From 8a055675af8e428bf7b8338cd0b22d01c252c6dc Mon Sep 17 00:00:00 2001
From: lkomurcu <44089359+lkomurcu@users.noreply.github.com>
Date: Sun, 19 Jun 2022 21:39:40 +0200
Subject: [PATCH 001/838] Move gas mbus config option being a define to being a
 build flag since its used in external libraries. (#3575)

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

diff --git a/esphome/components/dsmr/__init__.py b/esphome/components/dsmr/__init__.py
index 7a7681082e..624a0f35a1 100644
--- a/esphome/components/dsmr/__init__.py
+++ b/esphome/components/dsmr/__init__.py
@@ -79,7 +79,7 @@ async def to_code(config):
     cg.add(var.set_request_interval(config[CONF_REQUEST_INTERVAL].total_milliseconds))
     cg.add(var.set_receive_timeout(config[CONF_RECEIVE_TIMEOUT].total_milliseconds))
 
-    cg.add_define("DSMR_GAS_MBUS_ID", config[CONF_GAS_MBUS_ID])
+    cg.add_build_flag("-DDSMR_GAS_MBUS_ID=" + str(config[CONF_GAS_MBUS_ID]))
 
     # DSMR Parser
     cg.add_library("glmnet/Dsmr", "0.5")

From d0c646c72162ca0421df84bd941d54735282db52 Mon Sep 17 00:00:00 2001
From: ShellAddicted <ShellAddicted@gmail.com>
Date: Mon, 20 Jun 2022 01:17:58 +0200
Subject: [PATCH 002/838] Fix: Make MQTT over TLS actually work (#3580)

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

diff --git a/esphome/components/mqtt/mqtt_client.cpp b/esphome/components/mqtt/mqtt_client.cpp
index 157504fb41..aa0cf56c51 100644
--- a/esphome/components/mqtt/mqtt_client.cpp
+++ b/esphome/components/mqtt/mqtt_client.cpp
@@ -187,7 +187,7 @@ void MQTTClientComponent::start_connect_() {
 
   this->mqtt_backend_.set_credentials(username, password);
 
-  this->mqtt_backend_.set_server((uint32_t) this->ip_, this->credentials_.port);
+  this->mqtt_backend_.set_server(this->credentials_.address.c_str(), this->credentials_.port);
   if (!this->last_will_.topic.empty()) {
     this->mqtt_backend_.set_will(this->last_will_.topic.c_str(), this->last_will_.qos, this->last_will_.retain,
                                  this->last_will_.payload.c_str());

From ca13c4c1a657cf614379125e15a679213923abc7 Mon Sep 17 00:00:00 2001
From: kahrendt <kahrendt@gmail.com>
Date: Sun, 19 Jun 2022 19:27:00 -0400
Subject: [PATCH 003/838] Fix wrong type for voc_state*_ in sgp4x component
 (#3581)

Co-authored-by: Martin <25747549+martgras@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/sgp4x/sensor.py | 4 +++-
 esphome/components/sgp4x/sgp4x.cpp | 4 ++--
 esphome/components/sgp4x/sgp4x.h   | 6 +++---
 platformio.ini                     | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/esphome/components/sgp4x/sensor.py b/esphome/components/sgp4x/sensor.py
index 4855d7f066..1f6c5006a5 100644
--- a/esphome/components/sgp4x/sensor.py
+++ b/esphome/components/sgp4x/sensor.py
@@ -140,5 +140,7 @@ async def to_code(config):
                 )
             )
     cg.add_library(
-        None, None, "https://github.com/Sensirion/arduino-gas-index-algorithm.git"
+        None,
+        None,
+        "https://github.com/Sensirion/arduino-gas-index-algorithm.git#3.2.1",
     )
diff --git a/esphome/components/sgp4x/sgp4x.cpp b/esphome/components/sgp4x/sgp4x.cpp
index a6f57e0342..257c30075f 100644
--- a/esphome/components/sgp4x/sgp4x.cpp
+++ b/esphome/components/sgp4x/sgp4x.cpp
@@ -170,8 +170,8 @@ bool SGP4xComponent::measure_gas_indices_(int32_t &voc, int32_t &nox) {
   // much
   if (this->store_baseline_ && this->seconds_since_last_store_ > SHORTEST_BASELINE_STORE_INTERVAL) {
     voc_algorithm_.get_states(this->voc_state0_, this->voc_state1_);
-    if ((uint32_t) abs(this->voc_baselines_storage_.state0 - this->voc_state0_) > MAXIMUM_STORAGE_DIFF ||
-        (uint32_t) abs(this->voc_baselines_storage_.state1 - this->voc_state1_) > MAXIMUM_STORAGE_DIFF) {
+    if (std::abs(this->voc_baselines_storage_.state0 - this->voc_state0_) > MAXIMUM_STORAGE_DIFF ||
+        std::abs(this->voc_baselines_storage_.state1 - this->voc_state1_) > MAXIMUM_STORAGE_DIFF) {
       this->seconds_since_last_store_ = 0;
       this->voc_baselines_storage_.state0 = this->voc_state0_;
       this->voc_baselines_storage_.state1 = this->voc_state1_;
diff --git a/esphome/components/sgp4x/sgp4x.h b/esphome/components/sgp4x/sgp4x.h
index 3060972fc3..3a8d8200a7 100644
--- a/esphome/components/sgp4x/sgp4x.h
+++ b/esphome/components/sgp4x/sgp4x.h
@@ -49,7 +49,7 @@ static const uint16_t SPG41_SELFTEST_TIME = 320;  // 320 ms for self test
 static const uint16_t SGP40_MEASURE_TIME = 30;
 static const uint16_t SGP41_MEASURE_TIME = 55;
 // Store anyway if the baseline difference exceeds the max storage diff value
-const uint32_t MAXIMUM_STORAGE_DIFF = 50;
+const float MAXIMUM_STORAGE_DIFF = 50.0f;
 
 class SGP4xComponent;
 
@@ -120,8 +120,8 @@ class SGP4xComponent : public PollingComponent, public sensor::Sensor, public se
   sensor::Sensor *voc_sensor_{nullptr};
   VOCGasIndexAlgorithm voc_algorithm_;
   optional<GasTuning> voc_tuning_params_;
-  int32_t voc_state0_;
-  int32_t voc_state1_;
+  float voc_state0_;
+  float voc_state1_;
   int32_t voc_index_ = 0;
 
   sensor::Sensor *nox_sensor_{nullptr};
diff --git a/platformio.ini b/platformio.ini
index fb33087a8a..733e942a84 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -40,7 +40,7 @@ lib_deps =
     wjtje/qr-code-generator-library@1.7.0  ; qr_code
     functionpointer/arduino-MLX90393@1.0.0 ; mlx90393
     ; This is using the repository until a new release is published to PlatformIO
-    https://github.com/Sensirion/arduino-gas-index-algorithm.git ; Sensirion Gas Index Algorithm Arduino Library
+    https://github.com/Sensirion/arduino-gas-index-algorithm.git#3.2.1 ; Sensirion Gas Index Algorithm Arduino Library
 build_flags =
     -DESPHOME_LOG_LEVEL=ESPHOME_LOG_LEVEL_VERY_VERBOSE
 src_filter =

From 8f67acadd817807f07a47fd883d307ffa7c15002 Mon Sep 17 00:00:00 2001
From: Sergey Dudanov <sergey.dudanov@gmail.com>
Date: Mon, 20 Jun 2022 04:17:20 +0400
Subject: [PATCH 004/838] Media Player: added play_media action (#3579)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/media_player/__init__.py  | 31 ++++++++++++++++++++
 esphome/components/media_player/automation.h | 19 ++++++++++--
 tests/test4.yaml                             |  6 ++++
 3 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/esphome/components/media_player/__init__.py b/esphome/components/media_player/__init__.py
index 3456417370..80f5fc558a 100644
--- a/esphome/components/media_player/__init__.py
+++ b/esphome/components/media_player/__init__.py
@@ -20,6 +20,9 @@ MediaPlayer = media_player_ns.class_("MediaPlayer")
 PlayAction = media_player_ns.class_(
     "PlayAction", automation.Action, cg.Parented.template(MediaPlayer)
 )
+PlayMediaAction = media_player_ns.class_(
+    "PlayMediaAction", automation.Action, cg.Parented.template(MediaPlayer)
+)
 ToggleAction = media_player_ns.class_(
     "ToggleAction", automation.Action, cg.Parented.template(MediaPlayer)
 )
@@ -44,11 +47,14 @@ CONF_VOLUME = "volume"
 CONF_ON_IDLE = "on_idle"
 CONF_ON_PLAY = "on_play"
 CONF_ON_PAUSE = "on_pause"
+CONF_MEDIA_URL = "media_url"
 
 StateTrigger = media_player_ns.class_("StateTrigger", automation.Trigger.template())
 IdleTrigger = media_player_ns.class_("IdleTrigger", automation.Trigger.template())
 PlayTrigger = media_player_ns.class_("PlayTrigger", automation.Trigger.template())
 PauseTrigger = media_player_ns.class_("PauseTrigger", automation.Trigger.template())
+IsIdleCondition = media_player_ns.class_("IsIdleCondition", automation.Condition)
+IsPlayingCondition = media_player_ns.class_("IsPlayingCondition", automation.Condition)
 
 
 async def setup_media_player_core_(var, config):
@@ -103,6 +109,25 @@ MEDIA_PLAYER_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
 MEDIA_PLAYER_ACTION_SCHEMA = maybe_simple_id({cv.GenerateID(): cv.use_id(MediaPlayer)})
 
 
+@automation.register_action(
+    "media_player.play_media",
+    PlayMediaAction,
+    cv.maybe_simple_value(
+        {
+            cv.GenerateID(): cv.use_id(MediaPlayer),
+            cv.Required(CONF_MEDIA_URL): cv.templatable(cv.url),
+        },
+        key=CONF_MEDIA_URL,
+    ),
+)
+async def media_player_play_media_action(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    await cg.register_parented(var, config[CONF_ID])
+    media_url = await cg.templatable(config[CONF_MEDIA_URL], args, cg.std_string)
+    cg.add(var.set_media_url(media_url))
+    return var
+
+
 @automation.register_action("media_player.play", PlayAction, MEDIA_PLAYER_ACTION_SCHEMA)
 @automation.register_action(
     "media_player.toggle", ToggleAction, MEDIA_PLAYER_ACTION_SCHEMA
@@ -117,6 +142,12 @@ MEDIA_PLAYER_ACTION_SCHEMA = maybe_simple_id({cv.GenerateID(): cv.use_id(MediaPl
 @automation.register_action(
     "media_player.volume_down", VolumeDownAction, MEDIA_PLAYER_ACTION_SCHEMA
 )
+@automation.register_condition(
+    "media_player.is_idle", IsIdleCondition, MEDIA_PLAYER_ACTION_SCHEMA
+)
+@automation.register_condition(
+    "media_player.is_playing", IsPlayingCondition, MEDIA_PLAYER_ACTION_SCHEMA
+)
 async def media_player_action(config, action_id, template_arg, args):
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
diff --git a/esphome/components/media_player/automation.h b/esphome/components/media_player/automation.h
index c6deba7dc6..261e93775c 100644
--- a/esphome/components/media_player/automation.h
+++ b/esphome/components/media_player/automation.h
@@ -17,7 +17,7 @@ namespace media_player {
 #define MEDIA_PLAYER_SIMPLE_STATE_TRIGGER(TRIGGER_CLASS, TRIGGER_STATE) \
   class TRIGGER_CLASS : public Trigger<> { \
    public: \
-    TRIGGER_CLASS(MediaPlayer *player) { \
+    explicit TRIGGER_CLASS(MediaPlayer *player) { \
       player->add_on_state_callback([this, player]() { \
         if (player->state == MediaPlayerState::MEDIA_PLAYER_STATE_##TRIGGER_STATE) \
           this->trigger(); \
@@ -32,6 +32,11 @@ MEDIA_PLAYER_SIMPLE_COMMAND_ACTION(ToggleAction, TOGGLE)
 MEDIA_PLAYER_SIMPLE_COMMAND_ACTION(VolumeUpAction, VOLUME_UP)
 MEDIA_PLAYER_SIMPLE_COMMAND_ACTION(VolumeDownAction, VOLUME_DOWN)
 
+template<typename... Ts> class PlayMediaAction : public Action<Ts...>, public Parented<MediaPlayer> {
+  TEMPLATABLE_VALUE(std::string, media_url)
+  void play(Ts... x) override { this->parent_->make_call().set_media_url(this->media_url_.value(x...)).perform(); }
+};
+
 template<typename... Ts> class VolumeSetAction : public Action<Ts...>, public Parented<MediaPlayer> {
   TEMPLATABLE_VALUE(float, volume)
   void play(Ts... x) override { this->parent_->make_call().set_volume(this->volume_.value(x...)).perform(); }
@@ -39,7 +44,7 @@ template<typename... Ts> class VolumeSetAction : public Action<Ts...>, public Pa
 
 class StateTrigger : public Trigger<> {
  public:
-  StateTrigger(MediaPlayer *player) {
+  explicit StateTrigger(MediaPlayer *player) {
     player->add_on_state_callback([this]() { this->trigger(); });
   }
 };
@@ -48,5 +53,15 @@ MEDIA_PLAYER_SIMPLE_STATE_TRIGGER(IdleTrigger, IDLE)
 MEDIA_PLAYER_SIMPLE_STATE_TRIGGER(PlayTrigger, PLAYING)
 MEDIA_PLAYER_SIMPLE_STATE_TRIGGER(PauseTrigger, PAUSED)
 
+template<typename... Ts> class IsIdleCondition : public Condition<Ts...>, public Parented<MediaPlayer> {
+ public:
+  bool check(Ts... x) override { return this->parent_->state == MediaPlayerState::MEDIA_PLAYER_STATE_IDLE; }
+};
+
+template<typename... Ts> class IsPlayingCondition : public Condition<Ts...>, public Parented<MediaPlayer> {
+ public:
+  bool check(Ts... x) override { return this->parent_->state == MediaPlayerState::MEDIA_PLAYER_STATE_PLAYING; }
+};
+
 }  // namespace media_player
 }  // namespace esphome
diff --git a/tests/test4.yaml b/tests/test4.yaml
index c82673b196..0dfbeed550 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -615,12 +615,18 @@ media_player:
     mute_pin: GPIO14
     on_state:
       - media_player.play:
+      - media_player.play_media: http://localhost/media.mp3
+      - media_player.play_media: !lambda 'return "http://localhost/media.mp3";'
     on_idle:
       - media_player.pause:
     on_play:
       - media_player.stop:
     on_pause:
       - media_player.toggle:
+      - wait_until:
+          media_player.is_idle:
+      - wait_until:
+          media_player.is_playing:
       - media_player.volume_up:
       - media_player.volume_down:
       - media_player.volume_set: 50%

From 4c37c17df129698e6962bfab52358cc0a16f8f41 Mon Sep 17 00:00:00 2001
From: Joe <jhansche@themeetgroup.com>
Date: Mon, 20 Jun 2022 19:31:17 -0400
Subject: [PATCH 005/838] Fix 2 small issues in BLEClient (#3544)

---
 esphome/components/ble_client/ble_client.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/esphome/components/ble_client/ble_client.cpp b/esphome/components/ble_client/ble_client.cpp
index 7bef0d652c..d06c3c4cad 100644
--- a/esphome/components/ble_client/ble_client.cpp
+++ b/esphome/components/ble_client/ble_client.cpp
@@ -113,6 +113,7 @@ void BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t es
     }
     case ESP_GATTC_OPEN_EVT: {
       ESP_LOGV(TAG, "[%s] ESP_GATTC_OPEN_EVT", this->address_str().c_str());
+      this->conn_id = param->open.conn_id;
       if (param->open.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "connect to %s failed, status=%d", this->address_str().c_str(), param->open.status);
         this->set_states_(espbt::ClientState::IDLE);
@@ -122,7 +123,10 @@ void BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t es
     }
     case ESP_GATTC_CONNECT_EVT: {
       ESP_LOGV(TAG, "[%s] ESP_GATTC_CONNECT_EVT", this->address_str().c_str());
-      this->conn_id = param->connect.conn_id;
+      if (this->conn_id != param->connect.conn_id) {
+        ESP_LOGD(TAG, "[%s] Unexpected conn_id in CONNECT_EVT: param conn=%d, open conn=%d",
+                 this->address_str().c_str(), param->connect.conn_id, this->conn_id);
+      }
       auto ret = esp_ble_gattc_send_mtu_req(this->gattc_if, param->connect.conn_id);
       if (ret) {
         ESP_LOGW(TAG, "esp_ble_gattc_send_mtu_req failed, status=%x", ret);
@@ -183,9 +187,10 @@ void BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t es
                  descr->uuid.to_string().c_str());
         break;
       }
-      uint8_t notify_en = 1;
-      auto status = esp_ble_gattc_write_char_descr(this->gattc_if, this->conn_id, descr->handle, sizeof(notify_en),
-                                                   &notify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
+      uint16_t notify_en = 1;
+      auto status =
+          esp_ble_gattc_write_char_descr(this->gattc_if, this->conn_id, descr->handle, sizeof(notify_en),
+                                         (uint8_t *) &notify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
       if (status) {
         ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, status=%d", status);
       }

From 020b2c05c828ca0faea7676ff73e8df37674cbb4 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 23 Jun 2022 10:34:10 +1200
Subject: [PATCH 006/838] Bump version to 2022.6.2

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

diff --git a/esphome/const.py b/esphome/const.py
index cdb923a107..f7b593b541 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.6.1"
+__version__ = "2022.6.2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From df73170e5ae387960baeb8a27c14d962bad00119 Mon Sep 17 00:00:00 2001
From: Javier Peletier <jpeletier@users.noreply.github.com>
Date: Sun, 24 Jul 2022 22:06:18 +0200
Subject: [PATCH 007/838] modbus: fix queue deduplicator erasing custom
 commands (#3650)

---
 .../modbus_controller/modbus_controller.cpp          | 12 ++++++++++--
 .../components/modbus_controller/modbus_controller.h |  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/esphome/components/modbus_controller/modbus_controller.cpp b/esphome/components/modbus_controller/modbus_controller.cpp
index 91e0dcc45f..b7fde157d8 100644
--- a/esphome/components/modbus_controller/modbus_controller.cpp
+++ b/esphome/components/modbus_controller/modbus_controller.cpp
@@ -108,8 +108,7 @@ void ModbusController::queue_command(const ModbusCommandItem &command) {
   // check if this commmand is already qeued.
   // not very effective but the queue is never really large
   for (auto &item : command_queue_) {
-    if (item->register_address == command.register_address && item->register_count == command.register_count &&
-        item->register_type == command.register_type && item->function_code == command.function_code) {
+    if (item->is_equal(command)) {
       ESP_LOGW(TAG, "Duplicate modbus command found: type=0x%x address=%u count=%u",
                static_cast<uint8_t>(command.register_type), command.register_address, command.register_count);
       // update the payload of the queued command
@@ -489,6 +488,15 @@ bool ModbusCommandItem::send() {
   return true;
 }
 
+bool ModbusCommandItem::is_equal(const ModbusCommandItem &other) {
+  // for custom commands we have to check for identical payloads, since
+  // address/count/type fields will be set to zero
+  return this->function_code == ModbusFunctionCode::CUSTOM
+             ? this->payload == other.payload
+             : other.register_address == this->register_address && other.register_count == this->register_count &&
+                   other.register_type == this->register_type && other.function_code == this->function_code;
+}
+
 void number_to_payload(std::vector<uint16_t> &data, int64_t value, SensorValueType value_type) {
   switch (value_type) {
     case SensorValueType::U_WORD:
diff --git a/esphome/components/modbus_controller/modbus_controller.h b/esphome/components/modbus_controller/modbus_controller.h
index 6aecf7f8a4..f67242a68e 100644
--- a/esphome/components/modbus_controller/modbus_controller.h
+++ b/esphome/components/modbus_controller/modbus_controller.h
@@ -395,6 +395,8 @@ class ModbusCommandItem {
       ModbusController *modbusdevice, const std::vector<uint16_t> &values,
       std::function<void(ModbusRegisterType register_type, uint16_t start_address, const std::vector<uint8_t> &data)>
           &&handler = nullptr);
+
+  bool is_equal(const ModbusCommandItem &other);
 };
 
 /** Modbus controller class.

From 311980e0e478612a01020758d2b71bec2cd02fdc Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Sun, 31 Jul 2022 18:08:19 -0700
Subject: [PATCH 008/838] Update inkbird_ibsth1_mini.cpp (#3664)

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

diff --git a/esphome/components/inkbird_ibsth1_mini/inkbird_ibsth1_mini.cpp b/esphome/components/inkbird_ibsth1_mini/inkbird_ibsth1_mini.cpp
index 76013e28ff..94c22ae84d 100644
--- a/esphome/components/inkbird_ibsth1_mini/inkbird_ibsth1_mini.cpp
+++ b/esphome/components/inkbird_ibsth1_mini/inkbird_ibsth1_mini.cpp
@@ -55,7 +55,7 @@ bool InkbirdIbstH1Mini::parse_device(const esp32_ble_tracker::ESPBTDevice &devic
     ESP_LOGVV(TAG, "parse_device(): manufacturer data element length is expected to be of length 7");
     return false;
   }
-  if (mnf_data.data[6] != 8) {
+  if ((mnf_data.data[6] != 8) && (mnf_data.data[6] != 6)) {
     ESP_LOGVV(TAG, "parse_device(): unexpected data");
     return false;
   }

From eb878710c1e6f750c0ca532ee4d258447bac30d6 Mon Sep 17 00:00:00 2001
From: Bryan Berg <berg@users.noreply.github.com>
Date: Mon, 1 Aug 2022 16:32:02 -0700
Subject: [PATCH 009/838] Add CO device class to binary_sensor (#3656)

---
 esphome/components/binary_sensor/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/components/binary_sensor/__init__.py b/esphome/components/binary_sensor/__init__.py
index 40f95d72f9..63fd34c7d5 100644
--- a/esphome/components/binary_sensor/__init__.py
+++ b/esphome/components/binary_sensor/__init__.py
@@ -29,6 +29,7 @@ from esphome.const import (
     DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_BATTERY_CHARGING,
+    DEVICE_CLASS_CARBON_MONOXIDE,
     DEVICE_CLASS_COLD,
     DEVICE_CLASS_CONNECTIVITY,
     DEVICE_CLASS_DOOR,
@@ -63,6 +64,7 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_BATTERY_CHARGING,
+    DEVICE_CLASS_CARBON_MONOXIDE,
     DEVICE_CLASS_COLD,
     DEVICE_CLASS_CONNECTIVITY,
     DEVICE_CLASS_DOOR,

From 50f32a3aa59cf31cf55abc73543ee7f09fa7d96e Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Mon, 1 Aug 2022 22:07:32 -0700
Subject: [PATCH 010/838] Use application/json instead of text/json (#3671)

---
 esphome/components/web_server/web_server.cpp | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index 18374d606b..f0a7efd12f 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -353,7 +353,7 @@ void WebServer::handle_sensor_request(AsyncWebServerRequest *request, const UrlM
     if (obj->get_object_id() != match.id)
       continue;
     std::string data = this->sensor_json(obj, obj->state, DETAIL_STATE);
-    request->send(200, "text/json", data.c_str());
+    request->send(200, "application/json", data.c_str());
     return;
   }
   request->send(404);
@@ -377,7 +377,7 @@ void WebServer::handle_text_sensor_request(AsyncWebServerRequest *request, const
     if (obj->get_object_id() != match.id)
       continue;
     std::string data = this->text_sensor_json(obj, obj->state, DETAIL_STATE);
-    request->send(200, "text/json", data.c_str());
+    request->send(200, "application/json", data.c_str());
     return;
   }
   request->send(404);
@@ -406,7 +406,7 @@ void WebServer::handle_switch_request(AsyncWebServerRequest *request, const UrlM
 
     if (request->method() == HTTP_GET) {
       std::string data = this->switch_json(obj, obj->state, DETAIL_STATE);
-      request->send(200, "text/json", data.c_str());
+      request->send(200, "application/json", data.c_str());
     } else if (match.method == "toggle") {
       this->defer([obj]() { obj->toggle(); });
       request->send(200);
@@ -462,7 +462,7 @@ void WebServer::handle_binary_sensor_request(AsyncWebServerRequest *request, con
     if (obj->get_object_id() != match.id)
       continue;
     std::string data = this->binary_sensor_json(obj, obj->state, DETAIL_STATE);
-    request->send(200, "text/json", data.c_str());
+    request->send(200, "application/json", data.c_str());
     return;
   }
   request->send(404);
@@ -490,7 +490,7 @@ void WebServer::handle_fan_request(AsyncWebServerRequest *request, const UrlMatc
 
     if (request->method() == HTTP_GET) {
       std::string data = this->fan_json(obj, DETAIL_STATE);
-      request->send(200, "text/json", data.c_str());
+      request->send(200, "application/json", data.c_str());
     } else if (match.method == "toggle") {
       this->defer([obj]() { obj->toggle().perform(); });
       request->send(200);
@@ -551,7 +551,7 @@ void WebServer::handle_light_request(AsyncWebServerRequest *request, const UrlMa
 
     if (request->method() == HTTP_GET) {
       std::string data = this->light_json(obj, DETAIL_STATE);
-      request->send(200, "text/json", data.c_str());
+      request->send(200, "application/json", data.c_str());
     } else if (match.method == "toggle") {
       this->defer([obj]() { obj->toggle().perform(); });
       request->send(200);
@@ -630,7 +630,7 @@ void WebServer::handle_cover_request(AsyncWebServerRequest *request, const UrlMa
 
     if (request->method() == HTTP_GET) {
       std::string data = this->cover_json(obj, DETAIL_STATE);
-      request->send(200, "text/json", data.c_str());
+      request->send(200, "application/json", data.c_str());
       continue;
     }
 
@@ -687,7 +687,7 @@ void WebServer::handle_number_request(AsyncWebServerRequest *request, const UrlM
 
     if (request->method() == HTTP_GET) {
       std::string data = this->number_json(obj, obj->state, DETAIL_STATE);
-      request->send(200, "text/json", data.c_str());
+      request->send(200, "application/json", data.c_str());
       return;
     }
     if (match.method != "set") {
@@ -741,7 +741,7 @@ void WebServer::handle_select_request(AsyncWebServerRequest *request, const UrlM
 
     if (request->method() == HTTP_GET) {
       std::string data = this->select_json(obj, obj->state, DETAIL_STATE);
-      request->send(200, "text/json", data.c_str());
+      request->send(200, "application/json", data.c_str());
       return;
     }
 
@@ -788,7 +788,7 @@ void WebServer::handle_climate_request(AsyncWebServerRequest *request, const Url
 
     if (request->method() == HTTP_GET) {
       std::string data = this->climate_json(obj, DETAIL_STATE);
-      request->send(200, "text/json", data.c_str());
+      request->send(200, "application/json", data.c_str());
       return;
     }
 
@@ -926,7 +926,7 @@ void WebServer::handle_lock_request(AsyncWebServerRequest *request, const UrlMat
 
     if (request->method() == HTTP_GET) {
       std::string data = this->lock_json(obj, obj->state, DETAIL_STATE);
-      request->send(200, "text/json", data.c_str());
+      request->send(200, "application/json", data.c_str());
     } else if (match.method == "lock") {
       this->defer([obj]() { obj->lock(); });
       request->send(200);

From e5eaf7a3fecfbb9818890aed7ef7a56cce41ae0e Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Mon, 1 Aug 2022 22:09:17 -0700
Subject: [PATCH 011/838] Use correct struct members. (#3672)

---
 esphome/components/remote_base/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esphome/components/remote_base/__init__.py b/esphome/components/remote_base/__init__.py
index 165da95d67..5ccfc500cf 100644
--- a/esphome/components/remote_base/__init__.py
+++ b/esphome/components/remote_base/__init__.py
@@ -744,7 +744,8 @@ def rc6_binary_sensor(var, config):
         var.set_data(
             cg.StructInitializer(
                 RC6Data,
-                ("device", config[CONF_DEVICE]),
+                ("mode", 0),
+                ("toggle", 0),
                 ("address", config[CONF_ADDRESS]),
                 ("command", config[CONF_COMMAND]),
             )

From bf8eddb13b4a5846c1e6bd21fb574e97e7bce684 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 8 Aug 2022 08:24:12 +1200
Subject: [PATCH 012/838] Bump version to 2022.6.3

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

diff --git a/esphome/const.py b/esphome/const.py
index f7b593b541..f95628735d 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.6.2"
+__version__ = "2022.6.3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From a97e3d827dc190da1fbc87f08b6b15b17a688255 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 10 Aug 2022 15:26:02 +1200
Subject: [PATCH 013/838] Bump version to 2022.8.0b1

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

diff --git a/esphome/const.py b/esphome/const.py
index 6de2581fc8..0593c19672 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.7.0-dev"
+__version__ = "2022.8.0b1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From e2c8e69d125a248169bb92fe3a86dbca0f91f611 Mon Sep 17 00:00:00 2001
From: anatoly-savchenkov
 <48646998+anatoly-savchenkov@users.noreply.github.com>
Date: Thu, 11 Aug 2022 04:32:55 +0300
Subject: [PATCH 014/838] Improve Web view for Climate components (#3706)

---
 esphome/components/web_server/server_index.h | 1136 +++++++++---------
 esphome/components/web_server/web_server.cpp |   27 +-
 2 files changed, 594 insertions(+), 569 deletions(-)

diff --git a/esphome/components/web_server/server_index.h b/esphome/components/web_server/server_index.h
index 719a804d0c..39c170f15b 100644
--- a/esphome/components/web_server/server_index.h
+++ b/esphome/components/web_server/server_index.h
@@ -6,568 +6,580 @@ namespace esphome {
 namespace web_server {
 
 const uint8_t INDEX_GZ[] PROGMEM = {
-    0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0xbd, 0x7d, 0xd9, 0x76, 0xe3, 0xc6, 0x92, 0xe0, 0xf3,
-    0x9c, 0x33, 0x7f, 0x30, 0x2f, 0x10, 0xac, 0x56, 0x01, 0x16, 0x08, 0x91, 0x54, 0x6d, 0x06, 0x05, 0xf2, 0xca, 0x55,
-    0xe5, 0x5b, 0x65, 0xd7, 0xe6, 0x92, 0xaa, 0xbc, 0xc8, 0x74, 0x09, 0x22, 0x93, 0x22, 0x5c, 0x20, 0x40, 0x03, 0x49,
-    0x2d, 0xa6, 0xd0, 0xa7, 0x9f, 0xfa, 0x69, 0xce, 0x99, 0xf5, 0xa1, 0x5f, 0xe6, 0xf4, 0xcb, 0x7c, 0xc4, 0x7c, 0xcf,
-    0xfd, 0x81, 0xe9, 0x4f, 0x98, 0x88, 0xc8, 0x05, 0x09, 0x90, 0x5a, 0xec, 0xf6, 0xdc, 0x53, 0x8b, 0x80, 0x5c, 0x23,
-    0x23, 0x23, 0x63, 0x4f, 0x68, 0x6f, 0x63, 0x9c, 0x8d, 0xf8, 0xe5, 0x9c, 0x59, 0x53, 0x3e, 0x4b, 0xfa, 0x7b, 0xf2,
-    0x7f, 0x16, 0x8d, 0xfb, 0x7b, 0x49, 0x9c, 0x7e, 0xb2, 0x72, 0x96, 0x84, 0xf1, 0x28, 0x4b, 0xad, 0x69, 0xce, 0x26,
-    0xe1, 0x38, 0xe2, 0x51, 0x10, 0xcf, 0xa2, 0x53, 0x66, 0xed, 0xf4, 0xf7, 0x66, 0x8c, 0x47, 0xd6, 0x68, 0x1a, 0xe5,
-    0x05, 0xe3, 0xe1, 0xfb, 0xc3, 0xaf, 0x5a, 0x8f, 0xfb, 0x7b, 0xc5, 0x28, 0x8f, 0xe7, 0xdc, 0xc2, 0x21, 0xc3, 0x59,
-    0x36, 0x5e, 0x24, 0xac, 0x7f, 0x16, 0xe5, 0xd6, 0x3e, 0x0b, 0xdf, 0x9c, 0xfc, 0xc2, 0x46, 0xdc, 0x1f, 0xb3, 0x49,
-    0x9c, 0xb2, 0xb7, 0x79, 0x36, 0x67, 0x39, 0xbf, 0xf4, 0x2e, 0xd6, 0x57, 0xc4, 0xac, 0xf0, 0x9e, 0xe9, 0xaa, 0x53,
-    0xc6, 0xdf, 0x9c, 0xa7, 0xaa, 0xcf, 0x53, 0x26, 0x26, 0xc9, 0xf2, 0xc2, 0xe3, 0xd7, 0xb4, 0x39, 0xb8, 0x9c, 0x9d,
-    0x64, 0x49, 0xe1, 0x1d, 0xe8, 0xfa, 0x79, 0x9e, 0xf1, 0x0c, 0xc1, 0xf2, 0xa7, 0x51, 0x61, 0xb4, 0xf4, 0x3e, 0xad,
-    0x69, 0x32, 0x97, 0x95, 0x2f, 0x8a, 0x67, 0xe9, 0x62, 0xc6, 0xf2, 0xe8, 0x24, 0x61, 0x5e, 0xc1, 0x42, 0x87, 0x79,
-    0xdc, 0x8b, 0xdd, 0xb0, 0xcf, 0xad, 0x38, 0xb5, 0xd8, 0x60, 0x9f, 0x51, 0xc9, 0x92, 0xe9, 0x56, 0xc1, 0x46, 0xdb,
-    0x03, 0x74, 0x4d, 0xe2, 0xd3, 0x85, 0x7e, 0x3f, 0xcf, 0x63, 0xae, 0x9e, 0xcf, 0xa2, 0x64, 0xc1, 0x82, 0xb8, 0x74,
-    0x03, 0x76, 0xc4, 0x87, 0x61, 0xec, 0x3d, 0xa1, 0x41, 0x61, 0xc8, 0xe5, 0x24, 0xcb, 0x1d, 0xc4, 0x55, 0x8c, 0x63,
-    0xf3, 0xab, 0x2b, 0x87, 0x87, 0xcb, 0xd2, 0x75, 0x0f, 0x98, 0x3f, 0x8a, 0x92, 0xc4, 0xc1, 0x89, 0xb7, 0xb6, 0x0a,
-    0x9c, 0x31, 0xf6, 0xf8, 0x51, 0x3c, 0x74, 0x7b, 0xf1, 0xc4, 0xe1, 0xcc, 0xad, 0xfa, 0x65, 0x13, 0x8b, 0x33, 0x87,
-    0xbb, 0xee, 0xa7, 0xeb, 0xfb, 0xe4, 0x8c, 0x2f, 0x72, 0x80, 0xbd, 0xf4, 0xde, 0xa8, 0x99, 0x2f, 0xb0, 0xfe, 0x19,
-    0x75, 0xec, 0x01, 0xec, 0x05, 0xb7, 0x3e, 0x84, 0xe7, 0x71, 0x3a, 0xce, 0xce, 0xfd, 0x83, 0x69, 0x04, 0x3f, 0xde,
-    0x65, 0x19, 0xdf, 0xda, 0x72, 0xce, 0xb2, 0x78, 0x6c, 0xb5, 0xc3, 0xd0, 0xac, 0xbc, 0x7c, 0x72, 0x70, 0x70, 0x75,
-    0xd5, 0x28, 0xf0, 0xd3, 0x88, 0xc7, 0x67, 0x4c, 0x74, 0x06, 0x00, 0x6c, 0xf8, 0x39, 0xe7, 0x6c, 0x7c, 0xc0, 0x2f,
-    0x13, 0x28, 0x65, 0x8c, 0x17, 0x36, 0xac, 0xf1, 0x69, 0x36, 0x02, 0xb4, 0xa5, 0x06, 0xe2, 0xa1, 0x69, 0xce, 0xe6,
-    0x49, 0x34, 0x62, 0x58, 0x0f, 0x23, 0x55, 0x3d, 0xaa, 0x46, 0xde, 0x57, 0xa1, 0xd8, 0x5e, 0xc7, 0xf5, 0x62, 0x16,
-    0xa6, 0xec, 0xdc, 0x7a, 0x15, 0xcd, 0x7b, 0xa3, 0x24, 0x2a, 0x0a, 0xa0, 0xd7, 0x25, 0x2d, 0x21, 0x5f, 0x8c, 0x80,
-    0x40, 0x68, 0x81, 0x4b, 0x44, 0xd3, 0x34, 0x2e, 0xfc, 0x8f, 0x9b, 0xa3, 0xa2, 0x78, 0xc7, 0x8a, 0x45, 0xc2, 0x37,
-    0x43, 0xd8, 0x0b, 0xbe, 0x11, 0x86, 0x5f, 0xb9, 0x7c, 0x9a, 0x67, 0xe7, 0xd6, 0xb3, 0x3c, 0x87, 0xe6, 0x36, 0x4c,
-    0x29, 0x1a, 0x58, 0x71, 0x61, 0xa5, 0x19, 0xb7, 0xf4, 0x60, 0xb8, 0x81, 0xbe, 0xf5, 0xbe, 0x60, 0xd6, 0xf1, 0x22,
-    0x2d, 0xa2, 0x09, 0x83, 0xa6, 0xc7, 0x56, 0x96, 0x5b, 0xc7, 0x30, 0xe8, 0x31, 0x6c, 0x59, 0xc1, 0xe1, 0xd4, 0xf8,
-    0xb6, 0xdb, 0xa3, 0xb9, 0xa0, 0xf0, 0x90, 0x5d, 0xf0, 0x90, 0x95, 0x40, 0x98, 0x56, 0xa1, 0x97, 0xe1, 0xb8, 0xcb,
-    0x04, 0x0a, 0x58, 0x18, 0x33, 0x24, 0x59, 0xc7, 0x6c, 0xac, 0x37, 0xe7, 0xc3, 0xd6, 0x96, 0xc6, 0x35, 0xe0, 0xc4,
-    0x81, 0xb6, 0x45, 0xa3, 0xad, 0x27, 0x16, 0x5e, 0x43, 0x91, 0xeb, 0x31, 0x5f, 0xa2, 0xef, 0xe0, 0x32, 0x1d, 0xd5,
-    0xc7, 0x86, 0xca, 0x92, 0x67, 0x07, 0x3c, 0x8f, 0xd3, 0x53, 0x00, 0x42, 0xce, 0x64, 0x36, 0x29, 0x4b, 0xb1, 0xf9,
-    0x4f, 0x58, 0xc8, 0xc2, 0x3e, 0x8e, 0x9e, 0x33, 0xc7, 0x2e, 0xa8, 0x87, 0x1d, 0x86, 0x88, 0x7a, 0x20, 0x30, 0x36,
-    0x60, 0x01, 0xdb, 0xb6, 0x6d, 0xef, 0x2b, 0xd7, 0x3b, 0x47, 0x0a, 0xf2, 0x7d, 0x9f, 0xc8, 0x57, 0x74, 0x8e, 0xc3,
-    0x0e, 0x02, 0xed, 0x27, 0x2c, 0x3d, 0xe5, 0xd3, 0x01, 0x3b, 0x6a, 0x0f, 0x03, 0x0e, 0x50, 0x8d, 0x17, 0x23, 0xe6,
-    0x20, 0x3d, 0x7a, 0x05, 0x1e, 0x9f, 0x6d, 0x07, 0xa6, 0xc0, 0x8d, 0xd9, 0xa0, 0x35, 0xd6, 0xb6, 0xc6, 0x55, 0x24,
-    0xaa, 0x00, 0x43, 0x3a, 0xb7, 0xe1, 0x84, 0x9d, 0xb0, 0xdc, 0x80, 0x43, 0x37, 0xeb, 0xd5, 0x76, 0x70, 0x01, 0x3b,
-    0x04, 0xfd, 0xac, 0xc9, 0x22, 0x1d, 0xf1, 0x18, 0x18, 0x97, 0xbd, 0x0d, 0xe0, 0x8a, 0x9d, 0xd3, 0x1b, 0x67, 0xbb,
-    0xa5, 0xeb, 0xc4, 0xee, 0x36, 0x3b, 0x2a, 0xb6, 0x3b, 0x43, 0x0f, 0xa1, 0xd4, 0xc8, 0x97, 0x0b, 0x8f, 0x61, 0x81,
-    0x70, 0x46, 0x98, 0x3e, 0x9e, 0x1f, 0x06, 0xcc, 0x5f, 0xa5, 0xe3, 0x90, 0xfb, 0xb3, 0x68, 0x8e, 0xab, 0x61, 0x44,
-    0x03, 0x51, 0x3a, 0x42, 0xe8, 0x6a, 0xfb, 0x82, 0x18, 0xf3, 0x2b, 0x12, 0x70, 0x01, 0x21, 0x70, 0x66, 0x9f, 0x45,
-    0xa3, 0x29, 0x1c, 0xf1, 0x0a, 0x71, 0x63, 0x75, 0x1c, 0x46, 0x39, 0x8b, 0x38, 0x7b, 0x96, 0x30, 0x7c, 0xc3, 0x1d,
-    0x80, 0x9e, 0xb6, 0xeb, 0x15, 0xea, 0xdc, 0x25, 0x31, 0x7f, 0x9d, 0xc1, 0x3c, 0x3d, 0x41, 0x24, 0x40, 0xc5, 0xc5,
-    0xd6, 0x56, 0x8c, 0x24, 0xb2, 0xcf, 0x61, 0xb7, 0x4e, 0x16, 0xc0, 0x04, 0xec, 0x14, 0x5b, 0xd8, 0x80, 0x6d, 0x2f,
-    0xf6, 0x39, 0x20, 0xf1, 0x49, 0x96, 0x72, 0x18, 0x0e, 0xe0, 0xd5, 0x14, 0xe4, 0x47, 0xf3, 0x39, 0x4b, 0xc7, 0x4f,
-    0xa6, 0x71, 0x32, 0x06, 0x6c, 0x94, 0xb0, 0xde, 0x8c, 0x85, 0xb0, 0x4e, 0x58, 0x4c, 0x70, 0xf3, 0x8a, 0x68, 0xfb,
-    0x90, 0x90, 0x79, 0x68, 0xdb, 0x3d, 0xe4, 0x40, 0x72, 0x15, 0xc8, 0x83, 0x68, 0xe3, 0xde, 0x01, 0xeb, 0x2f, 0x5c,
-    0xbe, 0x1d, 0xc6, 0x7a, 0x1b, 0x25, 0x82, 0x9f, 0x20, 0xa7, 0x01, 0xfc, 0x33, 0xe0, 0x81, 0x3d, 0x64, 0x5c, 0xdf,
-    0x49, 0xae, 0x93, 0x32, 0xb5, 0x42, 0x40, 0xc0, 0x08, 0x39, 0x88, 0xc4, 0xc1, 0xdb, 0x2c, 0xb9, 0x9c, 0xc4, 0x49,
-    0x72, 0xb0, 0x98, 0xcf, 0xb3, 0x9c, 0x7b, 0x5f, 0x87, 0x4b, 0x9e, 0x55, 0x6b, 0xa5, 0x43, 0x5e, 0x9c, 0xc7, 0x1c,
-    0x11, 0xea, 0x2e, 0x47, 0x11, 0x6c, 0xf5, 0x97, 0x59, 0x96, 0xb0, 0x28, 0x85, 0x65, 0xb0, 0x81, 0x6d, 0x07, 0xe9,
-    0x22, 0x49, 0x7a, 0x27, 0x30, 0xec, 0xa7, 0x1e, 0x55, 0x0b, 0x8e, 0x1f, 0xd0, 0xf3, 0x7e, 0x9e, 0x47, 0x97, 0xd0,
-    0x10, 0xdb, 0x00, 0x2d, 0xc2, 0x6e, 0x7d, 0x7d, 0xf0, 0xe6, 0xb5, 0x2f, 0x08, 0x3f, 0x9e, 0x5c, 0x02, 0xa0, 0x65,
-    0xc5, 0x35, 0x27, 0x79, 0x36, 0x6b, 0x4c, 0x8d, 0x78, 0x88, 0x43, 0xd6, 0xbb, 0x06, 0x84, 0x98, 0x46, 0x86, 0x5d,
-    0x62, 0x26, 0x04, 0xaf, 0x89, 0x9e, 0x65, 0x25, 0x9e, 0x81, 0x01, 0x3e, 0x04, 0xa2, 0x18, 0xa6, 0xbc, 0x19, 0x5a,
-    0x9e, 0x5f, 0x2e, 0xe3, 0x90, 0xe0, 0x9c, 0xa3, 0xfc, 0x45, 0x18, 0x47, 0x11, 0xcc, 0xbe, 0x14, 0x03, 0x96, 0x0a,
-    0xe2, 0xb8, 0x2c, 0xbd, 0x44, 0x13, 0x31, 0x72, 0x3c, 0x64, 0x28, 0x1c, 0x8e, 0xd1, 0xd5, 0x15, 0x83, 0x17, 0xd7,
-    0xfb, 0x26, 0x5c, 0x46, 0x6a, 0x3d, 0x28, 0xa1, 0xf0, 0x7c, 0x05, 0x82, 0x4f, 0xa0, 0x24, 0x3b, 0x03, 0x39, 0x08,
-    0x70, 0x7e, 0xed, 0x81, 0xfc, 0x4f, 0x10, 0x8a, 0x8d, 0x8e, 0x07, 0x12, 0xf4, 0xc9, 0x34, 0x4a, 0x4f, 0xd9, 0x38,
-    0x48, 0x58, 0x29, 0x39, 0xef, 0xbe, 0x05, 0x7b, 0x0c, 0xe4, 0x54, 0x58, 0xcf, 0x0f, 0x5f, 0xbd, 0x94, 0x3b, 0x57,
-    0x63, 0xc6, 0xb0, 0x49, 0x0b, 0x10, 0xab, 0xc0, 0xb6, 0x25, 0x3b, 0x7e, 0xc6, 0x15, 0xf7, 0x16, 0x25, 0x71, 0xf1,
-    0x7e, 0x0e, 0x2a, 0x06, 0x7b, 0x0b, 0xc3, 0xc0, 0xf4, 0x21, 0x4c, 0x45, 0xe5, 0x30, 0x9f, 0xa8, 0x18, 0xeb, 0x22,
-    0xe8, 0x2c, 0x56, 0x2a, 0x5e, 0x33, 0xc7, 0x2d, 0x81, 0x54, 0x79, 0x3c, 0xb2, 0xa2, 0xf1, 0xf8, 0x45, 0x1a, 0xf3,
-    0x38, 0x4a, 0xe2, 0xdf, 0x08, 0x93, 0x4b, 0xa4, 0x31, 0xde, 0x93, 0x9b, 0x00, 0x6b, 0xa7, 0x1e, 0x89, 0xab, 0x98,
-    0xec, 0x06, 0x21, 0x43, 0x70, 0xcb, 0x24, 0x3c, 0x1a, 0x4a, 0xf0, 0x12, 0x7f, 0xbe, 0x28, 0xa6, 0x88, 0x58, 0x39,
-    0x30, 0x32, 0xf2, 0xec, 0xa4, 0x60, 0xf9, 0x19, 0x1b, 0x6b, 0x0a, 0x28, 0x60, 0x55, 0xd4, 0x1c, 0x94, 0x17, 0x9a,
-    0xd1, 0x51, 0x32, 0x94, 0xc1, 0x50, 0x3d, 0x93, 0xcd, 0x32, 0x49, 0xcc, 0x5a, 0xc3, 0xd1, 0x5c, 0xc0, 0x11, 0x4a,
-    0x85, 0xe4, 0x04, 0x45, 0xa8, 0x56, 0x38, 0x05, 0x2e, 0x04, 0x52, 0xc1, 0x3c, 0xe6, 0x4a, 0x92, 0x3d, 0x5b, 0x90,
-    0x48, 0x28, 0xa0, 0x23, 0x1c, 0x64, 0x82, 0xb4, 0x70, 0xe1, 0x54, 0x01, 0x97, 0x97, 0xe0, 0x0a, 0x2e, 0xa2, 0xd4,
-    0x1c, 0x24, 0x80, 0xf0, 0x1b, 0x21, 0x0b, 0x7d, 0x6c, 0x41, 0x64, 0xe0, 0xeb, 0x9d, 0x07, 0xc4, 0xca, 0x75, 0x57,
-    0x0b, 0xf1, 0xae, 0x01, 0x1b, 0x27, 0x46, 0x7a, 0xf2, 0x36, 0xb8, 0x9f, 0x66, 0xfb, 0xa3, 0x11, 0x2b, 0x8a, 0x2c,
-    0xdf, 0xda, 0xda, 0xa0, 0xf6, 0xd7, 0x29, 0x5a, 0x80, 0x49, 0x57, 0xf3, 0x3a, 0xbb, 0x20, 0x09, 0x6e, 0x8a, 0x15,
-    0x25, 0xd3, 0x03, 0xfb, 0xe3, 0x47, 0xe0, 0xd9, 0x9e, 0x44, 0x03, 0x60, 0x7d, 0x55, 0xf1, 0x13, 0xfa, 0x4c, 0x1d,
-    0x33, 0x6b, 0xf5, 0x4b, 0xa7, 0x0e, 0x92, 0x07, 0xc3, 0xba, 0xa5, 0xb1, 0xa1, 0x6b, 0x87, 0xc6, 0xdd, 0x90, 0x02,
-    0x72, 0x79, 0x4a, 0x22, 0xdb, 0xd8, 0x46, 0xd0, 0xda, 0x4a, 0x8f, 0x50, 0xaf, 0x56, 0x93, 0x13, 0xa0, 0x47, 0x6c,
-    0xd8, 0x93, 0xf5, 0x61, 0x21, 0x30, 0x97, 0xb3, 0x5f, 0x17, 0xac, 0xe0, 0x82, 0x74, 0x61, 0xdc, 0x1c, 0xc6, 0x2d,
-    0x57, 0xb4, 0xc3, 0x9a, 0xee, 0xb8, 0x0e, 0xb6, 0x37, 0x73, 0x94, 0x63, 0x05, 0x52, 0xf2, 0xcd, 0xe4, 0x84, 0xb0,
-    0x32, 0xf7, 0xea, 0xea, 0x1b, 0x35, 0x48, 0xb5, 0x95, 0x5a, 0x07, 0x6a, 0xec, 0x89, 0xad, 0x9a, 0x8c, 0x6d, 0x57,
-    0x0a, 0xd4, 0x8d, 0x4e, 0xaf, 0x46, 0x07, 0x70, 0xe6, 0xda, 0x9a, 0xa4, 0x2b, 0x65, 0xfb, 0xad, 0xc2, 0xe9, 0x1b,
-    0x31, 0x32, 0x69, 0xa3, 0xec, 0x76, 0xea, 0x51, 0x27, 0x1e, 0xda, 0xae, 0xd4, 0x55, 0x8c, 0x61, 0x51, 0x67, 0x0c,
-    0x4d, 0xa8, 0xe7, 0xba, 0x8b, 0xad, 0x89, 0x8a, 0x85, 0x6a, 0xaf, 0x95, 0x01, 0xc1, 0xc3, 0x23, 0x50, 0x4e, 0xd6,
-    0xda, 0x07, 0xaf, 0xa3, 0x19, 0x43, 0x8c, 0x7a, 0xd7, 0x35, 0x90, 0x06, 0x04, 0x34, 0x19, 0x36, 0xc5, 0x1b, 0x77,
-    0x85, 0xd6, 0x54, 0x3f, 0x5f, 0x31, 0x68, 0x11, 0xa0, 0x5f, 0x97, 0x6b, 0xb6, 0x88, 0xe4, 0xa6, 0x24, 0x67, 0x85,
-    0x1f, 0x51, 0x26, 0xf6, 0x84, 0x04, 0x3c, 0x2c, 0x1e, 0xb6, 0xbf, 0xb1, 0x71, 0xb2, 0x15, 0x53, 0x6b, 0xe4, 0xc8,
-    0x53, 0x00, 0xcf, 0x24, 0x04, 0x80, 0x5d, 0xd2, 0xcf, 0xda, 0xc1, 0x42, 0xb4, 0x1d, 0x20, 0x1d, 0xf8, 0x93, 0x24,
-    0xe2, 0x4e, 0x67, 0xa7, 0xed, 0x02, 0x1d, 0x02, 0x13, 0x07, 0x19, 0x01, 0xea, 0x7d, 0xb5, 0x14, 0x86, 0x4b, 0x89,
-    0x5d, 0xee, 0x83, 0x52, 0x34, 0x8d, 0x27, 0xdc, 0xc9, 0x50, 0x88, 0xb8, 0x25, 0x4b, 0x40, 0xc8, 0xe8, 0x73, 0x05,
-    0x5c, 0x82, 0x0b, 0xee, 0x22, 0xaa, 0x35, 0x43, 0x53, 0x90, 0x12, 0x97, 0x22, 0x29, 0xa8, 0x20, 0x30, 0x98, 0x4a,
-    0x4f, 0x51, 0x14, 0xc8, 0xb7, 0x78, 0x20, 0x06, 0x0d, 0x56, 0x34, 0xca, 0x78, 0x10, 0xaf, 0x16, 0x82, 0x18, 0xf6,
-    0x79, 0xf6, 0x32, 0x3b, 0x67, 0xf9, 0x93, 0x08, 0x61, 0x0f, 0x44, 0xf7, 0x12, 0x38, 0x3d, 0x31, 0x74, 0xd6, 0x53,
-    0xb4, 0x72, 0x46, 0x8b, 0x86, 0x8d, 0x98, 0xc5, 0x28, 0x08, 0x41, 0xca, 0x11, 0xee, 0x53, 0x3c, 0x52, 0x74, 0xf6,
-    0x50, 0x94, 0x30, 0x4d, 0x5b, 0xfb, 0x2f, 0xeb, 0xb4, 0x05, 0x23, 0xcc, 0x15, 0xb5, 0xd6, 0x4f, 0xac, 0xeb, 0x49,
-    0xd9, 0xec, 0x48, 0xda, 0x32, 0x84, 0x19, 0xc8, 0x8f, 0xab, 0xab, 0x4a, 0x49, 0x07, 0x61, 0xaa, 0xb9, 0x39, 0x6a,
-    0x4e, 0xe2, 0x48, 0xb8, 0x25, 0x08, 0x23, 0x54, 0xbc, 0xf2, 0x2c, 0x49, 0x0c, 0x59, 0xe4, 0xc5, 0x3d, 0xa7, 0x21,
-    0x8e, 0x00, 0x8a, 0x59, 0x4d, 0x22, 0x0d, 0x78, 0xa0, 0x2b, 0x50, 0x28, 0x29, 0x69, 0xe4, 0x55, 0x4d, 0x04, 0xc4,
-    0xe9, 0x98, 0xe5, 0xc2, 0x40, 0x93, 0x32, 0x14, 0x26, 0x4c, 0x81, 0xa0, 0xd9, 0x18, 0x38, 0xbc, 0x5a, 0x00, 0xa8,
-    0x27, 0xfe, 0x34, 0x2b, 0xb8, 0xae, 0x33, 0xa1, 0x8f, 0xaf, 0xae, 0x62, 0x61, 0x2f, 0x22, 0x01, 0xe4, 0x6c, 0x96,
-    0x9d, 0xb1, 0x35, 0x50, 0xf7, 0xd4, 0x60, 0x26, 0xc8, 0xc6, 0x30, 0x20, 0x44, 0x41, 0xb4, 0xcc, 0x93, 0x78, 0xc4,
-    0xb4, 0x94, 0x9a, 0xf9, 0xa0, 0xd0, 0xb1, 0x0b, 0xe0, 0x11, 0xcc, 0xed, 0xf7, 0xfb, 0x6d, 0xaf, 0xe3, 0x96, 0x02,
-    0xe1, 0xcb, 0x15, 0x8c, 0xde, 0x20, 0x1f, 0xa5, 0x0a, 0xbe, 0x8e, 0x17, 0x70, 0xd7, 0x10, 0x8a, 0x5c, 0xd8, 0x49,
-    0x9e, 0x64, 0xc4, 0xae, 0x37, 0x86, 0x41, 0x39, 0x53, 0x8c, 0x1b, 0x55, 0x5c, 0x71, 0x6c, 0xdf, 0x69, 0xb4, 0x69,
-    0x72, 0x52, 0x27, 0x4c, 0x6d, 0x8c, 0xdc, 0xf3, 0x42, 0x5b, 0xc0, 0xe6, 0xf6, 0xa0, 0x96, 0x48, 0xd5, 0x40, 0xeb,
-    0x00, 0xa1, 0xb0, 0x74, 0x9d, 0x95, 0x25, 0x55, 0x9d, 0x25, 0x13, 0xd7, 0x07, 0xe8, 0x0d, 0x93, 0x60, 0xae, 0x43,
-    0xc1, 0x81, 0x64, 0x08, 0x1c, 0x2d, 0x32, 0xb1, 0x5f, 0x4f, 0x60, 0x7b, 0x4e, 0xa2, 0xd1, 0x27, 0x0d, 0x6e, 0x85,
-    0xf6, 0x26, 0x19, 0x38, 0x8d, 0x92, 0xd0, 0x60, 0x57, 0xe6, 0xba, 0x15, 0x87, 0xae, 0x1d, 0x14, 0x30, 0xc8, 0x56,
-    0xc8, 0xbe, 0xb9, 0xd1, 0x4d, 0x6a, 0x97, 0xe4, 0xa1, 0xec, 0x27, 0x4d, 0x25, 0x37, 0x90, 0x1c, 0x57, 0xdc, 0x80,
-    0x2b, 0xc2, 0x83, 0xad, 0x69, 0x40, 0x02, 0x74, 0x57, 0x8e, 0xe3, 0xe2, 0x7a, 0x14, 0xfc, 0xa9, 0x60, 0x3e, 0x35,
-    0x66, 0xba, 0x15, 0x52, 0xcd, 0xe1, 0xa4, 0x1a, 0xac, 0x41, 0x93, 0xca, 0x83, 0x62, 0x35, 0xdf, 0xa0, 0xa2, 0x42,
-    0x14, 0x7f, 0x2a, 0xaa, 0x50, 0x05, 0x43, 0x30, 0x0a, 0x2f, 0x97, 0x04, 0x97, 0xad, 0xb2, 0x16, 0xc9, 0x53, 0x63,
-    0x12, 0xa9, 0x9a, 0xe4, 0x32, 0x50, 0xb0, 0xe8, 0xb4, 0xfa, 0x52, 0x13, 0x57, 0x2c, 0x37, 0x0d, 0x35, 0x33, 0xc9,
-    0x95, 0x35, 0xe1, 0x14, 0x68, 0x77, 0x29, 0xed, 0xdd, 0x5c, 0x4f, 0xa1, 0xd6, 0x53, 0xf8, 0x86, 0x0d, 0x65, 0xd2,
-    0x76, 0x3e, 0x00, 0x75, 0xbf, 0x56, 0x89, 0xfa, 0xa9, 0x8f, 0x8c, 0xd9, 0xd5, 0x4c, 0x17, 0x18, 0x8a, 0x24, 0x93,
-    0x74, 0x20, 0xe9, 0x0d, 0xd9, 0x46, 0x65, 0x19, 0x65, 0xae, 0x38, 0x20, 0x35, 0xab, 0x34, 0xf3, 0x52, 0xb7, 0xa1,
-    0xbf, 0x97, 0xa5, 0xc4, 0x13, 0x17, 0x98, 0x89, 0xbd, 0x9b, 0x70, 0xe3, 0xa5, 0x61, 0x26, 0xb4, 0x5f, 0xa1, 0xec,
-    0xd4, 0x30, 0x94, 0x4a, 0x16, 0x88, 0x63, 0xe3, 0x6b, 0xa5, 0x19, 0x64, 0xfe, 0x1a, 0x7d, 0x0a, 0x40, 0x49, 0x60,
-    0xf3, 0x35, 0x96, 0xbc, 0x28, 0xac, 0xe3, 0x71, 0x83, 0xf0, 0x58, 0xb1, 0xd0, 0x1a, 0xcb, 0xd7, 0xf2, 0x2c, 0xf6,
-    0x6b, 0x26, 0xa1, 0x89, 0xc9, 0x62, 0x50, 0x04, 0xb6, 0x72, 0x44, 0x54, 0xb2, 0x2d, 0x19, 0x24, 0x64, 0x90, 0xae,
-    0x22, 0xbd, 0x36, 0x92, 0x81, 0xeb, 0x54, 0x70, 0xb4, 0x74, 0x18, 0x46, 0x0e, 0x1a, 0xee, 0xb4, 0x17, 0x2b, 0x88,
-    0x6c, 0xea, 0x9b, 0x44, 0x8a, 0x68, 0x9c, 0x16, 0xa8, 0xc2, 0x99, 0x32, 0xdd, 0x71, 0x60, 0x39, 0xc0, 0xf6, 0x57,
-    0x48, 0x6f, 0xad, 0xda, 0xe9, 0xfa, 0x95, 0xc1, 0x77, 0x75, 0x95, 0x20, 0x3d, 0x08, 0x85, 0x17, 0xf6, 0x6c, 0xa0,
-    0x78, 0xef, 0xfe, 0x4b, 0x6c, 0x45, 0xfa, 0x67, 0x55, 0x52, 0x59, 0x0a, 0x35, 0xca, 0xad, 0xef, 0x13, 0x33, 0x5d,
-    0x8b, 0xaa, 0xe2, 0xc0, 0xe0, 0xea, 0x07, 0x4a, 0x60, 0x57, 0x4b, 0x3e, 0x90, 0x43, 0xc7, 0xae, 0xeb, 0x06, 0x05,
-    0x19, 0x2f, 0x1b, 0xeb, 0x4c, 0xc8, 0xad, 0x2d, 0xd3, 0x66, 0x3a, 0xd3, 0xc3, 0x3f, 0x71, 0x50, 0x38, 0x17, 0x97,
-    0x29, 0x69, 0x30, 0x4f, 0x94, 0x38, 0x5a, 0x31, 0x40, 0xdb, 0x3d, 0xb4, 0xb4, 0xa3, 0xf3, 0x28, 0xe6, 0x96, 0x1e,
-    0x45, 0x58, 0xda, 0xc8, 0x9f, 0xa4, 0xd2, 0x01, 0xeb, 0x42, 0x15, 0x92, 0x8c, 0x70, 0x53, 0x17, 0x2d, 0x46, 0x53,
-    0x86, 0x2e, 0x70, 0xa5, 0x4f, 0x98, 0xbc, 0x67, 0x03, 0xd7, 0x2d, 0x06, 0x66, 0xeb, 0x61, 0x2f, 0x9b, 0xdd, 0x6b,
-    0xea, 0x3f, 0xec, 0x11, 0xf0, 0xb6, 0x99, 0xaa, 0x2b, 0x1b, 0xef, 0x92, 0x45, 0xa2, 0x87, 0x6d, 0xdd, 0xd8, 0x52,
-    0xd7, 0xef, 0x35, 0xcc, 0xeb, 0xca, 0x30, 0xaf, 0x09, 0xd5, 0x86, 0x1c, 0x56, 0x66, 0x0e, 0x33, 0x0d, 0x79, 0xb1,
-    0x83, 0x6e, 0x4f, 0x38, 0x85, 0xc0, 0x88, 0xd0, 0xfa, 0xa0, 0xa2, 0x06, 0x42, 0x25, 0x57, 0x52, 0x35, 0x5b, 0x24,
-    0x63, 0x09, 0x2c, 0x98, 0xb0, 0x5c, 0xd2, 0xd1, 0x79, 0x9c, 0x24, 0x55, 0xe9, 0x9f, 0xca, 0xe0, 0xc5, 0xb0, 0xb7,
-    0xb1, 0x76, 0xb1, 0xa2, 0x85, 0x02, 0xc1, 0xd5, 0x4a, 0xd8, 0x7b, 0xc7, 0xad, 0xf6, 0x5d, 0x78, 0x1c, 0xb9, 0xe9,
-    0x8d, 0x80, 0x7a, 0xf4, 0xb0, 0x6a, 0xd2, 0xde, 0x7f, 0x86, 0x2e, 0x35, 0x63, 0x3d, 0x28, 0xce, 0xa8, 0xf8, 0x77,
-    0xe9, 0x53, 0xbf, 0x73, 0x79, 0xb7, 0x8a, 0xae, 0xa6, 0x43, 0x45, 0x39, 0x3e, 0x4c, 0x17, 0x4b, 0x5b, 0x39, 0x02,
-    0x72, 0x3d, 0x2c, 0x72, 0x01, 0x13, 0x35, 0x58, 0x50, 0x8a, 0x55, 0x6b, 0x61, 0xf7, 0xf2, 0x36, 0x67, 0x0e, 0xb9,
-    0xc2, 0x45, 0xff, 0x27, 0xd9, 0x6c, 0x8e, 0x9a, 0x59, 0x83, 0xa8, 0xa1, 0xc1, 0xfb, 0x46, 0x7d, 0xb9, 0xa6, 0xac,
-    0xd6, 0x87, 0x4e, 0x64, 0x8d, 0x9e, 0xb4, 0xa1, 0x0c, 0x06, 0xd5, 0x42, 0x17, 0xd5, 0xf5, 0xe6, 0x26, 0x8b, 0x59,
-    0x47, 0xe3, 0x3e, 0xc9, 0x6d, 0xad, 0x4d, 0x7a, 0x1a, 0x07, 0xc4, 0x93, 0x24, 0xc1, 0x9b, 0x04, 0x50, 0x56, 0xc8,
-    0x59, 0x96, 0x0d, 0xf4, 0x2d, 0xcb, 0x12, 0xf7, 0xef, 0xdb, 0xde, 0x7e, 0xcd, 0xb2, 0xf6, 0xf6, 0xaf, 0x37, 0x91,
-    0xab, 0x3a, 0x69, 0x41, 0x1e, 0x0d, 0xa1, 0x68, 0x45, 0xa7, 0x0c, 0x97, 0xb3, 0x6c, 0xcc, 0x02, 0x1b, 0xba, 0xa7,
-    0x76, 0xa9, 0xa4, 0x32, 0x1c, 0x8e, 0x94, 0x39, 0xcb, 0x77, 0x75, 0x4f, 0x6a, 0xb0, 0x0f, 0x24, 0xa0, 0xd5, 0x85,
-    0xef, 0xc2, 0xd3, 0x24, 0x3b, 0x89, 0x92, 0x43, 0x21, 0xc0, 0x6b, 0x2d, 0x3f, 0x80, 0xc9, 0x48, 0x1a, 0xab, 0x21,
-    0xa4, 0xbe, 0x1b, 0x7c, 0x17, 0xdc, 0xde, 0xa3, 0xb2, 0x56, 0xec, 0x8e, 0xdf, 0xf6, 0x3b, 0xb6, 0xf2, 0x88, 0xbd,
-    0x34, 0xa7, 0x03, 0x89, 0x53, 0x00, 0x66, 0x0e, 0x41, 0x92, 0x15, 0x5e, 0xc4, 0xc2, 0x97, 0x83, 0x97, 0xca, 0xa4,
-    0xce, 0xc0, 0x84, 0x00, 0x23, 0x3f, 0x89, 0x79, 0x0b, 0xe3, 0x91, 0xb6, 0xb7, 0x14, 0x15, 0xe8, 0x57, 0x24, 0xbf,
-    0x74, 0xa9, 0xac, 0x41, 0xef, 0x63, 0x78, 0x0c, 0xcd, 0x36, 0x37, 0x97, 0xce, 0xab, 0x88, 0x4f, 0xfd, 0x3c, 0x4a,
-    0xc7, 0xd9, 0xcc, 0x71, 0xb7, 0x6d, 0xdb, 0xf5, 0x0b, 0xb2, 0x44, 0xbe, 0x70, 0xcb, 0xcd, 0x63, 0x6f, 0xca, 0x42,
-    0x7b, 0x60, 0x6f, 0x7f, 0xf4, 0xde, 0xb2, 0xf0, 0x78, 0x6f, 0x73, 0x39, 0x65, 0x65, 0xff, 0xd8, 0xbb, 0xd0, 0x3e,
-    0x77, 0xef, 0x2d, 0x72, 0x19, 0xe8, 0x15, 0xf6, 0x2f, 0x24, 0x18, 0x40, 0x6e, 0xe4, 0x7f, 0x07, 0x2e, 0xf7, 0x9e,
-    0x02, 0x22, 0xd2, 0x4f, 0x7b, 0x75, 0x65, 0x67, 0xe4, 0x31, 0xb0, 0x37, 0xb4, 0xb1, 0xba, 0xb5, 0x55, 0x89, 0xf9,
-    0xaa, 0xd4, 0x1b, 0xb1, 0xb0, 0x66, 0xa9, 0x7b, 0xef, 0x29, 0xb4, 0x52, 0x3f, 0xc8, 0x23, 0x46, 0x42, 0x73, 0x55,
-    0x4f, 0x70, 0x8c, 0x23, 0xbe, 0xfe, 0x58, 0x1f, 0x09, 0x2f, 0x85, 0x1f, 0x83, 0xf6, 0x12, 0x81, 0xf8, 0x06, 0x03,
-    0xc7, 0x3b, 0x0c, 0x77, 0xf6, 0x9c, 0x41, 0xe0, 0x6c, 0xb4, 0x5a, 0x57, 0x3f, 0xed, 0x1c, 0xfd, 0x1c, 0xb5, 0x7e,
-    0xdb, 0x6f, 0xfd, 0x38, 0x74, 0xaf, 0x9c, 0x9f, 0x76, 0x06, 0x47, 0xf2, 0xed, 0xe8, 0xe7, 0xfe, 0x4f, 0xc5, 0xf0,
-    0x73, 0x51, 0xb8, 0xe9, 0xba, 0x3b, 0xa7, 0x60, 0x29, 0x85, 0x3b, 0xad, 0x56, 0x1f, 0x9e, 0x16, 0xf0, 0x84, 0x3f,
-    0x2f, 0xe1, 0xc7, 0xd5, 0x91, 0xf5, 0x1f, 0x7e, 0x4a, 0xff, 0xe3, 0x4f, 0xf9, 0x10, 0xc7, 0x3c, 0xfa, 0xf9, 0xa7,
-    0xc2, 0xbe, 0xd7, 0x0f, 0x77, 0x86, 0xdb, 0xae, 0xa3, 0x6b, 0x3e, 0x0f, 0xab, 0x47, 0x68, 0x75, 0xf4, 0xb3, 0x7c,
-    0xb3, 0xef, 0x1d, 0xef, 0xf5, 0xc3, 0xe1, 0x95, 0x63, 0x5f, 0xdd, 0x73, 0xaf, 0x5c, 0xf7, 0x6a, 0x13, 0xe7, 0x99,
-    0xc3, 0xe8, 0xf7, 0xe0, 0xe7, 0x19, 0xfc, 0xb4, 0xe1, 0xe7, 0x29, 0xfc, 0xfc, 0x19, 0xba, 0x09, 0xff, 0xdb, 0x15,
-    0xf9, 0x42, 0xae, 0x30, 0x60, 0x11, 0xc1, 0x2e, 0xb8, 0x9b, 0x3b, 0xb1, 0x37, 0x21, 0xa4, 0xc1, 0x39, 0xf4, 0x7d,
-    0x1f, 0xdd, 0xa4, 0xce, 0xf2, 0xe3, 0x26, 0x6c, 0x3a, 0x52, 0xce, 0x66, 0xc0, 0x3c, 0xe1, 0x39, 0x28, 0x02, 0x2e,
-    0x62, 0xab, 0x05, 0x06, 0x57, 0xbd, 0x45, 0x38, 0x61, 0x0e, 0x28, 0x05, 0x87, 0x0c, 0x1f, 0xba, 0xae, 0xf7, 0x4c,
-    0xc6, 0x0c, 0xf1, 0x9c, 0x0b, 0xd2, 0x4a, 0x33, 0xa1, 0xd2, 0xd8, 0xae, 0x37, 0x5f, 0x53, 0x09, 0xc7, 0x3a, 0x3d,
-    0x85, 0xba, 0x4d, 0x11, 0x68, 0xfb, 0x8e, 0x45, 0x9f, 0xf0, 0x48, 0x3e, 0x37, 0x82, 0xc0, 0x2b, 0x9a, 0x7c, 0x53,
-    0x69, 0x34, 0x74, 0x44, 0x61, 0x8e, 0x7d, 0xc9, 0x60, 0x86, 0x15, 0x15, 0x91, 0x93, 0xd0, 0x14, 0x9a, 0x2d, 0x4c,
-    0xfe, 0x36, 0xca, 0xf9, 0x66, 0xa5, 0xd8, 0x86, 0x35, 0x4d, 0xb6, 0xa9, 0xe9, 0xdf, 0x61, 0x0a, 0x54, 0x2d, 0x29,
-    0xfe, 0x61, 0x8e, 0x1f, 0xa6, 0xb4, 0xac, 0xd7, 0x0e, 0x07, 0x0b, 0xbd, 0x00, 0xbe, 0x23, 0xfa, 0x39, 0x6f, 0x51,
-    0x8c, 0xc1, 0x5f, 0xe9, 0x66, 0xf0, 0xc4, 0x7c, 0xe8, 0xa2, 0x59, 0x96, 0xda, 0xb9, 0x95, 0x22, 0xbb, 0x7f, 0x81,
-    0x27, 0x23, 0x2d, 0xbd, 0x83, 0x50, 0x9d, 0x98, 0xc3, 0x9c, 0xb1, 0xef, 0xa2, 0xe4, 0x13, 0xcb, 0x9d, 0x0b, 0xaf,
-    0xd3, 0xfd, 0x82, 0x3a, 0x7b, 0xa8, 0x9b, 0xbd, 0xae, 0xc2, 0x68, 0x4a, 0x2d, 0x50, 0x21, 0xc2, 0x56, 0xc7, 0x43,
-    0x8e, 0x41, 0x28, 0xc8, 0xbd, 0x2c, 0xec, 0x12, 0x85, 0xdb, 0x7b, 0xc5, 0xd9, 0x69, 0xdf, 0x0e, 0x6c, 0x1b, 0x34,
-    0xfe, 0x43, 0x72, 0x5b, 0x09, 0xc5, 0x02, 0x14, 0xb2, 0xbd, 0xb8, 0xc7, 0xb7, 0xb7, 0x2b, 0x87, 0x13, 0x06, 0xd2,
-    0xa9, 0x7b, 0xe2, 0x45, 0xde, 0x34, 0x84, 0x01, 0x47, 0xd0, 0x0c, 0xbb, 0xf4, 0x46, 0x7b, 0xb1, 0x9c, 0x06, 0x7d,
-    0x21, 0x7e, 0x12, 0x15, 0xfc, 0x05, 0xfa, 0x23, 0xc2, 0x11, 0x2a, 0xfb, 0x3e, 0xbb, 0x60, 0x23, 0xa5, 0x67, 0x00,
-    0xa2, 0x22, 0xb7, 0xe7, 0x8e, 0x42, 0xa3, 0x19, 0xcc, 0x1d, 0x86, 0x87, 0x03, 0x1b, 0xce, 0x12, 0x9c, 0xca, 0x30,
-    0x3a, 0xea, 0x0c, 0x07, 0x69, 0x08, 0xbc, 0x56, 0xe3, 0x56, 0x16, 0x2d, 0x6a, 0x45, 0xdd, 0xe1, 0xc0, 0x39, 0x05,
-    0x25, 0x1d, 0x74, 0x71, 0x07, 0xdf, 0xd0, 0x43, 0x91, 0x87, 0xef, 0xd8, 0xe9, 0xb3, 0x8b, 0xb9, 0x63, 0xef, 0xed,
-    0xd8, 0xdb, 0x58, 0xea, 0xd9, 0x40, 0x5e, 0x30, 0x77, 0x78, 0xe9, 0x9a, 0x9d, 0x77, 0x87, 0x08, 0x2a, 0x16, 0xe2,
-    0xe4, 0x97, 0x03, 0xbb, 0x2f, 0xa6, 0x6e, 0xc3, 0xa0, 0xa9, 0xdc, 0x7e, 0xdc, 0xd1, 0x43, 0x5a, 0xaa, 0xea, 0xaa,
-    0xa0, 0x83, 0xb2, 0x6e, 0xe0, 0x4c, 0xcd, 0x45, 0xb4, 0x70, 0x32, 0x89, 0x05, 0x30, 0x78, 0xb0, 0x19, 0x4c, 0x6a,
-    0x74, 0xdb, 0x1d, 0x0e, 0x2e, 0x83, 0x7b, 0xf6, 0x3d, 0xf5, 0x72, 0xc6, 0x02, 0xb0, 0x2e, 0x68, 0xfa, 0x33, 0x94,
-    0x22, 0xf0, 0x73, 0xce, 0x60, 0x91, 0x97, 0x54, 0x34, 0x96, 0x45, 0x0b, 0x2c, 0x3a, 0x0c, 0x10, 0x54, 0x2f, 0xd7,
-    0xda, 0x9f, 0xd8, 0x93, 0x71, 0x48, 0xb0, 0x6f, 0x6d, 0xc1, 0xd6, 0x6c, 0x77, 0x86, 0x18, 0x6f, 0xc8, 0x79, 0xf1,
-    0x5d, 0xcc, 0x41, 0x24, 0xec, 0xf4, 0x6d, 0x77, 0x60, 0x5b, 0xb8, 0xb5, 0xbd, 0x6c, 0x3b, 0x14, 0x18, 0x8e, 0xb7,
-    0xdf, 0xb2, 0x60, 0xda, 0x0f, 0xdb, 0x03, 0xa7, 0x10, 0xa2, 0x23, 0xc1, 0xb8, 0xa5, 0xe0, 0xe0, 0x6d, 0x6f, 0x0a,
-    0x0c, 0x1d, 0x29, 0x77, 0xd3, 0xde, 0x56, 0x85, 0x50, 0xf4, 0x71, 0x7b, 0xec, 0x06, 0x31, 0xfc, 0x70, 0x5a, 0x48,
-    0x34, 0x53, 0xdd, 0x57, 0x4b, 0x66, 0x37, 0x18, 0x2b, 0x8d, 0x3c, 0x09, 0xb3, 0x6d, 0x07, 0x3d, 0xb4, 0xc0, 0x69,
-    0xf7, 0x06, 0x00, 0xc3, 0xb6, 0xa3, 0x28, 0x6d, 0x47, 0x91, 0x9a, 0xd2, 0xcf, 0x8f, 0xaa, 0xed, 0x60, 0x83, 0x88,
-    0xf9, 0x95, 0xf4, 0x01, 0xb0, 0x82, 0xc4, 0x2b, 0x86, 0x2a, 0xe6, 0xf5, 0xbc, 0x16, 0xdf, 0x5a, 0x2a, 0x56, 0xc4,
-    0x3c, 0x83, 0x43, 0xf1, 0x52, 0x9b, 0x61, 0x42, 0xdd, 0x9e, 0x23, 0x32, 0x34, 0xc9, 0x87, 0x6d, 0x20, 0x7a, 0xe5,
-    0x60, 0x4f, 0xcd, 0x63, 0x91, 0x84, 0x55, 0x73, 0xef, 0x08, 0x48, 0x7b, 0x18, 0xbe, 0x16, 0x11, 0xc7, 0x9e, 0xf2,
-    0xe6, 0xb3, 0x24, 0x7c, 0xde, 0x08, 0x17, 0x47, 0x18, 0x11, 0x3a, 0xf0, 0x47, 0x8b, 0x1c, 0xf8, 0x01, 0x7f, 0x0d,
-    0x9a, 0x41, 0x28, 0x9b, 0xa2, 0xa1, 0x87, 0x21, 0x60, 0x8f, 0x16, 0xde, 0x70, 0x9b, 0x1b, 0xd5, 0xa8, 0x51, 0x92,
-    0xf2, 0x42, 0x81, 0xe1, 0x1e, 0x97, 0xa6, 0x3d, 0x32, 0x06, 0x19, 0x31, 0x76, 0x30, 0xe6, 0xef, 0x8f, 0xb0, 0x1a,
-    0x27, 0x28, 0xdc, 0x92, 0x4e, 0x5b, 0xc5, 0xfe, 0x0e, 0xfc, 0x14, 0x38, 0x38, 0xd6, 0x81, 0x9d, 0xb5, 0xb5, 0x95,
-    0xc8, 0x45, 0xed, 0xa5, 0x3d, 0x8a, 0x44, 0xa0, 0x3f, 0xb8, 0xf0, 0x53, 0xa8, 0x46, 0x14, 0x51, 0x11, 0x69, 0xa0,
-    0x66, 0x54, 0xad, 0x82, 0xef, 0xc8, 0xf4, 0xc0, 0x73, 0x74, 0x5b, 0x93, 0xa2, 0xa8, 0x1b, 0x0b, 0x5f, 0xbe, 0xeb,
-    0x52, 0x68, 0x0b, 0x03, 0x90, 0x82, 0xd0, 0x04, 0xc1, 0xb8, 0xe4, 0x94, 0xac, 0xe8, 0xef, 0xa3, 0xe1, 0x2b, 0x9f,
-    0x1e, 0x65, 0xdb, 0xdb, 0x43, 0x11, 0xb7, 0x20, 0xc2, 0xe1, 0x86, 0x77, 0x35, 0xae, 0x00, 0xa8, 0x4f, 0xe7, 0xc4,
-    0x75, 0xc7, 0xb4, 0x22, 0x4d, 0x97, 0x7c, 0x9f, 0x1c, 0x66, 0x00, 0x0c, 0xee, 0x38, 0x47, 0xfe, 0xe0, 0x2f, 0x43,
-    0x30, 0x8f, 0xfd, 0xcf, 0xdd, 0x1d, 0xc5, 0x68, 0x7a, 0x32, 0xa6, 0xb8, 0xa4, 0x18, 0x6b, 0xc7, 0x23, 0xdf, 0x68,
-    0x90, 0x7b, 0x29, 0xac, 0x00, 0xa4, 0x39, 0xf0, 0x84, 0x8a, 0x82, 0x90, 0xa2, 0x02, 0xdb, 0xc7, 0xc3, 0xcf, 0xf1,
-    0x64, 0xbf, 0x03, 0x0d, 0x6f, 0xa0, 0xdf, 0x9e, 0xc2, 0xdb, 0x5f, 0xf4, 0xdb, 0x97, 0x2c, 0xf8, 0xa5, 0x94, 0xae,
-    0xfb, 0xda, 0x14, 0x0f, 0xd5, 0x14, 0xa5, 0xd8, 0x22, 0x03, 0x87, 0xcc, 0x5d, 0xf5, 0xd9, 0x70, 0xb7, 0x04, 0x64,
-    0x28, 0xd6, 0x05, 0x3a, 0x5a, 0x74, 0x8a, 0xc8, 0x75, 0x4d, 0x54, 0x18, 0xb9, 0x04, 0xe6, 0x82, 0x2b, 0xba, 0x25,
-    0xe2, 0xec, 0xb7, 0xdd, 0x65, 0xad, 0x2d, 0xe9, 0x77, 0x6c, 0x36, 0xe7, 0x97, 0x07, 0x24, 0xe8, 0x03, 0x99, 0x36,
-    0x20, 0x62, 0xe7, 0xed, 0x5e, 0xbc, 0xc7, 0x7b, 0x31, 0x70, 0xf5, 0x42, 0x91, 0x18, 0x9e, 0x55, 0xef, 0x2d, 0x7a,
-    0x29, 0x4d, 0x62, 0xf2, 0x6a, 0xcb, 0xeb, 0xca, 0xe5, 0x6d, 0x6f, 0xc3, 0x02, 0x7b, 0x46, 0x57, 0x2e, 0xba, 0x96,
-    0xa5, 0xc0, 0x09, 0x40, 0xf4, 0xb8, 0x4e, 0x72, 0x44, 0x71, 0x98, 0xcd, 0x86, 0x8c, 0x83, 0xb9, 0x6b, 0x47, 0xc5,
-    0x31, 0xb1, 0xbb, 0x4c, 0xd8, 0x81, 0x95, 0x11, 0x95, 0xb7, 0x3a, 0xc2, 0x3b, 0x2c, 0xfa, 0x6b, 0xff, 0xf6, 0x47,
-    0x8f, 0x6d, 0x77, 0x5c, 0x90, 0x20, 0xb5, 0xb1, 0x1e, 0x55, 0x63, 0x41, 0x7d, 0xf8, 0x51, 0x63, 0xa9, 0xcc, 0xb7,
-    0xb7, 0xcb, 0x7a, 0xa8, 0x56, 0x9d, 0xe0, 0x5a, 0x34, 0xe5, 0xa2, 0x99, 0x0d, 0xc2, 0x01, 0x89, 0x09, 0x14, 0x68,
-    0x6e, 0x65, 0xc5, 0x00, 0x43, 0xca, 0x72, 0xe4, 0x4f, 0x21, 0xf3, 0xe2, 0xb2, 0xd4, 0xa9, 0x2f, 0xd2, 0x1f, 0x19,
-    0x62, 0xd4, 0x93, 0x94, 0x15, 0x10, 0xb0, 0x5e, 0xea, 0x25, 0xb4, 0x45, 0xb0, 0xf2, 0x67, 0x2a, 0x87, 0x46, 0x68,
-    0x20, 0x51, 0x68, 0xa8, 0x25, 0x4a, 0xf9, 0xcc, 0xc3, 0x18, 0xa4, 0xfd, 0x93, 0x9a, 0xef, 0x2b, 0x57, 0x4a, 0x47,
-    0x7e, 0x54, 0x0c, 0x03, 0xaa, 0x5f, 0x48, 0x0e, 0x36, 0x0d, 0xdf, 0x03, 0x19, 0x55, 0x86, 0x27, 0x31, 0xc2, 0xa7,
-    0x71, 0xce, 0xc8, 0x52, 0xd8, 0x94, 0x30, 0x4b, 0xd5, 0x36, 0x52, 0xed, 0x22, 0xd3, 0x09, 0xe5, 0xc2, 0xfc, 0x53,
-    0x23, 0x76, 0x91, 0x85, 0x2b, 0xad, 0x41, 0xfd, 0x78, 0x63, 0x02, 0x94, 0x5d, 0x5d, 0x65, 0xc2, 0xc6, 0x8d, 0x48,
-    0xdf, 0xd0, 0x15, 0xd3, 0x81, 0x5a, 0x54, 0xe0, 0x44, 0xa4, 0xf1, 0x50, 0x0c, 0x85, 0x46, 0x38, 0xa4, 0x28, 0x72,
-    0xe1, 0x1a, 0x87, 0xbe, 0x18, 0x68, 0xdb, 0x28, 0x0d, 0x9d, 0x04, 0x98, 0x80, 0x58, 0xbb, 0xa1, 0x4d, 0xa5, 0x83,
-    0x34, 0x48, 0xa8, 0x14, 0xed, 0x1c, 0x58, 0x7f, 0x18, 0x49, 0x0c, 0x80, 0xfe, 0x50, 0x8d, 0x14, 0x51, 0x96, 0x05,
-    0x6e, 0x00, 0xcd, 0x75, 0x80, 0x3b, 0xe1, 0x0b, 0x05, 0x15, 0xa6, 0xa7, 0x59, 0x79, 0x29, 0x84, 0xc8, 0xab, 0x35,
-    0x29, 0x6b, 0xc4, 0x93, 0xcf, 0xd0, 0xe0, 0x53, 0xd6, 0xf5, 0x6b, 0xb9, 0x0e, 0x5d, 0xf0, 0x14, 0xb6, 0x55, 0x3d,
-    0xbf, 0x0a, 0x39, 0x19, 0xd7, 0x20, 0x2b, 0x24, 0xd3, 0x5f, 0x31, 0x92, 0xf7, 0x5f, 0xf9, 0x55, 0x2d, 0x35, 0x86,
-    0xb2, 0xf7, 0xeb, 0x9a, 0x61, 0x79, 0x39, 0xaf, 0xdc, 0x14, 0x04, 0xdc, 0x92, 0x25, 0xc1, 0x52, 0x4a, 0x08, 0xd0,
-    0xb0, 0x3d, 0x92, 0x4a, 0x41, 0x51, 0x6a, 0xf7, 0xce, 0x53, 0xd0, 0x02, 0x8c, 0xa0, 0x96, 0x4a, 0xa6, 0x91, 0xc8,
-    0x97, 0x42, 0x14, 0x88, 0xf2, 0x60, 0x04, 0x76, 0x6a, 0x33, 0xd2, 0x75, 0xe1, 0xfa, 0xf1, 0x0c, 0x53, 0x7b, 0x08,
-    0xf4, 0xd8, 0xdb, 0x00, 0x55, 0xa2, 0x2e, 0xc3, 0x72, 0xa2, 0xd0, 0xac, 0x26, 0x59, 0x40, 0x8d, 0x69, 0x83, 0x94,
-    0x6c, 0x83, 0x2e, 0x57, 0x80, 0x7e, 0x24, 0x8e, 0x67, 0xb5, 0x03, 0x42, 0xd6, 0xa0, 0x82, 0x21, 0x4f, 0xa9, 0x90,
-    0xc2, 0xbc, 0xd7, 0xa5, 0x22, 0x3c, 0x9f, 0x03, 0x2e, 0xb5, 0xe0, 0xcc, 0xcb, 0x68, 0xe0, 0x83, 0xf8, 0x24, 0xc1,
-    0xc4, 0x17, 0x5c, 0x15, 0xe8, 0xc1, 0x41, 0xa7, 0xd9, 0x14, 0x28, 0x15, 0x37, 0x29, 0x83, 0x6d, 0x45, 0xae, 0x0d,
-    0x3f, 0x24, 0xcb, 0xd6, 0x5d, 0x1e, 0xea, 0x2e, 0x44, 0x02, 0xd8, 0xe9, 0x25, 0x7a, 0xbe, 0x65, 0xbd, 0x74, 0x18,
-    0x9c, 0x69, 0x89, 0x83, 0xc0, 0x6f, 0x6f, 0x27, 0xc3, 0x32, 0x25, 0xb2, 0x6b, 0x92, 0xba, 0x80, 0x1c, 0x86, 0x6a,
-    0xae, 0x1d, 0x98, 0xa5, 0xd2, 0xc7, 0xf3, 0x72, 0x86, 0xdb, 0xa5, 0x34, 0xe4, 0x66, 0xbc, 0x9a, 0xe6, 0x73, 0x2b,
-    0xc9, 0xa6, 0xfd, 0xad, 0xf8, 0xa2, 0xe0, 0x1f, 0x38, 0xb1, 0xd4, 0xea, 0x29, 0xb5, 0xc2, 0xa3, 0xcc, 0x2d, 0x59,
-    0xa7, 0xb8, 0x56, 0xd7, 0x0d, 0x54, 0x23, 0x8c, 0xa6, 0x61, 0x23, 0x60, 0x62, 0x82, 0x8a, 0x5f, 0x37, 0x89, 0x98,
-    0xce, 0x96, 0xe0, 0x3a, 0x42, 0xef, 0xa1, 0x9c, 0xe0, 0xae, 0xa6, 0xd9, 0xe7, 0xe1, 0xfc, 0x7a, 0xe2, 0xde, 0x37,
-    0x88, 0xfb, 0xcb, 0x90, 0x1b, 0x84, 0x1e, 0xcb, 0x84, 0x1f, 0xe9, 0xfb, 0x28, 0x54, 0xd5, 0x93, 0xd3, 0xb0, 0x62,
-    0x59, 0xe2, 0xc9, 0x08, 0x75, 0x18, 0x51, 0xd1, 0x1a, 0x23, 0xbb, 0xba, 0xca, 0xcd, 0xb3, 0x40, 0x4e, 0x53, 0x8f,
-    0xd7, 0xfd, 0xb4, 0x15, 0x39, 0x1b, 0x9e, 0xc8, 0xfd, 0x57, 0x35, 0x4f, 0x64, 0x45, 0xe7, 0x38, 0xd2, 0x35, 0x81,
-    0xdc, 0x27, 0xa7, 0xab, 0x87, 0x54, 0xc8, 0x16, 0xbd, 0x6c, 0xe3, 0x8c, 0xea, 0x80, 0xa4, 0x9e, 0x51, 0x81, 0x55,
-    0x8d, 0xbd, 0xb5, 0xd5, 0x11, 0xe9, 0x96, 0x4a, 0xb0, 0xc1, 0xd6, 0xc2, 0x68, 0xc6, 0x28, 0xe8, 0x94, 0x14, 0x19,
-    0xa8, 0x51, 0x7e, 0x0d, 0x63, 0xd8, 0xa7, 0x06, 0x20, 0x38, 0xd7, 0x57, 0x7f, 0x59, 0x4a, 0xb2, 0x10, 0x90, 0xb8,
-    0x4b, 0x06, 0x6c, 0x4d, 0x10, 0x33, 0xd2, 0xc9, 0x7b, 0xa0, 0xbc, 0x01, 0x43, 0x1b, 0x01, 0xec, 0x02, 0x71, 0xe8,
-    0x41, 0xc5, 0xb6, 0x09, 0x29, 0x3a, 0x36, 0xf0, 0x1c, 0x80, 0x9d, 0x57, 0xae, 0xd1, 0x77, 0x55, 0x0a, 0x18, 0x92,
-    0x81, 0x1b, 0xb0, 0xca, 0x2d, 0xb7, 0xff, 0x1c, 0xcc, 0x06, 0x78, 0x7d, 0x26, 0x9b, 0x6f, 0x62, 0x9e, 0x60, 0x15,
-    0xbb, 0xf0, 0x2b, 0xcd, 0x5a, 0xc4, 0x9d, 0x0e, 0x1b, 0xf5, 0x0a, 0x13, 0xa2, 0xf6, 0x00, 0x6b, 0xdf, 0xa3, 0x87,
-    0x45, 0xbc, 0xbf, 0xc2, 0x77, 0x3d, 0x6e, 0xb9, 0xaf, 0x97, 0x45, 0x2b, 0x5d, 0x45, 0x8d, 0x81, 0xc9, 0xba, 0x9d,
-    0x8c, 0x6b, 0x2f, 0x0f, 0x84, 0x2f, 0xb8, 0x5a, 0x23, 0xab, 0x5c, 0x8a, 0x8d, 0x45, 0xd2, 0xd3, 0x3e, 0x05, 0xd8,
-    0x37, 0x9b, 0xbd, 0x00, 0x33, 0xef, 0x2b, 0x54, 0x49, 0x48, 0x69, 0x76, 0x83, 0x25, 0x09, 0x6d, 0x45, 0x46, 0x9d,
-    0x0f, 0x1c, 0x6d, 0x73, 0x2b, 0x8e, 0x60, 0x38, 0x27, 0x61, 0x3a, 0x56, 0x1e, 0x36, 0x19, 0xb8, 0xf2, 0x8e, 0x98,
-    0xb6, 0x09, 0xf0, 0x6f, 0x06, 0x7c, 0x7b, 0x25, 0xb9, 0xb6, 0xd0, 0x30, 0x3c, 0x41, 0x84, 0x55, 0x9e, 0x08, 0x34,
-    0x14, 0x60, 0x8d, 0x6b, 0x2d, 0x0f, 0x50, 0xe1, 0x6b, 0x67, 0x13, 0x00, 0x12, 0x59, 0x41, 0xce, 0x8a, 0xa3, 0x1b,
-    0x56, 0xb9, 0xde, 0x4f, 0x8d, 0x82, 0xc4, 0xc5, 0x83, 0xe9, 0xea, 0x96, 0xfe, 0x0c, 0x35, 0x67, 0x52, 0xc4, 0xb4,
-    0x13, 0x04, 0xfd, 0xa3, 0xcc, 0xc9, 0x69, 0x3a, 0xa1, 0x7d, 0xce, 0x9d, 0xda, 0xd4, 0x3d, 0x46, 0xdd, 0x3c, 0x89,
-    0x2d, 0x5e, 0xc7, 0x4d, 0x29, 0x17, 0x26, 0x39, 0xe6, 0xa6, 0x48, 0xc5, 0x66, 0x8a, 0xdd, 0xb9, 0xf5, 0x83, 0x16,
-    0xd2, 0x41, 0xdb, 0x14, 0x39, 0xd8, 0xac, 0xe2, 0xf7, 0x04, 0xc6, 0x73, 0x81, 0xf8, 0xf2, 0x15, 0x25, 0xe9, 0x30,
-    0xc7, 0x5c, 0x60, 0xf5, 0x62, 0x0a, 0xf2, 0x77, 0x8e, 0x4e, 0xb3, 0x37, 0xf0, 0x41, 0xe2, 0x0d, 0x38, 0x66, 0x8d,
-    0x7d, 0xe7, 0x52, 0x51, 0x47, 0x08, 0x54, 0x46, 0xb5, 0x4c, 0xc7, 0x89, 0x95, 0xfb, 0x46, 0xd0, 0xd5, 0x5b, 0x1d,
-    0xce, 0x37, 0x9e, 0x1b, 0xbb, 0x11, 0xc4, 0x60, 0x2d, 0x14, 0x43, 0x4f, 0xb2, 0xf0, 0x1c, 0xb6, 0x67, 0x7b, 0xbb,
-    0x57, 0xec, 0xf1, 0xca, 0x45, 0x52, 0xc1, 0x18, 0x63, 0x46, 0x31, 0x9e, 0x89, 0x9a, 0x58, 0x44, 0x64, 0xcb, 0xd6,
-    0x61, 0x81, 0x01, 0x00, 0x68, 0x69, 0x72, 0xaf, 0x9a, 0x08, 0x95, 0xf1, 0x5c, 0x5a, 0x4f, 0x15, 0x44, 0x55, 0x8d,
-    0xdf, 0xae, 0xcf, 0x40, 0x21, 0xb8, 0x37, 0x3a, 0x1e, 0x06, 0x21, 0x60, 0x17, 0x05, 0x2f, 0xd0, 0x07, 0xb4, 0x57,
-    0x25, 0x42, 0x31, 0x73, 0xb2, 0x1e, 0x33, 0x8c, 0x54, 0xd0, 0x85, 0x4a, 0xd8, 0x2a, 0xcd, 0xf0, 0xab, 0x83, 0xd0,
-    0x8c, 0x32, 0xee, 0xbf, 0xaa, 0xd6, 0x0c, 0xf2, 0x83, 0x79, 0xab, 0x84, 0xfa, 0x76, 0x25, 0x22, 0x53, 0x81, 0x89,
-    0x87, 0x59, 0x4a, 0xbf, 0x5f, 0xd6, 0x49, 0x3f, 0x2f, 0x97, 0xe7, 0x9c, 0x24, 0x5f, 0xe7, 0x0e, 0x92, 0x4f, 0xba,
-    0xfb, 0x95, 0xf0, 0x43, 0x0d, 0xa3, 0x26, 0xfc, 0xea, 0x5b, 0x1a, 0xe6, 0x9e, 0x72, 0x6f, 0xf5, 0xbb, 0xc8, 0x74,
-    0x51, 0x9e, 0x83, 0x22, 0xa4, 0x1f, 0xc1, 0x34, 0x34, 0x68, 0x50, 0x24, 0x8b, 0xc5, 0xda, 0x04, 0x71, 0x7d, 0xcc,
-    0xa9, 0x76, 0x28, 0x63, 0x8c, 0x68, 0x5a, 0x52, 0x90, 0x24, 0x70, 0x50, 0x7e, 0x03, 0x03, 0x62, 0x12, 0x12, 0xd2,
-    0x20, 0x74, 0xd6, 0x66, 0x22, 0x2a, 0x73, 0xf1, 0x76, 0xe5, 0xb2, 0x26, 0x50, 0x84, 0x9e, 0x60, 0xa6, 0x52, 0x2a,
-    0x08, 0xa4, 0xca, 0xb7, 0xd1, 0xa9, 0x39, 0x43, 0x73, 0xd7, 0x14, 0x40, 0x5e, 0xdb, 0xf5, 0xa0, 0xc9, 0x7b, 0xf2,
-    0xa1, 0xaf, 0x13, 0x23, 0x5e, 0x66, 0xd0, 0x35, 0x1c, 0xfe, 0x1a, 0x2b, 0x29, 0x42, 0x26, 0x7c, 0xaf, 0x60, 0x13,
-    0x21, 0x99, 0x82, 0x9e, 0x09, 0xf8, 0x43, 0xbd, 0xb2, 0x97, 0xee, 0xe5, 0x95, 0x49, 0x8b, 0xca, 0x56, 0xa2, 0x66,
-    0x2d, 0x8e, 0xe2, 0xed, 0x14, 0xce, 0xb3, 0x47, 0x09, 0x04, 0x24, 0xa9, 0x9c, 0xa4, 0x9a, 0xf7, 0x28, 0x1d, 0x02,
-    0x48, 0x70, 0xfa, 0x09, 0x2c, 0xb4, 0x9b, 0x12, 0x13, 0x2c, 0xaa, 0xc6, 0x6e, 0x73, 0x90, 0x9a, 0x73, 0x92, 0x7c,
-    0x73, 0x94, 0xda, 0xdb, 0x4a, 0x7b, 0xc6, 0xec, 0x00, 0xdb, 0x76, 0xb7, 0xf3, 0xa3, 0x74, 0xbb, 0x33, 0x34, 0x18,
-    0x17, 0x86, 0xff, 0x93, 0x12, 0xd3, 0x40, 0x0a, 0x29, 0x1b, 0x3f, 0xa1, 0x0c, 0xc3, 0xff, 0x96, 0x24, 0x80, 0x07,
-    0xb5, 0xdd, 0x58, 0x31, 0xee, 0x15, 0x45, 0xc9, 0x6d, 0x55, 0xed, 0x6a, 0x09, 0x1a, 0xba, 0x91, 0xf4, 0x89, 0x62,
-    0x9e, 0x13, 0x00, 0xa3, 0xc8, 0xfc, 0x1d, 0xd3, 0x49, 0xde, 0xbf, 0xac, 0x4d, 0xed, 0xf6, 0x7d, 0x3f, 0xca, 0x4f,
-    0x29, 0xa4, 0xa2, 0xb2, 0x39, 0x89, 0xf8, 0x77, 0x05, 0x98, 0xe6, 0xc4, 0x47, 0x7a, 0xae, 0x61, 0x28, 0xc0, 0x57,
-    0x3a, 0x94, 0x9a, 0xed, 0xe9, 0x1f, 0x9d, 0xed, 0xbe, 0x44, 0x8a, 0x20, 0x81, 0x06, 0x5e, 0xae, 0x59, 0x2f, 0xac,
-    0x32, 0xb8, 0x23, 0xfe, 0x14, 0x7c, 0x5f, 0x5e, 0x07, 0x9f, 0x71, 0xfe, 0x05, 0xa0, 0x55, 0x81, 0x01, 0xe5, 0x83,
-    0xa6, 0x62, 0x25, 0xd8, 0x25, 0x0a, 0xcc, 0xca, 0xcf, 0x1f, 0xd7, 0x69, 0xdd, 0xd4, 0x2c, 0xd1, 0x29, 0x3f, 0x77,
-    0x0d, 0x33, 0xbe, 0xd7, 0xc8, 0x1f, 0xdf, 0x7f, 0x0e, 0xb2, 0x9d, 0x50, 0xbb, 0xb5, 0x55, 0x6c, 0x90, 0x86, 0x86,
-    0xf7, 0xc2, 0xe6, 0xd0, 0x16, 0xf1, 0x52, 0xa8, 0x67, 0x2c, 0xc6, 0xdb, 0x22, 0x54, 0x86, 0x0f, 0x58, 0x30, 0x87,
-    0x15, 0x82, 0xc5, 0x4e, 0x65, 0xf2, 0x19, 0x0e, 0x9a, 0x22, 0xd7, 0x42, 0x28, 0x7c, 0x39, 0x88, 0x4a, 0x49, 0x8b,
-    0x75, 0xb4, 0x3d, 0x3b, 0x83, 0xe7, 0x97, 0x71, 0x01, 0xd8, 0x81, 0xe5, 0x57, 0x58, 0x16, 0x07, 0xc8, 0xc5, 0x43,
-    0x59, 0xeb, 0x15, 0x8d, 0xc7, 0x37, 0x76, 0x61, 0x75, 0x01, 0x3e, 0x8d, 0xd2, 0x71, 0x22, 0x26, 0x31, 0x93, 0x2a,
-    0xd7, 0xe4, 0xda, 0xe8, 0x5e, 0x5a, 0xa3, 0x79, 0x2e, 0x38, 0x78, 0x85, 0xe0, 0x06, 0xd3, 0x57, 0xf2, 0x72, 0xbd,
-    0x82, 0x82, 0xa1, 0xf6, 0xe6, 0x26, 0x98, 0x2b, 0xf1, 0x98, 0xc1, 0x35, 0xfd, 0x3a, 0x9c, 0x8a, 0x6e, 0x5e, 0xae,
-    0x18, 0xfc, 0x3a, 0x67, 0xac, 0x21, 0x00, 0x88, 0x4e, 0x1e, 0x5e, 0x6f, 0x26, 0xbd, 0x52, 0xd2, 0x41, 0x49, 0x84,
-    0xf8, 0xae, 0xcc, 0xd7, 0x5d, 0x2a, 0xba, 0x72, 0xd5, 0xbd, 0xaf, 0x19, 0x33, 0x2e, 0x18, 0x3d, 0xe7, 0xb3, 0xa4,
-    0x71, 0xed, 0x86, 0xee, 0xea, 0xfc, 0xe8, 0xfd, 0x20, 0xf3, 0x16, 0x66, 0x40, 0x26, 0x20, 0x0a, 0x9e, 0x7b, 0xaf,
-    0x8d, 0x88, 0xf2, 0xb7, 0x66, 0x88, 0x57, 0x0e, 0xb3, 0x2e, 0x92, 0xfc, 0xed, 0xe0, 0xdb, 0xe0, 0xfa, 0x96, 0x46,
-    0x04, 0xb9, 0xab, 0x22, 0xc8, 0x84, 0xb9, 0x99, 0x3e, 0x70, 0xfb, 0x77, 0x65, 0x08, 0x22, 0x2a, 0xa6, 0x43, 0xe5,
-    0xb8, 0x7f, 0xb4, 0x41, 0xa5, 0x42, 0xe2, 0x53, 0x95, 0xbb, 0x72, 0x6d, 0x6a, 0xa8, 0xc7, 0x75, 0x32, 0x0b, 0x4d,
-    0xb3, 0x26, 0x97, 0xb2, 0x69, 0x31, 0x32, 0x4d, 0x4e, 0xb5, 0xf9, 0xdd, 0x6b, 0x83, 0x74, 0x0c, 0xd5, 0xc5, 0x5a,
-    0x2d, 0x98, 0xdf, 0x95, 0x17, 0xde, 0xf5, 0x62, 0x23, 0x95, 0xa1, 0xa6, 0x3d, 0x8a, 0x3e, 0x8e, 0xdb, 0xcc, 0xe5,
-    0x51, 0xfa, 0x67, 0x0d, 0x00, 0xd3, 0x10, 0x16, 0xdd, 0x4d, 0xcb, 0xd8, 0x13, 0xcb, 0xd3, 0x13, 0x19, 0x28, 0x7a,
-    0xae, 0xf3, 0x55, 0xab, 0xc4, 0xd2, 0x35, 0x08, 0x76, 0x6f, 0xc8, 0x58, 0x95, 0xb8, 0x5b, 0xad, 0x5f, 0xcd, 0xf3,
-    0x79, 0xca, 0x57, 0xf2, 0x7c, 0x6a, 0x1a, 0xdd, 0x46, 0xdb, 0xbd, 0x39, 0x35, 0x54, 0xcc, 0xb5, 0xbe, 0xc9, 0x1f,
-    0x98, 0xae, 0x83, 0xae, 0x16, 0x81, 0x66, 0x75, 0xaa, 0x9e, 0x95, 0xe5, 0xac, 0x9e, 0xc9, 0x31, 0x13, 0xb6, 0xa9,
-    0x34, 0x87, 0xe8, 0x86, 0xa9, 0x9a, 0xe9, 0xc7, 0xc6, 0xb1, 0x90, 0x6d, 0x9e, 0x5f, 0x8e, 0x73, 0xc0, 0xb4, 0x3c,
-    0x5f, 0x26, 0x0c, 0x3f, 0x5e, 0x5d, 0xfd, 0x28, 0xf8, 0x54, 0xd5, 0xd1, 0x5b, 0xbe, 0xd4, 0x3d, 0x83, 0x59, 0xa9,
-    0x8c, 0x88, 0x13, 0xb6, 0x7e, 0xf0, 0xe6, 0xe9, 0x15, 0xb0, 0x9c, 0xc0, 0xea, 0x4e, 0x98, 0xd3, 0x18, 0xaa, 0x3a,
-    0xc0, 0x3f, 0xac, 0x1f, 0x6c, 0xdd, 0x19, 0xfe, 0x61, 0xf0, 0x43, 0x70, 0x63, 0x63, 0xe3, 0x18, 0xef, 0xd6, 0x12,
-    0x41, 0x5e, 0x61, 0x40, 0x1f, 0xaf, 0x3e, 0x0a, 0x5c, 0xae, 0x63, 0xdb, 0x03, 0x87, 0xdc, 0xd6, 0xc0, 0xdf, 0x24,
-    0x4f, 0x1a, 0x2d, 0x0a, 0x9e, 0xcd, 0xe4, 0x0c, 0x85, 0xbc, 0xe6, 0xe3, 0xa0, 0xee, 0x08, 0x7f, 0x03, 0xa7, 0x16,
-    0x5e, 0x5e, 0x7e, 0x82, 0x3e, 0x60, 0xe9, 0x4a, 0x6e, 0x2a, 0xfc, 0x94, 0xf2, 0x88, 0xae, 0xd6, 0x79, 0x30, 0x52,
-    0x5c, 0x4c, 0x51, 0xe8, 0xb8, 0xcb, 0x1b, 0x67, 0x23, 0xa3, 0xbf, 0xc4, 0xab, 0x8b, 0x74, 0xf9, 0x48, 0x64, 0xab,
-    0x96, 0xde, 0x2f, 0x3a, 0xba, 0x6d, 0xcf, 0x18, 0x9f, 0x66, 0x63, 0x0a, 0xcc, 0xf8, 0x38, 0x11, 0x5e, 0x9f, 0x18,
-    0xeb, 0xbb, 0x45, 0xa0, 0xba, 0x39, 0x36, 0xd9, 0xe1, 0x78, 0xbd, 0xd9, 0xac, 0x71, 0x07, 0x6f, 0x9c, 0x27, 0xce,
-    0xb2, 0x44, 0x8f, 0xca, 0x52, 0xc3, 0x03, 0x52, 0x21, 0x6e, 0xde, 0x33, 0x81, 0x71, 0xd9, 0x25, 0x71, 0x6d, 0x37,
-    0x10, 0x6b, 0xb1, 0x27, 0x31, 0x4b, 0xc6, 0xb6, 0x07, 0xe5, 0x81, 0xbe, 0x18, 0x4d, 0xb7, 0x80, 0x69, 0x7b, 0xed,
-    0xec, 0x3c, 0xb5, 0xbd, 0x6a, 0xaa, 0x00, 0x66, 0xc9, 0xf2, 0xf8, 0x14, 0x49, 0xf7, 0x1b, 0xe8, 0x22, 0x06, 0x8c,
-    0x8d, 0x2b, 0x73, 0xee, 0x72, 0xdd, 0x8e, 0xf8, 0x46, 0x13, 0xa9, 0x52, 0x1f, 0x51, 0xdf, 0x61, 0x58, 0xab, 0xab,
-    0x0c, 0x24, 0x30, 0x8f, 0xbc, 0x3b, 0xae, 0xa5, 0xa7, 0x63, 0x16, 0x93, 0x2a, 0x7d, 0x4b, 0x5d, 0x8b, 0x6b, 0xba,
-    0xbd, 0xe2, 0x01, 0xe8, 0x1f, 0xe8, 0xb7, 0x88, 0x85, 0xbf, 0x9d, 0xd7, 0x52, 0x58, 0x1b, 0x73, 0xe4, 0xe8, 0x6b,
-    0x0f, 0x7e, 0x61, 0xd5, 0x9e, 0x81, 0x1a, 0x66, 0xc4, 0x48, 0x7e, 0x33, 0xee, 0x55, 0x4d, 0x1c, 0xb9, 0x0b, 0xc0,
-    0xfa, 0x96, 0x74, 0x49, 0x0e, 0xaf, 0x64, 0xb9, 0x2a, 0x86, 0xfc, 0x1b, 0xec, 0xb3, 0xde, 0x9c, 0x80, 0x99, 0x38,
-    0xe5, 0x25, 0x26, 0xa6, 0x88, 0xcb, 0xcd, 0xd2, 0xe7, 0x69, 0xda, 0x2c, 0xda, 0xc0, 0x29, 0x8c, 0x04, 0x8e, 0xd8,
-    0x37, 0xb6, 0xa1, 0x99, 0xb0, 0x11, 0x13, 0x6a, 0x54, 0x4a, 0x09, 0x1f, 0xc8, 0xad, 0x96, 0xf4, 0x65, 0x6e, 0xaf,
-    0xbe, 0xdc, 0x26, 0x28, 0xa0, 0xa8, 0x81, 0xe5, 0xd0, 0x38, 0x6e, 0x19, 0xc8, 0x85, 0xc5, 0xb0, 0x30, 0x6a, 0x55,
-    0xae, 0x26, 0xa3, 0x3a, 0x99, 0xaf, 0x16, 0x17, 0x2a, 0xf4, 0xe0, 0x91, 0x40, 0xce, 0x5f, 0x60, 0xea, 0x60, 0x56,
-    0x6a, 0x33, 0x2d, 0x36, 0x51, 0xde, 0x33, 0x1d, 0x92, 0xeb, 0xaf, 0xe1, 0xa1, 0xf2, 0x8b, 0x57, 0xe6, 0x14, 0xf3,
-    0x45, 0x1e, 0x4b, 0x5b, 0x63, 0x6e, 0xfd, 0xaf, 0xf2, 0x3e, 0xad, 0x04, 0xec, 0x37, 0x60, 0x53, 0xc6, 0x5a, 0x62,
-    0xe3, 0x82, 0xa4, 0xbc, 0x96, 0xa7, 0xf4, 0xbe, 0x86, 0xf0, 0x5d, 0x51, 0xe9, 0x2a, 0x91, 0x75, 0x8d, 0x56, 0xf7,
-    0xeb, 0x82, 0xe5, 0x97, 0x07, 0x0c, 0x73, 0x93, 0x51, 0x21, 0x5b, 0x51, 0xb3, 0x29, 0xbf, 0xda, 0xbb, 0xf1, 0x2b,
-    0x0f, 0x25, 0x05, 0xd5, 0x2a, 0xd9, 0xbc, 0x72, 0xc3, 0x31, 0x6e, 0xdc, 0x70, 0x8c, 0x7b, 0x14, 0x57, 0xae, 0x50,
-    0xad, 0xf3, 0xdf, 0x57, 0xdd, 0x4f, 0x74, 0xd6, 0x86, 0xfa, 0xd4, 0x0d, 0xd7, 0xa6, 0xa7, 0xdf, 0xb0, 0x54, 0x23,
-    0x4b, 0xe8, 0xa6, 0xa5, 0x62, 0x32, 0x12, 0x25, 0xa6, 0xab, 0x94, 0x47, 0x7d, 0x8d, 0xb8, 0x00, 0x76, 0x43, 0xf9,
-    0x8b, 0x7f, 0x0d, 0xcf, 0x8f, 0x03, 0x54, 0xa2, 0x96, 0x93, 0x2c, 0xe5, 0xad, 0x49, 0x34, 0x8b, 0x93, 0xcb, 0x60,
-    0x11, 0xb7, 0x66, 0x59, 0x9a, 0x15, 0x73, 0xa0, 0x4a, 0xaf, 0xb8, 0x04, 0x1d, 0x7e, 0xd6, 0x5a, 0xc4, 0xde, 0x73,
-    0x96, 0x9c, 0x31, 0x1e, 0x8f, 0x22, 0xcf, 0xde, 0xcf, 0x81, 0x3d, 0x58, 0xaf, 0xa3, 0x3c, 0xcf, 0xce, 0x6d, 0xef,
-    0x5d, 0x76, 0x02, 0x44, 0xeb, 0xbd, 0xb9, 0xb8, 0x3c, 0x65, 0xa9, 0xf7, 0xfe, 0x64, 0x91, 0xf2, 0x85, 0x57, 0x44,
-    0x69, 0xd1, 0x2a, 0x58, 0x1e, 0x4f, 0x40, 0x4c, 0x24, 0x59, 0xde, 0xc2, 0xfc, 0xe7, 0x19, 0x0b, 0x92, 0xf8, 0x74,
-    0xca, 0xad, 0x71, 0x94, 0x7f, 0xea, 0xb5, 0x5a, 0xf3, 0x3c, 0x9e, 0x45, 0xf9, 0x65, 0x8b, 0x5a, 0x04, 0x9f, 0xb5,
-    0x77, 0xa3, 0x2f, 0x26, 0xf7, 0x7b, 0x3c, 0x87, 0xbe, 0x31, 0x62, 0x31, 0x00, 0xe6, 0x63, 0xed, 0x3e, 0x68, 0xcf,
-    0x8a, 0x0d, 0x11, 0x51, 0x8a, 0x52, 0x5e, 0x1e, 0x7b, 0x1f, 0x41, 0xb7, 0x3d, 0xf6, 0x4f, 0x78, 0xea, 0x81, 0x2d,
-    0xc7, 0xb3, 0x74, 0x39, 0x5a, 0xe4, 0x05, 0x0c, 0x30, 0xcf, 0xe2, 0x94, 0xb3, 0xbc, 0x77, 0x92, 0xe5, 0x80, 0xb6,
-    0x56, 0x1e, 0x8d, 0xe3, 0x45, 0x11, 0xdc, 0x9f, 0x5f, 0xf4, 0x50, 0x57, 0x38, 0xcd, 0xb3, 0x45, 0x3a, 0x96, 0x73,
-    0xc5, 0x29, 0x1c, 0x8c, 0x98, 0x9b, 0x15, 0xf4, 0x25, 0x14, 0x80, 0x2f, 0x65, 0x51, 0xde, 0x3a, 0xc5, 0xce, 0xa8,
-    0xe8, 0xb7, 0xc7, 0xec, 0xd4, 0xcb, 0x4f, 0x4f, 0x22, 0xa7, 0xd3, 0x7d, 0xe4, 0xa9, 0x7f, 0xfe, 0x03, 0x17, 0x14,
-    0xf7, 0xb5, 0xc5, 0x9d, 0x76, 0xfb, 0x1f, 0xdc, 0x5e, 0x63, 0x16, 0x02, 0x28, 0xe8, 0xcc, 0x2f, 0xac, 0x22, 0x4b,
-    0x60, 0x7f, 0xd6, 0xf5, 0xec, 0xcd, 0xc1, 0x6e, 0x8a, 0xd3, 0xd3, 0xa0, 0x3b, 0xbf, 0x28, 0x71, 0x75, 0x81, 0x48,
-    0xc8, 0x94, 0x8b, 0x94, 0x6f, 0xcb, 0x3f, 0x0a, 0xf1, 0xe3, 0xf5, 0x10, 0x77, 0x15, 0xc4, 0x15, 0xd6, 0x5b, 0x63,
-    0x38, 0x07, 0x84, 0xfe, 0x4e, 0x21, 0x00, 0x99, 0x82, 0x11, 0x98, 0x2b, 0x38, 0xe8, 0xe5, 0x0f, 0x83, 0xd1, 0x5d,
-    0x0f, 0xc6, 0xe3, 0xdb, 0xc0, 0xc8, 0xd3, 0xf1, 0xb2, 0xbe, 0xaf, 0x1d, 0x30, 0x4e, 0x7b, 0x53, 0x86, 0xf4, 0x14,
-    0x74, 0xf1, 0xf9, 0x3c, 0x1e, 0xf3, 0xa9, 0x78, 0x24, 0x72, 0x3e, 0x17, 0x75, 0x0f, 0xda, 0x6d, 0xf1, 0x5e, 0x80,
-    0x40, 0x0b, 0x3a, 0x3e, 0x36, 0x00, 0x22, 0x7a, 0x71, 0xdd, 0x47, 0x6c, 0x3e, 0xdc, 0xfa, 0xa5, 0x1a, 0xef, 0x52,
-    0xe5, 0x0d, 0x0a, 0x11, 0xa1, 0xbe, 0xd9, 0x82, 0x19, 0x6f, 0x45, 0xbf, 0xa3, 0x03, 0x55, 0x83, 0x0f, 0x8c, 0xa4,
-    0x5e, 0xc0, 0x3d, 0x33, 0x17, 0xa8, 0x97, 0xf6, 0xd1, 0x25, 0xd5, 0x6a, 0xb9, 0x20, 0x37, 0x18, 0xba, 0x90, 0x28,
-    0x20, 0xe8, 0x14, 0x83, 0x9c, 0xbe, 0xa9, 0x91, 0xb9, 0x41, 0xee, 0x64, 0x2e, 0x1c, 0xf9, 0x4c, 0xf3, 0xf5, 0x62,
-    0x6b, 0x0b, 0xac, 0xec, 0x17, 0x4c, 0x36, 0x00, 0xee, 0x4d, 0xae, 0xae, 0xef, 0x43, 0x61, 0x4a, 0x29, 0x43, 0x6a,
-    0x76, 0xd3, 0x15, 0x7d, 0xd8, 0x95, 0x98, 0x32, 0x92, 0x8f, 0x86, 0xff, 0x0e, 0xc5, 0xde, 0xd1, 0x86, 0x65, 0x91,
-    0x2d, 0xf2, 0x11, 0x79, 0xea, 0x56, 0x2d, 0x7e, 0x9b, 0x04, 0xae, 0xed, 0x31, 0xcd, 0xe7, 0xd1, 0x0c, 0xae, 0x7d,
-    0xe4, 0x80, 0x53, 0x10, 0x44, 0xdc, 0x31, 0x90, 0x5e, 0x0e, 0x05, 0x21, 0x8a, 0xae, 0x31, 0xe5, 0xbb, 0xd1, 0xfd,
-    0x4b, 0x7f, 0x91, 0xc6, 0xc0, 0xe9, 0x3e, 0xc6, 0x63, 0xba, 0x77, 0x12, 0x8f, 0x29, 0x10, 0xd1, 0xa2, 0xc4, 0x23,
-    0xf4, 0x6c, 0x43, 0x81, 0xfa, 0x0e, 0x0b, 0x3c, 0xcb, 0x44, 0x16, 0xbb, 0x65, 0x63, 0x30, 0xc1, 0x10, 0x95, 0xe3,
-    0x6c, 0x16, 0xc5, 0x69, 0x80, 0xdf, 0x07, 0xf1, 0xf4, 0x88, 0x01, 0x76, 0xf1, 0xe0, 0x27, 0x93, 0xb9, 0x68, 0x1d,
-    0xd7, 0xff, 0x05, 0xf8, 0x08, 0xf5, 0x2f, 0xa5, 0x1d, 0xa6, 0xe1, 0x52, 0x61, 0xde, 0x7a, 0x29, 0xf0, 0x1e, 0xae,
-    0x74, 0x56, 0x46, 0x7e, 0x8e, 0x3d, 0x4e, 0x3f, 0x06, 0xad, 0x4e, 0xd0, 0xd1, 0xa6, 0x6b, 0xed, 0x36, 0xaa, 0xc8,
-    0x65, 0x91, 0x37, 0x1a, 0x09, 0x06, 0xfd, 0x2c, 0xe0, 0xac, 0xde, 0x35, 0xac, 0x9e, 0xa4, 0x4b, 0x74, 0xe0, 0x9c,
-    0xa6, 0x4e, 0x0d, 0x08, 0x8a, 0x05, 0x5c, 0x33, 0x95, 0x5b, 0x46, 0x24, 0x94, 0xbe, 0xa4, 0x03, 0x5c, 0xbf, 0x4b,
-    0x84, 0xf7, 0x86, 0xea, 0x29, 0x50, 0x8a, 0xe4, 0x16, 0xc7, 0x7b, 0xe2, 0xc4, 0x5b, 0x44, 0x63, 0xa1, 0x0d, 0x47,
-    0xd0, 0xb6, 0xfe, 0x32, 0x02, 0x2c, 0x7d, 0x0a, 0xed, 0xcd, 0xa5, 0xa3, 0x12, 0xeb, 0x73, 0x98, 0x6b, 0x5f, 0x48,
-    0x3d, 0xba, 0x91, 0x6f, 0xf7, 0x37, 0x97, 0xbc, 0xdc, 0xdb, 0x11, 0xbd, 0xfb, 0xc7, 0x65, 0x41, 0x02, 0xca, 0x74,
-    0xa4, 0x55, 0x53, 0x88, 0x3a, 0x18, 0x96, 0xd2, 0x77, 0x71, 0xdc, 0x42, 0x2b, 0x5d, 0xc2, 0x63, 0x2c, 0xc9, 0x2e,
-    0xc7, 0x74, 0xa5, 0x28, 0x87, 0x33, 0xa9, 0x13, 0x52, 0x72, 0x91, 0x83, 0xd1, 0x5b, 0x85, 0xe2, 0x18, 0x21, 0x18,
-    0x6c, 0x2e, 0xe3, 0x32, 0xdc, 0x5c, 0x66, 0xe5, 0x31, 0x68, 0x26, 0x08, 0x55, 0xa1, 0x3e, 0xef, 0x02, 0x13, 0x0b,
-    0x27, 0x8b, 0x45, 0x23, 0xe0, 0xb4, 0xac, 0xb4, 0xad, 0x81, 0x80, 0x06, 0x2c, 0x40, 0x2c, 0x00, 0xdd, 0x8d, 0x7a,
-    0x31, 0x58, 0x8b, 0x68, 0xdd, 0x87, 0x81, 0xf6, 0x76, 0x44, 0x23, 0x58, 0x57, 0x8e, 0x20, 0x57, 0xcb, 0xc2, 0x74,
-    0x1c, 0x73, 0x69, 0x49, 0x74, 0xc2, 0x12, 0xe8, 0x9f, 0x5f, 0x5d, 0xb5, 0xa1, 0x9b, 0x78, 0xb5, 0xf6, 0xe2, 0x74,
-    0xbe, 0x90, 0xdf, 0xd4, 0x82, 0x59, 0x3a, 0x18, 0xe6, 0xc4, 0x94, 0xff, 0x81, 0x8a, 0xdb, 0x05, 0x36, 0x8d, 0x6b,
-    0x03, 0x3c, 0x14, 0x32, 0x40, 0x50, 0x2a, 0x1a, 0x80, 0xd2, 0x78, 0xbc, 0x5a, 0xa6, 0x97, 0x51, 0xc0, 0x0b, 0x9c,
-    0xc1, 0x39, 0x3e, 0xa7, 0xf0, 0x3c, 0x8b, 0x53, 0x7c, 0xcc, 0xf1, 0x31, 0xba, 0xc0, 0xc7, 0xac, 0xb4, 0xff, 0x2e,
-    0xe8, 0xb6, 0x34, 0x02, 0xb2, 0xab, 0x2b, 0x60, 0xee, 0x1a, 0x05, 0x40, 0x10, 0xe2, 0xdb, 0x2a, 0xcc, 0xc4, 0x16,
-    0x2b, 0xe6, 0x2d, 0x51, 0x6e, 0x91, 0xf0, 0x0c, 0xc1, 0xb6, 0xca, 0x9d, 0x86, 0x8e, 0xe0, 0xc9, 0x2c, 0x92, 0x27,
-    0xf8, 0xe2, 0xda, 0x96, 0xf8, 0xf8, 0x85, 0x40, 0x07, 0x3d, 0xe2, 0xda, 0x74, 0x19, 0x97, 0x9f, 0xb5, 0x89, 0x43,
-    0x1b, 0x67, 0x01, 0x35, 0x0d, 0x99, 0x3d, 0x8f, 0xe2, 0x44, 0x34, 0x5e, 0xb3, 0x92, 0x46, 0x3a, 0x20, 0x2d, 0x64,
-    0x6f, 0xa7, 0x82, 0x0d, 0x80, 0x1f, 0x89, 0xcb, 0xd4, 0x15, 0xf4, 0xb6, 0xa8, 0xa2, 0x28, 0xb9, 0x3c, 0xbc, 0x03,
-    0xe1, 0x0f, 0xd7, 0xeb, 0x1c, 0x82, 0x5d, 0x17, 0xa5, 0xf5, 0x16, 0x00, 0xf1, 0x9c, 0xb1, 0xb1, 0x67, 0x5b, 0xc0,
-    0x26, 0xc5, 0xf3, 0xc7, 0x84, 0x9d, 0x31, 0xf9, 0x11, 0x14, 0xdd, 0x57, 0x57, 0x8e, 0x40, 0xda, 0x72, 0x79, 0x3f,
-    0x53, 0x52, 0x9e, 0x5a, 0x97, 0x5c, 0x7d, 0x1d, 0x78, 0xcf, 0x36, 0x06, 0x6d, 0xce, 0xd1, 0xae, 0x0f, 0xeb, 0x75,
-    0x40, 0x91, 0xb5, 0x01, 0x4c, 0xd2, 0xcf, 0x6e, 0x5a, 0x0a, 0xf4, 0x63, 0x93, 0x09, 0x1c, 0x00, 0x15, 0xb7, 0xd0,
-    0xa7, 0x5b, 0x00, 0x03, 0x66, 0xa6, 0x67, 0x8b, 0x16, 0x76, 0xd5, 0x56, 0x3f, 0x21, 0x2a, 0x92, 0x6c, 0xf4, 0xa9,
-    0x36, 0xc5, 0x02, 0x09, 0x08, 0xc7, 0x6a, 0xf0, 0x29, 0xfb, 0xdf, 0xfe, 0xf5, 0x7f, 0xfe, 0x57, 0x18, 0x8e, 0x3a,
-    0xb8, 0xa5, 0x75, 0x7d, 0xab, 0xff, 0x01, 0xad, 0x16, 0xe9, 0x2d, 0xed, 0xfe, 0xf6, 0xcf, 0xff, 0x0d, 0x9a, 0xd1,
-    0xcd, 0x1a, 0xb7, 0x3c, 0x0e, 0xec, 0x11, 0x6a, 0x32, 0x77, 0x03, 0xa4, 0xd6, 0xf5, 0xda, 0xf1, 0xff, 0x05, 0x81,
-    0x2d, 0x78, 0x36, 0xbf, 0x11, 0x08, 0x84, 0x75, 0x94, 0x64, 0x05, 0x13, 0x50, 0x08, 0x36, 0x79, 0x47, 0x30, 0x68,
-    0x86, 0x39, 0x90, 0x6c, 0x61, 0x89, 0xde, 0x02, 0xfb, 0xb5, 0xde, 0x8d, 0x5d, 0x29, 0x18, 0x27, 0xd0, 0xc9, 0x03,
-    0x00, 0xfb, 0x20, 0x9e, 0xe0, 0x81, 0x4e, 0x33, 0x6c, 0xbb, 0xce, 0x17, 0x68, 0x0c, 0xa1, 0x89, 0x4c, 0x8c, 0x20,
-    0x5c, 0x1d, 0xaa, 0x1f, 0xfc, 0x04, 0xd6, 0xf2, 0x51, 0x3f, 0x47, 0x17, 0xfa, 0x19, 0xd9, 0x0f, 0x0c, 0x0b, 0x82,
-    0x62, 0x86, 0x3a, 0x40, 0x73, 0x61, 0xea, 0xa4, 0x56, 0xfc, 0x81, 0xa9, 0xe4, 0xb0, 0x8f, 0x98, 0x0f, 0x89, 0xb7,
-    0x5f, 0x16, 0x39, 0xab, 0x38, 0x26, 0x36, 0x10, 0xac, 0xc8, 0xac, 0xff, 0x98, 0x64, 0xe7, 0xe5, 0x75, 0x75, 0x53,
-    0xa0, 0xe2, 0x72, 0x6f, 0x1c, 0x9f, 0xf5, 0x25, 0x22, 0x1b, 0x6b, 0x59, 0xed, 0xd2, 0x5c, 0x18, 0x56, 0xc9, 0x75,
-    0xc9, 0x47, 0x5c, 0x96, 0xd7, 0x46, 0x01, 0x80, 0xe3, 0xee, 0x9d, 0xe4, 0x7d, 0xb9, 0x80, 0x57, 0x78, 0x61, 0x8b,
-    0x20, 0x41, 0x3e, 0x2e, 0x64, 0x0c, 0x27, 0x19, 0x63, 0xb2, 0x7a, 0xd4, 0x5a, 0x33, 0xc5, 0xd2, 0xb1, 0x61, 0x8d,
-    0x0b, 0x73, 0xc9, 0x85, 0x63, 0xa9, 0x0e, 0x49, 0x2e, 0x8c, 0x1f, 0xe0, 0x68, 0x70, 0xe1, 0xf8, 0x5a, 0x2e, 0x8c,
-    0x6b, 0x1b, 0xe0, 0xc8, 0xa1, 0xbd, 0x8d, 0xb6, 0xb8, 0x21, 0x15, 0x38, 0x0a, 0x37, 0x30, 0xc0, 0x46, 0x9f, 0xa4,
-    0x6c, 0x23, 0x50, 0xd1, 0x18, 0x95, 0xd2, 0x9a, 0x04, 0x9b, 0x64, 0xcf, 0xc1, 0xe2, 0x18, 0x64, 0x9b, 0x39, 0x32,
-    0x58, 0xc2, 0x13, 0x86, 0xc7, 0xff, 0x78, 0x07, 0xfb, 0x8a, 0xcd, 0x2c, 0xe9, 0x19, 0xa4, 0xcf, 0x0e, 0x0d, 0xe0,
-    0x2d, 0x85, 0x3b, 0x23, 0xb0, 0xdf, 0xbe, 0x39, 0x38, 0xb4, 0xbd, 0x93, 0x6c, 0x7c, 0x19, 0xd8, 0xa0, 0x8a, 0x82,
-    0x24, 0x73, 0x7d, 0x3e, 0x65, 0xa9, 0xa3, 0x94, 0xc1, 0x2c, 0x01, 0x65, 0x38, 0x3b, 0x15, 0xb7, 0xef, 0x9b, 0xae,
-    0x58, 0x40, 0x1b, 0x7d, 0x9e, 0xaf, 0xbf, 0xc7, 0xc5, 0x97, 0x2b, 0x79, 0x8e, 0x8f, 0x7d, 0x0c, 0x46, 0xef, 0xed,
-    0xc0, 0x03, 0xbe, 0x1c, 0x20, 0x05, 0xe9, 0x37, 0x01, 0x67, 0x21, 0xde, 0x77, 0xb0, 0xfd, 0x8e, 0xea, 0x8b, 0x50,
-    0x28, 0x1a, 0xd0, 0xfa, 0x5a, 0xa5, 0x04, 0xd0, 0xd8, 0x63, 0x22, 0x41, 0xdc, 0x18, 0xc0, 0x01, 0x1f, 0xeb, 0x12,
-    0x41, 0xa6, 0x46, 0x11, 0x8d, 0x52, 0xb1, 0x7f, 0x59, 0x85, 0x13, 0x12, 0xfa, 0xc4, 0x64, 0xf0, 0x93, 0xc0, 0x3f,
-    0x36, 0xbf, 0x34, 0x25, 0x3e, 0x0a, 0xa3, 0x17, 0x79, 0xf4, 0x57, 0xb0, 0x61, 0xbd, 0xf3, 0x63, 0x6a, 0xa9, 0xcc,
-    0x1a, 0xb4, 0xb7, 0xd1, 0xfc, 0x6b, 0x2b, 0xfb, 0x15, 0x24, 0x5e, 0x12, 0xcd, 0x0b, 0x16, 0xa8, 0x07, 0x69, 0xe1,
-    0xa0, 0xa1, 0xb4, 0x6a, 0x52, 0x9a, 0x92, 0xb1, 0xe4, 0xd3, 0xa5, 0x69, 0x02, 0x3d, 0x04, 0x13, 0x08, 0xd3, 0xb7,
-    0x5b, 0x11, 0xb0, 0xf7, 0x34, 0x48, 0xd8, 0x84, 0x97, 0x1c, 0xef, 0x07, 0x2f, 0x95, 0xcd, 0xe9, 0x77, 0x1f, 0x80,
-    0x59, 0x64, 0xf9, 0xf8, 0xff, 0x6d, 0x63, 0x8f, 0x83, 0x14, 0xcc, 0x18, 0xba, 0x30, 0x80, 0x97, 0xb1, 0x00, 0x22,
-    0xf3, 0x7d, 0x69, 0x4c, 0x34, 0x62, 0x68, 0x8f, 0x97, 0x3c, 0xb7, 0xf8, 0xd4, 0xe3, 0xb9, 0xd9, 0x0e, 0x34, 0xa5,
-    0x15, 0xa3, 0x7c, 0xd5, 0x2c, 0xdc, 0x75, 0xa5, 0xf2, 0xb8, 0xda, 0x58, 0xd9, 0xd6, 0xf5, 0xb7, 0x15, 0x0c, 0x19,
-    0x5e, 0x80, 0x52, 0x70, 0xbe, 0xa5, 0xe8, 0x61, 0xae, 0x69, 0xd5, 0x3f, 0x70, 0xab, 0xee, 0x51, 0xd2, 0xd9, 0x3e,
-    0xa2, 0xb3, 0x4d, 0xcc, 0x65, 0xb8, 0x14, 0x73, 0x8f, 0xa2, 0x64, 0xe4, 0x20, 0x00, 0x56, 0xcb, 0xba, 0x0f, 0xd8,
-    0x04, 0x2e, 0x3d, 0x2c, 0xcb, 0xde, 0x25, 0x73, 0x8e, 0x7e, 0x93, 0x79, 0xe4, 0xe2, 0xfa, 0xa0, 0xfe, 0x04, 0x5b,
-    0xbb, 0x74, 0x87, 0xde, 0xf7, 0xc6, 0x77, 0xad, 0x6c, 0x45, 0xa9, 0xb6, 0x07, 0xf8, 0xfd, 0x3e, 0xc4, 0xbe, 0xaf,
-    0x1c, 0x1b, 0xb5, 0x10, 0xaa, 0xb9, 0x6c, 0x11, 0xe1, 0xd8, 0xd8, 0x4d, 0x78, 0x41, 0xbf, 0xba, 0xce, 0x98, 0xfd,
-    0xee, 0x76, 0x63, 0x96, 0xdd, 0xd1, 0x98, 0xfd, 0xee, 0x4f, 0x36, 0x66, 0xbf, 0x6a, 0x1a, 0xb3, 0xbf, 0xfe, 0x1e,
-    0x63, 0x36, 0xcf, 0xce, 0x8b, 0xb0, 0x23, 0x83, 0xa7, 0xc0, 0x4c, 0xfe, 0x3e, 0x56, 0x2d, 0x4c, 0xd4, 0xb0, 0x69,
-    0xc9, 0x88, 0x15, 0xf9, 0x5e, 0xc0, 0xab, 0xa5, 0x09, 0xd9, 0xd6, 0x89, 0x55, 0xad, 0xfb, 0xea, 0x26, 0x09, 0xe8,
-    0xf5, 0xae, 0xbe, 0x03, 0xd5, 0x55, 0x46, 0x66, 0x40, 0x9f, 0x82, 0xd4, 0x1d, 0xbb, 0xdb, 0x2a, 0xa3, 0xc7, 0x1c,
-    0xa1, 0xa7, 0x1c, 0xb5, 0x82, 0x7c, 0x96, 0xf6, 0x7f, 0x3a, 0xea, 0xf4, 0x76, 0x3b, 0x33, 0xe8, 0x0d, 0x72, 0x0b,
-    0xde, 0xda, 0xbd, 0xdd, 0x5d, 0x7c, 0x3b, 0x57, 0x6f, 0x5d, 0x7c, 0x8b, 0xd5, 0xdb, 0x03, 0x7c, 0x1b, 0xa9, 0xb7,
-    0x87, 0xf8, 0x36, 0x56, 0x6f, 0x8f, 0xf0, 0xed, 0xcc, 0x2e, 0x8f, 0xb8, 0x06, 0xee, 0x11, 0xd0, 0x15, 0x29, 0x89,
-    0x81, 0x2a, 0x83, 0xd3, 0x88, 0x37, 0xb0, 0xa2, 0xd3, 0x20, 0xf6, 0x84, 0x02, 0x1d, 0x14, 0xde, 0x39, 0xb0, 0xf4,
-    0x80, 0x12, 0x8e, 0x9e, 0xe2, 0x55, 0x7c, 0xd0, 0x3d, 0x0f, 0xe3, 0x19, 0x53, 0xdf, 0x24, 0x55, 0xab, 0x06, 0x35,
-    0x05, 0xec, 0xed, 0xb2, 0xa7, 0xf7, 0x49, 0xd8, 0xd0, 0x2a, 0x77, 0x82, 0x76, 0xae, 0xaa, 0x13, 0xd3, 0xb5, 0xf4,
-    0x0e, 0x5f, 0x23, 0x20, 0x40, 0x00, 0x2b, 0xa3, 0x74, 0x02, 0x6a, 0x40, 0xeb, 0x02, 0x94, 0xf4, 0xb5, 0x42, 0x03,
-    0x21, 0xd2, 0x62, 0x82, 0xd6, 0xa4, 0xdf, 0x0e, 0xa3, 0x53, 0xfd, 0xfc, 0x0a, 0xf4, 0xa9, 0xe8, 0x94, 0xdd, 0x26,
-    0x40, 0x08, 0x44, 0x53, 0x78, 0x28, 0x20, 0x48, 0x0b, 0x81, 0xad, 0x41, 0x63, 0x41, 0x0a, 0x0f, 0xc4, 0x4e, 0x5d,
-    0x9c, 0xd0, 0xf4, 0xf5, 0x22, 0xc0, 0x68, 0x55, 0xb0, 0x07, 0x6a, 0x1d, 0x95, 0x0a, 0x0c, 0x43, 0x05, 0x16, 0xdc,
-    0x28, 0x63, 0x84, 0x2a, 0x72, 0x93, 0xa4, 0xb1, 0x94, 0x90, 0x31, 0x1d, 0xbc, 0xda, 0xbb, 0xbb, 0xca, 0xf7, 0x3e,
-    0xeb, 0x8c, 0xf0, 0x8f, 0xe4, 0xaa, 0x9f, 0x4d, 0x26, 0x93, 0x1b, 0x85, 0xce, 0x67, 0xe3, 0x09, 0xeb, 0xb2, 0x07,
-    0x3d, 0x74, 0xfe, 0xb5, 0xa4, 0x2f, 0xae, 0x53, 0x12, 0xee, 0x96, 0x77, 0x6b, 0x8c, 0xce, 0x38, 0x90, 0x43, 0x77,
-    0x97, 0x4e, 0x25, 0x60, 0x65, 0x09, 0x5c, 0xf9, 0x34, 0x4e, 0x83, 0x76, 0xe9, 0x9f, 0x49, 0x76, 0xfe, 0xd9, 0xe3,
-    0xc7, 0x8f, 0x4b, 0x7f, 0xac, 0xde, 0xda, 0xe3, 0x71, 0xe9, 0x8f, 0x96, 0x7a, 0x19, 0xed, 0xf6, 0x64, 0x52, 0xfa,
-    0xb1, 0x2a, 0xd8, 0xed, 0x8e, 0xc6, 0xbb, 0xdd, 0xd2, 0x3f, 0x37, 0x5a, 0x94, 0x3e, 0x93, 0x6f, 0x39, 0x1b, 0xd7,
-    0x3c, 0x88, 0x8f, 0xc0, 0x78, 0xf5, 0x05, 0xa1, 0x2d, 0xd1, 0x64, 0x10, 0x8f, 0x41, 0xb4, 0xe0, 0x60, 0xeb, 0x02,
-    0x6f, 0x67, 0xc0, 0x9f, 0x27, 0x92, 0xb7, 0x8b, 0x4f, 0x7e, 0x22, 0x47, 0xff, 0xd5, 0xe4, 0xe8, 0x48, 0xcc, 0xc4,
-    0xcd, 0x19, 0xc9, 0x81, 0x66, 0x35, 0x52, 0x16, 0x55, 0xff, 0x1a, 0xb2, 0x8a, 0xd9, 0x23, 0xb7, 0xc1, 0x96, 0x82,
-    0xc7, 0x7f, 0x7d, 0x1d, 0x8f, 0xff, 0xe6, 0x76, 0x1e, 0x7f, 0x72, 0x37, 0x16, 0xff, 0xcd, 0x9f, 0xcc, 0xe2, 0xbf,
-    0x6e, 0xb2, 0xf8, 0xcd, 0x3b, 0xb1, 0xf8, 0x35, 0x89, 0x1f, 0xa4, 0x9a, 0xbe, 0x49, 0x43, 0xfb, 0x0d, 0xd8, 0x30,
-    0x46, 0xc9, 0x64, 0x02, 0x45, 0x93, 0x89, 0xad, 0x92, 0x1d, 0x81, 0x13, 0x51, 0xab, 0xd7, 0xb5, 0x12, 0x6a, 0xf5,
-    0xd5, 0x57, 0x66, 0x99, 0x59, 0x20, 0xfd, 0x0d, 0xa6, 0x7c, 0x57, 0x35, 0x52, 0x65, 0x56, 0x9f, 0x06, 0x19, 0xc7,
-    0x05, 0x9e, 0x26, 0x2c, 0x28, 0x79, 0x76, 0x7a, 0x9a, 0x30, 0xfd, 0xed, 0x33, 0xd5, 0xd2, 0x7c, 0x33, 0xe7, 0x33,
-    0xcb, 0x07, 0x26, 0xb4, 0x41, 0x0d, 0xd0, 0x9e, 0x70, 0x64, 0xd2, 0xe7, 0xa0, 0x45, 0xd8, 0xfa, 0x4c, 0x7e, 0x37,
-    0x98, 0xfc, 0xa9, 0x4b, 0xc9, 0x7e, 0x65, 0x40, 0xb3, 0xea, 0x8a, 0x2e, 0x4c, 0x91, 0x02, 0x32, 0x2e, 0x95, 0xdb,
-    0x12, 0xa0, 0x9d, 0xe3, 0x47, 0x4e, 0x74, 0xca, 0xd2, 0xca, 0x37, 0x85, 0x34, 0x9b, 0xc0, 0x8f, 0x1e, 0x88, 0x29,
-    0xc4, 0x67, 0x02, 0xf5, 0xb8, 0x22, 0x0e, 0xe8, 0xd4, 0xd6, 0x68, 0xac, 0x2a, 0x0c, 0xcd, 0xa5, 0xa8, 0x9c, 0x93,
-    0xd5, 0x79, 0xd6, 0x8a, 0xe6, 0xeb, 0x85, 0xf2, 0xdd, 0xa6, 0xbb, 0x45, 0x34, 0x14, 0xe7, 0x76, 0x5f, 0xdb, 0x98,
-    0x35, 0x9a, 0x29, 0xeb, 0x5e, 0x38, 0x9a, 0xe8, 0x24, 0xbb, 0xa8, 0xdb, 0x48, 0x26, 0x0c, 0x68, 0x3e, 0xe9, 0xbd,
-    0x57, 0x75, 0xaa, 0xa0, 0x34, 0xbd, 0xa2, 0x22, 0xd3, 0x8b, 0x48, 0x83, 0x7c, 0x60, 0xb0, 0x03, 0xa9, 0x60, 0xca,
-    0x30, 0x0f, 0x71, 0x17, 0x6d, 0x47, 0xa0, 0x32, 0x6d, 0x2b, 0x60, 0x51, 0x3a, 0xe4, 0xe8, 0x6b, 0xc2, 0x0e, 0x7d,
-    0xab, 0x06, 0x70, 0xaa, 0x6d, 0xb3, 0xdb, 0x19, 0x3e, 0x98, 0x16, 0xe7, 0xc7, 0x7e, 0x71, 0xee, 0xc1, 0x3f, 0xeb,
-    0xf3, 0x25, 0xb0, 0xb0, 0x93, 0x4f, 0x31, 0x07, 0x85, 0x71, 0xde, 0x42, 0xa3, 0x98, 0xdc, 0x3b, 0x92, 0xd7, 0x53,
-    0xa8, 0x45, 0x5c, 0x89, 0xe8, 0x2d, 0x0a, 0xb4, 0x40, 0x48, 0xd5, 0x0e, 0xd2, 0x2c, 0x65, 0xbd, 0x7a, 0x48, 0xcd,
-    0xd4, 0x76, 0x15, 0xb6, 0x86, 0xcb, 0x0c, 0x2d, 0x16, 0x7e, 0x09, 0x16, 0x8b, 0x90, 0x11, 0x6d, 0x15, 0x8e, 0x69,
-    0xaf, 0x6d, 0x1f, 0x48, 0x64, 0x6e, 0x93, 0x28, 0xcc, 0x57, 0x55, 0xfa, 0xeb, 0x54, 0xf2, 0xdb, 0x02, 0x4c, 0xdd,
-    0x07, 0x0f, 0x3c, 0xf5, 0xcf, 0x88, 0xcc, 0x35, 0x8b, 0x29, 0xc0, 0x74, 0x17, 0xc8, 0x82, 0x68, 0x82, 0x5f, 0x10,
-    0xbb, 0x4b, 0xcb, 0x13, 0xca, 0xee, 0x5a, 0xa2, 0xcc, 0x0a, 0x3a, 0x8f, 0xc1, 0xc6, 0xb8, 0xf3, 0xf0, 0x37, 0x2f,
-    0xbf, 0x94, 0x38, 0x52, 0x97, 0xf4, 0x6c, 0xbb, 0x87, 0xa7, 0x39, 0x89, 0x2e, 0xc1, 0xd4, 0x21, 0x01, 0x7a, 0x82,
-    0xce, 0xae, 0xde, 0x3c, 0x93, 0x91, 0xd2, 0x9c, 0x25, 0xf4, 0x99, 0x7e, 0xb9, 0x15, 0xbb, 0x0f, 0xe7, 0x17, 0x6a,
-    0x37, 0x3a, 0x8d, 0x08, 0xe8, 0x9f, 0x1a, 0xe8, 0xbc, 0x3e, 0xb2, 0x5a, 0x0f, 0xd6, 0x3d, 0x00, 0x18, 0x84, 0xd4,
-    0x6e, 0xe5, 0x02, 0xaa, 0x36, 0x94, 0x18, 0xa1, 0xde, 0x6a, 0x20, 0xcb, 0xdf, 0x05, 0x09, 0x11, 0x81, 0xbd, 0x8b,
-    0x9f, 0x72, 0x8b, 0xc1, 0xa0, 0x92, 0x9a, 0xc1, 0x2c, 0x1e, 0x8f, 0x13, 0xd6, 0x53, 0xc2, 0xdf, 0xea, 0x3c, 0xc4,
-    0x48, 0xa9, 0xb9, 0x65, 0xf5, 0x5d, 0x31, 0x90, 0xa7, 0xf1, 0x14, 0x9d, 0x80, 0x32, 0x82, 0xdf, 0x63, 0x5b, 0x8b,
-    0x4e, 0x19, 0x42, 0x6c, 0x57, 0xc8, 0xa3, 0xe7, 0xfa, 0x5a, 0x1e, 0x80, 0x26, 0x44, 0x1b, 0x0e, 0x46, 0x75, 0x36,
-    0x0f, 0x5a, 0xbb, 0xf5, 0x85, 0x60, 0x95, 0x5e, 0x82, 0xb7, 0x66, 0x59, 0x1e, 0xd0, 0x44, 0x4b, 0x7c, 0xf8, 0xc7,
-    0xf2, 0x3b, 0xb2, 0x8c, 0x06, 0xc0, 0x6f, 0x7e, 0xe9, 0xa2, 0xb2, 0xbe, 0x98, 0xff, 0x3f, 0xa7, 0xe5, 0x8b, 0xf5,
-    0xa7, 0xe5, 0x0b, 0x75, 0x5a, 0x6e, 0xa6, 0xd8, 0xcf, 0x26, 0x1d, 0xfc, 0xd3, 0xab, 0x16, 0x04, 0xbb, 0x02, 0xe8,
-    0xb0, 0x50, 0xe9, 0x6b, 0x75, 0xe1, 0x3f, 0x1a, 0xba, 0xed, 0xe1, 0x1f, 0x1f, 0xd4, 0x9b, 0xb6, 0x85, 0x85, 0xf8,
-    0xaf, 0x5d, 0xab, 0xea, 0xdc, 0xc7, 0x3a, 0xec, 0xf5, 0x60, 0xb5, 0xae, 0x7b, 0xf3, 0xa1, 0x05, 0x7e, 0xc5, 0x9d,
-    0x40, 0x31, 0x63, 0xb0, 0x43, 0xa2, 0x93, 0x13, 0x28, 0x9d, 0x64, 0xa3, 0x45, 0xf1, 0x8f, 0x12, 0x7e, 0x89, 0xc4,
-    0x1b, 0x8f, 0x74, 0x63, 0x1c, 0xd5, 0x55, 0x84, 0xdd, 0xd5, 0x08, 0x4b, 0xbd, 0x4f, 0x41, 0x01, 0x84, 0xc9, 0x9c,
-    0xae, 0x7f, 0x7f, 0xcd, 0x21, 0xf8, 0xbb, 0xec, 0xcd, 0xda, 0xc5, 0xfc, 0x7b, 0x91, 0x71, 0x23, 0x12, 0x7e, 0x17,
-    0x0e, 0xcc, 0x3d, 0x6c, 0x3f, 0x5e, 0x0f, 0xee, 0x91, 0x9a, 0x69, 0xa8, 0x84, 0x82, 0x94, 0x3b, 0xa0, 0xe2, 0x46,
-    0x8b, 0x84, 0xdf, 0x3c, 0xea, 0x75, 0x94, 0xb1, 0x32, 0xea, 0x0d, 0x0c, 0xbd, 0x6a, 0x7b, 0x47, 0x2e, 0xfd, 0xd9,
-    0x17, 0xf7, 0xf1, 0x8f, 0xf0, 0xea, 0x9c, 0x54, 0x8a, 0xbf, 0x30, 0x7c, 0x51, 0xf1, 0xdf, 0xac, 0x69, 0xf6, 0x42,
-    0x82, 0x93, 0x72, 0x7f, 0xd7, 0xd6, 0xa8, 0xcf, 0xde, 0xa9, 0xb9, 0xd4, 0x83, 0x7e, 0x57, 0xeb, 0xdf, 0x37, 0xf8,
-    0x1d, 0xdb, 0x8e, 0x84, 0xce, 0x5c, 0x6f, 0x2b, 0x7f, 0x65, 0xc2, 0x6a, 0x63, 0x81, 0xe7, 0xbb, 0x36, 0x57, 0x1b,
-    0x44, 0xed, 0x37, 0xc3, 0x13, 0x6d, 0x1e, 0xc9, 0xb0, 0x1b, 0xb6, 0x17, 0x16, 0xd2, 0xb7, 0x2c, 0xbc, 0x87, 0x9f,
-    0x1a, 0xb2, 0x2e, 0x66, 0x49, 0x0a, 0x3a, 0xd5, 0x94, 0xf3, 0x79, 0xb0, 0xb3, 0x73, 0x7e, 0x7e, 0xee, 0x9f, 0xef,
-    0xfa, 0x59, 0x7e, 0xba, 0xd3, 0x6d, 0xb7, 0xdb, 0xf8, 0x85, 0x18, 0xdb, 0x3a, 0x8b, 0xd9, 0xf9, 0x97, 0xd9, 0x45,
-    0x68, 0x3f, 0xb2, 0x1e, 0x5b, 0x8f, 0x76, 0xad, 0x07, 0x0f, 0x6d, 0x8b, 0xb8, 0x3f, 0x94, 0xec, 0xda, 0x96, 0xe0,
-    0xfe, 0xa1, 0x0d, 0xc5, 0xfd, 0xbd, 0x53, 0xa5, 0xc0, 0x61, 0x06, 0xae, 0x50, 0x8f, 0xc0, 0x66, 0xc9, 0x3e, 0xb1,
-    0xfa, 0x39, 0x17, 0x65, 0x2d, 0x29, 0x43, 0xd4, 0x2b, 0x1e, 0xf6, 0x51, 0x34, 0x0f, 0x88, 0x86, 0xcc, 0x42, 0x74,
-    0x00, 0x89, 0x52, 0x9a, 0x02, 0xa3, 0xba, 0x27, 0xf0, 0x04, 0x1a, 0xfb, 0xd4, 0x82, 0xe7, 0x57, 0xdd, 0x47, 0x20,
-    0xe0, 0xce, 0x5a, 0xf7, 0x47, 0xed, 0x56, 0xc7, 0xea, 0xb4, 0xba, 0xfe, 0x23, 0xab, 0x2b, 0xfe, 0x07, 0x06, 0xb9,
-    0x6b, 0x75, 0xe0, 0x69, 0xd7, 0x82, 0xf7, 0xb3, 0xfb, 0x22, 0x24, 0x1c, 0xd9, 0x3b, 0xfd, 0x3d, 0xfc, 0x85, 0x29,
-    0xb0, 0xa8, 0x2f, 0x6c, 0xf1, 0x2b, 0x9e, 0xec, 0xcf, 0xcc, 0xd2, 0xce, 0xe3, 0xb5, 0xc5, 0xdd, 0x47, 0x6b, 0x8b,
-    0x77, 0x1f, 0xae, 0x2d, 0xbe, 0xff, 0xa0, 0x5e, 0xbc, 0x73, 0x2a, 0xaa, 0x34, 0x53, 0x08, 0xed, 0x59, 0x04, 0x54,
-    0x72, 0xe1, 0x74, 0x00, 0xce, 0xb6, 0xd5, 0xc2, 0x1f, 0x8f, 0xba, 0xae, 0xee, 0x75, 0x82, 0xbd, 0xf4, 0x2a, 0x1f,
-    0x3d, 0x86, 0x55, 0x3e, 0xef, 0x3e, 0x1c, 0x61, 0x3b, 0x5a, 0x28, 0xfc, 0x3b, 0xdb, 0x7d, 0x3c, 0x02, 0x71, 0x60,
-    0xe1, 0x3f, 0xf8, 0x33, 0x7d, 0xd0, 0x1d, 0x89, 0x97, 0x36, 0xd6, 0x7f, 0xe8, 0x3c, 0x2a, 0xa0, 0x29, 0xfe, 0xf9,
-    0x4d, 0xeb, 0xcf, 0xa8, 0xbe, 0x9b, 0xe3, 0xde, 0x07, 0x1c, 0x3d, 0x9e, 0x76, 0xfd, 0x2f, 0xce, 0x1e, 0xf9, 0x8f,
-    0xa7, 0x9d, 0x47, 0x1f, 0xc4, 0x5b, 0x02, 0x18, 0xfc, 0x02, 0xff, 0x7d, 0xd8, 0x6d, 0x83, 0x69, 0xeb, 0x3f, 0x3e,
-    0xdb, 0xf5, 0x77, 0x93, 0xd6, 0x43, 0xff, 0x31, 0xfe, 0xab, 0x86, 0x9b, 0x66, 0x33, 0x66, 0x5b, 0xb8, 0xdf, 0x0d,
-    0xbb, 0xd0, 0x9c, 0xa3, 0x7b, 0xdf, 0x7a, 0x70, 0xff, 0xf9, 0x63, 0xd8, 0xa3, 0x69, 0xa7, 0x0b, 0xff, 0x5f, 0xf7,
-    0xf8, 0x01, 0x11, 0x2f, 0x07, 0x8e, 0x18, 0xe6, 0xce, 0x29, 0xc4, 0xd1, 0xd7, 0x8a, 0xee, 0x79, 0x3f, 0x5e, 0x67,
-    0xda, 0xff, 0x70, 0xbb, 0x69, 0xff, 0xd7, 0x3b, 0xba, 0x6f, 0x7f, 0xf8, 0x93, 0x6d, 0xfb, 0x1f, 0x9b, 0xb6, 0xfd,
-    0x39, 0x5b, 0x31, 0xee, 0x9b, 0xf6, 0xd9, 0x21, 0x73, 0x8e, 0xbe, 0x65, 0x43, 0xcc, 0x13, 0x85, 0xd6, 0x7f, 0xad,
-    0x79, 0x3a, 0x32, 0x3c, 0xc8, 0xe7, 0x4c, 0x9c, 0xe4, 0xef, 0xaf, 0x43, 0x08, 0xe3, 0xb7, 0x22, 0xe4, 0xc5, 0xdd,
-    0xf0, 0x41, 0x9f, 0x16, 0xff, 0x13, 0xf1, 0xf1, 0xbd, 0x89, 0x8f, 0x9a, 0x2f, 0x99, 0x8c, 0x79, 0xb2, 0xc1, 0x0f,
-    0xe8, 0xdd, 0xb1, 0x77, 0x18, 0xbe, 0x15, 0xb6, 0x48, 0x7e, 0x7a, 0xf7, 0x7b, 0xfc, 0xde, 0x22, 0x8d, 0x32, 0xb4,
-    0xa5, 0x83, 0x62, 0x8e, 0x1f, 0xe3, 0x54, 0x2f, 0x67, 0x22, 0x55, 0x3f, 0xa4, 0x7b, 0x36, 0xf7, 0xb5, 0x73, 0x03,
-    0x33, 0x5b, 0xc3, 0x65, 0xc6, 0x23, 0xfc, 0x6d, 0x2f, 0x3c, 0xe6, 0x09, 0xde, 0x02, 0x94, 0x37, 0x66, 0x30, 0x11,
-    0xf3, 0x5b, 0x4c, 0x22, 0x55, 0xee, 0xef, 0x19, 0x3a, 0x0c, 0x5e, 0xb1, 0x71, 0x1c, 0x39, 0xb6, 0x33, 0x87, 0x13,
-    0x0b, 0x63, 0xb6, 0x6a, 0x19, 0x9c, 0x94, 0xbc, 0xe9, 0xda, 0xea, 0x17, 0x8c, 0xe4, 0xf8, 0xc1, 0xa6, 0xf0, 0x48,
-    0xba, 0xce, 0x6c, 0xa9, 0xfe, 0xc3, 0xf8, 0xaa, 0x24, 0x47, 0xd6, 0x5d, 0xa9, 0x0c, 0xb6, 0xd0, 0x19, 0x3a, 0x7e,
-    0x17, 0x6c, 0x08, 0x2a, 0xc6, 0x0f, 0xe0, 0xfc, 0xe0, 0xb4, 0x76, 0x41, 0xa7, 0x31, 0xba, 0xe9, 0x81, 0x86, 0x2b,
-    0x1f, 0xdf, 0x14, 0x7e, 0x83, 0x46, 0xa9, 0xa7, 0x7f, 0xe3, 0x12, 0x50, 0x86, 0xca, 0xf5, 0xff, 0xf2, 0xf2, 0x50,
-    0x5e, 0x72, 0xb5, 0xd1, 0x27, 0x49, 0xbe, 0xe8, 0xea, 0x03, 0x3b, 0xdb, 0x20, 0x2e, 0xe8, 0xd7, 0xde, 0x51, 0x50,
-    0x16, 0x25, 0x02, 0xe6, 0x98, 0x5a, 0xd2, 0x6c, 0x08, 0x6d, 0x21, 0x0f, 0xc6, 0xec, 0x2c, 0x1e, 0x49, 0xb6, 0xee,
-    0x59, 0x32, 0x37, 0xbe, 0x45, 0xab, 0x08, 0x3b, 0x9e, 0x30, 0x9c, 0xe1, 0x05, 0x65, 0x54, 0x98, 0x66, 0x76, 0xff,
-    0x5e, 0x4f, 0x43, 0x52, 0x4f, 0xcf, 0xb5, 0xf1, 0x77, 0xf0, 0x1d, 0x81, 0xa1, 0xf6, 0x8f, 0xe1, 0x3d, 0xfc, 0x2d,
-    0x7c, 0xf7, 0x86, 0xb6, 0xeb, 0x13, 0x53, 0xbc, 0x57, 0xfd, 0x2a, 0x3e, 0xe4, 0x08, 0xdb, 0x20, 0xbf, 0xbc, 0xbb,
-    0x0a, 0x32, 0x29, 0xb4, 0xba, 0x0f, 0x2a, 0xa1, 0x05, 0xcf, 0x06, 0x97, 0x02, 0x06, 0xda, 0xf5, 0x1f, 0x18, 0xac,
-    0xf0, 0xac, 0x85, 0x3f, 0x6b, 0xcc, 0xf0, 0x3e, 0x34, 0x50, 0xdc, 0xf0, 0x25, 0x34, 0xdf, 0x15, 0x8c, 0x17, 0xfa,
-    0xfd, 0x48, 0xac, 0x4a, 0xb0, 0xa9, 0x3a, 0xc5, 0xac, 0x09, 0x8f, 0x88, 0x78, 0xb6, 0xed, 0x39, 0xfa, 0xfb, 0xfe,
-    0x92, 0x5c, 0xe5, 0xe5, 0xa4, 0xa7, 0xd0, 0xd7, 0xd1, 0xdf, 0xad, 0x5d, 0x57, 0xe7, 0xd5, 0x4e, 0xce, 0x9a, 0x29,
-    0x90, 0xe0, 0x1b, 0x21, 0x18, 0xca, 0xd5, 0x16, 0xdf, 0x6f, 0x12, 0xc7, 0xb8, 0xfa, 0xc2, 0xd5, 0x9a, 0x74, 0x43,
-    0xf3, 0x50, 0xb0, 0x8a, 0x68, 0xe8, 0x5c, 0x00, 0x23, 0xa0, 0x9f, 0x55, 0xb1, 0x7a, 0x90, 0x04, 0xe5, 0x27, 0x11,
-    0xfe, 0xfa, 0x09, 0xfa, 0x51, 0x56, 0x07, 0x90, 0xd3, 0x07, 0xfa, 0x08, 0xd2, 0x17, 0xe3, 0xb2, 0xb9, 0x08, 0xd0,
-    0x17, 0xf0, 0xb7, 0x99, 0x55, 0xb9, 0xe1, 0xf2, 0xd2, 0x17, 0x86, 0xc1, 0xc7, 0x71, 0x4e, 0x77, 0x09, 0xd5, 0xfa,
-    0x6b, 0xd7, 0xfc, 0x2a, 0x54, 0xd3, 0xa9, 0x64, 0xc5, 0xc0, 0xc6, 0x22, 0x5b, 0x65, 0xe9, 0x98, 0x5f, 0xa8, 0x35,
-    0x2f, 0x7b, 0x8d, 0x45, 0x9a, 0x0e, 0x7e, 0xc1, 0xdb, 0x16, 0x48, 0xb6, 0x81, 0x8d, 0x5d, 0xbb, 0x26, 0x52, 0x6e,
-    0xf0, 0x8e, 0x54, 0xf5, 0x2b, 0x59, 0xcc, 0x03, 0x6f, 0x9b, 0xbb, 0xa5, 0xc7, 0xa5, 0x7d, 0x70, 0xa5, 0xa7, 0xf0,
-    0x84, 0x45, 0xdc, 0x8f, 0x52, 0xca, 0xf7, 0x70, 0x0c, 0xb6, 0xe0, 0x75, 0xd8, 0xae, 0x5b, 0x02, 0xe7, 0x31, 0x7e,
-    0x67, 0x8d, 0x40, 0xbd, 0x0f, 0x85, 0x6e, 0xe5, 0xb5, 0x9b, 0x76, 0xfb, 0x6f, 0x0e, 0xf7, 0x2d, 0x71, 0x9a, 0xf7,
-    0x76, 0xe0, 0x75, 0x8f, 0x6c, 0x61, 0x91, 0x52, 0x10, 0x8a, 0x94, 0x02, 0x4b, 0x64, 0xc3, 0x84, 0xf6, 0x8e, 0x58,
-    0xa6, 0x6d, 0xb1, 0x74, 0x24, 0x3c, 0x78, 0x33, 0xb0, 0x15, 0x62, 0xfc, 0x8a, 0xd1, 0x0e, 0x76, 0x6b, 0xe1, 0x4e,
-    0xc3, 0x11, 0x10, 0x3e, 0x3e, 0xa5, 0x20, 0xf0, 0xd4, 0x96, 0xfe, 0x3e, 0x10, 0xeb, 0x4c, 0x65, 0x62, 0xc8, 0xa1,
-    0x74, 0x5e, 0xde, 0x6a, 0xeb, 0x62, 0x71, 0x32, 0x03, 0x3e, 0xa4, 0x92, 0x29, 0xde, 0xcb, 0x0e, 0x7b, 0x34, 0x15,
-    0x66, 0x01, 0xae, 0x3a, 0x21, 0xa7, 0x9d, 0xfe, 0x5e, 0x24, 0xf5, 0x1d, 0x3c, 0xbb, 0x05, 0x1c, 0x5e, 0x10, 0x73,
-    0xa8, 0x54, 0xf8, 0x71, 0xb6, 0x73, 0xce, 0x4e, 0x5a, 0xd1, 0x3c, 0xae, 0x7c, 0x7f, 0x28, 0xfd, 0xfa, 0x7b, 0x4a,
-    0x10, 0xca, 0x84, 0x33, 0xf9, 0x18, 0x19, 0x89, 0x07, 0x88, 0x38, 0x22, 0xd0, 0x52, 0x3a, 0x16, 0x49, 0x69, 0x04,
-    0xe4, 0x03, 0xac, 0x44, 0xbf, 0xca, 0x01, 0x29, 0x25, 0x41, 0x69, 0xf7, 0xff, 0xf6, 0xbf, 0xfe, 0xb7, 0xf4, 0x29,
-    0x02, 0x5a, 0x01, 0x2c, 0xcc, 0xdc, 0xa8, 0x62, 0x67, 0xec, 0x02, 0xac, 0xd0, 0x78, 0xdc, 0x9a, 0x46, 0xc9, 0x04,
-    0x20, 0x28, 0x98, 0xb8, 0xbb, 0x21, 0xeb, 0x81, 0x0a, 0x24, 0x58, 0x66, 0xd8, 0x59, 0x82, 0x57, 0x2f, 0xc2, 0x1d,
-    0xfb, 0x43, 0x19, 0x7c, 0x2a, 0xb7, 0x94, 0x08, 0xda, 0xc8, 0xe7, 0x33, 0x68, 0xae, 0x96, 0xd3, 0xa7, 0x7e, 0x23,
-    0x8c, 0x64, 0x1e, 0xac, 0x96, 0xd0, 0x07, 0x2d, 0x75, 0xa0, 0xe0, 0xdf, 0xfe, 0xf5, 0x3f, 0xff, 0x77, 0xf5, 0x8a,
-    0xfe, 0xff, 0xbf, 0xfd, 0xcb, 0x3f, 0xfd, 0xdf, 0xff, 0xf3, 0x5f, 0x30, 0x39, 0x52, 0xc6, 0x08, 0xe8, 0x28, 0x59,
-    0x55, 0x80, 0x40, 0x9c, 0xa9, 0x7a, 0xb6, 0xdf, 0x01, 0xcd, 0x42, 0x04, 0x29, 0x41, 0x22, 0x62, 0xa6, 0x24, 0x50,
-    0x42, 0xd5, 0x0d, 0x38, 0x83, 0xfd, 0xb3, 0x28, 0x4a, 0x6d, 0x3f, 0x68, 0xdb, 0xd5, 0x9e, 0xf6, 0x8d, 0xbe, 0x3b,
-    0xb8, 0x1b, 0x77, 0xca, 0x14, 0xf1, 0xf5, 0x5e, 0x2d, 0x95, 0xe3, 0x0a, 0x4b, 0xca, 0xaa, 0xdc, 0x42, 0x8f, 0xf2,
-    0x12, 0x5f, 0x83, 0xae, 0x51, 0x4c, 0x5b, 0x5b, 0xeb, 0xd3, 0xfb, 0x65, 0x51, 0xf0, 0x78, 0x82, 0xfb, 0x21, 0xdc,
-    0x63, 0x14, 0x0a, 0x6c, 0xa1, 0x4a, 0x92, 0x5c, 0x96, 0x34, 0x8a, 0x30, 0x61, 0xee, 0x3f, 0xfe, 0x87, 0xf2, 0x2f,
-    0x33, 0x54, 0x05, 0x2c, 0x67, 0x16, 0x5d, 0x48, 0xc3, 0xe6, 0x61, 0xbb, 0x3d, 0xbf, 0x70, 0x97, 0xd5, 0x0c, 0xde,
-    0x75, 0x93, 0x91, 0x4b, 0xcd, 0x1c, 0x90, 0x62, 0x88, 0xda, 0x7b, 0x07, 0xba, 0x7c, 0x1b, 0x9d, 0x3d, 0x65, 0xf9,
-    0xf9, 0x92, 0x1c, 0x48, 0xf1, 0x6f, 0x18, 0xeb, 0x93, 0xbe, 0x36, 0x28, 0x31, 0x56, 0xb1, 0x34, 0x7a, 0x75, 0x45,
-    0xaf, 0x69, 0x67, 0x35, 0xd3, 0xc4, 0x8c, 0x55, 0x9a, 0x51, 0x46, 0xcc, 0xc3, 0x80, 0x0e, 0xde, 0xb4, 0xbb, 0xd4,
-    0xc3, 0x73, 0x9e, 0xcd, 0xcc, 0xe0, 0x24, 0x8b, 0xd8, 0x88, 0x4d, 0x94, 0x8f, 0x52, 0xd6, 0x8b, 0xc0, 0x63, 0xf9,
-    0x19, 0x9e, 0x31, 0xc0, 0x6d, 0x16, 0xf1, 0x80, 0x28, 0xb5, 0x67, 0x86, 0x2f, 0x23, 0x0c, 0x0c, 0x67, 0x4b, 0x63,
-    0xae, 0x9e, 0x68, 0x8a, 0x9e, 0xc0, 0x7a, 0x7e, 0x4a, 0xe9, 0x53, 0x77, 0x73, 0x28, 0xe1, 0x48, 0x78, 0x51, 0x65,
-    0x87, 0x54, 0x26, 0xf6, 0xbb, 0x9a, 0x39, 0x2e, 0x99, 0x31, 0x18, 0xc1, 0xb7, 0x37, 0x16, 0x52, 0x52, 0x34, 0xfd,
-    0x15, 0x94, 0x1f, 0x5a, 0x80, 0xdd, 0x6c, 0x45, 0x85, 0xd8, 0xea, 0x5d, 0xf8, 0x42, 0xab, 0xe2, 0xd1, 0x7c, 0x4e,
-    0x0d, 0x5d, 0xa0, 0x53, 0x52, 0xa9, 0x91, 0x71, 0x50, 0x2c, 0x5c, 0x84, 0x9e, 0x65, 0x1b, 0x49, 0xd0, 0xe2, 0x49,
-    0x06, 0xa5, 0xe9, 0xf7, 0x0d, 0xff, 0x3f, 0xdf, 0x8d, 0x21, 0x2b, 0x85, 0x78, 0x00, 0x00};
+    0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0xbd, 0x7d, 0xc9, 0x76, 0xdb, 0xc8, 0xb2, 0xe0, 0xba,
+    0xcf, 0xe9, 0x3f, 0xe8, 0x0d, 0x84, 0xd2, 0x93, 0x81, 0x12, 0x08, 0x91, 0x94, 0x65, 0xbb, 0x40, 0x41, 0xbc, 0xf2,
+    0x50, 0xd7, 0xae, 0xf2, 0x54, 0x96, 0xec, 0x1a, 0x54, 0x2c, 0x0b, 0x22, 0x93, 0x22, 0xca, 0x20, 0xc0, 0x02, 0x92,
+    0x1a, 0x8a, 0xc2, 0x3b, 0xbd, 0xea, 0x55, 0x9f, 0xd3, 0xe3, 0xe2, 0x6d, 0xfa, 0xbc, 0x5e, 0xf4, 0x47, 0xf4, 0xba,
+    0x3f, 0xe5, 0xfe, 0x40, 0xbf, 0x4f, 0xe8, 0x88, 0xc8, 0x01, 0x09, 0x90, 0x1a, 0x5c, 0xaf, 0xfa, 0x1e, 0x0f, 0x02,
+    0x72, 0x8c, 0x88, 0x8c, 0x8c, 0x29, 0x23, 0xa1, 0xdd, 0xb5, 0x51, 0x36, 0xe4, 0x97, 0x33, 0x66, 0x4d, 0xf8, 0x34,
+    0xd9, 0xdb, 0x95, 0xff, 0xb3, 0x68, 0xb4, 0xb7, 0x9b, 0xc4, 0xe9, 0x27, 0x2b, 0x67, 0x49, 0x18, 0x0f, 0xb3, 0xd4,
+    0x9a, 0xe4, 0x6c, 0x1c, 0x8e, 0x22, 0x1e, 0x05, 0xf1, 0x34, 0x3a, 0x65, 0xd6, 0xd6, 0xde, 0xee, 0x94, 0xf1, 0xc8,
+    0x1a, 0x4e, 0xa2, 0xbc, 0x60, 0x3c, 0x7c, 0x7f, 0xf8, 0x75, 0xeb, 0xd1, 0xde, 0x6e, 0x31, 0xcc, 0xe3, 0x19, 0xb7,
+    0x70, 0xc8, 0x70, 0x9a, 0x8d, 0xe6, 0x09, 0xdb, 0x3b, 0x8b, 0x72, 0xeb, 0x82, 0x85, 0x6f, 0x4e, 0x7e, 0x65, 0x43,
+    0xee, 0x8f, 0xd8, 0x38, 0x4e, 0xd9, 0xdb, 0x3c, 0x9b, 0xb1, 0x9c, 0x5f, 0x7a, 0xcf, 0x56, 0x57, 0xc4, 0xac, 0xf0,
+    0x0e, 0x74, 0xd5, 0x29, 0xe3, 0x6f, 0xce, 0x53, 0xd5, 0xe7, 0x29, 0x13, 0x93, 0x64, 0x79, 0xe1, 0xf1, 0x6b, 0xda,
+    0x1c, 0x5c, 0x4e, 0x4f, 0xb2, 0xa4, 0xf0, 0x3e, 0xe9, 0xfa, 0x59, 0x9e, 0xf1, 0x0c, 0xc1, 0xf2, 0x27, 0x51, 0x61,
+    0xb4, 0xf4, 0x9e, 0xac, 0x68, 0x32, 0x93, 0x95, 0x2f, 0x8a, 0x67, 0xe9, 0x7c, 0xca, 0xf2, 0xe8, 0x24, 0x61, 0x5e,
+    0xc1, 0x42, 0x87, 0x79, 0xdc, 0x8b, 0xdd, 0x70, 0x8f, 0x5b, 0x71, 0x6a, 0xb1, 0xfe, 0x05, 0xa3, 0x92, 0x05, 0xd3,
+    0xad, 0x82, 0xb5, 0xb6, 0x07, 0xe4, 0x1a, 0xc7, 0xa7, 0x73, 0xfd, 0x7e, 0x9e, 0xc7, 0x5c, 0x3d, 0x9f, 0x45, 0xc9,
+    0x9c, 0x05, 0x71, 0xe9, 0x06, 0xec, 0x88, 0x0f, 0xc2, 0xd8, 0x7b, 0x42, 0x83, 0xc2, 0x90, 0x8b, 0x71, 0x96, 0x3b,
+    0x48, 0xab, 0x18, 0xc7, 0xe6, 0x57, 0x57, 0x0e, 0x0f, 0x17, 0xa5, 0xeb, 0x7e, 0x62, 0xfe, 0x30, 0x4a, 0x12, 0x07,
+    0x27, 0xde, 0xd8, 0x28, 0x70, 0xc6, 0xd8, 0xe3, 0x47, 0xf1, 0xc0, 0xed, 0xc5, 0x63, 0x87, 0x33, 0xb7, 0xea, 0x97,
+    0x8d, 0x2d, 0xce, 0x1c, 0xee, 0xba, 0x4f, 0xae, 0xef, 0x93, 0x33, 0x3e, 0xcf, 0x01, 0xf6, 0xd2, 0x7b, 0xa3, 0x66,
+    0x7e, 0x86, 0xf5, 0x07, 0xd4, 0xb1, 0x07, 0xb0, 0x17, 0xdc, 0xfa, 0x10, 0x9e, 0xc7, 0xe9, 0x28, 0x3b, 0xf7, 0x0f,
+    0x26, 0x11, 0xfc, 0x78, 0x97, 0x65, 0x7c, 0x63, 0xc3, 0x39, 0xcb, 0xe2, 0x91, 0xd5, 0x0e, 0x43, 0xb3, 0xf2, 0xf2,
+    0xc9, 0xc1, 0xc1, 0xd5, 0x55, 0xa3, 0xc0, 0x4f, 0x23, 0x1e, 0x9f, 0x31, 0xd1, 0x19, 0x00, 0xb0, 0xe1, 0xe7, 0x8c,
+    0xb3, 0xd1, 0x01, 0xbf, 0x4c, 0xa0, 0x94, 0x31, 0x5e, 0xd8, 0x80, 0xe3, 0xd3, 0x6c, 0x08, 0x64, 0x4b, 0x0d, 0xc2,
+    0x43, 0xd3, 0x9c, 0xcd, 0x92, 0x68, 0xc8, 0xb0, 0x1e, 0x46, 0xaa, 0x7a, 0x54, 0x8d, 0xbc, 0xaf, 0x43, 0xb1, 0xbc,
+    0x8e, 0xeb, 0xc5, 0x2c, 0x4c, 0xd9, 0xb9, 0xf5, 0x2a, 0x9a, 0xf5, 0x86, 0x49, 0x54, 0x14, 0xc0, 0xaf, 0x0b, 0x42,
+    0x21, 0x9f, 0x0f, 0x81, 0x41, 0x08, 0xc1, 0x05, 0x92, 0x69, 0x12, 0x17, 0xfe, 0xc7, 0xf5, 0x61, 0x51, 0xbc, 0x63,
+    0xc5, 0x3c, 0xe1, 0xeb, 0x21, 0xac, 0x05, 0x5f, 0x0b, 0xc3, 0xaf, 0x5d, 0x3e, 0xc9, 0xb3, 0x73, 0xeb, 0x59, 0x9e,
+    0x43, 0x73, 0x1b, 0xa6, 0x14, 0x0d, 0xac, 0xb8, 0xb0, 0xd2, 0x8c, 0x5b, 0x7a, 0x30, 0x5c, 0x40, 0xdf, 0x7a, 0x5f,
+    0x30, 0xeb, 0x78, 0x9e, 0x16, 0xd1, 0x98, 0x41, 0xd3, 0x63, 0x2b, 0xcb, 0xad, 0x63, 0x18, 0xf4, 0x18, 0x96, 0xac,
+    0xe0, 0xb0, 0x6b, 0x7c, 0xdb, 0xed, 0xd1, 0x5c, 0x50, 0x78, 0xc8, 0x2e, 0x78, 0xc8, 0x4a, 0x60, 0x4c, 0xab, 0xd0,
+    0x68, 0x38, 0xee, 0x22, 0x81, 0x02, 0x16, 0xc6, 0x0c, 0x59, 0xd6, 0x31, 0x1b, 0xeb, 0xc5, 0xf9, 0xb0, 0xb1, 0xa1,
+    0x69, 0x0d, 0x34, 0x71, 0xa0, 0x6d, 0xd1, 0x68, 0xeb, 0x09, 0xc4, 0x6b, 0x24, 0x72, 0x3d, 0xe6, 0x4b, 0xf2, 0x1d,
+    0x5c, 0xa6, 0xc3, 0xfa, 0xd8, 0x50, 0x59, 0xf2, 0xec, 0x80, 0xe7, 0x71, 0x7a, 0x0a, 0x40, 0xc8, 0x99, 0xcc, 0x26,
+    0x65, 0x29, 0x16, 0xff, 0x0d, 0x0b, 0x59, 0xb8, 0x87, 0xa3, 0xe7, 0xcc, 0xb1, 0x0b, 0xea, 0x61, 0x87, 0x21, 0x92,
+    0x1e, 0x18, 0x8c, 0xf5, 0x59, 0xc0, 0x36, 0x6d, 0xdb, 0xfb, 0xda, 0xf5, 0x2e, 0x91, 0x83, 0x7c, 0xdf, 0x27, 0xf6,
+    0x15, 0x9d, 0xe3, 0xb0, 0x83, 0x40, 0xfb, 0x09, 0x4b, 0x4f, 0xf9, 0xa4, 0xcf, 0x8e, 0xda, 0x83, 0x80, 0x03, 0x54,
+    0xa3, 0xf9, 0x90, 0x39, 0xc8, 0x8f, 0x5e, 0x8e, 0xdb, 0x67, 0xd3, 0x81, 0x29, 0x70, 0x61, 0xd6, 0x08, 0xc7, 0xda,
+    0xd2, 0xb8, 0x8a, 0x45, 0x15, 0x60, 0xc8, 0xe7, 0x36, 0xec, 0xb0, 0x13, 0x96, 0x1b, 0x70, 0xe8, 0x66, 0xbd, 0xda,
+    0x0a, 0xce, 0x61, 0x85, 0xa0, 0x9f, 0x35, 0x9e, 0xa7, 0x43, 0x1e, 0x83, 0xe0, 0xb2, 0x37, 0x01, 0x5c, 0xb1, 0x72,
+    0x7a, 0xe1, 0x6c, 0xb7, 0x74, 0x9d, 0xd8, 0xdd, 0x64, 0x47, 0xf9, 0x66, 0x67, 0xe0, 0x21, 0x94, 0x9a, 0xf8, 0x12,
+    0xf1, 0x18, 0x10, 0x2c, 0xbd, 0xb7, 0x4c, 0x6f, 0xcf, 0x0f, 0x7d, 0xe6, 0x2f, 0xf3, 0x71, 0xc8, 0xfd, 0x69, 0x34,
+    0x43, 0x6c, 0x18, 0xf1, 0x40, 0x94, 0x0e, 0x11, 0xba, 0xda, 0xba, 0x20, 0xc5, 0xfc, 0x8a, 0x05, 0x5c, 0x20, 0x08,
+    0xec, 0xd9, 0x67, 0xd1, 0x70, 0x02, 0x5b, 0xbc, 0x22, 0xdc, 0x48, 0x6d, 0x87, 0x61, 0xce, 0x22, 0xce, 0x9e, 0x25,
+    0x0c, 0xdf, 0x70, 0x05, 0xa0, 0xa7, 0xed, 0x7a, 0xb9, 0xda, 0x77, 0x49, 0xcc, 0x5f, 0x67, 0x30, 0x4f, 0x4f, 0x30,
+    0x09, 0x70, 0x71, 0xbe, 0xb1, 0x11, 0x23, 0x8b, 0xec, 0x73, 0x58, 0xad, 0x93, 0x39, 0x08, 0x01, 0x3b, 0xc5, 0x16,
+    0x36, 0x50, 0xdb, 0x8b, 0x7d, 0x0e, 0x44, 0x7c, 0x92, 0xa5, 0x1c, 0x86, 0x03, 0x78, 0x35, 0x07, 0xf9, 0xd1, 0x6c,
+    0xc6, 0xd2, 0xd1, 0x93, 0x49, 0x9c, 0x8c, 0x80, 0x1a, 0x25, 0xe0, 0x9b, 0xb1, 0x10, 0xf0, 0x04, 0x64, 0x82, 0x9b,
+    0x31, 0xa2, 0xe5, 0x43, 0x46, 0xe6, 0xa1, 0x6d, 0xf7, 0x50, 0x02, 0x49, 0x2c, 0x50, 0x06, 0xd1, 0xc2, 0xbd, 0x03,
+    0xd1, 0x5f, 0xb8, 0x7c, 0x33, 0x8c, 0xf5, 0x32, 0x4a, 0x02, 0xbf, 0x41, 0x49, 0x03, 0xf4, 0x67, 0x20, 0x03, 0x7b,
+    0x28, 0xb8, 0xbe, 0x97, 0x52, 0x27, 0x65, 0x0a, 0x43, 0x20, 0xc0, 0x10, 0x25, 0x88, 0xa4, 0xc1, 0xdb, 0x2c, 0xb9,
+    0x1c, 0xc7, 0x49, 0x72, 0x30, 0x9f, 0xcd, 0xb2, 0x9c, 0x7b, 0xdf, 0x84, 0x0b, 0x9e, 0x55, 0xb8, 0xd2, 0x26, 0x2f,
+    0xce, 0x63, 0x8e, 0x04, 0x75, 0x17, 0xc3, 0x08, 0x96, 0xfa, 0x71, 0x96, 0x25, 0x2c, 0x4a, 0x01, 0x0d, 0xd6, 0xb7,
+    0xed, 0x20, 0x9d, 0x27, 0x49, 0xef, 0x04, 0x86, 0xfd, 0xd4, 0xa3, 0x6a, 0x21, 0xf1, 0x03, 0x7a, 0xde, 0xcf, 0xf3,
+    0xe8, 0x12, 0x1a, 0x62, 0x1b, 0xe0, 0x45, 0x58, 0xad, 0x6f, 0x0e, 0xde, 0xbc, 0xf6, 0x05, 0xe3, 0xc7, 0xe3, 0x4b,
+    0x00, 0xb4, 0xac, 0xa4, 0xe6, 0x38, 0xcf, 0xa6, 0x8d, 0xa9, 0x91, 0x0e, 0x71, 0xc8, 0x7a, 0xd7, 0x80, 0x10, 0xd3,
+    0xc8, 0xb0, 0x4a, 0xcc, 0x84, 0xe0, 0x35, 0xf1, 0xb3, 0xac, 0xc4, 0x3d, 0xd0, 0xc7, 0x87, 0x40, 0x14, 0xc3, 0x94,
+    0x37, 0x43, 0xcb, 0xf3, 0xcb, 0x45, 0x1c, 0x12, 0x9c, 0x33, 0xd4, 0xbf, 0x08, 0xe3, 0x30, 0x82, 0xd9, 0x17, 0x62,
+    0xc0, 0x52, 0x41, 0x1c, 0x97, 0xa5, 0x97, 0x68, 0x26, 0x46, 0x89, 0x87, 0x02, 0x85, 0xc3, 0x36, 0xba, 0xba, 0x62,
+    0xf0, 0xe2, 0x7a, 0xdf, 0x86, 0x8b, 0x48, 0xe1, 0x83, 0x1a, 0x0a, 0xf7, 0x57, 0x20, 0xe4, 0x04, 0x6a, 0xb2, 0x33,
+    0xd0, 0x83, 0x00, 0xe7, 0x37, 0x1e, 0xe8, 0xff, 0x04, 0xa1, 0x58, 0xeb, 0x78, 0xa0, 0x41, 0x9f, 0x4c, 0xa2, 0xf4,
+    0x94, 0x8d, 0x82, 0x84, 0x95, 0x52, 0xf2, 0xee, 0x5b, 0xb0, 0xc6, 0xc0, 0x4e, 0x85, 0xf5, 0xfc, 0xf0, 0xd5, 0x4b,
+    0xb9, 0x72, 0x35, 0x61, 0x0c, 0x8b, 0x34, 0x07, 0xb5, 0x0a, 0x62, 0x5b, 0x8a, 0xe3, 0x67, 0x5c, 0x49, 0x6f, 0x51,
+    0x12, 0x17, 0xef, 0x67, 0x60, 0x62, 0xb0, 0xb7, 0x30, 0x0c, 0x4c, 0x1f, 0xc2, 0x54, 0x54, 0x0e, 0xf3, 0x89, 0x8a,
+    0x91, 0x2e, 0x82, 0xce, 0x02, 0x53, 0xf1, 0x9a, 0x39, 0x6e, 0x09, 0xac, 0xca, 0xe3, 0xa1, 0x15, 0x8d, 0x46, 0x2f,
+    0xd2, 0x98, 0xc7, 0x51, 0x12, 0xff, 0x4e, 0x94, 0x5c, 0x20, 0x8f, 0xf1, 0x9e, 0x5c, 0x04, 0xc0, 0x9d, 0x7a, 0x24,
+    0xae, 0x12, 0xb2, 0x6b, 0x44, 0x0c, 0x21, 0x2d, 0x93, 0xf0, 0x68, 0x20, 0xc1, 0x4b, 0xfc, 0xd9, 0xbc, 0x98, 0x20,
+    0x61, 0xe5, 0xc0, 0x28, 0xc8, 0xb3, 0x93, 0x82, 0xe5, 0x67, 0x6c, 0xa4, 0x39, 0xa0, 0x00, 0xac, 0xa8, 0x39, 0x18,
+    0x2f, 0x34, 0xa3, 0xa3, 0x74, 0x28, 0x83, 0xa1, 0x7a, 0xa6, 0x98, 0x65, 0x92, 0x99, 0xb5, 0x85, 0xa3, 0xa5, 0x80,
+    0x23, 0x8c, 0x0a, 0x29, 0x09, 0xf2, 0x50, 0x61, 0x38, 0x01, 0x29, 0x04, 0x5a, 0xc1, 0xdc, 0xe6, 0x4a, 0x93, 0x3d,
+    0x9b, 0x93, 0x4a, 0xc8, 0xa1, 0x23, 0x6c, 0x64, 0x82, 0x34, 0x77, 0x61, 0x57, 0x81, 0x94, 0x97, 0xe0, 0x0a, 0x29,
+    0xa2, 0xcc, 0x1c, 0x64, 0x80, 0xf0, 0x5b, 0xa1, 0x0b, 0x7d, 0x6c, 0x41, 0x6c, 0xe0, 0xeb, 0x95, 0x07, 0xc2, 0x4a,
+    0xbc, 0x2b, 0x44, 0xbc, 0x6b, 0xc0, 0xc6, 0x89, 0x91, 0x9f, 0xbc, 0x35, 0xee, 0xa7, 0xd9, 0xfe, 0x70, 0xc8, 0x8a,
+    0x22, 0x03, 0xd8, 0xd6, 0xa8, 0xfd, 0x75, 0x86, 0x16, 0x50, 0xd2, 0xd5, 0xb2, 0xce, 0x2e, 0x48, 0x83, 0x9b, 0x6a,
+    0x45, 0xe9, 0xf4, 0xc0, 0xfe, 0xf8, 0x11, 0x64, 0xb6, 0x27, 0xc9, 0x00, 0x54, 0x5f, 0x36, 0xfc, 0x84, 0x3d, 0x53,
+    0xa7, 0xcc, 0x4a, 0xfb, 0xd2, 0xa9, 0x83, 0xe4, 0xc1, 0xb0, 0x6e, 0x69, 0x2c, 0xe8, 0xca, 0xa1, 0x71, 0x35, 0xa4,
+    0x82, 0x5c, 0x9c, 0x92, 0xca, 0x36, 0x96, 0x11, 0xac, 0xb6, 0xd2, 0x23, 0xd2, 0x2b, 0x6c, 0x0a, 0x02, 0xf4, 0x88,
+    0x0d, 0x7a, 0xb2, 0x3e, 0xcc, 0x05, 0xe5, 0x72, 0xf6, 0xdb, 0x9c, 0x15, 0x5c, 0xb0, 0x2e, 0x8c, 0x5b, 0xc0, 0xb8,
+    0xe5, 0x92, 0x75, 0x58, 0xb3, 0x1d, 0x57, 0xc1, 0xf6, 0x66, 0x86, 0x7a, 0xac, 0x40, 0x4e, 0xbe, 0x99, 0x9d, 0x10,
+    0x56, 0xe6, 0x5e, 0x5d, 0x7d, 0xab, 0x06, 0xa9, 0x96, 0x52, 0xdb, 0x40, 0x8d, 0x35, 0xb1, 0x55, 0x93, 0x91, 0xed,
+    0x4a, 0x85, 0xba, 0xd6, 0xe9, 0xd5, 0xf8, 0x00, 0xf6, 0x5c, 0x5b, 0xb3, 0x74, 0x65, 0x6c, 0xbf, 0x55, 0x34, 0x7d,
+    0x23, 0x46, 0x26, 0x6b, 0x94, 0xdd, 0xce, 0x3d, 0x6a, 0xc7, 0x43, 0xdb, 0xa5, 0xba, 0x4a, 0x30, 0xcc, 0xeb, 0x82,
+    0xa1, 0x09, 0xf5, 0x4c, 0x77, 0xb1, 0x35, 0x53, 0xb1, 0x50, 0xad, 0xb5, 0x72, 0x20, 0x78, 0x78, 0x04, 0xc6, 0xc9,
+    0x4a, 0xff, 0xe0, 0x75, 0x34, 0x65, 0x48, 0x51, 0xef, 0xba, 0x06, 0xd2, 0x81, 0x80, 0x26, 0x83, 0xa6, 0x7a, 0xe3,
+    0xae, 0xb0, 0x9a, 0xea, 0xfb, 0x2b, 0x06, 0x2b, 0x02, 0xec, 0xeb, 0x72, 0xc5, 0x12, 0x91, 0xde, 0x14, 0x5c, 0xa2,
+    0xe9, 0x23, 0xca, 0xc4, 0x9a, 0x90, 0x82, 0x07, 0xe4, 0x61, 0xf9, 0x1b, 0x0b, 0x27, 0x5b, 0x31, 0x85, 0x23, 0x47,
+    0x99, 0x02, 0x74, 0x26, 0x25, 0x00, 0xe2, 0x92, 0x7e, 0xd6, 0x36, 0x16, 0x92, 0xed, 0x00, 0xf9, 0xc0, 0x1f, 0x27,
+    0x11, 0x77, 0x3a, 0x5b, 0x6d, 0x17, 0xf8, 0x10, 0x84, 0x38, 0xe8, 0x08, 0x30, 0xef, 0x2b, 0x54, 0x18, 0xa2, 0x12,
+    0xbb, 0xdc, 0x07, 0xa3, 0x68, 0x12, 0x8f, 0xb9, 0x93, 0xa1, 0x12, 0x71, 0x4b, 0x96, 0x80, 0x92, 0xd1, 0xfb, 0x0a,
+    0xa4, 0x04, 0x17, 0xd2, 0x45, 0x54, 0x6b, 0x81, 0xa6, 0x20, 0x25, 0x29, 0x45, 0x5a, 0x50, 0x41, 0x60, 0x08, 0x95,
+    0x9e, 0xe2, 0x28, 0xd0, 0x6f, 0x71, 0x5f, 0x0c, 0x1a, 0x2c, 0x59, 0x94, 0x71, 0x3f, 0x5e, 0x2e, 0x04, 0x35, 0xec,
+    0xf3, 0xec, 0x65, 0x76, 0xce, 0xf2, 0x27, 0x11, 0xc2, 0x1e, 0x88, 0xee, 0x25, 0x48, 0x7a, 0x12, 0xe8, 0xac, 0xa7,
+    0x78, 0xe5, 0x8c, 0x90, 0x86, 0x85, 0x98, 0xc6, 0xa8, 0x08, 0x41, 0xcb, 0x11, 0xed, 0x53, 0xdc, 0x52, 0xb4, 0xf7,
+    0x50, 0x95, 0x30, 0xcd, 0x5b, 0xfb, 0x2f, 0xeb, 0xbc, 0x05, 0x23, 0xcc, 0x14, 0xb7, 0xd6, 0x77, 0xac, 0xeb, 0x49,
+    0xdd, 0xec, 0x48, 0xde, 0x32, 0x94, 0x19, 0xe8, 0x8f, 0xab, 0xab, 0xca, 0x48, 0x07, 0x65, 0xaa, 0xa5, 0x39, 0x5a,
+    0x4e, 0x62, 0x4b, 0xb8, 0x25, 0x28, 0x23, 0x34, 0xbc, 0xf2, 0x2c, 0x49, 0x0c, 0x5d, 0xe4, 0xc5, 0x3d, 0xa7, 0xa1,
+    0x8e, 0x00, 0x8a, 0x69, 0x4d, 0x23, 0xf5, 0x79, 0xa0, 0x2b, 0x50, 0x29, 0x29, 0x6d, 0xe4, 0x55, 0x4d, 0x04, 0xc4,
+    0xe9, 0x88, 0xe5, 0xc2, 0x41, 0x93, 0x3a, 0x14, 0x26, 0x4c, 0x81, 0xa1, 0xd9, 0x08, 0x24, 0xbc, 0x42, 0x00, 0xcc,
+    0x13, 0x7f, 0x92, 0x15, 0x5c, 0xd7, 0x99, 0xd0, 0xc7, 0x57, 0x57, 0xb1, 0xf0, 0x17, 0x91, 0x01, 0x72, 0x36, 0xcd,
+    0xce, 0xd8, 0x0a, 0xa8, 0x7b, 0x6a, 0x30, 0x13, 0x64, 0x63, 0x18, 0x50, 0xa2, 0xa0, 0x5a, 0x66, 0x49, 0x3c, 0x64,
+    0x5a, 0x4b, 0x4d, 0x7d, 0x30, 0xe8, 0xd8, 0x05, 0xc8, 0x08, 0xe6, 0xee, 0xed, 0xed, 0xb5, 0xbd, 0x8e, 0x5b, 0x0a,
+    0x82, 0x2f, 0x96, 0x28, 0x7a, 0x83, 0x7e, 0x94, 0x26, 0xf8, 0x2a, 0x59, 0xc0, 0x5d, 0x43, 0x29, 0x72, 0xe1, 0x27,
+    0x79, 0x52, 0x10, 0xbb, 0xde, 0x08, 0x06, 0xe5, 0x4c, 0x09, 0x6e, 0x34, 0x71, 0xc5, 0xb6, 0x7d, 0xa7, 0xc9, 0xa6,
+    0xd9, 0x49, 0xed, 0x30, 0xb5, 0x30, 0x72, 0xcd, 0x0b, 0xed, 0x01, 0x9b, 0xcb, 0x83, 0x56, 0x22, 0x55, 0x03, 0xaf,
+    0x03, 0x84, 0xc2, 0xd3, 0x75, 0x96, 0x50, 0xaa, 0x3a, 0x4b, 0x21, 0xae, 0x37, 0xd0, 0x5b, 0x26, 0xc1, 0x5c, 0x45,
+    0x82, 0x03, 0x29, 0x10, 0x38, 0x7a, 0x64, 0x62, 0xbd, 0x9e, 0xc0, 0xf2, 0x9c, 0x44, 0xc3, 0x4f, 0x1a, 0xdc, 0x8a,
+    0xec, 0x4d, 0x36, 0x70, 0x1a, 0x25, 0xa1, 0x21, 0xae, 0x4c, 0xbc, 0x95, 0x84, 0xae, 0x6d, 0x14, 0x70, 0xc8, 0x96,
+    0xd8, 0xbe, 0xb9, 0xd0, 0x4d, 0x6e, 0x97, 0xec, 0xa1, 0xfc, 0x27, 0xcd, 0x25, 0x37, 0xb0, 0x1c, 0x57, 0xd2, 0x80,
+    0x2b, 0xc6, 0x83, 0xa5, 0x69, 0x40, 0x02, 0x7c, 0x57, 0x8e, 0xe2, 0xe2, 0x7a, 0x12, 0xfc, 0xa9, 0x60, 0x3e, 0x35,
+    0x66, 0xba, 0x15, 0x52, 0x2d, 0xe1, 0xa4, 0x19, 0xac, 0x41, 0x93, 0xc6, 0x83, 0x12, 0x35, 0xdf, 0xa2, 0xa1, 0x42,
+    0x1c, 0x7f, 0x2a, 0xaa, 0xd0, 0x04, 0x43, 0x30, 0x72, 0xaf, 0x90, 0x0c, 0x97, 0x2d, 0x8b, 0x16, 0x29, 0x53, 0x63,
+    0x52, 0xa9, 0x9a, 0xe5, 0x32, 0x30, 0xb0, 0x68, 0xb7, 0xfa, 0xd2, 0x12, 0x57, 0x22, 0x37, 0x0d, 0xb5, 0x30, 0x29,
+    0x94, 0x37, 0xe1, 0xe4, 0xe8, 0x77, 0x29, 0xeb, 0xdd, 0xc4, 0x27, 0x57, 0xf8, 0xe4, 0xbe, 0xe1, 0x43, 0x99, 0xbc,
+    0x5d, 0xf4, 0x8b, 0xe0, 0x9b, 0x5a, 0x25, 0xda, 0xa7, 0x3e, 0x0a, 0x66, 0x57, 0x0b, 0x5d, 0x10, 0x28, 0x92, 0x4d,
+    0xd2, 0xbe, 0xe4, 0x37, 0x14, 0x1b, 0x95, 0x67, 0x94, 0xb9, 0x62, 0x83, 0xd4, 0xbc, 0xd2, 0xcc, 0x4b, 0xdd, 0x86,
+    0xfd, 0x5e, 0x96, 0x92, 0x4e, 0x5c, 0x50, 0x26, 0xf6, 0x6e, 0xa2, 0x8d, 0x97, 0x86, 0x99, 0xb0, 0x7e, 0x85, 0xb1,
+    0x53, 0xa3, 0x50, 0x2a, 0x45, 0x20, 0x8e, 0x8d, 0xaf, 0x95, 0x65, 0x90, 0xf9, 0x2b, 0xec, 0x29, 0x00, 0x25, 0x81,
+    0xc5, 0xd7, 0x54, 0xf2, 0xa2, 0xb0, 0x4e, 0xc7, 0x35, 0xa2, 0x63, 0x25, 0x42, 0x6b, 0x22, 0x5f, 0xeb, 0xb3, 0xd8,
+    0xaf, 0xb9, 0x84, 0x26, 0x25, 0xf3, 0x7e, 0x1e, 0xd8, 0x2a, 0x10, 0x51, 0xe9, 0xb6, 0xa4, 0x9f, 0x90, 0x43, 0xba,
+    0x4c, 0xf4, 0xda, 0x48, 0x06, 0xad, 0x53, 0x21, 0xd1, 0xd2, 0x41, 0x18, 0x39, 0xe8, 0xb8, 0xd3, 0x5a, 0x2c, 0x11,
+    0xb2, 0x69, 0x6f, 0x12, 0x2b, 0xa2, 0x73, 0x9a, 0xa3, 0x09, 0x67, 0xea, 0x74, 0xc7, 0x01, 0x74, 0x40, 0xec, 0x2f,
+    0xb1, 0xde, 0x4a, 0xb3, 0xd3, 0xf5, 0x2b, 0x87, 0xef, 0xea, 0x2a, 0x41, 0x7e, 0x10, 0x06, 0x2f, 0xac, 0x59, 0x5f,
+    0xc9, 0xde, 0xfd, 0x97, 0xd8, 0x8a, 0xec, 0xcf, 0xaa, 0xa4, 0xf2, 0x14, 0x6a, 0x9c, 0x5b, 0x5f, 0x27, 0x66, 0x86,
+    0x16, 0x55, 0xc5, 0x81, 0x21, 0xd5, 0x0f, 0x94, 0xc2, 0xae, 0x50, 0x3e, 0x90, 0x43, 0xc7, 0xae, 0xeb, 0x06, 0x39,
+    0x39, 0x2f, 0x6b, 0xab, 0x5c, 0xc8, 0x8d, 0x0d, 0xd3, 0x67, 0x3a, 0xd3, 0xc3, 0x3f, 0x71, 0x50, 0x39, 0x17, 0x97,
+    0x29, 0x59, 0x30, 0x4f, 0x94, 0x3a, 0x5a, 0x72, 0x40, 0xdb, 0x3d, 0xf4, 0xb4, 0xa3, 0xf3, 0x28, 0xe6, 0x96, 0x1e,
+    0x45, 0x78, 0xda, 0x28, 0x9f, 0xa4, 0xd1, 0x01, 0x78, 0xa1, 0x09, 0x49, 0x4e, 0xb8, 0x69, 0x8b, 0x16, 0xc3, 0x09,
+    0xc3, 0x10, 0xb8, 0xb2, 0x27, 0x4c, 0xd9, 0xb3, 0x86, 0x78, 0x8b, 0x81, 0xd9, 0x6a, 0xd8, 0xcb, 0x66, 0xf7, 0x9a,
+    0xf9, 0x0f, 0x6b, 0x04, 0xb2, 0x6d, 0xaa, 0xea, 0xca, 0xc6, 0xbb, 0x14, 0x91, 0x18, 0x61, 0x5b, 0x35, 0xb6, 0xb4,
+    0xf5, 0x7b, 0x0d, 0xf7, 0xba, 0x72, 0xcc, 0x6b, 0x4a, 0xb5, 0xa1, 0x87, 0x95, 0x9b, 0xc3, 0x4c, 0x47, 0x5e, 0xac,
+    0xa0, 0xdb, 0x13, 0x41, 0x21, 0x70, 0x22, 0xb4, 0x3d, 0xa8, 0xb8, 0x81, 0x48, 0xc9, 0x95, 0x56, 0xcd, 0xe6, 0xc9,
+    0x48, 0x02, 0x0b, 0x2e, 0x2c, 0x97, 0x7c, 0x74, 0x1e, 0x27, 0x49, 0x55, 0xfa, 0xa7, 0x0a, 0x78, 0x31, 0xec, 0x6d,
+    0xa2, 0x5d, 0x60, 0x34, 0x57, 0x20, 0xb8, 0xda, 0x08, 0x7b, 0xef, 0xb8, 0xd5, 0xba, 0x8b, 0x88, 0x23, 0x37, 0xa3,
+    0x11, 0x50, 0x8f, 0x11, 0x56, 0xcd, 0xda, 0xfb, 0xcf, 0x30, 0xa4, 0x66, 0xe0, 0x83, 0xea, 0x8c, 0x8a, 0x3f, 0xcb,
+    0x9e, 0xfa, 0x4c, 0xf4, 0x6e, 0x55, 0x5d, 0xcd, 0x80, 0x8a, 0x0a, 0x7c, 0x98, 0x21, 0x96, 0xb6, 0x0a, 0x04, 0xe4,
+    0x7a, 0x58, 0x94, 0x02, 0x26, 0x69, 0xb0, 0xa0, 0x14, 0x58, 0x6b, 0x65, 0xf7, 0xf2, 0xb6, 0x60, 0x0e, 0x85, 0xc2,
+    0x45, 0xff, 0x27, 0xd9, 0x74, 0x86, 0x96, 0x59, 0x83, 0xa9, 0xa1, 0xc1, 0xfb, 0x46, 0x7d, 0xb9, 0xa2, 0xac, 0xd6,
+    0x87, 0x76, 0x64, 0x8d, 0x9f, 0xb4, 0xa3, 0x0c, 0x0e, 0xd5, 0x5c, 0x17, 0xd5, 0xed, 0xe6, 0xa6, 0x88, 0x59, 0xc5,
+    0xe3, 0x3e, 0xe9, 0x6d, 0x6d, 0x4d, 0x7a, 0x9a, 0x06, 0x24, 0x93, 0x24, 0xc3, 0x9b, 0x0c, 0x50, 0x56, 0xc4, 0x59,
+    0x94, 0x0d, 0xf2, 0x2d, 0xca, 0x12, 0xd7, 0xef, 0xbb, 0xde, 0x7e, 0xcd, 0xb3, 0xf6, 0xf6, 0xaf, 0x77, 0x91, 0xab,
+    0x3a, 0xe9, 0x41, 0x1e, 0x0d, 0xa0, 0x68, 0xc9, 0xa6, 0x0c, 0x17, 0xd3, 0x6c, 0xc4, 0x02, 0x1b, 0xba, 0xa7, 0x76,
+    0xa9, 0xb4, 0x32, 0x6c, 0x8e, 0x94, 0x39, 0x8b, 0x77, 0xf5, 0x48, 0x6a, 0xb0, 0x0f, 0x2c, 0xa0, 0xcd, 0x85, 0xef,
+    0xc3, 0xd3, 0x24, 0x3b, 0x89, 0x92, 0x43, 0xa1, 0xc0, 0x6b, 0x2d, 0x3f, 0x80, 0xcb, 0x48, 0x16, 0xab, 0xa1, 0xa4,
+    0xbe, 0xef, 0x7f, 0x1f, 0xdc, 0xde, 0xa3, 0xf2, 0x56, 0xec, 0x8e, 0xdf, 0xf6, 0x3b, 0xb6, 0x8a, 0x88, 0xbd, 0x34,
+    0xa7, 0x03, 0x8d, 0x53, 0x00, 0x65, 0x0e, 0x41, 0x93, 0x15, 0x5e, 0xc4, 0xc2, 0x97, 0xfd, 0x97, 0xca, 0xa5, 0xce,
+    0xc0, 0x85, 0x00, 0x27, 0x3f, 0x89, 0x79, 0x0b, 0xcf, 0x23, 0x6d, 0x6f, 0x21, 0x2a, 0x30, 0xae, 0x48, 0x71, 0xe9,
+    0x52, 0x79, 0x83, 0xde, 0xc7, 0xf0, 0x18, 0x9a, 0xad, 0xaf, 0x2f, 0x9c, 0x57, 0x11, 0x9f, 0xf8, 0x79, 0x94, 0x8e,
+    0xb2, 0xa9, 0xe3, 0x6e, 0xda, 0xb6, 0xeb, 0x17, 0xe4, 0x89, 0x7c, 0xe5, 0x96, 0xeb, 0xc7, 0xde, 0x84, 0x85, 0x76,
+    0xdf, 0xde, 0xfc, 0xe8, 0xbd, 0x67, 0xe1, 0xf1, 0xee, 0xfa, 0x62, 0xc2, 0xca, 0xbd, 0x63, 0xef, 0x42, 0xc7, 0xdc,
+    0xbd, 0xb7, 0x28, 0x65, 0xa0, 0x57, 0xb8, 0x77, 0x21, 0xc1, 0x00, 0x76, 0xa3, 0xf8, 0x3b, 0x48, 0xb9, 0xf7, 0x74,
+    0x20, 0x22, 0xe3, 0xb4, 0x57, 0x57, 0x76, 0x46, 0x11, 0x03, 0x7b, 0x4d, 0x3b, 0xab, 0x1b, 0x1b, 0x95, 0x9a, 0xaf,
+    0x4a, 0xbd, 0x21, 0x0b, 0x6b, 0x9e, 0xba, 0x77, 0x48, 0x47, 0x2b, 0xf5, 0x8d, 0x3c, 0x64, 0xa4, 0x34, 0x97, 0xed,
+    0x04, 0xc7, 0xd8, 0xe2, 0xab, 0xb7, 0xf5, 0x91, 0x88, 0x52, 0xf8, 0x31, 0x58, 0x2f, 0x11, 0xa8, 0x6f, 0x70, 0x70,
+    0xbc, 0xc3, 0x70, 0x6b, 0xd7, 0xe9, 0x07, 0xce, 0x5a, 0xab, 0x75, 0xf5, 0xf3, 0xd6, 0xd1, 0x2f, 0x51, 0xeb, 0xf7,
+    0xfd, 0xd6, 0x4f, 0x03, 0xf7, 0xca, 0xf9, 0x79, 0xab, 0x7f, 0x24, 0xdf, 0x8e, 0x7e, 0xd9, 0xfb, 0xb9, 0x18, 0x7c,
+    0x29, 0x0a, 0xd7, 0x5d, 0x77, 0xeb, 0x14, 0x3c, 0xa5, 0x70, 0xab, 0xd5, 0xda, 0x83, 0xa7, 0x39, 0x3c, 0xe1, 0xcf,
+    0x73, 0xf8, 0x71, 0x75, 0x64, 0xfd, 0x9b, 0x9f, 0xd3, 0x7f, 0xfb, 0x73, 0x3e, 0xc0, 0x31, 0x8f, 0x7e, 0xf9, 0xb9,
+    0xb0, 0xef, 0xed, 0x85, 0x5b, 0x83, 0x4d, 0xd7, 0xd1, 0x35, 0x5f, 0x86, 0xd5, 0x23, 0xb4, 0x3a, 0xfa, 0x45, 0xbe,
+    0xd9, 0xf7, 0x8e, 0x77, 0xf7, 0xc2, 0xc1, 0x95, 0x63, 0x5f, 0xdd, 0x73, 0xaf, 0x5c, 0xf7, 0x6a, 0x1d, 0xe7, 0x99,
+    0xc1, 0xe8, 0xf7, 0xe0, 0xe7, 0x29, 0xfc, 0xb4, 0xe1, 0xe7, 0x19, 0xfc, 0xfc, 0x05, 0xba, 0x89, 0xf8, 0xdb, 0x15,
+    0xc5, 0x42, 0xae, 0xf0, 0xc0, 0x22, 0x82, 0x55, 0x70, 0xd7, 0xb7, 0x62, 0x6f, 0x4c, 0x44, 0x83, 0x7d, 0xe8, 0xfb,
+    0x3e, 0x86, 0x49, 0x9d, 0xc5, 0xc7, 0x75, 0x58, 0x74, 0xe4, 0x9c, 0xf5, 0x80, 0x79, 0x22, 0x72, 0x50, 0x04, 0x5c,
+    0x9c, 0xad, 0x16, 0x78, 0xb8, 0xea, 0x8d, 0xc2, 0x31, 0x73, 0xc0, 0x28, 0x78, 0xce, 0xf0, 0xa1, 0xeb, 0x7a, 0xcf,
+    0xe4, 0x99, 0x21, 0xee, 0x73, 0xc1, 0x5a, 0x69, 0x26, 0x4c, 0x1a, 0xdb, 0xf5, 0x66, 0x2b, 0x2a, 0x61, 0x5b, 0xa7,
+    0xa7, 0x50, 0xb7, 0x2e, 0x0e, 0xda, 0xbe, 0x67, 0xd1, 0x27, 0xdc, 0x92, 0xaf, 0x8d, 0x43, 0xe0, 0x25, 0x4b, 0xbe,
+    0x69, 0x34, 0x1a, 0x36, 0xa2, 0x70, 0xc7, 0x1e, 0x33, 0x98, 0x61, 0xc9, 0x44, 0xe4, 0xa4, 0x34, 0x85, 0x65, 0x0b,
+    0x93, 0xbf, 0x8d, 0x72, 0xbe, 0x5e, 0x19, 0xb6, 0x61, 0xcd, 0x92, 0x6d, 0x5a, 0xfa, 0x77, 0x98, 0x02, 0x4d, 0x4b,
+    0x3a, 0xff, 0x30, 0xc7, 0x0f, 0x53, 0x42, 0xeb, 0xb5, 0xc3, 0xc1, 0x43, 0x2f, 0x40, 0xee, 0x88, 0x7e, 0xce, 0x5b,
+    0x54, 0x63, 0xf0, 0x57, 0x86, 0x19, 0x3c, 0x31, 0x1f, 0x86, 0x68, 0x16, 0xa5, 0x0e, 0x6e, 0xa5, 0x28, 0xee, 0x5f,
+    0xe0, 0xce, 0x48, 0x4b, 0xef, 0x20, 0x54, 0x3b, 0xe6, 0x30, 0x67, 0xec, 0xfb, 0x28, 0xf9, 0xc4, 0x72, 0xe7, 0xc2,
+    0xeb, 0x74, 0xbf, 0xa2, 0xce, 0x1e, 0xda, 0x66, 0xaf, 0xaa, 0x63, 0x34, 0x65, 0x16, 0xa8, 0x23, 0xc2, 0x56, 0xc7,
+    0xcb, 0x31, 0xaa, 0x85, 0x24, 0x28, 0xbc, 0x2c, 0xec, 0x12, 0x87, 0xdb, 0xbb, 0xc5, 0xd9, 0xe9, 0x9e, 0x1d, 0xd8,
+    0x36, 0x58, 0xfc, 0x87, 0x14, 0xb6, 0x12, 0x86, 0x05, 0x18, 0x64, 0xbb, 0x71, 0x8f, 0x6f, 0x6e, 0x56, 0x01, 0x27,
+    0x3c, 0x48, 0xa7, 0xee, 0x89, 0x17, 0x79, 0x93, 0x10, 0x06, 0x1c, 0x42, 0x33, 0xec, 0xd2, 0x1b, 0xee, 0xc6, 0x72,
+    0x1a, 0x8c, 0x85, 0xf8, 0x49, 0x54, 0xf0, 0x17, 0x18, 0x8f, 0x08, 0x87, 0x68, 0xec, 0xfb, 0xec, 0x82, 0x0d, 0x95,
+    0x9d, 0x01, 0x84, 0x8a, 0xdc, 0x9e, 0x3b, 0x0c, 0x8d, 0x66, 0x30, 0x77, 0x18, 0x1e, 0xf6, 0x6d, 0xd8, 0x4b, 0xb0,
+    0x2b, 0xc3, 0xe8, 0xa8, 0x33, 0xe8, 0xa7, 0x21, 0xc8, 0x5a, 0x4d, 0x5b, 0x59, 0x34, 0xaf, 0x15, 0x75, 0x07, 0x7d,
+    0xe7, 0x0c, 0x8c, 0x74, 0xb0, 0xc5, 0x1d, 0x7c, 0xc3, 0x08, 0x45, 0x11, 0xbe, 0x63, 0xa7, 0xcf, 0x2e, 0x66, 0x8e,
+    0xbd, 0xbb, 0x65, 0x6f, 0x62, 0xa9, 0x67, 0x03, 0x7b, 0xc1, 0xdc, 0xe1, 0xb9, 0x6b, 0x76, 0xde, 0x1e, 0x20, 0xa8,
+    0x58, 0x88, 0x93, 0x9f, 0xf7, 0xed, 0x3d, 0x31, 0x75, 0x1b, 0x06, 0x4d, 0xe5, 0xf2, 0xe3, 0x8a, 0x1e, 0x12, 0xaa,
+    0xaa, 0xab, 0x82, 0x0e, 0xca, 0xba, 0x81, 0x33, 0x31, 0x91, 0x68, 0xe1, 0x64, 0x92, 0x0a, 0xe0, 0xf0, 0x60, 0x33,
+    0x98, 0xd4, 0xe8, 0xb6, 0x3d, 0xe8, 0x9f, 0x07, 0xf7, 0xec, 0x7b, 0xea, 0xe5, 0x94, 0x05, 0xe0, 0x5d, 0xd0, 0xf4,
+    0xa7, 0xa8, 0x45, 0xe0, 0xe7, 0x8c, 0x01, 0x92, 0xe7, 0x54, 0x34, 0x92, 0x45, 0x73, 0x2c, 0x3a, 0x0c, 0x10, 0x54,
+    0xaf, 0xd0, 0xd6, 0x9f, 0x58, 0x93, 0x51, 0x48, 0xb0, 0x6f, 0x6c, 0xc0, 0xd2, 0x6c, 0x76, 0x06, 0x78, 0xde, 0x90,
+    0xf3, 0xe2, 0xfb, 0x98, 0x83, 0x4a, 0xd8, 0xda, 0xb3, 0xdd, 0xbe, 0x6d, 0xe1, 0xd2, 0xf6, 0xb2, 0xcd, 0x50, 0x50,
+    0x38, 0xde, 0x7c, 0xcf, 0x82, 0xc9, 0x5e, 0xd8, 0xee, 0x3b, 0xb9, 0x50, 0x1d, 0x09, 0x9e, 0x5b, 0x0a, 0x09, 0xde,
+    0xf6, 0x26, 0x20, 0xd0, 0x91, 0x73, 0xd7, 0xed, 0x4d, 0x55, 0x08, 0x45, 0x1f, 0x37, 0x47, 0x6e, 0x10, 0xc3, 0x0f,
+    0xa7, 0x85, 0x4c, 0x33, 0xd1, 0x7d, 0xb5, 0x66, 0x76, 0x83, 0x91, 0xb2, 0xc8, 0x93, 0x30, 0xdb, 0x74, 0x30, 0x42,
+    0x0b, 0x92, 0x76, 0xb7, 0x0f, 0x30, 0x6c, 0x3a, 0x8a, 0xd3, 0xb6, 0x14, 0xab, 0x29, 0xfb, 0xfc, 0xa8, 0x5a, 0x0e,
+    0xd6, 0x8f, 0x98, 0x5f, 0x69, 0x1f, 0x00, 0x2b, 0x48, 0xbc, 0x7c, 0xa0, 0xce, 0xbc, 0x9e, 0xd7, 0xce, 0xb7, 0x16,
+    0x4a, 0x14, 0x31, 0xcf, 0x90, 0x50, 0xbc, 0xd4, 0x6e, 0x98, 0x30, 0xb7, 0x67, 0x48, 0x0c, 0xcd, 0xf2, 0x61, 0x1b,
+    0x98, 0x5e, 0x05, 0xd8, 0x53, 0x73, 0x5b, 0x24, 0x61, 0xd5, 0xdc, 0x3b, 0x02, 0xd6, 0x1e, 0x84, 0xaf, 0xc4, 0x89,
+    0x63, 0x4f, 0x45, 0xf3, 0x59, 0x12, 0x3e, 0x6f, 0x1c, 0x17, 0x47, 0x78, 0x22, 0x74, 0xe0, 0x0f, 0xe7, 0x39, 0xc8,
+    0x03, 0xfe, 0x1a, 0x2c, 0x83, 0x50, 0x36, 0x45, 0x47, 0x0f, 0x8f, 0x80, 0x3d, 0x42, 0xbc, 0x11, 0x36, 0x37, 0xaa,
+    0xd1, 0xa2, 0x24, 0xe3, 0x85, 0x0e, 0x86, 0x7b, 0x5c, 0xba, 0xf6, 0x28, 0x18, 0xe4, 0x89, 0xb1, 0x83, 0x67, 0xfe,
+    0xfe, 0x10, 0xab, 0x71, 0x82, 0xc2, 0x2d, 0x69, 0xb7, 0x55, 0xe2, 0xef, 0xc0, 0x4f, 0x41, 0x82, 0x63, 0x1d, 0xf8,
+    0x59, 0x1b, 0x1b, 0x89, 0x44, 0x6a, 0x37, 0xed, 0xd1, 0x49, 0x04, 0xc6, 0x83, 0x73, 0x3f, 0x85, 0x6a, 0x24, 0x11,
+    0x15, 0xe5, 0x68, 0x81, 0x9a, 0xa7, 0x6a, 0x15, 0x7c, 0x47, 0x66, 0x04, 0x9e, 0x63, 0xd8, 0x9a, 0xfc, 0x54, 0xdd,
+    0x58, 0xc4, 0xf2, 0x5d, 0x97, 0x8e, 0xb6, 0xf0, 0x00, 0x52, 0x30, 0x9a, 0x60, 0x18, 0x97, 0x82, 0x92, 0x15, 0xff,
+    0x7d, 0x34, 0x62, 0xe5, 0x93, 0xa3, 0x6c, 0x73, 0x73, 0x20, 0xce, 0x2d, 0x88, 0x71, 0xb8, 0x11, 0x5d, 0x8d, 0x2b,
+    0x00, 0xea, 0xd3, 0x39, 0x71, 0x3d, 0x30, 0xad, 0x58, 0xd3, 0xa5, 0xd8, 0x27, 0x87, 0x19, 0x80, 0x82, 0x5b, 0xce,
+    0x91, 0xdf, 0xff, 0xcb, 0x00, 0xdc, 0x63, 0xff, 0x4b, 0x77, 0x4b, 0x09, 0x9a, 0x9e, 0x3c, 0x53, 0x5c, 0xd0, 0x19,
+    0x6b, 0xc7, 0xa3, 0xd8, 0x68, 0x50, 0x78, 0x29, 0x60, 0x00, 0xda, 0x1c, 0x64, 0x42, 0xc5, 0x41, 0xc8, 0x51, 0x81,
+    0xed, 0xe3, 0xe6, 0xe7, 0xb8, 0xb3, 0x9f, 0x82, 0x85, 0xd7, 0xd7, 0x6f, 0x8f, 0xe1, 0xed, 0x2f, 0xfa, 0xed, 0x25,
+    0x0b, 0x7e, 0x2d, 0x65, 0xe8, 0xbe, 0x36, 0xc5, 0x03, 0x35, 0x45, 0x29, 0x96, 0xc8, 0xa0, 0x21, 0x73, 0xf3, 0xa5,
+    0x98, 0x0d, 0x77, 0x4b, 0x54, 0x3b, 0x52, 0x74, 0xe5, 0x3e, 0x8f, 0x4e, 0x91, 0xb8, 0xae, 0x49, 0x0a, 0x23, 0x97,
+    0xc0, 0x44, 0xb8, 0xe2, 0x5b, 0x62, 0xce, 0xbd, 0x36, 0xd8, 0xe0, 0xb5, 0xbc, 0x03, 0xb4, 0xef, 0xd8, 0x74, 0xc6,
+    0x2f, 0x0f, 0x48, 0xd1, 0x07, 0x32, 0x6d, 0x40, 0x9c, 0x9d, 0xb7, 0x7b, 0xf1, 0x2e, 0xef, 0xc5, 0x20, 0xd5, 0x73,
+    0xc5, 0x62, 0xb8, 0x57, 0xbd, 0xb7, 0x18, 0xa5, 0x34, 0x99, 0xc9, 0xab, 0xa1, 0xd7, 0x95, 0xe8, 0x6d, 0x6e, 0x02,
+    0x82, 0x3d, 0xa3, 0x2b, 0x17, 0x5d, 0xcb, 0x52, 0xd0, 0x04, 0x20, 0x7a, 0x54, 0x67, 0x39, 0xe2, 0x38, 0xcc, 0x66,
+    0x43, 0xc1, 0xc1, 0xdc, 0x95, 0xa3, 0xe2, 0x98, 0xd8, 0x5d, 0x26, 0xec, 0x00, 0x66, 0xc4, 0xe5, 0xad, 0x8e, 0x88,
+    0x0e, 0x8b, 0xfe, 0x3a, 0xbe, 0xfd, 0xd1, 0x63, 0x9b, 0x1d, 0x17, 0x34, 0x48, 0x6d, 0xac, 0x87, 0xd5, 0x58, 0x50,
+    0x1f, 0x7e, 0xd4, 0x54, 0x2a, 0x8b, 0xcd, 0xcd, 0xb2, 0x7e, 0x54, 0xab, 0x76, 0x70, 0xed, 0x34, 0xe5, 0xa2, 0x99,
+    0x0d, 0xc2, 0x81, 0x88, 0x09, 0x14, 0x68, 0x69, 0x65, 0xc5, 0x00, 0x43, 0xca, 0x72, 0x94, 0x4f, 0x21, 0xf3, 0xe2,
+    0xb2, 0xd4, 0xa9, 0x2f, 0x32, 0x1e, 0x19, 0xe2, 0xa9, 0x27, 0x19, 0x2b, 0xa0, 0x60, 0xbd, 0xd4, 0x4b, 0x68, 0x89,
+    0x00, 0xf3, 0x67, 0x2a, 0x87, 0x46, 0x58, 0x20, 0x51, 0x68, 0x98, 0x25, 0xca, 0xf8, 0x2c, 0xc2, 0x18, 0xb4, 0xfd,
+    0x93, 0x5a, 0xec, 0xab, 0x50, 0x46, 0x47, 0x71, 0x94, 0x0f, 0x02, 0xaa, 0x9f, 0x4b, 0x09, 0x36, 0x09, 0xdf, 0x03,
+    0x1b, 0x55, 0x8e, 0x27, 0x09, 0xc2, 0xa7, 0x71, 0xce, 0xc8, 0x53, 0x58, 0x97, 0x30, 0x4b, 0xd3, 0x36, 0x52, 0xed,
+    0x22, 0x33, 0x08, 0xe5, 0xc2, 0xfc, 0x13, 0xe3, 0xec, 0x22, 0x0b, 0x97, 0x5a, 0x83, 0xf9, 0xf1, 0xc6, 0x04, 0x28,
+    0xbb, 0xba, 0xca, 0x84, 0x8f, 0x1b, 0x91, 0xbd, 0xa1, 0x2b, 0x26, 0x7d, 0x85, 0x54, 0xe0, 0x44, 0x64, 0xf1, 0xd0,
+    0x19, 0x0a, 0x8d, 0x70, 0x48, 0xa7, 0xc8, 0xb9, 0x6b, 0x6c, 0xfa, 0xbc, 0xaf, 0x7d, 0xa3, 0x34, 0x74, 0x12, 0x10,
+    0x02, 0x02, 0x77, 0xc3, 0x9a, 0x4a, 0xfb, 0x69, 0x90, 0x50, 0x29, 0xfa, 0x39, 0x80, 0x7f, 0x18, 0x49, 0x0a, 0x80,
+    0xfd, 0x50, 0x8d, 0x14, 0x51, 0x96, 0x05, 0x2e, 0x00, 0xcd, 0x75, 0x80, 0x2b, 0xe1, 0x0b, 0x03, 0x15, 0xa6, 0xa7,
+    0x59, 0x79, 0x29, 0x94, 0xc8, 0xbb, 0x15, 0x29, 0x6b, 0x24, 0x93, 0xcf, 0xd0, 0xe1, 0x53, 0xde, 0xf5, 0x6b, 0x89,
+    0x87, 0x2e, 0x78, 0x0a, 0xcb, 0xaa, 0x9e, 0x5f, 0x85, 0x9c, 0x9c, 0x6b, 0xd0, 0x15, 0x52, 0xe8, 0x2f, 0x39, 0xc9,
+    0xfb, 0xaf, 0xfc, 0xaa, 0x96, 0x1a, 0x43, 0xd9, 0xfb, 0x55, 0xcd, 0xb0, 0xbc, 0x9c, 0x55, 0x61, 0x0a, 0x02, 0x6e,
+    0xc1, 0x92, 0x60, 0x21, 0x35, 0x04, 0x58, 0xd8, 0x1e, 0x69, 0xa5, 0x20, 0x2f, 0x75, 0x78, 0xe7, 0x29, 0x58, 0x01,
+    0xc6, 0xa1, 0x96, 0x4a, 0xa6, 0x91, 0xc4, 0x97, 0x4a, 0x14, 0x98, 0xf2, 0x60, 0x08, 0x7e, 0x6a, 0xf3, 0xa4, 0xeb,
+    0xc2, 0xf5, 0xe3, 0x29, 0xa6, 0xf6, 0x10, 0xe8, 0xb1, 0xb7, 0x06, 0xa6, 0x44, 0x5d, 0x87, 0x15, 0xc4, 0xa1, 0x59,
+    0x4d, 0xb3, 0x80, 0x19, 0xd3, 0x06, 0x2d, 0xd9, 0x06, 0x5b, 0x2e, 0x07, 0xfb, 0x48, 0x6c, 0xcf, 0x6a, 0x05, 0x84,
+    0xae, 0x41, 0x03, 0x43, 0xee, 0x52, 0xa1, 0x85, 0x79, 0xaf, 0x4b, 0x45, 0xb8, 0x3f, 0xfb, 0x5c, 0x5a, 0xc1, 0x99,
+    0x97, 0xd1, 0xc0, 0x07, 0xf1, 0x49, 0x82, 0x89, 0x2f, 0x88, 0x15, 0xd8, 0xc1, 0x41, 0xa7, 0xd9, 0x14, 0x38, 0x15,
+    0x17, 0x29, 0x83, 0x65, 0x45, 0xa9, 0x0d, 0x3f, 0xa4, 0xc8, 0xd6, 0x5d, 0x1e, 0xe8, 0x2e, 0xc4, 0x02, 0xd8, 0xe9,
+    0x57, 0x8c, 0x7c, 0xcb, 0x7a, 0x19, 0x30, 0x38, 0xd3, 0x1a, 0x07, 0x81, 0xdf, 0xdc, 0x4c, 0x06, 0x65, 0x4a, 0x6c,
+    0xd7, 0x64, 0x75, 0x01, 0x39, 0x0c, 0xd5, 0xc4, 0x1d, 0x84, 0xa5, 0xb2, 0xc7, 0x8b, 0x72, 0x8a, 0xcb, 0xa5, 0x2c,
+    0xe4, 0xe6, 0x79, 0x35, 0xcd, 0xe7, 0x56, 0x9a, 0x4d, 0xc7, 0x5b, 0xf1, 0x45, 0xc1, 0xdf, 0x77, 0x62, 0x69, 0xd5,
+    0x53, 0x6a, 0x85, 0x47, 0x99, 0x5b, 0xb2, 0x4e, 0x49, 0xad, 0xae, 0x1b, 0xa8, 0x46, 0x78, 0x9a, 0x86, 0x8d, 0x40,
+    0x88, 0x09, 0x2e, 0x7e, 0xdd, 0x64, 0x62, 0xda, 0x5b, 0x42, 0xea, 0x08, 0xbb, 0x87, 0x72, 0x82, 0xbb, 0x9a, 0x67,
+    0x9f, 0x87, 0xb3, 0xeb, 0x99, 0x7b, 0xdf, 0x60, 0xee, 0xc7, 0x21, 0x37, 0x18, 0x3d, 0x96, 0x09, 0x3f, 0x32, 0xf6,
+    0x91, 0xab, 0xaa, 0x27, 0xa7, 0x61, 0x25, 0xb2, 0xc4, 0x93, 0x71, 0xd4, 0x61, 0x9c, 0x8a, 0xd6, 0x04, 0xd9, 0xd5,
+    0x55, 0x61, 0xee, 0x05, 0x0a, 0x9a, 0x7a, 0xbc, 0x1e, 0xa7, 0xad, 0xd8, 0xd9, 0x88, 0x44, 0xee, 0xbf, 0xaa, 0x45,
+    0x22, 0x2b, 0x3e, 0xc7, 0x91, 0xae, 0x39, 0xc8, 0x7d, 0x72, 0xba, 0xbc, 0x49, 0x85, 0x6e, 0xd1, 0x68, 0x1b, 0x7b,
+    0x54, 0x1f, 0x48, 0xea, 0x19, 0x15, 0x58, 0xd5, 0xd8, 0x1b, 0x1b, 0x1d, 0x91, 0x6e, 0xa9, 0x14, 0x1b, 0x2c, 0x2d,
+    0x8c, 0x66, 0x8c, 0x82, 0x41, 0x49, 0x91, 0x81, 0x1a, 0xe5, 0xd7, 0x08, 0x86, 0x7d, 0x6a, 0x00, 0x8a, 0x73, 0x75,
+    0xf5, 0xe3, 0x52, 0xb2, 0x85, 0x80, 0xc4, 0x5d, 0x30, 0x10, 0x6b, 0x82, 0x99, 0x91, 0x4f, 0xde, 0x03, 0xe7, 0xf5,
+    0x19, 0xfa, 0x08, 0xe0, 0x17, 0x88, 0x4d, 0x0f, 0x26, 0xb6, 0x4d, 0x44, 0xd1, 0x67, 0x03, 0xcf, 0x01, 0xd8, 0x59,
+    0x15, 0x1a, 0x7d, 0x57, 0xa5, 0x80, 0x21, 0x1b, 0xb8, 0x01, 0xab, 0xc2, 0x72, 0xfb, 0xcf, 0xc1, 0x6d, 0x80, 0xd7,
+    0x67, 0xb2, 0xf9, 0x3a, 0xe6, 0x09, 0x56, 0x67, 0x17, 0x7e, 0x65, 0x59, 0x8b, 0x73, 0xa7, 0xc3, 0x46, 0xbd, 0xa2,
+    0x84, 0xa8, 0x3d, 0xc0, 0xda, 0x43, 0x8c, 0xb0, 0x88, 0xf7, 0x57, 0xf8, 0xae, 0xc7, 0x2d, 0xf7, 0x35, 0x5a, 0x84,
+    0xe9, 0x32, 0x69, 0x0c, 0x4a, 0xd6, 0xfd, 0x64, 0xc4, 0xbd, 0x3c, 0x10, 0xb1, 0xe0, 0x0a, 0x47, 0x56, 0x85, 0x14,
+    0x1b, 0x48, 0xd2, 0xd3, 0x3e, 0x1d, 0xb0, 0xaf, 0x37, 0x7b, 0x01, 0x65, 0xde, 0x57, 0xa4, 0x92, 0x90, 0xd2, 0xec,
+    0x86, 0x48, 0x12, 0xd6, 0x8a, 0x3c, 0x75, 0x3e, 0x70, 0xb4, 0xcf, 0xad, 0x24, 0x82, 0x11, 0x9c, 0x84, 0xe9, 0x58,
+    0x79, 0xd8, 0x14, 0xe0, 0x2a, 0x3a, 0x62, 0xfa, 0x26, 0x20, 0xbf, 0x19, 0xc8, 0xed, 0xa5, 0xe4, 0xda, 0x5c, 0xc3,
+    0xf0, 0x04, 0x09, 0x56, 0x45, 0x22, 0xf0, 0x88, 0x1a, 0x70, 0xcc, 0x57, 0x79, 0x1e, 0x60, 0xc2, 0xd7, 0xf6, 0x26,
+    0x00, 0x94, 0x93, 0xab, 0xe2, 0x2c, 0x05, 0xba, 0x01, 0xcb, 0xd5, 0x71, 0x6a, 0x54, 0x24, 0x2e, 0x6e, 0x4c, 0x57,
+    0xb7, 0xf4, 0xa7, 0x68, 0x39, 0x93, 0x21, 0xa6, 0x83, 0x20, 0x20, 0x53, 0xdf, 0x31, 0x47, 0xc8, 0x5c, 0x61, 0x7d,
+    0xce, 0x9c, 0xda, 0xd4, 0x3d, 0x46, 0xdd, 0x3c, 0x49, 0x2d, 0x5e, 0xa7, 0x4d, 0x29, 0x11, 0x93, 0x12, 0x73, 0x5d,
+    0xa4, 0x62, 0x33, 0x25, 0xee, 0xdc, 0xfa, 0x46, 0x0b, 0x69, 0xa3, 0xad, 0x8b, 0x1c, 0x6c, 0x56, 0xc9, 0x7b, 0x02,
+    0xe3, 0xb9, 0x20, 0x7c, 0xf9, 0x8a, 0x92, 0x74, 0x98, 0x63, 0x22, 0x58, 0xbd, 0x98, 0x8a, 0xfc, 0x9d, 0xa3, 0xd3,
+    0xec, 0x0d, 0x7a, 0x90, 0x7a, 0x03, 0x89, 0x59, 0x13, 0xdf, 0x85, 0x34, 0xd4, 0x11, 0x02, 0x95, 0x51, 0x2d, 0xd3,
+    0x71, 0x62, 0x15, 0xbe, 0x11, 0x7c, 0xf5, 0x56, 0x1f, 0xe7, 0x1b, 0xcf, 0x8d, 0xd5, 0x08, 0x62, 0xf0, 0x16, 0xf2,
+    0x81, 0x27, 0x45, 0x38, 0x10, 0x2e, 0xdf, 0xdc, 0xec, 0xe5, 0xbb, 0xbc, 0x0a, 0x91, 0x54, 0x30, 0xc6, 0x98, 0x51,
+    0x8c, 0x7b, 0xa2, 0xa6, 0x16, 0x73, 0x18, 0x58, 0xb6, 0x0e, 0x73, 0x3c, 0x00, 0x80, 0x96, 0xa6, 0xf4, 0xaa, 0xa9,
+    0x50, 0x79, 0x9e, 0x4b, 0xf8, 0x54, 0x87, 0xa8, 0xaa, 0xf1, 0xdb, 0xd5, 0x19, 0x28, 0x04, 0xf7, 0x5a, 0xc7, 0xc3,
+    0x43, 0x08, 0x58, 0x45, 0x21, 0x0b, 0xf4, 0x06, 0xed, 0x55, 0x89, 0x50, 0xcc, 0x9c, 0xac, 0xc7, 0x0c, 0x27, 0x15,
+    0x6c, 0xa1, 0x12, 0x96, 0x4a, 0x0b, 0xfc, 0x6a, 0x23, 0x34, 0x4f, 0x19, 0xf7, 0x5f, 0x55, 0x38, 0x83, 0xfe, 0x60,
+    0xde, 0x32, 0xa3, 0xbe, 0x5d, 0x3a, 0x91, 0xa9, 0xc0, 0xc4, 0xcd, 0x2c, 0xb5, 0xdf, 0xaf, 0xab, 0xb4, 0x9f, 0x57,
+    0xc8, 0x7d, 0x4e, 0x9a, 0xaf, 0x73, 0x07, 0xcd, 0x27, 0xc3, 0xfd, 0x4a, 0xf9, 0xa1, 0x85, 0x51, 0x53, 0x7e, 0x79,
+    0x5d, 0xf9, 0x15, 0x9e, 0x0a, 0x6f, 0xed, 0x75, 0x51, 0xe8, 0xa2, 0x3e, 0x07, 0x43, 0x48, 0x3f, 0x82, 0x6b, 0x68,
+    0xf0, 0xa0, 0x48, 0x16, 0x8b, 0xb5, 0x0b, 0xe2, 0xfa, 0x98, 0x53, 0xed, 0x50, 0xc6, 0x18, 0xf1, 0xb4, 0xe4, 0x20,
+    0xc9, 0xe0, 0x60, 0xfc, 0x06, 0x06, 0xc4, 0xa4, 0x24, 0xa4, 0x43, 0xe8, 0xac, 0xcc, 0x44, 0x54, 0xee, 0xe2, 0xed,
+    0xc6, 0x65, 0x4d, 0xa1, 0x08, 0x3b, 0xc1, 0x4c, 0xa5, 0x54, 0x10, 0x48, 0x93, 0x6f, 0xad, 0x53, 0x0b, 0x86, 0x16,
+    0xae, 0xa9, 0x80, 0xbc, 0xb6, 0xeb, 0x41, 0x93, 0xf7, 0x14, 0x43, 0x5f, 0xa5, 0x46, 0xbc, 0xcc, 0xe0, 0x6b, 0xd8,
+    0xfc, 0x35, 0x51, 0x92, 0x87, 0x4c, 0xc4, 0x5e, 0xc1, 0x27, 0x42, 0x36, 0x05, 0x3b, 0x13, 0xe8, 0x87, 0x76, 0x65,
+    0x2f, 0xdd, 0x2d, 0x2a, 0x97, 0x16, 0x8d, 0xad, 0x44, 0xcd, 0x9a, 0x1f, 0xc5, 0x9b, 0x29, 0xec, 0x67, 0x8f, 0x12,
+    0x08, 0x48, 0x53, 0x39, 0x49, 0x35, 0xef, 0x51, 0x3a, 0x00, 0x90, 0x60, 0xf7, 0x13, 0x58, 0xe8, 0x37, 0x25, 0x26,
+    0x58, 0x54, 0x8d, 0xdd, 0x66, 0xa0, 0x35, 0x67, 0xa4, 0xf9, 0x66, 0xa8, 0xb5, 0x37, 0x95, 0xf5, 0x8c, 0xd9, 0x01,
+    0xb6, 0xed, 0x6e, 0x16, 0x47, 0xe9, 0x66, 0x67, 0x60, 0x08, 0x2e, 0x3c, 0xfe, 0x4f, 0x4a, 0x4c, 0x03, 0xc9, 0xa5,
+    0x6e, 0xfc, 0x84, 0x3a, 0x0c, 0xff, 0x5b, 0x90, 0x02, 0xee, 0xd7, 0x56, 0x63, 0xc9, 0xb9, 0x57, 0x1c, 0x25, 0x97,
+    0x55, 0xb5, 0xab, 0x25, 0x68, 0xe8, 0x46, 0x32, 0x26, 0x8a, 0x79, 0x4e, 0x00, 0x8c, 0x62, 0xf3, 0xa7, 0x4c, 0x27,
+    0x79, 0xff, 0xba, 0x32, 0xb5, 0xdb, 0xf7, 0xfd, 0x28, 0x3f, 0xa5, 0x23, 0x15, 0x95, 0xcd, 0x49, 0xcc, 0xbf, 0x2d,
+    0xc0, 0x34, 0x27, 0x3e, 0xd2, 0x73, 0x0d, 0x42, 0x01, 0xbe, 0xb2, 0xa1, 0xd4, 0x6c, 0x8f, 0xff, 0xe8, 0x6c, 0xf7,
+    0x25, 0x51, 0x04, 0x0b, 0x34, 0xe8, 0x72, 0x0d, 0xbe, 0x80, 0x65, 0x70, 0x47, 0xfa, 0x29, 0xf8, 0x5e, 0x5e, 0x07,
+    0x9f, 0xb1, 0xff, 0x05, 0xa0, 0x55, 0x81, 0x01, 0xe5, 0x4e, 0xd3, 0xb0, 0x12, 0xe2, 0x12, 0x15, 0x66, 0x15, 0xe7,
+    0x8f, 0xeb, 0xbc, 0x6e, 0x5a, 0x96, 0x18, 0x94, 0x9f, 0xb9, 0x86, 0x1b, 0xdf, 0x6b, 0xe4, 0x8f, 0xef, 0x3f, 0x07,
+    0xdd, 0x4e, 0xa4, 0xdd, 0xd8, 0xc8, 0xd7, 0xc8, 0x42, 0xc3, 0x7b, 0x61, 0x33, 0x68, 0x8b, 0x74, 0xc9, 0xd5, 0x33,
+    0x16, 0xe3, 0x6d, 0x11, 0x2a, 0xc3, 0x07, 0x2c, 0x98, 0x01, 0x86, 0xe0, 0xb1, 0x53, 0x99, 0x7c, 0x86, 0x8d, 0xa6,
+    0xd8, 0x35, 0x17, 0x06, 0x1f, 0xa8, 0xca, 0x42, 0xf2, 0x62, 0x9d, 0x6c, 0xcf, 0xce, 0xe0, 0xf9, 0x65, 0x5c, 0x00,
+    0x75, 0x00, 0xfd, 0x8a, 0xca, 0x62, 0x03, 0xb9, 0xb8, 0x29, 0x6b, 0xbd, 0xa2, 0xd1, 0xe8, 0xc6, 0x2e, 0xac, 0xae,
+    0xc0, 0x27, 0x51, 0x3a, 0x4a, 0xc4, 0x24, 0x66, 0x52, 0xe5, 0x8a, 0x5c, 0x1b, 0xdd, 0x4b, 0x5b, 0x34, 0xcf, 0x85,
+    0x04, 0xaf, 0x08, 0xdc, 0x10, 0xfa, 0x4a, 0x5f, 0xae, 0x36, 0x50, 0xf0, 0xa8, 0xbd, 0xb9, 0x08, 0x26, 0x26, 0x1e,
+    0x33, 0xa4, 0xa6, 0x5f, 0x87, 0x53, 0x2b, 0x8b, 0x25, 0x87, 0x5f, 0xe7, 0x8c, 0x35, 0x14, 0x00, 0xf1, 0xc9, 0x83,
+    0xeb, 0xdd, 0xa4, 0x57, 0x4a, 0x3b, 0x28, 0x8d, 0x10, 0xdf, 0x55, 0xf8, 0xba, 0x0b, 0xc5, 0x57, 0xae, 0xba, 0xf7,
+    0x35, 0x65, 0xc6, 0x05, 0xa3, 0xe7, 0x7c, 0x9a, 0x34, 0xae, 0xdd, 0xd0, 0x5d, 0x9d, 0x9f, 0xbc, 0x1f, 0x65, 0xde,
+    0xc2, 0x14, 0xd8, 0x04, 0x54, 0xc1, 0x73, 0xef, 0xb5, 0x71, 0xa2, 0xfc, 0x9d, 0x79, 0xc4, 0x2b, 0x87, 0x59, 0x75,
+    0x92, 0xfc, 0x5d, 0xff, 0xbb, 0xe0, 0xfa, 0x96, 0xc6, 0x09, 0x72, 0x57, 0x9d, 0x20, 0x13, 0xe5, 0xa6, 0x7a, 0xc3,
+    0xed, 0xdf, 0x55, 0x20, 0x88, 0x53, 0x31, 0x7d, 0x54, 0x8e, 0xeb, 0x47, 0x0b, 0x54, 0x2a, 0x22, 0x3e, 0x55, 0xb9,
+    0x2b, 0xd7, 0xa6, 0x86, 0x7a, 0x5c, 0x27, 0xb3, 0xd0, 0x34, 0x2b, 0x72, 0x29, 0x9b, 0x1e, 0x23, 0xd3, 0xec, 0x54,
+    0x9b, 0xdf, 0xbd, 0xf6, 0x90, 0x8e, 0xa1, 0xb9, 0x58, 0xab, 0x05, 0xf7, 0xbb, 0x8a, 0xc2, 0xbb, 0x5e, 0x6c, 0xa4,
+    0x32, 0xd4, 0xac, 0x47, 0xd1, 0xc7, 0x71, 0x9b, 0xb9, 0x3c, 0xca, 0xfe, 0xac, 0x01, 0x60, 0x3a, 0xc2, 0xa2, 0xbb,
+    0xe9, 0x19, 0x7b, 0x02, 0x3d, 0x3d, 0x91, 0x41, 0xa2, 0xd7, 0x3a, 0x5f, 0xb5, 0x4a, 0x2c, 0x5d, 0x41, 0x60, 0xf7,
+    0x86, 0x8c, 0x55, 0x49, 0xbb, 0xe5, 0xfa, 0xe5, 0x3c, 0x9f, 0xa7, 0x7c, 0x29, 0xcf, 0xa7, 0x66, 0xd1, 0xad, 0xb5,
+    0xdd, 0x9b, 0x53, 0x43, 0xc5, 0x5c, 0xab, 0x9b, 0xfc, 0x81, 0xe9, 0x3a, 0x18, 0x6a, 0x11, 0x64, 0x56, 0xbb, 0xea,
+    0x59, 0x59, 0x4e, 0xeb, 0x99, 0x1c, 0x53, 0xe1, 0x9b, 0x4a, 0x77, 0x88, 0x6e, 0x98, 0xaa, 0x99, 0x7e, 0x6a, 0x6c,
+    0x0b, 0xd9, 0xe6, 0xf9, 0xe5, 0x28, 0x07, 0x4a, 0xcb, 0xfd, 0x65, 0xc2, 0xf0, 0xd3, 0xd5, 0xd5, 0x4f, 0x42, 0x4e,
+    0x55, 0x1d, 0xbd, 0xc5, 0x4b, 0xdd, 0x33, 0x98, 0x96, 0xca, 0x89, 0x38, 0x61, 0xab, 0x07, 0x6f, 0xee, 0x5e, 0x01,
+    0xcb, 0x09, 0x60, 0x77, 0xc2, 0x9c, 0xc6, 0x50, 0xd5, 0x06, 0xfe, 0x71, 0xf5, 0x60, 0xab, 0xf6, 0xf0, 0x8f, 0xfd,
+    0x1f, 0x83, 0x1b, 0x1b, 0x1b, 0xdb, 0x78, 0xbb, 0x96, 0x08, 0xf2, 0x0a, 0x0f, 0xf4, 0xf1, 0xea, 0xa3, 0xa0, 0xe5,
+    0x2a, 0xb1, 0xdd, 0x77, 0x28, 0x6c, 0x0d, 0xf2, 0x4d, 0xca, 0xa4, 0xe1, 0xbc, 0xe0, 0xd9, 0x54, 0xce, 0x50, 0xc8,
+    0x6b, 0x3e, 0x0e, 0xda, 0x8e, 0xf0, 0x37, 0x70, 0x6a, 0xc7, 0xcb, 0x8b, 0x4f, 0xd0, 0x07, 0x3c, 0x5d, 0x29, 0x4d,
+    0x45, 0x9c, 0x52, 0x6e, 0xd1, 0xe5, 0x3a, 0x0f, 0x46, 0x8a, 0x8b, 0x09, 0x2a, 0x1d, 0x77, 0x71, 0xe3, 0x6c, 0xe4,
+    0xf4, 0x97, 0x78, 0x75, 0x91, 0x2e, 0x1f, 0x89, 0x6c, 0xd5, 0xd2, 0xfb, 0x5d, 0x9f, 0x6e, 0xdb, 0x53, 0xc6, 0x27,
+    0xd9, 0x88, 0x0e, 0x66, 0x7c, 0x9c, 0x08, 0xaf, 0x4f, 0x8c, 0xf4, 0xdd, 0x22, 0x30, 0xdd, 0x1c, 0x9b, 0xfc, 0x70,
+    0xbc, 0xde, 0x6c, 0xd6, 0xb8, 0xfd, 0x37, 0xce, 0x13, 0x67, 0x51, 0x62, 0x44, 0x65, 0xa1, 0xe1, 0x01, 0xad, 0x10,
+    0x37, 0xef, 0x99, 0xc0, 0xb8, 0xec, 0x92, 0xa4, 0xb6, 0x1b, 0x08, 0x5c, 0xec, 0x71, 0xcc, 0x92, 0x91, 0xed, 0x41,
+    0x79, 0xa0, 0x2f, 0x46, 0xd3, 0x2d, 0x60, 0x5a, 0x5e, 0x3b, 0x3b, 0x4f, 0x6d, 0xaf, 0x9a, 0x2a, 0x80, 0x59, 0xb2,
+    0x3c, 0x3e, 0x45, 0xd6, 0xfd, 0x16, 0xba, 0x88, 0x01, 0x63, 0xe3, 0xca, 0x9c, 0xbb, 0x58, 0xb5, 0x22, 0xbe, 0xd1,
+    0x44, 0x9a, 0xd4, 0x47, 0xd4, 0x77, 0x10, 0xd6, 0xea, 0x2a, 0x07, 0x09, 0xdc, 0x23, 0xef, 0x8e, 0xb8, 0xf4, 0xf4,
+    0x99, 0xc5, 0xb8, 0x4a, 0xdf, 0x52, 0xd7, 0xe2, 0x9a, 0x61, 0xaf, 0xb8, 0x0f, 0xf6, 0x07, 0xc6, 0x2d, 0x62, 0x11,
+    0x6f, 0xe7, 0xb5, 0x14, 0xd6, 0xc6, 0x1c, 0x68, 0x6e, 0xb8, 0xc1, 0xef, 0xac, 0x5a, 0x33, 0x30, 0xc3, 0x8c, 0x33,
+    0x92, 0xdf, 0x8d, 0x7b, 0x55, 0x63, 0x47, 0xae, 0x02, 0x88, 0xbe, 0x05, 0x5d, 0x92, 0xc3, 0x2b, 0x59, 0xae, 0x3a,
+    0x43, 0xfe, 0x0d, 0xd6, 0x59, 0x2f, 0x4e, 0xc0, 0x4c, 0x9a, 0xf2, 0x12, 0x13, 0x53, 0xc4, 0xe5, 0x66, 0x19, 0xf3,
+    0x34, 0x7d, 0x16, 0xed, 0xe0, 0xe4, 0x46, 0x02, 0x47, 0xec, 0x1b, 0xcb, 0xd0, 0x4c, 0xd8, 0x88, 0x89, 0x34, 0x2a,
+    0xa5, 0x84, 0xf7, 0xe5, 0x52, 0x4b, 0xfe, 0x32, 0x97, 0x57, 0x5f, 0x6e, 0x13, 0x1c, 0x90, 0xd7, 0xc0, 0x72, 0x68,
+    0x1c, 0xb7, 0x0c, 0x24, 0x62, 0x31, 0x20, 0x46, 0xad, 0xca, 0xe5, 0x64, 0x54, 0x27, 0xf3, 0x15, 0x72, 0xa1, 0x22,
+    0x0f, 0x6e, 0x09, 0x94, 0xfc, 0x39, 0xa6, 0x0e, 0x66, 0xa5, 0x76, 0xd3, 0x62, 0x93, 0xe4, 0x3d, 0x33, 0x20, 0xb9,
+    0xfa, 0x1a, 0x1e, 0x1a, 0xbf, 0x78, 0x65, 0x4e, 0x09, 0x5f, 0x94, 0xb1, 0xb4, 0x34, 0xe6, 0xd2, 0xbf, 0x90, 0xf7,
+    0x69, 0x25, 0x60, 0xbf, 0x81, 0x98, 0x32, 0x70, 0x89, 0x8d, 0x0b, 0x92, 0xf2, 0x5a, 0x9e, 0xb2, 0xfb, 0x1a, 0xca,
+    0x77, 0xc9, 0xa4, 0xab, 0x54, 0xd6, 0x35, 0x56, 0xdd, 0x6f, 0x73, 0x96, 0x5f, 0x1e, 0x30, 0xcc, 0x4d, 0x46, 0x83,
+    0x6c, 0xc9, 0xcc, 0xa6, 0xfc, 0x6a, 0xef, 0xc6, 0xaf, 0x3c, 0x94, 0x74, 0xa8, 0x56, 0xe9, 0xe6, 0xa5, 0x1b, 0x8e,
+    0x71, 0xe3, 0x86, 0x23, 0x80, 0x8d, 0x61, 0xa7, 0x8a, 0xd4, 0x3a, 0xff, 0x7d, 0x39, 0xfc, 0x44, 0x7b, 0x6d, 0xa0,
+    0x77, 0xdd, 0x60, 0x65, 0x7a, 0xfa, 0x0d, 0xa8, 0x1a, 0x59, 0x42, 0x37, 0xa1, 0x8a, 0xc9, 0x48, 0x94, 0x98, 0xae,
+    0x52, 0x1e, 0xf5, 0x35, 0xe2, 0x1c, 0xc4, 0x0d, 0xe5, 0x2f, 0xfe, 0x35, 0xbc, 0x3c, 0x0e, 0xd0, 0x88, 0x5a, 0x8c,
+    0xb3, 0x94, 0xb7, 0xc6, 0xd1, 0x34, 0x4e, 0x2e, 0x83, 0x79, 0xdc, 0x9a, 0x66, 0x69, 0x56, 0xcc, 0x80, 0x2b, 0xbd,
+    0xe2, 0x12, 0x6c, 0xf8, 0x69, 0x6b, 0x1e, 0x7b, 0xcf, 0x59, 0x72, 0xc6, 0x78, 0x3c, 0x8c, 0x3c, 0x7b, 0x3f, 0x07,
+    0xf1, 0x60, 0xbd, 0x8e, 0xf2, 0x3c, 0x3b, 0xb7, 0xbd, 0x77, 0xd9, 0x09, 0x30, 0xad, 0xf7, 0xe6, 0xe2, 0xf2, 0x94,
+    0xa5, 0xde, 0xfb, 0x93, 0x79, 0xca, 0xe7, 0x5e, 0x11, 0xa5, 0x45, 0xab, 0x60, 0x79, 0x3c, 0x06, 0x35, 0x91, 0x64,
+    0x79, 0x0b, 0xf3, 0x9f, 0xa7, 0x2c, 0x48, 0xe2, 0xd3, 0x09, 0xb7, 0x46, 0x51, 0xfe, 0xa9, 0xd7, 0x6a, 0xcd, 0xf2,
+    0x78, 0x1a, 0xe5, 0x97, 0x2d, 0x6a, 0x11, 0x7c, 0xd1, 0xde, 0x8e, 0xbe, 0x1a, 0xdf, 0xef, 0xf1, 0x1c, 0xfa, 0xc6,
+    0x48, 0xc5, 0x00, 0x84, 0x8f, 0xb5, 0xbd, 0xd3, 0x9e, 0x16, 0x6b, 0xe2, 0x44, 0x29, 0x4a, 0x79, 0x79, 0xec, 0x7d,
+    0x64, 0x00, 0xb7, 0x7f, 0xc2, 0x53, 0x0f, 0x7c, 0x39, 0x9e, 0xa5, 0x8b, 0xe1, 0x3c, 0x2f, 0x60, 0x80, 0x59, 0x16,
+    0xa7, 0x9c, 0xe5, 0xbd, 0x93, 0x2c, 0x07, 0xb2, 0xb5, 0xf2, 0x68, 0x14, 0xcf, 0x8b, 0xe0, 0xfe, 0xec, 0xa2, 0x87,
+    0xb6, 0xc2, 0x69, 0x9e, 0xcd, 0xd3, 0x91, 0x9c, 0x2b, 0x4e, 0x61, 0x63, 0xc4, 0xdc, 0xac, 0xa0, 0x2f, 0xa1, 0x00,
+    0x7c, 0x29, 0x8b, 0xf2, 0xd6, 0x29, 0x76, 0x46, 0x43, 0xbf, 0x3d, 0x62, 0xa7, 0x5e, 0x7e, 0x7a, 0x12, 0x39, 0x9d,
+    0xee, 0x43, 0x4f, 0xfd, 0xf3, 0x77, 0x5c, 0x30, 0xdc, 0x57, 0x16, 0x77, 0xda, 0xed, 0x7f, 0x70, 0x7b, 0x8d, 0x59,
+    0x08, 0xa0, 0xa0, 0x33, 0xbb, 0xb0, 0x8a, 0x2c, 0x81, 0xf5, 0x59, 0xd5, 0xb3, 0x37, 0x03, 0xbf, 0x29, 0x4e, 0x4f,
+    0x83, 0xee, 0xec, 0xa2, 0x44, 0xec, 0x02, 0x91, 0x90, 0x29, 0x91, 0x94, 0x6f, 0x8b, 0x3f, 0x0a, 0xf1, 0xa3, 0xd5,
+    0x10, 0x77, 0x15, 0xc4, 0x15, 0xd5, 0x5b, 0x23, 0xd8, 0x07, 0x44, 0xfe, 0x4e, 0x21, 0x00, 0x99, 0x80, 0x13, 0x98,
+    0x2b, 0x38, 0xe8, 0xe5, 0x0f, 0x83, 0xd1, 0x5d, 0x0d, 0xc6, 0xa3, 0xdb, 0xc0, 0xc8, 0xd3, 0xd1, 0xa2, 0xbe, 0xae,
+    0x1d, 0x70, 0x4e, 0x7b, 0x13, 0x86, 0xfc, 0x14, 0x74, 0xf1, 0xf9, 0x3c, 0x1e, 0xf1, 0x89, 0x78, 0x24, 0x76, 0x3e,
+    0x17, 0x75, 0x3b, 0xed, 0xb6, 0x78, 0x2f, 0x40, 0xa1, 0x05, 0x1d, 0x1f, 0x1b, 0x00, 0x13, 0x7d, 0xb8, 0xee, 0x23,
+    0x36, 0x5f, 0xdf, 0xfa, 0xa5, 0x1a, 0xef, 0x5c, 0xe5, 0x0d, 0x0a, 0x15, 0xa1, 0xbe, 0xd9, 0x82, 0x19, 0x6f, 0xf9,
+    0x5e, 0x47, 0x1f, 0x54, 0xf5, 0xbf, 0x66, 0xa4, 0xf5, 0x02, 0xee, 0x99, 0xb9, 0x40, 0xbd, 0x74, 0x0f, 0x43, 0x52,
+    0xad, 0x96, 0x0b, 0x7a, 0x83, 0x61, 0x08, 0x89, 0x0e, 0x04, 0x9d, 0xbc, 0x5f, 0xd0, 0x37, 0x35, 0x32, 0x37, 0x28,
+    0x9c, 0xcc, 0x85, 0x2d, 0x9f, 0x69, 0xb9, 0x0e, 0x4a, 0x1a, 0xbc, 0xec, 0x0f, 0x4c, 0x36, 0x00, 0xe9, 0x4d, 0xa1,
+    0xae, 0x1f, 0x42, 0xe1, 0x4a, 0x29, 0x47, 0x6a, 0x7a, 0xd3, 0x15, 0x7d, 0x58, 0x95, 0x98, 0x32, 0x92, 0x8f, 0x06,
+    0xff, 0x0a, 0xc3, 0xde, 0xd1, 0x8e, 0x65, 0x91, 0xcd, 0xf3, 0x21, 0x45, 0xea, 0x96, 0x3d, 0x7e, 0x9b, 0x14, 0xae,
+    0xed, 0x31, 0x2d, 0xe7, 0xd1, 0x0d, 0xae, 0x7d, 0xe4, 0x80, 0xd3, 0x21, 0x88, 0xb8, 0x63, 0x20, 0xa3, 0x1c, 0x0a,
+    0x42, 0x54, 0x5d, 0x23, 0xca, 0x77, 0xa3, 0xfb, 0x97, 0xfe, 0x3c, 0x8d, 0x41, 0xd2, 0x7d, 0x8c, 0x47, 0x74, 0xef,
+    0x24, 0x1e, 0xd1, 0x41, 0x44, 0x8b, 0x12, 0x8f, 0x30, 0xb2, 0x0d, 0x05, 0xea, 0x3b, 0x2c, 0xf0, 0x2c, 0x13, 0x59,
+    0xec, 0x96, 0x8d, 0x87, 0x09, 0x86, 0xaa, 0x1c, 0x65, 0xd3, 0x28, 0x4e, 0x03, 0xfc, 0x3e, 0x88, 0xa7, 0x47, 0x0c,
+    0xb0, 0x8b, 0x07, 0x3f, 0x99, 0xcc, 0x45, 0xeb, 0xb8, 0xfe, 0xaf, 0x20, 0x47, 0xa8, 0x7f, 0x29, 0xfd, 0x30, 0x0d,
+    0x97, 0x3a, 0xe6, 0xad, 0x97, 0x82, 0xec, 0xe1, 0xca, 0x66, 0x65, 0x14, 0xe7, 0xd8, 0xe5, 0xf4, 0xa3, 0xdf, 0xea,
+    0x04, 0x1d, 0xed, 0xba, 0xd6, 0x6e, 0xa3, 0x8a, 0x5c, 0x16, 0x79, 0xa3, 0x91, 0x60, 0xd0, 0xcf, 0x02, 0xce, 0xea,
+    0x5d, 0xc3, 0xea, 0x49, 0xbe, 0xc4, 0x00, 0xce, 0x69, 0xea, 0xd4, 0x80, 0xa0, 0xb3, 0x80, 0x6b, 0xa6, 0x72, 0xcb,
+    0x88, 0x94, 0xd2, 0x63, 0xda, 0xc0, 0xf5, 0xbb, 0x44, 0x78, 0x6f, 0xa8, 0x9e, 0x02, 0xa5, 0x58, 0x6e, 0x74, 0xbc,
+    0x2b, 0x76, 0xbc, 0x45, 0x3c, 0x16, 0xda, 0xb0, 0x05, 0x6d, 0xeb, 0x2f, 0x43, 0xa0, 0xd2, 0xa7, 0xd0, 0x5e, 0x5f,
+    0x38, 0x2a, 0xb1, 0x3e, 0x87, 0xb9, 0xf6, 0x85, 0xd6, 0xa3, 0x1b, 0xf9, 0xf6, 0xde, 0xfa, 0x82, 0x97, 0xbb, 0x5b,
+    0xa2, 0xf7, 0xde, 0x71, 0x59, 0x90, 0x82, 0x32, 0x03, 0x69, 0xd5, 0x14, 0xa2, 0x0e, 0x86, 0xa5, 0xf4, 0x5d, 0x1c,
+    0x37, 0xd7, 0x46, 0x97, 0x88, 0x18, 0x4b, 0xb6, 0x2b, 0x30, 0x5d, 0x29, 0xca, 0x61, 0x4f, 0xea, 0x84, 0x94, 0x42,
+    0xe4, 0x60, 0xf4, 0x96, 0xa1, 0x38, 0x46, 0x08, 0xfa, 0xeb, 0x8b, 0xb8, 0x0c, 0xd7, 0x17, 0x59, 0x79, 0x0c, 0x96,
+    0x09, 0x42, 0x95, 0xab, 0xcf, 0xbb, 0xc0, 0xc4, 0x22, 0xc8, 0x62, 0xd1, 0x08, 0x38, 0x2d, 0x2b, 0x6d, 0xab, 0x2f,
+    0xa0, 0x01, 0x0f, 0x10, 0x0b, 0xc0, 0x76, 0xa3, 0x5e, 0x0c, 0x70, 0x11, 0xad, 0xf7, 0x60, 0xa0, 0xdd, 0x2d, 0xd1,
+    0x08, 0xf0, 0xca, 0x11, 0xe4, 0x0a, 0x2d, 0x4c, 0xc7, 0x31, 0x51, 0x1b, 0xc5, 0x67, 0x9a, 0x74, 0x94, 0x9b, 0xbc,
+    0xb7, 0x9b, 0x44, 0x27, 0x2c, 0x81, 0x21, 0x8b, 0xab, 0xab, 0x36, 0x8c, 0x24, 0x5e, 0xad, 0xdd, 0x38, 0x9d, 0xcd,
+    0xe5, 0x67, 0xb6, 0x60, 0xe2, 0x0e, 0x9e, 0x7c, 0xe2, 0x2d, 0x80, 0xbe, 0x3a, 0xca, 0x0b, 0xe4, 0x00, 0x00, 0x22,
+    0x9d, 0x22, 0x20, 0x74, 0x15, 0x5b, 0x40, 0x69, 0x3c, 0x5a, 0x2e, 0xd3, 0x98, 0xe5, 0xf0, 0x02, 0xdb, 0x72, 0x86,
+    0xcf, 0x29, 0x3c, 0x4f, 0xe3, 0x14, 0x1f, 0x0b, 0x7c, 0x8c, 0x2e, 0xf0, 0x31, 0x2b, 0xed, 0xbf, 0xcb, 0x0a, 0x58,
+    0x9a, 0x00, 0xd9, 0xd5, 0x15, 0xc8, 0x7b, 0x4d, 0x82, 0xdd, 0x2d, 0x20, 0x16, 0x72, 0x8a, 0xf8, 0xe8, 0x0a, 0x33,
+    0xc9, 0xc8, 0x8a, 0x59, 0x4b, 0x94, 0x5b, 0xa4, 0x55, 0x43, 0x70, 0xba, 0x72, 0xa7, 0x61, 0x3c, 0x78, 0x32, 0xbd,
+    0xe4, 0x09, 0xbe, 0xb8, 0xb6, 0x25, 0xbe, 0x8a, 0x21, 0x88, 0x42, 0x8f, 0x88, 0xa1, 0x2e, 0xe3, 0xf2, 0x7b, 0x37,
+    0x71, 0x68, 0xe3, 0x2c, 0x60, 0xbf, 0xa1, 0x16, 0xe0, 0x51, 0x9c, 0x88, 0xc6, 0x2b, 0xf0, 0x69, 0xe4, 0x09, 0x12,
+    0x3a, 0xbb, 0x5b, 0x15, 0x6c, 0x00, 0xfc, 0x50, 0xdc, 0xb2, 0x76, 0x44, 0x0e, 0xa4, 0x2d, 0xca, 0xe9, 0xec, 0x5c,
+    0x6e, 0x69, 0x19, 0xd9, 0x15, 0xb1, 0x72, 0x8d, 0x2a, 0xe5, 0x2c, 0xda, 0xe3, 0x28, 0x5d, 0xd5, 0x14, 0xa0, 0x9f,
+    0x31, 0x36, 0xf2, 0x6c, 0x0b, 0x64, 0xa9, 0x78, 0xfe, 0x98, 0xb0, 0x33, 0x26, 0xbf, 0x94, 0xa2, 0x07, 0xd1, 0x95,
+    0x43, 0x50, 0xc9, 0x5c, 0x5e, 0xe2, 0x94, 0xec, 0xa9, 0x70, 0x94, 0x94, 0xa8, 0x23, 0xe2, 0xd9, 0xc6, 0xa0, 0xcd,
+    0x39, 0xda, 0xf5, 0x61, 0xbd, 0x0e, 0x58, 0xbb, 0xb6, 0x80, 0x97, 0xec, 0xb8, 0xdb, 0x91, 0x83, 0x01, 0xd8, 0x78,
+    0x0c, 0xdb, 0x45, 0x45, 0x96, 0xb5, 0x2c, 0x10, 0x50, 0x81, 0x53, 0xea, 0xd9, 0xa2, 0x85, 0x5d, 0xb5, 0xd5, 0x4f,
+    0x92, 0x38, 0x49, 0x36, 0xfc, 0xb4, 0x62, 0x2e, 0xe0, 0x8e, 0x75, 0x11, 0x69, 0x6d, 0xc8, 0x37, 0xfb, 0x5f, 0xfe,
+    0xf9, 0xbf, 0xff, 0x67, 0x18, 0x98, 0xfa, 0xb9, 0xa5, 0x75, 0x7d, 0xab, 0xff, 0x06, 0xad, 0xe6, 0xe9, 0x2d, 0xed,
+    0xfe, 0xf6, 0x1f, 0xfe, 0x0b, 0x34, 0xa3, 0x1b, 0x39, 0x6e, 0x79, 0x4c, 0x10, 0x0d, 0xd1, 0x08, 0xfa, 0x2c, 0x90,
+    0x6a, 0x83, 0x5c, 0x3b, 0xd3, 0x3f, 0x21, 0xd8, 0x05, 0xcf, 0x66, 0x37, 0x82, 0x83, 0x50, 0x0f, 0x93, 0xac, 0x60,
+    0x1a, 0x1e, 0x21, 0x6b, 0x3f, 0x0f, 0x20, 0x9a, 0x6b, 0x06, 0x5c, 0x5e, 0x58, 0x7a, 0x1c, 0xb1, 0x3c, 0xab, 0xc6,
+    0x69, 0xac, 0x5e, 0xc1, 0x38, 0xa1, 0x43, 0x71, 0x05, 0x58, 0x2f, 0xf1, 0x04, 0x0f, 0x24, 0x10, 0xdc, 0xfa, 0x57,
+    0xbe, 0x56, 0x0f, 0xa6, 0xf9, 0x53, 0x8c, 0x25, 0x42, 0x29, 0x6a, 0x04, 0xf8, 0x09, 0x72, 0xea, 0xa3, 0x7e, 0x8e,
+    0x2e, 0xf4, 0x33, 0xca, 0x32, 0x31, 0x01, 0xe8, 0xa2, 0x29, 0x9a, 0x19, 0xe6, 0x0c, 0x22, 0x0d, 0xa0, 0xf2, 0x23,
+    0x8d, 0x6c, 0x12, 0x21, 0xbc, 0x3e, 0x62, 0xd2, 0x25, 0x5e, 0xb1, 0x99, 0xe7, 0xec, 0x63, 0x92, 0x9d, 0x63, 0x70,
+    0x0a, 0x89, 0x74, 0x5d, 0x7d, 0x69, 0xf9, 0xbe, 0x75, 0x4d, 0xf5, 0x04, 0x76, 0x01, 0xd8, 0x92, 0x3c, 0xd4, 0x54,
+    0x6e, 0x20, 0xb5, 0x7a, 0x48, 0xc4, 0x72, 0x75, 0x8d, 0x44, 0x1b, 0x4b, 0x25, 0xd6, 0xf2, 0x11, 0x91, 0xf6, 0xda,
+    0x15, 0x53, 0xdc, 0x3e, 0x0f, 0xc2, 0x76, 0xcd, 0x44, 0x58, 0x75, 0xeb, 0x4c, 0xc7, 0x6e, 0x70, 0x03, 0x65, 0x3e,
+    0x13, 0xeb, 0xd5, 0x80, 0xdc, 0x01, 0x06, 0x0f, 0x34, 0x80, 0xd0, 0x11, 0x4f, 0x84, 0x84, 0x0f, 0x68, 0x2d, 0xa4,
+    0xb8, 0xaf, 0x41, 0xe4, 0x59, 0xff, 0xe7, 0x7f, 0x1e, 0xd2, 0x1c, 0xd8, 0x26, 0xae, 0xf4, 0x2b, 0x99, 0x23, 0x27,
+    0xb9, 0x52, 0xbf, 0xaf, 0xf0, 0x82, 0x1d, 0x8d, 0x82, 0x4a, 0xb6, 0x20, 0x9b, 0x80, 0x93, 0x4d, 0x60, 0xea, 0x61,
+    0xf4, 0x32, 0xb2, 0xd5, 0xfa, 0xf6, 0x23, 0xf6, 0xab, 0x69, 0x4c, 0x2e, 0x35, 0x66, 0x2c, 0xad, 0x59, 0xa9, 0x31,
+    0xf1, 0xfb, 0x29, 0x0d, 0x8d, 0x19, 0x5f, 0xab, 0x31, 0x91, 0x76, 0x7d, 0x1c, 0x39, 0xb4, 0x37, 0x31, 0x94, 0x62,
+    0x68, 0x70, 0x8e, 0xb6, 0x09, 0xf8, 0xcf, 0xc3, 0x4f, 0xd2, 0x34, 0x21, 0xc8, 0x31, 0x96, 0x20, 0x8d, 0x2d, 0xb2,
+    0x4b, 0x04, 0x76, 0xc7, 0xa5, 0xde, 0xf8, 0xf8, 0x68, 0x4c, 0xc0, 0xdd, 0xc5, 0x98, 0xa1, 0x58, 0x3e, 0xde, 0xc2,
+    0x21, 0xc4, 0x7e, 0x29, 0xe9, 0x19, 0x90, 0xda, 0xa2, 0x71, 0xbc, 0x85, 0x08, 0x4a, 0x05, 0xf6, 0xdb, 0x37, 0x07,
+    0x87, 0xb6, 0x77, 0x92, 0x8d, 0x2e, 0x03, 0x1b, 0x1c, 0x0a, 0x30, 0x3e, 0x5c, 0x9f, 0x4f, 0x58, 0xea, 0x28, 0x93,
+    0x3e, 0x4b, 0xc0, 0xa5, 0xc9, 0x4e, 0xc5, 0x37, 0x14, 0x9a, 0x01, 0x75, 0x20, 0x26, 0x7d, 0x64, 0x71, 0x6f, 0x97,
+    0x8b, 0xef, 0x8f, 0xf2, 0x1c, 0x1f, 0xf7, 0x30, 0xa5, 0x60, 0x77, 0x0b, 0x1e, 0xf0, 0xe5, 0x00, 0xd5, 0x91, 0x7e,
+    0x13, 0x70, 0x16, 0xe2, 0x7d, 0x0b, 0xdb, 0x6f, 0xa9, 0xbe, 0x08, 0xc5, 0x9e, 0x64, 0x35, 0x6d, 0x75, 0x57, 0xa6,
+    0x1c, 0x8d, 0x3d, 0x42, 0x4b, 0x8d, 0xac, 0x6e, 0x20, 0x05, 0x1f, 0xe9, 0x12, 0xa1, 0xfd, 0x8d, 0x22, 0x1a, 0xa5,
+    0xd2, 0xd5, 0xb2, 0x0a, 0x27, 0x24, 0x2a, 0x8a, 0xc9, 0xe0, 0x27, 0x81, 0x7f, 0x6c, 0x7e, 0x2f, 0x4c, 0x7c, 0xda,
+    0x47, 0x23, 0x79, 0xf4, 0x57, 0xef, 0x23, 0xf3, 0x2e, 0x8f, 0xa9, 0xa5, 0x72, 0x4e, 0x31, 0x6a, 0x82, 0x4e, 0x7c,
+    0x5b, 0x45, 0x21, 0xc0, 0x3c, 0x49, 0xa2, 0x59, 0xc1, 0x02, 0xf5, 0x20, 0xfd, 0x54, 0x74, 0x77, 0x97, 0x03, 0x03,
+    0xa6, 0x19, 0x53, 0xf2, 0xc9, 0xc2, 0x74, 0x64, 0x1f, 0x80, 0x23, 0x8b, 0x49, 0xf8, 0xad, 0x08, 0x94, 0x6f, 0x1a,
+    0x24, 0x6c, 0xcc, 0x4b, 0x8e, 0xb7, 0xbc, 0x17, 0x2a, 0x72, 0xe0, 0x77, 0x77, 0xc0, 0xb9, 0xb5, 0x7c, 0xfc, 0xff,
+    0xb6, 0xb1, 0x47, 0x41, 0x0a, 0xce, 0x28, 0x5d, 0xfb, 0xc0, 0x2b, 0x75, 0x00, 0x91, 0xf9, 0xbe, 0x30, 0x26, 0x1a,
+    0x32, 0x8c, 0xaa, 0x94, 0x3c, 0x07, 0xb1, 0xed, 0xf1, 0xdc, 0x6c, 0x07, 0xe2, 0x76, 0x29, 0xb4, 0xb2, 0xec, 0xdc,
+    0x6f, 0xbb, 0xd2, 0x05, 0x58, 0x6e, 0xac, 0x22, 0x24, 0xf5, 0xb7, 0x25, 0x0a, 0x19, 0xb1, 0x9c, 0x52, 0x68, 0x9a,
+    0x85, 0xe8, 0x61, 0xe2, 0xb4, 0x1c, 0xe5, 0xb9, 0xd5, 0x50, 0x2c, 0x69, 0xc7, 0x1f, 0xd1, 0x8e, 0x27, 0x19, 0x36,
+    0x58, 0x88, 0xb9, 0x87, 0x51, 0x32, 0x74, 0x10, 0x00, 0xab, 0x65, 0x3d, 0x02, 0x6a, 0xba, 0x2a, 0xd2, 0xe0, 0x3f,
+    0x44, 0xe2, 0x96, 0x42, 0xe2, 0xad, 0xa0, 0xd2, 0xf1, 0xa0, 0x2c, 0x7b, 0xe7, 0xcc, 0x39, 0xfa, 0x5d, 0x5e, 0x1a,
+    0x10, 0x77, 0x45, 0xf5, 0xf7, 0xf6, 0xda, 0xa5, 0x3b, 0xf0, 0x7e, 0x30, 0x3e, 0x62, 0x66, 0x2b, 0x86, 0xb6, 0x3d,
+    0x58, 0x86, 0x1f, 0x42, 0xec, 0xfb, 0xca, 0xb1, 0xd1, 0xb2, 0xa4, 0x9a, 0xcb, 0x16, 0xf1, 0x97, 0x8d, 0xdd, 0x44,
+    0xc8, 0xfb, 0xfb, 0xeb, 0x22, 0x17, 0xdf, 0xdc, 0x1e, 0xb9, 0x60, 0x77, 0x8c, 0x5c, 0x7c, 0xf3, 0x27, 0x47, 0x2e,
+    0xbe, 0x6f, 0x46, 0x2e, 0x7e, 0xfb, 0x9c, 0xc8, 0x45, 0x9e, 0x9d, 0x17, 0x61, 0x47, 0x9e, 0x94, 0x83, 0xcc, 0xf9,
+    0xfb, 0x84, 0x30, 0x60, 0xa2, 0x46, 0x00, 0x83, 0x22, 0x16, 0x22, 0xb9, 0x0f, 0x24, 0xbb, 0x8c, 0x17, 0xb4, 0x75,
+    0x16, 0x5d, 0xeb, 0xbe, 0xba, 0x36, 0x04, 0x1e, 0x9b, 0xab, 0x2f, 0xbc, 0x75, 0x55, 0x44, 0x21, 0xa0, 0xef, 0x7e,
+    0xea, 0x8e, 0xdd, 0x4d, 0x95, 0xbe, 0x65, 0x8e, 0xd0, 0x53, 0x51, 0x79, 0xc1, 0x3e, 0x0b, 0xfb, 0xdf, 0x1d, 0x75,
+    0x7a, 0xdb, 0x9d, 0x29, 0xf4, 0x06, 0x2d, 0x0a, 0x6f, 0xed, 0xde, 0xf6, 0x36, 0xbe, 0x9d, 0xab, 0xb7, 0x2e, 0xbe,
+    0xc5, 0xea, 0x6d, 0x07, 0xdf, 0x86, 0xea, 0xed, 0x01, 0xbe, 0x8d, 0xd4, 0xdb, 0x43, 0x7c, 0x3b, 0xb3, 0xcb, 0x23,
+    0xae, 0x81, 0x7b, 0x08, 0x7c, 0x45, 0xc6, 0x7e, 0xa0, 0xca, 0x60, 0xd3, 0xe2, 0x75, 0xbb, 0xe8, 0x34, 0x88, 0x3d,
+    0xe1, 0x14, 0x05, 0xb9, 0x77, 0x0e, 0x92, 0x3f, 0xa0, 0xec, 0xb2, 0xa7, 0xf8, 0xdd, 0x05, 0xf0, 0x21, 0x0e, 0xe3,
+    0x29, 0x53, 0x1f, 0xa0, 0x55, 0x58, 0x83, 0x1d, 0x79, 0xd4, 0x1e, 0x94, 0x3d, 0xbd, 0x4e, 0x22, 0x60, 0xa2, 0x4e,
+    0xef, 0x69, 0xe5, 0xaa, 0x3a, 0x31, 0x5d, 0x4b, 0xaf, 0xf0, 0x35, 0x7a, 0xc4, 0x70, 0xa3, 0xc7, 0x60, 0x21, 0xb5,
+    0x2e, 0xc0, 0xf1, 0x5a, 0xa9, 0x5b, 0x10, 0x22, 0xad, 0x4d, 0x08, 0x27, 0xfd, 0x76, 0x18, 0x9d, 0xea, 0xe7, 0x57,
+    0x60, 0xf0, 0x46, 0xa7, 0xec, 0x36, 0x3d, 0x43, 0x20, 0x9a, 0x3a, 0x46, 0x01, 0x41, 0xf6, 0x10, 0x2c, 0x0d, 0x3a,
+    0x80, 0x52, 0xc7, 0x20, 0x75, 0xea, 0x5a, 0x87, 0xa6, 0xaf, 0x17, 0x01, 0x45, 0xab, 0x82, 0x5d, 0xb0, 0xbb, 0xa9,
+    0x54, 0x50, 0x18, 0x2a, 0xb0, 0xe0, 0x46, 0x55, 0xa4, 0x7d, 0xe4, 0x6b, 0x15, 0x92, 0xa5, 0x74, 0x91, 0x19, 0xcd,
+    0xd7, 0xa1, 0xfc, 0x65, 0xf1, 0xf8, 0x45, 0x67, 0x88, 0x7f, 0xa4, 0xf0, 0xfd, 0x62, 0x3c, 0x1e, 0xdf, 0xa8, 0x9b,
+    0xbe, 0x18, 0x8d, 0x59, 0x97, 0xed, 0xf4, 0x30, 0xd2, 0xdb, 0x92, 0xe2, 0xb0, 0x53, 0x12, 0xed, 0x16, 0x77, 0x6b,
+    0x8c, 0x92, 0x13, 0xd4, 0xd5, 0xdd, 0x95, 0x58, 0x09, 0x54, 0x59, 0x80, 0xf0, 0x3e, 0x8d, 0xd3, 0xa0, 0x5d, 0xfa,
+    0x67, 0x52, 0xea, 0x7f, 0xf1, 0xe8, 0xd1, 0xa3, 0xd2, 0x1f, 0xa9, 0xb7, 0xf6, 0x68, 0x54, 0xfa, 0xc3, 0x85, 0x46,
+    0xa3, 0xdd, 0x1e, 0x8f, 0x4b, 0x3f, 0x56, 0x05, 0xdb, 0xdd, 0xe1, 0x68, 0xbb, 0x5b, 0xfa, 0xe7, 0x46, 0x8b, 0xd2,
+    0x67, 0xf2, 0x2d, 0x67, 0xa3, 0x5a, 0xb8, 0xf8, 0x61, 0x1b, 0x2a, 0x05, 0xa3, 0x2d, 0xd0, 0xc9, 0x13, 0x8f, 0x41,
+    0x34, 0xe7, 0x59, 0x79, 0x0c, 0xb2, 0x9d, 0x81, 0x7c, 0x1e, 0x4b, 0xd9, 0x2e, 0xbe, 0xef, 0x8a, 0x12, 0xfd, 0x37,
+    0x53, 0xa2, 0x23, 0x33, 0x93, 0x34, 0x67, 0xa4, 0x07, 0x9a, 0xd5, 0xc8, 0x59, 0x54, 0xfd, 0x5b, 0xc8, 0x2a, 0x61,
+    0x8f, 0xd2, 0x06, 0x5b, 0x0a, 0x19, 0xff, 0xed, 0x75, 0x32, 0xfe, 0xbb, 0xdb, 0x65, 0xfc, 0xc9, 0xdd, 0x44, 0xfc,
+    0x77, 0x7f, 0xb2, 0x88, 0xff, 0xd6, 0x14, 0xf1, 0x42, 0x88, 0x5d, 0x82, 0xf5, 0x4a, 0x66, 0xeb, 0x49, 0x76, 0xd1,
+    0xc2, 0x2d, 0x91, 0xdb, 0x24, 0x3d, 0xd7, 0xef, 0x24, 0xfc, 0x57, 0xe4, 0xff, 0xa8, 0xc1, 0x8c, 0x8f, 0xc5, 0xf2,
+    0xec, 0xf4, 0x34, 0x61, 0x4a, 0xc6, 0x1b, 0x15, 0x64, 0x0e, 0xbf, 0x49, 0x43, 0xfb, 0x0d, 0x38, 0xa8, 0x46, 0xc9,
+    0x78, 0x0c, 0x45, 0xe3, 0xb1, 0xad, 0xf2, 0x63, 0x41, 0x9e, 0x51, 0xab, 0xd7, 0xb5, 0x12, 0x6a, 0xf5, 0xf5, 0xd7,
+    0x66, 0x99, 0x59, 0x20, 0x23, 0x51, 0xa6, 0x31, 0x21, 0x6b, 0x46, 0x71, 0x81, 0x7b, 0xb0, 0xfa, 0xb8, 0x2d, 0xda,
+    0x2b, 0x53, 0x50, 0x2a, 0xf1, 0x10, 0xbf, 0x9a, 0xd2, 0xfc, 0x90, 0x88, 0xc8, 0x65, 0x5e, 0x46, 0xae, 0x3a, 0xef,
+    0x34, 0xbe, 0x59, 0x57, 0x9d, 0x71, 0xc2, 0xe2, 0xcb, 0x7c, 0x86, 0xc7, 0x97, 0x2f, 0x46, 0xce, 0x25, 0xd8, 0xb1,
+    0x71, 0xf1, 0x26, 0x6d, 0xe4, 0x89, 0x09, 0xb0, 0xc3, 0xd0, 0xc4, 0xb4, 0x14, 0x04, 0xab, 0x12, 0xe6, 0xab, 0xca,
+    0x9e, 0xd1, 0x49, 0xa6, 0x13, 0xe1, 0x90, 0xfd, 0x1a, 0x59, 0x02, 0x73, 0x30, 0xa9, 0x0b, 0xe9, 0xe3, 0xe5, 0x22,
+    0xc9, 0xe2, 0x4c, 0x7e, 0xe5, 0x9a, 0xa2, 0xff, 0x0b, 0xa9, 0x3f, 0xe4, 0xf1, 0x7b, 0xd5, 0x13, 0x03, 0xee, 0x62,
+    0x86, 0x51, 0xa9, 0x82, 0xec, 0x40, 0xb8, 0x19, 0x7e, 0x92, 0x47, 0x0c, 0xa1, 0x62, 0xd9, 0x15, 0xf5, 0xf0, 0x13,
+    0x28, 0xd5, 0x97, 0x21, 0x6b, 0x5f, 0x11, 0x6c, 0xf0, 0x00, 0x7e, 0xdd, 0x9f, 0xa3, 0x36, 0xc8, 0xe6, 0xdc, 0x71,
+    0xa8, 0x95, 0xe3, 0x96, 0x5e, 0x77, 0x07, 0x3c, 0x4a, 0xd7, 0x17, 0xdf, 0xfd, 0x71, 0x74, 0x67, 0x89, 0xef, 0x75,
+    0xa1, 0xf3, 0xa5, 0xef, 0x70, 0x69, 0x12, 0xe3, 0x87, 0x42, 0x04, 0xa2, 0xc6, 0x5d, 0x11, 0xb5, 0x88, 0xcd, 0x77,
+    0x5f, 0xb9, 0x6f, 0x06, 0x61, 0xdd, 0x55, 0x1c, 0x2c, 0xe3, 0x64, 0xf5, 0x42, 0x6c, 0x2b, 0xac, 0x9a, 0x65, 0x70,
+    0x6e, 0xd1, 0x99, 0xc5, 0xb9, 0x11, 0x77, 0xae, 0x6d, 0x83, 0x52, 0x05, 0x9e, 0x45, 0xf4, 0xf8, 0x12, 0x63, 0xa4,
+    0xc2, 0xf7, 0x55, 0x40, 0xd7, 0xbd, 0x4e, 0x03, 0x72, 0xf4, 0x47, 0x35, 0xa3, 0xab, 0x2a, 0x55, 0x50, 0x9a, 0xa7,
+    0x04, 0x06, 0x32, 0x14, 0x00, 0x86, 0x35, 0x4e, 0x85, 0xde, 0x82, 0x69, 0x48, 0x00, 0x6b, 0x8f, 0x0c, 0xdd, 0x12,
+    0x5b, 0x81, 0x2d, 0xa4, 0x05, 0x28, 0x3d, 0xec, 0xb0, 0x67, 0xd5, 0x40, 0x4f, 0x97, 0xe3, 0xc6, 0x37, 0x39, 0x69,
+    0x97, 0xc7, 0x7e, 0x71, 0xee, 0xc1, 0x3f, 0xeb, 0xcb, 0x05, 0x48, 0xf9, 0x93, 0x4f, 0x31, 0x07, 0x9b, 0x7a, 0xd6,
+    0xc2, 0x28, 0x08, 0x85, 0x31, 0xa5, 0x3a, 0xa4, 0xa3, 0x47, 0x71, 0x45, 0xa8, 0x37, 0x2f, 0xd0, 0x97, 0x23, 0xa7,
+    0x25, 0x48, 0xb3, 0x94, 0xf5, 0xea, 0x47, 0xcc, 0xa6, 0xdf, 0xa0, 0x88, 0x35, 0x58, 0x64, 0xe8, 0xfb, 0xf1, 0x4b,
+    0xf0, 0xfd, 0x84, 0x1a, 0x6d, 0x2b, 0xa7, 0xa1, 0xbd, 0xb2, 0x7d, 0x20, 0x69, 0xbb, 0x49, 0xd6, 0x42, 0xbe, 0xec,
+    0x1c, 0x5d, 0xe7, 0xdc, 0xdc, 0x76, 0xe0, 0xda, 0xdd, 0xd9, 0xf1, 0xd4, 0x3f, 0xe3, 0xa4, 0xba, 0x59, 0x4c, 0x07,
+    0xae, 0x77, 0x81, 0x2c, 0x88, 0xc6, 0xf8, 0x45, 0xbd, 0xbb, 0xb4, 0x3c, 0xa1, 0x6c, 0xc7, 0x05, 0xaa, 0xf5, 0xa0,
+    0xf3, 0x08, 0xbc, 0xb5, 0x3b, 0x0f, 0x7f, 0x33, 0xfa, 0xa5, 0xa4, 0x91, 0xba, 0xb4, 0x6a, 0xdb, 0x3d, 0x94, 0x17,
+    0x49, 0x74, 0x09, 0x4e, 0x23, 0xd9, 0x18, 0x27, 0x18, 0xc4, 0xed, 0xcd, 0x32, 0x99, 0x39, 0x90, 0xb3, 0x84, 0x7e,
+    0x6d, 0x85, 0x5c, 0x8a, 0xed, 0x07, 0xb3, 0x0b, 0xb5, 0x1a, 0x9d, 0x46, 0x46, 0xc0, 0x9f, 0x7a, 0xf0, 0x7f, 0x7d,
+    0xa6, 0x41, 0xfd, 0xf0, 0x7a, 0x07, 0x60, 0x10, 0x86, 0x4d, 0x2b, 0x17, 0x50, 0xb5, 0xa1, 0xc4, 0x48, 0x7d, 0xa8,
+    0x06, 0xb2, 0xfc, 0x6d, 0x50, 0x95, 0x51, 0xc1, 0x7a, 0xf8, 0x69, 0xc3, 0x18, 0x5c, 0x53, 0x69, 0x3c, 0x4d, 0xe3,
+    0xd1, 0x28, 0x61, 0x3d, 0x65, 0x1f, 0x59, 0x9d, 0x07, 0x98, 0x39, 0x60, 0x2e, 0x59, 0x7d, 0x55, 0x0c, 0xe2, 0x69,
+    0x3a, 0x45, 0x27, 0x60, 0xaf, 0xe1, 0xf7, 0x09, 0x57, 0x92, 0x53, 0x1e, 0xa9, 0xb7, 0x2b, 0xe2, 0xd1, 0x73, 0x1d,
+    0x97, 0x1d, 0x30, 0x16, 0x69, 0xc1, 0xdb, 0x3d, 0x9e, 0xcd, 0x82, 0xd6, 0x76, 0x1d, 0x11, 0xac, 0xd2, 0x28, 0x78,
+    0x2b, 0xd0, 0xf2, 0xd0, 0x3a, 0x10, 0x5a, 0xce, 0xf2, 0x3b, 0xb2, 0x8c, 0x06, 0xc0, 0x6f, 0xe0, 0xe9, 0xa2, 0xb2,
+    0x8e, 0xcc, 0xff, 0x9f, 0xdd, 0xf2, 0xd5, 0xea, 0xdd, 0xf2, 0x95, 0xda, 0x2d, 0x37, 0x73, 0xec, 0x17, 0xe3, 0x0e,
+    0xfe, 0xe9, 0x55, 0x08, 0xc1, 0xaa, 0x00, 0x39, 0x2c, 0xb4, 0x8b, 0x5b, 0x5d, 0xf8, 0x8f, 0x86, 0x6e, 0x7b, 0xf8,
+    0xc7, 0x07, 0x0b, 0xb0, 0x6d, 0x61, 0x21, 0xfe, 0x6b, 0xd7, 0xaa, 0x3a, 0xf7, 0xb1, 0x0e, 0x7b, 0xed, 0x2c, 0xd7,
+    0x75, 0x6f, 0xde, 0xb4, 0x20, 0xaf, 0xb8, 0x13, 0x28, 0x61, 0x0c, 0xae, 0x5a, 0x74, 0x72, 0x02, 0xa5, 0xe3, 0x6c,
+    0x38, 0x2f, 0xfe, 0x51, 0xc2, 0x2f, 0x89, 0x78, 0xe3, 0x96, 0x6e, 0x8c, 0xa3, 0xba, 0x8a, 0x34, 0x14, 0x35, 0xc2,
+    0x42, 0xaf, 0x53, 0x50, 0x00, 0x63, 0x32, 0xa7, 0xeb, 0xdf, 0x5f, 0xb1, 0x09, 0xfe, 0x2e, 0x6b, 0xb3, 0x12, 0x99,
+    0x7f, 0x2d, 0x31, 0x6e, 0x24, 0xc2, 0x67, 0xd1, 0xc0, 0x5c, 0xc3, 0xf6, 0xa3, 0xd5, 0xe0, 0x1e, 0xa9, 0x99, 0x06,
+    0x4a, 0x29, 0x48, 0xbd, 0x03, 0x5e, 0x40, 0x34, 0x4f, 0xf8, 0xcd, 0xa3, 0x5e, 0xc7, 0x19, 0x4b, 0xa3, 0xde, 0x20,
+    0xd0, 0xab, 0xb6, 0x77, 0x94, 0xd2, 0x5f, 0x7c, 0x75, 0x1f, 0xff, 0x88, 0xc0, 0xd7, 0x49, 0xe5, 0x1b, 0x89, 0xd8,
+    0x00, 0xfa, 0x46, 0xeb, 0x35, 0xe7, 0x47, 0x68, 0x70, 0xf2, 0x7f, 0xee, 0xda, 0x1a, 0x8d, 0xf5, 0x3b, 0x35, 0x97,
+    0x56, 0xe9, 0x67, 0xb5, 0xfe, 0xbc, 0xc1, 0xef, 0xd8, 0x76, 0x28, 0x1c, 0x82, 0x7a, 0x5b, 0xf9, 0x2b, 0x44, 0x96,
+    0x1a, 0x2b, 0x8a, 0xdf, 0xb5, 0x7d, 0x65, 0x12, 0x53, 0x8f, 0xf5, 0xf0, 0x44, 0x3b, 0x91, 0xf2, 0xcc, 0x19, 0x7b,
+    0x08, 0x3f, 0xf2, 0x27, 0x16, 0xde, 0xc3, 0xaf, 0x6f, 0x59, 0x17, 0xd3, 0x24, 0x05, 0xb3, 0x6a, 0xc2, 0xf9, 0x2c,
+    0xd8, 0xda, 0x3a, 0x3f, 0x3f, 0xf7, 0xcf, 0xb7, 0xfd, 0x2c, 0x3f, 0xdd, 0xea, 0xb6, 0xdb, 0x6d, 0xfc, 0x68, 0x92,
+    0x6d, 0x9d, 0xc5, 0xec, 0xfc, 0x31, 0xb8, 0x1f, 0xf6, 0x43, 0xeb, 0x91, 0xf5, 0x70, 0xdb, 0xda, 0x79, 0x60, 0x5b,
+    0xa4, 0x00, 0xa0, 0x64, 0xdb, 0xb6, 0x84, 0x02, 0x08, 0x6d, 0x28, 0xde, 0xdb, 0x3d, 0x55, 0x36, 0x1c, 0x26, 0xa5,
+    0x0b, 0x0b, 0x09, 0xfc, 0xb7, 0xec, 0x13, 0xab, 0x6f, 0x75, 0x51, 0xd6, 0x92, 0x6a, 0x44, 0xbd, 0xe2, 0x7e, 0x1f,
+    0x46, 0xb3, 0x80, 0xd8, 0xc8, 0x2c, 0xc4, 0x30, 0x99, 0x28, 0xa5, 0x29, 0xd0, 0x2e, 0x3d, 0x81, 0x27, 0x70, 0x0b,
+    0x26, 0x16, 0x3c, 0xbf, 0xea, 0x3e, 0x04, 0x1d, 0x77, 0xd6, 0xba, 0x3f, 0x6c, 0xb7, 0x3a, 0x56, 0xa7, 0xd5, 0xf5,
+    0x1f, 0x5a, 0x5d, 0xf1, 0x3f, 0xc8, 0xc8, 0x6d, 0xab, 0x03, 0x4f, 0xdb, 0x16, 0xbc, 0x9f, 0xdd, 0x17, 0x29, 0x11,
+    0x91, 0xbd, 0xb5, 0xb7, 0x8b, 0xbf, 0x43, 0x08, 0x90, 0xfa, 0xca, 0x16, 0xbf, 0xf5, 0xcc, 0xfe, 0xc2, 0x2c, 0xed,
+    0x3c, 0x5a, 0x59, 0xdc, 0x7d, 0xb8, 0xb2, 0x78, 0xfb, 0xc1, 0xca, 0xe2, 0xfb, 0x3b, 0xf5, 0xe2, 0xad, 0x53, 0x51,
+    0xa5, 0xe5, 0x42, 0x68, 0x4f, 0x23, 0x60, 0x94, 0x0b, 0xa7, 0x03, 0x70, 0xb6, 0xad, 0x16, 0xfe, 0x78, 0xd8, 0x75,
+    0x75, 0xaf, 0x13, 0xec, 0xa5, 0xb1, 0x7c, 0xf8, 0x08, 0xb0, 0x7c, 0xde, 0x7d, 0x30, 0xc4, 0x76, 0x84, 0x28, 0xfc,
+    0x3b, 0xdb, 0x7e, 0x34, 0x04, 0x8d, 0x60, 0xe1, 0x3f, 0xf8, 0x33, 0xd9, 0xe9, 0x0e, 0xc5, 0x4b, 0x1b, 0xeb, 0x3f,
+    0x74, 0x1e, 0x16, 0xd0, 0x14, 0xff, 0xfc, 0xae, 0x4d, 0x68, 0x34, 0xe0, 0xcd, 0x71, 0xef, 0x03, 0x8d, 0x1e, 0x4d,
+    0xba, 0xfe, 0x57, 0x67, 0x0f, 0xfd, 0x47, 0x93, 0xce, 0xc3, 0x0f, 0xe2, 0x2d, 0x01, 0x0a, 0x7e, 0x85, 0xff, 0x3e,
+    0x6c, 0xb7, 0x27, 0xad, 0x8e, 0xff, 0xe8, 0x6c, 0xdb, 0xdf, 0x4e, 0x5a, 0x0f, 0xfc, 0x47, 0xf8, 0xaf, 0x1a, 0x6e,
+    0x92, 0x4d, 0x99, 0x6d, 0xe1, 0x7a, 0x37, 0xfc, 0x5e, 0x73, 0x8e, 0xee, 0x7d, 0x6b, 0xe7, 0xfe, 0xf3, 0x47, 0xb0,
+    0x46, 0x93, 0x4e, 0x17, 0xfe, 0xbf, 0xee, 0xf1, 0x03, 0x12, 0x5e, 0x0e, 0x1c, 0x31, 0x4c, 0x27, 0x55, 0x84, 0xa3,
+    0x0f, 0x78, 0xdd, 0xf3, 0x7e, 0xbc, 0x2e, 0x00, 0xf2, 0xd7, 0xdb, 0x03, 0x20, 0x3f, 0xdc, 0x31, 0xc8, 0xfd, 0xd7,
+    0x3f, 0x39, 0x02, 0xf2, 0x63, 0x33, 0xc8, 0xbd, 0xcf, 0x96, 0x02, 0x1d, 0x4d, 0x67, 0xed, 0x39, 0x73, 0x8e, 0x7e,
+    0x62, 0x03, 0x4c, 0x9d, 0x86, 0xd6, 0x3f, 0xd4, 0xe2, 0x41, 0x19, 0x6e, 0xe4, 0x7d, 0x26, 0x76, 0x32, 0xe3, 0xd7,
+    0x10, 0x84, 0xf3, 0x5b, 0x09, 0xf2, 0xe2, 0x6e, 0xf4, 0xe0, 0xfc, 0xcf, 0xa5, 0x07, 0x7d, 0xbd, 0x5f, 0xd1, 0xa3,
+    0x16, 0x71, 0xa7, 0x88, 0x01, 0x39, 0xfa, 0x07, 0xf4, 0xee, 0xd8, 0x5b, 0x0c, 0xdf, 0x0a, 0x5b, 0xe4, 0x03, 0xbe,
+    0xfb, 0x9c, 0xd3, 0x01, 0x91, 0x59, 0x1c, 0xda, 0x32, 0x00, 0x33, 0xc3, 0xef, 0xd3, 0xaa, 0x97, 0x33, 0x71, 0x7b,
+    0x25, 0xa4, 0xab, 0x67, 0x3b, 0x3a, 0x78, 0x83, 0xc9, 0xde, 0xe1, 0x22, 0xe3, 0x11, 0xfe, 0x02, 0x24, 0x1e, 0xf3,
+    0x04, 0x2f, 0xc6, 0xca, 0x4b, 0x64, 0x98, 0x9b, 0xfc, 0x1d, 0xe6, 0x55, 0xab, 0x43, 0x82, 0x29, 0x06, 0x0c, 0x5e,
+    0xb1, 0x51, 0x1c, 0x39, 0xb6, 0x33, 0x83, 0x1d, 0x0b, 0x63, 0xb6, 0x6a, 0x49, 0xcd, 0x94, 0xcf, 0xec, 0xda, 0xea,
+    0x77, 0xee, 0xe4, 0xf8, 0x0d, 0xb3, 0xf0, 0x48, 0x06, 0x18, 0x6d, 0xe9, 0x01, 0xc0, 0xf8, 0xaa, 0x24, 0x47, 0x61,
+    0x5f, 0x59, 0x0d, 0xb6, 0x30, 0x1b, 0x3a, 0x7e, 0x17, 0xdc, 0x08, 0x2a, 0xc6, 0x6f, 0x42, 0xfd, 0xe8, 0xb4, 0xb6,
+    0xc1, 0xac, 0x31, 0xba, 0xe9, 0x81, 0x06, 0x4b, 0x61, 0x24, 0x11, 0x1c, 0x68, 0x94, 0x7a, 0xfa, 0x97, 0x90, 0x55,
+    0xe1, 0xa2, 0xe2, 0xf1, 0xe5, 0xa1, 0xbc, 0xf7, 0x6d, 0x63, 0xe4, 0x96, 0x22, 0xf6, 0xd5, 0x37, 0xa7, 0x36, 0x41,
+    0x5d, 0xd0, 0x6f, 0x82, 0xa4, 0x73, 0x6f, 0xd4, 0x08, 0x98, 0x76, 0x6d, 0x49, 0xcf, 0x21, 0xb4, 0x85, 0x3e, 0x18,
+    0xb1, 0xb3, 0x78, 0x28, 0xc5, 0xba, 0x67, 0xc9, 0xeb, 0x22, 0x2d, 0xc2, 0x22, 0xec, 0x78, 0xc2, 0x77, 0x86, 0x17,
+    0xd4, 0x6a, 0x61, 0x9a, 0xd9, 0x7b, 0xf7, 0x7a, 0x1a, 0x92, 0x7a, 0xc6, 0xba, 0x8d, 0xbf, 0x96, 0xf2, 0x08, 0x7c,
+    0xb5, 0x7f, 0x0c, 0xef, 0xe1, 0x2f, 0xa6, 0xbc, 0x37, 0xb0, 0x5d, 0x9f, 0x84, 0xe2, 0xbd, 0xea, 0xb7, 0x53, 0xa2,
+    0x44, 0xd8, 0x04, 0xfd, 0xe5, 0xdd, 0x55, 0x91, 0x49, 0xa5, 0xd5, 0xdd, 0xa9, 0x94, 0x16, 0x3c, 0x1b, 0x52, 0x0a,
+    0x04, 0x68, 0xd7, 0xdf, 0x31, 0x44, 0xe1, 0x59, 0x0b, 0x7f, 0xd6, 0x84, 0xe1, 0x7d, 0x68, 0xa0, 0xa4, 0xe1, 0x4b,
+    0x68, 0xbe, 0x2d, 0x04, 0x2f, 0xf4, 0xfb, 0x89, 0x44, 0x95, 0x10, 0x53, 0x75, 0x8e, 0x59, 0x71, 0x88, 0x24, 0x72,
+    0x04, 0x6c, 0xcf, 0x88, 0x37, 0x09, 0x76, 0x95, 0xd1, 0x94, 0xa7, 0xd0, 0xd7, 0xd1, 0x9f, 0x72, 0x5e, 0x55, 0xe7,
+    0xd5, 0x76, 0xce, 0x8a, 0x29, 0x90, 0xe1, 0x1b, 0x07, 0x55, 0x74, 0x7d, 0x41, 0x7c, 0xd2, 0x4c, 0x6c, 0xe3, 0xea,
+    0xa3, 0x6f, 0x2b, 0x32, 0x70, 0xcd, 0x4d, 0xc1, 0x2a, 0xa6, 0xa1, 0x7d, 0x81, 0x69, 0x33, 0xf8, 0xb3, 0x2a, 0x56,
+    0x0f, 0x92, 0xa1, 0xfc, 0x24, 0xc2, 0xdf, 0xc8, 0x42, 0x3f, 0xca, 0x6a, 0x03, 0x72, 0xfa, 0x66, 0x25, 0x41, 0xfa,
+    0x62, 0x54, 0x36, 0x91, 0x00, 0x7b, 0x01, 0x7f, 0xc1, 0x5f, 0x75, 0x5d, 0x42, 0xde, 0x83, 0xc4, 0x9c, 0x82, 0x51,
+    0x9c, 0xd3, 0xf5, 0x5a, 0x85, 0x7f, 0x2d, 0xa2, 0x59, 0x91, 0x9a, 0x76, 0x25, 0x2b, 0xfa, 0x36, 0x16, 0xd9, 0x81,
+    0x4c, 0x48, 0x33, 0x3f, 0xda, 0x6c, 0xde, 0x7f, 0x1c, 0x89, 0x5c, 0x34, 0xfc, 0xa8, 0xbd, 0x2d, 0x88, 0x6c, 0x83,
+    0x18, 0xbb, 0x16, 0x27, 0x32, 0x6e, 0xf0, 0xda, 0x60, 0xf5, 0x5b, 0x8a, 0xcc, 0x0d, 0x6f, 0x9b, 0xab, 0xa5, 0xc7,
+    0xa5, 0x75, 0x70, 0x65, 0xfc, 0xee, 0x84, 0x45, 0xdc, 0x8f, 0x52, 0xca, 0x4f, 0x72, 0x0c, 0xb1, 0xe0, 0x75, 0xd8,
+    0xb6, 0x5b, 0x82, 0xe4, 0x31, 0x7e, 0x8d, 0x93, 0x20, 0xbd, 0x0f, 0x85, 0x55, 0xd2, 0xd6, 0xee, 0xa4, 0xbb, 0xf7,
+    0xe6, 0x70, 0xdf, 0x12, 0xbb, 0x79, 0x77, 0x0b, 0x5e, 0x77, 0xc9, 0x1d, 0x16, 0xf9, 0x19, 0xa1, 0xc8, 0xcf, 0xb0,
+    0x44, 0x52, 0x57, 0x68, 0x6f, 0x09, 0x34, 0x6d, 0x8b, 0xa5, 0x43, 0x11, 0xc3, 0x9b, 0x82, 0xbb, 0x10, 0xe3, 0x87,
+    0xbd, 0xb6, 0xb0, 0x5b, 0x0b, 0x57, 0x1a, 0xb6, 0x80, 0x08, 0xf8, 0x29, 0x03, 0x81, 0xa7, 0x2a, 0xe2, 0x07, 0x6a,
+    0x9d, 0xa9, 0x64, 0x17, 0x39, 0x94, 0xce, 0x4b, 0x5d, 0x6e, 0x5d, 0xcc, 0x4f, 0xa6, 0x20, 0x87, 0x54, 0x82, 0xca,
+    0x7b, 0xd9, 0x61, 0x97, 0xa6, 0xa2, 0x0c, 0x94, 0xa5, 0x88, 0xe4, 0xa4, 0xb3, 0xb7, 0x1b, 0x49, 0x7b, 0x07, 0xf7,
+    0x6e, 0x01, 0x9b, 0x17, 0xd4, 0x1c, 0x1a, 0x15, 0x7e, 0x9c, 0x6d, 0x9d, 0xb3, 0x93, 0x56, 0x34, 0x8b, 0xab, 0xf0,
+    0x1f, 0x6a, 0xbf, 0xbd, 0x5d, 0xa5, 0x08, 0x65, 0xaa, 0xa5, 0x7c, 0x8c, 0x8c, 0x2c, 0x0e, 0x24, 0x1c, 0x31, 0x68,
+    0x29, 0x63, 0x8b, 0x64, 0x34, 0x02, 0xf1, 0x01, 0x56, 0xe2, 0x5f, 0x15, 0x83, 0x94, 0x9a, 0xa0, 0xb4, 0xf7, 0xfe,
+    0xf6, 0x3f, 0xfe, 0x97, 0x0c, 0x2b, 0x02, 0x59, 0x01, 0x2c, 0x4c, 0x83, 0xa9, 0x4e, 0x18, 0xd9, 0x05, 0x38, 0xa2,
+    0xf1, 0xa8, 0x35, 0x89, 0x92, 0x31, 0x40, 0x50, 0x30, 0x71, 0x9d, 0x49, 0xd6, 0x03, 0x17, 0x48, 0xb0, 0xcc, 0xc3,
+    0x79, 0x09, 0x5e, 0xbd, 0x08, 0x57, 0xec, 0x0f, 0xe5, 0xae, 0xaa, 0x9c, 0x61, 0x62, 0x68, 0x23, 0x93, 0xd5, 0xe0,
+    0xb9, 0x5a, 0x36, 0xab, 0xfa, 0x25, 0x49, 0x52, 0x78, 0xb0, 0x5a, 0x2a, 0x2b, 0xb4, 0xd4, 0x07, 0x21, 0xff, 0xf2,
+    0xcf, 0xff, 0xf1, 0xbf, 0xaa, 0x57, 0x3c, 0xdf, 0xf8, 0xdb, 0x3f, 0xfd, 0xfb, 0xff, 0xfb, 0xbf, 0xff, 0x13, 0x26,
+    0x07, 0xcb, 0x33, 0x10, 0xda, 0x4a, 0x56, 0x75, 0x00, 0x22, 0xf6, 0x94, 0x55, 0x39, 0x1c, 0xf5, 0x94, 0xd7, 0x03,
+    0x9a, 0x90, 0x78, 0x53, 0x42, 0x47, 0x7c, 0x4d, 0x29, 0xd2, 0x44, 0xb5, 0x1b, 0xc8, 0x07, 0x4b, 0x69, 0xd1, 0xb1,
+    0xbe, 0xbd, 0xd3, 0xb6, 0xab, 0xe5, 0xdd, 0x33, 0xfa, 0x6e, 0xe1, 0xc2, 0xdc, 0x29, 0x03, 0xc7, 0xd7, 0xcb, 0xb6,
+    0x50, 0x61, 0x2c, 0x2c, 0x29, 0xab, 0x72, 0x0b, 0xe3, 0xcb, 0x0b, 0x7c, 0x0d, 0xba, 0x46, 0x31, 0xad, 0x72, 0xad,
+    0x4f, 0xef, 0xd7, 0x39, 0x20, 0x3a, 0xc6, 0xa5, 0x11, 0xc1, 0x32, 0x3a, 0x3b, 0x6d, 0xa1, 0x75, 0x92, 0x5c, 0x96,
+    0x34, 0x8a, 0xf0, 0x66, 0xee, 0x3f, 0xfa, 0x87, 0xf2, 0x2f, 0x53, 0xb4, 0x0a, 0x2c, 0x67, 0x1a, 0x5d, 0x48, 0x1f,
+    0xe7, 0x41, 0xbb, 0x3d, 0xbb, 0x70, 0x17, 0xd5, 0x0c, 0xde, 0x75, 0x93, 0x51, 0x80, 0xcd, 0x1c, 0x90, 0x0e, 0x5d,
+    0x75, 0x2c, 0x0f, 0xcc, 0xfa, 0x36, 0x86, 0x7e, 0xca, 0xf2, 0xcb, 0x05, 0x85, 0x93, 0xe2, 0xdf, 0xf1, 0x70, 0x54,
+    0x46, 0xde, 0xa0, 0xc4, 0xc0, 0x62, 0x61, 0xf4, 0xea, 0x8a, 0x5e, 0x93, 0xce, 0x72, 0x6e, 0x8a, 0x79, 0xb8, 0x6b,
+    0x1e, 0xcb, 0xde, 0xc7, 0x83, 0xd6, 0x49, 0xc7, 0x9b, 0x74, 0x17, 0x7a, 0x78, 0xce, 0xb3, 0xa9, 0x79, 0x9a, 0xcb,
+    0x22, 0x36, 0x64, 0x63, 0x15, 0xb1, 0x94, 0xf5, 0xe2, 0xa4, 0xb6, 0xfc, 0x02, 0xb7, 0x1b, 0xd0, 0x36, 0x8b, 0x78,
+    0x40, 0x4c, 0xdb, 0x33, 0xcf, 0x7b, 0x23, 0x3c, 0x49, 0xcf, 0x16, 0xc6, 0x5c, 0x3d, 0xd1, 0x14, 0xe3, 0x82, 0xf5,
+    0xbc, 0x9f, 0xd2, 0xa7, 0xee, 0xe6, 0x50, 0x22, 0xac, 0xf0, 0x42, 0x1e, 0xa3, 0xbe, 0xab, 0xf9, 0xe3, 0x52, 0x14,
+    0x83, 0x0b, 0xbc, 0xb2, 0x5e, 0xa8, 0x45, 0x51, 0xfb, 0x02, 0xac, 0x1d, 0x02, 0xd3, 0x6e, 0xb6, 0xa2, 0x42, 0x6c,
+    0xf5, 0x2e, 0x7c, 0xa1, 0x6d, 0xef, 0x68, 0x36, 0xa3, 0x86, 0x2e, 0x70, 0x23, 0xd9, 0xd0, 0x28, 0x29, 0x28, 0x45,
+    0x40, 0x9c, 0xc8, 0xcb, 0x36, 0x92, 0x6d, 0xc5, 0x93, 0x3c, 0xab, 0xa7, 0xdf, 0xb9, 0xfd, 0xff, 0x00, 0x52, 0x99,
+    0xa6, 0xd8, 0x89, 0x7b, 0x00, 0x00};
 
 }  // namespace web_server
 }  // namespace esphome
diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index f0a7efd12f..5c06a97d47 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -839,6 +839,7 @@ std::string WebServer::climate_json(climate::Climate *obj, JsonDetail start_conf
   return json::build_json([obj, start_config](JsonObject root) {
     set_json_id(root, obj, "climate-" + obj->get_object_id(), start_config);
     const auto traits = obj->get_traits();
+    int8_t accuracy = traits.get_temperature_accuracy_decimals();
     char __buf[16];
 
     if (start_config == DETAIL_ALL) {
@@ -873,12 +874,15 @@ std::string WebServer::climate_json(climate::Climate *obj, JsonDetail start_conf
       }
     }
 
+    bool has_state = false;
     root["mode"] = PSTR_LOCAL(climate_mode_to_string(obj->mode));
-    root["max_temp"] = traits.get_visual_max_temperature();
-    root["min_temp"] = traits.get_visual_min_temperature();
+    root["max_temp"] = value_accuracy_to_string(traits.get_visual_max_temperature(), accuracy);
+    root["min_temp"] = value_accuracy_to_string(traits.get_visual_min_temperature(), accuracy);
     root["step"] = traits.get_visual_temperature_step();
     if (traits.get_supports_action()) {
       root["action"] = PSTR_LOCAL(climate_action_to_string(obj->action));
+      root["state"] = root["action"];
+      has_state = true;
     }
     if (traits.get_supports_fan_modes() && obj->fan_mode.has_value()) {
       root["fan_mode"] = PSTR_LOCAL(climate_fan_mode_to_string(obj->fan_mode.value()));
@@ -896,14 +900,23 @@ std::string WebServer::climate_json(climate::Climate *obj, JsonDetail start_conf
       root["swing_mode"] = PSTR_LOCAL(climate_swing_mode_to_string(obj->swing_mode));
     }
     if (traits.get_supports_current_temperature()) {
-      root["current_temperature"] = obj->current_temperature;
+      if (!std::isnan(obj->current_temperature)) {
+        root["current_temperature"] = value_accuracy_to_string(obj->current_temperature, accuracy);
+      } else {
+        root["current_temperature"] = "NA";
+      }
     }
     if (traits.get_supports_two_point_target_temperature()) {
-      root["current_temperature_low"] = obj->target_temperature_low;
-      root["current_temperature_high"] = obj->target_temperature_low;
+      root["target_temperature_low"] = value_accuracy_to_string(obj->target_temperature_low, accuracy);
+      root["target_temperature_high"] = value_accuracy_to_string(obj->target_temperature_high, accuracy);
+      if (!has_state) {
+        root["state"] =
+            value_accuracy_to_string((obj->target_temperature_high + obj->target_temperature_low) / 2.0f, accuracy);
+      }
     } else {
-      root["target_temperature"] = obj->target_temperature;
-      root["state"] = obj->target_temperature;
+      root["target_temperature"] = value_accuracy_to_string(obj->target_temperature, accuracy);
+      if (!has_state)
+        root["state"] = root["target_temperature"];
     }
   });
 }

From 4759b4fe2e00f704e64d5b102bd907e1c095316b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 11 Aug 2022 13:57:42 +1200
Subject: [PATCH 015/838] Add vector include (#3707)

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

diff --git a/esphome/components/e131/e131.h b/esphome/components/e131/e131.h
index 648cfb4585..8bf8999c21 100644
--- a/esphome/components/e131/e131.h
+++ b/esphome/components/e131/e131.h
@@ -4,9 +4,10 @@
 
 #include "esphome/core/component.h"
 
+#include <map>
 #include <memory>
 #include <set>
-#include <map>
+#include <vector>
 
 class UDP;
 

From 7f41b7cd939c1e488fcc2fb66490ab007be6c54a Mon Sep 17 00:00:00 2001
From: Peter Galantha <peter.galantha@gmail.com>
Date: Wed, 10 Aug 2022 19:00:09 -0700
Subject: [PATCH 016/838] Add state_class total (#3608)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/api/api.proto      | 1 +
 esphome/components/api/api_pb2.cpp    | 2 ++
 esphome/components/api/api_pb2.h      | 1 +
 esphome/components/sensor/__init__.py | 1 +
 esphome/components/sensor/sensor.cpp  | 2 ++
 esphome/components/sensor/sensor.h    | 1 +
 esphome/const.py                      | 3 +++
 7 files changed, 11 insertions(+)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 3e9a62f3d8..88a74540d0 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -473,6 +473,7 @@ enum SensorStateClass {
   STATE_CLASS_NONE = 0;
   STATE_CLASS_MEASUREMENT = 1;
   STATE_CLASS_TOTAL_INCREASING = 2;
+  STATE_CLASS_TOTAL = 3;
 }
 
 enum SensorLastResetType {
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 70f909c07a..b91c9bd600 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -108,6 +108,8 @@ template<> const char *proto_enum_to_string<enums::SensorStateClass>(enums::Sens
       return "STATE_CLASS_MEASUREMENT";
     case enums::STATE_CLASS_TOTAL_INCREASING:
       return "STATE_CLASS_TOTAL_INCREASING";
+    case enums::STATE_CLASS_TOTAL:
+      return "STATE_CLASS_TOTAL";
     default:
       return "UNKNOWN";
   }
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index ec1cdc35ac..f9981fdbb7 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -53,6 +53,7 @@ enum SensorStateClass : uint32_t {
   STATE_CLASS_NONE = 0,
   STATE_CLASS_MEASUREMENT = 1,
   STATE_CLASS_TOTAL_INCREASING = 2,
+  STATE_CLASS_TOTAL = 3,
 };
 enum SensorLastResetType : uint32_t {
   LAST_RESET_NONE = 0,
diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index e88cd05c31..d6ba038057 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -109,6 +109,7 @@ STATE_CLASSES = {
     "": StateClasses.STATE_CLASS_NONE,
     "measurement": StateClasses.STATE_CLASS_MEASUREMENT,
     "total_increasing": StateClasses.STATE_CLASS_TOTAL_INCREASING,
+    "total": StateClasses.STATE_CLASS_TOTAL,
 }
 validate_state_class = cv.enum(STATE_CLASSES, lower=True, space="_")
 
diff --git a/esphome/components/sensor/sensor.cpp b/esphome/components/sensor/sensor.cpp
index c0869631aa..a729791e7e 100644
--- a/esphome/components/sensor/sensor.cpp
+++ b/esphome/components/sensor/sensor.cpp
@@ -12,6 +12,8 @@ std::string state_class_to_string(StateClass state_class) {
       return "measurement";
     case STATE_CLASS_TOTAL_INCREASING:
       return "total_increasing";
+    case STATE_CLASS_TOTAL:
+      return "total";
     case STATE_CLASS_NONE:
     default:
       return "";
diff --git a/esphome/components/sensor/sensor.h b/esphome/components/sensor/sensor.h
index f29125ee42..ba9edd68d0 100644
--- a/esphome/components/sensor/sensor.h
+++ b/esphome/components/sensor/sensor.h
@@ -36,6 +36,7 @@ enum StateClass : uint8_t {
   STATE_CLASS_NONE = 0,
   STATE_CLASS_MEASUREMENT = 1,
   STATE_CLASS_TOTAL_INCREASING = 2,
+  STATE_CLASS_TOTAL = 3,
 };
 
 std::string state_class_to_string(StateClass state_class);
diff --git a/esphome/const.py b/esphome/const.py
index 0593c19672..4e1e293e94 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -956,6 +956,9 @@ STATE_CLASS_MEASUREMENT = "measurement"
 # The state represents a total that only increases, a decrease is considered a reset.
 STATE_CLASS_TOTAL_INCREASING = "total_increasing"
 
+# The state represents a total amount that can both increase and decrease, e.g. a net energy meter.
+STATE_CLASS_TOTAL = "total"
+
 KEY_CORE = "core"
 KEY_TARGET_PLATFORM = "target_platform"
 KEY_TARGET_FRAMEWORK = "target_framework"

From b918abfd54230cac83f0797ed077f15281bc924c Mon Sep 17 00:00:00 2001
From: NP v/d Spek <nielsnl68@gmail.com>
Date: Sun, 14 Aug 2022 22:21:08 +0200
Subject: [PATCH 017/838] add gradient color V2.0 (#3709)

---
 esphome/core/color.h | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/esphome/core/color.h b/esphome/core/color.h
index 4e7733ca85..7596eeb0cf 100644
--- a/esphome/core/color.h
+++ b/esphome/core/color.h
@@ -139,9 +139,19 @@ struct Color {
     return Color(uint8_t((uint16_t(r) * 255U / max_rgb)), uint8_t((uint16_t(g) * 255U / max_rgb)),
                  uint8_t((uint16_t(b) * 255U / max_rgb)), w);
   }
-  Color fade_to_white(uint8_t amnt) { return Color(255, 255, 255, 255) - (*this * amnt); }
-  Color fade_to_black(uint8_t amnt) { return *this * amnt; }
-  Color gradient(const Color &to_color, uint8_t amnt) { return (*this * amnt) + (to_color * (255 - amnt)); }
+
+  Color gradient(const Color &to_color, uint8_t amnt) {
+    Color new_color;
+    float amnt_f = float(amnt) / 255.0f;
+    new_color.r = amnt_f * (to_color.r - (*this).r) + (*this).r;
+    new_color.g = amnt_f * (to_color.g - (*this).g) + (*this).g;
+    new_color.b = amnt_f * (to_color.b - (*this).b) + (*this).b;
+    new_color.w = amnt_f * (to_color.w - (*this).w) + (*this).w;
+    return new_color;
+  }
+  Color fade_to_white(uint8_t amnt) { return (*this).gradient(Color::WHITE, amnt); }
+  Color fade_to_black(uint8_t amnt) { return (*this).gradient(Color::BLACK, amnt); }
+
   Color lighten(uint8_t delta) { return *this + delta; }
   Color darken(uint8_t delta) { return *this - delta; }
 

From 84c051d097b010b4175a6244fc61f8862bcdada1 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 15 Aug 2022 08:23:35 +1200
Subject: [PATCH 018/838] Bump version to 2022.8.0b2

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

diff --git a/esphome/const.py b/esphome/const.py
index 4e1e293e94..59fa466d11 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.8.0b1"
+__version__ = "2022.8.0b2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 0d0733dd940f65e829734c92b534772e6d06c5d0 Mon Sep 17 00:00:00 2001
From: anatoly-savchenkov
 <48646998+anatoly-savchenkov@users.noreply.github.com>
Date: Mon, 15 Aug 2022 01:28:29 +0300
Subject: [PATCH 019/838] Webui small fixes (#3713)

---
 esphome/components/climate/climate_traits.cpp |   11 +-
 esphome/components/web_server/server_index.h  | 1148 ++++++++---------
 esphome/components/web_server/web_server.cpp  |   18 +-
 esphome/core/helpers.cpp                      |   13 +
 esphome/core/helpers.h                        |    3 +
 5 files changed, 604 insertions(+), 589 deletions(-)

diff --git a/esphome/components/climate/climate_traits.cpp b/esphome/components/climate/climate_traits.cpp
index 16c9cd05be..38ded6cdf7 100644
--- a/esphome/components/climate/climate_traits.cpp
+++ b/esphome/components/climate/climate_traits.cpp
@@ -1,19 +1,10 @@
 #include "climate_traits.h"
-#include <cstdio>
 
 namespace esphome {
 namespace climate {
 
 int8_t ClimateTraits::get_temperature_accuracy_decimals() const {
-  // use printf %g to find number of digits based on temperature step
-  char buf[32];
-  sprintf(buf, "%.5g", this->visual_temperature_step_);
-  std::string str{buf};
-  size_t dot_pos = str.find('.');
-  if (dot_pos == std::string::npos)
-    return 0;
-
-  return str.length() - dot_pos - 1;
+  return step_to_accuracy_decimals(this->visual_temperature_step_);
 }
 
 }  // namespace climate
diff --git a/esphome/components/web_server/server_index.h b/esphome/components/web_server/server_index.h
index 39c170f15b..75c7130151 100644
--- a/esphome/components/web_server/server_index.h
+++ b/esphome/components/web_server/server_index.h
@@ -6,580 +6,580 @@ namespace esphome {
 namespace web_server {
 
 const uint8_t INDEX_GZ[] PROGMEM = {
-    0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0xbd, 0x7d, 0xc9, 0x76, 0xdb, 0xc8, 0xb2, 0xe0, 0xba,
-    0xcf, 0xe9, 0x3f, 0xe8, 0x0d, 0x84, 0xd2, 0x93, 0x81, 0x12, 0x08, 0x91, 0x94, 0x65, 0xbb, 0x40, 0x41, 0xbc, 0xf2,
-    0x50, 0xd7, 0xae, 0xf2, 0x54, 0x96, 0xec, 0x1a, 0x54, 0x2c, 0x0b, 0x22, 0x93, 0x22, 0xca, 0x20, 0xc0, 0x02, 0x92,
-    0x1a, 0x8a, 0xc2, 0x3b, 0xbd, 0xea, 0x55, 0x9f, 0xd3, 0xe3, 0xe2, 0x6d, 0xfa, 0xbc, 0x5e, 0xf4, 0x47, 0xf4, 0xba,
-    0x3f, 0xe5, 0xfe, 0x40, 0xbf, 0x4f, 0xe8, 0x88, 0xc8, 0x01, 0x09, 0x90, 0x1a, 0x5c, 0xaf, 0xfa, 0x1e, 0x0f, 0x02,
-    0x72, 0x8c, 0x88, 0x8c, 0x8c, 0x29, 0x23, 0xa1, 0xdd, 0xb5, 0x51, 0x36, 0xe4, 0x97, 0x33, 0x66, 0x4d, 0xf8, 0x34,
-    0xd9, 0xdb, 0x95, 0xff, 0xb3, 0x68, 0xb4, 0xb7, 0x9b, 0xc4, 0xe9, 0x27, 0x2b, 0x67, 0x49, 0x18, 0x0f, 0xb3, 0xd4,
-    0x9a, 0xe4, 0x6c, 0x1c, 0x8e, 0x22, 0x1e, 0x05, 0xf1, 0x34, 0x3a, 0x65, 0xd6, 0xd6, 0xde, 0xee, 0x94, 0xf1, 0xc8,
-    0x1a, 0x4e, 0xa2, 0xbc, 0x60, 0x3c, 0x7c, 0x7f, 0xf8, 0x75, 0xeb, 0xd1, 0xde, 0x6e, 0x31, 0xcc, 0xe3, 0x19, 0xb7,
-    0x70, 0xc8, 0x70, 0x9a, 0x8d, 0xe6, 0x09, 0xdb, 0x3b, 0x8b, 0x72, 0xeb, 0x82, 0x85, 0x6f, 0x4e, 0x7e, 0x65, 0x43,
-    0xee, 0x8f, 0xd8, 0x38, 0x4e, 0xd9, 0xdb, 0x3c, 0x9b, 0xb1, 0x9c, 0x5f, 0x7a, 0xcf, 0x56, 0x57, 0xc4, 0xac, 0xf0,
-    0x0e, 0x74, 0xd5, 0x29, 0xe3, 0x6f, 0xce, 0x53, 0xd5, 0xe7, 0x29, 0x13, 0x93, 0x64, 0x79, 0xe1, 0xf1, 0x6b, 0xda,
-    0x1c, 0x5c, 0x4e, 0x4f, 0xb2, 0xa4, 0xf0, 0x3e, 0xe9, 0xfa, 0x59, 0x9e, 0xf1, 0x0c, 0xc1, 0xf2, 0x27, 0x51, 0x61,
-    0xb4, 0xf4, 0x9e, 0xac, 0x68, 0x32, 0x93, 0x95, 0x2f, 0x8a, 0x67, 0xe9, 0x7c, 0xca, 0xf2, 0xe8, 0x24, 0x61, 0x5e,
-    0xc1, 0x42, 0x87, 0x79, 0xdc, 0x8b, 0xdd, 0x70, 0x8f, 0x5b, 0x71, 0x6a, 0xb1, 0xfe, 0x05, 0xa3, 0x92, 0x05, 0xd3,
-    0xad, 0x82, 0xb5, 0xb6, 0x07, 0xe4, 0x1a, 0xc7, 0xa7, 0x73, 0xfd, 0x7e, 0x9e, 0xc7, 0x5c, 0x3d, 0x9f, 0x45, 0xc9,
-    0x9c, 0x05, 0x71, 0xe9, 0x06, 0xec, 0x88, 0x0f, 0xc2, 0xd8, 0x7b, 0x42, 0x83, 0xc2, 0x90, 0x8b, 0x71, 0x96, 0x3b,
-    0x48, 0xab, 0x18, 0xc7, 0xe6, 0x57, 0x57, 0x0e, 0x0f, 0x17, 0xa5, 0xeb, 0x7e, 0x62, 0xfe, 0x30, 0x4a, 0x12, 0x07,
-    0x27, 0xde, 0xd8, 0x28, 0x70, 0xc6, 0xd8, 0xe3, 0x47, 0xf1, 0xc0, 0xed, 0xc5, 0x63, 0x87, 0x33, 0xb7, 0xea, 0x97,
-    0x8d, 0x2d, 0xce, 0x1c, 0xee, 0xba, 0x4f, 0xae, 0xef, 0x93, 0x33, 0x3e, 0xcf, 0x01, 0xf6, 0xd2, 0x7b, 0xa3, 0x66,
-    0x7e, 0x86, 0xf5, 0x07, 0xd4, 0xb1, 0x07, 0xb0, 0x17, 0xdc, 0xfa, 0x10, 0x9e, 0xc7, 0xe9, 0x28, 0x3b, 0xf7, 0x0f,
-    0x26, 0x11, 0xfc, 0x78, 0x97, 0x65, 0x7c, 0x63, 0xc3, 0x39, 0xcb, 0xe2, 0x91, 0xd5, 0x0e, 0x43, 0xb3, 0xf2, 0xf2,
-    0xc9, 0xc1, 0xc1, 0xd5, 0x55, 0xa3, 0xc0, 0x4f, 0x23, 0x1e, 0x9f, 0x31, 0xd1, 0x19, 0x00, 0xb0, 0xe1, 0xe7, 0x8c,
-    0xb3, 0xd1, 0x01, 0xbf, 0x4c, 0xa0, 0x94, 0x31, 0x5e, 0xd8, 0x80, 0xe3, 0xd3, 0x6c, 0x08, 0x64, 0x4b, 0x0d, 0xc2,
-    0x43, 0xd3, 0x9c, 0xcd, 0x92, 0x68, 0xc8, 0xb0, 0x1e, 0x46, 0xaa, 0x7a, 0x54, 0x8d, 0xbc, 0xaf, 0x43, 0xb1, 0xbc,
-    0x8e, 0xeb, 0xc5, 0x2c, 0x4c, 0xd9, 0xb9, 0xf5, 0x2a, 0x9a, 0xf5, 0x86, 0x49, 0x54, 0x14, 0xc0, 0xaf, 0x0b, 0x42,
-    0x21, 0x9f, 0x0f, 0x81, 0x41, 0x08, 0xc1, 0x05, 0x92, 0x69, 0x12, 0x17, 0xfe, 0xc7, 0xf5, 0x61, 0x51, 0xbc, 0x63,
-    0xc5, 0x3c, 0xe1, 0xeb, 0x21, 0xac, 0x05, 0x5f, 0x0b, 0xc3, 0xaf, 0x5d, 0x3e, 0xc9, 0xb3, 0x73, 0xeb, 0x59, 0x9e,
-    0x43, 0x73, 0x1b, 0xa6, 0x14, 0x0d, 0xac, 0xb8, 0xb0, 0xd2, 0x8c, 0x5b, 0x7a, 0x30, 0x5c, 0x40, 0xdf, 0x7a, 0x5f,
-    0x30, 0xeb, 0x78, 0x9e, 0x16, 0xd1, 0x98, 0x41, 0xd3, 0x63, 0x2b, 0xcb, 0xad, 0x63, 0x18, 0xf4, 0x18, 0x96, 0xac,
-    0xe0, 0xb0, 0x6b, 0x7c, 0xdb, 0xed, 0xd1, 0x5c, 0x50, 0x78, 0xc8, 0x2e, 0x78, 0xc8, 0x4a, 0x60, 0x4c, 0xab, 0xd0,
-    0x68, 0x38, 0xee, 0x22, 0x81, 0x02, 0x16, 0xc6, 0x0c, 0x59, 0xd6, 0x31, 0x1b, 0xeb, 0xc5, 0xf9, 0xb0, 0xb1, 0xa1,
-    0x69, 0x0d, 0x34, 0x71, 0xa0, 0x6d, 0xd1, 0x68, 0xeb, 0x09, 0xc4, 0x6b, 0x24, 0x72, 0x3d, 0xe6, 0x4b, 0xf2, 0x1d,
-    0x5c, 0xa6, 0xc3, 0xfa, 0xd8, 0x50, 0x59, 0xf2, 0xec, 0x80, 0xe7, 0x71, 0x7a, 0x0a, 0x40, 0xc8, 0x99, 0xcc, 0x26,
-    0x65, 0x29, 0x16, 0xff, 0x0d, 0x0b, 0x59, 0xb8, 0x87, 0xa3, 0xe7, 0xcc, 0xb1, 0x0b, 0xea, 0x61, 0x87, 0x21, 0x92,
-    0x1e, 0x18, 0x8c, 0xf5, 0x59, 0xc0, 0x36, 0x6d, 0xdb, 0xfb, 0xda, 0xf5, 0x2e, 0x91, 0x83, 0x7c, 0xdf, 0x27, 0xf6,
-    0x15, 0x9d, 0xe3, 0xb0, 0x83, 0x40, 0xfb, 0x09, 0x4b, 0x4f, 0xf9, 0xa4, 0xcf, 0x8e, 0xda, 0x83, 0x80, 0x03, 0x54,
-    0xa3, 0xf9, 0x90, 0x39, 0xc8, 0x8f, 0x5e, 0x8e, 0xdb, 0x67, 0xd3, 0x81, 0x29, 0x70, 0x61, 0xd6, 0x08, 0xc7, 0xda,
-    0xd2, 0xb8, 0x8a, 0x45, 0x15, 0x60, 0xc8, 0xe7, 0x36, 0xec, 0xb0, 0x13, 0x96, 0x1b, 0x70, 0xe8, 0x66, 0xbd, 0xda,
-    0x0a, 0xce, 0x61, 0x85, 0xa0, 0x9f, 0x35, 0x9e, 0xa7, 0x43, 0x1e, 0x83, 0xe0, 0xb2, 0x37, 0x01, 0x5c, 0xb1, 0x72,
-    0x7a, 0xe1, 0x6c, 0xb7, 0x74, 0x9d, 0xd8, 0xdd, 0x64, 0x47, 0xf9, 0x66, 0x67, 0xe0, 0x21, 0x94, 0x9a, 0xf8, 0x12,
-    0xf1, 0x18, 0x10, 0x2c, 0xbd, 0xb7, 0x4c, 0x6f, 0xcf, 0x0f, 0x7d, 0xe6, 0x2f, 0xf3, 0x71, 0xc8, 0xfd, 0x69, 0x34,
-    0x43, 0x6c, 0x18, 0xf1, 0x40, 0x94, 0x0e, 0x11, 0xba, 0xda, 0xba, 0x20, 0xc5, 0xfc, 0x8a, 0x05, 0x5c, 0x20, 0x08,
-    0xec, 0xd9, 0x67, 0xd1, 0x70, 0x02, 0x5b, 0xbc, 0x22, 0xdc, 0x48, 0x6d, 0x87, 0x61, 0xce, 0x22, 0xce, 0x9e, 0x25,
-    0x0c, 0xdf, 0x70, 0x05, 0xa0, 0xa7, 0xed, 0x7a, 0xb9, 0xda, 0x77, 0x49, 0xcc, 0x5f, 0x67, 0x30, 0x4f, 0x4f, 0x30,
-    0x09, 0x70, 0x71, 0xbe, 0xb1, 0x11, 0x23, 0x8b, 0xec, 0x73, 0x58, 0xad, 0x93, 0x39, 0x08, 0x01, 0x3b, 0xc5, 0x16,
-    0x36, 0x50, 0xdb, 0x8b, 0x7d, 0x0e, 0x44, 0x7c, 0x92, 0xa5, 0x1c, 0x86, 0x03, 0x78, 0x35, 0x07, 0xf9, 0xd1, 0x6c,
-    0xc6, 0xd2, 0xd1, 0x93, 0x49, 0x9c, 0x8c, 0x80, 0x1a, 0x25, 0xe0, 0x9b, 0xb1, 0x10, 0xf0, 0x04, 0x64, 0x82, 0x9b,
-    0x31, 0xa2, 0xe5, 0x43, 0x46, 0xe6, 0xa1, 0x6d, 0xf7, 0x50, 0x02, 0x49, 0x2c, 0x50, 0x06, 0xd1, 0xc2, 0xbd, 0x03,
-    0xd1, 0x5f, 0xb8, 0x7c, 0x33, 0x8c, 0xf5, 0x32, 0x4a, 0x02, 0xbf, 0x41, 0x49, 0x03, 0xf4, 0x67, 0x20, 0x03, 0x7b,
-    0x28, 0xb8, 0xbe, 0x97, 0x52, 0x27, 0x65, 0x0a, 0x43, 0x20, 0xc0, 0x10, 0x25, 0x88, 0xa4, 0xc1, 0xdb, 0x2c, 0xb9,
-    0x1c, 0xc7, 0x49, 0x72, 0x30, 0x9f, 0xcd, 0xb2, 0x9c, 0x7b, 0xdf, 0x84, 0x0b, 0x9e, 0x55, 0xb8, 0xd2, 0x26, 0x2f,
-    0xce, 0x63, 0x8e, 0x04, 0x75, 0x17, 0xc3, 0x08, 0x96, 0xfa, 0x71, 0x96, 0x25, 0x2c, 0x4a, 0x01, 0x0d, 0xd6, 0xb7,
-    0xed, 0x20, 0x9d, 0x27, 0x49, 0xef, 0x04, 0x86, 0xfd, 0xd4, 0xa3, 0x6a, 0x21, 0xf1, 0x03, 0x7a, 0xde, 0xcf, 0xf3,
-    0xe8, 0x12, 0x1a, 0x62, 0x1b, 0xe0, 0x45, 0x58, 0xad, 0x6f, 0x0e, 0xde, 0xbc, 0xf6, 0x05, 0xe3, 0xc7, 0xe3, 0x4b,
-    0x00, 0xb4, 0xac, 0xa4, 0xe6, 0x38, 0xcf, 0xa6, 0x8d, 0xa9, 0x91, 0x0e, 0x71, 0xc8, 0x7a, 0xd7, 0x80, 0x10, 0xd3,
-    0xc8, 0xb0, 0x4a, 0xcc, 0x84, 0xe0, 0x35, 0xf1, 0xb3, 0xac, 0xc4, 0x3d, 0xd0, 0xc7, 0x87, 0x40, 0x14, 0xc3, 0x94,
-    0x37, 0x43, 0xcb, 0xf3, 0xcb, 0x45, 0x1c, 0x12, 0x9c, 0x33, 0xd4, 0xbf, 0x08, 0xe3, 0x30, 0x82, 0xd9, 0x17, 0x62,
-    0xc0, 0x52, 0x41, 0x1c, 0x97, 0xa5, 0x97, 0x68, 0x26, 0x46, 0x89, 0x87, 0x02, 0x85, 0xc3, 0x36, 0xba, 0xba, 0x62,
-    0xf0, 0xe2, 0x7a, 0xdf, 0x86, 0x8b, 0x48, 0xe1, 0x83, 0x1a, 0x0a, 0xf7, 0x57, 0x20, 0xe4, 0x04, 0x6a, 0xb2, 0x33,
-    0xd0, 0x83, 0x00, 0xe7, 0x37, 0x1e, 0xe8, 0xff, 0x04, 0xa1, 0x58, 0xeb, 0x78, 0xa0, 0x41, 0x9f, 0x4c, 0xa2, 0xf4,
-    0x94, 0x8d, 0x82, 0x84, 0x95, 0x52, 0xf2, 0xee, 0x5b, 0xb0, 0xc6, 0xc0, 0x4e, 0x85, 0xf5, 0xfc, 0xf0, 0xd5, 0x4b,
-    0xb9, 0x72, 0x35, 0x61, 0x0c, 0x8b, 0x34, 0x07, 0xb5, 0x0a, 0x62, 0x5b, 0x8a, 0xe3, 0x67, 0x5c, 0x49, 0x6f, 0x51,
-    0x12, 0x17, 0xef, 0x67, 0x60, 0x62, 0xb0, 0xb7, 0x30, 0x0c, 0x4c, 0x1f, 0xc2, 0x54, 0x54, 0x0e, 0xf3, 0x89, 0x8a,
-    0x91, 0x2e, 0x82, 0xce, 0x02, 0x53, 0xf1, 0x9a, 0x39, 0x6e, 0x09, 0xac, 0xca, 0xe3, 0xa1, 0x15, 0x8d, 0x46, 0x2f,
-    0xd2, 0x98, 0xc7, 0x51, 0x12, 0xff, 0x4e, 0x94, 0x5c, 0x20, 0x8f, 0xf1, 0x9e, 0x5c, 0x04, 0xc0, 0x9d, 0x7a, 0x24,
-    0xae, 0x12, 0xb2, 0x6b, 0x44, 0x0c, 0x21, 0x2d, 0x93, 0xf0, 0x68, 0x20, 0xc1, 0x4b, 0xfc, 0xd9, 0xbc, 0x98, 0x20,
-    0x61, 0xe5, 0xc0, 0x28, 0xc8, 0xb3, 0x93, 0x82, 0xe5, 0x67, 0x6c, 0xa4, 0x39, 0xa0, 0x00, 0xac, 0xa8, 0x39, 0x18,
-    0x2f, 0x34, 0xa3, 0xa3, 0x74, 0x28, 0x83, 0xa1, 0x7a, 0xa6, 0x98, 0x65, 0x92, 0x99, 0xb5, 0x85, 0xa3, 0xa5, 0x80,
-    0x23, 0x8c, 0x0a, 0x29, 0x09, 0xf2, 0x50, 0x61, 0x38, 0x01, 0x29, 0x04, 0x5a, 0xc1, 0xdc, 0xe6, 0x4a, 0x93, 0x3d,
-    0x9b, 0x93, 0x4a, 0xc8, 0xa1, 0x23, 0x6c, 0x64, 0x82, 0x34, 0x77, 0x61, 0x57, 0x81, 0x94, 0x97, 0xe0, 0x0a, 0x29,
-    0xa2, 0xcc, 0x1c, 0x64, 0x80, 0xf0, 0x5b, 0xa1, 0x0b, 0x7d, 0x6c, 0x41, 0x6c, 0xe0, 0xeb, 0x95, 0x07, 0xc2, 0x4a,
-    0xbc, 0x2b, 0x44, 0xbc, 0x6b, 0xc0, 0xc6, 0x89, 0x91, 0x9f, 0xbc, 0x35, 0xee, 0xa7, 0xd9, 0xfe, 0x70, 0xc8, 0x8a,
-    0x22, 0x03, 0xd8, 0xd6, 0xa8, 0xfd, 0x75, 0x86, 0x16, 0x50, 0xd2, 0xd5, 0xb2, 0xce, 0x2e, 0x48, 0x83, 0x9b, 0x6a,
-    0x45, 0xe9, 0xf4, 0xc0, 0xfe, 0xf8, 0x11, 0x64, 0xb6, 0x27, 0xc9, 0x00, 0x54, 0x5f, 0x36, 0xfc, 0x84, 0x3d, 0x53,
-    0xa7, 0xcc, 0x4a, 0xfb, 0xd2, 0xa9, 0x83, 0xe4, 0xc1, 0xb0, 0x6e, 0x69, 0x2c, 0xe8, 0xca, 0xa1, 0x71, 0x35, 0xa4,
-    0x82, 0x5c, 0x9c, 0x92, 0xca, 0x36, 0x96, 0x11, 0xac, 0xb6, 0xd2, 0x23, 0xd2, 0x2b, 0x6c, 0x0a, 0x02, 0xf4, 0x88,
-    0x0d, 0x7a, 0xb2, 0x3e, 0xcc, 0x05, 0xe5, 0x72, 0xf6, 0xdb, 0x9c, 0x15, 0x5c, 0xb0, 0x2e, 0x8c, 0x5b, 0xc0, 0xb8,
-    0xe5, 0x92, 0x75, 0x58, 0xb3, 0x1d, 0x57, 0xc1, 0xf6, 0x66, 0x86, 0x7a, 0xac, 0x40, 0x4e, 0xbe, 0x99, 0x9d, 0x10,
-    0x56, 0xe6, 0x5e, 0x5d, 0x7d, 0xab, 0x06, 0xa9, 0x96, 0x52, 0xdb, 0x40, 0x8d, 0x35, 0xb1, 0x55, 0x93, 0x91, 0xed,
-    0x4a, 0x85, 0xba, 0xd6, 0xe9, 0xd5, 0xf8, 0x00, 0xf6, 0x5c, 0x5b, 0xb3, 0x74, 0x65, 0x6c, 0xbf, 0x55, 0x34, 0x7d,
-    0x23, 0x46, 0x26, 0x6b, 0x94, 0xdd, 0xce, 0x3d, 0x6a, 0xc7, 0x43, 0xdb, 0xa5, 0xba, 0x4a, 0x30, 0xcc, 0xeb, 0x82,
-    0xa1, 0x09, 0xf5, 0x4c, 0x77, 0xb1, 0x35, 0x53, 0xb1, 0x50, 0xad, 0xb5, 0x72, 0x20, 0x78, 0x78, 0x04, 0xc6, 0xc9,
-    0x4a, 0xff, 0xe0, 0x75, 0x34, 0x65, 0x48, 0x51, 0xef, 0xba, 0x06, 0xd2, 0x81, 0x80, 0x26, 0x83, 0xa6, 0x7a, 0xe3,
-    0xae, 0xb0, 0x9a, 0xea, 0xfb, 0x2b, 0x06, 0x2b, 0x02, 0xec, 0xeb, 0x72, 0xc5, 0x12, 0x91, 0xde, 0x14, 0x5c, 0xa2,
-    0xe9, 0x23, 0xca, 0xc4, 0x9a, 0x90, 0x82, 0x07, 0xe4, 0x61, 0xf9, 0x1b, 0x0b, 0x27, 0x5b, 0x31, 0x85, 0x23, 0x47,
-    0x99, 0x02, 0x74, 0x26, 0x25, 0x00, 0xe2, 0x92, 0x7e, 0xd6, 0x36, 0x16, 0x92, 0xed, 0x00, 0xf9, 0xc0, 0x1f, 0x27,
-    0x11, 0x77, 0x3a, 0x5b, 0x6d, 0x17, 0xf8, 0x10, 0x84, 0x38, 0xe8, 0x08, 0x30, 0xef, 0x2b, 0x54, 0x18, 0xa2, 0x12,
-    0xbb, 0xdc, 0x07, 0xa3, 0x68, 0x12, 0x8f, 0xb9, 0x93, 0xa1, 0x12, 0x71, 0x4b, 0x96, 0x80, 0x92, 0xd1, 0xfb, 0x0a,
-    0xa4, 0x04, 0x17, 0xd2, 0x45, 0x54, 0x6b, 0x81, 0xa6, 0x20, 0x25, 0x29, 0x45, 0x5a, 0x50, 0x41, 0x60, 0x08, 0x95,
-    0x9e, 0xe2, 0x28, 0xd0, 0x6f, 0x71, 0x5f, 0x0c, 0x1a, 0x2c, 0x59, 0x94, 0x71, 0x3f, 0x5e, 0x2e, 0x04, 0x35, 0xec,
-    0xf3, 0xec, 0x65, 0x76, 0xce, 0xf2, 0x27, 0x11, 0xc2, 0x1e, 0x88, 0xee, 0x25, 0x48, 0x7a, 0x12, 0xe8, 0xac, 0xa7,
-    0x78, 0xe5, 0x8c, 0x90, 0x86, 0x85, 0x98, 0xc6, 0xa8, 0x08, 0x41, 0xcb, 0x11, 0xed, 0x53, 0xdc, 0x52, 0xb4, 0xf7,
-    0x50, 0x95, 0x30, 0xcd, 0x5b, 0xfb, 0x2f, 0xeb, 0xbc, 0x05, 0x23, 0xcc, 0x14, 0xb7, 0xd6, 0x77, 0xac, 0xeb, 0x49,
-    0xdd, 0xec, 0x48, 0xde, 0x32, 0x94, 0x19, 0xe8, 0x8f, 0xab, 0xab, 0xca, 0x48, 0x07, 0x65, 0xaa, 0xa5, 0x39, 0x5a,
-    0x4e, 0x62, 0x4b, 0xb8, 0x25, 0x28, 0x23, 0x34, 0xbc, 0xf2, 0x2c, 0x49, 0x0c, 0x5d, 0xe4, 0xc5, 0x3d, 0xa7, 0xa1,
-    0x8e, 0x00, 0x8a, 0x69, 0x4d, 0x23, 0xf5, 0x79, 0xa0, 0x2b, 0x50, 0x29, 0x29, 0x6d, 0xe4, 0x55, 0x4d, 0x04, 0xc4,
-    0xe9, 0x88, 0xe5, 0xc2, 0x41, 0x93, 0x3a, 0x14, 0x26, 0x4c, 0x81, 0xa1, 0xd9, 0x08, 0x24, 0xbc, 0x42, 0x00, 0xcc,
-    0x13, 0x7f, 0x92, 0x15, 0x5c, 0xd7, 0x99, 0xd0, 0xc7, 0x57, 0x57, 0xb1, 0xf0, 0x17, 0x91, 0x01, 0x72, 0x36, 0xcd,
-    0xce, 0xd8, 0x0a, 0xa8, 0x7b, 0x6a, 0x30, 0x13, 0x64, 0x63, 0x18, 0x50, 0xa2, 0xa0, 0x5a, 0x66, 0x49, 0x3c, 0x64,
-    0x5a, 0x4b, 0x4d, 0x7d, 0x30, 0xe8, 0xd8, 0x05, 0xc8, 0x08, 0xe6, 0xee, 0xed, 0xed, 0xb5, 0xbd, 0x8e, 0x5b, 0x0a,
-    0x82, 0x2f, 0x96, 0x28, 0x7a, 0x83, 0x7e, 0x94, 0x26, 0xf8, 0x2a, 0x59, 0xc0, 0x5d, 0x43, 0x29, 0x72, 0xe1, 0x27,
-    0x79, 0x52, 0x10, 0xbb, 0xde, 0x08, 0x06, 0xe5, 0x4c, 0x09, 0x6e, 0x34, 0x71, 0xc5, 0xb6, 0x7d, 0xa7, 0xc9, 0xa6,
-    0xd9, 0x49, 0xed, 0x30, 0xb5, 0x30, 0x72, 0xcd, 0x0b, 0xed, 0x01, 0x9b, 0xcb, 0x83, 0x56, 0x22, 0x55, 0x03, 0xaf,
-    0x03, 0x84, 0xc2, 0xd3, 0x75, 0x96, 0x50, 0xaa, 0x3a, 0x4b, 0x21, 0xae, 0x37, 0xd0, 0x5b, 0x26, 0xc1, 0x5c, 0x45,
-    0x82, 0x03, 0x29, 0x10, 0x38, 0x7a, 0x64, 0x62, 0xbd, 0x9e, 0xc0, 0xf2, 0x9c, 0x44, 0xc3, 0x4f, 0x1a, 0xdc, 0x8a,
-    0xec, 0x4d, 0x36, 0x70, 0x1a, 0x25, 0xa1, 0x21, 0xae, 0x4c, 0xbc, 0x95, 0x84, 0xae, 0x6d, 0x14, 0x70, 0xc8, 0x96,
-    0xd8, 0xbe, 0xb9, 0xd0, 0x4d, 0x6e, 0x97, 0xec, 0xa1, 0xfc, 0x27, 0xcd, 0x25, 0x37, 0xb0, 0x1c, 0x57, 0xd2, 0x80,
-    0x2b, 0xc6, 0x83, 0xa5, 0x69, 0x40, 0x02, 0x7c, 0x57, 0x8e, 0xe2, 0xe2, 0x7a, 0x12, 0xfc, 0xa9, 0x60, 0x3e, 0x35,
-    0x66, 0xba, 0x15, 0x52, 0x2d, 0xe1, 0xa4, 0x19, 0xac, 0x41, 0x93, 0xc6, 0x83, 0x12, 0x35, 0xdf, 0xa2, 0xa1, 0x42,
-    0x1c, 0x7f, 0x2a, 0xaa, 0xd0, 0x04, 0x43, 0x30, 0x72, 0xaf, 0x90, 0x0c, 0x97, 0x2d, 0x8b, 0x16, 0x29, 0x53, 0x63,
-    0x52, 0xa9, 0x9a, 0xe5, 0x32, 0x30, 0xb0, 0x68, 0xb7, 0xfa, 0xd2, 0x12, 0x57, 0x22, 0x37, 0x0d, 0xb5, 0x30, 0x29,
-    0x94, 0x37, 0xe1, 0xe4, 0xe8, 0x77, 0x29, 0xeb, 0xdd, 0xc4, 0x27, 0x57, 0xf8, 0xe4, 0xbe, 0xe1, 0x43, 0x99, 0xbc,
-    0x5d, 0xf4, 0x8b, 0xe0, 0x9b, 0x5a, 0x25, 0xda, 0xa7, 0x3e, 0x0a, 0x66, 0x57, 0x0b, 0x5d, 0x10, 0x28, 0x92, 0x4d,
-    0xd2, 0xbe, 0xe4, 0x37, 0x14, 0x1b, 0x95, 0x67, 0x94, 0xb9, 0x62, 0x83, 0xd4, 0xbc, 0xd2, 0xcc, 0x4b, 0xdd, 0x86,
-    0xfd, 0x5e, 0x96, 0x92, 0x4e, 0x5c, 0x50, 0x26, 0xf6, 0x6e, 0xa2, 0x8d, 0x97, 0x86, 0x99, 0xb0, 0x7e, 0x85, 0xb1,
-    0x53, 0xa3, 0x50, 0x2a, 0x45, 0x20, 0x8e, 0x8d, 0xaf, 0x95, 0x65, 0x90, 0xf9, 0x2b, 0xec, 0x29, 0x00, 0x25, 0x81,
-    0xc5, 0xd7, 0x54, 0xf2, 0xa2, 0xb0, 0x4e, 0xc7, 0x35, 0xa2, 0x63, 0x25, 0x42, 0x6b, 0x22, 0x5f, 0xeb, 0xb3, 0xd8,
-    0xaf, 0xb9, 0x84, 0x26, 0x25, 0xf3, 0x7e, 0x1e, 0xd8, 0x2a, 0x10, 0x51, 0xe9, 0xb6, 0xa4, 0x9f, 0x90, 0x43, 0xba,
-    0x4c, 0xf4, 0xda, 0x48, 0x06, 0xad, 0x53, 0x21, 0xd1, 0xd2, 0x41, 0x18, 0x39, 0xe8, 0xb8, 0xd3, 0x5a, 0x2c, 0x11,
-    0xb2, 0x69, 0x6f, 0x12, 0x2b, 0xa2, 0x73, 0x9a, 0xa3, 0x09, 0x67, 0xea, 0x74, 0xc7, 0x01, 0x74, 0x40, 0xec, 0x2f,
-    0xb1, 0xde, 0x4a, 0xb3, 0xd3, 0xf5, 0x2b, 0x87, 0xef, 0xea, 0x2a, 0x41, 0x7e, 0x10, 0x06, 0x2f, 0xac, 0x59, 0x5f,
-    0xc9, 0xde, 0xfd, 0x97, 0xd8, 0x8a, 0xec, 0xcf, 0xaa, 0xa4, 0xf2, 0x14, 0x6a, 0x9c, 0x5b, 0x5f, 0x27, 0x66, 0x86,
-    0x16, 0x55, 0xc5, 0x81, 0x21, 0xd5, 0x0f, 0x94, 0xc2, 0xae, 0x50, 0x3e, 0x90, 0x43, 0xc7, 0xae, 0xeb, 0x06, 0x39,
-    0x39, 0x2f, 0x6b, 0xab, 0x5c, 0xc8, 0x8d, 0x0d, 0xd3, 0x67, 0x3a, 0xd3, 0xc3, 0x3f, 0x71, 0x50, 0x39, 0x17, 0x97,
-    0x29, 0x59, 0x30, 0x4f, 0x94, 0x3a, 0x5a, 0x72, 0x40, 0xdb, 0x3d, 0xf4, 0xb4, 0xa3, 0xf3, 0x28, 0xe6, 0x96, 0x1e,
-    0x45, 0x78, 0xda, 0x28, 0x9f, 0xa4, 0xd1, 0x01, 0x78, 0xa1, 0x09, 0x49, 0x4e, 0xb8, 0x69, 0x8b, 0x16, 0xc3, 0x09,
-    0xc3, 0x10, 0xb8, 0xb2, 0x27, 0x4c, 0xd9, 0xb3, 0x86, 0x78, 0x8b, 0x81, 0xd9, 0x6a, 0xd8, 0xcb, 0x66, 0xf7, 0x9a,
-    0xf9, 0x0f, 0x6b, 0x04, 0xb2, 0x6d, 0xaa, 0xea, 0xca, 0xc6, 0xbb, 0x14, 0x91, 0x18, 0x61, 0x5b, 0x35, 0xb6, 0xb4,
-    0xf5, 0x7b, 0x0d, 0xf7, 0xba, 0x72, 0xcc, 0x6b, 0x4a, 0xb5, 0xa1, 0x87, 0x95, 0x9b, 0xc3, 0x4c, 0x47, 0x5e, 0xac,
-    0xa0, 0xdb, 0x13, 0x41, 0x21, 0x70, 0x22, 0xb4, 0x3d, 0xa8, 0xb8, 0x81, 0x48, 0xc9, 0x95, 0x56, 0xcd, 0xe6, 0xc9,
-    0x48, 0x02, 0x0b, 0x2e, 0x2c, 0x97, 0x7c, 0x74, 0x1e, 0x27, 0x49, 0x55, 0xfa, 0xa7, 0x0a, 0x78, 0x31, 0xec, 0x6d,
-    0xa2, 0x5d, 0x60, 0x34, 0x57, 0x20, 0xb8, 0xda, 0x08, 0x7b, 0xef, 0xb8, 0xd5, 0xba, 0x8b, 0x88, 0x23, 0x37, 0xa3,
-    0x11, 0x50, 0x8f, 0x11, 0x56, 0xcd, 0xda, 0xfb, 0xcf, 0x30, 0xa4, 0x66, 0xe0, 0x83, 0xea, 0x8c, 0x8a, 0x3f, 0xcb,
-    0x9e, 0xfa, 0x4c, 0xf4, 0x6e, 0x55, 0x5d, 0xcd, 0x80, 0x8a, 0x0a, 0x7c, 0x98, 0x21, 0x96, 0xb6, 0x0a, 0x04, 0xe4,
-    0x7a, 0x58, 0x94, 0x02, 0x26, 0x69, 0xb0, 0xa0, 0x14, 0x58, 0x6b, 0x65, 0xf7, 0xf2, 0xb6, 0x60, 0x0e, 0x85, 0xc2,
-    0x45, 0xff, 0x27, 0xd9, 0x74, 0x86, 0x96, 0x59, 0x83, 0xa9, 0xa1, 0xc1, 0xfb, 0x46, 0x7d, 0xb9, 0xa2, 0xac, 0xd6,
-    0x87, 0x76, 0x64, 0x8d, 0x9f, 0xb4, 0xa3, 0x0c, 0x0e, 0xd5, 0x5c, 0x17, 0xd5, 0xed, 0xe6, 0xa6, 0x88, 0x59, 0xc5,
-    0xe3, 0x3e, 0xe9, 0x6d, 0x6d, 0x4d, 0x7a, 0x9a, 0x06, 0x24, 0x93, 0x24, 0xc3, 0x9b, 0x0c, 0x50, 0x56, 0xc4, 0x59,
-    0x94, 0x0d, 0xf2, 0x2d, 0xca, 0x12, 0xd7, 0xef, 0xbb, 0xde, 0x7e, 0xcd, 0xb3, 0xf6, 0xf6, 0xaf, 0x77, 0x91, 0xab,
-    0x3a, 0xe9, 0x41, 0x1e, 0x0d, 0xa0, 0x68, 0xc9, 0xa6, 0x0c, 0x17, 0xd3, 0x6c, 0xc4, 0x02, 0x1b, 0xba, 0xa7, 0x76,
-    0xa9, 0xb4, 0x32, 0x6c, 0x8e, 0x94, 0x39, 0x8b, 0x77, 0xf5, 0x48, 0x6a, 0xb0, 0x0f, 0x2c, 0xa0, 0xcd, 0x85, 0xef,
-    0xc3, 0xd3, 0x24, 0x3b, 0x89, 0x92, 0x43, 0xa1, 0xc0, 0x6b, 0x2d, 0x3f, 0x80, 0xcb, 0x48, 0x16, 0xab, 0xa1, 0xa4,
-    0xbe, 0xef, 0x7f, 0x1f, 0xdc, 0xde, 0xa3, 0xf2, 0x56, 0xec, 0x8e, 0xdf, 0xf6, 0x3b, 0xb6, 0x8a, 0x88, 0xbd, 0x34,
-    0xa7, 0x03, 0x8d, 0x53, 0x00, 0x65, 0x0e, 0x41, 0x93, 0x15, 0x5e, 0xc4, 0xc2, 0x97, 0xfd, 0x97, 0xca, 0xa5, 0xce,
-    0xc0, 0x85, 0x00, 0x27, 0x3f, 0x89, 0x79, 0x0b, 0xcf, 0x23, 0x6d, 0x6f, 0x21, 0x2a, 0x30, 0xae, 0x48, 0x71, 0xe9,
-    0x52, 0x79, 0x83, 0xde, 0xc7, 0xf0, 0x18, 0x9a, 0xad, 0xaf, 0x2f, 0x9c, 0x57, 0x11, 0x9f, 0xf8, 0x79, 0x94, 0x8e,
-    0xb2, 0xa9, 0xe3, 0x6e, 0xda, 0xb6, 0xeb, 0x17, 0xe4, 0x89, 0x7c, 0xe5, 0x96, 0xeb, 0xc7, 0xde, 0x84, 0x85, 0x76,
-    0xdf, 0xde, 0xfc, 0xe8, 0xbd, 0x67, 0xe1, 0xf1, 0xee, 0xfa, 0x62, 0xc2, 0xca, 0xbd, 0x63, 0xef, 0x42, 0xc7, 0xdc,
-    0xbd, 0xb7, 0x28, 0x65, 0xa0, 0x57, 0xb8, 0x77, 0x21, 0xc1, 0x00, 0x76, 0xa3, 0xf8, 0x3b, 0x48, 0xb9, 0xf7, 0x74,
-    0x20, 0x22, 0xe3, 0xb4, 0x57, 0x57, 0x76, 0x46, 0x11, 0x03, 0x7b, 0x4d, 0x3b, 0xab, 0x1b, 0x1b, 0x95, 0x9a, 0xaf,
-    0x4a, 0xbd, 0x21, 0x0b, 0x6b, 0x9e, 0xba, 0x77, 0x48, 0x47, 0x2b, 0xf5, 0x8d, 0x3c, 0x64, 0xa4, 0x34, 0x97, 0xed,
-    0x04, 0xc7, 0xd8, 0xe2, 0xab, 0xb7, 0xf5, 0x91, 0x88, 0x52, 0xf8, 0x31, 0x58, 0x2f, 0x11, 0xa8, 0x6f, 0x70, 0x70,
-    0xbc, 0xc3, 0x70, 0x6b, 0xd7, 0xe9, 0x07, 0xce, 0x5a, 0xab, 0x75, 0xf5, 0xf3, 0xd6, 0xd1, 0x2f, 0x51, 0xeb, 0xf7,
-    0xfd, 0xd6, 0x4f, 0x03, 0xf7, 0xca, 0xf9, 0x79, 0xab, 0x7f, 0x24, 0xdf, 0x8e, 0x7e, 0xd9, 0xfb, 0xb9, 0x18, 0x7c,
-    0x29, 0x0a, 0xd7, 0x5d, 0x77, 0xeb, 0x14, 0x3c, 0xa5, 0x70, 0xab, 0xd5, 0xda, 0x83, 0xa7, 0x39, 0x3c, 0xe1, 0xcf,
-    0x73, 0xf8, 0x71, 0x75, 0x64, 0xfd, 0x9b, 0x9f, 0xd3, 0x7f, 0xfb, 0x73, 0x3e, 0xc0, 0x31, 0x8f, 0x7e, 0xf9, 0xb9,
-    0xb0, 0xef, 0xed, 0x85, 0x5b, 0x83, 0x4d, 0xd7, 0xd1, 0x35, 0x5f, 0x86, 0xd5, 0x23, 0xb4, 0x3a, 0xfa, 0x45, 0xbe,
-    0xd9, 0xf7, 0x8e, 0x77, 0xf7, 0xc2, 0xc1, 0x95, 0x63, 0x5f, 0xdd, 0x73, 0xaf, 0x5c, 0xf7, 0x6a, 0x1d, 0xe7, 0x99,
-    0xc1, 0xe8, 0xf7, 0xe0, 0xe7, 0x29, 0xfc, 0xb4, 0xe1, 0xe7, 0x19, 0xfc, 0xfc, 0x05, 0xba, 0x89, 0xf8, 0xdb, 0x15,
-    0xc5, 0x42, 0xae, 0xf0, 0xc0, 0x22, 0x82, 0x55, 0x70, 0xd7, 0xb7, 0x62, 0x6f, 0x4c, 0x44, 0x83, 0x7d, 0xe8, 0xfb,
-    0x3e, 0x86, 0x49, 0x9d, 0xc5, 0xc7, 0x75, 0x58, 0x74, 0xe4, 0x9c, 0xf5, 0x80, 0x79, 0x22, 0x72, 0x50, 0x04, 0x5c,
-    0x9c, 0xad, 0x16, 0x78, 0xb8, 0xea, 0x8d, 0xc2, 0x31, 0x73, 0xc0, 0x28, 0x78, 0xce, 0xf0, 0xa1, 0xeb, 0x7a, 0xcf,
-    0xe4, 0x99, 0x21, 0xee, 0x73, 0xc1, 0x5a, 0x69, 0x26, 0x4c, 0x1a, 0xdb, 0xf5, 0x66, 0x2b, 0x2a, 0x61, 0x5b, 0xa7,
-    0xa7, 0x50, 0xb7, 0x2e, 0x0e, 0xda, 0xbe, 0x67, 0xd1, 0x27, 0xdc, 0x92, 0xaf, 0x8d, 0x43, 0xe0, 0x25, 0x4b, 0xbe,
-    0x69, 0x34, 0x1a, 0x36, 0xa2, 0x70, 0xc7, 0x1e, 0x33, 0x98, 0x61, 0xc9, 0x44, 0xe4, 0xa4, 0x34, 0x85, 0x65, 0x0b,
-    0x93, 0xbf, 0x8d, 0x72, 0xbe, 0x5e, 0x19, 0xb6, 0x61, 0xcd, 0x92, 0x6d, 0x5a, 0xfa, 0x77, 0x98, 0x02, 0x4d, 0x4b,
-    0x3a, 0xff, 0x30, 0xc7, 0x0f, 0x53, 0x42, 0xeb, 0xb5, 0xc3, 0xc1, 0x43, 0x2f, 0x40, 0xee, 0x88, 0x7e, 0xce, 0x5b,
-    0x54, 0x63, 0xf0, 0x57, 0x86, 0x19, 0x3c, 0x31, 0x1f, 0x86, 0x68, 0x16, 0xa5, 0x0e, 0x6e, 0xa5, 0x28, 0xee, 0x5f,
-    0xe0, 0xce, 0x48, 0x4b, 0xef, 0x20, 0x54, 0x3b, 0xe6, 0x30, 0x67, 0xec, 0xfb, 0x28, 0xf9, 0xc4, 0x72, 0xe7, 0xc2,
-    0xeb, 0x74, 0xbf, 0xa2, 0xce, 0x1e, 0xda, 0x66, 0xaf, 0xaa, 0x63, 0x34, 0x65, 0x16, 0xa8, 0x23, 0xc2, 0x56, 0xc7,
-    0xcb, 0x31, 0xaa, 0x85, 0x24, 0x28, 0xbc, 0x2c, 0xec, 0x12, 0x87, 0xdb, 0xbb, 0xc5, 0xd9, 0xe9, 0x9e, 0x1d, 0xd8,
-    0x36, 0x58, 0xfc, 0x87, 0x14, 0xb6, 0x12, 0x86, 0x05, 0x18, 0x64, 0xbb, 0x71, 0x8f, 0x6f, 0x6e, 0x56, 0x01, 0x27,
-    0x3c, 0x48, 0xa7, 0xee, 0x89, 0x17, 0x79, 0x93, 0x10, 0x06, 0x1c, 0x42, 0x33, 0xec, 0xd2, 0x1b, 0xee, 0xc6, 0x72,
-    0x1a, 0x8c, 0x85, 0xf8, 0x49, 0x54, 0xf0, 0x17, 0x18, 0x8f, 0x08, 0x87, 0x68, 0xec, 0xfb, 0xec, 0x82, 0x0d, 0x95,
-    0x9d, 0x01, 0x84, 0x8a, 0xdc, 0x9e, 0x3b, 0x0c, 0x8d, 0x66, 0x30, 0x77, 0x18, 0x1e, 0xf6, 0x6d, 0xd8, 0x4b, 0xb0,
-    0x2b, 0xc3, 0xe8, 0xa8, 0x33, 0xe8, 0xa7, 0x21, 0xc8, 0x5a, 0x4d, 0x5b, 0x59, 0x34, 0xaf, 0x15, 0x75, 0x07, 0x7d,
-    0xe7, 0x0c, 0x8c, 0x74, 0xb0, 0xc5, 0x1d, 0x7c, 0xc3, 0x08, 0x45, 0x11, 0xbe, 0x63, 0xa7, 0xcf, 0x2e, 0x66, 0x8e,
-    0xbd, 0xbb, 0x65, 0x6f, 0x62, 0xa9, 0x67, 0x03, 0x7b, 0xc1, 0xdc, 0xe1, 0xb9, 0x6b, 0x76, 0xde, 0x1e, 0x20, 0xa8,
-    0x58, 0x88, 0x93, 0x9f, 0xf7, 0xed, 0x3d, 0x31, 0x75, 0x1b, 0x06, 0x4d, 0xe5, 0xf2, 0xe3, 0x8a, 0x1e, 0x12, 0xaa,
-    0xaa, 0xab, 0x82, 0x0e, 0xca, 0xba, 0x81, 0x33, 0x31, 0x91, 0x68, 0xe1, 0x64, 0x92, 0x0a, 0xe0, 0xf0, 0x60, 0x33,
-    0x98, 0xd4, 0xe8, 0xb6, 0x3d, 0xe8, 0x9f, 0x07, 0xf7, 0xec, 0x7b, 0xea, 0xe5, 0x94, 0x05, 0xe0, 0x5d, 0xd0, 0xf4,
-    0xa7, 0xa8, 0x45, 0xe0, 0xe7, 0x8c, 0x01, 0x92, 0xe7, 0x54, 0x34, 0x92, 0x45, 0x73, 0x2c, 0x3a, 0x0c, 0x10, 0x54,
-    0xaf, 0xd0, 0xd6, 0x9f, 0x58, 0x93, 0x51, 0x48, 0xb0, 0x6f, 0x6c, 0xc0, 0xd2, 0x6c, 0x76, 0x06, 0x78, 0xde, 0x90,
-    0xf3, 0xe2, 0xfb, 0x98, 0x83, 0x4a, 0xd8, 0xda, 0xb3, 0xdd, 0xbe, 0x6d, 0xe1, 0xd2, 0xf6, 0xb2, 0xcd, 0x50, 0x50,
-    0x38, 0xde, 0x7c, 0xcf, 0x82, 0xc9, 0x5e, 0xd8, 0xee, 0x3b, 0xb9, 0x50, 0x1d, 0x09, 0x9e, 0x5b, 0x0a, 0x09, 0xde,
-    0xf6, 0x26, 0x20, 0xd0, 0x91, 0x73, 0xd7, 0xed, 0x4d, 0x55, 0x08, 0x45, 0x1f, 0x37, 0x47, 0x6e, 0x10, 0xc3, 0x0f,
-    0xa7, 0x85, 0x4c, 0x33, 0xd1, 0x7d, 0xb5, 0x66, 0x76, 0x83, 0x91, 0xb2, 0xc8, 0x93, 0x30, 0xdb, 0x74, 0x30, 0x42,
-    0x0b, 0x92, 0x76, 0xb7, 0x0f, 0x30, 0x6c, 0x3a, 0x8a, 0xd3, 0xb6, 0x14, 0xab, 0x29, 0xfb, 0xfc, 0xa8, 0x5a, 0x0e,
-    0xd6, 0x8f, 0x98, 0x5f, 0x69, 0x1f, 0x00, 0x2b, 0x48, 0xbc, 0x7c, 0xa0, 0xce, 0xbc, 0x9e, 0xd7, 0xce, 0xb7, 0x16,
-    0x4a, 0x14, 0x31, 0xcf, 0x90, 0x50, 0xbc, 0xd4, 0x6e, 0x98, 0x30, 0xb7, 0x67, 0x48, 0x0c, 0xcd, 0xf2, 0x61, 0x1b,
-    0x98, 0x5e, 0x05, 0xd8, 0x53, 0x73, 0x5b, 0x24, 0x61, 0xd5, 0xdc, 0x3b, 0x02, 0xd6, 0x1e, 0x84, 0xaf, 0xc4, 0x89,
-    0x63, 0x4f, 0x45, 0xf3, 0x59, 0x12, 0x3e, 0x6f, 0x1c, 0x17, 0x47, 0x78, 0x22, 0x74, 0xe0, 0x0f, 0xe7, 0x39, 0xc8,
-    0x03, 0xfe, 0x1a, 0x2c, 0x83, 0x50, 0x36, 0x45, 0x47, 0x0f, 0x8f, 0x80, 0x3d, 0x42, 0xbc, 0x11, 0x36, 0x37, 0xaa,
-    0xd1, 0xa2, 0x24, 0xe3, 0x85, 0x0e, 0x86, 0x7b, 0x5c, 0xba, 0xf6, 0x28, 0x18, 0xe4, 0x89, 0xb1, 0x83, 0x67, 0xfe,
-    0xfe, 0x10, 0xab, 0x71, 0x82, 0xc2, 0x2d, 0x69, 0xb7, 0x55, 0xe2, 0xef, 0xc0, 0x4f, 0x41, 0x82, 0x63, 0x1d, 0xf8,
-    0x59, 0x1b, 0x1b, 0x89, 0x44, 0x6a, 0x37, 0xed, 0xd1, 0x49, 0x04, 0xc6, 0x83, 0x73, 0x3f, 0x85, 0x6a, 0x24, 0x11,
-    0x15, 0xe5, 0x68, 0x81, 0x9a, 0xa7, 0x6a, 0x15, 0x7c, 0x47, 0x66, 0x04, 0x9e, 0x63, 0xd8, 0x9a, 0xfc, 0x54, 0xdd,
-    0x58, 0xc4, 0xf2, 0x5d, 0x97, 0x8e, 0xb6, 0xf0, 0x00, 0x52, 0x30, 0x9a, 0x60, 0x18, 0x97, 0x82, 0x92, 0x15, 0xff,
-    0x7d, 0x34, 0x62, 0xe5, 0x93, 0xa3, 0x6c, 0x73, 0x73, 0x20, 0xce, 0x2d, 0x88, 0x71, 0xb8, 0x11, 0x5d, 0x8d, 0x2b,
-    0x00, 0xea, 0xd3, 0x39, 0x71, 0x3d, 0x30, 0xad, 0x58, 0xd3, 0xa5, 0xd8, 0x27, 0x87, 0x19, 0x80, 0x82, 0x5b, 0xce,
-    0x91, 0xdf, 0xff, 0xcb, 0x00, 0xdc, 0x63, 0xff, 0x4b, 0x77, 0x4b, 0x09, 0x9a, 0x9e, 0x3c, 0x53, 0x5c, 0xd0, 0x19,
-    0x6b, 0xc7, 0xa3, 0xd8, 0x68, 0x50, 0x78, 0x29, 0x60, 0x00, 0xda, 0x1c, 0x64, 0x42, 0xc5, 0x41, 0xc8, 0x51, 0x81,
-    0xed, 0xe3, 0xe6, 0xe7, 0xb8, 0xb3, 0x9f, 0x82, 0x85, 0xd7, 0xd7, 0x6f, 0x8f, 0xe1, 0xed, 0x2f, 0xfa, 0xed, 0x25,
-    0x0b, 0x7e, 0x2d, 0x65, 0xe8, 0xbe, 0x36, 0xc5, 0x03, 0x35, 0x45, 0x29, 0x96, 0xc8, 0xa0, 0x21, 0x73, 0xf3, 0xa5,
-    0x98, 0x0d, 0x77, 0x4b, 0x54, 0x3b, 0x52, 0x74, 0xe5, 0x3e, 0x8f, 0x4e, 0x91, 0xb8, 0xae, 0x49, 0x0a, 0x23, 0x97,
-    0xc0, 0x44, 0xb8, 0xe2, 0x5b, 0x62, 0xce, 0xbd, 0x36, 0xd8, 0xe0, 0xb5, 0xbc, 0x03, 0xb4, 0xef, 0xd8, 0x74, 0xc6,
-    0x2f, 0x0f, 0x48, 0xd1, 0x07, 0x32, 0x6d, 0x40, 0x9c, 0x9d, 0xb7, 0x7b, 0xf1, 0x2e, 0xef, 0xc5, 0x20, 0xd5, 0x73,
-    0xc5, 0x62, 0xb8, 0x57, 0xbd, 0xb7, 0x18, 0xa5, 0x34, 0x99, 0xc9, 0xab, 0xa1, 0xd7, 0x95, 0xe8, 0x6d, 0x6e, 0x02,
-    0x82, 0x3d, 0xa3, 0x2b, 0x17, 0x5d, 0xcb, 0x52, 0xd0, 0x04, 0x20, 0x7a, 0x54, 0x67, 0x39, 0xe2, 0x38, 0xcc, 0x66,
-    0x43, 0xc1, 0xc1, 0xdc, 0x95, 0xa3, 0xe2, 0x98, 0xd8, 0x5d, 0x26, 0xec, 0x00, 0x66, 0xc4, 0xe5, 0xad, 0x8e, 0x88,
-    0x0e, 0x8b, 0xfe, 0x3a, 0xbe, 0xfd, 0xd1, 0x63, 0x9b, 0x1d, 0x17, 0x34, 0x48, 0x6d, 0xac, 0x87, 0xd5, 0x58, 0x50,
-    0x1f, 0x7e, 0xd4, 0x54, 0x2a, 0x8b, 0xcd, 0xcd, 0xb2, 0x7e, 0x54, 0xab, 0x76, 0x70, 0xed, 0x34, 0xe5, 0xa2, 0x99,
-    0x0d, 0xc2, 0x81, 0x88, 0x09, 0x14, 0x68, 0x69, 0x65, 0xc5, 0x00, 0x43, 0xca, 0x72, 0x94, 0x4f, 0x21, 0xf3, 0xe2,
-    0xb2, 0xd4, 0xa9, 0x2f, 0x32, 0x1e, 0x19, 0xe2, 0xa9, 0x27, 0x19, 0x2b, 0xa0, 0x60, 0xbd, 0xd4, 0x4b, 0x68, 0x89,
-    0x00, 0xf3, 0x67, 0x2a, 0x87, 0x46, 0x58, 0x20, 0x51, 0x68, 0x98, 0x25, 0xca, 0xf8, 0x2c, 0xc2, 0x18, 0xb4, 0xfd,
-    0x93, 0x5a, 0xec, 0xab, 0x50, 0x46, 0x47, 0x71, 0x94, 0x0f, 0x02, 0xaa, 0x9f, 0x4b, 0x09, 0x36, 0x09, 0xdf, 0x03,
-    0x1b, 0x55, 0x8e, 0x27, 0x09, 0xc2, 0xa7, 0x71, 0xce, 0xc8, 0x53, 0x58, 0x97, 0x30, 0x4b, 0xd3, 0x36, 0x52, 0xed,
-    0x22, 0x33, 0x08, 0xe5, 0xc2, 0xfc, 0x13, 0xe3, 0xec, 0x22, 0x0b, 0x97, 0x5a, 0x83, 0xf9, 0xf1, 0xc6, 0x04, 0x28,
-    0xbb, 0xba, 0xca, 0x84, 0x8f, 0x1b, 0x91, 0xbd, 0xa1, 0x2b, 0x26, 0x7d, 0x85, 0x54, 0xe0, 0x44, 0x64, 0xf1, 0xd0,
-    0x19, 0x0a, 0x8d, 0x70, 0x48, 0xa7, 0xc8, 0xb9, 0x6b, 0x6c, 0xfa, 0xbc, 0xaf, 0x7d, 0xa3, 0x34, 0x74, 0x12, 0x10,
-    0x02, 0x02, 0x77, 0xc3, 0x9a, 0x4a, 0xfb, 0x69, 0x90, 0x50, 0x29, 0xfa, 0x39, 0x80, 0x7f, 0x18, 0x49, 0x0a, 0x80,
-    0xfd, 0x50, 0x8d, 0x14, 0x51, 0x96, 0x05, 0x2e, 0x00, 0xcd, 0x75, 0x80, 0x2b, 0xe1, 0x0b, 0x03, 0x15, 0xa6, 0xa7,
-    0x59, 0x79, 0x29, 0x94, 0xc8, 0xbb, 0x15, 0x29, 0x6b, 0x24, 0x93, 0xcf, 0xd0, 0xe1, 0x53, 0xde, 0xf5, 0x6b, 0x89,
-    0x87, 0x2e, 0x78, 0x0a, 0xcb, 0xaa, 0x9e, 0x5f, 0x85, 0x9c, 0x9c, 0x6b, 0xd0, 0x15, 0x52, 0xe8, 0x2f, 0x39, 0xc9,
-    0xfb, 0xaf, 0xfc, 0xaa, 0x96, 0x1a, 0x43, 0xd9, 0xfb, 0x55, 0xcd, 0xb0, 0xbc, 0x9c, 0x55, 0x61, 0x0a, 0x02, 0x6e,
-    0xc1, 0x92, 0x60, 0x21, 0x35, 0x04, 0x58, 0xd8, 0x1e, 0x69, 0xa5, 0x20, 0x2f, 0x75, 0x78, 0xe7, 0x29, 0x58, 0x01,
-    0xc6, 0xa1, 0x96, 0x4a, 0xa6, 0x91, 0xc4, 0x97, 0x4a, 0x14, 0x98, 0xf2, 0x60, 0x08, 0x7e, 0x6a, 0xf3, 0xa4, 0xeb,
-    0xc2, 0xf5, 0xe3, 0x29, 0xa6, 0xf6, 0x10, 0xe8, 0xb1, 0xb7, 0x06, 0xa6, 0x44, 0x5d, 0x87, 0x15, 0xc4, 0xa1, 0x59,
-    0x4d, 0xb3, 0x80, 0x19, 0xd3, 0x06, 0x2d, 0xd9, 0x06, 0x5b, 0x2e, 0x07, 0xfb, 0x48, 0x6c, 0xcf, 0x6a, 0x05, 0x84,
-    0xae, 0x41, 0x03, 0x43, 0xee, 0x52, 0xa1, 0x85, 0x79, 0xaf, 0x4b, 0x45, 0xb8, 0x3f, 0xfb, 0x5c, 0x5a, 0xc1, 0x99,
-    0x97, 0xd1, 0xc0, 0x07, 0xf1, 0x49, 0x82, 0x89, 0x2f, 0x88, 0x15, 0xd8, 0xc1, 0x41, 0xa7, 0xd9, 0x14, 0x38, 0x15,
-    0x17, 0x29, 0x83, 0x65, 0x45, 0xa9, 0x0d, 0x3f, 0xa4, 0xc8, 0xd6, 0x5d, 0x1e, 0xe8, 0x2e, 0xc4, 0x02, 0xd8, 0xe9,
-    0x57, 0x8c, 0x7c, 0xcb, 0x7a, 0x19, 0x30, 0x38, 0xd3, 0x1a, 0x07, 0x81, 0xdf, 0xdc, 0x4c, 0x06, 0x65, 0x4a, 0x6c,
-    0xd7, 0x64, 0x75, 0x01, 0x39, 0x0c, 0xd5, 0xc4, 0x1d, 0x84, 0xa5, 0xb2, 0xc7, 0x8b, 0x72, 0x8a, 0xcb, 0xa5, 0x2c,
-    0xe4, 0xe6, 0x79, 0x35, 0xcd, 0xe7, 0x56, 0x9a, 0x4d, 0xc7, 0x5b, 0xf1, 0x45, 0xc1, 0xdf, 0x77, 0x62, 0x69, 0xd5,
-    0x53, 0x6a, 0x85, 0x47, 0x99, 0x5b, 0xb2, 0x4e, 0x49, 0xad, 0xae, 0x1b, 0xa8, 0x46, 0x78, 0x9a, 0x86, 0x8d, 0x40,
-    0x88, 0x09, 0x2e, 0x7e, 0xdd, 0x64, 0x62, 0xda, 0x5b, 0x42, 0xea, 0x08, 0xbb, 0x87, 0x72, 0x82, 0xbb, 0x9a, 0x67,
-    0x9f, 0x87, 0xb3, 0xeb, 0x99, 0x7b, 0xdf, 0x60, 0xee, 0xc7, 0x21, 0x37, 0x18, 0x3d, 0x96, 0x09, 0x3f, 0x32, 0xf6,
-    0x91, 0xab, 0xaa, 0x27, 0xa7, 0x61, 0x25, 0xb2, 0xc4, 0x93, 0x71, 0xd4, 0x61, 0x9c, 0x8a, 0xd6, 0x04, 0xd9, 0xd5,
-    0x55, 0x61, 0xee, 0x05, 0x0a, 0x9a, 0x7a, 0xbc, 0x1e, 0xa7, 0xad, 0xd8, 0xd9, 0x88, 0x44, 0xee, 0xbf, 0xaa, 0x45,
-    0x22, 0x2b, 0x3e, 0xc7, 0x91, 0xae, 0x39, 0xc8, 0x7d, 0x72, 0xba, 0xbc, 0x49, 0x85, 0x6e, 0xd1, 0x68, 0x1b, 0x7b,
-    0x54, 0x1f, 0x48, 0xea, 0x19, 0x15, 0x58, 0xd5, 0xd8, 0x1b, 0x1b, 0x1d, 0x91, 0x6e, 0xa9, 0x14, 0x1b, 0x2c, 0x2d,
-    0x8c, 0x66, 0x8c, 0x82, 0x41, 0x49, 0x91, 0x81, 0x1a, 0xe5, 0xd7, 0x08, 0x86, 0x7d, 0x6a, 0x00, 0x8a, 0x73, 0x75,
-    0xf5, 0xe3, 0x52, 0xb2, 0x85, 0x80, 0xc4, 0x5d, 0x30, 0x10, 0x6b, 0x82, 0x99, 0x91, 0x4f, 0xde, 0x03, 0xe7, 0xf5,
-    0x19, 0xfa, 0x08, 0xe0, 0x17, 0x88, 0x4d, 0x0f, 0x26, 0xb6, 0x4d, 0x44, 0xd1, 0x67, 0x03, 0xcf, 0x01, 0xd8, 0x59,
-    0x15, 0x1a, 0x7d, 0x57, 0xa5, 0x80, 0x21, 0x1b, 0xb8, 0x01, 0xab, 0xc2, 0x72, 0xfb, 0xcf, 0xc1, 0x6d, 0x80, 0xd7,
-    0x67, 0xb2, 0xf9, 0x3a, 0xe6, 0x09, 0x56, 0x67, 0x17, 0x7e, 0x65, 0x59, 0x8b, 0x73, 0xa7, 0xc3, 0x46, 0xbd, 0xa2,
-    0x84, 0xa8, 0x3d, 0xc0, 0xda, 0x43, 0x8c, 0xb0, 0x88, 0xf7, 0x57, 0xf8, 0xae, 0xc7, 0x2d, 0xf7, 0x35, 0x5a, 0x84,
-    0xe9, 0x32, 0x69, 0x0c, 0x4a, 0xd6, 0xfd, 0x64, 0xc4, 0xbd, 0x3c, 0x10, 0xb1, 0xe0, 0x0a, 0x47, 0x56, 0x85, 0x14,
-    0x1b, 0x48, 0xd2, 0xd3, 0x3e, 0x1d, 0xb0, 0xaf, 0x37, 0x7b, 0x01, 0x65, 0xde, 0x57, 0xa4, 0x92, 0x90, 0xd2, 0xec,
-    0x86, 0x48, 0x12, 0xd6, 0x8a, 0x3c, 0x75, 0x3e, 0x70, 0xb4, 0xcf, 0xad, 0x24, 0x82, 0x11, 0x9c, 0x84, 0xe9, 0x58,
-    0x79, 0xd8, 0x14, 0xe0, 0x2a, 0x3a, 0x62, 0xfa, 0x26, 0x20, 0xbf, 0x19, 0xc8, 0xed, 0xa5, 0xe4, 0xda, 0x5c, 0xc3,
-    0xf0, 0x04, 0x09, 0x56, 0x45, 0x22, 0xf0, 0x88, 0x1a, 0x70, 0xcc, 0x57, 0x79, 0x1e, 0x60, 0xc2, 0xd7, 0xf6, 0x26,
-    0x00, 0x94, 0x93, 0xab, 0xe2, 0x2c, 0x05, 0xba, 0x01, 0xcb, 0xd5, 0x71, 0x6a, 0x54, 0x24, 0x2e, 0x6e, 0x4c, 0x57,
-    0xb7, 0xf4, 0xa7, 0x68, 0x39, 0x93, 0x21, 0xa6, 0x83, 0x20, 0x20, 0x53, 0xdf, 0x31, 0x47, 0xc8, 0x5c, 0x61, 0x7d,
-    0xce, 0x9c, 0xda, 0xd4, 0x3d, 0x46, 0xdd, 0x3c, 0x49, 0x2d, 0x5e, 0xa7, 0x4d, 0x29, 0x11, 0x93, 0x12, 0x73, 0x5d,
-    0xa4, 0x62, 0x33, 0x25, 0xee, 0xdc, 0xfa, 0x46, 0x0b, 0x69, 0xa3, 0xad, 0x8b, 0x1c, 0x6c, 0x56, 0xc9, 0x7b, 0x02,
-    0xe3, 0xb9, 0x20, 0x7c, 0xf9, 0x8a, 0x92, 0x74, 0x98, 0x63, 0x22, 0x58, 0xbd, 0x98, 0x8a, 0xfc, 0x9d, 0xa3, 0xd3,
-    0xec, 0x0d, 0x7a, 0x90, 0x7a, 0x03, 0x89, 0x59, 0x13, 0xdf, 0x85, 0x34, 0xd4, 0x11, 0x02, 0x95, 0x51, 0x2d, 0xd3,
-    0x71, 0x62, 0x15, 0xbe, 0x11, 0x7c, 0xf5, 0x56, 0x1f, 0xe7, 0x1b, 0xcf, 0x8d, 0xd5, 0x08, 0x62, 0xf0, 0x16, 0xf2,
-    0x81, 0x27, 0x45, 0x38, 0x10, 0x2e, 0xdf, 0xdc, 0xec, 0xe5, 0xbb, 0xbc, 0x0a, 0x91, 0x54, 0x30, 0xc6, 0x98, 0x51,
-    0x8c, 0x7b, 0xa2, 0xa6, 0x16, 0x73, 0x18, 0x58, 0xb6, 0x0e, 0x73, 0x3c, 0x00, 0x80, 0x96, 0xa6, 0xf4, 0xaa, 0xa9,
-    0x50, 0x79, 0x9e, 0x4b, 0xf8, 0x54, 0x87, 0xa8, 0xaa, 0xf1, 0xdb, 0xd5, 0x19, 0x28, 0x04, 0xf7, 0x5a, 0xc7, 0xc3,
-    0x43, 0x08, 0x58, 0x45, 0x21, 0x0b, 0xf4, 0x06, 0xed, 0x55, 0x89, 0x50, 0xcc, 0x9c, 0xac, 0xc7, 0x0c, 0x27, 0x15,
-    0x6c, 0xa1, 0x12, 0x96, 0x4a, 0x0b, 0xfc, 0x6a, 0x23, 0x34, 0x4f, 0x19, 0xf7, 0x5f, 0x55, 0x38, 0x83, 0xfe, 0x60,
-    0xde, 0x32, 0xa3, 0xbe, 0x5d, 0x3a, 0x91, 0xa9, 0xc0, 0xc4, 0xcd, 0x2c, 0xb5, 0xdf, 0xaf, 0xab, 0xb4, 0x9f, 0x57,
-    0xc8, 0x7d, 0x4e, 0x9a, 0xaf, 0x73, 0x07, 0xcd, 0x27, 0xc3, 0xfd, 0x4a, 0xf9, 0xa1, 0x85, 0x51, 0x53, 0x7e, 0x79,
-    0x5d, 0xf9, 0x15, 0x9e, 0x0a, 0x6f, 0xed, 0x75, 0x51, 0xe8, 0xa2, 0x3e, 0x07, 0x43, 0x48, 0x3f, 0x82, 0x6b, 0x68,
-    0xf0, 0xa0, 0x48, 0x16, 0x8b, 0xb5, 0x0b, 0xe2, 0xfa, 0x98, 0x53, 0xed, 0x50, 0xc6, 0x18, 0xf1, 0xb4, 0xe4, 0x20,
-    0xc9, 0xe0, 0x60, 0xfc, 0x06, 0x06, 0xc4, 0xa4, 0x24, 0xa4, 0x43, 0xe8, 0xac, 0xcc, 0x44, 0x54, 0xee, 0xe2, 0xed,
-    0xc6, 0x65, 0x4d, 0xa1, 0x08, 0x3b, 0xc1, 0x4c, 0xa5, 0x54, 0x10, 0x48, 0x93, 0x6f, 0xad, 0x53, 0x0b, 0x86, 0x16,
-    0xae, 0xa9, 0x80, 0xbc, 0xb6, 0xeb, 0x41, 0x93, 0xf7, 0x14, 0x43, 0x5f, 0xa5, 0x46, 0xbc, 0xcc, 0xe0, 0x6b, 0xd8,
-    0xfc, 0x35, 0x51, 0x92, 0x87, 0x4c, 0xc4, 0x5e, 0xc1, 0x27, 0x42, 0x36, 0x05, 0x3b, 0x13, 0xe8, 0x87, 0x76, 0x65,
-    0x2f, 0xdd, 0x2d, 0x2a, 0x97, 0x16, 0x8d, 0xad, 0x44, 0xcd, 0x9a, 0x1f, 0xc5, 0x9b, 0x29, 0xec, 0x67, 0x8f, 0x12,
-    0x08, 0x48, 0x53, 0x39, 0x49, 0x35, 0xef, 0x51, 0x3a, 0x00, 0x90, 0x60, 0xf7, 0x13, 0x58, 0xe8, 0x37, 0x25, 0x26,
-    0x58, 0x54, 0x8d, 0xdd, 0x66, 0xa0, 0x35, 0x67, 0xa4, 0xf9, 0x66, 0xa8, 0xb5, 0x37, 0x95, 0xf5, 0x8c, 0xd9, 0x01,
-    0xb6, 0xed, 0x6e, 0x16, 0x47, 0xe9, 0x66, 0x67, 0x60, 0x08, 0x2e, 0x3c, 0xfe, 0x4f, 0x4a, 0x4c, 0x03, 0xc9, 0xa5,
-    0x6e, 0xfc, 0x84, 0x3a, 0x0c, 0xff, 0x5b, 0x90, 0x02, 0xee, 0xd7, 0x56, 0x63, 0xc9, 0xb9, 0x57, 0x1c, 0x25, 0x97,
-    0x55, 0xb5, 0xab, 0x25, 0x68, 0xe8, 0x46, 0x32, 0x26, 0x8a, 0x79, 0x4e, 0x00, 0x8c, 0x62, 0xf3, 0xa7, 0x4c, 0x27,
-    0x79, 0xff, 0xba, 0x32, 0xb5, 0xdb, 0xf7, 0xfd, 0x28, 0x3f, 0xa5, 0x23, 0x15, 0x95, 0xcd, 0x49, 0xcc, 0xbf, 0x2d,
-    0xc0, 0x34, 0x27, 0x3e, 0xd2, 0x73, 0x0d, 0x42, 0x01, 0xbe, 0xb2, 0xa1, 0xd4, 0x6c, 0x8f, 0xff, 0xe8, 0x6c, 0xf7,
-    0x25, 0x51, 0x04, 0x0b, 0x34, 0xe8, 0x72, 0x0d, 0xbe, 0x80, 0x65, 0x70, 0x47, 0xfa, 0x29, 0xf8, 0x5e, 0x5e, 0x07,
-    0x9f, 0xb1, 0xff, 0x05, 0xa0, 0x55, 0x81, 0x01, 0xe5, 0x4e, 0xd3, 0xb0, 0x12, 0xe2, 0x12, 0x15, 0x66, 0x15, 0xe7,
-    0x8f, 0xeb, 0xbc, 0x6e, 0x5a, 0x96, 0x18, 0x94, 0x9f, 0xb9, 0x86, 0x1b, 0xdf, 0x6b, 0xe4, 0x8f, 0xef, 0x3f, 0x07,
-    0xdd, 0x4e, 0xa4, 0xdd, 0xd8, 0xc8, 0xd7, 0xc8, 0x42, 0xc3, 0x7b, 0x61, 0x33, 0x68, 0x8b, 0x74, 0xc9, 0xd5, 0x33,
-    0x16, 0xe3, 0x6d, 0x11, 0x2a, 0xc3, 0x07, 0x2c, 0x98, 0x01, 0x86, 0xe0, 0xb1, 0x53, 0x99, 0x7c, 0x86, 0x8d, 0xa6,
-    0xd8, 0x35, 0x17, 0x06, 0x1f, 0xa8, 0xca, 0x42, 0xf2, 0x62, 0x9d, 0x6c, 0xcf, 0xce, 0xe0, 0xf9, 0x65, 0x5c, 0x00,
-    0x75, 0x00, 0xfd, 0x8a, 0xca, 0x62, 0x03, 0xb9, 0xb8, 0x29, 0x6b, 0xbd, 0xa2, 0xd1, 0xe8, 0xc6, 0x2e, 0xac, 0xae,
-    0xc0, 0x27, 0x51, 0x3a, 0x4a, 0xc4, 0x24, 0x66, 0x52, 0xe5, 0x8a, 0x5c, 0x1b, 0xdd, 0x4b, 0x5b, 0x34, 0xcf, 0x85,
-    0x04, 0xaf, 0x08, 0xdc, 0x10, 0xfa, 0x4a, 0x5f, 0xae, 0x36, 0x50, 0xf0, 0xa8, 0xbd, 0xb9, 0x08, 0x26, 0x26, 0x1e,
-    0x33, 0xa4, 0xa6, 0x5f, 0x87, 0x53, 0x2b, 0x8b, 0x25, 0x87, 0x5f, 0xe7, 0x8c, 0x35, 0x14, 0x00, 0xf1, 0xc9, 0x83,
-    0xeb, 0xdd, 0xa4, 0x57, 0x4a, 0x3b, 0x28, 0x8d, 0x10, 0xdf, 0x55, 0xf8, 0xba, 0x0b, 0xc5, 0x57, 0xae, 0xba, 0xf7,
-    0x35, 0x65, 0xc6, 0x05, 0xa3, 0xe7, 0x7c, 0x9a, 0x34, 0xae, 0xdd, 0xd0, 0x5d, 0x9d, 0x9f, 0xbc, 0x1f, 0x65, 0xde,
-    0xc2, 0x14, 0xd8, 0x04, 0x54, 0xc1, 0x73, 0xef, 0xb5, 0x71, 0xa2, 0xfc, 0x9d, 0x79, 0xc4, 0x2b, 0x87, 0x59, 0x75,
-    0x92, 0xfc, 0x5d, 0xff, 0xbb, 0xe0, 0xfa, 0x96, 0xc6, 0x09, 0x72, 0x57, 0x9d, 0x20, 0x13, 0xe5, 0xa6, 0x7a, 0xc3,
-    0xed, 0xdf, 0x55, 0x20, 0x88, 0x53, 0x31, 0x7d, 0x54, 0x8e, 0xeb, 0x47, 0x0b, 0x54, 0x2a, 0x22, 0x3e, 0x55, 0xb9,
-    0x2b, 0xd7, 0xa6, 0x86, 0x7a, 0x5c, 0x27, 0xb3, 0xd0, 0x34, 0x2b, 0x72, 0x29, 0x9b, 0x1e, 0x23, 0xd3, 0xec, 0x54,
-    0x9b, 0xdf, 0xbd, 0xf6, 0x90, 0x8e, 0xa1, 0xb9, 0x58, 0xab, 0x05, 0xf7, 0xbb, 0x8a, 0xc2, 0xbb, 0x5e, 0x6c, 0xa4,
-    0x32, 0xd4, 0xac, 0x47, 0xd1, 0xc7, 0x71, 0x9b, 0xb9, 0x3c, 0xca, 0xfe, 0xac, 0x01, 0x60, 0x3a, 0xc2, 0xa2, 0xbb,
-    0xe9, 0x19, 0x7b, 0x02, 0x3d, 0x3d, 0x91, 0x41, 0xa2, 0xd7, 0x3a, 0x5f, 0xb5, 0x4a, 0x2c, 0x5d, 0x41, 0x60, 0xf7,
-    0x86, 0x8c, 0x55, 0x49, 0xbb, 0xe5, 0xfa, 0xe5, 0x3c, 0x9f, 0xa7, 0x7c, 0x29, 0xcf, 0xa7, 0x66, 0xd1, 0xad, 0xb5,
-    0xdd, 0x9b, 0x53, 0x43, 0xc5, 0x5c, 0xab, 0x9b, 0xfc, 0x81, 0xe9, 0x3a, 0x18, 0x6a, 0x11, 0x64, 0x56, 0xbb, 0xea,
-    0x59, 0x59, 0x4e, 0xeb, 0x99, 0x1c, 0x53, 0xe1, 0x9b, 0x4a, 0x77, 0x88, 0x6e, 0x98, 0xaa, 0x99, 0x7e, 0x6a, 0x6c,
-    0x0b, 0xd9, 0xe6, 0xf9, 0xe5, 0x28, 0x07, 0x4a, 0xcb, 0xfd, 0x65, 0xc2, 0xf0, 0xd3, 0xd5, 0xd5, 0x4f, 0x42, 0x4e,
-    0x55, 0x1d, 0xbd, 0xc5, 0x4b, 0xdd, 0x33, 0x98, 0x96, 0xca, 0x89, 0x38, 0x61, 0xab, 0x07, 0x6f, 0xee, 0x5e, 0x01,
-    0xcb, 0x09, 0x60, 0x77, 0xc2, 0x9c, 0xc6, 0x50, 0xd5, 0x06, 0xfe, 0x71, 0xf5, 0x60, 0xab, 0xf6, 0xf0, 0x8f, 0xfd,
-    0x1f, 0x83, 0x1b, 0x1b, 0x1b, 0xdb, 0x78, 0xbb, 0x96, 0x08, 0xf2, 0x0a, 0x0f, 0xf4, 0xf1, 0xea, 0xa3, 0xa0, 0xe5,
-    0x2a, 0xb1, 0xdd, 0x77, 0x28, 0x6c, 0x0d, 0xf2, 0x4d, 0xca, 0xa4, 0xe1, 0xbc, 0xe0, 0xd9, 0x54, 0xce, 0x50, 0xc8,
-    0x6b, 0x3e, 0x0e, 0xda, 0x8e, 0xf0, 0x37, 0x70, 0x6a, 0xc7, 0xcb, 0x8b, 0x4f, 0xd0, 0x07, 0x3c, 0x5d, 0x29, 0x4d,
-    0x45, 0x9c, 0x52, 0x6e, 0xd1, 0xe5, 0x3a, 0x0f, 0x46, 0x8a, 0x8b, 0x09, 0x2a, 0x1d, 0x77, 0x71, 0xe3, 0x6c, 0xe4,
-    0xf4, 0x97, 0x78, 0x75, 0x91, 0x2e, 0x1f, 0x89, 0x6c, 0xd5, 0xd2, 0xfb, 0x5d, 0x9f, 0x6e, 0xdb, 0x53, 0xc6, 0x27,
-    0xd9, 0x88, 0x0e, 0x66, 0x7c, 0x9c, 0x08, 0xaf, 0x4f, 0x8c, 0xf4, 0xdd, 0x22, 0x30, 0xdd, 0x1c, 0x9b, 0xfc, 0x70,
-    0xbc, 0xde, 0x6c, 0xd6, 0xb8, 0xfd, 0x37, 0xce, 0x13, 0x67, 0x51, 0x62, 0x44, 0x65, 0xa1, 0xe1, 0x01, 0xad, 0x10,
-    0x37, 0xef, 0x99, 0xc0, 0xb8, 0xec, 0x92, 0xa4, 0xb6, 0x1b, 0x08, 0x5c, 0xec, 0x71, 0xcc, 0x92, 0x91, 0xed, 0x41,
-    0x79, 0xa0, 0x2f, 0x46, 0xd3, 0x2d, 0x60, 0x5a, 0x5e, 0x3b, 0x3b, 0x4f, 0x6d, 0xaf, 0x9a, 0x2a, 0x80, 0x59, 0xb2,
-    0x3c, 0x3e, 0x45, 0xd6, 0xfd, 0x16, 0xba, 0x88, 0x01, 0x63, 0xe3, 0xca, 0x9c, 0xbb, 0x58, 0xb5, 0x22, 0xbe, 0xd1,
-    0x44, 0x9a, 0xd4, 0x47, 0xd4, 0x77, 0x10, 0xd6, 0xea, 0x2a, 0x07, 0x09, 0xdc, 0x23, 0xef, 0x8e, 0xb8, 0xf4, 0xf4,
-    0x99, 0xc5, 0xb8, 0x4a, 0xdf, 0x52, 0xd7, 0xe2, 0x9a, 0x61, 0xaf, 0xb8, 0x0f, 0xf6, 0x07, 0xc6, 0x2d, 0x62, 0x11,
-    0x6f, 0xe7, 0xb5, 0x14, 0xd6, 0xc6, 0x1c, 0x68, 0x6e, 0xb8, 0xc1, 0xef, 0xac, 0x5a, 0x33, 0x30, 0xc3, 0x8c, 0x33,
-    0x92, 0xdf, 0x8d, 0x7b, 0x55, 0x63, 0x47, 0xae, 0x02, 0x88, 0xbe, 0x05, 0x5d, 0x92, 0xc3, 0x2b, 0x59, 0xae, 0x3a,
-    0x43, 0xfe, 0x0d, 0xd6, 0x59, 0x2f, 0x4e, 0xc0, 0x4c, 0x9a, 0xf2, 0x12, 0x13, 0x53, 0xc4, 0xe5, 0x66, 0x19, 0xf3,
-    0x34, 0x7d, 0x16, 0xed, 0xe0, 0xe4, 0x46, 0x02, 0x47, 0xec, 0x1b, 0xcb, 0xd0, 0x4c, 0xd8, 0x88, 0x89, 0x34, 0x2a,
-    0xa5, 0x84, 0xf7, 0xe5, 0x52, 0x4b, 0xfe, 0x32, 0x97, 0x57, 0x5f, 0x6e, 0x13, 0x1c, 0x90, 0xd7, 0xc0, 0x72, 0x68,
-    0x1c, 0xb7, 0x0c, 0x24, 0x62, 0x31, 0x20, 0x46, 0xad, 0xca, 0xe5, 0x64, 0x54, 0x27, 0xf3, 0x15, 0x72, 0xa1, 0x22,
-    0x0f, 0x6e, 0x09, 0x94, 0xfc, 0x39, 0xa6, 0x0e, 0x66, 0xa5, 0x76, 0xd3, 0x62, 0x93, 0xe4, 0x3d, 0x33, 0x20, 0xb9,
-    0xfa, 0x1a, 0x1e, 0x1a, 0xbf, 0x78, 0x65, 0x4e, 0x09, 0x5f, 0x94, 0xb1, 0xb4, 0x34, 0xe6, 0xd2, 0xbf, 0x90, 0xf7,
-    0x69, 0x25, 0x60, 0xbf, 0x81, 0x98, 0x32, 0x70, 0x89, 0x8d, 0x0b, 0x92, 0xf2, 0x5a, 0x9e, 0xb2, 0xfb, 0x1a, 0xca,
-    0x77, 0xc9, 0xa4, 0xab, 0x54, 0xd6, 0x35, 0x56, 0xdd, 0x6f, 0x73, 0x96, 0x5f, 0x1e, 0x30, 0xcc, 0x4d, 0x46, 0x83,
-    0x6c, 0xc9, 0xcc, 0xa6, 0xfc, 0x6a, 0xef, 0xc6, 0xaf, 0x3c, 0x94, 0x74, 0xa8, 0x56, 0xe9, 0xe6, 0xa5, 0x1b, 0x8e,
-    0x71, 0xe3, 0x86, 0x23, 0x80, 0x8d, 0x61, 0xa7, 0x8a, 0xd4, 0x3a, 0xff, 0x7d, 0x39, 0xfc, 0x44, 0x7b, 0x6d, 0xa0,
-    0x77, 0xdd, 0x60, 0x65, 0x7a, 0xfa, 0x0d, 0xa8, 0x1a, 0x59, 0x42, 0x37, 0xa1, 0x8a, 0xc9, 0x48, 0x94, 0x98, 0xae,
-    0x52, 0x1e, 0xf5, 0x35, 0xe2, 0x1c, 0xc4, 0x0d, 0xe5, 0x2f, 0xfe, 0x35, 0xbc, 0x3c, 0x0e, 0xd0, 0x88, 0x5a, 0x8c,
-    0xb3, 0x94, 0xb7, 0xc6, 0xd1, 0x34, 0x4e, 0x2e, 0x83, 0x79, 0xdc, 0x9a, 0x66, 0x69, 0x56, 0xcc, 0x80, 0x2b, 0xbd,
-    0xe2, 0x12, 0x6c, 0xf8, 0x69, 0x6b, 0x1e, 0x7b, 0xcf, 0x59, 0x72, 0xc6, 0x78, 0x3c, 0x8c, 0x3c, 0x7b, 0x3f, 0x07,
-    0xf1, 0x60, 0xbd, 0x8e, 0xf2, 0x3c, 0x3b, 0xb7, 0xbd, 0x77, 0xd9, 0x09, 0x30, 0xad, 0xf7, 0xe6, 0xe2, 0xf2, 0x94,
-    0xa5, 0xde, 0xfb, 0x93, 0x79, 0xca, 0xe7, 0x5e, 0x11, 0xa5, 0x45, 0xab, 0x60, 0x79, 0x3c, 0x06, 0x35, 0x91, 0x64,
-    0x79, 0x0b, 0xf3, 0x9f, 0xa7, 0x2c, 0x48, 0xe2, 0xd3, 0x09, 0xb7, 0x46, 0x51, 0xfe, 0xa9, 0xd7, 0x6a, 0xcd, 0xf2,
-    0x78, 0x1a, 0xe5, 0x97, 0x2d, 0x6a, 0x11, 0x7c, 0xd1, 0xde, 0x8e, 0xbe, 0x1a, 0xdf, 0xef, 0xf1, 0x1c, 0xfa, 0xc6,
-    0x48, 0xc5, 0x00, 0x84, 0x8f, 0xb5, 0xbd, 0xd3, 0x9e, 0x16, 0x6b, 0xe2, 0x44, 0x29, 0x4a, 0x79, 0x79, 0xec, 0x7d,
-    0x64, 0x00, 0xb7, 0x7f, 0xc2, 0x53, 0x0f, 0x7c, 0x39, 0x9e, 0xa5, 0x8b, 0xe1, 0x3c, 0x2f, 0x60, 0x80, 0x59, 0x16,
-    0xa7, 0x9c, 0xe5, 0xbd, 0x93, 0x2c, 0x07, 0xb2, 0xb5, 0xf2, 0x68, 0x14, 0xcf, 0x8b, 0xe0, 0xfe, 0xec, 0xa2, 0x87,
-    0xb6, 0xc2, 0x69, 0x9e, 0xcd, 0xd3, 0x91, 0x9c, 0x2b, 0x4e, 0x61, 0x63, 0xc4, 0xdc, 0xac, 0xa0, 0x2f, 0xa1, 0x00,
-    0x7c, 0x29, 0x8b, 0xf2, 0xd6, 0x29, 0x76, 0x46, 0x43, 0xbf, 0x3d, 0x62, 0xa7, 0x5e, 0x7e, 0x7a, 0x12, 0x39, 0x9d,
-    0xee, 0x43, 0x4f, 0xfd, 0xf3, 0x77, 0x5c, 0x30, 0xdc, 0x57, 0x16, 0x77, 0xda, 0xed, 0x7f, 0x70, 0x7b, 0x8d, 0x59,
-    0x08, 0xa0, 0xa0, 0x33, 0xbb, 0xb0, 0x8a, 0x2c, 0x81, 0xf5, 0x59, 0xd5, 0xb3, 0x37, 0x03, 0xbf, 0x29, 0x4e, 0x4f,
-    0x83, 0xee, 0xec, 0xa2, 0x44, 0xec, 0x02, 0x91, 0x90, 0x29, 0x91, 0x94, 0x6f, 0x8b, 0x3f, 0x0a, 0xf1, 0xa3, 0xd5,
-    0x10, 0x77, 0x15, 0xc4, 0x15, 0xd5, 0x5b, 0x23, 0xd8, 0x07, 0x44, 0xfe, 0x4e, 0x21, 0x00, 0x99, 0x80, 0x13, 0x98,
-    0x2b, 0x38, 0xe8, 0xe5, 0x0f, 0x83, 0xd1, 0x5d, 0x0d, 0xc6, 0xa3, 0xdb, 0xc0, 0xc8, 0xd3, 0xd1, 0xa2, 0xbe, 0xae,
-    0x1d, 0x70, 0x4e, 0x7b, 0x13, 0x86, 0xfc, 0x14, 0x74, 0xf1, 0xf9, 0x3c, 0x1e, 0xf1, 0x89, 0x78, 0x24, 0x76, 0x3e,
-    0x17, 0x75, 0x3b, 0xed, 0xb6, 0x78, 0x2f, 0x40, 0xa1, 0x05, 0x1d, 0x1f, 0x1b, 0x00, 0x13, 0x7d, 0xb8, 0xee, 0x23,
-    0x36, 0x5f, 0xdf, 0xfa, 0xa5, 0x1a, 0xef, 0x5c, 0xe5, 0x0d, 0x0a, 0x15, 0xa1, 0xbe, 0xd9, 0x82, 0x19, 0x6f, 0xf9,
-    0x5e, 0x47, 0x1f, 0x54, 0xf5, 0xbf, 0x66, 0xa4, 0xf5, 0x02, 0xee, 0x99, 0xb9, 0x40, 0xbd, 0x74, 0x0f, 0x43, 0x52,
-    0xad, 0x96, 0x0b, 0x7a, 0x83, 0x61, 0x08, 0x89, 0x0e, 0x04, 0x9d, 0xbc, 0x5f, 0xd0, 0x37, 0x35, 0x32, 0x37, 0x28,
-    0x9c, 0xcc, 0x85, 0x2d, 0x9f, 0x69, 0xb9, 0x0e, 0x4a, 0x1a, 0xbc, 0xec, 0x0f, 0x4c, 0x36, 0x00, 0xe9, 0x4d, 0xa1,
-    0xae, 0x1f, 0x42, 0xe1, 0x4a, 0x29, 0x47, 0x6a, 0x7a, 0xd3, 0x15, 0x7d, 0x58, 0x95, 0x98, 0x32, 0x92, 0x8f, 0x06,
-    0xff, 0x0a, 0xc3, 0xde, 0xd1, 0x8e, 0x65, 0x91, 0xcd, 0xf3, 0x21, 0x45, 0xea, 0x96, 0x3d, 0x7e, 0x9b, 0x14, 0xae,
-    0xed, 0x31, 0x2d, 0xe7, 0xd1, 0x0d, 0xae, 0x7d, 0xe4, 0x80, 0xd3, 0x21, 0x88, 0xb8, 0x63, 0x20, 0xa3, 0x1c, 0x0a,
-    0x42, 0x54, 0x5d, 0x23, 0xca, 0x77, 0xa3, 0xfb, 0x97, 0xfe, 0x3c, 0x8d, 0x41, 0xd2, 0x7d, 0x8c, 0x47, 0x74, 0xef,
-    0x24, 0x1e, 0xd1, 0x41, 0x44, 0x8b, 0x12, 0x8f, 0x30, 0xb2, 0x0d, 0x05, 0xea, 0x3b, 0x2c, 0xf0, 0x2c, 0x13, 0x59,
-    0xec, 0x96, 0x8d, 0x87, 0x09, 0x86, 0xaa, 0x1c, 0x65, 0xd3, 0x28, 0x4e, 0x03, 0xfc, 0x3e, 0x88, 0xa7, 0x47, 0x0c,
-    0xb0, 0x8b, 0x07, 0x3f, 0x99, 0xcc, 0x45, 0xeb, 0xb8, 0xfe, 0xaf, 0x20, 0x47, 0xa8, 0x7f, 0x29, 0xfd, 0x30, 0x0d,
-    0x97, 0x3a, 0xe6, 0xad, 0x97, 0x82, 0xec, 0xe1, 0xca, 0x66, 0x65, 0x14, 0xe7, 0xd8, 0xe5, 0xf4, 0xa3, 0xdf, 0xea,
-    0x04, 0x1d, 0xed, 0xba, 0xd6, 0x6e, 0xa3, 0x8a, 0x5c, 0x16, 0x79, 0xa3, 0x91, 0x60, 0xd0, 0xcf, 0x02, 0xce, 0xea,
-    0x5d, 0xc3, 0xea, 0x49, 0xbe, 0xc4, 0x00, 0xce, 0x69, 0xea, 0xd4, 0x80, 0xa0, 0xb3, 0x80, 0x6b, 0xa6, 0x72, 0xcb,
-    0x88, 0x94, 0xd2, 0x63, 0xda, 0xc0, 0xf5, 0xbb, 0x44, 0x78, 0x6f, 0xa8, 0x9e, 0x02, 0xa5, 0x58, 0x6e, 0x74, 0xbc,
-    0x2b, 0x76, 0xbc, 0x45, 0x3c, 0x16, 0xda, 0xb0, 0x05, 0x6d, 0xeb, 0x2f, 0x43, 0xa0, 0xd2, 0xa7, 0xd0, 0x5e, 0x5f,
-    0x38, 0x2a, 0xb1, 0x3e, 0x87, 0xb9, 0xf6, 0x85, 0xd6, 0xa3, 0x1b, 0xf9, 0xf6, 0xde, 0xfa, 0x82, 0x97, 0xbb, 0x5b,
-    0xa2, 0xf7, 0xde, 0x71, 0x59, 0x90, 0x82, 0x32, 0x03, 0x69, 0xd5, 0x14, 0xa2, 0x0e, 0x86, 0xa5, 0xf4, 0x5d, 0x1c,
-    0x37, 0xd7, 0x46, 0x97, 0x88, 0x18, 0x4b, 0xb6, 0x2b, 0x30, 0x5d, 0x29, 0xca, 0x61, 0x4f, 0xea, 0x84, 0x94, 0x42,
-    0xe4, 0x60, 0xf4, 0x96, 0xa1, 0x38, 0x46, 0x08, 0xfa, 0xeb, 0x8b, 0xb8, 0x0c, 0xd7, 0x17, 0x59, 0x79, 0x0c, 0x96,
-    0x09, 0x42, 0x95, 0xab, 0xcf, 0xbb, 0xc0, 0xc4, 0x22, 0xc8, 0x62, 0xd1, 0x08, 0x38, 0x2d, 0x2b, 0x6d, 0xab, 0x2f,
-    0xa0, 0x01, 0x0f, 0x10, 0x0b, 0xc0, 0x76, 0xa3, 0x5e, 0x0c, 0x70, 0x11, 0xad, 0xf7, 0x60, 0xa0, 0xdd, 0x2d, 0xd1,
-    0x08, 0xf0, 0xca, 0x11, 0xe4, 0x0a, 0x2d, 0x4c, 0xc7, 0x31, 0x51, 0x1b, 0xc5, 0x67, 0x9a, 0x74, 0x94, 0x9b, 0xbc,
-    0xb7, 0x9b, 0x44, 0x27, 0x2c, 0x81, 0x21, 0x8b, 0xab, 0xab, 0x36, 0x8c, 0x24, 0x5e, 0xad, 0xdd, 0x38, 0x9d, 0xcd,
-    0xe5, 0x67, 0xb6, 0x60, 0xe2, 0x0e, 0x9e, 0x7c, 0xe2, 0x2d, 0x80, 0xbe, 0x3a, 0xca, 0x0b, 0xe4, 0x00, 0x00, 0x22,
-    0x9d, 0x22, 0x20, 0x74, 0x15, 0x5b, 0x40, 0x69, 0x3c, 0x5a, 0x2e, 0xd3, 0x98, 0xe5, 0xf0, 0x02, 0xdb, 0x72, 0x86,
-    0xcf, 0x29, 0x3c, 0x4f, 0xe3, 0x14, 0x1f, 0x0b, 0x7c, 0x8c, 0x2e, 0xf0, 0x31, 0x2b, 0xed, 0xbf, 0xcb, 0x0a, 0x58,
-    0x9a, 0x00, 0xd9, 0xd5, 0x15, 0xc8, 0x7b, 0x4d, 0x82, 0xdd, 0x2d, 0x20, 0x16, 0x72, 0x8a, 0xf8, 0xe8, 0x0a, 0x33,
-    0xc9, 0xc8, 0x8a, 0x59, 0x4b, 0x94, 0x5b, 0xa4, 0x55, 0x43, 0x70, 0xba, 0x72, 0xa7, 0x61, 0x3c, 0x78, 0x32, 0xbd,
-    0xe4, 0x09, 0xbe, 0xb8, 0xb6, 0x25, 0xbe, 0x8a, 0x21, 0x88, 0x42, 0x8f, 0x88, 0xa1, 0x2e, 0xe3, 0xf2, 0x7b, 0x37,
-    0x71, 0x68, 0xe3, 0x2c, 0x60, 0xbf, 0xa1, 0x16, 0xe0, 0x51, 0x9c, 0x88, 0xc6, 0x2b, 0xf0, 0x69, 0xe4, 0x09, 0x12,
-    0x3a, 0xbb, 0x5b, 0x15, 0x6c, 0x00, 0xfc, 0x50, 0xdc, 0xb2, 0x76, 0x44, 0x0e, 0xa4, 0x2d, 0xca, 0xe9, 0xec, 0x5c,
-    0x6e, 0x69, 0x19, 0xd9, 0x15, 0xb1, 0x72, 0x8d, 0x2a, 0xe5, 0x2c, 0xda, 0xe3, 0x28, 0x5d, 0xd5, 0x14, 0xa0, 0x9f,
-    0x31, 0x36, 0xf2, 0x6c, 0x0b, 0x64, 0xa9, 0x78, 0xfe, 0x98, 0xb0, 0x33, 0x26, 0xbf, 0x94, 0xa2, 0x07, 0xd1, 0x95,
-    0x43, 0x50, 0xc9, 0x5c, 0x5e, 0xe2, 0x94, 0xec, 0xa9, 0x70, 0x94, 0x94, 0xa8, 0x23, 0xe2, 0xd9, 0xc6, 0xa0, 0xcd,
-    0x39, 0xda, 0xf5, 0x61, 0xbd, 0x0e, 0x58, 0xbb, 0xb6, 0x80, 0x97, 0xec, 0xb8, 0xdb, 0x91, 0x83, 0x01, 0xd8, 0x78,
-    0x0c, 0xdb, 0x45, 0x45, 0x96, 0xb5, 0x2c, 0x10, 0x50, 0x81, 0x53, 0xea, 0xd9, 0xa2, 0x85, 0x5d, 0xb5, 0xd5, 0x4f,
-    0x92, 0x38, 0x49, 0x36, 0xfc, 0xb4, 0x62, 0x2e, 0xe0, 0x8e, 0x75, 0x11, 0x69, 0x6d, 0xc8, 0x37, 0xfb, 0x5f, 0xfe,
-    0xf9, 0xbf, 0xff, 0x67, 0x18, 0x98, 0xfa, 0xb9, 0xa5, 0x75, 0x7d, 0xab, 0xff, 0x06, 0xad, 0xe6, 0xe9, 0x2d, 0xed,
-    0xfe, 0xf6, 0x1f, 0xfe, 0x0b, 0x34, 0xa3, 0x1b, 0x39, 0x6e, 0x79, 0x4c, 0x10, 0x0d, 0xd1, 0x08, 0xfa, 0x2c, 0x90,
-    0x6a, 0x83, 0x5c, 0x3b, 0xd3, 0x3f, 0x21, 0xd8, 0x05, 0xcf, 0x66, 0x37, 0x82, 0x83, 0x50, 0x0f, 0x93, 0xac, 0x60,
-    0x1a, 0x1e, 0x21, 0x6b, 0x3f, 0x0f, 0x20, 0x9a, 0x6b, 0x06, 0x5c, 0x5e, 0x58, 0x7a, 0x1c, 0xb1, 0x3c, 0xab, 0xc6,
-    0x69, 0xac, 0x5e, 0xc1, 0x38, 0xa1, 0x43, 0x71, 0x05, 0x58, 0x2f, 0xf1, 0x04, 0x0f, 0x24, 0x10, 0xdc, 0xfa, 0x57,
-    0xbe, 0x56, 0x0f, 0xa6, 0xf9, 0x53, 0x8c, 0x25, 0x42, 0x29, 0x6a, 0x04, 0xf8, 0x09, 0x72, 0xea, 0xa3, 0x7e, 0x8e,
-    0x2e, 0xf4, 0x33, 0xca, 0x32, 0x31, 0x01, 0xe8, 0xa2, 0x29, 0x9a, 0x19, 0xe6, 0x0c, 0x22, 0x0d, 0xa0, 0xf2, 0x23,
-    0x8d, 0x6c, 0x12, 0x21, 0xbc, 0x3e, 0x62, 0xd2, 0x25, 0x5e, 0xb1, 0x99, 0xe7, 0xec, 0x63, 0x92, 0x9d, 0x63, 0x70,
-    0x0a, 0x89, 0x74, 0x5d, 0x7d, 0x69, 0xf9, 0xbe, 0x75, 0x4d, 0xf5, 0x04, 0x76, 0x01, 0xd8, 0x92, 0x3c, 0xd4, 0x54,
-    0x6e, 0x20, 0xb5, 0x7a, 0x48, 0xc4, 0x72, 0x75, 0x8d, 0x44, 0x1b, 0x4b, 0x25, 0xd6, 0xf2, 0x11, 0x91, 0xf6, 0xda,
-    0x15, 0x53, 0xdc, 0x3e, 0x0f, 0xc2, 0x76, 0xcd, 0x44, 0x58, 0x75, 0xeb, 0x4c, 0xc7, 0x6e, 0x70, 0x03, 0x65, 0x3e,
-    0x13, 0xeb, 0xd5, 0x80, 0xdc, 0x01, 0x06, 0x0f, 0x34, 0x80, 0xd0, 0x11, 0x4f, 0x84, 0x84, 0x0f, 0x68, 0x2d, 0xa4,
-    0xb8, 0xaf, 0x41, 0xe4, 0x59, 0xff, 0xe7, 0x7f, 0x1e, 0xd2, 0x1c, 0xd8, 0x26, 0xae, 0xf4, 0x2b, 0x99, 0x23, 0x27,
-    0xb9, 0x52, 0xbf, 0xaf, 0xf0, 0x82, 0x1d, 0x8d, 0x82, 0x4a, 0xb6, 0x20, 0x9b, 0x80, 0x93, 0x4d, 0x60, 0xea, 0x61,
-    0xf4, 0x32, 0xb2, 0xd5, 0xfa, 0xf6, 0x23, 0xf6, 0xab, 0x69, 0x4c, 0x2e, 0x35, 0x66, 0x2c, 0xad, 0x59, 0xa9, 0x31,
-    0xf1, 0xfb, 0x29, 0x0d, 0x8d, 0x19, 0x5f, 0xab, 0x31, 0x91, 0x76, 0x7d, 0x1c, 0x39, 0xb4, 0x37, 0x31, 0x94, 0x62,
-    0x68, 0x70, 0x8e, 0xb6, 0x09, 0xf8, 0xcf, 0xc3, 0x4f, 0xd2, 0x34, 0x21, 0xc8, 0x31, 0x96, 0x20, 0x8d, 0x2d, 0xb2,
-    0x4b, 0x04, 0x76, 0xc7, 0xa5, 0xde, 0xf8, 0xf8, 0x68, 0x4c, 0xc0, 0xdd, 0xc5, 0x98, 0xa1, 0x58, 0x3e, 0xde, 0xc2,
-    0x21, 0xc4, 0x7e, 0x29, 0xe9, 0x19, 0x90, 0xda, 0xa2, 0x71, 0xbc, 0x85, 0x08, 0x4a, 0x05, 0xf6, 0xdb, 0x37, 0x07,
-    0x87, 0xb6, 0x77, 0x92, 0x8d, 0x2e, 0x03, 0x1b, 0x1c, 0x0a, 0x30, 0x3e, 0x5c, 0x9f, 0x4f, 0x58, 0xea, 0x28, 0x93,
-    0x3e, 0x4b, 0xc0, 0xa5, 0xc9, 0x4e, 0xc5, 0x37, 0x14, 0x9a, 0x01, 0x75, 0x20, 0x26, 0x7d, 0x64, 0x71, 0x6f, 0x97,
-    0x8b, 0xef, 0x8f, 0xf2, 0x1c, 0x1f, 0xf7, 0x30, 0xa5, 0x60, 0x77, 0x0b, 0x1e, 0xf0, 0xe5, 0x00, 0xd5, 0x91, 0x7e,
-    0x13, 0x70, 0x16, 0xe2, 0x7d, 0x0b, 0xdb, 0x6f, 0xa9, 0xbe, 0x08, 0xc5, 0x9e, 0x64, 0x35, 0x6d, 0x75, 0x57, 0xa6,
-    0x1c, 0x8d, 0x3d, 0x42, 0x4b, 0x8d, 0xac, 0x6e, 0x20, 0x05, 0x1f, 0xe9, 0x12, 0xa1, 0xfd, 0x8d, 0x22, 0x1a, 0xa5,
-    0xd2, 0xd5, 0xb2, 0x0a, 0x27, 0x24, 0x2a, 0x8a, 0xc9, 0xe0, 0x27, 0x81, 0x7f, 0x6c, 0x7e, 0x2f, 0x4c, 0x7c, 0xda,
-    0x47, 0x23, 0x79, 0xf4, 0x57, 0xef, 0x23, 0xf3, 0x2e, 0x8f, 0xa9, 0xa5, 0x72, 0x4e, 0x31, 0x6a, 0x82, 0x4e, 0x7c,
-    0x5b, 0x45, 0x21, 0xc0, 0x3c, 0x49, 0xa2, 0x59, 0xc1, 0x02, 0xf5, 0x20, 0xfd, 0x54, 0x74, 0x77, 0x97, 0x03, 0x03,
-    0xa6, 0x19, 0x53, 0xf2, 0xc9, 0xc2, 0x74, 0x64, 0x1f, 0x80, 0x23, 0x8b, 0x49, 0xf8, 0xad, 0x08, 0x94, 0x6f, 0x1a,
-    0x24, 0x6c, 0xcc, 0x4b, 0x8e, 0xb7, 0xbc, 0x17, 0x2a, 0x72, 0xe0, 0x77, 0x77, 0xc0, 0xb9, 0xb5, 0x7c, 0xfc, 0xff,
-    0xb6, 0xb1, 0x47, 0x41, 0x0a, 0xce, 0x28, 0x5d, 0xfb, 0xc0, 0x2b, 0x75, 0x00, 0x91, 0xf9, 0xbe, 0x30, 0x26, 0x1a,
-    0x32, 0x8c, 0xaa, 0x94, 0x3c, 0x07, 0xb1, 0xed, 0xf1, 0xdc, 0x6c, 0x07, 0xe2, 0x76, 0x29, 0xb4, 0xb2, 0xec, 0xdc,
-    0x6f, 0xbb, 0xd2, 0x05, 0x58, 0x6e, 0xac, 0x22, 0x24, 0xf5, 0xb7, 0x25, 0x0a, 0x19, 0xb1, 0x9c, 0x52, 0x68, 0x9a,
-    0x85, 0xe8, 0x61, 0xe2, 0xb4, 0x1c, 0xe5, 0xb9, 0xd5, 0x50, 0x2c, 0x69, 0xc7, 0x1f, 0xd1, 0x8e, 0x27, 0x19, 0x36,
-    0x58, 0x88, 0xb9, 0x87, 0x51, 0x32, 0x74, 0x10, 0x00, 0xab, 0x65, 0x3d, 0x02, 0x6a, 0xba, 0x2a, 0xd2, 0xe0, 0x3f,
-    0x44, 0xe2, 0x96, 0x42, 0xe2, 0xad, 0xa0, 0xd2, 0xf1, 0xa0, 0x2c, 0x7b, 0xe7, 0xcc, 0x39, 0xfa, 0x5d, 0x5e, 0x1a,
-    0x10, 0x77, 0x45, 0xf5, 0xf7, 0xf6, 0xda, 0xa5, 0x3b, 0xf0, 0x7e, 0x30, 0x3e, 0x62, 0x66, 0x2b, 0x86, 0xb6, 0x3d,
-    0x58, 0x86, 0x1f, 0x42, 0xec, 0xfb, 0xca, 0xb1, 0xd1, 0xb2, 0xa4, 0x9a, 0xcb, 0x16, 0xf1, 0x97, 0x8d, 0xdd, 0x44,
-    0xc8, 0xfb, 0xfb, 0xeb, 0x22, 0x17, 0xdf, 0xdc, 0x1e, 0xb9, 0x60, 0x77, 0x8c, 0x5c, 0x7c, 0xf3, 0x27, 0x47, 0x2e,
-    0xbe, 0x6f, 0x46, 0x2e, 0x7e, 0xfb, 0x9c, 0xc8, 0x45, 0x9e, 0x9d, 0x17, 0x61, 0x47, 0x9e, 0x94, 0x83, 0xcc, 0xf9,
-    0xfb, 0x84, 0x30, 0x60, 0xa2, 0x46, 0x00, 0x83, 0x22, 0x16, 0x22, 0xb9, 0x0f, 0x24, 0xbb, 0x8c, 0x17, 0xb4, 0x75,
-    0x16, 0x5d, 0xeb, 0xbe, 0xba, 0x36, 0x04, 0x1e, 0x9b, 0xab, 0x2f, 0xbc, 0x75, 0x55, 0x44, 0x21, 0xa0, 0xef, 0x7e,
-    0xea, 0x8e, 0xdd, 0x4d, 0x95, 0xbe, 0x65, 0x8e, 0xd0, 0x53, 0x51, 0x79, 0xc1, 0x3e, 0x0b, 0xfb, 0xdf, 0x1d, 0x75,
-    0x7a, 0xdb, 0x9d, 0x29, 0xf4, 0x06, 0x2d, 0x0a, 0x6f, 0xed, 0xde, 0xf6, 0x36, 0xbe, 0x9d, 0xab, 0xb7, 0x2e, 0xbe,
-    0xc5, 0xea, 0x6d, 0x07, 0xdf, 0x86, 0xea, 0xed, 0x01, 0xbe, 0x8d, 0xd4, 0xdb, 0x43, 0x7c, 0x3b, 0xb3, 0xcb, 0x23,
-    0xae, 0x81, 0x7b, 0x08, 0x7c, 0x45, 0xc6, 0x7e, 0xa0, 0xca, 0x60, 0xd3, 0xe2, 0x75, 0xbb, 0xe8, 0x34, 0x88, 0x3d,
-    0xe1, 0x14, 0x05, 0xb9, 0x77, 0x0e, 0x92, 0x3f, 0xa0, 0xec, 0xb2, 0xa7, 0xf8, 0xdd, 0x05, 0xf0, 0x21, 0x0e, 0xe3,
-    0x29, 0x53, 0x1f, 0xa0, 0x55, 0x58, 0x83, 0x1d, 0x79, 0xd4, 0x1e, 0x94, 0x3d, 0xbd, 0x4e, 0x22, 0x60, 0xa2, 0x4e,
-    0xef, 0x69, 0xe5, 0xaa, 0x3a, 0x31, 0x5d, 0x4b, 0xaf, 0xf0, 0x35, 0x7a, 0xc4, 0x70, 0xa3, 0xc7, 0x60, 0x21, 0xb5,
-    0x2e, 0xc0, 0xf1, 0x5a, 0xa9, 0x5b, 0x10, 0x22, 0xad, 0x4d, 0x08, 0x27, 0xfd, 0x76, 0x18, 0x9d, 0xea, 0xe7, 0x57,
-    0x60, 0xf0, 0x46, 0xa7, 0xec, 0x36, 0x3d, 0x43, 0x20, 0x9a, 0x3a, 0x46, 0x01, 0x41, 0xf6, 0x10, 0x2c, 0x0d, 0x3a,
-    0x80, 0x52, 0xc7, 0x20, 0x75, 0xea, 0x5a, 0x87, 0xa6, 0xaf, 0x17, 0x01, 0x45, 0xab, 0x82, 0x5d, 0xb0, 0xbb, 0xa9,
-    0x54, 0x50, 0x18, 0x2a, 0xb0, 0xe0, 0x46, 0x55, 0xa4, 0x7d, 0xe4, 0x6b, 0x15, 0x92, 0xa5, 0x74, 0x91, 0x19, 0xcd,
-    0xd7, 0xa1, 0xfc, 0x65, 0xf1, 0xf8, 0x45, 0x67, 0x88, 0x7f, 0xa4, 0xf0, 0xfd, 0x62, 0x3c, 0x1e, 0xdf, 0xa8, 0x9b,
-    0xbe, 0x18, 0x8d, 0x59, 0x97, 0xed, 0xf4, 0x30, 0xd2, 0xdb, 0x92, 0xe2, 0xb0, 0x53, 0x12, 0xed, 0x16, 0x77, 0x6b,
-    0x8c, 0x92, 0x13, 0xd4, 0xd5, 0xdd, 0x95, 0x58, 0x09, 0x54, 0x59, 0x80, 0xf0, 0x3e, 0x8d, 0xd3, 0xa0, 0x5d, 0xfa,
-    0x67, 0x52, 0xea, 0x7f, 0xf1, 0xe8, 0xd1, 0xa3, 0xd2, 0x1f, 0xa9, 0xb7, 0xf6, 0x68, 0x54, 0xfa, 0xc3, 0x85, 0x46,
-    0xa3, 0xdd, 0x1e, 0x8f, 0x4b, 0x3f, 0x56, 0x05, 0xdb, 0xdd, 0xe1, 0x68, 0xbb, 0x5b, 0xfa, 0xe7, 0x46, 0x8b, 0xd2,
-    0x67, 0xf2, 0x2d, 0x67, 0xa3, 0x5a, 0xb8, 0xf8, 0x61, 0x1b, 0x2a, 0x05, 0xa3, 0x2d, 0xd0, 0xc9, 0x13, 0x8f, 0x41,
-    0x34, 0xe7, 0x59, 0x79, 0x0c, 0xb2, 0x9d, 0x81, 0x7c, 0x1e, 0x4b, 0xd9, 0x2e, 0xbe, 0xef, 0x8a, 0x12, 0xfd, 0x37,
-    0x53, 0xa2, 0x23, 0x33, 0x93, 0x34, 0x67, 0xa4, 0x07, 0x9a, 0xd5, 0xc8, 0x59, 0x54, 0xfd, 0x5b, 0xc8, 0x2a, 0x61,
-    0x8f, 0xd2, 0x06, 0x5b, 0x0a, 0x19, 0xff, 0xed, 0x75, 0x32, 0xfe, 0xbb, 0xdb, 0x65, 0xfc, 0xc9, 0xdd, 0x44, 0xfc,
-    0x77, 0x7f, 0xb2, 0x88, 0xff, 0xd6, 0x14, 0xf1, 0x42, 0x88, 0x5d, 0x82, 0xf5, 0x4a, 0x66, 0xeb, 0x49, 0x76, 0xd1,
-    0xc2, 0x2d, 0x91, 0xdb, 0x24, 0x3d, 0xd7, 0xef, 0x24, 0xfc, 0x57, 0xe4, 0xff, 0xa8, 0xc1, 0x8c, 0x8f, 0xc5, 0xf2,
-    0xec, 0xf4, 0x34, 0x61, 0x4a, 0xc6, 0x1b, 0x15, 0x64, 0x0e, 0xbf, 0x49, 0x43, 0xfb, 0x0d, 0x38, 0xa8, 0x46, 0xc9,
-    0x78, 0x0c, 0x45, 0xe3, 0xb1, 0xad, 0xf2, 0x63, 0x41, 0x9e, 0x51, 0xab, 0xd7, 0xb5, 0x12, 0x6a, 0xf5, 0xf5, 0xd7,
-    0x66, 0x99, 0x59, 0x20, 0x23, 0x51, 0xa6, 0x31, 0x21, 0x6b, 0x46, 0x71, 0x81, 0x7b, 0xb0, 0xfa, 0xb8, 0x2d, 0xda,
-    0x2b, 0x53, 0x50, 0x2a, 0xf1, 0x10, 0xbf, 0x9a, 0xd2, 0xfc, 0x90, 0x88, 0xc8, 0x65, 0x5e, 0x46, 0xae, 0x3a, 0xef,
-    0x34, 0xbe, 0x59, 0x57, 0x9d, 0x71, 0xc2, 0xe2, 0xcb, 0x7c, 0x86, 0xc7, 0x97, 0x2f, 0x46, 0xce, 0x25, 0xd8, 0xb1,
-    0x71, 0xf1, 0x26, 0x6d, 0xe4, 0x89, 0x09, 0xb0, 0xc3, 0xd0, 0xc4, 0xb4, 0x14, 0x04, 0xab, 0x12, 0xe6, 0xab, 0xca,
-    0x9e, 0xd1, 0x49, 0xa6, 0x13, 0xe1, 0x90, 0xfd, 0x1a, 0x59, 0x02, 0x73, 0x30, 0xa9, 0x0b, 0xe9, 0xe3, 0xe5, 0x22,
-    0xc9, 0xe2, 0x4c, 0x7e, 0xe5, 0x9a, 0xa2, 0xff, 0x0b, 0xa9, 0x3f, 0xe4, 0xf1, 0x7b, 0xd5, 0x13, 0x03, 0xee, 0x62,
-    0x86, 0x51, 0xa9, 0x82, 0xec, 0x40, 0xb8, 0x19, 0x7e, 0x92, 0x47, 0x0c, 0xa1, 0x62, 0xd9, 0x15, 0xf5, 0xf0, 0x13,
-    0x28, 0xd5, 0x97, 0x21, 0x6b, 0x5f, 0x11, 0x6c, 0xf0, 0x00, 0x7e, 0xdd, 0x9f, 0xa3, 0x36, 0xc8, 0xe6, 0xdc, 0x71,
-    0xa8, 0x95, 0xe3, 0x96, 0x5e, 0x77, 0x07, 0x3c, 0x4a, 0xd7, 0x17, 0xdf, 0xfd, 0x71, 0x74, 0x67, 0x89, 0xef, 0x75,
-    0xa1, 0xf3, 0xa5, 0xef, 0x70, 0x69, 0x12, 0xe3, 0x87, 0x42, 0x04, 0xa2, 0xc6, 0x5d, 0x11, 0xb5, 0x88, 0xcd, 0x77,
-    0x5f, 0xb9, 0x6f, 0x06, 0x61, 0xdd, 0x55, 0x1c, 0x2c, 0xe3, 0x64, 0xf5, 0x42, 0x6c, 0x2b, 0xac, 0x9a, 0x65, 0x70,
-    0x6e, 0xd1, 0x99, 0xc5, 0xb9, 0x11, 0x77, 0xae, 0x6d, 0x83, 0x52, 0x05, 0x9e, 0x45, 0xf4, 0xf8, 0x12, 0x63, 0xa4,
-    0xc2, 0xf7, 0x55, 0x40, 0xd7, 0xbd, 0x4e, 0x03, 0x72, 0xf4, 0x47, 0x35, 0xa3, 0xab, 0x2a, 0x55, 0x50, 0x9a, 0xa7,
-    0x04, 0x06, 0x32, 0x14, 0x00, 0x86, 0x35, 0x4e, 0x85, 0xde, 0x82, 0x69, 0x48, 0x00, 0x6b, 0x8f, 0x0c, 0xdd, 0x12,
-    0x5b, 0x81, 0x2d, 0xa4, 0x05, 0x28, 0x3d, 0xec, 0xb0, 0x67, 0xd5, 0x40, 0x4f, 0x97, 0xe3, 0xc6, 0x37, 0x39, 0x69,
-    0x97, 0xc7, 0x7e, 0x71, 0xee, 0xc1, 0x3f, 0xeb, 0xcb, 0x05, 0x48, 0xf9, 0x93, 0x4f, 0x31, 0x07, 0x9b, 0x7a, 0xd6,
-    0xc2, 0x28, 0x08, 0x85, 0x31, 0xa5, 0x3a, 0xa4, 0xa3, 0x47, 0x71, 0x45, 0xa8, 0x37, 0x2f, 0xd0, 0x97, 0x23, 0xa7,
-    0x25, 0x48, 0xb3, 0x94, 0xf5, 0xea, 0x47, 0xcc, 0xa6, 0xdf, 0xa0, 0x88, 0x35, 0x58, 0x64, 0xe8, 0xfb, 0xf1, 0x4b,
-    0xf0, 0xfd, 0x84, 0x1a, 0x6d, 0x2b, 0xa7, 0xa1, 0xbd, 0xb2, 0x7d, 0x20, 0x69, 0xbb, 0x49, 0xd6, 0x42, 0xbe, 0xec,
-    0x1c, 0x5d, 0xe7, 0xdc, 0xdc, 0x76, 0xe0, 0xda, 0xdd, 0xd9, 0xf1, 0xd4, 0x3f, 0xe3, 0xa4, 0xba, 0x59, 0x4c, 0x07,
-    0xae, 0x77, 0x81, 0x2c, 0x88, 0xc6, 0xf8, 0x45, 0xbd, 0xbb, 0xb4, 0x3c, 0xa1, 0x6c, 0xc7, 0x05, 0xaa, 0xf5, 0xa0,
-    0xf3, 0x08, 0xbc, 0xb5, 0x3b, 0x0f, 0x7f, 0x33, 0xfa, 0xa5, 0xa4, 0x91, 0xba, 0xb4, 0x6a, 0xdb, 0x3d, 0x94, 0x17,
-    0x49, 0x74, 0x09, 0x4e, 0x23, 0xd9, 0x18, 0x27, 0x18, 0xc4, 0xed, 0xcd, 0x32, 0x99, 0x39, 0x90, 0xb3, 0x84, 0x7e,
-    0x6d, 0x85, 0x5c, 0x8a, 0xed, 0x07, 0xb3, 0x0b, 0xb5, 0x1a, 0x9d, 0x46, 0x46, 0xc0, 0x9f, 0x7a, 0xf0, 0x7f, 0x7d,
-    0xa6, 0x41, 0xfd, 0xf0, 0x7a, 0x07, 0x60, 0x10, 0x86, 0x4d, 0x2b, 0x17, 0x50, 0xb5, 0xa1, 0xc4, 0x48, 0x7d, 0xa8,
-    0x06, 0xb2, 0xfc, 0x6d, 0x50, 0x95, 0x51, 0xc1, 0x7a, 0xf8, 0x69, 0xc3, 0x18, 0x5c, 0x53, 0x69, 0x3c, 0x4d, 0xe3,
-    0xd1, 0x28, 0x61, 0x3d, 0x65, 0x1f, 0x59, 0x9d, 0x07, 0x98, 0x39, 0x60, 0x2e, 0x59, 0x7d, 0x55, 0x0c, 0xe2, 0x69,
-    0x3a, 0x45, 0x27, 0x60, 0xaf, 0xe1, 0xf7, 0x09, 0x57, 0x92, 0x53, 0x1e, 0xa9, 0xb7, 0x2b, 0xe2, 0xd1, 0x73, 0x1d,
-    0x97, 0x1d, 0x30, 0x16, 0x69, 0xc1, 0xdb, 0x3d, 0x9e, 0xcd, 0x82, 0xd6, 0x76, 0x1d, 0x11, 0xac, 0xd2, 0x28, 0x78,
-    0x2b, 0xd0, 0xf2, 0xd0, 0x3a, 0x10, 0x5a, 0xce, 0xf2, 0x3b, 0xb2, 0x8c, 0x06, 0xc0, 0x6f, 0xe0, 0xe9, 0xa2, 0xb2,
-    0x8e, 0xcc, 0xff, 0x9f, 0xdd, 0xf2, 0xd5, 0xea, 0xdd, 0xf2, 0x95, 0xda, 0x2d, 0x37, 0x73, 0xec, 0x17, 0xe3, 0x0e,
-    0xfe, 0xe9, 0x55, 0x08, 0xc1, 0xaa, 0x00, 0x39, 0x2c, 0xb4, 0x8b, 0x5b, 0x5d, 0xf8, 0x8f, 0x86, 0x6e, 0x7b, 0xf8,
-    0xc7, 0x07, 0x0b, 0xb0, 0x6d, 0x61, 0x21, 0xfe, 0x6b, 0xd7, 0xaa, 0x3a, 0xf7, 0xb1, 0x0e, 0x7b, 0xed, 0x2c, 0xd7,
-    0x75, 0x6f, 0xde, 0xb4, 0x20, 0xaf, 0xb8, 0x13, 0x28, 0x61, 0x0c, 0xae, 0x5a, 0x74, 0x72, 0x02, 0xa5, 0xe3, 0x6c,
-    0x38, 0x2f, 0xfe, 0x51, 0xc2, 0x2f, 0x89, 0x78, 0xe3, 0x96, 0x6e, 0x8c, 0xa3, 0xba, 0x8a, 0x34, 0x14, 0x35, 0xc2,
-    0x42, 0xaf, 0x53, 0x50, 0x00, 0x63, 0x32, 0xa7, 0xeb, 0xdf, 0x5f, 0xb1, 0x09, 0xfe, 0x2e, 0x6b, 0xb3, 0x12, 0x99,
-    0x7f, 0x2d, 0x31, 0x6e, 0x24, 0xc2, 0x67, 0xd1, 0xc0, 0x5c, 0xc3, 0xf6, 0xa3, 0xd5, 0xe0, 0x1e, 0xa9, 0x99, 0x06,
-    0x4a, 0x29, 0x48, 0xbd, 0x03, 0x5e, 0x40, 0x34, 0x4f, 0xf8, 0xcd, 0xa3, 0x5e, 0xc7, 0x19, 0x4b, 0xa3, 0xde, 0x20,
-    0xd0, 0xab, 0xb6, 0x77, 0x94, 0xd2, 0x5f, 0x7c, 0x75, 0x1f, 0xff, 0x88, 0xc0, 0xd7, 0x49, 0xe5, 0x1b, 0x89, 0xd8,
-    0x00, 0xfa, 0x46, 0xeb, 0x35, 0xe7, 0x47, 0x68, 0x70, 0xf2, 0x7f, 0xee, 0xda, 0x1a, 0x8d, 0xf5, 0x3b, 0x35, 0x97,
-    0x56, 0xe9, 0x67, 0xb5, 0xfe, 0xbc, 0xc1, 0xef, 0xd8, 0x76, 0x28, 0x1c, 0x82, 0x7a, 0x5b, 0xf9, 0x2b, 0x44, 0x96,
-    0x1a, 0x2b, 0x8a, 0xdf, 0xb5, 0x7d, 0x65, 0x12, 0x53, 0x8f, 0xf5, 0xf0, 0x44, 0x3b, 0x91, 0xf2, 0xcc, 0x19, 0x7b,
-    0x08, 0x3f, 0xf2, 0x27, 0x16, 0xde, 0xc3, 0xaf, 0x6f, 0x59, 0x17, 0xd3, 0x24, 0x05, 0xb3, 0x6a, 0xc2, 0xf9, 0x2c,
-    0xd8, 0xda, 0x3a, 0x3f, 0x3f, 0xf7, 0xcf, 0xb7, 0xfd, 0x2c, 0x3f, 0xdd, 0xea, 0xb6, 0xdb, 0x6d, 0xfc, 0x68, 0x92,
-    0x6d, 0x9d, 0xc5, 0xec, 0xfc, 0x31, 0xb8, 0x1f, 0xf6, 0x43, 0xeb, 0x91, 0xf5, 0x70, 0xdb, 0xda, 0x79, 0x60, 0x5b,
-    0xa4, 0x00, 0xa0, 0x64, 0xdb, 0xb6, 0x84, 0x02, 0x08, 0x6d, 0x28, 0xde, 0xdb, 0x3d, 0x55, 0x36, 0x1c, 0x26, 0xa5,
-    0x0b, 0x0b, 0x09, 0xfc, 0xb7, 0xec, 0x13, 0xab, 0x6f, 0x75, 0x51, 0xd6, 0x92, 0x6a, 0x44, 0xbd, 0xe2, 0x7e, 0x1f,
-    0x46, 0xb3, 0x80, 0xd8, 0xc8, 0x2c, 0xc4, 0x30, 0x99, 0x28, 0xa5, 0x29, 0xd0, 0x2e, 0x3d, 0x81, 0x27, 0x70, 0x0b,
-    0x26, 0x16, 0x3c, 0xbf, 0xea, 0x3e, 0x04, 0x1d, 0x77, 0xd6, 0xba, 0x3f, 0x6c, 0xb7, 0x3a, 0x56, 0xa7, 0xd5, 0xf5,
-    0x1f, 0x5a, 0x5d, 0xf1, 0x3f, 0xc8, 0xc8, 0x6d, 0xab, 0x03, 0x4f, 0xdb, 0x16, 0xbc, 0x9f, 0xdd, 0x17, 0x29, 0x11,
-    0x91, 0xbd, 0xb5, 0xb7, 0x8b, 0xbf, 0x43, 0x08, 0x90, 0xfa, 0xca, 0x16, 0xbf, 0xf5, 0xcc, 0xfe, 0xc2, 0x2c, 0xed,
-    0x3c, 0x5a, 0x59, 0xdc, 0x7d, 0xb8, 0xb2, 0x78, 0xfb, 0xc1, 0xca, 0xe2, 0xfb, 0x3b, 0xf5, 0xe2, 0xad, 0x53, 0x51,
-    0xa5, 0xe5, 0x42, 0x68, 0x4f, 0x23, 0x60, 0x94, 0x0b, 0xa7, 0x03, 0x70, 0xb6, 0xad, 0x16, 0xfe, 0x78, 0xd8, 0x75,
-    0x75, 0xaf, 0x13, 0xec, 0xa5, 0xb1, 0x7c, 0xf8, 0x08, 0xb0, 0x7c, 0xde, 0x7d, 0x30, 0xc4, 0x76, 0x84, 0x28, 0xfc,
-    0x3b, 0xdb, 0x7e, 0x34, 0x04, 0x8d, 0x60, 0xe1, 0x3f, 0xf8, 0x33, 0xd9, 0xe9, 0x0e, 0xc5, 0x4b, 0x1b, 0xeb, 0x3f,
-    0x74, 0x1e, 0x16, 0xd0, 0x14, 0xff, 0xfc, 0xae, 0x4d, 0x68, 0x34, 0xe0, 0xcd, 0x71, 0xef, 0x03, 0x8d, 0x1e, 0x4d,
-    0xba, 0xfe, 0x57, 0x67, 0x0f, 0xfd, 0x47, 0x93, 0xce, 0xc3, 0x0f, 0xe2, 0x2d, 0x01, 0x0a, 0x7e, 0x85, 0xff, 0x3e,
-    0x6c, 0xb7, 0x27, 0xad, 0x8e, 0xff, 0xe8, 0x6c, 0xdb, 0xdf, 0x4e, 0x5a, 0x0f, 0xfc, 0x47, 0xf8, 0xaf, 0x1a, 0x6e,
-    0x92, 0x4d, 0x99, 0x6d, 0xe1, 0x7a, 0x37, 0xfc, 0x5e, 0x73, 0x8e, 0xee, 0x7d, 0x6b, 0xe7, 0xfe, 0xf3, 0x47, 0xb0,
-    0x46, 0x93, 0x4e, 0x17, 0xfe, 0xbf, 0xee, 0xf1, 0x03, 0x12, 0x5e, 0x0e, 0x1c, 0x31, 0x4c, 0x27, 0x55, 0x84, 0xa3,
-    0x0f, 0x78, 0xdd, 0xf3, 0x7e, 0xbc, 0x2e, 0x00, 0xf2, 0xd7, 0xdb, 0x03, 0x20, 0x3f, 0xdc, 0x31, 0xc8, 0xfd, 0xd7,
-    0x3f, 0x39, 0x02, 0xf2, 0x63, 0x33, 0xc8, 0xbd, 0xcf, 0x96, 0x02, 0x1d, 0x4d, 0x67, 0xed, 0x39, 0x73, 0x8e, 0x7e,
-    0x62, 0x03, 0x4c, 0x9d, 0x86, 0xd6, 0x3f, 0xd4, 0xe2, 0x41, 0x19, 0x6e, 0xe4, 0x7d, 0x26, 0x76, 0x32, 0xe3, 0xd7,
-    0x10, 0x84, 0xf3, 0x5b, 0x09, 0xf2, 0xe2, 0x6e, 0xf4, 0xe0, 0xfc, 0xcf, 0xa5, 0x07, 0x7d, 0xbd, 0x5f, 0xd1, 0xa3,
-    0x16, 0x71, 0xa7, 0x88, 0x01, 0x39, 0xfa, 0x07, 0xf4, 0xee, 0xd8, 0x5b, 0x0c, 0xdf, 0x0a, 0x5b, 0xe4, 0x03, 0xbe,
-    0xfb, 0x9c, 0xd3, 0x01, 0x91, 0x59, 0x1c, 0xda, 0x32, 0x00, 0x33, 0xc3, 0xef, 0xd3, 0xaa, 0x97, 0x33, 0x71, 0x7b,
-    0x25, 0xa4, 0xab, 0x67, 0x3b, 0x3a, 0x78, 0x83, 0xc9, 0xde, 0xe1, 0x22, 0xe3, 0x11, 0xfe, 0x02, 0x24, 0x1e, 0xf3,
-    0x04, 0x2f, 0xc6, 0xca, 0x4b, 0x64, 0x98, 0x9b, 0xfc, 0x1d, 0xe6, 0x55, 0xab, 0x43, 0x82, 0x29, 0x06, 0x0c, 0x5e,
-    0xb1, 0x51, 0x1c, 0x39, 0xb6, 0x33, 0x83, 0x1d, 0x0b, 0x63, 0xb6, 0x6a, 0x49, 0xcd, 0x94, 0xcf, 0xec, 0xda, 0xea,
-    0x77, 0xee, 0xe4, 0xf8, 0x0d, 0xb3, 0xf0, 0x48, 0x06, 0x18, 0x6d, 0xe9, 0x01, 0xc0, 0xf8, 0xaa, 0x24, 0x47, 0x61,
-    0x5f, 0x59, 0x0d, 0xb6, 0x30, 0x1b, 0x3a, 0x7e, 0x17, 0xdc, 0x08, 0x2a, 0xc6, 0x6f, 0x42, 0xfd, 0xe8, 0xb4, 0xb6,
-    0xc1, 0xac, 0x31, 0xba, 0xe9, 0x81, 0x06, 0x4b, 0x61, 0x24, 0x11, 0x1c, 0x68, 0x94, 0x7a, 0xfa, 0x97, 0x90, 0x55,
-    0xe1, 0xa2, 0xe2, 0xf1, 0xe5, 0xa1, 0xbc, 0xf7, 0x6d, 0x63, 0xe4, 0x96, 0x22, 0xf6, 0xd5, 0x37, 0xa7, 0x36, 0x41,
-    0x5d, 0xd0, 0x6f, 0x82, 0xa4, 0x73, 0x6f, 0xd4, 0x08, 0x98, 0x76, 0x6d, 0x49, 0xcf, 0x21, 0xb4, 0x85, 0x3e, 0x18,
-    0xb1, 0xb3, 0x78, 0x28, 0xc5, 0xba, 0x67, 0xc9, 0xeb, 0x22, 0x2d, 0xc2, 0x22, 0xec, 0x78, 0xc2, 0x77, 0x86, 0x17,
-    0xd4, 0x6a, 0x61, 0x9a, 0xd9, 0x7b, 0xf7, 0x7a, 0x1a, 0x92, 0x7a, 0xc6, 0xba, 0x8d, 0xbf, 0x96, 0xf2, 0x08, 0x7c,
-    0xb5, 0x7f, 0x0c, 0xef, 0xe1, 0x2f, 0xa6, 0xbc, 0x37, 0xb0, 0x5d, 0x9f, 0x84, 0xe2, 0xbd, 0xea, 0xb7, 0x53, 0xa2,
-    0x44, 0xd8, 0x04, 0xfd, 0xe5, 0xdd, 0x55, 0x91, 0x49, 0xa5, 0xd5, 0xdd, 0xa9, 0x94, 0x16, 0x3c, 0x1b, 0x52, 0x0a,
-    0x04, 0x68, 0xd7, 0xdf, 0x31, 0x44, 0xe1, 0x59, 0x0b, 0x7f, 0xd6, 0x84, 0xe1, 0x7d, 0x68, 0xa0, 0xa4, 0xe1, 0x4b,
-    0x68, 0xbe, 0x2d, 0x04, 0x2f, 0xf4, 0xfb, 0x89, 0x44, 0x95, 0x10, 0x53, 0x75, 0x8e, 0x59, 0x71, 0x88, 0x24, 0x72,
-    0x04, 0x6c, 0xcf, 0x88, 0x37, 0x09, 0x76, 0x95, 0xd1, 0x94, 0xa7, 0xd0, 0xd7, 0xd1, 0x9f, 0x72, 0x5e, 0x55, 0xe7,
-    0xd5, 0x76, 0xce, 0x8a, 0x29, 0x90, 0xe1, 0x1b, 0x07, 0x55, 0x74, 0x7d, 0x41, 0x7c, 0xd2, 0x4c, 0x6c, 0xe3, 0xea,
-    0xa3, 0x6f, 0x2b, 0x32, 0x70, 0xcd, 0x4d, 0xc1, 0x2a, 0xa6, 0xa1, 0x7d, 0x81, 0x69, 0x33, 0xf8, 0xb3, 0x2a, 0x56,
-    0x0f, 0x92, 0xa1, 0xfc, 0x24, 0xc2, 0xdf, 0xc8, 0x42, 0x3f, 0xca, 0x6a, 0x03, 0x72, 0xfa, 0x66, 0x25, 0x41, 0xfa,
-    0x62, 0x54, 0x36, 0x91, 0x00, 0x7b, 0x01, 0x7f, 0xc1, 0x5f, 0x75, 0x5d, 0x42, 0xde, 0x83, 0xc4, 0x9c, 0x82, 0x51,
-    0x9c, 0xd3, 0xf5, 0x5a, 0x85, 0x7f, 0x2d, 0xa2, 0x59, 0x91, 0x9a, 0x76, 0x25, 0x2b, 0xfa, 0x36, 0x16, 0xd9, 0x81,
-    0x4c, 0x48, 0x33, 0x3f, 0xda, 0x6c, 0xde, 0x7f, 0x1c, 0x89, 0x5c, 0x34, 0xfc, 0xa8, 0xbd, 0x2d, 0x88, 0x6c, 0x83,
-    0x18, 0xbb, 0x16, 0x27, 0x32, 0x6e, 0xf0, 0xda, 0x60, 0xf5, 0x5b, 0x8a, 0xcc, 0x0d, 0x6f, 0x9b, 0xab, 0xa5, 0xc7,
-    0xa5, 0x75, 0x70, 0x65, 0xfc, 0xee, 0x84, 0x45, 0xdc, 0x8f, 0x52, 0xca, 0x4f, 0x72, 0x0c, 0xb1, 0xe0, 0x75, 0xd8,
-    0xb6, 0x5b, 0x82, 0xe4, 0x31, 0x7e, 0x8d, 0x93, 0x20, 0xbd, 0x0f, 0x85, 0x55, 0xd2, 0xd6, 0xee, 0xa4, 0xbb, 0xf7,
-    0xe6, 0x70, 0xdf, 0x12, 0xbb, 0x79, 0x77, 0x0b, 0x5e, 0x77, 0xc9, 0x1d, 0x16, 0xf9, 0x19, 0xa1, 0xc8, 0xcf, 0xb0,
-    0x44, 0x52, 0x57, 0x68, 0x6f, 0x09, 0x34, 0x6d, 0x8b, 0xa5, 0x43, 0x11, 0xc3, 0x9b, 0x82, 0xbb, 0x10, 0xe3, 0x87,
-    0xbd, 0xb6, 0xb0, 0x5b, 0x0b, 0x57, 0x1a, 0xb6, 0x80, 0x08, 0xf8, 0x29, 0x03, 0x81, 0xa7, 0x2a, 0xe2, 0x07, 0x6a,
-    0x9d, 0xa9, 0x64, 0x17, 0x39, 0x94, 0xce, 0x4b, 0x5d, 0x6e, 0x5d, 0xcc, 0x4f, 0xa6, 0x20, 0x87, 0x54, 0x82, 0xca,
-    0x7b, 0xd9, 0x61, 0x97, 0xa6, 0xa2, 0x0c, 0x94, 0xa5, 0x88, 0xe4, 0xa4, 0xb3, 0xb7, 0x1b, 0x49, 0x7b, 0x07, 0xf7,
-    0x6e, 0x01, 0x9b, 0x17, 0xd4, 0x1c, 0x1a, 0x15, 0x7e, 0x9c, 0x6d, 0x9d, 0xb3, 0x93, 0x56, 0x34, 0x8b, 0xab, 0xf0,
-    0x1f, 0x6a, 0xbf, 0xbd, 0x5d, 0xa5, 0x08, 0x65, 0xaa, 0xa5, 0x7c, 0x8c, 0x8c, 0x2c, 0x0e, 0x24, 0x1c, 0x31, 0x68,
-    0x29, 0x63, 0x8b, 0x64, 0x34, 0x02, 0xf1, 0x01, 0x56, 0xe2, 0x5f, 0x15, 0x83, 0x94, 0x9a, 0xa0, 0xb4, 0xf7, 0xfe,
-    0xf6, 0x3f, 0xfe, 0x97, 0x0c, 0x2b, 0x02, 0x59, 0x01, 0x2c, 0x4c, 0x83, 0xa9, 0x4e, 0x18, 0xd9, 0x05, 0x38, 0xa2,
-    0xf1, 0xa8, 0x35, 0x89, 0x92, 0x31, 0x40, 0x50, 0x30, 0x71, 0x9d, 0x49, 0xd6, 0x03, 0x17, 0x48, 0xb0, 0xcc, 0xc3,
-    0x79, 0x09, 0x5e, 0xbd, 0x08, 0x57, 0xec, 0x0f, 0xe5, 0xae, 0xaa, 0x9c, 0x61, 0x62, 0x68, 0x23, 0x93, 0xd5, 0xe0,
-    0xb9, 0x5a, 0x36, 0xab, 0xfa, 0x25, 0x49, 0x52, 0x78, 0xb0, 0x5a, 0x2a, 0x2b, 0xb4, 0xd4, 0x07, 0x21, 0xff, 0xf2,
-    0xcf, 0xff, 0xf1, 0xbf, 0xaa, 0x57, 0x3c, 0xdf, 0xf8, 0xdb, 0x3f, 0xfd, 0xfb, 0xff, 0xfb, 0xbf, 0xff, 0x13, 0x26,
-    0x07, 0xcb, 0x33, 0x10, 0xda, 0x4a, 0x56, 0x75, 0x00, 0x22, 0xf6, 0x94, 0x55, 0x39, 0x1c, 0xf5, 0x94, 0xd7, 0x03,
-    0x9a, 0x90, 0x78, 0x53, 0x42, 0x47, 0x7c, 0x4d, 0x29, 0xd2, 0x44, 0xb5, 0x1b, 0xc8, 0x07, 0x4b, 0x69, 0xd1, 0xb1,
-    0xbe, 0xbd, 0xd3, 0xb6, 0xab, 0xe5, 0xdd, 0x33, 0xfa, 0x6e, 0xe1, 0xc2, 0xdc, 0x29, 0x03, 0xc7, 0xd7, 0xcb, 0xb6,
-    0x50, 0x61, 0x2c, 0x2c, 0x29, 0xab, 0x72, 0x0b, 0xe3, 0xcb, 0x0b, 0x7c, 0x0d, 0xba, 0x46, 0x31, 0xad, 0x72, 0xad,
-    0x4f, 0xef, 0xd7, 0x39, 0x20, 0x3a, 0xc6, 0xa5, 0x11, 0xc1, 0x32, 0x3a, 0x3b, 0x6d, 0xa1, 0x75, 0x92, 0x5c, 0x96,
-    0x34, 0x8a, 0xf0, 0x66, 0xee, 0x3f, 0xfa, 0x87, 0xf2, 0x2f, 0x53, 0xb4, 0x0a, 0x2c, 0x67, 0x1a, 0x5d, 0x48, 0x1f,
-    0xe7, 0x41, 0xbb, 0x3d, 0xbb, 0x70, 0x17, 0xd5, 0x0c, 0xde, 0x75, 0x93, 0x51, 0x80, 0xcd, 0x1c, 0x90, 0x0e, 0x5d,
-    0x75, 0x2c, 0x0f, 0xcc, 0xfa, 0x36, 0x86, 0x7e, 0xca, 0xf2, 0xcb, 0x05, 0x85, 0x93, 0xe2, 0xdf, 0xf1, 0x70, 0x54,
-    0x46, 0xde, 0xa0, 0xc4, 0xc0, 0x62, 0x61, 0xf4, 0xea, 0x8a, 0x5e, 0x93, 0xce, 0x72, 0x6e, 0x8a, 0x79, 0xb8, 0x6b,
-    0x1e, 0xcb, 0xde, 0xc7, 0x83, 0xd6, 0x49, 0xc7, 0x9b, 0x74, 0x17, 0x7a, 0x78, 0xce, 0xb3, 0xa9, 0x79, 0x9a, 0xcb,
-    0x22, 0x36, 0x64, 0x63, 0x15, 0xb1, 0x94, 0xf5, 0xe2, 0xa4, 0xb6, 0xfc, 0x02, 0xb7, 0x1b, 0xd0, 0x36, 0x8b, 0x78,
-    0x40, 0x4c, 0xdb, 0x33, 0xcf, 0x7b, 0x23, 0x3c, 0x49, 0xcf, 0x16, 0xc6, 0x5c, 0x3d, 0xd1, 0x14, 0xe3, 0x82, 0xf5,
-    0xbc, 0x9f, 0xd2, 0xa7, 0xee, 0xe6, 0x50, 0x22, 0xac, 0xf0, 0x42, 0x1e, 0xa3, 0xbe, 0xab, 0xf9, 0xe3, 0x52, 0x14,
-    0x83, 0x0b, 0xbc, 0xb2, 0x5e, 0xa8, 0x45, 0x51, 0xfb, 0x02, 0xac, 0x1d, 0x02, 0xd3, 0x6e, 0xb6, 0xa2, 0x42, 0x6c,
-    0xf5, 0x2e, 0x7c, 0xa1, 0x6d, 0xef, 0x68, 0x36, 0xa3, 0x86, 0x2e, 0x70, 0x23, 0xd9, 0xd0, 0x28, 0x29, 0x28, 0x45,
-    0x40, 0x9c, 0xc8, 0xcb, 0x36, 0x92, 0x6d, 0xc5, 0x93, 0x3c, 0xab, 0xa7, 0xdf, 0xb9, 0xfd, 0xff, 0x00, 0x52, 0x99,
-    0xa6, 0xd8, 0x89, 0x7b, 0x00, 0x00};
+    0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0xbd, 0x7d, 0xd9, 0x76, 0xdb, 0xc8, 0x92, 0xe0, 0xf3,
+    0x9c, 0x33, 0x7f, 0x30, 0x2f, 0x30, 0x4a, 0x6d, 0x03, 0x25, 0x10, 0x22, 0x29, 0xcb, 0x76, 0x81, 0x02, 0x79, 0xe5,
+    0xa5, 0xae, 0x5d, 0xe5, 0xad, 0x2c, 0xd9, 0x75, 0xab, 0x54, 0x2c, 0x0b, 0x22, 0x93, 0x22, 0xca, 0x20, 0xc0, 0x02,
+    0x92, 0x5a, 0x8a, 0x42, 0x9f, 0x7e, 0xea, 0xa7, 0x39, 0x67, 0xd6, 0x87, 0x7e, 0x99, 0xd3, 0xfd, 0x30, 0x1f, 0x31,
+    0xcf, 0xfd, 0x29, 0xf7, 0x07, 0xa6, 0x3f, 0x61, 0x22, 0x22, 0x17, 0x24, 0x40, 0x6a, 0x71, 0x75, 0xcd, 0x3d, 0x5e,
+    0x04, 0xe4, 0x1a, 0x11, 0x19, 0x19, 0x5b, 0x46, 0x42, 0xbb, 0x77, 0xc6, 0xd9, 0x88, 0x5f, 0xcc, 0x99, 0x35, 0xe5,
+    0xb3, 0xa4, 0xbf, 0x2b, 0xff, 0x67, 0xd1, 0xb8, 0xbf, 0x9b, 0xc4, 0xe9, 0x27, 0x2b, 0x67, 0x49, 0x18, 0x8f, 0xb2,
+    0xd4, 0x9a, 0xe6, 0x6c, 0x12, 0x8e, 0x23, 0x1e, 0x05, 0xf1, 0x2c, 0x3a, 0x61, 0xd6, 0x56, 0x7f, 0x77, 0xc6, 0x78,
+    0x64, 0x8d, 0xa6, 0x51, 0x5e, 0x30, 0x1e, 0xbe, 0x3f, 0xf8, 0xba, 0xf5, 0xa8, 0xbf, 0x5b, 0x8c, 0xf2, 0x78, 0xce,
+    0x2d, 0x1c, 0x32, 0x9c, 0x65, 0xe3, 0x45, 0xc2, 0xfa, 0xa7, 0x51, 0x6e, 0x9d, 0xb3, 0xf0, 0xcd, 0xf1, 0x2f, 0x6c,
+    0xc4, 0xfd, 0x31, 0x9b, 0xc4, 0x29, 0x7b, 0x9b, 0x67, 0x73, 0x96, 0xf3, 0x0b, 0xef, 0xd9, 0xfa, 0x8a, 0x98, 0x15,
+    0xde, 0xbe, 0xae, 0x3a, 0x61, 0xfc, 0xcd, 0x59, 0xaa, 0xfa, 0x3c, 0x65, 0x62, 0x92, 0x2c, 0x2f, 0x3c, 0x7e, 0x45,
+    0x9b, 0xfd, 0x8b, 0xd9, 0x71, 0x96, 0x14, 0xde, 0x27, 0x5d, 0x3f, 0xcf, 0x33, 0x9e, 0x21, 0x58, 0xfe, 0x34, 0x2a,
+    0x8c, 0x96, 0xde, 0x93, 0x35, 0x4d, 0xe6, 0xb2, 0xf2, 0x45, 0xf1, 0x2c, 0x5d, 0xcc, 0x58, 0x1e, 0x1d, 0x27, 0xcc,
+    0x2b, 0x58, 0xe8, 0x30, 0x8f, 0x7b, 0xb1, 0x1b, 0xf6, 0xb9, 0x15, 0xa7, 0x16, 0x1b, 0x9c, 0x33, 0x2a, 0x59, 0x32,
+    0xdd, 0x2a, 0xb8, 0xd3, 0xf6, 0x80, 0x5c, 0x93, 0xf8, 0x64, 0xa1, 0xdf, 0xcf, 0xf2, 0x98, 0xab, 0xe7, 0xd3, 0x28,
+    0x59, 0xb0, 0x20, 0x2e, 0xdd, 0x80, 0x1d, 0xf2, 0x61, 0x18, 0x7b, 0x4f, 0x68, 0x50, 0x18, 0x72, 0x39, 0xc9, 0x72,
+    0x07, 0x69, 0x15, 0xe3, 0xd8, 0xfc, 0xf2, 0xd2, 0xe1, 0xe1, 0xb2, 0x74, 0xdd, 0x4f, 0xcc, 0x1f, 0x45, 0x49, 0xe2,
+    0xe0, 0xc4, 0x77, 0xef, 0x16, 0x38, 0x63, 0xec, 0xf1, 0xc3, 0x78, 0xe8, 0xf6, 0xe2, 0x89, 0xc3, 0x99, 0x5b, 0xf5,
+    0xcb, 0x26, 0x16, 0x67, 0x0e, 0x77, 0xdd, 0x27, 0x57, 0xf7, 0xc9, 0x19, 0x5f, 0xe4, 0x00, 0x7b, 0xe9, 0xbd, 0x51,
+    0x33, 0x3f, 0xc3, 0xfa, 0x7d, 0xea, 0xd8, 0x03, 0xd8, 0x0b, 0x6e, 0x7d, 0x08, 0xcf, 0xe2, 0x74, 0x9c, 0x9d, 0xf9,
+    0xfb, 0xd3, 0x08, 0x7e, 0xbc, 0xcb, 0x32, 0x7e, 0xf7, 0xae, 0x73, 0x9a, 0xc5, 0x63, 0xab, 0x1d, 0x86, 0x66, 0xe5,
+    0xc5, 0x93, 0xfd, 0xfd, 0xcb, 0xcb, 0x46, 0x81, 0x9f, 0x46, 0x3c, 0x3e, 0x65, 0xa2, 0x33, 0x00, 0x60, 0xc3, 0xcf,
+    0x39, 0x67, 0xe3, 0x7d, 0x7e, 0x91, 0x40, 0x29, 0x63, 0xbc, 0xb0, 0x01, 0xc7, 0xa7, 0xd9, 0x08, 0xc8, 0x96, 0x1a,
+    0x84, 0x87, 0xa6, 0x39, 0x9b, 0x27, 0xd1, 0x88, 0x61, 0x3d, 0x8c, 0x54, 0xf5, 0xa8, 0x1a, 0x79, 0x5f, 0x87, 0x62,
+    0x79, 0x1d, 0xd7, 0x8b, 0x59, 0x98, 0xb2, 0x33, 0xeb, 0x55, 0x34, 0xef, 0x8d, 0x92, 0xa8, 0x28, 0x80, 0x5f, 0x97,
+    0x84, 0x42, 0xbe, 0x18, 0x01, 0x83, 0x10, 0x82, 0x4b, 0x24, 0xd3, 0x34, 0x2e, 0xfc, 0x8f, 0x1b, 0xa3, 0xa2, 0x78,
+    0xc7, 0x8a, 0x45, 0xc2, 0x37, 0x42, 0x58, 0x0b, 0x7e, 0x27, 0x0c, 0xbf, 0x76, 0xf9, 0x34, 0xcf, 0xce, 0xac, 0x67,
+    0x79, 0x0e, 0xcd, 0x6d, 0x98, 0x52, 0x34, 0xb0, 0xe2, 0xc2, 0x4a, 0x33, 0x6e, 0xe9, 0xc1, 0x70, 0x01, 0x7d, 0xeb,
+    0x7d, 0xc1, 0xac, 0xa3, 0x45, 0x5a, 0x44, 0x13, 0x06, 0x4d, 0x8f, 0xac, 0x2c, 0xb7, 0x8e, 0x60, 0xd0, 0x23, 0x58,
+    0xb2, 0x82, 0xc3, 0xae, 0xf1, 0x6d, 0xb7, 0x47, 0x73, 0x41, 0xe1, 0x01, 0x3b, 0xe7, 0x21, 0x2b, 0x81, 0x31, 0xad,
+    0x42, 0xa3, 0xe1, 0xb8, 0xcb, 0x04, 0x0a, 0x58, 0x18, 0x33, 0x64, 0x59, 0xc7, 0x6c, 0xac, 0x17, 0xe7, 0xc3, 0xdd,
+    0xbb, 0x9a, 0xd6, 0x40, 0x13, 0x07, 0xda, 0x16, 0x8d, 0xb6, 0x9e, 0x40, 0xbc, 0x46, 0x22, 0xd7, 0x63, 0xbe, 0x24,
+    0xdf, 0xfe, 0x45, 0x3a, 0xaa, 0x8f, 0x0d, 0x95, 0x25, 0xcf, 0xf6, 0x79, 0x1e, 0xa7, 0x27, 0x00, 0x84, 0x9c, 0xc9,
+    0x6c, 0x52, 0x96, 0x62, 0xf1, 0xdf, 0xb0, 0x90, 0x85, 0x7d, 0x1c, 0x3d, 0x67, 0x8e, 0x5d, 0x50, 0x0f, 0x3b, 0x0c,
+    0x91, 0xf4, 0xc0, 0x60, 0x6c, 0xc0, 0x02, 0xb6, 0x69, 0xdb, 0xde, 0xd7, 0xae, 0x77, 0x81, 0x1c, 0xe4, 0xfb, 0x3e,
+    0xb1, 0xaf, 0xe8, 0x1c, 0x87, 0x1d, 0x04, 0xda, 0x4f, 0x58, 0x7a, 0xc2, 0xa7, 0x03, 0x76, 0xd8, 0x1e, 0x06, 0x1c,
+    0xa0, 0x1a, 0x2f, 0x46, 0xcc, 0x41, 0x7e, 0xf4, 0x72, 0xdc, 0x3e, 0x9b, 0x0e, 0x4c, 0x81, 0x0b, 0x73, 0x87, 0x70,
+    0xac, 0x2d, 0x8d, 0xab, 0x58, 0x54, 0x01, 0x86, 0x7c, 0x6e, 0xc3, 0x0e, 0x3b, 0x66, 0xb9, 0x01, 0x87, 0x6e, 0xd6,
+    0xab, 0xad, 0xe0, 0x02, 0x56, 0x08, 0xfa, 0x59, 0x93, 0x45, 0x3a, 0xe2, 0x31, 0x08, 0x2e, 0x7b, 0x13, 0xc0, 0x15,
+    0x2b, 0xa7, 0x17, 0xce, 0x76, 0x4b, 0xd7, 0x89, 0xdd, 0x4d, 0x76, 0x98, 0x6f, 0x76, 0x86, 0x1e, 0x42, 0xa9, 0x89,
+    0x2f, 0x11, 0x8f, 0x01, 0xc1, 0xd2, 0x7b, 0xcb, 0xf4, 0xf6, 0xfc, 0x30, 0x60, 0xfe, 0x2a, 0x1f, 0x87, 0xdc, 0x9f,
+    0x45, 0x73, 0xc4, 0x86, 0x11, 0x0f, 0x44, 0xe9, 0x08, 0xa1, 0xab, 0xad, 0x0b, 0x52, 0xcc, 0xaf, 0x58, 0xc0, 0x05,
+    0x82, 0xc0, 0x9e, 0x7d, 0x16, 0x8d, 0xa6, 0xb0, 0xc5, 0x2b, 0xc2, 0x8d, 0xd5, 0x76, 0x18, 0xe5, 0x2c, 0xe2, 0xec,
+    0x59, 0xc2, 0xf0, 0x0d, 0x57, 0x00, 0x7a, 0xda, 0xae, 0x97, 0xab, 0x7d, 0x97, 0xc4, 0xfc, 0x75, 0x06, 0xf3, 0xf4,
+    0x04, 0x93, 0x00, 0x17, 0xe7, 0x77, 0xef, 0xc6, 0xc8, 0x22, 0x7b, 0x1c, 0x56, 0xeb, 0x78, 0x01, 0x42, 0xc0, 0x4e,
+    0xb1, 0x85, 0x0d, 0xd4, 0xf6, 0x62, 0x9f, 0x03, 0x11, 0x9f, 0x64, 0x29, 0x87, 0xe1, 0x00, 0x5e, 0xcd, 0x41, 0x7e,
+    0x34, 0x9f, 0xb3, 0x74, 0xfc, 0x64, 0x1a, 0x27, 0x63, 0xa0, 0x46, 0x09, 0xf8, 0x66, 0x2c, 0x04, 0x3c, 0x01, 0x99,
+    0xe0, 0x7a, 0x8c, 0x68, 0xf9, 0x90, 0x91, 0x79, 0x68, 0xdb, 0x3d, 0x94, 0x40, 0x12, 0x0b, 0x94, 0x41, 0xb4, 0x70,
+    0xef, 0x40, 0xf4, 0x17, 0x2e, 0xdf, 0x0c, 0x63, 0xbd, 0x8c, 0x92, 0xc0, 0x6f, 0x50, 0xd2, 0x00, 0xfd, 0x19, 0xc8,
+    0xc0, 0x1e, 0x0a, 0xae, 0xef, 0xa5, 0xd4, 0x49, 0x99, 0xc2, 0x10, 0x08, 0x30, 0x42, 0x09, 0x22, 0x69, 0xf0, 0x36,
+    0x4b, 0x2e, 0x26, 0x71, 0x92, 0xec, 0x2f, 0xe6, 0xf3, 0x2c, 0xe7, 0xde, 0x37, 0xe1, 0x92, 0x67, 0x15, 0xae, 0xb4,
+    0xc9, 0x8b, 0xb3, 0x98, 0x23, 0x41, 0xdd, 0xe5, 0x28, 0x82, 0xa5, 0x7e, 0x9c, 0x65, 0x09, 0x8b, 0x52, 0x40, 0x83,
+    0x0d, 0x6c, 0x3b, 0x48, 0x17, 0x49, 0xd2, 0x3b, 0x86, 0x61, 0x3f, 0xf5, 0xa8, 0x5a, 0x48, 0xfc, 0x80, 0x9e, 0xf7,
+    0xf2, 0x3c, 0xba, 0x80, 0x86, 0xd8, 0x06, 0x78, 0x11, 0x56, 0xeb, 0x9b, 0xfd, 0x37, 0xaf, 0x7d, 0xc1, 0xf8, 0xf1,
+    0xe4, 0x02, 0x00, 0x2d, 0x2b, 0xa9, 0x39, 0xc9, 0xb3, 0x59, 0x63, 0x6a, 0xa4, 0x43, 0x1c, 0xb2, 0xde, 0x15, 0x20,
+    0xc4, 0x34, 0x32, 0xac, 0x12, 0x33, 0x21, 0x78, 0x4d, 0xfc, 0x2c, 0x2b, 0x71, 0x0f, 0x0c, 0xf0, 0x21, 0x10, 0xc5,
+    0x30, 0xe5, 0xf5, 0xd0, 0xf2, 0xfc, 0x62, 0x19, 0x87, 0x04, 0xe7, 0x1c, 0xf5, 0x2f, 0xc2, 0x38, 0x8a, 0x60, 0xf6,
+    0xa5, 0x18, 0xb0, 0x54, 0x10, 0xc7, 0x65, 0xe9, 0x25, 0x9a, 0x89, 0x51, 0xe2, 0xa1, 0x40, 0xe1, 0xb0, 0x8d, 0x2e,
+    0x2f, 0x19, 0xbc, 0xb8, 0xde, 0xb7, 0xe1, 0x32, 0x52, 0xf8, 0xa0, 0x86, 0xc2, 0xfd, 0x15, 0x08, 0x39, 0x81, 0x9a,
+    0xec, 0x14, 0xf4, 0x20, 0xc0, 0xf9, 0x8d, 0x07, 0xfa, 0x3f, 0x41, 0x28, 0xee, 0x74, 0x3c, 0xd0, 0xa0, 0x4f, 0xa6,
+    0x51, 0x7a, 0xc2, 0xc6, 0x41, 0xc2, 0x4a, 0x29, 0x79, 0xf7, 0x2c, 0x58, 0x63, 0x60, 0xa7, 0xc2, 0x7a, 0x7e, 0xf0,
+    0xea, 0xa5, 0x5c, 0xb9, 0x9a, 0x30, 0x86, 0x45, 0x5a, 0x80, 0x5a, 0x05, 0xb1, 0x2d, 0xc5, 0xf1, 0x33, 0xae, 0xa4,
+    0xb7, 0x28, 0x89, 0x8b, 0xf7, 0x73, 0x30, 0x31, 0xd8, 0x5b, 0x18, 0x06, 0xa6, 0x0f, 0x61, 0x2a, 0x2a, 0x87, 0xf9,
+    0x44, 0xc5, 0x58, 0x17, 0x41, 0x67, 0x81, 0xa9, 0x78, 0xcd, 0x1c, 0xb7, 0x04, 0x56, 0xe5, 0xf1, 0xc8, 0x8a, 0xc6,
+    0xe3, 0x17, 0x69, 0xcc, 0xe3, 0x28, 0x89, 0x7f, 0x23, 0x4a, 0x2e, 0x91, 0xc7, 0x78, 0x4f, 0x2e, 0x02, 0xe0, 0x4e,
+    0x3d, 0x12, 0x57, 0x09, 0xd9, 0x3b, 0x44, 0x0c, 0x21, 0x2d, 0x93, 0xf0, 0x70, 0x28, 0xc1, 0x4b, 0xfc, 0xf9, 0xa2,
+    0x98, 0x22, 0x61, 0xe5, 0xc0, 0x28, 0xc8, 0xb3, 0xe3, 0x82, 0xe5, 0xa7, 0x6c, 0xac, 0x39, 0xa0, 0x00, 0xac, 0xa8,
+    0x39, 0x18, 0x2f, 0x34, 0xa3, 0xa3, 0x74, 0x28, 0x83, 0xa1, 0x7a, 0xa6, 0x98, 0x65, 0x92, 0x99, 0xb5, 0x85, 0xa3,
+    0xa5, 0x80, 0x23, 0x8c, 0x0a, 0x29, 0x09, 0xf2, 0x50, 0x61, 0x38, 0x05, 0x29, 0x04, 0x5a, 0xc1, 0xdc, 0xe6, 0x4a,
+    0x93, 0x3d, 0x5b, 0x90, 0x4a, 0xc8, 0xa1, 0x23, 0x6c, 0x64, 0x82, 0x34, 0x77, 0x61, 0x57, 0x81, 0x94, 0x97, 0xe0,
+    0x0a, 0x29, 0xa2, 0xcc, 0x1c, 0x64, 0x80, 0xf0, 0x5b, 0xa1, 0x0b, 0x7d, 0x6c, 0x41, 0x6c, 0xe0, 0xeb, 0x95, 0x07,
+    0xc2, 0x4a, 0xbc, 0x2b, 0x44, 0xbc, 0x2b, 0xc0, 0xc6, 0x89, 0x91, 0x9f, 0xbc, 0x3b, 0xdc, 0x4f, 0xb3, 0xbd, 0xd1,
+    0x88, 0x15, 0x45, 0x06, 0xb0, 0xdd, 0xa1, 0xf6, 0x57, 0x19, 0x5a, 0x40, 0x49, 0x57, 0xcb, 0x3a, 0xbb, 0x20, 0x0d,
+    0x6e, 0xaa, 0x15, 0xa5, 0xd3, 0x03, 0xfb, 0xe3, 0x47, 0x90, 0xd9, 0x9e, 0x24, 0x03, 0x50, 0x7d, 0xd5, 0xf0, 0x13,
+    0xf6, 0x4c, 0x9d, 0x32, 0x6b, 0xed, 0x4b, 0xa7, 0x0e, 0x92, 0x07, 0xc3, 0xba, 0xa5, 0xb1, 0xa0, 0x6b, 0x87, 0xc6,
+    0xd5, 0x90, 0x0a, 0x72, 0x79, 0x42, 0x2a, 0xdb, 0x58, 0x46, 0xb0, 0xda, 0x4a, 0x8f, 0x48, 0xaf, 0xb0, 0x29, 0x08,
+    0xd0, 0x43, 0x36, 0xec, 0xc9, 0xfa, 0x30, 0x17, 0x94, 0xcb, 0xd9, 0xaf, 0x0b, 0x56, 0x70, 0xc1, 0xba, 0x30, 0x6e,
+    0x01, 0xe3, 0x96, 0x2b, 0xd6, 0x61, 0xcd, 0x76, 0x5c, 0x07, 0xdb, 0x9b, 0x39, 0xea, 0xb1, 0x02, 0x39, 0xf9, 0x7a,
+    0x76, 0x42, 0x58, 0x99, 0x7b, 0x79, 0xf9, 0xad, 0x1a, 0xa4, 0x5a, 0x4a, 0x6d, 0x03, 0x35, 0xd6, 0xc4, 0x56, 0x4d,
+    0xc6, 0xb6, 0x2b, 0x15, 0xea, 0x9d, 0x4e, 0xaf, 0xc6, 0x07, 0xb0, 0xe7, 0xda, 0x9a, 0xa5, 0x2b, 0x63, 0xfb, 0xad,
+    0xa2, 0xe9, 0x1b, 0x31, 0x32, 0x59, 0xa3, 0xec, 0x66, 0xee, 0x51, 0x3b, 0x1e, 0xda, 0xae, 0xd4, 0x55, 0x82, 0x61,
+    0x51, 0x17, 0x0c, 0x4d, 0xa8, 0xe7, 0xba, 0x8b, 0xad, 0x99, 0x8a, 0x85, 0x6a, 0xad, 0x95, 0x03, 0xc1, 0xc3, 0x43,
+    0x30, 0x4e, 0xd6, 0xfa, 0x07, 0xaf, 0xa3, 0x19, 0x43, 0x8a, 0x7a, 0x57, 0x35, 0x90, 0x0e, 0x04, 0x34, 0x19, 0x36,
+    0xd5, 0x1b, 0x77, 0x85, 0xd5, 0x54, 0xdf, 0x5f, 0x31, 0x58, 0x11, 0x60, 0x5f, 0x97, 0x6b, 0x96, 0x88, 0xf4, 0xa6,
+    0xe0, 0x12, 0x4d, 0x1f, 0x51, 0x26, 0xd6, 0x84, 0x14, 0x3c, 0x20, 0x0f, 0xcb, 0xdf, 0x58, 0x38, 0xd9, 0x8a, 0x29,
+    0x1c, 0x39, 0xca, 0x14, 0xa0, 0x33, 0x29, 0x01, 0x10, 0x97, 0xf4, 0xb3, 0xb6, 0xb1, 0x90, 0x6c, 0xfb, 0xc8, 0x07,
+    0xfe, 0x24, 0x89, 0xb8, 0xd3, 0xd9, 0x6a, 0xbb, 0xc0, 0x87, 0x20, 0xc4, 0x41, 0x47, 0x80, 0x79, 0x5f, 0xa1, 0xc2,
+    0x10, 0x95, 0xd8, 0xe5, 0x3e, 0x18, 0x45, 0xd3, 0x78, 0xc2, 0x9d, 0x0c, 0x95, 0x88, 0x5b, 0xb2, 0x04, 0x94, 0x8c,
+    0xde, 0x57, 0x20, 0x25, 0xb8, 0x90, 0x2e, 0xa2, 0x5a, 0x0b, 0x34, 0x05, 0x29, 0x49, 0x29, 0xd2, 0x82, 0x0a, 0x02,
+    0x43, 0xa8, 0xf4, 0x14, 0x47, 0x81, 0x7e, 0x8b, 0x07, 0x62, 0xd0, 0x60, 0xc5, 0xa2, 0x8c, 0x07, 0xf1, 0x6a, 0x21,
+    0xa8, 0x61, 0x9f, 0x67, 0x2f, 0xb3, 0x33, 0x96, 0x3f, 0x89, 0x10, 0xf6, 0x40, 0x74, 0x2f, 0x41, 0xd2, 0x93, 0x40,
+    0x67, 0x3d, 0xc5, 0x2b, 0xa7, 0x84, 0x34, 0x2c, 0xc4, 0x2c, 0x46, 0x45, 0x08, 0x5a, 0x8e, 0x68, 0x9f, 0xe2, 0x96,
+    0xa2, 0xbd, 0x87, 0xaa, 0x84, 0x69, 0xde, 0xda, 0x7b, 0x59, 0xe7, 0x2d, 0x18, 0x61, 0xae, 0xb8, 0xb5, 0xbe, 0x63,
+    0x5d, 0x4f, 0xea, 0x66, 0x47, 0xf2, 0x96, 0xa1, 0xcc, 0x40, 0x7f, 0x5c, 0x5e, 0x56, 0x46, 0x3a, 0x28, 0x53, 0x2d,
+    0xcd, 0xd1, 0x72, 0x12, 0x5b, 0xc2, 0x2d, 0x41, 0x19, 0xa1, 0xe1, 0x95, 0x67, 0x49, 0x62, 0xe8, 0x22, 0x2f, 0xee,
+    0x39, 0x0d, 0x75, 0x04, 0x50, 0xcc, 0x6a, 0x1a, 0x69, 0xc0, 0x03, 0x5d, 0x81, 0x4a, 0x49, 0x69, 0x23, 0xaf, 0x6a,
+    0x22, 0x20, 0x4e, 0xc7, 0x2c, 0x17, 0x0e, 0x9a, 0xd4, 0xa1, 0x30, 0x61, 0x0a, 0x0c, 0xcd, 0xc6, 0x20, 0xe1, 0x15,
+    0x02, 0x60, 0x9e, 0xf8, 0xd3, 0xac, 0xe0, 0xba, 0xce, 0x84, 0x3e, 0xbe, 0xbc, 0x8c, 0x85, 0xbf, 0x88, 0x0c, 0x90,
+    0xb3, 0x59, 0x76, 0xca, 0xd6, 0x40, 0xdd, 0x53, 0x83, 0x99, 0x20, 0x1b, 0xc3, 0x80, 0x12, 0x05, 0xd5, 0x32, 0x4f,
+    0xe2, 0x11, 0xd3, 0x5a, 0x6a, 0xe6, 0x83, 0x41, 0xc7, 0xce, 0x41, 0x46, 0x30, 0xb7, 0xdf, 0xef, 0xb7, 0xbd, 0x8e,
+    0x5b, 0x0a, 0x82, 0x2f, 0x57, 0x28, 0x7a, 0x8d, 0x7e, 0x94, 0x26, 0xf8, 0x3a, 0x59, 0xc0, 0x5d, 0x43, 0x29, 0x72,
+    0xe1, 0x27, 0x79, 0x52, 0x10, 0xbb, 0xde, 0x18, 0x06, 0xe5, 0x4c, 0x09, 0x6e, 0x34, 0x71, 0xc5, 0xb6, 0x7d, 0xa7,
+    0xc9, 0xa6, 0xd9, 0x49, 0xed, 0x30, 0xb5, 0x30, 0x72, 0xcd, 0x0b, 0xed, 0x01, 0x9b, 0xcb, 0x83, 0x56, 0x22, 0x55,
+    0x03, 0xaf, 0x03, 0x84, 0xc2, 0xd3, 0x75, 0x56, 0x50, 0xaa, 0x3a, 0x4b, 0x21, 0xae, 0x37, 0xd0, 0x5b, 0x26, 0xc1,
+    0x5c, 0x47, 0x82, 0x7d, 0x29, 0x10, 0x38, 0x7a, 0x64, 0x62, 0xbd, 0x9e, 0xc0, 0xf2, 0x1c, 0x47, 0xa3, 0x4f, 0x1a,
+    0xdc, 0x8a, 0xec, 0x4d, 0x36, 0x70, 0x1a, 0x25, 0xa1, 0x21, 0xae, 0x4c, 0xbc, 0x95, 0x84, 0xae, 0x6d, 0x14, 0x70,
+    0xc8, 0x56, 0xd8, 0xbe, 0xb9, 0xd0, 0x4d, 0x6e, 0x97, 0xec, 0xa1, 0xfc, 0x27, 0xcd, 0x25, 0xd7, 0xb0, 0x1c, 0x57,
+    0xd2, 0x80, 0x2b, 0xc6, 0x83, 0xa5, 0x69, 0x40, 0x02, 0x7c, 0x57, 0x8e, 0xe3, 0xe2, 0x6a, 0x12, 0xfc, 0xa1, 0x60,
+    0x3e, 0x35, 0x66, 0xba, 0x11, 0x52, 0x2d, 0xe1, 0xa4, 0x19, 0xac, 0x41, 0x93, 0xc6, 0x83, 0x12, 0x35, 0xdf, 0xa2,
+    0xa1, 0x42, 0x1c, 0x7f, 0x22, 0xaa, 0xd0, 0x04, 0x43, 0x30, 0x72, 0xaf, 0x90, 0x0c, 0x97, 0xad, 0x8a, 0x16, 0x29,
+    0x53, 0x63, 0x52, 0xa9, 0x9a, 0xe5, 0x32, 0x30, 0xb0, 0x68, 0xb7, 0xfa, 0xd2, 0x12, 0x57, 0x22, 0x37, 0x0d, 0xb5,
+    0x30, 0x29, 0x94, 0x37, 0xe1, 0xe4, 0xe8, 0x77, 0x29, 0xeb, 0xdd, 0xc4, 0x27, 0x57, 0xf8, 0xe4, 0xbe, 0xe1, 0x43,
+    0x99, 0xbc, 0x5d, 0x0c, 0x8a, 0xe0, 0x9b, 0x5a, 0x25, 0xda, 0xa7, 0x3e, 0x0a, 0x66, 0x57, 0x0b, 0x5d, 0x10, 0x28,
+    0x92, 0x4d, 0xd2, 0x81, 0xe4, 0x37, 0x14, 0x1b, 0x95, 0x67, 0x94, 0xb9, 0x62, 0x83, 0xd4, 0xbc, 0xd2, 0xcc, 0x4b,
+    0xdd, 0x86, 0xfd, 0x5e, 0x96, 0x92, 0x4e, 0x5c, 0x50, 0x26, 0xf6, 0xae, 0xa3, 0x8d, 0x97, 0x86, 0x99, 0xb0, 0x7e,
+    0x85, 0xb1, 0x53, 0xa3, 0x50, 0x2a, 0x45, 0x20, 0x8e, 0x8d, 0xaf, 0x95, 0x65, 0x90, 0xf9, 0x6b, 0xec, 0x29, 0x00,
+    0x25, 0x81, 0xc5, 0xd7, 0x54, 0xf2, 0xa2, 0xb0, 0x4e, 0xc7, 0x3b, 0x44, 0xc7, 0x4a, 0x84, 0xd6, 0x44, 0xbe, 0xd6,
+    0x67, 0xb1, 0x5f, 0x73, 0x09, 0x4d, 0x4a, 0xe6, 0x83, 0x3c, 0xb0, 0x55, 0x20, 0xa2, 0xd2, 0x6d, 0xc9, 0x20, 0x21,
+    0x87, 0x74, 0x95, 0xe8, 0xb5, 0x91, 0x0c, 0x5a, 0xa7, 0x42, 0xa2, 0xa5, 0xc3, 0x30, 0x72, 0xd0, 0x71, 0xa7, 0xb5,
+    0x58, 0x21, 0x64, 0xd3, 0xde, 0x24, 0x56, 0x44, 0xe7, 0x34, 0x47, 0x13, 0xce, 0xd4, 0xe9, 0x8e, 0x03, 0xe8, 0x80,
+    0xd8, 0x5f, 0x61, 0xbd, 0xb5, 0x66, 0xa7, 0xeb, 0x57, 0x0e, 0xdf, 0xe5, 0x65, 0x82, 0xfc, 0x20, 0x0c, 0x5e, 0x58,
+    0xb3, 0x81, 0x92, 0xbd, 0x7b, 0x2f, 0xb1, 0x15, 0xd9, 0x9f, 0x55, 0x49, 0xe5, 0x29, 0xd4, 0x38, 0xb7, 0xbe, 0x4e,
+    0xcc, 0x0c, 0x2d, 0xaa, 0x8a, 0x7d, 0x43, 0xaa, 0xef, 0x2b, 0x85, 0x5d, 0xa1, 0xbc, 0x2f, 0x87, 0x8e, 0x5d, 0xd7,
+    0x0d, 0x72, 0x72, 0x5e, 0xee, 0xac, 0x73, 0x21, 0xef, 0xde, 0x35, 0x7d, 0xa6, 0x53, 0x3d, 0xfc, 0x13, 0x07, 0x95,
+    0x73, 0x71, 0x91, 0x92, 0x05, 0xf3, 0x44, 0xa9, 0xa3, 0x15, 0x07, 0xb4, 0xdd, 0x43, 0x4f, 0x3b, 0x3a, 0x8b, 0x62,
+    0x6e, 0xe9, 0x51, 0x84, 0xa7, 0x8d, 0xf2, 0x49, 0x1a, 0x1d, 0x80, 0x17, 0x9a, 0x90, 0xe4, 0x84, 0x9b, 0xb6, 0x68,
+    0x31, 0x9a, 0x32, 0x0c, 0x81, 0x2b, 0x7b, 0xc2, 0x94, 0x3d, 0x77, 0x10, 0x6f, 0x31, 0x30, 0x5b, 0x0f, 0x7b, 0xd9,
+    0xec, 0x5e, 0x33, 0xff, 0x61, 0x8d, 0x40, 0xb6, 0xcd, 0x54, 0x5d, 0xd9, 0x78, 0x97, 0x22, 0x12, 0x23, 0x6c, 0xeb,
+    0xc6, 0x96, 0xb6, 0x7e, 0xaf, 0xe1, 0x5e, 0x57, 0x8e, 0x79, 0x4d, 0xa9, 0x36, 0xf4, 0xb0, 0x72, 0x73, 0x98, 0xe9,
+    0xc8, 0x8b, 0x15, 0x74, 0x7b, 0x22, 0x28, 0x04, 0x4e, 0x84, 0xb6, 0x07, 0x15, 0x37, 0x10, 0x29, 0xb9, 0xd2, 0xaa,
+    0xd9, 0x22, 0x19, 0x4b, 0x60, 0xc1, 0x85, 0xe5, 0x92, 0x8f, 0xce, 0xe2, 0x24, 0xa9, 0x4a, 0xff, 0x50, 0x01, 0x2f,
+    0x86, 0xbd, 0x49, 0xb4, 0x0b, 0x8c, 0x16, 0x0a, 0x04, 0x57, 0x1b, 0x61, 0xef, 0x1d, 0xb7, 0x5a, 0x77, 0x11, 0x71,
+    0xe4, 0x66, 0x34, 0x02, 0xea, 0x31, 0xc2, 0xaa, 0x59, 0x7b, 0xef, 0x19, 0x86, 0xd4, 0x0c, 0x7c, 0x50, 0x9d, 0x51,
+    0xf1, 0x67, 0xd9, 0x53, 0x9f, 0x89, 0xde, 0x8d, 0xaa, 0xab, 0x19, 0x50, 0x51, 0x81, 0x0f, 0x33, 0xc4, 0xd2, 0x56,
+    0x81, 0x80, 0x5c, 0x0f, 0x8b, 0x52, 0xc0, 0x24, 0x0d, 0x16, 0x94, 0x02, 0x6b, 0xad, 0xec, 0x5e, 0xde, 0x14, 0xcc,
+    0xa1, 0x50, 0xb8, 0xe8, 0xff, 0x24, 0x9b, 0xcd, 0xd1, 0x32, 0x6b, 0x30, 0x35, 0x34, 0x78, 0xdf, 0xa8, 0x2f, 0xd7,
+    0x94, 0xd5, 0xfa, 0xd0, 0x8e, 0xac, 0xf1, 0x93, 0x76, 0x94, 0xc1, 0xa1, 0x5a, 0xe8, 0xa2, 0xba, 0xdd, 0xdc, 0x14,
+    0x31, 0xeb, 0x78, 0xdc, 0x27, 0xbd, 0xad, 0xad, 0x49, 0x4f, 0xd3, 0x80, 0x64, 0x92, 0x64, 0x78, 0x93, 0x01, 0xca,
+    0x8a, 0x38, 0xcb, 0xb2, 0x41, 0xbe, 0x65, 0x59, 0xe2, 0xfa, 0x7d, 0xd7, 0xdb, 0xab, 0x79, 0xd6, 0xde, 0xde, 0xd5,
+    0x2e, 0x72, 0x55, 0x27, 0x3d, 0xc8, 0xc3, 0x21, 0x14, 0xad, 0xd8, 0x94, 0xe1, 0x72, 0x96, 0x8d, 0x59, 0x60, 0x43,
+    0xf7, 0xd4, 0x2e, 0x95, 0x56, 0x86, 0xcd, 0x91, 0x32, 0x67, 0xf9, 0xae, 0x1e, 0x49, 0x0d, 0xf6, 0x80, 0x05, 0xb4,
+    0xb9, 0xf0, 0x7d, 0x78, 0x92, 0x64, 0xc7, 0x51, 0x72, 0x20, 0x14, 0x78, 0xad, 0xe5, 0x07, 0x70, 0x19, 0xc9, 0x62,
+    0x35, 0x94, 0xd4, 0xf7, 0x83, 0xef, 0x83, 0x9b, 0x7b, 0x54, 0xde, 0x8a, 0xdd, 0xf1, 0xdb, 0x7e, 0xc7, 0x56, 0x11,
+    0xb1, 0x97, 0xe6, 0x74, 0xa0, 0x71, 0x0a, 0xa0, 0xcc, 0x01, 0x68, 0xb2, 0xc2, 0x8b, 0x58, 0xf8, 0x72, 0xf0, 0x52,
+    0xb9, 0xd4, 0x19, 0xb8, 0x10, 0xe0, 0xe4, 0x27, 0x31, 0x6f, 0xe1, 0x79, 0xa4, 0xed, 0x2d, 0x45, 0x05, 0xc6, 0x15,
+    0x29, 0x2e, 0x5d, 0x2a, 0x6f, 0xd0, 0xfb, 0x18, 0x1e, 0x41, 0xb3, 0x8d, 0x8d, 0xa5, 0xf3, 0x2a, 0xe2, 0x53, 0x3f,
+    0x8f, 0xd2, 0x71, 0x36, 0x73, 0xdc, 0x4d, 0xdb, 0x76, 0xfd, 0x82, 0x3c, 0x91, 0xaf, 0xdc, 0x72, 0xe3, 0xc8, 0x9b,
+    0xb2, 0xd0, 0x1e, 0xd8, 0x9b, 0x1f, 0xbd, 0xf7, 0x2c, 0x3c, 0xda, 0xdd, 0x58, 0x4e, 0x59, 0xd9, 0x3f, 0xf2, 0xce,
+    0x75, 0xcc, 0xdd, 0x7b, 0x8b, 0x52, 0x06, 0x7a, 0x85, 0xfd, 0x73, 0x09, 0x06, 0xb0, 0x1b, 0xc5, 0xdf, 0x41, 0xca,
+    0xbd, 0xa7, 0x03, 0x11, 0x19, 0xa7, 0xbd, 0xbc, 0xb4, 0x33, 0x8a, 0x18, 0xd8, 0x77, 0xb4, 0xb3, 0x7a, 0xf7, 0x6e,
+    0xa5, 0xe6, 0xab, 0x52, 0x6f, 0xc4, 0xc2, 0x9a, 0xa7, 0xee, 0x1d, 0xd0, 0xd1, 0x4a, 0x7d, 0x23, 0x8f, 0x18, 0x29,
+    0xcd, 0x55, 0x3b, 0xc1, 0x31, 0xb6, 0xf8, 0xfa, 0x6d, 0x7d, 0x28, 0xa2, 0x14, 0x7e, 0x0c, 0xd6, 0x4b, 0x04, 0xea,
+    0x1b, 0x1c, 0x1c, 0xef, 0x20, 0xdc, 0xda, 0x75, 0x06, 0x81, 0x73, 0xa7, 0xd5, 0xba, 0xfc, 0x69, 0xeb, 0xf0, 0xe7,
+    0xa8, 0xf5, 0xdb, 0x5e, 0xeb, 0xc7, 0xa1, 0x7b, 0xe9, 0xfc, 0xb4, 0x35, 0x38, 0x94, 0x6f, 0x87, 0x3f, 0xf7, 0x7f,
+    0x2a, 0x86, 0x5f, 0x8a, 0xc2, 0x0d, 0xd7, 0xdd, 0x3a, 0x01, 0x4f, 0x29, 0xdc, 0x6a, 0xb5, 0xfa, 0xf0, 0xb4, 0x80,
+    0x27, 0xfc, 0x79, 0x06, 0x3f, 0x2e, 0x0f, 0xad, 0xff, 0xf0, 0x53, 0xfa, 0x1f, 0x7f, 0xca, 0x87, 0x38, 0xe6, 0xe1,
+    0xcf, 0x3f, 0x15, 0xf6, 0xbd, 0x7e, 0xb8, 0x35, 0xdc, 0x74, 0x1d, 0x5d, 0xf3, 0x65, 0x58, 0x3d, 0x42, 0xab, 0xc3,
+    0x9f, 0xe5, 0x9b, 0x7d, 0xef, 0x68, 0xb7, 0x1f, 0x0e, 0x2f, 0x1d, 0xfb, 0xf2, 0x9e, 0x7b, 0xe9, 0xba, 0x97, 0x1b,
+    0x38, 0xcf, 0x1c, 0x46, 0xbf, 0x07, 0x3f, 0x4f, 0xe0, 0xa7, 0x0d, 0x3f, 0x4f, 0xe1, 0xe7, 0xcf, 0xd0, 0x4d, 0xc4,
+    0xdf, 0x2e, 0x29, 0x16, 0x72, 0x89, 0x07, 0x16, 0x11, 0xac, 0x82, 0xbb, 0xb1, 0x15, 0x7b, 0x13, 0x22, 0x1a, 0xec,
+    0x43, 0xdf, 0xf7, 0x31, 0x4c, 0xea, 0x2c, 0x3f, 0x6e, 0xc0, 0xa2, 0x23, 0xe7, 0x6c, 0x04, 0xcc, 0x13, 0x91, 0x83,
+    0x22, 0xe0, 0xe2, 0x6c, 0xb5, 0xc0, 0xc3, 0x55, 0x6f, 0x1c, 0x4e, 0x98, 0x03, 0x46, 0xc1, 0x73, 0x86, 0x0f, 0x5d,
+    0xd7, 0x7b, 0x26, 0xcf, 0x0c, 0x71, 0x9f, 0x0b, 0xd6, 0x4a, 0x33, 0x61, 0xd2, 0xd8, 0xae, 0x37, 0x5f, 0x53, 0x09,
+    0xdb, 0x3a, 0x3d, 0x81, 0xba, 0x0d, 0x71, 0xd0, 0xf6, 0x3d, 0x8b, 0x3e, 0xe1, 0x96, 0x7c, 0x6d, 0x1c, 0x02, 0xaf,
+    0x58, 0xf2, 0x4d, 0xa3, 0xd1, 0xb0, 0x11, 0x85, 0x3b, 0xf6, 0x98, 0xc1, 0x0c, 0x2b, 0x26, 0x22, 0x27, 0xa5, 0x29,
+    0x2c, 0x5b, 0x98, 0xfc, 0x6d, 0x94, 0xf3, 0x8d, 0xca, 0xb0, 0x0d, 0x6b, 0x96, 0x6c, 0xd3, 0xd2, 0xbf, 0xc5, 0x14,
+    0x68, 0x5a, 0xd2, 0xf9, 0x87, 0x39, 0x7e, 0x98, 0x12, 0x5a, 0xaf, 0x1d, 0x0e, 0x1e, 0x7a, 0x01, 0x72, 0x47, 0xf4,
+    0x73, 0xde, 0xa2, 0x1a, 0x83, 0xbf, 0x32, 0xcc, 0xe0, 0x89, 0xf9, 0x30, 0x44, 0xb3, 0x2c, 0x75, 0x70, 0x2b, 0x45,
+    0x71, 0xff, 0x02, 0x77, 0x46, 0x5a, 0x7a, 0xfb, 0xa1, 0xda, 0x31, 0x07, 0x39, 0x63, 0xdf, 0x47, 0xc9, 0x27, 0x96,
+    0x3b, 0xe7, 0x5e, 0xa7, 0xfb, 0x15, 0x75, 0xf6, 0xd0, 0x36, 0x7b, 0x55, 0x1d, 0xa3, 0x29, 0xb3, 0x40, 0x1d, 0x11,
+    0xb6, 0x3a, 0x5e, 0x8e, 0x51, 0x2d, 0x24, 0x41, 0xe1, 0x65, 0x61, 0x97, 0x38, 0xdc, 0xde, 0x2d, 0x4e, 0x4f, 0xfa,
+    0x76, 0x60, 0xdb, 0x60, 0xf1, 0x1f, 0x50, 0xd8, 0x4a, 0x18, 0x16, 0x60, 0x90, 0xed, 0xc6, 0x3d, 0xbe, 0xb9, 0x59,
+    0x05, 0x9c, 0xf0, 0x20, 0x9d, 0xba, 0x27, 0x5e, 0xe4, 0x4d, 0x43, 0x18, 0x70, 0x04, 0xcd, 0xb0, 0x4b, 0x6f, 0xb4,
+    0x1b, 0xcb, 0x69, 0x30, 0x16, 0xe2, 0x27, 0x51, 0xc1, 0x5f, 0x60, 0x3c, 0x22, 0x1c, 0xa1, 0xb1, 0xef, 0xb3, 0x73,
+    0x36, 0x52, 0x76, 0x06, 0x10, 0x2a, 0x72, 0x7b, 0xee, 0x28, 0x34, 0x9a, 0xc1, 0xdc, 0x61, 0x78, 0x30, 0xb0, 0x61,
+    0x2f, 0xc1, 0xae, 0x0c, 0xa3, 0xc3, 0xce, 0x70, 0x90, 0x86, 0x20, 0x6b, 0x35, 0x6d, 0x65, 0xd1, 0xa2, 0x56, 0xd4,
+    0x1d, 0x0e, 0x9c, 0x53, 0x30, 0xd2, 0xc1, 0x16, 0x77, 0xf0, 0x0d, 0x23, 0x14, 0x45, 0xf8, 0x8e, 0x9d, 0x3c, 0x3b,
+    0x9f, 0x3b, 0xf6, 0xee, 0x96, 0xbd, 0x89, 0xa5, 0x9e, 0x0d, 0xec, 0x05, 0x73, 0x87, 0x67, 0xae, 0xd9, 0x79, 0x7b,
+    0x88, 0xa0, 0x62, 0x21, 0x4e, 0x7e, 0x36, 0xb0, 0xfb, 0x62, 0xea, 0x36, 0x0c, 0x9a, 0xca, 0xe5, 0xc7, 0x15, 0x3d,
+    0x20, 0x54, 0x55, 0x57, 0x05, 0x1d, 0x94, 0x75, 0x03, 0x67, 0x6a, 0x22, 0xd1, 0xc2, 0xc9, 0x24, 0x15, 0xc0, 0xe1,
+    0xc1, 0x66, 0x30, 0xa9, 0xd1, 0x6d, 0x7b, 0x38, 0x38, 0x0b, 0xee, 0xd9, 0xf7, 0xd4, 0xcb, 0x09, 0x0b, 0xc0, 0xbb,
+    0xa0, 0xe9, 0x4f, 0x50, 0x8b, 0xc0, 0xcf, 0x39, 0x03, 0x24, 0xcf, 0xa8, 0x68, 0x2c, 0x8b, 0x16, 0x58, 0x74, 0x10,
+    0x20, 0xa8, 0x5e, 0xa1, 0xad, 0x3f, 0xb1, 0x26, 0xe3, 0x90, 0x60, 0xbf, 0x7b, 0x17, 0x96, 0x66, 0xb3, 0x33, 0xc4,
+    0xf3, 0x86, 0x9c, 0x17, 0xdf, 0xc7, 0x1c, 0x54, 0xc2, 0x56, 0xdf, 0x76, 0x07, 0xb6, 0x85, 0x4b, 0xdb, 0xcb, 0x36,
+    0x43, 0x41, 0xe1, 0x78, 0xf3, 0x3d, 0x0b, 0xa6, 0xfd, 0xb0, 0x3d, 0x70, 0x72, 0xa1, 0x3a, 0x12, 0x3c, 0xb7, 0x14,
+    0x12, 0xbc, 0xed, 0x4d, 0x41, 0xa0, 0x23, 0xe7, 0x6e, 0xd8, 0x9b, 0xaa, 0x10, 0x8a, 0x3e, 0x6e, 0x8e, 0xdd, 0x20,
+    0x86, 0x1f, 0x4e, 0x0b, 0x99, 0x66, 0xaa, 0xfb, 0x6a, 0xcd, 0xec, 0x06, 0x63, 0x65, 0x91, 0x27, 0x61, 0xb6, 0xe9,
+    0x60, 0x84, 0x16, 0x24, 0xed, 0xee, 0x00, 0x60, 0xd8, 0x74, 0x14, 0xa7, 0x6d, 0x29, 0x56, 0x53, 0xf6, 0xf9, 0x61,
+    0xb5, 0x1c, 0x6c, 0x10, 0x31, 0xbf, 0xd2, 0x3e, 0x00, 0x56, 0x90, 0x78, 0xf9, 0x50, 0x9d, 0x79, 0x3d, 0xaf, 0x9d,
+    0x6f, 0x2d, 0x95, 0x28, 0x62, 0x9e, 0x21, 0xa1, 0x78, 0xa9, 0xdd, 0x30, 0x61, 0x6e, 0xcf, 0x91, 0x18, 0x9a, 0xe5,
+    0xc3, 0x36, 0x30, 0xbd, 0x0a, 0xb0, 0xa7, 0xe6, 0xb6, 0x48, 0xc2, 0xaa, 0xb9, 0x77, 0x08, 0xac, 0x3d, 0x0c, 0x5f,
+    0x89, 0x13, 0xc7, 0x9e, 0x8a, 0xe6, 0xb3, 0x24, 0x7c, 0xde, 0x38, 0x2e, 0x8e, 0xf0, 0x44, 0x68, 0xdf, 0x1f, 0x2d,
+    0x72, 0x90, 0x07, 0xfc, 0x35, 0x58, 0x06, 0xa1, 0x6c, 0x8a, 0x8e, 0x1e, 0x1e, 0x01, 0x7b, 0x84, 0x78, 0x23, 0x6c,
+    0x6e, 0x54, 0xa3, 0x45, 0x49, 0xc6, 0x0b, 0x1d, 0x0c, 0xf7, 0xb8, 0x74, 0xed, 0x51, 0x30, 0xc8, 0x13, 0x63, 0x07,
+    0xcf, 0xfc, 0xfd, 0x11, 0x56, 0xe3, 0x04, 0x85, 0x5b, 0xd2, 0x6e, 0xab, 0xc4, 0xdf, 0xbe, 0x9f, 0x82, 0x04, 0xc7,
+    0x3a, 0xf0, 0xb3, 0xee, 0xde, 0x4d, 0x24, 0x52, 0xbb, 0x69, 0x8f, 0x4e, 0x22, 0x30, 0x1e, 0x9c, 0xfb, 0x29, 0x54,
+    0x23, 0x89, 0xa8, 0x28, 0x47, 0x0b, 0xd4, 0x3c, 0x55, 0xab, 0xe0, 0x3b, 0x34, 0x23, 0xf0, 0x1c, 0xc3, 0xd6, 0xe4,
+    0xa7, 0xea, 0xc6, 0x22, 0x96, 0xef, 0xba, 0x74, 0xb4, 0x85, 0x07, 0x90, 0x82, 0xd1, 0x04, 0xc3, 0xb8, 0x14, 0x94,
+    0xac, 0xf8, 0xef, 0xa3, 0x11, 0x2b, 0x9f, 0x1e, 0x66, 0x9b, 0x9b, 0x43, 0x71, 0x6e, 0x41, 0x8c, 0xc3, 0x8d, 0xe8,
+    0x6a, 0x5c, 0x01, 0x50, 0x9f, 0xce, 0x89, 0xeb, 0x81, 0x69, 0xc5, 0x9a, 0x2e, 0xc5, 0x3e, 0x39, 0xcc, 0x00, 0x14,
+    0xdc, 0x72, 0x0e, 0xfd, 0xc1, 0x9f, 0x86, 0xe0, 0x1e, 0xfb, 0x5f, 0xba, 0x5b, 0x4a, 0xd0, 0xf4, 0xe4, 0x99, 0xe2,
+    0x92, 0xce, 0x58, 0x3b, 0x1e, 0xc5, 0x46, 0x83, 0xc2, 0x4b, 0x01, 0x03, 0xd0, 0xe6, 0x20, 0x13, 0x2a, 0x0e, 0x42,
+    0x8e, 0x0a, 0x6c, 0x1f, 0x37, 0x3f, 0xc7, 0x9d, 0xfd, 0x14, 0x2c, 0xbc, 0x81, 0x7e, 0x7b, 0x0c, 0x6f, 0x7f, 0xd2,
+    0x6f, 0x2f, 0x59, 0xf0, 0x4b, 0x29, 0x43, 0xf7, 0xb5, 0x29, 0x1e, 0xa8, 0x29, 0x4a, 0xb1, 0x44, 0x06, 0x0d, 0x99,
+    0x9b, 0xaf, 0xc4, 0x6c, 0xb8, 0x5b, 0xa2, 0xda, 0x91, 0xa2, 0x2b, 0xf7, 0x79, 0x74, 0x82, 0xc4, 0x75, 0x4d, 0x52,
+    0x18, 0xb9, 0x04, 0x26, 0xc2, 0x15, 0xdf, 0x12, 0x73, 0xf6, 0xdb, 0x60, 0x83, 0xd7, 0xf2, 0x0e, 0xd0, 0xbe, 0x63,
+    0xb3, 0x39, 0xbf, 0xd8, 0x27, 0x45, 0x1f, 0xc8, 0xb4, 0x01, 0x71, 0x76, 0xde, 0xee, 0xc5, 0xbb, 0xbc, 0x17, 0x83,
+    0x54, 0xcf, 0x15, 0x8b, 0xe1, 0x5e, 0xf5, 0xde, 0x62, 0x94, 0xd2, 0x64, 0x26, 0xaf, 0x86, 0x5e, 0x57, 0xa2, 0xb7,
+    0xb9, 0x09, 0x08, 0xf6, 0x8c, 0xae, 0x5c, 0x74, 0x2d, 0x4b, 0x41, 0x13, 0x80, 0xe8, 0x51, 0x9d, 0xe5, 0x88, 0xe3,
+    0x30, 0x9b, 0x0d, 0x05, 0x07, 0x73, 0xd7, 0x8e, 0x8a, 0x63, 0x62, 0x77, 0x99, 0xb0, 0x03, 0x98, 0x11, 0x97, 0xb7,
+    0x3a, 0x22, 0x3a, 0x2c, 0xfa, 0xeb, 0xf8, 0xf6, 0x47, 0x8f, 0x6d, 0x76, 0x5c, 0xd0, 0x20, 0xb5, 0xb1, 0x1e, 0x56,
+    0x63, 0x41, 0x7d, 0xf8, 0x51, 0x53, 0xa9, 0x2c, 0x36, 0x37, 0xcb, 0xfa, 0x51, 0xad, 0xda, 0xc1, 0xb5, 0xd3, 0x94,
+    0xf3, 0x66, 0x36, 0x08, 0x07, 0x22, 0x26, 0x50, 0xa0, 0xa5, 0x95, 0x15, 0x03, 0x0c, 0x29, 0xcb, 0x51, 0x3e, 0x85,
+    0xcc, 0x8b, 0xcb, 0x52, 0xa7, 0xbe, 0xc8, 0x78, 0x64, 0x88, 0xa7, 0x9e, 0x64, 0xac, 0x80, 0x82, 0xf5, 0x52, 0x2f,
+    0xa1, 0x25, 0x02, 0xcc, 0x9f, 0xa9, 0x1c, 0x1a, 0x61, 0x81, 0x44, 0xa1, 0x61, 0x96, 0x28, 0xe3, 0xb3, 0x08, 0x63,
+    0xd0, 0xf6, 0x4f, 0x6a, 0xb1, 0xaf, 0x42, 0x19, 0x1d, 0xc5, 0x61, 0x3e, 0x0c, 0xa8, 0x7e, 0x21, 0x25, 0xd8, 0x34,
+    0x7c, 0x0f, 0x6c, 0x54, 0x39, 0x9e, 0x24, 0x08, 0x9f, 0xc6, 0x39, 0x23, 0x4f, 0x61, 0x43, 0xc2, 0x2c, 0x4d, 0xdb,
+    0x48, 0xb5, 0x8b, 0xcc, 0x20, 0x94, 0x0b, 0xf3, 0x4f, 0x8d, 0xb3, 0x8b, 0x2c, 0x5c, 0x69, 0x0d, 0xe6, 0xc7, 0x1b,
+    0x13, 0xa0, 0xec, 0xf2, 0x32, 0x13, 0x3e, 0x6e, 0x44, 0xf6, 0x86, 0xae, 0x98, 0x0e, 0x14, 0x52, 0x81, 0x13, 0x91,
+    0xc5, 0x43, 0x67, 0x28, 0x34, 0xc2, 0x01, 0x9d, 0x22, 0xe7, 0xae, 0xb1, 0xe9, 0xf3, 0x81, 0xf6, 0x8d, 0xd2, 0xd0,
+    0x49, 0x40, 0x08, 0x08, 0xdc, 0x0d, 0x6b, 0x2a, 0x1d, 0xa4, 0x41, 0x42, 0xa5, 0xe8, 0xe7, 0x00, 0xfe, 0x61, 0x24,
+    0x29, 0x00, 0xf6, 0x43, 0x35, 0x52, 0x44, 0x59, 0x16, 0xb8, 0x00, 0x34, 0xd7, 0x3e, 0xae, 0x84, 0x2f, 0x0c, 0x54,
+    0x98, 0x9e, 0x66, 0xe5, 0xa5, 0x50, 0x22, 0xef, 0xd6, 0xa4, 0xac, 0x91, 0x4c, 0x3e, 0x45, 0x87, 0x4f, 0x79, 0xd7,
+    0xaf, 0x25, 0x1e, 0xba, 0xe0, 0x29, 0x2c, 0xab, 0x7a, 0x7e, 0x15, 0x72, 0x72, 0xae, 0x41, 0x57, 0x48, 0xa1, 0xbf,
+    0xe2, 0x24, 0xef, 0xbd, 0xf2, 0xab, 0x5a, 0x6a, 0x0c, 0x65, 0xef, 0xd7, 0x35, 0xc3, 0xf2, 0x72, 0x5e, 0x85, 0x29,
+    0x08, 0xb8, 0x25, 0x4b, 0x82, 0xa5, 0xd4, 0x10, 0x60, 0x61, 0x7b, 0xa4, 0x95, 0x82, 0xbc, 0xd4, 0xe1, 0x9d, 0xa7,
+    0x60, 0x05, 0x18, 0x87, 0x5a, 0x2a, 0x99, 0x46, 0x12, 0x5f, 0x2a, 0x51, 0x60, 0xca, 0xfd, 0x11, 0xf8, 0xa9, 0xcd,
+    0x93, 0xae, 0x73, 0xd7, 0x8f, 0x67, 0x98, 0xda, 0x43, 0xa0, 0xc7, 0xde, 0x1d, 0x30, 0x25, 0xea, 0x3a, 0xac, 0x20,
+    0x0e, 0xcd, 0x6a, 0x9a, 0x05, 0xcc, 0x98, 0x36, 0x68, 0xc9, 0x36, 0xd8, 0x72, 0x39, 0xd8, 0x47, 0x62, 0x7b, 0x56,
+    0x2b, 0x20, 0x74, 0x0d, 0x1a, 0x18, 0x72, 0x97, 0x0a, 0x2d, 0xcc, 0x7b, 0x5d, 0x2a, 0xc2, 0xfd, 0x39, 0xe0, 0xd2,
+    0x0a, 0xce, 0xbc, 0x8c, 0x06, 0xde, 0x8f, 0x8f, 0x13, 0x4c, 0x7c, 0x41, 0xac, 0xc0, 0x0e, 0x0e, 0x3a, 0xcd, 0xa6,
+    0xc0, 0xa9, 0xb8, 0x48, 0x19, 0x2c, 0x2b, 0x4a, 0x6d, 0xf8, 0x21, 0x45, 0xb6, 0xee, 0xf2, 0x40, 0x77, 0x21, 0x16,
+    0xc0, 0x4e, 0xbf, 0x60, 0xe4, 0x5b, 0xd6, 0xcb, 0x80, 0xc1, 0xa9, 0xd6, 0x38, 0x08, 0xfc, 0xe6, 0x66, 0x32, 0x2c,
+    0x53, 0x62, 0xbb, 0x26, 0xab, 0x0b, 0xc8, 0x61, 0xa8, 0x26, 0xee, 0x20, 0x2c, 0x95, 0x3d, 0x5e, 0x94, 0x33, 0x5c,
+    0x2e, 0x65, 0x21, 0x37, 0xcf, 0xab, 0x69, 0x3e, 0xb7, 0xd2, 0x6c, 0x3a, 0xde, 0x8a, 0x2f, 0x0a, 0xfe, 0x81, 0x13,
+    0x4b, 0xab, 0x9e, 0x52, 0x2b, 0x3c, 0xca, 0xdc, 0x92, 0x75, 0x4a, 0x6a, 0x75, 0xdd, 0x40, 0x35, 0xc2, 0xd3, 0x34,
+    0x6c, 0x04, 0x42, 0x4c, 0x70, 0xf1, 0xeb, 0x26, 0x13, 0xd3, 0xde, 0x12, 0x52, 0x47, 0xd8, 0x3d, 0x94, 0x13, 0xdc,
+    0xd5, 0x3c, 0xfb, 0x3c, 0x9c, 0x5f, 0xcd, 0xdc, 0x7b, 0x06, 0x73, 0x3f, 0x0e, 0xb9, 0xc1, 0xe8, 0xb1, 0x4c, 0xf8,
+    0x91, 0xb1, 0x8f, 0x5c, 0x55, 0x3d, 0x39, 0x09, 0x2b, 0x91, 0x25, 0x9e, 0x8c, 0xa3, 0x0e, 0xe3, 0x54, 0xb4, 0x26,
+    0xc8, 0x2e, 0x2f, 0x0b, 0x73, 0x2f, 0x50, 0xd0, 0xd4, 0xe3, 0xf5, 0x38, 0x6d, 0xc5, 0xce, 0x46, 0x24, 0x72, 0xef,
+    0x55, 0x2d, 0x12, 0x59, 0xf1, 0x39, 0x8e, 0x74, 0xc5, 0x41, 0xee, 0x93, 0x93, 0xd5, 0x4d, 0x2a, 0x74, 0x8b, 0x46,
+    0xdb, 0xd8, 0xa3, 0xfa, 0x40, 0x52, 0xcf, 0xa8, 0xc0, 0xaa, 0xc6, 0xbe, 0x7b, 0xb7, 0x23, 0xd2, 0x2d, 0x95, 0x62,
+    0x83, 0xa5, 0x85, 0xd1, 0x8c, 0x51, 0x30, 0x28, 0x29, 0x32, 0x50, 0xa3, 0xfc, 0x0a, 0xc1, 0xb0, 0x47, 0x0d, 0x40,
+    0x71, 0xae, 0xaf, 0x7e, 0x5c, 0x4a, 0xb6, 0x10, 0x90, 0xb8, 0x4b, 0x06, 0x62, 0x4d, 0x30, 0x33, 0xf2, 0xc9, 0x7b,
+    0xe0, 0xbc, 0x01, 0x43, 0x1f, 0x01, 0xfc, 0x02, 0xb1, 0xe9, 0xc1, 0xc4, 0xb6, 0x89, 0x28, 0xfa, 0x6c, 0xe0, 0x39,
+    0x00, 0x3b, 0xaf, 0x42, 0xa3, 0xef, 0xaa, 0x14, 0x30, 0x64, 0x03, 0x37, 0x60, 0x55, 0x58, 0x6e, 0xef, 0x39, 0xb8,
+    0x0d, 0xf0, 0xfa, 0x4c, 0x36, 0xdf, 0xc0, 0x3c, 0xc1, 0xea, 0xec, 0xc2, 0xaf, 0x2c, 0x6b, 0x71, 0xee, 0x74, 0xd0,
+    0xa8, 0x57, 0x94, 0x10, 0xb5, 0xfb, 0x58, 0x7b, 0x80, 0x11, 0x16, 0xf1, 0xfe, 0x0a, 0xdf, 0xf5, 0xb8, 0xe5, 0x9e,
+    0x46, 0x8b, 0x30, 0x5d, 0x25, 0x8d, 0x41, 0xc9, 0xba, 0x9f, 0x8c, 0xb8, 0x97, 0xfb, 0x22, 0x16, 0x5c, 0xe1, 0xc8,
+    0xaa, 0x90, 0x62, 0x03, 0x49, 0x7a, 0xda, 0xa3, 0x03, 0xf6, 0x8d, 0x66, 0x2f, 0xa0, 0xcc, 0xfb, 0x8a, 0x54, 0x12,
+    0x52, 0x9a, 0xdd, 0x10, 0x49, 0xc2, 0x5a, 0x91, 0xa7, 0xce, 0xfb, 0x8e, 0xf6, 0xb9, 0x95, 0x44, 0x30, 0x82, 0x93,
+    0x30, 0x1d, 0x2b, 0x0f, 0x9a, 0x02, 0x5c, 0x45, 0x47, 0x4c, 0xdf, 0x04, 0xe4, 0x37, 0x03, 0xb9, 0xbd, 0x92, 0x5c,
+    0x9b, 0x6b, 0x18, 0x9e, 0x20, 0xc1, 0xaa, 0x48, 0x04, 0x1e, 0x51, 0x03, 0x8e, 0xf9, 0x3a, 0xcf, 0x03, 0x4c, 0xf8,
+    0xda, 0xde, 0x04, 0x80, 0x72, 0x72, 0x55, 0x9c, 0x95, 0x40, 0x37, 0x60, 0xb9, 0x3e, 0x4e, 0x8d, 0x8a, 0xc4, 0xc5,
+    0x8d, 0xe9, 0xea, 0x96, 0xfe, 0x0c, 0x2d, 0x67, 0x32, 0xc4, 0x74, 0x10, 0x04, 0x64, 0xea, 0x3b, 0xe6, 0x08, 0x99,
+    0x2b, 0xac, 0xcf, 0xb9, 0x53, 0x9b, 0xba, 0xc7, 0xa8, 0x9b, 0x27, 0xa9, 0xc5, 0xeb, 0xb4, 0x29, 0x25, 0x62, 0x52,
+    0x62, 0x6e, 0x88, 0x54, 0x6c, 0xa6, 0xc4, 0x9d, 0x5b, 0xdf, 0x68, 0x21, 0x6d, 0xb4, 0x0d, 0x91, 0x83, 0xcd, 0x2a,
+    0x79, 0x4f, 0x60, 0x3c, 0x17, 0x84, 0x2f, 0x5f, 0x51, 0x92, 0x0e, 0x73, 0x4c, 0x04, 0xab, 0x17, 0x53, 0x91, 0xbf,
+    0x73, 0x74, 0x9a, 0xbd, 0x41, 0x0f, 0x52, 0x6f, 0x20, 0x31, 0x6b, 0xe2, 0xbb, 0x90, 0x86, 0x3a, 0x42, 0xa0, 0x32,
+    0xaa, 0x65, 0x3a, 0x4e, 0xac, 0xc2, 0x37, 0x82, 0xaf, 0xde, 0xea, 0xe3, 0x7c, 0xe3, 0xb9, 0xb1, 0x1a, 0x41, 0x0c,
+    0xde, 0x42, 0x3e, 0xf4, 0xa4, 0x08, 0x07, 0xc2, 0xe5, 0x9b, 0x9b, 0xbd, 0x7c, 0x97, 0x57, 0x21, 0x92, 0x0a, 0xc6,
+    0x18, 0x33, 0x8a, 0x71, 0x4f, 0xd4, 0xd4, 0x62, 0x0e, 0x03, 0xcb, 0xd6, 0x61, 0x8e, 0x07, 0x00, 0xd0, 0xd2, 0x94,
+    0x5e, 0x35, 0x15, 0x2a, 0xcf, 0x73, 0x09, 0x9f, 0xea, 0x10, 0x55, 0x35, 0x7e, 0xbb, 0x3e, 0x03, 0x85, 0xe0, 0xbe,
+    0xd3, 0xf1, 0xf0, 0x10, 0x02, 0x56, 0x51, 0xc8, 0x02, 0xbd, 0x41, 0x7b, 0x55, 0x22, 0x14, 0x33, 0x27, 0xeb, 0x31,
+    0xc3, 0x49, 0x05, 0x5b, 0xa8, 0x84, 0xa5, 0xd2, 0x02, 0xbf, 0xda, 0x08, 0xcd, 0x53, 0xc6, 0xbd, 0x57, 0x15, 0xce,
+    0xa0, 0x3f, 0x98, 0xb7, 0xca, 0xa8, 0x6f, 0x57, 0x4e, 0x64, 0x2a, 0x30, 0x71, 0x33, 0x4b, 0xed, 0xf7, 0xcb, 0x3a,
+    0xed, 0xe7, 0x15, 0x72, 0x9f, 0x93, 0xe6, 0xeb, 0xdc, 0x42, 0xf3, 0xc9, 0x70, 0xbf, 0x52, 0x7e, 0x68, 0x61, 0xd4,
+    0x94, 0x5f, 0x5e, 0x57, 0x7e, 0x85, 0xa7, 0xc2, 0x5b, 0xfd, 0x2e, 0x0a, 0x5d, 0xd4, 0xe7, 0x60, 0x08, 0xe9, 0x47,
+    0x70, 0x0d, 0x0d, 0x1e, 0x14, 0xc9, 0x62, 0xb1, 0x76, 0x41, 0x5c, 0x1f, 0x73, 0xaa, 0x1d, 0xca, 0x18, 0x23, 0x9e,
+    0x96, 0x1c, 0x24, 0x19, 0x1c, 0x8c, 0xdf, 0xc0, 0x80, 0x98, 0x94, 0x84, 0x74, 0x08, 0x9d, 0xb5, 0x99, 0x88, 0xca,
+    0x5d, 0xbc, 0xd9, 0xb8, 0xac, 0x29, 0x14, 0x61, 0x27, 0x98, 0xa9, 0x94, 0x0a, 0x02, 0x69, 0xf2, 0xdd, 0xe9, 0xd4,
+    0x82, 0xa1, 0x85, 0x6b, 0x2a, 0x20, 0xaf, 0xed, 0x7a, 0xd0, 0xe4, 0x3d, 0xc5, 0xd0, 0xd7, 0xa9, 0x11, 0x2f, 0x33,
+    0xf8, 0x1a, 0x36, 0x7f, 0x4d, 0x94, 0xe4, 0x21, 0x13, 0xb1, 0x57, 0xf0, 0x89, 0x90, 0x4d, 0xc1, 0xce, 0x04, 0xfa,
+    0xa1, 0x5d, 0xd9, 0x4b, 0x77, 0x8b, 0xca, 0xa5, 0x45, 0x63, 0x2b, 0x51, 0xb3, 0xe6, 0x87, 0xf1, 0x66, 0x0a, 0xfb,
+    0xd9, 0xa3, 0x04, 0x02, 0xd2, 0x54, 0x4e, 0x52, 0xcd, 0x7b, 0x98, 0x0e, 0x01, 0x24, 0xd8, 0xfd, 0x04, 0x16, 0xfa,
+    0x4d, 0x89, 0x09, 0x16, 0x55, 0x63, 0xb7, 0x39, 0x68, 0xcd, 0x39, 0x69, 0xbe, 0x39, 0x6a, 0xed, 0x4d, 0x65, 0x3d,
+    0x63, 0x76, 0x80, 0x6d, 0xbb, 0x9b, 0xc5, 0x61, 0xba, 0xd9, 0x19, 0x1a, 0x82, 0x0b, 0x8f, 0xff, 0x93, 0x12, 0xd3,
+    0x40, 0x72, 0xa9, 0x1b, 0x3f, 0xa1, 0x0e, 0xc3, 0xff, 0x96, 0xa4, 0x80, 0x07, 0xb5, 0xd5, 0x58, 0x71, 0xee, 0x15,
+    0x47, 0xc9, 0x65, 0x55, 0xed, 0x6a, 0x09, 0x1a, 0xba, 0x91, 0x8c, 0x89, 0x62, 0x9e, 0x13, 0x00, 0xa3, 0xd8, 0xfc,
+    0x29, 0xd3, 0x49, 0xde, 0xbf, 0xac, 0x4d, 0xed, 0xf6, 0x7d, 0x3f, 0xca, 0x4f, 0xe8, 0x48, 0x45, 0x65, 0x73, 0x12,
+    0xf3, 0x6f, 0x0b, 0x30, 0xcd, 0x89, 0x0f, 0xf5, 0x5c, 0xc3, 0x50, 0x80, 0xaf, 0x6c, 0x28, 0x35, 0xdb, 0xe3, 0xdf,
+    0x3b, 0xdb, 0x7d, 0x49, 0x14, 0xc1, 0x02, 0x0d, 0xba, 0x5c, 0x81, 0x2f, 0x60, 0x19, 0xdc, 0x92, 0x7e, 0x0a, 0xbe,
+    0x97, 0x57, 0xc1, 0x67, 0xec, 0x7f, 0x01, 0x68, 0x55, 0x60, 0x40, 0xb9, 0xd3, 0x34, 0xac, 0x84, 0xb8, 0x44, 0x85,
+    0x59, 0xc5, 0xf9, 0xe3, 0x3a, 0xaf, 0x9b, 0x96, 0x25, 0x06, 0xe5, 0xe7, 0xae, 0xe1, 0xc6, 0xf7, 0x1a, 0xf9, 0xe3,
+    0x7b, 0xcf, 0x41, 0xb7, 0x13, 0x69, 0xef, 0xde, 0xcd, 0xef, 0x90, 0x85, 0x86, 0xf7, 0xc2, 0xe6, 0xd0, 0x16, 0xe9,
+    0x92, 0xab, 0x67, 0x2c, 0xc6, 0xdb, 0x22, 0x54, 0x86, 0x0f, 0x58, 0x30, 0x07, 0x0c, 0xc1, 0x63, 0xa7, 0x32, 0xf9,
+    0x0c, 0x1b, 0x4d, 0xb1, 0x6b, 0x2e, 0x0c, 0x3e, 0x50, 0x95, 0x85, 0xe4, 0xc5, 0x3a, 0xd9, 0x9e, 0x9d, 0xc2, 0xf3,
+    0xcb, 0xb8, 0x00, 0xea, 0x00, 0xfa, 0x15, 0x95, 0xc5, 0x06, 0x72, 0x71, 0x53, 0xd6, 0x7a, 0x45, 0xe3, 0xf1, 0xb5,
+    0x5d, 0x58, 0x5d, 0x81, 0x4f, 0xa3, 0x74, 0x9c, 0x88, 0x49, 0xcc, 0xa4, 0xca, 0x35, 0xb9, 0x36, 0xba, 0x97, 0xb6,
+    0x68, 0x9e, 0x0b, 0x09, 0x5e, 0x11, 0xb8, 0x21, 0xf4, 0x95, 0xbe, 0x5c, 0x6f, 0xa0, 0xe0, 0x51, 0x7b, 0x73, 0x11,
+    0x4c, 0x4c, 0x3c, 0x66, 0x48, 0x4d, 0xbf, 0x0e, 0xa7, 0x56, 0x16, 0x2b, 0x0e, 0xbf, 0xce, 0x19, 0x6b, 0x28, 0x00,
+    0xe2, 0x93, 0x07, 0x57, 0xbb, 0x49, 0xaf, 0x94, 0x76, 0x50, 0x1a, 0x21, 0xbe, 0xad, 0xf0, 0x75, 0x97, 0x8a, 0xaf,
+    0x5c, 0x75, 0xef, 0x6b, 0xc6, 0x8c, 0x0b, 0x46, 0xcf, 0xf9, 0x2c, 0x69, 0x5c, 0xbb, 0xa1, 0xbb, 0x3a, 0x3f, 0x7a,
+    0x3f, 0xc8, 0xbc, 0x85, 0x19, 0xb0, 0x09, 0xa8, 0x82, 0xe7, 0xde, 0x6b, 0xe3, 0x44, 0xf9, 0x3b, 0xf3, 0x88, 0x57,
+    0x0e, 0xb3, 0xee, 0x24, 0xf9, 0xbb, 0xc1, 0x77, 0xc1, 0xd5, 0x2d, 0x8d, 0x13, 0xe4, 0xae, 0x3a, 0x41, 0x26, 0xca,
+    0xcd, 0xf4, 0x86, 0xdb, 0xbb, 0xad, 0x40, 0x10, 0xa7, 0x62, 0xfa, 0xa8, 0x1c, 0xd7, 0x8f, 0x16, 0xa8, 0x54, 0x44,
+    0x7c, 0xaa, 0x72, 0x57, 0xae, 0x4c, 0x0d, 0xf5, 0xb8, 0x4e, 0x66, 0xa1, 0x69, 0xd6, 0xe4, 0x52, 0x36, 0x3d, 0x46,
+    0xa6, 0xd9, 0xa9, 0x36, 0xbf, 0x7b, 0xe5, 0x21, 0x1d, 0x43, 0x73, 0xb1, 0x56, 0x0b, 0xee, 0x77, 0x15, 0x85, 0x77,
+    0xbd, 0xd8, 0x48, 0x65, 0xa8, 0x59, 0x8f, 0xa2, 0x8f, 0xe3, 0x36, 0x73, 0x79, 0x94, 0xfd, 0x59, 0x03, 0xc0, 0x74,
+    0x84, 0x45, 0x77, 0xd3, 0x33, 0xf6, 0x04, 0x7a, 0x7a, 0x22, 0x83, 0x44, 0xaf, 0x75, 0xbe, 0x6a, 0x95, 0x58, 0xba,
+    0x86, 0xc0, 0xee, 0x35, 0x19, 0xab, 0x92, 0x76, 0xab, 0xf5, 0xab, 0x79, 0x3e, 0x4f, 0xf9, 0x4a, 0x9e, 0x4f, 0xcd,
+    0xa2, 0xbb, 0xd3, 0x76, 0xaf, 0x4f, 0x0d, 0x15, 0x73, 0xad, 0x6f, 0xf2, 0x3b, 0xa6, 0xeb, 0x60, 0xa8, 0x45, 0x90,
+    0x59, 0xed, 0xaa, 0x67, 0x65, 0x39, 0xab, 0x67, 0x72, 0xcc, 0x84, 0x6f, 0x2a, 0xdd, 0x21, 0xba, 0x61, 0xaa, 0x66,
+    0xfa, 0xb1, 0xb1, 0x2d, 0x64, 0x9b, 0xe7, 0x17, 0xe3, 0x1c, 0x28, 0x2d, 0xf7, 0x97, 0x09, 0xc3, 0x8f, 0x97, 0x97,
+    0x3f, 0x0a, 0x39, 0x55, 0x75, 0xf4, 0x96, 0x2f, 0x75, 0xcf, 0x60, 0x56, 0x2a, 0x27, 0xe2, 0x98, 0xad, 0x1f, 0xbc,
+    0xb9, 0x7b, 0x05, 0x2c, 0xc7, 0x80, 0xdd, 0x31, 0x73, 0x1a, 0x43, 0x55, 0x1b, 0xf8, 0x87, 0xf5, 0x83, 0xad, 0xdb,
+    0xc3, 0x3f, 0x0c, 0x7e, 0x08, 0xae, 0x6d, 0x6c, 0x6c, 0xe3, 0xed, 0x5a, 0x22, 0xc8, 0x2b, 0x3c, 0xd0, 0xc7, 0xab,
+    0x8f, 0x82, 0x96, 0xeb, 0xc4, 0xf6, 0xc0, 0xa1, 0xb0, 0x35, 0xc8, 0x37, 0x29, 0x93, 0x46, 0x8b, 0x82, 0x67, 0x33,
+    0x39, 0x43, 0x21, 0xaf, 0xf9, 0x38, 0x68, 0x3b, 0xc2, 0xdf, 0xc0, 0xa9, 0x1d, 0x2f, 0x2f, 0x3f, 0x41, 0x1f, 0xf0,
+    0x74, 0xa5, 0x34, 0x15, 0x71, 0x4a, 0xb9, 0x45, 0x57, 0xeb, 0x3c, 0x18, 0x29, 0x2e, 0xa6, 0xa8, 0x74, 0xdc, 0xe5,
+    0xb5, 0xb3, 0x91, 0xd3, 0x5f, 0xe2, 0xd5, 0x45, 0xba, 0x7c, 0x24, 0xb2, 0x55, 0x4b, 0xef, 0x37, 0x7d, 0xba, 0x6d,
+    0xcf, 0x18, 0x9f, 0x66, 0x63, 0x3a, 0x98, 0xf1, 0x71, 0x22, 0xbc, 0x3e, 0x31, 0xd6, 0x77, 0x8b, 0xc0, 0x74, 0x73,
+    0x6c, 0xf2, 0xc3, 0xf1, 0x7a, 0xb3, 0x59, 0xe3, 0x0e, 0xde, 0x38, 0x4f, 0x9c, 0x65, 0x89, 0x11, 0x95, 0xa5, 0x86,
+    0x07, 0xb4, 0x42, 0xdc, 0xbc, 0x67, 0x02, 0xe3, 0xb2, 0x0b, 0x92, 0xda, 0x6e, 0x20, 0x70, 0xb1, 0x27, 0x31, 0x4b,
+    0xc6, 0xb6, 0x07, 0xe5, 0x81, 0xbe, 0x18, 0x4d, 0xb7, 0x80, 0x69, 0x79, 0xed, 0xec, 0x2c, 0xb5, 0xbd, 0x6a, 0xaa,
+    0x00, 0x66, 0xc9, 0xf2, 0xf8, 0x04, 0x59, 0xf7, 0x5b, 0xe8, 0x22, 0x06, 0x8c, 0x8d, 0x2b, 0x73, 0xee, 0x72, 0xdd,
+    0x8a, 0xf8, 0x46, 0x13, 0x69, 0x52, 0x1f, 0x52, 0xdf, 0x61, 0x58, 0xab, 0xab, 0x1c, 0x24, 0x70, 0x8f, 0xbc, 0x5b,
+    0xe2, 0xd2, 0xd3, 0x67, 0x16, 0x93, 0x2a, 0x7d, 0x4b, 0x5d, 0x8b, 0x6b, 0x86, 0xbd, 0xe2, 0x01, 0xd8, 0x1f, 0x18,
+    0xb7, 0x88, 0x45, 0xbc, 0x9d, 0xd7, 0x52, 0x58, 0x1b, 0x73, 0xa0, 0xb9, 0xe1, 0x06, 0xbf, 0xb1, 0x6a, 0xcd, 0xc0,
+    0x0c, 0x33, 0xce, 0x48, 0x7e, 0x33, 0xee, 0x55, 0x4d, 0x1c, 0xb9, 0x0a, 0x20, 0xfa, 0x96, 0x74, 0x49, 0x0e, 0xaf,
+    0x64, 0xb9, 0xea, 0x0c, 0xf9, 0x57, 0x58, 0x67, 0xbd, 0x38, 0x01, 0x33, 0x69, 0xca, 0x4b, 0x4c, 0x4c, 0x11, 0x97,
+    0x9b, 0x65, 0xcc, 0xd3, 0xf4, 0x59, 0xb4, 0x83, 0x93, 0x1b, 0x09, 0x1c, 0xb1, 0x6f, 0x2c, 0x43, 0x33, 0x61, 0x23,
+    0x26, 0xd2, 0xa8, 0x94, 0x12, 0x3e, 0x90, 0x4b, 0x2d, 0xf9, 0xcb, 0x5c, 0x5e, 0x7d, 0xb9, 0x4d, 0x70, 0x40, 0x5e,
+    0x03, 0xcb, 0xa1, 0x71, 0xdc, 0x32, 0x90, 0x88, 0xc5, 0x80, 0x18, 0xb5, 0x2a, 0x57, 0x93, 0x51, 0x9d, 0xcc, 0x57,
+    0xc8, 0x85, 0x8a, 0x3c, 0xb8, 0x25, 0x50, 0xf2, 0xe7, 0x98, 0x3a, 0x98, 0x95, 0xda, 0x4d, 0x8b, 0x4d, 0x92, 0xf7,
+    0xcc, 0x80, 0xe4, 0xfa, 0x6b, 0x78, 0x68, 0xfc, 0xe2, 0x95, 0x39, 0x25, 0x7c, 0x51, 0xc6, 0xd2, 0xd2, 0x98, 0x4b,
+    0xff, 0x42, 0xde, 0xa7, 0x95, 0x80, 0xfd, 0x0a, 0x62, 0xca, 0xc0, 0x25, 0x36, 0x2e, 0x48, 0xca, 0x6b, 0x79, 0xca,
+    0xee, 0x6b, 0x28, 0xdf, 0x15, 0x93, 0xae, 0x52, 0x59, 0x57, 0x58, 0x75, 0xbf, 0x2e, 0x58, 0x7e, 0xb1, 0xcf, 0x30,
+    0x37, 0x19, 0x0d, 0xb2, 0x15, 0x33, 0x9b, 0xf2, 0xab, 0xbd, 0x6b, 0xbf, 0xf2, 0x50, 0xd2, 0xa1, 0x5a, 0xa5, 0x9b,
+    0x57, 0x6e, 0x38, 0xc6, 0x8d, 0x1b, 0x8e, 0x00, 0x36, 0x86, 0x9d, 0x2a, 0x52, 0xeb, 0xfc, 0xf7, 0xd5, 0xf0, 0x13,
+    0xed, 0xb5, 0xa1, 0xde, 0x75, 0xc3, 0xb5, 0xe9, 0xe9, 0xd7, 0xa0, 0x6a, 0x64, 0x09, 0x5d, 0x87, 0x2a, 0x26, 0x23,
+    0x51, 0x62, 0xba, 0x4a, 0x79, 0xd4, 0xd7, 0x88, 0x73, 0x10, 0x37, 0x94, 0xbf, 0xf8, 0xe7, 0xf0, 0xe2, 0x28, 0x40,
+    0x23, 0x6a, 0x39, 0xc9, 0x52, 0xde, 0x9a, 0x44, 0xb3, 0x38, 0xb9, 0x08, 0x16, 0x71, 0x6b, 0x96, 0xa5, 0x59, 0x31,
+    0x07, 0xae, 0xf4, 0x8a, 0x0b, 0xb0, 0xe1, 0x67, 0xad, 0x45, 0xec, 0x3d, 0x67, 0xc9, 0x29, 0xe3, 0xf1, 0x28, 0xf2,
+    0xec, 0xbd, 0x1c, 0xc4, 0x83, 0xf5, 0x3a, 0xca, 0xf3, 0xec, 0xcc, 0xf6, 0xde, 0x65, 0xc7, 0xc0, 0xb4, 0xde, 0x9b,
+    0xf3, 0x8b, 0x13, 0x96, 0x7a, 0xef, 0x8f, 0x17, 0x29, 0x5f, 0x78, 0x45, 0x94, 0x16, 0xad, 0x82, 0xe5, 0xf1, 0x04,
+    0xd4, 0x44, 0x92, 0xe5, 0x2d, 0xcc, 0x7f, 0x9e, 0xb1, 0x20, 0x89, 0x4f, 0xa6, 0xdc, 0x1a, 0x47, 0xf9, 0xa7, 0x5e,
+    0xab, 0x35, 0xcf, 0xe3, 0x59, 0x94, 0x5f, 0xb4, 0xa8, 0x45, 0xf0, 0x45, 0x7b, 0x3b, 0xfa, 0x6a, 0x72, 0xbf, 0xc7,
+    0x73, 0xe8, 0x1b, 0x23, 0x15, 0x03, 0x10, 0x3e, 0xd6, 0xf6, 0x4e, 0x7b, 0x56, 0xdc, 0x11, 0x27, 0x4a, 0x51, 0xca,
+    0xcb, 0x23, 0xef, 0x23, 0x03, 0xb8, 0xfd, 0x63, 0x9e, 0x7a, 0xe0, 0xcb, 0xf1, 0x2c, 0x5d, 0x8e, 0x16, 0x79, 0x01,
+    0x03, 0xcc, 0xb3, 0x38, 0xe5, 0x2c, 0xef, 0x1d, 0x67, 0x39, 0x90, 0xad, 0x95, 0x47, 0xe3, 0x78, 0x51, 0x04, 0xf7,
+    0xe7, 0xe7, 0x3d, 0xb4, 0x15, 0x4e, 0xf2, 0x6c, 0x91, 0x8e, 0xe5, 0x5c, 0x71, 0x0a, 0x1b, 0x23, 0xe6, 0x66, 0x05,
+    0x7d, 0x09, 0x05, 0xe0, 0x4b, 0x59, 0x94, 0xb7, 0x4e, 0xb0, 0x33, 0x1a, 0xfa, 0xed, 0x31, 0x3b, 0xf1, 0xf2, 0x93,
+    0xe3, 0xc8, 0xe9, 0x74, 0x1f, 0x7a, 0xea, 0x9f, 0xbf, 0xe3, 0x82, 0xe1, 0xbe, 0xb6, 0xb8, 0xd3, 0x6e, 0xff, 0x9d,
+    0xdb, 0x6b, 0xcc, 0x42, 0x00, 0x05, 0x9d, 0xf9, 0xb9, 0x55, 0x64, 0x09, 0xac, 0xcf, 0xba, 0x9e, 0xbd, 0x39, 0xf8,
+    0x4d, 0x71, 0x7a, 0x12, 0x74, 0xe7, 0xe7, 0x25, 0x62, 0x17, 0x88, 0x84, 0x4c, 0x89, 0xa4, 0x7c, 0x5b, 0xfe, 0x5e,
+    0x88, 0x1f, 0xad, 0x87, 0xb8, 0xab, 0x20, 0xae, 0xa8, 0xde, 0x1a, 0xc3, 0x3e, 0x20, 0xf2, 0x77, 0x0a, 0x01, 0xc8,
+    0x14, 0x9c, 0xc0, 0x5c, 0xc1, 0x41, 0x2f, 0xbf, 0x1b, 0x8c, 0xee, 0x7a, 0x30, 0x1e, 0xdd, 0x04, 0x46, 0x9e, 0x8e,
+    0x97, 0xf5, 0x75, 0xed, 0x80, 0x73, 0xda, 0x9b, 0x32, 0xe4, 0xa7, 0xa0, 0x8b, 0xcf, 0x67, 0xf1, 0x98, 0x4f, 0xc5,
+    0x23, 0xb1, 0xf3, 0x99, 0xa8, 0xdb, 0x69, 0xb7, 0xc5, 0x7b, 0x01, 0x0a, 0x2d, 0xe8, 0xf8, 0xd8, 0x00, 0x98, 0xe8,
+    0xc3, 0x55, 0x1f, 0xb1, 0xf9, 0xfa, 0xc6, 0x2f, 0xd5, 0x78, 0x67, 0x2a, 0x6f, 0x50, 0xa8, 0x08, 0xf5, 0xcd, 0x16,
+    0xcc, 0x78, 0xcb, 0xfb, 0x1d, 0x7d, 0x50, 0x35, 0xf8, 0x9a, 0x91, 0xd6, 0x0b, 0xb8, 0x67, 0xe6, 0x02, 0xf5, 0xd2,
+    0x3e, 0x86, 0xa4, 0x5a, 0x2d, 0x17, 0xf4, 0x06, 0xc3, 0x10, 0x12, 0x1d, 0x08, 0x3a, 0xf9, 0xa0, 0xa0, 0x6f, 0x6a,
+    0x64, 0x6e, 0x50, 0x38, 0x99, 0x0b, 0x5b, 0x3e, 0xd3, 0x72, 0x1d, 0x94, 0x34, 0x78, 0xd9, 0x1f, 0x98, 0x6c, 0x00,
+    0xd2, 0x9b, 0x42, 0x5d, 0x7f, 0x09, 0x85, 0x2b, 0xa5, 0x1c, 0xa9, 0xd9, 0x75, 0x57, 0xf4, 0x61, 0x55, 0x62, 0xca,
+    0x48, 0x3e, 0x1c, 0xfe, 0x3b, 0x0c, 0x7b, 0x47, 0x3b, 0x96, 0x45, 0xb6, 0xc8, 0x47, 0x14, 0xa9, 0x5b, 0xf5, 0xf8,
+    0x6d, 0x52, 0xb8, 0xb6, 0xc7, 0xb4, 0x9c, 0x47, 0x37, 0xb8, 0xf6, 0x91, 0x03, 0x4e, 0x87, 0x20, 0xe2, 0x8e, 0x81,
+    0x8c, 0x72, 0x28, 0x08, 0x51, 0x75, 0x8d, 0x29, 0xdf, 0x8d, 0xee, 0x5f, 0xfa, 0x8b, 0x34, 0x06, 0x49, 0xf7, 0x31,
+    0x1e, 0xd3, 0xbd, 0x93, 0x78, 0x4c, 0x07, 0x11, 0x2d, 0x4a, 0x3c, 0xc2, 0xc8, 0x36, 0x14, 0xa8, 0xef, 0xb0, 0xc0,
+    0xb3, 0x4c, 0x64, 0xb1, 0x5b, 0x36, 0x1e, 0x26, 0x18, 0xaa, 0x72, 0x9c, 0xcd, 0xa2, 0x38, 0x0d, 0xf0, 0xfb, 0x20,
+    0x9e, 0x1e, 0x31, 0xc0, 0x2e, 0x1e, 0xfc, 0x64, 0x32, 0x17, 0xad, 0xe3, 0xfa, 0xbf, 0x80, 0x1c, 0xa1, 0xfe, 0xa5,
+    0xf4, 0xc3, 0x34, 0x5c, 0xea, 0x98, 0xb7, 0x5e, 0x0a, 0xb2, 0x87, 0x2b, 0x9b, 0x95, 0x51, 0x9c, 0x63, 0x97, 0xd3,
+    0x8f, 0x41, 0xab, 0x13, 0x74, 0xb4, 0xeb, 0x5a, 0xbb, 0x8d, 0x2a, 0x72, 0x59, 0xe4, 0x8d, 0x46, 0x82, 0x41, 0x3f,
+    0x0b, 0x38, 0xab, 0x77, 0x0d, 0xab, 0x27, 0xf9, 0x12, 0x03, 0x38, 0x27, 0xa9, 0x53, 0x03, 0x82, 0xce, 0x02, 0xae,
+    0x98, 0xca, 0x2d, 0x23, 0x52, 0x4a, 0x8f, 0x69, 0x03, 0xd7, 0xef, 0x12, 0xe1, 0xbd, 0xa1, 0x7a, 0x0a, 0x94, 0x62,
+    0xb9, 0xf1, 0xd1, 0xae, 0xd8, 0xf1, 0x16, 0xf1, 0x58, 0x68, 0xc3, 0x16, 0xb4, 0xad, 0x3f, 0x8d, 0x80, 0x4a, 0x9f,
+    0x42, 0x7b, 0x63, 0xe9, 0xa8, 0xc4, 0xfa, 0x1c, 0xe6, 0xda, 0x13, 0x5a, 0x8f, 0x6e, 0xe4, 0xdb, 0xfd, 0x8d, 0x25,
+    0x2f, 0x77, 0xb7, 0x44, 0xef, 0xfe, 0x51, 0x59, 0x90, 0x82, 0x32, 0x03, 0x69, 0xd5, 0x14, 0xa2, 0x0e, 0x86, 0xa5,
+    0xf4, 0x5d, 0x1c, 0x37, 0xd7, 0x46, 0x97, 0x88, 0x18, 0x4b, 0xb6, 0x2b, 0x30, 0x5d, 0x29, 0xca, 0x61, 0x4f, 0xea,
+    0x84, 0x94, 0x42, 0xe4, 0x60, 0xf4, 0x56, 0xa1, 0x38, 0x42, 0x08, 0x06, 0x1b, 0xcb, 0xb8, 0x0c, 0x37, 0x96, 0x59,
+    0x79, 0x04, 0x96, 0x09, 0x42, 0x95, 0xab, 0xcf, 0xbb, 0xc0, 0xc4, 0x22, 0xc8, 0x62, 0xd1, 0x08, 0x38, 0x2d, 0x2b,
+    0x6d, 0x6b, 0x20, 0xa0, 0x01, 0x0f, 0x10, 0x0b, 0xc0, 0x76, 0xa3, 0x5e, 0x0c, 0x70, 0x11, 0xad, 0xfb, 0x30, 0xd0,
+    0xee, 0x96, 0x68, 0x04, 0x78, 0xe5, 0x08, 0x72, 0x85, 0x16, 0xa6, 0xe3, 0x98, 0xa8, 0x8d, 0xe3, 0x53, 0x4d, 0x3a,
+    0xca, 0x4d, 0xee, 0xef, 0x26, 0xd1, 0x31, 0x4b, 0x60, 0xc8, 0xe2, 0xf2, 0xb2, 0x0d, 0x23, 0x89, 0x57, 0x6b, 0x37,
+    0x4e, 0xe7, 0x0b, 0xf9, 0x99, 0x2d, 0x98, 0xb8, 0x83, 0x27, 0x9f, 0x78, 0x0b, 0x60, 0xa0, 0x8e, 0xf2, 0x02, 0x39,
+    0x00, 0x80, 0x48, 0xa7, 0x08, 0x08, 0x5d, 0xc5, 0x16, 0x50, 0x1a, 0x8f, 0x57, 0xcb, 0x60, 0x27, 0xce, 0xb1, 0x34,
+    0x85, 0xe7, 0x59, 0x9c, 0xe2, 0x63, 0x81, 0x8f, 0xd1, 0x39, 0x3e, 0x66, 0xf0, 0xa8, 0x71, 0xcf, 0x4b, 0xfb, 0x6f,
+    0xb2, 0x02, 0x96, 0x26, 0x40, 0x76, 0x79, 0x09, 0xf2, 0x5e, 0x93, 0x60, 0x77, 0x0b, 0x88, 0x85, 0x9c, 0x22, 0x3e,
+    0xba, 0xc2, 0x4c, 0x32, 0xb2, 0x62, 0xde, 0x12, 0xe5, 0x16, 0x69, 0xd5, 0x10, 0x9c, 0xae, 0xdc, 0x69, 0x18, 0x0f,
+    0x9e, 0x4c, 0x2f, 0x79, 0x82, 0x2f, 0xae, 0x6d, 0x89, 0xaf, 0x62, 0x08, 0xa2, 0xd0, 0x23, 0x62, 0xa8, 0xcb, 0xb8,
+    0xfc, 0xde, 0x4d, 0x1c, 0xda, 0x38, 0x0b, 0xd8, 0x6f, 0xa8, 0x05, 0x78, 0x14, 0x27, 0xa2, 0xf1, 0x1a, 0x7c, 0x1a,
+    0x79, 0x82, 0x84, 0xce, 0xee, 0x56, 0x05, 0x1b, 0x00, 0x3f, 0x12, 0xb7, 0xac, 0x1d, 0x91, 0x03, 0x69, 0x8b, 0x72,
+    0x3a, 0x3b, 0x97, 0x5b, 0x5a, 0x46, 0x76, 0x45, 0xac, 0x5c, 0xa3, 0x4a, 0x39, 0x8b, 0xf6, 0x24, 0x4a, 0xd7, 0x35,
+    0x05, 0xe8, 0xe7, 0x8c, 0x8d, 0x3d, 0xdb, 0x02, 0x59, 0x2a, 0x9e, 0x3f, 0x26, 0xec, 0x94, 0xc9, 0x2f, 0xa5, 0xe8,
+    0x41, 0x74, 0xe5, 0x08, 0x54, 0x32, 0x97, 0x97, 0x38, 0x25, 0x7b, 0x2a, 0x1c, 0x25, 0x25, 0xea, 0x88, 0x78, 0xb6,
+    0x31, 0x68, 0x73, 0x8e, 0x76, 0x7d, 0x58, 0xaf, 0x03, 0xd6, 0xae, 0x2d, 0xe0, 0x25, 0x3b, 0xee, 0x66, 0xe4, 0x60,
+    0x00, 0x36, 0x99, 0xc0, 0x76, 0x51, 0x91, 0x65, 0x2d, 0x0b, 0x04, 0x54, 0xe0, 0x94, 0x7a, 0xb6, 0x68, 0x61, 0x57,
+    0x6d, 0xf5, 0x93, 0x24, 0x4e, 0x92, 0x8d, 0x3e, 0xad, 0x99, 0x0b, 0xb8, 0x63, 0x43, 0x44, 0x5a, 0x1b, 0xf2, 0xcd,
+    0xfe, 0xb7, 0x7f, 0xfe, 0x9f, 0xff, 0x15, 0x06, 0xa6, 0x7e, 0x6e, 0x69, 0x5d, 0xdd, 0xea, 0x7f, 0x40, 0xab, 0x45,
+    0x7a, 0x43, 0xbb, 0xbf, 0xfe, 0xe3, 0x7f, 0x83, 0x66, 0x74, 0x23, 0xc7, 0x2d, 0x8f, 0x08, 0xa2, 0x11, 0x1a, 0x41,
+    0x9f, 0x05, 0x52, 0x6d, 0x90, 0x2b, 0x67, 0xfa, 0x27, 0x04, 0xbb, 0xe0, 0xd9, 0xfc, 0x5a, 0x70, 0x10, 0xea, 0x51,
+    0x92, 0x15, 0x4c, 0xc3, 0x23, 0x64, 0xed, 0xe7, 0x01, 0x44, 0x73, 0xcd, 0x81, 0xcb, 0x0b, 0x4b, 0x8f, 0x23, 0x96,
+    0x67, 0xdd, 0x38, 0x8d, 0xd5, 0x2b, 0x18, 0x27, 0x74, 0x28, 0xae, 0x00, 0xeb, 0x25, 0x9e, 0xe0, 0x81, 0x04, 0x82,
+    0x5b, 0xff, 0xca, 0xd7, 0xfa, 0xc1, 0x34, 0x7f, 0x8a, 0xb1, 0x44, 0x28, 0x45, 0x8d, 0x00, 0x3f, 0x41, 0x68, 0x7d,
+    0xd4, 0xcf, 0xd1, 0xb9, 0x7e, 0x46, 0xc1, 0x26, 0x26, 0x00, 0x5d, 0x34, 0x43, 0x33, 0xc3, 0x9c, 0x41, 0xa4, 0x01,
+    0x54, 0x7e, 0xa4, 0x91, 0x4d, 0x22, 0x84, 0xd7, 0x47, 0x4c, 0xba, 0xc4, 0x2b, 0x36, 0x8b, 0x9c, 0x7d, 0x4c, 0xb2,
+    0x33, 0x0c, 0x4e, 0x21, 0x91, 0xae, 0xaa, 0x2f, 0xff, 0xf5, 0x5f, 0x7c, 0xff, 0x5f, 0xff, 0xe5, 0x8a, 0x06, 0x53,
+    0xd8, 0x07, 0x60, 0x4d, 0xf2, 0x50, 0xd3, 0xb9, 0x81, 0xd6, 0xfa, 0x41, 0x11, 0xcf, 0xf5, 0x35, 0x12, 0x71, 0x2c,
+    0x95, 0x78, 0xcb, 0x47, 0x42, 0x5b, 0x33, 0xc5, 0xcd, 0xb3, 0x20, 0x64, 0x57, 0x4c, 0x83, 0x55, 0x37, 0xcc, 0x73,
+    0xe4, 0x06, 0xd7, 0xd0, 0xe5, 0x33, 0x31, 0x5e, 0x0f, 0xc6, 0x8d, 0x10, 0x78, 0x20, 0xfd, 0x85, 0x7e, 0x78, 0x22,
+    0xa4, 0x7b, 0x20, 0x96, 0x41, 0xca, 0xfa, 0x1a, 0x40, 0x9e, 0x75, 0x40, 0x13, 0x50, 0x93, 0xb8, 0xd2, 0xad, 0x64,
+    0x8a, 0x1c, 0xe7, 0xfd, 0x57, 0x78, 0xab, 0xce, 0xc2, 0xde, 0xa8, 0x59, 0x0b, 0x32, 0x04, 0x38, 0x19, 0x02, 0x52,
+    0x03, 0x99, 0x3a, 0x18, 0x3d, 0x8c, 0x6c, 0xbd, 0xae, 0xfd, 0x88, 0xdd, 0x6b, 0xda, 0x92, 0x4b, 0x6d, 0x19, 0x4b,
+    0x4b, 0x56, 0x6a, 0x4b, 0xfc, 0x76, 0x4a, 0x43, 0x5b, 0xc6, 0x57, 0x6a, 0x4b, 0xa4, 0xdc, 0x00, 0x47, 0x0e, 0xed,
+    0x4d, 0x0c, 0xa3, 0x18, 0xba, 0x99, 0xa3, 0x5d, 0x02, 0xbe, 0xf3, 0xe8, 0x93, 0x34, 0x4b, 0x08, 0x01, 0x8c, 0x23,
+    0x68, 0x43, 0x4b, 0x60, 0x00, 0x2a, 0xf6, 0xa8, 0xd4, 0x9b, 0x1e, 0x1f, 0x8d, 0x09, 0xb8, 0xbb, 0x9c, 0x30, 0x14,
+    0xc9, 0x47, 0x5b, 0x38, 0x84, 0xd8, 0x2b, 0x25, 0x3d, 0x03, 0x52, 0x5b, 0x38, 0xce, 0x91, 0xb7, 0x14, 0x01, 0xa9,
+    0xc0, 0x7e, 0xfb, 0x66, 0xff, 0xc0, 0xf6, 0x8e, 0xb3, 0xf1, 0x45, 0x60, 0x83, 0x33, 0x01, 0x86, 0x87, 0xeb, 0xf3,
+    0x29, 0x4b, 0x1d, 0x65, 0xce, 0x67, 0x09, 0xb8, 0x33, 0xd9, 0x89, 0xf8, 0x7e, 0x42, 0x33, 0x98, 0x0e, 0x34, 0xa5,
+    0x0f, 0x2c, 0xf6, 0x77, 0xb9, 0xf8, 0xf6, 0x28, 0xcf, 0xf1, 0xb1, 0x8f, 0xe9, 0x04, 0xbb, 0x5b, 0xf0, 0x80, 0x2f,
+    0xfb, 0xa8, 0x8a, 0xf4, 0x9b, 0x80, 0xb3, 0x10, 0xef, 0x5b, 0xd8, 0x7e, 0x4b, 0xf5, 0x45, 0x28, 0xfa, 0x92, 0xd1,
+    0xb4, 0xc5, 0x5d, 0x99, 0x71, 0x34, 0xf6, 0x18, 0xad, 0x34, 0xb2, 0xb8, 0x81, 0x1a, 0x7c, 0xac, 0x4b, 0x84, 0xe6,
+    0x37, 0x8a, 0x68, 0x94, 0x4a, 0x4f, 0xcb, 0x2a, 0x9c, 0x90, 0x2c, 0x3b, 0x31, 0x19, 0xfc, 0x24, 0xf0, 0x8f, 0xcc,
+    0x6f, 0x85, 0x89, 0xcf, 0xfa, 0x68, 0x24, 0x0f, 0xff, 0xec, 0x7d, 0x64, 0xde, 0xc5, 0x11, 0xb5, 0x54, 0x8e, 0x29,
+    0x46, 0x4c, 0xd0, 0x81, 0x6f, 0xab, 0x08, 0x04, 0x98, 0x26, 0x49, 0x34, 0x2f, 0x58, 0xa0, 0x1e, 0xa4, 0x8f, 0x8a,
+    0xae, 0xee, 0x6a, 0x50, 0xc0, 0x34, 0x61, 0x4a, 0x3e, 0x5d, 0x9a, 0x4e, 0xec, 0x03, 0x70, 0x62, 0x31, 0x01, 0xbf,
+    0x15, 0x81, 0xe2, 0x4d, 0x83, 0x84, 0x4d, 0x78, 0xc9, 0xf1, 0x86, 0xf7, 0x52, 0x45, 0x0d, 0xfc, 0xee, 0x0e, 0x38,
+    0xb6, 0x96, 0x8f, 0xff, 0xdf, 0x34, 0xf6, 0x38, 0x48, 0xc1, 0x11, 0xa5, 0x2b, 0x1f, 0x78, 0x9d, 0x0e, 0x20, 0x32,
+    0xdf, 0x97, 0xc6, 0x44, 0x23, 0x86, 0x11, 0x95, 0x92, 0xe7, 0x20, 0xb2, 0x3d, 0x9e, 0x9b, 0xed, 0x40, 0xd4, 0xae,
+    0x84, 0x55, 0x56, 0x1d, 0xfb, 0x6d, 0x57, 0x9a, 0xff, 0xab, 0x8d, 0x55, 0x74, 0xa4, 0xfe, 0xb6, 0x42, 0x21, 0x23,
+    0x8e, 0x53, 0x0a, 0x2d, 0xb3, 0x14, 0x3d, 0x4c, 0x9c, 0x56, 0x23, 0x3c, 0x37, 0x1a, 0x89, 0x25, 0xed, 0xf8, 0x43,
+    0xda, 0xf1, 0x24, 0xc1, 0x86, 0x4b, 0x31, 0xf7, 0x28, 0x4a, 0x46, 0x0e, 0x02, 0x60, 0xb5, 0xac, 0x47, 0x40, 0x4d,
+    0x57, 0x45, 0x19, 0xfc, 0x87, 0x48, 0xdc, 0x52, 0xc8, 0xbb, 0x35, 0x54, 0x3a, 0x1a, 0x96, 0x65, 0xef, 0x8c, 0x39,
+    0x87, 0xbf, 0xc9, 0x0b, 0x03, 0xe2, 0x9e, 0xa8, 0xfe, 0xd6, 0x5e, 0xbb, 0x74, 0x87, 0xde, 0x5f, 0x8c, 0x0f, 0x98,
+    0xd9, 0x8a, 0xa1, 0x6d, 0x0f, 0x96, 0xe1, 0x2f, 0x21, 0xf6, 0x7d, 0xe5, 0xd8, 0x68, 0x55, 0x52, 0xcd, 0x45, 0x8b,
+    0xf8, 0xcb, 0xc6, 0x6e, 0x22, 0xdc, 0xfd, 0xfd, 0x55, 0x51, 0x8b, 0x6f, 0x6e, 0x8e, 0x5a, 0xb0, 0x5b, 0x46, 0x2d,
+    0xbe, 0xf9, 0x83, 0xa3, 0x16, 0xdf, 0x37, 0xa3, 0x16, 0xbf, 0x7e, 0x4e, 0xd4, 0x22, 0xcf, 0xce, 0x8a, 0xb0, 0x23,
+    0x4f, 0xc9, 0x41, 0xe6, 0xfc, 0x6d, 0xc2, 0x17, 0x30, 0x51, 0x23, 0x78, 0x41, 0xd1, 0x0a, 0x91, 0xd8, 0x07, 0x92,
+    0x5d, 0xc6, 0x0a, 0xda, 0x3a, 0x83, 0xae, 0x75, 0x5f, 0x5d, 0x19, 0x02, 0x6f, 0xcd, 0xd5, 0x97, 0xdd, 0xba, 0x2a,
+    0x9a, 0x10, 0xd0, 0x37, 0x3f, 0x75, 0xc7, 0xee, 0xa6, 0x4a, 0xdd, 0x32, 0x47, 0xe8, 0xa9, 0x88, 0xbc, 0x60, 0x9f,
+    0xa5, 0xfd, 0x9f, 0x0e, 0x3b, 0xbd, 0xed, 0xce, 0x0c, 0x7a, 0x83, 0x0e, 0x85, 0xb7, 0x76, 0x6f, 0x7b, 0x1b, 0xdf,
+    0xce, 0xd4, 0x5b, 0x17, 0xdf, 0x62, 0xf5, 0xb6, 0x83, 0x6f, 0x23, 0xf5, 0xf6, 0x00, 0xdf, 0xc6, 0xea, 0xed, 0x21,
+    0xbe, 0x9d, 0xda, 0xe5, 0x21, 0xd7, 0xc0, 0x3d, 0x04, 0xbe, 0x22, 0x43, 0x3f, 0x50, 0x65, 0xb0, 0x69, 0xf1, 0xaa,
+    0x5d, 0x74, 0x12, 0xc4, 0x9e, 0x70, 0x88, 0x82, 0xdc, 0x3b, 0x03, 0xc9, 0x1f, 0x50, 0x66, 0xd9, 0x53, 0xfc, 0xe6,
+    0x02, 0xf8, 0x0f, 0x07, 0xf1, 0x8c, 0xa9, 0x8f, 0xcf, 0x2a, 0xac, 0xc1, 0x86, 0x3c, 0x6c, 0x0f, 0xcb, 0x9e, 0x5e,
+    0x27, 0x11, 0x2c, 0x51, 0x27, 0xf7, 0xb4, 0x72, 0x55, 0x9d, 0x98, 0xae, 0xa5, 0x57, 0xf8, 0x0a, 0x3d, 0x62, 0xb8,
+    0xd0, 0x13, 0xb0, 0x8d, 0x5a, 0xe7, 0xe0, 0x74, 0xad, 0xd5, 0x2d, 0x08, 0x91, 0xd6, 0x26, 0x84, 0x93, 0x7e, 0x3b,
+    0x88, 0x4e, 0xf4, 0xf3, 0x2b, 0x30, 0x76, 0xa3, 0x13, 0x76, 0x93, 0x9e, 0x21, 0x10, 0x4d, 0x1d, 0xa3, 0x80, 0x20,
+    0x6b, 0x08, 0x96, 0x06, 0x9d, 0x3f, 0xa9, 0x63, 0x90, 0x3a, 0x75, 0xad, 0x43, 0xd3, 0xd7, 0x8b, 0x80, 0xa2, 0x55,
+    0xc1, 0x2e, 0xd8, 0xdc, 0x54, 0x2a, 0x28, 0x0c, 0x15, 0x58, 0x70, 0xad, 0x2a, 0xd2, 0xfe, 0xf1, 0x95, 0x0a, 0xc9,
+    0x52, 0xba, 0xc8, 0x8c, 0xe4, 0xeb, 0x30, 0xfe, 0xaa, 0x78, 0xfc, 0xa2, 0x33, 0xc2, 0x3f, 0x52, 0xf8, 0x7e, 0x31,
+    0x99, 0x4c, 0xae, 0xd5, 0x4d, 0x5f, 0x8c, 0x27, 0xac, 0xcb, 0x76, 0x7a, 0x18, 0xe5, 0x6d, 0x49, 0x71, 0xd8, 0x29,
+    0x89, 0x76, 0xcb, 0xdb, 0x35, 0x46, 0xc9, 0x09, 0xea, 0xea, 0xf6, 0x4a, 0xac, 0x04, 0xaa, 0x2c, 0x41, 0x78, 0x9f,
+    0xc4, 0x69, 0xd0, 0x2e, 0xfd, 0x53, 0x29, 0xf5, 0xbf, 0x78, 0xf4, 0xe8, 0x51, 0xe9, 0x8f, 0xd5, 0x5b, 0x7b, 0x3c,
+    0x2e, 0xfd, 0xd1, 0x52, 0xa3, 0xd1, 0x6e, 0x4f, 0x26, 0xa5, 0x1f, 0xab, 0x82, 0xed, 0xee, 0x68, 0xbc, 0xdd, 0x2d,
+    0xfd, 0x33, 0xa3, 0x45, 0xe9, 0x33, 0xf9, 0x96, 0xb3, 0x71, 0x2d, 0x54, 0xfc, 0xb0, 0x0d, 0x95, 0x82, 0xd1, 0x96,
+    0xe8, 0xe0, 0x89, 0xc7, 0x20, 0x5a, 0xf0, 0x0c, 0x6c, 0xab, 0xb2, 0xc7, 0x40, 0x3e, 0x4f, 0xa4, 0x6c, 0x17, 0xdf,
+    0x76, 0x45, 0x89, 0xfe, 0xab, 0x29, 0xd1, 0x91, 0x99, 0x49, 0x9a, 0x33, 0xd2, 0x03, 0xcd, 0x6a, 0xe4, 0x2c, 0xaa,
+    0xfe, 0x35, 0x64, 0x95, 0xb0, 0x47, 0x69, 0x83, 0x2d, 0x85, 0x8c, 0xff, 0xf6, 0x2a, 0x19, 0xff, 0xdd, 0xcd, 0x32,
+    0xfe, 0xf8, 0x76, 0x22, 0xfe, 0xbb, 0x3f, 0x58, 0xc4, 0x7f, 0x6b, 0x8a, 0x78, 0x21, 0xc4, 0x2e, 0xc0, 0x7a, 0x25,
+    0xb3, 0xf5, 0x38, 0x3b, 0x6f, 0xe1, 0x96, 0xc8, 0x6d, 0x92, 0x9e, 0x1b, 0xb7, 0x12, 0xfe, 0x6b, 0x72, 0x7f, 0xd4,
+    0x60, 0xc6, 0x87, 0x62, 0x79, 0x76, 0x72, 0x92, 0x30, 0x25, 0xe3, 0x8d, 0x0a, 0xb2, 0x88, 0xdf, 0xa4, 0xa1, 0xfd,
+    0x06, 0x9c, 0x53, 0xa3, 0x64, 0x32, 0x81, 0xa2, 0xc9, 0xc4, 0x56, 0xb9, 0xb1, 0x20, 0xcf, 0xa8, 0xd5, 0xeb, 0x5a,
+    0x09, 0xb5, 0xfa, 0xfa, 0x6b, 0xb3, 0xcc, 0x2c, 0x90, 0x51, 0x28, 0xd3, 0x98, 0x90, 0x35, 0xe3, 0xb8, 0xc0, 0x3d,
+    0x58, 0x7d, 0xd8, 0x16, 0xed, 0x95, 0x19, 0x28, 0x95, 0x78, 0x84, 0x5f, 0x4c, 0x69, 0x7e, 0x44, 0x44, 0xe4, 0x31,
+    0xaf, 0x22, 0x57, 0x9d, 0x75, 0x1a, 0xdf, 0xab, 0xab, 0xce, 0x37, 0x61, 0xf1, 0x65, 0x2e, 0xc3, 0xe3, 0x8b, 0x17,
+    0x63, 0xe7, 0x02, 0xec, 0xd8, 0xb8, 0x78, 0x93, 0x36, 0x72, 0xc4, 0x04, 0xd8, 0x61, 0x68, 0x62, 0x5a, 0x0a, 0x82,
+    0x55, 0xc9, 0xf2, 0x55, 0x65, 0xcf, 0xe8, 0x24, 0x53, 0x89, 0x70, 0xc8, 0x41, 0x8d, 0x2c, 0x81, 0x39, 0x98, 0xd4,
+    0x85, 0xf4, 0xe1, 0x72, 0x91, 0x60, 0x71, 0x2a, 0xbf, 0x70, 0x4d, 0x91, 0xff, 0xa5, 0xd4, 0x1f, 0xf2, 0xe8, 0xbd,
+    0xea, 0x89, 0xc1, 0x76, 0x31, 0xc3, 0xb8, 0x54, 0x01, 0x76, 0x20, 0xdc, 0x1c, 0x3f, 0xc7, 0x23, 0x86, 0x50, 0x71,
+    0xec, 0x8a, 0x7a, 0xf8, 0xf9, 0x93, 0xea, 0xab, 0x90, 0xb5, 0x2f, 0x08, 0x36, 0x78, 0x00, 0xbf, 0xec, 0xcf, 0x51,
+    0x1b, 0x64, 0x0b, 0xee, 0x38, 0xd4, 0xca, 0x71, 0x4b, 0xaf, 0xbb, 0xd3, 0x06, 0x15, 0xe3, 0x8b, 0x6f, 0xfe, 0x38,
+    0xba, 0xb3, 0xc4, 0xf7, 0xaa, 0xb0, 0xf9, 0xca, 0x37, 0xb8, 0x34, 0x89, 0xf1, 0x23, 0x21, 0x02, 0x51, 0xe3, 0x9e,
+    0x88, 0x5a, 0xc4, 0xe6, 0xbb, 0xaf, 0xdc, 0x37, 0x83, 0xb0, 0xee, 0x3a, 0x0e, 0x96, 0x31, 0xb2, 0x7a, 0x21, 0xb6,
+    0x15, 0x56, 0xcd, 0x2a, 0x38, 0x37, 0xe8, 0xcc, 0xe2, 0xcc, 0x88, 0x39, 0xd7, 0xb6, 0x41, 0xa9, 0x82, 0xce, 0x22,
+    0x72, 0x7c, 0x81, 0xf1, 0x51, 0xe1, 0xfb, 0x2a, 0xa0, 0xeb, 0x5e, 0xa7, 0x01, 0x39, 0xfa, 0xa3, 0x9a, 0xd1, 0x55,
+    0x95, 0x2a, 0x28, 0xcd, 0x13, 0x02, 0x03, 0x19, 0x0a, 0xfe, 0xc2, 0x1a, 0xa7, 0x42, 0x6f, 0xc1, 0x34, 0x24, 0x80,
+    0xb5, 0x47, 0x86, 0x6e, 0x89, 0xad, 0xc0, 0x16, 0xd2, 0x02, 0x94, 0x1e, 0x76, 0xe8, 0x5b, 0x35, 0xd0, 0xd3, 0xd5,
+    0x98, 0xf1, 0x75, 0x4e, 0xda, 0xc5, 0x91, 0x5f, 0x9c, 0x79, 0xf0, 0xcf, 0xfa, 0x72, 0x09, 0x52, 0xfe, 0xf8, 0x53,
+    0xcc, 0xc1, 0xa6, 0x9e, 0xb7, 0x30, 0x02, 0x42, 0x21, 0x4c, 0xa9, 0x0e, 0xe9, 0xd8, 0x51, 0x5c, 0x0f, 0xea, 0x2d,
+    0x0a, 0xf4, 0xe5, 0xc8, 0x69, 0x09, 0xd2, 0x2c, 0x65, 0xbd, 0xfa, 0xf1, 0xb2, 0xe9, 0x37, 0x28, 0x62, 0x0d, 0x97,
+    0x19, 0xfa, 0x7e, 0xfc, 0x02, 0x7c, 0x3f, 0xa1, 0x46, 0xdb, 0xca, 0x69, 0x68, 0xaf, 0x6d, 0x1f, 0x48, 0xda, 0x6e,
+    0x92, 0xb5, 0x90, 0xaf, 0x3a, 0x47, 0x57, 0x39, 0x37, 0x37, 0x1d, 0xb6, 0x76, 0x77, 0x76, 0x3c, 0xf5, 0xcf, 0x38,
+    0xa5, 0x6e, 0x16, 0xd3, 0x61, 0xeb, 0x6d, 0x20, 0x0b, 0xa2, 0x09, 0x7e, 0x4d, 0xef, 0x36, 0x2d, 0x8f, 0x29, 0xd3,
+    0x71, 0x89, 0x6a, 0x3d, 0xe8, 0x3c, 0x02, 0x6f, 0xed, 0xd6, 0xc3, 0x5f, 0x8f, 0x7e, 0x29, 0x69, 0xa4, 0x2e, 0xac,
+    0xda, 0x76, 0x0f, 0xe5, 0x45, 0x12, 0x5d, 0x80, 0xd3, 0x48, 0x36, 0xc6, 0x31, 0x06, 0x70, 0x7b, 0xf3, 0x4c, 0x66,
+    0x0d, 0xe4, 0x2c, 0xa1, 0x5f, 0x59, 0x21, 0x97, 0x62, 0xfb, 0xc1, 0xfc, 0x5c, 0xad, 0x46, 0xa7, 0x91, 0x0d, 0xf0,
+    0x87, 0x1e, 0xfa, 0x5f, 0x9d, 0x65, 0x50, 0x3f, 0xb8, 0xde, 0x01, 0x18, 0x84, 0x61, 0xd3, 0xca, 0x05, 0x54, 0x6d,
+    0x28, 0x31, 0xd2, 0x1e, 0xaa, 0x81, 0x2c, 0x7f, 0x1b, 0x54, 0x65, 0x54, 0xb0, 0x1e, 0x7e, 0xd6, 0x30, 0x06, 0xd7,
+    0x54, 0x1a, 0x4f, 0xb3, 0x78, 0x3c, 0x4e, 0x58, 0x4f, 0xd9, 0x47, 0x56, 0xe7, 0x01, 0x66, 0x0d, 0x98, 0x4b, 0x56,
+    0x5f, 0x15, 0x83, 0x78, 0x9a, 0x4e, 0xd1, 0x31, 0xd8, 0x6b, 0xf8, 0x6d, 0xc2, 0xb5, 0xe4, 0x94, 0xc7, 0xe9, 0xed,
+    0x8a, 0x78, 0xf4, 0x5c, 0xc7, 0x65, 0x07, 0x8c, 0x45, 0x5a, 0xf0, 0x76, 0x8f, 0x67, 0xf3, 0xa0, 0xb5, 0x5d, 0x47,
+    0x04, 0xab, 0x34, 0x0a, 0xde, 0x1a, 0xb4, 0x3c, 0xb4, 0x0e, 0x84, 0x96, 0xb3, 0xfc, 0x8e, 0x2c, 0xa3, 0x01, 0xf0,
+    0xfb, 0x77, 0xba, 0xa8, 0xac, 0x23, 0xf3, 0xff, 0x67, 0xb7, 0x7c, 0xb5, 0x7e, 0xb7, 0x7c, 0xa5, 0x76, 0xcb, 0xf5,
+    0x1c, 0xfb, 0xc5, 0xa4, 0x83, 0x7f, 0x7a, 0x15, 0x42, 0xb0, 0x2a, 0x40, 0x0e, 0x0b, 0xed, 0xe2, 0x56, 0x17, 0xfe,
+    0xa3, 0xa1, 0xdb, 0x1e, 0xfe, 0xf1, 0xc1, 0x02, 0x6c, 0x5b, 0x58, 0x88, 0xff, 0xda, 0xb5, 0xaa, 0xce, 0x7d, 0xac,
+    0xc3, 0x5e, 0x3b, 0xab, 0x75, 0xdd, 0xeb, 0x37, 0x2d, 0xc8, 0x2b, 0xee, 0x04, 0x4a, 0x18, 0x83, 0xab, 0x16, 0x1d,
+    0x1f, 0x43, 0xe9, 0x24, 0x1b, 0x2d, 0x8a, 0xbf, 0x97, 0xf0, 0x4b, 0x22, 0x5e, 0xbb, 0xa5, 0x1b, 0xe3, 0xa8, 0xae,
+    0x22, 0x05, 0x45, 0x8d, 0xb0, 0xd4, 0xeb, 0x14, 0x14, 0xc0, 0x98, 0xcc, 0xe9, 0xfa, 0xf7, 0xd7, 0x6c, 0x82, 0xbf,
+    0xc9, 0xda, 0xac, 0x45, 0xe6, 0xdf, 0x4b, 0x8c, 0x6b, 0x89, 0xf0, 0x59, 0x34, 0x30, 0xd7, 0xb0, 0xfd, 0x68, 0x3d,
+    0xb8, 0x87, 0x6a, 0xa6, 0xa1, 0x52, 0x0a, 0x52, 0xef, 0x80, 0x17, 0x10, 0x2d, 0x12, 0x7e, 0xfd, 0xa8, 0x57, 0x71,
+    0xc6, 0xca, 0xa8, 0xd7, 0x08, 0xf4, 0xaa, 0xed, 0x2d, 0xa5, 0xf4, 0x17, 0x5f, 0xdd, 0xc7, 0x3f, 0x22, 0xf0, 0x75,
+    0x5c, 0xf9, 0x46, 0x22, 0x36, 0x80, 0xbe, 0xd1, 0x46, 0xcd, 0xf9, 0x11, 0x1a, 0x9c, 0xfc, 0x9f, 0xdb, 0xb6, 0x46,
+    0x63, 0xfd, 0x56, 0xcd, 0xa5, 0x55, 0xfa, 0x59, 0xad, 0x3f, 0x6f, 0xf0, 0x5b, 0xb6, 0x1d, 0x09, 0x87, 0xa0, 0xde,
+    0x56, 0xfe, 0xfa, 0x90, 0x95, 0xc6, 0x8a, 0xe2, 0xb7, 0x6d, 0x5f, 0x99, 0xc4, 0xd4, 0x63, 0x23, 0x3c, 0xd6, 0x4e,
+    0xa4, 0x3c, 0x6f, 0xc6, 0x1e, 0xc2, 0x8f, 0xfc, 0x91, 0x85, 0xf7, 0xf0, 0xcb, 0x5b, 0xd6, 0xf9, 0x2c, 0x49, 0xc1,
+    0xac, 0x9a, 0x72, 0x3e, 0x0f, 0xb6, 0xb6, 0xce, 0xce, 0xce, 0xfc, 0xb3, 0x6d, 0x3f, 0xcb, 0x4f, 0xb6, 0xba, 0xed,
+    0x76, 0x1b, 0x3f, 0x98, 0x64, 0x5b, 0xa7, 0x31, 0x3b, 0x7b, 0x0c, 0xee, 0x87, 0xfd, 0xd0, 0x7a, 0x64, 0x3d, 0xdc,
+    0xb6, 0x76, 0x1e, 0xd8, 0x16, 0x29, 0x00, 0x28, 0xd9, 0xb6, 0x2d, 0xa1, 0x00, 0x42, 0x1b, 0x8a, 0xfb, 0xbb, 0x27,
+    0xca, 0x86, 0xc3, 0x84, 0x74, 0x61, 0x21, 0x81, 0xff, 0x96, 0x7d, 0x62, 0xf5, 0xad, 0x2e, 0xca, 0x5a, 0x52, 0x8d,
+    0xa8, 0x57, 0xdc, 0xef, 0xa3, 0x68, 0x1e, 0x10, 0x1b, 0x99, 0x85, 0x18, 0x26, 0x13, 0xa5, 0x34, 0x05, 0xda, 0xa5,
+    0xc7, 0xf0, 0x04, 0x6e, 0xc1, 0xd4, 0x82, 0xe7, 0x57, 0xdd, 0x87, 0xa0, 0xe3, 0x4e, 0x5b, 0xf7, 0x47, 0xed, 0x56,
+    0xc7, 0xea, 0xb4, 0xba, 0xfe, 0x43, 0xab, 0x2b, 0xfe, 0x07, 0x19, 0xb9, 0x6d, 0x75, 0xe0, 0x69, 0xdb, 0x82, 0xf7,
+    0xd3, 0xfb, 0x22, 0x1d, 0x22, 0xb2, 0xb7, 0xfa, 0xbb, 0xf8, 0xfb, 0x83, 0x00, 0xa9, 0xaf, 0x6c, 0xf1, 0x1b, 0xcf,
+    0xec, 0x2f, 0xcc, 0xd2, 0xce, 0xa3, 0xb5, 0xc5, 0xdd, 0x87, 0x6b, 0x8b, 0xb7, 0x1f, 0xac, 0x2d, 0xbe, 0xbf, 0x53,
+    0x2f, 0xde, 0x3a, 0x11, 0x55, 0x5a, 0x2e, 0x84, 0xf6, 0x2c, 0x02, 0x46, 0x39, 0x77, 0x3a, 0x00, 0x67, 0xdb, 0x6a,
+    0xe1, 0x8f, 0x87, 0x5d, 0x57, 0xf7, 0x3a, 0xc6, 0x5e, 0x1a, 0xcb, 0x87, 0x8f, 0x00, 0xcb, 0xe7, 0xdd, 0x07, 0x23,
+    0x6c, 0x47, 0x88, 0xc2, 0xbf, 0xd3, 0xed, 0x47, 0x23, 0xd0, 0x08, 0x16, 0xfe, 0x83, 0x3f, 0xd3, 0x9d, 0xee, 0x48,
+    0xbc, 0xb4, 0xb1, 0xfe, 0x43, 0xe7, 0x61, 0x01, 0x4d, 0xf1, 0xcf, 0x6f, 0xda, 0x84, 0x46, 0x03, 0xde, 0x1c, 0xf7,
+    0x3e, 0xd0, 0xe8, 0xd1, 0xb4, 0xeb, 0x7f, 0x75, 0xfa, 0xd0, 0x7f, 0x34, 0xed, 0x3c, 0xfc, 0x20, 0xde, 0x12, 0xa0,
+    0xe0, 0x57, 0xf8, 0xef, 0xc3, 0x76, 0x7b, 0xda, 0xea, 0xf8, 0x8f, 0x4e, 0xb7, 0xfd, 0xed, 0xa4, 0xf5, 0xc0, 0x7f,
+    0x84, 0xff, 0xaa, 0xe1, 0xa6, 0xd9, 0x8c, 0xd9, 0x16, 0xae, 0x77, 0xc3, 0xef, 0x35, 0xe7, 0xe8, 0xde, 0xb7, 0x76,
+    0xee, 0x3f, 0x7f, 0x04, 0x6b, 0x34, 0xed, 0x74, 0xe1, 0xff, 0xab, 0x1e, 0x3f, 0x20, 0xe1, 0xe5, 0xc0, 0x11, 0xc3,
+    0x54, 0x52, 0x45, 0x38, 0xfa, 0x78, 0xd7, 0x3d, 0xef, 0x87, 0xab, 0x02, 0x20, 0x7f, 0xbe, 0x39, 0x00, 0xf2, 0x97,
+    0x5b, 0x06, 0xb9, 0xff, 0xfc, 0x07, 0x47, 0x40, 0x7e, 0x68, 0x06, 0xb9, 0xf7, 0xd8, 0x4a, 0xa0, 0xa3, 0xe9, 0xac,
+    0x3d, 0x67, 0xce, 0xe1, 0x8f, 0x6c, 0x88, 0x69, 0xd3, 0xd0, 0xfa, 0x2f, 0xb5, 0x78, 0x50, 0x86, 0x1b, 0x79, 0x8f,
+    0x89, 0x9d, 0xcc, 0xf8, 0x15, 0x04, 0xe1, 0xfc, 0x46, 0x82, 0xbc, 0xb8, 0x1d, 0x3d, 0x38, 0xff, 0x63, 0xe9, 0x41,
+    0x5f, 0xee, 0x57, 0xf4, 0xa8, 0x45, 0xdc, 0x29, 0x62, 0x40, 0x8e, 0xfe, 0x3e, 0xbd, 0x3b, 0xf6, 0x16, 0xc3, 0xb7,
+    0xc2, 0x16, 0xb9, 0x80, 0xef, 0x3e, 0xe7, 0x74, 0x40, 0x64, 0x15, 0x87, 0xb6, 0x0c, 0xc0, 0xcc, 0xf1, 0xdb, 0xb4,
+    0xea, 0xe5, 0x54, 0xdc, 0x5c, 0x09, 0xe9, 0xda, 0xd9, 0x8e, 0x0e, 0xde, 0x60, 0xa2, 0x77, 0xb8, 0xcc, 0x78, 0x84,
+    0xbf, 0xfc, 0x88, 0xc7, 0x3c, 0xc1, 0x4b, 0xb1, 0xf2, 0x02, 0x19, 0xe6, 0x25, 0x7f, 0x87, 0x39, 0xd5, 0xea, 0x90,
+    0x60, 0x86, 0x01, 0x83, 0x57, 0x6c, 0x1c, 0x47, 0x8e, 0xed, 0xcc, 0x61, 0xc7, 0xc2, 0x98, 0xad, 0x5a, 0x42, 0x33,
+    0xe5, 0x32, 0xbb, 0xb6, 0xfa, 0x7d, 0x3b, 0x39, 0x7e, 0xbf, 0x2c, 0x3c, 0x94, 0x01, 0x46, 0x5b, 0x7a, 0x00, 0x30,
+    0xbe, 0x2a, 0xc9, 0x51, 0xd8, 0x57, 0x56, 0x83, 0x2d, 0xcc, 0x86, 0x8e, 0xdf, 0x05, 0x37, 0x82, 0x8a, 0xf1, 0x7b,
+    0x50, 0x3f, 0x38, 0xad, 0x6d, 0x30, 0x6b, 0x8c, 0x6e, 0x7a, 0xa0, 0xe1, 0x4a, 0x18, 0x49, 0x04, 0x07, 0x1a, 0xa5,
+    0x9e, 0xfe, 0x05, 0x64, 0x55, 0xb8, 0xa8, 0x78, 0x7c, 0x71, 0x20, 0xef, 0x7c, 0xdb, 0x18, 0xb9, 0xa5, 0x88, 0x7d,
+    0xf5, 0xbd, 0xa9, 0x4d, 0x50, 0x17, 0xf4, 0x5b, 0x20, 0xe9, 0xdc, 0x1b, 0x35, 0x02, 0xa6, 0x5c, 0x5b, 0xd2, 0x73,
+    0x08, 0x6d, 0xa1, 0x0f, 0xc6, 0xec, 0x34, 0x1e, 0x49, 0xb1, 0xee, 0x59, 0xf2, 0xaa, 0x48, 0x8b, 0xb0, 0x08, 0x3b,
+    0x9e, 0xf0, 0x9d, 0xe1, 0x05, 0xb5, 0x5a, 0x98, 0x66, 0x76, 0xff, 0x5e, 0x4f, 0x43, 0x52, 0xcf, 0x56, 0xb7, 0xf1,
+    0x57, 0x52, 0x1e, 0x82, 0xaf, 0xf6, 0xf7, 0xe1, 0x3d, 0xfc, 0xa5, 0x94, 0xf7, 0x86, 0xb6, 0xeb, 0x93, 0x50, 0xbc,
+    0x57, 0xfd, 0x66, 0x4a, 0x94, 0x08, 0x9b, 0xa0, 0xbf, 0xbc, 0xdb, 0x2a, 0x32, 0xa9, 0xb4, 0xba, 0x3b, 0x95, 0xd2,
+    0x82, 0x67, 0x43, 0x4a, 0x81, 0x00, 0xed, 0xfa, 0x3b, 0x86, 0x28, 0x3c, 0x6d, 0xe1, 0xcf, 0x9a, 0x30, 0xbc, 0x0f,
+    0x0d, 0x94, 0x34, 0x7c, 0x09, 0xcd, 0xb7, 0x85, 0xe0, 0x85, 0x7e, 0x3f, 0x92, 0xa8, 0x12, 0x62, 0xaa, 0xce, 0x31,
+    0x6b, 0x0e, 0x91, 0x44, 0x8e, 0x80, 0xed, 0x19, 0xf1, 0x26, 0xc1, 0xae, 0x32, 0x9a, 0xf2, 0x14, 0xfa, 0x3a, 0xfa,
+    0x33, 0xce, 0xeb, 0xea, 0xbc, 0xda, 0xce, 0x59, 0x33, 0x05, 0x32, 0x7c, 0xe3, 0xa0, 0x8a, 0xae, 0x2e, 0x88, 0xcf,
+    0x99, 0x89, 0x6d, 0x5c, 0x7d, 0xf0, 0x6d, 0x4d, 0xf6, 0xad, 0xb9, 0x29, 0x58, 0xc5, 0x34, 0xb4, 0x2f, 0x30, 0x65,
+    0x06, 0x7f, 0x56, 0xc5, 0xea, 0x41, 0x32, 0x94, 0x9f, 0x44, 0xf8, 0xdb, 0x58, 0xe8, 0x47, 0x59, 0x6d, 0x40, 0x4e,
+    0xdf, 0xab, 0x24, 0x48, 0x5f, 0x8c, 0xcb, 0x26, 0x12, 0x60, 0x2f, 0xe0, 0x2f, 0xf7, 0xab, 0xae, 0x4a, 0xc8, 0x3b,
+    0x90, 0x98, 0x53, 0x30, 0x8e, 0x73, 0xba, 0x5a, 0xab, 0xf0, 0xaf, 0x45, 0x34, 0x2b, 0x52, 0xd3, 0xae, 0x64, 0xc5,
+    0xc0, 0xc6, 0x22, 0x3b, 0x90, 0xc9, 0x68, 0xe6, 0x07, 0x9b, 0xcd, 0xbb, 0x8f, 0x63, 0x91, 0x87, 0x86, 0x1f, 0xb4,
+    0xb7, 0x05, 0x91, 0x6d, 0x10, 0x63, 0x57, 0xe2, 0x44, 0xc6, 0x0d, 0x5e, 0x19, 0xac, 0x7e, 0x43, 0x91, 0xb9, 0xe1,
+    0x6d, 0x73, 0xb5, 0xf4, 0xb8, 0xb4, 0x0e, 0xae, 0x8c, 0xdf, 0x1d, 0xb3, 0x88, 0xfb, 0x51, 0x4a, 0xb9, 0x49, 0x8e,
+    0x21, 0x16, 0xbc, 0x0e, 0xdb, 0x76, 0x4b, 0x90, 0x3c, 0xc6, 0xaf, 0x70, 0x12, 0xa4, 0xf7, 0xa1, 0xb0, 0x4a, 0xd8,
+    0xda, 0x9d, 0x76, 0xfb, 0x6f, 0x0e, 0xf6, 0x2c, 0xb1, 0x9b, 0x77, 0xb7, 0xe0, 0x75, 0x97, 0xdc, 0x61, 0x91, 0x9f,
+    0x11, 0x8a, 0xfc, 0x0c, 0x4b, 0x24, 0x74, 0x85, 0xf6, 0x96, 0x40, 0xd3, 0xb6, 0x58, 0x3a, 0x12, 0x31, 0xbc, 0x19,
+    0xb8, 0x0b, 0x31, 0x7e, 0xd4, 0x6b, 0x0b, 0xbb, 0xb5, 0x70, 0xa5, 0x6d, 0x95, 0xe1, 0xa2, 0x0c, 0x04, 0x9e, 0xaa,
+    0x88, 0x1f, 0xa8, 0x75, 0xa6, 0x92, 0x5d, 0xe4, 0x50, 0x3a, 0x27, 0x75, 0xb5, 0x75, 0xb1, 0x38, 0x9e, 0x81, 0x1c,
+    0x52, 0x09, 0x2a, 0xef, 0x65, 0x87, 0x5d, 0x9a, 0x0a, 0x93, 0x62, 0x57, 0x23, 0x92, 0xd3, 0x4e, 0x7f, 0x37, 0x92,
+    0xf6, 0x0e, 0xee, 0xdd, 0x02, 0x36, 0x2f, 0xa8, 0x39, 0x34, 0x2a, 0xfc, 0x38, 0xdb, 0x3a, 0x63, 0xc7, 0xad, 0x68,
+    0x1e, 0x57, 0xe1, 0x3f, 0xd4, 0x7e, 0xfd, 0x5d, 0xa5, 0x08, 0x65, 0x9a, 0xa5, 0x7c, 0x8c, 0x8c, 0x2c, 0x0e, 0x24,
+    0x1c, 0x31, 0x68, 0x29, 0x63, 0x8b, 0x64, 0x34, 0x02, 0xf1, 0x01, 0x56, 0xe2, 0x5f, 0x15, 0x83, 0x94, 0x9a, 0xa0,
+    0xb4, 0xfb, 0x7f, 0xfd, 0x5f, 0xff, 0x5b, 0x86, 0x15, 0x81, 0xac, 0x00, 0x16, 0xa6, 0xc1, 0x54, 0x27, 0x8c, 0xec,
+    0x1c, 0x1c, 0xd1, 0x78, 0xdc, 0x9a, 0x46, 0xc9, 0x04, 0x20, 0x28, 0x98, 0xb8, 0xca, 0x24, 0xeb, 0x81, 0x0b, 0x24,
+    0x58, 0xe6, 0xe1, 0xbc, 0x04, 0xaf, 0x5e, 0x84, 0x2b, 0xf6, 0xbb, 0xf2, 0x56, 0x55, 0xbe, 0x30, 0x31, 0xb4, 0x91,
+    0xc5, 0x6a, 0xf0, 0x5c, 0x2d, 0x93, 0x55, 0xfd, 0x82, 0x24, 0x29, 0x3c, 0x58, 0x2d, 0x8d, 0x15, 0x5a, 0xea, 0x83,
+    0x90, 0x7f, 0xfb, 0xe7, 0xff, 0xfc, 0xdf, 0xd5, 0x2b, 0x9e, 0x6f, 0xfc, 0xf5, 0x9f, 0xfe, 0xe1, 0xff, 0xfe, 0x9f,
+    0xff, 0x82, 0x59, 0xc2, 0xf2, 0x0c, 0x84, 0xb6, 0x92, 0x55, 0x1d, 0x80, 0x88, 0x3d, 0x65, 0x55, 0x0e, 0x47, 0x3d,
+    0xdd, 0x75, 0x9f, 0x26, 0x24, 0xde, 0x94, 0xd0, 0x11, 0x5f, 0x53, 0x7a, 0x34, 0x51, 0xed, 0x1a, 0xf2, 0xc1, 0x52,
+    0x5a, 0x74, 0xac, 0x6f, 0xef, 0xb4, 0xed, 0x6a, 0x79, 0xfb, 0x46, 0xdf, 0x2d, 0x5c, 0x98, 0x5b, 0x65, 0xe0, 0xf8,
+    0x7a, 0xd9, 0x96, 0x2a, 0x8c, 0x85, 0x25, 0x65, 0x55, 0x6e, 0x61, 0x7c, 0x79, 0x89, 0xaf, 0x41, 0xd7, 0x28, 0xa6,
+    0x55, 0xae, 0xf5, 0xe9, 0xfd, 0xb2, 0x00, 0x44, 0x27, 0xb8, 0x34, 0x22, 0x58, 0x46, 0x67, 0xa7, 0x2d, 0xb4, 0x4e,
+    0x92, 0x8b, 0x92, 0x46, 0x11, 0xde, 0xcc, 0xfd, 0x47, 0x7f, 0x57, 0xfe, 0x69, 0x86, 0x56, 0x81, 0xe5, 0xcc, 0xa2,
+    0x73, 0xe9, 0xe3, 0x3c, 0x68, 0xb7, 0xe7, 0xe7, 0xee, 0xb2, 0x9a, 0xc1, 0xbb, 0x6a, 0x32, 0x0a, 0xb0, 0x99, 0x03,
+    0xd2, 0xa1, 0xab, 0x8e, 0xe5, 0x81, 0x59, 0xdf, 0xc6, 0xd0, 0x4f, 0x59, 0x7e, 0xb9, 0xa4, 0x70, 0x52, 0xfc, 0x1b,
+    0x1e, 0x8e, 0xca, 0xc8, 0x1b, 0x94, 0x18, 0x58, 0x2c, 0x8d, 0x5e, 0x5d, 0xd1, 0x6b, 0xda, 0x59, 0xcd, 0x4d, 0x31,
+    0x0f, 0x77, 0xcd, 0x63, 0xd9, 0xfb, 0x78, 0xd0, 0x3a, 0xed, 0x78, 0xd3, 0xee, 0x52, 0x0f, 0xcf, 0x79, 0x36, 0x33,
+    0x4f, 0x73, 0x59, 0xc4, 0x46, 0x6c, 0xa2, 0x22, 0x96, 0xb2, 0x5e, 0x9c, 0xd4, 0x96, 0x5f, 0xe0, 0x76, 0x03, 0xda,
+    0x66, 0x11, 0x0f, 0x88, 0x69, 0x7b, 0xe6, 0x79, 0x6f, 0x84, 0x27, 0xe9, 0xd9, 0xd2, 0x98, 0xab, 0x27, 0x9a, 0x62,
+    0x5c, 0xb0, 0x9e, 0xf7, 0x53, 0xfa, 0xd4, 0xdd, 0x1c, 0x4a, 0x84, 0x15, 0x5e, 0xc8, 0x63, 0xd4, 0x77, 0x35, 0x7f,
+    0x5c, 0x8a, 0x62, 0x70, 0x81, 0xd7, 0xd6, 0x0b, 0xb5, 0x28, 0x6a, 0x5f, 0x80, 0xb5, 0x43, 0x60, 0xda, 0xcd, 0x56,
+    0x54, 0x88, 0xad, 0xde, 0x85, 0x2f, 0xb4, 0xed, 0x1d, 0xcd, 0xe7, 0xd4, 0xd0, 0x05, 0x6e, 0x24, 0x1b, 0x1a, 0x25,
+    0x05, 0xa5, 0x08, 0x88, 0x13, 0x79, 0xd9, 0x46, 0xb2, 0xad, 0x78, 0x92, 0x67, 0xf5, 0xf4, 0xfb, 0xb6, 0xff, 0x1f,
+    0x22, 0x28, 0x4d, 0x5d, 0x85, 0x7b, 0x00, 0x00};
 
 }  // namespace web_server
 }  // namespace esphome
diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index 5c06a97d47..30ac959e43 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -360,9 +360,14 @@ void WebServer::handle_sensor_request(AsyncWebServerRequest *request, const UrlM
 }
 std::string WebServer::sensor_json(sensor::Sensor *obj, float value, JsonDetail start_config) {
   return json::build_json([obj, value, start_config](JsonObject root) {
-    std::string state = value_accuracy_to_string(value, obj->get_accuracy_decimals());
-    if (!obj->get_unit_of_measurement().empty())
-      state += " " + obj->get_unit_of_measurement();
+    std::string state;
+    if (isnan(value)) {
+      state = "NA";
+    } else {
+      state = value_accuracy_to_string(value, obj->get_accuracy_decimals());
+      if (!obj->get_unit_of_measurement().empty())
+        state += " " + obj->get_unit_of_measurement();
+    }
     set_json_icon_state_value(root, obj, "sensor-" + obj->get_object_id(), state, value, start_config);
   });
 }
@@ -719,12 +724,15 @@ std::string WebServer::number_json(number::Number *obj, float value, JsonDetail
       root["step"] = obj->traits.get_step();
       root["mode"] = (int) obj->traits.get_mode();
     }
-    std::string state = str_sprintf("%f", value);
-    root["state"] = state;
     if (isnan(value)) {
       root["value"] = "\"NaN\"";
+      root["state"] = "NA";
     } else {
       root["value"] = value;
+      std::string state = value_accuracy_to_string(value, step_to_accuracy_decimals(obj->traits.get_step()));
+      if (!obj->traits.get_unit_of_measurement().empty())
+        state += " " + obj->traits.get_unit_of_measurement();
+      root["state"] = state;
     }
   });
 }
diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index b03d890ad8..d82e452c3d 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -258,6 +258,19 @@ std::string value_accuracy_to_string(float value, int8_t accuracy_decimals) {
   return std::string(tmp);
 }
 
+int8_t step_to_accuracy_decimals(float step) {
+  // use printf %g to find number of digits based on temperature step
+  char buf[32];
+  sprintf(buf, "%.5g", step);
+
+  std::string str{buf};
+  size_t dot_pos = str.find('.');
+  if (dot_pos == std::string::npos)
+    return 0;
+
+  return str.length() - dot_pos - 1;
+}
+
 // Colors
 
 float gamma_correct(float value, float gamma) {
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index dab829ab93..6bed743010 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -415,6 +415,9 @@ ParseOnOffState parse_on_off(const char *str, const char *on = nullptr, const ch
 /// Create a string from a value and an accuracy in decimals.
 std::string value_accuracy_to_string(float value, int8_t accuracy_decimals);
 
+/// Derive accuracy in decimals from an increment step.
+int8_t step_to_accuracy_decimals(float step);
+
 ///@}
 
 /// @name Colors

From fb8846bb455c4d8a8b84776ebb71e43eeb359c99 Mon Sep 17 00:00:00 2001
From: buxtronix <bbuxton@gmail.com>
Date: Mon, 15 Aug 2022 13:06:05 +1000
Subject: [PATCH 020/838] Only trigger ble_client on_connect after discovering
 services (#3710)

---
 esphome/components/ble_client/automation.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/ble_client/automation.h b/esphome/components/ble_client/automation.h
index 12c22345b4..828cbca662 100644
--- a/esphome/components/ble_client/automation.h
+++ b/esphome/components/ble_client/automation.h
@@ -15,10 +15,10 @@ class BLEClientConnectTrigger : public Trigger<>, public BLEClientNode {
   void loop() override {}
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override {
-    if (event == ESP_GATTC_OPEN_EVT && param->open.status == ESP_GATT_OK)
-      this->trigger();
-    if (event == ESP_GATTC_SEARCH_CMPL_EVT)
+    if (event == ESP_GATTC_SEARCH_CMPL_EVT) {
       this->node_state = espbt::ClientState::ESTABLISHED;
+      this->trigger();
+    }
   }
 };
 

From 8cfcd5904c7a3b88310227ce8947f0117627868c Mon Sep 17 00:00:00 2001
From: rbaron <rbaron@rbaron.net>
Date: Mon, 15 Aug 2022 05:09:33 +0200
Subject: [PATCH 021/838] Fixes BLE remote address type when connecting (#3702)

---
 esphome/components/ble_client/ble_client.cpp | 3 ++-
 esphome/components/ble_client/ble_client.h   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/esphome/components/ble_client/ble_client.cpp b/esphome/components/ble_client/ble_client.cpp
index d06c3c4cad..5f58d8273f 100644
--- a/esphome/components/ble_client/ble_client.cpp
+++ b/esphome/components/ble_client/ble_client.cpp
@@ -54,6 +54,7 @@ bool BLEClient::parse_device(const espbt::ESPBTDevice &device) {
   this->remote_bda[3] = (addr >> 16) & 0xFF;
   this->remote_bda[4] = (addr >> 8) & 0xFF;
   this->remote_bda[5] = (addr >> 0) & 0xFF;
+  this->remote_addr_type = device.get_address_type();
   return true;
 }
 
@@ -83,7 +84,7 @@ void BLEClient::set_enabled(bool enabled) {
 
 void BLEClient::connect() {
   ESP_LOGI(TAG, "Attempting BLE connection to %s", this->address_str().c_str());
-  auto ret = esp_ble_gattc_open(this->gattc_if, this->remote_bda, BLE_ADDR_TYPE_PUBLIC, true);
+  auto ret = esp_ble_gattc_open(this->gattc_if, this->remote_bda, this->remote_addr_type, true);
   if (ret) {
     ESP_LOGW(TAG, "esp_ble_gattc_open error, address=%s status=%d", this->address_str().c_str(), ret);
     this->set_states_(espbt::ClientState::IDLE);
diff --git a/esphome/components/ble_client/ble_client.h b/esphome/components/ble_client/ble_client.h
index b122bfd11e..5ed8f219d1 100644
--- a/esphome/components/ble_client/ble_client.h
+++ b/esphome/components/ble_client/ble_client.h
@@ -115,6 +115,7 @@ class BLEClient : public espbt::ESPBTClient, public Component {
 
   int gattc_if;
   esp_bd_addr_t remote_bda;
+  esp_ble_addr_type_t remote_addr_type;
   uint16_t conn_id;
   uint64_t address;
   bool enabled;

From d07a6704d53c79eaf6bbe40eeab920e21f226ebc Mon Sep 17 00:00:00 2001
From: rbaron <rbaron@rbaron.net>
Date: Tue, 16 Aug 2022 04:40:58 +0200
Subject: [PATCH 022/838] Makes ble_client.ble_write's action value templatable
 (#3715)

---
 esphome/components/ble_client/__init__.py    | 10 +++++--
 esphome/components/ble_client/automation.cpp |  9 +++---
 esphome/components/ble_client/automation.h   | 30 ++++++++++++++++----
 tests/test2.yaml                             |  6 ++++
 4 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/esphome/components/ble_client/__init__.py b/esphome/components/ble_client/__init__.py
index 6c13e7fcf5..4b7d5f5b8a 100644
--- a/esphome/components/ble_client/__init__.py
+++ b/esphome/components/ble_client/__init__.py
@@ -82,7 +82,7 @@ BLE_WRITE_ACTION_SCHEMA = cv.Schema(
         cv.Required(CONF_ID): cv.use_id(BLEClient),
         cv.Required(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
         cv.Required(CONF_CHARACTERISTIC_UUID): esp32_ble_tracker.bt_uuid,
-        cv.Required(CONF_VALUE): cv.ensure_list(cv.hex_uint8_t),
+        cv.Required(CONF_VALUE): cv.templatable(cv.ensure_list(cv.hex_uint8_t)),
     }
 )
 
@@ -93,8 +93,14 @@ BLE_WRITE_ACTION_SCHEMA = cv.Schema(
 async def ble_write_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)
+
     value = config[CONF_VALUE]
-    cg.add(var.set_value(value))
+    if cg.is_template(value):
+        templ = await cg.templatable(value, args, cg.std_vector.template(cg.uint8))
+        cg.add(var.set_value_template(templ))
+    else:
+        cg.add(var.set_value_simple(value))
+
     serv_uuid128 = esp32_ble_tracker.as_reversed_hex_array(config[CONF_SERVICE_UUID])
     cg.add(var.set_service_uuid128(serv_uuid128))
     char_uuid128 = esp32_ble_tracker.as_reversed_hex_array(
diff --git a/esphome/components/ble_client/automation.cpp b/esphome/components/ble_client/automation.cpp
index 8d5fe96570..6918ab31b4 100644
--- a/esphome/components/ble_client/automation.cpp
+++ b/esphome/components/ble_client/automation.cpp
@@ -10,7 +10,7 @@ namespace esphome {
 namespace ble_client {
 static const char *const TAG = "ble_client.automation";
 
-void BLEWriterClientNode::write() {
+void BLEWriterClientNode::write(const std::vector<uint8_t> &value) {
   if (this->node_state != espbt::ClientState::ESTABLISHED) {
     ESP_LOGW(TAG, "Cannot write to BLE characteristic - not connected");
     return;
@@ -29,9 +29,10 @@ void BLEWriterClientNode::write() {
     ESP_LOGE(TAG, "Characteristic %s does not allow writing", this->char_uuid_.to_string().c_str());
     return;
   }
-  ESP_LOGVV(TAG, "Will write %d bytes: %s", this->value_.size(), format_hex_pretty(this->value_).c_str());
-  esp_err_t err = esp_ble_gattc_write_char(this->parent()->gattc_if, this->parent()->conn_id, this->ble_char_handle_,
-                                           value_.size(), value_.data(), write_type, ESP_GATT_AUTH_REQ_NONE);
+  ESP_LOGVV(TAG, "Will write %d bytes: %s", value.size(), format_hex_pretty(value).c_str());
+  esp_err_t err =
+      esp_ble_gattc_write_char(this->parent()->gattc_if, this->parent()->conn_id, this->ble_char_handle_, value.size(),
+                               const_cast<uint8_t *>(value.data()), write_type, ESP_GATT_AUTH_REQ_NONE);
   if (err != ESP_OK) {
     ESP_LOGE(TAG, "Error writing to characteristic: %s!", esp_err_to_name(err));
   }
diff --git a/esphome/components/ble_client/automation.h b/esphome/components/ble_client/automation.h
index 828cbca662..38e64ebd76 100644
--- a/esphome/components/ble_client/automation.h
+++ b/esphome/components/ble_client/automation.h
@@ -42,10 +42,8 @@ class BLEWriterClientNode : public BLEClientNode {
     ble_client_ = ble_client;
   }
 
-  void set_value(std::vector<uint8_t> value) { value_ = std::move(value); }
-
-  // Attempts to write the contents of value_ to char_uuid_.
-  void write();
+  // Attempts to write the contents of value to char_uuid_.
+  void write(const std::vector<uint8_t> &value);
 
   void set_char_uuid128(uint8_t *uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
 
@@ -60,14 +58,34 @@ class BLEWriterClientNode : public BLEClientNode {
   esp_gatt_char_prop_t char_props_;
   espbt::ESPBTUUID service_uuid_;
   espbt::ESPBTUUID char_uuid_;
-  std::vector<uint8_t> value_;
 };
 
 template<typename... Ts> class BLEClientWriteAction : public Action<Ts...>, public BLEWriterClientNode {
  public:
   BLEClientWriteAction(BLEClient *ble_client) : BLEWriterClientNode(ble_client) {}
 
-  void play(Ts... x) override { return write(); }
+  void play(Ts... x) override {
+    if (has_simple_value_) {
+      return write(this->value_simple_);
+    } else {
+      return write(this->value_template_(x...));
+    }
+  }
+
+  void set_value_template(std::function<std::vector<uint8_t>(Ts...)> func) {
+    this->value_template_ = std::move(func);
+    has_simple_value_ = false;
+  }
+
+  void set_value_simple(const std::vector<uint8_t> &value) {
+    this->value_simple_ = value;
+    has_simple_value_ = true;
+  }
+
+ private:
+  bool has_simple_value_ = true;
+  std::vector<uint8_t> value_simple_;
+  std::function<std::vector<uint8_t>(Ts...)> value_template_{};
 };
 
 }  // namespace ble_client
diff --git a/tests/test2.yaml b/tests/test2.yaml
index 5dd9e76a2f..110e8e6625 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -615,3 +615,9 @@ switch:
           service_uuid: F61E3BE9-2826-A81B-970A-4D4DECFABBAE
           characteristic_uuid: 6490FAFE-0734-732C-8705-91B653A081FC
           value: [0x01, 0xab, 0xff]
+      - ble_client.ble_write:
+          id: airthings01
+          service_uuid: F61E3BE9-2826-A81B-970A-4D4DECFABBAE
+          characteristic_uuid: 6490FAFE-0734-732C-8705-91B653A081FC
+          value: !lambda |-
+            return {0x13, 0x37};

From c943d84036fd77a89d8ba1f3c3a0156aa3ffd59a Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 16 Aug 2022 14:47:48 +1200
Subject: [PATCH 023/838] Bump version to 2022.8.0b3

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

diff --git a/esphome/const.py b/esphome/const.py
index 59fa466d11..00d155e66f 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.8.0b2"
+__version__ = "2022.8.0b3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 3a82f500d4d1a8122aeb8ba4dd1a228a36ed2101 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 17 Aug 2022 12:58:30 +1200
Subject: [PATCH 024/838] Bump version to 2022.8.0

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

diff --git a/esphome/const.py b/esphome/const.py
index 00d155e66f..981ee773d4 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.8.0b3"
+__version__ = "2022.8.0"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 2650441013a587911d603e3e715e63ae7b808484 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Aug 2022 17:01:36 +1200
Subject: [PATCH 025/838] Bump pylint from 2.14.5 to 2.15.0 (#3746)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/font/__init__.py       | 4 ++--
 esphome/components/shelly_dimmer/light.py | 2 +-
 esphome/dashboard/dashboard.py            | 4 +++-
 requirements_test.txt                     | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/esphome/components/font/__init__.py b/esphome/components/font/__init__.py
index ced433dc5a..aa165ebaa5 100644
--- a/esphome/components/font/__init__.py
+++ b/esphome/components/font/__init__.py
@@ -146,7 +146,7 @@ def download_gfonts(value):
     if path.is_file():
         return value
     try:
-        req = requests.get(url)
+        req = requests.get(url, timeout=30)
         req.raise_for_status()
     except requests.exceptions.RequestException as e:
         raise cv.Invalid(
@@ -162,7 +162,7 @@ def download_gfonts(value):
 
     ttf_url = match.group(1)
     try:
-        req = requests.get(ttf_url)
+        req = requests.get(ttf_url, timeout=30)
         req.raise_for_status()
     except requests.exceptions.RequestException as e:
         raise cv.Invalid(f"Could not download ttf file for {name} ({ttf_url}): {e}")
diff --git a/esphome/components/shelly_dimmer/light.py b/esphome/components/shelly_dimmer/light.py
index 003498c090..3978d37c0b 100644
--- a/esphome/components/shelly_dimmer/light.py
+++ b/esphome/components/shelly_dimmer/light.py
@@ -73,7 +73,7 @@ def get_firmware(value):
 
     def dl(url):
         try:
-            req = requests.get(url)
+            req = requests.get(url, timeout=30)
             req.raise_for_status()
         except requests.exceptions.RequestException as e:
             raise cv.Invalid(f"Could not download firmware file ({url}): {e}")
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index ca2767639d..e7a17cba4c 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -823,7 +823,9 @@ class LoginHandler(BaseHandler):
             "password": self.get_argument("password", ""),
         }
         try:
-            req = requests.post("http://supervisor/auth", headers=headers, data=data)
+            req = requests.post(
+                "http://supervisor/auth", headers=headers, data=data, timeout=30
+            )
             if req.status_code == 200:
                 self.set_secure_cookie("authenticated", cookie_authenticated_yes)
                 self.redirect("/")
diff --git a/requirements_test.txt b/requirements_test.txt
index ed48818276..8ae7563642 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,4 +1,4 @@
-pylint==2.14.5
+pylint==2.15.0
 flake8==5.0.4
 black==22.6.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==2.37.3  # also change in .pre-commit-config.yaml when updating

From 3acc8e7479843998bdc9def5ea0a0c7397906b57 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Tue, 16 Aug 2022 20:41:46 -0700
Subject: [PATCH 026/838] fix grow password setting (#3722)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 esphome/components/fingerprint_grow/fingerprint_grow.cpp | 8 ++++----
 esphome/components/fingerprint_grow/fingerprint_grow.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/esphome/components/fingerprint_grow/fingerprint_grow.cpp b/esphome/components/fingerprint_grow/fingerprint_grow.cpp
index 3b8c52fea2..1d6cb776b7 100644
--- a/esphome/components/fingerprint_grow/fingerprint_grow.cpp
+++ b/esphome/components/fingerprint_grow/fingerprint_grow.cpp
@@ -51,7 +51,7 @@ void FingerprintGrowComponent::update() {
 void FingerprintGrowComponent::setup() {
   ESP_LOGCONFIG(TAG, "Setting up Grow Fingerprint Reader...");
   if (this->check_password_()) {
-    if (this->new_password_ != nullptr) {
+    if (this->new_password_ != -1) {
       if (this->set_password_())
         return;
     } else {
@@ -202,9 +202,9 @@ bool FingerprintGrowComponent::check_password_() {
 }
 
 bool FingerprintGrowComponent::set_password_() {
-  ESP_LOGI(TAG, "Setting new password: %d", *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)};
+  ESP_LOGI(TAG, "Setting new password: %d", 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) {
     ESP_LOGI(TAG, "New password successfully set");
     ESP_LOGI(TAG, "Define the new password in your configuration and reflash now");
diff --git a/esphome/components/fingerprint_grow/fingerprint_grow.h b/esphome/components/fingerprint_grow/fingerprint_grow.h
index 7ec253ff3a..e50418a768 100644
--- a/esphome/components/fingerprint_grow/fingerprint_grow.h
+++ b/esphome/components/fingerprint_grow/fingerprint_grow.h
@@ -96,7 +96,7 @@ class FingerprintGrowComponent : public PollingComponent, public uart::UARTDevic
   }
   void set_sensing_pin(GPIOPin *sensing_pin) { this->sensing_pin_ = sensing_pin; }
   void set_password(uint32_t password) { this->password_ = password; }
-  void set_new_password(uint32_t new_password) { this->new_password_ = &new_password; }
+  void set_new_password(uint32_t new_password) { this->new_password_ = new_password; }
   void set_fingerprint_count_sensor(sensor::Sensor *fingerprint_count_sensor) {
     this->fingerprint_count_sensor_ = fingerprint_count_sensor;
   }
@@ -153,7 +153,7 @@ class FingerprintGrowComponent : public PollingComponent, public uart::UARTDevic
   uint8_t address_[4] = {0xFF, 0xFF, 0xFF, 0xFF};
   uint16_t capacity_ = 64;
   uint32_t password_ = 0x0;
-  uint32_t *new_password_{nullptr};
+  uint32_t new_password_ = -1;
   GPIOPin *sensing_pin_{nullptr};
   uint8_t enrollment_image_ = 0;
   uint16_t enrollment_slot_ = 0;

From 22eb4f9cb92ee2a22397f187c15d279c46e2552a Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Thu, 18 Aug 2022 14:55:10 -0500
Subject: [PATCH 027/838] Fix SPI HW selection for ESP32 variants (#3728)

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

diff --git a/esphome/components/spi/spi.cpp b/esphome/components/spi/spi.cpp
index 95280f23b9..864f6ae39d 100644
--- a/esphome/components/spi/spi.cpp
+++ b/esphome/components/spi/spi.cpp
@@ -76,7 +76,11 @@ void SPIComponent::setup() {
     if (spi_bus_num == 0) {
       this->hw_spi_ = &SPI;
     } else {
+#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+      this->hw_spi_ = new SPIClass(FSPI);  // NOLINT(cppcoreguidelines-owning-memory)
+#else
       this->hw_spi_ = new SPIClass(VSPI);  // NOLINT(cppcoreguidelines-owning-memory)
+#endif  // USE_ESP32_VARIANT
     }
     spi_bus_num++;
     this->hw_spi_->begin(clk_pin, miso_pin, mosi_pin);

From aa2eb29274a7c3c7be4bf97dfe13e4a070cb81a6 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 1 Sep 2022 11:26:52 +1200
Subject: [PATCH 028/838] Bump version to 2022.8.1

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

diff --git a/esphome/const.py b/esphome/const.py
index 981ee773d4..3091f55f12 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.8.0"
+__version__ = "2022.8.1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 1b4156646e03dacd3dfba02e092023c7d7dd188a Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Fri, 2 Sep 2022 03:22:34 +0200
Subject: [PATCH 029/838] Esp32 pulsecounter optional pcnt (#3691)

Co-authored-by: RoboMagus <->
---
 esphome/components/hlw8012/hlw8012.h          | 13 +++++-
 .../pulse_counter/pulse_counter_sensor.cpp    | 23 ++++++----
 .../pulse_counter/pulse_counter_sensor.h      | 45 ++++++++++++-------
 esphome/components/pulse_counter/sensor.py    | 34 +++++++++-----
 4 files changed, 79 insertions(+), 36 deletions(-)

diff --git a/esphome/components/hlw8012/hlw8012.h b/esphome/components/hlw8012/hlw8012.h
index 5060957cf1..adb49ffb66 100644
--- a/esphome/components/hlw8012/hlw8012.h
+++ b/esphome/components/hlw8012/hlw8012.h
@@ -16,8 +16,17 @@ enum HLW8012SensorModels {
   HLW8012_SENSOR_MODEL_BL0937
 };
 
+#ifdef HAS_PCNT
+#define USE_PCNT true
+#else
+#define USE_PCNT false
+#endif
+
 class HLW8012Component : public PollingComponent {
  public:
+  HLW8012Component()
+      : cf_store_(*pulse_counter::get_storage(USE_PCNT)), cf1_store_(*pulse_counter::get_storage(USE_PCNT)) {}
+
   void setup() override;
   void dump_config() override;
   float get_setup_priority() const override;
@@ -49,9 +58,9 @@ class HLW8012Component : public PollingComponent {
   uint64_t cf_total_pulses_{0};
   GPIOPin *sel_pin_;
   InternalGPIOPin *cf_pin_;
-  pulse_counter::PulseCounterStorage cf_store_;
+  pulse_counter::PulseCounterStorageBase &cf_store_;
   InternalGPIOPin *cf1_pin_;
-  pulse_counter::PulseCounterStorage cf1_store_;
+  pulse_counter::PulseCounterStorageBase &cf1_store_;
   sensor::Sensor *voltage_sensor_{nullptr};
   sensor::Sensor *current_sensor_{nullptr};
   sensor::Sensor *power_sensor_{nullptr};
diff --git a/esphome/components/pulse_counter/pulse_counter_sensor.cpp b/esphome/components/pulse_counter/pulse_counter_sensor.cpp
index 002f6dcac9..1f50360fed 100644
--- a/esphome/components/pulse_counter/pulse_counter_sensor.cpp
+++ b/esphome/components/pulse_counter/pulse_counter_sensor.cpp
@@ -8,8 +8,16 @@ static const char *const TAG = "pulse_counter";
 
 const char *const EDGE_MODE_TO_STRING[] = {"DISABLE", "INCREMENT", "DECREMENT"};
 
-#ifndef HAS_PCNT
-void IRAM_ATTR PulseCounterStorage::gpio_intr(PulseCounterStorage *arg) {
+#ifdef HAS_PCNT
+PulseCounterStorageBase *get_storage(bool hw_pcnt) {
+  return (hw_pcnt ? (PulseCounterStorageBase *) (new HwPulseCounterStorage)
+                  : (PulseCounterStorageBase *) (new BasicPulseCounterStorage));
+}
+#else
+PulseCounterStorageBase *get_storage(bool) { return new BasicPulseCounterStorage; }
+#endif
+
+void IRAM_ATTR BasicPulseCounterStorage::gpio_intr(BasicPulseCounterStorage *arg) {
   const uint32_t now = micros();
   const bool discard = now - arg->last_pulse < arg->filter_us;
   arg->last_pulse = now;
@@ -28,23 +36,22 @@ void IRAM_ATTR PulseCounterStorage::gpio_intr(PulseCounterStorage *arg) {
       break;
   }
 }
-bool PulseCounterStorage::pulse_counter_setup(InternalGPIOPin *pin) {
+bool BasicPulseCounterStorage::pulse_counter_setup(InternalGPIOPin *pin) {
   this->pin = pin;
   this->pin->setup();
   this->isr_pin = this->pin->to_isr();
-  this->pin->attach_interrupt(PulseCounterStorage::gpio_intr, this, gpio::INTERRUPT_ANY_EDGE);
+  this->pin->attach_interrupt(BasicPulseCounterStorage::gpio_intr, this, gpio::INTERRUPT_ANY_EDGE);
   return true;
 }
-pulse_counter_t PulseCounterStorage::read_raw_value() {
+pulse_counter_t BasicPulseCounterStorage::read_raw_value() {
   pulse_counter_t counter = this->counter;
   pulse_counter_t ret = counter - this->last_value;
   this->last_value = counter;
   return ret;
 }
-#endif
 
 #ifdef HAS_PCNT
-bool PulseCounterStorage::pulse_counter_setup(InternalGPIOPin *pin) {
+bool HwPulseCounterStorage::pulse_counter_setup(InternalGPIOPin *pin) {
   static pcnt_unit_t next_pcnt_unit = PCNT_UNIT_0;
   this->pin = pin;
   this->pin->setup();
@@ -127,7 +134,7 @@ bool PulseCounterStorage::pulse_counter_setup(InternalGPIOPin *pin) {
   }
   return true;
 }
-pulse_counter_t PulseCounterStorage::read_raw_value() {
+pulse_counter_t HwPulseCounterStorage::read_raw_value() {
   pulse_counter_t counter;
   pcnt_get_counter_value(this->pcnt_unit, &counter);
   pulse_counter_t ret = counter - this->last_value;
diff --git a/esphome/components/pulse_counter/pulse_counter_sensor.h b/esphome/components/pulse_counter/pulse_counter_sensor.h
index f81d20a646..d9be79e403 100644
--- a/esphome/components/pulse_counter/pulse_counter_sensor.h
+++ b/esphome/components/pulse_counter/pulse_counter_sensor.h
@@ -24,31 +24,44 @@ using pulse_counter_t = int16_t;
 using pulse_counter_t = int32_t;
 #endif
 
-struct PulseCounterStorage {
-  bool pulse_counter_setup(InternalGPIOPin *pin);
-  pulse_counter_t read_raw_value();
-
-  static void gpio_intr(PulseCounterStorage *arg);
-
-#ifndef HAS_PCNT
-  volatile pulse_counter_t counter{0};
-  volatile uint32_t last_pulse{0};
-#endif
+struct PulseCounterStorageBase {
+  virtual bool pulse_counter_setup(InternalGPIOPin *pin) = 0;
+  virtual pulse_counter_t read_raw_value() = 0;
 
   InternalGPIOPin *pin;
-#ifdef HAS_PCNT
-  pcnt_unit_t pcnt_unit;
-#else
-  ISRInternalGPIOPin isr_pin;
-#endif
   PulseCounterCountMode rising_edge_mode{PULSE_COUNTER_INCREMENT};
   PulseCounterCountMode falling_edge_mode{PULSE_COUNTER_DISABLE};
   uint32_t filter_us{0};
   pulse_counter_t last_value{0};
 };
 
+struct BasicPulseCounterStorage : public PulseCounterStorageBase {
+  static void gpio_intr(BasicPulseCounterStorage *arg);
+
+  bool pulse_counter_setup(InternalGPIOPin *pin) override;
+  pulse_counter_t read_raw_value() override;
+
+  volatile pulse_counter_t counter{0};
+  volatile uint32_t last_pulse{0};
+
+  ISRInternalGPIOPin isr_pin;
+};
+
+#ifdef HAS_PCNT
+struct HwPulseCounterStorage : public PulseCounterStorageBase {
+  bool pulse_counter_setup(InternalGPIOPin *pin) override;
+  pulse_counter_t read_raw_value() override;
+
+  pcnt_unit_t pcnt_unit;
+};
+#endif
+
+PulseCounterStorageBase *get_storage(bool hw_pcnt = false);
+
 class PulseCounterSensor : public sensor::Sensor, public PollingComponent {
  public:
+  explicit PulseCounterSensor(bool hw_pcnt = false) : storage_(*get_storage(hw_pcnt)) {}
+
   void set_pin(InternalGPIOPin *pin) { pin_ = pin; }
   void set_rising_edge_mode(PulseCounterCountMode mode) { storage_.rising_edge_mode = mode; }
   void set_falling_edge_mode(PulseCounterCountMode mode) { storage_.falling_edge_mode = mode; }
@@ -65,7 +78,7 @@ class PulseCounterSensor : public sensor::Sensor, public PollingComponent {
 
  protected:
   InternalGPIOPin *pin_;
-  PulseCounterStorage storage_;
+  PulseCounterStorageBase &storage_;
   uint32_t last_time_{0};
   uint32_t current_total_{0};
   sensor::Sensor *total_sensor_;
diff --git a/esphome/components/pulse_counter/sensor.py b/esphome/components/pulse_counter/sensor.py
index 88f53bdf77..27364a34b3 100644
--- a/esphome/components/pulse_counter/sensor.py
+++ b/esphome/components/pulse_counter/sensor.py
@@ -20,6 +20,8 @@ from esphome.const import (
 )
 from esphome.core import CORE
 
+CONF_USE_PCNT = "use_pcnt"
+
 pulse_counter_ns = cg.esphome_ns.namespace("pulse_counter")
 PulseCounterCountMode = pulse_counter_ns.enum("PulseCounterCountMode")
 COUNT_MODES = {
@@ -40,11 +42,19 @@ SetTotalPulsesAction = pulse_counter_ns.class_(
 
 
 def validate_internal_filter(value):
-    value = cv.positive_time_period_microseconds(value)
-    if CORE.is_esp32:
-        if value.total_microseconds > 13:
-            raise cv.Invalid("Maximum internal filter value for ESP32 is 13us")
-        return value
+    use_pcnt = value.get(CONF_USE_PCNT)
+    if CORE.is_esp8266 and use_pcnt:
+        raise cv.Invalid(
+            "Using hardware PCNT is only available on ESP32",
+            [CONF_USE_PCNT],
+        )
+
+    if CORE.is_esp32 and use_pcnt:
+        if value.get(CONF_INTERNAL_FILTER).total_microseconds > 13:
+            raise cv.Invalid(
+                "Maximum internal filter value when using ESP32 hardware PCNT is 13us",
+                [CONF_INTERNAL_FILTER],
+            )
 
     return value
 
@@ -69,7 +79,7 @@ def validate_count_mode(value):
     return value
 
 
-CONFIG_SCHEMA = (
+CONFIG_SCHEMA = cv.All(
     sensor.sensor_schema(
         PulseCounterSensor,
         unit_of_measurement=UNIT_PULSES_PER_MINUTE,
@@ -95,21 +105,25 @@ CONFIG_SCHEMA = (
                 ),
                 validate_count_mode,
             ),
-            cv.Optional(CONF_INTERNAL_FILTER, default="13us"): validate_internal_filter,
+            cv.SplitDefault(CONF_USE_PCNT, esp32=True): cv.boolean,
+            cv.Optional(
+                CONF_INTERNAL_FILTER, default="13us"
+            ): cv.positive_time_period_microseconds,
             cv.Optional(CONF_TOTAL): sensor.sensor_schema(
                 unit_of_measurement=UNIT_PULSES,
                 icon=ICON_PULSE,
                 accuracy_decimals=0,
                 state_class=STATE_CLASS_TOTAL_INCREASING,
             ),
-        }
+        },
     )
-    .extend(cv.polling_component_schema("60s"))
+    .extend(cv.polling_component_schema("60s")),
+    validate_internal_filter,
 )
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = await sensor.new_sensor(config, config.get(CONF_USE_PCNT))
     await cg.register_component(var, config)
 
     pin = await cg.gpio_pin_expression(config[CONF_PIN])

From e3dad7c63215bbeddf154c52379b99f6cec0749f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Sep 2022 13:42:04 +1200
Subject: [PATCH 030/838] Bump black from 22.6.0 to 22.8.0 (#3760)

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 8ae7563642..bbd707fbb3 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,6 +1,6 @@
 pylint==2.15.0
 flake8==5.0.4
-black==22.6.0  # also change in .pre-commit-config.yaml when updating
+black==22.8.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==2.37.3  # also change in .pre-commit-config.yaml when updating
 pre-commit
 

From 4788a6182e295abc7ee50b30234bf6f893d81479 Mon Sep 17 00:00:00 2001
From: NP v/d Spek <nielsnl68@gmail.com>
Date: Fri, 2 Sep 2022 05:46:51 +0200
Subject: [PATCH 031/838] I found some issue in the ili9341 driver (#3756)

---
 .../components/ili9341/ili9341_display.cpp    | 92 ++++++++++++-------
 esphome/components/ili9341/ili9341_display.h  | 12 ++-
 2 files changed, 71 insertions(+), 33 deletions(-)

diff --git a/esphome/components/ili9341/ili9341_display.cpp b/esphome/components/ili9341/ili9341_display.cpp
index c4fa5f1b10..117de3de89 100644
--- a/esphome/components/ili9341/ili9341_display.cpp
+++ b/esphome/components/ili9341/ili9341_display.cpp
@@ -10,7 +10,6 @@ namespace ili9341 {
 static const char *const TAG = "ili9341";
 
 void ILI9341Display::setup_pins_() {
-  this->init_internal_(this->get_buffer_length_());
   this->dc_pin_->setup();  // OUTPUT
   this->dc_pin_->digital_write(false);
   if (this->reset_pin_ != nullptr) {
@@ -28,15 +27,14 @@ void ILI9341Display::setup_pins_() {
 
 void ILI9341Display::dump_config() {
   LOG_DISPLAY("", "ili9341", this);
-  ESP_LOGCONFIG(TAG, "  Width: %d, Height: %d,  Rotation: %d", this->width_, this->height_, this->rotation_);
   LOG_PIN("  Reset Pin: ", this->reset_pin_);
   LOG_PIN("  DC Pin: ", this->dc_pin_);
   LOG_PIN("  Busy Pin: ", this->busy_pin_);
-  LOG_PIN("  Backlight Pin: ", this->led_pin_);
   LOG_UPDATE_INTERVAL(this);
 }
 
-float ILI9341Display::get_setup_priority() const { return setup_priority::PROCESSOR; }
+float ILI9341Display::get_setup_priority() const { return setup_priority::HARDWARE; }
+
 void ILI9341Display::command(uint8_t value) {
   this->start_command_();
   this->write_byte(value);
@@ -88,10 +86,19 @@ void ILI9341Display::display_() {
   // we will only update the changed window to the display
   uint16_t w = this->x_high_ - this->x_low_ + 1;
   uint16_t h = this->y_high_ - this->y_low_ + 1;
+  uint32_t start_pos = ((this->y_low_ * this->width_) + x_low_);
+
+  // check if something was displayed
+  if ((this->x_high_ < this->x_low_) || (this->y_high_ < this->y_low_)) {
+    return;
+  }
 
   set_addr_window_(this->x_low_, this->y_low_, w, h);
+
+  ESP_LOGVV("ILI9341", "Start ILI9341Display::display_(xl:%d, xh:%d, yl:%d, yh:%d, w:%d, h:%d, start_pos:%d)",
+            this->x_low_, this->x_high_, this->y_low_, this->y_high_, w, h, start_pos);
+
   this->start_data_();
-  uint32_t start_pos = ((this->y_low_ * this->width_) + x_low_);
   for (uint16_t row = 0; row < h; row++) {
     uint32_t pos = start_pos + (row * width_);
     uint32_t rem = w;
@@ -101,7 +108,9 @@ void ILI9341Display::display_() {
       this->write_array(transfer_buffer_, 2 * sz);
       pos += sz;
       rem -= sz;
+      App.feed_wdt();
     }
+    App.feed_wdt();
   }
   this->end_data_();
 
@@ -121,20 +130,10 @@ void ILI9341Display::fill(Color color) {
   this->y_high_ = this->get_height_internal() - 1;
 }
 
-void ILI9341Display::fill_internal_(Color color) {
-  if (color.raw_32 == Color::BLACK.raw_32) {
-    memset(transfer_buffer_, 0, sizeof(transfer_buffer_));
-  } else {
-    uint8_t *dst = transfer_buffer_;
-    auto color565 = display::ColorUtil::color_to_565(color);
+void ILI9341Display::fill_internal_(uint8_t color) {
+  memset(transfer_buffer_, color, sizeof(transfer_buffer_));
 
-    while (dst < transfer_buffer_ + sizeof(transfer_buffer_)) {
-      *dst++ = (uint8_t)(color565 >> 8);
-      *dst++ = (uint8_t) color565;
-    }
-  }
-
-  uint32_t rem = this->get_width_internal() * this->get_height_internal();
+  uint32_t rem = (this->get_buffer_length_() * 2);
 
   this->set_addr_window_(0, 0, this->get_width_internal(), this->get_height_internal());
   this->start_data_();
@@ -147,26 +146,58 @@ void ILI9341Display::fill_internal_(Color color) {
 
   this->end_data_();
 
-  memset(buffer_, 0, (this->get_width_internal()) * (this->get_height_internal()));
+  memset(buffer_, color, this->get_buffer_length_());
+}
+
+void ILI9341Display::rotate_my_(uint8_t m) {
+  uint8_t rotation = m & 3;  // can't be higher than 3
+  switch (rotation) {
+    case 0:
+      m = (MADCTL_MX | MADCTL_BGR);
+      // _width = ILI9341_TFTWIDTH;
+      // _height = ILI9341_TFTHEIGHT;
+      break;
+    case 1:
+      m = (MADCTL_MV | MADCTL_BGR);
+      // _width = ILI9341_TFTHEIGHT;
+      // _height = ILI9341_TFTWIDTH;
+      break;
+    case 2:
+      m = (MADCTL_MY | MADCTL_BGR);
+      // _width = ILI9341_TFTWIDTH;
+      // _height = ILI9341_TFTHEIGHT;
+      break;
+    case 3:
+      m = (MADCTL_MX | MADCTL_MY | MADCTL_MV | MADCTL_BGR);
+      // _width = ILI9341_TFTHEIGHT;
+      // _height = ILI9341_TFTWIDTH;
+      break;
+  }
+
+  this->command(ILI9341_MADCTL);
+  this->data(m);
 }
 
 void HOT ILI9341Display::draw_absolute_pixel_internal(int x, int y, Color color) {
   if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0)
     return;
 
-  // low and high watermark may speed up drawing from buffer
-  this->x_low_ = (x < this->x_low_) ? x : this->x_low_;
-  this->y_low_ = (y < this->y_low_) ? y : this->y_low_;
-  this->x_high_ = (x > this->x_high_) ? x : this->x_high_;
-  this->y_high_ = (y > this->y_high_) ? y : this->y_high_;
-
   uint32_t pos = (y * width_) + x;
+  uint8_t new_color;
+
   if (this->buffer_color_mode_ == BITS_8) {
-    uint8_t color332 = display::ColorUtil::color_to_332(color, display::ColorOrder::COLOR_ORDER_RGB);
-    buffer_[pos] = color332;
+    new_color = display::ColorUtil::color_to_332(color, display::ColorOrder::COLOR_ORDER_RGB);
   } else {  // if (this->buffer_color_mode_ == BITS_8_INDEXED) {
-    uint8_t index = display::ColorUtil::color_to_index8_palette888(color, this->palette_);
-    buffer_[pos] = index;
+    new_color = display::ColorUtil::color_to_index8_palette888(color, this->palette_);
+  }
+
+  if (buffer_[pos] != new_color) {
+    buffer_[pos] = new_color;
+    // low and high watermark may speed up drawing from buffer
+    this->x_low_ = (x < this->x_low_) ? x : this->x_low_;
+    this->y_low_ = (y < this->y_low_) ? y : this->y_low_;
+    this->x_high_ = (x > this->x_high_) ? x : this->x_high_;
+    this->y_high_ = (y > this->y_high_) ? y : this->y_high_;
   }
 }
 
@@ -252,7 +283,6 @@ void ILI9341M5Stack::initialize() {
   this->width_ = 320;
   this->height_ = 240;
   this->invert_display_(true);
-  this->fill_internal_(Color::BLACK);
 }
 
 //   24_TFT display
@@ -260,7 +290,6 @@ void ILI9341TFT24::initialize() {
   this->init_lcd_(INITCMD_TFT);
   this->width_ = 240;
   this->height_ = 320;
-  this->fill_internal_(Color::BLACK);
 }
 
 //   24_TFT rotated display
@@ -268,7 +297,6 @@ void ILI9341TFT24R::initialize() {
   this->init_lcd_(INITCMD_TFT);
   this->width_ = 320;
   this->height_ = 240;
-  this->fill_internal_(Color::BLACK);
 }
 
 }  // namespace ili9341
diff --git a/esphome/components/ili9341/ili9341_display.h b/esphome/components/ili9341/ili9341_display.h
index 3fbc144ac2..547c608ae8 100644
--- a/esphome/components/ili9341/ili9341_display.h
+++ b/esphome/components/ili9341/ili9341_display.h
@@ -5,6 +5,7 @@
 #include "esphome/components/display/display_buffer.h"
 #include "ili9341_defines.h"
 #include "ili9341_init.h"
+#include "esphome/core/log.h"
 
 namespace esphome {
 namespace ili9341 {
@@ -47,6 +48,14 @@ class ILI9341Display : public PollingComponent,
   void setup() override {
     this->setup_pins_();
     this->initialize();
+
+    this->x_low_ = this->width_;
+    this->y_low_ = this->height_;
+    this->x_high_ = 0;
+    this->y_high_ = 0;
+
+    this->init_internal_(this->get_buffer_length_());
+    this->fill_internal_(0x00);
   }
 
   display::DisplayType get_display_type() override { return display::DisplayType::DISPLAY_TYPE_COLOR; }
@@ -59,8 +68,9 @@ class ILI9341Display : public PollingComponent,
   void set_addr_window_(uint16_t x, uint16_t y, uint16_t w, uint16_t h);
   void invert_display_(bool invert);
   void reset_();
-  void fill_internal_(Color color);
+  void fill_internal_(uint8_t color);
   void display_();
+  void rotate_my_(uint8_t m);
 
   ILI9341Model model_;
   int16_t width_{320};   ///< Display width as modified by current rotation

From 7a4cf13e0c998bb08f85c57461d270c399dfb694 Mon Sep 17 00:00:00 2001
From: anatoly-savchenkov
 <48646998+anatoly-savchenkov@users.noreply.github.com>
Date: Sun, 4 Sep 2022 10:21:17 +0300
Subject: [PATCH 032/838] Ignore NaN states in the integration component
 (#3767)

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

diff --git a/esphome/components/integration/integration_sensor.cpp b/esphome/components/integration/integration_sensor.cpp
index 65fa42dd0d..2ac7caca21 100644
--- a/esphome/components/integration/integration_sensor.cpp
+++ b/esphome/components/integration/integration_sensor.cpp
@@ -23,6 +23,8 @@ void IntegrationSensor::setup() {
 }
 void IntegrationSensor::dump_config() { LOG_SENSOR("", "Integration Sensor", this); }
 void IntegrationSensor::process_sensor_value_(float value) {
+  if (std::isnan(value))
+    return;
   const uint32_t now = millis();
   const double old_value = this->last_value_;
   const double new_value = value;

From 7097b7677ea8196f2e3052debe193b7c95ce0a09 Mon Sep 17 00:00:00 2001
From: Andrey Yantsen <andrey-yantsen@users.noreply.github.com>
Date: Sun, 4 Sep 2022 09:23:54 +0100
Subject: [PATCH 033/838] Add the same docker tags as used in HA (#3752)

---
 docker/build.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/docker/build.py b/docker/build.py
index d5926ae3d4..ae977f87c1 100755
--- a/docker/build.py
+++ b/docker/build.py
@@ -88,10 +88,12 @@ def main():
                 sys.exit(1)
 
     # detect channel from tag
-    match = re.match(r'^\d+\.\d+(?:\.\d+)?(b\d+)?$', args.tag)
+    match = re.match(r"^(\d+\.\d+)(?:\.\d+)?(b\d+)?$", args.tag)
+    major_minor_version = None
     if match is None:
         channel = CHANNEL_DEV
-    elif match.group(1) is None:
+    elif match.group(2) is None:
+        major_minor_version = match.group(1)
         channel = CHANNEL_RELEASE
     else:
         channel = CHANNEL_BETA
@@ -106,6 +108,11 @@ def main():
         tags_to_push.append("beta")
         tags_to_push.append("latest")
 
+        # Compatibility with HA tags
+        if major_minor_version:
+            tags_to_push.append("stable")
+            tags_to_push.append(major_minor_version)
+
     if args.command == "build":
         # 1. pull cache image
         params = DockerParams.for_type_arch(args.build_type, args.arch)

From 5d712c73ea77bbf61e5abdd690da610b742dfdfa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 4 Sep 2022 20:24:26 +1200
Subject: [PATCH 034/838] Bump pytest from 7.1.1 to 7.1.3 (#3766)

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 bbd707fbb3..1d57fef954 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -5,7 +5,7 @@ pyupgrade==2.37.3  # also change in .pre-commit-config.yaml when updating
 pre-commit
 
 # Unit tests
-pytest==7.1.1
+pytest==7.1.3
 pytest-cov==3.0.0
 pytest-mock==3.8.2
 pytest-asyncio==0.19.0

From 219c5953f152e375469ba81e4728dcbfcf9c1526 Mon Sep 17 00:00:00 2001
From: Avirsaam <107193364+Avirsaam@users.noreply.github.com>
Date: Mon, 5 Sep 2022 03:50:27 +0300
Subject: [PATCH 035/838] Update modbus_controller.cpp (#3768)

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

diff --git a/esphome/components/modbus_controller/modbus_controller.cpp b/esphome/components/modbus_controller/modbus_controller.cpp
index bd2fec3ece..e60b016a17 100644
--- a/esphome/components/modbus_controller/modbus_controller.cpp
+++ b/esphome/components/modbus_controller/modbus_controller.cpp
@@ -236,7 +236,7 @@ size_t ModbusController::create_register_ranges_() {
       }
     }
 
-    if (curr->start_address == r.start_address) {
+    if (curr->start_address == r.start_address && curr->register_type == r.register_type) {
       // use the lowest non zero value for the whole range
       // Because zero is the default value for skip_updates it is excluded from getting the min value.
       if (curr->skip_updates != 0) {

From 614eb81ad7b51b86b8d12714517bb59e7ca085f1 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 6 Sep 2022 11:54:32 +1200
Subject: [PATCH 036/838] Remove unneeded line (spi component adds it) (#3778)

---
 esphome/components/mcp3008/__init__.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/esphome/components/mcp3008/__init__.py b/esphome/components/mcp3008/__init__.py
index 431963acfd..24a48664c1 100644
--- a/esphome/components/mcp3008/__init__.py
+++ b/esphome/components/mcp3008/__init__.py
@@ -2,7 +2,6 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import spi
 from esphome.const import CONF_ID
-from esphome.core import CORE
 
 DEPENDENCIES = ["spi"]
 AUTO_LOAD = ["sensor"]
@@ -24,6 +23,3 @@ async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await spi.register_spi_device(var, config)
-
-    if CORE.is_esp32:
-        cg.add_library("SPI", None)

From c317422ed76089fe0900b2e80bf676ee63ddf70f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 6 Sep 2022 12:57:21 +1200
Subject: [PATCH 037/838] Move crc16 to helpers (#3780)

---
 esphome/components/am2320/am2320.cpp     | 24 +++---------------------
 esphome/components/modbus/modbus.cpp     | 16 ----------------
 esphome/components/modbus/modbus.h       |  2 --
 esphome/components/senseair/senseair.cpp | 20 ++------------------
 esphome/components/senseair/senseair.h   |  1 -
 esphome/core/helpers.cpp                 | 15 +++++++++++++++
 esphome/core/helpers.h                   |  3 +++
 7 files changed, 23 insertions(+), 58 deletions(-)

diff --git a/esphome/components/am2320/am2320.cpp b/esphome/components/am2320/am2320.cpp
index 8ab48a348e..ec501f2d36 100644
--- a/esphome/components/am2320/am2320.cpp
+++ b/esphome/components/am2320/am2320.cpp
@@ -4,33 +4,15 @@
 //  - Arduino - AM2320: https://github.com/EngDial/AM2320/blob/master/src/AM2320.cpp
 
 #include "am2320.h"
-#include "esphome/core/log.h"
 #include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
 
 namespace esphome {
 namespace am2320 {
 
 static const char *const TAG = "am2320";
 
-// ---=== Calc CRC16 ===---
-uint16_t crc_16(uint8_t *ptr, uint8_t length) {
-  uint16_t crc = 0xFFFF;
-  uint8_t i;
-  //------------------------------
-  while (length--) {
-    crc ^= *ptr++;
-    for (i = 0; i < 8; i++) {
-      if ((crc & 0x01) != 0) {
-        crc >>= 1;
-        crc ^= 0xA001;
-      } else {
-        crc >>= 1;
-      }
-    }
-  }
-  return crc;
-}
-
 void AM2320Component::update() {
   uint8_t data[8];
   data[0] = 0;
@@ -98,7 +80,7 @@ bool AM2320Component::read_data_(uint8_t *data) {
   checksum = data[7] << 8;
   checksum += data[6];
 
-  if (crc_16(data, 6) != checksum) {
+  if (crc16(data, 6) != checksum) {
     ESP_LOGW(TAG, "AM2320 Checksum invalid!");
     return false;
   }
diff --git a/esphome/components/modbus/modbus.cpp b/esphome/components/modbus/modbus.cpp
index 845fa92e95..4d75675d0f 100644
--- a/esphome/components/modbus/modbus.cpp
+++ b/esphome/components/modbus/modbus.cpp
@@ -35,22 +35,6 @@ void Modbus::loop() {
   }
 }
 
-uint16_t crc16(const uint8_t *data, uint8_t len) {
-  uint16_t crc = 0xFFFF;
-  while (len--) {
-    crc ^= *data++;
-    for (uint8_t i = 0; i < 8; i++) {
-      if ((crc & 0x01) != 0) {
-        crc >>= 1;
-        crc ^= 0xA001;
-      } else {
-        crc >>= 1;
-      }
-    }
-  }
-  return crc;
-}
-
 bool Modbus::parse_modbus_byte_(uint8_t byte) {
   size_t at = this->rx_buffer_.size();
   this->rx_buffer_.push_back(byte);
diff --git a/esphome/components/modbus/modbus.h b/esphome/components/modbus/modbus.h
index 400e29e08b..629ab6dcce 100644
--- a/esphome/components/modbus/modbus.h
+++ b/esphome/components/modbus/modbus.h
@@ -40,8 +40,6 @@ class Modbus : public uart::UARTDevice, public Component {
   std::vector<ModbusDevice *> devices_;
 };
 
-uint16_t crc16(const uint8_t *data, uint8_t len);
-
 class ModbusDevice {
  public:
   void set_parent(Modbus *parent) { parent_ = parent; }
diff --git a/esphome/components/senseair/senseair.cpp b/esphome/components/senseair/senseair.cpp
index 50b9e01f17..7a98584201 100644
--- a/esphome/components/senseair/senseair.cpp
+++ b/esphome/components/senseair/senseair.cpp
@@ -1,4 +1,5 @@
 #include "senseair.h"
+#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
 namespace esphome {
@@ -42,7 +43,7 @@ void SenseAirComponent::update() {
     return;
   }
 
-  uint16_t calc_checksum = this->senseair_checksum_(response, 11);
+  uint16_t calc_checksum = crc16(response, 11);
   uint16_t resp_checksum = (uint16_t(response[12]) << 8) | response[11];
   if (resp_checksum != calc_checksum) {
     ESP_LOGW(TAG, "SenseAir checksum doesn't match: 0x%02X!=0x%02X", resp_checksum, calc_checksum);
@@ -60,23 +61,6 @@ void SenseAirComponent::update() {
     this->co2_sensor_->publish_state(ppm);
 }
 
-uint16_t SenseAirComponent::senseair_checksum_(uint8_t *ptr, uint8_t length) {
-  uint16_t crc = 0xFFFF;
-  uint8_t i;
-  while (length--) {
-    crc ^= *ptr++;
-    for (i = 0; i < 8; i++) {
-      if ((crc & 0x01) != 0) {
-        crc >>= 1;
-        crc ^= 0xA001;
-      } else {
-        crc >>= 1;
-      }
-    }
-  }
-  return crc;
-}
-
 void SenseAirComponent::background_calibration() {
   // Responses are just echoes but must be read to clear the buffer
   ESP_LOGD(TAG, "SenseAir Starting background calibration");
diff --git a/esphome/components/senseair/senseair.h b/esphome/components/senseair/senseair.h
index c03a0848e9..bcec638f79 100644
--- a/esphome/components/senseair/senseair.h
+++ b/esphome/components/senseair/senseair.h
@@ -23,7 +23,6 @@ class SenseAirComponent : public PollingComponent, public uart::UARTDevice {
   void abc_disable();
 
  protected:
-  uint16_t senseair_checksum_(uint8_t *ptr, uint8_t length);
   bool senseair_write_command_(const uint8_t *command, uint8_t *response, uint8_t response_length);
 
   sensor::Sensor *co2_sensor_{nullptr};
diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index d82e452c3d..3aca944a36 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -62,6 +62,21 @@ uint8_t crc8(uint8_t *data, uint8_t len) {
   }
   return crc;
 }
+uint16_t crc16(const uint8_t *data, uint8_t len) {
+  uint16_t crc = 0xFFFF;
+  while (len--) {
+    crc ^= *data++;
+    for (uint8_t i = 0; i < 8; i++) {
+      if ((crc & 0x01) != 0) {
+        crc >>= 1;
+        crc ^= 0xA001;
+      } else {
+        crc >>= 1;
+      }
+    }
+  }
+  return crc;
+}
 uint32_t fnv1_hash(const std::string &str) {
   uint32_t hash = 2166136261UL;
   for (char c : str) {
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index 6bed743010..1459f0ef55 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -149,6 +149,9 @@ template<typename T, typename U> T remap(U value, U min, U max, T min_out, T max
 /// Calculate a CRC-8 checksum of \p data with size \p len.
 uint8_t crc8(uint8_t *data, uint8_t len);
 
+/// Calculate a CRC-16 checksum of \p data with size \p len.
+uint16_t crc16(const uint8_t *data, uint8_t len);
+
 /// Calculate a FNV-1 hash of \p str.
 uint32_t fnv1_hash(const std::string &str);
 

From c8eb30ef27934329f54a1fce50444400239acda8 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 25 Aug 2022 07:13:44 +1200
Subject: [PATCH 038/838] Initial bluetooth_proxy support (#3736)

---
 CODEOWNERS                                    |   1 +
 esphome/components/api/api.proto              |  28 ++++
 esphome/components/api/api_connection.cpp     |   3 +
 esphome/components/api/api_connection.h       |  15 ++
 esphome/components/api/api_pb2.cpp            | 146 ++++++++++++++++++
 esphome/components/api/api_pb2.h              |  40 +++++
 esphome/components/api/api_pb2_service.cpp    |  29 ++++
 esphome/components/api/api_pb2_service.h      |   7 +
 esphome/components/api/api_server.cpp         |   7 +
 esphome/components/api/api_server.h           |   3 +
 esphome/components/api/proto.h                |   2 +-
 .../components/bluetooth_proxy/__init__.py    |  27 ++++
 .../bluetooth_proxy/bluetooth_proxy.cpp       |  58 +++++++
 .../bluetooth_proxy/bluetooth_proxy.h         |  26 ++++
 esphome/core/defines.h                        |   1 +
 tests/test1.yaml                              |   2 +
 16 files changed, 394 insertions(+), 1 deletion(-)
 create mode 100644 esphome/components/bluetooth_proxy/__init__.py
 create mode 100644 esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
 create mode 100644 esphome/components/bluetooth_proxy/bluetooth_proxy.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 62aae6d3cb..7f7562dec4 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -34,6 +34,7 @@ esphome/components/binary_sensor/* @esphome/core
 esphome/components/bl0939/* @ziceva
 esphome/components/bl0940/* @tobias-
 esphome/components/ble_client/* @buxtronix
+esphome/components/bluetooth_proxy/* @jesserockz
 esphome/components/bme680_bsec/* @trvrnrth
 esphome/components/bmp3xx/* @martgras
 esphome/components/button/* @esphome/core
diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 88a74540d0..c6cde8b038 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -27,6 +27,7 @@ service APIConnection {
   rpc subscribe_logs (SubscribeLogsRequest) returns (void) {}
   rpc subscribe_homeassistant_services (SubscribeHomeassistantServicesRequest) returns (void) {}
   rpc subscribe_home_assistant_states (SubscribeHomeAssistantStatesRequest) returns (void) {}
+  rpc subscribe_bluetooth_le_advertisements (SubscribeBluetoothLEAdvertisementsRequest) returns (void) {}
   rpc get_time (GetTimeRequest) returns (GetTimeResponse) {
     option (needs_authentication) = false;
   }
@@ -190,6 +191,8 @@ message DeviceInfoResponse {
   string project_version = 9;
 
   uint32 webserver_port = 10;
+
+  bool has_bluetooth_proxy = 11;
 }
 
 message ListEntitiesRequest {
@@ -1099,3 +1102,28 @@ message MediaPlayerCommandRequest {
   bool has_media_url = 6;
   string media_url = 7;
 }
+
+// ==================== BLUETOOTH ====================
+message SubscribeBluetoothLEAdvertisementsRequest {
+  option (id) = 66;
+  option (source) = SOURCE_CLIENT;
+}
+
+message BluetoothServiceData {
+  string uuid = 1;
+  repeated uint32 data = 2 [packed=false];
+}
+message BluetoothLEAdvertisementResponse {
+  option (id) = 67;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+  option (no_delay) = true;
+
+  uint64 address = 1;
+  string name = 2;
+  sint32 rssi = 3;
+
+  repeated string service_uuids = 4;
+  repeated BluetoothServiceData service_data = 5;
+  repeated BluetoothServiceData manufacturer_data = 6;
+}
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 9028034c90..a3b000c778 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -886,6 +886,9 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
 #endif
 #ifdef USE_WEBSERVER
   resp.webserver_port = USE_WEBSERVER_PORT;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  resp.has_bluetooth_proxy = true;
 #endif
   return resp;
 }
diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h
index 0787d2f7eb..dcf8bacad2 100644
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -7,6 +7,10 @@
 #include "api_server.h"
 #include "api_frame_helper.h"
 
+#ifdef USE_BLUETOOTH_PROXY
+#include "esphome/components/bluetooth_proxy/bluetooth_proxy.h"
+#endif
+
 namespace esphome {
 namespace api {
 
@@ -94,6 +98,13 @@ class APIConnection : public APIServerConnection {
       return;
     this->send_homeassistant_service_response(call);
   }
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &call) {
+    if (!this->bluetooth_le_advertisement_subscription_)
+      return false;
+    return this->send_bluetooth_le_advertisement_response(call);
+  }
+#endif
 #ifdef USE_HOMEASSISTANT_TIME
   void send_time_request() {
     GetTimeRequest req;
@@ -134,6 +145,9 @@ class APIConnection : public APIServerConnection {
     return {};
   }
   void execute_service(const ExecuteServiceRequest &msg) override;
+  void subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) override {
+    this->bluetooth_le_advertisement_subscription_ = true;
+  }
   bool is_authenticated() override { return this->connection_state_ == ConnectionState::AUTHENTICATED; }
   bool is_connection_setup() override {
     return this->connection_state_ == ConnectionState ::CONNECTED || this->is_authenticated();
@@ -176,6 +190,7 @@ class APIConnection : public APIServerConnection {
   uint32_t last_traffic_;
   bool sent_ping_{false};
   bool service_call_subscription_{false};
+  bool bluetooth_le_advertisement_subscription_{true};
   bool next_close_ = false;
   APIServer *parent_;
   InitialStateIterator initial_state_iterator_;
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index b91c9bd600..13969fce76 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -495,6 +495,10 @@ bool DeviceInfoResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
       this->webserver_port = value.as_uint32();
       return true;
     }
+    case 11: {
+      this->has_bluetooth_proxy = value.as_bool();
+      return true;
+    }
     default:
       return false;
   }
@@ -544,6 +548,7 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(8, this->project_name);
   buffer.encode_string(9, this->project_version);
   buffer.encode_uint32(10, this->webserver_port);
+  buffer.encode_bool(11, this->has_bluetooth_proxy);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DeviceInfoResponse::dump_to(std::string &out) const {
@@ -589,6 +594,10 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   sprintf(buffer, "%u", this->webserver_port);
   out.append(buffer);
   out.append("\n");
+
+  out.append("  has_bluetooth_proxy: ");
+  out.append(YESNO(this->has_bluetooth_proxy));
+  out.append("\n");
   out.append("}");
 }
 #endif
@@ -4854,6 +4863,143 @@ void MediaPlayerCommandRequest::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
+void SubscribeBluetoothLEAdvertisementsRequest::encode(ProtoWriteBuffer buffer) const {}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void SubscribeBluetoothLEAdvertisementsRequest::dump_to(std::string &out) const {
+  out.append("SubscribeBluetoothLEAdvertisementsRequest {}");
+}
+#endif
+bool BluetoothServiceData::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 2: {
+      this->data.push_back(value.as_uint32());
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool BluetoothServiceData::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 1: {
+      this->uuid = value.as_string();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothServiceData::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_string(1, this->uuid);
+  for (auto &it : this->data) {
+    buffer.encode_uint32(2, it, true);
+  }
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothServiceData::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothServiceData {\n");
+  out.append("  uuid: ");
+  out.append("'").append(this->uuid).append("'");
+  out.append("\n");
+
+  for (const auto &it : this->data) {
+    out.append("  data: ");
+    sprintf(buffer, "%u", it);
+    out.append(buffer);
+    out.append("\n");
+  }
+  out.append("}");
+}
+#endif
+bool BluetoothLEAdvertisementResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 3: {
+      this->rssi = value.as_sint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool BluetoothLEAdvertisementResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 2: {
+      this->name = value.as_string();
+      return true;
+    }
+    case 4: {
+      this->service_uuids.push_back(value.as_string());
+      return true;
+    }
+    case 5: {
+      this->service_data.push_back(value.as_message<BluetoothServiceData>());
+      return true;
+    }
+    case 6: {
+      this->manufacturer_data.push_back(value.as_message<BluetoothServiceData>());
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothLEAdvertisementResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_string(2, this->name);
+  buffer.encode_sint32(3, this->rssi);
+  for (auto &it : this->service_uuids) {
+    buffer.encode_string(4, it, true);
+  }
+  for (auto &it : this->service_data) {
+    buffer.encode_message<BluetoothServiceData>(5, it, true);
+  }
+  for (auto &it : this->manufacturer_data) {
+    buffer.encode_message<BluetoothServiceData>(6, it, true);
+  }
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothLEAdvertisementResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothLEAdvertisementResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  name: ");
+  out.append("'").append(this->name).append("'");
+  out.append("\n");
+
+  out.append("  rssi: ");
+  sprintf(buffer, "%d", this->rssi);
+  out.append(buffer);
+  out.append("\n");
+
+  for (const auto &it : this->service_uuids) {
+    out.append("  service_uuids: ");
+    out.append("'").append(it).append("'");
+    out.append("\n");
+  }
+
+  for (const auto &it : this->service_data) {
+    out.append("  service_data: ");
+    it.dump_to(out);
+    out.append("\n");
+  }
+
+  for (const auto &it : this->manufacturer_data) {
+    out.append("  manufacturer_data: ");
+    it.dump_to(out);
+    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 f9981fdbb7..2093f93ee7 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -263,6 +263,7 @@ class DeviceInfoResponse : public ProtoMessage {
   std::string project_name{};
   std::string project_version{};
   uint32_t webserver_port{0};
+  bool has_bluetooth_proxy{false};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1214,6 +1215,45 @@ class MediaPlayerCommandRequest : public ProtoMessage {
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
   bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
+class SubscribeBluetoothLEAdvertisementsRequest : public ProtoMessage {
+ public:
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+};
+class BluetoothServiceData : public ProtoMessage {
+ public:
+  std::string uuid{};
+  std::vector<uint32_t> data{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothLEAdvertisementResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  std::string name{};
+  int32_t rssi{0};
+  std::vector<std::string> service_uuids{};
+  std::vector<BluetoothServiceData> service_data{};
+  std::vector<BluetoothServiceData> manufacturer_data{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt 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 bd146cb54d..6932675c41 100644
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -328,6 +328,14 @@ bool APIServerConnectionBase::send_media_player_state_response(const MediaPlayer
 #endif
 #ifdef USE_MEDIA_PLAYER
 #endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_le_advertisement_response(const BluetoothLEAdvertisementResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_le_advertisement_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothLEAdvertisementResponse>(msg, 67);
+}
+#endif
 bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
   switch (msg_type) {
     case 1: {
@@ -595,6 +603,15 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
 #endif
       break;
     }
+    case 66: {
+      SubscribeBluetoothLEAdvertisementsRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_subscribe_bluetooth_le_advertisements_request: %s", msg.dump().c_str());
+#endif
+      this->on_subscribe_bluetooth_le_advertisements_request(msg);
+      break;
+    }
     default:
       return false;
   }
@@ -691,6 +708,18 @@ void APIServerConnection::on_subscribe_home_assistant_states_request(const Subsc
   }
   this->subscribe_home_assistant_states(msg);
 }
+void APIServerConnection::on_subscribe_bluetooth_le_advertisements_request(
+    const SubscribeBluetoothLEAdvertisementsRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->subscribe_bluetooth_le_advertisements(msg);
+}
 void APIServerConnection::on_get_time_request(const GetTimeRequest &msg) {
   if (!this->is_connection_setup()) {
     this->on_no_setup_connection();
diff --git a/esphome/components/api/api_pb2_service.h b/esphome/components/api/api_pb2_service.h
index 28ad3fbd15..49426d1bbc 100644
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -153,6 +153,11 @@ class APIServerConnectionBase : public ProtoService {
 #endif
 #ifdef USE_MEDIA_PLAYER
   virtual void on_media_player_command_request(const MediaPlayerCommandRequest &value){};
+#endif
+  virtual void on_subscribe_bluetooth_le_advertisements_request(
+      const SubscribeBluetoothLEAdvertisementsRequest &value){};
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_le_advertisement_response(const BluetoothLEAdvertisementResponse &msg);
 #endif
  protected:
   bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
@@ -170,6 +175,7 @@ class APIServerConnection : public APIServerConnectionBase {
   virtual void subscribe_logs(const SubscribeLogsRequest &msg) = 0;
   virtual void subscribe_homeassistant_services(const SubscribeHomeassistantServicesRequest &msg) = 0;
   virtual void subscribe_home_assistant_states(const SubscribeHomeAssistantStatesRequest &msg) = 0;
+  virtual void subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) = 0;
   virtual GetTimeResponse get_time(const GetTimeRequest &msg) = 0;
   virtual void execute_service(const ExecuteServiceRequest &msg) = 0;
 #ifdef USE_COVER
@@ -216,6 +222,7 @@ class APIServerConnection : public APIServerConnectionBase {
   void on_subscribe_logs_request(const SubscribeLogsRequest &msg) override;
   void on_subscribe_homeassistant_services_request(const SubscribeHomeassistantServicesRequest &msg) override;
   void on_subscribe_home_assistant_states_request(const SubscribeHomeAssistantStatesRequest &msg) override;
+  void on_subscribe_bluetooth_le_advertisements_request(const SubscribeBluetoothLEAdvertisementsRequest &msg) override;
   void on_get_time_request(const GetTimeRequest &msg) override;
   void on_execute_service_request(const ExecuteServiceRequest &msg) override;
 #ifdef USE_COVER
diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index 8375a82313..5851594955 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -291,6 +291,13 @@ void APIServer::send_homeassistant_service_call(const HomeassistantServiceRespon
     client->send_homeassistant_service_call(call);
   }
 }
+#ifdef USE_BLUETOOTH_PROXY
+void APIServer::send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &call) {
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_le_advertisement(call);
+  }
+}
+#endif
 APIServer::APIServer() { global_api_server = this; }
 void APIServer::subscribe_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                                std::function<void(std::string)> f) {
diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index 6997e23cac..dc892b2088 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -73,6 +73,9 @@ class APIServer : public Component, public Controller {
   void on_media_player_update(media_player::MediaPlayer *obj) override;
 #endif
   void send_homeassistant_service_call(const HomeassistantServiceResponse &call);
+#ifdef USE_BLUETOOTH_PROXY
+  void send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &call);
+#endif
   void register_user_service(UserServiceDescriptor *descriptor) { this->user_services_.push_back(descriptor); }
 #ifdef USE_HOMEASSISTANT_TIME
   void request_time();
diff --git a/esphome/components/api/proto.h b/esphome/components/api/proto.h
index 32f525990d..11cd4330ce 100644
--- a/esphome/components/api/proto.h
+++ b/esphome/components/api/proto.h
@@ -70,7 +70,7 @@ class ProtoVarInt {
     }
   }
   void encode(std::vector<uint8_t> &out) {
-    uint32_t val = this->value_;
+    uint64_t val = this->value_;
     if (val <= 0x7F) {
       out.push_back(val);
       return;
diff --git a/esphome/components/bluetooth_proxy/__init__.py b/esphome/components/bluetooth_proxy/__init__.py
new file mode 100644
index 0000000000..a6a5a4391b
--- /dev/null
+++ b/esphome/components/bluetooth_proxy/__init__.py
@@ -0,0 +1,27 @@
+from esphome.components import esp32_ble_tracker
+import esphome.config_validation as cv
+import esphome.codegen as cg
+from esphome.const import CONF_ID
+
+DEPENDENCIES = ["esp32", "esp32_ble_tracker"]
+CODEOWNERS = ["@jesserockz"]
+
+
+bluetooth_proxy_ns = cg.esphome_ns.namespace("bluetooth_proxy")
+
+BluetoothProxy = bluetooth_proxy_ns.class_("BluetoothProxy", cg.Component)
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(BluetoothProxy),
+    }
+).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+
+    await esp32_ble_tracker.register_ble_device(var, config)
+
+    cg.add_define("USE_BLUETOOTH_PROXY")
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
new file mode 100644
index 0000000000..41871295ce
--- /dev/null
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -0,0 +1,58 @@
+#include "bluetooth_proxy.h"
+
+#ifdef USE_API
+#include "esphome/components/api/api_pb2.h"
+#include "esphome/components/api/api_server.h"
+#endif  // USE_API
+#include "esphome/core/log.h"
+
+#ifdef USE_ESP32
+
+namespace esphome {
+namespace bluetooth_proxy {
+
+static const char *const TAG = "bluetooth_proxy";
+
+bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  ESP_LOGV(TAG, "Proxying packet from %s - %s. RSSI: %d dB", device.get_name().c_str(), device.address_str().c_str(),
+           device.get_rssi());
+  this->send_api_packet_(device);
+  return true;
+}
+
+void BluetoothProxy::send_api_packet_(const esp32_ble_tracker::ESPBTDevice &device) {
+#ifndef USE_API
+  return;
+#else
+  api::BluetoothLEAdvertisementResponse resp;
+  resp.address = device.address_uint64();
+  if (!device.get_name().empty())
+    resp.name = device.get_name();
+  resp.rssi = device.get_rssi();
+  for (auto uuid : device.get_service_uuids()) {
+    resp.service_uuids.push_back(uuid.to_string());
+  }
+  for (auto &data : device.get_service_datas()) {
+    api::BluetoothServiceData service_data;
+    service_data.uuid = data.uuid.to_string();
+    for (auto d : data.data)
+      service_data.data.push_back(d);
+    resp.service_data.push_back(service_data);
+  }
+  for (auto &data : device.get_manufacturer_datas()) {
+    api::BluetoothServiceData manufacturer_data;
+    manufacturer_data.uuid = data.uuid.to_string();
+    for (auto d : data.data)
+      manufacturer_data.data.push_back(d);
+    resp.manufacturer_data.push_back(manufacturer_data);
+  }
+  api::global_api_server->send_bluetooth_le_advertisement(resp);
+#endif
+}
+
+void BluetoothProxy::dump_config() { ESP_LOGCONFIG(TAG, "Bluetooth Proxy:"); }
+
+}  // namespace bluetooth_proxy
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.h b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
new file mode 100644
index 0000000000..9a936747c0
--- /dev/null
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#ifdef USE_ESP32
+
+#include <map>
+
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/core/automation.h"
+#include "esphome/core/component.h"
+
+namespace esphome {
+namespace bluetooth_proxy {
+
+class BluetoothProxy : public Component, public esp32_ble_tracker::ESPBTDeviceListener {
+ public:
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
+  void dump_config() override;
+
+ protected:
+  void send_api_packet_(const esp32_ble_tracker::ESPBTDevice &device);
+};
+
+}  // namespace bluetooth_proxy
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index 5b1d567aa4..51da2ceb66 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -70,6 +70,7 @@
 #define USE_ESP32_IGNORE_EFUSE_MAC_CRC
 #define USE_IMPROV
 #define USE_SOCKET_IMPL_BSD_SOCKETS
+#define USE_BLUETOOTH_PROXY
 
 #ifdef USE_ARDUINO
 #define USE_ARDUINO_VERSION_CODE VERSION_CODE(1, 0, 6)
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 5897639ead..15ede4d05e 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -288,6 +288,8 @@ adalight:
 
 esp32_ble_tracker:
 
+bluetooth_proxy:
+
 ble_client:
   - mac_address: AA:BB:CC:DD:EE:FF
     id: ble_foo

From d2ce62aa13714c8f76bd74d9b03c93985205a343 Mon Sep 17 00:00:00 2001
From: anatoly-savchenkov
 <48646998+anatoly-savchenkov@users.noreply.github.com>
Date: Sun, 4 Sep 2022 10:21:17 +0300
Subject: [PATCH 039/838] Ignore NaN states in the integration component
 (#3767)

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

diff --git a/esphome/components/integration/integration_sensor.cpp b/esphome/components/integration/integration_sensor.cpp
index 65fa42dd0d..2ac7caca21 100644
--- a/esphome/components/integration/integration_sensor.cpp
+++ b/esphome/components/integration/integration_sensor.cpp
@@ -23,6 +23,8 @@ void IntegrationSensor::setup() {
 }
 void IntegrationSensor::dump_config() { LOG_SENSOR("", "Integration Sensor", this); }
 void IntegrationSensor::process_sensor_value_(float value) {
+  if (std::isnan(value))
+    return;
   const uint32_t now = millis();
   const double old_value = this->last_value_;
   const double new_value = value;

From 39d493c2786d301797ec19a46fa45914710d226c Mon Sep 17 00:00:00 2001
From: Avirsaam <107193364+Avirsaam@users.noreply.github.com>
Date: Mon, 5 Sep 2022 03:50:27 +0300
Subject: [PATCH 040/838] Update modbus_controller.cpp (#3768)

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

diff --git a/esphome/components/modbus_controller/modbus_controller.cpp b/esphome/components/modbus_controller/modbus_controller.cpp
index bd2fec3ece..e60b016a17 100644
--- a/esphome/components/modbus_controller/modbus_controller.cpp
+++ b/esphome/components/modbus_controller/modbus_controller.cpp
@@ -236,7 +236,7 @@ size_t ModbusController::create_register_ranges_() {
       }
     }
 
-    if (curr->start_address == r.start_address) {
+    if (curr->start_address == r.start_address && curr->register_type == r.register_type) {
       // use the lowest non zero value for the whole range
       // Because zero is the default value for skip_updates it is excluded from getting the min value.
       if (curr->skip_updates != 0) {

From 5bf0c92318b463968bdf070835070fb2112e43a9 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 6 Sep 2022 13:12:00 +1200
Subject: [PATCH 041/838] Bump version to 2022.8.2

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

diff --git a/esphome/const.py b/esphome/const.py
index 3091f55f12..7d916e30af 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.8.1"
+__version__ = "2022.8.2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 89fd3672970ecbcaf2bcc63c5bd43936f749ed18 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 6 Sep 2022 15:48:01 +1200
Subject: [PATCH 042/838] YAML linting (#3779)

---
 .editorconfig                                 |   3 +-
 .github/FUNDING.yml                           |   1 +
 .github/ISSUE_TEMPLATE/config.yml             |   8 +-
 .github/dependabot.yml                        |   7 +-
 .github/workflows/ci-docker.yml               |  56 +-
 .github/workflows/ci.yml                      |  21 +-
 .github/workflows/lock.yml                    |   4 +-
 .github/workflows/release.yml                 | 104 +--
 .github/workflows/stale.yml                   |   7 +-
 .gitpod.yml                                   |  10 +-
 .pre-commit-config.yaml                       |  11 +-
 .yamllint                                     |   3 +
 .../binary_sensor/test_binary_sensor.yaml     |   5 +-
 tests/component_tests/button/test_button.yaml |   1 +
 .../deep_sleep/test_deep_sleep1.yaml          |   1 +
 .../deep_sleep/test_deep_sleep2.yaml          |   1 +
 tests/component_tests/sensor/test_sensor.yaml |   5 +-
 tests/test1.yaml                              | 775 +++++++++---------
 tests/test2.yaml                              | 321 ++++----
 tests/test3.yaml                              | 427 +++++-----
 tests/test4.yaml                              |  95 +--
 tests/test5.yaml                              |  91 +-
 .../test_packages/test_packages_package1.yaml |   1 +
 .../test_packages_package_wifi.yaml           |   5 +-
 tests/test_packages/test_uptime_sensor.yaml   |   1 +
 .../fixtures/yaml_util/includes/scalar.yaml   |   1 +
 .../fixtures/yaml_util/includetest.yaml       |   7 +-
 27 files changed, 1039 insertions(+), 933 deletions(-)
 create mode 100644 .yamllint

diff --git a/.editorconfig b/.editorconfig
index 8ccf1eeebc..9e203f60e4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -25,10 +25,9 @@ indent_size = 2
 [*.{yaml,yml}]
 indent_style = space
 indent_size = 2
-quote_type = single
+quote_type = double
 
 # JSON
 [*.json]
 indent_style = space
 indent_size = 2
-
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 864586fe6b..a8ca63d158 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +1,4 @@
+---
 # These are supported funding model platforms
 
 custom: https://www.nabucasa.com
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 7f99701e39..804dad47c7 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,3 +1,4 @@
+---
 blank_issues_enabled: false
 contact_links:
   - name: Issue Tracker
@@ -5,7 +6,10 @@ contact_links:
     about: Please create bug reports in the dedicated issue tracker.
   - name: Feature Request Tracker
     url: https://github.com/esphome/feature-requests
-    about: Please create feature requests in the dedicated feature request tracker.
+    about: |
+      Please create feature requests in the dedicated feature request tracker.
   - name: Frequently Asked Question
     url: https://esphome.io/guides/faq.html
-    about: Please view the FAQ for common questions and what to include in a bug report.
+    about: |
+      Please view the FAQ for common questions and what
+      to include in a bug report.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c67378093e..666532f360 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,13 +1,14 @@
+---
 version: 2
 updates:
-  - package-ecosystem: "pip"
+  - package-ecosystem: pip
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: daily
     ignore:
       # Hypotehsis is only used for testing and is updated quite often
       - dependency-name: hypothesis
-  - package-ecosystem: "github-actions"
+  - package-ecosystem: github-actions
     directory: "/"
     schedule:
       interval: daily
diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index d424bd3b60..7eb4cd1f66 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -1,21 +1,23 @@
+---
 name: CI for docker images
 
 # Only run when docker paths change
+# yamllint disable-line rule:truthy
 on:
   push:
     branches: [dev, beta, release]
     paths:
-      - 'docker/**'
-      - '.github/workflows/**'
-      - 'requirements*.txt'
-      - 'platformio.ini'
+      - "docker/**"
+      - ".github/workflows/**"
+      - "requirements*.txt"
+      - "platformio.ini"
 
   pull_request:
     paths:
-      - 'docker/**'
-      - '.github/workflows/**'
-      - 'requirements*.txt'
-      - 'platformio.ini'
+      - "docker/**"
+      - ".github/workflows/**"
+      - "requirements*.txt"
+      - "platformio.ini"
 
 permissions:
   contents: read
@@ -30,24 +32,24 @@ jobs:
         arch: [amd64, armv7, aarch64]
         build_type: ["ha-addon", "docker", "lint"]
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.9'
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.9"
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
 
-    - name: Set TAG
-      run: |
-        echo "TAG=check" >> $GITHUB_ENV
+      - name: Set TAG
+        run: |
+          echo "TAG=check" >> $GITHUB_ENV
 
-    - name: Run build
-      run: |
-        docker/build.py \
-          --tag "${TAG}" \
-          --arch "${{ matrix.arch }}" \
-          --build-type "${{ matrix.build_type }}" \
-          build
+      - name: Run build
+        run: |
+          docker/build.py \
+            --tag "${TAG}" \
+            --arch "${{ matrix.arch }}" \
+            --build-type "${{ matrix.build_type }}" \
+            build
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1705610947..7496ccf388 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,5 +1,7 @@
+---
 name: CI
 
+# yamllint disable-line rule:truthy
 on:
   push:
     branches: [dev, beta, release]
@@ -10,6 +12,7 @@ permissions:
   contents: read
 
 concurrency:
+  # yamllint disable-line rule:line-length
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
@@ -73,6 +76,8 @@ jobs:
             name: Run script/clang-tidy for ESP32 IDF
             options: --environment esp32-idf-tidy --grep USE_ESP_IDF
             pio_cache_key: tidyesp32-idf
+          - id: yamllint
+            name: Run yamllint
 
     steps:
       - uses: actions/checkout@v3
@@ -80,17 +85,19 @@ jobs:
         uses: actions/setup-python@v4
         id: python
         with:
-          python-version: '3.8'
+          python-version: "3.8"
 
       - name: Cache virtualenv
         uses: actions/cache@v3
         with:
           path: .venv
+          # yamllint disable-line rule:line-length
           key: venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements*.txt') }}
           restore-keys: |
             venv-${{ steps.python.outputs.python-version }}-
 
       - name: Set up virtualenv
+        # yamllint disable rule:line-length
         run: |
           python -m venv .venv
           source .venv/bin/activate
@@ -99,12 +106,14 @@ jobs:
           pip install -e .
           echo "$GITHUB_WORKSPACE/.venv/bin" >> $GITHUB_PATH
           echo "VIRTUAL_ENV=$GITHUB_WORKSPACE/.venv" >> $GITHUB_ENV
+        # yamllint enable rule:line-length
 
       # Use per check platformio cache because checks use different parts
       - name: Cache platformio
         uses: actions/cache@v3
         with:
           path: ~/.platformio
+          # yamllint disable-line rule:line-length
           key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
         if: matrix.id == 'test' || matrix.id == 'clang-tidy'
 
@@ -145,8 +154,9 @@ jobs:
           pytest -vv --tb=native tests
         if: matrix.id == 'pytest'
 
-      # Also run git-diff-index so that the step is marked as failed on formatting errors,
-      # since clang-format doesn't do anything but change files if -i is passed.
+      # Also run git-diff-index so that the step is marked as failed on
+      # formatting errors, since clang-format doesn't do anything but
+      # change files if -i is passed.
       - name: Run clang-format
         run: |
           script/clang-format -i
@@ -161,6 +171,11 @@ jobs:
           # Also cache libdeps, store them in a ~/.platformio subfolder
           PLATFORMIO_LIBDEPS_DIR: ~/.platformio/libdeps
 
+      - name: Run yamllint
+        if: matrix.id == 'yamllint'
+        uses: frenck/action-yamllint@v1.2.0
+
       - name: Suggested changes
         run: script/ci-suggest-changes
+        # yamllint disable-line rule:line-length
         if: always() && (matrix.id == 'clang-tidy' || matrix.id == 'clang-format' || matrix.id == 'lint-python')
diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
index ceb45b2a91..1cf82895f3 100644
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -1,8 +1,10 @@
+---
 name: Lock
 
+# yamllint disable-line rule:truthy
 on:
   schedule:
-    - cron: '30 0 * * *'
+    - cron: "30 0 * * *"
   workflow_dispatch:
 
 permissions:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 216c094122..65d170f5d3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,5 +1,7 @@
+---
 name: Publish Release
 
+# yamllint disable-line rule:truthy
 on:
   workflow_dispatch:
   release:
@@ -20,6 +22,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Get tag
         id: tag
+        # yamllint disable rule:line-length
         run: |
           if [[ "$GITHUB_EVENT_NAME" = "release" ]]; then
             TAG="${GITHUB_REF#refs/tags/}"
@@ -29,6 +32,7 @@ jobs:
             TAG="${TAG}${today}"
           fi
           echo "::set-output name=tag::${TAG}"
+        # yamllint enable rule:line-length
 
   deploy-pypi:
     name: Build and publish to PyPi
@@ -39,7 +43,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: "3.x"
       - name: Set up python environment
         run: |
           script/setup
@@ -65,37 +69,37 @@ jobs:
         arch: [amd64, armv7, aarch64]
         build_type: ["ha-addon", "docker", "lint"]
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.9'
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.9"
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
 
-    - name: Log in to docker hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USER }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-    - name: Log in to the GitHub container registry
-      uses: docker/login-action@v2
-      with:
+      - name: Log in to docker hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Log in to the GitHub container registry
+        uses: docker/login-action@v2
+        with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Build and push
-      run: |
-        docker/build.py \
-          --tag "${{ needs.init.outputs.tag }}" \
-          --arch "${{ matrix.arch }}" \
-          --build-type "${{ matrix.build_type }}" \
-          build \
-          --push
+      - name: Build and push
+        run: |
+          docker/build.py \
+            --tag "${{ needs.init.outputs.tag }}" \
+            --arch "${{ matrix.arch }}" \
+            --build-type "${{ matrix.build_type }}" \
+            build \
+            --push
 
   deploy-docker-manifest:
     if: github.repository == 'esphome/esphome'
@@ -108,34 +112,34 @@ jobs:
       matrix:
         build_type: ["ha-addon", "docker", "lint"]
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.9'
-    - name: Enable experimental manifest support
-      run: |
-        mkdir -p ~/.docker
-        echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.9"
+      - name: Enable experimental manifest support
+        run: |
+          mkdir -p ~/.docker
+          echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
 
-    - name: Log in to docker hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USER }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-    - name: Log in to the GitHub container registry
-      uses: docker/login-action@v2
-      with:
+      - name: Log in to docker hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Log in to the GitHub container registry
+        uses: docker/login-action@v2
+        with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Run manifest
-      run: |
-        docker/build.py \
-          --tag "${{ needs.init.outputs.tag }}" \
-          --build-type "${{ matrix.build_type }}" \
-          manifest
+      - name: Run manifest
+        run: |
+          docker/build.py \
+            --tag "${{ needs.init.outputs.tag }}" \
+            --build-type "${{ matrix.build_type }}" \
+            manifest
 
   deploy-ha-addon-repo:
     if: github.repository == 'esphome/esphome' && github.event_name == 'release'
@@ -144,6 +148,7 @@ jobs:
     steps:
       - env:
           TOKEN: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
+        # yamllint disable rule:line-length
         run: |
           TAG="${GITHUB_REF#refs/tags/}"
           curl \
@@ -152,3 +157,4 @@ jobs:
             -H "Accept: application/vnd.github.v3+json" \
             https://api.github.com/repos/esphome/home-assistant-addon/actions/workflows/bump-version.yml/dispatches \
             -d "{\"ref\":\"main\",\"inputs\":{\"version\":\"$TAG\"}}"
+        # yamllint enable rule:line-length
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index b998043039..33f7ad041c 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,8 +1,10 @@
+---
 name: Stale
 
+# yamllint disable-line rule:truthy
 on:
   schedule:
-    - cron: '30 0 * * *'
+    - cron: "30 0 * * *"
   workflow_dispatch:
 
 permissions:
@@ -31,7 +33,8 @@ jobs:
             and will be closed if no further activity occurs within 7 days.
             Thank you for your contributions.
 
-  # Use stale to automatically close issues with a reference to the issue tracker
+  # Use stale to automatically close issues with a
+  # reference to the issue tracker
   close-issues:
     runs-on: ubuntu-latest
     steps:
diff --git a/.gitpod.yml b/.gitpod.yml
index e3f786a403..be2f11227c 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,6 +1,8 @@
+---
 ports:
-- port: 6052
-  onOpen: open-preview
+  - port: 6052
+    onOpen: open-preview
 tasks:
-- before: pyenv local $(pyenv version | grep '^3\.' | cut -d ' ' -f 1) && script/setup
-  command: python -m esphome dashboard config
+  # yamllint disable-line rule:line-length
+  - before: pyenv local $(pyenv version | grep '^3\.' | cut -d ' ' -f 1) && script/setup
+    command: python -m esphome dashboard config
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 95365ff5bb..083aea117d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,14 +1,15 @@
+---
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/ambv/black
     rev: 22.6.0
     hooks:
-    - id: black
-      args:
-        - --safe
-        - --quiet
-      files: ^((esphome|script|tests)/.+)?[^/]+\.py$
+      - id: black
+        args:
+          - --safe
+          - --quiet
+        files: ^((esphome|script|tests)/.+)?[^/]+\.py$
   - repo: https://gitlab.com/pycqa/flake8
     rev: 4.0.1
     hooks:
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000000..4fea263214
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,3 @@
+---
+ignore: |
+  venv/
diff --git a/tests/component_tests/binary_sensor/test_binary_sensor.yaml b/tests/component_tests/binary_sensor/test_binary_sensor.yaml
index 912ae115eb..f98ce693f7 100644
--- a/tests/component_tests/binary_sensor/test_binary_sensor.yaml
+++ b/tests/component_tests/binary_sensor/test_binary_sensor.yaml
@@ -1,3 +1,4 @@
+---
 esphome:
   name: test
   platform: ESP8266
@@ -6,13 +7,13 @@ esphome:
 binary_sensor:
   - platform: gpio
     id: bs_1
-    name: "test bs1"
+    name: test bs1
     internal: true
     pin:
       number: D0
   - platform: gpio
     id: bs_2
-    name: "test bs2"
+    name: test bs2
     internal: false
     pin:
       number: D1
diff --git a/tests/component_tests/button/test_button.yaml b/tests/component_tests/button/test_button.yaml
index 32d2e8d93b..48e13f0353 100644
--- a/tests/component_tests/button/test_button.yaml
+++ b/tests/component_tests/button/test_button.yaml
@@ -1,3 +1,4 @@
+---
 esphome:
   name: test
   platform: ESP8266
diff --git a/tests/component_tests/deep_sleep/test_deep_sleep1.yaml b/tests/component_tests/deep_sleep/test_deep_sleep1.yaml
index 18a425df58..96514a677f 100644
--- a/tests/component_tests/deep_sleep/test_deep_sleep1.yaml
+++ b/tests/component_tests/deep_sleep/test_deep_sleep1.yaml
@@ -1,3 +1,4 @@
+---
 esphome:
   name: test
   platform: ESP32
diff --git a/tests/component_tests/deep_sleep/test_deep_sleep2.yaml b/tests/component_tests/deep_sleep/test_deep_sleep2.yaml
index 49a7f510f2..0e8e598402 100644
--- a/tests/component_tests/deep_sleep/test_deep_sleep2.yaml
+++ b/tests/component_tests/deep_sleep/test_deep_sleep2.yaml
@@ -1,3 +1,4 @@
+---
 esphome:
   name: test
   platform: ESP32
diff --git a/tests/component_tests/sensor/test_sensor.yaml b/tests/component_tests/sensor/test_sensor.yaml
index a38dd14041..8c0fd85b17 100644
--- a/tests/component_tests/sensor/test_sensor.yaml
+++ b/tests/component_tests/sensor/test_sensor.yaml
@@ -1,3 +1,4 @@
+---
 esphome:
   name: test
   platform: ESP8266
@@ -7,6 +8,6 @@ sensor:
   - platform: adc
     pin: A0
     id: s_1
-    name: "test s1"
+    name: test s1
     update_interval: 60s
-    device_class: "voltage"
+    device_class: voltage
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 1a9d69eac8..274b25548b 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1,3 +1,4 @@
+---
 substitutions:
   devicename: test1
   sensorname: my
@@ -43,13 +44,13 @@ esphome:
           json:
             key: !lambda |-
               return id(${textname}_text).state;
-            greeting: "Hello World"
+            greeting: Hello World
       - http_request.send:
           method: PUT
           url: https://esphome.io
           headers:
             Content-Type: application/json
-          body: "Some data"
+          body: Some data
           verify_ssl: false
           on_response:
             then:
@@ -95,8 +96,8 @@ mqtt:
   password: "debug"
   client_id: someclient
   use_abbreviations: false
-  discovery: True
-  discovery_retain: False
+  discovery: true
+  discovery_retain: false
   discovery_prefix: discovery
   discovery_unique_id_generator: legacy
   topic_prefix: helloworld
@@ -109,7 +110,7 @@ mqtt:
     topic: topic/to/send/to
     payload: hi
     qos: 2
-    retain: True
+    retain: true
   keepalive: 60s
   reboot_timeout: 60s
   on_message:
@@ -154,6 +155,7 @@ mqtt:
                   return effect;
             - light.control:
                 id: ${roomname}_lights
+                # yamllint disable-line rule:line-length
                 brightness: !lambda "return id(${roomname}_lights).current_values.get_brightness() + 0.5;"
             - light.dim_relative:
                 id: ${roomname}_lights
@@ -179,7 +181,7 @@ mqtt:
 i2c:
   sda: 21
   scl: 22
-  scan: True
+  scan: true
   frequency: 100kHz
   setup_priority: -100
   id: i2c_bus
@@ -192,10 +194,10 @@ spi:
 uart:
   - tx_pin:
       number: GPIO22
-      inverted: yes
+      inverted: true
     rx_pin:
       number: GPIO23
-      inverted: yes
+      inverted: true
     baud_rate: 115200
     id: uart0
     parity: NONE
@@ -222,7 +224,7 @@ uart:
     rx_buffer_size: 1024
 
 ota:
-  safe_mode: True
+  safe_mode: true
   password: "superlongpasswordthatnoonewillknow"
   port: 3286
   reboot_timeout: 2min
@@ -233,14 +235,14 @@ ota:
         ESP_LOGD("ota", "State %d", state);
   on_begin:
     then:
-      logger.log: "OTA begin"
+      logger.log: OTA begin
   on_progress:
     then:
       lambda: >-
         ESP_LOGD("ota", "Got progress %f", x);
   on_end:
     then:
-      logger.log: "OTA end"
+      logger.log: OTA end
   on_error:
     then:
       lambda: >-
@@ -258,7 +260,7 @@ web_server:
   version: 2
 
 power_supply:
-  id: "atx_power_supply"
+  id: atx_power_supply
   enable_time: 20ms
   keep_on_time: 10s
   pin:
@@ -308,22 +310,22 @@ bedjet:
     id: my_bedjet_client
     time_id: sntp_time
 mcp23s08:
-  - id: "mcp23s08_hub"
+  - id: mcp23s08_hub
     cs_pin: GPIO12
     deviceaddress: 0
 
 mcp23s17:
-  - id: "mcp23s17_hub"
+  - id: mcp23s17_hub
     cs_pin: GPIO12
     deviceaddress: 1
 
 sensor:
   - platform: ble_client
     ble_client_id: ble_foo
-    name: "Green iTag btn"
-    service_uuid: "ffe0"
-    characteristic_uuid: "ffe1"
-    descriptor_uuid: "ffe2"
+    name: Green iTag btn
+    service_uuid: ffe0
+    characteristic_uuid: ffe1
+    descriptor_uuid: ffe2
     notify: true
     update_interval: never
     lambda: |-
@@ -335,7 +337,7 @@ sensor:
             ESP_LOGD("green_btn", "Button was pressed, val%f", x);
   - platform: adc
     pin: A0
-    name: "Living Room Brightness"
+    name: Living Room Brightness
     update_interval: "1:01"
     attenuation: 2.5db
     unit_of_measurement: "°C"
@@ -384,11 +386,13 @@ sensor:
       - lambda: return x * (9.0/5.0) + 32.0;
     on_value:
       then:
+        # yamllint disable rule:line-length
         - lambda: |-
             ESP_LOGD("main", "Got value %f", x);
             id(${sensorname}_sensor).publish_state(42.0);
             ESP_LOGI("main", "Value of my sensor: %f", id(${sensorname}_sensor).state);
             ESP_LOGI("main", "Raw Value of my sensor: %f", id(${sensorname}_sensor).state);
+        # yamllint enable rule:line-length
     on_value_range:
       above: 5
       below: 10
@@ -405,18 +409,18 @@ sensor:
           ESP_LOGD("main", "Got raw value %f", x);
       - logger.log:
           level: DEBUG
-          format: "Got raw value %f"
+          format: Got raw value %f
           args: ["x"]
-      - logger.log: "Got raw value NAN"
+      - logger.log: Got raw value NAN
       - mqtt.publish:
           topic: some/topic
           payload: Hello
           qos: 2
-          retain: True
+          retain: true
   - platform: esp32_hall
     name: ESP32 Hall Sensor
   - platform: ads1115
-    multiplexer: "A0_A1"
+    multiplexer: A0_A1
     gain: 1.024
     id: ${sensorname}_sensor
     filters:
@@ -427,57 +431,57 @@ sensor:
     cs_pin: 5
     phase_a:
       voltage:
-        name: "EMON Line Voltage A"
+        name: EMON Line Voltage A
       current:
-        name: "EMON CT1 Current"
+        name: EMON CT1 Current
       power:
-        name: "EMON Active Power CT1"
+        name: EMON Active Power CT1
       reactive_power:
-        name: "EMON Reactive Power CT1"
+        name: EMON Reactive Power CT1
       power_factor:
-        name: "EMON Power Factor CT1"
+        name: EMON Power Factor CT1
       gain_voltage: 7305
       gain_ct: 27961
     phase_b:
       current:
-        name: "EMON CT2 Current"
+        name: EMON CT2 Current
       power:
-        name: "EMON Active Power CT2"
+        name: EMON Active Power CT2
       reactive_power:
-        name: "EMON Reactive Power CT2"
+        name: EMON Reactive Power CT2
       power_factor:
-        name: "EMON Power Factor CT2"
+        name: EMON Power Factor CT2
       gain_voltage: 7305
       gain_ct: 27961
     phase_c:
       current:
-        name: "EMON CT3 Current"
+        name: EMON CT3 Current
       power:
-        name: "EMON Active Power CT3"
+        name: EMON Active Power CT3
       reactive_power:
-        name: "EMON Reactive Power CT3"
+        name: EMON Reactive Power CT3
       power_factor:
-        name: "EMON Power Factor CT3"
+        name: EMON Power Factor CT3
       gain_voltage: 7305
       gain_ct: 27961
     frequency:
-      name: "EMON Line Frequency"
+      name: EMON Line Frequency
     chip_temperature:
-      name: "EMON Chip Temp A"
+      name: EMON Chip Temp A
     line_frequency: 60Hz
     current_phases: 3
     gain_pga: 2X
   - platform: bh1750
-    name: "Living Room Brightness 3"
+    name: Living Room Brightness 3
     internal: true
     address: 0x23
     update_interval: 30s
-    retain: False
+    retain: false
     availability:
     state_topic: livingroom/custom_state_topic
     i2c_id: i2c_bus
   - platform: max44009
-    name: "Outside Brightness 1"
+    name: Outside Brightness 1
     internal: true
     address: 0x4A
     update_interval: 30s
@@ -485,13 +489,13 @@ sensor:
     i2c_id: i2c_bus
   - platform: bme280
     temperature:
-      name: "Outside Temperature"
+      name: Outside Temperature
       oversampling: 16x
     pressure:
-      name: "Outside Pressure"
+      name: Outside Pressure
       oversampling: none
     humidity:
-      name: "Outside Humidity"
+      name: Outside Humidity
       oversampling: 8x
     address: 0x77
     iir_filter: 16x
@@ -499,14 +503,14 @@ sensor:
     i2c_id: i2c_bus
   - platform: bme680
     temperature:
-      name: "Outside Temperature"
+      name: Outside Temperature
       oversampling: 16x
     pressure:
-      name: "Outside Pressure"
+      name: Outside Pressure
     humidity:
-      name: "Outside Humidity"
+      name: Outside Humidity
     gas_resistance:
-      name: "Outside Gas Sensor"
+      name: Outside Gas Sensor
     address: 0x77
     heater:
       temperature: 320
@@ -515,9 +519,9 @@ sensor:
     i2c_id: i2c_bus
   - platform: bmp085
     temperature:
-      name: "Outside Temperature"
+      name: Outside Temperature
     pressure:
-      name: "Outside Pressure"
+      name: Outside Pressure
       filters:
         - lambda: >-
             return x / powf(1.0 - (x / 44330.0), 5.255);
@@ -525,54 +529,54 @@ sensor:
     i2c_id: i2c_bus
   - platform: bmp280
     temperature:
-      name: "Outside Temperature"
+      name: Outside Temperature
       oversampling: 16x
     pressure:
-      name: "Outside Pressure"
+      name: Outside Pressure
     address: 0x77
     update_interval: 15s
     iir_filter: 16x
     i2c_id: i2c_bus
   - platform: dallas
     address: 0x1C0000031EDD2A28
-    name: "Living Room Temperature"
+    name: Living Room Temperature
     resolution: 9
   - platform: dallas
     index: 1
-    name: "Living Room Temperature 2"
+    name: Living Room Temperature 2
   - platform: dht
     pin: GPIO26
     temperature:
-      name: "Living Room Temperature 3"
+      name: Living Room Temperature 3
     humidity:
-      name: "Living Room Humidity 3"
+      name: Living Room Humidity 3
     model: AM2302
     update_interval: 15s
   - platform: dht12
     temperature:
-      name: "Living Room Temperature 4"
+      name: Living Room Temperature 4
     humidity:
-      name: "Living Room Humidity 4"
+      name: Living Room Humidity 4
     update_interval: 15s
     i2c_id: i2c_bus
   - platform: duty_cycle
     pin: GPIO25
     name: Duty Cycle Sensor
   - platform: esp32_hall
-    name: "ESP32 Hall Sensor"
+    name: ESP32 Hall Sensor
     update_interval: 15s
   - platform: ens210
     temperature:
-      name: "Living Room Temperature 5"
+      name: Living Room Temperature 5
     humidity:
-      name: 'Living Room Humidity 5'
+      name: Living Room Humidity 5
     update_interval: 15s
     i2c_id: i2c_bus
   - platform: hdc1080
     temperature:
-      name: 'Living Room Temperature 6'
+      name: Living Room Temperature 6
     humidity:
-      name: 'Living Room Humidity 5'
+      name: Living Room Humidity 5
     update_interval: 15s
     i2c_id: i2c_bus
   - platform: hlw8012
@@ -580,14 +584,14 @@ sensor:
     cf_pin: 14
     cf1_pin: 13
     current:
-      name: "HLW8012 Current"
+      name: HLW8012 Current
     voltage:
-      name: "HLW8012 Voltage"
+      name: HLW8012 Voltage
     power:
-      name: "HLW8012 Power"
+      name: HLW8012 Power
       id: hlw8012_power
     energy:
-      name: "HLW8012 Energy"
+      name: HLW8012 Energy
       id: hlw8012_energy
     update_interval: 15s
     current_resistor: 0.001 ohm
@@ -597,53 +601,53 @@ sensor:
     model: hlw8012
   - platform: total_daily_energy
     power_id: hlw8012_power
-    name: "HLW8012 Total Daily Energy"
+    name: HLW8012 Total Daily Energy
   - platform: integration
     sensor: hlw8012_power
-    name: "Integration Sensor"
+    name: Integration Sensor
     time_unit: s
   - platform: integration
     sensor: hlw8012_power
-    name: "Integration Sensor lazy"
+    name: Integration Sensor lazy
     time_unit: s
   - platform: hmc5883l
     address: 0x68
     field_strength_x:
-      name: "HMC5883L Field Strength X"
+      name: HMC5883L Field Strength X
     field_strength_y:
-      name: "HMC5883L Field Strength Y"
+      name: HMC5883L Field Strength Y
     field_strength_z:
-      name: "HMC5883L Field Strength Z"
+      name: HMC5883L Field Strength Z
     heading:
-      name: "HMC5883L Heading"
+      name: HMC5883L Heading
     range: 130uT
     oversampling: 8x
     update_interval: 15s
     i2c_id: i2c_bus
   - platform: honeywellabp
     pressure:
-      name: "Honeywell pressure"
+      name: Honeywell pressure
       min_pressure: 0
       max_pressure: 15
     temperature:
-      name: "Honeywell temperature"
+      name: Honeywell temperature
     cs_pin: GPIO5
   - platform: qmc5883l
     address: 0x0D
     field_strength_x:
-      name: "QMC5883L Field Strength X"
+      name: QMC5883L Field Strength X
     field_strength_y:
-      name: "QMC5883L Field Strength Y"
+      name: QMC5883L Field Strength Y
     field_strength_z:
-      name: "QMC5883L Field Strength Z"
+      name: QMC5883L Field Strength Z
     heading:
-      name: "QMC5883L Heading"
+      name: QMC5883L Heading
     range: 800uT
     oversampling: 256x
     update_interval: 15s
     i2c_id: i2c_bus
   - platform: hx711
-    name: "HX711 Value"
+    name: HX711 Value
     dout_pin: GPIO23
     clk_pin: GPIO25
     gain: 128
@@ -652,13 +656,13 @@ sensor:
     address: 0x40
     shunt_resistance: 0.1 ohm
     current:
-      name: "INA219 Current"
+      name: INA219 Current
     power:
-      name: "INA219 Power"
+      name: INA219 Power
     bus_voltage:
-      name: "INA219 Bus Voltage"
+      name: INA219 Bus Voltage
     shunt_voltage:
-      name: "INA219 Shunt Voltage"
+      name: INA219 Shunt Voltage
     max_voltage: 32.0V
     max_current: 3.2A
     update_interval: 15s
@@ -667,13 +671,13 @@ sensor:
     address: 0x40
     shunt_resistance: 0.1 ohm
     current:
-      name: "INA226 Current"
+      name: INA226 Current
     power:
-      name: "INA226 Power"
+      name: INA226 Power
     bus_voltage:
-      name: "INA226 Bus Voltage"
+      name: INA226 Bus Voltage
     shunt_voltage:
-      name: "INA226 Shunt Voltage"
+      name: INA226 Shunt Voltage
     max_current: 3.2A
     update_interval: 15s
     i2c_id: i2c_bus
@@ -682,17 +686,17 @@ sensor:
     channel_1:
       shunt_resistance: 0.1 ohm
       current:
-        name: "INA3221 Channel 1 Current"
+        name: INA3221 Channel 1 Current
       power:
-        name: "INA3221 Channel 1 Power"
+        name: INA3221 Channel 1 Power
       bus_voltage:
-        name: "INA3221 Channel 1 Bus Voltage"
+        name: INA3221 Channel 1 Bus Voltage
       shunt_voltage:
-        name: "INA3221 Channel 1 Shunt Voltage"
+        name: INA3221 Channel 1 Shunt Voltage
     update_interval: 15s
     i2c_id: i2c_bus
   - platform: kalman_combinator
-    name: "Kalman-filtered temperature"
+    name: Kalman-filtered temperature
     process_std_dev: 0.00139
     sources:
       - source: scd30_temperature
@@ -702,114 +706,114 @@ sensor:
         error: 1.5
   - platform: htu21d
     temperature:
-      name: "Living Room Temperature 6"
+      name: Living Room Temperature 6
     humidity:
-      name: "Living Room Humidity 6"
+      name: Living Room Humidity 6
     update_interval: 15s
     i2c_id: i2c_bus
   - platform: max6675
-    name: "Living Room Temperature"
+    name: Living Room Temperature
     cs_pin: GPIO23
     update_interval: 15s
   - platform: max31855
-    name: "Den Temperature"
+    name: Den Temperature
     cs_pin: GPIO23
     update_interval: 15s
     reference_temperature:
-      name: "MAX31855 Internal Temperature"
+      name: MAX31855 Internal Temperature
   - platform: max31856
-    name: "BBQ Temperature"
+    name: BBQ Temperature
     cs_pin: GPIO17
     update_interval: 15s
     mains_filter: 50Hz
   - platform: max31865
-    name: "Water Tank Temperature"
+    name: Water Tank Temperature
     cs_pin: GPIO23
     update_interval: 15s
-    reference_resistance: "430 Ω"
-    rtd_nominal_resistance: "100 Ω"
+    reference_resistance: 430 Ω
+    rtd_nominal_resistance: 100 Ω
   - platform: mhz19
     uart_id: uart0
     co2:
-      name: "MH-Z19 CO2 Value"
+      name: MH-Z19 CO2 Value
     temperature:
-      name: "MH-Z19 Temperature"
+      name: MH-Z19 Temperature
     update_interval: 15s
     automatic_baseline_calibration: false
   - platform: mpu6050
     address: 0x68
     accel_x:
-      name: "MPU6050 Accel X"
+      name: MPU6050 Accel X
     accel_y:
-      name: "MPU6050 Accel Y"
+      name: MPU6050 Accel Y
     accel_z:
-      name: "MPU6050 Accel z"
+      name: MPU6050 Accel z
     gyro_x:
-      name: "MPU6050 Gyro X"
+      name: MPU6050 Gyro X
     gyro_y:
-      name: "MPU6050 Gyro Y"
+      name: MPU6050 Gyro Y
     gyro_z:
-      name: "MPU6050 Gyro z"
+      name: MPU6050 Gyro z
     temperature:
-      name: "MPU6050 Temperature"
+      name: MPU6050 Temperature
     i2c_id: i2c_bus
   - platform: mpu6886
     address: 0x68
     accel_x:
-      name: "MPU6886 Accel X"
+      name: MPU6886 Accel X
     accel_y:
-      name: "MPU6886 Accel Y"
+      name: MPU6886 Accel Y
     accel_z:
-      name: "MPU6886 Accel z"
+      name: MPU6886 Accel z
     gyro_x:
-      name: "MPU6886 Gyro X"
+      name: MPU6886 Gyro X
     gyro_y:
-      name: "MPU6886 Gyro Y"
+      name: MPU6886 Gyro Y
     gyro_z:
-      name: "MPU6886 Gyro z"
+      name: MPU6886 Gyro z
     temperature:
-      name: "MPU6886 Temperature"
+      name: MPU6886 Temperature
     i2c_id: i2c_bus
   - platform: dps310
     temperature:
-      name: "DPS310 Temperature"
+      name: DPS310 Temperature
     pressure:
-      name: "DPS310 Pressure"
+      name: DPS310 Pressure
     address: 0x77
     update_interval: 15s
     i2c_id: i2c_bus
   - platform: ms5611
     temperature:
-      name: "Outside Temperature"
+      name: Outside Temperature
     pressure:
-      name: "Outside Pressure"
+      name: Outside Pressure
     address: 0x77
     update_interval: 15s
     i2c_id: i2c_bus
   - platform: pmsa003i
     pm_1_0:
-      name: "PMSA003i PM1.0"
+      name: PMSA003i PM1.0
     pm_2_5:
-      name: "PMSA003i PM2.5"
+      name: PMSA003i PM2.5
     pm_10_0:
-      name: "PMSA003i PM10.0"
+      name: PMSA003i PM10.0
     pmc_0_3:
-      name: "PMSA003i PMC <0.3µm"
+      name: PMSA003i PMC <0.3µm
     pmc_0_5:
-      name: "PMSA003i PMC <0.5µm"
+      name: PMSA003i PMC <0.5µm
     pmc_1_0:
-      name: "PMSA003i PMC <1µm"
+      name: PMSA003i PMC <1µm
     pmc_2_5:
-      name: "PMSA003i PMC <2.5µm"
+      name: PMSA003i PMC <2.5µm
     pmc_5_0:
-      name: "PMSA003i PMC <5µm"
+      name: PMSA003i PMC <5µm
     pmc_10_0:
-      name: "PMSA003i PMC <10µm"
+      name: PMSA003i PMC <10µm
     address: 0x12
-    standard_units: True
+    standard_units: true
     i2c_id: i2c_bus
   - platform: pulse_counter
-    name: "Pulse Counter"
+    name: Pulse Counter
     pin: GPIO12
     count_mode:
       rising_edge: INCREMENT
@@ -817,7 +821,7 @@ sensor:
     internal_filter: 13us
     update_interval: 15s
   - platform: pulse_meter
-    name: "Pulse Meter"
+    name: Pulse Meter
     id: pulse_meter_sensor
     pin: GPIO12
     internal_filter: 100ms
@@ -827,20 +831,20 @@ sensor:
           id: pulse_meter_sensor
           value: 12345
     total:
-      name: "Pulse Meter Total"
+      name: Pulse Meter Total
   - platform: qmp6988
     temperature:
-      name: "Living Temperature QMP"
+      name: Living Temperature QMP
       oversampling: 32x
     pressure:
-      name: "Living Pressure QMP"
+      name: Living Pressure QMP
       oversampling: 2x
     address: 0x70
     update_interval: 30s
     iir_filter: 16x
     i2c_id: i2c_bus
   - platform: rotary_encoder
-    name: "Rotary Encoder"
+    name: Rotary Encoder
     id: rotary_encoder1
     pin_a: GPIO23
     pin_b: GPIO25
@@ -860,49 +864,49 @@ sensor:
           id: rotary_encoder1
           value: !lambda "return -1;"
     on_clockwise:
-      - logger.log: "Clockwise"
+      - logger.log: Clockwise
     on_anticlockwise:
-      - logger.log: "Anticlockwise"
+      - logger.log: Anticlockwise
   - platform: pulse_width
     name: Pulse Width
     pin: GPIO12
   - platform: sm300d2
     uart_id: uart0
     co2:
-      name: "SM300D2 CO2 Value"
+      name: SM300D2 CO2 Value
     formaldehyde:
-      name: "SM300D2 Formaldehyde Value"
+      name: SM300D2 Formaldehyde Value
     tvoc:
-      name: "SM300D2 TVOC Value"
+      name: SM300D2 TVOC Value
     pm_2_5:
-      name: "SM300D2 PM2.5 Value"
+      name: SM300D2 PM2.5 Value
     pm_10_0:
-      name: "SM300D2 PM10 Value"
+      name: SM300D2 PM10 Value
     temperature:
-      name: "SM300D2 Temperature Value"
+      name: SM300D2 Temperature Value
     humidity:
-      name: "SM300D2 Humidity Value"
+      name: SM300D2 Humidity Value
     update_interval: 60s
   - platform: sht3xd
     temperature:
-      name: "Living Room Temperature 8"
+      name: Living Room Temperature 8
     humidity:
-      name: "Living Room Humidity 8"
+      name: Living Room Humidity 8
     address: 0x44
     i2c_id: i2c_bus
     update_interval: 15s
   - platform: sts3x
-    name: "Living Room Temperature 9"
+    name: Living Room Temperature 9
     address: 0x4A
     i2c_id: i2c_bus
   - platform: scd30
     co2:
-      name: "Living Room CO2 9"
+      name: Living Room CO2 9
     temperature:
       id: scd30_temperature
-      name: "Living Room Temperature 9"
+      name: Living Room Temperature 9
     humidity:
-      name: "Living Room Humidity 9"
+      name: Living Room Humidity 9
     address: 0x61
     update_interval: 15s
     automatic_self_calibration: true
@@ -913,12 +917,12 @@ sensor:
   - platform: scd4x
     id: scd40
     co2:
-      name: "SCD4X CO2"
+      name: SCD4X CO2
     temperature:
       id: scd4x_temperature
-      name: "SCD4X Temperature"
+      name: SCD4X Temperature
     humidity:
-      name: "SCD4X Humidity"
+      name: SCD4X Humidity
     update_interval: 15s
     automatic_self_calibration: true
     altitude_compensation: 10m
@@ -927,63 +931,63 @@ sensor:
     i2c_id: i2c_bus
   - platform: sgp30
     eco2:
-      name: "Workshop eCO2"
+      name: Workshop eCO2
       accuracy_decimals: 1
     tvoc:
-      name: "Workshop TVOC"
+      name: Workshop TVOC
       accuracy_decimals: 1
     address: 0x58
     update_interval: 5s
     i2c_id: i2c_bus
   - platform: sps30
     pm_1_0:
-      name: "Workshop PM <1µm Weight concentration"
-      id: "workshop_PM_1_0"
+      name: Workshop PM <1µm Weight concentration
+      id: workshop_PM_1_0
     pm_2_5:
-      name: "Workshop PM <2.5µm Weight concentration"
-      id: "workshop_PM_2_5"
+      name: Workshop PM <2.5µm Weight concentration
+      id: workshop_PM_2_5
     pm_4_0:
-      name: "Workshop PM <4µm Weight concentration"
-      id: "workshop_PM_4_0"
+      name: Workshop PM <4µm Weight concentration
+      id: workshop_PM_4_0
     pm_10_0:
-      name: "Workshop PM <10µm Weight concentration"
-      id: "workshop_PM_10_0"
+      name: Workshop PM <10µm Weight concentration
+      id: workshop_PM_10_0
     pmc_0_5:
-      name: "Workshop PM <0.5µm Number concentration"
-      id: "workshop_PMC_0_5"
+      name: Workshop PM <0.5µm Number concentration
+      id: workshop_PMC_0_5
     pmc_1_0:
-      name: "Workshop PM <1µm Number concentration"
-      id: "workshop_PMC_1_0"
+      name: Workshop PM <1µm Number concentration
+      id: workshop_PMC_1_0
     pmc_2_5:
-      name: "Workshop PM <2.5µm Number concentration"
-      id: "workshop_PMC_2_5"
+      name: Workshop PM <2.5µm Number concentration
+      id: workshop_PMC_2_5
     pmc_4_0:
-      name: "Workshop PM <4µm Number concentration"
-      id: "workshop_PMC_4_0"
+      name: Workshop PM <4µm Number concentration
+      id: workshop_PMC_4_0
     pmc_10_0:
-      name: "Workshop PM <10µm Number concentration"
-      id: "workshop_PMC_10_0"
+      name: Workshop PM <10µm Number concentration
+      id: workshop_PMC_10_0
     address: 0x69
     update_interval: 10s
     i2c_id: i2c_bus
   - platform: sht4x
     temperature:
-      name: "SHT4X Temperature"
+      name: SHT4X Temperature
     humidity:
-      name: "SHT4X Humidity"
+      name: SHT4X Humidity
     address: 0x44
     update_interval: 15s
     i2c_id: i2c_bus
   - platform: shtcx
     temperature:
-      name: "Living Room Temperature 10"
+      name: Living Room Temperature 10
     humidity:
-      name: "Living Room Humidity 10"
+      name: Living Room Humidity 10
     address: 0x70
     update_interval: 15s
     i2c_id: i2c_bus
   - platform: template
-    name: "Template Sensor"
+    name: Template Sensor
     state_class: measurement
     id: template_sensor
     lambda: |-
@@ -1001,7 +1005,7 @@ sensor:
           id: template_sensor
           state: !lambda "return NAN;"
   - platform: tsl2561
-    name: "TSL2561 Ambient Light"
+    name: TSL2561 Ambient Light
     address: 0x39
     update_interval: 15s
     is_cs_package: true
@@ -1015,17 +1019,17 @@ sensor:
     integration_time: 600ms
     gain: high
     visible:
-      name: "tsl2591 visible"
+      name: tsl2591 visible
       id: tsl2591_vis
-      unit_of_measurement: "pH"
+      unit_of_measurement: pH
     infrared:
-      name: "tsl2591 infrared"
+      name: tsl2591 infrared
       id: tsl2591_ir
     full_spectrum:
-      name: "tsl2591 full_spectrum"
+      name: tsl2591 full_spectrum
       id: tsl2591_fs
     calculated_lux:
-      name: "tsl2591 calculated_lux"
+      name: tsl2591 calculated_lux
       id: tsl2591_cl
     i2c_id: i2c_bus
   - platform: ultrasonic
@@ -1033,17 +1037,17 @@ sensor:
     echo_pin:
       number: GPIO23
       inverted: true
-    name: "Ultrasonic Sensor"
+    name: Ultrasonic Sensor
     timeout: 5.5m
     id: ultrasonic_sensor1
   - platform: uptime
     name: Uptime Sensor
   - platform: wifi_signal
-    name: "WiFi Signal Sensor"
+    name: WiFi Signal Sensor
     update_interval: 15s
   - platform: mqtt_subscribe
-    name: "MQTT Subscribe Sensor 1"
-    topic: "mqtt/topic"
+    name: MQTT Subscribe Sensor 1
+    topic: mqtt/topic
     id: the_sensor
     qos: 2
     on_value:
@@ -1055,9 +1059,9 @@ sensor:
   - platform: sds011
     uart_id: uart0
     pm_2_5:
-      name: "SDS011 PM2.5"
+      name: SDS011 PM2.5
     pm_10_0:
-      name: "SDS011 PM10.0"
+      name: SDS011 PM10.0
     update_interval: 5min
     rx_only: false
   - platform: ccs811
@@ -1070,9 +1074,9 @@ sensor:
     i2c_id: i2c_bus
   - platform: tx20
     wind_speed:
-      name: "Windspeed"
+      name: Windspeed
     wind_direction_degrees:
-      name: "Winddirection Degrees"
+      name: Winddirection Degrees
     pin:
       number: GPIO04
       mode: INPUT
@@ -1080,48 +1084,48 @@ sensor:
     clock_pin: GPIO5
     data_pin: GPIO4
     co2:
-      name: "ZyAura CO2"
+      name: ZyAura CO2
     temperature:
-      name: "ZyAura Temperature"
+      name: ZyAura Temperature
     humidity:
-      name: "ZyAura Humidity"
+      name: ZyAura Humidity
   - platform: as3935
     lightning_energy:
-      name: "Lightning Energy"
+      name: Lightning Energy
     distance:
-      name: "Distance Storm"
+      name: Distance Storm
   - platform: tmp117
-    name: "TMP117 Temperature"
+    name: TMP117 Temperature
     update_interval: 5s
     i2c_id: i2c_bus
   - platform: hm3301
     pm_1_0:
-      name: "PM1.0"
+      name: PM1.0
     pm_2_5:
-      name: "PM2.5"
+      name: PM2.5
     pm_10_0:
-      name: "PM10.0"
+      name: PM10.0
     aqi:
-      name: "AQI"
-      calculation_type: "CAQI"
+      name: AQI
+      calculation_type: CAQI
     i2c_id: i2c_bus
   - platform: teleinfo
-    tag_name: "HCHC"
-    name: "hchc"
-    unit_of_measurement: "Wh"
+    tag_name: HCHC
+    name: hchc
+    unit_of_measurement: Wh
     icon: mdi:flash
     teleinfo_id: myteleinfo
   - platform: mcp9808
-    name: "MCP9808 Temperature"
+    name: MCP9808 Temperature
     update_interval: 15s
     i2c_id: i2c_bus
   - platform: ezo
     id: ph_ezo
     address: 99
-    unit_of_measurement: "pH"
+    unit_of_measurement: pH
     i2c_id: i2c_bus
   - platform: sdp3x
-    name: "HVAC Filter Pressure drop"
+    name: HVAC Filter Pressure drop
     id: filter_pressure
     update_interval: 5s
     accuracy_decimals: 3
@@ -1129,11 +1133,11 @@ sensor:
   - platform: cs5460a
     id: cs5460a1
     current:
-      name: "Socket current"
+      name: Socket current
     voltage:
-      name: "Mains voltage"
+      name: Mains voltage
     power:
-      name: "Socket power"
+      name: Socket power
       on_value:
         then:
           cs5460a.restart: cs5460a1
@@ -1141,8 +1145,8 @@ sensor:
     pga_gain: 10X
     current_gain: 0.01
     voltage_gain: 0.000573
-    current_hpf: on
-    voltage_hpf: on
+    current_hpf: true
+    voltage_hpf: true
     phase_offset: 20
     pulse_energy: 0.01 kWh
     cs_pin:
@@ -1151,7 +1155,7 @@ sensor:
   - platform: max9611
     i2c_id: i2c_bus
     shunt_resistance: 0.2 ohm
-    gain: "1X"
+    gain: 1X
     voltage:
       name: Max9611 Voltage
     current:
@@ -1163,7 +1167,7 @@ sensor:
     update_interval: 1s
 
 esp32_touch:
-  setup_mode: False
+  setup_mode: false
   iir_filter: 10ms
   sleep_duration: 27ms
   measurement_duration: 8ms
@@ -1180,7 +1184,7 @@ binary_sensor:
       number: 1
       # One of INPUT or INPUT_PULLUP
       mode: INPUT_PULLUP
-      inverted: False
+      inverted: false
   - platform: gpio
     name: "MCP23S17 Pin #1"
     pin:
@@ -1189,7 +1193,7 @@ binary_sensor:
       number: 1
       # One of INPUT or INPUT_PULLUP
       mode: INPUT_PULLUP
-      inverted: False
+      inverted: false
   - platform: gpio
     name: "MCP23S17 Pin #1 with interrupt"
     pin:
@@ -1198,11 +1202,11 @@ binary_sensor:
       number: 1
       # One of INPUT or INPUT_PULLUP
       mode: INPUT_PULLUP
-      inverted: False
+      inverted: false
       interrupt: FALLING
   - platform: gpio
     pin: GPIO9
-    name: "Living Room Window"
+    name: Living Room Window
     device_class: window
     filters:
       - invert:
@@ -1242,7 +1246,7 @@ binary_sensor:
           - OFF for at least 0.2s
         then:
           - logger.log:
-              format: "Multi Clicked TWO"
+              format: Multi Clicked TWO
               level: warn
       - timing:
           - OFF for 1s to 2s
@@ -1250,30 +1254,30 @@ binary_sensor:
           - OFF for at least 0.5s
         then:
           - logger.log:
-              format: "Multi Clicked LONG SINGLE"
+              format: Multi Clicked LONG SINGLE
               level: warn
       - timing:
           - ON for at most 1s
           - OFF for at least 0.5s
         then:
           - logger.log:
-              format: "Multi Clicked SINGLE"
+              format: Multi Clicked SINGLE
               level: warn
     id: binary_sensor1
   - platform: gpio
     pin:
       number: GPIO9
       mode: INPUT_PULLUP
-    name: "Living Room Window 2"
+    name: Living Room Window 2
   - platform: status
-    name: "Living Room Status"
+    name: Living Room Status
   - platform: esp32_touch
-    name: "ESP32 Touch Pad GPIO27"
+    name: ESP32 Touch Pad GPIO27
     pin: GPIO27
     threshold: 1000
     id: btn_left
   - platform: template
-    name: "Garage Door Open"
+    name: Garage Door Open
     id: garage_door
     lambda: |-
       if (isnan(id(${sensorname}_sensor).state)) {
@@ -1291,7 +1295,7 @@ binary_sensor:
     on_press:
       - binary_sensor.template.publish:
           id: garage_door
-          state: OFF
+          state: false
       - output.ledc.set_frequency:
           id: gpio_19
           frequency: 500.0Hz
@@ -1301,41 +1305,41 @@ binary_sensor:
   - platform: pn532
     pn532_id: pn532_bs
     uid: 74-10-37-94
-    name: "PN532 NFC Tag"
+    name: PN532 NFC Tag
   - platform: rdm6300
     uid: 7616525
-    name: "RDM6300 NFC Tag"
+    name: RDM6300 NFC Tag
   - platform: gpio
-    name: "PCF binary sensor"
+    name: PCF binary sensor
     pin:
       pcf8574: pcf8574_hub
       number: 1
       mode: INPUT
-      inverted: True
+      inverted: true
   - platform: gpio
-    name: "MCP21 binary sensor"
+    name: MCP21 binary sensor
     pin:
       mcp23xxx: mcp23017_hub
       number: 1
       mode: INPUT
-      inverted: True
+      inverted: true
   - platform: gpio
-    name: "MCP22 binary sensor"
+    name: MCP22 binary sensor
     pin:
       mcp23xxx: mcp23008_hub
       number: 7
       mode: INPUT_PULLUP
-      inverted: False
+      inverted: false
   - platform: gpio
-    name: "MCP23 binary sensor"
+    name: MCP23 binary sensor
     pin:
       mcp23016: mcp23016_hub
       number: 7
       mode: INPUT
-      inverted: False
+      inverted: false
 
   - platform: remote_receiver
-    name: "Raw Remote Receiver Test"
+    name: Raw Remote Receiver Test
     raw:
       code:
         [
@@ -1376,7 +1380,7 @@ binary_sensor:
           1709,
         ]
   - platform: as3935
-    name: "Storm Alert"
+    name: Storm Alert
   - platform: analog_threshold
     name: Analog Trheshold 1
     sensor_id: template_sensor
@@ -1434,7 +1438,7 @@ output:
     pin: GPIO26
     id: gpio_26
     power_supply: atx_power_supply
-    inverted: False
+    inverted: false
   - platform: ledc
     pin: 19
     id: gpio_19
@@ -1468,67 +1472,67 @@ output:
   - platform: tlc59208f
     id: tlc_0
     channel: 0
-    tlc59208f_id: "tlc59208f_1"
+    tlc59208f_id: tlc59208f_1
   - platform: tlc59208f
     id: tlc_1
     channel: 1
-    tlc59208f_id: "tlc59208f_1"
+    tlc59208f_id: tlc59208f_1
   - platform: tlc59208f
     id: tlc_2
     channel: 2
-    tlc59208f_id: "tlc59208f_1"
+    tlc59208f_id: tlc59208f_1
   - platform: tlc59208f
     id: tlc_3
     channel: 0
-    tlc59208f_id: "tlc59208f_2"
+    tlc59208f_id: tlc59208f_2
   - platform: tlc59208f
     id: tlc_4
     channel: 1
-    tlc59208f_id: "tlc59208f_2"
+    tlc59208f_id: tlc59208f_2
   - platform: tlc59208f
     id: tlc_5
     channel: 2
-    tlc59208f_id: "tlc59208f_2"
+    tlc59208f_id: tlc59208f_2
   - platform: tlc59208f
     id: tlc_6
     channel: 0
-    tlc59208f_id: "tlc59208f_3"
+    tlc59208f_id: tlc59208f_3
   - platform: tlc59208f
     id: tlc_7
     channel: 1
-    tlc59208f_id: "tlc59208f_3"
+    tlc59208f_id: tlc59208f_3
   - platform: tlc59208f
     id: tlc_8
     channel: 2
-    tlc59208f_id: "tlc59208f_3"
+    tlc59208f_id: tlc59208f_3
   - platform: gpio
     id: id2
     pin:
       pcf8574: pcf8574_hub
       number: 0
       mode: OUTPUT
-      inverted: False
+      inverted: false
   - platform: gpio
     id: id22
     pin:
       mcp23xxx: mcp23017_hub
       number: 0
       mode: OUTPUT
-      inverted: False
+      inverted: false
   - platform: gpio
     id: id23
     pin:
       mcp23xxx: mcp23008_hub
       number: 0
       mode: OUTPUT
-      inverted: False
+      inverted: false
   - platform: gpio
     id: id25
     pin:
       mcp23016: mcp23016_hub
       number: 0
       mode: OUTPUT
-      inverted: False
+      inverted: false
   - platform: my9231
     id: my_0
     channel: 0
@@ -1588,27 +1592,27 @@ e131:
 
 light:
   - platform: binary
-    name: "Desk Lamp"
+    name: Desk Lamp
     output: gpio_26
     effects:
       - strobe:
       - strobe:
-          name: "My Strobe"
+          name: My Strobe
           colors:
-            - state: True
+            - state: true
               duration: 250ms
-            - state: False
+            - state: false
               duration: 250ms
     on_turn_on:
       - switch.template.publish:
           id: livingroom_lights
-          state: yes
+          state: true
     on_turn_off:
       - switch.template.publish:
           id: livingroom_lights
-          state: yes
+          state: true
   - platform: monochromatic
-    name: "Kitchen Lights"
+    name: Kitchen Lights
     id: kitchen
     output: gpio_19
     gamma_correct: 2.8
@@ -1617,7 +1621,7 @@ light:
       - strobe:
       - flicker:
       - flicker:
-          name: "My Flicker"
+          name: My Flicker
           alpha: 98%
           intensity: 1.5%
       - lambda:
@@ -1629,20 +1633,20 @@ light:
             if (state == 4)
               state = 0;
   - platform: rgb
-    name: "Living Room Lights"
+    name: Living Room Lights
     id: ${roomname}_lights
     red: pca_0
     green: pca_1
     blue: pca_2
   - platform: rgbw
-    name: "Living Room Lights 2"
+    name: Living Room Lights 2
     red: pca_3
     green: pca_4
     blue: pca_5
     white: pca_6
     color_interlock: true
   - platform: rgbww
-    name: "Living Room Lights 2"
+    name: Living Room Lights 2
     red: pca_3
     green: pca_4
     blue: pca_5
@@ -1652,7 +1656,7 @@ light:
     warm_white_color_temperature: 500 mireds
     color_interlock: true
   - platform: rgbct
-    name: "Living Room Lights 2"
+    name: Living Room Lights 2
     red: pca_3
     green: pca_4
     blue: pca_5
@@ -1662,14 +1666,14 @@ light:
     warm_white_color_temperature: 500 mireds
     color_interlock: true
   - platform: cwww
-    name: "Living Room Lights 2"
+    name: Living Room Lights 2
     cold_white: pca_6
     warm_white: pca_6
     cold_white_color_temperature: 153 mireds
     warm_white_color_temperature: 500 mireds
     constant_brightness: true
   - platform: color_temperature
-    name: "Living Room Lights 2"
+    name: Living Room Lights 2
     color_temperature: pca_6
     brightness: pca_6
     cold_white_color_temperature: 153 mireds
@@ -1683,7 +1687,7 @@ light:
     max_refresh_rate: 20ms
     power_supply: atx_power_supply
     color_correct: [75%, 100%, 50%]
-    name: "FastLED WS2811 Light"
+    name: FastLED WS2811 Light
     effects:
       - addressable_color_wipe:
       - addressable_color_wipe:
@@ -1698,7 +1702,7 @@ light:
               blue: 0%
               num_leds: 1
           add_led_interval: 100ms
-          reverse: False
+          reverse: false
       - addressable_scan:
       - addressable_scan:
           name: Scan Effect With Custom Values
@@ -1726,7 +1730,7 @@ light:
           update_interval: 16ms
           intensity: 5%
       - addressable_lambda:
-          name: "Test For Custom Lambda Effect"
+          name: Test For Custom Lambda Effect
           lambda: |-
             if (initial_run) {
               it[0] = current_color;
@@ -1762,10 +1766,10 @@ light:
     data_rate: 2MHz
     num_leds: 60
     rgb_order: BRG
-    name: "FastLED SPI Light"
+    name: FastLED SPI Light
   - platform: neopixelbus
     id: addr3
-    name: "Neopixelbus Light"
+    name: Neopixelbus Light
     gamma_correct: 2.8
     color_correct: [0.0, 0.0, 0.0, 0.0]
     default_transition_length: 10s
@@ -1781,7 +1785,7 @@ light:
     num_leds: 60
     pin: GPIO23
   - platform: partition
-    name: "Partition Light"
+    name: Partition Light
     segments:
       - id: addr1
         from: 0
@@ -1795,13 +1799,13 @@ light:
       - single_light_id: ${roomname}_lights
 
   - platform: shelly_dimmer
-    name: "Shelly Dimmer Light"
+    name: Shelly Dimmer Light
     power:
-      name: "Shelly Dimmer Power"
+      name: Shelly Dimmer Power
     voltage:
-      name: "Shelly Dimmer Voltage"
+      name: Shelly Dimmer Voltage
     current:
-      name: "Shelly Dimmer Current"
+      name: Shelly Dimmer Current
     max_brightness: 500
     firmware: "51.6"
     uart_id: uart0
@@ -1813,8 +1817,8 @@ remote_transmitter:
 climate:
   - platform: tcl112
     name: TCL112 Climate With Sensor
-    supports_heat: True
-    supports_cool: True
+    supports_heat: true
+    supports_cool: true
     sensor: ${sensorname}_sensor
   - platform: tcl112
     name: TCL112 Climate
@@ -1836,8 +1840,8 @@ climate:
     target_temperature_state_topic: target/temperature/state/topic
   - platform: coolix
     name: Coolix Climate With Sensor
-    supports_heat: True
-    supports_cool: True
+    supports_heat: true
+    supports_cool: true
     sensor: ${sensorname}_sensor
   - platform: coolix
     name: Coolix Climate
@@ -1871,7 +1875,7 @@ climate:
     use_fahrenheit: true
   - platform: midea
     on_state:
-      logger.log: "State changed!"
+      logger.log: State changed!
     id: midea_unit
     uart_id: uart0
     name: Midea Climate
@@ -1905,11 +1909,11 @@ climate:
       - HORIZONTAL
       - BOTH
     outdoor_temperature:
-      name: "Temp"
+      name: Temp
     power_usage:
-      name: "Power"
+      name: Power
     humidity_setpoint:
-      name: "Humidity"
+      name: Humidity
   - platform: anova
     name: Anova cooker
     ble_client_id: ble_blah
@@ -1955,7 +1959,7 @@ switch:
       # Use pin number 0
       number: 0
       mode: OUTPUT
-      inverted: False
+      inverted: false
   - platform: gpio
     name: "MCP23S17 Pin #0"
     pin:
@@ -1963,12 +1967,12 @@ switch:
       # Use pin number 0
       number: 1
       mode: OUTPUT
-      inverted: False
+      inverted: false
   - platform: gpio
     pin: GPIO25
-    name: "Living Room Dehumidifier"
+    name: Living Room Dehumidifier
     icon: "mdi:restart"
-    inverted: True
+    inverted: true
     command_topic: custom_command_topic
     command_retain: true
     restore_mode: ALWAYS_OFF
@@ -2045,20 +2049,20 @@ switch:
       remote_transmitter.transmit_rc_switch_type_a:
         group: "11001"
         device: "01000"
-        state: True
+        state: true
         protocol:
           pulse_length: 175
           sync: [1, 31]
           zero: [1, 3]
           one: [3, 1]
-          inverted: False
+          inverted: false
   - platform: template
     name: RC Switch Type B
     turn_on_action:
       remote_transmitter.transmit_rc_switch_type_b:
         address: 4
         channel: 2
-        state: True
+        state: true
   - platform: template
     name: RC Switch Type C
     turn_on_action:
@@ -2066,14 +2070,14 @@ switch:
         family: "a"
         group: 1
         device: 2
-        state: True
+        state: true
   - platform: template
     name: RC Switch Type D
     turn_on_action:
       remote_transmitter.transmit_rc_switch_type_d:
         group: "a"
         device: 2
-        state: True
+        state: true
   - platform: template
     name: RC5
     turn_on_action:
@@ -2091,12 +2095,49 @@ switch:
     turn_on_action:
       remote_transmitter.transmit_aeha:
         address: 0x8008
-        data: [0x00, 0x02, 0xFD, 0xFF, 0x00, 0x33, 0xCC, 0x49, 0xB6, 0xC8, 0x37, 0x16, 0xE9, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0xCA, 0x35, 0x8F, 0x70, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF]
+        data:
+          [
+            0x00,
+            0x02,
+            0xFD,
+            0xFF,
+            0x00,
+            0x33,
+            0xCC,
+            0x49,
+            0xB6,
+            0xC8,
+            0x37,
+            0x16,
+            0xE9,
+            0x00,
+            0xFF,
+            0x00,
+            0xFF,
+            0x00,
+            0xFF,
+            0x00,
+            0xFF,
+            0x00,
+            0xFF,
+            0xCA,
+            0x35,
+            0x8F,
+            0x70,
+            0x00,
+            0xFF,
+            0x00,
+            0xFF,
+            0x00,
+            0xFF,
+            0x00,
+            0xFF,
+          ]
   - platform: template
     name: Living Room Lights
     id: livingroom_lights
-    optimistic: True
-    assumed_state: yes
+    optimistic: true
+    assumed_state: true
     turn_on_action:
       - switch.turn_on: living_room_lights_on
       - output.set_level:
@@ -2119,22 +2160,22 @@ switch:
           level: !lambda "return 0.5;"
     turn_off_action:
       - switch.turn_on: living_room_lights_off
-    restore_state: False
+    restore_state: false
     on_turn_on:
       - switch.template.publish:
           id: livingroom_lights
-          state: yes
+          state: true
   - platform: restart
-    name: "Living Room Restart"
+    name: Living Room Restart
   - platform: safe_mode
-    name: "Living Room Restart (Safe Mode)"
+    name: Living Room Restart (Safe Mode)
   - platform: shutdown
-    name: "Living Room Shutdown"
+    name: Living Room Shutdown
   - platform: output
-    name: "Generic Output"
+    name: Generic Output
     output: pca_6
   - platform: template
-    name: "Template Switch"
+    name: Template Switch
     id: my_switch
     lambda: |-
       if (id(binary_sensor1).state) {
@@ -2152,27 +2193,27 @@ switch:
         // Switch is OFF, do something else here
       }
     optimistic: true
-    assumed_state: no
-    restore_state: True
+    assumed_state: false
+    restore_state: true
     on_turn_off:
       - switch.template.publish:
           id: my_switch
           state: !lambda "return false;"
   - platform: uart
     uart_id: uart0
-    name: "UART String Output"
-    data: "DataToSend"
+    name: UART String Output
+    data: DataToSend
   - platform: uart
     uart_id: uart0
-    name: "UART Bytes Output"
+    name: UART Bytes Output
     data: [0xDE, 0xAD, 0xBE, 0xEF]
   - platform: uart
     uart_id: uart0
-    name: "UART Recurring Output"
+    name: UART Recurring Output
     data: [0xDE, 0xAD, 0xBE, 0xEF]
     send_every: 1s
   - platform: template
-    assumed_state: yes
+    assumed_state: true
     name: Stepper Switch
     turn_on_action:
       - stepper.set_target:
@@ -2194,7 +2235,7 @@ switch:
       sn74hc595: sn74hc595_hub
       # Use pin number 0
       number: 0
-      inverted: False
+      inverted: false
   - platform: template
     id: ble1_status
     optimistic: true
@@ -2206,7 +2247,7 @@ switch:
 fan:
   - platform: binary
     output: gpio_26
-    name: "Living Room Fan 1"
+    name: Living Room Fan 1
     oscillation_output: gpio_19
     direction_output: gpio_26
   - platform: speed
@@ -2214,7 +2255,7 @@ fan:
     icon: mdi:weather-windy
     output: pca_6
     speed_count: 10
-    name: "Living Room Fan 2"
+    name: Living Room Fan 2
     oscillation_output: gpio_19
     direction_output: gpio_26
     oscillation_state_topic: oscillation/state/topic
@@ -2225,13 +2266,13 @@ fan:
     speed_command_topic: speed/command/topic
     on_speed_set:
       then:
-        - logger.log: "Fan speed was changed!"
+        - logger.log: Fan speed was changed!
   - platform: bedjet
     name: My Bedjet fan
     bedjet_id: my_bedjet_client
   - platform: copy
     source_id: fan_speed
-    name: "Fan Speed Copy"
+    name: Fan Speed Copy
 
 interval:
   - interval: 10s
@@ -2242,6 +2283,7 @@ interval:
       - display.page.show_previous: display1
   - interval: 2s
     then:
+      # yamllint disable rule:line-length
       - lambda: |-
           static uint16_t btn_left_state = id(btn_left)->get_value();
 
@@ -2250,13 +2292,14 @@ interval:
           btn_left_state = ((uint32_t) id(btn_left)->get_value()  +  63 * (uint32_t)btn_left_state) >> 6;
 
           id(btn_left)->set_threshold(btn_left_state * 0.9);
+      # yamllint enable rule:line-length
       - if:
           condition:
             display.is_displaying_page:
               id: display1
               page_id: page1
           then:
-            - logger.log: "Seeing page 1"
+            - logger.log: Seeing page 1
 
 color:
   - id: kbx_red
@@ -2328,7 +2371,7 @@ display:
     lambda: |-
       it.rectangle(0, 0, it.get_width(), it.get_height());
   - platform: ssd1306_i2c
-    model: "SSD1306_128X64"
+    model: SSD1306_128X64
     reset_pin: GPIO23
     address: 0x3C
     id: display1
@@ -2349,28 +2392,28 @@ display:
           ESP_LOGD("display", "1 -> 2");
     i2c_id: i2c_bus
   - platform: ssd1306_spi
-    model: "SSD1306 128x64"
+    model: SSD1306 128x64
     cs_pin: GPIO23
     dc_pin: GPIO23
     reset_pin: GPIO23
     lambda: |-
       it.rectangle(0, 0, it.get_width(), it.get_height());
   - platform: ssd1322_spi
-    model: "SSD1322 256x64"
+    model: SSD1322 256x64
     cs_pin: GPIO23
     dc_pin: GPIO23
     reset_pin: GPIO23
     lambda: |-
       it.rectangle(0, 0, it.get_width(), it.get_height());
   - platform: ssd1325_spi
-    model: "SSD1325 128x64"
+    model: SSD1325 128x64
     cs_pin: GPIO23
     dc_pin: GPIO23
     reset_pin: GPIO23
     lambda: |-
       it.rectangle(0, 0, it.get_width(), it.get_height());
   - platform: ssd1327_i2c
-    model: "SSD1327 128X128"
+    model: SSD1327 128X128
     reset_pin: GPIO23
     address: 0x3D
     id: display1327
@@ -2384,7 +2427,7 @@ display:
           // Nothing
     i2c_id: i2c_bus
   - platform: ssd1327_spi
-    model: "SSD1327 128x128"
+    model: SSD1327 128x128
     cs_pin: GPIO23
     dc_pin: GPIO23
     reset_pin: GPIO23
@@ -2397,7 +2440,7 @@ display:
     lambda: |-
       it.rectangle(0, 0, it.get_width(), it.get_height());
   - platform: ssd1351_spi
-    model: "SSD1351 128x128"
+    model: SSD1351 128x128
     cs_pin: GPIO23
     dc_pin: GPIO23
     reset_pin: GPIO23
@@ -2420,7 +2463,7 @@ display:
     lambda: |-
       it.rectangle(0, 0, it.get_width(), it.get_height());
   - platform: st7735
-    model: "INITR_BLACKTAB"
+    model: INITR_BLACKTAB
     cs_pin: GPIO5
     dc_pin: GPIO16
     reset_pin: GPIO23
@@ -2432,7 +2475,7 @@ display:
     lambda: |-
       it.rectangle(0, 0, it.get_width(), it.get_height());
   - platform: ili9341
-    model: "TFT 2.4"
+    model: TFT 2.4
     cs_pin: GPIO5
     dc_pin: GPIO4
     reset_pin: GPIO22
@@ -2442,7 +2485,7 @@ display:
     lambda: |-
       it.rectangle(0, 0, it.get_width(), it.get_height());
   - platform: ili9341
-    model: "TFT 2.4"
+    model: TFT 2.4
     cs_pin: GPIO5
     dc_pin: GPIO4
     reset_pin: GPIO22
@@ -2529,7 +2572,7 @@ rc522_i2c:
 
 mcp4728:
   - id: mcp4728_dac
-    store_in_eeprom: False
+    store_in_eeprom: false
     address: 0x60
     i2c_id: i2c_bus
 
@@ -2562,7 +2605,7 @@ time:
 
 cover:
   - platform: template
-    name: "Template Cover"
+    name: Template Cover
     id: template_cover
     lambda: |-
       if (id(binary_sensor1).state) {
@@ -2575,8 +2618,8 @@ cover:
       - cover.template.publish:
           id: template_cover
           state: CLOSED
-    assumed_state: no
-    has_position: yes
+    assumed_state: false
+    has_position: true
     position_state_topic: position/state/topic
     position_command_topic: position/command/topic
     tilt_lambda: !lambda "return 0.5;"
@@ -2589,12 +2632,12 @@ cover:
       then:
         - lambda: 'ESP_LOGD("cover", "closed");'
   - platform: am43
-    name: "Test AM43"
+    name: Test AM43
     id: am43_test
     ble_client_id: ble_foo
     icon: mdi:blinds
   - platform: feedback
-    name: "Feedback Cover"
+    name: Feedback Cover
     id: gate
     device_class: gate
 
@@ -2638,24 +2681,24 @@ tca9548a:
     i2c_id: multiplex0_chan0
 
 pcf8574:
-  - id: "pcf8574_hub"
+  - id: pcf8574_hub
     address: 0x21
-    pcf8575: False
+    pcf8575: false
     i2c_id: i2c_bus
 
 mcp23017:
-  - id: "mcp23017_hub"
-    open_drain_interrupt: "true"
+  - id: mcp23017_hub
+    open_drain_interrupt: true
     i2c_id: i2c_bus
 
 mcp23008:
-  - id: "mcp23008_hub"
+  - id: mcp23008_hub
     address: 0x22
-    open_drain_interrupt: "true"
+    open_drain_interrupt: true
     i2c_id: i2c_bus
 
 mcp23016:
-  - id: "mcp23016_hub"
+  - id: mcp23016_hub
     address: 0x23
     i2c_id: i2c_bus
 
@@ -2672,29 +2715,29 @@ stepper:
 globals:
   - id: glob_int
     type: int
-    restore_value: yes
+    restore_value: true
     initial_value: "0"
   - id: glob_float
     type: float
-    restore_value: yes
+    restore_value: true
     initial_value: "0.0f"
   - id: glob_bool
     type: bool
-    restore_value: no
+    restore_value: false
     initial_value: "true"
   - id: glob_string
     type: std::string
-    restore_value: no
+    restore_value: false
     # initial_value: ""
   - id: glob_bool_processed
     type: bool
-    restore_value: no
+    restore_value: false
     initial_value: "false"
 
 text_sensor:
   - platform: ble_client
     ble_client_id: ble_foo
-    name: "Sensor Location"
+    name: Sensor Location
     service_uuid: "180d"
     characteristic_uuid: "2a38"
     descriptor_uuid: "2902"
@@ -2705,7 +2748,7 @@ text_sensor:
         - lambda: |-
             ESP_LOGD("green_btn", "Location changed: %s", x.c_str());
   - platform: mqtt_subscribe
-    name: "MQTT Subscribe Text"
+    name: MQTT Subscribe Text
     topic: "the/topic"
     qos: 2
     on_value:
@@ -2742,25 +2785,25 @@ text_sensor:
     id: ${textname}_text
   - platform: wifi_info
     scan_results:
-      name: "Scan Results"
+      name: Scan Results
     ip_address:
-      name: "IP Address"
+      name: IP Address
     ssid:
-      name: "SSID"
+      name: SSID
     bssid:
-      name: "BSSID"
+      name: BSSID
     mac_address:
-      name: "Mac Address"
+      name: Mac Address
   - platform: version
-    name: "ESPHome Version No Timestamp"
-    hide_timestamp: True
+    name: ESPHome Version No Timestamp
+    hide_timestamp: true
   - platform: teleinfo
-    tag_name: "OPTARIF"
-    name: "optarif"
+    tag_name: OPTARIF
+    name: optarif
     teleinfo_id: myteleinfo
 
 sn74hc595:
-  - id: "sn74hc595_hub"
+  - id: sn74hc595_hub
     data_pin: GPIO21
     clock_pin: GPIO23
     latch_pin: GPIO22
@@ -2883,7 +2926,7 @@ qr_code:
 lock:
   - platform: template
     id: test_lock1
-    name: "Template Switch"
+    name: Template Switch
     lambda: |-
       if (id(binary_sensor1).state) {
         return LOCK_STATE_LOCKED;
@@ -2891,7 +2934,7 @@ lock:
         return LOCK_STATE_UNLOCKED;
       }
     optimistic: true
-    assumed_state: no
+    assumed_state: false
     on_unlock:
       - lock.template.publish:
           id: test_lock1
@@ -2901,7 +2944,7 @@ lock:
           id: test_lock1
           state: !lambda "return LOCK_STATE_LOCKED;"
   - platform: output
-    name: "Generic Output Lock"
+    name: Generic Output Lock
     id: test_lock2
     output: pca_6
   - platform: copy
@@ -2910,7 +2953,7 @@ lock:
 
 button:
   - platform: template
-    name: "Start calibration"
+    name: Start calibration
     on_press:
       - scd4x.perform_forced_calibration:
           value: 419
diff --git a/tests/test2.yaml b/tests/test2.yaml
index 3dd8f824dd..d01a0a742a 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -1,3 +1,4 @@
+---
 esphome:
   name: $devicename
   platform: ESP32
@@ -28,7 +29,7 @@ api:
 i2c:
   sda: 21
   scl: 22
-  scan: False
+  scan: false
 
 spi:
   clk_pin: GPIO21
@@ -47,7 +48,7 @@ uart:
       - lambda: UARTDebug::log_hex(direction, bytes, ':');
 
 ota:
-  safe_mode: True
+  safe_mode: true
   port: 3286
   num_attempts: 15
 
@@ -67,7 +68,7 @@ as3935_i2c:
   irq_pin: GPIO12
 
 mcp3008:
-  - id: 'mcp3008_hub'
+  - id: mcp3008_hub
     cs_pin: GPIO12
 
 output:
@@ -86,35 +87,35 @@ sensor:
     id: ha_hello_world_temperature
   - platform: ble_rssi
     mac_address: AC:37:43:77:5F:4C
-    name: 'BLE Google Home Mini RSSI value'
+    name: BLE Google Home Mini RSSI value
   - platform: ble_rssi
-    service_uuid: '11aa'
-    name: 'BLE Test Service 16'
+    service_uuid: 11aa
+    name: BLE Test Service 16
   - platform: ble_rssi
-    service_uuid: '11223344'
-    name: 'BLE Test Service 32'
+    service_uuid: "11223344"
+    name: BLE Test Service 32
   - platform: ble_rssi
-    service_uuid: '11223344-5566-7788-99aa-bbccddeeff00'
-    name: 'BLE Test Service 128'
+    service_uuid: 11223344-5566-7788-99aa-bbccddeeff00
+    name: BLE Test Service 128
   - platform: ble_rssi
-    service_uuid: '11223344-5566-7788-99aa-bbccddeeff00'
-    name: 'BLE Test iBeacon UUID'
+    service_uuid: 11223344-5566-7788-99aa-bbccddeeff00
+    name: BLE Test iBeacon UUID
   - platform: b_parasite
     mac_address: F0:CA:F0:CA:01:01
     humidity:
-      name: 'b-parasite Air Humidity'
+      name: b-parasite Air Humidity
     temperature:
-      name: 'b-parasite Air Temperature'
+      name: b-parasite Air Temperature
     moisture:
-      name: 'b-parasite Soil Moisture'
+      name: b-parasite Soil Moisture
     battery_voltage:
-      name: 'b-parasite Battery Voltage'
+      name: b-parasite Battery Voltage
     illuminance:
-      name: 'b-parasite Illuminance'
+      name: b-parasite Illuminance
   - platform: senseair
     id: senseair0
     co2:
-      name: 'SenseAir CO2 Value'
+      name: SenseAir CO2 Value
       on_value:
         then:
           - senseair.background_calibration: senseair0
@@ -126,167 +127,167 @@ sensor:
   - platform: ruuvitag
     mac_address: FF:56:D3:2F:7D:E8
     humidity:
-      name: 'RuuviTag Humidity'
+      name: RuuviTag Humidity
     temperature:
-      name: 'RuuviTag Temperature'
+      name: RuuviTag Temperature
     pressure:
-      name: 'RuuviTag Pressure'
+      name: RuuviTag Pressure
     acceleration_x:
-      name: 'RuuviTag Acceleration X'
+      name: RuuviTag Acceleration X
     acceleration_y:
-      name: 'RuuviTag Acceleration Y'
+      name: RuuviTag Acceleration Y
     acceleration_z:
-      name: 'RuuviTag Acceleration Z'
+      name: RuuviTag Acceleration Z
     battery_voltage:
-      name: 'RuuviTag Battery Voltage'
+      name: RuuviTag Battery Voltage
     tx_power:
-      name: 'RuuviTag TX Power'
+      name: RuuviTag TX Power
     movement_counter:
-      name: 'RuuviTag Movement Counter'
+      name: RuuviTag Movement Counter
     measurement_sequence_number:
-      name: 'RuuviTag Measurement Sequence Number'
+      name: RuuviTag Measurement Sequence Number
   - platform: as3935
     lightning_energy:
-      name: 'Lightning Energy'
+      name: Lightning Energy
     distance:
-      name: 'Distance Storm'
+      name: Distance Storm
   - platform: xiaomi_hhccjcy01
     mac_address: 94:2B:FF:5C:91:61
     temperature:
-      name: 'Xiaomi HHCCJCY01 Temperature'
+      name: Xiaomi HHCCJCY01 Temperature
     moisture:
-      name: 'Xiaomi HHCCJCY01 Moisture'
+      name: Xiaomi HHCCJCY01 Moisture
     illuminance:
-      name: 'Xiaomi HHCCJCY01 Illuminance'
+      name: Xiaomi HHCCJCY01 Illuminance
     conductivity:
-      name: 'Xiaomi HHCCJCY01 Soil Conductivity'
+      name: Xiaomi HHCCJCY01 Soil Conductivity
     battery_level:
-      name: 'Xiaomi HHCCJCY01 Battery Level'
+      name: Xiaomi HHCCJCY01 Battery Level
   - platform: xiaomi_lywsdcgq
     mac_address: 7A:80:8E:19:36:BA
     temperature:
-      name: 'Xiaomi LYWSDCGQ Temperature'
+      name: Xiaomi LYWSDCGQ Temperature
     humidity:
-      name: 'Xiaomi LYWSDCGQ Humidity'
+      name: Xiaomi LYWSDCGQ Humidity
     battery_level:
-      name: 'Xiaomi LYWSDCGQ Battery Level'
+      name: Xiaomi LYWSDCGQ Battery Level
   - platform: xiaomi_lywsd02
     mac_address: 3F:5B:7D:82:58:4E
     temperature:
-      name: 'Xiaomi LYWSD02 Temperature'
+      name: Xiaomi LYWSD02 Temperature
     humidity:
-      name: 'Xiaomi LYWSD02 Humidity'
+      name: Xiaomi LYWSD02 Humidity
     battery_level:
-      name: 'Xiaomi LYWSD02 Battery Level'
+      name: Xiaomi LYWSD02 Battery Level
   - platform: xiaomi_cgg1
     mac_address: 7A:80:8E:19:36:BA
     temperature:
-      name: 'Xiaomi CGG1 Temperature'
+      name: Xiaomi CGG1 Temperature
     humidity:
-      name: 'Xiaomi CGG1 Humidity'
+      name: Xiaomi CGG1 Humidity
     battery_level:
-      name: 'Xiaomi CGG1 Battery Level'
+      name: Xiaomi CGG1 Battery Level
   - platform: xiaomi_gcls002
-    mac_address: '94:2B:FF:5C:91:61'
+    mac_address: 94:2B:FF:5C:91:61
     temperature:
-      name: 'GCLS02 Temperature'
+      name: GCLS02 Temperature
     moisture:
-      name: 'GCLS02 Moisture'
+      name: GCLS02 Moisture
     conductivity:
-      name: 'GCLS02 Soil Conductivity'
+      name: GCLS02 Soil Conductivity
     illuminance:
-      name: 'GCLS02 Illuminance'
+      name: GCLS02 Illuminance
   - platform: xiaomi_hhccpot002
-    mac_address: '94:2B:FF:5C:91:61'
+    mac_address: 94:2B:FF:5C:91:61
     moisture:
-      name: 'HHCCPOT002 Moisture'
+      name: HHCCPOT002 Moisture
     conductivity:
-      name: 'HHCCPOT002 Soil Conductivity'
+      name: HHCCPOT002 Soil Conductivity
   - platform: xiaomi_lywsd03mmc
-    mac_address: 'A4:C1:38:4E:16:78'
-    bindkey: 'e9efaa6873f9f9c87a5e75a5f814801c'
+    mac_address: A4:C1:38:4E:16:78
+    bindkey: e9efaa6873f9f9c87a5e75a5f814801c
     temperature:
-      name: 'Xiaomi LYWSD03MMC Temperature'
+      name: Xiaomi LYWSD03MMC Temperature
     humidity:
-      name: 'Xiaomi LYWSD03MMC Humidity'
+      name: Xiaomi LYWSD03MMC Humidity
     battery_level:
-      name: 'Xiaomi LYWSD03MMC Battery Level'
+      name: Xiaomi LYWSD03MMC Battery Level
   - platform: xiaomi_cgd1
-    mac_address: 'A4:C1:38:D1:61:7D'
-    bindkey: 'c99d2313182473b38001086febf781bd'
+    mac_address: A4:C1:38:D1:61:7D
+    bindkey: c99d2313182473b38001086febf781bd
     temperature:
-      name: 'Xiaomi CGD1 Temperature'
+      name: Xiaomi CGD1 Temperature
     humidity:
-      name: 'Xiaomi CGD1 Humidity'
+      name: Xiaomi CGD1 Humidity
     battery_level:
-      name: 'Xiaomi CGD1 Battery Level'
+      name: Xiaomi CGD1 Battery Level
   - platform: xiaomi_jqjcy01ym
-    mac_address: '7A:80:8E:19:36:BA'
+    mac_address: 7A:80:8E:19:36:BA
     temperature:
-      name: 'JQJCY01YM Temperature'
+      name: JQJCY01YM Temperature
     humidity:
-      name: 'JQJCY01YM Humidity'
+      name: JQJCY01YM Humidity
     formaldehyde:
-      name: 'JQJCY01YM Formaldehyde'
+      name: JQJCY01YM Formaldehyde
     battery_level:
-      name: 'JQJCY01YM Battery Level'
+      name: JQJCY01YM Battery Level
   - platform: xiaomi_mhoc303
-    mac_address: 'E7:50:59:32:A0:1C'
+    mac_address: E7:50:59:32:A0:1C
     temperature:
-      name: 'MHO-C303 Temperature'
+      name: MHO-C303 Temperature
     humidity:
-      name: 'MHO-C303 Humidity'
+      name: MHO-C303 Humidity
     battery_level:
-      name: 'MHO-C303 Battery Level'
+      name: MHO-C303 Battery Level
   - platform: atc_mithermometer
-    mac_address: 'A4:C1:38:4E:16:78'
+    mac_address: A4:C1:38:4E:16:78
     temperature:
-      name: 'ATC Temperature'
+      name: ATC Temperature
     humidity:
-      name: 'ATC Humidity'
+      name: ATC Humidity
     battery_level:
-      name: 'ATC Battery-Level'
+      name: ATC Battery-Level
     battery_voltage:
-      name: 'ATC Battery-Voltage'
+      name: ATC Battery-Voltage
   - platform: pvvx_mithermometer
-    mac_address: 'A4:C1:38:4E:16:78'
+    mac_address: A4:C1:38:4E:16:78
     temperature:
-      name: 'PVVX Temperature'
+      name: PVVX Temperature
     humidity:
-      name: 'PVVX Humidity'
+      name: PVVX Humidity
     battery_level:
-      name: 'PVVX Battery-Level'
+      name: PVVX Battery-Level
     battery_voltage:
-      name: 'PVVX Battery-Voltage'
+      name: PVVX Battery-Voltage
   - platform: inkbird_ibsth1_mini
     mac_address: 38:81:D7:0A:9C:11
     temperature:
-      name: 'Inkbird IBS-TH1 Temperature'
+      name: Inkbird IBS-TH1 Temperature
     humidity:
-      name: 'Inkbird IBS-TH1 Humidity'
+      name: Inkbird IBS-TH1 Humidity
     battery_level:
-      name: 'Inkbird IBS-TH1 Battery Level'
+      name: Inkbird IBS-TH1 Battery Level
   - platform: xiaomi_rtcgq02lm
     id: motion_rtcgq02lm
     battery_level:
-      name: 'Mi Motion Sensor 2 Battery level'
+      name: Mi Motion Sensor 2 Battery level
   - platform: ltr390
     uv:
-      name: "LTR390 UV"
+      name: LTR390 UV
     uv_index:
-      name: "LTR390 UVI"
+      name: LTR390 UVI
     light:
-      name: "LTR390 Light"
+      name: LTR390 Light
     ambient_light:
-      name: "LTR390 ALS"
-    gain: "X3"
+      name: LTR390 ALS
+    gain: X3
     resolution: 18
     window_correction_factor: 1.0
     address: 0x53
     update_interval: 60s
   - platform: sgp4x
     voc:
-      name: "VOC Index"
+      name: VOC Index
       id: sgp40_voc_index
       algorithm_tuning:
         index_offset: 100
@@ -296,7 +297,7 @@ sensor:
         std_initial: 50
         gain_factor: 230
     nox:
-      name: "NOx"
+      name: NOx
       algorithm_tuning:
         index_offset: 100
         learning_time_offset_hours: 12
@@ -307,7 +308,7 @@ sensor:
     update_interval: 5s
   - platform: mcp3008
     update_interval: 5s
-    mcp3008_id: 'mcp3008_hub'
+    mcp3008_id: mcp3008_hub
     id: freezer_temp_source
     reference_voltage: 3.19
     number: 0
@@ -315,59 +316,59 @@ sensor:
     ble_client_id: airthings01
     update_interval: 5min
     temperature:
-      name: "Wave Plus Temperature"
+      name: Wave Plus Temperature
     radon:
-      name: "Wave Plus Radon"
+      name: Wave Plus Radon
     radon_long_term:
-      name: "Wave Plus Radon Long Term"
+      name: Wave Plus Radon Long Term
     pressure:
-      name: "Wave Plus Pressure"
+      name: Wave Plus Pressure
     humidity:
-      name: "Wave Plus Humidity"
+      name: Wave Plus Humidity
     co2:
-      name: "Wave Plus CO2"
+      name: Wave Plus CO2
     tvoc:
-      name: "Wave Plus VOC"
+      name: Wave Plus VOC
   - platform: airthings_wave_mini
     ble_client_id: airthingsmini01
     update_interval: 5min
     temperature:
-      name: "Wave Mini Temperature"
+      name: Wave Mini Temperature
     humidity:
-      name: "Wave Mini Humidity"
+      name: Wave Mini Humidity
     pressure:
-      name: "Wave Mini Pressure"
+      name: Wave Mini Pressure
     tvoc:
-      name: "Wave Mini VOC"
+      name: Wave Mini VOC
   - platform: ina260
     address: 0x40
     current:
-      name: "INA260 Current"
+      name: INA260 Current
     power:
-      name: "INA260 Power"
+      name: INA260 Power
     bus_voltage:
-      name: "INA260 Voltage"
+      name: INA260 Voltage
     update_interval: 60s
   - platform: radon_eye_rd200
     ble_client_id: radon_eye_ble_id
     update_interval: 10min
     radon:
-      name: "RD200 Radon"
+      name: RD200 Radon
     radon_long_term:
-      name: "RD200 Radon Long Term"
+      name: RD200 Radon Long Term
   - platform: mopeka_pro_check
     mac_address: D3:75:F2:DC:16:91
     tank_type: CUSTOM
     custom_distance_full: 40cm
     custom_distance_empty: 10mm
     temperature:
-      name: "Propane test temp"
+      name: Propane test temp
     level:
-      name: "Propane test level"
+      name: Propane test level
     distance:
-      name: "Propane test distance"
+      name: Propane test distance
     battery_level:
-      name: "Propane test battery level"
+      name: Propane test battery level
 
 time:
   - platform: homeassistant
@@ -377,7 +378,7 @@ time:
           - logger.log: It's 16:00
 
 esp32_touch:
-  setup_mode: True
+  setup_mode: true
 
 binary_sensor:
   - platform: homeassistant
@@ -389,76 +390,80 @@ binary_sensor:
     id: ha_hello_world_binary_attribute
   - platform: ble_presence
     mac_address: AC:37:43:77:5F:4C
-    name: 'ESP32 BLE Tracker Google Home Mini'
+    name: ESP32 BLE Tracker Google Home Mini
   - platform: ble_presence
-    service_uuid: '11aa'
-    name: 'BLE Test Service 16 Presence'
+    service_uuid: 11aa
+    name: BLE Test Service 16 Presence
   - platform: ble_presence
-    service_uuid: '11223344'
-    name: 'BLE Test Service 32 Presence'
+    service_uuid: "11223344"
+    name: BLE Test Service 32 Presence
   - platform: ble_presence
-    service_uuid: '11223344-5566-7788-99aa-bbccddeeff00'
-    name: 'BLE Test Service 128 Presence'
+    service_uuid: 11223344-5566-7788-99aa-bbccddeeff00
+    name: BLE Test Service 128 Presence
   - platform: ble_presence
-    ibeacon_uuid: '11223344-5566-7788-99aa-bbccddeeff00'
+    ibeacon_uuid: 11223344-5566-7788-99aa-bbccddeeff00
     ibeacon_major: 100
     ibeacon_minor: 1
-    name: 'BLE Test iBeacon Presence'
+    name: BLE Test iBeacon Presence
   - platform: esp32_touch
-    name: 'ESP32 Touch Pad GPIO27'
+    name: ESP32 Touch Pad GPIO27
     pin: GPIO27
     threshold: 1000
   - platform: as3935
-    name: 'Storm Alert'
+    name: Storm Alert
   - platform: xiaomi_mue4094rt
-    name: 'MUE4094RT Motion'
-    mac_address: '7A:80:8E:19:36:BA'
-    timeout: '5s'
+    name: MUE4094RT Motion
+    mac_address: 7A:80:8E:19:36:BA
+    timeout: 5s
   - platform: xiaomi_mjyd02yla
-    name: 'MJYD02YL-A Motion'
-    mac_address: '50:EC:50:CD:32:02'
-    bindkey: '48403ebe2d385db8d0c187f81e62cb64'
+    name: MJYD02YL-A Motion
+    mac_address: 50:EC:50:CD:32:02
+    bindkey: 48403ebe2d385db8d0c187f81e62cb64
     idle_time:
-      name: 'MJYD02YL-A Idle Time'
+      name: MJYD02YL-A Idle Time
     light:
-      name: 'MJYD02YL-A Light Status'
+      name: MJYD02YL-A Light Status
     battery_level:
-      name: 'MJYD02YL-A Battery Level'
+      name: MJYD02YL-A Battery Level
   - platform: xiaomi_wx08zm
-    name: 'WX08ZM Activation State'
-    mac_address: '74:a3:4a:b5:07:34'
+    name: WX08ZM Activation State
+    mac_address: 74:a3:4a:b5:07:34
     tablet:
-      name: 'WX08ZM Tablet Resource'
+      name: WX08ZM Tablet Resource
     battery_level:
-      name: 'WX08ZM Battery Level'
+      name: WX08ZM Battery Level
   - platform: xiaomi_cgpr1
-    name: 'CGPR1 Motion'
-    mac_address: '12:34:56:12:34:56'
-    bindkey: '48403ebe2d385db8d0c187f81e62cb64'
+    name: CGPR1 Motion
+    mac_address: "12:34:56:12:34:56"
+    bindkey: 48403ebe2d385db8d0c187f81e62cb64
     battery_level:
-      name: 'CGPR1 battery Level'
+      name: CGPR1 battery Level
     idle_time:
-      name: 'CGPR1 Idle Time'
+      name: CGPR1 Idle Time
     illuminance:
-      name: 'CGPR1 Illuminance'
+      name: CGPR1 Illuminance
   - platform: xiaomi_rtcgq02lm
     id: motion_rtcgq02lm
     motion:
-      name: 'Mi Motion Sensor 2'
+      name: Mi Motion Sensor 2
     light:
-      name: 'Mi Motion Sensor 2 Light'
+      name: Mi Motion Sensor 2 Light
     button:
-      name: 'Mi Motion Sensor 2 Button'
+      name: Mi Motion Sensor 2 Button
 
 esp32_ble_tracker:
   on_ble_advertise:
     - mac_address: AC:37:43:77:5F:4C
       then:
+        # yamllint disable rule:line-length
         - lambda: !lambda |-
             ESP_LOGD("main", "The device address is %s", x.address_str().c_str());
+        # yamllint enable rule:line-length
     - then:
+        # yamllint disable rule:line-length
         - lambda: !lambda |-
             ESP_LOGD("main", "The device address is %s", x.address_str().c_str());
+        # yamllint enable rule:line-length
   on_ble_service_data_advertise:
     - service_uuid: ABCD
       then:
@@ -494,16 +499,12 @@ xiaomi_rtcgq02lm:
     mac_address: 01:02:03:04:05:06
     bindkey: '48403ebe2d385db8d0c187f81e62cb64'
 
-#esp32_ble_beacon:
-#  type: iBeacon
-#  uuid: 'c29ce823-e67a-4e71-bff2-abaa32e77a98'
-
 status_led:
   pin: GPIO2
 
 text_sensor:
   - platform: version
-    name: 'ESPHome Version'
+    name: ESPHome Version
     icon: mdi:icon
     id: version_sensor
     on_value:
@@ -511,8 +512,10 @@ text_sensor:
           condition:
             - api.connected:
           then:
+            # yamllint disable rule:line-length
             - lambda: !lambda |-
                 ESP_LOGD("main", "The state is %s=%s", x.c_str(), id(version_sensor).state.c_str());
+            # yamllint enable rule:line-length
       - script.execute: my_script
       - homeassistant.service:
           service: notify.html5
@@ -537,19 +540,19 @@ text_sensor:
       - deep_sleep.enter:
           sleep_duration: !lambda "return 30 * 60 * 1000;"
   - platform: template
-    name: 'Template Text Sensor'
+    name: Template Text Sensor
     lambda: |-
       return {"Hello World"};
     filters:
       - to_upper:
       - to_lower:
-      - append: "xyz"
-      - prepend: "abcd"
+      - append: xyz
+      - prepend: abcd
       - substitute:
           - Hello -> Goodbye
       - map:
           - red -> green
-      - lambda: return {"1234"};
+      - lambda: 'return {"1234"};'
   - platform: homeassistant
     entity_id: sensor.hello_world2
     id: ha_hello_world2
@@ -587,7 +590,7 @@ stepper:
     pin_b: GPIO27
     pin_c: GPIO25
     pin_d: GPIO26
-    sleep_when_done: no
+    sleep_when_done: false
     step_mode: HALF_STEP
     max_speed: 250 steps/s
 
@@ -598,7 +601,7 @@ stepper:
 interval:
   interval: 5s
   then:
-    - logger.log: 'Interval Run'
+    - logger.log: Interval Run
 
 display:
 
@@ -611,7 +614,7 @@ cap1188:
 
 switch:
   - platform: template
-    name: "Test BLE Write Action"
+    name: Test BLE Write Action
     turn_on_action:
       - ble_client.ble_write:
           id: airthings01
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 4b2224dc3c..de0fc0dfdb 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -1,3 +1,4 @@
+---
 esphome:
   name: $device_name
   comment: $device_comment
@@ -9,38 +10,38 @@ esphome:
           - wifi.connected
           - time.has_time
         then:
-          - logger.log: "Have time"
+          - logger.log: Have time
   includes:
     - custom.h
 
 esp8266:
   board: d1_mini
-  early_pin_init: True
+  early_pin_init: true
 
 substitutions:
   device_name: test3
   device_comment: test3 device
-  min_sub: '0.03'
-  max_sub: '12.0%'
+  min_sub: "0.03"
+  max_sub: "12.0%"
 
 api:
   port: 8000
-  password: 'pwd'
+  password: pwd
   reboot_timeout: 0min
   encryption:
-    key: 'bOFFzzvfpg5DB94DuBGLXD/hMnhpDKgP9UQyBulwWVU='
+    key: bOFFzzvfpg5DB94DuBGLXD/hMnhpDKgP9UQyBulwWVU=
   services:
     - service: hello_world
       variables:
         name: string
       then:
         - logger.log:
-            format: 'Hello World %s!'
+            format: Hello World %s!
             args:
               - name.c_str()
     - service: empty_service
       then:
-        - logger.log: 'Service Called'
+        - logger.log: Service Called
     - service: all_types
       variables:
         bool_: bool
@@ -48,7 +49,7 @@ api:
         float_: float
         string_: string
       then:
-        - logger.log: 'Something happened'
+        - logger.log: Something happened
         - stepper.set_target:
             id: my_stepper2
             target: !lambda 'return int_;'
@@ -60,7 +61,9 @@ api:
         string_arr: string[]
       then:
         - logger.log:
+            # yamllint disable rule:line-length
             format: 'Bool: %s (%u), Int: %d (%u), Float: %f (%u), String: %s (%u)'
+            # yamllint enable rule:line-length
             args:
               - YESNO(bool_arr[0])
               - bool_arr.size()
@@ -104,7 +107,7 @@ api:
       then:
         - dfplayer.play_folder:
             folder: !lambda 'return folder;'
-            loop: True
+            loop: true
 
     - service: dfplayer_set_device
       variables:
@@ -122,7 +125,9 @@ api:
       variables:
         preset: int
       then:
+        # yamllint disable rule:line-length
         - dfplayer.set_eq: !lambda 'return static_cast<dfplayer::EqPreset>(preset);'
+        # yamllint enable rule:line-length
 
     - service: dfplayer_sleep
       then:
@@ -220,7 +225,7 @@ wifi:
 i2c:
   sda: 4
   scl: 5
-  scan: False
+  scan: false
 
 spi:
   clk_pin: GPIO12
@@ -231,7 +236,7 @@ uart:
   - id: uart1
     tx_pin:
       number: GPIO1
-      inverted: yes
+      inverted: true
     rx_pin: GPIO3
     baud_rate: 115200
   - id: uart2
@@ -279,7 +284,7 @@ modbus:
   uart_id: uart1
 
 ota:
-  safe_mode: True
+  safe_mode: true
   port: 3286
   reboot_timeout: 15min
 
@@ -302,40 +307,40 @@ adalight:
 sensor:
   - platform: daly_bms
     voltage:
-      name: "Battery Voltage"
+      name: Battery Voltage
     current:
-      name: "Battery Current"
+      name: Battery Current
     battery_level:
-      name: "Battery Level"
+      name: Battery Level
     max_cell_voltage:
-      name: "Max Cell Voltage"
+      name: Max Cell Voltage
     max_cell_voltage_number:
-      name: "Max Cell Voltage Number"
+      name: Max Cell Voltage Number
     min_cell_voltage:
-      name: "Min Cell Voltage"
+      name: Min Cell Voltage
     min_cell_voltage_number:
-      name: "Min Cell Voltage Number"
+      name: Min Cell Voltage Number
     max_temperature:
-      name: "Max Temperature"
+      name: Max Temperature
     max_temperature_probe_number:
-      name: "Max Temperature Probe Number"
+      name: Max Temperature Probe Number
     min_temperature:
-      name: "Min Temperature"
+      name: Min Temperature
     min_temperature_probe_number:
-      name: "Min Temperature Probe Number"
+      name: Min Temperature Probe Number
     remaining_capacity:
-      name: "Remaining Capacity"
+      name: Remaining Capacity
     cells_number:
-      name: "Cells Number"
+      name: Cells Number
     temperature_1:
-      name: "Temperature 1"
+      name: Temperature 1
     temperature_2:
-      name: "Temperature 2"
+      name: Temperature 2
   - platform: apds9960
     type: proximity
     name: APDS9960 Proximity
   - platform: vl53l0x
-    name: 'VL53L0x Distance'
+    name: VL53L0x Distance
     address: 0x29
     update_interval: 60s
     enable_pin: GPIO13
@@ -357,32 +362,32 @@ sensor:
     id: ha_hello_world
   - platform: aht10
     temperature:
-      name: 'Temperature'
+      name: Temperature
     humidity:
-      name: 'Humidity'
+      name: Humidity
   - platform: am2320
     temperature:
-      name: 'Temperature'
+      name: Temperature
     humidity:
-      name: 'Humidity'
+      name: Humidity
   - platform: hydreon_rgxx
-    model: "RG 9"
+    model: RG 9
     uart_id: uart6
-    id: "hydreon_rg9"
+    id: hydreon_rg9
     moisture:
-      name: "hydreon_rain"
+      name: hydreon_rain
       id: hydreon_rain
   - platform: hydreon_rgxx
-    model: "RG_15"
+    model: RG_15
     uart_id: uart6
     acc:
-      name: "hydreon_acc"
+      name: hydreon_acc
     event_acc:
-      name: "hydreon_event_acc"
+      name: hydreon_event_acc
     total_acc:
-      name: "hydreon_total_acc"
+      name: hydreon_total_acc
     r_int:
-      name: "hydreon_r_int"
+      name: hydreon_r_int
   - platform: adc
     pin: VCC
     id: my_sensor
@@ -496,281 +501,281 @@ sensor:
   - platform: bl0939
     uart_id: uart8
     voltage:
-      name: 'BL0939 Voltage'
+      name: BL0939 Voltage
     current_1:
-      name: 'BL0939 Current 1'
+      name: BL0939 Current 1
     current_2:
-      name: 'BL0939 Current 2'
+      name: BL0939 Current 2
     active_power_1:
-      name: 'BL0939 Active Power 1'
+      name: BL0939 Active Power 1
     active_power_2:
-      name: 'BL0939 Active Power 2'
+      name: BL0939 Active Power 2
     energy_1:
-      name: 'BL0939 Energy 1'
+      name: BL0939 Energy 1
     energy_2:
-      name: 'BL0939 Energy 2'
+      name: BL0939 Energy 2
     energy_total:
-      name: 'BL0939 Total energy'
+      name: BL0939 Total energy
   - platform: bl0940
     uart_id: uart3
     voltage:
-      name: 'BL0940 Voltage'
+      name: BL0940 Voltage
     current:
-      name: 'BL0940 Current'
+      name: BL0940 Current
     power:
-      name: 'BL0940 Power'
+      name: BL0940 Power
     energy:
-      name: 'BL0940 Energy'
+      name: BL0940 Energy
     internal_temperature:
-      name: 'BL0940 Internal temperature'
+      name: BL0940 Internal temperature
     external_temperature:
-      name: 'BL0940 External temperature'
+      name: BL0940 External temperature
   - platform: pzem004t
     uart_id: uart3
     voltage:
-      name: 'PZEM004T Voltage'
+      name: PZEM004T Voltage
     current:
-      name: 'PZEM004T Current'
+      name: PZEM004T Current
     power:
-      name: 'PZEM004T Power'
+      name: PZEM004T Power
   - platform: pzemac
     id: pzemac1
     voltage:
-      name: 'PZEMAC Voltage'
+      name: PZEMAC Voltage
     current:
-      name: 'PZEMAC Current'
+      name: PZEMAC Current
     power:
-      name: 'PZEMAC Power'
+      name: PZEMAC Power
     energy:
-      name: 'PZEMAC Energy'
+      name: PZEMAC Energy
     frequency:
-      name: 'PZEMAC Frequency'
+      name: PZEMAC Frequency
     power_factor:
-      name: 'PZEMAC Power Factor'
+      name: PZEMAC Power Factor
   - platform: pzemdc
     voltage:
-      name: 'PZEMDC Voltage'
+      name: PZEMDC Voltage
     current:
-      name: 'PZEMDC Current'
+      name: PZEMDC Current
     power:
-      name: 'PZEMDC Power'
+      name: PZEMDC Power
   - platform: tmp102
-    name: 'TMP102 Temperature'
+    name: TMP102 Temperature
   - platform: hm3301
     pm_1_0:
-      name: 'PM1.0'
+      name: PM1.0
     pm_2_5:
-      name: 'PM2.5'
+      name: PM2.5
     pm_10_0:
-      name: 'PM10.0'
+      name: PM10.0
     aqi:
-      name: 'AQI'
-      calculation_type: 'AQI'
+      name: AQI
+      calculation_type: AQI
   - platform: pmsx003
     uart_id: uart9
     type: PMSX003
     pm_1_0:
-      name: 'PM 1.0 Concentration'
+      name: PM 1.0 Concentration
     pm_2_5:
-      name: 'PM 2.5 Concentration'
+      name: PM 2.5 Concentration
     pm_10_0:
-      name: 'PM 10.0 Concentration'
+      name: PM 10.0 Concentration
     pm_1_0_std:
-      name: 'PM 1.0 Standard Atmospher Concentration'
+      name: PM 1.0 Standard Atmospher Concentration
     pm_2_5_std:
-      name: 'PM 2.5 Standard Atmospher Concentration'
+      name: PM 2.5 Standard Atmospher Concentration
     pm_10_0_std:
-      name: 'PM 10.0 Standard Atmospher Concentration'
+      name: PM 10.0 Standard Atmospher Concentration
     pm_0_3um:
-      name: 'Particulate Count >0.3um'
+      name: Particulate Count >0.3um
     pm_0_5um:
-      name: 'Particulate Count >0.5um'
+      name: Particulate Count >0.5um
     pm_1_0um:
-      name: 'Particulate Count >1.0um'
+      name: Particulate Count >1.0um
     pm_2_5um:
-      name: 'Particulate Count >2.5um'
+      name: Particulate Count >2.5um
     pm_5_0um:
-      name: 'Particulate Count >5.0um'
+      name: Particulate Count >5.0um
     pm_10_0um:
-      name: 'Particulate Count >10.0um'
+      name: Particulate Count >10.0um
     update_interval: 30s
   - platform: pmsx003
     uart_id: uart5
     type: PMS5003T
     pm_2_5:
-      name: 'PM 2.5 Concentration'
+      name: PM 2.5 Concentration
     temperature:
-      name: 'PMS Temperature'
+      name: PMS Temperature
     humidity:
-      name: 'PMS Humidity'
+      name: PMS Humidity
   - platform: pmsx003
     uart_id: uart6
     type: PMS5003ST
     pm_1_0:
-      name: 'PM 1.0 Concentration'
+      name: PM 1.0 Concentration
     pm_2_5:
-      name: 'PM 2.5 Concentration'
+      name: PM 2.5 Concentration
     pm_10_0:
-      name: 'PM 10.0 Concentration'
+      name: PM 10.0 Concentration
     pm_1_0_std:
-      name: 'PM 1.0 Standard Atmospher Concentration'
+      name: PM 1.0 Standard Atmospher Concentration
     pm_2_5_std:
-      name: 'PM 2.5 Standard Atmospher Concentration'
+      name: PM 2.5 Standard Atmospher Concentration
     pm_10_0_std:
-      name: 'PM 10.0 Standard Atmospher Concentration'
+      name: PM 10.0 Standard Atmospher Concentration
     pm_0_3um:
-      name: 'Particulate Count >0.3um'
+      name: Particulate Count >0.3um
     pm_0_5um:
-      name: 'Particulate Count >0.5um'
+      name: Particulate Count >0.5um
     pm_1_0um:
-      name: 'Particulate Count >1.0um'
+      name: Particulate Count >1.0um
     pm_2_5um:
-      name: 'Particulate Count >2.5um'
+      name: Particulate Count >2.5um
     pm_5_0um:
-      name: 'Particulate Count >5.0um'
+      name: Particulate Count >5.0um
     pm_10_0um:
-      name: 'Particulate Count >10.0um'
+      name: Particulate Count >10.0um
     temperature:
-      name: 'PMS Temperature'
+      name: PMS Temperature
     humidity:
-      name: 'PMS Humidity'
+      name: PMS Humidity
     formaldehyde:
-      name: 'PMS Formaldehyde Concentration'
+      name: PMS Formaldehyde Concentration
   - platform: cse7761
     uart_id: uart7
     voltage:
-      name: 'CSE7761 Voltage'
+      name: CSE7761 Voltage
     current_1:
-      name: 'CSE7761 Current 1'
+      name: CSE7761 Current 1
     current_2:
-      name: 'CSE7761 Current 2'
+      name: CSE7761 Current 2
     active_power_1:
-      name: 'CSE7761 Active Power 1'
+      name: CSE7761 Active Power 1
     active_power_2:
-      name: 'CSE7761 Active Power 2'
+      name: CSE7761 Active Power 2
   - platform: cse7766
     uart_id: uart3
     voltage:
-      name: 'CSE7766 Voltage'
+      name: CSE7766 Voltage
     current:
-      name: 'CSE7766 Current'
+      name: CSE7766 Current
     power:
-      name: 'CSE776 Power'
+      name: CSE776 Power
   - platform: ezo
     id: ph_ezo
     address: 99
-    unit_of_measurement: 'pH'
+    unit_of_measurement: pH
   - platform: tof10120
-    name: "Distance sensor"
+    name: Distance sensor
     update_interval: 5s
   - platform: fingerprint_grow
     fingerprint_count:
-      name: "Fingerprint Count"
+      name: Fingerprint Count
     status:
-      name: "Fingerprint Status"
+      name: Fingerprint Status
     capacity:
-      name: "Fingerprint Capacity"
+      name: Fingerprint Capacity
     security_level:
-      name: "Fingerprint Security Level"
+      name: Fingerprint Security Level
     last_finger_id:
-      name: "Fingerprint Last Finger ID"
+      name: Fingerprint Last Finger ID
     last_confidence:
-      name: "Fingerprint Last Confidence"
+      name: Fingerprint Last Confidence
   - platform: sdm_meter
     phase_a:
       current:
-        name: 'Phase A Current'
+        name: Phase A Current
       voltage:
-        name: 'Phase A Voltage'
+        name: Phase A Voltage
       active_power:
-        name: 'Phase A Power'
+        name: Phase A Power
       power_factor:
-        name: 'Phase A Power Factor'
+        name: Phase A Power Factor
       apparent_power:
-        name: 'Phase A Apparent Power'
+        name: Phase A Apparent Power
       reactive_power:
-        name: 'Phase A Reactive Power'
+        name: Phase A Reactive Power
       phase_angle:
-        name: 'Phase A Phase Angle'
+        name: Phase A Phase Angle
     phase_b:
       current:
-        name: 'Phase B Current'
+        name: Phase B Current
       voltage:
-        name: 'Phase B Voltage'
+        name: Phase B Voltage
       active_power:
-        name: 'Phase B Power'
+        name: Phase B Power
       power_factor:
-        name: 'Phase B Power Factor'
+        name: Phase B Power Factor
       apparent_power:
-        name: 'Phase B Apparent Power'
+        name: Phase B Apparent Power
       reactive_power:
-        name: 'Phase B Reactive Power'
+        name: Phase B Reactive Power
       phase_angle:
-        name: 'Phase B Phase Angle'
+        name: Phase B Phase Angle
     phase_c:
       current:
-        name: 'Phase C Current'
+        name: Phase C Current
       voltage:
-        name: 'Phase C Voltage'
+        name: Phase C Voltage
       active_power:
-        name: 'Phase C Power'
+        name: Phase C Power
       power_factor:
-        name: 'Phase C Power Factor'
+        name: Phase C Power Factor
       apparent_power:
-        name: 'Phase C Apparent Power'
+        name: Phase C Apparent Power
       reactive_power:
-        name: 'Phase C Reactive Power'
+        name: Phase C Reactive Power
       phase_angle:
-        name: 'Phase C Phase Angle'
+        name: Phase C Phase Angle
     frequency:
-      name: 'Frequency'
+      name: Frequency
     import_active_energy:
-      name: 'Import Active Energy'
+      name: Import Active Energy
     export_active_energy:
-      name: 'Export Active Energy'
+      name: Export Active Energy
     import_reactive_energy:
-      name: 'Import Reactive Energy'
+      name: Import Reactive Energy
     export_reactive_energy:
-      name: 'Export Reactive Energy'
+      name: Export Reactive Energy
   - platform: dsmr
     energy_delivered_tariff1:
       name: dsmr_energy_delivered_tariff1
 
   - platform: nextion
     id: testnumber
-    name: 'testnumber'
+    name: testnumber
     variable_name: testnumber
   - platform: nextion
     id: testwave
-    name: 'testwave'
+    name: testwave
     component_id: 2
     wave_channel_id: 1
   - platform: mlx90393
     oversampling: 1
     filter: 0
-    gain: "3X"
+    gain: 3X
     x_axis:
-      name: "mlxxaxis"
+      name: mlxxaxis
     y_axis:
-      name: "mlxyaxis"
+      name: mlxyaxis
     z_axis:
-      name: "mlxzaxis"
+      name: mlxzaxis
       resolution: 17BIT
     temperature:
-      name: "mlxtemp"
+      name: mlxtemp
       oversampling: 2
   - platform: smt100
     uart_id: uart10
     counts:
-      name: "Counts"
+      name: Counts
     dielectric_constant:
-      name: "Dielectric Constant"
+      name: Dielectric Constant
     temperature:
-      name: "Temperature"
+      name: Temperature
     moisture:
-      name: "Moisture"
+      name: Moisture
     voltage:
-      name: "Voltage"
+      name: Voltage
     update_interval: 60s
 time:
   - platform: homeassistant
@@ -786,9 +791,9 @@ mpr121:
 binary_sensor:
   - platform: daly_bms
     charging_mos_enabled:
-      name: "Charging MOS"
+      name: Charging MOS
     discharging_mos_enabled:
-      name: "Discharging MOS"
+      name: Discharging MOS
   - platform: apds9960
     direction: up
     name: APDS9960 Up
@@ -816,18 +821,18 @@ binary_sensor:
   - platform: mpr121
     id: touchkey0
     channel: 0
-    name: 'touchkey0'
+    name: touchkey0
   - platform: mpr121
     channel: 1
-    name: 'touchkey1'
+    name: touchkey1
     id: bin1
   - platform: mpr121
     channel: 2
-    name: 'touchkey2'
+    name: touchkey2
     id: bin2
   - platform: mpr121
     channel: 3
-    name: 'touchkey3'
+    name: touchkey3
     id: bin3
     on_press:
       then:
@@ -839,7 +844,7 @@ binary_sensor:
     channel: 1
     name: TTP229 BSF Test
   - platform: fingerprint_grow
-    name: "Fingerprint Enrolling"
+    name: Fingerprint Enrolling
   - platform: custom
     lambda: |-
       auto s = new CustomBinarySensor();
@@ -851,27 +856,27 @@ binary_sensor:
   - platform: nextion
     page_id: 0
     component_id: 2
-    name: 'Nextion Component 2 Touch'
+    name: Nextion Component 2 Touch
   - platform: nextion
     id: r0_sensor
-    name: 'R0 Sensor'
+    name: R0 Sensor
     component_name: page0.r0
   - platform: template
-    id: 'cover_toggle'
+    id: cover_toggle
     on_press:
       then:
         - cover.toggle: time_based_cover
         - cover.toggle: endstop_cover
   - platform: hydreon_rgxx
-    hydreon_rgxx_id: "hydreon_rg9"
+    hydreon_rgxx_id: hydreon_rg9
     too_cold:
-      name: "rg9_toocold"
+      name: rg9_toocold
     em_sat:
-      name: "rg9_emsat"
+      name: rg9_emsat
     lens_bad:
-      name: "rg9_lens_bad"
+      name: rg9_lens_bad
   - platform: template
-    id: 'pzemac_reset_energy'
+    id: pzemac_reset_energy
     on_press:
       then:
         - pzemac.reset_energy: pzemac1
@@ -891,14 +896,16 @@ status_led:
 text_sensor:
   - platform: daly_bms
     status:
-      name: "BMS Status"
+      name: BMS Status
   - platform: version
-    name: 'ESPHome Version'
+    name: ESPHome Version
     icon: mdi:icon
     id: version_sensor
     on_value:
+      # yamllint disable rule:line-length
       - lambda: !lambda |-
           ESP_LOGD("main", "The state is %s=%s", x.c_str(), id(version_sensor).state.c_str());
+      # yamllint enable rule:line-length
       - script.execute: my_script
       - script.wait: my_script
       - script.stop: my_script
@@ -912,7 +919,7 @@ text_sensor:
             my_variable: |-
               return id(version_sensor).state;
   - platform: template
-    name: 'Template Text Sensor'
+    name: Template Text Sensor
     lambda: |-
       return {"Hello World"};
   - platform: homeassistant
@@ -933,9 +940,9 @@ text_sensor:
     component_name: text0
   - platform: dsmr
     identification:
-      name: "dsmr_identification"
+      name: dsmr_identification
     p1_version:
-      name: "dsmr_p1_version"
+      name: dsmr_p1_version
 
 script:
   - id: my_script
@@ -948,9 +955,9 @@ sm2135:
 
 switch:
   - platform: template
-    name: 'mpr121_toggle'
+    name: mpr121_toggle
     id: mpr121_toggle
-    optimistic: True
+    optimistic: true
   - platform: gpio
     id: gpio_switch1
     pin:
@@ -978,7 +985,7 @@ switch:
         name: Custom Switch
   - platform: nextion
     id: r0
-    name: 'R0 Switch'
+    name: R0 Switch
     component_name: page0.r0
 
 custom_component:
@@ -994,7 +1001,7 @@ stepper:
     pin_b: GPIO13
     pin_c: GPIO14
     pin_d: GPIO15
-    sleep_when_done: no
+    sleep_when_done: false
     step_mode: HALF_STEP
     max_speed: 250 steps/s
     acceleration: inf
@@ -1010,7 +1017,7 @@ stepper:
 interval:
   interval: 5s
   then:
-    - logger.log: 'Interval Run'
+    - logger.log: Interval Run
     - stepper.set_target:
         id: my_stepper2
         target: 500
@@ -1123,7 +1130,7 @@ climate:
       default_target_temperature_high: 20°C
   - platform: pid
     id: pid_climate
-    name: 'PID Climate Controller'
+    name: PID Climate Controller
     sensor: ha_hello_world
     default_target_temperature: 21°C
     heat_output: my_slow_pwm
@@ -1134,42 +1141,42 @@ climate:
 
 sprinkler:
   - id: yard_sprinkler_ctrlr
-    main_switch: "Yard Sprinklers"
-    auto_advance_switch: "Yard Sprinklers Auto Advance"
-    reverse_switch: "Yard Sprinklers Reverse"
+    main_switch: Yard Sprinklers
+    auto_advance_switch: Yard Sprinklers Auto Advance
+    reverse_switch: Yard Sprinklers Reverse
     pump_start_pump_delay: 2s
     pump_stop_valve_delay: 4s
     pump_switch_off_during_valve_open_delay: true
     valve_open_delay: 5s
     valves:
-      - valve_switch: "Yard Valve 0"
-        enable_switch: "Enable Yard Valve 0"
+      - valve_switch: Yard Valve 0
+        enable_switch: Enable Yard Valve 0
         pump_switch_id: gpio_switch1
         run_duration: 10s
         valve_switch_id: gpio_switch2
-      - valve_switch: "Yard Valve 1"
-        enable_switch: "Enable Yard Valve 1"
+      - valve_switch: Yard Valve 1
+        enable_switch: Enable Yard Valve 1
         pump_switch_id: gpio_switch1
         run_duration: 10s
         valve_switch_id: gpio_switch2
-      - valve_switch: "Yard Valve 2"
-        enable_switch: "Enable Yard Valve 2"
+      - valve_switch: Yard Valve 2
+        enable_switch: Enable Yard Valve 2
         pump_switch_id: gpio_switch1
         run_duration: 10s
         valve_switch_id: gpio_switch2
   - id: garden_sprinkler_ctrlr
-    main_switch: "Garden Sprinklers"
-    auto_advance_switch: "Garden Sprinklers Auto Advance"
-    reverse_switch: "Garden Sprinklers Reverse"
+    main_switch: Garden Sprinklers
+    auto_advance_switch: Garden Sprinklers Auto Advance
+    reverse_switch: Garden Sprinklers Reverse
     valve_overlap: 5s
     valves:
-      - valve_switch: "Garden Valve 0"
-        enable_switch: "Enable Garden Valve 0"
+      - valve_switch: Garden Valve 0
+        enable_switch: Enable Garden Valve 0
         pump_switch_id: gpio_switch1
         run_duration: 10s
         valve_switch_id: gpio_switch2
-      - valve_switch: "Garden Valve 1"
-        enable_switch: "Enable Garden Valve 1"
+      - valve_switch: Garden Valve 1
+        enable_switch: Enable Garden Valve 1
         pump_switch_id: gpio_switch1
         run_duration: 10s
         valve_switch_id: gpio_switch2
@@ -1219,7 +1226,7 @@ cover:
       - switch.turn_on: gpio_switch2
     close_duration: 4.5min
   - platform: current_based
-    name: "Current Based Cover"
+    name: Current Based Cover
     open_sensor: ade7953_current_a
     open_moving_current_threshold: 0.5
     open_obstacle_current_threshold: 0.8
@@ -1240,7 +1247,7 @@ cover:
     malfunction_detection: true
     malfunction_action:
       then:
-        - logger.log: "Malfunction Detected"
+        - logger.log: Malfunction Detected
   - platform: template
     name: Template Cover with Tilt
     tilt_lambda: 'return 0.5;'
@@ -1326,7 +1333,7 @@ light:
     pin_b: out2
   - platform: sonoff_d1
     uart_id: uart2
-    use_rm433_remote: False
+    use_rm433_remote: false
     name: Sonoff D1 Dimmer
     id: d1_light
     restore_mode: RESTORE_DEFAULT_OFF
@@ -1352,7 +1359,7 @@ sim800l:
         str = sender;
         str = message;
     - sim800l.send_sms:
-        message: 'hello you'
+        message: hello you
         recipient: '+1234'
     - sim800l.dial:
         recipient: '+1234'
@@ -1365,7 +1372,7 @@ dfplayer:
         condition:
           not: dfplayer.is_playing
         then:
-          logger.log: 'Playback finished event'
+          logger.log: Playback finished event
 tm1651:
   id: tm1651_battery
   clk_pin: D6
@@ -1394,8 +1401,8 @@ rf_bridge:
         test = data.length;
         test = data.protocol;
         test_code = data.code;
-    - rf_bridge.start_advanced_sniffing
-    - rf_bridge.stop_advanced_sniffing
+    - rf_bridge.start_advanced_sniffing:
+    - rf_bridge.stop_advanced_sniffing:
     - rf_bridge.send_advanced_code:
         length: 0x04
         protocol: 0x01
@@ -1413,13 +1420,13 @@ rf_bridge:
         json:
           key: !lambda |-
             return id(version_sensor).state;
-          greeting: 'Hello World'
+          greeting: Hello World
     - http_request.send:
         method: PUT
         url: https://esphome.io
         headers:
           Content-Type: application/json
-        body: 'Some data'
+        body: Some data
         verify_ssl: false
 
 display:
@@ -1428,13 +1435,13 @@ display:
     num_chips: 4
     rotate_chip: 0
     intensity: 10
-    scroll_mode: 'STOP'
+    scroll_mode: STOP
     id: my_matrix
     lambda: |-
       it.printdigit("hello");
   - platform: nextion
     uart_id: uart1
-    tft_url: 'http://esphome.io/default35.tft'
+    tft_url: http://esphome.io/default35.tft
     update_interval: 5s
     on_sleep:
       then:
diff --git a/tests/test4.yaml b/tests/test4.yaml
index c3079037c1..d6857de7cd 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -1,3 +1,4 @@
+---
 esphome:
   name: $devicename
   platform: ESP32
@@ -25,7 +26,7 @@ api:
 i2c:
   sda: 21
   scl: 22
-  scan: False
+  scan: false
 
 spi:
   clk_pin: GPIO21
@@ -38,7 +39,7 @@ uart:
   baud_rate: 115200
 
 ota:
-  safe_mode: True
+  safe_mode: true
   port: 3286
 
 logger:
@@ -71,7 +72,7 @@ select:
       2: Both
 
 pipsolar:
-    id: inverter0
+  id: inverter0
 
 sx1509:
   - id: sx1509_hub
@@ -81,9 +82,9 @@ mcp3204:
   cs_pin: GPIO23
 
 dac7678:
-    address: 0x4A
-    id: dac7678_hub1
-    internal_reference: true
+  address: 0x4A
+  id: dac7678_hub1
+  internal_reference: true
 
 sensor:
   - platform: homeassistant
@@ -226,22 +227,22 @@ sensor:
     pv_charging_power:
       id: inverter0_pv_charging_power
       name: inverter0_pv_charging_power
-  - platform: "hrxl_maxsonar_wr"
-    name: "Rainwater Tank Level"
+  - platform: hrxl_maxsonar_wr
+    name: Rainwater Tank Level
     filters:
       - sliding_window_moving_average:
           window_size: 12
           send_every: 12
       - or:
-        - throttle: "20min"
-        - delta: 0.02
+          - throttle: 20min
+          - delta: 0.02
   - platform: mcp3204
-    name: "MCP3204 Pin 1"
+    name: MCP3204 Pin 1
     number: 1
     id: mcp_sensor
   - platform: copy
     source_id: mcp_sensor
-    name: "MCP binary sensor copy"
+    name: MCP binary sensor copy
 
 #
 # platform sensor.apds9960 requires component apds9960
@@ -321,15 +322,15 @@ binary_sensor:
       name: inverter0_backlight_on
   - platform: template
     id: ar1
-    lambda: 'return {};'
+    lambda: "return {};"
     filters:
       - autorepeat:
-        - delay: 2s
-          time_off: 100ms
-          time_on: 900ms
-        - delay: 4s
-          time_off: 100ms
-          time_on: 400ms
+          - delay: 2s
+            time_off: 100ms
+            time_on: 900ms
+          - delay: 4s
+            time_off: 100ms
+            time_on: 400ms
     on_state:
       then:
         - lambda: 'ESP_LOGI("ar1:", "%d", x);'
@@ -356,8 +357,7 @@ binary_sensor:
     y_min: 0
     y_max: 100
     on_press:
-      - logger.log: "Touched"
-
+      - logger.log: Touched
 
 climate:
   - platform: tuya
@@ -392,7 +392,7 @@ switch:
 light:
   - platform: fastled_clockless
     id: led_matrix_32x8
-    name: "led_matrix_32x8"
+    name: led_matrix_32x8
     chipset: WS2812B
     pin: GPIO15
     num_leds: 256
@@ -417,7 +417,7 @@ cover:
     position_datapoint: 2
   - platform: copy
     source_id: tuya_cover
-    name: "Tuya Cover copy"
+    name: Tuya Cover copy
 
 display:
   - platform: addressable_light
@@ -516,7 +516,7 @@ text_sensor:
       name: inverter0_last_qflag
   - platform: copy
     source_id: inverter0_device_mode
-    name: "Inverter Text Sensor Copy"
+    name: Inverter Text Sensor Copy
 
 output:
   - platform: pipsolar
@@ -524,37 +524,37 @@ output:
     battery_recharge_voltage:
       id: inverter0_battery_recharge_voltage_out
   - platform: dac7678
-    dac7678_id: 'dac7678_hub1'
+    dac7678_id: dac7678_hub1
     channel: 0
-    id: 'dac7678_1_ch0'
+    id: dac7678_1_ch0
   - platform: dac7678
-    dac7678_id: 'dac7678_hub1'
+    dac7678_id: dac7678_hub1
     channel: 1
-    id: 'dac7678_1_ch1'
+    id: dac7678_1_ch1
   - platform: dac7678
-    dac7678_id: 'dac7678_hub1'
+    dac7678_id: dac7678_hub1
     channel: 2
-    id: 'dac7678_1_ch2'
+    id: dac7678_1_ch2
   - platform: dac7678
-    dac7678_id: 'dac7678_hub1'
+    dac7678_id: dac7678_hub1
     channel: 3
-    id: 'dac7678_1_ch3'
+    id: dac7678_1_ch3
   - platform: dac7678
-    dac7678_id: 'dac7678_hub1'
+    dac7678_id: dac7678_hub1
     channel: 4
-    id: 'dac7678_1_ch4'
+    id: dac7678_1_ch4
   - platform: dac7678
-    dac7678_id: 'dac7678_hub1'
+    dac7678_id: dac7678_hub1
     channel: 5
-    id: 'dac7678_1_ch5'
+    id: dac7678_1_ch5
   - platform: dac7678
-    dac7678_id: 'dac7678_hub1'
+    dac7678_id: dac7678_hub1
     channel: 6
-    id: 'dac7678_1_ch6'
+    id: dac7678_1_ch6
   - platform: dac7678
-    dac7678_id: 'dac7678_hub1'
+    dac7678_id: dac7678_hub1
     channel: 7
-    id: 'dac7678_1_ch7'
+    id: dac7678_1_ch7
 esp32_camera:
   name: ESP-32 Camera
   data_pins: [GPIO17, GPIO35, GPIO34, GPIO5, GPIO39, GPIO18, GPIO36, GPIO19]
@@ -581,9 +581,9 @@ esp32_camera_web_server:
 external_components:
   - source: github://esphome/esphome@dev
     refresh: 1d
-    components: ["bh1750"]
+    components: [bh1750]
   - source: ../esphome/components
-    components: ["sntp"]
+    components: [sntp]
 xpt2046:
   id: xpt_touchscreen
   cs_pin: 17
@@ -597,8 +597,9 @@ xpt2046:
   calibration_x_max: 280
   calibration_y_min: 340
   calibration_y_max: 3860
-  swap_x_y: False
+  swap_x_y: false
   on_state:
+    # yamllint disable rule:line-length
     - lambda: |-
         ESP_LOGI("main", "args x=%d, y=%d, touched=%s", x, y, (touched ? "touch" : "release"));
         ESP_LOGI("main", "member x=%d, y=%d, touched=%d, x_raw=%d, y_raw=%d, z_raw=%d",
@@ -609,6 +610,7 @@ xpt2046:
             id(xpt_touchscreen).y_raw,
             id(xpt_touchscreen).z_raw
             );
+    # yamllint enable rule:line-length
 
 button:
   - platform: restart
@@ -622,7 +624,6 @@ button:
     source_id: shutdown_btn
     name: Shutdown Button Copy
 
-
 touchscreen:
   - platform: ektf2232
     interrupt_pin: GPIO36
@@ -631,7 +632,7 @@ touchscreen:
     on_touch:
       - logger.log:
           format: Touch at (%d, %d)
-          args: ["touch.x", "touch.y"]
+          args: [touch.x, touch.y]
 
   - platform: lilygo_t5_47
     id: lilygo_touchscreen
@@ -640,7 +641,7 @@ touchscreen:
     on_touch:
       - logger.log:
           format: Touch at (%d, %d)
-          args: ["touch.x", "touch.y"]
+          args: [touch.x, touch.y]
 
 media_player:
   - platform: i2s_audio
@@ -673,4 +674,4 @@ prometheus:
   relabel:
     ha_hello_world:
       id: hellow_world
-      name: "Hello World"
+      name: Hello World
diff --git a/tests/test5.yaml b/tests/test5.yaml
index c193009ead..3b6862a4d4 100644
--- a/tests/test5.yaml
+++ b/tests/test5.yaml
@@ -1,3 +1,4 @@
+---
 esphome:
   name: test5
   build_path: build/test5
@@ -60,8 +61,10 @@ mqtt:
     topic: testing/sensor/testing_sensor/state
     qos: 0
     then:
+      # yamllint disable rule:line-length
       - lambda: |-
-          ESP_LOGD("Mqtt Test","testing/sensor/testing_sensor/state=[%s]",x.c_str());
+          ESP_LOGD("Mqtt Test", "testing/sensor/testing_sensor/state=[%s]", x.c_str());
+      # yamllint enable rule:line-length
 
 binary_sensor:
   - platform: gpio
@@ -74,8 +77,8 @@ binary_sensor:
     id: modbus_binsensortest
     register_type: read
     address: 0x3200
-    bitmask: 0x80 #(bit 8)
-    lambda: !lambda "{ return x ;}"
+    bitmask: 0x80  # (bit 8)
+    lambda: "return x;"
 
 tlc5947:
   data_pin: GPIO12
@@ -108,8 +111,8 @@ demo:
 esp32_ble:
 
 esp32_ble_server:
-  manufacturer: "ESPHome"
-  model: "Test5"
+  manufacturer: ESPHome
+  model: Test5
 
 esp32_improv:
   authorizer: io0_button
@@ -128,12 +131,12 @@ number:
     mode: slider
     on_value:
       - logger.log:
-          format: "Number changed to %f"
-          args: ["x"]
+          format: Number changed to %f
+          args: [x]
     set_action:
       - logger.log:
-          format: "Template Number set to %f"
-          args: ["x"]
+          format: Template Number set to %f
+          args: [x]
       - number.set:
           id: template_number_id
           value: 50
@@ -163,10 +166,10 @@ number:
   - id: modbus_numbertest
     platform: modbus_controller
     modbus_controller_id: modbus_controller_test
-    name: "ModbusNumber"
+    name: ModbusNumber
     address: 0x9002
     value_type: U_WORD
-    lambda: "return  x * 1.0; "
+    lambda: "return  x * 1.0;"
     write_lambda: |-
       return x * 1.0 ;
     multiply: 1.0
@@ -180,11 +183,11 @@ select:
     restore_value: true
     on_value:
       - logger.log:
-          format: "Select changed to %s (index %d)"
+          format: Select changed to %s (index %d)"
           args: ["x.c_str()", "i"]
     set_action:
       - logger.log:
-          format: "Template Select set to %s"
+          format: Template Select set to %s
           args: ["x.c_str()"]
       - select.set:
           id: template_select_id
@@ -216,7 +219,7 @@ select:
       - three
 
   - platform: modbus_controller
-    name: "Modbus Select Register 1000"
+    name: Modbus Select Register 1000
     address: 1000
     value_type: U_WORD
     optionsmap:
@@ -228,41 +231,41 @@ select:
 sensor:
   - platform: selec_meter
     total_active_energy:
-      name: "SelecEM2M Total Active Energy"
+      name: SelecEM2M Total Active Energy
     import_active_energy:
-      name: "SelecEM2M Import Active Energy"
+      name: SelecEM2M Import Active Energy
     export_active_energy:
-      name: "SelecEM2M Export Active Energy"
+      name: SelecEM2M Export Active Energy
     total_reactive_energy:
-      name: "SelecEM2M Total Reactive Energy"
+      name: SelecEM2M Total Reactive Energy
     import_reactive_energy:
-      name: "SelecEM2M Import Reactive Energy"
+      name: SelecEM2M Import Reactive Energy
     export_reactive_energy:
-      name: "SelecEM2M Export Reactive Energy"
+      name: SelecEM2M Export Reactive Energy
     apparent_energy:
-      name: "SelecEM2M Apparent Energy"
+      name: SelecEM2M Apparent Energy
     active_power:
-      name: "SelecEM2M Active Power"
+      name: SelecEM2M Active Power
     reactive_power:
-      name: "SelecEM2M Reactive Power"
+      name: SelecEM2M Reactive Power
     apparent_power:
-      name: "SelecEM2M Apparent Power"
+      name: SelecEM2M Apparent Power
     voltage:
-      name: "SelecEM2M Voltage"
+      name: SelecEM2M Voltage
     current:
-      name: "SelecEM2M Current"
+      name: SelecEM2M Current
     power_factor:
-      name: "SelecEM2M Power Factor"
+      name: SelecEM2M Power Factor
     frequency:
-      name: "SelecEM2M Frequency"
+      name: SelecEM2M Frequency
     maximum_demand_active_power:
-      name: "SelecEM2M Maximum Demand Active Power"
+      name: SelecEM2M Maximum Demand Active Power
       disabled_by_default: true
     maximum_demand_reactive_power:
-      name: "SelecEM2M Maximum Demand Reactive Power"
+      name: SelecEM2M Maximum Demand Reactive Power
       disabled_by_default: true
     maximum_demand_apparent_power:
-      name: "SelecEM2M Maximum Demand Apparent Power"
+      name: SelecEM2M Maximum Demand Apparent Power
       disabled_by_default: true
 
   - id: modbus_sensortest
@@ -279,41 +282,41 @@ sensor:
 
   - platform: bmp3xx
     temperature:
-      name: "BMP Temperature"
+      name: BMP Temperature
       oversampling: 16x
     pressure:
-      name: "BMP Pressure"
+      name: BMP Pressure
     address: 0x77
     iir_filter: 2X
 
   - platform: sen5x
     id: sen54
     temperature:
-      name: "Temperature"
+      name: Temperature
       accuracy_decimals: 1
     humidity:
-      name: "Humidity"
+      name: Humidity
       accuracy_decimals: 0
     pm_1_0:
-      name: " PM <1µm Weight concentration"
+      name: PM <1µm Weight concentration
       id: pm_1_0
       accuracy_decimals: 1
     pm_2_5:
-      name: " PM <2.5µm Weight concentration"
+      name: PM <2.5µm Weight concentration
       id: pm_2_5
       accuracy_decimals: 1
     pm_4_0:
-      name: " PM <4µm Weight concentration"
+      name: PM <4µm Weight concentration
       id: pm_4_0
       accuracy_decimals: 1
     pm_10_0:
-      name: " PM <10µm Weight concentration"
+      name: PM <10µm Weight concentration
       id: pm_10_0
       accuracy_decimals: 1
     nox:
-      name: "NOx"
+      name: NOx
     voc:
-      name: "VOC"
+      name: VOC
       algorithm_tuning:
         index_offset: 100
         learning_time_offset_hours: 12
@@ -332,9 +335,9 @@ sensor:
   - platform: mcp9600
     thermocouple_type: K
     hot_junction:
-      name: "Thermocouple Temperature"
+      name: Thermocouple Temperature
     cold_junction:
-      name: "Ambient Temperature"
+      name: Ambient Temperature
 
 script:
   - id: automation_test
@@ -342,7 +345,7 @@ script:
       - repeat:
           count: 5
           then:
-            - logger.log: "looping!"
+            - logger.log: looping!
 
 switch:
   - platform: modbus_controller
diff --git a/tests/test_packages/test_packages_package1.yaml b/tests/test_packages/test_packages_package1.yaml
index 0495984d42..312bbe574a 100644
--- a/tests/test_packages/test_packages_package1.yaml
+++ b/tests/test_packages/test_packages_package1.yaml
@@ -1,2 +1,3 @@
+---
 sensor:
   - <<: !include ./test_uptime_sensor.yaml
diff --git a/tests/test_packages/test_packages_package_wifi.yaml b/tests/test_packages/test_packages_package_wifi.yaml
index 7d5d41ddab..a8c610edfd 100644
--- a/tests/test_packages/test_packages_package_wifi.yaml
+++ b/tests/test_packages/test_packages_package_wifi.yaml
@@ -1,4 +1,5 @@
+---
 wifi:
   networks:
-  - ssid: 'WiFiFromPackage'
-    password: 'password1'
+    - ssid: "WiFiFromPackage"
+      password: "password1"
diff --git a/tests/test_packages/test_uptime_sensor.yaml b/tests/test_packages/test_uptime_sensor.yaml
index 1bf52a6d0b..f15d968fee 100644
--- a/tests/test_packages/test_uptime_sensor.yaml
+++ b/tests/test_packages/test_uptime_sensor.yaml
@@ -1,3 +1,4 @@
+---
 # Uptime sensor.
 platform: uptime
 id: ${devicename}_uptime_pcg
diff --git a/tests/unit_tests/fixtures/yaml_util/includes/scalar.yaml b/tests/unit_tests/fixtures/yaml_util/includes/scalar.yaml
index ddd2156b5e..89879248aa 100644
--- a/tests/unit_tests/fixtures/yaml_util/includes/scalar.yaml
+++ b/tests/unit_tests/fixtures/yaml_util/includes/scalar.yaml
@@ -1 +1,2 @@
+---
 ${var1}
diff --git a/tests/unit_tests/fixtures/yaml_util/includetest.yaml b/tests/unit_tests/fixtures/yaml_util/includetest.yaml
index 959283df60..af0a4e2030 100644
--- a/tests/unit_tests/fixtures/yaml_util/includetest.yaml
+++ b/tests/unit_tests/fixtures/yaml_util/includetest.yaml
@@ -8,10 +8,11 @@ wifi: !include
     name: my_custom_ssid
 
 esphome:
-  # should be substituted as 'original', not overwritten by vars in the !include above
+  # should be substituted as 'original',
+  # not overwritten by vars in the !include above
   name: ${name}
   name_add_mac_suffix: true
   platform: esp8266
-  board: !include { file: includes/scalar.yaml, vars: { var1: nodemcu } }
+  board: !include {file: includes/scalar.yaml, vars: {var1: nodemcu}}
 
-  libraries: !include { file: includes/list.yaml, vars: { var1: Wire } }
+  libraries: !include {file: includes/list.yaml, vars: {var1: Wire}}

From 635851807a660d401f60990520906d426e3bb6bc Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 6 Sep 2022 16:41:23 +1200
Subject: [PATCH 043/838] Fix HA addon auth using HA credentials (#3758)

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

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index e7a17cba4c..889f5cc0bf 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -816,15 +816,16 @@ class LoginHandler(BaseHandler):
         import requests
 
         headers = {
-            "Authentication": f"Bearer {os.getenv('SUPERVISOR_TOKEN')}",
+            "X-Supervisor-Token": os.getenv("SUPERVISOR_TOKEN"),
         }
+
         data = {
             "username": self.get_argument("username", ""),
             "password": self.get_argument("password", ""),
         }
         try:
             req = requests.post(
-                "http://supervisor/auth", headers=headers, data=data, timeout=30
+                "http://supervisor/auth", headers=headers, json=data, timeout=30
             )
             if req.status_code == 200:
                 self.set_secure_cookie("authenticated", cookie_authenticated_yes)

From acd0b50b40115d63cc345b3211ad551cee764307 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 6 Sep 2022 16:41:23 +1200
Subject: [PATCH 044/838] Fix HA addon auth using HA credentials (#3758)

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

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 1fadac968d..21730033a5 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -816,14 +816,17 @@ class LoginHandler(BaseHandler):
         import requests
 
         headers = {
-            "Authentication": f"Bearer {os.getenv('SUPERVISOR_TOKEN')}",
+            "X-Supervisor-Token": os.getenv("SUPERVISOR_TOKEN"),
         }
+
         data = {
             "username": self.get_argument("username", ""),
             "password": self.get_argument("password", ""),
         }
         try:
-            req = requests.post("http://supervisor/auth", headers=headers, data=data)
+            req = requests.post(
+                "http://supervisor/auth", headers=headers, json=data, timeout=30
+            )
             if req.status_code == 200:
                 self.set_secure_cookie("authenticated", cookie_authenticated_yes)
                 self.redirect("/")

From 733a84df7515019c20cf660139737c3a4818966f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 6 Sep 2022 16:50:17 +1200
Subject: [PATCH 045/838] Bump version to 2022.8.3

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

diff --git a/esphome/const.py b/esphome/const.py
index 7d916e30af..d65aea7159 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.8.2"
+__version__ = "2022.8.3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From f77118a90cf7e0cad80fd226b59db0a1ca7f7408 Mon Sep 17 00:00:00 2001
From: Philippe FOUQUET <ph.fouquet@gmail.com>
Date: Thu, 8 Sep 2022 01:40:27 +0200
Subject: [PATCH 046/838] Add support to tm1621 display (#3737)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                            |   1 +
 esphome/components/tm1621/__init__.py |   1 +
 esphome/components/tm1621/display.py  |  47 +++++
 esphome/components/tm1621/tm1621.cpp  | 283 ++++++++++++++++++++++++++
 esphome/components/tm1621/tm1621.h    |  74 +++++++
 esphome/const.py                      |   2 +
 tests/test1.yaml                      |  13 ++
 7 files changed, 421 insertions(+)
 create mode 100644 esphome/components/tm1621/__init__.py
 create mode 100644 esphome/components/tm1621/display.py
 create mode 100644 esphome/components/tm1621/tm1621.cpp
 create mode 100644 esphome/components/tm1621/tm1621.h

diff --git a/CODEOWNERS b/CODEOWNERS
index ae112b3330..f8efe79c81 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -225,6 +225,7 @@ esphome/components/teleinfo/* @0hax
 esphome/components/thermostat/* @kbx81
 esphome/components/time/* @OttoWinter
 esphome/components/tlc5947/* @rnauber
+esphome/components/tm1621/* @Philippe12
 esphome/components/tm1637/* @glmnet
 esphome/components/tmp102/* @timsavage
 esphome/components/tmp117/* @Azimath
diff --git a/esphome/components/tm1621/__init__.py b/esphome/components/tm1621/__init__.py
new file mode 100644
index 0000000000..2e88d4f366
--- /dev/null
+++ b/esphome/components/tm1621/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@Philippe12"]
diff --git a/esphome/components/tm1621/display.py b/esphome/components/tm1621/display.py
new file mode 100644
index 0000000000..edbc5f6928
--- /dev/null
+++ b/esphome/components/tm1621/display.py
@@ -0,0 +1,47 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import display
+from esphome.const import (
+    CONF_DATA_PIN,
+    CONF_CS_PIN,
+    CONF_ID,
+    CONF_LAMBDA,
+    CONF_READ_PIN,
+    CONF_WRITE_PIN,
+)
+
+tm1621_ns = cg.esphome_ns.namespace("tm1621")
+TM1621Display = tm1621_ns.class_("TM1621Display", cg.PollingComponent)
+TM1621DisplayRef = TM1621Display.operator("ref")
+
+CONFIG_SCHEMA = display.BASIC_DISPLAY_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(TM1621Display),
+        cv.Required(CONF_CS_PIN): pins.gpio_output_pin_schema,
+        cv.Required(CONF_DATA_PIN): pins.gpio_output_pin_schema,
+        cv.Required(CONF_READ_PIN): pins.gpio_output_pin_schema,
+        cv.Required(CONF_WRITE_PIN): pins.gpio_output_pin_schema,
+    }
+).extend(cv.polling_component_schema("1s"))
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await display.register_display(var, config)
+
+    cs = await cg.gpio_pin_expression(config[CONF_CS_PIN])
+    cg.add(var.set_cs_pin(cs))
+    data = await cg.gpio_pin_expression(config[CONF_DATA_PIN])
+    cg.add(var.set_data_pin(data))
+    read = await cg.gpio_pin_expression(config[CONF_READ_PIN])
+    cg.add(var.set_read_pin(read))
+    write = await cg.gpio_pin_expression(config[CONF_WRITE_PIN])
+    cg.add(var.set_write_pin(write))
+
+    if CONF_LAMBDA in config:
+        lambda_ = await cg.process_lambda(
+            config[CONF_LAMBDA], [(TM1621DisplayRef, "it")], return_type=cg.void
+        )
+        cg.add(var.set_writer(lambda_))
diff --git a/esphome/components/tm1621/tm1621.cpp b/esphome/components/tm1621/tm1621.cpp
new file mode 100644
index 0000000000..ebaa5a3457
--- /dev/null
+++ b/esphome/components/tm1621/tm1621.cpp
@@ -0,0 +1,283 @@
+#include "tm1621.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/hal.h"
+
+namespace esphome {
+namespace tm1621 {
+
+static const char *const TAG = "tm1621";
+
+const uint8_t TM1621_PULSE_WIDTH = 10;  // microseconds (Sonoff = 100)
+
+const uint8_t TM1621_SYS_EN = 0x01;     // 0b00000001
+const uint8_t TM1621_LCD_ON = 0x03;     // 0b00000011
+const uint8_t TM1621_TIMER_DIS = 0x04;  // 0b00000100
+const uint8_t TM1621_WDT_DIS = 0x05;    // 0b00000101
+const uint8_t TM1621_TONE_OFF = 0x08;   // 0b00001000
+const uint8_t TM1621_BIAS = 0x29;       // 0b00101001 = LCD 1/3 bias 4 commons option
+const uint8_t TM1621_IRQ_DIS = 0x80;    // 0b100x0xxx
+
+enum Tm1621Device { TM1621_USER, TM1621_POWR316D, TM1621_THR316D };
+
+const uint8_t TM1621_COMMANDS[] = {TM1621_SYS_EN,  TM1621_LCD_ON,   TM1621_BIAS,   TM1621_TIMER_DIS,
+                                   TM1621_WDT_DIS, TM1621_TONE_OFF, TM1621_IRQ_DIS};
+
+const char TM1621_KCHAR[] PROGMEM = {"0|1|2|3|4|5|6|7|8|9|-| "};
+//                                          0     1     2     3     4     5     6     7     8     9     -     off
+const uint8_t TM1621_DIGIT_ROW[2][12] = {{0x5F, 0x50, 0x3D, 0x79, 0x72, 0x6B, 0x6F, 0x51, 0x7F, 0x7B, 0x20, 0x00},
+                                         {0xF5, 0x05, 0xB6, 0x97, 0x47, 0xD3, 0xF3, 0x85, 0xF7, 0xD7, 0x02, 0x00}};
+
+void TM1621Display::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up TM1621...");
+
+  this->cs_pin_->setup();  // OUTPUT
+  this->cs_pin_->digital_write(true);
+  this->data_pin_->setup();  // OUTPUT
+  this->data_pin_->digital_write(true);
+  this->read_pin_->setup();  // OUTPUT
+  this->read_pin_->digital_write(true);
+  this->write_pin_->setup();  // OUTPUT
+  this->write_pin_->digital_write(true);
+
+  this->state_ = 100;
+
+  this->cs_pin_->digital_write(false);
+  delayMicroseconds(80);
+  this->read_pin_->digital_write(false);
+  delayMicroseconds(15);
+  this->write_pin_->digital_write(false);
+  delayMicroseconds(25);
+  this->data_pin_->digital_write(false);
+  delayMicroseconds(TM1621_PULSE_WIDTH);
+  this->data_pin_->digital_write(true);
+
+  for (uint8_t tm1621_command : TM1621_COMMANDS) {
+    this->send_command_(tm1621_command);
+  }
+
+  this->send_address_(0x00);
+  for (uint32_t segment = 0; segment < 16; segment++) {
+    this->send_common_(0);
+  }
+  this->stop_();
+
+  snprintf(this->row_[0], sizeof(this->row_[0]), "----");
+  snprintf(this->row_[1], sizeof(this->row_[1]), "----");
+
+  this->display();
+}
+void TM1621Display::dump_config() {
+  ESP_LOGCONFIG(TAG, "TM1621:");
+  LOG_PIN("  CS Pin: ", this->cs_pin_);
+  LOG_PIN("  DATA Pin: ", this->data_pin_);
+  LOG_PIN("  READ Pin: ", this->read_pin_);
+  LOG_PIN("  WRITE Pin: ", this->write_pin_);
+  LOG_UPDATE_INTERVAL(this);
+}
+
+void TM1621Display::update() {
+  // memset(this->row, 0, sizeof(this->row));
+  if (this->writer_.has_value())
+    (*this->writer_)(*this);
+  this->display();
+}
+
+float TM1621Display::get_setup_priority() const { return setup_priority::PROCESSOR; }
+void TM1621Display::bit_delay_() { delayMicroseconds(100); }
+
+void TM1621Display::stop_() {
+  this->cs_pin_->digital_write(true);  // Stop command sequence
+  delayMicroseconds(TM1621_PULSE_WIDTH / 2);
+  this->data_pin_->digital_write(true);  // Reset data
+}
+
+void TM1621Display::display() {
+  // Tm1621.row[x] = "text", "----", "    " or a number with one decimal like "0.4", "237.5", "123456.7"
+  // "123456.7" will be shown as "9999" being a four digit overflow
+
+  // AddLog(LOG_LEVEL_DEBUG, PSTR("TM1: Row1 '%s', Row2 '%s'"), Tm1621.row[0], Tm1621.row[1]);
+
+  uint8_t buffer[8] = {0};  // TM1621 16-segment 4-bit common buffer
+  char row[4];
+  for (uint32_t j = 0; j < 2; j++) {
+    // 0.4V => "  04", 0.0A => "  ", 1234.5V => "1234"
+    uint32_t len = strlen(this->row_[j]);
+    char *dp = nullptr;     // Expect number larger than "123"
+    int row_idx = len - 3;  // "1234.5"
+    if (len <= 5) {         // "----", "    ", "0.4", "237.5"
+      dp = strchr(this->row_[j], '.');
+      row_idx = len - 1;
+    } else if (len > 6) {  // "12345.6"
+      snprintf(this->row_[j], sizeof(this->row_[j]), "9999");
+      row_idx = 3;
+    }
+    row[3] = (row_idx >= 0) ? this->row_[j][row_idx--] : ' ';
+    if ((row_idx >= 0) && dp) {
+      row_idx--;
+    }
+    row[2] = (row_idx >= 0) ? this->row_[j][row_idx--] : ' ';
+    row[1] = (row_idx >= 0) ? this->row_[j][row_idx--] : ' ';
+    row[0] = (row_idx >= 0) ? this->row_[j][row_idx--] : ' ';
+
+    //    AddLog(LOG_LEVEL_DEBUG, PSTR("TM1: Dump%d %4_H"), j +1, row);
+
+    char command[10];
+    char needle[2] = {0};
+    for (uint32_t i = 0; i < 4; i++) {
+      needle[0] = row[i];
+      int index = this->get_command_code_(command, sizeof(command), (const char *) needle, TM1621_KCHAR);
+      if (-1 == index) {
+        index = 11;
+      }
+      uint32_t bidx = (0 == j) ? i : 7 - i;
+      buffer[bidx] = TM1621_DIGIT_ROW[j][index];
+    }
+    if (dp) {
+      if (0 == j) {
+        buffer[2] |= 0x80;  // Row 1 decimal point
+      } else {
+        buffer[5] |= 0x08;  // Row 2 decimal point
+      }
+    }
+  }
+
+  if (this->fahrenheit_) {
+    buffer[1] |= 0x80;
+  }
+  if (this->celsius_) {
+    buffer[3] |= 0x80;
+  }
+  if (this->kwh_) {
+    buffer[4] |= 0x08;
+  }
+  if (this->humidity_) {
+    buffer[6] |= 0x08;
+  }
+  if (this->voltage_) {
+    buffer[7] |= 0x08;
+  }
+
+  //  AddLog(LOG_LEVEL_DEBUG, PSTR("TM1: Dump3 %8_H"), buffer);
+
+  this->send_address_(0x10);  // Sonoff only uses the upper 16 Segments
+  for (uint8_t i : buffer) {
+    this->send_common_(i);
+  }
+  this->stop_();
+}
+
+bool TM1621Display::send_command_(uint16_t command) {
+  uint16_t full_command = (0x0400 | command) << 5;  // 0b100cccccccc00000
+  this->cs_pin_->digital_write(false);              // Start command sequence
+  delayMicroseconds(TM1621_PULSE_WIDTH / 2);
+  for (uint32_t i = 0; i < 12; i++) {
+    this->write_pin_->digital_write(false);  // Start write sequence
+    if (full_command & 0x8000) {
+      this->data_pin_->digital_write(true);  // Set data
+    } else {
+      this->data_pin_->digital_write(false);  // Set data
+    }
+    delayMicroseconds(TM1621_PULSE_WIDTH);
+    this->write_pin_->digital_write(true);  // Read data
+    delayMicroseconds(TM1621_PULSE_WIDTH);
+    full_command <<= 1;
+  }
+  this->stop_();
+  return true;
+}
+
+bool TM1621Display::send_common_(uint8_t common) {
+  for (uint32_t i = 0; i < 8; i++) {
+    this->write_pin_->digital_write(false);  // Start write sequence
+    if (common & 1) {
+      this->data_pin_->digital_write(true);  // Set data
+    } else {
+      this->data_pin_->digital_write(false);  // Set data
+    }
+    delayMicroseconds(TM1621_PULSE_WIDTH);
+    this->write_pin_->digital_write(true);  // Read data
+    delayMicroseconds(TM1621_PULSE_WIDTH);
+    common >>= 1;
+  }
+  return true;
+}
+
+bool TM1621Display::send_address_(uint16_t address) {
+  uint16_t full_address = (address | 0x0140) << 7;  // 0b101aaaaaa0000000
+  this->cs_pin_->digital_write(false);              // Start command sequence
+  delayMicroseconds(TM1621_PULSE_WIDTH / 2);
+  for (uint32_t i = 0; i < 9; i++) {
+    this->write_pin_->digital_write(false);  // Start write sequence
+    if (full_address & 0x8000) {
+      this->data_pin_->digital_write(true);  // Set data
+    } else {
+      this->data_pin_->digital_write(false);  // Set data
+    }
+    delayMicroseconds(TM1621_PULSE_WIDTH);
+    this->write_pin_->digital_write(true);  // Read data
+    delayMicroseconds(TM1621_PULSE_WIDTH);
+    full_address <<= 1;
+  }
+  return true;
+}
+
+uint8_t TM1621Display::print(uint8_t start_pos, const char *str) {
+  // ESP_LOGD(TAG, "Print at %d: %s", start_pos, str);
+  return snprintf(this->row_[start_pos], sizeof(this->row_[start_pos]), "%s", str);
+}
+uint8_t TM1621Display::print(const char *str) { return this->print(0, str); }
+uint8_t TM1621Display::printf(uint8_t pos, const char *format, ...) {
+  va_list arg;
+  va_start(arg, format);
+  char buffer[64];
+  int ret = vsnprintf(buffer, sizeof(buffer), format, arg);
+  va_end(arg);
+  if (ret > 0)
+    return this->print(pos, buffer);
+  return 0;
+}
+uint8_t TM1621Display::printf(const char *format, ...) {
+  va_list arg;
+  va_start(arg, format);
+  char buffer[64];
+  int ret = vsnprintf(buffer, sizeof(buffer), format, arg);
+  va_end(arg);
+  if (ret > 0)
+    return this->print(buffer);
+  return 0;
+}
+
+int TM1621Display::get_command_code_(char *destination, size_t destination_size, const char *needle,
+                                     const char *haystack) {
+  // Returns -1 of not found
+  // Returns index and command if found
+  int result = -1;
+  const char *read = haystack;
+  char *write = destination;
+
+  while (true) {
+    result++;
+    size_t size = destination_size - 1;
+    write = destination;
+    char ch = '.';
+    while ((ch != '\0') && (ch != '|')) {
+      ch = *(read++);
+      if (size && (ch != '|')) {
+        *write++ = ch;
+        size--;
+      }
+    }
+    *write = '\0';
+    if (!strcasecmp(needle, destination)) {
+      break;
+    }
+    if (0 == ch) {
+      result = -1;
+      break;
+    }
+  }
+  return result;
+}
+}  // namespace tm1621
+}  // namespace esphome
diff --git a/esphome/components/tm1621/tm1621.h b/esphome/components/tm1621/tm1621.h
new file mode 100644
index 0000000000..b9f330e96e
--- /dev/null
+++ b/esphome/components/tm1621/tm1621.h
@@ -0,0 +1,74 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/defines.h"
+#include "esphome/core/hal.h"
+
+namespace esphome {
+namespace tm1621 {
+
+class TM1621Display;
+
+using tm1621_writer_t = std::function<void(TM1621Display &)>;
+
+class TM1621Display : public PollingComponent {
+ public:
+  void set_writer(tm1621_writer_t &&writer) { this->writer_ = writer; }
+
+  void setup() override;
+
+  void dump_config() override;
+
+  void set_cs_pin(GPIOPin *pin) { cs_pin_ = pin; }
+  void set_data_pin(GPIOPin *pin) { data_pin_ = pin; }
+  void set_read_pin(GPIOPin *pin) { read_pin_ = pin; }
+  void set_write_pin(GPIOPin *pin) { write_pin_ = pin; }
+
+  void display_celsius(bool d) { celsius_ = d; }
+  void display_fahrenheit(bool d) { fahrenheit_ = d; }
+  void display_humidity(bool d) { humidity_ = d; }
+  void display_voltage(bool d) { voltage_ = d; }
+  void display_kwh(bool d) { kwh_ = d; }
+
+  float get_setup_priority() const override;
+
+  void update() override;
+
+  /// Evaluate the printf-format and print the result at the given position.
+  uint8_t printf(uint8_t pos, const char *format, ...) __attribute__((format(printf, 3, 4)));
+  /// Evaluate the printf-format and print the result at position 0.
+  uint8_t printf(const char *format, ...) __attribute__((format(printf, 2, 3)));
+
+  /// Print `str` at the given position.
+  uint8_t print(uint8_t pos, const char *str);
+  /// Print `str` at position 0.
+  uint8_t print(const char *str);
+
+  void display();
+
+ protected:
+  void bit_delay_();
+  void setup_pins_();
+  bool send_command_(uint16_t command);
+  bool send_common_(uint8_t common);
+  bool send_address_(uint16_t address);
+  void stop_();
+  int get_command_code_(char *destination, size_t destination_size, const char *needle, const char *haystack);
+
+  GPIOPin *data_pin_;
+  GPIOPin *cs_pin_;
+  GPIOPin *read_pin_;
+  GPIOPin *write_pin_;
+  optional<tm1621_writer_t> writer_{};
+  char row_[2][12];
+  uint8_t state_;
+  uint8_t device_;
+  bool celsius_;
+  bool fahrenheit_;
+  bool humidity_;
+  bool voltage_;
+  bool kwh_;
+};
+
+}  // namespace tm1621
+}  // namespace esphome
diff --git a/esphome/const.py b/esphome/const.py
index 8245ed26f7..adbd20c620 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -558,6 +558,7 @@ CONF_RAW_DATA_ID = "raw_data_id"
 CONF_RC_CODE_1 = "rc_code_1"
 CONF_RC_CODE_2 = "rc_code_2"
 CONF_REACTIVE_POWER = "reactive_power"
+CONF_READ_PIN = "read_pin"
 CONF_REBOOT_TIMEOUT = "reboot_timeout"
 CONF_RECEIVE_TIMEOUT = "receive_timeout"
 CONF_RED = "red"
@@ -769,6 +770,7 @@ CONF_WILL_MESSAGE = "will_message"
 CONF_WIND_DIRECTION_DEGREES = "wind_direction_degrees"
 CONF_WIND_SPEED = "wind_speed"
 CONF_WINDOW_SIZE = "window_size"
+CONF_WRITE_PIN = "write_pin"
 CONF_X_GRID = "x_grid"
 CONF_Y_GRID = "y_grid"
 CONF_ZERO = "zero"
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 274b25548b..20209923aa 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -547,8 +547,10 @@ sensor:
   - platform: dht
     pin: GPIO26
     temperature:
+      id: dht_temperature
       name: Living Room Temperature 3
     humidity:
+      id: dht_humidity
       name: Living Room Humidity 3
     model: AM2302
     update_interval: 15s
@@ -2514,6 +2516,17 @@ display:
       it.print_sad(true);
       it.print_bracket(true);
       it.print_battery(true);
+  - platform: tm1621
+    id: tm1621_display
+    cs_pin: GPIO17
+    data_pin: GPIO5
+    read_pin: GPIO23
+    write_pin: GPIO18
+    lambda: |-
+      it.printf(0, "%.1f", id(dht_temperature).state);
+      it.display_celsius(true);
+      it.printf(1, "%.1f", id(dht_humidity).state);
+      it.display_humidity(true);
 
 tm1651:
   id: tm1651_battery

From e3f2562047847cd849ccd05674929bf2c2238f6f Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Thu, 8 Sep 2022 12:30:07 +0200
Subject: [PATCH 047/838] u-fire EC sensor (#3774)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                               |   1 +
 esphome/components/ufire_ec/__init__.py  |   1 +
 esphome/components/ufire_ec/sensor.py    | 126 +++++++++++++++++++++++
 esphome/components/ufire_ec/ufire_ec.cpp | 119 +++++++++++++++++++++
 esphome/components/ufire_ec/ufire_ec.h   |  87 ++++++++++++++++
 esphome/const.py                         |   2 +
 tests/test2.yaml                         |   7 ++
 tests/test4.yaml                         |   8 ++
 8 files changed, 351 insertions(+)
 create mode 100644 esphome/components/ufire_ec/__init__.py
 create mode 100644 esphome/components/ufire_ec/sensor.py
 create mode 100644 esphome/components/ufire_ec/ufire_ec.cpp
 create mode 100644 esphome/components/ufire_ec/ufire_ec.h

diff --git a/CODEOWNERS b/CODEOWNERS
index f8efe79c81..ff497c35ec 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -241,6 +241,7 @@ esphome/components/tuya/sensor/* @jesserockz
 esphome/components/tuya/switch/* @jesserockz
 esphome/components/tuya/text_sensor/* @dentra
 esphome/components/uart/* @esphome/core
+esphome/components/ufire_ec/* @pvizeli
 esphome/components/ultrasonic/* @OttoWinter
 esphome/components/version/* @esphome/core
 esphome/components/wake_on_lan/* @willwill2will54
diff --git a/esphome/components/ufire_ec/__init__.py b/esphome/components/ufire_ec/__init__.py
new file mode 100644
index 0000000000..08f36c7934
--- /dev/null
+++ b/esphome/components/ufire_ec/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@pvizeli"]
diff --git a/esphome/components/ufire_ec/sensor.py b/esphome/components/ufire_ec/sensor.py
new file mode 100644
index 0000000000..9602d0c2d0
--- /dev/null
+++ b/esphome/components/ufire_ec/sensor.py
@@ -0,0 +1,126 @@
+import esphome.codegen as cg
+from esphome import automation
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import (
+    CONF_ID,
+    CONF_EC,
+    CONF_TEMPERATURE,
+    DEVICE_CLASS_EMPTY,
+    DEVICE_CLASS_TEMPERATURE,
+    ICON_EMPTY,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_CELSIUS,
+    UNIT_MILLISIEMENS_PER_CENTIMETER,
+)
+
+DEPENDENCIES = ["i2c"]
+
+CONF_SOLUTION = "solution"
+CONF_TEMPERATURE_SENSOR = "temperature_sensor"
+CONF_TEMPERATURE_COMPENSATION = "temperature_compensation"
+CONF_TEMPERATURE_COEFFICIENT = "temperature_coefficient"
+
+ufire_ec_ns = cg.esphome_ns.namespace("ufire_ec")
+UFireECComponent = ufire_ec_ns.class_(
+    "UFireECComponent", cg.PollingComponent, i2c.I2CDevice
+)
+
+# Actions
+UFireECCalibrateProbeAction = ufire_ec_ns.class_(
+    "UFireECCalibrateProbeAction", automation.Action
+)
+UFireECResetAction = ufire_ec_ns.class_("UFireECResetAction", automation.Action)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(UFireECComponent),
+            cv.Exclusive(CONF_TEMPERATURE, "temperature"): sensor.sensor_schema(
+                unit_of_measurement=UNIT_CELSIUS,
+                device_class=DEVICE_CLASS_TEMPERATURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+                accuracy_decimals=1,
+            ),
+            cv.Optional(CONF_EC): sensor.sensor_schema(
+                unit_of_measurement=UNIT_MILLISIEMENS_PER_CENTIMETER,
+                icon=ICON_EMPTY,
+                device_class=DEVICE_CLASS_EMPTY,
+                state_class=STATE_CLASS_MEASUREMENT,
+                accuracy_decimals=1,
+            ),
+            cv.Exclusive(CONF_TEMPERATURE_SENSOR, "temperature"): cv.use_id(
+                sensor.Sensor
+            ),
+            cv.Optional(CONF_TEMPERATURE_COMPENSATION, default=21.0): cv.temperature,
+            cv.Optional(CONF_TEMPERATURE_COEFFICIENT, default=0.019): cv.float_range(
+                min=0.01, max=0.04
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x3C))
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    cg.add(var.set_temperature_compensation(config[CONF_TEMPERATURE_COMPENSATION]))
+    cg.add(var.set_temperature_coefficient(config[CONF_TEMPERATURE_COEFFICIENT]))
+
+    if CONF_TEMPERATURE in config:
+        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
+        cg.add(var.set_temperature_sensor(sens))
+
+    if CONF_EC in config:
+        sens = await sensor.new_sensor(config[CONF_EC])
+        cg.add(var.set_ec_sensor(sens))
+
+    if CONF_TEMPERATURE_SENSOR in config:
+        sens = await cg.get_variable(config[CONF_TEMPERATURE_SENSOR])
+        cg.add(var.set_temperature_sensor_external(sens))
+
+    await i2c.register_i2c_device(var, config)
+
+
+UFIRE_EC_CALIBRATE_PROBE_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.use_id(UFireECComponent),
+        cv.Required(CONF_SOLUTION): cv.templatable(float),
+        cv.Required(CONF_TEMPERATURE): cv.templatable(cv.temperature),
+    }
+)
+
+
+@automation.register_action(
+    "ufire_ec.calibrate_probe",
+    UFireECCalibrateProbeAction,
+    UFIRE_EC_CALIBRATE_PROBE_SCHEMA,
+)
+async def ufire_ec_calibrate_probe_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)
+    solution_ = await cg.templatable(config[CONF_SOLUTION], args, float)
+    temperature_ = await cg.templatable(config[CONF_TEMPERATURE], args, float)
+    cg.add(var.set_solution(solution_))
+    cg.add(var.set_temperature(temperature_))
+    return var
+
+
+UFIRE_EC_RESET_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.use_id(UFireECComponent),
+    }
+)
+
+
+@automation.register_action(
+    "ufire_ec.reset",
+    UFireECResetAction,
+    UFIRE_EC_RESET_SCHEMA,
+)
+async def ufire_ec_reset_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)
+    return var
diff --git a/esphome/components/ufire_ec/ufire_ec.cpp b/esphome/components/ufire_ec/ufire_ec.cpp
new file mode 100644
index 0000000000..d7ed890e21
--- /dev/null
+++ b/esphome/components/ufire_ec/ufire_ec.cpp
@@ -0,0 +1,119 @@
+#include "esphome/core/log.h"
+#include "ufire_ec.h"
+
+namespace esphome {
+namespace ufire_ec {
+
+static const char *const TAG = "ufire_ec";
+
+void UFireECComponent::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up uFire_ec...");
+
+  uint8_t version;
+  if (!this->read_byte(REGISTER_VERSION, &version) && version != 0xFF) {
+    this->mark_failed();
+    this->status_set_error();
+    return;
+  }
+  ESP_LOGI(TAG, "Found ufire_ec board version 0x%02X", version);
+
+  // Write option for temperature adjustments
+  uint8_t config;
+  this->read_byte(REGISTER_CONFIG, &config);
+  if (this->temperature_sensor_ == nullptr && this->temperature_sensor_external_ == nullptr) {
+    config &= ~CONFIG_TEMP_COMPENSATION;
+  } else {
+    config |= CONFIG_TEMP_COMPENSATION;
+  }
+  this->write_byte(REGISTER_CONFIG, config);
+
+  // Update temperature compensation
+  this->set_compensation_(this->temperature_compensation_);
+  this->set_coefficient_(this->temperature_coefficient_);
+}
+
+void UFireECComponent::update() {
+  int wait = 0;
+
+  if (this->temperature_sensor_ != nullptr) {
+    this->write_byte(REGISTER_TASK, COMMAND_MEASURE_TEMP);
+    wait += 750;
+  } else if (this->temperature_sensor_external_ != nullptr) {
+    this->set_temperature_(this->temperature_sensor_external_->state);
+  }
+
+  if (this->ec_sensor_ != nullptr) {
+    this->write_byte(REGISTER_TASK, COMMAND_MEASURE_EC);
+    wait += 750;
+  }
+
+  if (wait > 0) {
+    this->set_timeout("data", wait, [this]() { this->update_internal_(); });
+  }
+}
+
+void UFireECComponent::update_internal_() {
+  if (this->temperature_sensor_ != nullptr)
+    this->temperature_sensor_->publish_state(this->measure_temperature_());
+  if (this->ec_sensor_ != nullptr)
+    this->ec_sensor_->publish_state(this->measure_ms_());
+}
+
+float UFireECComponent::measure_temperature_() { return this->read_data_(REGISTER_TEMP); }
+
+float UFireECComponent::measure_ms_() { return this->read_data_(REGISTER_MS); }
+
+void UFireECComponent::set_solution_(float solution, float temperature) {
+  solution /= (1 - (this->temperature_coefficient_ * (temperature - 25)));
+  this->write_data_(REGISTER_SOLUTION, solution);
+}
+
+void UFireECComponent::set_compensation_(float temperature) { this->write_data_(REGISTER_COMPENSATION, temperature); }
+
+void UFireECComponent::set_coefficient_(float coefficient) { this->write_data_(REGISTER_COEFFICENT, coefficient); }
+
+void UFireECComponent::set_temperature_(float temperature) { this->write_data_(REGISTER_TEMP, temperature); }
+
+void UFireECComponent::calibrate_probe(float solution, float temperature) {
+  this->set_solution_(solution, temperature);
+  this->write_byte(REGISTER_TASK, COMMAND_CALIBRATE_PROBE);
+}
+
+void UFireECComponent::reset_board() { this->write_data_(REGISTER_CALIBRATE_OFFSET, NAN); }
+
+float UFireECComponent::read_data_(uint8_t reg) {
+  float f;
+  uint8_t temp[4];
+
+  this->write(&reg, 1);
+  delay(10);
+
+  for (uint8_t i = 0; i < 4; i++) {
+    this->read_bytes_raw(temp + i, 1);
+  }
+  memcpy(&f, temp, sizeof(f));
+
+  return f;
+}
+
+void UFireECComponent::write_data_(uint8_t reg, float data) {
+  uint8_t temp[4];
+
+  memcpy(temp, &data, sizeof(data));
+  this->write_bytes(reg, temp, 4);
+  delay(10);
+}
+
+void UFireECComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "uFire-EC");
+  LOG_I2C_DEVICE(this)
+  LOG_UPDATE_INTERVAL(this)
+  LOG_SENSOR("  ", "EC Sensor", this->ec_sensor_)
+  LOG_SENSOR("  ", "Temperature Sensor", this->temperature_sensor_)
+  LOG_SENSOR("  ", "Temperature Sensor external", this->temperature_sensor_external_)
+  ESP_LOGCONFIG(TAG, "  Temperature Compensation: %f", this->temperature_compensation_);
+  ESP_LOGCONFIG(TAG, "  Temperature Coefficient: %f", this->temperature_coefficient_);
+}
+
+}  // namespace ufire_ec
+}  // namespace esphome
diff --git a/esphome/components/ufire_ec/ufire_ec.h b/esphome/components/ufire_ec/ufire_ec.h
new file mode 100644
index 0000000000..3d436555a2
--- /dev/null
+++ b/esphome/components/ufire_ec/ufire_ec.h
@@ -0,0 +1,87 @@
+#pragma once
+
+#include "esphome/core/automation.h"
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace ufire_ec {
+
+static const uint8_t CONFIG_TEMP_COMPENSATION = 0x02;
+
+static const uint8_t REGISTER_VERSION = 0;
+static const uint8_t REGISTER_MS = 1;
+static const uint8_t REGISTER_TEMP = 5;
+static const uint8_t REGISTER_SOLUTION = 9;
+static const uint8_t REGISTER_COEFFICENT = 13;
+static const uint8_t REGISTER_CALIBRATE_OFFSET = 33;
+static const uint8_t REGISTER_COMPENSATION = 45;
+static const uint8_t REGISTER_CONFIG = 54;
+static const uint8_t REGISTER_TASK = 55;
+
+static const uint8_t COMMAND_CALIBRATE_PROBE = 20;
+static const uint8_t COMMAND_MEASURE_TEMP = 40;
+static const uint8_t COMMAND_MEASURE_EC = 80;
+
+class UFireECComponent : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void setup() override;
+  void update() override;
+  void dump_config() override;
+
+  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { this->temperature_sensor_ = temperature_sensor; }
+  void set_temperature_sensor_external(sensor::Sensor *temperature_sensor) {
+    this->temperature_sensor_external_ = temperature_sensor;
+  }
+  void set_ec_sensor(sensor::Sensor *ec_sensor) { this->ec_sensor_ = ec_sensor; }
+  void set_temperature_compensation(float compensation) { this->temperature_compensation_ = compensation; }
+  void set_temperature_coefficient(float coefficient) { this->temperature_coefficient_ = coefficient; }
+  void calibrate_probe(float solution, float temperature);
+  void reset_board();
+
+ protected:
+  float measure_temperature_();
+  float measure_ms_();
+  void set_solution_(float solution, float temperature);
+  void set_compensation_(float temperature);
+  void set_coefficient_(float coefficient);
+  void set_temperature_(float temperature);
+  float read_data_(uint8_t reg);
+  void write_data_(uint8_t reg, float data);
+  void update_internal_();
+
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_external_{nullptr};
+  sensor::Sensor *ec_sensor_{nullptr};
+  float temperature_compensation_{0.0};
+  float temperature_coefficient_{0.0};
+};
+
+template<typename... Ts> class UFireECCalibrateProbeAction : public Action<Ts...> {
+ public:
+  UFireECCalibrateProbeAction(UFireECComponent *parent) : parent_(parent) {}
+  TEMPLATABLE_VALUE(float, solution)
+  TEMPLATABLE_VALUE(float, temperature)
+
+  void play(Ts... x) override {
+    this->parent_->calibrate_probe(this->solution_.value(x...), this->temperature_.value(x...));
+  }
+
+ protected:
+  UFireECComponent *parent_;
+};
+
+template<typename... Ts> class UFireECResetAction : public Action<Ts...> {
+ public:
+  UFireECResetAction(UFireECComponent *parent) : parent_(parent) {}
+
+  void play(Ts... x) override { this->parent_->reset_board(); }
+
+ protected:
+  UFireECComponent *parent_;
+};
+
+}  // namespace ufire_ec
+}  // namespace esphome
diff --git a/esphome/const.py b/esphome/const.py
index adbd20c620..51c07ab666 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -192,6 +192,7 @@ CONF_DUMMY_RECEIVER_ID = "dummy_receiver_id"
 CONF_DUMP = "dump"
 CONF_DURATION = "duration"
 CONF_EAP = "eap"
+CONF_EC = "ec"
 CONF_ECHO_PIN = "echo_pin"
 CONF_ECO2 = "eco2"
 CONF_EFFECT = "effect"
@@ -871,6 +872,7 @@ UNIT_MICROSIEMENS_PER_CENTIMETER = "µS/cm"
 UNIT_MICROTESLA = "µT"
 UNIT_MILLIGRAMS_PER_CUBIC_METER = "mg/m³"
 UNIT_MILLISECOND = "ms"
+UNIT_MILLISIEMENS_PER_CENTIMETER = "mS/cm"
 UNIT_MINUTE = "min"
 UNIT_OHM = "Ω"
 UNIT_PARTS_PER_BILLION = "ppb"
diff --git a/tests/test2.yaml b/tests/test2.yaml
index d01a0a742a..f8ed04d389 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -369,6 +369,13 @@ sensor:
       name: Propane test distance
     battery_level:
       name: Propane test battery level
+  - platform: ufire_ec
+    id: ufire_ec_board
+    ec:
+      name: Ufire EC
+    temperature_sensor: ha_hello_world_temperature
+    temperature_compensation: 20.0
+    temperature_coefficient: 0.019
 
 time:
   - platform: homeassistant
diff --git a/tests/test4.yaml b/tests/test4.yaml
index d6857de7cd..d79b421cf8 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -243,6 +243,14 @@ sensor:
   - platform: copy
     source_id: mcp_sensor
     name: MCP binary sensor copy
+  - platform: ufire_ec
+    id: ufire_ec_board
+    temperature:
+      name: Ufire Temperature
+    ec:
+      name: Ufire EC
+    temperature_compensation: 20.0
+    temperature_coefficient: 0.019
 
 #
 # platform sensor.apds9960 requires component apds9960

From d66b2a1778c0add96b353328f67d6f514688751d Mon Sep 17 00:00:00 2001
From: Keilin Bickar <TrumpetGod@gmail.com>
Date: Fri, 9 Sep 2022 01:18:02 -0400
Subject: [PATCH 048/838] Add support for MPL3115A2 Pressure/Altitude and
 Temperature Sensor (#3371)

* Add support for mpl3115a2

* Add codeowner

* Linter/test updates

* Minor changes

* Made pressure/altitude exclusive

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

diff --git a/CODEOWNERS b/CODEOWNERS
index ff497c35ec..0441a6bfcd 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -143,6 +143,7 @@ esphome/components/modbus_controller/switch/* @martgras
 esphome/components/modbus_controller/text_sensor/* @martgras
 esphome/components/mopeka_ble/* @spbrogan
 esphome/components/mopeka_pro_check/* @spbrogan
+esphome/components/mpl3115a2/* @kbickar
 esphome/components/mpu6886/* @fabaff
 esphome/components/network/* @esphome/core
 esphome/components/nextion/* @senexcrenshaw
diff --git a/esphome/components/mpl3115a2/__init__.py b/esphome/components/mpl3115a2/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/mpl3115a2/mpl3115a2.cpp b/esphome/components/mpl3115a2/mpl3115a2.cpp
new file mode 100644
index 0000000000..f1e553e107
--- /dev/null
+++ b/esphome/components/mpl3115a2/mpl3115a2.cpp
@@ -0,0 +1,99 @@
+#include "mpl3115a2.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace mpl3115a2 {
+
+static const char *const TAG = "mpl3115a2";
+
+void MPL3115A2Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up MPL3115A2...");
+
+  uint8_t whoami = 0xFF;
+  if (!this->read_byte(MPL3115A2_WHOAMI, &whoami, false)) {
+    this->error_code_ = COMMUNICATION_FAILED;
+    this->mark_failed();
+    return;
+  }
+  if (whoami != 0xC4) {
+    this->error_code_ = WRONG_ID;
+    this->mark_failed();
+    return;
+  }
+
+  // reset
+  this->write_byte(MPL3115A2_CTRL_REG1, MPL3115A2_CTRL_REG1_RST);
+  delay(15);
+
+  // enable data ready events for pressure/altitude and temperature
+  this->write_byte(MPL3115A2_PT_DATA_CFG,
+                   MPL3115A2_PT_DATA_CFG_TDEFE | MPL3115A2_PT_DATA_CFG_PDEFE | MPL3115A2_PT_DATA_CFG_DREM);
+}
+
+void MPL3115A2Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "MPL3115A2:");
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    switch (this->error_code_) {
+      case COMMUNICATION_FAILED:
+        ESP_LOGE(TAG, "Communication with MPL3115A2 failed!");
+        break;
+      case WRONG_ID:
+        ESP_LOGE(TAG, "MPL3115A2 has invalid id");
+        break;
+      default:
+        ESP_LOGE(TAG, "Setting up MPL3115A2 registers failed!");
+        break;
+    }
+  }
+  LOG_UPDATE_INTERVAL(this);
+  LOG_SENSOR("  ", "Temperature", this->temperature_);
+  LOG_SENSOR("  ", "Pressure", this->pressure_);
+  LOG_SENSOR("  ", "Altitude", this->altitude_);
+}
+
+void MPL3115A2Component::update() {
+  uint8_t mode = MPL3115A2_CTRL_REG1_OS128;
+  this->write_byte(MPL3115A2_CTRL_REG1, mode, true);
+  // Trigger a new reading
+  mode |= MPL3115A2_CTRL_REG1_OST;
+  if (this->altitude_ != nullptr)
+    mode |= MPL3115A2_CTRL_REG1_ALT;
+  this->write_byte(MPL3115A2_CTRL_REG1, mode, true);
+
+  // Wait until status shows reading available
+  uint8_t status = 0;
+  if (!this->read_byte(MPL3115A2_REGISTER_STATUS, &status, false) || (status & MPL3115A2_REGISTER_STATUS_PDR) == 0) {
+    delay(10);
+    if (!this->read_byte(MPL3115A2_REGISTER_STATUS, &status, false) || (status & MPL3115A2_REGISTER_STATUS_PDR) == 0) {
+      return;
+    }
+  }
+
+  uint8_t buffer[5] = {0, 0, 0, 0, 0};
+  this->read_register(MPL3115A2_REGISTER_PRESSURE_MSB, buffer, 5, false);
+
+  float altitude = 0, pressure = 0;
+  if (this->altitude_ != nullptr) {
+    int32_t alt = encode_uint32(buffer[0], buffer[1], buffer[2], 0);
+    altitude = float(alt) / 65536.0;
+    this->altitude_->publish_state(altitude);
+  } else {
+    uint32_t p = encode_uint32(0, buffer[0], buffer[1], buffer[2]);
+    pressure = float(p) / 6400.0;
+    if (this->pressure_ != nullptr)
+      this->pressure_->publish_state(pressure);
+  }
+  int16_t t = encode_uint16(buffer[3], buffer[4]);
+  float temperature = float(t) / 256.0;
+  if (this->temperature_ != nullptr)
+    this->temperature_->publish_state(temperature);
+
+  ESP_LOGD(TAG, "Got Temperature=%.1f°C Altitude=%.1f Pressure=%.1f", temperature, altitude, pressure);
+
+  this->status_clear_warning();
+}
+
+}  // namespace mpl3115a2
+}  // namespace esphome
diff --git a/esphome/components/mpl3115a2/mpl3115a2.h b/esphome/components/mpl3115a2/mpl3115a2.h
new file mode 100644
index 0000000000..00a6d90c52
--- /dev/null
+++ b/esphome/components/mpl3115a2/mpl3115a2.h
@@ -0,0 +1,108 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace mpl3115a2 {
+
+// enums from https://github.com/adafruit/Adafruit_MPL3115A2_Library/
+/** MPL3115A2 registers **/
+enum {
+  MPL3115A2_REGISTER_STATUS = (0x00),
+
+  MPL3115A2_REGISTER_PRESSURE_MSB = (0x01),
+  MPL3115A2_REGISTER_PRESSURE_CSB = (0x02),
+  MPL3115A2_REGISTER_PRESSURE_LSB = (0x03),
+
+  MPL3115A2_REGISTER_TEMP_MSB = (0x04),
+  MPL3115A2_REGISTER_TEMP_LSB = (0x05),
+
+  MPL3115A2_REGISTER_DR_STATUS = (0x06),
+
+  MPL3115A2_OUT_P_DELTA_MSB = (0x07),
+  MPL3115A2_OUT_P_DELTA_CSB = (0x08),
+  MPL3115A2_OUT_P_DELTA_LSB = (0x09),
+
+  MPL3115A2_OUT_T_DELTA_MSB = (0x0A),
+  MPL3115A2_OUT_T_DELTA_LSB = (0x0B),
+
+  MPL3115A2_WHOAMI = (0x0C),
+
+  MPL3115A2_BAR_IN_MSB = (0x14),
+  MPL3115A2_BAR_IN_LSB = (0x15),
+};
+
+/** MPL3115A2 status register bits **/
+enum {
+  MPL3115A2_REGISTER_STATUS_TDR = 0x02,
+  MPL3115A2_REGISTER_STATUS_PDR = 0x04,
+  MPL3115A2_REGISTER_STATUS_PTDR = 0x08,
+};
+
+/** MPL3115A2 PT DATA register bits **/
+enum {
+  MPL3115A2_PT_DATA_CFG = 0x13,
+  MPL3115A2_PT_DATA_CFG_TDEFE = 0x01,
+  MPL3115A2_PT_DATA_CFG_PDEFE = 0x02,
+  MPL3115A2_PT_DATA_CFG_DREM = 0x04,
+};
+
+/** MPL3115A2 control registers **/
+enum {
+
+  MPL3115A2_CTRL_REG1 = (0x26),
+  MPL3115A2_CTRL_REG2 = (0x27),
+  MPL3115A2_CTRL_REG3 = (0x28),
+  MPL3115A2_CTRL_REG4 = (0x29),
+  MPL3115A2_CTRL_REG5 = (0x2A),
+};
+
+/** MPL3115A2 control register bits **/
+enum {
+  MPL3115A2_CTRL_REG1_SBYB = 0x01,
+  MPL3115A2_CTRL_REG1_OST = 0x02,
+  MPL3115A2_CTRL_REG1_RST = 0x04,
+  MPL3115A2_CTRL_REG1_RAW = 0x40,
+  MPL3115A2_CTRL_REG1_ALT = 0x80,
+  MPL3115A2_CTRL_REG1_BAR = 0x00,
+};
+
+/** MPL3115A2 oversample values **/
+enum {
+  MPL3115A2_CTRL_REG1_OS1 = 0x00,
+  MPL3115A2_CTRL_REG1_OS2 = 0x08,
+  MPL3115A2_CTRL_REG1_OS4 = 0x10,
+  MPL3115A2_CTRL_REG1_OS8 = 0x18,
+  MPL3115A2_CTRL_REG1_OS16 = 0x20,
+  MPL3115A2_CTRL_REG1_OS32 = 0x28,
+  MPL3115A2_CTRL_REG1_OS64 = 0x30,
+  MPL3115A2_CTRL_REG1_OS128 = 0x38,
+};
+
+class MPL3115A2Component : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void set_temperature(sensor::Sensor *temperature) { temperature_ = temperature; }
+  void set_altitude(sensor::Sensor *altitude) { altitude_ = altitude; }
+  void set_pressure(sensor::Sensor *pressure) { pressure_ = pressure; }
+
+  void setup() override;
+  void dump_config() override;
+  void update() override;
+
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
+ protected:
+  sensor::Sensor *temperature_{nullptr};
+  sensor::Sensor *altitude_{nullptr};
+  sensor::Sensor *pressure_{nullptr};
+  enum ErrorCode {
+    NONE = 0,
+    COMMUNICATION_FAILED,
+    WRONG_ID,
+  } error_code_{NONE};
+};
+
+}  // namespace mpl3115a2
+}  // namespace esphome
diff --git a/esphome/components/mpl3115a2/sensor.py b/esphome/components/mpl3115a2/sensor.py
new file mode 100644
index 0000000000..68ed0e08a8
--- /dev/null
+++ b/esphome/components/mpl3115a2/sensor.py
@@ -0,0 +1,75 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import (
+    CONF_ALTITUDE,
+    CONF_ID,
+    CONF_PRESSURE,
+    CONF_TEMPERATURE,
+    DEVICE_CLASS_PRESSURE,
+    DEVICE_CLASS_TEMPERATURE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_CELSIUS,
+    UNIT_HECTOPASCAL,
+    UNIT_METER,
+)
+
+CODEOWNERS = ["@kbickar"]
+DEPENDENCIES = ["i2c"]
+
+mpl3115a2_ns = cg.esphome_ns.namespace("mpl3115a2")
+MPL3115A2Component = mpl3115a2_ns.class_(
+    "MPL3115A2Component", cg.PollingComponent, i2c.I2CDevice
+)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(MPL3115A2Component),
+            cv.Exclusive(
+                CONF_PRESSURE,
+                "pressure",
+                f"{CONF_PRESSURE} and {CONF_ALTITUDE} can't be used together",
+            ): sensor.sensor_schema(
+                unit_of_measurement=UNIT_HECTOPASCAL,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_PRESSURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Exclusive(
+                CONF_ALTITUDE,
+                "pressure",
+                f"{CONF_PRESSURE} and {CONF_ALTITUDE} can't be used together",
+            ): sensor.sensor_schema(
+                unit_of_measurement=UNIT_METER,
+                accuracy_decimals=1,
+                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,
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x60))
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
+
+    if CONF_PRESSURE in config:
+        sens = await sensor.new_sensor(config[CONF_PRESSURE])
+        cg.add(var.set_pressure(sens))
+    elif CONF_ALTITUDE in config:
+        sens = await sensor.new_sensor(config[CONF_ALTITUDE])
+        cg.add(var.set_altitude(sens))
+
+    if CONF_TEMPERATURE in config:
+        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
+        cg.add(var.set_temperature(sens))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 20209923aa..e5e9754d74 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1167,6 +1167,13 @@ sensor:
     temperature:
       name: Max9611 Temp
     update_interval: 1s
+  - platform: mpl3115a2
+    i2c_id: i2c_bus
+    temperature:
+      name: "MPL3115A2 Temperature"
+    pressure:
+      name: "MPL3115A2 Pressure"
+    update_interval: 10s
 
 esp32_touch:
   setup_mode: false

From 8ba207fc7f9ba08cb87eb31c9a020ce3541a4d2f Mon Sep 17 00:00:00 2001
From: David Buezas <dbuezas@users.noreply.github.com>
Date: Sun, 11 Sep 2022 23:36:09 +0200
Subject: [PATCH 049/838] Add support for BL0942 voltage, current, energy and
 power Sensor (#3777)

---
 CODEOWNERS                            |   1 +
 esphome/components/bl0942/__init__.py |   1 +
 esphome/components/bl0942/bl0942.cpp  | 121 ++++++++++++++++++++++++++
 esphome/components/bl0942/bl0942.h    |  68 +++++++++++++++
 esphome/components/bl0942/sensor.py   |  93 ++++++++++++++++++++
 tests/test3.yaml                      |  12 +++
 6 files changed, 296 insertions(+)
 create mode 100644 esphome/components/bl0942/__init__.py
 create mode 100644 esphome/components/bl0942/bl0942.cpp
 create mode 100644 esphome/components/bl0942/bl0942.h
 create mode 100644 esphome/components/bl0942/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index 0441a6bfcd..e63528fabc 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -35,6 +35,7 @@ esphome/components/bh1750/* @OttoWinter
 esphome/components/binary_sensor/* @esphome/core
 esphome/components/bl0939/* @ziceva
 esphome/components/bl0940/* @tobias-
+esphome/components/bl0942/* @dbuezas
 esphome/components/ble_client/* @buxtronix
 esphome/components/bluetooth_proxy/* @jesserockz
 esphome/components/bme680_bsec/* @trvrnrth
diff --git a/esphome/components/bl0942/__init__.py b/esphome/components/bl0942/__init__.py
new file mode 100644
index 0000000000..8ef7857b7b
--- /dev/null
+++ b/esphome/components/bl0942/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@dbuezas"]
diff --git a/esphome/components/bl0942/bl0942.cpp b/esphome/components/bl0942/bl0942.cpp
new file mode 100644
index 0000000000..e6d18a82a7
--- /dev/null
+++ b/esphome/components/bl0942/bl0942.cpp
@@ -0,0 +1,121 @@
+#include "bl0942.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace bl0942 {
+
+static const char *const TAG = "bl0942";
+
+static const uint8_t BL0942_READ_COMMAND = 0x58;
+static const uint8_t BL0942_FULL_PACKET = 0xAA;
+static const uint8_t BL0942_PACKET_HEADER = 0x55;
+
+static const uint8_t BL0942_WRITE_COMMAND = 0xA8;
+static const uint8_t BL0942_REG_I_FAST_RMS_CTRL = 0x10;
+static const uint8_t BL0942_REG_MODE = 0x18;
+static const uint8_t BL0942_REG_SOFT_RESET = 0x19;
+static const uint8_t BL0942_REG_USR_WRPROT = 0x1A;
+static const uint8_t BL0942_REG_TPS_CTRL = 0x1B;
+
+// TODO: Confirm insialisation works as intended
+const uint8_t BL0942_INIT[5][6] = {
+    // Reset to default
+    {BL0942_WRITE_COMMAND, BL0942_REG_SOFT_RESET, 0x5A, 0x5A, 0x5A, 0x38},
+    // Enable User Operation Write
+    {BL0942_WRITE_COMMAND, BL0942_REG_USR_WRPROT, 0x55, 0x00, 0x00, 0xF0},
+    // 0x0100 = CF_UNABLE energy pulse, AC_FREQ_SEL 50Hz, RMS_UPDATE_SEL 800mS
+    {BL0942_WRITE_COMMAND, BL0942_REG_MODE, 0x00, 0x10, 0x00, 0x37},
+    // 0x47FF = Over-current and leakage alarm on, Automatic temperature measurement, Interval 100mS
+    {BL0942_WRITE_COMMAND, BL0942_REG_TPS_CTRL, 0xFF, 0x47, 0x00, 0xFE},
+    // 0x181C = Half cycle, Fast RMS threshold 6172
+    {BL0942_WRITE_COMMAND, BL0942_REG_I_FAST_RMS_CTRL, 0x1C, 0x18, 0x00, 0x1B}};
+
+void BL0942::loop() {
+  DataPacket buffer;
+  if (!this->available()) {
+    return;
+  }
+  if (read_array((uint8_t *) &buffer, sizeof(buffer))) {
+    if (validate_checksum(&buffer)) {
+      received_package_(&buffer);
+    }
+  } else {
+    ESP_LOGW(TAG, "Junk on wire. Throwing away partial message");
+    while (read() >= 0)
+      ;
+  }
+}
+
+bool BL0942::validate_checksum(DataPacket *data) {
+  uint8_t checksum = BL0942_READ_COMMAND;
+  // Whole package but checksum
+  uint8_t *raw = (uint8_t *) data;
+  for (uint32_t i = 0; i < sizeof(*data) - 1; i++) {
+    checksum += raw[i];
+  }
+  checksum ^= 0xFF;
+  if (checksum != data->checksum) {
+    ESP_LOGW(TAG, "BL0942 invalid checksum! 0x%02X != 0x%02X", checksum, data->checksum);
+  }
+  return checksum == data->checksum;
+}
+
+void BL0942::update() {
+  this->flush();
+  this->write_byte(BL0942_READ_COMMAND);
+  this->write_byte(BL0942_FULL_PACKET);
+}
+
+void BL0942::setup() {
+  for (auto *i : BL0942_INIT) {
+    this->write_array(i, 6);
+    delay(1);
+  }
+  this->flush();
+}
+
+void BL0942::received_package_(DataPacket *data) {
+  // Bad header
+  if (data->frame_header != BL0942_PACKET_HEADER) {
+    ESP_LOGI(TAG, "Invalid data. Header mismatch: %d", data->frame_header);
+    return;
+  }
+
+  float v_rms = (uint24_t) data->v_rms / voltage_reference_;
+  float i_rms = (uint24_t) data->i_rms / current_reference_;
+  float watt = (int24_t) data->watt / power_reference_;
+  uint32_t cf_cnt = (uint24_t) data->cf_cnt;
+  float total_energy_consumption = cf_cnt / energy_reference_;
+  float frequency = 1000000.0f / data->frequency;
+
+  if (voltage_sensor_ != nullptr) {
+    voltage_sensor_->publish_state(v_rms);
+  }
+  if (current_sensor_ != nullptr) {
+    current_sensor_->publish_state(i_rms);
+  }
+  if (power_sensor_ != nullptr) {
+    power_sensor_->publish_state(watt);
+  }
+  if (energy_sensor_ != nullptr) {
+    energy_sensor_->publish_state(total_energy_consumption);
+  }
+  if (frequency_sensor_ != nullptr) {
+    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);
+}
+
+void BL0942::dump_config() {  // NOLINT(readability-function-cognitive-complexity)
+  ESP_LOGCONFIG(TAG, "BL0942:");
+  LOG_SENSOR("", "Voltage", this->voltage_sensor_);
+  LOG_SENSOR("", "Current", this->current_sensor_);
+  LOG_SENSOR("", "Power", this->power_sensor_);
+  LOG_SENSOR("", "Energy", this->energy_sensor_);
+  LOG_SENSOR("", "frequency", this->frequency_sensor_);
+}
+
+}  // namespace bl0942
+}  // namespace esphome
diff --git a/esphome/components/bl0942/bl0942.h b/esphome/components/bl0942/bl0942.h
new file mode 100644
index 0000000000..8149b7493b
--- /dev/null
+++ b/esphome/components/bl0942/bl0942.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/datatypes.h"
+#include "esphome/components/uart/uart.h"
+#include "esphome/components/sensor/sensor.h"
+
+namespace esphome {
+namespace bl0942 {
+
+static const float BL0942_PREF = 596;              // taken from tasmota
+static const float BL0942_UREF = 15873.35944299;   // should be 73989/1.218
+static const float BL0942_IREF = 251213.46469622;  // 305978/1.218
+static const float BL0942_EREF = 3304.61127328;    // Measured
+
+struct DataPacket {
+  uint8_t frame_header;
+  uint24_le_t i_rms;
+  uint24_le_t v_rms;
+  uint24_le_t i_fast_rms;
+  int24_le_t watt;
+  uint24_le_t cf_cnt;
+  uint16_le_t frequency;
+  uint8_t reserved1;
+  uint8_t status;
+  uint8_t reserved2;
+  uint8_t reserved3;
+  uint8_t checksum;
+} __attribute__((packed));
+
+class BL0942 : public PollingComponent, public uart::UARTDevice {
+ public:
+  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
+  void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
+  void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
+  void set_energy_sensor(sensor::Sensor *energy_sensor) { energy_sensor_ = energy_sensor; }
+  void set_frequency_sensor(sensor::Sensor *frequency_sensor) { frequency_sensor_ = frequency_sensor; }
+
+  void loop() override;
+
+  void update() override;
+  void setup() override;
+  void dump_config() override;
+
+ protected:
+  sensor::Sensor *voltage_sensor_;
+  sensor::Sensor *current_sensor_;
+  // NB This may be negative as the circuits is seemingly able to measure
+  // power in both directions
+  sensor::Sensor *power_sensor_;
+  sensor::Sensor *energy_sensor_;
+  sensor::Sensor *frequency_sensor_;
+
+  // Divide by this to turn into Watt
+  float power_reference_ = BL0942_PREF;
+  // Divide by this to turn into Volt
+  float voltage_reference_ = BL0942_UREF;
+  // Divide by this to turn into Ampere
+  float current_reference_ = BL0942_IREF;
+  // Divide by this to turn into kWh
+  float energy_reference_ = BL0942_EREF;
+
+  static bool validate_checksum(DataPacket *data);
+
+  void received_package_(DataPacket *data);
+};
+}  // namespace bl0942
+}  // namespace esphome
diff --git a/esphome/components/bl0942/sensor.py b/esphome/components/bl0942/sensor.py
new file mode 100644
index 0000000000..f23375b309
--- /dev/null
+++ b/esphome/components/bl0942/sensor.py
@@ -0,0 +1,93 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, uart
+from esphome.const import (
+    CONF_CURRENT,
+    CONF_ENERGY,
+    CONF_ID,
+    CONF_POWER,
+    CONF_VOLTAGE,
+    CONF_FREQUENCY,
+    DEVICE_CLASS_CURRENT,
+    DEVICE_CLASS_ENERGY,
+    DEVICE_CLASS_POWER,
+    DEVICE_CLASS_VOLTAGE,
+    DEVICE_CLASS_FREQUENCY,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_AMPERE,
+    UNIT_KILOWATT_HOURS,
+    UNIT_VOLT,
+    UNIT_WATT,
+    UNIT_HERTZ,
+)
+
+DEPENDENCIES = ["uart"]
+
+bl0942_ns = cg.esphome_ns.namespace("bl0942")
+BL0942 = bl0942_ns.class_("BL0942", cg.PollingComponent, uart.UARTDevice)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(BL0942),
+            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): sensor.sensor_schema(
+                unit_of_measurement=UNIT_AMPERE,
+                accuracy_decimals=2,
+                device_class=DEVICE_CLASS_CURRENT,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_POWER): sensor.sensor_schema(
+                unit_of_measurement=UNIT_WATT,
+                accuracy_decimals=0,
+                device_class=DEVICE_CLASS_POWER,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_ENERGY): sensor.sensor_schema(
+                unit_of_measurement=UNIT_KILOWATT_HOURS,
+                accuracy_decimals=0,
+                device_class=DEVICE_CLASS_ENERGY,
+            ),
+            cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(
+                unit_of_measurement=UNIT_HERTZ,
+                accuracy_decimals=0,
+                device_class=DEVICE_CLASS_FREQUENCY,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .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)
+
+    if CONF_VOLTAGE in config:
+        conf = config[CONF_VOLTAGE]
+        sens = await sensor.new_sensor(conf)
+        cg.add(var.set_voltage_sensor(sens))
+    if CONF_CURRENT in config:
+        conf = config[CONF_CURRENT]
+        sens = await sensor.new_sensor(conf)
+        cg.add(var.set_current_sensor(sens))
+    if CONF_POWER in config:
+        conf = config[CONF_POWER]
+        sens = await sensor.new_sensor(conf)
+        cg.add(var.set_power_sensor(sens))
+    if CONF_ENERGY in config:
+        conf = config[CONF_ENERGY]
+        sens = await sensor.new_sensor(conf)
+        cg.add(var.set_energy_sensor(sens))
+    if CONF_FREQUENCY in config:
+        conf = config[CONF_FREQUENCY]
+        sens = await sensor.new_sensor(conf)
+        cg.add(var.set_frequency_sensor(sens))
diff --git a/tests/test3.yaml b/tests/test3.yaml
index de0fc0dfdb..1d4b4fb076 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -530,6 +530,18 @@ sensor:
       name: BL0940 Internal temperature
     external_temperature:
       name: BL0940 External temperature
+  - platform: bl0942
+    uart_id: uart3
+    voltage:
+      name: 'BL0942 Voltage'
+    current:
+      name: 'BL0942 Current'
+    power:
+      name: 'BL0942 Power'
+    energy:
+      name: 'BL0942 Energy'
+    frequency:
+      name: "BL0942 Frequency"
   - platform: pzem004t
     uart_id: uart3
     voltage:

From 790280ace93b153a6c255ca94edcb99dafa2436d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:16:18 +1200
Subject: [PATCH 050/838] Bump pylint from 2.15.0 to 2.15.2 (#3785)

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 1d57fef954..5ef791906d 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,4 +1,4 @@
-pylint==2.15.0
+pylint==2.15.2
 flake8==5.0.4
 black==22.8.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==2.37.3  # also change in .pre-commit-config.yaml when updating

From 9a5f865eeabc3aab37c70debe8c19d33cac8045a Mon Sep 17 00:00:00 2001
From: anatoly-savchenkov
 <48646998+anatoly-savchenkov@users.noreply.github.com>
Date: Mon, 12 Sep 2022 01:23:46 +0300
Subject: [PATCH 051/838] Add Factory Reset button and switch (#3724)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                                    |  1 +
 esphome/components/esp32/preferences.cpp      | 13 ++++++-
 esphome/components/esp8266/preferences.cpp    | 21 +++++++++--
 esphome/components/factory_reset/__init__.py  |  5 +++
 .../factory_reset/button/__init__.py          | 30 ++++++++++++++++
 .../button/factory_reset_button.cpp           | 21 +++++++++++
 .../button/factory_reset_button.h             | 18 ++++++++++
 .../factory_reset/switch/__init__.py          | 35 +++++++++++++++++++
 .../switch/factory_reset_switch.cpp           | 26 ++++++++++++++
 .../switch/factory_reset_switch.h             | 18 ++++++++++
 esphome/core/preferences.h                    |  8 +++++
 tests/test1.yaml                              |  2 ++
 tests/test3.yaml                              |  3 ++
 13 files changed, 198 insertions(+), 3 deletions(-)
 create mode 100644 esphome/components/factory_reset/__init__.py
 create mode 100644 esphome/components/factory_reset/button/__init__.py
 create mode 100644 esphome/components/factory_reset/button/factory_reset_button.cpp
 create mode 100644 esphome/components/factory_reset/button/factory_reset_button.h
 create mode 100644 esphome/components/factory_reset/switch/__init__.py
 create mode 100644 esphome/components/factory_reset/switch/factory_reset_switch.cpp
 create mode 100644 esphome/components/factory_reset/switch/factory_reset_switch.h

diff --git a/CODEOWNERS b/CODEOWNERS
index e63528fabc..85ac107975 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -77,6 +77,7 @@ esphome/components/esp32_improv/* @jesserockz
 esphome/components/esp8266/* @esphome/core
 esphome/components/exposure_notifications/* @OttoWinter
 esphome/components/ezo/* @ssieb
+esphome/components/factory_reset/* @anatoly-savchenkov
 esphome/components/fastled_base/* @OttoWinter
 esphome/components/feedback/* @ianchi
 esphome/components/fingerprint_grow/* @OnFreund @loongyh
diff --git a/esphome/components/esp32/preferences.cpp b/esphome/components/esp32/preferences.cpp
index d070a20d82..6a6305cf87 100644
--- a/esphome/components/esp32/preferences.cpp
+++ b/esphome/components/esp32/preferences.cpp
@@ -141,7 +141,7 @@ class ESP32Preferences : public ESPPreferences {
     ESP_LOGD(TAG, "Saving %d preferences to flash: %d cached, %d written, %d failed", cached + written + failed, cached,
              written, failed);
     if (failed > 0) {
-      ESP_LOGD(TAG, "Error saving %d preferences to flash. Last error=%s for key=%s", failed, esp_err_to_name(last_err),
+      ESP_LOGE(TAG, "Error saving %d preferences to flash. Last error=%s for key=%s", failed, esp_err_to_name(last_err),
                last_key.c_str());
     }
 
@@ -170,6 +170,17 @@ class ESP32Preferences : public ESPPreferences {
     }
     return to_save.data != stored_data.data;
   }
+
+  bool reset() override {
+    ESP_LOGD(TAG, "Cleaning up preferences in flash...");
+    s_pending_save.clear();
+
+    nvs_flash_deinit();
+    nvs_flash_erase();
+    // Make the handle invalid to prevent any saves until restart
+    nvs_handle = 0;
+    return true;
+  }
 };
 
 void setup_preferences() {
diff --git a/esphome/components/esp8266/preferences.cpp b/esphome/components/esp8266/preferences.cpp
index 0e42cea576..1bd20f16ae 100644
--- a/esphome/components/esp8266/preferences.cpp
+++ b/esphome/components/esp8266/preferences.cpp
@@ -243,17 +243,34 @@ class ESP8266Preferences : public ESPPreferences {
       }
     }
     if (erase_res != SPI_FLASH_RESULT_OK) {
-      ESP_LOGV(TAG, "Erase ESP8266 flash failed!");
+      ESP_LOGE(TAG, "Erase ESP8266 flash failed!");
       return false;
     }
     if (write_res != SPI_FLASH_RESULT_OK) {
-      ESP_LOGV(TAG, "Write ESP8266 flash failed!");
+      ESP_LOGE(TAG, "Write ESP8266 flash failed!");
       return false;
     }
 
     s_flash_dirty = false;
     return true;
   }
+
+  bool reset() override {
+    ESP_LOGD(TAG, "Cleaning up preferences in flash...");
+    SpiFlashOpResult erase_res;
+    {
+      InterruptLock lock;
+      erase_res = spi_flash_erase_sector(get_esp8266_flash_sector());
+    }
+    if (erase_res != SPI_FLASH_RESULT_OK) {
+      ESP_LOGE(TAG, "Erase ESP8266 flash failed!");
+      return false;
+    }
+
+    // Protect flash from writing till restart
+    s_prevent_write = true;
+    return true;
+  }
 };
 
 void setup_preferences() {
diff --git a/esphome/components/factory_reset/__init__.py b/esphome/components/factory_reset/__init__.py
new file mode 100644
index 0000000000..f1bcfd8c55
--- /dev/null
+++ b/esphome/components/factory_reset/__init__.py
@@ -0,0 +1,5 @@
+import esphome.codegen as cg
+
+CODEOWNERS = ["@anatoly-savchenkov"]
+
+factory_reset_ns = cg.esphome_ns.namespace("factory_reset")
diff --git a/esphome/components/factory_reset/button/__init__.py b/esphome/components/factory_reset/button/__init__.py
new file mode 100644
index 0000000000..d5beac34b5
--- /dev/null
+++ b/esphome/components/factory_reset/button/__init__.py
@@ -0,0 +1,30 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import button
+from esphome.const import (
+    CONF_ID,
+    DEVICE_CLASS_RESTART,
+    ENTITY_CATEGORY_CONFIG,
+    ICON_RESTART_ALERT,
+)
+from .. import factory_reset_ns
+
+FactoryResetButton = factory_reset_ns.class_(
+    "FactoryResetButton", button.Button, cg.Component
+)
+
+CONFIG_SCHEMA = (
+    button.button_schema(
+        device_class=DEVICE_CLASS_RESTART,
+        entity_category=ENTITY_CATEGORY_CONFIG,
+        icon=ICON_RESTART_ALERT,
+    )
+    .extend({cv.GenerateID(): cv.declare_id(FactoryResetButton)})
+    .extend(cv.COMPONENT_SCHEMA)
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await button.register_button(var, config)
diff --git a/esphome/components/factory_reset/button/factory_reset_button.cpp b/esphome/components/factory_reset/button/factory_reset_button.cpp
new file mode 100644
index 0000000000..9354a3363e
--- /dev/null
+++ b/esphome/components/factory_reset/button/factory_reset_button.cpp
@@ -0,0 +1,21 @@
+#include "factory_reset_button.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+#include "esphome/core/application.h"
+
+namespace esphome {
+namespace factory_reset {
+
+static const char *const TAG = "factory_reset.button";
+
+void FactoryResetButton::dump_config() { LOG_BUTTON("", "Factory Reset Button", this); }
+void FactoryResetButton::press_action() {
+  ESP_LOGI(TAG, "Resetting to factory defaults...");
+  // Let MQTT settle a bit
+  delay(100);  // NOLINT
+  global_preferences->reset();
+  App.safe_reboot();
+}
+
+}  // namespace factory_reset
+}  // namespace esphome
diff --git a/esphome/components/factory_reset/button/factory_reset_button.h b/esphome/components/factory_reset/button/factory_reset_button.h
new file mode 100644
index 0000000000..9996a860d9
--- /dev/null
+++ b/esphome/components/factory_reset/button/factory_reset_button.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/button/button.h"
+
+namespace esphome {
+namespace factory_reset {
+
+class FactoryResetButton : public button::Button, public Component {
+ public:
+  void dump_config() override;
+
+ protected:
+  void press_action() override;
+};
+
+}  // namespace factory_reset
+}  // namespace esphome
diff --git a/esphome/components/factory_reset/switch/__init__.py b/esphome/components/factory_reset/switch/__init__.py
new file mode 100644
index 0000000000..3cc19a35a3
--- /dev/null
+++ b/esphome/components/factory_reset/switch/__init__.py
@@ -0,0 +1,35 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import switch
+from esphome.const import (
+    CONF_ENTITY_CATEGORY,
+    CONF_ID,
+    CONF_INVERTED,
+    CONF_ICON,
+    ENTITY_CATEGORY_CONFIG,
+    ICON_RESTART_ALERT,
+)
+from .. import factory_reset_ns
+
+FactoryResetSwitch = factory_reset_ns.class_(
+    "FactoryResetSwitch", switch.Switch, cg.Component
+)
+
+CONFIG_SCHEMA = switch.SWITCH_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(FactoryResetSwitch),
+        cv.Optional(CONF_INVERTED): cv.invalid(
+            "Factory Reset switches do not support inverted mode!"
+        ),
+        cv.Optional(CONF_ICON, default=ICON_RESTART_ALERT): cv.icon,
+        cv.Optional(
+            CONF_ENTITY_CATEGORY, default=ENTITY_CATEGORY_CONFIG
+        ): cv.entity_category,
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await switch.register_switch(var, config)
diff --git a/esphome/components/factory_reset/switch/factory_reset_switch.cpp b/esphome/components/factory_reset/switch/factory_reset_switch.cpp
new file mode 100644
index 0000000000..7bc8676736
--- /dev/null
+++ b/esphome/components/factory_reset/switch/factory_reset_switch.cpp
@@ -0,0 +1,26 @@
+#include "factory_reset_switch.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+#include "esphome/core/application.h"
+
+namespace esphome {
+namespace factory_reset {
+
+static const char *const TAG = "factory_reset.switch";
+
+void FactoryResetSwitch::dump_config() { LOG_SWITCH("", "Factory Reset Switch", this); }
+void FactoryResetSwitch::write_state(bool state) {
+  // Acknowledge
+  this->publish_state(false);
+
+  if (state) {
+    ESP_LOGI(TAG, "Resetting to factory defaults...");
+    // Let MQTT settle a bit
+    delay(100);  // NOLINT
+    global_preferences->reset();
+    App.safe_reboot();
+  }
+}
+
+}  // namespace factory_reset
+}  // namespace esphome
diff --git a/esphome/components/factory_reset/switch/factory_reset_switch.h b/esphome/components/factory_reset/switch/factory_reset_switch.h
new file mode 100644
index 0000000000..2c914ea76d
--- /dev/null
+++ b/esphome/components/factory_reset/switch/factory_reset_switch.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/switch/switch.h"
+
+namespace esphome {
+namespace factory_reset {
+
+class FactoryResetSwitch : public switch_::Switch, public Component {
+ public:
+  void dump_config() override;
+
+ protected:
+  void write_state(bool state) override;
+};
+
+}  // namespace factory_reset
+}  // namespace esphome
diff --git a/esphome/core/preferences.h b/esphome/core/preferences.h
index 2b13061a59..6d2dd967e9 100644
--- a/esphome/core/preferences.h
+++ b/esphome/core/preferences.h
@@ -46,6 +46,14 @@ class ESPPreferences {
    */
   virtual bool sync() = 0;
 
+  /**
+   * Forget all unsaved changes and re-initialize the permanent preferences storage.
+   * Usually followed by a restart which moves the system to "factory" conditions
+   *
+   * @return true if operation is successful.
+   */
+  virtual bool reset() = 0;
+
   template<typename T, enable_if_t<is_trivially_copyable<T>::value, bool> = true>
   ESPPreferenceObject make_preference(uint32_t type, bool in_flash) {
     return this->make_preference(sizeof(T), type, in_flash);
diff --git a/tests/test1.yaml b/tests/test1.yaml
index e5e9754d74..e213a8b041 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -2178,6 +2178,8 @@ switch:
     name: Living Room Restart
   - platform: safe_mode
     name: Living Room Restart (Safe Mode)
+  - platform: factory_reset
+    name: Living Room Restart (Factory Default Settings)
   - platform: shutdown
     name: Living Room Shutdown
   - platform: output
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 1d4b4fb076..4eee0fd2c9 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -1529,6 +1529,9 @@ button:
     target_mac_address: 12:34:56:78:90:ab
     name: wol_test_1
     id: wol_1
+  - platform: factory_reset
+    name: Restart Button (Factory Default Settings)
+
 
 cd74hc4067:
   pin_s0: GPIO12

From be473b97c49562996fa0a257a6e31b933eb0b431 Mon Sep 17 00:00:00 2001
From: Carlos Garcia Saura <CarlosGS@users.noreply.github.com>
Date: Mon, 12 Sep 2022 00:32:07 +0200
Subject: [PATCH 052/838] [MPU6050] Support devices with WHOAMI 0x98 (#3784)

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

diff --git a/esphome/components/mpu6050/mpu6050.cpp b/esphome/components/mpu6050/mpu6050.cpp
index 8a0756e63c..cc426e58a2 100644
--- a/esphome/components/mpu6050/mpu6050.cpp
+++ b/esphome/components/mpu6050/mpu6050.cpp
@@ -23,7 +23,7 @@ const float GRAVITY_EARTH = 9.80665f;
 void MPU6050Component::setup() {
   ESP_LOGCONFIG(TAG, "Setting up MPU6050...");
   uint8_t who_am_i;
-  if (!this->read_byte(MPU6050_REGISTER_WHO_AM_I, &who_am_i) || who_am_i != 0x68) {
+  if (!this->read_byte(MPU6050_REGISTER_WHO_AM_I, &who_am_i) || (who_am_i != 0x68 && who_am_i != 0x98)) {
     this->mark_failed();
     return;
   }

From 9ff187c3f8b2e2653ca1c49e274cbcc735b224c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:32:33 +1200
Subject: [PATCH 053/838] Bump zeroconf from 0.39.0 to 0.39.1 (#3782)

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 f4cb4285ab..bd0c70bb72 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ esptool==3.3.1
 click==8.1.3
 esphome-dashboard==20220508.0
 aioesphomeapi==10.13.0
-zeroconf==0.39.0
+zeroconf==0.39.1
 
 # esp-idf requires this, but doesn't bundle it by default
 # https://github.com/espressif/esp-idf/blob/220590d599e134d7a5e7f1e683cc4550349ffbf8/requirements.txt#L24

From cbd8d70431decfcaaf1c36e931a693f9ca398d30 Mon Sep 17 00:00:00 2001
From: "Jordan W. Cobb" <skykingjwc@yahoo.com>
Date: Mon, 12 Sep 2022 11:30:15 -0400
Subject: [PATCH 054/838] Add support for TM1638 Led and Key component (#3340)

---
 CODEOWNERS                                    |   1 +
 esphome/components/tm1638/__init__.py         |   0
 .../tm1638/binary_sensor/__init__.py          |  22 ++
 .../tm1638/binary_sensor/tm1638_key.cpp       |  13 +
 .../tm1638/binary_sensor/tm1638_key.h         |  19 ++
 esphome/components/tm1638/display.py          |  55 ++++
 esphome/components/tm1638/output/__init__.py  |  25 ++
 .../tm1638/output/tm1638_output_led.cpp       |  17 ++
 .../tm1638/output/tm1638_output_led.h         |  25 ++
 esphome/components/tm1638/sevenseg.h          | 107 +++++++
 esphome/components/tm1638/switch/__init__.py  |  24 ++
 .../tm1638/switch/tm1638_switch_led.cpp       |  20 ++
 .../tm1638/switch/tm1638_switch_led.h         |  23 ++
 esphome/components/tm1638/tm1638.cpp          | 288 ++++++++++++++++++
 esphome/components/tm1638/tm1638.h            |  81 +++++
 esphome/const.py                              |   2 +
 tests/test5.yaml                              | 133 ++++++++
 17 files changed, 855 insertions(+)
 create mode 100644 esphome/components/tm1638/__init__.py
 create mode 100644 esphome/components/tm1638/binary_sensor/__init__.py
 create mode 100644 esphome/components/tm1638/binary_sensor/tm1638_key.cpp
 create mode 100644 esphome/components/tm1638/binary_sensor/tm1638_key.h
 create mode 100644 esphome/components/tm1638/display.py
 create mode 100644 esphome/components/tm1638/output/__init__.py
 create mode 100644 esphome/components/tm1638/output/tm1638_output_led.cpp
 create mode 100644 esphome/components/tm1638/output/tm1638_output_led.h
 create mode 100644 esphome/components/tm1638/sevenseg.h
 create mode 100644 esphome/components/tm1638/switch/__init__.py
 create mode 100644 esphome/components/tm1638/switch/tm1638_switch_led.cpp
 create mode 100644 esphome/components/tm1638/switch/tm1638_switch_led.h
 create mode 100644 esphome/components/tm1638/tm1638.cpp
 create mode 100644 esphome/components/tm1638/tm1638.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 85ac107975..3a1087191c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -230,6 +230,7 @@ esphome/components/time/* @OttoWinter
 esphome/components/tlc5947/* @rnauber
 esphome/components/tm1621/* @Philippe12
 esphome/components/tm1637/* @glmnet
+esphome/components/tm1638/* @skykingjwc
 esphome/components/tmp102/* @timsavage
 esphome/components/tmp117/* @Azimath
 esphome/components/tof10120/* @wstrzalka
diff --git a/esphome/components/tm1638/__init__.py b/esphome/components/tm1638/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/tm1638/binary_sensor/__init__.py b/esphome/components/tm1638/binary_sensor/__init__.py
new file mode 100644
index 0000000000..7262d9e9e1
--- /dev/null
+++ b/esphome/components/tm1638/binary_sensor/__init__.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 CONF_KEY
+from ..display import tm1638_ns, TM1638Component, CONF_TM1638_ID
+
+TM1638Key = tm1638_ns.class_("TM1638Key", binary_sensor.BinarySensor)
+
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(TM1638Key),
+        cv.GenerateID(CONF_TM1638_ID): cv.use_id(TM1638Component),
+        cv.Required(CONF_KEY): cv.int_range(min=0, max=15),
+    }
+)
+
+
+async def to_code(config):
+    var = await binary_sensor.new_binary_sensor(config)
+    cg.add(var.set_keycode(config[CONF_KEY]))
+    hub = await cg.get_variable(config[CONF_TM1638_ID])
+    cg.add(hub.register_listener(var))
diff --git a/esphome/components/tm1638/binary_sensor/tm1638_key.cpp b/esphome/components/tm1638/binary_sensor/tm1638_key.cpp
new file mode 100644
index 0000000000..c143bafaea
--- /dev/null
+++ b/esphome/components/tm1638/binary_sensor/tm1638_key.cpp
@@ -0,0 +1,13 @@
+#include "tm1638_key.h"
+
+namespace esphome {
+namespace tm1638 {
+
+void TM1638Key::keys_update(uint8_t keys) {
+  bool pressed = keys & (1 << key_code_);
+  if (pressed != this->state)
+    this->publish_state(pressed);
+}
+
+}  // namespace tm1638
+}  // namespace esphome
diff --git a/esphome/components/tm1638/binary_sensor/tm1638_key.h b/esphome/components/tm1638/binary_sensor/tm1638_key.h
new file mode 100644
index 0000000000..0ea385f434
--- /dev/null
+++ b/esphome/components/tm1638/binary_sensor/tm1638_key.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "esphome/components/binary_sensor/binary_sensor.h"
+#include "../tm1638.h"
+
+namespace esphome {
+namespace tm1638 {
+
+class TM1638Key : public binary_sensor::BinarySensor, public KeyListener {
+ public:
+  void set_keycode(uint8_t key_code) { key_code_ = key_code; };
+  void keys_update(uint8_t keys) override;
+
+ protected:
+  uint8_t key_code_{0};
+};
+
+}  // namespace tm1638
+}  // namespace esphome
diff --git a/esphome/components/tm1638/display.py b/esphome/components/tm1638/display.py
new file mode 100644
index 0000000000..6339983674
--- /dev/null
+++ b/esphome/components/tm1638/display.py
@@ -0,0 +1,55 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import display
+from esphome.const import (
+    CONF_ID,
+    CONF_INTENSITY,
+    CONF_LAMBDA,
+    CONF_CLK_PIN,
+    CONF_DIO_PIN,
+    CONF_STB_PIN,
+)
+
+CODEOWNERS = ["@skykingjwc"]
+
+CONF_TM1638_ID = "tm1638_id"
+
+tm1638_ns = cg.esphome_ns.namespace("tm1638")
+TM1638Component = tm1638_ns.class_("TM1638Component", cg.PollingComponent)
+TM1638ComponentRef = TM1638Component.operator("ref")
+
+
+CONFIG_SCHEMA = display.BASIC_DISPLAY_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(TM1638Component),
+        cv.Required(CONF_CLK_PIN): pins.gpio_output_pin_schema,
+        cv.Required(CONF_STB_PIN): pins.gpio_output_pin_schema,
+        cv.Required(CONF_DIO_PIN): pins.gpio_output_pin_schema,
+        cv.Optional(CONF_INTENSITY, default=7): cv.int_range(min=0, max=8),
+    }
+).extend(cv.polling_component_schema("1s"))
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await display.register_display(var, config)
+
+    clk = await cg.gpio_pin_expression(config[CONF_CLK_PIN])
+    cg.add(var.set_clk_pin(clk))
+
+    dio = await cg.gpio_pin_expression(config[CONF_DIO_PIN])
+    cg.add(var.set_dio_pin(dio))
+
+    stb = await cg.gpio_pin_expression(config[CONF_STB_PIN])
+    cg.add(var.set_stb_pin(stb))
+
+    cg.add(var.set_intensity(config[CONF_INTENSITY]))
+
+    if CONF_LAMBDA in config:
+        lambda_ = await cg.process_lambda(
+            config[CONF_LAMBDA], [(TM1638ComponentRef, "it")], return_type=cg.void
+        )
+
+    cg.add(var.set_writer(lambda_))
diff --git a/esphome/components/tm1638/output/__init__.py b/esphome/components/tm1638/output/__init__.py
new file mode 100644
index 0000000000..2d982e409d
--- /dev/null
+++ b/esphome/components/tm1638/output/__init__.py
@@ -0,0 +1,25 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import output
+from esphome.const import CONF_ID, CONF_LED
+from ..display import tm1638_ns, TM1638Component, CONF_TM1638_ID
+
+TM1638OutputLed = tm1638_ns.class_("TM1638OutputLed", output.BinaryOutput, cg.Component)
+
+
+CONFIG_SCHEMA = output.BINARY_OUTPUT_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(TM1638OutputLed),
+        cv.GenerateID(CONF_TM1638_ID): cv.use_id(TM1638Component),
+        cv.Required(CONF_LED): cv.int_range(min=0, max=7),
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await output.register_output(var, config)
+    await cg.register_component(var, config)
+    cg.add(var.set_lednum(config[CONF_LED]))
+    hub = await cg.get_variable(config[CONF_TM1638_ID])
+    cg.add(var.set_tm1638(hub))
diff --git a/esphome/components/tm1638/output/tm1638_output_led.cpp b/esphome/components/tm1638/output/tm1638_output_led.cpp
new file mode 100644
index 0000000000..ea1c84e64b
--- /dev/null
+++ b/esphome/components/tm1638/output/tm1638_output_led.cpp
@@ -0,0 +1,17 @@
+#include "tm1638_output_led.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace tm1638 {
+
+static const char *const TAG = "tm1638.led";
+
+void TM1638OutputLed::write_state(bool state) { tm1638_->set_led(led_, state); }
+
+void TM1638OutputLed::dump_config() {
+  LOG_BINARY_OUTPUT(this);
+  ESP_LOGCONFIG(TAG, "  LED: %d", led_);
+}
+
+}  // namespace tm1638
+}  // namespace esphome
diff --git a/esphome/components/tm1638/output/tm1638_output_led.h b/esphome/components/tm1638/output/tm1638_output_led.h
new file mode 100644
index 0000000000..6aa1015aae
--- /dev/null
+++ b/esphome/components/tm1638/output/tm1638_output_led.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/output/binary_output.h"
+#include "../tm1638.h"
+
+namespace esphome {
+namespace tm1638 {
+
+class TM1638OutputLed : public output::BinaryOutput, public Component {
+ public:
+  void dump_config() override;
+
+  void set_tm1638(TM1638Component *tm1638) { tm1638_ = tm1638; }
+  void set_lednum(int led) { led_ = led; }
+
+ protected:
+  void write_state(bool state) override;
+
+  TM1638Component *tm1638_;
+  int led_;
+};
+
+}  // namespace tm1638
+}  // namespace esphome
diff --git a/esphome/components/tm1638/sevenseg.h b/esphome/components/tm1638/sevenseg.h
new file mode 100644
index 0000000000..e20a55a69f
--- /dev/null
+++ b/esphome/components/tm1638/sevenseg.h
@@ -0,0 +1,107 @@
+#pragma once
+
+namespace esphome {
+namespace tm1638 {
+namespace TM1638Translation {
+
+const unsigned char SEVEN_SEG[] PROGMEM = {
+    0x00, /* (space) */
+    0x86, /* ! */
+    0x22, /* " */
+    0x7E, /* # */
+    0x6D, /* $ */
+    0xD2, /* % */
+    0x46, /* & */
+    0x20, /* ' */
+    0x29, /* ( */
+    0x0B, /* ) */
+    0x21, /* * */
+    0x70, /* + */
+    0x10, /* , */
+    0x40, /* - */
+    0x80, /* . */
+    0x52, /* / */
+    0x3F, /* 0 */
+    0x06, /* 1 */
+    0x5B, /* 2 */
+    0x4F, /* 3 */
+    0x66, /* 4 */
+    0x6D, /* 5 */
+    0x7D, /* 6 */
+    0x07, /* 7 */
+    0x7F, /* 8 */
+    0x6F, /* 9 */
+    0x09, /* : */
+    0x0D, /* ; */
+    0x61, /* < */
+    0x48, /* = */
+    0x43, /* > */
+    0xD3, /* ? */
+    0x5F, /* @ */
+    0x77, /* A */
+    0x7C, /* B */
+    0x39, /* C */
+    0x5E, /* D */
+    0x79, /* E */
+    0x71, /* F */
+    0x3D, /* G */
+    0x76, /* H */
+    0x30, /* I */
+    0x1E, /* J */
+    0x75, /* K */
+    0x38, /* L */
+    0x15, /* M */
+    0x37, /* N */
+    0x3F, /* O */
+    0x73, /* P */
+    0x6B, /* Q */
+    0x33, /* R */
+    0x6D, /* S */
+    0x78, /* T */
+    0x3E, /* U */
+    0x3E, /* V */
+    0x2A, /* W */
+    0x76, /* X */
+    0x6E, /* Y */
+    0x5B, /* Z */
+    0x39, /* [ */
+    0x64, /* \ */
+    0x0F, /* ] */
+    0x23, /* ^ */
+    0x08, /* _ */
+    0x02, /* ` */
+    0x5F, /* a */
+    0x7C, /* b */
+    0x58, /* c */
+    0x5E, /* d */
+    0x7B, /* e */
+    0x71, /* f */
+    0x6F, /* g */
+    0x74, /* h */
+    0x10, /* i */
+    0x0C, /* j */
+    0x75, /* k */
+    0x30, /* l */
+    0x14, /* m */
+    0x54, /* n */
+    0x5C, /* o */
+    0x73, /* p */
+    0x67, /* q */
+    0x50, /* r */
+    0x6D, /* s */
+    0x78, /* t */
+    0x1C, /* u */
+    0x1C, /* v */
+    0x14, /* w */
+    0x76, /* x */
+    0x6E, /* y */
+    0x5B, /* z */
+    0x46, /* { */
+    0x30, /* | */
+    0x70, /* } */
+    0x01, /* ~ */
+};
+
+};  // namespace TM1638Translation
+}  // namespace tm1638
+}  // namespace esphome
diff --git a/esphome/components/tm1638/switch/__init__.py b/esphome/components/tm1638/switch/__init__.py
new file mode 100644
index 0000000000..ed6aa91d03
--- /dev/null
+++ b/esphome/components/tm1638/switch/__init__.py
@@ -0,0 +1,24 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import switch
+from esphome.const import CONF_LED
+from ..display import tm1638_ns, TM1638Component, CONF_TM1638_ID
+
+TM1638SwitchLed = tm1638_ns.class_("TM1638SwitchLed", switch.Switch, cg.Component)
+
+
+CONFIG_SCHEMA = switch.SWITCH_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(TM1638SwitchLed),
+        cv.GenerateID(CONF_TM1638_ID): cv.use_id(TM1638Component),
+        cv.Required(CONF_LED): cv.int_range(min=0, max=7),
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+async def to_code(config):
+    var = await switch.new_switch(config)
+    await cg.register_component(var, config)
+    cg.add(var.set_lednum(config[CONF_LED]))
+    hub = await cg.get_variable(config[CONF_TM1638_ID])
+    cg.add(var.set_tm1638(hub))
diff --git a/esphome/components/tm1638/switch/tm1638_switch_led.cpp b/esphome/components/tm1638/switch/tm1638_switch_led.cpp
new file mode 100644
index 0000000000..60c9e8b4a9
--- /dev/null
+++ b/esphome/components/tm1638/switch/tm1638_switch_led.cpp
@@ -0,0 +1,20 @@
+#include "tm1638_switch_led.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace tm1638 {
+
+static const char *const TAG = "tm1638.led";
+
+void TM1638SwitchLed::write_state(bool state) {
+  tm1638_->set_led(led_, state);
+  publish_state(state);
+}
+
+void TM1638SwitchLed::dump_config() {
+  LOG_SWITCH("", "TM1638 LED", this);
+  ESP_LOGCONFIG(TAG, "  LED: %d", led_);
+}
+
+}  // namespace tm1638
+}  // namespace esphome
diff --git a/esphome/components/tm1638/switch/tm1638_switch_led.h b/esphome/components/tm1638/switch/tm1638_switch_led.h
new file mode 100644
index 0000000000..10516e0079
--- /dev/null
+++ b/esphome/components/tm1638/switch/tm1638_switch_led.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/switch/switch.h"
+#include "../tm1638.h"
+
+namespace esphome {
+namespace tm1638 {
+
+class TM1638SwitchLed : public switch_::Switch, public Component {
+ public:
+  void dump_config() override;
+
+  void set_tm1638(TM1638Component *tm1638) { tm1638_ = tm1638; }
+  void set_lednum(int led) { led_ = led; }
+
+ protected:
+  void write_state(bool state) override;
+  TM1638Component *tm1638_;
+  int led_;
+};
+}  // namespace tm1638
+}  // namespace esphome
diff --git a/esphome/components/tm1638/tm1638.cpp b/esphome/components/tm1638/tm1638.cpp
new file mode 100644
index 0000000000..526b53f601
--- /dev/null
+++ b/esphome/components/tm1638/tm1638.cpp
@@ -0,0 +1,288 @@
+#include "tm1638.h"
+#include "sevenseg.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/hal.h"
+
+namespace esphome {
+namespace tm1638 {
+
+static const char *const TAG = "display.tm1638";
+static const uint8_t TM1638_REGISTER_FIXEDADDRESS = 0x44;
+static const uint8_t TM1638_REGISTER_AUTOADDRESS = 0x40;
+static const uint8_t TM1638_REGISTER_READBUTTONS = 0x42;
+static const uint8_t TM1638_REGISTER_DISPLAYOFF = 0x80;
+static const uint8_t TM1638_REGISTER_DISPLAYON = 0x88;
+static const uint8_t TM1638_REGISTER_7SEG_0 = 0xC0;
+static const uint8_t TM1638_REGISTER_LED_0 = 0xC1;
+static const uint8_t TM1638_UNKNOWN_CHAR = 0b11111111;
+
+static const uint8_t TM1638_SHIFT_DELAY = 4;  // clock pause between commands, default 4ms
+
+void TM1638Component::setup() {
+  ESP_LOGD(TAG, "Setting up TM1638...");
+
+  this->clk_pin_->setup();  // OUTPUT
+  this->dio_pin_->setup();  // OUTPUT
+  this->stb_pin_->setup();  // OUTPUT
+
+  this->clk_pin_->pin_mode(gpio::FLAG_OUTPUT);
+  this->dio_pin_->pin_mode(gpio::FLAG_OUTPUT);
+  this->stb_pin_->pin_mode(gpio::FLAG_OUTPUT);
+
+  this->clk_pin_->digital_write(false);
+  this->dio_pin_->digital_write(false);
+  this->stb_pin_->digital_write(false);
+
+  this->set_intensity(intensity_);
+
+  this->reset_();  // all LEDs off
+
+  for (uint8_t i = 0; i < 8; i++)  // zero fill print buffer
+    this->buffer_[i] = 0;
+}
+
+void TM1638Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "TM1638:");
+  ESP_LOGCONFIG(TAG, "  Intensity: %u", this->intensity_);
+  LOG_PIN("  CLK Pin: ", this->clk_pin_);
+  LOG_PIN("  DIO Pin: ", this->dio_pin_);
+  LOG_PIN("  STB Pin: ", this->stb_pin_);
+  LOG_UPDATE_INTERVAL(this);
+}
+
+void TM1638Component::loop() {
+  if (this->listeners_.empty())
+    return;
+
+  uint8_t keys = this->get_keys();
+  for (auto &listener : this->listeners_)
+    listener->keys_update(keys);
+}
+
+uint8_t TM1638Component::get_keys() {
+  uint8_t buttons = 0;
+
+  this->stb_pin_->digital_write(false);
+
+  this->shift_out_(TM1638_REGISTER_READBUTTONS);
+
+  this->dio_pin_->pin_mode(gpio::FLAG_INPUT);
+
+  delayMicroseconds(10);
+
+  for (uint8_t i = 0; i < 4; i++) {  // read the 4 button registers
+    uint8_t v = this->shift_in_();
+    buttons |= v << i;  // shift bits to correct slots in the byte
+  }
+
+  this->dio_pin_->pin_mode(gpio::FLAG_OUTPUT);
+
+  this->stb_pin_->digital_write(true);
+
+  return buttons;
+}
+
+void TM1638Component::update() {  // this is called at the interval specified in the config.yaml
+  if (this->writer_.has_value()) {
+    (*this->writer_)(*this);
+  }
+
+  this->display();
+}
+
+float TM1638Component::get_setup_priority() const { return setup_priority::PROCESSOR; }
+
+void TM1638Component::display() {
+  for (uint8_t i = 0; i < 8; i++) {
+    this->set_7seg_(i, buffer_[i]);
+  }
+}
+
+void TM1638Component::reset_() {
+  uint8_t num_commands = 16;  // 16 addresses, 8 for 7seg and 8 for LEDs
+  uint8_t commands[num_commands];
+
+  for (uint8_t i = 0; i < num_commands; i++) {
+    commands[i] = 0;
+  }
+
+  this->send_command_sequence_(commands, num_commands, TM1638_REGISTER_7SEG_0);
+}
+
+/////////////// LEDs /////////////////
+
+void TM1638Component::set_led(int led_pos, bool led_on_off) {
+  this->send_command_(TM1638_REGISTER_FIXEDADDRESS);
+
+  uint8_t commands[2];
+
+  commands[0] = TM1638_REGISTER_LED_0 + (led_pos << 1);
+  commands[1] = led_on_off;
+
+  this->send_commands_(commands, 2);
+}
+
+void TM1638Component::set_7seg_(int seg_pos, uint8_t seg_bits) {
+  this->send_command_(TM1638_REGISTER_FIXEDADDRESS);
+
+  uint8_t commands[2] = {};
+
+  commands[0] = TM1638_REGISTER_7SEG_0 + (seg_pos << 1);
+  commands[1] = seg_bits;
+
+  this->send_commands_(commands, 2);
+}
+
+void TM1638Component::set_intensity(uint8_t brightness_level) {
+  this->intensity_ = brightness_level;
+
+  this->send_command_(TM1638_REGISTER_FIXEDADDRESS);
+
+  if (brightness_level > 0) {
+    this->send_command_((uint8_t)(TM1638_REGISTER_DISPLAYON | intensity_));
+  } else {
+    this->send_command_(TM1638_REGISTER_DISPLAYOFF);
+  }
+}
+
+/////////////// DISPLAY PRINT /////////////////
+
+uint8_t TM1638Component::print(uint8_t start_pos, const char *str) {
+  uint8_t pos = start_pos;
+
+  bool last_was_dot = false;
+
+  for (; *str != '\0'; str++) {
+    uint8_t data = TM1638_UNKNOWN_CHAR;
+
+    if (*str >= ' ' && *str <= '~') {
+      data = progmem_read_byte(&TM1638Translation::SEVEN_SEG[*str - 32]);  // subract 32 to account for ASCII offset
+    } else if (data == TM1638_UNKNOWN_CHAR) {
+      ESP_LOGW(TAG, "Encountered character '%c' with no TM1638 representation while translating string!", *str);
+    }
+
+    if (*str == '.')  // handle dots
+    {
+      if (pos != start_pos &&
+          !last_was_dot)  // if we are not at the first position, backup by one unless last char was a dot
+      {
+        pos--;
+      }
+      this->buffer_[pos] |= 0b10000000;  // turn on the dot on the previous position
+      last_was_dot = true;               // set a bit in case the next chracter is also a dot
+    } else                               // if not a dot, then just write the character to display
+    {
+      if (pos >= 8) {
+        ESP_LOGI(TAG, "TM1638 String is too long for the display!");
+        break;
+      }
+      this->buffer_[pos] = data;
+      last_was_dot = false;  // clear dot tracking bit
+    }
+
+    pos++;
+  }
+  return pos - start_pos;
+}
+
+/////////////// PRINT /////////////////
+
+uint8_t TM1638Component::print(const char *str) { return this->print(0, str); }
+
+uint8_t TM1638Component::printf(uint8_t pos, const char *format, ...) {
+  va_list arg;
+  va_start(arg, format);
+  char buffer[64];
+  int ret = vsnprintf(buffer, sizeof(buffer), format, arg);
+  va_end(arg);
+  if (ret > 0)
+    return this->print(pos, buffer);
+  return 0;
+}
+uint8_t TM1638Component::printf(const char *format, ...) {
+  va_list arg;
+  va_start(arg, format);
+  char buffer[64];
+  int ret = vsnprintf(buffer, sizeof(buffer), format, arg);
+  va_end(arg);
+  if (ret > 0)
+    return this->print(buffer);
+  return 0;
+}
+
+#ifdef USE_TIME
+uint8_t TM1638Component::strftime(uint8_t pos, const char *format, time::ESPTime time) {
+  char buffer[64];
+  size_t ret = time.strftime(buffer, sizeof(buffer), format);
+  if (ret > 0)
+    return this->print(pos, buffer);
+  return 0;
+}
+uint8_t TM1638Component::strftime(const char *format, time::ESPTime time) { return this->strftime(0, format, time); }
+#endif
+
+//////////////// SPI   ////////////////
+
+void TM1638Component::send_command_(uint8_t value) {
+  this->stb_pin_->pin_mode(gpio::FLAG_OUTPUT);
+  this->stb_pin_->digital_write(false);
+  this->shift_out_(value);
+  this->stb_pin_->digital_write(true);
+}
+
+void TM1638Component::send_commands_(uint8_t const commands[], uint8_t num_commands) {
+  this->stb_pin_->digital_write(false);
+
+  for (uint8_t i = 0; i < num_commands; i++) {
+    uint8_t command = commands[i];
+    this->shift_out_(command);
+  }
+  this->stb_pin_->digital_write(true);
+}
+
+void TM1638Component::send_command_leave_open_(uint8_t value) {
+  this->stb_pin_->digital_write(false);
+  this->shift_out_(value);
+}
+
+void TM1638Component::send_command_sequence_(uint8_t commands[], uint8_t num_commands, uint8_t starting_address) {
+  this->send_command_(TM1638_REGISTER_AUTOADDRESS);
+  this->send_command_leave_open_(starting_address);
+
+  for (uint8_t i = 0; i < num_commands; i++) {
+    this->shift_out_(commands[i]);
+  }
+
+  this->stb_pin_->digital_write(true);
+}
+
+uint8_t TM1638Component::shift_in_() {
+  uint8_t value = 0;
+
+  for (int i = 0; i < 8; ++i) {
+    value |= dio_pin_->digital_read() << i;
+    delayMicroseconds(TM1638_SHIFT_DELAY);
+    this->clk_pin_->digital_write(true);
+    delayMicroseconds(TM1638_SHIFT_DELAY);
+    this->clk_pin_->digital_write(false);
+    delayMicroseconds(TM1638_SHIFT_DELAY);
+  }
+  return value;
+}
+
+void TM1638Component::shift_out_(uint8_t val) {
+  for (int i = 0; i < 8; i++) {
+    this->dio_pin_->digital_write((val & (1 << i)));
+    delayMicroseconds(TM1638_SHIFT_DELAY);
+
+    this->clk_pin_->digital_write(true);
+    delayMicroseconds(TM1638_SHIFT_DELAY);
+
+    this->clk_pin_->digital_write(false);
+    delayMicroseconds(TM1638_SHIFT_DELAY);
+  }
+}
+
+}  // namespace tm1638
+}  // namespace esphome
diff --git a/esphome/components/tm1638/tm1638.h b/esphome/components/tm1638/tm1638.h
new file mode 100644
index 0000000000..44160ad227
--- /dev/null
+++ b/esphome/components/tm1638/tm1638.h
@@ -0,0 +1,81 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/defines.h"
+#include "esphome/core/automation.h"
+#include "esphome/core/hal.h"
+
+#ifdef USE_TIME
+#include "esphome/components/time/real_time_clock.h"
+#endif
+
+namespace esphome {
+namespace tm1638 {
+
+class KeyListener {
+ public:
+  virtual void keys_update(uint8_t keys){};
+};
+
+class TM1638Component;
+
+using tm1638_writer_t = std::function<void(TM1638Component &)>;
+
+class TM1638Component : public PollingComponent {
+ public:
+  void set_writer(tm1638_writer_t &&writer) { this->writer_ = writer; }
+  void setup() override;
+  void dump_config() override;
+  void update() override;
+  float get_setup_priority() const override;
+  void set_intensity(uint8_t brightness_level);
+  void display();
+
+  void set_clk_pin(GPIOPin *pin) { this->clk_pin_ = pin; }
+  void set_dio_pin(GPIOPin *pin) { this->dio_pin_ = pin; }
+  void set_stb_pin(GPIOPin *pin) { this->stb_pin_ = pin; }
+
+  void register_listener(KeyListener *listener) { this->listeners_.push_back(listener); }
+
+  /// Evaluate the printf-format and print the result at the given position.
+  uint8_t printf(uint8_t pos, const char *format, ...) __attribute__((format(printf, 3, 4)));
+  /// Evaluate the printf-format and print the result at position 0.
+  uint8_t printf(const char *format, ...) __attribute__((format(printf, 2, 3)));
+
+  /// Print `str` at the given position.
+  uint8_t print(uint8_t pos, const char *str);
+  /// Print `str` at position 0.
+  uint8_t print(const char *str);
+
+  void loop() override;
+  uint8_t get_keys();
+
+#ifdef USE_TIME
+  /// Evaluate the strftime-format and print the result at the given position.
+  uint8_t strftime(uint8_t pos, const char *format, time::ESPTime time) __attribute__((format(strftime, 3, 0)));
+  /// Evaluate the strftime-format and print the result at position 0.
+  uint8_t strftime(const char *format, time::ESPTime time) __attribute__((format(strftime, 2, 0)));
+#endif
+
+  void set_led(int led_pos, bool led_on_off);
+
+ protected:
+  void set_7seg_(int seg_pos, uint8_t seg_bits);
+  void send_command_(uint8_t value);
+  void send_command_leave_open_(uint8_t value);
+  void send_commands_(uint8_t const commands[], uint8_t num_commands);
+  void send_command_sequence_(uint8_t commands[], uint8_t num_commands, uint8_t starting_address);
+  void shift_out_(uint8_t value);
+  void reset_();
+  uint8_t shift_in_();
+  uint8_t intensity_{};  /// brghtness of the display  0 through 7
+  GPIOPin *clk_pin_;
+  GPIOPin *stb_pin_;
+  GPIOPin *dio_pin_;
+  uint8_t *buffer_ = new uint8_t[8];
+  optional<tm1638_writer_t> writer_{};
+  std::vector<KeyListener *> listeners_{};
+};
+
+}  // namespace tm1638
+}  // namespace esphome
diff --git a/esphome/const.py b/esphome/const.py
index 51c07ab666..5153efbbe0 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -334,6 +334,7 @@ CONF_LAMBDA = "lambda"
 CONF_LAST_CONFIDENCE = "last_confidence"
 CONF_LAST_FINGER_ID = "last_finger_id"
 CONF_LATITUDE = "latitude"
+CONF_LED = "led"
 CONF_LEGEND = "legend"
 CONF_LENGTH = "length"
 CONF_LEVEL = "level"
@@ -653,6 +654,7 @@ CONF_STATE_CLASS = "state_class"
 CONF_STATE_TOPIC = "state_topic"
 CONF_STATIC_IP = "static_ip"
 CONF_STATUS = "status"
+CONF_STB_PIN = "stb_pin"
 CONF_STEP = "step"
 CONF_STEP_MODE = "step_mode"
 CONF_STEP_PIN = "step_pin"
diff --git a/tests/test5.yaml b/tests/test5.yaml
index 3b6862a4d4..7fc20c452f 100644
--- a/tests/test5.yaml
+++ b/tests/test5.yaml
@@ -80,6 +80,91 @@ binary_sensor:
     bitmask: 0x80  # (bit 8)
     lambda: "return x;"
 
+  - platform: tm1638
+    id: Button0
+    key: 0
+    filters:
+      - delayed_on: 10ms
+    on_press:
+      then:
+        - switch.turn_on: Led0
+    on_release:
+      then:
+        - switch.turn_off: Led0
+
+  - platform: tm1638
+    id: Button1
+    key: 1
+    on_press:
+      then:
+        - switch.turn_on: Led1
+    on_release:
+      then:
+        - switch.turn_off: Led1
+
+  - platform: tm1638
+    id: Button2
+    key: 2
+    on_press:
+      then:
+        - switch.turn_on: Led2
+    on_release:
+      then:
+        - switch.turn_off: Led2
+
+  - platform: tm1638
+    id: Button3
+    key: 3
+    on_press:
+      then:
+        - switch.turn_on: Led3
+    on_release:
+      then:
+        - switch.turn_off: Led3
+
+  - platform: tm1638
+    id: Button4
+    key: 4
+    on_press:
+      then:
+        - output.turn_on: Led4
+    on_release:
+      then:
+        - output.turn_off: Led4
+
+  - platform: tm1638
+    id: Button5
+    key: 5
+    on_press:
+      then:
+        - output.turn_on: Led5
+    on_release:
+      then:
+        - output.turn_off: Led5
+
+  - platform: tm1638
+    id: Button6
+    key: 6
+    on_press:
+      then:
+        - output.turn_on: Led6
+    on_release:
+      then:
+        - output.turn_off: Led6
+
+  - platform: tm1638
+    id: Button7
+    key: 7
+    on_press:
+      then:
+        - output.turn_on: Led7
+    on_release:
+      then:
+        - output.turn_off: Led7
+
+
+
+
 tlc5947:
   data_pin: GPIO12
   clock_pin: GPIO14
@@ -106,6 +191,22 @@ output:
     address: 0x9001
     value_type: U_WORD
 
+  - platform: tm1638
+    id: Led4
+    led: 4
+
+  - platform: tm1638
+    id: Led5
+    led: 5
+
+  - platform: tm1638
+    id: Led6
+    led: 6
+
+  - platform: tm1638
+    id: Led7
+    led: 7
+
 demo:
 
 esp32_ble:
@@ -354,3 +455,35 @@ switch:
     register_type: coil
     address: 2
     bitmask: 1
+
+  - platform: tm1638
+    id: Led0
+    led: 0
+    name: TM1638Led0
+
+  - platform: tm1638
+    id: Led1
+    led: 1
+    name: TM1638Led1
+
+  - platform: tm1638
+    id: Led2
+    led: 2
+    name: TM1638Led2
+
+  - platform: tm1638
+    id: Led3
+    led: 3
+    name: TM1638Led3
+
+display:
+  - platform: tm1638
+    id: primarydisplay
+    stb_pin: 5 #TM1638 STB
+    clk_pin: 18 #TM1638 CLK
+    dio_pin: 23 #TM1638 DIO
+    update_interval: 5s
+    intensity: 5
+    lambda: |-
+      it.print("81818181");
+

From ed8f343aadef51328a26404bf8d006597cf1ff00 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Tue, 13 Sep 2022 01:17:33 +0200
Subject: [PATCH 055/838] Remove status_set_error from ufire_ec (#3792)

---
 esphome/components/ufire_ec/ufire_ec.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/esphome/components/ufire_ec/ufire_ec.cpp b/esphome/components/ufire_ec/ufire_ec.cpp
index d7ed890e21..7af4fadf75 100644
--- a/esphome/components/ufire_ec/ufire_ec.cpp
+++ b/esphome/components/ufire_ec/ufire_ec.cpp
@@ -12,7 +12,6 @@ void UFireECComponent::setup() {
   uint8_t version;
   if (!this->read_byte(REGISTER_VERSION, &version) && version != 0xFF) {
     this->mark_failed();
-    this->status_set_error();
     return;
   }
   ESP_LOGI(TAG, "Found ufire_ec board version 0x%02X", version);

From 15f0e54cbfadf65a065797796db4dcfeef6d94c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Sep 2022 09:57:43 +1200
Subject: [PATCH 056/838] Bump frenck/action-yamllint from 1.2.0 to 1.3.0
 (#3798)

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7496ccf388..b5b7521b3f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -173,7 +173,7 @@ jobs:
 
       - name: Run yamllint
         if: matrix.id == 'yamllint'
-        uses: frenck/action-yamllint@v1.2.0
+        uses: frenck/action-yamllint@v1.3.0
 
       - name: Suggested changes
         run: script/ci-suggest-changes

From 49465223a48a49434434d9a59206c15fea1b1229 Mon Sep 17 00:00:00 2001
From: Jonathan V <11986470+jonofmac@users.noreply.github.com>
Date: Tue, 13 Sep 2022 18:10:12 -0500
Subject: [PATCH 057/838] esp32_ble_tracker continuous and one shot scanning
 modes (#3649)

Co-authored-by: Jonathan Valdez <@jonofmac>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .../components/esp32_ble_tracker/__init__.py  | 39 +++++++++++++++
 .../components/esp32_ble_tracker/automation.h |  8 ++++
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   | 47 +++++++++++++++++--
 .../esp32_ble_tracker/esp32_ble_tracker.h     | 21 +++++++++
 4 files changed, 112 insertions(+), 3 deletions(-)

diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index e647b74a8f..db7fcc68ae 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -23,6 +23,8 @@ CONF_ESP32_BLE_ID = "esp32_ble_id"
 CONF_SCAN_PARAMETERS = "scan_parameters"
 CONF_WINDOW = "window"
 CONF_ACTIVE = "active"
+CONF_CONTINUOUS = "continuous"
+CONF_ON_SCAN_END = "on_scan_end"
 esp32_ble_tracker_ns = cg.esphome_ns.namespace("esp32_ble_tracker")
 ESP32BLETracker = esp32_ble_tracker_ns.class_("ESP32BLETracker", cg.Component)
 ESPBTClient = esp32_ble_tracker_ns.class_("ESPBTClient")
@@ -42,6 +44,13 @@ BLEManufacturerDataAdvertiseTrigger = esp32_ble_tracker_ns.class_(
     "BLEManufacturerDataAdvertiseTrigger",
     automation.Trigger.template(adv_data_t_const_ref),
 )
+BLEEndOfScanTrigger = esp32_ble_tracker_ns.class_(
+    "BLEEndOfScanTrigger", automation.Trigger.template()
+)
+# Actions
+ESP32BLEStartScanAction = esp32_ble_tracker_ns.class_(
+    "ESP32BLEStartScanAction", automation.Action
+)
 
 
 def validate_scan_parameters(config):
@@ -138,6 +147,7 @@ CONFIG_SCHEMA = cv.Schema(
                         CONF_WINDOW, default="30ms"
                     ): cv.positive_time_period_milliseconds,
                     cv.Optional(CONF_ACTIVE, default=True): cv.boolean,
+                    cv.Optional(CONF_CONTINUOUS, default=True): cv.boolean,
                 }
             ),
             validate_scan_parameters,
@@ -168,6 +178,9 @@ CONFIG_SCHEMA = cv.Schema(
                 cv.Required(CONF_MANUFACTURER_ID): bt_uuid,
             }
         ),
+        cv.Optional(CONF_ON_SCAN_END): automation.validate_automation(
+            {cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(BLEEndOfScanTrigger)}
+        ),
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
@@ -186,6 +199,7 @@ async def to_code(config):
     cg.add(var.set_scan_interval(int(params[CONF_INTERVAL].total_milliseconds / 0.625)))
     cg.add(var.set_scan_window(int(params[CONF_WINDOW].total_milliseconds / 0.625)))
     cg.add(var.set_scan_active(params[CONF_ACTIVE]))
+    cg.add(var.set_scan_continuous(params[CONF_CONTINUOUS]))
     for conf in config.get(CONF_ON_BLE_ADVERTISE, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         if CONF_MAC_ADDRESS in conf:
@@ -215,11 +229,36 @@ async def to_code(config):
         if CONF_MAC_ADDRESS in conf:
             cg.add(trigger.set_address(conf[CONF_MAC_ADDRESS].as_hex))
         await automation.build_automation(trigger, [(adv_data_t_const_ref, "x")], conf)
+    for conf in config.get(CONF_ON_SCAN_END, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
 
     if CORE.using_esp_idf:
         add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)
 
 
+ESP32_BLE_START_SCAN_ACTION_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.use_id(ESP32BLETracker),
+        cv.Optional(CONF_CONTINUOUS, default=False): cv.templatable(cv.boolean),
+    }
+)
+
+
+@automation.register_action(
+    "esp32_ble_tracker.start_scan",
+    ESP32BLEStartScanAction,
+    ESP32_BLE_START_SCAN_ACTION_SCHEMA,
+)
+async def esp32_ble_tracker_start_scan_action_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)
+    cg.add(var.set_continuous(config[CONF_CONTINUOUS]))
+    return var
+
+
 async def register_ble_device(var, config):
     paren = await cg.get_variable(config[CONF_ESP32_BLE_ID])
     cg.add(paren.register_listener(var))
diff --git a/esphome/components/esp32_ble_tracker/automation.h b/esphome/components/esp32_ble_tracker/automation.h
index 3505e9c26d..d9e3b820af 100644
--- a/esphome/components/esp32_ble_tracker/automation.h
+++ b/esphome/components/esp32_ble_tracker/automation.h
@@ -76,6 +76,14 @@ class BLEManufacturerDataAdvertiseTrigger : public Trigger<const adv_data_t &>,
   ESPBTUUID uuid_;
 };
 
+class BLEEndOfScanTrigger : public Trigger<>, public ESPBTDeviceListener {
+ public:
+  explicit BLEEndOfScanTrigger(ESP32BLETracker *parent) { parent->register_listener(this); }
+
+  bool parse_device(const ESPBTDevice &device) override { return false; }
+  void on_scan_end() override { this->trigger(); }
+};
+
 }  // namespace esp32_ble_tracker
 }  // namespace esphome
 
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 82945dc771..743f246d3a 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -46,13 +46,15 @@ void ESP32BLETracker::setup() {
   global_esp32_ble_tracker = this;
   this->scan_result_lock_ = xSemaphoreCreateMutex();
   this->scan_end_lock_ = xSemaphoreCreateMutex();
-
+  this->scanner_idle_ = true;
   if (!ESP32BLETracker::ble_setup()) {
     this->mark_failed();
     return;
   }
 
-  global_esp32_ble_tracker->start_scan_(true);
+  if (this->scan_continuous_) {
+    global_esp32_ble_tracker->start_scan_(true);
+  }
 }
 
 void ESP32BLETracker::loop() {
@@ -68,14 +70,25 @@ void ESP32BLETracker::loop() {
     ble_event = this->ble_events_.pop();
   }
 
+  if (this->scanner_idle_) {
+    return;
+  }
+
   bool connecting = false;
   for (auto *client : this->clients_) {
     if (client->state() == ClientState::CONNECTING || client->state() == ClientState::DISCOVERED)
       connecting = true;
   }
+
   if (!connecting && xSemaphoreTake(this->scan_end_lock_, 0L)) {
     xSemaphoreGive(this->scan_end_lock_);
-    global_esp32_ble_tracker->start_scan_(false);
+    if (this->scan_continuous_) {
+      global_esp32_ble_tracker->start_scan_(false);
+    } else if (xSemaphoreTake(this->scan_end_lock_, 0L) && !this->scanner_idle_) {
+      xSemaphoreGive(this->scan_end_lock_);
+      global_esp32_ble_tracker->end_of_scan_();
+      return;
+    }
   }
 
   if (xSemaphoreTake(this->scan_result_lock_, 5L / portTICK_PERIOD_MS)) {
@@ -134,6 +147,15 @@ void ESP32BLETracker::loop() {
   }
 }
 
+void ESP32BLETracker::start_scan() {
+  if (xSemaphoreTake(this->scan_end_lock_, 0L)) {
+    xSemaphoreGive(this->scan_end_lock_);
+    global_esp32_ble_tracker->start_scan_(true);
+  } else {
+    ESP_LOGW(TAG, "Scan requested when a scan is already in progress. Ignoring.");
+  }
+}
+
 bool ESP32BLETracker::ble_setup() {
   // Initialize non-volatile storage for the bluetooth controller
   esp_err_t err = nvs_flash_init();
@@ -225,6 +247,7 @@ 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;
@@ -240,6 +263,22 @@ void ESP32BLETracker::start_scan_(bool first) {
   });
 }
 
+void ESP32BLETracker::end_of_scan_() {
+  if (!xSemaphoreTake(this->scan_end_lock_, 0L)) {
+    ESP_LOGW(TAG, "Cannot clean up end of scan!");
+    return;
+  }
+
+  ESP_LOGD(TAG, "End of scan.");
+  this->scanner_idle_ = true;
+  this->already_discovered_.clear();
+  xSemaphoreGive(this->scan_end_lock_);
+  this->cancel_timeout("scan");
+
+  for (auto *listener : this->listeners_)
+    listener->on_scan_end();
+}
+
 void ESP32BLETracker::register_client(ESPBTClient *client) {
   client->app_id = ++this->app_id_;
   this->clients_.push_back(client);
@@ -719,7 +758,9 @@ void ESP32BLETracker::dump_config() {
   ESP_LOGCONFIG(TAG, "  Scan Interval: %.1f ms", this->scan_interval_ * 0.625f);
   ESP_LOGCONFIG(TAG, "  Scan Window: %.1f ms", this->scan_window_ * 0.625f);
   ESP_LOGCONFIG(TAG, "  Scan Type: %s", this->scan_active_ ? "ACTIVE" : "PASSIVE");
+  ESP_LOGCONFIG(TAG, "  Continuous Scanning: %s", this->scan_continuous_ ? "True" : "False");
 }
+
 void ESP32BLETracker::print_bt_device_info(const ESPBTDevice &device) {
   const uint64_t address = device.address_uint64();
   for (auto &disc : this->already_discovered_) {
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 62fff30a20..1d2900af69 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "esphome/core/component.h"
+#include "esphome/core/automation.h"
 #include "esphome/core/helpers.h"
 #include "queue.h"
 
@@ -171,6 +172,7 @@ class ESP32BLETracker : public Component {
   void set_scan_interval(uint32_t scan_interval) { scan_interval_ = scan_interval; }
   void set_scan_window(uint32_t scan_window) { scan_window_ = scan_window; }
   void set_scan_active(bool scan_active) { scan_active_ = scan_active; }
+  void set_scan_continuous(bool scan_continuous) { scan_continuous_ = scan_continuous; }
 
   /// Setup the FreeRTOS task and the Bluetooth stack.
   void setup() override;
@@ -188,11 +190,15 @@ class ESP32BLETracker : public Component {
 
   void print_bt_device_info(const ESPBTDevice &device);
 
+  void start_scan();
+
  protected:
   /// The FreeRTOS task managing the bluetooth interface.
   static bool ble_setup();
   /// 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
+  void end_of_scan_();
   /// Callback that will handle all GAP events and redistribute them to other callbacks.
   static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param);
   void real_gap_event_handler_(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param);
@@ -221,7 +227,9 @@ class ESP32BLETracker : public Component {
   uint32_t scan_duration_;
   uint32_t scan_interval_;
   uint32_t scan_window_;
+  bool scan_continuous_;
   bool scan_active_;
+  bool scanner_idle_;
   SemaphoreHandle_t scan_result_lock_;
   SemaphoreHandle_t scan_end_lock_;
   size_t scan_result_index_{0};
@@ -235,6 +243,19 @@ class ESP32BLETracker : public Component {
 // NOLINTNEXTLINE
 extern ESP32BLETracker *global_esp32_ble_tracker;
 
+template<typename... Ts> class ESP32BLEStartScanAction : public Action<Ts...> {
+ public:
+  ESP32BLEStartScanAction(ESP32BLETracker *parent) : parent_(parent) {}
+  TEMPLATABLE_VALUE(bool, continuous)
+  void play(Ts... x) override {
+    this->parent_->set_scan_continuous(this->continuous_.value(x...));
+    this->parent_->start_scan();
+  }
+
+ protected:
+  ESP32BLETracker *parent_;
+};
+
 }  // namespace esp32_ble_tracker
 }  // namespace esphome
 

From b3cca5dcb63a2060921801d77854048f7ba1a844 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 14 Sep 2022 14:57:45 +1200
Subject: [PATCH 058/838] Add stop action for ble scanning (#3799)

---
 .../components/esp32_ble_tracker/__init__.py  | 25 +++++++++++++++++++
 .../components/esp32_ble_tracker/automation.h | 18 +++++++++++++
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   |  7 ++++++
 .../esp32_ble_tracker/esp32_ble_tracker.h     | 14 +----------
 4 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index db7fcc68ae..f70fea0639 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -51,6 +51,9 @@ BLEEndOfScanTrigger = esp32_ble_tracker_ns.class_(
 ESP32BLEStartScanAction = esp32_ble_tracker_ns.class_(
     "ESP32BLEStartScanAction", automation.Action
 )
+ESP32BLEStopScanAction = esp32_ble_tracker_ns.class_(
+    "ESP32BLEStopScanAction", automation.Action
+)
 
 
 def validate_scan_parameters(config):
@@ -259,6 +262,28 @@ async def esp32_ble_tracker_start_scan_action_to_code(
     return var
 
 
+ESP32_BLE_STOP_SCAN_ACTION_SCHEMA = automation.maybe_simple_id(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.use_id(ESP32BLETracker),
+        }
+    )
+)
+
+
+@automation.register_action(
+    "esp32_ble_tracker.stop_scan",
+    ESP32BLEStopScanAction,
+    ESP32_BLE_STOP_SCAN_ACTION_SCHEMA,
+)
+async def esp32_ble_tracker_stop_scan_action_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
+
+
 async def register_ble_device(var, config):
     paren = await cg.get_variable(config[CONF_ESP32_BLE_ID])
     cg.add(paren.register_listener(var))
diff --git a/esphome/components/esp32_ble_tracker/automation.h b/esphome/components/esp32_ble_tracker/automation.h
index d9e3b820af..6131d6ddf7 100644
--- a/esphome/components/esp32_ble_tracker/automation.h
+++ b/esphome/components/esp32_ble_tracker/automation.h
@@ -84,6 +84,24 @@ class BLEEndOfScanTrigger : public Trigger<>, public ESPBTDeviceListener {
   void on_scan_end() override { this->trigger(); }
 };
 
+template<typename... Ts> class ESP32BLEStartScanAction : public Action<Ts...> {
+ public:
+  ESP32BLEStartScanAction(ESP32BLETracker *parent) : parent_(parent) {}
+  TEMPLATABLE_VALUE(bool, continuous)
+  void play(Ts... x) override {
+    this->parent_->set_scan_continuous(this->continuous_.value(x...));
+    this->parent_->start_scan();
+  }
+
+ protected:
+  ESP32BLETracker *parent_;
+};
+
+template<typename... Ts> class ESP32BLEStopScanAction : public Action<Ts...>, public Parented<ESP32BLETracker> {
+ public:
+  void play(Ts... x) override { this->parent_->stop_scan(); }
+};
+
 }  // namespace esp32_ble_tracker
 }  // namespace esphome
 
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 743f246d3a..68d88eb1e8 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -156,6 +156,13 @@ void ESP32BLETracker::start_scan() {
   }
 }
 
+void ESP32BLETracker::stop_scan() {
+  ESP_LOGD(TAG, "Stopping scan.");
+  this->scan_continuous_ = false;
+  esp_ble_gap_stop_scanning();
+  this->cancel_timeout("scan");
+}
+
 bool ESP32BLETracker::ble_setup() {
   // Initialize non-volatile storage for the bluetooth controller
   esp_err_t err = nvs_flash_init();
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 1d2900af69..29d0c81542 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -191,6 +191,7 @@ class ESP32BLETracker : public Component {
   void print_bt_device_info(const ESPBTDevice &device);
 
   void start_scan();
+  void stop_scan();
 
  protected:
   /// The FreeRTOS task managing the bluetooth interface.
@@ -243,19 +244,6 @@ class ESP32BLETracker : public Component {
 // NOLINTNEXTLINE
 extern ESP32BLETracker *global_esp32_ble_tracker;
 
-template<typename... Ts> class ESP32BLEStartScanAction : public Action<Ts...> {
- public:
-  ESP32BLEStartScanAction(ESP32BLETracker *parent) : parent_(parent) {}
-  TEMPLATABLE_VALUE(bool, continuous)
-  void play(Ts... x) override {
-    this->parent_->set_scan_continuous(this->continuous_.value(x...));
-    this->parent_->start_scan();
-  }
-
- protected:
-  ESP32BLETracker *parent_;
-};
-
 }  // namespace esp32_ble_tracker
 }  // namespace esphome
 

From a5e3cd1a42a1068bc3fc915d8589a4e2a477d2ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Kom=C3=A1rek?= <github@newt.cz>
Date: Wed, 14 Sep 2022 05:22:59 +0200
Subject: [PATCH 059/838] Add Prometheus Service Discovery for online devices
 (#3788)

---
 esphome/dashboard/dashboard.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 889f5cc0bf..9a8f072237 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -644,6 +644,33 @@ def _ping_func(filename, address):
     return filename, rc == 0
 
 
+class PrometheusServiceDiscoveryHandler(BaseHandler):
+    @authenticated
+    def get(self):
+        entries = _list_dashboard_entries()
+        self.set_header("content-type", "application/json")
+        sd = []
+        for entry in entries:
+            if entry.web_port is None:
+                continue
+            labels = {
+                "__meta_name": entry.name,
+                "__meta_esp_platform": entry.target_platform,
+                "__meta_esphome_version": entry.storage.esphome_version,
+            }
+            for integration in entry.storage.loaded_integrations:
+                labels[f"__meta_integration_{integration}"] = "true"
+            sd.append(
+                {
+                    "targets": [
+                        f"{entry.address}:{entry.web_port}",
+                    ],
+                    "labels": labels,
+                }
+            )
+        self.write(json.dumps(sd))
+
+
 class MDNSStatusThread(threading.Thread):
     def run(self):
         global IMPORT_RESULT
@@ -993,6 +1020,7 @@ def make_app(debug=get_bool_env(ENV_DEV)):
             (f"{rel}import", ImportRequestHandler),
             (f"{rel}secret_keys", SecretKeysRequestHandler),
             (f"{rel}rename", EsphomeRenameHandler),
+            (f"{rel}prometheus-sd", PrometheusServiceDiscoveryHandler),
         ],
         **app_settings,
     )

From f4b0917239b91059a5680450e6805ff6fed53a3a Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 14 Sep 2022 16:49:20 +1200
Subject: [PATCH 060/838] Allow ble tracker to subscribe to ota start and stop
 the scanning (#3800)

---
 .../components/esp32_ble_tracker/__init__.py  |  2 +
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   | 37 +++++++++++++------
 esphome/components/ota/__init__.py            |  1 +
 esphome/components/ota/ota_component.cpp      |  4 ++
 esphome/components/ota/ota_component.h        |  3 ++
 esphome/core/defines.h                        |  1 +
 6 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index f70fea0639..6d7868d4c5 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -239,6 +239,8 @@ async def to_code(config):
     if CORE.using_esp_idf:
         add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)
 
+    cg.add_define("USE_OTA_STATE_CALLBACK")  # To be notified when an OTA update starts
+
 
 ESP32_BLE_START_SCAN_ACTION_SCHEMA = cv.Schema(
     {
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 68d88eb1e8..f7e51a8ab3 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -1,10 +1,11 @@
 #ifdef USE_ESP32
 
 #include "esp32_ble_tracker.h"
-#include "esphome/core/log.h"
 #include "esphome/core/application.h"
-#include "esphome/core/helpers.h"
+#include "esphome/core/defines.h"
 #include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
 
 #include <nvs_flash.h>
 #include <freertos/FreeRTOSConfig.h>
@@ -15,6 +16,10 @@
 #include <esp_gap_ble_api.h>
 #include <esp_bt_defs.h>
 
+#ifdef USE_OTA
+#include "esphome/components/ota/ota_component.h"
+#endif
+
 #ifdef USE_ARDUINO
 #include <esp32-hal-bt.h>
 #endif
@@ -52,8 +57,16 @@ void ESP32BLETracker::setup() {
     return;
   }
 
+#ifdef USE_OTA
+  ota::global_ota_component->add_on_state_callback([this](ota::OTAState state, float progress, uint8_t error) {
+    if (state == ota::OTA_STARTED) {
+      this->stop_scan();
+    }
+  });
+#endif
+
   if (this->scan_continuous_) {
-    global_esp32_ble_tracker->start_scan_(true);
+    this->start_scan_(true);
   }
 }
 
@@ -83,10 +96,10 @@ void ESP32BLETracker::loop() {
   if (!connecting && xSemaphoreTake(this->scan_end_lock_, 0L)) {
     xSemaphoreGive(this->scan_end_lock_);
     if (this->scan_continuous_) {
-      global_esp32_ble_tracker->start_scan_(false);
+      this->start_scan_(false);
     } else if (xSemaphoreTake(this->scan_end_lock_, 0L) && !this->scanner_idle_) {
       xSemaphoreGive(this->scan_end_lock_);
-      global_esp32_ble_tracker->end_of_scan_();
+      this->end_of_scan_();
       return;
     }
   }
@@ -150,7 +163,7 @@ void ESP32BLETracker::loop() {
 void ESP32BLETracker::start_scan() {
   if (xSemaphoreTake(this->scan_end_lock_, 0L)) {
     xSemaphoreGive(this->scan_end_lock_);
-    global_esp32_ble_tracker->start_scan_(true);
+    this->start_scan_(true);
   } else {
     ESP_LOGW(TAG, "Scan requested when a scan is already in progress. Ignoring.");
   }
@@ -299,21 +312,21 @@ void ESP32BLETracker::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_ga
 void ESP32BLETracker::real_gap_event_handler_(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
   switch (event) {
     case ESP_GAP_BLE_SCAN_RESULT_EVT:
-      global_esp32_ble_tracker->gap_scan_result_(param->scan_rst);
+      this->gap_scan_result_(param->scan_rst);
       break;
     case ESP_GAP_BLE_SCAN_PARAM_SET_COMPLETE_EVT:
-      global_esp32_ble_tracker->gap_scan_set_param_complete_(param->scan_param_cmpl);
+      this->gap_scan_set_param_complete_(param->scan_param_cmpl);
       break;
     case ESP_GAP_BLE_SCAN_START_COMPLETE_EVT:
-      global_esp32_ble_tracker->gap_scan_start_complete_(param->scan_start_cmpl);
+      this->gap_scan_start_complete_(param->scan_start_cmpl);
       break;
     case ESP_GAP_BLE_SCAN_STOP_COMPLETE_EVT:
-      global_esp32_ble_tracker->gap_scan_stop_complete_(param->scan_stop_cmpl);
+      this->gap_scan_stop_complete_(param->scan_stop_cmpl);
       break;
     default:
       break;
   }
-  for (auto *client : global_esp32_ble_tracker->clients_) {
+  for (auto *client : this->clients_) {
     client->gap_event_handler(event, param);
   }
 }
@@ -351,7 +364,7 @@ void ESP32BLETracker::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_i
 
 void ESP32BLETracker::real_gattc_event_handler_(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                                                 esp_ble_gattc_cb_param_t *param) {
-  for (auto *client : global_esp32_ble_tracker->clients_) {
+  for (auto *client : this->clients_) {
     client->gattc_event_handler(event, gattc_if, param);
   }
 }
diff --git a/esphome/components/ota/__init__.py b/esphome/components/ota/__init__.py
index b3d3b7ad23..1bc4012ce2 100644
--- a/esphome/components/ota/__init__.py
+++ b/esphome/components/ota/__init__.py
@@ -78,6 +78,7 @@ CONFIG_SCHEMA = cv.Schema(
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_port(config[CONF_PORT]))
+    cg.add_define("USE_OTA")
     if CONF_PASSWORD in config:
         cg.add(var.set_auth_password(config[CONF_PASSWORD]))
         cg.add_define("USE_OTA_PASSWORD")
diff --git a/esphome/components/ota/ota_component.cpp b/esphome/components/ota/ota_component.cpp
index 25c9f2e912..a02d64cd08 100644
--- a/esphome/components/ota/ota_component.cpp
+++ b/esphome/components/ota/ota_component.cpp
@@ -21,6 +21,8 @@ static const char *const TAG = "ota";
 
 static const uint8_t OTA_VERSION_1_0 = 1;
 
+OTAComponent *global_ota_component = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+
 std::unique_ptr<OTABackend> make_ota_backend() {
 #ifdef USE_ARDUINO
 #ifdef USE_ESP8266
@@ -35,6 +37,8 @@ std::unique_ptr<OTABackend> make_ota_backend() {
 #endif  // USE_ESP_IDF
 }
 
+OTAComponent::OTAComponent() { global_ota_component = this; }
+
 void OTAComponent::setup() {
   server_ = socket::socket_ip(SOCK_STREAM, 0);
   if (server_ == nullptr) {
diff --git a/esphome/components/ota/ota_component.h b/esphome/components/ota/ota_component.h
index d178805168..9a1c92f727 100644
--- a/esphome/components/ota/ota_component.h
+++ b/esphome/components/ota/ota_component.h
@@ -41,6 +41,7 @@ enum OTAState { OTA_COMPLETED = 0, OTA_STARTED, OTA_IN_PROGRESS, OTA_ERROR };
 /// OTAComponent provides a simple way to integrate Over-the-Air updates into your app using ArduinoOTA.
 class OTAComponent : public Component {
  public:
+  OTAComponent();
 #ifdef USE_OTA_PASSWORD
   void set_auth_password(const std::string &password) { password_ = password; }
 #endif  // USE_OTA_PASSWORD
@@ -103,5 +104,7 @@ class OTAComponent : public Component {
 #endif
 };
 
+extern OTAComponent *global_ota_component;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+
 }  // namespace ota
 }  // namespace esphome
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index 90676c421e..cea53b8545 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -32,6 +32,7 @@
 #define USE_MEDIA_PLAYER
 #define USE_MQTT
 #define USE_NUMBER
+#define USE_OTA
 #define USE_OTA_PASSWORD
 #define USE_OTA_STATE_CALLBACK
 #define USE_POWER_SUPPLY

From 6236db1a27d17ea1f0481a51fad13ebaf1528601 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Wed, 14 Sep 2022 06:51:20 +0200
Subject: [PATCH 061/838] Add uFire ISE sensor (#3789)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                                 |   1 +
 esphome/components/ufire_ise/__init__.py   |   1 +
 esphome/components/ufire_ise/sensor.py     | 127 +++++++++++++++++
 esphome/components/ufire_ise/ufire_ise.cpp | 153 +++++++++++++++++++++
 esphome/components/ufire_ise/ufire_ise.h   |  95 +++++++++++++
 esphome/const.py                           |   2 +
 tests/test2.yaml                           |   5 +
 tests/test4.yaml                           |   6 +
 8 files changed, 390 insertions(+)
 create mode 100644 esphome/components/ufire_ise/__init__.py
 create mode 100644 esphome/components/ufire_ise/sensor.py
 create mode 100644 esphome/components/ufire_ise/ufire_ise.cpp
 create mode 100644 esphome/components/ufire_ise/ufire_ise.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 3a1087191c..69e30027a9 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -246,6 +246,7 @@ esphome/components/tuya/switch/* @jesserockz
 esphome/components/tuya/text_sensor/* @dentra
 esphome/components/uart/* @esphome/core
 esphome/components/ufire_ec/* @pvizeli
+esphome/components/ufire_ise/* @pvizeli
 esphome/components/ultrasonic/* @OttoWinter
 esphome/components/version/* @esphome/core
 esphome/components/wake_on_lan/* @willwill2will54
diff --git a/esphome/components/ufire_ise/__init__.py b/esphome/components/ufire_ise/__init__.py
new file mode 100644
index 0000000000..08f36c7934
--- /dev/null
+++ b/esphome/components/ufire_ise/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@pvizeli"]
diff --git a/esphome/components/ufire_ise/sensor.py b/esphome/components/ufire_ise/sensor.py
new file mode 100644
index 0000000000..8f4359d6af
--- /dev/null
+++ b/esphome/components/ufire_ise/sensor.py
@@ -0,0 +1,127 @@
+import esphome.codegen as cg
+from esphome import automation
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import (
+    CONF_ID,
+    CONF_PH,
+    CONF_TEMPERATURE,
+    DEVICE_CLASS_EMPTY,
+    DEVICE_CLASS_TEMPERATURE,
+    ICON_EMPTY,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_CELSIUS,
+    UNIT_PH,
+)
+
+DEPENDENCIES = ["i2c"]
+
+CONF_SOLUTION = "solution"
+CONF_TEMPERATURE_SENSOR = "temperature_sensor"
+
+ufire_ise_ns = cg.esphome_ns.namespace("ufire_ise")
+UFireISEComponent = ufire_ise_ns.class_(
+    "UFireISEComponent", cg.PollingComponent, i2c.I2CDevice
+)
+
+# Actions
+UFireISECalibrateProbeLowAction = ufire_ise_ns.class_(
+    "UFireISECalibrateProbeLowAction", automation.Action
+)
+UFireISECalibrateProbeHighAction = ufire_ise_ns.class_(
+    "UFireISECalibrateProbeHighAction", automation.Action
+)
+UFireISEResetAction = ufire_ise_ns.class_("UFireISEResetAction", automation.Action)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(UFireISEComponent),
+            cv.Exclusive(CONF_TEMPERATURE, "temperature"): sensor.sensor_schema(
+                unit_of_measurement=UNIT_CELSIUS,
+                device_class=DEVICE_CLASS_TEMPERATURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+                accuracy_decimals=1,
+            ),
+            cv.Optional(CONF_PH): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PH,
+                icon=ICON_EMPTY,
+                device_class=DEVICE_CLASS_EMPTY,
+                state_class=STATE_CLASS_MEASUREMENT,
+                accuracy_decimals=1,
+            ),
+            cv.Exclusive(CONF_TEMPERATURE_SENSOR, "temperature"): cv.use_id(
+                sensor.Sensor
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x3F))
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+
+    if CONF_TEMPERATURE in config:
+        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
+        cg.add(var.set_temperature_sensor(sens))
+
+    if CONF_PH in config:
+        sens = await sensor.new_sensor(config[CONF_PH])
+        cg.add(var.set_ph_sensor(sens))
+
+    if CONF_TEMPERATURE_SENSOR in config:
+        sens = await cg.get_variable(config[CONF_TEMPERATURE_SENSOR])
+        cg.add(var.set_temperature_sensor_external(sens))
+
+    await i2c.register_i2c_device(var, config)
+
+
+UFIRE_ISE_CALIBRATE_PROBE_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.use_id(UFireISEComponent),
+        cv.Required(CONF_SOLUTION): cv.templatable(float),
+    }
+)
+
+
+@automation.register_action(
+    "ufire_ise.calibrate_probe_low",
+    UFireISECalibrateProbeLowAction,
+    UFIRE_ISE_CALIBRATE_PROBE_SCHEMA,
+)
+async def ufire_ise_calibrate_probe_low_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_SOLUTION], args, float)
+    cg.add(var.set_solution(template_))
+    return var
+
+
+@automation.register_action(
+    "ufire_ise.calibrate_probe_high",
+    UFireISECalibrateProbeHighAction,
+    UFIRE_ISE_CALIBRATE_PROBE_SCHEMA,
+)
+async def ufire_ise_calibrate_probe_high_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_SOLUTION], args, float)
+    cg.add(var.set_solution(template_))
+    return var
+
+
+UFIRE_ISE_RESET_SCHEMA = cv.Schema({cv.GenerateID(): cv.use_id(UFireISEComponent)})
+
+
+@automation.register_action(
+    "ufire_ise.reset",
+    UFireISEResetAction,
+    UFIRE_ISE_RESET_SCHEMA,
+)
+async def ufire_ise_reset_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)
+    return var
diff --git a/esphome/components/ufire_ise/ufire_ise.cpp b/esphome/components/ufire_ise/ufire_ise.cpp
new file mode 100644
index 0000000000..957e6f3299
--- /dev/null
+++ b/esphome/components/ufire_ise/ufire_ise.cpp
@@ -0,0 +1,153 @@
+#include "esphome/core/log.h"
+#include "ufire_ise.h"
+
+#include <cmath>
+
+namespace esphome {
+namespace ufire_ise {
+
+static const char *const TAG = "ufire_ise";
+
+void UFireISEComponent::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up uFire_ise...");
+
+  uint8_t version;
+  if (!this->read_byte(REGISTER_VERSION, &version) && version != 0xFF) {
+    this->mark_failed();
+    return;
+  }
+  ESP_LOGI(TAG, "Found uFire_ise board version 0x%02X", version);
+
+  // Write option for temperature adjustments
+  uint8_t config;
+  this->read_byte(REGISTER_CONFIG, &config);
+  if (this->temperature_sensor_ == nullptr && this->temperature_sensor_external_ == nullptr) {
+    config &= ~CONFIG_TEMP_COMPENSATION;
+  } else {
+    config |= CONFIG_TEMP_COMPENSATION;
+  }
+  this->write_byte(REGISTER_CONFIG, config);
+}
+
+void UFireISEComponent::update() {
+  int wait = 0;
+  if (this->temperature_sensor_ != nullptr) {
+    this->write_byte(REGISTER_TASK, COMMAND_MEASURE_TEMP);
+    wait += 750;
+  }
+  if (this->ph_sensor_ != nullptr) {
+    this->write_byte(REGISTER_TASK, COMMAND_MEASURE_MV);
+    wait += 750;
+  }
+
+  // Wait until measurement are taken
+  this->set_timeout("data", wait, [this]() { this->update_internal_(); });
+}
+
+void UFireISEComponent::update_internal_() {
+  float temperature = 0;
+
+  // Read temperature internal and populate it
+  if (this->temperature_sensor_ != nullptr) {
+    temperature = this->measure_temperature_();
+    this->temperature_sensor_->publish_state(temperature);
+  }
+  // Get temperature from external only for adjustments
+  else if (this->temperature_sensor_external_ != nullptr) {
+    temperature = this->temperature_sensor_external_->state;
+  }
+
+  if (this->ph_sensor_ != nullptr) {
+    this->ph_sensor_->publish_state(this->measure_ph_(temperature));
+  }
+}
+
+float UFireISEComponent::measure_temperature_() { return this->read_data_(REGISTER_TEMP); }
+
+float UFireISEComponent::measure_mv_() { return this->read_data_(REGISTER_MV); }
+
+float UFireISEComponent::measure_ph_(float temperature) {
+  float mv, ph;
+
+  mv = this->measure_mv_();
+  if (mv == -1)
+    return -1;
+
+  ph = fabs(7.0 - (mv / PROBE_MV_TO_PH));
+
+  // Determine the temperature correction
+  float distance_from_7 = std::abs(7 - roundf(ph));
+  float distance_from_25 = std::floor(std::abs(25 - roundf(temperature)) / 10);
+  float temp_multiplier = (distance_from_25 * distance_from_7) * PROBE_TMP_CORRECTION;
+  if ((ph >= 8.0) && (temperature >= 35))
+    temp_multiplier *= -1;
+  if ((ph <= 6.0) && (temperature <= 15))
+    temp_multiplier *= -1;
+
+  ph += temp_multiplier;
+  if ((ph <= 0.0) || (ph > 14.0))
+    ph = -1;
+  if (std::isinf(ph))
+    ph = -1;
+  if (std::isnan(ph))
+    ph = -1;
+
+  return ph;
+}
+
+void UFireISEComponent::set_solution_(float solution) {
+  solution = (7 - solution) * PROBE_MV_TO_PH;
+  this->write_data_(REGISTER_SOLUTION, solution);
+}
+
+void UFireISEComponent::calibrate_probe_low(float solution) {
+  this->set_solution_(solution);
+  this->write_byte(REGISTER_TASK, COMMAND_CALIBRATE_LOW);
+}
+
+void UFireISEComponent::calibrate_probe_high(float solution) {
+  this->set_solution_(solution);
+  this->write_byte(REGISTER_TASK, COMMAND_CALIBRATE_HIGH);
+}
+
+void UFireISEComponent::reset_board() {
+  this->write_data_(REGISTER_REFHIGH, NAN);
+  this->write_data_(REGISTER_REFLOW, NAN);
+  this->write_data_(REGISTER_READHIGH, NAN);
+  this->write_data_(REGISTER_READLOW, NAN);
+}
+
+float UFireISEComponent::read_data_(uint8_t reg) {
+  float f;
+  uint8_t temp[4];
+
+  this->write(&reg, 1);
+  delay(10);
+
+  for (uint8_t i = 0; i < 4; i++) {
+    this->read_bytes_raw(temp + i, 1);
+  }
+  memcpy(&f, temp, sizeof(f));
+
+  return f;
+}
+
+void UFireISEComponent::write_data_(uint8_t reg, float data) {
+  uint8_t temp[4];
+
+  memcpy(temp, &data, sizeof(data));
+  this->write_bytes(reg, temp, 4);
+  delay(10);
+}
+
+void UFireISEComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "uFire-ISE");
+  LOG_I2C_DEVICE(this)
+  LOG_UPDATE_INTERVAL(this)
+  LOG_SENSOR("  ", "PH Sensor", this->ph_sensor_)
+  LOG_SENSOR("  ", "Temperature Sensor", this->temperature_sensor_)
+  LOG_SENSOR("  ", "Temperature Sensor external", this->temperature_sensor_external_)
+}
+
+}  // namespace ufire_ise
+}  // namespace esphome
diff --git a/esphome/components/ufire_ise/ufire_ise.h b/esphome/components/ufire_ise/ufire_ise.h
new file mode 100644
index 0000000000..01efdcdb55
--- /dev/null
+++ b/esphome/components/ufire_ise/ufire_ise.h
@@ -0,0 +1,95 @@
+#pragma once
+
+#include "esphome/core/automation.h"
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace ufire_ise {
+
+static const float PROBE_MV_TO_PH = 59.2;
+static const float PROBE_TMP_CORRECTION = 0.03;
+
+static const uint8_t CONFIG_TEMP_COMPENSATION = 0x02;
+
+static const uint8_t REGISTER_VERSION = 0;
+static const uint8_t REGISTER_MV = 1;
+static const uint8_t REGISTER_TEMP = 5;
+static const uint8_t REGISTER_REFHIGH = 13;
+static const uint8_t REGISTER_REFLOW = 17;
+static const uint8_t REGISTER_READHIGH = 21;
+static const uint8_t REGISTER_READLOW = 25;
+static const uint8_t REGISTER_SOLUTION = 29;
+static const uint8_t REGISTER_CONFIG = 38;
+static const uint8_t REGISTER_TASK = 39;
+
+static const uint8_t COMMAND_CALIBRATE_HIGH = 8;
+static const uint8_t COMMAND_CALIBRATE_LOW = 10;
+static const uint8_t COMMAND_MEASURE_TEMP = 40;
+static const uint8_t COMMAND_MEASURE_MV = 80;
+
+class UFireISEComponent : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void setup() override;
+  void update() override;
+  void dump_config() override;
+
+  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { this->temperature_sensor_ = temperature_sensor; }
+  void set_temperature_sensor_external(sensor::Sensor *temperature_sensor) {
+    this->temperature_sensor_external_ = temperature_sensor;
+  }
+  void set_ph_sensor(sensor::Sensor *ph_sensor) { this->ph_sensor_ = ph_sensor; }
+  void calibrate_probe_low(float solution);
+  void calibrate_probe_high(float solution);
+  void reset_board();
+
+ protected:
+  float measure_temperature_();
+  float measure_mv_();
+  float measure_ph_(float temperature);
+  void set_solution_(float solution);
+  float read_data_(uint8_t reg);
+  void write_data_(uint8_t reg, float data);
+  void update_internal_();
+
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_external_{nullptr};
+  sensor::Sensor *ph_sensor_{nullptr};
+};
+
+template<typename... Ts> class UFireISECalibrateProbeLowAction : public Action<Ts...> {
+ public:
+  UFireISECalibrateProbeLowAction(UFireISEComponent *parent) : parent_(parent) {}
+  TEMPLATABLE_VALUE(float, solution)
+
+  void play(Ts... x) override { this->parent_->calibrate_probe_low(this->solution_.value(x...)); }
+
+ protected:
+  UFireISEComponent *parent_;
+};
+
+template<typename... Ts> class UFireISECalibrateProbeHighAction : public Action<Ts...> {
+ public:
+  UFireISECalibrateProbeHighAction(UFireISEComponent *parent) : parent_(parent) {}
+  TEMPLATABLE_VALUE(float, solution)
+
+  void play(Ts... x) override { this->parent_->calibrate_probe_high(this->solution_.value(x...)); }
+
+ protected:
+  UFireISEComponent *parent_;
+};
+
+template<typename... Ts> class UFireISEResetAction : public Action<Ts...> {
+ public:
+  UFireISEResetAction(UFireISEComponent *parent) : parent_(parent) {}
+
+  void play(Ts... x) override { this->parent_->reset_board(); }
+
+ protected:
+  UFireISEComponent *parent_;
+};
+
+}  // namespace ufire_ise
+}  // namespace esphome
diff --git a/esphome/const.py b/esphome/const.py
index 5153efbbe0..c9d46fc82c 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -493,6 +493,7 @@ CONF_PAYLOAD = "payload"
 CONF_PAYLOAD_AVAILABLE = "payload_available"
 CONF_PAYLOAD_NOT_AVAILABLE = "payload_not_available"
 CONF_PERIOD = "period"
+CONF_PH = "ph"
 CONF_PHASE_ANGLE = "phase_angle"
 CONF_PHASE_BALANCER = "phase_balancer"
 CONF_PIN = "pin"
@@ -881,6 +882,7 @@ UNIT_PARTS_PER_BILLION = "ppb"
 UNIT_PARTS_PER_MILLION = "ppm"
 UNIT_PASCAL = "Pa"
 UNIT_PERCENT = "%"
+UNIT_PH = "pH"
 UNIT_PULSES = "pulses"
 UNIT_PULSES_PER_MINUTE = "pulses/min"
 UNIT_SECOND = "s"
diff --git a/tests/test2.yaml b/tests/test2.yaml
index f8ed04d389..5507fa0631 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -376,6 +376,11 @@ sensor:
     temperature_sensor: ha_hello_world_temperature
     temperature_compensation: 20.0
     temperature_coefficient: 0.019
+  - platform: ufire_ise
+    id: ufire_ise_board
+    temperature_sensor: ha_hello_world_temperature
+    ph:
+      name: Ufire pH
 
 time:
   - platform: homeassistant
diff --git a/tests/test4.yaml b/tests/test4.yaml
index d79b421cf8..6293e0f7b7 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -251,6 +251,12 @@ sensor:
       name: Ufire EC
     temperature_compensation: 20.0
     temperature_coefficient: 0.019
+  - platform: ufire_ise
+    id: ufire_ise_board
+    temperature:
+      name: Ufire Temperature
+    ph:
+      name: Ufire pH
 
 #
 # platform sensor.apds9960 requires component apds9960

From f1e8cc2cf091fe6a3c857d802a3d5d391c1d4886 Mon Sep 17 00:00:00 2001
From: Ignacio Hernandez-Ros <ignacio@hernandez-ros.com>
Date: Wed, 14 Sep 2022 06:53:51 +0200
Subject: [PATCH 062/838] fix spi timing issues (#3763)

---
 esphome/components/spi/spi.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/esphome/components/spi/spi.h b/esphome/components/spi/spi.h
index 7f0b0f481a..6c92321ac8 100644
--- a/esphome/components/spi/spi.h
+++ b/esphome/components/spi/spi.h
@@ -195,6 +195,11 @@ class SPIComponent : public Component {
 
   template<SPIBitOrder BIT_ORDER, SPIClockPolarity CLOCK_POLARITY, SPIClockPhase CLOCK_PHASE, uint32_t DATA_RATE>
   void enable(GPIOPin *cs) {
+    if (cs != nullptr) {
+      this->active_cs_ = cs;
+      this->active_cs_->digital_write(false);
+    }
+
 #ifdef USE_SPI_ARDUINO_BACKEND
     if (this->hw_spi_ != nullptr) {
       uint8_t data_mode = SPI_MODE0;
@@ -215,11 +220,6 @@ class SPIComponent : public Component {
 #ifdef USE_SPI_ARDUINO_BACKEND
     }
 #endif  // USE_SPI_ARDUINO_BACKEND
-
-    if (cs != nullptr) {
-      this->active_cs_ = cs;
-      this->active_cs_->digital_write(false);
-    }
   }
 
   void disable();

From e557dc7208abda7e1e23ec23c743637491f8fcae Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 14 Sep 2022 17:02:22 +1200
Subject: [PATCH 063/838] Bump version to 2022.9.0b1

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

diff --git a/esphome/const.py b/esphome/const.py
index c9d46fc82c..608a61466b 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.9.0-dev"
+__version__ = "2022.9.0b1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 88943103a2bd8008dc0978465c541c57a8b84c29 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 14 Sep 2022 17:02:22 +1200
Subject: [PATCH 064/838] Bump version to 2022.10.0-dev

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

diff --git a/esphome/const.py b/esphome/const.py
index c9d46fc82c..22f030e84e 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.9.0-dev"
+__version__ = "2022.10.0-dev"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 6a8f4e92df580f5e726003e2a9fd04a3123f435b Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Wed, 14 Sep 2022 15:01:28 +0200
Subject: [PATCH 065/838] null initialize total sensor for pulse counter
 (#3803)

* null initialize total sensor.

* pedantic styling fix

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/pulse_counter/pulse_counter_sensor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/pulse_counter/pulse_counter_sensor.h b/esphome/components/pulse_counter/pulse_counter_sensor.h
index d9be79e403..ef944f106f 100644
--- a/esphome/components/pulse_counter/pulse_counter_sensor.h
+++ b/esphome/components/pulse_counter/pulse_counter_sensor.h
@@ -81,7 +81,7 @@ class PulseCounterSensor : public sensor::Sensor, public PollingComponent {
   PulseCounterStorageBase &storage_;
   uint32_t last_time_{0};
   uint32_t current_total_{0};
-  sensor::Sensor *total_sensor_;
+  sensor::Sensor *total_sensor_{nullptr};
 };
 
 }  // namespace pulse_counter

From aaf50fc2e67c493a8208c4b73d3a00516c023d9e Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Wed, 14 Sep 2022 16:43:03 -0300
Subject: [PATCH 066/838] Sim800l add calls, multiline sms and ussd (#3630)

Co-authored-by: Matus Ivanecky <matus.ivanecky@gmail.com>
Co-authored-by: Matus Ivanecky <maty535@users.noreply.github.com>
---
 esphome/components/sim800l/__init__.py | 109 ++++++++++
 esphome/components/sim800l/sim800l.cpp | 282 ++++++++++++++++++++-----
 esphome/components/sim800l/sim800l.h   | 121 +++++++++--
 3 files changed, 442 insertions(+), 70 deletions(-)

diff --git a/esphome/components/sim800l/__init__.py b/esphome/components/sim800l/__init__.py
index 564b685b37..698e3cda9e 100644
--- a/esphome/components/sim800l/__init__.py
+++ b/esphome/components/sim800l/__init__.py
@@ -18,15 +18,42 @@ Sim800LReceivedMessageTrigger = sim800l_ns.class_(
     "Sim800LReceivedMessageTrigger",
     automation.Trigger.template(cg.std_string, cg.std_string),
 )
+Sim800LIncomingCallTrigger = sim800l_ns.class_(
+    "Sim800LIncomingCallTrigger",
+    automation.Trigger.template(cg.std_string),
+)
+Sim800LCallConnectedTrigger = sim800l_ns.class_(
+    "Sim800LCallConnectedTrigger",
+    automation.Trigger.template(),
+)
+Sim800LCallDisconnectedTrigger = sim800l_ns.class_(
+    "Sim800LCallDisconnectedTrigger",
+    automation.Trigger.template(),
+)
+
+Sim800LReceivedUssdTrigger = sim800l_ns.class_(
+    "Sim800LReceivedUssdTrigger",
+    automation.Trigger.template(cg.std_string),
+)
 
 # Actions
 Sim800LSendSmsAction = sim800l_ns.class_("Sim800LSendSmsAction", automation.Action)
+Sim800LSendUssdAction = sim800l_ns.class_("Sim800LSendUssdAction", automation.Action)
 Sim800LDialAction = sim800l_ns.class_("Sim800LDialAction", automation.Action)
+Sim800LConnectAction = sim800l_ns.class_("Sim800LConnectAction", automation.Action)
+Sim800LDisconnectAction = sim800l_ns.class_(
+    "Sim800LDisconnectAction", automation.Action
+)
 
 CONF_SIM800L_ID = "sim800l_id"
 CONF_ON_SMS_RECEIVED = "on_sms_received"
+CONF_ON_USSD_RECEIVED = "on_ussd_received"
+CONF_ON_INCOMING_CALL = "on_incoming_call"
+CONF_ON_CALL_CONNECTED = "on_call_connected"
+CONF_ON_CALL_DISCONNECTED = "on_call_disconnected"
 CONF_RECIPIENT = "recipient"
 CONF_MESSAGE = "message"
+CONF_USSD = "ussd"
 
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
@@ -39,6 +66,34 @@ CONFIG_SCHEMA = cv.All(
                     ),
                 }
             ),
+            cv.Optional(CONF_ON_INCOMING_CALL): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                        Sim800LIncomingCallTrigger
+                    ),
+                }
+            ),
+            cv.Optional(CONF_ON_CALL_CONNECTED): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                        Sim800LCallConnectedTrigger
+                    ),
+                }
+            ),
+            cv.Optional(CONF_ON_CALL_DISCONNECTED): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                        Sim800LCallDisconnectedTrigger
+                    ),
+                }
+            ),
+            cv.Optional(CONF_ON_USSD_RECEIVED): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                        Sim800LReceivedUssdTrigger
+                    ),
+                }
+            ),
         }
     )
     .extend(cv.polling_component_schema("5s"))
@@ -59,6 +114,19 @@ async def to_code(config):
         await automation.build_automation(
             trigger, [(cg.std_string, "message"), (cg.std_string, "sender")], conf
         )
+    for conf in config.get(CONF_ON_INCOMING_CALL, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [(cg.std_string, "caller_id")], conf)
+    for conf in config.get(CONF_ON_CALL_CONNECTED, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+    for conf in config.get(CONF_ON_CALL_DISCONNECTED, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+
+    for conf in config.get(CONF_ON_USSD_RECEIVED, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [(cg.std_string, "ussd")], conf)
 
 
 SIM800L_SEND_SMS_SCHEMA = cv.Schema(
@@ -98,3 +166,44 @@ async def sim800l_dial_to_code(config, action_id, template_arg, args):
     template_ = await cg.templatable(config[CONF_RECIPIENT], args, cg.std_string)
     cg.add(var.set_recipient(template_))
     return var
+
+
+@automation.register_action(
+    "sim800l.connect",
+    Sim800LConnectAction,
+    cv.Schema({cv.GenerateID(): cv.use_id(Sim800LComponent)}),
+)
+async def sim800l_connect_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)
+    return var
+
+
+SIM800L_SEND_USSD_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.use_id(Sim800LComponent),
+        cv.Required(CONF_USSD): cv.templatable(cv.string_strict),
+    }
+)
+
+
+@automation.register_action(
+    "sim800l.send_ussd", Sim800LSendUssdAction, SIM800L_SEND_USSD_SCHEMA
+)
+async def sim800l_send_ussd_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_USSD], args, cg.std_string)
+    cg.add(var.set_ussd(template_))
+    return var
+
+
+@automation.register_action(
+    "sim800l.disconnect",
+    Sim800LDisconnectAction,
+    cv.Schema({cv.GenerateID(): cv.use_id(Sim800LComponent)}),
+)
+async def sim800l_disconnect_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)
+    return var
diff --git a/esphome/components/sim800l/sim800l.cpp b/esphome/components/sim800l/sim800l.cpp
index a935978747..3ae5de491a 100644
--- a/esphome/components/sim800l/sim800l.cpp
+++ b/esphome/components/sim800l/sim800l.cpp
@@ -16,20 +16,38 @@ void Sim800LComponent::update() {
     this->write(26);
   }
 
+  if (this->expect_ack_)
+    return;
+
   if (state_ == STATE_INIT) {
     if (this->registered_ && this->send_pending_) {
       this->send_cmd_("AT+CSCS=\"GSM\"");
-      this->state_ = STATE_SENDINGSMS1;
+      this->state_ = STATE_SENDING_SMS_1;
     } else if (this->registered_ && this->dial_pending_) {
       this->send_cmd_("AT+CSCS=\"GSM\"");
       this->state_ = STATE_DIALING1;
+    } else if (this->registered_ && this->connect_pending_) {
+      this->connect_pending_ = false;
+      ESP_LOGI(TAG, "Connecting...");
+      this->send_cmd_("ATA");
+      this->state_ = STATE_ATA_SENT;
+    } else if (this->registered_ && this->send_ussd_pending_) {
+      this->send_cmd_("AT+CSCS=\"GSM\"");
+      this->state_ = STATE_SEND_USSD1;
+    } else if (this->registered_ && this->disconnect_pending_) {
+      this->disconnect_pending_ = false;
+      ESP_LOGI(TAG, "Disconnecting...");
+      this->send_cmd_("ATH");
+    } else if (this->registered_ && this->call_state_ != 6) {
+      send_cmd_("AT+CLCC");
+      this->state_ = STATE_CHECK_CALL;
+      return;
     } else {
       this->send_cmd_("AT");
-      this->state_ = STATE_CHECK_AT;
+      this->state_ = STATE_SETUP_CMGF;
     }
     this->expect_ack_ = true;
-  }
-  if (state_ == STATE_RECEIVEDSMS) {
+  } else if (state_ == STATE_RECEIVED_SMS) {
     // Serial Buffer should have flushed.
     // Send cmd to delete received sms
     char delete_cmd[20];
@@ -49,16 +67,29 @@ void Sim800LComponent::send_cmd_(const std::string &message) {
 }
 
 void Sim800LComponent::parse_cmd_(std::string message) {
-  ESP_LOGV(TAG, "R: %s - %d", message.c_str(), this->state_);
-
   if (message.empty())
     return;
 
+  ESP_LOGV(TAG, "R: %s - %d", message.c_str(), this->state_);
+
+  if (this->state_ != STATE_RECEIVE_SMS) {
+    if (message == "RING") {
+      // Incoming call...
+      this->state_ = STATE_PARSE_CLIP;
+      this->expect_ack_ = false;
+    } else if (message == "NO CARRIER") {
+      if (this->call_state_ != 6) {
+        this->call_state_ = 6;
+        this->call_disconnected_callback_.call();
+      }
+    }
+  }
+
+  bool ok = message == "OK";
   if (this->expect_ack_) {
-    bool ok = message == "OK";
     this->expect_ack_ = false;
     if (!ok) {
-      if (this->state_ == STATE_CHECK_AT && message == "AT") {
+      if (this->state_ == STATE_SETUP_CMGF && message == "AT") {
         // Expected ack but AT echo received
         this->state_ = STATE_DISABLE_ECHO;
         this->expect_ack_ = true;
@@ -68,6 +99,10 @@ void Sim800LComponent::parse_cmd_(std::string message) {
         return;
       }
     }
+  } else if (ok && (this->state_ != STATE_PARSE_SMS_RESPONSE && this->state_ != STATE_CHECK_CALL &&
+                    this->state_ != STATE_RECEIVE_SMS && this->state_ != STATE_DIALING2)) {
+    ESP_LOGW(TAG, "Received unexpected OK. Ignoring");
+    return;
   }
 
   switch (this->state_) {
@@ -75,30 +110,88 @@ void Sim800LComponent::parse_cmd_(std::string message) {
       // While we were waiting for update to check for messages, this notifies a message
       // is available.
       bool message_available = message.compare(0, 6, "+CMTI:") == 0;
-      if (!message_available)
+      if (!message_available) {
+        if (message == "RING") {
+          // Incoming call...
+          this->state_ = STATE_PARSE_CLIP;
+        } else if (message == "NO CARRIER") {
+          if (this->call_state_ != 6) {
+            this->call_state_ = 6;
+            this->call_disconnected_callback_.call();
+          }
+        } else if (message.compare(0, 6, "+CUSD:") == 0) {
+          // Incoming USSD MESSAGE
+          this->state_ = STATE_CHECK_USSD;
+        }
         break;
+      }
+
       // Else fall thru ...
     }
     case STATE_CHECK_SMS:
       send_cmd_("AT+CMGL=\"ALL\"");
-      this->state_ = STATE_PARSE_SMS;
+      this->state_ = STATE_PARSE_SMS_RESPONSE;
       this->parse_index_ = 0;
       break;
     case STATE_DISABLE_ECHO:
       send_cmd_("ATE0");
-      this->state_ = STATE_CHECK_AT;
+      this->state_ = STATE_SETUP_CMGF;
       this->expect_ack_ = true;
       break;
-    case STATE_CHECK_AT:
+    case STATE_SETUP_CMGF:
       send_cmd_("AT+CMGF=1");
+      this->state_ = STATE_SETUP_CLIP;
+      this->expect_ack_ = true;
+      break;
+    case STATE_SETUP_CLIP:
+      send_cmd_("AT+CLIP=1");
       this->state_ = STATE_CREG;
       this->expect_ack_ = true;
       break;
+    case STATE_SETUP_USSD:
+      send_cmd_("AT+CUSD=1");
+      this->state_ = STATE_CREG;
+      this->expect_ack_ = true;
+      break;
+    case STATE_SEND_USSD1:
+      this->send_cmd_("AT+CUSD=1, \"" + this->ussd_ + "\"");
+      this->state_ = STATE_SEND_USSD2;
+      break;
+    case STATE_SEND_USSD2:
+      ESP_LOGD(TAG, "SendUssd2: '%s'", message.c_str());
+      if (message == "OK") {
+        // Dialing
+        ESP_LOGD(TAG, "Dialing ussd code: '%s' done.", this->ussd_.c_str());
+        this->state_ = STATE_CHECK_USSD;
+        this->send_ussd_pending_ = false;
+      } else {
+        this->set_registered_(false);
+        this->state_ = STATE_INIT;
+        this->send_cmd_("AT+CMEE=2");
+        this->write(26);
+      }
+      break;
+    case STATE_CHECK_USSD:
+      ESP_LOGD(TAG, "Check ussd code: '%s'", message.c_str());
+      if (message.compare(0, 6, "+CUSD:") == 0) {
+        this->state_ = STATE_RECEIVED_USSD;
+        this->ussd_ = "";
+        size_t start = 10;
+        size_t end = message.find_last_of(',');
+        if (end > start) {
+          this->ussd_ = message.substr(start + 1, end - start - 2);
+          this->ussd_received_callback_.call(this->ussd_);
+        }
+      }
+      // Otherwise we receive another OK, we do nothing just wait polling to continuously check for SMS
+      if (message == "OK")
+        this->state_ = STATE_INIT;
+      break;
     case STATE_CREG:
       send_cmd_("AT+CREG?");
-      this->state_ = STATE_CREGWAIT;
+      this->state_ = STATE_CREG_WAIT;
       break;
-    case STATE_CREGWAIT: {
+    case STATE_CREG_WAIT: {
       // Response: "+CREG: 0,1" -- the one there means registered ok
       //           "+CREG: -,-" means not registered ok
       bool registered = message.compare(0, 6, "+CREG:") == 0 && (message[9] == '1' || message[9] == '5');
@@ -112,10 +205,10 @@ void Sim800LComponent::parse_cmd_(std::string message) {
         if (message[7] == '0') {  // Network registration is disable, enable it
           send_cmd_("AT+CREG=1");
           this->expect_ack_ = true;
-          this->state_ = STATE_CHECK_AT;
+          this->state_ = STATE_SETUP_CMGF;
         } else {
           // Keep waiting registration
-          this->state_ = STATE_CREG;
+          this->state_ = STATE_INIT;
         }
       }
       set_registered_(registered);
@@ -145,9 +238,6 @@ void Sim800LComponent::parse_cmd_(std::string message) {
       this->expect_ack_ = true;
       this->state_ = STATE_CHECK_SMS;
       break;
-    case STATE_PARSE_SMS:
-      this->state_ = STATE_PARSE_SMS_RESPONSE;
-      break;
     case STATE_PARSE_SMS_RESPONSE:
       if (message.compare(0, 6, "+CMGL:") == 0 && this->parse_index_ == 0) {
         size_t start = 7;
@@ -158,10 +248,11 @@ void Sim800LComponent::parse_cmd_(std::string message) {
           if (item == 1) {  // Slot Index
             this->parse_index_ = parse_number<uint8_t>(message.substr(start, end - start)).value_or(0);
           }
-          // item 2 = STATUS, usually "REC UNERAD"
+          // item 2 = STATUS, usually "REC UNREAD"
           if (item == 3) {  // recipient
             // Add 1 and remove 2 from substring to get rid of "quotes"
             this->sender_ = message.substr(start + 1, end - start - 2);
+            this->message_.clear();
             break;
           }
           // item 4 = ""
@@ -174,42 +265,83 @@ void Sim800LComponent::parse_cmd_(std::string message) {
           ESP_LOGD(TAG, "Invalid message %d %s", this->state_, message.c_str());
           return;
         }
-        this->state_ = STATE_RECEIVESMS;
+        this->state_ = STATE_RECEIVE_SMS;
+      }
+      // Otherwise we receive another OK
+      if (ok) {
+        send_cmd_("AT+CLCC");
+        this->state_ = STATE_CHECK_CALL;
       }
-      // Otherwise we receive another OK, we do nothing just wait polling to continuously check for SMS
-      if (message == "OK")
-        this->state_ = STATE_INIT;
       break;
-    case STATE_RECEIVESMS:
+    case STATE_CHECK_CALL:
+      if (message.compare(0, 6, "+CLCC:") == 0 && this->parse_index_ == 0) {
+        this->expect_ack_ = true;
+        size_t start = 7;
+        size_t end = message.find(',', start);
+        uint8_t item = 0;
+        while (end != start) {
+          item++;
+          // item 1 call index for +CHLD
+          // item 2 dir 0 Mobile originated; 1 Mobile terminated
+          if (item == 3) {  // stat
+            uint8_t current_call_state = parse_number<uint8_t>(message.substr(start, end - start)).value_or(6);
+            if (current_call_state != this->call_state_) {
+              ESP_LOGD(TAG, "Call state is now: %d", current_call_state);
+              if (current_call_state == 0)
+                this->call_connected_callback_.call();
+            }
+            this->call_state_ = current_call_state;
+            break;
+          }
+          // item 4 = ""
+          // item 5 = Received timestamp
+          start = end + 1;
+          end = message.find(',', start);
+        }
+
+        if (item < 2) {
+          ESP_LOGD(TAG, "Invalid message %d %s", this->state_, message.c_str());
+          return;
+        }
+      } else if (ok) {
+        if (this->call_state_ != 6) {
+          // no call in progress
+          this->call_state_ = 6;  // Disconnect
+          this->call_disconnected_callback_.call();
+        }
+      }
+      this->state_ = STATE_INIT;
+      break;
+    case STATE_RECEIVE_SMS:
       /* Our recipient is set and the message body is in message
         kick ESPHome callback now
       */
-      ESP_LOGD(TAG, "Received SMS from: %s", this->sender_.c_str());
-      ESP_LOGD(TAG, "%s", message.c_str());
-      this->callback_.call(message, this->sender_);
-      /* If the message is multiline, next lines will contain message data.
-         If there were other messages in the list, next line will be +CMGL: ...
-         At the end of the list the new line and the OK should be received.
-         To keep this simple just first line of message if considered, then
-         the next state will swallow all received data and in next poll event
-         this message index is marked for deletion.
-      */
-      this->state_ = STATE_RECEIVEDSMS;
+      if (ok || message.compare(0, 6, "+CMGL:") == 0) {
+        ESP_LOGD(TAG, "Received SMS from: %s", this->sender_.c_str());
+        ESP_LOGD(TAG, "%s", this->message_.c_str());
+        this->sms_received_callback_.call(this->message_, this->sender_);
+        this->state_ = STATE_RECEIVED_SMS;
+      } else {
+        if (this->message_.length() > 0)
+          this->message_ += "\n";
+        this->message_ += message;
+      }
       break;
-    case STATE_RECEIVEDSMS:
+    case STATE_RECEIVED_SMS:
+    case STATE_RECEIVED_USSD:
       // Let the buffer flush. Next poll will request to delete the parsed index message.
       break;
-    case STATE_SENDINGSMS1:
+    case STATE_SENDING_SMS_1:
       this->send_cmd_("AT+CMGS=\"" + this->recipient_ + "\"");
-      this->state_ = STATE_SENDINGSMS2;
+      this->state_ = STATE_SENDING_SMS_2;
       break;
-    case STATE_SENDINGSMS2:
+    case STATE_SENDING_SMS_2:
       if (message == ">") {
         // Send sms body
-        ESP_LOGD(TAG, "Sending message: '%s'", this->outgoing_message_.c_str());
+        ESP_LOGI(TAG, "Sending to %s message: '%s'", this->recipient_.c_str(), this->outgoing_message_.c_str());
         this->write_str(this->outgoing_message_.c_str());
         this->write(26);
-        this->state_ = STATE_SENDINGSMS3;
+        this->state_ = STATE_SENDING_SMS_3;
       } else {
         set_registered_(false);
         this->state_ = STATE_INIT;
@@ -217,7 +349,7 @@ void Sim800LComponent::parse_cmd_(std::string message) {
         this->write(26);
       }
       break;
-    case STATE_SENDINGSMS3:
+    case STATE_SENDING_SMS_3:
       if (message.compare(0, 6, "+CMGS:") == 0) {
         ESP_LOGD(TAG, "SMS Sent OK: %s", message.c_str());
         this->send_pending_ = false;
@@ -230,23 +362,55 @@ void Sim800LComponent::parse_cmd_(std::string message) {
       this->state_ = STATE_DIALING2;
       break;
     case STATE_DIALING2:
-      if (message == "OK") {
-        // Dialing
-        ESP_LOGD(TAG, "Dialing: '%s'", this->recipient_.c_str());
-        this->state_ = STATE_INIT;
+      if (ok) {
+        ESP_LOGI(TAG, "Dialing: '%s'", this->recipient_.c_str());
         this->dial_pending_ = false;
       } else {
         this->set_registered_(false);
-        this->state_ = STATE_INIT;
         this->send_cmd_("AT+CMEE=2");
         this->write(26);
       }
+      this->state_ = STATE_INIT;
+      break;
+    case STATE_PARSE_CLIP:
+      if (message.compare(0, 6, "+CLIP:") == 0) {
+        std::string caller_id;
+        size_t start = 7;
+        size_t end = message.find(',', start);
+        uint8_t item = 0;
+        while (end != start) {
+          item++;
+          if (item == 1) {  // Slot Index
+            // Add 1 and remove 2 from substring to get rid of "quotes"
+            caller_id = message.substr(start + 1, end - start - 2);
+            break;
+          }
+          // item 4 = ""
+          // item 5 = Received timestamp
+          start = end + 1;
+          end = message.find(',', start);
+        }
+        if (this->call_state_ != 4) {
+          this->call_state_ = 4;
+          ESP_LOGI(TAG, "Incoming call from %s", caller_id.c_str());
+          incoming_call_callback_.call(caller_id);
+        }
+        this->state_ = STATE_INIT;
+      }
+      break;
+    case STATE_ATA_SENT:
+      ESP_LOGI(TAG, "Call connected");
+      if (this->call_state_ != 0) {
+        this->call_state_ = 0;
+        this->call_connected_callback_.call();
+      }
+      this->state_ = STATE_INIT;
       break;
     default:
-      ESP_LOGD(TAG, "Unhandled: %s - %d", message.c_str(), this->state_);
+      ESP_LOGW(TAG, "Unhandled: %s - %d", message.c_str(), this->state_);
       break;
   }
-}
+}  // namespace sim800l
 
 void Sim800LComponent::loop() {
   // Read message
@@ -265,7 +429,7 @@ void Sim800LComponent::loop() {
       byte = '?';  // need to be valid utf8 string for log functions.
     this->read_buffer_[this->read_pos_] = byte;
 
-    if (this->state_ == STATE_SENDINGSMS2 && this->read_pos_ == 0 && byte == '>')
+    if (this->state_ == STATE_SENDING_SMS_2 && this->read_pos_ == 0 && byte == '>')
       this->read_buffer_[++this->read_pos_] = ASCII_LF;
 
     if (this->read_buffer_[this->read_pos_] == ASCII_LF) {
@@ -276,13 +440,23 @@ void Sim800LComponent::loop() {
       this->read_pos_++;
     }
   }
+  if (state_ == STATE_INIT && this->registered_ &&
+      (this->call_state_ != 6  // A call is in progress
+       || this->send_pending_ || this->dial_pending_ || this->connect_pending_ || this->disconnect_pending_)) {
+    this->update();
+  }
 }
 
 void Sim800LComponent::send_sms(const std::string &recipient, const std::string &message) {
-  ESP_LOGD(TAG, "Sending to %s: %s", recipient.c_str(), message.c_str());
   this->recipient_ = recipient;
   this->outgoing_message_ = message;
   this->send_pending_ = true;
+}
+
+void Sim800LComponent::send_ussd(const std::string &ussd_code) {
+  ESP_LOGD(TAG, "Sending USSD code: %s", ussd_code.c_str());
+  this->ussd_ = ussd_code;
+  this->send_ussd_pending_ = true;
   this->update();
 }
 void Sim800LComponent::dump_config() {
@@ -295,11 +469,11 @@ void Sim800LComponent::dump_config() {
 #endif
 }
 void Sim800LComponent::dial(const std::string &recipient) {
-  ESP_LOGD(TAG, "Dialing %s", recipient.c_str());
   this->recipient_ = recipient;
   this->dial_pending_ = true;
-  this->update();
 }
+void Sim800LComponent::connect() { this->connect_pending_ = true; }
+void Sim800LComponent::disconnect() { this->disconnect_pending_ = true; }
 
 void Sim800LComponent::set_registered_(bool registered) {
   this->registered_ = registered;
diff --git a/esphome/components/sim800l/sim800l.h b/esphome/components/sim800l/sim800l.h
index 3535b96283..bf7efd6915 100644
--- a/esphome/components/sim800l/sim800l.h
+++ b/esphome/components/sim800l/sim800l.h
@@ -16,31 +16,35 @@
 namespace esphome {
 namespace sim800l {
 
-const uint8_t SIM800L_READ_BUFFER_LENGTH = 255;
+const uint16_t SIM800L_READ_BUFFER_LENGTH = 1024;
 
 enum State {
   STATE_IDLE = 0,
   STATE_INIT,
-  STATE_CHECK_AT,
+  STATE_SETUP_CMGF,
+  STATE_SETUP_CLIP,
   STATE_CREG,
-  STATE_CREGWAIT,
+  STATE_CREG_WAIT,
   STATE_CSQ,
   STATE_CSQ_RESPONSE,
-  STATE_IDLEWAIT,
-  STATE_SENDINGSMS1,
-  STATE_SENDINGSMS2,
-  STATE_SENDINGSMS3,
+  STATE_SENDING_SMS_1,
+  STATE_SENDING_SMS_2,
+  STATE_SENDING_SMS_3,
   STATE_CHECK_SMS,
-  STATE_PARSE_SMS,
   STATE_PARSE_SMS_RESPONSE,
-  STATE_RECEIVESMS,
-  STATE_READSMS,
-  STATE_RECEIVEDSMS,
-  STATE_DELETEDSMS,
+  STATE_RECEIVE_SMS,
+  STATE_RECEIVED_SMS,
   STATE_DISABLE_ECHO,
-  STATE_PARSE_SMS_OK,
   STATE_DIALING1,
-  STATE_DIALING2
+  STATE_DIALING2,
+  STATE_PARSE_CLIP,
+  STATE_ATA_SENT,
+  STATE_CHECK_CALL,
+  STATE_SETUP_USSD,
+  STATE_SEND_USSD1,
+  STATE_SEND_USSD2,
+  STATE_CHECK_USSD,
+  STATE_RECEIVED_USSD
 };
 
 class Sim800LComponent : public uart::UARTDevice, public PollingComponent {
@@ -58,10 +62,25 @@ class Sim800LComponent : public uart::UARTDevice, public PollingComponent {
   void set_rssi_sensor(sensor::Sensor *rssi_sensor) { rssi_sensor_ = rssi_sensor; }
 #endif
   void add_on_sms_received_callback(std::function<void(std::string, std::string)> callback) {
-    this->callback_.add(std::move(callback));
+    this->sms_received_callback_.add(std::move(callback));
+  }
+  void add_on_incoming_call_callback(std::function<void(std::string)> callback) {
+    this->incoming_call_callback_.add(std::move(callback));
+  }
+  void add_on_call_connected_callback(std::function<void()> callback) {
+    this->call_connected_callback_.add(std::move(callback));
+  }
+  void add_on_call_disconnected_callback(std::function<void()> callback) {
+    this->call_disconnected_callback_.add(std::move(callback));
+  }
+  void add_on_ussd_received_callback(std::function<void(std::string)> callback) {
+    this->ussd_received_callback_.add(std::move(callback));
   }
   void send_sms(const std::string &recipient, const std::string &message);
+  void send_ussd(const std::string &ussd_code);
   void dial(const std::string &recipient);
+  void connect();
+  void disconnect();
 
  protected:
   void send_cmd_(const std::string &message);
@@ -76,6 +95,7 @@ class Sim800LComponent : public uart::UARTDevice, public PollingComponent {
   sensor::Sensor *rssi_sensor_{nullptr};
 #endif
   std::string sender_;
+  std::string message_;
   char read_buffer_[SIM800L_READ_BUFFER_LENGTH];
   size_t read_pos_{0};
   uint8_t parse_index_{0};
@@ -86,10 +106,19 @@ class Sim800LComponent : public uart::UARTDevice, public PollingComponent {
 
   std::string recipient_;
   std::string outgoing_message_;
+  std::string ussd_;
   bool send_pending_;
   bool dial_pending_;
+  bool connect_pending_;
+  bool disconnect_pending_;
+  bool send_ussd_pending_;
+  uint8_t call_state_{6};
 
-  CallbackManager<void(std::string, std::string)> callback_;
+  CallbackManager<void(std::string, std::string)> sms_received_callback_;
+  CallbackManager<void(std::string)> incoming_call_callback_;
+  CallbackManager<void()> call_connected_callback_;
+  CallbackManager<void()> call_disconnected_callback_;
+  CallbackManager<void(std::string)> ussd_received_callback_;
 };
 
 class Sim800LReceivedMessageTrigger : public Trigger<std::string, std::string> {
@@ -100,6 +129,33 @@ class Sim800LReceivedMessageTrigger : public Trigger<std::string, std::string> {
   }
 };
 
+class Sim800LIncomingCallTrigger : public Trigger<std::string> {
+ public:
+  explicit Sim800LIncomingCallTrigger(Sim800LComponent *parent) {
+    parent->add_on_incoming_call_callback([this](const std::string &caller_id) { this->trigger(caller_id); });
+  }
+};
+
+class Sim800LCallConnectedTrigger : public Trigger<> {
+ public:
+  explicit Sim800LCallConnectedTrigger(Sim800LComponent *parent) {
+    parent->add_on_call_connected_callback([this]() { this->trigger(); });
+  }
+};
+
+class Sim800LCallDisconnectedTrigger : public Trigger<> {
+ public:
+  explicit Sim800LCallDisconnectedTrigger(Sim800LComponent *parent) {
+    parent->add_on_call_disconnected_callback([this]() { this->trigger(); });
+  }
+};
+class Sim800LReceivedUssdTrigger : public Trigger<std::string> {
+ public:
+  explicit Sim800LReceivedUssdTrigger(Sim800LComponent *parent) {
+    parent->add_on_ussd_received_callback([this](const std::string &ussd) { this->trigger(ussd); });
+  }
+};
+
 template<typename... Ts> class Sim800LSendSmsAction : public Action<Ts...> {
  public:
   Sim800LSendSmsAction(Sim800LComponent *parent) : parent_(parent) {}
@@ -116,6 +172,20 @@ template<typename... Ts> class Sim800LSendSmsAction : public Action<Ts...> {
   Sim800LComponent *parent_;
 };
 
+template<typename... Ts> class Sim800LSendUssdAction : public Action<Ts...> {
+ public:
+  Sim800LSendUssdAction(Sim800LComponent *parent) : parent_(parent) {}
+  TEMPLATABLE_VALUE(std::string, ussd)
+
+  void play(Ts... x) {
+    auto ussd_code = this->ussd_.value(x...);
+    this->parent_->send_ussd(ussd_code);
+  }
+
+ protected:
+  Sim800LComponent *parent_;
+};
+
 template<typename... Ts> class Sim800LDialAction : public Action<Ts...> {
  public:
   Sim800LDialAction(Sim800LComponent *parent) : parent_(parent) {}
@@ -129,6 +199,25 @@ template<typename... Ts> class Sim800LDialAction : public Action<Ts...> {
  protected:
   Sim800LComponent *parent_;
 };
+template<typename... Ts> class Sim800LConnectAction : public Action<Ts...> {
+ public:
+  Sim800LConnectAction(Sim800LComponent *parent) : parent_(parent) {}
+
+  void play(Ts... x) { this->parent_->connect(); }
+
+ protected:
+  Sim800LComponent *parent_;
+};
+
+template<typename... Ts> class Sim800LDisconnectAction : public Action<Ts...> {
+ public:
+  Sim800LDisconnectAction(Sim800LComponent *parent) : parent_(parent) {}
+
+  void play(Ts... x) { this->parent_->disconnect(); }
+
+ protected:
+  Sim800LComponent *parent_;
+};
 
 }  // namespace sim800l
 }  // namespace esphome

From 78b55d86e96ba72848379f75e889bc268122d41b Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Thu, 15 Sep 2022 01:53:02 +0200
Subject: [PATCH 067/838] Unify 'nullptr' initalization of class members;
 (#3805)

---
 esphome/components/ade7953/ade7953.h                        | 2 +-
 esphome/components/api/api_frame_helper.h                   | 6 +++---
 esphome/components/hydreon_rgxx/hydreon_rgxx.h              | 6 +++---
 esphome/components/mlx90393/sensor_mlx90393.h               | 2 +-
 esphome/components/pid/pid_climate.h                        | 4 ++--
 esphome/components/pulse_meter/pulse_meter_sensor.h         | 4 ++--
 .../components/pvvx_mithermometer/display/pvvx_display.h    | 2 +-
 esphome/core/automation.h                                   | 2 +-
 esphome/core/component.h                                    | 2 +-
 esphome/core/gpio.h                                         | 2 +-
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/esphome/components/ade7953/ade7953.h b/esphome/components/ade7953/ade7953.h
index bb160cd8eb..418ad1c9e7 100644
--- a/esphome/components/ade7953/ade7953.h
+++ b/esphome/components/ade7953/ade7953.h
@@ -82,7 +82,7 @@ class ADE7953 : public i2c::I2CDevice, public PollingComponent {
     return i2c::ERROR_OK;
   }
 
-  InternalGPIOPin *irq_pin_ = nullptr;
+  InternalGPIOPin *irq_pin_{nullptr};
   bool is_setup_{false};
   sensor::Sensor *voltage_sensor_{nullptr};
   sensor::Sensor *current_a_sensor_{nullptr};
diff --git a/esphome/components/api/api_frame_helper.h b/esphome/components/api/api_frame_helper.h
index 57e3c961d5..348a9b574f 100644
--- a/esphome/components/api/api_frame_helper.h
+++ b/esphome/components/api/api_frame_helper.h
@@ -116,9 +116,9 @@ class APINoiseFrameHelper : public APIFrameHelper {
   std::vector<uint8_t> prologue_;
 
   std::shared_ptr<APINoiseContext> ctx_;
-  NoiseHandshakeState *handshake_ = nullptr;
-  NoiseCipherState *send_cipher_ = nullptr;
-  NoiseCipherState *recv_cipher_ = nullptr;
+  NoiseHandshakeState *handshake_{nullptr};
+  NoiseCipherState *send_cipher_{nullptr};
+  NoiseCipherState *recv_cipher_{nullptr};
   NoiseProtocolId nid_;
 
   enum class State {
diff --git a/esphome/components/hydreon_rgxx/hydreon_rgxx.h b/esphome/components/hydreon_rgxx/hydreon_rgxx.h
index 1697060d28..34b9bd8d5e 100644
--- a/esphome/components/hydreon_rgxx/hydreon_rgxx.h
+++ b/esphome/components/hydreon_rgxx/hydreon_rgxx.h
@@ -58,9 +58,9 @@ class HydreonRGxxComponent : public PollingComponent, public uart::UARTDevice {
 
   sensor::Sensor *sensors_[NUM_SENSORS] = {nullptr};
 #ifdef USE_BINARY_SENSOR
-  binary_sensor::BinarySensor *too_cold_sensor_ = nullptr;
-  binary_sensor::BinarySensor *lens_bad_sensor_ = nullptr;
-  binary_sensor::BinarySensor *em_sat_sensor_ = nullptr;
+  binary_sensor::BinarySensor *too_cold_sensor_{nullptr};
+  binary_sensor::BinarySensor *lens_bad_sensor_{nullptr};
+  binary_sensor::BinarySensor *em_sat_sensor_{nullptr};
 #endif
 
   int16_t boot_count_ = 0;
diff --git a/esphome/components/mlx90393/sensor_mlx90393.h b/esphome/components/mlx90393/sensor_mlx90393.h
index fc33ad1aa8..8dfb7e6a13 100644
--- a/esphome/components/mlx90393/sensor_mlx90393.h
+++ b/esphome/components/mlx90393/sensor_mlx90393.h
@@ -52,7 +52,7 @@ class MLX90393Cls : public PollingComponent, public i2c::I2CDevice, public MLX90
   uint8_t temperature_oversampling_ = 0;
   uint8_t filter_;
   uint8_t resolutions_[3] = {0};
-  GPIOPin *drdy_pin_ = nullptr;
+  GPIOPin *drdy_pin_{nullptr};
 };
 
 }  // namespace mlx90393
diff --git a/esphome/components/pid/pid_climate.h b/esphome/components/pid/pid_climate.h
index ff301386b6..095c00eb49 100644
--- a/esphome/components/pid/pid_climate.h
+++ b/esphome/components/pid/pid_climate.h
@@ -59,8 +59,8 @@ class PIDClimate : public climate::Climate, public Component {
 
   /// The sensor used for getting the current temperature
   sensor::Sensor *sensor_;
-  output::FloatOutput *cool_output_ = nullptr;
-  output::FloatOutput *heat_output_ = nullptr;
+  output::FloatOutput *cool_output_{nullptr};
+  output::FloatOutput *heat_output_{nullptr};
   PIDController controller_;
   /// Output value as reported by the PID controller, for PIDClimateSensor
   float output_value_;
diff --git a/esphome/components/pulse_meter/pulse_meter_sensor.h b/esphome/components/pulse_meter/pulse_meter_sensor.h
index cf08f8c92d..bf50eab6ff 100644
--- a/esphome/components/pulse_meter/pulse_meter_sensor.h
+++ b/esphome/components/pulse_meter/pulse_meter_sensor.h
@@ -31,11 +31,11 @@ class PulseMeterSensor : public sensor::Sensor, public Component {
  protected:
   static void gpio_intr(PulseMeterSensor *sensor);
 
-  InternalGPIOPin *pin_ = nullptr;
+  InternalGPIOPin *pin_{nullptr};
   ISRInternalGPIOPin isr_pin_;
   uint32_t filter_us_ = 0;
   uint32_t timeout_us_ = 1000000UL * 60UL * 5UL;
-  sensor::Sensor *total_sensor_ = nullptr;
+  sensor::Sensor *total_sensor_{nullptr};
   InternalFilterMode filter_mode_{FILTER_EDGE};
 
   Deduplicator<uint32_t> pulse_width_dedupe_;
diff --git a/esphome/components/pvvx_mithermometer/display/pvvx_display.h b/esphome/components/pvvx_mithermometer/display/pvvx_display.h
index 4de1ab7ba6..c7e7cc04fb 100644
--- a/esphome/components/pvvx_mithermometer/display/pvvx_display.h
+++ b/esphome/components/pvvx_mithermometer/display/pvvx_display.h
@@ -114,7 +114,7 @@ class PVVXDisplay : public ble_client::BLEClientNode, public PollingComponent {
   void delayed_disconnect_();
 #ifdef USE_TIME
   void sync_time_();
-  time::RealTimeClock *time_ = nullptr;
+  time::RealTimeClock *time_{nullptr};
 #endif
   uint16_t char_handle_ = 0;
   bool connection_established_ = false;
diff --git a/esphome/core/automation.h b/esphome/core/automation.h
index 92bc32247b..84c754e081 100644
--- a/esphome/core/automation.h
+++ b/esphome/core/automation.h
@@ -176,7 +176,7 @@ template<typename... Ts> class Action {
     return this->next_->is_running();
   }
 
-  Action<Ts...> *next_ = nullptr;
+  Action<Ts...> *next_{nullptr};
 
   /// The number of instances of this sequence in the list of actions
   /// that is currently being executed.
diff --git a/esphome/core/component.h b/esphome/core/component.h
index e394736653..cb97a93d21 100644
--- a/esphome/core/component.h
+++ b/esphome/core/component.h
@@ -254,7 +254,7 @@ class Component {
 
   uint32_t component_state_{0x0000};  ///< State of this component.
   float setup_priority_override_{NAN};
-  const char *component_source_ = nullptr;
+  const char *component_source_{nullptr};
 };
 
 /** This class simplifies creating components that periodically check a state.
diff --git a/esphome/core/gpio.h b/esphome/core/gpio.h
index b953a95664..1b6f2ba1e6 100644
--- a/esphome/core/gpio.h
+++ b/esphome/core/gpio.h
@@ -73,7 +73,7 @@ class ISRInternalGPIOPin {
   void pin_mode(gpio::Flags flags);
 
  protected:
-  void *arg_ = nullptr;
+  void *arg_{nullptr};
 };
 
 class InternalGPIOPin : public GPIOPin {

From 0ac4c055de90030d35d9fab704db06ee473da30c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 15 Sep 2022 11:53:22 +1200
Subject: [PATCH 068/838] Initialize all child sensors to nullptr (#3808)

---
 esphome/components/aht10/aht10.h               |  4 ++--
 esphome/components/am2320/am2320.h             |  4 ++--
 esphome/components/as3935/as3935.h             |  6 +++---
 esphome/components/bl0939/bl0939.h             | 16 ++++++++--------
 esphome/components/bl0940/bl0940.h             | 12 ++++++------
 esphome/components/bl0942/bl0942.h             | 10 +++++-----
 esphome/components/bme280/bme280.h             |  6 +++---
 esphome/components/bme680/bme680.h             |  8 ++++----
 esphome/components/bme680_bsec/bme680_bsec.h   | 18 +++++++++---------
 esphome/components/bmp280/bmp280.h             |  4 ++--
 esphome/components/bmp3xx/bmp3xx.h             |  4 ++--
 esphome/components/dht12/dht12.h               |  4 ++--
 esphome/components/dps310/dps310.h             |  4 ++--
 esphome/components/ens210/ens210.h             |  4 ++--
 esphome/components/hdc1080/hdc1080.h           |  4 ++--
 esphome/components/hmc5883l/hmc5883l.h         |  8 ++++----
 esphome/components/honeywellabp/honeywellabp.h |  4 ++--
 esphome/components/ms5611/ms5611.h             |  4 ++--
 esphome/components/pzem004t/pzem004t.h         |  8 ++++----
 esphome/components/pzemac/pzemac.h             | 12 ++++++------
 esphome/components/pzemdc/pzemdc.h             | 10 +++++-----
 esphome/components/qmc5883l/qmc5883l.h         |  8 ++++----
 esphome/components/qmp6988/qmp6988.h           |  4 ++--
 esphome/components/sht3xd/sht3xd.h             |  4 ++--
 esphome/components/shtcx/shtcx.h               |  4 ++--
 esphome/components/tsl2591/tsl2591.h           |  8 ++++----
 esphome/components/tx20/tx20.h                 |  4 ++--
 27 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/esphome/components/aht10/aht10.h b/esphome/components/aht10/aht10.h
index bfb6b07a7a..4d0eaa5919 100644
--- a/esphome/components/aht10/aht10.h
+++ b/esphome/components/aht10/aht10.h
@@ -18,8 +18,8 @@ class AHT10Component : public PollingComponent, public i2c::I2CDevice {
   void set_humidity_sensor(sensor::Sensor *humidity_sensor) { humidity_sensor_ = humidity_sensor; }
 
  protected:
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *humidity_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
 };
 
 }  // namespace aht10
diff --git a/esphome/components/am2320/am2320.h b/esphome/components/am2320/am2320.h
index 33e1d30aa0..da1e87cf65 100644
--- a/esphome/components/am2320/am2320.h
+++ b/esphome/components/am2320/am2320.h
@@ -21,8 +21,8 @@ class AM2320Component : public PollingComponent, public i2c::I2CDevice {
   bool read_data_(uint8_t *data);
   bool read_bytes_(uint8_t a_register, uint8_t *data, uint8_t len, uint32_t conversion = 0);
 
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *humidity_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
 };
 
 }  // namespace am2320
diff --git a/esphome/components/as3935/as3935.h b/esphome/components/as3935/as3935.h
index 2e65aab4d1..2cba9b11a0 100644
--- a/esphome/components/as3935/as3935.h
+++ b/esphome/components/as3935/as3935.h
@@ -92,9 +92,9 @@ class AS3935Component : public Component {
 
   virtual void write_register(uint8_t reg, uint8_t mask, uint8_t bits, uint8_t start_position) = 0;
 
-  sensor::Sensor *distance_sensor_;
-  sensor::Sensor *energy_sensor_;
-  binary_sensor::BinarySensor *thunder_alert_binary_sensor_;
+  sensor::Sensor *distance_sensor_{nullptr};
+  sensor::Sensor *energy_sensor_{nullptr};
+  binary_sensor::BinarySensor *thunder_alert_binary_sensor_{nullptr};
   GPIOPin *irq_pin_;
 
   bool indoor_;
diff --git a/esphome/components/bl0939/bl0939.h b/esphome/components/bl0939/bl0939.h
index d3dab67cc1..673d4ff351 100644
--- a/esphome/components/bl0939/bl0939.h
+++ b/esphome/components/bl0939/bl0939.h
@@ -75,16 +75,16 @@ class BL0939 : public PollingComponent, public uart::UARTDevice {
   void dump_config() override;
 
  protected:
-  sensor::Sensor *voltage_sensor_;
-  sensor::Sensor *current_sensor_1_;
-  sensor::Sensor *current_sensor_2_;
+  sensor::Sensor *voltage_sensor_{nullptr};
+  sensor::Sensor *current_sensor_1_{nullptr};
+  sensor::Sensor *current_sensor_2_{nullptr};
   // NB This may be negative as the circuits is seemingly able to measure
   // power in both directions
-  sensor::Sensor *power_sensor_1_;
-  sensor::Sensor *power_sensor_2_;
-  sensor::Sensor *energy_sensor_1_;
-  sensor::Sensor *energy_sensor_2_;
-  sensor::Sensor *energy_sensor_sum_;
+  sensor::Sensor *power_sensor_1_{nullptr};
+  sensor::Sensor *power_sensor_2_{nullptr};
+  sensor::Sensor *energy_sensor_1_{nullptr};
+  sensor::Sensor *energy_sensor_2_{nullptr};
+  sensor::Sensor *energy_sensor_sum_{nullptr};
 
   // Divide by this to turn into Watt
   float power_reference_ = BL0939_PREF;
diff --git a/esphome/components/bl0940/bl0940.h b/esphome/components/bl0940/bl0940.h
index 49c8e50595..2d4e7ccaac 100644
--- a/esphome/components/bl0940/bl0940.h
+++ b/esphome/components/bl0940/bl0940.h
@@ -75,14 +75,14 @@ class BL0940 : public PollingComponent, public uart::UARTDevice {
   void dump_config() override;
 
  protected:
-  sensor::Sensor *voltage_sensor_;
-  sensor::Sensor *current_sensor_;
+  sensor::Sensor *voltage_sensor_{nullptr};
+  sensor::Sensor *current_sensor_{nullptr};
   // NB This may be negative as the circuits is seemingly able to measure
   // power in both directions
-  sensor::Sensor *power_sensor_;
-  sensor::Sensor *energy_sensor_;
-  sensor::Sensor *internal_temperature_sensor_;
-  sensor::Sensor *external_temperature_sensor_;
+  sensor::Sensor *power_sensor_{nullptr};
+  sensor::Sensor *energy_sensor_{nullptr};
+  sensor::Sensor *internal_temperature_sensor_{nullptr};
+  sensor::Sensor *external_temperature_sensor_{nullptr};
 
   // Max difference between two measurements of the temperature. Used to avoid noise.
   float max_temperature_diff_{0};
diff --git a/esphome/components/bl0942/bl0942.h b/esphome/components/bl0942/bl0942.h
index 8149b7493b..12489915e1 100644
--- a/esphome/components/bl0942/bl0942.h
+++ b/esphome/components/bl0942/bl0942.h
@@ -43,13 +43,13 @@ class BL0942 : public PollingComponent, public uart::UARTDevice {
   void dump_config() override;
 
  protected:
-  sensor::Sensor *voltage_sensor_;
-  sensor::Sensor *current_sensor_;
+  sensor::Sensor *voltage_sensor_{nullptr};
+  sensor::Sensor *current_sensor_{nullptr};
   // NB This may be negative as the circuits is seemingly able to measure
   // power in both directions
-  sensor::Sensor *power_sensor_;
-  sensor::Sensor *energy_sensor_;
-  sensor::Sensor *frequency_sensor_;
+  sensor::Sensor *power_sensor_{nullptr};
+  sensor::Sensor *energy_sensor_{nullptr};
+  sensor::Sensor *frequency_sensor_{nullptr};
 
   // Divide by this to turn into Watt
   float power_reference_ = BL0942_PREF;
diff --git a/esphome/components/bme280/bme280.h b/esphome/components/bme280/bme280.h
index 8511f73382..50d398c40f 100644
--- a/esphome/components/bme280/bme280.h
+++ b/esphome/components/bme280/bme280.h
@@ -96,9 +96,9 @@ class BME280Component : public PollingComponent, public i2c::I2CDevice {
   BME280Oversampling pressure_oversampling_{BME280_OVERSAMPLING_16X};
   BME280Oversampling humidity_oversampling_{BME280_OVERSAMPLING_16X};
   BME280IIRFilter iir_filter_{BME280_IIR_FILTER_OFF};
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
-  sensor::Sensor *humidity_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
   enum ErrorCode {
     NONE = 0,
     COMMUNICATION_FAILED,
diff --git a/esphome/components/bme680/bme680.h b/esphome/components/bme680/bme680.h
index 0671cd990e..6446449742 100644
--- a/esphome/components/bme680/bme680.h
+++ b/esphome/components/bme680/bme680.h
@@ -129,10 +129,10 @@ class BME680Component : public PollingComponent, public i2c::I2CDevice {
   uint16_t heater_temperature_{320};
   uint16_t heater_duration_{150};
 
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
-  sensor::Sensor *humidity_sensor_;
-  sensor::Sensor *gas_resistance_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
+  sensor::Sensor *gas_resistance_sensor_{nullptr};
 };
 
 }  // namespace bme680
diff --git a/esphome/components/bme680_bsec/bme680_bsec.h b/esphome/components/bme680_bsec/bme680_bsec.h
index 650b4d2413..6fe8f8fef7 100644
--- a/esphome/components/bme680_bsec/bme680_bsec.h
+++ b/esphome/components/bme680_bsec/bme680_bsec.h
@@ -100,15 +100,15 @@ class BME680BSECComponent : public Component, public i2c::I2CDevice {
   SampleRate pressure_sample_rate_{SAMPLE_RATE_DEFAULT};
   SampleRate humidity_sample_rate_{SAMPLE_RATE_DEFAULT};
 
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
-  sensor::Sensor *humidity_sensor_;
-  sensor::Sensor *gas_resistance_sensor_;
-  sensor::Sensor *iaq_sensor_;
-  text_sensor::TextSensor *iaq_accuracy_text_sensor_;
-  sensor::Sensor *iaq_accuracy_sensor_;
-  sensor::Sensor *co2_equivalent_sensor_;
-  sensor::Sensor *breath_voc_equivalent_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
+  sensor::Sensor *gas_resistance_sensor_{nullptr};
+  sensor::Sensor *iaq_sensor_{nullptr};
+  text_sensor::TextSensor *iaq_accuracy_text_sensor_{nullptr};
+  sensor::Sensor *iaq_accuracy_sensor_{nullptr};
+  sensor::Sensor *co2_equivalent_sensor_{nullptr};
+  sensor::Sensor *breath_voc_equivalent_sensor_{nullptr};
 };
 #endif
 }  // namespace bme680_bsec
diff --git a/esphome/components/bmp280/bmp280.h b/esphome/components/bmp280/bmp280.h
index f8646fb547..96eb470155 100644
--- a/esphome/components/bmp280/bmp280.h
+++ b/esphome/components/bmp280/bmp280.h
@@ -81,8 +81,8 @@ class BMP280Component : public PollingComponent, public i2c::I2CDevice {
   BMP280Oversampling temperature_oversampling_{BMP280_OVERSAMPLING_16X};
   BMP280Oversampling pressure_oversampling_{BMP280_OVERSAMPLING_16X};
   BMP280IIRFilter iir_filter_{BMP280_IIR_FILTER_OFF};
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
   enum ErrorCode {
     NONE = 0,
     COMMUNICATION_FAILED,
diff --git a/esphome/components/bmp3xx/bmp3xx.h b/esphome/components/bmp3xx/bmp3xx.h
index ab20abfe9b..d3b15f601d 100644
--- a/esphome/components/bmp3xx/bmp3xx.h
+++ b/esphome/components/bmp3xx/bmp3xx.h
@@ -125,8 +125,8 @@ class BMP3XXComponent : public PollingComponent, public i2c::I2CDevice {
   Oversampling pressure_oversampling_{OVERSAMPLING_X16};
   IIRFilter iir_filter_{IIR_FILTER_OFF};
   OperationMode operation_mode_{FORCED_MODE};
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
   enum ErrorCode {
     NONE = 0,
     ERROR_COMMUNICATION_FAILED,
diff --git a/esphome/components/dht12/dht12.h b/esphome/components/dht12/dht12.h
index ae4d4fd607..2a706039ba 100644
--- a/esphome/components/dht12/dht12.h
+++ b/esphome/components/dht12/dht12.h
@@ -20,8 +20,8 @@ class DHT12Component : public PollingComponent, public i2c::I2CDevice {
  protected:
   bool read_data_(uint8_t *data);
 
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *humidity_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
 };
 
 }  // namespace dht12
diff --git a/esphome/components/dps310/dps310.h b/esphome/components/dps310/dps310.h
index 7aca2c3d10..50e7d93c8a 100644
--- a/esphome/components/dps310/dps310.h
+++ b/esphome/components/dps310/dps310.h
@@ -53,8 +53,8 @@ class DPS310Component : public PollingComponent, public i2c::I2CDevice {
   void calculate_values_(int32_t raw_temperature, int32_t raw_pressure);
   static int32_t twos_complement(int32_t val, uint8_t bits);
 
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
   int32_t raw_pressure_, raw_temperature_, c00_, c10_;
   int16_t c0_, c1_, c01_, c11_, c20_, c21_, c30_;
   uint8_t prod_rev_id_;
diff --git a/esphome/components/ens210/ens210.h b/esphome/components/ens210/ens210.h
index 342be04799..0fb6ff634d 100644
--- a/esphome/components/ens210/ens210.h
+++ b/esphome/components/ens210/ens210.h
@@ -31,8 +31,8 @@ class ENS210Component : public PollingComponent, public i2c::I2CDevice {
   bool set_low_power_(bool enable);
   void extract_measurement_(uint32_t val, int *data, int *status);
 
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *humidity_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
 };
 
 }  // namespace ens210
diff --git a/esphome/components/hdc1080/hdc1080.h b/esphome/components/hdc1080/hdc1080.h
index 9cb87cdb8b..2ff7b6dc33 100644
--- a/esphome/components/hdc1080/hdc1080.h
+++ b/esphome/components/hdc1080/hdc1080.h
@@ -21,8 +21,8 @@ class HDC1080Component : public PollingComponent, public i2c::I2CDevice {
   float get_setup_priority() const override;
 
  protected:
-  sensor::Sensor *temperature_;
-  sensor::Sensor *humidity_;
+  sensor::Sensor *temperature_{nullptr};
+  sensor::Sensor *humidity_{nullptr};
 };
 
 }  // namespace hdc1080
diff --git a/esphome/components/hmc5883l/hmc5883l.h b/esphome/components/hmc5883l/hmc5883l.h
index 41d41baa22..3481f45dc8 100644
--- a/esphome/components/hmc5883l/hmc5883l.h
+++ b/esphome/components/hmc5883l/hmc5883l.h
@@ -54,10 +54,10 @@ class HMC5883LComponent : public PollingComponent, public i2c::I2CDevice {
   HMC5883LOversampling oversampling_{HMC5883L_OVERSAMPLING_1};
   HMC5883LDatarate datarate_{HMC5883L_DATARATE_15_0_HZ};
   HMC5883LRange range_{HMC5883L_RANGE_130_UT};
-  sensor::Sensor *x_sensor_;
-  sensor::Sensor *y_sensor_;
-  sensor::Sensor *z_sensor_;
-  sensor::Sensor *heading_sensor_;
+  sensor::Sensor *x_sensor_{nullptr};
+  sensor::Sensor *y_sensor_{nullptr};
+  sensor::Sensor *z_sensor_{nullptr};
+  sensor::Sensor *heading_sensor_{nullptr};
   enum ErrorCode {
     NONE = 0,
     COMMUNICATION_FAILED,
diff --git a/esphome/components/honeywellabp/honeywellabp.h b/esphome/components/honeywellabp/honeywellabp.h
index 44d5952ca6..98f6f08c4a 100644
--- a/esphome/components/honeywellabp/honeywellabp.h
+++ b/esphome/components/honeywellabp/honeywellabp.h
@@ -29,8 +29,8 @@ class HONEYWELLABPSensor : public PollingComponent,
   uint8_t status_ = 0;         // byte to hold status information.
   int pressure_count_ = 0;     // hold raw pressure data (14 - bit, 0 - 16384)
   int temperature_count_ = 0;  // hold raw temperature data (11 - bit, 0 - 2048)
-  sensor::Sensor *pressure_sensor_;
-  sensor::Sensor *temperature_sensor_;
+  sensor::Sensor *pressure_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_{nullptr};
   uint8_t readsensor_();
   uint8_t readstatus_();
   int rawpressure_();
diff --git a/esphome/components/ms5611/ms5611.h b/esphome/components/ms5611/ms5611.h
index b5663ad736..476db79612 100644
--- a/esphome/components/ms5611/ms5611.h
+++ b/esphome/components/ms5611/ms5611.h
@@ -22,8 +22,8 @@ class MS5611Component : public PollingComponent, public i2c::I2CDevice {
   void read_pressure_(uint32_t raw_temperature);
   void calculate_values_(uint32_t raw_temperature, uint32_t raw_pressure);
 
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
   uint16_t prom_[6];
 };
 
diff --git a/esphome/components/pzem004t/pzem004t.h b/esphome/components/pzem004t/pzem004t.h
index f4f9f29b4d..e18413f35c 100644
--- a/esphome/components/pzem004t/pzem004t.h
+++ b/esphome/components/pzem004t/pzem004t.h
@@ -23,10 +23,10 @@ class PZEM004T : public PollingComponent, public uart::UARTDevice {
   void dump_config() override;
 
  protected:
-  sensor::Sensor *voltage_sensor_;
-  sensor::Sensor *current_sensor_;
-  sensor::Sensor *power_sensor_;
-  sensor::Sensor *energy_sensor_;
+  sensor::Sensor *voltage_sensor_{nullptr};
+  sensor::Sensor *current_sensor_{nullptr};
+  sensor::Sensor *power_sensor_{nullptr};
+  sensor::Sensor *energy_sensor_{nullptr};
 
   enum PZEM004TReadState {
     SET_ADDRESS = 0xB4,
diff --git a/esphome/components/pzemac/pzemac.h b/esphome/components/pzemac/pzemac.h
index e9f76972a3..8f2cf1460d 100644
--- a/esphome/components/pzemac/pzemac.h
+++ b/esphome/components/pzemac/pzemac.h
@@ -27,12 +27,12 @@ class PZEMAC : public PollingComponent, public modbus::ModbusDevice {
 
  protected:
   template<typename... Ts> friend class ResetEnergyAction;
-  sensor::Sensor *voltage_sensor_;
-  sensor::Sensor *current_sensor_;
-  sensor::Sensor *power_sensor_;
-  sensor::Sensor *energy_sensor_;
-  sensor::Sensor *frequency_sensor_;
-  sensor::Sensor *power_factor_sensor_;
+  sensor::Sensor *voltage_sensor_{nullptr};
+  sensor::Sensor *current_sensor_{nullptr};
+  sensor::Sensor *power_sensor_{nullptr};
+  sensor::Sensor *energy_sensor_{nullptr};
+  sensor::Sensor *frequency_sensor_{nullptr};
+  sensor::Sensor *power_factor_sensor_{nullptr};
 
   void reset_energy_();
 };
diff --git a/esphome/components/pzemdc/pzemdc.h b/esphome/components/pzemdc/pzemdc.h
index d838eb4167..a78a48a6fb 100644
--- a/esphome/components/pzemdc/pzemdc.h
+++ b/esphome/components/pzemdc/pzemdc.h
@@ -22,11 +22,11 @@ class PZEMDC : public PollingComponent, public modbus::ModbusDevice {
   void dump_config() override;
 
  protected:
-  sensor::Sensor *voltage_sensor_;
-  sensor::Sensor *current_sensor_;
-  sensor::Sensor *power_sensor_;
-  sensor::Sensor *frequency_sensor_;
-  sensor::Sensor *power_factor_sensor_;
+  sensor::Sensor *voltage_sensor_{nullptr};
+  sensor::Sensor *current_sensor_{nullptr};
+  sensor::Sensor *power_sensor_{nullptr};
+  sensor::Sensor *frequency_sensor_{nullptr};
+  sensor::Sensor *power_factor_sensor_{nullptr};
 };
 
 }  // namespace pzemdc
diff --git a/esphome/components/qmc5883l/qmc5883l.h b/esphome/components/qmc5883l/qmc5883l.h
index 01697ecbd0..15ef435ce5 100644
--- a/esphome/components/qmc5883l/qmc5883l.h
+++ b/esphome/components/qmc5883l/qmc5883l.h
@@ -45,10 +45,10 @@ class QMC5883LComponent : public PollingComponent, public i2c::I2CDevice {
   QMC5883LDatarate datarate_{QMC5883L_DATARATE_10_HZ};
   QMC5883LRange range_{QMC5883L_RANGE_200_UT};
   QMC5883LOversampling oversampling_{QMC5883L_SAMPLING_512};
-  sensor::Sensor *x_sensor_;
-  sensor::Sensor *y_sensor_;
-  sensor::Sensor *z_sensor_;
-  sensor::Sensor *heading_sensor_;
+  sensor::Sensor *x_sensor_{nullptr};
+  sensor::Sensor *y_sensor_{nullptr};
+  sensor::Sensor *z_sensor_{nullptr};
+  sensor::Sensor *heading_sensor_{nullptr};
   enum ErrorCode {
     NONE = 0,
     COMMUNICATION_FAILED,
diff --git a/esphome/components/qmp6988/qmp6988.h b/esphome/components/qmp6988/qmp6988.h
index ef944ba4ff..f0c11adf43 100644
--- a/esphome/components/qmp6988/qmp6988.h
+++ b/esphome/components/qmp6988/qmp6988.h
@@ -91,8 +91,8 @@ class QMP6988Component : public PollingComponent, public i2c::I2CDevice {
 
  protected:
   qmp6988_data_t qmp6988_data_;
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
 
   QMP6988Oversampling temperature_oversampling_{QMP6988_OVERSAMPLING_16X};
   QMP6988Oversampling pressure_oversampling_{QMP6988_OVERSAMPLING_16X};
diff --git a/esphome/components/sht3xd/sht3xd.h b/esphome/components/sht3xd/sht3xd.h
index 3164aa0687..41ca3c5d6e 100644
--- a/esphome/components/sht3xd/sht3xd.h
+++ b/esphome/components/sht3xd/sht3xd.h
@@ -19,8 +19,8 @@ class SHT3XDComponent : public PollingComponent, public sensirion_common::Sensir
   void update() override;
 
  protected:
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *humidity_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
 };
 
 }  // namespace sht3xd
diff --git a/esphome/components/shtcx/shtcx.h b/esphome/components/shtcx/shtcx.h
index c44fb9d9c1..084d3bfc35 100644
--- a/esphome/components/shtcx/shtcx.h
+++ b/esphome/components/shtcx/shtcx.h
@@ -26,8 +26,8 @@ class SHTCXComponent : public PollingComponent, public sensirion_common::Sensiri
  protected:
   SHTCXType type_;
   uint16_t sensor_id_;
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *humidity_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
 };
 
 }  // namespace shtcx
diff --git a/esphome/components/tsl2591/tsl2591.h b/esphome/components/tsl2591/tsl2591.h
index d82dbc395f..5b7eea35ec 100644
--- a/esphome/components/tsl2591/tsl2591.h
+++ b/esphome/components/tsl2591/tsl2591.h
@@ -245,10 +245,10 @@ class TSL2591Component : public PollingComponent, public i2c::I2CDevice {
 
  protected:
   const char *name_;
-  sensor::Sensor *full_spectrum_sensor_;
-  sensor::Sensor *infrared_sensor_;
-  sensor::Sensor *visible_sensor_;
-  sensor::Sensor *calculated_lux_sensor_;
+  sensor::Sensor *full_spectrum_sensor_{nullptr};
+  sensor::Sensor *infrared_sensor_{nullptr};
+  sensor::Sensor *visible_sensor_{nullptr};
+  sensor::Sensor *calculated_lux_sensor_{nullptr};
   TSL2591IntegrationTime integration_time_;
   TSL2591ComponentGain component_gain_;
   TSL2591Gain gain_;
diff --git a/esphome/components/tx20/tx20.h b/esphome/components/tx20/tx20.h
index 1c617d0674..95a9517227 100644
--- a/esphome/components/tx20/tx20.h
+++ b/esphome/components/tx20/tx20.h
@@ -43,8 +43,8 @@ class Tx20Component : public Component {
 
   std::string wind_cardinal_direction_;
   InternalGPIOPin *pin_;
-  sensor::Sensor *wind_speed_sensor_;
-  sensor::Sensor *wind_direction_degrees_sensor_;
+  sensor::Sensor *wind_speed_sensor_{nullptr};
+  sensor::Sensor *wind_direction_degrees_sensor_{nullptr};
   Tx20ComponentStore store_;
 };
 

From 917bbc669c517070b5f8cf4fba9335755165ca74 Mon Sep 17 00:00:00 2001
From: Azimath <npnickster@gmail.com>
Date: Wed, 14 Sep 2022 19:54:33 -0400
Subject: [PATCH 069/838] Remove floating point calculation from ac_dimmer ISR
 (#3770)

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

diff --git a/esphome/components/ac_dimmer/ac_dimmer.cpp b/esphome/components/ac_dimmer/ac_dimmer.cpp
index 1d0cd8d0ab..16101a1c2c 100644
--- a/esphome/components/ac_dimmer/ac_dimmer.cpp
+++ b/esphome/components/ac_dimmer/ac_dimmer.cpp
@@ -121,11 +121,8 @@ void IRAM_ATTR HOT AcDimmerDataStore::gpio_intr() {
       // calculate time until enable in µs: (1.0-value)*cycle_time, but with integer arithmetic
       // also take into account min_power
       auto min_us = this->cycle_time_us * this->min_power / 1000;
-      // calculate required value to provide a true RMS voltage output
-      this->enable_time_us =
-          std::max((uint32_t) 1, (uint32_t)((65535 - (acos(1 - (2 * this->value / 65535.0)) / 3.14159 * 65535)) *
-                                            (this->cycle_time_us - min_us)) /
-                                     65535);
+      this->enable_time_us = std::max((uint32_t) 1, ((65535 - this->value) * (this->cycle_time_us - min_us)) / 65535);
+
       if (this->method == DIM_METHOD_LEADING_PULSE) {
         // Minimum pulse time should be enough for the triac to trigger when it is close to the ZC zone
         // this is for brightness near 99%
@@ -206,6 +203,7 @@ void AcDimmer::setup() {
 #endif
 }
 void AcDimmer::write_state(float state) {
+  state = std::acos(1 - (2 * state)) / 3.14159;  // RMS power compensation
   auto new_value = static_cast<uint16_t>(roundf(state * 65535));
   if (new_value != 0 && this->store_.value == 0)
     this->store_.init_cycle = this->init_with_half_cycle_;

From c61abf6aca6be646320bd39d1b8fd7cdf348e339 Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Wed, 14 Sep 2022 15:01:28 +0200
Subject: [PATCH 070/838] null initialize total sensor for pulse counter
 (#3803)

* null initialize total sensor.

* pedantic styling fix

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/pulse_counter/pulse_counter_sensor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/pulse_counter/pulse_counter_sensor.h b/esphome/components/pulse_counter/pulse_counter_sensor.h
index d9be79e403..ef944f106f 100644
--- a/esphome/components/pulse_counter/pulse_counter_sensor.h
+++ b/esphome/components/pulse_counter/pulse_counter_sensor.h
@@ -81,7 +81,7 @@ class PulseCounterSensor : public sensor::Sensor, public PollingComponent {
   PulseCounterStorageBase &storage_;
   uint32_t last_time_{0};
   uint32_t current_total_{0};
-  sensor::Sensor *total_sensor_;
+  sensor::Sensor *total_sensor_{nullptr};
 };
 
 }  // namespace pulse_counter

From cea7deab912f664635cb28678690c72fc452c80d Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Wed, 14 Sep 2022 16:43:03 -0300
Subject: [PATCH 071/838] Sim800l add calls, multiline sms and ussd (#3630)

Co-authored-by: Matus Ivanecky <matus.ivanecky@gmail.com>
Co-authored-by: Matus Ivanecky <maty535@users.noreply.github.com>
---
 esphome/components/sim800l/__init__.py | 109 ++++++++++
 esphome/components/sim800l/sim800l.cpp | 282 ++++++++++++++++++++-----
 esphome/components/sim800l/sim800l.h   | 121 +++++++++--
 3 files changed, 442 insertions(+), 70 deletions(-)

diff --git a/esphome/components/sim800l/__init__.py b/esphome/components/sim800l/__init__.py
index 564b685b37..698e3cda9e 100644
--- a/esphome/components/sim800l/__init__.py
+++ b/esphome/components/sim800l/__init__.py
@@ -18,15 +18,42 @@ Sim800LReceivedMessageTrigger = sim800l_ns.class_(
     "Sim800LReceivedMessageTrigger",
     automation.Trigger.template(cg.std_string, cg.std_string),
 )
+Sim800LIncomingCallTrigger = sim800l_ns.class_(
+    "Sim800LIncomingCallTrigger",
+    automation.Trigger.template(cg.std_string),
+)
+Sim800LCallConnectedTrigger = sim800l_ns.class_(
+    "Sim800LCallConnectedTrigger",
+    automation.Trigger.template(),
+)
+Sim800LCallDisconnectedTrigger = sim800l_ns.class_(
+    "Sim800LCallDisconnectedTrigger",
+    automation.Trigger.template(),
+)
+
+Sim800LReceivedUssdTrigger = sim800l_ns.class_(
+    "Sim800LReceivedUssdTrigger",
+    automation.Trigger.template(cg.std_string),
+)
 
 # Actions
 Sim800LSendSmsAction = sim800l_ns.class_("Sim800LSendSmsAction", automation.Action)
+Sim800LSendUssdAction = sim800l_ns.class_("Sim800LSendUssdAction", automation.Action)
 Sim800LDialAction = sim800l_ns.class_("Sim800LDialAction", automation.Action)
+Sim800LConnectAction = sim800l_ns.class_("Sim800LConnectAction", automation.Action)
+Sim800LDisconnectAction = sim800l_ns.class_(
+    "Sim800LDisconnectAction", automation.Action
+)
 
 CONF_SIM800L_ID = "sim800l_id"
 CONF_ON_SMS_RECEIVED = "on_sms_received"
+CONF_ON_USSD_RECEIVED = "on_ussd_received"
+CONF_ON_INCOMING_CALL = "on_incoming_call"
+CONF_ON_CALL_CONNECTED = "on_call_connected"
+CONF_ON_CALL_DISCONNECTED = "on_call_disconnected"
 CONF_RECIPIENT = "recipient"
 CONF_MESSAGE = "message"
+CONF_USSD = "ussd"
 
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
@@ -39,6 +66,34 @@ CONFIG_SCHEMA = cv.All(
                     ),
                 }
             ),
+            cv.Optional(CONF_ON_INCOMING_CALL): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                        Sim800LIncomingCallTrigger
+                    ),
+                }
+            ),
+            cv.Optional(CONF_ON_CALL_CONNECTED): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                        Sim800LCallConnectedTrigger
+                    ),
+                }
+            ),
+            cv.Optional(CONF_ON_CALL_DISCONNECTED): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                        Sim800LCallDisconnectedTrigger
+                    ),
+                }
+            ),
+            cv.Optional(CONF_ON_USSD_RECEIVED): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                        Sim800LReceivedUssdTrigger
+                    ),
+                }
+            ),
         }
     )
     .extend(cv.polling_component_schema("5s"))
@@ -59,6 +114,19 @@ async def to_code(config):
         await automation.build_automation(
             trigger, [(cg.std_string, "message"), (cg.std_string, "sender")], conf
         )
+    for conf in config.get(CONF_ON_INCOMING_CALL, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [(cg.std_string, "caller_id")], conf)
+    for conf in config.get(CONF_ON_CALL_CONNECTED, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+    for conf in config.get(CONF_ON_CALL_DISCONNECTED, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+
+    for conf in config.get(CONF_ON_USSD_RECEIVED, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [(cg.std_string, "ussd")], conf)
 
 
 SIM800L_SEND_SMS_SCHEMA = cv.Schema(
@@ -98,3 +166,44 @@ async def sim800l_dial_to_code(config, action_id, template_arg, args):
     template_ = await cg.templatable(config[CONF_RECIPIENT], args, cg.std_string)
     cg.add(var.set_recipient(template_))
     return var
+
+
+@automation.register_action(
+    "sim800l.connect",
+    Sim800LConnectAction,
+    cv.Schema({cv.GenerateID(): cv.use_id(Sim800LComponent)}),
+)
+async def sim800l_connect_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)
+    return var
+
+
+SIM800L_SEND_USSD_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.use_id(Sim800LComponent),
+        cv.Required(CONF_USSD): cv.templatable(cv.string_strict),
+    }
+)
+
+
+@automation.register_action(
+    "sim800l.send_ussd", Sim800LSendUssdAction, SIM800L_SEND_USSD_SCHEMA
+)
+async def sim800l_send_ussd_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_USSD], args, cg.std_string)
+    cg.add(var.set_ussd(template_))
+    return var
+
+
+@automation.register_action(
+    "sim800l.disconnect",
+    Sim800LDisconnectAction,
+    cv.Schema({cv.GenerateID(): cv.use_id(Sim800LComponent)}),
+)
+async def sim800l_disconnect_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)
+    return var
diff --git a/esphome/components/sim800l/sim800l.cpp b/esphome/components/sim800l/sim800l.cpp
index a935978747..3ae5de491a 100644
--- a/esphome/components/sim800l/sim800l.cpp
+++ b/esphome/components/sim800l/sim800l.cpp
@@ -16,20 +16,38 @@ void Sim800LComponent::update() {
     this->write(26);
   }
 
+  if (this->expect_ack_)
+    return;
+
   if (state_ == STATE_INIT) {
     if (this->registered_ && this->send_pending_) {
       this->send_cmd_("AT+CSCS=\"GSM\"");
-      this->state_ = STATE_SENDINGSMS1;
+      this->state_ = STATE_SENDING_SMS_1;
     } else if (this->registered_ && this->dial_pending_) {
       this->send_cmd_("AT+CSCS=\"GSM\"");
       this->state_ = STATE_DIALING1;
+    } else if (this->registered_ && this->connect_pending_) {
+      this->connect_pending_ = false;
+      ESP_LOGI(TAG, "Connecting...");
+      this->send_cmd_("ATA");
+      this->state_ = STATE_ATA_SENT;
+    } else if (this->registered_ && this->send_ussd_pending_) {
+      this->send_cmd_("AT+CSCS=\"GSM\"");
+      this->state_ = STATE_SEND_USSD1;
+    } else if (this->registered_ && this->disconnect_pending_) {
+      this->disconnect_pending_ = false;
+      ESP_LOGI(TAG, "Disconnecting...");
+      this->send_cmd_("ATH");
+    } else if (this->registered_ && this->call_state_ != 6) {
+      send_cmd_("AT+CLCC");
+      this->state_ = STATE_CHECK_CALL;
+      return;
     } else {
       this->send_cmd_("AT");
-      this->state_ = STATE_CHECK_AT;
+      this->state_ = STATE_SETUP_CMGF;
     }
     this->expect_ack_ = true;
-  }
-  if (state_ == STATE_RECEIVEDSMS) {
+  } else if (state_ == STATE_RECEIVED_SMS) {
     // Serial Buffer should have flushed.
     // Send cmd to delete received sms
     char delete_cmd[20];
@@ -49,16 +67,29 @@ void Sim800LComponent::send_cmd_(const std::string &message) {
 }
 
 void Sim800LComponent::parse_cmd_(std::string message) {
-  ESP_LOGV(TAG, "R: %s - %d", message.c_str(), this->state_);
-
   if (message.empty())
     return;
 
+  ESP_LOGV(TAG, "R: %s - %d", message.c_str(), this->state_);
+
+  if (this->state_ != STATE_RECEIVE_SMS) {
+    if (message == "RING") {
+      // Incoming call...
+      this->state_ = STATE_PARSE_CLIP;
+      this->expect_ack_ = false;
+    } else if (message == "NO CARRIER") {
+      if (this->call_state_ != 6) {
+        this->call_state_ = 6;
+        this->call_disconnected_callback_.call();
+      }
+    }
+  }
+
+  bool ok = message == "OK";
   if (this->expect_ack_) {
-    bool ok = message == "OK";
     this->expect_ack_ = false;
     if (!ok) {
-      if (this->state_ == STATE_CHECK_AT && message == "AT") {
+      if (this->state_ == STATE_SETUP_CMGF && message == "AT") {
         // Expected ack but AT echo received
         this->state_ = STATE_DISABLE_ECHO;
         this->expect_ack_ = true;
@@ -68,6 +99,10 @@ void Sim800LComponent::parse_cmd_(std::string message) {
         return;
       }
     }
+  } else if (ok && (this->state_ != STATE_PARSE_SMS_RESPONSE && this->state_ != STATE_CHECK_CALL &&
+                    this->state_ != STATE_RECEIVE_SMS && this->state_ != STATE_DIALING2)) {
+    ESP_LOGW(TAG, "Received unexpected OK. Ignoring");
+    return;
   }
 
   switch (this->state_) {
@@ -75,30 +110,88 @@ void Sim800LComponent::parse_cmd_(std::string message) {
       // While we were waiting for update to check for messages, this notifies a message
       // is available.
       bool message_available = message.compare(0, 6, "+CMTI:") == 0;
-      if (!message_available)
+      if (!message_available) {
+        if (message == "RING") {
+          // Incoming call...
+          this->state_ = STATE_PARSE_CLIP;
+        } else if (message == "NO CARRIER") {
+          if (this->call_state_ != 6) {
+            this->call_state_ = 6;
+            this->call_disconnected_callback_.call();
+          }
+        } else if (message.compare(0, 6, "+CUSD:") == 0) {
+          // Incoming USSD MESSAGE
+          this->state_ = STATE_CHECK_USSD;
+        }
         break;
+      }
+
       // Else fall thru ...
     }
     case STATE_CHECK_SMS:
       send_cmd_("AT+CMGL=\"ALL\"");
-      this->state_ = STATE_PARSE_SMS;
+      this->state_ = STATE_PARSE_SMS_RESPONSE;
       this->parse_index_ = 0;
       break;
     case STATE_DISABLE_ECHO:
       send_cmd_("ATE0");
-      this->state_ = STATE_CHECK_AT;
+      this->state_ = STATE_SETUP_CMGF;
       this->expect_ack_ = true;
       break;
-    case STATE_CHECK_AT:
+    case STATE_SETUP_CMGF:
       send_cmd_("AT+CMGF=1");
+      this->state_ = STATE_SETUP_CLIP;
+      this->expect_ack_ = true;
+      break;
+    case STATE_SETUP_CLIP:
+      send_cmd_("AT+CLIP=1");
       this->state_ = STATE_CREG;
       this->expect_ack_ = true;
       break;
+    case STATE_SETUP_USSD:
+      send_cmd_("AT+CUSD=1");
+      this->state_ = STATE_CREG;
+      this->expect_ack_ = true;
+      break;
+    case STATE_SEND_USSD1:
+      this->send_cmd_("AT+CUSD=1, \"" + this->ussd_ + "\"");
+      this->state_ = STATE_SEND_USSD2;
+      break;
+    case STATE_SEND_USSD2:
+      ESP_LOGD(TAG, "SendUssd2: '%s'", message.c_str());
+      if (message == "OK") {
+        // Dialing
+        ESP_LOGD(TAG, "Dialing ussd code: '%s' done.", this->ussd_.c_str());
+        this->state_ = STATE_CHECK_USSD;
+        this->send_ussd_pending_ = false;
+      } else {
+        this->set_registered_(false);
+        this->state_ = STATE_INIT;
+        this->send_cmd_("AT+CMEE=2");
+        this->write(26);
+      }
+      break;
+    case STATE_CHECK_USSD:
+      ESP_LOGD(TAG, "Check ussd code: '%s'", message.c_str());
+      if (message.compare(0, 6, "+CUSD:") == 0) {
+        this->state_ = STATE_RECEIVED_USSD;
+        this->ussd_ = "";
+        size_t start = 10;
+        size_t end = message.find_last_of(',');
+        if (end > start) {
+          this->ussd_ = message.substr(start + 1, end - start - 2);
+          this->ussd_received_callback_.call(this->ussd_);
+        }
+      }
+      // Otherwise we receive another OK, we do nothing just wait polling to continuously check for SMS
+      if (message == "OK")
+        this->state_ = STATE_INIT;
+      break;
     case STATE_CREG:
       send_cmd_("AT+CREG?");
-      this->state_ = STATE_CREGWAIT;
+      this->state_ = STATE_CREG_WAIT;
       break;
-    case STATE_CREGWAIT: {
+    case STATE_CREG_WAIT: {
       // Response: "+CREG: 0,1" -- the one there means registered ok
       //           "+CREG: -,-" means not registered ok
       bool registered = message.compare(0, 6, "+CREG:") == 0 && (message[9] == '1' || message[9] == '5');
@@ -112,10 +205,10 @@ void Sim800LComponent::parse_cmd_(std::string message) {
         if (message[7] == '0') {  // Network registration is disable, enable it
           send_cmd_("AT+CREG=1");
           this->expect_ack_ = true;
-          this->state_ = STATE_CHECK_AT;
+          this->state_ = STATE_SETUP_CMGF;
         } else {
           // Keep waiting registration
-          this->state_ = STATE_CREG;
+          this->state_ = STATE_INIT;
         }
       }
       set_registered_(registered);
@@ -145,9 +238,6 @@ void Sim800LComponent::parse_cmd_(std::string message) {
       this->expect_ack_ = true;
       this->state_ = STATE_CHECK_SMS;
       break;
-    case STATE_PARSE_SMS:
-      this->state_ = STATE_PARSE_SMS_RESPONSE;
-      break;
     case STATE_PARSE_SMS_RESPONSE:
       if (message.compare(0, 6, "+CMGL:") == 0 && this->parse_index_ == 0) {
         size_t start = 7;
@@ -158,10 +248,11 @@ void Sim800LComponent::parse_cmd_(std::string message) {
           if (item == 1) {  // Slot Index
             this->parse_index_ = parse_number<uint8_t>(message.substr(start, end - start)).value_or(0);
           }
-          // item 2 = STATUS, usually "REC UNERAD"
+          // item 2 = STATUS, usually "REC UNREAD"
           if (item == 3) {  // recipient
             // Add 1 and remove 2 from substring to get rid of "quotes"
             this->sender_ = message.substr(start + 1, end - start - 2);
+            this->message_.clear();
             break;
           }
           // item 4 = ""
@@ -174,42 +265,83 @@ void Sim800LComponent::parse_cmd_(std::string message) {
           ESP_LOGD(TAG, "Invalid message %d %s", this->state_, message.c_str());
           return;
         }
-        this->state_ = STATE_RECEIVESMS;
+        this->state_ = STATE_RECEIVE_SMS;
+      }
+      // Otherwise we receive another OK
+      if (ok) {
+        send_cmd_("AT+CLCC");
+        this->state_ = STATE_CHECK_CALL;
       }
-      // Otherwise we receive another OK, we do nothing just wait polling to continuously check for SMS
-      if (message == "OK")
-        this->state_ = STATE_INIT;
       break;
-    case STATE_RECEIVESMS:
+    case STATE_CHECK_CALL:
+      if (message.compare(0, 6, "+CLCC:") == 0 && this->parse_index_ == 0) {
+        this->expect_ack_ = true;
+        size_t start = 7;
+        size_t end = message.find(',', start);
+        uint8_t item = 0;
+        while (end != start) {
+          item++;
+          // item 1 call index for +CHLD
+          // item 2 dir 0 Mobile originated; 1 Mobile terminated
+          if (item == 3) {  // stat
+            uint8_t current_call_state = parse_number<uint8_t>(message.substr(start, end - start)).value_or(6);
+            if (current_call_state != this->call_state_) {
+              ESP_LOGD(TAG, "Call state is now: %d", current_call_state);
+              if (current_call_state == 0)
+                this->call_connected_callback_.call();
+            }
+            this->call_state_ = current_call_state;
+            break;
+          }
+          // item 4 = ""
+          // item 5 = Received timestamp
+          start = end + 1;
+          end = message.find(',', start);
+        }
+
+        if (item < 2) {
+          ESP_LOGD(TAG, "Invalid message %d %s", this->state_, message.c_str());
+          return;
+        }
+      } else if (ok) {
+        if (this->call_state_ != 6) {
+          // no call in progress
+          this->call_state_ = 6;  // Disconnect
+          this->call_disconnected_callback_.call();
+        }
+      }
+      this->state_ = STATE_INIT;
+      break;
+    case STATE_RECEIVE_SMS:
       /* Our recipient is set and the message body is in message
         kick ESPHome callback now
       */
-      ESP_LOGD(TAG, "Received SMS from: %s", this->sender_.c_str());
-      ESP_LOGD(TAG, "%s", message.c_str());
-      this->callback_.call(message, this->sender_);
-      /* If the message is multiline, next lines will contain message data.
-         If there were other messages in the list, next line will be +CMGL: ...
-         At the end of the list the new line and the OK should be received.
-         To keep this simple just first line of message if considered, then
-         the next state will swallow all received data and in next poll event
-         this message index is marked for deletion.
-      */
-      this->state_ = STATE_RECEIVEDSMS;
+      if (ok || message.compare(0, 6, "+CMGL:") == 0) {
+        ESP_LOGD(TAG, "Received SMS from: %s", this->sender_.c_str());
+        ESP_LOGD(TAG, "%s", this->message_.c_str());
+        this->sms_received_callback_.call(this->message_, this->sender_);
+        this->state_ = STATE_RECEIVED_SMS;
+      } else {
+        if (this->message_.length() > 0)
+          this->message_ += "\n";
+        this->message_ += message;
+      }
       break;
-    case STATE_RECEIVEDSMS:
+    case STATE_RECEIVED_SMS:
+    case STATE_RECEIVED_USSD:
       // Let the buffer flush. Next poll will request to delete the parsed index message.
       break;
-    case STATE_SENDINGSMS1:
+    case STATE_SENDING_SMS_1:
       this->send_cmd_("AT+CMGS=\"" + this->recipient_ + "\"");
-      this->state_ = STATE_SENDINGSMS2;
+      this->state_ = STATE_SENDING_SMS_2;
       break;
-    case STATE_SENDINGSMS2:
+    case STATE_SENDING_SMS_2:
       if (message == ">") {
         // Send sms body
-        ESP_LOGD(TAG, "Sending message: '%s'", this->outgoing_message_.c_str());
+        ESP_LOGI(TAG, "Sending to %s message: '%s'", this->recipient_.c_str(), this->outgoing_message_.c_str());
         this->write_str(this->outgoing_message_.c_str());
         this->write(26);
-        this->state_ = STATE_SENDINGSMS3;
+        this->state_ = STATE_SENDING_SMS_3;
       } else {
         set_registered_(false);
         this->state_ = STATE_INIT;
@@ -217,7 +349,7 @@ void Sim800LComponent::parse_cmd_(std::string message) {
         this->write(26);
       }
       break;
-    case STATE_SENDINGSMS3:
+    case STATE_SENDING_SMS_3:
       if (message.compare(0, 6, "+CMGS:") == 0) {
         ESP_LOGD(TAG, "SMS Sent OK: %s", message.c_str());
         this->send_pending_ = false;
@@ -230,23 +362,55 @@ void Sim800LComponent::parse_cmd_(std::string message) {
       this->state_ = STATE_DIALING2;
       break;
     case STATE_DIALING2:
-      if (message == "OK") {
-        // Dialing
-        ESP_LOGD(TAG, "Dialing: '%s'", this->recipient_.c_str());
-        this->state_ = STATE_INIT;
+      if (ok) {
+        ESP_LOGI(TAG, "Dialing: '%s'", this->recipient_.c_str());
         this->dial_pending_ = false;
       } else {
         this->set_registered_(false);
-        this->state_ = STATE_INIT;
         this->send_cmd_("AT+CMEE=2");
         this->write(26);
       }
+      this->state_ = STATE_INIT;
+      break;
+    case STATE_PARSE_CLIP:
+      if (message.compare(0, 6, "+CLIP:") == 0) {
+        std::string caller_id;
+        size_t start = 7;
+        size_t end = message.find(',', start);
+        uint8_t item = 0;
+        while (end != start) {
+          item++;
+          if (item == 1) {  // Slot Index
+            // Add 1 and remove 2 from substring to get rid of "quotes"
+            caller_id = message.substr(start + 1, end - start - 2);
+            break;
+          }
+          // item 4 = ""
+          // item 5 = Received timestamp
+          start = end + 1;
+          end = message.find(',', start);
+        }
+        if (this->call_state_ != 4) {
+          this->call_state_ = 4;
+          ESP_LOGI(TAG, "Incoming call from %s", caller_id.c_str());
+          incoming_call_callback_.call(caller_id);
+        }
+        this->state_ = STATE_INIT;
+      }
+      break;
+    case STATE_ATA_SENT:
+      ESP_LOGI(TAG, "Call connected");
+      if (this->call_state_ != 0) {
+        this->call_state_ = 0;
+        this->call_connected_callback_.call();
+      }
+      this->state_ = STATE_INIT;
       break;
     default:
-      ESP_LOGD(TAG, "Unhandled: %s - %d", message.c_str(), this->state_);
+      ESP_LOGW(TAG, "Unhandled: %s - %d", message.c_str(), this->state_);
       break;
   }
-}
+}  // namespace sim800l
 
 void Sim800LComponent::loop() {
   // Read message
@@ -265,7 +429,7 @@ void Sim800LComponent::loop() {
       byte = '?';  // need to be valid utf8 string for log functions.
     this->read_buffer_[this->read_pos_] = byte;
 
-    if (this->state_ == STATE_SENDINGSMS2 && this->read_pos_ == 0 && byte == '>')
+    if (this->state_ == STATE_SENDING_SMS_2 && this->read_pos_ == 0 && byte == '>')
       this->read_buffer_[++this->read_pos_] = ASCII_LF;
 
     if (this->read_buffer_[this->read_pos_] == ASCII_LF) {
@@ -276,13 +440,23 @@ void Sim800LComponent::loop() {
       this->read_pos_++;
     }
   }
+  if (state_ == STATE_INIT && this->registered_ &&
+      (this->call_state_ != 6  // A call is in progress
+       || this->send_pending_ || this->dial_pending_ || this->connect_pending_ || this->disconnect_pending_)) {
+    this->update();
+  }
 }
 
 void Sim800LComponent::send_sms(const std::string &recipient, const std::string &message) {
-  ESP_LOGD(TAG, "Sending to %s: %s", recipient.c_str(), message.c_str());
   this->recipient_ = recipient;
   this->outgoing_message_ = message;
   this->send_pending_ = true;
+}
+
+void Sim800LComponent::send_ussd(const std::string &ussd_code) {
+  ESP_LOGD(TAG, "Sending USSD code: %s", ussd_code.c_str());
+  this->ussd_ = ussd_code;
+  this->send_ussd_pending_ = true;
   this->update();
 }
 void Sim800LComponent::dump_config() {
@@ -295,11 +469,11 @@ void Sim800LComponent::dump_config() {
 #endif
 }
 void Sim800LComponent::dial(const std::string &recipient) {
-  ESP_LOGD(TAG, "Dialing %s", recipient.c_str());
   this->recipient_ = recipient;
   this->dial_pending_ = true;
-  this->update();
 }
+void Sim800LComponent::connect() { this->connect_pending_ = true; }
+void Sim800LComponent::disconnect() { this->disconnect_pending_ = true; }
 
 void Sim800LComponent::set_registered_(bool registered) {
   this->registered_ = registered;
diff --git a/esphome/components/sim800l/sim800l.h b/esphome/components/sim800l/sim800l.h
index 3535b96283..bf7efd6915 100644
--- a/esphome/components/sim800l/sim800l.h
+++ b/esphome/components/sim800l/sim800l.h
@@ -16,31 +16,35 @@
 namespace esphome {
 namespace sim800l {
 
-const uint8_t SIM800L_READ_BUFFER_LENGTH = 255;
+const uint16_t SIM800L_READ_BUFFER_LENGTH = 1024;
 
 enum State {
   STATE_IDLE = 0,
   STATE_INIT,
-  STATE_CHECK_AT,
+  STATE_SETUP_CMGF,
+  STATE_SETUP_CLIP,
   STATE_CREG,
-  STATE_CREGWAIT,
+  STATE_CREG_WAIT,
   STATE_CSQ,
   STATE_CSQ_RESPONSE,
-  STATE_IDLEWAIT,
-  STATE_SENDINGSMS1,
-  STATE_SENDINGSMS2,
-  STATE_SENDINGSMS3,
+  STATE_SENDING_SMS_1,
+  STATE_SENDING_SMS_2,
+  STATE_SENDING_SMS_3,
   STATE_CHECK_SMS,
-  STATE_PARSE_SMS,
   STATE_PARSE_SMS_RESPONSE,
-  STATE_RECEIVESMS,
-  STATE_READSMS,
-  STATE_RECEIVEDSMS,
-  STATE_DELETEDSMS,
+  STATE_RECEIVE_SMS,
+  STATE_RECEIVED_SMS,
   STATE_DISABLE_ECHO,
-  STATE_PARSE_SMS_OK,
   STATE_DIALING1,
-  STATE_DIALING2
+  STATE_DIALING2,
+  STATE_PARSE_CLIP,
+  STATE_ATA_SENT,
+  STATE_CHECK_CALL,
+  STATE_SETUP_USSD,
+  STATE_SEND_USSD1,
+  STATE_SEND_USSD2,
+  STATE_CHECK_USSD,
+  STATE_RECEIVED_USSD
 };
 
 class Sim800LComponent : public uart::UARTDevice, public PollingComponent {
@@ -58,10 +62,25 @@ class Sim800LComponent : public uart::UARTDevice, public PollingComponent {
   void set_rssi_sensor(sensor::Sensor *rssi_sensor) { rssi_sensor_ = rssi_sensor; }
 #endif
   void add_on_sms_received_callback(std::function<void(std::string, std::string)> callback) {
-    this->callback_.add(std::move(callback));
+    this->sms_received_callback_.add(std::move(callback));
+  }
+  void add_on_incoming_call_callback(std::function<void(std::string)> callback) {
+    this->incoming_call_callback_.add(std::move(callback));
+  }
+  void add_on_call_connected_callback(std::function<void()> callback) {
+    this->call_connected_callback_.add(std::move(callback));
+  }
+  void add_on_call_disconnected_callback(std::function<void()> callback) {
+    this->call_disconnected_callback_.add(std::move(callback));
+  }
+  void add_on_ussd_received_callback(std::function<void(std::string)> callback) {
+    this->ussd_received_callback_.add(std::move(callback));
   }
   void send_sms(const std::string &recipient, const std::string &message);
+  void send_ussd(const std::string &ussd_code);
   void dial(const std::string &recipient);
+  void connect();
+  void disconnect();
 
  protected:
   void send_cmd_(const std::string &message);
@@ -76,6 +95,7 @@ class Sim800LComponent : public uart::UARTDevice, public PollingComponent {
   sensor::Sensor *rssi_sensor_{nullptr};
 #endif
   std::string sender_;
+  std::string message_;
   char read_buffer_[SIM800L_READ_BUFFER_LENGTH];
   size_t read_pos_{0};
   uint8_t parse_index_{0};
@@ -86,10 +106,19 @@ class Sim800LComponent : public uart::UARTDevice, public PollingComponent {
 
   std::string recipient_;
   std::string outgoing_message_;
+  std::string ussd_;
   bool send_pending_;
   bool dial_pending_;
+  bool connect_pending_;
+  bool disconnect_pending_;
+  bool send_ussd_pending_;
+  uint8_t call_state_{6};
 
-  CallbackManager<void(std::string, std::string)> callback_;
+  CallbackManager<void(std::string, std::string)> sms_received_callback_;
+  CallbackManager<void(std::string)> incoming_call_callback_;
+  CallbackManager<void()> call_connected_callback_;
+  CallbackManager<void()> call_disconnected_callback_;
+  CallbackManager<void(std::string)> ussd_received_callback_;
 };
 
 class Sim800LReceivedMessageTrigger : public Trigger<std::string, std::string> {
@@ -100,6 +129,33 @@ class Sim800LReceivedMessageTrigger : public Trigger<std::string, std::string> {
   }
 };
 
+class Sim800LIncomingCallTrigger : public Trigger<std::string> {
+ public:
+  explicit Sim800LIncomingCallTrigger(Sim800LComponent *parent) {
+    parent->add_on_incoming_call_callback([this](const std::string &caller_id) { this->trigger(caller_id); });
+  }
+};
+
+class Sim800LCallConnectedTrigger : public Trigger<> {
+ public:
+  explicit Sim800LCallConnectedTrigger(Sim800LComponent *parent) {
+    parent->add_on_call_connected_callback([this]() { this->trigger(); });
+  }
+};
+
+class Sim800LCallDisconnectedTrigger : public Trigger<> {
+ public:
+  explicit Sim800LCallDisconnectedTrigger(Sim800LComponent *parent) {
+    parent->add_on_call_disconnected_callback([this]() { this->trigger(); });
+  }
+};
+class Sim800LReceivedUssdTrigger : public Trigger<std::string> {
+ public:
+  explicit Sim800LReceivedUssdTrigger(Sim800LComponent *parent) {
+    parent->add_on_ussd_received_callback([this](const std::string &ussd) { this->trigger(ussd); });
+  }
+};
+
 template<typename... Ts> class Sim800LSendSmsAction : public Action<Ts...> {
  public:
   Sim800LSendSmsAction(Sim800LComponent *parent) : parent_(parent) {}
@@ -116,6 +172,20 @@ template<typename... Ts> class Sim800LSendSmsAction : public Action<Ts...> {
   Sim800LComponent *parent_;
 };
 
+template<typename... Ts> class Sim800LSendUssdAction : public Action<Ts...> {
+ public:
+  Sim800LSendUssdAction(Sim800LComponent *parent) : parent_(parent) {}
+  TEMPLATABLE_VALUE(std::string, ussd)
+
+  void play(Ts... x) {
+    auto ussd_code = this->ussd_.value(x...);
+    this->parent_->send_ussd(ussd_code);
+  }
+
+ protected:
+  Sim800LComponent *parent_;
+};
+
 template<typename... Ts> class Sim800LDialAction : public Action<Ts...> {
  public:
   Sim800LDialAction(Sim800LComponent *parent) : parent_(parent) {}
@@ -129,6 +199,25 @@ template<typename... Ts> class Sim800LDialAction : public Action<Ts...> {
  protected:
   Sim800LComponent *parent_;
 };
+template<typename... Ts> class Sim800LConnectAction : public Action<Ts...> {
+ public:
+  Sim800LConnectAction(Sim800LComponent *parent) : parent_(parent) {}
+
+  void play(Ts... x) { this->parent_->connect(); }
+
+ protected:
+  Sim800LComponent *parent_;
+};
+
+template<typename... Ts> class Sim800LDisconnectAction : public Action<Ts...> {
+ public:
+  Sim800LDisconnectAction(Sim800LComponent *parent) : parent_(parent) {}
+
+  void play(Ts... x) { this->parent_->disconnect(); }
+
+ protected:
+  Sim800LComponent *parent_;
+};
 
 }  // namespace sim800l
 }  // namespace esphome

From 6b23b7cad7cecdd892dd36f8e9a5fce0e9d3cb29 Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Thu, 15 Sep 2022 01:53:02 +0200
Subject: [PATCH 072/838] Unify 'nullptr' initalization of class members;
 (#3805)

---
 esphome/components/ade7953/ade7953.h                        | 2 +-
 esphome/components/api/api_frame_helper.h                   | 6 +++---
 esphome/components/hydreon_rgxx/hydreon_rgxx.h              | 6 +++---
 esphome/components/mlx90393/sensor_mlx90393.h               | 2 +-
 esphome/components/pid/pid_climate.h                        | 4 ++--
 esphome/components/pulse_meter/pulse_meter_sensor.h         | 4 ++--
 .../components/pvvx_mithermometer/display/pvvx_display.h    | 2 +-
 esphome/core/automation.h                                   | 2 +-
 esphome/core/component.h                                    | 2 +-
 esphome/core/gpio.h                                         | 2 +-
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/esphome/components/ade7953/ade7953.h b/esphome/components/ade7953/ade7953.h
index bb160cd8eb..418ad1c9e7 100644
--- a/esphome/components/ade7953/ade7953.h
+++ b/esphome/components/ade7953/ade7953.h
@@ -82,7 +82,7 @@ class ADE7953 : public i2c::I2CDevice, public PollingComponent {
     return i2c::ERROR_OK;
   }
 
-  InternalGPIOPin *irq_pin_ = nullptr;
+  InternalGPIOPin *irq_pin_{nullptr};
   bool is_setup_{false};
   sensor::Sensor *voltage_sensor_{nullptr};
   sensor::Sensor *current_a_sensor_{nullptr};
diff --git a/esphome/components/api/api_frame_helper.h b/esphome/components/api/api_frame_helper.h
index 57e3c961d5..348a9b574f 100644
--- a/esphome/components/api/api_frame_helper.h
+++ b/esphome/components/api/api_frame_helper.h
@@ -116,9 +116,9 @@ class APINoiseFrameHelper : public APIFrameHelper {
   std::vector<uint8_t> prologue_;
 
   std::shared_ptr<APINoiseContext> ctx_;
-  NoiseHandshakeState *handshake_ = nullptr;
-  NoiseCipherState *send_cipher_ = nullptr;
-  NoiseCipherState *recv_cipher_ = nullptr;
+  NoiseHandshakeState *handshake_{nullptr};
+  NoiseCipherState *send_cipher_{nullptr};
+  NoiseCipherState *recv_cipher_{nullptr};
   NoiseProtocolId nid_;
 
   enum class State {
diff --git a/esphome/components/hydreon_rgxx/hydreon_rgxx.h b/esphome/components/hydreon_rgxx/hydreon_rgxx.h
index 1697060d28..34b9bd8d5e 100644
--- a/esphome/components/hydreon_rgxx/hydreon_rgxx.h
+++ b/esphome/components/hydreon_rgxx/hydreon_rgxx.h
@@ -58,9 +58,9 @@ class HydreonRGxxComponent : public PollingComponent, public uart::UARTDevice {
 
   sensor::Sensor *sensors_[NUM_SENSORS] = {nullptr};
 #ifdef USE_BINARY_SENSOR
-  binary_sensor::BinarySensor *too_cold_sensor_ = nullptr;
-  binary_sensor::BinarySensor *lens_bad_sensor_ = nullptr;
-  binary_sensor::BinarySensor *em_sat_sensor_ = nullptr;
+  binary_sensor::BinarySensor *too_cold_sensor_{nullptr};
+  binary_sensor::BinarySensor *lens_bad_sensor_{nullptr};
+  binary_sensor::BinarySensor *em_sat_sensor_{nullptr};
 #endif
 
   int16_t boot_count_ = 0;
diff --git a/esphome/components/mlx90393/sensor_mlx90393.h b/esphome/components/mlx90393/sensor_mlx90393.h
index fc33ad1aa8..8dfb7e6a13 100644
--- a/esphome/components/mlx90393/sensor_mlx90393.h
+++ b/esphome/components/mlx90393/sensor_mlx90393.h
@@ -52,7 +52,7 @@ class MLX90393Cls : public PollingComponent, public i2c::I2CDevice, public MLX90
   uint8_t temperature_oversampling_ = 0;
   uint8_t filter_;
   uint8_t resolutions_[3] = {0};
-  GPIOPin *drdy_pin_ = nullptr;
+  GPIOPin *drdy_pin_{nullptr};
 };
 
 }  // namespace mlx90393
diff --git a/esphome/components/pid/pid_climate.h b/esphome/components/pid/pid_climate.h
index ff301386b6..095c00eb49 100644
--- a/esphome/components/pid/pid_climate.h
+++ b/esphome/components/pid/pid_climate.h
@@ -59,8 +59,8 @@ class PIDClimate : public climate::Climate, public Component {
 
   /// The sensor used for getting the current temperature
   sensor::Sensor *sensor_;
-  output::FloatOutput *cool_output_ = nullptr;
-  output::FloatOutput *heat_output_ = nullptr;
+  output::FloatOutput *cool_output_{nullptr};
+  output::FloatOutput *heat_output_{nullptr};
   PIDController controller_;
   /// Output value as reported by the PID controller, for PIDClimateSensor
   float output_value_;
diff --git a/esphome/components/pulse_meter/pulse_meter_sensor.h b/esphome/components/pulse_meter/pulse_meter_sensor.h
index cf08f8c92d..bf50eab6ff 100644
--- a/esphome/components/pulse_meter/pulse_meter_sensor.h
+++ b/esphome/components/pulse_meter/pulse_meter_sensor.h
@@ -31,11 +31,11 @@ class PulseMeterSensor : public sensor::Sensor, public Component {
  protected:
   static void gpio_intr(PulseMeterSensor *sensor);
 
-  InternalGPIOPin *pin_ = nullptr;
+  InternalGPIOPin *pin_{nullptr};
   ISRInternalGPIOPin isr_pin_;
   uint32_t filter_us_ = 0;
   uint32_t timeout_us_ = 1000000UL * 60UL * 5UL;
-  sensor::Sensor *total_sensor_ = nullptr;
+  sensor::Sensor *total_sensor_{nullptr};
   InternalFilterMode filter_mode_{FILTER_EDGE};
 
   Deduplicator<uint32_t> pulse_width_dedupe_;
diff --git a/esphome/components/pvvx_mithermometer/display/pvvx_display.h b/esphome/components/pvvx_mithermometer/display/pvvx_display.h
index 4de1ab7ba6..c7e7cc04fb 100644
--- a/esphome/components/pvvx_mithermometer/display/pvvx_display.h
+++ b/esphome/components/pvvx_mithermometer/display/pvvx_display.h
@@ -114,7 +114,7 @@ class PVVXDisplay : public ble_client::BLEClientNode, public PollingComponent {
   void delayed_disconnect_();
 #ifdef USE_TIME
   void sync_time_();
-  time::RealTimeClock *time_ = nullptr;
+  time::RealTimeClock *time_{nullptr};
 #endif
   uint16_t char_handle_ = 0;
   bool connection_established_ = false;
diff --git a/esphome/core/automation.h b/esphome/core/automation.h
index 92bc32247b..84c754e081 100644
--- a/esphome/core/automation.h
+++ b/esphome/core/automation.h
@@ -176,7 +176,7 @@ template<typename... Ts> class Action {
     return this->next_->is_running();
   }
 
-  Action<Ts...> *next_ = nullptr;
+  Action<Ts...> *next_{nullptr};
 
   /// The number of instances of this sequence in the list of actions
   /// that is currently being executed.
diff --git a/esphome/core/component.h b/esphome/core/component.h
index e394736653..cb97a93d21 100644
--- a/esphome/core/component.h
+++ b/esphome/core/component.h
@@ -254,7 +254,7 @@ class Component {
 
   uint32_t component_state_{0x0000};  ///< State of this component.
   float setup_priority_override_{NAN};
-  const char *component_source_ = nullptr;
+  const char *component_source_{nullptr};
 };
 
 /** This class simplifies creating components that periodically check a state.
diff --git a/esphome/core/gpio.h b/esphome/core/gpio.h
index b953a95664..1b6f2ba1e6 100644
--- a/esphome/core/gpio.h
+++ b/esphome/core/gpio.h
@@ -73,7 +73,7 @@ class ISRInternalGPIOPin {
   void pin_mode(gpio::Flags flags);
 
  protected:
-  void *arg_ = nullptr;
+  void *arg_{nullptr};
 };
 
 class InternalGPIOPin : public GPIOPin {

From df4d0da221f8c1296ea3c53d3667d50c44a663df Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 15 Sep 2022 11:53:22 +1200
Subject: [PATCH 073/838] Initialize all child sensors to nullptr (#3808)

---
 esphome/components/aht10/aht10.h               |  4 ++--
 esphome/components/am2320/am2320.h             |  4 ++--
 esphome/components/as3935/as3935.h             |  6 +++---
 esphome/components/bl0939/bl0939.h             | 16 ++++++++--------
 esphome/components/bl0940/bl0940.h             | 12 ++++++------
 esphome/components/bl0942/bl0942.h             | 10 +++++-----
 esphome/components/bme280/bme280.h             |  6 +++---
 esphome/components/bme680/bme680.h             |  8 ++++----
 esphome/components/bme680_bsec/bme680_bsec.h   | 18 +++++++++---------
 esphome/components/bmp280/bmp280.h             |  4 ++--
 esphome/components/bmp3xx/bmp3xx.h             |  4 ++--
 esphome/components/dht12/dht12.h               |  4 ++--
 esphome/components/dps310/dps310.h             |  4 ++--
 esphome/components/ens210/ens210.h             |  4 ++--
 esphome/components/hdc1080/hdc1080.h           |  4 ++--
 esphome/components/hmc5883l/hmc5883l.h         |  8 ++++----
 esphome/components/honeywellabp/honeywellabp.h |  4 ++--
 esphome/components/ms5611/ms5611.h             |  4 ++--
 esphome/components/pzem004t/pzem004t.h         |  8 ++++----
 esphome/components/pzemac/pzemac.h             | 12 ++++++------
 esphome/components/pzemdc/pzemdc.h             | 10 +++++-----
 esphome/components/qmc5883l/qmc5883l.h         |  8 ++++----
 esphome/components/qmp6988/qmp6988.h           |  4 ++--
 esphome/components/sht3xd/sht3xd.h             |  4 ++--
 esphome/components/shtcx/shtcx.h               |  4 ++--
 esphome/components/tsl2591/tsl2591.h           |  8 ++++----
 esphome/components/tx20/tx20.h                 |  4 ++--
 27 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/esphome/components/aht10/aht10.h b/esphome/components/aht10/aht10.h
index bfb6b07a7a..4d0eaa5919 100644
--- a/esphome/components/aht10/aht10.h
+++ b/esphome/components/aht10/aht10.h
@@ -18,8 +18,8 @@ class AHT10Component : public PollingComponent, public i2c::I2CDevice {
   void set_humidity_sensor(sensor::Sensor *humidity_sensor) { humidity_sensor_ = humidity_sensor; }
 
  protected:
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *humidity_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
 };
 
 }  // namespace aht10
diff --git a/esphome/components/am2320/am2320.h b/esphome/components/am2320/am2320.h
index 33e1d30aa0..da1e87cf65 100644
--- a/esphome/components/am2320/am2320.h
+++ b/esphome/components/am2320/am2320.h
@@ -21,8 +21,8 @@ class AM2320Component : public PollingComponent, public i2c::I2CDevice {
   bool read_data_(uint8_t *data);
   bool read_bytes_(uint8_t a_register, uint8_t *data, uint8_t len, uint32_t conversion = 0);
 
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *humidity_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
 };
 
 }  // namespace am2320
diff --git a/esphome/components/as3935/as3935.h b/esphome/components/as3935/as3935.h
index 2e65aab4d1..2cba9b11a0 100644
--- a/esphome/components/as3935/as3935.h
+++ b/esphome/components/as3935/as3935.h
@@ -92,9 +92,9 @@ class AS3935Component : public Component {
 
   virtual void write_register(uint8_t reg, uint8_t mask, uint8_t bits, uint8_t start_position) = 0;
 
-  sensor::Sensor *distance_sensor_;
-  sensor::Sensor *energy_sensor_;
-  binary_sensor::BinarySensor *thunder_alert_binary_sensor_;
+  sensor::Sensor *distance_sensor_{nullptr};
+  sensor::Sensor *energy_sensor_{nullptr};
+  binary_sensor::BinarySensor *thunder_alert_binary_sensor_{nullptr};
   GPIOPin *irq_pin_;
 
   bool indoor_;
diff --git a/esphome/components/bl0939/bl0939.h b/esphome/components/bl0939/bl0939.h
index d3dab67cc1..673d4ff351 100644
--- a/esphome/components/bl0939/bl0939.h
+++ b/esphome/components/bl0939/bl0939.h
@@ -75,16 +75,16 @@ class BL0939 : public PollingComponent, public uart::UARTDevice {
   void dump_config() override;
 
  protected:
-  sensor::Sensor *voltage_sensor_;
-  sensor::Sensor *current_sensor_1_;
-  sensor::Sensor *current_sensor_2_;
+  sensor::Sensor *voltage_sensor_{nullptr};
+  sensor::Sensor *current_sensor_1_{nullptr};
+  sensor::Sensor *current_sensor_2_{nullptr};
   // NB This may be negative as the circuits is seemingly able to measure
   // power in both directions
-  sensor::Sensor *power_sensor_1_;
-  sensor::Sensor *power_sensor_2_;
-  sensor::Sensor *energy_sensor_1_;
-  sensor::Sensor *energy_sensor_2_;
-  sensor::Sensor *energy_sensor_sum_;
+  sensor::Sensor *power_sensor_1_{nullptr};
+  sensor::Sensor *power_sensor_2_{nullptr};
+  sensor::Sensor *energy_sensor_1_{nullptr};
+  sensor::Sensor *energy_sensor_2_{nullptr};
+  sensor::Sensor *energy_sensor_sum_{nullptr};
 
   // Divide by this to turn into Watt
   float power_reference_ = BL0939_PREF;
diff --git a/esphome/components/bl0940/bl0940.h b/esphome/components/bl0940/bl0940.h
index 49c8e50595..2d4e7ccaac 100644
--- a/esphome/components/bl0940/bl0940.h
+++ b/esphome/components/bl0940/bl0940.h
@@ -75,14 +75,14 @@ class BL0940 : public PollingComponent, public uart::UARTDevice {
   void dump_config() override;
 
  protected:
-  sensor::Sensor *voltage_sensor_;
-  sensor::Sensor *current_sensor_;
+  sensor::Sensor *voltage_sensor_{nullptr};
+  sensor::Sensor *current_sensor_{nullptr};
   // NB This may be negative as the circuits is seemingly able to measure
   // power in both directions
-  sensor::Sensor *power_sensor_;
-  sensor::Sensor *energy_sensor_;
-  sensor::Sensor *internal_temperature_sensor_;
-  sensor::Sensor *external_temperature_sensor_;
+  sensor::Sensor *power_sensor_{nullptr};
+  sensor::Sensor *energy_sensor_{nullptr};
+  sensor::Sensor *internal_temperature_sensor_{nullptr};
+  sensor::Sensor *external_temperature_sensor_{nullptr};
 
   // Max difference between two measurements of the temperature. Used to avoid noise.
   float max_temperature_diff_{0};
diff --git a/esphome/components/bl0942/bl0942.h b/esphome/components/bl0942/bl0942.h
index 8149b7493b..12489915e1 100644
--- a/esphome/components/bl0942/bl0942.h
+++ b/esphome/components/bl0942/bl0942.h
@@ -43,13 +43,13 @@ class BL0942 : public PollingComponent, public uart::UARTDevice {
   void dump_config() override;
 
  protected:
-  sensor::Sensor *voltage_sensor_;
-  sensor::Sensor *current_sensor_;
+  sensor::Sensor *voltage_sensor_{nullptr};
+  sensor::Sensor *current_sensor_{nullptr};
   // NB This may be negative as the circuits is seemingly able to measure
   // power in both directions
-  sensor::Sensor *power_sensor_;
-  sensor::Sensor *energy_sensor_;
-  sensor::Sensor *frequency_sensor_;
+  sensor::Sensor *power_sensor_{nullptr};
+  sensor::Sensor *energy_sensor_{nullptr};
+  sensor::Sensor *frequency_sensor_{nullptr};
 
   // Divide by this to turn into Watt
   float power_reference_ = BL0942_PREF;
diff --git a/esphome/components/bme280/bme280.h b/esphome/components/bme280/bme280.h
index 8511f73382..50d398c40f 100644
--- a/esphome/components/bme280/bme280.h
+++ b/esphome/components/bme280/bme280.h
@@ -96,9 +96,9 @@ class BME280Component : public PollingComponent, public i2c::I2CDevice {
   BME280Oversampling pressure_oversampling_{BME280_OVERSAMPLING_16X};
   BME280Oversampling humidity_oversampling_{BME280_OVERSAMPLING_16X};
   BME280IIRFilter iir_filter_{BME280_IIR_FILTER_OFF};
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
-  sensor::Sensor *humidity_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
   enum ErrorCode {
     NONE = 0,
     COMMUNICATION_FAILED,
diff --git a/esphome/components/bme680/bme680.h b/esphome/components/bme680/bme680.h
index 0671cd990e..6446449742 100644
--- a/esphome/components/bme680/bme680.h
+++ b/esphome/components/bme680/bme680.h
@@ -129,10 +129,10 @@ class BME680Component : public PollingComponent, public i2c::I2CDevice {
   uint16_t heater_temperature_{320};
   uint16_t heater_duration_{150};
 
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
-  sensor::Sensor *humidity_sensor_;
-  sensor::Sensor *gas_resistance_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
+  sensor::Sensor *gas_resistance_sensor_{nullptr};
 };
 
 }  // namespace bme680
diff --git a/esphome/components/bme680_bsec/bme680_bsec.h b/esphome/components/bme680_bsec/bme680_bsec.h
index 650b4d2413..6fe8f8fef7 100644
--- a/esphome/components/bme680_bsec/bme680_bsec.h
+++ b/esphome/components/bme680_bsec/bme680_bsec.h
@@ -100,15 +100,15 @@ class BME680BSECComponent : public Component, public i2c::I2CDevice {
   SampleRate pressure_sample_rate_{SAMPLE_RATE_DEFAULT};
   SampleRate humidity_sample_rate_{SAMPLE_RATE_DEFAULT};
 
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
-  sensor::Sensor *humidity_sensor_;
-  sensor::Sensor *gas_resistance_sensor_;
-  sensor::Sensor *iaq_sensor_;
-  text_sensor::TextSensor *iaq_accuracy_text_sensor_;
-  sensor::Sensor *iaq_accuracy_sensor_;
-  sensor::Sensor *co2_equivalent_sensor_;
-  sensor::Sensor *breath_voc_equivalent_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
+  sensor::Sensor *gas_resistance_sensor_{nullptr};
+  sensor::Sensor *iaq_sensor_{nullptr};
+  text_sensor::TextSensor *iaq_accuracy_text_sensor_{nullptr};
+  sensor::Sensor *iaq_accuracy_sensor_{nullptr};
+  sensor::Sensor *co2_equivalent_sensor_{nullptr};
+  sensor::Sensor *breath_voc_equivalent_sensor_{nullptr};
 };
 #endif
 }  // namespace bme680_bsec
diff --git a/esphome/components/bmp280/bmp280.h b/esphome/components/bmp280/bmp280.h
index f8646fb547..96eb470155 100644
--- a/esphome/components/bmp280/bmp280.h
+++ b/esphome/components/bmp280/bmp280.h
@@ -81,8 +81,8 @@ class BMP280Component : public PollingComponent, public i2c::I2CDevice {
   BMP280Oversampling temperature_oversampling_{BMP280_OVERSAMPLING_16X};
   BMP280Oversampling pressure_oversampling_{BMP280_OVERSAMPLING_16X};
   BMP280IIRFilter iir_filter_{BMP280_IIR_FILTER_OFF};
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
   enum ErrorCode {
     NONE = 0,
     COMMUNICATION_FAILED,
diff --git a/esphome/components/bmp3xx/bmp3xx.h b/esphome/components/bmp3xx/bmp3xx.h
index ab20abfe9b..d3b15f601d 100644
--- a/esphome/components/bmp3xx/bmp3xx.h
+++ b/esphome/components/bmp3xx/bmp3xx.h
@@ -125,8 +125,8 @@ class BMP3XXComponent : public PollingComponent, public i2c::I2CDevice {
   Oversampling pressure_oversampling_{OVERSAMPLING_X16};
   IIRFilter iir_filter_{IIR_FILTER_OFF};
   OperationMode operation_mode_{FORCED_MODE};
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
   enum ErrorCode {
     NONE = 0,
     ERROR_COMMUNICATION_FAILED,
diff --git a/esphome/components/dht12/dht12.h b/esphome/components/dht12/dht12.h
index ae4d4fd607..2a706039ba 100644
--- a/esphome/components/dht12/dht12.h
+++ b/esphome/components/dht12/dht12.h
@@ -20,8 +20,8 @@ class DHT12Component : public PollingComponent, public i2c::I2CDevice {
  protected:
   bool read_data_(uint8_t *data);
 
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *humidity_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
 };
 
 }  // namespace dht12
diff --git a/esphome/components/dps310/dps310.h b/esphome/components/dps310/dps310.h
index 7aca2c3d10..50e7d93c8a 100644
--- a/esphome/components/dps310/dps310.h
+++ b/esphome/components/dps310/dps310.h
@@ -53,8 +53,8 @@ class DPS310Component : public PollingComponent, public i2c::I2CDevice {
   void calculate_values_(int32_t raw_temperature, int32_t raw_pressure);
   static int32_t twos_complement(int32_t val, uint8_t bits);
 
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
   int32_t raw_pressure_, raw_temperature_, c00_, c10_;
   int16_t c0_, c1_, c01_, c11_, c20_, c21_, c30_;
   uint8_t prod_rev_id_;
diff --git a/esphome/components/ens210/ens210.h b/esphome/components/ens210/ens210.h
index 342be04799..0fb6ff634d 100644
--- a/esphome/components/ens210/ens210.h
+++ b/esphome/components/ens210/ens210.h
@@ -31,8 +31,8 @@ class ENS210Component : public PollingComponent, public i2c::I2CDevice {
   bool set_low_power_(bool enable);
   void extract_measurement_(uint32_t val, int *data, int *status);
 
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *humidity_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
 };
 
 }  // namespace ens210
diff --git a/esphome/components/hdc1080/hdc1080.h b/esphome/components/hdc1080/hdc1080.h
index 9cb87cdb8b..2ff7b6dc33 100644
--- a/esphome/components/hdc1080/hdc1080.h
+++ b/esphome/components/hdc1080/hdc1080.h
@@ -21,8 +21,8 @@ class HDC1080Component : public PollingComponent, public i2c::I2CDevice {
   float get_setup_priority() const override;
 
  protected:
-  sensor::Sensor *temperature_;
-  sensor::Sensor *humidity_;
+  sensor::Sensor *temperature_{nullptr};
+  sensor::Sensor *humidity_{nullptr};
 };
 
 }  // namespace hdc1080
diff --git a/esphome/components/hmc5883l/hmc5883l.h b/esphome/components/hmc5883l/hmc5883l.h
index 41d41baa22..3481f45dc8 100644
--- a/esphome/components/hmc5883l/hmc5883l.h
+++ b/esphome/components/hmc5883l/hmc5883l.h
@@ -54,10 +54,10 @@ class HMC5883LComponent : public PollingComponent, public i2c::I2CDevice {
   HMC5883LOversampling oversampling_{HMC5883L_OVERSAMPLING_1};
   HMC5883LDatarate datarate_{HMC5883L_DATARATE_15_0_HZ};
   HMC5883LRange range_{HMC5883L_RANGE_130_UT};
-  sensor::Sensor *x_sensor_;
-  sensor::Sensor *y_sensor_;
-  sensor::Sensor *z_sensor_;
-  sensor::Sensor *heading_sensor_;
+  sensor::Sensor *x_sensor_{nullptr};
+  sensor::Sensor *y_sensor_{nullptr};
+  sensor::Sensor *z_sensor_{nullptr};
+  sensor::Sensor *heading_sensor_{nullptr};
   enum ErrorCode {
     NONE = 0,
     COMMUNICATION_FAILED,
diff --git a/esphome/components/honeywellabp/honeywellabp.h b/esphome/components/honeywellabp/honeywellabp.h
index 44d5952ca6..98f6f08c4a 100644
--- a/esphome/components/honeywellabp/honeywellabp.h
+++ b/esphome/components/honeywellabp/honeywellabp.h
@@ -29,8 +29,8 @@ class HONEYWELLABPSensor : public PollingComponent,
   uint8_t status_ = 0;         // byte to hold status information.
   int pressure_count_ = 0;     // hold raw pressure data (14 - bit, 0 - 16384)
   int temperature_count_ = 0;  // hold raw temperature data (11 - bit, 0 - 2048)
-  sensor::Sensor *pressure_sensor_;
-  sensor::Sensor *temperature_sensor_;
+  sensor::Sensor *pressure_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_{nullptr};
   uint8_t readsensor_();
   uint8_t readstatus_();
   int rawpressure_();
diff --git a/esphome/components/ms5611/ms5611.h b/esphome/components/ms5611/ms5611.h
index b5663ad736..476db79612 100644
--- a/esphome/components/ms5611/ms5611.h
+++ b/esphome/components/ms5611/ms5611.h
@@ -22,8 +22,8 @@ class MS5611Component : public PollingComponent, public i2c::I2CDevice {
   void read_pressure_(uint32_t raw_temperature);
   void calculate_values_(uint32_t raw_temperature, uint32_t raw_pressure);
 
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
   uint16_t prom_[6];
 };
 
diff --git a/esphome/components/pzem004t/pzem004t.h b/esphome/components/pzem004t/pzem004t.h
index f4f9f29b4d..e18413f35c 100644
--- a/esphome/components/pzem004t/pzem004t.h
+++ b/esphome/components/pzem004t/pzem004t.h
@@ -23,10 +23,10 @@ class PZEM004T : public PollingComponent, public uart::UARTDevice {
   void dump_config() override;
 
  protected:
-  sensor::Sensor *voltage_sensor_;
-  sensor::Sensor *current_sensor_;
-  sensor::Sensor *power_sensor_;
-  sensor::Sensor *energy_sensor_;
+  sensor::Sensor *voltage_sensor_{nullptr};
+  sensor::Sensor *current_sensor_{nullptr};
+  sensor::Sensor *power_sensor_{nullptr};
+  sensor::Sensor *energy_sensor_{nullptr};
 
   enum PZEM004TReadState {
     SET_ADDRESS = 0xB4,
diff --git a/esphome/components/pzemac/pzemac.h b/esphome/components/pzemac/pzemac.h
index e9f76972a3..8f2cf1460d 100644
--- a/esphome/components/pzemac/pzemac.h
+++ b/esphome/components/pzemac/pzemac.h
@@ -27,12 +27,12 @@ class PZEMAC : public PollingComponent, public modbus::ModbusDevice {
 
  protected:
   template<typename... Ts> friend class ResetEnergyAction;
-  sensor::Sensor *voltage_sensor_;
-  sensor::Sensor *current_sensor_;
-  sensor::Sensor *power_sensor_;
-  sensor::Sensor *energy_sensor_;
-  sensor::Sensor *frequency_sensor_;
-  sensor::Sensor *power_factor_sensor_;
+  sensor::Sensor *voltage_sensor_{nullptr};
+  sensor::Sensor *current_sensor_{nullptr};
+  sensor::Sensor *power_sensor_{nullptr};
+  sensor::Sensor *energy_sensor_{nullptr};
+  sensor::Sensor *frequency_sensor_{nullptr};
+  sensor::Sensor *power_factor_sensor_{nullptr};
 
   void reset_energy_();
 };
diff --git a/esphome/components/pzemdc/pzemdc.h b/esphome/components/pzemdc/pzemdc.h
index d838eb4167..a78a48a6fb 100644
--- a/esphome/components/pzemdc/pzemdc.h
+++ b/esphome/components/pzemdc/pzemdc.h
@@ -22,11 +22,11 @@ class PZEMDC : public PollingComponent, public modbus::ModbusDevice {
   void dump_config() override;
 
  protected:
-  sensor::Sensor *voltage_sensor_;
-  sensor::Sensor *current_sensor_;
-  sensor::Sensor *power_sensor_;
-  sensor::Sensor *frequency_sensor_;
-  sensor::Sensor *power_factor_sensor_;
+  sensor::Sensor *voltage_sensor_{nullptr};
+  sensor::Sensor *current_sensor_{nullptr};
+  sensor::Sensor *power_sensor_{nullptr};
+  sensor::Sensor *frequency_sensor_{nullptr};
+  sensor::Sensor *power_factor_sensor_{nullptr};
 };
 
 }  // namespace pzemdc
diff --git a/esphome/components/qmc5883l/qmc5883l.h b/esphome/components/qmc5883l/qmc5883l.h
index 01697ecbd0..15ef435ce5 100644
--- a/esphome/components/qmc5883l/qmc5883l.h
+++ b/esphome/components/qmc5883l/qmc5883l.h
@@ -45,10 +45,10 @@ class QMC5883LComponent : public PollingComponent, public i2c::I2CDevice {
   QMC5883LDatarate datarate_{QMC5883L_DATARATE_10_HZ};
   QMC5883LRange range_{QMC5883L_RANGE_200_UT};
   QMC5883LOversampling oversampling_{QMC5883L_SAMPLING_512};
-  sensor::Sensor *x_sensor_;
-  sensor::Sensor *y_sensor_;
-  sensor::Sensor *z_sensor_;
-  sensor::Sensor *heading_sensor_;
+  sensor::Sensor *x_sensor_{nullptr};
+  sensor::Sensor *y_sensor_{nullptr};
+  sensor::Sensor *z_sensor_{nullptr};
+  sensor::Sensor *heading_sensor_{nullptr};
   enum ErrorCode {
     NONE = 0,
     COMMUNICATION_FAILED,
diff --git a/esphome/components/qmp6988/qmp6988.h b/esphome/components/qmp6988/qmp6988.h
index ef944ba4ff..f0c11adf43 100644
--- a/esphome/components/qmp6988/qmp6988.h
+++ b/esphome/components/qmp6988/qmp6988.h
@@ -91,8 +91,8 @@ class QMP6988Component : public PollingComponent, public i2c::I2CDevice {
 
  protected:
   qmp6988_data_t qmp6988_data_;
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
 
   QMP6988Oversampling temperature_oversampling_{QMP6988_OVERSAMPLING_16X};
   QMP6988Oversampling pressure_oversampling_{QMP6988_OVERSAMPLING_16X};
diff --git a/esphome/components/sht3xd/sht3xd.h b/esphome/components/sht3xd/sht3xd.h
index 3164aa0687..41ca3c5d6e 100644
--- a/esphome/components/sht3xd/sht3xd.h
+++ b/esphome/components/sht3xd/sht3xd.h
@@ -19,8 +19,8 @@ class SHT3XDComponent : public PollingComponent, public sensirion_common::Sensir
   void update() override;
 
  protected:
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *humidity_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
 };
 
 }  // namespace sht3xd
diff --git a/esphome/components/shtcx/shtcx.h b/esphome/components/shtcx/shtcx.h
index c44fb9d9c1..084d3bfc35 100644
--- a/esphome/components/shtcx/shtcx.h
+++ b/esphome/components/shtcx/shtcx.h
@@ -26,8 +26,8 @@ class SHTCXComponent : public PollingComponent, public sensirion_common::Sensiri
  protected:
   SHTCXType type_;
   uint16_t sensor_id_;
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *humidity_sensor_;
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
 };
 
 }  // namespace shtcx
diff --git a/esphome/components/tsl2591/tsl2591.h b/esphome/components/tsl2591/tsl2591.h
index d82dbc395f..5b7eea35ec 100644
--- a/esphome/components/tsl2591/tsl2591.h
+++ b/esphome/components/tsl2591/tsl2591.h
@@ -245,10 +245,10 @@ class TSL2591Component : public PollingComponent, public i2c::I2CDevice {
 
  protected:
   const char *name_;
-  sensor::Sensor *full_spectrum_sensor_;
-  sensor::Sensor *infrared_sensor_;
-  sensor::Sensor *visible_sensor_;
-  sensor::Sensor *calculated_lux_sensor_;
+  sensor::Sensor *full_spectrum_sensor_{nullptr};
+  sensor::Sensor *infrared_sensor_{nullptr};
+  sensor::Sensor *visible_sensor_{nullptr};
+  sensor::Sensor *calculated_lux_sensor_{nullptr};
   TSL2591IntegrationTime integration_time_;
   TSL2591ComponentGain component_gain_;
   TSL2591Gain gain_;
diff --git a/esphome/components/tx20/tx20.h b/esphome/components/tx20/tx20.h
index 1c617d0674..95a9517227 100644
--- a/esphome/components/tx20/tx20.h
+++ b/esphome/components/tx20/tx20.h
@@ -43,8 +43,8 @@ class Tx20Component : public Component {
 
   std::string wind_cardinal_direction_;
   InternalGPIOPin *pin_;
-  sensor::Sensor *wind_speed_sensor_;
-  sensor::Sensor *wind_direction_degrees_sensor_;
+  sensor::Sensor *wind_speed_sensor_{nullptr};
+  sensor::Sensor *wind_direction_degrees_sensor_{nullptr};
   Tx20ComponentStore store_;
 };
 

From 625a575e49f362578a9ea6acef7d83538fa66b9d Mon Sep 17 00:00:00 2001
From: Azimath <npnickster@gmail.com>
Date: Wed, 14 Sep 2022 19:54:33 -0400
Subject: [PATCH 074/838] Remove floating point calculation from ac_dimmer ISR
 (#3770)

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

diff --git a/esphome/components/ac_dimmer/ac_dimmer.cpp b/esphome/components/ac_dimmer/ac_dimmer.cpp
index 1d0cd8d0ab..16101a1c2c 100644
--- a/esphome/components/ac_dimmer/ac_dimmer.cpp
+++ b/esphome/components/ac_dimmer/ac_dimmer.cpp
@@ -121,11 +121,8 @@ void IRAM_ATTR HOT AcDimmerDataStore::gpio_intr() {
       // calculate time until enable in µs: (1.0-value)*cycle_time, but with integer arithmetic
       // also take into account min_power
       auto min_us = this->cycle_time_us * this->min_power / 1000;
-      // calculate required value to provide a true RMS voltage output
-      this->enable_time_us =
-          std::max((uint32_t) 1, (uint32_t)((65535 - (acos(1 - (2 * this->value / 65535.0)) / 3.14159 * 65535)) *
-                                            (this->cycle_time_us - min_us)) /
-                                     65535);
+      this->enable_time_us = std::max((uint32_t) 1, ((65535 - this->value) * (this->cycle_time_us - min_us)) / 65535);
+
       if (this->method == DIM_METHOD_LEADING_PULSE) {
         // Minimum pulse time should be enough for the triac to trigger when it is close to the ZC zone
         // this is for brightness near 99%
@@ -206,6 +203,7 @@ void AcDimmer::setup() {
 #endif
 }
 void AcDimmer::write_state(float state) {
+  state = std::acos(1 - (2 * state)) / 3.14159;  // RMS power compensation
   auto new_value = static_cast<uint16_t>(roundf(state * 65535));
   if (new_value != 0 && this->store_.value == 0)
     this->store_.init_cycle = this->init_with_half_cycle_;

From 7deabbb51232da5d0ab85744cd6e61431e5c3666 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 15 Sep 2022 13:02:40 +1200
Subject: [PATCH 075/838] Bump version to 2022.9.0b2

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

diff --git a/esphome/const.py b/esphome/const.py
index 608a61466b..5ce1edb8cd 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.9.0b1"
+__version__ = "2022.9.0b2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 7a91ca98090a57c180a01750c388f496a47aee93 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Thu, 15 Sep 2022 12:27:50 -0700
Subject: [PATCH 076/838] split pronto codes if they are too long (#3812)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 esphome/components/remote_base/pronto_protocol.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/esphome/components/remote_base/pronto_protocol.cpp b/esphome/components/remote_base/pronto_protocol.cpp
index d434744e49..d8798d4ab9 100644
--- a/esphome/components/remote_base/pronto_protocol.cpp
+++ b/esphome/components/remote_base/pronto_protocol.cpp
@@ -227,7 +227,18 @@ optional<ProntoData> ProntoProtocol::decode(RemoteReceiveData src) {
   return out;
 }
 
-void ProntoProtocol::dump(const ProntoData &data) { ESP_LOGD(TAG, "Received Pronto: data=%s", data.data.c_str()); }
+void ProntoProtocol::dump(const ProntoData &data) {
+  std::string first, rest;
+  if (data.data.size() < 230) {
+    first = data.data;
+  } else {
+    first = data.data.substr(0, 229);
+    rest = data.data.substr(230);
+  }
+  ESP_LOGD(TAG, "Received Pronto: data=%s", first.c_str());
+  if (!rest.empty())
+    ESP_LOGD(TAG, "%s", rest.c_str());
+}
 
 }  // namespace remote_base
 }  // namespace esphome

From f6e5a8cb2a9840840239006fd7649f56cab02d02 Mon Sep 17 00:00:00 2001
From: pawel3410 <pawel3410@gmail.com>
Date: Fri, 16 Sep 2022 03:19:41 +0200
Subject: [PATCH 077/838] Fix mcp23s17 addressing beyond 3 (#3797)

---
 esphome/components/mcp23s17/mcp23s17.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/esphome/components/mcp23s17/mcp23s17.cpp b/esphome/components/mcp23s17/mcp23s17.cpp
index 2fc9c74634..ca4c28e0b4 100644
--- a/esphome/components/mcp23s17/mcp23s17.cpp
+++ b/esphome/components/mcp23s17/mcp23s17.cpp
@@ -23,6 +23,13 @@ void MCP23S17::setup() {
   this->transfer_byte(0b00011000);  // Enable HAEN pins for addressing
   this->disable();
 
+  this->enable();
+  cmd = 0b01001000;
+  this->transfer_byte(cmd);
+  this->transfer_byte(mcp23x17_base::MCP23X17_IOCONA);
+  this->transfer_byte(0b00011000);  // Enable HAEN pins for addressing
+  this->disable();
+
   // Read current output register state
   this->read_reg(mcp23x17_base::MCP23X17_OLATA, &this->olat_a_);
   this->read_reg(mcp23x17_base::MCP23X17_OLATB, &this->olat_b_);

From 55ad45e3ee2384fa6b2146d0b0646566dd69a202 Mon Sep 17 00:00:00 2001
From: h3ndrik <hendrik+dev@xd0.de>
Date: Sun, 18 Sep 2022 21:25:59 +0200
Subject: [PATCH 078/838] [BME280] raise standby time (#3804)

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

diff --git a/esphome/components/bme280/bme280.cpp b/esphome/components/bme280/bme280.cpp
index 345b24a36e..d8124f5dc3 100644
--- a/esphome/components/bme280/bme280.cpp
+++ b/esphome/components/bme280/bme280.cpp
@@ -163,7 +163,7 @@ void BME280Component::setup() {
     return;
   }
   config_register &= ~0b11111100;
-  config_register |= 0b000 << 5;  // 0.5 ms standby time
+  config_register |= 0b101 << 5;  // 1000 ms standby time
   config_register |= (this->iir_filter_ & 0b111) << 2;
   if (!this->write_byte(BME280_REGISTER_CONFIG, config_register)) {
     this->mark_failed();

From d1c85fc3fa9b9705fbbc366c11f7d2846e36b192 Mon Sep 17 00:00:00 2001
From: Geek_cat <36782632+zhzhzhy@users.noreply.github.com>
Date: Tue, 20 Sep 2022 09:01:00 +0800
Subject: [PATCH 079/838] Allow CORS for web_server (#3819)

---
 esphome/components/web_server_base/web_server_base.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/web_server_base/web_server_base.h b/esphome/components/web_server_base/web_server_base.h
index bc37337ca5..cdabe66d44 100644
--- a/esphome/components/web_server_base/web_server_base.h
+++ b/esphome/components/web_server_base/web_server_base.h
@@ -81,6 +81,7 @@ class WebServerBase : public Component {
       return;
     }
     this->server_ = std::make_shared<AsyncWebServer>(this->port_);
+    DefaultHeaders::Instance().addHeader("Access-Control-Allow-Origin", "*");
     this->server_->begin();
 
     for (auto *handler : this->handlers_)

From ab8674a5c7993f6d10abbf9792adaba3c591154e Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Mon, 19 Sep 2022 20:02:55 -0500
Subject: [PATCH 080/838] Make sprinkler reset_resume() method public (#3824)

---
 esphome/components/sprinkler/sprinkler.cpp | 12 ++++++------
 esphome/components/sprinkler/sprinkler.h   |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/esphome/components/sprinkler/sprinkler.cpp b/esphome/components/sprinkler/sprinkler.cpp
index ab694c8412..2be71a08d0 100644
--- a/esphome/components/sprinkler/sprinkler.cpp
+++ b/esphome/components/sprinkler/sprinkler.cpp
@@ -769,7 +769,7 @@ void Sprinkler::resume() {
     ESP_LOGD(TAG, "Resuming valve %u with %u 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());
-    this->reset_resume_();
+    this->reset_resume();
   } else {
     ESP_LOGD(TAG, "No valve to resume!");
   }
@@ -783,6 +783,11 @@ void Sprinkler::resume_or_start_full_cycle() {
   }
 }
 
+void Sprinkler::reset_resume() {
+  this->paused_valve_.reset();
+  this->resume_duration_.reset();
+}
+
 const char *Sprinkler::valve_name(const size_t valve_number) {
   if (this->is_a_valid_valve(valve_number)) {
     return this->valve_[valve_number].controller_switch->get_name().c_str();
@@ -1101,11 +1106,6 @@ void Sprinkler::reset_cycle_states_() {
   }
 }
 
-void Sprinkler::reset_resume_() {
-  this->paused_valve_.reset();
-  this->resume_duration_.reset();
-}
-
 void Sprinkler::fsm_request_(size_t requested_valve, uint32_t requested_run_duration) {
   this->next_req_.set_valve(requested_valve);
   this->next_req_.set_run_duration(requested_run_duration);
diff --git a/esphome/components/sprinkler/sprinkler.h b/esphome/components/sprinkler/sprinkler.h
index 1243a844fa..acd168d791 100644
--- a/esphome/components/sprinkler/sprinkler.h
+++ b/esphome/components/sprinkler/sprinkler.h
@@ -308,6 +308,9 @@ class Sprinkler : public Component, public EntityBase {
   /// if a cycle was suspended using pause(), resumes it. otherwise calls start_full_cycle()
   void resume_or_start_full_cycle();
 
+  /// resets resume state
+  void reset_resume();
+
   /// returns a pointer to a valve's name string object; returns nullptr if valve_number is invalid
   const char *valve_name(size_t valve_number);
 
@@ -401,9 +404,6 @@ class Sprinkler : public Component, public EntityBase {
   /// resets the cycle state for all valves
   void reset_cycle_states_();
 
-  /// resets resume state
-  void reset_resume_();
-
   /// make a request of the state machine
   void fsm_request_(size_t requested_valve, uint32_t requested_run_duration = 0);
 

From b2db524366e79bdb3f786840ef63fded3285805a Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Tue, 20 Sep 2022 01:13:59 -0400
Subject: [PATCH 081/838] Bump dashboard to 20220919.1 (#3828)

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

diff --git a/requirements.txt b/requirements.txt
index bd0c70bb72..a81c38c44f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.0.2  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
-esphome-dashboard==20220508.0
+esphome-dashboard==20220919.1
 aioesphomeapi==10.13.0
 zeroconf==0.39.1
 

From fb9984e21f54dabab4563b83c5f14dce4ac3128e Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Thu, 15 Sep 2022 12:27:50 -0700
Subject: [PATCH 082/838] split pronto codes if they are too long (#3812)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 esphome/components/remote_base/pronto_protocol.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/esphome/components/remote_base/pronto_protocol.cpp b/esphome/components/remote_base/pronto_protocol.cpp
index d434744e49..d8798d4ab9 100644
--- a/esphome/components/remote_base/pronto_protocol.cpp
+++ b/esphome/components/remote_base/pronto_protocol.cpp
@@ -227,7 +227,18 @@ optional<ProntoData> ProntoProtocol::decode(RemoteReceiveData src) {
   return out;
 }
 
-void ProntoProtocol::dump(const ProntoData &data) { ESP_LOGD(TAG, "Received Pronto: data=%s", data.data.c_str()); }
+void ProntoProtocol::dump(const ProntoData &data) {
+  std::string first, rest;
+  if (data.data.size() < 230) {
+    first = data.data;
+  } else {
+    first = data.data.substr(0, 229);
+    rest = data.data.substr(230);
+  }
+  ESP_LOGD(TAG, "Received Pronto: data=%s", first.c_str());
+  if (!rest.empty())
+    ESP_LOGD(TAG, "%s", rest.c_str());
+}
 
 }  // namespace remote_base
 }  // namespace esphome

From 47a7a239aef236351ba547ab44d4f299f3c691ab Mon Sep 17 00:00:00 2001
From: h3ndrik <hendrik+dev@xd0.de>
Date: Sun, 18 Sep 2022 21:25:59 +0200
Subject: [PATCH 083/838] [BME280] raise standby time (#3804)

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

diff --git a/esphome/components/bme280/bme280.cpp b/esphome/components/bme280/bme280.cpp
index 345b24a36e..d8124f5dc3 100644
--- a/esphome/components/bme280/bme280.cpp
+++ b/esphome/components/bme280/bme280.cpp
@@ -163,7 +163,7 @@ void BME280Component::setup() {
     return;
   }
   config_register &= ~0b11111100;
-  config_register |= 0b000 << 5;  // 0.5 ms standby time
+  config_register |= 0b101 << 5;  // 1000 ms standby time
   config_register |= (this->iir_filter_ & 0b111) << 2;
   if (!this->write_byte(BME280_REGISTER_CONFIG, config_register)) {
     this->mark_failed();

From 91f1c25fccea0f7d120ead79dcdd609b2236616a Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Mon, 19 Sep 2022 20:02:55 -0500
Subject: [PATCH 084/838] Make sprinkler reset_resume() method public (#3824)

---
 esphome/components/sprinkler/sprinkler.cpp | 12 ++++++------
 esphome/components/sprinkler/sprinkler.h   |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/esphome/components/sprinkler/sprinkler.cpp b/esphome/components/sprinkler/sprinkler.cpp
index ab694c8412..2be71a08d0 100644
--- a/esphome/components/sprinkler/sprinkler.cpp
+++ b/esphome/components/sprinkler/sprinkler.cpp
@@ -769,7 +769,7 @@ void Sprinkler::resume() {
     ESP_LOGD(TAG, "Resuming valve %u with %u 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());
-    this->reset_resume_();
+    this->reset_resume();
   } else {
     ESP_LOGD(TAG, "No valve to resume!");
   }
@@ -783,6 +783,11 @@ void Sprinkler::resume_or_start_full_cycle() {
   }
 }
 
+void Sprinkler::reset_resume() {
+  this->paused_valve_.reset();
+  this->resume_duration_.reset();
+}
+
 const char *Sprinkler::valve_name(const size_t valve_number) {
   if (this->is_a_valid_valve(valve_number)) {
     return this->valve_[valve_number].controller_switch->get_name().c_str();
@@ -1101,11 +1106,6 @@ void Sprinkler::reset_cycle_states_() {
   }
 }
 
-void Sprinkler::reset_resume_() {
-  this->paused_valve_.reset();
-  this->resume_duration_.reset();
-}
-
 void Sprinkler::fsm_request_(size_t requested_valve, uint32_t requested_run_duration) {
   this->next_req_.set_valve(requested_valve);
   this->next_req_.set_run_duration(requested_run_duration);
diff --git a/esphome/components/sprinkler/sprinkler.h b/esphome/components/sprinkler/sprinkler.h
index 1243a844fa..acd168d791 100644
--- a/esphome/components/sprinkler/sprinkler.h
+++ b/esphome/components/sprinkler/sprinkler.h
@@ -308,6 +308,9 @@ class Sprinkler : public Component, public EntityBase {
   /// if a cycle was suspended using pause(), resumes it. otherwise calls start_full_cycle()
   void resume_or_start_full_cycle();
 
+  /// resets resume state
+  void reset_resume();
+
   /// returns a pointer to a valve's name string object; returns nullptr if valve_number is invalid
   const char *valve_name(size_t valve_number);
 
@@ -401,9 +404,6 @@ class Sprinkler : public Component, public EntityBase {
   /// resets the cycle state for all valves
   void reset_cycle_states_();
 
-  /// resets resume state
-  void reset_resume_();
-
   /// make a request of the state machine
   void fsm_request_(size_t requested_valve, uint32_t requested_run_duration = 0);
 

From 5c4e83ebdc1f8685b0dc7a675416d75d4552f221 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Tue, 20 Sep 2022 01:13:59 -0400
Subject: [PATCH 085/838] Bump dashboard to 20220919.1 (#3828)

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

diff --git a/requirements.txt b/requirements.txt
index bd0c70bb72..a81c38c44f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.0.2  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
-esphome-dashboard==20220508.0
+esphome-dashboard==20220919.1
 aioesphomeapi==10.13.0
 zeroconf==0.39.1
 

From 5f56cf312848c5e20f0c25463e768f90a3a372da Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 20 Sep 2022 17:14:51 +1200
Subject: [PATCH 086/838] Bump version to 2022.9.0b3

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

diff --git a/esphome/const.py b/esphome/const.py
index 5ce1edb8cd..02cbe02ba2 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.9.0b2"
+__version__ = "2022.9.0b3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 1444cddda9393d5b21d2ca4e2c8bc23a79ea9179 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Tue, 20 Sep 2022 02:23:55 -0300
Subject: [PATCH 087/838] Fix-esphome-validation-line-number (#3815)

---
 esphome/config.py      | 22 +++++++++++++++-------
 esphome/core/config.py |  6 +++++-
 esphome/vscode.py      |  4 +++-
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/esphome/config.py b/esphome/config.py
index 56fe75a4c7..04717be6f5 100644
--- a/esphome/config.py
+++ b/esphome/config.py
@@ -165,15 +165,19 @@ class Config(OrderedDict, fv.FinalValidateConfig):
                 return err
         return None
 
-    def get_deepest_document_range_for_path(self, path):
-        # type: (ConfigPath) -> Optional[ESPHomeDataBase]
+    def get_deepest_document_range_for_path(self, path, get_key=False):
+        # type: (ConfigPath, bool) -> Optional[ESPHomeDataBase]
         data = self
         doc_range = None
-        for item_index in path:
+        for index, path_item in enumerate(path):
             try:
-                if item_index in data:
-                    doc_range = [x for x in data.keys() if x == item_index][0].esp_range
-                data = data[item_index]
+                if path_item in data:
+                    key_data = [x for x in data.keys() if x == path_item][0]
+                    if isinstance(key_data, ESPHomeDataBase):
+                        doc_range = key_data.esp_range
+                        if get_key and index == len(path) - 1:
+                            return doc_range
+                data = data[path_item]
             except (KeyError, IndexError, TypeError, AttributeError):
                 return doc_range
             if isinstance(data, core.ID):
@@ -281,7 +285,7 @@ class ConfigValidationStep(abc.ABC):
 class LoadValidationStep(ConfigValidationStep):
     """Load step, this step is called once for each domain config fragment.
 
-    Responsibilties:
+    Responsibilities:
     - Load component code
     - Ensure all AUTO_LOADs are added
     - Set output paths of result
@@ -738,6 +742,10 @@ def validate_config(config, command_line_substitutions) -> Config:
             result.add_validation_step(LoadValidationStep(key, config[key]))
     result.run_validation_steps()
 
+    if result.errors:
+        # do not try to validate further as we don't know what the target is
+        return result
+
     for domain, conf in config.items():
         result.add_validation_step(LoadValidationStep(domain, conf))
     result.add_validation_step(IDPassValidationStep())
diff --git a/esphome/core/config.py b/esphome/core/config.py
index f1337be04b..82cf37d44d 100644
--- a/esphome/core/config.py
+++ b/esphome/core/config.py
@@ -179,7 +179,11 @@ def preload_core_config(config, result):
     ]
 
     if not has_oldstyle and not newstyle_found:
-        raise cv.Invalid("Platform missing for core options!", [CONF_ESPHOME])
+        raise cv.Invalid(
+            "Platform missing. You must include one of the available platform keys: "
+            + ", ".join(TARGET_PLATFORMS),
+            [CONF_ESPHOME],
+        )
     if has_oldstyle and newstyle_found:
         raise cv.Invalid(
             f"Please remove the `platform` key from the [esphome] block. You're already using the new style with the [{conf[CONF_PLATFORM]}] block",
diff --git a/esphome/vscode.py b/esphome/vscode.py
index 68d59abd02..6a43a654ed 100644
--- a/esphome/vscode.py
+++ b/esphome/vscode.py
@@ -12,7 +12,9 @@ from typing import Optional
 
 def _get_invalid_range(res, invalid):
     # type: (Config, cv.Invalid) -> Optional[DocumentRange]
-    return res.get_deepest_document_range_for_path(invalid.path)
+    return res.get_deepest_document_range_for_path(
+        invalid.path, invalid.error_message == "extra keys not allowed"
+    )
 
 
 def _dump_range(range):

From 3572c62315a1caf915e9b23e558ffba8aee3161b Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Tue, 20 Sep 2022 15:35:46 -0400
Subject: [PATCH 088/838] Bump dashboard to 20220920.0 (#3831)

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

diff --git a/requirements.txt b/requirements.txt
index a81c38c44f..0a667bef10 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.0.2  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
-esphome-dashboard==20220919.1
+esphome-dashboard==20220920.0
 aioesphomeapi==10.13.0
 zeroconf==0.39.1
 

From 33f296e05b11786c48bfbe8cbb1bed9a6c559572 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Tue, 20 Sep 2022 02:23:55 -0300
Subject: [PATCH 089/838] Fix-esphome-validation-line-number (#3815)

---
 esphome/config.py      | 22 +++++++++++++++-------
 esphome/core/config.py |  6 +++++-
 esphome/vscode.py      |  4 +++-
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/esphome/config.py b/esphome/config.py
index 56fe75a4c7..04717be6f5 100644
--- a/esphome/config.py
+++ b/esphome/config.py
@@ -165,15 +165,19 @@ class Config(OrderedDict, fv.FinalValidateConfig):
                 return err
         return None
 
-    def get_deepest_document_range_for_path(self, path):
-        # type: (ConfigPath) -> Optional[ESPHomeDataBase]
+    def get_deepest_document_range_for_path(self, path, get_key=False):
+        # type: (ConfigPath, bool) -> Optional[ESPHomeDataBase]
         data = self
         doc_range = None
-        for item_index in path:
+        for index, path_item in enumerate(path):
             try:
-                if item_index in data:
-                    doc_range = [x for x in data.keys() if x == item_index][0].esp_range
-                data = data[item_index]
+                if path_item in data:
+                    key_data = [x for x in data.keys() if x == path_item][0]
+                    if isinstance(key_data, ESPHomeDataBase):
+                        doc_range = key_data.esp_range
+                        if get_key and index == len(path) - 1:
+                            return doc_range
+                data = data[path_item]
             except (KeyError, IndexError, TypeError, AttributeError):
                 return doc_range
             if isinstance(data, core.ID):
@@ -281,7 +285,7 @@ class ConfigValidationStep(abc.ABC):
 class LoadValidationStep(ConfigValidationStep):
     """Load step, this step is called once for each domain config fragment.
 
-    Responsibilties:
+    Responsibilities:
     - Load component code
     - Ensure all AUTO_LOADs are added
     - Set output paths of result
@@ -738,6 +742,10 @@ def validate_config(config, command_line_substitutions) -> Config:
             result.add_validation_step(LoadValidationStep(key, config[key]))
     result.run_validation_steps()
 
+    if result.errors:
+        # do not try to validate further as we don't know what the target is
+        return result
+
     for domain, conf in config.items():
         result.add_validation_step(LoadValidationStep(domain, conf))
     result.add_validation_step(IDPassValidationStep())
diff --git a/esphome/core/config.py b/esphome/core/config.py
index f1337be04b..82cf37d44d 100644
--- a/esphome/core/config.py
+++ b/esphome/core/config.py
@@ -179,7 +179,11 @@ def preload_core_config(config, result):
     ]
 
     if not has_oldstyle and not newstyle_found:
-        raise cv.Invalid("Platform missing for core options!", [CONF_ESPHOME])
+        raise cv.Invalid(
+            "Platform missing. You must include one of the available platform keys: "
+            + ", ".join(TARGET_PLATFORMS),
+            [CONF_ESPHOME],
+        )
     if has_oldstyle and newstyle_found:
         raise cv.Invalid(
             f"Please remove the `platform` key from the [esphome] block. You're already using the new style with the [{conf[CONF_PLATFORM]}] block",
diff --git a/esphome/vscode.py b/esphome/vscode.py
index 68d59abd02..6a43a654ed 100644
--- a/esphome/vscode.py
+++ b/esphome/vscode.py
@@ -12,7 +12,9 @@ from typing import Optional
 
 def _get_invalid_range(res, invalid):
     # type: (Config, cv.Invalid) -> Optional[DocumentRange]
-    return res.get_deepest_document_range_for_path(invalid.path)
+    return res.get_deepest_document_range_for_path(
+        invalid.path, invalid.error_message == "extra keys not allowed"
+    )
 
 
 def _dump_range(range):

From d56107e97fe72de58c26b2667cc42e9d08bc8fbc Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Tue, 20 Sep 2022 15:35:46 -0400
Subject: [PATCH 090/838] Bump dashboard to 20220920.0 (#3831)

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

diff --git a/requirements.txt b/requirements.txt
index a81c38c44f..0a667bef10 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.0.2  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
-esphome-dashboard==20220919.1
+esphome-dashboard==20220920.0
 aioesphomeapi==10.13.0
 zeroconf==0.39.1
 

From 63b42f36080c17ab51fc57325e2fd61dc71eac4a Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 21 Sep 2022 07:36:39 +1200
Subject: [PATCH 091/838] Bump version to 2022.9.0b4

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

diff --git a/esphome/const.py b/esphome/const.py
index 02cbe02ba2..0fe271cd5a 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.9.0b3"
+__version__ = "2022.9.0b4"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 9a69769a7e377634efc2d688fe5cde802383e0be Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 21 Sep 2022 07:54:35 +1200
Subject: [PATCH 092/838] Dont fail fast on CI for docker (#3832)

---
 .github/workflows/ci-docker.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index 7eb4cd1f66..86035b9259 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -28,6 +28,7 @@ jobs:
     name: Build docker containers
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         arch: [amd64, armv7, aarch64]
         build_type: ["ha-addon", "docker", "lint"]

From 68ea59f3ae19fafdb8ce59133e9fc8513ec2b910 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Tue, 20 Sep 2022 21:32:53 -0300
Subject: [PATCH 093/838] Bump dashboard to 20220920.1 (#3834)

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

diff --git a/requirements.txt b/requirements.txt
index 0a667bef10..55544e442e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.0.2  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
-esphome-dashboard==20220920.0
+esphome-dashboard==20220920.1
 aioesphomeapi==10.13.0
 zeroconf==0.39.1
 

From fd6135aebb1199dfd4029bfe53f3343c7dcb14f7 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Tue, 20 Sep 2022 21:32:53 -0300
Subject: [PATCH 094/838] Bump dashboard to 20220920.1 (#3834)

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

diff --git a/requirements.txt b/requirements.txt
index 0a667bef10..55544e442e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.0.2  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
-esphome-dashboard==20220920.0
+esphome-dashboard==20220920.1
 aioesphomeapi==10.13.0
 zeroconf==0.39.1
 

From 91560ae4e9613e78c3265c6d637e6f7ee530f2af Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 21 Sep 2022 12:38:55 +1200
Subject: [PATCH 095/838] Bump version to 2022.9.0b5

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

diff --git a/esphome/const.py b/esphome/const.py
index 0fe271cd5a..290e5e2994 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.9.0b4"
+__version__ = "2022.9.0b5"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 9655362f238bacc6e24a4c5446fb345f4d8afe8d Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 21 Sep 2022 15:34:02 +1200
Subject: [PATCH 096/838] Bump version to 2022.9.0

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

diff --git a/esphome/const.py b/esphome/const.py
index 290e5e2994..41057f3d29 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.9.0b5"
+__version__ = "2022.9.0"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 6ef93452f5fa707d1023e498b7d3ee6579850411 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 22 Sep 2022 07:38:31 +1200
Subject: [PATCH 097/838] Revert "fix spi timing issues" (#3838)

---
 esphome/components/spi/spi.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/esphome/components/spi/spi.h b/esphome/components/spi/spi.h
index 6c92321ac8..7f0b0f481a 100644
--- a/esphome/components/spi/spi.h
+++ b/esphome/components/spi/spi.h
@@ -195,11 +195,6 @@ class SPIComponent : public Component {
 
   template<SPIBitOrder BIT_ORDER, SPIClockPolarity CLOCK_POLARITY, SPIClockPhase CLOCK_PHASE, uint32_t DATA_RATE>
   void enable(GPIOPin *cs) {
-    if (cs != nullptr) {
-      this->active_cs_ = cs;
-      this->active_cs_->digital_write(false);
-    }
-
 #ifdef USE_SPI_ARDUINO_BACKEND
     if (this->hw_spi_ != nullptr) {
       uint8_t data_mode = SPI_MODE0;
@@ -220,6 +215,11 @@ class SPIComponent : public Component {
 #ifdef USE_SPI_ARDUINO_BACKEND
     }
 #endif  // USE_SPI_ARDUINO_BACKEND
+
+    if (cs != nullptr) {
+      this->active_cs_ = cs;
+      this->active_cs_->digital_write(false);
+    }
   }
 
   void disable();

From 34bef2f2ca73f5e73796ea62671dccb97de48e60 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 22 Sep 2022 07:38:31 +1200
Subject: [PATCH 098/838] Revert "fix spi timing issues" (#3838)

---
 esphome/components/spi/spi.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/esphome/components/spi/spi.h b/esphome/components/spi/spi.h
index 6c92321ac8..7f0b0f481a 100644
--- a/esphome/components/spi/spi.h
+++ b/esphome/components/spi/spi.h
@@ -195,11 +195,6 @@ class SPIComponent : public Component {
 
   template<SPIBitOrder BIT_ORDER, SPIClockPolarity CLOCK_POLARITY, SPIClockPhase CLOCK_PHASE, uint32_t DATA_RATE>
   void enable(GPIOPin *cs) {
-    if (cs != nullptr) {
-      this->active_cs_ = cs;
-      this->active_cs_->digital_write(false);
-    }
-
 #ifdef USE_SPI_ARDUINO_BACKEND
     if (this->hw_spi_ != nullptr) {
       uint8_t data_mode = SPI_MODE0;
@@ -220,6 +215,11 @@ class SPIComponent : public Component {
 #ifdef USE_SPI_ARDUINO_BACKEND
     }
 #endif  // USE_SPI_ARDUINO_BACKEND
+
+    if (cs != nullptr) {
+      this->active_cs_ = cs;
+      this->active_cs_->digital_write(false);
+    }
   }
 
   void disable();

From 66226abb4877de61261b4bc5553ea7caf5664a4f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 22 Sep 2022 07:40:15 +1200
Subject: [PATCH 099/838] Bump version to 2022.9.1

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

diff --git a/esphome/const.py b/esphome/const.py
index 41057f3d29..ce5a51aa71 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.9.0"
+__version__ = "2022.9.1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From ce2e161b082be0bf44b2689e40d0c63dd69676fb Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sun, 25 Sep 2022 18:16:30 -0300
Subject: [PATCH 100/838] Bump dashboard to 20220925.0 (#3846)

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

diff --git a/requirements.txt b/requirements.txt
index 55544e442e..7f86acdbef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.0.2  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
-esphome-dashboard==20220920.1
+esphome-dashboard==20220925.0
 aioesphomeapi==10.13.0
 zeroconf==0.39.1
 

From 8095db67152eecf8709d3c7893efdeddf027f52f Mon Sep 17 00:00:00 2001
From: Michael Davidson <mrmdavidson@sadorangeproductions.com>
Date: Mon, 26 Sep 2022 12:59:04 +1000
Subject: [PATCH 101/838] Thermostat remove deprecated config (#3643)

* Raise errors for all the now deprecated options

* Fix CONF_DEFAULT_PRESET detection

* Stop attempting to set the non-existent normal_config

* Add support for default presets

* Fix correct detection of Two Point temperature mode

* Fix lint issues

* Fix tests

* Generate correct yaml for equivalent configurations

* Remove debug code

* Only set default preset if the thermostat does not have state to restore

* Add restore_default_preset_on_boot option
If set to True then the default_preset will be applied on every boot. If False (Default) state will be restored from memory as per prior versions

* Apply lint suggestions

* Switch from restore_default_preset_on_boot to an enum for startup_behavior
This gives better self-documentation as well as the option for extending to other options down the track

* Lint fixes

* Rename startup_behavior to on_boot_restore_from
This removes any issues with different English locales

* Fix comparable_preset yaml output alignment

* Add dump of on_boot_restore_from setting

Co-authored-by: Keith Burzinski <kbx81x@gmail.com>
---
 esphome/components/thermostat/climate.py      | 147 ++++++++++++------
 .../thermostat/thermostat_climate.cpp         |  53 +++++--
 .../thermostat/thermostat_climate.h           |  18 ++-
 tests/test3.yaml                              |  12 +-
 4 files changed, 161 insertions(+), 69 deletions(-)

diff --git a/esphome/components/thermostat/climate.py b/esphome/components/thermostat/climate.py
index 5e26e6d6de..8aa61dbb93 100644
--- a/esphome/components/thermostat/climate.py
+++ b/esphome/components/thermostat/climate.py
@@ -69,6 +69,8 @@ from esphome.const import (
 )
 
 CONF_PRESET_CHANGE = "preset_change"
+CONF_DEFAULT_PRESET = "default_preset"
+CONF_ON_BOOT_RESTORE_FROM = "on_boot_restore_from"
 
 CODEOWNERS = ["@kbx81"]
 
@@ -80,6 +82,13 @@ ThermostatClimate = thermostat_ns.class_(
 ThermostatClimateTargetTempConfig = thermostat_ns.struct(
     "ThermostatClimateTargetTempConfig"
 )
+OnBootRestoreFrom = thermostat_ns.enum("OnBootRestoreFrom")
+ON_BOOT_RESTORE_FROM = {
+    "MEMORY": OnBootRestoreFrom.MEMORY,
+    "DEFAULT_PRESET": OnBootRestoreFrom.DEFAULT_PRESET,
+}
+validate_on_boot_restore_from = cv.enum(ON_BOOT_RESTORE_FROM, upper=True)
+
 ClimateMode = climate_ns.enum("ClimateMode")
 CLIMATE_MODES = {
     "OFF": ClimateMode.CLIMATE_MODE_OFF,
@@ -125,6 +134,17 @@ def validate_temperature_preset(preset, root_config, name, requirements):
                 )
 
 
+def generate_comparable_preset(config, name):
+    comparable_preset = f"{CONF_PRESET}:\n" f"  -  {CONF_NAME}: {name}\n"
+
+    if CONF_DEFAULT_TARGET_TEMPERATURE_LOW in config:
+        comparable_preset += f"     {CONF_DEFAULT_TARGET_TEMPERATURE_LOW}: {config[CONF_DEFAULT_TARGET_TEMPERATURE_LOW]}\n"
+    if CONF_DEFAULT_TARGET_TEMPERATURE_HIGH in config:
+        comparable_preset += f"     {CONF_DEFAULT_TARGET_TEMPERATURE_HIGH}: {config[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]}\n"
+
+    return comparable_preset
+
+
 def validate_thermostat(config):
     # verify corresponding action(s) exist(s) for any defined climate mode or action
     requirements = {
@@ -277,13 +297,32 @@ def validate_thermostat(config):
             CONF_DEFAULT_TARGET_TEMPERATURE_LOW: [CONF_HEAT_ACTION],
         }
 
-    # Validate temperature requirements for default configuraation
-    validate_temperature_preset(config, config, "default", requirements)
+    # Legacy high/low configs
+    if CONF_DEFAULT_TARGET_TEMPERATURE_LOW in config:
+        comparable_preset = generate_comparable_preset(config, "Your new preset")
 
-    # Validate temperature requirements for away configuration
+        raise cv.Invalid(
+            f"{CONF_DEFAULT_TARGET_TEMPERATURE_LOW} is no longer valid. Please switch to using a preset for an equivalent experience.\nEquivalent configuration:\n\n"
+            f"{comparable_preset}"
+        )
+    if CONF_DEFAULT_TARGET_TEMPERATURE_HIGH in config:
+        comparable_preset = generate_comparable_preset(config, "Your new preset")
+
+        raise cv.Invalid(
+            f"{CONF_DEFAULT_TARGET_TEMPERATURE_HIGH} is no longer valid. Please switch to using a preset for an equivalent experience.\nEquivalent configuration:\n\n"
+            f"{comparable_preset}"
+        )
+
+    # Legacy away mode - raise an error instructing the user to switch to presets
     if CONF_AWAY_CONFIG in config:
-        away = config[CONF_AWAY_CONFIG]
-        validate_temperature_preset(away, config, "away", requirements)
+        comparable_preset = generate_comparable_preset(config[CONF_AWAY_CONFIG], "Away")
+
+        raise cv.Invalid(
+            f"{CONF_AWAY_CONFIG} is no longer valid. Please switch to using a preset named "
+            "Away"
+            " for an equivalent experience.\nEquivalent configuration:\n\n"
+            f"{comparable_preset}"
+        )
 
     # Validate temperature requirements for presets
     if CONF_PRESET in config:
@@ -292,7 +331,12 @@ def validate_thermostat(config):
                 preset_config, config, preset_config[CONF_NAME], requirements
             )
 
-    # Verify default climate mode is valid given above configuration
+    # Warn about using the removed CONF_DEFAULT_MODE and advise users
+    if CONF_DEFAULT_MODE in config and config[CONF_DEFAULT_MODE] is not None:
+        raise cv.Invalid(
+            f"{CONF_DEFAULT_MODE} is no longer valid. Please switch to using presets and specify a {CONF_DEFAULT_PRESET}."
+        )
+
     default_mode = config[CONF_DEFAULT_MODE]
     requirements = {
         "HEAT_COOL": [CONF_COOL_ACTION, CONF_HEAT_ACTION],
@@ -403,6 +447,38 @@ def validate_thermostat(config):
                         f"{CONF_SWING_MODE} is set to {swing_mode} for {preset_config[CONF_NAME]} but {req} is not present in the configuration"
                     )
 
+    # If a default preset is requested then ensure that preset is defined
+    if CONF_DEFAULT_PRESET in config:
+        default_preset = config[CONF_DEFAULT_PRESET]
+
+        if CONF_PRESET not in config:
+            raise cv.Invalid(
+                f"{CONF_DEFAULT_PRESET} is specified but no presets are defined"
+            )
+
+        presets = config[CONF_PRESET]
+        found_preset = False
+
+        for preset in presets:
+            if preset[CONF_NAME] == default_preset:
+                found_preset = True
+                break
+
+        if found_preset is False:
+            raise cv.Invalid(
+                f"{CONF_DEFAULT_PRESET} set to '{default_preset}' but no such preset has been defined. Available presets: {[preset[CONF_NAME] for preset in presets]}"
+            )
+
+    # If restoring default preset on boot is true then ensure we have a default preset
+    if (
+        CONF_ON_BOOT_RESTORE_FROM in config
+        and config[CONF_ON_BOOT_RESTORE_FROM] is OnBootRestoreFrom.DEFAULT_PRESET
+    ):
+        if CONF_DEFAULT_PRESET not in config:
+            raise cv.Invalid(
+                f"{CONF_DEFAULT_PRESET} must be defined to use {CONF_ON_BOOT_RESTORE_FROM} in DEFAULT_PRESET mode"
+            )
+
     if config[CONF_FAN_WITH_COOLING] is True and CONF_FAN_ONLY_ACTION not in config:
         raise cv.Invalid(
             f"{CONF_FAN_ONLY_ACTION} must be defined to use {CONF_FAN_WITH_COOLING}"
@@ -502,9 +578,8 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(
                 CONF_TARGET_TEMPERATURE_CHANGE_ACTION
             ): automation.validate_automation(single=True),
-            cv.Optional(CONF_DEFAULT_MODE, default="OFF"): cv.templatable(
-                validate_climate_mode
-            ),
+            cv.Optional(CONF_DEFAULT_MODE, default=None): cv.valid,
+            cv.Optional(CONF_DEFAULT_PRESET): cv.templatable(cv.string),
             cv.Optional(CONF_DEFAULT_TARGET_TEMPERATURE_HIGH): cv.temperature,
             cv.Optional(CONF_DEFAULT_TARGET_TEMPERATURE_LOW): cv.temperature,
             cv.Optional(
@@ -542,6 +617,7 @@ CONFIG_SCHEMA = cv.All(
                 }
             ),
             cv.Optional(CONF_PRESET): cv.ensure_list(PRESET_CONFIG_SCHEMA),
+            cv.Optional(CONF_ON_BOOT_RESTORE_FROM): validate_on_boot_restore_from,
             cv.Optional(CONF_PRESET_CHANGE): automation.validate_automation(
                 single=True
             ),
@@ -564,9 +640,10 @@ async def to_code(config):
         CONF_COOL_ACTION in config
         or (config[CONF_FAN_ONLY_COOLING] and CONF_FAN_ONLY_ACTION in config)
     )
+    if two_points_available:
+        cg.add(var.set_supports_two_points(True))
 
     sens = await cg.get_variable(config[CONF_SENSOR])
-    cg.add(var.set_default_mode(config[CONF_DEFAULT_MODE]))
     cg.add(
         var.set_set_point_minimum_differential(
             config[CONF_SET_POINT_MINIMUM_DIFFERENTIAL]
@@ -579,23 +656,6 @@ async def to_code(config):
     cg.add(var.set_heat_deadband(config[CONF_HEAT_DEADBAND]))
     cg.add(var.set_heat_overrun(config[CONF_HEAT_OVERRUN]))
 
-    if two_points_available is True:
-        cg.add(var.set_supports_two_points(True))
-        normal_config = ThermostatClimateTargetTempConfig(
-            config[CONF_DEFAULT_TARGET_TEMPERATURE_LOW],
-            config[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH],
-        )
-    elif CONF_DEFAULT_TARGET_TEMPERATURE_HIGH in config:
-        cg.add(var.set_supports_two_points(False))
-        normal_config = ThermostatClimateTargetTempConfig(
-            config[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
-        )
-    elif CONF_DEFAULT_TARGET_TEMPERATURE_LOW in config:
-        cg.add(var.set_supports_two_points(False))
-        normal_config = ThermostatClimateTargetTempConfig(
-            config[CONF_DEFAULT_TARGET_TEMPERATURE_LOW]
-        )
-
     if CONF_MAX_COOLING_RUN_TIME in config:
         cg.add(
             var.set_cooling_maximum_run_time_in_sec(config[CONF_MAX_COOLING_RUN_TIME])
@@ -661,7 +721,6 @@ async def to_code(config):
     cg.add(var.set_supports_fan_with_heating(config[CONF_FAN_WITH_HEATING]))
 
     cg.add(var.set_use_startup_delay(config[CONF_STARTUP_DELAY]))
-    cg.add(var.set_preset_config(ClimatePreset.CLIMATE_PRESET_HOME, normal_config))
 
     await automation.build_automation(
         var.get_idle_action_trigger(), [], config[CONF_IDLE_ACTION]
@@ -808,27 +867,8 @@ async def to_code(config):
             config[CONF_TARGET_TEMPERATURE_CHANGE_ACTION],
         )
 
-    if CONF_AWAY_CONFIG in config:
-        away = config[CONF_AWAY_CONFIG]
-
-        if two_points_available is True:
-            away_config = ThermostatClimateTargetTempConfig(
-                away[CONF_DEFAULT_TARGET_TEMPERATURE_LOW],
-                away[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH],
-            )
-        elif CONF_DEFAULT_TARGET_TEMPERATURE_HIGH in away:
-            away_config = ThermostatClimateTargetTempConfig(
-                away[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
-            )
-        elif CONF_DEFAULT_TARGET_TEMPERATURE_LOW in away:
-            away_config = ThermostatClimateTargetTempConfig(
-                away[CONF_DEFAULT_TARGET_TEMPERATURE_LOW]
-            )
-        cg.add(var.set_preset_config(ClimatePreset.CLIMATE_PRESET_AWAY, away_config))
-
     if CONF_PRESET in config:
         for preset_config in config[CONF_PRESET]:
-
             name = preset_config[CONF_NAME]
             standard_preset = None
             if name.upper() in climate.CLIMATE_PRESETS:
@@ -872,6 +912,19 @@ async def to_code(config):
             else:
                 cg.add(var.set_custom_preset_config(name, preset_target_variable))
 
+    if CONF_DEFAULT_PRESET in config:
+        default_preset_name = config[CONF_DEFAULT_PRESET]
+
+        # if the name is a built in preset use the appropriate naming format
+        if default_preset_name.upper() in climate.CLIMATE_PRESETS:
+            climate_preset = climate.CLIMATE_PRESETS[default_preset_name.upper()]
+            cg.add(var.set_default_preset(climate_preset))
+        else:
+            cg.add(var.set_default_preset(default_preset_name))
+
+    if CONF_ON_BOOT_RESTORE_FROM in config:
+        cg.add(var.set_on_boot_restore_from(config[CONF_ON_BOOT_RESTORE_FROM]))
+
     if CONF_PRESET_CHANGE in config:
         await automation.build_automation(
             var.get_preset_change_trigger(), [], config[CONF_PRESET_CHANGE]
diff --git a/esphome/components/thermostat/thermostat_climate.cpp b/esphome/components/thermostat/thermostat_climate.cpp
index dc4e1e437e..a9b03187d3 100644
--- a/esphome/components/thermostat/thermostat_climate.cpp
+++ b/esphome/components/thermostat/thermostat_climate.cpp
@@ -25,15 +25,27 @@ void ThermostatClimate::setup() {
     this->publish_state();
   });
   this->current_temperature = this->sensor_->state;
-  // restore all climate data, if possible
-  auto restore = this->restore_state_();
-  if (restore.has_value()) {
-    restore->to_call(this).perform();
-  } else {
-    // restore from defaults, change_away handles temps for us
-    this->mode = this->default_mode_;
-    this->change_preset_(climate::CLIMATE_PRESET_HOME);
+
+  auto use_default_preset = true;
+
+  if (this->on_boot_restore_from_ == thermostat::OnBootRestoreFrom::MEMORY) {
+    // restore all climate data, if possible
+    auto restore = this->restore_state_();
+    if (restore.has_value()) {
+      use_default_preset = false;
+      restore->to_call(this).perform();
+    }
   }
+
+  // Either we failed to restore state or the user has requested we always apply the default preset
+  if (use_default_preset) {
+    if (this->default_preset_ != climate::ClimatePreset::CLIMATE_PRESET_NONE) {
+      this->change_preset_(this->default_preset_);
+    } else if (!this->default_custom_preset_.empty()) {
+      this->change_custom_preset_(this->default_custom_preset_);
+    }
+  }
+
   // refresh the climate action based on the restored settings, we'll publish_state() later
   this->switch_to_action_(this->compute_action_(), false);
   this->switch_to_supplemental_action_(this->compute_supplemental_action_());
@@ -923,10 +935,12 @@ bool ThermostatClimate::supplemental_heating_required_() {
           (this->supplemental_action_ == climate::CLIMATE_ACTION_HEATING));
 }
 
-void ThermostatClimate::dump_preset_config_(const std::string &preset,
-                                            const ThermostatClimateTargetTempConfig &config) {
+void ThermostatClimate::dump_preset_config_(const std::string &preset, const ThermostatClimateTargetTempConfig &config,
+                                            bool is_default_preset) {
   const auto *preset_name = preset.c_str();
 
+  ESP_LOGCONFIG(TAG, "      %s Is Default: %s", preset_name, YESNO(is_default_preset));
+
   if (this->supports_heat_) {
     if (this->supports_two_points_) {
       ESP_LOGCONFIG(TAG, "      %s Default Target Temperature Low: %.1f°C", preset_name,
@@ -1061,7 +1075,15 @@ ThermostatClimate::ThermostatClimate()
       temperature_change_trigger_(new Trigger<>()),
       preset_change_trigger_(new Trigger<>()) {}
 
-void ThermostatClimate::set_default_mode(climate::ClimateMode default_mode) { this->default_mode_ = default_mode; }
+void ThermostatClimate::set_default_preset(const std::string &custom_preset) {
+  this->default_custom_preset_ = custom_preset;
+}
+
+void ThermostatClimate::set_default_preset(climate::ClimatePreset preset) { this->default_preset_ = preset; }
+
+void ThermostatClimate::set_on_boot_restore_from(thermostat::OnBootRestoreFrom on_boot_restore_from) {
+  this->on_boot_restore_from_ = on_boot_restore_from;
+}
 void ThermostatClimate::set_set_point_minimum_differential(float differential) {
   this->set_point_minimum_differential_ = differential;
 }
@@ -1213,8 +1235,9 @@ Trigger<> *ThermostatClimate::get_preset_change_trigger() const { return this->p
 void ThermostatClimate::dump_config() {
   LOG_CLIMATE("", "Thermostat", this);
 
-  if (this->supports_two_points_)
+  if (this->supports_two_points_) {
     ESP_LOGCONFIG(TAG, "  Minimum Set Point Differential: %.1f°C", this->set_point_minimum_differential_);
+  }
   ESP_LOGCONFIG(TAG, "  Start-up Delay Enabled: %s", YESNO(this->use_startup_delay_));
   if (this->supports_cool_) {
     ESP_LOGCONFIG(TAG, "  Cooling Parameters:");
@@ -1284,7 +1307,7 @@ void ThermostatClimate::dump_config() {
     const auto *preset_name = LOG_STR_ARG(climate::climate_preset_to_string(it.first));
 
     ESP_LOGCONFIG(TAG, "    Supports %s: %s", preset_name, YESNO(true));
-    this->dump_preset_config_(preset_name, it.second);
+    this->dump_preset_config_(preset_name, it.second, it.first == this->default_preset_);
   }
 
   ESP_LOGCONFIG(TAG, "  Supported CUSTOM PRESETS: ");
@@ -1292,8 +1315,10 @@ void ThermostatClimate::dump_config() {
     const auto *preset_name = it.first.c_str();
 
     ESP_LOGCONFIG(TAG, "    Supports %s: %s", preset_name, YESNO(true));
-    this->dump_preset_config_(preset_name, it.second);
+    this->dump_preset_config_(preset_name, it.second, it.first == this->default_custom_preset_);
   }
+  ESP_LOGCONFIG(TAG, "  On boot, restore from: %s",
+                this->on_boot_restore_from_ == thermostat::DEFAULT_PRESET ? "DEFAULT_PRESET" : "MEMORY");
 }
 
 ThermostatClimateTargetTempConfig::ThermostatClimateTargetTempConfig() = default;
diff --git a/esphome/components/thermostat/thermostat_climate.h b/esphome/components/thermostat/thermostat_climate.h
index a5498dc53d..aa7529cfb1 100644
--- a/esphome/components/thermostat/thermostat_climate.h
+++ b/esphome/components/thermostat/thermostat_climate.h
@@ -22,6 +22,7 @@ enum ThermostatClimateTimerIndex : size_t {
   TIMER_IDLE_ON = 9,
 };
 
+enum OnBootRestoreFrom : size_t { MEMORY = 0, DEFAULT_PRESET = 1 };
 struct ThermostatClimateTimer {
   const std::string name;
   bool active;
@@ -57,7 +58,9 @@ class ThermostatClimate : public climate::Climate, public Component {
   void setup() override;
   void dump_config() override;
 
-  void set_default_mode(climate::ClimateMode default_mode);
+  void set_default_preset(const std::string &custom_preset);
+  void set_default_preset(climate::ClimatePreset preset);
+  void set_on_boot_restore_from(thermostat::OnBootRestoreFrom on_boot_restore_from);
   void set_set_point_minimum_differential(float differential);
   void set_cool_deadband(float deadband);
   void set_cool_overrun(float overrun);
@@ -225,7 +228,8 @@ class ThermostatClimate : public climate::Climate, public Component {
   bool supplemental_cooling_required_();
   bool supplemental_heating_required_();
 
-  void dump_preset_config_(const std::string &preset_name, const ThermostatClimateTargetTempConfig &config);
+  void dump_preset_config_(const std::string &preset_name, const ThermostatClimateTargetTempConfig &config,
+                           bool is_default_preset);
 
   /// The sensor used for getting the current temperature
   sensor::Sensor *sensor_{nullptr};
@@ -397,7 +401,6 @@ class ThermostatClimate : public climate::Climate, public Component {
   /// These are used to determine when a trigger/action needs to be called
   climate::ClimateAction supplemental_action_{climate::CLIMATE_ACTION_OFF};
   climate::ClimateFanMode prev_fan_mode_{climate::CLIMATE_FAN_ON};
-  climate::ClimateMode default_mode_{climate::CLIMATE_MODE_OFF};
   climate::ClimateMode prev_mode_{climate::CLIMATE_MODE_OFF};
   climate::ClimateSwingMode prev_swing_mode_{climate::CLIMATE_SWING_OFF};
 
@@ -441,6 +444,15 @@ class ThermostatClimate : public climate::Climate, public Component {
   std::map<climate::ClimatePreset, ThermostatClimateTargetTempConfig> preset_config_{};
   /// The set of custom preset configurations this thermostat supports (eg. "My Custom Preset")
   std::map<std::string, ThermostatClimateTargetTempConfig> custom_preset_config_{};
+
+  /// Default standard preset to use on start up
+  climate::ClimatePreset default_preset_{};
+  /// Default custom preset to use on start up
+  std::string default_custom_preset_{};
+
+  /// If set to DEFAULT_PRESET then the default preset is always used. When MEMORY prior
+  /// state will attempt to be restored if possible
+  thermostat::OnBootRestoreFrom on_boot_restore_from_{thermostat::OnBootRestoreFrom::MEMORY};
 };
 
 }  // namespace thermostat
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 4eee0fd2c9..8fc66f4918 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -1061,8 +1061,13 @@ climate:
   - platform: thermostat
     name: Thermostat Climate
     sensor: ha_hello_world
-    default_target_temperature_low: 18°C
-    default_target_temperature_high: 24°C
+    preset:
+    - name: Default Preset
+      default_target_temperature_low: 18°C
+      default_target_temperature_high: 24°C
+    - name: Away
+      default_target_temperature_low: 16°C
+      default_target_temperature_high: 20°C
     idle_action:
       - switch.turn_on: gpio_switch1
     cool_action:
@@ -1137,9 +1142,6 @@ climate:
     fan_only_cooling: true
     fan_with_cooling: true
     fan_with_heating: true
-    away_config:
-      default_target_temperature_low: 16°C
-      default_target_temperature_high: 20°C
   - platform: pid
     id: pid_climate
     name: PID Climate Controller

From efdb3d1f40eb0750b15ff2e3894aea0ac8ba28d3 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sun, 25 Sep 2022 18:16:30 -0300
Subject: [PATCH 102/838] Bump dashboard to 20220925.0 (#3846)

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

diff --git a/requirements.txt b/requirements.txt
index 55544e442e..7f86acdbef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.0.2  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
-esphome-dashboard==20220920.1
+esphome-dashboard==20220925.0
 aioesphomeapi==10.13.0
 zeroconf==0.39.1
 

From d2c1c7507cbb42dd1bfa857006b3db9f6432f4d1 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 29 Sep 2022 16:00:55 +1300
Subject: [PATCH 103/838] Bump version to 2022.9.2

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

diff --git a/esphome/const.py b/esphome/const.py
index ce5a51aa71..a272f518df 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.9.1"
+__version__ = "2022.9.2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 106de3530dac29a0d21803aa44a11121142d63a0 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 29 Sep 2022 10:15:30 -1000
Subject: [PATCH 104/838] Add support for parsing the short local name in the
 tracker (#3854)

---
 .../components/esp32_ble_tracker/esp32_ble_tracker.cpp    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index f7e51a8ab3..47c1f6022e 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -637,11 +637,17 @@ void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_p
     // (called CSS here)
 
     switch (record_type) {
+      case ESP_BLE_AD_TYPE_NAME_SHORT:
       case ESP_BLE_AD_TYPE_NAME_CMPL: {
         // CSS 1.2 LOCAL NAME
         // "The Local Name data type shall be the same as, or a shortened version of, the local name assigned to the
         // device." CSS 1: Optional in this context; shall not appear more than once in a block.
-        this->name_ = std::string(reinterpret_cast<const char *>(record), record_length);
+        // SHORTENED LOCAL NAME
+        // "The Shortened Local Name data type defines a shortened version of the Local Name data type. The Shortened
+        // Local Name data type shall not be used to advertise a name that is longer than the Local Name data type."
+        if (record_length > this->name_.length()) {
+          this->name_ = std::string(reinterpret_cast<const char *>(record), record_length);
+        }
         break;
       }
       case ESP_BLE_AD_TYPE_TX_PWR: {

From f4a84765cdc618d488e50b7a132c955b9c45448d Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Fri, 30 Sep 2022 01:10:53 -0500
Subject: [PATCH 105/838] Add display GPIO setup instruction for Aliexpress
 display (#3851)

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

diff --git a/esphome/components/ssd1327_base/ssd1327_base.cpp b/esphome/components/ssd1327_base/ssd1327_base.cpp
index 4cb8d17a3d..4223a013a4 100644
--- a/esphome/components/ssd1327_base/ssd1327_base.cpp
+++ b/esphome/components/ssd1327_base/ssd1327_base.cpp
@@ -76,6 +76,8 @@ void SSD1327::setup() {
   this->command(0x55);
   this->command(SSD1327_SETVCOMHVOLTAGE);  // Set High Voltage Level of COM Pin
   this->command(0x1C);
+  this->command(SSD1327_SETGPIO);  // Switch voltage converter on (for Aliexpress display)
+  this->command(0x03);
   this->command(SSD1327_NORMALDISPLAY);  // set display mode
   set_brightness(this->brightness_);
   this->fill(Color::BLACK);  // clear display - ensures we do not see garbage at power-on

From ed443c6153c56eedd5671b7fa545806c5350ff1c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 4 Oct 2022 10:45:06 +1300
Subject: [PATCH 106/838] Bluetooth Proxy active connections (#3817)

---
 CODEOWNERS                                    |   1 +
 .../airthings_wave_mini.cpp                   |   6 +-
 .../airthings_wave_plus.cpp                   |   6 +-
 esphome/components/am43/am43.cpp              |  10 +-
 esphome/components/am43/cover/am43_cover.cpp  |  21 +-
 esphome/components/anova/anova.cpp            |  22 +-
 esphome/components/api/api.proto              | 177 +++-
 esphome/components/api/api_connection.cpp     |  72 +-
 esphome/components/api/api_connection.h       |  31 +-
 esphome/components/api/api_pb2.cpp            | 764 +++++++++++++++++-
 esphome/components/api/api_pb2.h              | 231 +++++-
 esphome/components/api/api_pb2_service.cpp    | 285 ++++++-
 esphome/components/api/api_pb2_service.h      |  95 ++-
 esphome/components/api/api_server.cpp         |  45 ++
 esphome/components/api/api_server.h           |   6 +
 esphome/components/bedjet/bedjet_hub.cpp      |  48 +-
 esphome/components/bedjet/bedjet_hub.h        |   2 -
 esphome/components/ble_client/__init__.py     |   7 +-
 esphome/components/ble_client/automation.cpp  |   6 +-
 esphome/components/ble_client/automation.h    |   3 +-
 esphome/components/ble_client/ble_client.cpp  | 409 +---------
 esphome/components/ble_client/ble_client.h    |  86 +-
 .../components/ble_client/sensor/automation.h |   3 +-
 .../ble_client/sensor/ble_sensor.cpp          |  12 +-
 .../ble_client/text_sensor/automation.h       |   3 +-
 .../text_sensor/ble_text_sensor.cpp           |  12 +-
 .../components/bluetooth_proxy/__init__.py    |  16 +-
 .../bluetooth_proxy/bluetooth_proxy.cpp       | 323 +++++++-
 .../bluetooth_proxy/bluetooth_proxy.h         |  39 +-
 .../components/esp32_ble_client/__init__.py   |  12 +
 .../esp32_ble_client/ble_characteristic.cpp   |  83 ++
 .../esp32_ble_client/ble_characteristic.h     |  35 +
 .../esp32_ble_client/ble_client_base.cpp      | 324 ++++++++
 .../esp32_ble_client/ble_client_base.h        |  72 ++
 .../esp32_ble_client/ble_descriptor.h         |  25 +
 .../esp32_ble_client/ble_service.cpp          |  66 ++
 .../components/esp32_ble_client/ble_service.h |  32 +
 .../components/esp32_ble_tracker/__init__.py  |   2 +-
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   |  37 +-
 .../esp32_ble_tracker/esp32_ble_tracker.h     |   5 +-
 esphome/components/esp32_ble_tracker/queue.h  |  10 +-
 .../display/pvvx_display.cpp                  |   5 +-
 .../radon_eye_rd200/radon_eye_rd200.cpp       |  12 +-
 esphome/const.py                              |   1 +
 44 files changed, 2818 insertions(+), 644 deletions(-)
 create mode 100644 esphome/components/esp32_ble_client/__init__.py
 create mode 100644 esphome/components/esp32_ble_client/ble_characteristic.cpp
 create mode 100644 esphome/components/esp32_ble_client/ble_characteristic.h
 create mode 100644 esphome/components/esp32_ble_client/ble_client_base.cpp
 create mode 100644 esphome/components/esp32_ble_client/ble_client_base.h
 create mode 100644 esphome/components/esp32_ble_client/ble_descriptor.h
 create mode 100644 esphome/components/esp32_ble_client/ble_service.cpp
 create mode 100644 esphome/components/esp32_ble_client/ble_service.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 69e30027a9..d95ebcce59 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -70,6 +70,7 @@ esphome/components/ektf2232/* @jesserockz
 esphome/components/ens210/* @itn3rd77
 esphome/components/esp32/* @esphome/core
 esphome/components/esp32_ble/* @jesserockz
+esphome/components/esp32_ble_client/* @jesserockz
 esphome/components/esp32_ble_server/* @jesserockz
 esphome/components/esp32_camera_web_server/* @ayufan
 esphome/components/esp32_can/* @Sympatron
diff --git a/esphome/components/airthings_wave_mini/airthings_wave_mini.cpp b/esphome/components/airthings_wave_mini/airthings_wave_mini.cpp
index 2e7a1fb024..40873ec005 100644
--- a/esphome/components/airthings_wave_mini/airthings_wave_mini.cpp
+++ b/esphome/components/airthings_wave_mini/airthings_wave_mini.cpp
@@ -38,7 +38,7 @@ void AirthingsWaveMini::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt
     }
 
     case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->conn_id)
+      if (param->read.conn_id != this->parent()->get_conn_id())
         break;
       if (param->read.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
@@ -88,8 +88,8 @@ void AirthingsWaveMini::update() {
 }
 
 void AirthingsWaveMini::request_read_values_() {
-  auto status =
-      esp_ble_gattc_read_char(this->parent()->gattc_if, this->parent()->conn_id, this->handle_, ESP_GATT_AUTH_REQ_NONE);
+  auto status = esp_ble_gattc_read_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->handle_,
+                                        ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     ESP_LOGW(TAG, "Error sending read request for sensor, status=%d", status);
   }
diff --git a/esphome/components/airthings_wave_plus/airthings_wave_plus.cpp b/esphome/components/airthings_wave_plus/airthings_wave_plus.cpp
index 02ed33b87a..11f86307fe 100644
--- a/esphome/components/airthings_wave_plus/airthings_wave_plus.cpp
+++ b/esphome/components/airthings_wave_plus/airthings_wave_plus.cpp
@@ -38,7 +38,7 @@ void AirthingsWavePlus::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt
     }
 
     case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->conn_id)
+      if (param->read.conn_id != this->parent()->get_conn_id())
         break;
       if (param->read.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
@@ -109,8 +109,8 @@ void AirthingsWavePlus::update() {
 }
 
 void AirthingsWavePlus::request_read_values_() {
-  auto status =
-      esp_ble_gattc_read_char(this->parent()->gattc_if, this->parent()->conn_id, this->handle_, ESP_GATT_AUTH_REQ_NONE);
+  auto status = esp_ble_gattc_read_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->handle_,
+                                        ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     ESP_LOGW(TAG, "Error sending read request for sensor, status=%d", status);
   }
diff --git a/esphome/components/am43/am43.cpp b/esphome/components/am43/am43.cpp
index 1c4bad64c3..9a0e5999d2 100644
--- a/esphome/components/am43/am43.cpp
+++ b/esphome/components/am43/am43.cpp
@@ -76,9 +76,9 @@ void Am43::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_i
       if (this->current_sensor_ > 0) {
         if (this->illuminance_ != nullptr) {
           auto *packet = this->encoder_->get_light_level_request();
-          auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
-                                                 packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP,
-                                                 ESP_GATT_AUTH_REQ_NONE);
+          auto status = esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(),
+                                                 this->char_handle_, packet->length, packet->data,
+                                                 ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
           if (status) {
             ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(),
                      status);
@@ -102,8 +102,8 @@ void Am43::update() {
     if (this->battery_ != nullptr) {
       auto *packet = this->encoder_->get_battery_level_request();
       auto status =
-          esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, packet->length,
-                                   packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+          esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
+                                   packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
       if (status)
         ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
     }
diff --git a/esphome/components/am43/cover/am43_cover.cpp b/esphome/components/am43/cover/am43_cover.cpp
index 39089e73c0..ba8e350732 100644
--- a/esphome/components/am43/cover/am43_cover.cpp
+++ b/esphome/components/am43/cover/am43_cover.cpp
@@ -27,8 +27,8 @@ void Am43Component::loop() {
   if (this->node_state == espbt::ClientState::ESTABLISHED && !this->logged_in_) {
     auto *packet = this->encoder_->get_send_pin_request(this->pin_);
     auto status =
-        esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, packet->length,
-                                 packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
+                                 packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
     ESP_LOGI(TAG, "[%s] Logging into AM43", this->get_name().c_str());
     if (status) {
       ESP_LOGW(TAG, "[%s] Error writing set_pin to device, error = %d", this->get_name().c_str(), status);
@@ -54,8 +54,8 @@ void Am43Component::control(const CoverCall &call) {
   if (call.get_stop()) {
     auto *packet = this->encoder_->get_stop_request();
     auto status =
-        esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, packet->length,
-                                 packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
+                                 packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
     if (status)
       ESP_LOGW(TAG, "[%s] Error writing stop command to device, error = %d", this->get_name().c_str(), status);
   }
@@ -66,8 +66,8 @@ void Am43Component::control(const CoverCall &call) {
       pos = 1 - pos;
     auto *packet = this->encoder_->get_set_position_request(100 - (uint8_t)(pos * 100));
     auto status =
-        esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, packet->length,
-                                 packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
+                                 packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
     if (status)
       ESP_LOGW(TAG, "[%s] Error writing set_position command to device, error = %d", this->get_name().c_str(), status);
   }
@@ -92,7 +92,8 @@ void Am43Component::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       }
       this->char_handle_ = chr->handle;
 
-      auto status = esp_ble_gattc_register_for_notify(this->parent_->gattc_if, this->parent_->remote_bda, chr->handle);
+      auto status = esp_ble_gattc_register_for_notify(this->parent_->get_gattc_if(), this->parent_->get_remote_bda(),
+                                                      chr->handle);
       if (status) {
         ESP_LOGW(TAG, "[%s] esp_ble_gattc_register_for_notify failed, status=%d", this->get_name().c_str(), status);
       }
@@ -122,9 +123,9 @@ void Am43Component::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
         if (this->decoder_->pin_ok_) {
           ESP_LOGI(TAG, "[%s] AM43 pin accepted.", this->get_name().c_str());
           auto *packet = this->encoder_->get_position_request();
-          auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
-                                                 packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP,
-                                                 ESP_GATT_AUTH_REQ_NONE);
+          auto status = esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(),
+                                                 this->char_handle_, packet->length, packet->data,
+                                                 ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
           if (status)
             ESP_LOGW(TAG, "[%s] Error writing set_position to device, error = %d", this->get_name().c_str(), status);
         } else {
diff --git a/esphome/components/anova/anova.cpp b/esphome/components/anova/anova.cpp
index 6c8316d338..cafd30149d 100644
--- a/esphome/components/anova/anova.cpp
+++ b/esphome/components/anova/anova.cpp
@@ -34,15 +34,17 @@ void Anova::control(const ClimateCall &call) {
         ESP_LOGW(TAG, "Unsupported mode: %d", mode);
         return;
     }
-    auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
-                                           pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+    auto status =
+        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
+                                 pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
     if (status)
       ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
   }
   if (call.get_target_temperature().has_value()) {
     auto *pkt = this->codec_->get_set_target_temp_request(*call.get_target_temperature());
-    auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
-                                           pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+    auto status =
+        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
+                                 pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
     if (status)
       ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
   }
@@ -65,7 +67,8 @@ void Anova::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_
       }
       this->char_handle_ = chr->handle;
 
-      auto status = esp_ble_gattc_register_for_notify(this->parent_->gattc_if, this->parent_->remote_bda, chr->handle);
+      auto status = esp_ble_gattc_register_for_notify(this->parent_->get_gattc_if(), this->parent_->get_remote_bda(),
+                                                      chr->handle);
       if (status) {
         ESP_LOGW(TAG, "[%s] esp_ble_gattc_register_for_notify failed, status=%d", this->get_name().c_str(), status);
       }
@@ -112,8 +115,8 @@ void Anova::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_
         }
         if (pkt != nullptr) {
           auto status =
-              esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, pkt->length,
-                                       pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+              esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
+                                       pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
           if (status) {
             ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(),
                      status);
@@ -137,8 +140,9 @@ void Anova::update() {
     auto *pkt = this->codec_->get_read_device_status_request();
     if (this->current_request_ == 0)
       this->codec_->get_set_unit_request(this->fahrenheit_ ? 'f' : 'c');
-    auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
-                                           pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+    auto status =
+        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
+                                 pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
     if (status)
       ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
     this->current_request_++;
diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index c6cde8b038..9fa77d2daa 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -27,7 +27,6 @@ service APIConnection {
   rpc subscribe_logs (SubscribeLogsRequest) returns (void) {}
   rpc subscribe_homeassistant_services (SubscribeHomeassistantServicesRequest) returns (void) {}
   rpc subscribe_home_assistant_states (SubscribeHomeAssistantStatesRequest) returns (void) {}
-  rpc subscribe_bluetooth_le_advertisements (SubscribeBluetoothLEAdvertisementsRequest) returns (void) {}
   rpc get_time (GetTimeRequest) returns (GetTimeResponse) {
     option (needs_authentication) = false;
   }
@@ -44,6 +43,16 @@ service APIConnection {
   rpc button_command (ButtonCommandRequest) returns (void) {}
   rpc lock_command (LockCommandRequest) returns (void) {}
   rpc media_player_command (MediaPlayerCommandRequest) returns (void) {}
+
+  rpc subscribe_bluetooth_le_advertisements(SubscribeBluetoothLEAdvertisementsRequest) returns (void) {}
+  rpc bluetooth_device_request(BluetoothDeviceRequest) returns (void) {}
+  rpc bluetooth_gatt_get_services(BluetoothGATTGetServicesRequest) returns (void) {}
+  rpc bluetooth_gatt_read(BluetoothGATTReadRequest) returns (void) {}
+  rpc bluetooth_gatt_write(BluetoothGATTWriteRequest) returns (void) {}
+  rpc bluetooth_gatt_read_descriptor(BluetoothGATTReadDescriptorRequest) returns (void) {}
+  rpc bluetooth_gatt_write_descriptor(BluetoothGATTWriteDescriptorRequest) returns (void) {}
+  rpc bluetooth_gatt_notify(BluetoothGATTNotifyRequest) returns (void) {}
+  rpc subscribe_bluetooth_connections_free(SubscribeBluetoothConnectionsFreeRequest) returns (BluetoothConnectionsFreeResponse) {}
 }
 
 
@@ -78,6 +87,8 @@ message HelloRequest {
   // Not strictly necessary to send but nice for debugging
   // purposes.
   string client_info = 1;
+  uint32 api_version_major = 2;
+  uint32 api_version_minor = 3;
 }
 
 // Confirmation of successful connection request.
@@ -192,7 +203,7 @@ message DeviceInfoResponse {
 
   uint32 webserver_port = 10;
 
-  bool has_bluetooth_proxy = 11;
+  uint32 bluetooth_proxy_version = 11;
 }
 
 message ListEntitiesRequest {
@@ -1111,7 +1122,8 @@ message SubscribeBluetoothLEAdvertisementsRequest {
 
 message BluetoothServiceData {
   string uuid = 1;
-  repeated uint32 data = 2 [packed=false];
+  repeated uint32 legacy_data = 2 [deprecated = true];
+  bytes data = 3; // Changed in proto version 1.7
 }
 message BluetoothLEAdvertisementResponse {
   option (id) = 67;
@@ -1127,3 +1139,162 @@ message BluetoothLEAdvertisementResponse {
   repeated BluetoothServiceData service_data = 5;
   repeated BluetoothServiceData manufacturer_data = 6;
 }
+
+enum BluetoothDeviceRequestType {
+  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT = 0;
+  BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT = 1;
+  BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR = 2;
+  BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR = 3;
+}
+
+message BluetoothDeviceRequest {
+  option (id) = 68;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  BluetoothDeviceRequestType request_type = 2;
+}
+
+message BluetoothDeviceConnectionResponse {
+  option (id) = 69;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  bool connected = 2;
+  uint32 mtu = 3;
+  int32 error = 4;
+}
+
+message BluetoothGATTGetServicesRequest {
+  option (id) = 70;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+}
+
+message BluetoothGATTDescriptor {
+  repeated uint64 uuid = 1;
+  uint32 handle = 2;
+}
+
+message BluetoothGATTCharacteristic {
+  repeated uint64 uuid = 1;
+  uint32 handle = 2;
+  uint32 properties = 3;
+  repeated BluetoothGATTDescriptor descriptors = 4;
+}
+
+message BluetoothGATTService {
+  repeated uint64 uuid = 1;
+  uint32 handle = 2;
+  repeated BluetoothGATTCharacteristic characteristics = 3;
+}
+
+message BluetoothGATTGetServicesResponse {
+  option (id) = 71;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  repeated BluetoothGATTService services = 2;
+}
+
+message BluetoothGATTGetServicesDoneResponse {
+  option (id) = 72;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+}
+
+message BluetoothGATTReadRequest {
+  option (id) = 73;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+}
+
+message BluetoothGATTReadResponse {
+  option (id) = 74;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+
+  bytes data = 3;
+
+}
+
+message BluetoothGATTWriteRequest {
+  option (id) = 75;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+  bool response = 3;
+
+  bytes data = 4;
+}
+
+message BluetoothGATTReadDescriptorRequest {
+  option (id) = 76;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+}
+
+message BluetoothGATTWriteDescriptorRequest {
+  option (id) = 77;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+
+  bytes data = 3;
+}
+
+message BluetoothGATTNotifyRequest {
+  option (id) = 78;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+  bool enable = 3;
+}
+
+message BluetoothGATTNotifyDataResponse {
+  option (id) = 79;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+
+  bytes data = 3;
+}
+
+message SubscribeBluetoothConnectionsFreeRequest {
+  option (id) = 80;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+}
+
+message BluetoothConnectionsFreeResponse {
+  option (id) = 81;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint32 free = 1;
+  uint32 limit = 2;
+}
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index a3b000c778..1dbf0abec4 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -1,10 +1,10 @@
 #include "api_connection.h"
-#include "esphome/core/entity_base.h"
-#include "esphome/core/log.h"
-#include "esphome/components/network/util.h"
-#include "esphome/core/version.h"
-#include "esphome/core/hal.h"
 #include <cerrno>
+#include "esphome/components/network/util.h"
+#include "esphome/core/entity_base.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+#include "esphome/core/version.h"
 
 #ifdef USE_DEEP_SLEEP
 #include "esphome/components/deep_sleep/deep_sleep_component.h"
@@ -12,6 +12,9 @@
 #ifdef USE_HOMEASSISTANT_TIME
 #include "esphome/components/homeassistant/time/homeassistant_time.h"
 #endif
+#ifdef USE_BLUETOOTH_PROXY
+#include "esphome/components/bluetooth_proxy/bluetooth_proxy.h"
+#endif
 
 namespace esphome {
 namespace api {
@@ -823,6 +826,56 @@ void APIConnection::on_get_time_response(const GetTimeResponse &value) {
 }
 #endif
 
+#ifdef USE_BLUETOOTH_PROXY
+bool APIConnection::send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &msg) {
+  if (!this->bluetooth_le_advertisement_subscription_)
+    return false;
+  if (this->client_api_version_major_ < 1 || this->client_api_version_minor_ < 7) {
+    BluetoothLEAdvertisementResponse resp = msg;
+    for (auto &service : resp.service_data) {
+      service.legacy_data.assign(service.data.begin(), service.data.end());
+      service.data.clear();
+    }
+    for (auto &manufacturer_data : resp.manufacturer_data) {
+      manufacturer_data.legacy_data.assign(manufacturer_data.data.begin(), manufacturer_data.data.end());
+      manufacturer_data.data.clear();
+    }
+    return this->send_bluetooth_le_advertisement_response(resp);
+  }
+  return this->send_bluetooth_le_advertisement_response(msg);
+}
+void APIConnection::bluetooth_device_request(const BluetoothDeviceRequest &msg) {
+  bluetooth_proxy::global_bluetooth_proxy->bluetooth_device_request(msg);
+}
+void APIConnection::bluetooth_gatt_read(const BluetoothGATTReadRequest &msg) {
+  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_read(msg);
+}
+void APIConnection::bluetooth_gatt_write(const BluetoothGATTWriteRequest &msg) {
+  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_write(msg);
+}
+void APIConnection::bluetooth_gatt_read_descriptor(const BluetoothGATTReadDescriptorRequest &msg) {
+  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_read_descriptor(msg);
+}
+void APIConnection::bluetooth_gatt_write_descriptor(const BluetoothGATTWriteDescriptorRequest &msg) {
+  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_write_descriptor(msg);
+}
+void APIConnection::bluetooth_gatt_get_services(const BluetoothGATTGetServicesRequest &msg) {
+  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_send_services(msg);
+}
+
+void APIConnection::bluetooth_gatt_notify(const BluetoothGATTNotifyRequest &msg) {
+  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_notify(msg);
+}
+
+BluetoothConnectionsFreeResponse APIConnection::subscribe_bluetooth_connections_free(
+    const SubscribeBluetoothConnectionsFreeRequest &msg) {
+  BluetoothConnectionsFreeResponse resp;
+  resp.free = bluetooth_proxy::global_bluetooth_proxy->get_bluetooth_connections_free();
+  resp.limit = bluetooth_proxy::global_bluetooth_proxy->get_bluetooth_connections_limit();
+  return resp;
+}
+#endif
+
 bool APIConnection::send_log_message(int level, const char *tag, const char *line) {
   if (this->log_subscription_ < level)
     return false;
@@ -840,11 +893,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_);
-  ESP_LOGV(TAG, "Hello from client: '%s'", this->client_info_.c_str());
+  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 %d.%d", this->client_info_.c_str(),
+           this->client_api_version_major_, this->client_api_version_minor_);
 
   HelloResponse resp;
   resp.api_version_major = 1;
-  resp.api_version_minor = 6;
+  resp.api_version_minor = 7;
   resp.server_info = App.get_name() + " (esphome v" ESPHOME_VERSION ")";
   resp.name = App.get_name();
 
@@ -888,7 +944,7 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
   resp.webserver_port = USE_WEBSERVER_PORT;
 #endif
 #ifdef USE_BLUETOOTH_PROXY
-  resp.has_bluetooth_proxy = true;
+  resp.bluetooth_proxy_version = bluetooth_proxy::global_bluetooth_proxy->has_active() ? 2 : 1;
 #endif
   return resp;
 }
diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h
index dcf8bacad2..028fb80175 100644
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -1,15 +1,11 @@
 #pragma once
 
-#include "esphome/core/component.h"
-#include "esphome/core/application.h"
+#include "api_frame_helper.h"
 #include "api_pb2.h"
 #include "api_pb2_service.h"
 #include "api_server.h"
-#include "api_frame_helper.h"
-
-#ifdef USE_BLUETOOTH_PROXY
-#include "esphome/components/bluetooth_proxy/bluetooth_proxy.h"
-#endif
+#include "esphome/core/application.h"
+#include "esphome/core/component.h"
 
 namespace esphome {
 namespace api {
@@ -99,11 +95,18 @@ class APIConnection : public APIServerConnection {
     this->send_homeassistant_service_response(call);
   }
 #ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &call) {
-    if (!this->bluetooth_le_advertisement_subscription_)
-      return false;
-    return this->send_bluetooth_le_advertisement_response(call);
-  }
+  bool send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &msg);
+
+  void bluetooth_device_request(const BluetoothDeviceRequest &msg) override;
+  void bluetooth_gatt_read(const BluetoothGATTReadRequest &msg) override;
+  void bluetooth_gatt_write(const BluetoothGATTWriteRequest &msg) override;
+  void bluetooth_gatt_read_descriptor(const BluetoothGATTReadDescriptorRequest &msg) override;
+  void bluetooth_gatt_write_descriptor(const BluetoothGATTWriteDescriptorRequest &msg) override;
+  void bluetooth_gatt_get_services(const BluetoothGATTGetServicesRequest &msg) override;
+  void bluetooth_gatt_notify(const BluetoothGATTNotifyRequest &msg) override;
+  BluetoothConnectionsFreeResponse subscribe_bluetooth_connections_free(
+      const SubscribeBluetoothConnectionsFreeRequest &msg) override;
+
 #endif
 #ifdef USE_HOMEASSISTANT_TIME
   void send_time_request() {
@@ -181,6 +184,8 @@ class APIConnection : public APIServerConnection {
   std::unique_ptr<APIFrameHelper> helper_;
 
   std::string client_info_;
+  uint32_t client_api_version_major_{0};
+  uint32_t client_api_version_minor_{0};
 #ifdef USE_ESP32_CAMERA
   esp32_camera::CameraImageReader image_reader_;
 #endif
@@ -190,7 +195,7 @@ class APIConnection : public APIServerConnection {
   uint32_t last_traffic_;
   bool sent_ping_{false};
   bool service_call_subscription_{false};
-  bool bluetooth_le_advertisement_subscription_{true};
+  bool bluetooth_le_advertisement_subscription_{false};
   bool next_close_ = false;
   APIServer *parent_;
   InitialStateIterator initial_state_iterator_;
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 13969fce76..73d8044cde 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -340,6 +340,35 @@ template<> const char *proto_enum_to_string<enums::MediaPlayerCommand>(enums::Me
       return "UNKNOWN";
   }
 }
+template<>
+const char *proto_enum_to_string<enums::BluetoothDeviceRequestType>(enums::BluetoothDeviceRequestType value) {
+  switch (value) {
+    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT:
+      return "BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT";
+    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT:
+      return "BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT";
+    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR:
+      return "BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR";
+    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR:
+      return "BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR";
+    default:
+      return "UNKNOWN";
+  }
+}
+bool HelloRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 2: {
+      this->api_version_major = value.as_uint32();
+      return true;
+    }
+    case 3: {
+      this->api_version_minor = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
 bool HelloRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
     case 1: {
@@ -350,7 +379,11 @@ bool HelloRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value)
       return false;
   }
 }
-void HelloRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_string(1, this->client_info); }
+void HelloRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_string(1, this->client_info);
+  buffer.encode_uint32(2, this->api_version_major);
+  buffer.encode_uint32(3, this->api_version_minor);
+}
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void HelloRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
@@ -358,6 +391,16 @@ void HelloRequest::dump_to(std::string &out) const {
   out.append("  client_info: ");
   out.append("'").append(this->client_info).append("'");
   out.append("\n");
+
+  out.append("  api_version_major: ");
+  sprintf(buffer, "%u", this->api_version_major);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  api_version_minor: ");
+  sprintf(buffer, "%u", this->api_version_minor);
+  out.append(buffer);
+  out.append("\n");
   out.append("}");
 }
 #endif
@@ -496,7 +539,7 @@ bool DeviceInfoResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
       return true;
     }
     case 11: {
-      this->has_bluetooth_proxy = value.as_bool();
+      this->bluetooth_proxy_version = value.as_uint32();
       return true;
     }
     default:
@@ -548,7 +591,7 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(8, this->project_name);
   buffer.encode_string(9, this->project_version);
   buffer.encode_uint32(10, this->webserver_port);
-  buffer.encode_bool(11, this->has_bluetooth_proxy);
+  buffer.encode_uint32(11, this->bluetooth_proxy_version);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DeviceInfoResponse::dump_to(std::string &out) const {
@@ -595,8 +638,9 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
-  out.append("  has_bluetooth_proxy: ");
-  out.append(YESNO(this->has_bluetooth_proxy));
+  out.append("  bluetooth_proxy_version: ");
+  sprintf(buffer, "%u", this->bluetooth_proxy_version);
+  out.append(buffer);
   out.append("\n");
   out.append("}");
 }
@@ -4872,7 +4916,7 @@ void SubscribeBluetoothLEAdvertisementsRequest::dump_to(std::string &out) const
 bool BluetoothServiceData::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 2: {
-      this->data.push_back(value.as_uint32());
+      this->legacy_data.push_back(value.as_uint32());
       return true;
     }
     default:
@@ -4885,15 +4929,20 @@ bool BluetoothServiceData::decode_length(uint32_t field_id, ProtoLengthDelimited
       this->uuid = value.as_string();
       return true;
     }
+    case 3: {
+      this->data = value.as_string();
+      return true;
+    }
     default:
       return false;
   }
 }
 void BluetoothServiceData::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->uuid);
-  for (auto &it : this->data) {
+  for (auto &it : this->legacy_data) {
     buffer.encode_uint32(2, it, true);
   }
+  buffer.encode_string(3, this->data);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothServiceData::dump_to(std::string &out) const {
@@ -4903,12 +4952,16 @@ void BluetoothServiceData::dump_to(std::string &out) const {
   out.append("'").append(this->uuid).append("'");
   out.append("\n");
 
-  for (const auto &it : this->data) {
-    out.append("  data: ");
+  for (const auto &it : this->legacy_data) {
+    out.append("  legacy_data: ");
     sprintf(buffer, "%u", it);
     out.append(buffer);
     out.append("\n");
   }
+
+  out.append("  data: ");
+  out.append("'").append(this->data).append("'");
+  out.append("\n");
   out.append("}");
 }
 #endif
@@ -5000,6 +5053,699 @@ void BluetoothLEAdvertisementResponse::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
+bool BluetoothDeviceRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->request_type = value.as_enum<enums::BluetoothDeviceRequestType>();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothDeviceRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_enum<enums::BluetoothDeviceRequestType>(2, this->request_type);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothDeviceRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothDeviceRequest {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  request_type: ");
+  out.append(proto_enum_to_string<enums::BluetoothDeviceRequestType>(this->request_type));
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothDeviceConnectionResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->connected = value.as_bool();
+      return true;
+    }
+    case 3: {
+      this->mtu = value.as_uint32();
+      return true;
+    }
+    case 4: {
+      this->error = value.as_int32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothDeviceConnectionResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_bool(2, this->connected);
+  buffer.encode_uint32(3, this->mtu);
+  buffer.encode_int32(4, this->error);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothDeviceConnectionResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothDeviceConnectionResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  connected: ");
+  out.append(YESNO(this->connected));
+  out.append("\n");
+
+  out.append("  mtu: ");
+  sprintf(buffer, "%u", this->mtu);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  error: ");
+  sprintf(buffer, "%d", this->error);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTGetServicesRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTGetServicesRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_uint64(1, this->address); }
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTGetServicesRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTGetServicesRequest {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTDescriptor::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->uuid.push_back(value.as_uint64());
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTDescriptor::encode(ProtoWriteBuffer buffer) const {
+  for (auto &it : this->uuid) {
+    buffer.encode_uint64(1, it, true);
+  }
+  buffer.encode_uint32(2, this->handle);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTDescriptor::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTDescriptor {\n");
+  for (const auto &it : this->uuid) {
+    out.append("  uuid: ");
+    sprintf(buffer, "%llu", it);
+    out.append(buffer);
+    out.append("\n");
+  }
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTCharacteristic::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->uuid.push_back(value.as_uint64());
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    case 3: {
+      this->properties = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool BluetoothGATTCharacteristic::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 4: {
+      this->descriptors.push_back(value.as_message<BluetoothGATTDescriptor>());
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTCharacteristic::encode(ProtoWriteBuffer buffer) const {
+  for (auto &it : this->uuid) {
+    buffer.encode_uint64(1, it, true);
+  }
+  buffer.encode_uint32(2, this->handle);
+  buffer.encode_uint32(3, this->properties);
+  for (auto &it : this->descriptors) {
+    buffer.encode_message<BluetoothGATTDescriptor>(4, it, true);
+  }
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTCharacteristic::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTCharacteristic {\n");
+  for (const auto &it : this->uuid) {
+    out.append("  uuid: ");
+    sprintf(buffer, "%llu", it);
+    out.append(buffer);
+    out.append("\n");
+  }
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  properties: ");
+  sprintf(buffer, "%u", this->properties);
+  out.append(buffer);
+  out.append("\n");
+
+  for (const auto &it : this->descriptors) {
+    out.append("  descriptors: ");
+    it.dump_to(out);
+    out.append("\n");
+  }
+  out.append("}");
+}
+#endif
+bool BluetoothGATTService::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->uuid.push_back(value.as_uint64());
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool BluetoothGATTService::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 3: {
+      this->characteristics.push_back(value.as_message<BluetoothGATTCharacteristic>());
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTService::encode(ProtoWriteBuffer buffer) const {
+  for (auto &it : this->uuid) {
+    buffer.encode_uint64(1, it, true);
+  }
+  buffer.encode_uint32(2, this->handle);
+  for (auto &it : this->characteristics) {
+    buffer.encode_message<BluetoothGATTCharacteristic>(3, it, true);
+  }
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTService::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTService {\n");
+  for (const auto &it : this->uuid) {
+    out.append("  uuid: ");
+    sprintf(buffer, "%llu", it);
+    out.append(buffer);
+    out.append("\n");
+  }
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+
+  for (const auto &it : this->characteristics) {
+    out.append("  characteristics: ");
+    it.dump_to(out);
+    out.append("\n");
+  }
+  out.append("}");
+}
+#endif
+bool BluetoothGATTGetServicesResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool BluetoothGATTGetServicesResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 2: {
+      this->services.push_back(value.as_message<BluetoothGATTService>());
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTGetServicesResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  for (auto &it : this->services) {
+    buffer.encode_message<BluetoothGATTService>(2, it, true);
+  }
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTGetServicesResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTGetServicesResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  for (const auto &it : this->services) {
+    out.append("  services: ");
+    it.dump_to(out);
+    out.append("\n");
+  }
+  out.append("}");
+}
+#endif
+bool BluetoothGATTGetServicesDoneResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTGetServicesDoneResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTGetServicesDoneResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTGetServicesDoneResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTReadRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTReadRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTReadRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTReadRequest {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTReadResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool BluetoothGATTReadResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 3: {
+      this->data = value.as_string();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTReadResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+  buffer.encode_string(3, this->data);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTReadResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTReadResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  data: ");
+  out.append("'").append(this->data).append("'");
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTWriteRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    case 3: {
+      this->response = value.as_bool();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool BluetoothGATTWriteRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 4: {
+      this->data = value.as_string();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTWriteRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+  buffer.encode_bool(3, this->response);
+  buffer.encode_string(4, this->data);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTWriteRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTWriteRequest {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  response: ");
+  out.append(YESNO(this->response));
+  out.append("\n");
+
+  out.append("  data: ");
+  out.append("'").append(this->data).append("'");
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTReadDescriptorRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTReadDescriptorRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTReadDescriptorRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTReadDescriptorRequest {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTWriteDescriptorRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool BluetoothGATTWriteDescriptorRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 3: {
+      this->data = value.as_string();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTWriteDescriptorRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+  buffer.encode_string(3, this->data);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTWriteDescriptorRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTWriteDescriptorRequest {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  data: ");
+  out.append("'").append(this->data).append("'");
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTNotifyRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    case 3: {
+      this->enable = value.as_bool();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTNotifyRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+  buffer.encode_bool(3, this->enable);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTNotifyRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTNotifyRequest {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  enable: ");
+  out.append(YESNO(this->enable));
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTNotifyDataResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool BluetoothGATTNotifyDataResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 3: {
+      this->data = value.as_string();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTNotifyDataResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+  buffer.encode_string(3, this->data);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTNotifyDataResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTNotifyDataResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  data: ");
+  out.append("'").append(this->data).append("'");
+  out.append("\n");
+  out.append("}");
+}
+#endif
+void SubscribeBluetoothConnectionsFreeRequest::encode(ProtoWriteBuffer buffer) const {}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void SubscribeBluetoothConnectionsFreeRequest::dump_to(std::string &out) const {
+  out.append("SubscribeBluetoothConnectionsFreeRequest {}");
+}
+#endif
+bool BluetoothConnectionsFreeResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->free = value.as_uint32();
+      return true;
+    }
+    case 2: {
+      this->limit = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothConnectionsFreeResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint32(1, this->free);
+  buffer.encode_uint32(2, this->limit);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothConnectionsFreeResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothConnectionsFreeResponse {\n");
+  out.append("  free: ");
+  sprintf(buffer, "%u", this->free);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  limit: ");
+  sprintf(buffer, "%u", this->limit);
+  out.append(buffer);
+  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 2093f93ee7..325e9a23c3 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -155,12 +155,20 @@ enum MediaPlayerCommand : uint32_t {
   MEDIA_PLAYER_COMMAND_MUTE = 3,
   MEDIA_PLAYER_COMMAND_UNMUTE = 4,
 };
+enum BluetoothDeviceRequestType : uint32_t {
+  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT = 0,
+  BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT = 1,
+  BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR = 2,
+  BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR = 3,
+};
 
 }  // namespace enums
 
 class HelloRequest : public ProtoMessage {
  public:
   std::string client_info{};
+  uint32_t api_version_major{0};
+  uint32_t api_version_minor{0};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -168,6 +176,7 @@ class HelloRequest : public ProtoMessage {
 
  protected:
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
 class HelloResponse : public ProtoMessage {
  public:
@@ -263,7 +272,7 @@ class DeviceInfoResponse : public ProtoMessage {
   std::string project_name{};
   std::string project_version{};
   uint32_t webserver_port{0};
-  bool has_bluetooth_proxy{false};
+  uint32_t bluetooth_proxy_version{0};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1227,7 +1236,8 @@ class SubscribeBluetoothLEAdvertisementsRequest : public ProtoMessage {
 class BluetoothServiceData : public ProtoMessage {
  public:
   std::string uuid{};
-  std::vector<uint32_t> data{};
+  std::vector<uint32_t> legacy_data{};
+  std::string data{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1254,6 +1264,223 @@ class BluetoothLEAdvertisementResponse : public ProtoMessage {
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
   bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
+class BluetoothDeviceRequest : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  enums::BluetoothDeviceRequestType request_type{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothDeviceConnectionResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  bool connected{false};
+  uint32_t mtu{0};
+  int32_t error{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTGetServicesRequest : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTDescriptor : public ProtoMessage {
+ public:
+  std::vector<uint64_t> uuid{};
+  uint32_t handle{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTCharacteristic : public ProtoMessage {
+ public:
+  std::vector<uint64_t> uuid{};
+  uint32_t handle{0};
+  uint32_t properties{0};
+  std::vector<BluetoothGATTDescriptor> descriptors{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTService : public ProtoMessage {
+ public:
+  std::vector<uint64_t> uuid{};
+  uint32_t handle{0};
+  std::vector<BluetoothGATTCharacteristic> characteristics{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTGetServicesResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  std::vector<BluetoothGATTService> services{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTGetServicesDoneResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTReadRequest : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTReadResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  std::string data{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTWriteRequest : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  bool response{false};
+  std::string data{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTReadDescriptorRequest : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTWriteDescriptorRequest : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  std::string data{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTNotifyRequest : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  bool enable{false};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTNotifyDataResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  std::string data{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class SubscribeBluetoothConnectionsFreeRequest : public ProtoMessage {
+ public:
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+};
+class BluetoothConnectionsFreeResponse : public ProtoMessage {
+ public:
+  uint32_t free{0};
+  uint32_t limit{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt 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 6932675c41..7bfe1acf48 100644
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -336,6 +336,71 @@ bool APIServerConnectionBase::send_bluetooth_le_advertisement_response(const Blu
   return this->send_message_<BluetoothLEAdvertisementResponse>(msg, 67);
 }
 #endif
+#ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_device_connection_response(const BluetoothDeviceConnectionResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_device_connection_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothDeviceConnectionResponse>(msg, 69);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_gatt_get_services_response(const BluetoothGATTGetServicesResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_gatt_get_services_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothGATTGetServicesResponse>(msg, 71);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_gatt_get_services_done_response(
+    const BluetoothGATTGetServicesDoneResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_gatt_get_services_done_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothGATTGetServicesDoneResponse>(msg, 72);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_gatt_read_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothGATTReadResponse>(msg, 74);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_gatt_notify_data_response(const BluetoothGATTNotifyDataResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_gatt_notify_data_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothGATTNotifyDataResponse>(msg, 79);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_connections_free_response(const BluetoothConnectionsFreeResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_connections_free_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothConnectionsFreeResponse>(msg, 81);
+}
+#endif
 bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
   switch (msg_type) {
     case 1: {
@@ -612,6 +677,94 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
       this->on_subscribe_bluetooth_le_advertisements_request(msg);
       break;
     }
+    case 68: {
+#ifdef USE_BLUETOOTH_PROXY
+      BluetoothDeviceRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_bluetooth_device_request: %s", msg.dump().c_str());
+#endif
+      this->on_bluetooth_device_request(msg);
+#endif
+      break;
+    }
+    case 70: {
+#ifdef USE_BLUETOOTH_PROXY
+      BluetoothGATTGetServicesRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_get_services_request: %s", msg.dump().c_str());
+#endif
+      this->on_bluetooth_gatt_get_services_request(msg);
+#endif
+      break;
+    }
+    case 73: {
+#ifdef USE_BLUETOOTH_PROXY
+      BluetoothGATTReadRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_read_request: %s", msg.dump().c_str());
+#endif
+      this->on_bluetooth_gatt_read_request(msg);
+#endif
+      break;
+    }
+    case 75: {
+#ifdef USE_BLUETOOTH_PROXY
+      BluetoothGATTWriteRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_write_request: %s", msg.dump().c_str());
+#endif
+      this->on_bluetooth_gatt_write_request(msg);
+#endif
+      break;
+    }
+    case 76: {
+#ifdef USE_BLUETOOTH_PROXY
+      BluetoothGATTReadDescriptorRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_read_descriptor_request: %s", msg.dump().c_str());
+#endif
+      this->on_bluetooth_gatt_read_descriptor_request(msg);
+#endif
+      break;
+    }
+    case 77: {
+#ifdef USE_BLUETOOTH_PROXY
+      BluetoothGATTWriteDescriptorRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_write_descriptor_request: %s", msg.dump().c_str());
+#endif
+      this->on_bluetooth_gatt_write_descriptor_request(msg);
+#endif
+      break;
+    }
+    case 78: {
+#ifdef USE_BLUETOOTH_PROXY
+      BluetoothGATTNotifyRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_notify_request: %s", msg.dump().c_str());
+#endif
+      this->on_bluetooth_gatt_notify_request(msg);
+#endif
+      break;
+    }
+    case 80: {
+#ifdef USE_BLUETOOTH_PROXY
+      SubscribeBluetoothConnectionsFreeRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_subscribe_bluetooth_connections_free_request: %s", msg.dump().c_str());
+#endif
+      this->on_subscribe_bluetooth_connections_free_request(msg);
+#endif
+      break;
+    }
     default:
       return false;
   }
@@ -708,18 +861,6 @@ void APIServerConnection::on_subscribe_home_assistant_states_request(const Subsc
   }
   this->subscribe_home_assistant_states(msg);
 }
-void APIServerConnection::on_subscribe_bluetooth_le_advertisements_request(
-    const SubscribeBluetoothLEAdvertisementsRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->subscribe_bluetooth_le_advertisements(msg);
-}
 void APIServerConnection::on_get_time_request(const GetTimeRequest &msg) {
   if (!this->is_connection_setup()) {
     this->on_no_setup_connection();
@@ -884,6 +1025,126 @@ void APIServerConnection::on_media_player_command_request(const MediaPlayerComma
   this->media_player_command(msg);
 }
 #endif
+void APIServerConnection::on_subscribe_bluetooth_le_advertisements_request(
+    const SubscribeBluetoothLEAdvertisementsRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->subscribe_bluetooth_le_advertisements(msg);
+}
+#ifdef USE_BLUETOOTH_PROXY
+void APIServerConnection::on_bluetooth_device_request(const BluetoothDeviceRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->bluetooth_device_request(msg);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+void APIServerConnection::on_bluetooth_gatt_get_services_request(const BluetoothGATTGetServicesRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->bluetooth_gatt_get_services(msg);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+void APIServerConnection::on_bluetooth_gatt_read_request(const BluetoothGATTReadRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->bluetooth_gatt_read(msg);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+void APIServerConnection::on_bluetooth_gatt_write_request(const BluetoothGATTWriteRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->bluetooth_gatt_write(msg);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+void APIServerConnection::on_bluetooth_gatt_read_descriptor_request(const BluetoothGATTReadDescriptorRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->bluetooth_gatt_read_descriptor(msg);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+void APIServerConnection::on_bluetooth_gatt_write_descriptor_request(const BluetoothGATTWriteDescriptorRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->bluetooth_gatt_write_descriptor(msg);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+void APIServerConnection::on_bluetooth_gatt_notify_request(const BluetoothGATTNotifyRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->bluetooth_gatt_notify(msg);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+void APIServerConnection::on_subscribe_bluetooth_connections_free_request(
+    const SubscribeBluetoothConnectionsFreeRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  BluetoothConnectionsFreeResponse ret = this->subscribe_bluetooth_connections_free(msg);
+  if (!this->send_bluetooth_connections_free_response(ret)) {
+    this->on_fatal_error();
+  }
+}
+#endif
 
 }  // namespace api
 }  // namespace esphome
diff --git a/esphome/components/api/api_pb2_service.h b/esphome/components/api/api_pb2_service.h
index 49426d1bbc..c7ef1468d8 100644
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -158,6 +158,48 @@ class APIServerConnectionBase : public ProtoService {
       const SubscribeBluetoothLEAdvertisementsRequest &value){};
 #ifdef USE_BLUETOOTH_PROXY
   bool send_bluetooth_le_advertisement_response(const BluetoothLEAdvertisementResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void on_bluetooth_device_request(const BluetoothDeviceRequest &value){};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_device_connection_response(const BluetoothDeviceConnectionResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void on_bluetooth_gatt_get_services_request(const BluetoothGATTGetServicesRequest &value){};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_gatt_get_services_response(const BluetoothGATTGetServicesResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_gatt_get_services_done_response(const BluetoothGATTGetServicesDoneResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void on_bluetooth_gatt_read_request(const BluetoothGATTReadRequest &value){};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void on_bluetooth_gatt_write_request(const BluetoothGATTWriteRequest &value){};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void on_bluetooth_gatt_read_descriptor_request(const BluetoothGATTReadDescriptorRequest &value){};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void on_bluetooth_gatt_write_descriptor_request(const BluetoothGATTWriteDescriptorRequest &value){};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void on_bluetooth_gatt_notify_request(const BluetoothGATTNotifyRequest &value){};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_gatt_notify_data_response(const BluetoothGATTNotifyDataResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void on_subscribe_bluetooth_connections_free_request(const SubscribeBluetoothConnectionsFreeRequest &value){};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_connections_free_response(const BluetoothConnectionsFreeResponse &msg);
 #endif
  protected:
   bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
@@ -175,7 +217,6 @@ class APIServerConnection : public APIServerConnectionBase {
   virtual void subscribe_logs(const SubscribeLogsRequest &msg) = 0;
   virtual void subscribe_homeassistant_services(const SubscribeHomeassistantServicesRequest &msg) = 0;
   virtual void subscribe_home_assistant_states(const SubscribeHomeAssistantStatesRequest &msg) = 0;
-  virtual void subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) = 0;
   virtual GetTimeResponse get_time(const GetTimeRequest &msg) = 0;
   virtual void execute_service(const ExecuteServiceRequest &msg) = 0;
 #ifdef USE_COVER
@@ -210,6 +251,32 @@ class APIServerConnection : public APIServerConnectionBase {
 #endif
 #ifdef USE_MEDIA_PLAYER
   virtual void media_player_command(const MediaPlayerCommandRequest &msg) = 0;
+#endif
+  virtual void subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) = 0;
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void bluetooth_device_request(const BluetoothDeviceRequest &msg) = 0;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void bluetooth_gatt_get_services(const BluetoothGATTGetServicesRequest &msg) = 0;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void bluetooth_gatt_read(const BluetoothGATTReadRequest &msg) = 0;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void bluetooth_gatt_write(const BluetoothGATTWriteRequest &msg) = 0;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void bluetooth_gatt_read_descriptor(const BluetoothGATTReadDescriptorRequest &msg) = 0;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void bluetooth_gatt_write_descriptor(const BluetoothGATTWriteDescriptorRequest &msg) = 0;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void bluetooth_gatt_notify(const BluetoothGATTNotifyRequest &msg) = 0;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual BluetoothConnectionsFreeResponse subscribe_bluetooth_connections_free(
+      const SubscribeBluetoothConnectionsFreeRequest &msg) = 0;
 #endif
  protected:
   void on_hello_request(const HelloRequest &msg) override;
@@ -222,7 +289,6 @@ class APIServerConnection : public APIServerConnectionBase {
   void on_subscribe_logs_request(const SubscribeLogsRequest &msg) override;
   void on_subscribe_homeassistant_services_request(const SubscribeHomeassistantServicesRequest &msg) override;
   void on_subscribe_home_assistant_states_request(const SubscribeHomeAssistantStatesRequest &msg) override;
-  void on_subscribe_bluetooth_le_advertisements_request(const SubscribeBluetoothLEAdvertisementsRequest &msg) override;
   void on_get_time_request(const GetTimeRequest &msg) override;
   void on_execute_service_request(const ExecuteServiceRequest &msg) override;
 #ifdef USE_COVER
@@ -257,6 +323,31 @@ class APIServerConnection : public APIServerConnectionBase {
 #endif
 #ifdef USE_MEDIA_PLAYER
   void on_media_player_command_request(const MediaPlayerCommandRequest &msg) override;
+#endif
+  void on_subscribe_bluetooth_le_advertisements_request(const SubscribeBluetoothLEAdvertisementsRequest &msg) override;
+#ifdef USE_BLUETOOTH_PROXY
+  void on_bluetooth_device_request(const BluetoothDeviceRequest &msg) override;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  void on_bluetooth_gatt_get_services_request(const BluetoothGATTGetServicesRequest &msg) override;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  void on_bluetooth_gatt_read_request(const BluetoothGATTReadRequest &msg) override;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  void on_bluetooth_gatt_write_request(const BluetoothGATTWriteRequest &msg) override;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  void on_bluetooth_gatt_read_descriptor_request(const BluetoothGATTReadDescriptorRequest &msg) override;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  void on_bluetooth_gatt_write_descriptor_request(const BluetoothGATTWriteDescriptorRequest &msg) override;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  void on_bluetooth_gatt_notify_request(const BluetoothGATTNotifyRequest &msg) override;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  void on_subscribe_bluetooth_connections_free_request(const SubscribeBluetoothConnectionsFreeRequest &msg) override;
 #endif
 };
 
diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index 5851594955..965f08aa15 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -297,6 +297,51 @@ void APIServer::send_bluetooth_le_advertisement(const BluetoothLEAdvertisementRe
     client->send_bluetooth_le_advertisement(call);
   }
 }
+void APIServer::send_bluetooth_device_connection(uint64_t address, bool connected, uint16_t mtu, esp_err_t error) {
+  BluetoothDeviceConnectionResponse call;
+  call.address = address;
+  call.connected = connected;
+  call.mtu = mtu;
+  call.error = error;
+
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_device_connection_response(call);
+  }
+}
+
+void APIServer::send_bluetooth_connections_free(uint8_t free, uint8_t limit) {
+  BluetoothConnectionsFreeResponse call;
+  call.free = free;
+  call.limit = limit;
+
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_connections_free_response(call);
+  }
+}
+
+void APIServer::send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &call) {
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_gatt_read_response(call);
+  }
+}
+void APIServer::send_bluetooth_gatt_notify_data_response(const BluetoothGATTNotifyDataResponse &call) {
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_gatt_notify_data_response(call);
+  }
+}
+void APIServer::send_bluetooth_gatt_services(const BluetoothGATTGetServicesResponse &call) {
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_gatt_get_services_response(call);
+  }
+}
+void APIServer::send_bluetooth_gatt_services_done(uint64_t address) {
+  BluetoothGATTGetServicesDoneResponse call;
+  call.address = address;
+
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_gatt_get_services_done_response(call);
+  }
+}
 #endif
 APIServer::APIServer() { global_api_server = this; }
 void APIServer::subscribe_home_assistant_state(std::string entity_id, optional<std::string> attribute,
diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index dc892b2088..72ab55432c 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -75,6 +75,12 @@ class APIServer : public Component, public Controller {
   void send_homeassistant_service_call(const HomeassistantServiceResponse &call);
 #ifdef USE_BLUETOOTH_PROXY
   void send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &call);
+  void send_bluetooth_device_connection(uint64_t address, bool connected, uint16_t mtu, esp_err_t error = ESP_OK);
+  void send_bluetooth_connections_free(uint8_t free, uint8_t limit);
+  void send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &call);
+  void send_bluetooth_gatt_notify_data_response(const BluetoothGATTNotifyDataResponse &call);
+  void send_bluetooth_gatt_services(const BluetoothGATTGetServicesResponse &call);
+  void send_bluetooth_gatt_services_done(uint64_t address);
 #endif
   void register_user_service(UserServiceDescriptor *descriptor) { this->user_services_.push_back(descriptor); }
 #ifdef USE_HOMEASSISTANT_TIME
diff --git a/esphome/components/bedjet/bedjet_hub.cpp b/esphome/components/bedjet/bedjet_hub.cpp
index fd383eb6be..f90ca5cf54 100644
--- a/esphome/components/bedjet/bedjet_hub.cpp
+++ b/esphome/components/bedjet/bedjet_hub.cpp
@@ -128,9 +128,9 @@ uint8_t BedJetHub::write_bedjet_packet_(BedjetPacket *pkt) {
     }
     return -1;
   }
-  auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_cmd_,
-                                         pkt->data_length + 1, (uint8_t *) &pkt->command, ESP_GATT_WRITE_TYPE_NO_RSP,
-                                         ESP_GATT_AUTH_REQ_NONE);
+  auto status = esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(),
+                                         this->char_handle_cmd_, pkt->data_length + 1, (uint8_t *) &pkt->command,
+                                         ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
   return status;
 }
 
@@ -138,13 +138,13 @@ uint8_t BedJetHub::write_bedjet_packet_(BedjetPacket *pkt) {
 uint8_t BedJetHub::set_notify_(const bool enable) {
   uint8_t status;
   if (enable) {
-    status = esp_ble_gattc_register_for_notify(this->parent_->gattc_if, this->parent_->remote_bda,
+    status = esp_ble_gattc_register_for_notify(this->parent_->get_gattc_if(), this->parent_->get_remote_bda(),
                                                this->char_handle_status_);
     if (status) {
       ESP_LOGW(TAG, "[%s] esp_ble_gattc_register_for_notify failed, status=%d", this->get_name().c_str(), status);
     }
   } else {
-    status = esp_ble_gattc_unregister_for_notify(this->parent_->gattc_if, this->parent_->remote_bda,
+    status = esp_ble_gattc_unregister_for_notify(this->parent_->get_gattc_if(), this->parent_->get_remote_bda(),
                                                  this->char_handle_status_);
     if (status) {
       ESP_LOGW(TAG, "[%s] esp_ble_gattc_unregister_for_notify failed, status=%d", this->get_name().c_str(), status);
@@ -204,8 +204,8 @@ bool BedJetHub::discover_characteristics_() {
       result = false;
     } else {
       this->char_handle_name_ = chr->handle;
-      auto status = esp_ble_gattc_read_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_name_,
-                                            ESP_GATT_AUTH_REQ_NONE);
+      auto status = esp_ble_gattc_read_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(),
+                                            this->char_handle_name_, ESP_GATT_AUTH_REQ_NONE);
       if (status) {
         ESP_LOGI(TAG, "[%s] Unable to read name characteristic: %d", this->get_name().c_str(), status);
       }
@@ -230,22 +230,6 @@ void BedJetHub::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
       this->dispatch_state_(false);
       break;
     }
-    case ESP_GATTC_OPEN_EVT: {
-      // FIXME: bug in BLEClient
-      this->parent_->conn_id = param->open.conn_id;
-      this->open_conn_id_ = param->open.conn_id;
-      break;
-    }
-
-    case ESP_GATTC_CONNECT_EVT: {
-      if (this->parent_->conn_id != param->connect.conn_id && this->open_conn_id_ != 0xff) {
-        // FIXME: bug in BLEClient
-        ESP_LOGW(TAG, "[%s] CONNECT_EVT unexpected conn_id; open=%d, parent=%d, param=%d", this->get_name().c_str(),
-                 this->open_conn_id_, this->parent_->conn_id, param->connect.conn_id);
-        this->parent_->conn_id = this->open_conn_id_;
-      }
-      break;
-    }
     case ESP_GATTC_SEARCH_CMPL_EVT: {
       auto result = this->discover_characteristics_();
 
@@ -301,7 +285,7 @@ void BedJetHub::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
       break;
     }
     case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent_->conn_id)
+      if (param->read.conn_id != this->parent_->get_conn_id())
         break;
       if (param->read.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
@@ -358,9 +342,9 @@ void BedJetHub::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
       if (this->processing_)
         break;
 
-      if (param->notify.conn_id != this->parent_->conn_id) {
+      if (param->notify.conn_id != this->parent_->get_conn_id()) {
         ESP_LOGW(TAG, "[%s] Received notify event for unexpected parent conn: expect %x, got %x",
-                 this->get_name().c_str(), this->parent_->conn_id, param->notify.conn_id);
+                 this->get_name().c_str(), this->parent_->get_conn_id(), param->notify.conn_id);
         // FIXME: bug in BLEClient holding wrong conn_id.
       }
 
@@ -394,7 +378,7 @@ void BedJetHub::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
         if (needs_extra) {
           // This means the packet was partial, so read the status characteristic to get the second part.
           // Ideally this will complete quickly. We won't process additional notification events until it does.
-          auto status = esp_ble_gattc_read_char(this->parent_->gattc_if, this->parent_->conn_id,
+          auto status = esp_ble_gattc_read_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(),
                                                 this->char_handle_status_, ESP_GATT_AUTH_REQ_NONE);
           if (status) {
             ESP_LOGI(TAG, "[%s] Unable to read extended status packet", this->get_name().c_str());
@@ -438,15 +422,15 @@ uint8_t BedJetHub::write_notify_config_descriptor_(bool enable) {
 
   // NOTE: BLEClient uses `uint8_t*` of length 1, but BLE spec requires 16 bits.
   uint16_t notify_en = enable ? 1 : 0;
-  auto status =
-      esp_ble_gattc_write_char_descr(this->parent_->gattc_if, this->parent_->conn_id, handle, sizeof(notify_en),
-                                     (uint8_t *) &notify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
+  auto status = esp_ble_gattc_write_char_descr(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), handle,
+                                               sizeof(notify_en), (uint8_t *) &notify_en, ESP_GATT_WRITE_TYPE_RSP,
+                                               ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, status=%d", status);
     return status;
   }
   ESP_LOGD(TAG, "[%s] wrote notify=%s to status config 0x%04x, for conn %d", this->get_name().c_str(),
-           enable ? "true" : "false", handle, this->parent_->conn_id);
+           enable ? "true" : "false", handle, this->parent_->get_conn_id());
   return ESP_GATT_OK;
 }
 
@@ -500,7 +484,7 @@ void BedJetHub::update() { this->dispatch_status_(); }
 void BedJetHub::dump_config() {
   ESP_LOGCONFIG(TAG, "BedJet Hub '%s'", this->get_name().c_str());
   ESP_LOGCONFIG(TAG, "  ble_client.app_id: %d", this->parent()->app_id);
-  ESP_LOGCONFIG(TAG, "  ble_client.conn_id: %d", this->parent()->conn_id);
+  ESP_LOGCONFIG(TAG, "  ble_client.conn_id: %d", this->parent()->get_conn_id());
   LOG_UPDATE_INTERVAL(this)
   ESP_LOGCONFIG(TAG, "  Child components (%d):", this->children_.size());
   for (auto *child : this->children_) {
diff --git a/esphome/components/bedjet/bedjet_hub.h b/esphome/components/bedjet/bedjet_hub.h
index c7583b78e9..f1479710a7 100644
--- a/esphome/components/bedjet/bedjet_hub.h
+++ b/esphome/components/bedjet/bedjet_hub.h
@@ -167,8 +167,6 @@ class BedJetHub : public esphome::ble_client::BLEClientNode, public PollingCompo
   uint16_t char_handle_status_;
   uint16_t config_descr_status_;
 
-  uint8_t open_conn_id_ = -1;
-
   uint8_t write_notify_config_descriptor_(bool enable);
 };
 
diff --git a/esphome/components/ble_client/__init__.py b/esphome/components/ble_client/__init__.py
index 4b7d5f5b8a..0f1f60e62b 100644
--- a/esphome/components/ble_client/__init__.py
+++ b/esphome/components/ble_client/__init__.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.components import esp32_ble_tracker
+from esphome.components import esp32_ble_tracker, esp32_ble_client
 from esphome.const import (
     CONF_CHARACTERISTIC_UUID,
     CONF_ID,
@@ -14,13 +14,12 @@ from esphome.const import (
 )
 from esphome import automation
 
+AUTO_LOAD = ["esp32_ble_client"]
 CODEOWNERS = ["@buxtronix"]
 DEPENDENCIES = ["esp32_ble_tracker"]
 
 ble_client_ns = cg.esphome_ns.namespace("ble_client")
-BLEClient = ble_client_ns.class_(
-    "BLEClient", cg.Component, esp32_ble_tracker.ESPBTClient
-)
+BLEClient = ble_client_ns.class_("BLEClient", esp32_ble_client.BLEClientBase)
 BLEClientNode = ble_client_ns.class_("BLEClientNode")
 BLEClientNodeConstRef = BLEClientNode.operator("ref").operator("const")
 # Triggers
diff --git a/esphome/components/ble_client/automation.cpp b/esphome/components/ble_client/automation.cpp
index 6918ab31b4..395950dd26 100644
--- a/esphome/components/ble_client/automation.cpp
+++ b/esphome/components/ble_client/automation.cpp
@@ -1,8 +1,8 @@
 #include "automation.h"
 
+#include <esp_bt_defs.h>
 #include <esp_gap_ble_api.h>
 #include <esp_gattc_api.h>
-#include <esp_bt_defs.h>
 
 #include "esphome/core/log.h"
 
@@ -31,8 +31,8 @@ void BLEWriterClientNode::write(const std::vector<uint8_t> &value) {
   }
   ESP_LOGVV(TAG, "Will write %d bytes: %s", value.size(), format_hex_pretty(value).c_str());
   esp_err_t err =
-      esp_ble_gattc_write_char(this->parent()->gattc_if, this->parent()->conn_id, this->ble_char_handle_, value.size(),
-                               const_cast<uint8_t *>(value.data()), write_type, ESP_GATT_AUTH_REQ_NONE);
+      esp_ble_gattc_write_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->ble_char_handle_,
+                               value.size(), const_cast<uint8_t *>(value.data()), write_type, ESP_GATT_AUTH_REQ_NONE);
   if (err != ESP_OK) {
     ESP_LOGE(TAG, "Error writing to characteristic: %s!", esp_err_to_name(err));
   }
diff --git a/esphome/components/ble_client/automation.h b/esphome/components/ble_client/automation.h
index 38e64ebd76..ba5f78109e 100644
--- a/esphome/components/ble_client/automation.h
+++ b/esphome/components/ble_client/automation.h
@@ -28,7 +28,8 @@ class BLEClientDisconnectTrigger : public Trigger<>, public BLEClientNode {
   void loop() override {}
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override {
-    if (event == ESP_GATTC_DISCONNECT_EVT && memcmp(param->disconnect.remote_bda, this->parent_->remote_bda, 6) == 0)
+    if (event == ESP_GATTC_DISCONNECT_EVT &&
+        memcmp(param->disconnect.remote_bda, this->parent_->get_remote_bda(), 6) == 0)
       this->trigger();
     if (event == ESP_GATTC_SEARCH_CMPL_EVT)
       this->node_state = espbt::ClientState::ESTABLISHED;
diff --git a/esphome/components/ble_client/ble_client.cpp b/esphome/components/ble_client/ble_client.cpp
index 5f58d8273f..3f86df32f5 100644
--- a/esphome/components/ble_client/ble_client.cpp
+++ b/esphome/components/ble_client/ble_client.cpp
@@ -1,8 +1,9 @@
-#include "esphome/core/log.h"
+#include "ble_client.h"
+#include "esphome/components/esp32_ble_client/ble_client_base.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 "ble_client.h"
+#include "esphome/core/log.h"
 
 #ifdef USE_ESP32
 
@@ -11,22 +12,13 @@ namespace ble_client {
 
 static const char *const TAG = "ble_client";
 
-float BLEClient::get_setup_priority() const { return setup_priority::AFTER_BLUETOOTH; }
-
 void BLEClient::setup() {
-  auto ret = esp_ble_gattc_app_register(this->app_id);
-  if (ret) {
-    ESP_LOGE(TAG, "gattc app register failed. app_id=%d code=%d", this->app_id, ret);
-    this->mark_failed();
-  }
-  this->set_states_(espbt::ClientState::IDLE);
+  BLEClientBase::setup();
   this->enabled = true;
 }
 
 void BLEClient::loop() {
-  if (this->state() == espbt::ClientState::DISCOVERED) {
-    this->connect();
-  }
+  BLEClientBase::loop();
   for (auto *node : this->nodes_)
     node->loop();
 }
@@ -39,34 +31,7 @@ void BLEClient::dump_config() {
 bool BLEClient::parse_device(const espbt::ESPBTDevice &device) {
   if (!this->enabled)
     return false;
-  if (device.address_uint64() != this->address)
-    return false;
-  if (this->state() != espbt::ClientState::IDLE)
-    return false;
-
-  ESP_LOGD(TAG, "Found device at MAC address [%s]", device.address_str().c_str());
-  this->set_states_(espbt::ClientState::DISCOVERED);
-
-  auto addr = device.address_uint64();
-  this->remote_bda[0] = (addr >> 40) & 0xFF;
-  this->remote_bda[1] = (addr >> 32) & 0xFF;
-  this->remote_bda[2] = (addr >> 24) & 0xFF;
-  this->remote_bda[3] = (addr >> 16) & 0xFF;
-  this->remote_bda[4] = (addr >> 8) & 0xFF;
-  this->remote_bda[5] = (addr >> 0) & 0xFF;
-  this->remote_addr_type = device.get_address_type();
-  return true;
-}
-
-std::string BLEClient::address_str() const {
-  char buf[20];
-  sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x", (uint8_t)(this->address >> 40) & 0xff,
-          (uint8_t)(this->address >> 32) & 0xff, (uint8_t)(this->address >> 24) & 0xff,
-          (uint8_t)(this->address >> 16) & 0xff, (uint8_t)(this->address >> 8) & 0xff,
-          (uint8_t)(this->address >> 0) & 0xff);
-  std::string ret;
-  ret = buf;
-  return ret;
+  return BLEClientBase::parse_device(device);
 }
 
 void BLEClient::set_enabled(bool enabled) {
@@ -74,7 +39,7 @@ void BLEClient::set_enabled(bool enabled) {
     return;
   if (!enabled && this->state() != espbt::ClientState::IDLE) {
     ESP_LOGI(TAG, "[%s] Disabling BLE client.", this->address_str().c_str());
-    auto ret = esp_ble_gattc_close(this->gattc_if, this->conn_id);
+    auto ret = esp_ble_gattc_close(this->gattc_if_, this->conn_id_);
     if (ret) {
       ESP_LOGW(TAG, "esp_ble_gattc_close error, address=%s status=%d", this->address_str().c_str(), ret);
     }
@@ -82,125 +47,12 @@ void BLEClient::set_enabled(bool enabled) {
   this->enabled = enabled;
 }
 
-void BLEClient::connect() {
-  ESP_LOGI(TAG, "Attempting BLE connection to %s", this->address_str().c_str());
-  auto ret = esp_ble_gattc_open(this->gattc_if, this->remote_bda, this->remote_addr_type, true);
-  if (ret) {
-    ESP_LOGW(TAG, "esp_ble_gattc_open error, address=%s status=%d", this->address_str().c_str(), ret);
-    this->set_states_(espbt::ClientState::IDLE);
-  } else {
-    this->set_states_(espbt::ClientState::CONNECTING);
-  }
-}
-
 void BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t esp_gattc_if,
                                     esp_ble_gattc_cb_param_t *param) {
-  if (event == ESP_GATTC_REG_EVT && this->app_id != param->reg.app_id)
-    return;
-  if (event != ESP_GATTC_REG_EVT && esp_gattc_if != ESP_GATT_IF_NONE && esp_gattc_if != this->gattc_if)
-    return;
-
   bool all_established = this->all_nodes_established_();
 
-  switch (event) {
-    case ESP_GATTC_REG_EVT: {
-      if (param->reg.status == ESP_GATT_OK) {
-        ESP_LOGV(TAG, "gattc registered app id %d", this->app_id);
-        this->gattc_if = esp_gattc_if;
-      } else {
-        ESP_LOGE(TAG, "gattc app registration failed id=%d code=%d", param->reg.app_id, param->reg.status);
-      }
-      break;
-    }
-    case ESP_GATTC_OPEN_EVT: {
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_OPEN_EVT", this->address_str().c_str());
-      this->conn_id = param->open.conn_id;
-      if (param->open.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "connect to %s failed, status=%d", this->address_str().c_str(), param->open.status);
-        this->set_states_(espbt::ClientState::IDLE);
-        break;
-      }
-      break;
-    }
-    case ESP_GATTC_CONNECT_EVT: {
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_CONNECT_EVT", this->address_str().c_str());
-      if (this->conn_id != param->connect.conn_id) {
-        ESP_LOGD(TAG, "[%s] Unexpected conn_id in CONNECT_EVT: param conn=%d, open conn=%d",
-                 this->address_str().c_str(), param->connect.conn_id, this->conn_id);
-      }
-      auto ret = esp_ble_gattc_send_mtu_req(this->gattc_if, param->connect.conn_id);
-      if (ret) {
-        ESP_LOGW(TAG, "esp_ble_gattc_send_mtu_req failed, status=%x", ret);
-      }
-      break;
-    }
-    case ESP_GATTC_CFG_MTU_EVT: {
-      if (param->cfg_mtu.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "cfg_mtu to %s failed, mtu %d, status %d", this->address_str().c_str(), param->cfg_mtu.mtu,
-                 param->cfg_mtu.status);
-        this->set_states_(espbt::ClientState::IDLE);
-        break;
-      }
-      ESP_LOGV(TAG, "cfg_mtu status %d, mtu %d", param->cfg_mtu.status, param->cfg_mtu.mtu);
-      esp_ble_gattc_search_service(esp_gattc_if, param->cfg_mtu.conn_id, nullptr);
-      break;
-    }
-    case ESP_GATTC_DISCONNECT_EVT: {
-      if (memcmp(param->disconnect.remote_bda, this->remote_bda, 6) != 0) {
-        return;
-      }
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_DISCONNECT_EVT, reason %d", this->address_str().c_str(), param->disconnect.reason);
-      for (auto &svc : this->services_)
-        delete svc;  // NOLINT(cppcoreguidelines-owning-memory)
-      this->services_.clear();
-      this->set_states_(espbt::ClientState::IDLE);
-      break;
-    }
-    case ESP_GATTC_SEARCH_RES_EVT: {
-      BLEService *ble_service = new BLEService();  // NOLINT(cppcoreguidelines-owning-memory)
-      ble_service->uuid = espbt::ESPBTUUID::from_uuid(param->search_res.srvc_id.uuid);
-      ble_service->start_handle = param->search_res.start_handle;
-      ble_service->end_handle = param->search_res.end_handle;
-      ble_service->client = this;
-      this->services_.push_back(ble_service);
-      break;
-    }
-    case ESP_GATTC_SEARCH_CMPL_EVT: {
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_SEARCH_CMPL_EVT", this->address_str().c_str());
-      for (auto &svc : this->services_) {
-        ESP_LOGI(TAG, "Service UUID: %s", svc->uuid.to_string().c_str());
-        ESP_LOGI(TAG, "  start_handle: 0x%x  end_handle: 0x%x", svc->start_handle, svc->end_handle);
-        svc->parse_characteristics();
-      }
-      this->set_states_(espbt::ClientState::CONNECTED);
-      this->set_state(espbt::ClientState::ESTABLISHED);
-      break;
-    }
-    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
-      auto *descr = this->get_config_descriptor(param->reg_for_notify.handle);
-      if (descr == nullptr) {
-        ESP_LOGW(TAG, "No descriptor found for notify of handle 0x%x", param->reg_for_notify.handle);
-        break;
-      }
-      if (descr->uuid.get_uuid().len != ESP_UUID_LEN_16 ||
-          descr->uuid.get_uuid().uuid.uuid16 != ESP_GATT_UUID_CHAR_CLIENT_CONFIG) {
-        ESP_LOGW(TAG, "Handle 0x%x (uuid %s) is not a client config char uuid", param->reg_for_notify.handle,
-                 descr->uuid.to_string().c_str());
-        break;
-      }
-      uint16_t notify_en = 1;
-      auto status =
-          esp_ble_gattc_write_char_descr(this->gattc_if, this->conn_id, descr->handle, sizeof(notify_en),
-                                         (uint8_t *) &notify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
-      if (status) {
-        ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, status=%d", status);
-      }
-      break;
-    }
+  BLEClientBase::gattc_event_handler(event, esp_gattc_if, param);
 
-    default:
-      break;
-  }
   for (auto *node : this->nodes_)
     node->gattc_event_handler(event, esp_gattc_if, param);
 
@@ -212,237 +64,20 @@ void BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t es
   }
 }
 
-void BLEClient::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
-  switch (event) {
-    // This event is sent by the server when it requests security
-    case ESP_GAP_BLE_SEC_REQ_EVT:
-      ESP_LOGV(TAG, "ESP_GAP_BLE_SEC_REQ_EVT %x", event);
-      esp_ble_gap_security_rsp(param->ble_security.ble_req.bd_addr, true);
-      break;
-    // This event is sent once authentication has completed
-    case ESP_GAP_BLE_AUTH_CMPL_EVT:
-      esp_bd_addr_t bd_addr;
-      memcpy(bd_addr, param->ble_security.auth_cmpl.bd_addr, sizeof(esp_bd_addr_t));
-      ESP_LOGI(TAG, "auth complete. remote BD_ADDR: %s", format_hex(bd_addr, 6).c_str());
-      if (!param->ble_security.auth_cmpl.success) {
-        ESP_LOGE(TAG, "auth fail reason = 0x%x", param->ble_security.auth_cmpl.fail_reason);
-      } else {
-        ESP_LOGV(TAG, "auth success. address type = %d auth mode = %d", param->ble_security.auth_cmpl.addr_type,
-                 param->ble_security.auth_cmpl.auth_mode);
-      }
-      break;
-    // There are other events we'll want to implement at some point to support things like pass key
-    // https://github.com/espressif/esp-idf/blob/cba69dd088344ed9d26739f04736ae7a37541b3a/examples/bluetooth/bluedroid/ble/gatt_security_client/tutorial/Gatt_Security_Client_Example_Walkthrough.md
-    default:
-      break;
+void BLEClient::set_state(espbt::ClientState state) {
+  BLEClientBase::set_state(state);
+  for (auto &node : nodes_)
+    node->node_state = state;
+}
+
+bool BLEClient::all_nodes_established_() {
+  if (this->state() != espbt::ClientState::ESTABLISHED)
+    return false;
+  for (auto &node : nodes_) {
+    if (node->node_state != espbt::ClientState::ESTABLISHED)
+      return false;
   }
-}
-
-// Parse GATT values into a float for a sensor.
-// Ref: https://www.bluetooth.com/specifications/assigned-numbers/format-types/
-float BLEClient::parse_char_value(uint8_t *value, uint16_t length) {
-  // A length of one means a single octet value.
-  if (length == 0)
-    return 0;
-  if (length == 1)
-    return (float) ((uint8_t) value[0]);
-
-  switch (value[0]) {
-    case 0x1:  // boolean.
-    case 0x2:  // 2bit.
-    case 0x3:  // nibble.
-    case 0x4:  // uint8.
-      return (float) ((uint8_t) value[1]);
-    case 0x5:  // uint12.
-    case 0x6:  // uint16.
-      if (length > 2) {
-        return (float) ((uint16_t)(value[1] << 8) + (uint16_t) value[2]);
-      }
-    case 0x7:  // uint24.
-      if (length > 3) {
-        return (float) ((uint32_t)(value[1] << 16) + (uint32_t)(value[2] << 8) + (uint32_t)(value[3]));
-      }
-    case 0x8:  // uint32.
-      if (length > 4) {
-        return (float) ((uint32_t)(value[1] << 24) + (uint32_t)(value[2] << 16) + (uint32_t)(value[3] << 8) +
-                        (uint32_t)(value[4]));
-      }
-    case 0xC:  // int8.
-      return (float) ((int8_t) value[1]);
-    case 0xD:  // int12.
-    case 0xE:  // int16.
-      if (length > 2) {
-        return (float) ((int16_t)(value[1] << 8) + (int16_t) value[2]);
-      }
-    case 0xF:  // int24.
-      if (length > 3) {
-        return (float) ((int32_t)(value[1] << 16) + (int32_t)(value[2] << 8) + (int32_t)(value[3]));
-      }
-    case 0x10:  // int32.
-      if (length > 4) {
-        return (float) ((int32_t)(value[1] << 24) + (int32_t)(value[2] << 16) + (int32_t)(value[3] << 8) +
-                        (int32_t)(value[4]));
-      }
-  }
-  ESP_LOGW(TAG, "Cannot parse characteristic value of type 0x%x length %d", value[0], length);
-  return NAN;
-}
-
-BLEService *BLEClient::get_service(espbt::ESPBTUUID uuid) {
-  for (auto *svc : this->services_) {
-    if (svc->uuid == uuid)
-      return svc;
-  }
-  return nullptr;
-}
-
-BLEService *BLEClient::get_service(uint16_t uuid) { return this->get_service(espbt::ESPBTUUID::from_uint16(uuid)); }
-
-BLECharacteristic *BLEClient::get_characteristic(espbt::ESPBTUUID service, espbt::ESPBTUUID chr) {
-  auto *svc = this->get_service(service);
-  if (svc == nullptr)
-    return nullptr;
-  return svc->get_characteristic(chr);
-}
-
-BLECharacteristic *BLEClient::get_characteristic(uint16_t service, uint16_t chr) {
-  return this->get_characteristic(espbt::ESPBTUUID::from_uint16(service), espbt::ESPBTUUID::from_uint16(chr));
-}
-
-BLEDescriptor *BLEClient::get_config_descriptor(uint16_t handle) {
-  for (auto &svc : this->services_) {
-    for (auto &chr : svc->characteristics) {
-      if (chr->handle == handle) {
-        for (auto &desc : chr->descriptors) {
-          if (desc->uuid == espbt::ESPBTUUID::from_uint16(0x2902))
-            return desc;
-        }
-      }
-    }
-  }
-  return nullptr;
-}
-
-BLECharacteristic *BLEService::get_characteristic(espbt::ESPBTUUID uuid) {
-  for (auto &chr : this->characteristics) {
-    if (chr->uuid == uuid)
-      return chr;
-  }
-  return nullptr;
-}
-
-BLECharacteristic *BLEService::get_characteristic(uint16_t uuid) {
-  return this->get_characteristic(espbt::ESPBTUUID::from_uint16(uuid));
-}
-
-BLEDescriptor *BLEClient::get_descriptor(espbt::ESPBTUUID service, espbt::ESPBTUUID chr, espbt::ESPBTUUID descr) {
-  auto *svc = this->get_service(service);
-  if (svc == nullptr)
-    return nullptr;
-  auto *ch = svc->get_characteristic(chr);
-  if (ch == nullptr)
-    return nullptr;
-  return ch->get_descriptor(descr);
-}
-
-BLEDescriptor *BLEClient::get_descriptor(uint16_t service, uint16_t chr, uint16_t descr) {
-  return this->get_descriptor(espbt::ESPBTUUID::from_uint16(service), espbt::ESPBTUUID::from_uint16(chr),
-                              espbt::ESPBTUUID::from_uint16(descr));
-}
-
-BLEService::~BLEService() {
-  for (auto &chr : this->characteristics)
-    delete chr;  // NOLINT(cppcoreguidelines-owning-memory)
-}
-
-void BLEService::parse_characteristics() {
-  uint16_t offset = 0;
-  esp_gattc_char_elem_t result;
-
-  while (true) {
-    uint16_t count = 1;
-    esp_gatt_status_t status = esp_ble_gattc_get_all_char(
-        this->client->gattc_if, this->client->conn_id, this->start_handle, this->end_handle, &result, &count, offset);
-    if (status == ESP_GATT_INVALID_OFFSET || status == ESP_GATT_NOT_FOUND) {
-      break;
-    }
-    if (status != ESP_GATT_OK) {
-      ESP_LOGW(TAG, "esp_ble_gattc_get_all_char error, status=%d", status);
-      break;
-    }
-    if (count == 0) {
-      break;
-    }
-
-    BLECharacteristic *characteristic = new BLECharacteristic();  // NOLINT(cppcoreguidelines-owning-memory)
-    characteristic->uuid = espbt::ESPBTUUID::from_uuid(result.uuid);
-    characteristic->properties = result.properties;
-    characteristic->handle = result.char_handle;
-    characteristic->service = this;
-    this->characteristics.push_back(characteristic);
-    ESP_LOGI(TAG, " characteristic %s, handle 0x%x, properties 0x%x", characteristic->uuid.to_string().c_str(),
-             characteristic->handle, characteristic->properties);
-    characteristic->parse_descriptors();
-    offset++;
-  }
-}
-
-BLECharacteristic::~BLECharacteristic() {
-  for (auto &desc : this->descriptors)
-    delete desc;  // NOLINT(cppcoreguidelines-owning-memory)
-}
-
-void BLECharacteristic::parse_descriptors() {
-  uint16_t offset = 0;
-  esp_gattc_descr_elem_t result;
-
-  while (true) {
-    uint16_t count = 1;
-    esp_gatt_status_t status = esp_ble_gattc_get_all_descr(
-        this->service->client->gattc_if, this->service->client->conn_id, this->handle, &result, &count, offset);
-    if (status == ESP_GATT_INVALID_OFFSET || status == ESP_GATT_NOT_FOUND) {
-      break;
-    }
-    if (status != ESP_GATT_OK) {
-      ESP_LOGW(TAG, "esp_ble_gattc_get_all_descr error, status=%d", status);
-      break;
-    }
-    if (count == 0) {
-      break;
-    }
-
-    BLEDescriptor *desc = new BLEDescriptor();  // NOLINT(cppcoreguidelines-owning-memory)
-    desc->uuid = espbt::ESPBTUUID::from_uuid(result.uuid);
-    desc->handle = result.handle;
-    desc->characteristic = this;
-    this->descriptors.push_back(desc);
-    ESP_LOGV(TAG, "   descriptor %s, handle 0x%x", desc->uuid.to_string().c_str(), desc->handle);
-    offset++;
-  }
-}
-
-BLEDescriptor *BLECharacteristic::get_descriptor(espbt::ESPBTUUID uuid) {
-  for (auto &desc : this->descriptors) {
-    if (desc->uuid == uuid)
-      return desc;
-  }
-  return nullptr;
-}
-BLEDescriptor *BLECharacteristic::get_descriptor(uint16_t uuid) {
-  return this->get_descriptor(espbt::ESPBTUUID::from_uint16(uuid));
-}
-
-void BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size, esp_gatt_write_type_t write_type) {
-  auto *client = this->service->client;
-  auto status = esp_ble_gattc_write_char(client->gattc_if, client->conn_id, this->handle, new_val_size, new_val,
-                                         write_type, ESP_GATT_AUTH_REQ_NONE);
-  if (status) {
-    ESP_LOGW(TAG, "Error sending write value to BLE gattc server, status=%d", status);
-  }
-}
-
-void BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size) {
-  write_value(new_val, new_val_size, ESP_GATT_WRITE_TYPE_NO_RSP);
+  return true;
 }
 
 }  // namespace ble_client
diff --git a/esphome/components/ble_client/ble_client.h b/esphome/components/ble_client/ble_client.h
index 5ed8f219d1..0f8373ab1f 100644
--- a/esphome/components/ble_client/ble_client.h
+++ b/esphome/components/ble_client/ble_client.h
@@ -1,8 +1,9 @@
 #pragma once
 
+#include "esphome/components/esp32_ble_client/ble_client_base.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 
 #ifdef USE_ESP32
 
@@ -18,9 +19,9 @@ namespace ble_client {
 
 namespace espbt = esphome::esp32_ble_tracker;
 
+using namespace esp32_ble_client;
+
 class BLEClient;
-class BLEService;
-class BLECharacteristic;
 
 class BLEClientNode {
  public:
@@ -42,57 +43,15 @@ class BLEClientNode {
   uint64_t address_;
 };
 
-class BLEDescriptor {
- public:
-  espbt::ESPBTUUID uuid;
-  uint16_t handle;
-
-  BLECharacteristic *characteristic;
-};
-
-class BLECharacteristic {
- public:
-  ~BLECharacteristic();
-  espbt::ESPBTUUID uuid;
-  uint16_t handle;
-  esp_gatt_char_prop_t properties;
-  std::vector<BLEDescriptor *> descriptors;
-  void parse_descriptors();
-  BLEDescriptor *get_descriptor(espbt::ESPBTUUID uuid);
-  BLEDescriptor *get_descriptor(uint16_t uuid);
-  void write_value(uint8_t *new_val, int16_t new_val_size);
-  void write_value(uint8_t *new_val, int16_t new_val_size, esp_gatt_write_type_t write_type);
-  BLEService *service;
-};
-
-class BLEService {
- public:
-  ~BLEService();
-  espbt::ESPBTUUID uuid;
-  uint16_t start_handle;
-  uint16_t end_handle;
-  std::vector<BLECharacteristic *> characteristics;
-  BLEClient *client;
-  void parse_characteristics();
-  BLECharacteristic *get_characteristic(espbt::ESPBTUUID uuid);
-  BLECharacteristic *get_characteristic(uint16_t uuid);
-};
-
-class BLEClient : public espbt::ESPBTClient, public Component {
+class BLEClient : public BLEClientBase {
  public:
   void setup() override;
   void dump_config() override;
   void loop() override;
-  float get_setup_priority() const override;
 
   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;
   bool parse_device(const espbt::ESPBTDevice &device) override;
-  void on_scan_end() override {}
-  void connect() override;
-
-  void set_address(uint64_t address) { this->address = address; }
 
   void set_enabled(bool enabled);
 
@@ -102,43 +61,14 @@ class BLEClient : public espbt::ESPBTClient, public Component {
     this->nodes_.push_back(node);
   }
 
-  BLEService *get_service(espbt::ESPBTUUID uuid);
-  BLEService *get_service(uint16_t uuid);
-  BLECharacteristic *get_characteristic(espbt::ESPBTUUID service, espbt::ESPBTUUID chr);
-  BLECharacteristic *get_characteristic(uint16_t service, uint16_t chr);
-  BLEDescriptor *get_descriptor(espbt::ESPBTUUID service, espbt::ESPBTUUID chr, espbt::ESPBTUUID descr);
-  BLEDescriptor *get_descriptor(uint16_t service, uint16_t chr, uint16_t descr);
-  // Get the configuration descriptor for the given characteristic handle.
-  BLEDescriptor *get_config_descriptor(uint16_t handle);
-
-  float parse_char_value(uint8_t *value, uint16_t length);
-
-  int gattc_if;
-  esp_bd_addr_t remote_bda;
-  esp_ble_addr_type_t remote_addr_type;
-  uint16_t conn_id;
-  uint64_t address;
   bool enabled;
-  std::string address_str() const;
+
+  void set_state(espbt::ClientState state) override;
 
  protected:
-  void set_states_(espbt::ClientState st) {
-    this->set_state(st);
-    for (auto &node : nodes_)
-      node->node_state = st;
-  }
-  bool all_nodes_established_() {
-    if (this->state() != espbt::ClientState::ESTABLISHED)
-      return false;
-    for (auto &node : nodes_) {
-      if (node->node_state != espbt::ClientState::ESTABLISHED)
-        return false;
-    }
-    return true;
-  }
+  bool all_nodes_established_();
 
   std::vector<BLEClientNode *> nodes_;
-  std::vector<BLEService *> services_;
 };
 
 }  // namespace ble_client
diff --git a/esphome/components/ble_client/sensor/automation.h b/esphome/components/ble_client/sensor/automation.h
index 2baaafe2ec..d830165d30 100644
--- a/esphome/components/ble_client/sensor/automation.h
+++ b/esphome/components/ble_client/sensor/automation.h
@@ -19,7 +19,8 @@ class BLESensorNotifyTrigger : public Trigger<float>, public BLESensor {
         break;
       }
       case ESP_GATTC_NOTIFY_EVT: {
-        if (param->notify.conn_id != this->sensor_->parent()->conn_id || param->notify.handle != this->sensor_->handle)
+        if (param->notify.conn_id != this->sensor_->parent()->get_conn_id() ||
+            param->notify.handle != this->sensor_->handle)
           break;
         this->trigger(this->sensor_->parent()->parse_char_value(param->notify.value, param->notify.value_len));
       }
diff --git a/esphome/components/ble_client/sensor/ble_sensor.cpp b/esphome/components/ble_client/sensor/ble_sensor.cpp
index ee5afd3f7b..a05efad60b 100644
--- a/esphome/components/ble_client/sensor/ble_sensor.cpp
+++ b/esphome/components/ble_client/sensor/ble_sensor.cpp
@@ -63,8 +63,8 @@ void BLESensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
         this->handle = descr->handle;
       }
       if (this->notify_) {
-        auto status =
-            esp_ble_gattc_register_for_notify(this->parent()->gattc_if, this->parent()->remote_bda, chr->handle);
+        auto status = esp_ble_gattc_register_for_notify(this->parent()->get_gattc_if(),
+                                                        this->parent()->get_remote_bda(), chr->handle);
         if (status) {
           ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, status=%d", status);
         }
@@ -74,7 +74,7 @@ void BLESensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
       break;
     }
     case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->conn_id)
+      if (param->read.conn_id != this->parent()->get_conn_id())
         break;
       if (param->read.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
@@ -87,7 +87,7 @@ void BLESensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
       break;
     }
     case ESP_GATTC_NOTIFY_EVT: {
-      if (param->notify.conn_id != this->parent()->conn_id || param->notify.handle != this->handle)
+      if (param->notify.conn_id != this->parent()->get_conn_id() || param->notify.handle != this->handle)
         break;
       ESP_LOGV(TAG, "[%s] ESP_GATTC_NOTIFY_EVT: handle=0x%x, value=0x%x", this->get_name().c_str(),
                param->notify.handle, param->notify.value[0]);
@@ -122,8 +122,8 @@ void BLESensor::update() {
     return;
   }
 
-  auto status =
-      esp_ble_gattc_read_char(this->parent()->gattc_if, this->parent()->conn_id, this->handle, ESP_GATT_AUTH_REQ_NONE);
+  auto status = esp_ble_gattc_read_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->handle,
+                                        ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     this->status_set_warning();
     this->publish_state(NAN);
diff --git a/esphome/components/ble_client/text_sensor/automation.h b/esphome/components/ble_client/text_sensor/automation.h
index be85892c5a..c504c35a58 100644
--- a/esphome/components/ble_client/text_sensor/automation.h
+++ b/esphome/components/ble_client/text_sensor/automation.h
@@ -19,7 +19,8 @@ class BLETextSensorNotifyTrigger : public Trigger<std::string>, public BLETextSe
         break;
       }
       case ESP_GATTC_NOTIFY_EVT: {
-        if (param->notify.conn_id != this->sensor_->parent()->conn_id || param->notify.handle != this->sensor_->handle)
+        if (param->notify.conn_id != this->sensor_->parent()->get_conn_id() ||
+            param->notify.handle != this->sensor_->handle)
           break;
         this->trigger(this->sensor_->parse_data(param->notify.value, param->notify.value_len));
       }
diff --git a/esphome/components/ble_client/text_sensor/ble_text_sensor.cpp b/esphome/components/ble_client/text_sensor/ble_text_sensor.cpp
index 1a71cd6cd8..1a304593c7 100644
--- a/esphome/components/ble_client/text_sensor/ble_text_sensor.cpp
+++ b/esphome/components/ble_client/text_sensor/ble_text_sensor.cpp
@@ -66,8 +66,8 @@ void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
         this->handle = descr->handle;
       }
       if (this->notify_) {
-        auto status =
-            esp_ble_gattc_register_for_notify(this->parent()->gattc_if, this->parent()->remote_bda, chr->handle);
+        auto status = esp_ble_gattc_register_for_notify(this->parent()->get_gattc_if(),
+                                                        this->parent()->get_remote_bda(), chr->handle);
         if (status) {
           ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, status=%d", status);
         }
@@ -77,7 +77,7 @@ void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       break;
     }
     case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->conn_id)
+      if (param->read.conn_id != this->parent()->get_conn_id())
         break;
       if (param->read.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
@@ -90,7 +90,7 @@ void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       break;
     }
     case ESP_GATTC_NOTIFY_EVT: {
-      if (param->notify.conn_id != this->parent()->conn_id || param->notify.handle != this->handle)
+      if (param->notify.conn_id != this->parent()->get_conn_id() || param->notify.handle != this->handle)
         break;
       ESP_LOGV(TAG, "[%s] ESP_GATTC_NOTIFY_EVT: handle=0x%x, value=0x%x", this->get_name().c_str(),
                param->notify.handle, param->notify.value[0]);
@@ -121,8 +121,8 @@ void BLETextSensor::update() {
     return;
   }
 
-  auto status =
-      esp_ble_gattc_read_char(this->parent()->gattc_if, this->parent()->conn_id, this->handle, ESP_GATT_AUTH_REQ_NONE);
+  auto status = esp_ble_gattc_read_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->handle,
+                                        ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     this->status_set_warning();
     this->publish_state(EMPTY);
diff --git a/esphome/components/bluetooth_proxy/__init__.py b/esphome/components/bluetooth_proxy/__init__.py
index a6a5a4391b..b5acea89dd 100644
--- a/esphome/components/bluetooth_proxy/__init__.py
+++ b/esphome/components/bluetooth_proxy/__init__.py
@@ -1,19 +1,23 @@
-from esphome.components import esp32_ble_tracker
+from esphome.components import esp32_ble_tracker, esp32_ble_client
 import esphome.config_validation as cv
 import esphome.codegen as cg
-from esphome.const import CONF_ID
+from esphome.const import CONF_ACTIVE, CONF_ID
 
-DEPENDENCIES = ["esp32", "esp32_ble_tracker"]
+AUTO_LOAD = ["esp32_ble_client", "esp32_ble_tracker"]
+DEPENDENCIES = ["esp32"]
 CODEOWNERS = ["@jesserockz"]
 
 
 bluetooth_proxy_ns = cg.esphome_ns.namespace("bluetooth_proxy")
 
-BluetoothProxy = bluetooth_proxy_ns.class_("BluetoothProxy", cg.Component)
+BluetoothProxy = bluetooth_proxy_ns.class_(
+    "BluetoothProxy", esp32_ble_client.BLEClientBase
+)
 
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(BluetoothProxy),
+        cv.Optional(CONF_ACTIVE, default=False): cv.boolean,
     }
 ).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
 
@@ -22,6 +26,8 @@ async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
-    await esp32_ble_tracker.register_ble_device(var, config)
+    cg.add(var.set_active(config[CONF_ACTIVE]))
+
+    await esp32_ble_tracker.register_client(var, config)
 
     cg.add_define("USE_BLUETOOTH_PROXY")
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index 41871295ce..96fee39f95 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -1,22 +1,39 @@
 #include "bluetooth_proxy.h"
 
-#ifdef USE_API
-#include "esphome/components/api/api_pb2.h"
-#include "esphome/components/api/api_server.h"
-#endif  // USE_API
 #include "esphome/core/log.h"
 
 #ifdef USE_ESP32
 
+#ifdef USE_API
+#include "esphome/components/api/api_server.h"
+#endif
+
 namespace esphome {
 namespace bluetooth_proxy {
 
 static const char *const TAG = "bluetooth_proxy";
 
+BluetoothProxy::BluetoothProxy() {
+  global_bluetooth_proxy = this;
+  this->address_ = 0;
+}
+
 bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
   ESP_LOGV(TAG, "Proxying packet from %s - %s. RSSI: %d dB", device.get_name().c_str(), device.address_str().c_str(),
            device.get_rssi());
   this->send_api_packet_(device);
+
+  this->address_type_map_[device.address_uint64()] = device.get_address_type();
+
+  if (this->address_ == 0)
+    return true;
+
+  if (this->state_ == espbt::ClientState::DISCOVERED) {
+    ESP_LOGV(TAG, "Connecting to address %s", this->address_str().c_str());
+    return true;
+  }
+
+  BLEClientBase::parse_device(device);
   return true;
 }
 
@@ -35,23 +52,309 @@ void BluetoothProxy::send_api_packet_(const esp32_ble_tracker::ESPBTDevice &devi
   for (auto &data : device.get_service_datas()) {
     api::BluetoothServiceData service_data;
     service_data.uuid = data.uuid.to_string();
-    for (auto d : data.data)
-      service_data.data.push_back(d);
-    resp.service_data.push_back(service_data);
+    service_data.data.assign(data.data.begin(), data.data.end());
+    resp.service_data.push_back(std::move(service_data));
   }
   for (auto &data : device.get_manufacturer_datas()) {
     api::BluetoothServiceData manufacturer_data;
     manufacturer_data.uuid = data.uuid.to_string();
-    for (auto d : data.data)
-      manufacturer_data.data.push_back(d);
-    resp.manufacturer_data.push_back(manufacturer_data);
+    manufacturer_data.data.assign(data.data.begin(), data.data.end());
+    resp.manufacturer_data.push_back(std::move(manufacturer_data));
   }
   api::global_api_server->send_bluetooth_le_advertisement(resp);
 #endif
 }
 
+void BluetoothProxy::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+                                         esp_ble_gattc_cb_param_t *param) {
+  BLEClientBase::gattc_event_handler(event, gattc_if, param);
+  switch (event) {
+    case ESP_GATTC_DISCONNECT_EVT: {
+#ifdef USE_API
+      api::global_api_server->send_bluetooth_device_connection(this->address_, false, this->mtu_,
+                                                               param->disconnect.reason);
+      api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
+                                                              this->get_bluetooth_connections_limit());
+#endif
+      this->address_ = 0;
+    }
+    case ESP_GATTC_OPEN_EVT: {
+      if (param->open.status != ESP_GATT_OK && param->open.status != ESP_GATT_ALREADY_OPEN) {
+#ifdef USE_API
+        api::global_api_server->send_bluetooth_device_connection(this->address_, false, this->mtu_, param->open.status);
+
+#endif
+        break;
+      }
+      break;
+    }
+    case ESP_GATTC_SEARCH_CMPL_EVT: {
+#ifdef USE_API
+      api::global_api_server->send_bluetooth_device_connection(this->address_, true, this->mtu_);
+      api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
+                                                              this->get_bluetooth_connections_limit());
+#endif
+      break;
+    }
+    case ESP_GATTC_READ_DESCR_EVT:
+    case ESP_GATTC_READ_CHAR_EVT: {
+      if (param->read.conn_id != this->conn_id_)
+        break;
+      if (param->read.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "Error reading char/descriptor at handle %d, status=%d", param->read.handle, param->read.status);
+        break;
+      }
+#ifdef USE_API
+      api::BluetoothGATTReadResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->read.handle;
+      resp.data.reserve(param->read.value_len);
+      for (uint16_t i = 0; i < param->read.value_len; i++) {
+        resp.data.push_back(param->read.value[i]);
+      }
+      api::global_api_server->send_bluetooth_gatt_read_response(resp);
+#endif
+      break;
+    }
+    case ESP_GATTC_NOTIFY_EVT: {
+      if (param->notify.conn_id != this->conn_id_)
+        break;
+      ESP_LOGV(TAG, "ESP_GATTC_NOTIFY_EVT: handle=0x%x", param->notify.handle);
+#ifdef USE_API
+      api::BluetoothGATTNotifyDataResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->notify.handle;
+      resp.data.reserve(param->notify.value_len);
+      for (uint16_t i = 0; i < param->notify.value_len; i++) {
+        resp.data.push_back(param->notify.value[i]);
+      }
+      api::global_api_server->send_bluetooth_gatt_notify_data_response(resp);
+#endif
+      break;
+    }
+    default:
+      break;
+  }
+}
+
 void BluetoothProxy::dump_config() { ESP_LOGCONFIG(TAG, "Bluetooth Proxy:"); }
 
+void BluetoothProxy::loop() {
+  BLEClientBase::loop();
+#ifdef USE_API
+  if (this->state_ != espbt::ClientState::IDLE && !api::global_api_server->is_connected()) {
+    ESP_LOGI(TAG, "[%s] Disconnecting.", this->address_str().c_str());
+    auto err = esp_ble_gattc_close(this->gattc_if_, this->conn_id_);
+    if (err != ERR_OK) {
+      ESP_LOGW(TAG, "esp_ble_gattc_close error, address=%s err=%d", this->address_str().c_str(), err);
+    }
+  }
+
+  if (this->send_service_ == this->services_.size()) {
+    this->send_service_ = -1;
+    api::global_api_server->send_bluetooth_gatt_services_done(this->address_);
+  } else if (this->send_service_ >= 0) {
+    auto &service = this->services_[this->send_service_];
+    api::BluetoothGATTGetServicesResponse resp;
+    resp.address = this->address_;
+    api::BluetoothGATTService service_resp;
+    service_resp.uuid = {service->uuid.get_128bit_high(), service->uuid.get_128bit_low()};
+    service_resp.handle = service->start_handle;
+    for (auto &characteristic : service->characteristics) {
+      api::BluetoothGATTCharacteristic characteristic_resp;
+      characteristic_resp.uuid = {characteristic->uuid.get_128bit_high(), characteristic->uuid.get_128bit_low()};
+      characteristic_resp.handle = characteristic->handle;
+      characteristic_resp.properties = characteristic->properties;
+      for (auto &descriptor : characteristic->descriptors) {
+        api::BluetoothGATTDescriptor descriptor_resp;
+        descriptor_resp.uuid = {descriptor->uuid.get_128bit_high(), descriptor->uuid.get_128bit_low()};
+        descriptor_resp.handle = descriptor->handle;
+        characteristic_resp.descriptors.push_back(std::move(descriptor_resp));
+      }
+      service_resp.characteristics.push_back(std::move(characteristic_resp));
+    }
+    resp.services.push_back(std::move(service_resp));
+    api::global_api_server->send_bluetooth_gatt_services(resp);
+    this->send_service_++;
+  }
+#endif
+}
+
+#ifdef USE_API
+void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest &msg) {
+  switch (msg.request_type) {
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT: {
+      this->address_ = msg.address;
+      if (this->address_type_map_.find(this->address_) != this->address_type_map_.end()) {
+        // Utilise the address type cache
+        this->remote_addr_type_ = this->address_type_map_[this->address_];
+      } else {
+        this->remote_addr_type_ = BLE_ADDR_TYPE_PUBLIC;
+      }
+      this->remote_bda_[0] = (this->address_ >> 40) & 0xFF;
+      this->remote_bda_[1] = (this->address_ >> 32) & 0xFF;
+      this->remote_bda_[2] = (this->address_ >> 24) & 0xFF;
+      this->remote_bda_[3] = (this->address_ >> 16) & 0xFF;
+      this->remote_bda_[4] = (this->address_ >> 8) & 0xFF;
+      this->remote_bda_[5] = (this->address_ >> 0) & 0xFF;
+      this->set_state(espbt::ClientState::DISCOVERED);
+      esp_ble_gap_stop_scanning();
+      break;
+    }
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT: {
+      if (this->state() != espbt::ClientState::IDLE) {
+        ESP_LOGI(TAG, "[%s] Disconnecting.", this->address_str().c_str());
+        auto err = esp_ble_gattc_close(this->gattc_if_, this->conn_id_);
+        if (err != ERR_OK) {
+          ESP_LOGW(TAG, "esp_ble_gattc_close error, address=%s err=%d", this->address_str().c_str(), err);
+        }
+      }
+      break;
+    }
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR:
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR:
+      break;
+  }
+}
+
+void BluetoothProxy::bluetooth_gatt_read(const api::BluetoothGATTReadRequest &msg) {
+  if (this->state_ != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "Cannot read GATT characteristic, not connected.");
+    return;
+  }
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for read GATT characteristic request");
+    return;
+  }
+
+  auto *characteristic = this->get_characteristic(msg.handle);
+  if (characteristic == nullptr) {
+    ESP_LOGW(TAG, "Cannot read GATT characteristic, not found.");
+    return;
+  }
+
+  ESP_LOGV(TAG, "Reading GATT characteristic %s", characteristic->uuid.to_string().c_str());
+
+  esp_err_t err =
+      esp_ble_gattc_read_char(this->gattc_if_, this->conn_id_, characteristic->handle, ESP_GATT_AUTH_REQ_NONE);
+  if (err != ERR_OK) {
+    ESP_LOGW(TAG, "esp_ble_gattc_read_char error, err=%d", err);
+  }
+}
+
+void BluetoothProxy::bluetooth_gatt_write(const api::BluetoothGATTWriteRequest &msg) {
+  if (this->state_ != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "Cannot write GATT characteristic, not connected.");
+    return;
+  }
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for write GATT characteristic request");
+    return;
+  }
+
+  auto *characteristic = this->get_characteristic(msg.handle);
+  if (characteristic == nullptr) {
+    ESP_LOGW(TAG, "Cannot write GATT characteristic, not found.");
+    return;
+  }
+
+  ESP_LOGV(TAG, "Writing GATT characteristic %s", characteristic->uuid.to_string().c_str());
+  characteristic->write_value((uint8_t *) msg.data.data(), msg.data.size(),
+                              msg.response ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP);
+}
+
+void BluetoothProxy::bluetooth_gatt_read_descriptor(const api::BluetoothGATTReadDescriptorRequest &msg) {
+  if (this->state_ != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "Cannot read GATT characteristic descriptor, not connected.");
+    return;
+  }
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for read GATT characteristic descriptor request");
+    return;
+  }
+
+  auto *descriptor = this->get_descriptor(msg.handle);
+  if (descriptor == nullptr) {
+    ESP_LOGW(TAG, "Cannot read GATT characteristic descriptor, not found.");
+    return;
+  }
+
+  ESP_LOGV(TAG, "Reading GATT characteristic descriptor %s -> %s", descriptor->characteristic->uuid.to_string().c_str(),
+           descriptor->uuid.to_string().c_str());
+
+  esp_err_t err =
+      esp_ble_gattc_read_char_descr(this->gattc_if_, this->conn_id_, descriptor->handle, ESP_GATT_AUTH_REQ_NONE);
+  if (err != ERR_OK) {
+    ESP_LOGW(TAG, "esp_ble_gattc_read_char error, err=%d", err);
+  }
+}
+
+void BluetoothProxy::bluetooth_gatt_write_descriptor(const api::BluetoothGATTWriteDescriptorRequest &msg) {
+  if (this->state_ != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "Cannot write GATT characteristic descriptor, not connected.");
+    return;
+  }
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for write GATT characteristic descriptor request");
+    return;
+  }
+
+  auto *descriptor = this->get_descriptor(msg.handle);
+  if (descriptor == nullptr) {
+    ESP_LOGW(TAG, "Cannot write GATT characteristic descriptor, not found.");
+    return;
+  }
+
+  ESP_LOGV(TAG, "Writing GATT characteristic descriptor %s -> %s", descriptor->characteristic->uuid.to_string().c_str(),
+           descriptor->uuid.to_string().c_str());
+
+  esp_err_t err =
+      esp_ble_gattc_write_char_descr(this->gattc_if_, this->conn_id_, descriptor->handle, msg.data.size(),
+                                     (uint8_t *) msg.data.data(), ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+  if (err != ERR_OK) {
+    ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, err=%d", err);
+  }
+}
+
+void BluetoothProxy::bluetooth_gatt_send_services(const api::BluetoothGATTGetServicesRequest &msg) {
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for service list request");
+    return;
+  }
+  this->send_service_ = 0;
+}
+
+void BluetoothProxy::bluetooth_gatt_notify(const api::BluetoothGATTNotifyRequest &msg) {
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for notify");
+    return;
+  }
+
+  auto *characteristic = this->get_characteristic(msg.handle);
+
+  if (characteristic == nullptr) {
+    ESP_LOGW(TAG, "Cannot notify GATT characteristic, not found.");
+    return;
+  }
+
+  esp_err_t err;
+  if (msg.enable) {
+    err = esp_ble_gattc_register_for_notify(this->gattc_if_, this->remote_bda_, characteristic->handle);
+    if (err != ESP_OK) {
+      ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, err=%d", err);
+    }
+  } else {
+    err = esp_ble_gattc_unregister_for_notify(this->gattc_if_, this->remote_bda_, characteristic->handle);
+    if (err != ESP_OK) {
+      ESP_LOGW(TAG, "esp_ble_gattc_unregister_for_notify failed, err=%d", err);
+    }
+  }
+}
+
+#endif
+
+BluetoothProxy *global_bluetooth_proxy = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+
 }  // namespace bluetooth_proxy
 }  // namespace esphome
 
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.h b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
index 9a936747c0..8ff43aff3f 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -4,22 +4,59 @@
 
 #include <map>
 
+#include "esphome/components/esp32_ble_client/ble_client_base.h"
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
+#include "esphome/core/defines.h"
+
+#include <map>
+
+#ifdef USE_API
+#include "esphome/components/api/api_pb2.h"
+#endif  // USE_API
 
 namespace esphome {
 namespace bluetooth_proxy {
 
-class BluetoothProxy : public Component, public esp32_ble_tracker::ESPBTDeviceListener {
+using namespace esp32_ble_client;
+
+class BluetoothProxy : public BLEClientBase {
  public:
+  BluetoothProxy();
   bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
   void dump_config() override;
+  void loop() override;
+
+  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+                           esp_ble_gattc_cb_param_t *param) override;
+
+#ifdef USE_API
+  void bluetooth_device_request(const api::BluetoothDeviceRequest &msg);
+  void bluetooth_gatt_read(const api::BluetoothGATTReadRequest &msg);
+  void bluetooth_gatt_write(const api::BluetoothGATTWriteRequest &msg);
+  void bluetooth_gatt_read_descriptor(const api::BluetoothGATTReadDescriptorRequest &msg);
+  void bluetooth_gatt_write_descriptor(const api::BluetoothGATTWriteDescriptorRequest &msg);
+  void bluetooth_gatt_send_services(const api::BluetoothGATTGetServicesRequest &msg);
+  void bluetooth_gatt_notify(const api::BluetoothGATTNotifyRequest &msg);
+#endif
+
+  int get_bluetooth_connections_free() { return this->state_ == espbt::ClientState::IDLE ? 1 : 0; }
+  int get_bluetooth_connections_limit() { return 1; }
+
+  void set_active(bool active) { this->active_ = active; }
+  bool has_active() { return this->active_; }
 
  protected:
   void send_api_packet_(const esp32_ble_tracker::ESPBTDevice &device);
+
+  std::map<uint64_t, esp_ble_addr_type_t> address_type_map_;
+  int16_t send_service_{-1};
+  bool active_;
 };
 
+extern BluetoothProxy *global_bluetooth_proxy;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+
 }  // namespace bluetooth_proxy
 }  // namespace esphome
 
diff --git a/esphome/components/esp32_ble_client/__init__.py b/esphome/components/esp32_ble_client/__init__.py
new file mode 100644
index 0000000000..94a5576d0b
--- /dev/null
+++ b/esphome/components/esp32_ble_client/__init__.py
@@ -0,0 +1,12 @@
+import esphome.codegen as cg
+
+from esphome.components import esp32_ble_tracker
+
+AUTO_LOAD = ["esp32_ble_tracker"]
+CODEOWNERS = ["@jesserockz"]
+DEPENDENCIES = ["esp32"]
+
+esp32_ble_client_ns = cg.esphome_ns.namespace("esp32_ble_client")
+BLEClientBase = esp32_ble_client_ns.class_(
+    "BLEClientBase", esp32_ble_tracker.ESPBTClient, cg.Component
+)
diff --git a/esphome/components/esp32_ble_client/ble_characteristic.cpp b/esphome/components/esp32_ble_client/ble_characteristic.cpp
new file mode 100644
index 0000000000..873833368c
--- /dev/null
+++ b/esphome/components/esp32_ble_client/ble_characteristic.cpp
@@ -0,0 +1,83 @@
+#include "ble_characteristic.h"
+#include "ble_client_base.h"
+#include "ble_service.h"
+
+#include "esphome/core/log.h"
+
+#ifdef USE_ESP32
+
+namespace esphome {
+namespace esp32_ble_client {
+
+static const char *const TAG = "esp32_ble_client.characteristic";
+
+BLECharacteristic::~BLECharacteristic() {
+  for (auto &desc : this->descriptors)
+    delete desc;  // NOLINT(cppcoreguidelines-owning-memory)
+}
+
+void BLECharacteristic::parse_descriptors() {
+  uint16_t offset = 0;
+  esp_gattc_descr_elem_t result;
+
+  while (true) {
+    uint16_t count = 1;
+    esp_gatt_status_t status =
+        esp_ble_gattc_get_all_descr(this->service->client->get_gattc_if(), this->service->client->get_conn_id(),
+                                    this->handle, &result, &count, offset);
+    if (status == ESP_GATT_INVALID_OFFSET || status == ESP_GATT_NOT_FOUND) {
+      break;
+    }
+    if (status != ESP_GATT_OK) {
+      ESP_LOGW(TAG, "esp_ble_gattc_get_all_descr error, status=%d", status);
+      break;
+    }
+    if (count == 0) {
+      break;
+    }
+
+    BLEDescriptor *desc = new BLEDescriptor();  // NOLINT(cppcoreguidelines-owning-memory)
+    desc->uuid = espbt::ESPBTUUID::from_uuid(result.uuid);
+    desc->handle = result.handle;
+    desc->characteristic = this;
+    this->descriptors.push_back(desc);
+    ESP_LOGV(TAG, "   descriptor %s, handle 0x%x", desc->uuid.to_string().c_str(), desc->handle);
+    offset++;
+  }
+}
+
+BLEDescriptor *BLECharacteristic::get_descriptor(espbt::ESPBTUUID uuid) {
+  for (auto &desc : this->descriptors) {
+    if (desc->uuid == uuid)
+      return desc;
+  }
+  return nullptr;
+}
+BLEDescriptor *BLECharacteristic::get_descriptor(uint16_t uuid) {
+  return this->get_descriptor(espbt::ESPBTUUID::from_uint16(uuid));
+}
+BLEDescriptor *BLECharacteristic::get_descriptor_by_handle(uint16_t handle) {
+  for (auto &desc : this->descriptors) {
+    if (desc->handle == handle)
+      return desc;
+  }
+  return nullptr;
+}
+
+void BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size, esp_gatt_write_type_t write_type) {
+  auto *client = this->service->client;
+  auto status = esp_ble_gattc_write_char(client->get_gattc_if(), client->get_conn_id(), this->handle, new_val_size,
+                                         new_val, write_type, ESP_GATT_AUTH_REQ_NONE);
+  if (status) {
+    ESP_LOGW(TAG, "Error sending write value to BLE gattc server, status=%d", status);
+  }
+}
+
+void BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size) {
+  write_value(new_val, new_val_size, ESP_GATT_WRITE_TYPE_NO_RSP);
+}
+
+}  // namespace esp32_ble_client
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/esp32_ble_client/ble_characteristic.h b/esphome/components/esp32_ble_client/ble_characteristic.h
new file mode 100644
index 0000000000..ffa9227cc4
--- /dev/null
+++ b/esphome/components/esp32_ble_client/ble_characteristic.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#ifdef USE_ESP32
+
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+
+#include "ble_descriptor.h"
+
+namespace esphome {
+namespace esp32_ble_client {
+
+namespace espbt = esphome::esp32_ble_tracker;
+
+class BLEService;
+
+class BLECharacteristic {
+ public:
+  ~BLECharacteristic();
+  espbt::ESPBTUUID uuid;
+  uint16_t handle;
+  esp_gatt_char_prop_t properties;
+  std::vector<BLEDescriptor *> descriptors;
+  void parse_descriptors();
+  BLEDescriptor *get_descriptor(espbt::ESPBTUUID uuid);
+  BLEDescriptor *get_descriptor(uint16_t uuid);
+  BLEDescriptor *get_descriptor_by_handle(uint16_t handle);
+  void write_value(uint8_t *new_val, int16_t new_val_size);
+  void write_value(uint8_t *new_val, int16_t new_val_size, esp_gatt_write_type_t write_type);
+  BLEService *service;
+};
+
+}  // namespace esp32_ble_client
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
new file mode 100644
index 0000000000..0e81c9aca8
--- /dev/null
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -0,0 +1,324 @@
+#include "ble_client_base.h"
+
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+#ifdef USE_ESP32
+
+namespace esphome {
+namespace esp32_ble_client {
+
+static const char *const TAG = "esp32_ble_client";
+
+void BLEClientBase::setup() {
+  auto ret = esp_ble_gattc_app_register(this->app_id);
+  if (ret) {
+    ESP_LOGE(TAG, "gattc app register failed. app_id=%d code=%d", this->app_id, ret);
+    this->mark_failed();
+  }
+  this->set_state(espbt::ClientState::IDLE);
+}
+
+void BLEClientBase::loop() {
+  if (this->state_ == espbt::ClientState::DISCOVERED) {
+    this->connect();
+  }
+}
+
+float BLEClientBase::get_setup_priority() const { return setup_priority::AFTER_BLUETOOTH; }
+
+bool BLEClientBase::parse_device(const espbt::ESPBTDevice &device) {
+  if (device.address_uint64() != this->address_)
+    return false;
+  if (this->state_ != espbt::ClientState::IDLE)
+    return false;
+
+  ESP_LOGD(TAG, "Found device at MAC address [%s]", device.address_str().c_str());
+  this->set_state(espbt::ClientState::DISCOVERED);
+
+  auto addr = device.address_uint64();
+  this->remote_bda_[0] = (addr >> 40) & 0xFF;
+  this->remote_bda_[1] = (addr >> 32) & 0xFF;
+  this->remote_bda_[2] = (addr >> 24) & 0xFF;
+  this->remote_bda_[3] = (addr >> 16) & 0xFF;
+  this->remote_bda_[4] = (addr >> 8) & 0xFF;
+  this->remote_bda_[5] = (addr >> 0) & 0xFF;
+  this->remote_addr_type_ = device.get_address_type();
+  return true;
+}
+
+std::string BLEClientBase::address_str() const {
+  return str_snprintf("%02x:%02x:%02x:%02x:%02x:%02x", 17, (uint8_t)(this->address_ >> 40) & 0xff,
+                      (uint8_t)(this->address_ >> 32) & 0xff, (uint8_t)(this->address_ >> 24) & 0xff,
+                      (uint8_t)(this->address_ >> 16) & 0xff, (uint8_t)(this->address_ >> 8) & 0xff,
+                      (uint8_t)(this->address_ >> 0) & 0xff);
+}
+
+void BLEClientBase::connect() {
+  ESP_LOGI(TAG, "Attempting BLE connection to %s", this->address_str().c_str());
+  auto ret = esp_ble_gattc_open(this->gattc_if_, this->remote_bda_, this->remote_addr_type_, true);
+  if (ret) {
+    ESP_LOGW(TAG, "esp_ble_gattc_open error, address=%s status=%d", this->address_str().c_str(), ret);
+    this->set_state(espbt::ClientState::IDLE);
+  } else {
+    this->set_state(espbt::ClientState::CONNECTING);
+  }
+}
+
+void BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t esp_gattc_if,
+                                        esp_ble_gattc_cb_param_t *param) {
+  if (event == ESP_GATTC_REG_EVT && this->app_id != param->reg.app_id)
+    return;
+  if (event != ESP_GATTC_REG_EVT && esp_gattc_if != ESP_GATT_IF_NONE && esp_gattc_if != this->gattc_if_)
+    return;
+
+  switch (event) {
+    case ESP_GATTC_REG_EVT: {
+      if (param->reg.status == ESP_GATT_OK) {
+        ESP_LOGV(TAG, "gattc registered app id %d", this->app_id);
+        this->gattc_if_ = esp_gattc_if;
+      } else {
+        ESP_LOGE(TAG, "gattc app registration failed id=%d code=%d", param->reg.app_id, param->reg.status);
+      }
+      break;
+    }
+    case ESP_GATTC_OPEN_EVT: {
+      ESP_LOGV(TAG, "[%s] ESP_GATTC_OPEN_EVT", this->address_str().c_str());
+      this->conn_id_ = param->open.conn_id;
+      if (param->open.status != ESP_GATT_OK && param->open.status != ESP_GATT_ALREADY_OPEN) {
+        ESP_LOGW(TAG, "connect to %s failed, status=%d", this->address_str().c_str(), param->open.status);
+        this->set_state(espbt::ClientState::IDLE);
+        break;
+      }
+      break;
+    }
+    case ESP_GATTC_CONNECT_EVT: {
+      ESP_LOGV(TAG, "[%s] ESP_GATTC_CONNECT_EVT", this->address_str().c_str());
+      if (this->conn_id_ != param->connect.conn_id) {
+        ESP_LOGD(TAG, "[%s] Unexpected conn_id in CONNECT_EVT: param conn=%d, open conn=%d",
+                 this->address_str().c_str(), param->connect.conn_id, this->conn_id_);
+      }
+      auto ret = esp_ble_gattc_send_mtu_req(this->gattc_if_, param->connect.conn_id);
+      if (ret) {
+        ESP_LOGW(TAG, "esp_ble_gattc_send_mtu_req failed, status=%x", ret);
+      }
+      break;
+    }
+    case ESP_GATTC_CFG_MTU_EVT: {
+      if (param->cfg_mtu.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "cfg_mtu to %s failed, mtu %d, status %d", this->address_str().c_str(), param->cfg_mtu.mtu,
+                 param->cfg_mtu.status);
+        this->set_state(espbt::ClientState::IDLE);
+        break;
+      }
+      ESP_LOGV(TAG, "cfg_mtu status %d, mtu %d", param->cfg_mtu.status, param->cfg_mtu.mtu);
+      this->mtu_ = param->cfg_mtu.mtu;
+      esp_ble_gattc_search_service(esp_gattc_if, param->cfg_mtu.conn_id, nullptr);
+      break;
+    }
+    case ESP_GATTC_DISCONNECT_EVT: {
+      if (memcmp(param->disconnect.remote_bda, this->remote_bda_, 6) != 0) {
+        return;
+      }
+      ESP_LOGV(TAG, "[%s] ESP_GATTC_DISCONNECT_EVT, reason %d", this->address_str().c_str(), param->disconnect.reason);
+      for (auto &svc : this->services_)
+        delete svc;  // NOLINT(cppcoreguidelines-owning-memory)
+      this->services_.clear();
+      this->set_state(espbt::ClientState::IDLE);
+      break;
+    }
+    case ESP_GATTC_SEARCH_RES_EVT: {
+      BLEService *ble_service = new BLEService();  // NOLINT(cppcoreguidelines-owning-memory)
+      ble_service->uuid = espbt::ESPBTUUID::from_uuid(param->search_res.srvc_id.uuid);
+      ble_service->start_handle = param->search_res.start_handle;
+      ble_service->end_handle = param->search_res.end_handle;
+      ble_service->client = this;
+      this->services_.push_back(ble_service);
+      break;
+    }
+    case ESP_GATTC_SEARCH_CMPL_EVT: {
+      ESP_LOGV(TAG, "[%s] ESP_GATTC_SEARCH_CMPL_EVT", this->address_str().c_str());
+      for (auto &svc : this->services_) {
+        ESP_LOGI(TAG, "Service UUID: %s", svc->uuid.to_string().c_str());
+        ESP_LOGI(TAG, "  start_handle: 0x%x  end_handle: 0x%x", svc->start_handle, svc->end_handle);
+        svc->parse_characteristics();
+      }
+      this->set_state(espbt::ClientState::CONNECTED);
+      this->state_ = espbt::ClientState::ESTABLISHED;
+      break;
+    }
+    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
+      auto *descr = this->get_config_descriptor(param->reg_for_notify.handle);
+      if (descr == nullptr) {
+        ESP_LOGW(TAG, "No descriptor found for notify of handle 0x%x", param->reg_for_notify.handle);
+        break;
+      }
+      if (descr->uuid.get_uuid().len != ESP_UUID_LEN_16 ||
+          descr->uuid.get_uuid().uuid.uuid16 != ESP_GATT_UUID_CHAR_CLIENT_CONFIG) {
+        ESP_LOGW(TAG, "Handle 0x%x (uuid %s) is not a client config char uuid", param->reg_for_notify.handle,
+                 descr->uuid.to_string().c_str());
+        break;
+      }
+      uint16_t notify_en = 1;
+      auto status =
+          esp_ble_gattc_write_char_descr(this->gattc_if_, this->conn_id_, descr->handle, sizeof(notify_en),
+                                         (uint8_t *) &notify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
+      if (status) {
+        ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, status=%d", status);
+      }
+      break;
+    }
+
+    default:
+      break;
+  }
+}
+
+void BLEClientBase::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
+  switch (event) {
+    // This event is sent by the server when it requests security
+    case ESP_GAP_BLE_SEC_REQ_EVT:
+      ESP_LOGV(TAG, "ESP_GAP_BLE_SEC_REQ_EVT %x", event);
+      esp_ble_gap_security_rsp(param->ble_security.ble_req.bd_addr, true);
+      break;
+    // This event is sent once authentication has completed
+    case ESP_GAP_BLE_AUTH_CMPL_EVT:
+      esp_bd_addr_t bd_addr;
+      memcpy(bd_addr, param->ble_security.auth_cmpl.bd_addr, sizeof(esp_bd_addr_t));
+      ESP_LOGI(TAG, "auth complete. remote BD_ADDR: %s", format_hex(bd_addr, 6).c_str());
+      if (!param->ble_security.auth_cmpl.success) {
+        ESP_LOGE(TAG, "auth fail reason = 0x%x", param->ble_security.auth_cmpl.fail_reason);
+      } else {
+        ESP_LOGV(TAG, "auth success. address type = %d auth mode = %d", param->ble_security.auth_cmpl.addr_type,
+                 param->ble_security.auth_cmpl.auth_mode);
+      }
+      break;
+    // There are other events we'll want to implement at some point to support things like pass key
+    // https://github.com/espressif/esp-idf/blob/cba69dd088344ed9d26739f04736ae7a37541b3a/examples/bluetooth/bluedroid/ble/gatt_security_client/tutorial/Gatt_Security_Client_Example_Walkthrough.md
+    default:
+      break;
+  }
+}
+
+// Parse GATT values into a float for a sensor.
+// Ref: https://www.bluetooth.com/specifications/assigned-numbers/format-types/
+float BLEClientBase::parse_char_value(uint8_t *value, uint16_t length) {
+  // A length of one means a single octet value.
+  if (length == 0)
+    return 0;
+  if (length == 1)
+    return (float) ((uint8_t) value[0]);
+
+  switch (value[0]) {
+    case 0x1:  // boolean.
+    case 0x2:  // 2bit.
+    case 0x3:  // nibble.
+    case 0x4:  // uint8.
+      return (float) ((uint8_t) value[1]);
+    case 0x5:  // uint12.
+    case 0x6:  // uint16.
+      if (length > 2) {
+        return (float) encode_uint16(value[1], value[2]);
+      }
+    case 0x7:  // uint24.
+      if (length > 3) {
+        return (float) encode_uint24(value[1], value[2], value[3]);
+      }
+    case 0x8:  // uint32.
+      if (length > 4) {
+        return (float) encode_uint32(value[1], value[2], value[3], value[4]);
+      }
+    case 0xC:  // int8.
+      return (float) ((int8_t) value[1]);
+    case 0xD:  // int12.
+    case 0xE:  // int16.
+      if (length > 2) {
+        return (float) ((int16_t)(value[1] << 8) + (int16_t) value[2]);
+      }
+    case 0xF:  // int24.
+      if (length > 3) {
+        return (float) ((int32_t)(value[1] << 16) + (int32_t)(value[2] << 8) + (int32_t)(value[3]));
+      }
+    case 0x10:  // int32.
+      if (length > 4) {
+        return (float) ((int32_t)(value[1] << 24) + (int32_t)(value[2] << 16) + (int32_t)(value[3] << 8) +
+                        (int32_t)(value[4]));
+      }
+  }
+  ESP_LOGW(TAG, "Cannot parse characteristic value of type 0x%x length %d", value[0], length);
+  return NAN;
+}
+
+BLEService *BLEClientBase::get_service(espbt::ESPBTUUID uuid) {
+  for (auto *svc : this->services_) {
+    if (svc->uuid == uuid)
+      return svc;
+  }
+  return nullptr;
+}
+
+BLEService *BLEClientBase::get_service(uint16_t uuid) { return this->get_service(espbt::ESPBTUUID::from_uint16(uuid)); }
+
+BLECharacteristic *BLEClientBase::get_characteristic(espbt::ESPBTUUID service, espbt::ESPBTUUID chr) {
+  auto *svc = this->get_service(service);
+  if (svc == nullptr)
+    return nullptr;
+  return svc->get_characteristic(chr);
+}
+
+BLECharacteristic *BLEClientBase::get_characteristic(uint16_t service, uint16_t chr) {
+  return this->get_characteristic(espbt::ESPBTUUID::from_uint16(service), espbt::ESPBTUUID::from_uint16(chr));
+}
+
+BLECharacteristic *BLEClientBase::get_characteristic(uint16_t handle) {
+  for (auto *svc : this->services_) {
+    for (auto *chr : svc->characteristics) {
+      if (chr->handle == handle)
+        return chr;
+    }
+  }
+  return nullptr;
+}
+
+BLEDescriptor *BLEClientBase::get_config_descriptor(uint16_t handle) {
+  auto *chr = this->get_characteristic(handle);
+  if (chr != nullptr) {
+    for (auto &desc : chr->descriptors) {
+      if (desc->uuid == espbt::ESPBTUUID::from_uint16(0x2902))
+        return desc;
+    }
+  }
+  return nullptr;
+}
+
+BLEDescriptor *BLEClientBase::get_descriptor(espbt::ESPBTUUID service, espbt::ESPBTUUID chr, espbt::ESPBTUUID descr) {
+  auto *svc = this->get_service(service);
+  if (svc == nullptr)
+    return nullptr;
+  auto *ch = svc->get_characteristic(chr);
+  if (ch == nullptr)
+    return nullptr;
+  return ch->get_descriptor(descr);
+}
+
+BLEDescriptor *BLEClientBase::get_descriptor(uint16_t service, uint16_t chr, uint16_t descr) {
+  return this->get_descriptor(espbt::ESPBTUUID::from_uint16(service), espbt::ESPBTUUID::from_uint16(chr),
+                              espbt::ESPBTUUID::from_uint16(descr));
+}
+
+BLEDescriptor *BLEClientBase::get_descriptor(uint16_t handle) {
+  for (auto *svc : this->services_) {
+    for (auto *chr : svc->characteristics) {
+      for (auto *desc : chr->descriptors) {
+        if (desc->handle == handle)
+          return desc;
+      }
+    }
+  }
+  return nullptr;
+}
+
+}  // namespace esp32_ble_client
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/esp32_ble_client/ble_client_base.h b/esphome/components/esp32_ble_client/ble_client_base.h
new file mode 100644
index 0000000000..eba70fa571
--- /dev/null
+++ b/esphome/components/esp32_ble_client/ble_client_base.h
@@ -0,0 +1,72 @@
+#pragma once
+
+#ifdef USE_ESP32
+
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/core/component.h"
+
+#include "ble_service.h"
+
+#include <array>
+#include <string>
+
+#include <esp_bt_defs.h>
+#include <esp_gap_ble_api.h>
+#include <esp_gatt_common_api.h>
+#include <esp_gattc_api.h>
+
+namespace esphome {
+namespace esp32_ble_client {
+
+namespace espbt = esphome::esp32_ble_tracker;
+
+class BLEClientBase : public espbt::ESPBTClient, public Component {
+ public:
+  void setup() override;
+  void loop() override;
+  float get_setup_priority() const override;
+
+  bool parse_device(const espbt::ESPBTDevice &device) override;
+  void on_scan_end() override {}
+  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 connect() override;
+
+  void set_address(uint64_t address) { this->address_ = address; }
+  std::string address_str() const;
+
+  BLEService *get_service(espbt::ESPBTUUID uuid);
+  BLEService *get_service(uint16_t uuid);
+  BLECharacteristic *get_characteristic(espbt::ESPBTUUID service, espbt::ESPBTUUID chr);
+  BLECharacteristic *get_characteristic(uint16_t service, uint16_t chr);
+  BLECharacteristic *get_characteristic(uint16_t handle);
+  BLEDescriptor *get_descriptor(espbt::ESPBTUUID service, espbt::ESPBTUUID chr, espbt::ESPBTUUID descr);
+  BLEDescriptor *get_descriptor(uint16_t service, uint16_t chr, uint16_t descr);
+  BLEDescriptor *get_descriptor(uint16_t handle);
+  // Get the configuration descriptor for the given characteristic handle.
+  BLEDescriptor *get_config_descriptor(uint16_t handle);
+
+  float parse_char_value(uint8_t *value, uint16_t length);
+
+  int get_gattc_if() const { return this->gattc_if_; }
+  uint8_t *get_remote_bda() { return this->remote_bda_; }
+  esp_ble_addr_type_t get_remote_addr_type() const { return this->remote_addr_type_; }
+  uint16_t get_conn_id() const { return this->conn_id_; }
+  uint64_t get_address() const { return this->address_; }
+
+ protected:
+  int gattc_if_;
+  esp_bd_addr_t remote_bda_;
+  esp_ble_addr_type_t remote_addr_type_;
+  uint16_t conn_id_;
+  uint64_t address_;
+  uint16_t mtu_{23};
+
+  std::vector<BLEService *> services_;
+};
+
+}  // namespace esp32_ble_client
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/esp32_ble_client/ble_descriptor.h b/esphome/components/esp32_ble_client/ble_descriptor.h
new file mode 100644
index 0000000000..c05430144f
--- /dev/null
+++ b/esphome/components/esp32_ble_client/ble_descriptor.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#ifdef USE_ESP32
+
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+
+namespace esphome {
+namespace esp32_ble_client {
+
+namespace espbt = esphome::esp32_ble_tracker;
+
+class BLECharacteristic;
+
+class BLEDescriptor {
+ public:
+  espbt::ESPBTUUID uuid;
+  uint16_t handle;
+
+  BLECharacteristic *characteristic;
+};
+
+}  // namespace esp32_ble_client
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/esp32_ble_client/ble_service.cpp b/esphome/components/esp32_ble_client/ble_service.cpp
new file mode 100644
index 0000000000..1d81eaa556
--- /dev/null
+++ b/esphome/components/esp32_ble_client/ble_service.cpp
@@ -0,0 +1,66 @@
+#include "ble_service.h"
+#include "ble_client_base.h"
+
+#include "esphome/core/log.h"
+
+#ifdef USE_ESP32
+
+namespace esphome {
+namespace esp32_ble_client {
+
+static const char *const TAG = "esp32_ble_client.service";
+
+BLECharacteristic *BLEService::get_characteristic(espbt::ESPBTUUID uuid) {
+  for (auto &chr : this->characteristics) {
+    if (chr->uuid == uuid)
+      return chr;
+  }
+  return nullptr;
+}
+
+BLECharacteristic *BLEService::get_characteristic(uint16_t uuid) {
+  return this->get_characteristic(espbt::ESPBTUUID::from_uint16(uuid));
+}
+
+BLEService::~BLEService() {
+  for (auto &chr : this->characteristics)
+    delete chr;  // NOLINT(cppcoreguidelines-owning-memory)
+}
+
+void BLEService::parse_characteristics() {
+  uint16_t offset = 0;
+  esp_gattc_char_elem_t result;
+
+  while (true) {
+    uint16_t count = 1;
+    esp_gatt_status_t status =
+        esp_ble_gattc_get_all_char(this->client->get_gattc_if(), this->client->get_conn_id(), this->start_handle,
+                                   this->end_handle, &result, &count, offset);
+    if (status == ESP_GATT_INVALID_OFFSET || status == ESP_GATT_NOT_FOUND) {
+      break;
+    }
+    if (status != ESP_GATT_OK) {
+      ESP_LOGW(TAG, "esp_ble_gattc_get_all_char error, status=%d", status);
+      break;
+    }
+    if (count == 0) {
+      break;
+    }
+
+    BLECharacteristic *characteristic = new BLECharacteristic();  // NOLINT(cppcoreguidelines-owning-memory)
+    characteristic->uuid = espbt::ESPBTUUID::from_uuid(result.uuid);
+    characteristic->properties = result.properties;
+    characteristic->handle = result.char_handle;
+    characteristic->service = this;
+    this->characteristics.push_back(characteristic);
+    ESP_LOGI(TAG, " characteristic %s, handle 0x%x, properties 0x%x", characteristic->uuid.to_string().c_str(),
+             characteristic->handle, characteristic->properties);
+    characteristic->parse_descriptors();
+    offset++;
+  }
+}
+
+}  // namespace esp32_ble_client
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/esp32_ble_client/ble_service.h b/esphome/components/esp32_ble_client/ble_service.h
new file mode 100644
index 0000000000..04f2212e0e
--- /dev/null
+++ b/esphome/components/esp32_ble_client/ble_service.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#ifdef USE_ESP32
+
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+
+#include "ble_characteristic.h"
+
+namespace esphome {
+namespace esp32_ble_client {
+
+namespace espbt = esphome::esp32_ble_tracker;
+
+class BLEClientBase;
+
+class BLEService {
+ public:
+  ~BLEService();
+  espbt::ESPBTUUID uuid;
+  uint16_t start_handle;
+  uint16_t end_handle;
+  std::vector<BLECharacteristic *> characteristics;
+  BLEClientBase *client;
+  void parse_characteristics();
+  BLECharacteristic *get_characteristic(espbt::ESPBTUUID uuid);
+  BLECharacteristic *get_characteristic(uint16_t uuid);
+};
+
+}  // namespace esp32_ble_client
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index 6d7868d4c5..0d7abe32f9 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
 from esphome.const import (
+    CONF_ACTIVE,
     CONF_ID,
     CONF_INTERVAL,
     CONF_DURATION,
@@ -22,7 +23,6 @@ DEPENDENCIES = ["esp32"]
 CONF_ESP32_BLE_ID = "esp32_ble_id"
 CONF_SCAN_PARAMETERS = "scan_parameters"
 CONF_WINDOW = "window"
-CONF_ACTIVE = "active"
 CONF_CONTINUOUS = "continuous"
 CONF_ON_SCAN_END = "on_scan_end"
 esp32_ble_tracker_ns = cg.esphome_ns.namespace("esp32_ble_tracker")
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 47c1f6022e..4aaa6dfa32 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -518,28 +518,39 @@ bool ESPBTUUID::operator==(const ESPBTUUID &uuid) const {
 }
 esp_bt_uuid_t ESPBTUUID::get_uuid() const { return this->uuid_; }
 std::string ESPBTUUID::to_string() const {
-  char sbuf[64];
   switch (this->uuid_.len) {
     case ESP_UUID_LEN_16:
-      sprintf(sbuf, "0x%02X%02X", this->uuid_.uuid.uuid16 >> 8, this->uuid_.uuid.uuid16 & 0xff);
-      break;
+      return str_snprintf("0x%02X%02X", 6, this->uuid_.uuid.uuid16 >> 8, this->uuid_.uuid.uuid16 & 0xff);
     case ESP_UUID_LEN_32:
-      sprintf(sbuf, "0x%02X%02X%02X%02X", this->uuid_.uuid.uuid32 >> 24, (this->uuid_.uuid.uuid32 >> 16 & 0xff),
-              (this->uuid_.uuid.uuid32 >> 8 & 0xff), this->uuid_.uuid.uuid32 & 0xff);
-      break;
+      return str_snprintf("0x%02X%02X%02X%02X", 10, this->uuid_.uuid.uuid32 >> 24,
+                          (this->uuid_.uuid.uuid32 >> 16 & 0xff), (this->uuid_.uuid.uuid32 >> 8 & 0xff),
+                          this->uuid_.uuid.uuid32 & 0xff);
     default:
     case ESP_UUID_LEN_128:
-      char *bpos = sbuf;
+      std::string buf;
       for (int8_t i = 15; i >= 0; i--) {
-        sprintf(bpos, "%02X", this->uuid_.uuid.uuid128[i]);
-        bpos += 2;
+        buf += str_snprintf("%02X", 2, this->uuid_.uuid.uuid128[i]);
         if (i == 6 || i == 8 || i == 10 || i == 12)
-          sprintf(bpos++, "-");
+          buf += "-";
       }
-      sbuf[47] = '\0';
-      break;
+      return buf;
   }
-  return sbuf;
+  return "";
+}
+
+uint64_t ESPBTUUID::get_128bit_high() const {
+  esp_bt_uuid_t uuid = this->as_128bit().get_uuid();
+  return ((uint64_t) uuid.uuid.uuid128[15] << 56) | ((uint64_t) uuid.uuid.uuid128[14] << 48) |
+         ((uint64_t) uuid.uuid.uuid128[13] << 40) | ((uint64_t) uuid.uuid.uuid128[12] << 32) |
+         ((uint64_t) uuid.uuid.uuid128[11] << 24) | ((uint64_t) uuid.uuid.uuid128[10] << 16) |
+         ((uint64_t) uuid.uuid.uuid128[9] << 8) | ((uint64_t) uuid.uuid.uuid128[8]);
+}
+uint64_t ESPBTUUID::get_128bit_low() const {
+  esp_bt_uuid_t uuid = this->as_128bit().get_uuid();
+  return ((uint64_t) uuid.uuid.uuid128[7] << 56) | ((uint64_t) uuid.uuid.uuid128[6] << 48) |
+         ((uint64_t) uuid.uuid.uuid128[5] << 40) | ((uint64_t) uuid.uuid.uuid128[4] << 32) |
+         ((uint64_t) uuid.uuid.uuid128[3] << 24) | ((uint64_t) uuid.uuid.uuid128[2] << 16) |
+         ((uint64_t) uuid.uuid.uuid128[1] << 8) | ((uint64_t) uuid.uuid.uuid128[0]);
 }
 
 ESPBLEiBeacon::ESPBLEiBeacon(const uint8_t *data) { memcpy(&this->beacon_data_, data, sizeof(beacon_data_)); }
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 29d0c81542..45abcd63fa 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -41,6 +41,9 @@ class ESPBTUUID {
 
   std::string to_string() const;
 
+  uint64_t get_128bit_high() const;
+  uint64_t get_128bit_low() const;
+
  protected:
   esp_bt_uuid_t uuid_;
 };
@@ -158,7 +161,7 @@ class ESPBTClient : public ESPBTDeviceListener {
                                    esp_ble_gattc_cb_param_t *param) = 0;
   virtual void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) = 0;
   virtual void connect() = 0;
-  void set_state(ClientState st) { this->state_ = st; }
+  virtual void set_state(ClientState st) { this->state_ = st; }
   ClientState state() const { return state_; }
   int app_id;
 
diff --git a/esphome/components/esp32_ble_tracker/queue.h b/esphome/components/esp32_ble_tracker/queue.h
index f09b2ca8d7..f3a2b3cb3c 100644
--- a/esphome/components/esp32_ble_tracker/queue.h
+++ b/esphome/components/esp32_ble_tracker/queue.h
@@ -72,13 +72,13 @@ class BLEEvent {
     // Need to also make a copy of relevant event data.
     switch (e) {
       case ESP_GATTC_NOTIFY_EVT:
-        memcpy(this->event_.gattc.data, p->notify.value, p->notify.value_len);
-        this->event_.gattc.gattc_param.notify.value = this->event_.gattc.data;
+        this->data.assign(p->notify.value, p->notify.value + p->notify.value_len);
+        this->event_.gattc.gattc_param.notify.value = this->data.data();
         break;
       case ESP_GATTC_READ_CHAR_EVT:
       case ESP_GATTC_READ_DESCR_EVT:
-        memcpy(this->event_.gattc.data, p->read.value, p->read.value_len);
-        this->event_.gattc.gattc_param.read.value = this->event_.gattc.data;
+        this->data.assign(p->read.value, p->read.value + p->read.value_len);
+        this->event_.gattc.gattc_param.read.value = this->data.data();
         break;
       default:
         break;
@@ -96,9 +96,9 @@ class BLEEvent {
       esp_gattc_cb_event_t gattc_event;
       esp_gatt_if_t gattc_if;
       esp_ble_gattc_cb_param_t gattc_param;
-      uint8_t data[64];
     } gattc;
   } event_;
+  std::vector<uint8_t> data{};
   uint8_t type_;  // 0=gap 1=gattc
 };
 
diff --git a/esphome/components/pvvx_mithermometer/display/pvvx_display.cpp b/esphome/components/pvvx_mithermometer/display/pvvx_display.cpp
index 21638ef7e4..384537e5d7 100644
--- a/esphome/components/pvvx_mithermometer/display/pvvx_display.cpp
+++ b/esphome/components/pvvx_mithermometer/display/pvvx_display.cpp
@@ -102,8 +102,9 @@ void PVVXDisplay::send_to_setup_char_(uint8_t *blk, size_t size) {
     ESP_LOGW(TAG, "[%s] Not connected to BLE client.", this->parent_->address_str().c_str());
     return;
   }
-  auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, size, blk,
-                                         ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+  auto status =
+      esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_, size,
+                               blk, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
   } else {
diff --git a/esphome/components/radon_eye_rd200/radon_eye_rd200.cpp b/esphome/components/radon_eye_rd200/radon_eye_rd200.cpp
index 6bb17f0508..3959178b94 100644
--- a/esphome/components/radon_eye_rd200/radon_eye_rd200.cpp
+++ b/esphome/components/radon_eye_rd200/radon_eye_rd200.cpp
@@ -50,7 +50,7 @@ void RadonEyeRD200::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
     }
 
     case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->conn_id)
+      if (param->read.conn_id != this->parent()->get_conn_id())
         break;
       if (param->read.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
@@ -146,17 +146,17 @@ void RadonEyeRD200::update() {
 void RadonEyeRD200::write_query_message_() {
   ESP_LOGV(TAG, "writing 0x50 to write service");
   int request = 0x50;
-  auto status = esp_ble_gattc_write_char_descr(this->parent()->gattc_if, this->parent()->conn_id, this->write_handle_,
-                                               sizeof(request), (uint8_t *) &request, ESP_GATT_WRITE_TYPE_NO_RSP,
-                                               ESP_GATT_AUTH_REQ_NONE);
+  auto status = esp_ble_gattc_write_char_descr(this->parent()->get_gattc_if(), this->parent()->get_conn_id(),
+                                               this->write_handle_, sizeof(request), (uint8_t *) &request,
+                                               ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     ESP_LOGW(TAG, "Error sending write request for sensor, status=%d", status);
   }
 }
 
 void RadonEyeRD200::request_read_values_() {
-  auto status = esp_ble_gattc_read_char(this->parent()->gattc_if, this->parent()->conn_id, this->read_handle_,
-                                        ESP_GATT_AUTH_REQ_NONE);
+  auto status = esp_ble_gattc_read_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(),
+                                        this->read_handle_, ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     ESP_LOGW(TAG, "Error sending read request for sensor, status=%d", status);
   }
diff --git a/esphome/const.py b/esphome/const.py
index 22f030e84e..d12708cdd6 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -23,6 +23,7 @@ CONF_ACCURACY = "accuracy"
 CONF_ACCURACY_DECIMALS = "accuracy_decimals"
 CONF_ACTION_ID = "action_id"
 CONF_ACTION_STATE_TOPIC = "action_state_topic"
+CONF_ACTIVE = "active"
 CONF_ACTIVE_POWER = "active_power"
 CONF_ADDRESS = "address"
 CONF_ADDRESSABLE_LIGHT_ID = "addressable_light_id"

From e8ff36d1f3766950c13bafcbcf0bd05d8184edc8 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Mon, 3 Oct 2022 18:50:33 -0300
Subject: [PATCH 107/838] fix dump preset string type (#3863)

---
 esphome/components/thermostat/thermostat_climate.cpp | 4 +---
 esphome/components/thermostat/thermostat_climate.h   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/esphome/components/thermostat/thermostat_climate.cpp b/esphome/components/thermostat/thermostat_climate.cpp
index a9b03187d3..54e9f1687c 100644
--- a/esphome/components/thermostat/thermostat_climate.cpp
+++ b/esphome/components/thermostat/thermostat_climate.cpp
@@ -935,10 +935,8 @@ bool ThermostatClimate::supplemental_heating_required_() {
           (this->supplemental_action_ == climate::CLIMATE_ACTION_HEATING));
 }
 
-void ThermostatClimate::dump_preset_config_(const std::string &preset, const ThermostatClimateTargetTempConfig &config,
+void ThermostatClimate::dump_preset_config_(const char *preset_name, const ThermostatClimateTargetTempConfig &config,
                                             bool is_default_preset) {
-  const auto *preset_name = preset.c_str();
-
   ESP_LOGCONFIG(TAG, "      %s Is Default: %s", preset_name, YESNO(is_default_preset));
 
   if (this->supports_heat_) {
diff --git a/esphome/components/thermostat/thermostat_climate.h b/esphome/components/thermostat/thermostat_climate.h
index aa7529cfb1..a738ba4986 100644
--- a/esphome/components/thermostat/thermostat_climate.h
+++ b/esphome/components/thermostat/thermostat_climate.h
@@ -228,7 +228,7 @@ class ThermostatClimate : public climate::Climate, public Component {
   bool supplemental_cooling_required_();
   bool supplemental_heating_required_();
 
-  void dump_preset_config_(const std::string &preset_name, const ThermostatClimateTargetTempConfig &config,
+  void dump_preset_config_(const char *preset_name, const ThermostatClimateTargetTempConfig &config,
                            bool is_default_preset);
 
   /// The sensor used for getting the current temperature

From 16249c02a5800a90c134bafa4e770d64a43f0317 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 5 Oct 2022 11:21:13 +1300
Subject: [PATCH 108/838] Bump CI to python 3.9 (#3869)

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b5b7521b3f..671b74d118 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,7 +85,7 @@ jobs:
         uses: actions/setup-python@v4
         id: python
         with:
-          python-version: "3.8"
+          python-version: "3.9"
 
       - name: Cache virtualenv
         uses: actions/cache@v3

From 05edfd0e82882f763253e72e1bc7e0c2f3963119 Mon Sep 17 00:00:00 2001
From: Javier Peletier <jpeletier@users.noreply.github.com>
Date: Wed, 5 Oct 2022 00:50:03 +0200
Subject: [PATCH 109/838] Add cg.with_local_variable (#3577)

---
 esphome/codegen.py                  |  1 +
 esphome/components/wifi/__init__.py | 16 ++++++----
 esphome/cpp_generator.py            | 45 +++++++++++++++++++++++++++--
 3 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/esphome/codegen.py b/esphome/codegen.py
index 185e6599b1..ef5b490004 100644
--- a/esphome/codegen.py
+++ b/esphome/codegen.py
@@ -22,6 +22,7 @@ from esphome.cpp_generator import (  # noqa
     static_const_array,
     statement,
     variable,
+    with_local_variable,
     new_variable,
     Pvariable,
     new_Pvariable,
diff --git a/esphome/components/wifi/__init__.py b/esphome/components/wifi/__init__.py
index 846a8e1303..a4c246da89 100644
--- a/esphome/components/wifi/__init__.py
+++ b/esphome/components/wifi/__init__.py
@@ -332,8 +332,7 @@ def manual_ip(config):
     )
 
 
-def wifi_network(config, static_ip):
-    ap = cg.variable(config[CONF_ID], WiFiAP())
+def wifi_network(config, ap, static_ip):
     if CONF_SSID in config:
         cg.add(ap.set_ssid(config[CONF_SSID]))
     if CONF_PASSWORD in config:
@@ -360,14 +359,21 @@ async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_use_address(config[CONF_USE_ADDRESS]))
 
-    for network in config.get(CONF_NETWORKS, []):
+    def add_sta(ap, network):
         ip_config = network.get(CONF_MANUAL_IP, config.get(CONF_MANUAL_IP))
-        cg.add(var.add_sta(wifi_network(network, ip_config)))
+        cg.add(var.add_sta(wifi_network(network, ap, ip_config)))
+
+    for network in config.get(CONF_NETWORKS, []):
+        cg.with_local_variable(network[CONF_ID], WiFiAP(), add_sta, network)
 
     if CONF_AP in config:
         conf = config[CONF_AP]
         ip_config = conf.get(CONF_MANUAL_IP, config.get(CONF_MANUAL_IP))
-        cg.add(var.set_ap(wifi_network(conf, ip_config)))
+        cg.with_local_variable(
+            conf[CONF_ID],
+            WiFiAP(),
+            lambda ap: cg.add(var.set_ap(wifi_network(conf, ap, ip_config))),
+        )
         cg.add(var.set_ap_timeout(conf[CONF_AP_TIMEOUT]))
 
     cg.add(var.set_reboot_timeout(config[CONF_REBOOT_TIMEOUT]))
diff --git a/esphome/cpp_generator.py b/esphome/cpp_generator.py
index 42828450e8..df806af1a5 100644
--- a/esphome/cpp_generator.py
+++ b/esphome/cpp_generator.py
@@ -5,7 +5,17 @@ import re
 from esphome.yaml_util import ESPHomeDataBase
 
 # pylint: disable=unused-import, wrong-import-order
-from typing import Any, Generator, List, Optional, Tuple, Type, Union, Sequence
+from typing import (
+    Any,
+    Callable,
+    Generator,
+    List,
+    Optional,
+    Tuple,
+    Type,
+    Union,
+    Sequence,
+)
 
 from esphome.core import (  # noqa
     CORE,
@@ -468,7 +478,9 @@ def statement(expression: Union[Expression, Statement]) -> Statement:
     return ExpressionStatement(expression)
 
 
-def variable(id_: ID, rhs: SafeExpType, type_: "MockObj" = None) -> "MockObj":
+def variable(
+    id_: ID, rhs: SafeExpType, type_: "MockObj" = None, register=True
+) -> "MockObj":
     """Declare a new variable, not pointer type, in the code generation.
 
     :param id_: The ID used to declare the variable.
@@ -485,10 +497,37 @@ def variable(id_: ID, rhs: SafeExpType, type_: "MockObj" = None) -> "MockObj":
         id_.type = type_
     assignment = AssignmentExpression(id_.type, "", id_, rhs)
     CORE.add(assignment)
-    CORE.register_variable(id_, obj)
+    if register:
+        CORE.register_variable(id_, obj)
     return obj
 
 
+def with_local_variable(
+    id_: ID, rhs: SafeExpType, callback: Callable[["MockObj"], None], *args
+) -> None:
+    """Declare a new variable, not pointer type, in the code generation, within a scoped block
+    The variable is only usable within the callback
+    The callback cannot be async.
+
+    :param id_: The ID used to declare the variable.
+    :param rhs: The expression to place on the right hand side of the assignment.
+    :param callback: The function to invoke that will receive the temporary variable
+    :param args: args to pass to the callback in addition to the temporary variable
+
+    """
+
+    # throw if the callback is async:
+    assert not inspect.iscoroutinefunction(
+        callback
+    ), "with_local_variable() callback cannot be async!"
+
+    CORE.add(RawStatement("{"))  # output opening curly brace
+    obj = variable(id_, rhs, None, True)
+    # invoke user-provided callback to generate code with this local variable
+    callback(obj, *args)
+    CORE.add(RawStatement("}"))  # output closing curly brace
+
+
 def new_variable(id_: ID, rhs: SafeExpType, type_: "MockObj" = None) -> "MockObj":
     """Declare and define a new variable, not pointer type, in the code generation.
 

From 584b722e7ed81c116faba601f46f20d952031a45 Mon Sep 17 00:00:00 2001
From: Javier Peletier <jpeletier@users.noreply.github.com>
Date: Wed, 5 Oct 2022 03:52:45 +0200
Subject: [PATCH 110/838] Fix time/automation (cron) wdt crash when time jumps
 ahead too much (#3844)

---
 esphome/components/time/automation.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/esphome/components/time/automation.cpp b/esphome/components/time/automation.cpp
index 7e16d7141f..af2b6c720c 100644
--- a/esphome/components/time/automation.cpp
+++ b/esphome/components/time/automation.cpp
@@ -6,6 +6,8 @@ namespace esphome {
 namespace time {
 
 static const char *const TAG = "automation";
+static const int MAX_TIMESTAMP_DRIFT = 900;  // how far can the clock drift before we consider
+                                             // there has been a drastic time synchronization
 
 void CronTrigger::add_second(uint8_t second) { this->seconds_[second] = true; }
 void CronTrigger::add_minute(uint8_t minute) { this->minutes_[minute] = true; }
@@ -23,12 +25,17 @@ void CronTrigger::loop() {
     return;
 
   if (this->last_check_.has_value()) {
-    if (*this->last_check_ > time && this->last_check_->timestamp - time.timestamp > 900) {
+    if (*this->last_check_ > time && this->last_check_->timestamp - time.timestamp > MAX_TIMESTAMP_DRIFT) {
       // We went back in time (a lot), probably caused by time synchronization
       ESP_LOGW(TAG, "Time has jumped back!");
     } else if (*this->last_check_ >= time) {
       // already handled this one
       return;
+    } else if (time > *this->last_check_ && time.timestamp - this->last_check_->timestamp > MAX_TIMESTAMP_DRIFT) {
+      // We went ahead in time (a lot), probably caused by time synchronization
+      ESP_LOGW(TAG, "Time has jumped ahead!");
+      this->last_check_ = time;
+      return;
     }
 
     while (true) {

From 263b6031886a097680a636e4f075c72eef02113b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Oct 2022 16:29:49 +1300
Subject: [PATCH 111/838] Bump pyupgrade from 2.37.3 to 3.0.0 (#3867)

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 083aea117d..d53263dcef 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: v2.37.3
+    rev: v3.0.0
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
diff --git a/requirements_test.txt b/requirements_test.txt
index 5ef791906d..e7b6387b73 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,7 +1,7 @@
 pylint==2.15.2
 flake8==5.0.4
 black==22.8.0  # also change in .pre-commit-config.yaml when updating
-pyupgrade==2.37.3  # also change in .pre-commit-config.yaml when updating
+pyupgrade==3.0.0  # also change in .pre-commit-config.yaml when updating
 pre-commit
 
 # Unit tests

From c3a89725509ebfd97bcb191ffec41764ef71dc70 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 5 Oct 2022 16:30:56 +1300
Subject: [PATCH 112/838] Add min_version to esphome config (#3866)

---
 .../external_components/__init__.py           |  2 +-
 esphome/components/packages/__init__.py       | 57 +++++++++++++++----
 esphome/config_validation.py                  |  4 +-
 esphome/const.py                              |  1 +
 esphome/core/config.py                        | 15 +++++
 esphome/git.py                                | 16 +++++-
 6 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/esphome/components/external_components/__init__.py b/esphome/components/external_components/__init__.py
index d0153f6104..53fd337ed8 100644
--- a/esphome/components/external_components/__init__.py
+++ b/esphome/components/external_components/__init__.py
@@ -98,7 +98,7 @@ async def to_code(config):
 
 
 def _process_git_config(config: dict, refresh) -> str:
-    repo_dir = git.clone_or_update(
+    repo_dir, _ = git.clone_or_update(
         url=config[CONF_URL],
         ref=config.get(CONF_REF),
         refresh=refresh,
diff --git a/esphome/components/packages/__init__.py b/esphome/components/packages/__init__.py
index 67220cae08..3b5a6a5908 100644
--- a/esphome/components/packages/__init__.py
+++ b/esphome/components/packages/__init__.py
@@ -5,14 +5,17 @@ from esphome.config_helpers import merge_config
 
 from esphome import git, yaml_util
 from esphome.const import (
+    CONF_ESPHOME,
     CONF_FILE,
     CONF_FILES,
+    CONF_MIN_VERSION,
     CONF_PACKAGES,
     CONF_REF,
     CONF_REFRESH,
     CONF_URL,
     CONF_USERNAME,
     CONF_PASSWORD,
+    __version__ as ESPHOME_VERSION,
 )
 import esphome.config_validation as cv
 
@@ -104,7 +107,7 @@ CONFIG_SCHEMA = cv.All(
 
 
 def _process_base_package(config: dict) -> dict:
-    repo_dir = git.clone_or_update(
+    repo_dir, revert = git.clone_or_update(
         url=config[CONF_URL],
         ref=config.get(CONF_REF),
         refresh=config[CONF_REFRESH],
@@ -112,21 +115,51 @@ def _process_base_package(config: dict) -> dict:
         username=config.get(CONF_USERNAME),
         password=config.get(CONF_PASSWORD),
     )
-    files: str = config[CONF_FILES]
+    files: list[str] = config[CONF_FILES]
+
+    def get_packages(files) -> dict:
+        packages = {}
+        for file in files:
+            yaml_file: Path = repo_dir / file
+
+            if not yaml_file.is_file():
+                raise cv.Invalid(
+                    f"{file} does not exist in repository", path=[CONF_FILES]
+                )
+
+            try:
+                new_yaml = yaml_util.load_yaml(yaml_file)
+                if (
+                    CONF_ESPHOME in new_yaml
+                    and CONF_MIN_VERSION in new_yaml[CONF_ESPHOME]
+                ):
+                    min_version = new_yaml[CONF_ESPHOME][CONF_MIN_VERSION]
+                    if cv.Version.parse(min_version) > cv.Version.parse(
+                        ESPHOME_VERSION
+                    ):
+                        raise cv.Invalid(
+                            f"Current ESPHome Version is too old to use this package: {ESPHOME_VERSION} < {min_version}"
+                        )
+
+                packages[file] = new_yaml
+            except EsphomeError as e:
+                raise cv.Invalid(
+                    f"{file} is not a valid YAML file. Please check the file contents."
+                ) from e
+        return packages
 
     packages = {}
-    for file in files:
-        yaml_file: Path = repo_dir / file
 
-        if not yaml_file.is_file():
-            raise cv.Invalid(f"{file} does not exist in repository", path=[CONF_FILES])
+    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")
 
-        try:
-            packages[file] = yaml_util.load_yaml(yaml_file)
-        except EsphomeError as e:
-            raise cv.Invalid(
-                f"{file} is not a valid YAML file. Please check the file contents."
-            ) from e
     return {"packages": packages}
 
 
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 0ff0ba83d9..09436c1fbf 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -1689,7 +1689,7 @@ class Version:
 
     @classmethod
     def parse(cls, value: str) -> "Version":
-        match = re.match(r"(\d+).(\d+).(\d+)", value)
+        match = re.match(r"^(\d+).(\d+).(\d+)-?\w*$", value)
         if match is None:
             raise ValueError(f"Not a valid version number {value}")
         major = int(match[1])
@@ -1703,7 +1703,7 @@ def version_number(value):
     try:
         return str(Version.parse(value))
     except ValueError as e:
-        raise Invalid("Not a version number") from e
+        raise Invalid("Not a valid version number") from e
 
 
 def platformio_version_constraint(value):
diff --git a/esphome/const.py b/esphome/const.py
index d12708cdd6..0f056498e4 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -396,6 +396,7 @@ CONF_MIN_POWER = "min_power"
 CONF_MIN_RANGE = "min_range"
 CONF_MIN_TEMPERATURE = "min_temperature"
 CONF_MIN_VALUE = "min_value"
+CONF_MIN_VERSION = "min_version"
 CONF_MINUTE = "minute"
 CONF_MINUTES = "minutes"
 CONF_MISO_PIN = "miso_pin"
diff --git a/esphome/core/config.py b/esphome/core/config.py
index 82cf37d44d..733cdcd66e 100644
--- a/esphome/core/config.py
+++ b/esphome/core/config.py
@@ -15,6 +15,7 @@ from esphome.const import (
     CONF_FRAMEWORK,
     CONF_INCLUDES,
     CONF_LIBRARIES,
+    CONF_MIN_VERSION,
     CONF_NAME,
     CONF_ON_BOOT,
     CONF_ON_LOOP,
@@ -30,6 +31,7 @@ from esphome.const import (
     KEY_CORE,
     TARGET_PLATFORMS,
     PLATFORM_ESP8266,
+    __version__ as ESPHOME_VERSION,
 )
 from esphome.core import CORE, coroutine_with_priority
 from esphome.helpers import copy_file_if_changed, walk_files
@@ -96,6 +98,16 @@ def valid_project_name(value: str):
     return value
 
 
+def validate_version(value: str):
+    min_version = cv.Version.parse(value)
+    current_version = cv.Version.parse(ESPHOME_VERSION)
+    if current_version < min_version:
+        raise cv.Invalid(
+            f"Your ESPHome version is too old. Please update to at least {min_version}"
+        )
+    return value
+
+
 CONF_ESP8266_RESTORE_FROM_FLASH = "esp8266_restore_from_flash"
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
@@ -136,6 +148,9 @@ CONFIG_SCHEMA = cv.All(
                     cv.Required(CONF_VERSION): cv.string_strict,
                 }
             ),
+            cv.Optional(CONF_MIN_VERSION, default=ESPHOME_VERSION): cv.All(
+                cv.version_number, validate_version
+            ),
         }
     ),
     validate_hostname,
diff --git a/esphome/git.py b/esphome/git.py
index 64c8d6a6b7..54fedc035f 100644
--- a/esphome/git.py
+++ b/esphome/git.py
@@ -2,6 +2,7 @@ from pathlib import Path
 import subprocess
 import hashlib
 import logging
+from typing import Callable, Optional
 import urllib.parse
 
 from datetime import datetime
@@ -12,7 +13,7 @@ import esphome.config_validation as cv
 _LOGGER = logging.getLogger(__name__)
 
 
-def run_git_command(cmd, cwd=None):
+def run_git_command(cmd, cwd=None) -> str:
     try:
         ret = subprocess.run(cmd, cwd=cwd, capture_output=True, check=False)
     except FileNotFoundError as err:
@@ -28,6 +29,8 @@ def run_git_command(cmd, cwd=None):
             raise cv.Invalid(lines[-1][len("fatal: ") :])
         raise cv.Invalid(err_str)
 
+    return ret.stdout.decode("utf-8").strip()
+
 
 def _compute_destination_path(key: str, domain: str) -> Path:
     base_dir = Path(CORE.config_dir) / ".esphome" / domain
@@ -44,7 +47,7 @@ def clone_or_update(
     domain: str,
     username: str = None,
     password: str = None,
-) -> Path:
+) -> tuple[Path, Optional[Callable[[], None]]]:
     key = f"{url}@{ref}"
 
     if username is not None and password is not None:
@@ -78,6 +81,7 @@ def clone_or_update(
             file_timestamp = Path(repo_dir / ".git" / "HEAD")
         age = datetime.now() - datetime.fromtimestamp(file_timestamp.stat().st_mtime)
         if age.total_seconds() > refresh.total_seconds:
+            old_sha = run_git_command(["git", "rev-parse", "HEAD"], str(repo_dir))
             _LOGGER.info("Updating %s", key)
             _LOGGER.debug("Location: %s", repo_dir)
             # Stash local changes (if any)
@@ -92,4 +96,10 @@ def clone_or_update(
             # Hard reset to FETCH_HEAD (short-lived git ref corresponding to most recent fetch)
             run_git_command(["git", "reset", "--hard", "FETCH_HEAD"], str(repo_dir))
 
-    return repo_dir
+            def revert():
+                _LOGGER.info("Reverting changes to %s -> %s", key, old_sha)
+                run_git_command(["git", "reset", "--hard", old_sha], str(repo_dir))
+
+            return repo_dir, revert
+
+    return repo_dir, None

From d220d41182e1b914a2eba39670f3c7396b630e38 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 5 Oct 2022 20:09:27 +1300
Subject: [PATCH 113/838] Bump python min to 3.9 (#3871)

---
 .pre-commit-config.yaml                    |  2 +-
 esphome/components/esp8266/gpio.py         |  3 +-
 esphome/components/neopixelbus/_methods.py |  4 +-
 esphome/components/select/__init__.py      |  7 +--
 esphome/config.py                          | 52 ++++++++---------
 esphome/config_helpers.py                  |  3 +-
 esphome/core/__init__.py                   | 20 +++----
 esphome/coroutine.py                       |  7 ++-
 esphome/cpp_generator.py                   | 26 ++++-----
 esphome/cpp_helpers.py                     |  5 +-
 esphome/dashboard/dashboard.py             |  6 +-
 esphome/final_validate.py                  |  4 +-
 esphome/helpers.py                         |  2 +-
 esphome/loader.py                          | 18 +++---
 esphome/platformio_api.py                  |  4 +-
 esphome/storage_json.py                    | 68 +++++++++++-----------
 esphome/types.py                           |  8 +--
 esphome/util.py                            |  7 +--
 esphome/vscode.py                          |  6 +-
 esphome/writer.py                          |  8 +--
 esphome/zeroconf.py                        |  6 +-
 pyproject.toml                             |  2 +-
 script/lint-python                         |  2 +-
 setup.py                                   |  2 +-
 tests/unit_tests/strategies.py             |  5 +-
 25 files changed, 130 insertions(+), 147 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d53263dcef..9c5610d9dc 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -30,4 +30,4 @@ repos:
     rev: v3.0.0
     hooks:
       - id: pyupgrade
-        args: [--py38-plus]
+        args: [--py39-plus]
diff --git a/esphome/components/esp8266/gpio.py b/esphome/components/esp8266/gpio.py
index cf33ec126b..d4b2078524 100644
--- a/esphome/components/esp8266/gpio.py
+++ b/esphome/components/esp8266/gpio.py
@@ -1,6 +1,5 @@
 import logging
 from dataclasses import dataclass
-from typing import List
 
 from esphome.const import (
     CONF_ID,
@@ -200,7 +199,7 @@ async def esp8266_pin_to_code(config):
 @coroutine_with_priority(-999.0)
 async def add_pin_initial_states_array():
     # Add includes at the very end, so that they override everything
-    initial_states: List[PinInitialState] = CORE.data[KEY_ESP8266][
+    initial_states: list[PinInitialState] = CORE.data[KEY_ESP8266][
         KEY_PIN_INITIAL_STATES
     ]
     initial_modes_s = ", ".join(str(x.mode) for x in initial_states)
diff --git a/esphome/components/neopixelbus/_methods.py b/esphome/components/neopixelbus/_methods.py
index 4e3c3ca778..98a2d152e1 100644
--- a/esphome/components/neopixelbus/_methods.py
+++ b/esphome/components/neopixelbus/_methods.py
@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Any, List
+from typing import Any
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import (
@@ -349,7 +349,7 @@ def _spi_extra_validate(config):
 class MethodDescriptor:
     method_schema: Any
     to_code: Any
-    supported_chips: List[str]
+    supported_chips: list[str]
     extra_validate: Any = None
 
 
diff --git a/esphome/components/select/__init__.py b/esphome/components/select/__init__.py
index a1c73c385e..b505d89c6f 100644
--- a/esphome/components/select/__init__.py
+++ b/esphome/components/select/__init__.py
@@ -1,4 +1,3 @@
-from typing import List
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
@@ -60,7 +59,7 @@ SELECT_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).e
 )
 
 
-async def setup_select_core_(var, config, *, options: List[str]):
+async def setup_select_core_(var, config, *, options: list[str]):
     await setup_entity(var, config)
 
     cg.add(var.traits.set_options(options))
@@ -76,14 +75,14 @@ async def setup_select_core_(var, config, *, options: List[str]):
         await mqtt.register_mqtt_component(mqtt_, config)
 
 
-async def register_select(var, config, *, options: List[str]):
+async def register_select(var, config, *, options: list[str]):
     if not CORE.has_id(config[CONF_ID]):
         var = cg.Pvariable(config[CONF_ID], var)
     cg.add(cg.App.register_select(var))
     await setup_select_core_(var, config, options=options)
 
 
-async def new_select(config, *, options: List[str]):
+async def new_select(config, *, options: list[str]):
     var = cg.new_Pvariable(config[CONF_ID])
     await register_select(var, config, options=options)
     return var
diff --git a/esphome/config.py b/esphome/config.py
index 04717be6f5..0bf4ec8df3 100644
--- a/esphome/config.py
+++ b/esphome/config.py
@@ -23,7 +23,7 @@ from esphome.core import CORE, EsphomeError
 from esphome.helpers import indent
 from esphome.util import safe_print, OrderedDict
 
-from typing import List, Optional, Tuple, Union
+from typing import Optional, Union
 from esphome.loader import get_component, get_platform, ComponentManifest
 from esphome.yaml_util import is_secret, ESPHomeDataBase, ESPForceValue
 from esphome.voluptuous_schema import ExtraKeysInvalid
@@ -50,10 +50,10 @@ def iter_components(config):
                 yield p_name, platform, p_config
 
 
-ConfigPath = List[Union[str, int]]
+ConfigPath = list[Union[str, int]]
 
 
-def _path_begins_with(path, other):  # type: (ConfigPath, ConfigPath) -> bool
+def _path_begins_with(path: ConfigPath, other: ConfigPath) -> bool:
     if len(path) < len(other):
         return False
     return path[: len(other)] == other
@@ -67,7 +67,7 @@ class _ValidationStepTask:
         self.step = step
 
     @property
-    def _cmp_tuple(self) -> Tuple[float, int]:
+    def _cmp_tuple(self) -> tuple[float, int]:
         return (-self.priority, self.id_number)
 
     def __eq__(self, other):
@@ -84,21 +84,20 @@ class Config(OrderedDict, fv.FinalValidateConfig):
     def __init__(self):
         super().__init__()
         # A list of voluptuous errors
-        self.errors = []  # type: List[vol.Invalid]
+        self.errors: list[vol.Invalid] = []
         # A list of paths that should be fully outputted
         # The values will be the paths to all "domain", for example (['logger'], 'logger')
         # or (['sensor', 'ultrasonic'], 'sensor.ultrasonic')
-        self.output_paths = []  # type: List[Tuple[ConfigPath, str]]
+        self.output_paths: list[tuple[ConfigPath, str]] = []
         # A list of components ids with the config path
-        self.declare_ids = []  # type: List[Tuple[core.ID, ConfigPath]]
+        self.declare_ids: list[tuple[core.ID, ConfigPath]] = []
         self._data = {}
         # Store pending validation tasks (in heap order)
-        self._validation_tasks: List[_ValidationStepTask] = []
+        self._validation_tasks: list[_ValidationStepTask] = []
         # ID to ensure stable order for keys with equal priority
         self._validation_tasks_id = 0
 
-    def add_error(self, error):
-        # type: (vol.Invalid) -> None
+    def add_error(self, error: vol.Invalid) -> None:
         if isinstance(error, vol.MultipleInvalid):
             for err in error.errors:
                 self.add_error(err)
@@ -132,20 +131,16 @@ class Config(OrderedDict, fv.FinalValidateConfig):
             e.prepend(path)
             self.add_error(e)
 
-    def add_str_error(self, message, path):
-        # type: (str, ConfigPath) -> None
+    def add_str_error(self, message: str, path: ConfigPath) -> None:
         self.add_error(vol.Invalid(message, path))
 
-    def add_output_path(self, path, domain):
-        # type: (ConfigPath, str) -> None
+    def add_output_path(self, path: ConfigPath, domain: str) -> None:
         self.output_paths.append((path, domain))
 
-    def remove_output_path(self, path, domain):
-        # type: (ConfigPath, str) -> None
+    def remove_output_path(self, path: ConfigPath, domain: str) -> None:
         self.output_paths.remove((path, domain))
 
-    def is_in_error_path(self, path):
-        # type: (ConfigPath) -> bool
+    def is_in_error_path(self, path: ConfigPath) -> bool:
         for err in self.errors:
             if _path_begins_with(err.path, path):
                 return True
@@ -157,16 +152,16 @@ class Config(OrderedDict, fv.FinalValidateConfig):
             conf = conf[key]
         conf[path[-1]] = value
 
-    def get_error_for_path(self, path):
-        # type: (ConfigPath) -> Optional[vol.Invalid]
+    def get_error_for_path(self, path: ConfigPath) -> Optional[vol.Invalid]:
         for err in self.errors:
             if self.get_deepest_path(err.path) == path:
                 self.errors.remove(err)
                 return err
         return None
 
-    def get_deepest_document_range_for_path(self, path, get_key=False):
-        # type: (ConfigPath, bool) -> Optional[ESPHomeDataBase]
+    def get_deepest_document_range_for_path(
+        self, path: ConfigPath, get_key: bool = False
+    ) -> Optional[ESPHomeDataBase]:
         data = self
         doc_range = None
         for index, path_item in enumerate(path):
@@ -207,8 +202,7 @@ class Config(OrderedDict, fv.FinalValidateConfig):
                 return {}
         return data
 
-    def get_deepest_path(self, path):
-        # type: (ConfigPath) -> ConfigPath
+    def get_deepest_path(self, path: ConfigPath) -> ConfigPath:
         """Return the path that is the deepest reachable by following path."""
         data = self
         part = []
@@ -532,7 +526,7 @@ class IDPassValidationStep(ConfigValidationStep):
             # because the component that did not validate doesn't have any IDs set
             return
 
-        searching_ids = []  # type: List[Tuple[core.ID, ConfigPath]]
+        searching_ids: list[tuple[core.ID, ConfigPath]] = []
         for id, path in iter_ids(result):
             if id.is_declaration:
                 if id.id is not None:
@@ -780,8 +774,7 @@ def _get_parent_name(path, config):
     return path[-1]
 
 
-def _format_vol_invalid(ex, config):
-    # type: (vol.Invalid, Config) -> str
+def _format_vol_invalid(ex: vol.Invalid, config: Config) -> str:
     message = ""
 
     paren = _get_parent_name(ex.path[:-1], config)
@@ -862,8 +855,9 @@ def _print_on_next_line(obj):
     return False
 
 
-def dump_dict(config, path, at_root=True):
-    # type: (Config, ConfigPath, bool) -> Tuple[str, bool]
+def dump_dict(
+    config: Config, path: ConfigPath, at_root: bool = True
+) -> tuple[str, bool]:
     conf = config.get_nested_item(path)
     ret = ""
     multiline = False
diff --git a/esphome/config_helpers.py b/esphome/config_helpers.py
index 39b57e441b..bfb0f65417 100644
--- a/esphome/config_helpers.py
+++ b/esphome/config_helpers.py
@@ -5,8 +5,7 @@ from esphome.core import CORE
 from esphome.helpers import read_file
 
 
-def read_config_file(path):
-    # type: (str) -> str
+def read_config_file(path: str) -> str:
     if CORE.vscode and (
         not CORE.ace or os.path.abspath(path) == os.path.abspath(CORE.config_path)
     ):
diff --git a/esphome/core/__init__.py b/esphome/core/__init__.py
index 3ee94efd64..a422cd9507 100644
--- a/esphome/core/__init__.py
+++ b/esphome/core/__init__.py
@@ -2,7 +2,7 @@ import logging
 import math
 import os
 import re
-from typing import TYPE_CHECKING, Dict, List, Optional, Set, Tuple, Union
+from typing import TYPE_CHECKING, Optional, Union
 
 from esphome.const import (
     CONF_COMMENT,
@@ -469,19 +469,19 @@ class EsphomeCore:
         # Task counter for pending tasks
         self.task_counter = 0
         # The variable cache, for each ID this holds a MockObj of the variable obj
-        self.variables: Dict[str, "MockObj"] = {}
+        self.variables: dict[str, "MockObj"] = {}
         # A list of statements that go in the main setup() block
-        self.main_statements: List["Statement"] = []
+        self.main_statements: list["Statement"] = []
         # A list of statements to insert in the global block (includes and global variables)
-        self.global_statements: List["Statement"] = []
+        self.global_statements: list["Statement"] = []
         # A set of platformio libraries to add to the project
-        self.libraries: List[Library] = []
+        self.libraries: list[Library] = []
         # A set of build flags to set in the platformio project
-        self.build_flags: Set[str] = set()
+        self.build_flags: set[str] = set()
         # A set of defines to set for the compile process in esphome/core/defines.h
-        self.defines: Set["Define"] = set()
+        self.defines: set["Define"] = set()
         # A map of all platformio options to apply
-        self.platformio_options: Dict[str, Union[str, List[str]]] = {}
+        self.platformio_options: dict[str, Union[str, list[str]]] = {}
         # A set of strings of names of loaded integrations, used to find namespace ID conflicts
         self.loaded_integrations = set()
         # A set of component IDs to track what Component subclasses are declared
@@ -701,7 +701,7 @@ class EsphomeCore:
         _LOGGER.debug("Adding define: %s", define)
         return define
 
-    def add_platformio_option(self, key: str, value: Union[str, List[str]]) -> None:
+    def add_platformio_option(self, key: str, value: Union[str, list[str]]) -> None:
         new_val = value
         old_val = self.platformio_options.get(key)
         if isinstance(old_val, list):
@@ -734,7 +734,7 @@ class EsphomeCore:
             _LOGGER.debug("Waiting for variable %s", id)
             yield
 
-    async def get_variable_with_full_id(self, id: ID) -> Tuple[ID, "MockObj"]:
+    async def get_variable_with_full_id(self, id: ID) -> tuple[ID, "MockObj"]:
         if not isinstance(id, ID):
             raise ValueError(f"ID {id!r} must be of type ID!")
         return await _FakeAwaitable(self._get_variable_with_full_id_generator(id))
diff --git a/esphome/coroutine.py b/esphome/coroutine.py
index 58f79c6b36..5f391dc7ad 100644
--- a/esphome/coroutine.py
+++ b/esphome/coroutine.py
@@ -48,7 +48,8 @@ import heapq
 import inspect
 import logging
 import types
-from typing import Any, Awaitable, Callable, Generator, Iterator, List, Tuple
+from typing import Any, Callable
+from collections.abc import Awaitable, Generator, Iterator
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -177,7 +178,7 @@ class _Task:
         return _Task(priority, self.id_number, self.iterator, self.original_function)
 
     @property
-    def _cmp_tuple(self) -> Tuple[float, int]:
+    def _cmp_tuple(self) -> tuple[float, int]:
         return (-self.priority, self.id_number)
 
     def __eq__(self, other):
@@ -194,7 +195,7 @@ class FakeEventLoop:
     """Emulate an asyncio EventLoop to run some registered coroutine jobs in sequence."""
 
     def __init__(self):
-        self._pending_tasks: List[_Task] = []
+        self._pending_tasks: list[_Task] = []
         self._task_counter = 0
 
     def add_job(self, func, *args, **kwargs):
diff --git a/esphome/cpp_generator.py b/esphome/cpp_generator.py
index df806af1a5..a0f60e1ff8 100644
--- a/esphome/cpp_generator.py
+++ b/esphome/cpp_generator.py
@@ -8,14 +8,10 @@ from esphome.yaml_util import ESPHomeDataBase
 from typing import (
     Any,
     Callable,
-    Generator,
-    List,
     Optional,
-    Tuple,
-    Type,
     Union,
-    Sequence,
 )
+from collections.abc import Generator, Sequence
 
 from esphome.core import (  # noqa
     CORE,
@@ -54,9 +50,9 @@ SafeExpType = Union[
     int,
     float,
     TimePeriod,
-    Type[bool],
-    Type[int],
-    Type[float],
+    type[bool],
+    type[int],
+    type[float],
     Sequence[Any],
 ]
 
@@ -150,7 +146,7 @@ class CallExpression(Expression):
 class StructInitializer(Expression):
     __slots__ = ("base", "args")
 
-    def __init__(self, base: Expression, *args: Tuple[str, Optional[SafeExpType]]):
+    def __init__(self, base: Expression, *args: tuple[str, Optional[SafeExpType]]):
         self.base = base
         # TODO: args is always a Tuple, is this check required?
         if not isinstance(args, OrderedDict):
@@ -210,7 +206,7 @@ class ParameterListExpression(Expression):
     __slots__ = ("parameters",)
 
     def __init__(
-        self, *parameters: Union[ParameterExpression, Tuple[SafeExpType, str]]
+        self, *parameters: Union[ParameterExpression, tuple[SafeExpType, str]]
     ):
         self.parameters = []
         for parameter in parameters:
@@ -629,7 +625,7 @@ def add_define(name: str, value: SafeExpType = None):
         CORE.add_define(Define(name, safe_exp(value)))
 
 
-def add_platformio_option(key: str, value: Union[str, List[str]]):
+def add_platformio_option(key: str, value: Union[str, list[str]]):
     CORE.add_platformio_option(key, value)
 
 
@@ -646,7 +642,7 @@ async def get_variable(id_: ID) -> "MockObj":
     return await CORE.get_variable(id_)
 
 
-async def get_variable_with_full_id(id_: ID) -> Tuple[ID, "MockObj"]:
+async def get_variable_with_full_id(id_: ID) -> tuple[ID, "MockObj"]:
     """
     Wait for the given ID to be defined in the code generation and
     return it as a MockObj.
@@ -661,7 +657,7 @@ async def get_variable_with_full_id(id_: ID) -> Tuple[ID, "MockObj"]:
 
 async def process_lambda(
     value: Lambda,
-    parameters: List[Tuple[SafeExpType, str]],
+    parameters: list[tuple[SafeExpType, str]],
     capture: str = "=",
     return_type: SafeExpType = None,
 ) -> Generator[LambdaExpression, None, None]:
@@ -715,7 +711,7 @@ def is_template(value):
 
 async def templatable(
     value: Any,
-    args: List[Tuple[SafeExpType, str]],
+    args: list[tuple[SafeExpType, str]],
     output_type: Optional[SafeExpType],
     to_exp: Any = None,
 ):
@@ -763,7 +759,7 @@ class MockObj(Expression):
             attr = attr[1:]
         return MockObj(f"{self.base}{self.op}{attr}", next_op)
 
-    def __call__(self, *args):  # type: (SafeExpType) -> MockObj
+    def __call__(self, *args: SafeExpType) -> "MockObj":
         call = CallExpression(self.base, *args)
         return MockObj(call, self.op)
 
diff --git a/esphome/cpp_helpers.py b/esphome/cpp_helpers.py
index 9127f88e39..822197341e 100644
--- a/esphome/cpp_helpers.py
+++ b/esphome/cpp_helpers.py
@@ -107,8 +107,9 @@ async def setup_entity(var, config):
         add(var.set_entity_category(config[CONF_ENTITY_CATEGORY]))
 
 
-def extract_registry_entry_config(registry, full_config):
-    # type: (Registry, ConfigType) -> RegistryEntry
+def extract_registry_entry_config(
+    registry: Registry, full_config: ConfigType
+) -> RegistryEntry:
     key, config = next((k, v) for k, v in full_config.items() if k in registry)
     return registry[key], config
 
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 9a8f072237..4f361d0936 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -522,7 +522,7 @@ class DashboardEntry:
         return os.path.basename(self.path)
 
     @property
-    def storage(self):  # type: () -> Optional[StorageJSON]
+    def storage(self) -> Optional[StorageJSON]:
         if not self._loaded_storage:
             self._storage = StorageJSON.load(
                 ext_storage_path(settings.config_dir, self.filename)
@@ -817,7 +817,7 @@ class UndoDeleteRequestHandler(BaseHandler):
         shutil.move(os.path.join(trash_path, configuration), config_file)
 
 
-PING_RESULT = {}  # type: dict
+PING_RESULT: dict = {}
 IMPORT_RESULT = {}
 STOP_EVENT = threading.Event()
 PING_REQUEST = threading.Event()
@@ -933,7 +933,7 @@ def get_static_path(*args):
     return os.path.join(get_base_frontend_path(), "static", *args)
 
 
-@functools.lru_cache(maxsize=None)
+@functools.cache
 def get_static_file_url(name):
     base = f"./static/{name}"
 
diff --git a/esphome/final_validate.py b/esphome/final_validate.py
index 96dd2fd651..5e9d2207b0 100644
--- a/esphome/final_validate.py
+++ b/esphome/final_validate.py
@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import Dict, Any
+from typing import Any
 import contextvars
 
 from esphome.types import ConfigFragmentType, ID, ConfigPathType
@@ -9,7 +9,7 @@ import esphome.config_validation as cv
 class FinalValidateConfig(ABC):
     @property
     @abstractmethod
-    def data(self) -> Dict[str, Any]:
+    def data(self) -> dict[str, Any]:
         """A dictionary that can be used by post validation functions to store
         global data during the validation phase. Each component should store its
         data under a unique key
diff --git a/esphome/helpers.py b/esphome/helpers.py
index e958aca78e..85a767036a 100644
--- a/esphome/helpers.py
+++ b/esphome/helpers.py
@@ -40,7 +40,7 @@ def indent(text, padding="  "):
 
 # From https://stackoverflow.com/a/14945195/8924614
 def cpp_string_escape(string, encoding="utf-8"):
-    def _should_escape(byte):  # type: (int) -> bool
+    def _should_escape(byte: int) -> bool:
         if not 32 <= byte < 127:
             return True
         if byte in (ord("\\"), ord('"')):
diff --git a/esphome/loader.py b/esphome/loader.py
index 05d2e5a213..a0676eb90e 100644
--- a/esphome/loader.py
+++ b/esphome/loader.py
@@ -1,5 +1,5 @@
 import logging
-from typing import Callable, List, Optional, Any, ContextManager
+from typing import Callable, Optional, Any, ContextManager
 from types import ModuleType
 import importlib
 import importlib.util
@@ -62,19 +62,19 @@ class ComponentManifest:
         return getattr(self.module, "to_code", None)
 
     @property
-    def dependencies(self) -> List[str]:
+    def dependencies(self) -> list[str]:
         return getattr(self.module, "DEPENDENCIES", [])
 
     @property
-    def conflicts_with(self) -> List[str]:
+    def conflicts_with(self) -> list[str]:
         return getattr(self.module, "CONFLICTS_WITH", [])
 
     @property
-    def auto_load(self) -> List[str]:
+    def auto_load(self) -> list[str]:
         return getattr(self.module, "AUTO_LOAD", [])
 
     @property
-    def codeowners(self) -> List[str]:
+    def codeowners(self) -> list[str]:
         return getattr(self.module, "CODEOWNERS", [])
 
     @property
@@ -87,7 +87,7 @@ class ComponentManifest:
         return getattr(self.module, "FINAL_VALIDATE_SCHEMA", None)
 
     @property
-    def resources(self) -> List[FileResource]:
+    def resources(self) -> list[FileResource]:
         """Return a list of all file resources defined in the package of this component.
 
         This will return all cpp source files that are located in the same folder as the
@@ -106,7 +106,7 @@ class ComponentManifest:
 
 class ComponentMetaFinder(importlib.abc.MetaPathFinder):
     def __init__(
-        self, components_path: Path, allowed_components: Optional[List[str]] = None
+        self, components_path: Path, allowed_components: Optional[list[str]] = None
     ) -> None:
         self._allowed_components = allowed_components
         self._finders = []
@@ -117,7 +117,7 @@ class ComponentMetaFinder(importlib.abc.MetaPathFinder):
                 continue
             self._finders.append(finder)
 
-    def find_spec(self, fullname: str, path: Optional[List[str]], target=None):
+    def find_spec(self, fullname: str, path: Optional[list[str]], target=None):
         if not fullname.startswith("esphome.components."):
             return None
         parts = fullname.split(".")
@@ -144,7 +144,7 @@ def clear_component_meta_finders():
 
 
 def install_meta_finder(
-    components_path: Path, allowed_components: Optional[List[str]] = None
+    components_path: Path, allowed_components: Optional[list[str]] = None
 ):
     sys.meta_path.insert(0, ComponentMetaFinder(components_path, allowed_components))
 
diff --git a/esphome/platformio_api.py b/esphome/platformio_api.py
index c4bf3d3f1a..a4a3f32092 100644
--- a/esphome/platformio_api.py
+++ b/esphome/platformio_api.py
@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 import json
-from typing import List, Union
+from typing import Union
 from pathlib import Path
 
 import logging
@@ -310,7 +310,7 @@ class IDEData:
         return str(Path(self.firmware_elf_path).with_suffix(".bin"))
 
     @property
-    def extra_flash_images(self) -> List[FlashImage]:
+    def extra_flash_images(self) -> list[FlashImage]:
         return [
             FlashImage(path=entry["path"], offset=entry["offset"])
             for entry in self.raw["extra"]["flash_images"]
diff --git a/esphome/storage_json.py b/esphome/storage_json.py
index a941fca0af..af71d4583c 100644
--- a/esphome/storage_json.py
+++ b/esphome/storage_json.py
@@ -4,7 +4,7 @@ from datetime import datetime
 import json
 import logging
 import os
-from typing import Any, Optional, List
+from typing import Optional
 
 from esphome import const
 from esphome.core import CORE
@@ -15,19 +15,19 @@ from esphome.types import CoreType
 _LOGGER = logging.getLogger(__name__)
 
 
-def storage_path():  # type: () -> str
+def storage_path() -> str:
     return CORE.relative_internal_path(f"{CORE.config_filename}.json")
 
 
-def ext_storage_path(base_path, config_filename):  # type: (str, str) -> str
+def ext_storage_path(base_path: str, config_filename: str) -> str:
     return os.path.join(base_path, ".esphome", f"{config_filename}.json")
 
 
-def esphome_storage_path(base_path):  # type: (str) -> str
+def esphome_storage_path(base_path: str) -> str:
     return os.path.join(base_path, ".esphome", "esphome.json")
 
 
-def trash_storage_path(base_path):  # type: (str) -> str
+def trash_storage_path(base_path: str) -> str:
     return os.path.join(base_path, ".esphome", "trash")
 
 
@@ -49,29 +49,29 @@ class StorageJSON:
     ):
         # Version of the storage JSON schema
         assert storage_version is None or isinstance(storage_version, int)
-        self.storage_version = storage_version  # type: int
+        self.storage_version: int = storage_version
         # The name of the node
-        self.name = name  # type: str
+        self.name: str = name
         # The comment of the node
-        self.comment = comment  # type: str
+        self.comment: str = comment
         # The esphome version this was compiled with
-        self.esphome_version = esphome_version  # type: str
+        self.esphome_version: str = esphome_version
         # The version of the file in src/main.cpp - Used to migrate the file
         assert src_version is None or isinstance(src_version, int)
-        self.src_version = src_version  # type: int
+        self.src_version: int = src_version
         # Address of the ESP, for example livingroom.local or a static IP
-        self.address = address  # type: str
+        self.address: str = address
         # Web server port of the ESP, for example 80
         assert web_port is None or isinstance(web_port, int)
-        self.web_port = web_port  # type: int
+        self.web_port: int = web_port
         # The type of hardware in use, like "ESP32", "ESP32C3", "ESP8266", etc.
-        self.target_platform = target_platform  # type: str
+        self.target_platform: str = target_platform
         # The absolute path to the platformio project
-        self.build_path = build_path  # type: str
+        self.build_path: str = build_path
         # The absolute path to the firmware binary
-        self.firmware_bin_path = firmware_bin_path  # type: str
+        self.firmware_bin_path: str = firmware_bin_path
         # A list of strings of names of loaded integrations
-        self.loaded_integrations = loaded_integrations  # type: List[str]
+        self.loaded_integrations: list[str] = loaded_integrations
         self.loaded_integrations.sort()
 
     def as_dict(self):
@@ -97,8 +97,8 @@ class StorageJSON:
 
     @staticmethod
     def from_esphome_core(
-        esph, old
-    ):  # type: (CoreType, Optional[StorageJSON]) -> StorageJSON
+        esph: CoreType, old: Optional["StorageJSON"]
+    ) -> "StorageJSON":
         hardware = esph.target_platform.upper()
         if esph.is_esp32:
             from esphome.components import esp32
@@ -135,7 +135,7 @@ class StorageJSON:
         )
 
     @staticmethod
-    def _load_impl(path):  # type: (str) -> Optional[StorageJSON]
+    def _load_impl(path: str) -> Optional["StorageJSON"]:
         with codecs.open(path, "r", encoding="utf-8") as f_handle:
             storage = json.load(f_handle)
         storage_version = storage["storage_version"]
@@ -166,13 +166,13 @@ class StorageJSON:
         )
 
     @staticmethod
-    def load(path):  # type: (str) -> Optional[StorageJSON]
+    def load(path: str) -> Optional["StorageJSON"]:
         try:
             return StorageJSON._load_impl(path)
         except Exception:  # pylint: disable=broad-except
             return None
 
-    def __eq__(self, o):  # type: (Any) -> bool
+    def __eq__(self, o) -> bool:
         return isinstance(o, StorageJSON) and self.as_dict() == o.as_dict()
 
 
@@ -182,15 +182,15 @@ class EsphomeStorageJSON:
     ):
         # Version of the storage JSON schema
         assert storage_version is None or isinstance(storage_version, int)
-        self.storage_version = storage_version  # type: int
+        self.storage_version: int = storage_version
         # The cookie secret for the dashboard
-        self.cookie_secret = cookie_secret  # type: str
+        self.cookie_secret: str = cookie_secret
         # The last time ESPHome checked for an update as an isoformat encoded str
-        self.last_update_check_str = last_update_check  # type: str
+        self.last_update_check_str: str = last_update_check
         # Cache of the version gotten in the last version check
-        self.remote_version = remote_version  # type: Optional[str]
+        self.remote_version: Optional[str] = remote_version
 
-    def as_dict(self):  # type: () -> dict
+    def as_dict(self) -> dict:
         return {
             "storage_version": self.storage_version,
             "cookie_secret": self.cookie_secret,
@@ -199,24 +199,24 @@ class EsphomeStorageJSON:
         }
 
     @property
-    def last_update_check(self):  # type: () -> Optional[datetime]
+    def last_update_check(self) -> Optional[datetime]:
         try:
             return datetime.strptime(self.last_update_check_str, "%Y-%m-%dT%H:%M:%S")
         except Exception:  # pylint: disable=broad-except
             return None
 
     @last_update_check.setter
-    def last_update_check(self, new):  # type: (datetime) -> None
+    def last_update_check(self, new: datetime) -> None:
         self.last_update_check_str = new.strftime("%Y-%m-%dT%H:%M:%S")
 
-    def to_json(self):  # type: () -> dict
+    def to_json(self) -> dict:
         return f"{json.dumps(self.as_dict(), indent=2)}\n"
 
-    def save(self, path):  # type: (str) -> None
+    def save(self, path: str) -> None:
         write_file_if_changed(path, self.to_json())
 
     @staticmethod
-    def _load_impl(path):  # type: (str) -> Optional[EsphomeStorageJSON]
+    def _load_impl(path: str) -> Optional["EsphomeStorageJSON"]:
         with codecs.open(path, "r", encoding="utf-8") as f_handle:
             storage = json.load(f_handle)
         storage_version = storage["storage_version"]
@@ -228,14 +228,14 @@ class EsphomeStorageJSON:
         )
 
     @staticmethod
-    def load(path):  # type: (str) -> Optional[EsphomeStorageJSON]
+    def load(path: str) -> Optional["EsphomeStorageJSON"]:
         try:
             return EsphomeStorageJSON._load_impl(path)
         except Exception:  # pylint: disable=broad-except
             return None
 
     @staticmethod
-    def get_default():  # type: () -> EsphomeStorageJSON
+    def get_default() -> "EsphomeStorageJSON":
         return EsphomeStorageJSON(
             storage_version=1,
             cookie_secret=binascii.hexlify(os.urandom(64)).decode(),
@@ -243,5 +243,5 @@ class EsphomeStorageJSON:
             remote_version=None,
         )
 
-    def __eq__(self, o):  # type: (Any) -> bool
+    def __eq__(self, o) -> bool:
         return isinstance(o, EsphomeStorageJSON) and self.as_dict() == o.as_dict()
diff --git a/esphome/types.py b/esphome/types.py
index 6bbfb00ce6..adb16fa91b 100644
--- a/esphome/types.py
+++ b/esphome/types.py
@@ -1,5 +1,5 @@
 """This helper module tracks commonly used types in the esphome python codebase."""
-from typing import Dict, Union, List
+from typing import Union
 
 from esphome.core import ID, Lambda, EsphomeCore
 
@@ -8,11 +8,11 @@ ConfigFragmentType = Union[
     int,
     float,
     None,
-    Dict[Union[str, int], "ConfigFragmentType"],
-    List["ConfigFragmentType"],
+    dict[Union[str, int], "ConfigFragmentType"],
+    list["ConfigFragmentType"],
     ID,
     Lambda,
 ]
-ConfigType = Dict[str, ConfigFragmentType]
+ConfigType = dict[str, ConfigFragmentType]
 CoreType = EsphomeCore
 ConfigPathType = Union[str, int]
diff --git a/esphome/util.py b/esphome/util.py
index 927c50fe89..1779e8ccfb 100644
--- a/esphome/util.py
+++ b/esphome/util.py
@@ -1,5 +1,4 @@
-import typing
-from typing import Union, List
+from typing import Union
 
 import collections
 import io
@@ -242,7 +241,7 @@ def is_dev_esphome_version():
     return "dev" in const.__version__
 
 
-def parse_esphome_version() -> typing.Tuple[int, int, int]:
+def parse_esphome_version() -> tuple[int, int, int]:
     match = re.match(r"^(\d+).(\d+).(\d+)(-dev\d*|b\d*)?$", const.__version__)
     if match is None:
         raise ValueError(f"Failed to parse ESPHome version '{const.__version__}'")
@@ -282,7 +281,7 @@ class SerialPort:
 
 
 # from https://github.com/pyserial/pyserial/blob/master/serial/tools/list_ports.py
-def get_serial_ports() -> List[SerialPort]:
+def get_serial_ports() -> list[SerialPort]:
     from serial.tools.list_ports import comports
 
     result = []
diff --git a/esphome/vscode.py b/esphome/vscode.py
index 6a43a654ed..32a6b524f6 100644
--- a/esphome/vscode.py
+++ b/esphome/vscode.py
@@ -10,15 +10,13 @@ import esphome.config_validation as cv
 from typing import Optional
 
 
-def _get_invalid_range(res, invalid):
-    # type: (Config, cv.Invalid) -> Optional[DocumentRange]
+def _get_invalid_range(res: Config, invalid: cv.Invalid) -> Optional[DocumentRange]:
     return res.get_deepest_document_range_for_path(
         invalid.path, invalid.error_message == "extra keys not allowed"
     )
 
 
-def _dump_range(range):
-    # type: (Optional[DocumentRange]) -> Optional[dict]
+def _dump_range(range: Optional[DocumentRange]) -> Optional[dict]:
     if range is None:
         return None
     return {
diff --git a/esphome/writer.py b/esphome/writer.py
index 31b47e243e..7a3c13e80b 100644
--- a/esphome/writer.py
+++ b/esphome/writer.py
@@ -2,7 +2,7 @@ import logging
 import os
 import re
 from pathlib import Path
-from typing import Dict, List, Union
+from typing import Union
 
 from esphome.config import iter_components
 from esphome.const import (
@@ -98,7 +98,7 @@ def replace_file_content(text, pattern, repl):
     return content_new, count
 
 
-def storage_should_clean(old, new):  # type: (StorageJSON, StorageJSON) -> bool
+def storage_should_clean(old: StorageJSON, new: StorageJSON) -> bool:
     if old is None:
         return True
 
@@ -123,7 +123,7 @@ def update_storage_json():
     new.save(path)
 
 
-def format_ini(data: Dict[str, Union[str, List[str]]]) -> str:
+def format_ini(data: dict[str, Union[str, list[str]]]) -> str:
     content = ""
     for key, value in sorted(data.items()):
         if isinstance(value, list):
@@ -226,7 +226,7 @@ the custom_components folder or the external_components feature.
 
 
 def copy_src_tree():
-    source_files: List[loader.FileResource] = []
+    source_files: list[loader.FileResource] = []
     for _, component, _ in iter_components(CORE.config):
         source_files += component.resources
     source_files_map = {
diff --git a/esphome/zeroconf.py b/esphome/zeroconf.py
index 1fbdf7e93f..3a491d9b99 100644
--- a/esphome/zeroconf.py
+++ b/esphome/zeroconf.py
@@ -1,7 +1,7 @@
 import socket
 import threading
 import time
-from typing import Dict, Optional
+from typing import Optional
 import logging
 from dataclasses import dataclass
 
@@ -71,12 +71,12 @@ class DashboardStatus(threading.Thread):
         threading.Thread.__init__(self)
         self.zc = zc
         self.query_hosts: set[str] = set()
-        self.key_to_host: Dict[str, str] = {}
+        self.key_to_host: dict[str, str] = {}
         self.stop_event = threading.Event()
         self.query_event = threading.Event()
         self.on_update = on_update
 
-    def request_query(self, hosts: Dict[str, str]) -> None:
+    def request_query(self, hosts: dict[str, str]) -> None:
         self.query_hosts = set(hosts.values())
         self.key_to_host = hosts
         self.query_event.set()
diff --git a/pyproject.toml b/pyproject.toml
index 7a75060c8e..a49abb7b3d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,3 @@
 [tool.black]
-target-version = ["py36", "py37", "py38"]
+target-version = ["py39", "py310"]
 exclude = 'generated'
diff --git a/script/lint-python b/script/lint-python
index 90b5dcd59f..7de1de80b0 100755
--- a/script/lint-python
+++ b/script/lint-python
@@ -109,7 +109,7 @@ def main():
         print_error(file_, linno, msg)
         errors += 1
 
-    PYUPGRADE_TARGET = "--py38-plus"
+    PYUPGRADE_TARGET = "--py39-plus"
     cmd = ["pyupgrade", PYUPGRADE_TARGET] + files
     print()
     print("Running pyupgrade...")
diff --git a/setup.py b/setup.py
index 941c8089ec..95453960ff 100755
--- a/setup.py
+++ b/setup.py
@@ -74,7 +74,7 @@ setup(
     zip_safe=False,
     platforms="any",
     test_suite="tests",
-    python_requires=">=3.8,<4.0",
+    python_requires=">=3.9.0",
     install_requires=REQUIRES,
     keywords=["home", "automation"],
     entry_points={"console_scripts": ["esphome = esphome.__main__:main"]},
diff --git a/tests/unit_tests/strategies.py b/tests/unit_tests/strategies.py
index 30768f9d56..20a3d190da 100644
--- a/tests/unit_tests/strategies.py
+++ b/tests/unit_tests/strategies.py
@@ -1,12 +1,9 @@
-from typing import Text
-
 import hypothesis.strategies._internal.core as st
 from hypothesis.strategies._internal.strategies import SearchStrategy
 
 
 @st.defines_strategy(force_reusable_values=True)
-def mac_addr_strings():
-    # type: () -> SearchStrategy[Text]
+def mac_addr_strings() -> SearchStrategy[str]:
     """A strategy for MAC address strings.
 
     This consists of six strings representing integers [0..255],

From 1001d9c04e738d619c8a76796a55abc1a3549367 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 4 Oct 2022 10:45:06 +1300
Subject: [PATCH 114/838] Bluetooth Proxy active connections (#3817)

---
 CODEOWNERS                                    |   1 +
 .../airthings_wave_mini.cpp                   |   6 +-
 .../airthings_wave_plus.cpp                   |   6 +-
 esphome/components/am43/am43.cpp              |  10 +-
 esphome/components/am43/cover/am43_cover.cpp  |  21 +-
 esphome/components/anova/anova.cpp            |  22 +-
 esphome/components/api/api.proto              | 177 +++-
 esphome/components/api/api_connection.cpp     |  72 +-
 esphome/components/api/api_connection.h       |  31 +-
 esphome/components/api/api_pb2.cpp            | 764 +++++++++++++++++-
 esphome/components/api/api_pb2.h              | 231 +++++-
 esphome/components/api/api_pb2_service.cpp    | 285 ++++++-
 esphome/components/api/api_pb2_service.h      |  95 ++-
 esphome/components/api/api_server.cpp         |  45 ++
 esphome/components/api/api_server.h           |   6 +
 esphome/components/bedjet/bedjet_hub.cpp      |  48 +-
 esphome/components/bedjet/bedjet_hub.h        |   2 -
 esphome/components/ble_client/__init__.py     |   7 +-
 esphome/components/ble_client/automation.cpp  |   6 +-
 esphome/components/ble_client/automation.h    |   3 +-
 esphome/components/ble_client/ble_client.cpp  | 409 +---------
 esphome/components/ble_client/ble_client.h    |  86 +-
 .../components/ble_client/sensor/automation.h |   3 +-
 .../ble_client/sensor/ble_sensor.cpp          |  12 +-
 .../ble_client/text_sensor/automation.h       |   3 +-
 .../text_sensor/ble_text_sensor.cpp           |  12 +-
 .../components/bluetooth_proxy/__init__.py    |  16 +-
 .../bluetooth_proxy/bluetooth_proxy.cpp       | 323 +++++++-
 .../bluetooth_proxy/bluetooth_proxy.h         |  39 +-
 .../components/esp32_ble_client/__init__.py   |  12 +
 .../esp32_ble_client/ble_characteristic.cpp   |  83 ++
 .../esp32_ble_client/ble_characteristic.h     |  35 +
 .../esp32_ble_client/ble_client_base.cpp      | 324 ++++++++
 .../esp32_ble_client/ble_client_base.h        |  72 ++
 .../esp32_ble_client/ble_descriptor.h         |  25 +
 .../esp32_ble_client/ble_service.cpp          |  66 ++
 .../components/esp32_ble_client/ble_service.h |  32 +
 .../components/esp32_ble_tracker/__init__.py  |   2 +-
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   |  37 +-
 .../esp32_ble_tracker/esp32_ble_tracker.h     |   5 +-
 esphome/components/esp32_ble_tracker/queue.h  |  10 +-
 .../display/pvvx_display.cpp                  |   5 +-
 .../radon_eye_rd200/radon_eye_rd200.cpp       |  12 +-
 esphome/const.py                              |   1 +
 44 files changed, 2818 insertions(+), 644 deletions(-)
 create mode 100644 esphome/components/esp32_ble_client/__init__.py
 create mode 100644 esphome/components/esp32_ble_client/ble_characteristic.cpp
 create mode 100644 esphome/components/esp32_ble_client/ble_characteristic.h
 create mode 100644 esphome/components/esp32_ble_client/ble_client_base.cpp
 create mode 100644 esphome/components/esp32_ble_client/ble_client_base.h
 create mode 100644 esphome/components/esp32_ble_client/ble_descriptor.h
 create mode 100644 esphome/components/esp32_ble_client/ble_service.cpp
 create mode 100644 esphome/components/esp32_ble_client/ble_service.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 69e30027a9..d95ebcce59 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -70,6 +70,7 @@ esphome/components/ektf2232/* @jesserockz
 esphome/components/ens210/* @itn3rd77
 esphome/components/esp32/* @esphome/core
 esphome/components/esp32_ble/* @jesserockz
+esphome/components/esp32_ble_client/* @jesserockz
 esphome/components/esp32_ble_server/* @jesserockz
 esphome/components/esp32_camera_web_server/* @ayufan
 esphome/components/esp32_can/* @Sympatron
diff --git a/esphome/components/airthings_wave_mini/airthings_wave_mini.cpp b/esphome/components/airthings_wave_mini/airthings_wave_mini.cpp
index 2e7a1fb024..40873ec005 100644
--- a/esphome/components/airthings_wave_mini/airthings_wave_mini.cpp
+++ b/esphome/components/airthings_wave_mini/airthings_wave_mini.cpp
@@ -38,7 +38,7 @@ void AirthingsWaveMini::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt
     }
 
     case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->conn_id)
+      if (param->read.conn_id != this->parent()->get_conn_id())
         break;
       if (param->read.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
@@ -88,8 +88,8 @@ void AirthingsWaveMini::update() {
 }
 
 void AirthingsWaveMini::request_read_values_() {
-  auto status =
-      esp_ble_gattc_read_char(this->parent()->gattc_if, this->parent()->conn_id, this->handle_, ESP_GATT_AUTH_REQ_NONE);
+  auto status = esp_ble_gattc_read_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->handle_,
+                                        ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     ESP_LOGW(TAG, "Error sending read request for sensor, status=%d", status);
   }
diff --git a/esphome/components/airthings_wave_plus/airthings_wave_plus.cpp b/esphome/components/airthings_wave_plus/airthings_wave_plus.cpp
index 02ed33b87a..11f86307fe 100644
--- a/esphome/components/airthings_wave_plus/airthings_wave_plus.cpp
+++ b/esphome/components/airthings_wave_plus/airthings_wave_plus.cpp
@@ -38,7 +38,7 @@ void AirthingsWavePlus::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt
     }
 
     case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->conn_id)
+      if (param->read.conn_id != this->parent()->get_conn_id())
         break;
       if (param->read.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
@@ -109,8 +109,8 @@ void AirthingsWavePlus::update() {
 }
 
 void AirthingsWavePlus::request_read_values_() {
-  auto status =
-      esp_ble_gattc_read_char(this->parent()->gattc_if, this->parent()->conn_id, this->handle_, ESP_GATT_AUTH_REQ_NONE);
+  auto status = esp_ble_gattc_read_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->handle_,
+                                        ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     ESP_LOGW(TAG, "Error sending read request for sensor, status=%d", status);
   }
diff --git a/esphome/components/am43/am43.cpp b/esphome/components/am43/am43.cpp
index 1c4bad64c3..9a0e5999d2 100644
--- a/esphome/components/am43/am43.cpp
+++ b/esphome/components/am43/am43.cpp
@@ -76,9 +76,9 @@ void Am43::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_i
       if (this->current_sensor_ > 0) {
         if (this->illuminance_ != nullptr) {
           auto *packet = this->encoder_->get_light_level_request();
-          auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
-                                                 packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP,
-                                                 ESP_GATT_AUTH_REQ_NONE);
+          auto status = esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(),
+                                                 this->char_handle_, packet->length, packet->data,
+                                                 ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
           if (status) {
             ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(),
                      status);
@@ -102,8 +102,8 @@ void Am43::update() {
     if (this->battery_ != nullptr) {
       auto *packet = this->encoder_->get_battery_level_request();
       auto status =
-          esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, packet->length,
-                                   packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+          esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
+                                   packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
       if (status)
         ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
     }
diff --git a/esphome/components/am43/cover/am43_cover.cpp b/esphome/components/am43/cover/am43_cover.cpp
index 39089e73c0..ba8e350732 100644
--- a/esphome/components/am43/cover/am43_cover.cpp
+++ b/esphome/components/am43/cover/am43_cover.cpp
@@ -27,8 +27,8 @@ void Am43Component::loop() {
   if (this->node_state == espbt::ClientState::ESTABLISHED && !this->logged_in_) {
     auto *packet = this->encoder_->get_send_pin_request(this->pin_);
     auto status =
-        esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, packet->length,
-                                 packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
+                                 packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
     ESP_LOGI(TAG, "[%s] Logging into AM43", this->get_name().c_str());
     if (status) {
       ESP_LOGW(TAG, "[%s] Error writing set_pin to device, error = %d", this->get_name().c_str(), status);
@@ -54,8 +54,8 @@ void Am43Component::control(const CoverCall &call) {
   if (call.get_stop()) {
     auto *packet = this->encoder_->get_stop_request();
     auto status =
-        esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, packet->length,
-                                 packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
+                                 packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
     if (status)
       ESP_LOGW(TAG, "[%s] Error writing stop command to device, error = %d", this->get_name().c_str(), status);
   }
@@ -66,8 +66,8 @@ void Am43Component::control(const CoverCall &call) {
       pos = 1 - pos;
     auto *packet = this->encoder_->get_set_position_request(100 - (uint8_t)(pos * 100));
     auto status =
-        esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, packet->length,
-                                 packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
+                                 packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
     if (status)
       ESP_LOGW(TAG, "[%s] Error writing set_position command to device, error = %d", this->get_name().c_str(), status);
   }
@@ -92,7 +92,8 @@ void Am43Component::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       }
       this->char_handle_ = chr->handle;
 
-      auto status = esp_ble_gattc_register_for_notify(this->parent_->gattc_if, this->parent_->remote_bda, chr->handle);
+      auto status = esp_ble_gattc_register_for_notify(this->parent_->get_gattc_if(), this->parent_->get_remote_bda(),
+                                                      chr->handle);
       if (status) {
         ESP_LOGW(TAG, "[%s] esp_ble_gattc_register_for_notify failed, status=%d", this->get_name().c_str(), status);
       }
@@ -122,9 +123,9 @@ void Am43Component::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
         if (this->decoder_->pin_ok_) {
           ESP_LOGI(TAG, "[%s] AM43 pin accepted.", this->get_name().c_str());
           auto *packet = this->encoder_->get_position_request();
-          auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
-                                                 packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP,
-                                                 ESP_GATT_AUTH_REQ_NONE);
+          auto status = esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(),
+                                                 this->char_handle_, packet->length, packet->data,
+                                                 ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
           if (status)
             ESP_LOGW(TAG, "[%s] Error writing set_position to device, error = %d", this->get_name().c_str(), status);
         } else {
diff --git a/esphome/components/anova/anova.cpp b/esphome/components/anova/anova.cpp
index 6c8316d338..cafd30149d 100644
--- a/esphome/components/anova/anova.cpp
+++ b/esphome/components/anova/anova.cpp
@@ -34,15 +34,17 @@ void Anova::control(const ClimateCall &call) {
         ESP_LOGW(TAG, "Unsupported mode: %d", mode);
         return;
     }
-    auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
-                                           pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+    auto status =
+        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
+                                 pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
     if (status)
       ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
   }
   if (call.get_target_temperature().has_value()) {
     auto *pkt = this->codec_->get_set_target_temp_request(*call.get_target_temperature());
-    auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
-                                           pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+    auto status =
+        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
+                                 pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
     if (status)
       ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
   }
@@ -65,7 +67,8 @@ void Anova::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_
       }
       this->char_handle_ = chr->handle;
 
-      auto status = esp_ble_gattc_register_for_notify(this->parent_->gattc_if, this->parent_->remote_bda, chr->handle);
+      auto status = esp_ble_gattc_register_for_notify(this->parent_->get_gattc_if(), this->parent_->get_remote_bda(),
+                                                      chr->handle);
       if (status) {
         ESP_LOGW(TAG, "[%s] esp_ble_gattc_register_for_notify failed, status=%d", this->get_name().c_str(), status);
       }
@@ -112,8 +115,8 @@ void Anova::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_
         }
         if (pkt != nullptr) {
           auto status =
-              esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, pkt->length,
-                                       pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+              esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
+                                       pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
           if (status) {
             ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(),
                      status);
@@ -137,8 +140,9 @@ void Anova::update() {
     auto *pkt = this->codec_->get_read_device_status_request();
     if (this->current_request_ == 0)
       this->codec_->get_set_unit_request(this->fahrenheit_ ? 'f' : 'c');
-    auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_,
-                                           pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+    auto status =
+        esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
+                                 pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
     if (status)
       ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
     this->current_request_++;
diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index c6cde8b038..9fa77d2daa 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -27,7 +27,6 @@ service APIConnection {
   rpc subscribe_logs (SubscribeLogsRequest) returns (void) {}
   rpc subscribe_homeassistant_services (SubscribeHomeassistantServicesRequest) returns (void) {}
   rpc subscribe_home_assistant_states (SubscribeHomeAssistantStatesRequest) returns (void) {}
-  rpc subscribe_bluetooth_le_advertisements (SubscribeBluetoothLEAdvertisementsRequest) returns (void) {}
   rpc get_time (GetTimeRequest) returns (GetTimeResponse) {
     option (needs_authentication) = false;
   }
@@ -44,6 +43,16 @@ service APIConnection {
   rpc button_command (ButtonCommandRequest) returns (void) {}
   rpc lock_command (LockCommandRequest) returns (void) {}
   rpc media_player_command (MediaPlayerCommandRequest) returns (void) {}
+
+  rpc subscribe_bluetooth_le_advertisements(SubscribeBluetoothLEAdvertisementsRequest) returns (void) {}
+  rpc bluetooth_device_request(BluetoothDeviceRequest) returns (void) {}
+  rpc bluetooth_gatt_get_services(BluetoothGATTGetServicesRequest) returns (void) {}
+  rpc bluetooth_gatt_read(BluetoothGATTReadRequest) returns (void) {}
+  rpc bluetooth_gatt_write(BluetoothGATTWriteRequest) returns (void) {}
+  rpc bluetooth_gatt_read_descriptor(BluetoothGATTReadDescriptorRequest) returns (void) {}
+  rpc bluetooth_gatt_write_descriptor(BluetoothGATTWriteDescriptorRequest) returns (void) {}
+  rpc bluetooth_gatt_notify(BluetoothGATTNotifyRequest) returns (void) {}
+  rpc subscribe_bluetooth_connections_free(SubscribeBluetoothConnectionsFreeRequest) returns (BluetoothConnectionsFreeResponse) {}
 }
 
 
@@ -78,6 +87,8 @@ message HelloRequest {
   // Not strictly necessary to send but nice for debugging
   // purposes.
   string client_info = 1;
+  uint32 api_version_major = 2;
+  uint32 api_version_minor = 3;
 }
 
 // Confirmation of successful connection request.
@@ -192,7 +203,7 @@ message DeviceInfoResponse {
 
   uint32 webserver_port = 10;
 
-  bool has_bluetooth_proxy = 11;
+  uint32 bluetooth_proxy_version = 11;
 }
 
 message ListEntitiesRequest {
@@ -1111,7 +1122,8 @@ message SubscribeBluetoothLEAdvertisementsRequest {
 
 message BluetoothServiceData {
   string uuid = 1;
-  repeated uint32 data = 2 [packed=false];
+  repeated uint32 legacy_data = 2 [deprecated = true];
+  bytes data = 3; // Changed in proto version 1.7
 }
 message BluetoothLEAdvertisementResponse {
   option (id) = 67;
@@ -1127,3 +1139,162 @@ message BluetoothLEAdvertisementResponse {
   repeated BluetoothServiceData service_data = 5;
   repeated BluetoothServiceData manufacturer_data = 6;
 }
+
+enum BluetoothDeviceRequestType {
+  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT = 0;
+  BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT = 1;
+  BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR = 2;
+  BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR = 3;
+}
+
+message BluetoothDeviceRequest {
+  option (id) = 68;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  BluetoothDeviceRequestType request_type = 2;
+}
+
+message BluetoothDeviceConnectionResponse {
+  option (id) = 69;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  bool connected = 2;
+  uint32 mtu = 3;
+  int32 error = 4;
+}
+
+message BluetoothGATTGetServicesRequest {
+  option (id) = 70;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+}
+
+message BluetoothGATTDescriptor {
+  repeated uint64 uuid = 1;
+  uint32 handle = 2;
+}
+
+message BluetoothGATTCharacteristic {
+  repeated uint64 uuid = 1;
+  uint32 handle = 2;
+  uint32 properties = 3;
+  repeated BluetoothGATTDescriptor descriptors = 4;
+}
+
+message BluetoothGATTService {
+  repeated uint64 uuid = 1;
+  uint32 handle = 2;
+  repeated BluetoothGATTCharacteristic characteristics = 3;
+}
+
+message BluetoothGATTGetServicesResponse {
+  option (id) = 71;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  repeated BluetoothGATTService services = 2;
+}
+
+message BluetoothGATTGetServicesDoneResponse {
+  option (id) = 72;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+}
+
+message BluetoothGATTReadRequest {
+  option (id) = 73;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+}
+
+message BluetoothGATTReadResponse {
+  option (id) = 74;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+
+  bytes data = 3;
+
+}
+
+message BluetoothGATTWriteRequest {
+  option (id) = 75;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+  bool response = 3;
+
+  bytes data = 4;
+}
+
+message BluetoothGATTReadDescriptorRequest {
+  option (id) = 76;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+}
+
+message BluetoothGATTWriteDescriptorRequest {
+  option (id) = 77;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+
+  bytes data = 3;
+}
+
+message BluetoothGATTNotifyRequest {
+  option (id) = 78;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+  bool enable = 3;
+}
+
+message BluetoothGATTNotifyDataResponse {
+  option (id) = 79;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+
+  bytes data = 3;
+}
+
+message SubscribeBluetoothConnectionsFreeRequest {
+  option (id) = 80;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+}
+
+message BluetoothConnectionsFreeResponse {
+  option (id) = 81;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint32 free = 1;
+  uint32 limit = 2;
+}
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index a3b000c778..1dbf0abec4 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -1,10 +1,10 @@
 #include "api_connection.h"
-#include "esphome/core/entity_base.h"
-#include "esphome/core/log.h"
-#include "esphome/components/network/util.h"
-#include "esphome/core/version.h"
-#include "esphome/core/hal.h"
 #include <cerrno>
+#include "esphome/components/network/util.h"
+#include "esphome/core/entity_base.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+#include "esphome/core/version.h"
 
 #ifdef USE_DEEP_SLEEP
 #include "esphome/components/deep_sleep/deep_sleep_component.h"
@@ -12,6 +12,9 @@
 #ifdef USE_HOMEASSISTANT_TIME
 #include "esphome/components/homeassistant/time/homeassistant_time.h"
 #endif
+#ifdef USE_BLUETOOTH_PROXY
+#include "esphome/components/bluetooth_proxy/bluetooth_proxy.h"
+#endif
 
 namespace esphome {
 namespace api {
@@ -823,6 +826,56 @@ void APIConnection::on_get_time_response(const GetTimeResponse &value) {
 }
 #endif
 
+#ifdef USE_BLUETOOTH_PROXY
+bool APIConnection::send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &msg) {
+  if (!this->bluetooth_le_advertisement_subscription_)
+    return false;
+  if (this->client_api_version_major_ < 1 || this->client_api_version_minor_ < 7) {
+    BluetoothLEAdvertisementResponse resp = msg;
+    for (auto &service : resp.service_data) {
+      service.legacy_data.assign(service.data.begin(), service.data.end());
+      service.data.clear();
+    }
+    for (auto &manufacturer_data : resp.manufacturer_data) {
+      manufacturer_data.legacy_data.assign(manufacturer_data.data.begin(), manufacturer_data.data.end());
+      manufacturer_data.data.clear();
+    }
+    return this->send_bluetooth_le_advertisement_response(resp);
+  }
+  return this->send_bluetooth_le_advertisement_response(msg);
+}
+void APIConnection::bluetooth_device_request(const BluetoothDeviceRequest &msg) {
+  bluetooth_proxy::global_bluetooth_proxy->bluetooth_device_request(msg);
+}
+void APIConnection::bluetooth_gatt_read(const BluetoothGATTReadRequest &msg) {
+  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_read(msg);
+}
+void APIConnection::bluetooth_gatt_write(const BluetoothGATTWriteRequest &msg) {
+  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_write(msg);
+}
+void APIConnection::bluetooth_gatt_read_descriptor(const BluetoothGATTReadDescriptorRequest &msg) {
+  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_read_descriptor(msg);
+}
+void APIConnection::bluetooth_gatt_write_descriptor(const BluetoothGATTWriteDescriptorRequest &msg) {
+  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_write_descriptor(msg);
+}
+void APIConnection::bluetooth_gatt_get_services(const BluetoothGATTGetServicesRequest &msg) {
+  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_send_services(msg);
+}
+
+void APIConnection::bluetooth_gatt_notify(const BluetoothGATTNotifyRequest &msg) {
+  bluetooth_proxy::global_bluetooth_proxy->bluetooth_gatt_notify(msg);
+}
+
+BluetoothConnectionsFreeResponse APIConnection::subscribe_bluetooth_connections_free(
+    const SubscribeBluetoothConnectionsFreeRequest &msg) {
+  BluetoothConnectionsFreeResponse resp;
+  resp.free = bluetooth_proxy::global_bluetooth_proxy->get_bluetooth_connections_free();
+  resp.limit = bluetooth_proxy::global_bluetooth_proxy->get_bluetooth_connections_limit();
+  return resp;
+}
+#endif
+
 bool APIConnection::send_log_message(int level, const char *tag, const char *line) {
   if (this->log_subscription_ < level)
     return false;
@@ -840,11 +893,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_);
-  ESP_LOGV(TAG, "Hello from client: '%s'", this->client_info_.c_str());
+  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 %d.%d", this->client_info_.c_str(),
+           this->client_api_version_major_, this->client_api_version_minor_);
 
   HelloResponse resp;
   resp.api_version_major = 1;
-  resp.api_version_minor = 6;
+  resp.api_version_minor = 7;
   resp.server_info = App.get_name() + " (esphome v" ESPHOME_VERSION ")";
   resp.name = App.get_name();
 
@@ -888,7 +944,7 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
   resp.webserver_port = USE_WEBSERVER_PORT;
 #endif
 #ifdef USE_BLUETOOTH_PROXY
-  resp.has_bluetooth_proxy = true;
+  resp.bluetooth_proxy_version = bluetooth_proxy::global_bluetooth_proxy->has_active() ? 2 : 1;
 #endif
   return resp;
 }
diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h
index dcf8bacad2..028fb80175 100644
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -1,15 +1,11 @@
 #pragma once
 
-#include "esphome/core/component.h"
-#include "esphome/core/application.h"
+#include "api_frame_helper.h"
 #include "api_pb2.h"
 #include "api_pb2_service.h"
 #include "api_server.h"
-#include "api_frame_helper.h"
-
-#ifdef USE_BLUETOOTH_PROXY
-#include "esphome/components/bluetooth_proxy/bluetooth_proxy.h"
-#endif
+#include "esphome/core/application.h"
+#include "esphome/core/component.h"
 
 namespace esphome {
 namespace api {
@@ -99,11 +95,18 @@ class APIConnection : public APIServerConnection {
     this->send_homeassistant_service_response(call);
   }
 #ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &call) {
-    if (!this->bluetooth_le_advertisement_subscription_)
-      return false;
-    return this->send_bluetooth_le_advertisement_response(call);
-  }
+  bool send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &msg);
+
+  void bluetooth_device_request(const BluetoothDeviceRequest &msg) override;
+  void bluetooth_gatt_read(const BluetoothGATTReadRequest &msg) override;
+  void bluetooth_gatt_write(const BluetoothGATTWriteRequest &msg) override;
+  void bluetooth_gatt_read_descriptor(const BluetoothGATTReadDescriptorRequest &msg) override;
+  void bluetooth_gatt_write_descriptor(const BluetoothGATTWriteDescriptorRequest &msg) override;
+  void bluetooth_gatt_get_services(const BluetoothGATTGetServicesRequest &msg) override;
+  void bluetooth_gatt_notify(const BluetoothGATTNotifyRequest &msg) override;
+  BluetoothConnectionsFreeResponse subscribe_bluetooth_connections_free(
+      const SubscribeBluetoothConnectionsFreeRequest &msg) override;
+
 #endif
 #ifdef USE_HOMEASSISTANT_TIME
   void send_time_request() {
@@ -181,6 +184,8 @@ class APIConnection : public APIServerConnection {
   std::unique_ptr<APIFrameHelper> helper_;
 
   std::string client_info_;
+  uint32_t client_api_version_major_{0};
+  uint32_t client_api_version_minor_{0};
 #ifdef USE_ESP32_CAMERA
   esp32_camera::CameraImageReader image_reader_;
 #endif
@@ -190,7 +195,7 @@ class APIConnection : public APIServerConnection {
   uint32_t last_traffic_;
   bool sent_ping_{false};
   bool service_call_subscription_{false};
-  bool bluetooth_le_advertisement_subscription_{true};
+  bool bluetooth_le_advertisement_subscription_{false};
   bool next_close_ = false;
   APIServer *parent_;
   InitialStateIterator initial_state_iterator_;
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 13969fce76..73d8044cde 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -340,6 +340,35 @@ template<> const char *proto_enum_to_string<enums::MediaPlayerCommand>(enums::Me
       return "UNKNOWN";
   }
 }
+template<>
+const char *proto_enum_to_string<enums::BluetoothDeviceRequestType>(enums::BluetoothDeviceRequestType value) {
+  switch (value) {
+    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT:
+      return "BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT";
+    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT:
+      return "BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT";
+    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR:
+      return "BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR";
+    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR:
+      return "BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR";
+    default:
+      return "UNKNOWN";
+  }
+}
+bool HelloRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 2: {
+      this->api_version_major = value.as_uint32();
+      return true;
+    }
+    case 3: {
+      this->api_version_minor = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
 bool HelloRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
     case 1: {
@@ -350,7 +379,11 @@ bool HelloRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value)
       return false;
   }
 }
-void HelloRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_string(1, this->client_info); }
+void HelloRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_string(1, this->client_info);
+  buffer.encode_uint32(2, this->api_version_major);
+  buffer.encode_uint32(3, this->api_version_minor);
+}
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void HelloRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
@@ -358,6 +391,16 @@ void HelloRequest::dump_to(std::string &out) const {
   out.append("  client_info: ");
   out.append("'").append(this->client_info).append("'");
   out.append("\n");
+
+  out.append("  api_version_major: ");
+  sprintf(buffer, "%u", this->api_version_major);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  api_version_minor: ");
+  sprintf(buffer, "%u", this->api_version_minor);
+  out.append(buffer);
+  out.append("\n");
   out.append("}");
 }
 #endif
@@ -496,7 +539,7 @@ bool DeviceInfoResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
       return true;
     }
     case 11: {
-      this->has_bluetooth_proxy = value.as_bool();
+      this->bluetooth_proxy_version = value.as_uint32();
       return true;
     }
     default:
@@ -548,7 +591,7 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(8, this->project_name);
   buffer.encode_string(9, this->project_version);
   buffer.encode_uint32(10, this->webserver_port);
-  buffer.encode_bool(11, this->has_bluetooth_proxy);
+  buffer.encode_uint32(11, this->bluetooth_proxy_version);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DeviceInfoResponse::dump_to(std::string &out) const {
@@ -595,8 +638,9 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
-  out.append("  has_bluetooth_proxy: ");
-  out.append(YESNO(this->has_bluetooth_proxy));
+  out.append("  bluetooth_proxy_version: ");
+  sprintf(buffer, "%u", this->bluetooth_proxy_version);
+  out.append(buffer);
   out.append("\n");
   out.append("}");
 }
@@ -4872,7 +4916,7 @@ void SubscribeBluetoothLEAdvertisementsRequest::dump_to(std::string &out) const
 bool BluetoothServiceData::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 2: {
-      this->data.push_back(value.as_uint32());
+      this->legacy_data.push_back(value.as_uint32());
       return true;
     }
     default:
@@ -4885,15 +4929,20 @@ bool BluetoothServiceData::decode_length(uint32_t field_id, ProtoLengthDelimited
       this->uuid = value.as_string();
       return true;
     }
+    case 3: {
+      this->data = value.as_string();
+      return true;
+    }
     default:
       return false;
   }
 }
 void BluetoothServiceData::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->uuid);
-  for (auto &it : this->data) {
+  for (auto &it : this->legacy_data) {
     buffer.encode_uint32(2, it, true);
   }
+  buffer.encode_string(3, this->data);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothServiceData::dump_to(std::string &out) const {
@@ -4903,12 +4952,16 @@ void BluetoothServiceData::dump_to(std::string &out) const {
   out.append("'").append(this->uuid).append("'");
   out.append("\n");
 
-  for (const auto &it : this->data) {
-    out.append("  data: ");
+  for (const auto &it : this->legacy_data) {
+    out.append("  legacy_data: ");
     sprintf(buffer, "%u", it);
     out.append(buffer);
     out.append("\n");
   }
+
+  out.append("  data: ");
+  out.append("'").append(this->data).append("'");
+  out.append("\n");
   out.append("}");
 }
 #endif
@@ -5000,6 +5053,699 @@ void BluetoothLEAdvertisementResponse::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
+bool BluetoothDeviceRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->request_type = value.as_enum<enums::BluetoothDeviceRequestType>();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothDeviceRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_enum<enums::BluetoothDeviceRequestType>(2, this->request_type);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothDeviceRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothDeviceRequest {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  request_type: ");
+  out.append(proto_enum_to_string<enums::BluetoothDeviceRequestType>(this->request_type));
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothDeviceConnectionResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->connected = value.as_bool();
+      return true;
+    }
+    case 3: {
+      this->mtu = value.as_uint32();
+      return true;
+    }
+    case 4: {
+      this->error = value.as_int32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothDeviceConnectionResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_bool(2, this->connected);
+  buffer.encode_uint32(3, this->mtu);
+  buffer.encode_int32(4, this->error);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothDeviceConnectionResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothDeviceConnectionResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  connected: ");
+  out.append(YESNO(this->connected));
+  out.append("\n");
+
+  out.append("  mtu: ");
+  sprintf(buffer, "%u", this->mtu);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  error: ");
+  sprintf(buffer, "%d", this->error);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTGetServicesRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTGetServicesRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_uint64(1, this->address); }
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTGetServicesRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTGetServicesRequest {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTDescriptor::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->uuid.push_back(value.as_uint64());
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTDescriptor::encode(ProtoWriteBuffer buffer) const {
+  for (auto &it : this->uuid) {
+    buffer.encode_uint64(1, it, true);
+  }
+  buffer.encode_uint32(2, this->handle);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTDescriptor::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTDescriptor {\n");
+  for (const auto &it : this->uuid) {
+    out.append("  uuid: ");
+    sprintf(buffer, "%llu", it);
+    out.append(buffer);
+    out.append("\n");
+  }
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTCharacteristic::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->uuid.push_back(value.as_uint64());
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    case 3: {
+      this->properties = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool BluetoothGATTCharacteristic::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 4: {
+      this->descriptors.push_back(value.as_message<BluetoothGATTDescriptor>());
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTCharacteristic::encode(ProtoWriteBuffer buffer) const {
+  for (auto &it : this->uuid) {
+    buffer.encode_uint64(1, it, true);
+  }
+  buffer.encode_uint32(2, this->handle);
+  buffer.encode_uint32(3, this->properties);
+  for (auto &it : this->descriptors) {
+    buffer.encode_message<BluetoothGATTDescriptor>(4, it, true);
+  }
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTCharacteristic::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTCharacteristic {\n");
+  for (const auto &it : this->uuid) {
+    out.append("  uuid: ");
+    sprintf(buffer, "%llu", it);
+    out.append(buffer);
+    out.append("\n");
+  }
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  properties: ");
+  sprintf(buffer, "%u", this->properties);
+  out.append(buffer);
+  out.append("\n");
+
+  for (const auto &it : this->descriptors) {
+    out.append("  descriptors: ");
+    it.dump_to(out);
+    out.append("\n");
+  }
+  out.append("}");
+}
+#endif
+bool BluetoothGATTService::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->uuid.push_back(value.as_uint64());
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool BluetoothGATTService::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 3: {
+      this->characteristics.push_back(value.as_message<BluetoothGATTCharacteristic>());
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTService::encode(ProtoWriteBuffer buffer) const {
+  for (auto &it : this->uuid) {
+    buffer.encode_uint64(1, it, true);
+  }
+  buffer.encode_uint32(2, this->handle);
+  for (auto &it : this->characteristics) {
+    buffer.encode_message<BluetoothGATTCharacteristic>(3, it, true);
+  }
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTService::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTService {\n");
+  for (const auto &it : this->uuid) {
+    out.append("  uuid: ");
+    sprintf(buffer, "%llu", it);
+    out.append(buffer);
+    out.append("\n");
+  }
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+
+  for (const auto &it : this->characteristics) {
+    out.append("  characteristics: ");
+    it.dump_to(out);
+    out.append("\n");
+  }
+  out.append("}");
+}
+#endif
+bool BluetoothGATTGetServicesResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool BluetoothGATTGetServicesResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 2: {
+      this->services.push_back(value.as_message<BluetoothGATTService>());
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTGetServicesResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  for (auto &it : this->services) {
+    buffer.encode_message<BluetoothGATTService>(2, it, true);
+  }
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTGetServicesResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTGetServicesResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  for (const auto &it : this->services) {
+    out.append("  services: ");
+    it.dump_to(out);
+    out.append("\n");
+  }
+  out.append("}");
+}
+#endif
+bool BluetoothGATTGetServicesDoneResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTGetServicesDoneResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTGetServicesDoneResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTGetServicesDoneResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTReadRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTReadRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTReadRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTReadRequest {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTReadResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool BluetoothGATTReadResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 3: {
+      this->data = value.as_string();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTReadResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+  buffer.encode_string(3, this->data);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTReadResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTReadResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  data: ");
+  out.append("'").append(this->data).append("'");
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTWriteRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    case 3: {
+      this->response = value.as_bool();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool BluetoothGATTWriteRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 4: {
+      this->data = value.as_string();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTWriteRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+  buffer.encode_bool(3, this->response);
+  buffer.encode_string(4, this->data);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTWriteRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTWriteRequest {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  response: ");
+  out.append(YESNO(this->response));
+  out.append("\n");
+
+  out.append("  data: ");
+  out.append("'").append(this->data).append("'");
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTReadDescriptorRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTReadDescriptorRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTReadDescriptorRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTReadDescriptorRequest {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTWriteDescriptorRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool BluetoothGATTWriteDescriptorRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 3: {
+      this->data = value.as_string();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTWriteDescriptorRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+  buffer.encode_string(3, this->data);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTWriteDescriptorRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTWriteDescriptorRequest {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  data: ");
+  out.append("'").append(this->data).append("'");
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTNotifyRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    case 3: {
+      this->enable = value.as_bool();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTNotifyRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+  buffer.encode_bool(3, this->enable);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTNotifyRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTNotifyRequest {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  enable: ");
+  out.append(YESNO(this->enable));
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTNotifyDataResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool BluetoothGATTNotifyDataResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 3: {
+      this->data = value.as_string();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTNotifyDataResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+  buffer.encode_string(3, this->data);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTNotifyDataResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTNotifyDataResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  data: ");
+  out.append("'").append(this->data).append("'");
+  out.append("\n");
+  out.append("}");
+}
+#endif
+void SubscribeBluetoothConnectionsFreeRequest::encode(ProtoWriteBuffer buffer) const {}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void SubscribeBluetoothConnectionsFreeRequest::dump_to(std::string &out) const {
+  out.append("SubscribeBluetoothConnectionsFreeRequest {}");
+}
+#endif
+bool BluetoothConnectionsFreeResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->free = value.as_uint32();
+      return true;
+    }
+    case 2: {
+      this->limit = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothConnectionsFreeResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint32(1, this->free);
+  buffer.encode_uint32(2, this->limit);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothConnectionsFreeResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothConnectionsFreeResponse {\n");
+  out.append("  free: ");
+  sprintf(buffer, "%u", this->free);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  limit: ");
+  sprintf(buffer, "%u", this->limit);
+  out.append(buffer);
+  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 2093f93ee7..325e9a23c3 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -155,12 +155,20 @@ enum MediaPlayerCommand : uint32_t {
   MEDIA_PLAYER_COMMAND_MUTE = 3,
   MEDIA_PLAYER_COMMAND_UNMUTE = 4,
 };
+enum BluetoothDeviceRequestType : uint32_t {
+  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT = 0,
+  BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT = 1,
+  BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR = 2,
+  BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR = 3,
+};
 
 }  // namespace enums
 
 class HelloRequest : public ProtoMessage {
  public:
   std::string client_info{};
+  uint32_t api_version_major{0};
+  uint32_t api_version_minor{0};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -168,6 +176,7 @@ class HelloRequest : public ProtoMessage {
 
  protected:
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
 class HelloResponse : public ProtoMessage {
  public:
@@ -263,7 +272,7 @@ class DeviceInfoResponse : public ProtoMessage {
   std::string project_name{};
   std::string project_version{};
   uint32_t webserver_port{0};
-  bool has_bluetooth_proxy{false};
+  uint32_t bluetooth_proxy_version{0};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1227,7 +1236,8 @@ class SubscribeBluetoothLEAdvertisementsRequest : public ProtoMessage {
 class BluetoothServiceData : public ProtoMessage {
  public:
   std::string uuid{};
-  std::vector<uint32_t> data{};
+  std::vector<uint32_t> legacy_data{};
+  std::string data{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1254,6 +1264,223 @@ class BluetoothLEAdvertisementResponse : public ProtoMessage {
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
   bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
+class BluetoothDeviceRequest : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  enums::BluetoothDeviceRequestType request_type{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothDeviceConnectionResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  bool connected{false};
+  uint32_t mtu{0};
+  int32_t error{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTGetServicesRequest : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTDescriptor : public ProtoMessage {
+ public:
+  std::vector<uint64_t> uuid{};
+  uint32_t handle{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTCharacteristic : public ProtoMessage {
+ public:
+  std::vector<uint64_t> uuid{};
+  uint32_t handle{0};
+  uint32_t properties{0};
+  std::vector<BluetoothGATTDescriptor> descriptors{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTService : public ProtoMessage {
+ public:
+  std::vector<uint64_t> uuid{};
+  uint32_t handle{0};
+  std::vector<BluetoothGATTCharacteristic> characteristics{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTGetServicesResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  std::vector<BluetoothGATTService> services{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTGetServicesDoneResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTReadRequest : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTReadResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  std::string data{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTWriteRequest : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  bool response{false};
+  std::string data{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTReadDescriptorRequest : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTWriteDescriptorRequest : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  std::string data{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTNotifyRequest : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  bool enable{false};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTNotifyDataResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  std::string data{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class SubscribeBluetoothConnectionsFreeRequest : public ProtoMessage {
+ public:
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+};
+class BluetoothConnectionsFreeResponse : public ProtoMessage {
+ public:
+  uint32_t free{0};
+  uint32_t limit{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt 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 6932675c41..7bfe1acf48 100644
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -336,6 +336,71 @@ bool APIServerConnectionBase::send_bluetooth_le_advertisement_response(const Blu
   return this->send_message_<BluetoothLEAdvertisementResponse>(msg, 67);
 }
 #endif
+#ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_device_connection_response(const BluetoothDeviceConnectionResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_device_connection_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothDeviceConnectionResponse>(msg, 69);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_gatt_get_services_response(const BluetoothGATTGetServicesResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_gatt_get_services_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothGATTGetServicesResponse>(msg, 71);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_gatt_get_services_done_response(
+    const BluetoothGATTGetServicesDoneResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_gatt_get_services_done_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothGATTGetServicesDoneResponse>(msg, 72);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_gatt_read_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothGATTReadResponse>(msg, 74);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_gatt_notify_data_response(const BluetoothGATTNotifyDataResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_gatt_notify_data_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothGATTNotifyDataResponse>(msg, 79);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_connections_free_response(const BluetoothConnectionsFreeResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_connections_free_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothConnectionsFreeResponse>(msg, 81);
+}
+#endif
 bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
   switch (msg_type) {
     case 1: {
@@ -612,6 +677,94 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
       this->on_subscribe_bluetooth_le_advertisements_request(msg);
       break;
     }
+    case 68: {
+#ifdef USE_BLUETOOTH_PROXY
+      BluetoothDeviceRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_bluetooth_device_request: %s", msg.dump().c_str());
+#endif
+      this->on_bluetooth_device_request(msg);
+#endif
+      break;
+    }
+    case 70: {
+#ifdef USE_BLUETOOTH_PROXY
+      BluetoothGATTGetServicesRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_get_services_request: %s", msg.dump().c_str());
+#endif
+      this->on_bluetooth_gatt_get_services_request(msg);
+#endif
+      break;
+    }
+    case 73: {
+#ifdef USE_BLUETOOTH_PROXY
+      BluetoothGATTReadRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_read_request: %s", msg.dump().c_str());
+#endif
+      this->on_bluetooth_gatt_read_request(msg);
+#endif
+      break;
+    }
+    case 75: {
+#ifdef USE_BLUETOOTH_PROXY
+      BluetoothGATTWriteRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_write_request: %s", msg.dump().c_str());
+#endif
+      this->on_bluetooth_gatt_write_request(msg);
+#endif
+      break;
+    }
+    case 76: {
+#ifdef USE_BLUETOOTH_PROXY
+      BluetoothGATTReadDescriptorRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_read_descriptor_request: %s", msg.dump().c_str());
+#endif
+      this->on_bluetooth_gatt_read_descriptor_request(msg);
+#endif
+      break;
+    }
+    case 77: {
+#ifdef USE_BLUETOOTH_PROXY
+      BluetoothGATTWriteDescriptorRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_write_descriptor_request: %s", msg.dump().c_str());
+#endif
+      this->on_bluetooth_gatt_write_descriptor_request(msg);
+#endif
+      break;
+    }
+    case 78: {
+#ifdef USE_BLUETOOTH_PROXY
+      BluetoothGATTNotifyRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_notify_request: %s", msg.dump().c_str());
+#endif
+      this->on_bluetooth_gatt_notify_request(msg);
+#endif
+      break;
+    }
+    case 80: {
+#ifdef USE_BLUETOOTH_PROXY
+      SubscribeBluetoothConnectionsFreeRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_subscribe_bluetooth_connections_free_request: %s", msg.dump().c_str());
+#endif
+      this->on_subscribe_bluetooth_connections_free_request(msg);
+#endif
+      break;
+    }
     default:
       return false;
   }
@@ -708,18 +861,6 @@ void APIServerConnection::on_subscribe_home_assistant_states_request(const Subsc
   }
   this->subscribe_home_assistant_states(msg);
 }
-void APIServerConnection::on_subscribe_bluetooth_le_advertisements_request(
-    const SubscribeBluetoothLEAdvertisementsRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->subscribe_bluetooth_le_advertisements(msg);
-}
 void APIServerConnection::on_get_time_request(const GetTimeRequest &msg) {
   if (!this->is_connection_setup()) {
     this->on_no_setup_connection();
@@ -884,6 +1025,126 @@ void APIServerConnection::on_media_player_command_request(const MediaPlayerComma
   this->media_player_command(msg);
 }
 #endif
+void APIServerConnection::on_subscribe_bluetooth_le_advertisements_request(
+    const SubscribeBluetoothLEAdvertisementsRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->subscribe_bluetooth_le_advertisements(msg);
+}
+#ifdef USE_BLUETOOTH_PROXY
+void APIServerConnection::on_bluetooth_device_request(const BluetoothDeviceRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->bluetooth_device_request(msg);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+void APIServerConnection::on_bluetooth_gatt_get_services_request(const BluetoothGATTGetServicesRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->bluetooth_gatt_get_services(msg);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+void APIServerConnection::on_bluetooth_gatt_read_request(const BluetoothGATTReadRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->bluetooth_gatt_read(msg);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+void APIServerConnection::on_bluetooth_gatt_write_request(const BluetoothGATTWriteRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->bluetooth_gatt_write(msg);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+void APIServerConnection::on_bluetooth_gatt_read_descriptor_request(const BluetoothGATTReadDescriptorRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->bluetooth_gatt_read_descriptor(msg);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+void APIServerConnection::on_bluetooth_gatt_write_descriptor_request(const BluetoothGATTWriteDescriptorRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->bluetooth_gatt_write_descriptor(msg);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+void APIServerConnection::on_bluetooth_gatt_notify_request(const BluetoothGATTNotifyRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->bluetooth_gatt_notify(msg);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+void APIServerConnection::on_subscribe_bluetooth_connections_free_request(
+    const SubscribeBluetoothConnectionsFreeRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  BluetoothConnectionsFreeResponse ret = this->subscribe_bluetooth_connections_free(msg);
+  if (!this->send_bluetooth_connections_free_response(ret)) {
+    this->on_fatal_error();
+  }
+}
+#endif
 
 }  // namespace api
 }  // namespace esphome
diff --git a/esphome/components/api/api_pb2_service.h b/esphome/components/api/api_pb2_service.h
index 49426d1bbc..c7ef1468d8 100644
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -158,6 +158,48 @@ class APIServerConnectionBase : public ProtoService {
       const SubscribeBluetoothLEAdvertisementsRequest &value){};
 #ifdef USE_BLUETOOTH_PROXY
   bool send_bluetooth_le_advertisement_response(const BluetoothLEAdvertisementResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void on_bluetooth_device_request(const BluetoothDeviceRequest &value){};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_device_connection_response(const BluetoothDeviceConnectionResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void on_bluetooth_gatt_get_services_request(const BluetoothGATTGetServicesRequest &value){};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_gatt_get_services_response(const BluetoothGATTGetServicesResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_gatt_get_services_done_response(const BluetoothGATTGetServicesDoneResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void on_bluetooth_gatt_read_request(const BluetoothGATTReadRequest &value){};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void on_bluetooth_gatt_write_request(const BluetoothGATTWriteRequest &value){};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void on_bluetooth_gatt_read_descriptor_request(const BluetoothGATTReadDescriptorRequest &value){};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void on_bluetooth_gatt_write_descriptor_request(const BluetoothGATTWriteDescriptorRequest &value){};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void on_bluetooth_gatt_notify_request(const BluetoothGATTNotifyRequest &value){};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_gatt_notify_data_response(const BluetoothGATTNotifyDataResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void on_subscribe_bluetooth_connections_free_request(const SubscribeBluetoothConnectionsFreeRequest &value){};
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_connections_free_response(const BluetoothConnectionsFreeResponse &msg);
 #endif
  protected:
   bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
@@ -175,7 +217,6 @@ class APIServerConnection : public APIServerConnectionBase {
   virtual void subscribe_logs(const SubscribeLogsRequest &msg) = 0;
   virtual void subscribe_homeassistant_services(const SubscribeHomeassistantServicesRequest &msg) = 0;
   virtual void subscribe_home_assistant_states(const SubscribeHomeAssistantStatesRequest &msg) = 0;
-  virtual void subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) = 0;
   virtual GetTimeResponse get_time(const GetTimeRequest &msg) = 0;
   virtual void execute_service(const ExecuteServiceRequest &msg) = 0;
 #ifdef USE_COVER
@@ -210,6 +251,32 @@ class APIServerConnection : public APIServerConnectionBase {
 #endif
 #ifdef USE_MEDIA_PLAYER
   virtual void media_player_command(const MediaPlayerCommandRequest &msg) = 0;
+#endif
+  virtual void subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) = 0;
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void bluetooth_device_request(const BluetoothDeviceRequest &msg) = 0;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void bluetooth_gatt_get_services(const BluetoothGATTGetServicesRequest &msg) = 0;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void bluetooth_gatt_read(const BluetoothGATTReadRequest &msg) = 0;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void bluetooth_gatt_write(const BluetoothGATTWriteRequest &msg) = 0;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void bluetooth_gatt_read_descriptor(const BluetoothGATTReadDescriptorRequest &msg) = 0;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void bluetooth_gatt_write_descriptor(const BluetoothGATTWriteDescriptorRequest &msg) = 0;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual void bluetooth_gatt_notify(const BluetoothGATTNotifyRequest &msg) = 0;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  virtual BluetoothConnectionsFreeResponse subscribe_bluetooth_connections_free(
+      const SubscribeBluetoothConnectionsFreeRequest &msg) = 0;
 #endif
  protected:
   void on_hello_request(const HelloRequest &msg) override;
@@ -222,7 +289,6 @@ class APIServerConnection : public APIServerConnectionBase {
   void on_subscribe_logs_request(const SubscribeLogsRequest &msg) override;
   void on_subscribe_homeassistant_services_request(const SubscribeHomeassistantServicesRequest &msg) override;
   void on_subscribe_home_assistant_states_request(const SubscribeHomeAssistantStatesRequest &msg) override;
-  void on_subscribe_bluetooth_le_advertisements_request(const SubscribeBluetoothLEAdvertisementsRequest &msg) override;
   void on_get_time_request(const GetTimeRequest &msg) override;
   void on_execute_service_request(const ExecuteServiceRequest &msg) override;
 #ifdef USE_COVER
@@ -257,6 +323,31 @@ class APIServerConnection : public APIServerConnectionBase {
 #endif
 #ifdef USE_MEDIA_PLAYER
   void on_media_player_command_request(const MediaPlayerCommandRequest &msg) override;
+#endif
+  void on_subscribe_bluetooth_le_advertisements_request(const SubscribeBluetoothLEAdvertisementsRequest &msg) override;
+#ifdef USE_BLUETOOTH_PROXY
+  void on_bluetooth_device_request(const BluetoothDeviceRequest &msg) override;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  void on_bluetooth_gatt_get_services_request(const BluetoothGATTGetServicesRequest &msg) override;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  void on_bluetooth_gatt_read_request(const BluetoothGATTReadRequest &msg) override;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  void on_bluetooth_gatt_write_request(const BluetoothGATTWriteRequest &msg) override;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  void on_bluetooth_gatt_read_descriptor_request(const BluetoothGATTReadDescriptorRequest &msg) override;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  void on_bluetooth_gatt_write_descriptor_request(const BluetoothGATTWriteDescriptorRequest &msg) override;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  void on_bluetooth_gatt_notify_request(const BluetoothGATTNotifyRequest &msg) override;
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  void on_subscribe_bluetooth_connections_free_request(const SubscribeBluetoothConnectionsFreeRequest &msg) override;
 #endif
 };
 
diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index 5851594955..965f08aa15 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -297,6 +297,51 @@ void APIServer::send_bluetooth_le_advertisement(const BluetoothLEAdvertisementRe
     client->send_bluetooth_le_advertisement(call);
   }
 }
+void APIServer::send_bluetooth_device_connection(uint64_t address, bool connected, uint16_t mtu, esp_err_t error) {
+  BluetoothDeviceConnectionResponse call;
+  call.address = address;
+  call.connected = connected;
+  call.mtu = mtu;
+  call.error = error;
+
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_device_connection_response(call);
+  }
+}
+
+void APIServer::send_bluetooth_connections_free(uint8_t free, uint8_t limit) {
+  BluetoothConnectionsFreeResponse call;
+  call.free = free;
+  call.limit = limit;
+
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_connections_free_response(call);
+  }
+}
+
+void APIServer::send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &call) {
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_gatt_read_response(call);
+  }
+}
+void APIServer::send_bluetooth_gatt_notify_data_response(const BluetoothGATTNotifyDataResponse &call) {
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_gatt_notify_data_response(call);
+  }
+}
+void APIServer::send_bluetooth_gatt_services(const BluetoothGATTGetServicesResponse &call) {
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_gatt_get_services_response(call);
+  }
+}
+void APIServer::send_bluetooth_gatt_services_done(uint64_t address) {
+  BluetoothGATTGetServicesDoneResponse call;
+  call.address = address;
+
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_gatt_get_services_done_response(call);
+  }
+}
 #endif
 APIServer::APIServer() { global_api_server = this; }
 void APIServer::subscribe_home_assistant_state(std::string entity_id, optional<std::string> attribute,
diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index dc892b2088..72ab55432c 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -75,6 +75,12 @@ class APIServer : public Component, public Controller {
   void send_homeassistant_service_call(const HomeassistantServiceResponse &call);
 #ifdef USE_BLUETOOTH_PROXY
   void send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &call);
+  void send_bluetooth_device_connection(uint64_t address, bool connected, uint16_t mtu, esp_err_t error = ESP_OK);
+  void send_bluetooth_connections_free(uint8_t free, uint8_t limit);
+  void send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &call);
+  void send_bluetooth_gatt_notify_data_response(const BluetoothGATTNotifyDataResponse &call);
+  void send_bluetooth_gatt_services(const BluetoothGATTGetServicesResponse &call);
+  void send_bluetooth_gatt_services_done(uint64_t address);
 #endif
   void register_user_service(UserServiceDescriptor *descriptor) { this->user_services_.push_back(descriptor); }
 #ifdef USE_HOMEASSISTANT_TIME
diff --git a/esphome/components/bedjet/bedjet_hub.cpp b/esphome/components/bedjet/bedjet_hub.cpp
index fd383eb6be..f90ca5cf54 100644
--- a/esphome/components/bedjet/bedjet_hub.cpp
+++ b/esphome/components/bedjet/bedjet_hub.cpp
@@ -128,9 +128,9 @@ uint8_t BedJetHub::write_bedjet_packet_(BedjetPacket *pkt) {
     }
     return -1;
   }
-  auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_cmd_,
-                                         pkt->data_length + 1, (uint8_t *) &pkt->command, ESP_GATT_WRITE_TYPE_NO_RSP,
-                                         ESP_GATT_AUTH_REQ_NONE);
+  auto status = esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(),
+                                         this->char_handle_cmd_, pkt->data_length + 1, (uint8_t *) &pkt->command,
+                                         ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
   return status;
 }
 
@@ -138,13 +138,13 @@ uint8_t BedJetHub::write_bedjet_packet_(BedjetPacket *pkt) {
 uint8_t BedJetHub::set_notify_(const bool enable) {
   uint8_t status;
   if (enable) {
-    status = esp_ble_gattc_register_for_notify(this->parent_->gattc_if, this->parent_->remote_bda,
+    status = esp_ble_gattc_register_for_notify(this->parent_->get_gattc_if(), this->parent_->get_remote_bda(),
                                                this->char_handle_status_);
     if (status) {
       ESP_LOGW(TAG, "[%s] esp_ble_gattc_register_for_notify failed, status=%d", this->get_name().c_str(), status);
     }
   } else {
-    status = esp_ble_gattc_unregister_for_notify(this->parent_->gattc_if, this->parent_->remote_bda,
+    status = esp_ble_gattc_unregister_for_notify(this->parent_->get_gattc_if(), this->parent_->get_remote_bda(),
                                                  this->char_handle_status_);
     if (status) {
       ESP_LOGW(TAG, "[%s] esp_ble_gattc_unregister_for_notify failed, status=%d", this->get_name().c_str(), status);
@@ -204,8 +204,8 @@ bool BedJetHub::discover_characteristics_() {
       result = false;
     } else {
       this->char_handle_name_ = chr->handle;
-      auto status = esp_ble_gattc_read_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_name_,
-                                            ESP_GATT_AUTH_REQ_NONE);
+      auto status = esp_ble_gattc_read_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(),
+                                            this->char_handle_name_, ESP_GATT_AUTH_REQ_NONE);
       if (status) {
         ESP_LOGI(TAG, "[%s] Unable to read name characteristic: %d", this->get_name().c_str(), status);
       }
@@ -230,22 +230,6 @@ void BedJetHub::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
       this->dispatch_state_(false);
       break;
     }
-    case ESP_GATTC_OPEN_EVT: {
-      // FIXME: bug in BLEClient
-      this->parent_->conn_id = param->open.conn_id;
-      this->open_conn_id_ = param->open.conn_id;
-      break;
-    }
-
-    case ESP_GATTC_CONNECT_EVT: {
-      if (this->parent_->conn_id != param->connect.conn_id && this->open_conn_id_ != 0xff) {
-        // FIXME: bug in BLEClient
-        ESP_LOGW(TAG, "[%s] CONNECT_EVT unexpected conn_id; open=%d, parent=%d, param=%d", this->get_name().c_str(),
-                 this->open_conn_id_, this->parent_->conn_id, param->connect.conn_id);
-        this->parent_->conn_id = this->open_conn_id_;
-      }
-      break;
-    }
     case ESP_GATTC_SEARCH_CMPL_EVT: {
       auto result = this->discover_characteristics_();
 
@@ -301,7 +285,7 @@ void BedJetHub::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
       break;
     }
     case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent_->conn_id)
+      if (param->read.conn_id != this->parent_->get_conn_id())
         break;
       if (param->read.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
@@ -358,9 +342,9 @@ void BedJetHub::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
       if (this->processing_)
         break;
 
-      if (param->notify.conn_id != this->parent_->conn_id) {
+      if (param->notify.conn_id != this->parent_->get_conn_id()) {
         ESP_LOGW(TAG, "[%s] Received notify event for unexpected parent conn: expect %x, got %x",
-                 this->get_name().c_str(), this->parent_->conn_id, param->notify.conn_id);
+                 this->get_name().c_str(), this->parent_->get_conn_id(), param->notify.conn_id);
         // FIXME: bug in BLEClient holding wrong conn_id.
       }
 
@@ -394,7 +378,7 @@ void BedJetHub::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
         if (needs_extra) {
           // This means the packet was partial, so read the status characteristic to get the second part.
           // Ideally this will complete quickly. We won't process additional notification events until it does.
-          auto status = esp_ble_gattc_read_char(this->parent_->gattc_if, this->parent_->conn_id,
+          auto status = esp_ble_gattc_read_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(),
                                                 this->char_handle_status_, ESP_GATT_AUTH_REQ_NONE);
           if (status) {
             ESP_LOGI(TAG, "[%s] Unable to read extended status packet", this->get_name().c_str());
@@ -438,15 +422,15 @@ uint8_t BedJetHub::write_notify_config_descriptor_(bool enable) {
 
   // NOTE: BLEClient uses `uint8_t*` of length 1, but BLE spec requires 16 bits.
   uint16_t notify_en = enable ? 1 : 0;
-  auto status =
-      esp_ble_gattc_write_char_descr(this->parent_->gattc_if, this->parent_->conn_id, handle, sizeof(notify_en),
-                                     (uint8_t *) &notify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
+  auto status = esp_ble_gattc_write_char_descr(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), handle,
+                                               sizeof(notify_en), (uint8_t *) &notify_en, ESP_GATT_WRITE_TYPE_RSP,
+                                               ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, status=%d", status);
     return status;
   }
   ESP_LOGD(TAG, "[%s] wrote notify=%s to status config 0x%04x, for conn %d", this->get_name().c_str(),
-           enable ? "true" : "false", handle, this->parent_->conn_id);
+           enable ? "true" : "false", handle, this->parent_->get_conn_id());
   return ESP_GATT_OK;
 }
 
@@ -500,7 +484,7 @@ void BedJetHub::update() { this->dispatch_status_(); }
 void BedJetHub::dump_config() {
   ESP_LOGCONFIG(TAG, "BedJet Hub '%s'", this->get_name().c_str());
   ESP_LOGCONFIG(TAG, "  ble_client.app_id: %d", this->parent()->app_id);
-  ESP_LOGCONFIG(TAG, "  ble_client.conn_id: %d", this->parent()->conn_id);
+  ESP_LOGCONFIG(TAG, "  ble_client.conn_id: %d", this->parent()->get_conn_id());
   LOG_UPDATE_INTERVAL(this)
   ESP_LOGCONFIG(TAG, "  Child components (%d):", this->children_.size());
   for (auto *child : this->children_) {
diff --git a/esphome/components/bedjet/bedjet_hub.h b/esphome/components/bedjet/bedjet_hub.h
index c7583b78e9..f1479710a7 100644
--- a/esphome/components/bedjet/bedjet_hub.h
+++ b/esphome/components/bedjet/bedjet_hub.h
@@ -167,8 +167,6 @@ class BedJetHub : public esphome::ble_client::BLEClientNode, public PollingCompo
   uint16_t char_handle_status_;
   uint16_t config_descr_status_;
 
-  uint8_t open_conn_id_ = -1;
-
   uint8_t write_notify_config_descriptor_(bool enable);
 };
 
diff --git a/esphome/components/ble_client/__init__.py b/esphome/components/ble_client/__init__.py
index 4b7d5f5b8a..0f1f60e62b 100644
--- a/esphome/components/ble_client/__init__.py
+++ b/esphome/components/ble_client/__init__.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.components import esp32_ble_tracker
+from esphome.components import esp32_ble_tracker, esp32_ble_client
 from esphome.const import (
     CONF_CHARACTERISTIC_UUID,
     CONF_ID,
@@ -14,13 +14,12 @@ from esphome.const import (
 )
 from esphome import automation
 
+AUTO_LOAD = ["esp32_ble_client"]
 CODEOWNERS = ["@buxtronix"]
 DEPENDENCIES = ["esp32_ble_tracker"]
 
 ble_client_ns = cg.esphome_ns.namespace("ble_client")
-BLEClient = ble_client_ns.class_(
-    "BLEClient", cg.Component, esp32_ble_tracker.ESPBTClient
-)
+BLEClient = ble_client_ns.class_("BLEClient", esp32_ble_client.BLEClientBase)
 BLEClientNode = ble_client_ns.class_("BLEClientNode")
 BLEClientNodeConstRef = BLEClientNode.operator("ref").operator("const")
 # Triggers
diff --git a/esphome/components/ble_client/automation.cpp b/esphome/components/ble_client/automation.cpp
index 6918ab31b4..395950dd26 100644
--- a/esphome/components/ble_client/automation.cpp
+++ b/esphome/components/ble_client/automation.cpp
@@ -1,8 +1,8 @@
 #include "automation.h"
 
+#include <esp_bt_defs.h>
 #include <esp_gap_ble_api.h>
 #include <esp_gattc_api.h>
-#include <esp_bt_defs.h>
 
 #include "esphome/core/log.h"
 
@@ -31,8 +31,8 @@ void BLEWriterClientNode::write(const std::vector<uint8_t> &value) {
   }
   ESP_LOGVV(TAG, "Will write %d bytes: %s", value.size(), format_hex_pretty(value).c_str());
   esp_err_t err =
-      esp_ble_gattc_write_char(this->parent()->gattc_if, this->parent()->conn_id, this->ble_char_handle_, value.size(),
-                               const_cast<uint8_t *>(value.data()), write_type, ESP_GATT_AUTH_REQ_NONE);
+      esp_ble_gattc_write_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->ble_char_handle_,
+                               value.size(), const_cast<uint8_t *>(value.data()), write_type, ESP_GATT_AUTH_REQ_NONE);
   if (err != ESP_OK) {
     ESP_LOGE(TAG, "Error writing to characteristic: %s!", esp_err_to_name(err));
   }
diff --git a/esphome/components/ble_client/automation.h b/esphome/components/ble_client/automation.h
index 38e64ebd76..ba5f78109e 100644
--- a/esphome/components/ble_client/automation.h
+++ b/esphome/components/ble_client/automation.h
@@ -28,7 +28,8 @@ class BLEClientDisconnectTrigger : public Trigger<>, public BLEClientNode {
   void loop() override {}
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override {
-    if (event == ESP_GATTC_DISCONNECT_EVT && memcmp(param->disconnect.remote_bda, this->parent_->remote_bda, 6) == 0)
+    if (event == ESP_GATTC_DISCONNECT_EVT &&
+        memcmp(param->disconnect.remote_bda, this->parent_->get_remote_bda(), 6) == 0)
       this->trigger();
     if (event == ESP_GATTC_SEARCH_CMPL_EVT)
       this->node_state = espbt::ClientState::ESTABLISHED;
diff --git a/esphome/components/ble_client/ble_client.cpp b/esphome/components/ble_client/ble_client.cpp
index 5f58d8273f..3f86df32f5 100644
--- a/esphome/components/ble_client/ble_client.cpp
+++ b/esphome/components/ble_client/ble_client.cpp
@@ -1,8 +1,9 @@
-#include "esphome/core/log.h"
+#include "ble_client.h"
+#include "esphome/components/esp32_ble_client/ble_client_base.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 "ble_client.h"
+#include "esphome/core/log.h"
 
 #ifdef USE_ESP32
 
@@ -11,22 +12,13 @@ namespace ble_client {
 
 static const char *const TAG = "ble_client";
 
-float BLEClient::get_setup_priority() const { return setup_priority::AFTER_BLUETOOTH; }
-
 void BLEClient::setup() {
-  auto ret = esp_ble_gattc_app_register(this->app_id);
-  if (ret) {
-    ESP_LOGE(TAG, "gattc app register failed. app_id=%d code=%d", this->app_id, ret);
-    this->mark_failed();
-  }
-  this->set_states_(espbt::ClientState::IDLE);
+  BLEClientBase::setup();
   this->enabled = true;
 }
 
 void BLEClient::loop() {
-  if (this->state() == espbt::ClientState::DISCOVERED) {
-    this->connect();
-  }
+  BLEClientBase::loop();
   for (auto *node : this->nodes_)
     node->loop();
 }
@@ -39,34 +31,7 @@ void BLEClient::dump_config() {
 bool BLEClient::parse_device(const espbt::ESPBTDevice &device) {
   if (!this->enabled)
     return false;
-  if (device.address_uint64() != this->address)
-    return false;
-  if (this->state() != espbt::ClientState::IDLE)
-    return false;
-
-  ESP_LOGD(TAG, "Found device at MAC address [%s]", device.address_str().c_str());
-  this->set_states_(espbt::ClientState::DISCOVERED);
-
-  auto addr = device.address_uint64();
-  this->remote_bda[0] = (addr >> 40) & 0xFF;
-  this->remote_bda[1] = (addr >> 32) & 0xFF;
-  this->remote_bda[2] = (addr >> 24) & 0xFF;
-  this->remote_bda[3] = (addr >> 16) & 0xFF;
-  this->remote_bda[4] = (addr >> 8) & 0xFF;
-  this->remote_bda[5] = (addr >> 0) & 0xFF;
-  this->remote_addr_type = device.get_address_type();
-  return true;
-}
-
-std::string BLEClient::address_str() const {
-  char buf[20];
-  sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x", (uint8_t)(this->address >> 40) & 0xff,
-          (uint8_t)(this->address >> 32) & 0xff, (uint8_t)(this->address >> 24) & 0xff,
-          (uint8_t)(this->address >> 16) & 0xff, (uint8_t)(this->address >> 8) & 0xff,
-          (uint8_t)(this->address >> 0) & 0xff);
-  std::string ret;
-  ret = buf;
-  return ret;
+  return BLEClientBase::parse_device(device);
 }
 
 void BLEClient::set_enabled(bool enabled) {
@@ -74,7 +39,7 @@ void BLEClient::set_enabled(bool enabled) {
     return;
   if (!enabled && this->state() != espbt::ClientState::IDLE) {
     ESP_LOGI(TAG, "[%s] Disabling BLE client.", this->address_str().c_str());
-    auto ret = esp_ble_gattc_close(this->gattc_if, this->conn_id);
+    auto ret = esp_ble_gattc_close(this->gattc_if_, this->conn_id_);
     if (ret) {
       ESP_LOGW(TAG, "esp_ble_gattc_close error, address=%s status=%d", this->address_str().c_str(), ret);
     }
@@ -82,125 +47,12 @@ void BLEClient::set_enabled(bool enabled) {
   this->enabled = enabled;
 }
 
-void BLEClient::connect() {
-  ESP_LOGI(TAG, "Attempting BLE connection to %s", this->address_str().c_str());
-  auto ret = esp_ble_gattc_open(this->gattc_if, this->remote_bda, this->remote_addr_type, true);
-  if (ret) {
-    ESP_LOGW(TAG, "esp_ble_gattc_open error, address=%s status=%d", this->address_str().c_str(), ret);
-    this->set_states_(espbt::ClientState::IDLE);
-  } else {
-    this->set_states_(espbt::ClientState::CONNECTING);
-  }
-}
-
 void BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t esp_gattc_if,
                                     esp_ble_gattc_cb_param_t *param) {
-  if (event == ESP_GATTC_REG_EVT && this->app_id != param->reg.app_id)
-    return;
-  if (event != ESP_GATTC_REG_EVT && esp_gattc_if != ESP_GATT_IF_NONE && esp_gattc_if != this->gattc_if)
-    return;
-
   bool all_established = this->all_nodes_established_();
 
-  switch (event) {
-    case ESP_GATTC_REG_EVT: {
-      if (param->reg.status == ESP_GATT_OK) {
-        ESP_LOGV(TAG, "gattc registered app id %d", this->app_id);
-        this->gattc_if = esp_gattc_if;
-      } else {
-        ESP_LOGE(TAG, "gattc app registration failed id=%d code=%d", param->reg.app_id, param->reg.status);
-      }
-      break;
-    }
-    case ESP_GATTC_OPEN_EVT: {
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_OPEN_EVT", this->address_str().c_str());
-      this->conn_id = param->open.conn_id;
-      if (param->open.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "connect to %s failed, status=%d", this->address_str().c_str(), param->open.status);
-        this->set_states_(espbt::ClientState::IDLE);
-        break;
-      }
-      break;
-    }
-    case ESP_GATTC_CONNECT_EVT: {
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_CONNECT_EVT", this->address_str().c_str());
-      if (this->conn_id != param->connect.conn_id) {
-        ESP_LOGD(TAG, "[%s] Unexpected conn_id in CONNECT_EVT: param conn=%d, open conn=%d",
-                 this->address_str().c_str(), param->connect.conn_id, this->conn_id);
-      }
-      auto ret = esp_ble_gattc_send_mtu_req(this->gattc_if, param->connect.conn_id);
-      if (ret) {
-        ESP_LOGW(TAG, "esp_ble_gattc_send_mtu_req failed, status=%x", ret);
-      }
-      break;
-    }
-    case ESP_GATTC_CFG_MTU_EVT: {
-      if (param->cfg_mtu.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "cfg_mtu to %s failed, mtu %d, status %d", this->address_str().c_str(), param->cfg_mtu.mtu,
-                 param->cfg_mtu.status);
-        this->set_states_(espbt::ClientState::IDLE);
-        break;
-      }
-      ESP_LOGV(TAG, "cfg_mtu status %d, mtu %d", param->cfg_mtu.status, param->cfg_mtu.mtu);
-      esp_ble_gattc_search_service(esp_gattc_if, param->cfg_mtu.conn_id, nullptr);
-      break;
-    }
-    case ESP_GATTC_DISCONNECT_EVT: {
-      if (memcmp(param->disconnect.remote_bda, this->remote_bda, 6) != 0) {
-        return;
-      }
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_DISCONNECT_EVT, reason %d", this->address_str().c_str(), param->disconnect.reason);
-      for (auto &svc : this->services_)
-        delete svc;  // NOLINT(cppcoreguidelines-owning-memory)
-      this->services_.clear();
-      this->set_states_(espbt::ClientState::IDLE);
-      break;
-    }
-    case ESP_GATTC_SEARCH_RES_EVT: {
-      BLEService *ble_service = new BLEService();  // NOLINT(cppcoreguidelines-owning-memory)
-      ble_service->uuid = espbt::ESPBTUUID::from_uuid(param->search_res.srvc_id.uuid);
-      ble_service->start_handle = param->search_res.start_handle;
-      ble_service->end_handle = param->search_res.end_handle;
-      ble_service->client = this;
-      this->services_.push_back(ble_service);
-      break;
-    }
-    case ESP_GATTC_SEARCH_CMPL_EVT: {
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_SEARCH_CMPL_EVT", this->address_str().c_str());
-      for (auto &svc : this->services_) {
-        ESP_LOGI(TAG, "Service UUID: %s", svc->uuid.to_string().c_str());
-        ESP_LOGI(TAG, "  start_handle: 0x%x  end_handle: 0x%x", svc->start_handle, svc->end_handle);
-        svc->parse_characteristics();
-      }
-      this->set_states_(espbt::ClientState::CONNECTED);
-      this->set_state(espbt::ClientState::ESTABLISHED);
-      break;
-    }
-    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
-      auto *descr = this->get_config_descriptor(param->reg_for_notify.handle);
-      if (descr == nullptr) {
-        ESP_LOGW(TAG, "No descriptor found for notify of handle 0x%x", param->reg_for_notify.handle);
-        break;
-      }
-      if (descr->uuid.get_uuid().len != ESP_UUID_LEN_16 ||
-          descr->uuid.get_uuid().uuid.uuid16 != ESP_GATT_UUID_CHAR_CLIENT_CONFIG) {
-        ESP_LOGW(TAG, "Handle 0x%x (uuid %s) is not a client config char uuid", param->reg_for_notify.handle,
-                 descr->uuid.to_string().c_str());
-        break;
-      }
-      uint16_t notify_en = 1;
-      auto status =
-          esp_ble_gattc_write_char_descr(this->gattc_if, this->conn_id, descr->handle, sizeof(notify_en),
-                                         (uint8_t *) &notify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
-      if (status) {
-        ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, status=%d", status);
-      }
-      break;
-    }
+  BLEClientBase::gattc_event_handler(event, esp_gattc_if, param);
 
-    default:
-      break;
-  }
   for (auto *node : this->nodes_)
     node->gattc_event_handler(event, esp_gattc_if, param);
 
@@ -212,237 +64,20 @@ void BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t es
   }
 }
 
-void BLEClient::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
-  switch (event) {
-    // This event is sent by the server when it requests security
-    case ESP_GAP_BLE_SEC_REQ_EVT:
-      ESP_LOGV(TAG, "ESP_GAP_BLE_SEC_REQ_EVT %x", event);
-      esp_ble_gap_security_rsp(param->ble_security.ble_req.bd_addr, true);
-      break;
-    // This event is sent once authentication has completed
-    case ESP_GAP_BLE_AUTH_CMPL_EVT:
-      esp_bd_addr_t bd_addr;
-      memcpy(bd_addr, param->ble_security.auth_cmpl.bd_addr, sizeof(esp_bd_addr_t));
-      ESP_LOGI(TAG, "auth complete. remote BD_ADDR: %s", format_hex(bd_addr, 6).c_str());
-      if (!param->ble_security.auth_cmpl.success) {
-        ESP_LOGE(TAG, "auth fail reason = 0x%x", param->ble_security.auth_cmpl.fail_reason);
-      } else {
-        ESP_LOGV(TAG, "auth success. address type = %d auth mode = %d", param->ble_security.auth_cmpl.addr_type,
-                 param->ble_security.auth_cmpl.auth_mode);
-      }
-      break;
-    // There are other events we'll want to implement at some point to support things like pass key
-    // https://github.com/espressif/esp-idf/blob/cba69dd088344ed9d26739f04736ae7a37541b3a/examples/bluetooth/bluedroid/ble/gatt_security_client/tutorial/Gatt_Security_Client_Example_Walkthrough.md
-    default:
-      break;
+void BLEClient::set_state(espbt::ClientState state) {
+  BLEClientBase::set_state(state);
+  for (auto &node : nodes_)
+    node->node_state = state;
+}
+
+bool BLEClient::all_nodes_established_() {
+  if (this->state() != espbt::ClientState::ESTABLISHED)
+    return false;
+  for (auto &node : nodes_) {
+    if (node->node_state != espbt::ClientState::ESTABLISHED)
+      return false;
   }
-}
-
-// Parse GATT values into a float for a sensor.
-// Ref: https://www.bluetooth.com/specifications/assigned-numbers/format-types/
-float BLEClient::parse_char_value(uint8_t *value, uint16_t length) {
-  // A length of one means a single octet value.
-  if (length == 0)
-    return 0;
-  if (length == 1)
-    return (float) ((uint8_t) value[0]);
-
-  switch (value[0]) {
-    case 0x1:  // boolean.
-    case 0x2:  // 2bit.
-    case 0x3:  // nibble.
-    case 0x4:  // uint8.
-      return (float) ((uint8_t) value[1]);
-    case 0x5:  // uint12.
-    case 0x6:  // uint16.
-      if (length > 2) {
-        return (float) ((uint16_t)(value[1] << 8) + (uint16_t) value[2]);
-      }
-    case 0x7:  // uint24.
-      if (length > 3) {
-        return (float) ((uint32_t)(value[1] << 16) + (uint32_t)(value[2] << 8) + (uint32_t)(value[3]));
-      }
-    case 0x8:  // uint32.
-      if (length > 4) {
-        return (float) ((uint32_t)(value[1] << 24) + (uint32_t)(value[2] << 16) + (uint32_t)(value[3] << 8) +
-                        (uint32_t)(value[4]));
-      }
-    case 0xC:  // int8.
-      return (float) ((int8_t) value[1]);
-    case 0xD:  // int12.
-    case 0xE:  // int16.
-      if (length > 2) {
-        return (float) ((int16_t)(value[1] << 8) + (int16_t) value[2]);
-      }
-    case 0xF:  // int24.
-      if (length > 3) {
-        return (float) ((int32_t)(value[1] << 16) + (int32_t)(value[2] << 8) + (int32_t)(value[3]));
-      }
-    case 0x10:  // int32.
-      if (length > 4) {
-        return (float) ((int32_t)(value[1] << 24) + (int32_t)(value[2] << 16) + (int32_t)(value[3] << 8) +
-                        (int32_t)(value[4]));
-      }
-  }
-  ESP_LOGW(TAG, "Cannot parse characteristic value of type 0x%x length %d", value[0], length);
-  return NAN;
-}
-
-BLEService *BLEClient::get_service(espbt::ESPBTUUID uuid) {
-  for (auto *svc : this->services_) {
-    if (svc->uuid == uuid)
-      return svc;
-  }
-  return nullptr;
-}
-
-BLEService *BLEClient::get_service(uint16_t uuid) { return this->get_service(espbt::ESPBTUUID::from_uint16(uuid)); }
-
-BLECharacteristic *BLEClient::get_characteristic(espbt::ESPBTUUID service, espbt::ESPBTUUID chr) {
-  auto *svc = this->get_service(service);
-  if (svc == nullptr)
-    return nullptr;
-  return svc->get_characteristic(chr);
-}
-
-BLECharacteristic *BLEClient::get_characteristic(uint16_t service, uint16_t chr) {
-  return this->get_characteristic(espbt::ESPBTUUID::from_uint16(service), espbt::ESPBTUUID::from_uint16(chr));
-}
-
-BLEDescriptor *BLEClient::get_config_descriptor(uint16_t handle) {
-  for (auto &svc : this->services_) {
-    for (auto &chr : svc->characteristics) {
-      if (chr->handle == handle) {
-        for (auto &desc : chr->descriptors) {
-          if (desc->uuid == espbt::ESPBTUUID::from_uint16(0x2902))
-            return desc;
-        }
-      }
-    }
-  }
-  return nullptr;
-}
-
-BLECharacteristic *BLEService::get_characteristic(espbt::ESPBTUUID uuid) {
-  for (auto &chr : this->characteristics) {
-    if (chr->uuid == uuid)
-      return chr;
-  }
-  return nullptr;
-}
-
-BLECharacteristic *BLEService::get_characteristic(uint16_t uuid) {
-  return this->get_characteristic(espbt::ESPBTUUID::from_uint16(uuid));
-}
-
-BLEDescriptor *BLEClient::get_descriptor(espbt::ESPBTUUID service, espbt::ESPBTUUID chr, espbt::ESPBTUUID descr) {
-  auto *svc = this->get_service(service);
-  if (svc == nullptr)
-    return nullptr;
-  auto *ch = svc->get_characteristic(chr);
-  if (ch == nullptr)
-    return nullptr;
-  return ch->get_descriptor(descr);
-}
-
-BLEDescriptor *BLEClient::get_descriptor(uint16_t service, uint16_t chr, uint16_t descr) {
-  return this->get_descriptor(espbt::ESPBTUUID::from_uint16(service), espbt::ESPBTUUID::from_uint16(chr),
-                              espbt::ESPBTUUID::from_uint16(descr));
-}
-
-BLEService::~BLEService() {
-  for (auto &chr : this->characteristics)
-    delete chr;  // NOLINT(cppcoreguidelines-owning-memory)
-}
-
-void BLEService::parse_characteristics() {
-  uint16_t offset = 0;
-  esp_gattc_char_elem_t result;
-
-  while (true) {
-    uint16_t count = 1;
-    esp_gatt_status_t status = esp_ble_gattc_get_all_char(
-        this->client->gattc_if, this->client->conn_id, this->start_handle, this->end_handle, &result, &count, offset);
-    if (status == ESP_GATT_INVALID_OFFSET || status == ESP_GATT_NOT_FOUND) {
-      break;
-    }
-    if (status != ESP_GATT_OK) {
-      ESP_LOGW(TAG, "esp_ble_gattc_get_all_char error, status=%d", status);
-      break;
-    }
-    if (count == 0) {
-      break;
-    }
-
-    BLECharacteristic *characteristic = new BLECharacteristic();  // NOLINT(cppcoreguidelines-owning-memory)
-    characteristic->uuid = espbt::ESPBTUUID::from_uuid(result.uuid);
-    characteristic->properties = result.properties;
-    characteristic->handle = result.char_handle;
-    characteristic->service = this;
-    this->characteristics.push_back(characteristic);
-    ESP_LOGI(TAG, " characteristic %s, handle 0x%x, properties 0x%x", characteristic->uuid.to_string().c_str(),
-             characteristic->handle, characteristic->properties);
-    characteristic->parse_descriptors();
-    offset++;
-  }
-}
-
-BLECharacteristic::~BLECharacteristic() {
-  for (auto &desc : this->descriptors)
-    delete desc;  // NOLINT(cppcoreguidelines-owning-memory)
-}
-
-void BLECharacteristic::parse_descriptors() {
-  uint16_t offset = 0;
-  esp_gattc_descr_elem_t result;
-
-  while (true) {
-    uint16_t count = 1;
-    esp_gatt_status_t status = esp_ble_gattc_get_all_descr(
-        this->service->client->gattc_if, this->service->client->conn_id, this->handle, &result, &count, offset);
-    if (status == ESP_GATT_INVALID_OFFSET || status == ESP_GATT_NOT_FOUND) {
-      break;
-    }
-    if (status != ESP_GATT_OK) {
-      ESP_LOGW(TAG, "esp_ble_gattc_get_all_descr error, status=%d", status);
-      break;
-    }
-    if (count == 0) {
-      break;
-    }
-
-    BLEDescriptor *desc = new BLEDescriptor();  // NOLINT(cppcoreguidelines-owning-memory)
-    desc->uuid = espbt::ESPBTUUID::from_uuid(result.uuid);
-    desc->handle = result.handle;
-    desc->characteristic = this;
-    this->descriptors.push_back(desc);
-    ESP_LOGV(TAG, "   descriptor %s, handle 0x%x", desc->uuid.to_string().c_str(), desc->handle);
-    offset++;
-  }
-}
-
-BLEDescriptor *BLECharacteristic::get_descriptor(espbt::ESPBTUUID uuid) {
-  for (auto &desc : this->descriptors) {
-    if (desc->uuid == uuid)
-      return desc;
-  }
-  return nullptr;
-}
-BLEDescriptor *BLECharacteristic::get_descriptor(uint16_t uuid) {
-  return this->get_descriptor(espbt::ESPBTUUID::from_uint16(uuid));
-}
-
-void BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size, esp_gatt_write_type_t write_type) {
-  auto *client = this->service->client;
-  auto status = esp_ble_gattc_write_char(client->gattc_if, client->conn_id, this->handle, new_val_size, new_val,
-                                         write_type, ESP_GATT_AUTH_REQ_NONE);
-  if (status) {
-    ESP_LOGW(TAG, "Error sending write value to BLE gattc server, status=%d", status);
-  }
-}
-
-void BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size) {
-  write_value(new_val, new_val_size, ESP_GATT_WRITE_TYPE_NO_RSP);
+  return true;
 }
 
 }  // namespace ble_client
diff --git a/esphome/components/ble_client/ble_client.h b/esphome/components/ble_client/ble_client.h
index 5ed8f219d1..0f8373ab1f 100644
--- a/esphome/components/ble_client/ble_client.h
+++ b/esphome/components/ble_client/ble_client.h
@@ -1,8 +1,9 @@
 #pragma once
 
+#include "esphome/components/esp32_ble_client/ble_client_base.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 
 #ifdef USE_ESP32
 
@@ -18,9 +19,9 @@ namespace ble_client {
 
 namespace espbt = esphome::esp32_ble_tracker;
 
+using namespace esp32_ble_client;
+
 class BLEClient;
-class BLEService;
-class BLECharacteristic;
 
 class BLEClientNode {
  public:
@@ -42,57 +43,15 @@ class BLEClientNode {
   uint64_t address_;
 };
 
-class BLEDescriptor {
- public:
-  espbt::ESPBTUUID uuid;
-  uint16_t handle;
-
-  BLECharacteristic *characteristic;
-};
-
-class BLECharacteristic {
- public:
-  ~BLECharacteristic();
-  espbt::ESPBTUUID uuid;
-  uint16_t handle;
-  esp_gatt_char_prop_t properties;
-  std::vector<BLEDescriptor *> descriptors;
-  void parse_descriptors();
-  BLEDescriptor *get_descriptor(espbt::ESPBTUUID uuid);
-  BLEDescriptor *get_descriptor(uint16_t uuid);
-  void write_value(uint8_t *new_val, int16_t new_val_size);
-  void write_value(uint8_t *new_val, int16_t new_val_size, esp_gatt_write_type_t write_type);
-  BLEService *service;
-};
-
-class BLEService {
- public:
-  ~BLEService();
-  espbt::ESPBTUUID uuid;
-  uint16_t start_handle;
-  uint16_t end_handle;
-  std::vector<BLECharacteristic *> characteristics;
-  BLEClient *client;
-  void parse_characteristics();
-  BLECharacteristic *get_characteristic(espbt::ESPBTUUID uuid);
-  BLECharacteristic *get_characteristic(uint16_t uuid);
-};
-
-class BLEClient : public espbt::ESPBTClient, public Component {
+class BLEClient : public BLEClientBase {
  public:
   void setup() override;
   void dump_config() override;
   void loop() override;
-  float get_setup_priority() const override;
 
   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;
   bool parse_device(const espbt::ESPBTDevice &device) override;
-  void on_scan_end() override {}
-  void connect() override;
-
-  void set_address(uint64_t address) { this->address = address; }
 
   void set_enabled(bool enabled);
 
@@ -102,43 +61,14 @@ class BLEClient : public espbt::ESPBTClient, public Component {
     this->nodes_.push_back(node);
   }
 
-  BLEService *get_service(espbt::ESPBTUUID uuid);
-  BLEService *get_service(uint16_t uuid);
-  BLECharacteristic *get_characteristic(espbt::ESPBTUUID service, espbt::ESPBTUUID chr);
-  BLECharacteristic *get_characteristic(uint16_t service, uint16_t chr);
-  BLEDescriptor *get_descriptor(espbt::ESPBTUUID service, espbt::ESPBTUUID chr, espbt::ESPBTUUID descr);
-  BLEDescriptor *get_descriptor(uint16_t service, uint16_t chr, uint16_t descr);
-  // Get the configuration descriptor for the given characteristic handle.
-  BLEDescriptor *get_config_descriptor(uint16_t handle);
-
-  float parse_char_value(uint8_t *value, uint16_t length);
-
-  int gattc_if;
-  esp_bd_addr_t remote_bda;
-  esp_ble_addr_type_t remote_addr_type;
-  uint16_t conn_id;
-  uint64_t address;
   bool enabled;
-  std::string address_str() const;
+
+  void set_state(espbt::ClientState state) override;
 
  protected:
-  void set_states_(espbt::ClientState st) {
-    this->set_state(st);
-    for (auto &node : nodes_)
-      node->node_state = st;
-  }
-  bool all_nodes_established_() {
-    if (this->state() != espbt::ClientState::ESTABLISHED)
-      return false;
-    for (auto &node : nodes_) {
-      if (node->node_state != espbt::ClientState::ESTABLISHED)
-        return false;
-    }
-    return true;
-  }
+  bool all_nodes_established_();
 
   std::vector<BLEClientNode *> nodes_;
-  std::vector<BLEService *> services_;
 };
 
 }  // namespace ble_client
diff --git a/esphome/components/ble_client/sensor/automation.h b/esphome/components/ble_client/sensor/automation.h
index 2baaafe2ec..d830165d30 100644
--- a/esphome/components/ble_client/sensor/automation.h
+++ b/esphome/components/ble_client/sensor/automation.h
@@ -19,7 +19,8 @@ class BLESensorNotifyTrigger : public Trigger<float>, public BLESensor {
         break;
       }
       case ESP_GATTC_NOTIFY_EVT: {
-        if (param->notify.conn_id != this->sensor_->parent()->conn_id || param->notify.handle != this->sensor_->handle)
+        if (param->notify.conn_id != this->sensor_->parent()->get_conn_id() ||
+            param->notify.handle != this->sensor_->handle)
           break;
         this->trigger(this->sensor_->parent()->parse_char_value(param->notify.value, param->notify.value_len));
       }
diff --git a/esphome/components/ble_client/sensor/ble_sensor.cpp b/esphome/components/ble_client/sensor/ble_sensor.cpp
index ee5afd3f7b..a05efad60b 100644
--- a/esphome/components/ble_client/sensor/ble_sensor.cpp
+++ b/esphome/components/ble_client/sensor/ble_sensor.cpp
@@ -63,8 +63,8 @@ void BLESensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
         this->handle = descr->handle;
       }
       if (this->notify_) {
-        auto status =
-            esp_ble_gattc_register_for_notify(this->parent()->gattc_if, this->parent()->remote_bda, chr->handle);
+        auto status = esp_ble_gattc_register_for_notify(this->parent()->get_gattc_if(),
+                                                        this->parent()->get_remote_bda(), chr->handle);
         if (status) {
           ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, status=%d", status);
         }
@@ -74,7 +74,7 @@ void BLESensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
       break;
     }
     case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->conn_id)
+      if (param->read.conn_id != this->parent()->get_conn_id())
         break;
       if (param->read.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
@@ -87,7 +87,7 @@ void BLESensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
       break;
     }
     case ESP_GATTC_NOTIFY_EVT: {
-      if (param->notify.conn_id != this->parent()->conn_id || param->notify.handle != this->handle)
+      if (param->notify.conn_id != this->parent()->get_conn_id() || param->notify.handle != this->handle)
         break;
       ESP_LOGV(TAG, "[%s] ESP_GATTC_NOTIFY_EVT: handle=0x%x, value=0x%x", this->get_name().c_str(),
                param->notify.handle, param->notify.value[0]);
@@ -122,8 +122,8 @@ void BLESensor::update() {
     return;
   }
 
-  auto status =
-      esp_ble_gattc_read_char(this->parent()->gattc_if, this->parent()->conn_id, this->handle, ESP_GATT_AUTH_REQ_NONE);
+  auto status = esp_ble_gattc_read_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->handle,
+                                        ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     this->status_set_warning();
     this->publish_state(NAN);
diff --git a/esphome/components/ble_client/text_sensor/automation.h b/esphome/components/ble_client/text_sensor/automation.h
index be85892c5a..c504c35a58 100644
--- a/esphome/components/ble_client/text_sensor/automation.h
+++ b/esphome/components/ble_client/text_sensor/automation.h
@@ -19,7 +19,8 @@ class BLETextSensorNotifyTrigger : public Trigger<std::string>, public BLETextSe
         break;
       }
       case ESP_GATTC_NOTIFY_EVT: {
-        if (param->notify.conn_id != this->sensor_->parent()->conn_id || param->notify.handle != this->sensor_->handle)
+        if (param->notify.conn_id != this->sensor_->parent()->get_conn_id() ||
+            param->notify.handle != this->sensor_->handle)
           break;
         this->trigger(this->sensor_->parse_data(param->notify.value, param->notify.value_len));
       }
diff --git a/esphome/components/ble_client/text_sensor/ble_text_sensor.cpp b/esphome/components/ble_client/text_sensor/ble_text_sensor.cpp
index 1a71cd6cd8..1a304593c7 100644
--- a/esphome/components/ble_client/text_sensor/ble_text_sensor.cpp
+++ b/esphome/components/ble_client/text_sensor/ble_text_sensor.cpp
@@ -66,8 +66,8 @@ void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
         this->handle = descr->handle;
       }
       if (this->notify_) {
-        auto status =
-            esp_ble_gattc_register_for_notify(this->parent()->gattc_if, this->parent()->remote_bda, chr->handle);
+        auto status = esp_ble_gattc_register_for_notify(this->parent()->get_gattc_if(),
+                                                        this->parent()->get_remote_bda(), chr->handle);
         if (status) {
           ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, status=%d", status);
         }
@@ -77,7 +77,7 @@ void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       break;
     }
     case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->conn_id)
+      if (param->read.conn_id != this->parent()->get_conn_id())
         break;
       if (param->read.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
@@ -90,7 +90,7 @@ void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       break;
     }
     case ESP_GATTC_NOTIFY_EVT: {
-      if (param->notify.conn_id != this->parent()->conn_id || param->notify.handle != this->handle)
+      if (param->notify.conn_id != this->parent()->get_conn_id() || param->notify.handle != this->handle)
         break;
       ESP_LOGV(TAG, "[%s] ESP_GATTC_NOTIFY_EVT: handle=0x%x, value=0x%x", this->get_name().c_str(),
                param->notify.handle, param->notify.value[0]);
@@ -121,8 +121,8 @@ void BLETextSensor::update() {
     return;
   }
 
-  auto status =
-      esp_ble_gattc_read_char(this->parent()->gattc_if, this->parent()->conn_id, this->handle, ESP_GATT_AUTH_REQ_NONE);
+  auto status = esp_ble_gattc_read_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(), this->handle,
+                                        ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     this->status_set_warning();
     this->publish_state(EMPTY);
diff --git a/esphome/components/bluetooth_proxy/__init__.py b/esphome/components/bluetooth_proxy/__init__.py
index a6a5a4391b..b5acea89dd 100644
--- a/esphome/components/bluetooth_proxy/__init__.py
+++ b/esphome/components/bluetooth_proxy/__init__.py
@@ -1,19 +1,23 @@
-from esphome.components import esp32_ble_tracker
+from esphome.components import esp32_ble_tracker, esp32_ble_client
 import esphome.config_validation as cv
 import esphome.codegen as cg
-from esphome.const import CONF_ID
+from esphome.const import CONF_ACTIVE, CONF_ID
 
-DEPENDENCIES = ["esp32", "esp32_ble_tracker"]
+AUTO_LOAD = ["esp32_ble_client", "esp32_ble_tracker"]
+DEPENDENCIES = ["esp32"]
 CODEOWNERS = ["@jesserockz"]
 
 
 bluetooth_proxy_ns = cg.esphome_ns.namespace("bluetooth_proxy")
 
-BluetoothProxy = bluetooth_proxy_ns.class_("BluetoothProxy", cg.Component)
+BluetoothProxy = bluetooth_proxy_ns.class_(
+    "BluetoothProxy", esp32_ble_client.BLEClientBase
+)
 
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(BluetoothProxy),
+        cv.Optional(CONF_ACTIVE, default=False): cv.boolean,
     }
 ).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
 
@@ -22,6 +26,8 @@ async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
-    await esp32_ble_tracker.register_ble_device(var, config)
+    cg.add(var.set_active(config[CONF_ACTIVE]))
+
+    await esp32_ble_tracker.register_client(var, config)
 
     cg.add_define("USE_BLUETOOTH_PROXY")
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index 41871295ce..96fee39f95 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -1,22 +1,39 @@
 #include "bluetooth_proxy.h"
 
-#ifdef USE_API
-#include "esphome/components/api/api_pb2.h"
-#include "esphome/components/api/api_server.h"
-#endif  // USE_API
 #include "esphome/core/log.h"
 
 #ifdef USE_ESP32
 
+#ifdef USE_API
+#include "esphome/components/api/api_server.h"
+#endif
+
 namespace esphome {
 namespace bluetooth_proxy {
 
 static const char *const TAG = "bluetooth_proxy";
 
+BluetoothProxy::BluetoothProxy() {
+  global_bluetooth_proxy = this;
+  this->address_ = 0;
+}
+
 bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
   ESP_LOGV(TAG, "Proxying packet from %s - %s. RSSI: %d dB", device.get_name().c_str(), device.address_str().c_str(),
            device.get_rssi());
   this->send_api_packet_(device);
+
+  this->address_type_map_[device.address_uint64()] = device.get_address_type();
+
+  if (this->address_ == 0)
+    return true;
+
+  if (this->state_ == espbt::ClientState::DISCOVERED) {
+    ESP_LOGV(TAG, "Connecting to address %s", this->address_str().c_str());
+    return true;
+  }
+
+  BLEClientBase::parse_device(device);
   return true;
 }
 
@@ -35,23 +52,309 @@ void BluetoothProxy::send_api_packet_(const esp32_ble_tracker::ESPBTDevice &devi
   for (auto &data : device.get_service_datas()) {
     api::BluetoothServiceData service_data;
     service_data.uuid = data.uuid.to_string();
-    for (auto d : data.data)
-      service_data.data.push_back(d);
-    resp.service_data.push_back(service_data);
+    service_data.data.assign(data.data.begin(), data.data.end());
+    resp.service_data.push_back(std::move(service_data));
   }
   for (auto &data : device.get_manufacturer_datas()) {
     api::BluetoothServiceData manufacturer_data;
     manufacturer_data.uuid = data.uuid.to_string();
-    for (auto d : data.data)
-      manufacturer_data.data.push_back(d);
-    resp.manufacturer_data.push_back(manufacturer_data);
+    manufacturer_data.data.assign(data.data.begin(), data.data.end());
+    resp.manufacturer_data.push_back(std::move(manufacturer_data));
   }
   api::global_api_server->send_bluetooth_le_advertisement(resp);
 #endif
 }
 
+void BluetoothProxy::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+                                         esp_ble_gattc_cb_param_t *param) {
+  BLEClientBase::gattc_event_handler(event, gattc_if, param);
+  switch (event) {
+    case ESP_GATTC_DISCONNECT_EVT: {
+#ifdef USE_API
+      api::global_api_server->send_bluetooth_device_connection(this->address_, false, this->mtu_,
+                                                               param->disconnect.reason);
+      api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
+                                                              this->get_bluetooth_connections_limit());
+#endif
+      this->address_ = 0;
+    }
+    case ESP_GATTC_OPEN_EVT: {
+      if (param->open.status != ESP_GATT_OK && param->open.status != ESP_GATT_ALREADY_OPEN) {
+#ifdef USE_API
+        api::global_api_server->send_bluetooth_device_connection(this->address_, false, this->mtu_, param->open.status);
+
+#endif
+        break;
+      }
+      break;
+    }
+    case ESP_GATTC_SEARCH_CMPL_EVT: {
+#ifdef USE_API
+      api::global_api_server->send_bluetooth_device_connection(this->address_, true, this->mtu_);
+      api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
+                                                              this->get_bluetooth_connections_limit());
+#endif
+      break;
+    }
+    case ESP_GATTC_READ_DESCR_EVT:
+    case ESP_GATTC_READ_CHAR_EVT: {
+      if (param->read.conn_id != this->conn_id_)
+        break;
+      if (param->read.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "Error reading char/descriptor at handle %d, status=%d", param->read.handle, param->read.status);
+        break;
+      }
+#ifdef USE_API
+      api::BluetoothGATTReadResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->read.handle;
+      resp.data.reserve(param->read.value_len);
+      for (uint16_t i = 0; i < param->read.value_len; i++) {
+        resp.data.push_back(param->read.value[i]);
+      }
+      api::global_api_server->send_bluetooth_gatt_read_response(resp);
+#endif
+      break;
+    }
+    case ESP_GATTC_NOTIFY_EVT: {
+      if (param->notify.conn_id != this->conn_id_)
+        break;
+      ESP_LOGV(TAG, "ESP_GATTC_NOTIFY_EVT: handle=0x%x", param->notify.handle);
+#ifdef USE_API
+      api::BluetoothGATTNotifyDataResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->notify.handle;
+      resp.data.reserve(param->notify.value_len);
+      for (uint16_t i = 0; i < param->notify.value_len; i++) {
+        resp.data.push_back(param->notify.value[i]);
+      }
+      api::global_api_server->send_bluetooth_gatt_notify_data_response(resp);
+#endif
+      break;
+    }
+    default:
+      break;
+  }
+}
+
 void BluetoothProxy::dump_config() { ESP_LOGCONFIG(TAG, "Bluetooth Proxy:"); }
 
+void BluetoothProxy::loop() {
+  BLEClientBase::loop();
+#ifdef USE_API
+  if (this->state_ != espbt::ClientState::IDLE && !api::global_api_server->is_connected()) {
+    ESP_LOGI(TAG, "[%s] Disconnecting.", this->address_str().c_str());
+    auto err = esp_ble_gattc_close(this->gattc_if_, this->conn_id_);
+    if (err != ERR_OK) {
+      ESP_LOGW(TAG, "esp_ble_gattc_close error, address=%s err=%d", this->address_str().c_str(), err);
+    }
+  }
+
+  if (this->send_service_ == this->services_.size()) {
+    this->send_service_ = -1;
+    api::global_api_server->send_bluetooth_gatt_services_done(this->address_);
+  } else if (this->send_service_ >= 0) {
+    auto &service = this->services_[this->send_service_];
+    api::BluetoothGATTGetServicesResponse resp;
+    resp.address = this->address_;
+    api::BluetoothGATTService service_resp;
+    service_resp.uuid = {service->uuid.get_128bit_high(), service->uuid.get_128bit_low()};
+    service_resp.handle = service->start_handle;
+    for (auto &characteristic : service->characteristics) {
+      api::BluetoothGATTCharacteristic characteristic_resp;
+      characteristic_resp.uuid = {characteristic->uuid.get_128bit_high(), characteristic->uuid.get_128bit_low()};
+      characteristic_resp.handle = characteristic->handle;
+      characteristic_resp.properties = characteristic->properties;
+      for (auto &descriptor : characteristic->descriptors) {
+        api::BluetoothGATTDescriptor descriptor_resp;
+        descriptor_resp.uuid = {descriptor->uuid.get_128bit_high(), descriptor->uuid.get_128bit_low()};
+        descriptor_resp.handle = descriptor->handle;
+        characteristic_resp.descriptors.push_back(std::move(descriptor_resp));
+      }
+      service_resp.characteristics.push_back(std::move(characteristic_resp));
+    }
+    resp.services.push_back(std::move(service_resp));
+    api::global_api_server->send_bluetooth_gatt_services(resp);
+    this->send_service_++;
+  }
+#endif
+}
+
+#ifdef USE_API
+void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest &msg) {
+  switch (msg.request_type) {
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT: {
+      this->address_ = msg.address;
+      if (this->address_type_map_.find(this->address_) != this->address_type_map_.end()) {
+        // Utilise the address type cache
+        this->remote_addr_type_ = this->address_type_map_[this->address_];
+      } else {
+        this->remote_addr_type_ = BLE_ADDR_TYPE_PUBLIC;
+      }
+      this->remote_bda_[0] = (this->address_ >> 40) & 0xFF;
+      this->remote_bda_[1] = (this->address_ >> 32) & 0xFF;
+      this->remote_bda_[2] = (this->address_ >> 24) & 0xFF;
+      this->remote_bda_[3] = (this->address_ >> 16) & 0xFF;
+      this->remote_bda_[4] = (this->address_ >> 8) & 0xFF;
+      this->remote_bda_[5] = (this->address_ >> 0) & 0xFF;
+      this->set_state(espbt::ClientState::DISCOVERED);
+      esp_ble_gap_stop_scanning();
+      break;
+    }
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT: {
+      if (this->state() != espbt::ClientState::IDLE) {
+        ESP_LOGI(TAG, "[%s] Disconnecting.", this->address_str().c_str());
+        auto err = esp_ble_gattc_close(this->gattc_if_, this->conn_id_);
+        if (err != ERR_OK) {
+          ESP_LOGW(TAG, "esp_ble_gattc_close error, address=%s err=%d", this->address_str().c_str(), err);
+        }
+      }
+      break;
+    }
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR:
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR:
+      break;
+  }
+}
+
+void BluetoothProxy::bluetooth_gatt_read(const api::BluetoothGATTReadRequest &msg) {
+  if (this->state_ != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "Cannot read GATT characteristic, not connected.");
+    return;
+  }
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for read GATT characteristic request");
+    return;
+  }
+
+  auto *characteristic = this->get_characteristic(msg.handle);
+  if (characteristic == nullptr) {
+    ESP_LOGW(TAG, "Cannot read GATT characteristic, not found.");
+    return;
+  }
+
+  ESP_LOGV(TAG, "Reading GATT characteristic %s", characteristic->uuid.to_string().c_str());
+
+  esp_err_t err =
+      esp_ble_gattc_read_char(this->gattc_if_, this->conn_id_, characteristic->handle, ESP_GATT_AUTH_REQ_NONE);
+  if (err != ERR_OK) {
+    ESP_LOGW(TAG, "esp_ble_gattc_read_char error, err=%d", err);
+  }
+}
+
+void BluetoothProxy::bluetooth_gatt_write(const api::BluetoothGATTWriteRequest &msg) {
+  if (this->state_ != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "Cannot write GATT characteristic, not connected.");
+    return;
+  }
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for write GATT characteristic request");
+    return;
+  }
+
+  auto *characteristic = this->get_characteristic(msg.handle);
+  if (characteristic == nullptr) {
+    ESP_LOGW(TAG, "Cannot write GATT characteristic, not found.");
+    return;
+  }
+
+  ESP_LOGV(TAG, "Writing GATT characteristic %s", characteristic->uuid.to_string().c_str());
+  characteristic->write_value((uint8_t *) msg.data.data(), msg.data.size(),
+                              msg.response ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP);
+}
+
+void BluetoothProxy::bluetooth_gatt_read_descriptor(const api::BluetoothGATTReadDescriptorRequest &msg) {
+  if (this->state_ != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "Cannot read GATT characteristic descriptor, not connected.");
+    return;
+  }
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for read GATT characteristic descriptor request");
+    return;
+  }
+
+  auto *descriptor = this->get_descriptor(msg.handle);
+  if (descriptor == nullptr) {
+    ESP_LOGW(TAG, "Cannot read GATT characteristic descriptor, not found.");
+    return;
+  }
+
+  ESP_LOGV(TAG, "Reading GATT characteristic descriptor %s -> %s", descriptor->characteristic->uuid.to_string().c_str(),
+           descriptor->uuid.to_string().c_str());
+
+  esp_err_t err =
+      esp_ble_gattc_read_char_descr(this->gattc_if_, this->conn_id_, descriptor->handle, ESP_GATT_AUTH_REQ_NONE);
+  if (err != ERR_OK) {
+    ESP_LOGW(TAG, "esp_ble_gattc_read_char error, err=%d", err);
+  }
+}
+
+void BluetoothProxy::bluetooth_gatt_write_descriptor(const api::BluetoothGATTWriteDescriptorRequest &msg) {
+  if (this->state_ != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "Cannot write GATT characteristic descriptor, not connected.");
+    return;
+  }
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for write GATT characteristic descriptor request");
+    return;
+  }
+
+  auto *descriptor = this->get_descriptor(msg.handle);
+  if (descriptor == nullptr) {
+    ESP_LOGW(TAG, "Cannot write GATT characteristic descriptor, not found.");
+    return;
+  }
+
+  ESP_LOGV(TAG, "Writing GATT characteristic descriptor %s -> %s", descriptor->characteristic->uuid.to_string().c_str(),
+           descriptor->uuid.to_string().c_str());
+
+  esp_err_t err =
+      esp_ble_gattc_write_char_descr(this->gattc_if_, this->conn_id_, descriptor->handle, msg.data.size(),
+                                     (uint8_t *) msg.data.data(), ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+  if (err != ERR_OK) {
+    ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, err=%d", err);
+  }
+}
+
+void BluetoothProxy::bluetooth_gatt_send_services(const api::BluetoothGATTGetServicesRequest &msg) {
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for service list request");
+    return;
+  }
+  this->send_service_ = 0;
+}
+
+void BluetoothProxy::bluetooth_gatt_notify(const api::BluetoothGATTNotifyRequest &msg) {
+  if (this->address_ != msg.address) {
+    ESP_LOGW(TAG, "Address mismatch for notify");
+    return;
+  }
+
+  auto *characteristic = this->get_characteristic(msg.handle);
+
+  if (characteristic == nullptr) {
+    ESP_LOGW(TAG, "Cannot notify GATT characteristic, not found.");
+    return;
+  }
+
+  esp_err_t err;
+  if (msg.enable) {
+    err = esp_ble_gattc_register_for_notify(this->gattc_if_, this->remote_bda_, characteristic->handle);
+    if (err != ESP_OK) {
+      ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, err=%d", err);
+    }
+  } else {
+    err = esp_ble_gattc_unregister_for_notify(this->gattc_if_, this->remote_bda_, characteristic->handle);
+    if (err != ESP_OK) {
+      ESP_LOGW(TAG, "esp_ble_gattc_unregister_for_notify failed, err=%d", err);
+    }
+  }
+}
+
+#endif
+
+BluetoothProxy *global_bluetooth_proxy = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+
 }  // namespace bluetooth_proxy
 }  // namespace esphome
 
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.h b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
index 9a936747c0..8ff43aff3f 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -4,22 +4,59 @@
 
 #include <map>
 
+#include "esphome/components/esp32_ble_client/ble_client_base.h"
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
+#include "esphome/core/defines.h"
+
+#include <map>
+
+#ifdef USE_API
+#include "esphome/components/api/api_pb2.h"
+#endif  // USE_API
 
 namespace esphome {
 namespace bluetooth_proxy {
 
-class BluetoothProxy : public Component, public esp32_ble_tracker::ESPBTDeviceListener {
+using namespace esp32_ble_client;
+
+class BluetoothProxy : public BLEClientBase {
  public:
+  BluetoothProxy();
   bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
   void dump_config() override;
+  void loop() override;
+
+  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+                           esp_ble_gattc_cb_param_t *param) override;
+
+#ifdef USE_API
+  void bluetooth_device_request(const api::BluetoothDeviceRequest &msg);
+  void bluetooth_gatt_read(const api::BluetoothGATTReadRequest &msg);
+  void bluetooth_gatt_write(const api::BluetoothGATTWriteRequest &msg);
+  void bluetooth_gatt_read_descriptor(const api::BluetoothGATTReadDescriptorRequest &msg);
+  void bluetooth_gatt_write_descriptor(const api::BluetoothGATTWriteDescriptorRequest &msg);
+  void bluetooth_gatt_send_services(const api::BluetoothGATTGetServicesRequest &msg);
+  void bluetooth_gatt_notify(const api::BluetoothGATTNotifyRequest &msg);
+#endif
+
+  int get_bluetooth_connections_free() { return this->state_ == espbt::ClientState::IDLE ? 1 : 0; }
+  int get_bluetooth_connections_limit() { return 1; }
+
+  void set_active(bool active) { this->active_ = active; }
+  bool has_active() { return this->active_; }
 
  protected:
   void send_api_packet_(const esp32_ble_tracker::ESPBTDevice &device);
+
+  std::map<uint64_t, esp_ble_addr_type_t> address_type_map_;
+  int16_t send_service_{-1};
+  bool active_;
 };
 
+extern BluetoothProxy *global_bluetooth_proxy;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+
 }  // namespace bluetooth_proxy
 }  // namespace esphome
 
diff --git a/esphome/components/esp32_ble_client/__init__.py b/esphome/components/esp32_ble_client/__init__.py
new file mode 100644
index 0000000000..94a5576d0b
--- /dev/null
+++ b/esphome/components/esp32_ble_client/__init__.py
@@ -0,0 +1,12 @@
+import esphome.codegen as cg
+
+from esphome.components import esp32_ble_tracker
+
+AUTO_LOAD = ["esp32_ble_tracker"]
+CODEOWNERS = ["@jesserockz"]
+DEPENDENCIES = ["esp32"]
+
+esp32_ble_client_ns = cg.esphome_ns.namespace("esp32_ble_client")
+BLEClientBase = esp32_ble_client_ns.class_(
+    "BLEClientBase", esp32_ble_tracker.ESPBTClient, cg.Component
+)
diff --git a/esphome/components/esp32_ble_client/ble_characteristic.cpp b/esphome/components/esp32_ble_client/ble_characteristic.cpp
new file mode 100644
index 0000000000..873833368c
--- /dev/null
+++ b/esphome/components/esp32_ble_client/ble_characteristic.cpp
@@ -0,0 +1,83 @@
+#include "ble_characteristic.h"
+#include "ble_client_base.h"
+#include "ble_service.h"
+
+#include "esphome/core/log.h"
+
+#ifdef USE_ESP32
+
+namespace esphome {
+namespace esp32_ble_client {
+
+static const char *const TAG = "esp32_ble_client.characteristic";
+
+BLECharacteristic::~BLECharacteristic() {
+  for (auto &desc : this->descriptors)
+    delete desc;  // NOLINT(cppcoreguidelines-owning-memory)
+}
+
+void BLECharacteristic::parse_descriptors() {
+  uint16_t offset = 0;
+  esp_gattc_descr_elem_t result;
+
+  while (true) {
+    uint16_t count = 1;
+    esp_gatt_status_t status =
+        esp_ble_gattc_get_all_descr(this->service->client->get_gattc_if(), this->service->client->get_conn_id(),
+                                    this->handle, &result, &count, offset);
+    if (status == ESP_GATT_INVALID_OFFSET || status == ESP_GATT_NOT_FOUND) {
+      break;
+    }
+    if (status != ESP_GATT_OK) {
+      ESP_LOGW(TAG, "esp_ble_gattc_get_all_descr error, status=%d", status);
+      break;
+    }
+    if (count == 0) {
+      break;
+    }
+
+    BLEDescriptor *desc = new BLEDescriptor();  // NOLINT(cppcoreguidelines-owning-memory)
+    desc->uuid = espbt::ESPBTUUID::from_uuid(result.uuid);
+    desc->handle = result.handle;
+    desc->characteristic = this;
+    this->descriptors.push_back(desc);
+    ESP_LOGV(TAG, "   descriptor %s, handle 0x%x", desc->uuid.to_string().c_str(), desc->handle);
+    offset++;
+  }
+}
+
+BLEDescriptor *BLECharacteristic::get_descriptor(espbt::ESPBTUUID uuid) {
+  for (auto &desc : this->descriptors) {
+    if (desc->uuid == uuid)
+      return desc;
+  }
+  return nullptr;
+}
+BLEDescriptor *BLECharacteristic::get_descriptor(uint16_t uuid) {
+  return this->get_descriptor(espbt::ESPBTUUID::from_uint16(uuid));
+}
+BLEDescriptor *BLECharacteristic::get_descriptor_by_handle(uint16_t handle) {
+  for (auto &desc : this->descriptors) {
+    if (desc->handle == handle)
+      return desc;
+  }
+  return nullptr;
+}
+
+void BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size, esp_gatt_write_type_t write_type) {
+  auto *client = this->service->client;
+  auto status = esp_ble_gattc_write_char(client->get_gattc_if(), client->get_conn_id(), this->handle, new_val_size,
+                                         new_val, write_type, ESP_GATT_AUTH_REQ_NONE);
+  if (status) {
+    ESP_LOGW(TAG, "Error sending write value to BLE gattc server, status=%d", status);
+  }
+}
+
+void BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size) {
+  write_value(new_val, new_val_size, ESP_GATT_WRITE_TYPE_NO_RSP);
+}
+
+}  // namespace esp32_ble_client
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/esp32_ble_client/ble_characteristic.h b/esphome/components/esp32_ble_client/ble_characteristic.h
new file mode 100644
index 0000000000..ffa9227cc4
--- /dev/null
+++ b/esphome/components/esp32_ble_client/ble_characteristic.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#ifdef USE_ESP32
+
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+
+#include "ble_descriptor.h"
+
+namespace esphome {
+namespace esp32_ble_client {
+
+namespace espbt = esphome::esp32_ble_tracker;
+
+class BLEService;
+
+class BLECharacteristic {
+ public:
+  ~BLECharacteristic();
+  espbt::ESPBTUUID uuid;
+  uint16_t handle;
+  esp_gatt_char_prop_t properties;
+  std::vector<BLEDescriptor *> descriptors;
+  void parse_descriptors();
+  BLEDescriptor *get_descriptor(espbt::ESPBTUUID uuid);
+  BLEDescriptor *get_descriptor(uint16_t uuid);
+  BLEDescriptor *get_descriptor_by_handle(uint16_t handle);
+  void write_value(uint8_t *new_val, int16_t new_val_size);
+  void write_value(uint8_t *new_val, int16_t new_val_size, esp_gatt_write_type_t write_type);
+  BLEService *service;
+};
+
+}  // namespace esp32_ble_client
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
new file mode 100644
index 0000000000..0e81c9aca8
--- /dev/null
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -0,0 +1,324 @@
+#include "ble_client_base.h"
+
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+#ifdef USE_ESP32
+
+namespace esphome {
+namespace esp32_ble_client {
+
+static const char *const TAG = "esp32_ble_client";
+
+void BLEClientBase::setup() {
+  auto ret = esp_ble_gattc_app_register(this->app_id);
+  if (ret) {
+    ESP_LOGE(TAG, "gattc app register failed. app_id=%d code=%d", this->app_id, ret);
+    this->mark_failed();
+  }
+  this->set_state(espbt::ClientState::IDLE);
+}
+
+void BLEClientBase::loop() {
+  if (this->state_ == espbt::ClientState::DISCOVERED) {
+    this->connect();
+  }
+}
+
+float BLEClientBase::get_setup_priority() const { return setup_priority::AFTER_BLUETOOTH; }
+
+bool BLEClientBase::parse_device(const espbt::ESPBTDevice &device) {
+  if (device.address_uint64() != this->address_)
+    return false;
+  if (this->state_ != espbt::ClientState::IDLE)
+    return false;
+
+  ESP_LOGD(TAG, "Found device at MAC address [%s]", device.address_str().c_str());
+  this->set_state(espbt::ClientState::DISCOVERED);
+
+  auto addr = device.address_uint64();
+  this->remote_bda_[0] = (addr >> 40) & 0xFF;
+  this->remote_bda_[1] = (addr >> 32) & 0xFF;
+  this->remote_bda_[2] = (addr >> 24) & 0xFF;
+  this->remote_bda_[3] = (addr >> 16) & 0xFF;
+  this->remote_bda_[4] = (addr >> 8) & 0xFF;
+  this->remote_bda_[5] = (addr >> 0) & 0xFF;
+  this->remote_addr_type_ = device.get_address_type();
+  return true;
+}
+
+std::string BLEClientBase::address_str() const {
+  return str_snprintf("%02x:%02x:%02x:%02x:%02x:%02x", 17, (uint8_t)(this->address_ >> 40) & 0xff,
+                      (uint8_t)(this->address_ >> 32) & 0xff, (uint8_t)(this->address_ >> 24) & 0xff,
+                      (uint8_t)(this->address_ >> 16) & 0xff, (uint8_t)(this->address_ >> 8) & 0xff,
+                      (uint8_t)(this->address_ >> 0) & 0xff);
+}
+
+void BLEClientBase::connect() {
+  ESP_LOGI(TAG, "Attempting BLE connection to %s", this->address_str().c_str());
+  auto ret = esp_ble_gattc_open(this->gattc_if_, this->remote_bda_, this->remote_addr_type_, true);
+  if (ret) {
+    ESP_LOGW(TAG, "esp_ble_gattc_open error, address=%s status=%d", this->address_str().c_str(), ret);
+    this->set_state(espbt::ClientState::IDLE);
+  } else {
+    this->set_state(espbt::ClientState::CONNECTING);
+  }
+}
+
+void BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t esp_gattc_if,
+                                        esp_ble_gattc_cb_param_t *param) {
+  if (event == ESP_GATTC_REG_EVT && this->app_id != param->reg.app_id)
+    return;
+  if (event != ESP_GATTC_REG_EVT && esp_gattc_if != ESP_GATT_IF_NONE && esp_gattc_if != this->gattc_if_)
+    return;
+
+  switch (event) {
+    case ESP_GATTC_REG_EVT: {
+      if (param->reg.status == ESP_GATT_OK) {
+        ESP_LOGV(TAG, "gattc registered app id %d", this->app_id);
+        this->gattc_if_ = esp_gattc_if;
+      } else {
+        ESP_LOGE(TAG, "gattc app registration failed id=%d code=%d", param->reg.app_id, param->reg.status);
+      }
+      break;
+    }
+    case ESP_GATTC_OPEN_EVT: {
+      ESP_LOGV(TAG, "[%s] ESP_GATTC_OPEN_EVT", this->address_str().c_str());
+      this->conn_id_ = param->open.conn_id;
+      if (param->open.status != ESP_GATT_OK && param->open.status != ESP_GATT_ALREADY_OPEN) {
+        ESP_LOGW(TAG, "connect to %s failed, status=%d", this->address_str().c_str(), param->open.status);
+        this->set_state(espbt::ClientState::IDLE);
+        break;
+      }
+      break;
+    }
+    case ESP_GATTC_CONNECT_EVT: {
+      ESP_LOGV(TAG, "[%s] ESP_GATTC_CONNECT_EVT", this->address_str().c_str());
+      if (this->conn_id_ != param->connect.conn_id) {
+        ESP_LOGD(TAG, "[%s] Unexpected conn_id in CONNECT_EVT: param conn=%d, open conn=%d",
+                 this->address_str().c_str(), param->connect.conn_id, this->conn_id_);
+      }
+      auto ret = esp_ble_gattc_send_mtu_req(this->gattc_if_, param->connect.conn_id);
+      if (ret) {
+        ESP_LOGW(TAG, "esp_ble_gattc_send_mtu_req failed, status=%x", ret);
+      }
+      break;
+    }
+    case ESP_GATTC_CFG_MTU_EVT: {
+      if (param->cfg_mtu.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "cfg_mtu to %s failed, mtu %d, status %d", this->address_str().c_str(), param->cfg_mtu.mtu,
+                 param->cfg_mtu.status);
+        this->set_state(espbt::ClientState::IDLE);
+        break;
+      }
+      ESP_LOGV(TAG, "cfg_mtu status %d, mtu %d", param->cfg_mtu.status, param->cfg_mtu.mtu);
+      this->mtu_ = param->cfg_mtu.mtu;
+      esp_ble_gattc_search_service(esp_gattc_if, param->cfg_mtu.conn_id, nullptr);
+      break;
+    }
+    case ESP_GATTC_DISCONNECT_EVT: {
+      if (memcmp(param->disconnect.remote_bda, this->remote_bda_, 6) != 0) {
+        return;
+      }
+      ESP_LOGV(TAG, "[%s] ESP_GATTC_DISCONNECT_EVT, reason %d", this->address_str().c_str(), param->disconnect.reason);
+      for (auto &svc : this->services_)
+        delete svc;  // NOLINT(cppcoreguidelines-owning-memory)
+      this->services_.clear();
+      this->set_state(espbt::ClientState::IDLE);
+      break;
+    }
+    case ESP_GATTC_SEARCH_RES_EVT: {
+      BLEService *ble_service = new BLEService();  // NOLINT(cppcoreguidelines-owning-memory)
+      ble_service->uuid = espbt::ESPBTUUID::from_uuid(param->search_res.srvc_id.uuid);
+      ble_service->start_handle = param->search_res.start_handle;
+      ble_service->end_handle = param->search_res.end_handle;
+      ble_service->client = this;
+      this->services_.push_back(ble_service);
+      break;
+    }
+    case ESP_GATTC_SEARCH_CMPL_EVT: {
+      ESP_LOGV(TAG, "[%s] ESP_GATTC_SEARCH_CMPL_EVT", this->address_str().c_str());
+      for (auto &svc : this->services_) {
+        ESP_LOGI(TAG, "Service UUID: %s", svc->uuid.to_string().c_str());
+        ESP_LOGI(TAG, "  start_handle: 0x%x  end_handle: 0x%x", svc->start_handle, svc->end_handle);
+        svc->parse_characteristics();
+      }
+      this->set_state(espbt::ClientState::CONNECTED);
+      this->state_ = espbt::ClientState::ESTABLISHED;
+      break;
+    }
+    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
+      auto *descr = this->get_config_descriptor(param->reg_for_notify.handle);
+      if (descr == nullptr) {
+        ESP_LOGW(TAG, "No descriptor found for notify of handle 0x%x", param->reg_for_notify.handle);
+        break;
+      }
+      if (descr->uuid.get_uuid().len != ESP_UUID_LEN_16 ||
+          descr->uuid.get_uuid().uuid.uuid16 != ESP_GATT_UUID_CHAR_CLIENT_CONFIG) {
+        ESP_LOGW(TAG, "Handle 0x%x (uuid %s) is not a client config char uuid", param->reg_for_notify.handle,
+                 descr->uuid.to_string().c_str());
+        break;
+      }
+      uint16_t notify_en = 1;
+      auto status =
+          esp_ble_gattc_write_char_descr(this->gattc_if_, this->conn_id_, descr->handle, sizeof(notify_en),
+                                         (uint8_t *) &notify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
+      if (status) {
+        ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, status=%d", status);
+      }
+      break;
+    }
+
+    default:
+      break;
+  }
+}
+
+void BLEClientBase::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
+  switch (event) {
+    // This event is sent by the server when it requests security
+    case ESP_GAP_BLE_SEC_REQ_EVT:
+      ESP_LOGV(TAG, "ESP_GAP_BLE_SEC_REQ_EVT %x", event);
+      esp_ble_gap_security_rsp(param->ble_security.ble_req.bd_addr, true);
+      break;
+    // This event is sent once authentication has completed
+    case ESP_GAP_BLE_AUTH_CMPL_EVT:
+      esp_bd_addr_t bd_addr;
+      memcpy(bd_addr, param->ble_security.auth_cmpl.bd_addr, sizeof(esp_bd_addr_t));
+      ESP_LOGI(TAG, "auth complete. remote BD_ADDR: %s", format_hex(bd_addr, 6).c_str());
+      if (!param->ble_security.auth_cmpl.success) {
+        ESP_LOGE(TAG, "auth fail reason = 0x%x", param->ble_security.auth_cmpl.fail_reason);
+      } else {
+        ESP_LOGV(TAG, "auth success. address type = %d auth mode = %d", param->ble_security.auth_cmpl.addr_type,
+                 param->ble_security.auth_cmpl.auth_mode);
+      }
+      break;
+    // There are other events we'll want to implement at some point to support things like pass key
+    // https://github.com/espressif/esp-idf/blob/cba69dd088344ed9d26739f04736ae7a37541b3a/examples/bluetooth/bluedroid/ble/gatt_security_client/tutorial/Gatt_Security_Client_Example_Walkthrough.md
+    default:
+      break;
+  }
+}
+
+// Parse GATT values into a float for a sensor.
+// Ref: https://www.bluetooth.com/specifications/assigned-numbers/format-types/
+float BLEClientBase::parse_char_value(uint8_t *value, uint16_t length) {
+  // A length of one means a single octet value.
+  if (length == 0)
+    return 0;
+  if (length == 1)
+    return (float) ((uint8_t) value[0]);
+
+  switch (value[0]) {
+    case 0x1:  // boolean.
+    case 0x2:  // 2bit.
+    case 0x3:  // nibble.
+    case 0x4:  // uint8.
+      return (float) ((uint8_t) value[1]);
+    case 0x5:  // uint12.
+    case 0x6:  // uint16.
+      if (length > 2) {
+        return (float) encode_uint16(value[1], value[2]);
+      }
+    case 0x7:  // uint24.
+      if (length > 3) {
+        return (float) encode_uint24(value[1], value[2], value[3]);
+      }
+    case 0x8:  // uint32.
+      if (length > 4) {
+        return (float) encode_uint32(value[1], value[2], value[3], value[4]);
+      }
+    case 0xC:  // int8.
+      return (float) ((int8_t) value[1]);
+    case 0xD:  // int12.
+    case 0xE:  // int16.
+      if (length > 2) {
+        return (float) ((int16_t)(value[1] << 8) + (int16_t) value[2]);
+      }
+    case 0xF:  // int24.
+      if (length > 3) {
+        return (float) ((int32_t)(value[1] << 16) + (int32_t)(value[2] << 8) + (int32_t)(value[3]));
+      }
+    case 0x10:  // int32.
+      if (length > 4) {
+        return (float) ((int32_t)(value[1] << 24) + (int32_t)(value[2] << 16) + (int32_t)(value[3] << 8) +
+                        (int32_t)(value[4]));
+      }
+  }
+  ESP_LOGW(TAG, "Cannot parse characteristic value of type 0x%x length %d", value[0], length);
+  return NAN;
+}
+
+BLEService *BLEClientBase::get_service(espbt::ESPBTUUID uuid) {
+  for (auto *svc : this->services_) {
+    if (svc->uuid == uuid)
+      return svc;
+  }
+  return nullptr;
+}
+
+BLEService *BLEClientBase::get_service(uint16_t uuid) { return this->get_service(espbt::ESPBTUUID::from_uint16(uuid)); }
+
+BLECharacteristic *BLEClientBase::get_characteristic(espbt::ESPBTUUID service, espbt::ESPBTUUID chr) {
+  auto *svc = this->get_service(service);
+  if (svc == nullptr)
+    return nullptr;
+  return svc->get_characteristic(chr);
+}
+
+BLECharacteristic *BLEClientBase::get_characteristic(uint16_t service, uint16_t chr) {
+  return this->get_characteristic(espbt::ESPBTUUID::from_uint16(service), espbt::ESPBTUUID::from_uint16(chr));
+}
+
+BLECharacteristic *BLEClientBase::get_characteristic(uint16_t handle) {
+  for (auto *svc : this->services_) {
+    for (auto *chr : svc->characteristics) {
+      if (chr->handle == handle)
+        return chr;
+    }
+  }
+  return nullptr;
+}
+
+BLEDescriptor *BLEClientBase::get_config_descriptor(uint16_t handle) {
+  auto *chr = this->get_characteristic(handle);
+  if (chr != nullptr) {
+    for (auto &desc : chr->descriptors) {
+      if (desc->uuid == espbt::ESPBTUUID::from_uint16(0x2902))
+        return desc;
+    }
+  }
+  return nullptr;
+}
+
+BLEDescriptor *BLEClientBase::get_descriptor(espbt::ESPBTUUID service, espbt::ESPBTUUID chr, espbt::ESPBTUUID descr) {
+  auto *svc = this->get_service(service);
+  if (svc == nullptr)
+    return nullptr;
+  auto *ch = svc->get_characteristic(chr);
+  if (ch == nullptr)
+    return nullptr;
+  return ch->get_descriptor(descr);
+}
+
+BLEDescriptor *BLEClientBase::get_descriptor(uint16_t service, uint16_t chr, uint16_t descr) {
+  return this->get_descriptor(espbt::ESPBTUUID::from_uint16(service), espbt::ESPBTUUID::from_uint16(chr),
+                              espbt::ESPBTUUID::from_uint16(descr));
+}
+
+BLEDescriptor *BLEClientBase::get_descriptor(uint16_t handle) {
+  for (auto *svc : this->services_) {
+    for (auto *chr : svc->characteristics) {
+      for (auto *desc : chr->descriptors) {
+        if (desc->handle == handle)
+          return desc;
+      }
+    }
+  }
+  return nullptr;
+}
+
+}  // namespace esp32_ble_client
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/esp32_ble_client/ble_client_base.h b/esphome/components/esp32_ble_client/ble_client_base.h
new file mode 100644
index 0000000000..eba70fa571
--- /dev/null
+++ b/esphome/components/esp32_ble_client/ble_client_base.h
@@ -0,0 +1,72 @@
+#pragma once
+
+#ifdef USE_ESP32
+
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/core/component.h"
+
+#include "ble_service.h"
+
+#include <array>
+#include <string>
+
+#include <esp_bt_defs.h>
+#include <esp_gap_ble_api.h>
+#include <esp_gatt_common_api.h>
+#include <esp_gattc_api.h>
+
+namespace esphome {
+namespace esp32_ble_client {
+
+namespace espbt = esphome::esp32_ble_tracker;
+
+class BLEClientBase : public espbt::ESPBTClient, public Component {
+ public:
+  void setup() override;
+  void loop() override;
+  float get_setup_priority() const override;
+
+  bool parse_device(const espbt::ESPBTDevice &device) override;
+  void on_scan_end() override {}
+  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 connect() override;
+
+  void set_address(uint64_t address) { this->address_ = address; }
+  std::string address_str() const;
+
+  BLEService *get_service(espbt::ESPBTUUID uuid);
+  BLEService *get_service(uint16_t uuid);
+  BLECharacteristic *get_characteristic(espbt::ESPBTUUID service, espbt::ESPBTUUID chr);
+  BLECharacteristic *get_characteristic(uint16_t service, uint16_t chr);
+  BLECharacteristic *get_characteristic(uint16_t handle);
+  BLEDescriptor *get_descriptor(espbt::ESPBTUUID service, espbt::ESPBTUUID chr, espbt::ESPBTUUID descr);
+  BLEDescriptor *get_descriptor(uint16_t service, uint16_t chr, uint16_t descr);
+  BLEDescriptor *get_descriptor(uint16_t handle);
+  // Get the configuration descriptor for the given characteristic handle.
+  BLEDescriptor *get_config_descriptor(uint16_t handle);
+
+  float parse_char_value(uint8_t *value, uint16_t length);
+
+  int get_gattc_if() const { return this->gattc_if_; }
+  uint8_t *get_remote_bda() { return this->remote_bda_; }
+  esp_ble_addr_type_t get_remote_addr_type() const { return this->remote_addr_type_; }
+  uint16_t get_conn_id() const { return this->conn_id_; }
+  uint64_t get_address() const { return this->address_; }
+
+ protected:
+  int gattc_if_;
+  esp_bd_addr_t remote_bda_;
+  esp_ble_addr_type_t remote_addr_type_;
+  uint16_t conn_id_;
+  uint64_t address_;
+  uint16_t mtu_{23};
+
+  std::vector<BLEService *> services_;
+};
+
+}  // namespace esp32_ble_client
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/esp32_ble_client/ble_descriptor.h b/esphome/components/esp32_ble_client/ble_descriptor.h
new file mode 100644
index 0000000000..c05430144f
--- /dev/null
+++ b/esphome/components/esp32_ble_client/ble_descriptor.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#ifdef USE_ESP32
+
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+
+namespace esphome {
+namespace esp32_ble_client {
+
+namespace espbt = esphome::esp32_ble_tracker;
+
+class BLECharacteristic;
+
+class BLEDescriptor {
+ public:
+  espbt::ESPBTUUID uuid;
+  uint16_t handle;
+
+  BLECharacteristic *characteristic;
+};
+
+}  // namespace esp32_ble_client
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/esp32_ble_client/ble_service.cpp b/esphome/components/esp32_ble_client/ble_service.cpp
new file mode 100644
index 0000000000..1d81eaa556
--- /dev/null
+++ b/esphome/components/esp32_ble_client/ble_service.cpp
@@ -0,0 +1,66 @@
+#include "ble_service.h"
+#include "ble_client_base.h"
+
+#include "esphome/core/log.h"
+
+#ifdef USE_ESP32
+
+namespace esphome {
+namespace esp32_ble_client {
+
+static const char *const TAG = "esp32_ble_client.service";
+
+BLECharacteristic *BLEService::get_characteristic(espbt::ESPBTUUID uuid) {
+  for (auto &chr : this->characteristics) {
+    if (chr->uuid == uuid)
+      return chr;
+  }
+  return nullptr;
+}
+
+BLECharacteristic *BLEService::get_characteristic(uint16_t uuid) {
+  return this->get_characteristic(espbt::ESPBTUUID::from_uint16(uuid));
+}
+
+BLEService::~BLEService() {
+  for (auto &chr : this->characteristics)
+    delete chr;  // NOLINT(cppcoreguidelines-owning-memory)
+}
+
+void BLEService::parse_characteristics() {
+  uint16_t offset = 0;
+  esp_gattc_char_elem_t result;
+
+  while (true) {
+    uint16_t count = 1;
+    esp_gatt_status_t status =
+        esp_ble_gattc_get_all_char(this->client->get_gattc_if(), this->client->get_conn_id(), this->start_handle,
+                                   this->end_handle, &result, &count, offset);
+    if (status == ESP_GATT_INVALID_OFFSET || status == ESP_GATT_NOT_FOUND) {
+      break;
+    }
+    if (status != ESP_GATT_OK) {
+      ESP_LOGW(TAG, "esp_ble_gattc_get_all_char error, status=%d", status);
+      break;
+    }
+    if (count == 0) {
+      break;
+    }
+
+    BLECharacteristic *characteristic = new BLECharacteristic();  // NOLINT(cppcoreguidelines-owning-memory)
+    characteristic->uuid = espbt::ESPBTUUID::from_uuid(result.uuid);
+    characteristic->properties = result.properties;
+    characteristic->handle = result.char_handle;
+    characteristic->service = this;
+    this->characteristics.push_back(characteristic);
+    ESP_LOGI(TAG, " characteristic %s, handle 0x%x, properties 0x%x", characteristic->uuid.to_string().c_str(),
+             characteristic->handle, characteristic->properties);
+    characteristic->parse_descriptors();
+    offset++;
+  }
+}
+
+}  // namespace esp32_ble_client
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/esp32_ble_client/ble_service.h b/esphome/components/esp32_ble_client/ble_service.h
new file mode 100644
index 0000000000..04f2212e0e
--- /dev/null
+++ b/esphome/components/esp32_ble_client/ble_service.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#ifdef USE_ESP32
+
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+
+#include "ble_characteristic.h"
+
+namespace esphome {
+namespace esp32_ble_client {
+
+namespace espbt = esphome::esp32_ble_tracker;
+
+class BLEClientBase;
+
+class BLEService {
+ public:
+  ~BLEService();
+  espbt::ESPBTUUID uuid;
+  uint16_t start_handle;
+  uint16_t end_handle;
+  std::vector<BLECharacteristic *> characteristics;
+  BLEClientBase *client;
+  void parse_characteristics();
+  BLECharacteristic *get_characteristic(espbt::ESPBTUUID uuid);
+  BLECharacteristic *get_characteristic(uint16_t uuid);
+};
+
+}  // namespace esp32_ble_client
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index 6d7868d4c5..0d7abe32f9 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
 from esphome.const import (
+    CONF_ACTIVE,
     CONF_ID,
     CONF_INTERVAL,
     CONF_DURATION,
@@ -22,7 +23,6 @@ DEPENDENCIES = ["esp32"]
 CONF_ESP32_BLE_ID = "esp32_ble_id"
 CONF_SCAN_PARAMETERS = "scan_parameters"
 CONF_WINDOW = "window"
-CONF_ACTIVE = "active"
 CONF_CONTINUOUS = "continuous"
 CONF_ON_SCAN_END = "on_scan_end"
 esp32_ble_tracker_ns = cg.esphome_ns.namespace("esp32_ble_tracker")
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index f7e51a8ab3..d4512b52b0 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -518,28 +518,39 @@ bool ESPBTUUID::operator==(const ESPBTUUID &uuid) const {
 }
 esp_bt_uuid_t ESPBTUUID::get_uuid() const { return this->uuid_; }
 std::string ESPBTUUID::to_string() const {
-  char sbuf[64];
   switch (this->uuid_.len) {
     case ESP_UUID_LEN_16:
-      sprintf(sbuf, "0x%02X%02X", this->uuid_.uuid.uuid16 >> 8, this->uuid_.uuid.uuid16 & 0xff);
-      break;
+      return str_snprintf("0x%02X%02X", 6, this->uuid_.uuid.uuid16 >> 8, this->uuid_.uuid.uuid16 & 0xff);
     case ESP_UUID_LEN_32:
-      sprintf(sbuf, "0x%02X%02X%02X%02X", this->uuid_.uuid.uuid32 >> 24, (this->uuid_.uuid.uuid32 >> 16 & 0xff),
-              (this->uuid_.uuid.uuid32 >> 8 & 0xff), this->uuid_.uuid.uuid32 & 0xff);
-      break;
+      return str_snprintf("0x%02X%02X%02X%02X", 10, this->uuid_.uuid.uuid32 >> 24,
+                          (this->uuid_.uuid.uuid32 >> 16 & 0xff), (this->uuid_.uuid.uuid32 >> 8 & 0xff),
+                          this->uuid_.uuid.uuid32 & 0xff);
     default:
     case ESP_UUID_LEN_128:
-      char *bpos = sbuf;
+      std::string buf;
       for (int8_t i = 15; i >= 0; i--) {
-        sprintf(bpos, "%02X", this->uuid_.uuid.uuid128[i]);
-        bpos += 2;
+        buf += str_snprintf("%02X", 2, this->uuid_.uuid.uuid128[i]);
         if (i == 6 || i == 8 || i == 10 || i == 12)
-          sprintf(bpos++, "-");
+          buf += "-";
       }
-      sbuf[47] = '\0';
-      break;
+      return buf;
   }
-  return sbuf;
+  return "";
+}
+
+uint64_t ESPBTUUID::get_128bit_high() const {
+  esp_bt_uuid_t uuid = this->as_128bit().get_uuid();
+  return ((uint64_t) uuid.uuid.uuid128[15] << 56) | ((uint64_t) uuid.uuid.uuid128[14] << 48) |
+         ((uint64_t) uuid.uuid.uuid128[13] << 40) | ((uint64_t) uuid.uuid.uuid128[12] << 32) |
+         ((uint64_t) uuid.uuid.uuid128[11] << 24) | ((uint64_t) uuid.uuid.uuid128[10] << 16) |
+         ((uint64_t) uuid.uuid.uuid128[9] << 8) | ((uint64_t) uuid.uuid.uuid128[8]);
+}
+uint64_t ESPBTUUID::get_128bit_low() const {
+  esp_bt_uuid_t uuid = this->as_128bit().get_uuid();
+  return ((uint64_t) uuid.uuid.uuid128[7] << 56) | ((uint64_t) uuid.uuid.uuid128[6] << 48) |
+         ((uint64_t) uuid.uuid.uuid128[5] << 40) | ((uint64_t) uuid.uuid.uuid128[4] << 32) |
+         ((uint64_t) uuid.uuid.uuid128[3] << 24) | ((uint64_t) uuid.uuid.uuid128[2] << 16) |
+         ((uint64_t) uuid.uuid.uuid128[1] << 8) | ((uint64_t) uuid.uuid.uuid128[0]);
 }
 
 ESPBLEiBeacon::ESPBLEiBeacon(const uint8_t *data) { memcpy(&this->beacon_data_, data, sizeof(beacon_data_)); }
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 29d0c81542..45abcd63fa 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -41,6 +41,9 @@ class ESPBTUUID {
 
   std::string to_string() const;
 
+  uint64_t get_128bit_high() const;
+  uint64_t get_128bit_low() const;
+
  protected:
   esp_bt_uuid_t uuid_;
 };
@@ -158,7 +161,7 @@ class ESPBTClient : public ESPBTDeviceListener {
                                    esp_ble_gattc_cb_param_t *param) = 0;
   virtual void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) = 0;
   virtual void connect() = 0;
-  void set_state(ClientState st) { this->state_ = st; }
+  virtual void set_state(ClientState st) { this->state_ = st; }
   ClientState state() const { return state_; }
   int app_id;
 
diff --git a/esphome/components/esp32_ble_tracker/queue.h b/esphome/components/esp32_ble_tracker/queue.h
index f09b2ca8d7..f3a2b3cb3c 100644
--- a/esphome/components/esp32_ble_tracker/queue.h
+++ b/esphome/components/esp32_ble_tracker/queue.h
@@ -72,13 +72,13 @@ class BLEEvent {
     // Need to also make a copy of relevant event data.
     switch (e) {
       case ESP_GATTC_NOTIFY_EVT:
-        memcpy(this->event_.gattc.data, p->notify.value, p->notify.value_len);
-        this->event_.gattc.gattc_param.notify.value = this->event_.gattc.data;
+        this->data.assign(p->notify.value, p->notify.value + p->notify.value_len);
+        this->event_.gattc.gattc_param.notify.value = this->data.data();
         break;
       case ESP_GATTC_READ_CHAR_EVT:
       case ESP_GATTC_READ_DESCR_EVT:
-        memcpy(this->event_.gattc.data, p->read.value, p->read.value_len);
-        this->event_.gattc.gattc_param.read.value = this->event_.gattc.data;
+        this->data.assign(p->read.value, p->read.value + p->read.value_len);
+        this->event_.gattc.gattc_param.read.value = this->data.data();
         break;
       default:
         break;
@@ -96,9 +96,9 @@ class BLEEvent {
       esp_gattc_cb_event_t gattc_event;
       esp_gatt_if_t gattc_if;
       esp_ble_gattc_cb_param_t gattc_param;
-      uint8_t data[64];
     } gattc;
   } event_;
+  std::vector<uint8_t> data{};
   uint8_t type_;  // 0=gap 1=gattc
 };
 
diff --git a/esphome/components/pvvx_mithermometer/display/pvvx_display.cpp b/esphome/components/pvvx_mithermometer/display/pvvx_display.cpp
index 21638ef7e4..384537e5d7 100644
--- a/esphome/components/pvvx_mithermometer/display/pvvx_display.cpp
+++ b/esphome/components/pvvx_mithermometer/display/pvvx_display.cpp
@@ -102,8 +102,9 @@ void PVVXDisplay::send_to_setup_char_(uint8_t *blk, size_t size) {
     ESP_LOGW(TAG, "[%s] Not connected to BLE client.", this->parent_->address_str().c_str());
     return;
   }
-  auto status = esp_ble_gattc_write_char(this->parent_->gattc_if, this->parent_->conn_id, this->char_handle_, size, blk,
-                                         ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+  auto status =
+      esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_, size,
+                               blk, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
   } else {
diff --git a/esphome/components/radon_eye_rd200/radon_eye_rd200.cpp b/esphome/components/radon_eye_rd200/radon_eye_rd200.cpp
index 6bb17f0508..3959178b94 100644
--- a/esphome/components/radon_eye_rd200/radon_eye_rd200.cpp
+++ b/esphome/components/radon_eye_rd200/radon_eye_rd200.cpp
@@ -50,7 +50,7 @@ void RadonEyeRD200::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
     }
 
     case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->conn_id)
+      if (param->read.conn_id != this->parent()->get_conn_id())
         break;
       if (param->read.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
@@ -146,17 +146,17 @@ void RadonEyeRD200::update() {
 void RadonEyeRD200::write_query_message_() {
   ESP_LOGV(TAG, "writing 0x50 to write service");
   int request = 0x50;
-  auto status = esp_ble_gattc_write_char_descr(this->parent()->gattc_if, this->parent()->conn_id, this->write_handle_,
-                                               sizeof(request), (uint8_t *) &request, ESP_GATT_WRITE_TYPE_NO_RSP,
-                                               ESP_GATT_AUTH_REQ_NONE);
+  auto status = esp_ble_gattc_write_char_descr(this->parent()->get_gattc_if(), this->parent()->get_conn_id(),
+                                               this->write_handle_, sizeof(request), (uint8_t *) &request,
+                                               ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     ESP_LOGW(TAG, "Error sending write request for sensor, status=%d", status);
   }
 }
 
 void RadonEyeRD200::request_read_values_() {
-  auto status = esp_ble_gattc_read_char(this->parent()->gattc_if, this->parent()->conn_id, this->read_handle_,
-                                        ESP_GATT_AUTH_REQ_NONE);
+  auto status = esp_ble_gattc_read_char(this->parent()->get_gattc_if(), this->parent()->get_conn_id(),
+                                        this->read_handle_, ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     ESP_LOGW(TAG, "Error sending read request for sensor, status=%d", status);
   }
diff --git a/esphome/const.py b/esphome/const.py
index a272f518df..e9a6975ca2 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -23,6 +23,7 @@ CONF_ACCURACY = "accuracy"
 CONF_ACCURACY_DECIMALS = "accuracy_decimals"
 CONF_ACTION_ID = "action_id"
 CONF_ACTION_STATE_TOPIC = "action_state_topic"
+CONF_ACTIVE = "active"
 CONF_ACTIVE_POWER = "active_power"
 CONF_ADDRESS = "address"
 CONF_ADDRESSABLE_LIGHT_ID = "addressable_light_id"

From 6b52f62531519451d934fe8cfbe74bbcf0b8564e Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 6 Oct 2022 09:22:01 +1300
Subject: [PATCH 115/838] Bump version to 2022.9.3

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

diff --git a/esphome/const.py b/esphome/const.py
index e9a6975ca2..ff59f2b8bf 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.9.2"
+__version__ = "2022.9.3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 7171286c3cf63ea73f176522b8ab443e45ebb4c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Oct 2022 14:57:07 +1300
Subject: [PATCH 116/838] Bump pylint from 2.15.2 to 2.15.3 (#3870)

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 e7b6387b73..d72449fd66 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,4 +1,4 @@
-pylint==2.15.2
+pylint==2.15.3
 flake8==5.0.4
 black==22.8.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.0.0  # also change in .pre-commit-config.yaml when updating

From 01b7c4200ec498057a51caba24fd40910fa2ca90 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 7 Oct 2022 14:42:28 +1300
Subject: [PATCH 117/838] Add network type to mdns service message (#3880)

---
 esphome/components/mdns/mdns_component.cpp | 6 ++++++
 esphome/dashboard/dashboard.py             | 1 +
 esphome/zeroconf.py                        | 6 +++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/esphome/components/mdns/mdns_component.cpp b/esphome/components/mdns/mdns_component.cpp
index 31858c0d3c..e1fcf320ed 100644
--- a/esphome/components/mdns/mdns_component.cpp
+++ b/esphome/components/mdns/mdns_component.cpp
@@ -45,6 +45,12 @@ void MDNSComponent::compile_records_() {
 
     service.txt_records.push_back({"board", ESPHOME_BOARD});
 
+#if defined(USE_WIFI)
+    service.txt_records.push_back({"network", "wifi"});
+#elif defined(USE_ETHERNET)
+    service.txt_records.push_back({"network", "ethernet"});
+#endif
+
 #ifdef ESPHOME_PROJECT_NAME
     service.txt_records.push_back({"project_name", ESPHOME_PROJECT_NAME});
     service.txt_records.push_back({"project_version", ESPHOME_PROJECT_VERSION});
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 4f361d0936..207d5cae93 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -613,6 +613,7 @@ class ListDevicesHandler(BaseHandler):
                             "package_import_url": res.package_import_url,
                             "project_name": res.project_name,
                             "project_version": res.project_version,
+                            "network": res.network,
                         }
                         for res in IMPORT_RESULT.values()
                         if res.device_name not in configured
diff --git a/esphome/zeroconf.py b/esphome/zeroconf.py
index 3a491d9b99..3743f650f3 100644
--- a/esphome/zeroconf.py
+++ b/esphome/zeroconf.py
@@ -118,6 +118,7 @@ ESPHOME_SERVICE_TYPE = "_esphomelib._tcp.local."
 TXT_RECORD_PACKAGE_IMPORT_URL = b"package_import_url"
 TXT_RECORD_PROJECT_NAME = b"project_name"
 TXT_RECORD_PROJECT_VERSION = b"project_version"
+TXT_RECORD_NETWORK = b"network"
 
 
 @dataclass
@@ -126,6 +127,7 @@ class DiscoveredImport:
     package_import_url: str
     project_name: str
     project_version: str
+    network: str
 
 
 class DashboardImportDiscovery:
@@ -134,7 +136,7 @@ class DashboardImportDiscovery:
         self.service_browser = ServiceBrowser(
             self.zc, ESPHOME_SERVICE_TYPE, [self._on_update]
         )
-        self.import_state = {}
+        self.import_state: dict[str, DiscoveredImport] = {}
 
     def _on_update(
         self,
@@ -171,12 +173,14 @@ class DashboardImportDiscovery:
         import_url = info.properties[TXT_RECORD_PACKAGE_IMPORT_URL].decode()
         project_name = info.properties[TXT_RECORD_PROJECT_NAME].decode()
         project_version = info.properties[TXT_RECORD_PROJECT_VERSION].decode()
+        network = info.properties.get(TXT_RECORD_NETWORK, b"wifi").decode()
 
         self.import_state[name] = DiscoveredImport(
             device_name=node_name,
             package_import_url=import_url,
             project_name=project_name,
             project_version=project_version,
+            network=network,
         )
 
     def cancel(self) -> None:

From 6087183a0c28f82a24545e9972388cf99943e4a7 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 7 Oct 2022 15:20:13 +1300
Subject: [PATCH 118/838] Bump esphome-dashboard to 20221007.0 (#3881)

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

diff --git a/requirements.txt b/requirements.txt
index 7f86acdbef..00e6e0ba67 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.0.2  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
-esphome-dashboard==20220925.0
+esphome-dashboard==20221007.0
 aioesphomeapi==10.13.0
 zeroconf==0.39.1
 

From fd57b21affab08a48fd03e7b1e61c522fd524f0b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 7 Oct 2022 15:35:48 +1300
Subject: [PATCH 119/838] Dont add wifi block to yaml if discovered device uses
 ethernet (#3882)

---
 esphome/components/dashboard_import/__init__.py | 15 ++++++++++-----
 esphome/dashboard/dashboard.py                  | 11 +++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/esphome/components/dashboard_import/__init__.py b/esphome/components/dashboard_import/__init__.py
index 41b4a8bed1..b795c85b12 100644
--- a/esphome/components/dashboard_import/__init__.py
+++ b/esphome/components/dashboard_import/__init__.py
@@ -3,6 +3,7 @@ from pathlib import Path
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components.packages import validate_source_shorthand
+from esphome.const import CONF_WIFI
 from esphome.wizard import wizard_file
 from esphome.yaml_util import dump
 
@@ -43,7 +44,9 @@ async def to_code(config):
     cg.add(dashboard_import_ns.set_package_import_url(config[CONF_PACKAGE_IMPORT_URL]))
 
 
-def import_config(path: str, name: str, project_name: str, import_url: str) -> None:
+def import_config(
+    path: str, name: str, project_name: str, import_url: str, network: str = CONF_WIFI
+) -> None:
     p = Path(path)
 
     if p.exists():
@@ -69,7 +72,9 @@ def import_config(path: str, name: str, project_name: str, import_url: str) -> N
                 "name_add_mac_suffix": False,
             },
         }
-        p.write_text(
-            dump(config) + WIFI_CONFIG,
-            encoding="utf8",
-        )
+        output = dump(config)
+
+        if network == CONF_WIFI:
+            output += WIFI_CONFIG
+
+        p.write_text(output, encoding="utf8")
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 207d5cae93..1a51f3056f 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -395,11 +395,22 @@ class ImportRequestHandler(BaseHandler):
         args = json.loads(self.request.body.decode())
         try:
             name = args["name"]
+
+            imported_device = next(
+                (res for res in IMPORT_RESULT.values() if res.device_name == name), None
+            )
+
+            if imported_device is not None:
+                network = imported_device.network
+            else:
+                network = const.CONF_WIFI
+
             import_config(
                 settings.rel_path(f"{name}.yaml"),
                 name,
                 args["project_name"],
                 args["package_import_url"],
+                network,
             )
         except FileExistsError:
             self.set_status(500)

From 5df0e82c372362a310b332720e63e47e8284ab01 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 7 Oct 2022 14:42:28 +1300
Subject: [PATCH 120/838] Add network type to mdns service message (#3880)

---
 esphome/components/mdns/mdns_component.cpp | 6 ++++++
 esphome/dashboard/dashboard.py             | 1 +
 esphome/zeroconf.py                        | 6 +++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/esphome/components/mdns/mdns_component.cpp b/esphome/components/mdns/mdns_component.cpp
index 31858c0d3c..e1fcf320ed 100644
--- a/esphome/components/mdns/mdns_component.cpp
+++ b/esphome/components/mdns/mdns_component.cpp
@@ -45,6 +45,12 @@ void MDNSComponent::compile_records_() {
 
     service.txt_records.push_back({"board", ESPHOME_BOARD});
 
+#if defined(USE_WIFI)
+    service.txt_records.push_back({"network", "wifi"});
+#elif defined(USE_ETHERNET)
+    service.txt_records.push_back({"network", "ethernet"});
+#endif
+
 #ifdef ESPHOME_PROJECT_NAME
     service.txt_records.push_back({"project_name", ESPHOME_PROJECT_NAME});
     service.txt_records.push_back({"project_version", ESPHOME_PROJECT_VERSION});
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 9a8f072237..c812ec4b49 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -613,6 +613,7 @@ class ListDevicesHandler(BaseHandler):
                             "package_import_url": res.package_import_url,
                             "project_name": res.project_name,
                             "project_version": res.project_version,
+                            "network": res.network,
                         }
                         for res in IMPORT_RESULT.values()
                         if res.device_name not in configured
diff --git a/esphome/zeroconf.py b/esphome/zeroconf.py
index 1fbdf7e93f..089ae4f1c2 100644
--- a/esphome/zeroconf.py
+++ b/esphome/zeroconf.py
@@ -118,6 +118,7 @@ ESPHOME_SERVICE_TYPE = "_esphomelib._tcp.local."
 TXT_RECORD_PACKAGE_IMPORT_URL = b"package_import_url"
 TXT_RECORD_PROJECT_NAME = b"project_name"
 TXT_RECORD_PROJECT_VERSION = b"project_version"
+TXT_RECORD_NETWORK = b"network"
 
 
 @dataclass
@@ -126,6 +127,7 @@ class DiscoveredImport:
     package_import_url: str
     project_name: str
     project_version: str
+    network: str
 
 
 class DashboardImportDiscovery:
@@ -134,7 +136,7 @@ class DashboardImportDiscovery:
         self.service_browser = ServiceBrowser(
             self.zc, ESPHOME_SERVICE_TYPE, [self._on_update]
         )
-        self.import_state = {}
+        self.import_state: dict[str, DiscoveredImport] = {}
 
     def _on_update(
         self,
@@ -171,12 +173,14 @@ class DashboardImportDiscovery:
         import_url = info.properties[TXT_RECORD_PACKAGE_IMPORT_URL].decode()
         project_name = info.properties[TXT_RECORD_PROJECT_NAME].decode()
         project_version = info.properties[TXT_RECORD_PROJECT_VERSION].decode()
+        network = info.properties.get(TXT_RECORD_NETWORK, b"wifi").decode()
 
         self.import_state[name] = DiscoveredImport(
             device_name=node_name,
             package_import_url=import_url,
             project_name=project_name,
             project_version=project_version,
+            network=network,
         )
 
     def cancel(self) -> None:

From 5e96b8ef7c903d5c4a15a1e66384e0c7ff8dfa0f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 7 Oct 2022 15:20:13 +1300
Subject: [PATCH 121/838] Bump esphome-dashboard to 20221007.0 (#3881)

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

diff --git a/requirements.txt b/requirements.txt
index 7f86acdbef..00e6e0ba67 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.0.2  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
-esphome-dashboard==20220925.0
+esphome-dashboard==20221007.0
 aioesphomeapi==10.13.0
 zeroconf==0.39.1
 

From 3b83f967e4859ae800ff9448cc47034ef045a011 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 7 Oct 2022 15:35:48 +1300
Subject: [PATCH 122/838] Dont add wifi block to yaml if discovered device uses
 ethernet (#3882)

---
 esphome/components/dashboard_import/__init__.py | 15 ++++++++++-----
 esphome/dashboard/dashboard.py                  | 11 +++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/esphome/components/dashboard_import/__init__.py b/esphome/components/dashboard_import/__init__.py
index 41b4a8bed1..b795c85b12 100644
--- a/esphome/components/dashboard_import/__init__.py
+++ b/esphome/components/dashboard_import/__init__.py
@@ -3,6 +3,7 @@ from pathlib import Path
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components.packages import validate_source_shorthand
+from esphome.const import CONF_WIFI
 from esphome.wizard import wizard_file
 from esphome.yaml_util import dump
 
@@ -43,7 +44,9 @@ async def to_code(config):
     cg.add(dashboard_import_ns.set_package_import_url(config[CONF_PACKAGE_IMPORT_URL]))
 
 
-def import_config(path: str, name: str, project_name: str, import_url: str) -> None:
+def import_config(
+    path: str, name: str, project_name: str, import_url: str, network: str = CONF_WIFI
+) -> None:
     p = Path(path)
 
     if p.exists():
@@ -69,7 +72,9 @@ def import_config(path: str, name: str, project_name: str, import_url: str) -> N
                 "name_add_mac_suffix": False,
             },
         }
-        p.write_text(
-            dump(config) + WIFI_CONFIG,
-            encoding="utf8",
-        )
+        output = dump(config)
+
+        if network == CONF_WIFI:
+            output += WIFI_CONFIG
+
+        p.write_text(output, encoding="utf8")
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index c812ec4b49..07ee151949 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -395,11 +395,22 @@ class ImportRequestHandler(BaseHandler):
         args = json.loads(self.request.body.decode())
         try:
             name = args["name"]
+
+            imported_device = next(
+                (res for res in IMPORT_RESULT.values() if res.device_name == name), None
+            )
+
+            if imported_device is not None:
+                network = imported_device.network
+            else:
+                network = const.CONF_WIFI
+
             import_config(
                 settings.rel_path(f"{name}.yaml"),
                 name,
                 args["project_name"],
                 args["package_import_url"],
+                network,
             )
         except FileExistsError:
             self.set_status(500)

From 3c320c4c836c4611ac8171b0b69be3cdbfc40ee0 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 7 Oct 2022 16:34:39 +1300
Subject: [PATCH 123/838] Bump version to 2022.9.4

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

diff --git a/esphome/const.py b/esphome/const.py
index ff59f2b8bf..e93808e6d4 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.9.3"
+__version__ = "2022.9.4"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 786c8b6cfe585914afa9d9676ba84b0be7a8b38c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 11 Oct 2022 09:54:58 +1300
Subject: [PATCH 124/838] Add new sensor device classes (#3895)

---
 esphome/components/sensor/__init__.py | 10 ++++++++++
 esphome/const.py                      |  8 ++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index d6ba038057..12daf34d6e 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -29,6 +29,7 @@ from esphome.const import (
     CONF_WINDOW_SIZE,
     CONF_MQTT_ID,
     CONF_FORCE_UPDATE,
+    DEVICE_CLASS_DISTANCE,
     DEVICE_CLASS_DURATION,
     DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_APPARENT_POWER,
@@ -43,6 +44,7 @@ from esphome.const import (
     DEVICE_CLASS_GAS,
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_ILLUMINANCE,
+    DEVICE_CLASS_MOISTURE,
     DEVICE_CLASS_MONETARY,
     DEVICE_CLASS_NITROGEN_DIOXIDE,
     DEVICE_CLASS_NITROGEN_MONOXIDE,
@@ -56,11 +58,14 @@ from esphome.const import (
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_REACTIVE_POWER,
     DEVICE_CLASS_SIGNAL_STRENGTH,
+    DEVICE_CLASS_SPEED,
     DEVICE_CLASS_SULPHUR_DIOXIDE,
     DEVICE_CLASS_TEMPERATURE,
     DEVICE_CLASS_TIMESTAMP,
     DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
     DEVICE_CLASS_VOLTAGE,
+    DEVICE_CLASS_VOLUME,
+    DEVICE_CLASS_WEIGHT,
 )
 from esphome.core import CORE, coroutine_with_priority
 from esphome.cpp_generator import MockObjClass
@@ -77,12 +82,14 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_CARBON_MONOXIDE,
     DEVICE_CLASS_CURRENT,
     DEVICE_CLASS_DATE,
+    DEVICE_CLASS_DISTANCE,
     DEVICE_CLASS_DURATION,
     DEVICE_CLASS_ENERGY,
     DEVICE_CLASS_FREQUENCY,
     DEVICE_CLASS_GAS,
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_ILLUMINANCE,
+    DEVICE_CLASS_MOISTURE,
     DEVICE_CLASS_MONETARY,
     DEVICE_CLASS_NITROGEN_DIOXIDE,
     DEVICE_CLASS_NITROGEN_MONOXIDE,
@@ -96,11 +103,14 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_REACTIVE_POWER,
     DEVICE_CLASS_SIGNAL_STRENGTH,
+    DEVICE_CLASS_SPEED,
     DEVICE_CLASS_SULPHUR_DIOXIDE,
     DEVICE_CLASS_TEMPERATURE,
     DEVICE_CLASS_TIMESTAMP,
     DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
     DEVICE_CLASS_VOLTAGE,
+    DEVICE_CLASS_VOLUME,
+    DEVICE_CLASS_WEIGHT,
 ]
 
 sensor_ns = cg.esphome_ns.namespace("sensor")
diff --git a/esphome/const.py b/esphome/const.py
index 0f056498e4..7dcb3c823c 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -905,7 +905,6 @@ DEVICE_CLASS_GARAGE_DOOR = "garage_door"
 DEVICE_CLASS_HEAT = "heat"
 DEVICE_CLASS_LIGHT = "light"
 DEVICE_CLASS_LOCK = "lock"
-DEVICE_CLASS_MOISTURE = "moisture"
 DEVICE_CLASS_MOTION = "motion"
 DEVICE_CLASS_MOVING = "moving"
 DEVICE_CLASS_OCCUPANCY = "occupancy"
@@ -923,15 +922,17 @@ DEVICE_CLASS_WINDOW = "window"
 # device classes of both binary_sensor and sensor component
 DEVICE_CLASS_EMPTY = ""
 DEVICE_CLASS_BATTERY = "battery"
+DEVICE_CLASS_CARBON_MONOXIDE = "carbon_monoxide"
 DEVICE_CLASS_GAS = "gas"
+DEVICE_CLASS_MOISTURE = "moisture"
 DEVICE_CLASS_POWER = "power"
 # device classes of sensor component
 DEVICE_CLASS_APPARENT_POWER = "apparent_power"
 DEVICE_CLASS_AQI = "aqi"
 DEVICE_CLASS_CARBON_DIOXIDE = "carbon_dioxide"
-DEVICE_CLASS_CARBON_MONOXIDE = "carbon_monoxide"
 DEVICE_CLASS_CURRENT = "current"
 DEVICE_CLASS_DATE = "date"
+DEVICE_CLASS_DISTANCE = "distance"
 DEVICE_CLASS_DURATION = "duration"
 DEVICE_CLASS_ENERGY = "energy"
 DEVICE_CLASS_FREQUENCY = "frequency"
@@ -949,11 +950,14 @@ DEVICE_CLASS_POWER_FACTOR = "power_factor"
 DEVICE_CLASS_PRESSURE = "pressure"
 DEVICE_CLASS_REACTIVE_POWER = "reactive_power"
 DEVICE_CLASS_SIGNAL_STRENGTH = "signal_strength"
+DEVICE_CLASS_SPEED = "speed"
 DEVICE_CLASS_SULPHUR_DIOXIDE = "sulphur_dioxide"
 DEVICE_CLASS_TEMPERATURE = "temperature"
 DEVICE_CLASS_TIMESTAMP = "timestamp"
 DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS = "volatile_organic_compounds"
 DEVICE_CLASS_VOLTAGE = "voltage"
+DEVICE_CLASS_VOLUME = "volume"
+DEVICE_CLASS_WEIGHT = "weight"
 # device classes of both binary_sensor and button component
 DEVICE_CLASS_UPDATE = "update"
 # device classes of button component

From 3c2766448d7e6f077af42dee7cfcf64c9b4eaa82 Mon Sep 17 00:00:00 2001
From: NP v/d Spek <nielsnl68@gmail.com>
Date: Mon, 10 Oct 2022 23:10:22 +0200
Subject: [PATCH 125/838] Refactor xpt2046 to be a touchscreen platform (#3793)

---
 CODEOWNERS                                  |   2 +-
 esphome/components/animation/__init__.py    |   2 +-
 esphome/components/xpt2046/__init__.py      | 128 +--------------
 esphome/components/xpt2046/binary_sensor.py |  54 +------
 esphome/components/xpt2046/touchscreen.py   | 116 ++++++++++++++
 esphome/components/xpt2046/xpt2046.cpp      | 168 ++++++++++----------
 esphome/components/xpt2046/xpt2046.h        |  57 +++----
 tests/test4.yaml                            |  55 +++----
 8 files changed, 248 insertions(+), 334 deletions(-)
 create mode 100644 esphome/components/xpt2046/touchscreen.py

diff --git a/CODEOWNERS b/CODEOWNERS
index d95ebcce59..b04b480780 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -258,4 +258,4 @@ esphome/components/xiaomi_lywsd03mmc/* @ahpohl
 esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs
 esphome/components/xiaomi_rtcgq02lm/* @jesserockz
-esphome/components/xpt2046/* @numo68
+esphome/components/xpt2046/* @nielsnl68 @numo68
diff --git a/esphome/components/animation/__init__.py b/esphome/components/animation/__init__.py
index 3a150146e2..87d72254e8 100644
--- a/esphome/components/animation/__init__.py
+++ b/esphome/components/animation/__init__.py
@@ -13,7 +13,7 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ["display"]
 MULTI_CONF = True
 
-Animation_ = display.display_ns.class_("Animation")
+Animation_ = display.display_ns.class_("Animation", espImage.Image_)
 
 ANIMATION_SCHEMA = cv.Schema(
     {
diff --git a/esphome/components/xpt2046/__init__.py b/esphome/components/xpt2046/__init__.py
index 3de89a6425..3b8a925bb2 100644
--- a/esphome/components/xpt2046/__init__.py
+++ b/esphome/components/xpt2046/__init__.py
@@ -1,129 +1,5 @@
-import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome import automation
-from esphome import pins
-from esphome.components import spi
-from esphome.const import CONF_ID, CONF_ON_STATE, CONF_THRESHOLD, CONF_TRIGGER_ID
 
-CODEOWNERS = ["@numo68"]
-AUTO_LOAD = ["binary_sensor"]
-DEPENDENCIES = ["spi"]
-MULTI_CONF = True
-
-CONF_REPORT_INTERVAL = "report_interval"
-CONF_CALIBRATION_X_MIN = "calibration_x_min"
-CONF_CALIBRATION_X_MAX = "calibration_x_max"
-CONF_CALIBRATION_Y_MIN = "calibration_y_min"
-CONF_CALIBRATION_Y_MAX = "calibration_y_max"
-CONF_DIMENSION_X = "dimension_x"
-CONF_DIMENSION_Y = "dimension_y"
-CONF_SWAP_X_Y = "swap_x_y"
-CONF_IRQ_PIN = "irq_pin"
-
-xpt2046_ns = cg.esphome_ns.namespace("xpt2046")
-CONF_XPT2046_ID = "xpt2046_id"
-
-XPT2046Component = xpt2046_ns.class_(
-    "XPT2046Component", cg.PollingComponent, spi.SPIDevice
+CONFIG_SCHEMA = cv.invalid(
+    "This component sould now be used as platform of the Touchscreen component."
 )
-
-XPT2046OnStateTrigger = xpt2046_ns.class_(
-    "XPT2046OnStateTrigger", automation.Trigger.template(cg.int_, cg.int_, cg.bool_)
-)
-
-
-def validate_xpt2046(config):
-    if (
-        abs(
-            cv.int_(config[CONF_CALIBRATION_X_MAX])
-            - cv.int_(config[CONF_CALIBRATION_X_MIN])
-        )
-        < 1000
-    ):
-        raise cv.Invalid("Calibration X values difference < 1000")
-
-    if (
-        abs(
-            cv.int_(config[CONF_CALIBRATION_Y_MAX])
-            - cv.int_(config[CONF_CALIBRATION_Y_MIN])
-        )
-        < 1000
-    ):
-        raise cv.Invalid("Calibration Y values difference < 1000")
-
-    return config
-
-
-def report_interval(value):
-    if value == "never":
-        return 4294967295  # uint32_t max
-    return cv.positive_time_period_milliseconds(value)
-
-
-CONFIG_SCHEMA = cv.All(
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(XPT2046Component),
-            cv.Optional(CONF_IRQ_PIN): pins.gpio_input_pin_schema,
-            cv.Optional(CONF_CALIBRATION_X_MIN, default=0): cv.int_range(
-                min=0, max=4095
-            ),
-            cv.Optional(CONF_CALIBRATION_X_MAX, default=4095): cv.int_range(
-                min=0, max=4095
-            ),
-            cv.Optional(CONF_CALIBRATION_Y_MIN, default=0): cv.int_range(
-                min=0, max=4095
-            ),
-            cv.Optional(CONF_CALIBRATION_Y_MAX, default=4095): cv.int_range(
-                min=0, max=4095
-            ),
-            cv.Optional(CONF_DIMENSION_X, default=100): cv.positive_not_null_int,
-            cv.Optional(CONF_DIMENSION_Y, default=100): cv.positive_not_null_int,
-            cv.Optional(CONF_THRESHOLD, default=400): cv.int_range(min=0, max=4095),
-            cv.Optional(CONF_REPORT_INTERVAL, default="never"): report_interval,
-            cv.Optional(CONF_SWAP_X_Y, default=False): cv.boolean,
-            cv.Optional(CONF_ON_STATE): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
-                        XPT2046OnStateTrigger
-                    ),
-                }
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("50ms"))
-    .extend(spi.spi_device_schema()),
-    validate_xpt2046,
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await spi.register_spi_device(var, config)
-
-    cg.add(var.set_threshold(config[CONF_THRESHOLD]))
-    cg.add(var.set_report_interval(config[CONF_REPORT_INTERVAL]))
-    cg.add(var.set_dimensions(config[CONF_DIMENSION_X], config[CONF_DIMENSION_Y]))
-    cg.add(
-        var.set_calibration(
-            config[CONF_CALIBRATION_X_MIN],
-            config[CONF_CALIBRATION_X_MAX],
-            config[CONF_CALIBRATION_Y_MIN],
-            config[CONF_CALIBRATION_Y_MAX],
-        )
-    )
-
-    if CONF_SWAP_X_Y in config:
-        cg.add(var.set_swap_x_y(config[CONF_SWAP_X_Y]))
-
-    if CONF_IRQ_PIN in config:
-        pin = await cg.gpio_pin_expression(config[CONF_IRQ_PIN])
-        cg.add(var.set_irq_pin(pin))
-
-    for conf in config.get(CONF_ON_STATE, []):
-        await automation.build_automation(
-            var.get_on_state_trigger(),
-            [(cg.int_, "x"), (cg.int_, "y"), (cg.bool_, "touched")],
-            conf,
-        )
diff --git a/esphome/components/xpt2046/binary_sensor.py b/esphome/components/xpt2046/binary_sensor.py
index 6ec09a2295..5a6cfe4919 100644
--- a/esphome/components/xpt2046/binary_sensor.py
+++ b/esphome/components/xpt2046/binary_sensor.py
@@ -1,55 +1,3 @@
-import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.components import binary_sensor
 
-from . import (
-    xpt2046_ns,
-    XPT2046Component,
-    CONF_XPT2046_ID,
-)
-
-CONF_X_MIN = "x_min"
-CONF_X_MAX = "x_max"
-CONF_Y_MIN = "y_min"
-CONF_Y_MAX = "y_max"
-
-DEPENDENCIES = ["xpt2046"]
-XPT2046Button = xpt2046_ns.class_("XPT2046Button", binary_sensor.BinarySensor)
-
-
-def validate_xpt2046_button(config):
-    if cv.int_(config[CONF_X_MAX]) < cv.int_(config[CONF_X_MIN]) or cv.int_(
-        config[CONF_Y_MAX]
-    ) < cv.int_(config[CONF_Y_MIN]):
-        raise cv.Invalid("x_max is less than x_min or y_max is less than y_min")
-
-    return config
-
-
-CONFIG_SCHEMA = cv.All(
-    binary_sensor.binary_sensor_schema(XPT2046Button).extend(
-        {
-            cv.GenerateID(CONF_XPT2046_ID): cv.use_id(XPT2046Component),
-            cv.Required(CONF_X_MIN): cv.int_range(min=0, max=4095),
-            cv.Required(CONF_X_MAX): cv.int_range(min=0, max=4095),
-            cv.Required(CONF_Y_MIN): cv.int_range(min=0, max=4095),
-            cv.Required(CONF_Y_MAX): cv.int_range(min=0, max=4095),
-        }
-    ),
-    validate_xpt2046_button,
-)
-
-
-async def to_code(config):
-    var = await binary_sensor.new_binary_sensor(config)
-    hub = await cg.get_variable(config[CONF_XPT2046_ID])
-    cg.add(
-        var.set_area(
-            config[CONF_X_MIN],
-            config[CONF_X_MAX],
-            config[CONF_Y_MIN],
-            config[CONF_Y_MAX],
-        )
-    )
-
-    cg.add(hub.register_button(var))
+CONFIG_SCHEMA = cv.invalid("Rename this platform component to Touchscreen.")
diff --git a/esphome/components/xpt2046/touchscreen.py b/esphome/components/xpt2046/touchscreen.py
new file mode 100644
index 0000000000..868525ccb1
--- /dev/null
+++ b/esphome/components/xpt2046/touchscreen.py
@@ -0,0 +1,116 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+
+from esphome import pins
+from esphome.components import spi, touchscreen
+from esphome.const import CONF_ID, CONF_THRESHOLD
+
+CODEOWNERS = ["@numo68", "@nielsnl68"]
+DEPENDENCIES = ["spi"]
+
+XPT2046_ns = cg.esphome_ns.namespace("xpt2046")
+XPT2046Component = XPT2046_ns.class_(
+    "XPT2046Component", touchscreen.Touchscreen, cg.PollingComponent, spi.SPIDevice
+)
+
+CONF_INTERRUPT_PIN = "interrupt_pin"
+
+CONF_REPORT_INTERVAL = "report_interval"
+CONF_CALIBRATION_X_MIN = "calibration_x_min"
+CONF_CALIBRATION_X_MAX = "calibration_x_max"
+CONF_CALIBRATION_Y_MIN = "calibration_y_min"
+CONF_CALIBRATION_Y_MAX = "calibration_y_max"
+CONF_SWAP_X_Y = "swap_x_y"
+
+# obsolete Keys
+CONF_DIMENSION_X = "dimension_x"
+CONF_DIMENSION_Y = "dimension_y"
+CONF_IRQ_PIN = "irq_pin"
+
+
+def validate_xpt2046(config):
+    if (
+        abs(
+            cv.int_(config[CONF_CALIBRATION_X_MAX])
+            - cv.int_(config[CONF_CALIBRATION_X_MIN])
+        )
+        < 1000
+    ):
+        raise cv.Invalid("Calibration X values difference < 1000")
+
+    if (
+        abs(
+            cv.int_(config[CONF_CALIBRATION_Y_MAX])
+            - cv.int_(config[CONF_CALIBRATION_Y_MIN])
+        )
+        < 1000
+    ):
+        raise cv.Invalid("Calibration Y values difference < 1000")
+
+    return config
+
+
+def report_interval(value):
+    if value == "never":
+        return 4294967295  # uint32_t max
+    return cv.positive_time_period_milliseconds(value)
+
+
+CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(XPT2046Component),
+            cv.Optional(CONF_INTERRUPT_PIN): cv.All(
+                pins.internal_gpio_input_pin_schema
+            ),
+            cv.Optional(CONF_CALIBRATION_X_MIN, default=0): cv.int_range(
+                min=0, max=4095
+            ),
+            cv.Optional(CONF_CALIBRATION_X_MAX, default=4095): cv.int_range(
+                min=0, max=4095
+            ),
+            cv.Optional(CONF_CALIBRATION_Y_MIN, default=0): cv.int_range(
+                min=0, max=4095
+            ),
+            cv.Optional(CONF_CALIBRATION_Y_MAX, default=4095): cv.int_range(
+                min=0, max=4095
+            ),
+            cv.Optional(CONF_THRESHOLD, default=400): cv.int_range(min=0, max=4095),
+            cv.Optional(CONF_REPORT_INTERVAL, default="never"): report_interval,
+            cv.Optional(CONF_SWAP_X_Y, default=False): cv.boolean,
+            # obsolete Keys
+            cv.Optional(CONF_IRQ_PIN): cv.invalid("Rename IRQ_PIN to INTERUPT_PIN"),
+            cv.Optional(CONF_DIMENSION_X): cv.invalid(
+                "This key is now obsolete, please remove it"
+            ),
+            cv.Optional(CONF_DIMENSION_Y): cv.invalid(
+                "This key is now obsolete, please remove it"
+            ),
+        },
+    )
+    .extend(cv.polling_component_schema("50ms"))
+    .extend(spi.spi_device_schema()),
+).add_extra(validate_xpt2046)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await spi.register_spi_device(var, config)
+    await touchscreen.register_touchscreen(var, config)
+
+    cg.add(var.set_threshold(config[CONF_THRESHOLD]))
+    cg.add(var.set_report_interval(config[CONF_REPORT_INTERVAL]))
+    cg.add(var.set_swap_x_y(config[CONF_SWAP_X_Y]))
+    cg.add(
+        var.set_calibration(
+            config[CONF_CALIBRATION_X_MIN],
+            config[CONF_CALIBRATION_X_MAX],
+            config[CONF_CALIBRATION_Y_MIN],
+            config[CONF_CALIBRATION_Y_MAX],
+        )
+    )
+
+    if CONF_INTERRUPT_PIN in config:
+        pin = await cg.gpio_pin_expression(config[CONF_INTERRUPT_PIN])
+        cg.add(var.set_irq_pin(pin))
diff --git a/esphome/components/xpt2046/xpt2046.cpp b/esphome/components/xpt2046/xpt2046.cpp
index aaadeea52e..d6cbe39aa0 100644
--- a/esphome/components/xpt2046/xpt2046.cpp
+++ b/esphome/components/xpt2046/xpt2046.cpp
@@ -9,31 +9,38 @@ namespace xpt2046 {
 
 static const char *const TAG = "xpt2046";
 
+void XPT2046TouchscreenStore::gpio_intr(XPT2046TouchscreenStore *store) { store->touch = true; }
+
 void XPT2046Component::setup() {
   if (this->irq_pin_ != nullptr) {
     // The pin reports a touch with a falling edge. Unfortunately the pin goes also changes state
     // while the channels are read and wiring it as an interrupt is not straightforward and would
     // need careful masking. A GPIO poll is cheap so we'll just use that.
+
     this->irq_pin_->setup();  // INPUT
+    this->irq_pin_->pin_mode(gpio::FLAG_INPUT | gpio::FLAG_PULLUP);
+    this->irq_pin_->setup();
+
+    this->store_.pin = this->irq_pin_->to_isr();
+    this->irq_pin_->attach_interrupt(XPT2046TouchscreenStore::gpio_intr, &this->store_, gpio::INTERRUPT_FALLING_EDGE);
   }
   spi_setup();
   read_adc_(0xD0);  // ADC powerdown, enable PENIRQ pin
 }
 
 void XPT2046Component::loop() {
-  if (this->irq_pin_ != nullptr) {
-    // Force immediate update if a falling edge (= touched is seen) Ignore if still active
-    // (that would mean that we missed the release because of a too long update interval)
-    bool val = this->irq_pin_->digital_read();
-    if (!val && this->last_irq_ && !this->touched) {
-      ESP_LOGD(TAG, "Falling penirq edge, forcing update");
-      update();
-    }
-    this->last_irq_ = val;
-  }
+  if ((this->irq_pin_ == nullptr) || (!this->store_.touch))
+    return;
+  this->store_.touch = false;
+  check_touch_();
 }
 
 void XPT2046Component::update() {
+  if (this->irq_pin_ == nullptr)
+    check_touch_();
+}
+
+void XPT2046Component::check_touch_() {
   int16_t data[6];
   bool touch = false;
   uint32_t now = millis();
@@ -42,13 +49,13 @@ void XPT2046Component::update() {
 
   // In case the penirq pin is present only do the SPI transaction if it reports a touch (is low).
   // The touch has to be also confirmed with checking the pressure over threshold
-  if (this->irq_pin_ == nullptr || !this->irq_pin_->digital_read()) {
+  if ((this->irq_pin_ == nullptr) || !this->irq_pin_->digital_read()) {
     enable();
 
-    int16_t z1 = read_adc_(0xB1 /* Z1 */);
-    int16_t z2 = read_adc_(0xC1 /* Z2 */);
+    int16_t touch_pressure_1 = read_adc_(0xB1 /* touch_pressure_1 */);
+    int16_t touch_pressure_2 = read_adc_(0xC1 /* touch_pressure_2 */);
 
-    this->z_raw = z1 + 4095 - z2;
+    this->z_raw = touch_pressure_1 + 4095 - touch_pressure_2;
 
     touch = (this->z_raw >= this->threshold_);
     if (touch) {
@@ -63,64 +70,73 @@ void XPT2046Component::update() {
     data[5] = read_adc_(0x90 /* Y */);  // Last Y touch power down
 
     disable();
-  }
 
-  if (touch) {
-    this->x_raw = best_two_avg(data[0], data[2], data[4]);
-    this->y_raw = best_two_avg(data[1], data[3], data[5]);
-  } else {
-    this->x_raw = this->y_raw = 0;
-  }
+    if (touch) {
+      this->x_raw = best_two_avg(data[0], data[2], data[4]);
+      this->y_raw = best_two_avg(data[1], data[3], data[5]);
 
-  ESP_LOGV(TAG, "Update [x, y] = [%d, %d], z = %d%s", this->x_raw, this->y_raw, this->z_raw, (touch ? " touched" : ""));
+      ESP_LOGVV(TAG, "Update [x, y] = [%d, %d], z = %d", this->x_raw, this->y_raw, this->z_raw);
 
-  if (touch) {
-    // Normalize raw data according to calibration min and max
+      TouchPoint touchpoint;
 
-    int16_t x_val = normalize(this->x_raw, this->x_raw_min_, this->x_raw_max_);
-    int16_t y_val = normalize(this->y_raw, this->y_raw_min_, this->y_raw_max_);
+      touchpoint.x = normalize(this->x_raw, this->x_raw_min_, this->x_raw_max_);
+      touchpoint.y = normalize(this->y_raw, this->y_raw_min_, this->y_raw_max_);
 
-    if (this->swap_x_y_) {
-      std::swap(x_val, y_val);
-    }
+      if (this->swap_x_y_) {
+        std::swap(touchpoint.x, touchpoint.y);
+      }
 
-    if (this->invert_x_) {
-      x_val = 0x7fff - x_val;
-    }
+      if (this->invert_x_) {
+        touchpoint.x = 0xfff - touchpoint.x;
+      }
 
-    if (this->invert_y_) {
-      y_val = 0x7fff - y_val;
-    }
+      if (this->invert_y_) {
+        touchpoint.y = 0xfff - touchpoint.y;
+      }
 
-    x_val = (int16_t)((int) x_val * this->x_dim_ / 0x7fff);
-    y_val = (int16_t)((int) y_val * this->y_dim_ / 0x7fff);
+      switch (static_cast<TouchRotation>(this->display_->get_rotation())) {
+        case ROTATE_0_DEGREES:
+          break;
+        case ROTATE_90_DEGREES:
+          std::swap(touchpoint.x, touchpoint.y);
+          touchpoint.y = 0xfff - touchpoint.y;
+          break;
+        case ROTATE_180_DEGREES:
+          touchpoint.x = 0xfff - touchpoint.x;
+          touchpoint.y = 0xfff - touchpoint.y;
+          break;
+        case ROTATE_270_DEGREES:
+          std::swap(touchpoint.x, touchpoint.y);
+          touchpoint.x = 0xfff - touchpoint.x;
+          break;
+      }
 
-    if (!this->touched || (now - this->last_pos_ms_) >= this->report_millis_) {
-      ESP_LOGD(TAG, "Raw [x, y] = [%d, %d], transformed = [%d, %d]", this->x_raw, this->y_raw, x_val, y_val);
+      touchpoint.x = (int16_t)((int) touchpoint.x * this->display_->get_width() / 0xfff);
+      touchpoint.y = (int16_t)((int) touchpoint.y * this->display_->get_height() / 0xfff);
 
-      this->x = x_val;
-      this->y = y_val;
-      this->touched = true;
-      this->last_pos_ms_ = now;
+      if (!this->touched || (now - this->last_pos_ms_) >= this->report_millis_) {
+        ESP_LOGV(TAG, "Touching at [%03X, %03X] => [%3d, %3d]", this->x_raw, this->y_raw, touchpoint.x, touchpoint.y);
 
-      this->on_state_trigger_->process(this->x, this->y, true);
-      for (auto *button : this->buttons_)
-        button->touch(this->x, this->y);
-    }
-  } else {
-    if (this->touched) {
-      ESP_LOGD(TAG, "Released [%d, %d]", this->x, this->y);
+        this->defer([this, touchpoint]() { this->send_touch_(touchpoint); });
 
-      this->touched = false;
-
-      this->on_state_trigger_->process(this->x, this->y, false);
-      for (auto *button : this->buttons_)
-        button->release();
+        this->x = touchpoint.x;
+        this->y = touchpoint.y;
+        this->touched = true;
+        this->last_pos_ms_ = now;
+      }
+    } else {
+      this->x_raw = this->y_raw = 0;
+      if (this->touched) {
+        ESP_LOGV(TAG, "Released [%d, %d]", this->x, this->y);
+        this->touched = false;
+        for (auto *listener : this->touch_listeners_)
+          listener->release();
+      }
     }
   }
 }
 
-void XPT2046Component::set_calibration(int16_t x_min, int16_t x_max, int16_t y_min, int16_t y_max) {
+void XPT2046Component::set_calibration(int16_t x_min, int16_t x_max, int16_t y_min, int16_t y_max) {  // NOLINT
   this->x_raw_min_ = std::min(x_min, x_max);
   this->x_raw_max_ = std::max(x_min, x_max);
   this->y_raw_min_ = std::min(y_min, y_max);
@@ -137,11 +153,11 @@ void XPT2046Component::dump_config() {
   ESP_LOGCONFIG(TAG, "  X max: %d", this->x_raw_max_);
   ESP_LOGCONFIG(TAG, "  Y min: %d", this->y_raw_min_);
   ESP_LOGCONFIG(TAG, "  Y max: %d", this->y_raw_max_);
-  ESP_LOGCONFIG(TAG, "  X dim: %d", this->x_dim_);
-  ESP_LOGCONFIG(TAG, "  Y dim: %d", this->y_dim_);
-  if (this->swap_x_y_) {
-    ESP_LOGCONFIG(TAG, "  Swap X/Y");
-  }
+
+  ESP_LOGCONFIG(TAG, "  Swap X/Y: %s", YESNO(this->swap_x_y_));
+  ESP_LOGCONFIG(TAG, "  Invert X: %s", YESNO(this->invert_x_));
+  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_);
 
@@ -150,8 +166,8 @@ void XPT2046Component::dump_config() {
 
 float XPT2046Component::get_setup_priority() const { return setup_priority::DATA; }
 
-int16_t XPT2046Component::best_two_avg(int16_t x, int16_t y, int16_t z) {
-  int16_t da, db, dc;
+int16_t XPT2046Component::best_two_avg(int16_t x, int16_t y, int16_t z) {  // NOLINT
+  int16_t da, db, dc;                                                      // NOLINT
   int16_t reta = 0;
 
   da = (x > y) ? x - y : y - x;
@@ -175,15 +191,15 @@ int16_t XPT2046Component::normalize(int16_t val, int16_t min_val, int16_t max_va
   if (val <= min_val) {
     ret = 0;
   } else if (val >= max_val) {
-    ret = 0x7fff;
+    ret = 0xfff;
   } else {
-    ret = (int16_t)((int) 0x7fff * (val - min_val) / (max_val - min_val));
+    ret = (int16_t)((int) 0xfff * (val - min_val) / (max_val - min_val));
   }
 
   return ret;
 }
 
-int16_t XPT2046Component::read_adc_(uint8_t ctrl) {
+int16_t XPT2046Component::read_adc_(uint8_t ctrl) {  // NOLINT
   uint8_t data[2];
 
   write_byte(ctrl);
@@ -193,25 +209,5 @@ int16_t XPT2046Component::read_adc_(uint8_t ctrl) {
   return ((data[0] << 8) | data[1]) >> 3;
 }
 
-void XPT2046OnStateTrigger::process(int x, int y, bool touched) { this->trigger(x, y, touched); }
-
-void XPT2046Button::touch(int16_t x, int16_t y) {
-  bool touched = (x >= this->x_min_ && x <= this->x_max_ && y >= this->y_min_ && y <= this->y_max_);
-
-  if (touched) {
-    this->publish_state(true);
-    this->state_ = true;
-  } else {
-    release();
-  }
-}
-
-void XPT2046Button::release() {
-  if (this->state_) {
-    this->publish_state(false);
-    this->state_ = false;
-  }
-}
-
 }  // namespace xpt2046
 }  // namespace esphome
diff --git a/esphome/components/xpt2046/xpt2046.h b/esphome/components/xpt2046/xpt2046.h
index e7270f7d7d..c3d0462c6a 100644
--- a/esphome/components/xpt2046/xpt2046.h
+++ b/esphome/components/xpt2046/xpt2046.h
@@ -3,42 +3,31 @@
 #include "esphome/core/component.h"
 #include "esphome/core/automation.h"
 #include "esphome/components/spi/spi.h"
-#include "esphome/components/binary_sensor/binary_sensor.h"
+#include "esphome/components/touchscreen/touchscreen.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
 
 namespace esphome {
 namespace xpt2046 {
 
-class XPT2046OnStateTrigger : public Trigger<int, int, bool> {
- public:
-  void process(int x, int y, bool touched);
+using namespace touchscreen;
+
+struct XPT2046TouchscreenStore {
+  volatile bool touch;
+  ISRInternalGPIOPin pin;
+
+  static void gpio_intr(XPT2046TouchscreenStore *store);
 };
 
-class XPT2046Button : public binary_sensor::BinarySensor {
- public:
-  /// Set the touch screen area where the button will detect the touch.
-  void set_area(int16_t x_min, int16_t x_max, int16_t y_min, int16_t y_max) {
-    this->x_min_ = x_min;
-    this->x_max_ = x_max;
-    this->y_min_ = y_min;
-    this->y_max_ = y_max;
-  }
-
-  void touch(int16_t x, int16_t y);
-  void release();
-
- protected:
-  int16_t x_min_, x_max_, y_min_, y_max_;
-  bool state_{false};
-};
-
-class XPT2046Component : public PollingComponent,
+class XPT2046Component : public Touchscreen,
+                         public PollingComponent,
                          public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
                                                spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_2MHZ> {
  public:
   /// Set the logical touch screen dimensions.
   void set_dimensions(int16_t x, int16_t y) {
-    this->x_dim_ = x;
-    this->y_dim_ = y;
+    this->display_width_ = x;
+    this->display_height_ = y;
   }
   /// Set the coordinates for the touch screen edges.
   void set_calibration(int16_t x_min, int16_t x_max, int16_t y_min, int16_t y_max);
@@ -47,14 +36,12 @@ class XPT2046Component : public PollingComponent,
 
   /// Set the interval to report the touch point perodically.
   void set_report_interval(uint32_t interval) { this->report_millis_ = interval; }
+  uint32_t get_report_interval() { return this->report_millis_; }
+
   /// Set the threshold for the touch detection.
   void set_threshold(int16_t threshold) { this->threshold_ = threshold; }
   /// Set the pin used to detect the touch.
-  void set_irq_pin(GPIOPin *pin) { this->irq_pin_ = pin; }
-  /// Get an access to the on_state automation trigger
-  XPT2046OnStateTrigger *get_on_state_trigger() const { return this->on_state_trigger_; }
-  /// Register a virtual button to the component.
-  void register_button(XPT2046Button *button) { this->buttons_.push_back(button); }
+  void set_irq_pin(InternalGPIOPin *pin) { this->irq_pin_ = pin; }
 
   void setup() override;
   void dump_config() override;
@@ -103,21 +90,19 @@ class XPT2046Component : public PollingComponent,
   static int16_t normalize(int16_t val, int16_t min_val, int16_t max_val);
 
   int16_t read_adc_(uint8_t ctrl);
+  void check_touch_();
 
   int16_t threshold_;
   int16_t x_raw_min_, x_raw_max_, y_raw_min_, y_raw_max_;
-  int16_t x_dim_, y_dim_;
+
   bool invert_x_, invert_y_;
   bool swap_x_y_;
 
   uint32_t report_millis_;
   uint32_t last_pos_ms_{0};
 
-  GPIOPin *irq_pin_{nullptr};
-  bool last_irq_{true};
-
-  XPT2046OnStateTrigger *on_state_trigger_{new XPT2046OnStateTrigger()};
-  std::vector<XPT2046Button *> buttons_{};
+  InternalGPIOPin *irq_pin_{nullptr};
+  XPT2046TouchscreenStore store_;
 };
 
 }  // namespace xpt2046
diff --git a/tests/test4.yaml b/tests/test4.yaml
index 6293e0f7b7..cf517bb391 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -348,15 +348,16 @@ binary_sensor:
     on_state:
       then:
         - lambda: 'ESP_LOGI("ar1:", "%d", x);'
-  - platform: xpt2046
-    xpt2046_id: xpt_touchscreen
+  - platform: touchscreen
+    touchscreen_id: xpt_touchscreen
     id: touch_key0
     x_min: 80
     x_max: 160
     y_min: 106
     y_max: 212
-    on_state:
-      - lambda: 'ESP_LOGI("main", "key0: %s", (x ? "touch" : "release"));'
+    on_press:
+      - logger.log: Touched
+
   - platform: gpio
     name: GPIO SX1509 test
     pin:
@@ -598,33 +599,6 @@ external_components:
     components: [bh1750]
   - source: ../esphome/components
     components: [sntp]
-xpt2046:
-  id: xpt_touchscreen
-  cs_pin: 17
-  irq_pin: 16
-  update_interval: 50ms
-  report_interval: 1s
-  threshold: 400
-  dimension_x: 240
-  dimension_y: 320
-  calibration_x_min: 3860
-  calibration_x_max: 280
-  calibration_y_min: 340
-  calibration_y_max: 3860
-  swap_x_y: false
-  on_state:
-    # yamllint disable rule:line-length
-    - lambda: |-
-        ESP_LOGI("main", "args x=%d, y=%d, touched=%s", x, y, (touched ? "touch" : "release"));
-        ESP_LOGI("main", "member x=%d, y=%d, touched=%d, x_raw=%d, y_raw=%d, z_raw=%d",
-            id(xpt_touchscreen).x,
-            id(xpt_touchscreen).y,
-            (int) id(xpt_touchscreen).touched,
-            id(xpt_touchscreen).x_raw,
-            id(xpt_touchscreen).y_raw,
-            id(xpt_touchscreen).z_raw
-            );
-    # yamllint enable rule:line-length
 
 button:
   - platform: restart
@@ -648,6 +622,25 @@ touchscreen:
           format: Touch at (%d, %d)
           args: [touch.x, touch.y]
 
+  - platform: xpt2046
+    id: xpt_touchscreen
+    cs_pin: 17
+    interrupt_pin: 16
+    display: inkplate_display
+    update_interval: 50ms
+    report_interval: 1s
+    threshold: 400
+    calibration_x_min: 3860
+    calibration_x_max: 280
+    calibration_y_min: 340
+    calibration_y_max: 3860
+    swap_x_y: false
+    on_touch:
+      - logger.log:
+          format: Touch at (%d, %d)
+          args: [touch.x, touch.y]
+
+
   - platform: lilygo_t5_47
     id: lilygo_touchscreen
     interrupt_pin: GPIO36

From edff9ae3222733822bb0de78532038d4e53c960a Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Tue, 11 Oct 2022 01:01:31 +0200
Subject: [PATCH 126/838] Proxy friendly host url resolution for `use_address`
 with path. (#3653)

---
 esphome/helpers.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/esphome/helpers.py b/esphome/helpers.py
index 85a767036a..b5a6306342 100644
--- a/esphome/helpers.py
+++ b/esphome/helpers.py
@@ -6,6 +6,7 @@ import os
 from pathlib import Path
 from typing import Union
 import tempfile
+from urllib.parse import urlparse
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -134,7 +135,8 @@ def resolve_ip_address(host):
             errs.append(str(err))
 
     try:
-        return socket.gethostbyname(host)
+        host_url = host if (urlparse(host).scheme != "") else "http://" + host
+        return socket.gethostbyname(urlparse(host_url).hostname)
     except OSError as err:
         errs.append(str(err))
         raise EsphomeError(f"Error resolving IP address: {', '.join(errs)}") from err

From de23bbace21bcf88cf645dff3afb7735c13c0d3d Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 11 Oct 2022 12:01:41 +1300
Subject: [PATCH 127/838] Update webserver index file (#3896)

---
 esphome/components/web_server/server_index.h | 116 ++++++++++---------
 1 file changed, 59 insertions(+), 57 deletions(-)

diff --git a/esphome/components/web_server/server_index.h b/esphome/components/web_server/server_index.h
index 75c7130151..c02ef279b7 100644
--- a/esphome/components/web_server/server_index.h
+++ b/esphome/components/web_server/server_index.h
@@ -6,7 +6,7 @@ namespace esphome {
 namespace web_server {
 
 const uint8_t INDEX_GZ[] PROGMEM = {
-    0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0xbd, 0x7d, 0xd9, 0x76, 0xdb, 0xc8, 0x92, 0xe0, 0xf3,
+    0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xbd, 0x7d, 0xd9, 0x76, 0xdb, 0xc8, 0x92, 0xe0, 0xf3,
     0x9c, 0x33, 0x7f, 0x30, 0x2f, 0x30, 0x4a, 0x6d, 0x03, 0x25, 0x10, 0x22, 0x29, 0xcb, 0x76, 0x81, 0x02, 0x79, 0xe5,
     0xa5, 0xae, 0x5d, 0xe5, 0xad, 0x2c, 0xd9, 0x75, 0xab, 0x54, 0x2c, 0x0b, 0x22, 0x93, 0x22, 0xca, 0x20, 0xc0, 0x02,
     0x92, 0x5a, 0x8a, 0x42, 0x9f, 0x7e, 0xea, 0xa7, 0x39, 0x67, 0xd6, 0x87, 0x7e, 0x99, 0xd3, 0xfd, 0x30, 0x1f, 0x31,
@@ -524,62 +524,64 @@ const uint8_t INDEX_GZ[] PROGMEM = {
     0x5b, 0x06, 0xb9, 0xff, 0xfc, 0x07, 0x47, 0x40, 0x7e, 0x68, 0x06, 0xb9, 0xf7, 0xd8, 0x4a, 0xa0, 0xa3, 0xe9, 0xac,
     0x3d, 0x67, 0xce, 0xe1, 0x8f, 0x6c, 0x88, 0x69, 0xd3, 0xd0, 0xfa, 0x2f, 0xb5, 0x78, 0x50, 0x86, 0x1b, 0x79, 0x8f,
     0x89, 0x9d, 0xcc, 0xf8, 0x15, 0x04, 0xe1, 0xfc, 0x46, 0x82, 0xbc, 0xb8, 0x1d, 0x3d, 0x38, 0xff, 0x63, 0xe9, 0x41,
-    0x5f, 0xee, 0x57, 0xf4, 0xa8, 0x45, 0xdc, 0x29, 0x62, 0x40, 0x8e, 0xfe, 0x3e, 0xbd, 0x3b, 0xf6, 0x16, 0xc3, 0xb7,
-    0xc2, 0x16, 0xb9, 0x80, 0xef, 0x3e, 0xe7, 0x74, 0x40, 0x64, 0x15, 0x87, 0xb6, 0x0c, 0xc0, 0xcc, 0xf1, 0xdb, 0xb4,
-    0xea, 0xe5, 0x54, 0xdc, 0x5c, 0x09, 0xe9, 0xda, 0xd9, 0x8e, 0x0e, 0xde, 0x60, 0xa2, 0x77, 0xb8, 0xcc, 0x78, 0x84,
-    0xbf, 0xfc, 0x88, 0xc7, 0x3c, 0xc1, 0x4b, 0xb1, 0xf2, 0x02, 0x19, 0xe6, 0x25, 0x7f, 0x87, 0x39, 0xd5, 0xea, 0x90,
-    0x60, 0x86, 0x01, 0x83, 0x57, 0x6c, 0x1c, 0x47, 0x8e, 0xed, 0xcc, 0x61, 0xc7, 0xc2, 0x98, 0xad, 0x5a, 0x42, 0x33,
-    0xe5, 0x32, 0xbb, 0xb6, 0xfa, 0x7d, 0x3b, 0x39, 0x7e, 0xbf, 0x2c, 0x3c, 0x94, 0x01, 0x46, 0x5b, 0x7a, 0x00, 0x30,
-    0xbe, 0x2a, 0xc9, 0x51, 0xd8, 0x57, 0x56, 0x83, 0x2d, 0xcc, 0x86, 0x8e, 0xdf, 0x05, 0x37, 0x82, 0x8a, 0xf1, 0x7b,
-    0x50, 0x3f, 0x38, 0xad, 0x6d, 0x30, 0x6b, 0x8c, 0x6e, 0x7a, 0xa0, 0xe1, 0x4a, 0x18, 0x49, 0x04, 0x07, 0x1a, 0xa5,
-    0x9e, 0xfe, 0x05, 0x64, 0x55, 0xb8, 0xa8, 0x78, 0x7c, 0x71, 0x20, 0xef, 0x7c, 0xdb, 0x18, 0xb9, 0xa5, 0x88, 0x7d,
-    0xf5, 0xbd, 0xa9, 0x4d, 0x50, 0x17, 0xf4, 0x5b, 0x20, 0xe9, 0xdc, 0x1b, 0x35, 0x02, 0xa6, 0x5c, 0x5b, 0xd2, 0x73,
-    0x08, 0x6d, 0xa1, 0x0f, 0xc6, 0xec, 0x34, 0x1e, 0x49, 0xb1, 0xee, 0x59, 0xf2, 0xaa, 0x48, 0x8b, 0xb0, 0x08, 0x3b,
-    0x9e, 0xf0, 0x9d, 0xe1, 0x05, 0xb5, 0x5a, 0x98, 0x66, 0x76, 0xff, 0x5e, 0x4f, 0x43, 0x52, 0xcf, 0x56, 0xb7, 0xf1,
-    0x57, 0x52, 0x1e, 0x82, 0xaf, 0xf6, 0xf7, 0xe1, 0x3d, 0xfc, 0xa5, 0x94, 0xf7, 0x86, 0xb6, 0xeb, 0x93, 0x50, 0xbc,
-    0x57, 0xfd, 0x66, 0x4a, 0x94, 0x08, 0x9b, 0xa0, 0xbf, 0xbc, 0xdb, 0x2a, 0x32, 0xa9, 0xb4, 0xba, 0x3b, 0x95, 0xd2,
-    0x82, 0x67, 0x43, 0x4a, 0x81, 0x00, 0xed, 0xfa, 0x3b, 0x86, 0x28, 0x3c, 0x6d, 0xe1, 0xcf, 0x9a, 0x30, 0xbc, 0x0f,
-    0x0d, 0x94, 0x34, 0x7c, 0x09, 0xcd, 0xb7, 0x85, 0xe0, 0x85, 0x7e, 0x3f, 0x92, 0xa8, 0x12, 0x62, 0xaa, 0xce, 0x31,
-    0x6b, 0x0e, 0x91, 0x44, 0x8e, 0x80, 0xed, 0x19, 0xf1, 0x26, 0xc1, 0xae, 0x32, 0x9a, 0xf2, 0x14, 0xfa, 0x3a, 0xfa,
-    0x33, 0xce, 0xeb, 0xea, 0xbc, 0xda, 0xce, 0x59, 0x33, 0x05, 0x32, 0x7c, 0xe3, 0xa0, 0x8a, 0xae, 0x2e, 0x88, 0xcf,
-    0x99, 0x89, 0x6d, 0x5c, 0x7d, 0xf0, 0x6d, 0x4d, 0xf6, 0xad, 0xb9, 0x29, 0x58, 0xc5, 0x34, 0xb4, 0x2f, 0x30, 0x65,
-    0x06, 0x7f, 0x56, 0xc5, 0xea, 0x41, 0x32, 0x94, 0x9f, 0x44, 0xf8, 0xdb, 0x58, 0xe8, 0x47, 0x59, 0x6d, 0x40, 0x4e,
-    0xdf, 0xab, 0x24, 0x48, 0x5f, 0x8c, 0xcb, 0x26, 0x12, 0x60, 0x2f, 0xe0, 0x2f, 0xf7, 0xab, 0xae, 0x4a, 0xc8, 0x3b,
-    0x90, 0x98, 0x53, 0x30, 0x8e, 0x73, 0xba, 0x5a, 0xab, 0xf0, 0xaf, 0x45, 0x34, 0x2b, 0x52, 0xd3, 0xae, 0x64, 0xc5,
-    0xc0, 0xc6, 0x22, 0x3b, 0x90, 0xc9, 0x68, 0xe6, 0x07, 0x9b, 0xcd, 0xbb, 0x8f, 0x63, 0x91, 0x87, 0x86, 0x1f, 0xb4,
-    0xb7, 0x05, 0x91, 0x6d, 0x10, 0x63, 0x57, 0xe2, 0x44, 0xc6, 0x0d, 0x5e, 0x19, 0xac, 0x7e, 0x43, 0x91, 0xb9, 0xe1,
-    0x6d, 0x73, 0xb5, 0xf4, 0xb8, 0xb4, 0x0e, 0xae, 0x8c, 0xdf, 0x1d, 0xb3, 0x88, 0xfb, 0x51, 0x4a, 0xb9, 0x49, 0x8e,
-    0x21, 0x16, 0xbc, 0x0e, 0xdb, 0x76, 0x4b, 0x90, 0x3c, 0xc6, 0xaf, 0x70, 0x12, 0xa4, 0xf7, 0xa1, 0xb0, 0x4a, 0xd8,
-    0xda, 0x9d, 0x76, 0xfb, 0x6f, 0x0e, 0xf6, 0x2c, 0xb1, 0x9b, 0x77, 0xb7, 0xe0, 0x75, 0x97, 0xdc, 0x61, 0x91, 0x9f,
-    0x11, 0x8a, 0xfc, 0x0c, 0x4b, 0x24, 0x74, 0x85, 0xf6, 0x96, 0x40, 0xd3, 0xb6, 0x58, 0x3a, 0x12, 0x31, 0xbc, 0x19,
-    0xb8, 0x0b, 0x31, 0x7e, 0xd4, 0x6b, 0x0b, 0xbb, 0xb5, 0x70, 0xa5, 0x6d, 0x95, 0xe1, 0xa2, 0x0c, 0x04, 0x9e, 0xaa,
-    0x88, 0x1f, 0xa8, 0x75, 0xa6, 0x92, 0x5d, 0xe4, 0x50, 0x3a, 0x27, 0x75, 0xb5, 0x75, 0xb1, 0x38, 0x9e, 0x81, 0x1c,
-    0x52, 0x09, 0x2a, 0xef, 0x65, 0x87, 0x5d, 0x9a, 0x0a, 0x93, 0x62, 0x57, 0x23, 0x92, 0xd3, 0x4e, 0x7f, 0x37, 0x92,
-    0xf6, 0x0e, 0xee, 0xdd, 0x02, 0x36, 0x2f, 0xa8, 0x39, 0x34, 0x2a, 0xfc, 0x38, 0xdb, 0x3a, 0x63, 0xc7, 0xad, 0x68,
-    0x1e, 0x57, 0xe1, 0x3f, 0xd4, 0x7e, 0xfd, 0x5d, 0xa5, 0x08, 0x65, 0x9a, 0xa5, 0x7c, 0x8c, 0x8c, 0x2c, 0x0e, 0x24,
-    0x1c, 0x31, 0x68, 0x29, 0x63, 0x8b, 0x64, 0x34, 0x02, 0xf1, 0x01, 0x56, 0xe2, 0x5f, 0x15, 0x83, 0x94, 0x9a, 0xa0,
-    0xb4, 0xfb, 0x7f, 0xfd, 0x5f, 0xff, 0x5b, 0x86, 0x15, 0x81, 0xac, 0x00, 0x16, 0xa6, 0xc1, 0x54, 0x27, 0x8c, 0xec,
-    0x1c, 0x1c, 0xd1, 0x78, 0xdc, 0x9a, 0x46, 0xc9, 0x04, 0x20, 0x28, 0x98, 0xb8, 0xca, 0x24, 0xeb, 0x81, 0x0b, 0x24,
-    0x58, 0xe6, 0xe1, 0xbc, 0x04, 0xaf, 0x5e, 0x84, 0x2b, 0xf6, 0xbb, 0xf2, 0x56, 0x55, 0xbe, 0x30, 0x31, 0xb4, 0x91,
-    0xc5, 0x6a, 0xf0, 0x5c, 0x2d, 0x93, 0x55, 0xfd, 0x82, 0x24, 0x29, 0x3c, 0x58, 0x2d, 0x8d, 0x15, 0x5a, 0xea, 0x83,
-    0x90, 0x7f, 0xfb, 0xe7, 0xff, 0xfc, 0xdf, 0xd5, 0x2b, 0x9e, 0x6f, 0xfc, 0xf5, 0x9f, 0xfe, 0xe1, 0xff, 0xfe, 0x9f,
-    0xff, 0x82, 0x59, 0xc2, 0xf2, 0x0c, 0x84, 0xb6, 0x92, 0x55, 0x1d, 0x80, 0x88, 0x3d, 0x65, 0x55, 0x0e, 0x47, 0x3d,
-    0xdd, 0x75, 0x9f, 0x26, 0x24, 0xde, 0x94, 0xd0, 0x11, 0x5f, 0x53, 0x7a, 0x34, 0x51, 0xed, 0x1a, 0xf2, 0xc1, 0x52,
-    0x5a, 0x74, 0xac, 0x6f, 0xef, 0xb4, 0xed, 0x6a, 0x79, 0xfb, 0x46, 0xdf, 0x2d, 0x5c, 0x98, 0x5b, 0x65, 0xe0, 0xf8,
-    0x7a, 0xd9, 0x96, 0x2a, 0x8c, 0x85, 0x25, 0x65, 0x55, 0x6e, 0x61, 0x7c, 0x79, 0x89, 0xaf, 0x41, 0xd7, 0x28, 0xa6,
-    0x55, 0xae, 0xf5, 0xe9, 0xfd, 0xb2, 0x00, 0x44, 0x27, 0xb8, 0x34, 0x22, 0x58, 0x46, 0x67, 0xa7, 0x2d, 0xb4, 0x4e,
-    0x92, 0x8b, 0x92, 0x46, 0x11, 0xde, 0xcc, 0xfd, 0x47, 0x7f, 0x57, 0xfe, 0x69, 0x86, 0x56, 0x81, 0xe5, 0xcc, 0xa2,
-    0x73, 0xe9, 0xe3, 0x3c, 0x68, 0xb7, 0xe7, 0xe7, 0xee, 0xb2, 0x9a, 0xc1, 0xbb, 0x6a, 0x32, 0x0a, 0xb0, 0x99, 0x03,
-    0xd2, 0xa1, 0xab, 0x8e, 0xe5, 0x81, 0x59, 0xdf, 0xc6, 0xd0, 0x4f, 0x59, 0x7e, 0xb9, 0xa4, 0x70, 0x52, 0xfc, 0x1b,
-    0x1e, 0x8e, 0xca, 0xc8, 0x1b, 0x94, 0x18, 0x58, 0x2c, 0x8d, 0x5e, 0x5d, 0xd1, 0x6b, 0xda, 0x59, 0xcd, 0x4d, 0x31,
-    0x0f, 0x77, 0xcd, 0x63, 0xd9, 0xfb, 0x78, 0xd0, 0x3a, 0xed, 0x78, 0xd3, 0xee, 0x52, 0x0f, 0xcf, 0x79, 0x36, 0x33,
-    0x4f, 0x73, 0x59, 0xc4, 0x46, 0x6c, 0xa2, 0x22, 0x96, 0xb2, 0x5e, 0x9c, 0xd4, 0x96, 0x5f, 0xe0, 0x76, 0x03, 0xda,
-    0x66, 0x11, 0x0f, 0x88, 0x69, 0x7b, 0xe6, 0x79, 0x6f, 0x84, 0x27, 0xe9, 0xd9, 0xd2, 0x98, 0xab, 0x27, 0x9a, 0x62,
-    0x5c, 0xb0, 0x9e, 0xf7, 0x53, 0xfa, 0xd4, 0xdd, 0x1c, 0x4a, 0x84, 0x15, 0x5e, 0xc8, 0x63, 0xd4, 0x77, 0x35, 0x7f,
-    0x5c, 0x8a, 0x62, 0x70, 0x81, 0xd7, 0xd6, 0x0b, 0xb5, 0x28, 0x6a, 0x5f, 0x80, 0xb5, 0x43, 0x60, 0xda, 0xcd, 0x56,
-    0x54, 0x88, 0xad, 0xde, 0x85, 0x2f, 0xb4, 0xed, 0x1d, 0xcd, 0xe7, 0xd4, 0xd0, 0x05, 0x6e, 0x24, 0x1b, 0x1a, 0x25,
-    0x05, 0xa5, 0x08, 0x88, 0x13, 0x79, 0xd9, 0x46, 0xb2, 0xad, 0x78, 0x92, 0x67, 0xf5, 0xf4, 0xfb, 0xb6, 0xff, 0x1f,
-    0x22, 0x28, 0x4d, 0x5d, 0x85, 0x7b, 0x00, 0x00};
+    0x5f, 0xee, 0x57, 0xf4, 0xd0, 0x49, 0xe1, 0x85, 0xf1, 0xfb, 0x57, 0x16, 0x79, 0xa2, 0xaf, 0xa8, 0x65, 0x23, 0xca,
+    0xf4, 0xf4, 0x91, 0x97, 0xe8, 0x9e, 0x20, 0x54, 0x6e, 0x86, 0xf0, 0x9f, 0xf1, 0x09, 0xb0, 0x2d, 0xfc, 0xd4, 0x9c,
+    0x1d, 0xc0, 0x4f, 0xaa, 0xb5, 0x19, 0xc6, 0x0a, 0x0a, 0xbb, 0xac, 0x85, 0xf3, 0x29, 0x1c, 0x41, 0x51, 0x84, 0x7d,
+    0x7a, 0x77, 0x70, 0x46, 0x91, 0x63, 0xf8, 0xee, 0x73, 0x4e, 0x1d, 0x44, 0xb6, 0x72, 0x68, 0xcb, 0xc0, 0xce, 0x1c,
+    0xbf, 0x79, 0xab, 0x5e, 0x4e, 0xc5, 0x8d, 0x98, 0x90, 0xae, 0xb3, 0xed, 0xe8, 0xa0, 0x10, 0x26, 0x90, 0x87, 0xcb,
+    0x8c, 0x47, 0xf8, 0x4b, 0x95, 0x78, 0xcc, 0x13, 0xbc, 0x6c, 0x2b, 0x2f, 0xa6, 0x61, 0xbe, 0xf3, 0x77, 0x98, 0xab,
+    0xad, 0x30, 0x9e, 0x61, 0x20, 0xe2, 0x15, 0x1b, 0xc7, 0x91, 0x63, 0x3b, 0x73, 0x90, 0x04, 0x30, 0x66, 0xab, 0x96,
+    0x28, 0x4d, 0x39, 0xd2, 0xae, 0xad, 0x7e, 0x8f, 0x4f, 0x8e, 0xdf, 0x45, 0x0b, 0x0f, 0x65, 0xe0, 0xd2, 0x96, 0x9e,
+    0x05, 0x8c, 0xaf, 0x4a, 0x72, 0x54, 0x22, 0x95, 0x35, 0x62, 0x0b, 0x73, 0xa4, 0xe3, 0x77, 0xc1, 0x3d, 0xa1, 0x62,
+    0xfc, 0xce, 0xd4, 0x0f, 0x4e, 0x6b, 0x1b, 0xcc, 0x25, 0xa3, 0x9b, 0x1e, 0x68, 0xb8, 0x12, 0x9e, 0x12, 0x41, 0x87,
+    0x46, 0xa9, 0xa7, 0x7f, 0xb1, 0x59, 0x15, 0x86, 0x2a, 0x1e, 0x5f, 0x1c, 0xc8, 0xbb, 0xe4, 0x36, 0x46, 0x84, 0xe9,
+    0x24, 0xa0, 0xfa, 0x8e, 0xd5, 0x26, 0xa8, 0x21, 0xfa, 0xed, 0x92, 0x74, 0x9e, 0x8e, 0x9a, 0x06, 0x53, 0xb9, 0x2d,
+    0xe9, 0x91, 0x84, 0xb6, 0xd0, 0x33, 0x63, 0x76, 0x1a, 0x8f, 0xa4, 0xba, 0xf0, 0x2c, 0x79, 0x05, 0xa5, 0x45, 0x58,
+    0x84, 0x1d, 0x4f, 0xf8, 0xe4, 0xf0, 0x82, 0xda, 0x32, 0x4c, 0x33, 0xbb, 0x7f, 0xaf, 0xa7, 0x21, 0xa9, 0x67, 0xc1,
+    0xdb, 0xf8, 0xab, 0x2e, 0x0f, 0xc1, 0x07, 0xfc, 0xfb, 0xf0, 0x1e, 0xfe, 0xb2, 0xcb, 0x7b, 0x43, 0xdb, 0xf5, 0x49,
+    0xd8, 0xde, 0xab, 0x7e, 0xe3, 0x25, 0x4a, 0x9a, 0x4d, 0xd0, 0x8b, 0xde, 0x6d, 0x15, 0xa4, 0x54, 0x86, 0xdd, 0x9d,
+    0x4a, 0x19, 0xc2, 0xb3, 0x21, 0xfd, 0x40, 0x30, 0x77, 0xfd, 0x1d, 0x43, 0xc4, 0x9e, 0xb6, 0xf0, 0x67, 0x4d, 0xc8,
+    0xde, 0x87, 0x06, 0x4a, 0xca, 0xbe, 0x84, 0xe6, 0xdb, 0x42, 0xa0, 0x43, 0xbf, 0x1f, 0x49, 0x04, 0x0a, 0xf1, 0x57,
+    0xe7, 0x98, 0x35, 0x87, 0x53, 0x22, 0xf7, 0xc0, 0xf6, 0x8c, 0x38, 0x96, 0x60, 0x57, 0x19, 0xa5, 0x79, 0x0a, 0x7d,
+    0x1d, 0xfd, 0x79, 0xe8, 0x75, 0x75, 0x5e, 0x6d, 0xd3, 0xac, 0x99, 0x02, 0x19, 0xbe, 0x71, 0x00, 0x46, 0x57, 0x22,
+    0xc4, 0x67, 0xd2, 0x84, 0x78, 0xa8, 0x3e, 0x24, 0xb7, 0x26, 0xab, 0xd7, 0xdc, 0x14, 0xac, 0x62, 0x1a, 0xda, 0x17,
+    0x98, 0x8a, 0x83, 0x3f, 0xab, 0x62, 0xf5, 0x20, 0x19, 0xca, 0x4f, 0x22, 0xfc, 0x2d, 0x2f, 0xf4, 0xa3, 0xac, 0x36,
+    0x20, 0xa7, 0xef, 0x60, 0x12, 0xa4, 0x2f, 0xc6, 0x65, 0x13, 0x09, 0xb0, 0x43, 0xf0, 0x97, 0x06, 0x56, 0x57, 0x30,
+    0xe4, 0xdd, 0x4a, 0xcc, 0x55, 0x18, 0xc7, 0x39, 0x5d, 0xd9, 0x55, 0xf8, 0xd7, 0x22, 0xa5, 0x15, 0xa9, 0x69, 0x57,
+    0xb2, 0x62, 0x60, 0x63, 0x11, 0x88, 0x1a, 0x91, 0xe4, 0x66, 0x7e, 0x08, 0xda, 0xbc, 0x53, 0x39, 0x16, 0xf9, 0x6d,
+    0xf8, 0xa1, 0x7c, 0x5b, 0x10, 0xd9, 0x06, 0xf1, 0x78, 0x25, 0x4e, 0x64, 0x34, 0xe1, 0x55, 0xc4, 0xea, 0x37, 0x1f,
+    0x99, 0x1b, 0xde, 0x36, 0x57, 0x4b, 0x8f, 0x4b, 0xeb, 0xe0, 0xca, 0xb8, 0xe0, 0x31, 0x8b, 0xb8, 0x1f, 0xa5, 0x94,
+    0xf3, 0xe4, 0x18, 0x62, 0xc1, 0xeb, 0xb0, 0x6d, 0xb7, 0x04, 0xc9, 0x63, 0xfc, 0x6a, 0x28, 0x41, 0x7a, 0x1f, 0x0a,
+    0xab, 0x44, 0xb0, 0xdd, 0x69, 0xb7, 0xff, 0xe6, 0x60, 0xcf, 0x12, 0xbb, 0x79, 0x77, 0x0b, 0x5e, 0x77, 0xc9, 0xcd,
+    0x16, 0x79, 0x1f, 0xa1, 0xc8, 0xfb, 0xb0, 0x44, 0xa2, 0x58, 0x68, 0x6f, 0x09, 0x34, 0x6d, 0x8b, 0xa5, 0x23, 0x11,
+    0x1b, 0x9c, 0x81, 0x1b, 0x12, 0xe3, 0xc7, 0xc2, 0xb6, 0xb0, 0x5b, 0x0b, 0x57, 0xda, 0x56, 0x99, 0x33, 0xca, 0xf0,
+    0xe0, 0xa9, 0x8a, 0x24, 0x82, 0xb9, 0xc0, 0x54, 0x12, 0x8d, 0x1c, 0x4a, 0xe7, 0xba, 0xae, 0xb6, 0x2e, 0x16, 0xc7,
+    0x33, 0x90, 0x43, 0x2a, 0xf1, 0xe5, 0xbd, 0xec, 0xb0, 0x4b, 0x53, 0x61, 0xb2, 0xed, 0x6a, 0xa4, 0x73, 0xda, 0xe9,
+    0xef, 0x46, 0xd2, 0x8e, 0xc2, 0xbd, 0x5b, 0xc0, 0xe6, 0x05, 0xf5, 0x89, 0xc6, 0x8a, 0x1f, 0x67, 0x5b, 0x67, 0xec,
+    0xb8, 0x15, 0xcd, 0xe3, 0x2a, 0xac, 0x88, 0x5a, 0xb5, 0xbf, 0xab, 0x14, 0xac, 0x4c, 0xdf, 0x94, 0x8f, 0x91, 0x91,
+    0x1d, 0x82, 0x84, 0x23, 0x06, 0x2d, 0x65, 0xcc, 0x92, 0x8c, 0x51, 0x20, 0x3e, 0xc0, 0x4a, 0xfc, 0xab, 0x62, 0x9b,
+    0x52, 0x13, 0x94, 0x76, 0xff, 0xaf, 0xff, 0xeb, 0x7f, 0xcb, 0x70, 0x25, 0x90, 0x15, 0xc0, 0xc2, 0xf4, 0x9a, 0xea,
+    0xe4, 0x92, 0x9d, 0x83, 0x83, 0x1b, 0x8f, 0x5b, 0xd3, 0x28, 0x99, 0x00, 0x04, 0x05, 0x13, 0xda, 0x50, 0xd6, 0x03,
+    0x17, 0x48, 0xb0, 0xcc, 0x43, 0x7f, 0x09, 0x5e, 0xbd, 0x08, 0x57, 0xec, 0x77, 0xe5, 0xc3, 0xaa, 0x3c, 0x64, 0x62,
+    0x68, 0x23, 0x3b, 0xd6, 0xe0, 0xb9, 0x5a, 0x86, 0xac, 0xfa, 0xc5, 0x4b, 0x52, 0x78, 0xb0, 0x5a, 0x7a, 0x2c, 0xb4,
+    0xd4, 0x07, 0x2c, 0xff, 0xf6, 0xcf, 0xff, 0xf9, 0xbf, 0xab, 0x57, 0x3c, 0x37, 0xf9, 0xeb, 0x3f, 0xfd, 0xc3, 0xff,
+    0xfd, 0x3f, 0xff, 0x05, 0xb3, 0x8f, 0xe5, 0xd9, 0x0a, 0x6d, 0x25, 0xab, 0x3a, 0x58, 0x11, 0x7b, 0xca, 0xaa, 0x1c,
+    0x99, 0x7a, 0x1a, 0xed, 0x3e, 0x4d, 0x48, 0xbc, 0x29, 0xa1, 0x23, 0xbe, 0xa6, 0xb4, 0x6b, 0xa2, 0xda, 0x35, 0xe4,
+    0x83, 0xa5, 0xb4, 0x28, 0x5d, 0xc0, 0xde, 0x69, 0xdb, 0xd5, 0xf2, 0xf6, 0x8d, 0xbe, 0x5b, 0xb8, 0x30, 0xb7, 0xca,
+    0xec, 0xf1, 0xf5, 0xb2, 0x2d, 0x55, 0x78, 0x0c, 0x4b, 0xca, 0xaa, 0xdc, 0xc2, 0xb8, 0xf5, 0x12, 0x5f, 0x83, 0xae,
+    0x51, 0x4c, 0xab, 0x5c, 0xeb, 0xd3, 0xfb, 0x65, 0x01, 0x88, 0x4e, 0x70, 0x69, 0x44, 0x10, 0x8e, 0xce, 0x64, 0x5b,
+    0x68, 0xc0, 0x24, 0x17, 0x25, 0x8d, 0x22, 0xbc, 0xa4, 0xfb, 0x8f, 0xfe, 0xae, 0xfc, 0xd3, 0x0c, 0xad, 0x02, 0xcb,
+    0x99, 0x45, 0xe7, 0xd2, 0x77, 0x7a, 0xd0, 0x6e, 0xcf, 0xcf, 0xdd, 0x65, 0x35, 0x83, 0x77, 0xd5, 0x64, 0x14, 0xb8,
+    0x33, 0x07, 0xa4, 0xc3, 0x5c, 0x1d, 0x23, 0x04, 0x77, 0xa1, 0x8d, 0x21, 0xa5, 0xb2, 0xfc, 0x72, 0x49, 0x61, 0xaa,
+    0xf8, 0x37, 0x3c, 0x74, 0x95, 0x11, 0x3d, 0x28, 0x31, 0xb0, 0x58, 0x1a, 0xbd, 0xba, 0xa2, 0xd7, 0xb4, 0xb3, 0x9a,
+    0xf3, 0x62, 0x1e, 0x1a, 0x9b, 0xc7, 0xbd, 0xf7, 0xf1, 0x00, 0x77, 0xda, 0xf1, 0xa6, 0xdd, 0xa5, 0x1e, 0x9e, 0xf3,
+    0x6c, 0x66, 0x9e, 0x12, 0xb3, 0x88, 0x8d, 0xd8, 0x44, 0x45, 0x42, 0x65, 0xbd, 0x38, 0x01, 0x2e, 0xbf, 0xc0, 0xed,
+    0x06, 0xb4, 0xcd, 0x22, 0x1e, 0x10, 0xd3, 0xf6, 0xcc, 0x73, 0xe4, 0x08, 0x4f, 0xe8, 0xb3, 0xa5, 0x31, 0x57, 0x4f,
+    0x34, 0xc5, 0x78, 0x63, 0x3d, 0x9f, 0xa8, 0xf4, 0xa9, 0xbb, 0x39, 0x94, 0x08, 0x57, 0xbc, 0x90, 0xc7, 0xb3, 0xef,
+    0x6a, 0x7e, 0xbe, 0x14, 0xc5, 0xe0, 0x5a, 0xaf, 0xad, 0x17, 0x6a, 0x51, 0xd4, 0xbe, 0x00, 0x6b, 0x87, 0xc0, 0xb4,
+    0x9b, 0xad, 0xa8, 0x10, 0x5b, 0xbd, 0x0b, 0x5f, 0x68, 0x9b, 0x3e, 0x9a, 0xcf, 0xa9, 0xa1, 0x0b, 0xdc, 0x48, 0xb6,
+    0x39, 0x4a, 0x0a, 0x4a, 0x3d, 0x10, 0x27, 0xfd, 0xb2, 0x8d, 0x64, 0x5b, 0xf1, 0x24, 0x73, 0x00, 0xe8, 0xf7, 0x78,
+    0xff, 0x3f, 0x32, 0x18, 0x26, 0x95, 0xdd, 0x7b, 0x00, 0x00};
 
 }  // namespace web_server
 }  // namespace esphome

From 44b335e7e369ff720918416655cd9b89a35f59a0 Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Tue, 11 Oct 2022 01:02:53 +0200
Subject: [PATCH 128/838] Correctly set ble_write UUIDs based on their lengths.
 (#3885)

---
 esphome/components/ble_client/__init__.py  | 40 ++++++++++++++++++----
 esphome/components/ble_client/automation.h |  8 +++--
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/esphome/components/ble_client/__init__.py b/esphome/components/ble_client/__init__.py
index 0f1f60e62b..44812d29b5 100644
--- a/esphome/components/ble_client/__init__.py
+++ b/esphome/components/ble_client/__init__.py
@@ -100,12 +100,40 @@ async def ble_write_to_code(config, action_id, template_arg, args):
     else:
         cg.add(var.set_value_simple(value))
 
-    serv_uuid128 = esp32_ble_tracker.as_reversed_hex_array(config[CONF_SERVICE_UUID])
-    cg.add(var.set_service_uuid128(serv_uuid128))
-    char_uuid128 = esp32_ble_tracker.as_reversed_hex_array(
-        config[CONF_CHARACTERISTIC_UUID]
-    )
-    cg.add(var.set_char_uuid128(char_uuid128))
+    if len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
+        cg.add(
+            var.set_service_uuid16(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID]))
+        )
+    elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid32_format):
+        cg.add(
+            var.set_service_uuid32(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID]))
+        )
+    elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid128_format):
+        uuid128 = esp32_ble_tracker.as_reversed_hex_array(config[CONF_SERVICE_UUID])
+        cg.add(var.set_service_uuid128(uuid128))
+
+    if len(config[CONF_CHARACTERISTIC_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
+        cg.add(
+            var.set_char_uuid16(
+                esp32_ble_tracker.as_hex(config[CONF_CHARACTERISTIC_UUID])
+            )
+        )
+    elif len(config[CONF_CHARACTERISTIC_UUID]) == len(
+        esp32_ble_tracker.bt_uuid32_format
+    ):
+        cg.add(
+            var.set_char_uuid32(
+                esp32_ble_tracker.as_hex(config[CONF_CHARACTERISTIC_UUID])
+            )
+        )
+    elif len(config[CONF_CHARACTERISTIC_UUID]) == len(
+        esp32_ble_tracker.bt_uuid128_format
+    ):
+        uuid128 = esp32_ble_tracker.as_reversed_hex_array(
+            config[CONF_CHARACTERISTIC_UUID]
+        )
+        cg.add(var.set_char_uuid128(uuid128))
+
     return var
 
 
diff --git a/esphome/components/ble_client/automation.h b/esphome/components/ble_client/automation.h
index ba5f78109e..98c19dedf8 100644
--- a/esphome/components/ble_client/automation.h
+++ b/esphome/components/ble_client/automation.h
@@ -46,10 +46,14 @@ class BLEWriterClientNode : public BLEClientNode {
   // Attempts to write the contents of value to char_uuid_.
   void write(const std::vector<uint8_t> &value);
 
-  void set_char_uuid128(uint8_t *uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-
+  void set_service_uuid16(uint16_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
+  void set_service_uuid32(uint32_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
   void set_service_uuid128(uint8_t *uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
 
+  void set_char_uuid16(uint16_t uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
+  void set_char_uuid32(uint32_t uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
+  void set_char_uuid128(uint8_t *uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
+
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override;
 

From 45861456f15792a5d77ffda470bae001a22a5709 Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Tue, 11 Oct 2022 01:03:54 +0200
Subject: [PATCH 129/838] Fix default unit for ble_rssi sensor (#3874)

---
 esphome/components/ble_rssi/sensor.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/ble_rssi/sensor.py b/esphome/components/ble_rssi/sensor.py
index bd8e4f98e3..7c7bfc58a7 100644
--- a/esphome/components/ble_rssi/sensor.py
+++ b/esphome/components/ble_rssi/sensor.py
@@ -9,7 +9,7 @@ from esphome.const import (
     CONF_MAC_ADDRESS,
     DEVICE_CLASS_SIGNAL_STRENGTH,
     STATE_CLASS_MEASUREMENT,
-    UNIT_DECIBEL,
+    UNIT_DECIBEL_MILLIWATT,
 )
 
 DEPENDENCIES = ["esp32_ble_tracker"]
@@ -31,7 +31,7 @@ def _validate(config):
 CONFIG_SCHEMA = cv.All(
     sensor.sensor_schema(
         BLERSSISensor,
-        unit_of_measurement=UNIT_DECIBEL,
+        unit_of_measurement=UNIT_DECIBEL_MILLIWATT,
         accuracy_decimals=0,
         device_class=DEVICE_CLASS_SIGNAL_STRENGTH,
         state_class=STATE_CLASS_MEASUREMENT,

From a8ff0a89134b271da6990c62ae00599510745d4c Mon Sep 17 00:00:00 2001
From: Gustavo Ambrozio <gustavo@gustavo.eng.br>
Date: Mon, 10 Oct 2022 16:22:13 -0700
Subject: [PATCH 130/838] Exposing coordinates from touchscreen binary sensor
 (#3891)

---
 .../touchscreen/binary_sensor/touchscreen_binary_sensor.h   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/esphome/components/touchscreen/binary_sensor/touchscreen_binary_sensor.h b/esphome/components/touchscreen/binary_sensor/touchscreen_binary_sensor.h
index d7e53962e2..701468aa1e 100644
--- a/esphome/components/touchscreen/binary_sensor/touchscreen_binary_sensor.h
+++ b/esphome/components/touchscreen/binary_sensor/touchscreen_binary_sensor.h
@@ -23,6 +23,12 @@ class TouchscreenBinarySensor : public binary_sensor::BinarySensor,
     this->y_min_ = y_min;
     this->y_max_ = y_max;
   }
+  int16_t get_x_min() { return this->x_min_; }
+  int16_t get_x_max() { return this->x_max_; }
+  int16_t get_y_min() { return this->y_min_; }
+  int16_t get_y_max() { return this->y_max_; }
+  int16_t get_width() { return this->x_max_ - this->x_min_; }
+  int16_t get_height() { return this->y_max_ - this->y_min_; }
 
   void set_page(display::DisplayPage *page) { this->page_ = page; }
 

From 19900b004b0651ff62a94f78a0c5f977162dd95f Mon Sep 17 00:00:00 2001
From: Quentin Smith <quentin@mit.edu>
Date: Tue, 11 Oct 2022 22:15:03 -0400
Subject: [PATCH 131/838] Fix type annotation on
 `extract_registry_entry_config` (#3623)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/cpp_helpers.py | 7 ++++---
 esphome/util.py        | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/esphome/cpp_helpers.py b/esphome/cpp_helpers.py
index 822197341e..0ab4b75a16 100644
--- a/esphome/cpp_helpers.py
+++ b/esphome/cpp_helpers.py
@@ -13,7 +13,7 @@ from esphome.const import (
 
 # pylint: disable=unused-import
 from esphome.core import coroutine, ID, CORE
-from esphome.types import ConfigType
+from esphome.types import ConfigType, ConfigFragmentType
 from esphome.cpp_generator import add, get_variable
 from esphome.cpp_types import App
 from esphome.util import Registry, RegistryEntry
@@ -108,8 +108,9 @@ async def setup_entity(var, config):
 
 
 def extract_registry_entry_config(
-    registry: Registry, full_config: ConfigType
-) -> RegistryEntry:
+    registry: Registry,
+    full_config: ConfigType,
+) -> tuple[RegistryEntry, ConfigFragmentType]:
     key, config = next((k, v) for k, v in full_config.items() if k in registry)
     return registry[key], config
 
diff --git a/esphome/util.py b/esphome/util.py
index 1779e8ccfb..0d60212f50 100644
--- a/esphome/util.py
+++ b/esphome/util.py
@@ -34,7 +34,7 @@ class RegistryEntry:
         return Schema(self.raw_schema)
 
 
-class Registry(dict):
+class Registry(dict[str, RegistryEntry]):
     def __init__(self, base_schema=None, type_id_key=None):
         super().__init__()
         self.base_schema = base_schema or {}

From 9f9980e3382038ca43270110d8a6f1e5c946eb08 Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Wed, 12 Oct 2022 04:23:56 +0200
Subject: [PATCH 132/838] Add ble RSSI sensor for connected devices (#3860)

---
 esphome/components/ble_client/ble_client.cpp  |  7 ++
 esphome/components/ble_client/ble_client.h    |  5 +-
 .../components/ble_client/sensor/__init__.py  | 95 ++++++++++++++-----
 .../ble_client/sensor/ble_rssi_sensor.cpp     | 78 +++++++++++++++
 .../ble_client/sensor/ble_rssi_sensor.h       | 31 ++++++
 tests/test1.yaml                              |  6 ++
 6 files changed, 197 insertions(+), 25 deletions(-)
 create mode 100644 esphome/components/ble_client/sensor/ble_rssi_sensor.cpp
 create mode 100644 esphome/components/ble_client/sensor/ble_rssi_sensor.h

diff --git a/esphome/components/ble_client/ble_client.cpp b/esphome/components/ble_client/ble_client.cpp
index 3f86df32f5..a757d6f903 100644
--- a/esphome/components/ble_client/ble_client.cpp
+++ b/esphome/components/ble_client/ble_client.cpp
@@ -64,6 +64,13 @@ void BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t es
   }
 }
 
+void BLEClient::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
+  BLEClientBase::gap_event_handler(event, param);
+
+  for (auto *node : this->nodes_)
+    node->gap_event_handler(event, param);
+}
+
 void BLEClient::set_state(espbt::ClientState state) {
   BLEClientBase::set_state(state);
   for (auto &node : nodes_)
diff --git a/esphome/components/ble_client/ble_client.h b/esphome/components/ble_client/ble_client.h
index 0f8373ab1f..177cab2e3c 100644
--- a/esphome/components/ble_client/ble_client.h
+++ b/esphome/components/ble_client/ble_client.h
@@ -27,7 +27,8 @@ class BLEClientNode {
  public:
   virtual void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                                    esp_ble_gattc_cb_param_t *param) = 0;
-  virtual void loop(){};
+  virtual void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {}
+  virtual void loop() {}
   void set_address(uint64_t address) { address_ = address; }
   espbt::ESPBTClient *client;
   // This should be transitioned to Established once the node no longer needs
@@ -51,6 +52,8 @@ class BLEClient : public BLEClientBase {
 
   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;
   bool parse_device(const espbt::ESPBTDevice &device) override;
 
   void set_enabled(bool enabled);
diff --git a/esphome/components/ble_client/sensor/__init__.py b/esphome/components/ble_client/sensor/__init__.py
index e8f84d2542..c9bf2995b1 100644
--- a/esphome/components/ble_client/sensor/__init__.py
+++ b/esphome/components/ble_client/sensor/__init__.py
@@ -5,7 +5,11 @@ from esphome.const import (
     CONF_CHARACTERISTIC_UUID,
     CONF_LAMBDA,
     CONF_TRIGGER_ID,
+    CONF_TYPE,
     CONF_SERVICE_UUID,
+    DEVICE_CLASS_SIGNAL_STRENGTH,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_DECIBEL_MILLIWATT,
 )
 from esphome import automation
 from .. import ble_client_ns
@@ -16,6 +20,8 @@ CONF_DESCRIPTOR_UUID = "descriptor_uuid"
 
 CONF_NOTIFY = "notify"
 CONF_ON_NOTIFY = "on_notify"
+TYPE_CHARACTERISTIC = "characteristic"
+TYPE_RSSI = "rssi"
 
 adv_data_t = cg.std_vector.template(cg.uint8)
 adv_data_t_const_ref = adv_data_t.operator("ref").operator("const")
@@ -27,33 +33,67 @@ BLESensorNotifyTrigger = ble_client_ns.class_(
     "BLESensorNotifyTrigger", automation.Trigger.template(cg.float_)
 )
 
-CONFIG_SCHEMA = cv.All(
-    sensor.sensor_schema(
-        BLESensor,
-        accuracy_decimals=0,
-    )
-    .extend(
-        {
-            cv.Required(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
-            cv.Required(CONF_CHARACTERISTIC_UUID): esp32_ble_tracker.bt_uuid,
-            cv.Optional(CONF_DESCRIPTOR_UUID): esp32_ble_tracker.bt_uuid,
-            cv.Optional(CONF_LAMBDA): cv.returning_lambda,
-            cv.Optional(CONF_NOTIFY, default=False): cv.boolean,
-            cv.Optional(CONF_ON_NOTIFY): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
-                        BLESensorNotifyTrigger
-                    ),
-                }
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(ble_client.BLE_CLIENT_SCHEMA)
+BLEClientRssiSensor = ble_client_ns.class_(
+    "BLEClientRSSISensor", sensor.Sensor, cg.PollingComponent, ble_client.BLEClientNode
 )
 
 
-async def to_code(config):
+def checkType(value):
+    if CONF_TYPE not in value and CONF_SERVICE_UUID in value:
+        raise cv.Invalid(
+            "Looks like you're trying to create a ble characteristic sensor. Please add `type: characteristic` to your sensor config."
+        )
+    return value
+
+
+CONFIG_SCHEMA = cv.All(
+    checkType,
+    cv.typed_schema(
+        {
+            TYPE_CHARACTERISTIC: sensor.sensor_schema(
+                BLESensor,
+                accuracy_decimals=0,
+            )
+            .extend(cv.polling_component_schema("60s"))
+            .extend(ble_client.BLE_CLIENT_SCHEMA)
+            .extend(
+                {
+                    cv.Required(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
+                    cv.Required(CONF_CHARACTERISTIC_UUID): esp32_ble_tracker.bt_uuid,
+                    cv.Optional(CONF_DESCRIPTOR_UUID): esp32_ble_tracker.bt_uuid,
+                    cv.Optional(CONF_LAMBDA): cv.returning_lambda,
+                    cv.Optional(CONF_NOTIFY, default=False): cv.boolean,
+                    cv.Optional(CONF_ON_NOTIFY): automation.validate_automation(
+                        {
+                            cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                                BLESensorNotifyTrigger
+                            ),
+                        }
+                    ),
+                }
+            ),
+            TYPE_RSSI: sensor.sensor_schema(
+                BLEClientRssiSensor,
+                accuracy_decimals=0,
+                unit_of_measurement=UNIT_DECIBEL_MILLIWATT,
+                device_class=DEVICE_CLASS_SIGNAL_STRENGTH,
+                state_class=STATE_CLASS_MEASUREMENT,
+            )
+            .extend(cv.polling_component_schema("60s"))
+            .extend(ble_client.BLE_CLIENT_SCHEMA),
+        },
+        lower=True,
+    ),
+)
+
+
+async def rssi_sensor_to_code(config):
+    var = await sensor.new_sensor(config)
+    await cg.register_component(var, config)
+    await ble_client.register_ble_node(var, config)
+
+
+async def characteristic_sensor_to_code(config):
     var = await sensor.new_sensor(config)
     if len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
         cg.add(
@@ -125,3 +165,10 @@ async def to_code(config):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         await ble_client.register_ble_node(trigger, config)
         await automation.build_automation(trigger, [(float, "x")], conf)
+
+
+async def to_code(config):
+    if config[CONF_TYPE] == TYPE_RSSI:
+        await rssi_sensor_to_code(config)
+    elif config[CONF_TYPE] == TYPE_CHARACTERISTIC:
+        await characteristic_sensor_to_code(config)
diff --git a/esphome/components/ble_client/sensor/ble_rssi_sensor.cpp b/esphome/components/ble_client/sensor/ble_rssi_sensor.cpp
new file mode 100644
index 0000000000..13e51ed5b3
--- /dev/null
+++ b/esphome/components/ble_client/sensor/ble_rssi_sensor.cpp
@@ -0,0 +1,78 @@
+#include "ble_rssi_sensor.h"
+#include "esphome/core/log.h"
+#include "esphome/core/application.h"
+#include "esphome/core/helpers.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+
+#ifdef USE_ESP32
+
+namespace esphome {
+namespace ble_client {
+
+static const char *const TAG = "ble_rssi_sensor";
+
+void BLEClientRSSISensor::loop() {}
+
+void BLEClientRSSISensor::dump_config() {
+  LOG_SENSOR("", "BLE Client RSSI Sensor", this);
+  ESP_LOGCONFIG(TAG, "  MAC address        : %s", this->parent()->address_str().c_str());
+  LOG_UPDATE_INTERVAL(this);
+}
+
+void BLEClientRSSISensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+                                              esp_ble_gattc_cb_param_t *param) {
+  switch (event) {
+    case ESP_GATTC_OPEN_EVT: {
+      if (param->open.status == ESP_GATT_OK) {
+        ESP_LOGI(TAG, "[%s] Connected successfully!", this->get_name().c_str());
+        break;
+      }
+      break;
+    }
+    case ESP_GATTC_DISCONNECT_EVT: {
+      ESP_LOGW(TAG, "[%s] Disconnected!", this->get_name().c_str());
+      this->status_set_warning();
+      this->publish_state(NAN);
+      break;
+    }
+    case ESP_GATTC_SEARCH_CMPL_EVT:
+      this->node_state = espbt::ClientState::ESTABLISHED;
+      break;
+    default:
+      break;
+  }
+}
+
+void BLEClientRSSISensor::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
+  switch (event) {
+    // server response on RSSI request:
+    case ESP_GAP_BLE_READ_RSSI_COMPLETE_EVT:
+      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->publish_state(rssi);
+      }
+      break;
+    default:
+      break;
+  }
+}
+
+void BLEClientRSSISensor::update() {
+  if (this->node_state != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "[%s] Cannot poll, not connected", this->get_name().c_str());
+    return;
+  }
+
+  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) {
+    ESP_LOGW(TAG, "esp_ble_gap_read_rssi error, address=%s, status=%d", this->parent()->address_str().c_str(), status);
+    this->status_set_warning();
+    this->publish_state(NAN);
+  }
+}
+
+}  // namespace ble_client
+}  // namespace esphome
+#endif
diff --git a/esphome/components/ble_client/sensor/ble_rssi_sensor.h b/esphome/components/ble_client/sensor/ble_rssi_sensor.h
new file mode 100644
index 0000000000..028df83832
--- /dev/null
+++ b/esphome/components/ble_client/sensor/ble_rssi_sensor.h
@@ -0,0 +1,31 @@
+#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"
+
+#ifdef USE_ESP32
+#include <esp_gattc_api.h>
+
+namespace esphome {
+namespace ble_client {
+
+namespace espbt = esphome::esp32_ble_tracker;
+
+class BLEClientRSSISensor : public sensor::Sensor, public PollingComponent, public BLEClientNode {
+ public:
+  void loop() override;
+  void update() override;
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
+  void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) override;
+
+  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+                           esp_ble_gattc_cb_param_t *param) override;
+};
+
+}  // namespace ble_client
+}  // namespace esphome
+#endif
diff --git a/tests/test1.yaml b/tests/test1.yaml
index e213a8b041..01672fcc01 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -321,6 +321,7 @@ mcp23s17:
 
 sensor:
   - platform: ble_client
+    type: characteristic
     ble_client_id: ble_foo
     name: Green iTag btn
     service_uuid: ffe0
@@ -335,6 +336,11 @@ sensor:
       then:
         - lambda: |-
             ESP_LOGD("green_btn", "Button was pressed, val%f", x);
+  - platform: ble_client
+    type: rssi
+    ble_client_id: ble_foo
+    name: Green iTag RSSI
+    update_interval: 15s
   - platform: adc
     pin: A0
     name: Living Room Brightness

From 03fca8d91eeeb257a66933f16bd871f36c193982 Mon Sep 17 00:00:00 2001
From: cstaahl <44496349+cstaahl@users.noreply.github.com>
Date: Wed, 12 Oct 2022 04:26:35 +0200
Subject: [PATCH 133/838] Fix pulse_meter filter logic (#3321)

---
 .../pulse_meter/pulse_meter_sensor.cpp        | 105 +++++++++++-------
 .../pulse_meter/pulse_meter_sensor.h          |   7 +-
 2 files changed, 68 insertions(+), 44 deletions(-)

diff --git a/esphome/components/pulse_meter/pulse_meter_sensor.cpp b/esphome/components/pulse_meter/pulse_meter_sensor.cpp
index f747f9ee40..52b7261f8b 100644
--- a/esphome/components/pulse_meter/pulse_meter_sensor.cpp
+++ b/esphome/components/pulse_meter/pulse_meter_sensor.cpp
@@ -11,62 +11,43 @@ void PulseMeterSensor::setup() {
   this->isr_pin_ = pin_->to_isr();
   this->pin_->attach_interrupt(PulseMeterSensor::gpio_intr, this, gpio::INTERRUPT_ANY_EDGE);
 
+  this->pulse_width_us_ = 0;
   this->last_detected_edge_us_ = 0;
-  this->last_valid_low_edge_us_ = 0;
   this->last_valid_high_edge_us_ = 0;
+  this->last_valid_low_edge_us_ = 0;
   this->sensor_is_high_ = this->isr_pin_.digital_read();
+  this->has_valid_high_edge_ = false;
+  this->has_valid_low_edge_ = false;
 }
 
 void PulseMeterSensor::loop() {
+  // Get a local copy of the volatile sensor values, to make sure they are not
+  // modified by the ISR. This could cause overflow in the following arithmetic
+  const uint32_t last_valid_high_edge_us = this->last_valid_high_edge_us_;
+  const bool has_valid_high_edge = this->has_valid_high_edge_;
   const uint32_t now = micros();
 
-  // Check to see if we should filter this edge out
-  if (this->filter_mode_ == FILTER_EDGE) {
-    if ((this->last_detected_edge_us_ - this->last_valid_high_edge_us_) >= this->filter_us_) {
-      // Don't measure the first valid pulse (we need at least two pulses to measure the width)
-      if (this->last_valid_high_edge_us_ != 0) {
-        this->pulse_width_us_ = (this->last_detected_edge_us_ - this->last_valid_high_edge_us_);
-      }
-      this->total_pulses_++;
-      this->last_valid_high_edge_us_ = this->last_detected_edge_us_;
-    }
-  } else {
-    // Make sure the signal has been stable long enough
-    if ((now - this->last_detected_edge_us_) >= this->filter_us_) {
-      // Only consider HIGH pulses and "new" edges if sensor state is LOW
-      if (!this->sensor_is_high_ && this->isr_pin_.digital_read() &&
-          (this->last_detected_edge_us_ != this->last_valid_high_edge_us_)) {
-        // Don't measure the first valid pulse (we need at least two pulses to measure the width)
-        if (this->last_valid_high_edge_us_ != 0) {
-          this->pulse_width_us_ = (this->last_detected_edge_us_ - this->last_valid_high_edge_us_);
-        }
-        this->sensor_is_high_ = true;
-        this->total_pulses_++;
-        this->last_valid_high_edge_us_ = this->last_detected_edge_us_;
-      }
-      // Only consider LOW pulses and "new" edges if sensor state is HIGH
-      else if (this->sensor_is_high_ && !this->isr_pin_.digital_read() &&
-               (this->last_detected_edge_us_ != this->last_valid_low_edge_us_)) {
-        this->sensor_is_high_ = false;
-        this->last_valid_low_edge_us_ = this->last_detected_edge_us_;
-      }
-    }
-  }
-
-  // If we've exceeded our timeout interval without receiving any pulses, assume 0 pulses/min until
-  // we get at least two valid pulses.
-  const uint32_t time_since_valid_edge_us = now - this->last_valid_high_edge_us_;
-  if ((this->last_valid_high_edge_us_ != 0) && (time_since_valid_edge_us > this->timeout_us_) &&
-      (this->pulse_width_us_ != 0)) {
+  // If we've exceeded our timeout interval without receiving any pulses, assume
+  // 0 pulses/min until we get at least two valid pulses.
+  const uint32_t time_since_valid_edge_us = now - last_valid_high_edge_us;
+  if ((has_valid_high_edge) && (time_since_valid_edge_us > this->timeout_us_)) {
     ESP_LOGD(TAG, "No pulse detected for %us, assuming 0 pulses/min", time_since_valid_edge_us / 1000000);
+
     this->pulse_width_us_ = 0;
+    this->last_detected_edge_us_ = 0;
+    this->last_valid_high_edge_us_ = 0;
+    this->last_valid_low_edge_us_ = 0;
+    this->has_detected_edge_ = false;
+    this->has_valid_high_edge_ = false;
+    this->has_valid_low_edge_ = false;
   }
 
   // We quantize our pulse widths to 1 ms to avoid unnecessary jitter
   const uint32_t pulse_width_ms = this->pulse_width_us_ / 1000;
   if (this->pulse_width_dedupe_.next(pulse_width_ms)) {
     if (pulse_width_ms == 0) {
-      // Treat 0 pulse width as 0 pulses/min (normally because we've not detected any pulses for a while)
+      // Treat 0 pulse width as 0 pulses/min (normally because we've not
+      // detected any pulses for a while)
       this->publish_state(0);
     } else {
       // Calculate pulses/min from the pulse width in ms
@@ -96,9 +77,11 @@ void PulseMeterSensor::dump_config() {
 }
 
 void IRAM_ATTR PulseMeterSensor::gpio_intr(PulseMeterSensor *sensor) {
-  // This is an interrupt handler - we can't call any virtual method from this method
+  // This is an interrupt handler - we can't call any virtual method from this
+  // method
 
-  // Get the current time before we do anything else so the measurements are consistent
+  // Get the current time before we do anything else so the measurements are
+  // consistent
   const uint32_t now = micros();
 
   // We only look at rising edges in EDGE mode, and all edges in PULSE mode
@@ -106,7 +89,45 @@ void IRAM_ATTR PulseMeterSensor::gpio_intr(PulseMeterSensor *sensor) {
     if (sensor->isr_pin_.digital_read()) {
       sensor->last_detected_edge_us_ = now;
     }
+  }
+
+  // Check to see if we should filter this edge out
+  if (sensor->filter_mode_ == FILTER_EDGE) {
+    if ((sensor->last_detected_edge_us_ - sensor->last_valid_high_edge_us_) >= sensor->filter_us_) {
+      // Don't measure the first valid pulse (we need at least two pulses to
+      // measure the width)
+      if (sensor->has_valid_high_edge_) {
+        sensor->pulse_width_us_ = (sensor->last_detected_edge_us_ - sensor->last_valid_high_edge_us_);
+      }
+      sensor->total_pulses_++;
+      sensor->last_valid_high_edge_us_ = sensor->last_detected_edge_us_;
+      sensor->has_valid_high_edge_ = true;
+    }
   } else {
+    // Filter Mode is PULSE
+    bool pin_val = sensor->isr_pin_.digital_read();
+    // Ignore false edges that may be caused by bouncing and exit the ISR ASAP
+    if (pin_val == sensor->sensor_is_high_) {
+      return;
+    }
+    // Make sure the signal has been stable long enough
+    if (sensor->has_detected_edge_ && (now - sensor->last_detected_edge_us_ >= sensor->filter_us_)) {
+      if (pin_val) {
+        sensor->has_valid_high_edge_ = true;
+        sensor->last_valid_high_edge_us_ = sensor->last_detected_edge_us_;
+        sensor->sensor_is_high_ = true;
+      } else {
+        // Count pulses when a sufficiently long high pulse is concluded.
+        sensor->total_pulses_++;
+        if (sensor->has_valid_low_edge_) {
+          sensor->pulse_width_us_ = sensor->last_detected_edge_us_ - sensor->last_valid_low_edge_us_;
+        }
+        sensor->has_valid_low_edge_ = true;
+        sensor->last_valid_low_edge_us_ = sensor->last_detected_edge_us_;
+        sensor->sensor_is_high_ = false;
+      }
+    }
+    sensor->has_detected_edge_ = true;
     sensor->last_detected_edge_us_ = now;
   }
 }
diff --git a/esphome/components/pulse_meter/pulse_meter_sensor.h b/esphome/components/pulse_meter/pulse_meter_sensor.h
index bf50eab6ff..ed4fb2a1f4 100644
--- a/esphome/components/pulse_meter/pulse_meter_sensor.h
+++ b/esphome/components/pulse_meter/pulse_meter_sensor.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "esphome/components/sensor/sensor.h"
 #include "esphome/core/component.h"
 #include "esphome/core/hal.h"
-#include "esphome/components/sensor/sensor.h"
 #include "esphome/core/helpers.h"
 
 namespace esphome {
@@ -42,11 +42,14 @@ class PulseMeterSensor : public sensor::Sensor, public Component {
   Deduplicator<uint32_t> total_dedupe_;
 
   volatile uint32_t last_detected_edge_us_ = 0;
-  volatile uint32_t last_valid_low_edge_us_ = 0;
   volatile uint32_t last_valid_high_edge_us_ = 0;
+  volatile uint32_t last_valid_low_edge_us_ = 0;
   volatile uint32_t pulse_width_us_ = 0;
   volatile uint32_t total_pulses_ = 0;
   volatile bool sensor_is_high_ = false;
+  volatile bool has_detected_edge_ = false;
+  volatile bool has_valid_high_edge_ = false;
+  volatile bool has_valid_low_edge_ = false;
 };
 
 }  // namespace pulse_meter

From fe38b36c265f88702d301f569a1e197ea081196f Mon Sep 17 00:00:00 2001
From: Chris Feenstra <73584137+cfeenstra1024@users.noreply.github.com>
Date: Wed, 12 Oct 2022 04:29:57 +0200
Subject: [PATCH 134/838] Add support for ZHLT01 heatpump IR protocol (#3655)

Co-authored-by: Chris Feenstra <chris@cfeenstra.nl>
---
 esphome/components/heatpumpir/climate.py     | 1 +
 esphome/components/heatpumpir/heatpumpir.cpp | 1 +
 esphome/components/heatpumpir/heatpumpir.h   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/esphome/components/heatpumpir/climate.py b/esphome/components/heatpumpir/climate.py
index a253a778de..2e78db8356 100644
--- a/esphome/components/heatpumpir/climate.py
+++ b/esphome/components/heatpumpir/climate.py
@@ -58,6 +58,7 @@ PROTOCOLS = {
     "sharp": Protocol.PROTOCOL_SHARP,
     "toshiba_daiseikai": Protocol.PROTOCOL_TOSHIBA_DAISEIKAI,
     "toshiba": Protocol.PROTOCOL_TOSHIBA,
+    "zhlt01": Protocol.PROTOCOL_ZHLT01,
 }
 
 CONF_HORIZONTAL_DEFAULT = "horizontal_default"
diff --git a/esphome/components/heatpumpir/heatpumpir.cpp b/esphome/components/heatpumpir/heatpumpir.cpp
index cd24411763..bed1dc76c0 100644
--- a/esphome/components/heatpumpir/heatpumpir.cpp
+++ b/esphome/components/heatpumpir/heatpumpir.cpp
@@ -53,6 +53,7 @@ const std::map<Protocol, std::function<HeatpumpIR *()>> PROTOCOL_CONSTRUCTOR_MAP
     {PROTOCOL_SHARP, []() { return new SharpHeatpumpIR(); }},                                // NOLINT
     {PROTOCOL_TOSHIBA_DAISEIKAI, []() { return new ToshibaDaiseikaiHeatpumpIR(); }},         // NOLINT
     {PROTOCOL_TOSHIBA, []() { return new ToshibaHeatpumpIR(); }},                            // NOLINT
+    {PROTOCOL_ZHLT01, []() { return new ZHLT01HeatpumpIR(); }},                              // NOLINT
 };
 
 void HeatpumpIRClimate::setup() {
diff --git a/esphome/components/heatpumpir/heatpumpir.h b/esphome/components/heatpumpir/heatpumpir.h
index decf1eae07..c60b944111 100644
--- a/esphome/components/heatpumpir/heatpumpir.h
+++ b/esphome/components/heatpumpir/heatpumpir.h
@@ -53,6 +53,7 @@ enum Protocol {
   PROTOCOL_SHARP,
   PROTOCOL_TOSHIBA_DAISEIKAI,
   PROTOCOL_TOSHIBA,
+  PROTOCOL_ZHLT01,
 };
 
 // Simple enum to represent horizontal directios

From b34d24735a42dabc7486e12211b27b2be3c7613b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 12 Oct 2022 22:22:07 +1300
Subject: [PATCH 135/838] Send GATT error events to HA (#3884)

---
 esphome/components/api/api.proto              |  28 +++++
 esphome/components/api/api_pb2.cpp            | 112 +++++++++++++++++
 esphome/components/api/api_pb2.h              |  37 ++++++
 esphome/components/api/api_pb2_service.cpp    |  24 ++++
 esphome/components/api/api_pb2_service.h      |   9 ++
 esphome/components/api/api_server.cpp         |  21 ++++
 esphome/components/api/api_server.h           |   3 +
 .../components/bluetooth_proxy/__init__.py    |   2 +-
 .../bluetooth_proxy/bluetooth_proxy.cpp       | 115 ++++++++++++++----
 .../bluetooth_proxy/bluetooth_proxy.h         |   7 +-
 .../esp32_ble_client/ble_characteristic.cpp   |   7 +-
 .../esp32_ble_client/ble_characteristic.h     |   4 +-
 tests/test1.yaml                              |   2 -
 tests/test2.yaml                              |   3 +
 14 files changed, 334 insertions(+), 40 deletions(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 9fa77d2daa..a8e45e1ea6 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -1298,3 +1298,31 @@ message BluetoothConnectionsFreeResponse {
   uint32 free = 1;
   uint32 limit = 2;
 }
+
+message BluetoothGATTErrorResponse {
+  option (id) = 82;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+  int32 error = 3;
+}
+
+message BluetoothGATTWriteResponse {
+  option (id) = 83;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+}
+
+message BluetoothGATTNotifyResponse {
+  option (id) = 84;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  uint32 handle = 2;
+}
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 73d8044cde..8cb244f1a1 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -5746,6 +5746,118 @@ void BluetoothConnectionsFreeResponse::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
+bool BluetoothGATTErrorResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    case 3: {
+      this->error = value.as_int32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTErrorResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+  buffer.encode_int32(3, this->error);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTErrorResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTErrorResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  error: ");
+  sprintf(buffer, "%d", this->error);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTWriteResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTWriteResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTWriteResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTWriteResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothGATTNotifyResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->handle = value.as_uint32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothGATTNotifyResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_uint32(2, this->handle);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothGATTNotifyResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothGATTNotifyResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  handle: ");
+  sprintf(buffer, "%u", this->handle);
+  out.append(buffer);
+  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 325e9a23c3..fb676f1cc8 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -1481,6 +1481,43 @@ class BluetoothConnectionsFreeResponse : public ProtoMessage {
  protected:
   bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
+class BluetoothGATTErrorResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  int32_t error{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTWriteResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothGATTNotifyResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  uint32_t handle{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt 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 7bfe1acf48..b603ade9de 100644
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -401,6 +401,30 @@ bool APIServerConnectionBase::send_bluetooth_connections_free_response(const Blu
   return this->send_message_<BluetoothConnectionsFreeResponse>(msg, 81);
 }
 #endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_gatt_error_response(const BluetoothGATTErrorResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_gatt_error_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothGATTErrorResponse>(msg, 82);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_gatt_write_response(const BluetoothGATTWriteResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_gatt_write_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothGATTWriteResponse>(msg, 83);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_gatt_notify_response(const BluetoothGATTNotifyResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_gatt_notify_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothGATTNotifyResponse>(msg, 84);
+}
+#endif
 bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
   switch (msg_type) {
     case 1: {
diff --git a/esphome/components/api/api_pb2_service.h b/esphome/components/api/api_pb2_service.h
index c7ef1468d8..3cb8b59ba5 100644
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -200,6 +200,15 @@ class APIServerConnectionBase : public ProtoService {
 #endif
 #ifdef USE_BLUETOOTH_PROXY
   bool send_bluetooth_connections_free_response(const BluetoothConnectionsFreeResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_gatt_error_response(const BluetoothGATTErrorResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_gatt_write_response(const BluetoothGATTWriteResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_gatt_notify_response(const BluetoothGATTNotifyResponse &msg);
 #endif
  protected:
   bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index 965f08aa15..dbd732f466 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -324,11 +324,21 @@ void APIServer::send_bluetooth_gatt_read_response(const BluetoothGATTReadRespons
     client->send_bluetooth_gatt_read_response(call);
   }
 }
+void APIServer::send_bluetooth_gatt_write_response(const BluetoothGATTWriteResponse &call) {
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_gatt_write_response(call);
+  }
+}
 void APIServer::send_bluetooth_gatt_notify_data_response(const BluetoothGATTNotifyDataResponse &call) {
   for (auto &client : this->clients_) {
     client->send_bluetooth_gatt_notify_data_response(call);
   }
 }
+void APIServer::send_bluetooth_gatt_notify_response(const BluetoothGATTNotifyResponse &call) {
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_gatt_notify_response(call);
+  }
+}
 void APIServer::send_bluetooth_gatt_services(const BluetoothGATTGetServicesResponse &call) {
   for (auto &client : this->clients_) {
     client->send_bluetooth_gatt_get_services_response(call);
@@ -342,6 +352,17 @@ void APIServer::send_bluetooth_gatt_services_done(uint64_t address) {
     client->send_bluetooth_gatt_get_services_done_response(call);
   }
 }
+void APIServer::send_bluetooth_gatt_error(uint64_t address, uint16_t handle, esp_err_t error) {
+  BluetoothGATTErrorResponse call;
+  call.address = address;
+  call.handle = handle;
+  call.error = error;
+
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_gatt_error_response(call);
+  }
+}
+
 #endif
 APIServer::APIServer() { global_api_server = this; }
 void APIServer::subscribe_home_assistant_state(std::string entity_id, optional<std::string> attribute,
diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index 72ab55432c..ec8c54a269 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -78,9 +78,12 @@ class APIServer : public Component, public Controller {
   void send_bluetooth_device_connection(uint64_t address, bool connected, uint16_t mtu, esp_err_t error = ESP_OK);
   void send_bluetooth_connections_free(uint8_t free, uint8_t limit);
   void send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &call);
+  void send_bluetooth_gatt_write_response(const BluetoothGATTWriteResponse &call);
   void send_bluetooth_gatt_notify_data_response(const BluetoothGATTNotifyDataResponse &call);
+  void send_bluetooth_gatt_notify_response(const BluetoothGATTNotifyResponse &call);
   void send_bluetooth_gatt_services(const BluetoothGATTGetServicesResponse &call);
   void send_bluetooth_gatt_services_done(uint64_t address);
+  void send_bluetooth_gatt_error(uint64_t address, uint16_t handle, esp_err_t error);
 #endif
   void register_user_service(UserServiceDescriptor *descriptor) { this->user_services_.push_back(descriptor); }
 #ifdef USE_HOMEASSISTANT_TIME
diff --git a/esphome/components/bluetooth_proxy/__init__.py b/esphome/components/bluetooth_proxy/__init__.py
index b5acea89dd..84841d9bf4 100644
--- a/esphome/components/bluetooth_proxy/__init__.py
+++ b/esphome/components/bluetooth_proxy/__init__.py
@@ -4,7 +4,7 @@ import esphome.codegen as cg
 from esphome.const import CONF_ACTIVE, CONF_ID
 
 AUTO_LOAD = ["esp32_ble_client", "esp32_ble_tracker"]
-DEPENDENCIES = ["esp32"]
+DEPENDENCIES = ["api", "esp32"]
 CODEOWNERS = ["@jesserockz"]
 
 
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index 96fee39f95..a08c58bd9e 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -4,21 +4,24 @@
 
 #ifdef USE_ESP32
 
-#ifdef USE_API
 #include "esphome/components/api/api_server.h"
-#endif
 
 namespace esphome {
 namespace bluetooth_proxy {
 
 static const char *const TAG = "bluetooth_proxy";
 
+static const esp_err_t ESP_GATT_NOT_CONNECTED = -1;
+static const esp_err_t ESP_GATT_WRONG_ADDRESS = -2;
+
 BluetoothProxy::BluetoothProxy() {
   global_bluetooth_proxy = this;
   this->address_ = 0;
 }
 
 bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  if (!api::global_api_server->is_connected())
+    return false;
   ESP_LOGV(TAG, "Proxying packet from %s - %s. RSSI: %d dB", device.get_name().c_str(), device.address_str().c_str(),
            device.get_rssi());
   this->send_api_packet_(device);
@@ -38,9 +41,6 @@ bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device)
 }
 
 void BluetoothProxy::send_api_packet_(const esp32_ble_tracker::ESPBTDevice &device) {
-#ifndef USE_API
-  return;
-#else
   api::BluetoothLEAdvertisementResponse resp;
   resp.address = device.address_uint64();
   if (!device.get_name().empty())
@@ -62,7 +62,6 @@ void BluetoothProxy::send_api_packet_(const esp32_ble_tracker::ESPBTDevice &devi
     resp.manufacturer_data.push_back(std::move(manufacturer_data));
   }
   api::global_api_server->send_bluetooth_le_advertisement(resp);
-#endif
 }
 
 void BluetoothProxy::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
@@ -70,30 +69,23 @@ void BluetoothProxy::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if
   BLEClientBase::gattc_event_handler(event, gattc_if, param);
   switch (event) {
     case ESP_GATTC_DISCONNECT_EVT: {
-#ifdef USE_API
       api::global_api_server->send_bluetooth_device_connection(this->address_, false, this->mtu_,
                                                                param->disconnect.reason);
       api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
                                                               this->get_bluetooth_connections_limit());
-#endif
       this->address_ = 0;
     }
     case ESP_GATTC_OPEN_EVT: {
       if (param->open.status != ESP_GATT_OK && param->open.status != ESP_GATT_ALREADY_OPEN) {
-#ifdef USE_API
         api::global_api_server->send_bluetooth_device_connection(this->address_, false, this->mtu_, param->open.status);
-
-#endif
         break;
       }
       break;
     }
     case ESP_GATTC_SEARCH_CMPL_EVT: {
-#ifdef USE_API
       api::global_api_server->send_bluetooth_device_connection(this->address_, true, this->mtu_);
       api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
                                                               this->get_bluetooth_connections_limit());
-#endif
       break;
     }
     case ESP_GATTC_READ_DESCR_EVT:
@@ -101,10 +93,11 @@ void BluetoothProxy::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if
       if (param->read.conn_id != this->conn_id_)
         break;
       if (param->read.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "Error reading char/descriptor at handle %d, status=%d", param->read.handle, param->read.status);
+        ESP_LOGW(TAG, "Error reading char/descriptor at handle 0x%2X, status=%d", param->read.handle,
+                 param->read.status);
+        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->read.handle, param->read.status);
         break;
       }
-#ifdef USE_API
       api::BluetoothGATTReadResponse resp;
       resp.address = this->address_;
       resp.handle = param->read.handle;
@@ -113,14 +106,56 @@ void BluetoothProxy::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if
         resp.data.push_back(param->read.value[i]);
       }
       api::global_api_server->send_bluetooth_gatt_read_response(resp);
-#endif
+      break;
+    }
+    case ESP_GATTC_WRITE_CHAR_EVT:
+    case ESP_GATTC_WRITE_DESCR_EVT: {
+      if (param->write.conn_id != this->conn_id_)
+        break;
+      if (param->write.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "Error writing char/descriptor at handle 0x%2X, status=%d", param->write.handle,
+                 param->write.status);
+        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->write.handle, param->write.status);
+        break;
+      }
+      api::BluetoothGATTWriteResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->write.handle;
+      api::global_api_server->send_bluetooth_gatt_write_response(resp);
+      break;
+    }
+    case ESP_GATTC_UNREG_FOR_NOTIFY_EVT: {
+      if (param->unreg_for_notify.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "Error unregistering notifications for handle 0x%2X, status=%d", param->unreg_for_notify.handle,
+                 param->unreg_for_notify.status);
+        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->unreg_for_notify.handle,
+                                                          param->unreg_for_notify.status);
+        break;
+      }
+      api::BluetoothGATTNotifyResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->unreg_for_notify.handle;
+      api::global_api_server->send_bluetooth_gatt_notify_response(resp);
+      break;
+    }
+    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
+      if (param->reg_for_notify.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "Error registering notifications for handle 0x%2X, status=%d", param->reg_for_notify.handle,
+                 param->reg_for_notify.status);
+        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->reg_for_notify.handle,
+                                                          param->reg_for_notify.status);
+        break;
+      }
+      api::BluetoothGATTNotifyResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->reg_for_notify.handle;
+      api::global_api_server->send_bluetooth_gatt_notify_response(resp);
       break;
     }
     case ESP_GATTC_NOTIFY_EVT: {
       if (param->notify.conn_id != this->conn_id_)
         break;
-      ESP_LOGV(TAG, "ESP_GATTC_NOTIFY_EVT: handle=0x%x", param->notify.handle);
-#ifdef USE_API
+      ESP_LOGV(TAG, "ESP_GATTC_NOTIFY_EVT: handle=0x%2X", param->notify.handle);
       api::BluetoothGATTNotifyDataResponse resp;
       resp.address = this->address_;
       resp.handle = param->notify.handle;
@@ -129,7 +164,6 @@ void BluetoothProxy::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if
         resp.data.push_back(param->notify.value[i]);
       }
       api::global_api_server->send_bluetooth_gatt_notify_data_response(resp);
-#endif
       break;
     }
     default:
@@ -141,7 +175,6 @@ void BluetoothProxy::dump_config() { ESP_LOGCONFIG(TAG, "Bluetooth Proxy:"); }
 
 void BluetoothProxy::loop() {
   BLEClientBase::loop();
-#ifdef USE_API
   if (this->state_ != espbt::ClientState::IDLE && !api::global_api_server->is_connected()) {
     ESP_LOGI(TAG, "[%s] Disconnecting.", this->address_str().c_str());
     auto err = esp_ble_gattc_close(this->gattc_if_, this->conn_id_);
@@ -177,10 +210,8 @@ void BluetoothProxy::loop() {
     api::global_api_server->send_bluetooth_gatt_services(resp);
     this->send_service_++;
   }
-#endif
 }
 
-#ifdef USE_API
 void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest &msg) {
   switch (msg.request_type) {
     case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT: {
@@ -220,16 +251,19 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
 void BluetoothProxy::bluetooth_gatt_read(const api::BluetoothGATTReadRequest &msg) {
   if (this->state_ != espbt::ClientState::ESTABLISHED) {
     ESP_LOGW(TAG, "Cannot read GATT characteristic, not connected.");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
     return;
   }
   if (this->address_ != msg.address) {
     ESP_LOGW(TAG, "Address mismatch for read GATT characteristic request");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_WRONG_ADDRESS);
     return;
   }
 
   auto *characteristic = this->get_characteristic(msg.handle);
   if (characteristic == nullptr) {
     ESP_LOGW(TAG, "Cannot read GATT characteristic, not found.");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_INVALID_HANDLE);
     return;
   }
 
@@ -239,43 +273,53 @@ void BluetoothProxy::bluetooth_gatt_read(const api::BluetoothGATTReadRequest &ms
       esp_ble_gattc_read_char(this->gattc_if_, this->conn_id_, characteristic->handle, ESP_GATT_AUTH_REQ_NONE);
   if (err != ERR_OK) {
     ESP_LOGW(TAG, "esp_ble_gattc_read_char error, err=%d", err);
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
   }
 }
 
 void BluetoothProxy::bluetooth_gatt_write(const api::BluetoothGATTWriteRequest &msg) {
   if (this->state_ != espbt::ClientState::ESTABLISHED) {
     ESP_LOGW(TAG, "Cannot write GATT characteristic, not connected.");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
     return;
   }
   if (this->address_ != msg.address) {
     ESP_LOGW(TAG, "Address mismatch for write GATT characteristic request");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_WRONG_ADDRESS);
     return;
   }
 
   auto *characteristic = this->get_characteristic(msg.handle);
   if (characteristic == nullptr) {
     ESP_LOGW(TAG, "Cannot write GATT characteristic, not found.");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_INVALID_HANDLE);
     return;
   }
 
   ESP_LOGV(TAG, "Writing GATT characteristic %s", characteristic->uuid.to_string().c_str());
-  characteristic->write_value((uint8_t *) msg.data.data(), msg.data.size(),
-                              msg.response ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP);
+  auto err = characteristic->write_value((uint8_t *) msg.data.data(), msg.data.size(),
+                                         msg.response ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP);
+  if (err != ERR_OK) {
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
+  }
 }
 
 void BluetoothProxy::bluetooth_gatt_read_descriptor(const api::BluetoothGATTReadDescriptorRequest &msg) {
   if (this->state_ != espbt::ClientState::ESTABLISHED) {
     ESP_LOGW(TAG, "Cannot read GATT characteristic descriptor, not connected.");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
     return;
   }
   if (this->address_ != msg.address) {
     ESP_LOGW(TAG, "Address mismatch for read GATT characteristic descriptor request");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_WRONG_ADDRESS);
     return;
   }
 
   auto *descriptor = this->get_descriptor(msg.handle);
   if (descriptor == nullptr) {
     ESP_LOGW(TAG, "Cannot read GATT characteristic descriptor, not found.");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_INVALID_HANDLE);
     return;
   }
 
@@ -286,22 +330,26 @@ void BluetoothProxy::bluetooth_gatt_read_descriptor(const api::BluetoothGATTRead
       esp_ble_gattc_read_char_descr(this->gattc_if_, this->conn_id_, descriptor->handle, ESP_GATT_AUTH_REQ_NONE);
   if (err != ERR_OK) {
     ESP_LOGW(TAG, "esp_ble_gattc_read_char error, err=%d", err);
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
   }
 }
 
 void BluetoothProxy::bluetooth_gatt_write_descriptor(const api::BluetoothGATTWriteDescriptorRequest &msg) {
   if (this->state_ != espbt::ClientState::ESTABLISHED) {
     ESP_LOGW(TAG, "Cannot write GATT characteristic descriptor, not connected.");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
     return;
   }
   if (this->address_ != msg.address) {
     ESP_LOGW(TAG, "Address mismatch for write GATT characteristic descriptor request");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_WRONG_ADDRESS);
     return;
   }
 
   auto *descriptor = this->get_descriptor(msg.handle);
   if (descriptor == nullptr) {
     ESP_LOGW(TAG, "Cannot write GATT characteristic descriptor, not found.");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_INVALID_HANDLE);
     return;
   }
 
@@ -313,20 +361,34 @@ void BluetoothProxy::bluetooth_gatt_write_descriptor(const api::BluetoothGATTWri
                                      (uint8_t *) msg.data.data(), ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
   if (err != ERR_OK) {
     ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, err=%d", err);
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
   }
 }
 
 void BluetoothProxy::bluetooth_gatt_send_services(const api::BluetoothGATTGetServicesRequest &msg) {
+  if (this->state_ != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "Cannot get GATT services, not connected.");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, 0, ESP_GATT_NOT_CONNECTED);
+    return;
+  }
   if (this->address_ != msg.address) {
     ESP_LOGW(TAG, "Address mismatch for service list request");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, 0, ESP_GATT_WRONG_ADDRESS);
     return;
   }
   this->send_service_ = 0;
 }
 
 void BluetoothProxy::bluetooth_gatt_notify(const api::BluetoothGATTNotifyRequest &msg) {
+  if (this->state_ != espbt::ClientState::ESTABLISHED) {
+    ESP_LOGW(TAG, "Cannot configure notify, not connected.");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
+    return;
+  }
+
   if (this->address_ != msg.address) {
     ESP_LOGW(TAG, "Address mismatch for notify");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_WRONG_ADDRESS);
     return;
   }
 
@@ -334,6 +396,7 @@ void BluetoothProxy::bluetooth_gatt_notify(const api::BluetoothGATTNotifyRequest
 
   if (characteristic == nullptr) {
     ESP_LOGW(TAG, "Cannot notify GATT characteristic, not found.");
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_INVALID_HANDLE);
     return;
   }
 
@@ -342,17 +405,17 @@ void BluetoothProxy::bluetooth_gatt_notify(const api::BluetoothGATTNotifyRequest
     err = esp_ble_gattc_register_for_notify(this->gattc_if_, this->remote_bda_, characteristic->handle);
     if (err != ESP_OK) {
       ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, err=%d", err);
+      api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
     }
   } else {
     err = esp_ble_gattc_unregister_for_notify(this->gattc_if_, this->remote_bda_, characteristic->handle);
     if (err != ESP_OK) {
       ESP_LOGW(TAG, "esp_ble_gattc_unregister_for_notify failed, err=%d", err);
+      api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
     }
   }
 }
 
-#endif
-
 BluetoothProxy *global_bluetooth_proxy = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
 }  // namespace bluetooth_proxy
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.h b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
index 8ff43aff3f..97047c118b 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -4,6 +4,7 @@
 
 #include <map>
 
+#include "esphome/components/api/api_pb2.h"
 #include "esphome/components/esp32_ble_client/ble_client_base.h"
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 #include "esphome/core/automation.h"
@@ -12,10 +13,6 @@
 
 #include <map>
 
-#ifdef USE_API
-#include "esphome/components/api/api_pb2.h"
-#endif  // USE_API
-
 namespace esphome {
 namespace bluetooth_proxy {
 
@@ -31,7 +28,6 @@ class BluetoothProxy : public BLEClientBase {
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override;
 
-#ifdef USE_API
   void bluetooth_device_request(const api::BluetoothDeviceRequest &msg);
   void bluetooth_gatt_read(const api::BluetoothGATTReadRequest &msg);
   void bluetooth_gatt_write(const api::BluetoothGATTWriteRequest &msg);
@@ -39,7 +35,6 @@ class BluetoothProxy : public BLEClientBase {
   void bluetooth_gatt_write_descriptor(const api::BluetoothGATTWriteDescriptorRequest &msg);
   void bluetooth_gatt_send_services(const api::BluetoothGATTGetServicesRequest &msg);
   void bluetooth_gatt_notify(const api::BluetoothGATTNotifyRequest &msg);
-#endif
 
   int get_bluetooth_connections_free() { return this->state_ == espbt::ClientState::IDLE ? 1 : 0; }
   int get_bluetooth_connections_limit() { return 1; }
diff --git a/esphome/components/esp32_ble_client/ble_characteristic.cpp b/esphome/components/esp32_ble_client/ble_characteristic.cpp
index 873833368c..2692498e98 100644
--- a/esphome/components/esp32_ble_client/ble_characteristic.cpp
+++ b/esphome/components/esp32_ble_client/ble_characteristic.cpp
@@ -64,17 +64,18 @@ BLEDescriptor *BLECharacteristic::get_descriptor_by_handle(uint16_t handle) {
   return nullptr;
 }
 
-void BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size, esp_gatt_write_type_t write_type) {
+esp_err_t BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size, esp_gatt_write_type_t write_type) {
   auto *client = this->service->client;
   auto status = esp_ble_gattc_write_char(client->get_gattc_if(), client->get_conn_id(), this->handle, new_val_size,
                                          new_val, write_type, ESP_GATT_AUTH_REQ_NONE);
   if (status) {
     ESP_LOGW(TAG, "Error sending write value to BLE gattc server, status=%d", status);
   }
+  return status;
 }
 
-void BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size) {
-  write_value(new_val, new_val_size, ESP_GATT_WRITE_TYPE_NO_RSP);
+esp_err_t BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size) {
+  return write_value(new_val, new_val_size, ESP_GATT_WRITE_TYPE_NO_RSP);
 }
 
 }  // namespace esp32_ble_client
diff --git a/esphome/components/esp32_ble_client/ble_characteristic.h b/esphome/components/esp32_ble_client/ble_characteristic.h
index ffa9227cc4..d290b282fc 100644
--- a/esphome/components/esp32_ble_client/ble_characteristic.h
+++ b/esphome/components/esp32_ble_client/ble_characteristic.h
@@ -24,8 +24,8 @@ class BLECharacteristic {
   BLEDescriptor *get_descriptor(espbt::ESPBTUUID uuid);
   BLEDescriptor *get_descriptor(uint16_t uuid);
   BLEDescriptor *get_descriptor_by_handle(uint16_t handle);
-  void write_value(uint8_t *new_val, int16_t new_val_size);
-  void write_value(uint8_t *new_val, int16_t new_val_size, esp_gatt_write_type_t write_type);
+  esp_err_t write_value(uint8_t *new_val, int16_t new_val_size);
+  esp_err_t write_value(uint8_t *new_val, int16_t new_val_size, esp_gatt_write_type_t write_type);
   BLEService *service;
 };
 
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 01672fcc01..82cdac4623 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -290,8 +290,6 @@ adalight:
 
 esp32_ble_tracker:
 
-bluetooth_proxy:
-
 ble_client:
   - mac_address: AA:BB:CC:DD:EE:FF
     id: ble_foo
diff --git a/tests/test2.yaml b/tests/test2.yaml
index 5507fa0631..d485d3f16c 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -506,6 +506,9 @@ xiaomi_ble:
 
 mopeka_ble:
 
+bluetooth_proxy:
+  active: true
+
 xiaomi_rtcgq02lm:
   - id: motion_rtcgq02lm
     mac_address: 01:02:03:04:05:06

From 48a1797e720729fe8a71465b1872bf26d9fd8a15 Mon Sep 17 00:00:00 2001
From: definitio <37266727+definitio@users.noreply.github.com>
Date: Wed, 12 Oct 2022 22:26:28 +0300
Subject: [PATCH 136/838] Do not require CS pin for ST7789V (#3888)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/st7789v/display.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/esphome/components/st7789v/display.py b/esphome/components/st7789v/display.py
index c276be2f5a..d18e305cc2 100644
--- a/esphome/components/st7789v/display.py
+++ b/esphome/components/st7789v/display.py
@@ -4,7 +4,6 @@ from esphome import pins
 from esphome.components import display, spi
 from esphome.const import (
     CONF_BACKLIGHT_PIN,
-    CONF_CS_PIN,
     CONF_DC_PIN,
     CONF_HEIGHT,
     CONF_ID,
@@ -69,7 +68,6 @@ CONFIG_SCHEMA = cv.All(
             cv.Required(CONF_MODEL): ST7789V_MODEL,
             cv.Required(CONF_RESET_PIN): pins.gpio_output_pin_schema,
             cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
-            cv.Required(CONF_CS_PIN): pins.gpio_output_pin_schema,
             cv.Optional(CONF_BACKLIGHT_PIN): pins.gpio_output_pin_schema,
             cv.Optional(CONF_EIGHTBITCOLOR, default=False): cv.boolean,
             cv.Optional(CONF_HEIGHT): cv.int_,
@@ -79,7 +77,7 @@ CONFIG_SCHEMA = cv.All(
         }
     )
     .extend(cv.polling_component_schema("5s"))
-    .extend(spi.spi_device_schema()),
+    .extend(spi.spi_device_schema(cs_pin_required=False)),
     validate_st7789v,
 )
 

From f422fabab415ab39e78aab874bc19f75ca461ff0 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 13 Oct 2022 09:18:46 +1300
Subject: [PATCH 137/838] Bump version to 2022.10.0b1

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

diff --git a/esphome/const.py b/esphome/const.py
index 7dcb3c823c..e0f3bc77b5 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.10.0-dev"
+__version__ = "2022.10.0b1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From bf15b1d302a05a9d73bdd5c856472b51d91b6e72 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 13 Oct 2022 09:18:46 +1300
Subject: [PATCH 138/838] Bump version to 2022.11.0-dev

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

diff --git a/esphome/const.py b/esphome/const.py
index 7dcb3c823c..f2d31bd21f 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.10.0-dev"
+__version__ = "2022.11.0-dev"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 98171c9f499868314b0a862512c03d967a7bcb5c Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Wed, 12 Oct 2022 18:11:59 -0300
Subject: [PATCH 139/838] fix never calling preset change trigger (#3864)

Co-authored-by: Keith Burzinski <kbx81x@gmail.com>
---
 .../thermostat/thermostat_climate.cpp         | 73 +++++++++++++------
 .../thermostat/thermostat_climate.h           |  3 +-
 2 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/esphome/components/thermostat/thermostat_climate.cpp b/esphome/components/thermostat/thermostat_climate.cpp
index 54e9f1687c..61e279d4a6 100644
--- a/esphome/components/thermostat/thermostat_climate.cpp
+++ b/esphome/components/thermostat/thermostat_climate.cpp
@@ -974,9 +974,19 @@ void ThermostatClimate::change_preset_(climate::ClimatePreset preset) {
   auto config = this->preset_config_.find(preset);
 
   if (config != this->preset_config_.end()) {
-    ESP_LOGI(TAG, "Switching to preset  %s", LOG_STR_ARG(climate::climate_preset_to_string(preset)));
-    this->change_preset_internal_(config->second);
+    ESP_LOGI(TAG, "Preset %s requested", LOG_STR_ARG(climate::climate_preset_to_string(preset)));
+    if (this->change_preset_internal_(config->second) || (!this->preset.has_value()) ||
+        this->preset.value() != preset) {
+      // Fire any preset changed trigger if defined
+      Trigger<> *trig = this->preset_change_trigger_;
+      assert(trig != nullptr);
+      trig->trigger();
 
+      this->refresh();
+      ESP_LOGI(TAG, "Preset %s applied", LOG_STR_ARG(climate::climate_preset_to_string(preset)));
+    } else {
+      ESP_LOGI(TAG, "No changes required to apply preset %s", LOG_STR_ARG(climate::climate_preset_to_string(preset)));
+    }
     this->custom_preset.reset();
     this->preset = preset;
   } else {
@@ -988,9 +998,19 @@ void ThermostatClimate::change_custom_preset_(const std::string &custom_preset)
   auto config = this->custom_preset_config_.find(custom_preset);
 
   if (config != this->custom_preset_config_.end()) {
-    ESP_LOGI(TAG, "Switching to custom preset  %s", custom_preset.c_str());
-    this->change_preset_internal_(config->second);
+    ESP_LOGI(TAG, "Custom preset %s requested", custom_preset.c_str());
+    if (this->change_preset_internal_(config->second) || (!this->custom_preset.has_value()) ||
+        this->custom_preset.value() != custom_preset) {
+      // Fire any preset changed trigger if defined
+      Trigger<> *trig = this->preset_change_trigger_;
+      assert(trig != nullptr);
+      trig->trigger();
 
+      this->refresh();
+      ESP_LOGI(TAG, "Custom preset %s applied", custom_preset.c_str());
+    } else {
+      ESP_LOGI(TAG, "No changes required to apply custom preset %s", custom_preset.c_str());
+    }
     this->preset.reset();
     this->custom_preset = custom_preset;
   } else {
@@ -998,39 +1018,46 @@ void ThermostatClimate::change_custom_preset_(const std::string &custom_preset)
   }
 }
 
-void ThermostatClimate::change_preset_internal_(const ThermostatClimateTargetTempConfig &config) {
+bool ThermostatClimate::change_preset_internal_(const ThermostatClimateTargetTempConfig &config) {
+  bool something_changed = false;
+
   if (this->supports_two_points_) {
-    this->target_temperature_low = config.default_temperature_low;
-    this->target_temperature_high = config.default_temperature_high;
+    if (this->target_temperature_low != config.default_temperature_low) {
+      this->target_temperature_low = config.default_temperature_low;
+      something_changed = true;
+    }
+    if (this->target_temperature_high != config.default_temperature_high) {
+      this->target_temperature_high = config.default_temperature_high;
+      something_changed = true;
+    }
   } else {
-    this->target_temperature = config.default_temperature;
+    if (this->target_temperature != config.default_temperature) {
+      this->target_temperature = config.default_temperature;
+      something_changed = true;
+    }
   }
 
-  // Note: The mode, fan_mode, and swing_mode can all be defined on the preset but if the climate.control call
-  // also specifies them then the control's version will override these for that call
-  if (config.mode_.has_value()) {
-    this->mode = *config.mode_;
+  // Note: The mode, fan_mode and swing_mode can all be defined in the preset but if the climate.control call
+  //  also specifies them then the climate.control call's values will override the preset's values for that call
+  if (config.mode_.has_value() && (this->mode != config.mode_.value())) {
     ESP_LOGV(TAG, "Setting mode to %s", LOG_STR_ARG(climate::climate_mode_to_string(*config.mode_)));
+    this->mode = *config.mode_;
+    something_changed = true;
   }
 
-  if (config.fan_mode_.has_value()) {
-    this->fan_mode = *config.fan_mode_;
+  if (config.fan_mode_.has_value() && (this->fan_mode != config.fan_mode_.value())) {
     ESP_LOGV(TAG, "Setting fan mode to %s", LOG_STR_ARG(climate::climate_fan_mode_to_string(*config.fan_mode_)));
+    this->fan_mode = *config.fan_mode_;
+    something_changed = true;
   }
 
-  if (config.swing_mode_.has_value()) {
+  if (config.swing_mode_.has_value() && (this->swing_mode != config.swing_mode_.value())) {
     ESP_LOGV(TAG, "Setting swing mode to %s", LOG_STR_ARG(climate::climate_swing_mode_to_string(*config.swing_mode_)));
     this->swing_mode = *config.swing_mode_;
+    something_changed = true;
   }
 
-  // Fire any preset changed trigger if defined
-  if (this->preset != preset) {
-    Trigger<> *trig = this->preset_change_trigger_;
-    assert(trig != nullptr);
-    trig->trigger();
-  }
-
-  this->refresh();
+  return something_changed;
 }
 
 void ThermostatClimate::set_preset_config(climate::ClimatePreset preset,
diff --git a/esphome/components/thermostat/thermostat_climate.h b/esphome/components/thermostat/thermostat_climate.h
index a738ba4986..68cbb17e34 100644
--- a/esphome/components/thermostat/thermostat_climate.h
+++ b/esphome/components/thermostat/thermostat_climate.h
@@ -168,7 +168,8 @@ class ThermostatClimate : public climate::Climate, public Component {
 
   /// Applies the temperature, mode, fan, and swing modes of the provided config.
   /// This is agnostic of custom vs built in preset
-  void change_preset_internal_(const ThermostatClimateTargetTempConfig &config);
+  /// Returns true if something was changed
+  bool change_preset_internal_(const ThermostatClimateTargetTempConfig &config);
 
   /// Return the traits of this controller.
   climate::ClimateTraits traits() override;

From 71387be72e36804773748d20c623d3e9cc7963d7 Mon Sep 17 00:00:00 2001
From: Sergey Dudanov <sergey.dudanov@gmail.com>
Date: Thu, 13 Oct 2022 03:50:45 +0400
Subject: [PATCH 140/838] Modbus QWORD fix (#3856)

---
 .../modbus_controller/modbus_controller.cpp   | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/esphome/components/modbus_controller/modbus_controller.cpp b/esphome/components/modbus_controller/modbus_controller.cpp
index e60b016a17..57f714f233 100644
--- a/esphome/components/modbus_controller/modbus_controller.cpp
+++ b/esphome/components/modbus_controller/modbus_controller.cpp
@@ -571,24 +571,16 @@ int64_t payload_to_number(const std::vector<uint8_t> &data, SensorValueType sens
           static_cast<int32_t>(((value & 0x7FFF) << 16 | (value & 0xFFFF0000) >> 16) | sign_bit), bitmask);
     } break;
     case SensorValueType::U_QWORD:
-      // Ignore bitmask for U_QWORD
-      value = get_data<uint64_t>(data, offset);
-      break;
     case SensorValueType::S_QWORD:
-      // Ignore bitmask for S_QWORD
-      value = get_data<int64_t>(data, offset);
+      // Ignore bitmask for QWORD
+      value = get_data<uint64_t>(data, offset);
       break;
     case SensorValueType::U_QWORD_R:
-      // Ignore bitmask for U_QWORD
-      value = get_data<uint64_t>(data, offset);
-      value = static_cast<uint64_t>(value & 0xFFFF) << 48 | (value & 0xFFFF000000000000) >> 48 |
-              static_cast<uint64_t>(value & 0xFFFF0000) << 32 | (value & 0x0000FFFF00000000) >> 32 |
-              static_cast<uint64_t>(value & 0xFFFF00000000) << 16 | (value & 0x00000000FFFF0000) >> 16;
-      break;
-    case SensorValueType::S_QWORD_R:
-      // Ignore bitmask for S_QWORD
-      value = get_data<int64_t>(data, offset);
-      break;
+    case SensorValueType::S_QWORD_R: {
+      // Ignore bitmask for QWORD
+      uint64_t tmp = get_data<uint64_t>(data, offset);
+      value = (tmp << 48) | (tmp >> 48) | ((tmp & 0xFFFF0000) << 16) | ((tmp >> 16) & 0xFFFF0000);
+    } break;
     case SensorValueType::RAW:
     default:
       break;

From 5ec158811025db6932bbbd999ce6cf322cd89287 Mon Sep 17 00:00:00 2001
From: Frank Riley <fhriley@gmail.com>
Date: Wed, 12 Oct 2022 16:59:07 -0700
Subject: [PATCH 141/838] Update the ibeacon code (#3859)

---
 .../components/esp32_ble_beacon/__init__.py   | 57 +++++++++++++++----
 .../esp32_ble_beacon/esp32_ble_beacon.cpp     | 30 ++++++++--
 .../esp32_ble_beacon/esp32_ble_beacon.h       | 13 ++++-
 3 files changed, 83 insertions(+), 17 deletions(-)

diff --git a/esphome/components/esp32_ble_beacon/__init__.py b/esphome/components/esp32_ble_beacon/__init__.py
index d6cbb15dd2..c3bd4ee418 100644
--- a/esphome/components/esp32_ble_beacon/__init__.py
+++ b/esphome/components/esp32_ble_beacon/__init__.py
@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_TYPE, CONF_UUID
-from esphome.core import CORE
+from esphome.const import CONF_ID, CONF_TYPE, CONF_UUID, CONF_TX_POWER
+from esphome.core import CORE, TimePeriod
 from esphome.components.esp32 import add_idf_sdkconfig_option
 
 DEPENDENCIES = ["esp32"]
@@ -12,16 +12,47 @@ ESP32BLEBeacon = esp32_ble_beacon_ns.class_("ESP32BLEBeacon", cg.Component)
 
 CONF_MAJOR = "major"
 CONF_MINOR = "minor"
+CONF_MIN_INTERVAL = "min_interval"
+CONF_MAX_INTERVAL = "max_interval"
+CONF_MEASURED_POWER = "measured_power"
 
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(ESP32BLEBeacon),
-        cv.Required(CONF_TYPE): cv.one_of("IBEACON", upper=True),
-        cv.Required(CONF_UUID): cv.uuid,
-        cv.Optional(CONF_MAJOR, default=10167): cv.uint16_t,
-        cv.Optional(CONF_MINOR, default=61958): cv.uint16_t,
-    }
-).extend(cv.COMPONENT_SCHEMA)
+
+def validate_config(config):
+    if config[CONF_MIN_INTERVAL] > config.get(CONF_MAX_INTERVAL):
+        raise cv.Invalid("min_interval must be <= max_interval")
+    return config
+
+
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(ESP32BLEBeacon),
+            cv.Required(CONF_TYPE): cv.one_of("IBEACON", upper=True),
+            cv.Required(CONF_UUID): cv.uuid,
+            cv.Optional(CONF_MAJOR, default=10167): cv.uint16_t,
+            cv.Optional(CONF_MINOR, default=61958): cv.uint16_t,
+            cv.Optional(CONF_MIN_INTERVAL, default="100ms"): cv.All(
+                cv.positive_time_period_milliseconds,
+                cv.Range(
+                    min=TimePeriod(milliseconds=20), max=TimePeriod(milliseconds=10240)
+                ),
+            ),
+            cv.Optional(CONF_MAX_INTERVAL, default="100ms"): cv.All(
+                cv.positive_time_period_milliseconds,
+                cv.Range(
+                    min=TimePeriod(milliseconds=20), max=TimePeriod(milliseconds=10240)
+                ),
+            ),
+            cv.Optional(CONF_MEASURED_POWER, default=-59): cv.int_range(
+                min=-128, max=0
+            ),
+            cv.Optional(CONF_TX_POWER, default="3dBm"): cv.All(
+                cv.decibel, cv.one_of(-12, -9, -6, -3, 0, 3, 6, 9, int=True)
+            ),
+        }
+    ).extend(cv.COMPONENT_SCHEMA),
+    validate_config,
+)
 
 
 async def to_code(config):
@@ -31,6 +62,10 @@ async def to_code(config):
     await cg.register_component(var, config)
     cg.add(var.set_major(config[CONF_MAJOR]))
     cg.add(var.set_minor(config[CONF_MINOR]))
+    cg.add(var.set_min_interval(config[CONF_MIN_INTERVAL]))
+    cg.add(var.set_max_interval(config[CONF_MAX_INTERVAL]))
+    cg.add(var.set_measured_power(config[CONF_MEASURED_POWER]))
+    cg.add(var.set_tx_power(config[CONF_TX_POWER]))
 
     if CORE.using_esp_idf:
         add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)
diff --git a/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp b/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp
index 955bc8595f..589fcc1e82 100644
--- a/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp
+++ b/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp
@@ -36,11 +36,24 @@ static esp_ble_adv_params_t ble_adv_params = {
 #define ENDIAN_CHANGE_U16(x) ((((x) &0xFF00) >> 8) + (((x) &0xFF) << 8))
 
 static const esp_ble_ibeacon_head_t IBEACON_COMMON_HEAD = {
-    .flags = {0x02, 0x01, 0x06}, .length = 0x1A, .type = 0xFF, .company_id = 0x004C, .beacon_type = 0x1502};
+    .flags = {0x02, 0x01, 0x06}, .length = 0x1A, .type = 0xFF, .company_id = {0x4C, 0x00}, .beacon_type = {0x02, 0x15}};
 
 void ESP32BLEBeacon::dump_config() {
   ESP_LOGCONFIG(TAG, "ESP32 BLE Beacon:");
-  ESP_LOGCONFIG(TAG, "  Major: %u, Minor: %u", this->major_, this->minor_);
+  char uuid[37];
+  char *bpos = uuid;
+  for (int8_t ii = 0; ii < 16; ++ii) {
+    bpos += sprintf(bpos, "%02X", this->uuid_[ii]);
+    if (ii == 3 || ii == 5 || ii == 7 || ii == 9) {
+      bpos += sprintf(bpos, "-");
+    }
+  }
+  uuid[36] = '\0';
+  ESP_LOGCONFIG(TAG,
+                "  UUID: %s, Major: %u, Minor: %u, Min Interval: %ums, Max Interval: %ums, Measured Power: %d"
+                ", TX Power: %ddBm",
+                uuid, this->major_, this->minor_, this->min_interval_, this->max_interval_, this->measured_power_,
+                this->tx_power_);
 }
 
 void ESP32BLEBeacon::setup() {
@@ -67,6 +80,9 @@ void ESP32BLEBeacon::ble_core_task(void *params) {
 }
 
 void ESP32BLEBeacon::ble_setup() {
+  ble_adv_params.adv_int_min = static_cast<uint16_t>(global_esp32_ble_beacon->min_interval_ / 0.625f);
+  ble_adv_params.adv_int_max = static_cast<uint16_t>(global_esp32_ble_beacon->max_interval_ / 0.625f);
+
   // Initialize non-volatile storage for the bluetooth controller
   esp_err_t err = nvs_flash_init();
   if (err != ESP_OK) {
@@ -118,6 +134,12 @@ void ESP32BLEBeacon::ble_setup() {
     ESP_LOGE(TAG, "esp_bluedroid_enable failed: %d", err);
     return;
   }
+  err = esp_ble_tx_power_set(ESP_BLE_PWR_TYPE_ADV,
+                             static_cast<esp_power_level_t>((global_esp32_ble_beacon->tx_power_ + 12) / 3));
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "esp_ble_tx_power_set failed: %s", esp_err_to_name(err));
+    return;
+  }
   err = esp_ble_gap_register_callback(ESP32BLEBeacon::gap_event_handler);
   if (err != ESP_OK) {
     ESP_LOGE(TAG, "esp_ble_gap_register_callback failed: %d", err);
@@ -130,7 +152,7 @@ void ESP32BLEBeacon::ble_setup() {
          sizeof(ibeacon_adv_data.ibeacon_vendor.proximity_uuid));
   ibeacon_adv_data.ibeacon_vendor.minor = ENDIAN_CHANGE_U16(global_esp32_ble_beacon->minor_);
   ibeacon_adv_data.ibeacon_vendor.major = ENDIAN_CHANGE_U16(global_esp32_ble_beacon->major_);
-  ibeacon_adv_data.ibeacon_vendor.measured_power = 0xC5;
+  ibeacon_adv_data.ibeacon_vendor.measured_power = static_cast<uint8_t>(global_esp32_ble_beacon->measured_power_);
 
   esp_ble_gap_config_adv_data_raw((uint8_t *) &ibeacon_adv_data, sizeof(ibeacon_adv_data));
 }
@@ -153,7 +175,7 @@ void ESP32BLEBeacon::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap
       break;
     }
     case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT: {
-      err = param->adv_start_cmpl.status;
+      err = param->adv_stop_cmpl.status;
       if (err != ESP_BT_STATUS_SUCCESS) {
         ESP_LOGE(TAG, "BLE adv stop failed: %s", esp_err_to_name(err));
       } else {
diff --git a/esphome/components/esp32_ble_beacon/esp32_ble_beacon.h b/esphome/components/esp32_ble_beacon/esp32_ble_beacon.h
index 80ad2041f2..5208b67ea3 100644
--- a/esphome/components/esp32_ble_beacon/esp32_ble_beacon.h
+++ b/esphome/components/esp32_ble_beacon/esp32_ble_beacon.h
@@ -5,6 +5,7 @@
 #ifdef USE_ESP32
 
 #include <esp_gap_ble_api.h>
+#include <esp_bt.h>
 
 namespace esphome {
 namespace esp32_ble_beacon {
@@ -14,8 +15,8 @@ typedef struct {
   uint8_t flags[3];
   uint8_t length;
   uint8_t type;
-  uint16_t company_id;
-  uint16_t beacon_type;
+  uint8_t company_id[2];
+  uint8_t beacon_type[2];
 } __attribute__((packed)) esp_ble_ibeacon_head_t;
 
 // NOLINTNEXTLINE(modernize-use-using)
@@ -42,6 +43,10 @@ class ESP32BLEBeacon : public Component {
 
   void set_major(uint16_t major) { this->major_ = major; }
   void set_minor(uint16_t minor) { this->minor_ = minor; }
+  void set_min_interval(uint16_t val) { this->min_interval_ = val; }
+  void set_max_interval(uint16_t val) { this->max_interval_ = val; }
+  void set_measured_power(int8_t val) { this->measured_power_ = val; }
+  void set_tx_power(int8_t val) { this->tx_power_ = val; }
 
  protected:
   static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param);
@@ -51,6 +56,10 @@ class ESP32BLEBeacon : public Component {
   std::array<uint8_t, 16> uuid_;
   uint16_t major_{};
   uint16_t minor_{};
+  uint16_t min_interval_{};
+  uint16_t max_interval_{};
+  int8_t measured_power_{};
+  int8_t tx_power_{};
 };
 
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)

From 3b21d1d81eef1a5fac74b3f9239376cf180ae208 Mon Sep 17 00:00:00 2001
From: Brian Kaufman <bkaufx@gmail.com>
Date: Thu, 13 Oct 2022 12:55:59 -0700
Subject: [PATCH 142/838] Don't Use Base Network Manual IP for WiFi AP (#3902)

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

diff --git a/esphome/components/wifi/__init__.py b/esphome/components/wifi/__init__.py
index a4c246da89..93ea6b92a4 100644
--- a/esphome/components/wifi/__init__.py
+++ b/esphome/components/wifi/__init__.py
@@ -368,7 +368,7 @@ async def to_code(config):
 
     if CONF_AP in config:
         conf = config[CONF_AP]
-        ip_config = conf.get(CONF_MANUAL_IP, config.get(CONF_MANUAL_IP))
+        ip_config = conf.get(CONF_MANUAL_IP)
         cg.with_local_variable(
             conf[CONF_ID],
             WiFiAP(),

From 4bf94e0757420d97d7bd4c1d1950d8efea1477b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Thu, 13 Oct 2022 21:58:42 +0200
Subject: [PATCH 143/838] Allow preserving WiFi credentials entered with
 captive_portal (#3813)

---
 esphome/components/captive_portal/__init__.py | 24 ++++++++++++++++++-
 esphome/components/wifi/wifi_component.cpp    |  4 ++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/esphome/components/captive_portal/__init__.py b/esphome/components/captive_portal/__init__.py
index f024c94b01..b41095304e 100644
--- a/esphome/components/captive_portal/__init__.py
+++ b/esphome/components/captive_portal/__init__.py
@@ -1,8 +1,9 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
+import esphome.final_validate as fv
 from esphome.components import web_server_base
 from esphome.components.web_server_base import CONF_WEB_SERVER_BASE_ID
-from esphome.const import CONF_ID
+from esphome.const import CONF_ID, CONF_NETWORKS, CONF_PASSWORD, CONF_SSID, CONF_WIFI
 from esphome.core import coroutine_with_priority, CORE
 
 AUTO_LOAD = ["web_server_base"]
@@ -12,6 +13,7 @@ CODEOWNERS = ["@OttoWinter"]
 captive_portal_ns = cg.esphome_ns.namespace("captive_portal")
 CaptivePortal = captive_portal_ns.class_("CaptivePortal", cg.Component)
 
+CONF_KEEP_USER_CREDENTIALS = "keep_user_credentials"
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
         {
@@ -19,12 +21,29 @@ CONFIG_SCHEMA = cv.All(
             cv.GenerateID(CONF_WEB_SERVER_BASE_ID): cv.use_id(
                 web_server_base.WebServerBase
             ),
+            cv.Optional(CONF_KEEP_USER_CREDENTIALS, default=False): cv.boolean,
         }
     ).extend(cv.COMPONENT_SCHEMA),
     cv.only_with_arduino,
 )
 
 
+def validate_wifi(config):
+    wifi_conf = fv.full_config.get()[CONF_WIFI]
+    if config.get(CONF_KEEP_USER_CREDENTIALS, False) and (
+        CONF_SSID in wifi_conf
+        or CONF_PASSWORD in wifi_conf
+        or CONF_NETWORKS in wifi_conf
+    ):
+        raise cv.Invalid(
+            f"WiFi credentials cannot be used together with {CONF_KEEP_USER_CREDENTIALS}"
+        )
+    return config
+
+
+FINAL_VALIDATE_SCHEMA = validate_wifi
+
+
 @coroutine_with_priority(64.0)
 async def to_code(config):
     paren = await cg.get_variable(config[CONF_WEB_SERVER_BASE_ID])
@@ -38,3 +57,6 @@ async def to_code(config):
         cg.add_library("WiFi", None)
     if CORE.is_esp8266:
         cg.add_library("DNSServer", None)
+
+    if config.get(CONF_KEEP_USER_CREDENTIALS, False):
+        cg.add_define("USE_CAPTIVE_PORTAL_KEEP_USER_CREDENTIALS")
diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index 37f5276c8f..0103106222 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -38,7 +38,11 @@ void WiFiComponent::setup() {
   this->last_connected_ = millis();
   this->wifi_pre_setup_();
 
+#ifndef USE_CAPTIVE_PORTAL_KEEP_USER_CREDENTIALS
   uint32_t hash = fnv1_hash(App.get_compilation_time());
+#else
+  uint32_t hash = 88491487UL;
+#endif
   this->pref_ = global_preferences->make_preference<wifi::SavedWifiSettings>(hash, true);
 
   SavedWifiSettings save{};

From 225b3c14943f698de57e1ad17fee97c56e13b36a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Jouault?=
 <fjouault@users.noreply.github.com>
Date: Fri, 14 Oct 2022 01:47:05 +0200
Subject: [PATCH 144/838] Send true and not RSSI in ble_presence (#3904)

---
 esphome/components/ble_presence/ble_presence_device.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/ble_presence/ble_presence_device.h b/esphome/components/ble_presence/ble_presence_device.h
index dcccf844d2..1689c9ba3f 100644
--- a/esphome/components/ble_presence/ble_presence_device.h
+++ b/esphome/components/ble_presence/ble_presence_device.h
@@ -58,7 +58,7 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
       case MATCH_BY_SERVICE_UUID:
         for (auto uuid : device.get_service_uuids()) {
           if (this->uuid_ == uuid) {
-            this->publish_state(device.get_rssi());
+            this->publish_state(true);
             this->found_ = true;
             return true;
           }
@@ -83,7 +83,7 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
           return false;
         }
 
-        this->publish_state(device.get_rssi());
+        this->publish_state(true);
         this->found_ = true;
         return true;
     }

From 8bb670521d3d51632a64781753219a9df9bc9f71 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sat, 15 Oct 2022 08:35:35 +1300
Subject: [PATCH 145/838] Remove address type map from bluetooth proxy (#3905)

---
 .../bluetooth_proxy/bluetooth_proxy.cpp       | 21 -------------------
 .../bluetooth_proxy/bluetooth_proxy.h         |  1 -
 2 files changed, 22 deletions(-)

diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index a08c58bd9e..cc1c178b08 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -26,16 +26,9 @@ bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device)
            device.get_rssi());
   this->send_api_packet_(device);
 
-  this->address_type_map_[device.address_uint64()] = device.get_address_type();
-
   if (this->address_ == 0)
     return true;
 
-  if (this->state_ == espbt::ClientState::DISCOVERED) {
-    ESP_LOGV(TAG, "Connecting to address %s", this->address_str().c_str());
-    return true;
-  }
-
   BLEClientBase::parse_device(device);
   return true;
 }
@@ -216,20 +209,6 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
   switch (msg.request_type) {
     case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT: {
       this->address_ = msg.address;
-      if (this->address_type_map_.find(this->address_) != this->address_type_map_.end()) {
-        // Utilise the address type cache
-        this->remote_addr_type_ = this->address_type_map_[this->address_];
-      } else {
-        this->remote_addr_type_ = BLE_ADDR_TYPE_PUBLIC;
-      }
-      this->remote_bda_[0] = (this->address_ >> 40) & 0xFF;
-      this->remote_bda_[1] = (this->address_ >> 32) & 0xFF;
-      this->remote_bda_[2] = (this->address_ >> 24) & 0xFF;
-      this->remote_bda_[3] = (this->address_ >> 16) & 0xFF;
-      this->remote_bda_[4] = (this->address_ >> 8) & 0xFF;
-      this->remote_bda_[5] = (this->address_ >> 0) & 0xFF;
-      this->set_state(espbt::ClientState::DISCOVERED);
-      esp_ble_gap_stop_scanning();
       break;
     }
     case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT: {
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.h b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
index 97047c118b..9529b99f73 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -45,7 +45,6 @@ class BluetoothProxy : public BLEClientBase {
  protected:
   void send_api_packet_(const esp32_ble_tracker::ESPBTDevice &device);
 
-  std::map<uint64_t, esp_ble_addr_type_t> address_type_map_;
   int16_t send_service_{-1};
   bool active_;
 };

From be914f2c1593453ba8ed7736e699ba5c16c9e80e Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Wed, 12 Oct 2022 18:11:59 -0300
Subject: [PATCH 146/838] fix never calling preset change trigger (#3864)

Co-authored-by: Keith Burzinski <kbx81x@gmail.com>
---
 .../thermostat/thermostat_climate.cpp         | 73 +++++++++++++------
 .../thermostat/thermostat_climate.h           |  3 +-
 2 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/esphome/components/thermostat/thermostat_climate.cpp b/esphome/components/thermostat/thermostat_climate.cpp
index 54e9f1687c..61e279d4a6 100644
--- a/esphome/components/thermostat/thermostat_climate.cpp
+++ b/esphome/components/thermostat/thermostat_climate.cpp
@@ -974,9 +974,19 @@ void ThermostatClimate::change_preset_(climate::ClimatePreset preset) {
   auto config = this->preset_config_.find(preset);
 
   if (config != this->preset_config_.end()) {
-    ESP_LOGI(TAG, "Switching to preset  %s", LOG_STR_ARG(climate::climate_preset_to_string(preset)));
-    this->change_preset_internal_(config->second);
+    ESP_LOGI(TAG, "Preset %s requested", LOG_STR_ARG(climate::climate_preset_to_string(preset)));
+    if (this->change_preset_internal_(config->second) || (!this->preset.has_value()) ||
+        this->preset.value() != preset) {
+      // Fire any preset changed trigger if defined
+      Trigger<> *trig = this->preset_change_trigger_;
+      assert(trig != nullptr);
+      trig->trigger();
 
+      this->refresh();
+      ESP_LOGI(TAG, "Preset %s applied", LOG_STR_ARG(climate::climate_preset_to_string(preset)));
+    } else {
+      ESP_LOGI(TAG, "No changes required to apply preset %s", LOG_STR_ARG(climate::climate_preset_to_string(preset)));
+    }
     this->custom_preset.reset();
     this->preset = preset;
   } else {
@@ -988,9 +998,19 @@ void ThermostatClimate::change_custom_preset_(const std::string &custom_preset)
   auto config = this->custom_preset_config_.find(custom_preset);
 
   if (config != this->custom_preset_config_.end()) {
-    ESP_LOGI(TAG, "Switching to custom preset  %s", custom_preset.c_str());
-    this->change_preset_internal_(config->second);
+    ESP_LOGI(TAG, "Custom preset %s requested", custom_preset.c_str());
+    if (this->change_preset_internal_(config->second) || (!this->custom_preset.has_value()) ||
+        this->custom_preset.value() != custom_preset) {
+      // Fire any preset changed trigger if defined
+      Trigger<> *trig = this->preset_change_trigger_;
+      assert(trig != nullptr);
+      trig->trigger();
 
+      this->refresh();
+      ESP_LOGI(TAG, "Custom preset %s applied", custom_preset.c_str());
+    } else {
+      ESP_LOGI(TAG, "No changes required to apply custom preset %s", custom_preset.c_str());
+    }
     this->preset.reset();
     this->custom_preset = custom_preset;
   } else {
@@ -998,39 +1018,46 @@ void ThermostatClimate::change_custom_preset_(const std::string &custom_preset)
   }
 }
 
-void ThermostatClimate::change_preset_internal_(const ThermostatClimateTargetTempConfig &config) {
+bool ThermostatClimate::change_preset_internal_(const ThermostatClimateTargetTempConfig &config) {
+  bool something_changed = false;
+
   if (this->supports_two_points_) {
-    this->target_temperature_low = config.default_temperature_low;
-    this->target_temperature_high = config.default_temperature_high;
+    if (this->target_temperature_low != config.default_temperature_low) {
+      this->target_temperature_low = config.default_temperature_low;
+      something_changed = true;
+    }
+    if (this->target_temperature_high != config.default_temperature_high) {
+      this->target_temperature_high = config.default_temperature_high;
+      something_changed = true;
+    }
   } else {
-    this->target_temperature = config.default_temperature;
+    if (this->target_temperature != config.default_temperature) {
+      this->target_temperature = config.default_temperature;
+      something_changed = true;
+    }
   }
 
-  // Note: The mode, fan_mode, and swing_mode can all be defined on the preset but if the climate.control call
-  // also specifies them then the control's version will override these for that call
-  if (config.mode_.has_value()) {
-    this->mode = *config.mode_;
+  // Note: The mode, fan_mode and swing_mode can all be defined in the preset but if the climate.control call
+  //  also specifies them then the climate.control call's values will override the preset's values for that call
+  if (config.mode_.has_value() && (this->mode != config.mode_.value())) {
     ESP_LOGV(TAG, "Setting mode to %s", LOG_STR_ARG(climate::climate_mode_to_string(*config.mode_)));
+    this->mode = *config.mode_;
+    something_changed = true;
   }
 
-  if (config.fan_mode_.has_value()) {
-    this->fan_mode = *config.fan_mode_;
+  if (config.fan_mode_.has_value() && (this->fan_mode != config.fan_mode_.value())) {
     ESP_LOGV(TAG, "Setting fan mode to %s", LOG_STR_ARG(climate::climate_fan_mode_to_string(*config.fan_mode_)));
+    this->fan_mode = *config.fan_mode_;
+    something_changed = true;
   }
 
-  if (config.swing_mode_.has_value()) {
+  if (config.swing_mode_.has_value() && (this->swing_mode != config.swing_mode_.value())) {
     ESP_LOGV(TAG, "Setting swing mode to %s", LOG_STR_ARG(climate::climate_swing_mode_to_string(*config.swing_mode_)));
     this->swing_mode = *config.swing_mode_;
+    something_changed = true;
   }
 
-  // Fire any preset changed trigger if defined
-  if (this->preset != preset) {
-    Trigger<> *trig = this->preset_change_trigger_;
-    assert(trig != nullptr);
-    trig->trigger();
-  }
-
-  this->refresh();
+  return something_changed;
 }
 
 void ThermostatClimate::set_preset_config(climate::ClimatePreset preset,
diff --git a/esphome/components/thermostat/thermostat_climate.h b/esphome/components/thermostat/thermostat_climate.h
index a738ba4986..68cbb17e34 100644
--- a/esphome/components/thermostat/thermostat_climate.h
+++ b/esphome/components/thermostat/thermostat_climate.h
@@ -168,7 +168,8 @@ class ThermostatClimate : public climate::Climate, public Component {
 
   /// Applies the temperature, mode, fan, and swing modes of the provided config.
   /// This is agnostic of custom vs built in preset
-  void change_preset_internal_(const ThermostatClimateTargetTempConfig &config);
+  /// Returns true if something was changed
+  bool change_preset_internal_(const ThermostatClimateTargetTempConfig &config);
 
   /// Return the traits of this controller.
   climate::ClimateTraits traits() override;

From 8bf34e09f43a50c641c9e67892d99c4ed84ae7da Mon Sep 17 00:00:00 2001
From: Sergey Dudanov <sergey.dudanov@gmail.com>
Date: Thu, 13 Oct 2022 03:50:45 +0400
Subject: [PATCH 147/838] Modbus QWORD fix (#3856)

---
 .../modbus_controller/modbus_controller.cpp   | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/esphome/components/modbus_controller/modbus_controller.cpp b/esphome/components/modbus_controller/modbus_controller.cpp
index e60b016a17..57f714f233 100644
--- a/esphome/components/modbus_controller/modbus_controller.cpp
+++ b/esphome/components/modbus_controller/modbus_controller.cpp
@@ -571,24 +571,16 @@ int64_t payload_to_number(const std::vector<uint8_t> &data, SensorValueType sens
           static_cast<int32_t>(((value & 0x7FFF) << 16 | (value & 0xFFFF0000) >> 16) | sign_bit), bitmask);
     } break;
     case SensorValueType::U_QWORD:
-      // Ignore bitmask for U_QWORD
-      value = get_data<uint64_t>(data, offset);
-      break;
     case SensorValueType::S_QWORD:
-      // Ignore bitmask for S_QWORD
-      value = get_data<int64_t>(data, offset);
+      // Ignore bitmask for QWORD
+      value = get_data<uint64_t>(data, offset);
       break;
     case SensorValueType::U_QWORD_R:
-      // Ignore bitmask for U_QWORD
-      value = get_data<uint64_t>(data, offset);
-      value = static_cast<uint64_t>(value & 0xFFFF) << 48 | (value & 0xFFFF000000000000) >> 48 |
-              static_cast<uint64_t>(value & 0xFFFF0000) << 32 | (value & 0x0000FFFF00000000) >> 32 |
-              static_cast<uint64_t>(value & 0xFFFF00000000) << 16 | (value & 0x00000000FFFF0000) >> 16;
-      break;
-    case SensorValueType::S_QWORD_R:
-      // Ignore bitmask for S_QWORD
-      value = get_data<int64_t>(data, offset);
-      break;
+    case SensorValueType::S_QWORD_R: {
+      // Ignore bitmask for QWORD
+      uint64_t tmp = get_data<uint64_t>(data, offset);
+      value = (tmp << 48) | (tmp >> 48) | ((tmp & 0xFFFF0000) << 16) | ((tmp >> 16) & 0xFFFF0000);
+    } break;
     case SensorValueType::RAW:
     default:
       break;

From b2d91ac5de0f001b9d058e097714d5f1a6c08f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Jouault?=
 <fjouault@users.noreply.github.com>
Date: Fri, 14 Oct 2022 01:47:05 +0200
Subject: [PATCH 148/838] Send true and not RSSI in ble_presence (#3904)

---
 esphome/components/ble_presence/ble_presence_device.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/ble_presence/ble_presence_device.h b/esphome/components/ble_presence/ble_presence_device.h
index dcccf844d2..1689c9ba3f 100644
--- a/esphome/components/ble_presence/ble_presence_device.h
+++ b/esphome/components/ble_presence/ble_presence_device.h
@@ -58,7 +58,7 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
       case MATCH_BY_SERVICE_UUID:
         for (auto uuid : device.get_service_uuids()) {
           if (this->uuid_ == uuid) {
-            this->publish_state(device.get_rssi());
+            this->publish_state(true);
             this->found_ = true;
             return true;
           }
@@ -83,7 +83,7 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
           return false;
         }
 
-        this->publish_state(device.get_rssi());
+        this->publish_state(true);
         this->found_ = true;
         return true;
     }

From b6073408f4a820b2c38da517f9092a1f8abdfe1c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sat, 15 Oct 2022 08:35:35 +1300
Subject: [PATCH 149/838] Remove address type map from bluetooth proxy (#3905)

---
 .../bluetooth_proxy/bluetooth_proxy.cpp       | 21 -------------------
 .../bluetooth_proxy/bluetooth_proxy.h         |  1 -
 2 files changed, 22 deletions(-)

diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index a08c58bd9e..cc1c178b08 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -26,16 +26,9 @@ bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device)
            device.get_rssi());
   this->send_api_packet_(device);
 
-  this->address_type_map_[device.address_uint64()] = device.get_address_type();
-
   if (this->address_ == 0)
     return true;
 
-  if (this->state_ == espbt::ClientState::DISCOVERED) {
-    ESP_LOGV(TAG, "Connecting to address %s", this->address_str().c_str());
-    return true;
-  }
-
   BLEClientBase::parse_device(device);
   return true;
 }
@@ -216,20 +209,6 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
   switch (msg.request_type) {
     case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT: {
       this->address_ = msg.address;
-      if (this->address_type_map_.find(this->address_) != this->address_type_map_.end()) {
-        // Utilise the address type cache
-        this->remote_addr_type_ = this->address_type_map_[this->address_];
-      } else {
-        this->remote_addr_type_ = BLE_ADDR_TYPE_PUBLIC;
-      }
-      this->remote_bda_[0] = (this->address_ >> 40) & 0xFF;
-      this->remote_bda_[1] = (this->address_ >> 32) & 0xFF;
-      this->remote_bda_[2] = (this->address_ >> 24) & 0xFF;
-      this->remote_bda_[3] = (this->address_ >> 16) & 0xFF;
-      this->remote_bda_[4] = (this->address_ >> 8) & 0xFF;
-      this->remote_bda_[5] = (this->address_ >> 0) & 0xFF;
-      this->set_state(espbt::ClientState::DISCOVERED);
-      esp_ble_gap_stop_scanning();
       break;
     }
     case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT: {
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.h b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
index 97047c118b..9529b99f73 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -45,7 +45,6 @@ class BluetoothProxy : public BLEClientBase {
  protected:
   void send_api_packet_(const esp32_ble_tracker::ESPBTDevice &device);
 
-  std::map<uint64_t, esp_ble_addr_type_t> address_type_map_;
   int16_t send_service_{-1};
   bool active_;
 };

From a84378c6c26aed20537810bee5ceb0386339c903 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sat, 15 Oct 2022 08:37:11 +1300
Subject: [PATCH 150/838] Bump version to 2022.10.0b2

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

diff --git a/esphome/const.py b/esphome/const.py
index e0f3bc77b5..9d608ebf9b 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.10.0b1"
+__version__ = "2022.10.0b2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From d1263e583b2b5c41fe73fa3668cae4a5b960a088 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 19 Oct 2022 10:30:22 +1300
Subject: [PATCH 151/838] Bump version to 2022.10.0

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

diff --git a/esphome/const.py b/esphome/const.py
index 9d608ebf9b..d2bac8f9df 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.10.0b2"
+__version__ = "2022.10.0"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 58cd754e0733c22b456e2472e730e9d84b6f12f4 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 19 Oct 2022 10:50:32 +1300
Subject: [PATCH 152/838] Fix bad merge

---
 .../bluetooth_proxy/bluetooth_proxy.cpp       | 72 -------------------
 1 file changed, 72 deletions(-)

diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index 3f06cd5c25..cc1c178b08 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -164,78 +164,6 @@ void BluetoothProxy::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if
   }
 }
 
-void BluetoothProxy::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                                         esp_ble_gattc_cb_param_t *param) {
-  BLEClientBase::gattc_event_handler(event, gattc_if, param);
-  switch (event) {
-    case ESP_GATTC_DISCONNECT_EVT: {
-#ifdef USE_API
-      api::global_api_server->send_bluetooth_device_connection(this->address_, false, this->mtu_,
-                                                               param->disconnect.reason);
-      api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
-                                                              this->get_bluetooth_connections_limit());
-#endif
-      this->address_ = 0;
-    }
-    case ESP_GATTC_OPEN_EVT: {
-      if (param->open.status != ESP_GATT_OK && param->open.status != ESP_GATT_ALREADY_OPEN) {
-#ifdef USE_API
-        api::global_api_server->send_bluetooth_device_connection(this->address_, false, this->mtu_, param->open.status);
-
-#endif
-        break;
-      }
-      break;
-    }
-    case ESP_GATTC_SEARCH_CMPL_EVT: {
-#ifdef USE_API
-      api::global_api_server->send_bluetooth_device_connection(this->address_, true, this->mtu_);
-      api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
-                                                              this->get_bluetooth_connections_limit());
-#endif
-      break;
-    }
-    case ESP_GATTC_READ_DESCR_EVT:
-    case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->conn_id_)
-        break;
-      if (param->read.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "Error reading char/descriptor at handle %d, status=%d", param->read.handle, param->read.status);
-        break;
-      }
-#ifdef USE_API
-      api::BluetoothGATTReadResponse resp;
-      resp.address = this->address_;
-      resp.handle = param->read.handle;
-      resp.data.reserve(param->read.value_len);
-      for (uint16_t i = 0; i < param->read.value_len; i++) {
-        resp.data.push_back(param->read.value[i]);
-      }
-      api::global_api_server->send_bluetooth_gatt_read_response(resp);
-#endif
-      break;
-    }
-    case ESP_GATTC_NOTIFY_EVT: {
-      if (param->notify.conn_id != this->conn_id_)
-        break;
-      ESP_LOGV(TAG, "ESP_GATTC_NOTIFY_EVT: handle=0x%x", param->notify.handle);
-#ifdef USE_API
-      api::BluetoothGATTNotifyDataResponse resp;
-      resp.address = this->address_;
-      resp.handle = param->notify.handle;
-      resp.data.reserve(param->notify.value_len);
-      for (uint16_t i = 0; i < param->notify.value_len; i++) {
-        resp.data.push_back(param->notify.value[i]);
-      }
-      api::global_api_server->send_bluetooth_gatt_notify_data_response(resp);
-#endif
-      break;
-    }
-    default:
-      break;
-  }
-}
-
 void BluetoothProxy::dump_config() { ESP_LOGCONFIG(TAG, "Bluetooth Proxy:"); }
 
 void BluetoothProxy::loop() {

From 4ac72d7d08bc54f06751424ef57b1e794526745b Mon Sep 17 00:00:00 2001
From: Marcel Hoppe <hobbypunk90@users.noreply.github.com>
Date: Wed, 19 Oct 2022 02:44:26 +0200
Subject: [PATCH 153/838] Add support for wl-134 (#3569)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                               |   1 +
 esphome/components/wl_134/__init__.py    |   0
 esphome/components/wl_134/text_sensor.py |  31 +++++++
 esphome/components/wl_134/wl_134.cpp     | 111 +++++++++++++++++++++++
 esphome/components/wl_134/wl_134.h       |  63 +++++++++++++
 5 files changed, 206 insertions(+)
 create mode 100644 esphome/components/wl_134/__init__.py
 create mode 100644 esphome/components/wl_134/text_sensor.py
 create mode 100644 esphome/components/wl_134/wl_134.cpp
 create mode 100644 esphome/components/wl_134/wl_134.h

diff --git a/CODEOWNERS b/CODEOWNERS
index b04b480780..4ac394345c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -254,6 +254,7 @@ esphome/components/wake_on_lan/* @willwill2will54
 esphome/components/web_server_base/* @OttoWinter
 esphome/components/whirlpool/* @glmnet
 esphome/components/whynter/* @aeonsablaze
+esphome/components/wl_134/* @hobbypunk90
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
 esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs
diff --git a/esphome/components/wl_134/__init__.py b/esphome/components/wl_134/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/wl_134/text_sensor.py b/esphome/components/wl_134/text_sensor.py
new file mode 100644
index 0000000000..1373df77f4
--- /dev/null
+++ b/esphome/components/wl_134/text_sensor.py
@@ -0,0 +1,31 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import text_sensor, uart
+from esphome.const import (
+    ICON_FINGERPRINT,
+)
+
+CODEOWNERS = ["@hobbypunk90"]
+DEPENDENCIES = ["uart"]
+CONF_RESET = "reset"
+
+wl134_ns = cg.esphome_ns.namespace("wl_134")
+Wl134Component = wl134_ns.class_(
+    "Wl134Component", text_sensor.TextSensor, cg.Component, uart.UARTDevice
+)
+
+CONFIG_SCHEMA = (
+    text_sensor.text_sensor_schema(
+        Wl134Component,
+        icon=ICON_FINGERPRINT,
+    )
+    .extend({cv.Optional(CONF_RESET, default=False): cv.boolean})
+    .extend(uart.UART_DEVICE_SCHEMA)
+)
+
+
+async def to_code(config):
+    var = await text_sensor.new_text_sensor(config)
+    await cg.register_component(var, config)
+    cg.add(var.set_do_reset(config[CONF_RESET]))
+    await uart.register_uart_device(var, config)
diff --git a/esphome/components/wl_134/wl_134.cpp b/esphome/components/wl_134/wl_134.cpp
new file mode 100644
index 0000000000..3ffa0c63ce
--- /dev/null
+++ b/esphome/components/wl_134/wl_134.cpp
@@ -0,0 +1,111 @@
+#include "wl_134.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace wl_134 {
+
+static const char *const TAG = "wl_134.sensor";
+static const uint8_t ASCII_CR = 0x0D;
+static const uint8_t ASCII_NBSP = 0xFF;
+static const int MAX_DATA_LENGTH_BYTES = 6;
+
+void Wl134Component::setup() { this->publish_state(""); }
+
+void Wl134Component::loop() {
+  while (this->available() >= RFID134_PACKET_SIZE) {
+    Wl134Component::Rfid134Error error = this->read_packet_();
+    if (error != RFID134_ERROR_NONE) {
+      ESP_LOGW(TAG, "Error: %d", error);
+    }
+  }
+}
+
+Wl134Component::Rfid134Error Wl134Component::read_packet_() {
+  uint8_t packet[RFID134_PACKET_SIZE];
+  packet[RFID134_PACKET_START_CODE] = this->read();
+
+  // check for the first byte being the packet start code
+  if (packet[RFID134_PACKET_START_CODE] != 0x02) {
+    // just out of sync, ignore until we are synced up
+    return RFID134_ERROR_NONE;
+  }
+
+  if (!this->read_array(&(packet[RFID134_PACKET_ID]), RFID134_PACKET_SIZE - 1)) {
+    return RFID134_ERROR_PACKET_SIZE;
+  }
+
+  if (packet[RFID134_PACKET_END_CODE] != 0x03) {
+    return RFID134_ERROR_PACKET_END_CODE_MISSMATCH;
+  }
+
+  // calculate checksum
+  uint8_t checksum = 0;
+  for (uint8_t i = RFID134_PACKET_ID; i < RFID134_PACKET_CHECKSUM; i++) {
+    checksum = checksum ^ packet[i];
+  }
+
+  // test checksum
+  if (checksum != packet[RFID134_PACKET_CHECKSUM]) {
+    return RFID134_ERROR_PACKET_CHECKSUM;
+  }
+
+  if (static_cast<uint8_t>(~checksum) != static_cast<uint8_t>(packet[RFID134_PACKET_CHECKSUM_INVERT])) {
+    return RFID134_ERROR_PACKET_CHECKSUM_INVERT;
+  }
+
+  Rfid134Reading reading;
+
+  // convert packet into the reading struct
+  reading.id = this->hex_lsb_ascii_to_uint64_(&(packet[RFID134_PACKET_ID]), RFID134_PACKET_COUNTRY - RFID134_PACKET_ID);
+  reading.country = this->hex_lsb_ascii_to_uint64_(&(packet[RFID134_PACKET_COUNTRY]),
+                                                   RFID134_PACKET_DATA_FLAG - RFID134_PACKET_COUNTRY);
+  reading.isData = packet[RFID134_PACKET_DATA_FLAG] == '1';
+  reading.isAnimal = packet[RFID134_PACKET_ANIMAL_FLAG] == '1';
+  reading.reserved0 = this->hex_lsb_ascii_to_uint64_(&(packet[RFID134_PACKET_RESERVED0]),
+                                                     RFID134_PACKET_RESERVED1 - RFID134_PACKET_RESERVED0);
+  reading.reserved1 = this->hex_lsb_ascii_to_uint64_(&(packet[RFID134_PACKET_RESERVED1]),
+                                                     RFID134_PACKET_CHECKSUM - RFID134_PACKET_RESERVED1);
+
+  ESP_LOGV(TAG, "Tag id:    %012lld", reading.id);
+  ESP_LOGV(TAG, "Country:   %03d", reading.country);
+  ESP_LOGV(TAG, "isData:    %s", reading.isData ? "true" : "false");
+  ESP_LOGV(TAG, "isAnimal:  %s", reading.isAnimal ? "true" : "false");
+  ESP_LOGV(TAG, "Reserved0: %d", reading.reserved0);
+  ESP_LOGV(TAG, "Reserved1: %d", reading.reserved1);
+
+  char buf[20];
+  sprintf(buf, "%03d%012lld", reading.country, reading.id);
+  this->publish_state(buf);
+  if (this->do_reset_) {
+    this->set_timeout(1000, [this]() { this->publish_state(""); });
+  }
+
+  return RFID134_ERROR_NONE;
+}
+
+uint64_t Wl134Component::hex_lsb_ascii_to_uint64_(const uint8_t *text, uint8_t text_size) {
+  uint64_t value = 0;
+  uint8_t i = text_size;
+  do {
+    i--;
+
+    uint8_t digit = text[i];
+    if (digit >= 'A') {
+      digit = digit - 'A' + 10;
+    } else {
+      digit = digit - '0';
+    }
+    value = (value << 4) + digit;
+  } while (i != 0);
+
+  return value;
+}
+
+void Wl134Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "WL-134 Sensor:");
+  LOG_TEXT_SENSOR("", "Tag", this);
+  // As specified in the sensor's data sheet
+  this->check_uart_settings(9600, 1, esphome::uart::UART_CONFIG_PARITY_NONE, 8);
+}
+}  // namespace wl_134
+}  // namespace esphome
diff --git a/esphome/components/wl_134/wl_134.h b/esphome/components/wl_134/wl_134.h
new file mode 100644
index 0000000000..c0a90de17d
--- /dev/null
+++ b/esphome/components/wl_134/wl_134.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#include <string>
+
+#include "esphome/core/component.h"
+#include "esphome/components/text_sensor/text_sensor.h"
+#include "esphome/components/uart/uart.h"
+
+namespace esphome {
+namespace wl_134 {
+
+class Wl134Component : public text_sensor::TextSensor, public Component, public uart::UARTDevice {
+ public:
+  enum Rfid134Error {
+    RFID134_ERROR_NONE,
+
+    // from library
+    RFID134_ERROR_PACKET_SIZE = 0x81,
+    RFID134_ERROR_PACKET_END_CODE_MISSMATCH,
+    RFID134_ERROR_PACKET_CHECKSUM,
+    RFID134_ERROR_PACKET_CHECKSUM_INVERT
+  };
+
+  struct Rfid134Reading {
+    uint16_t country;
+    uint64_t id;
+    bool isData;
+    bool isAnimal;
+    uint16_t reserved0;
+    uint32_t reserved1;
+  };
+  // Nothing really public.
+
+  // ========== INTERNAL METHODS ==========
+  void setup() override;
+  void loop() override;
+  void dump_config() override;
+
+  void set_do_reset(bool do_reset) { this->do_reset_ = do_reset; }
+
+ private:
+  enum DfMp3Packet {
+    RFID134_PACKET_START_CODE,
+    RFID134_PACKET_ID = 1,
+    RFID134_PACKET_COUNTRY = 11,
+    RFID134_PACKET_DATA_FLAG = 15,
+    RFID134_PACKET_ANIMAL_FLAG = 16,
+    RFID134_PACKET_RESERVED0 = 17,
+    RFID134_PACKET_RESERVED1 = 21,
+    RFID134_PACKET_CHECKSUM = 27,
+    RFID134_PACKET_CHECKSUM_INVERT = 28,
+    RFID134_PACKET_END_CODE = 29,
+    RFID134_PACKET_SIZE
+  };
+
+  bool do_reset_;
+
+  Rfid134Error read_packet_();
+  uint64_t hex_lsb_ascii_to_uint64_(const uint8_t *text, uint8_t text_size);
+};
+
+}  // namespace wl_134
+}  // namespace esphome

From 41b5cb06d3d9a58a08fed080741bef35404e149f Mon Sep 17 00:00:00 2001
From: Jadson Santos <42282908+gtjadsonsantos@users.noreply.github.com>
Date: Tue, 18 Oct 2022 21:44:48 -0300
Subject: [PATCH 154/838] New platform ethernet_info from component text_sensor
 (#3811)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                                    |  1 +
 esphome/components/ethernet_info/__init__.py  |  1 +
 .../ethernet_info_text_sensor.cpp             | 16 +++++++++
 .../ethernet_info/ethernet_info_text_sensor.h | 35 +++++++++++++++++++
 .../components/ethernet_info/text_sensor.py   | 34 ++++++++++++++++++
 esphome/core/component.cpp                    |  1 +
 esphome/core/component.h                      |  1 +
 tests/test4.yaml                              |  3 ++
 8 files changed, 92 insertions(+)
 create mode 100644 esphome/components/ethernet_info/__init__.py
 create mode 100644 esphome/components/ethernet_info/ethernet_info_text_sensor.cpp
 create mode 100644 esphome/components/ethernet_info/ethernet_info_text_sensor.h
 create mode 100644 esphome/components/ethernet_info/text_sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index 4ac394345c..d3151c3f02 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -76,6 +76,7 @@ esphome/components/esp32_camera_web_server/* @ayufan
 esphome/components/esp32_can/* @Sympatron
 esphome/components/esp32_improv/* @jesserockz
 esphome/components/esp8266/* @esphome/core
+esphome/components/ethernet_info/* @gtjadsonsantos
 esphome/components/exposure_notifications/* @OttoWinter
 esphome/components/ezo/* @ssieb
 esphome/components/factory_reset/* @anatoly-savchenkov
diff --git a/esphome/components/ethernet_info/__init__.py b/esphome/components/ethernet_info/__init__.py
new file mode 100644
index 0000000000..312688d3fd
--- /dev/null
+++ b/esphome/components/ethernet_info/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@gtjadsonsantos"]
diff --git a/esphome/components/ethernet_info/ethernet_info_text_sensor.cpp b/esphome/components/ethernet_info/ethernet_info_text_sensor.cpp
new file mode 100644
index 0000000000..e69872c290
--- /dev/null
+++ b/esphome/components/ethernet_info/ethernet_info_text_sensor.cpp
@@ -0,0 +1,16 @@
+#include "ethernet_info_text_sensor.h"
+#include "esphome/core/log.h"
+
+#ifdef USE_ESP32_FRAMEWORK_ARDUINO
+
+namespace esphome {
+namespace ethernet_info {
+
+static const char *const TAG = "ethernet_info";
+
+void IPAddressEthernetInfo::dump_config() { LOG_TEXT_SENSOR("", "EthernetInfo IPAddress", this); }
+
+}  // namespace ethernet_info
+}  // namespace esphome
+
+#endif  // USE_ESP32_FRAMEWORK_ARDUINO
diff --git a/esphome/components/ethernet_info/ethernet_info_text_sensor.h b/esphome/components/ethernet_info/ethernet_info_text_sensor.h
new file mode 100644
index 0000000000..c683b68080
--- /dev/null
+++ b/esphome/components/ethernet_info/ethernet_info_text_sensor.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/text_sensor/text_sensor.h"
+#include "esphome/components/ethernet/ethernet_component.h"
+
+#ifdef USE_ESP32_FRAMEWORK_ARDUINO
+
+namespace esphome {
+namespace ethernet_info {
+
+class IPAddressEthernetInfo : public PollingComponent, public text_sensor::TextSensor {
+ public:
+  void update() override {
+    tcpip_adapter_ip_info_t tcpip;
+    tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_ETH, &tcpip);
+    auto ip = tcpip.ip.addr;
+    if (ip != this->last_ip_) {
+      this->last_ip_ = ip;
+      this->publish_state(network::IPAddress(ip).str());
+    }
+  }
+
+  float get_setup_priority() const override { return setup_priority::ETHERNET; }
+  std::string unique_id() override { return get_mac_address() + "-ethernetinfo"; }
+  void dump_config() override;
+
+ protected:
+  network::IPAddress last_ip_;
+};
+
+}  // namespace ethernet_info
+}  // namespace esphome
+
+#endif  // USE_ESP32_FRAMEWORK_ARDUINO
diff --git a/esphome/components/ethernet_info/text_sensor.py b/esphome/components/ethernet_info/text_sensor.py
new file mode 100644
index 0000000000..7cb9944c92
--- /dev/null
+++ b/esphome/components/ethernet_info/text_sensor.py
@@ -0,0 +1,34 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import text_sensor
+from esphome.const import (
+    CONF_IP_ADDRESS,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+)
+
+DEPENDENCIES = ["ethernet"]
+
+ethernet_info_ns = cg.esphome_ns.namespace("ethernet_info")
+
+IPAddressEsthernetInfo = ethernet_info_ns.class_(
+    "IPAddressEthernetInfo", text_sensor.TextSensor, cg.PollingComponent
+)
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.Optional(CONF_IP_ADDRESS): text_sensor.text_sensor_schema(
+            IPAddressEsthernetInfo, entity_category=ENTITY_CATEGORY_DIAGNOSTIC
+        ).extend(cv.polling_component_schema("1s"))
+    }
+)
+
+
+async def setup_conf(config, key):
+    if key in config:
+        conf = config[key]
+        var = await text_sensor.new_text_sensor(conf)
+        await cg.register_component(var, conf)
+
+
+async def to_code(config):
+    await setup_conf(config, CONF_IP_ADDRESS)
diff --git a/esphome/core/component.cpp b/esphome/core/component.cpp
index 5cb063cbec..7505e1f39b 100644
--- a/esphome/core/component.cpp
+++ b/esphome/core/component.cpp
@@ -20,6 +20,7 @@ const float PROCESSOR = 400.0;
 const float BLUETOOTH = 350.0f;
 const float AFTER_BLUETOOTH = 300.0f;
 const float WIFI = 250.0f;
+const float ETHERNET = 250.0f;
 const float BEFORE_CONNECTION = 220.0f;
 const float AFTER_WIFI = 200.0f;
 const float AFTER_CONNECTION = 100.0f;
diff --git a/esphome/core/component.h b/esphome/core/component.h
index cb97a93d21..1d8499e262 100644
--- a/esphome/core/component.h
+++ b/esphome/core/component.h
@@ -29,6 +29,7 @@ extern const float PROCESSOR;
 extern const float BLUETOOTH;
 extern const float AFTER_BLUETOOTH;
 extern const float WIFI;
+extern const float ETHERNET;
 /// For components that should be initialized after WiFi and before API is connected.
 extern const float BEFORE_CONNECTION;
 /// For components that should be initialized after WiFi is connected.
diff --git a/tests/test4.yaml b/tests/test4.yaml
index cf517bb391..a8077c625f 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -532,6 +532,9 @@ text_sensor:
   - platform: copy
     source_id: inverter0_device_mode
     name: Inverter Text Sensor Copy
+  - platform: ethernet_info
+    ip_address:
+      name: IP Address
 
 output:
   - platform: pipsolar

From f30e54d1770f1e38e9a10931fa9199f6dbbe9f9e Mon Sep 17 00:00:00 2001
From: Carlos Gustavo Sarmiento <carlos5678@gmail.com>
Date: Tue, 18 Oct 2022 22:08:27 -0500
Subject: [PATCH 155/838] Implementation for Atlas Scientific Peristaltic Pump
 (#3528)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                                  |   1 +
 esphome/components/ezo_pmp/__init__.py      | 291 +++++++++++
 esphome/components/ezo_pmp/binary_sensor.py |  42 ++
 esphome/components/ezo_pmp/ezo_pmp.cpp      | 542 ++++++++++++++++++++
 esphome/components/ezo_pmp/ezo_pmp.h        | 252 +++++++++
 esphome/components/ezo_pmp/sensor.py        | 104 ++++
 esphome/components/ezo_pmp/text_sensor.py   |  39 ++
 tests/test5.yaml                            |  54 ++
 8 files changed, 1325 insertions(+)
 create mode 100644 esphome/components/ezo_pmp/__init__.py
 create mode 100644 esphome/components/ezo_pmp/binary_sensor.py
 create mode 100644 esphome/components/ezo_pmp/ezo_pmp.cpp
 create mode 100644 esphome/components/ezo_pmp/ezo_pmp.h
 create mode 100644 esphome/components/ezo_pmp/sensor.py
 create mode 100644 esphome/components/ezo_pmp/text_sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index d3151c3f02..86e6cd978b 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -79,6 +79,7 @@ esphome/components/esp8266/* @esphome/core
 esphome/components/ethernet_info/* @gtjadsonsantos
 esphome/components/exposure_notifications/* @OttoWinter
 esphome/components/ezo/* @ssieb
+esphome/components/ezo_pmp/* @carlos-sarmiento
 esphome/components/factory_reset/* @anatoly-savchenkov
 esphome/components/fastled_base/* @OttoWinter
 esphome/components/feedback/* @ianchi
diff --git a/esphome/components/ezo_pmp/__init__.py b/esphome/components/ezo_pmp/__init__.py
new file mode 100644
index 0000000000..e65fcf74ca
--- /dev/null
+++ b/esphome/components/ezo_pmp/__init__.py
@@ -0,0 +1,291 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c
+from esphome.const import CONF_ADDRESS, CONF_COMMAND, CONF_ID, CONF_DURATION
+from esphome import automation
+from esphome.automation import maybe_simple_id
+
+CODEOWNERS = ["@carlos-sarmiento"]
+DEPENDENCIES = ["i2c"]
+MULTI_CONF = True
+
+CONF_VOLUME = "volume"
+CONF_VOLUME_PER_MINUTE = "volume_per_minute"
+
+ezo_pmp_ns = cg.esphome_ns.namespace("ezo_pmp")
+EzoPMP = ezo_pmp_ns.class_("EzoPMP", cg.PollingComponent, i2c.I2CDevice)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(EzoPMP),
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(103))
+)
+
+
+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)
+
+
+EZO_PMP_NO_ARGS_ACTION_SCHEMA = maybe_simple_id(
+    {
+        cv.Required(CONF_ID): cv.use_id(EzoPMP),
+    }
+)
+
+# Actions that do not require more arguments
+
+EzoPMPFindAction = ezo_pmp_ns.class_("EzoPMPFindAction", automation.Action)
+EzoPMPClearTotalVolumeDispensedAction = ezo_pmp_ns.class_(
+    "EzoPMPClearTotalVolumeDispensedAction", automation.Action
+)
+EzoPMPClearCalibrationAction = ezo_pmp_ns.class_(
+    "EzoPMPClearCalibrationAction", automation.Action
+)
+EzoPMPPauseDosingAction = ezo_pmp_ns.class_(
+    "EzoPMPPauseDosingAction", automation.Action
+)
+EzoPMPStopDosingAction = ezo_pmp_ns.class_("EzoPMPStopDosingAction", automation.Action)
+EzoPMPDoseContinuouslyAction = ezo_pmp_ns.class_(
+    "EzoPMPDoseContinuouslyAction", automation.Action
+)
+
+# Actions that require more arguments
+EzoPMPDoseVolumeAction = ezo_pmp_ns.class_("EzoPMPDoseVolumeAction", automation.Action)
+EzoPMPDoseVolumeOverTimeAction = ezo_pmp_ns.class_(
+    "EzoPMPDoseVolumeOverTimeAction", automation.Action
+)
+EzoPMPDoseWithConstantFlowRateAction = ezo_pmp_ns.class_(
+    "EzoPMPDoseWithConstantFlowRateAction", automation.Action
+)
+EzoPMPSetCalibrationVolumeAction = ezo_pmp_ns.class_(
+    "EzoPMPSetCalibrationVolumeAction", automation.Action
+)
+EzoPMPChangeI2CAddressAction = ezo_pmp_ns.class_(
+    "EzoPMPChangeI2CAddressAction", automation.Action
+)
+EzoPMPArbitraryCommandAction = ezo_pmp_ns.class_(
+    "EzoPMPArbitraryCommandAction", automation.Action
+)
+
+
+@automation.register_action(
+    "ezo_pmp.find", EzoPMPFindAction, EZO_PMP_NO_ARGS_ACTION_SCHEMA
+)
+async def ezo_pmp_find_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)
+
+
+@automation.register_action(
+    "ezo_pmp.dose_continuously",
+    EzoPMPDoseContinuouslyAction,
+    EZO_PMP_NO_ARGS_ACTION_SCHEMA,
+)
+async def ezo_pmp_dose_continuously_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)
+
+
+@automation.register_action(
+    "ezo_pmp.clear_total_volume_dosed",
+    EzoPMPClearTotalVolumeDispensedAction,
+    EZO_PMP_NO_ARGS_ACTION_SCHEMA,
+)
+async def ezo_pmp_clear_total_volume_dosed_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)
+
+
+@automation.register_action(
+    "ezo_pmp.clear_calibration",
+    EzoPMPClearCalibrationAction,
+    EZO_PMP_NO_ARGS_ACTION_SCHEMA,
+)
+async def ezo_pmp_clear_calibration_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)
+
+
+@automation.register_action(
+    "ezo_pmp.pause_dosing", EzoPMPPauseDosingAction, EZO_PMP_NO_ARGS_ACTION_SCHEMA
+)
+async def ezo_pmp_pause_dosing_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)
+
+
+@automation.register_action(
+    "ezo_pmp.stop_dosing", EzoPMPStopDosingAction, EZO_PMP_NO_ARGS_ACTION_SCHEMA
+)
+async def ezo_pmp_stop_dosing_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)
+
+
+# Actions that require Multiple Args
+
+EZO_PMP_DOSE_VOLUME_ACTION_SCHEMA = cv.All(
+    {
+        cv.Required(CONF_ID): cv.use_id(EzoPMP),
+        cv.Required(CONF_VOLUME): cv.templatable(
+            cv.float_range()
+        ),  # Any way to represent as proper volume (vs. raw int)
+    }
+)
+
+
+@automation.register_action(
+    "ezo_pmp.dose_volume", EzoPMPDoseVolumeAction, EZO_PMP_DOSE_VOLUME_ACTION_SCHEMA
+)
+async def ezo_pmp_dose_volume_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_VOLUME], args, cg.double)
+    cg.add(var.set_volume(template_))
+
+    return var
+
+
+EZO_PMP_DOSE_VOLUME_OVER_TIME_ACTION_SCHEMA = cv.All(
+    {
+        cv.Required(CONF_ID): cv.use_id(EzoPMP),
+        cv.Required(CONF_VOLUME): cv.templatable(
+            cv.float_range()
+        ),  # Any way to represent as proper volume (vs. raw int)
+        cv.Required(CONF_DURATION): cv.templatable(
+            cv.int_range(1)
+        ),  # Any way to represent it as minutes (vs. raw int)
+    }
+)
+
+
+@automation.register_action(
+    "ezo_pmp.dose_volume_over_time",
+    EzoPMPDoseVolumeOverTimeAction,
+    EZO_PMP_DOSE_VOLUME_OVER_TIME_ACTION_SCHEMA,
+)
+async def ezo_pmp_dose_volume_over_time_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_VOLUME], args, cg.double)
+    cg.add(var.set_volume(template_))
+
+    template_ = await cg.templatable(config[CONF_DURATION], args, int)
+    cg.add(var.set_duration(template_))
+
+    return var
+
+
+EZO_PMP_DOSE_WITH_CONSTANT_FLOW_RATE_ACTION_SCHEMA = cv.All(
+    {
+        cv.Required(CONF_ID): cv.use_id(EzoPMP),
+        cv.Required(CONF_VOLUME_PER_MINUTE): cv.templatable(
+            cv.float_range()
+        ),  # Any way to represent as proper volume (vs. raw int)
+        cv.Required(CONF_DURATION): cv.templatable(
+            cv.int_range(1)
+        ),  # Any way to represent it as minutes (vs. raw int)
+    }
+)
+
+
+@automation.register_action(
+    "ezo_pmp.dose_with_constant_flow_rate",
+    EzoPMPDoseWithConstantFlowRateAction,
+    EZO_PMP_DOSE_WITH_CONSTANT_FLOW_RATE_ACTION_SCHEMA,
+)
+async def ezo_pmp_dose_with_constant_flow_rate_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_VOLUME_PER_MINUTE], args, cg.double)
+    cg.add(var.set_volume(template_))
+
+    template_ = await cg.templatable(config[CONF_DURATION], args, int)
+    cg.add(var.set_duration(template_))
+
+    return var
+
+
+EZO_PMP_SET_CALIBRATION_VOLUME_ACTION_SCHEMA = cv.All(
+    {
+        cv.Required(CONF_ID): cv.use_id(EzoPMP),
+        cv.Required(CONF_VOLUME): cv.templatable(
+            cv.float_range()
+        ),  # Any way to represent as proper volume (vs. raw int)
+    }
+)
+
+
+@automation.register_action(
+    "ezo_pmp.set_calibration_volume",
+    EzoPMPSetCalibrationVolumeAction,
+    EZO_PMP_SET_CALIBRATION_VOLUME_ACTION_SCHEMA,
+)
+async def ezo_pmp_set_calibration_volume_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_VOLUME], args, cg.double)
+    cg.add(var.set_volume(template_))
+
+    return var
+
+
+EZO_PMP_CHANGE_I2C_ADDRESS_ACTION_SCHEMA = cv.All(
+    {
+        cv.Required(CONF_ID): cv.use_id(EzoPMP),
+        cv.Required(CONF_ADDRESS): cv.templatable(cv.int_range(min=1, max=127)),
+    }
+)
+
+
+@automation.register_action(
+    "ezo_pmp.change_i2c_address",
+    EzoPMPChangeI2CAddressAction,
+    EZO_PMP_CHANGE_I2C_ADDRESS_ACTION_SCHEMA,
+)
+async def ezo_pmp_change_i2c_address_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_ADDRESS], args, cg.double)
+    cg.add(var.set_address(template_))
+
+    return var
+
+
+EZO_PMP_ARBITRARY_COMMAND_ACTION_SCHEMA = cv.All(
+    {
+        cv.Required(CONF_ID): cv.use_id(EzoPMP),
+        cv.Required(CONF_COMMAND): cv.templatable(cv.string_strict),
+    }
+)
+
+
+@automation.register_action(
+    "ezo_pmp.arbitrary_command",
+    EzoPMPArbitraryCommandAction,
+    EZO_PMP_ARBITRARY_COMMAND_ACTION_SCHEMA,
+)
+async def ezo_pmp_arbitrary_command_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_COMMAND], args, cg.std_string)
+    cg.add(var.set_command(template_))
+
+    return var
diff --git a/esphome/components/ezo_pmp/binary_sensor.py b/esphome/components/ezo_pmp/binary_sensor.py
new file mode 100644
index 0000000000..582eb7af25
--- /dev/null
+++ b/esphome/components/ezo_pmp/binary_sensor.py
@@ -0,0 +1,42 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import binary_sensor
+from esphome.const import (
+    ENTITY_CATEGORY_NONE,
+    DEVICE_CLASS_RUNNING,
+    DEVICE_CLASS_EMPTY,
+    CONF_ID,
+)
+
+from . import EzoPMP
+
+DEPENDENCIES = ["ezo_pmp"]
+
+CONF_PUMP_STATE = "pump_state"
+CONF_IS_PAUSED = "is_paused"
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.use_id(EzoPMP),
+        cv.Optional(CONF_PUMP_STATE): binary_sensor.binary_sensor_schema(
+            device_class=DEVICE_CLASS_RUNNING,
+            entity_category=ENTITY_CATEGORY_NONE,
+        ),
+        cv.Optional(CONF_IS_PAUSED): binary_sensor.binary_sensor_schema(
+            device_class=DEVICE_CLASS_EMPTY,
+            entity_category=ENTITY_CATEGORY_NONE,
+        ),
+    }
+)
+
+
+async def to_code(config):
+    parent = await cg.get_variable(config[CONF_ID])
+
+    if CONF_PUMP_STATE in config:
+        sens = await binary_sensor.new_binary_sensor(config[CONF_PUMP_STATE])
+        cg.add(parent.set_is_dosing(sens))
+
+    if CONF_IS_PAUSED in config:
+        sens = await binary_sensor.new_binary_sensor(config[CONF_IS_PAUSED])
+        cg.add(parent.set_is_paused(sens))
diff --git a/esphome/components/ezo_pmp/ezo_pmp.cpp b/esphome/components/ezo_pmp/ezo_pmp.cpp
new file mode 100644
index 0000000000..9c96ce2af0
--- /dev/null
+++ b/esphome/components/ezo_pmp/ezo_pmp.cpp
@@ -0,0 +1,542 @@
+#include "ezo_pmp.h"
+#include "esphome/core/log.h"
+#include "esphome/core/hal.h"
+
+namespace esphome {
+namespace ezo_pmp {
+
+static const char *const TAG = "ezo-pmp";
+
+static const uint16_t EZO_PMP_COMMAND_NONE = 0;
+static const uint16_t EZO_PMP_COMMAND_TYPE_READ = 1;
+
+static const uint16_t EZO_PMP_COMMAND_FIND = 2;
+static const uint16_t EZO_PMP_COMMAND_DOSE_CONTINUOUSLY = 4;
+static const uint16_t EZO_PMP_COMMAND_DOSE_VOLUME = 8;
+static const uint16_t EZO_PMP_COMMAND_DOSE_VOLUME_OVER_TIME = 16;
+static const uint16_t EZO_PMP_COMMAND_DOSE_WITH_CONSTANT_FLOW_RATE = 32;
+static const uint16_t EZO_PMP_COMMAND_SET_CALIBRATION_VOLUME = 64;
+static const uint16_t EZO_PMP_COMMAND_CLEAR_TOTAL_VOLUME_DOSED = 128;
+static const uint16_t EZO_PMP_COMMAND_CLEAR_CALIBRATION = 256;
+static const uint16_t EZO_PMP_COMMAND_PAUSE_DOSING = 512;
+static const uint16_t EZO_PMP_COMMAND_STOP_DOSING = 1024;
+static const uint16_t EZO_PMP_COMMAND_CHANGE_I2C_ADDRESS = 2048;
+static const uint16_t EZO_PMP_COMMAND_EXEC_ARBITRARY_COMMAND_ADDRESS = 4096;
+
+static const uint16_t EZO_PMP_COMMAND_READ_DOSING = 3;
+static const uint16_t EZO_PMP_COMMAND_READ_SINGLE_REPORT = 5;
+static const uint16_t EZO_PMP_COMMAND_READ_MAX_FLOW_RATE = 9;
+static const uint16_t EZO_PMP_COMMAND_READ_PAUSE_STATUS = 17;
+static const uint16_t EZO_PMP_COMMAND_READ_TOTAL_VOLUME_DOSED = 33;
+static const uint16_t EZO_PMP_COMMAND_READ_ABSOLUTE_TOTAL_VOLUME_DOSED = 65;
+static const uint16_t EZO_PMP_COMMAND_READ_CALIBRATION_STATUS = 129;
+static const uint16_t EZO_PMP_COMMAND_READ_PUMP_VOLTAGE = 257;
+
+static const std::string DOSING_MODE_NONE = "None";
+static const std::string DOSING_MODE_VOLUME = "Volume";
+static const std::string DOSING_MODE_VOLUME_OVER_TIME = "Volume/Time";
+static const std::string DOSING_MODE_CONSTANT_FLOW_RATE = "Constant Flow Rate";
+static const std::string DOSING_MODE_CONTINUOUS = "Continuous";
+
+void EzoPMP::dump_config() {
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed())
+    ESP_LOGE(TAG, "Communication with EZO-PMP circuit failed!");
+  LOG_UPDATE_INTERVAL(this);
+}
+
+void EzoPMP::update() {
+  if (this->is_waiting_) {
+    return;
+  }
+
+  if (this->is_first_read_) {
+    this->queue_command_(EZO_PMP_COMMAND_READ_CALIBRATION_STATUS, 0, 0, (bool) this->calibration_status_);
+    this->queue_command_(EZO_PMP_COMMAND_READ_MAX_FLOW_RATE, 0, 0, (bool) this->max_flow_rate_);
+    this->queue_command_(EZO_PMP_COMMAND_READ_SINGLE_REPORT, 0, 0, (bool) this->current_volume_dosed_);
+    this->queue_command_(EZO_PMP_COMMAND_READ_TOTAL_VOLUME_DOSED, 0, 0, (bool) this->total_volume_dosed_);
+    this->queue_command_(EZO_PMP_COMMAND_READ_ABSOLUTE_TOTAL_VOLUME_DOSED, 0, 0,
+                         (bool) this->absolute_total_volume_dosed_);
+    this->queue_command_(EZO_PMP_COMMAND_READ_PAUSE_STATUS, 0, 0, true);
+    this->is_first_read_ = false;
+  }
+
+  if (!this->is_waiting_ && this->peek_next_command_() == EZO_PMP_COMMAND_NONE) {
+    this->queue_command_(EZO_PMP_COMMAND_READ_DOSING, 0, 0, true);
+
+    if (this->is_dosing_flag_) {
+      this->queue_command_(EZO_PMP_COMMAND_READ_SINGLE_REPORT, 0, 0, (bool) this->current_volume_dosed_);
+      this->queue_command_(EZO_PMP_COMMAND_READ_TOTAL_VOLUME_DOSED, 0, 0, (bool) this->total_volume_dosed_);
+      this->queue_command_(EZO_PMP_COMMAND_READ_ABSOLUTE_TOTAL_VOLUME_DOSED, 0, 0,
+                           (bool) this->absolute_total_volume_dosed_);
+    }
+
+    this->queue_command_(EZO_PMP_COMMAND_READ_PUMP_VOLTAGE, 0, 0, (bool) this->pump_voltage_);
+  } else {
+    ESP_LOGV(TAG, "Not Scheduling new Command during update()");
+  }
+}
+
+void EzoPMP::loop() {
+  // If we are not waiting for anything and there is no command to be sent, return
+  if (!this->is_waiting_ && this->peek_next_command_() == EZO_PMP_COMMAND_NONE) {
+    return;
+  }
+
+  // If we are not waiting for anything and there IS a command to be sent, do it.
+  if (!this->is_waiting_ && this->peek_next_command_() != EZO_PMP_COMMAND_NONE) {
+    this->send_next_command_();
+  }
+
+  // If we are waiting for something but it isn't ready yet, then return
+  if (this->is_waiting_ && millis() - this->start_time_ < this->wait_time_) {
+    return;
+  }
+
+  // We are waiting for something and it should be ready.
+  this->read_command_result_();
+}
+
+void EzoPMP::clear_current_command_() {
+  this->current_command_ = EZO_PMP_COMMAND_NONE;
+  this->is_waiting_ = false;
+}
+
+void EzoPMP::read_command_result_() {
+  uint8_t response_buffer[21] = {'\0'};
+
+  response_buffer[0] = 0;
+  if (!this->read_bytes_raw(response_buffer, 20)) {
+    ESP_LOGE(TAG, "read error");
+    this->clear_current_command_();
+    return;
+  }
+
+  switch (response_buffer[0]) {
+    case 254:
+      return;  // keep waiting
+    case 1:
+      break;
+    case 2:
+      ESP_LOGE(TAG, "device returned a syntax error");
+      this->clear_current_command_();
+      return;
+    case 255:
+      ESP_LOGE(TAG, "device returned no data");
+      this->clear_current_command_();
+      return;
+    default:
+      ESP_LOGE(TAG, "device returned an unknown response: %d", response_buffer[0]);
+      this->clear_current_command_();
+      return;
+  }
+
+  char first_parameter_buffer[10] = {'\0'};
+  char second_parameter_buffer[10] = {'\0'};
+  char third_parameter_buffer[10] = {'\0'};
+
+  first_parameter_buffer[0] = '\0';
+  second_parameter_buffer[0] = '\0';
+  third_parameter_buffer[0] = '\0';
+
+  int current_parameter = 1;
+
+  size_t position_in_parameter_buffer = 0;
+  // some sensors return multiple comma-separated values, terminate string after first one
+  for (size_t i = 1; i < sizeof(response_buffer) - 1; i++) {
+    char current_char = response_buffer[i];
+
+    if (current_char == '\0') {
+      ESP_LOGV(TAG, "Read Response from device: %s", (char *) response_buffer);
+      ESP_LOGV(TAG, "First Component: %s", (char *) first_parameter_buffer);
+      ESP_LOGV(TAG, "Second Component: %s", (char *) second_parameter_buffer);
+      ESP_LOGV(TAG, "Third Component: %s", (char *) third_parameter_buffer);
+
+      break;
+    }
+
+    if (current_char == ',') {
+      current_parameter++;
+      position_in_parameter_buffer = 0;
+      continue;
+    }
+
+    switch (current_parameter) {
+      case 1:
+        first_parameter_buffer[position_in_parameter_buffer] = current_char;
+        first_parameter_buffer[position_in_parameter_buffer + 1] = '\0';
+        break;
+      case 2:
+        second_parameter_buffer[position_in_parameter_buffer] = current_char;
+        second_parameter_buffer[position_in_parameter_buffer + 1] = '\0';
+        break;
+      case 3:
+        third_parameter_buffer[position_in_parameter_buffer] = current_char;
+        third_parameter_buffer[position_in_parameter_buffer + 1] = '\0';
+        break;
+    }
+
+    position_in_parameter_buffer++;
+  }
+
+  auto parsed_first_parameter = parse_number<float>(first_parameter_buffer);
+  auto parsed_second_parameter = parse_number<float>(second_parameter_buffer);
+  auto parsed_third_parameter = parse_number<float>(third_parameter_buffer);
+
+  switch (this->current_command_) {
+    // Read Commands
+    case EZO_PMP_COMMAND_READ_DOSING:  // Page 54
+      if (parsed_third_parameter.has_value())
+        this->is_dosing_flag_ = parsed_third_parameter.value_or(0) == 1;
+
+      if (this->is_dosing_)
+        this->is_dosing_->publish_state(this->is_dosing_flag_);
+
+      if (parsed_second_parameter.has_value() && this->last_volume_requested_) {
+        this->last_volume_requested_->publish_state(parsed_second_parameter.value_or(0));
+      }
+
+      if (!this->is_dosing_flag_ && !this->is_paused_flag_) {
+        // If pump is not paused and not dispensing
+        if (this->dosing_mode_ && this->dosing_mode_->state != DOSING_MODE_NONE)
+          this->dosing_mode_->publish_state(DOSING_MODE_NONE);
+      }
+
+      break;
+
+    case EZO_PMP_COMMAND_READ_SINGLE_REPORT:  // Single Report (page 53)
+      if (parsed_first_parameter.has_value() && (bool) this->current_volume_dosed_) {
+        this->current_volume_dosed_->publish_state(parsed_first_parameter.value_or(0));
+      }
+      break;
+
+    case EZO_PMP_COMMAND_READ_MAX_FLOW_RATE:  // Constant Flow Rate (page 57)
+      if (parsed_second_parameter.has_value() && this->max_flow_rate_)
+        this->max_flow_rate_->publish_state(parsed_second_parameter.value_or(0));
+      break;
+
+    case EZO_PMP_COMMAND_READ_PAUSE_STATUS:  // Pause (page 61)
+      if (parsed_second_parameter.has_value())
+        this->is_paused_flag_ = parsed_second_parameter.value_or(0) == 1;
+
+      if (this->is_paused_)
+        this->is_paused_->publish_state(this->is_paused_flag_);
+      break;
+
+    case EZO_PMP_COMMAND_READ_TOTAL_VOLUME_DOSED:  // Total Volume Dispensed (page 64)
+      if (parsed_second_parameter.has_value() && this->total_volume_dosed_)
+        this->total_volume_dosed_->publish_state(parsed_second_parameter.value_or(0));
+      break;
+
+    case EZO_PMP_COMMAND_READ_ABSOLUTE_TOTAL_VOLUME_DOSED:  // Total Volume Dispensed (page 64)
+      if (parsed_second_parameter.has_value() && this->absolute_total_volume_dosed_)
+        this->absolute_total_volume_dosed_->publish_state(parsed_second_parameter.value_or(0));
+      break;
+
+    case EZO_PMP_COMMAND_READ_CALIBRATION_STATUS:  // Calibration (page 65)
+      if (parsed_second_parameter.has_value() && this->calibration_status_) {
+        if (parsed_second_parameter.value_or(0) == 1) {
+          this->calibration_status_->publish_state("Fixed Volume");
+        } else if (parsed_second_parameter.value_or(0) == 2) {
+          this->calibration_status_->publish_state("Volume/Time");
+        } else if (parsed_second_parameter.value_or(0) == 3) {
+          this->calibration_status_->publish_state("Fixed Volume & Volume/Time");
+        } else {
+          this->calibration_status_->publish_state("Uncalibrated");
+        }
+      }
+      break;
+
+    case EZO_PMP_COMMAND_READ_PUMP_VOLTAGE:  // Pump Voltage (page 67)
+      if (parsed_second_parameter.has_value() && this->pump_voltage_)
+        this->pump_voltage_->publish_state(parsed_second_parameter.value_or(0));
+      break;
+
+      // Non-Read Commands
+
+    case EZO_PMP_COMMAND_DOSE_VOLUME:  // Volume Dispensing (page 55)
+      if (this->dosing_mode_ && this->dosing_mode_->state != DOSING_MODE_VOLUME)
+        this->dosing_mode_->publish_state(DOSING_MODE_VOLUME);
+      break;
+
+    case EZO_PMP_COMMAND_DOSE_VOLUME_OVER_TIME:  // Dose over time (page 56)
+      if (this->dosing_mode_ && this->dosing_mode_->state != DOSING_MODE_VOLUME_OVER_TIME)
+        this->dosing_mode_->publish_state(DOSING_MODE_VOLUME_OVER_TIME);
+      break;
+
+    case EZO_PMP_COMMAND_DOSE_WITH_CONSTANT_FLOW_RATE:  // Constant Flow Rate (page 57)
+      if (this->dosing_mode_ && this->dosing_mode_->state != DOSING_MODE_CONSTANT_FLOW_RATE)
+        this->dosing_mode_->publish_state(DOSING_MODE_CONSTANT_FLOW_RATE);
+      break;
+
+    case EZO_PMP_COMMAND_DOSE_CONTINUOUSLY:  // Continuous Dispensing (page 54)
+      if (this->dosing_mode_ && this->dosing_mode_->state != DOSING_MODE_CONTINUOUS)
+        this->dosing_mode_->publish_state(DOSING_MODE_CONTINUOUS);
+      break;
+
+    case EZO_PMP_COMMAND_STOP_DOSING:  // Stop (page 62)
+      this->is_paused_flag_ = false;
+      if (this->is_paused_)
+        this->is_paused_->publish_state(this->is_paused_flag_);
+      if (this->dosing_mode_ && this->dosing_mode_->state != DOSING_MODE_NONE)
+        this->dosing_mode_->publish_state(DOSING_MODE_NONE);
+      break;
+
+    case EZO_PMP_COMMAND_EXEC_ARBITRARY_COMMAND_ADDRESS:
+      ESP_LOGI(TAG, "Arbitrary Command Response: %s", (char *) response_buffer);
+      break;
+
+    case EZO_PMP_COMMAND_CLEAR_CALIBRATION:         // Clear Calibration (page 65)
+    case EZO_PMP_COMMAND_PAUSE_DOSING:              // Pause (page 61)
+    case EZO_PMP_COMMAND_SET_CALIBRATION_VOLUME:    // Set Calibration Volume (page 65)
+    case EZO_PMP_COMMAND_CLEAR_TOTAL_VOLUME_DOSED:  // Clear Total Volume Dosed (page 64)
+    case EZO_PMP_COMMAND_FIND:                      // Find (page 52)
+      // Nothing to do here
+      break;
+
+    case EZO_PMP_COMMAND_TYPE_READ:
+    case EZO_PMP_COMMAND_NONE:
+    default:
+      ESP_LOGE(TAG, "Unsupported command received: %d", this->current_command_);
+      return;
+  }
+
+  this->clear_current_command_();
+}
+
+void EzoPMP::send_next_command_() {
+  int wait_time_for_command = 400;  // milliseconds
+  uint8_t command_buffer[21];
+  int command_buffer_length = 0;
+
+  this->pop_next_command_();  // this->next_command will be updated.
+
+  switch (this->next_command_) {
+    // Read Commands
+    case EZO_PMP_COMMAND_READ_DOSING:  // Page 54
+      command_buffer_length = sprintf((char *) command_buffer, "D,?");
+      break;
+
+    case EZO_PMP_COMMAND_READ_SINGLE_REPORT:  // Single Report (page 53)
+      command_buffer_length = sprintf((char *) command_buffer, "R");
+      break;
+
+    case EZO_PMP_COMMAND_READ_MAX_FLOW_RATE:
+      command_buffer_length = sprintf((char *) command_buffer, "DC,?");
+      break;
+
+    case EZO_PMP_COMMAND_READ_PAUSE_STATUS:
+      command_buffer_length = sprintf((char *) command_buffer, "P,?");
+      break;
+
+    case EZO_PMP_COMMAND_READ_TOTAL_VOLUME_DOSED:
+      command_buffer_length = sprintf((char *) command_buffer, "TV,?");
+      break;
+
+    case EZO_PMP_COMMAND_READ_ABSOLUTE_TOTAL_VOLUME_DOSED:
+      command_buffer_length = sprintf((char *) command_buffer, "ATV,?");
+      break;
+
+    case EZO_PMP_COMMAND_READ_CALIBRATION_STATUS:
+      command_buffer_length = sprintf((char *) command_buffer, "Cal,?");
+      break;
+
+    case EZO_PMP_COMMAND_READ_PUMP_VOLTAGE:
+      command_buffer_length = sprintf((char *) command_buffer, "PV,?");
+      break;
+
+      // Non-Read Commands
+
+    case EZO_PMP_COMMAND_FIND:  // Find (page 52)
+      command_buffer_length = sprintf((char *) command_buffer, "Find");
+      wait_time_for_command = 60000;  // This command will block all updates for a minute
+      break;
+
+    case EZO_PMP_COMMAND_DOSE_CONTINUOUSLY:  // Continuous Dispensing (page 54)
+      command_buffer_length = sprintf((char *) command_buffer, "D,*");
+      break;
+
+    case EZO_PMP_COMMAND_CLEAR_TOTAL_VOLUME_DOSED:  // Clear Total Volume Dosed (page 64)
+      command_buffer_length = sprintf((char *) command_buffer, "Clear");
+      break;
+
+    case EZO_PMP_COMMAND_CLEAR_CALIBRATION:  // Clear Calibration (page 65)
+      command_buffer_length = sprintf((char *) command_buffer, "Cal,clear");
+      break;
+
+    case EZO_PMP_COMMAND_PAUSE_DOSING:  // Pause (page 61)
+      command_buffer_length = sprintf((char *) command_buffer, "P");
+      break;
+
+    case EZO_PMP_COMMAND_STOP_DOSING:  // Stop (page 62)
+      command_buffer_length = sprintf((char *) command_buffer, "X");
+      break;
+
+      // Non-Read commands with parameters
+
+    case EZO_PMP_COMMAND_DOSE_VOLUME:  // Volume Dispensing (page 55)
+      command_buffer_length = sprintf((char *) command_buffer, "D,%0.1f", this->next_command_volume_);
+      break;
+
+    case EZO_PMP_COMMAND_DOSE_VOLUME_OVER_TIME:  // Dose over time (page 56)
+      command_buffer_length =
+          sprintf((char *) command_buffer, "D,%0.1f,%i", this->next_command_volume_, this->next_command_duration_);
+      break;
+
+    case EZO_PMP_COMMAND_DOSE_WITH_CONSTANT_FLOW_RATE:  // Constant Flow Rate (page 57)
+      command_buffer_length =
+          sprintf((char *) command_buffer, "DC,%0.1f,%i", this->next_command_volume_, this->next_command_duration_);
+      break;
+
+    case EZO_PMP_COMMAND_SET_CALIBRATION_VOLUME:  // Set Calibration Volume (page 65)
+      command_buffer_length = sprintf((char *) command_buffer, "Cal,%0.2f", this->next_command_volume_);
+      break;
+
+    case EZO_PMP_COMMAND_CHANGE_I2C_ADDRESS:  // Change I2C Address (page 73)
+      command_buffer_length = sprintf((char *) command_buffer, "I2C,%i", this->next_command_duration_);
+      break;
+
+    case EZO_PMP_COMMAND_EXEC_ARBITRARY_COMMAND_ADDRESS:  // Run an arbitrary command
+      command_buffer_length = sprintf((char *) command_buffer, this->arbitrary_command_, this->next_command_duration_);
+      ESP_LOGI(TAG, "Sending arbitrary command: %s", (char *) command_buffer);
+      break;
+
+    case EZO_PMP_COMMAND_TYPE_READ:
+    case EZO_PMP_COMMAND_NONE:
+    default:
+      ESP_LOGE(TAG, "Unsupported command received: %d", this->next_command_);
+      return;
+  }
+
+  // Send command
+  ESP_LOGV(TAG, "Sending command to device: %s", (char *) command_buffer);
+  this->write(command_buffer, command_buffer_length);
+
+  this->current_command_ = this->next_command_;
+  this->next_command_ = EZO_PMP_COMMAND_NONE;
+  this->is_waiting_ = true;
+  this->start_time_ = millis();
+  this->wait_time_ = wait_time_for_command;
+}
+
+void EzoPMP::pop_next_command_() {
+  if (this->next_command_queue_length_ <= 0) {
+    ESP_LOGE(TAG, "Tried to dequeue command from empty queue");
+    this->next_command_ = EZO_PMP_COMMAND_NONE;
+    this->next_command_volume_ = 0;
+    this->next_command_duration_ = 0;
+    return;
+  }
+
+  // Read from Head
+  this->next_command_ = this->next_command_queue_[this->next_command_queue_head_];
+  this->next_command_volume_ = this->next_command_volume_queue_[this->next_command_queue_head_];
+  this->next_command_duration_ = this->next_command_duration_queue_[this->next_command_queue_head_];
+
+  // Move positions
+  next_command_queue_head_++;
+  if (next_command_queue_head_ >= 10) {
+    next_command_queue_head_ = 0;
+  }
+
+  next_command_queue_length_--;
+}
+
+uint16_t EzoPMP::peek_next_command_() {
+  if (this->next_command_queue_length_ <= 0) {
+    return EZO_PMP_COMMAND_NONE;
+  }
+
+  return this->next_command_queue_[this->next_command_queue_head_];
+}
+
+void EzoPMP::queue_command_(uint16_t command, double volume, int duration, bool should_schedule) {
+  if (!should_schedule) {
+    return;
+  }
+
+  if (this->next_command_queue_length_ >= 10) {
+    ESP_LOGE(TAG, "Tried to queue command '%d' but queue is full", command);
+    return;
+  }
+
+  this->next_command_queue_[this->next_command_queue_last_] = command;
+  this->next_command_volume_queue_[this->next_command_queue_last_] = volume;
+  this->next_command_duration_queue_[this->next_command_queue_last_] = duration;
+
+  ESP_LOGV(TAG, "Queue command '%d' in position '%d'", command, next_command_queue_last_);
+
+  // Move positions
+  next_command_queue_last_++;
+  if (next_command_queue_last_ >= 10) {
+    next_command_queue_last_ = 0;
+  }
+
+  next_command_queue_length_++;
+}
+
+// Actions
+
+void EzoPMP::find() { this->queue_command_(EZO_PMP_COMMAND_FIND, 0, 0, true); }
+
+void EzoPMP::dose_continuously() {
+  this->queue_command_(EZO_PMP_COMMAND_DOSE_CONTINUOUSLY, 0, 0, true);
+  this->queue_command_(EZO_PMP_COMMAND_READ_DOSING, 0, 0, true);
+  this->queue_command_(EZO_PMP_COMMAND_READ_SINGLE_REPORT, 0, 0, (bool) this->current_volume_dosed_);
+}
+
+void EzoPMP::dose_volume(double volume) {
+  this->queue_command_(EZO_PMP_COMMAND_DOSE_VOLUME, volume, 0, true);
+  this->queue_command_(EZO_PMP_COMMAND_READ_DOSING, 0, 0, true);
+  this->queue_command_(EZO_PMP_COMMAND_READ_SINGLE_REPORT, 0, 0, (bool) this->current_volume_dosed_);
+}
+
+void EzoPMP::dose_volume_over_time(double volume, int duration) {
+  this->queue_command_(EZO_PMP_COMMAND_DOSE_VOLUME_OVER_TIME, volume, duration, true);
+  this->queue_command_(EZO_PMP_COMMAND_READ_DOSING, 0, 0, true);
+  this->queue_command_(EZO_PMP_COMMAND_READ_SINGLE_REPORT, 0, 0, (bool) this->current_volume_dosed_);
+}
+
+void EzoPMP::dose_with_constant_flow_rate(double volume, int duration) {
+  this->queue_command_(EZO_PMP_COMMAND_DOSE_WITH_CONSTANT_FLOW_RATE, volume, duration, true);
+  this->queue_command_(EZO_PMP_COMMAND_READ_DOSING, 0, 0, true);
+  this->queue_command_(EZO_PMP_COMMAND_READ_SINGLE_REPORT, 0, 0, (bool) this->current_volume_dosed_);
+}
+
+void EzoPMP::set_calibration_volume(double volume) {
+  this->queue_command_(EZO_PMP_COMMAND_SET_CALIBRATION_VOLUME, volume, 0, true);
+  this->queue_command_(EZO_PMP_COMMAND_READ_CALIBRATION_STATUS, 0, 0, true);
+  this->queue_command_(EZO_PMP_COMMAND_READ_MAX_FLOW_RATE, 0, 0, true);
+}
+
+void EzoPMP::clear_total_volume_dosed() {
+  this->queue_command_(EZO_PMP_COMMAND_CLEAR_TOTAL_VOLUME_DOSED, 0, 0, true);
+  this->queue_command_(EZO_PMP_COMMAND_READ_SINGLE_REPORT, 0, 0, true);
+  this->queue_command_(EZO_PMP_COMMAND_READ_TOTAL_VOLUME_DOSED, 0, 0, true);
+  this->queue_command_(EZO_PMP_COMMAND_READ_ABSOLUTE_TOTAL_VOLUME_DOSED, 0, 0, true);
+}
+
+void EzoPMP::clear_calibration() {
+  this->queue_command_(EZO_PMP_COMMAND_CLEAR_CALIBRATION, 0, 0, true);
+  this->queue_command_(EZO_PMP_COMMAND_READ_CALIBRATION_STATUS, 0, 0, true);
+  this->queue_command_(EZO_PMP_COMMAND_READ_MAX_FLOW_RATE, 0, 0, true);
+}
+
+void EzoPMP::pause_dosing() {
+  this->queue_command_(EZO_PMP_COMMAND_PAUSE_DOSING, 0, 0, true);
+  this->queue_command_(EZO_PMP_COMMAND_READ_PAUSE_STATUS, 0, 0, true);
+}
+
+void EzoPMP::stop_dosing() { this->queue_command_(EZO_PMP_COMMAND_STOP_DOSING, 0, 0, true); }
+
+void EzoPMP::change_i2c_address(int address) {
+  this->queue_command_(EZO_PMP_COMMAND_CHANGE_I2C_ADDRESS, 0, address, true);
+}
+
+void EzoPMP::exec_arbitrary_command(const std::basic_string<char> &command) {
+  this->arbitrary_command_ = command.c_str();
+  this->queue_command_(EZO_PMP_COMMAND_EXEC_ARBITRARY_COMMAND_ADDRESS, 0, 0, true);
+}
+
+}  // namespace ezo_pmp
+}  // namespace esphome
diff --git a/esphome/components/ezo_pmp/ezo_pmp.h b/esphome/components/ezo_pmp/ezo_pmp.h
new file mode 100644
index 0000000000..b41710cd78
--- /dev/null
+++ b/esphome/components/ezo_pmp/ezo_pmp.h
@@ -0,0 +1,252 @@
+#pragma once
+
+#include "esphome/core/defines.h"
+#include "esphome/core/component.h"
+#include "esphome/core/automation.h"
+#include "esphome/components/i2c/i2c.h"
+
+#ifdef USE_BINARY_SENSOR
+#include "esphome/components/binary_sensor/binary_sensor.h"
+#endif
+
+#ifdef USE_SENSOR
+#include "esphome/components/sensor/sensor.h"
+#endif
+
+#ifdef USE_TEXT_SENSOR
+#include "esphome/components/text_sensor/text_sensor.h"
+#endif
+
+namespace esphome {
+namespace ezo_pmp {
+
+class EzoPMP : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; };
+
+  void loop() override;
+  void update() override;
+
+#ifdef USE_SENSOR
+  void set_current_volume_dosed(sensor::Sensor *current_volume_dosed) { current_volume_dosed_ = current_volume_dosed; }
+  void set_total_volume_dosed(sensor::Sensor *total_volume_dosed) { total_volume_dosed_ = total_volume_dosed; }
+  void set_absolute_total_volume_dosed(sensor::Sensor *absolute_total_volume_dosed) {
+    absolute_total_volume_dosed_ = absolute_total_volume_dosed;
+  }
+  void set_pump_voltage(sensor::Sensor *pump_voltage) { pump_voltage_ = pump_voltage; }
+  void set_last_volume_requested(sensor::Sensor *last_volume_requested) {
+    last_volume_requested_ = last_volume_requested;
+  }
+  void set_max_flow_rate(sensor::Sensor *max_flow_rate) { max_flow_rate_ = max_flow_rate; }
+#endif
+
+#ifdef USE_BINARY_SENSOR
+  void set_is_dosing(binary_sensor::BinarySensor *is_dosing) { is_dosing_ = is_dosing; }
+  void set_is_paused(binary_sensor::BinarySensor *is_paused) { is_paused_ = is_paused; }
+#endif
+
+#ifdef USE_TEXT_SENSOR
+  void set_dosing_mode(text_sensor::TextSensor *dosing_mode) { dosing_mode_ = dosing_mode; }
+  void set_calibration_status(text_sensor::TextSensor *calibration_status) { calibration_status_ = calibration_status; }
+#endif
+
+  // Actions for EZO-PMP
+  void find();
+  void dose_continuously();
+  void dose_volume(double volume);
+  void dose_volume_over_time(double volume, int duration);
+  void dose_with_constant_flow_rate(double volume, int duration);
+  void set_calibration_volume(double volume);
+  void clear_total_volume_dosed();
+  void clear_calibration();
+  void pause_dosing();
+  void stop_dosing();
+  void change_i2c_address(int address);
+  void exec_arbitrary_command(const std::basic_string<char> &command);
+
+ protected:
+  uint32_t start_time_ = 0;
+  uint32_t wait_time_ = 0;
+  bool is_waiting_ = false;
+  bool is_first_read_ = true;
+
+  uint16_t next_command_ = 0;
+  double next_command_volume_ = 0;  // might be negative
+  int next_command_duration_ = 0;
+
+  uint16_t next_command_queue_[10];
+  double next_command_volume_queue_[10];
+  int next_command_duration_queue_[10];
+  int next_command_queue_head_ = 0;
+  int next_command_queue_last_ = 0;
+  int next_command_queue_length_ = 0;
+
+  uint16_t current_command_ = 0;
+  bool is_paused_flag_ = false;
+  bool is_dosing_flag_ = false;
+
+  const char *arbitrary_command_{nullptr};
+
+  void send_next_command_();
+  void read_command_result_();
+  void clear_current_command_();
+  void queue_command_(uint16_t command, double volume, int duration, bool should_schedule);
+  void pop_next_command_();
+  uint16_t peek_next_command_();
+
+#ifdef USE_SENSOR
+  sensor::Sensor *current_volume_dosed_{nullptr};
+  sensor::Sensor *total_volume_dosed_{nullptr};
+  sensor::Sensor *absolute_total_volume_dosed_{nullptr};
+  sensor::Sensor *pump_voltage_{nullptr};
+  sensor::Sensor *max_flow_rate_{nullptr};
+  sensor::Sensor *last_volume_requested_{nullptr};
+#endif
+
+#ifdef USE_BINARY_SENSOR
+  binary_sensor::BinarySensor *is_dosing_{nullptr};
+  binary_sensor::BinarySensor *is_paused_{nullptr};
+#endif
+
+#ifdef USE_TEXT_SENSOR
+  text_sensor::TextSensor *dosing_mode_{nullptr};
+  text_sensor::TextSensor *calibration_status_{nullptr};
+#endif
+};
+
+// Action Templates
+template<typename... Ts> class EzoPMPFindAction : public Action<Ts...> {
+ public:
+  EzoPMPFindAction(EzoPMP *ezopmp) : ezopmp_(ezopmp) {}
+
+  void play(Ts... x) override { this->ezopmp_->find(); }
+
+ protected:
+  EzoPMP *ezopmp_;
+};
+
+template<typename... Ts> class EzoPMPDoseContinuouslyAction : public Action<Ts...> {
+ public:
+  EzoPMPDoseContinuouslyAction(EzoPMP *ezopmp) : ezopmp_(ezopmp) {}
+
+  void play(Ts... x) override { this->ezopmp_->dose_continuously(); }
+
+ protected:
+  EzoPMP *ezopmp_;
+};
+
+template<typename... Ts> class EzoPMPDoseVolumeAction : public Action<Ts...> {
+ public:
+  EzoPMPDoseVolumeAction(EzoPMP *ezopmp) : ezopmp_(ezopmp) {}
+
+  void play(Ts... x) override { this->ezopmp_->dose_volume(this->volume_.value(x...)); }
+  TEMPLATABLE_VALUE(double, volume)
+
+ protected:
+  EzoPMP *ezopmp_;
+};
+
+template<typename... Ts> class EzoPMPDoseVolumeOverTimeAction : public Action<Ts...> {
+ public:
+  EzoPMPDoseVolumeOverTimeAction(EzoPMP *ezopmp) : ezopmp_(ezopmp) {}
+
+  void play(Ts... x) override {
+    this->ezopmp_->dose_volume_over_time(this->volume_.value(x...), this->duration_.value(x...));
+  }
+  TEMPLATABLE_VALUE(double, volume)
+  TEMPLATABLE_VALUE(int, duration)
+
+ protected:
+  EzoPMP *ezopmp_;
+};
+
+template<typename... Ts> class EzoPMPDoseWithConstantFlowRateAction : public Action<Ts...> {
+ public:
+  EzoPMPDoseWithConstantFlowRateAction(EzoPMP *ezopmp) : ezopmp_(ezopmp) {}
+
+  void play(Ts... x) override {
+    this->ezopmp_->dose_with_constant_flow_rate(this->volume_.value(x...), this->duration_.value(x...));
+  }
+  TEMPLATABLE_VALUE(double, volume)
+  TEMPLATABLE_VALUE(int, duration)
+
+ protected:
+  EzoPMP *ezopmp_;
+};
+
+template<typename... Ts> class EzoPMPSetCalibrationVolumeAction : public Action<Ts...> {
+ public:
+  EzoPMPSetCalibrationVolumeAction(EzoPMP *ezopmp) : ezopmp_(ezopmp) {}
+
+  void play(Ts... x) override { this->ezopmp_->set_calibration_volume(this->volume_.value(x...)); }
+  TEMPLATABLE_VALUE(double, volume)
+
+ protected:
+  EzoPMP *ezopmp_;
+};
+
+template<typename... Ts> class EzoPMPClearTotalVolumeDispensedAction : public Action<Ts...> {
+ public:
+  EzoPMPClearTotalVolumeDispensedAction(EzoPMP *ezopmp) : ezopmp_(ezopmp) {}
+
+  void play(Ts... x) override { this->ezopmp_->clear_total_volume_dosed(); }
+
+ protected:
+  EzoPMP *ezopmp_;
+};
+
+template<typename... Ts> class EzoPMPClearCalibrationAction : public Action<Ts...> {
+ public:
+  EzoPMPClearCalibrationAction(EzoPMP *ezopmp) : ezopmp_(ezopmp) {}
+
+  void play(Ts... x) override { this->ezopmp_->clear_calibration(); }
+
+ protected:
+  EzoPMP *ezopmp_;
+};
+
+template<typename... Ts> class EzoPMPPauseDosingAction : public Action<Ts...> {
+ public:
+  EzoPMPPauseDosingAction(EzoPMP *ezopmp) : ezopmp_(ezopmp) {}
+
+  void play(Ts... x) override { this->ezopmp_->pause_dosing(); }
+
+ protected:
+  EzoPMP *ezopmp_;
+};
+
+template<typename... Ts> class EzoPMPStopDosingAction : public Action<Ts...> {
+ public:
+  EzoPMPStopDosingAction(EzoPMP *ezopmp) : ezopmp_(ezopmp) {}
+
+  void play(Ts... x) override { this->ezopmp_->stop_dosing(); }
+
+ protected:
+  EzoPMP *ezopmp_;
+};
+
+template<typename... Ts> class EzoPMPChangeI2CAddressAction : public Action<Ts...> {
+ public:
+  EzoPMPChangeI2CAddressAction(EzoPMP *ezopmp) : ezopmp_(ezopmp) {}
+
+  void play(Ts... x) override { this->ezopmp_->change_i2c_address(this->address_.value(x...)); }
+  TEMPLATABLE_VALUE(int, address)
+
+ protected:
+  EzoPMP *ezopmp_;
+};
+
+template<typename... Ts> class EzoPMPArbitraryCommandAction : public Action<Ts...> {
+ public:
+  EzoPMPArbitraryCommandAction(EzoPMP *ezopmp) : ezopmp_(ezopmp) {}
+
+  void play(Ts... x) override { this->ezopmp_->exec_arbitrary_command(this->command_.value(x...)); }
+  TEMPLATABLE_VALUE(std::string, command)
+
+ protected:
+  EzoPMP *ezopmp_;
+};
+
+}  // namespace ezo_pmp
+}  // namespace esphome
diff --git a/esphome/components/ezo_pmp/sensor.py b/esphome/components/ezo_pmp/sensor.py
new file mode 100644
index 0000000000..737985f4c5
--- /dev/null
+++ b/esphome/components/ezo_pmp/sensor.py
@@ -0,0 +1,104 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome.const import (
+    ENTITY_CATEGORY_DIAGNOSTIC,
+    ENTITY_CATEGORY_NONE,
+    DEVICE_CLASS_EMPTY,
+    DEVICE_CLASS_VOLTAGE,
+    STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_NONE,
+    CONF_ID,
+    UNIT_VOLT,
+)
+
+from . import EzoPMP
+
+
+DEPENDENCIES = ["ezo_pmp"]
+
+CONF_CURRENT_VOLUME_DOSED = "current_volume_dosed"
+CONF_TOTAL_VOLUME_DOSED = "total_volume_dosed"
+CONF_ABSOLUTE_TOTAL_VOLUME_DOSED = "absolute_total_volume_dosed"
+CONF_PUMP_VOLTAGE = "pump_voltage"
+CONF_LAST_VOLUME_REQUESTED = "last_volume_requested"
+CONF_MAX_FLOW_RATE = "max_flow_rate"
+
+UNIT_MILILITER = "ml"
+UNIT_MILILITERS_PER_MINUTE = "ml/min"
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.use_id(EzoPMP),
+        cv.Optional(CONF_CURRENT_VOLUME_DOSED): sensor.sensor_schema(
+            unit_of_measurement=UNIT_MILILITER,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_EMPTY,
+            state_class=STATE_CLASS_MEASUREMENT,
+            entity_category=ENTITY_CATEGORY_NONE,
+        ),
+        cv.Optional(CONF_LAST_VOLUME_REQUESTED): sensor.sensor_schema(
+            unit_of_measurement=UNIT_MILILITER,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_EMPTY,
+            state_class=STATE_CLASS_MEASUREMENT,
+            entity_category=ENTITY_CATEGORY_NONE,
+        ),
+        cv.Optional(CONF_MAX_FLOW_RATE): sensor.sensor_schema(
+            unit_of_measurement=UNIT_MILILITERS_PER_MINUTE,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_EMPTY,
+            state_class=STATE_CLASS_NONE,
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        ),
+        cv.Optional(CONF_TOTAL_VOLUME_DOSED): sensor.sensor_schema(
+            unit_of_measurement=UNIT_MILILITER,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_EMPTY,
+            state_class=STATE_CLASS_MEASUREMENT,
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        ),
+        cv.Optional(CONF_ABSOLUTE_TOTAL_VOLUME_DOSED): sensor.sensor_schema(
+            unit_of_measurement=UNIT_MILILITER,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_EMPTY,
+            state_class=STATE_CLASS_MEASUREMENT,
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        ),
+        cv.Optional(CONF_PUMP_VOLTAGE): sensor.sensor_schema(
+            unit_of_measurement=UNIT_VOLT,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_VOLTAGE,
+            state_class=STATE_CLASS_MEASUREMENT,
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        ),
+    }
+)
+
+
+async def to_code(config):
+    parent = await cg.get_variable(config[CONF_ID])
+
+    if CONF_CURRENT_VOLUME_DOSED in config:
+        sens = await sensor.new_sensor(config[CONF_CURRENT_VOLUME_DOSED])
+        cg.add(parent.set_current_volume_dosed(sens))
+
+    if CONF_LAST_VOLUME_REQUESTED in config:
+        sens = await sensor.new_sensor(config[CONF_LAST_VOLUME_REQUESTED])
+        cg.add(parent.set_last_volume_requested(sens))
+
+    if CONF_TOTAL_VOLUME_DOSED in config:
+        sens = await sensor.new_sensor(config[CONF_TOTAL_VOLUME_DOSED])
+        cg.add(parent.set_total_volume_dosed(sens))
+
+    if CONF_ABSOLUTE_TOTAL_VOLUME_DOSED in config:
+        sens = await sensor.new_sensor(config[CONF_ABSOLUTE_TOTAL_VOLUME_DOSED])
+        cg.add(parent.set_absolute_total_volume_dosed(sens))
+
+    if CONF_PUMP_VOLTAGE in config:
+        sens = await sensor.new_sensor(config[CONF_PUMP_VOLTAGE])
+        cg.add(parent.set_pump_voltage(sens))
+
+    if CONF_MAX_FLOW_RATE in config:
+        sens = await sensor.new_sensor(config[CONF_MAX_FLOW_RATE])
+        cg.add(parent.set_max_flow_rate(sens))
diff --git a/esphome/components/ezo_pmp/text_sensor.py b/esphome/components/ezo_pmp/text_sensor.py
new file mode 100644
index 0000000000..f8f133e316
--- /dev/null
+++ b/esphome/components/ezo_pmp/text_sensor.py
@@ -0,0 +1,39 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import text_sensor
+from esphome.const import (
+    ENTITY_CATEGORY_NONE,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+    CONF_ID,
+)
+
+from . import EzoPMP
+
+DEPENDENCIES = ["ezo_pmp"]
+
+CONF_DOSING_MODE = "dosing_mode"
+CONF_CALIBRATION_STATUS = "calibration_status"
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.use_id(EzoPMP),
+        cv.Optional(CONF_DOSING_MODE): text_sensor.text_sensor_schema(
+            entity_category=ENTITY_CATEGORY_NONE,
+        ),
+        cv.Optional(CONF_CALIBRATION_STATUS): text_sensor.text_sensor_schema(
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        ),
+    }
+)
+
+
+async def to_code(config):
+    parent = await cg.get_variable(config[CONF_ID])
+
+    if CONF_DOSING_MODE in config:
+        sens = await text_sensor.new_text_sensor(config[CONF_DOSING_MODE])
+        cg.add(parent.set_dosing_mode(sens))
+
+    if CONF_CALIBRATION_STATUS in config:
+        sens = await text_sensor.new_text_sensor(config[CONF_CALIBRATION_STATUS])
+        cg.add(parent.set_calibration_status(sens))
diff --git a/tests/test5.yaml b/tests/test5.yaml
index 7fc20c452f..131d2f5b7f 100644
--- a/tests/test5.yaml
+++ b/tests/test5.yaml
@@ -165,6 +165,12 @@ binary_sensor:
 
 
 
+  - platform: ezo_pmp
+    pump_state:
+      name: "Pump State"
+    is_paused:
+      name: "Is Paused"
+
 tlc5947:
   data_pin: GPIO12
   clock_pin: GPIO14
@@ -220,6 +226,10 @@ esp32_improv:
   authorized_duration: 1min
   status_indicator: built_in_led
 
+ezo_pmp:
+  id: hcl_pump
+  update_interval: 1s
+
 number:
   - platform: template
     name: My template number
@@ -440,6 +450,20 @@ sensor:
     cold_junction:
       name: Ambient Temperature
 
+  - platform: ezo_pmp
+    current_volume_dosed:
+      name: Current Volume Dosed
+    total_volume_dosed:
+      name: Total Volume Dosed
+    absolute_total_volume_dosed:
+      name: Absolute Total Volume Dosed
+    pump_voltage:
+      name: Pump Voltage
+    last_volume_requested:
+      name: Last Volume Requested
+    max_flow_rate:
+      name: Max Flow Rate
+
 script:
   - id: automation_test
     then:
@@ -487,3 +511,33 @@ display:
     lambda: |-
       it.print("81818181");
 
+text_sensor:
+  - platform: ezo_pmp
+    dosing_mode:
+      name: Dosing Mode
+    calibration_status:
+      name: Calibration Status
+      on_value:
+        - ezo_pmp.dose_volume:
+            id: hcl_pump
+            volume: 10
+        - ezo_pmp.dose_volume_over_time:
+            id: hcl_pump
+            volume: 10
+            duration: 2
+        - ezo_pmp.dose_with_constant_flow_rate:
+            id: hcl_pump
+            volume_per_minute: 10
+            duration: 2
+        - ezo_pmp.set_calibration_volume:
+            id: hcl_pump
+            volume: 10
+        - ezo_pmp.find: hcl_pump
+        - ezo_pmp.dose_continuously: hcl_pump
+        - ezo_pmp.clear_total_volume_dosed: hcl_pump
+        - ezo_pmp.clear_calibration: hcl_pump
+        - ezo_pmp.pause_dosing: hcl_pump
+        - ezo_pmp.stop_dosing: hcl_pump
+        - ezo_pmp.arbitrary_command:
+            id: hcl_pump
+            command: D,?

From 138de643a27fc5cd41c0efcdb5432d27626fbb76 Mon Sep 17 00:00:00 2001
From: Maximilian <43999966+DeerMaximum@users.noreply.github.com>
Date: Wed, 19 Oct 2022 06:06:22 +0200
Subject: [PATCH 156/838] Add adc128s102 sensor (#3822)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                                    |  1 +
 esphome/components/adc128s102/__init__.py     | 23 ++++++++++++
 esphome/components/adc128s102/adc128s102.cpp  | 35 +++++++++++++++++++
 esphome/components/adc128s102/adc128s102.h    | 23 ++++++++++++
 .../components/adc128s102/sensor/__init__.py  | 35 +++++++++++++++++++
 .../adc128s102/sensor/adc128s102_sensor.cpp   | 24 +++++++++++++
 .../adc128s102/sensor/adc128s102_sensor.h     | 29 +++++++++++++++
 tests/test3.yaml                              |  8 +++++
 8 files changed, 178 insertions(+)
 create mode 100644 esphome/components/adc128s102/__init__.py
 create mode 100644 esphome/components/adc128s102/adc128s102.cpp
 create mode 100644 esphome/components/adc128s102/adc128s102.h
 create mode 100644 esphome/components/adc128s102/sensor/__init__.py
 create mode 100644 esphome/components/adc128s102/sensor/adc128s102_sensor.cpp
 create mode 100644 esphome/components/adc128s102/sensor/adc128s102_sensor.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 86e6cd978b..688c58b2a4 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -13,6 +13,7 @@ esphome/core/* @esphome/core
 # Integrations
 esphome/components/ac_dimmer/* @glmnet
 esphome/components/adc/* @esphome/core
+esphome/components/adc128s102/* @DeerMaximum
 esphome/components/addressable_light/* @justfalter
 esphome/components/airthings_ble/* @jeromelaban
 esphome/components/airthings_wave_mini/* @ncareau
diff --git a/esphome/components/adc128s102/__init__.py b/esphome/components/adc128s102/__init__.py
new file mode 100644
index 0000000000..c4e9d5831e
--- /dev/null
+++ b/esphome/components/adc128s102/__init__.py
@@ -0,0 +1,23 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import spi
+from esphome.const import CONF_ID
+
+DEPENDENCIES = ["spi"]
+MULTI_CONF = True
+CODEOWNERS = ["@DeerMaximum"]
+
+adc128s102_ns = cg.esphome_ns.namespace("adc128s102")
+ADC128S102 = adc128s102_ns.class_("ADC128S102", cg.Component, spi.SPIDevice)
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(ADC128S102),
+    }
+).extend(spi.spi_device_schema(cs_pin_required=True))
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await spi.register_spi_device(var, config)
diff --git a/esphome/components/adc128s102/adc128s102.cpp b/esphome/components/adc128s102/adc128s102.cpp
new file mode 100644
index 0000000000..c27a354dd3
--- /dev/null
+++ b/esphome/components/adc128s102/adc128s102.cpp
@@ -0,0 +1,35 @@
+#include "adc128s102.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace adc128s102 {
+
+static const char *const TAG = "adc128s102";
+
+float ADC128S102::get_setup_priority() const { return setup_priority::HARDWARE; }
+
+void ADC128S102::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up adc128s102");
+  this->spi_setup();
+}
+
+void ADC128S102::dump_config() {
+  ESP_LOGCONFIG(TAG, "ADC128S102:");
+  LOG_PIN("  CS Pin:", this->cs_);
+}
+
+uint16_t ADC128S102::read_data(uint8_t channel) {
+  uint8_t control = channel << 3;
+
+  this->enable();
+  uint8_t adc_primary_byte = this->transfer_byte(control);
+  uint8_t adc_secondary_byte = this->transfer_byte(0x00);
+  this->disable();
+
+  uint16_t digital_value = adc_primary_byte << 8 | adc_secondary_byte;
+
+  return digital_value;
+}
+
+}  // namespace adc128s102
+}  // namespace esphome
diff --git a/esphome/components/adc128s102/adc128s102.h b/esphome/components/adc128s102/adc128s102.h
new file mode 100644
index 0000000000..bd6b7f7af1
--- /dev/null
+++ b/esphome/components/adc128s102/adc128s102.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/components/spi/spi.h"
+
+namespace esphome {
+namespace adc128s102 {
+
+class ADC128S102 : public Component,
+                   public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW, spi::CLOCK_PHASE_LEADING,
+                                         spi::DATA_RATE_10MHZ> {
+ public:
+  ADC128S102() = default;
+
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  uint16_t read_data(uint8_t channel);
+};
+
+}  // namespace adc128s102
+}  // namespace esphome
diff --git a/esphome/components/adc128s102/sensor/__init__.py b/esphome/components/adc128s102/sensor/__init__.py
new file mode 100644
index 0000000000..3ab6fc4c38
--- /dev/null
+++ b/esphome/components/adc128s102/sensor/__init__.py
@@ -0,0 +1,35 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, voltage_sampler
+from esphome.const import CONF_ID, CONF_CHANNEL
+
+from .. import adc128s102_ns, ADC128S102
+
+AUTO_LOAD = ["voltage_sampler"]
+DEPENDENCIES = ["adc128s102"]
+
+ADC128S102Sensor = adc128s102_ns.class_(
+    "ADC128S102Sensor",
+    sensor.Sensor,
+    cg.PollingComponent,
+    voltage_sampler.VoltageSampler,
+)
+CONF_ADC128S102_ID = "adc128s102_id"
+
+CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(ADC128S102Sensor),
+        cv.GenerateID(CONF_ADC128S102_ID): cv.use_id(ADC128S102),
+        cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=7),
+    }
+).extend(cv.polling_component_schema("60s"))
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(
+        config[CONF_ID],
+        config[CONF_CHANNEL],
+    )
+    await cg.register_parented(var, config[CONF_ADC128S102_ID])
+    await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
diff --git a/esphome/components/adc128s102/sensor/adc128s102_sensor.cpp b/esphome/components/adc128s102/sensor/adc128s102_sensor.cpp
new file mode 100644
index 0000000000..03ce31d3cb
--- /dev/null
+++ b/esphome/components/adc128s102/sensor/adc128s102_sensor.cpp
@@ -0,0 +1,24 @@
+#include "adc128s102_sensor.h"
+
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace adc128s102 {
+
+static const char *const TAG = "adc128s102.sensor";
+
+ADC128S102Sensor::ADC128S102Sensor(uint8_t channel) : channel_(channel) {}
+
+float ADC128S102Sensor::get_setup_priority() const { return setup_priority::DATA; }
+
+void ADC128S102Sensor::dump_config() {
+  LOG_SENSOR("", "ADC128S102 Sensor", this);
+  ESP_LOGCONFIG(TAG, "  Pin: %u", this->channel_);
+  LOG_UPDATE_INTERVAL(this);
+}
+
+float ADC128S102Sensor::sample() { return this->parent_->read_data(this->channel_); }
+void ADC128S102Sensor::update() { this->publish_state(this->sample()); }
+
+}  // namespace adc128s102
+}  // namespace esphome
diff --git a/esphome/components/adc128s102/sensor/adc128s102_sensor.h b/esphome/components/adc128s102/sensor/adc128s102_sensor.h
new file mode 100644
index 0000000000..234500c2f4
--- /dev/null
+++ b/esphome/components/adc128s102/sensor/adc128s102_sensor.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/voltage_sampler/voltage_sampler.h"
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+
+#include "../adc128s102.h"
+
+namespace esphome {
+namespace adc128s102 {
+
+class ADC128S102Sensor : public PollingComponent,
+                         public Parented<ADC128S102>,
+                         public sensor::Sensor,
+                         public voltage_sampler::VoltageSampler {
+ public:
+  ADC128S102Sensor(uint8_t channel);
+
+  void update() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  float sample() override;
+
+ protected:
+  uint8_t channel_;
+};
+}  // namespace adc128s102
+}  // namespace esphome
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 8fc66f4918..8150f43e02 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -789,6 +789,11 @@ sensor:
     voltage:
       name: Voltage
     update_interval: 60s
+
+  - platform: adc128s102
+    id: adc128s102_channel_0
+    channel: 0
+
 time:
   - platform: homeassistant
 
@@ -1540,3 +1545,6 @@ cd74hc4067:
   pin_s1: GPIO13
   pin_s2: GPIO14
   pin_s3: GPIO15
+
+adc128s102:
+  cs_pin: GPIO12

From d7576f67e85701d2ec35786b1c4c25432b7e31d1 Mon Sep 17 00:00:00 2001
From: hagak <9702199+hagak@users.noreply.github.com>
Date: Wed, 19 Oct 2022 03:29:22 -0400
Subject: [PATCH 157/838] Added component Daikin BRC to support ceiling
 cassette heatpumps (#3743)

---
 CODEOWNERS                                   |   1 +
 esphome/components/daikin_brc/__init__.py    |   1 +
 esphome/components/daikin_brc/climate.py     |  24 ++
 esphome/components/daikin_brc/daikin_brc.cpp | 273 +++++++++++++++++++
 esphome/components/daikin_brc/daikin_brc.h   |  82 ++++++
 tests/test1.yaml                             |   3 +
 6 files changed, 384 insertions(+)
 create mode 100644 esphome/components/daikin_brc/__init__.py
 create mode 100644 esphome/components/daikin_brc/climate.py
 create mode 100644 esphome/components/daikin_brc/daikin_brc.cpp
 create mode 100644 esphome/components/daikin_brc/daikin_brc.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 688c58b2a4..78624ecdbe 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -58,6 +58,7 @@ esphome/components/cse7761/* @berfenger
 esphome/components/ct_clamp/* @jesserockz
 esphome/components/current_based/* @djwmarcx
 esphome/components/dac7678/* @NickB1
+esphome/components/daikin_brc/* @hagak
 esphome/components/daly_bms/* @s1lvi0
 esphome/components/dashboard_import/* @esphome/core
 esphome/components/debug/* @OttoWinter
diff --git a/esphome/components/daikin_brc/__init__.py b/esphome/components/daikin_brc/__init__.py
new file mode 100644
index 0000000000..69002c015f
--- /dev/null
+++ b/esphome/components/daikin_brc/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@hagak"]
diff --git a/esphome/components/daikin_brc/climate.py b/esphome/components/daikin_brc/climate.py
new file mode 100644
index 0000000000..3468b6533c
--- /dev/null
+++ b/esphome/components/daikin_brc/climate.py
@@ -0,0 +1,24 @@
+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"]
+
+daikin_brc_ns = cg.esphome_ns.namespace("daikin_brc")
+DaikinBrcClimate = daikin_brc_ns.class_("DaikinBrcClimate", climate_ir.ClimateIR)
+
+CONF_USE_FAHRENHEIT = "use_fahrenheit"
+
+CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(DaikinBrcClimate),
+        cv.Optional(CONF_USE_FAHRENHEIT, default=False): cv.boolean,
+    }
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await climate_ir.register_climate_ir(var, config)
+    cg.add(var.set_fahrenheit(config[CONF_USE_FAHRENHEIT]))
diff --git a/esphome/components/daikin_brc/daikin_brc.cpp b/esphome/components/daikin_brc/daikin_brc.cpp
new file mode 100644
index 0000000000..6683d70f80
--- /dev/null
+++ b/esphome/components/daikin_brc/daikin_brc.cpp
@@ -0,0 +1,273 @@
+#include "daikin_brc.h"
+#include "esphome/components/remote_base/remote_base.h"
+
+namespace esphome {
+namespace daikin_brc {
+
+static const char *const TAG = "daikin_brc.climate";
+
+void DaikinBrcClimate::control(const climate::ClimateCall &call) {
+  this->mode_button_ = 0x00;
+  if (call.get_mode().has_value()) {
+    // Need to determine if this is call due to Mode button pressed so that we can set the Mode button byte
+    this->mode_button_ = DAIKIN_BRC_IR_MODE_BUTTON;
+  }
+  ClimateIR::control(call);
+}
+
+void DaikinBrcClimate::transmit_state() {
+  uint8_t remote_state[DAIKIN_BRC_TRANSMIT_FRAME_SIZE] = {0x11, 0xDA, 0x17, 0x18, 0x04, 0x00, 0x1E, 0x11,
+                                                          0xDA, 0x17, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                          0x00, 0x00, 0x00, 0x00, 0x20, 0x00};
+
+  remote_state[12] = this->alt_mode_();
+  remote_state[13] = this->mode_button_;
+  remote_state[14] = this->operation_mode_();
+  remote_state[17] = this->temperature_();
+  remote_state[18] = this->fan_speed_swing_();
+
+  // Calculate checksum
+  for (int i = DAIKIN_BRC_PREAMBLE_SIZE; i < DAIKIN_BRC_TRANSMIT_FRAME_SIZE - 1; i++) {
+    remote_state[DAIKIN_BRC_TRANSMIT_FRAME_SIZE - 1] += remote_state[i];
+  }
+
+  auto transmit = this->transmitter_->transmit();
+  auto *data = transmit.get_data();
+  data->set_carrier_frequency(DAIKIN_BRC_IR_FREQUENCY);
+
+  data->mark(DAIKIN_BRC_HEADER_MARK);
+  data->space(DAIKIN_BRC_HEADER_SPACE);
+  for (int i = 0; i < DAIKIN_BRC_PREAMBLE_SIZE; i++) {
+    for (uint8_t mask = 1; mask > 0; mask <<= 1) {  // iterate through bit mask
+      data->mark(DAIKIN_BRC_BIT_MARK);
+      bool bit = remote_state[i] & mask;
+      data->space(bit ? DAIKIN_BRC_ONE_SPACE : DAIKIN_BRC_ZERO_SPACE);
+    }
+  }
+  data->mark(DAIKIN_BRC_BIT_MARK);
+  data->space(DAIKIN_BRC_MESSAGE_SPACE);
+  data->mark(DAIKIN_BRC_HEADER_MARK);
+  data->space(DAIKIN_BRC_HEADER_SPACE);
+
+  for (int i = DAIKIN_BRC_PREAMBLE_SIZE; i < DAIKIN_BRC_TRANSMIT_FRAME_SIZE; i++) {
+    for (uint8_t mask = 1; mask > 0; mask <<= 1) {  // iterate through bit mask
+      data->mark(DAIKIN_BRC_BIT_MARK);
+      bool bit = remote_state[i] & mask;
+      data->space(bit ? DAIKIN_BRC_ONE_SPACE : DAIKIN_BRC_ZERO_SPACE);
+    }
+  }
+
+  data->mark(DAIKIN_BRC_BIT_MARK);
+  data->space(0);
+
+  transmit.perform();
+}
+
+uint8_t DaikinBrcClimate::alt_mode_() {
+  uint8_t alt_mode = 0x00;
+  switch (this->mode) {
+    case climate::CLIMATE_MODE_DRY:
+      alt_mode = 0x23;
+      break;
+    case climate::CLIMATE_MODE_FAN_ONLY:
+      alt_mode = 0x63;
+      break;
+    case climate::CLIMATE_MODE_HEAT_COOL:
+    case climate::CLIMATE_MODE_COOL:
+    case climate::CLIMATE_MODE_HEAT:
+    default:
+      alt_mode = 0x73;
+      break;
+  }
+  return alt_mode;
+}
+
+uint8_t DaikinBrcClimate::operation_mode_() {
+  uint8_t operating_mode = DAIKIN_BRC_MODE_ON;
+  switch (this->mode) {
+    case climate::CLIMATE_MODE_COOL:
+      operating_mode |= DAIKIN_BRC_MODE_COOL;
+      break;
+    case climate::CLIMATE_MODE_DRY:
+      operating_mode |= DAIKIN_BRC_MODE_DRY;
+      break;
+    case climate::CLIMATE_MODE_HEAT:
+      operating_mode |= DAIKIN_BRC_MODE_HEAT;
+      break;
+    case climate::CLIMATE_MODE_HEAT_COOL:
+      operating_mode |= DAIKIN_BRC_MODE_AUTO;
+      break;
+    case climate::CLIMATE_MODE_FAN_ONLY:
+      operating_mode |= DAIKIN_BRC_MODE_FAN;
+      break;
+    case climate::CLIMATE_MODE_OFF:
+    default:
+      operating_mode = DAIKIN_BRC_MODE_OFF;
+      break;
+  }
+
+  return operating_mode;
+}
+
+uint8_t DaikinBrcClimate::fan_speed_swing_() {
+  uint16_t fan_speed;
+  switch (this->fan_mode.value()) {
+    case climate::CLIMATE_FAN_LOW:
+      fan_speed = DAIKIN_BRC_FAN_1;
+      break;
+    case climate::CLIMATE_FAN_MEDIUM:
+      fan_speed = DAIKIN_BRC_FAN_2;
+      break;
+    case climate::CLIMATE_FAN_HIGH:
+      fan_speed = DAIKIN_BRC_FAN_3;
+      break;
+    default:
+      fan_speed = DAIKIN_BRC_FAN_1;
+  }
+
+  // If swing is enabled switch first 4 bits to 1111
+  switch (this->swing_mode) {
+    case climate::CLIMATE_SWING_BOTH:
+      fan_speed |= DAIKIN_BRC_IR_SWING_ON;
+      break;
+    default:
+      fan_speed |= DAIKIN_BRC_IR_SWING_OFF;
+      break;
+  }
+  return fan_speed;
+}
+
+uint8_t DaikinBrcClimate::temperature_() {
+  // Force special temperatures depending on the mode
+  switch (this->mode) {
+    case climate::CLIMATE_MODE_FAN_ONLY:
+    case climate::CLIMATE_MODE_DRY:
+      if (this->fahrenheit_) {
+        return DAIKIN_BRC_IR_DRY_FAN_TEMP_F;
+      }
+      return DAIKIN_BRC_IR_DRY_FAN_TEMP_C;
+    case climate::CLIMATE_MODE_HEAT_COOL:
+    default:
+      uint8_t temperature;
+      // Temperature in remote is in F
+      if (this->fahrenheit_) {
+        temperature = (uint8_t) roundf(
+            clamp<float>(((this->target_temperature * 1.8) + 32), DAIKIN_BRC_TEMP_MIN_F, DAIKIN_BRC_TEMP_MAX_F));
+      } else {
+        temperature = ((uint8_t) roundf(this->target_temperature) - 9) << 1;
+      }
+      return temperature;
+  }
+}
+
+bool DaikinBrcClimate::parse_state_frame_(const uint8_t frame[]) {
+  uint8_t checksum = 0;
+  for (int i = 0; i < (DAIKIN_BRC_STATE_FRAME_SIZE - 1); i++) {
+    checksum += frame[i];
+  }
+  if (frame[DAIKIN_BRC_STATE_FRAME_SIZE - 1] != checksum) {
+    ESP_LOGCONFIG(TAG, "Bad CheckSum %x", checksum);
+    return false;
+  }
+
+  uint8_t mode = frame[7];
+  if (mode & DAIKIN_BRC_MODE_ON) {
+    switch (mode & 0xF0) {
+      case DAIKIN_BRC_MODE_COOL:
+        this->mode = climate::CLIMATE_MODE_COOL;
+        break;
+      case DAIKIN_BRC_MODE_DRY:
+        this->mode = climate::CLIMATE_MODE_DRY;
+        break;
+      case DAIKIN_BRC_MODE_HEAT:
+        this->mode = climate::CLIMATE_MODE_HEAT;
+        break;
+      case DAIKIN_BRC_MODE_AUTO:
+        this->mode = climate::CLIMATE_MODE_HEAT_COOL;
+        break;
+      case DAIKIN_BRC_MODE_FAN:
+        this->mode = climate::CLIMATE_MODE_FAN_ONLY;
+        break;
+    }
+  } else {
+    this->mode = climate::CLIMATE_MODE_OFF;
+  }
+
+  uint8_t temperature = frame[10];
+  float temperature_c;
+  if (this->fahrenheit_) {
+    temperature_c = clamp<float>(((temperature - 32) / 1.8), DAIKIN_BRC_TEMP_MIN_C, DAIKIN_BRC_TEMP_MAX_C);
+  } else {
+    temperature_c = (temperature >> 1) + 9;
+  }
+
+  this->target_temperature = temperature_c;
+
+  uint8_t fan_mode = frame[11];
+  uint8_t swing_mode = frame[11];
+  switch (swing_mode & 0xF) {
+    case DAIKIN_BRC_IR_SWING_ON:
+      this->swing_mode = climate::CLIMATE_SWING_BOTH;
+      break;
+    case DAIKIN_BRC_IR_SWING_OFF:
+      this->swing_mode = climate::CLIMATE_SWING_OFF;
+      break;
+  }
+
+  switch (fan_mode & 0xF0) {
+    case DAIKIN_BRC_FAN_1:
+      this->fan_mode = climate::CLIMATE_FAN_LOW;
+      break;
+    case DAIKIN_BRC_FAN_2:
+      this->fan_mode = climate::CLIMATE_FAN_MEDIUM;
+      break;
+    case DAIKIN_BRC_FAN_3:
+      this->fan_mode = climate::CLIMATE_FAN_HIGH;
+      break;
+  }
+  this->publish_state();
+  return true;
+}
+
+bool DaikinBrcClimate::on_receive(remote_base::RemoteReceiveData data) {
+  uint8_t state_frame[DAIKIN_BRC_STATE_FRAME_SIZE] = {};
+  if (!data.expect_item(DAIKIN_BRC_HEADER_MARK, DAIKIN_BRC_HEADER_SPACE)) {
+    return false;
+  }
+  for (uint8_t pos = 0; pos < DAIKIN_BRC_STATE_FRAME_SIZE; pos++) {
+    uint8_t byte = 0;
+    for (int8_t bit = 0; bit < 8; bit++) {
+      if (data.expect_item(DAIKIN_BRC_BIT_MARK, DAIKIN_BRC_ONE_SPACE)) {
+        byte |= 1 << bit;
+      } else if (!data.expect_item(DAIKIN_BRC_BIT_MARK, DAIKIN_BRC_ZERO_SPACE)) {
+        return false;
+      }
+    }
+    state_frame[pos] = byte;
+    if (pos == 0) {
+      // frame header
+      if (byte != 0x11)
+        return false;
+    } else if (pos == 1) {
+      // frame header
+      if (byte != 0xDA)
+        return false;
+    } else if (pos == 2) {
+      // frame header
+      if (byte != 0x17)
+        return false;
+    } else if (pos == 3) {
+      // frame header
+      if (byte != 0x18)
+        return false;
+    } else if (pos == 4) {
+      // frame type
+      if (byte != 0x00)
+        return false;
+    }
+  }
+  return this->parse_state_frame_(state_frame);
+}
+
+}  // namespace daikin_brc
+}  // namespace esphome
diff --git a/esphome/components/daikin_brc/daikin_brc.h b/esphome/components/daikin_brc/daikin_brc.h
new file mode 100644
index 0000000000..bdc6384809
--- /dev/null
+++ b/esphome/components/daikin_brc/daikin_brc.h
@@ -0,0 +1,82 @@
+#pragma once
+
+#include "esphome/components/climate_ir/climate_ir.h"
+
+namespace esphome {
+namespace daikin_brc {
+
+// Values for Daikin BRC4CXXX IR Controllers
+// Temperature
+const uint8_t DAIKIN_BRC_TEMP_MIN_F = 60;                                // fahrenheit
+const uint8_t DAIKIN_BRC_TEMP_MAX_F = 90;                                // fahrenheit
+const float DAIKIN_BRC_TEMP_MIN_C = (DAIKIN_BRC_TEMP_MIN_F - 32) / 1.8;  // fahrenheit
+const float DAIKIN_BRC_TEMP_MAX_C = (DAIKIN_BRC_TEMP_MAX_F - 32) / 1.8;  // fahrenheit
+
+// Modes
+const uint8_t DAIKIN_BRC_MODE_AUTO = 0x30;
+const uint8_t DAIKIN_BRC_MODE_COOL = 0x20;
+const uint8_t DAIKIN_BRC_MODE_HEAT = 0x10;
+const uint8_t DAIKIN_BRC_MODE_DRY = 0x70;
+const uint8_t DAIKIN_BRC_MODE_FAN = 0x00;
+const uint8_t DAIKIN_BRC_MODE_OFF = 0x00;
+const uint8_t DAIKIN_BRC_MODE_ON = 0x01;
+
+// Fan Speed
+const uint8_t DAIKIN_BRC_FAN_1 = 0x10;
+const uint8_t DAIKIN_BRC_FAN_2 = 0x30;
+const uint8_t DAIKIN_BRC_FAN_3 = 0x50;
+const uint8_t DAIKIN_BRC_FAN_AUTO = 0xA0;
+
+// IR Transmission
+const uint32_t DAIKIN_BRC_IR_FREQUENCY = 38000;
+const uint32_t DAIKIN_BRC_HEADER_MARK = 5070;
+const uint32_t DAIKIN_BRC_HEADER_SPACE = 2140;
+const uint32_t DAIKIN_BRC_BIT_MARK = 370;
+const uint32_t DAIKIN_BRC_ONE_SPACE = 1780;
+const uint32_t DAIKIN_BRC_ZERO_SPACE = 710;
+const uint32_t DAIKIN_BRC_MESSAGE_SPACE = 29410;
+
+const uint8_t DAIKIN_BRC_IR_DRY_FAN_TEMP_F = 72;            // Dry/Fan mode is always 17 Celsius.
+const uint8_t DAIKIN_BRC_IR_DRY_FAN_TEMP_C = (17 - 9) * 2;  // Dry/Fan mode is always 17 Celsius.
+const uint8_t DAIKIN_BRC_IR_SWING_ON = 0x5;
+const uint8_t DAIKIN_BRC_IR_SWING_OFF = 0x6;
+const uint8_t DAIKIN_BRC_IR_MODE_BUTTON = 0x4;  // This is set after a mode action
+
+// State Frame size
+const uint8_t DAIKIN_BRC_STATE_FRAME_SIZE = 15;
+// Preamble size
+const uint8_t DAIKIN_BRC_PREAMBLE_SIZE = 7;
+// Transmit Frame size - includes a preamble
+const uint8_t DAIKIN_BRC_TRANSMIT_FRAME_SIZE = DAIKIN_BRC_PREAMBLE_SIZE + DAIKIN_BRC_STATE_FRAME_SIZE;
+
+class DaikinBrcClimate : public climate_ir::ClimateIR {
+ public:
+  DaikinBrcClimate()
+      : climate_ir::ClimateIR(DAIKIN_BRC_TEMP_MIN_C, DAIKIN_BRC_TEMP_MAX_C, 0.5f, true, true,
+                              {climate::CLIMATE_FAN_LOW, climate::CLIMATE_FAN_MEDIUM, climate::CLIMATE_FAN_HIGH},
+                              {climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_BOTH}) {}
+
+  /// Set use of Fahrenheit units
+  void set_fahrenheit(bool value) {
+    this->fahrenheit_ = value;
+    this->temperature_step_ = value ? 0.5f : 1.0f;
+  }
+
+ protected:
+  uint8_t mode_button_ = 0x00;
+  // Capture if the MODE was changed
+  void control(const climate::ClimateCall &call) override;
+  // Transmit via IR the state of this climate controller.
+  void transmit_state() override;
+  uint8_t alt_mode_();
+  uint8_t operation_mode_();
+  uint8_t fan_speed_swing_();
+  uint8_t temperature_();
+  // Handle received IR Buffer
+  bool on_receive(remote_base::RemoteReceiveData data) override;
+  bool parse_state_frame_(const uint8_t frame[]);
+  bool fahrenheit_{false};
+};
+
+}  // namespace daikin_brc
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 82cdac4623..b286c37deb 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1862,6 +1862,9 @@ climate:
     name: Fujitsu General Climate
   - platform: daikin
     name: Daikin Climate
+  - platform: daikin_brc
+    name: Daikin BRC Climate
+    use_fahrenheit: true
   - platform: delonghi
     name: Delonghi Climate
   - platform: yashima

From a21c3e8e2db3dddd55c9a56ee348a6a76a6daeb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 12:49:11 +1300
Subject: [PATCH 158/838] Bump platformio from 6.0.2 to 6.1.4 (#3711)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 docker/Dockerfile | 2 +-
 requirements.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index f4652bc513..05b518ca74 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -46,7 +46,7 @@ RUN \
     # Ubuntu python3-pip is missing wheel
     pip3 install --no-cache-dir \
         wheel==0.37.1 \
-        platformio==6.0.2 \
+        platformio==6.1.4 \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
     && platformio settings set check_platformio_interval 1000000 \
diff --git a/requirements.txt b/requirements.txt
index 00e6e0ba67..af7ac0cab4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ tornado==6.1
 tzlocal==4.2    # from time
 tzdata>=2021.1  # from time
 pyserial==3.5
-platformio==6.0.2  # When updating platformio, also update Dockerfile
+platformio==6.1.4  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
 esphome-dashboard==20221007.0

From e87edcc77a4e4c83624cad270eebdd19b30669d5 Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Thu, 20 Oct 2022 05:39:34 +0200
Subject: [PATCH 159/838] Add API interface to request a complete device config
 as JSON. (#3911)

Co-authored-by: Paulus Schoutsen <paulus@home-assistant.io>
---
 esphome/dashboard/dashboard.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 1a51f3056f..0367101023 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -29,6 +29,7 @@ import tornado.web
 import tornado.websocket
 
 from esphome import const, platformio_api, util, yaml_util
+from esphome.core import EsphomeError
 from esphome.helpers import mkdir_p, get_bool_env, run_system_command
 from esphome.storage_json import (
     EsphomeStorageJSON,
@@ -927,6 +928,27 @@ class SecretKeysRequestHandler(BaseHandler):
         self.write(json.dumps(secret_keys))
 
 
+class JsonConfigRequestHandler(BaseHandler):
+    @authenticated
+    @bind_config
+    def get(self, configuration=None):
+        filename = settings.rel_path(configuration)
+        if not os.path.isfile(filename):
+            self.send_error(404)
+            return
+
+        try:
+            content = yaml_util.load_yaml(filename, clear_secrets=False)
+            json_content = json.dumps(
+                content, default=lambda o: {"__type": str(type(o)), "repr": repr(o)}
+            )
+            self.set_header("content-type", "application/json")
+            self.write(json_content)
+        except EsphomeError as err:
+            _LOGGER.warning("Error translating file %s to JSON: %s", filename, err)
+            self.send_error(500)
+
+
 def get_base_frontend_path():
     if ENV_DEV not in os.environ:
         import esphome_dashboard
@@ -1031,6 +1053,7 @@ def make_app(debug=get_bool_env(ENV_DEV)):
             (f"{rel}devices", ListDevicesHandler),
             (f"{rel}import", ImportRequestHandler),
             (f"{rel}secret_keys", SecretKeysRequestHandler),
+            (f"{rel}json-config", JsonConfigRequestHandler),
             (f"{rel}rename", EsphomeRenameHandler),
             (f"{rel}prometheus-sd", PrometheusServiceDiscoveryHandler),
         ],

From 6153bcc6ad818c8ece3fc149614d7aa391bd483f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 20 Oct 2022 16:50:39 +1300
Subject: [PATCH 160/838] Initial Support for RP2040 platform (#3284)

Co-authored-by: Paulus Schoutsen <balloob@gmail.com>
---
 .github/workflows/ci.yml                      |   4 +
 CODEOWNERS                                    |   2 +
 esphome/__main__.py                           |  72 ++++---
 esphome/components/logger/__init__.py         |  17 +-
 esphome/components/logger/logger.cpp          |   6 +-
 esphome/components/logger/logger.h            |  12 +-
 esphome/components/md5/md5.cpp                |  15 +-
 esphome/components/md5/md5.h                  |   5 +
 esphome/components/mdns/mdns_component.cpp    |   3 +
 esphome/components/mdns/mdns_rp2040.cpp       |  40 ++++
 esphome/components/ota/__init__.py            |   5 +-
 .../ota/ota_backend_arduino_rp2040.cpp        |  55 +++++
 .../ota/ota_backend_arduino_rp2040.h          |  27 +++
 esphome/components/ota/ota_component.cpp      |   4 +
 esphome/components/ota/ota_component.h        |   1 +
 esphome/components/rp2040/__init__.py         | 157 ++++++++++++++
 esphome/components/rp2040/boards.py           |   7 +
 esphome/components/rp2040/const.py            |   6 +
 esphome/components/rp2040/core.cpp            |  32 +++
 esphome/components/rp2040/core.h              |  14 ++
 esphome/components/rp2040/gpio.cpp            | 103 +++++++++
 esphome/components/rp2040/gpio.h              |  38 ++++
 esphome/components/rp2040/gpio.py             |  91 ++++++++
 esphome/components/rp2040/preferences.cpp     |  49 +++++
 esphome/components/rp2040/preferences.h       |  13 ++
 esphome/components/rp2040_pwm/__init__.py     |   0
 esphome/components/rp2040_pwm/output.py       |  55 +++++
 esphome/components/rp2040_pwm/rp2040_pwm.cpp  |  45 ++++
 esphome/components/rp2040_pwm/rp2040_pwm.h    |  57 +++++
 esphome/components/socket/__init__.py         |   1 +
 esphome/components/socket/headers.h           |   2 +-
 esphome/components/spi/__init__.py            |   4 +-
 esphome/components/spi/spi.h                  |  20 ++
 esphome/components/wifi/__init__.py           |   4 +-
 esphome/components/wifi/wifi_component.cpp    |   2 +
 esphome/components/wifi/wifi_component.h      |  17 ++
 .../components/wifi/wifi_component_pico_w.cpp | 204 ++++++++++++++++++
 esphome/config_validation.py                  |   4 +
 esphome/const.py                              |   3 +-
 esphome/core/__init__.py                      |   4 +
 esphome/core/helpers.cpp                      |   8 +
 esphome/dashboard/dashboard.py                |  28 ++-
 esphome/storage_json.py                       |   6 +-
 esphome/wizard.py                             |  20 +-
 platformio.ini                                |  25 +++
 script/ci-custom.py                           |   1 +
 tests/README.md                               |   1 +
 tests/dummy_main.cpp                          |   3 +-
 tests/test6.yaml                              |  39 ++++
 49 files changed, 1270 insertions(+), 61 deletions(-)
 create mode 100644 esphome/components/mdns/mdns_rp2040.cpp
 create mode 100644 esphome/components/ota/ota_backend_arduino_rp2040.cpp
 create mode 100644 esphome/components/ota/ota_backend_arduino_rp2040.h
 create mode 100644 esphome/components/rp2040/__init__.py
 create mode 100644 esphome/components/rp2040/boards.py
 create mode 100644 esphome/components/rp2040/const.py
 create mode 100644 esphome/components/rp2040/core.cpp
 create mode 100644 esphome/components/rp2040/core.h
 create mode 100644 esphome/components/rp2040/gpio.cpp
 create mode 100644 esphome/components/rp2040/gpio.h
 create mode 100644 esphome/components/rp2040/gpio.py
 create mode 100644 esphome/components/rp2040/preferences.cpp
 create mode 100644 esphome/components/rp2040/preferences.h
 create mode 100644 esphome/components/rp2040_pwm/__init__.py
 create mode 100644 esphome/components/rp2040_pwm/output.py
 create mode 100644 esphome/components/rp2040_pwm/rp2040_pwm.cpp
 create mode 100644 esphome/components/rp2040_pwm/rp2040_pwm.h
 create mode 100644 esphome/components/wifi/wifi_component_pico_w.cpp
 create mode 100644 tests/test6.yaml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 671b74d118..8e09fef069 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,6 +48,10 @@ jobs:
             file: tests/test5.yaml
             name: Test tests/test5.yaml
             pio_cache_key: test5
+          - id: test
+            file: tests/test6.yaml
+            name: Test tests/test6.yaml
+            pio_cache_key: test6
           - id: pytest
             name: Run pytest
           - id: clang-format
diff --git a/CODEOWNERS b/CODEOWNERS
index 78624ecdbe..ac793e19af 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -184,6 +184,8 @@ esphome/components/rc522_spi/* @glmnet
 esphome/components/restart/* @esphome/core
 esphome/components/rf_bridge/* @jesserockz
 esphome/components/rgbct/* @jesserockz
+esphome/components/rp2040/* @jesserockz
+esphome/components/rp2040_pwm/* @jesserockz
 esphome/components/rtttl/* @glmnet
 esphome/components/safe_mode/* @jsuanet @paulmonigatti
 esphome/components/scd4x/* @martgras @sjtrny
diff --git a/esphome/__main__.py b/esphome/__main__.py
index c336336f18..cf2d161d04 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -4,6 +4,7 @@ import logging
 import os
 import re
 import sys
+import time
 from datetime import datetime
 
 from esphome import const, writer, yaml_util
@@ -22,6 +23,9 @@ from esphome.const import (
     CONF_ESPHOME,
     CONF_PLATFORMIO_OPTIONS,
     CONF_SUBSTITUTIONS,
+    PLATFORM_ESP32,
+    PLATFORM_ESP8266,
+    PLATFORM_RP2040,
     SECRETS_FILES,
 )
 from esphome.core import CORE, EsphomeError, coroutine
@@ -101,11 +105,11 @@ def run_miniterm(config, port):
 
     if CONF_LOGGER not in config:
         _LOGGER.info("Logger is not enabled. Not starting UART logs.")
-        return
+        return 1
     baud_rate = config["logger"][CONF_BAUD_RATE]
     if baud_rate == 0:
         _LOGGER.info("UART logging is disabled (baud_rate=0). Not starting UART logs.")
-        return
+        return 1
     _LOGGER.info("Starting log output from %s with baud rate %s", port, baud_rate)
 
     backtrace_state = False
@@ -119,25 +123,34 @@ def run_miniterm(config, port):
         ser.dtr = False
         ser.rts = False
 
-    with ser:
-        while True:
-            try:
-                raw = ser.readline()
-            except serial.SerialException:
-                _LOGGER.error("Serial port closed!")
-                return
-            line = (
-                raw.replace(b"\r", b"")
-                .replace(b"\n", b"")
-                .decode("utf8", "backslashreplace")
-            )
-            time = datetime.now().time().strftime("[%H:%M:%S]")
-            message = time + line
-            safe_print(message)
+    tries = 0
+    while tries < 5:
+        try:
+            with ser:
+                while True:
+                    try:
+                        raw = ser.readline()
+                    except serial.SerialException:
+                        _LOGGER.error("Serial port closed!")
+                        return 0
+                    line = (
+                        raw.replace(b"\r", b"")
+                        .replace(b"\n", b"")
+                        .decode("utf8", "backslashreplace")
+                    )
+                    time_str = datetime.now().time().strftime("[%H:%M:%S]")
+                    message = time_str + line
+                    safe_print(message)
 
-            backtrace_state = platformio_api.process_stacktrace(
-                config, line, backtrace_state=backtrace_state
-            )
+                    backtrace_state = platformio_api.process_stacktrace(
+                        config, line, backtrace_state=backtrace_state
+                    )
+        except serial.SerialException:
+            tries += 1
+            time.sleep(1)
+    if tries >= 5:
+        _LOGGER.error("Could not connect to serial port %s", port)
+        return 1
 
 
 def wrap_to_code(name, comp):
@@ -258,9 +271,21 @@ def upload_using_esptool(config, port):
 
 
 def upload_program(config, args, host):
-    # if upload is to a serial port use platformio, otherwise assume ota
     if get_port_type(host) == "SERIAL":
-        return upload_using_esptool(config, host)
+        if CORE.target_platform in (PLATFORM_ESP32, PLATFORM_ESP8266):
+            return upload_using_esptool(config, host)
+
+        if CORE.target_platform in (PLATFORM_RP2040):
+            from esphome import platformio_api
+
+            upload_args = ["-t", "upload"]
+            if args.device is not None:
+                upload_args += ["--upload-port", args.device]
+            return platformio_api.run_platformio_cli_run(
+                config, CORE.verbose, *upload_args
+            )
+
+        return 1  # Unknown target platform
 
     from esphome import espota2
 
@@ -280,8 +305,7 @@ def show_logs(config, args, port):
     if "logger" not in config:
         raise EsphomeError("Logger is not configured!")
     if get_port_type(port) == "SERIAL":
-        run_miniterm(config, port)
-        return 0
+        return run_miniterm(config, port)
     if get_port_type(port) == "NETWORK" and "api" in config:
         from esphome.components.api.client import run_logs
 
diff --git a/esphome/components/logger/__init__.py b/esphome/components/logger/__init__.py
index 43d87bcefe..333e109379 100644
--- a/esphome/components/logger/__init__.py
+++ b/esphome/components/logger/__init__.py
@@ -77,6 +77,8 @@ UART_SELECTION_ESP8266 = [UART0, UART0_SWAP, UART1]
 
 ESP_IDF_UARTS = [USB_CDC, USB_SERIAL_JTAG]
 
+UART_SELECTION_RP2040 = [UART0, UART1]
+
 HARDWARE_UART_TO_UART_SELECTION = {
     UART0: logger_ns.UART_SELECTION_UART0,
     UART0_SWAP: logger_ns.UART_SELECTION_UART0_SWAP,
@@ -106,6 +108,8 @@ def uart_selection(value):
             return cv.one_of(*UART_SELECTION_ESP32[variant], upper=True)(value)
     if CORE.is_esp8266:
         return cv.one_of(*UART_SELECTION_ESP8266, upper=True)(value)
+    if CORE.is_rp2040:
+        return cv.one_of(*UART_SELECTION_RP2040, upper=True)(value)
     raise NotImplementedError
 
 
@@ -158,12 +162,13 @@ CONFIG_SCHEMA = cv.All(
 @coroutine_with_priority(90.0)
 async def to_code(config):
     baud_rate = config[CONF_BAUD_RATE]
-    rhs = Logger.new(
-        baud_rate,
-        config[CONF_TX_BUFFER_SIZE],
-        HARDWARE_UART_TO_UART_SELECTION[config[CONF_HARDWARE_UART]],
-    )
-    log = cg.Pvariable(config[CONF_ID], rhs)
+    log = cg.new_Pvariable(config[CONF_ID], baud_rate, config[CONF_TX_BUFFER_SIZE])
+    if CONF_HARDWARE_UART in config:
+        cg.add(
+            log.set_uart_selection(
+                HARDWARE_UART_TO_UART_SELECTION[config[CONF_HARDWARE_UART]]
+            )
+        )
     cg.add(log.pre_setup())
 
     for tag, level in config[CONF_LOGS].items():
diff --git a/esphome/components/logger/logger.cpp b/esphome/components/logger/logger.cpp
index c97677c887..271f99ba58 100644
--- a/esphome/components/logger/logger.cpp
+++ b/esphome/components/logger/logger.cpp
@@ -148,8 +148,7 @@ void HOT Logger::log_message_(int level, const char *tag, int offset) {
   this->log_callback_.call(level, tag, msg);
 }
 
-Logger::Logger(uint32_t baud_rate, size_t tx_buffer_size, UARTSelection uart)
-    : baud_rate_(baud_rate), tx_buffer_size_(tx_buffer_size), uart_(uart) {
+Logger::Logger(uint32_t baud_rate, size_t tx_buffer_size) : baud_rate_(baud_rate), tx_buffer_size_(tx_buffer_size) {
   // add 1 to buffer size for null terminator
   this->tx_buffer_ = new char[this->tx_buffer_size_ + 1];  // NOLINT
 }
@@ -270,6 +269,9 @@ const char *const UART_SELECTIONS[] = {
 #endif  // USE_ESP32
 #ifdef USE_ESP8266
 const char *const UART_SELECTIONS[] = {"UART0", "UART1", "UART0_SWAP"};
+#endif
+#ifdef USE_RP2040
+const char *const UART_SELECTIONS[] = {"UART0", "UART1"};
 #endif  // USE_ESP8266
 void Logger::dump_config() {
   ESP_LOGCONFIG(TAG, "Logger:");
diff --git a/esphome/components/logger/logger.h b/esphome/components/logger/logger.h
index 307c13a91f..0251faf987 100644
--- a/esphome/components/logger/logger.h
+++ b/esphome/components/logger/logger.h
@@ -7,8 +7,15 @@
 #include <cstdarg>
 
 #ifdef USE_ARDUINO
+#if defined(USE_ESP8266) || defined(USE_ESP32)
 #include <HardwareSerial.h>
-#endif
+#endif  // USE_ESP8266 || USE_ESP32
+#ifdef USE_RP2040
+#include <HardwareSerial.h>
+#include <SerialUSB.h>
+#endif  // USE_RP2040
+#endif  // USE_ARDUINO
+
 #ifdef USE_ESP_IDF
 #include <driver/uart.h>
 #endif
@@ -44,7 +51,7 @@ enum UARTSelection {
 
 class Logger : public Component {
  public:
-  explicit Logger(uint32_t baud_rate, size_t tx_buffer_size, UARTSelection uart);
+  explicit Logger(uint32_t baud_rate, size_t tx_buffer_size);
 
   /// Manually set the baud rate for serial, set to 0 to disable.
   void set_baud_rate(uint32_t baud_rate);
@@ -56,6 +63,7 @@ class Logger : public Component {
   uart_port_t get_uart_num() const { return uart_num_; }
 #endif
 
+  void set_uart_selection(UARTSelection uart_selection) { uart_ = uart_selection; }
   /// Get the UART used by the logger.
   UARTSelection get_uart() const;
 
diff --git a/esphome/components/md5/md5.cpp b/esphome/components/md5/md5.cpp
index 8d4bac1fd2..620b6749f3 100644
--- a/esphome/components/md5/md5.cpp
+++ b/esphome/components/md5/md5.cpp
@@ -6,7 +6,7 @@
 namespace esphome {
 namespace md5 {
 
-#ifdef USE_ARDUINO
+#if defined(USE_ARDUINO) && !defined(USE_RP2040)
 void MD5Digest::init() {
   memset(this->digest_, 0, 16);
   MD5Init(&this->ctx_);
@@ -15,7 +15,7 @@ void MD5Digest::init() {
 void MD5Digest::add(const uint8_t *data, size_t len) { MD5Update(&this->ctx_, data, len); }
 
 void MD5Digest::calculate() { MD5Final(this->digest_, &this->ctx_); }
-#endif  // USE_ARDUINO
+#endif  // USE_ARDUINO && !USE_RP2040
 
 #ifdef USE_ESP_IDF
 void MD5Digest::init() {
@@ -28,6 +28,17 @@ void MD5Digest::add(const uint8_t *data, size_t len) { esp_rom_md5_update(&this-
 void MD5Digest::calculate() { esp_rom_md5_final(this->digest_, &this->ctx_); }
 #endif  // USE_ESP_IDF
 
+#ifdef USE_RP2040
+void MD5Digest::init() {
+  memset(this->digest_, 0, 16);
+  br_md5_init(&this->ctx_);
+}
+
+void MD5Digest::add(const uint8_t *data, size_t len) { br_md5_update(&this->ctx_, data, len); }
+
+void MD5Digest::calculate() { br_md5_out(&this->ctx_, this->digest_); }
+#endif  // USE_RP2040
+
 void MD5Digest::get_bytes(uint8_t *output) { memcpy(output, this->digest_, 16); }
 
 void MD5Digest::get_hex(char *output) {
diff --git a/esphome/components/md5/md5.h b/esphome/components/md5/md5.h
index a9628c9242..738a312267 100644
--- a/esphome/components/md5/md5.h
+++ b/esphome/components/md5/md5.h
@@ -17,6 +17,11 @@
 #define MD5_CTX_TYPE md5_context_t
 #endif
 
+#ifdef USE_RP2040
+#include <MD5Builder.h>
+#define MD5_CTX_TYPE br_md5_context
+#endif
+
 namespace esphome {
 namespace md5 {
 
diff --git a/esphome/components/mdns/mdns_component.cpp b/esphome/components/mdns/mdns_component.cpp
index e1fcf320ed..a3f38322b3 100644
--- a/esphome/components/mdns/mdns_component.cpp
+++ b/esphome/components/mdns/mdns_component.cpp
@@ -38,6 +38,9 @@ void MDNSComponent::compile_records_() {
 #endif
 #ifdef USE_ESP32
     platform = "ESP32";
+#endif
+#ifdef USE_RP2040
+    platform = "RP2040";
 #endif
     if (platform != nullptr) {
       service.txt_records.push_back({"platform", platform});
diff --git a/esphome/components/mdns/mdns_rp2040.cpp b/esphome/components/mdns/mdns_rp2040.cpp
new file mode 100644
index 0000000000..b153ececcc
--- /dev/null
+++ b/esphome/components/mdns/mdns_rp2040.cpp
@@ -0,0 +1,40 @@
+#ifdef USE_RP2040
+
+#include "esphome/components/network/ip_address.h"
+#include "esphome/components/network/util.h"
+#include "esphome/core/log.h"
+#include "mdns_component.h"
+
+namespace esphome {
+namespace mdns {
+
+void MDNSComponent::setup() {
+  this->compile_records_();
+
+  network::IPAddress addr = network::get_ip_address();
+  // MDNS.begin(this->hostname_.c_str(), (uint32_t) addr);
+
+  // for (const auto &service : this->services_) {
+  //   // Strip the leading underscore from the proto and service_type. While it is
+  //   // part of the wire protocol to have an underscore, and for example ESP-IDF
+  //   // expects the underscore to be there, the ESP8266 implementation always adds
+  //   // the underscore itself.
+  //   auto *proto = service.proto.c_str();
+  //   while (*proto == '_') {
+  //     proto++;
+  //   }
+  //   auto *service_type = service.service_type.c_str();
+  //   while (*service_type == '_') {
+  //     service_type++;
+  //   }
+  //   MDNS.addService(service_type, proto, service.port);
+  //   for (const auto &record : service.txt_records) {
+  //     MDNS.addServiceTxt(service_type, proto, record.key.c_str(), record.value.c_str());
+  //   }
+  // }
+}
+
+}  // namespace mdns
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/ota/__init__.py b/esphome/components/ota/__init__.py
index 1bc4012ce2..32ea1fd363 100644
--- a/esphome/components/ota/__init__.py
+++ b/esphome/components/ota/__init__.py
@@ -39,7 +39,7 @@ CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(OTAComponent),
         cv.Optional(CONF_SAFE_MODE, default=True): cv.boolean,
-        cv.SplitDefault(CONF_PORT, esp8266=8266, esp32=3232): cv.port,
+        cv.SplitDefault(CONF_PORT, esp8266=8266, esp32=3232, rp2040=2040): cv.port,
         cv.Optional(CONF_PASSWORD): cv.string,
         cv.Optional(
             CONF_REBOOT_TIMEOUT, default="5min"
@@ -94,6 +94,9 @@ async def to_code(config):
     if CORE.is_esp32 and CORE.using_arduino:
         cg.add_library("Update", None)
 
+    if CORE.is_rp2040 and CORE.using_arduino:
+        cg.add_library("Updater", None)
+
     use_state_callback = False
     for conf in config.get(CONF_ON_STATE_CHANGE, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
diff --git a/esphome/components/ota/ota_backend_arduino_rp2040.cpp b/esphome/components/ota/ota_backend_arduino_rp2040.cpp
new file mode 100644
index 0000000000..5a46b8f07e
--- /dev/null
+++ b/esphome/components/ota/ota_backend_arduino_rp2040.cpp
@@ -0,0 +1,55 @@
+#include "esphome/core/defines.h"
+#ifdef USE_ARDUINO
+#ifdef USE_RP2040
+
+#include "esphome/components/rp2040/preferences.h"
+#include "ota_backend.h"
+#include "ota_backend_arduino_rp2040.h"
+#include "ota_component.h"
+
+#include <Updater.h>
+
+namespace esphome {
+namespace ota {
+
+OTAResponseTypes ArduinoRP2040OTABackend::begin(size_t image_size) {
+  bool ret = Update.begin(image_size, U_FLASH);
+  if (ret) {
+    return OTA_RESPONSE_OK;
+  }
+
+  uint8_t error = Update.getError();
+  if (error == UPDATE_ERROR_BOOTSTRAP)
+    return OTA_RESPONSE_ERROR_INVALID_BOOTSTRAPPING;
+  if (error == UPDATE_ERROR_NEW_FLASH_CONFIG)
+    return OTA_RESPONSE_ERROR_WRONG_NEW_FLASH_CONFIG;
+  if (error == UPDATE_ERROR_FLASH_CONFIG)
+    return OTA_RESPONSE_ERROR_WRONG_CURRENT_FLASH_CONFIG;
+  if (error == UPDATE_ERROR_SPACE)
+    return OTA_RESPONSE_ERROR_RP2040_NOT_ENOUGH_SPACE;
+  return OTA_RESPONSE_ERROR_UNKNOWN;
+}
+
+void ArduinoRP2040OTABackend::set_update_md5(const char *md5) { Update.setMD5(md5); }
+
+OTAResponseTypes ArduinoRP2040OTABackend::write(uint8_t *data, size_t len) {
+  size_t written = Update.write(data, len);
+  if (written != len) {
+    return OTA_RESPONSE_ERROR_WRITING_FLASH;
+  }
+  return OTA_RESPONSE_OK;
+}
+
+OTAResponseTypes ArduinoRP2040OTABackend::end() {
+  if (!Update.end())
+    return OTA_RESPONSE_ERROR_UPDATE_END;
+  return OTA_RESPONSE_OK;
+}
+
+void ArduinoRP2040OTABackend::abort() { Update.end(); }
+
+}  // namespace ota
+}  // namespace esphome
+
+#endif  // USE_RP2040
+#endif  // USE_ARDUINO
diff --git a/esphome/components/ota/ota_backend_arduino_rp2040.h b/esphome/components/ota/ota_backend_arduino_rp2040.h
new file mode 100644
index 0000000000..5aa2ec9435
--- /dev/null
+++ b/esphome/components/ota/ota_backend_arduino_rp2040.h
@@ -0,0 +1,27 @@
+#pragma once
+#include "esphome/core/defines.h"
+#ifdef USE_ARDUINO
+#ifdef USE_RP2040
+
+#include "esphome/core/macros.h"
+#include "ota_backend.h"
+#include "ota_component.h"
+
+namespace esphome {
+namespace ota {
+
+class ArduinoRP2040OTABackend : public OTABackend {
+ public:
+  OTAResponseTypes begin(size_t image_size) override;
+  void set_update_md5(const char *md5) override;
+  OTAResponseTypes write(uint8_t *data, size_t len) override;
+  OTAResponseTypes end() override;
+  void abort() override;
+  bool supports_compression() override { return false; }
+};
+
+}  // namespace ota
+}  // namespace esphome
+
+#endif  // USE_RP2040
+#endif  // USE_ARDUINO
diff --git a/esphome/components/ota/ota_component.cpp b/esphome/components/ota/ota_component.cpp
index a02d64cd08..1f1ecd9867 100644
--- a/esphome/components/ota/ota_component.cpp
+++ b/esphome/components/ota/ota_component.cpp
@@ -2,6 +2,7 @@
 #include "ota_backend.h"
 #include "ota_backend_arduino_esp32.h"
 #include "ota_backend_arduino_esp8266.h"
+#include "ota_backend_arduino_rp2040.h"
 #include "ota_backend_esp_idf.h"
 
 #include "esphome/core/log.h"
@@ -35,6 +36,9 @@ std::unique_ptr<OTABackend> make_ota_backend() {
 #ifdef USE_ESP_IDF
   return make_unique<IDFOTABackend>();
 #endif  // USE_ESP_IDF
+#ifdef USE_RP2040
+  return make_unique<ArduinoRP2040OTABackend>();
+#endif  // USE_RP2040
 }
 
 OTAComponent::OTAComponent() { global_ota_component = this; }
diff --git a/esphome/components/ota/ota_component.h b/esphome/components/ota/ota_component.h
index 9a1c92f727..50d095be6c 100644
--- a/esphome/components/ota/ota_component.h
+++ b/esphome/components/ota/ota_component.h
@@ -33,6 +33,7 @@ enum OTAResponseTypes {
   OTA_RESPONSE_ERROR_ESP32_NOT_ENOUGH_SPACE = 137,
   OTA_RESPONSE_ERROR_NO_UPDATE_PARTITION = 138,
   OTA_RESPONSE_ERROR_MD5_MISMATCH = 139,
+  OTA_RESPONSE_ERROR_RP2040_NOT_ENOUGH_SPACE = 140,
   OTA_RESPONSE_ERROR_UNKNOWN = 255,
 };
 
diff --git a/esphome/components/rp2040/__init__.py b/esphome/components/rp2040/__init__.py
new file mode 100644
index 0000000000..d526228f41
--- /dev/null
+++ b/esphome/components/rp2040/__init__.py
@@ -0,0 +1,157 @@
+import logging
+
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.const import (
+    CONF_BOARD,
+    CONF_FRAMEWORK,
+    CONF_SOURCE,
+    CONF_VERSION,
+    KEY_CORE,
+    KEY_FRAMEWORK_VERSION,
+    KEY_TARGET_FRAMEWORK,
+    KEY_TARGET_PLATFORM,
+)
+from esphome.core import CORE, coroutine_with_priority
+
+from .const import KEY_BOARD, KEY_RP2040, rp2040_ns
+
+# force import gpio to register pin schema
+from .gpio import rp2040_pin_to_code  # noqa
+
+_LOGGER = logging.getLogger(__name__)
+CODEOWNERS = ["@jesserockz"]
+AUTO_LOAD = []
+
+
+def set_core_data(config):
+    CORE.data[KEY_RP2040] = {}
+    CORE.data[KEY_CORE][KEY_TARGET_PLATFORM] = "rp2040"
+    CORE.data[KEY_CORE][KEY_TARGET_FRAMEWORK] = "arduino"
+    CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] = cv.Version.parse(
+        config[CONF_FRAMEWORK][CONF_VERSION]
+    )
+    CORE.data[KEY_RP2040][KEY_BOARD] = config[CONF_BOARD]
+
+    return config
+
+
+def _format_framework_arduino_version(ver: cv.Version) -> str:
+    # format the given arduino (https://github.com/earlephilhower/arduino-pico/releases) version to
+    # a PIO earlephilhower/framework-arduinopico value
+    # List of package versions: https://api.registry.platformio.org/v3/packages/earlephilhower/tool/framework-arduinopico
+    return f"~1.{ver.major}{ver.minor:02d}{ver.patch:02d}.0"
+
+
+# NOTE: Keep this in mind when updating the recommended version:
+#  * The new version needs to be thoroughly validated before changing the
+#    recommended version as otherwise a bunch of devices could be bricked
+#  * For all constants below, update platformio.ini (in this repo)
+#    and platformio.ini/platformio-lint.ini in the esphome-docker-base repository
+
+# The default/recommended arduino framework version
+#  - https://github.com/earlephilhower/arduino-pico/releases
+#  - https://api.registry.platformio.org/v3/packages/earlephilhower/tool/framework-arduinopico
+RECOMMENDED_ARDUINO_FRAMEWORK_VERSION = cv.Version(2, 4, 0)
+
+# The platformio/raspberrypi version to use for arduino frameworks
+#  - https://github.com/platformio/platform-raspberrypi/releases
+#  - https://api.registry.platformio.org/v3/packages/platformio/platform/raspberrypi
+ARDUINO_PLATFORM_VERSION = cv.Version(1, 7, 0)
+
+
+def _arduino_check_versions(value):
+    value = value.copy()
+    lookups = {
+        "dev": (cv.Version(2, 4, 0), "https://github.com/earlephilhower/arduino-pico"),
+        "latest": (cv.Version(2, 4, 0), None),
+        "recommended": (RECOMMENDED_ARDUINO_FRAMEWORK_VERSION, None),
+    }
+
+    if value[CONF_VERSION] in lookups:
+        if CONF_SOURCE in value:
+            raise cv.Invalid(
+                "Framework version needs to be explicitly specified when custom source is used."
+            )
+
+        version, source = lookups[value[CONF_VERSION]]
+    else:
+        version = cv.Version.parse(cv.version_number(value[CONF_VERSION]))
+        source = value.get(CONF_SOURCE, None)
+
+    value[CONF_VERSION] = str(version)
+    value[CONF_SOURCE] = source or _format_framework_arduino_version(version)
+
+    value[CONF_PLATFORM_VERSION] = value.get(
+        CONF_PLATFORM_VERSION, _parse_platform_version(str(ARDUINO_PLATFORM_VERSION))
+    )
+
+    if version != RECOMMENDED_ARDUINO_FRAMEWORK_VERSION:
+        _LOGGER.warning(
+            "The selected Arduino framework version is not the recommended one."
+        )
+
+    return value
+
+
+def _parse_platform_version(value):
+    try:
+        # if platform version is a valid version constraint, prefix the default package
+        cv.platformio_version_constraint(value)
+        return f"platformio/raspberrypi @ {value}"
+    except cv.Invalid:
+        return value
+
+
+CONF_PLATFORM_VERSION = "platform_version"
+
+ARDUINO_FRAMEWORK_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.Optional(CONF_VERSION, default="recommended"): cv.string_strict,
+            cv.Optional(CONF_SOURCE): cv.string_strict,
+            cv.Optional(CONF_PLATFORM_VERSION): _parse_platform_version,
+        }
+    ),
+    _arduino_check_versions,
+)
+
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.Required(CONF_BOARD): cv.string_strict,
+            cv.Optional(CONF_FRAMEWORK, default={}): ARDUINO_FRAMEWORK_SCHEMA,
+        }
+    ),
+    set_core_data,
+)
+
+
+@coroutine_with_priority(1000)
+async def to_code(config):
+    cg.add(rp2040_ns.setup_preferences())
+
+    cg.add_platformio_option("board", config[CONF_BOARD])
+    cg.add_build_flag("-DUSE_RP2040")
+    cg.add_define("ESPHOME_BOARD", config[CONF_BOARD])
+    cg.add_define("ESPHOME_VARIANT", "RP2040")
+
+    conf = config[CONF_FRAMEWORK]
+    cg.add_platformio_option("framework", "arduino")
+    cg.add_build_flag("-DUSE_ARDUINO")
+    cg.add_build_flag("-DUSE_RP2040_FRAMEWORK_ARDUINO")
+    # cg.add_build_flag("-DPICO_BOARD=pico_w")
+    cg.add_platformio_option("platform", conf[CONF_PLATFORM_VERSION])
+    cg.add_platformio_option(
+        "platform_packages",
+        [f"earlephilhower/framework-arduinopico @ {conf[CONF_SOURCE]}"],
+    )
+
+    cg.add_platformio_option("board_build.core", "earlephilhower")
+    cg.add_platformio_option("board_build.filesystem_size", "0.5m")
+
+    ver: cv.Version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
+    cg.add_define(
+        "USE_ARDUINO_VERSION_CODE",
+        cg.RawExpression(f"VERSION_CODE({ver.major}, {ver.minor}, {ver.patch})"),
+    )
diff --git a/esphome/components/rp2040/boards.py b/esphome/components/rp2040/boards.py
new file mode 100644
index 0000000000..be3d05369a
--- /dev/null
+++ b/esphome/components/rp2040/boards.py
@@ -0,0 +1,7 @@
+RP2040_BASE_PINS = {}
+
+RP2040_BOARD_PINS = {
+    "pico": {"LED": 25},
+    "rpipico": "pico",
+    "rpipicow": {},
+}
diff --git a/esphome/components/rp2040/const.py b/esphome/components/rp2040/const.py
new file mode 100644
index 0000000000..e09016ca31
--- /dev/null
+++ b/esphome/components/rp2040/const.py
@@ -0,0 +1,6 @@
+import esphome.codegen as cg
+
+KEY_BOARD = "board"
+KEY_RP2040 = "rp2040"
+
+rp2040_ns = cg.esphome_ns.namespace("rp2040")
diff --git a/esphome/components/rp2040/core.cpp b/esphome/components/rp2040/core.cpp
new file mode 100644
index 0000000000..2a1ce5a4d3
--- /dev/null
+++ b/esphome/components/rp2040/core.cpp
@@ -0,0 +1,32 @@
+#ifdef USE_RP2040
+
+#include "core.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
+
+#include "hardware/watchdog.h"
+
+namespace esphome {
+
+void IRAM_ATTR HOT yield() { ::yield(); }
+uint32_t IRAM_ATTR HOT millis() { return ::millis(); }
+void IRAM_ATTR HOT delay(uint32_t ms) { ::delay(ms); }
+uint32_t IRAM_ATTR HOT micros() { return ::micros(); }
+void IRAM_ATTR HOT delayMicroseconds(uint32_t us) { delay_microseconds_safe(us); }
+void arch_restart() {
+  while (true) {  // NOLINT(clang-diagnostic-unreachable-code)
+    yield();
+  }
+}
+void arch_init() { watchdog_enable(0x7fffff, false); }
+void IRAM_ATTR HOT arch_feed_wdt() { watchdog_update(); }
+
+uint8_t progmem_read_byte(const uint8_t *addr) {
+  return pgm_read_byte(addr);  // NOLINT
+}
+uint32_t IRAM_ATTR HOT arch_get_cpu_cycle_count() { return ulMainGetRunTimeCounterValue(); }
+uint32_t arch_get_cpu_freq_hz() { return RP2040::f_cpu(); }
+
+}  // namespace esphome
+
+#endif  // USE_RP2040
diff --git a/esphome/components/rp2040/core.h b/esphome/components/rp2040/core.h
new file mode 100644
index 0000000000..92fc4f824e
--- /dev/null
+++ b/esphome/components/rp2040/core.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#ifdef USE_RP2040
+
+#include <Arduino.h>
+#include <pico.h>
+
+extern "C" unsigned long ulMainGetRunTimeCounterValue();
+
+namespace esphome {
+namespace rp2040 {}  // namespace rp2040
+}  // namespace esphome
+
+#endif  // USE_RP2040
diff --git a/esphome/components/rp2040/gpio.cpp b/esphome/components/rp2040/gpio.cpp
new file mode 100644
index 0000000000..e32b93b5c2
--- /dev/null
+++ b/esphome/components/rp2040/gpio.cpp
@@ -0,0 +1,103 @@
+#ifdef USE_RP2040
+
+#include "gpio.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace rp2040 {
+
+static const char *const TAG = "rp2040";
+
+static int IRAM_ATTR flags_to_mode(gpio::Flags flags, uint8_t pin) {
+  if (flags == gpio::FLAG_INPUT) {  // NOLINT(bugprone-branch-clone)
+    return INPUT;
+  } else if (flags == gpio::FLAG_OUTPUT) {
+    return OUTPUT;
+  } else if (flags == (gpio::FLAG_INPUT | gpio::FLAG_PULLUP)) {
+    return INPUT_PULLUP;
+  } else if (flags == (gpio::FLAG_INPUT | gpio::FLAG_PULLDOWN)) {
+    return INPUT_PULLDOWN;
+    // } else if (flags == (gpio::FLAG_OUTPUT | gpio::FLAG_OPEN_DRAIN)) {
+    //   return OpenDrain;
+  } else {
+    return 0;
+  }
+}
+
+struct ISRPinArg {
+  uint8_t pin;
+  bool inverted;
+};
+
+ISRInternalGPIOPin RP2040GPIOPin::to_isr() const {
+  auto *arg = new ISRPinArg{};  // NOLINT(cppcoreguidelines-owning-memory)
+  arg->pin = pin_;
+  arg->inverted = inverted_;
+  return ISRInternalGPIOPin((void *) arg);
+}
+
+void RP2040GPIOPin::attach_interrupt(void (*func)(void *), void *arg, gpio::InterruptType type) const {
+  PinStatus arduino_mode = LOW;
+  switch (type) {
+    case gpio::INTERRUPT_RISING_EDGE:
+      arduino_mode = inverted_ ? FALLING : RISING;
+      break;
+    case gpio::INTERRUPT_FALLING_EDGE:
+      arduino_mode = inverted_ ? RISING : FALLING;
+      break;
+    case gpio::INTERRUPT_ANY_EDGE:
+      arduino_mode = CHANGE;
+      break;
+    case gpio::INTERRUPT_LOW_LEVEL:
+      arduino_mode = inverted_ ? HIGH : LOW;
+      break;
+    case gpio::INTERRUPT_HIGH_LEVEL:
+      arduino_mode = inverted_ ? LOW : HIGH;
+      break;
+  }
+
+  attachInterrupt(pin_, func, arduino_mode, arg);
+}
+void RP2040GPIOPin::pin_mode(gpio::Flags flags) {
+  pinMode(pin_, flags_to_mode(flags, pin_));  // NOLINT
+}
+
+std::string RP2040GPIOPin::dump_summary() const {
+  char buffer[32];
+  snprintf(buffer, sizeof(buffer), "GPIO%u", pin_);
+  return buffer;
+}
+
+bool RP2040GPIOPin::digital_read() {
+  return bool(digitalRead(pin_)) != inverted_;  // NOLINT
+}
+void RP2040GPIOPin::digital_write(bool value) {
+  digitalWrite(pin_, value != inverted_ ? 1 : 0);  // NOLINT
+}
+void RP2040GPIOPin::detach_interrupt() const { detachInterrupt(pin_); }
+
+}  // namespace rp2040
+
+using namespace rp2040;
+
+bool IRAM_ATTR ISRInternalGPIOPin::digital_read() {
+  auto *arg = reinterpret_cast<ISRPinArg *>(arg_);
+  return bool(digitalRead(arg->pin)) != arg->inverted;  // NOLINT
+}
+void IRAM_ATTR ISRInternalGPIOPin::digital_write(bool value) {
+  auto *arg = reinterpret_cast<ISRPinArg *>(arg_);
+  digitalWrite(arg->pin, value != arg->inverted ? 1 : 0);  // NOLINT
+}
+void IRAM_ATTR ISRInternalGPIOPin::clear_interrupt() {
+  // TODO: implement
+  // auto *arg = reinterpret_cast<ISRPinArg *>(arg_);
+  // GPIO_REG_WRITE(GPIO_STATUS_W1TC_ADDRESS, 1UL << arg->pin);
+}
+void IRAM_ATTR ISRInternalGPIOPin::pin_mode(gpio::Flags flags) {
+  auto *arg = reinterpret_cast<ISRPinArg *>(arg_);
+  pinMode(arg->pin, flags_to_mode(flags, arg->pin));  // NOLINT
+}
+
+}  // namespace esphome
+
+#endif  // USE_RP2040
diff --git a/esphome/components/rp2040/gpio.h b/esphome/components/rp2040/gpio.h
new file mode 100644
index 0000000000..ef9500d5dd
--- /dev/null
+++ b/esphome/components/rp2040/gpio.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#ifdef USE_RP2040
+
+#include <Arduino.h>
+#include "esphome/core/hal.h"
+
+namespace esphome {
+namespace rp2040 {
+
+class RP2040GPIOPin : public InternalGPIOPin {
+ public:
+  void set_pin(uint8_t pin) { pin_ = pin; }
+  void set_inverted(bool inverted) { inverted_ = inverted; }
+  void set_flags(gpio::Flags flags) { flags_ = flags; }
+
+  void setup() override { pin_mode(flags_); }
+  void pin_mode(gpio::Flags flags) override;
+  bool digital_read() override;
+  void digital_write(bool value) override;
+  std::string dump_summary() const override;
+  void detach_interrupt() const override;
+  ISRInternalGPIOPin to_isr() const override;
+  uint8_t get_pin() const override { return pin_; }
+  bool is_inverted() const override { return inverted_; }
+
+ protected:
+  void attach_interrupt(void (*func)(void *), void *arg, gpio::InterruptType type) const override;
+
+  uint8_t pin_;
+  bool inverted_;
+  gpio::Flags flags_;
+};
+
+}  // namespace rp2040
+}  // namespace esphome
+
+#endif  // USE_RP2040
diff --git a/esphome/components/rp2040/gpio.py b/esphome/components/rp2040/gpio.py
new file mode 100644
index 0000000000..4bc6dbee1c
--- /dev/null
+++ b/esphome/components/rp2040/gpio.py
@@ -0,0 +1,91 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.const import (
+    CONF_ID,
+    CONF_INPUT,
+    CONF_INVERTED,
+    CONF_MODE,
+    CONF_NUMBER,
+    CONF_OPEN_DRAIN,
+    CONF_OUTPUT,
+    CONF_PULLDOWN,
+    CONF_PULLUP,
+)
+from esphome.core import CORE
+from esphome import pins
+
+from . import boards
+from .const import KEY_BOARD, KEY_RP2040, rp2040_ns
+
+RP2040GPIOPin = rp2040_ns.class_("RP2040GPIOPin", cg.InternalGPIOPin)
+
+
+def _lookup_pin(value):
+    board = CORE.data[KEY_RP2040][KEY_BOARD]
+    board_pins = boards.RP2040_BOARD_PINS.get(board, {})
+
+    while isinstance(board_pins, str):
+        board_pins = boards.RP2040_BOARD_PINS[board_pins]
+
+    if value in board_pins:
+        return board_pins[value]
+    if value in boards.RP2040_BASE_PINS:
+        return boards.RP2040_BASE_PINS[value]
+    raise cv.Invalid(f"Cannot resolve pin name '{value}' for board {board}.")
+
+
+def _translate_pin(value):
+    if isinstance(value, dict) or value is None:
+        raise cv.Invalid(
+            "This variable only supports pin numbers, not full pin schemas "
+            "(with inverted and mode)."
+        )
+    if isinstance(value, int):
+        return value
+    try:
+        return int(value)
+    except ValueError:
+        pass
+    if value.startswith("GPIO"):
+        return cv.int_(value[len("GPIO") :].strip())
+    return _lookup_pin(value)
+
+
+def validate_gpio_pin(value):
+    value = _translate_pin(value)
+    if value < 0 or value > 29:
+        raise cv.Invalid(f"RP2040: Invalid pin number: {value}")
+    return value
+
+
+CONF_ANALOG = "analog"
+
+RP2040_PIN_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(RP2040GPIOPin),
+            cv.Required(CONF_NUMBER): validate_gpio_pin,
+            cv.Optional(CONF_MODE, default={}): cv.Schema(
+                {
+                    cv.Optional(CONF_ANALOG, default=False): cv.boolean,
+                    cv.Optional(CONF_INPUT, default=False): cv.boolean,
+                    cv.Optional(CONF_OUTPUT, default=False): cv.boolean,
+                    cv.Optional(CONF_OPEN_DRAIN, default=False): cv.boolean,
+                    cv.Optional(CONF_PULLUP, default=False): cv.boolean,
+                    cv.Optional(CONF_PULLDOWN, default=False): cv.boolean,
+                }
+            ),
+            cv.Optional(CONF_INVERTED, default=False): cv.boolean,
+        }
+    )
+)
+
+
+@pins.PIN_SCHEMA_REGISTRY.register("rp2040", RP2040_PIN_SCHEMA)
+async def rp2040_pin_to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    num = config[CONF_NUMBER]
+    cg.add(var.set_pin(num))
+    cg.add(var.set_inverted(config[CONF_INVERTED]))
+    cg.add(var.set_flags(pins.gpio_flags_expr(config[CONF_MODE])))
+    return var
diff --git a/esphome/components/rp2040/preferences.cpp b/esphome/components/rp2040/preferences.cpp
new file mode 100644
index 0000000000..58ec57df2a
--- /dev/null
+++ b/esphome/components/rp2040/preferences.cpp
@@ -0,0 +1,49 @@
+#ifdef USE_RP2040
+
+#include "preferences.h"
+
+#include <cstring>
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+#include "esphome/core/preferences.h"
+
+namespace esphome {
+namespace rp2040 {
+
+static const char *const TAG = "rp2040.preferences";
+
+class RP2040PreferenceBackend : public ESPPreferenceBackend {
+ public:
+  bool save(const uint8_t *data, size_t len) override { return true; }
+  bool load(uint8_t *data, size_t len) override { return false; }
+};
+
+class RP2040Preferences : public ESPPreferences {
+ public:
+  ESPPreferenceObject make_preference(size_t length, uint32_t type, bool in_flash) override {
+    auto *pref = new RP2040PreferenceBackend();  // NOLINT(cppcoreguidelines-owning-memory)
+    return ESPPreferenceObject(pref);
+  }
+
+  ESPPreferenceObject make_preference(size_t length, uint32_t type) override {
+    auto *pref = new RP2040PreferenceBackend();  // NOLINT(cppcoreguidelines-owning-memory)
+    return ESPPreferenceObject(pref);
+  }
+
+  bool sync() override { return true; }
+
+  bool reset() override { return true; }
+};
+
+void setup_preferences() {
+  auto *prefs = new RP2040Preferences();  // NOLINT(cppcoreguidelines-owning-memory)
+  global_preferences = prefs;
+}
+
+}  // namespace rp2040
+
+ESPPreferences *global_preferences;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+
+}  // namespace esphome
+
+#endif  // USE_RP2040
diff --git a/esphome/components/rp2040/preferences.h b/esphome/components/rp2040/preferences.h
new file mode 100644
index 0000000000..3c740a41c1
--- /dev/null
+++ b/esphome/components/rp2040/preferences.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#ifdef USE_RP2040
+
+namespace esphome {
+namespace rp2040 {
+
+void setup_preferences();
+
+}  // namespace rp2040
+}  // namespace esphome
+
+#endif  // USE_RP2040
diff --git a/esphome/components/rp2040_pwm/__init__.py b/esphome/components/rp2040_pwm/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/rp2040_pwm/output.py b/esphome/components/rp2040_pwm/output.py
new file mode 100644
index 0000000000..8f2972d4a0
--- /dev/null
+++ b/esphome/components/rp2040_pwm/output.py
@@ -0,0 +1,55 @@
+from esphome import pins, automation
+from esphome.components import output
+import esphome.config_validation as cv
+import esphome.codegen as cg
+from esphome.const import (
+    CONF_FREQUENCY,
+    CONF_ID,
+    CONF_PIN,
+)
+
+CODEOWNERS = ["@jesserockz"]
+DEPENDENCIES = ["rp2040"]
+
+
+rp2040_pwm_ns = cg.esphome_ns.namespace("rp2040_pwm")
+RP2040PWM = rp2040_pwm_ns.class_("RP2040PWM", output.FloatOutput, cg.Component)
+SetFrequencyAction = rp2040_pwm_ns.class_("SetFrequencyAction", automation.Action)
+validate_frequency = cv.All(cv.frequency, cv.Range(min=1.0e-6))
+
+CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
+    {
+        cv.Required(CONF_ID): cv.declare_id(RP2040PWM),
+        cv.Required(CONF_PIN): pins.internal_gpio_output_pin_schema,
+        cv.Optional(CONF_FREQUENCY, default="1kHz"): validate_frequency,
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await output.register_output(var, config)
+
+    pin = await cg.gpio_pin_expression(config[CONF_PIN])
+    cg.add(var.set_pin(pin))
+
+    cg.add(var.set_frequency(config[CONF_FREQUENCY]))
+
+
+@automation.register_action(
+    "output.rp2040_pwm.set_frequency",
+    SetFrequencyAction,
+    cv.Schema(
+        {
+            cv.Required(CONF_ID): cv.use_id(RP2040PWM),
+            cv.Required(CONF_FREQUENCY): cv.templatable(validate_frequency),
+        }
+    ),
+)
+async def rp2040_set_frequency_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_FREQUENCY], args, float)
+    cg.add(var.set_frequency(template_))
+    return var
diff --git a/esphome/components/rp2040_pwm/rp2040_pwm.cpp b/esphome/components/rp2040_pwm/rp2040_pwm.cpp
new file mode 100644
index 0000000000..bf2a446edf
--- /dev/null
+++ b/esphome/components/rp2040_pwm/rp2040_pwm.cpp
@@ -0,0 +1,45 @@
+#ifdef USE_RP2040
+
+#include "rp2040_pwm.h"
+#include "esphome/core/defines.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+#include "esphome/core/macros.h"
+
+#include <PinNames.h>
+
+namespace esphome {
+namespace rp2040_pwm {
+
+static const char *const TAG = "rp2040_pwm";
+
+void RP2040PWM::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up RP2040 PWM Output...");
+  this->pin_->setup();
+  this->pwm_ = new mbed::PwmOut((PinName) this->pin_->get_pin());
+  this->turn_off();
+}
+void RP2040PWM::dump_config() {
+  ESP_LOGCONFIG(TAG, "RP2040 PWM:");
+  LOG_PIN("  Pin: ", this->pin_);
+  ESP_LOGCONFIG(TAG, "  Frequency: %.1f Hz", this->frequency_);
+  LOG_FLOAT_OUTPUT(this);
+}
+void HOT RP2040PWM::write_state(float state) {
+  this->last_output_ = state;
+
+  // Also check pin inversion
+  if (this->pin_->is_inverted()) {
+    state = 1.0f - state;
+  }
+
+  auto total_time_us = static_cast<uint32_t>(roundf(1e6f / this->frequency_));
+
+  this->pwm_->period_us(total_time_us);
+  this->pwm_->write(state);
+}
+
+}  // namespace rp2040_pwm
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/rp2040_pwm/rp2040_pwm.h b/esphome/components/rp2040_pwm/rp2040_pwm.h
new file mode 100644
index 0000000000..e348f131c2
--- /dev/null
+++ b/esphome/components/rp2040_pwm/rp2040_pwm.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#ifdef USE_RP2040
+
+#include "esphome/components/output/float_output.h"
+#include "esphome/core/automation.h"
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+
+#include "drivers/PwmOut.h"
+
+namespace esphome {
+namespace rp2040_pwm {
+
+class RP2040PWM : public output::FloatOutput, public Component {
+ public:
+  void set_pin(InternalGPIOPin *pin) { pin_ = pin; }
+  void set_frequency(float frequency) { this->frequency_ = frequency; }
+  /// Dynamically update frequency
+  void update_frequency(float frequency) override {
+    this->set_frequency(frequency);
+    this->write_state(this->last_output_);
+  }
+
+  /// Initialize pin
+  void setup() override;
+  void dump_config() override;
+  /// HARDWARE setup_priority
+  float get_setup_priority() const override { return setup_priority::HARDWARE; }
+
+ protected:
+  void write_state(float state) override;
+
+  InternalGPIOPin *pin_;
+  mbed::PwmOut *pwm_;
+  float frequency_{1000.0};
+  /// Cache last output level for dynamic frequency updating
+  float last_output_{0.0};
+};
+
+template<typename... Ts> class SetFrequencyAction : public Action<Ts...> {
+ public:
+  SetFrequencyAction(RP2040PWM *parent) : parent_(parent) {}
+  TEMPLATABLE_VALUE(float, frequency);
+
+  void play(Ts... x) {
+    float freq = this->frequency_.value(x...);
+    this->parent_->update_frequency(freq);
+  }
+
+  RP2040PWM *parent_;
+};
+
+}  // namespace rp2040_pwm
+}  // namespace esphome
+
+#endif  // USE_RP2040
diff --git a/esphome/components/socket/__init__.py b/esphome/components/socket/__init__.py
index 8e9502be6d..81203fdc31 100644
--- a/esphome/components/socket/__init__.py
+++ b/esphome/components/socket/__init__.py
@@ -13,6 +13,7 @@ CONFIG_SCHEMA = cv.Schema(
             CONF_IMPLEMENTATION,
             esp8266=IMPLEMENTATION_LWIP_TCP,
             esp32=IMPLEMENTATION_BSD_SOCKETS,
+            rp2040=IMPLEMENTATION_LWIP_TCP,
         ): cv.one_of(
             IMPLEMENTATION_LWIP_TCP, IMPLEMENTATION_BSD_SOCKETS, lower=True, space="_"
         ),
diff --git a/esphome/components/socket/headers.h b/esphome/components/socket/headers.h
index a383c0071d..1e79c8a1ab 100644
--- a/esphome/components/socket/headers.h
+++ b/esphome/components/socket/headers.h
@@ -91,7 +91,7 @@ struct iovec {
   size_t iov_len;
 };
 
-#ifdef USE_ESP8266
+#if defined(USE_ESP8266) || defined(USE_RP2040)
 // arduino-esp8266 declares a global vars called INADDR_NONE/ANY which are invalid with the define
 #ifdef INADDR_ANY
 #undef INADDR_ANY
diff --git a/esphome/components/spi/__init__.py b/esphome/components/spi/__init__.py
index c917fe1ad8..eeaf37985b 100644
--- a/esphome/components/spi/__init__.py
+++ b/esphome/components/spi/__init__.py
@@ -46,9 +46,7 @@ async def to_code(config):
         mosi = await cg.gpio_pin_expression(config[CONF_MOSI_PIN])
         cg.add(var.set_mosi(mosi))
 
-    if CORE.is_esp32 and CORE.using_arduino:
-        cg.add_library("SPI", None)
-    if CORE.is_esp8266:
+    if CORE.using_arduino:
         cg.add_library("SPI", None)
 
 
diff --git a/esphome/components/spi/spi.h b/esphome/components/spi/spi.h
index 7f0b0f481a..bc183be54b 100644
--- a/esphome/components/spi/spi.h
+++ b/esphome/components/spi/spi.h
@@ -105,7 +105,11 @@ class SPIComponent : public Component {
   void write_byte(uint8_t data) {
 #ifdef USE_SPI_ARDUINO_BACKEND
     if (this->hw_spi_ != nullptr) {
+#ifdef USE_RP2040
+      this->hw_spi_->transfer(data);
+#else
       this->hw_spi_->write(data);
+#endif
       return;
     }
 #endif  // USE_SPI_ARDUINO_BACKEND
@@ -116,7 +120,11 @@ class SPIComponent : public Component {
   void write_byte16(const uint16_t data) {
 #ifdef USE_SPI_ARDUINO_BACKEND
     if (this->hw_spi_ != nullptr) {
+#ifdef USE_RP2040
+      this->hw_spi_->transfer16(data);
+#else
       this->hw_spi_->write16(data);
+#endif
       return;
     }
 #endif  // USE_SPI_ARDUINO_BACKEND
@@ -130,7 +138,11 @@ class SPIComponent : public Component {
 #ifdef USE_SPI_ARDUINO_BACKEND
     if (this->hw_spi_ != nullptr) {
       for (size_t i = 0; i < length; i++) {
+#ifdef USE_RP2040
+        this->hw_spi_->transfer16(data[i]);
+#else
         this->hw_spi_->write16(data[i]);
+#endif
       }
       return;
     }
@@ -145,7 +157,11 @@ class SPIComponent : public Component {
 #ifdef USE_SPI_ARDUINO_BACKEND
     if (this->hw_spi_ != nullptr) {
       auto *data_c = const_cast<uint8_t *>(data);
+#ifdef USE_RP2040
+      this->hw_spi_->transfer(data_c, length);
+#else
       this->hw_spi_->writeBytes(data_c, length);
+#endif
       return;
     }
 #endif  // USE_SPI_ARDUINO_BACKEND
@@ -178,7 +194,11 @@ class SPIComponent : public Component {
       if (this->miso_ != nullptr) {
         this->hw_spi_->transfer(data, length);
       } else {
+#ifdef USE_RP2040
+        this->hw_spi_->transfer(data, length);
+#else
         this->hw_spi_->writeBytes(data, length);
+#endif
       }
       return;
     }
diff --git a/esphome/components/wifi/__init__.py b/esphome/components/wifi/__init__.py
index 93ea6b92a4..f5684f06f7 100644
--- a/esphome/components/wifi/__init__.py
+++ b/esphome/components/wifi/__init__.py
@@ -267,7 +267,7 @@ CONFIG_SCHEMA = cv.All(
                 CONF_REBOOT_TIMEOUT, default="15min"
             ): cv.positive_time_period_milliseconds,
             cv.SplitDefault(
-                CONF_POWER_SAVE_MODE, esp8266="none", esp32="light"
+                CONF_POWER_SAVE_MODE, esp8266="none", esp32="light", rp2040="light"
             ): cv.enum(WIFI_POWER_SAVE_MODES, upper=True),
             cv.Optional(CONF_FAST_CONNECT, default=False): cv.boolean,
             cv.Optional(CONF_USE_ADDRESS): cv.string_strict,
@@ -386,6 +386,8 @@ async def to_code(config):
         cg.add_library("ESP8266WiFi", None)
     elif CORE.is_esp32 and CORE.using_arduino:
         cg.add_library("WiFi", None)
+    elif CORE.is_rp2040:
+        cg.add_library("WiFi", None)
 
     if CORE.is_esp32 and CORE.using_esp_idf:
         if config[CONF_ENABLE_BTM] or config[CONF_ENABLE_RRM]:
diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index 0103106222..1ed9fd060f 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -710,6 +710,8 @@ int8_t WiFiScanResult::get_rssi() const { return this->rssi_; }
 bool WiFiScanResult::get_with_auth() const { return this->with_auth_; }
 bool WiFiScanResult::get_is_hidden() const { return this->is_hidden_; }
 
+bool WiFiScanResult::operator==(const WiFiScanResult &rhs) const { return this->bssid_ == rhs.bssid_; }
+
 WiFiComponent *global_wifi_component;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
 }  // namespace wifi
diff --git a/esphome/components/wifi/wifi_component.h b/esphome/components/wifi/wifi_component.h
index 6c5202ed7a..dba0d48724 100644
--- a/esphome/components/wifi/wifi_component.h
+++ b/esphome/components/wifi/wifi_component.h
@@ -24,6 +24,16 @@ extern "C" {
 #endif
 #endif
 
+#ifdef USE_RP2040
+extern "C" {
+#include "cyw43.h"
+#include "cyw43_country.h"
+#include "pico/cyw43_arch.h"
+}
+
+#include <WiFi.h>
+#endif
+
 namespace esphome {
 namespace wifi {
 
@@ -138,6 +148,8 @@ class WiFiScanResult {
   float get_priority() const { return priority_; }
   void set_priority(float priority) { priority_ = priority; }
 
+  bool operator==(const WiFiScanResult &rhs) const;
+
  protected:
   bool matches_{false};
   bssid_t bssid_;
@@ -310,6 +322,11 @@ class WiFiComponent : public Component {
   void wifi_process_event_(IDFWiFiEvent *data);
 #endif
 
+#ifdef USE_RP2040
+  static int s_wifi_scan_result(void *env, const cyw43_ev_scan_result_t *result);
+  void wifi_scan_result(void *env, const cyw43_ev_scan_result_t *result);
+#endif
+
   std::string use_address_;
   std::vector<WiFiAP> sta_;
   std::vector<WiFiSTAPriority> sta_priorities_;
diff --git a/esphome/components/wifi/wifi_component_pico_w.cpp b/esphome/components/wifi/wifi_component_pico_w.cpp
new file mode 100644
index 0000000000..0ab143a9de
--- /dev/null
+++ b/esphome/components/wifi/wifi_component_pico_w.cpp
@@ -0,0 +1,204 @@
+
+#include "wifi_component.h"
+
+#ifdef USE_RP2040
+
+#include "lwip/dns.h"
+#include "lwip/err.h"
+#include "lwip/netif.h"
+
+#include "esphome/core/application.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+#include "esphome/core/util.h"
+
+namespace esphome {
+namespace wifi {
+
+static const char *const TAG = "wifi_pico_w";
+
+bool WiFiComponent::wifi_mode_(optional<bool> sta, optional<bool> ap) {
+  if (sta.has_value()) {
+    if (sta.value()) {
+      cyw43_wifi_set_up(&cyw43_state, CYW43_ITF_STA, true, CYW43_COUNTRY_WORLDWIDE);
+    }
+  }
+  return true;
+}
+
+bool WiFiComponent::wifi_apply_power_save_() {
+  uint32_t pm;
+  switch (this->power_save_) {
+    case WIFI_POWER_SAVE_NONE:
+      pm = CYW43_PERFORMANCE_PM;
+      break;
+    case WIFI_POWER_SAVE_LIGHT:
+      pm = CYW43_DEFAULT_PM;
+      break;
+    case WIFI_POWER_SAVE_HIGH:
+      pm = CYW43_AGGRESSIVE_PM;
+      break;
+  }
+  int ret = cyw43_wifi_pm(&cyw43_state, pm);
+  return ret == 0;
+}
+
+// TODO: The driver doesnt seem to have an API for this
+bool WiFiComponent::wifi_apply_output_power_(float output_power) { return true; }
+
+bool WiFiComponent::wifi_sta_connect_(const WiFiAP &ap) {
+  if (!this->wifi_sta_ip_config_(ap.get_manual_ip()))
+    return false;
+
+  auto ret = WiFi.begin(ap.get_ssid().c_str(), ap.get_password().c_str());
+  if (ret != WL_CONNECTED)
+    return false;
+
+  return true;
+}
+
+bool WiFiComponent::wifi_sta_pre_setup_() { return this->wifi_mode_(true, {}); }
+
+bool WiFiComponent::wifi_sta_ip_config_(optional<ManualIP> manual_ip) {
+  if (!manual_ip.has_value()) {
+    return true;
+  }
+
+  IPAddress ip_address = IPAddress(manual_ip->static_ip);
+  IPAddress gateway = IPAddress(manual_ip->gateway);
+  IPAddress subnet = IPAddress(manual_ip->subnet);
+
+  IPAddress dns = IPAddress(manual_ip->dns1);
+
+  WiFi.config(ip_address, dns, gateway, subnet);
+  return true;
+}
+
+bool WiFiComponent::wifi_apply_hostname_() {
+  WiFi.setHostname(App.get_name().c_str());
+  return true;
+}
+const char *get_auth_mode_str(uint8_t mode) {
+  // TODO:
+  return "UNKNOWN";
+}
+const char *get_disconnect_reason_str(uint8_t reason) {
+  // TODO:
+  return "UNKNOWN";
+}
+
+WiFiSTAConnectStatus WiFiComponent::wifi_sta_connect_status_() {
+  int status = cyw43_tcpip_link_status(&cyw43_state, CYW43_ITF_STA);
+  switch (status) {
+    case CYW43_LINK_JOIN:
+    case CYW43_LINK_NOIP:
+      return WiFiSTAConnectStatus::CONNECTING;
+    case CYW43_LINK_UP:
+      return WiFiSTAConnectStatus::CONNECTED;
+    case CYW43_LINK_FAIL:
+    case CYW43_LINK_BADAUTH:
+      return WiFiSTAConnectStatus::ERROR_CONNECT_FAILED;
+    case CYW43_LINK_NONET:
+      return WiFiSTAConnectStatus::ERROR_NETWORK_NOT_FOUND;
+  }
+  return WiFiSTAConnectStatus::IDLE;
+}
+
+int WiFiComponent::s_wifi_scan_result(void *env, const cyw43_ev_scan_result_t *result) {
+  global_wifi_component->wifi_scan_result(env, result);
+  return 0;
+}
+
+void WiFiComponent::wifi_scan_result(void *env, const cyw43_ev_scan_result_t *result) {
+  bssid_t bssid;
+  std::copy(result->bssid, result->bssid + 6, bssid.begin());
+  std::string ssid(reinterpret_cast<const char *>(result->ssid));
+  WiFiScanResult res(bssid, ssid, result->channel, result->rssi, result->auth_mode != CYW43_AUTH_OPEN, ssid.empty());
+  if (std::find(this->scan_result_.begin(), this->scan_result_.end(), res) == this->scan_result_.end()) {
+    this->scan_result_.push_back(res);
+  }
+}
+
+bool WiFiComponent::wifi_scan_start_() {
+  this->scan_result_.clear();
+  this->scan_done_ = false;
+  cyw43_wifi_scan_options_t scan_options = {0};
+  int err = cyw43_wifi_scan(&cyw43_state, &scan_options, nullptr, &s_wifi_scan_result);
+  if (err) {
+    ESP_LOGV(TAG, "cyw43_wifi_scan failed!");
+  }
+  return err == 0;
+  return true;
+}
+
+bool WiFiComponent::wifi_ap_ip_config_(optional<ManualIP> manual_ip) {
+  // TODO:
+  return false;
+}
+
+bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
+  if (!this->wifi_mode_({}, true))
+    return false;
+
+  if (ap.get_channel().has_value()) {
+    cyw43_wifi_ap_set_channel(&cyw43_state, ap.get_channel().value());
+  }
+
+  const char *ssid = ap.get_ssid().c_str();
+
+  cyw43_wifi_ap_set_ssid(&cyw43_state, strlen(ssid), (const uint8_t *) ssid);
+
+  if (!ap.get_password().empty()) {
+    const char *password = ap.get_password().c_str();
+    cyw43_wifi_ap_set_password(&cyw43_state, strlen(password), (const uint8_t *) password);
+    cyw43_wifi_ap_set_auth(&cyw43_state, CYW43_AUTH_WPA2_MIXED_PSK);
+  } else {
+    cyw43_wifi_ap_set_auth(&cyw43_state, CYW43_AUTH_OPEN);
+  }
+  cyw43_wifi_set_up(&cyw43_state, CYW43_ITF_AP, true, CYW43_COUNTRY_WORLDWIDE);
+
+  return true;
+}
+network::IPAddress WiFiComponent::wifi_soft_ap_ip() { return {WiFi.localIP()}; }
+
+bool WiFiComponent::wifi_disconnect_() {
+  int err = cyw43_wifi_leave(&cyw43_state, CYW43_ITF_STA);
+  return err == 0;
+}
+// NOTE: The driver does not provide an interface to get this
+bssid_t WiFiComponent::wifi_bssid() {
+  bssid_t bssid{};
+  uint8_t raw_bssid[6];
+  WiFi.BSSID(raw_bssid);
+  for (size_t i = 0; i < bssid.size(); i++)
+    bssid[i] = raw_bssid[i];
+  return bssid;
+}
+// NOTE: The driver does not provide an interface to get this
+std::string WiFiComponent::wifi_ssid() { return WiFi.SSID(); }
+// NOTE: The driver does not provide an interface to get this
+int8_t WiFiComponent::wifi_rssi() { return WiFi.RSSI(); }
+// NOTE: The driver does not provide an interface to get this
+int32_t WiFiComponent::wifi_channel_() { return 0; }
+network::IPAddress WiFiComponent::wifi_sta_ip() { return {WiFi.localIP()}; }
+network::IPAddress WiFiComponent::wifi_subnet_mask_() { return {WiFi.subnetMask()}; }
+network::IPAddress WiFiComponent::wifi_gateway_ip_() { return {WiFi.gatewayIP()}; }
+network::IPAddress WiFiComponent::wifi_dns_ip_(int num) {
+  const ip_addr_t *dns_ip = dns_getserver(num);
+  return {dns_ip->addr};
+}
+
+void WiFiComponent::wifi_loop_() {
+  if (this->state_ == WIFI_COMPONENT_STATE_STA_SCANNING && !cyw43_wifi_scan_active(&cyw43_state)) {
+    this->scan_done_ = true;
+    ESP_LOGV(TAG, "Scan done!");
+  }
+}
+
+void WiFiComponent::wifi_pre_setup_() {}
+
+}  // namespace wifi
+}  // namespace esphome
+
+#endif
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 09436c1fbf..19d4747575 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -1440,6 +1440,7 @@ class SplitDefault(Optional):
         esp32=vol.UNDEFINED,
         esp32_arduino=vol.UNDEFINED,
         esp32_idf=vol.UNDEFINED,
+        rp2040=vol.UNDEFINED,
     ):
         super().__init__(key)
         self._esp8266_default = vol.default_factory(esp8266)
@@ -1449,6 +1450,7 @@ class SplitDefault(Optional):
         self._esp32_idf_default = vol.default_factory(
             esp32_idf if esp32 is vol.UNDEFINED else esp32
         )
+        self._rp2040_default = vol.default_factory(rp2040)
 
     @property
     def default(self):
@@ -1458,6 +1460,8 @@ class SplitDefault(Optional):
             return self._esp32_arduino_default
         if CORE.is_esp32 and CORE.using_esp_idf:
             return self._esp32_idf_default
+        if CORE.is_rp2040:
+            return self._rp2040_default
         raise NotImplementedError
 
     @default.setter
diff --git a/esphome/const.py b/esphome/const.py
index f2d31bd21f..f8551f81ce 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -6,8 +6,9 @@ ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 
 PLATFORM_ESP32 = "esp32"
 PLATFORM_ESP8266 = "esp8266"
+PLATFORM_RP2040 = "rp2040"
 
-TARGET_PLATFORMS = [PLATFORM_ESP32, PLATFORM_ESP8266]
+TARGET_PLATFORMS = [PLATFORM_ESP32, PLATFORM_ESP8266, PLATFORM_RP2040]
 
 SOURCE_FILE_EXTENSIONS = {".cpp", ".hpp", ".h", ".c", ".tcc", ".ino"}
 HEADER_FILE_EXTENSIONS = {".h", ".hpp", ".tcc"}
diff --git a/esphome/core/__init__.py b/esphome/core/__init__.py
index a422cd9507..ef44b31fa3 100644
--- a/esphome/core/__init__.py
+++ b/esphome/core/__init__.py
@@ -594,6 +594,10 @@ class EsphomeCore:
     def is_esp32(self):
         return self.target_platform == "esp32"
 
+    @property
+    def is_rp2040(self):
+        return self.target_platform == "rp2040"
+
     @property
     def target_framework(self):
         return self.data[KEY_CORE][KEY_TARGET_FRAMEWORK]
diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index 3aca944a36..79e706cf0d 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -21,6 +21,8 @@
 #include "esp_system.h"
 #include <freertos/FreeRTOS.h>
 #include <freertos/portmacro.h>
+#elif defined(USE_RP2040) && defined(USE_WIFI)
+#include <WiFi.h>
 #endif
 
 #ifdef USE_ESP32_IGNORE_EFUSE_MAC_CRC
@@ -91,6 +93,8 @@ uint32_t random_uint32() {
   return esp_random();
 #elif defined(USE_ESP8266)
   return os_random();
+#elif defined(USE_RP2040)
+  return ((uint32_t) rand()) << 16 + ((uint32_t) rand());
 #else
 #error "No random source available for this configuration."
 #endif
@@ -102,6 +106,8 @@ bool random_bytes(uint8_t *data, size_t len) {
   return true;
 #elif defined(USE_ESP8266)
   return os_get_random(data, len) == 0;
+#elif defined(USE_RP2040)
+  return false;
 #else
 #error "No random source available for this configuration."
 #endif
@@ -409,6 +415,8 @@ void get_mac_address_raw(uint8_t *mac) {
 #endif
 #elif defined(USE_ESP8266)
   wifi_get_macaddr(STATION_IF, mac);
+#elif defined(USE_RP2040) && defined(USE_WIFI)
+  WiFi.macAddress(mac);
 #endif
 }
 std::string get_mac_address() {
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 0367101023..d551c9da4b 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -428,21 +428,27 @@ class DownloadBinaryRequestHandler(BaseHandler):
     def get(self, configuration=None):
         type = self.get_argument("type", "firmware.bin")
 
-        if type == "firmware.bin":
-            storage_path = ext_storage_path(settings.config_dir, configuration)
-            storage_json = StorageJSON.load(storage_path)
-            if storage_json is None:
-                self.send_error(404)
-                return
+        storage_path = ext_storage_path(settings.config_dir, configuration)
+        storage_json = StorageJSON.load(storage_path)
+        if storage_json is None:
+            self.send_error(404)
+            return
+
+        if storage_json.target_platform.lower() == const.PLATFORM_RP2040:
+            filename = f"{storage_json.name}.uf2"
+            path = storage_json.firmware_bin_path.replace(
+                "firmware.bin", "firmware.uf2"
+            )
+
+        elif storage_json.target_platform.lower() == const.PLATFORM_ESP8266:
+            filename = f"{storage_json.name}.bin"
+            path = storage_json.firmware_bin_path
+
+        elif type == "firmware.bin":
             filename = f"{storage_json.name}.bin"
             path = storage_json.firmware_bin_path
 
         elif type == "firmware-factory.bin":
-            storage_path = ext_storage_path(settings.config_dir, configuration)
-            storage_json = StorageJSON.load(storage_path)
-            if storage_json is None:
-                self.send_error(404)
-                return
             filename = f"{storage_json.name}-factory.bin"
             path = storage_json.firmware_bin_path.replace(
                 "firmware.bin", "firmware-factory.bin"
diff --git a/esphome/storage_json.py b/esphome/storage_json.py
index af71d4583c..1cc2180747 100644
--- a/esphome/storage_json.py
+++ b/esphome/storage_json.py
@@ -119,16 +119,16 @@ class StorageJSON:
         )
 
     @staticmethod
-    def from_wizard(name: str, address: str, esp_platform: str) -> "StorageJSON":
+    def from_wizard(name: str, address: str, platform: str) -> "StorageJSON":
         return StorageJSON(
             storage_version=1,
             name=name,
             comment=None,
-            esphome_version=const.__version__,
+            esphome_version=None,
             src_version=1,
             address=address,
             web_port=None,
-            target_platform=esp_platform,
+            target_platform=platform,
             build_path=None,
             firmware_bin_path=None,
             loaded_integrations=[],
diff --git a/esphome/wizard.py b/esphome/wizard.py
index 602f4ecf04..6273eec25d 100644
--- a/esphome/wizard.py
+++ b/esphome/wizard.py
@@ -81,11 +81,20 @@ esp32:
     type: esp-idf
 """
 
+RP2040_CONFIG = """
+rp2040:
+  board: {board}
+  framework:
+    # Required until https://github.com/platformio/platform-raspberrypi/pull/36 is merged
+    platform_version: https://github.com/maxgerhardt/platform-raspberrypi.git
+"""
+
 HARDWARE_BASE_CONFIGS = {
     "ESP8266": ESP8266_CONFIG,
     "ESP32": ESP32_CONFIG,
     "ESP32S2": ESP32S2_CONFIG,
     "ESP32C3": ESP32C3_CONFIG,
+    "RP2040": RP2040_CONFIG,
 }
 
 
@@ -164,6 +173,7 @@ captive_portal:
 
 def wizard_write(path, **kwargs):
     from esphome.components.esp8266 import boards as esp8266_boards
+    from esphome.components.rp2040 import boards as rp2040_boards
 
     name = kwargs["name"]
     board = kwargs["board"]
@@ -173,9 +183,13 @@ def wizard_write(path, **kwargs):
             kwargs[key] = sanitize_double_quotes(kwargs[key])
 
     if "platform" not in kwargs:
-        kwargs["platform"] = (
-            "ESP8266" if board in esp8266_boards.ESP8266_BOARD_PINS else "ESP32"
-        )
+        if board in esp8266_boards.ESP8266_BOARD_PINS:
+            platform = "ESP8266"
+        elif board in rp2040_boards.RP2040_BOARD_PINS:
+            platform = "RP2040"
+        else:
+            platform = "ESP32"
+        kwargs["platform"] = platform
     hardware = kwargs["platform"]
 
     write_file(path, wizard_file(**kwargs))
diff --git a/platformio.ini b/platformio.ini
index 9b943242f7..86617586ae 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -146,6 +146,24 @@ build_flags =
     -DUSE_ESP32_FRAMEWORK_ESP_IDF
 extra_scripts = post:esphome/components/esp32/post_build.py.script
 
+; These are common settings for the RP2040 using Arduino.
+[common:rp2040-arduino]
+extends = common:arduino
+board_build.core = earlephilhower
+board_build.filesystem_size = 0.5m
+
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git
+platform_packages =
+    earlephilhower/framework-arduinopico @ ~1.20400.0
+
+framework = arduino
+lib_deps =
+    ${common:arduino.lib_deps}
+build_flags =
+    ${common:arduino.build_flags}
+    -DUSE_RP2040
+    -DUSE_RP2040_FRAMEWORK_ARDUINO
+
 ; All the actual environments are defined below.
 [env:esp8266-arduino]
 extends = common:esp8266-arduino
@@ -222,3 +240,10 @@ board_build.esp-idf.sdkconfig_path = .temp/sdkconfig-esp32s2-idf-tidy
 build_flags =
     ${common:esp32-idf.build_flags}
     ${flags:clangtidy.build_flags}
+
+[env:rp2040-pico-arduino]
+extends = common:rp2040-arduino
+board = pico
+build_flags =
+    ${common:rp2040-arduino.build_flags}
+    ${flags:runtime.build_flags}
diff --git a/script/ci-custom.py b/script/ci-custom.py
index 6f69b55d2c..f95039576b 100755
--- a/script/ci-custom.py
+++ b/script/ci-custom.py
@@ -534,6 +534,7 @@ def lint_relative_py_import(fname):
         "esphome/components/socket/headers.h",
         "esphome/components/esp32/core.cpp",
         "esphome/components/esp8266/core.cpp",
+        "esphome/components/rp2040/core.cpp",
     ],
 )
 def lint_namespace(fname, content):
diff --git a/tests/README.md b/tests/README.md
index 546025526f..ed78b3e7d1 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -24,3 +24,4 @@ Current test_.yaml file contents.
 | test3.yaml | ESP8266 | wifi | N/A
 | test4.yaml | ESP32 | ethernet | None
 | test5.yaml | ESP32 | wifi | ble_server
+| test6.yaml | RP2040 | wifi | N/A
diff --git a/tests/dummy_main.cpp b/tests/dummy_main.cpp
index d956387665..8cc1838d94 100644
--- a/tests/dummy_main.cpp
+++ b/tests/dummy_main.cpp
@@ -13,8 +13,9 @@ using namespace esphome;
 
 void setup() {
   App.pre_setup("livingroom", __DATE__ ", " __TIME__, false);
-  auto *log = new logger::Logger(115200, 512, logger::UART_SELECTION_UART0);  // NOLINT
+  auto *log = new logger::Logger(115200, 512);  // NOLINT
   log->pre_setup();
+  log->set_uart_selection(logger::UART_SELECTION_UART0);
   App.register_component(log);
 
   auto *wifi = new wifi::WiFiComponent();  // NOLINT
diff --git a/tests/test6.yaml b/tests/test6.yaml
new file mode 100644
index 0000000000..264773331e
--- /dev/null
+++ b/tests/test6.yaml
@@ -0,0 +1,39 @@
+---
+esphome:
+  name: test6
+  project:
+    name: esphome.test6_project
+    version: "1.0.0"
+
+rp2040:
+  board: rpipicow
+  framework:
+    # Waiting for https://github.com/platformio/platform-raspberrypi/pull/36
+    platform_version: https://github.com/maxgerhardt/platform-raspberrypi.git
+
+
+wifi:
+  networks:
+    - ssid: "MySSID"
+      password: "password1"
+
+api:
+
+ota:
+
+logger:
+
+binary_sensor:
+  - platform: gpio
+    pin: GPIO5
+    id: pin_5_button
+
+output:
+  - platform: gpio
+    pin: GPIO4
+    id: pin_4
+
+switch:
+  - platform: output
+    output: pin_4
+    id: pin_4_switch

From 615288c151ae83c364b1ade26de0c31c8e2efd64 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 21 Oct 2022 01:59:41 +1300
Subject: [PATCH 161/838] Bump esphome-dashboard to 20221020.0 (#3920)

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

diff --git a/requirements.txt b/requirements.txt
index af7ac0cab4..3b6d444c22 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.1.4  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
-esphome-dashboard==20221007.0
+esphome-dashboard==20221020.0
 aioesphomeapi==10.13.0
 zeroconf==0.39.1
 

From 96e8cb66b69be4233dd6b1d9ae2498ba6888c683 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 25 Oct 2022 12:12:55 +1300
Subject: [PATCH 162/838] Fix missing dependencies for heatpumpir (#3933)

---
 esphome/components/heatpumpir/climate.py |  4 ++++
 platformio.ini                           | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/esphome/components/heatpumpir/climate.py b/esphome/components/heatpumpir/climate.py
index 2e78db8356..cc8e75dcbd 100644
--- a/esphome/components/heatpumpir/climate.py
+++ b/esphome/components/heatpumpir/climate.py
@@ -8,6 +8,7 @@ from esphome.const import (
     CONF_PROTOCOL,
     CONF_VISUAL,
 )
+from esphome.core import CORE
 
 CODEOWNERS = ["@rob-deutsch"]
 
@@ -115,3 +116,6 @@ def to_code(config):
     cg.add(var.set_min_temperature(config[CONF_MIN_TEMPERATURE]))
 
     cg.add_library("tonia/HeatpumpIR", "1.0.20")
+
+    if CORE.is_esp8266 or CORE.is_esp32:
+        cg.add_library("crankyoldgit/IRremoteESP8266", "2.7.12")
diff --git a/platformio.ini b/platformio.ini
index 86617586ae..ccfee97207 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -92,6 +92,7 @@ lib_deps =
     ESP8266HTTPClient                     ; http_request (Arduino built-in)
     ESP8266mDNS                           ; mdns (Arduino built-in)
     DNSServer                             ; captive_portal (Arduino built-in)
+    crankyoldgit/IRremoteESP8266@2.7.12   ; heatpumpir
 build_flags =
     ${common:arduino.build_flags}
     -Wno-nonnull-compare
@@ -111,16 +112,17 @@ board = nodemcu-32s
 lib_deps =
     ; order matters with lib-deps; some of the libs in common:arduino.lib_deps
     ; don't declare built-in libraries as dependencies, so they have to be declared first
-    FS                              ; web_server_base (Arduino built-in)
-    WiFi                            ; wifi,web_server_base,ethernet (Arduino built-in)
-    Update                          ; ota,web_server_base (Arduino built-in)
+    FS                                   ; web_server_base (Arduino built-in)
+    WiFi                                 ; wifi,web_server_base,ethernet (Arduino built-in)
+    Update                               ; ota,web_server_base (Arduino built-in)
     ${common:arduino.lib_deps}
-    esphome/AsyncTCP-esphome@1.2.2  ; async_tcp
-    WiFiClientSecure                ; http_request,nextion (Arduino built-in)
-    HTTPClient                      ; http_request,nextion (Arduino built-in)
-    ESPmDNS                         ; mdns (Arduino built-in)
-    DNSServer                       ; captive_portal (Arduino built-in)
-    esphome/ESP32-audioI2S@2.1.0    ; i2s_audio
+    esphome/AsyncTCP-esphome@1.2.2       ; async_tcp
+    WiFiClientSecure                     ; http_request,nextion (Arduino built-in)
+    HTTPClient                           ; http_request,nextion (Arduino built-in)
+    ESPmDNS                              ; mdns (Arduino built-in)
+    DNSServer                            ; captive_portal (Arduino built-in)
+    esphome/ESP32-audioI2S@2.1.0         ; i2s_audio
+    crankyoldgit/IRremoteESP8266@2.7.12  ; heatpumpir
 build_flags =
     ${common:arduino.build_flags}
     -DUSE_ESP32

From 3a134ef009357235da786fa448dad1c930f0ef2c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 25 Oct 2022 12:53:01 +1300
Subject: [PATCH 163/838] Update the PR template (#3934)

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

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f9c8cce0af..3221b8ac5c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 # What does this implement/fix?
 
-Quick description and explanation of changes
+<!-- Quick description and explanation of changes -->
 
 ## Types of changes
 
@@ -18,6 +18,7 @@ Quick description and explanation of changes
 - [ ] ESP32
 - [ ] ESP32 IDF
 - [ ] ESP8266
+- [ ] RP2040
 
 ## Example entry for `config.yaml`:
 <!--

From 22e0a944c8c8e111256f75717fa3bb5a18def5cb Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 25 Oct 2022 12:54:10 +1300
Subject: [PATCH 164/838] Update bluetooth proxy limit as soon as connection
 requested (#3935)

---
 esphome/components/bluetooth_proxy/bluetooth_proxy.cpp   | 3 +++
 esphome/components/esp32_ble_tracker/esp32_ble_tracker.h | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index cc1c178b08..5dfdc06070 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -209,6 +209,9 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
   switch (msg.request_type) {
     case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT: {
       this->address_ = msg.address;
+      this->set_state(espbt::ClientState::SEARCHING);
+      api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
+                                                              this->get_bluetooth_connections_limit());
       break;
     }
     case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT: {
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 45abcd63fa..dd08f07fd7 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -145,6 +145,8 @@ class ESPBTDeviceListener {
 enum class ClientState {
   // Connection is idle, no device detected.
   IDLE,
+  // Searching for device.
+  SEARCHING,
   // Device advertisement found.
   DISCOVERED,
   // Connection in progress.

From f8ce597918e9b4bd0e3da9a01d72e9726d5afcfe Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 25 Oct 2022 13:47:48 +1300
Subject: [PATCH 165/838] Fix error with require_framework_version and rp2040
 (#3923)

---
 esphome/config_validation.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 19d4747575..afc800f3f2 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -44,6 +44,7 @@ from esphome.const import (
     KEY_CORE,
     KEY_FRAMEWORK_VERSION,
     KEY_TARGET_FRAMEWORK,
+    KEY_TARGET_PLATFORM,
 )
 from esphome.core import (
     CORE,
@@ -1734,6 +1735,7 @@ def require_framework_version(
     esp_idf=None,
     esp32_arduino=None,
     esp8266_arduino=None,
+    rp2040_arduino=None,
     max_version=False,
     extra_message=None,
 ):
@@ -1761,8 +1763,23 @@ def require_framework_version(
                     msg += f". {extra_message}"
                 raise Invalid(msg)
             required = esp8266_arduino
+        elif CORE.is_rp2040 and framework == "arduino":
+            if rp2040_arduino is None:
+                msg = "This feature is incompatible with RP2040"
+                if extra_message:
+                    msg += f". {extra_message}"
+                raise Invalid(msg)
+            required = rp2040_arduino
         else:
-            raise NotImplementedError
+            raise Invalid(
+                f"""
+            Internal Error: require_framework_version does not support this platform configuration
+                platform: {core_data[KEY_TARGET_PLATFORM]}
+                framework: {framework}
+
+            Please report this issue on GitHub -> https://github.com/esphome/issues/issues/new?template=bug_report.yml.
+            """
+            )
 
         if max_version:
             if core_data[KEY_FRAMEWORK_VERSION] > required:

From 702b60ce66884755ce451a184a23d537f65005cb Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 25 Oct 2022 16:23:20 +1300
Subject: [PATCH 166/838] Make mDNS on rp2040 work (#3936)

---
 esphome/components/mdns/__init__.py      |  2 ++
 esphome/components/mdns/mdns_component.h |  2 +-
 esphome/components/mdns/mdns_rp2040.cpp  | 42 +++++++++++++-----------
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/esphome/components/mdns/__init__.py b/esphome/components/mdns/__init__.py
index b5be153d5a..154e6b099f 100644
--- a/esphome/components/mdns/__init__.py
+++ b/esphome/components/mdns/__init__.py
@@ -36,6 +36,8 @@ async def to_code(config):
             cg.add_library("ESPmDNS", None)
         elif CORE.is_esp8266:
             cg.add_library("ESP8266mDNS", None)
+        elif CORE.is_rp2040:
+            cg.add_library("LEAmDNS", None)
 
     if config[CONF_DISABLED]:
         return
diff --git a/esphome/components/mdns/mdns_component.h b/esphome/components/mdns/mdns_component.h
index 45614d509a..dbf7482f1f 100644
--- a/esphome/components/mdns/mdns_component.h
+++ b/esphome/components/mdns/mdns_component.h
@@ -28,7 +28,7 @@ class MDNSComponent : public Component {
   void setup() override;
   void dump_config() override;
 
-#if defined(USE_ESP8266) && defined(USE_ARDUINO)
+#if (defined(USE_ESP8266) || defined(USE_RP2040)) && defined(USE_ARDUINO)
   void loop() override;
 #endif
   float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
diff --git a/esphome/components/mdns/mdns_rp2040.cpp b/esphome/components/mdns/mdns_rp2040.cpp
index b153ececcc..e443a78c48 100644
--- a/esphome/components/mdns/mdns_rp2040.cpp
+++ b/esphome/components/mdns/mdns_rp2040.cpp
@@ -5,6 +5,8 @@
 #include "esphome/core/log.h"
 #include "mdns_component.h"
 
+#include <ESP8266mDNS.h>
+
 namespace esphome {
 namespace mdns {
 
@@ -12,28 +14,30 @@ void MDNSComponent::setup() {
   this->compile_records_();
 
   network::IPAddress addr = network::get_ip_address();
-  // MDNS.begin(this->hostname_.c_str(), (uint32_t) addr);
+  MDNS.begin(this->hostname_.c_str(), (uint32_t) addr);
 
-  // for (const auto &service : this->services_) {
-  //   // Strip the leading underscore from the proto and service_type. While it is
-  //   // part of the wire protocol to have an underscore, and for example ESP-IDF
-  //   // expects the underscore to be there, the ESP8266 implementation always adds
-  //   // the underscore itself.
-  //   auto *proto = service.proto.c_str();
-  //   while (*proto == '_') {
-  //     proto++;
-  //   }
-  //   auto *service_type = service.service_type.c_str();
-  //   while (*service_type == '_') {
-  //     service_type++;
-  //   }
-  //   MDNS.addService(service_type, proto, service.port);
-  //   for (const auto &record : service.txt_records) {
-  //     MDNS.addServiceTxt(service_type, proto, record.key.c_str(), record.value.c_str());
-  //   }
-  // }
+  for (const auto &service : this->services_) {
+    // Strip the leading underscore from the proto and service_type. While it is
+    // part of the wire protocol to have an underscore, and for example ESP-IDF
+    // expects the underscore to be there, the ESP8266 implementation always adds
+    // the underscore itself.
+    auto *proto = service.proto.c_str();
+    while (*proto == '_') {
+      proto++;
+    }
+    auto *service_type = service.service_type.c_str();
+    while (*service_type == '_') {
+      service_type++;
+    }
+    MDNS.addService(service_type, proto, service.port);
+    for (const auto &record : service.txt_records) {
+      MDNS.addServiceTxt(service_type, proto, record.key.c_str(), record.value.c_str());
+    }
+  }
 }
 
+void MDNSComponent::loop() { MDNS.update(); }
+
 }  // namespace mdns
 }  // namespace esphome
 

From d93f35701f95656d50c8f40a15f70c2779f714fc Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 25 Oct 2022 17:24:38 +1300
Subject: [PATCH 167/838] Send manufacturer name via API (#3938)

---
 esphome/components/api/api.proto          | 2 ++
 esphome/components/api/api_connection.cpp | 5 +++++
 esphome/components/api/api_pb2.cpp        | 9 +++++++++
 esphome/components/api/api_pb2.h          | 1 +
 4 files changed, 17 insertions(+)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index a8e45e1ea6..5df35f7978 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -204,6 +204,8 @@ message DeviceInfoResponse {
   uint32 webserver_port = 10;
 
   uint32 bluetooth_proxy_version = 11;
+
+  string manufacturer = 12;
 }
 
 message ListEntitiesRequest {
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 1dbf0abec4..5227750cc0 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -932,6 +932,11 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
   resp.mac_address = get_mac_address_pretty();
   resp.esphome_version = ESPHOME_VERSION;
   resp.compilation_time = App.get_compilation_time();
+#if defined(USE_ESP8266) || defined(USE_ESP32)
+  resp.manufacturer = "Espressif";
+#elif defined(USE_RP2040)
+  resp.manufacturer = "Raspberry Pi";
+#endif
   resp.model = ESPHOME_BOARD;
 #ifdef USE_DEEP_SLEEP
   resp.has_deep_sleep = deep_sleep::global_has_deep_sleep;
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 8cb244f1a1..03d09a0913 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -576,6 +576,10 @@ bool DeviceInfoResponse::decode_length(uint32_t field_id, ProtoLengthDelimited v
       this->project_version = value.as_string();
       return true;
     }
+    case 12: {
+      this->manufacturer = value.as_string();
+      return true;
+    }
     default:
       return false;
   }
@@ -592,6 +596,7 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(9, this->project_version);
   buffer.encode_uint32(10, this->webserver_port);
   buffer.encode_uint32(11, this->bluetooth_proxy_version);
+  buffer.encode_string(12, this->manufacturer);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DeviceInfoResponse::dump_to(std::string &out) const {
@@ -642,6 +647,10 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   sprintf(buffer, "%u", this->bluetooth_proxy_version);
   out.append(buffer);
   out.append("\n");
+
+  out.append("  manufacturer: ");
+  out.append("'").append(this->manufacturer).append("'");
+  out.append("\n");
   out.append("}");
 }
 #endif
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index fb676f1cc8..2ca0853951 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -273,6 +273,7 @@ class DeviceInfoResponse : public ProtoMessage {
   std::string project_version{};
   uint32_t webserver_port{0};
   uint32_t bluetooth_proxy_version{0};
+  std::string manufacturer{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;

From c3fba97b4c396790db5b283ecb21b22a662395ad Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 25 Oct 2022 17:46:55 +1300
Subject: [PATCH 168/838] Update base platformio board for rp2040 (#3937)

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index ccfee97207..6aec8c8971 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -245,7 +245,7 @@ build_flags =
 
 [env:rp2040-pico-arduino]
 extends = common:rp2040-arduino
-board = pico
+board = rpipico
 build_flags =
     ${common:rp2040-arduino.build_flags}
     ${flags:runtime.build_flags}

From 60717b074e6e8dba28e1fb60237926f8f0f78b85 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 25 Oct 2022 17:59:10 +1300
Subject: [PATCH 169/838] Implement different random for rp2040 (#3939)

---
 esphome/core/helpers.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index 79e706cf0d..48ef406a81 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -23,6 +23,7 @@
 #include <freertos/portmacro.h>
 #elif defined(USE_RP2040) && defined(USE_WIFI)
 #include <WiFi.h>
+#include <hardware/structs/rosc.h>
 #endif
 
 #ifdef USE_ESP32_IGNORE_EFUSE_MAC_CRC
@@ -94,7 +95,12 @@ uint32_t random_uint32() {
 #elif defined(USE_ESP8266)
   return os_random();
 #elif defined(USE_RP2040)
-  return ((uint32_t) rand()) << 16 + ((uint32_t) rand());
+  uint32_t result = 0;
+  for (uint8_t i = 0; i < 32; i++) {
+    result <<= 1;
+    result |= rosc_hw->randombit;
+  }
+  return result;
 #else
 #error "No random source available for this configuration."
 #endif
@@ -107,7 +113,15 @@ bool random_bytes(uint8_t *data, size_t len) {
 #elif defined(USE_ESP8266)
   return os_get_random(data, len) == 0;
 #elif defined(USE_RP2040)
-  return false;
+  while (len-- != 0) {
+    uint8_t result = 0;
+    for (uint8_t i = 0; i < 8; i++) {
+      result <<= 1;
+      result |= rosc_hw->randombit;
+    }
+    *data++ = result;
+  }
+  return true;
 #else
 #error "No random source available for this configuration."
 #endif

From 1000c4466fd10ff64bbb373a109c80ad2b65db59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=2E=20=C3=81rkosi=20R=C3=B3bert?= <robreg@zsurob.hu>
Date: Tue, 25 Oct 2022 08:10:03 +0200
Subject: [PATCH 170/838] add proper device class to uptime (#3928)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/uptime/sensor.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/components/uptime/sensor.py b/esphome/components/uptime/sensor.py
index 103bc3a666..07d7d8f2cf 100644
--- a/esphome/components/uptime/sensor.py
+++ b/esphome/components/uptime/sensor.py
@@ -6,6 +6,7 @@ from esphome.const import (
     STATE_CLASS_TOTAL_INCREASING,
     UNIT_SECOND,
     ICON_TIMER,
+    DEVICE_CLASS_DURATION,
 )
 
 uptime_ns = cg.esphome_ns.namespace("uptime")
@@ -17,6 +18,7 @@ CONFIG_SCHEMA = sensor.sensor_schema(
     icon=ICON_TIMER,
     accuracy_decimals=0,
     state_class=STATE_CLASS_TOTAL_INCREASING,
+    device_class=DEVICE_CLASS_DURATION,
     entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
 ).extend(cv.polling_component_schema("60s"))
 

From 8161222b3353560a1eab7b37b2e476d75f0051c2 Mon Sep 17 00:00:00 2001
From: cvwillegen <github.com@vanwillegen-vannoort.nl>
Date: Tue, 25 Oct 2022 08:50:46 +0200
Subject: [PATCH 171/838] Show local mac when scanning wifi (#3635)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/wifi/wifi_component.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index 1ed9fd060f..ac7314d603 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -35,6 +35,7 @@ float WiFiComponent::get_setup_priority() const { return setup_priority::WIFI; }
 
 void WiFiComponent::setup() {
   ESP_LOGCONFIG(TAG, "Setting up WiFi...");
+  ESP_LOGCONFIG(TAG, "  Local MAC: %s", get_mac_address_pretty().c_str());
   this->last_connected_ = millis();
   this->wifi_pre_setup_();
 

From 60b7d1c8a104e3b98a6f661fd6ea5c6af1a39791 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Tue, 25 Oct 2022 09:37:19 +0200
Subject: [PATCH 172/838] Add water & precipitation_intensity sensor device
 classes (#3940)

---
 esphome/components/sensor/__init__.py | 4 ++++
 esphome/const.py                      | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index 12daf34d6e..3ed27390bd 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -55,6 +55,7 @@ from esphome.const import (
     DEVICE_CLASS_PM25,
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_POWER_FACTOR,
+    DEVICE_CLASS_PRECIPITATION_INTENSITY,
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_REACTIVE_POWER,
     DEVICE_CLASS_SIGNAL_STRENGTH,
@@ -65,6 +66,7 @@ from esphome.const import (
     DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_VOLUME,
+    DEVICE_CLASS_WATER,
     DEVICE_CLASS_WEIGHT,
 )
 from esphome.core import CORE, coroutine_with_priority
@@ -100,6 +102,7 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_PM25,
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_POWER_FACTOR,
+    DEVICE_CLASS_PRECIPITATION_INTENSITY,
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_REACTIVE_POWER,
     DEVICE_CLASS_SIGNAL_STRENGTH,
@@ -110,6 +113,7 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_VOLUME,
+    DEVICE_CLASS_WATER,
     DEVICE_CLASS_WEIGHT,
 ]
 
diff --git a/esphome/const.py b/esphome/const.py
index f8551f81ce..425645081f 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -948,6 +948,7 @@ DEVICE_CLASS_PM1 = "pm1"
 DEVICE_CLASS_PM10 = "pm10"
 DEVICE_CLASS_PM25 = "pm25"
 DEVICE_CLASS_POWER_FACTOR = "power_factor"
+DEVICE_CLASS_PRECIPITATION_INTENSITY = "precipitation_intensity"
 DEVICE_CLASS_PRESSURE = "pressure"
 DEVICE_CLASS_REACTIVE_POWER = "reactive_power"
 DEVICE_CLASS_SIGNAL_STRENGTH = "signal_strength"
@@ -958,6 +959,7 @@ DEVICE_CLASS_TIMESTAMP = "timestamp"
 DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS = "volatile_organic_compounds"
 DEVICE_CLASS_VOLTAGE = "voltage"
 DEVICE_CLASS_VOLUME = "volume"
+DEVICE_CLASS_WATER = "water"
 DEVICE_CLASS_WEIGHT = "weight"
 # device classes of both binary_sensor and button component
 DEVICE_CLASS_UPDATE = "update"

From b781b8d77de2bf4fa50e82e6e32dc23690a1e7c4 Mon Sep 17 00:00:00 2001
From: NP v/d Spek <nielsnl68@gmail.com>
Date: Tue, 25 Oct 2022 20:33:18 +0200
Subject: [PATCH 173/838] Fixed touch release issue using the interrupt pin
 (#3925)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/xpt2046/xpt2046.cpp | 159 ++++++++++++-------------
 esphome/components/xpt2046/xpt2046.h   |   2 -
 2 files changed, 76 insertions(+), 85 deletions(-)

diff --git a/esphome/components/xpt2046/xpt2046.cpp b/esphome/components/xpt2046/xpt2046.cpp
index d6cbe39aa0..e3317e0fd5 100644
--- a/esphome/components/xpt2046/xpt2046.cpp
+++ b/esphome/components/xpt2046/xpt2046.cpp
@@ -20,8 +20,6 @@ void XPT2046Component::setup() {
     this->irq_pin_->setup();  // INPUT
     this->irq_pin_->pin_mode(gpio::FLAG_INPUT | gpio::FLAG_PULLUP);
     this->irq_pin_->setup();
-
-    this->store_.pin = this->irq_pin_->to_isr();
     this->irq_pin_->attach_interrupt(XPT2046TouchscreenStore::gpio_intr, &this->store_, gpio::INTERRUPT_FALLING_EDGE);
   }
   spi_setup();
@@ -29,10 +27,10 @@ void XPT2046Component::setup() {
 }
 
 void XPT2046Component::loop() {
-  if ((this->irq_pin_ == nullptr) || (!this->store_.touch))
-    return;
-  this->store_.touch = false;
-  check_touch_();
+  if ((this->irq_pin_ != nullptr) && (this->store_.touch || this->touched)) {
+    this->store_.touch = false;
+    check_touch_();
+  }
 }
 
 void XPT2046Component::update() {
@@ -45,94 +43,88 @@ void XPT2046Component::check_touch_() {
   bool touch = false;
   uint32_t now = millis();
 
-  this->z_raw = 0;
+  enable();
 
-  // In case the penirq pin is present only do the SPI transaction if it reports a touch (is low).
-  // The touch has to be also confirmed with checking the pressure over threshold
-  if ((this->irq_pin_ == nullptr) || !this->irq_pin_->digital_read()) {
-    enable();
+  int16_t touch_pressure_1 = read_adc_(0xB1 /* touch_pressure_1 */);
+  int16_t touch_pressure_2 = read_adc_(0xC1 /* touch_pressure_2 */);
 
-    int16_t touch_pressure_1 = read_adc_(0xB1 /* touch_pressure_1 */);
-    int16_t touch_pressure_2 = read_adc_(0xC1 /* touch_pressure_2 */);
+  this->z_raw = touch_pressure_1 + 0Xfff - touch_pressure_2;
 
-    this->z_raw = touch_pressure_1 + 4095 - touch_pressure_2;
+  touch = (this->z_raw >= this->threshold_);
+  if (touch) {
+    read_adc_(0xD1 /* X */);  // dummy Y measure, 1st is always noisy
+    data[0] = read_adc_(0x91 /* Y */);
+    data[1] = read_adc_(0xD1 /* X */);  // make 3 x-y measurements
+    data[2] = read_adc_(0x91 /* Y */);
+    data[3] = read_adc_(0xD1 /* X */);
+    data[4] = read_adc_(0x91 /* Y */);
+  }
 
-    touch = (this->z_raw >= this->threshold_);
-    if (touch) {
-      read_adc_(0x91 /* Y */);  // dummy Y measure, 1st is always noisy
-      data[0] = read_adc_(0xD1 /* X */);
-      data[1] = read_adc_(0x91 /* Y */);  // make 3 x-y measurements
-      data[2] = read_adc_(0xD1 /* X */);
-      data[3] = read_adc_(0x91 /* Y */);
-      data[4] = read_adc_(0xD1 /* X */);
+  data[5] = read_adc_(0xD0 /* X */);  // Last X touch power down
+
+  disable();
+
+  if (touch) {
+    this->x_raw = best_two_avg(data[1], data[3], data[5]);
+    this->y_raw = best_two_avg(data[0], data[2], data[4]);
+
+    ESP_LOGVV(TAG, "Update [x, y] = [%d, %d], z = %d", this->x_raw, this->y_raw, this->z_raw);
+
+    TouchPoint touchpoint;
+
+    touchpoint.x = normalize(this->x_raw, this->x_raw_min_, this->x_raw_max_);
+    touchpoint.y = normalize(this->y_raw, this->y_raw_min_, this->y_raw_max_);
+
+    if (this->swap_x_y_) {
+      std::swap(touchpoint.x, touchpoint.y);
     }
 
-    data[5] = read_adc_(0x90 /* Y */);  // Last Y touch power down
+    if (this->invert_x_) {
+      touchpoint.x = 0xfff - touchpoint.x;
+    }
 
-    disable();
+    if (this->invert_y_) {
+      touchpoint.y = 0xfff - touchpoint.y;
+    }
 
-    if (touch) {
-      this->x_raw = best_two_avg(data[0], data[2], data[4]);
-      this->y_raw = best_two_avg(data[1], data[3], data[5]);
-
-      ESP_LOGVV(TAG, "Update [x, y] = [%d, %d], z = %d", this->x_raw, this->y_raw, this->z_raw);
-
-      TouchPoint touchpoint;
-
-      touchpoint.x = normalize(this->x_raw, this->x_raw_min_, this->x_raw_max_);
-      touchpoint.y = normalize(this->y_raw, this->y_raw_min_, this->y_raw_max_);
-
-      if (this->swap_x_y_) {
+    switch (static_cast<TouchRotation>(this->display_->get_rotation())) {
+      case ROTATE_0_DEGREES:
+        break;
+      case ROTATE_90_DEGREES:
         std::swap(touchpoint.x, touchpoint.y);
-      }
-
-      if (this->invert_x_) {
-        touchpoint.x = 0xfff - touchpoint.x;
-      }
-
-      if (this->invert_y_) {
         touchpoint.y = 0xfff - touchpoint.y;
-      }
-
-      switch (static_cast<TouchRotation>(this->display_->get_rotation())) {
-        case ROTATE_0_DEGREES:
-          break;
-        case ROTATE_90_DEGREES:
-          std::swap(touchpoint.x, touchpoint.y);
-          touchpoint.y = 0xfff - touchpoint.y;
-          break;
-        case ROTATE_180_DEGREES:
-          touchpoint.x = 0xfff - touchpoint.x;
-          touchpoint.y = 0xfff - touchpoint.y;
-          break;
-        case ROTATE_270_DEGREES:
-          std::swap(touchpoint.x, touchpoint.y);
-          touchpoint.x = 0xfff - touchpoint.x;
-          break;
-      }
-
-      touchpoint.x = (int16_t)((int) touchpoint.x * this->display_->get_width() / 0xfff);
-      touchpoint.y = (int16_t)((int) touchpoint.y * this->display_->get_height() / 0xfff);
-
-      if (!this->touched || (now - this->last_pos_ms_) >= this->report_millis_) {
-        ESP_LOGV(TAG, "Touching at [%03X, %03X] => [%3d, %3d]", this->x_raw, this->y_raw, touchpoint.x, touchpoint.y);
-
-        this->defer([this, touchpoint]() { this->send_touch_(touchpoint); });
-
-        this->x = touchpoint.x;
-        this->y = touchpoint.y;
-        this->touched = true;
-        this->last_pos_ms_ = now;
-      }
-    } else {
-      this->x_raw = this->y_raw = 0;
-      if (this->touched) {
-        ESP_LOGV(TAG, "Released [%d, %d]", this->x, this->y);
-        this->touched = false;
-        for (auto *listener : this->touch_listeners_)
-          listener->release();
-      }
+        break;
+      case ROTATE_180_DEGREES:
+        touchpoint.x = 0xfff - touchpoint.x;
+        touchpoint.y = 0xfff - touchpoint.y;
+        break;
+      case ROTATE_270_DEGREES:
+        std::swap(touchpoint.x, touchpoint.y);
+        touchpoint.x = 0xfff - touchpoint.x;
+        break;
     }
+
+    touchpoint.x = (int16_t)((int) touchpoint.x * this->display_->get_width() / 0xfff);
+    touchpoint.y = (int16_t)((int) touchpoint.y * this->display_->get_height() / 0xfff);
+
+    if (!this->touched || (now - this->last_pos_ms_) >= this->report_millis_) {
+      ESP_LOGV(TAG, "Touching at [%03X, %03X] => [%3d, %3d]", this->x_raw, this->y_raw, touchpoint.x, touchpoint.y);
+
+      this->defer([this, touchpoint]() { this->send_touch_(touchpoint); });
+
+      this->x = touchpoint.x;
+      this->y = touchpoint.y;
+      this->touched = true;
+      this->last_pos_ms_ = now;
+    }
+  }
+
+  if (!touch && this->touched) {
+    this->x_raw = this->y_raw = this->z_raw = 0;
+    ESP_LOGV(TAG, "Released [%d, %d]", this->x, this->y);
+    this->touched = false;
+    for (auto *listener : this->touch_listeners_)
+      listener->release();
   }
 }
 
@@ -203,6 +195,7 @@ int16_t XPT2046Component::read_adc_(uint8_t ctrl) {  // NOLINT
   uint8_t data[2];
 
   write_byte(ctrl);
+  delay(1);
   data[0] = read_byte();
   data[1] = read_byte();
 
diff --git a/esphome/components/xpt2046/xpt2046.h b/esphome/components/xpt2046/xpt2046.h
index c3d0462c6a..e7d9caba21 100644
--- a/esphome/components/xpt2046/xpt2046.h
+++ b/esphome/components/xpt2046/xpt2046.h
@@ -14,8 +14,6 @@ using namespace touchscreen;
 
 struct XPT2046TouchscreenStore {
   volatile bool touch;
-  ISRInternalGPIOPin pin;
-
   static void gpio_intr(XPT2046TouchscreenStore *store);
 };
 

From 237c7dd169f8d9b09f6afa3c77c79507ff9e9638 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Tue, 25 Oct 2022 20:35:12 +0200
Subject: [PATCH 174/838] Add wind_speed sensor device class (#3941)

---
 esphome/components/sensor/__init__.py | 2 ++
 esphome/const.py                      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index 3ed27390bd..2859dc6e5a 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -67,6 +67,7 @@ from esphome.const import (
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_VOLUME,
     DEVICE_CLASS_WATER,
+    DEVICE_CLASS_WIND_SPEED,
     DEVICE_CLASS_WEIGHT,
 )
 from esphome.core import CORE, coroutine_with_priority
@@ -114,6 +115,7 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_VOLUME,
     DEVICE_CLASS_WATER,
+    DEVICE_CLASS_WIND_SPEED,
     DEVICE_CLASS_WEIGHT,
 ]
 
diff --git a/esphome/const.py b/esphome/const.py
index 425645081f..fe76852f4c 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -960,6 +960,7 @@ DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS = "volatile_organic_compounds"
 DEVICE_CLASS_VOLTAGE = "voltage"
 DEVICE_CLASS_VOLUME = "volume"
 DEVICE_CLASS_WATER = "water"
+DEVICE_CLASS_WIND_SPEED = "wind_speed"
 DEVICE_CLASS_WEIGHT = "weight"
 # device classes of both binary_sensor and button component
 DEVICE_CLASS_UPDATE = "update"

From f2c4f018de6d16ef09192525c873d2d7c0dfd3cd Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 26 Oct 2022 12:04:29 +1300
Subject: [PATCH 175/838] Prefix devcontainer image with ghcr.io (#3942)

---
 .devcontainer/devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 433e5d2792..7e5a0c19c9 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "ESPHome Dev",
-  "image": "esphome/esphome-lint:dev",
+  "image": "ghcr.io/esphome/esphome-lint:dev",
   "postCreateCommand": [
     "script/devcontainer-post-create"
   ],

From e96d7483b3acec403cb1cec25ae0ff8b8656d282 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 25 Oct 2022 12:54:10 +1300
Subject: [PATCH 176/838] Update bluetooth proxy limit as soon as connection
 requested (#3935)

---
 esphome/components/bluetooth_proxy/bluetooth_proxy.cpp   | 3 +++
 esphome/components/esp32_ble_tracker/esp32_ble_tracker.h | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index cc1c178b08..5dfdc06070 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -209,6 +209,9 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
   switch (msg.request_type) {
     case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT: {
       this->address_ = msg.address;
+      this->set_state(espbt::ClientState::SEARCHING);
+      api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
+                                                              this->get_bluetooth_connections_limit());
       break;
     }
     case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT: {
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 45abcd63fa..dd08f07fd7 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -145,6 +145,8 @@ class ESPBTDeviceListener {
 enum class ClientState {
   // Connection is idle, no device detected.
   IDLE,
+  // Searching for device.
+  SEARCHING,
   // Device advertisement found.
   DISCOVERED,
   // Connection in progress.

From ca09693efa97458cdb735dfe312487172f21e55a Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Tue, 25 Oct 2022 09:37:19 +0200
Subject: [PATCH 177/838] Add water & precipitation_intensity sensor device
 classes (#3940)

---
 esphome/components/sensor/__init__.py | 4 ++++
 esphome/const.py                      | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index 12daf34d6e..3ed27390bd 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -55,6 +55,7 @@ from esphome.const import (
     DEVICE_CLASS_PM25,
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_POWER_FACTOR,
+    DEVICE_CLASS_PRECIPITATION_INTENSITY,
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_REACTIVE_POWER,
     DEVICE_CLASS_SIGNAL_STRENGTH,
@@ -65,6 +66,7 @@ from esphome.const import (
     DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_VOLUME,
+    DEVICE_CLASS_WATER,
     DEVICE_CLASS_WEIGHT,
 )
 from esphome.core import CORE, coroutine_with_priority
@@ -100,6 +102,7 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_PM25,
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_POWER_FACTOR,
+    DEVICE_CLASS_PRECIPITATION_INTENSITY,
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_REACTIVE_POWER,
     DEVICE_CLASS_SIGNAL_STRENGTH,
@@ -110,6 +113,7 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_VOLUME,
+    DEVICE_CLASS_WATER,
     DEVICE_CLASS_WEIGHT,
 ]
 
diff --git a/esphome/const.py b/esphome/const.py
index d2bac8f9df..96dfc47dbc 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -947,6 +947,7 @@ DEVICE_CLASS_PM1 = "pm1"
 DEVICE_CLASS_PM10 = "pm10"
 DEVICE_CLASS_PM25 = "pm25"
 DEVICE_CLASS_POWER_FACTOR = "power_factor"
+DEVICE_CLASS_PRECIPITATION_INTENSITY = "precipitation_intensity"
 DEVICE_CLASS_PRESSURE = "pressure"
 DEVICE_CLASS_REACTIVE_POWER = "reactive_power"
 DEVICE_CLASS_SIGNAL_STRENGTH = "signal_strength"
@@ -957,6 +958,7 @@ DEVICE_CLASS_TIMESTAMP = "timestamp"
 DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS = "volatile_organic_compounds"
 DEVICE_CLASS_VOLTAGE = "voltage"
 DEVICE_CLASS_VOLUME = "volume"
+DEVICE_CLASS_WATER = "water"
 DEVICE_CLASS_WEIGHT = "weight"
 # device classes of both binary_sensor and button component
 DEVICE_CLASS_UPDATE = "update"

From 0220934e4cef6677d585a4992cd17cd4bf80f5fd Mon Sep 17 00:00:00 2001
From: NP v/d Spek <nielsnl68@gmail.com>
Date: Tue, 25 Oct 2022 20:33:18 +0200
Subject: [PATCH 178/838] Fixed touch release issue using the interrupt pin
 (#3925)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/xpt2046/xpt2046.cpp | 159 ++++++++++++-------------
 esphome/components/xpt2046/xpt2046.h   |   2 -
 2 files changed, 76 insertions(+), 85 deletions(-)

diff --git a/esphome/components/xpt2046/xpt2046.cpp b/esphome/components/xpt2046/xpt2046.cpp
index d6cbe39aa0..e3317e0fd5 100644
--- a/esphome/components/xpt2046/xpt2046.cpp
+++ b/esphome/components/xpt2046/xpt2046.cpp
@@ -20,8 +20,6 @@ void XPT2046Component::setup() {
     this->irq_pin_->setup();  // INPUT
     this->irq_pin_->pin_mode(gpio::FLAG_INPUT | gpio::FLAG_PULLUP);
     this->irq_pin_->setup();
-
-    this->store_.pin = this->irq_pin_->to_isr();
     this->irq_pin_->attach_interrupt(XPT2046TouchscreenStore::gpio_intr, &this->store_, gpio::INTERRUPT_FALLING_EDGE);
   }
   spi_setup();
@@ -29,10 +27,10 @@ void XPT2046Component::setup() {
 }
 
 void XPT2046Component::loop() {
-  if ((this->irq_pin_ == nullptr) || (!this->store_.touch))
-    return;
-  this->store_.touch = false;
-  check_touch_();
+  if ((this->irq_pin_ != nullptr) && (this->store_.touch || this->touched)) {
+    this->store_.touch = false;
+    check_touch_();
+  }
 }
 
 void XPT2046Component::update() {
@@ -45,94 +43,88 @@ void XPT2046Component::check_touch_() {
   bool touch = false;
   uint32_t now = millis();
 
-  this->z_raw = 0;
+  enable();
 
-  // In case the penirq pin is present only do the SPI transaction if it reports a touch (is low).
-  // The touch has to be also confirmed with checking the pressure over threshold
-  if ((this->irq_pin_ == nullptr) || !this->irq_pin_->digital_read()) {
-    enable();
+  int16_t touch_pressure_1 = read_adc_(0xB1 /* touch_pressure_1 */);
+  int16_t touch_pressure_2 = read_adc_(0xC1 /* touch_pressure_2 */);
 
-    int16_t touch_pressure_1 = read_adc_(0xB1 /* touch_pressure_1 */);
-    int16_t touch_pressure_2 = read_adc_(0xC1 /* touch_pressure_2 */);
+  this->z_raw = touch_pressure_1 + 0Xfff - touch_pressure_2;
 
-    this->z_raw = touch_pressure_1 + 4095 - touch_pressure_2;
+  touch = (this->z_raw >= this->threshold_);
+  if (touch) {
+    read_adc_(0xD1 /* X */);  // dummy Y measure, 1st is always noisy
+    data[0] = read_adc_(0x91 /* Y */);
+    data[1] = read_adc_(0xD1 /* X */);  // make 3 x-y measurements
+    data[2] = read_adc_(0x91 /* Y */);
+    data[3] = read_adc_(0xD1 /* X */);
+    data[4] = read_adc_(0x91 /* Y */);
+  }
 
-    touch = (this->z_raw >= this->threshold_);
-    if (touch) {
-      read_adc_(0x91 /* Y */);  // dummy Y measure, 1st is always noisy
-      data[0] = read_adc_(0xD1 /* X */);
-      data[1] = read_adc_(0x91 /* Y */);  // make 3 x-y measurements
-      data[2] = read_adc_(0xD1 /* X */);
-      data[3] = read_adc_(0x91 /* Y */);
-      data[4] = read_adc_(0xD1 /* X */);
+  data[5] = read_adc_(0xD0 /* X */);  // Last X touch power down
+
+  disable();
+
+  if (touch) {
+    this->x_raw = best_two_avg(data[1], data[3], data[5]);
+    this->y_raw = best_two_avg(data[0], data[2], data[4]);
+
+    ESP_LOGVV(TAG, "Update [x, y] = [%d, %d], z = %d", this->x_raw, this->y_raw, this->z_raw);
+
+    TouchPoint touchpoint;
+
+    touchpoint.x = normalize(this->x_raw, this->x_raw_min_, this->x_raw_max_);
+    touchpoint.y = normalize(this->y_raw, this->y_raw_min_, this->y_raw_max_);
+
+    if (this->swap_x_y_) {
+      std::swap(touchpoint.x, touchpoint.y);
     }
 
-    data[5] = read_adc_(0x90 /* Y */);  // Last Y touch power down
+    if (this->invert_x_) {
+      touchpoint.x = 0xfff - touchpoint.x;
+    }
 
-    disable();
+    if (this->invert_y_) {
+      touchpoint.y = 0xfff - touchpoint.y;
+    }
 
-    if (touch) {
-      this->x_raw = best_two_avg(data[0], data[2], data[4]);
-      this->y_raw = best_two_avg(data[1], data[3], data[5]);
-
-      ESP_LOGVV(TAG, "Update [x, y] = [%d, %d], z = %d", this->x_raw, this->y_raw, this->z_raw);
-
-      TouchPoint touchpoint;
-
-      touchpoint.x = normalize(this->x_raw, this->x_raw_min_, this->x_raw_max_);
-      touchpoint.y = normalize(this->y_raw, this->y_raw_min_, this->y_raw_max_);
-
-      if (this->swap_x_y_) {
+    switch (static_cast<TouchRotation>(this->display_->get_rotation())) {
+      case ROTATE_0_DEGREES:
+        break;
+      case ROTATE_90_DEGREES:
         std::swap(touchpoint.x, touchpoint.y);
-      }
-
-      if (this->invert_x_) {
-        touchpoint.x = 0xfff - touchpoint.x;
-      }
-
-      if (this->invert_y_) {
         touchpoint.y = 0xfff - touchpoint.y;
-      }
-
-      switch (static_cast<TouchRotation>(this->display_->get_rotation())) {
-        case ROTATE_0_DEGREES:
-          break;
-        case ROTATE_90_DEGREES:
-          std::swap(touchpoint.x, touchpoint.y);
-          touchpoint.y = 0xfff - touchpoint.y;
-          break;
-        case ROTATE_180_DEGREES:
-          touchpoint.x = 0xfff - touchpoint.x;
-          touchpoint.y = 0xfff - touchpoint.y;
-          break;
-        case ROTATE_270_DEGREES:
-          std::swap(touchpoint.x, touchpoint.y);
-          touchpoint.x = 0xfff - touchpoint.x;
-          break;
-      }
-
-      touchpoint.x = (int16_t)((int) touchpoint.x * this->display_->get_width() / 0xfff);
-      touchpoint.y = (int16_t)((int) touchpoint.y * this->display_->get_height() / 0xfff);
-
-      if (!this->touched || (now - this->last_pos_ms_) >= this->report_millis_) {
-        ESP_LOGV(TAG, "Touching at [%03X, %03X] => [%3d, %3d]", this->x_raw, this->y_raw, touchpoint.x, touchpoint.y);
-
-        this->defer([this, touchpoint]() { this->send_touch_(touchpoint); });
-
-        this->x = touchpoint.x;
-        this->y = touchpoint.y;
-        this->touched = true;
-        this->last_pos_ms_ = now;
-      }
-    } else {
-      this->x_raw = this->y_raw = 0;
-      if (this->touched) {
-        ESP_LOGV(TAG, "Released [%d, %d]", this->x, this->y);
-        this->touched = false;
-        for (auto *listener : this->touch_listeners_)
-          listener->release();
-      }
+        break;
+      case ROTATE_180_DEGREES:
+        touchpoint.x = 0xfff - touchpoint.x;
+        touchpoint.y = 0xfff - touchpoint.y;
+        break;
+      case ROTATE_270_DEGREES:
+        std::swap(touchpoint.x, touchpoint.y);
+        touchpoint.x = 0xfff - touchpoint.x;
+        break;
     }
+
+    touchpoint.x = (int16_t)((int) touchpoint.x * this->display_->get_width() / 0xfff);
+    touchpoint.y = (int16_t)((int) touchpoint.y * this->display_->get_height() / 0xfff);
+
+    if (!this->touched || (now - this->last_pos_ms_) >= this->report_millis_) {
+      ESP_LOGV(TAG, "Touching at [%03X, %03X] => [%3d, %3d]", this->x_raw, this->y_raw, touchpoint.x, touchpoint.y);
+
+      this->defer([this, touchpoint]() { this->send_touch_(touchpoint); });
+
+      this->x = touchpoint.x;
+      this->y = touchpoint.y;
+      this->touched = true;
+      this->last_pos_ms_ = now;
+    }
+  }
+
+  if (!touch && this->touched) {
+    this->x_raw = this->y_raw = this->z_raw = 0;
+    ESP_LOGV(TAG, "Released [%d, %d]", this->x, this->y);
+    this->touched = false;
+    for (auto *listener : this->touch_listeners_)
+      listener->release();
   }
 }
 
@@ -203,6 +195,7 @@ int16_t XPT2046Component::read_adc_(uint8_t ctrl) {  // NOLINT
   uint8_t data[2];
 
   write_byte(ctrl);
+  delay(1);
   data[0] = read_byte();
   data[1] = read_byte();
 
diff --git a/esphome/components/xpt2046/xpt2046.h b/esphome/components/xpt2046/xpt2046.h
index c3d0462c6a..e7d9caba21 100644
--- a/esphome/components/xpt2046/xpt2046.h
+++ b/esphome/components/xpt2046/xpt2046.h
@@ -14,8 +14,6 @@ using namespace touchscreen;
 
 struct XPT2046TouchscreenStore {
   volatile bool touch;
-  ISRInternalGPIOPin pin;
-
   static void gpio_intr(XPT2046TouchscreenStore *store);
 };
 

From 01adece6736cad79be1dcdba492d1510fdae994e Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Tue, 25 Oct 2022 20:35:12 +0200
Subject: [PATCH 179/838] Add wind_speed sensor device class (#3941)

---
 esphome/components/sensor/__init__.py | 2 ++
 esphome/const.py                      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index 3ed27390bd..2859dc6e5a 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -67,6 +67,7 @@ from esphome.const import (
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_VOLUME,
     DEVICE_CLASS_WATER,
+    DEVICE_CLASS_WIND_SPEED,
     DEVICE_CLASS_WEIGHT,
 )
 from esphome.core import CORE, coroutine_with_priority
@@ -114,6 +115,7 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_VOLUME,
     DEVICE_CLASS_WATER,
+    DEVICE_CLASS_WIND_SPEED,
     DEVICE_CLASS_WEIGHT,
 ]
 
diff --git a/esphome/const.py b/esphome/const.py
index 96dfc47dbc..8f1dd48539 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -959,6 +959,7 @@ DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS = "volatile_organic_compounds"
 DEVICE_CLASS_VOLTAGE = "voltage"
 DEVICE_CLASS_VOLUME = "volume"
 DEVICE_CLASS_WATER = "water"
+DEVICE_CLASS_WIND_SPEED = "wind_speed"
 DEVICE_CLASS_WEIGHT = "weight"
 # device classes of both binary_sensor and button component
 DEVICE_CLASS_UPDATE = "update"

From b8549d323c5062e3c2e2b7136684d1c5ef3b0ba9 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 26 Oct 2022 12:08:19 +1300
Subject: [PATCH 180/838] Bump version to 2022.10.1

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

diff --git a/esphome/const.py b/esphome/const.py
index 8f1dd48539..2fb03722a0 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.10.0"
+__version__ = "2022.10.1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From f97252b93a8962b4f6acf8fa254f3602a8e274a4 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 26 Oct 2022 16:41:51 +1300
Subject: [PATCH 181/838] Implement InterruptLock for RP2040 (#3945)

---
 esphome/core/helpers.cpp | 7 +++++--
 esphome/core/helpers.h   | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index 48ef406a81..53bb6bfd79 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -392,13 +392,16 @@ void hsv_to_rgb(int hue, float saturation, float value, float &red, float &green
 // System APIs
 
 #if defined(USE_ESP8266)
-IRAM_ATTR InterruptLock::InterruptLock() { xt_state_ = xt_rsil(15); }
-IRAM_ATTR InterruptLock::~InterruptLock() { xt_wsr_ps(xt_state_); }
+IRAM_ATTR InterruptLock::InterruptLock() { state_ = xt_rsil(15); }
+IRAM_ATTR InterruptLock::~InterruptLock() { xt_wsr_ps(state_); }
 #elif defined(USE_ESP32)
 // only affects the executing core
 // so should not be used as a mutex lock, only to get accurate timing
 IRAM_ATTR InterruptLock::InterruptLock() { portDISABLE_INTERRUPTS(); }
 IRAM_ATTR InterruptLock::~InterruptLock() { portENABLE_INTERRUPTS(); }
+#elif defined(USE_RP2040)
+IRAM_ATTR InterruptLock::InterruptLock() { state_ = save_and_disable_interrupts(); }
+IRAM_ATTR InterruptLock::~InterruptLock() { restore_interrupts(state_); }
 #endif
 
 uint8_t HighFrequencyLoopRequester::num_requests = 0;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index 1459f0ef55..6f3b5805cf 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -542,8 +542,8 @@ class InterruptLock {
   ~InterruptLock();
 
  protected:
-#ifdef USE_ESP8266
-  uint32_t xt_state_;
+#if defined(USE_ESP8266) || defined(USE_RP2040)
+  uint32_t state_;
 #endif
 };
 

From 9865cb7f555bf5bf6db79f5a203e428c9d838f72 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 26 Oct 2022 22:56:56 +1300
Subject: [PATCH 182/838] Implement RP2040 preferences (#3946)

---
 .../ota/ota_backend_arduino_rp2040.cpp        |   6 +-
 esphome/components/rp2040/preferences.cpp     | 123 +++++++++++++++++-
 esphome/components/rp2040/preferences.h       |   1 +
 3 files changed, 122 insertions(+), 8 deletions(-)

diff --git a/esphome/components/ota/ota_backend_arduino_rp2040.cpp b/esphome/components/ota/ota_backend_arduino_rp2040.cpp
index 5a46b8f07e..260387cec1 100644
--- a/esphome/components/ota/ota_backend_arduino_rp2040.cpp
+++ b/esphome/components/ota/ota_backend_arduino_rp2040.cpp
@@ -15,6 +15,7 @@ namespace ota {
 OTAResponseTypes ArduinoRP2040OTABackend::begin(size_t image_size) {
   bool ret = Update.begin(image_size, U_FLASH);
   if (ret) {
+    rp2040::preferences_prevent_write(true);
     return OTA_RESPONSE_OK;
   }
 
@@ -46,7 +47,10 @@ OTAResponseTypes ArduinoRP2040OTABackend::end() {
   return OTA_RESPONSE_OK;
 }
 
-void ArduinoRP2040OTABackend::abort() { Update.end(); }
+void ArduinoRP2040OTABackend::abort() {
+  Update.end();
+  rp2040::preferences_prevent_write(false);
+}
 
 }  // namespace ota
 }  // namespace esphome
diff --git a/esphome/components/rp2040/preferences.cpp b/esphome/components/rp2040/preferences.cpp
index 58ec57df2a..c98344541c 100644
--- a/esphome/components/rp2040/preferences.cpp
+++ b/esphome/components/rp2040/preferences.cpp
@@ -1,5 +1,10 @@
 #ifdef USE_RP2040
 
+#include <Arduino.h>
+
+#include <hardware/flash.h>
+#include <hardware/sync.h>
+
 #include "preferences.h"
 
 #include <cstring>
@@ -12,33 +17,137 @@ namespace rp2040 {
 
 static const char *const TAG = "rp2040.preferences";
 
+static bool s_prevent_write = false;        // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+static uint8_t *s_flash_storage = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+static bool s_flash_dirty = false;          // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+
+static const uint32_t RP2040_FLASH_STORAGE_SIZE = 512;
+
+extern "C" uint8_t _EEPROM_start;
+
+template<class It> uint8_t calculate_crc(It first, It last, uint32_t type) {
+  std::array<uint8_t, 4> type_array = decode_value(type);
+  uint8_t crc = type_array[0] ^ type_array[1] ^ type_array[2] ^ type_array[3];
+  while (first != last) {
+    crc ^= (*first++);
+  }
+  return crc;
+}
+
 class RP2040PreferenceBackend : public ESPPreferenceBackend {
  public:
-  bool save(const uint8_t *data, size_t len) override { return true; }
-  bool load(uint8_t *data, size_t len) override { return false; }
+  size_t offset = 0;
+  uint32_t type = 0;
+
+  bool save(const uint8_t *data, size_t len) override {
+    std::vector<uint8_t> buffer;
+    buffer.resize(len + 1);
+    memcpy(buffer.data(), data, len);
+    buffer[buffer.size() - 1] = calculate_crc(buffer.begin(), buffer.end() - 1, type);
+
+    for (uint32_t i = 0; i < len + 1; i++) {
+      uint32_t j = offset + i;
+      if (j >= RP2040_FLASH_STORAGE_SIZE)
+        return false;
+      uint8_t v = buffer[i];
+      uint8_t *ptr = &s_flash_storage[j];
+      if (*ptr != v)
+        s_flash_dirty = true;
+      *ptr = v;
+    }
+    return true;
+  }
+  bool load(uint8_t *data, size_t len) override {
+    std::vector<uint8_t> buffer;
+    buffer.resize(len + 1);
+
+    for (size_t i = 0; i < len + 1; i++) {
+      uint32_t j = offset + i;
+      if (j >= RP2040_FLASH_STORAGE_SIZE)
+        return false;
+      buffer[i] = s_flash_storage[j];
+    }
+
+    uint8_t crc = calculate_crc(buffer.begin(), buffer.end() - 1, type);
+    if (buffer[buffer.size() - 1] != crc) {
+      return false;
+    }
+
+    memcpy(data, buffer.data(), len);
+    return true;
+  }
 };
 
 class RP2040Preferences : public ESPPreferences {
  public:
+  uint32_t current_flash_offset = 0;
+
+  RP2040Preferences() : eeprom_sector_(&_EEPROM_start) {}
+  void setup() {
+    s_flash_storage = new uint8_t[RP2040_FLASH_STORAGE_SIZE];  // NOLINT
+    ESP_LOGVV(TAG, "Loading preferences from flash...");
+    memcpy(s_flash_storage, this->eeprom_sector_, RP2040_FLASH_STORAGE_SIZE);
+  }
+
   ESPPreferenceObject make_preference(size_t length, uint32_t type, bool in_flash) override {
-    auto *pref = new RP2040PreferenceBackend();  // NOLINT(cppcoreguidelines-owning-memory)
-    return ESPPreferenceObject(pref);
+    return make_preference(length, type);
   }
 
   ESPPreferenceObject make_preference(size_t length, uint32_t type) override {
+    uint32_t start = this->current_flash_offset;
+    uint32_t end = start + length + 1;
+    if (end > RP2040_FLASH_STORAGE_SIZE) {
+      return {};
+    }
     auto *pref = new RP2040PreferenceBackend();  // NOLINT(cppcoreguidelines-owning-memory)
-    return ESPPreferenceObject(pref);
+    pref->offset = start;
+    pref->type = type;
+    current_flash_offset = end;
+    return {pref};
   }
 
-  bool sync() override { return true; }
+  bool sync() override {
+    if (!s_flash_dirty)
+      return true;
+    if (s_prevent_write)
+      return false;
 
-  bool reset() override { return true; }
+    ESP_LOGD(TAG, "Saving preferences to flash...");
+
+    {
+      InterruptLock lock;
+      ::rp2040.idleOtherCore();
+      flash_range_erase((intptr_t) eeprom_sector_ - (intptr_t) XIP_BASE, 4096);
+      flash_range_program((intptr_t) eeprom_sector_ - (intptr_t) XIP_BASE, s_flash_storage, RP2040_FLASH_STORAGE_SIZE);
+      ::rp2040.resumeOtherCore();
+    }
+
+    s_flash_dirty = false;
+    return true;
+  }
+
+  bool reset() override {
+    ESP_LOGD(TAG, "Cleaning up preferences in flash...");
+    {
+      InterruptLock lock;
+      ::rp2040.idleOtherCore();
+      flash_range_erase((intptr_t) eeprom_sector_ - (intptr_t) XIP_BASE, 4096);
+      ::rp2040.resumeOtherCore();
+    }
+    s_prevent_write = true;
+    return true;
+  }
+
+ protected:
+  uint8_t *eeprom_sector_;
 };
 
 void setup_preferences() {
   auto *prefs = new RP2040Preferences();  // NOLINT(cppcoreguidelines-owning-memory)
+  prefs->setup();
   global_preferences = prefs;
 }
+void preferences_prevent_write(bool prevent) { s_prevent_write = prevent; }
 
 }  // namespace rp2040
 
diff --git a/esphome/components/rp2040/preferences.h b/esphome/components/rp2040/preferences.h
index 3c740a41c1..b815c6d58a 100644
--- a/esphome/components/rp2040/preferences.h
+++ b/esphome/components/rp2040/preferences.h
@@ -6,6 +6,7 @@ namespace esphome {
 namespace rp2040 {
 
 void setup_preferences();
+void preferences_prevent_write(bool prevent);
 
 }  // namespace rp2040
 }  // namespace esphome

From 2de891dc320535d4c083847f77e0c10c632b2e56 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 26 Oct 2022 22:57:08 +1300
Subject: [PATCH 183/838] Fix filesystem size for RP2040 OTA (#3947)

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

diff --git a/esphome/components/rp2040/__init__.py b/esphome/components/rp2040/__init__.py
index d526228f41..f858295974 100644
--- a/esphome/components/rp2040/__init__.py
+++ b/esphome/components/rp2040/__init__.py
@@ -148,7 +148,7 @@ async def to_code(config):
     )
 
     cg.add_platformio_option("board_build.core", "earlephilhower")
-    cg.add_platformio_option("board_build.filesystem_size", "0.5m")
+    cg.add_platformio_option("board_build.filesystem_size", "1m")
 
     ver: cv.Version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
     cg.add_define(

From 991fc549944229dea404dff30cfe95557b431946 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 27 Oct 2022 07:44:15 +1300
Subject: [PATCH 184/838] Bump esphome/Improv to 1.2.3 (#3948)

---
 esphome/components/esp32_improv/__init__.py  | 2 +-
 esphome/components/improv_serial/__init__.py | 2 +-
 platformio.ini                               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/esp32_improv/__init__.py b/esphome/components/esp32_improv/__init__.py
index 9f8438f785..1e50418e01 100644
--- a/esphome/components/esp32_improv/__init__.py
+++ b/esphome/components/esp32_improv/__init__.py
@@ -56,7 +56,7 @@ async def to_code(config):
     cg.add(ble_server.register_service_component(var))
 
     cg.add_define("USE_IMPROV")
-    cg.add_library("esphome/Improv", "1.2.1")
+    cg.add_library("esphome/Improv", "1.2.3")
 
     cg.add(var.set_identify_duration(config[CONF_IDENTIFY_DURATION]))
     cg.add(var.set_authorized_duration(config[CONF_AUTHORIZED_DURATION]))
diff --git a/esphome/components/improv_serial/__init__.py b/esphome/components/improv_serial/__init__.py
index 67a0f7f4ed..4a6da6bee0 100644
--- a/esphome/components/improv_serial/__init__.py
+++ b/esphome/components/improv_serial/__init__.py
@@ -37,4 +37,4 @@ FINAL_VALIDATE_SCHEMA = validate_logger
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
-    cg.add_library("esphome/Improv", "1.2.1")
+    cg.add_library("esphome/Improv", "1.2.3")
diff --git a/platformio.ini b/platformio.ini
index 6aec8c8971..88cf176b72 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -35,7 +35,7 @@ build_flags =
 lib_deps =
     esphome/noise-c@0.1.4                  ; api
     makuna/NeoPixelBus@2.6.9               ; neopixelbus
-    esphome/Improv@1.2.1                   ; improv_serial / esp32_improv
+    esphome/Improv@1.2.3                   ; improv_serial / esp32_improv
     bblanchon/ArduinoJson@6.18.5           ; json
     wjtje/qr-code-generator-library@1.7.0  ; qr_code
     functionpointer/arduino-MLX90393@1.0.0 ; mlx90393

From 85faecb2fd27832583e3c3806a48383fc9601fe4 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 27 Oct 2022 12:17:21 +1300
Subject: [PATCH 185/838] Add core config option to limit compile process count
 (#3952)

---
 esphome/const.py          | 1 +
 esphome/core/config.py    | 5 +++++
 esphome/platformio_api.py | 7 +++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/esphome/const.py b/esphome/const.py
index fe76852f4c..56f48d2f92 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -116,6 +116,7 @@ CONF_COMMAND_RETAIN = "command_retain"
 CONF_COMMAND_TOPIC = "command_topic"
 CONF_COMMENT = "comment"
 CONF_COMMIT = "commit"
+CONF_COMPILE_PROCESS_LIMIT = "compile_process_limit"
 CONF_COMPONENT_ID = "component_id"
 CONF_COMPONENTS = "components"
 CONF_CONDITION = "condition"
diff --git a/esphome/core/config.py b/esphome/core/config.py
index 733cdcd66e..a40542c662 100644
--- a/esphome/core/config.py
+++ b/esphome/core/config.py
@@ -1,4 +1,5 @@
 import logging
+import multiprocessing
 import os
 import re
 
@@ -11,6 +12,7 @@ from esphome.const import (
     CONF_BOARD_FLASH_MODE,
     CONF_BUILD_PATH,
     CONF_COMMENT,
+    CONF_COMPILE_PROCESS_LIMIT,
     CONF_ESPHOME,
     CONF_FRAMEWORK,
     CONF_INCLUDES,
@@ -151,6 +153,9 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_MIN_VERSION, default=ESPHOME_VERSION): cv.All(
                 cv.version_number, validate_version
             ),
+            cv.Optional(CONF_COMPILE_PROCESS_LIMIT): cv.int_range(
+                min=1, max=multiprocessing.cpu_count()
+            ),
         }
     ),
     validate_hostname,
diff --git a/esphome/platformio_api.py b/esphome/platformio_api.py
index a4a3f32092..70576bec11 100644
--- a/esphome/platformio_api.py
+++ b/esphome/platformio_api.py
@@ -8,7 +8,7 @@ import os
 import re
 import subprocess
 
-from esphome.const import KEY_CORE
+from esphome.const import CONF_COMPILE_PROCESS_LIMIT, CONF_ESPHOME, KEY_CORE
 from esphome.core import CORE, EsphomeError
 from esphome.util import run_external_command, run_external_process
 
@@ -103,7 +103,10 @@ def run_platformio_cli_run(config, verbose, *args, **kwargs) -> Union[str, int]:
 
 
 def run_compile(config, verbose):
-    return run_platformio_cli_run(config, verbose)
+    args = []
+    if CONF_COMPILE_PROCESS_LIMIT in config[CONF_ESPHOME]:
+        args += [f"-j{config[CONF_ESPHOME][CONF_COMPILE_PROCESS_LIMIT]}"]
+    return run_platformio_cli_run(config, verbose, *args)
 
 
 def _run_idedata(config):

From a5d4ca0f6dd0b7359e34c7d04cb3a52a02fc3b97 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 27 Oct 2022 19:14:41 +1300
Subject: [PATCH 186/838] Some RP2040 wifi changes for AP mode (#3953)

---
 .../components/wifi/wifi_component_pico_w.cpp | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/esphome/components/wifi/wifi_component_pico_w.cpp b/esphome/components/wifi/wifi_component_pico_w.cpp
index 0ab143a9de..794ab34219 100644
--- a/esphome/components/wifi/wifi_component_pico_w.cpp
+++ b/esphome/components/wifi/wifi_component_pico_w.cpp
@@ -24,6 +24,11 @@ bool WiFiComponent::wifi_mode_(optional<bool> sta, optional<bool> ap) {
       cyw43_wifi_set_up(&cyw43_state, CYW43_ITF_STA, true, CYW43_COUNTRY_WORLDWIDE);
     }
   }
+  if (ap.has_value()) {
+    if (ap.value()) {
+      cyw43_wifi_set_up(&cyw43_state, CYW43_ITF_AP, true, CYW43_COUNTRY_WORLDWIDE);
+    }
+  }
   return true;
 }
 
@@ -141,22 +146,7 @@ bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
   if (!this->wifi_mode_({}, true))
     return false;
 
-  if (ap.get_channel().has_value()) {
-    cyw43_wifi_ap_set_channel(&cyw43_state, ap.get_channel().value());
-  }
-
-  const char *ssid = ap.get_ssid().c_str();
-
-  cyw43_wifi_ap_set_ssid(&cyw43_state, strlen(ssid), (const uint8_t *) ssid);
-
-  if (!ap.get_password().empty()) {
-    const char *password = ap.get_password().c_str();
-    cyw43_wifi_ap_set_password(&cyw43_state, strlen(password), (const uint8_t *) password);
-    cyw43_wifi_ap_set_auth(&cyw43_state, CYW43_AUTH_WPA2_MIXED_PSK);
-  } else {
-    cyw43_wifi_ap_set_auth(&cyw43_state, CYW43_AUTH_OPEN);
-  }
-  cyw43_wifi_set_up(&cyw43_state, CYW43_ITF_AP, true, CYW43_COUNTRY_WORLDWIDE);
+  WiFi.beginAP(ap.get_ssid().c_str(), ap.get_password().c_str(), ap.get_channel().value_or(1));
 
   return true;
 }

From 4bcfeb6e331b8927810cbf212fcf688f3150551b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 27 Oct 2022 19:26:22 +1300
Subject: [PATCH 187/838] Update rp2040 to latest framework release from GitHub
 (#3954)

---
 esphome/components/rp2040/__init__.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/esphome/components/rp2040/__init__.py b/esphome/components/rp2040/__init__.py
index f858295974..c759576e4d 100644
--- a/esphome/components/rp2040/__init__.py
+++ b/esphome/components/rp2040/__init__.py
@@ -37,10 +37,14 @@ def set_core_data(config):
 
 
 def _format_framework_arduino_version(ver: cv.Version) -> str:
+    # The most recent releases have not been uploaded to platformio so grabbing them directly from
+    # the GitHub release is one path forward for now.
+    return f"https://github.com/earlephilhower/arduino-pico/releases/download/{ver}/rp2040-{ver}.zip"
+
     # format the given arduino (https://github.com/earlephilhower/arduino-pico/releases) version to
     # a PIO earlephilhower/framework-arduinopico value
     # List of package versions: https://api.registry.platformio.org/v3/packages/earlephilhower/tool/framework-arduinopico
-    return f"~1.{ver.major}{ver.minor:02d}{ver.patch:02d}.0"
+    # return f"~1.{ver.major}{ver.minor:02d}{ver.patch:02d}.0"
 
 
 # NOTE: Keep this in mind when updating the recommended version:
@@ -52,7 +56,7 @@ def _format_framework_arduino_version(ver: cv.Version) -> str:
 # The default/recommended arduino framework version
 #  - https://github.com/earlephilhower/arduino-pico/releases
 #  - https://api.registry.platformio.org/v3/packages/earlephilhower/tool/framework-arduinopico
-RECOMMENDED_ARDUINO_FRAMEWORK_VERSION = cv.Version(2, 4, 0)
+RECOMMENDED_ARDUINO_FRAMEWORK_VERSION = cv.Version(2, 6, 2)
 
 # The platformio/raspberrypi version to use for arduino frameworks
 #  - https://github.com/platformio/platform-raspberrypi/releases
@@ -63,8 +67,8 @@ ARDUINO_PLATFORM_VERSION = cv.Version(1, 7, 0)
 def _arduino_check_versions(value):
     value = value.copy()
     lookups = {
-        "dev": (cv.Version(2, 4, 0), "https://github.com/earlephilhower/arduino-pico"),
-        "latest": (cv.Version(2, 4, 0), None),
+        "dev": (cv.Version(2, 6, 2), "https://github.com/earlephilhower/arduino-pico"),
+        "latest": (cv.Version(2, 6, 2), None),
         "recommended": (RECOMMENDED_ARDUINO_FRAMEWORK_VERSION, None),
     }
 

From f8640cf2cda7916b8ce0f00b30ab4a3a65e05843 Mon Sep 17 00:00:00 2001
From: Paul Nicholls <paul.n@next.gen.nz>
Date: Thu, 27 Oct 2022 19:27:17 +1300
Subject: [PATCH 188/838] [SM300D2] Reduce log severity for successful reads
 (#3955)

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

diff --git a/esphome/components/sm300d2/sm300d2.cpp b/esphome/components/sm300d2/sm300d2.cpp
index c726faec48..365271cec9 100644
--- a/esphome/components/sm300d2/sm300d2.cpp
+++ b/esphome/components/sm300d2/sm300d2.cpp
@@ -42,7 +42,7 @@ void SM300D2Sensor::update() {
 
   this->status_clear_warning();
 
-  ESP_LOGW(TAG, "Successfully read SM300D2 data");
+  ESP_LOGD(TAG, "Successfully read SM300D2 data");
 
   const uint16_t co2 = (response[2] * 256) + response[3];
   const uint16_t formaldehyde = (response[4] * 256) + response[5];

From e61a01f7bb1a6398d34ef0a6133f58540662c24c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 28 Oct 2022 08:12:12 +1300
Subject: [PATCH 189/838] Fix imports for rp2040 with no wifi (#3956)

---
 esphome/core/helpers.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index 53bb6bfd79..9f9a1f10b1 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -21,9 +21,12 @@
 #include "esp_system.h"
 #include <freertos/FreeRTOS.h>
 #include <freertos/portmacro.h>
-#elif defined(USE_RP2040) && defined(USE_WIFI)
+#elif defined(USE_RP2040)
+#if defined(USE_WIFI)
 #include <WiFi.h>
+#endif
 #include <hardware/structs/rosc.h>
+#include <hardware/sync.h>
 #endif
 
 #ifdef USE_ESP32_IGNORE_EFUSE_MAC_CRC

From 0e30c49e3f8ec6be48f6a3a788458cdc5192e35f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 28 Oct 2022 10:06:22 +1300
Subject: [PATCH 190/838] Allow using LED pin on rpi pico-w (#3957)

---
 esphome/components/rp2040/boards.py |  2 +-
 esphome/components/rp2040/gpio.py   | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/esphome/components/rp2040/boards.py b/esphome/components/rp2040/boards.py
index be3d05369a..e2d34bc02a 100644
--- a/esphome/components/rp2040/boards.py
+++ b/esphome/components/rp2040/boards.py
@@ -3,5 +3,5 @@ RP2040_BASE_PINS = {}
 RP2040_BOARD_PINS = {
     "pico": {"LED": 25},
     "rpipico": "pico",
-    "rpipicow": {},
+    "rpipicow": {"LED": 32},
 }
diff --git a/esphome/components/rp2040/gpio.py b/esphome/components/rp2040/gpio.py
index 4bc6dbee1c..2340bed892 100644
--- a/esphome/components/rp2040/gpio.py
+++ b/esphome/components/rp2040/gpio.py
@@ -53,11 +53,29 @@ def _translate_pin(value):
 
 def validate_gpio_pin(value):
     value = _translate_pin(value)
+    board = CORE.data[KEY_RP2040][KEY_BOARD]
+    if board == "rpipicow" and value == 32:
+        return value  # Special case for Pico-w LED pin
     if value < 0 or value > 29:
         raise cv.Invalid(f"RP2040: Invalid pin number: {value}")
     return value
 
 
+def validate_supports(value):
+    board = CORE.data[KEY_RP2040][KEY_BOARD]
+    if board != "rpipicow" or value[CONF_NUMBER] != 32:
+        return value
+    mode = value[CONF_MODE]
+    is_input = mode[CONF_INPUT]
+    is_output = mode[CONF_OUTPUT]
+    is_open_drain = mode[CONF_OPEN_DRAIN]
+    is_pullup = mode[CONF_PULLUP]
+    is_pulldown = mode[CONF_PULLDOWN]
+    if not is_output or is_input or is_open_drain or is_pullup or is_pulldown:
+        raise cv.Invalid("Only output mode is supported for Pico-w LED pin")
+    return value
+
+
 CONF_ANALOG = "analog"
 
 RP2040_PIN_SCHEMA = cv.All(
@@ -77,7 +95,8 @@ RP2040_PIN_SCHEMA = cv.All(
             ),
             cv.Optional(CONF_INVERTED, default=False): cv.boolean,
         }
-    )
+    ),
+    validate_supports,
 )
 
 

From bf4d3df906bc35d5ec128874b27d9f25977177cd Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 28 Oct 2022 12:33:15 +1300
Subject: [PATCH 191/838] Fix RP2040 SPISettings (#3960)

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

diff --git a/esphome/components/spi/spi.h b/esphome/components/spi/spi.h
index bc183be54b..b7124302f4 100644
--- a/esphome/components/spi/spi.h
+++ b/esphome/components/spi/spi.h
@@ -225,7 +225,11 @@ class SPIComponent : public Component {
       } else if (CLOCK_POLARITY && CLOCK_PHASE) {
         data_mode = SPI_MODE3;
       }
+#ifdef USE_RP2040
+      SPISettings settings(DATA_RATE, static_cast<BitOrder>(BIT_ORDER), data_mode);
+#else
       SPISettings settings(DATA_RATE, BIT_ORDER, data_mode);
+#endif
       this->hw_spi_->beginTransaction(settings);
     } else {
 #endif  // USE_SPI_ARDUINO_BACKEND

From 40e0cd0f03f50bf254d44a2b71713ae5facac522 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 28 Oct 2022 12:33:49 +1300
Subject: [PATCH 192/838] =?UTF-8?q?Make=20some=20minor=20changes=20to=20I?=
 =?UTF-8?q?=C2=B2C=20so=20rp2040=20works=20(#3959)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esphome/components/i2c/i2c_bus_arduino.cpp | 18 ++++++++++++++++--
 esphome/components/rp2040/boards.py        | 16 ++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/esphome/components/i2c/i2c_bus_arduino.cpp b/esphome/components/i2c/i2c_bus_arduino.cpp
index 2e92468659..16d89c3450 100644
--- a/esphome/components/i2c/i2c_bus_arduino.cpp
+++ b/esphome/components/i2c/i2c_bus_arduino.cpp
@@ -14,7 +14,7 @@ static const char *const TAG = "i2c.arduino";
 void ArduinoI2CBus::setup() {
   recover_();
 
-#ifdef USE_ESP32
+#if defined(USE_ESP32)
   static uint8_t next_bus_num = 0;
   if (next_bus_num == 0) {
     wire_ = &Wire;
@@ -22,11 +22,25 @@ void ArduinoI2CBus::setup() {
     wire_ = new TwoWire(next_bus_num);  // NOLINT(cppcoreguidelines-owning-memory)
   }
   next_bus_num++;
-#else
+#elif defined(USE_ESP8266)
   wire_ = &Wire;  // NOLINT(cppcoreguidelines-prefer-member-initializer)
+#elif defined(USE_RP2040)
+  static bool first = true;
+  if (first) {
+    wire_ = &Wire;
+    first = false;
+  } else {
+    wire_ = &Wire1;  // NOLINT(cppcoreguidelines-owning-memory)
+  }
 #endif
 
+#ifdef USE_RP2040
+  wire_->setSDA(this->sda_pin_);
+  wire_->setSCL(this->scl_pin_);
+  wire_->begin();
+#else
   wire_->begin(static_cast<int>(sda_pin_), static_cast<int>(scl_pin_));
+#endif
   wire_->setClock(frequency_);
   initialized_ = true;
   if (this->scan_) {
diff --git a/esphome/components/rp2040/boards.py b/esphome/components/rp2040/boards.py
index e2d34bc02a..6063b6d77d 100644
--- a/esphome/components/rp2040/boards.py
+++ b/esphome/components/rp2040/boards.py
@@ -1,7 +1,19 @@
 RP2040_BASE_PINS = {}
 
 RP2040_BOARD_PINS = {
-    "pico": {"LED": 25},
+    "pico": {
+        "SDA": 4,
+        "SCL": 5,
+        "LED": 25,
+        "SDA1": 26,
+        "SCL1": 27,
+    },
     "rpipico": "pico",
-    "rpipicow": {"LED": 32},
+    "rpipicow": {
+        "SDA": 4,
+        "SCL": 5,
+        "LED": 32,
+        "SDA1": 26,
+        "SCL1": 27,
+    },
 }

From 3a689112fdc1ab71cb3bcbba3fdea79eb90286de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Oct 2022 13:29:10 +1300
Subject: [PATCH 193/838] Bump tornado from 6.1 to 6.2 (#3620)

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 3b6d444c22..7603f026d0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ voluptuous==0.13.1
 PyYAML==6.0
 paho-mqtt==1.6.1
 colorama==0.4.5
-tornado==6.1
+tornado==6.2
 tzlocal==4.2    # from time
 tzdata>=2021.1  # from time
 pyserial==3.5

From 109ca2406dfb9234f77e9ae4968de74a39abb0a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Oct 2022 15:40:42 +1300
Subject: [PATCH 194/838] Bump pytest-cov from 3.0.0 to 4.0.0 (#3922)

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 d72449fd66..448d59af80 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -6,7 +6,7 @@ pre-commit
 
 # Unit tests
 pytest==7.1.3
-pytest-cov==3.0.0
+pytest-cov==4.0.0
 pytest-mock==3.8.2
 pytest-asyncio==0.19.0
 asyncmock==0.4.2

From a1c8b8092bec4cce06e10b164c7dcf43d2d10508 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Fri, 28 Oct 2022 10:25:02 -0400
Subject: [PATCH 195/838] Remove gitpod (#3964)

---
 .gitpod.yml | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 .gitpod.yml

diff --git a/.gitpod.yml b/.gitpod.yml
deleted file mode 100644
index be2f11227c..0000000000
--- a/.gitpod.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-ports:
-  - port: 6052
-    onOpen: open-preview
-tasks:
-  # yamllint disable-line rule:line-length
-  - before: pyenv local $(pyenv version | grep '^3\.' | cut -d ' ' -f 1) && script/setup
-    command: python -m esphome dashboard config

From e5b8dd7f2d596ff820314b61dee8848b6fe4ea7f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sat, 29 Oct 2022 12:42:48 +1300
Subject: [PATCH 196/838] Fix bluetooth_proxy not connecting (#3967)

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

diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 0e81c9aca8..68d9d873cd 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -30,7 +30,7 @@ float BLEClientBase::get_setup_priority() const { return setup_priority::AFTER_B
 bool BLEClientBase::parse_device(const espbt::ESPBTDevice &device) {
   if (device.address_uint64() != this->address_)
     return false;
-  if (this->state_ != espbt::ClientState::IDLE)
+  if (this->state_ != espbt::ClientState::IDLE && this->state_ != espbt::ClientState::SEARCHING)
     return false;
 
   ESP_LOGD(TAG, "Found device at MAC address [%s]", device.address_str().c_str());

From 45b6c93f5f0f21925da0f1cf513dd9a5d1d70702 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sat, 29 Oct 2022 12:42:48 +1300
Subject: [PATCH 197/838] Fix bluetooth_proxy not connecting (#3967)

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

diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 0e81c9aca8..68d9d873cd 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -30,7 +30,7 @@ float BLEClientBase::get_setup_priority() const { return setup_priority::AFTER_B
 bool BLEClientBase::parse_device(const espbt::ESPBTDevice &device) {
   if (device.address_uint64() != this->address_)
     return false;
-  if (this->state_ != espbt::ClientState::IDLE)
+  if (this->state_ != espbt::ClientState::IDLE && this->state_ != espbt::ClientState::SEARCHING)
     return false;
 
   ESP_LOGD(TAG, "Found device at MAC address [%s]", device.address_str().c_str());

From bdf1813b3a359e2f1ed8cbaa6b80ae37cb7c9584 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 1 Nov 2022 12:38:54 +1300
Subject: [PATCH 198/838] Bump version to 2022.10.2

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

diff --git a/esphome/const.py b/esphome/const.py
index 2fb03722a0..23e8b9ae6c 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.10.1"
+__version__ = "2022.10.2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 8cad93de3746906d9260ed0bf504ebdc294dafd1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 15:32:30 +1300
Subject: [PATCH 199/838] Bump pyupgrade from 3.0.0 to 3.2.0 (#3973)

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 448d59af80..1c943530ba 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,7 +1,7 @@
 pylint==2.15.3
 flake8==5.0.4
 black==22.8.0  # also change in .pre-commit-config.yaml when updating
-pyupgrade==3.0.0  # also change in .pre-commit-config.yaml when updating
+pyupgrade==3.2.0  # also change in .pre-commit-config.yaml when updating
 pre-commit
 
 # Unit tests

From dfca2f88d3b2ecd58785c8abfc9c43b03a23127b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 17:18:22 +1300
Subject: [PATCH 200/838] Bump pytest from 7.1.3 to 7.2.0 (#3966)

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 1c943530ba..0a7e3b74ae 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -5,7 +5,7 @@ pyupgrade==3.2.0  # also change in .pre-commit-config.yaml when updating
 pre-commit
 
 # Unit tests
-pytest==7.1.3
+pytest==7.2.0
 pytest-cov==4.0.0
 pytest-mock==3.8.2
 pytest-asyncio==0.19.0

From 97bd3e732043c1575270b3c7ca330d30ee135668 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 17:19:28 +1300
Subject: [PATCH 201/838] Bump actions/stale from 5 to 6 (#3841)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/stale.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 33f7ad041c..6cb3b659c4 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -18,7 +18,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v6
         with:
           days-before-pr-stale: 90
           days-before-pr-close: 7
@@ -38,7 +38,7 @@ jobs:
   close-issues:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v6
         with:
           days-before-pr-stale: -1
           days-before-pr-close: -1

From fae4d03473cfedebb918672c7c76f21e06f6e83c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 19:16:58 +1300
Subject: [PATCH 202/838] Bump pylint from 2.15.3 to 2.15.5 (#3978)

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 0a7e3b74ae..af1a10351b 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,4 +1,4 @@
-pylint==2.15.3
+pylint==2.15.5
 flake8==5.0.4
 black==22.8.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.2.0  # also change in .pre-commit-config.yaml when updating

From e7d236f939a2e5b648aa10b90d72a24cc8586622 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 19:17:21 +1300
Subject: [PATCH 203/838] Bump pytest-mock from 3.8.2 to 3.10.0 (#3877)

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 af1a10351b..34efaea2ed 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -7,7 +7,7 @@ pre-commit
 # Unit tests
 pytest==7.2.0
 pytest-cov==4.0.0
-pytest-mock==3.8.2
+pytest-mock==3.10.0
 pytest-asyncio==0.19.0
 asyncmock==0.4.2
 hypothesis==5.49.0

From 0e66c899ce57b304a7697bf4859806e78a07325c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 2 Nov 2022 23:02:33 +1300
Subject: [PATCH 204/838] Allow multiple bluetooth proxy connections (#3971)

---
 esphome/components/api/api_server.h           |   2 +-
 esphome/components/ble_client/ble_client.cpp  |   6 +-
 esphome/components/ble_client/ble_client.h    |   2 +-
 .../components/bluetooth_proxy/__init__.py    |  54 ++-
 .../bluetooth_proxy/bluetooth_connection.cpp  | 281 +++++++++++++
 .../bluetooth_proxy/bluetooth_connection.h    |  34 ++
 .../bluetooth_proxy/bluetooth_proxy.cpp       | 379 +++++-------------
 .../bluetooth_proxy/bluetooth_proxy.h         |  28 +-
 .../esp32_ble_client/ble_characteristic.cpp   |  11 +-
 .../esp32_ble_client/ble_client_base.cpp      | 113 +++---
 .../esp32_ble_client/ble_client_base.h        |  28 +-
 .../esp32_ble_client/ble_service.cpp          |  10 +-
 .../esp32_ble_tracker/esp32_ble_tracker.h     |   2 +-
 13 files changed, 601 insertions(+), 349 deletions(-)
 create mode 100644 esphome/components/bluetooth_proxy/bluetooth_connection.cpp
 create mode 100644 esphome/components/bluetooth_proxy/bluetooth_connection.h

diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index ec8c54a269..1aefa31400 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -75,7 +75,7 @@ class APIServer : public Component, public Controller {
   void send_homeassistant_service_call(const HomeassistantServiceResponse &call);
 #ifdef USE_BLUETOOTH_PROXY
   void send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &call);
-  void send_bluetooth_device_connection(uint64_t address, bool connected, uint16_t mtu, esp_err_t error = ESP_OK);
+  void send_bluetooth_device_connection(uint64_t address, bool connected, uint16_t mtu = 0, esp_err_t error = ESP_OK);
   void send_bluetooth_connections_free(uint8_t free, uint8_t limit);
   void send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &call);
   void send_bluetooth_gatt_write_response(const BluetoothGATTWriteResponse &call);
diff --git a/esphome/components/ble_client/ble_client.cpp b/esphome/components/ble_client/ble_client.cpp
index a757d6f903..f3a9f01a1a 100644
--- a/esphome/components/ble_client/ble_client.cpp
+++ b/esphome/components/ble_client/ble_client.cpp
@@ -47,11 +47,12 @@ void BLEClient::set_enabled(bool enabled) {
   this->enabled = enabled;
 }
 
-void BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t esp_gattc_if,
+bool BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t esp_gattc_if,
                                     esp_ble_gattc_cb_param_t *param) {
   bool all_established = this->all_nodes_established_();
 
-  BLEClientBase::gattc_event_handler(event, esp_gattc_if, param);
+  if (!BLEClientBase::gattc_event_handler(event, esp_gattc_if, param))
+    return false;
 
   for (auto *node : this->nodes_)
     node->gattc_event_handler(event, esp_gattc_if, param);
@@ -62,6 +63,7 @@ void BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t es
       delete svc;  // NOLINT(cppcoreguidelines-owning-memory)
     this->services_.clear();
   }
+  return true;
 }
 
 void BLEClient::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
diff --git a/esphome/components/ble_client/ble_client.h b/esphome/components/ble_client/ble_client.h
index 177cab2e3c..54f5f298fc 100644
--- a/esphome/components/ble_client/ble_client.h
+++ b/esphome/components/ble_client/ble_client.h
@@ -50,7 +50,7 @@ class BLEClient : public BLEClientBase {
   void dump_config() override;
   void loop() override;
 
-  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+  bool 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;
diff --git a/esphome/components/bluetooth_proxy/__init__.py b/esphome/components/bluetooth_proxy/__init__.py
index 84841d9bf4..9c566c56a5 100644
--- a/esphome/components/bluetooth_proxy/__init__.py
+++ b/esphome/components/bluetooth_proxy/__init__.py
@@ -7,19 +7,56 @@ AUTO_LOAD = ["esp32_ble_client", "esp32_ble_tracker"]
 DEPENDENCIES = ["api", "esp32"]
 CODEOWNERS = ["@jesserockz"]
 
+CONF_CONNECTIONS = "connections"
+MAX_CONNECTIONS = 3
 
 bluetooth_proxy_ns = cg.esphome_ns.namespace("bluetooth_proxy")
 
 BluetoothProxy = bluetooth_proxy_ns.class_(
-    "BluetoothProxy", esp32_ble_client.BLEClientBase
+    "BluetoothProxy", esp32_ble_tracker.ESPBTDeviceListener, cg.Component
+)
+BluetoothConnection = bluetooth_proxy_ns.class_(
+    "BluetoothConnection", esp32_ble_client.BLEClientBase
 )
 
-CONFIG_SCHEMA = cv.Schema(
+CONNECTION_SCHEMA = esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA.extend(
     {
-        cv.GenerateID(): cv.declare_id(BluetoothProxy),
-        cv.Optional(CONF_ACTIVE, default=False): cv.boolean,
+        cv.GenerateID(): cv.declare_id(BluetoothConnection),
     }
-).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
+).extend(cv.COMPONENT_SCHEMA)
+
+
+def validate_connections(config):
+    if CONF_CONNECTIONS in config:
+        if not config[CONF_ACTIVE]:
+            raise cv.Invalid(
+                "Connections can only be used if the proxy is set to active"
+            )
+    else:
+        if config[CONF_ACTIVE]:
+            conf = config.copy()
+            conf[CONF_CONNECTIONS] = [
+                CONNECTION_SCHEMA({}) for _ in range(MAX_CONNECTIONS)
+            ]
+            return conf
+    return config
+
+
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(BluetoothProxy),
+            cv.Optional(CONF_ACTIVE, default=False): cv.boolean,
+            cv.Optional(CONF_CONNECTIONS): cv.All(
+                cv.ensure_list(CONNECTION_SCHEMA),
+                cv.Length(min=1, max=MAX_CONNECTIONS),
+            ),
+        }
+    )
+    .extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
+    .extend(cv.COMPONENT_SCHEMA),
+    validate_connections,
+)
 
 
 async def to_code(config):
@@ -27,7 +64,12 @@ async def to_code(config):
     await cg.register_component(var, config)
 
     cg.add(var.set_active(config[CONF_ACTIVE]))
+    await esp32_ble_tracker.register_ble_device(var, config)
 
-    await esp32_ble_tracker.register_client(var, config)
+    for connection_conf in config.get(CONF_CONNECTIONS, []):
+        connection_var = cg.new_Pvariable(connection_conf[CONF_ID])
+        await cg.register_component(connection_var, connection_conf)
+        cg.add(var.register_connection(connection_var))
+        await esp32_ble_tracker.register_client(connection_var, connection_conf)
 
     cg.add_define("USE_BLUETOOTH_PROXY")
diff --git a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
new file mode 100644
index 0000000000..1911701632
--- /dev/null
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
@@ -0,0 +1,281 @@
+#include "bluetooth_connection.h"
+
+#include "esphome/components/api/api_server.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+#ifdef USE_ESP32
+
+#include "bluetooth_proxy.h"
+
+namespace esphome {
+namespace bluetooth_proxy {
+
+static const char *const TAG = "bluetooth_proxy.connection";
+
+bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+                                              esp_ble_gattc_cb_param_t *param) {
+  if (!BLEClientBase::gattc_event_handler(event, gattc_if, param))
+    return false;
+
+  switch (event) {
+    case ESP_GATTC_DISCONNECT_EVT: {
+      api::global_api_server->send_bluetooth_device_connection(this->address_, false, 0, param->disconnect.reason);
+      this->set_address(0);
+      api::global_api_server->send_bluetooth_connections_free(this->proxy_->get_bluetooth_connections_free(),
+                                                              this->proxy_->get_bluetooth_connections_limit());
+      break;
+    }
+    case ESP_GATTC_OPEN_EVT: {
+      if (param->open.conn_id != this->conn_id_)
+        break;
+      if (param->open.status != ESP_GATT_OK && param->open.status != ESP_GATT_ALREADY_OPEN) {
+        api::global_api_server->send_bluetooth_device_connection(this->address_, false, 0, param->open.status);
+        this->set_address(0);
+        api::global_api_server->send_bluetooth_connections_free(this->proxy_->get_bluetooth_connections_free(),
+                                                                this->proxy_->get_bluetooth_connections_limit());
+      }
+      break;
+    }
+    case ESP_GATTC_SEARCH_CMPL_EVT: {
+      if (param->search_cmpl.conn_id != this->conn_id_)
+        break;
+      api::global_api_server->send_bluetooth_device_connection(this->address_, true, this->mtu_);
+      api::global_api_server->send_bluetooth_connections_free(this->proxy_->get_bluetooth_connections_free(),
+                                                              this->proxy_->get_bluetooth_connections_limit());
+      break;
+    }
+    case ESP_GATTC_READ_DESCR_EVT:
+    case ESP_GATTC_READ_CHAR_EVT: {
+      if (param->read.conn_id != this->conn_id_)
+        break;
+      if (param->read.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "[%d] [%s] Error reading char/descriptor at handle 0x%2X, status=%d", this->connection_index_,
+                 this->address_str_.c_str(), param->read.handle, param->read.status);
+        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->read.handle, param->read.status);
+        break;
+      }
+      api::BluetoothGATTReadResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->read.handle;
+      resp.data.reserve(param->read.value_len);
+      for (uint16_t i = 0; i < param->read.value_len; i++) {
+        resp.data.push_back(param->read.value[i]);
+      }
+      api::global_api_server->send_bluetooth_gatt_read_response(resp);
+      break;
+    }
+    case ESP_GATTC_WRITE_CHAR_EVT:
+    case ESP_GATTC_WRITE_DESCR_EVT: {
+      if (param->write.conn_id != this->conn_id_)
+        break;
+      if (param->write.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "[%d] [%s] Error writing char/descriptor at handle 0x%2X, status=%d", this->connection_index_,
+                 this->address_str_.c_str(), param->write.handle, param->write.status);
+        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->write.handle, param->write.status);
+        break;
+      }
+      api::BluetoothGATTWriteResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->write.handle;
+      api::global_api_server->send_bluetooth_gatt_write_response(resp);
+      break;
+    }
+    case ESP_GATTC_UNREG_FOR_NOTIFY_EVT: {
+      if (this->get_characteristic(param->unreg_for_notify.handle) == nullptr)  // No conn_id in this event
+        break;
+      if (param->unreg_for_notify.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "[%d] [%s] Error unregistering notifications for handle 0x%2X, status=%d",
+                 this->connection_index_, this->address_str_.c_str(), param->unreg_for_notify.handle,
+                 param->unreg_for_notify.status);
+        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->unreg_for_notify.handle,
+                                                          param->unreg_for_notify.status);
+        break;
+      }
+      api::BluetoothGATTNotifyResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->unreg_for_notify.handle;
+      api::global_api_server->send_bluetooth_gatt_notify_response(resp);
+      break;
+    }
+    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
+      if (this->get_characteristic(param->reg_for_notify.handle) == nullptr)  // No conn_id in this event
+        break;
+      if (param->reg_for_notify.status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "[%d] [%s] Error registering notifications for handle 0x%2X, status=%d", this->connection_index_,
+                 this->address_str_.c_str(), param->reg_for_notify.handle, param->reg_for_notify.status);
+        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->reg_for_notify.handle,
+                                                          param->reg_for_notify.status);
+        break;
+      }
+      api::BluetoothGATTNotifyResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->reg_for_notify.handle;
+      api::global_api_server->send_bluetooth_gatt_notify_response(resp);
+      break;
+    }
+    case ESP_GATTC_NOTIFY_EVT: {
+      if (param->notify.conn_id != this->conn_id_)
+        break;
+      ESP_LOGV(TAG, "[%d] [%s] ESP_GATTC_NOTIFY_EVT: handle=0x%2X", this->connection_index_, this->address_str_.c_str(),
+               param->notify.handle);
+      api::BluetoothGATTNotifyDataResponse resp;
+      resp.address = this->address_;
+      resp.handle = param->notify.handle;
+      resp.data.reserve(param->notify.value_len);
+      for (uint16_t i = 0; i < param->notify.value_len; i++) {
+        resp.data.push_back(param->notify.value[i]);
+      }
+      api::global_api_server->send_bluetooth_gatt_notify_data_response(resp);
+      break;
+    }
+    default:
+      break;
+  }
+  return true;
+}
+
+esp_err_t BluetoothConnection::read_characteristic(uint16_t handle) {
+  if (!this->connected()) {
+    ESP_LOGW(TAG, "[%d] [%s] Cannot read GATT characteristic, not connected.", this->connection_index_,
+             this->address_str_.c_str());
+    return ESP_GATT_NOT_CONNECTED;
+  }
+  auto *characteristic = this->get_characteristic(handle);
+  if (characteristic == nullptr) {
+    ESP_LOGW(TAG, "[%d] [%s] Cannot read GATT characteristic, not found.", this->connection_index_,
+             this->address_str_.c_str());
+    return ESP_GATT_INVALID_HANDLE;
+  }
+
+  ESP_LOGV(TAG, "[%d] [%s] Reading GATT characteristic %s", this->connection_index_, this->address_str_.c_str(),
+           characteristic->uuid.to_string().c_str());
+
+  esp_err_t err =
+      esp_ble_gattc_read_char(this->gattc_if_, this->conn_id_, characteristic->handle, ESP_GATT_AUTH_REQ_NONE);
+  if (err != ERR_OK) {
+    ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_read_char error, err=%d", this->connection_index_,
+             this->address_str_.c_str(), err);
+    return err;
+  }
+  return ESP_OK;
+}
+
+esp_err_t BluetoothConnection::write_characteristic(uint16_t handle, const std::string &data, bool response) {
+  if (!this->connected()) {
+    ESP_LOGW(TAG, "[%d] [%s] Cannot write GATT characteristic, not connected.", this->connection_index_,
+             this->address_str_.c_str());
+    return ESP_GATT_NOT_CONNECTED;
+  }
+  auto *characteristic = this->get_characteristic(handle);
+  if (characteristic == nullptr) {
+    ESP_LOGW(TAG, "[%d] [%s] Cannot write GATT characteristic, not found.", this->connection_index_,
+             this->address_str_.c_str());
+    return ESP_GATT_INVALID_HANDLE;
+  }
+
+  ESP_LOGV(TAG, "[%d] [%s] Writing GATT characteristic %s", this->connection_index_, this->address_str_.c_str(),
+           characteristic->uuid.to_string().c_str());
+
+  auto err = characteristic->write_value((uint8_t *) data.data(), data.size(),
+                                         response ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP);
+  if (err != ERR_OK) {
+    ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_write_char error, err=%d", this->connection_index_,
+             this->address_str_.c_str(), err);
+    return err;
+  }
+  return ESP_OK;
+}
+
+esp_err_t BluetoothConnection::read_descriptor(uint16_t handle) {
+  if (!this->connected()) {
+    ESP_LOGW(TAG, "[%d] [%s] Cannot read GATT descriptor, not connected.", this->connection_index_,
+             this->address_str_.c_str());
+    return ESP_GATT_NOT_CONNECTED;
+  }
+  auto *descriptor = this->get_descriptor(handle);
+  if (descriptor == nullptr) {
+    ESP_LOGW(TAG, "[%d] [%s] Cannot read GATT descriptor, not found.", this->connection_index_,
+             this->address_str_.c_str());
+    return ESP_GATT_INVALID_HANDLE;
+  }
+
+  ESP_LOGV(TAG, "[%d] [%s] Reading GATT descriptor %s", this->connection_index_, this->address_str_.c_str(),
+           descriptor->uuid.to_string().c_str());
+
+  esp_err_t err =
+      esp_ble_gattc_read_char_descr(this->gattc_if_, this->conn_id_, descriptor->handle, ESP_GATT_AUTH_REQ_NONE);
+  if (err != ERR_OK) {
+    ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_read_char_descr error, err=%d", this->connection_index_,
+             this->address_str_.c_str(), err);
+    return err;
+  }
+  return ESP_OK;
+}
+
+esp_err_t BluetoothConnection::write_descriptor(uint16_t handle, const std::string &data) {
+  if (!this->connected()) {
+    ESP_LOGW(TAG, "[%d] [%s] Cannot write GATT descriptor, not connected.", this->connection_index_,
+             this->address_str_.c_str());
+    return ESP_GATT_NOT_CONNECTED;
+  }
+  auto *descriptor = this->get_descriptor(handle);
+  if (descriptor == nullptr) {
+    ESP_LOGW(TAG, "[%d] [%s] Cannot write GATT descriptor, not found.", this->connection_index_,
+             this->address_str_.c_str());
+    return ESP_GATT_INVALID_HANDLE;
+  }
+
+  ESP_LOGV(TAG, "[%d] [%s] Writing GATT descriptor %s", this->connection_index_, this->address_str_.c_str(),
+           descriptor->uuid.to_string().c_str());
+
+  auto err =
+      esp_ble_gattc_write_char_descr(this->gattc_if_, this->conn_id_, descriptor->handle, data.size(),
+                                     (uint8_t *) data.data(), ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+  if (err != ERR_OK) {
+    ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_write_char_descr error, err=%d", this->connection_index_,
+             this->address_str_.c_str(), err);
+    return err;
+  }
+  return ESP_OK;
+}
+
+esp_err_t BluetoothConnection::notify_characteristic(uint16_t handle, bool enable) {
+  if (!this->connected()) {
+    ESP_LOGW(TAG, "[%d] [%s] Cannot notify GATT characteristic, not connected.", this->connection_index_,
+             this->address_str_.c_str());
+    return ESP_GATT_NOT_CONNECTED;
+  }
+  auto *characteristic = this->get_characteristic(handle);
+  if (characteristic == nullptr) {
+    ESP_LOGW(TAG, "[%d] [%s] Cannot notify GATT characteristic, not found.", this->connection_index_,
+             this->address_str_.c_str());
+    return ESP_GATT_INVALID_HANDLE;
+  }
+
+  if (enable) {
+    ESP_LOGV(TAG, "[%d] [%s] Registering for GATT characteristic notifications %s", this->connection_index_,
+             this->address_str_.c_str(), characteristic->uuid.to_string().c_str());
+    esp_err_t err = esp_ble_gattc_register_for_notify(this->gattc_if_, this->remote_bda_, characteristic->handle);
+    if (err != ESP_OK) {
+      ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_register_for_notify failed, err=%d", this->connection_index_,
+               this->address_str_.c_str(), err);
+      return err;
+    }
+  } else {
+    ESP_LOGV(TAG, "[%d] [%s] Unregistering for GATT characteristic notifications %s", this->connection_index_,
+             this->address_str_.c_str(), characteristic->uuid.to_string().c_str());
+    esp_err_t err = esp_ble_gattc_unregister_for_notify(this->gattc_if_, this->remote_bda_, characteristic->handle);
+    if (err != ESP_OK) {
+      ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_unregister_for_notify failed, err=%d", this->connection_index_,
+               this->address_str_.c_str(), err);
+      return err;
+    }
+  }
+  return ESP_OK;
+}
+
+}  // namespace bluetooth_proxy
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/bluetooth_proxy/bluetooth_connection.h b/esphome/components/bluetooth_proxy/bluetooth_connection.h
new file mode 100644
index 0000000000..1f759c3485
--- /dev/null
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#ifdef USE_ESP32
+
+#include "esphome/components/esp32_ble_client/ble_client_base.h"
+
+namespace esphome {
+namespace bluetooth_proxy {
+
+class BluetoothProxy;
+
+class BluetoothConnection : public esp32_ble_client::BLEClientBase {
+ public:
+  bool gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+                           esp_ble_gattc_cb_param_t *param) override;
+
+  esp_err_t read_characteristic(uint16_t handle);
+  esp_err_t write_characteristic(uint16_t handle, const std::string &data, bool response);
+  esp_err_t read_descriptor(uint16_t handle);
+  esp_err_t write_descriptor(uint16_t handle, const std::string &data);
+
+  esp_err_t notify_characteristic(uint16_t handle, bool enable);
+
+ protected:
+  friend class BluetoothProxy;
+
+  int16_t send_service_{-1};
+  BluetoothProxy *proxy_;
+};
+
+}  // namespace bluetooth_proxy
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index 5dfdc06070..7798bb1e85 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -11,13 +11,7 @@ namespace bluetooth_proxy {
 
 static const char *const TAG = "bluetooth_proxy";
 
-static const esp_err_t ESP_GATT_NOT_CONNECTED = -1;
-static const esp_err_t ESP_GATT_WRONG_ADDRESS = -2;
-
-BluetoothProxy::BluetoothProxy() {
-  global_bluetooth_proxy = this;
-  this->address_ = 0;
-}
+BluetoothProxy::BluetoothProxy() { global_bluetooth_proxy = this; }
 
 bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
   if (!api::global_api_server->is_connected())
@@ -26,10 +20,6 @@ bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device)
            device.get_rssi());
   this->send_api_packet_(device);
 
-  if (this->address_ == 0)
-    return true;
-
-  BLEClientBase::parse_device(device);
   return true;
 }
 
@@ -57,170 +47,101 @@ void BluetoothProxy::send_api_packet_(const esp32_ble_tracker::ESPBTDevice &devi
   api::global_api_server->send_bluetooth_le_advertisement(resp);
 }
 
-void BluetoothProxy::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                                         esp_ble_gattc_cb_param_t *param) {
-  BLEClientBase::gattc_event_handler(event, gattc_if, param);
-  switch (event) {
-    case ESP_GATTC_DISCONNECT_EVT: {
-      api::global_api_server->send_bluetooth_device_connection(this->address_, false, this->mtu_,
-                                                               param->disconnect.reason);
-      api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
-                                                              this->get_bluetooth_connections_limit());
-      this->address_ = 0;
-    }
-    case ESP_GATTC_OPEN_EVT: {
-      if (param->open.status != ESP_GATT_OK && param->open.status != ESP_GATT_ALREADY_OPEN) {
-        api::global_api_server->send_bluetooth_device_connection(this->address_, false, this->mtu_, param->open.status);
-        break;
+void BluetoothProxy::dump_config() {
+  ESP_LOGCONFIG(TAG, "Bluetooth Proxy:");
+  ESP_LOGCONFIG(TAG, "  Active: %s", YESNO(this->active_));
+}
+
+void BluetoothProxy::loop() {
+  if (!api::global_api_server->is_connected()) {
+    for (auto *connection : this->connections_) {
+      if (connection->get_address() != 0) {
+        connection->disconnect();
       }
-      break;
     }
-    case ESP_GATTC_SEARCH_CMPL_EVT: {
-      api::global_api_server->send_bluetooth_device_connection(this->address_, true, this->mtu_);
-      api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
-                                                              this->get_bluetooth_connections_limit());
-      break;
-    }
-    case ESP_GATTC_READ_DESCR_EVT:
-    case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->conn_id_)
-        break;
-      if (param->read.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "Error reading char/descriptor at handle 0x%2X, status=%d", param->read.handle,
-                 param->read.status);
-        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->read.handle, param->read.status);
-        break;
+    return;
+  }
+  for (auto *connection : this->connections_) {
+    if (connection->send_service_ == connection->services_.size()) {
+      connection->send_service_ = -1;
+      api::global_api_server->send_bluetooth_gatt_services_done(connection->get_address());
+    } else if (connection->send_service_ >= 0) {
+      auto &service = connection->services_[connection->send_service_];
+      api::BluetoothGATTGetServicesResponse resp;
+      resp.address = connection->get_address();
+      api::BluetoothGATTService service_resp;
+      service_resp.uuid = {service->uuid.get_128bit_high(), service->uuid.get_128bit_low()};
+      service_resp.handle = service->start_handle;
+      for (auto &characteristic : service->characteristics) {
+        api::BluetoothGATTCharacteristic characteristic_resp;
+        characteristic_resp.uuid = {characteristic->uuid.get_128bit_high(), characteristic->uuid.get_128bit_low()};
+        characteristic_resp.handle = characteristic->handle;
+        characteristic_resp.properties = characteristic->properties;
+        for (auto &descriptor : characteristic->descriptors) {
+          api::BluetoothGATTDescriptor descriptor_resp;
+          descriptor_resp.uuid = {descriptor->uuid.get_128bit_high(), descriptor->uuid.get_128bit_low()};
+          descriptor_resp.handle = descriptor->handle;
+          characteristic_resp.descriptors.push_back(std::move(descriptor_resp));
+        }
+        service_resp.characteristics.push_back(std::move(characteristic_resp));
       }
-      api::BluetoothGATTReadResponse resp;
-      resp.address = this->address_;
-      resp.handle = param->read.handle;
-      resp.data.reserve(param->read.value_len);
-      for (uint16_t i = 0; i < param->read.value_len; i++) {
-        resp.data.push_back(param->read.value[i]);
-      }
-      api::global_api_server->send_bluetooth_gatt_read_response(resp);
-      break;
+      resp.services.push_back(std::move(service_resp));
+      api::global_api_server->send_bluetooth_gatt_services(resp);
+      connection->send_service_++;
     }
-    case ESP_GATTC_WRITE_CHAR_EVT:
-    case ESP_GATTC_WRITE_DESCR_EVT: {
-      if (param->write.conn_id != this->conn_id_)
-        break;
-      if (param->write.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "Error writing char/descriptor at handle 0x%2X, status=%d", param->write.handle,
-                 param->write.status);
-        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->write.handle, param->write.status);
-        break;
-      }
-      api::BluetoothGATTWriteResponse resp;
-      resp.address = this->address_;
-      resp.handle = param->write.handle;
-      api::global_api_server->send_bluetooth_gatt_write_response(resp);
-      break;
-    }
-    case ESP_GATTC_UNREG_FOR_NOTIFY_EVT: {
-      if (param->unreg_for_notify.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "Error unregistering notifications for handle 0x%2X, status=%d", param->unreg_for_notify.handle,
-                 param->unreg_for_notify.status);
-        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->unreg_for_notify.handle,
-                                                          param->unreg_for_notify.status);
-        break;
-      }
-      api::BluetoothGATTNotifyResponse resp;
-      resp.address = this->address_;
-      resp.handle = param->unreg_for_notify.handle;
-      api::global_api_server->send_bluetooth_gatt_notify_response(resp);
-      break;
-    }
-    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
-      if (param->reg_for_notify.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "Error registering notifications for handle 0x%2X, status=%d", param->reg_for_notify.handle,
-                 param->reg_for_notify.status);
-        api::global_api_server->send_bluetooth_gatt_error(this->address_, param->reg_for_notify.handle,
-                                                          param->reg_for_notify.status);
-        break;
-      }
-      api::BluetoothGATTNotifyResponse resp;
-      resp.address = this->address_;
-      resp.handle = param->reg_for_notify.handle;
-      api::global_api_server->send_bluetooth_gatt_notify_response(resp);
-      break;
-    }
-    case ESP_GATTC_NOTIFY_EVT: {
-      if (param->notify.conn_id != this->conn_id_)
-        break;
-      ESP_LOGV(TAG, "ESP_GATTC_NOTIFY_EVT: handle=0x%2X", param->notify.handle);
-      api::BluetoothGATTNotifyDataResponse resp;
-      resp.address = this->address_;
-      resp.handle = param->notify.handle;
-      resp.data.reserve(param->notify.value_len);
-      for (uint16_t i = 0; i < param->notify.value_len; i++) {
-        resp.data.push_back(param->notify.value[i]);
-      }
-      api::global_api_server->send_bluetooth_gatt_notify_data_response(resp);
-      break;
-    }
-    default:
-      break;
   }
 }
 
-void BluetoothProxy::dump_config() { ESP_LOGCONFIG(TAG, "Bluetooth Proxy:"); }
+BluetoothConnection *BluetoothProxy::get_connection_(uint64_t address, bool reserve) {
+  for (auto *connection : this->connections_) {
+    if (connection->get_address() == address)
+      return connection;
+  }
 
-void BluetoothProxy::loop() {
-  BLEClientBase::loop();
-  if (this->state_ != espbt::ClientState::IDLE && !api::global_api_server->is_connected()) {
-    ESP_LOGI(TAG, "[%s] Disconnecting.", this->address_str().c_str());
-    auto err = esp_ble_gattc_close(this->gattc_if_, this->conn_id_);
-    if (err != ERR_OK) {
-      ESP_LOGW(TAG, "esp_ble_gattc_close error, address=%s err=%d", this->address_str().c_str(), err);
+  if (!reserve)
+    return nullptr;
+
+  for (auto *connection : this->connections_) {
+    if (connection->get_address() == 0) {
+      connection->set_address(address);
+      return connection;
     }
   }
 
-  if (this->send_service_ == this->services_.size()) {
-    this->send_service_ = -1;
-    api::global_api_server->send_bluetooth_gatt_services_done(this->address_);
-  } else if (this->send_service_ >= 0) {
-    auto &service = this->services_[this->send_service_];
-    api::BluetoothGATTGetServicesResponse resp;
-    resp.address = this->address_;
-    api::BluetoothGATTService service_resp;
-    service_resp.uuid = {service->uuid.get_128bit_high(), service->uuid.get_128bit_low()};
-    service_resp.handle = service->start_handle;
-    for (auto &characteristic : service->characteristics) {
-      api::BluetoothGATTCharacteristic characteristic_resp;
-      characteristic_resp.uuid = {characteristic->uuid.get_128bit_high(), characteristic->uuid.get_128bit_low()};
-      characteristic_resp.handle = characteristic->handle;
-      characteristic_resp.properties = characteristic->properties;
-      for (auto &descriptor : characteristic->descriptors) {
-        api::BluetoothGATTDescriptor descriptor_resp;
-        descriptor_resp.uuid = {descriptor->uuid.get_128bit_high(), descriptor->uuid.get_128bit_low()};
-        descriptor_resp.handle = descriptor->handle;
-        characteristic_resp.descriptors.push_back(std::move(descriptor_resp));
-      }
-      service_resp.characteristics.push_back(std::move(characteristic_resp));
-    }
-    resp.services.push_back(std::move(service_resp));
-    api::global_api_server->send_bluetooth_gatt_services(resp);
-    this->send_service_++;
-  }
+  return nullptr;
 }
 
 void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest &msg) {
   switch (msg.request_type) {
     case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT: {
-      this->address_ = msg.address;
-      this->set_state(espbt::ClientState::SEARCHING);
+      auto *connection = this->get_connection_(msg.address, true);
+      if (connection == nullptr) {
+        ESP_LOGW(TAG, "No free connections available");
+        api::global_api_server->send_bluetooth_device_connection(msg.address, false);
+        return;
+      }
+      ESP_LOGV(TAG, "[%d] [%s] Searching to connect", connection->get_connection_index(),
+               connection->address_str().c_str());
+      connection->set_state(espbt::ClientState::SEARCHING);
       api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
                                                               this->get_bluetooth_connections_limit());
       break;
     }
     case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT: {
-      if (this->state() != espbt::ClientState::IDLE) {
-        ESP_LOGI(TAG, "[%s] Disconnecting.", this->address_str().c_str());
-        auto err = esp_ble_gattc_close(this->gattc_if_, this->conn_id_);
-        if (err != ERR_OK) {
-          ESP_LOGW(TAG, "esp_ble_gattc_close error, address=%s err=%d", this->address_str().c_str(), err);
-        }
+      auto *connection = this->get_connection_(msg.address, false);
+      if (connection == nullptr) {
+        api::global_api_server->send_bluetooth_device_connection(msg.address, false);
+        api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
+                                                                this->get_bluetooth_connections_limit());
+        return;
+      }
+      if (connection->state() != espbt::ClientState::IDLE) {
+        connection->disconnect();
+      } else {
+        connection->set_address(0);
+        api::global_api_server->send_bluetooth_device_connection(msg.address, false);
+        api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
+                                                                this->get_bluetooth_connections_limit());
       }
       break;
     }
@@ -231,170 +152,88 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
 }
 
 void BluetoothProxy::bluetooth_gatt_read(const api::BluetoothGATTReadRequest &msg) {
-  if (this->state_ != espbt::ClientState::ESTABLISHED) {
-    ESP_LOGW(TAG, "Cannot read GATT characteristic, not connected.");
+  auto *connection = this->get_connection_(msg.address, false);
+  if (connection == nullptr) {
+    ESP_LOGW(TAG, "Cannot read GATT characteristic, not connected");
     api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
     return;
   }
-  if (this->address_ != msg.address) {
-    ESP_LOGW(TAG, "Address mismatch for read GATT characteristic request");
-    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_WRONG_ADDRESS);
-    return;
-  }
 
-  auto *characteristic = this->get_characteristic(msg.handle);
-  if (characteristic == nullptr) {
-    ESP_LOGW(TAG, "Cannot read GATT characteristic, not found.");
-    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_INVALID_HANDLE);
-    return;
-  }
-
-  ESP_LOGV(TAG, "Reading GATT characteristic %s", characteristic->uuid.to_string().c_str());
-
-  esp_err_t err =
-      esp_ble_gattc_read_char(this->gattc_if_, this->conn_id_, characteristic->handle, ESP_GATT_AUTH_REQ_NONE);
-  if (err != ERR_OK) {
-    ESP_LOGW(TAG, "esp_ble_gattc_read_char error, err=%d", err);
+  auto err = connection->read_characteristic(msg.handle);
+  if (err != ESP_OK) {
     api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
   }
 }
 
 void BluetoothProxy::bluetooth_gatt_write(const api::BluetoothGATTWriteRequest &msg) {
-  if (this->state_ != espbt::ClientState::ESTABLISHED) {
-    ESP_LOGW(TAG, "Cannot write GATT characteristic, not connected.");
+  auto *connection = this->get_connection_(msg.address, false);
+  if (connection == nullptr) {
+    ESP_LOGW(TAG, "Cannot write GATT characteristic, not connected");
     api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
     return;
   }
-  if (this->address_ != msg.address) {
-    ESP_LOGW(TAG, "Address mismatch for write GATT characteristic request");
-    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_WRONG_ADDRESS);
-    return;
-  }
 
-  auto *characteristic = this->get_characteristic(msg.handle);
-  if (characteristic == nullptr) {
-    ESP_LOGW(TAG, "Cannot write GATT characteristic, not found.");
-    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_INVALID_HANDLE);
-    return;
-  }
-
-  ESP_LOGV(TAG, "Writing GATT characteristic %s", characteristic->uuid.to_string().c_str());
-  auto err = characteristic->write_value((uint8_t *) msg.data.data(), msg.data.size(),
-                                         msg.response ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP);
-  if (err != ERR_OK) {
+  auto err = connection->write_characteristic(msg.handle, msg.data, msg.response);
+  if (err != ESP_OK) {
     api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
   }
 }
 
 void BluetoothProxy::bluetooth_gatt_read_descriptor(const api::BluetoothGATTReadDescriptorRequest &msg) {
-  if (this->state_ != espbt::ClientState::ESTABLISHED) {
-    ESP_LOGW(TAG, "Cannot read GATT characteristic descriptor, not connected.");
+  auto *connection = this->get_connection_(msg.address, false);
+  if (connection == nullptr) {
+    ESP_LOGW(TAG, "Cannot read GATT descriptor, not connected");
     api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
     return;
   }
-  if (this->address_ != msg.address) {
-    ESP_LOGW(TAG, "Address mismatch for read GATT characteristic descriptor request");
-    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_WRONG_ADDRESS);
-    return;
-  }
 
-  auto *descriptor = this->get_descriptor(msg.handle);
-  if (descriptor == nullptr) {
-    ESP_LOGW(TAG, "Cannot read GATT characteristic descriptor, not found.");
-    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_INVALID_HANDLE);
-    return;
-  }
-
-  ESP_LOGV(TAG, "Reading GATT characteristic descriptor %s -> %s", descriptor->characteristic->uuid.to_string().c_str(),
-           descriptor->uuid.to_string().c_str());
-
-  esp_err_t err =
-      esp_ble_gattc_read_char_descr(this->gattc_if_, this->conn_id_, descriptor->handle, ESP_GATT_AUTH_REQ_NONE);
-  if (err != ERR_OK) {
-    ESP_LOGW(TAG, "esp_ble_gattc_read_char error, err=%d", err);
+  auto err = connection->read_descriptor(msg.handle);
+  if (err != ESP_OK) {
     api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
   }
 }
 
 void BluetoothProxy::bluetooth_gatt_write_descriptor(const api::BluetoothGATTWriteDescriptorRequest &msg) {
-  if (this->state_ != espbt::ClientState::ESTABLISHED) {
-    ESP_LOGW(TAG, "Cannot write GATT characteristic descriptor, not connected.");
+  auto *connection = this->get_connection_(msg.address, false);
+  if (connection == nullptr) {
+    ESP_LOGW(TAG, "Cannot write GATT descriptor, not connected");
     api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
     return;
   }
-  if (this->address_ != msg.address) {
-    ESP_LOGW(TAG, "Address mismatch for write GATT characteristic descriptor request");
-    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_WRONG_ADDRESS);
-    return;
-  }
 
-  auto *descriptor = this->get_descriptor(msg.handle);
-  if (descriptor == nullptr) {
-    ESP_LOGW(TAG, "Cannot write GATT characteristic descriptor, not found.");
-    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_INVALID_HANDLE);
-    return;
-  }
-
-  ESP_LOGV(TAG, "Writing GATT characteristic descriptor %s -> %s", descriptor->characteristic->uuid.to_string().c_str(),
-           descriptor->uuid.to_string().c_str());
-
-  esp_err_t err =
-      esp_ble_gattc_write_char_descr(this->gattc_if_, this->conn_id_, descriptor->handle, msg.data.size(),
-                                     (uint8_t *) msg.data.data(), ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-  if (err != ERR_OK) {
-    ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, err=%d", err);
+  auto err = connection->write_descriptor(msg.handle, msg.data);
+  if (err != ESP_OK) {
     api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
   }
 }
 
 void BluetoothProxy::bluetooth_gatt_send_services(const api::BluetoothGATTGetServicesRequest &msg) {
-  if (this->state_ != espbt::ClientState::ESTABLISHED) {
-    ESP_LOGW(TAG, "Cannot get GATT services, not connected.");
+  auto *connection = this->get_connection_(msg.address, false);
+  if (connection == nullptr || !connection->connected()) {
+    ESP_LOGW(TAG, "Cannot get GATT services, not connected");
     api::global_api_server->send_bluetooth_gatt_error(msg.address, 0, ESP_GATT_NOT_CONNECTED);
     return;
   }
-  if (this->address_ != msg.address) {
-    ESP_LOGW(TAG, "Address mismatch for service list request");
-    api::global_api_server->send_bluetooth_gatt_error(msg.address, 0, ESP_GATT_WRONG_ADDRESS);
+  if (connection->services_.empty()) {
+    ESP_LOGW(TAG, "[%d] [%s] No GATT services found", connection->connection_index_, connection->address_str().c_str());
+    api::global_api_server->send_bluetooth_gatt_services_done(msg.address);
     return;
   }
-  this->send_service_ = 0;
+  if (connection->send_service_ == -1)  // Don't start sending services again if we're already sending them
+    connection->send_service_ = 0;
 }
 
 void BluetoothProxy::bluetooth_gatt_notify(const api::BluetoothGATTNotifyRequest &msg) {
-  if (this->state_ != espbt::ClientState::ESTABLISHED) {
-    ESP_LOGW(TAG, "Cannot configure notify, not connected.");
+  auto *connection = this->get_connection_(msg.address, false);
+  if (connection == nullptr) {
+    ESP_LOGW(TAG, "Cannot notify GATT characteristic, not connected");
     api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_NOT_CONNECTED);
     return;
   }
 
-  if (this->address_ != msg.address) {
-    ESP_LOGW(TAG, "Address mismatch for notify");
-    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_WRONG_ADDRESS);
-    return;
-  }
-
-  auto *characteristic = this->get_characteristic(msg.handle);
-
-  if (characteristic == nullptr) {
-    ESP_LOGW(TAG, "Cannot notify GATT characteristic, not found.");
-    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, ESP_GATT_INVALID_HANDLE);
-    return;
-  }
-
-  esp_err_t err;
-  if (msg.enable) {
-    err = esp_ble_gattc_register_for_notify(this->gattc_if_, this->remote_bda_, characteristic->handle);
-    if (err != ESP_OK) {
-      ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, err=%d", err);
-      api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
-    }
-  } else {
-    err = esp_ble_gattc_unregister_for_notify(this->gattc_if_, this->remote_bda_, characteristic->handle);
-    if (err != ESP_OK) {
-      ESP_LOGW(TAG, "esp_ble_gattc_unregister_for_notify failed, err=%d", err);
-      api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
-    }
+  auto err = connection->notify_characteristic(msg.handle, msg.enable);
+  if (err != ESP_OK) {
+    api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
   }
 }
 
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.h b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
index 9529b99f73..129b042277 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -11,22 +11,26 @@
 #include "esphome/core/component.h"
 #include "esphome/core/defines.h"
 
-#include <map>
+#include "bluetooth_connection.h"
 
 namespace esphome {
 namespace bluetooth_proxy {
 
+static const esp_err_t ESP_GATT_NOT_CONNECTED = -1;
+
 using namespace esp32_ble_client;
 
-class BluetoothProxy : public BLEClientBase {
+class BluetoothProxy : public esp32_ble_tracker::ESPBTDeviceListener, public Component {
  public:
   BluetoothProxy();
   bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
   void dump_config() override;
   void loop() override;
 
-  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 register_connection(BluetoothConnection *connection) {
+    this->connections_.push_back(connection);
+    connection->proxy_ = this;
+  }
 
   void bluetooth_device_request(const api::BluetoothDeviceRequest &msg);
   void bluetooth_gatt_read(const api::BluetoothGATTReadRequest &msg);
@@ -36,8 +40,16 @@ class BluetoothProxy : public BLEClientBase {
   void bluetooth_gatt_send_services(const api::BluetoothGATTGetServicesRequest &msg);
   void bluetooth_gatt_notify(const api::BluetoothGATTNotifyRequest &msg);
 
-  int get_bluetooth_connections_free() { return this->state_ == espbt::ClientState::IDLE ? 1 : 0; }
-  int get_bluetooth_connections_limit() { return 1; }
+  int get_bluetooth_connections_free() {
+    int free = 0;
+    for (auto *connection : this->connections_) {
+      if (connection->address_ == 0) {
+        free++;
+      }
+    }
+    return free;
+  }
+  int get_bluetooth_connections_limit() { return this->connections_.size(); }
 
   void set_active(bool active) { this->active_ = active; }
   bool has_active() { return this->active_; }
@@ -45,8 +57,12 @@ class BluetoothProxy : public BLEClientBase {
  protected:
   void send_api_packet_(const esp32_ble_tracker::ESPBTDevice &device);
 
+  BluetoothConnection *get_connection_(uint64_t address, bool reserve);
+
   int16_t send_service_{-1};
   bool active_;
+
+  std::vector<BluetoothConnection *> connections_{};
 };
 
 extern BluetoothProxy *global_bluetooth_proxy;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
diff --git a/esphome/components/esp32_ble_client/ble_characteristic.cpp b/esphome/components/esp32_ble_client/ble_characteristic.cpp
index 2692498e98..fbc9ba16dc 100644
--- a/esphome/components/esp32_ble_client/ble_characteristic.cpp
+++ b/esphome/components/esp32_ble_client/ble_characteristic.cpp
@@ -9,7 +9,7 @@
 namespace esphome {
 namespace esp32_ble_client {
 
-static const char *const TAG = "esp32_ble_client.characteristic";
+static const char *const TAG = "esp32_ble_client";
 
 BLECharacteristic::~BLECharacteristic() {
   for (auto &desc : this->descriptors)
@@ -29,7 +29,8 @@ void BLECharacteristic::parse_descriptors() {
       break;
     }
     if (status != ESP_GATT_OK) {
-      ESP_LOGW(TAG, "esp_ble_gattc_get_all_descr error, status=%d", status);
+      ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_get_all_descr error, status=%d",
+               this->service->client->get_connection_index(), this->service->client->address_str().c_str(), status);
       break;
     }
     if (count == 0) {
@@ -41,7 +42,8 @@ void BLECharacteristic::parse_descriptors() {
     desc->handle = result.handle;
     desc->characteristic = this;
     this->descriptors.push_back(desc);
-    ESP_LOGV(TAG, "   descriptor %s, handle 0x%x", desc->uuid.to_string().c_str(), desc->handle);
+    ESP_LOGV(TAG, "[%d] [%s]    descriptor %s, handle 0x%x", this->service->client->get_connection_index(),
+             this->service->client->address_str().c_str(), desc->uuid.to_string().c_str(), desc->handle);
     offset++;
   }
 }
@@ -69,7 +71,8 @@ esp_err_t BLECharacteristic::write_value(uint8_t *new_val, int16_t new_val_size,
   auto status = esp_ble_gattc_write_char(client->get_gattc_if(), client->get_conn_id(), this->handle, new_val_size,
                                          new_val, write_type, ESP_GATT_AUTH_REQ_NONE);
   if (status) {
-    ESP_LOGW(TAG, "Error sending write value to BLE gattc server, status=%d", status);
+    ESP_LOGW(TAG, "[%d] [%s] Error sending write value to BLE gattc server, status=%d",
+             this->service->client->get_connection_index(), this->service->client->address_str().c_str(), status);
   }
   return status;
 }
diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 68d9d873cd..3579d93c5a 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -11,6 +11,9 @@ namespace esp32_ble_client {
 static const char *const TAG = "esp32_ble_client";
 
 void BLEClientBase::setup() {
+  static uint8_t connection_index = 0;
+  this->connection_index_ = connection_index++;
+
   auto ret = esp_ble_gattc_app_register(this->app_id);
   if (ret) {
     ESP_LOGE(TAG, "gattc app register failed. app_id=%d code=%d", this->app_id, ret);
@@ -33,7 +36,7 @@ bool BLEClientBase::parse_device(const espbt::ESPBTDevice &device) {
   if (this->state_ != espbt::ClientState::IDLE && this->state_ != espbt::ClientState::SEARCHING)
     return false;
 
-  ESP_LOGD(TAG, "Found device at MAC address [%s]", device.address_str().c_str());
+  ESP_LOGD(TAG, "[%d] [%s] Found device", this->connection_index_, this->address_str_.c_str());
   this->set_state(espbt::ClientState::DISCOVERED);
 
   auto addr = device.address_uint64();
@@ -47,80 +50,88 @@ bool BLEClientBase::parse_device(const espbt::ESPBTDevice &device) {
   return true;
 }
 
-std::string BLEClientBase::address_str() const {
-  return str_snprintf("%02x:%02x:%02x:%02x:%02x:%02x", 17, (uint8_t)(this->address_ >> 40) & 0xff,
-                      (uint8_t)(this->address_ >> 32) & 0xff, (uint8_t)(this->address_ >> 24) & 0xff,
-                      (uint8_t)(this->address_ >> 16) & 0xff, (uint8_t)(this->address_ >> 8) & 0xff,
-                      (uint8_t)(this->address_ >> 0) & 0xff);
-}
-
 void BLEClientBase::connect() {
-  ESP_LOGI(TAG, "Attempting BLE connection to %s", this->address_str().c_str());
+  ESP_LOGI(TAG, "[%d] [%s] Attempting BLE connection", this->connection_index_, this->address_str_.c_str());
   auto ret = esp_ble_gattc_open(this->gattc_if_, this->remote_bda_, this->remote_addr_type_, true);
   if (ret) {
-    ESP_LOGW(TAG, "esp_ble_gattc_open error, address=%s status=%d", this->address_str().c_str(), ret);
+    ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_open error, status=%d", this->connection_index_, this->address_str_.c_str(),
+             ret);
     this->set_state(espbt::ClientState::IDLE);
   } else {
     this->set_state(espbt::ClientState::CONNECTING);
   }
 }
 
-void BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t esp_gattc_if,
+void BLEClientBase::disconnect() {
+  ESP_LOGI(TAG, "[%d] [%s] Disconnecting.", this->connection_index_, this->address_str_.c_str());
+  auto err = esp_ble_gattc_close(this->gattc_if_, this->conn_id_);
+  if (err != ESP_OK) {
+    ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_close error, err=%d", this->connection_index_, this->address_str_.c_str(),
+             err);
+  }
+
+  if (this->state_ == espbt::ClientState::SEARCHING) {
+    this->set_address(0);
+    this->set_state(espbt::ClientState::IDLE);
+  }
+}
+
+bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t esp_gattc_if,
                                         esp_ble_gattc_cb_param_t *param) {
   if (event == ESP_GATTC_REG_EVT && this->app_id != param->reg.app_id)
-    return;
+    return false;
   if (event != ESP_GATTC_REG_EVT && esp_gattc_if != ESP_GATT_IF_NONE && esp_gattc_if != this->gattc_if_)
-    return;
+    return false;
+
+  ESP_LOGV(TAG, "[%d] [%s] gattc_event_handler: event=%d gattc_if=%d", this->connection_index_,
+           this->address_str_.c_str(), event, esp_gattc_if);
 
   switch (event) {
     case ESP_GATTC_REG_EVT: {
       if (param->reg.status == ESP_GATT_OK) {
-        ESP_LOGV(TAG, "gattc registered app id %d", this->app_id);
+        ESP_LOGV(TAG, "[%d] [%s] gattc registered app id %d", this->connection_index_, this->address_str_.c_str(),
+                 this->app_id);
         this->gattc_if_ = esp_gattc_if;
       } else {
-        ESP_LOGE(TAG, "gattc app registration failed id=%d code=%d", param->reg.app_id, param->reg.status);
+        ESP_LOGE(TAG, "[%d] [%s] gattc app registration failed id=%d code=%d", this->connection_index_,
+                 this->address_str_.c_str(), param->reg.app_id, param->reg.status);
       }
       break;
     }
     case ESP_GATTC_OPEN_EVT: {
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_OPEN_EVT", this->address_str().c_str());
+      ESP_LOGV(TAG, "[%d] [%s] ESP_GATTC_OPEN_EVT", this->connection_index_, this->address_str_.c_str());
       this->conn_id_ = param->open.conn_id;
       if (param->open.status != ESP_GATT_OK && param->open.status != ESP_GATT_ALREADY_OPEN) {
-        ESP_LOGW(TAG, "connect to %s failed, status=%d", this->address_str().c_str(), param->open.status);
+        ESP_LOGW(TAG, "[%d] [%s] Connection failed, status=%d", this->connection_index_, this->address_str_.c_str(),
+                 param->open.status);
         this->set_state(espbt::ClientState::IDLE);
         break;
       }
-      break;
-    }
-    case ESP_GATTC_CONNECT_EVT: {
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_CONNECT_EVT", this->address_str().c_str());
-      if (this->conn_id_ != param->connect.conn_id) {
-        ESP_LOGD(TAG, "[%s] Unexpected conn_id in CONNECT_EVT: param conn=%d, open conn=%d",
-                 this->address_str().c_str(), param->connect.conn_id, this->conn_id_);
-      }
-      auto ret = esp_ble_gattc_send_mtu_req(this->gattc_if_, param->connect.conn_id);
+      auto ret = esp_ble_gattc_send_mtu_req(this->gattc_if_, param->open.conn_id);
       if (ret) {
-        ESP_LOGW(TAG, "esp_ble_gattc_send_mtu_req failed, status=%x", ret);
+        ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_send_mtu_req failed, status=%x", this->connection_index_,
+                 this->address_str_.c_str(), ret);
       }
       break;
     }
     case ESP_GATTC_CFG_MTU_EVT: {
       if (param->cfg_mtu.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "cfg_mtu to %s failed, mtu %d, status %d", this->address_str().c_str(), param->cfg_mtu.mtu,
-                 param->cfg_mtu.status);
+        ESP_LOGW(TAG, "[%d] [%s] cfg_mtu failed, mtu %d, status %d", this->connection_index_,
+                 this->address_str_.c_str(), param->cfg_mtu.mtu, param->cfg_mtu.status);
         this->set_state(espbt::ClientState::IDLE);
         break;
       }
-      ESP_LOGV(TAG, "cfg_mtu status %d, mtu %d", param->cfg_mtu.status, param->cfg_mtu.mtu);
+      ESP_LOGV(TAG, "[%d] [%s] cfg_mtu status %d, mtu %d", this->connection_index_, this->address_str_.c_str(),
+               param->cfg_mtu.status, param->cfg_mtu.mtu);
       this->mtu_ = param->cfg_mtu.mtu;
       esp_ble_gattc_search_service(esp_gattc_if, param->cfg_mtu.conn_id, nullptr);
       break;
     }
     case ESP_GATTC_DISCONNECT_EVT: {
-      if (memcmp(param->disconnect.remote_bda, this->remote_bda_, 6) != 0) {
-        return;
-      }
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_DISCONNECT_EVT, reason %d", this->address_str().c_str(), param->disconnect.reason);
+      if (memcmp(param->disconnect.remote_bda, this->remote_bda_, 6) != 0)
+        return false;
+      ESP_LOGV(TAG, "[%d] [%s] ESP_GATTC_DISCONNECT_EVT, reason %d", this->connection_index_,
+               this->address_str_.c_str(), param->disconnect.reason);
       for (auto &svc : this->services_)
         delete svc;  // NOLINT(cppcoreguidelines-owning-memory)
       this->services_.clear();
@@ -137,10 +148,12 @@ void BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       break;
     }
     case ESP_GATTC_SEARCH_CMPL_EVT: {
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_SEARCH_CMPL_EVT", this->address_str().c_str());
+      ESP_LOGV(TAG, "[%d] [%s] ESP_GATTC_SEARCH_CMPL_EVT", this->connection_index_, this->address_str_.c_str());
       for (auto &svc : this->services_) {
-        ESP_LOGI(TAG, "Service UUID: %s", svc->uuid.to_string().c_str());
-        ESP_LOGI(TAG, "  start_handle: 0x%x  end_handle: 0x%x", svc->start_handle, svc->end_handle);
+        ESP_LOGI(TAG, "[%d] [%s] Service UUID: %s", this->connection_index_, this->address_str_.c_str(),
+                 svc->uuid.to_string().c_str());
+        ESP_LOGI(TAG, "[%d] [%s]  start_handle: 0x%x  end_handle: 0x%x", this->connection_index_,
+                 this->address_str_.c_str(), svc->start_handle, svc->end_handle);
         svc->parse_characteristics();
       }
       this->set_state(espbt::ClientState::CONNECTED);
@@ -149,14 +162,10 @@ void BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
     }
     case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
       auto *descr = this->get_config_descriptor(param->reg_for_notify.handle);
-      if (descr == nullptr) {
-        ESP_LOGW(TAG, "No descriptor found for notify of handle 0x%x", param->reg_for_notify.handle);
-        break;
-      }
       if (descr->uuid.get_uuid().len != ESP_UUID_LEN_16 ||
           descr->uuid.get_uuid().uuid.uuid16 != ESP_GATT_UUID_CHAR_CLIENT_CONFIG) {
-        ESP_LOGW(TAG, "Handle 0x%x (uuid %s) is not a client config char uuid", param->reg_for_notify.handle,
-                 descr->uuid.to_string().c_str());
+        ESP_LOGW(TAG, "[%d] [%s] Handle 0x%x (uuid %s) is not a client config char uuid", this->connection_index_,
+                 this->address_str_.c_str(), param->reg_for_notify.handle, descr->uuid.to_string().c_str());
         break;
       }
       uint16_t notify_en = 1;
@@ -164,7 +173,8 @@ void BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
           esp_ble_gattc_write_char_descr(this->gattc_if_, this->conn_id_, descr->handle, sizeof(notify_en),
                                          (uint8_t *) &notify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
       if (status) {
-        ESP_LOGW(TAG, "esp_ble_gattc_write_char_descr error, status=%d", status);
+        ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_write_char_descr error, status=%d", this->connection_index_,
+                 this->address_str_.c_str(), status);
       }
       break;
     }
@@ -172,24 +182,28 @@ void BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
     default:
       break;
   }
+  return true;
 }
 
 void BLEClientBase::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
   switch (event) {
     // This event is sent by the server when it requests security
     case ESP_GAP_BLE_SEC_REQ_EVT:
-      ESP_LOGV(TAG, "ESP_GAP_BLE_SEC_REQ_EVT %x", event);
+      ESP_LOGV(TAG, "[%d] [%s] ESP_GAP_BLE_SEC_REQ_EVT %x", this->connection_index_, this->address_str_.c_str(), event);
       esp_ble_gap_security_rsp(param->ble_security.ble_req.bd_addr, true);
       break;
     // This event is sent once authentication has completed
     case ESP_GAP_BLE_AUTH_CMPL_EVT:
       esp_bd_addr_t bd_addr;
       memcpy(bd_addr, param->ble_security.auth_cmpl.bd_addr, sizeof(esp_bd_addr_t));
-      ESP_LOGI(TAG, "auth complete. remote BD_ADDR: %s", format_hex(bd_addr, 6).c_str());
+      ESP_LOGI(TAG, "[%d] [%s] auth complete. remote BD_ADDR: %s", this->connection_index_, this->address_str_.c_str(),
+               format_hex(bd_addr, 6).c_str());
       if (!param->ble_security.auth_cmpl.success) {
-        ESP_LOGE(TAG, "auth fail reason = 0x%x", param->ble_security.auth_cmpl.fail_reason);
+        ESP_LOGE(TAG, "[%d] [%s] auth fail reason = 0x%x", this->connection_index_, this->address_str_.c_str(),
+                 param->ble_security.auth_cmpl.fail_reason);
       } else {
-        ESP_LOGV(TAG, "auth success. address type = %d auth mode = %d", param->ble_security.auth_cmpl.addr_type,
+        ESP_LOGV(TAG, "[%d] [%s] auth success. address type = %d auth mode = %d", this->connection_index_,
+                 this->address_str_.c_str(), param->ble_security.auth_cmpl.addr_type,
                  param->ble_security.auth_cmpl.auth_mode);
       }
       break;
@@ -245,7 +259,8 @@ float BLEClientBase::parse_char_value(uint8_t *value, uint16_t length) {
                         (int32_t)(value[4]));
       }
   }
-  ESP_LOGW(TAG, "Cannot parse characteristic value of type 0x%x length %d", value[0], length);
+  ESP_LOGW(TAG, "[%d] [%s] Cannot parse characteristic value of type 0x%x length %d", this->connection_index_,
+           this->address_str_.c_str(), value[0], length);
   return NAN;
 }
 
diff --git a/esphome/components/esp32_ble_client/ble_client_base.h b/esphome/components/esp32_ble_client/ble_client_base.h
index eba70fa571..90cd8dbddc 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.h
+++ b/esphome/components/esp32_ble_client/ble_client_base.h
@@ -28,13 +28,27 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
 
   bool parse_device(const espbt::ESPBTDevice &device) override;
   void on_scan_end() override {}
-  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+  bool 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 connect() override;
+  void disconnect();
 
-  void set_address(uint64_t address) { this->address_ = address; }
-  std::string address_str() const;
+  bool connected() { return this->state_ == espbt::ClientState::ESTABLISHED; }
+
+  void set_address(uint64_t address) {
+    this->address_ = address;
+    if (address == 0) {
+      memset(this->remote_bda_, 0, sizeof(this->remote_bda_));
+      this->address_str_ = "";
+    } else {
+      this->address_str_ = str_snprintf("%02x:%02x:%02x:%02x:%02x:%02x", 17, (uint8_t)(this->address_ >> 40) & 0xff,
+                                        (uint8_t)(this->address_ >> 32) & 0xff, (uint8_t)(this->address_ >> 24) & 0xff,
+                                        (uint8_t)(this->address_ >> 16) & 0xff, (uint8_t)(this->address_ >> 8) & 0xff,
+                                        (uint8_t)(this->address_ >> 0) & 0xff);
+    }
+  }
+  std::string address_str() const { return this->address_str_; }
 
   BLEService *get_service(espbt::ESPBTUUID uuid);
   BLEService *get_service(uint16_t uuid);
@@ -55,12 +69,16 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
   uint16_t get_conn_id() const { return this->conn_id_; }
   uint64_t get_address() const { return this->address_; }
 
+  uint8_t get_connection_index() const { return this->connection_index_; }
+
  protected:
   int gattc_if_;
   esp_bd_addr_t remote_bda_;
   esp_ble_addr_type_t remote_addr_type_;
-  uint16_t conn_id_;
-  uint64_t address_;
+  uint16_t conn_id_{0xFFFF};
+  uint64_t address_{0};
+  std::string address_str_{};
+  uint8_t connection_index_;
   uint16_t mtu_{23};
 
   std::vector<BLEService *> services_;
diff --git a/esphome/components/esp32_ble_client/ble_service.cpp b/esphome/components/esp32_ble_client/ble_service.cpp
index 1d81eaa556..2f8a55f928 100644
--- a/esphome/components/esp32_ble_client/ble_service.cpp
+++ b/esphome/components/esp32_ble_client/ble_service.cpp
@@ -8,7 +8,7 @@
 namespace esphome {
 namespace esp32_ble_client {
 
-static const char *const TAG = "esp32_ble_client.service";
+static const char *const TAG = "esp32_ble_client";
 
 BLECharacteristic *BLEService::get_characteristic(espbt::ESPBTUUID uuid) {
   for (auto &chr : this->characteristics) {
@@ -40,7 +40,8 @@ void BLEService::parse_characteristics() {
       break;
     }
     if (status != ESP_GATT_OK) {
-      ESP_LOGW(TAG, "esp_ble_gattc_get_all_char error, status=%d", status);
+      ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_get_all_char error, status=%d", this->client->get_connection_index(),
+               this->client->address_str().c_str(), status);
       break;
     }
     if (count == 0) {
@@ -53,8 +54,9 @@ void BLEService::parse_characteristics() {
     characteristic->handle = result.char_handle;
     characteristic->service = this;
     this->characteristics.push_back(characteristic);
-    ESP_LOGI(TAG, " characteristic %s, handle 0x%x, properties 0x%x", characteristic->uuid.to_string().c_str(),
-             characteristic->handle, characteristic->properties);
+    ESP_LOGI(TAG, "[%d] [%s]  characteristic %s, handle 0x%x, properties 0x%x", this->client->get_connection_index(),
+             this->client->address_str().c_str(), characteristic->uuid.to_string().c_str(), characteristic->handle,
+             characteristic->properties);
     characteristic->parse_descriptors();
     offset++;
   }
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index dd08f07fd7..4fbf7b12e1 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -159,7 +159,7 @@ enum class ClientState {
 
 class ESPBTClient : public ESPBTDeviceListener {
  public:
-  virtual void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+  virtual bool gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                                    esp_ble_gattc_cb_param_t *param) = 0;
   virtual void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) = 0;
   virtual void connect() = 0;

From 0a649c184fbcaaf2d7f9247f15ccf8a149231833 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 3 Nov 2022 11:41:12 +1300
Subject: [PATCH 205/838] Always use gh releases in base platformio file
 (#3988)

---
 platformio.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 88cf176b72..ae0578de05 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -156,7 +156,8 @@ board_build.filesystem_size = 0.5m
 
 platform = https://github.com/maxgerhardt/platform-raspberrypi.git
 platform_packages =
-    earlephilhower/framework-arduinopico @ ~1.20400.0
+    ; earlephilhower/framework-arduinopico @ ~1.20602.0 ; Cannot use the platformio package until old releases stop getting deleted
+    earlephilhower/framework-arduinopico @ https://github.com/earlephilhower/arduino-pico/releases/download/2.6.2/rp2040-2.6.2.zip
 
 framework = arduino
 lib_deps =

From 04883e14f6cb439ea7a430ea74dd3c6855809a9f Mon Sep 17 00:00:00 2001
From: mbardeen <mbardeen@gmail.com>
Date: Thu, 3 Nov 2022 02:25:09 -0300
Subject: [PATCH 206/838] Allow the use of multiple RDM6300 devices (#3989)

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

diff --git a/esphome/components/rdm6300/__init__.py b/esphome/components/rdm6300/__init__.py
index 37ebcb49a9..f57eaaad6a 100644
--- a/esphome/components/rdm6300/__init__.py
+++ b/esphome/components/rdm6300/__init__.py
@@ -6,6 +6,7 @@ from esphome.const import CONF_ID, CONF_ON_TAG, CONF_TRIGGER_ID
 
 DEPENDENCIES = ["uart"]
 AUTO_LOAD = ["binary_sensor"]
+MULTI_CONF = True
 
 rdm6300_ns = cg.esphome_ns.namespace("rdm6300")
 RDM6300Component = rdm6300_ns.class_("RDM6300Component", cg.Component, uart.UARTDevice)

From 5cf257b251eddea46abd3b66378282061eed91eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Nov 2022 20:30:23 +1300
Subject: [PATCH 207/838] Bump aioesphomeapi from 10.13.0 to 11.4.2 (#3987)

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 7603f026d0..50502cfac7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.4  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
 esphome-dashboard==20221020.0
-aioesphomeapi==10.13.0
+aioesphomeapi==11.4.2
 zeroconf==0.39.1
 
 # esp-idf requires this, but doesn't bundle it by default

From 1554c5700e032d390b04a54434da7f2c0081c7dd Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 3 Nov 2022 20:47:19 +1300
Subject: [PATCH 208/838] rp2040: Set watchdog to reboot properly (#3991)

---
 esphome/components/rp2040/core.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/esphome/components/rp2040/core.cpp b/esphome/components/rp2040/core.cpp
index 2a1ce5a4d3..c20401c791 100644
--- a/esphome/components/rp2040/core.cpp
+++ b/esphome/components/rp2040/core.cpp
@@ -14,8 +14,9 @@ void IRAM_ATTR HOT delay(uint32_t ms) { ::delay(ms); }
 uint32_t IRAM_ATTR HOT micros() { return ::micros(); }
 void IRAM_ATTR HOT delayMicroseconds(uint32_t us) { delay_microseconds_safe(us); }
 void arch_restart() {
-  while (true) {  // NOLINT(clang-diagnostic-unreachable-code)
-    yield();
+  watchdog_reboot(0, 0, 10);
+  while (1) {
+    continue;
   }
 }
 void arch_init() { watchdog_enable(0x7fffff, false); }

From de7917181572004a9bc154393828a79dc59d88f9 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 7 Nov 2022 10:01:40 +1300
Subject: [PATCH 209/838] RP2040 uart support (#3990)

---
 esphome/components/logger/__init__.py         |  14 +-
 esphome/components/logger/logger.cpp          |  26 ++-
 esphome/components/logger/logger.h            |  17 +-
 esphome/components/uart/__init__.py           |   3 +
 .../components/uart/uart_component_rp2040.cpp | 184 ++++++++++++++++++
 .../components/uart/uart_component_rp2040.h   |  43 ++++
 6 files changed, 270 insertions(+), 17 deletions(-)
 create mode 100644 esphome/components/uart/uart_component_rp2040.cpp
 create mode 100644 esphome/components/uart/uart_component_rp2040.h

diff --git a/esphome/components/logger/__init__.py b/esphome/components/logger/__init__.py
index 333e109379..9f0fa22fc0 100644
--- a/esphome/components/logger/__init__.py
+++ b/esphome/components/logger/__init__.py
@@ -77,7 +77,7 @@ UART_SELECTION_ESP8266 = [UART0, UART0_SWAP, UART1]
 
 ESP_IDF_UARTS = [USB_CDC, USB_SERIAL_JTAG]
 
-UART_SELECTION_RP2040 = [UART0, UART1]
+UART_SELECTION_RP2040 = [USB_CDC, UART0, UART1]
 
 HARDWARE_UART_TO_UART_SELECTION = {
     UART0: logger_ns.UART_SELECTION_UART0,
@@ -99,10 +99,9 @@ is_log_level = cv.one_of(*LOG_LEVELS, upper=True)
 
 
 def uart_selection(value):
-    if value.upper() in ESP_IDF_UARTS:
-        if not CORE.using_esp_idf:
-            raise cv.Invalid(f"Only esp-idf framework supports {value}.")
     if CORE.is_esp32:
+        if value.upper() in ESP_IDF_UARTS and not CORE.using_esp_idf:
+            raise cv.Invalid(f"Only esp-idf framework supports {value}.")
         variant = get_esp32_variant()
         if variant in UART_SELECTION_ESP32:
             return cv.one_of(*UART_SELECTION_ESP32[variant], upper=True)(value)
@@ -137,7 +136,12 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_BAUD_RATE, default=115200): cv.positive_int,
             cv.Optional(CONF_TX_BUFFER_SIZE, default=512): cv.validate_bytes,
             cv.Optional(CONF_DEASSERT_RTS_DTR, default=False): cv.boolean,
-            cv.Optional(CONF_HARDWARE_UART, default=UART0): uart_selection,
+            cv.SplitDefault(
+                CONF_HARDWARE_UART,
+                esp8266=UART0,
+                esp32=UART0,
+                rp2040=USB_CDC,
+            ): uart_selection,
             cv.Optional(CONF_LEVEL, default="DEBUG"): is_log_level,
             cv.Optional(CONF_LOGS, default={}): cv.Schema(
                 {
diff --git a/esphome/components/logger/logger.cpp b/esphome/components/logger/logger.cpp
index 271f99ba58..8a3c6a951d 100644
--- a/esphome/components/logger/logger.cpp
+++ b/esphome/components/logger/logger.cpp
@@ -1,15 +1,15 @@
 #include "logger.h"
 
 #ifdef USE_ESP_IDF
-#include "freertos/FreeRTOS.h"
 #include <driver/uart.h>
-#endif
+#include "freertos/FreeRTOS.h"
+#endif  // USE_ESP_IDF
 
 #if defined(USE_ESP32_FRAMEWORK_ARDUINO) || defined(USE_ESP_IDF)
 #include <esp_log.h>
-#endif
-#include "esphome/core/log.h"
+#endif  // USE_ESP32_FRAMEWORK_ARDUINO || USE_ESP_IDF
 #include "esphome/core/hal.h"
+#include "esphome/core/log.h"
 
 namespace esphome {
 namespace logger {
@@ -161,8 +161,13 @@ void Logger::pre_setup() {
 #ifdef USE_ESP8266
       case UART_SELECTION_UART0_SWAP:
 #endif
+#ifdef USE_RP2040
+        this->hw_serial_ = &Serial1;
+        Serial1.begin(this->baud_rate_);
+#else
         this->hw_serial_ = &Serial;
         Serial.begin(this->baud_rate_);
+#endif
 #ifdef USE_ESP8266
         if (this->uart_ == UART_SELECTION_UART0_SWAP) {
           Serial.swap();
@@ -171,8 +176,13 @@ void Logger::pre_setup() {
 #endif
         break;
       case UART_SELECTION_UART1:
+#ifdef USE_RP2040
+        this->hw_serial_ = &Serial2;
+        Serial2.begin(this->baud_rate_);
+#else
         this->hw_serial_ = &Serial1;
         Serial1.begin(this->baud_rate_);
+#endif
 #ifdef USE_ESP8266
         Serial1.setDebugOutput(ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE);
 #endif
@@ -183,6 +193,12 @@ void Logger::pre_setup() {
         this->hw_serial_ = &Serial2;
         Serial2.begin(this->baud_rate_);
         break;
+#endif
+#ifdef USE_RP2040
+      case UART_SELECTION_USB_CDC:
+        this->hw_serial_ = &Serial;
+        Serial.begin(this->baud_rate_);
+        break;
 #endif
     }
 #endif  // USE_ARDUINO
@@ -271,7 +287,7 @@ const char *const UART_SELECTIONS[] = {
 const char *const UART_SELECTIONS[] = {"UART0", "UART1", "UART0_SWAP"};
 #endif
 #ifdef USE_RP2040
-const char *const UART_SELECTIONS[] = {"UART0", "UART1"};
+const char *const UART_SELECTIONS[] = {"UART0", "UART1", "USB_CDC"};
 #endif  // USE_ESP8266
 void Logger::dump_config() {
   ESP_LOGCONFIG(TAG, "Logger:");
diff --git a/esphome/components/logger/logger.h b/esphome/components/logger/logger.h
index 0251faf987..0e12acacd8 100644
--- a/esphome/components/logger/logger.h
+++ b/esphome/components/logger/logger.h
@@ -18,7 +18,7 @@
 
 #ifdef USE_ESP_IDF
 #include <driver/uart.h>
-#endif
+#endif  // USE_ESP_IDF
 
 namespace esphome {
 
@@ -34,19 +34,22 @@ enum UARTSelection {
 #if defined(USE_ESP32)
 #if !defined(USE_ESP32_VARIANT_ESP32C3) && !defined(USE_ESP32_VARIANT_ESP32S2) && !defined(USE_ESP32_VARIANT_ESP32S3)
   UART_SELECTION_UART2,
-#endif
+#endif  // !USE_ESP32_VARIANT_ESP32C3 && !USE_ESP32_VARIANT_ESP32S2 && !USE_ESP32_VARIANT_ESP32S3
 #ifdef USE_ESP_IDF
 #if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
   UART_SELECTION_USB_CDC,
-#endif
+#endif  // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3
 #if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S3)
   UART_SELECTION_USB_SERIAL_JTAG,
-#endif
-#endif
-#endif
+#endif  // USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32S3
+#endif  // USE_ESP_IDF
+#endif  // USE_ESP32
 #ifdef USE_ESP8266
   UART_SELECTION_UART0_SWAP,
-#endif
+#endif  // USE_ESP8266
+#ifdef USE_RP2040
+  UART_SELECTION_USB_CDC,
+#endif  // USE_RP2040
 };
 
 class Logger : public Component {
diff --git a/esphome/components/uart/__init__.py b/esphome/components/uart/__init__.py
index a63b220fc7..01a1049568 100644
--- a/esphome/components/uart/__init__.py
+++ b/esphome/components/uart/__init__.py
@@ -41,6 +41,7 @@ ESP32ArduinoUARTComponent = uart_ns.class_(
 ESP8266UartComponent = uart_ns.class_(
     "ESP8266UartComponent", UARTComponent, cg.Component
 )
+RP2040UartComponent = uart_ns.class_("RP2040UartComponent", UARTComponent, cg.Component)
 
 UARTDevice = uart_ns.class_("UARTDevice")
 UARTWriteAction = uart_ns.class_("UARTWriteAction", automation.Action)
@@ -89,6 +90,8 @@ def _uart_declare_type(value):
             return cv.declare_id(ESP32ArduinoUARTComponent)(value)
         if CORE.using_esp_idf:
             return cv.declare_id(IDFUARTComponent)(value)
+    if CORE.is_rp2040:
+        return cv.declare_id(RP2040UartComponent)(value)
     raise NotImplementedError
 
 
diff --git a/esphome/components/uart/uart_component_rp2040.cpp b/esphome/components/uart/uart_component_rp2040.cpp
new file mode 100644
index 0000000000..e2c47080ac
--- /dev/null
+++ b/esphome/components/uart/uart_component_rp2040.cpp
@@ -0,0 +1,184 @@
+#ifdef USE_RP2040
+#include "uart_component_rp2040.h"
+#include "esphome/core/application.h"
+#include "esphome/core/defines.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+#include <hardware/uart.h>
+
+#ifdef USE_LOGGER
+#include "esphome/components/logger/logger.h"
+#endif
+
+namespace esphome {
+namespace uart {
+
+static const char *const TAG = "uart.arduino_rp2040";
+
+uint16_t RP2040UartComponent::get_config() {
+  uint16_t config = 0;
+
+  if (this->parity_ == UART_CONFIG_PARITY_NONE) {
+    config |= UART_PARITY_NONE;
+  } else if (this->parity_ == UART_CONFIG_PARITY_EVEN) {
+    config |= UART_PARITY_EVEN;
+  } else if (this->parity_ == UART_CONFIG_PARITY_ODD) {
+    config |= UART_PARITY_ODD;
+  }
+
+  switch (this->data_bits_) {
+    case 5:
+      config |= SERIAL_DATA_5;
+      break;
+    case 6:
+      config |= SERIAL_DATA_6;
+      break;
+    case 7:
+      config |= SERIAL_DATA_7;
+      break;
+    case 8:
+      config |= SERIAL_DATA_8;
+      break;
+  }
+
+  if (this->stop_bits_ == 1) {
+    config |= SERIAL_STOP_BIT_1;
+  } else {
+    config |= SERIAL_STOP_BIT_2;
+  }
+
+  return config;
+}
+
+void RP2040UartComponent::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up UART bus...");
+
+  uint16_t config = get_config();
+
+  constexpr uint32_t valid_tx_uart_0 = __bitset({0, 12, 16, 28});
+  constexpr uint32_t valid_tx_uart_1 = __bitset({4, 8, 20, 24});
+
+  constexpr uint32_t valid_rx_uart_0 = __bitset({1, 13, 17, 29});
+  constexpr uint32_t valid_rx_uart_1 = __bitset({5, 9, 21, 25});
+
+  int8_t tx_hw = -1;
+  int8_t rx_hw = -1;
+
+  if (this->tx_pin_ != nullptr) {
+    if (this->tx_pin_->is_inverted()) {
+      ESP_LOGD(TAG, "An inverted TX pin %u can only be used with SerialPIO", this->tx_pin_->get_pin());
+    } else {
+      if (((1 << this->tx_pin_->get_pin()) & valid_tx_uart_0) != 0) {
+        tx_hw = 0;
+      } else if (((1 << this->tx_pin_->get_pin()) & valid_tx_uart_1) != 0) {
+        tx_hw = 1;
+      } else {
+        ESP_LOGD(TAG, "TX pin %u can only be used with SerialPIO", this->tx_pin_->get_pin());
+      }
+    }
+  }
+
+  if (this->rx_pin_ != nullptr) {
+    if (this->rx_pin_->is_inverted()) {
+      ESP_LOGD(TAG, "An inverted RX pin %u can only be used with SerialPIO", this->rx_pin_->get_pin());
+    } else {
+      if (((1 << this->rx_pin_->get_pin()) & valid_rx_uart_0) != 0) {
+        rx_hw = 0;
+      } else if (((1 << this->rx_pin_->get_pin()) & valid_rx_uart_1) != 0) {
+        rx_hw = 1;
+      } else {
+        ESP_LOGD(TAG, "RX pin %u can only be used with SerialPIO", this->rx_pin_->get_pin());
+      }
+    }
+  }
+
+#ifdef USE_LOGGER
+  if (tx_hw == rx_hw && logger::global_logger->get_uart() == tx_hw) {
+    ESP_LOGD(TAG, "Using SerialPIO as UART%d is taken by the logger", tx_hw);
+    tx_hw = -1;
+    rx_hw = -1;
+  }
+#endif
+
+  if (tx_hw == -1 || rx_hw == -1 || tx_hw != rx_hw) {
+    ESP_LOGV(TAG, "Using SerialPIO");
+    pin_size_t tx = this->tx_pin_ == nullptr ? SerialPIO::NOPIN : this->tx_pin_->get_pin();
+    pin_size_t rx = this->rx_pin_ == nullptr ? SerialPIO::NOPIN : this->rx_pin_->get_pin();
+    auto *serial = new SerialPIO(tx, rx, this->rx_buffer_size_);  // NOLINT(cppcoreguidelines-owning-memory)
+    serial->begin(this->baud_rate_, config);
+    if (this->tx_pin_ != nullptr && this->tx_pin_->is_inverted())
+      gpio_set_outover(tx, GPIO_OVERRIDE_INVERT);
+    if (this->rx_pin_ != nullptr && this->rx_pin_->is_inverted())
+      gpio_set_inover(rx, GPIO_OVERRIDE_INVERT);
+    this->serial_ = serial;
+  } else {
+    ESP_LOGV(TAG, "Using Hardware Serial");
+    SerialUART *serial;
+    if (tx_hw == 0) {
+      serial = &Serial1;
+    } else {
+      serial = &Serial2;
+    }
+    serial->setTX(this->tx_pin_->get_pin());
+    serial->setRX(this->rx_pin_->get_pin());
+    serial->setFIFOSize(this->rx_buffer_size_);
+    serial->begin(this->baud_rate_, config);
+    this->serial_ = serial;
+    this->hw_serial_ = true;
+  }
+}
+
+void RP2040UartComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "UART Bus:");
+  LOG_PIN("  TX Pin: ", tx_pin_);
+  LOG_PIN("  RX Pin: ", rx_pin_);
+  if (this->rx_pin_ != nullptr) {
+    ESP_LOGCONFIG(TAG, "  RX Buffer Size: %u", this->rx_buffer_size_);
+  }
+  ESP_LOGCONFIG(TAG, "  Baud Rate: %u baud", this->baud_rate_);
+  ESP_LOGCONFIG(TAG, "  Data Bits: %u", this->data_bits_);
+  ESP_LOGCONFIG(TAG, "  Parity: %s", LOG_STR_ARG(parity_to_str(this->parity_)));
+  ESP_LOGCONFIG(TAG, "  Stop bits: %u", this->stop_bits_);
+  if (this->hw_serial_) {
+    ESP_LOGCONFIG(TAG, "  Using hardware serial");
+  } else {
+    ESP_LOGCONFIG(TAG, "  Using SerialPIO");
+  }
+}
+
+void RP2040UartComponent::write_array(const uint8_t *data, size_t len) {
+  this->serial_->write(data, len);
+#ifdef USE_UART_DEBUGGER
+  for (size_t i = 0; i < len; i++) {
+    this->debug_callback_.call(UART_DIRECTION_TX, data[i]);
+  }
+#endif
+}
+bool RP2040UartComponent::peek_byte(uint8_t *data) {
+  if (!this->check_read_timeout_())
+    return false;
+  *data = this->serial_->peek();
+  return true;
+}
+bool RP2040UartComponent::read_array(uint8_t *data, size_t len) {
+  if (!this->check_read_timeout_(len))
+    return false;
+  this->serial_->readBytes(data, len);
+#ifdef USE_UART_DEBUGGER
+  for (size_t i = 0; i < len; i++) {
+    this->debug_callback_.call(UART_DIRECTION_RX, data[i]);
+  }
+#endif
+  return true;
+}
+int RP2040UartComponent::available() { return this->serial_->available(); }
+void RP2040UartComponent::flush() {
+  ESP_LOGVV(TAG, "    Flushing...");
+  this->serial_->flush();
+}
+
+}  // namespace uart
+}  // namespace esphome
+
+#endif  // USE_RP2040
diff --git a/esphome/components/uart/uart_component_rp2040.h b/esphome/components/uart/uart_component_rp2040.h
new file mode 100644
index 0000000000..163315dee7
--- /dev/null
+++ b/esphome/components/uart/uart_component_rp2040.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#ifdef USE_RP2040
+
+#include <SerialPIO.h>
+#include <SerialUART.h>
+
+#include <vector>
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+#include "uart_component.h"
+
+namespace esphome {
+namespace uart {
+
+class RP2040UartComponent : public UARTComponent, public Component {
+ public:
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::BUS; }
+
+  void write_array(const uint8_t *data, size_t len) override;
+
+  bool peek_byte(uint8_t *data) override;
+  bool read_array(uint8_t *data, size_t len) override;
+
+  int available() override;
+  void flush() override;
+
+  uint16_t get_config();
+
+ protected:
+  void check_logger_conflict() override {}
+  bool hw_serial_{false};
+
+  HardwareSerial *serial_{nullptr};
+};
+
+}  // namespace uart
+}  // namespace esphome
+
+#endif  // USE_RP2040

From 90683223dd8d351397485e58cbb2a3a23f359193 Mon Sep 17 00:00:00 2001
From: tomaszduda23 <tomaszduda23@gmail.com>
Date: Mon, 7 Nov 2022 00:58:56 +0100
Subject: [PATCH 210/838] add uart number to LOGCONFIG (#3996)

---
 esphome/components/uart/uart_component_esp32_arduino.cpp | 3 ++-
 esphome/components/uart/uart_component_esp32_arduino.h   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/esphome/components/uart/uart_component_esp32_arduino.cpp b/esphome/components/uart/uart_component_esp32_arduino.cpp
index a67e5354fb..402e41e0b5 100644
--- a/esphome/components/uart/uart_component_esp32_arduino.cpp
+++ b/esphome/components/uart/uart_component_esp32_arduino.cpp
@@ -90,6 +90,7 @@ void ESP32ArduinoUARTComponent::setup() {
     this->hw_serial_ = &Serial;
   } else {
     static uint8_t next_uart_num = 1;
+    this->number_ = next_uart_num;
     this->hw_serial_ = new HardwareSerial(next_uart_num++);  // NOLINT(cppcoreguidelines-owning-memory)
   }
   int8_t tx = this->tx_pin_ != nullptr ? this->tx_pin_->get_pin() : -1;
@@ -104,7 +105,7 @@ void ESP32ArduinoUARTComponent::setup() {
 }
 
 void ESP32ArduinoUARTComponent::dump_config() {
-  ESP_LOGCONFIG(TAG, "UART Bus:");
+  ESP_LOGCONFIG(TAG, "UART Bus %d:", this->number_);
   LOG_PIN("  TX Pin: ", tx_pin_);
   LOG_PIN("  RX Pin: ", rx_pin_);
   if (this->rx_pin_ != nullptr) {
diff --git a/esphome/components/uart/uart_component_esp32_arduino.h b/esphome/components/uart/uart_component_esp32_arduino.h
index c6f445ff12..4a000b12d2 100644
--- a/esphome/components/uart/uart_component_esp32_arduino.h
+++ b/esphome/components/uart/uart_component_esp32_arduino.h
@@ -32,6 +32,7 @@ class ESP32ArduinoUARTComponent : public UARTComponent, public Component {
   void check_logger_conflict() override;
 
   HardwareSerial *hw_serial_{nullptr};
+  uint8_t number_{0};
 };
 
 }  // namespace uart

From 2c76381fcd754dc3ee4707cad38172c98c46c0d0 Mon Sep 17 00:00:00 2001
From: Stanislav Meduna <stano@meduna.org>
Date: Mon, 7 Nov 2022 07:00:55 +0100
Subject: [PATCH 211/838] Implement a simple LCD menu (#3406)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                                    |   2 +
 .../components/display_menu_base/__init__.py  | 430 ++++++++++++++++++
 .../components/display_menu_base/automation.h | 133 ++++++
 .../display_menu_base/display_menu_base.cpp   | 315 +++++++++++++
 .../display_menu_base/display_menu_base.h     |  77 ++++
 .../display_menu_base/menu_item.cpp           | 179 ++++++++
 .../components/display_menu_base/menu_item.h  | 187 ++++++++
 esphome/components/lcd_menu/__init__.py       |  74 +++
 esphome/components/lcd_menu/lcd_menu.cpp      |  74 +++
 esphome/components/lcd_menu/lcd_menu.h        |  45 ++
 tests/test1.yaml                              |  95 ++++
 11 files changed, 1611 insertions(+)
 create mode 100644 esphome/components/display_menu_base/__init__.py
 create mode 100644 esphome/components/display_menu_base/automation.h
 create mode 100644 esphome/components/display_menu_base/display_menu_base.cpp
 create mode 100644 esphome/components/display_menu_base/display_menu_base.h
 create mode 100644 esphome/components/display_menu_base/menu_item.cpp
 create mode 100644 esphome/components/display_menu_base/menu_item.h
 create mode 100644 esphome/components/lcd_menu/__init__.py
 create mode 100644 esphome/components/lcd_menu/lcd_menu.cpp
 create mode 100644 esphome/components/lcd_menu/lcd_menu.h

diff --git a/CODEOWNERS b/CODEOWNERS
index ac793e19af..1da55891fd 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -65,6 +65,7 @@ esphome/components/debug/* @OttoWinter
 esphome/components/delonghi/* @grob6000
 esphome/components/dfplayer/* @glmnet
 esphome/components/dht/* @OttoWinter
+esphome/components/display_menu_base/* @numo68
 esphome/components/dps310/* @kbx81
 esphome/components/ds1307/* @badbadc0ffee
 esphome/components/dsmr/* @glmnet @zuidwijk
@@ -110,6 +111,7 @@ esphome/components/integration/* @OttoWinter
 esphome/components/interval/* @esphome/core
 esphome/components/json/* @OttoWinter
 esphome/components/kalman_combinator/* @Cat-Ion
+esphome/components/lcd_menu/* @numo68
 esphome/components/ledc/* @OttoWinter
 esphome/components/light/* @esphome/core
 esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
diff --git a/esphome/components/display_menu_base/__init__.py b/esphome/components/display_menu_base/__init__.py
new file mode 100644
index 0000000000..eb66737fdb
--- /dev/null
+++ b/esphome/components/display_menu_base/__init__.py
@@ -0,0 +1,430 @@
+import re
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import automation, core
+from esphome.const import (
+    CONF_ID,
+    CONF_TYPE,
+    CONF_TRIGGER_ID,
+    CONF_ON_VALUE,
+    CONF_COMMAND,
+    CONF_NUMBER,
+    CONF_FORMAT,
+    CONF_MODE,
+    CONF_ACTIVE,
+)
+from esphome.automation import maybe_simple_id
+from esphome.components.select import Select
+from esphome.components.number import Number
+from esphome.components.switch import Switch
+
+CODEOWNERS = ["@numo68"]
+
+display_menu_base_ns = cg.esphome_ns.namespace("display_menu_base")
+
+CONF_DISPLAY_ID = "display_id"
+
+CONF_ROTARY = "rotary"
+CONF_JOYSTICK = "joystick"
+CONF_LABEL = "label"
+CONF_MENU = "menu"
+CONF_BACK = "back"
+CONF_TEXT = "text"
+CONF_SELECT = "select"
+CONF_SWITCH = "switch"
+CONF_CUSTOM = "custom"
+CONF_ITEMS = "items"
+CONF_ON_TEXT = "on_text"
+CONF_OFF_TEXT = "off_text"
+CONF_VALUE_LAMBDA = "value_lambda"
+CONF_IMMEDIATE_EDIT = "immediate_edit"
+CONF_ROOT_ITEM_ID = "root_item_id"
+CONF_ON_ENTER = "on_enter"
+CONF_ON_LEAVE = "on_leave"
+CONF_ON_NEXT = "on_next"
+CONF_ON_PREV = "on_prev"
+
+DisplayMenuComponent = display_menu_base_ns.class_("DisplayMenuComponent", cg.Component)
+
+MenuItem = display_menu_base_ns.class_("MenuItem")
+MenuItemConstPtr = MenuItem.operator("ptr").operator("const")
+MenuItemMenu = display_menu_base_ns.class_("MenuItemMenu")
+MenuItemSelect = display_menu_base_ns.class_("MenuItemSelect")
+MenuItemNumber = display_menu_base_ns.class_("MenuItemNumber")
+MenuItemSwitch = display_menu_base_ns.class_("MenuItemSwitch")
+MenuItemCommand = display_menu_base_ns.class_("MenuItemCommand")
+MenuItemCustom = display_menu_base_ns.class_("MenuItemCustom")
+
+UpAction = display_menu_base_ns.class_("UpAction", automation.Action)
+DownAction = display_menu_base_ns.class_("DownAction", automation.Action)
+LeftAction = display_menu_base_ns.class_("LeftAction", automation.Action)
+RightAction = display_menu_base_ns.class_("RightAction", automation.Action)
+EnterAction = display_menu_base_ns.class_("EnterAction", automation.Action)
+ShowAction = display_menu_base_ns.class_("ShowAction", automation.Action)
+HideAction = display_menu_base_ns.class_("HideAction", automation.Action)
+ShowMainAction = display_menu_base_ns.class_("ShowMainAction", automation.Action)
+
+IsActiveCondition = display_menu_base_ns.class_(
+    "IsActiveCondition", automation.Condition
+)
+
+MULTI_CONF = True
+
+MenuItemType = display_menu_base_ns.enum("MenuItemType")
+
+MENU_ITEM_TYPES = {
+    CONF_LABEL: MenuItemType.MENU_ITEM_LABEL,
+    CONF_MENU: MenuItemType.MENU_ITEM_MENU,
+    CONF_BACK: MenuItemType.MENU_ITEM_BACK,
+    CONF_SELECT: MenuItemType.MENU_ITEM_SELECT,
+    CONF_NUMBER: MenuItemType.MENU_ITEM_NUMBER,
+    CONF_SWITCH: MenuItemType.MENU_ITEM_SWITCH,
+    CONF_COMMAND: MenuItemType.MENU_ITEM_COMMAND,
+    CONF_CUSTOM: MenuItemType.MENU_ITEM_CUSTOM,
+}
+
+MENU_ITEMS_WITH_SPECIALIZED_CLASSES = (
+    CONF_MENU,
+    CONF_SELECT,
+    CONF_NUMBER,
+    CONF_SWITCH,
+    CONF_COMMAND,
+    CONF_CUSTOM,
+)
+
+MenuMode = display_menu_base_ns.enum("MenuMode")
+
+MENU_MODES = {
+    CONF_ROTARY: MenuMode.MENU_MODE_ROTARY,
+    CONF_JOYSTICK: MenuMode.MENU_MODE_JOYSTICK,
+}
+
+DisplayMenuOnEnterTrigger = display_menu_base_ns.class_(
+    "DisplayMenuOnEnterTrigger", automation.Trigger
+)
+
+DisplayMenuOnLeaveTrigger = display_menu_base_ns.class_(
+    "DisplayMenuOnLeaveTrigger", automation.Trigger
+)
+
+DisplayMenuOnValueTrigger = display_menu_base_ns.class_(
+    "DisplayMenuOnValueTrigger", automation.Trigger
+)
+
+DisplayMenuOnNextTrigger = display_menu_base_ns.class_(
+    "DisplayMenuOnNextTrigger", automation.Trigger
+)
+
+DisplayMenuOnPrevTrigger = display_menu_base_ns.class_(
+    "DisplayMenuOnPrevTrigger", automation.Trigger
+)
+
+
+def validate_format(format):
+    if re.search(r"^%([+-])*(\d+)*(\.\d+)*[fg]$", format) is None:
+        raise cv.Invalid(
+            f"{CONF_FORMAT}: has to specify a printf-like format string specifying exactly one f or g type conversion, '{format}' provided"
+        )
+
+    return format
+
+
+# Use a simple indirection to circumvent the recursion limitation
+def menu_item_schema(value):
+    return MENU_ITEM_SCHEMA(value)
+
+
+MENU_ITEM_COMMON_SCHEMA = cv.Schema(
+    {
+        cv.Optional(CONF_TEXT): cv.templatable(cv.string),
+    }
+)
+
+MENU_ITEM_ENTER_LEAVE_SCHEMA = MENU_ITEM_COMMON_SCHEMA.extend(
+    {
+        cv.Optional(CONF_ON_ENTER): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                    DisplayMenuOnEnterTrigger
+                ),
+            }
+        ),
+        cv.Optional(CONF_ON_LEAVE): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                    DisplayMenuOnLeaveTrigger
+                ),
+            }
+        ),
+    }
+)
+
+MENU_ITEM_VALUE_SCHEMA = MENU_ITEM_COMMON_SCHEMA.extend(
+    {
+        cv.Optional(CONF_ON_VALUE): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                    DisplayMenuOnValueTrigger
+                ),
+            }
+        ),
+    }
+)
+
+MENU_ITEM_ENTER_LEAVE_VALUE_SCHEMA = MENU_ITEM_ENTER_LEAVE_SCHEMA.extend(
+    {
+        cv.Optional(CONF_ON_VALUE): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                    DisplayMenuOnValueTrigger
+                ),
+            }
+        ),
+    }
+)
+
+MENU_ITEM_SCHEMA = cv.typed_schema(
+    {
+        CONF_LABEL: MENU_ITEM_COMMON_SCHEMA.extend(
+            {
+                cv.GenerateID(CONF_ID): cv.declare_id(MenuItem),
+            }
+        ),
+        CONF_BACK: MENU_ITEM_COMMON_SCHEMA.extend(
+            {
+                cv.GenerateID(CONF_ID): cv.declare_id(MenuItem),
+            }
+        ),
+        CONF_MENU: MENU_ITEM_ENTER_LEAVE_SCHEMA.extend(
+            {
+                cv.GenerateID(CONF_ID): cv.declare_id(MenuItemMenu),
+                cv.Required(CONF_ITEMS): cv.All(
+                    cv.ensure_list(menu_item_schema), cv.Length(min=1)
+                ),
+            }
+        ),
+        CONF_SELECT: MENU_ITEM_ENTER_LEAVE_VALUE_SCHEMA.extend(
+            {
+                cv.GenerateID(CONF_ID): cv.declare_id(MenuItemSelect),
+                cv.Required(CONF_SELECT): cv.use_id(Select),
+                cv.Optional(CONF_IMMEDIATE_EDIT, default=False): cv.boolean,
+                cv.Optional(CONF_VALUE_LAMBDA): cv.returning_lambda,
+            }
+        ),
+        CONF_NUMBER: MENU_ITEM_ENTER_LEAVE_VALUE_SCHEMA.extend(
+            {
+                cv.GenerateID(CONF_ID): cv.declare_id(MenuItemNumber),
+                cv.Required(CONF_NUMBER): cv.use_id(Number),
+                cv.Optional(CONF_IMMEDIATE_EDIT, default=False): cv.boolean,
+                cv.Optional(CONF_FORMAT, default="%.1f"): cv.All(
+                    cv.string_strict,
+                    validate_format,
+                ),
+                cv.Optional(CONF_VALUE_LAMBDA): cv.returning_lambda,
+            }
+        ),
+        CONF_SWITCH: MENU_ITEM_ENTER_LEAVE_VALUE_SCHEMA.extend(
+            {
+                cv.GenerateID(CONF_ID): cv.declare_id(MenuItemSwitch),
+                cv.Required(CONF_SWITCH): cv.use_id(Switch),
+                cv.Optional(CONF_IMMEDIATE_EDIT, default=False): cv.boolean,
+                cv.Optional(CONF_ON_TEXT, default="On"): cv.string_strict,
+                cv.Optional(CONF_OFF_TEXT, default="Off"): cv.string_strict,
+                cv.Optional(CONF_VALUE_LAMBDA): cv.returning_lambda,
+            }
+        ),
+        CONF_COMMAND: MENU_ITEM_VALUE_SCHEMA.extend(
+            {
+                cv.GenerateID(CONF_ID): cv.declare_id(MenuItemCommand),
+            }
+        ),
+        CONF_CUSTOM: MENU_ITEM_ENTER_LEAVE_VALUE_SCHEMA.extend(
+            {
+                cv.GenerateID(CONF_ID): cv.declare_id(MenuItemCustom),
+                cv.Optional(CONF_IMMEDIATE_EDIT, default=False): cv.boolean,
+                cv.Optional(CONF_VALUE_LAMBDA): cv.returning_lambda,
+                cv.Optional(CONF_ON_NEXT): automation.validate_automation(
+                    {
+                        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                            DisplayMenuOnNextTrigger
+                        ),
+                    }
+                ),
+                cv.Optional(CONF_ON_PREV): automation.validate_automation(
+                    {
+                        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                            DisplayMenuOnPrevTrigger
+                        ),
+                    }
+                ),
+            }
+        ),
+    },
+    default_type="label",
+    lower=True,
+)
+
+DISPLAY_MENU_BASE_SCHEMA = cv.Schema(
+    {
+        cv.Optional(CONF_ACTIVE, default=True): cv.boolean,
+        cv.GenerateID(CONF_ROOT_ITEM_ID): cv.declare_id(MenuItemMenu),
+        cv.Optional(CONF_MODE, default=CONF_ROTARY): cv.enum(MENU_MODES),
+        cv.Optional(CONF_ON_ENTER): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                    DisplayMenuOnEnterTrigger
+                ),
+            }
+        ),
+        cv.Optional(CONF_ON_LEAVE): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                    DisplayMenuOnLeaveTrigger
+                ),
+            }
+        ),
+        cv.Required(CONF_ITEMS): cv.All(
+            cv.ensure_list(MENU_ITEM_SCHEMA), cv.Length(min=1)
+        ),
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+MENU_ACTION_SCHEMA = maybe_simple_id(
+    {
+        cv.GenerateID(CONF_ID): cv.use_id(DisplayMenuComponent),
+    }
+)
+
+
+@automation.register_action("display_menu.up", UpAction, MENU_ACTION_SCHEMA)
+async def menu_up_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)
+
+
+@automation.register_action("display_menu.down", DownAction, MENU_ACTION_SCHEMA)
+async def menu_down_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)
+
+
+@automation.register_action("display_menu.left", LeftAction, MENU_ACTION_SCHEMA)
+async def menu_left_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)
+
+
+@automation.register_action("display_menu.right", RightAction, MENU_ACTION_SCHEMA)
+async def menu_right_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)
+
+
+@automation.register_action("display_menu.enter", EnterAction, MENU_ACTION_SCHEMA)
+async def menu_enter_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)
+
+
+@automation.register_action("display_menu.show", ShowAction, MENU_ACTION_SCHEMA)
+async def menu_show_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)
+
+
+@automation.register_action("display_menu.hide", HideAction, MENU_ACTION_SCHEMA)
+async def menu_hide_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)
+
+
+@automation.register_action(
+    "display_menu.show_main", ShowMainAction, MENU_ACTION_SCHEMA
+)
+async def menu_show_main_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)
+
+
+@automation.register_condition(
+    "display_menu.is_active",
+    IsActiveCondition,
+    automation.maybe_simple_id(
+        {
+            cv.GenerateID(CONF_ID): cv.use_id(DisplayMenuComponent),
+        }
+    ),
+)
+async def display_menu_is_active_to_code(config, condition_id, template_arg, args):
+    paren = await cg.get_variable(config[CONF_ID])
+    return cg.new_Pvariable(condition_id, template_arg, paren)
+
+
+async def menu_item_to_code(menu, config, parent):
+    if config[CONF_TYPE] in MENU_ITEMS_WITH_SPECIALIZED_CLASSES:
+        item = cg.new_Pvariable(config[CONF_ID])
+    else:
+        item = cg.new_Pvariable(config[CONF_ID], MENU_ITEM_TYPES[config[CONF_TYPE]])
+    cg.add(parent.add_item(item))
+    if CONF_TEXT in config:
+        if isinstance(config[CONF_TEXT], core.Lambda):
+            template_ = await cg.templatable(
+                config[CONF_TEXT], [(MenuItemConstPtr, "it")], cg.std_string
+            )
+            cg.add(item.set_text(template_))
+        else:
+            cg.add(item.set_text(config[CONF_TEXT]))
+    if CONF_VALUE_LAMBDA in config:
+        template_ = await cg.process_lambda(
+            config[CONF_VALUE_LAMBDA],
+            [(MenuItemConstPtr, "it")],
+            return_type=cg.std_string,
+        )
+        cg.add(item.set_value_lambda(template_))
+    if CONF_ITEMS in config:
+        for c in config[CONF_ITEMS]:
+            await menu_item_to_code(menu, c, item)
+    if CONF_IMMEDIATE_EDIT in config:
+        cg.add(item.set_immediate_edit(config[CONF_IMMEDIATE_EDIT]))
+    if config[CONF_TYPE] == CONF_SELECT:
+        var = await cg.get_variable(config[CONF_SELECT])
+        cg.add(item.set_select_variable(var))
+    if config[CONF_TYPE] == CONF_NUMBER:
+        var = await cg.get_variable(config[CONF_NUMBER])
+        cg.add(item.set_number_variable(var))
+        cg.add(item.set_format(config[CONF_FORMAT]))
+    if config[CONF_TYPE] == CONF_SWITCH:
+        var = await cg.get_variable(config[CONF_SWITCH])
+        cg.add(item.set_switch_variable(var))
+        cg.add(item.set_on_text(config[CONF_ON_TEXT]))
+        cg.add(item.set_off_text(config[CONF_OFF_TEXT]))
+    for conf in config.get(CONF_ON_ENTER, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], item)
+        await automation.build_automation(trigger, [(MenuItemConstPtr, "it")], conf)
+    for conf in config.get(CONF_ON_LEAVE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], item)
+        await automation.build_automation(trigger, [(MenuItemConstPtr, "it")], conf)
+    for conf in config.get(CONF_ON_VALUE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], item)
+        await automation.build_automation(trigger, [(MenuItemConstPtr, "it")], conf)
+    for conf in config.get(CONF_ON_NEXT, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], item)
+        await automation.build_automation(trigger, [(MenuItemConstPtr, "it")], conf)
+    for conf in config.get(CONF_ON_PREV, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], item)
+        await automation.build_automation(trigger, [(MenuItemConstPtr, "it")], conf)
+
+
+async def display_menu_to_code(menu, config):
+    cg.add(menu.set_active(config[CONF_ACTIVE]))
+    root_item = cg.new_Pvariable(config[CONF_ROOT_ITEM_ID])
+    cg.add(menu.set_root_item(root_item))
+    cg.add(menu.set_mode(config[CONF_MODE]))
+    for c in config[CONF_ITEMS]:
+        await menu_item_to_code(menu, c, root_item)
+    for conf in config.get(CONF_ON_ENTER, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], root_item)
+        await automation.build_automation(trigger, [(MenuItemConstPtr, "it")], conf)
+    for conf in config.get(CONF_ON_LEAVE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], root_item)
+        await automation.build_automation(trigger, [(MenuItemConstPtr, "it")], conf)
diff --git a/esphome/components/display_menu_base/automation.h b/esphome/components/display_menu_base/automation.h
new file mode 100644
index 0000000000..d5394a1e0c
--- /dev/null
+++ b/esphome/components/display_menu_base/automation.h
@@ -0,0 +1,133 @@
+#pragma once
+
+#include "esphome/core/automation.h"
+#include "display_menu_base.h"
+
+namespace esphome {
+namespace display_menu_base {
+
+template<typename... Ts> class UpAction : public Action<Ts...> {
+ public:
+  explicit UpAction(DisplayMenuComponent *menu) : menu_(menu) {}
+
+  void play(Ts... x) override { this->menu_->up(); }
+
+ protected:
+  DisplayMenuComponent *menu_;
+};
+
+template<typename... Ts> class DownAction : public Action<Ts...> {
+ public:
+  explicit DownAction(DisplayMenuComponent *menu) : menu_(menu) {}
+
+  void play(Ts... x) override { this->menu_->down(); }
+
+ protected:
+  DisplayMenuComponent *menu_;
+};
+
+template<typename... Ts> class LeftAction : public Action<Ts...> {
+ public:
+  explicit LeftAction(DisplayMenuComponent *menu) : menu_(menu) {}
+
+  void play(Ts... x) override { this->menu_->left(); }
+
+ protected:
+  DisplayMenuComponent *menu_;
+};
+
+template<typename... Ts> class RightAction : public Action<Ts...> {
+ public:
+  explicit RightAction(DisplayMenuComponent *menu) : menu_(menu) {}
+
+  void play(Ts... x) override { this->menu_->right(); }
+
+ protected:
+  DisplayMenuComponent *menu_;
+};
+
+template<typename... Ts> class EnterAction : public Action<Ts...> {
+ public:
+  explicit EnterAction(DisplayMenuComponent *menu) : menu_(menu) {}
+
+  void play(Ts... x) override { this->menu_->enter(); }
+
+ protected:
+  DisplayMenuComponent *menu_;
+};
+
+template<typename... Ts> class ShowAction : public Action<Ts...> {
+ public:
+  explicit ShowAction(DisplayMenuComponent *menu) : menu_(menu) {}
+
+  void play(Ts... x) override { this->menu_->show(); }
+
+ protected:
+  DisplayMenuComponent *menu_;
+};
+
+template<typename... Ts> class HideAction : public Action<Ts...> {
+ public:
+  explicit HideAction(DisplayMenuComponent *menu) : menu_(menu) {}
+
+  void play(Ts... x) override { this->menu_->hide(); }
+
+ protected:
+  DisplayMenuComponent *menu_;
+};
+
+template<typename... Ts> class ShowMainAction : public Action<Ts...> {
+ public:
+  explicit ShowMainAction(DisplayMenuComponent *menu) : menu_(menu) {}
+
+  void play(Ts... x) override { this->menu_->show_main(); }
+
+ protected:
+  DisplayMenuComponent *menu_;
+};
+template<typename... Ts> class IsActiveCondition : public Condition<Ts...> {
+ public:
+  explicit IsActiveCondition(DisplayMenuComponent *menu) : menu_(menu) {}
+  bool check(Ts... x) override { return this->menu_->is_active(); }
+
+ protected:
+  DisplayMenuComponent *menu_;
+};
+
+class DisplayMenuOnEnterTrigger : public Trigger<const MenuItem *> {
+ public:
+  explicit DisplayMenuOnEnterTrigger(MenuItem *parent) {
+    parent->add_on_enter_callback([this, parent]() { this->trigger(parent); });
+  }
+};
+
+class DisplayMenuOnLeaveTrigger : public Trigger<const MenuItem *> {
+ public:
+  explicit DisplayMenuOnLeaveTrigger(MenuItem *parent) {
+    parent->add_on_leave_callback([this, parent]() { this->trigger(parent); });
+  }
+};
+
+class DisplayMenuOnValueTrigger : public Trigger<const MenuItem *> {
+ public:
+  explicit DisplayMenuOnValueTrigger(MenuItem *parent) {
+    parent->add_on_value_callback([this, parent]() { this->trigger(parent); });
+  }
+};
+
+class DisplayMenuOnNextTrigger : public Trigger<const MenuItem *> {
+ public:
+  explicit DisplayMenuOnNextTrigger(MenuItemCustom *parent) {
+    parent->add_on_next_callback([this, parent]() { this->trigger(parent); });
+  }
+};
+
+class DisplayMenuOnPrevTrigger : public Trigger<const MenuItem *> {
+ public:
+  explicit DisplayMenuOnPrevTrigger(MenuItemCustom *parent) {
+    parent->add_on_prev_callback([this, parent]() { this->trigger(parent); });
+  }
+};
+
+}  // namespace display_menu_base
+}  // namespace esphome
diff --git a/esphome/components/display_menu_base/display_menu_base.cpp b/esphome/components/display_menu_base/display_menu_base.cpp
new file mode 100644
index 0000000000..57da3cec35
--- /dev/null
+++ b/esphome/components/display_menu_base/display_menu_base.cpp
@@ -0,0 +1,315 @@
+#include "display_menu_base.h"
+#include <algorithm>
+
+namespace esphome {
+namespace display_menu_base {
+
+void DisplayMenuComponent::up() {
+  if (this->check_healthy_and_active_()) {
+    bool changed = false;
+
+    if (this->editing_) {
+      switch (this->mode_) {
+        case MENU_MODE_ROTARY:
+          changed = this->get_selected_item_()->select_prev();
+          break;
+        default:
+          break;
+      }
+    } else {
+      changed = this->cursor_up_();
+    }
+
+    if (changed)
+      this->draw_and_update();
+  }
+}
+
+void DisplayMenuComponent::down() {
+  if (this->check_healthy_and_active_()) {
+    bool changed = false;
+
+    if (this->editing_) {
+      switch (this->mode_) {
+        case MENU_MODE_ROTARY:
+          changed = this->get_selected_item_()->select_next();
+          break;
+        default:
+          break;
+      }
+    } else {
+      changed = this->cursor_down_();
+    }
+
+    if (changed)
+      this->draw_and_update();
+  }
+}
+
+void DisplayMenuComponent::left() {
+  if (this->check_healthy_and_active_()) {
+    bool changed = false;
+
+    switch (this->get_selected_item_()->get_type()) {
+      case MENU_ITEM_SELECT:
+      case MENU_ITEM_SWITCH:
+      case MENU_ITEM_NUMBER:
+      case MENU_ITEM_CUSTOM:
+        switch (this->mode_) {
+          case MENU_MODE_ROTARY:
+            if (this->editing_) {
+              this->finish_editing_();
+              changed = true;
+            }
+            break;
+          case MENU_MODE_JOYSTICK:
+            if (this->editing_ || this->get_selected_item_()->get_immediate_edit())
+              changed = this->get_selected_item_()->select_prev();
+            break;
+          default:
+            break;
+        }
+        break;
+      case MENU_ITEM_BACK:
+        changed = this->leave_menu_();
+        break;
+      default:
+        break;
+    }
+
+    if (changed)
+      this->draw_and_update();
+  }
+}
+
+void DisplayMenuComponent::right() {
+  if (this->check_healthy_and_active_()) {
+    bool changed = false;
+
+    switch (this->get_selected_item_()->get_type()) {
+      case MENU_ITEM_SELECT:
+      case MENU_ITEM_SWITCH:
+      case MENU_ITEM_NUMBER:
+      case MENU_ITEM_CUSTOM:
+        switch (this->mode_) {
+          case MENU_MODE_JOYSTICK:
+            if (this->editing_ || this->get_selected_item_()->get_immediate_edit())
+              changed = this->get_selected_item_()->select_next();
+          default:
+            break;
+        }
+        break;
+      case MENU_ITEM_MENU:
+        changed = this->enter_menu_();
+        break;
+      default:
+        break;
+    }
+
+    if (changed)
+      this->draw_and_update();
+  }
+}
+
+void DisplayMenuComponent::enter() {
+  if (this->check_healthy_and_active_()) {
+    bool changed = false;
+    MenuItem *item = this->get_selected_item_();
+
+    if (this->editing_) {
+      this->finish_editing_();
+      changed = true;
+    } else {
+      switch (item->get_type()) {
+        case MENU_ITEM_MENU:
+          changed = this->enter_menu_();
+          break;
+        case MENU_ITEM_BACK:
+          changed = this->leave_menu_();
+          break;
+        case MENU_ITEM_SELECT:
+        case MENU_ITEM_SWITCH:
+        case MENU_ITEM_CUSTOM:
+          if (item->get_immediate_edit()) {
+            changed = item->select_next();
+          } else {
+            this->editing_ = true;
+            item->on_enter();
+            changed = true;
+          }
+          break;
+        case MENU_ITEM_NUMBER:
+          // A number cannot be immediate in the rotary mode
+          if (!item->get_immediate_edit() || this->mode_ == MENU_MODE_ROTARY) {
+            this->editing_ = true;
+            item->on_enter();
+            changed = true;
+          }
+          break;
+        case MENU_ITEM_COMMAND:
+          changed = item->select_next();
+          break;
+        default:
+          break;
+      }
+    }
+
+    if (changed)
+      this->draw_and_update();
+  }
+}
+
+void DisplayMenuComponent::draw() {
+  if (this->check_healthy_and_active_())
+    this->draw_menu();
+}
+
+void DisplayMenuComponent::show_main() {
+  bool disp_changed = false;
+
+  if (this->is_failed())
+    return;
+
+  this->process_initial_();
+
+  if (this->active_ && this->editing_)
+    this->finish_editing_();
+
+  if (this->displayed_item_ != this->root_item_) {
+    this->displayed_item_->on_leave();
+    disp_changed = true;
+  }
+
+  this->reset_();
+  this->active_ = true;
+
+  if (disp_changed) {
+    this->displayed_item_->on_enter();
+  }
+
+  this->draw_and_update();
+}
+
+void DisplayMenuComponent::show() {
+  if (this->is_failed())
+    return;
+
+  this->process_initial_();
+
+  if (!this->active_) {
+    this->active_ = true;
+    this->draw_and_update();
+  }
+}
+
+void DisplayMenuComponent::hide() {
+  if (this->check_healthy_and_active_()) {
+    if (this->editing_)
+      this->finish_editing_();
+    this->active_ = false;
+    this->update();
+  }
+}
+
+void DisplayMenuComponent::reset_() {
+  this->displayed_item_ = this->root_item_;
+  this->cursor_index_ = this->top_index_ = 0;
+  this->selection_stack_.clear();
+}
+
+void DisplayMenuComponent::process_initial_() {
+  if (!this->root_on_enter_called_) {
+    this->root_item_->on_enter();
+    this->root_on_enter_called_ = true;
+  }
+}
+
+bool DisplayMenuComponent::check_healthy_and_active_() {
+  if (this->is_failed())
+    return false;
+
+  this->process_initial_();
+
+  return this->active_;
+}
+
+bool DisplayMenuComponent::cursor_up_() {
+  bool changed = false;
+
+  if (this->cursor_index_ > 0) {
+    changed = true;
+
+    --this->cursor_index_;
+
+    if (this->cursor_index_ < this->top_index_)
+      this->top_index_ = this->cursor_index_;
+  }
+
+  return changed;
+}
+
+bool DisplayMenuComponent::cursor_down_() {
+  bool changed = false;
+
+  if (this->cursor_index_ + 1 < this->displayed_item_->items_size()) {
+    changed = true;
+
+    ++this->cursor_index_;
+
+    if (this->cursor_index_ >= this->top_index_ + this->rows_)
+      this->top_index_ = this->cursor_index_ - this->rows_ + 1;
+  }
+
+  return changed;
+}
+
+bool DisplayMenuComponent::enter_menu_() {
+  this->displayed_item_->on_leave();
+  this->displayed_item_ = static_cast<MenuItemMenu *>(this->get_selected_item_());
+  this->selection_stack_.push_front({this->top_index_, this->cursor_index_});
+  this->cursor_index_ = this->top_index_ = 0;
+  this->displayed_item_->on_enter();
+
+  return true;
+}
+
+bool DisplayMenuComponent::leave_menu_() {
+  bool changed = false;
+
+  if (this->displayed_item_->get_parent() != nullptr) {
+    this->displayed_item_->on_leave();
+    this->displayed_item_ = this->displayed_item_->get_parent();
+    this->top_index_ = this->selection_stack_.front().first;
+    this->cursor_index_ = this->selection_stack_.front().second;
+    this->selection_stack_.pop_front();
+    this->displayed_item_->on_enter();
+    changed = true;
+  }
+
+  return changed;
+}
+
+void DisplayMenuComponent::finish_editing_() {
+  switch (this->get_selected_item_()->get_type()) {
+    case MENU_ITEM_SELECT:
+    case MENU_ITEM_NUMBER:
+    case MENU_ITEM_SWITCH:
+    case MENU_ITEM_CUSTOM:
+      this->get_selected_item_()->on_leave();
+      break;
+    default:
+      break;
+  }
+
+  this->editing_ = false;
+}
+
+void DisplayMenuComponent::draw_menu() {
+  for (size_t i = 0; i < this->rows_ && this->top_index_ + i < this->displayed_item_->items_size(); ++i) {
+    this->draw_item(this->displayed_item_->get_item(this->top_index_ + i), i,
+                    this->top_index_ + i == this->cursor_index_);
+  }
+}
+
+}  // namespace display_menu_base
+}  // namespace esphome
diff --git a/esphome/components/display_menu_base/display_menu_base.h b/esphome/components/display_menu_base/display_menu_base.h
new file mode 100644
index 0000000000..46bb0a8192
--- /dev/null
+++ b/esphome/components/display_menu_base/display_menu_base.h
@@ -0,0 +1,77 @@
+#pragma once
+
+#include "esphome/core/component.h"
+
+#include "menu_item.h"
+
+#include <forward_list>
+
+namespace esphome {
+namespace display_menu_base {
+
+enum MenuMode {
+  MENU_MODE_ROTARY,
+  MENU_MODE_JOYSTICK,
+};
+
+class MenuItem;
+
+/** Class to display a hierarchical menu.
+ *
+ */
+class DisplayMenuComponent : public Component {
+ public:
+  void set_root_item(MenuItemMenu *item) { this->displayed_item_ = this->root_item_ = item; }
+  void set_active(bool active) { this->active_ = active; }
+  void set_mode(MenuMode mode) { this->mode_ = mode; }
+  void set_rows(uint8_t rows) { this->rows_ = rows; }
+
+  float get_setup_priority() const override { return setup_priority::PROCESSOR; }
+
+  void up();
+  void down();
+  void left();
+  void right();
+  void enter();
+
+  void show_main();
+  void show();
+  void hide();
+
+  void draw();
+
+  bool is_active() const { return this->active_; }
+
+ protected:
+  void reset_();
+  void process_initial_();
+  bool check_healthy_and_active_();
+  MenuItem *get_selected_item_() { return this->displayed_item_->get_item(this->cursor_index_); }
+  bool cursor_up_();
+  bool cursor_down_();
+  bool enter_menu_();
+  bool leave_menu_();
+  void finish_editing_();
+  virtual void draw_menu();
+  virtual void draw_item(const MenuItem *item, uint8_t row, bool selected) = 0;
+  virtual void update() {}
+  virtual void draw_and_update() {
+    draw_menu();
+    update();
+  }
+
+  uint8_t rows_;
+  bool active_;
+  MenuMode mode_;
+  MenuItemMenu *root_item_{nullptr};
+
+  MenuItemMenu *displayed_item_{nullptr};
+  uint8_t top_index_{0};
+  uint8_t cursor_index_{0};
+  std::forward_list<std::pair<uint8_t, uint8_t>> selection_stack_{};
+  bool editing_{false};
+  bool root_on_enter_called_{false};
+};
+
+}  // namespace display_menu_base
+}  // namespace esphome
diff --git a/esphome/components/display_menu_base/menu_item.cpp b/esphome/components/display_menu_base/menu_item.cpp
new file mode 100644
index 0000000000..bbe6ec0e89
--- /dev/null
+++ b/esphome/components/display_menu_base/menu_item.cpp
@@ -0,0 +1,179 @@
+#include "menu_item.h"
+
+#include <cstdio>
+
+namespace esphome {
+namespace display_menu_base {
+
+void MenuItem::on_enter() { this->on_enter_callbacks_.call(); }
+
+void MenuItem::on_leave() { this->on_leave_callbacks_.call(); }
+
+void MenuItem::on_value_() { this->on_value_callbacks_.call(); }
+
+#ifdef USE_SELECT
+std::string MenuItemSelect::get_value_text() const {
+  std::string result;
+
+  if (this->value_getter_.has_value()) {
+    result = this->value_getter_.value()(this);
+  } else {
+    if (this->select_var_ != nullptr) {
+      result = this->select_var_->state;
+    }
+  }
+
+  return result;
+}
+
+bool MenuItemSelect::select_next() {
+  bool changed = false;
+
+  if (this->select_var_ != nullptr) {
+    this->select_var_->make_call().select_next(true).perform();
+    changed = true;
+  }
+
+  return changed;
+}
+
+bool MenuItemSelect::select_prev() {
+  bool changed = false;
+
+  if (this->select_var_ != nullptr) {
+    this->select_var_->make_call().select_previous(true).perform();
+    changed = true;
+  }
+
+  return changed;
+}
+#endif  // USE_SELECT
+
+#ifdef USE_NUMBER
+std::string MenuItemNumber::get_value_text() const {
+  std::string result;
+
+  if (this->value_getter_.has_value()) {
+    result = this->value_getter_.value()(this);
+  } else {
+    char data[32];
+    snprintf(data, sizeof(data), this->format_.c_str(), get_number_value_());
+    result = data;
+  }
+
+  return result;
+}
+
+bool MenuItemNumber::select_next() {
+  bool changed = false;
+
+  if (this->number_var_ != nullptr) {
+    float last = this->number_var_->state;
+    this->number_var_->make_call().number_increment(false).perform();
+
+    if (this->number_var_->state != last) {
+      this->on_value_();
+      changed = true;
+    }
+  }
+
+  return changed;
+}
+
+bool MenuItemNumber::select_prev() {
+  bool changed = false;
+
+  if (this->number_var_ != nullptr) {
+    float last = this->number_var_->state;
+    this->number_var_->make_call().number_decrement(false).perform();
+
+    if (this->number_var_->state != last) {
+      this->on_value_();
+      changed = true;
+    }
+  }
+
+  return changed;
+}
+
+float MenuItemNumber::get_number_value_() const {
+  float result = 0.0;
+
+  if (this->number_var_ != nullptr) {
+    if (!this->number_var_->has_state() || this->number_var_->state < this->number_var_->traits.get_min_value()) {
+      result = this->number_var_->traits.get_min_value();
+    } else if (this->number_var_->state > this->number_var_->traits.get_max_value()) {
+      result = this->number_var_->traits.get_max_value();
+    } else {
+      result = this->number_var_->state;
+    }
+  }
+
+  return result;
+}
+#endif  // USE_NUMBER
+
+#ifdef USE_SWITCH
+std::string MenuItemSwitch::get_value_text() const {
+  std::string result;
+
+  if (this->value_getter_.has_value()) {
+    result = this->value_getter_.value()(this);
+  } else {
+    result = this->get_switch_state_() ? this->switch_on_text_ : this->switch_off_text_;
+  }
+
+  return result;
+}
+
+bool MenuItemSwitch::select_next() { return this->toggle_switch_(); }
+
+bool MenuItemSwitch::select_prev() { return this->toggle_switch_(); }
+
+bool MenuItemSwitch::get_switch_state_() const { return (this->switch_var_ != nullptr && this->switch_var_->state); }
+
+bool MenuItemSwitch::toggle_switch_() {
+  bool changed = false;
+
+  if (this->switch_var_ != nullptr) {
+    this->switch_var_->toggle();
+    this->on_value_();
+    changed = true;
+  }
+
+  return changed;
+}
+#endif  // USE_SWITCH
+
+std::string MenuItemCustom::get_value_text() const {
+  return (this->value_getter_.has_value()) ? this->value_getter_.value()(this) : "";
+}
+
+bool MenuItemCommand::select_next() {
+  this->on_value_();
+  return true;
+}
+
+bool MenuItemCommand::select_prev() {
+  this->on_value_();
+  return true;
+}
+
+bool MenuItemCustom::select_next() {
+  this->on_next_();
+  this->on_value_();
+  return true;
+}
+
+bool MenuItemCustom::select_prev() {
+  this->on_prev_();
+  this->on_value_();
+  return true;
+}
+
+void MenuItemCustom::on_next_() { this->on_next_callbacks_.call(); }
+
+void MenuItemCustom::on_prev_() { this->on_prev_callbacks_.call(); }
+
+}  // namespace display_menu_base
+}  // namespace esphome
diff --git a/esphome/components/display_menu_base/menu_item.h b/esphome/components/display_menu_base/menu_item.h
new file mode 100644
index 0000000000..a30f31e88f
--- /dev/null
+++ b/esphome/components/display_menu_base/menu_item.h
@@ -0,0 +1,187 @@
+#pragma once
+
+#include "esphome/core/defines.h"
+#include "esphome/core/automation.h"
+
+#ifdef USE_NUMBER
+#include "esphome/components/number/number.h"
+#endif
+#ifdef USE_SELECT
+#include "esphome/components/select/select.h"
+#endif
+#ifdef USE_SWITCH
+#include "esphome/components/switch/switch.h"
+#endif
+
+#include <vector>
+
+namespace esphome {
+namespace display_menu_base {
+
+enum MenuItemType {
+  MENU_ITEM_LABEL,
+  MENU_ITEM_MENU,
+  MENU_ITEM_BACK,
+  MENU_ITEM_SELECT,
+  MENU_ITEM_NUMBER,
+  MENU_ITEM_SWITCH,
+  MENU_ITEM_COMMAND,
+  MENU_ITEM_CUSTOM,
+};
+
+class MenuItem;
+class MenuItemMenu;
+using value_getter_t = std::function<std::string(const MenuItem *)>;
+
+class MenuItem {
+ public:
+  explicit MenuItem(MenuItemType t) : item_type_(t) {}
+  void set_parent(MenuItemMenu *parent) { this->parent_ = parent; }
+  MenuItemMenu *get_parent() { return this->parent_; }
+  MenuItemType get_type() const { return this->item_type_; }
+  template<typename V> void set_text(V val) { this->text_ = val; }
+  void add_on_enter_callback(std::function<void()> &&cb) { this->on_enter_callbacks_.add(std::move(cb)); }
+  void add_on_leave_callback(std::function<void()> &&cb) { this->on_leave_callbacks_.add(std::move(cb)); }
+  void add_on_value_callback(std::function<void()> &&cb) { this->on_value_callbacks_.add(std::move(cb)); }
+
+  std::string get_text() const { return const_cast<MenuItem *>(this)->text_.value(this); }
+  virtual bool get_immediate_edit() const { return false; }
+  virtual bool has_value() const { return false; }
+  virtual std::string get_value_text() const { return ""; }
+
+  virtual bool select_next() { return false; }
+  virtual bool select_prev() { return false; }
+
+  void on_enter();
+  void on_leave();
+
+ protected:
+  void on_value_();
+
+  MenuItemType item_type_;
+  MenuItemMenu *parent_{nullptr};
+  TemplatableValue<std::string, const MenuItem *> text_;
+
+  CallbackManager<void()> on_enter_callbacks_{};
+  CallbackManager<void()> on_leave_callbacks_{};
+  CallbackManager<void()> on_value_callbacks_{};
+};
+
+class MenuItemMenu : public MenuItem {
+ public:
+  explicit MenuItemMenu() : MenuItem(MENU_ITEM_MENU) {}
+  void add_item(MenuItem *item) {
+    item->set_parent(this);
+    this->items_.push_back(item);
+  }
+  size_t items_size() const { return this->items_.size(); }
+  MenuItem *get_item(size_t i) { return this->items_[i]; }
+
+ protected:
+  std::vector<MenuItem *> items_;
+};
+
+class MenuItemEditable : public MenuItem {
+ public:
+  explicit MenuItemEditable(MenuItemType t) : MenuItem(t) {}
+  void set_immediate_edit(bool val) { this->immediate_edit_ = val; }
+  bool get_immediate_edit() const override { return this->immediate_edit_; }
+  void set_value_lambda(value_getter_t &&getter) { this->value_getter_ = getter; }
+
+ protected:
+  bool immediate_edit_{false};
+  optional<value_getter_t> value_getter_{};
+};
+
+#ifdef USE_SELECT
+class MenuItemSelect : public MenuItemEditable {
+ public:
+  explicit MenuItemSelect() : MenuItemEditable(MENU_ITEM_SELECT) {}
+  void set_select_variable(select::Select *var) { this->select_var_ = var; }
+
+  bool has_value() const override { return true; }
+  std::string get_value_text() const override;
+
+  bool select_next() override;
+  bool select_prev() override;
+
+ protected:
+  select::Select *select_var_{nullptr};
+};
+#endif
+
+#ifdef USE_NUMBER
+class MenuItemNumber : public MenuItemEditable {
+ public:
+  explicit MenuItemNumber() : MenuItemEditable(MENU_ITEM_NUMBER) {}
+  void set_number_variable(number::Number *var) { this->number_var_ = var; }
+  void set_format(const std::string &fmt) { this->format_ = fmt; }
+
+  bool has_value() const override { return true; }
+  std::string get_value_text() const override;
+
+  bool select_next() override;
+  bool select_prev() override;
+
+ protected:
+  float get_number_value_() const;
+
+  number::Number *number_var_{nullptr};
+  std::string format_;
+};
+#endif
+
+#ifdef USE_SWITCH
+class MenuItemSwitch : public MenuItemEditable {
+ public:
+  explicit MenuItemSwitch() : MenuItemEditable(MENU_ITEM_SWITCH) {}
+  void set_switch_variable(switch_::Switch *var) { this->switch_var_ = var; }
+  void set_on_text(const std::string &t) { this->switch_on_text_ = t; }
+  void set_off_text(const std::string &t) { this->switch_off_text_ = t; }
+
+  bool has_value() const override { return true; }
+  std::string get_value_text() const override;
+
+  bool select_next() override;
+  bool select_prev() override;
+
+ protected:
+  bool get_switch_state_() const;
+  bool toggle_switch_();
+
+  switch_::Switch *switch_var_{nullptr};
+  std::string switch_on_text_;
+  std::string switch_off_text_;
+};
+#endif
+
+class MenuItemCommand : public MenuItem {
+ public:
+  explicit MenuItemCommand() : MenuItem(MENU_ITEM_COMMAND) {}
+
+  bool select_next() override;
+  bool select_prev() override;
+};
+
+class MenuItemCustom : public MenuItemEditable {
+ public:
+  explicit MenuItemCustom() : MenuItemEditable(MENU_ITEM_CUSTOM) {}
+  void add_on_next_callback(std::function<void()> &&cb) { this->on_next_callbacks_.add(std::move(cb)); }
+  void add_on_prev_callback(std::function<void()> &&cb) { this->on_prev_callbacks_.add(std::move(cb)); }
+
+  bool has_value() const override { return this->value_getter_.has_value(); }
+  std::string get_value_text() const override;
+
+  bool select_next() override;
+  bool select_prev() override;
+
+ protected:
+  void on_next_();
+  void on_prev_();
+
+  CallbackManager<void()> on_next_callbacks_{};
+  CallbackManager<void()> on_prev_callbacks_{};
+};
+
+}  // namespace display_menu_base
+}  // namespace esphome
diff --git a/esphome/components/lcd_menu/__init__.py b/esphome/components/lcd_menu/__init__.py
new file mode 100644
index 0000000000..a356c85ba7
--- /dev/null
+++ b/esphome/components/lcd_menu/__init__.py
@@ -0,0 +1,74 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.const import (
+    CONF_ID,
+    CONF_DIMENSIONS,
+)
+from esphome.core.entity_helpers import inherit_property_from
+from esphome.components import lcd_base
+from esphome.components.display_menu_base import (
+    DISPLAY_MENU_BASE_SCHEMA,
+    DisplayMenuComponent,
+    display_menu_to_code,
+)
+
+CODEOWNERS = ["@numo68"]
+
+AUTO_LOAD = ["display_menu_base"]
+
+lcd_menu_ns = cg.esphome_ns.namespace("lcd_menu")
+
+CONF_DISPLAY_ID = "display_id"
+
+CONF_MARK_SELECTED = "mark_selected"
+CONF_MARK_EDITING = "mark_editing"
+CONF_MARK_SUBMENU = "mark_submenu"
+CONF_MARK_BACK = "mark_back"
+
+MINIMUM_COLUMNS = 12
+
+LCDCharacterMenuComponent = lcd_menu_ns.class_(
+    "LCDCharacterMenuComponent", DisplayMenuComponent
+)
+
+MULTI_CONF = True
+
+
+def validate_lcd_dimensions(config):
+    if config[CONF_DIMENSIONS][0] < MINIMUM_COLUMNS:
+        raise cv.Invalid(
+            f"LCD display must have at least {MINIMUM_COLUMNS} columns to be usable with the menu"
+        )
+    return config
+
+
+CONFIG_SCHEMA = DISPLAY_MENU_BASE_SCHEMA.extend(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(LCDCharacterMenuComponent),
+            cv.GenerateID(CONF_DISPLAY_ID): cv.use_id(lcd_base.LCDDisplay),
+            cv.Optional(CONF_MARK_SELECTED, default=0x3E): cv.uint8_t,
+            cv.Optional(CONF_MARK_EDITING, default=0x2A): cv.uint8_t,
+            cv.Optional(CONF_MARK_SUBMENU, default=0x7E): cv.uint8_t,
+            cv.Optional(CONF_MARK_BACK, default=0x5E): cv.uint8_t,
+        }
+    )
+)
+
+FINAL_VALIDATE_SCHEMA = cv.All(
+    inherit_property_from(CONF_DIMENSIONS, CONF_DISPLAY_ID),
+    validate_lcd_dimensions,
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    disp = await cg.get_variable(config[CONF_DISPLAY_ID])
+    cg.add(var.set_display(disp))
+    cg.add(var.set_dimensions(config[CONF_DIMENSIONS][0], config[CONF_DIMENSIONS][1]))
+    await display_menu_to_code(var, config)
+    cg.add(var.set_mark_selected(config[CONF_MARK_SELECTED]))
+    cg.add(var.set_mark_editing(config[CONF_MARK_EDITING]))
+    cg.add(var.set_mark_submenu(config[CONF_MARK_SUBMENU]))
+    cg.add(var.set_mark_back(config[CONF_MARK_BACK]))
diff --git a/esphome/components/lcd_menu/lcd_menu.cpp b/esphome/components/lcd_menu/lcd_menu.cpp
new file mode 100644
index 0000000000..74ada5e584
--- /dev/null
+++ b/esphome/components/lcd_menu/lcd_menu.cpp
@@ -0,0 +1,74 @@
+#include "lcd_menu.h"
+#include "esphome/core/log.h"
+#include <algorithm>
+
+namespace esphome {
+namespace lcd_menu {
+
+static const char *const TAG = "lcd_menu";
+
+void LCDCharacterMenuComponent::setup() {
+  if (this->display_->is_failed()) {
+    this->mark_failed();
+    return;
+  }
+
+  display_menu_base::DisplayMenuComponent::setup();
+}
+
+float LCDCharacterMenuComponent::get_setup_priority() const { return setup_priority::PROCESSOR - 1.0f; }
+
+void LCDCharacterMenuComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "LCD Menu");
+  ESP_LOGCONFIG(TAG, "  Columns: %u, Rows: %u", this->columns_, this->rows_);
+  ESP_LOGCONFIG(TAG, "  Mark characters: %02x, %02x, %02x, %02x", this->mark_selected_, this->mark_editing_,
+                this->mark_submenu_, this->mark_back_);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "The connected display failed, the menu is disabled!");
+  }
+}
+
+void LCDCharacterMenuComponent::draw_item(const display_menu_base::MenuItem *item, uint8_t row, bool selected) {
+  char data[this->columns_ + 1];  // Bounded to 65 through the config
+
+  memset(data, ' ', this->columns_);
+
+  if (selected) {
+    data[0] = (this->editing_ || (this->mode_ == display_menu_base::MENU_MODE_JOYSTICK && item->get_immediate_edit()))
+                  ? this->mark_editing_
+                  : this->mark_selected_;
+  }
+
+  switch (item->get_type()) {
+    case display_menu_base::MENU_ITEM_MENU:
+      data[this->columns_ - 1] = this->mark_submenu_;
+      break;
+    case display_menu_base::MENU_ITEM_BACK:
+      data[this->columns_ - 1] = this->mark_back_;
+      break;
+    default:
+      break;
+  }
+
+  auto text = item->get_text();
+  size_t n = std::min(text.size(), (size_t) this->columns_ - 2);
+  memcpy(data + 1, item->get_text().c_str(), n);
+
+  if (item->has_value()) {
+    std::string value = item->get_value_text();
+
+    // Maximum: start mark, at least two chars of label, space, '[', value, ']',
+    // end mark. Config guarantees columns >= 12
+    size_t val_width = std::min((size_t) this->columns_ - 7, value.length());
+    memcpy(data + this->columns_ - val_width - 4, " [", 2);
+    memcpy(data + this->columns_ - val_width - 2, value.c_str(), val_width);
+    data[this->columns_ - 2] = ']';
+  }
+
+  data[this->columns_] = '\0';
+
+  this->display_->print(0, row, data);
+}
+
+}  // namespace lcd_menu
+}  // namespace esphome
diff --git a/esphome/components/lcd_menu/lcd_menu.h b/esphome/components/lcd_menu/lcd_menu.h
new file mode 100644
index 0000000000..d0dbca7b2f
--- /dev/null
+++ b/esphome/components/lcd_menu/lcd_menu.h
@@ -0,0 +1,45 @@
+#pragma once
+
+#include "esphome/components/lcd_base/lcd_display.h"
+#include "esphome/components/display_menu_base/display_menu_base.h"
+
+#include <forward_list>
+#include <vector>
+
+namespace esphome {
+namespace lcd_menu {
+
+/** Class to display a hierarchical menu.
+ *
+ */
+class LCDCharacterMenuComponent : public display_menu_base::DisplayMenuComponent {
+ public:
+  void set_display(lcd_base::LCDDisplay *display) { this->display_ = display; }
+  void set_dimensions(uint8_t columns, uint8_t rows) {
+    this->columns_ = columns;
+    set_rows(rows);
+  }
+  void set_mark_selected(uint8_t c) { this->mark_selected_ = c; }
+  void set_mark_editing(uint8_t c) { this->mark_editing_ = c; }
+  void set_mark_submenu(uint8_t c) { this->mark_submenu_ = c; }
+  void set_mark_back(uint8_t c) { this->mark_back_ = c; }
+
+  void setup() override;
+  float get_setup_priority() const override;
+
+  void dump_config() override;
+
+ protected:
+  void draw_item(const display_menu_base::MenuItem *item, uint8_t row, bool selected) override;
+  void update() override { this->display_->update(); }
+
+  lcd_base::LCDDisplay *display_;
+  uint8_t columns_;
+  char mark_selected_;
+  char mark_editing_;
+  char mark_submenu_;
+  char mark_back_;
+};
+
+}  // namespace lcd_menu
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index b286c37deb..eacaf9b38c 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -871,8 +871,10 @@ sensor:
           value: !lambda "return -1;"
     on_clockwise:
       - logger.log: Clockwise
+      - display_menu.down:
     on_anticlockwise:
       - logger.log: Anticlockwise
+      - display_menu.up:
   - platform: pulse_width
     name: Pulse Width
     pin: GPIO12
@@ -1289,6 +1291,16 @@ binary_sensor:
     pin: GPIO27
     threshold: 1000
     id: btn_left
+    on_press:
+      - if:
+          condition:
+            display_menu.is_active:
+          then:
+            - display_menu.enter:
+          else:
+            - display_menu.left:
+            - display_menu.right:
+            - display_menu.show:
   - platform: template
     name: Garage Door Open
     id: garage_door
@@ -2331,6 +2343,7 @@ color:
 
 display:
   - platform: lcd_gpio
+    id: my_lcd_gpio
     dimensions: 18x4
     data_pins:
       - GPIO19
@@ -3009,3 +3022,85 @@ button:
     name: Midea Power Inverse
     on_press:
       midea_ac.power_toggle:
+
+lcd_menu:
+  display_id: my_lcd_gpio
+  mark_back: 0x5e
+  mark_selected: 0x3e
+  mark_editing: 0x2a
+  mark_submenu: 0x7e
+  active: false
+  mode: rotary
+  on_enter:
+    then:
+      lambda: 'ESP_LOGI("lcd_menu", "root enter");'
+  on_leave:
+    then:
+      lambda: 'ESP_LOGI("lcd_menu", "root leave");'
+  items:
+    - type: back
+      text: 'Back'
+    - type: label
+    - type: menu
+      text: 'Submenu 1'
+      items:
+        - type: back
+          text: 'Back'
+        - type: menu
+          text: 'Submenu 21'
+          items:
+            - type: back
+              text: 'Back'
+            - type: command
+              text: 'Show Main'
+              on_value:
+                then:
+                  - display_menu.show_main:
+    - type: select
+      text: 'Enum Item'
+      immediate_edit: true
+      select: test_select
+      on_enter:
+        then:
+          lambda: 'ESP_LOGI("lcd_menu", "select enter: %s, %s", it->get_text().c_str(), it->get_value_text().c_str());'
+      on_leave:
+        then:
+          lambda: 'ESP_LOGI("lcd_menu", "select leave: %s, %s", it->get_text().c_str(), it->get_value_text().c_str());'
+      on_value:
+        then:
+          lambda: 'ESP_LOGI("lcd_menu", "select value: %s, %s", it->get_text().c_str(), it->get_value_text().c_str());'
+    - type: number
+      text: 'Number'
+      number: test_number
+      on_enter:
+        then:
+          lambda: 'ESP_LOGI("lcd_menu", "number enter: %s, %s", it->get_text().c_str(), it->get_value_text().c_str());'
+      on_leave:
+        then:
+          lambda: 'ESP_LOGI("lcd_menu", "number leave: %s, %s", it->get_text().c_str(), it->get_value_text().c_str());'
+      on_value:
+        then:
+          lambda: 'ESP_LOGI("lcd_menu", "number value: %s, %s", it->get_text().c_str(), it->get_value_text().c_str());'
+    - type: command
+      text: 'Hide'
+      on_value:
+        then:
+          - display_menu.hide:
+    - type: switch
+      text: 'Switch'
+      switch: my_switch
+      on_text: 'Bright'
+      off_text: 'Dark'
+      immediate_edit: false
+      on_value:
+        then:
+          lambda: 'ESP_LOGI("lcd_menu", "switch value: %s", it->get_value_text().c_str());'
+    - type: custom
+      text: !lambda 'return "Custom";'
+      value_lambda: 'return "Val";'
+      on_next:
+        then:
+          lambda: 'ESP_LOGI("lcd_menu", "custom next: %s", it->get_text().c_str());'
+      on_prev:
+        then:
+          lambda: 'ESP_LOGI("lcd_menu", "custom prev: %s", it->get_text().c_str());'

From 16ebf9da4c46a46494075ff9dda49040d4e0d43c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 7 Nov 2022 19:03:59 +1300
Subject: [PATCH 212/838] Lint updates (#3992)

---
 .pre-commit-config.yaml | 8 ++++----
 requirements_test.txt   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9c5610d9dc..7c10978a8d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,15 +3,15 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/ambv/black
-    rev: 22.6.0
+    rev: 22.8.0
     hooks:
       - id: black
         args:
           - --safe
           - --quiet
         files: ^((esphome|script|tests)/.+)?[^/]+\.py$
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 4.0.1
+  - repo: https://github.com/PyCQA/flake8
+    rev: 5.0.4
     hooks:
       - id: flake8
         additional_dependencies:
@@ -27,7 +27,7 @@ repos:
           - --branch=release
           - --branch=beta
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.0.0
+    rev: v3.2.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
diff --git a/requirements_test.txt b/requirements_test.txt
index 34efaea2ed..1b79142167 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,5 +1,5 @@
 pylint==2.15.5
-flake8==5.0.4
+flake8==5.0.4  # also change in .pre-commit-config.yaml when updating
 black==22.8.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.2.0  # also change in .pre-commit-config.yaml when updating
 pre-commit

From 65fbfa20974bbe5771665eb83c01e66b5b85ddfc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 19:14:13 +1300
Subject: [PATCH 213/838] Bump zeroconf from 0.39.1 to 0.39.4 (#3979)

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 50502cfac7..8f665acba7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ esptool==3.3.1
 click==8.1.3
 esphome-dashboard==20221020.0
 aioesphomeapi==11.4.2
-zeroconf==0.39.1
+zeroconf==0.39.4
 
 # esp-idf requires this, but doesn't bundle it by default
 # https://github.com/espressif/esp-idf/blob/220590d599e134d7a5e7f1e683cc4550349ffbf8/requirements.txt#L24

From 3e110681c9f92db596aa6f7385b929e914f7a41b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 19:24:50 +1300
Subject: [PATCH 214/838] Bump black from 22.8.0 to 22.10.0 (#3986)

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 7c10978a8d..4a9d9f5cc3 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/ambv/black
-    rev: 22.8.0
+    rev: 22.10.0
     hooks:
       - id: black
         args:
diff --git a/requirements_test.txt b/requirements_test.txt
index 1b79142167..9567181238 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,6 +1,6 @@
 pylint==2.15.5
 flake8==5.0.4  # also change in .pre-commit-config.yaml when updating
-black==22.8.0  # also change in .pre-commit-config.yaml when updating
+black==22.10.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.2.0  # also change in .pre-commit-config.yaml when updating
 pre-commit
 

From 291deb12adefc369a7eba2ddca476cd261140623 Mon Sep 17 00:00:00 2001
From: Jens-Christian Skibakk <jens.christian@skibakk.no>
Date: Tue, 8 Nov 2022 07:06:45 +0100
Subject: [PATCH 215/838] Skip validation of defined pins (#3999)

---
 esphome/components/esp32/gpio.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/esphome/components/esp32/gpio.py b/esphome/components/esp32/gpio.py
index 6c3fa92fcd..518514a6a3 100644
--- a/esphome/components/esp32/gpio.py
+++ b/esphome/components/esp32/gpio.py
@@ -105,6 +105,12 @@ _esp32_validations = {
 
 def validate_gpio_pin(value):
     value = _translate_pin(value)
+    board = CORE.data[KEY_ESP32][KEY_BOARD]
+    board_pins = boards.ESP32_BOARD_PINS.get(board, {})
+
+    if value in board_pins.values():
+        return value
+
     variant = CORE.data[KEY_ESP32][KEY_VARIANT]
     if variant not in _esp32_validations:
         raise cv.Invalid(f"Unsupported ESP32 variant {variant}")

From d7858f16c1ca123cf275854a4b09e758fabd6f6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Nov 2022 11:48:56 +1300
Subject: [PATCH 216/838] Bump pytest-asyncio from 0.19.0 to 0.20.1 (#4003)

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 9567181238..28112521ac 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -8,6 +8,6 @@ pre-commit
 pytest==7.2.0
 pytest-cov==4.0.0
 pytest-mock==3.10.0
-pytest-asyncio==0.19.0
+pytest-asyncio==0.20.1
 asyncmock==0.4.2
 hypothesis==5.49.0

From ed316b1ce3e552ece889d87a10bbd08b2a018623 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Nov 2022 11:49:09 +1300
Subject: [PATCH 217/838] Bump aioesphomeapi from 11.4.2 to 11.4.3 (#4002)

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 8f665acba7..fff4747442 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.4  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
 esphome-dashboard==20221020.0
-aioesphomeapi==11.4.2
+aioesphomeapi==11.4.3
 zeroconf==0.39.4
 
 # esp-idf requires this, but doesn't bundle it by default

From 02b15dbc4acb82dbfa932acefc8b31a576f6e75b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Nov 2022 12:03:39 +1300
Subject: [PATCH 218/838] Bump platformio from 6.1.4 to 6.1.5 (#4004)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 docker/Dockerfile | 2 +-
 requirements.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 05b518ca74..aa4bd5fc53 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -46,7 +46,7 @@ RUN \
     # Ubuntu python3-pip is missing wheel
     pip3 install --no-cache-dir \
         wheel==0.37.1 \
-        platformio==6.1.4 \
+        platformio==6.1.5 \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
     && platformio settings set check_platformio_interval 1000000 \
diff --git a/requirements.txt b/requirements.txt
index fff4747442..86b248f978 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ tornado==6.2
 tzlocal==4.2    # from time
 tzdata>=2021.1  # from time
 pyserial==3.5
-platformio==6.1.4  # When updating platformio, also update Dockerfile
+platformio==6.1.5  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
 esphome-dashboard==20221020.0

From dc794918ed06833e67f4a29fd10f39c7cc916bb9 Mon Sep 17 00:00:00 2001
From: Gilles van den Hoven <gilles@webunity.nl>
Date: Wed, 9 Nov 2022 04:46:31 +0100
Subject: [PATCH 219/838] Enable calibration, callbacks and custom commands for
 EZO sensors (#3910)

Co-authored-by: PoppyPop <skytep@gmail.com>
Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 esphome/components/ezo/automation.h |  53 +++++++
 esphome/components/ezo/ezo.cpp      | 228 +++++++++++++++++++++++-----
 esphome/components/ezo/ezo.h        |  91 ++++++++++-
 esphome/components/ezo/sensor.py    |  85 ++++++++++-
 4 files changed, 414 insertions(+), 43 deletions(-)
 create mode 100644 esphome/components/ezo/automation.h

diff --git a/esphome/components/ezo/automation.h b/esphome/components/ezo/automation.h
new file mode 100644
index 0000000000..19427b9159
--- /dev/null
+++ b/esphome/components/ezo/automation.h
@@ -0,0 +1,53 @@
+#pragma once
+#include <utility>
+
+#include "esphome/core/automation.h"
+#include "ezo.h"
+
+namespace esphome {
+namespace ezo {
+
+class LedTrigger : public Trigger<bool> {
+ public:
+  explicit LedTrigger(EZOSensor *ezo) {
+    ezo->add_led_state_callback([this](bool value) { this->trigger(value); });
+  }
+};
+
+class CustomTrigger : public Trigger<std::string> {
+ public:
+  explicit CustomTrigger(EZOSensor *ezo) {
+    ezo->add_custom_callback([this](std::string value) { this->trigger(std::move(value)); });
+  }
+};
+
+class TTrigger : public Trigger<std::string> {
+ public:
+  explicit TTrigger(EZOSensor *ezo) {
+    ezo->add_t_callback([this](std::string value) { this->trigger(std::move(value)); });
+  }
+};
+
+class CalibrationTrigger : public Trigger<std::string> {
+ public:
+  explicit CalibrationTrigger(EZOSensor *ezo) {
+    ezo->add_calibration_callback([this](std::string value) { this->trigger(std::move(value)); });
+  }
+};
+
+class SlopeTrigger : public Trigger<std::string> {
+ public:
+  explicit SlopeTrigger(EZOSensor *ezo) {
+    ezo->add_slope_callback([this](std::string value) { this->trigger(std::move(value)); });
+  }
+};
+
+class DeviceInformationTrigger : public Trigger<std::string> {
+ public:
+  explicit DeviceInformationTrigger(EZOSensor *ezo) {
+    ezo->add_device_infomation_callback([this](std::string value) { this->trigger(std::move(value)); });
+  }
+};
+
+}  // namespace ezo
+}  // namespace esphome
diff --git a/esphome/components/ezo/ezo.cpp b/esphome/components/ezo/ezo.cpp
index 12f88a0f66..2efdc1b984 100644
--- a/esphome/components/ezo/ezo.cpp
+++ b/esphome/components/ezo/ezo.cpp
@@ -5,11 +5,11 @@
 namespace esphome {
 namespace ezo {
 
-static const char *const TAG = "ezo.sensor";
+static const char *const EZO_COMMAND_TYPE_STRINGS[] = {"EZO_READ",  "EZO_LED",         "EZO_DEVICE_INFORMATION",
+                                                       "EZO_SLOPE", "EZO_CALIBRATION", "EZO_SLEEP",
+                                                       "EZO_I2C",   "EZO_T",           "EZO_CUSTOM"};
 
-static const uint16_t EZO_STATE_WAIT = 1;
-static const uint16_t EZO_STATE_SEND_TEMP = 2;
-static const uint16_t EZO_STATE_WAIT_TEMP = 4;
+static const char *const EZO_CALIBRATION_TYPE_STRINGS[] = {"LOW", "MID", "HIGH"};
 
 void EZOSensor::dump_config() {
   LOG_SENSOR("", "EZO", this);
@@ -20,37 +20,75 @@ void EZOSensor::dump_config() {
 }
 
 void EZOSensor::update() {
-  if (this->state_ & EZO_STATE_WAIT) {
-    ESP_LOGE(TAG, "update overrun, still waiting for previous response");
+  // Check if a read is in there already and if not insert on in the second position
+
+  if (!this->commands_.empty() && this->commands_.front()->command_type != EzoCommandType::EZO_READ &&
+      this->commands_.size() > 1) {
+    bool found = false;
+
+    for (auto &i : this->commands_) {
+      if (i->command_type == EzoCommandType::EZO_READ) {
+        found = true;
+        break;
+      }
+    }
+
+    if (!found) {
+      std::unique_ptr<EzoCommand> ezo_command(new EzoCommand);
+      ezo_command->command = "R";
+      ezo_command->command_type = EzoCommandType::EZO_READ;
+      ezo_command->delay_ms = 900;
+
+      auto it = this->commands_.begin();
+      ++it;
+      this->commands_.insert(it, std::move(ezo_command));
+    }
+
     return;
   }
-  uint8_t c = 'R';
-  this->write(&c, 1);
-  this->state_ |= EZO_STATE_WAIT;
-  this->start_time_ = millis();
-  this->wait_time_ = 900;
+
+  this->get_state();
 }
 
 void EZOSensor::loop() {
-  uint8_t buf[21];
-  if (!(this->state_ & EZO_STATE_WAIT)) {
-    if (this->state_ & EZO_STATE_SEND_TEMP) {
-      int len = sprintf((char *) buf, "T,%0.3f", this->tempcomp_);
-      this->write(buf, len);
-      this->state_ = EZO_STATE_WAIT | EZO_STATE_WAIT_TEMP;
-      this->start_time_ = millis();
-      this->wait_time_ = 300;
+  if (this->commands_.empty()) {
+    return;
+  }
+
+  EzoCommand *to_run = this->commands_.front().get();
+
+  if (!to_run->command_sent) {
+    const uint8_t *data = reinterpret_cast<const uint8_t *>(to_run->command.c_str());
+    ESP_LOGVV(TAG, "Sending command \"%s\"", data);
+
+    this->write(data, to_run->command.length());
+
+    if (to_run->command_type == EzoCommandType::EZO_SLEEP ||
+        to_run->command_type == EzoCommandType::EZO_I2C) {  // Commands with no return data
+      this->commands_.pop_front();
+      if (to_run->command_type == EzoCommandType::EZO_I2C)
+        this->address_ = this->new_address_;
+      return;
     }
+
+    this->start_time_ = millis();
+    to_run->command_sent = true;
     return;
   }
-  if (millis() - this->start_time_ < this->wait_time_)
+
+  if (millis() - this->start_time_ < to_run->delay_ms)
     return;
+
+  uint8_t buf[32];
+
   buf[0] = 0;
-  if (!this->read_bytes_raw(buf, 20)) {
+
+  if (!this->read_bytes_raw(buf, 32)) {
     ESP_LOGE(TAG, "read error");
-    this->state_ = 0;
+    this->commands_.pop_front();
     return;
   }
+
   switch (buf[0]) {
     case 1:
       break;
@@ -66,28 +104,142 @@ void EZOSensor::loop() {
       ESP_LOGE(TAG, "device returned an unknown response: %d", buf[0]);
       break;
   }
-  if (this->state_ & EZO_STATE_WAIT_TEMP) {
-    this->state_ = 0;
-    return;
-  }
-  this->state_ &= ~EZO_STATE_WAIT;
-  if (buf[0] != 1)
-    return;
 
-  // some sensors return multiple comma-separated values, terminate string after first one
-  for (size_t i = 1; i < sizeof(buf) - 1; i++) {
-    if (buf[i] == ',')
-      buf[i] = '\0';
+  ESP_LOGV(TAG, "Received buffer \"%s\" for command type %s", buf, EZO_COMMAND_TYPE_STRINGS[to_run->command_type]);
+
+  if ((buf[0] == 1) || (to_run->command_type == EzoCommandType::EZO_CALIBRATION)) {  // EZO_CALIBRATION returns 0-3
+    // some sensors return multiple comma-separated values, terminate string after first one
+    for (size_t i = 1; i < sizeof(buf) - 1; i++) {
+      if (buf[i] == ',') {
+        buf[i] = '\0';
+        break;
+      }
+    }
+    std::string payload = reinterpret_cast<char *>(&buf[1]);
+    if (!payload.empty()) {
+      switch (to_run->command_type) {
+        case EzoCommandType::EZO_READ: {
+          auto val = parse_number<float>(payload);
+          if (!val.has_value()) {
+            ESP_LOGW(TAG, "Can't convert '%s' to number!", payload.c_str());
+          } else {
+            this->publish_state(*val);
+          }
+          break;
+        }
+        case EzoCommandType::EZO_LED: {
+          this->led_callback_.call(payload.back() == '1');
+          break;
+        }
+        case EzoCommandType::EZO_DEVICE_INFORMATION: {
+          int start_location = 0;
+          if ((start_location = payload.find(',')) != std::string::npos) {
+            this->device_infomation_callback_.call(payload.substr(start_location + 1));
+          }
+          break;
+        }
+        case EzoCommandType::EZO_SLOPE: {
+          int start_location = 0;
+          if ((start_location = payload.find(',')) != std::string::npos) {
+            this->slope_callback_.call(payload.substr(start_location + 1));
+          }
+          break;
+        }
+        case EzoCommandType::EZO_CALIBRATION: {
+          int start_location = 0;
+          if ((start_location = payload.find(',')) != std::string::npos) {
+            this->calibration_callback_.call(payload.substr(start_location + 1));
+          }
+          break;
+        }
+        case EzoCommandType::EZO_T: {
+          this->t_callback_.call(payload);
+          break;
+        }
+        case EzoCommandType::EZO_CUSTOM: {
+          this->custom_callback_.call(payload);
+          break;
+        }
+        default: {
+          break;
+        }
+      }
+    }
   }
 
-  float val = parse_number<float>((char *) &buf[1]).value_or(0);
-  this->publish_state(val);
+  this->commands_.pop_front();
 }
 
-void EZOSensor::set_tempcomp_value(float temp) {
-  this->tempcomp_ = temp;
-  this->state_ |= EZO_STATE_SEND_TEMP;
+void EZOSensor::add_command_(const std::string &command, EzoCommandType command_type, uint16_t delay_ms) {
+  std::unique_ptr<EzoCommand> ezo_command(new EzoCommand);
+  ezo_command->command = command;
+  ezo_command->command_type = command_type;
+  ezo_command->delay_ms = delay_ms;
+  this->commands_.push_back(std::move(ezo_command));
+};
+
+void EZOSensor::set_calibration_point_(EzoCalibrationType type, float value) {
+  std::string payload = str_sprintf("Cal,%s,%0.2f", EZO_CALIBRATION_TYPE_STRINGS[type], value);
+  this->add_command_(payload, EzoCommandType::EZO_CALIBRATION, 900);
 }
 
+void EZOSensor::set_address(uint8_t address) {
+  if (address > 0 && address < 128) {
+    std::string payload = str_sprintf("I2C,%u", address);
+    this->new_address_ = address;
+    this->add_command_(payload, EzoCommandType::EZO_I2C);
+  } else {
+    ESP_LOGE(TAG, "Invalid I2C address");
+  }
+}
+
+void EZOSensor::get_device_information() { this->add_command_("i", EzoCommandType::EZO_DEVICE_INFORMATION); }
+
+void EZOSensor::set_sleep() { this->add_command_("Sleep", EzoCommandType::EZO_SLEEP); }
+
+void EZOSensor::get_state() { this->add_command_("R", EzoCommandType::EZO_READ, 900); }
+
+void EZOSensor::get_slope() { this->add_command_("Slope,?", EzoCommandType::EZO_SLOPE); }
+
+void EZOSensor::get_t() { this->add_command_("T,?", EzoCommandType::EZO_T); }
+
+void EZOSensor::set_t(float value) {
+  std::string payload = str_sprintf("T,%0.2f", value);
+  this->add_command_(payload, EzoCommandType::EZO_T);
+}
+
+void EZOSensor::set_tempcomp_value(float temp) { this->set_t(temp); }
+
+void EZOSensor::get_calibration() { this->add_command_("Cal,?", EzoCommandType::EZO_CALIBRATION); }
+
+void EZOSensor::set_calibration_point_low(float value) {
+  this->set_calibration_point_(EzoCalibrationType::EZO_CAL_LOW, value);
+}
+
+void EZOSensor::set_calibration_point_mid(float value) {
+  this->set_calibration_point_(EzoCalibrationType::EZO_CAL_MID, value);
+}
+
+void EZOSensor::set_calibration_point_high(float value) {
+  this->set_calibration_point_(EzoCalibrationType::EZO_CAL_HIGH, value);
+}
+
+void EZOSensor::set_calibration_generic(float value) {
+  std::string payload = str_sprintf("Cal,%0.2f", value);
+  this->add_command_(payload, EzoCommandType::EZO_CALIBRATION, 900);
+}
+
+void EZOSensor::clear_calibration() { this->add_command_("Cal,clear", EzoCommandType::EZO_CALIBRATION); }
+
+void EZOSensor::get_led_state() { this->add_command_("L,?", EzoCommandType::EZO_LED); }
+
+void EZOSensor::set_led_state(bool on) {
+  std::string to_send = "L,";
+  to_send += on ? "1" : "0";
+  this->add_command_(to_send, EzoCommandType::EZO_LED);
+}
+
+void EZOSensor::send_custom(const std::string &to_send) { this->add_command_(to_send, EzoCommandType::EZO_CUSTOM); }
+
 }  // namespace ezo
 }  // namespace esphome
diff --git a/esphome/components/ezo/ezo.h b/esphome/components/ezo/ezo.h
index d46d193ae7..72e82a574f 100644
--- a/esphome/components/ezo/ezo.h
+++ b/esphome/components/ezo/ezo.h
@@ -3,10 +3,35 @@
 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/i2c/i2c.h"
+#include <deque>
 
 namespace esphome {
 namespace ezo {
 
+static const char *const TAG = "ezo.sensor";
+
+enum EzoCommandType : uint8_t {
+  EZO_READ = 0,
+  EZO_LED = 1,
+  EZO_DEVICE_INFORMATION = 2,
+  EZO_SLOPE = 3,
+  EZO_CALIBRATION,
+  EZO_SLEEP = 4,
+  EZO_I2C = 5,
+  EZO_T = 6,
+  EZO_CUSTOM = 7
+};
+
+enum EzoCalibrationType : uint8_t { EZO_CAL_LOW = 0, EZO_CAL_MID = 1, EZO_CAL_HIGH = 2 };
+
+class EzoCommand {
+ public:
+  std::string command;
+  uint16_t delay_ms = 0;
+  bool command_sent = false;
+  EzoCommandType command_type;
+};
+
 /// This class implements support for the EZO circuits in i2c mode
 class EZOSensor : public sensor::Sensor, public PollingComponent, public i2c::I2CDevice {
  public:
@@ -15,13 +40,71 @@ class EZOSensor : public sensor::Sensor, public PollingComponent, public i2c::I2
   void update() override;
   float get_setup_priority() const override { return setup_priority::DATA; };
 
-  void set_tempcomp_value(float temp);
+  // I2C
+  void set_address(uint8_t address);
+
+  // Device Information
+  void get_device_information();
+  void add_device_infomation_callback(std::function<void(std::string)> &&callback) {
+    this->device_infomation_callback_.add(std::move(callback));
+  }
+
+  // Sleep
+  void set_sleep();
+
+  // R
+  void get_state();
+
+  // Slope
+  void get_slope();
+  void add_slope_callback(std::function<void(std::string)> &&callback) {
+    this->slope_callback_.add(std::move(callback));
+  }
+
+  // T
+  void get_t();
+  void set_t(float value);
+  void set_tempcomp_value(float temp);  // For backwards compatibility
+  void add_t_callback(std::function<void(std::string)> &&callback) { this->t_callback_.add(std::move(callback)); }
+
+  // Calibration
+  void get_calibration();
+  void set_calibration_point_low(float value);
+  void set_calibration_point_mid(float value);
+  void set_calibration_point_high(float value);
+  void set_calibration_generic(float value);
+  void clear_calibration();
+  void add_calibration_callback(std::function<void(std::string)> &&callback) {
+    this->calibration_callback_.add(std::move(callback));
+  }
+
+  // LED
+  void get_led_state();
+  void set_led_state(bool on);
+  void add_led_state_callback(std::function<void(bool)> &&callback) { this->led_callback_.add(std::move(callback)); }
+
+  // Custom
+  void send_custom(const std::string &to_send);
+  void add_custom_callback(std::function<void(std::string)> &&callback) {
+    this->custom_callback_.add(std::move(callback));
+  }
 
  protected:
+  std::deque<std::unique_ptr<EzoCommand>> commands_;
+  int new_address_;
+
+  void add_command_(const std::string &command, EzoCommandType command_type, uint16_t delay_ms = 300);
+
+  void set_calibration_point_(EzoCalibrationType type, float value);
+
+  CallbackManager<void(std::string)> device_infomation_callback_{};
+  CallbackManager<void(std::string)> calibration_callback_{};
+  CallbackManager<void(std::string)> slope_callback_{};
+  CallbackManager<void(std::string)> t_callback_{};
+  CallbackManager<void(std::string)> custom_callback_{};
+  CallbackManager<void(bool)> led_callback_{};
+
   uint32_t start_time_ = 0;
-  uint32_t wait_time_ = 0;
-  uint16_t state_ = 0;
-  float tempcomp_;
 };
 
 }  // namespace ezo
diff --git a/esphome/components/ezo/sensor.py b/esphome/components/ezo/sensor.py
index 09b36b7135..049b1bf4d0 100644
--- a/esphome/components/ezo/sensor.py
+++ b/esphome/components/ezo/sensor.py
@@ -1,22 +1,81 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
+from esphome import automation
 from esphome.components import i2c, sensor
-from esphome.const import CONF_ID
+from esphome.const import CONF_ID, CONF_TRIGGER_ID
 
 CODEOWNERS = ["@ssieb"]
 
 DEPENDENCIES = ["i2c"]
 
+CONF_ON_LED = "on_led"
+CONF_ON_DEVICE_INFORMATION = "on_device_information"
+CONF_ON_SLOPE = "on_slope"
+CONF_ON_CALIBRATION = "on_calibration"
+CONF_ON_T = "on_t"
+CONF_ON_CUSTOM = "on_custom"
+
 ezo_ns = cg.esphome_ns.namespace("ezo")
 
 EZOSensor = ezo_ns.class_(
     "EZOSensor", sensor.Sensor, cg.PollingComponent, i2c.I2CDevice
 )
 
+CustomTrigger = ezo_ns.class_(
+    "CustomTrigger", automation.Trigger.template(cg.std_string)
+)
+
+
+TTrigger = ezo_ns.class_("TTrigger", automation.Trigger.template(cg.std_string))
+
+SlopeTrigger = ezo_ns.class_("SlopeTrigger", automation.Trigger.template(cg.std_string))
+
+CalibrationTrigger = ezo_ns.class_(
+    "CalibrationTrigger", automation.Trigger.template(cg.std_string)
+)
+
+DeviceInformationTrigger = ezo_ns.class_(
+    "DeviceInformationTrigger", automation.Trigger.template(cg.std_string)
+)
+
+LedTrigger = ezo_ns.class_("LedTrigger", automation.Trigger.template(cg.bool_))
+
 CONFIG_SCHEMA = (
     sensor.SENSOR_SCHEMA.extend(
         {
             cv.GenerateID(): cv.declare_id(EZOSensor),
+            cv.Optional(CONF_ON_CUSTOM): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(CustomTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_CALIBRATION): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(CalibrationTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_SLOPE): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(SlopeTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_T): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(TTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_DEVICE_INFORMATION): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                        DeviceInformationTrigger
+                    ),
+                }
+            ),
+            cv.Optional(CONF_ON_LED): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(LedTrigger),
+                }
+            ),
         }
     )
     .extend(cv.polling_component_schema("60s"))
@@ -29,3 +88,27 @@ async def to_code(config):
     await cg.register_component(var, config)
     await sensor.register_sensor(var, config)
     await i2c.register_i2c_device(var, config)
+
+    for conf in config.get(CONF_ON_CUSTOM, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [(cg.std_string, "x")], conf)
+
+    for conf in config.get(CONF_ON_LED, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [(bool, "x")], conf)
+
+    for conf in config.get(CONF_ON_DEVICE_INFORMATION, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [(cg.std_string, "x")], conf)
+
+    for conf in config.get(CONF_ON_SLOPE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [(cg.std_string, "x")], conf)
+
+    for conf in config.get(CONF_ON_CALIBRATION, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [(cg.std_string, "x")], conf)
+
+    for conf in config.get(CONF_ON_T, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [(cg.std_string, "x")], conf)

From 5a0bf9fee996310b141d620317475f730e6e8724 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 9 Nov 2022 16:46:44 +1300
Subject: [PATCH 220/838] Bump esphome-dashboard to 20221109.0 (#4006)

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

diff --git a/requirements.txt b/requirements.txt
index 86b248f978..55da7ec57a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.1.5  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
-esphome-dashboard==20221020.0
+esphome-dashboard==20221109.0
 aioesphomeapi==11.4.3
 zeroconf==0.39.4
 

From 8c122aa372e620ee95d19d6920510ab595e3e51c Mon Sep 17 00:00:00 2001
From: jimtng <2554958+jimtng@users.noreply.github.com>
Date: Wed, 9 Nov 2022 13:51:59 +1000
Subject: [PATCH 221/838] Add support for parameters in scripts (#3538)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
fixes https://github.com/esphome/feature-requests/issues/241
---
 esphome/components/script/__init__.py | 108 ++++++++++++++++--
 esphome/components/script/script.cpp  |  57 +---------
 esphome/components/script/script.h    | 151 +++++++++++++++++++++-----
 esphome/const.py                      |   1 +
 tests/test2.yaml                      |  17 +++
 5 files changed, 243 insertions(+), 91 deletions(-)

diff --git a/esphome/components/script/__init__.py b/esphome/components/script/__init__.py
index 9702878475..907d7bf0e3 100644
--- a/esphome/components/script/__init__.py
+++ b/esphome/components/script/__init__.py
@@ -2,7 +2,8 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
 from esphome.automation import maybe_simple_id
-from esphome.const import CONF_ID, CONF_MODE
+from esphome.const import CONF_ID, CONF_MODE, CONF_PARAMETERS
+from esphome.core import CORE, EsphomeError
 
 CODEOWNERS = ["@esphome/core"]
 script_ns = cg.esphome_ns.namespace("script")
@@ -16,6 +17,7 @@ RestartScript = script_ns.class_("RestartScript", Script)
 QueueingScript = script_ns.class_("QueueingScript", Script, cg.Component)
 ParallelScript = script_ns.class_("ParallelScript", Script)
 
+CONF_SCRIPT = "script"
 CONF_SINGLE = "single"
 CONF_RESTART = "restart"
 CONF_QUEUED = "queued"
@@ -29,6 +31,18 @@ SCRIPT_MODES = {
     CONF_PARALLEL: ParallelScript,
 }
 
+PARAMETER_TYPE_TRANSLATIONS = {
+    "string": "std::string",
+}
+
+
+def get_script(script_id):
+    scripts = CORE.config.get(CONF_SCRIPT, {})
+    for script in scripts:
+        if script.get(CONF_ID, None) == script_id:
+            return script
+    raise cv.Invalid(f"Script id '{script_id}' not found")
+
 
 def check_max_runs(value):
     if CONF_MAX_RUNS not in value:
@@ -47,6 +61,44 @@ def assign_declare_id(value):
     return value
 
 
+def parameters_to_template(args):
+
+    template_args = []
+    func_args = []
+    script_arg_names = []
+    for name, type_ in args.items():
+        array = False
+        if type_.endswith("[]"):
+            array = True
+            type_ = type_[:-2]
+        type_ = PARAMETER_TYPE_TRANSLATIONS.get(type_, type_)
+        if array:
+            type_ = f"std::vector<{type_}>"
+        type_ = cg.esphome_ns.namespace(type_)
+        template_args.append(type_)
+        func_args.append((type_, name))
+        script_arg_names.append(name)
+    template = cg.TemplateArguments(*template_args)
+    return template, func_args
+
+
+def validate_parameter_name(value):
+    value = cv.string(value)
+    if value != CONF_ID:
+        return value
+    raise cv.Invalid(f"Script's parameter name cannot be {CONF_ID}")
+
+
+ALLOWED_PARAM_TYPE_CHARSET = set("abcdefghijklmnopqrstuvwxyz0123456789_:*&[]")
+
+
+def validate_parameter_type(value):
+    value = cv.string_strict(value)
+    if set(value.lower()) <= ALLOWED_PARAM_TYPE_CHARSET:
+        return value
+    raise cv.Invalid("Parameter type contains invalid characters")
+
+
 CONFIG_SCHEMA = automation.validate_automation(
     {
         # Don't declare id as cv.declare_id yet, because the ID type
@@ -56,6 +108,11 @@ CONFIG_SCHEMA = automation.validate_automation(
             *SCRIPT_MODES, lower=True
         ),
         cv.Optional(CONF_MAX_RUNS): cv.positive_int,
+        cv.Optional(CONF_PARAMETERS, default={}): cv.Schema(
+            {
+                validate_parameter_name: validate_parameter_type,
+            }
+        ),
     },
     extra_validators=cv.All(check_max_runs, assign_declare_id),
 )
@@ -65,7 +122,8 @@ async def to_code(config):
     # Register all variables first, so that scripts can use other scripts
     triggers = []
     for conf in config:
-        trigger = cg.new_Pvariable(conf[CONF_ID])
+        template, func_args = parameters_to_template(conf[CONF_PARAMETERS])
+        trigger = cg.new_Pvariable(conf[CONF_ID], template)
         # Add a human-readable name to the script
         cg.add(trigger.set_name(conf[CONF_ID].id))
 
@@ -75,10 +133,10 @@ async def to_code(config):
         if conf[CONF_MODE] == CONF_QUEUED:
             await cg.register_component(trigger, conf)
 
-        triggers.append((trigger, conf))
+        triggers.append((trigger, func_args, conf))
 
-    for trigger, conf in triggers:
-        await automation.build_automation(trigger, [], conf)
+    for trigger, func_args, conf in triggers:
+        await automation.build_automation(trigger, func_args, conf)
 
 
 @automation.register_action(
@@ -87,12 +145,39 @@ async def to_code(config):
     maybe_simple_id(
         {
             cv.Required(CONF_ID): cv.use_id(Script),
-        }
+            cv.Optional(validate_parameter_name): cv.templatable(cv.valid),
+        },
     ),
 )
 async def script_execute_action_to_code(config, action_id, template_arg, args):
+    async def get_ordered_args(config, script_params):
+        config_args = config.copy()
+        config_args.pop(CONF_ID)
+
+        # match script_args to the formal parameter order
+        script_args = []
+        for type, name in script_params:
+            if name not in config_args:
+                raise EsphomeError(
+                    f"Missing parameter: '{name}' in script.execute {config[CONF_ID]}"
+                )
+            arg = await cg.templatable(config_args[name], args, type)
+            script_args.append(arg)
+        return script_args
+
+    script = get_script(config[CONF_ID])
+    params = script.get(CONF_PARAMETERS, [])
+    template, script_params = parameters_to_template(params)
+    script_args = await get_ordered_args(config, script_params)
+
+    # We need to use the parent class 'Script' as the template argument
+    # to match the partial specialization of the ScriptExecuteAction template
+    template_arg = cg.TemplateArguments(Script.template(template), *template_arg)
+
     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)
+    cg.add(var.set_args(*script_args))
+    return var
 
 
 @automation.register_action(
@@ -101,7 +186,8 @@ async def script_execute_action_to_code(config, action_id, template_arg, args):
     maybe_simple_id({cv.Required(CONF_ID): cv.use_id(Script)}),
 )
 async def script_stop_action_to_code(config, action_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
+    full_id, paren = await cg.get_variable_with_full_id(config[CONF_ID])
+    template_arg = cg.TemplateArguments(full_id.type, *template_arg)
     return cg.new_Pvariable(action_id, template_arg, paren)
 
 
@@ -111,7 +197,8 @@ async def script_stop_action_to_code(config, action_id, template_arg, args):
     maybe_simple_id({cv.Required(CONF_ID): cv.use_id(Script)}),
 )
 async def script_wait_action_to_code(config, action_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
+    full_id, paren = await cg.get_variable_with_full_id(config[CONF_ID])
+    template_arg = cg.TemplateArguments(full_id.type, *template_arg)
     var = cg.new_Pvariable(action_id, template_arg, paren)
     await cg.register_component(var, {})
     return var
@@ -123,5 +210,6 @@ async def script_wait_action_to_code(config, action_id, template_arg, args):
     automation.maybe_simple_id({cv.Required(CONF_ID): cv.use_id(Script)}),
 )
 async def script_is_running_to_code(config, condition_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
+    full_id, paren = await cg.get_variable_with_full_id(config[CONF_ID])
+    template_arg = cg.TemplateArguments(full_id.type, *template_arg)
     return cg.new_Pvariable(condition_id, template_arg, paren)
diff --git a/esphome/components/script/script.cpp b/esphome/components/script/script.cpp
index 46bcef905b..331f7dcd65 100644
--- a/esphome/components/script/script.cpp
+++ b/esphome/components/script/script.cpp
@@ -6,61 +6,8 @@ namespace script {
 
 static const char *const TAG = "script";
 
-void SingleScript::execute() {
-  if (this->is_action_running()) {
-    ESP_LOGW(TAG, "Script '%s' is already running! (mode: single)", this->name_.c_str());
-    return;
-  }
-
-  this->trigger();
-}
-
-void RestartScript::execute() {
-  if (this->is_action_running()) {
-    ESP_LOGD(TAG, "Script '%s' restarting (mode: restart)", this->name_.c_str());
-    this->stop_action();
-  }
-
-  this->trigger();
-}
-
-void QueueingScript::execute() {
-  if (this->is_action_running()) {
-    // num_runs_ is the number of *queued* instances, so total number of instances is
-    // num_runs_ + 1
-    if (this->max_runs_ != 0 && this->num_runs_ + 1 >= this->max_runs_) {
-      ESP_LOGW(TAG, "Script '%s' maximum number of queued runs exceeded!", this->name_.c_str());
-      return;
-    }
-
-    ESP_LOGD(TAG, "Script '%s' queueing new instance (mode: queued)", this->name_.c_str());
-    this->num_runs_++;
-    return;
-  }
-
-  this->trigger();
-  // Check if the trigger was immediate and we can continue right away.
-  this->loop();
-}
-
-void QueueingScript::stop() {
-  this->num_runs_ = 0;
-  Script::stop();
-}
-
-void QueueingScript::loop() {
-  if (this->num_runs_ != 0 && !this->is_action_running()) {
-    this->num_runs_--;
-    this->trigger();
-  }
-}
-
-void ParallelScript::execute() {
-  if (this->max_runs_ != 0 && this->automation_parent_->num_running() >= this->max_runs_) {
-    ESP_LOGW(TAG, "Script '%s' maximum number of parallel runs exceeded!", this->name_.c_str());
-    return;
-  }
-  this->trigger();
+void ScriptLogger::esp_log_(int level, int line, const char *format, const char *param) {
+  esp_log_printf_(level, TAG, line, format, param);
 }
 
 }  // namespace script
diff --git a/esphome/components/script/script.h b/esphome/components/script/script.h
index 5663d32ce8..f3a83cd6ec 100644
--- a/esphome/components/script/script.h
+++ b/esphome/components/script/script.h
@@ -2,27 +2,48 @@
 
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
+#include "esphome/core/log.h"
 
 namespace esphome {
 namespace script {
 
+class ScriptLogger {
+ protected:
+  void esp_logw_(int line, const char *format, const char *param) {
+    esp_log_(ESPHOME_LOG_LEVEL_WARN, line, format, param);
+  }
+  void esp_logd_(int line, const char *format, const char *param) {
+    esp_log_(ESPHOME_LOG_LEVEL_DEBUG, line, format, param);
+  }
+  void esp_log_(int level, int line, const char *format, const char *param);
+};
+
 /// The abstract base class for all script types.
-class Script : public Trigger<> {
+template<typename... Ts> class Script : public ScriptLogger, public Trigger<Ts...> {
  public:
   /** Execute a new instance of this script.
    *
    * The behavior of this function when a script is already running is defined by the subtypes
    */
-  virtual void execute() = 0;
+  virtual void execute(Ts...) = 0;
   /// Check if any instance of this script is currently running.
   virtual bool is_running() { return this->is_action_running(); }
   /// Stop all instances of this script.
   virtual void stop() { this->stop_action(); }
 
+  // execute this script using a tuple that contains the arguments
+  void execute_tuple(const std::tuple<Ts...> &tuple) {
+    this->execute_tuple_(tuple, typename gens<sizeof...(Ts)>::type());
+  }
+
   // Internal function to give scripts readable names.
   void set_name(const std::string &name) { name_ = name; }
 
  protected:
+  template<int... S> void execute_tuple_(const std::tuple<Ts...> &tuple, seq<S...> /*unused*/) {
+    this->execute(std::get<S>(tuple)...);
+  }
+
   std::string name_;
 };
 
@@ -31,9 +52,16 @@ class Script : public Trigger<> {
  * If a new instance is executed while the previous one hasn't finished yet,
  * a warning is printed and the new instance is discarded.
  */
-class SingleScript : public Script {
+template<typename... Ts> class SingleScript : public Script<Ts...> {
  public:
-  void execute() override;
+  void execute(Ts... x) override {
+    if (this->is_action_running()) {
+      this->esp_logw_(__LINE__, "Script '%s' is already running! (mode: single)", this->name_.c_str());
+      return;
+    }
+
+    this->trigger(x...);
+  }
 };
 
 /** A script type that restarts scripts from the beginning when a new instance is started.
@@ -41,20 +69,55 @@ class SingleScript : public Script {
  * If a new instance is started but another one is already running, the existing
  * script is stopped and the new instance starts from the beginning.
  */
-class RestartScript : public Script {
+template<typename... Ts> class RestartScript : public Script<Ts...> {
  public:
-  void execute() override;
+  void execute(Ts... x) override {
+    if (this->is_action_running()) {
+      this->esp_logd_(__LINE__, "Script '%s' restarting (mode: restart)", this->name_.c_str());
+      this->stop_action();
+    }
+
+    this->trigger(x...);
+  }
 };
 
 /** A script type that queues new instances that are created.
  *
  * Only one instance of the script can be active at a time.
  */
-class QueueingScript : public Script, public Component {
+template<typename... Ts> class QueueingScript : public Script<Ts...>, public Component {
  public:
-  void execute() override;
-  void stop() override;
-  void loop() override;
+  void execute(Ts... x) override {
+    if (this->is_action_running()) {
+      // num_runs_ is the number of *queued* instances, so total number of instances is
+      // num_runs_ + 1
+      if (this->max_runs_ != 0 && this->num_runs_ + 1 >= this->max_runs_) {
+        this->esp_logw_(__LINE__, "Script '%s' maximum number of queued runs exceeded!", this->name_.c_str());
+        return;
+      }
+
+      this->esp_logd_(__LINE__, "Script '%s' queueing new instance (mode: queued)", this->name_.c_str());
+      this->num_runs_++;
+      return;
+    }
+
+    this->trigger(x...);
+    // Check if the trigger was immediate and we can continue right away.
+    this->loop();
+  }
+
+  void stop() override {
+    this->num_runs_ = 0;
+    Script<Ts...>::stop();
+  }
+
+  void loop() override {
+    if (this->num_runs_ != 0 && !this->is_action_running()) {
+      this->num_runs_--;
+      this->trigger();
+    }
+  }
+
   void set_max_runs(int max_runs) { max_runs_ = max_runs; }
 
  protected:
@@ -67,48 +130,84 @@ class QueueingScript : public Script, public Component {
  * If a new instance is started while previous ones haven't finished yet,
  * the new one is executed in parallel to the other instances.
  */
-class ParallelScript : public Script {
+template<typename... Ts> class ParallelScript : public Script<Ts...> {
  public:
-  void execute() override;
+  void execute(Ts... x) override {
+    if (this->max_runs_ != 0 && this->automation_parent_->num_running() >= this->max_runs_) {
+      this->esp_logw_(__LINE__, "Script '%s' maximum number of parallel runs exceeded!", this->name_.c_str());
+      return;
+    }
+    this->trigger(x...);
+  }
   void set_max_runs(int max_runs) { max_runs_ = max_runs; }
 
  protected:
   int max_runs_ = 0;
 };
 
-template<typename... Ts> class ScriptExecuteAction : public Action<Ts...> {
- public:
-  ScriptExecuteAction(Script *script) : script_(script) {}
+template<class S, typename... Ts> class ScriptExecuteAction;
 
-  void play(Ts... x) override { this->script_->execute(); }
+template<class... As, typename... Ts> class ScriptExecuteAction<Script<As...>, Ts...> : public Action<Ts...> {
+ public:
+  ScriptExecuteAction(Script<As...> *script) : script_(script) {}
+
+  using Args = std::tuple<TemplatableValue<As, Ts...>...>;
+
+  template<typename... F> void set_args(F... x) { args_ = Args{x...}; }
+
+  void play(Ts... x) override { this->script_->execute_tuple(this->eval_args_(x...)); }
 
  protected:
-  Script *script_;
+  // NOTE:
+  //  `eval_args_impl` functions evaluates `I`th the functions in `args` member.
+  //  and then recursively calls `eval_args_impl` for the `I+1`th arg.
+  //  if `I` = `N` all args have been stored, and nothing is done.
+
+  template<std::size_t N>
+  void eval_args_impl_(std::tuple<As...> & /*unused*/, std::integral_constant<std::size_t, N> /*unused*/,
+                       std::integral_constant<std::size_t, N> /*unused*/, Ts... /*unused*/) {}
+
+  template<std::size_t I, std::size_t N>
+  void eval_args_impl_(std::tuple<As...> &evaled_args, std::integral_constant<std::size_t, I> /*unused*/,
+                       std::integral_constant<std::size_t, N> n, Ts... x) {
+    std::get<I>(evaled_args) = std::get<I>(args_).value(x...);  // NOTE: evaluate `i`th arg, and store in tuple.
+    eval_args_impl_(evaled_args, std::integral_constant<std::size_t, I + 1>{}, n,
+                    x...);  // NOTE: recurse to next index.
+  }
+
+  std::tuple<As...> eval_args_(Ts... x) {
+    std::tuple<As...> evaled_args;
+    eval_args_impl_(evaled_args, std::integral_constant<std::size_t, 0>{}, std::tuple_size<Args>{}, x...);
+    return evaled_args;
+  }
+
+  Script<As...> *script_;
+  Args args_;
 };
 
-template<typename... Ts> class ScriptStopAction : public Action<Ts...> {
+template<class C, typename... Ts> class ScriptStopAction : public Action<Ts...> {
  public:
-  ScriptStopAction(Script *script) : script_(script) {}
+  ScriptStopAction(C *script) : script_(script) {}
 
   void play(Ts... x) override { this->script_->stop(); }
 
  protected:
-  Script *script_;
+  C *script_;
 };
 
-template<typename... Ts> class IsRunningCondition : public Condition<Ts...> {
+template<class C, typename... Ts> class IsRunningCondition : public Condition<Ts...> {
  public:
-  explicit IsRunningCondition(Script *parent) : parent_(parent) {}
+  explicit IsRunningCondition(C *parent) : parent_(parent) {}
 
   bool check(Ts... x) override { return this->parent_->is_running(); }
 
  protected:
-  Script *parent_;
+  C *parent_;
 };
 
-template<typename... Ts> class ScriptWaitAction : public Action<Ts...>, public Component {
+template<class C, typename... Ts> class ScriptWaitAction : public Action<Ts...>, public Component {
  public:
-  ScriptWaitAction(Script *script) : script_(script) {}
+  ScriptWaitAction(C *script) : script_(script) {}
 
   void play_complex(Ts... x) override {
     this->num_running_++;
@@ -137,7 +236,7 @@ template<typename... Ts> class ScriptWaitAction : public Action<Ts...>, public C
   }
 
  protected:
-  Script *script_;
+  C *script_;
   std::tuple<Ts...> var_{};
 };
 
diff --git a/esphome/const.py b/esphome/const.py
index 56f48d2f92..c19da541eb 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -491,6 +491,7 @@ CONF_PACKAGES = "packages"
 CONF_PAGE_ID = "page_id"
 CONF_PAGES = "pages"
 CONF_PANASONIC = "panasonic"
+CONF_PARAMETERS = "parameters"
 CONF_PASSWORD = "password"
 CONF_PATH = "path"
 CONF_PAYLOAD = "payload"
diff --git a/tests/test2.yaml b/tests/test2.yaml
index d485d3f16c..7d4cb4cbb2 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -532,6 +532,16 @@ text_sensor:
                 ESP_LOGD("main", "The state is %s=%s", x.c_str(), id(version_sensor).state.c_str());
             # yamllint enable rule:line-length
       - script.execute: my_script
+      - script.execute:
+          id: my_script_with_params
+          prefix: Running my_script_with_params
+          param2: 100
+          param3: true
+      - script.execute:
+          id: my_script_with_params
+          prefix: Running my_script_with_params using lambda parameters
+          param2: !lambda return 200;
+          param3: !lambda return true;
       - homeassistant.service:
           service: notify.html5
           data:
@@ -597,6 +607,13 @@ script:
     mode: restart
     then:
       - lambda: 'ESP_LOGD("main", "Hello World!");'
+  - id: my_script_with_params
+    parameters:
+      prefix: string
+      param2: int
+      param3: bool
+    then:
+      - lambda: 'ESP_LOGD("main", (prefix + " Hello World!" + to_string(param2) + " " + to_string(param3)).c_str());'
 
 stepper:
   - platform: uln2003

From 4fa0e860adab84e8328c65ac6150f2eaa0f9ee17 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 9 Nov 2022 17:27:18 +1300
Subject: [PATCH 222/838] Bump version to 2022.11.0b1

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

diff --git a/esphome/const.py b/esphome/const.py
index c19da541eb..916ce0ea63 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.11.0-dev"
+__version__ = "2022.11.0b1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 3155f02be6e216abe7001a54c1064127119051d2 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 9 Nov 2022 17:27:19 +1300
Subject: [PATCH 223/838] Bump version to 2022.12.0-dev

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

diff --git a/esphome/const.py b/esphome/const.py
index c19da541eb..f85cf88386 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.11.0-dev"
+__version__ = "2022.12.0-dev"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 2455589f614dd78f6e65503e688227992af69663 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 10 Nov 2022 07:42:14 +1300
Subject: [PATCH 224/838] Update set-output to use new GITHUB_OUTPUT (#4008)

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 65d170f5d3..432aee9938 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
             today="$(date --utc '+%Y%m%d')"
             TAG="${TAG}${today}"
           fi
-          echo "::set-output name=tag::${TAG}"
+          echo "tag=${TAG}" >> $GITHUB_OUTPUT
         # yamllint enable rule:line-length
 
   deploy-pypi:

From 0ae61410d26f68ba5d33ef49160fd54f992aba78 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Nov 2022 09:36:53 +1300
Subject: [PATCH 225/838] Bump colorama from 0.4.5 to 0.4.6 (#4010)

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 55da7ec57a..90408a7e14 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 voluptuous==0.13.1
 PyYAML==6.0
 paho-mqtt==1.6.1
-colorama==0.4.5
+colorama==0.4.6
 tornado==6.2
 tzlocal==4.2    # from time
 tzdata>=2021.1  # from time

From 3d927c2f446d2fea1c52185dba7c9b775b621cc4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Nov 2022 09:38:21 +1300
Subject: [PATCH 226/838] Bump frenck/action-yamllint from 1.3.0 to 1.3.1
 (#4011)

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8e09fef069..3baaf02506 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -177,7 +177,7 @@ jobs:
 
       - name: Run yamllint
         if: matrix.id == 'yamllint'
-        uses: frenck/action-yamllint@v1.3.0
+        uses: frenck/action-yamllint@v1.3.1
 
       - name: Suggested changes
         run: script/ci-suggest-changes

From dc17c47634375298c92391324270ef6330a0232e Mon Sep 17 00:00:00 2001
From: maringeph <maringeph@yahoo.com>
Date: Wed, 9 Nov 2022 21:40:13 +0100
Subject: [PATCH 227/838] Add cover toggle support to current based cover
 (#3950)

---
 .../current_based/current_based_cover.cpp       | 17 +++++++++++++++++
 .../current_based/current_based_cover.h         |  2 ++
 tests/test3.yaml                                |  2 ++
 3 files changed, 21 insertions(+)

diff --git a/esphome/components/current_based/current_based_cover.cpp b/esphome/components/current_based/current_based_cover.cpp
index 4a52770bcf..3d7a9b8425 100644
--- a/esphome/components/current_based/current_based_cover.cpp
+++ b/esphome/components/current_based/current_based_cover.cpp
@@ -13,6 +13,7 @@ using namespace esphome::cover;
 CoverTraits CurrentBasedCover::get_traits() {
   auto traits = CoverTraits();
   traits.set_supports_position(true);
+  traits.set_supports_toggle(true);
   traits.set_is_assumed_state(false);
   return traits;
 }
@@ -20,6 +21,20 @@ void CurrentBasedCover::control(const CoverCall &call) {
   if (call.get_stop()) {
     this->direction_idle_();
   }
+  if (call.get_toggle().has_value()) {
+    if (this->current_operation != COVER_OPERATION_IDLE) {
+      this->start_direction_(COVER_OPERATION_IDLE);
+      this->publish_state();
+    } else {
+      if (this->position == COVER_CLOSED || this->last_operation_ == COVER_OPERATION_CLOSING) {
+        this->target_position_ = COVER_OPEN;
+        this->start_direction_(COVER_OPERATION_OPENING);
+      } else {
+        this->target_position_ = COVER_CLOSED;
+        this->start_direction_(COVER_OPERATION_CLOSING);
+      }
+    }
+  }
   if (call.get_position().has_value()) {
     auto pos = *call.get_position();
     if (pos == this->position) {
@@ -202,9 +217,11 @@ void CurrentBasedCover::start_direction_(CoverOperation dir) {
       trig = this->stop_trigger_;
       break;
     case COVER_OPERATION_OPENING:
+      this->last_operation_ = dir;
       trig = this->open_trigger_;
       break;
     case COVER_OPERATION_CLOSING:
+      this->last_operation_ = dir;
       trig = this->close_trigger_;
       break;
     default:
diff --git a/esphome/components/current_based/current_based_cover.h b/esphome/components/current_based/current_based_cover.h
index 220b770c05..b172e762b0 100644
--- a/esphome/components/current_based/current_based_cover.h
+++ b/esphome/components/current_based/current_based_cover.h
@@ -89,6 +89,8 @@ class CurrentBasedCover : public cover::Cover, public Component {
   uint32_t start_dir_time_{0};
   uint32_t last_publish_time_{0};
   float target_position_{0};
+
+  cover::CoverOperation last_operation_{cover::COVER_OPERATION_OPENING};
 };
 
 }  // namespace current_based
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 8150f43e02..da704d90a3 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -884,6 +884,7 @@ binary_sensor:
       then:
         - cover.toggle: time_based_cover
         - cover.toggle: endstop_cover
+        - cover.toggle: current_based_cover
   - platform: hydreon_rgxx
     hydreon_rgxx_id: hydreon_rg9
     too_cold:
@@ -1246,6 +1247,7 @@ cover:
     close_duration: 4.5min
   - platform: current_based
     name: Current Based Cover
+    id: current_based_cover
     open_sensor: ade7953_current_a
     open_moving_current_threshold: 0.5
     open_obstacle_current_threshold: 0.8

From 7c8f502e7ec1dba04b96264fac398daf41e2cd22 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 10 Nov 2022 09:42:03 +1300
Subject: [PATCH 228/838] Add option for dashboard command to only generate the
 project and supporting files (#3981)

---
 esphome/dashboard/dashboard.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index d551c9da4b..b7c24f9e2e 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -313,7 +313,11 @@ class EsphomeUploadHandler(EsphomeCommandWebSocket):
 class EsphomeCompileHandler(EsphomeCommandWebSocket):
     def build_command(self, json_message):
         config_file = settings.rel_path(json_message["configuration"])
-        return ["esphome", "--dashboard", "compile", config_file]
+        command = ["esphome", "--dashboard", "compile"]
+        if json_message.get("only_generate", False):
+            command.append("--only-generate")
+        command.append(config_file)
+        return command
 
 
 class EsphomeValidateHandler(EsphomeCommandWebSocket):

From fcec7d45cb536595e0cd8289286fb0be24fe731d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=2E=20=C3=81rkosi=20R=C3=B3bert?= <robreg@zsurob.hu>
Date: Wed, 9 Nov 2022 21:46:51 +0100
Subject: [PATCH 229/838] add two new icons (#3963)

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

diff --git a/esphome/const.py b/esphome/const.py
index f85cf88386..4b259984eb 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -803,6 +803,7 @@ ICON_BRIGHTNESS_6 = "mdi:brightness-6"
 ICON_BUG = "mdi:bug"
 ICON_CHECK_CIRCLE_OUTLINE = "mdi:check-circle-outline"
 ICON_CHEMICAL_WEAPON = "mdi:chemical-weapon"
+ICON_CHIP = "mdi:chip"
 ICON_COUNTER = "mdi:counter"
 ICON_CURRENT_AC = "mdi:current-ac"
 ICON_DATABASE = "mdi:database"
@@ -818,6 +819,7 @@ ICON_GRAIN = "mdi:grain"
 ICON_KEY_PLUS = "mdi:key-plus"
 ICON_LIGHTBULB = "mdi:lightbulb"
 ICON_MAGNET = "mdi:magnet"
+ICON_MEMORY = "mdi:memory"
 ICON_MOLECULE_CO2 = "mdi:molecule-co2"
 ICON_MOTION_SENSOR = "mdi:motion-sensor"
 ICON_NEW_BOX = "mdi:new-box"

From 2c2e68123ac4132999f2fd06f6e25ebcf4f9713f Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Wed, 9 Nov 2022 22:59:42 +0100
Subject: [PATCH 230/838] Fix local webserver based on
 esphome/esphome-webserver#17 (#3958)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
fixes https://github.com/esphome/issues/issues/3720
---
 esphome/components/web_server/server_index.h | 1145 +++++++++---------
 1 file changed, 573 insertions(+), 572 deletions(-)

diff --git a/esphome/components/web_server/server_index.h b/esphome/components/web_server/server_index.h
index c02ef279b7..88c62baf50 100644
--- a/esphome/components/web_server/server_index.h
+++ b/esphome/components/web_server/server_index.h
@@ -7,581 +7,582 @@ namespace web_server {
 
 const uint8_t INDEX_GZ[] PROGMEM = {
     0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xbd, 0x7d, 0xd9, 0x76, 0xdb, 0xc8, 0x92, 0xe0, 0xf3,
-    0x9c, 0x33, 0x7f, 0x30, 0x2f, 0x30, 0x4a, 0x6d, 0x03, 0x25, 0x10, 0x22, 0x29, 0xcb, 0x76, 0x81, 0x02, 0x79, 0xe5,
-    0xa5, 0xae, 0x5d, 0xe5, 0xad, 0x2c, 0xd9, 0x75, 0xab, 0x54, 0x2c, 0x0b, 0x22, 0x93, 0x22, 0xca, 0x20, 0xc0, 0x02,
-    0x92, 0x5a, 0x8a, 0x42, 0x9f, 0x7e, 0xea, 0xa7, 0x39, 0x67, 0xd6, 0x87, 0x7e, 0x99, 0xd3, 0xfd, 0x30, 0x1f, 0x31,
-    0xcf, 0xfd, 0x29, 0xf7, 0x07, 0xa6, 0x3f, 0x61, 0x22, 0x22, 0x17, 0x24, 0x40, 0x6a, 0x71, 0x75, 0xcd, 0x3d, 0x5e,
-    0x04, 0xe4, 0x1a, 0x11, 0x19, 0x19, 0x5b, 0x46, 0x42, 0xbb, 0x77, 0xc6, 0xd9, 0x88, 0x5f, 0xcc, 0x99, 0x35, 0xe5,
-    0xb3, 0xa4, 0xbf, 0x2b, 0xff, 0x67, 0xd1, 0xb8, 0xbf, 0x9b, 0xc4, 0xe9, 0x27, 0x2b, 0x67, 0x49, 0x18, 0x8f, 0xb2,
-    0xd4, 0x9a, 0xe6, 0x6c, 0x12, 0x8e, 0x23, 0x1e, 0x05, 0xf1, 0x2c, 0x3a, 0x61, 0xd6, 0x56, 0x7f, 0x77, 0xc6, 0x78,
-    0x64, 0x8d, 0xa6, 0x51, 0x5e, 0x30, 0x1e, 0xbe, 0x3f, 0xf8, 0xba, 0xf5, 0xa8, 0xbf, 0x5b, 0x8c, 0xf2, 0x78, 0xce,
-    0x2d, 0x1c, 0x32, 0x9c, 0x65, 0xe3, 0x45, 0xc2, 0xfa, 0xa7, 0x51, 0x6e, 0x9d, 0xb3, 0xf0, 0xcd, 0xf1, 0x2f, 0x6c,
-    0xc4, 0xfd, 0x31, 0x9b, 0xc4, 0x29, 0x7b, 0x9b, 0x67, 0x73, 0x96, 0xf3, 0x0b, 0xef, 0xd9, 0xfa, 0x8a, 0x98, 0x15,
-    0xde, 0xbe, 0xae, 0x3a, 0x61, 0xfc, 0xcd, 0x59, 0xaa, 0xfa, 0x3c, 0x65, 0x62, 0x92, 0x2c, 0x2f, 0x3c, 0x7e, 0x45,
-    0x9b, 0xfd, 0x8b, 0xd9, 0x71, 0x96, 0x14, 0xde, 0x27, 0x5d, 0x3f, 0xcf, 0x33, 0x9e, 0x21, 0x58, 0xfe, 0x34, 0x2a,
-    0x8c, 0x96, 0xde, 0x93, 0x35, 0x4d, 0xe6, 0xb2, 0xf2, 0x45, 0xf1, 0x2c, 0x5d, 0xcc, 0x58, 0x1e, 0x1d, 0x27, 0xcc,
-    0x2b, 0x58, 0xe8, 0x30, 0x8f, 0x7b, 0xb1, 0x1b, 0xf6, 0xb9, 0x15, 0xa7, 0x16, 0x1b, 0x9c, 0x33, 0x2a, 0x59, 0x32,
-    0xdd, 0x2a, 0xb8, 0xd3, 0xf6, 0x80, 0x5c, 0x93, 0xf8, 0x64, 0xa1, 0xdf, 0xcf, 0xf2, 0x98, 0xab, 0xe7, 0xd3, 0x28,
-    0x59, 0xb0, 0x20, 0x2e, 0xdd, 0x80, 0x1d, 0xf2, 0x61, 0x18, 0x7b, 0x4f, 0x68, 0x50, 0x18, 0x72, 0x39, 0xc9, 0x72,
-    0x07, 0x69, 0x15, 0xe3, 0xd8, 0xfc, 0xf2, 0xd2, 0xe1, 0xe1, 0xb2, 0x74, 0xdd, 0x4f, 0xcc, 0x1f, 0x45, 0x49, 0xe2,
-    0xe0, 0xc4, 0x77, 0xef, 0x16, 0x38, 0x63, 0xec, 0xf1, 0xc3, 0x78, 0xe8, 0xf6, 0xe2, 0x89, 0xc3, 0x99, 0x5b, 0xf5,
-    0xcb, 0x26, 0x16, 0x67, 0x0e, 0x77, 0xdd, 0x27, 0x57, 0xf7, 0xc9, 0x19, 0x5f, 0xe4, 0x00, 0x7b, 0xe9, 0xbd, 0x51,
-    0x33, 0x3f, 0xc3, 0xfa, 0x7d, 0xea, 0xd8, 0x03, 0xd8, 0x0b, 0x6e, 0x7d, 0x08, 0xcf, 0xe2, 0x74, 0x9c, 0x9d, 0xf9,
-    0xfb, 0xd3, 0x08, 0x7e, 0xbc, 0xcb, 0x32, 0x7e, 0xf7, 0xae, 0x73, 0x9a, 0xc5, 0x63, 0xab, 0x1d, 0x86, 0x66, 0xe5,
-    0xc5, 0x93, 0xfd, 0xfd, 0xcb, 0xcb, 0x46, 0x81, 0x9f, 0x46, 0x3c, 0x3e, 0x65, 0xa2, 0x33, 0x00, 0x60, 0xc3, 0xcf,
-    0x39, 0x67, 0xe3, 0x7d, 0x7e, 0x91, 0x40, 0x29, 0x63, 0xbc, 0xb0, 0x01, 0xc7, 0xa7, 0xd9, 0x08, 0xc8, 0x96, 0x1a,
-    0x84, 0x87, 0xa6, 0x39, 0x9b, 0x27, 0xd1, 0x88, 0x61, 0x3d, 0x8c, 0x54, 0xf5, 0xa8, 0x1a, 0x79, 0x5f, 0x87, 0x62,
-    0x79, 0x1d, 0xd7, 0x8b, 0x59, 0x98, 0xb2, 0x33, 0xeb, 0x55, 0x34, 0xef, 0x8d, 0x92, 0xa8, 0x28, 0x80, 0x5f, 0x97,
-    0x84, 0x42, 0xbe, 0x18, 0x01, 0x83, 0x10, 0x82, 0x4b, 0x24, 0xd3, 0x34, 0x2e, 0xfc, 0x8f, 0x1b, 0xa3, 0xa2, 0x78,
-    0xc7, 0x8a, 0x45, 0xc2, 0x37, 0x42, 0x58, 0x0b, 0x7e, 0x27, 0x0c, 0xbf, 0x76, 0xf9, 0x34, 0xcf, 0xce, 0xac, 0x67,
-    0x79, 0x0e, 0xcd, 0x6d, 0x98, 0x52, 0x34, 0xb0, 0xe2, 0xc2, 0x4a, 0x33, 0x6e, 0xe9, 0xc1, 0x70, 0x01, 0x7d, 0xeb,
-    0x7d, 0xc1, 0xac, 0xa3, 0x45, 0x5a, 0x44, 0x13, 0x06, 0x4d, 0x8f, 0xac, 0x2c, 0xb7, 0x8e, 0x60, 0xd0, 0x23, 0x58,
-    0xb2, 0x82, 0xc3, 0xae, 0xf1, 0x6d, 0xb7, 0x47, 0x73, 0x41, 0xe1, 0x01, 0x3b, 0xe7, 0x21, 0x2b, 0x81, 0x31, 0xad,
-    0x42, 0xa3, 0xe1, 0xb8, 0xcb, 0x04, 0x0a, 0x58, 0x18, 0x33, 0x64, 0x59, 0xc7, 0x6c, 0xac, 0x17, 0xe7, 0xc3, 0xdd,
-    0xbb, 0x9a, 0xd6, 0x40, 0x13, 0x07, 0xda, 0x16, 0x8d, 0xb6, 0x9e, 0x40, 0xbc, 0x46, 0x22, 0xd7, 0x63, 0xbe, 0x24,
-    0xdf, 0xfe, 0x45, 0x3a, 0xaa, 0x8f, 0x0d, 0x95, 0x25, 0xcf, 0xf6, 0x79, 0x1e, 0xa7, 0x27, 0x00, 0x84, 0x9c, 0xc9,
-    0x6c, 0x52, 0x96, 0x62, 0xf1, 0xdf, 0xb0, 0x90, 0x85, 0x7d, 0x1c, 0x3d, 0x67, 0x8e, 0x5d, 0x50, 0x0f, 0x3b, 0x0c,
-    0x91, 0xf4, 0xc0, 0x60, 0x6c, 0xc0, 0x02, 0xb6, 0x69, 0xdb, 0xde, 0xd7, 0xae, 0x77, 0x81, 0x1c, 0xe4, 0xfb, 0x3e,
-    0xb1, 0xaf, 0xe8, 0x1c, 0x87, 0x1d, 0x04, 0xda, 0x4f, 0x58, 0x7a, 0xc2, 0xa7, 0x03, 0x76, 0xd8, 0x1e, 0x06, 0x1c,
-    0xa0, 0x1a, 0x2f, 0x46, 0xcc, 0x41, 0x7e, 0xf4, 0x72, 0xdc, 0x3e, 0x9b, 0x0e, 0x4c, 0x81, 0x0b, 0x73, 0x87, 0x70,
-    0xac, 0x2d, 0x8d, 0xab, 0x58, 0x54, 0x01, 0x86, 0x7c, 0x6e, 0xc3, 0x0e, 0x3b, 0x66, 0xb9, 0x01, 0x87, 0x6e, 0xd6,
-    0xab, 0xad, 0xe0, 0x02, 0x56, 0x08, 0xfa, 0x59, 0x93, 0x45, 0x3a, 0xe2, 0x31, 0x08, 0x2e, 0x7b, 0x13, 0xc0, 0x15,
-    0x2b, 0xa7, 0x17, 0xce, 0x76, 0x4b, 0xd7, 0x89, 0xdd, 0x4d, 0x76, 0x98, 0x6f, 0x76, 0x86, 0x1e, 0x42, 0xa9, 0x89,
-    0x2f, 0x11, 0x8f, 0x01, 0xc1, 0xd2, 0x7b, 0xcb, 0xf4, 0xf6, 0xfc, 0x30, 0x60, 0xfe, 0x2a, 0x1f, 0x87, 0xdc, 0x9f,
-    0x45, 0x73, 0xc4, 0x86, 0x11, 0x0f, 0x44, 0xe9, 0x08, 0xa1, 0xab, 0xad, 0x0b, 0x52, 0xcc, 0xaf, 0x58, 0xc0, 0x05,
-    0x82, 0xc0, 0x9e, 0x7d, 0x16, 0x8d, 0xa6, 0xb0, 0xc5, 0x2b, 0xc2, 0x8d, 0xd5, 0x76, 0x18, 0xe5, 0x2c, 0xe2, 0xec,
-    0x59, 0xc2, 0xf0, 0x0d, 0x57, 0x00, 0x7a, 0xda, 0xae, 0x97, 0xab, 0x7d, 0x97, 0xc4, 0xfc, 0x75, 0x06, 0xf3, 0xf4,
-    0x04, 0x93, 0x00, 0x17, 0xe7, 0x77, 0xef, 0xc6, 0xc8, 0x22, 0x7b, 0x1c, 0x56, 0xeb, 0x78, 0x01, 0x42, 0xc0, 0x4e,
-    0xb1, 0x85, 0x0d, 0xd4, 0xf6, 0x62, 0x9f, 0x03, 0x11, 0x9f, 0x64, 0x29, 0x87, 0xe1, 0x00, 0x5e, 0xcd, 0x41, 0x7e,
-    0x34, 0x9f, 0xb3, 0x74, 0xfc, 0x64, 0x1a, 0x27, 0x63, 0xa0, 0x46, 0x09, 0xf8, 0x66, 0x2c, 0x04, 0x3c, 0x01, 0x99,
-    0xe0, 0x7a, 0x8c, 0x68, 0xf9, 0x90, 0x91, 0x79, 0x68, 0xdb, 0x3d, 0x94, 0x40, 0x12, 0x0b, 0x94, 0x41, 0xb4, 0x70,
-    0xef, 0x40, 0xf4, 0x17, 0x2e, 0xdf, 0x0c, 0x63, 0xbd, 0x8c, 0x92, 0xc0, 0x6f, 0x50, 0xd2, 0x00, 0xfd, 0x19, 0xc8,
-    0xc0, 0x1e, 0x0a, 0xae, 0xef, 0xa5, 0xd4, 0x49, 0x99, 0xc2, 0x10, 0x08, 0x30, 0x42, 0x09, 0x22, 0x69, 0xf0, 0x36,
-    0x4b, 0x2e, 0x26, 0x71, 0x92, 0xec, 0x2f, 0xe6, 0xf3, 0x2c, 0xe7, 0xde, 0x37, 0xe1, 0x92, 0x67, 0x15, 0xae, 0xb4,
-    0xc9, 0x8b, 0xb3, 0x98, 0x23, 0x41, 0xdd, 0xe5, 0x28, 0x82, 0xa5, 0x7e, 0x9c, 0x65, 0x09, 0x8b, 0x52, 0x40, 0x83,
-    0x0d, 0x6c, 0x3b, 0x48, 0x17, 0x49, 0xd2, 0x3b, 0x86, 0x61, 0x3f, 0xf5, 0xa8, 0x5a, 0x48, 0xfc, 0x80, 0x9e, 0xf7,
-    0xf2, 0x3c, 0xba, 0x80, 0x86, 0xd8, 0x06, 0x78, 0x11, 0x56, 0xeb, 0x9b, 0xfd, 0x37, 0xaf, 0x7d, 0xc1, 0xf8, 0xf1,
-    0xe4, 0x02, 0x00, 0x2d, 0x2b, 0xa9, 0x39, 0xc9, 0xb3, 0x59, 0x63, 0x6a, 0xa4, 0x43, 0x1c, 0xb2, 0xde, 0x15, 0x20,
-    0xc4, 0x34, 0x32, 0xac, 0x12, 0x33, 0x21, 0x78, 0x4d, 0xfc, 0x2c, 0x2b, 0x71, 0x0f, 0x0c, 0xf0, 0x21, 0x10, 0xc5,
-    0x30, 0xe5, 0xf5, 0xd0, 0xf2, 0xfc, 0x62, 0x19, 0x87, 0x04, 0xe7, 0x1c, 0xf5, 0x2f, 0xc2, 0x38, 0x8a, 0x60, 0xf6,
-    0xa5, 0x18, 0xb0, 0x54, 0x10, 0xc7, 0x65, 0xe9, 0x25, 0x9a, 0x89, 0x51, 0xe2, 0xa1, 0x40, 0xe1, 0xb0, 0x8d, 0x2e,
-    0x2f, 0x19, 0xbc, 0xb8, 0xde, 0xb7, 0xe1, 0x32, 0x52, 0xf8, 0xa0, 0x86, 0xc2, 0xfd, 0x15, 0x08, 0x39, 0x81, 0x9a,
-    0xec, 0x14, 0xf4, 0x20, 0xc0, 0xf9, 0x8d, 0x07, 0xfa, 0x3f, 0x41, 0x28, 0xee, 0x74, 0x3c, 0xd0, 0xa0, 0x4f, 0xa6,
-    0x51, 0x7a, 0xc2, 0xc6, 0x41, 0xc2, 0x4a, 0x29, 0x79, 0xf7, 0x2c, 0x58, 0x63, 0x60, 0xa7, 0xc2, 0x7a, 0x7e, 0xf0,
-    0xea, 0xa5, 0x5c, 0xb9, 0x9a, 0x30, 0x86, 0x45, 0x5a, 0x80, 0x5a, 0x05, 0xb1, 0x2d, 0xc5, 0xf1, 0x33, 0xae, 0xa4,
-    0xb7, 0x28, 0x89, 0x8b, 0xf7, 0x73, 0x30, 0x31, 0xd8, 0x5b, 0x18, 0x06, 0xa6, 0x0f, 0x61, 0x2a, 0x2a, 0x87, 0xf9,
-    0x44, 0xc5, 0x58, 0x17, 0x41, 0x67, 0x81, 0xa9, 0x78, 0xcd, 0x1c, 0xb7, 0x04, 0x56, 0xe5, 0xf1, 0xc8, 0x8a, 0xc6,
-    0xe3, 0x17, 0x69, 0xcc, 0xe3, 0x28, 0x89, 0x7f, 0x23, 0x4a, 0x2e, 0x91, 0xc7, 0x78, 0x4f, 0x2e, 0x02, 0xe0, 0x4e,
-    0x3d, 0x12, 0x57, 0x09, 0xd9, 0x3b, 0x44, 0x0c, 0x21, 0x2d, 0x93, 0xf0, 0x70, 0x28, 0xc1, 0x4b, 0xfc, 0xf9, 0xa2,
-    0x98, 0x22, 0x61, 0xe5, 0xc0, 0x28, 0xc8, 0xb3, 0xe3, 0x82, 0xe5, 0xa7, 0x6c, 0xac, 0x39, 0xa0, 0x00, 0xac, 0xa8,
-    0x39, 0x18, 0x2f, 0x34, 0xa3, 0xa3, 0x74, 0x28, 0x83, 0xa1, 0x7a, 0xa6, 0x98, 0x65, 0x92, 0x99, 0xb5, 0x85, 0xa3,
-    0xa5, 0x80, 0x23, 0x8c, 0x0a, 0x29, 0x09, 0xf2, 0x50, 0x61, 0x38, 0x05, 0x29, 0x04, 0x5a, 0xc1, 0xdc, 0xe6, 0x4a,
-    0x93, 0x3d, 0x5b, 0x90, 0x4a, 0xc8, 0xa1, 0x23, 0x6c, 0x64, 0x82, 0x34, 0x77, 0x61, 0x57, 0x81, 0x94, 0x97, 0xe0,
-    0x0a, 0x29, 0xa2, 0xcc, 0x1c, 0x64, 0x80, 0xf0, 0x5b, 0xa1, 0x0b, 0x7d, 0x6c, 0x41, 0x6c, 0xe0, 0xeb, 0x95, 0x07,
-    0xc2, 0x4a, 0xbc, 0x2b, 0x44, 0xbc, 0x2b, 0xc0, 0xc6, 0x89, 0x91, 0x9f, 0xbc, 0x3b, 0xdc, 0x4f, 0xb3, 0xbd, 0xd1,
-    0x88, 0x15, 0x45, 0x06, 0xb0, 0xdd, 0xa1, 0xf6, 0x57, 0x19, 0x5a, 0x40, 0x49, 0x57, 0xcb, 0x3a, 0xbb, 0x20, 0x0d,
-    0x6e, 0xaa, 0x15, 0xa5, 0xd3, 0x03, 0xfb, 0xe3, 0x47, 0x90, 0xd9, 0x9e, 0x24, 0x03, 0x50, 0x7d, 0xd5, 0xf0, 0x13,
-    0xf6, 0x4c, 0x9d, 0x32, 0x6b, 0xed, 0x4b, 0xa7, 0x0e, 0x92, 0x07, 0xc3, 0xba, 0xa5, 0xb1, 0xa0, 0x6b, 0x87, 0xc6,
-    0xd5, 0x90, 0x0a, 0x72, 0x79, 0x42, 0x2a, 0xdb, 0x58, 0x46, 0xb0, 0xda, 0x4a, 0x8f, 0x48, 0xaf, 0xb0, 0x29, 0x08,
-    0xd0, 0x43, 0x36, 0xec, 0xc9, 0xfa, 0x30, 0x17, 0x94, 0xcb, 0xd9, 0xaf, 0x0b, 0x56, 0x70, 0xc1, 0xba, 0x30, 0x6e,
-    0x01, 0xe3, 0x96, 0x2b, 0xd6, 0x61, 0xcd, 0x76, 0x5c, 0x07, 0xdb, 0x9b, 0x39, 0xea, 0xb1, 0x02, 0x39, 0xf9, 0x7a,
-    0x76, 0x42, 0x58, 0x99, 0x7b, 0x79, 0xf9, 0xad, 0x1a, 0xa4, 0x5a, 0x4a, 0x6d, 0x03, 0x35, 0xd6, 0xc4, 0x56, 0x4d,
-    0xc6, 0xb6, 0x2b, 0x15, 0xea, 0x9d, 0x4e, 0xaf, 0xc6, 0x07, 0xb0, 0xe7, 0xda, 0x9a, 0xa5, 0x2b, 0x63, 0xfb, 0xad,
-    0xa2, 0xe9, 0x1b, 0x31, 0x32, 0x59, 0xa3, 0xec, 0x66, 0xee, 0x51, 0x3b, 0x1e, 0xda, 0xae, 0xd4, 0x55, 0x82, 0x61,
-    0x51, 0x17, 0x0c, 0x4d, 0xa8, 0xe7, 0xba, 0x8b, 0xad, 0x99, 0x8a, 0x85, 0x6a, 0xad, 0x95, 0x03, 0xc1, 0xc3, 0x43,
-    0x30, 0x4e, 0xd6, 0xfa, 0x07, 0xaf, 0xa3, 0x19, 0x43, 0x8a, 0x7a, 0x57, 0x35, 0x90, 0x0e, 0x04, 0x34, 0x19, 0x36,
-    0xd5, 0x1b, 0x77, 0x85, 0xd5, 0x54, 0xdf, 0x5f, 0x31, 0x58, 0x11, 0x60, 0x5f, 0x97, 0x6b, 0x96, 0x88, 0xf4, 0xa6,
-    0xe0, 0x12, 0x4d, 0x1f, 0x51, 0x26, 0xd6, 0x84, 0x14, 0x3c, 0x20, 0x0f, 0xcb, 0xdf, 0x58, 0x38, 0xd9, 0x8a, 0x29,
-    0x1c, 0x39, 0xca, 0x14, 0xa0, 0x33, 0x29, 0x01, 0x10, 0x97, 0xf4, 0xb3, 0xb6, 0xb1, 0x90, 0x6c, 0xfb, 0xc8, 0x07,
-    0xfe, 0x24, 0x89, 0xb8, 0xd3, 0xd9, 0x6a, 0xbb, 0xc0, 0x87, 0x20, 0xc4, 0x41, 0x47, 0x80, 0x79, 0x5f, 0xa1, 0xc2,
-    0x10, 0x95, 0xd8, 0xe5, 0x3e, 0x18, 0x45, 0xd3, 0x78, 0xc2, 0x9d, 0x0c, 0x95, 0x88, 0x5b, 0xb2, 0x04, 0x94, 0x8c,
-    0xde, 0x57, 0x20, 0x25, 0xb8, 0x90, 0x2e, 0xa2, 0x5a, 0x0b, 0x34, 0x05, 0x29, 0x49, 0x29, 0xd2, 0x82, 0x0a, 0x02,
-    0x43, 0xa8, 0xf4, 0x14, 0x47, 0x81, 0x7e, 0x8b, 0x07, 0x62, 0xd0, 0x60, 0xc5, 0xa2, 0x8c, 0x07, 0xf1, 0x6a, 0x21,
-    0xa8, 0x61, 0x9f, 0x67, 0x2f, 0xb3, 0x33, 0x96, 0x3f, 0x89, 0x10, 0xf6, 0x40, 0x74, 0x2f, 0x41, 0xd2, 0x93, 0x40,
-    0x67, 0x3d, 0xc5, 0x2b, 0xa7, 0x84, 0x34, 0x2c, 0xc4, 0x2c, 0x46, 0x45, 0x08, 0x5a, 0x8e, 0x68, 0x9f, 0xe2, 0x96,
-    0xa2, 0xbd, 0x87, 0xaa, 0x84, 0x69, 0xde, 0xda, 0x7b, 0x59, 0xe7, 0x2d, 0x18, 0x61, 0xae, 0xb8, 0xb5, 0xbe, 0x63,
-    0x5d, 0x4f, 0xea, 0x66, 0x47, 0xf2, 0x96, 0xa1, 0xcc, 0x40, 0x7f, 0x5c, 0x5e, 0x56, 0x46, 0x3a, 0x28, 0x53, 0x2d,
-    0xcd, 0xd1, 0x72, 0x12, 0x5b, 0xc2, 0x2d, 0x41, 0x19, 0xa1, 0xe1, 0x95, 0x67, 0x49, 0x62, 0xe8, 0x22, 0x2f, 0xee,
-    0x39, 0x0d, 0x75, 0x04, 0x50, 0xcc, 0x6a, 0x1a, 0x69, 0xc0, 0x03, 0x5d, 0x81, 0x4a, 0x49, 0x69, 0x23, 0xaf, 0x6a,
-    0x22, 0x20, 0x4e, 0xc7, 0x2c, 0x17, 0x0e, 0x9a, 0xd4, 0xa1, 0x30, 0x61, 0x0a, 0x0c, 0xcd, 0xc6, 0x20, 0xe1, 0x15,
-    0x02, 0x60, 0x9e, 0xf8, 0xd3, 0xac, 0xe0, 0xba, 0xce, 0x84, 0x3e, 0xbe, 0xbc, 0x8c, 0x85, 0xbf, 0x88, 0x0c, 0x90,
-    0xb3, 0x59, 0x76, 0xca, 0xd6, 0x40, 0xdd, 0x53, 0x83, 0x99, 0x20, 0x1b, 0xc3, 0x80, 0x12, 0x05, 0xd5, 0x32, 0x4f,
-    0xe2, 0x11, 0xd3, 0x5a, 0x6a, 0xe6, 0x83, 0x41, 0xc7, 0xce, 0x41, 0x46, 0x30, 0xb7, 0xdf, 0xef, 0xb7, 0xbd, 0x8e,
-    0x5b, 0x0a, 0x82, 0x2f, 0x57, 0x28, 0x7a, 0x8d, 0x7e, 0x94, 0x26, 0xf8, 0x3a, 0x59, 0xc0, 0x5d, 0x43, 0x29, 0x72,
-    0xe1, 0x27, 0x79, 0x52, 0x10, 0xbb, 0xde, 0x18, 0x06, 0xe5, 0x4c, 0x09, 0x6e, 0x34, 0x71, 0xc5, 0xb6, 0x7d, 0xa7,
-    0xc9, 0xa6, 0xd9, 0x49, 0xed, 0x30, 0xb5, 0x30, 0x72, 0xcd, 0x0b, 0xed, 0x01, 0x9b, 0xcb, 0x83, 0x56, 0x22, 0x55,
-    0x03, 0xaf, 0x03, 0x84, 0xc2, 0xd3, 0x75, 0x56, 0x50, 0xaa, 0x3a, 0x4b, 0x21, 0xae, 0x37, 0xd0, 0x5b, 0x26, 0xc1,
-    0x5c, 0x47, 0x82, 0x7d, 0x29, 0x10, 0x38, 0x7a, 0x64, 0x62, 0xbd, 0x9e, 0xc0, 0xf2, 0x1c, 0x47, 0xa3, 0x4f, 0x1a,
-    0xdc, 0x8a, 0xec, 0x4d, 0x36, 0x70, 0x1a, 0x25, 0xa1, 0x21, 0xae, 0x4c, 0xbc, 0x95, 0x84, 0xae, 0x6d, 0x14, 0x70,
-    0xc8, 0x56, 0xd8, 0xbe, 0xb9, 0xd0, 0x4d, 0x6e, 0x97, 0xec, 0xa1, 0xfc, 0x27, 0xcd, 0x25, 0xd7, 0xb0, 0x1c, 0x57,
-    0xd2, 0x80, 0x2b, 0xc6, 0x83, 0xa5, 0x69, 0x40, 0x02, 0x7c, 0x57, 0x8e, 0xe3, 0xe2, 0x6a, 0x12, 0xfc, 0xa1, 0x60,
-    0x3e, 0x35, 0x66, 0xba, 0x11, 0x52, 0x2d, 0xe1, 0xa4, 0x19, 0xac, 0x41, 0x93, 0xc6, 0x83, 0x12, 0x35, 0xdf, 0xa2,
-    0xa1, 0x42, 0x1c, 0x7f, 0x22, 0xaa, 0xd0, 0x04, 0x43, 0x30, 0x72, 0xaf, 0x90, 0x0c, 0x97, 0xad, 0x8a, 0x16, 0x29,
-    0x53, 0x63, 0x52, 0xa9, 0x9a, 0xe5, 0x32, 0x30, 0xb0, 0x68, 0xb7, 0xfa, 0xd2, 0x12, 0x57, 0x22, 0x37, 0x0d, 0xb5,
-    0x30, 0x29, 0x94, 0x37, 0xe1, 0xe4, 0xe8, 0x77, 0x29, 0xeb, 0xdd, 0xc4, 0x27, 0x57, 0xf8, 0xe4, 0xbe, 0xe1, 0x43,
-    0x99, 0xbc, 0x5d, 0x0c, 0x8a, 0xe0, 0x9b, 0x5a, 0x25, 0xda, 0xa7, 0x3e, 0x0a, 0x66, 0x57, 0x0b, 0x5d, 0x10, 0x28,
-    0x92, 0x4d, 0xd2, 0x81, 0xe4, 0x37, 0x14, 0x1b, 0x95, 0x67, 0x94, 0xb9, 0x62, 0x83, 0xd4, 0xbc, 0xd2, 0xcc, 0x4b,
-    0xdd, 0x86, 0xfd, 0x5e, 0x96, 0x92, 0x4e, 0x5c, 0x50, 0x26, 0xf6, 0xae, 0xa3, 0x8d, 0x97, 0x86, 0x99, 0xb0, 0x7e,
-    0x85, 0xb1, 0x53, 0xa3, 0x50, 0x2a, 0x45, 0x20, 0x8e, 0x8d, 0xaf, 0x95, 0x65, 0x90, 0xf9, 0x6b, 0xec, 0x29, 0x00,
-    0x25, 0x81, 0xc5, 0xd7, 0x54, 0xf2, 0xa2, 0xb0, 0x4e, 0xc7, 0x3b, 0x44, 0xc7, 0x4a, 0x84, 0xd6, 0x44, 0xbe, 0xd6,
-    0x67, 0xb1, 0x5f, 0x73, 0x09, 0x4d, 0x4a, 0xe6, 0x83, 0x3c, 0xb0, 0x55, 0x20, 0xa2, 0xd2, 0x6d, 0xc9, 0x20, 0x21,
-    0x87, 0x74, 0x95, 0xe8, 0xb5, 0x91, 0x0c, 0x5a, 0xa7, 0x42, 0xa2, 0xa5, 0xc3, 0x30, 0x72, 0xd0, 0x71, 0xa7, 0xb5,
-    0x58, 0x21, 0x64, 0xd3, 0xde, 0x24, 0x56, 0x44, 0xe7, 0x34, 0x47, 0x13, 0xce, 0xd4, 0xe9, 0x8e, 0x03, 0xe8, 0x80,
-    0xd8, 0x5f, 0x61, 0xbd, 0xb5, 0x66, 0xa7, 0xeb, 0x57, 0x0e, 0xdf, 0xe5, 0x65, 0x82, 0xfc, 0x20, 0x0c, 0x5e, 0x58,
-    0xb3, 0x81, 0x92, 0xbd, 0x7b, 0x2f, 0xb1, 0x15, 0xd9, 0x9f, 0x55, 0x49, 0xe5, 0x29, 0xd4, 0x38, 0xb7, 0xbe, 0x4e,
-    0xcc, 0x0c, 0x2d, 0xaa, 0x8a, 0x7d, 0x43, 0xaa, 0xef, 0x2b, 0x85, 0x5d, 0xa1, 0xbc, 0x2f, 0x87, 0x8e, 0x5d, 0xd7,
-    0x0d, 0x72, 0x72, 0x5e, 0xee, 0xac, 0x73, 0x21, 0xef, 0xde, 0x35, 0x7d, 0xa6, 0x53, 0x3d, 0xfc, 0x13, 0x07, 0x95,
-    0x73, 0x71, 0x91, 0x92, 0x05, 0xf3, 0x44, 0xa9, 0xa3, 0x15, 0x07, 0xb4, 0xdd, 0x43, 0x4f, 0x3b, 0x3a, 0x8b, 0x62,
-    0x6e, 0xe9, 0x51, 0x84, 0xa7, 0x8d, 0xf2, 0x49, 0x1a, 0x1d, 0x80, 0x17, 0x9a, 0x90, 0xe4, 0x84, 0x9b, 0xb6, 0x68,
-    0x31, 0x9a, 0x32, 0x0c, 0x81, 0x2b, 0x7b, 0xc2, 0x94, 0x3d, 0x77, 0x10, 0x6f, 0x31, 0x30, 0x5b, 0x0f, 0x7b, 0xd9,
-    0xec, 0x5e, 0x33, 0xff, 0x61, 0x8d, 0x40, 0xb6, 0xcd, 0x54, 0x5d, 0xd9, 0x78, 0x97, 0x22, 0x12, 0x23, 0x6c, 0xeb,
-    0xc6, 0x96, 0xb6, 0x7e, 0xaf, 0xe1, 0x5e, 0x57, 0x8e, 0x79, 0x4d, 0xa9, 0x36, 0xf4, 0xb0, 0x72, 0x73, 0x98, 0xe9,
-    0xc8, 0x8b, 0x15, 0x74, 0x7b, 0x22, 0x28, 0x04, 0x4e, 0x84, 0xb6, 0x07, 0x15, 0x37, 0x10, 0x29, 0xb9, 0xd2, 0xaa,
-    0xd9, 0x22, 0x19, 0x4b, 0x60, 0xc1, 0x85, 0xe5, 0x92, 0x8f, 0xce, 0xe2, 0x24, 0xa9, 0x4a, 0xff, 0x50, 0x01, 0x2f,
-    0x86, 0xbd, 0x49, 0xb4, 0x0b, 0x8c, 0x16, 0x0a, 0x04, 0x57, 0x1b, 0x61, 0xef, 0x1d, 0xb7, 0x5a, 0x77, 0x11, 0x71,
-    0xe4, 0x66, 0x34, 0x02, 0xea, 0x31, 0xc2, 0xaa, 0x59, 0x7b, 0xef, 0x19, 0x86, 0xd4, 0x0c, 0x7c, 0x50, 0x9d, 0x51,
-    0xf1, 0x67, 0xd9, 0x53, 0x9f, 0x89, 0xde, 0x8d, 0xaa, 0xab, 0x19, 0x50, 0x51, 0x81, 0x0f, 0x33, 0xc4, 0xd2, 0x56,
-    0x81, 0x80, 0x5c, 0x0f, 0x8b, 0x52, 0xc0, 0x24, 0x0d, 0x16, 0x94, 0x02, 0x6b, 0xad, 0xec, 0x5e, 0xde, 0x14, 0xcc,
-    0xa1, 0x50, 0xb8, 0xe8, 0xff, 0x24, 0x9b, 0xcd, 0xd1, 0x32, 0x6b, 0x30, 0x35, 0x34, 0x78, 0xdf, 0xa8, 0x2f, 0xd7,
-    0x94, 0xd5, 0xfa, 0xd0, 0x8e, 0xac, 0xf1, 0x93, 0x76, 0x94, 0xc1, 0xa1, 0x5a, 0xe8, 0xa2, 0xba, 0xdd, 0xdc, 0x14,
-    0x31, 0xeb, 0x78, 0xdc, 0x27, 0xbd, 0xad, 0xad, 0x49, 0x4f, 0xd3, 0x80, 0x64, 0x92, 0x64, 0x78, 0x93, 0x01, 0xca,
-    0x8a, 0x38, 0xcb, 0xb2, 0x41, 0xbe, 0x65, 0x59, 0xe2, 0xfa, 0x7d, 0xd7, 0xdb, 0xab, 0x79, 0xd6, 0xde, 0xde, 0xd5,
-    0x2e, 0x72, 0x55, 0x27, 0x3d, 0xc8, 0xc3, 0x21, 0x14, 0xad, 0xd8, 0x94, 0xe1, 0x72, 0x96, 0x8d, 0x59, 0x60, 0x43,
-    0xf7, 0xd4, 0x2e, 0x95, 0x56, 0x86, 0xcd, 0x91, 0x32, 0x67, 0xf9, 0xae, 0x1e, 0x49, 0x0d, 0xf6, 0x80, 0x05, 0xb4,
-    0xb9, 0xf0, 0x7d, 0x78, 0x92, 0x64, 0xc7, 0x51, 0x72, 0x20, 0x14, 0x78, 0xad, 0xe5, 0x07, 0x70, 0x19, 0xc9, 0x62,
-    0x35, 0x94, 0xd4, 0xf7, 0x83, 0xef, 0x83, 0x9b, 0x7b, 0x54, 0xde, 0x8a, 0xdd, 0xf1, 0xdb, 0x7e, 0xc7, 0x56, 0x11,
-    0xb1, 0x97, 0xe6, 0x74, 0xa0, 0x71, 0x0a, 0xa0, 0xcc, 0x01, 0x68, 0xb2, 0xc2, 0x8b, 0x58, 0xf8, 0x72, 0xf0, 0x52,
-    0xb9, 0xd4, 0x19, 0xb8, 0x10, 0xe0, 0xe4, 0x27, 0x31, 0x6f, 0xe1, 0x79, 0xa4, 0xed, 0x2d, 0x45, 0x05, 0xc6, 0x15,
-    0x29, 0x2e, 0x5d, 0x2a, 0x6f, 0xd0, 0xfb, 0x18, 0x1e, 0x41, 0xb3, 0x8d, 0x8d, 0xa5, 0xf3, 0x2a, 0xe2, 0x53, 0x3f,
-    0x8f, 0xd2, 0x71, 0x36, 0x73, 0xdc, 0x4d, 0xdb, 0x76, 0xfd, 0x82, 0x3c, 0x91, 0xaf, 0xdc, 0x72, 0xe3, 0xc8, 0x9b,
-    0xb2, 0xd0, 0x1e, 0xd8, 0x9b, 0x1f, 0xbd, 0xf7, 0x2c, 0x3c, 0xda, 0xdd, 0x58, 0x4e, 0x59, 0xd9, 0x3f, 0xf2, 0xce,
+    0x9c, 0xd3, 0x7f, 0x30, 0x2f, 0x30, 0x4a, 0x6d, 0x03, 0x57, 0x20, 0x44, 0x52, 0x96, 0xed, 0x02, 0x05, 0xf2, 0xca,
+    0x4b, 0x5d, 0xbb, 0xca, 0x5b, 0x59, 0xb2, 0x6b, 0x51, 0xb1, 0x2c, 0x88, 0x4c, 0x8a, 0x28, 0x83, 0x00, 0x0b, 0x48,
+    0x6a, 0x29, 0x0a, 0x7d, 0xfa, 0xa9, 0x9f, 0xe6, 0x9c, 0x59, 0x1f, 0xfa, 0x65, 0x4e, 0xf7, 0xc3, 0x7c, 0xc4, 0x3c,
+    0xf7, 0xa7, 0xdc, 0x1f, 0x98, 0xfe, 0x84, 0x89, 0x88, 0x5c, 0x90, 0x00, 0xa9, 0xc5, 0xd5, 0xd5, 0x7d, 0xbc, 0x08,
+    0xc8, 0x35, 0x22, 0x32, 0x32, 0xb6, 0x8c, 0x84, 0x76, 0xef, 0x8c, 0xb3, 0x11, 0xbf, 0x98, 0x33, 0x6b, 0xca, 0x67,
+    0x49, 0x7f, 0x57, 0xfe, 0xcf, 0xa2, 0x71, 0x7f, 0x37, 0x89, 0xd3, 0x4f, 0x56, 0xce, 0x92, 0x30, 0x1e, 0x65, 0xa9,
+    0x35, 0xcd, 0xd9, 0x24, 0x1c, 0x47, 0x3c, 0x0a, 0xe2, 0x59, 0x74, 0xc2, 0xac, 0xad, 0xfe, 0xee, 0x8c, 0xf1, 0xc8,
+    0x1a, 0x4d, 0xa3, 0xbc, 0x60, 0x3c, 0x7c, 0x7f, 0xf0, 0x55, 0xeb, 0x51, 0x7f, 0xb7, 0x18, 0xe5, 0xf1, 0x9c, 0x5b,
+    0x38, 0x64, 0x38, 0xcb, 0xc6, 0x8b, 0x84, 0xf5, 0x4f, 0xa3, 0xdc, 0x7a, 0xc6, 0xc2, 0x37, 0xc7, 0xbf, 0xb0, 0x11,
+    0xf7, 0xc7, 0x6c, 0x12, 0xa7, 0xec, 0x6d, 0x9e, 0xcd, 0x59, 0xce, 0x2f, 0xbc, 0xfd, 0xf5, 0x15, 0x31, 0x2b, 0xbc,
+    0x4f, 0xba, 0xea, 0x84, 0xf1, 0x37, 0x67, 0xa9, 0xea, 0xf3, 0x94, 0x89, 0x49, 0xb2, 0xbc, 0xf0, 0x8a, 0x2b, 0xda,
+    0xec, 0x5f, 0xcc, 0x8e, 0xb3, 0xa4, 0xf0, 0x9e, 0xe8, 0xfa, 0x79, 0x9e, 0xf1, 0x0c, 0xc1, 0xf2, 0xa7, 0x51, 0x61,
+    0xb4, 0xf4, 0xde, 0xac, 0x69, 0x32, 0x97, 0x95, 0x2f, 0x8a, 0x67, 0xe9, 0x62, 0xc6, 0xf2, 0xe8, 0x38, 0x61, 0x5e,
+    0xcc, 0x42, 0x87, 0x79, 0xdc, 0x8b, 0xdd, 0xb0, 0xcf, 0xad, 0x38, 0xb5, 0xd8, 0xe0, 0x19, 0xa3, 0x92, 0x25, 0xd3,
+    0xad, 0x82, 0x3b, 0x6d, 0x0f, 0xc8, 0x35, 0x89, 0x4f, 0x16, 0xfa, 0xfd, 0x2c, 0x8f, 0xb9, 0x7a, 0x3e, 0x8d, 0x92,
+    0x05, 0x0b, 0xe2, 0xd2, 0x0d, 0xd8, 0x21, 0x1f, 0x86, 0xb1, 0xf7, 0x84, 0x06, 0x85, 0x21, 0x97, 0x93, 0x2c, 0x77,
+    0x90, 0x56, 0x31, 0x8e, 0xcd, 0x2f, 0x2f, 0x1d, 0x1e, 0x2e, 0x4b, 0xd7, 0x7d, 0xc2, 0xfc, 0x51, 0x94, 0x24, 0x0e,
+    0x4e, 0x7c, 0xf7, 0x6e, 0x8c, 0x33, 0xc6, 0x1e, 0x3f, 0x8c, 0x87, 0x6e, 0x2f, 0x9e, 0x38, 0x05, 0x73, 0xab, 0x7e,
+    0xd9, 0xc4, 0x2a, 0x98, 0xc3, 0x5d, 0xf7, 0xcd, 0xd5, 0x7d, 0x72, 0xc6, 0x17, 0x39, 0xc0, 0x5e, 0x7a, 0x6f, 0xd4,
+    0xcc, 0xfb, 0x58, 0xff, 0x89, 0x3a, 0xf6, 0x00, 0xf6, 0x82, 0x5b, 0x1f, 0xc2, 0xb3, 0x38, 0x1d, 0x67, 0x67, 0xfe,
+    0xfe, 0x34, 0x82, 0x1f, 0xef, 0xb2, 0x8c, 0xdf, 0xbd, 0xeb, 0x9c, 0x66, 0xf1, 0xd8, 0x6a, 0x87, 0xa1, 0x59, 0x79,
+    0xf1, 0x64, 0x7f, 0xff, 0xf2, 0xb2, 0x51, 0xe0, 0xa7, 0x11, 0x8f, 0x4f, 0x99, 0xe8, 0x0c, 0x00, 0xd8, 0xf0, 0x73,
+    0xce, 0xd9, 0x78, 0x9f, 0x5f, 0x24, 0x50, 0xca, 0x18, 0x2f, 0x6c, 0xc0, 0xf1, 0x69, 0x36, 0x02, 0xb2, 0xa5, 0x06,
+    0xe1, 0xa1, 0x69, 0xce, 0xe6, 0x49, 0x34, 0x62, 0x58, 0x0f, 0x23, 0x55, 0x3d, 0xaa, 0x46, 0xde, 0x57, 0xa1, 0x58,
+    0x5e, 0xc7, 0xf5, 0x72, 0x16, 0xa6, 0xec, 0xcc, 0x7a, 0x15, 0xcd, 0x7b, 0xa3, 0x24, 0x2a, 0x0a, 0x2b, 0x63, 0x4b,
+    0x42, 0x21, 0x5f, 0x8c, 0x80, 0x41, 0x08, 0xc1, 0x25, 0x90, 0x89, 0x4f, 0xe3, 0xc2, 0xff, 0xb8, 0x31, 0x2a, 0x8a,
+    0x77, 0xac, 0x58, 0x24, 0x7c, 0x23, 0x84, 0xb5, 0xe0, 0x77, 0xc2, 0xf0, 0x2b, 0x97, 0x4f, 0xf3, 0xec, 0xcc, 0x7a,
+    0x96, 0xe7, 0xd0, 0xdc, 0x86, 0x29, 0x45, 0x03, 0x2b, 0x2e, 0xac, 0x34, 0xe3, 0x96, 0x1e, 0x0c, 0x17, 0xd0, 0xb7,
+    0xde, 0x17, 0xcc, 0x3a, 0x5a, 0xa4, 0x45, 0x34, 0x61, 0xd0, 0xf4, 0xc8, 0xca, 0x72, 0xeb, 0x08, 0x06, 0x3d, 0x82,
+    0x25, 0x2b, 0x38, 0xec, 0x1a, 0xdf, 0x76, 0x7b, 0x34, 0x17, 0x14, 0x1e, 0xb0, 0x73, 0x1e, 0xb2, 0x12, 0x18, 0xd3,
+    0x2a, 0x34, 0x1a, 0x8e, 0xbb, 0x4c, 0xa0, 0x80, 0x85, 0x39, 0x43, 0x96, 0x75, 0xcc, 0xc6, 0x7a, 0x71, 0x3e, 0xdc,
+    0xbd, 0xab, 0x69, 0x0d, 0x34, 0x71, 0xa0, 0x6d, 0xd1, 0x68, 0xeb, 0x09, 0xc4, 0x6b, 0x24, 0x72, 0x3d, 0xe6, 0x4b,
+    0xf2, 0xed, 0x5f, 0xa4, 0xa3, 0xfa, 0xd8, 0x50, 0x59, 0xf2, 0x6c, 0x9f, 0xe7, 0x71, 0x7a, 0x02, 0x40, 0xc8, 0x99,
+    0xcc, 0x26, 0x65, 0x29, 0x16, 0xff, 0x2d, 0x0b, 0x59, 0xd8, 0xc7, 0xd1, 0x33, 0xe6, 0xd8, 0x05, 0xf5, 0xb0, 0xc3,
+    0x10, 0x49, 0x0f, 0x0c, 0xc6, 0x06, 0x2c, 0x60, 0x9b, 0xb6, 0xed, 0x7d, 0xe5, 0x7a, 0x17, 0xc8, 0x41, 0xbe, 0xef,
+    0x13, 0xfb, 0x8a, 0xce, 0x71, 0xd8, 0x41, 0xa0, 0xfd, 0x84, 0xa5, 0x27, 0x7c, 0x3a, 0x60, 0x87, 0xed, 0x61, 0xc0,
+    0x01, 0xaa, 0xf1, 0x62, 0xc4, 0x1c, 0xe4, 0x47, 0x2f, 0xc7, 0xed, 0xb3, 0xe9, 0xc0, 0x14, 0xb8, 0x30, 0x77, 0x08,
+    0xc7, 0xda, 0xd2, 0xb8, 0x8a, 0x45, 0x15, 0x60, 0xc8, 0xe7, 0x36, 0xec, 0xb0, 0x63, 0x96, 0x1b, 0x70, 0xe8, 0x66,
+    0xbd, 0xda, 0x0a, 0x2e, 0x60, 0x85, 0xa0, 0x9f, 0x35, 0x59, 0xa4, 0x23, 0x1e, 0x83, 0xe0, 0xb2, 0x37, 0x01, 0x5c,
+    0xb1, 0x72, 0x7a, 0xe1, 0x6c, 0xb7, 0x74, 0x9d, 0xd8, 0xdd, 0x64, 0x87, 0xf9, 0x66, 0x67, 0xe8, 0x21, 0x94, 0x9a,
+    0xf8, 0x12, 0xf1, 0x18, 0x10, 0x2c, 0xbd, 0xf7, 0x4c, 0x6f, 0xcf, 0x0f, 0x03, 0xe6, 0xaf, 0xf2, 0x71, 0xc8, 0xfd,
+    0x59, 0x34, 0x47, 0x6c, 0x18, 0xf1, 0x40, 0x94, 0x8e, 0x10, 0xba, 0xda, 0xba, 0x20, 0xc5, 0xfc, 0x8a, 0x05, 0x5c,
+    0x20, 0x08, 0xec, 0xd9, 0x67, 0xd1, 0x68, 0x0a, 0x5b, 0xbc, 0x22, 0xdc, 0x58, 0x6d, 0x87, 0x51, 0xce, 0x22, 0xce,
+    0x9e, 0x25, 0x0c, 0xdf, 0x70, 0x05, 0xa0, 0xa7, 0x0d, 0xbc, 0xae, 0xf6, 0x5d, 0x12, 0xf3, 0xd7, 0x19, 0xcc, 0xd3,
+    0x13, 0x4c, 0x02, 0x5c, 0x9c, 0xc3, 0x26, 0x47, 0x16, 0xd9, 0xe3, 0xb0, 0x5a, 0xc7, 0x0b, 0x0e, 0xeb, 0x96, 0x62,
+    0x0b, 0x1b, 0xa8, 0xed, 0xc5, 0x3e, 0x07, 0x22, 0x3e, 0xc9, 0x52, 0x0e, 0xc3, 0x01, 0xbc, 0x9a, 0x83, 0xfc, 0x68,
+    0x3e, 0x67, 0xe9, 0xf8, 0xc9, 0x34, 0x4e, 0xc6, 0x40, 0x8d, 0x12, 0xf0, 0x4d, 0x59, 0x08, 0x78, 0x02, 0x32, 0xc1,
+    0xf5, 0x18, 0xd1, 0xf2, 0x21, 0x23, 0xf3, 0xd0, 0xb6, 0x7b, 0x28, 0x81, 0x24, 0x16, 0x28, 0x83, 0x68, 0xe1, 0xde,
+    0x81, 0xe8, 0x2f, 0x5c, 0xbe, 0x19, 0xc6, 0x7a, 0x19, 0x25, 0x81, 0xdf, 0xa2, 0xa4, 0x01, 0xfa, 0x33, 0x90, 0x81,
+    0x3d, 0x14, 0x5c, 0xdf, 0x49, 0xa9, 0x93, 0x30, 0x85, 0x21, 0x10, 0x60, 0x84, 0x12, 0x44, 0xd2, 0xe0, 0x6d, 0x96,
+    0x5c, 0x4c, 0xe2, 0x24, 0xd9, 0x5f, 0xcc, 0xe7, 0x59, 0xce, 0xbd, 0xaf, 0xc3, 0x25, 0xcf, 0x2a, 0x5c, 0x69, 0x93,
+    0x17, 0x67, 0x31, 0x47, 0x82, 0xba, 0xcb, 0x51, 0x04, 0x4b, 0xfd, 0x38, 0xcb, 0x12, 0x16, 0xa5, 0x80, 0x06, 0x1b,
+    0xd8, 0x76, 0x90, 0x2e, 0x92, 0xa4, 0x77, 0x0c, 0xc3, 0x7e, 0xea, 0x51, 0xb5, 0x90, 0xf8, 0x01, 0x3d, 0xef, 0xe5,
+    0x79, 0x74, 0x01, 0x0d, 0xb1, 0x0d, 0xf0, 0x22, 0xac, 0xd6, 0xd7, 0xfb, 0x6f, 0x5e, 0xfb, 0x82, 0xf1, 0xe3, 0xc9,
+    0x05, 0x00, 0x5a, 0x56, 0x52, 0x73, 0x92, 0x67, 0xb3, 0xc6, 0xd4, 0x48, 0x87, 0x38, 0x64, 0xbd, 0x2b, 0x40, 0x88,
+    0x69, 0x64, 0x58, 0x25, 0x66, 0x42, 0xf0, 0x9a, 0xf8, 0x59, 0x56, 0xe2, 0x1e, 0x18, 0xe0, 0x43, 0x20, 0x8a, 0x61,
+    0xca, 0xeb, 0xa1, 0xe5, 0xf9, 0xc5, 0x32, 0x0e, 0x09, 0xce, 0x39, 0xea, 0x5f, 0x84, 0x71, 0x14, 0xc1, 0xec, 0x4b,
+    0x31, 0x60, 0xa9, 0x20, 0x8e, 0xcb, 0xd2, 0x8b, 0x34, 0x13, 0xa3, 0xc4, 0x43, 0x81, 0xc2, 0x61, 0x1b, 0x5d, 0x5e,
+    0x32, 0x78, 0x71, 0xbd, 0x6f, 0xc2, 0x65, 0xa4, 0xf0, 0x41, 0x0d, 0x85, 0xfb, 0x2b, 0x10, 0x72, 0x02, 0x35, 0xd9,
+    0x29, 0xe8, 0x41, 0x80, 0xf3, 0x6b, 0x10, 0xb5, 0x93, 0x04, 0xa1, 0xb8, 0xd3, 0xf1, 0x40, 0x83, 0x3e, 0x99, 0x46,
+    0xe9, 0x09, 0x1b, 0x07, 0x11, 0x2b, 0xa5, 0xe4, 0xdd, 0xb3, 0x60, 0x8d, 0x81, 0x9d, 0x0a, 0xeb, 0xf9, 0xc1, 0xab,
+    0x97, 0x72, 0xe5, 0x6a, 0xc2, 0x18, 0x16, 0x69, 0x01, 0x6a, 0x15, 0xc4, 0xb6, 0x14, 0xc7, 0xcf, 0xb8, 0x92, 0xde,
+    0xa2, 0x24, 0x2e, 0xde, 0xcf, 0xc1, 0xc4, 0x60, 0x6f, 0x61, 0x18, 0x98, 0x3e, 0x84, 0xa9, 0xa8, 0x1c, 0xe6, 0x13,
+    0x15, 0x63, 0x5d, 0x04, 0x9d, 0x05, 0xa6, 0xe2, 0x35, 0x73, 0xdc, 0x12, 0x58, 0x95, 0xc7, 0x23, 0x2b, 0x1a, 0x8f,
+    0x5f, 0xa4, 0x31, 0x8f, 0xa3, 0x24, 0xfe, 0x8d, 0x28, 0xb9, 0x44, 0x1e, 0xe3, 0x3d, 0xb9, 0x08, 0x80, 0x3b, 0xf5,
+    0x48, 0x5c, 0x25, 0x64, 0xef, 0x10, 0x31, 0x84, 0xb4, 0x4c, 0xc2, 0xc3, 0xa1, 0x04, 0x2f, 0xf1, 0xe7, 0x8b, 0x62,
+    0x8a, 0x84, 0x95, 0x03, 0xa3, 0x20, 0xcf, 0x8e, 0x0b, 0x96, 0x9f, 0xb2, 0xb1, 0xe6, 0x80, 0x02, 0xb0, 0xa2, 0xe6,
+    0x60, 0xbc, 0xd0, 0x8c, 0x8e, 0xd2, 0xa1, 0x0c, 0x86, 0xea, 0x99, 0x62, 0x96, 0x49, 0x66, 0xd6, 0x16, 0x8e, 0x96,
+    0x02, 0x8e, 0x30, 0x2a, 0xa4, 0x24, 0xc8, 0x43, 0x85, 0xe1, 0x14, 0xa4, 0x10, 0x68, 0x05, 0x73, 0x9b, 0x2b, 0x4d,
+    0xf6, 0x6c, 0x41, 0x2a, 0x21, 0x87, 0x8e, 0xb0, 0x91, 0x09, 0xd2, 0xdc, 0x85, 0x5d, 0x05, 0x52, 0x5e, 0x82, 0x2b,
+    0xa4, 0x88, 0x32, 0x73, 0x90, 0x01, 0xc2, 0x6f, 0x84, 0x2e, 0xf4, 0xb1, 0x05, 0xb1, 0x81, 0xaf, 0x57, 0x1e, 0x08,
+    0x2b, 0xf1, 0xae, 0x10, 0xf1, 0xae, 0x00, 0x1b, 0x27, 0x46, 0x7e, 0xf2, 0xee, 0x70, 0x3f, 0xcd, 0xf6, 0x46, 0x23,
+    0x56, 0x14, 0x19, 0xc0, 0x76, 0x87, 0xda, 0x5f, 0x65, 0x68, 0x01, 0x25, 0x5d, 0x2d, 0xeb, 0xec, 0x82, 0x34, 0xb8,
+    0xa9, 0x56, 0x94, 0x4e, 0x0f, 0xec, 0x8f, 0x1f, 0x41, 0x66, 0x7b, 0x92, 0x0c, 0x40, 0xf5, 0x55, 0xc3, 0x4f, 0xd8,
+    0x33, 0x75, 0xca, 0xac, 0xb5, 0x2f, 0x9d, 0x3a, 0x48, 0x1e, 0x0c, 0xeb, 0x96, 0xc6, 0x82, 0xae, 0x1d, 0x1a, 0x57,
+    0x43, 0x2a, 0xc8, 0xe5, 0x09, 0xa9, 0x6c, 0x63, 0x19, 0xc1, 0x6a, 0x2b, 0x3d, 0x22, 0xbd, 0xc2, 0xa6, 0x20, 0x40,
+    0x0f, 0xd9, 0xb0, 0x27, 0xeb, 0xc3, 0x5c, 0x50, 0x2e, 0x67, 0xbf, 0x2e, 0x58, 0xc1, 0x05, 0xeb, 0xc2, 0xb8, 0x05,
+    0x8c, 0x5b, 0xae, 0x58, 0x87, 0x35, 0xdb, 0x71, 0x1d, 0x6c, 0x6f, 0xe6, 0xa8, 0xc7, 0x0a, 0xe4, 0xe4, 0xeb, 0xd9,
+    0x09, 0x61, 0x65, 0xee, 0xe5, 0xe5, 0x37, 0x6a, 0x90, 0x6a, 0x29, 0xb5, 0x0d, 0xd4, 0x58, 0x13, 0x5b, 0x35, 0x19,
+    0xdb, 0xae, 0x54, 0xa8, 0x77, 0x3a, 0xbd, 0x1a, 0x1f, 0xc0, 0x9e, 0x6b, 0x6b, 0x96, 0xae, 0x8c, 0xed, 0xb7, 0x8a,
+    0xa6, 0x6f, 0xc4, 0xc8, 0x64, 0x8d, 0xb2, 0x9b, 0xb9, 0x47, 0xed, 0x78, 0x68, 0xbb, 0x52, 0x57, 0x09, 0x86, 0x45,
+    0x5d, 0x30, 0x34, 0xa1, 0x9e, 0xeb, 0x2e, 0xb6, 0x66, 0x2a, 0x16, 0xaa, 0xb5, 0x56, 0x0e, 0x04, 0x0f, 0x0f, 0xc1,
+    0x38, 0x59, 0xeb, 0x1f, 0xbc, 0x8e, 0x66, 0x0c, 0x29, 0xea, 0x5d, 0xd5, 0x40, 0x3a, 0x10, 0xd0, 0x64, 0xd8, 0x54,
+    0x6f, 0xdc, 0x15, 0x56, 0x53, 0x7d, 0x7f, 0xc5, 0x60, 0x45, 0x80, 0x7d, 0x5d, 0xae, 0x59, 0x22, 0xd2, 0x9b, 0x82,
+    0x4b, 0x34, 0x7d, 0x44, 0x99, 0x58, 0x13, 0x52, 0xf0, 0x80, 0x3c, 0x2c, 0x7f, 0x63, 0xe1, 0x64, 0x2b, 0xa6, 0x70,
+    0xe4, 0x28, 0x53, 0x80, 0xce, 0xa4, 0x04, 0x40, 0x5c, 0xd2, 0xcf, 0xda, 0xc6, 0x42, 0xb2, 0xed, 0x23, 0x1f, 0xf8,
+    0x93, 0x24, 0xe2, 0x4e, 0x67, 0xab, 0xed, 0x02, 0x1f, 0x82, 0x10, 0x07, 0x1d, 0x01, 0xe6, 0x7d, 0x85, 0x0a, 0x43,
+    0x54, 0x62, 0x97, 0xfb, 0x60, 0x14, 0x4d, 0xe3, 0x09, 0x77, 0x52, 0x54, 0x22, 0x6e, 0xc9, 0x12, 0x50, 0x32, 0x7a,
+    0x5f, 0x81, 0x94, 0xe0, 0x42, 0xba, 0x88, 0x6a, 0x2d, 0xd0, 0x14, 0xa4, 0x24, 0xa5, 0x48, 0x0b, 0x2a, 0x08, 0x0c,
+    0xa1, 0xd2, 0x53, 0x1c, 0x05, 0xfa, 0x2d, 0x1e, 0x88, 0x41, 0x83, 0x15, 0x8b, 0x32, 0x1e, 0xc4, 0xab, 0x85, 0xa0,
+    0x86, 0x7d, 0x9e, 0xbd, 0xcc, 0xce, 0x58, 0xfe, 0x24, 0x42, 0xd8, 0x03, 0xd1, 0xbd, 0x04, 0x49, 0x4f, 0x02, 0x9d,
+    0xf5, 0x14, 0xaf, 0x9c, 0x12, 0xd2, 0xb0, 0x10, 0xb3, 0x18, 0x15, 0x21, 0x68, 0x39, 0xa2, 0x7d, 0x8a, 0x5b, 0x8a,
+    0xf6, 0x1e, 0xaa, 0x12, 0xa6, 0x79, 0x6b, 0xef, 0x65, 0x9d, 0xb7, 0x60, 0x84, 0xb9, 0xe2, 0xd6, 0xfa, 0x8e, 0x75,
+    0x3d, 0xa9, 0x9b, 0x1d, 0xc9, 0x5b, 0x86, 0x32, 0x03, 0xfd, 0x71, 0x79, 0x59, 0x19, 0xe9, 0xa0, 0x4c, 0xb5, 0x34,
+    0x47, 0xcb, 0x49, 0x6c, 0x09, 0xb7, 0x04, 0x65, 0x84, 0x86, 0x57, 0x9e, 0x25, 0x89, 0xa1, 0x8b, 0xbc, 0xb8, 0xe7,
+    0x34, 0xd4, 0x11, 0x40, 0x31, 0xab, 0x69, 0xa4, 0x01, 0x0f, 0x74, 0x05, 0x2a, 0x25, 0xa5, 0x8d, 0xbc, 0xaa, 0x89,
+    0x80, 0x38, 0x1d, 0xb3, 0x5c, 0x38, 0x68, 0x52, 0x87, 0xc2, 0x84, 0x29, 0x30, 0x34, 0x1b, 0x83, 0x84, 0x57, 0x08,
+    0x80, 0x79, 0xe2, 0x4f, 0xb3, 0x82, 0xeb, 0x3a, 0x13, 0xfa, 0xf8, 0xf2, 0x32, 0x16, 0xfe, 0x22, 0x32, 0x40, 0xce,
+    0x66, 0xd9, 0x29, 0x5b, 0x03, 0x75, 0x4f, 0x0d, 0x66, 0x82, 0x6c, 0x0c, 0x03, 0x4a, 0x14, 0x54, 0xcb, 0x3c, 0x89,
+    0x47, 0x4c, 0x6b, 0xa9, 0x99, 0x0f, 0x06, 0x1d, 0x3b, 0x07, 0x19, 0xc1, 0xdc, 0x7e, 0xbf, 0xdf, 0xf6, 0x3a, 0x6e,
+    0x29, 0x08, 0xbe, 0x5c, 0xa1, 0xe8, 0x35, 0xfa, 0x51, 0x9a, 0xe0, 0xeb, 0x64, 0x01, 0x77, 0x0d, 0xa5, 0xc8, 0x85,
+    0x9f, 0xe4, 0x49, 0x41, 0xec, 0x7a, 0x63, 0x18, 0x94, 0x33, 0x25, 0xb8, 0xd1, 0xc4, 0x15, 0xdb, 0xf6, 0x9d, 0x26,
+    0x9b, 0x66, 0x27, 0xb5, 0xc3, 0xd4, 0xc2, 0xc8, 0x35, 0x2f, 0xb4, 0x07, 0x6c, 0x2e, 0x0f, 0x5a, 0x89, 0x54, 0x0d,
+    0xbc, 0x0e, 0x10, 0x0a, 0x4f, 0xd7, 0x59, 0x41, 0xa9, 0xea, 0x2c, 0x85, 0xb8, 0xde, 0x40, 0xef, 0x99, 0x04, 0x73,
+    0x1d, 0x09, 0xf6, 0xa5, 0x40, 0xe0, 0xe8, 0x91, 0x89, 0xf5, 0x7a, 0x02, 0xcb, 0x73, 0x1c, 0x8d, 0x3e, 0x69, 0x70,
+    0x2b, 0xb2, 0x37, 0xd9, 0xc0, 0x69, 0x94, 0x84, 0x86, 0xb8, 0x32, 0xf1, 0x56, 0x12, 0xba, 0xb6, 0x51, 0xc0, 0x21,
+    0x5b, 0x61, 0xfb, 0xe6, 0x42, 0x37, 0xb9, 0x5d, 0xb2, 0x87, 0xf2, 0x9f, 0x34, 0x97, 0x5c, 0xc3, 0x72, 0x5c, 0x49,
+    0x03, 0xae, 0x18, 0x0f, 0x96, 0xa6, 0x01, 0x09, 0xf0, 0x5d, 0x39, 0x8e, 0x8b, 0xab, 0x49, 0xf0, 0x87, 0x82, 0xf9,
+    0xd4, 0x98, 0xe9, 0x46, 0x48, 0xb5, 0x84, 0x93, 0x66, 0xb0, 0x06, 0x4d, 0x1a, 0x0f, 0x4a, 0xd4, 0x7c, 0x83, 0x86,
+    0x0a, 0x71, 0xfc, 0x89, 0xa8, 0x42, 0x13, 0x0c, 0xc1, 0xc8, 0xbd, 0x42, 0x32, 0x5c, 0xb6, 0x2a, 0x5a, 0xa4, 0x4c,
+    0x8d, 0x49, 0xa5, 0x6a, 0x96, 0xcb, 0xc0, 0xc0, 0xa2, 0xdd, 0xea, 0x4b, 0x4b, 0x5c, 0x89, 0xdc, 0x34, 0xd4, 0xc2,
+    0xa4, 0x50, 0xde, 0x84, 0x93, 0xa3, 0xdf, 0xa5, 0xac, 0x77, 0x13, 0x9f, 0x5c, 0xe1, 0x93, 0xfb, 0x86, 0x0f, 0x65,
+    0xf2, 0x76, 0x31, 0x28, 0x82, 0xaf, 0x6b, 0x95, 0x68, 0x9f, 0xfa, 0x28, 0x98, 0x5d, 0x2d, 0x74, 0x41, 0xa0, 0x48,
+    0x36, 0x49, 0x07, 0x92, 0xdf, 0x50, 0x6c, 0x54, 0x9e, 0x51, 0xe6, 0x8a, 0x0d, 0x52, 0xf3, 0x4a, 0x33, 0x2f, 0x75,
+    0x1b, 0xf6, 0x7b, 0x59, 0x4a, 0x3a, 0x71, 0x41, 0x99, 0xd8, 0xbb, 0x8e, 0x36, 0x5e, 0x1a, 0x66, 0xc2, 0xfa, 0x15,
+    0xc6, 0x4e, 0x8d, 0x42, 0xa9, 0x14, 0x81, 0x38, 0x36, 0xbe, 0x56, 0x96, 0x41, 0xe6, 0xaf, 0xb1, 0xa7, 0x00, 0x94,
+    0x04, 0x16, 0x5f, 0x53, 0xc9, 0x8b, 0xc2, 0x3a, 0x1d, 0xef, 0x10, 0x1d, 0x2b, 0x11, 0x5a, 0x13, 0xf9, 0x5a, 0x9f,
+    0xc5, 0x7e, 0xcd, 0x25, 0x34, 0x29, 0x99, 0x0f, 0xf2, 0xc0, 0x56, 0x81, 0x88, 0x4a, 0xb7, 0x25, 0x83, 0x84, 0x1c,
+    0xd2, 0x55, 0xa2, 0xd7, 0x46, 0x32, 0x68, 0x9d, 0x0a, 0x89, 0x96, 0x0e, 0xc3, 0xc8, 0x41, 0xc7, 0x9d, 0xd6, 0x62,
+    0x85, 0x90, 0x4d, 0x7b, 0x93, 0x58, 0x11, 0x9d, 0xd3, 0x1c, 0x4d, 0x38, 0x53, 0xa7, 0x3b, 0x0e, 0xa0, 0x03, 0x62,
+    0x7f, 0x85, 0xf5, 0xd6, 0x9a, 0x9d, 0xae, 0x5f, 0x39, 0x7c, 0x97, 0x97, 0x11, 0xf2, 0x83, 0x30, 0x78, 0x61, 0xcd,
+    0x06, 0x4a, 0xf6, 0xee, 0xbd, 0xc4, 0x56, 0x64, 0x7f, 0x56, 0x25, 0x95, 0xa7, 0x50, 0xe3, 0xdc, 0xfa, 0x3a, 0x31,
+    0x33, 0xb4, 0xa8, 0x2a, 0xf6, 0x0d, 0xa9, 0xbe, 0xaf, 0x14, 0x76, 0x85, 0xf2, 0xbe, 0x1c, 0x3a, 0x76, 0x5d, 0x37,
+    0xc8, 0xc9, 0x79, 0xb9, 0xb3, 0xce, 0x85, 0xbc, 0x7b, 0xd7, 0xf4, 0x99, 0x4e, 0xf5, 0xf0, 0x4f, 0x1c, 0x54, 0xce,
+    0xc5, 0x45, 0x4a, 0x16, 0xcc, 0x13, 0xa5, 0x8e, 0x56, 0x1c, 0xd0, 0x76, 0x0f, 0x3d, 0xed, 0xe8, 0x2c, 0x8a, 0xb9,
+    0xa5, 0x47, 0x11, 0x9e, 0x36, 0xca, 0x27, 0x69, 0x74, 0x00, 0x5e, 0x68, 0x42, 0x92, 0x13, 0x6e, 0xda, 0xa2, 0xc5,
+    0x68, 0xca, 0x30, 0x04, 0xae, 0xec, 0x09, 0x53, 0xf6, 0xdc, 0x41, 0xbc, 0xc5, 0xc0, 0x6c, 0x3d, 0xec, 0x65, 0xb3,
+    0x7b, 0xcd, 0xfc, 0x87, 0x35, 0x02, 0xd9, 0x36, 0x53, 0x75, 0x65, 0xe3, 0x5d, 0x8a, 0x48, 0x8c, 0xb0, 0xad, 0x1b,
+    0x5b, 0xda, 0xfa, 0xbd, 0x86, 0x7b, 0x5d, 0x39, 0xe6, 0x35, 0xa5, 0xda, 0xd0, 0xc3, 0xca, 0xcd, 0x61, 0xa6, 0x23,
+    0x2f, 0x56, 0xd0, 0xed, 0x89, 0xa0, 0x10, 0x38, 0x11, 0xda, 0x1e, 0x54, 0xdc, 0x40, 0xa4, 0xe4, 0x4a, 0xab, 0x66,
+    0x8b, 0x64, 0x2c, 0x81, 0x05, 0x17, 0x96, 0x4b, 0x3e, 0x3a, 0x8b, 0x93, 0xa4, 0x2a, 0xfd, 0x43, 0x05, 0xbc, 0x18,
+    0xf6, 0x26, 0xd1, 0x2e, 0x30, 0x5a, 0x28, 0x10, 0x5c, 0x6d, 0x84, 0xbd, 0x77, 0xdc, 0x6a, 0xdd, 0x45, 0xc4, 0x91,
+    0x9b, 0xd1, 0x08, 0xa8, 0xc7, 0x08, 0xab, 0x66, 0xed, 0xbd, 0x67, 0x18, 0x52, 0x33, 0xf0, 0x41, 0x75, 0x46, 0xc5,
+    0x9f, 0x65, 0x4f, 0x7d, 0x26, 0x7a, 0x37, 0xaa, 0xae, 0x66, 0x40, 0x45, 0x05, 0x3e, 0xcc, 0x10, 0x4b, 0x5b, 0x05,
+    0x02, 0x72, 0x3d, 0x2c, 0x4a, 0x01, 0x93, 0x34, 0x58, 0x50, 0x0a, 0xac, 0xb5, 0xb2, 0x7b, 0x79, 0x53, 0x30, 0x87,
+    0x42, 0xe1, 0xa2, 0xff, 0x93, 0x6c, 0x36, 0x47, 0xcb, 0xac, 0xc1, 0xd4, 0xd0, 0xe0, 0x7d, 0xa3, 0xbe, 0x5c, 0x53,
+    0x56, 0xeb, 0x43, 0x3b, 0xb2, 0xc6, 0x4f, 0xda, 0x51, 0x06, 0x87, 0x6a, 0xa1, 0x8b, 0xea, 0x76, 0x73, 0x53, 0xc4,
+    0xac, 0xe3, 0x71, 0x9f, 0xf4, 0xb6, 0xb6, 0x26, 0x3d, 0x4d, 0x03, 0x92, 0x49, 0x92, 0xe1, 0x4d, 0x06, 0x28, 0x2b,
+    0xe2, 0x2c, 0xcb, 0x06, 0xf9, 0x96, 0x65, 0x89, 0xeb, 0xf7, 0x6d, 0x6f, 0xaf, 0xe6, 0x59, 0x7b, 0x7b, 0x57, 0xbb,
+    0xc8, 0x55, 0x9d, 0xf4, 0x20, 0x0f, 0x87, 0x50, 0xb4, 0x62, 0x53, 0x86, 0xcb, 0x59, 0x36, 0x66, 0x81, 0x0d, 0xdd,
+    0x53, 0xbb, 0x94, 0x9b, 0x26, 0x81, 0xcd, 0x91, 0x30, 0x67, 0xf9, 0xae, 0x1e, 0x49, 0x0d, 0xf6, 0x80, 0x05, 0xb4,
+    0xb9, 0xf0, 0x5d, 0x78, 0x92, 0x64, 0xc7, 0x51, 0x72, 0x20, 0x14, 0x78, 0xad, 0xe5, 0x07, 0x70, 0x19, 0xc9, 0x62,
+    0x35, 0x94, 0xd4, 0x77, 0x83, 0xef, 0x82, 0x9b, 0x7b, 0x54, 0xde, 0x8a, 0xdd, 0xf1, 0xdb, 0x7e, 0xc7, 0x56, 0x11,
+    0xb1, 0x97, 0xe6, 0x74, 0xa0, 0x71, 0x0a, 0xa0, 0xcc, 0x01, 0x68, 0xb2, 0xc2, 0x9b, 0xb2, 0xf0, 0xe5, 0xe0, 0xa5,
+    0x72, 0xa9, 0x33, 0x70, 0x21, 0xc0, 0xc9, 0x4f, 0x62, 0xde, 0xc2, 0xf3, 0x48, 0xdb, 0x5b, 0x8a, 0x0a, 0x8c, 0x2b,
+    0x52, 0x5c, 0xba, 0x54, 0xde, 0xa0, 0xf7, 0x31, 0x3c, 0x82, 0x66, 0x1b, 0x1b, 0x4b, 0xe7, 0x55, 0xc4, 0xa7, 0x7e,
+    0x1e, 0xa5, 0xe3, 0x6c, 0xe6, 0xb8, 0x9b, 0xb6, 0xed, 0xfa, 0x05, 0x79, 0x22, 0x5f, 0xba, 0xe5, 0xc6, 0x91, 0x37,
+    0x62, 0xa1, 0x3d, 0xb0, 0x37, 0x3f, 0x7a, 0x07, 0x2c, 0x3c, 0xda, 0xdd, 0x58, 0x8e, 0x58, 0xd9, 0x3f, 0xf2, 0xce,
     0x75, 0xcc, 0xdd, 0x7b, 0x8b, 0x52, 0x06, 0x7a, 0x85, 0xfd, 0x73, 0x09, 0x06, 0xb0, 0x1b, 0xc5, 0xdf, 0x41, 0xca,
     0xbd, 0xa7, 0x03, 0x11, 0x19, 0xa7, 0xbd, 0xbc, 0xb4, 0x33, 0x8a, 0x18, 0xd8, 0x77, 0xb4, 0xb3, 0x7a, 0xf7, 0x6e,
-    0xa5, 0xe6, 0xab, 0x52, 0x6f, 0xc4, 0xc2, 0x9a, 0xa7, 0xee, 0x1d, 0xd0, 0xd1, 0x4a, 0x7d, 0x23, 0x8f, 0x18, 0x29,
-    0xcd, 0x55, 0x3b, 0xc1, 0x31, 0xb6, 0xf8, 0xfa, 0x6d, 0x7d, 0x28, 0xa2, 0x14, 0x7e, 0x0c, 0xd6, 0x4b, 0x04, 0xea,
-    0x1b, 0x1c, 0x1c, 0xef, 0x20, 0xdc, 0xda, 0x75, 0x06, 0x81, 0x73, 0xa7, 0xd5, 0xba, 0xfc, 0x69, 0xeb, 0xf0, 0xe7,
-    0xa8, 0xf5, 0xdb, 0x5e, 0xeb, 0xc7, 0xa1, 0x7b, 0xe9, 0xfc, 0xb4, 0x35, 0x38, 0x94, 0x6f, 0x87, 0x3f, 0xf7, 0x7f,
-    0x2a, 0x86, 0x5f, 0x8a, 0xc2, 0x0d, 0xd7, 0xdd, 0x3a, 0x01, 0x4f, 0x29, 0xdc, 0x6a, 0xb5, 0xfa, 0xf0, 0xb4, 0x80,
-    0x27, 0xfc, 0x79, 0x06, 0x3f, 0x2e, 0x0f, 0xad, 0xff, 0xf0, 0x53, 0xfa, 0x1f, 0x7f, 0xca, 0x87, 0x38, 0xe6, 0xe1,
-    0xcf, 0x3f, 0x15, 0xf6, 0xbd, 0x7e, 0xb8, 0x35, 0xdc, 0x74, 0x1d, 0x5d, 0xf3, 0x65, 0x58, 0x3d, 0x42, 0xab, 0xc3,
-    0x9f, 0xe5, 0x9b, 0x7d, 0xef, 0x68, 0xb7, 0x1f, 0x0e, 0x2f, 0x1d, 0xfb, 0xf2, 0x9e, 0x7b, 0xe9, 0xba, 0x97, 0x1b,
-    0x38, 0xcf, 0x1c, 0x46, 0xbf, 0x07, 0x3f, 0x4f, 0xe0, 0xa7, 0x0d, 0x3f, 0x4f, 0xe1, 0xe7, 0xcf, 0xd0, 0x4d, 0xc4,
-    0xdf, 0x2e, 0x29, 0x16, 0x72, 0x89, 0x07, 0x16, 0x11, 0xac, 0x82, 0xbb, 0xb1, 0x15, 0x7b, 0x13, 0x22, 0x1a, 0xec,
-    0x43, 0xdf, 0xf7, 0x31, 0x4c, 0xea, 0x2c, 0x3f, 0x6e, 0xc0, 0xa2, 0x23, 0xe7, 0x6c, 0x04, 0xcc, 0x13, 0x91, 0x83,
-    0x22, 0xe0, 0xe2, 0x6c, 0xb5, 0xc0, 0xc3, 0x55, 0x6f, 0x1c, 0x4e, 0x98, 0x03, 0x46, 0xc1, 0x73, 0x86, 0x0f, 0x5d,
-    0xd7, 0x7b, 0x26, 0xcf, 0x0c, 0x71, 0x9f, 0x0b, 0xd6, 0x4a, 0x33, 0x61, 0xd2, 0xd8, 0xae, 0x37, 0x5f, 0x53, 0x09,
-    0xdb, 0x3a, 0x3d, 0x81, 0xba, 0x0d, 0x71, 0xd0, 0xf6, 0x3d, 0x8b, 0x3e, 0xe1, 0x96, 0x7c, 0x6d, 0x1c, 0x02, 0xaf,
-    0x58, 0xf2, 0x4d, 0xa3, 0xd1, 0xb0, 0x11, 0x85, 0x3b, 0xf6, 0x98, 0xc1, 0x0c, 0x2b, 0x26, 0x22, 0x27, 0xa5, 0x29,
-    0x2c, 0x5b, 0x98, 0xfc, 0x6d, 0x94, 0xf3, 0x8d, 0xca, 0xb0, 0x0d, 0x6b, 0x96, 0x6c, 0xd3, 0xd2, 0xbf, 0xc5, 0x14,
-    0x68, 0x5a, 0xd2, 0xf9, 0x87, 0x39, 0x7e, 0x98, 0x12, 0x5a, 0xaf, 0x1d, 0x0e, 0x1e, 0x7a, 0x01, 0x72, 0x47, 0xf4,
-    0x73, 0xde, 0xa2, 0x1a, 0x83, 0xbf, 0x32, 0xcc, 0xe0, 0x89, 0xf9, 0x30, 0x44, 0xb3, 0x2c, 0x75, 0x70, 0x2b, 0x45,
-    0x71, 0xff, 0x02, 0x77, 0x46, 0x5a, 0x7a, 0xfb, 0xa1, 0xda, 0x31, 0x07, 0x39, 0x63, 0xdf, 0x47, 0xc9, 0x27, 0x96,
-    0x3b, 0xe7, 0x5e, 0xa7, 0xfb, 0x15, 0x75, 0xf6, 0xd0, 0x36, 0x7b, 0x55, 0x1d, 0xa3, 0x29, 0xb3, 0x40, 0x1d, 0x11,
-    0xb6, 0x3a, 0x5e, 0x8e, 0x51, 0x2d, 0x24, 0x41, 0xe1, 0x65, 0x61, 0x97, 0x38, 0xdc, 0xde, 0x2d, 0x4e, 0x4f, 0xfa,
-    0x76, 0x60, 0xdb, 0x60, 0xf1, 0x1f, 0x50, 0xd8, 0x4a, 0x18, 0x16, 0x60, 0x90, 0xed, 0xc6, 0x3d, 0xbe, 0xb9, 0x59,
-    0x05, 0x9c, 0xf0, 0x20, 0x9d, 0xba, 0x27, 0x5e, 0xe4, 0x4d, 0x43, 0x18, 0x70, 0x04, 0xcd, 0xb0, 0x4b, 0x6f, 0xb4,
-    0x1b, 0xcb, 0x69, 0x30, 0x16, 0xe2, 0x27, 0x51, 0xc1, 0x5f, 0x60, 0x3c, 0x22, 0x1c, 0xa1, 0xb1, 0xef, 0xb3, 0x73,
-    0x36, 0x52, 0x76, 0x06, 0x10, 0x2a, 0x72, 0x7b, 0xee, 0x28, 0x34, 0x9a, 0xc1, 0xdc, 0x61, 0x78, 0x30, 0xb0, 0x61,
-    0x2f, 0xc1, 0xae, 0x0c, 0xa3, 0xc3, 0xce, 0x70, 0x90, 0x86, 0x20, 0x6b, 0x35, 0x6d, 0x65, 0xd1, 0xa2, 0x56, 0xd4,
-    0x1d, 0x0e, 0x9c, 0x53, 0x30, 0xd2, 0xc1, 0x16, 0x77, 0xf0, 0x0d, 0x23, 0x14, 0x45, 0xf8, 0x8e, 0x9d, 0x3c, 0x3b,
-    0x9f, 0x3b, 0xf6, 0xee, 0x96, 0xbd, 0x89, 0xa5, 0x9e, 0x0d, 0xec, 0x05, 0x73, 0x87, 0x67, 0xae, 0xd9, 0x79, 0x7b,
-    0x88, 0xa0, 0x62, 0x21, 0x4e, 0x7e, 0x36, 0xb0, 0xfb, 0x62, 0xea, 0x36, 0x0c, 0x9a, 0xca, 0xe5, 0xc7, 0x15, 0x3d,
-    0x20, 0x54, 0x55, 0x57, 0x05, 0x1d, 0x94, 0x75, 0x03, 0x67, 0x6a, 0x22, 0xd1, 0xc2, 0xc9, 0x24, 0x15, 0xc0, 0xe1,
-    0xc1, 0x66, 0x30, 0xa9, 0xd1, 0x6d, 0x7b, 0x38, 0x38, 0x0b, 0xee, 0xd9, 0xf7, 0xd4, 0xcb, 0x09, 0x0b, 0xc0, 0xbb,
-    0xa0, 0xe9, 0x4f, 0x50, 0x8b, 0xc0, 0xcf, 0x39, 0x03, 0x24, 0xcf, 0xa8, 0x68, 0x2c, 0x8b, 0x16, 0x58, 0x74, 0x10,
+    0xa5, 0xe6, 0xab, 0x52, 0xf0, 0x3e, 0xc2, 0x9a, 0xa7, 0xee, 0x3d, 0xa7, 0xa3, 0x95, 0xfa, 0x46, 0x1e, 0x33, 0x52,
+    0x9a, 0xab, 0x76, 0x82, 0x63, 0x6c, 0xf1, 0xf5, 0xdb, 0xfa, 0x50, 0x44, 0x29, 0xfc, 0x18, 0xac, 0x97, 0x08, 0xd4,
+    0x37, 0x38, 0x38, 0xde, 0x41, 0xb8, 0xb5, 0xeb, 0x0c, 0x02, 0xe7, 0x4e, 0xab, 0x75, 0xf9, 0xd3, 0xd6, 0xe1, 0xcf,
+    0x51, 0xeb, 0xb7, 0xbd, 0xd6, 0x8f, 0x43, 0xf7, 0xd2, 0xf9, 0x69, 0x6b, 0x70, 0x28, 0xdf, 0x0e, 0x7f, 0xee, 0xff,
+    0x54, 0x0c, 0xff, 0x24, 0x0a, 0x37, 0x5c, 0x77, 0xeb, 0xc4, 0x5b, 0xb0, 0x70, 0xab, 0xd5, 0xea, 0xc3, 0xd3, 0x1c,
+    0x9e, 0xf0, 0xe7, 0x19, 0xfc, 0xb8, 0x3c, 0xb4, 0xfe, 0xd3, 0x4f, 0xe9, 0xdf, 0xfc, 0x94, 0x0f, 0x71, 0xcc, 0xc3,
+    0x9f, 0x7f, 0x2a, 0xec, 0x7b, 0xfd, 0x70, 0x6b, 0xb8, 0xe9, 0x3a, 0xba, 0xe6, 0x4f, 0x61, 0xf5, 0x08, 0xad, 0x0e,
+    0x7f, 0x96, 0x6f, 0xf6, 0xbd, 0xa3, 0xdd, 0x7e, 0x38, 0xbc, 0x74, 0xec, 0xcb, 0x7b, 0xee, 0xa5, 0xeb, 0x5e, 0x6e,
+    0xe0, 0x3c, 0x27, 0x30, 0xfa, 0x3d, 0xf8, 0x79, 0x0a, 0x3f, 0x6d, 0xf8, 0x39, 0x81, 0x9f, 0x3f, 0x43, 0x37, 0x11,
+    0x7f, 0xbb, 0xa4, 0x58, 0xc8, 0x25, 0x1e, 0x58, 0x44, 0xb0, 0x0a, 0xee, 0xc6, 0x56, 0xec, 0x6d, 0x10, 0xd1, 0x60,
+    0x1f, 0xfa, 0xbe, 0x8f, 0x61, 0x52, 0x67, 0xf9, 0x71, 0x03, 0x16, 0x1d, 0x39, 0x67, 0x23, 0x60, 0x9e, 0x88, 0x1c,
+    0x14, 0x01, 0x17, 0x67, 0xab, 0x05, 0x1e, 0xae, 0x7a, 0xe3, 0x70, 0x83, 0x39, 0x60, 0x14, 0xbc, 0x66, 0xf8, 0xd0,
+    0x75, 0xbd, 0x67, 0xf2, 0xcc, 0x10, 0xf7, 0xb9, 0x60, 0xad, 0x34, 0x13, 0x26, 0x8d, 0xed, 0x7a, 0xf3, 0x35, 0x95,
+    0xb0, 0xad, 0xd3, 0x13, 0xa8, 0x9b, 0x89, 0x83, 0xb6, 0xef, 0x58, 0xf4, 0x09, 0xb7, 0xe4, 0x2b, 0xe3, 0x10, 0x78,
+    0xc5, 0x92, 0x6f, 0x1a, 0x8d, 0x86, 0x8d, 0x28, 0xdc, 0xb1, 0xc7, 0x0c, 0x66, 0x58, 0x31, 0x11, 0x39, 0x29, 0x4d,
+    0x61, 0xd9, 0xc2, 0xe4, 0x6f, 0xa3, 0x9c, 0x6f, 0x54, 0x86, 0x6d, 0x58, 0xb3, 0x64, 0x9b, 0x96, 0xfe, 0x2d, 0xa6,
+    0x40, 0xd3, 0x92, 0xce, 0x3f, 0xcc, 0xf1, 0xc3, 0x94, 0xd0, 0x7a, 0xed, 0x70, 0xf0, 0xd0, 0x0b, 0x90, 0x3b, 0xa2,
+    0x9f, 0xf3, 0x16, 0xd5, 0x18, 0xfc, 0x95, 0x61, 0x06, 0x4f, 0xcc, 0x87, 0x21, 0x9a, 0x65, 0xa9, 0x83, 0x5b, 0x29,
+    0x8a, 0xfb, 0x17, 0xb8, 0x33, 0xd2, 0xd2, 0xdb, 0x0f, 0xd5, 0x8e, 0x39, 0xc8, 0x19, 0xfb, 0x2e, 0x4a, 0x3e, 0xb1,
+    0xdc, 0x39, 0xf7, 0x3a, 0xdd, 0x2f, 0xa9, 0xb3, 0x87, 0xb6, 0xd9, 0xbb, 0xea, 0x18, 0x4d, 0x99, 0x05, 0xea, 0x88,
+    0xb0, 0xd5, 0xf1, 0x72, 0x8c, 0x6a, 0x21, 0x09, 0x0a, 0x2f, 0x0b, 0xbb, 0xc4, 0xe1, 0xf6, 0x6e, 0x71, 0x7a, 0xd2,
+    0xb7, 0x03, 0xdb, 0x06, 0x8b, 0xff, 0x80, 0xc2, 0x56, 0xc2, 0xb0, 0x00, 0x83, 0x6c, 0x37, 0xee, 0xf1, 0xcd, 0xcd,
+    0x2a, 0xe0, 0x84, 0x07, 0xe9, 0xd4, 0x3d, 0xf1, 0x22, 0x6f, 0x1a, 0xc2, 0x80, 0x23, 0x68, 0x86, 0x5d, 0x7a, 0xa3,
+    0xdd, 0x58, 0x4e, 0x83, 0xb1, 0x10, 0x3f, 0x89, 0x0a, 0xfe, 0x02, 0xe3, 0x11, 0xe1, 0x08, 0x8d, 0x7d, 0x9f, 0x9d,
+    0xb3, 0x91, 0xb2, 0x33, 0x80, 0x50, 0x91, 0xdb, 0x73, 0x47, 0xa1, 0xd1, 0x0c, 0xe6, 0x0e, 0xc3, 0x83, 0x81, 0x0d,
+    0x7b, 0x09, 0x76, 0x65, 0x18, 0x1d, 0x76, 0x86, 0x83, 0x34, 0x5c, 0xb0, 0x40, 0xd3, 0x56, 0x16, 0xcd, 0x6b, 0x45,
+    0xdd, 0xe1, 0xc0, 0x99, 0x80, 0x91, 0x0e, 0xb6, 0xb8, 0x83, 0x6f, 0x18, 0xa1, 0x28, 0xc2, 0x77, 0xec, 0xe4, 0xd9,
+    0xf9, 0xdc, 0xb1, 0x77, 0xb7, 0xec, 0x4d, 0x2c, 0xf5, 0x6c, 0x60, 0x2f, 0x98, 0x3b, 0x3c, 0x73, 0xcd, 0xce, 0xdb,
+    0x43, 0x04, 0x15, 0x0b, 0x71, 0xf2, 0xb3, 0x81, 0xdd, 0x17, 0x53, 0xb7, 0x61, 0xd0, 0x54, 0x2e, 0x3f, 0xae, 0xe8,
+    0x01, 0xa1, 0xaa, 0xba, 0x2a, 0xe8, 0xa0, 0xac, 0x1b, 0x38, 0x53, 0x13, 0x89, 0x16, 0x4e, 0x26, 0xa9, 0x00, 0x0e,
+    0x0f, 0x36, 0x83, 0x49, 0x8d, 0x6e, 0xdb, 0xc3, 0xc1, 0x59, 0x70, 0xcf, 0xbe, 0xa7, 0x5e, 0x4e, 0x59, 0x70, 0xc2,
+    0xc4, 0xf4, 0xa7, 0x20, 0xed, 0xf0, 0xe7, 0x09, 0x03, 0x24, 0xcf, 0xa8, 0x68, 0x21, 0x8b, 0xe6, 0x58, 0x74, 0x10,
     0x20, 0xa8, 0x5e, 0xa1, 0xad, 0x3f, 0xb1, 0x26, 0xe3, 0x90, 0x60, 0xbf, 0x7b, 0x17, 0x96, 0x66, 0xb3, 0x33, 0xc4,
-    0xf3, 0x86, 0x9c, 0x17, 0xdf, 0xc7, 0x1c, 0x54, 0xc2, 0x56, 0xdf, 0x76, 0x07, 0xb6, 0x85, 0x4b, 0xdb, 0xcb, 0x36,
-    0x43, 0x41, 0xe1, 0x78, 0xf3, 0x3d, 0x0b, 0xa6, 0xfd, 0xb0, 0x3d, 0x70, 0x72, 0xa1, 0x3a, 0x12, 0x3c, 0xb7, 0x14,
-    0x12, 0xbc, 0xed, 0x4d, 0x41, 0xa0, 0x23, 0xe7, 0x6e, 0xd8, 0x9b, 0xaa, 0x10, 0x8a, 0x3e, 0x6e, 0x8e, 0xdd, 0x20,
-    0x86, 0x1f, 0x4e, 0x0b, 0x99, 0x66, 0xaa, 0xfb, 0x6a, 0xcd, 0xec, 0x06, 0x63, 0x65, 0x91, 0x27, 0x61, 0xb6, 0xe9,
-    0x60, 0x84, 0x16, 0x24, 0xed, 0xee, 0x00, 0x60, 0xd8, 0x74, 0x14, 0xa7, 0x6d, 0x29, 0x56, 0x53, 0xf6, 0xf9, 0x61,
-    0xb5, 0x1c, 0x6c, 0x10, 0x31, 0xbf, 0xd2, 0x3e, 0x00, 0x56, 0x90, 0x78, 0xf9, 0x50, 0x9d, 0x79, 0x3d, 0xaf, 0x9d,
-    0x6f, 0x2d, 0x95, 0x28, 0x62, 0x9e, 0x21, 0xa1, 0x78, 0xa9, 0xdd, 0x30, 0x61, 0x6e, 0xcf, 0x91, 0x18, 0x9a, 0xe5,
-    0xc3, 0x36, 0x30, 0xbd, 0x0a, 0xb0, 0xa7, 0xe6, 0xb6, 0x48, 0xc2, 0xaa, 0xb9, 0x77, 0x08, 0xac, 0x3d, 0x0c, 0x5f,
-    0x89, 0x13, 0xc7, 0x9e, 0x8a, 0xe6, 0xb3, 0x24, 0x7c, 0xde, 0x38, 0x2e, 0x8e, 0xf0, 0x44, 0x68, 0xdf, 0x1f, 0x2d,
-    0x72, 0x90, 0x07, 0xfc, 0x35, 0x58, 0x06, 0xa1, 0x6c, 0x8a, 0x8e, 0x1e, 0x1e, 0x01, 0x7b, 0x84, 0x78, 0x23, 0x6c,
-    0x6e, 0x54, 0xa3, 0x45, 0x49, 0xc6, 0x0b, 0x1d, 0x0c, 0xf7, 0xb8, 0x74, 0xed, 0x51, 0x30, 0xc8, 0x13, 0x63, 0x07,
-    0xcf, 0xfc, 0xfd, 0x11, 0x56, 0xe3, 0x04, 0x85, 0x5b, 0xd2, 0x6e, 0xab, 0xc4, 0xdf, 0xbe, 0x9f, 0x82, 0x04, 0xc7,
-    0x3a, 0xf0, 0xb3, 0xee, 0xde, 0x4d, 0x24, 0x52, 0xbb, 0x69, 0x8f, 0x4e, 0x22, 0x30, 0x1e, 0x9c, 0xfb, 0x29, 0x54,
-    0x23, 0x89, 0xa8, 0x28, 0x47, 0x0b, 0xd4, 0x3c, 0x55, 0xab, 0xe0, 0x3b, 0x34, 0x23, 0xf0, 0x1c, 0xc3, 0xd6, 0xe4,
-    0xa7, 0xea, 0xc6, 0x22, 0x96, 0xef, 0xba, 0x74, 0xb4, 0x85, 0x07, 0x90, 0x82, 0xd1, 0x04, 0xc3, 0xb8, 0x14, 0x94,
-    0xac, 0xf8, 0xef, 0xa3, 0x11, 0x2b, 0x9f, 0x1e, 0x66, 0x9b, 0x9b, 0x43, 0x71, 0x6e, 0x41, 0x8c, 0xc3, 0x8d, 0xe8,
-    0x6a, 0x5c, 0x01, 0x50, 0x9f, 0xce, 0x89, 0xeb, 0x81, 0x69, 0xc5, 0x9a, 0x2e, 0xc5, 0x3e, 0x39, 0xcc, 0x00, 0x14,
-    0xdc, 0x72, 0x0e, 0xfd, 0xc1, 0x9f, 0x86, 0xe0, 0x1e, 0xfb, 0x5f, 0xba, 0x5b, 0x4a, 0xd0, 0xf4, 0xe4, 0x99, 0xe2,
-    0x92, 0xce, 0x58, 0x3b, 0x1e, 0xc5, 0x46, 0x83, 0xc2, 0x4b, 0x01, 0x03, 0xd0, 0xe6, 0x20, 0x13, 0x2a, 0x0e, 0x42,
-    0x8e, 0x0a, 0x6c, 0x1f, 0x37, 0x3f, 0xc7, 0x9d, 0xfd, 0x14, 0x2c, 0xbc, 0x81, 0x7e, 0x7b, 0x0c, 0x6f, 0x7f, 0xd2,
-    0x6f, 0x2f, 0x59, 0xf0, 0x4b, 0x29, 0x43, 0xf7, 0xb5, 0x29, 0x1e, 0xa8, 0x29, 0x4a, 0xb1, 0x44, 0x06, 0x0d, 0x99,
-    0x9b, 0xaf, 0xc4, 0x6c, 0xb8, 0x5b, 0xa2, 0xda, 0x91, 0xa2, 0x2b, 0xf7, 0x79, 0x74, 0x82, 0xc4, 0x75, 0x4d, 0x52,
-    0x18, 0xb9, 0x04, 0x26, 0xc2, 0x15, 0xdf, 0x12, 0x73, 0xf6, 0xdb, 0x60, 0x83, 0xd7, 0xf2, 0x0e, 0xd0, 0xbe, 0x63,
-    0xb3, 0x39, 0xbf, 0xd8, 0x27, 0x45, 0x1f, 0xc8, 0xb4, 0x01, 0x71, 0x76, 0xde, 0xee, 0xc5, 0xbb, 0xbc, 0x17, 0x83,
-    0x54, 0xcf, 0x15, 0x8b, 0xe1, 0x5e, 0xf5, 0xde, 0x62, 0x94, 0xd2, 0x64, 0x26, 0xaf, 0x86, 0x5e, 0x57, 0xa2, 0xb7,
-    0xb9, 0x09, 0x08, 0xf6, 0x8c, 0xae, 0x5c, 0x74, 0x2d, 0x4b, 0x41, 0x13, 0x80, 0xe8, 0x51, 0x9d, 0xe5, 0x88, 0xe3,
-    0x30, 0x9b, 0x0d, 0x05, 0x07, 0x73, 0xd7, 0x8e, 0x8a, 0x63, 0x62, 0x77, 0x99, 0xb0, 0x03, 0x98, 0x11, 0x97, 0xb7,
-    0x3a, 0x22, 0x3a, 0x2c, 0xfa, 0xeb, 0xf8, 0xf6, 0x47, 0x8f, 0x6d, 0x76, 0x5c, 0xd0, 0x20, 0xb5, 0xb1, 0x1e, 0x56,
-    0x63, 0x41, 0x7d, 0xf8, 0x51, 0x53, 0xa9, 0x2c, 0x36, 0x37, 0xcb, 0xfa, 0x51, 0xad, 0xda, 0xc1, 0xb5, 0xd3, 0x94,
-    0xf3, 0x66, 0x36, 0x08, 0x07, 0x22, 0x26, 0x50, 0xa0, 0xa5, 0x95, 0x15, 0x03, 0x0c, 0x29, 0xcb, 0x51, 0x3e, 0x85,
-    0xcc, 0x8b, 0xcb, 0x52, 0xa7, 0xbe, 0xc8, 0x78, 0x64, 0x88, 0xa7, 0x9e, 0x64, 0xac, 0x80, 0x82, 0xf5, 0x52, 0x2f,
-    0xa1, 0x25, 0x02, 0xcc, 0x9f, 0xa9, 0x1c, 0x1a, 0x61, 0x81, 0x44, 0xa1, 0x61, 0x96, 0x28, 0xe3, 0xb3, 0x08, 0x63,
-    0xd0, 0xf6, 0x4f, 0x6a, 0xb1, 0xaf, 0x42, 0x19, 0x1d, 0xc5, 0x61, 0x3e, 0x0c, 0xa8, 0x7e, 0x21, 0x25, 0xd8, 0x34,
-    0x7c, 0x0f, 0x6c, 0x54, 0x39, 0x9e, 0x24, 0x08, 0x9f, 0xc6, 0x39, 0x23, 0x4f, 0x61, 0x43, 0xc2, 0x2c, 0x4d, 0xdb,
-    0x48, 0xb5, 0x8b, 0xcc, 0x20, 0x94, 0x0b, 0xf3, 0x4f, 0x8d, 0xb3, 0x8b, 0x2c, 0x5c, 0x69, 0x0d, 0xe6, 0xc7, 0x1b,
-    0x13, 0xa0, 0xec, 0xf2, 0x32, 0x13, 0x3e, 0x6e, 0x44, 0xf6, 0x86, 0xae, 0x98, 0x0e, 0x14, 0x52, 0x81, 0x13, 0x91,
-    0xc5, 0x43, 0x67, 0x28, 0x34, 0xc2, 0x01, 0x9d, 0x22, 0xe7, 0xae, 0xb1, 0xe9, 0xf3, 0x81, 0xf6, 0x8d, 0xd2, 0xd0,
-    0x49, 0x40, 0x08, 0x08, 0xdc, 0x0d, 0x6b, 0x2a, 0x1d, 0xa4, 0x41, 0x42, 0xa5, 0xe8, 0xe7, 0x00, 0xfe, 0x61, 0x24,
-    0x29, 0x00, 0xf6, 0x43, 0x35, 0x52, 0x44, 0x59, 0x16, 0xb8, 0x00, 0x34, 0xd7, 0x3e, 0xae, 0x84, 0x2f, 0x0c, 0x54,
-    0x98, 0x9e, 0x66, 0xe5, 0xa5, 0x50, 0x22, 0xef, 0xd6, 0xa4, 0xac, 0x91, 0x4c, 0x3e, 0x45, 0x87, 0x4f, 0x79, 0xd7,
-    0xaf, 0x25, 0x1e, 0xba, 0xe0, 0x29, 0x2c, 0xab, 0x7a, 0x7e, 0x15, 0x72, 0x72, 0xae, 0x41, 0x57, 0x48, 0xa1, 0xbf,
-    0xe2, 0x24, 0xef, 0xbd, 0xf2, 0xab, 0x5a, 0x6a, 0x0c, 0x65, 0xef, 0xd7, 0x35, 0xc3, 0xf2, 0x72, 0x5e, 0x85, 0x29,
-    0x08, 0xb8, 0x25, 0x4b, 0x82, 0xa5, 0xd4, 0x10, 0x60, 0x61, 0x7b, 0xa4, 0x95, 0x82, 0xbc, 0xd4, 0xe1, 0x9d, 0xa7,
-    0x60, 0x05, 0x18, 0x87, 0x5a, 0x2a, 0x99, 0x46, 0x12, 0x5f, 0x2a, 0x51, 0x60, 0xca, 0xfd, 0x11, 0xf8, 0xa9, 0xcd,
-    0x93, 0xae, 0x73, 0xd7, 0x8f, 0x67, 0x98, 0xda, 0x43, 0xa0, 0xc7, 0xde, 0x1d, 0x30, 0x25, 0xea, 0x3a, 0xac, 0x20,
-    0x0e, 0xcd, 0x6a, 0x9a, 0x05, 0xcc, 0x98, 0x36, 0x68, 0xc9, 0x36, 0xd8, 0x72, 0x39, 0xd8, 0x47, 0x62, 0x7b, 0x56,
-    0x2b, 0x20, 0x74, 0x0d, 0x1a, 0x18, 0x72, 0x97, 0x0a, 0x2d, 0xcc, 0x7b, 0x5d, 0x2a, 0xc2, 0xfd, 0x39, 0xe0, 0xd2,
-    0x0a, 0xce, 0xbc, 0x8c, 0x06, 0xde, 0x8f, 0x8f, 0x13, 0x4c, 0x7c, 0x41, 0xac, 0xc0, 0x0e, 0x0e, 0x3a, 0xcd, 0xa6,
-    0xc0, 0xa9, 0xb8, 0x48, 0x19, 0x2c, 0x2b, 0x4a, 0x6d, 0xf8, 0x21, 0x45, 0xb6, 0xee, 0xf2, 0x40, 0x77, 0x21, 0x16,
-    0xc0, 0x4e, 0xbf, 0x60, 0xe4, 0x5b, 0xd6, 0xcb, 0x80, 0xc1, 0xa9, 0xd6, 0x38, 0x08, 0xfc, 0xe6, 0x66, 0x32, 0x2c,
-    0x53, 0x62, 0xbb, 0x26, 0xab, 0x0b, 0xc8, 0x61, 0xa8, 0x26, 0xee, 0x20, 0x2c, 0x95, 0x3d, 0x5e, 0x94, 0x33, 0x5c,
-    0x2e, 0x65, 0x21, 0x37, 0xcf, 0xab, 0x69, 0x3e, 0xb7, 0xd2, 0x6c, 0x3a, 0xde, 0x8a, 0x2f, 0x0a, 0xfe, 0x81, 0x13,
-    0x4b, 0xab, 0x9e, 0x52, 0x2b, 0x3c, 0xca, 0xdc, 0x92, 0x75, 0x4a, 0x6a, 0x75, 0xdd, 0x40, 0x35, 0xc2, 0xd3, 0x34,
-    0x6c, 0x04, 0x42, 0x4c, 0x70, 0xf1, 0xeb, 0x26, 0x13, 0xd3, 0xde, 0x12, 0x52, 0x47, 0xd8, 0x3d, 0x94, 0x13, 0xdc,
-    0xd5, 0x3c, 0xfb, 0x3c, 0x9c, 0x5f, 0xcd, 0xdc, 0x7b, 0x06, 0x73, 0x3f, 0x0e, 0xb9, 0xc1, 0xe8, 0xb1, 0x4c, 0xf8,
-    0x91, 0xb1, 0x8f, 0x5c, 0x55, 0x3d, 0x39, 0x09, 0x2b, 0x91, 0x25, 0x9e, 0x8c, 0xa3, 0x0e, 0xe3, 0x54, 0xb4, 0x26,
-    0xc8, 0x2e, 0x2f, 0x0b, 0x73, 0x2f, 0x50, 0xd0, 0xd4, 0xe3, 0xf5, 0x38, 0x6d, 0xc5, 0xce, 0x46, 0x24, 0x72, 0xef,
-    0x55, 0x2d, 0x12, 0x59, 0xf1, 0x39, 0x8e, 0x74, 0xc5, 0x41, 0xee, 0x93, 0x93, 0xd5, 0x4d, 0x2a, 0x74, 0x8b, 0x46,
-    0xdb, 0xd8, 0xa3, 0xfa, 0x40, 0x52, 0xcf, 0xa8, 0xc0, 0xaa, 0xc6, 0xbe, 0x7b, 0xb7, 0x23, 0xd2, 0x2d, 0x95, 0x62,
-    0x83, 0xa5, 0x85, 0xd1, 0x8c, 0x51, 0x30, 0x28, 0x29, 0x32, 0x50, 0xa3, 0xfc, 0x0a, 0xc1, 0xb0, 0x47, 0x0d, 0x40,
-    0x71, 0xae, 0xaf, 0x7e, 0x5c, 0x4a, 0xb6, 0x10, 0x90, 0xb8, 0x4b, 0x06, 0x62, 0x4d, 0x30, 0x33, 0xf2, 0xc9, 0x7b,
-    0xe0, 0xbc, 0x01, 0x43, 0x1f, 0x01, 0xfc, 0x02, 0xb1, 0xe9, 0xc1, 0xc4, 0xb6, 0x89, 0x28, 0xfa, 0x6c, 0xe0, 0x39,
-    0x00, 0x3b, 0xaf, 0x42, 0xa3, 0xef, 0xaa, 0x14, 0x30, 0x64, 0x03, 0x37, 0x60, 0x55, 0x58, 0x6e, 0xef, 0x39, 0xb8,
-    0x0d, 0xf0, 0xfa, 0x4c, 0x36, 0xdf, 0xc0, 0x3c, 0xc1, 0xea, 0xec, 0xc2, 0xaf, 0x2c, 0x6b, 0x71, 0xee, 0x74, 0xd0,
-    0xa8, 0x57, 0x94, 0x10, 0xb5, 0xfb, 0x58, 0x7b, 0x80, 0x11, 0x16, 0xf1, 0xfe, 0x0a, 0xdf, 0xf5, 0xb8, 0xe5, 0x9e,
-    0x46, 0x8b, 0x30, 0x5d, 0x25, 0x8d, 0x41, 0xc9, 0xba, 0x9f, 0x8c, 0xb8, 0x97, 0xfb, 0x22, 0x16, 0x5c, 0xe1, 0xc8,
-    0xaa, 0x90, 0x62, 0x03, 0x49, 0x7a, 0xda, 0xa3, 0x03, 0xf6, 0x8d, 0x66, 0x2f, 0xa0, 0xcc, 0xfb, 0x8a, 0x54, 0x12,
-    0x52, 0x9a, 0xdd, 0x10, 0x49, 0xc2, 0x5a, 0x91, 0xa7, 0xce, 0xfb, 0x8e, 0xf6, 0xb9, 0x95, 0x44, 0x30, 0x82, 0x93,
-    0x30, 0x1d, 0x2b, 0x0f, 0x9a, 0x02, 0x5c, 0x45, 0x47, 0x4c, 0xdf, 0x04, 0xe4, 0x37, 0x03, 0xb9, 0xbd, 0x92, 0x5c,
-    0x9b, 0x6b, 0x18, 0x9e, 0x20, 0xc1, 0xaa, 0x48, 0x04, 0x1e, 0x51, 0x03, 0x8e, 0xf9, 0x3a, 0xcf, 0x03, 0x4c, 0xf8,
-    0xda, 0xde, 0x04, 0x80, 0x72, 0x72, 0x55, 0x9c, 0x95, 0x40, 0x37, 0x60, 0xb9, 0x3e, 0x4e, 0x8d, 0x8a, 0xc4, 0xc5,
-    0x8d, 0xe9, 0xea, 0x96, 0xfe, 0x0c, 0x2d, 0x67, 0x32, 0xc4, 0x74, 0x10, 0x04, 0x64, 0xea, 0x3b, 0xe6, 0x08, 0x99,
-    0x2b, 0xac, 0xcf, 0xb9, 0x53, 0x9b, 0xba, 0xc7, 0xa8, 0x9b, 0x27, 0xa9, 0xc5, 0xeb, 0xb4, 0x29, 0x25, 0x62, 0x52,
-    0x62, 0x6e, 0x88, 0x54, 0x6c, 0xa6, 0xc4, 0x9d, 0x5b, 0xdf, 0x68, 0x21, 0x6d, 0xb4, 0x0d, 0x91, 0x83, 0xcd, 0x2a,
-    0x79, 0x4f, 0x60, 0x3c, 0x17, 0x84, 0x2f, 0x5f, 0x51, 0x92, 0x0e, 0x73, 0x4c, 0x04, 0xab, 0x17, 0x53, 0x91, 0xbf,
-    0x73, 0x74, 0x9a, 0xbd, 0x41, 0x0f, 0x52, 0x6f, 0x20, 0x31, 0x6b, 0xe2, 0xbb, 0x90, 0x86, 0x3a, 0x42, 0xa0, 0x32,
-    0xaa, 0x65, 0x3a, 0x4e, 0xac, 0xc2, 0x37, 0x82, 0xaf, 0xde, 0xea, 0xe3, 0x7c, 0xe3, 0xb9, 0xb1, 0x1a, 0x41, 0x0c,
-    0xde, 0x42, 0x3e, 0xf4, 0xa4, 0x08, 0x07, 0xc2, 0xe5, 0x9b, 0x9b, 0xbd, 0x7c, 0x97, 0x57, 0x21, 0x92, 0x0a, 0xc6,
-    0x18, 0x33, 0x8a, 0x71, 0x4f, 0xd4, 0xd4, 0x62, 0x0e, 0x03, 0xcb, 0xd6, 0x61, 0x8e, 0x07, 0x00, 0xd0, 0xd2, 0x94,
-    0x5e, 0x35, 0x15, 0x2a, 0xcf, 0x73, 0x09, 0x9f, 0xea, 0x10, 0x55, 0x35, 0x7e, 0xbb, 0x3e, 0x03, 0x85, 0xe0, 0xbe,
-    0xd3, 0xf1, 0xf0, 0x10, 0x02, 0x56, 0x51, 0xc8, 0x02, 0xbd, 0x41, 0x7b, 0x55, 0x22, 0x14, 0x33, 0x27, 0xeb, 0x31,
-    0xc3, 0x49, 0x05, 0x5b, 0xa8, 0x84, 0xa5, 0xd2, 0x02, 0xbf, 0xda, 0x08, 0xcd, 0x53, 0xc6, 0xbd, 0x57, 0x15, 0xce,
-    0xa0, 0x3f, 0x98, 0xb7, 0xca, 0xa8, 0x6f, 0x57, 0x4e, 0x64, 0x2a, 0x30, 0x71, 0x33, 0x4b, 0xed, 0xf7, 0xcb, 0x3a,
-    0xed, 0xe7, 0x15, 0x72, 0x9f, 0x93, 0xe6, 0xeb, 0xdc, 0x42, 0xf3, 0xc9, 0x70, 0xbf, 0x52, 0x7e, 0x68, 0x61, 0xd4,
-    0x94, 0x5f, 0x5e, 0x57, 0x7e, 0x85, 0xa7, 0xc2, 0x5b, 0xfd, 0x2e, 0x0a, 0x5d, 0xd4, 0xe7, 0x60, 0x08, 0xe9, 0x47,
-    0x70, 0x0d, 0x0d, 0x1e, 0x14, 0xc9, 0x62, 0xb1, 0x76, 0x41, 0x5c, 0x1f, 0x73, 0xaa, 0x1d, 0xca, 0x18, 0x23, 0x9e,
-    0x96, 0x1c, 0x24, 0x19, 0x1c, 0x8c, 0xdf, 0xc0, 0x80, 0x98, 0x94, 0x84, 0x74, 0x08, 0x9d, 0xb5, 0x99, 0x88, 0xca,
-    0x5d, 0xbc, 0xd9, 0xb8, 0xac, 0x29, 0x14, 0x61, 0x27, 0x98, 0xa9, 0x94, 0x0a, 0x02, 0x69, 0xf2, 0xdd, 0xe9, 0xd4,
-    0x82, 0xa1, 0x85, 0x6b, 0x2a, 0x20, 0xaf, 0xed, 0x7a, 0xd0, 0xe4, 0x3d, 0xc5, 0xd0, 0xd7, 0xa9, 0x11, 0x2f, 0x33,
-    0xf8, 0x1a, 0x36, 0x7f, 0x4d, 0x94, 0xe4, 0x21, 0x13, 0xb1, 0x57, 0xf0, 0x89, 0x90, 0x4d, 0xc1, 0xce, 0x04, 0xfa,
-    0xa1, 0x5d, 0xd9, 0x4b, 0x77, 0x8b, 0xca, 0xa5, 0x45, 0x63, 0x2b, 0x51, 0xb3, 0xe6, 0x87, 0xf1, 0x66, 0x0a, 0xfb,
-    0xd9, 0xa3, 0x04, 0x02, 0xd2, 0x54, 0x4e, 0x52, 0xcd, 0x7b, 0x98, 0x0e, 0x01, 0x24, 0xd8, 0xfd, 0x04, 0x16, 0xfa,
-    0x4d, 0x89, 0x09, 0x16, 0x55, 0x63, 0xb7, 0x39, 0x68, 0xcd, 0x39, 0x69, 0xbe, 0x39, 0x6a, 0xed, 0x4d, 0x65, 0x3d,
-    0x63, 0x76, 0x80, 0x6d, 0xbb, 0x9b, 0xc5, 0x61, 0xba, 0xd9, 0x19, 0x1a, 0x82, 0x0b, 0x8f, 0xff, 0x93, 0x12, 0xd3,
-    0x40, 0x72, 0xa9, 0x1b, 0x3f, 0xa1, 0x0e, 0xc3, 0xff, 0x96, 0xa4, 0x80, 0x07, 0xb5, 0xd5, 0x58, 0x71, 0xee, 0x15,
-    0x47, 0xc9, 0x65, 0x55, 0xed, 0x6a, 0x09, 0x1a, 0xba, 0x91, 0x8c, 0x89, 0x62, 0x9e, 0x13, 0x00, 0xa3, 0xd8, 0xfc,
-    0x29, 0xd3, 0x49, 0xde, 0xbf, 0xac, 0x4d, 0xed, 0xf6, 0x7d, 0x3f, 0xca, 0x4f, 0xe8, 0x48, 0x45, 0x65, 0x73, 0x12,
-    0xf3, 0x6f, 0x0b, 0x30, 0xcd, 0x89, 0x0f, 0xf5, 0x5c, 0xc3, 0x50, 0x80, 0xaf, 0x6c, 0x28, 0x35, 0xdb, 0xe3, 0xdf,
-    0x3b, 0xdb, 0x7d, 0x49, 0x14, 0xc1, 0x02, 0x0d, 0xba, 0x5c, 0x81, 0x2f, 0x60, 0x19, 0xdc, 0x92, 0x7e, 0x0a, 0xbe,
-    0x97, 0x57, 0xc1, 0x67, 0xec, 0x7f, 0x01, 0x68, 0x55, 0x60, 0x40, 0xb9, 0xd3, 0x34, 0xac, 0x84, 0xb8, 0x44, 0x85,
-    0x59, 0xc5, 0xf9, 0xe3, 0x3a, 0xaf, 0x9b, 0x96, 0x25, 0x06, 0xe5, 0xe7, 0xae, 0xe1, 0xc6, 0xf7, 0x1a, 0xf9, 0xe3,
-    0x7b, 0xcf, 0x41, 0xb7, 0x13, 0x69, 0xef, 0xde, 0xcd, 0xef, 0x90, 0x85, 0x86, 0xf7, 0xc2, 0xe6, 0xd0, 0x16, 0xe9,
-    0x92, 0xab, 0x67, 0x2c, 0xc6, 0xdb, 0x22, 0x54, 0x86, 0x0f, 0x58, 0x30, 0x07, 0x0c, 0xc1, 0x63, 0xa7, 0x32, 0xf9,
-    0x0c, 0x1b, 0x4d, 0xb1, 0x6b, 0x2e, 0x0c, 0x3e, 0x50, 0x95, 0x85, 0xe4, 0xc5, 0x3a, 0xd9, 0x9e, 0x9d, 0xc2, 0xf3,
-    0xcb, 0xb8, 0x00, 0xea, 0x00, 0xfa, 0x15, 0x95, 0xc5, 0x06, 0x72, 0x71, 0x53, 0xd6, 0x7a, 0x45, 0xe3, 0xf1, 0xb5,
-    0x5d, 0x58, 0x5d, 0x81, 0x4f, 0xa3, 0x74, 0x9c, 0x88, 0x49, 0xcc, 0xa4, 0xca, 0x35, 0xb9, 0x36, 0xba, 0x97, 0xb6,
-    0x68, 0x9e, 0x0b, 0x09, 0x5e, 0x11, 0xb8, 0x21, 0xf4, 0x95, 0xbe, 0x5c, 0x6f, 0xa0, 0xe0, 0x51, 0x7b, 0x73, 0x11,
-    0x4c, 0x4c, 0x3c, 0x66, 0x48, 0x4d, 0xbf, 0x0e, 0xa7, 0x56, 0x16, 0x2b, 0x0e, 0xbf, 0xce, 0x19, 0x6b, 0x28, 0x00,
-    0xe2, 0x93, 0x07, 0x57, 0xbb, 0x49, 0xaf, 0x94, 0x76, 0x50, 0x1a, 0x21, 0xbe, 0xad, 0xf0, 0x75, 0x97, 0x8a, 0xaf,
-    0x5c, 0x75, 0xef, 0x6b, 0xc6, 0x8c, 0x0b, 0x46, 0xcf, 0xf9, 0x2c, 0x69, 0x5c, 0xbb, 0xa1, 0xbb, 0x3a, 0x3f, 0x7a,
-    0x3f, 0xc8, 0xbc, 0x85, 0x19, 0xb0, 0x09, 0xa8, 0x82, 0xe7, 0xde, 0x6b, 0xe3, 0x44, 0xf9, 0x3b, 0xf3, 0x88, 0x57,
-    0x0e, 0xb3, 0xee, 0x24, 0xf9, 0xbb, 0xc1, 0x77, 0xc1, 0xd5, 0x2d, 0x8d, 0x13, 0xe4, 0xae, 0x3a, 0x41, 0x26, 0xca,
-    0xcd, 0xf4, 0x86, 0xdb, 0xbb, 0xad, 0x40, 0x10, 0xa7, 0x62, 0xfa, 0xa8, 0x1c, 0xd7, 0x8f, 0x16, 0xa8, 0x54, 0x44,
-    0x7c, 0xaa, 0x72, 0x57, 0xae, 0x4c, 0x0d, 0xf5, 0xb8, 0x4e, 0x66, 0xa1, 0x69, 0xd6, 0xe4, 0x52, 0x36, 0x3d, 0x46,
-    0xa6, 0xd9, 0xa9, 0x36, 0xbf, 0x7b, 0xe5, 0x21, 0x1d, 0x43, 0x73, 0xb1, 0x56, 0x0b, 0xee, 0x77, 0x15, 0x85, 0x77,
-    0xbd, 0xd8, 0x48, 0x65, 0xa8, 0x59, 0x8f, 0xa2, 0x8f, 0xe3, 0x36, 0x73, 0x79, 0x94, 0xfd, 0x59, 0x03, 0xc0, 0x74,
-    0x84, 0x45, 0x77, 0xd3, 0x33, 0xf6, 0x04, 0x7a, 0x7a, 0x22, 0x83, 0x44, 0xaf, 0x75, 0xbe, 0x6a, 0x95, 0x58, 0xba,
-    0x86, 0xc0, 0xee, 0x35, 0x19, 0xab, 0x92, 0x76, 0xab, 0xf5, 0xab, 0x79, 0x3e, 0x4f, 0xf9, 0x4a, 0x9e, 0x4f, 0xcd,
-    0xa2, 0xbb, 0xd3, 0x76, 0xaf, 0x4f, 0x0d, 0x15, 0x73, 0xad, 0x6f, 0xf2, 0x3b, 0xa6, 0xeb, 0x60, 0xa8, 0x45, 0x90,
-    0x59, 0xed, 0xaa, 0x67, 0x65, 0x39, 0xab, 0x67, 0x72, 0xcc, 0x84, 0x6f, 0x2a, 0xdd, 0x21, 0xba, 0x61, 0xaa, 0x66,
-    0xfa, 0xb1, 0xb1, 0x2d, 0x64, 0x9b, 0xe7, 0x17, 0xe3, 0x1c, 0x28, 0x2d, 0xf7, 0x97, 0x09, 0xc3, 0x8f, 0x97, 0x97,
-    0x3f, 0x0a, 0x39, 0x55, 0x75, 0xf4, 0x96, 0x2f, 0x75, 0xcf, 0x60, 0x56, 0x2a, 0x27, 0xe2, 0x98, 0xad, 0x1f, 0xbc,
-    0xb9, 0x7b, 0x05, 0x2c, 0xc7, 0x80, 0xdd, 0x31, 0x73, 0x1a, 0x43, 0x55, 0x1b, 0xf8, 0x87, 0xf5, 0x83, 0xad, 0xdb,
-    0xc3, 0x3f, 0x0c, 0x7e, 0x08, 0xae, 0x6d, 0x6c, 0x6c, 0xe3, 0xed, 0x5a, 0x22, 0xc8, 0x2b, 0x3c, 0xd0, 0xc7, 0xab,
-    0x8f, 0x82, 0x96, 0xeb, 0xc4, 0xf6, 0xc0, 0xa1, 0xb0, 0x35, 0xc8, 0x37, 0x29, 0x93, 0x46, 0x8b, 0x82, 0x67, 0x33,
-    0x39, 0x43, 0x21, 0xaf, 0xf9, 0x38, 0x68, 0x3b, 0xc2, 0xdf, 0xc0, 0xa9, 0x1d, 0x2f, 0x2f, 0x3f, 0x41, 0x1f, 0xf0,
-    0x74, 0xa5, 0x34, 0x15, 0x71, 0x4a, 0xb9, 0x45, 0x57, 0xeb, 0x3c, 0x18, 0x29, 0x2e, 0xa6, 0xa8, 0x74, 0xdc, 0xe5,
-    0xb5, 0xb3, 0x91, 0xd3, 0x5f, 0xe2, 0xd5, 0x45, 0xba, 0x7c, 0x24, 0xb2, 0x55, 0x4b, 0xef, 0x37, 0x7d, 0xba, 0x6d,
-    0xcf, 0x18, 0x9f, 0x66, 0x63, 0x3a, 0x98, 0xf1, 0x71, 0x22, 0xbc, 0x3e, 0x31, 0xd6, 0x77, 0x8b, 0xc0, 0x74, 0x73,
-    0x6c, 0xf2, 0xc3, 0xf1, 0x7a, 0xb3, 0x59, 0xe3, 0x0e, 0xde, 0x38, 0x4f, 0x9c, 0x65, 0x89, 0x11, 0x95, 0xa5, 0x86,
-    0x07, 0xb4, 0x42, 0xdc, 0xbc, 0x67, 0x02, 0xe3, 0xb2, 0x0b, 0x92, 0xda, 0x6e, 0x20, 0x70, 0xb1, 0x27, 0x31, 0x4b,
-    0xc6, 0xb6, 0x07, 0xe5, 0x81, 0xbe, 0x18, 0x4d, 0xb7, 0x80, 0x69, 0x79, 0xed, 0xec, 0x2c, 0xb5, 0xbd, 0x6a, 0xaa,
-    0x00, 0x66, 0xc9, 0xf2, 0xf8, 0x04, 0x59, 0xf7, 0x5b, 0xe8, 0x22, 0x06, 0x8c, 0x8d, 0x2b, 0x73, 0xee, 0x72, 0xdd,
-    0x8a, 0xf8, 0x46, 0x13, 0x69, 0x52, 0x1f, 0x52, 0xdf, 0x61, 0x58, 0xab, 0xab, 0x1c, 0x24, 0x70, 0x8f, 0xbc, 0x5b,
-    0xe2, 0xd2, 0xd3, 0x67, 0x16, 0x93, 0x2a, 0x7d, 0x4b, 0x5d, 0x8b, 0x6b, 0x86, 0xbd, 0xe2, 0x01, 0xd8, 0x1f, 0x18,
-    0xb7, 0x88, 0x45, 0xbc, 0x9d, 0xd7, 0x52, 0x58, 0x1b, 0x73, 0xa0, 0xb9, 0xe1, 0x06, 0xbf, 0xb1, 0x6a, 0xcd, 0xc0,
-    0x0c, 0x33, 0xce, 0x48, 0x7e, 0x33, 0xee, 0x55, 0x4d, 0x1c, 0xb9, 0x0a, 0x20, 0xfa, 0x96, 0x74, 0x49, 0x0e, 0xaf,
-    0x64, 0xb9, 0xea, 0x0c, 0xf9, 0x57, 0x58, 0x67, 0xbd, 0x38, 0x01, 0x33, 0x69, 0xca, 0x4b, 0x4c, 0x4c, 0x11, 0x97,
-    0x9b, 0x65, 0xcc, 0xd3, 0xf4, 0x59, 0xb4, 0x83, 0x93, 0x1b, 0x09, 0x1c, 0xb1, 0x6f, 0x2c, 0x43, 0x33, 0x61, 0x23,
-    0x26, 0xd2, 0xa8, 0x94, 0x12, 0x3e, 0x90, 0x4b, 0x2d, 0xf9, 0xcb, 0x5c, 0x5e, 0x7d, 0xb9, 0x4d, 0x70, 0x40, 0x5e,
-    0x03, 0xcb, 0xa1, 0x71, 0xdc, 0x32, 0x90, 0x88, 0xc5, 0x80, 0x18, 0xb5, 0x2a, 0x57, 0x93, 0x51, 0x9d, 0xcc, 0x57,
-    0xc8, 0x85, 0x8a, 0x3c, 0xb8, 0x25, 0x50, 0xf2, 0xe7, 0x98, 0x3a, 0x98, 0x95, 0xda, 0x4d, 0x8b, 0x4d, 0x92, 0xf7,
-    0xcc, 0x80, 0xe4, 0xfa, 0x6b, 0x78, 0x68, 0xfc, 0xe2, 0x95, 0x39, 0x25, 0x7c, 0x51, 0xc6, 0xd2, 0xd2, 0x98, 0x4b,
-    0xff, 0x42, 0xde, 0xa7, 0x95, 0x80, 0xfd, 0x0a, 0x62, 0xca, 0xc0, 0x25, 0x36, 0x2e, 0x48, 0xca, 0x6b, 0x79, 0xca,
-    0xee, 0x6b, 0x28, 0xdf, 0x15, 0x93, 0xae, 0x52, 0x59, 0x57, 0x58, 0x75, 0xbf, 0x2e, 0x58, 0x7e, 0xb1, 0xcf, 0x30,
-    0x37, 0x19, 0x0d, 0xb2, 0x15, 0x33, 0x9b, 0xf2, 0xab, 0xbd, 0x6b, 0xbf, 0xf2, 0x50, 0xd2, 0xa1, 0x5a, 0xa5, 0x9b,
-    0x57, 0x6e, 0x38, 0xc6, 0x8d, 0x1b, 0x8e, 0x00, 0x36, 0x86, 0x9d, 0x2a, 0x52, 0xeb, 0xfc, 0xf7, 0xd5, 0xf0, 0x13,
-    0xed, 0xb5, 0xa1, 0xde, 0x75, 0xc3, 0xb5, 0xe9, 0xe9, 0xd7, 0xa0, 0x6a, 0x64, 0x09, 0x5d, 0x87, 0x2a, 0x26, 0x23,
-    0x51, 0x62, 0xba, 0x4a, 0x79, 0xd4, 0xd7, 0x88, 0x73, 0x10, 0x37, 0x94, 0xbf, 0xf8, 0xe7, 0xf0, 0xe2, 0x28, 0x40,
-    0x23, 0x6a, 0x39, 0xc9, 0x52, 0xde, 0x9a, 0x44, 0xb3, 0x38, 0xb9, 0x08, 0x16, 0x71, 0x6b, 0x96, 0xa5, 0x59, 0x31,
-    0x07, 0xae, 0xf4, 0x8a, 0x0b, 0xb0, 0xe1, 0x67, 0xad, 0x45, 0xec, 0x3d, 0x67, 0xc9, 0x29, 0xe3, 0xf1, 0x28, 0xf2,
-    0xec, 0xbd, 0x1c, 0xc4, 0x83, 0xf5, 0x3a, 0xca, 0xf3, 0xec, 0xcc, 0xf6, 0xde, 0x65, 0xc7, 0xc0, 0xb4, 0xde, 0x9b,
-    0xf3, 0x8b, 0x13, 0x96, 0x7a, 0xef, 0x8f, 0x17, 0x29, 0x5f, 0x78, 0x45, 0x94, 0x16, 0xad, 0x82, 0xe5, 0xf1, 0x04,
-    0xd4, 0x44, 0x92, 0xe5, 0x2d, 0xcc, 0x7f, 0x9e, 0xb1, 0x20, 0x89, 0x4f, 0xa6, 0xdc, 0x1a, 0x47, 0xf9, 0xa7, 0x5e,
-    0xab, 0x35, 0xcf, 0xe3, 0x59, 0x94, 0x5f, 0xb4, 0xa8, 0x45, 0xf0, 0x45, 0x7b, 0x3b, 0xfa, 0x6a, 0x72, 0xbf, 0xc7,
-    0x73, 0xe8, 0x1b, 0x23, 0x15, 0x03, 0x10, 0x3e, 0xd6, 0xf6, 0x4e, 0x7b, 0x56, 0xdc, 0x11, 0x27, 0x4a, 0x51, 0xca,
-    0xcb, 0x23, 0xef, 0x23, 0x03, 0xb8, 0xfd, 0x63, 0x9e, 0x7a, 0xe0, 0xcb, 0xf1, 0x2c, 0x5d, 0x8e, 0x16, 0x79, 0x01,
-    0x03, 0xcc, 0xb3, 0x38, 0xe5, 0x2c, 0xef, 0x1d, 0x67, 0x39, 0x90, 0xad, 0x95, 0x47, 0xe3, 0x78, 0x51, 0x04, 0xf7,
-    0xe7, 0xe7, 0x3d, 0xb4, 0x15, 0x4e, 0xf2, 0x6c, 0x91, 0x8e, 0xe5, 0x5c, 0x71, 0x0a, 0x1b, 0x23, 0xe6, 0x66, 0x05,
-    0x7d, 0x09, 0x05, 0xe0, 0x4b, 0x59, 0x94, 0xb7, 0x4e, 0xb0, 0x33, 0x1a, 0xfa, 0xed, 0x31, 0x3b, 0xf1, 0xf2, 0x93,
-    0xe3, 0xc8, 0xe9, 0x74, 0x1f, 0x7a, 0xea, 0x9f, 0xbf, 0xe3, 0x82, 0xe1, 0xbe, 0xb6, 0xb8, 0xd3, 0x6e, 0xff, 0x9d,
-    0xdb, 0x6b, 0xcc, 0x42, 0x00, 0x05, 0x9d, 0xf9, 0xb9, 0x55, 0x64, 0x09, 0xac, 0xcf, 0xba, 0x9e, 0xbd, 0x39, 0xf8,
-    0x4d, 0x71, 0x7a, 0x12, 0x74, 0xe7, 0xe7, 0x25, 0x62, 0x17, 0x88, 0x84, 0x4c, 0x89, 0xa4, 0x7c, 0x5b, 0xfe, 0x5e,
-    0x88, 0x1f, 0xad, 0x87, 0xb8, 0xab, 0x20, 0xae, 0xa8, 0xde, 0x1a, 0xc3, 0x3e, 0x20, 0xf2, 0x77, 0x0a, 0x01, 0xc8,
-    0x14, 0x9c, 0xc0, 0x5c, 0xc1, 0x41, 0x2f, 0xbf, 0x1b, 0x8c, 0xee, 0x7a, 0x30, 0x1e, 0xdd, 0x04, 0x46, 0x9e, 0x8e,
-    0x97, 0xf5, 0x75, 0xed, 0x80, 0x73, 0xda, 0x9b, 0x32, 0xe4, 0xa7, 0xa0, 0x8b, 0xcf, 0x67, 0xf1, 0x98, 0x4f, 0xc5,
-    0x23, 0xb1, 0xf3, 0x99, 0xa8, 0xdb, 0x69, 0xb7, 0xc5, 0x7b, 0x01, 0x0a, 0x2d, 0xe8, 0xf8, 0xd8, 0x00, 0x98, 0xe8,
-    0xc3, 0x55, 0x1f, 0xb1, 0xf9, 0xfa, 0xc6, 0x2f, 0xd5, 0x78, 0x67, 0x2a, 0x6f, 0x50, 0xa8, 0x08, 0xf5, 0xcd, 0x16,
-    0xcc, 0x78, 0xcb, 0xfb, 0x1d, 0x7d, 0x50, 0x35, 0xf8, 0x9a, 0x91, 0xd6, 0x0b, 0xb8, 0x67, 0xe6, 0x02, 0xf5, 0xd2,
-    0x3e, 0x86, 0xa4, 0x5a, 0x2d, 0x17, 0xf4, 0x06, 0xc3, 0x10, 0x12, 0x1d, 0x08, 0x3a, 0xf9, 0xa0, 0xa0, 0x6f, 0x6a,
-    0x64, 0x6e, 0x50, 0x38, 0x99, 0x0b, 0x5b, 0x3e, 0xd3, 0x72, 0x1d, 0x94, 0x34, 0x78, 0xd9, 0x1f, 0x98, 0x6c, 0x00,
-    0xd2, 0x9b, 0x42, 0x5d, 0x7f, 0x09, 0x85, 0x2b, 0xa5, 0x1c, 0xa9, 0xd9, 0x75, 0x57, 0xf4, 0x61, 0x55, 0x62, 0xca,
-    0x48, 0x3e, 0x1c, 0xfe, 0x3b, 0x0c, 0x7b, 0x47, 0x3b, 0x96, 0x45, 0xb6, 0xc8, 0x47, 0x14, 0xa9, 0x5b, 0xf5, 0xf8,
-    0x6d, 0x52, 0xb8, 0xb6, 0xc7, 0xb4, 0x9c, 0x47, 0x37, 0xb8, 0xf6, 0x91, 0x03, 0x4e, 0x87, 0x20, 0xe2, 0x8e, 0x81,
-    0x8c, 0x72, 0x28, 0x08, 0x51, 0x75, 0x8d, 0x29, 0xdf, 0x8d, 0xee, 0x5f, 0xfa, 0x8b, 0x34, 0x06, 0x49, 0xf7, 0x31,
-    0x1e, 0xd3, 0xbd, 0x93, 0x78, 0x4c, 0x07, 0x11, 0x2d, 0x4a, 0x3c, 0xc2, 0xc8, 0x36, 0x14, 0xa8, 0xef, 0xb0, 0xc0,
-    0xb3, 0x4c, 0x64, 0xb1, 0x5b, 0x36, 0x1e, 0x26, 0x18, 0xaa, 0x72, 0x9c, 0xcd, 0xa2, 0x38, 0x0d, 0xf0, 0xfb, 0x20,
-    0x9e, 0x1e, 0x31, 0xc0, 0x2e, 0x1e, 0xfc, 0x64, 0x32, 0x17, 0xad, 0xe3, 0xfa, 0xbf, 0x80, 0x1c, 0xa1, 0xfe, 0xa5,
-    0xf4, 0xc3, 0x34, 0x5c, 0xea, 0x98, 0xb7, 0x5e, 0x0a, 0xb2, 0x87, 0x2b, 0x9b, 0x95, 0x51, 0x9c, 0x63, 0x97, 0xd3,
-    0x8f, 0x41, 0xab, 0x13, 0x74, 0xb4, 0xeb, 0x5a, 0xbb, 0x8d, 0x2a, 0x72, 0x59, 0xe4, 0x8d, 0x46, 0x82, 0x41, 0x3f,
-    0x0b, 0x38, 0xab, 0x77, 0x0d, 0xab, 0x27, 0xf9, 0x12, 0x03, 0x38, 0x27, 0xa9, 0x53, 0x03, 0x82, 0xce, 0x02, 0xae,
-    0x98, 0xca, 0x2d, 0x23, 0x52, 0x4a, 0x8f, 0x69, 0x03, 0xd7, 0xef, 0x12, 0xe1, 0xbd, 0xa1, 0x7a, 0x0a, 0x94, 0x62,
-    0xb9, 0xf1, 0xd1, 0xae, 0xd8, 0xf1, 0x16, 0xf1, 0x58, 0x68, 0xc3, 0x16, 0xb4, 0xad, 0x3f, 0x8d, 0x80, 0x4a, 0x9f,
-    0x42, 0x7b, 0x63, 0xe9, 0xa8, 0xc4, 0xfa, 0x1c, 0xe6, 0xda, 0x13, 0x5a, 0x8f, 0x6e, 0xe4, 0xdb, 0xfd, 0x8d, 0x25,
-    0x2f, 0x77, 0xb7, 0x44, 0xef, 0xfe, 0x51, 0x59, 0x90, 0x82, 0x32, 0x03, 0x69, 0xd5, 0x14, 0xa2, 0x0e, 0x86, 0xa5,
-    0xf4, 0x5d, 0x1c, 0x37, 0xd7, 0x46, 0x97, 0x88, 0x18, 0x4b, 0xb6, 0x2b, 0x30, 0x5d, 0x29, 0xca, 0x61, 0x4f, 0xea,
-    0x84, 0x94, 0x42, 0xe4, 0x60, 0xf4, 0x56, 0xa1, 0x38, 0x42, 0x08, 0x06, 0x1b, 0xcb, 0xb8, 0x0c, 0x37, 0x96, 0x59,
-    0x79, 0x04, 0x96, 0x09, 0x42, 0x95, 0xab, 0xcf, 0xbb, 0xc0, 0xc4, 0x22, 0xc8, 0x62, 0xd1, 0x08, 0x38, 0x2d, 0x2b,
-    0x6d, 0x6b, 0x20, 0xa0, 0x01, 0x0f, 0x10, 0x0b, 0xc0, 0x76, 0xa3, 0x5e, 0x0c, 0x70, 0x11, 0xad, 0xfb, 0x30, 0xd0,
-    0xee, 0x96, 0x68, 0x04, 0x78, 0xe5, 0x08, 0x72, 0x85, 0x16, 0xa6, 0xe3, 0x98, 0xa8, 0x8d, 0xe3, 0x53, 0x4d, 0x3a,
-    0xca, 0x4d, 0xee, 0xef, 0x26, 0xd1, 0x31, 0x4b, 0x60, 0xc8, 0xe2, 0xf2, 0xb2, 0x0d, 0x23, 0x89, 0x57, 0x6b, 0x37,
-    0x4e, 0xe7, 0x0b, 0xf9, 0x99, 0x2d, 0x98, 0xb8, 0x83, 0x27, 0x9f, 0x78, 0x0b, 0x60, 0xa0, 0x8e, 0xf2, 0x02, 0x39,
-    0x00, 0x80, 0x48, 0xa7, 0x08, 0x08, 0x5d, 0xc5, 0x16, 0x50, 0x1a, 0x8f, 0x57, 0xcb, 0x60, 0x27, 0xce, 0xb1, 0x34,
-    0x85, 0xe7, 0x59, 0x9c, 0xe2, 0x63, 0x81, 0x8f, 0xd1, 0x39, 0x3e, 0x66, 0xf0, 0xa8, 0x71, 0xcf, 0x4b, 0xfb, 0x6f,
-    0xb2, 0x02, 0x96, 0x26, 0x40, 0x76, 0x79, 0x09, 0xf2, 0x5e, 0x93, 0x60, 0x77, 0x0b, 0x88, 0x85, 0x9c, 0x22, 0x3e,
-    0xba, 0xc2, 0x4c, 0x32, 0xb2, 0x62, 0xde, 0x12, 0xe5, 0x16, 0x69, 0xd5, 0x10, 0x9c, 0xae, 0xdc, 0x69, 0x18, 0x0f,
-    0x9e, 0x4c, 0x2f, 0x79, 0x82, 0x2f, 0xae, 0x6d, 0x89, 0xaf, 0x62, 0x08, 0xa2, 0xd0, 0x23, 0x62, 0xa8, 0xcb, 0xb8,
-    0xfc, 0xde, 0x4d, 0x1c, 0xda, 0x38, 0x0b, 0xd8, 0x6f, 0xa8, 0x05, 0x78, 0x14, 0x27, 0xa2, 0xf1, 0x1a, 0x7c, 0x1a,
-    0x79, 0x82, 0x84, 0xce, 0xee, 0x56, 0x05, 0x1b, 0x00, 0x3f, 0x12, 0xb7, 0xac, 0x1d, 0x91, 0x03, 0x69, 0x8b, 0x72,
-    0x3a, 0x3b, 0x97, 0x5b, 0x5a, 0x46, 0x76, 0x45, 0xac, 0x5c, 0xa3, 0x4a, 0x39, 0x8b, 0xf6, 0x24, 0x4a, 0xd7, 0x35,
-    0x05, 0xe8, 0xe7, 0x8c, 0x8d, 0x3d, 0xdb, 0x02, 0x59, 0x2a, 0x9e, 0x3f, 0x26, 0xec, 0x94, 0xc9, 0x2f, 0xa5, 0xe8,
-    0x41, 0x74, 0xe5, 0x08, 0x54, 0x32, 0x97, 0x97, 0x38, 0x25, 0x7b, 0x2a, 0x1c, 0x25, 0x25, 0xea, 0x88, 0x78, 0xb6,
-    0x31, 0x68, 0x73, 0x8e, 0x76, 0x7d, 0x58, 0xaf, 0x03, 0xd6, 0xae, 0x2d, 0xe0, 0x25, 0x3b, 0xee, 0x66, 0xe4, 0x60,
-    0x00, 0x36, 0x99, 0xc0, 0x76, 0x51, 0x91, 0x65, 0x2d, 0x0b, 0x04, 0x54, 0xe0, 0x94, 0x7a, 0xb6, 0x68, 0x61, 0x57,
-    0x6d, 0xf5, 0x93, 0x24, 0x4e, 0x92, 0x8d, 0x3e, 0xad, 0x99, 0x0b, 0xb8, 0x63, 0x43, 0x44, 0x5a, 0x1b, 0xf2, 0xcd,
-    0xfe, 0xb7, 0x7f, 0xfe, 0x9f, 0xff, 0x15, 0x06, 0xa6, 0x7e, 0x6e, 0x69, 0x5d, 0xdd, 0xea, 0x7f, 0x40, 0xab, 0x45,
-    0x7a, 0x43, 0xbb, 0xbf, 0xfe, 0xe3, 0x7f, 0x83, 0x66, 0x74, 0x23, 0xc7, 0x2d, 0x8f, 0x08, 0xa2, 0x11, 0x1a, 0x41,
-    0x9f, 0x05, 0x52, 0x6d, 0x90, 0x2b, 0x67, 0xfa, 0x27, 0x04, 0xbb, 0xe0, 0xd9, 0xfc, 0x5a, 0x70, 0x10, 0xea, 0x51,
-    0x92, 0x15, 0x4c, 0xc3, 0x23, 0x64, 0xed, 0xe7, 0x01, 0x44, 0x73, 0xcd, 0x81, 0xcb, 0x0b, 0x4b, 0x8f, 0x23, 0x96,
-    0x67, 0xdd, 0x38, 0x8d, 0xd5, 0x2b, 0x18, 0x27, 0x74, 0x28, 0xae, 0x00, 0xeb, 0x25, 0x9e, 0xe0, 0x81, 0x04, 0x82,
-    0x5b, 0xff, 0xca, 0xd7, 0xfa, 0xc1, 0x34, 0x7f, 0x8a, 0xb1, 0x44, 0x28, 0x45, 0x8d, 0x00, 0x3f, 0x41, 0x68, 0x7d,
-    0xd4, 0xcf, 0xd1, 0xb9, 0x7e, 0x46, 0xc1, 0x26, 0x26, 0x00, 0x5d, 0x34, 0x43, 0x33, 0xc3, 0x9c, 0x41, 0xa4, 0x01,
-    0x54, 0x7e, 0xa4, 0x91, 0x4d, 0x22, 0x84, 0xd7, 0x47, 0x4c, 0xba, 0xc4, 0x2b, 0x36, 0x8b, 0x9c, 0x7d, 0x4c, 0xb2,
-    0x33, 0x0c, 0x4e, 0x21, 0x91, 0xae, 0xaa, 0x2f, 0xff, 0xf5, 0x5f, 0x7c, 0xff, 0x5f, 0xff, 0xe5, 0x8a, 0x06, 0x53,
-    0xd8, 0x07, 0x60, 0x4d, 0xf2, 0x50, 0xd3, 0xb9, 0x81, 0xd6, 0xfa, 0x41, 0x11, 0xcf, 0xf5, 0x35, 0x12, 0x71, 0x2c,
-    0x95, 0x78, 0xcb, 0x47, 0x42, 0x5b, 0x33, 0xc5, 0xcd, 0xb3, 0x20, 0x64, 0x57, 0x4c, 0x83, 0x55, 0x37, 0xcc, 0x73,
-    0xe4, 0x06, 0xd7, 0xd0, 0xe5, 0x33, 0x31, 0x5e, 0x0f, 0xc6, 0x8d, 0x10, 0x78, 0x20, 0xfd, 0x85, 0x7e, 0x78, 0x22,
-    0xa4, 0x7b, 0x20, 0x96, 0x41, 0xca, 0xfa, 0x1a, 0x40, 0x9e, 0x75, 0x40, 0x13, 0x50, 0x93, 0xb8, 0xd2, 0xad, 0x64,
-    0x8a, 0x1c, 0xe7, 0xfd, 0x57, 0x78, 0xab, 0xce, 0xc2, 0xde, 0xa8, 0x59, 0x0b, 0x32, 0x04, 0x38, 0x19, 0x02, 0x52,
-    0x03, 0x99, 0x3a, 0x18, 0x3d, 0x8c, 0x6c, 0xbd, 0xae, 0xfd, 0x88, 0xdd, 0x6b, 0xda, 0x92, 0x4b, 0x6d, 0x19, 0x4b,
-    0x4b, 0x56, 0x6a, 0x4b, 0xfc, 0x76, 0x4a, 0x43, 0x5b, 0xc6, 0x57, 0x6a, 0x4b, 0xa4, 0xdc, 0x00, 0x47, 0x0e, 0xed,
-    0x4d, 0x0c, 0xa3, 0x18, 0xba, 0x99, 0xa3, 0x5d, 0x02, 0xbe, 0xf3, 0xe8, 0x93, 0x34, 0x4b, 0x08, 0x01, 0x8c, 0x23,
-    0x68, 0x43, 0x4b, 0x60, 0x00, 0x2a, 0xf6, 0xa8, 0xd4, 0x9b, 0x1e, 0x1f, 0x8d, 0x09, 0xb8, 0xbb, 0x9c, 0x30, 0x14,
-    0xc9, 0x47, 0x5b, 0x38, 0x84, 0xd8, 0x2b, 0x25, 0x3d, 0x03, 0x52, 0x5b, 0x38, 0xce, 0x91, 0xb7, 0x14, 0x01, 0xa9,
-    0xc0, 0x7e, 0xfb, 0x66, 0xff, 0xc0, 0xf6, 0x8e, 0xb3, 0xf1, 0x45, 0x60, 0x83, 0x33, 0x01, 0x86, 0x87, 0xeb, 0xf3,
-    0x29, 0x4b, 0x1d, 0x65, 0xce, 0x67, 0x09, 0xb8, 0x33, 0xd9, 0x89, 0xf8, 0x7e, 0x42, 0x33, 0x98, 0x0e, 0x34, 0xa5,
-    0x0f, 0x2c, 0xf6, 0x77, 0xb9, 0xf8, 0xf6, 0x28, 0xcf, 0xf1, 0xb1, 0x8f, 0xe9, 0x04, 0xbb, 0x5b, 0xf0, 0x80, 0x2f,
-    0xfb, 0xa8, 0x8a, 0xf4, 0x9b, 0x80, 0xb3, 0x10, 0xef, 0x5b, 0xd8, 0x7e, 0x4b, 0xf5, 0x45, 0x28, 0xfa, 0x92, 0xd1,
-    0xb4, 0xc5, 0x5d, 0x99, 0x71, 0x34, 0xf6, 0x18, 0xad, 0x34, 0xb2, 0xb8, 0x81, 0x1a, 0x7c, 0xac, 0x4b, 0x84, 0xe6,
-    0x37, 0x8a, 0x68, 0x94, 0x4a, 0x4f, 0xcb, 0x2a, 0x9c, 0x90, 0x2c, 0x3b, 0x31, 0x19, 0xfc, 0x24, 0xf0, 0x8f, 0xcc,
-    0x6f, 0x85, 0x89, 0xcf, 0xfa, 0x68, 0x24, 0x0f, 0xff, 0xec, 0x7d, 0x64, 0xde, 0xc5, 0x11, 0xb5, 0x54, 0x8e, 0x29,
-    0x46, 0x4c, 0xd0, 0x81, 0x6f, 0xab, 0x08, 0x04, 0x98, 0x26, 0x49, 0x34, 0x2f, 0x58, 0xa0, 0x1e, 0xa4, 0x8f, 0x8a,
-    0xae, 0xee, 0x6a, 0x50, 0xc0, 0x34, 0x61, 0x4a, 0x3e, 0x5d, 0x9a, 0x4e, 0xec, 0x03, 0x70, 0x62, 0x31, 0x01, 0xbf,
-    0x15, 0x81, 0xe2, 0x4d, 0x83, 0x84, 0x4d, 0x78, 0xc9, 0xf1, 0x86, 0xf7, 0x52, 0x45, 0x0d, 0xfc, 0xee, 0x0e, 0x38,
-    0xb6, 0x96, 0x8f, 0xff, 0xdf, 0x34, 0xf6, 0x38, 0x48, 0xc1, 0x11, 0xa5, 0x2b, 0x1f, 0x78, 0x9d, 0x0e, 0x20, 0x32,
-    0xdf, 0x97, 0xc6, 0x44, 0x23, 0x86, 0x11, 0x95, 0x92, 0xe7, 0x20, 0xb2, 0x3d, 0x9e, 0x9b, 0xed, 0x40, 0xd4, 0xae,
-    0x84, 0x55, 0x56, 0x1d, 0xfb, 0x6d, 0x57, 0x9a, 0xff, 0xab, 0x8d, 0x55, 0x74, 0xa4, 0xfe, 0xb6, 0x42, 0x21, 0x23,
-    0x8e, 0x53, 0x0a, 0x2d, 0xb3, 0x14, 0x3d, 0x4c, 0x9c, 0x56, 0x23, 0x3c, 0x37, 0x1a, 0x89, 0x25, 0xed, 0xf8, 0x43,
-    0xda, 0xf1, 0x24, 0xc1, 0x86, 0x4b, 0x31, 0xf7, 0x28, 0x4a, 0x46, 0x0e, 0x02, 0x60, 0xb5, 0xac, 0x47, 0x40, 0x4d,
-    0x57, 0x45, 0x19, 0xfc, 0x87, 0x48, 0xdc, 0x52, 0xc8, 0xbb, 0x35, 0x54, 0x3a, 0x1a, 0x96, 0x65, 0xef, 0x8c, 0x39,
-    0x87, 0xbf, 0xc9, 0x0b, 0x03, 0xe2, 0x9e, 0xa8, 0xfe, 0xd6, 0x5e, 0xbb, 0x74, 0x87, 0xde, 0x5f, 0x8c, 0x0f, 0x98,
-    0xd9, 0x8a, 0xa1, 0x6d, 0x0f, 0x96, 0xe1, 0x2f, 0x21, 0xf6, 0x7d, 0xe5, 0xd8, 0x68, 0x55, 0x52, 0xcd, 0x45, 0x8b,
-    0xf8, 0xcb, 0xc6, 0x6e, 0x22, 0xdc, 0xfd, 0xfd, 0x55, 0x51, 0x8b, 0x6f, 0x6e, 0x8e, 0x5a, 0xb0, 0x5b, 0x46, 0x2d,
-    0xbe, 0xf9, 0x83, 0xa3, 0x16, 0xdf, 0x37, 0xa3, 0x16, 0xbf, 0x7e, 0x4e, 0xd4, 0x22, 0xcf, 0xce, 0x8a, 0xb0, 0x23,
-    0x4f, 0xc9, 0x41, 0xe6, 0xfc, 0x6d, 0xc2, 0x17, 0x30, 0x51, 0x23, 0x78, 0x41, 0xd1, 0x0a, 0x91, 0xd8, 0x07, 0x92,
-    0x5d, 0xc6, 0x0a, 0xda, 0x3a, 0x83, 0xae, 0x75, 0x5f, 0x5d, 0x19, 0x02, 0x6f, 0xcd, 0xd5, 0x97, 0xdd, 0xba, 0x2a,
-    0x9a, 0x10, 0xd0, 0x37, 0x3f, 0x75, 0xc7, 0xee, 0xa6, 0x4a, 0xdd, 0x32, 0x47, 0xe8, 0xa9, 0x88, 0xbc, 0x60, 0x9f,
-    0xa5, 0xfd, 0x9f, 0x0e, 0x3b, 0xbd, 0xed, 0xce, 0x0c, 0x7a, 0x83, 0x0e, 0x85, 0xb7, 0x76, 0x6f, 0x7b, 0x1b, 0xdf,
-    0xce, 0xd4, 0x5b, 0x17, 0xdf, 0x62, 0xf5, 0xb6, 0x83, 0x6f, 0x23, 0xf5, 0xf6, 0x00, 0xdf, 0xc6, 0xea, 0xed, 0x21,
-    0xbe, 0x9d, 0xda, 0xe5, 0x21, 0xd7, 0xc0, 0x3d, 0x04, 0xbe, 0x22, 0x43, 0x3f, 0x50, 0x65, 0xb0, 0x69, 0xf1, 0xaa,
-    0x5d, 0x74, 0x12, 0xc4, 0x9e, 0x70, 0x88, 0x82, 0xdc, 0x3b, 0x03, 0xc9, 0x1f, 0x50, 0x66, 0xd9, 0x53, 0xfc, 0xe6,
-    0x02, 0xf8, 0x0f, 0x07, 0xf1, 0x8c, 0xa9, 0x8f, 0xcf, 0x2a, 0xac, 0xc1, 0x86, 0x3c, 0x6c, 0x0f, 0xcb, 0x9e, 0x5e,
-    0x27, 0x11, 0x2c, 0x51, 0x27, 0xf7, 0xb4, 0x72, 0x55, 0x9d, 0x98, 0xae, 0xa5, 0x57, 0xf8, 0x0a, 0x3d, 0x62, 0xb8,
-    0xd0, 0x13, 0xb0, 0x8d, 0x5a, 0xe7, 0xe0, 0x74, 0xad, 0xd5, 0x2d, 0x08, 0x91, 0xd6, 0x26, 0x84, 0x93, 0x7e, 0x3b,
-    0x88, 0x4e, 0xf4, 0xf3, 0x2b, 0x30, 0x76, 0xa3, 0x13, 0x76, 0x93, 0x9e, 0x21, 0x10, 0x4d, 0x1d, 0xa3, 0x80, 0x20,
-    0x6b, 0x08, 0x96, 0x06, 0x9d, 0x3f, 0xa9, 0x63, 0x90, 0x3a, 0x75, 0xad, 0x43, 0xd3, 0xd7, 0x8b, 0x80, 0xa2, 0x55,
-    0xc1, 0x2e, 0xd8, 0xdc, 0x54, 0x2a, 0x28, 0x0c, 0x15, 0x58, 0x70, 0xad, 0x2a, 0xd2, 0xfe, 0xf1, 0x95, 0x0a, 0xc9,
-    0x52, 0xba, 0xc8, 0x8c, 0xe4, 0xeb, 0x30, 0xfe, 0xaa, 0x78, 0xfc, 0xa2, 0x33, 0xc2, 0x3f, 0x52, 0xf8, 0x7e, 0x31,
-    0x99, 0x4c, 0xae, 0xd5, 0x4d, 0x5f, 0x8c, 0x27, 0xac, 0xcb, 0x76, 0x7a, 0x18, 0xe5, 0x6d, 0x49, 0x71, 0xd8, 0x29,
-    0x89, 0x76, 0xcb, 0xdb, 0x35, 0x46, 0xc9, 0x09, 0xea, 0xea, 0xf6, 0x4a, 0xac, 0x04, 0xaa, 0x2c, 0x41, 0x78, 0x9f,
-    0xc4, 0x69, 0xd0, 0x2e, 0xfd, 0x53, 0x29, 0xf5, 0xbf, 0x78, 0xf4, 0xe8, 0x51, 0xe9, 0x8f, 0xd5, 0x5b, 0x7b, 0x3c,
-    0x2e, 0xfd, 0xd1, 0x52, 0xa3, 0xd1, 0x6e, 0x4f, 0x26, 0xa5, 0x1f, 0xab, 0x82, 0xed, 0xee, 0x68, 0xbc, 0xdd, 0x2d,
-    0xfd, 0x33, 0xa3, 0x45, 0xe9, 0x33, 0xf9, 0x96, 0xb3, 0x71, 0x2d, 0x54, 0xfc, 0xb0, 0x0d, 0x95, 0x82, 0xd1, 0x96,
-    0xe8, 0xe0, 0x89, 0xc7, 0x20, 0x5a, 0xf0, 0x0c, 0x6c, 0xab, 0xb2, 0xc7, 0x40, 0x3e, 0x4f, 0xa4, 0x6c, 0x17, 0xdf,
-    0x76, 0x45, 0x89, 0xfe, 0xab, 0x29, 0xd1, 0x91, 0x99, 0x49, 0x9a, 0x33, 0xd2, 0x03, 0xcd, 0x6a, 0xe4, 0x2c, 0xaa,
-    0xfe, 0x35, 0x64, 0x95, 0xb0, 0x47, 0x69, 0x83, 0x2d, 0x85, 0x8c, 0xff, 0xf6, 0x2a, 0x19, 0xff, 0xdd, 0xcd, 0x32,
-    0xfe, 0xf8, 0x76, 0x22, 0xfe, 0xbb, 0x3f, 0x58, 0xc4, 0x7f, 0x6b, 0x8a, 0x78, 0x21, 0xc4, 0x2e, 0xc0, 0x7a, 0x25,
-    0xb3, 0xf5, 0x38, 0x3b, 0x6f, 0xe1, 0x96, 0xc8, 0x6d, 0x92, 0x9e, 0x1b, 0xb7, 0x12, 0xfe, 0x6b, 0x72, 0x7f, 0xd4,
-    0x60, 0xc6, 0x87, 0x62, 0x79, 0x76, 0x72, 0x92, 0x30, 0x25, 0xe3, 0x8d, 0x0a, 0xb2, 0x88, 0xdf, 0xa4, 0xa1, 0xfd,
-    0x06, 0x9c, 0x53, 0xa3, 0x64, 0x32, 0x81, 0xa2, 0xc9, 0xc4, 0x56, 0xb9, 0xb1, 0x20, 0xcf, 0xa8, 0xd5, 0xeb, 0x5a,
-    0x09, 0xb5, 0xfa, 0xfa, 0x6b, 0xb3, 0xcc, 0x2c, 0x90, 0x51, 0x28, 0xd3, 0x98, 0x90, 0x35, 0xe3, 0xb8, 0xc0, 0x3d,
-    0x58, 0x7d, 0xd8, 0x16, 0xed, 0x95, 0x19, 0x28, 0x95, 0x78, 0x84, 0x5f, 0x4c, 0x69, 0x7e, 0x44, 0x44, 0xe4, 0x31,
-    0xaf, 0x22, 0x57, 0x9d, 0x75, 0x1a, 0xdf, 0xab, 0xab, 0xce, 0x37, 0x61, 0xf1, 0x65, 0x2e, 0xc3, 0xe3, 0x8b, 0x17,
-    0x63, 0xe7, 0x02, 0xec, 0xd8, 0xb8, 0x78, 0x93, 0x36, 0x72, 0xc4, 0x04, 0xd8, 0x61, 0x68, 0x62, 0x5a, 0x0a, 0x82,
-    0x55, 0xc9, 0xf2, 0x55, 0x65, 0xcf, 0xe8, 0x24, 0x53, 0x89, 0x70, 0xc8, 0x41, 0x8d, 0x2c, 0x81, 0x39, 0x98, 0xd4,
-    0x85, 0xf4, 0xe1, 0x72, 0x91, 0x60, 0x71, 0x2a, 0xbf, 0x70, 0x4d, 0x91, 0xff, 0xa5, 0xd4, 0x1f, 0xf2, 0xe8, 0xbd,
-    0xea, 0x89, 0xc1, 0x76, 0x31, 0xc3, 0xb8, 0x54, 0x01, 0x76, 0x20, 0xdc, 0x1c, 0x3f, 0xc7, 0x23, 0x86, 0x50, 0x71,
-    0xec, 0x8a, 0x7a, 0xf8, 0xf9, 0x93, 0xea, 0xab, 0x90, 0xb5, 0x2f, 0x08, 0x36, 0x78, 0x00, 0xbf, 0xec, 0xcf, 0x51,
-    0x1b, 0x64, 0x0b, 0xee, 0x38, 0xd4, 0xca, 0x71, 0x4b, 0xaf, 0xbb, 0xd3, 0x06, 0x15, 0xe3, 0x8b, 0x6f, 0xfe, 0x38,
-    0xba, 0xb3, 0xc4, 0xf7, 0xaa, 0xb0, 0xf9, 0xca, 0x37, 0xb8, 0x34, 0x89, 0xf1, 0x23, 0x21, 0x02, 0x51, 0xe3, 0x9e,
-    0x88, 0x5a, 0xc4, 0xe6, 0xbb, 0xaf, 0xdc, 0x37, 0x83, 0xb0, 0xee, 0x3a, 0x0e, 0x96, 0x31, 0xb2, 0x7a, 0x21, 0xb6,
-    0x15, 0x56, 0xcd, 0x2a, 0x38, 0x37, 0xe8, 0xcc, 0xe2, 0xcc, 0x88, 0x39, 0xd7, 0xb6, 0x41, 0xa9, 0x82, 0xce, 0x22,
-    0x72, 0x7c, 0x81, 0xf1, 0x51, 0xe1, 0xfb, 0x2a, 0xa0, 0xeb, 0x5e, 0xa7, 0x01, 0x39, 0xfa, 0xa3, 0x9a, 0xd1, 0x55,
-    0x95, 0x2a, 0x28, 0xcd, 0x13, 0x02, 0x03, 0x19, 0x0a, 0xfe, 0xc2, 0x1a, 0xa7, 0x42, 0x6f, 0xc1, 0x34, 0x24, 0x80,
-    0xb5, 0x47, 0x86, 0x6e, 0x89, 0xad, 0xc0, 0x16, 0xd2, 0x02, 0x94, 0x1e, 0x76, 0xe8, 0x5b, 0x35, 0xd0, 0xd3, 0xd5,
-    0x98, 0xf1, 0x75, 0x4e, 0xda, 0xc5, 0x91, 0x5f, 0x9c, 0x79, 0xf0, 0xcf, 0xfa, 0x72, 0x09, 0x52, 0xfe, 0xf8, 0x53,
-    0xcc, 0xc1, 0xa6, 0x9e, 0xb7, 0x30, 0x02, 0x42, 0x21, 0x4c, 0xa9, 0x0e, 0xe9, 0xd8, 0x51, 0x5c, 0x0f, 0xea, 0x2d,
-    0x0a, 0xf4, 0xe5, 0xc8, 0x69, 0x09, 0xd2, 0x2c, 0x65, 0xbd, 0xfa, 0xf1, 0xb2, 0xe9, 0x37, 0x28, 0x62, 0x0d, 0x97,
-    0x19, 0xfa, 0x7e, 0xfc, 0x02, 0x7c, 0x3f, 0xa1, 0x46, 0xdb, 0xca, 0x69, 0x68, 0xaf, 0x6d, 0x1f, 0x48, 0xda, 0x6e,
-    0x92, 0xb5, 0x90, 0xaf, 0x3a, 0x47, 0x57, 0x39, 0x37, 0x37, 0x1d, 0xb6, 0x76, 0x77, 0x76, 0x3c, 0xf5, 0xcf, 0x38,
-    0xa5, 0x6e, 0x16, 0xd3, 0x61, 0xeb, 0x6d, 0x20, 0x0b, 0xa2, 0x09, 0x7e, 0x4d, 0xef, 0x36, 0x2d, 0x8f, 0x29, 0xd3,
-    0x71, 0x89, 0x6a, 0x3d, 0xe8, 0x3c, 0x02, 0x6f, 0xed, 0xd6, 0xc3, 0x5f, 0x8f, 0x7e, 0x29, 0x69, 0xa4, 0x2e, 0xac,
-    0xda, 0x76, 0x0f, 0xe5, 0x45, 0x12, 0x5d, 0x80, 0xd3, 0x48, 0x36, 0xc6, 0x31, 0x06, 0x70, 0x7b, 0xf3, 0x4c, 0x66,
-    0x0d, 0xe4, 0x2c, 0xa1, 0x5f, 0x59, 0x21, 0x97, 0x62, 0xfb, 0xc1, 0xfc, 0x5c, 0xad, 0x46, 0xa7, 0x91, 0x0d, 0xf0,
-    0x87, 0x1e, 0xfa, 0x5f, 0x9d, 0x65, 0x50, 0x3f, 0xb8, 0xde, 0x01, 0x18, 0x84, 0x61, 0xd3, 0xca, 0x05, 0x54, 0x6d,
-    0x28, 0x31, 0xd2, 0x1e, 0xaa, 0x81, 0x2c, 0x7f, 0x1b, 0x54, 0x65, 0x54, 0xb0, 0x1e, 0x7e, 0xd6, 0x30, 0x06, 0xd7,
-    0x54, 0x1a, 0x4f, 0xb3, 0x78, 0x3c, 0x4e, 0x58, 0x4f, 0xd9, 0x47, 0x56, 0xe7, 0x01, 0x66, 0x0d, 0x98, 0x4b, 0x56,
-    0x5f, 0x15, 0x83, 0x78, 0x9a, 0x4e, 0xd1, 0x31, 0xd8, 0x6b, 0xf8, 0x6d, 0xc2, 0xb5, 0xe4, 0x94, 0xc7, 0xe9, 0xed,
-    0x8a, 0x78, 0xf4, 0x5c, 0xc7, 0x65, 0x07, 0x8c, 0x45, 0x5a, 0xf0, 0x76, 0x8f, 0x67, 0xf3, 0xa0, 0xb5, 0x5d, 0x47,
-    0x04, 0xab, 0x34, 0x0a, 0xde, 0x1a, 0xb4, 0x3c, 0xb4, 0x0e, 0x84, 0x96, 0xb3, 0xfc, 0x8e, 0x2c, 0xa3, 0x01, 0xf0,
-    0xfb, 0x77, 0xba, 0xa8, 0xac, 0x23, 0xf3, 0xff, 0x67, 0xb7, 0x7c, 0xb5, 0x7e, 0xb7, 0x7c, 0xa5, 0x76, 0xcb, 0xf5,
-    0x1c, 0xfb, 0xc5, 0xa4, 0x83, 0x7f, 0x7a, 0x15, 0x42, 0xb0, 0x2a, 0x40, 0x0e, 0x0b, 0xed, 0xe2, 0x56, 0x17, 0xfe,
-    0xa3, 0xa1, 0xdb, 0x1e, 0xfe, 0xf1, 0xc1, 0x02, 0x6c, 0x5b, 0x58, 0x88, 0xff, 0xda, 0xb5, 0xaa, 0xce, 0x7d, 0xac,
-    0xc3, 0x5e, 0x3b, 0xab, 0x75, 0xdd, 0xeb, 0x37, 0x2d, 0xc8, 0x2b, 0xee, 0x04, 0x4a, 0x18, 0x83, 0xab, 0x16, 0x1d,
-    0x1f, 0x43, 0xe9, 0x24, 0x1b, 0x2d, 0x8a, 0xbf, 0x97, 0xf0, 0x4b, 0x22, 0x5e, 0xbb, 0xa5, 0x1b, 0xe3, 0xa8, 0xae,
-    0x22, 0x05, 0x45, 0x8d, 0xb0, 0xd4, 0xeb, 0x14, 0x14, 0xc0, 0x98, 0xcc, 0xe9, 0xfa, 0xf7, 0xd7, 0x6c, 0x82, 0xbf,
-    0xc9, 0xda, 0xac, 0x45, 0xe6, 0xdf, 0x4b, 0x8c, 0x6b, 0x89, 0xf0, 0x59, 0x34, 0x30, 0xd7, 0xb0, 0xfd, 0x68, 0x3d,
-    0xb8, 0x87, 0x6a, 0xa6, 0xa1, 0x52, 0x0a, 0x52, 0xef, 0x80, 0x17, 0x10, 0x2d, 0x12, 0x7e, 0xfd, 0xa8, 0x57, 0x71,
-    0xc6, 0xca, 0xa8, 0xd7, 0x08, 0xf4, 0xaa, 0xed, 0x2d, 0xa5, 0xf4, 0x17, 0x5f, 0xdd, 0xc7, 0x3f, 0x22, 0xf0, 0x75,
-    0x5c, 0xf9, 0x46, 0x22, 0x36, 0x80, 0xbe, 0xd1, 0x46, 0xcd, 0xf9, 0x11, 0x1a, 0x9c, 0xfc, 0x9f, 0xdb, 0xb6, 0x46,
-    0x63, 0xfd, 0x56, 0xcd, 0xa5, 0x55, 0xfa, 0x59, 0xad, 0x3f, 0x6f, 0xf0, 0x5b, 0xb6, 0x1d, 0x09, 0x87, 0xa0, 0xde,
-    0x56, 0xfe, 0xfa, 0x90, 0x95, 0xc6, 0x8a, 0xe2, 0xb7, 0x6d, 0x5f, 0x99, 0xc4, 0xd4, 0x63, 0x23, 0x3c, 0xd6, 0x4e,
-    0xa4, 0x3c, 0x6f, 0xc6, 0x1e, 0xc2, 0x8f, 0xfc, 0x91, 0x85, 0xf7, 0xf0, 0xcb, 0x5b, 0xd6, 0xf9, 0x2c, 0x49, 0xc1,
-    0xac, 0x9a, 0x72, 0x3e, 0x0f, 0xb6, 0xb6, 0xce, 0xce, 0xce, 0xfc, 0xb3, 0x6d, 0x3f, 0xcb, 0x4f, 0xb6, 0xba, 0xed,
-    0x76, 0x1b, 0x3f, 0x98, 0x64, 0x5b, 0xa7, 0x31, 0x3b, 0x7b, 0x0c, 0xee, 0x87, 0xfd, 0xd0, 0x7a, 0x64, 0x3d, 0xdc,
-    0xb6, 0x76, 0x1e, 0xd8, 0x16, 0x29, 0x00, 0x28, 0xd9, 0xb6, 0x2d, 0xa1, 0x00, 0x42, 0x1b, 0x8a, 0xfb, 0xbb, 0x27,
-    0xca, 0x86, 0xc3, 0x84, 0x74, 0x61, 0x21, 0x81, 0xff, 0x96, 0x7d, 0x62, 0xf5, 0xad, 0x2e, 0xca, 0x5a, 0x52, 0x8d,
-    0xa8, 0x57, 0xdc, 0xef, 0xa3, 0x68, 0x1e, 0x10, 0x1b, 0x99, 0x85, 0x18, 0x26, 0x13, 0xa5, 0x34, 0x05, 0xda, 0xa5,
-    0xc7, 0xf0, 0x04, 0x6e, 0xc1, 0xd4, 0x82, 0xe7, 0x57, 0xdd, 0x87, 0xa0, 0xe3, 0x4e, 0x5b, 0xf7, 0x47, 0xed, 0x56,
-    0xc7, 0xea, 0xb4, 0xba, 0xfe, 0x43, 0xab, 0x2b, 0xfe, 0x07, 0x19, 0xb9, 0x6d, 0x75, 0xe0, 0x69, 0xdb, 0x82, 0xf7,
-    0xd3, 0xfb, 0x22, 0x1d, 0x22, 0xb2, 0xb7, 0xfa, 0xbb, 0xf8, 0xfb, 0x83, 0x00, 0xa9, 0xaf, 0x6c, 0xf1, 0x1b, 0xcf,
-    0xec, 0x2f, 0xcc, 0xd2, 0xce, 0xa3, 0xb5, 0xc5, 0xdd, 0x87, 0x6b, 0x8b, 0xb7, 0x1f, 0xac, 0x2d, 0xbe, 0xbf, 0x53,
-    0x2f, 0xde, 0x3a, 0x11, 0x55, 0x5a, 0x2e, 0x84, 0xf6, 0x2c, 0x02, 0x46, 0x39, 0x77, 0x3a, 0x00, 0x67, 0xdb, 0x6a,
-    0xe1, 0x8f, 0x87, 0x5d, 0x57, 0xf7, 0x3a, 0xc6, 0x5e, 0x1a, 0xcb, 0x87, 0x8f, 0x00, 0xcb, 0xe7, 0xdd, 0x07, 0x23,
-    0x6c, 0x47, 0x88, 0xc2, 0xbf, 0xd3, 0xed, 0x47, 0x23, 0xd0, 0x08, 0x16, 0xfe, 0x83, 0x3f, 0xd3, 0x9d, 0xee, 0x48,
-    0xbc, 0xb4, 0xb1, 0xfe, 0x43, 0xe7, 0x61, 0x01, 0x4d, 0xf1, 0xcf, 0x6f, 0xda, 0x84, 0x46, 0x03, 0xde, 0x1c, 0xf7,
-    0x3e, 0xd0, 0xe8, 0xd1, 0xb4, 0xeb, 0x7f, 0x75, 0xfa, 0xd0, 0x7f, 0x34, 0xed, 0x3c, 0xfc, 0x20, 0xde, 0x12, 0xa0,
-    0xe0, 0x57, 0xf8, 0xef, 0xc3, 0x76, 0x7b, 0xda, 0xea, 0xf8, 0x8f, 0x4e, 0xb7, 0xfd, 0xed, 0xa4, 0xf5, 0xc0, 0x7f,
-    0x84, 0xff, 0xaa, 0xe1, 0xa6, 0xd9, 0x8c, 0xd9, 0x16, 0xae, 0x77, 0xc3, 0xef, 0x35, 0xe7, 0xe8, 0xde, 0xb7, 0x76,
-    0xee, 0x3f, 0x7f, 0x04, 0x6b, 0x34, 0xed, 0x74, 0xe1, 0xff, 0xab, 0x1e, 0x3f, 0x20, 0xe1, 0xe5, 0xc0, 0x11, 0xc3,
-    0x54, 0x52, 0x45, 0x38, 0xfa, 0x78, 0xd7, 0x3d, 0xef, 0x87, 0xab, 0x02, 0x20, 0x7f, 0xbe, 0x39, 0x00, 0xf2, 0x97,
-    0x5b, 0x06, 0xb9, 0xff, 0xfc, 0x07, 0x47, 0x40, 0x7e, 0x68, 0x06, 0xb9, 0xf7, 0xd8, 0x4a, 0xa0, 0xa3, 0xe9, 0xac,
-    0x3d, 0x67, 0xce, 0xe1, 0x8f, 0x6c, 0x88, 0x69, 0xd3, 0xd0, 0xfa, 0x2f, 0xb5, 0x78, 0x50, 0x86, 0x1b, 0x79, 0x8f,
-    0x89, 0x9d, 0xcc, 0xf8, 0x15, 0x04, 0xe1, 0xfc, 0x46, 0x82, 0xbc, 0xb8, 0x1d, 0x3d, 0x38, 0xff, 0x63, 0xe9, 0x41,
-    0x5f, 0xee, 0x57, 0xf4, 0xd0, 0x49, 0xe1, 0x85, 0xf1, 0xfb, 0x57, 0x16, 0x79, 0xa2, 0xaf, 0xa8, 0x65, 0x23, 0xca,
-    0xf4, 0xf4, 0x91, 0x97, 0xe8, 0x9e, 0x20, 0x54, 0x6e, 0x86, 0xf0, 0x9f, 0xf1, 0x09, 0xb0, 0x2d, 0xfc, 0xd4, 0x9c,
-    0x1d, 0xc0, 0x4f, 0xaa, 0xb5, 0x19, 0xc6, 0x0a, 0x0a, 0xbb, 0xac, 0x85, 0xf3, 0x29, 0x1c, 0x41, 0x51, 0x84, 0x7d,
-    0x7a, 0x77, 0x70, 0x46, 0x91, 0x63, 0xf8, 0xee, 0x73, 0x4e, 0x1d, 0x44, 0xb6, 0x72, 0x68, 0xcb, 0xc0, 0xce, 0x1c,
-    0xbf, 0x79, 0xab, 0x5e, 0x4e, 0xc5, 0x8d, 0x98, 0x90, 0xae, 0xb3, 0xed, 0xe8, 0xa0, 0x10, 0x26, 0x90, 0x87, 0xcb,
-    0x8c, 0x47, 0xf8, 0x4b, 0x95, 0x78, 0xcc, 0x13, 0xbc, 0x6c, 0x2b, 0x2f, 0xa6, 0x61, 0xbe, 0xf3, 0x77, 0x98, 0xab,
-    0xad, 0x30, 0x9e, 0x61, 0x20, 0xe2, 0x15, 0x1b, 0xc7, 0x91, 0x63, 0x3b, 0x73, 0x90, 0x04, 0x30, 0x66, 0xab, 0x96,
-    0x28, 0x4d, 0x39, 0xd2, 0xae, 0xad, 0x7e, 0x8f, 0x4f, 0x8e, 0xdf, 0x45, 0x0b, 0x0f, 0x65, 0xe0, 0xd2, 0x96, 0x9e,
-    0x05, 0x8c, 0xaf, 0x4a, 0x72, 0x54, 0x22, 0x95, 0x35, 0x62, 0x0b, 0x73, 0xa4, 0xe3, 0x77, 0xc1, 0x3d, 0xa1, 0x62,
-    0xfc, 0xce, 0xd4, 0x0f, 0x4e, 0x6b, 0x1b, 0xcc, 0x25, 0xa3, 0x9b, 0x1e, 0x68, 0xb8, 0x12, 0x9e, 0x12, 0x41, 0x87,
-    0x46, 0xa9, 0xa7, 0x7f, 0xb1, 0x59, 0x15, 0x86, 0x2a, 0x1e, 0x5f, 0x1c, 0xc8, 0xbb, 0xe4, 0x36, 0x46, 0x84, 0xe9,
-    0x24, 0xa0, 0xfa, 0x8e, 0xd5, 0x26, 0xa8, 0x21, 0xfa, 0xed, 0x92, 0x74, 0x9e, 0x8e, 0x9a, 0x06, 0x53, 0xb9, 0x2d,
-    0xe9, 0x91, 0x84, 0xb6, 0xd0, 0x33, 0x63, 0x76, 0x1a, 0x8f, 0xa4, 0xba, 0xf0, 0x2c, 0x79, 0x05, 0xa5, 0x45, 0x58,
-    0x84, 0x1d, 0x4f, 0xf8, 0xe4, 0xf0, 0x82, 0xda, 0x32, 0x4c, 0x33, 0xbb, 0x7f, 0xaf, 0xa7, 0x21, 0xa9, 0x67, 0xc1,
-    0xdb, 0xf8, 0xab, 0x2e, 0x0f, 0xc1, 0x07, 0xfc, 0xfb, 0xf0, 0x1e, 0xfe, 0xb2, 0xcb, 0x7b, 0x43, 0xdb, 0xf5, 0x49,
-    0xd8, 0xde, 0xab, 0x7e, 0xe3, 0x25, 0x4a, 0x9a, 0x4d, 0xd0, 0x8b, 0xde, 0x6d, 0x15, 0xa4, 0x54, 0x86, 0xdd, 0x9d,
-    0x4a, 0x19, 0xc2, 0xb3, 0x21, 0xfd, 0x40, 0x30, 0x77, 0xfd, 0x1d, 0x43, 0xc4, 0x9e, 0xb6, 0xf0, 0x67, 0x4d, 0xc8,
-    0xde, 0x87, 0x06, 0x4a, 0xca, 0xbe, 0x84, 0xe6, 0xdb, 0x42, 0xa0, 0x43, 0xbf, 0x1f, 0x49, 0x04, 0x0a, 0xf1, 0x57,
-    0xe7, 0x98, 0x35, 0x87, 0x53, 0x22, 0xf7, 0xc0, 0xf6, 0x8c, 0x38, 0x96, 0x60, 0x57, 0x19, 0xa5, 0x79, 0x0a, 0x7d,
-    0x1d, 0xfd, 0x79, 0xe8, 0x75, 0x75, 0x5e, 0x6d, 0xd3, 0xac, 0x99, 0x02, 0x19, 0xbe, 0x71, 0x00, 0x46, 0x57, 0x22,
-    0xc4, 0x67, 0xd2, 0x84, 0x78, 0xa8, 0x3e, 0x24, 0xb7, 0x26, 0xab, 0xd7, 0xdc, 0x14, 0xac, 0x62, 0x1a, 0xda, 0x17,
-    0x98, 0x8a, 0x83, 0x3f, 0xab, 0x62, 0xf5, 0x20, 0x19, 0xca, 0x4f, 0x22, 0xfc, 0x2d, 0x2f, 0xf4, 0xa3, 0xac, 0x36,
-    0x20, 0xa7, 0xef, 0x60, 0x12, 0xa4, 0x2f, 0xc6, 0x65, 0x13, 0x09, 0xb0, 0x43, 0xf0, 0x97, 0x06, 0x56, 0x57, 0x30,
-    0xe4, 0xdd, 0x4a, 0xcc, 0x55, 0x18, 0xc7, 0x39, 0x5d, 0xd9, 0x55, 0xf8, 0xd7, 0x22, 0xa5, 0x15, 0xa9, 0x69, 0x57,
-    0xb2, 0x62, 0x60, 0x63, 0x11, 0x88, 0x1a, 0x91, 0xe4, 0x66, 0x7e, 0x08, 0xda, 0xbc, 0x53, 0x39, 0x16, 0xf9, 0x6d,
-    0xf8, 0xa1, 0x7c, 0x5b, 0x10, 0xd9, 0x06, 0xf1, 0x78, 0x25, 0x4e, 0x64, 0x34, 0xe1, 0x55, 0xc4, 0xea, 0x37, 0x1f,
-    0x99, 0x1b, 0xde, 0x36, 0x57, 0x4b, 0x8f, 0x4b, 0xeb, 0xe0, 0xca, 0xb8, 0xe0, 0x31, 0x8b, 0xb8, 0x1f, 0xa5, 0x94,
-    0xf3, 0xe4, 0x18, 0x62, 0xc1, 0xeb, 0xb0, 0x6d, 0xb7, 0x04, 0xc9, 0x63, 0xfc, 0x6a, 0x28, 0x41, 0x7a, 0x1f, 0x0a,
-    0xab, 0x44, 0xb0, 0xdd, 0x69, 0xb7, 0xff, 0xe6, 0x60, 0xcf, 0x12, 0xbb, 0x79, 0x77, 0x0b, 0x5e, 0x77, 0xc9, 0xcd,
-    0x16, 0x79, 0x1f, 0xa1, 0xc8, 0xfb, 0xb0, 0x44, 0xa2, 0x58, 0x68, 0x6f, 0x09, 0x34, 0x6d, 0x8b, 0xa5, 0x23, 0x11,
-    0x1b, 0x9c, 0x81, 0x1b, 0x12, 0xe3, 0xc7, 0xc2, 0xb6, 0xb0, 0x5b, 0x0b, 0x57, 0xda, 0x56, 0x99, 0x33, 0xca, 0xf0,
-    0xe0, 0xa9, 0x8a, 0x24, 0x82, 0xb9, 0xc0, 0x54, 0x12, 0x8d, 0x1c, 0x4a, 0xe7, 0xba, 0xae, 0xb6, 0x2e, 0x16, 0xc7,
-    0x33, 0x90, 0x43, 0x2a, 0xf1, 0xe5, 0xbd, 0xec, 0xb0, 0x4b, 0x53, 0x61, 0xb2, 0xed, 0x6a, 0xa4, 0x73, 0xda, 0xe9,
-    0xef, 0x46, 0xd2, 0x8e, 0xc2, 0xbd, 0x5b, 0xc0, 0xe6, 0x05, 0xf5, 0x89, 0xc6, 0x8a, 0x1f, 0x67, 0x5b, 0x67, 0xec,
-    0xb8, 0x15, 0xcd, 0xe3, 0x2a, 0xac, 0x88, 0x5a, 0xb5, 0xbf, 0xab, 0x14, 0xac, 0x4c, 0xdf, 0x94, 0x8f, 0x91, 0x91,
-    0x1d, 0x82, 0x84, 0x23, 0x06, 0x2d, 0x65, 0xcc, 0x92, 0x8c, 0x51, 0x20, 0x3e, 0xc0, 0x4a, 0xfc, 0xab, 0x62, 0x9b,
-    0x52, 0x13, 0x94, 0x76, 0xff, 0xaf, 0xff, 0xeb, 0x7f, 0xcb, 0x70, 0x25, 0x90, 0x15, 0xc0, 0xc2, 0xf4, 0x9a, 0xea,
-    0xe4, 0x92, 0x9d, 0x83, 0x83, 0x1b, 0x8f, 0x5b, 0xd3, 0x28, 0x99, 0x00, 0x04, 0x05, 0x13, 0xda, 0x50, 0xd6, 0x03,
-    0x17, 0x48, 0xb0, 0xcc, 0x43, 0x7f, 0x09, 0x5e, 0xbd, 0x08, 0x57, 0xec, 0x77, 0xe5, 0xc3, 0xaa, 0x3c, 0x64, 0x62,
-    0x68, 0x23, 0x3b, 0xd6, 0xe0, 0xb9, 0x5a, 0x86, 0xac, 0xfa, 0xc5, 0x4b, 0x52, 0x78, 0xb0, 0x5a, 0x7a, 0x2c, 0xb4,
-    0xd4, 0x07, 0x2c, 0xff, 0xf6, 0xcf, 0xff, 0xf9, 0xbf, 0xab, 0x57, 0x3c, 0x37, 0xf9, 0xeb, 0x3f, 0xfd, 0xc3, 0xff,
-    0xfd, 0x3f, 0xff, 0x05, 0xb3, 0x8f, 0xe5, 0xd9, 0x0a, 0x6d, 0x25, 0xab, 0x3a, 0x58, 0x11, 0x7b, 0xca, 0xaa, 0x1c,
-    0x99, 0x7a, 0x1a, 0xed, 0x3e, 0x4d, 0x48, 0xbc, 0x29, 0xa1, 0x23, 0xbe, 0xa6, 0xb4, 0x6b, 0xa2, 0xda, 0x35, 0xe4,
-    0x83, 0xa5, 0xb4, 0x28, 0x5d, 0xc0, 0xde, 0x69, 0xdb, 0xd5, 0xf2, 0xf6, 0x8d, 0xbe, 0x5b, 0xb8, 0x30, 0xb7, 0xca,
-    0xec, 0xf1, 0xf5, 0xb2, 0x2d, 0x55, 0x78, 0x0c, 0x4b, 0xca, 0xaa, 0xdc, 0xc2, 0xb8, 0xf5, 0x12, 0x5f, 0x83, 0xae,
-    0x51, 0x4c, 0xab, 0x5c, 0xeb, 0xd3, 0xfb, 0x65, 0x01, 0x88, 0x4e, 0x70, 0x69, 0x44, 0x10, 0x8e, 0xce, 0x64, 0x5b,
-    0x68, 0xc0, 0x24, 0x17, 0x25, 0x8d, 0x22, 0xbc, 0xa4, 0xfb, 0x8f, 0xfe, 0xae, 0xfc, 0xd3, 0x0c, 0xad, 0x02, 0xcb,
-    0x99, 0x45, 0xe7, 0xd2, 0x77, 0x7a, 0xd0, 0x6e, 0xcf, 0xcf, 0xdd, 0x65, 0x35, 0x83, 0x77, 0xd5, 0x64, 0x14, 0xb8,
-    0x33, 0x07, 0xa4, 0xc3, 0x5c, 0x1d, 0x23, 0x04, 0x77, 0xa1, 0x8d, 0x21, 0xa5, 0xb2, 0xfc, 0x72, 0x49, 0x61, 0xaa,
-    0xf8, 0x37, 0x3c, 0x74, 0x95, 0x11, 0x3d, 0x28, 0x31, 0xb0, 0x58, 0x1a, 0xbd, 0xba, 0xa2, 0xd7, 0xb4, 0xb3, 0x9a,
-    0xf3, 0x62, 0x1e, 0x1a, 0x9b, 0xc7, 0xbd, 0xf7, 0xf1, 0x00, 0x77, 0xda, 0xf1, 0xa6, 0xdd, 0xa5, 0x1e, 0x9e, 0xf3,
-    0x6c, 0x66, 0x9e, 0x12, 0xb3, 0x88, 0x8d, 0xd8, 0x44, 0x45, 0x42, 0x65, 0xbd, 0x38, 0x01, 0x2e, 0xbf, 0xc0, 0xed,
-    0x06, 0xb4, 0xcd, 0x22, 0x1e, 0x10, 0xd3, 0xf6, 0xcc, 0x73, 0xe4, 0x08, 0x4f, 0xe8, 0xb3, 0xa5, 0x31, 0x57, 0x4f,
-    0x34, 0xc5, 0x78, 0x63, 0x3d, 0x9f, 0xa8, 0xf4, 0xa9, 0xbb, 0x39, 0x94, 0x08, 0x57, 0xbc, 0x90, 0xc7, 0xb3, 0xef,
-    0x6a, 0x7e, 0xbe, 0x14, 0xc5, 0xe0, 0x5a, 0xaf, 0xad, 0x17, 0x6a, 0x51, 0xd4, 0xbe, 0x00, 0x6b, 0x87, 0xc0, 0xb4,
-    0x9b, 0xad, 0xa8, 0x10, 0x5b, 0xbd, 0x0b, 0x5f, 0x68, 0x9b, 0x3e, 0x9a, 0xcf, 0xa9, 0xa1, 0x0b, 0xdc, 0x48, 0xb6,
-    0x39, 0x4a, 0x0a, 0x4a, 0x3d, 0x10, 0x27, 0xfd, 0xb2, 0x8d, 0x64, 0x5b, 0xf1, 0x24, 0x73, 0x00, 0xe8, 0xf7, 0x78,
-    0xff, 0x3f, 0x32, 0x18, 0x26, 0x95, 0xdd, 0x7b, 0x00, 0x00};
+    0xf3, 0x86, 0x9c, 0x17, 0xdf, 0xc5, 0x1c, 0x54, 0xc2, 0x56, 0xdf, 0x76, 0x07, 0xb6, 0x85, 0x4b, 0xdb, 0xcb, 0x36,
+    0x43, 0x41, 0xe1, 0x78, 0xf3, 0x80, 0x05, 0xd3, 0x7e, 0xd8, 0x1e, 0x38, 0xb9, 0x50, 0x1d, 0x09, 0x9e, 0x5b, 0x0a,
+    0x09, 0xde, 0xf6, 0xa6, 0x20, 0xd0, 0x91, 0x73, 0x37, 0xec, 0x4d, 0x55, 0x08, 0x45, 0x1f, 0x37, 0xc7, 0x6e, 0x10,
+    0xc3, 0x0f, 0xa7, 0x85, 0x4c, 0x33, 0xd5, 0x7d, 0xb5, 0x66, 0x76, 0x83, 0xb1, 0xb2, 0xc8, 0x93, 0x30, 0xdb, 0x74,
+    0x30, 0x42, 0x0b, 0x92, 0x76, 0x77, 0x00, 0x30, 0x6c, 0x3a, 0x8a, 0xd3, 0xb6, 0x14, 0xab, 0x29, 0xfb, 0xfc, 0x50,
+    0x2f, 0xc7, 0x94, 0x0d, 0xa6, 0xcc, 0xaf, 0xb4, 0x0f, 0x80, 0x15, 0x24, 0x5e, 0x3e, 0x54, 0x67, 0x5e, 0xcf, 0x6b,
+    0xe7, 0x5b, 0x4b, 0x25, 0x8a, 0x98, 0x67, 0x48, 0x28, 0x5e, 0x6a, 0x37, 0x4c, 0x98, 0xdb, 0x73, 0x24, 0x86, 0x66,
+    0xf9, 0xb0, 0x0d, 0x4c, 0xaf, 0x02, 0xec, 0xa9, 0xb9, 0x2d, 0x92, 0xb0, 0x6a, 0xee, 0x1d, 0x02, 0x6b, 0x0f, 0x81,
+    0x87, 0x68, 0x1b, 0xf5, 0x54, 0x34, 0x9f, 0x25, 0xe1, 0xf3, 0xc6, 0x71, 0x71, 0x84, 0x27, 0x42, 0xfb, 0xfe, 0x68,
+    0x91, 0x83, 0x3c, 0xe0, 0xaf, 0xc1, 0x32, 0x08, 0x65, 0x53, 0x74, 0xf4, 0xf0, 0x08, 0xd8, 0x23, 0xc4, 0x1b, 0x61,
+    0x73, 0xa3, 0x1a, 0x2d, 0x4a, 0x32, 0x5e, 0xe8, 0x60, 0xb8, 0xc7, 0xa5, 0x6b, 0x8f, 0x82, 0x41, 0x9e, 0x18, 0x3b,
+    0x78, 0xe6, 0xef, 0x8f, 0xb0, 0x1a, 0x27, 0x28, 0xdc, 0x92, 0x76, 0x5b, 0x25, 0xfe, 0xf6, 0xfd, 0x14, 0x24, 0x38,
+    0xd6, 0x81, 0x9f, 0x75, 0xf7, 0x6e, 0x22, 0x91, 0xda, 0x4d, 0x7b, 0x74, 0x12, 0x81, 0xf1, 0xe0, 0xdc, 0x4f, 0xa1,
+    0x1a, 0x49, 0x44, 0x45, 0x39, 0x5a, 0xa0, 0xe6, 0xa9, 0x5a, 0x05, 0xdf, 0xa1, 0x19, 0x81, 0xe7, 0x18, 0xb6, 0x26,
+    0x3f, 0x55, 0x37, 0x16, 0xb1, 0x7c, 0xd7, 0xa5, 0xa3, 0x2d, 0x3c, 0x80, 0x14, 0x8c, 0x26, 0x18, 0xc6, 0xa5, 0xa0,
+    0x64, 0xc5, 0x7f, 0x1f, 0x8d, 0x58, 0xf9, 0xf4, 0x30, 0xdb, 0xdc, 0x1c, 0x8a, 0x73, 0x0b, 0x62, 0x1c, 0x6e, 0x44,
+    0x57, 0xe3, 0x0a, 0x80, 0xfa, 0x74, 0x4e, 0x5c, 0x0f, 0x4c, 0x2b, 0xd6, 0x74, 0x29, 0xf6, 0xc9, 0x61, 0x06, 0xa0,
+    0xe0, 0x96, 0x73, 0xe8, 0x0f, 0xfe, 0x3c, 0x04, 0xf7, 0xd8, 0xff, 0x93, 0xbb, 0xa5, 0x04, 0x4d, 0x4f, 0x9e, 0x29,
+    0x2e, 0xe9, 0x8c, 0xb5, 0xe3, 0x51, 0x6c, 0x34, 0x28, 0xbc, 0x14, 0x30, 0x00, 0x6d, 0x0e, 0x32, 0xa1, 0xe2, 0x20,
+    0xe4, 0xa8, 0xc0, 0xf6, 0x71, 0xf3, 0x73, 0xdc, 0xd9, 0x4f, 0xc1, 0xc2, 0x1b, 0xe8, 0xb7, 0x97, 0xf0, 0xf6, 0x67,
+    0xfd, 0xf6, 0x0b, 0x0b, 0x7e, 0x29, 0x65, 0xe8, 0xbe, 0x36, 0xc5, 0x03, 0x35, 0x45, 0x29, 0x96, 0xc8, 0xa0, 0x21,
+    0x73, 0xf3, 0x95, 0x98, 0x0d, 0x77, 0x4b, 0x20, 0x86, 0x12, 0x5d, 0xb9, 0xcf, 0xa3, 0x13, 0x24, 0xae, 0x6b, 0x92,
+    0xc2, 0xc8, 0x25, 0x30, 0x11, 0xae, 0xf8, 0x96, 0x98, 0xb3, 0xdf, 0x06, 0x1b, 0xbc, 0x96, 0x77, 0x80, 0xf6, 0x1d,
+    0x9b, 0xcd, 0xf9, 0xc5, 0x3e, 0x29, 0xfa, 0x40, 0xa6, 0x0d, 0x88, 0xb3, 0xf3, 0x76, 0x2f, 0xde, 0xe5, 0xbd, 0x18,
+    0xa4, 0x7a, 0xae, 0x58, 0x0c, 0xf7, 0xaa, 0xf7, 0x16, 0xa3, 0x94, 0x26, 0x33, 0x79, 0x35, 0xf4, 0xba, 0x12, 0xbd,
+    0xcd, 0x4d, 0x40, 0xb0, 0x67, 0x74, 0xe5, 0xa2, 0x6b, 0x59, 0x0a, 0x9a, 0x00, 0x44, 0x8f, 0xea, 0x2c, 0x47, 0x1c,
+    0x87, 0xd9, 0x6c, 0x50, 0x3c, 0x62, 0xee, 0xda, 0x51, 0x71, 0x4c, 0xec, 0x2e, 0x13, 0x76, 0x00, 0x33, 0xe2, 0xf2,
+    0x56, 0x47, 0x44, 0x87, 0x45, 0x7f, 0x1d, 0xdf, 0xfe, 0xe8, 0xb1, 0xcd, 0x8e, 0x0b, 0x1a, 0xa4, 0x36, 0xd6, 0xc3,
+    0x6a, 0x2c, 0xa8, 0x0f, 0x3f, 0x6a, 0x2a, 0x95, 0xc5, 0xe6, 0x66, 0x59, 0x3f, 0xaa, 0x55, 0x3b, 0xb8, 0x76, 0x9a,
+    0x72, 0xde, 0xcc, 0x06, 0xe1, 0x40, 0xc4, 0x04, 0x0a, 0xb4, 0xb4, 0xb2, 0x62, 0x80, 0x21, 0x65, 0x39, 0xca, 0xa7,
+    0x90, 0x79, 0x71, 0x59, 0xea, 0xd4, 0x17, 0x19, 0x8f, 0x0c, 0xf1, 0xd4, 0x93, 0x8c, 0x15, 0x50, 0xb0, 0x5e, 0xea,
+    0x25, 0xb4, 0x44, 0x80, 0xf9, 0x33, 0x95, 0x43, 0x23, 0x2c, 0x90, 0x28, 0x34, 0xcc, 0x12, 0x65, 0x7c, 0x16, 0x61,
+    0x0c, 0xda, 0xfe, 0x49, 0x2d, 0xf6, 0x55, 0x28, 0xa3, 0xa3, 0x38, 0xcc, 0x87, 0x01, 0xd5, 0x2f, 0xa4, 0x04, 0x9b,
+    0x86, 0xef, 0x81, 0x8d, 0x2a, 0xc7, 0x93, 0x04, 0xe1, 0xd3, 0x38, 0x67, 0xe4, 0x29, 0x6c, 0x48, 0x98, 0xa5, 0x69,
+    0x1b, 0xa9, 0x76, 0x91, 0x19, 0x84, 0x72, 0x51, 0xf0, 0x1a, 0x67, 0x17, 0x59, 0xb8, 0xd2, 0x1a, 0xcc, 0x8f, 0x37,
+    0x26, 0x40, 0xd9, 0xe5, 0x65, 0x26, 0x7c, 0xdc, 0x88, 0xec, 0x0d, 0x5d, 0x31, 0x1d, 0x28, 0xa4, 0x02, 0x27, 0x22,
+    0x8b, 0x87, 0xce, 0x50, 0x68, 0x84, 0x03, 0x3a, 0x45, 0xce, 0x5d, 0x63, 0xd3, 0xe7, 0x03, 0xed, 0x1b, 0xa5, 0xa1,
+    0x93, 0x80, 0x10, 0x10, 0xb8, 0x1b, 0xd6, 0x54, 0x3a, 0x48, 0x83, 0x84, 0x4a, 0xd1, 0xcf, 0x01, 0xfc, 0xc3, 0x48,
+    0x52, 0x00, 0xec, 0x87, 0x6a, 0xa4, 0x88, 0xb2, 0x2c, 0x70, 0x01, 0x68, 0xae, 0x7d, 0x5c, 0x09, 0x5f, 0x18, 0xa8,
+    0x30, 0x3d, 0xcd, 0xca, 0x4b, 0xa1, 0x44, 0x1e, 0xaf, 0x49, 0x59, 0x23, 0x99, 0x7c, 0x8a, 0x0e, 0x9f, 0xf2, 0xae,
+    0x5f, 0x4b, 0x3c, 0x74, 0xc1, 0x53, 0x58, 0x56, 0xf5, 0xfc, 0x2a, 0xe4, 0xe4, 0x5c, 0x83, 0xae, 0x90, 0x42, 0x7f,
+    0xc5, 0x49, 0xde, 0x7b, 0xe5, 0x57, 0xb5, 0xd4, 0x18, 0xca, 0xde, 0xaf, 0x6b, 0x86, 0xe5, 0xe5, 0xbc, 0x0a, 0x53,
+    0x10, 0x70, 0x4b, 0x96, 0x04, 0x4b, 0xa9, 0x21, 0xc0, 0xc2, 0xf6, 0x48, 0x2b, 0x05, 0x79, 0xa9, 0xc3, 0x3b, 0x4f,
+    0xc1, 0x0a, 0x30, 0x0e, 0xb5, 0x54, 0x32, 0x8d, 0x24, 0xbe, 0x54, 0xa2, 0xc0, 0x94, 0xfb, 0x23, 0xf0, 0x53, 0x9b,
+    0x27, 0x5d, 0xe7, 0xae, 0x1f, 0xcf, 0x30, 0xb5, 0x87, 0x40, 0x8f, 0xbd, 0x3b, 0x60, 0x4a, 0xd4, 0x75, 0x58, 0x41,
+    0x1c, 0x9a, 0xd5, 0x34, 0x0b, 0x98, 0x31, 0x6d, 0xd0, 0x92, 0x6d, 0xb0, 0xe5, 0x72, 0xb0, 0x8f, 0xc4, 0xf6, 0xac,
+    0x56, 0x40, 0xe8, 0x1a, 0x34, 0x30, 0xe4, 0x2e, 0x15, 0x5a, 0x98, 0xf7, 0xba, 0x54, 0x84, 0xfb, 0x73, 0xc0, 0xa5,
+    0x15, 0x9c, 0x79, 0x19, 0x0d, 0xbc, 0x1f, 0x1f, 0x27, 0x98, 0xf8, 0x82, 0x58, 0x81, 0x1d, 0x1c, 0x74, 0x9a, 0x4d,
+    0x81, 0x53, 0x71, 0x91, 0x32, 0x58, 0x56, 0x94, 0xda, 0xf0, 0x43, 0x8a, 0x6c, 0xdd, 0xe5, 0x81, 0xee, 0x42, 0x2c,
+    0x80, 0x9d, 0x7e, 0xc3, 0xc8, 0xb7, 0xac, 0x97, 0x01, 0x83, 0x53, 0xad, 0x71, 0x10, 0xf8, 0xcd, 0xcd, 0x64, 0x58,
+    0xa6, 0xc4, 0x76, 0x4d, 0x56, 0x17, 0x90, 0xc3, 0x50, 0x4d, 0xdc, 0x41, 0x58, 0x2a, 0x7b, 0xbc, 0x28, 0x67, 0xb8,
+    0x5c, 0xca, 0x42, 0x6e, 0x9e, 0x57, 0xd3, 0x7c, 0x6e, 0xa5, 0xd9, 0x74, 0xbc, 0x15, 0x5f, 0x14, 0xfc, 0x03, 0x27,
+    0x96, 0x56, 0x3d, 0xa5, 0x56, 0x78, 0x94, 0xb9, 0x25, 0xeb, 0x94, 0xd4, 0xea, 0xba, 0x81, 0x6a, 0x84, 0xa7, 0x69,
+    0xd8, 0x08, 0x84, 0x98, 0xe0, 0xe2, 0xd7, 0x4d, 0x26, 0xa6, 0xbd, 0x25, 0xa4, 0x8e, 0xb0, 0x7b, 0x28, 0x27, 0xb8,
+    0xab, 0x79, 0xf6, 0x79, 0x38, 0xbf, 0x9a, 0xb9, 0xf7, 0x0c, 0xe6, 0x7e, 0x1c, 0x72, 0x83, 0xd1, 0x63, 0x99, 0xf0,
+    0x23, 0x63, 0x1f, 0xb9, 0xaa, 0x7a, 0x72, 0x12, 0x56, 0x22, 0x4b, 0x3c, 0x19, 0x47, 0x1d, 0xc6, 0xa9, 0x68, 0x4d,
+    0x90, 0x5d, 0x5e, 0x16, 0xe6, 0x5e, 0xa0, 0xa0, 0xa9, 0xc7, 0xeb, 0x71, 0xda, 0x8a, 0x9d, 0x8d, 0x48, 0xe4, 0xde,
+    0xab, 0x5a, 0x24, 0xb2, 0xe2, 0x73, 0x1c, 0xe9, 0x8a, 0x83, 0xdc, 0x27, 0x27, 0xab, 0x9b, 0x54, 0xe8, 0x16, 0x8d,
+    0xb6, 0xb1, 0x47, 0xf5, 0x81, 0xa4, 0x9e, 0x51, 0x81, 0x55, 0x8d, 0x7d, 0xf7, 0x6e, 0x47, 0xa4, 0x5b, 0x2a, 0xc5,
+    0x06, 0x4b, 0x0b, 0xa3, 0x19, 0xa3, 0x60, 0x50, 0x52, 0x64, 0xa0, 0x46, 0xf9, 0x15, 0x82, 0x61, 0x8f, 0x1a, 0x80,
+    0xe2, 0x5c, 0x5f, 0xfd, 0xb8, 0x94, 0x6c, 0x21, 0x20, 0x71, 0x97, 0x0c, 0xc4, 0x9a, 0x60, 0x66, 0xe4, 0x93, 0xf7,
+    0xc0, 0x79, 0x03, 0x86, 0x0e, 0x01, 0xf8, 0x05, 0x62, 0xd3, 0x83, 0x89, 0x6d, 0x13, 0x51, 0xf4, 0xd9, 0xc0, 0x73,
+    0x00, 0x76, 0x5e, 0x85, 0x46, 0xdf, 0x55, 0x29, 0x60, 0xc8, 0x06, 0x6e, 0xc0, 0xaa, 0xb0, 0xdc, 0xde, 0x73, 0x70,
+    0x1b, 0xe0, 0xf5, 0x99, 0x6c, 0xbe, 0x81, 0x79, 0x82, 0xd5, 0xd9, 0x85, 0x5f, 0x59, 0xd6, 0xe2, 0xdc, 0xe9, 0xa0,
+    0x51, 0xaf, 0x28, 0x21, 0x6a, 0xf7, 0xb1, 0xf6, 0x39, 0x46, 0x58, 0xc4, 0xfb, 0x2b, 0x7c, 0xd7, 0xe3, 0x96, 0x7b,
+    0x1a, 0x2d, 0xc2, 0x74, 0x95, 0x34, 0x06, 0x25, 0xeb, 0x7e, 0x32, 0xe2, 0x5e, 0xee, 0x8b, 0x58, 0x70, 0x85, 0x23,
+    0xab, 0x42, 0x8a, 0x0d, 0x24, 0xe9, 0x69, 0x8f, 0x0e, 0xd8, 0x37, 0x9a, 0xbd, 0x80, 0x32, 0xef, 0x2b, 0x52, 0x49,
+    0x48, 0x69, 0x76, 0x43, 0x24, 0x09, 0x6b, 0x45, 0x9e, 0x3a, 0xef, 0x3b, 0xda, 0xe7, 0x56, 0x12, 0xc1, 0x08, 0x4e,
+    0xc2, 0x74, 0xac, 0x3c, 0x68, 0x0a, 0x70, 0x15, 0x1d, 0x31, 0x7d, 0x13, 0x90, 0xdf, 0x0c, 0xe4, 0xf6, 0x4a, 0x72,
+    0x6d, 0xae, 0x61, 0x78, 0x82, 0x04, 0xab, 0x22, 0x11, 0x78, 0x44, 0x8d, 0x09, 0xc9, 0xeb, 0x3c, 0x0f, 0x30, 0xe1,
+    0x6b, 0x7b, 0x13, 0x00, 0xca, 0xc9, 0x55, 0x71, 0x56, 0x02, 0xdd, 0x80, 0xe5, 0xfa, 0x38, 0x35, 0x2a, 0x12, 0x17,
+    0x37, 0xa6, 0xab, 0x5b, 0xfa, 0x33, 0xb4, 0x9c, 0xc9, 0x10, 0xd3, 0x41, 0x10, 0x90, 0xa9, 0x8f, 0x99, 0x23, 0x64,
+    0xae, 0xb0, 0x3e, 0xe7, 0x4e, 0x6d, 0xea, 0x1e, 0xa3, 0x6e, 0x9e, 0xa4, 0x16, 0xaf, 0xd3, 0xa6, 0x94, 0x88, 0x49,
+    0x89, 0x39, 0x13, 0xa9, 0xd8, 0x4c, 0x89, 0x3b, 0xb7, 0xbe, 0xd1, 0x42, 0xda, 0x68, 0x33, 0x91, 0x83, 0xcd, 0x2a,
+    0x79, 0x4f, 0x60, 0x3c, 0x17, 0x84, 0x2f, 0x91, 0xb1, 0x96, 0x63, 0xe6, 0x98, 0x08, 0x56, 0x2f, 0xa6, 0x22, 0x7f,
+    0xe7, 0xe8, 0x34, 0x7b, 0x83, 0x1e, 0xa4, 0xde, 0x40, 0x62, 0xd6, 0xc4, 0x77, 0x21, 0x0d, 0x75, 0x84, 0x40, 0x65,
+    0x54, 0xcb, 0x74, 0x9c, 0x58, 0x85, 0x6f, 0x04, 0x5f, 0xbd, 0xd5, 0xc7, 0xf9, 0xc6, 0x73, 0x63, 0x35, 0x82, 0x18,
+    0xbc, 0x85, 0x7c, 0xe8, 0x49, 0x11, 0x0e, 0x84, 0xcb, 0x37, 0x37, 0x7b, 0xf9, 0x2e, 0xaf, 0x42, 0x24, 0x15, 0x8c,
+    0x31, 0x66, 0x14, 0xe3, 0x9e, 0xa8, 0xa9, 0xc5, 0x1c, 0x06, 0x96, 0xad, 0xc3, 0x1c, 0x0f, 0x00, 0xa0, 0xa5, 0x29,
+    0xbd, 0x6a, 0x2a, 0x54, 0x9e, 0xe7, 0x12, 0x3e, 0xd5, 0x21, 0xaa, 0x6a, 0xfc, 0x76, 0x7d, 0x06, 0x0a, 0xc1, 0x7d,
+    0xa7, 0xe3, 0xe1, 0x21, 0x04, 0xac, 0xa2, 0x90, 0x05, 0x7a, 0x83, 0xf6, 0xaa, 0x44, 0x28, 0x66, 0x4e, 0xd6, 0x63,
+    0x86, 0x93, 0x0a, 0xb6, 0x50, 0x09, 0x4b, 0xa5, 0x05, 0x7e, 0xb5, 0x11, 0x9a, 0xa7, 0x8c, 0x7b, 0xaf, 0x2a, 0x9c,
+    0x41, 0x7f, 0x30, 0x6f, 0x95, 0x51, 0xdf, 0xae, 0x9c, 0xc8, 0x54, 0x60, 0xe2, 0x66, 0x96, 0xda, 0xef, 0x97, 0x75,
+    0xda, 0xcf, 0x2b, 0xe4, 0x3e, 0x27, 0xcd, 0xd7, 0xb9, 0x85, 0xe6, 0x93, 0xe1, 0x7e, 0xa5, 0xfc, 0xd0, 0xc2, 0xa8,
+    0x29, 0xbf, 0xbc, 0xae, 0xfc, 0x0a, 0x4f, 0x85, 0xb7, 0xfa, 0x5d, 0x14, 0xba, 0xa8, 0xcf, 0xc1, 0x10, 0xd2, 0x8f,
+    0xe0, 0x1a, 0x1a, 0x3c, 0x28, 0x92, 0xc5, 0x62, 0xed, 0x82, 0xb8, 0x3e, 0xe6, 0x54, 0x3b, 0x94, 0x31, 0x46, 0x3c,
+    0x2d, 0x39, 0x48, 0x32, 0x38, 0x18, 0xbf, 0x81, 0x01, 0x31, 0x29, 0x09, 0xe9, 0x10, 0x3a, 0x6b, 0x33, 0x11, 0x95,
+    0xbb, 0x78, 0xb3, 0x71, 0x59, 0x53, 0x28, 0xc2, 0x4e, 0x30, 0x53, 0x29, 0x15, 0x04, 0xd2, 0xe4, 0xbb, 0xd3, 0xa9,
+    0x05, 0x43, 0x0b, 0xd7, 0x54, 0x40, 0x5e, 0xdb, 0xf5, 0xa0, 0xc9, 0x7b, 0x8a, 0xa1, 0xaf, 0x53, 0x23, 0x5e, 0x66,
+    0xf0, 0x35, 0x6c, 0xfe, 0x9a, 0x28, 0xc9, 0x43, 0x26, 0x62, 0xaf, 0xe0, 0x13, 0x21, 0x9b, 0x82, 0x9d, 0x09, 0xf4,
+    0x43, 0xbb, 0xb2, 0x97, 0xee, 0x16, 0x95, 0x4b, 0x8b, 0xc6, 0x56, 0xa2, 0x66, 0xcd, 0x0f, 0xe3, 0xcd, 0x14, 0xf6,
+    0xb3, 0x47, 0x09, 0x04, 0xa4, 0xa9, 0x9c, 0xa4, 0x9a, 0xf7, 0x30, 0x1d, 0x02, 0x48, 0xb0, 0xfb, 0x09, 0x2c, 0xf4,
+    0x9b, 0x12, 0x13, 0x2c, 0xaa, 0xc6, 0x6e, 0x73, 0xd0, 0x9a, 0x73, 0xd2, 0x7c, 0x73, 0xd4, 0xda, 0x9b, 0xca, 0x7a,
+    0xc6, 0xec, 0x00, 0xdb, 0x76, 0x37, 0x8b, 0xc3, 0x74, 0xb3, 0x33, 0x34, 0x04, 0x17, 0x1e, 0xff, 0x27, 0x25, 0xa6,
+    0x81, 0xe4, 0x52, 0x37, 0x7e, 0x42, 0x1d, 0x86, 0xff, 0x2d, 0x49, 0x01, 0x0f, 0x6a, 0xab, 0xb1, 0xe2, 0xdc, 0x2b,
+    0x8e, 0x92, 0xcb, 0xaa, 0xda, 0xd5, 0x12, 0x34, 0x74, 0x23, 0x19, 0x13, 0xc5, 0x3c, 0x27, 0x00, 0x46, 0xb1, 0xf9,
+    0x53, 0xa6, 0x93, 0xbc, 0x7f, 0x59, 0x9b, 0xda, 0xed, 0xfb, 0x7e, 0x94, 0x9f, 0xd0, 0x91, 0x8a, 0xca, 0xe6, 0x24,
+    0xe6, 0xdf, 0x16, 0x60, 0x9a, 0x13, 0x1f, 0xea, 0xb9, 0x86, 0xa1, 0x00, 0x5f, 0xd9, 0x50, 0x6a, 0xb6, 0x97, 0xbf,
+    0x77, 0xb6, 0xfb, 0x92, 0x28, 0x82, 0x05, 0x1a, 0x74, 0xb9, 0x02, 0x5f, 0xc0, 0x32, 0xb8, 0x25, 0xfd, 0xf4, 0xa6,
+    0xbf, 0x0a, 0x3e, 0x63, 0xff, 0x0b, 0x40, 0xab, 0x02, 0x03, 0xca, 0x9d, 0xa6, 0x61, 0x25, 0xc4, 0x25, 0x2a, 0xcc,
+    0x2a, 0xce, 0x1f, 0xd7, 0x79, 0xdd, 0xb4, 0x2c, 0x31, 0x28, 0x3f, 0x77, 0x0d, 0x37, 0xbe, 0xd7, 0xc8, 0x1f, 0xdf,
+    0x7b, 0x0e, 0xba, 0x9d, 0x48, 0x7b, 0xf7, 0x6e, 0x7e, 0x87, 0x2c, 0x34, 0xbc, 0x17, 0x36, 0x87, 0xb6, 0x48, 0x97,
+    0x5c, 0x3d, 0x63, 0x31, 0xde, 0x16, 0xa1, 0x32, 0x7c, 0xc0, 0x82, 0x39, 0x60, 0x08, 0x1e, 0x3b, 0x95, 0xc9, 0x67,
+    0xd8, 0x68, 0x8a, 0x5d, 0x73, 0x61, 0xf0, 0x81, 0xaa, 0x2c, 0x24, 0x2f, 0xd6, 0xc9, 0xf6, 0xec, 0x14, 0x9e, 0x5f,
+    0xc6, 0x05, 0x50, 0x07, 0xd0, 0xaf, 0xa8, 0x2c, 0x36, 0x90, 0x8b, 0x9b, 0xb2, 0xd6, 0x2b, 0x1a, 0x8f, 0xaf, 0xed,
+    0xc2, 0xea, 0x0a, 0x7c, 0x1a, 0xa5, 0xe3, 0x44, 0x4c, 0x62, 0x26, 0x55, 0xae, 0xc9, 0xb5, 0xd1, 0xbd, 0xb4, 0x45,
+    0xf3, 0x5c, 0x48, 0xf0, 0x8a, 0xc0, 0x0d, 0xa1, 0xaf, 0xf4, 0xe5, 0x7a, 0x03, 0x05, 0x8f, 0xda, 0x9b, 0x8b, 0x60,
+    0x62, 0xe2, 0x31, 0x43, 0x6a, 0xfa, 0x75, 0x38, 0x15, 0xdf, 0xfc, 0xb6, 0xe2, 0xf0, 0xeb, 0x9c, 0xb1, 0x86, 0x02,
+    0x20, 0x3e, 0x79, 0x70, 0xb5, 0x9b, 0xf4, 0x4a, 0x69, 0x07, 0xa5, 0x11, 0xe2, 0xdb, 0x0a, 0x5f, 0x77, 0xa9, 0xf8,
+    0xca, 0x55, 0xf7, 0xbe, 0x8e, 0x99, 0x71, 0xc1, 0xe8, 0x39, 0x9f, 0x25, 0x8d, 0x6b, 0x37, 0x74, 0x57, 0xe7, 0x47,
+    0xef, 0x07, 0x99, 0xb7, 0x70, 0x0c, 0x6c, 0x72, 0xcc, 0x9c, 0xe7, 0xde, 0x6b, 0xe3, 0x44, 0xf9, 0x5b, 0xf3, 0x88,
+    0x57, 0x0e, 0xb3, 0xee, 0x24, 0xf9, 0xdb, 0xc1, 0xb7, 0xc1, 0xd5, 0x2d, 0x8d, 0x13, 0xe4, 0xae, 0x3a, 0x41, 0x26,
+    0xca, 0xcd, 0xf4, 0x86, 0xdb, 0xbb, 0xad, 0x40, 0x10, 0xa7, 0x62, 0xfa, 0xa8, 0x1c, 0xd7, 0x8f, 0x16, 0xa8, 0x54,
+    0x44, 0x7c, 0xaa, 0x72, 0x57, 0xae, 0x4c, 0x0d, 0xf5, 0xb8, 0x4e, 0x66, 0xa1, 0x69, 0xd6, 0xe4, 0x52, 0x36, 0x3d,
+    0x46, 0xa6, 0xd9, 0xa9, 0x36, 0xbf, 0x7b, 0xe5, 0x21, 0x1d, 0x43, 0x73, 0xb1, 0x56, 0x0b, 0xee, 0x77, 0x15, 0x85,
+    0x77, 0xbd, 0xd8, 0x48, 0x65, 0xa8, 0x59, 0x8f, 0xa2, 0x8f, 0xe3, 0x36, 0x73, 0x79, 0x94, 0xfd, 0x59, 0x03, 0xc0,
+    0x74, 0x84, 0x45, 0x77, 0xd3, 0x33, 0xf6, 0x04, 0x7a, 0x7a, 0x22, 0x83, 0x44, 0xaf, 0x74, 0xbe, 0x6a, 0x95, 0x58,
+    0xba, 0x86, 0xc0, 0xee, 0x35, 0x19, 0xab, 0x92, 0x76, 0xab, 0xf5, 0xab, 0x79, 0x3e, 0x4f, 0xf9, 0x4a, 0x9e, 0x4f,
+    0xcd, 0xa2, 0xbb, 0xd3, 0x76, 0xaf, 0x4f, 0x0d, 0x15, 0x73, 0xad, 0x6f, 0xf2, 0x3b, 0xa6, 0xeb, 0x60, 0xa8, 0x45,
+    0x90, 0x59, 0xed, 0xaa, 0x67, 0x65, 0x39, 0xab, 0x67, 0x72, 0xcc, 0x84, 0x6f, 0x2a, 0xdd, 0x21, 0xba, 0x61, 0xaa,
+    0x66, 0xfa, 0xb1, 0xb1, 0x2d, 0x64, 0x9b, 0xe7, 0x17, 0xe3, 0x1c, 0x28, 0x2d, 0xf7, 0x97, 0x09, 0xc3, 0x8f, 0x97,
+    0x97, 0x3f, 0x0a, 0x39, 0x55, 0x75, 0xf4, 0x96, 0x2f, 0x75, 0xcf, 0x60, 0x56, 0x2a, 0x27, 0xe2, 0x23, 0x5b, 0x3f,
+    0x78, 0x73, 0xf7, 0x0a, 0x58, 0x3e, 0x02, 0x76, 0x1f, 0x99, 0xd3, 0x18, 0xaa, 0xda, 0xc0, 0x3f, 0xac, 0x1f, 0x6c,
+    0xdd, 0x1e, 0xfe, 0x61, 0xf0, 0x43, 0x70, 0x6d, 0x63, 0x63, 0x1b, 0x6f, 0xd7, 0x12, 0x41, 0x5e, 0xe1, 0x81, 0x3e,
+    0x5e, 0x7d, 0x14, 0xb4, 0x5c, 0x27, 0xb6, 0x07, 0x0e, 0x85, 0xad, 0x41, 0xbe, 0x49, 0x99, 0x34, 0x5a, 0x14, 0x3c,
+    0x9b, 0xc9, 0x19, 0x0a, 0x79, 0xcd, 0xc7, 0x41, 0xdb, 0x11, 0xfe, 0x06, 0x4e, 0xed, 0x78, 0x79, 0xf9, 0x09, 0xfa,
+    0x80, 0xa7, 0x2b, 0xa5, 0xa9, 0x88, 0x53, 0xca, 0x2d, 0xba, 0x5a, 0xe7, 0xc1, 0x48, 0x71, 0x31, 0x45, 0xa5, 0xe3,
+    0x2e, 0xaf, 0x9d, 0x8d, 0x9c, 0xfe, 0x12, 0xaf, 0x2e, 0xd2, 0xe5, 0x23, 0x91, 0xad, 0x5a, 0x7a, 0x2f, 0xf4, 0xe9,
+    0xb6, 0x3d, 0x63, 0x7c, 0x9a, 0x8d, 0xe9, 0x60, 0xc6, 0xc7, 0x89, 0xf0, 0xfa, 0xc4, 0x58, 0xdf, 0x2d, 0x02, 0xd3,
+    0xcd, 0xb1, 0xc9, 0x0f, 0xc7, 0xeb, 0xcd, 0x66, 0x8d, 0x3b, 0x78, 0xe3, 0x3c, 0x71, 0x96, 0x25, 0x46, 0x54, 0x96,
+    0x1a, 0x1e, 0xd0, 0x0a, 0x71, 0xf3, 0x9e, 0x09, 0x8c, 0xcb, 0x2e, 0x48, 0x6a, 0xbb, 0x81, 0xc0, 0xc5, 0x9e, 0xc4,
+    0x2c, 0x19, 0xdb, 0x1e, 0x94, 0x07, 0xfa, 0x62, 0x34, 0xdd, 0x02, 0xa6, 0xe5, 0xb5, 0xb3, 0xb3, 0xd4, 0xf6, 0xaa,
+    0xa9, 0x02, 0x98, 0x25, 0xcb, 0xe3, 0x13, 0x64, 0xdd, 0x6f, 0xa0, 0x8b, 0x18, 0x30, 0x36, 0xae, 0xcc, 0xb9, 0xcb,
+    0x75, 0x2b, 0xe2, 0x1b, 0x4d, 0xa4, 0x49, 0x7d, 0x48, 0x7d, 0x87, 0x61, 0xad, 0xae, 0x72, 0x90, 0xc0, 0x3d, 0xf2,
+    0x6e, 0x89, 0x4b, 0x4f, 0x9f, 0x59, 0x4c, 0xaa, 0xf4, 0x2d, 0x75, 0x2d, 0xae, 0x19, 0xf6, 0x8a, 0x07, 0x60, 0x7f,
+    0x60, 0xdc, 0x22, 0x16, 0xf1, 0x76, 0x5e, 0x4b, 0x61, 0x6d, 0xcc, 0x81, 0xe6, 0x86, 0x1b, 0xbc, 0x60, 0xd5, 0x9a,
+    0x81, 0x19, 0x66, 0x9c, 0x91, 0xfc, 0x66, 0xdc, 0xab, 0x9a, 0x38, 0x72, 0x15, 0x40, 0xf4, 0x2d, 0xe9, 0x92, 0x1c,
+    0x5e, 0xc9, 0x72, 0xd5, 0x19, 0xf2, 0xaf, 0xb0, 0xce, 0x7a, 0x71, 0x02, 0x66, 0xd2, 0x94, 0x97, 0x98, 0x98, 0x22,
+    0x2e, 0x37, 0xcb, 0x98, 0xa7, 0xe9, 0xb3, 0x68, 0x07, 0x27, 0x37, 0x12, 0x38, 0x62, 0xdf, 0x58, 0x86, 0x66, 0xc2,
+    0x46, 0x4c, 0xa4, 0x51, 0x29, 0x25, 0x7c, 0x20, 0x97, 0x5a, 0xf2, 0x97, 0xb9, 0xbc, 0xfa, 0x72, 0x9b, 0xe0, 0x80,
+    0xbc, 0x06, 0x96, 0x43, 0xe3, 0xb8, 0x65, 0x20, 0x11, 0x8b, 0x01, 0x31, 0x6a, 0x55, 0xae, 0x26, 0xa3, 0x3a, 0x99,
+    0xaf, 0x90, 0x0b, 0x15, 0x79, 0x70, 0x4b, 0xa0, 0xe4, 0xcf, 0x31, 0x75, 0x30, 0x2b, 0xb5, 0x9b, 0x16, 0x9b, 0x24,
+    0xef, 0x99, 0x01, 0xc9, 0xf5, 0xd7, 0xf0, 0xd0, 0xf8, 0xc5, 0x2b, 0x73, 0x4a, 0xf8, 0xa2, 0x8c, 0xa5, 0xa5, 0x31,
+    0x97, 0xfe, 0x83, 0xbc, 0x4f, 0x2b, 0x01, 0xfb, 0x15, 0xc4, 0x94, 0x81, 0x4b, 0x6c, 0x5c, 0x90, 0x94, 0xd7, 0xf2,
+    0x94, 0xdd, 0xd7, 0x50, 0xbe, 0x2b, 0x26, 0x5d, 0xa5, 0xb2, 0xae, 0xb0, 0xea, 0x7e, 0x5d, 0xb0, 0xfc, 0x62, 0x9f,
+    0x61, 0x6e, 0x32, 0x1a, 0x64, 0x2b, 0x66, 0x36, 0xe5, 0x57, 0x7b, 0xd7, 0x7e, 0xe5, 0xa1, 0xa4, 0x43, 0xb5, 0x4a,
+    0x37, 0xaf, 0xdc, 0x70, 0x8c, 0x1b, 0x37, 0x1c, 0x01, 0x6c, 0x0c, 0x3b, 0x55, 0xa4, 0xd6, 0xf9, 0xef, 0xab, 0xe1,
+    0x27, 0xda, 0x6b, 0x43, 0xbd, 0xeb, 0x86, 0x6b, 0xd3, 0xd3, 0xaf, 0x41, 0xd5, 0xc8, 0x12, 0xba, 0x0e, 0x55, 0x4c,
+    0x46, 0xa2, 0xc4, 0x74, 0x95, 0xf2, 0xa8, 0xaf, 0x11, 0xe7, 0x20, 0x6e, 0x28, 0x7f, 0xf1, 0x2f, 0xe1, 0xc5, 0x51,
+    0x80, 0x46, 0xd4, 0x72, 0x92, 0xa5, 0xbc, 0x35, 0x89, 0x66, 0x71, 0x72, 0x11, 0x2c, 0xe2, 0xd6, 0x2c, 0x4b, 0xb3,
+    0x62, 0x0e, 0x5c, 0xe9, 0x15, 0x17, 0x60, 0xc3, 0xcf, 0x5a, 0x8b, 0xd8, 0x7b, 0xce, 0x92, 0x53, 0xc6, 0xe3, 0x51,
+    0xe4, 0xd9, 0x7b, 0x39, 0x88, 0x07, 0xeb, 0x75, 0x94, 0xe7, 0xd9, 0x99, 0xed, 0xbd, 0xcb, 0x8e, 0x81, 0x69, 0xbd,
+    0x37, 0xe7, 0x17, 0x27, 0x2c, 0xf5, 0xde, 0x1f, 0x2f, 0x52, 0xbe, 0xf0, 0x8a, 0x28, 0x2d, 0x5a, 0x05, 0xcb, 0xe3,
+    0x09, 0xa8, 0x89, 0x24, 0xcb, 0x5b, 0x98, 0xff, 0x3c, 0x63, 0x41, 0x12, 0x9f, 0x4c, 0xb9, 0x35, 0x8e, 0xf2, 0x4f,
+    0xbd, 0x56, 0x6b, 0x9e, 0xc7, 0xb3, 0x28, 0xbf, 0x68, 0x51, 0x8b, 0xe0, 0x8b, 0xf6, 0x76, 0xf4, 0xe5, 0xe4, 0x7e,
+    0x8f, 0xe7, 0xd0, 0x37, 0x46, 0x2a, 0x06, 0x20, 0x7c, 0xac, 0xed, 0x9d, 0xf6, 0xac, 0xb8, 0x23, 0x4e, 0x94, 0xa2,
+    0x94, 0x97, 0x47, 0xde, 0x19, 0x03, 0xb8, 0xfd, 0x63, 0x9e, 0x7a, 0xe0, 0xcb, 0xf1, 0x2c, 0x5d, 0x8e, 0x16, 0x79,
+    0x01, 0x03, 0xcc, 0xb3, 0x38, 0xe5, 0x2c, 0xef, 0x1d, 0x67, 0x39, 0x90, 0xad, 0x95, 0x47, 0xe3, 0x78, 0x51, 0x04,
+    0xf7, 0xe7, 0xe7, 0x3d, 0xb4, 0x15, 0x4e, 0xf2, 0x6c, 0x91, 0x8e, 0xe5, 0x5c, 0x71, 0x0a, 0x1b, 0x23, 0xe6, 0x66,
+    0x05, 0x7d, 0x09, 0x05, 0xe0, 0x4b, 0x59, 0x94, 0xb7, 0x4e, 0xb0, 0x33, 0x1a, 0xfa, 0xed, 0x31, 0x3b, 0xf1, 0xf2,
+    0x93, 0xe3, 0xc8, 0xe9, 0x74, 0x1f, 0x7a, 0xea, 0x9f, 0xbf, 0xe3, 0x82, 0xe1, 0xbe, 0xb6, 0xb8, 0xd3, 0x6e, 0xff,
+    0xad, 0xdb, 0x6b, 0xcc, 0x42, 0x00, 0x05, 0x9d, 0xf9, 0xb9, 0x55, 0x64, 0x09, 0xac, 0xcf, 0xba, 0x9e, 0xbd, 0x39,
+    0xf8, 0x4d, 0x71, 0x7a, 0x12, 0x74, 0xe7, 0xe7, 0x25, 0x62, 0x17, 0x88, 0x84, 0x4c, 0x89, 0xa4, 0x7c, 0x5b, 0xfe,
+    0x5e, 0x88, 0x1f, 0xad, 0x87, 0xb8, 0xab, 0x20, 0xae, 0xa8, 0xde, 0x1a, 0xc3, 0x3e, 0x20, 0xf2, 0x77, 0x0a, 0x01,
+    0xc8, 0x14, 0x9c, 0xc0, 0x5c, 0xc1, 0x41, 0x2f, 0xbf, 0x1b, 0x8c, 0xee, 0x7a, 0x30, 0x1e, 0xdd, 0x04, 0x46, 0x9e,
+    0x8e, 0x97, 0xf5, 0x75, 0xed, 0x80, 0x73, 0xda, 0x9b, 0x32, 0xe4, 0xa7, 0xa0, 0x8b, 0xcf, 0x67, 0xf1, 0x98, 0x4f,
+    0xc5, 0x23, 0xb1, 0xf3, 0x99, 0xa8, 0xdb, 0x69, 0xb7, 0xc5, 0x7b, 0x01, 0x0a, 0x2d, 0xe8, 0xf8, 0xd8, 0x00, 0x98,
+    0xe8, 0xab, 0xab, 0x3e, 0x62, 0xf3, 0xdd, 0x8d, 0x5f, 0xaa, 0xf1, 0x2e, 0x54, 0xde, 0xa0, 0x50, 0x11, 0xea, 0x9b,
+    0x2d, 0x98, 0xf1, 0x96, 0xf7, 0x3b, 0xfa, 0xa0, 0x6a, 0xf0, 0x1d, 0x23, 0xad, 0x17, 0x70, 0xcf, 0xcc, 0x05, 0xea,
+    0xa5, 0x7d, 0x0c, 0x49, 0xb5, 0x5a, 0x2e, 0xe8, 0x0d, 0x86, 0x21, 0x24, 0x3a, 0x10, 0x74, 0xf2, 0x41, 0x41, 0xdf,
+    0xd4, 0xc8, 0xdc, 0xa0, 0x70, 0x32, 0x17, 0xb6, 0x7c, 0xa6, 0xe5, 0x3a, 0x28, 0x69, 0xf0, 0xb2, 0xbf, 0x62, 0xb2,
+    0x01, 0x48, 0xef, 0x4a, 0xd2, 0x7e, 0xaf, 0x4f, 0x9e, 0x94, 0xc7, 0x97, 0x8d, 0x88, 0x70, 0xe0, 0xea, 0xf3, 0x29,
+    0xba, 0xdd, 0xfa, 0x3b, 0x31, 0x46, 0x46, 0xcd, 0x96, 0xed, 0x0e, 0x98, 0x4e, 0xca, 0xc2, 0xe4, 0x33, 0x56, 0xe2,
+    0x28, 0x5f, 0xb3, 0xf0, 0x7b, 0x0c, 0xbc, 0xb2, 0x50, 0x78, 0x69, 0xca, 0x47, 0x9b, 0x5d, 0x77, 0xfb, 0x1f, 0x16,
+    0x3c, 0xa6, 0x64, 0xe7, 0xc3, 0xe1, 0xbf, 0xc1, 0x67, 0x70, 0x34, 0x06, 0x45, 0xb6, 0xc8, 0x47, 0x14, 0x04, 0x5c,
+    0x0d, 0x26, 0xd8, 0xa4, 0xcb, 0x6d, 0x8f, 0x69, 0x15, 0x82, 0x1e, 0x76, 0xed, 0xfb, 0x09, 0x9c, 0xce, 0x57, 0xc4,
+    0xf5, 0x05, 0x19, 0x40, 0x51, 0x10, 0xa2, 0x56, 0x1c, 0x53, 0x2a, 0x1d, 0x5d, 0xed, 0xf4, 0x17, 0x69, 0x0c, 0x42,
+    0xf4, 0x63, 0x3c, 0xa6, 0x2b, 0x2d, 0xf1, 0x98, 0xce, 0x38, 0x5a, 0x94, 0xd3, 0x84, 0x41, 0x73, 0x28, 0x90, 0xb4,
+    0xc5, 0x67, 0x99, 0x23, 0x63, 0xb7, 0x6c, 0x3c, 0xa7, 0x30, 0xb4, 0xf0, 0x38, 0x9b, 0x45, 0x71, 0x1a, 0xe0, 0xa7,
+    0x47, 0x3c, 0x3d, 0x62, 0x80, 0x5d, 0x3c, 0xf8, 0xa9, 0xc8, 0xdc, 0x71, 0xfd, 0x5f, 0x40, 0x44, 0x51, 0xff, 0x52,
+    0xba, 0x78, 0x1a, 0x2e, 0x75, 0x82, 0x5c, 0x2f, 0x05, 0xb1, 0xc6, 0x95, 0x39, 0xcc, 0x28, 0x84, 0xb2, 0xcb, 0xe9,
+    0xc7, 0xa0, 0xd5, 0x09, 0x3a, 0xda, 0x2b, 0xae, 0x5d, 0x74, 0x15, 0x69, 0x32, 0xf2, 0xb2, 0x24, 0xc1, 0xa0, 0x9f,
+    0x05, 0x9c, 0xd5, 0xbb, 0x86, 0xd5, 0x93, 0x2c, 0x8f, 0xb1, 0xa1, 0x93, 0xd4, 0xa9, 0x01, 0x41, 0xc7, 0x0c, 0x57,
+    0x4c, 0xe5, 0x96, 0x11, 0x31, 0xe1, 0x63, 0x92, 0x0d, 0xf5, 0x6b, 0x4a, 0x78, 0x25, 0xa9, 0x9e, 0x5d, 0xa5, 0xb3,
+    0xa4, 0x8f, 0x76, 0x85, 0x30, 0xb1, 0x88, 0xc7, 0x42, 0x1b, 0x76, 0xb7, 0x6d, 0xfd, 0x79, 0x04, 0x54, 0xfa, 0x14,
+    0xda, 0x1b, 0x4b, 0x47, 0xe5, 0xec, 0xe7, 0x30, 0xd7, 0x9e, 0x50, 0xa8, 0x74, 0xd9, 0xdf, 0xee, 0x6f, 0x2c, 0x79,
+    0xb9, 0xbb, 0x25, 0x7a, 0xf7, 0x8f, 0xca, 0x82, 0x74, 0x9f, 0x19, 0xa3, 0xab, 0xa6, 0x10, 0x75, 0x30, 0x2c, 0x65,
+    0x06, 0xe3, 0xb8, 0xb9, 0xb6, 0xe7, 0x44, 0x30, 0x5a, 0xb2, 0x5d, 0x81, 0x99, 0x50, 0x51, 0x0e, 0xdb, 0x5d, 0xe7,
+    0xba, 0x14, 0x22, 0xbd, 0xa3, 0xb7, 0x0a, 0xc5, 0x11, 0x42, 0x30, 0xd8, 0x58, 0xc6, 0x65, 0xb8, 0xb1, 0x64, 0xe9,
+    0x28, 0x1b, 0xb3, 0xf7, 0xef, 0x5e, 0xe0, 0x75, 0x86, 0x2c, 0x45, 0xb9, 0x97, 0xb9, 0xe5, 0x11, 0x18, 0x42, 0x08,
+    0x69, 0xae, 0xbe, 0x26, 0x03, 0xc0, 0x88, 0x98, 0x8e, 0x45, 0xa3, 0x22, 0x28, 0xac, 0xb4, 0xad, 0x81, 0x80, 0x10,
+    0x1c, 0x4e, 0x2c, 0x00, 0x53, 0x91, 0x7a, 0x31, 0xc0, 0x4f, 0xb4, 0xee, 0xc3, 0x40, 0xbb, 0x5b, 0xa2, 0x11, 0xe0,
+    0x9a, 0x23, 0x1a, 0x15, 0xaa, 0x98, 0xfd, 0x63, 0xa2, 0x3b, 0x8e, 0x4f, 0x35, 0x39, 0x29, 0x15, 0xba, 0xbf, 0x9b,
+    0x44, 0xc7, 0x2c, 0x81, 0x21, 0x8b, 0xcb, 0xcb, 0x36, 0x8c, 0x24, 0x5e, 0xad, 0xdd, 0x38, 0x9d, 0x2f, 0xe4, 0x57,
+    0xbd, 0x60, 0xe2, 0x0e, 0x1e, 0xb4, 0xe2, 0xa5, 0x83, 0x81, 0x3a, 0x39, 0x0c, 0xe4, 0x00, 0x00, 0x22, 0x1d, 0x5a,
+    0x20, 0x74, 0x15, 0xab, 0x40, 0x69, 0x3c, 0x5e, 0x2d, 0x83, 0xdd, 0x39, 0xc7, 0xd2, 0x14, 0x9e, 0x67, 0x71, 0x8a,
+    0x8f, 0x05, 0x3e, 0x46, 0xe7, 0xf8, 0x98, 0xc1, 0xa3, 0xc6, 0x3d, 0x2f, 0xed, 0x7f, 0xd7, 0x55, 0xc9, 0xe4, 0x0a,
+    0x58, 0x9a, 0x00, 0xd9, 0xe5, 0x25, 0xa8, 0x17, 0x4d, 0x82, 0xdd, 0x2d, 0x20, 0x16, 0x72, 0x8f, 0xf8, 0xc6, 0x0b,
+    0x33, 0xc9, 0xc8, 0x8a, 0x79, 0x4b, 0x94, 0x5b, 0xa4, 0xc4, 0x43, 0xf0, 0xf1, 0x72, 0xa7, 0x61, 0xab, 0x78, 0x32,
+    0x9b, 0xe5, 0x09, 0xbe, 0xb8, 0xb6, 0x25, 0x3e, 0xc2, 0x21, 0x88, 0x42, 0x8f, 0x88, 0xa1, 0x2e, 0xe3, 0xf2, 0xf3,
+    0x3a, 0x71, 0x68, 0xe3, 0x2c, 0x60, 0x2e, 0xa2, 0xd2, 0xe1, 0x51, 0x9c, 0x88, 0xc6, 0x6b, 0xf0, 0x69, 0xa4, 0x25,
+    0x12, 0x3a, 0xbb, 0x5b, 0x15, 0x6c, 0x00, 0xfc, 0x48, 0x5c, 0xea, 0x76, 0x44, 0xca, 0xa5, 0x2d, 0xca, 0xe9, 0xa8,
+    0x5e, 0x6e, 0x73, 0x19, 0x48, 0x16, 0xa1, 0x79, 0x8d, 0x2a, 0xa5, 0x48, 0xda, 0x93, 0x28, 0x5d, 0xd7, 0x14, 0xa0,
+    0x9f, 0x33, 0x36, 0xf6, 0x6c, 0x0b, 0xe4, 0xab, 0x78, 0xfe, 0x98, 0xb0, 0x53, 0x26, 0x3f, 0xcc, 0xa2, 0x07, 0xd1,
+    0x95, 0x23, 0xb0, 0x00, 0xb8, 0xbc, 0x33, 0x2a, 0xd9, 0x53, 0xe1, 0x28, 0x29, 0x51, 0x47, 0xc4, 0xb3, 0x8d, 0x41,
+    0x9b, 0x73, 0xb4, 0xeb, 0xc3, 0x7a, 0xa0, 0x93, 0x6c, 0x5b, 0xc0, 0x4b, 0x66, 0xe3, 0xcd, 0xc8, 0xc1, 0x00, 0x6c,
+    0x32, 0x81, 0xed, 0xa2, 0x02, 0xd9, 0x5a, 0x3e, 0x08, 0xa8, 0xc0, 0x07, 0xf6, 0x6c, 0xd1, 0xc2, 0xae, 0xda, 0xea,
+    0x27, 0x49, 0x1c, 0xd0, 0x9f, 0x9f, 0xd6, 0xcc, 0x05, 0xdc, 0xb1, 0x21, 0x02, 0xbb, 0x0d, 0x99, 0x67, 0xff, 0xeb,
+    0x3f, 0xfd, 0xaf, 0xff, 0x06, 0x03, 0x53, 0x3f, 0xb7, 0xb4, 0xae, 0x6e, 0xf5, 0x3f, 0xa1, 0xd5, 0x22, 0xbd, 0xa1,
+    0xdd, 0x5f, 0xff, 0xe1, 0xbf, 0x43, 0x33, 0xba, 0x00, 0x04, 0xb2, 0x84, 0x20, 0x1a, 0xa1, 0xcd, 0xf5, 0x59, 0x20,
+    0xd5, 0x06, 0xb9, 0x72, 0xa6, 0x7f, 0x44, 0xb0, 0x0b, 0x9e, 0xcd, 0xaf, 0x05, 0x07, 0xa1, 0x1e, 0x25, 0x59, 0xc1,
+    0x34, 0x3c, 0x42, 0xfe, 0x7e, 0x1e, 0x40, 0x34, 0xd7, 0x1c, 0xb8, 0xbc, 0xb0, 0xf4, 0x38, 0x62, 0x79, 0xd6, 0x8d,
+    0xd3, 0x58, 0xbd, 0x82, 0x71, 0x42, 0x87, 0xc2, 0x18, 0xb0, 0x5e, 0xe2, 0x09, 0x1e, 0x48, 0x20, 0xb8, 0xf5, 0x8f,
+    0x8a, 0xad, 0x1f, 0x4c, 0xf3, 0xa7, 0x18, 0x4b, 0x44, 0x6e, 0xd4, 0x08, 0xf0, 0x13, 0x84, 0xd6, 0x47, 0xfd, 0x1c,
+    0x9d, 0xeb, 0x67, 0x14, 0x6c, 0x62, 0x02, 0xd0, 0x4f, 0x33, 0x34, 0x3d, 0xcc, 0x19, 0x44, 0xd6, 0x41, 0xe5, 0xb6,
+    0x1a, 0xc9, 0x2b, 0x42, 0x78, 0x7d, 0xc4, 0x1c, 0x4f, 0xbc, 0xd1, 0xb3, 0xc8, 0xd9, 0xc7, 0x24, 0x3b, 0xc3, 0x58,
+    0x18, 0x12, 0xe9, 0xaa, 0xfa, 0xf2, 0x5f, 0xfe, 0xd9, 0xf7, 0xff, 0xe5, 0x9f, 0xaf, 0x68, 0x30, 0x85, 0x7d, 0x00,
+    0xc6, 0x2b, 0x0f, 0x35, 0x9d, 0x1b, 0x68, 0xad, 0x1f, 0x14, 0xf1, 0x5c, 0x5f, 0x23, 0x11, 0xc7, 0x52, 0x89, 0xb7,
+    0x7c, 0x24, 0xb4, 0x35, 0x53, 0xdc, 0x3c, 0x0b, 0x42, 0x76, 0xc5, 0x34, 0x58, 0x75, 0xc3, 0x3c, 0x47, 0x6e, 0x70,
+    0x0d, 0x5d, 0x3e, 0x13, 0xe3, 0xf5, 0x60, 0xdc, 0x08, 0x81, 0x07, 0xd2, 0x5f, 0xe8, 0x87, 0x27, 0x42, 0xba, 0x07,
+    0x62, 0x19, 0xa4, 0xac, 0xaf, 0x01, 0xe4, 0x59, 0x07, 0x34, 0x01, 0x35, 0x89, 0x2b, 0xdd, 0x4a, 0xe6, 0xc9, 0x71,
+    0xde, 0x7f, 0x85, 0x97, 0xf8, 0x2c, 0xec, 0x8d, 0x9a, 0xb5, 0x20, 0x43, 0x80, 0x93, 0x21, 0x20, 0x35, 0x90, 0xa9,
+    0x83, 0xd1, 0xa1, 0xc9, 0xd6, 0xeb, 0xda, 0x8f, 0xd8, 0xbd, 0xa6, 0x2d, 0xb9, 0xd4, 0x96, 0xb1, 0xb4, 0x6e, 0xa5,
+    0xb6, 0xc4, 0x4f, 0xb5, 0x34, 0xb4, 0x65, 0x7c, 0xa5, 0xb6, 0x44, 0xca, 0x0d, 0x70, 0xe4, 0xd0, 0xde, 0xc4, 0xa8,
+    0x8d, 0xa1, 0x9b, 0x39, 0xda, 0x25, 0xe0, 0xaa, 0x8f, 0x3e, 0x49, 0xb3, 0x84, 0x10, 0xc0, 0xb0, 0x85, 0x36, 0xbe,
+    0x04, 0x06, 0xa0, 0x62, 0x8f, 0x4a, 0xbd, 0xe9, 0xf1, 0xd1, 0x98, 0x80, 0xbb, 0xcb, 0x09, 0x43, 0x91, 0x0c, 0x6b,
+    0xf6, 0x35, 0x2b, 0xb7, 0x70, 0x1c, 0xb1, 0x61, 0xc4, 0x33, 0x60, 0xb6, 0x85, 0x83, 0x1d, 0x79, 0x4b, 0x11, 0x04,
+    0x0b, 0xec, 0xb7, 0x6f, 0xf6, 0x0f, 0x6c, 0xef, 0x38, 0x1b, 0x5f, 0x04, 0x36, 0x78, 0x19, 0x60, 0x7d, 0xb8, 0x3e,
+    0x9f, 0xb2, 0xd4, 0x51, 0x76, 0x7e, 0x96, 0x80, 0x0b, 0x95, 0x9d, 0x88, 0x6f, 0x36, 0x34, 0x03, 0xf8, 0x40, 0x58,
+    0xfa, 0xa8, 0x63, 0x7f, 0x97, 0x8b, 0xef, 0x9d, 0xf2, 0x1c, 0x1f, 0xfb, 0x98, 0xc2, 0xb0, 0xbb, 0x05, 0x0f, 0xf8,
+    0xb2, 0x8f, 0xfa, 0x48, 0xbf, 0x09, 0x60, 0x0b, 0xf1, 0xbe, 0x85, 0xed, 0xb7, 0x54, 0x5f, 0x84, 0xa2, 0x2f, 0xb9,
+    0x4d, 0x9b, 0xe2, 0x95, 0x2d, 0x47, 0x63, 0x8f, 0xd1, 0x54, 0x23, 0x53, 0x1c, 0x48, 0xc2, 0xc7, 0xba, 0x44, 0xa8,
+    0x7f, 0xa3, 0x88, 0x46, 0xa9, 0x94, 0xb5, 0xac, 0xc2, 0x09, 0xc9, 0xbc, 0x13, 0x93, 0xc1, 0x4f, 0x02, 0xff, 0xc8,
+    0xfc, 0x3e, 0x99, 0xf8, 0x94, 0x90, 0x46, 0xf2, 0xf0, 0x2f, 0xde, 0x19, 0xf3, 0x2e, 0x8e, 0xa8, 0xa5, 0x72, 0x86,
+    0x31, 0x4a, 0x83, 0x41, 0x83, 0xb6, 0x8a, 0x7a, 0x80, 0x7d, 0x92, 0x44, 0xf3, 0x82, 0x05, 0xea, 0x41, 0xfa, 0xc5,
+    0xe8, 0x5e, 0xaf, 0x06, 0x22, 0x4c, 0x3b, 0xa6, 0xe4, 0xd3, 0xa5, 0xe9, 0x38, 0x3f, 0x00, 0xc7, 0x19, 0x93, 0xfe,
+    0x5b, 0x11, 0x68, 0xdf, 0x34, 0x48, 0xd8, 0x84, 0x97, 0x1c, 0x6f, 0x95, 0x2f, 0x55, 0xa4, 0xc2, 0xef, 0xee, 0x80,
+    0x33, 0x6d, 0xf9, 0xf8, 0xff, 0x4d, 0x63, 0x8f, 0x83, 0x14, 0x9c, 0x5f, 0xba, 0x66, 0x82, 0x57, 0xf8, 0x00, 0x22,
+    0xf3, 0x7d, 0x69, 0x4c, 0x34, 0x62, 0x18, 0xc5, 0x29, 0x79, 0x0e, 0x72, 0xdb, 0xe3, 0xb9, 0xd9, 0x0e, 0xe4, 0xed,
+    0x4a, 0x28, 0x67, 0x35, 0x98, 0xb0, 0xed, 0x4a, 0xbf, 0x60, 0xb5, 0xb1, 0x8a, 0xc8, 0xd4, 0xdf, 0x56, 0x28, 0x64,
+    0xc4, 0x8e, 0x4a, 0xa1, 0x6a, 0x96, 0xa2, 0x87, 0x89, 0xd3, 0x6a, 0x54, 0xe9, 0x46, 0x4b, 0xb1, 0xa4, 0x6d, 0x7f,
+    0x48, 0xdb, 0x9e, 0xc4, 0xd8, 0x70, 0x29, 0xe6, 0x1e, 0x45, 0xc9, 0xc8, 0x41, 0x00, 0xac, 0x96, 0xf5, 0x08, 0xa8,
+    0xe9, 0xaa, 0xc8, 0x86, 0xff, 0x10, 0x89, 0x5b, 0x0a, 0xa1, 0xb7, 0x86, 0x4a, 0x47, 0xc3, 0xb2, 0xec, 0x5d, 0x30,
+    0xe7, 0xf0, 0x37, 0x79, 0x49, 0x41, 0xdc, 0x4d, 0xd5, 0xdf, 0xf7, 0x6b, 0x97, 0xee, 0x10, 0x9c, 0x79, 0xe3, 0xab,
+    0x69, 0xb6, 0xe2, 0x68, 0xdb, 0xeb, 0x92, 0x9f, 0x8f, 0xbd, 0x5f, 0x39, 0x36, 0x1a, 0x97, 0x54, 0x75, 0xd1, 0x22,
+    0x0e, 0xb3, 0xa9, 0xa3, 0x88, 0xb2, 0x7f, 0x73, 0x55, 0xb0, 0xe4, 0xdb, 0x9b, 0x83, 0x25, 0xfc, 0x96, 0xc1, 0x92,
+    0x6f, 0xff, 0xe0, 0x60, 0xc9, 0x37, 0x66, 0xb0, 0x04, 0x65, 0xe5, 0x8b, 0xcf, 0x89, 0x68, 0xe4, 0xd9, 0x59, 0x11,
+    0x76, 0xe4, 0xe1, 0x3c, 0x88, 0x9d, 0xff, 0x98, 0xd0, 0x06, 0x4c, 0xd4, 0x08, 0x6c, 0x50, 0x24, 0x43, 0xe4, 0x13,
+    0x82, 0x84, 0x97, 0x71, 0x84, 0xb6, 0x4e, 0xdc, 0x6b, 0xdd, 0x57, 0x37, 0x95, 0xc0, 0x6b, 0x73, 0x75, 0x38, 0xa7,
+    0xab, 0x22, 0x0d, 0x01, 0x7d, 0x6a, 0x54, 0x77, 0xec, 0x6e, 0xaa, 0x8c, 0x31, 0x73, 0x84, 0x9e, 0x3a, 0x08, 0x10,
+    0x1c, 0xb4, 0xb4, 0xff, 0xf3, 0x61, 0xa7, 0xb7, 0xdd, 0x99, 0x41, 0x6f, 0xd0, 0xa5, 0xf0, 0xd6, 0xee, 0x6d, 0x6f,
+    0xe3, 0xdb, 0x99, 0x7a, 0xeb, 0xe2, 0x5b, 0xac, 0xde, 0x76, 0xf0, 0x6d, 0xa4, 0xde, 0x1e, 0xe0, 0xdb, 0x58, 0xbd,
+    0x3d, 0xc4, 0xb7, 0x53, 0xbb, 0x3c, 0xe4, 0x1a, 0xb8, 0x87, 0xc0, 0x58, 0x64, 0xf0, 0x07, 0xaa, 0x0c, 0xf6, 0x2d,
+    0xde, 0xf0, 0x8b, 0x4e, 0x82, 0xd8, 0x13, 0x8e, 0x51, 0x90, 0x7b, 0x67, 0x20, 0xfc, 0x03, 0x4a, 0x68, 0x7b, 0x8a,
+    0x9f, 0x7a, 0x00, 0x3f, 0xe2, 0x20, 0x9e, 0x31, 0xf5, 0xcd, 0x5b, 0x85, 0x35, 0xd8, 0x92, 0x87, 0xed, 0x61, 0xd9,
+    0xd3, 0xeb, 0x24, 0x02, 0x29, 0x2a, 0x61, 0x80, 0x56, 0xae, 0xaa, 0x13, 0xd3, 0xb5, 0xf4, 0x0a, 0x5f, 0xa1, 0x4a,
+    0x0c, 0x57, 0x7a, 0x02, 0x36, 0x52, 0xeb, 0x1c, 0x9c, 0xaf, 0xb5, 0xea, 0x05, 0x21, 0xd2, 0x0a, 0x85, 0x70, 0xd2,
+    0x6f, 0x07, 0xd1, 0x89, 0x7e, 0x7e, 0x05, 0x46, 0x6f, 0x74, 0xc2, 0x6e, 0x52, 0x35, 0x04, 0xa2, 0xa9, 0x66, 0x14,
+    0x10, 0x64, 0x15, 0xc1, 0xd2, 0xa0, 0x13, 0x28, 0xd5, 0x0c, 0x52, 0xa7, 0xae, 0x78, 0x68, 0xfa, 0x7a, 0x11, 0x50,
+    0xb4, 0x2a, 0xd8, 0x05, 0xdb, 0x9b, 0x4a, 0x05, 0x85, 0xa1, 0x02, 0x0b, 0xae, 0xd5, 0x46, 0xda, 0x4f, 0xbe, 0x52,
+    0x27, 0x59, 0x4a, 0x1d, 0x99, 0x07, 0x08, 0xfa, 0xf4, 0x60, 0x55, 0x42, 0x7e, 0xd1, 0x19, 0xe1, 0x1f, 0x29, 0x7f,
+    0xbf, 0x98, 0x4c, 0x26, 0xd7, 0xaa, 0xa7, 0x2f, 0xc6, 0x13, 0xd6, 0x65, 0x3b, 0x3d, 0x0c, 0x2e, 0xb7, 0xa4, 0x44,
+    0xec, 0x94, 0x44, 0xbb, 0xe5, 0xed, 0x1a, 0xa3, 0xf0, 0x04, 0x8d, 0x75, 0x7b, 0x3d, 0x56, 0x02, 0x55, 0x96, 0x20,
+    0xbf, 0x4f, 0xe2, 0x34, 0x68, 0x97, 0xfe, 0xa9, 0x14, 0xfc, 0x5f, 0x3c, 0x7a, 0xf4, 0xa8, 0xf4, 0xc7, 0xea, 0xad,
+    0x3d, 0x1e, 0x97, 0xfe, 0x68, 0xa9, 0xd1, 0x68, 0xb7, 0x27, 0x93, 0xd2, 0x8f, 0x55, 0xc1, 0x76, 0x77, 0x34, 0xde,
+    0xee, 0x96, 0xfe, 0x99, 0xd1, 0xa2, 0xf4, 0x99, 0x7c, 0xcb, 0xd9, 0xb8, 0x16, 0xa1, 0x7e, 0xd8, 0x86, 0x4a, 0xc1,
+    0x68, 0x4b, 0x74, 0xf4, 0xc4, 0x63, 0x10, 0x2d, 0x78, 0x06, 0x36, 0x16, 0xf0, 0x36, 0x08, 0xe8, 0x89, 0x14, 0xef,
+    0xe2, 0x93, 0xb2, 0x28, 0xd4, 0x5f, 0x98, 0x32, 0x1d, 0x99, 0x99, 0xe4, 0x39, 0x27, 0x55, 0xd0, 0xac, 0x46, 0xce,
+    0xa2, 0xea, 0x17, 0x21, 0xaf, 0xa4, 0x3d, 0x4a, 0x1b, 0x6c, 0x29, 0x64, 0xfc, 0x8f, 0x57, 0xc9, 0xf8, 0x1f, 0x6e,
+    0x96, 0xf1, 0xc7, 0xb7, 0x13, 0xf1, 0x3f, 0xfc, 0xc1, 0x22, 0xfe, 0x47, 0x53, 0xc4, 0x0b, 0x21, 0xb6, 0x07, 0x56,
+    0x2c, 0x99, 0xaf, 0xc7, 0xd9, 0x79, 0x0b, 0xb7, 0x44, 0x6e, 0x93, 0xf4, 0xdc, 0xb8, 0x95, 0xf0, 0x5f, 0x93, 0x72,
+    0xa4, 0x06, 0x33, 0xbe, 0x4f, 0xcb, 0xb3, 0x93, 0x93, 0x84, 0x29, 0x19, 0x6f, 0x54, 0x90, 0x65, 0xfc, 0x26, 0x0d,
+    0xed, 0x37, 0xe0, 0xa4, 0x1a, 0x25, 0x93, 0x09, 0x14, 0x4d, 0x26, 0xb6, 0x4a, 0xc9, 0x05, 0x79, 0x46, 0xad, 0x5e,
+    0xd7, 0x4a, 0xa8, 0xd5, 0x57, 0x5f, 0x99, 0x65, 0x66, 0x81, 0x8c, 0x46, 0x99, 0xf6, 0x84, 0xac, 0x19, 0xc7, 0x05,
+    0xee, 0xc1, 0xea, 0x7b, 0xba, 0x68, 0xb2, 0xcc, 0x40, 0xa9, 0xc4, 0x23, 0xfc, 0x50, 0x4b, 0xf3, 0xdb, 0x25, 0x22,
+    0x7d, 0x7a, 0x15, 0xb9, 0xea, 0x88, 0xd5, 0xf8, 0x4c, 0x5e, 0x75, 0xac, 0x0a, 0x8b, 0x2f, 0x53, 0x28, 0x1e, 0x5f,
+    0xbc, 0x18, 0x3b, 0x7b, 0x60, 0xca, 0xc6, 0xc5, 0x9b, 0xb4, 0x91, 0x9a, 0x26, 0xc0, 0x0e, 0x43, 0x13, 0xd3, 0x52,
+    0x10, 0xac, 0xca, 0xd1, 0xaf, 0x2a, 0x7b, 0x46, 0x27, 0x99, 0xc1, 0x84, 0x43, 0x0e, 0x6a, 0x64, 0x09, 0xcc, 0xc1,
+    0xa4, 0x2e, 0xa4, 0xef, 0xa5, 0x8b, 0xbc, 0x8e, 0x53, 0xf9, 0x61, 0x6d, 0x3a, 0x15, 0x58, 0x4a, 0xfd, 0x21, 0x4f,
+    0xfc, 0xab, 0x9e, 0x18, 0x88, 0x17, 0x33, 0x8c, 0x4b, 0x15, 0x7c, 0x07, 0xc2, 0xcd, 0xf1, 0x2b, 0x40, 0x62, 0x08,
+    0x15, 0xe3, 0xae, 0xa8, 0x77, 0x79, 0x69, 0x7e, 0x8c, 0xb2, 0xf6, 0xe1, 0xc2, 0x06, 0x0f, 0x30, 0xfc, 0x8a, 0x2c,
+    0x6a, 0x83, 0x6c, 0xc1, 0x1d, 0x87, 0x5a, 0x39, 0x6e, 0xe9, 0xed, 0xb4, 0xdb, 0xa0, 0x62, 0x7c, 0xf1, 0xa9, 0x21,
+    0x47, 0x77, 0x96, 0xf8, 0x5e, 0x15, 0x52, 0x5f, 0xf9, 0xf4, 0x97, 0x26, 0x31, 0x7e, 0x9b, 0x44, 0x20, 0x6a, 0x5c,
+    0x4f, 0x51, 0x8b, 0xd8, 0x7c, 0xf7, 0x95, 0x1b, 0x67, 0x10, 0xd6, 0x5d, 0xc7, 0xc1, 0x32, 0x56, 0x56, 0x2f, 0xc4,
+    0xb6, 0xc2, 0xaa, 0x59, 0x05, 0xe7, 0x06, 0x9d, 0x59, 0x9c, 0x19, 0xb1, 0xe7, 0xda, 0x36, 0x28, 0x55, 0xf0, 0x59,
+    0x44, 0x90, 0xf7, 0x30, 0x4e, 0x2a, 0x7c, 0x60, 0x05, 0x74, 0xdd, 0xfb, 0x34, 0x20, 0x47, 0xbf, 0x54, 0x33, 0xba,
+    0xaa, 0x52, 0x05, 0xa5, 0x79, 0x7a, 0x60, 0x20, 0x43, 0x41, 0x60, 0x58, 0xe3, 0x54, 0xe8, 0x2d, 0x98, 0x86, 0x04,
+    0xb0, 0x76, 0xca, 0xd0, 0x33, 0xb1, 0x15, 0xd8, 0x42, 0x5a, 0x80, 0xd2, 0xc3, 0x0e, 0x7d, 0xab, 0x06, 0x7a, 0xba,
+    0x1a, 0x3b, 0xbe, 0xce, 0x4f, 0xbb, 0x38, 0xf2, 0x8b, 0x33, 0x0f, 0xfe, 0x59, 0x7f, 0x5a, 0x82, 0x94, 0x3f, 0xfe,
+    0x14, 0x73, 0x30, 0xaa, 0xe7, 0x2d, 0x8c, 0x84, 0x50, 0x28, 0x53, 0xaa, 0x43, 0x3a, 0xed, 0x14, 0xb7, 0x92, 0x7a,
+    0x8b, 0x02, 0xdd, 0x39, 0xf2, 0x5b, 0x82, 0x34, 0x4b, 0x59, 0xaf, 0x7e, 0xaa, 0x6d, 0xba, 0x0e, 0x8a, 0x58, 0xc3,
+    0x65, 0x86, 0xee, 0x1f, 0xbf, 0x00, 0xf7, 0x4f, 0xa8, 0xd1, 0xb6, 0xf2, 0x1b, 0xda, 0x6b, 0xdb, 0x07, 0x92, 0xb6,
+    0x9b, 0x64, 0x2d, 0xe4, 0xab, 0xfe, 0xd1, 0x55, 0xfe, 0xcd, 0x4d, 0x67, 0xbc, 0xdd, 0x9d, 0x1d, 0x4f, 0xfd, 0x33,
+    0x0e, 0xc7, 0x9b, 0xc5, 0x74, 0xc6, 0x7b, 0x1b, 0xc8, 0x82, 0x68, 0x82, 0x1f, 0xf1, 0xbb, 0x4d, 0xcb, 0x63, 0x4a,
+    0xb0, 0x5c, 0xa2, 0x5a, 0x0f, 0x3a, 0x8f, 0xc0, 0x61, 0xbb, 0xf5, 0xf0, 0xd7, 0xa3, 0x5f, 0x4a, 0x1a, 0xa9, 0x7b,
+    0xb2, 0xb6, 0xdd, 0x43, 0x79, 0x91, 0x44, 0x17, 0xe0, 0x37, 0x92, 0x8d, 0x71, 0x8c, 0x81, 0xdc, 0xde, 0x3c, 0x93,
+    0xc9, 0x0a, 0x39, 0x4b, 0xe8, 0x37, 0x65, 0xc8, 0xa5, 0xd8, 0x7e, 0x30, 0x3f, 0x57, 0xab, 0xd1, 0x69, 0x24, 0x21,
+    0xfc, 0xa1, 0xb9, 0x06, 0x57, 0x27, 0x37, 0xd4, 0xcf, 0xcb, 0x77, 0x00, 0x06, 0x61, 0xd8, 0xb4, 0x72, 0x01, 0x55,
+    0x1b, 0x4a, 0x8c, 0x6c, 0x8b, 0x6a, 0x20, 0xcb, 0xdf, 0x06, 0x55, 0x19, 0x15, 0xac, 0x87, 0x5f, 0x53, 0x8c, 0xc1,
+    0x3b, 0x95, 0xc6, 0xd3, 0x2c, 0x1e, 0x8f, 0x13, 0xd6, 0x53, 0xf6, 0x91, 0xd5, 0x79, 0x80, 0xc9, 0x0a, 0xe6, 0x92,
+    0xd5, 0x57, 0xc5, 0x20, 0x9e, 0xa6, 0x53, 0x74, 0x0c, 0xf6, 0x1a, 0x7e, 0x12, 0x71, 0x2d, 0x39, 0xe5, 0x29, 0x7e,
+    0xbb, 0x22, 0x1e, 0x3d, 0xd7, 0x71, 0xd9, 0x01, 0x63, 0x91, 0x16, 0xbc, 0xdd, 0xe3, 0xd9, 0x3c, 0x68, 0x6d, 0xd7,
+    0x11, 0xc1, 0x2a, 0x8d, 0x82, 0xb7, 0x06, 0x2d, 0x0f, 0xad, 0x03, 0xa1, 0xe5, 0x2c, 0xbf, 0x23, 0xcb, 0x68, 0x00,
+    0xfc, 0xec, 0x9e, 0x2e, 0x2a, 0xeb, 0xc8, 0xfc, 0xfb, 0xec, 0x96, 0x2f, 0xd7, 0xef, 0x96, 0x2f, 0xd5, 0x6e, 0xb9,
+    0x9e, 0x63, 0xbf, 0x98, 0x74, 0xf0, 0x4f, 0xaf, 0x42, 0x08, 0x56, 0x05, 0xc8, 0x61, 0xa1, 0x5d, 0xdc, 0xea, 0xc2,
+    0x7f, 0x34, 0x74, 0xdb, 0xc3, 0x3f, 0x3e, 0x58, 0x80, 0x6d, 0x0b, 0x0b, 0xf1, 0x5f, 0xbb, 0x56, 0xd5, 0xb9, 0x8f,
+    0x75, 0xd8, 0x6b, 0x67, 0xb5, 0xae, 0x7b, 0xfd, 0xa6, 0x05, 0x79, 0xc5, 0x9d, 0x40, 0x09, 0x63, 0x70, 0xd5, 0xa2,
+    0xe3, 0x63, 0x28, 0x9d, 0x64, 0xa3, 0x45, 0xf1, 0x77, 0x12, 0x7e, 0x49, 0xc4, 0x6b, 0xb7, 0x74, 0x63, 0x1c, 0xd5,
+    0x55, 0x64, 0xbe, 0xa8, 0x11, 0x96, 0x7a, 0x9d, 0x82, 0x02, 0x18, 0x93, 0x39, 0x5d, 0xff, 0xfe, 0x9a, 0x4d, 0xf0,
+    0x1f, 0xb2, 0x36, 0x6b, 0x91, 0xf9, 0xb7, 0x12, 0xe3, 0x5a, 0x22, 0x7c, 0x16, 0x0d, 0xcc, 0x35, 0x6c, 0x3f, 0x5a,
+    0x0f, 0xee, 0xa1, 0x9a, 0x69, 0xa8, 0x94, 0x82, 0xd4, 0x3b, 0xe0, 0x05, 0x44, 0x8b, 0x84, 0x5f, 0x3f, 0xea, 0x55,
+    0x9c, 0xb1, 0x32, 0xea, 0x35, 0x02, 0xbd, 0x6a, 0x7b, 0x4b, 0x29, 0xfd, 0xc5, 0x97, 0xf7, 0xf1, 0x8f, 0x88, 0x7d,
+    0x1d, 0x57, 0xbe, 0x91, 0x88, 0x0d, 0xa0, 0x6f, 0xb4, 0x51, 0x73, 0x7e, 0x84, 0x06, 0x27, 0xff, 0xe7, 0xb6, 0xad,
+    0xd1, 0x58, 0xbf, 0x55, 0x73, 0x69, 0x95, 0x7e, 0x56, 0xeb, 0xcf, 0x1b, 0xfc, 0x96, 0x6d, 0x47, 0xc2, 0x21, 0xa8,
+    0xb7, 0x95, 0xbf, 0xb5, 0x64, 0xa5, 0xb1, 0xa2, 0xf8, 0x6d, 0xdb, 0x57, 0x26, 0x31, 0xf5, 0xd8, 0x08, 0x8f, 0xb5,
+    0x13, 0x29, 0xcf, 0x9d, 0xb1, 0x87, 0xf0, 0x23, 0xff, 0xc2, 0xc2, 0x7b, 0xf8, 0xc1, 0x2f, 0xeb, 0x7c, 0x96, 0xa4,
+    0x60, 0x56, 0x4d, 0x39, 0x9f, 0x07, 0x5b, 0x5b, 0x67, 0x67, 0x67, 0xfe, 0xd9, 0xb6, 0x9f, 0xe5, 0x27, 0x5b, 0xdd,
+    0x76, 0xbb, 0x8d, 0xdf, 0x69, 0xb2, 0xad, 0xd3, 0x98, 0x9d, 0x3d, 0x06, 0xf7, 0xc3, 0x7e, 0x68, 0x3d, 0xb2, 0x1e,
+    0x6e, 0x5b, 0x3b, 0x0f, 0x6c, 0x8b, 0x14, 0x00, 0x94, 0x6c, 0xdb, 0x96, 0x50, 0x00, 0xa1, 0x0d, 0xc5, 0xfd, 0xdd,
+    0x13, 0x65, 0xc3, 0x61, 0x1e, 0xbc, 0xb0, 0x90, 0xc0, 0x7f, 0xcb, 0x3e, 0xb1, 0xfa, 0x56, 0x17, 0x65, 0x2d, 0xa9,
+    0x46, 0xd4, 0x2b, 0xee, 0xf7, 0x51, 0x34, 0x0f, 0x88, 0x8d, 0xcc, 0x42, 0x0c, 0x93, 0x89, 0x52, 0x9a, 0x02, 0xed,
+    0xd2, 0x63, 0x78, 0xc2, 0xcc, 0x29, 0x0b, 0x9e, 0x5f, 0x75, 0x1f, 0x82, 0x8e, 0x3b, 0x6d, 0xdd, 0x1f, 0xb5, 0x5b,
+    0x1d, 0xab, 0xd3, 0xea, 0xfa, 0x0f, 0xad, 0xae, 0xf8, 0x1f, 0x64, 0xe4, 0xb6, 0xd5, 0x81, 0xa7, 0x6d, 0x0b, 0xde,
+    0x4f, 0xef, 0x8b, 0xb4, 0x88, 0xc8, 0xde, 0xea, 0xef, 0xe2, 0xaf, 0x2d, 0x02, 0xa4, 0xbe, 0xb4, 0xc5, 0x2f, 0x5a,
+    0xb3, 0xbf, 0x30, 0x4b, 0x3b, 0x8f, 0xd6, 0x16, 0x77, 0x1f, 0xae, 0x2d, 0xde, 0x7e, 0xb0, 0xb6, 0xf8, 0xfe, 0x4e,
+    0xbd, 0x78, 0xeb, 0x44, 0x54, 0x69, 0xb9, 0x10, 0xda, 0xb3, 0x08, 0x18, 0xe5, 0xdc, 0xe9, 0x00, 0x9c, 0x6d, 0xab,
+    0x85, 0x3f, 0x1e, 0x76, 0x5d, 0xdd, 0xeb, 0x18, 0x7b, 0x69, 0x2c, 0x1f, 0x3e, 0x02, 0x2c, 0x9f, 0x77, 0x1f, 0x8c,
+    0xb0, 0x1d, 0x21, 0x0a, 0xff, 0x4e, 0xb7, 0x1f, 0x8d, 0x40, 0x23, 0x58, 0xf8, 0x0f, 0xfe, 0x4c, 0x77, 0xba, 0x23,
+    0xf1, 0xd2, 0xc6, 0xfa, 0x0f, 0x9d, 0x87, 0x05, 0x34, 0xc5, 0x3f, 0xbf, 0x69, 0x13, 0x1a, 0x0d, 0x78, 0x73, 0xdc,
+    0xfb, 0x40, 0xa3, 0x47, 0xd3, 0xae, 0xff, 0xe5, 0xe9, 0x43, 0xff, 0xd1, 0xb4, 0xf3, 0xf0, 0x83, 0x78, 0x4b, 0x80,
+    0x82, 0x5f, 0xe2, 0xbf, 0x0f, 0xdb, 0xed, 0x69, 0xab, 0xe3, 0x3f, 0x3a, 0xdd, 0xf6, 0xb7, 0x93, 0xd6, 0x03, 0xff,
+    0x11, 0xfe, 0xab, 0x86, 0x9b, 0x66, 0x33, 0x66, 0x5b, 0xb8, 0xde, 0x0d, 0xbf, 0xd7, 0x9c, 0xa3, 0x7b, 0xdf, 0xda,
+    0xb9, 0xff, 0xfc, 0x11, 0xac, 0xd1, 0xb4, 0xd3, 0x85, 0xff, 0xaf, 0x7a, 0xfc, 0x80, 0x84, 0x97, 0x03, 0x47, 0x0c,
+    0x33, 0x58, 0x15, 0xe1, 0xe8, 0x9b, 0x61, 0xf7, 0xbc, 0xef, 0xaf, 0x0a, 0x80, 0x30, 0x7e, 0x73, 0x90, 0x9b, 0xdf,
+    0x2e, 0x02, 0x42, 0x1f, 0xb4, 0xff, 0x03, 0x23, 0x20, 0xdf, 0x37, 0x83, 0xdc, 0xe7, 0xab, 0x79, 0x7b, 0x4d, 0x67,
+    0xed, 0x35, 0x73, 0x0e, 0xff, 0xc2, 0x86, 0x98, 0xad, 0x0d, 0xad, 0x39, 0x37, 0xe3, 0x41, 0x19, 0x6e, 0xe4, 0x73,
+    0x19, 0xf5, 0x2f, 0xf8, 0x15, 0x04, 0x89, 0x6f, 0x26, 0xc8, 0xaf, 0xb7, 0xa3, 0x47, 0xfc, 0x07, 0xd3, 0xa3, 0xe0,
+    0x06, 0x3d, 0x6a, 0x11, 0x77, 0x8a, 0x18, 0x90, 0xa3, 0xbf, 0x4f, 0xef, 0xce, 0xf7, 0xf8, 0xb5, 0xaf, 0x2d, 0x86,
+    0x25, 0x85, 0x2d, 0x72, 0x05, 0xdf, 0x7d, 0xce, 0x09, 0x81, 0x48, 0x68, 0x0e, 0x6d, 0x19, 0x84, 0x99, 0xe3, 0x67,
+    0x71, 0xd5, 0xcb, 0xa9, 0xb8, 0x34, 0x13, 0xd2, 0x8d, 0xb7, 0x1d, 0x1d, 0xc0, 0xc1, 0x1c, 0xf3, 0x70, 0x99, 0xf1,
+    0x08, 0x7f, 0xef, 0x12, 0x8f, 0x79, 0x82, 0xf7, 0x71, 0xe5, 0xdd, 0x35, 0x4c, 0x89, 0xfe, 0x16, 0xd3, 0xb9, 0xd5,
+    0x41, 0xc1, 0x0c, 0x83, 0x06, 0xaf, 0xd8, 0x38, 0x8e, 0x1c, 0xdb, 0x99, 0xc3, 0xae, 0x85, 0x31, 0x5b, 0xb5, 0x5c,
+    0x6a, 0x4a, 0xa3, 0x76, 0x6d, 0xf5, 0xab, 0x7e, 0x72, 0xfc, 0x74, 0x5a, 0x78, 0x28, 0x83, 0x8c, 0xb6, 0xf4, 0x02,
+    0x60, 0x7c, 0x55, 0x92, 0xa3, 0xc0, 0xaf, 0x2c, 0x07, 0x5b, 0x98, 0x0e, 0x1d, 0xbf, 0x0b, 0xae, 0x04, 0x15, 0xe3,
+    0xa7, 0xa8, 0x7e, 0x70, 0x5a, 0xdb, 0x60, 0xda, 0x18, 0xdd, 0xf4, 0x40, 0xc3, 0x95, 0x50, 0x92, 0x08, 0x10, 0x34,
+    0x4a, 0x3d, 0xfd, 0xbb, 0xcf, 0xaa, 0x90, 0x51, 0xf1, 0xf8, 0xe2, 0x40, 0x5e, 0x37, 0xb7, 0x31, 0x7a, 0x4b, 0x51,
+    0xfb, 0xea, 0x53, 0x57, 0x9b, 0xa0, 0x32, 0xe8, 0x17, 0x50, 0xd2, 0x19, 0x38, 0x6a, 0x05, 0xcc, 0xf6, 0xb6, 0xa4,
+    0xf7, 0x10, 0xda, 0x42, 0x27, 0x8c, 0xd9, 0x69, 0x3c, 0x92, 0xa2, 0xdd, 0xb3, 0xe4, 0x2d, 0x95, 0x16, 0x61, 0x11,
+    0x76, 0x3c, 0xe1, 0x3f, 0xc3, 0x0b, 0x6a, 0xb6, 0x30, 0xcd, 0xec, 0xfe, 0xbd, 0x9e, 0x86, 0xa4, 0x9e, 0x28, 0x6f,
+    0xe3, 0x6f, 0xc3, 0x3c, 0x04, 0x7f, 0xed, 0xef, 0xc2, 0x7b, 0xf8, 0xfb, 0x30, 0xef, 0x0d, 0x6d, 0xd7, 0x27, 0xc1,
+    0x78, 0xaf, 0xfa, 0xa5, 0x98, 0x28, 0x15, 0x36, 0x41, 0x87, 0x79, 0xb7, 0x55, 0x66, 0x52, 0x71, 0x75, 0x77, 0x2a,
+    0xc5, 0x05, 0xcf, 0x86, 0xa4, 0x02, 0x21, 0xda, 0xf5, 0x77, 0x0c, 0x71, 0x78, 0xda, 0xc2, 0x9f, 0x35, 0x81, 0x78,
+    0x1f, 0x1a, 0x28, 0x89, 0xf8, 0x12, 0x9a, 0x6f, 0x0b, 0xe1, 0x0b, 0xfd, 0x7e, 0x24, 0x71, 0x25, 0x44, 0x55, 0x9d,
+    0x63, 0xd6, 0x1c, 0x24, 0x89, 0x7c, 0x01, 0xdb, 0x33, 0x62, 0x4e, 0x82, 0x5d, 0x65, 0x44, 0xe5, 0x29, 0xf4, 0x75,
+    0xf4, 0x17, 0xa4, 0xd7, 0xd5, 0x79, 0xb5, 0xdd, 0xb3, 0x66, 0x0a, 0x64, 0xf8, 0xc6, 0x61, 0x15, 0xdd, 0x9a, 0x10,
+    0x5f, 0x52, 0x13, 0x5b, 0xb9, 0xfa, 0xd6, 0xdc, 0x9a, 0xec, 0x5c, 0x73, 0x53, 0xb0, 0x8a, 0x69, 0x68, 0x5f, 0x60,
+    0xfa, 0x0c, 0xfe, 0xac, 0x8a, 0xd5, 0x83, 0x64, 0x28, 0x3f, 0x89, 0xf0, 0x17, 0xc1, 0xd0, 0x8f, 0xb2, 0xda, 0x80,
+    0x9c, 0x3e, 0x95, 0x49, 0x90, 0xbe, 0x18, 0x97, 0x4d, 0x24, 0xc0, 0x66, 0xc0, 0xdf, 0x2b, 0x58, 0xdd, 0xd2, 0x90,
+    0xd7, 0x2f, 0x31, 0xb5, 0x60, 0x1c, 0xe7, 0x74, 0xab, 0x57, 0xe1, 0x5f, 0x8b, 0x6a, 0x56, 0xa4, 0xa6, 0x5d, 0xc9,
+    0x8a, 0x81, 0x8d, 0x45, 0x76, 0x20, 0x13, 0xd3, 0xcc, 0x6f, 0x45, 0x9b, 0xd7, 0x2e, 0xc7, 0x22, 0x27, 0x0d, 0xbf,
+    0xa5, 0x6f, 0x0b, 0x22, 0xdb, 0x20, 0xca, 0xae, 0xc4, 0x89, 0x0c, 0x1c, 0xbc, 0xad, 0x58, 0xfd, 0x72, 0x24, 0x73,
+    0xc3, 0xdb, 0xe6, 0x6a, 0xe9, 0x71, 0x69, 0x1d, 0x5c, 0x19, 0xc3, 0x3b, 0x66, 0x11, 0xf7, 0xa3, 0x94, 0xf2, 0x94,
+    0x1c, 0x43, 0x2c, 0x78, 0x1d, 0xb6, 0xed, 0x96, 0x20, 0x79, 0x8c, 0xdf, 0x1e, 0x25, 0x48, 0xef, 0x43, 0xa1, 0xca,
+    0x71, 0xfe, 0xbe, 0x96, 0xa2, 0x3b, 0xed, 0xf6, 0xdf, 0x1c, 0xec, 0x59, 0x62, 0x63, 0xef, 0x6e, 0xc1, 0xeb, 0x2e,
+    0x79, 0xc7, 0x22, 0x63, 0x23, 0x14, 0x19, 0x1b, 0x96, 0xc8, 0xf3, 0x12, 0x29, 0xad, 0x5b, 0x02, 0x6b, 0xdb, 0x62,
+    0xe9, 0x48, 0x84, 0xf5, 0x66, 0xe0, 0x41, 0xc4, 0xf8, 0x79, 0xb1, 0x2d, 0xec, 0xda, 0xc2, 0x85, 0xb7, 0x55, 0xf2,
+    0x8b, 0xb2, 0x19, 0x78, 0xaa, 0x82, 0x80, 0xa0, 0xe9, 0x99, 0xca, 0x83, 0x91, 0x43, 0xe9, 0x74, 0xd5, 0xd5, 0xd6,
+    0xc5, 0xe2, 0x78, 0x06, 0x62, 0x49, 0xe5, 0xae, 0xbc, 0x97, 0x1d, 0x76, 0x69, 0xaa, 0xfe, 0x51, 0xb9, 0x2e, 0x4a,
+    0x39, 0xed, 0xf4, 0x77, 0x23, 0x69, 0x03, 0xe1, 0x5e, 0x2e, 0x60, 0x33, 0x83, 0xea, 0x43, 0x43, 0xc3, 0x8f, 0xb3,
+    0xad, 0x33, 0x76, 0xdc, 0x8a, 0xe6, 0x71, 0x15, 0x12, 0x44, 0x8d, 0xd8, 0xdf, 0x55, 0xca, 0x51, 0xa6, 0x60, 0xca,
+    0xc7, 0xc8, 0x48, 0xee, 0x40, 0x42, 0x12, 0xc3, 0x96, 0x32, 0xde, 0x48, 0x86, 0x24, 0x2c, 0x06, 0x00, 0x4b, 0xfc,
+    0xac, 0xe2, 0x92, 0x52, 0x33, 0x94, 0x76, 0xff, 0xaf, 0xff, 0xfb, 0xff, 0xc8, 0x50, 0x23, 0xd0, 0x16, 0xc0, 0xc2,
+    0xec, 0x98, 0xea, 0xd4, 0x91, 0x9d, 0x83, 0x73, 0x1a, 0x8f, 0x5b, 0xd3, 0x28, 0x99, 0x00, 0x04, 0x05, 0x13, 0xb9,
+    0xfe, 0xb2, 0x1e, 0xb8, 0x42, 0x82, 0x65, 0x9e, 0xd8, 0x4b, 0xf0, 0xea, 0x45, 0xb8, 0x6c, 0xbf, 0x2b, 0xa7, 0x55,
+    0xe5, 0x12, 0x13, 0x83, 0x1b, 0x19, 0xae, 0x06, 0x0f, 0xd6, 0xb2, 0x5c, 0xd5, 0xef, 0x6a, 0x92, 0xc2, 0x84, 0xd5,
+    0x52, 0x5c, 0xa1, 0xa5, 0x3e, 0x1c, 0xf9, 0xd7, 0x7f, 0xfa, 0x2f, 0xff, 0x43, 0xbd, 0xe2, 0x99, 0xc7, 0x5f, 0xff,
+    0xf1, 0xef, 0xff, 0xdf, 0xff, 0xfd, 0xaf, 0x98, 0x41, 0x2c, 0xcf, 0x45, 0x68, 0x6b, 0x59, 0xd5, 0xa1, 0x88, 0xd8,
+    0x63, 0x56, 0xe5, 0x84, 0xd4, 0x53, 0x61, 0xf7, 0x69, 0x42, 0x62, 0x50, 0x09, 0x1d, 0xf1, 0x39, 0xa5, 0x4e, 0x13,
+    0xd5, 0xae, 0x21, 0x1f, 0x2c, 0xa5, 0x45, 0x47, 0xfd, 0xf6, 0x4e, 0xdb, 0xae, 0x96, 0xb7, 0x6f, 0xf4, 0xdd, 0xc2,
+    0x85, 0xb9, 0x55, 0x62, 0x8e, 0xaf, 0x97, 0x6d, 0xa9, 0x42, 0x5b, 0x58, 0x52, 0x56, 0xe5, 0x16, 0xc6, 0x9c, 0x97,
+    0xf8, 0x1a, 0x74, 0x8d, 0x62, 0x5a, 0xe5, 0x5a, 0x9f, 0xde, 0x2f, 0x0b, 0x40, 0x74, 0x82, 0x4b, 0x23, 0x02, 0x68,
+    0x74, 0x9e, 0xda, 0x42, 0x6b, 0x25, 0xb9, 0x28, 0x69, 0x14, 0xe1, 0xe1, 0xdc, 0x7f, 0xf4, 0xb7, 0xe5, 0x9f, 0x67,
+    0x68, 0x25, 0x58, 0xce, 0x2c, 0x3a, 0x97, 0x7e, 0xcf, 0x83, 0x76, 0x7b, 0x7e, 0xee, 0x2e, 0xab, 0x19, 0xbc, 0xab,
+    0x26, 0xa3, 0xa0, 0x9b, 0x39, 0x20, 0x1d, 0xc4, 0xea, 0xf8, 0x1e, 0x98, 0xfa, 0x6d, 0x0c, 0x07, 0x95, 0xe5, 0x9f,
+    0x96, 0x14, 0x62, 0x8a, 0x7f, 0xc3, 0x03, 0x53, 0x19, 0x8d, 0x83, 0x12, 0x03, 0x8b, 0xa5, 0xd1, 0xab, 0x2b, 0x7a,
+    0x4d, 0x3b, 0xab, 0x29, 0x2b, 0xe6, 0x81, 0xaf, 0x79, 0x54, 0x7b, 0x1f, 0x0f, 0x5f, 0xa7, 0x1d, 0x6f, 0xda, 0x5d,
+    0xea, 0xe1, 0x39, 0xcf, 0x66, 0xe6, 0x09, 0x2f, 0x8b, 0xd8, 0x88, 0x4d, 0x54, 0x14, 0x53, 0xd6, 0x8b, 0xd3, 0xdb,
+    0xf2, 0x0b, 0xdc, 0x6e, 0x40, 0xdb, 0x2c, 0xe2, 0x01, 0x31, 0x6d, 0xcf, 0x3c, 0x03, 0x8e, 0xf0, 0x74, 0x3d, 0x5b,
+    0x1a, 0x73, 0xf5, 0x44, 0x53, 0x8c, 0x15, 0xd6, 0xd3, 0x81, 0x4a, 0x9f, 0xba, 0x9b, 0x43, 0x89, 0x50, 0xc3, 0xaf,
+    0xf2, 0x68, 0xf5, 0x5d, 0xcd, 0x47, 0x97, 0xa2, 0x19, 0xdc, 0xe2, 0xb5, 0xf5, 0x42, 0x4d, 0x8a, 0xda, 0x0f, 0x60,
+    0xfd, 0x10, 0x98, 0x76, 0xb3, 0x15, 0x15, 0x62, 0xab, 0x77, 0xe1, 0xaf, 0xda, 0x1e, 0x8f, 0xe6, 0x73, 0x6a, 0xe8,
+    0x02, 0x37, 0x92, 0x5d, 0x8d, 0x92, 0x82, 0xd2, 0x06, 0xc4, 0x29, 0xbd, 0x6c, 0x23, 0xd9, 0x56, 0x3c, 0xc9, 0xf3,
+    0x7b, 0xfa, 0xd5, 0xdf, 0xff, 0x1f, 0x2a, 0x12, 0x27, 0x08, 0x10, 0x7c, 0x00, 0x00};
 
 }  // namespace web_server
 }  // namespace esphome

From 9682e60a25e489ff0391d3049648d7e0e80795fc Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 10 Nov 2022 07:42:14 +1300
Subject: [PATCH 231/838] Update set-output to use new GITHUB_OUTPUT (#4008)

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 65d170f5d3..432aee9938 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
             today="$(date --utc '+%Y%m%d')"
             TAG="${TAG}${today}"
           fi
-          echo "::set-output name=tag::${TAG}"
+          echo "tag=${TAG}" >> $GITHUB_OUTPUT
         # yamllint enable rule:line-length
 
   deploy-pypi:

From cc7cf73d590589925a6a1e64a08778694f89158f Mon Sep 17 00:00:00 2001
From: maringeph <maringeph@yahoo.com>
Date: Wed, 9 Nov 2022 21:40:13 +0100
Subject: [PATCH 232/838] Add cover toggle support to current based cover
 (#3950)

---
 .../current_based/current_based_cover.cpp       | 17 +++++++++++++++++
 .../current_based/current_based_cover.h         |  2 ++
 tests/test3.yaml                                |  2 ++
 3 files changed, 21 insertions(+)

diff --git a/esphome/components/current_based/current_based_cover.cpp b/esphome/components/current_based/current_based_cover.cpp
index 4a52770bcf..3d7a9b8425 100644
--- a/esphome/components/current_based/current_based_cover.cpp
+++ b/esphome/components/current_based/current_based_cover.cpp
@@ -13,6 +13,7 @@ using namespace esphome::cover;
 CoverTraits CurrentBasedCover::get_traits() {
   auto traits = CoverTraits();
   traits.set_supports_position(true);
+  traits.set_supports_toggle(true);
   traits.set_is_assumed_state(false);
   return traits;
 }
@@ -20,6 +21,20 @@ void CurrentBasedCover::control(const CoverCall &call) {
   if (call.get_stop()) {
     this->direction_idle_();
   }
+  if (call.get_toggle().has_value()) {
+    if (this->current_operation != COVER_OPERATION_IDLE) {
+      this->start_direction_(COVER_OPERATION_IDLE);
+      this->publish_state();
+    } else {
+      if (this->position == COVER_CLOSED || this->last_operation_ == COVER_OPERATION_CLOSING) {
+        this->target_position_ = COVER_OPEN;
+        this->start_direction_(COVER_OPERATION_OPENING);
+      } else {
+        this->target_position_ = COVER_CLOSED;
+        this->start_direction_(COVER_OPERATION_CLOSING);
+      }
+    }
+  }
   if (call.get_position().has_value()) {
     auto pos = *call.get_position();
     if (pos == this->position) {
@@ -202,9 +217,11 @@ void CurrentBasedCover::start_direction_(CoverOperation dir) {
       trig = this->stop_trigger_;
       break;
     case COVER_OPERATION_OPENING:
+      this->last_operation_ = dir;
       trig = this->open_trigger_;
       break;
     case COVER_OPERATION_CLOSING:
+      this->last_operation_ = dir;
       trig = this->close_trigger_;
       break;
     default:
diff --git a/esphome/components/current_based/current_based_cover.h b/esphome/components/current_based/current_based_cover.h
index 220b770c05..b172e762b0 100644
--- a/esphome/components/current_based/current_based_cover.h
+++ b/esphome/components/current_based/current_based_cover.h
@@ -89,6 +89,8 @@ class CurrentBasedCover : public cover::Cover, public Component {
   uint32_t start_dir_time_{0};
   uint32_t last_publish_time_{0};
   float target_position_{0};
+
+  cover::CoverOperation last_operation_{cover::COVER_OPERATION_OPENING};
 };
 
 }  // namespace current_based
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 8150f43e02..da704d90a3 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -884,6 +884,7 @@ binary_sensor:
       then:
         - cover.toggle: time_based_cover
         - cover.toggle: endstop_cover
+        - cover.toggle: current_based_cover
   - platform: hydreon_rgxx
     hydreon_rgxx_id: hydreon_rg9
     too_cold:
@@ -1246,6 +1247,7 @@ cover:
     close_duration: 4.5min
   - platform: current_based
     name: Current Based Cover
+    id: current_based_cover
     open_sensor: ade7953_current_a
     open_moving_current_threshold: 0.5
     open_obstacle_current_threshold: 0.8

From 22f81475dbf8e02e590a733ff77a7acc73c24cb6 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 10 Nov 2022 09:42:03 +1300
Subject: [PATCH 233/838] Add option for dashboard command to only generate the
 project and supporting files (#3981)

---
 esphome/dashboard/dashboard.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index d551c9da4b..b7c24f9e2e 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -313,7 +313,11 @@ class EsphomeUploadHandler(EsphomeCommandWebSocket):
 class EsphomeCompileHandler(EsphomeCommandWebSocket):
     def build_command(self, json_message):
         config_file = settings.rel_path(json_message["configuration"])
-        return ["esphome", "--dashboard", "compile", config_file]
+        command = ["esphome", "--dashboard", "compile"]
+        if json_message.get("only_generate", False):
+            command.append("--only-generate")
+        command.append(config_file)
+        return command
 
 
 class EsphomeValidateHandler(EsphomeCommandWebSocket):

From 31b62d7dca584449437303e831243351d5a47386 Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Wed, 9 Nov 2022 22:59:42 +0100
Subject: [PATCH 234/838] Fix local webserver based on
 esphome/esphome-webserver#17 (#3958)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
fixes https://github.com/esphome/issues/issues/3720
---
 esphome/components/web_server/server_index.h | 1145 +++++++++---------
 1 file changed, 573 insertions(+), 572 deletions(-)

diff --git a/esphome/components/web_server/server_index.h b/esphome/components/web_server/server_index.h
index c02ef279b7..88c62baf50 100644
--- a/esphome/components/web_server/server_index.h
+++ b/esphome/components/web_server/server_index.h
@@ -7,581 +7,582 @@ namespace web_server {
 
 const uint8_t INDEX_GZ[] PROGMEM = {
     0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xbd, 0x7d, 0xd9, 0x76, 0xdb, 0xc8, 0x92, 0xe0, 0xf3,
-    0x9c, 0x33, 0x7f, 0x30, 0x2f, 0x30, 0x4a, 0x6d, 0x03, 0x25, 0x10, 0x22, 0x29, 0xcb, 0x76, 0x81, 0x02, 0x79, 0xe5,
-    0xa5, 0xae, 0x5d, 0xe5, 0xad, 0x2c, 0xd9, 0x75, 0xab, 0x54, 0x2c, 0x0b, 0x22, 0x93, 0x22, 0xca, 0x20, 0xc0, 0x02,
-    0x92, 0x5a, 0x8a, 0x42, 0x9f, 0x7e, 0xea, 0xa7, 0x39, 0x67, 0xd6, 0x87, 0x7e, 0x99, 0xd3, 0xfd, 0x30, 0x1f, 0x31,
-    0xcf, 0xfd, 0x29, 0xf7, 0x07, 0xa6, 0x3f, 0x61, 0x22, 0x22, 0x17, 0x24, 0x40, 0x6a, 0x71, 0x75, 0xcd, 0x3d, 0x5e,
-    0x04, 0xe4, 0x1a, 0x11, 0x19, 0x19, 0x5b, 0x46, 0x42, 0xbb, 0x77, 0xc6, 0xd9, 0x88, 0x5f, 0xcc, 0x99, 0x35, 0xe5,
-    0xb3, 0xa4, 0xbf, 0x2b, 0xff, 0x67, 0xd1, 0xb8, 0xbf, 0x9b, 0xc4, 0xe9, 0x27, 0x2b, 0x67, 0x49, 0x18, 0x8f, 0xb2,
-    0xd4, 0x9a, 0xe6, 0x6c, 0x12, 0x8e, 0x23, 0x1e, 0x05, 0xf1, 0x2c, 0x3a, 0x61, 0xd6, 0x56, 0x7f, 0x77, 0xc6, 0x78,
-    0x64, 0x8d, 0xa6, 0x51, 0x5e, 0x30, 0x1e, 0xbe, 0x3f, 0xf8, 0xba, 0xf5, 0xa8, 0xbf, 0x5b, 0x8c, 0xf2, 0x78, 0xce,
-    0x2d, 0x1c, 0x32, 0x9c, 0x65, 0xe3, 0x45, 0xc2, 0xfa, 0xa7, 0x51, 0x6e, 0x9d, 0xb3, 0xf0, 0xcd, 0xf1, 0x2f, 0x6c,
-    0xc4, 0xfd, 0x31, 0x9b, 0xc4, 0x29, 0x7b, 0x9b, 0x67, 0x73, 0x96, 0xf3, 0x0b, 0xef, 0xd9, 0xfa, 0x8a, 0x98, 0x15,
-    0xde, 0xbe, 0xae, 0x3a, 0x61, 0xfc, 0xcd, 0x59, 0xaa, 0xfa, 0x3c, 0x65, 0x62, 0x92, 0x2c, 0x2f, 0x3c, 0x7e, 0x45,
-    0x9b, 0xfd, 0x8b, 0xd9, 0x71, 0x96, 0x14, 0xde, 0x27, 0x5d, 0x3f, 0xcf, 0x33, 0x9e, 0x21, 0x58, 0xfe, 0x34, 0x2a,
-    0x8c, 0x96, 0xde, 0x93, 0x35, 0x4d, 0xe6, 0xb2, 0xf2, 0x45, 0xf1, 0x2c, 0x5d, 0xcc, 0x58, 0x1e, 0x1d, 0x27, 0xcc,
-    0x2b, 0x58, 0xe8, 0x30, 0x8f, 0x7b, 0xb1, 0x1b, 0xf6, 0xb9, 0x15, 0xa7, 0x16, 0x1b, 0x9c, 0x33, 0x2a, 0x59, 0x32,
-    0xdd, 0x2a, 0xb8, 0xd3, 0xf6, 0x80, 0x5c, 0x93, 0xf8, 0x64, 0xa1, 0xdf, 0xcf, 0xf2, 0x98, 0xab, 0xe7, 0xd3, 0x28,
-    0x59, 0xb0, 0x20, 0x2e, 0xdd, 0x80, 0x1d, 0xf2, 0x61, 0x18, 0x7b, 0x4f, 0x68, 0x50, 0x18, 0x72, 0x39, 0xc9, 0x72,
-    0x07, 0x69, 0x15, 0xe3, 0xd8, 0xfc, 0xf2, 0xd2, 0xe1, 0xe1, 0xb2, 0x74, 0xdd, 0x4f, 0xcc, 0x1f, 0x45, 0x49, 0xe2,
-    0xe0, 0xc4, 0x77, 0xef, 0x16, 0x38, 0x63, 0xec, 0xf1, 0xc3, 0x78, 0xe8, 0xf6, 0xe2, 0x89, 0xc3, 0x99, 0x5b, 0xf5,
-    0xcb, 0x26, 0x16, 0x67, 0x0e, 0x77, 0xdd, 0x27, 0x57, 0xf7, 0xc9, 0x19, 0x5f, 0xe4, 0x00, 0x7b, 0xe9, 0xbd, 0x51,
-    0x33, 0x3f, 0xc3, 0xfa, 0x7d, 0xea, 0xd8, 0x03, 0xd8, 0x0b, 0x6e, 0x7d, 0x08, 0xcf, 0xe2, 0x74, 0x9c, 0x9d, 0xf9,
-    0xfb, 0xd3, 0x08, 0x7e, 0xbc, 0xcb, 0x32, 0x7e, 0xf7, 0xae, 0x73, 0x9a, 0xc5, 0x63, 0xab, 0x1d, 0x86, 0x66, 0xe5,
-    0xc5, 0x93, 0xfd, 0xfd, 0xcb, 0xcb, 0x46, 0x81, 0x9f, 0x46, 0x3c, 0x3e, 0x65, 0xa2, 0x33, 0x00, 0x60, 0xc3, 0xcf,
-    0x39, 0x67, 0xe3, 0x7d, 0x7e, 0x91, 0x40, 0x29, 0x63, 0xbc, 0xb0, 0x01, 0xc7, 0xa7, 0xd9, 0x08, 0xc8, 0x96, 0x1a,
-    0x84, 0x87, 0xa6, 0x39, 0x9b, 0x27, 0xd1, 0x88, 0x61, 0x3d, 0x8c, 0x54, 0xf5, 0xa8, 0x1a, 0x79, 0x5f, 0x87, 0x62,
-    0x79, 0x1d, 0xd7, 0x8b, 0x59, 0x98, 0xb2, 0x33, 0xeb, 0x55, 0x34, 0xef, 0x8d, 0x92, 0xa8, 0x28, 0x80, 0x5f, 0x97,
-    0x84, 0x42, 0xbe, 0x18, 0x01, 0x83, 0x10, 0x82, 0x4b, 0x24, 0xd3, 0x34, 0x2e, 0xfc, 0x8f, 0x1b, 0xa3, 0xa2, 0x78,
-    0xc7, 0x8a, 0x45, 0xc2, 0x37, 0x42, 0x58, 0x0b, 0x7e, 0x27, 0x0c, 0xbf, 0x76, 0xf9, 0x34, 0xcf, 0xce, 0xac, 0x67,
-    0x79, 0x0e, 0xcd, 0x6d, 0x98, 0x52, 0x34, 0xb0, 0xe2, 0xc2, 0x4a, 0x33, 0x6e, 0xe9, 0xc1, 0x70, 0x01, 0x7d, 0xeb,
-    0x7d, 0xc1, 0xac, 0xa3, 0x45, 0x5a, 0x44, 0x13, 0x06, 0x4d, 0x8f, 0xac, 0x2c, 0xb7, 0x8e, 0x60, 0xd0, 0x23, 0x58,
-    0xb2, 0x82, 0xc3, 0xae, 0xf1, 0x6d, 0xb7, 0x47, 0x73, 0x41, 0xe1, 0x01, 0x3b, 0xe7, 0x21, 0x2b, 0x81, 0x31, 0xad,
-    0x42, 0xa3, 0xe1, 0xb8, 0xcb, 0x04, 0x0a, 0x58, 0x18, 0x33, 0x64, 0x59, 0xc7, 0x6c, 0xac, 0x17, 0xe7, 0xc3, 0xdd,
-    0xbb, 0x9a, 0xd6, 0x40, 0x13, 0x07, 0xda, 0x16, 0x8d, 0xb6, 0x9e, 0x40, 0xbc, 0x46, 0x22, 0xd7, 0x63, 0xbe, 0x24,
-    0xdf, 0xfe, 0x45, 0x3a, 0xaa, 0x8f, 0x0d, 0x95, 0x25, 0xcf, 0xf6, 0x79, 0x1e, 0xa7, 0x27, 0x00, 0x84, 0x9c, 0xc9,
-    0x6c, 0x52, 0x96, 0x62, 0xf1, 0xdf, 0xb0, 0x90, 0x85, 0x7d, 0x1c, 0x3d, 0x67, 0x8e, 0x5d, 0x50, 0x0f, 0x3b, 0x0c,
-    0x91, 0xf4, 0xc0, 0x60, 0x6c, 0xc0, 0x02, 0xb6, 0x69, 0xdb, 0xde, 0xd7, 0xae, 0x77, 0x81, 0x1c, 0xe4, 0xfb, 0x3e,
-    0xb1, 0xaf, 0xe8, 0x1c, 0x87, 0x1d, 0x04, 0xda, 0x4f, 0x58, 0x7a, 0xc2, 0xa7, 0x03, 0x76, 0xd8, 0x1e, 0x06, 0x1c,
-    0xa0, 0x1a, 0x2f, 0x46, 0xcc, 0x41, 0x7e, 0xf4, 0x72, 0xdc, 0x3e, 0x9b, 0x0e, 0x4c, 0x81, 0x0b, 0x73, 0x87, 0x70,
-    0xac, 0x2d, 0x8d, 0xab, 0x58, 0x54, 0x01, 0x86, 0x7c, 0x6e, 0xc3, 0x0e, 0x3b, 0x66, 0xb9, 0x01, 0x87, 0x6e, 0xd6,
-    0xab, 0xad, 0xe0, 0x02, 0x56, 0x08, 0xfa, 0x59, 0x93, 0x45, 0x3a, 0xe2, 0x31, 0x08, 0x2e, 0x7b, 0x13, 0xc0, 0x15,
-    0x2b, 0xa7, 0x17, 0xce, 0x76, 0x4b, 0xd7, 0x89, 0xdd, 0x4d, 0x76, 0x98, 0x6f, 0x76, 0x86, 0x1e, 0x42, 0xa9, 0x89,
-    0x2f, 0x11, 0x8f, 0x01, 0xc1, 0xd2, 0x7b, 0xcb, 0xf4, 0xf6, 0xfc, 0x30, 0x60, 0xfe, 0x2a, 0x1f, 0x87, 0xdc, 0x9f,
-    0x45, 0x73, 0xc4, 0x86, 0x11, 0x0f, 0x44, 0xe9, 0x08, 0xa1, 0xab, 0xad, 0x0b, 0x52, 0xcc, 0xaf, 0x58, 0xc0, 0x05,
-    0x82, 0xc0, 0x9e, 0x7d, 0x16, 0x8d, 0xa6, 0xb0, 0xc5, 0x2b, 0xc2, 0x8d, 0xd5, 0x76, 0x18, 0xe5, 0x2c, 0xe2, 0xec,
-    0x59, 0xc2, 0xf0, 0x0d, 0x57, 0x00, 0x7a, 0xda, 0xae, 0x97, 0xab, 0x7d, 0x97, 0xc4, 0xfc, 0x75, 0x06, 0xf3, 0xf4,
-    0x04, 0x93, 0x00, 0x17, 0xe7, 0x77, 0xef, 0xc6, 0xc8, 0x22, 0x7b, 0x1c, 0x56, 0xeb, 0x78, 0x01, 0x42, 0xc0, 0x4e,
-    0xb1, 0x85, 0x0d, 0xd4, 0xf6, 0x62, 0x9f, 0x03, 0x11, 0x9f, 0x64, 0x29, 0x87, 0xe1, 0x00, 0x5e, 0xcd, 0x41, 0x7e,
-    0x34, 0x9f, 0xb3, 0x74, 0xfc, 0x64, 0x1a, 0x27, 0x63, 0xa0, 0x46, 0x09, 0xf8, 0x66, 0x2c, 0x04, 0x3c, 0x01, 0x99,
-    0xe0, 0x7a, 0x8c, 0x68, 0xf9, 0x90, 0x91, 0x79, 0x68, 0xdb, 0x3d, 0x94, 0x40, 0x12, 0x0b, 0x94, 0x41, 0xb4, 0x70,
-    0xef, 0x40, 0xf4, 0x17, 0x2e, 0xdf, 0x0c, 0x63, 0xbd, 0x8c, 0x92, 0xc0, 0x6f, 0x50, 0xd2, 0x00, 0xfd, 0x19, 0xc8,
-    0xc0, 0x1e, 0x0a, 0xae, 0xef, 0xa5, 0xd4, 0x49, 0x99, 0xc2, 0x10, 0x08, 0x30, 0x42, 0x09, 0x22, 0x69, 0xf0, 0x36,
-    0x4b, 0x2e, 0x26, 0x71, 0x92, 0xec, 0x2f, 0xe6, 0xf3, 0x2c, 0xe7, 0xde, 0x37, 0xe1, 0x92, 0x67, 0x15, 0xae, 0xb4,
-    0xc9, 0x8b, 0xb3, 0x98, 0x23, 0x41, 0xdd, 0xe5, 0x28, 0x82, 0xa5, 0x7e, 0x9c, 0x65, 0x09, 0x8b, 0x52, 0x40, 0x83,
-    0x0d, 0x6c, 0x3b, 0x48, 0x17, 0x49, 0xd2, 0x3b, 0x86, 0x61, 0x3f, 0xf5, 0xa8, 0x5a, 0x48, 0xfc, 0x80, 0x9e, 0xf7,
-    0xf2, 0x3c, 0xba, 0x80, 0x86, 0xd8, 0x06, 0x78, 0x11, 0x56, 0xeb, 0x9b, 0xfd, 0x37, 0xaf, 0x7d, 0xc1, 0xf8, 0xf1,
-    0xe4, 0x02, 0x00, 0x2d, 0x2b, 0xa9, 0x39, 0xc9, 0xb3, 0x59, 0x63, 0x6a, 0xa4, 0x43, 0x1c, 0xb2, 0xde, 0x15, 0x20,
-    0xc4, 0x34, 0x32, 0xac, 0x12, 0x33, 0x21, 0x78, 0x4d, 0xfc, 0x2c, 0x2b, 0x71, 0x0f, 0x0c, 0xf0, 0x21, 0x10, 0xc5,
-    0x30, 0xe5, 0xf5, 0xd0, 0xf2, 0xfc, 0x62, 0x19, 0x87, 0x04, 0xe7, 0x1c, 0xf5, 0x2f, 0xc2, 0x38, 0x8a, 0x60, 0xf6,
-    0xa5, 0x18, 0xb0, 0x54, 0x10, 0xc7, 0x65, 0xe9, 0x25, 0x9a, 0x89, 0x51, 0xe2, 0xa1, 0x40, 0xe1, 0xb0, 0x8d, 0x2e,
-    0x2f, 0x19, 0xbc, 0xb8, 0xde, 0xb7, 0xe1, 0x32, 0x52, 0xf8, 0xa0, 0x86, 0xc2, 0xfd, 0x15, 0x08, 0x39, 0x81, 0x9a,
-    0xec, 0x14, 0xf4, 0x20, 0xc0, 0xf9, 0x8d, 0x07, 0xfa, 0x3f, 0x41, 0x28, 0xee, 0x74, 0x3c, 0xd0, 0xa0, 0x4f, 0xa6,
-    0x51, 0x7a, 0xc2, 0xc6, 0x41, 0xc2, 0x4a, 0x29, 0x79, 0xf7, 0x2c, 0x58, 0x63, 0x60, 0xa7, 0xc2, 0x7a, 0x7e, 0xf0,
-    0xea, 0xa5, 0x5c, 0xb9, 0x9a, 0x30, 0x86, 0x45, 0x5a, 0x80, 0x5a, 0x05, 0xb1, 0x2d, 0xc5, 0xf1, 0x33, 0xae, 0xa4,
-    0xb7, 0x28, 0x89, 0x8b, 0xf7, 0x73, 0x30, 0x31, 0xd8, 0x5b, 0x18, 0x06, 0xa6, 0x0f, 0x61, 0x2a, 0x2a, 0x87, 0xf9,
-    0x44, 0xc5, 0x58, 0x17, 0x41, 0x67, 0x81, 0xa9, 0x78, 0xcd, 0x1c, 0xb7, 0x04, 0x56, 0xe5, 0xf1, 0xc8, 0x8a, 0xc6,
-    0xe3, 0x17, 0x69, 0xcc, 0xe3, 0x28, 0x89, 0x7f, 0x23, 0x4a, 0x2e, 0x91, 0xc7, 0x78, 0x4f, 0x2e, 0x02, 0xe0, 0x4e,
-    0x3d, 0x12, 0x57, 0x09, 0xd9, 0x3b, 0x44, 0x0c, 0x21, 0x2d, 0x93, 0xf0, 0x70, 0x28, 0xc1, 0x4b, 0xfc, 0xf9, 0xa2,
-    0x98, 0x22, 0x61, 0xe5, 0xc0, 0x28, 0xc8, 0xb3, 0xe3, 0x82, 0xe5, 0xa7, 0x6c, 0xac, 0x39, 0xa0, 0x00, 0xac, 0xa8,
-    0x39, 0x18, 0x2f, 0x34, 0xa3, 0xa3, 0x74, 0x28, 0x83, 0xa1, 0x7a, 0xa6, 0x98, 0x65, 0x92, 0x99, 0xb5, 0x85, 0xa3,
-    0xa5, 0x80, 0x23, 0x8c, 0x0a, 0x29, 0x09, 0xf2, 0x50, 0x61, 0x38, 0x05, 0x29, 0x04, 0x5a, 0xc1, 0xdc, 0xe6, 0x4a,
-    0x93, 0x3d, 0x5b, 0x90, 0x4a, 0xc8, 0xa1, 0x23, 0x6c, 0x64, 0x82, 0x34, 0x77, 0x61, 0x57, 0x81, 0x94, 0x97, 0xe0,
-    0x0a, 0x29, 0xa2, 0xcc, 0x1c, 0x64, 0x80, 0xf0, 0x5b, 0xa1, 0x0b, 0x7d, 0x6c, 0x41, 0x6c, 0xe0, 0xeb, 0x95, 0x07,
-    0xc2, 0x4a, 0xbc, 0x2b, 0x44, 0xbc, 0x2b, 0xc0, 0xc6, 0x89, 0x91, 0x9f, 0xbc, 0x3b, 0xdc, 0x4f, 0xb3, 0xbd, 0xd1,
-    0x88, 0x15, 0x45, 0x06, 0xb0, 0xdd, 0xa1, 0xf6, 0x57, 0x19, 0x5a, 0x40, 0x49, 0x57, 0xcb, 0x3a, 0xbb, 0x20, 0x0d,
-    0x6e, 0xaa, 0x15, 0xa5, 0xd3, 0x03, 0xfb, 0xe3, 0x47, 0x90, 0xd9, 0x9e, 0x24, 0x03, 0x50, 0x7d, 0xd5, 0xf0, 0x13,
-    0xf6, 0x4c, 0x9d, 0x32, 0x6b, 0xed, 0x4b, 0xa7, 0x0e, 0x92, 0x07, 0xc3, 0xba, 0xa5, 0xb1, 0xa0, 0x6b, 0x87, 0xc6,
-    0xd5, 0x90, 0x0a, 0x72, 0x79, 0x42, 0x2a, 0xdb, 0x58, 0x46, 0xb0, 0xda, 0x4a, 0x8f, 0x48, 0xaf, 0xb0, 0x29, 0x08,
-    0xd0, 0x43, 0x36, 0xec, 0xc9, 0xfa, 0x30, 0x17, 0x94, 0xcb, 0xd9, 0xaf, 0x0b, 0x56, 0x70, 0xc1, 0xba, 0x30, 0x6e,
-    0x01, 0xe3, 0x96, 0x2b, 0xd6, 0x61, 0xcd, 0x76, 0x5c, 0x07, 0xdb, 0x9b, 0x39, 0xea, 0xb1, 0x02, 0x39, 0xf9, 0x7a,
-    0x76, 0x42, 0x58, 0x99, 0x7b, 0x79, 0xf9, 0xad, 0x1a, 0xa4, 0x5a, 0x4a, 0x6d, 0x03, 0x35, 0xd6, 0xc4, 0x56, 0x4d,
-    0xc6, 0xb6, 0x2b, 0x15, 0xea, 0x9d, 0x4e, 0xaf, 0xc6, 0x07, 0xb0, 0xe7, 0xda, 0x9a, 0xa5, 0x2b, 0x63, 0xfb, 0xad,
-    0xa2, 0xe9, 0x1b, 0x31, 0x32, 0x59, 0xa3, 0xec, 0x66, 0xee, 0x51, 0x3b, 0x1e, 0xda, 0xae, 0xd4, 0x55, 0x82, 0x61,
-    0x51, 0x17, 0x0c, 0x4d, 0xa8, 0xe7, 0xba, 0x8b, 0xad, 0x99, 0x8a, 0x85, 0x6a, 0xad, 0x95, 0x03, 0xc1, 0xc3, 0x43,
-    0x30, 0x4e, 0xd6, 0xfa, 0x07, 0xaf, 0xa3, 0x19, 0x43, 0x8a, 0x7a, 0x57, 0x35, 0x90, 0x0e, 0x04, 0x34, 0x19, 0x36,
-    0xd5, 0x1b, 0x77, 0x85, 0xd5, 0x54, 0xdf, 0x5f, 0x31, 0x58, 0x11, 0x60, 0x5f, 0x97, 0x6b, 0x96, 0x88, 0xf4, 0xa6,
-    0xe0, 0x12, 0x4d, 0x1f, 0x51, 0x26, 0xd6, 0x84, 0x14, 0x3c, 0x20, 0x0f, 0xcb, 0xdf, 0x58, 0x38, 0xd9, 0x8a, 0x29,
-    0x1c, 0x39, 0xca, 0x14, 0xa0, 0x33, 0x29, 0x01, 0x10, 0x97, 0xf4, 0xb3, 0xb6, 0xb1, 0x90, 0x6c, 0xfb, 0xc8, 0x07,
-    0xfe, 0x24, 0x89, 0xb8, 0xd3, 0xd9, 0x6a, 0xbb, 0xc0, 0x87, 0x20, 0xc4, 0x41, 0x47, 0x80, 0x79, 0x5f, 0xa1, 0xc2,
-    0x10, 0x95, 0xd8, 0xe5, 0x3e, 0x18, 0x45, 0xd3, 0x78, 0xc2, 0x9d, 0x0c, 0x95, 0x88, 0x5b, 0xb2, 0x04, 0x94, 0x8c,
-    0xde, 0x57, 0x20, 0x25, 0xb8, 0x90, 0x2e, 0xa2, 0x5a, 0x0b, 0x34, 0x05, 0x29, 0x49, 0x29, 0xd2, 0x82, 0x0a, 0x02,
-    0x43, 0xa8, 0xf4, 0x14, 0x47, 0x81, 0x7e, 0x8b, 0x07, 0x62, 0xd0, 0x60, 0xc5, 0xa2, 0x8c, 0x07, 0xf1, 0x6a, 0x21,
-    0xa8, 0x61, 0x9f, 0x67, 0x2f, 0xb3, 0x33, 0x96, 0x3f, 0x89, 0x10, 0xf6, 0x40, 0x74, 0x2f, 0x41, 0xd2, 0x93, 0x40,
-    0x67, 0x3d, 0xc5, 0x2b, 0xa7, 0x84, 0x34, 0x2c, 0xc4, 0x2c, 0x46, 0x45, 0x08, 0x5a, 0x8e, 0x68, 0x9f, 0xe2, 0x96,
-    0xa2, 0xbd, 0x87, 0xaa, 0x84, 0x69, 0xde, 0xda, 0x7b, 0x59, 0xe7, 0x2d, 0x18, 0x61, 0xae, 0xb8, 0xb5, 0xbe, 0x63,
-    0x5d, 0x4f, 0xea, 0x66, 0x47, 0xf2, 0x96, 0xa1, 0xcc, 0x40, 0x7f, 0x5c, 0x5e, 0x56, 0x46, 0x3a, 0x28, 0x53, 0x2d,
-    0xcd, 0xd1, 0x72, 0x12, 0x5b, 0xc2, 0x2d, 0x41, 0x19, 0xa1, 0xe1, 0x95, 0x67, 0x49, 0x62, 0xe8, 0x22, 0x2f, 0xee,
-    0x39, 0x0d, 0x75, 0x04, 0x50, 0xcc, 0x6a, 0x1a, 0x69, 0xc0, 0x03, 0x5d, 0x81, 0x4a, 0x49, 0x69, 0x23, 0xaf, 0x6a,
-    0x22, 0x20, 0x4e, 0xc7, 0x2c, 0x17, 0x0e, 0x9a, 0xd4, 0xa1, 0x30, 0x61, 0x0a, 0x0c, 0xcd, 0xc6, 0x20, 0xe1, 0x15,
-    0x02, 0x60, 0x9e, 0xf8, 0xd3, 0xac, 0xe0, 0xba, 0xce, 0x84, 0x3e, 0xbe, 0xbc, 0x8c, 0x85, 0xbf, 0x88, 0x0c, 0x90,
-    0xb3, 0x59, 0x76, 0xca, 0xd6, 0x40, 0xdd, 0x53, 0x83, 0x99, 0x20, 0x1b, 0xc3, 0x80, 0x12, 0x05, 0xd5, 0x32, 0x4f,
-    0xe2, 0x11, 0xd3, 0x5a, 0x6a, 0xe6, 0x83, 0x41, 0xc7, 0xce, 0x41, 0x46, 0x30, 0xb7, 0xdf, 0xef, 0xb7, 0xbd, 0x8e,
-    0x5b, 0x0a, 0x82, 0x2f, 0x57, 0x28, 0x7a, 0x8d, 0x7e, 0x94, 0x26, 0xf8, 0x3a, 0x59, 0xc0, 0x5d, 0x43, 0x29, 0x72,
-    0xe1, 0x27, 0x79, 0x52, 0x10, 0xbb, 0xde, 0x18, 0x06, 0xe5, 0x4c, 0x09, 0x6e, 0x34, 0x71, 0xc5, 0xb6, 0x7d, 0xa7,
-    0xc9, 0xa6, 0xd9, 0x49, 0xed, 0x30, 0xb5, 0x30, 0x72, 0xcd, 0x0b, 0xed, 0x01, 0x9b, 0xcb, 0x83, 0x56, 0x22, 0x55,
-    0x03, 0xaf, 0x03, 0x84, 0xc2, 0xd3, 0x75, 0x56, 0x50, 0xaa, 0x3a, 0x4b, 0x21, 0xae, 0x37, 0xd0, 0x5b, 0x26, 0xc1,
-    0x5c, 0x47, 0x82, 0x7d, 0x29, 0x10, 0x38, 0x7a, 0x64, 0x62, 0xbd, 0x9e, 0xc0, 0xf2, 0x1c, 0x47, 0xa3, 0x4f, 0x1a,
-    0xdc, 0x8a, 0xec, 0x4d, 0x36, 0x70, 0x1a, 0x25, 0xa1, 0x21, 0xae, 0x4c, 0xbc, 0x95, 0x84, 0xae, 0x6d, 0x14, 0x70,
-    0xc8, 0x56, 0xd8, 0xbe, 0xb9, 0xd0, 0x4d, 0x6e, 0x97, 0xec, 0xa1, 0xfc, 0x27, 0xcd, 0x25, 0xd7, 0xb0, 0x1c, 0x57,
-    0xd2, 0x80, 0x2b, 0xc6, 0x83, 0xa5, 0x69, 0x40, 0x02, 0x7c, 0x57, 0x8e, 0xe3, 0xe2, 0x6a, 0x12, 0xfc, 0xa1, 0x60,
-    0x3e, 0x35, 0x66, 0xba, 0x11, 0x52, 0x2d, 0xe1, 0xa4, 0x19, 0xac, 0x41, 0x93, 0xc6, 0x83, 0x12, 0x35, 0xdf, 0xa2,
-    0xa1, 0x42, 0x1c, 0x7f, 0x22, 0xaa, 0xd0, 0x04, 0x43, 0x30, 0x72, 0xaf, 0x90, 0x0c, 0x97, 0xad, 0x8a, 0x16, 0x29,
-    0x53, 0x63, 0x52, 0xa9, 0x9a, 0xe5, 0x32, 0x30, 0xb0, 0x68, 0xb7, 0xfa, 0xd2, 0x12, 0x57, 0x22, 0x37, 0x0d, 0xb5,
-    0x30, 0x29, 0x94, 0x37, 0xe1, 0xe4, 0xe8, 0x77, 0x29, 0xeb, 0xdd, 0xc4, 0x27, 0x57, 0xf8, 0xe4, 0xbe, 0xe1, 0x43,
-    0x99, 0xbc, 0x5d, 0x0c, 0x8a, 0xe0, 0x9b, 0x5a, 0x25, 0xda, 0xa7, 0x3e, 0x0a, 0x66, 0x57, 0x0b, 0x5d, 0x10, 0x28,
-    0x92, 0x4d, 0xd2, 0x81, 0xe4, 0x37, 0x14, 0x1b, 0x95, 0x67, 0x94, 0xb9, 0x62, 0x83, 0xd4, 0xbc, 0xd2, 0xcc, 0x4b,
-    0xdd, 0x86, 0xfd, 0x5e, 0x96, 0x92, 0x4e, 0x5c, 0x50, 0x26, 0xf6, 0xae, 0xa3, 0x8d, 0x97, 0x86, 0x99, 0xb0, 0x7e,
-    0x85, 0xb1, 0x53, 0xa3, 0x50, 0x2a, 0x45, 0x20, 0x8e, 0x8d, 0xaf, 0x95, 0x65, 0x90, 0xf9, 0x6b, 0xec, 0x29, 0x00,
-    0x25, 0x81, 0xc5, 0xd7, 0x54, 0xf2, 0xa2, 0xb0, 0x4e, 0xc7, 0x3b, 0x44, 0xc7, 0x4a, 0x84, 0xd6, 0x44, 0xbe, 0xd6,
-    0x67, 0xb1, 0x5f, 0x73, 0x09, 0x4d, 0x4a, 0xe6, 0x83, 0x3c, 0xb0, 0x55, 0x20, 0xa2, 0xd2, 0x6d, 0xc9, 0x20, 0x21,
-    0x87, 0x74, 0x95, 0xe8, 0xb5, 0x91, 0x0c, 0x5a, 0xa7, 0x42, 0xa2, 0xa5, 0xc3, 0x30, 0x72, 0xd0, 0x71, 0xa7, 0xb5,
-    0x58, 0x21, 0x64, 0xd3, 0xde, 0x24, 0x56, 0x44, 0xe7, 0x34, 0x47, 0x13, 0xce, 0xd4, 0xe9, 0x8e, 0x03, 0xe8, 0x80,
-    0xd8, 0x5f, 0x61, 0xbd, 0xb5, 0x66, 0xa7, 0xeb, 0x57, 0x0e, 0xdf, 0xe5, 0x65, 0x82, 0xfc, 0x20, 0x0c, 0x5e, 0x58,
-    0xb3, 0x81, 0x92, 0xbd, 0x7b, 0x2f, 0xb1, 0x15, 0xd9, 0x9f, 0x55, 0x49, 0xe5, 0x29, 0xd4, 0x38, 0xb7, 0xbe, 0x4e,
-    0xcc, 0x0c, 0x2d, 0xaa, 0x8a, 0x7d, 0x43, 0xaa, 0xef, 0x2b, 0x85, 0x5d, 0xa1, 0xbc, 0x2f, 0x87, 0x8e, 0x5d, 0xd7,
-    0x0d, 0x72, 0x72, 0x5e, 0xee, 0xac, 0x73, 0x21, 0xef, 0xde, 0x35, 0x7d, 0xa6, 0x53, 0x3d, 0xfc, 0x13, 0x07, 0x95,
-    0x73, 0x71, 0x91, 0x92, 0x05, 0xf3, 0x44, 0xa9, 0xa3, 0x15, 0x07, 0xb4, 0xdd, 0x43, 0x4f, 0x3b, 0x3a, 0x8b, 0x62,
-    0x6e, 0xe9, 0x51, 0x84, 0xa7, 0x8d, 0xf2, 0x49, 0x1a, 0x1d, 0x80, 0x17, 0x9a, 0x90, 0xe4, 0x84, 0x9b, 0xb6, 0x68,
-    0x31, 0x9a, 0x32, 0x0c, 0x81, 0x2b, 0x7b, 0xc2, 0x94, 0x3d, 0x77, 0x10, 0x6f, 0x31, 0x30, 0x5b, 0x0f, 0x7b, 0xd9,
-    0xec, 0x5e, 0x33, 0xff, 0x61, 0x8d, 0x40, 0xb6, 0xcd, 0x54, 0x5d, 0xd9, 0x78, 0x97, 0x22, 0x12, 0x23, 0x6c, 0xeb,
-    0xc6, 0x96, 0xb6, 0x7e, 0xaf, 0xe1, 0x5e, 0x57, 0x8e, 0x79, 0x4d, 0xa9, 0x36, 0xf4, 0xb0, 0x72, 0x73, 0x98, 0xe9,
-    0xc8, 0x8b, 0x15, 0x74, 0x7b, 0x22, 0x28, 0x04, 0x4e, 0x84, 0xb6, 0x07, 0x15, 0x37, 0x10, 0x29, 0xb9, 0xd2, 0xaa,
-    0xd9, 0x22, 0x19, 0x4b, 0x60, 0xc1, 0x85, 0xe5, 0x92, 0x8f, 0xce, 0xe2, 0x24, 0xa9, 0x4a, 0xff, 0x50, 0x01, 0x2f,
-    0x86, 0xbd, 0x49, 0xb4, 0x0b, 0x8c, 0x16, 0x0a, 0x04, 0x57, 0x1b, 0x61, 0xef, 0x1d, 0xb7, 0x5a, 0x77, 0x11, 0x71,
-    0xe4, 0x66, 0x34, 0x02, 0xea, 0x31, 0xc2, 0xaa, 0x59, 0x7b, 0xef, 0x19, 0x86, 0xd4, 0x0c, 0x7c, 0x50, 0x9d, 0x51,
-    0xf1, 0x67, 0xd9, 0x53, 0x9f, 0x89, 0xde, 0x8d, 0xaa, 0xab, 0x19, 0x50, 0x51, 0x81, 0x0f, 0x33, 0xc4, 0xd2, 0x56,
-    0x81, 0x80, 0x5c, 0x0f, 0x8b, 0x52, 0xc0, 0x24, 0x0d, 0x16, 0x94, 0x02, 0x6b, 0xad, 0xec, 0x5e, 0xde, 0x14, 0xcc,
-    0xa1, 0x50, 0xb8, 0xe8, 0xff, 0x24, 0x9b, 0xcd, 0xd1, 0x32, 0x6b, 0x30, 0x35, 0x34, 0x78, 0xdf, 0xa8, 0x2f, 0xd7,
-    0x94, 0xd5, 0xfa, 0xd0, 0x8e, 0xac, 0xf1, 0x93, 0x76, 0x94, 0xc1, 0xa1, 0x5a, 0xe8, 0xa2, 0xba, 0xdd, 0xdc, 0x14,
-    0x31, 0xeb, 0x78, 0xdc, 0x27, 0xbd, 0xad, 0xad, 0x49, 0x4f, 0xd3, 0x80, 0x64, 0x92, 0x64, 0x78, 0x93, 0x01, 0xca,
-    0x8a, 0x38, 0xcb, 0xb2, 0x41, 0xbe, 0x65, 0x59, 0xe2, 0xfa, 0x7d, 0xd7, 0xdb, 0xab, 0x79, 0xd6, 0xde, 0xde, 0xd5,
-    0x2e, 0x72, 0x55, 0x27, 0x3d, 0xc8, 0xc3, 0x21, 0x14, 0xad, 0xd8, 0x94, 0xe1, 0x72, 0x96, 0x8d, 0x59, 0x60, 0x43,
-    0xf7, 0xd4, 0x2e, 0x95, 0x56, 0x86, 0xcd, 0x91, 0x32, 0x67, 0xf9, 0xae, 0x1e, 0x49, 0x0d, 0xf6, 0x80, 0x05, 0xb4,
-    0xb9, 0xf0, 0x7d, 0x78, 0x92, 0x64, 0xc7, 0x51, 0x72, 0x20, 0x14, 0x78, 0xad, 0xe5, 0x07, 0x70, 0x19, 0xc9, 0x62,
-    0x35, 0x94, 0xd4, 0xf7, 0x83, 0xef, 0x83, 0x9b, 0x7b, 0x54, 0xde, 0x8a, 0xdd, 0xf1, 0xdb, 0x7e, 0xc7, 0x56, 0x11,
-    0xb1, 0x97, 0xe6, 0x74, 0xa0, 0x71, 0x0a, 0xa0, 0xcc, 0x01, 0x68, 0xb2, 0xc2, 0x8b, 0x58, 0xf8, 0x72, 0xf0, 0x52,
-    0xb9, 0xd4, 0x19, 0xb8, 0x10, 0xe0, 0xe4, 0x27, 0x31, 0x6f, 0xe1, 0x79, 0xa4, 0xed, 0x2d, 0x45, 0x05, 0xc6, 0x15,
-    0x29, 0x2e, 0x5d, 0x2a, 0x6f, 0xd0, 0xfb, 0x18, 0x1e, 0x41, 0xb3, 0x8d, 0x8d, 0xa5, 0xf3, 0x2a, 0xe2, 0x53, 0x3f,
-    0x8f, 0xd2, 0x71, 0x36, 0x73, 0xdc, 0x4d, 0xdb, 0x76, 0xfd, 0x82, 0x3c, 0x91, 0xaf, 0xdc, 0x72, 0xe3, 0xc8, 0x9b,
-    0xb2, 0xd0, 0x1e, 0xd8, 0x9b, 0x1f, 0xbd, 0xf7, 0x2c, 0x3c, 0xda, 0xdd, 0x58, 0x4e, 0x59, 0xd9, 0x3f, 0xf2, 0xce,
+    0x9c, 0xd3, 0x7f, 0x30, 0x2f, 0x30, 0x4a, 0x6d, 0x03, 0x57, 0x20, 0x44, 0x52, 0x96, 0xed, 0x02, 0x05, 0xf2, 0xca,
+    0x4b, 0x5d, 0xbb, 0xca, 0x5b, 0x59, 0xb2, 0x6b, 0x51, 0xb1, 0x2c, 0x88, 0x4c, 0x8a, 0x28, 0x83, 0x00, 0x0b, 0x48,
+    0x6a, 0x29, 0x0a, 0x7d, 0xfa, 0xa9, 0x9f, 0xe6, 0x9c, 0x59, 0x1f, 0xfa, 0x65, 0x4e, 0xf7, 0xc3, 0x7c, 0xc4, 0x3c,
+    0xf7, 0xa7, 0xdc, 0x1f, 0x98, 0xfe, 0x84, 0x89, 0x88, 0x5c, 0x90, 0x00, 0xa9, 0xc5, 0xd5, 0xd5, 0x7d, 0xbc, 0x08,
+    0xc8, 0x35, 0x22, 0x32, 0x32, 0xb6, 0x8c, 0x84, 0x76, 0xef, 0x8c, 0xb3, 0x11, 0xbf, 0x98, 0x33, 0x6b, 0xca, 0x67,
+    0x49, 0x7f, 0x57, 0xfe, 0xcf, 0xa2, 0x71, 0x7f, 0x37, 0x89, 0xd3, 0x4f, 0x56, 0xce, 0x92, 0x30, 0x1e, 0x65, 0xa9,
+    0x35, 0xcd, 0xd9, 0x24, 0x1c, 0x47, 0x3c, 0x0a, 0xe2, 0x59, 0x74, 0xc2, 0xac, 0xad, 0xfe, 0xee, 0x8c, 0xf1, 0xc8,
+    0x1a, 0x4d, 0xa3, 0xbc, 0x60, 0x3c, 0x7c, 0x7f, 0xf0, 0x55, 0xeb, 0x51, 0x7f, 0xb7, 0x18, 0xe5, 0xf1, 0x9c, 0x5b,
+    0x38, 0x64, 0x38, 0xcb, 0xc6, 0x8b, 0x84, 0xf5, 0x4f, 0xa3, 0xdc, 0x7a, 0xc6, 0xc2, 0x37, 0xc7, 0xbf, 0xb0, 0x11,
+    0xf7, 0xc7, 0x6c, 0x12, 0xa7, 0xec, 0x6d, 0x9e, 0xcd, 0x59, 0xce, 0x2f, 0xbc, 0xfd, 0xf5, 0x15, 0x31, 0x2b, 0xbc,
+    0x4f, 0xba, 0xea, 0x84, 0xf1, 0x37, 0x67, 0xa9, 0xea, 0xf3, 0x94, 0x89, 0x49, 0xb2, 0xbc, 0xf0, 0x8a, 0x2b, 0xda,
+    0xec, 0x5f, 0xcc, 0x8e, 0xb3, 0xa4, 0xf0, 0x9e, 0xe8, 0xfa, 0x79, 0x9e, 0xf1, 0x0c, 0xc1, 0xf2, 0xa7, 0x51, 0x61,
+    0xb4, 0xf4, 0xde, 0xac, 0x69, 0x32, 0x97, 0x95, 0x2f, 0x8a, 0x67, 0xe9, 0x62, 0xc6, 0xf2, 0xe8, 0x38, 0x61, 0x5e,
+    0xcc, 0x42, 0x87, 0x79, 0xdc, 0x8b, 0xdd, 0xb0, 0xcf, 0xad, 0x38, 0xb5, 0xd8, 0xe0, 0x19, 0xa3, 0x92, 0x25, 0xd3,
+    0xad, 0x82, 0x3b, 0x6d, 0x0f, 0xc8, 0x35, 0x89, 0x4f, 0x16, 0xfa, 0xfd, 0x2c, 0x8f, 0xb9, 0x7a, 0x3e, 0x8d, 0x92,
+    0x05, 0x0b, 0xe2, 0xd2, 0x0d, 0xd8, 0x21, 0x1f, 0x86, 0xb1, 0xf7, 0x84, 0x06, 0x85, 0x21, 0x97, 0x93, 0x2c, 0x77,
+    0x90, 0x56, 0x31, 0x8e, 0xcd, 0x2f, 0x2f, 0x1d, 0x1e, 0x2e, 0x4b, 0xd7, 0x7d, 0xc2, 0xfc, 0x51, 0x94, 0x24, 0x0e,
+    0x4e, 0x7c, 0xf7, 0x6e, 0x8c, 0x33, 0xc6, 0x1e, 0x3f, 0x8c, 0x87, 0x6e, 0x2f, 0x9e, 0x38, 0x05, 0x73, 0xab, 0x7e,
+    0xd9, 0xc4, 0x2a, 0x98, 0xc3, 0x5d, 0xf7, 0xcd, 0xd5, 0x7d, 0x72, 0xc6, 0x17, 0x39, 0xc0, 0x5e, 0x7a, 0x6f, 0xd4,
+    0xcc, 0xfb, 0x58, 0xff, 0x89, 0x3a, 0xf6, 0x00, 0xf6, 0x82, 0x5b, 0x1f, 0xc2, 0xb3, 0x38, 0x1d, 0x67, 0x67, 0xfe,
+    0xfe, 0x34, 0x82, 0x1f, 0xef, 0xb2, 0x8c, 0xdf, 0xbd, 0xeb, 0x9c, 0x66, 0xf1, 0xd8, 0x6a, 0x87, 0xa1, 0x59, 0x79,
+    0xf1, 0x64, 0x7f, 0xff, 0xf2, 0xb2, 0x51, 0xe0, 0xa7, 0x11, 0x8f, 0x4f, 0x99, 0xe8, 0x0c, 0x00, 0xd8, 0xf0, 0x73,
+    0xce, 0xd9, 0x78, 0x9f, 0x5f, 0x24, 0x50, 0xca, 0x18, 0x2f, 0x6c, 0xc0, 0xf1, 0x69, 0x36, 0x02, 0xb2, 0xa5, 0x06,
+    0xe1, 0xa1, 0x69, 0xce, 0xe6, 0x49, 0x34, 0x62, 0x58, 0x0f, 0x23, 0x55, 0x3d, 0xaa, 0x46, 0xde, 0x57, 0xa1, 0x58,
+    0x5e, 0xc7, 0xf5, 0x72, 0x16, 0xa6, 0xec, 0xcc, 0x7a, 0x15, 0xcd, 0x7b, 0xa3, 0x24, 0x2a, 0x0a, 0x2b, 0x63, 0x4b,
+    0x42, 0x21, 0x5f, 0x8c, 0x80, 0x41, 0x08, 0xc1, 0x25, 0x90, 0x89, 0x4f, 0xe3, 0xc2, 0xff, 0xb8, 0x31, 0x2a, 0x8a,
+    0x77, 0xac, 0x58, 0x24, 0x7c, 0x23, 0x84, 0xb5, 0xe0, 0x77, 0xc2, 0xf0, 0x2b, 0x97, 0x4f, 0xf3, 0xec, 0xcc, 0x7a,
+    0x96, 0xe7, 0xd0, 0xdc, 0x86, 0x29, 0x45, 0x03, 0x2b, 0x2e, 0xac, 0x34, 0xe3, 0x96, 0x1e, 0x0c, 0x17, 0xd0, 0xb7,
+    0xde, 0x17, 0xcc, 0x3a, 0x5a, 0xa4, 0x45, 0x34, 0x61, 0xd0, 0xf4, 0xc8, 0xca, 0x72, 0xeb, 0x08, 0x06, 0x3d, 0x82,
+    0x25, 0x2b, 0x38, 0xec, 0x1a, 0xdf, 0x76, 0x7b, 0x34, 0x17, 0x14, 0x1e, 0xb0, 0x73, 0x1e, 0xb2, 0x12, 0x18, 0xd3,
+    0x2a, 0x34, 0x1a, 0x8e, 0xbb, 0x4c, 0xa0, 0x80, 0x85, 0x39, 0x43, 0x96, 0x75, 0xcc, 0xc6, 0x7a, 0x71, 0x3e, 0xdc,
+    0xbd, 0xab, 0x69, 0x0d, 0x34, 0x71, 0xa0, 0x6d, 0xd1, 0x68, 0xeb, 0x09, 0xc4, 0x6b, 0x24, 0x72, 0x3d, 0xe6, 0x4b,
+    0xf2, 0xed, 0x5f, 0xa4, 0xa3, 0xfa, 0xd8, 0x50, 0x59, 0xf2, 0x6c, 0x9f, 0xe7, 0x71, 0x7a, 0x02, 0x40, 0xc8, 0x99,
+    0xcc, 0x26, 0x65, 0x29, 0x16, 0xff, 0x2d, 0x0b, 0x59, 0xd8, 0xc7, 0xd1, 0x33, 0xe6, 0xd8, 0x05, 0xf5, 0xb0, 0xc3,
+    0x10, 0x49, 0x0f, 0x0c, 0xc6, 0x06, 0x2c, 0x60, 0x9b, 0xb6, 0xed, 0x7d, 0xe5, 0x7a, 0x17, 0xc8, 0x41, 0xbe, 0xef,
+    0x13, 0xfb, 0x8a, 0xce, 0x71, 0xd8, 0x41, 0xa0, 0xfd, 0x84, 0xa5, 0x27, 0x7c, 0x3a, 0x60, 0x87, 0xed, 0x61, 0xc0,
+    0x01, 0xaa, 0xf1, 0x62, 0xc4, 0x1c, 0xe4, 0x47, 0x2f, 0xc7, 0xed, 0xb3, 0xe9, 0xc0, 0x14, 0xb8, 0x30, 0x77, 0x08,
+    0xc7, 0xda, 0xd2, 0xb8, 0x8a, 0x45, 0x15, 0x60, 0xc8, 0xe7, 0x36, 0xec, 0xb0, 0x63, 0x96, 0x1b, 0x70, 0xe8, 0x66,
+    0xbd, 0xda, 0x0a, 0x2e, 0x60, 0x85, 0xa0, 0x9f, 0x35, 0x59, 0xa4, 0x23, 0x1e, 0x83, 0xe0, 0xb2, 0x37, 0x01, 0x5c,
+    0xb1, 0x72, 0x7a, 0xe1, 0x6c, 0xb7, 0x74, 0x9d, 0xd8, 0xdd, 0x64, 0x87, 0xf9, 0x66, 0x67, 0xe8, 0x21, 0x94, 0x9a,
+    0xf8, 0x12, 0xf1, 0x18, 0x10, 0x2c, 0xbd, 0xf7, 0x4c, 0x6f, 0xcf, 0x0f, 0x03, 0xe6, 0xaf, 0xf2, 0x71, 0xc8, 0xfd,
+    0x59, 0x34, 0x47, 0x6c, 0x18, 0xf1, 0x40, 0x94, 0x8e, 0x10, 0xba, 0xda, 0xba, 0x20, 0xc5, 0xfc, 0x8a, 0x05, 0x5c,
+    0x20, 0x08, 0xec, 0xd9, 0x67, 0xd1, 0x68, 0x0a, 0x5b, 0xbc, 0x22, 0xdc, 0x58, 0x6d, 0x87, 0x51, 0xce, 0x22, 0xce,
+    0x9e, 0x25, 0x0c, 0xdf, 0x70, 0x05, 0xa0, 0xa7, 0x0d, 0xbc, 0xae, 0xf6, 0x5d, 0x12, 0xf3, 0xd7, 0x19, 0xcc, 0xd3,
+    0x13, 0x4c, 0x02, 0x5c, 0x9c, 0xc3, 0x26, 0x47, 0x16, 0xd9, 0xe3, 0xb0, 0x5a, 0xc7, 0x0b, 0x0e, 0xeb, 0x96, 0x62,
+    0x0b, 0x1b, 0xa8, 0xed, 0xc5, 0x3e, 0x07, 0x22, 0x3e, 0xc9, 0x52, 0x0e, 0xc3, 0x01, 0xbc, 0x9a, 0x83, 0xfc, 0x68,
+    0x3e, 0x67, 0xe9, 0xf8, 0xc9, 0x34, 0x4e, 0xc6, 0x40, 0x8d, 0x12, 0xf0, 0x4d, 0x59, 0x08, 0x78, 0x02, 0x32, 0xc1,
+    0xf5, 0x18, 0xd1, 0xf2, 0x21, 0x23, 0xf3, 0xd0, 0xb6, 0x7b, 0x28, 0x81, 0x24, 0x16, 0x28, 0x83, 0x68, 0xe1, 0xde,
+    0x81, 0xe8, 0x2f, 0x5c, 0xbe, 0x19, 0xc6, 0x7a, 0x19, 0x25, 0x81, 0xdf, 0xa2, 0xa4, 0x01, 0xfa, 0x33, 0x90, 0x81,
+    0x3d, 0x14, 0x5c, 0xdf, 0x49, 0xa9, 0x93, 0x30, 0x85, 0x21, 0x10, 0x60, 0x84, 0x12, 0x44, 0xd2, 0xe0, 0x6d, 0x96,
+    0x5c, 0x4c, 0xe2, 0x24, 0xd9, 0x5f, 0xcc, 0xe7, 0x59, 0xce, 0xbd, 0xaf, 0xc3, 0x25, 0xcf, 0x2a, 0x5c, 0x69, 0x93,
+    0x17, 0x67, 0x31, 0x47, 0x82, 0xba, 0xcb, 0x51, 0x04, 0x4b, 0xfd, 0x38, 0xcb, 0x12, 0x16, 0xa5, 0x80, 0x06, 0x1b,
+    0xd8, 0x76, 0x90, 0x2e, 0x92, 0xa4, 0x77, 0x0c, 0xc3, 0x7e, 0xea, 0x51, 0xb5, 0x90, 0xf8, 0x01, 0x3d, 0xef, 0xe5,
+    0x79, 0x74, 0x01, 0x0d, 0xb1, 0x0d, 0xf0, 0x22, 0xac, 0xd6, 0xd7, 0xfb, 0x6f, 0x5e, 0xfb, 0x82, 0xf1, 0xe3, 0xc9,
+    0x05, 0x00, 0x5a, 0x56, 0x52, 0x73, 0x92, 0x67, 0xb3, 0xc6, 0xd4, 0x48, 0x87, 0x38, 0x64, 0xbd, 0x2b, 0x40, 0x88,
+    0x69, 0x64, 0x58, 0x25, 0x66, 0x42, 0xf0, 0x9a, 0xf8, 0x59, 0x56, 0xe2, 0x1e, 0x18, 0xe0, 0x43, 0x20, 0x8a, 0x61,
+    0xca, 0xeb, 0xa1, 0xe5, 0xf9, 0xc5, 0x32, 0x0e, 0x09, 0xce, 0x39, 0xea, 0x5f, 0x84, 0x71, 0x14, 0xc1, 0xec, 0x4b,
+    0x31, 0x60, 0xa9, 0x20, 0x8e, 0xcb, 0xd2, 0x8b, 0x34, 0x13, 0xa3, 0xc4, 0x43, 0x81, 0xc2, 0x61, 0x1b, 0x5d, 0x5e,
+    0x32, 0x78, 0x71, 0xbd, 0x6f, 0xc2, 0x65, 0xa4, 0xf0, 0x41, 0x0d, 0x85, 0xfb, 0x2b, 0x10, 0x72, 0x02, 0x35, 0xd9,
+    0x29, 0xe8, 0x41, 0x80, 0xf3, 0x6b, 0x10, 0xb5, 0x93, 0x04, 0xa1, 0xb8, 0xd3, 0xf1, 0x40, 0x83, 0x3e, 0x99, 0x46,
+    0xe9, 0x09, 0x1b, 0x07, 0x11, 0x2b, 0xa5, 0xe4, 0xdd, 0xb3, 0x60, 0x8d, 0x81, 0x9d, 0x0a, 0xeb, 0xf9, 0xc1, 0xab,
+    0x97, 0x72, 0xe5, 0x6a, 0xc2, 0x18, 0x16, 0x69, 0x01, 0x6a, 0x15, 0xc4, 0xb6, 0x14, 0xc7, 0xcf, 0xb8, 0x92, 0xde,
+    0xa2, 0x24, 0x2e, 0xde, 0xcf, 0xc1, 0xc4, 0x60, 0x6f, 0x61, 0x18, 0x98, 0x3e, 0x84, 0xa9, 0xa8, 0x1c, 0xe6, 0x13,
+    0x15, 0x63, 0x5d, 0x04, 0x9d, 0x05, 0xa6, 0xe2, 0x35, 0x73, 0xdc, 0x12, 0x58, 0x95, 0xc7, 0x23, 0x2b, 0x1a, 0x8f,
+    0x5f, 0xa4, 0x31, 0x8f, 0xa3, 0x24, 0xfe, 0x8d, 0x28, 0xb9, 0x44, 0x1e, 0xe3, 0x3d, 0xb9, 0x08, 0x80, 0x3b, 0xf5,
+    0x48, 0x5c, 0x25, 0x64, 0xef, 0x10, 0x31, 0x84, 0xb4, 0x4c, 0xc2, 0xc3, 0xa1, 0x04, 0x2f, 0xf1, 0xe7, 0x8b, 0x62,
+    0x8a, 0x84, 0x95, 0x03, 0xa3, 0x20, 0xcf, 0x8e, 0x0b, 0x96, 0x9f, 0xb2, 0xb1, 0xe6, 0x80, 0x02, 0xb0, 0xa2, 0xe6,
+    0x60, 0xbc, 0xd0, 0x8c, 0x8e, 0xd2, 0xa1, 0x0c, 0x86, 0xea, 0x99, 0x62, 0x96, 0x49, 0x66, 0xd6, 0x16, 0x8e, 0x96,
+    0x02, 0x8e, 0x30, 0x2a, 0xa4, 0x24, 0xc8, 0x43, 0x85, 0xe1, 0x14, 0xa4, 0x10, 0x68, 0x05, 0x73, 0x9b, 0x2b, 0x4d,
+    0xf6, 0x6c, 0x41, 0x2a, 0x21, 0x87, 0x8e, 0xb0, 0x91, 0x09, 0xd2, 0xdc, 0x85, 0x5d, 0x05, 0x52, 0x5e, 0x82, 0x2b,
+    0xa4, 0x88, 0x32, 0x73, 0x90, 0x01, 0xc2, 0x6f, 0x84, 0x2e, 0xf4, 0xb1, 0x05, 0xb1, 0x81, 0xaf, 0x57, 0x1e, 0x08,
+    0x2b, 0xf1, 0xae, 0x10, 0xf1, 0xae, 0x00, 0x1b, 0x27, 0x46, 0x7e, 0xf2, 0xee, 0x70, 0x3f, 0xcd, 0xf6, 0x46, 0x23,
+    0x56, 0x14, 0x19, 0xc0, 0x76, 0x87, 0xda, 0x5f, 0x65, 0x68, 0x01, 0x25, 0x5d, 0x2d, 0xeb, 0xec, 0x82, 0x34, 0xb8,
+    0xa9, 0x56, 0x94, 0x4e, 0x0f, 0xec, 0x8f, 0x1f, 0x41, 0x66, 0x7b, 0x92, 0x0c, 0x40, 0xf5, 0x55, 0xc3, 0x4f, 0xd8,
+    0x33, 0x75, 0xca, 0xac, 0xb5, 0x2f, 0x9d, 0x3a, 0x48, 0x1e, 0x0c, 0xeb, 0x96, 0xc6, 0x82, 0xae, 0x1d, 0x1a, 0x57,
+    0x43, 0x2a, 0xc8, 0xe5, 0x09, 0xa9, 0x6c, 0x63, 0x19, 0xc1, 0x6a, 0x2b, 0x3d, 0x22, 0xbd, 0xc2, 0xa6, 0x20, 0x40,
+    0x0f, 0xd9, 0xb0, 0x27, 0xeb, 0xc3, 0x5c, 0x50, 0x2e, 0x67, 0xbf, 0x2e, 0x58, 0xc1, 0x05, 0xeb, 0xc2, 0xb8, 0x05,
+    0x8c, 0x5b, 0xae, 0x58, 0x87, 0x35, 0xdb, 0x71, 0x1d, 0x6c, 0x6f, 0xe6, 0xa8, 0xc7, 0x0a, 0xe4, 0xe4, 0xeb, 0xd9,
+    0x09, 0x61, 0x65, 0xee, 0xe5, 0xe5, 0x37, 0x6a, 0x90, 0x6a, 0x29, 0xb5, 0x0d, 0xd4, 0x58, 0x13, 0x5b, 0x35, 0x19,
+    0xdb, 0xae, 0x54, 0xa8, 0x77, 0x3a, 0xbd, 0x1a, 0x1f, 0xc0, 0x9e, 0x6b, 0x6b, 0x96, 0xae, 0x8c, 0xed, 0xb7, 0x8a,
+    0xa6, 0x6f, 0xc4, 0xc8, 0x64, 0x8d, 0xb2, 0x9b, 0xb9, 0x47, 0xed, 0x78, 0x68, 0xbb, 0x52, 0x57, 0x09, 0x86, 0x45,
+    0x5d, 0x30, 0x34, 0xa1, 0x9e, 0xeb, 0x2e, 0xb6, 0x66, 0x2a, 0x16, 0xaa, 0xb5, 0x56, 0x0e, 0x04, 0x0f, 0x0f, 0xc1,
+    0x38, 0x59, 0xeb, 0x1f, 0xbc, 0x8e, 0x66, 0x0c, 0x29, 0xea, 0x5d, 0xd5, 0x40, 0x3a, 0x10, 0xd0, 0x64, 0xd8, 0x54,
+    0x6f, 0xdc, 0x15, 0x56, 0x53, 0x7d, 0x7f, 0xc5, 0x60, 0x45, 0x80, 0x7d, 0x5d, 0xae, 0x59, 0x22, 0xd2, 0x9b, 0x82,
+    0x4b, 0x34, 0x7d, 0x44, 0x99, 0x58, 0x13, 0x52, 0xf0, 0x80, 0x3c, 0x2c, 0x7f, 0x63, 0xe1, 0x64, 0x2b, 0xa6, 0x70,
+    0xe4, 0x28, 0x53, 0x80, 0xce, 0xa4, 0x04, 0x40, 0x5c, 0xd2, 0xcf, 0xda, 0xc6, 0x42, 0xb2, 0xed, 0x23, 0x1f, 0xf8,
+    0x93, 0x24, 0xe2, 0x4e, 0x67, 0xab, 0xed, 0x02, 0x1f, 0x82, 0x10, 0x07, 0x1d, 0x01, 0xe6, 0x7d, 0x85, 0x0a, 0x43,
+    0x54, 0x62, 0x97, 0xfb, 0x60, 0x14, 0x4d, 0xe3, 0x09, 0x77, 0x52, 0x54, 0x22, 0x6e, 0xc9, 0x12, 0x50, 0x32, 0x7a,
+    0x5f, 0x81, 0x94, 0xe0, 0x42, 0xba, 0x88, 0x6a, 0x2d, 0xd0, 0x14, 0xa4, 0x24, 0xa5, 0x48, 0x0b, 0x2a, 0x08, 0x0c,
+    0xa1, 0xd2, 0x53, 0x1c, 0x05, 0xfa, 0x2d, 0x1e, 0x88, 0x41, 0x83, 0x15, 0x8b, 0x32, 0x1e, 0xc4, 0xab, 0x85, 0xa0,
+    0x86, 0x7d, 0x9e, 0xbd, 0xcc, 0xce, 0x58, 0xfe, 0x24, 0x42, 0xd8, 0x03, 0xd1, 0xbd, 0x04, 0x49, 0x4f, 0x02, 0x9d,
+    0xf5, 0x14, 0xaf, 0x9c, 0x12, 0xd2, 0xb0, 0x10, 0xb3, 0x18, 0x15, 0x21, 0x68, 0x39, 0xa2, 0x7d, 0x8a, 0x5b, 0x8a,
+    0xf6, 0x1e, 0xaa, 0x12, 0xa6, 0x79, 0x6b, 0xef, 0x65, 0x9d, 0xb7, 0x60, 0x84, 0xb9, 0xe2, 0xd6, 0xfa, 0x8e, 0x75,
+    0x3d, 0xa9, 0x9b, 0x1d, 0xc9, 0x5b, 0x86, 0x32, 0x03, 0xfd, 0x71, 0x79, 0x59, 0x19, 0xe9, 0xa0, 0x4c, 0xb5, 0x34,
+    0x47, 0xcb, 0x49, 0x6c, 0x09, 0xb7, 0x04, 0x65, 0x84, 0x86, 0x57, 0x9e, 0x25, 0x89, 0xa1, 0x8b, 0xbc, 0xb8, 0xe7,
+    0x34, 0xd4, 0x11, 0x40, 0x31, 0xab, 0x69, 0xa4, 0x01, 0x0f, 0x74, 0x05, 0x2a, 0x25, 0xa5, 0x8d, 0xbc, 0xaa, 0x89,
+    0x80, 0x38, 0x1d, 0xb3, 0x5c, 0x38, 0x68, 0x52, 0x87, 0xc2, 0x84, 0x29, 0x30, 0x34, 0x1b, 0x83, 0x84, 0x57, 0x08,
+    0x80, 0x79, 0xe2, 0x4f, 0xb3, 0x82, 0xeb, 0x3a, 0x13, 0xfa, 0xf8, 0xf2, 0x32, 0x16, 0xfe, 0x22, 0x32, 0x40, 0xce,
+    0x66, 0xd9, 0x29, 0x5b, 0x03, 0x75, 0x4f, 0x0d, 0x66, 0x82, 0x6c, 0x0c, 0x03, 0x4a, 0x14, 0x54, 0xcb, 0x3c, 0x89,
+    0x47, 0x4c, 0x6b, 0xa9, 0x99, 0x0f, 0x06, 0x1d, 0x3b, 0x07, 0x19, 0xc1, 0xdc, 0x7e, 0xbf, 0xdf, 0xf6, 0x3a, 0x6e,
+    0x29, 0x08, 0xbe, 0x5c, 0xa1, 0xe8, 0x35, 0xfa, 0x51, 0x9a, 0xe0, 0xeb, 0x64, 0x01, 0x77, 0x0d, 0xa5, 0xc8, 0x85,
+    0x9f, 0xe4, 0x49, 0x41, 0xec, 0x7a, 0x63, 0x18, 0x94, 0x33, 0x25, 0xb8, 0xd1, 0xc4, 0x15, 0xdb, 0xf6, 0x9d, 0x26,
+    0x9b, 0x66, 0x27, 0xb5, 0xc3, 0xd4, 0xc2, 0xc8, 0x35, 0x2f, 0xb4, 0x07, 0x6c, 0x2e, 0x0f, 0x5a, 0x89, 0x54, 0x0d,
+    0xbc, 0x0e, 0x10, 0x0a, 0x4f, 0xd7, 0x59, 0x41, 0xa9, 0xea, 0x2c, 0x85, 0xb8, 0xde, 0x40, 0xef, 0x99, 0x04, 0x73,
+    0x1d, 0x09, 0xf6, 0xa5, 0x40, 0xe0, 0xe8, 0x91, 0x89, 0xf5, 0x7a, 0x02, 0xcb, 0x73, 0x1c, 0x8d, 0x3e, 0x69, 0x70,
+    0x2b, 0xb2, 0x37, 0xd9, 0xc0, 0x69, 0x94, 0x84, 0x86, 0xb8, 0x32, 0xf1, 0x56, 0x12, 0xba, 0xb6, 0x51, 0xc0, 0x21,
+    0x5b, 0x61, 0xfb, 0xe6, 0x42, 0x37, 0xb9, 0x5d, 0xb2, 0x87, 0xf2, 0x9f, 0x34, 0x97, 0x5c, 0xc3, 0x72, 0x5c, 0x49,
+    0x03, 0xae, 0x18, 0x0f, 0x96, 0xa6, 0x01, 0x09, 0xf0, 0x5d, 0x39, 0x8e, 0x8b, 0xab, 0x49, 0xf0, 0x87, 0x82, 0xf9,
+    0xd4, 0x98, 0xe9, 0x46, 0x48, 0xb5, 0x84, 0x93, 0x66, 0xb0, 0x06, 0x4d, 0x1a, 0x0f, 0x4a, 0xd4, 0x7c, 0x83, 0x86,
+    0x0a, 0x71, 0xfc, 0x89, 0xa8, 0x42, 0x13, 0x0c, 0xc1, 0xc8, 0xbd, 0x42, 0x32, 0x5c, 0xb6, 0x2a, 0x5a, 0xa4, 0x4c,
+    0x8d, 0x49, 0xa5, 0x6a, 0x96, 0xcb, 0xc0, 0xc0, 0xa2, 0xdd, 0xea, 0x4b, 0x4b, 0x5c, 0x89, 0xdc, 0x34, 0xd4, 0xc2,
+    0xa4, 0x50, 0xde, 0x84, 0x93, 0xa3, 0xdf, 0xa5, 0xac, 0x77, 0x13, 0x9f, 0x5c, 0xe1, 0x93, 0xfb, 0x86, 0x0f, 0x65,
+    0xf2, 0x76, 0x31, 0x28, 0x82, 0xaf, 0x6b, 0x95, 0x68, 0x9f, 0xfa, 0x28, 0x98, 0x5d, 0x2d, 0x74, 0x41, 0xa0, 0x48,
+    0x36, 0x49, 0x07, 0x92, 0xdf, 0x50, 0x6c, 0x54, 0x9e, 0x51, 0xe6, 0x8a, 0x0d, 0x52, 0xf3, 0x4a, 0x33, 0x2f, 0x75,
+    0x1b, 0xf6, 0x7b, 0x59, 0x4a, 0x3a, 0x71, 0x41, 0x99, 0xd8, 0xbb, 0x8e, 0x36, 0x5e, 0x1a, 0x66, 0xc2, 0xfa, 0x15,
+    0xc6, 0x4e, 0x8d, 0x42, 0xa9, 0x14, 0x81, 0x38, 0x36, 0xbe, 0x56, 0x96, 0x41, 0xe6, 0xaf, 0xb1, 0xa7, 0x00, 0x94,
+    0x04, 0x16, 0x5f, 0x53, 0xc9, 0x8b, 0xc2, 0x3a, 0x1d, 0xef, 0x10, 0x1d, 0x2b, 0x11, 0x5a, 0x13, 0xf9, 0x5a, 0x9f,
+    0xc5, 0x7e, 0xcd, 0x25, 0x34, 0x29, 0x99, 0x0f, 0xf2, 0xc0, 0x56, 0x81, 0x88, 0x4a, 0xb7, 0x25, 0x83, 0x84, 0x1c,
+    0xd2, 0x55, 0xa2, 0xd7, 0x46, 0x32, 0x68, 0x9d, 0x0a, 0x89, 0x96, 0x0e, 0xc3, 0xc8, 0x41, 0xc7, 0x9d, 0xd6, 0x62,
+    0x85, 0x90, 0x4d, 0x7b, 0x93, 0x58, 0x11, 0x9d, 0xd3, 0x1c, 0x4d, 0x38, 0x53, 0xa7, 0x3b, 0x0e, 0xa0, 0x03, 0x62,
+    0x7f, 0x85, 0xf5, 0xd6, 0x9a, 0x9d, 0xae, 0x5f, 0x39, 0x7c, 0x97, 0x97, 0x11, 0xf2, 0x83, 0x30, 0x78, 0x61, 0xcd,
+    0x06, 0x4a, 0xf6, 0xee, 0xbd, 0xc4, 0x56, 0x64, 0x7f, 0x56, 0x25, 0x95, 0xa7, 0x50, 0xe3, 0xdc, 0xfa, 0x3a, 0x31,
+    0x33, 0xb4, 0xa8, 0x2a, 0xf6, 0x0d, 0xa9, 0xbe, 0xaf, 0x14, 0x76, 0x85, 0xf2, 0xbe, 0x1c, 0x3a, 0x76, 0x5d, 0x37,
+    0xc8, 0xc9, 0x79, 0xb9, 0xb3, 0xce, 0x85, 0xbc, 0x7b, 0xd7, 0xf4, 0x99, 0x4e, 0xf5, 0xf0, 0x4f, 0x1c, 0x54, 0xce,
+    0xc5, 0x45, 0x4a, 0x16, 0xcc, 0x13, 0xa5, 0x8e, 0x56, 0x1c, 0xd0, 0x76, 0x0f, 0x3d, 0xed, 0xe8, 0x2c, 0x8a, 0xb9,
+    0xa5, 0x47, 0x11, 0x9e, 0x36, 0xca, 0x27, 0x69, 0x74, 0x00, 0x5e, 0x68, 0x42, 0x92, 0x13, 0x6e, 0xda, 0xa2, 0xc5,
+    0x68, 0xca, 0x30, 0x04, 0xae, 0xec, 0x09, 0x53, 0xf6, 0xdc, 0x41, 0xbc, 0xc5, 0xc0, 0x6c, 0x3d, 0xec, 0x65, 0xb3,
+    0x7b, 0xcd, 0xfc, 0x87, 0x35, 0x02, 0xd9, 0x36, 0x53, 0x75, 0x65, 0xe3, 0x5d, 0x8a, 0x48, 0x8c, 0xb0, 0xad, 0x1b,
+    0x5b, 0xda, 0xfa, 0xbd, 0x86, 0x7b, 0x5d, 0x39, 0xe6, 0x35, 0xa5, 0xda, 0xd0, 0xc3, 0xca, 0xcd, 0x61, 0xa6, 0x23,
+    0x2f, 0x56, 0xd0, 0xed, 0x89, 0xa0, 0x10, 0x38, 0x11, 0xda, 0x1e, 0x54, 0xdc, 0x40, 0xa4, 0xe4, 0x4a, 0xab, 0x66,
+    0x8b, 0x64, 0x2c, 0x81, 0x05, 0x17, 0x96, 0x4b, 0x3e, 0x3a, 0x8b, 0x93, 0xa4, 0x2a, 0xfd, 0x43, 0x05, 0xbc, 0x18,
+    0xf6, 0x26, 0xd1, 0x2e, 0x30, 0x5a, 0x28, 0x10, 0x5c, 0x6d, 0x84, 0xbd, 0x77, 0xdc, 0x6a, 0xdd, 0x45, 0xc4, 0x91,
+    0x9b, 0xd1, 0x08, 0xa8, 0xc7, 0x08, 0xab, 0x66, 0xed, 0xbd, 0x67, 0x18, 0x52, 0x33, 0xf0, 0x41, 0x75, 0x46, 0xc5,
+    0x9f, 0x65, 0x4f, 0x7d, 0x26, 0x7a, 0x37, 0xaa, 0xae, 0x66, 0x40, 0x45, 0x05, 0x3e, 0xcc, 0x10, 0x4b, 0x5b, 0x05,
+    0x02, 0x72, 0x3d, 0x2c, 0x4a, 0x01, 0x93, 0x34, 0x58, 0x50, 0x0a, 0xac, 0xb5, 0xb2, 0x7b, 0x79, 0x53, 0x30, 0x87,
+    0x42, 0xe1, 0xa2, 0xff, 0x93, 0x6c, 0x36, 0x47, 0xcb, 0xac, 0xc1, 0xd4, 0xd0, 0xe0, 0x7d, 0xa3, 0xbe, 0x5c, 0x53,
+    0x56, 0xeb, 0x43, 0x3b, 0xb2, 0xc6, 0x4f, 0xda, 0x51, 0x06, 0x87, 0x6a, 0xa1, 0x8b, 0xea, 0x76, 0x73, 0x53, 0xc4,
+    0xac, 0xe3, 0x71, 0x9f, 0xf4, 0xb6, 0xb6, 0x26, 0x3d, 0x4d, 0x03, 0x92, 0x49, 0x92, 0xe1, 0x4d, 0x06, 0x28, 0x2b,
+    0xe2, 0x2c, 0xcb, 0x06, 0xf9, 0x96, 0x65, 0x89, 0xeb, 0xf7, 0x6d, 0x6f, 0xaf, 0xe6, 0x59, 0x7b, 0x7b, 0x57, 0xbb,
+    0xc8, 0x55, 0x9d, 0xf4, 0x20, 0x0f, 0x87, 0x50, 0xb4, 0x62, 0x53, 0x86, 0xcb, 0x59, 0x36, 0x66, 0x81, 0x0d, 0xdd,
+    0x53, 0xbb, 0x94, 0x9b, 0x26, 0x81, 0xcd, 0x91, 0x30, 0x67, 0xf9, 0xae, 0x1e, 0x49, 0x0d, 0xf6, 0x80, 0x05, 0xb4,
+    0xb9, 0xf0, 0x5d, 0x78, 0x92, 0x64, 0xc7, 0x51, 0x72, 0x20, 0x14, 0x78, 0xad, 0xe5, 0x07, 0x70, 0x19, 0xc9, 0x62,
+    0x35, 0x94, 0xd4, 0x77, 0x83, 0xef, 0x82, 0x9b, 0x7b, 0x54, 0xde, 0x8a, 0xdd, 0xf1, 0xdb, 0x7e, 0xc7, 0x56, 0x11,
+    0xb1, 0x97, 0xe6, 0x74, 0xa0, 0x71, 0x0a, 0xa0, 0xcc, 0x01, 0x68, 0xb2, 0xc2, 0x9b, 0xb2, 0xf0, 0xe5, 0xe0, 0xa5,
+    0x72, 0xa9, 0x33, 0x70, 0x21, 0xc0, 0xc9, 0x4f, 0x62, 0xde, 0xc2, 0xf3, 0x48, 0xdb, 0x5b, 0x8a, 0x0a, 0x8c, 0x2b,
+    0x52, 0x5c, 0xba, 0x54, 0xde, 0xa0, 0xf7, 0x31, 0x3c, 0x82, 0x66, 0x1b, 0x1b, 0x4b, 0xe7, 0x55, 0xc4, 0xa7, 0x7e,
+    0x1e, 0xa5, 0xe3, 0x6c, 0xe6, 0xb8, 0x9b, 0xb6, 0xed, 0xfa, 0x05, 0x79, 0x22, 0x5f, 0xba, 0xe5, 0xc6, 0x91, 0x37,
+    0x62, 0xa1, 0x3d, 0xb0, 0x37, 0x3f, 0x7a, 0x07, 0x2c, 0x3c, 0xda, 0xdd, 0x58, 0x8e, 0x58, 0xd9, 0x3f, 0xf2, 0xce,
     0x75, 0xcc, 0xdd, 0x7b, 0x8b, 0x52, 0x06, 0x7a, 0x85, 0xfd, 0x73, 0x09, 0x06, 0xb0, 0x1b, 0xc5, 0xdf, 0x41, 0xca,
     0xbd, 0xa7, 0x03, 0x11, 0x19, 0xa7, 0xbd, 0xbc, 0xb4, 0x33, 0x8a, 0x18, 0xd8, 0x77, 0xb4, 0xb3, 0x7a, 0xf7, 0x6e,
-    0xa5, 0xe6, 0xab, 0x52, 0x6f, 0xc4, 0xc2, 0x9a, 0xa7, 0xee, 0x1d, 0xd0, 0xd1, 0x4a, 0x7d, 0x23, 0x8f, 0x18, 0x29,
-    0xcd, 0x55, 0x3b, 0xc1, 0x31, 0xb6, 0xf8, 0xfa, 0x6d, 0x7d, 0x28, 0xa2, 0x14, 0x7e, 0x0c, 0xd6, 0x4b, 0x04, 0xea,
-    0x1b, 0x1c, 0x1c, 0xef, 0x20, 0xdc, 0xda, 0x75, 0x06, 0x81, 0x73, 0xa7, 0xd5, 0xba, 0xfc, 0x69, 0xeb, 0xf0, 0xe7,
-    0xa8, 0xf5, 0xdb, 0x5e, 0xeb, 0xc7, 0xa1, 0x7b, 0xe9, 0xfc, 0xb4, 0x35, 0x38, 0x94, 0x6f, 0x87, 0x3f, 0xf7, 0x7f,
-    0x2a, 0x86, 0x5f, 0x8a, 0xc2, 0x0d, 0xd7, 0xdd, 0x3a, 0x01, 0x4f, 0x29, 0xdc, 0x6a, 0xb5, 0xfa, 0xf0, 0xb4, 0x80,
-    0x27, 0xfc, 0x79, 0x06, 0x3f, 0x2e, 0x0f, 0xad, 0xff, 0xf0, 0x53, 0xfa, 0x1f, 0x7f, 0xca, 0x87, 0x38, 0xe6, 0xe1,
-    0xcf, 0x3f, 0x15, 0xf6, 0xbd, 0x7e, 0xb8, 0x35, 0xdc, 0x74, 0x1d, 0x5d, 0xf3, 0x65, 0x58, 0x3d, 0x42, 0xab, 0xc3,
-    0x9f, 0xe5, 0x9b, 0x7d, 0xef, 0x68, 0xb7, 0x1f, 0x0e, 0x2f, 0x1d, 0xfb, 0xf2, 0x9e, 0x7b, 0xe9, 0xba, 0x97, 0x1b,
-    0x38, 0xcf, 0x1c, 0x46, 0xbf, 0x07, 0x3f, 0x4f, 0xe0, 0xa7, 0x0d, 0x3f, 0x4f, 0xe1, 0xe7, 0xcf, 0xd0, 0x4d, 0xc4,
-    0xdf, 0x2e, 0x29, 0x16, 0x72, 0x89, 0x07, 0x16, 0x11, 0xac, 0x82, 0xbb, 0xb1, 0x15, 0x7b, 0x13, 0x22, 0x1a, 0xec,
-    0x43, 0xdf, 0xf7, 0x31, 0x4c, 0xea, 0x2c, 0x3f, 0x6e, 0xc0, 0xa2, 0x23, 0xe7, 0x6c, 0x04, 0xcc, 0x13, 0x91, 0x83,
-    0x22, 0xe0, 0xe2, 0x6c, 0xb5, 0xc0, 0xc3, 0x55, 0x6f, 0x1c, 0x4e, 0x98, 0x03, 0x46, 0xc1, 0x73, 0x86, 0x0f, 0x5d,
-    0xd7, 0x7b, 0x26, 0xcf, 0x0c, 0x71, 0x9f, 0x0b, 0xd6, 0x4a, 0x33, 0x61, 0xd2, 0xd8, 0xae, 0x37, 0x5f, 0x53, 0x09,
-    0xdb, 0x3a, 0x3d, 0x81, 0xba, 0x0d, 0x71, 0xd0, 0xf6, 0x3d, 0x8b, 0x3e, 0xe1, 0x96, 0x7c, 0x6d, 0x1c, 0x02, 0xaf,
-    0x58, 0xf2, 0x4d, 0xa3, 0xd1, 0xb0, 0x11, 0x85, 0x3b, 0xf6, 0x98, 0xc1, 0x0c, 0x2b, 0x26, 0x22, 0x27, 0xa5, 0x29,
-    0x2c, 0x5b, 0x98, 0xfc, 0x6d, 0x94, 0xf3, 0x8d, 0xca, 0xb0, 0x0d, 0x6b, 0x96, 0x6c, 0xd3, 0xd2, 0xbf, 0xc5, 0x14,
-    0x68, 0x5a, 0xd2, 0xf9, 0x87, 0x39, 0x7e, 0x98, 0x12, 0x5a, 0xaf, 0x1d, 0x0e, 0x1e, 0x7a, 0x01, 0x72, 0x47, 0xf4,
-    0x73, 0xde, 0xa2, 0x1a, 0x83, 0xbf, 0x32, 0xcc, 0xe0, 0x89, 0xf9, 0x30, 0x44, 0xb3, 0x2c, 0x75, 0x70, 0x2b, 0x45,
-    0x71, 0xff, 0x02, 0x77, 0x46, 0x5a, 0x7a, 0xfb, 0xa1, 0xda, 0x31, 0x07, 0x39, 0x63, 0xdf, 0x47, 0xc9, 0x27, 0x96,
-    0x3b, 0xe7, 0x5e, 0xa7, 0xfb, 0x15, 0x75, 0xf6, 0xd0, 0x36, 0x7b, 0x55, 0x1d, 0xa3, 0x29, 0xb3, 0x40, 0x1d, 0x11,
-    0xb6, 0x3a, 0x5e, 0x8e, 0x51, 0x2d, 0x24, 0x41, 0xe1, 0x65, 0x61, 0x97, 0x38, 0xdc, 0xde, 0x2d, 0x4e, 0x4f, 0xfa,
-    0x76, 0x60, 0xdb, 0x60, 0xf1, 0x1f, 0x50, 0xd8, 0x4a, 0x18, 0x16, 0x60, 0x90, 0xed, 0xc6, 0x3d, 0xbe, 0xb9, 0x59,
-    0x05, 0x9c, 0xf0, 0x20, 0x9d, 0xba, 0x27, 0x5e, 0xe4, 0x4d, 0x43, 0x18, 0x70, 0x04, 0xcd, 0xb0, 0x4b, 0x6f, 0xb4,
-    0x1b, 0xcb, 0x69, 0x30, 0x16, 0xe2, 0x27, 0x51, 0xc1, 0x5f, 0x60, 0x3c, 0x22, 0x1c, 0xa1, 0xb1, 0xef, 0xb3, 0x73,
-    0x36, 0x52, 0x76, 0x06, 0x10, 0x2a, 0x72, 0x7b, 0xee, 0x28, 0x34, 0x9a, 0xc1, 0xdc, 0x61, 0x78, 0x30, 0xb0, 0x61,
-    0x2f, 0xc1, 0xae, 0x0c, 0xa3, 0xc3, 0xce, 0x70, 0x90, 0x86, 0x20, 0x6b, 0x35, 0x6d, 0x65, 0xd1, 0xa2, 0x56, 0xd4,
-    0x1d, 0x0e, 0x9c, 0x53, 0x30, 0xd2, 0xc1, 0x16, 0x77, 0xf0, 0x0d, 0x23, 0x14, 0x45, 0xf8, 0x8e, 0x9d, 0x3c, 0x3b,
-    0x9f, 0x3b, 0xf6, 0xee, 0x96, 0xbd, 0x89, 0xa5, 0x9e, 0x0d, 0xec, 0x05, 0x73, 0x87, 0x67, 0xae, 0xd9, 0x79, 0x7b,
-    0x88, 0xa0, 0x62, 0x21, 0x4e, 0x7e, 0x36, 0xb0, 0xfb, 0x62, 0xea, 0x36, 0x0c, 0x9a, 0xca, 0xe5, 0xc7, 0x15, 0x3d,
-    0x20, 0x54, 0x55, 0x57, 0x05, 0x1d, 0x94, 0x75, 0x03, 0x67, 0x6a, 0x22, 0xd1, 0xc2, 0xc9, 0x24, 0x15, 0xc0, 0xe1,
-    0xc1, 0x66, 0x30, 0xa9, 0xd1, 0x6d, 0x7b, 0x38, 0x38, 0x0b, 0xee, 0xd9, 0xf7, 0xd4, 0xcb, 0x09, 0x0b, 0xc0, 0xbb,
-    0xa0, 0xe9, 0x4f, 0x50, 0x8b, 0xc0, 0xcf, 0x39, 0x03, 0x24, 0xcf, 0xa8, 0x68, 0x2c, 0x8b, 0x16, 0x58, 0x74, 0x10,
+    0xa5, 0xe6, 0xab, 0x52, 0xf0, 0x3e, 0xc2, 0x9a, 0xa7, 0xee, 0x3d, 0xa7, 0xa3, 0x95, 0xfa, 0x46, 0x1e, 0x33, 0x52,
+    0x9a, 0xab, 0x76, 0x82, 0x63, 0x6c, 0xf1, 0xf5, 0xdb, 0xfa, 0x50, 0x44, 0x29, 0xfc, 0x18, 0xac, 0x97, 0x08, 0xd4,
+    0x37, 0x38, 0x38, 0xde, 0x41, 0xb8, 0xb5, 0xeb, 0x0c, 0x02, 0xe7, 0x4e, 0xab, 0x75, 0xf9, 0xd3, 0xd6, 0xe1, 0xcf,
+    0x51, 0xeb, 0xb7, 0xbd, 0xd6, 0x8f, 0x43, 0xf7, 0xd2, 0xf9, 0x69, 0x6b, 0x70, 0x28, 0xdf, 0x0e, 0x7f, 0xee, 0xff,
+    0x54, 0x0c, 0xff, 0x24, 0x0a, 0x37, 0x5c, 0x77, 0xeb, 0xc4, 0x5b, 0xb0, 0x70, 0xab, 0xd5, 0xea, 0xc3, 0xd3, 0x1c,
+    0x9e, 0xf0, 0xe7, 0x19, 0xfc, 0xb8, 0x3c, 0xb4, 0xfe, 0xd3, 0x4f, 0xe9, 0xdf, 0xfc, 0x94, 0x0f, 0x71, 0xcc, 0xc3,
+    0x9f, 0x7f, 0x2a, 0xec, 0x7b, 0xfd, 0x70, 0x6b, 0xb8, 0xe9, 0x3a, 0xba, 0xe6, 0x4f, 0x61, 0xf5, 0x08, 0xad, 0x0e,
+    0x7f, 0x96, 0x6f, 0xf6, 0xbd, 0xa3, 0xdd, 0x7e, 0x38, 0xbc, 0x74, 0xec, 0xcb, 0x7b, 0xee, 0xa5, 0xeb, 0x5e, 0x6e,
+    0xe0, 0x3c, 0x27, 0x30, 0xfa, 0x3d, 0xf8, 0x79, 0x0a, 0x3f, 0x6d, 0xf8, 0x39, 0x81, 0x9f, 0x3f, 0x43, 0x37, 0x11,
+    0x7f, 0xbb, 0xa4, 0x58, 0xc8, 0x25, 0x1e, 0x58, 0x44, 0xb0, 0x0a, 0xee, 0xc6, 0x56, 0xec, 0x6d, 0x10, 0xd1, 0x60,
+    0x1f, 0xfa, 0xbe, 0x8f, 0x61, 0x52, 0x67, 0xf9, 0x71, 0x03, 0x16, 0x1d, 0x39, 0x67, 0x23, 0x60, 0x9e, 0x88, 0x1c,
+    0x14, 0x01, 0x17, 0x67, 0xab, 0x05, 0x1e, 0xae, 0x7a, 0xe3, 0x70, 0x83, 0x39, 0x60, 0x14, 0xbc, 0x66, 0xf8, 0xd0,
+    0x75, 0xbd, 0x67, 0xf2, 0xcc, 0x10, 0xf7, 0xb9, 0x60, 0xad, 0x34, 0x13, 0x26, 0x8d, 0xed, 0x7a, 0xf3, 0x35, 0x95,
+    0xb0, 0xad, 0xd3, 0x13, 0xa8, 0x9b, 0x89, 0x83, 0xb6, 0xef, 0x58, 0xf4, 0x09, 0xb7, 0xe4, 0x2b, 0xe3, 0x10, 0x78,
+    0xc5, 0x92, 0x6f, 0x1a, 0x8d, 0x86, 0x8d, 0x28, 0xdc, 0xb1, 0xc7, 0x0c, 0x66, 0x58, 0x31, 0x11, 0x39, 0x29, 0x4d,
+    0x61, 0xd9, 0xc2, 0xe4, 0x6f, 0xa3, 0x9c, 0x6f, 0x54, 0x86, 0x6d, 0x58, 0xb3, 0x64, 0x9b, 0x96, 0xfe, 0x2d, 0xa6,
+    0x40, 0xd3, 0x92, 0xce, 0x3f, 0xcc, 0xf1, 0xc3, 0x94, 0xd0, 0x7a, 0xed, 0x70, 0xf0, 0xd0, 0x0b, 0x90, 0x3b, 0xa2,
+    0x9f, 0xf3, 0x16, 0xd5, 0x18, 0xfc, 0x95, 0x61, 0x06, 0x4f, 0xcc, 0x87, 0x21, 0x9a, 0x65, 0xa9, 0x83, 0x5b, 0x29,
+    0x8a, 0xfb, 0x17, 0xb8, 0x33, 0xd2, 0xd2, 0xdb, 0x0f, 0xd5, 0x8e, 0x39, 0xc8, 0x19, 0xfb, 0x2e, 0x4a, 0x3e, 0xb1,
+    0xdc, 0x39, 0xf7, 0x3a, 0xdd, 0x2f, 0xa9, 0xb3, 0x87, 0xb6, 0xd9, 0xbb, 0xea, 0x18, 0x4d, 0x99, 0x05, 0xea, 0x88,
+    0xb0, 0xd5, 0xf1, 0x72, 0x8c, 0x6a, 0x21, 0x09, 0x0a, 0x2f, 0x0b, 0xbb, 0xc4, 0xe1, 0xf6, 0x6e, 0x71, 0x7a, 0xd2,
+    0xb7, 0x03, 0xdb, 0x06, 0x8b, 0xff, 0x80, 0xc2, 0x56, 0xc2, 0xb0, 0x00, 0x83, 0x6c, 0x37, 0xee, 0xf1, 0xcd, 0xcd,
+    0x2a, 0xe0, 0x84, 0x07, 0xe9, 0xd4, 0x3d, 0xf1, 0x22, 0x6f, 0x1a, 0xc2, 0x80, 0x23, 0x68, 0x86, 0x5d, 0x7a, 0xa3,
+    0xdd, 0x58, 0x4e, 0x83, 0xb1, 0x10, 0x3f, 0x89, 0x0a, 0xfe, 0x02, 0xe3, 0x11, 0xe1, 0x08, 0x8d, 0x7d, 0x9f, 0x9d,
+    0xb3, 0x91, 0xb2, 0x33, 0x80, 0x50, 0x91, 0xdb, 0x73, 0x47, 0xa1, 0xd1, 0x0c, 0xe6, 0x0e, 0xc3, 0x83, 0x81, 0x0d,
+    0x7b, 0x09, 0x76, 0x65, 0x18, 0x1d, 0x76, 0x86, 0x83, 0x34, 0x5c, 0xb0, 0x40, 0xd3, 0x56, 0x16, 0xcd, 0x6b, 0x45,
+    0xdd, 0xe1, 0xc0, 0x99, 0x80, 0x91, 0x0e, 0xb6, 0xb8, 0x83, 0x6f, 0x18, 0xa1, 0x28, 0xc2, 0x77, 0xec, 0xe4, 0xd9,
+    0xf9, 0xdc, 0xb1, 0x77, 0xb7, 0xec, 0x4d, 0x2c, 0xf5, 0x6c, 0x60, 0x2f, 0x98, 0x3b, 0x3c, 0x73, 0xcd, 0xce, 0xdb,
+    0x43, 0x04, 0x15, 0x0b, 0x71, 0xf2, 0xb3, 0x81, 0xdd, 0x17, 0x53, 0xb7, 0x61, 0xd0, 0x54, 0x2e, 0x3f, 0xae, 0xe8,
+    0x01, 0xa1, 0xaa, 0xba, 0x2a, 0xe8, 0xa0, 0xac, 0x1b, 0x38, 0x53, 0x13, 0x89, 0x16, 0x4e, 0x26, 0xa9, 0x00, 0x0e,
+    0x0f, 0x36, 0x83, 0x49, 0x8d, 0x6e, 0xdb, 0xc3, 0xc1, 0x59, 0x70, 0xcf, 0xbe, 0xa7, 0x5e, 0x4e, 0x59, 0x70, 0xc2,
+    0xc4, 0xf4, 0xa7, 0x20, 0xed, 0xf0, 0xe7, 0x09, 0x03, 0x24, 0xcf, 0xa8, 0x68, 0x21, 0x8b, 0xe6, 0x58, 0x74, 0x10,
     0x20, 0xa8, 0x5e, 0xa1, 0xad, 0x3f, 0xb1, 0x26, 0xe3, 0x90, 0x60, 0xbf, 0x7b, 0x17, 0x96, 0x66, 0xb3, 0x33, 0xc4,
-    0xf3, 0x86, 0x9c, 0x17, 0xdf, 0xc7, 0x1c, 0x54, 0xc2, 0x56, 0xdf, 0x76, 0x07, 0xb6, 0x85, 0x4b, 0xdb, 0xcb, 0x36,
-    0x43, 0x41, 0xe1, 0x78, 0xf3, 0x3d, 0x0b, 0xa6, 0xfd, 0xb0, 0x3d, 0x70, 0x72, 0xa1, 0x3a, 0x12, 0x3c, 0xb7, 0x14,
-    0x12, 0xbc, 0xed, 0x4d, 0x41, 0xa0, 0x23, 0xe7, 0x6e, 0xd8, 0x9b, 0xaa, 0x10, 0x8a, 0x3e, 0x6e, 0x8e, 0xdd, 0x20,
-    0x86, 0x1f, 0x4e, 0x0b, 0x99, 0x66, 0xaa, 0xfb, 0x6a, 0xcd, 0xec, 0x06, 0x63, 0x65, 0x91, 0x27, 0x61, 0xb6, 0xe9,
-    0x60, 0x84, 0x16, 0x24, 0xed, 0xee, 0x00, 0x60, 0xd8, 0x74, 0x14, 0xa7, 0x6d, 0x29, 0x56, 0x53, 0xf6, 0xf9, 0x61,
-    0xb5, 0x1c, 0x6c, 0x10, 0x31, 0xbf, 0xd2, 0x3e, 0x00, 0x56, 0x90, 0x78, 0xf9, 0x50, 0x9d, 0x79, 0x3d, 0xaf, 0x9d,
-    0x6f, 0x2d, 0x95, 0x28, 0x62, 0x9e, 0x21, 0xa1, 0x78, 0xa9, 0xdd, 0x30, 0x61, 0x6e, 0xcf, 0x91, 0x18, 0x9a, 0xe5,
-    0xc3, 0x36, 0x30, 0xbd, 0x0a, 0xb0, 0xa7, 0xe6, 0xb6, 0x48, 0xc2, 0xaa, 0xb9, 0x77, 0x08, 0xac, 0x3d, 0x0c, 0x5f,
-    0x89, 0x13, 0xc7, 0x9e, 0x8a, 0xe6, 0xb3, 0x24, 0x7c, 0xde, 0x38, 0x2e, 0x8e, 0xf0, 0x44, 0x68, 0xdf, 0x1f, 0x2d,
-    0x72, 0x90, 0x07, 0xfc, 0x35, 0x58, 0x06, 0xa1, 0x6c, 0x8a, 0x8e, 0x1e, 0x1e, 0x01, 0x7b, 0x84, 0x78, 0x23, 0x6c,
-    0x6e, 0x54, 0xa3, 0x45, 0x49, 0xc6, 0x0b, 0x1d, 0x0c, 0xf7, 0xb8, 0x74, 0xed, 0x51, 0x30, 0xc8, 0x13, 0x63, 0x07,
-    0xcf, 0xfc, 0xfd, 0x11, 0x56, 0xe3, 0x04, 0x85, 0x5b, 0xd2, 0x6e, 0xab, 0xc4, 0xdf, 0xbe, 0x9f, 0x82, 0x04, 0xc7,
-    0x3a, 0xf0, 0xb3, 0xee, 0xde, 0x4d, 0x24, 0x52, 0xbb, 0x69, 0x8f, 0x4e, 0x22, 0x30, 0x1e, 0x9c, 0xfb, 0x29, 0x54,
-    0x23, 0x89, 0xa8, 0x28, 0x47, 0x0b, 0xd4, 0x3c, 0x55, 0xab, 0xe0, 0x3b, 0x34, 0x23, 0xf0, 0x1c, 0xc3, 0xd6, 0xe4,
-    0xa7, 0xea, 0xc6, 0x22, 0x96, 0xef, 0xba, 0x74, 0xb4, 0x85, 0x07, 0x90, 0x82, 0xd1, 0x04, 0xc3, 0xb8, 0x14, 0x94,
-    0xac, 0xf8, 0xef, 0xa3, 0x11, 0x2b, 0x9f, 0x1e, 0x66, 0x9b, 0x9b, 0x43, 0x71, 0x6e, 0x41, 0x8c, 0xc3, 0x8d, 0xe8,
-    0x6a, 0x5c, 0x01, 0x50, 0x9f, 0xce, 0x89, 0xeb, 0x81, 0x69, 0xc5, 0x9a, 0x2e, 0xc5, 0x3e, 0x39, 0xcc, 0x00, 0x14,
-    0xdc, 0x72, 0x0e, 0xfd, 0xc1, 0x9f, 0x86, 0xe0, 0x1e, 0xfb, 0x5f, 0xba, 0x5b, 0x4a, 0xd0, 0xf4, 0xe4, 0x99, 0xe2,
-    0x92, 0xce, 0x58, 0x3b, 0x1e, 0xc5, 0x46, 0x83, 0xc2, 0x4b, 0x01, 0x03, 0xd0, 0xe6, 0x20, 0x13, 0x2a, 0x0e, 0x42,
-    0x8e, 0x0a, 0x6c, 0x1f, 0x37, 0x3f, 0xc7, 0x9d, 0xfd, 0x14, 0x2c, 0xbc, 0x81, 0x7e, 0x7b, 0x0c, 0x6f, 0x7f, 0xd2,
-    0x6f, 0x2f, 0x59, 0xf0, 0x4b, 0x29, 0x43, 0xf7, 0xb5, 0x29, 0x1e, 0xa8, 0x29, 0x4a, 0xb1, 0x44, 0x06, 0x0d, 0x99,
-    0x9b, 0xaf, 0xc4, 0x6c, 0xb8, 0x5b, 0xa2, 0xda, 0x91, 0xa2, 0x2b, 0xf7, 0x79, 0x74, 0x82, 0xc4, 0x75, 0x4d, 0x52,
-    0x18, 0xb9, 0x04, 0x26, 0xc2, 0x15, 0xdf, 0x12, 0x73, 0xf6, 0xdb, 0x60, 0x83, 0xd7, 0xf2, 0x0e, 0xd0, 0xbe, 0x63,
-    0xb3, 0x39, 0xbf, 0xd8, 0x27, 0x45, 0x1f, 0xc8, 0xb4, 0x01, 0x71, 0x76, 0xde, 0xee, 0xc5, 0xbb, 0xbc, 0x17, 0x83,
-    0x54, 0xcf, 0x15, 0x8b, 0xe1, 0x5e, 0xf5, 0xde, 0x62, 0x94, 0xd2, 0x64, 0x26, 0xaf, 0x86, 0x5e, 0x57, 0xa2, 0xb7,
-    0xb9, 0x09, 0x08, 0xf6, 0x8c, 0xae, 0x5c, 0x74, 0x2d, 0x4b, 0x41, 0x13, 0x80, 0xe8, 0x51, 0x9d, 0xe5, 0x88, 0xe3,
-    0x30, 0x9b, 0x0d, 0x05, 0x07, 0x73, 0xd7, 0x8e, 0x8a, 0x63, 0x62, 0x77, 0x99, 0xb0, 0x03, 0x98, 0x11, 0x97, 0xb7,
-    0x3a, 0x22, 0x3a, 0x2c, 0xfa, 0xeb, 0xf8, 0xf6, 0x47, 0x8f, 0x6d, 0x76, 0x5c, 0xd0, 0x20, 0xb5, 0xb1, 0x1e, 0x56,
-    0x63, 0x41, 0x7d, 0xf8, 0x51, 0x53, 0xa9, 0x2c, 0x36, 0x37, 0xcb, 0xfa, 0x51, 0xad, 0xda, 0xc1, 0xb5, 0xd3, 0x94,
-    0xf3, 0x66, 0x36, 0x08, 0x07, 0x22, 0x26, 0x50, 0xa0, 0xa5, 0x95, 0x15, 0x03, 0x0c, 0x29, 0xcb, 0x51, 0x3e, 0x85,
-    0xcc, 0x8b, 0xcb, 0x52, 0xa7, 0xbe, 0xc8, 0x78, 0x64, 0x88, 0xa7, 0x9e, 0x64, 0xac, 0x80, 0x82, 0xf5, 0x52, 0x2f,
-    0xa1, 0x25, 0x02, 0xcc, 0x9f, 0xa9, 0x1c, 0x1a, 0x61, 0x81, 0x44, 0xa1, 0x61, 0x96, 0x28, 0xe3, 0xb3, 0x08, 0x63,
-    0xd0, 0xf6, 0x4f, 0x6a, 0xb1, 0xaf, 0x42, 0x19, 0x1d, 0xc5, 0x61, 0x3e, 0x0c, 0xa8, 0x7e, 0x21, 0x25, 0xd8, 0x34,
-    0x7c, 0x0f, 0x6c, 0x54, 0x39, 0x9e, 0x24, 0x08, 0x9f, 0xc6, 0x39, 0x23, 0x4f, 0x61, 0x43, 0xc2, 0x2c, 0x4d, 0xdb,
-    0x48, 0xb5, 0x8b, 0xcc, 0x20, 0x94, 0x0b, 0xf3, 0x4f, 0x8d, 0xb3, 0x8b, 0x2c, 0x5c, 0x69, 0x0d, 0xe6, 0xc7, 0x1b,
-    0x13, 0xa0, 0xec, 0xf2, 0x32, 0x13, 0x3e, 0x6e, 0x44, 0xf6, 0x86, 0xae, 0x98, 0x0e, 0x14, 0x52, 0x81, 0x13, 0x91,
-    0xc5, 0x43, 0x67, 0x28, 0x34, 0xc2, 0x01, 0x9d, 0x22, 0xe7, 0xae, 0xb1, 0xe9, 0xf3, 0x81, 0xf6, 0x8d, 0xd2, 0xd0,
-    0x49, 0x40, 0x08, 0x08, 0xdc, 0x0d, 0x6b, 0x2a, 0x1d, 0xa4, 0x41, 0x42, 0xa5, 0xe8, 0xe7, 0x00, 0xfe, 0x61, 0x24,
-    0x29, 0x00, 0xf6, 0x43, 0x35, 0x52, 0x44, 0x59, 0x16, 0xb8, 0x00, 0x34, 0xd7, 0x3e, 0xae, 0x84, 0x2f, 0x0c, 0x54,
-    0x98, 0x9e, 0x66, 0xe5, 0xa5, 0x50, 0x22, 0xef, 0xd6, 0xa4, 0xac, 0x91, 0x4c, 0x3e, 0x45, 0x87, 0x4f, 0x79, 0xd7,
-    0xaf, 0x25, 0x1e, 0xba, 0xe0, 0x29, 0x2c, 0xab, 0x7a, 0x7e, 0x15, 0x72, 0x72, 0xae, 0x41, 0x57, 0x48, 0xa1, 0xbf,
-    0xe2, 0x24, 0xef, 0xbd, 0xf2, 0xab, 0x5a, 0x6a, 0x0c, 0x65, 0xef, 0xd7, 0x35, 0xc3, 0xf2, 0x72, 0x5e, 0x85, 0x29,
-    0x08, 0xb8, 0x25, 0x4b, 0x82, 0xa5, 0xd4, 0x10, 0x60, 0x61, 0x7b, 0xa4, 0x95, 0x82, 0xbc, 0xd4, 0xe1, 0x9d, 0xa7,
-    0x60, 0x05, 0x18, 0x87, 0x5a, 0x2a, 0x99, 0x46, 0x12, 0x5f, 0x2a, 0x51, 0x60, 0xca, 0xfd, 0x11, 0xf8, 0xa9, 0xcd,
-    0x93, 0xae, 0x73, 0xd7, 0x8f, 0x67, 0x98, 0xda, 0x43, 0xa0, 0xc7, 0xde, 0x1d, 0x30, 0x25, 0xea, 0x3a, 0xac, 0x20,
-    0x0e, 0xcd, 0x6a, 0x9a, 0x05, 0xcc, 0x98, 0x36, 0x68, 0xc9, 0x36, 0xd8, 0x72, 0x39, 0xd8, 0x47, 0x62, 0x7b, 0x56,
-    0x2b, 0x20, 0x74, 0x0d, 0x1a, 0x18, 0x72, 0x97, 0x0a, 0x2d, 0xcc, 0x7b, 0x5d, 0x2a, 0xc2, 0xfd, 0x39, 0xe0, 0xd2,
-    0x0a, 0xce, 0xbc, 0x8c, 0x06, 0xde, 0x8f, 0x8f, 0x13, 0x4c, 0x7c, 0x41, 0xac, 0xc0, 0x0e, 0x0e, 0x3a, 0xcd, 0xa6,
-    0xc0, 0xa9, 0xb8, 0x48, 0x19, 0x2c, 0x2b, 0x4a, 0x6d, 0xf8, 0x21, 0x45, 0xb6, 0xee, 0xf2, 0x40, 0x77, 0x21, 0x16,
-    0xc0, 0x4e, 0xbf, 0x60, 0xe4, 0x5b, 0xd6, 0xcb, 0x80, 0xc1, 0xa9, 0xd6, 0x38, 0x08, 0xfc, 0xe6, 0x66, 0x32, 0x2c,
-    0x53, 0x62, 0xbb, 0x26, 0xab, 0x0b, 0xc8, 0x61, 0xa8, 0x26, 0xee, 0x20, 0x2c, 0x95, 0x3d, 0x5e, 0x94, 0x33, 0x5c,
-    0x2e, 0x65, 0x21, 0x37, 0xcf, 0xab, 0x69, 0x3e, 0xb7, 0xd2, 0x6c, 0x3a, 0xde, 0x8a, 0x2f, 0x0a, 0xfe, 0x81, 0x13,
-    0x4b, 0xab, 0x9e, 0x52, 0x2b, 0x3c, 0xca, 0xdc, 0x92, 0x75, 0x4a, 0x6a, 0x75, 0xdd, 0x40, 0x35, 0xc2, 0xd3, 0x34,
-    0x6c, 0x04, 0x42, 0x4c, 0x70, 0xf1, 0xeb, 0x26, 0x13, 0xd3, 0xde, 0x12, 0x52, 0x47, 0xd8, 0x3d, 0x94, 0x13, 0xdc,
-    0xd5, 0x3c, 0xfb, 0x3c, 0x9c, 0x5f, 0xcd, 0xdc, 0x7b, 0x06, 0x73, 0x3f, 0x0e, 0xb9, 0xc1, 0xe8, 0xb1, 0x4c, 0xf8,
-    0x91, 0xb1, 0x8f, 0x5c, 0x55, 0x3d, 0x39, 0x09, 0x2b, 0x91, 0x25, 0x9e, 0x8c, 0xa3, 0x0e, 0xe3, 0x54, 0xb4, 0x26,
-    0xc8, 0x2e, 0x2f, 0x0b, 0x73, 0x2f, 0x50, 0xd0, 0xd4, 0xe3, 0xf5, 0x38, 0x6d, 0xc5, 0xce, 0x46, 0x24, 0x72, 0xef,
-    0x55, 0x2d, 0x12, 0x59, 0xf1, 0x39, 0x8e, 0x74, 0xc5, 0x41, 0xee, 0x93, 0x93, 0xd5, 0x4d, 0x2a, 0x74, 0x8b, 0x46,
-    0xdb, 0xd8, 0xa3, 0xfa, 0x40, 0x52, 0xcf, 0xa8, 0xc0, 0xaa, 0xc6, 0xbe, 0x7b, 0xb7, 0x23, 0xd2, 0x2d, 0x95, 0x62,
-    0x83, 0xa5, 0x85, 0xd1, 0x8c, 0x51, 0x30, 0x28, 0x29, 0x32, 0x50, 0xa3, 0xfc, 0x0a, 0xc1, 0xb0, 0x47, 0x0d, 0x40,
-    0x71, 0xae, 0xaf, 0x7e, 0x5c, 0x4a, 0xb6, 0x10, 0x90, 0xb8, 0x4b, 0x06, 0x62, 0x4d, 0x30, 0x33, 0xf2, 0xc9, 0x7b,
-    0xe0, 0xbc, 0x01, 0x43, 0x1f, 0x01, 0xfc, 0x02, 0xb1, 0xe9, 0xc1, 0xc4, 0xb6, 0x89, 0x28, 0xfa, 0x6c, 0xe0, 0x39,
-    0x00, 0x3b, 0xaf, 0x42, 0xa3, 0xef, 0xaa, 0x14, 0x30, 0x64, 0x03, 0x37, 0x60, 0x55, 0x58, 0x6e, 0xef, 0x39, 0xb8,
-    0x0d, 0xf0, 0xfa, 0x4c, 0x36, 0xdf, 0xc0, 0x3c, 0xc1, 0xea, 0xec, 0xc2, 0xaf, 0x2c, 0x6b, 0x71, 0xee, 0x74, 0xd0,
-    0xa8, 0x57, 0x94, 0x10, 0xb5, 0xfb, 0x58, 0x7b, 0x80, 0x11, 0x16, 0xf1, 0xfe, 0x0a, 0xdf, 0xf5, 0xb8, 0xe5, 0x9e,
-    0x46, 0x8b, 0x30, 0x5d, 0x25, 0x8d, 0x41, 0xc9, 0xba, 0x9f, 0x8c, 0xb8, 0x97, 0xfb, 0x22, 0x16, 0x5c, 0xe1, 0xc8,
-    0xaa, 0x90, 0x62, 0x03, 0x49, 0x7a, 0xda, 0xa3, 0x03, 0xf6, 0x8d, 0x66, 0x2f, 0xa0, 0xcc, 0xfb, 0x8a, 0x54, 0x12,
-    0x52, 0x9a, 0xdd, 0x10, 0x49, 0xc2, 0x5a, 0x91, 0xa7, 0xce, 0xfb, 0x8e, 0xf6, 0xb9, 0x95, 0x44, 0x30, 0x82, 0x93,
-    0x30, 0x1d, 0x2b, 0x0f, 0x9a, 0x02, 0x5c, 0x45, 0x47, 0x4c, 0xdf, 0x04, 0xe4, 0x37, 0x03, 0xb9, 0xbd, 0x92, 0x5c,
-    0x9b, 0x6b, 0x18, 0x9e, 0x20, 0xc1, 0xaa, 0x48, 0x04, 0x1e, 0x51, 0x03, 0x8e, 0xf9, 0x3a, 0xcf, 0x03, 0x4c, 0xf8,
-    0xda, 0xde, 0x04, 0x80, 0x72, 0x72, 0x55, 0x9c, 0x95, 0x40, 0x37, 0x60, 0xb9, 0x3e, 0x4e, 0x8d, 0x8a, 0xc4, 0xc5,
-    0x8d, 0xe9, 0xea, 0x96, 0xfe, 0x0c, 0x2d, 0x67, 0x32, 0xc4, 0x74, 0x10, 0x04, 0x64, 0xea, 0x3b, 0xe6, 0x08, 0x99,
-    0x2b, 0xac, 0xcf, 0xb9, 0x53, 0x9b, 0xba, 0xc7, 0xa8, 0x9b, 0x27, 0xa9, 0xc5, 0xeb, 0xb4, 0x29, 0x25, 0x62, 0x52,
-    0x62, 0x6e, 0x88, 0x54, 0x6c, 0xa6, 0xc4, 0x9d, 0x5b, 0xdf, 0x68, 0x21, 0x6d, 0xb4, 0x0d, 0x91, 0x83, 0xcd, 0x2a,
-    0x79, 0x4f, 0x60, 0x3c, 0x17, 0x84, 0x2f, 0x5f, 0x51, 0x92, 0x0e, 0x73, 0x4c, 0x04, 0xab, 0x17, 0x53, 0x91, 0xbf,
-    0x73, 0x74, 0x9a, 0xbd, 0x41, 0x0f, 0x52, 0x6f, 0x20, 0x31, 0x6b, 0xe2, 0xbb, 0x90, 0x86, 0x3a, 0x42, 0xa0, 0x32,
-    0xaa, 0x65, 0x3a, 0x4e, 0xac, 0xc2, 0x37, 0x82, 0xaf, 0xde, 0xea, 0xe3, 0x7c, 0xe3, 0xb9, 0xb1, 0x1a, 0x41, 0x0c,
-    0xde, 0x42, 0x3e, 0xf4, 0xa4, 0x08, 0x07, 0xc2, 0xe5, 0x9b, 0x9b, 0xbd, 0x7c, 0x97, 0x57, 0x21, 0x92, 0x0a, 0xc6,
-    0x18, 0x33, 0x8a, 0x71, 0x4f, 0xd4, 0xd4, 0x62, 0x0e, 0x03, 0xcb, 0xd6, 0x61, 0x8e, 0x07, 0x00, 0xd0, 0xd2, 0x94,
-    0x5e, 0x35, 0x15, 0x2a, 0xcf, 0x73, 0x09, 0x9f, 0xea, 0x10, 0x55, 0x35, 0x7e, 0xbb, 0x3e, 0x03, 0x85, 0xe0, 0xbe,
-    0xd3, 0xf1, 0xf0, 0x10, 0x02, 0x56, 0x51, 0xc8, 0x02, 0xbd, 0x41, 0x7b, 0x55, 0x22, 0x14, 0x33, 0x27, 0xeb, 0x31,
-    0xc3, 0x49, 0x05, 0x5b, 0xa8, 0x84, 0xa5, 0xd2, 0x02, 0xbf, 0xda, 0x08, 0xcd, 0x53, 0xc6, 0xbd, 0x57, 0x15, 0xce,
-    0xa0, 0x3f, 0x98, 0xb7, 0xca, 0xa8, 0x6f, 0x57, 0x4e, 0x64, 0x2a, 0x30, 0x71, 0x33, 0x4b, 0xed, 0xf7, 0xcb, 0x3a,
-    0xed, 0xe7, 0x15, 0x72, 0x9f, 0x93, 0xe6, 0xeb, 0xdc, 0x42, 0xf3, 0xc9, 0x70, 0xbf, 0x52, 0x7e, 0x68, 0x61, 0xd4,
-    0x94, 0x5f, 0x5e, 0x57, 0x7e, 0x85, 0xa7, 0xc2, 0x5b, 0xfd, 0x2e, 0x0a, 0x5d, 0xd4, 0xe7, 0x60, 0x08, 0xe9, 0x47,
-    0x70, 0x0d, 0x0d, 0x1e, 0x14, 0xc9, 0x62, 0xb1, 0x76, 0x41, 0x5c, 0x1f, 0x73, 0xaa, 0x1d, 0xca, 0x18, 0x23, 0x9e,
-    0x96, 0x1c, 0x24, 0x19, 0x1c, 0x8c, 0xdf, 0xc0, 0x80, 0x98, 0x94, 0x84, 0x74, 0x08, 0x9d, 0xb5, 0x99, 0x88, 0xca,
-    0x5d, 0xbc, 0xd9, 0xb8, 0xac, 0x29, 0x14, 0x61, 0x27, 0x98, 0xa9, 0x94, 0x0a, 0x02, 0x69, 0xf2, 0xdd, 0xe9, 0xd4,
-    0x82, 0xa1, 0x85, 0x6b, 0x2a, 0x20, 0xaf, 0xed, 0x7a, 0xd0, 0xe4, 0x3d, 0xc5, 0xd0, 0xd7, 0xa9, 0x11, 0x2f, 0x33,
-    0xf8, 0x1a, 0x36, 0x7f, 0x4d, 0x94, 0xe4, 0x21, 0x13, 0xb1, 0x57, 0xf0, 0x89, 0x90, 0x4d, 0xc1, 0xce, 0x04, 0xfa,
-    0xa1, 0x5d, 0xd9, 0x4b, 0x77, 0x8b, 0xca, 0xa5, 0x45, 0x63, 0x2b, 0x51, 0xb3, 0xe6, 0x87, 0xf1, 0x66, 0x0a, 0xfb,
-    0xd9, 0xa3, 0x04, 0x02, 0xd2, 0x54, 0x4e, 0x52, 0xcd, 0x7b, 0x98, 0x0e, 0x01, 0x24, 0xd8, 0xfd, 0x04, 0x16, 0xfa,
-    0x4d, 0x89, 0x09, 0x16, 0x55, 0x63, 0xb7, 0x39, 0x68, 0xcd, 0x39, 0x69, 0xbe, 0x39, 0x6a, 0xed, 0x4d, 0x65, 0x3d,
-    0x63, 0x76, 0x80, 0x6d, 0xbb, 0x9b, 0xc5, 0x61, 0xba, 0xd9, 0x19, 0x1a, 0x82, 0x0b, 0x8f, 0xff, 0x93, 0x12, 0xd3,
-    0x40, 0x72, 0xa9, 0x1b, 0x3f, 0xa1, 0x0e, 0xc3, 0xff, 0x96, 0xa4, 0x80, 0x07, 0xb5, 0xd5, 0x58, 0x71, 0xee, 0x15,
-    0x47, 0xc9, 0x65, 0x55, 0xed, 0x6a, 0x09, 0x1a, 0xba, 0x91, 0x8c, 0x89, 0x62, 0x9e, 0x13, 0x00, 0xa3, 0xd8, 0xfc,
-    0x29, 0xd3, 0x49, 0xde, 0xbf, 0xac, 0x4d, 0xed, 0xf6, 0x7d, 0x3f, 0xca, 0x4f, 0xe8, 0x48, 0x45, 0x65, 0x73, 0x12,
-    0xf3, 0x6f, 0x0b, 0x30, 0xcd, 0x89, 0x0f, 0xf5, 0x5c, 0xc3, 0x50, 0x80, 0xaf, 0x6c, 0x28, 0x35, 0xdb, 0xe3, 0xdf,
-    0x3b, 0xdb, 0x7d, 0x49, 0x14, 0xc1, 0x02, 0x0d, 0xba, 0x5c, 0x81, 0x2f, 0x60, 0x19, 0xdc, 0x92, 0x7e, 0x0a, 0xbe,
-    0x97, 0x57, 0xc1, 0x67, 0xec, 0x7f, 0x01, 0x68, 0x55, 0x60, 0x40, 0xb9, 0xd3, 0x34, 0xac, 0x84, 0xb8, 0x44, 0x85,
-    0x59, 0xc5, 0xf9, 0xe3, 0x3a, 0xaf, 0x9b, 0x96, 0x25, 0x06, 0xe5, 0xe7, 0xae, 0xe1, 0xc6, 0xf7, 0x1a, 0xf9, 0xe3,
-    0x7b, 0xcf, 0x41, 0xb7, 0x13, 0x69, 0xef, 0xde, 0xcd, 0xef, 0x90, 0x85, 0x86, 0xf7, 0xc2, 0xe6, 0xd0, 0x16, 0xe9,
-    0x92, 0xab, 0x67, 0x2c, 0xc6, 0xdb, 0x22, 0x54, 0x86, 0x0f, 0x58, 0x30, 0x07, 0x0c, 0xc1, 0x63, 0xa7, 0x32, 0xf9,
-    0x0c, 0x1b, 0x4d, 0xb1, 0x6b, 0x2e, 0x0c, 0x3e, 0x50, 0x95, 0x85, 0xe4, 0xc5, 0x3a, 0xd9, 0x9e, 0x9d, 0xc2, 0xf3,
-    0xcb, 0xb8, 0x00, 0xea, 0x00, 0xfa, 0x15, 0x95, 0xc5, 0x06, 0x72, 0x71, 0x53, 0xd6, 0x7a, 0x45, 0xe3, 0xf1, 0xb5,
-    0x5d, 0x58, 0x5d, 0x81, 0x4f, 0xa3, 0x74, 0x9c, 0x88, 0x49, 0xcc, 0xa4, 0xca, 0x35, 0xb9, 0x36, 0xba, 0x97, 0xb6,
-    0x68, 0x9e, 0x0b, 0x09, 0x5e, 0x11, 0xb8, 0x21, 0xf4, 0x95, 0xbe, 0x5c, 0x6f, 0xa0, 0xe0, 0x51, 0x7b, 0x73, 0x11,
-    0x4c, 0x4c, 0x3c, 0x66, 0x48, 0x4d, 0xbf, 0x0e, 0xa7, 0x56, 0x16, 0x2b, 0x0e, 0xbf, 0xce, 0x19, 0x6b, 0x28, 0x00,
-    0xe2, 0x93, 0x07, 0x57, 0xbb, 0x49, 0xaf, 0x94, 0x76, 0x50, 0x1a, 0x21, 0xbe, 0xad, 0xf0, 0x75, 0x97, 0x8a, 0xaf,
-    0x5c, 0x75, 0xef, 0x6b, 0xc6, 0x8c, 0x0b, 0x46, 0xcf, 0xf9, 0x2c, 0x69, 0x5c, 0xbb, 0xa1, 0xbb, 0x3a, 0x3f, 0x7a,
-    0x3f, 0xc8, 0xbc, 0x85, 0x19, 0xb0, 0x09, 0xa8, 0x82, 0xe7, 0xde, 0x6b, 0xe3, 0x44, 0xf9, 0x3b, 0xf3, 0x88, 0x57,
-    0x0e, 0xb3, 0xee, 0x24, 0xf9, 0xbb, 0xc1, 0x77, 0xc1, 0xd5, 0x2d, 0x8d, 0x13, 0xe4, 0xae, 0x3a, 0x41, 0x26, 0xca,
-    0xcd, 0xf4, 0x86, 0xdb, 0xbb, 0xad, 0x40, 0x10, 0xa7, 0x62, 0xfa, 0xa8, 0x1c, 0xd7, 0x8f, 0x16, 0xa8, 0x54, 0x44,
-    0x7c, 0xaa, 0x72, 0x57, 0xae, 0x4c, 0x0d, 0xf5, 0xb8, 0x4e, 0x66, 0xa1, 0x69, 0xd6, 0xe4, 0x52, 0x36, 0x3d, 0x46,
-    0xa6, 0xd9, 0xa9, 0x36, 0xbf, 0x7b, 0xe5, 0x21, 0x1d, 0x43, 0x73, 0xb1, 0x56, 0x0b, 0xee, 0x77, 0x15, 0x85, 0x77,
-    0xbd, 0xd8, 0x48, 0x65, 0xa8, 0x59, 0x8f, 0xa2, 0x8f, 0xe3, 0x36, 0x73, 0x79, 0x94, 0xfd, 0x59, 0x03, 0xc0, 0x74,
-    0x84, 0x45, 0x77, 0xd3, 0x33, 0xf6, 0x04, 0x7a, 0x7a, 0x22, 0x83, 0x44, 0xaf, 0x75, 0xbe, 0x6a, 0x95, 0x58, 0xba,
-    0x86, 0xc0, 0xee, 0x35, 0x19, 0xab, 0x92, 0x76, 0xab, 0xf5, 0xab, 0x79, 0x3e, 0x4f, 0xf9, 0x4a, 0x9e, 0x4f, 0xcd,
-    0xa2, 0xbb, 0xd3, 0x76, 0xaf, 0x4f, 0x0d, 0x15, 0x73, 0xad, 0x6f, 0xf2, 0x3b, 0xa6, 0xeb, 0x60, 0xa8, 0x45, 0x90,
-    0x59, 0xed, 0xaa, 0x67, 0x65, 0x39, 0xab, 0x67, 0x72, 0xcc, 0x84, 0x6f, 0x2a, 0xdd, 0x21, 0xba, 0x61, 0xaa, 0x66,
-    0xfa, 0xb1, 0xb1, 0x2d, 0x64, 0x9b, 0xe7, 0x17, 0xe3, 0x1c, 0x28, 0x2d, 0xf7, 0x97, 0x09, 0xc3, 0x8f, 0x97, 0x97,
-    0x3f, 0x0a, 0x39, 0x55, 0x75, 0xf4, 0x96, 0x2f, 0x75, 0xcf, 0x60, 0x56, 0x2a, 0x27, 0xe2, 0x98, 0xad, 0x1f, 0xbc,
-    0xb9, 0x7b, 0x05, 0x2c, 0xc7, 0x80, 0xdd, 0x31, 0x73, 0x1a, 0x43, 0x55, 0x1b, 0xf8, 0x87, 0xf5, 0x83, 0xad, 0xdb,
-    0xc3, 0x3f, 0x0c, 0x7e, 0x08, 0xae, 0x6d, 0x6c, 0x6c, 0xe3, 0xed, 0x5a, 0x22, 0xc8, 0x2b, 0x3c, 0xd0, 0xc7, 0xab,
-    0x8f, 0x82, 0x96, 0xeb, 0xc4, 0xf6, 0xc0, 0xa1, 0xb0, 0x35, 0xc8, 0x37, 0x29, 0x93, 0x46, 0x8b, 0x82, 0x67, 0x33,
-    0x39, 0x43, 0x21, 0xaf, 0xf9, 0x38, 0x68, 0x3b, 0xc2, 0xdf, 0xc0, 0xa9, 0x1d, 0x2f, 0x2f, 0x3f, 0x41, 0x1f, 0xf0,
-    0x74, 0xa5, 0x34, 0x15, 0x71, 0x4a, 0xb9, 0x45, 0x57, 0xeb, 0x3c, 0x18, 0x29, 0x2e, 0xa6, 0xa8, 0x74, 0xdc, 0xe5,
-    0xb5, 0xb3, 0x91, 0xd3, 0x5f, 0xe2, 0xd5, 0x45, 0xba, 0x7c, 0x24, 0xb2, 0x55, 0x4b, 0xef, 0x37, 0x7d, 0xba, 0x6d,
-    0xcf, 0x18, 0x9f, 0x66, 0x63, 0x3a, 0x98, 0xf1, 0x71, 0x22, 0xbc, 0x3e, 0x31, 0xd6, 0x77, 0x8b, 0xc0, 0x74, 0x73,
-    0x6c, 0xf2, 0xc3, 0xf1, 0x7a, 0xb3, 0x59, 0xe3, 0x0e, 0xde, 0x38, 0x4f, 0x9c, 0x65, 0x89, 0x11, 0x95, 0xa5, 0x86,
-    0x07, 0xb4, 0x42, 0xdc, 0xbc, 0x67, 0x02, 0xe3, 0xb2, 0x0b, 0x92, 0xda, 0x6e, 0x20, 0x70, 0xb1, 0x27, 0x31, 0x4b,
-    0xc6, 0xb6, 0x07, 0xe5, 0x81, 0xbe, 0x18, 0x4d, 0xb7, 0x80, 0x69, 0x79, 0xed, 0xec, 0x2c, 0xb5, 0xbd, 0x6a, 0xaa,
-    0x00, 0x66, 0xc9, 0xf2, 0xf8, 0x04, 0x59, 0xf7, 0x5b, 0xe8, 0x22, 0x06, 0x8c, 0x8d, 0x2b, 0x73, 0xee, 0x72, 0xdd,
-    0x8a, 0xf8, 0x46, 0x13, 0x69, 0x52, 0x1f, 0x52, 0xdf, 0x61, 0x58, 0xab, 0xab, 0x1c, 0x24, 0x70, 0x8f, 0xbc, 0x5b,
-    0xe2, 0xd2, 0xd3, 0x67, 0x16, 0x93, 0x2a, 0x7d, 0x4b, 0x5d, 0x8b, 0x6b, 0x86, 0xbd, 0xe2, 0x01, 0xd8, 0x1f, 0x18,
-    0xb7, 0x88, 0x45, 0xbc, 0x9d, 0xd7, 0x52, 0x58, 0x1b, 0x73, 0xa0, 0xb9, 0xe1, 0x06, 0xbf, 0xb1, 0x6a, 0xcd, 0xc0,
-    0x0c, 0x33, 0xce, 0x48, 0x7e, 0x33, 0xee, 0x55, 0x4d, 0x1c, 0xb9, 0x0a, 0x20, 0xfa, 0x96, 0x74, 0x49, 0x0e, 0xaf,
-    0x64, 0xb9, 0xea, 0x0c, 0xf9, 0x57, 0x58, 0x67, 0xbd, 0x38, 0x01, 0x33, 0x69, 0xca, 0x4b, 0x4c, 0x4c, 0x11, 0x97,
-    0x9b, 0x65, 0xcc, 0xd3, 0xf4, 0x59, 0xb4, 0x83, 0x93, 0x1b, 0x09, 0x1c, 0xb1, 0x6f, 0x2c, 0x43, 0x33, 0x61, 0x23,
-    0x26, 0xd2, 0xa8, 0x94, 0x12, 0x3e, 0x90, 0x4b, 0x2d, 0xf9, 0xcb, 0x5c, 0x5e, 0x7d, 0xb9, 0x4d, 0x70, 0x40, 0x5e,
-    0x03, 0xcb, 0xa1, 0x71, 0xdc, 0x32, 0x90, 0x88, 0xc5, 0x80, 0x18, 0xb5, 0x2a, 0x57, 0x93, 0x51, 0x9d, 0xcc, 0x57,
-    0xc8, 0x85, 0x8a, 0x3c, 0xb8, 0x25, 0x50, 0xf2, 0xe7, 0x98, 0x3a, 0x98, 0x95, 0xda, 0x4d, 0x8b, 0x4d, 0x92, 0xf7,
-    0xcc, 0x80, 0xe4, 0xfa, 0x6b, 0x78, 0x68, 0xfc, 0xe2, 0x95, 0x39, 0x25, 0x7c, 0x51, 0xc6, 0xd2, 0xd2, 0x98, 0x4b,
-    0xff, 0x42, 0xde, 0xa7, 0x95, 0x80, 0xfd, 0x0a, 0x62, 0xca, 0xc0, 0x25, 0x36, 0x2e, 0x48, 0xca, 0x6b, 0x79, 0xca,
-    0xee, 0x6b, 0x28, 0xdf, 0x15, 0x93, 0xae, 0x52, 0x59, 0x57, 0x58, 0x75, 0xbf, 0x2e, 0x58, 0x7e, 0xb1, 0xcf, 0x30,
-    0x37, 0x19, 0x0d, 0xb2, 0x15, 0x33, 0x9b, 0xf2, 0xab, 0xbd, 0x6b, 0xbf, 0xf2, 0x50, 0xd2, 0xa1, 0x5a, 0xa5, 0x9b,
-    0x57, 0x6e, 0x38, 0xc6, 0x8d, 0x1b, 0x8e, 0x00, 0x36, 0x86, 0x9d, 0x2a, 0x52, 0xeb, 0xfc, 0xf7, 0xd5, 0xf0, 0x13,
-    0xed, 0xb5, 0xa1, 0xde, 0x75, 0xc3, 0xb5, 0xe9, 0xe9, 0xd7, 0xa0, 0x6a, 0x64, 0x09, 0x5d, 0x87, 0x2a, 0x26, 0x23,
-    0x51, 0x62, 0xba, 0x4a, 0x79, 0xd4, 0xd7, 0x88, 0x73, 0x10, 0x37, 0x94, 0xbf, 0xf8, 0xe7, 0xf0, 0xe2, 0x28, 0x40,
-    0x23, 0x6a, 0x39, 0xc9, 0x52, 0xde, 0x9a, 0x44, 0xb3, 0x38, 0xb9, 0x08, 0x16, 0x71, 0x6b, 0x96, 0xa5, 0x59, 0x31,
-    0x07, 0xae, 0xf4, 0x8a, 0x0b, 0xb0, 0xe1, 0x67, 0xad, 0x45, 0xec, 0x3d, 0x67, 0xc9, 0x29, 0xe3, 0xf1, 0x28, 0xf2,
-    0xec, 0xbd, 0x1c, 0xc4, 0x83, 0xf5, 0x3a, 0xca, 0xf3, 0xec, 0xcc, 0xf6, 0xde, 0x65, 0xc7, 0xc0, 0xb4, 0xde, 0x9b,
-    0xf3, 0x8b, 0x13, 0x96, 0x7a, 0xef, 0x8f, 0x17, 0x29, 0x5f, 0x78, 0x45, 0x94, 0x16, 0xad, 0x82, 0xe5, 0xf1, 0x04,
-    0xd4, 0x44, 0x92, 0xe5, 0x2d, 0xcc, 0x7f, 0x9e, 0xb1, 0x20, 0x89, 0x4f, 0xa6, 0xdc, 0x1a, 0x47, 0xf9, 0xa7, 0x5e,
-    0xab, 0x35, 0xcf, 0xe3, 0x59, 0x94, 0x5f, 0xb4, 0xa8, 0x45, 0xf0, 0x45, 0x7b, 0x3b, 0xfa, 0x6a, 0x72, 0xbf, 0xc7,
-    0x73, 0xe8, 0x1b, 0x23, 0x15, 0x03, 0x10, 0x3e, 0xd6, 0xf6, 0x4e, 0x7b, 0x56, 0xdc, 0x11, 0x27, 0x4a, 0x51, 0xca,
-    0xcb, 0x23, 0xef, 0x23, 0x03, 0xb8, 0xfd, 0x63, 0x9e, 0x7a, 0xe0, 0xcb, 0xf1, 0x2c, 0x5d, 0x8e, 0x16, 0x79, 0x01,
-    0x03, 0xcc, 0xb3, 0x38, 0xe5, 0x2c, 0xef, 0x1d, 0x67, 0x39, 0x90, 0xad, 0x95, 0x47, 0xe3, 0x78, 0x51, 0x04, 0xf7,
-    0xe7, 0xe7, 0x3d, 0xb4, 0x15, 0x4e, 0xf2, 0x6c, 0x91, 0x8e, 0xe5, 0x5c, 0x71, 0x0a, 0x1b, 0x23, 0xe6, 0x66, 0x05,
-    0x7d, 0x09, 0x05, 0xe0, 0x4b, 0x59, 0x94, 0xb7, 0x4e, 0xb0, 0x33, 0x1a, 0xfa, 0xed, 0x31, 0x3b, 0xf1, 0xf2, 0x93,
-    0xe3, 0xc8, 0xe9, 0x74, 0x1f, 0x7a, 0xea, 0x9f, 0xbf, 0xe3, 0x82, 0xe1, 0xbe, 0xb6, 0xb8, 0xd3, 0x6e, 0xff, 0x9d,
-    0xdb, 0x6b, 0xcc, 0x42, 0x00, 0x05, 0x9d, 0xf9, 0xb9, 0x55, 0x64, 0x09, 0xac, 0xcf, 0xba, 0x9e, 0xbd, 0x39, 0xf8,
-    0x4d, 0x71, 0x7a, 0x12, 0x74, 0xe7, 0xe7, 0x25, 0x62, 0x17, 0x88, 0x84, 0x4c, 0x89, 0xa4, 0x7c, 0x5b, 0xfe, 0x5e,
-    0x88, 0x1f, 0xad, 0x87, 0xb8, 0xab, 0x20, 0xae, 0xa8, 0xde, 0x1a, 0xc3, 0x3e, 0x20, 0xf2, 0x77, 0x0a, 0x01, 0xc8,
-    0x14, 0x9c, 0xc0, 0x5c, 0xc1, 0x41, 0x2f, 0xbf, 0x1b, 0x8c, 0xee, 0x7a, 0x30, 0x1e, 0xdd, 0x04, 0x46, 0x9e, 0x8e,
-    0x97, 0xf5, 0x75, 0xed, 0x80, 0x73, 0xda, 0x9b, 0x32, 0xe4, 0xa7, 0xa0, 0x8b, 0xcf, 0x67, 0xf1, 0x98, 0x4f, 0xc5,
-    0x23, 0xb1, 0xf3, 0x99, 0xa8, 0xdb, 0x69, 0xb7, 0xc5, 0x7b, 0x01, 0x0a, 0x2d, 0xe8, 0xf8, 0xd8, 0x00, 0x98, 0xe8,
-    0xc3, 0x55, 0x1f, 0xb1, 0xf9, 0xfa, 0xc6, 0x2f, 0xd5, 0x78, 0x67, 0x2a, 0x6f, 0x50, 0xa8, 0x08, 0xf5, 0xcd, 0x16,
-    0xcc, 0x78, 0xcb, 0xfb, 0x1d, 0x7d, 0x50, 0x35, 0xf8, 0x9a, 0x91, 0xd6, 0x0b, 0xb8, 0x67, 0xe6, 0x02, 0xf5, 0xd2,
-    0x3e, 0x86, 0xa4, 0x5a, 0x2d, 0x17, 0xf4, 0x06, 0xc3, 0x10, 0x12, 0x1d, 0x08, 0x3a, 0xf9, 0xa0, 0xa0, 0x6f, 0x6a,
-    0x64, 0x6e, 0x50, 0x38, 0x99, 0x0b, 0x5b, 0x3e, 0xd3, 0x72, 0x1d, 0x94, 0x34, 0x78, 0xd9, 0x1f, 0x98, 0x6c, 0x00,
-    0xd2, 0x9b, 0x42, 0x5d, 0x7f, 0x09, 0x85, 0x2b, 0xa5, 0x1c, 0xa9, 0xd9, 0x75, 0x57, 0xf4, 0x61, 0x55, 0x62, 0xca,
-    0x48, 0x3e, 0x1c, 0xfe, 0x3b, 0x0c, 0x7b, 0x47, 0x3b, 0x96, 0x45, 0xb6, 0xc8, 0x47, 0x14, 0xa9, 0x5b, 0xf5, 0xf8,
-    0x6d, 0x52, 0xb8, 0xb6, 0xc7, 0xb4, 0x9c, 0x47, 0x37, 0xb8, 0xf6, 0x91, 0x03, 0x4e, 0x87, 0x20, 0xe2, 0x8e, 0x81,
-    0x8c, 0x72, 0x28, 0x08, 0x51, 0x75, 0x8d, 0x29, 0xdf, 0x8d, 0xee, 0x5f, 0xfa, 0x8b, 0x34, 0x06, 0x49, 0xf7, 0x31,
-    0x1e, 0xd3, 0xbd, 0x93, 0x78, 0x4c, 0x07, 0x11, 0x2d, 0x4a, 0x3c, 0xc2, 0xc8, 0x36, 0x14, 0xa8, 0xef, 0xb0, 0xc0,
-    0xb3, 0x4c, 0x64, 0xb1, 0x5b, 0x36, 0x1e, 0x26, 0x18, 0xaa, 0x72, 0x9c, 0xcd, 0xa2, 0x38, 0x0d, 0xf0, 0xfb, 0x20,
-    0x9e, 0x1e, 0x31, 0xc0, 0x2e, 0x1e, 0xfc, 0x64, 0x32, 0x17, 0xad, 0xe3, 0xfa, 0xbf, 0x80, 0x1c, 0xa1, 0xfe, 0xa5,
-    0xf4, 0xc3, 0x34, 0x5c, 0xea, 0x98, 0xb7, 0x5e, 0x0a, 0xb2, 0x87, 0x2b, 0x9b, 0x95, 0x51, 0x9c, 0x63, 0x97, 0xd3,
-    0x8f, 0x41, 0xab, 0x13, 0x74, 0xb4, 0xeb, 0x5a, 0xbb, 0x8d, 0x2a, 0x72, 0x59, 0xe4, 0x8d, 0x46, 0x82, 0x41, 0x3f,
-    0x0b, 0x38, 0xab, 0x77, 0x0d, 0xab, 0x27, 0xf9, 0x12, 0x03, 0x38, 0x27, 0xa9, 0x53, 0x03, 0x82, 0xce, 0x02, 0xae,
-    0x98, 0xca, 0x2d, 0x23, 0x52, 0x4a, 0x8f, 0x69, 0x03, 0xd7, 0xef, 0x12, 0xe1, 0xbd, 0xa1, 0x7a, 0x0a, 0x94, 0x62,
-    0xb9, 0xf1, 0xd1, 0xae, 0xd8, 0xf1, 0x16, 0xf1, 0x58, 0x68, 0xc3, 0x16, 0xb4, 0xad, 0x3f, 0x8d, 0x80, 0x4a, 0x9f,
-    0x42, 0x7b, 0x63, 0xe9, 0xa8, 0xc4, 0xfa, 0x1c, 0xe6, 0xda, 0x13, 0x5a, 0x8f, 0x6e, 0xe4, 0xdb, 0xfd, 0x8d, 0x25,
-    0x2f, 0x77, 0xb7, 0x44, 0xef, 0xfe, 0x51, 0x59, 0x90, 0x82, 0x32, 0x03, 0x69, 0xd5, 0x14, 0xa2, 0x0e, 0x86, 0xa5,
-    0xf4, 0x5d, 0x1c, 0x37, 0xd7, 0x46, 0x97, 0x88, 0x18, 0x4b, 0xb6, 0x2b, 0x30, 0x5d, 0x29, 0xca, 0x61, 0x4f, 0xea,
-    0x84, 0x94, 0x42, 0xe4, 0x60, 0xf4, 0x56, 0xa1, 0x38, 0x42, 0x08, 0x06, 0x1b, 0xcb, 0xb8, 0x0c, 0x37, 0x96, 0x59,
-    0x79, 0x04, 0x96, 0x09, 0x42, 0x95, 0xab, 0xcf, 0xbb, 0xc0, 0xc4, 0x22, 0xc8, 0x62, 0xd1, 0x08, 0x38, 0x2d, 0x2b,
-    0x6d, 0x6b, 0x20, 0xa0, 0x01, 0x0f, 0x10, 0x0b, 0xc0, 0x76, 0xa3, 0x5e, 0x0c, 0x70, 0x11, 0xad, 0xfb, 0x30, 0xd0,
-    0xee, 0x96, 0x68, 0x04, 0x78, 0xe5, 0x08, 0x72, 0x85, 0x16, 0xa6, 0xe3, 0x98, 0xa8, 0x8d, 0xe3, 0x53, 0x4d, 0x3a,
-    0xca, 0x4d, 0xee, 0xef, 0x26, 0xd1, 0x31, 0x4b, 0x60, 0xc8, 0xe2, 0xf2, 0xb2, 0x0d, 0x23, 0x89, 0x57, 0x6b, 0x37,
-    0x4e, 0xe7, 0x0b, 0xf9, 0x99, 0x2d, 0x98, 0xb8, 0x83, 0x27, 0x9f, 0x78, 0x0b, 0x60, 0xa0, 0x8e, 0xf2, 0x02, 0x39,
-    0x00, 0x80, 0x48, 0xa7, 0x08, 0x08, 0x5d, 0xc5, 0x16, 0x50, 0x1a, 0x8f, 0x57, 0xcb, 0x60, 0x27, 0xce, 0xb1, 0x34,
-    0x85, 0xe7, 0x59, 0x9c, 0xe2, 0x63, 0x81, 0x8f, 0xd1, 0x39, 0x3e, 0x66, 0xf0, 0xa8, 0x71, 0xcf, 0x4b, 0xfb, 0x6f,
-    0xb2, 0x02, 0x96, 0x26, 0x40, 0x76, 0x79, 0x09, 0xf2, 0x5e, 0x93, 0x60, 0x77, 0x0b, 0x88, 0x85, 0x9c, 0x22, 0x3e,
-    0xba, 0xc2, 0x4c, 0x32, 0xb2, 0x62, 0xde, 0x12, 0xe5, 0x16, 0x69, 0xd5, 0x10, 0x9c, 0xae, 0xdc, 0x69, 0x18, 0x0f,
-    0x9e, 0x4c, 0x2f, 0x79, 0x82, 0x2f, 0xae, 0x6d, 0x89, 0xaf, 0x62, 0x08, 0xa2, 0xd0, 0x23, 0x62, 0xa8, 0xcb, 0xb8,
-    0xfc, 0xde, 0x4d, 0x1c, 0xda, 0x38, 0x0b, 0xd8, 0x6f, 0xa8, 0x05, 0x78, 0x14, 0x27, 0xa2, 0xf1, 0x1a, 0x7c, 0x1a,
-    0x79, 0x82, 0x84, 0xce, 0xee, 0x56, 0x05, 0x1b, 0x00, 0x3f, 0x12, 0xb7, 0xac, 0x1d, 0x91, 0x03, 0x69, 0x8b, 0x72,
-    0x3a, 0x3b, 0x97, 0x5b, 0x5a, 0x46, 0x76, 0x45, 0xac, 0x5c, 0xa3, 0x4a, 0x39, 0x8b, 0xf6, 0x24, 0x4a, 0xd7, 0x35,
-    0x05, 0xe8, 0xe7, 0x8c, 0x8d, 0x3d, 0xdb, 0x02, 0x59, 0x2a, 0x9e, 0x3f, 0x26, 0xec, 0x94, 0xc9, 0x2f, 0xa5, 0xe8,
-    0x41, 0x74, 0xe5, 0x08, 0x54, 0x32, 0x97, 0x97, 0x38, 0x25, 0x7b, 0x2a, 0x1c, 0x25, 0x25, 0xea, 0x88, 0x78, 0xb6,
-    0x31, 0x68, 0x73, 0x8e, 0x76, 0x7d, 0x58, 0xaf, 0x03, 0xd6, 0xae, 0x2d, 0xe0, 0x25, 0x3b, 0xee, 0x66, 0xe4, 0x60,
-    0x00, 0x36, 0x99, 0xc0, 0x76, 0x51, 0x91, 0x65, 0x2d, 0x0b, 0x04, 0x54, 0xe0, 0x94, 0x7a, 0xb6, 0x68, 0x61, 0x57,
-    0x6d, 0xf5, 0x93, 0x24, 0x4e, 0x92, 0x8d, 0x3e, 0xad, 0x99, 0x0b, 0xb8, 0x63, 0x43, 0x44, 0x5a, 0x1b, 0xf2, 0xcd,
-    0xfe, 0xb7, 0x7f, 0xfe, 0x9f, 0xff, 0x15, 0x06, 0xa6, 0x7e, 0x6e, 0x69, 0x5d, 0xdd, 0xea, 0x7f, 0x40, 0xab, 0x45,
-    0x7a, 0x43, 0xbb, 0xbf, 0xfe, 0xe3, 0x7f, 0x83, 0x66, 0x74, 0x23, 0xc7, 0x2d, 0x8f, 0x08, 0xa2, 0x11, 0x1a, 0x41,
-    0x9f, 0x05, 0x52, 0x6d, 0x90, 0x2b, 0x67, 0xfa, 0x27, 0x04, 0xbb, 0xe0, 0xd9, 0xfc, 0x5a, 0x70, 0x10, 0xea, 0x51,
-    0x92, 0x15, 0x4c, 0xc3, 0x23, 0x64, 0xed, 0xe7, 0x01, 0x44, 0x73, 0xcd, 0x81, 0xcb, 0x0b, 0x4b, 0x8f, 0x23, 0x96,
-    0x67, 0xdd, 0x38, 0x8d, 0xd5, 0x2b, 0x18, 0x27, 0x74, 0x28, 0xae, 0x00, 0xeb, 0x25, 0x9e, 0xe0, 0x81, 0x04, 0x82,
-    0x5b, 0xff, 0xca, 0xd7, 0xfa, 0xc1, 0x34, 0x7f, 0x8a, 0xb1, 0x44, 0x28, 0x45, 0x8d, 0x00, 0x3f, 0x41, 0x68, 0x7d,
-    0xd4, 0xcf, 0xd1, 0xb9, 0x7e, 0x46, 0xc1, 0x26, 0x26, 0x00, 0x5d, 0x34, 0x43, 0x33, 0xc3, 0x9c, 0x41, 0xa4, 0x01,
-    0x54, 0x7e, 0xa4, 0x91, 0x4d, 0x22, 0x84, 0xd7, 0x47, 0x4c, 0xba, 0xc4, 0x2b, 0x36, 0x8b, 0x9c, 0x7d, 0x4c, 0xb2,
-    0x33, 0x0c, 0x4e, 0x21, 0x91, 0xae, 0xaa, 0x2f, 0xff, 0xf5, 0x5f, 0x7c, 0xff, 0x5f, 0xff, 0xe5, 0x8a, 0x06, 0x53,
-    0xd8, 0x07, 0x60, 0x4d, 0xf2, 0x50, 0xd3, 0xb9, 0x81, 0xd6, 0xfa, 0x41, 0x11, 0xcf, 0xf5, 0x35, 0x12, 0x71, 0x2c,
-    0x95, 0x78, 0xcb, 0x47, 0x42, 0x5b, 0x33, 0xc5, 0xcd, 0xb3, 0x20, 0x64, 0x57, 0x4c, 0x83, 0x55, 0x37, 0xcc, 0x73,
-    0xe4, 0x06, 0xd7, 0xd0, 0xe5, 0x33, 0x31, 0x5e, 0x0f, 0xc6, 0x8d, 0x10, 0x78, 0x20, 0xfd, 0x85, 0x7e, 0x78, 0x22,
-    0xa4, 0x7b, 0x20, 0x96, 0x41, 0xca, 0xfa, 0x1a, 0x40, 0x9e, 0x75, 0x40, 0x13, 0x50, 0x93, 0xb8, 0xd2, 0xad, 0x64,
-    0x8a, 0x1c, 0xe7, 0xfd, 0x57, 0x78, 0xab, 0xce, 0xc2, 0xde, 0xa8, 0x59, 0x0b, 0x32, 0x04, 0x38, 0x19, 0x02, 0x52,
-    0x03, 0x99, 0x3a, 0x18, 0x3d, 0x8c, 0x6c, 0xbd, 0xae, 0xfd, 0x88, 0xdd, 0x6b, 0xda, 0x92, 0x4b, 0x6d, 0x19, 0x4b,
-    0x4b, 0x56, 0x6a, 0x4b, 0xfc, 0x76, 0x4a, 0x43, 0x5b, 0xc6, 0x57, 0x6a, 0x4b, 0xa4, 0xdc, 0x00, 0x47, 0x0e, 0xed,
-    0x4d, 0x0c, 0xa3, 0x18, 0xba, 0x99, 0xa3, 0x5d, 0x02, 0xbe, 0xf3, 0xe8, 0x93, 0x34, 0x4b, 0x08, 0x01, 0x8c, 0x23,
-    0x68, 0x43, 0x4b, 0x60, 0x00, 0x2a, 0xf6, 0xa8, 0xd4, 0x9b, 0x1e, 0x1f, 0x8d, 0x09, 0xb8, 0xbb, 0x9c, 0x30, 0x14,
-    0xc9, 0x47, 0x5b, 0x38, 0x84, 0xd8, 0x2b, 0x25, 0x3d, 0x03, 0x52, 0x5b, 0x38, 0xce, 0x91, 0xb7, 0x14, 0x01, 0xa9,
-    0xc0, 0x7e, 0xfb, 0x66, 0xff, 0xc0, 0xf6, 0x8e, 0xb3, 0xf1, 0x45, 0x60, 0x83, 0x33, 0x01, 0x86, 0x87, 0xeb, 0xf3,
-    0x29, 0x4b, 0x1d, 0x65, 0xce, 0x67, 0x09, 0xb8, 0x33, 0xd9, 0x89, 0xf8, 0x7e, 0x42, 0x33, 0x98, 0x0e, 0x34, 0xa5,
-    0x0f, 0x2c, 0xf6, 0x77, 0xb9, 0xf8, 0xf6, 0x28, 0xcf, 0xf1, 0xb1, 0x8f, 0xe9, 0x04, 0xbb, 0x5b, 0xf0, 0x80, 0x2f,
-    0xfb, 0xa8, 0x8a, 0xf4, 0x9b, 0x80, 0xb3, 0x10, 0xef, 0x5b, 0xd8, 0x7e, 0x4b, 0xf5, 0x45, 0x28, 0xfa, 0x92, 0xd1,
-    0xb4, 0xc5, 0x5d, 0x99, 0x71, 0x34, 0xf6, 0x18, 0xad, 0x34, 0xb2, 0xb8, 0x81, 0x1a, 0x7c, 0xac, 0x4b, 0x84, 0xe6,
-    0x37, 0x8a, 0x68, 0x94, 0x4a, 0x4f, 0xcb, 0x2a, 0x9c, 0x90, 0x2c, 0x3b, 0x31, 0x19, 0xfc, 0x24, 0xf0, 0x8f, 0xcc,
-    0x6f, 0x85, 0x89, 0xcf, 0xfa, 0x68, 0x24, 0x0f, 0xff, 0xec, 0x7d, 0x64, 0xde, 0xc5, 0x11, 0xb5, 0x54, 0x8e, 0x29,
-    0x46, 0x4c, 0xd0, 0x81, 0x6f, 0xab, 0x08, 0x04, 0x98, 0x26, 0x49, 0x34, 0x2f, 0x58, 0xa0, 0x1e, 0xa4, 0x8f, 0x8a,
-    0xae, 0xee, 0x6a, 0x50, 0xc0, 0x34, 0x61, 0x4a, 0x3e, 0x5d, 0x9a, 0x4e, 0xec, 0x03, 0x70, 0x62, 0x31, 0x01, 0xbf,
-    0x15, 0x81, 0xe2, 0x4d, 0x83, 0x84, 0x4d, 0x78, 0xc9, 0xf1, 0x86, 0xf7, 0x52, 0x45, 0x0d, 0xfc, 0xee, 0x0e, 0x38,
-    0xb6, 0x96, 0x8f, 0xff, 0xdf, 0x34, 0xf6, 0x38, 0x48, 0xc1, 0x11, 0xa5, 0x2b, 0x1f, 0x78, 0x9d, 0x0e, 0x20, 0x32,
-    0xdf, 0x97, 0xc6, 0x44, 0x23, 0x86, 0x11, 0x95, 0x92, 0xe7, 0x20, 0xb2, 0x3d, 0x9e, 0x9b, 0xed, 0x40, 0xd4, 0xae,
-    0x84, 0x55, 0x56, 0x1d, 0xfb, 0x6d, 0x57, 0x9a, 0xff, 0xab, 0x8d, 0x55, 0x74, 0xa4, 0xfe, 0xb6, 0x42, 0x21, 0x23,
-    0x8e, 0x53, 0x0a, 0x2d, 0xb3, 0x14, 0x3d, 0x4c, 0x9c, 0x56, 0x23, 0x3c, 0x37, 0x1a, 0x89, 0x25, 0xed, 0xf8, 0x43,
-    0xda, 0xf1, 0x24, 0xc1, 0x86, 0x4b, 0x31, 0xf7, 0x28, 0x4a, 0x46, 0x0e, 0x02, 0x60, 0xb5, 0xac, 0x47, 0x40, 0x4d,
-    0x57, 0x45, 0x19, 0xfc, 0x87, 0x48, 0xdc, 0x52, 0xc8, 0xbb, 0x35, 0x54, 0x3a, 0x1a, 0x96, 0x65, 0xef, 0x8c, 0x39,
-    0x87, 0xbf, 0xc9, 0x0b, 0x03, 0xe2, 0x9e, 0xa8, 0xfe, 0xd6, 0x5e, 0xbb, 0x74, 0x87, 0xde, 0x5f, 0x8c, 0x0f, 0x98,
-    0xd9, 0x8a, 0xa1, 0x6d, 0x0f, 0x96, 0xe1, 0x2f, 0x21, 0xf6, 0x7d, 0xe5, 0xd8, 0x68, 0x55, 0x52, 0xcd, 0x45, 0x8b,
-    0xf8, 0xcb, 0xc6, 0x6e, 0x22, 0xdc, 0xfd, 0xfd, 0x55, 0x51, 0x8b, 0x6f, 0x6e, 0x8e, 0x5a, 0xb0, 0x5b, 0x46, 0x2d,
-    0xbe, 0xf9, 0x83, 0xa3, 0x16, 0xdf, 0x37, 0xa3, 0x16, 0xbf, 0x7e, 0x4e, 0xd4, 0x22, 0xcf, 0xce, 0x8a, 0xb0, 0x23,
-    0x4f, 0xc9, 0x41, 0xe6, 0xfc, 0x6d, 0xc2, 0x17, 0x30, 0x51, 0x23, 0x78, 0x41, 0xd1, 0x0a, 0x91, 0xd8, 0x07, 0x92,
-    0x5d, 0xc6, 0x0a, 0xda, 0x3a, 0x83, 0xae, 0x75, 0x5f, 0x5d, 0x19, 0x02, 0x6f, 0xcd, 0xd5, 0x97, 0xdd, 0xba, 0x2a,
-    0x9a, 0x10, 0xd0, 0x37, 0x3f, 0x75, 0xc7, 0xee, 0xa6, 0x4a, 0xdd, 0x32, 0x47, 0xe8, 0xa9, 0x88, 0xbc, 0x60, 0x9f,
-    0xa5, 0xfd, 0x9f, 0x0e, 0x3b, 0xbd, 0xed, 0xce, 0x0c, 0x7a, 0x83, 0x0e, 0x85, 0xb7, 0x76, 0x6f, 0x7b, 0x1b, 0xdf,
-    0xce, 0xd4, 0x5b, 0x17, 0xdf, 0x62, 0xf5, 0xb6, 0x83, 0x6f, 0x23, 0xf5, 0xf6, 0x00, 0xdf, 0xc6, 0xea, 0xed, 0x21,
-    0xbe, 0x9d, 0xda, 0xe5, 0x21, 0xd7, 0xc0, 0x3d, 0x04, 0xbe, 0x22, 0x43, 0x3f, 0x50, 0x65, 0xb0, 0x69, 0xf1, 0xaa,
-    0x5d, 0x74, 0x12, 0xc4, 0x9e, 0x70, 0x88, 0x82, 0xdc, 0x3b, 0x03, 0xc9, 0x1f, 0x50, 0x66, 0xd9, 0x53, 0xfc, 0xe6,
-    0x02, 0xf8, 0x0f, 0x07, 0xf1, 0x8c, 0xa9, 0x8f, 0xcf, 0x2a, 0xac, 0xc1, 0x86, 0x3c, 0x6c, 0x0f, 0xcb, 0x9e, 0x5e,
-    0x27, 0x11, 0x2c, 0x51, 0x27, 0xf7, 0xb4, 0x72, 0x55, 0x9d, 0x98, 0xae, 0xa5, 0x57, 0xf8, 0x0a, 0x3d, 0x62, 0xb8,
-    0xd0, 0x13, 0xb0, 0x8d, 0x5a, 0xe7, 0xe0, 0x74, 0xad, 0xd5, 0x2d, 0x08, 0x91, 0xd6, 0x26, 0x84, 0x93, 0x7e, 0x3b,
-    0x88, 0x4e, 0xf4, 0xf3, 0x2b, 0x30, 0x76, 0xa3, 0x13, 0x76, 0x93, 0x9e, 0x21, 0x10, 0x4d, 0x1d, 0xa3, 0x80, 0x20,
-    0x6b, 0x08, 0x96, 0x06, 0x9d, 0x3f, 0xa9, 0x63, 0x90, 0x3a, 0x75, 0xad, 0x43, 0xd3, 0xd7, 0x8b, 0x80, 0xa2, 0x55,
-    0xc1, 0x2e, 0xd8, 0xdc, 0x54, 0x2a, 0x28, 0x0c, 0x15, 0x58, 0x70, 0xad, 0x2a, 0xd2, 0xfe, 0xf1, 0x95, 0x0a, 0xc9,
-    0x52, 0xba, 0xc8, 0x8c, 0xe4, 0xeb, 0x30, 0xfe, 0xaa, 0x78, 0xfc, 0xa2, 0x33, 0xc2, 0x3f, 0x52, 0xf8, 0x7e, 0x31,
-    0x99, 0x4c, 0xae, 0xd5, 0x4d, 0x5f, 0x8c, 0x27, 0xac, 0xcb, 0x76, 0x7a, 0x18, 0xe5, 0x6d, 0x49, 0x71, 0xd8, 0x29,
-    0x89, 0x76, 0xcb, 0xdb, 0x35, 0x46, 0xc9, 0x09, 0xea, 0xea, 0xf6, 0x4a, 0xac, 0x04, 0xaa, 0x2c, 0x41, 0x78, 0x9f,
-    0xc4, 0x69, 0xd0, 0x2e, 0xfd, 0x53, 0x29, 0xf5, 0xbf, 0x78, 0xf4, 0xe8, 0x51, 0xe9, 0x8f, 0xd5, 0x5b, 0x7b, 0x3c,
-    0x2e, 0xfd, 0xd1, 0x52, 0xa3, 0xd1, 0x6e, 0x4f, 0x26, 0xa5, 0x1f, 0xab, 0x82, 0xed, 0xee, 0x68, 0xbc, 0xdd, 0x2d,
-    0xfd, 0x33, 0xa3, 0x45, 0xe9, 0x33, 0xf9, 0x96, 0xb3, 0x71, 0x2d, 0x54, 0xfc, 0xb0, 0x0d, 0x95, 0x82, 0xd1, 0x96,
-    0xe8, 0xe0, 0x89, 0xc7, 0x20, 0x5a, 0xf0, 0x0c, 0x6c, 0xab, 0xb2, 0xc7, 0x40, 0x3e, 0x4f, 0xa4, 0x6c, 0x17, 0xdf,
-    0x76, 0x45, 0x89, 0xfe, 0xab, 0x29, 0xd1, 0x91, 0x99, 0x49, 0x9a, 0x33, 0xd2, 0x03, 0xcd, 0x6a, 0xe4, 0x2c, 0xaa,
-    0xfe, 0x35, 0x64, 0x95, 0xb0, 0x47, 0x69, 0x83, 0x2d, 0x85, 0x8c, 0xff, 0xf6, 0x2a, 0x19, 0xff, 0xdd, 0xcd, 0x32,
-    0xfe, 0xf8, 0x76, 0x22, 0xfe, 0xbb, 0x3f, 0x58, 0xc4, 0x7f, 0x6b, 0x8a, 0x78, 0x21, 0xc4, 0x2e, 0xc0, 0x7a, 0x25,
-    0xb3, 0xf5, 0x38, 0x3b, 0x6f, 0xe1, 0x96, 0xc8, 0x6d, 0x92, 0x9e, 0x1b, 0xb7, 0x12, 0xfe, 0x6b, 0x72, 0x7f, 0xd4,
-    0x60, 0xc6, 0x87, 0x62, 0x79, 0x76, 0x72, 0x92, 0x30, 0x25, 0xe3, 0x8d, 0x0a, 0xb2, 0x88, 0xdf, 0xa4, 0xa1, 0xfd,
-    0x06, 0x9c, 0x53, 0xa3, 0x64, 0x32, 0x81, 0xa2, 0xc9, 0xc4, 0x56, 0xb9, 0xb1, 0x20, 0xcf, 0xa8, 0xd5, 0xeb, 0x5a,
-    0x09, 0xb5, 0xfa, 0xfa, 0x6b, 0xb3, 0xcc, 0x2c, 0x90, 0x51, 0x28, 0xd3, 0x98, 0x90, 0x35, 0xe3, 0xb8, 0xc0, 0x3d,
-    0x58, 0x7d, 0xd8, 0x16, 0xed, 0x95, 0x19, 0x28, 0x95, 0x78, 0x84, 0x5f, 0x4c, 0x69, 0x7e, 0x44, 0x44, 0xe4, 0x31,
-    0xaf, 0x22, 0x57, 0x9d, 0x75, 0x1a, 0xdf, 0xab, 0xab, 0xce, 0x37, 0x61, 0xf1, 0x65, 0x2e, 0xc3, 0xe3, 0x8b, 0x17,
-    0x63, 0xe7, 0x02, 0xec, 0xd8, 0xb8, 0x78, 0x93, 0x36, 0x72, 0xc4, 0x04, 0xd8, 0x61, 0x68, 0x62, 0x5a, 0x0a, 0x82,
-    0x55, 0xc9, 0xf2, 0x55, 0x65, 0xcf, 0xe8, 0x24, 0x53, 0x89, 0x70, 0xc8, 0x41, 0x8d, 0x2c, 0x81, 0x39, 0x98, 0xd4,
-    0x85, 0xf4, 0xe1, 0x72, 0x91, 0x60, 0x71, 0x2a, 0xbf, 0x70, 0x4d, 0x91, 0xff, 0xa5, 0xd4, 0x1f, 0xf2, 0xe8, 0xbd,
-    0xea, 0x89, 0xc1, 0x76, 0x31, 0xc3, 0xb8, 0x54, 0x01, 0x76, 0x20, 0xdc, 0x1c, 0x3f, 0xc7, 0x23, 0x86, 0x50, 0x71,
-    0xec, 0x8a, 0x7a, 0xf8, 0xf9, 0x93, 0xea, 0xab, 0x90, 0xb5, 0x2f, 0x08, 0x36, 0x78, 0x00, 0xbf, 0xec, 0xcf, 0x51,
-    0x1b, 0x64, 0x0b, 0xee, 0x38, 0xd4, 0xca, 0x71, 0x4b, 0xaf, 0xbb, 0xd3, 0x06, 0x15, 0xe3, 0x8b, 0x6f, 0xfe, 0x38,
-    0xba, 0xb3, 0xc4, 0xf7, 0xaa, 0xb0, 0xf9, 0xca, 0x37, 0xb8, 0x34, 0x89, 0xf1, 0x23, 0x21, 0x02, 0x51, 0xe3, 0x9e,
-    0x88, 0x5a, 0xc4, 0xe6, 0xbb, 0xaf, 0xdc, 0x37, 0x83, 0xb0, 0xee, 0x3a, 0x0e, 0x96, 0x31, 0xb2, 0x7a, 0x21, 0xb6,
-    0x15, 0x56, 0xcd, 0x2a, 0x38, 0x37, 0xe8, 0xcc, 0xe2, 0xcc, 0x88, 0x39, 0xd7, 0xb6, 0x41, 0xa9, 0x82, 0xce, 0x22,
-    0x72, 0x7c, 0x81, 0xf1, 0x51, 0xe1, 0xfb, 0x2a, 0xa0, 0xeb, 0x5e, 0xa7, 0x01, 0x39, 0xfa, 0xa3, 0x9a, 0xd1, 0x55,
-    0x95, 0x2a, 0x28, 0xcd, 0x13, 0x02, 0x03, 0x19, 0x0a, 0xfe, 0xc2, 0x1a, 0xa7, 0x42, 0x6f, 0xc1, 0x34, 0x24, 0x80,
-    0xb5, 0x47, 0x86, 0x6e, 0x89, 0xad, 0xc0, 0x16, 0xd2, 0x02, 0x94, 0x1e, 0x76, 0xe8, 0x5b, 0x35, 0xd0, 0xd3, 0xd5,
-    0x98, 0xf1, 0x75, 0x4e, 0xda, 0xc5, 0x91, 0x5f, 0x9c, 0x79, 0xf0, 0xcf, 0xfa, 0x72, 0x09, 0x52, 0xfe, 0xf8, 0x53,
-    0xcc, 0xc1, 0xa6, 0x9e, 0xb7, 0x30, 0x02, 0x42, 0x21, 0x4c, 0xa9, 0x0e, 0xe9, 0xd8, 0x51, 0x5c, 0x0f, 0xea, 0x2d,
-    0x0a, 0xf4, 0xe5, 0xc8, 0x69, 0x09, 0xd2, 0x2c, 0x65, 0xbd, 0xfa, 0xf1, 0xb2, 0xe9, 0x37, 0x28, 0x62, 0x0d, 0x97,
-    0x19, 0xfa, 0x7e, 0xfc, 0x02, 0x7c, 0x3f, 0xa1, 0x46, 0xdb, 0xca, 0x69, 0x68, 0xaf, 0x6d, 0x1f, 0x48, 0xda, 0x6e,
-    0x92, 0xb5, 0x90, 0xaf, 0x3a, 0x47, 0x57, 0x39, 0x37, 0x37, 0x1d, 0xb6, 0x76, 0x77, 0x76, 0x3c, 0xf5, 0xcf, 0x38,
-    0xa5, 0x6e, 0x16, 0xd3, 0x61, 0xeb, 0x6d, 0x20, 0x0b, 0xa2, 0x09, 0x7e, 0x4d, 0xef, 0x36, 0x2d, 0x8f, 0x29, 0xd3,
-    0x71, 0x89, 0x6a, 0x3d, 0xe8, 0x3c, 0x02, 0x6f, 0xed, 0xd6, 0xc3, 0x5f, 0x8f, 0x7e, 0x29, 0x69, 0xa4, 0x2e, 0xac,
-    0xda, 0x76, 0x0f, 0xe5, 0x45, 0x12, 0x5d, 0x80, 0xd3, 0x48, 0x36, 0xc6, 0x31, 0x06, 0x70, 0x7b, 0xf3, 0x4c, 0x66,
-    0x0d, 0xe4, 0x2c, 0xa1, 0x5f, 0x59, 0x21, 0x97, 0x62, 0xfb, 0xc1, 0xfc, 0x5c, 0xad, 0x46, 0xa7, 0x91, 0x0d, 0xf0,
-    0x87, 0x1e, 0xfa, 0x5f, 0x9d, 0x65, 0x50, 0x3f, 0xb8, 0xde, 0x01, 0x18, 0x84, 0x61, 0xd3, 0xca, 0x05, 0x54, 0x6d,
-    0x28, 0x31, 0xd2, 0x1e, 0xaa, 0x81, 0x2c, 0x7f, 0x1b, 0x54, 0x65, 0x54, 0xb0, 0x1e, 0x7e, 0xd6, 0x30, 0x06, 0xd7,
-    0x54, 0x1a, 0x4f, 0xb3, 0x78, 0x3c, 0x4e, 0x58, 0x4f, 0xd9, 0x47, 0x56, 0xe7, 0x01, 0x66, 0x0d, 0x98, 0x4b, 0x56,
-    0x5f, 0x15, 0x83, 0x78, 0x9a, 0x4e, 0xd1, 0x31, 0xd8, 0x6b, 0xf8, 0x6d, 0xc2, 0xb5, 0xe4, 0x94, 0xc7, 0xe9, 0xed,
-    0x8a, 0x78, 0xf4, 0x5c, 0xc7, 0x65, 0x07, 0x8c, 0x45, 0x5a, 0xf0, 0x76, 0x8f, 0x67, 0xf3, 0xa0, 0xb5, 0x5d, 0x47,
-    0x04, 0xab, 0x34, 0x0a, 0xde, 0x1a, 0xb4, 0x3c, 0xb4, 0x0e, 0x84, 0x96, 0xb3, 0xfc, 0x8e, 0x2c, 0xa3, 0x01, 0xf0,
-    0xfb, 0x77, 0xba, 0xa8, 0xac, 0x23, 0xf3, 0xff, 0x67, 0xb7, 0x7c, 0xb5, 0x7e, 0xb7, 0x7c, 0xa5, 0x76, 0xcb, 0xf5,
-    0x1c, 0xfb, 0xc5, 0xa4, 0x83, 0x7f, 0x7a, 0x15, 0x42, 0xb0, 0x2a, 0x40, 0x0e, 0x0b, 0xed, 0xe2, 0x56, 0x17, 0xfe,
-    0xa3, 0xa1, 0xdb, 0x1e, 0xfe, 0xf1, 0xc1, 0x02, 0x6c, 0x5b, 0x58, 0x88, 0xff, 0xda, 0xb5, 0xaa, 0xce, 0x7d, 0xac,
-    0xc3, 0x5e, 0x3b, 0xab, 0x75, 0xdd, 0xeb, 0x37, 0x2d, 0xc8, 0x2b, 0xee, 0x04, 0x4a, 0x18, 0x83, 0xab, 0x16, 0x1d,
-    0x1f, 0x43, 0xe9, 0x24, 0x1b, 0x2d, 0x8a, 0xbf, 0x97, 0xf0, 0x4b, 0x22, 0x5e, 0xbb, 0xa5, 0x1b, 0xe3, 0xa8, 0xae,
-    0x22, 0x05, 0x45, 0x8d, 0xb0, 0xd4, 0xeb, 0x14, 0x14, 0xc0, 0x98, 0xcc, 0xe9, 0xfa, 0xf7, 0xd7, 0x6c, 0x82, 0xbf,
-    0xc9, 0xda, 0xac, 0x45, 0xe6, 0xdf, 0x4b, 0x8c, 0x6b, 0x89, 0xf0, 0x59, 0x34, 0x30, 0xd7, 0xb0, 0xfd, 0x68, 0x3d,
-    0xb8, 0x87, 0x6a, 0xa6, 0xa1, 0x52, 0x0a, 0x52, 0xef, 0x80, 0x17, 0x10, 0x2d, 0x12, 0x7e, 0xfd, 0xa8, 0x57, 0x71,
-    0xc6, 0xca, 0xa8, 0xd7, 0x08, 0xf4, 0xaa, 0xed, 0x2d, 0xa5, 0xf4, 0x17, 0x5f, 0xdd, 0xc7, 0x3f, 0x22, 0xf0, 0x75,
-    0x5c, 0xf9, 0x46, 0x22, 0x36, 0x80, 0xbe, 0xd1, 0x46, 0xcd, 0xf9, 0x11, 0x1a, 0x9c, 0xfc, 0x9f, 0xdb, 0xb6, 0x46,
-    0x63, 0xfd, 0x56, 0xcd, 0xa5, 0x55, 0xfa, 0x59, 0xad, 0x3f, 0x6f, 0xf0, 0x5b, 0xb6, 0x1d, 0x09, 0x87, 0xa0, 0xde,
-    0x56, 0xfe, 0xfa, 0x90, 0x95, 0xc6, 0x8a, 0xe2, 0xb7, 0x6d, 0x5f, 0x99, 0xc4, 0xd4, 0x63, 0x23, 0x3c, 0xd6, 0x4e,
-    0xa4, 0x3c, 0x6f, 0xc6, 0x1e, 0xc2, 0x8f, 0xfc, 0x91, 0x85, 0xf7, 0xf0, 0xcb, 0x5b, 0xd6, 0xf9, 0x2c, 0x49, 0xc1,
-    0xac, 0x9a, 0x72, 0x3e, 0x0f, 0xb6, 0xb6, 0xce, 0xce, 0xce, 0xfc, 0xb3, 0x6d, 0x3f, 0xcb, 0x4f, 0xb6, 0xba, 0xed,
-    0x76, 0x1b, 0x3f, 0x98, 0x64, 0x5b, 0xa7, 0x31, 0x3b, 0x7b, 0x0c, 0xee, 0x87, 0xfd, 0xd0, 0x7a, 0x64, 0x3d, 0xdc,
-    0xb6, 0x76, 0x1e, 0xd8, 0x16, 0x29, 0x00, 0x28, 0xd9, 0xb6, 0x2d, 0xa1, 0x00, 0x42, 0x1b, 0x8a, 0xfb, 0xbb, 0x27,
-    0xca, 0x86, 0xc3, 0x84, 0x74, 0x61, 0x21, 0x81, 0xff, 0x96, 0x7d, 0x62, 0xf5, 0xad, 0x2e, 0xca, 0x5a, 0x52, 0x8d,
-    0xa8, 0x57, 0xdc, 0xef, 0xa3, 0x68, 0x1e, 0x10, 0x1b, 0x99, 0x85, 0x18, 0x26, 0x13, 0xa5, 0x34, 0x05, 0xda, 0xa5,
-    0xc7, 0xf0, 0x04, 0x6e, 0xc1, 0xd4, 0x82, 0xe7, 0x57, 0xdd, 0x87, 0xa0, 0xe3, 0x4e, 0x5b, 0xf7, 0x47, 0xed, 0x56,
-    0xc7, 0xea, 0xb4, 0xba, 0xfe, 0x43, 0xab, 0x2b, 0xfe, 0x07, 0x19, 0xb9, 0x6d, 0x75, 0xe0, 0x69, 0xdb, 0x82, 0xf7,
-    0xd3, 0xfb, 0x22, 0x1d, 0x22, 0xb2, 0xb7, 0xfa, 0xbb, 0xf8, 0xfb, 0x83, 0x00, 0xa9, 0xaf, 0x6c, 0xf1, 0x1b, 0xcf,
-    0xec, 0x2f, 0xcc, 0xd2, 0xce, 0xa3, 0xb5, 0xc5, 0xdd, 0x87, 0x6b, 0x8b, 0xb7, 0x1f, 0xac, 0x2d, 0xbe, 0xbf, 0x53,
-    0x2f, 0xde, 0x3a, 0x11, 0x55, 0x5a, 0x2e, 0x84, 0xf6, 0x2c, 0x02, 0x46, 0x39, 0x77, 0x3a, 0x00, 0x67, 0xdb, 0x6a,
-    0xe1, 0x8f, 0x87, 0x5d, 0x57, 0xf7, 0x3a, 0xc6, 0x5e, 0x1a, 0xcb, 0x87, 0x8f, 0x00, 0xcb, 0xe7, 0xdd, 0x07, 0x23,
-    0x6c, 0x47, 0x88, 0xc2, 0xbf, 0xd3, 0xed, 0x47, 0x23, 0xd0, 0x08, 0x16, 0xfe, 0x83, 0x3f, 0xd3, 0x9d, 0xee, 0x48,
-    0xbc, 0xb4, 0xb1, 0xfe, 0x43, 0xe7, 0x61, 0x01, 0x4d, 0xf1, 0xcf, 0x6f, 0xda, 0x84, 0x46, 0x03, 0xde, 0x1c, 0xf7,
-    0x3e, 0xd0, 0xe8, 0xd1, 0xb4, 0xeb, 0x7f, 0x75, 0xfa, 0xd0, 0x7f, 0x34, 0xed, 0x3c, 0xfc, 0x20, 0xde, 0x12, 0xa0,
-    0xe0, 0x57, 0xf8, 0xef, 0xc3, 0x76, 0x7b, 0xda, 0xea, 0xf8, 0x8f, 0x4e, 0xb7, 0xfd, 0xed, 0xa4, 0xf5, 0xc0, 0x7f,
-    0x84, 0xff, 0xaa, 0xe1, 0xa6, 0xd9, 0x8c, 0xd9, 0x16, 0xae, 0x77, 0xc3, 0xef, 0x35, 0xe7, 0xe8, 0xde, 0xb7, 0x76,
-    0xee, 0x3f, 0x7f, 0x04, 0x6b, 0x34, 0xed, 0x74, 0xe1, 0xff, 0xab, 0x1e, 0x3f, 0x20, 0xe1, 0xe5, 0xc0, 0x11, 0xc3,
-    0x54, 0x52, 0x45, 0x38, 0xfa, 0x78, 0xd7, 0x3d, 0xef, 0x87, 0xab, 0x02, 0x20, 0x7f, 0xbe, 0x39, 0x00, 0xf2, 0x97,
-    0x5b, 0x06, 0xb9, 0xff, 0xfc, 0x07, 0x47, 0x40, 0x7e, 0x68, 0x06, 0xb9, 0xf7, 0xd8, 0x4a, 0xa0, 0xa3, 0xe9, 0xac,
-    0x3d, 0x67, 0xce, 0xe1, 0x8f, 0x6c, 0x88, 0x69, 0xd3, 0xd0, 0xfa, 0x2f, 0xb5, 0x78, 0x50, 0x86, 0x1b, 0x79, 0x8f,
-    0x89, 0x9d, 0xcc, 0xf8, 0x15, 0x04, 0xe1, 0xfc, 0x46, 0x82, 0xbc, 0xb8, 0x1d, 0x3d, 0x38, 0xff, 0x63, 0xe9, 0x41,
-    0x5f, 0xee, 0x57, 0xf4, 0xd0, 0x49, 0xe1, 0x85, 0xf1, 0xfb, 0x57, 0x16, 0x79, 0xa2, 0xaf, 0xa8, 0x65, 0x23, 0xca,
-    0xf4, 0xf4, 0x91, 0x97, 0xe8, 0x9e, 0x20, 0x54, 0x6e, 0x86, 0xf0, 0x9f, 0xf1, 0x09, 0xb0, 0x2d, 0xfc, 0xd4, 0x9c,
-    0x1d, 0xc0, 0x4f, 0xaa, 0xb5, 0x19, 0xc6, 0x0a, 0x0a, 0xbb, 0xac, 0x85, 0xf3, 0x29, 0x1c, 0x41, 0x51, 0x84, 0x7d,
-    0x7a, 0x77, 0x70, 0x46, 0x91, 0x63, 0xf8, 0xee, 0x73, 0x4e, 0x1d, 0x44, 0xb6, 0x72, 0x68, 0xcb, 0xc0, 0xce, 0x1c,
-    0xbf, 0x79, 0xab, 0x5e, 0x4e, 0xc5, 0x8d, 0x98, 0x90, 0xae, 0xb3, 0xed, 0xe8, 0xa0, 0x10, 0x26, 0x90, 0x87, 0xcb,
-    0x8c, 0x47, 0xf8, 0x4b, 0x95, 0x78, 0xcc, 0x13, 0xbc, 0x6c, 0x2b, 0x2f, 0xa6, 0x61, 0xbe, 0xf3, 0x77, 0x98, 0xab,
-    0xad, 0x30, 0x9e, 0x61, 0x20, 0xe2, 0x15, 0x1b, 0xc7, 0x91, 0x63, 0x3b, 0x73, 0x90, 0x04, 0x30, 0x66, 0xab, 0x96,
-    0x28, 0x4d, 0x39, 0xd2, 0xae, 0xad, 0x7e, 0x8f, 0x4f, 0x8e, 0xdf, 0x45, 0x0b, 0x0f, 0x65, 0xe0, 0xd2, 0x96, 0x9e,
-    0x05, 0x8c, 0xaf, 0x4a, 0x72, 0x54, 0x22, 0x95, 0x35, 0x62, 0x0b, 0x73, 0xa4, 0xe3, 0x77, 0xc1, 0x3d, 0xa1, 0x62,
-    0xfc, 0xce, 0xd4, 0x0f, 0x4e, 0x6b, 0x1b, 0xcc, 0x25, 0xa3, 0x9b, 0x1e, 0x68, 0xb8, 0x12, 0x9e, 0x12, 0x41, 0x87,
-    0x46, 0xa9, 0xa7, 0x7f, 0xb1, 0x59, 0x15, 0x86, 0x2a, 0x1e, 0x5f, 0x1c, 0xc8, 0xbb, 0xe4, 0x36, 0x46, 0x84, 0xe9,
-    0x24, 0xa0, 0xfa, 0x8e, 0xd5, 0x26, 0xa8, 0x21, 0xfa, 0xed, 0x92, 0x74, 0x9e, 0x8e, 0x9a, 0x06, 0x53, 0xb9, 0x2d,
-    0xe9, 0x91, 0x84, 0xb6, 0xd0, 0x33, 0x63, 0x76, 0x1a, 0x8f, 0xa4, 0xba, 0xf0, 0x2c, 0x79, 0x05, 0xa5, 0x45, 0x58,
-    0x84, 0x1d, 0x4f, 0xf8, 0xe4, 0xf0, 0x82, 0xda, 0x32, 0x4c, 0x33, 0xbb, 0x7f, 0xaf, 0xa7, 0x21, 0xa9, 0x67, 0xc1,
-    0xdb, 0xf8, 0xab, 0x2e, 0x0f, 0xc1, 0x07, 0xfc, 0xfb, 0xf0, 0x1e, 0xfe, 0xb2, 0xcb, 0x7b, 0x43, 0xdb, 0xf5, 0x49,
-    0xd8, 0xde, 0xab, 0x7e, 0xe3, 0x25, 0x4a, 0x9a, 0x4d, 0xd0, 0x8b, 0xde, 0x6d, 0x15, 0xa4, 0x54, 0x86, 0xdd, 0x9d,
-    0x4a, 0x19, 0xc2, 0xb3, 0x21, 0xfd, 0x40, 0x30, 0x77, 0xfd, 0x1d, 0x43, 0xc4, 0x9e, 0xb6, 0xf0, 0x67, 0x4d, 0xc8,
-    0xde, 0x87, 0x06, 0x4a, 0xca, 0xbe, 0x84, 0xe6, 0xdb, 0x42, 0xa0, 0x43, 0xbf, 0x1f, 0x49, 0x04, 0x0a, 0xf1, 0x57,
-    0xe7, 0x98, 0x35, 0x87, 0x53, 0x22, 0xf7, 0xc0, 0xf6, 0x8c, 0x38, 0x96, 0x60, 0x57, 0x19, 0xa5, 0x79, 0x0a, 0x7d,
-    0x1d, 0xfd, 0x79, 0xe8, 0x75, 0x75, 0x5e, 0x6d, 0xd3, 0xac, 0x99, 0x02, 0x19, 0xbe, 0x71, 0x00, 0x46, 0x57, 0x22,
-    0xc4, 0x67, 0xd2, 0x84, 0x78, 0xa8, 0x3e, 0x24, 0xb7, 0x26, 0xab, 0xd7, 0xdc, 0x14, 0xac, 0x62, 0x1a, 0xda, 0x17,
-    0x98, 0x8a, 0x83, 0x3f, 0xab, 0x62, 0xf5, 0x20, 0x19, 0xca, 0x4f, 0x22, 0xfc, 0x2d, 0x2f, 0xf4, 0xa3, 0xac, 0x36,
-    0x20, 0xa7, 0xef, 0x60, 0x12, 0xa4, 0x2f, 0xc6, 0x65, 0x13, 0x09, 0xb0, 0x43, 0xf0, 0x97, 0x06, 0x56, 0x57, 0x30,
-    0xe4, 0xdd, 0x4a, 0xcc, 0x55, 0x18, 0xc7, 0x39, 0x5d, 0xd9, 0x55, 0xf8, 0xd7, 0x22, 0xa5, 0x15, 0xa9, 0x69, 0x57,
-    0xb2, 0x62, 0x60, 0x63, 0x11, 0x88, 0x1a, 0x91, 0xe4, 0x66, 0x7e, 0x08, 0xda, 0xbc, 0x53, 0x39, 0x16, 0xf9, 0x6d,
-    0xf8, 0xa1, 0x7c, 0x5b, 0x10, 0xd9, 0x06, 0xf1, 0x78, 0x25, 0x4e, 0x64, 0x34, 0xe1, 0x55, 0xc4, 0xea, 0x37, 0x1f,
-    0x99, 0x1b, 0xde, 0x36, 0x57, 0x4b, 0x8f, 0x4b, 0xeb, 0xe0, 0xca, 0xb8, 0xe0, 0x31, 0x8b, 0xb8, 0x1f, 0xa5, 0x94,
-    0xf3, 0xe4, 0x18, 0x62, 0xc1, 0xeb, 0xb0, 0x6d, 0xb7, 0x04, 0xc9, 0x63, 0xfc, 0x6a, 0x28, 0x41, 0x7a, 0x1f, 0x0a,
-    0xab, 0x44, 0xb0, 0xdd, 0x69, 0xb7, 0xff, 0xe6, 0x60, 0xcf, 0x12, 0xbb, 0x79, 0x77, 0x0b, 0x5e, 0x77, 0xc9, 0xcd,
-    0x16, 0x79, 0x1f, 0xa1, 0xc8, 0xfb, 0xb0, 0x44, 0xa2, 0x58, 0x68, 0x6f, 0x09, 0x34, 0x6d, 0x8b, 0xa5, 0x23, 0x11,
-    0x1b, 0x9c, 0x81, 0x1b, 0x12, 0xe3, 0xc7, 0xc2, 0xb6, 0xb0, 0x5b, 0x0b, 0x57, 0xda, 0x56, 0x99, 0x33, 0xca, 0xf0,
-    0xe0, 0xa9, 0x8a, 0x24, 0x82, 0xb9, 0xc0, 0x54, 0x12, 0x8d, 0x1c, 0x4a, 0xe7, 0xba, 0xae, 0xb6, 0x2e, 0x16, 0xc7,
-    0x33, 0x90, 0x43, 0x2a, 0xf1, 0xe5, 0xbd, 0xec, 0xb0, 0x4b, 0x53, 0x61, 0xb2, 0xed, 0x6a, 0xa4, 0x73, 0xda, 0xe9,
-    0xef, 0x46, 0xd2, 0x8e, 0xc2, 0xbd, 0x5b, 0xc0, 0xe6, 0x05, 0xf5, 0x89, 0xc6, 0x8a, 0x1f, 0x67, 0x5b, 0x67, 0xec,
-    0xb8, 0x15, 0xcd, 0xe3, 0x2a, 0xac, 0x88, 0x5a, 0xb5, 0xbf, 0xab, 0x14, 0xac, 0x4c, 0xdf, 0x94, 0x8f, 0x91, 0x91,
-    0x1d, 0x82, 0x84, 0x23, 0x06, 0x2d, 0x65, 0xcc, 0x92, 0x8c, 0x51, 0x20, 0x3e, 0xc0, 0x4a, 0xfc, 0xab, 0x62, 0x9b,
-    0x52, 0x13, 0x94, 0x76, 0xff, 0xaf, 0xff, 0xeb, 0x7f, 0xcb, 0x70, 0x25, 0x90, 0x15, 0xc0, 0xc2, 0xf4, 0x9a, 0xea,
-    0xe4, 0x92, 0x9d, 0x83, 0x83, 0x1b, 0x8f, 0x5b, 0xd3, 0x28, 0x99, 0x00, 0x04, 0x05, 0x13, 0xda, 0x50, 0xd6, 0x03,
-    0x17, 0x48, 0xb0, 0xcc, 0x43, 0x7f, 0x09, 0x5e, 0xbd, 0x08, 0x57, 0xec, 0x77, 0xe5, 0xc3, 0xaa, 0x3c, 0x64, 0x62,
-    0x68, 0x23, 0x3b, 0xd6, 0xe0, 0xb9, 0x5a, 0x86, 0xac, 0xfa, 0xc5, 0x4b, 0x52, 0x78, 0xb0, 0x5a, 0x7a, 0x2c, 0xb4,
-    0xd4, 0x07, 0x2c, 0xff, 0xf6, 0xcf, 0xff, 0xf9, 0xbf, 0xab, 0x57, 0x3c, 0x37, 0xf9, 0xeb, 0x3f, 0xfd, 0xc3, 0xff,
-    0xfd, 0x3f, 0xff, 0x05, 0xb3, 0x8f, 0xe5, 0xd9, 0x0a, 0x6d, 0x25, 0xab, 0x3a, 0x58, 0x11, 0x7b, 0xca, 0xaa, 0x1c,
-    0x99, 0x7a, 0x1a, 0xed, 0x3e, 0x4d, 0x48, 0xbc, 0x29, 0xa1, 0x23, 0xbe, 0xa6, 0xb4, 0x6b, 0xa2, 0xda, 0x35, 0xe4,
-    0x83, 0xa5, 0xb4, 0x28, 0x5d, 0xc0, 0xde, 0x69, 0xdb, 0xd5, 0xf2, 0xf6, 0x8d, 0xbe, 0x5b, 0xb8, 0x30, 0xb7, 0xca,
-    0xec, 0xf1, 0xf5, 0xb2, 0x2d, 0x55, 0x78, 0x0c, 0x4b, 0xca, 0xaa, 0xdc, 0xc2, 0xb8, 0xf5, 0x12, 0x5f, 0x83, 0xae,
-    0x51, 0x4c, 0xab, 0x5c, 0xeb, 0xd3, 0xfb, 0x65, 0x01, 0x88, 0x4e, 0x70, 0x69, 0x44, 0x10, 0x8e, 0xce, 0x64, 0x5b,
-    0x68, 0xc0, 0x24, 0x17, 0x25, 0x8d, 0x22, 0xbc, 0xa4, 0xfb, 0x8f, 0xfe, 0xae, 0xfc, 0xd3, 0x0c, 0xad, 0x02, 0xcb,
-    0x99, 0x45, 0xe7, 0xd2, 0x77, 0x7a, 0xd0, 0x6e, 0xcf, 0xcf, 0xdd, 0x65, 0x35, 0x83, 0x77, 0xd5, 0x64, 0x14, 0xb8,
-    0x33, 0x07, 0xa4, 0xc3, 0x5c, 0x1d, 0x23, 0x04, 0x77, 0xa1, 0x8d, 0x21, 0xa5, 0xb2, 0xfc, 0x72, 0x49, 0x61, 0xaa,
-    0xf8, 0x37, 0x3c, 0x74, 0x95, 0x11, 0x3d, 0x28, 0x31, 0xb0, 0x58, 0x1a, 0xbd, 0xba, 0xa2, 0xd7, 0xb4, 0xb3, 0x9a,
-    0xf3, 0x62, 0x1e, 0x1a, 0x9b, 0xc7, 0xbd, 0xf7, 0xf1, 0x00, 0x77, 0xda, 0xf1, 0xa6, 0xdd, 0xa5, 0x1e, 0x9e, 0xf3,
-    0x6c, 0x66, 0x9e, 0x12, 0xb3, 0x88, 0x8d, 0xd8, 0x44, 0x45, 0x42, 0x65, 0xbd, 0x38, 0x01, 0x2e, 0xbf, 0xc0, 0xed,
-    0x06, 0xb4, 0xcd, 0x22, 0x1e, 0x10, 0xd3, 0xf6, 0xcc, 0x73, 0xe4, 0x08, 0x4f, 0xe8, 0xb3, 0xa5, 0x31, 0x57, 0x4f,
-    0x34, 0xc5, 0x78, 0x63, 0x3d, 0x9f, 0xa8, 0xf4, 0xa9, 0xbb, 0x39, 0x94, 0x08, 0x57, 0xbc, 0x90, 0xc7, 0xb3, 0xef,
-    0x6a, 0x7e, 0xbe, 0x14, 0xc5, 0xe0, 0x5a, 0xaf, 0xad, 0x17, 0x6a, 0x51, 0xd4, 0xbe, 0x00, 0x6b, 0x87, 0xc0, 0xb4,
-    0x9b, 0xad, 0xa8, 0x10, 0x5b, 0xbd, 0x0b, 0x5f, 0x68, 0x9b, 0x3e, 0x9a, 0xcf, 0xa9, 0xa1, 0x0b, 0xdc, 0x48, 0xb6,
-    0x39, 0x4a, 0x0a, 0x4a, 0x3d, 0x10, 0x27, 0xfd, 0xb2, 0x8d, 0x64, 0x5b, 0xf1, 0x24, 0x73, 0x00, 0xe8, 0xf7, 0x78,
-    0xff, 0x3f, 0x32, 0x18, 0x26, 0x95, 0xdd, 0x7b, 0x00, 0x00};
+    0xf3, 0x86, 0x9c, 0x17, 0xdf, 0xc5, 0x1c, 0x54, 0xc2, 0x56, 0xdf, 0x76, 0x07, 0xb6, 0x85, 0x4b, 0xdb, 0xcb, 0x36,
+    0x43, 0x41, 0xe1, 0x78, 0xf3, 0x80, 0x05, 0xd3, 0x7e, 0xd8, 0x1e, 0x38, 0xb9, 0x50, 0x1d, 0x09, 0x9e, 0x5b, 0x0a,
+    0x09, 0xde, 0xf6, 0xa6, 0x20, 0xd0, 0x91, 0x73, 0x37, 0xec, 0x4d, 0x55, 0x08, 0x45, 0x1f, 0x37, 0xc7, 0x6e, 0x10,
+    0xc3, 0x0f, 0xa7, 0x85, 0x4c, 0x33, 0xd5, 0x7d, 0xb5, 0x66, 0x76, 0x83, 0xb1, 0xb2, 0xc8, 0x93, 0x30, 0xdb, 0x74,
+    0x30, 0x42, 0x0b, 0x92, 0x76, 0x77, 0x00, 0x30, 0x6c, 0x3a, 0x8a, 0xd3, 0xb6, 0x14, 0xab, 0x29, 0xfb, 0xfc, 0x50,
+    0x2f, 0xc7, 0x94, 0x0d, 0xa6, 0xcc, 0xaf, 0xb4, 0x0f, 0x80, 0x15, 0x24, 0x5e, 0x3e, 0x54, 0x67, 0x5e, 0xcf, 0x6b,
+    0xe7, 0x5b, 0x4b, 0x25, 0x8a, 0x98, 0x67, 0x48, 0x28, 0x5e, 0x6a, 0x37, 0x4c, 0x98, 0xdb, 0x73, 0x24, 0x86, 0x66,
+    0xf9, 0xb0, 0x0d, 0x4c, 0xaf, 0x02, 0xec, 0xa9, 0xb9, 0x2d, 0x92, 0xb0, 0x6a, 0xee, 0x1d, 0x02, 0x6b, 0x0f, 0x81,
+    0x87, 0x68, 0x1b, 0xf5, 0x54, 0x34, 0x9f, 0x25, 0xe1, 0xf3, 0xc6, 0x71, 0x71, 0x84, 0x27, 0x42, 0xfb, 0xfe, 0x68,
+    0x91, 0x83, 0x3c, 0xe0, 0xaf, 0xc1, 0x32, 0x08, 0x65, 0x53, 0x74, 0xf4, 0xf0, 0x08, 0xd8, 0x23, 0xc4, 0x1b, 0x61,
+    0x73, 0xa3, 0x1a, 0x2d, 0x4a, 0x32, 0x5e, 0xe8, 0x60, 0xb8, 0xc7, 0xa5, 0x6b, 0x8f, 0x82, 0x41, 0x9e, 0x18, 0x3b,
+    0x78, 0xe6, 0xef, 0x8f, 0xb0, 0x1a, 0x27, 0x28, 0xdc, 0x92, 0x76, 0x5b, 0x25, 0xfe, 0xf6, 0xfd, 0x14, 0x24, 0x38,
+    0xd6, 0x81, 0x9f, 0x75, 0xf7, 0x6e, 0x22, 0x91, 0xda, 0x4d, 0x7b, 0x74, 0x12, 0x81, 0xf1, 0xe0, 0xdc, 0x4f, 0xa1,
+    0x1a, 0x49, 0x44, 0x45, 0x39, 0x5a, 0xa0, 0xe6, 0xa9, 0x5a, 0x05, 0xdf, 0xa1, 0x19, 0x81, 0xe7, 0x18, 0xb6, 0x26,
+    0x3f, 0x55, 0x37, 0x16, 0xb1, 0x7c, 0xd7, 0xa5, 0xa3, 0x2d, 0x3c, 0x80, 0x14, 0x8c, 0x26, 0x18, 0xc6, 0xa5, 0xa0,
+    0x64, 0xc5, 0x7f, 0x1f, 0x8d, 0x58, 0xf9, 0xf4, 0x30, 0xdb, 0xdc, 0x1c, 0x8a, 0x73, 0x0b, 0x62, 0x1c, 0x6e, 0x44,
+    0x57, 0xe3, 0x0a, 0x80, 0xfa, 0x74, 0x4e, 0x5c, 0x0f, 0x4c, 0x2b, 0xd6, 0x74, 0x29, 0xf6, 0xc9, 0x61, 0x06, 0xa0,
+    0xe0, 0x96, 0x73, 0xe8, 0x0f, 0xfe, 0x3c, 0x04, 0xf7, 0xd8, 0xff, 0x93, 0xbb, 0xa5, 0x04, 0x4d, 0x4f, 0x9e, 0x29,
+    0x2e, 0xe9, 0x8c, 0xb5, 0xe3, 0x51, 0x6c, 0x34, 0x28, 0xbc, 0x14, 0x30, 0x00, 0x6d, 0x0e, 0x32, 0xa1, 0xe2, 0x20,
+    0xe4, 0xa8, 0xc0, 0xf6, 0x71, 0xf3, 0x73, 0xdc, 0xd9, 0x4f, 0xc1, 0xc2, 0x1b, 0xe8, 0xb7, 0x97, 0xf0, 0xf6, 0x67,
+    0xfd, 0xf6, 0x0b, 0x0b, 0x7e, 0x29, 0x65, 0xe8, 0xbe, 0x36, 0xc5, 0x03, 0x35, 0x45, 0x29, 0x96, 0xc8, 0xa0, 0x21,
+    0x73, 0xf3, 0x95, 0x98, 0x0d, 0x77, 0x4b, 0x20, 0x86, 0x12, 0x5d, 0xb9, 0xcf, 0xa3, 0x13, 0x24, 0xae, 0x6b, 0x92,
+    0xc2, 0xc8, 0x25, 0x30, 0x11, 0xae, 0xf8, 0x96, 0x98, 0xb3, 0xdf, 0x06, 0x1b, 0xbc, 0x96, 0x77, 0x80, 0xf6, 0x1d,
+    0x9b, 0xcd, 0xf9, 0xc5, 0x3e, 0x29, 0xfa, 0x40, 0xa6, 0x0d, 0x88, 0xb3, 0xf3, 0x76, 0x2f, 0xde, 0xe5, 0xbd, 0x18,
+    0xa4, 0x7a, 0xae, 0x58, 0x0c, 0xf7, 0xaa, 0xf7, 0x16, 0xa3, 0x94, 0x26, 0x33, 0x79, 0x35, 0xf4, 0xba, 0x12, 0xbd,
+    0xcd, 0x4d, 0x40, 0xb0, 0x67, 0x74, 0xe5, 0xa2, 0x6b, 0x59, 0x0a, 0x9a, 0x00, 0x44, 0x8f, 0xea, 0x2c, 0x47, 0x1c,
+    0x87, 0xd9, 0x6c, 0x50, 0x3c, 0x62, 0xee, 0xda, 0x51, 0x71, 0x4c, 0xec, 0x2e, 0x13, 0x76, 0x00, 0x33, 0xe2, 0xf2,
+    0x56, 0x47, 0x44, 0x87, 0x45, 0x7f, 0x1d, 0xdf, 0xfe, 0xe8, 0xb1, 0xcd, 0x8e, 0x0b, 0x1a, 0xa4, 0x36, 0xd6, 0xc3,
+    0x6a, 0x2c, 0xa8, 0x0f, 0x3f, 0x6a, 0x2a, 0x95, 0xc5, 0xe6, 0x66, 0x59, 0x3f, 0xaa, 0x55, 0x3b, 0xb8, 0x76, 0x9a,
+    0x72, 0xde, 0xcc, 0x06, 0xe1, 0x40, 0xc4, 0x04, 0x0a, 0xb4, 0xb4, 0xb2, 0x62, 0x80, 0x21, 0x65, 0x39, 0xca, 0xa7,
+    0x90, 0x79, 0x71, 0x59, 0xea, 0xd4, 0x17, 0x19, 0x8f, 0x0c, 0xf1, 0xd4, 0x93, 0x8c, 0x15, 0x50, 0xb0, 0x5e, 0xea,
+    0x25, 0xb4, 0x44, 0x80, 0xf9, 0x33, 0x95, 0x43, 0x23, 0x2c, 0x90, 0x28, 0x34, 0xcc, 0x12, 0x65, 0x7c, 0x16, 0x61,
+    0x0c, 0xda, 0xfe, 0x49, 0x2d, 0xf6, 0x55, 0x28, 0xa3, 0xa3, 0x38, 0xcc, 0x87, 0x01, 0xd5, 0x2f, 0xa4, 0x04, 0x9b,
+    0x86, 0xef, 0x81, 0x8d, 0x2a, 0xc7, 0x93, 0x04, 0xe1, 0xd3, 0x38, 0x67, 0xe4, 0x29, 0x6c, 0x48, 0x98, 0xa5, 0x69,
+    0x1b, 0xa9, 0x76, 0x91, 0x19, 0x84, 0x72, 0x51, 0xf0, 0x1a, 0x67, 0x17, 0x59, 0xb8, 0xd2, 0x1a, 0xcc, 0x8f, 0x37,
+    0x26, 0x40, 0xd9, 0xe5, 0x65, 0x26, 0x7c, 0xdc, 0x88, 0xec, 0x0d, 0x5d, 0x31, 0x1d, 0x28, 0xa4, 0x02, 0x27, 0x22,
+    0x8b, 0x87, 0xce, 0x50, 0x68, 0x84, 0x03, 0x3a, 0x45, 0xce, 0x5d, 0x63, 0xd3, 0xe7, 0x03, 0xed, 0x1b, 0xa5, 0xa1,
+    0x93, 0x80, 0x10, 0x10, 0xb8, 0x1b, 0xd6, 0x54, 0x3a, 0x48, 0x83, 0x84, 0x4a, 0xd1, 0xcf, 0x01, 0xfc, 0xc3, 0x48,
+    0x52, 0x00, 0xec, 0x87, 0x6a, 0xa4, 0x88, 0xb2, 0x2c, 0x70, 0x01, 0x68, 0xae, 0x7d, 0x5c, 0x09, 0x5f, 0x18, 0xa8,
+    0x30, 0x3d, 0xcd, 0xca, 0x4b, 0xa1, 0x44, 0x1e, 0xaf, 0x49, 0x59, 0x23, 0x99, 0x7c, 0x8a, 0x0e, 0x9f, 0xf2, 0xae,
+    0x5f, 0x4b, 0x3c, 0x74, 0xc1, 0x53, 0x58, 0x56, 0xf5, 0xfc, 0x2a, 0xe4, 0xe4, 0x5c, 0x83, 0xae, 0x90, 0x42, 0x7f,
+    0xc5, 0x49, 0xde, 0x7b, 0xe5, 0x57, 0xb5, 0xd4, 0x18, 0xca, 0xde, 0xaf, 0x6b, 0x86, 0xe5, 0xe5, 0xbc, 0x0a, 0x53,
+    0x10, 0x70, 0x4b, 0x96, 0x04, 0x4b, 0xa9, 0x21, 0xc0, 0xc2, 0xf6, 0x48, 0x2b, 0x05, 0x79, 0xa9, 0xc3, 0x3b, 0x4f,
+    0xc1, 0x0a, 0x30, 0x0e, 0xb5, 0x54, 0x32, 0x8d, 0x24, 0xbe, 0x54, 0xa2, 0xc0, 0x94, 0xfb, 0x23, 0xf0, 0x53, 0x9b,
+    0x27, 0x5d, 0xe7, 0xae, 0x1f, 0xcf, 0x30, 0xb5, 0x87, 0x40, 0x8f, 0xbd, 0x3b, 0x60, 0x4a, 0xd4, 0x75, 0x58, 0x41,
+    0x1c, 0x9a, 0xd5, 0x34, 0x0b, 0x98, 0x31, 0x6d, 0xd0, 0x92, 0x6d, 0xb0, 0xe5, 0x72, 0xb0, 0x8f, 0xc4, 0xf6, 0xac,
+    0x56, 0x40, 0xe8, 0x1a, 0x34, 0x30, 0xe4, 0x2e, 0x15, 0x5a, 0x98, 0xf7, 0xba, 0x54, 0x84, 0xfb, 0x73, 0xc0, 0xa5,
+    0x15, 0x9c, 0x79, 0x19, 0x0d, 0xbc, 0x1f, 0x1f, 0x27, 0x98, 0xf8, 0x82, 0x58, 0x81, 0x1d, 0x1c, 0x74, 0x9a, 0x4d,
+    0x81, 0x53, 0x71, 0x91, 0x32, 0x58, 0x56, 0x94, 0xda, 0xf0, 0x43, 0x8a, 0x6c, 0xdd, 0xe5, 0x81, 0xee, 0x42, 0x2c,
+    0x80, 0x9d, 0x7e, 0xc3, 0xc8, 0xb7, 0xac, 0x97, 0x01, 0x83, 0x53, 0xad, 0x71, 0x10, 0xf8, 0xcd, 0xcd, 0x64, 0x58,
+    0xa6, 0xc4, 0x76, 0x4d, 0x56, 0x17, 0x90, 0xc3, 0x50, 0x4d, 0xdc, 0x41, 0x58, 0x2a, 0x7b, 0xbc, 0x28, 0x67, 0xb8,
+    0x5c, 0xca, 0x42, 0x6e, 0x9e, 0x57, 0xd3, 0x7c, 0x6e, 0xa5, 0xd9, 0x74, 0xbc, 0x15, 0x5f, 0x14, 0xfc, 0x03, 0x27,
+    0x96, 0x56, 0x3d, 0xa5, 0x56, 0x78, 0x94, 0xb9, 0x25, 0xeb, 0x94, 0xd4, 0xea, 0xba, 0x81, 0x6a, 0x84, 0xa7, 0x69,
+    0xd8, 0x08, 0x84, 0x98, 0xe0, 0xe2, 0xd7, 0x4d, 0x26, 0xa6, 0xbd, 0x25, 0xa4, 0x8e, 0xb0, 0x7b, 0x28, 0x27, 0xb8,
+    0xab, 0x79, 0xf6, 0x79, 0x38, 0xbf, 0x9a, 0xb9, 0xf7, 0x0c, 0xe6, 0x7e, 0x1c, 0x72, 0x83, 0xd1, 0x63, 0x99, 0xf0,
+    0x23, 0x63, 0x1f, 0xb9, 0xaa, 0x7a, 0x72, 0x12, 0x56, 0x22, 0x4b, 0x3c, 0x19, 0x47, 0x1d, 0xc6, 0xa9, 0x68, 0x4d,
+    0x90, 0x5d, 0x5e, 0x16, 0xe6, 0x5e, 0xa0, 0xa0, 0xa9, 0xc7, 0xeb, 0x71, 0xda, 0x8a, 0x9d, 0x8d, 0x48, 0xe4, 0xde,
+    0xab, 0x5a, 0x24, 0xb2, 0xe2, 0x73, 0x1c, 0xe9, 0x8a, 0x83, 0xdc, 0x27, 0x27, 0xab, 0x9b, 0x54, 0xe8, 0x16, 0x8d,
+    0xb6, 0xb1, 0x47, 0xf5, 0x81, 0xa4, 0x9e, 0x51, 0x81, 0x55, 0x8d, 0x7d, 0xf7, 0x6e, 0x47, 0xa4, 0x5b, 0x2a, 0xc5,
+    0x06, 0x4b, 0x0b, 0xa3, 0x19, 0xa3, 0x60, 0x50, 0x52, 0x64, 0xa0, 0x46, 0xf9, 0x15, 0x82, 0x61, 0x8f, 0x1a, 0x80,
+    0xe2, 0x5c, 0x5f, 0xfd, 0xb8, 0x94, 0x6c, 0x21, 0x20, 0x71, 0x97, 0x0c, 0xc4, 0x9a, 0x60, 0x66, 0xe4, 0x93, 0xf7,
+    0xc0, 0x79, 0x03, 0x86, 0x0e, 0x01, 0xf8, 0x05, 0x62, 0xd3, 0x83, 0x89, 0x6d, 0x13, 0x51, 0xf4, 0xd9, 0xc0, 0x73,
+    0x00, 0x76, 0x5e, 0x85, 0x46, 0xdf, 0x55, 0x29, 0x60, 0xc8, 0x06, 0x6e, 0xc0, 0xaa, 0xb0, 0xdc, 0xde, 0x73, 0x70,
+    0x1b, 0xe0, 0xf5, 0x99, 0x6c, 0xbe, 0x81, 0x79, 0x82, 0xd5, 0xd9, 0x85, 0x5f, 0x59, 0xd6, 0xe2, 0xdc, 0xe9, 0xa0,
+    0x51, 0xaf, 0x28, 0x21, 0x6a, 0xf7, 0xb1, 0xf6, 0x39, 0x46, 0x58, 0xc4, 0xfb, 0x2b, 0x7c, 0xd7, 0xe3, 0x96, 0x7b,
+    0x1a, 0x2d, 0xc2, 0x74, 0x95, 0x34, 0x06, 0x25, 0xeb, 0x7e, 0x32, 0xe2, 0x5e, 0xee, 0x8b, 0x58, 0x70, 0x85, 0x23,
+    0xab, 0x42, 0x8a, 0x0d, 0x24, 0xe9, 0x69, 0x8f, 0x0e, 0xd8, 0x37, 0x9a, 0xbd, 0x80, 0x32, 0xef, 0x2b, 0x52, 0x49,
+    0x48, 0x69, 0x76, 0x43, 0x24, 0x09, 0x6b, 0x45, 0x9e, 0x3a, 0xef, 0x3b, 0xda, 0xe7, 0x56, 0x12, 0xc1, 0x08, 0x4e,
+    0xc2, 0x74, 0xac, 0x3c, 0x68, 0x0a, 0x70, 0x15, 0x1d, 0x31, 0x7d, 0x13, 0x90, 0xdf, 0x0c, 0xe4, 0xf6, 0x4a, 0x72,
+    0x6d, 0xae, 0x61, 0x78, 0x82, 0x04, 0xab, 0x22, 0x11, 0x78, 0x44, 0x8d, 0x09, 0xc9, 0xeb, 0x3c, 0x0f, 0x30, 0xe1,
+    0x6b, 0x7b, 0x13, 0x00, 0xca, 0xc9, 0x55, 0x71, 0x56, 0x02, 0xdd, 0x80, 0xe5, 0xfa, 0x38, 0x35, 0x2a, 0x12, 0x17,
+    0x37, 0xa6, 0xab, 0x5b, 0xfa, 0x33, 0xb4, 0x9c, 0xc9, 0x10, 0xd3, 0x41, 0x10, 0x90, 0xa9, 0x8f, 0x99, 0x23, 0x64,
+    0xae, 0xb0, 0x3e, 0xe7, 0x4e, 0x6d, 0xea, 0x1e, 0xa3, 0x6e, 0x9e, 0xa4, 0x16, 0xaf, 0xd3, 0xa6, 0x94, 0x88, 0x49,
+    0x89, 0x39, 0x13, 0xa9, 0xd8, 0x4c, 0x89, 0x3b, 0xb7, 0xbe, 0xd1, 0x42, 0xda, 0x68, 0x33, 0x91, 0x83, 0xcd, 0x2a,
+    0x79, 0x4f, 0x60, 0x3c, 0x17, 0x84, 0x2f, 0x91, 0xb1, 0x96, 0x63, 0xe6, 0x98, 0x08, 0x56, 0x2f, 0xa6, 0x22, 0x7f,
+    0xe7, 0xe8, 0x34, 0x7b, 0x83, 0x1e, 0xa4, 0xde, 0x40, 0x62, 0xd6, 0xc4, 0x77, 0x21, 0x0d, 0x75, 0x84, 0x40, 0x65,
+    0x54, 0xcb, 0x74, 0x9c, 0x58, 0x85, 0x6f, 0x04, 0x5f, 0xbd, 0xd5, 0xc7, 0xf9, 0xc6, 0x73, 0x63, 0x35, 0x82, 0x18,
+    0xbc, 0x85, 0x7c, 0xe8, 0x49, 0x11, 0x0e, 0x84, 0xcb, 0x37, 0x37, 0x7b, 0xf9, 0x2e, 0xaf, 0x42, 0x24, 0x15, 0x8c,
+    0x31, 0x66, 0x14, 0xe3, 0x9e, 0xa8, 0xa9, 0xc5, 0x1c, 0x06, 0x96, 0xad, 0xc3, 0x1c, 0x0f, 0x00, 0xa0, 0xa5, 0x29,
+    0xbd, 0x6a, 0x2a, 0x54, 0x9e, 0xe7, 0x12, 0x3e, 0xd5, 0x21, 0xaa, 0x6a, 0xfc, 0x76, 0x7d, 0x06, 0x0a, 0xc1, 0x7d,
+    0xa7, 0xe3, 0xe1, 0x21, 0x04, 0xac, 0xa2, 0x90, 0x05, 0x7a, 0x83, 0xf6, 0xaa, 0x44, 0x28, 0x66, 0x4e, 0xd6, 0x63,
+    0x86, 0x93, 0x0a, 0xb6, 0x50, 0x09, 0x4b, 0xa5, 0x05, 0x7e, 0xb5, 0x11, 0x9a, 0xa7, 0x8c, 0x7b, 0xaf, 0x2a, 0x9c,
+    0x41, 0x7f, 0x30, 0x6f, 0x95, 0x51, 0xdf, 0xae, 0x9c, 0xc8, 0x54, 0x60, 0xe2, 0x66, 0x96, 0xda, 0xef, 0x97, 0x75,
+    0xda, 0xcf, 0x2b, 0xe4, 0x3e, 0x27, 0xcd, 0xd7, 0xb9, 0x85, 0xe6, 0x93, 0xe1, 0x7e, 0xa5, 0xfc, 0xd0, 0xc2, 0xa8,
+    0x29, 0xbf, 0xbc, 0xae, 0xfc, 0x0a, 0x4f, 0x85, 0xb7, 0xfa, 0x5d, 0x14, 0xba, 0xa8, 0xcf, 0xc1, 0x10, 0xd2, 0x8f,
+    0xe0, 0x1a, 0x1a, 0x3c, 0x28, 0x92, 0xc5, 0x62, 0xed, 0x82, 0xb8, 0x3e, 0xe6, 0x54, 0x3b, 0x94, 0x31, 0x46, 0x3c,
+    0x2d, 0x39, 0x48, 0x32, 0x38, 0x18, 0xbf, 0x81, 0x01, 0x31, 0x29, 0x09, 0xe9, 0x10, 0x3a, 0x6b, 0x33, 0x11, 0x95,
+    0xbb, 0x78, 0xb3, 0x71, 0x59, 0x53, 0x28, 0xc2, 0x4e, 0x30, 0x53, 0x29, 0x15, 0x04, 0xd2, 0xe4, 0xbb, 0xd3, 0xa9,
+    0x05, 0x43, 0x0b, 0xd7, 0x54, 0x40, 0x5e, 0xdb, 0xf5, 0xa0, 0xc9, 0x7b, 0x8a, 0xa1, 0xaf, 0x53, 0x23, 0x5e, 0x66,
+    0xf0, 0x35, 0x6c, 0xfe, 0x9a, 0x28, 0xc9, 0x43, 0x26, 0x62, 0xaf, 0xe0, 0x13, 0x21, 0x9b, 0x82, 0x9d, 0x09, 0xf4,
+    0x43, 0xbb, 0xb2, 0x97, 0xee, 0x16, 0x95, 0x4b, 0x8b, 0xc6, 0x56, 0xa2, 0x66, 0xcd, 0x0f, 0xe3, 0xcd, 0x14, 0xf6,
+    0xb3, 0x47, 0x09, 0x04, 0xa4, 0xa9, 0x9c, 0xa4, 0x9a, 0xf7, 0x30, 0x1d, 0x02, 0x48, 0xb0, 0xfb, 0x09, 0x2c, 0xf4,
+    0x9b, 0x12, 0x13, 0x2c, 0xaa, 0xc6, 0x6e, 0x73, 0xd0, 0x9a, 0x73, 0xd2, 0x7c, 0x73, 0xd4, 0xda, 0x9b, 0xca, 0x7a,
+    0xc6, 0xec, 0x00, 0xdb, 0x76, 0x37, 0x8b, 0xc3, 0x74, 0xb3, 0x33, 0x34, 0x04, 0x17, 0x1e, 0xff, 0x27, 0x25, 0xa6,
+    0x81, 0xe4, 0x52, 0x37, 0x7e, 0x42, 0x1d, 0x86, 0xff, 0x2d, 0x49, 0x01, 0x0f, 0x6a, 0xab, 0xb1, 0xe2, 0xdc, 0x2b,
+    0x8e, 0x92, 0xcb, 0xaa, 0xda, 0xd5, 0x12, 0x34, 0x74, 0x23, 0x19, 0x13, 0xc5, 0x3c, 0x27, 0x00, 0x46, 0xb1, 0xf9,
+    0x53, 0xa6, 0x93, 0xbc, 0x7f, 0x59, 0x9b, 0xda, 0xed, 0xfb, 0x7e, 0x94, 0x9f, 0xd0, 0x91, 0x8a, 0xca, 0xe6, 0x24,
+    0xe6, 0xdf, 0x16, 0x60, 0x9a, 0x13, 0x1f, 0xea, 0xb9, 0x86, 0xa1, 0x00, 0x5f, 0xd9, 0x50, 0x6a, 0xb6, 0x97, 0xbf,
+    0x77, 0xb6, 0xfb, 0x92, 0x28, 0x82, 0x05, 0x1a, 0x74, 0xb9, 0x02, 0x5f, 0xc0, 0x32, 0xb8, 0x25, 0xfd, 0xf4, 0xa6,
+    0xbf, 0x0a, 0x3e, 0x63, 0xff, 0x0b, 0x40, 0xab, 0x02, 0x03, 0xca, 0x9d, 0xa6, 0x61, 0x25, 0xc4, 0x25, 0x2a, 0xcc,
+    0x2a, 0xce, 0x1f, 0xd7, 0x79, 0xdd, 0xb4, 0x2c, 0x31, 0x28, 0x3f, 0x77, 0x0d, 0x37, 0xbe, 0xd7, 0xc8, 0x1f, 0xdf,
+    0x7b, 0x0e, 0xba, 0x9d, 0x48, 0x7b, 0xf7, 0x6e, 0x7e, 0x87, 0x2c, 0x34, 0xbc, 0x17, 0x36, 0x87, 0xb6, 0x48, 0x97,
+    0x5c, 0x3d, 0x63, 0x31, 0xde, 0x16, 0xa1, 0x32, 0x7c, 0xc0, 0x82, 0x39, 0x60, 0x08, 0x1e, 0x3b, 0x95, 0xc9, 0x67,
+    0xd8, 0x68, 0x8a, 0x5d, 0x73, 0x61, 0xf0, 0x81, 0xaa, 0x2c, 0x24, 0x2f, 0xd6, 0xc9, 0xf6, 0xec, 0x14, 0x9e, 0x5f,
+    0xc6, 0x05, 0x50, 0x07, 0xd0, 0xaf, 0xa8, 0x2c, 0x36, 0x90, 0x8b, 0x9b, 0xb2, 0xd6, 0x2b, 0x1a, 0x8f, 0xaf, 0xed,
+    0xc2, 0xea, 0x0a, 0x7c, 0x1a, 0xa5, 0xe3, 0x44, 0x4c, 0x62, 0x26, 0x55, 0xae, 0xc9, 0xb5, 0xd1, 0xbd, 0xb4, 0x45,
+    0xf3, 0x5c, 0x48, 0xf0, 0x8a, 0xc0, 0x0d, 0xa1, 0xaf, 0xf4, 0xe5, 0x7a, 0x03, 0x05, 0x8f, 0xda, 0x9b, 0x8b, 0x60,
+    0x62, 0xe2, 0x31, 0x43, 0x6a, 0xfa, 0x75, 0x38, 0x15, 0xdf, 0xfc, 0xb6, 0xe2, 0xf0, 0xeb, 0x9c, 0xb1, 0x86, 0x02,
+    0x20, 0x3e, 0x79, 0x70, 0xb5, 0x9b, 0xf4, 0x4a, 0x69, 0x07, 0xa5, 0x11, 0xe2, 0xdb, 0x0a, 0x5f, 0x77, 0xa9, 0xf8,
+    0xca, 0x55, 0xf7, 0xbe, 0x8e, 0x99, 0x71, 0xc1, 0xe8, 0x39, 0x9f, 0x25, 0x8d, 0x6b, 0x37, 0x74, 0x57, 0xe7, 0x47,
+    0xef, 0x07, 0x99, 0xb7, 0x70, 0x0c, 0x6c, 0x72, 0xcc, 0x9c, 0xe7, 0xde, 0x6b, 0xe3, 0x44, 0xf9, 0x5b, 0xf3, 0x88,
+    0x57, 0x0e, 0xb3, 0xee, 0x24, 0xf9, 0xdb, 0xc1, 0xb7, 0xc1, 0xd5, 0x2d, 0x8d, 0x13, 0xe4, 0xae, 0x3a, 0x41, 0x26,
+    0xca, 0xcd, 0xf4, 0x86, 0xdb, 0xbb, 0xad, 0x40, 0x10, 0xa7, 0x62, 0xfa, 0xa8, 0x1c, 0xd7, 0x8f, 0x16, 0xa8, 0x54,
+    0x44, 0x7c, 0xaa, 0x72, 0x57, 0xae, 0x4c, 0x0d, 0xf5, 0xb8, 0x4e, 0x66, 0xa1, 0x69, 0xd6, 0xe4, 0x52, 0x36, 0x3d,
+    0x46, 0xa6, 0xd9, 0xa9, 0x36, 0xbf, 0x7b, 0xe5, 0x21, 0x1d, 0x43, 0x73, 0xb1, 0x56, 0x0b, 0xee, 0x77, 0x15, 0x85,
+    0x77, 0xbd, 0xd8, 0x48, 0x65, 0xa8, 0x59, 0x8f, 0xa2, 0x8f, 0xe3, 0x36, 0x73, 0x79, 0x94, 0xfd, 0x59, 0x03, 0xc0,
+    0x74, 0x84, 0x45, 0x77, 0xd3, 0x33, 0xf6, 0x04, 0x7a, 0x7a, 0x22, 0x83, 0x44, 0xaf, 0x74, 0xbe, 0x6a, 0x95, 0x58,
+    0xba, 0x86, 0xc0, 0xee, 0x35, 0x19, 0xab, 0x92, 0x76, 0xab, 0xf5, 0xab, 0x79, 0x3e, 0x4f, 0xf9, 0x4a, 0x9e, 0x4f,
+    0xcd, 0xa2, 0xbb, 0xd3, 0x76, 0xaf, 0x4f, 0x0d, 0x15, 0x73, 0xad, 0x6f, 0xf2, 0x3b, 0xa6, 0xeb, 0x60, 0xa8, 0x45,
+    0x90, 0x59, 0xed, 0xaa, 0x67, 0x65, 0x39, 0xab, 0x67, 0x72, 0xcc, 0x84, 0x6f, 0x2a, 0xdd, 0x21, 0xba, 0x61, 0xaa,
+    0x66, 0xfa, 0xb1, 0xb1, 0x2d, 0x64, 0x9b, 0xe7, 0x17, 0xe3, 0x1c, 0x28, 0x2d, 0xf7, 0x97, 0x09, 0xc3, 0x8f, 0x97,
+    0x97, 0x3f, 0x0a, 0x39, 0x55, 0x75, 0xf4, 0x96, 0x2f, 0x75, 0xcf, 0x60, 0x56, 0x2a, 0x27, 0xe2, 0x23, 0x5b, 0x3f,
+    0x78, 0x73, 0xf7, 0x0a, 0x58, 0x3e, 0x02, 0x76, 0x1f, 0x99, 0xd3, 0x18, 0xaa, 0xda, 0xc0, 0x3f, 0xac, 0x1f, 0x6c,
+    0xdd, 0x1e, 0xfe, 0x61, 0xf0, 0x43, 0x70, 0x6d, 0x63, 0x63, 0x1b, 0x6f, 0xd7, 0x12, 0x41, 0x5e, 0xe1, 0x81, 0x3e,
+    0x5e, 0x7d, 0x14, 0xb4, 0x5c, 0x27, 0xb6, 0x07, 0x0e, 0x85, 0xad, 0x41, 0xbe, 0x49, 0x99, 0x34, 0x5a, 0x14, 0x3c,
+    0x9b, 0xc9, 0x19, 0x0a, 0x79, 0xcd, 0xc7, 0x41, 0xdb, 0x11, 0xfe, 0x06, 0x4e, 0xed, 0x78, 0x79, 0xf9, 0x09, 0xfa,
+    0x80, 0xa7, 0x2b, 0xa5, 0xa9, 0x88, 0x53, 0xca, 0x2d, 0xba, 0x5a, 0xe7, 0xc1, 0x48, 0x71, 0x31, 0x45, 0xa5, 0xe3,
+    0x2e, 0xaf, 0x9d, 0x8d, 0x9c, 0xfe, 0x12, 0xaf, 0x2e, 0xd2, 0xe5, 0x23, 0x91, 0xad, 0x5a, 0x7a, 0x2f, 0xf4, 0xe9,
+    0xb6, 0x3d, 0x63, 0x7c, 0x9a, 0x8d, 0xe9, 0x60, 0xc6, 0xc7, 0x89, 0xf0, 0xfa, 0xc4, 0x58, 0xdf, 0x2d, 0x02, 0xd3,
+    0xcd, 0xb1, 0xc9, 0x0f, 0xc7, 0xeb, 0xcd, 0x66, 0x8d, 0x3b, 0x78, 0xe3, 0x3c, 0x71, 0x96, 0x25, 0x46, 0x54, 0x96,
+    0x1a, 0x1e, 0xd0, 0x0a, 0x71, 0xf3, 0x9e, 0x09, 0x8c, 0xcb, 0x2e, 0x48, 0x6a, 0xbb, 0x81, 0xc0, 0xc5, 0x9e, 0xc4,
+    0x2c, 0x19, 0xdb, 0x1e, 0x94, 0x07, 0xfa, 0x62, 0x34, 0xdd, 0x02, 0xa6, 0xe5, 0xb5, 0xb3, 0xb3, 0xd4, 0xf6, 0xaa,
+    0xa9, 0x02, 0x98, 0x25, 0xcb, 0xe3, 0x13, 0x64, 0xdd, 0x6f, 0xa0, 0x8b, 0x18, 0x30, 0x36, 0xae, 0xcc, 0xb9, 0xcb,
+    0x75, 0x2b, 0xe2, 0x1b, 0x4d, 0xa4, 0x49, 0x7d, 0x48, 0x7d, 0x87, 0x61, 0xad, 0xae, 0x72, 0x90, 0xc0, 0x3d, 0xf2,
+    0x6e, 0x89, 0x4b, 0x4f, 0x9f, 0x59, 0x4c, 0xaa, 0xf4, 0x2d, 0x75, 0x2d, 0xae, 0x19, 0xf6, 0x8a, 0x07, 0x60, 0x7f,
+    0x60, 0xdc, 0x22, 0x16, 0xf1, 0x76, 0x5e, 0x4b, 0x61, 0x6d, 0xcc, 0x81, 0xe6, 0x86, 0x1b, 0xbc, 0x60, 0xd5, 0x9a,
+    0x81, 0x19, 0x66, 0x9c, 0x91, 0xfc, 0x66, 0xdc, 0xab, 0x9a, 0x38, 0x72, 0x15, 0x40, 0xf4, 0x2d, 0xe9, 0x92, 0x1c,
+    0x5e, 0xc9, 0x72, 0xd5, 0x19, 0xf2, 0xaf, 0xb0, 0xce, 0x7a, 0x71, 0x02, 0x66, 0xd2, 0x94, 0x97, 0x98, 0x98, 0x22,
+    0x2e, 0x37, 0xcb, 0x98, 0xa7, 0xe9, 0xb3, 0x68, 0x07, 0x27, 0x37, 0x12, 0x38, 0x62, 0xdf, 0x58, 0x86, 0x66, 0xc2,
+    0x46, 0x4c, 0xa4, 0x51, 0x29, 0x25, 0x7c, 0x20, 0x97, 0x5a, 0xf2, 0x97, 0xb9, 0xbc, 0xfa, 0x72, 0x9b, 0xe0, 0x80,
+    0xbc, 0x06, 0x96, 0x43, 0xe3, 0xb8, 0x65, 0x20, 0x11, 0x8b, 0x01, 0x31, 0x6a, 0x55, 0xae, 0x26, 0xa3, 0x3a, 0x99,
+    0xaf, 0x90, 0x0b, 0x15, 0x79, 0x70, 0x4b, 0xa0, 0xe4, 0xcf, 0x31, 0x75, 0x30, 0x2b, 0xb5, 0x9b, 0x16, 0x9b, 0x24,
+    0xef, 0x99, 0x01, 0xc9, 0xf5, 0xd7, 0xf0, 0xd0, 0xf8, 0xc5, 0x2b, 0x73, 0x4a, 0xf8, 0xa2, 0x8c, 0xa5, 0xa5, 0x31,
+    0x97, 0xfe, 0x83, 0xbc, 0x4f, 0x2b, 0x01, 0xfb, 0x15, 0xc4, 0x94, 0x81, 0x4b, 0x6c, 0x5c, 0x90, 0x94, 0xd7, 0xf2,
+    0x94, 0xdd, 0xd7, 0x50, 0xbe, 0x2b, 0x26, 0x5d, 0xa5, 0xb2, 0xae, 0xb0, 0xea, 0x7e, 0x5d, 0xb0, 0xfc, 0x62, 0x9f,
+    0x61, 0x6e, 0x32, 0x1a, 0x64, 0x2b, 0x66, 0x36, 0xe5, 0x57, 0x7b, 0xd7, 0x7e, 0xe5, 0xa1, 0xa4, 0x43, 0xb5, 0x4a,
+    0x37, 0xaf, 0xdc, 0x70, 0x8c, 0x1b, 0x37, 0x1c, 0x01, 0x6c, 0x0c, 0x3b, 0x55, 0xa4, 0xd6, 0xf9, 0xef, 0xab, 0xe1,
+    0x27, 0xda, 0x6b, 0x43, 0xbd, 0xeb, 0x86, 0x6b, 0xd3, 0xd3, 0xaf, 0x41, 0xd5, 0xc8, 0x12, 0xba, 0x0e, 0x55, 0x4c,
+    0x46, 0xa2, 0xc4, 0x74, 0x95, 0xf2, 0xa8, 0xaf, 0x11, 0xe7, 0x20, 0x6e, 0x28, 0x7f, 0xf1, 0x2f, 0xe1, 0xc5, 0x51,
+    0x80, 0x46, 0xd4, 0x72, 0x92, 0xa5, 0xbc, 0x35, 0x89, 0x66, 0x71, 0x72, 0x11, 0x2c, 0xe2, 0xd6, 0x2c, 0x4b, 0xb3,
+    0x62, 0x0e, 0x5c, 0xe9, 0x15, 0x17, 0x60, 0xc3, 0xcf, 0x5a, 0x8b, 0xd8, 0x7b, 0xce, 0x92, 0x53, 0xc6, 0xe3, 0x51,
+    0xe4, 0xd9, 0x7b, 0x39, 0x88, 0x07, 0xeb, 0x75, 0x94, 0xe7, 0xd9, 0x99, 0xed, 0xbd, 0xcb, 0x8e, 0x81, 0x69, 0xbd,
+    0x37, 0xe7, 0x17, 0x27, 0x2c, 0xf5, 0xde, 0x1f, 0x2f, 0x52, 0xbe, 0xf0, 0x8a, 0x28, 0x2d, 0x5a, 0x05, 0xcb, 0xe3,
+    0x09, 0xa8, 0x89, 0x24, 0xcb, 0x5b, 0x98, 0xff, 0x3c, 0x63, 0x41, 0x12, 0x9f, 0x4c, 0xb9, 0x35, 0x8e, 0xf2, 0x4f,
+    0xbd, 0x56, 0x6b, 0x9e, 0xc7, 0xb3, 0x28, 0xbf, 0x68, 0x51, 0x8b, 0xe0, 0x8b, 0xf6, 0x76, 0xf4, 0xe5, 0xe4, 0x7e,
+    0x8f, 0xe7, 0xd0, 0x37, 0x46, 0x2a, 0x06, 0x20, 0x7c, 0xac, 0xed, 0x9d, 0xf6, 0xac, 0xb8, 0x23, 0x4e, 0x94, 0xa2,
+    0x94, 0x97, 0x47, 0xde, 0x19, 0x03, 0xb8, 0xfd, 0x63, 0x9e, 0x7a, 0xe0, 0xcb, 0xf1, 0x2c, 0x5d, 0x8e, 0x16, 0x79,
+    0x01, 0x03, 0xcc, 0xb3, 0x38, 0xe5, 0x2c, 0xef, 0x1d, 0x67, 0x39, 0x90, 0xad, 0x95, 0x47, 0xe3, 0x78, 0x51, 0x04,
+    0xf7, 0xe7, 0xe7, 0x3d, 0xb4, 0x15, 0x4e, 0xf2, 0x6c, 0x91, 0x8e, 0xe5, 0x5c, 0x71, 0x0a, 0x1b, 0x23, 0xe6, 0x66,
+    0x05, 0x7d, 0x09, 0x05, 0xe0, 0x4b, 0x59, 0x94, 0xb7, 0x4e, 0xb0, 0x33, 0x1a, 0xfa, 0xed, 0x31, 0x3b, 0xf1, 0xf2,
+    0x93, 0xe3, 0xc8, 0xe9, 0x74, 0x1f, 0x7a, 0xea, 0x9f, 0xbf, 0xe3, 0x82, 0xe1, 0xbe, 0xb6, 0xb8, 0xd3, 0x6e, 0xff,
+    0xad, 0xdb, 0x6b, 0xcc, 0x42, 0x00, 0x05, 0x9d, 0xf9, 0xb9, 0x55, 0x64, 0x09, 0xac, 0xcf, 0xba, 0x9e, 0xbd, 0x39,
+    0xf8, 0x4d, 0x71, 0x7a, 0x12, 0x74, 0xe7, 0xe7, 0x25, 0x62, 0x17, 0x88, 0x84, 0x4c, 0x89, 0xa4, 0x7c, 0x5b, 0xfe,
+    0x5e, 0x88, 0x1f, 0xad, 0x87, 0xb8, 0xab, 0x20, 0xae, 0xa8, 0xde, 0x1a, 0xc3, 0x3e, 0x20, 0xf2, 0x77, 0x0a, 0x01,
+    0xc8, 0x14, 0x9c, 0xc0, 0x5c, 0xc1, 0x41, 0x2f, 0xbf, 0x1b, 0x8c, 0xee, 0x7a, 0x30, 0x1e, 0xdd, 0x04, 0x46, 0x9e,
+    0x8e, 0x97, 0xf5, 0x75, 0xed, 0x80, 0x73, 0xda, 0x9b, 0x32, 0xe4, 0xa7, 0xa0, 0x8b, 0xcf, 0x67, 0xf1, 0x98, 0x4f,
+    0xc5, 0x23, 0xb1, 0xf3, 0x99, 0xa8, 0xdb, 0x69, 0xb7, 0xc5, 0x7b, 0x01, 0x0a, 0x2d, 0xe8, 0xf8, 0xd8, 0x00, 0x98,
+    0xe8, 0xab, 0xab, 0x3e, 0x62, 0xf3, 0xdd, 0x8d, 0x5f, 0xaa, 0xf1, 0x2e, 0x54, 0xde, 0xa0, 0x50, 0x11, 0xea, 0x9b,
+    0x2d, 0x98, 0xf1, 0x96, 0xf7, 0x3b, 0xfa, 0xa0, 0x6a, 0xf0, 0x1d, 0x23, 0xad, 0x17, 0x70, 0xcf, 0xcc, 0x05, 0xea,
+    0xa5, 0x7d, 0x0c, 0x49, 0xb5, 0x5a, 0x2e, 0xe8, 0x0d, 0x86, 0x21, 0x24, 0x3a, 0x10, 0x74, 0xf2, 0x41, 0x41, 0xdf,
+    0xd4, 0xc8, 0xdc, 0xa0, 0x70, 0x32, 0x17, 0xb6, 0x7c, 0xa6, 0xe5, 0x3a, 0x28, 0x69, 0xf0, 0xb2, 0xbf, 0x62, 0xb2,
+    0x01, 0x48, 0xef, 0x4a, 0xd2, 0x7e, 0xaf, 0x4f, 0x9e, 0x94, 0xc7, 0x97, 0x8d, 0x88, 0x70, 0xe0, 0xea, 0xf3, 0x29,
+    0xba, 0xdd, 0xfa, 0x3b, 0x31, 0x46, 0x46, 0xcd, 0x96, 0xed, 0x0e, 0x98, 0x4e, 0xca, 0xc2, 0xe4, 0x33, 0x56, 0xe2,
+    0x28, 0x5f, 0xb3, 0xf0, 0x7b, 0x0c, 0xbc, 0xb2, 0x50, 0x78, 0x69, 0xca, 0x47, 0x9b, 0x5d, 0x77, 0xfb, 0x1f, 0x16,
+    0x3c, 0xa6, 0x64, 0xe7, 0xc3, 0xe1, 0xbf, 0xc1, 0x67, 0x70, 0x34, 0x06, 0x45, 0xb6, 0xc8, 0x47, 0x14, 0x04, 0x5c,
+    0x0d, 0x26, 0xd8, 0xa4, 0xcb, 0x6d, 0x8f, 0x69, 0x15, 0x82, 0x1e, 0x76, 0xed, 0xfb, 0x09, 0x9c, 0xce, 0x57, 0xc4,
+    0xf5, 0x05, 0x19, 0x40, 0x51, 0x10, 0xa2, 0x56, 0x1c, 0x53, 0x2a, 0x1d, 0x5d, 0xed, 0xf4, 0x17, 0x69, 0x0c, 0x42,
+    0xf4, 0x63, 0x3c, 0xa6, 0x2b, 0x2d, 0xf1, 0x98, 0xce, 0x38, 0x5a, 0x94, 0xd3, 0x84, 0x41, 0x73, 0x28, 0x90, 0xb4,
+    0xc5, 0x67, 0x99, 0x23, 0x63, 0xb7, 0x6c, 0x3c, 0xa7, 0x30, 0xb4, 0xf0, 0x38, 0x9b, 0x45, 0x71, 0x1a, 0xe0, 0xa7,
+    0x47, 0x3c, 0x3d, 0x62, 0x80, 0x5d, 0x3c, 0xf8, 0xa9, 0xc8, 0xdc, 0x71, 0xfd, 0x5f, 0x40, 0x44, 0x51, 0xff, 0x52,
+    0xba, 0x78, 0x1a, 0x2e, 0x75, 0x82, 0x5c, 0x2f, 0x05, 0xb1, 0xc6, 0x95, 0x39, 0xcc, 0x28, 0x84, 0xb2, 0xcb, 0xe9,
+    0xc7, 0xa0, 0xd5, 0x09, 0x3a, 0xda, 0x2b, 0xae, 0x5d, 0x74, 0x15, 0x69, 0x32, 0xf2, 0xb2, 0x24, 0xc1, 0xa0, 0x9f,
+    0x05, 0x9c, 0xd5, 0xbb, 0x86, 0xd5, 0x93, 0x2c, 0x8f, 0xb1, 0xa1, 0x93, 0xd4, 0xa9, 0x01, 0x41, 0xc7, 0x0c, 0x57,
+    0x4c, 0xe5, 0x96, 0x11, 0x31, 0xe1, 0x63, 0x92, 0x0d, 0xf5, 0x6b, 0x4a, 0x78, 0x25, 0xa9, 0x9e, 0x5d, 0xa5, 0xb3,
+    0xa4, 0x8f, 0x76, 0x85, 0x30, 0xb1, 0x88, 0xc7, 0x42, 0x1b, 0x76, 0xb7, 0x6d, 0xfd, 0x79, 0x04, 0x54, 0xfa, 0x14,
+    0xda, 0x1b, 0x4b, 0x47, 0xe5, 0xec, 0xe7, 0x30, 0xd7, 0x9e, 0x50, 0xa8, 0x74, 0xd9, 0xdf, 0xee, 0x6f, 0x2c, 0x79,
+    0xb9, 0xbb, 0x25, 0x7a, 0xf7, 0x8f, 0xca, 0x82, 0x74, 0x9f, 0x19, 0xa3, 0xab, 0xa6, 0x10, 0x75, 0x30, 0x2c, 0x65,
+    0x06, 0xe3, 0xb8, 0xb9, 0xb6, 0xe7, 0x44, 0x30, 0x5a, 0xb2, 0x5d, 0x81, 0x99, 0x50, 0x51, 0x0e, 0xdb, 0x5d, 0xe7,
+    0xba, 0x14, 0x22, 0xbd, 0xa3, 0xb7, 0x0a, 0xc5, 0x11, 0x42, 0x30, 0xd8, 0x58, 0xc6, 0x65, 0xb8, 0xb1, 0x64, 0xe9,
+    0x28, 0x1b, 0xb3, 0xf7, 0xef, 0x5e, 0xe0, 0x75, 0x86, 0x2c, 0x45, 0xb9, 0x97, 0xb9, 0xe5, 0x11, 0x18, 0x42, 0x08,
+    0x69, 0xae, 0xbe, 0x26, 0x03, 0xc0, 0x88, 0x98, 0x8e, 0x45, 0xa3, 0x22, 0x28, 0xac, 0xb4, 0xad, 0x81, 0x80, 0x10,
+    0x1c, 0x4e, 0x2c, 0x00, 0x53, 0x91, 0x7a, 0x31, 0xc0, 0x4f, 0xb4, 0xee, 0xc3, 0x40, 0xbb, 0x5b, 0xa2, 0x11, 0xe0,
+    0x9a, 0x23, 0x1a, 0x15, 0xaa, 0x98, 0xfd, 0x63, 0xa2, 0x3b, 0x8e, 0x4f, 0x35, 0x39, 0x29, 0x15, 0xba, 0xbf, 0x9b,
+    0x44, 0xc7, 0x2c, 0x81, 0x21, 0x8b, 0xcb, 0xcb, 0x36, 0x8c, 0x24, 0x5e, 0xad, 0xdd, 0x38, 0x9d, 0x2f, 0xe4, 0x57,
+    0xbd, 0x60, 0xe2, 0x0e, 0x1e, 0xb4, 0xe2, 0xa5, 0x83, 0x81, 0x3a, 0x39, 0x0c, 0xe4, 0x00, 0x00, 0x22, 0x1d, 0x5a,
+    0x20, 0x74, 0x15, 0xab, 0x40, 0x69, 0x3c, 0x5e, 0x2d, 0x83, 0xdd, 0x39, 0xc7, 0xd2, 0x14, 0x9e, 0x67, 0x71, 0x8a,
+    0x8f, 0x05, 0x3e, 0x46, 0xe7, 0xf8, 0x98, 0xc1, 0xa3, 0xc6, 0x3d, 0x2f, 0xed, 0x7f, 0xd7, 0x55, 0xc9, 0xe4, 0x0a,
+    0x58, 0x9a, 0x00, 0xd9, 0xe5, 0x25, 0xa8, 0x17, 0x4d, 0x82, 0xdd, 0x2d, 0x20, 0x16, 0x72, 0x8f, 0xf8, 0xc6, 0x0b,
+    0x33, 0xc9, 0xc8, 0x8a, 0x79, 0x4b, 0x94, 0x5b, 0xa4, 0xc4, 0x43, 0xf0, 0xf1, 0x72, 0xa7, 0x61, 0xab, 0x78, 0x32,
+    0x9b, 0xe5, 0x09, 0xbe, 0xb8, 0xb6, 0x25, 0x3e, 0xc2, 0x21, 0x88, 0x42, 0x8f, 0x88, 0xa1, 0x2e, 0xe3, 0xf2, 0xf3,
+    0x3a, 0x71, 0x68, 0xe3, 0x2c, 0x60, 0x2e, 0xa2, 0xd2, 0xe1, 0x51, 0x9c, 0x88, 0xc6, 0x6b, 0xf0, 0x69, 0xa4, 0x25,
+    0x12, 0x3a, 0xbb, 0x5b, 0x15, 0x6c, 0x00, 0xfc, 0x48, 0x5c, 0xea, 0x76, 0x44, 0xca, 0xa5, 0x2d, 0xca, 0xe9, 0xa8,
+    0x5e, 0x6e, 0x73, 0x19, 0x48, 0x16, 0xa1, 0x79, 0x8d, 0x2a, 0xa5, 0x48, 0xda, 0x93, 0x28, 0x5d, 0xd7, 0x14, 0xa0,
+    0x9f, 0x33, 0x36, 0xf6, 0x6c, 0x0b, 0xe4, 0xab, 0x78, 0xfe, 0x98, 0xb0, 0x53, 0x26, 0x3f, 0xcc, 0xa2, 0x07, 0xd1,
+    0x95, 0x23, 0xb0, 0x00, 0xb8, 0xbc, 0x33, 0x2a, 0xd9, 0x53, 0xe1, 0x28, 0x29, 0x51, 0x47, 0xc4, 0xb3, 0x8d, 0x41,
+    0x9b, 0x73, 0xb4, 0xeb, 0xc3, 0x7a, 0xa0, 0x93, 0x6c, 0x5b, 0xc0, 0x4b, 0x66, 0xe3, 0xcd, 0xc8, 0xc1, 0x00, 0x6c,
+    0x32, 0x81, 0xed, 0xa2, 0x02, 0xd9, 0x5a, 0x3e, 0x08, 0xa8, 0xc0, 0x07, 0xf6, 0x6c, 0xd1, 0xc2, 0xae, 0xda, 0xea,
+    0x27, 0x49, 0x1c, 0xd0, 0x9f, 0x9f, 0xd6, 0xcc, 0x05, 0xdc, 0xb1, 0x21, 0x02, 0xbb, 0x0d, 0x99, 0x67, 0xff, 0xeb,
+    0x3f, 0xfd, 0xaf, 0xff, 0x06, 0x03, 0x53, 0x3f, 0xb7, 0xb4, 0xae, 0x6e, 0xf5, 0x3f, 0xa1, 0xd5, 0x22, 0xbd, 0xa1,
+    0xdd, 0x5f, 0xff, 0xe1, 0xbf, 0x43, 0x33, 0xba, 0x00, 0x04, 0xb2, 0x84, 0x20, 0x1a, 0xa1, 0xcd, 0xf5, 0x59, 0x20,
+    0xd5, 0x06, 0xb9, 0x72, 0xa6, 0x7f, 0x44, 0xb0, 0x0b, 0x9e, 0xcd, 0xaf, 0x05, 0x07, 0xa1, 0x1e, 0x25, 0x59, 0xc1,
+    0x34, 0x3c, 0x42, 0xfe, 0x7e, 0x1e, 0x40, 0x34, 0xd7, 0x1c, 0xb8, 0xbc, 0xb0, 0xf4, 0x38, 0x62, 0x79, 0xd6, 0x8d,
+    0xd3, 0x58, 0xbd, 0x82, 0x71, 0x42, 0x87, 0xc2, 0x18, 0xb0, 0x5e, 0xe2, 0x09, 0x1e, 0x48, 0x20, 0xb8, 0xf5, 0x8f,
+    0x8a, 0xad, 0x1f, 0x4c, 0xf3, 0xa7, 0x18, 0x4b, 0x44, 0x6e, 0xd4, 0x08, 0xf0, 0x13, 0x84, 0xd6, 0x47, 0xfd, 0x1c,
+    0x9d, 0xeb, 0x67, 0x14, 0x6c, 0x62, 0x02, 0xd0, 0x4f, 0x33, 0x34, 0x3d, 0xcc, 0x19, 0x44, 0xd6, 0x41, 0xe5, 0xb6,
+    0x1a, 0xc9, 0x2b, 0x42, 0x78, 0x7d, 0xc4, 0x1c, 0x4f, 0xbc, 0xd1, 0xb3, 0xc8, 0xd9, 0xc7, 0x24, 0x3b, 0xc3, 0x58,
+    0x18, 0x12, 0xe9, 0xaa, 0xfa, 0xf2, 0x5f, 0xfe, 0xd9, 0xf7, 0xff, 0xe5, 0x9f, 0xaf, 0x68, 0x30, 0x85, 0x7d, 0x00,
+    0xc6, 0x2b, 0x0f, 0x35, 0x9d, 0x1b, 0x68, 0xad, 0x1f, 0x14, 0xf1, 0x5c, 0x5f, 0x23, 0x11, 0xc7, 0x52, 0x89, 0xb7,
+    0x7c, 0x24, 0xb4, 0x35, 0x53, 0xdc, 0x3c, 0x0b, 0x42, 0x76, 0xc5, 0x34, 0x58, 0x75, 0xc3, 0x3c, 0x47, 0x6e, 0x70,
+    0x0d, 0x5d, 0x3e, 0x13, 0xe3, 0xf5, 0x60, 0xdc, 0x08, 0x81, 0x07, 0xd2, 0x5f, 0xe8, 0x87, 0x27, 0x42, 0xba, 0x07,
+    0x62, 0x19, 0xa4, 0xac, 0xaf, 0x01, 0xe4, 0x59, 0x07, 0x34, 0x01, 0x35, 0x89, 0x2b, 0xdd, 0x4a, 0xe6, 0xc9, 0x71,
+    0xde, 0x7f, 0x85, 0x97, 0xf8, 0x2c, 0xec, 0x8d, 0x9a, 0xb5, 0x20, 0x43, 0x80, 0x93, 0x21, 0x20, 0x35, 0x90, 0xa9,
+    0x83, 0xd1, 0xa1, 0xc9, 0xd6, 0xeb, 0xda, 0x8f, 0xd8, 0xbd, 0xa6, 0x2d, 0xb9, 0xd4, 0x96, 0xb1, 0xb4, 0x6e, 0xa5,
+    0xb6, 0xc4, 0x4f, 0xb5, 0x34, 0xb4, 0x65, 0x7c, 0xa5, 0xb6, 0x44, 0xca, 0x0d, 0x70, 0xe4, 0xd0, 0xde, 0xc4, 0xa8,
+    0x8d, 0xa1, 0x9b, 0x39, 0xda, 0x25, 0xe0, 0xaa, 0x8f, 0x3e, 0x49, 0xb3, 0x84, 0x10, 0xc0, 0xb0, 0x85, 0x36, 0xbe,
+    0x04, 0x06, 0xa0, 0x62, 0x8f, 0x4a, 0xbd, 0xe9, 0xf1, 0xd1, 0x98, 0x80, 0xbb, 0xcb, 0x09, 0x43, 0x91, 0x0c, 0x6b,
+    0xf6, 0x35, 0x2b, 0xb7, 0x70, 0x1c, 0xb1, 0x61, 0xc4, 0x33, 0x60, 0xb6, 0x85, 0x83, 0x1d, 0x79, 0x4b, 0x11, 0x04,
+    0x0b, 0xec, 0xb7, 0x6f, 0xf6, 0x0f, 0x6c, 0xef, 0x38, 0x1b, 0x5f, 0x04, 0x36, 0x78, 0x19, 0x60, 0x7d, 0xb8, 0x3e,
+    0x9f, 0xb2, 0xd4, 0x51, 0x76, 0x7e, 0x96, 0x80, 0x0b, 0x95, 0x9d, 0x88, 0x6f, 0x36, 0x34, 0x03, 0xf8, 0x40, 0x58,
+    0xfa, 0xa8, 0x63, 0x7f, 0x97, 0x8b, 0xef, 0x9d, 0xf2, 0x1c, 0x1f, 0xfb, 0x98, 0xc2, 0xb0, 0xbb, 0x05, 0x0f, 0xf8,
+    0xb2, 0x8f, 0xfa, 0x48, 0xbf, 0x09, 0x60, 0x0b, 0xf1, 0xbe, 0x85, 0xed, 0xb7, 0x54, 0x5f, 0x84, 0xa2, 0x2f, 0xb9,
+    0x4d, 0x9b, 0xe2, 0x95, 0x2d, 0x47, 0x63, 0x8f, 0xd1, 0x54, 0x23, 0x53, 0x1c, 0x48, 0xc2, 0xc7, 0xba, 0x44, 0xa8,
+    0x7f, 0xa3, 0x88, 0x46, 0xa9, 0x94, 0xb5, 0xac, 0xc2, 0x09, 0xc9, 0xbc, 0x13, 0x93, 0xc1, 0x4f, 0x02, 0xff, 0xc8,
+    0xfc, 0x3e, 0x99, 0xf8, 0x94, 0x90, 0x46, 0xf2, 0xf0, 0x2f, 0xde, 0x19, 0xf3, 0x2e, 0x8e, 0xa8, 0xa5, 0x72, 0x86,
+    0x31, 0x4a, 0x83, 0x41, 0x83, 0xb6, 0x8a, 0x7a, 0x80, 0x7d, 0x92, 0x44, 0xf3, 0x82, 0x05, 0xea, 0x41, 0xfa, 0xc5,
+    0xe8, 0x5e, 0xaf, 0x06, 0x22, 0x4c, 0x3b, 0xa6, 0xe4, 0xd3, 0xa5, 0xe9, 0x38, 0x3f, 0x00, 0xc7, 0x19, 0x93, 0xfe,
+    0x5b, 0x11, 0x68, 0xdf, 0x34, 0x48, 0xd8, 0x84, 0x97, 0x1c, 0x6f, 0x95, 0x2f, 0x55, 0xa4, 0xc2, 0xef, 0xee, 0x80,
+    0x33, 0x6d, 0xf9, 0xf8, 0xff, 0x4d, 0x63, 0x8f, 0x83, 0x14, 0x9c, 0x5f, 0xba, 0x66, 0x82, 0x57, 0xf8, 0x00, 0x22,
+    0xf3, 0x7d, 0x69, 0x4c, 0x34, 0x62, 0x18, 0xc5, 0x29, 0x79, 0x0e, 0x72, 0xdb, 0xe3, 0xb9, 0xd9, 0x0e, 0xe4, 0xed,
+    0x4a, 0x28, 0x67, 0x35, 0x98, 0xb0, 0xed, 0x4a, 0xbf, 0x60, 0xb5, 0xb1, 0x8a, 0xc8, 0xd4, 0xdf, 0x56, 0x28, 0x64,
+    0xc4, 0x8e, 0x4a, 0xa1, 0x6a, 0x96, 0xa2, 0x87, 0x89, 0xd3, 0x6a, 0x54, 0xe9, 0x46, 0x4b, 0xb1, 0xa4, 0x6d, 0x7f,
+    0x48, 0xdb, 0x9e, 0xc4, 0xd8, 0x70, 0x29, 0xe6, 0x1e, 0x45, 0xc9, 0xc8, 0x41, 0x00, 0xac, 0x96, 0xf5, 0x08, 0xa8,
+    0xe9, 0xaa, 0xc8, 0x86, 0xff, 0x10, 0x89, 0x5b, 0x0a, 0xa1, 0xb7, 0x86, 0x4a, 0x47, 0xc3, 0xb2, 0xec, 0x5d, 0x30,
+    0xe7, 0xf0, 0x37, 0x79, 0x49, 0x41, 0xdc, 0x4d, 0xd5, 0xdf, 0xf7, 0x6b, 0x97, 0xee, 0x10, 0x9c, 0x79, 0xe3, 0xab,
+    0x69, 0xb6, 0xe2, 0x68, 0xdb, 0xeb, 0x92, 0x9f, 0x8f, 0xbd, 0x5f, 0x39, 0x36, 0x1a, 0x97, 0x54, 0x75, 0xd1, 0x22,
+    0x0e, 0xb3, 0xa9, 0xa3, 0x88, 0xb2, 0x7f, 0x73, 0x55, 0xb0, 0xe4, 0xdb, 0x9b, 0x83, 0x25, 0xfc, 0x96, 0xc1, 0x92,
+    0x6f, 0xff, 0xe0, 0x60, 0xc9, 0x37, 0x66, 0xb0, 0x04, 0x65, 0xe5, 0x8b, 0xcf, 0x89, 0x68, 0xe4, 0xd9, 0x59, 0x11,
+    0x76, 0xe4, 0xe1, 0x3c, 0x88, 0x9d, 0xff, 0x98, 0xd0, 0x06, 0x4c, 0xd4, 0x08, 0x6c, 0x50, 0x24, 0x43, 0xe4, 0x13,
+    0x82, 0x84, 0x97, 0x71, 0x84, 0xb6, 0x4e, 0xdc, 0x6b, 0xdd, 0x57, 0x37, 0x95, 0xc0, 0x6b, 0x73, 0x75, 0x38, 0xa7,
+    0xab, 0x22, 0x0d, 0x01, 0x7d, 0x6a, 0x54, 0x77, 0xec, 0x6e, 0xaa, 0x8c, 0x31, 0x73, 0x84, 0x9e, 0x3a, 0x08, 0x10,
+    0x1c, 0xb4, 0xb4, 0xff, 0xf3, 0x61, 0xa7, 0xb7, 0xdd, 0x99, 0x41, 0x6f, 0xd0, 0xa5, 0xf0, 0xd6, 0xee, 0x6d, 0x6f,
+    0xe3, 0xdb, 0x99, 0x7a, 0xeb, 0xe2, 0x5b, 0xac, 0xde, 0x76, 0xf0, 0x6d, 0xa4, 0xde, 0x1e, 0xe0, 0xdb, 0x58, 0xbd,
+    0x3d, 0xc4, 0xb7, 0x53, 0xbb, 0x3c, 0xe4, 0x1a, 0xb8, 0x87, 0xc0, 0x58, 0x64, 0xf0, 0x07, 0xaa, 0x0c, 0xf6, 0x2d,
+    0xde, 0xf0, 0x8b, 0x4e, 0x82, 0xd8, 0x13, 0x8e, 0x51, 0x90, 0x7b, 0x67, 0x20, 0xfc, 0x03, 0x4a, 0x68, 0x7b, 0x8a,
+    0x9f, 0x7a, 0x00, 0x3f, 0xe2, 0x20, 0x9e, 0x31, 0xf5, 0xcd, 0x5b, 0x85, 0x35, 0xd8, 0x92, 0x87, 0xed, 0x61, 0xd9,
+    0xd3, 0xeb, 0x24, 0x02, 0x29, 0x2a, 0x61, 0x80, 0x56, 0xae, 0xaa, 0x13, 0xd3, 0xb5, 0xf4, 0x0a, 0x5f, 0xa1, 0x4a,
+    0x0c, 0x57, 0x7a, 0x02, 0x36, 0x52, 0xeb, 0x1c, 0x9c, 0xaf, 0xb5, 0xea, 0x05, 0x21, 0xd2, 0x0a, 0x85, 0x70, 0xd2,
+    0x6f, 0x07, 0xd1, 0x89, 0x7e, 0x7e, 0x05, 0x46, 0x6f, 0x74, 0xc2, 0x6e, 0x52, 0x35, 0x04, 0xa2, 0xa9, 0x66, 0x14,
+    0x10, 0x64, 0x15, 0xc1, 0xd2, 0xa0, 0x13, 0x28, 0xd5, 0x0c, 0x52, 0xa7, 0xae, 0x78, 0x68, 0xfa, 0x7a, 0x11, 0x50,
+    0xb4, 0x2a, 0xd8, 0x05, 0xdb, 0x9b, 0x4a, 0x05, 0x85, 0xa1, 0x02, 0x0b, 0xae, 0xd5, 0x46, 0xda, 0x4f, 0xbe, 0x52,
+    0x27, 0x59, 0x4a, 0x1d, 0x99, 0x07, 0x08, 0xfa, 0xf4, 0x60, 0x55, 0x42, 0x7e, 0xd1, 0x19, 0xe1, 0x1f, 0x29, 0x7f,
+    0xbf, 0x98, 0x4c, 0x26, 0xd7, 0xaa, 0xa7, 0x2f, 0xc6, 0x13, 0xd6, 0x65, 0x3b, 0x3d, 0x0c, 0x2e, 0xb7, 0xa4, 0x44,
+    0xec, 0x94, 0x44, 0xbb, 0xe5, 0xed, 0x1a, 0xa3, 0xf0, 0x04, 0x8d, 0x75, 0x7b, 0x3d, 0x56, 0x02, 0x55, 0x96, 0x20,
+    0xbf, 0x4f, 0xe2, 0x34, 0x68, 0x97, 0xfe, 0xa9, 0x14, 0xfc, 0x5f, 0x3c, 0x7a, 0xf4, 0xa8, 0xf4, 0xc7, 0xea, 0xad,
+    0x3d, 0x1e, 0x97, 0xfe, 0x68, 0xa9, 0xd1, 0x68, 0xb7, 0x27, 0x93, 0xd2, 0x8f, 0x55, 0xc1, 0x76, 0x77, 0x34, 0xde,
+    0xee, 0x96, 0xfe, 0x99, 0xd1, 0xa2, 0xf4, 0x99, 0x7c, 0xcb, 0xd9, 0xb8, 0x16, 0xa1, 0x7e, 0xd8, 0x86, 0x4a, 0xc1,
+    0x68, 0x4b, 0x74, 0xf4, 0xc4, 0x63, 0x10, 0x2d, 0x78, 0x06, 0x36, 0x16, 0xf0, 0x36, 0x08, 0xe8, 0x89, 0x14, 0xef,
+    0xe2, 0x93, 0xb2, 0x28, 0xd4, 0x5f, 0x98, 0x32, 0x1d, 0x99, 0x99, 0xe4, 0x39, 0x27, 0x55, 0xd0, 0xac, 0x46, 0xce,
+    0xa2, 0xea, 0x17, 0x21, 0xaf, 0xa4, 0x3d, 0x4a, 0x1b, 0x6c, 0x29, 0x64, 0xfc, 0x8f, 0x57, 0xc9, 0xf8, 0x1f, 0x6e,
+    0x96, 0xf1, 0xc7, 0xb7, 0x13, 0xf1, 0x3f, 0xfc, 0xc1, 0x22, 0xfe, 0x47, 0x53, 0xc4, 0x0b, 0x21, 0xb6, 0x07, 0x56,
+    0x2c, 0x99, 0xaf, 0xc7, 0xd9, 0x79, 0x0b, 0xb7, 0x44, 0x6e, 0x93, 0xf4, 0xdc, 0xb8, 0x95, 0xf0, 0x5f, 0x93, 0x72,
+    0xa4, 0x06, 0x33, 0xbe, 0x4f, 0xcb, 0xb3, 0x93, 0x93, 0x84, 0x29, 0x19, 0x6f, 0x54, 0x90, 0x65, 0xfc, 0x26, 0x0d,
+    0xed, 0x37, 0xe0, 0xa4, 0x1a, 0x25, 0x93, 0x09, 0x14, 0x4d, 0x26, 0xb6, 0x4a, 0xc9, 0x05, 0x79, 0x46, 0xad, 0x5e,
+    0xd7, 0x4a, 0xa8, 0xd5, 0x57, 0x5f, 0x99, 0x65, 0x66, 0x81, 0x8c, 0x46, 0x99, 0xf6, 0x84, 0xac, 0x19, 0xc7, 0x05,
+    0xee, 0xc1, 0xea, 0x7b, 0xba, 0x68, 0xb2, 0xcc, 0x40, 0xa9, 0xc4, 0x23, 0xfc, 0x50, 0x4b, 0xf3, 0xdb, 0x25, 0x22,
+    0x7d, 0x7a, 0x15, 0xb9, 0xea, 0x88, 0xd5, 0xf8, 0x4c, 0x5e, 0x75, 0xac, 0x0a, 0x8b, 0x2f, 0x53, 0x28, 0x1e, 0x5f,
+    0xbc, 0x18, 0x3b, 0x7b, 0x60, 0xca, 0xc6, 0xc5, 0x9b, 0xb4, 0x91, 0x9a, 0x26, 0xc0, 0x0e, 0x43, 0x13, 0xd3, 0x52,
+    0x10, 0xac, 0xca, 0xd1, 0xaf, 0x2a, 0x7b, 0x46, 0x27, 0x99, 0xc1, 0x84, 0x43, 0x0e, 0x6a, 0x64, 0x09, 0xcc, 0xc1,
+    0xa4, 0x2e, 0xa4, 0xef, 0xa5, 0x8b, 0xbc, 0x8e, 0x53, 0xf9, 0x61, 0x6d, 0x3a, 0x15, 0x58, 0x4a, 0xfd, 0x21, 0x4f,
+    0xfc, 0xab, 0x9e, 0x18, 0x88, 0x17, 0x33, 0x8c, 0x4b, 0x15, 0x7c, 0x07, 0xc2, 0xcd, 0xf1, 0x2b, 0x40, 0x62, 0x08,
+    0x15, 0xe3, 0xae, 0xa8, 0x77, 0x79, 0x69, 0x7e, 0x8c, 0xb2, 0xf6, 0xe1, 0xc2, 0x06, 0x0f, 0x30, 0xfc, 0x8a, 0x2c,
+    0x6a, 0x83, 0x6c, 0xc1, 0x1d, 0x87, 0x5a, 0x39, 0x6e, 0xe9, 0xed, 0xb4, 0xdb, 0xa0, 0x62, 0x7c, 0xf1, 0xa9, 0x21,
+    0x47, 0x77, 0x96, 0xf8, 0x5e, 0x15, 0x52, 0x5f, 0xf9, 0xf4, 0x97, 0x26, 0x31, 0x7e, 0x9b, 0x44, 0x20, 0x6a, 0x5c,
+    0x4f, 0x51, 0x8b, 0xd8, 0x7c, 0xf7, 0x95, 0x1b, 0x67, 0x10, 0xd6, 0x5d, 0xc7, 0xc1, 0x32, 0x56, 0x56, 0x2f, 0xc4,
+    0xb6, 0xc2, 0xaa, 0x59, 0x05, 0xe7, 0x06, 0x9d, 0x59, 0x9c, 0x19, 0xb1, 0xe7, 0xda, 0x36, 0x28, 0x55, 0xf0, 0x59,
+    0x44, 0x90, 0xf7, 0x30, 0x4e, 0x2a, 0x7c, 0x60, 0x05, 0x74, 0xdd, 0xfb, 0x34, 0x20, 0x47, 0xbf, 0x54, 0x33, 0xba,
+    0xaa, 0x52, 0x05, 0xa5, 0x79, 0x7a, 0x60, 0x20, 0x43, 0x41, 0x60, 0x58, 0xe3, 0x54, 0xe8, 0x2d, 0x98, 0x86, 0x04,
+    0xb0, 0x76, 0xca, 0xd0, 0x33, 0xb1, 0x15, 0xd8, 0x42, 0x5a, 0x80, 0xd2, 0xc3, 0x0e, 0x7d, 0xab, 0x06, 0x7a, 0xba,
+    0x1a, 0x3b, 0xbe, 0xce, 0x4f, 0xbb, 0x38, 0xf2, 0x8b, 0x33, 0x0f, 0xfe, 0x59, 0x7f, 0x5a, 0x82, 0x94, 0x3f, 0xfe,
+    0x14, 0x73, 0x30, 0xaa, 0xe7, 0x2d, 0x8c, 0x84, 0x50, 0x28, 0x53, 0xaa, 0x43, 0x3a, 0xed, 0x14, 0xb7, 0x92, 0x7a,
+    0x8b, 0x02, 0xdd, 0x39, 0xf2, 0x5b, 0x82, 0x34, 0x4b, 0x59, 0xaf, 0x7e, 0xaa, 0x6d, 0xba, 0x0e, 0x8a, 0x58, 0xc3,
+    0x65, 0x86, 0xee, 0x1f, 0xbf, 0x00, 0xf7, 0x4f, 0xa8, 0xd1, 0xb6, 0xf2, 0x1b, 0xda, 0x6b, 0xdb, 0x07, 0x92, 0xb6,
+    0x9b, 0x64, 0x2d, 0xe4, 0xab, 0xfe, 0xd1, 0x55, 0xfe, 0xcd, 0x4d, 0x67, 0xbc, 0xdd, 0x9d, 0x1d, 0x4f, 0xfd, 0x33,
+    0x0e, 0xc7, 0x9b, 0xc5, 0x74, 0xc6, 0x7b, 0x1b, 0xc8, 0x82, 0x68, 0x82, 0x1f, 0xf1, 0xbb, 0x4d, 0xcb, 0x63, 0x4a,
+    0xb0, 0x5c, 0xa2, 0x5a, 0x0f, 0x3a, 0x8f, 0xc0, 0x61, 0xbb, 0xf5, 0xf0, 0xd7, 0xa3, 0x5f, 0x4a, 0x1a, 0xa9, 0x7b,
+    0xb2, 0xb6, 0xdd, 0x43, 0x79, 0x91, 0x44, 0x17, 0xe0, 0x37, 0x92, 0x8d, 0x71, 0x8c, 0x81, 0xdc, 0xde, 0x3c, 0x93,
+    0xc9, 0x0a, 0x39, 0x4b, 0xe8, 0x37, 0x65, 0xc8, 0xa5, 0xd8, 0x7e, 0x30, 0x3f, 0x57, 0xab, 0xd1, 0x69, 0x24, 0x21,
+    0xfc, 0xa1, 0xb9, 0x06, 0x57, 0x27, 0x37, 0xd4, 0xcf, 0xcb, 0x77, 0x00, 0x06, 0x61, 0xd8, 0xb4, 0x72, 0x01, 0x55,
+    0x1b, 0x4a, 0x8c, 0x6c, 0x8b, 0x6a, 0x20, 0xcb, 0xdf, 0x06, 0x55, 0x19, 0x15, 0xac, 0x87, 0x5f, 0x53, 0x8c, 0xc1,
+    0x3b, 0x95, 0xc6, 0xd3, 0x2c, 0x1e, 0x8f, 0x13, 0xd6, 0x53, 0xf6, 0x91, 0xd5, 0x79, 0x80, 0xc9, 0x0a, 0xe6, 0x92,
+    0xd5, 0x57, 0xc5, 0x20, 0x9e, 0xa6, 0x53, 0x74, 0x0c, 0xf6, 0x1a, 0x7e, 0x12, 0x71, 0x2d, 0x39, 0xe5, 0x29, 0x7e,
+    0xbb, 0x22, 0x1e, 0x3d, 0xd7, 0x71, 0xd9, 0x01, 0x63, 0x91, 0x16, 0xbc, 0xdd, 0xe3, 0xd9, 0x3c, 0x68, 0x6d, 0xd7,
+    0x11, 0xc1, 0x2a, 0x8d, 0x82, 0xb7, 0x06, 0x2d, 0x0f, 0xad, 0x03, 0xa1, 0xe5, 0x2c, 0xbf, 0x23, 0xcb, 0x68, 0x00,
+    0xfc, 0xec, 0x9e, 0x2e, 0x2a, 0xeb, 0xc8, 0xfc, 0xfb, 0xec, 0x96, 0x2f, 0xd7, 0xef, 0x96, 0x2f, 0xd5, 0x6e, 0xb9,
+    0x9e, 0x63, 0xbf, 0x98, 0x74, 0xf0, 0x4f, 0xaf, 0x42, 0x08, 0x56, 0x05, 0xc8, 0x61, 0xa1, 0x5d, 0xdc, 0xea, 0xc2,
+    0x7f, 0x34, 0x74, 0xdb, 0xc3, 0x3f, 0x3e, 0x58, 0x80, 0x6d, 0x0b, 0x0b, 0xf1, 0x5f, 0xbb, 0x56, 0xd5, 0xb9, 0x8f,
+    0x75, 0xd8, 0x6b, 0x67, 0xb5, 0xae, 0x7b, 0xfd, 0xa6, 0x05, 0x79, 0xc5, 0x9d, 0x40, 0x09, 0x63, 0x70, 0xd5, 0xa2,
+    0xe3, 0x63, 0x28, 0x9d, 0x64, 0xa3, 0x45, 0xf1, 0x77, 0x12, 0x7e, 0x49, 0xc4, 0x6b, 0xb7, 0x74, 0x63, 0x1c, 0xd5,
+    0x55, 0x64, 0xbe, 0xa8, 0x11, 0x96, 0x7a, 0x9d, 0x82, 0x02, 0x18, 0x93, 0x39, 0x5d, 0xff, 0xfe, 0x9a, 0x4d, 0xf0,
+    0x1f, 0xb2, 0x36, 0x6b, 0x91, 0xf9, 0xb7, 0x12, 0xe3, 0x5a, 0x22, 0x7c, 0x16, 0x0d, 0xcc, 0x35, 0x6c, 0x3f, 0x5a,
+    0x0f, 0xee, 0xa1, 0x9a, 0x69, 0xa8, 0x94, 0x82, 0xd4, 0x3b, 0xe0, 0x05, 0x44, 0x8b, 0x84, 0x5f, 0x3f, 0xea, 0x55,
+    0x9c, 0xb1, 0x32, 0xea, 0x35, 0x02, 0xbd, 0x6a, 0x7b, 0x4b, 0x29, 0xfd, 0xc5, 0x97, 0xf7, 0xf1, 0x8f, 0x88, 0x7d,
+    0x1d, 0x57, 0xbe, 0x91, 0x88, 0x0d, 0xa0, 0x6f, 0xb4, 0x51, 0x73, 0x7e, 0x84, 0x06, 0x27, 0xff, 0xe7, 0xb6, 0xad,
+    0xd1, 0x58, 0xbf, 0x55, 0x73, 0x69, 0x95, 0x7e, 0x56, 0xeb, 0xcf, 0x1b, 0xfc, 0x96, 0x6d, 0x47, 0xc2, 0x21, 0xa8,
+    0xb7, 0x95, 0xbf, 0xb5, 0x64, 0xa5, 0xb1, 0xa2, 0xf8, 0x6d, 0xdb, 0x57, 0x26, 0x31, 0xf5, 0xd8, 0x08, 0x8f, 0xb5,
+    0x13, 0x29, 0xcf, 0x9d, 0xb1, 0x87, 0xf0, 0x23, 0xff, 0xc2, 0xc2, 0x7b, 0xf8, 0xc1, 0x2f, 0xeb, 0x7c, 0x96, 0xa4,
+    0x60, 0x56, 0x4d, 0x39, 0x9f, 0x07, 0x5b, 0x5b, 0x67, 0x67, 0x67, 0xfe, 0xd9, 0xb6, 0x9f, 0xe5, 0x27, 0x5b, 0xdd,
+    0x76, 0xbb, 0x8d, 0xdf, 0x69, 0xb2, 0xad, 0xd3, 0x98, 0x9d, 0x3d, 0x06, 0xf7, 0xc3, 0x7e, 0x68, 0x3d, 0xb2, 0x1e,
+    0x6e, 0x5b, 0x3b, 0x0f, 0x6c, 0x8b, 0x14, 0x00, 0x94, 0x6c, 0xdb, 0x96, 0x50, 0x00, 0xa1, 0x0d, 0xc5, 0xfd, 0xdd,
+    0x13, 0x65, 0xc3, 0x61, 0x1e, 0xbc, 0xb0, 0x90, 0xc0, 0x7f, 0xcb, 0x3e, 0xb1, 0xfa, 0x56, 0x17, 0x65, 0x2d, 0xa9,
+    0x46, 0xd4, 0x2b, 0xee, 0xf7, 0x51, 0x34, 0x0f, 0x88, 0x8d, 0xcc, 0x42, 0x0c, 0x93, 0x89, 0x52, 0x9a, 0x02, 0xed,
+    0xd2, 0x63, 0x78, 0xc2, 0xcc, 0x29, 0x0b, 0x9e, 0x5f, 0x75, 0x1f, 0x82, 0x8e, 0x3b, 0x6d, 0xdd, 0x1f, 0xb5, 0x5b,
+    0x1d, 0xab, 0xd3, 0xea, 0xfa, 0x0f, 0xad, 0xae, 0xf8, 0x1f, 0x64, 0xe4, 0xb6, 0xd5, 0x81, 0xa7, 0x6d, 0x0b, 0xde,
+    0x4f, 0xef, 0x8b, 0xb4, 0x88, 0xc8, 0xde, 0xea, 0xef, 0xe2, 0xaf, 0x2d, 0x02, 0xa4, 0xbe, 0xb4, 0xc5, 0x2f, 0x5a,
+    0xb3, 0xbf, 0x30, 0x4b, 0x3b, 0x8f, 0xd6, 0x16, 0x77, 0x1f, 0xae, 0x2d, 0xde, 0x7e, 0xb0, 0xb6, 0xf8, 0xfe, 0x4e,
+    0xbd, 0x78, 0xeb, 0x44, 0x54, 0x69, 0xb9, 0x10, 0xda, 0xb3, 0x08, 0x18, 0xe5, 0xdc, 0xe9, 0x00, 0x9c, 0x6d, 0xab,
+    0x85, 0x3f, 0x1e, 0x76, 0x5d, 0xdd, 0xeb, 0x18, 0x7b, 0x69, 0x2c, 0x1f, 0x3e, 0x02, 0x2c, 0x9f, 0x77, 0x1f, 0x8c,
+    0xb0, 0x1d, 0x21, 0x0a, 0xff, 0x4e, 0xb7, 0x1f, 0x8d, 0x40, 0x23, 0x58, 0xf8, 0x0f, 0xfe, 0x4c, 0x77, 0xba, 0x23,
+    0xf1, 0xd2, 0xc6, 0xfa, 0x0f, 0x9d, 0x87, 0x05, 0x34, 0xc5, 0x3f, 0xbf, 0x69, 0x13, 0x1a, 0x0d, 0x78, 0x73, 0xdc,
+    0xfb, 0x40, 0xa3, 0x47, 0xd3, 0xae, 0xff, 0xe5, 0xe9, 0x43, 0xff, 0xd1, 0xb4, 0xf3, 0xf0, 0x83, 0x78, 0x4b, 0x80,
+    0x82, 0x5f, 0xe2, 0xbf, 0x0f, 0xdb, 0xed, 0x69, 0xab, 0xe3, 0x3f, 0x3a, 0xdd, 0xf6, 0xb7, 0x93, 0xd6, 0x03, 0xff,
+    0x11, 0xfe, 0xab, 0x86, 0x9b, 0x66, 0x33, 0x66, 0x5b, 0xb8, 0xde, 0x0d, 0xbf, 0xd7, 0x9c, 0xa3, 0x7b, 0xdf, 0xda,
+    0xb9, 0xff, 0xfc, 0x11, 0xac, 0xd1, 0xb4, 0xd3, 0x85, 0xff, 0xaf, 0x7a, 0xfc, 0x80, 0x84, 0x97, 0x03, 0x47, 0x0c,
+    0x33, 0x58, 0x15, 0xe1, 0xe8, 0x9b, 0x61, 0xf7, 0xbc, 0xef, 0xaf, 0x0a, 0x80, 0x30, 0x7e, 0x73, 0x90, 0x9b, 0xdf,
+    0x2e, 0x02, 0x42, 0x1f, 0xb4, 0xff, 0x03, 0x23, 0x20, 0xdf, 0x37, 0x83, 0xdc, 0xe7, 0xab, 0x79, 0x7b, 0x4d, 0x67,
+    0xed, 0x35, 0x73, 0x0e, 0xff, 0xc2, 0x86, 0x98, 0xad, 0x0d, 0xad, 0x39, 0x37, 0xe3, 0x41, 0x19, 0x6e, 0xe4, 0x73,
+    0x19, 0xf5, 0x2f, 0xf8, 0x15, 0x04, 0x89, 0x6f, 0x26, 0xc8, 0xaf, 0xb7, 0xa3, 0x47, 0xfc, 0x07, 0xd3, 0xa3, 0xe0,
+    0x06, 0x3d, 0x6a, 0x11, 0x77, 0x8a, 0x18, 0x90, 0xa3, 0xbf, 0x4f, 0xef, 0xce, 0xf7, 0xf8, 0xb5, 0xaf, 0x2d, 0x86,
+    0x25, 0x85, 0x2d, 0x72, 0x05, 0xdf, 0x7d, 0xce, 0x09, 0x81, 0x48, 0x68, 0x0e, 0x6d, 0x19, 0x84, 0x99, 0xe3, 0x67,
+    0x71, 0xd5, 0xcb, 0xa9, 0xb8, 0x34, 0x13, 0xd2, 0x8d, 0xb7, 0x1d, 0x1d, 0xc0, 0xc1, 0x1c, 0xf3, 0x70, 0x99, 0xf1,
+    0x08, 0x7f, 0xef, 0x12, 0x8f, 0x79, 0x82, 0xf7, 0x71, 0xe5, 0xdd, 0x35, 0x4c, 0x89, 0xfe, 0x16, 0xd3, 0xb9, 0xd5,
+    0x41, 0xc1, 0x0c, 0x83, 0x06, 0xaf, 0xd8, 0x38, 0x8e, 0x1c, 0xdb, 0x99, 0xc3, 0xae, 0x85, 0x31, 0x5b, 0xb5, 0x5c,
+    0x6a, 0x4a, 0xa3, 0x76, 0x6d, 0xf5, 0xab, 0x7e, 0x72, 0xfc, 0x74, 0x5a, 0x78, 0x28, 0x83, 0x8c, 0xb6, 0xf4, 0x02,
+    0x60, 0x7c, 0x55, 0x92, 0xa3, 0xc0, 0xaf, 0x2c, 0x07, 0x5b, 0x98, 0x0e, 0x1d, 0xbf, 0x0b, 0xae, 0x04, 0x15, 0xe3,
+    0xa7, 0xa8, 0x7e, 0x70, 0x5a, 0xdb, 0x60, 0xda, 0x18, 0xdd, 0xf4, 0x40, 0xc3, 0x95, 0x50, 0x92, 0x08, 0x10, 0x34,
+    0x4a, 0x3d, 0xfd, 0xbb, 0xcf, 0xaa, 0x90, 0x51, 0xf1, 0xf8, 0xe2, 0x40, 0x5e, 0x37, 0xb7, 0x31, 0x7a, 0x4b, 0x51,
+    0xfb, 0xea, 0x53, 0x57, 0x9b, 0xa0, 0x32, 0xe8, 0x17, 0x50, 0xd2, 0x19, 0x38, 0x6a, 0x05, 0xcc, 0xf6, 0xb6, 0xa4,
+    0xf7, 0x10, 0xda, 0x42, 0x27, 0x8c, 0xd9, 0x69, 0x3c, 0x92, 0xa2, 0xdd, 0xb3, 0xe4, 0x2d, 0x95, 0x16, 0x61, 0x11,
+    0x76, 0x3c, 0xe1, 0x3f, 0xc3, 0x0b, 0x6a, 0xb6, 0x30, 0xcd, 0xec, 0xfe, 0xbd, 0x9e, 0x86, 0xa4, 0x9e, 0x28, 0x6f,
+    0xe3, 0x6f, 0xc3, 0x3c, 0x04, 0x7f, 0xed, 0xef, 0xc2, 0x7b, 0xf8, 0xfb, 0x30, 0xef, 0x0d, 0x6d, 0xd7, 0x27, 0xc1,
+    0x78, 0xaf, 0xfa, 0xa5, 0x98, 0x28, 0x15, 0x36, 0x41, 0x87, 0x79, 0xb7, 0x55, 0x66, 0x52, 0x71, 0x75, 0x77, 0x2a,
+    0xc5, 0x05, 0xcf, 0x86, 0xa4, 0x02, 0x21, 0xda, 0xf5, 0x77, 0x0c, 0x71, 0x78, 0xda, 0xc2, 0x9f, 0x35, 0x81, 0x78,
+    0x1f, 0x1a, 0x28, 0x89, 0xf8, 0x12, 0x9a, 0x6f, 0x0b, 0xe1, 0x0b, 0xfd, 0x7e, 0x24, 0x71, 0x25, 0x44, 0x55, 0x9d,
+    0x63, 0xd6, 0x1c, 0x24, 0x89, 0x7c, 0x01, 0xdb, 0x33, 0x62, 0x4e, 0x82, 0x5d, 0x65, 0x44, 0xe5, 0x29, 0xf4, 0x75,
+    0xf4, 0x17, 0xa4, 0xd7, 0xd5, 0x79, 0xb5, 0xdd, 0xb3, 0x66, 0x0a, 0x64, 0xf8, 0xc6, 0x61, 0x15, 0xdd, 0x9a, 0x10,
+    0x5f, 0x52, 0x13, 0x5b, 0xb9, 0xfa, 0xd6, 0xdc, 0x9a, 0xec, 0x5c, 0x73, 0x53, 0xb0, 0x8a, 0x69, 0x68, 0x5f, 0x60,
+    0xfa, 0x0c, 0xfe, 0xac, 0x8a, 0xd5, 0x83, 0x64, 0x28, 0x3f, 0x89, 0xf0, 0x17, 0xc1, 0xd0, 0x8f, 0xb2, 0xda, 0x80,
+    0x9c, 0x3e, 0x95, 0x49, 0x90, 0xbe, 0x18, 0x97, 0x4d, 0x24, 0xc0, 0x66, 0xc0, 0xdf, 0x2b, 0x58, 0xdd, 0xd2, 0x90,
+    0xd7, 0x2f, 0x31, 0xb5, 0x60, 0x1c, 0xe7, 0x74, 0xab, 0x57, 0xe1, 0x5f, 0x8b, 0x6a, 0x56, 0xa4, 0xa6, 0x5d, 0xc9,
+    0x8a, 0x81, 0x8d, 0x45, 0x76, 0x20, 0x13, 0xd3, 0xcc, 0x6f, 0x45, 0x9b, 0xd7, 0x2e, 0xc7, 0x22, 0x27, 0x0d, 0xbf,
+    0xa5, 0x6f, 0x0b, 0x22, 0xdb, 0x20, 0xca, 0xae, 0xc4, 0x89, 0x0c, 0x1c, 0xbc, 0xad, 0x58, 0xfd, 0x72, 0x24, 0x73,
+    0xc3, 0xdb, 0xe6, 0x6a, 0xe9, 0x71, 0x69, 0x1d, 0x5c, 0x19, 0xc3, 0x3b, 0x66, 0x11, 0xf7, 0xa3, 0x94, 0xf2, 0x94,
+    0x1c, 0x43, 0x2c, 0x78, 0x1d, 0xb6, 0xed, 0x96, 0x20, 0x79, 0x8c, 0xdf, 0x1e, 0x25, 0x48, 0xef, 0x43, 0xa1, 0xca,
+    0x71, 0xfe, 0xbe, 0x96, 0xa2, 0x3b, 0xed, 0xf6, 0xdf, 0x1c, 0xec, 0x59, 0x62, 0x63, 0xef, 0x6e, 0xc1, 0xeb, 0x2e,
+    0x79, 0xc7, 0x22, 0x63, 0x23, 0x14, 0x19, 0x1b, 0x96, 0xc8, 0xf3, 0x12, 0x29, 0xad, 0x5b, 0x02, 0x6b, 0xdb, 0x62,
+    0xe9, 0x48, 0x84, 0xf5, 0x66, 0xe0, 0x41, 0xc4, 0xf8, 0x79, 0xb1, 0x2d, 0xec, 0xda, 0xc2, 0x85, 0xb7, 0x55, 0xf2,
+    0x8b, 0xb2, 0x19, 0x78, 0xaa, 0x82, 0x80, 0xa0, 0xe9, 0x99, 0xca, 0x83, 0x91, 0x43, 0xe9, 0x74, 0xd5, 0xd5, 0xd6,
+    0xc5, 0xe2, 0x78, 0x06, 0x62, 0x49, 0xe5, 0xae, 0xbc, 0x97, 0x1d, 0x76, 0x69, 0xaa, 0xfe, 0x51, 0xb9, 0x2e, 0x4a,
+    0x39, 0xed, 0xf4, 0x77, 0x23, 0x69, 0x03, 0xe1, 0x5e, 0x2e, 0x60, 0x33, 0x83, 0xea, 0x43, 0x43, 0xc3, 0x8f, 0xb3,
+    0xad, 0x33, 0x76, 0xdc, 0x8a, 0xe6, 0x71, 0x15, 0x12, 0x44, 0x8d, 0xd8, 0xdf, 0x55, 0xca, 0x51, 0xa6, 0x60, 0xca,
+    0xc7, 0xc8, 0x48, 0xee, 0x40, 0x42, 0x12, 0xc3, 0x96, 0x32, 0xde, 0x48, 0x86, 0x24, 0x2c, 0x06, 0x00, 0x4b, 0xfc,
+    0xac, 0xe2, 0x92, 0x52, 0x33, 0x94, 0x76, 0xff, 0xaf, 0xff, 0xfb, 0xff, 0xc8, 0x50, 0x23, 0xd0, 0x16, 0xc0, 0xc2,
+    0xec, 0x98, 0xea, 0xd4, 0x91, 0x9d, 0x83, 0x73, 0x1a, 0x8f, 0x5b, 0xd3, 0x28, 0x99, 0x00, 0x04, 0x05, 0x13, 0xb9,
+    0xfe, 0xb2, 0x1e, 0xb8, 0x42, 0x82, 0x65, 0x9e, 0xd8, 0x4b, 0xf0, 0xea, 0x45, 0xb8, 0x6c, 0xbf, 0x2b, 0xa7, 0x55,
+    0xe5, 0x12, 0x13, 0x83, 0x1b, 0x19, 0xae, 0x06, 0x0f, 0xd6, 0xb2, 0x5c, 0xd5, 0xef, 0x6a, 0x92, 0xc2, 0x84, 0xd5,
+    0x52, 0x5c, 0xa1, 0xa5, 0x3e, 0x1c, 0xf9, 0xd7, 0x7f, 0xfa, 0x2f, 0xff, 0x43, 0xbd, 0xe2, 0x99, 0xc7, 0x5f, 0xff,
+    0xf1, 0xef, 0xff, 0xdf, 0xff, 0xfd, 0xaf, 0x98, 0x41, 0x2c, 0xcf, 0x45, 0x68, 0x6b, 0x59, 0xd5, 0xa1, 0x88, 0xd8,
+    0x63, 0x56, 0xe5, 0x84, 0xd4, 0x53, 0x61, 0xf7, 0x69, 0x42, 0x62, 0x50, 0x09, 0x1d, 0xf1, 0x39, 0xa5, 0x4e, 0x13,
+    0xd5, 0xae, 0x21, 0x1f, 0x2c, 0xa5, 0x45, 0x47, 0xfd, 0xf6, 0x4e, 0xdb, 0xae, 0x96, 0xb7, 0x6f, 0xf4, 0xdd, 0xc2,
+    0x85, 0xb9, 0x55, 0x62, 0x8e, 0xaf, 0x97, 0x6d, 0xa9, 0x42, 0x5b, 0x58, 0x52, 0x56, 0xe5, 0x16, 0xc6, 0x9c, 0x97,
+    0xf8, 0x1a, 0x74, 0x8d, 0x62, 0x5a, 0xe5, 0x5a, 0x9f, 0xde, 0x2f, 0x0b, 0x40, 0x74, 0x82, 0x4b, 0x23, 0x02, 0x68,
+    0x74, 0x9e, 0xda, 0x42, 0x6b, 0x25, 0xb9, 0x28, 0x69, 0x14, 0xe1, 0xe1, 0xdc, 0x7f, 0xf4, 0xb7, 0xe5, 0x9f, 0x67,
+    0x68, 0x25, 0x58, 0xce, 0x2c, 0x3a, 0x97, 0x7e, 0xcf, 0x83, 0x76, 0x7b, 0x7e, 0xee, 0x2e, 0xab, 0x19, 0xbc, 0xab,
+    0x26, 0xa3, 0xa0, 0x9b, 0x39, 0x20, 0x1d, 0xc4, 0xea, 0xf8, 0x1e, 0x98, 0xfa, 0x6d, 0x0c, 0x07, 0x95, 0xe5, 0x9f,
+    0x96, 0x14, 0x62, 0x8a, 0x7f, 0xc3, 0x03, 0x53, 0x19, 0x8d, 0x83, 0x12, 0x03, 0x8b, 0xa5, 0xd1, 0xab, 0x2b, 0x7a,
+    0x4d, 0x3b, 0xab, 0x29, 0x2b, 0xe6, 0x81, 0xaf, 0x79, 0x54, 0x7b, 0x1f, 0x0f, 0x5f, 0xa7, 0x1d, 0x6f, 0xda, 0x5d,
+    0xea, 0xe1, 0x39, 0xcf, 0x66, 0xe6, 0x09, 0x2f, 0x8b, 0xd8, 0x88, 0x4d, 0x54, 0x14, 0x53, 0xd6, 0x8b, 0xd3, 0xdb,
+    0xf2, 0x0b, 0xdc, 0x6e, 0x40, 0xdb, 0x2c, 0xe2, 0x01, 0x31, 0x6d, 0xcf, 0x3c, 0x03, 0x8e, 0xf0, 0x74, 0x3d, 0x5b,
+    0x1a, 0x73, 0xf5, 0x44, 0x53, 0x8c, 0x15, 0xd6, 0xd3, 0x81, 0x4a, 0x9f, 0xba, 0x9b, 0x43, 0x89, 0x50, 0xc3, 0xaf,
+    0xf2, 0x68, 0xf5, 0x5d, 0xcd, 0x47, 0x97, 0xa2, 0x19, 0xdc, 0xe2, 0xb5, 0xf5, 0x42, 0x4d, 0x8a, 0xda, 0x0f, 0x60,
+    0xfd, 0x10, 0x98, 0x76, 0xb3, 0x15, 0x15, 0x62, 0xab, 0x77, 0xe1, 0xaf, 0xda, 0x1e, 0x8f, 0xe6, 0x73, 0x6a, 0xe8,
+    0x02, 0x37, 0x92, 0x5d, 0x8d, 0x92, 0x82, 0xd2, 0x06, 0xc4, 0x29, 0xbd, 0x6c, 0x23, 0xd9, 0x56, 0x3c, 0xc9, 0xf3,
+    0x7b, 0xfa, 0xd5, 0xdf, 0xff, 0x1f, 0x2a, 0x12, 0x27, 0x08, 0x10, 0x7c, 0x00, 0x00};
 
 }  // namespace web_server
 }  // namespace esphome

From a45ee8f4ac0c415779a3ca38b1c84424414e4bc9 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 10 Nov 2022 11:08:22 +1300
Subject: [PATCH 235/838] Bump version to 2022.11.0b2

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

diff --git a/esphome/const.py b/esphome/const.py
index 916ce0ea63..c0f0ddcbff 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.11.0b1"
+__version__ = "2022.11.0b2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 27a339fa12169e8bfcbf528ece73e8affcc694fc Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 10 Nov 2022 22:49:04 +1300
Subject: [PATCH 236/838] Move CONF_INTERRUPT_PIN to const.py (#4014)

---
 esphome/components/ektf2232/touchscreen.py              | 4 +---
 esphome/components/lilygo_t5_47/touchscreen/__init__.py | 4 +---
 esphome/components/xpt2046/touchscreen.py               | 9 +++++----
 esphome/const.py                                        | 1 +
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/esphome/components/ektf2232/touchscreen.py b/esphome/components/ektf2232/touchscreen.py
index b3513b2670..d937265e7a 100644
--- a/esphome/components/ektf2232/touchscreen.py
+++ b/esphome/components/ektf2232/touchscreen.py
@@ -3,7 +3,7 @@ import esphome.config_validation as cv
 
 from esphome import pins
 from esphome.components import i2c, touchscreen
-from esphome.const import CONF_ID
+from esphome.const import CONF_ID, CONF_INTERRUPT_PIN
 
 CODEOWNERS = ["@jesserockz"]
 DEPENDENCIES = ["i2c"]
@@ -17,10 +17,8 @@ EKTF2232Touchscreen = ektf2232_ns.class_(
 )
 
 CONF_EKTF2232_ID = "ektf2232_id"
-CONF_INTERRUPT_PIN = "interrupt_pin"
 CONF_RTS_PIN = "rts_pin"
 
-
 CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
     cv.Schema(
         {
diff --git a/esphome/components/lilygo_t5_47/touchscreen/__init__.py b/esphome/components/lilygo_t5_47/touchscreen/__init__.py
index 9ec6c925ee..fe94120644 100644
--- a/esphome/components/lilygo_t5_47/touchscreen/__init__.py
+++ b/esphome/components/lilygo_t5_47/touchscreen/__init__.py
@@ -3,7 +3,7 @@ import esphome.config_validation as cv
 
 from esphome import pins
 from esphome.components import i2c, touchscreen
-from esphome.const import CONF_ID
+from esphome.const import CONF_ID, CONF_INTERRUPT_PIN
 
 from .. import lilygo_t5_47_ns
 
@@ -18,8 +18,6 @@ LilygoT547Touchscreen = lilygo_t5_47_ns.class_(
 )
 
 CONF_LILYGO_T5_47_TOUCHSCREEN_ID = "lilygo_t5_47_touchscreen_id"
-CONF_INTERRUPT_PIN = "interrupt_pin"
-
 
 CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
     cv.Schema(
diff --git a/esphome/components/xpt2046/touchscreen.py b/esphome/components/xpt2046/touchscreen.py
index 868525ccb1..e45b723179 100644
--- a/esphome/components/xpt2046/touchscreen.py
+++ b/esphome/components/xpt2046/touchscreen.py
@@ -3,18 +3,19 @@ import esphome.config_validation as cv
 
 from esphome import pins
 from esphome.components import spi, touchscreen
-from esphome.const import CONF_ID, CONF_THRESHOLD
+from esphome.const import CONF_ID, CONF_THRESHOLD, CONF_INTERRUPT_PIN
 
 CODEOWNERS = ["@numo68", "@nielsnl68"]
 DEPENDENCIES = ["spi"]
 
 XPT2046_ns = cg.esphome_ns.namespace("xpt2046")
 XPT2046Component = XPT2046_ns.class_(
-    "XPT2046Component", touchscreen.Touchscreen, cg.PollingComponent, spi.SPIDevice
+    "XPT2046Component",
+    touchscreen.Touchscreen,
+    cg.PollingComponent,
+    spi.SPIDevice,
 )
 
-CONF_INTERRUPT_PIN = "interrupt_pin"
-
 CONF_REPORT_INTERVAL = "report_interval"
 CONF_CALIBRATION_X_MIN = "calibration_x_min"
 CONF_CALIBRATION_X_MAX = "calibration_x_max"
diff --git a/esphome/const.py b/esphome/const.py
index 4b259984eb..af5adcf26d 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -322,6 +322,7 @@ CONF_INTERNAL = "internal"
 CONF_INTERNAL_FILTER = "internal_filter"
 CONF_INTERNAL_FILTER_MODE = "internal_filter_mode"
 CONF_INTERRUPT = "interrupt"
+CONF_INTERRUPT_PIN = "interrupt_pin"
 CONF_INTERVAL = "interval"
 CONF_INVALID_COOLDOWN = "invalid_cooldown"
 CONF_INVERT = "invert"

From 2f18ae00c5add1832bfce396264b943afe29914d Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Thu, 10 Nov 2022 10:40:53 -0800
Subject: [PATCH 237/838] fix to_lower filter (#4015)

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

diff --git a/esphome/components/text_sensor/filter.cpp b/esphome/components/text_sensor/filter.cpp
index ba77913d1b..80edae2b6c 100644
--- a/esphome/components/text_sensor/filter.cpp
+++ b/esphome/components/text_sensor/filter.cpp
@@ -51,7 +51,7 @@ optional<std::string> ToUpperFilter::new_value(std::string value) {
 // ToLowerFilter
 optional<std::string> ToLowerFilter::new_value(std::string value) {
   for (char &c : value)
-    c = ::toupper(c);
+    c = ::tolower(c);
   return value;
 }
 

From 9f30f53c6b8e7b533d2c95cc4eddbb398116b57c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Nov 2022 10:50:01 +1300
Subject: [PATCH 238/838] Bump pyupgrade from 3.2.0 to 3.2.2 (#4017)

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 4a9d9f5cc3..e4fcf6f27e 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.2.0
+    rev: v3.2.2
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
diff --git a/requirements_test.txt b/requirements_test.txt
index 28112521ac..06deb4df18 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,7 +1,7 @@
 pylint==2.15.5
 flake8==5.0.4  # also change in .pre-commit-config.yaml when updating
 black==22.10.0  # also change in .pre-commit-config.yaml when updating
-pyupgrade==3.2.0  # also change in .pre-commit-config.yaml when updating
+pyupgrade==3.2.2  # also change in .pre-commit-config.yaml when updating
 pre-commit
 
 # Unit tests

From fcb02af7828bc194dc7afb971dc7aaab93bc568e Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Thu, 10 Nov 2022 10:40:53 -0800
Subject: [PATCH 239/838] fix to_lower filter (#4015)

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

diff --git a/esphome/components/text_sensor/filter.cpp b/esphome/components/text_sensor/filter.cpp
index ba77913d1b..80edae2b6c 100644
--- a/esphome/components/text_sensor/filter.cpp
+++ b/esphome/components/text_sensor/filter.cpp
@@ -51,7 +51,7 @@ optional<std::string> ToUpperFilter::new_value(std::string value) {
 // ToLowerFilter
 optional<std::string> ToLowerFilter::new_value(std::string value) {
   for (char &c : value)
-    c = ::toupper(c);
+    c = ::tolower(c);
   return value;
 }
 

From 9efe59a984d211c37c2c40adda02292d5ea08cbf Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 11 Nov 2022 11:49:37 +1300
Subject: [PATCH 240/838] Bump version to 2022.11.0b3

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

diff --git a/esphome/const.py b/esphome/const.py
index c0f0ddcbff..e3de750798 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.11.0b2"
+__version__ = "2022.11.0b3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 472dcebf2cf4db33ea1fde58a0a2672e2f4ef071 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 14 Nov 2022 13:19:32 +1300
Subject: [PATCH 241/838] Mark webserver and captive portal as not available on
 rp2040 (#4023)

---
 esphome/components/async_tcp/__init__.py      | 1 +
 esphome/components/captive_portal/__init__.py | 1 +
 esphome/components/web_server/__init__.py     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/esphome/components/async_tcp/__init__.py b/esphome/components/async_tcp/__init__.py
index 8789448792..c693544a2e 100644
--- a/esphome/components/async_tcp/__init__.py
+++ b/esphome/components/async_tcp/__init__.py
@@ -8,6 +8,7 @@ CODEOWNERS = ["@OttoWinter"]
 CONFIG_SCHEMA = cv.All(
     cv.Schema({}),
     cv.only_with_arduino,
+    cv.only_on(["esp32", "esp8266"]),
 )
 
 
diff --git a/esphome/components/captive_portal/__init__.py b/esphome/components/captive_portal/__init__.py
index b41095304e..f7b103d299 100644
--- a/esphome/components/captive_portal/__init__.py
+++ b/esphome/components/captive_portal/__init__.py
@@ -25,6 +25,7 @@ CONFIG_SCHEMA = cv.All(
         }
     ).extend(cv.COMPONENT_SCHEMA),
     cv.only_with_arduino,
+    cv.only_on(["esp32", "esp8266"]),
 )
 
 
diff --git a/esphome/components/web_server/__init__.py b/esphome/components/web_server/__init__.py
index 42683c8d77..d8343c6c39 100644
--- a/esphome/components/web_server/__init__.py
+++ b/esphome/components/web_server/__init__.py
@@ -75,6 +75,7 @@ CONFIG_SCHEMA = cv.All(
         }
     ).extend(cv.COMPONENT_SCHEMA),
     cv.only_with_arduino,
+    cv.only_on(["esp32", "esp8266"]),
     default_url,
     validate_local,
 )

From 9e3ee287442cc92788ed0d8241c1debfec2402fa Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 14 Nov 2022 13:29:41 +1300
Subject: [PATCH 242/838] Fix time components on rp2040 (#4024)

---
 esphome/components/sntp/sntp_component.cpp  | 3 +++
 esphome/components/time/real_time_clock.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/esphome/components/sntp/sntp_component.cpp b/esphome/components/sntp/sntp_component.cpp
index 21fcb96842..3af21a9b23 100644
--- a/esphome/components/sntp/sntp_component.cpp
+++ b/esphome/components/sntp/sntp_component.cpp
@@ -10,6 +10,9 @@
 #ifdef USE_ESP8266
 #include "sntp.h"
 #endif
+#ifdef USE_RP2040
+#include "lwip/apps/sntp.h"
+#endif
 
 // Yes, the server names are leaked, but that's fine.
 #ifdef CLANG_TIDY
diff --git a/esphome/components/time/real_time_clock.cpp b/esphome/components/time/real_time_clock.cpp
index 7b5f0aa49b..de76676a4d 100644
--- a/esphome/components/time/real_time_clock.cpp
+++ b/esphome/components/time/real_time_clock.cpp
@@ -4,6 +4,9 @@
 #ifdef USE_ESP8266
 #include "sys/time.h"
 #endif
+#ifdef USE_RP2040
+#include <sys/time.h>
+#endif
 #include <cerrno>
 
 namespace esphome {

From cb2d9e4bec2af31d10add592e762b3291be9118e Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 14 Nov 2022 13:29:53 +1300
Subject: [PATCH 243/838] Mark mqtt as unavailable on rp2040 (#4025)

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

diff --git a/esphome/components/mqtt/__init__.py b/esphome/components/mqtt/__init__.py
index 3f9275e231..7207eaddc1 100644
--- a/esphome/components/mqtt/__init__.py
+++ b/esphome/components/mqtt/__init__.py
@@ -250,6 +250,7 @@ CONFIG_SCHEMA = cv.All(
         }
     ),
     validate_config,
+    cv.only_on(["esp32", "esp8266"]),
 )
 
 

From 10f590324b6fa97c3f5df849b343a58b21891a36 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 14 Nov 2022 13:19:32 +1300
Subject: [PATCH 244/838] Mark webserver and captive portal as not available on
 rp2040 (#4023)

---
 esphome/components/async_tcp/__init__.py      | 1 +
 esphome/components/captive_portal/__init__.py | 1 +
 esphome/components/web_server/__init__.py     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/esphome/components/async_tcp/__init__.py b/esphome/components/async_tcp/__init__.py
index 8789448792..c693544a2e 100644
--- a/esphome/components/async_tcp/__init__.py
+++ b/esphome/components/async_tcp/__init__.py
@@ -8,6 +8,7 @@ CODEOWNERS = ["@OttoWinter"]
 CONFIG_SCHEMA = cv.All(
     cv.Schema({}),
     cv.only_with_arduino,
+    cv.only_on(["esp32", "esp8266"]),
 )
 
 
diff --git a/esphome/components/captive_portal/__init__.py b/esphome/components/captive_portal/__init__.py
index b41095304e..f7b103d299 100644
--- a/esphome/components/captive_portal/__init__.py
+++ b/esphome/components/captive_portal/__init__.py
@@ -25,6 +25,7 @@ CONFIG_SCHEMA = cv.All(
         }
     ).extend(cv.COMPONENT_SCHEMA),
     cv.only_with_arduino,
+    cv.only_on(["esp32", "esp8266"]),
 )
 
 
diff --git a/esphome/components/web_server/__init__.py b/esphome/components/web_server/__init__.py
index 42683c8d77..d8343c6c39 100644
--- a/esphome/components/web_server/__init__.py
+++ b/esphome/components/web_server/__init__.py
@@ -75,6 +75,7 @@ CONFIG_SCHEMA = cv.All(
         }
     ).extend(cv.COMPONENT_SCHEMA),
     cv.only_with_arduino,
+    cv.only_on(["esp32", "esp8266"]),
     default_url,
     validate_local,
 )

From 608be4e050d5eb4acafc3ef8cbf6dd18ecd10313 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 14 Nov 2022 13:29:41 +1300
Subject: [PATCH 245/838] Fix time components on rp2040 (#4024)

---
 esphome/components/sntp/sntp_component.cpp  | 3 +++
 esphome/components/time/real_time_clock.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/esphome/components/sntp/sntp_component.cpp b/esphome/components/sntp/sntp_component.cpp
index 21fcb96842..3af21a9b23 100644
--- a/esphome/components/sntp/sntp_component.cpp
+++ b/esphome/components/sntp/sntp_component.cpp
@@ -10,6 +10,9 @@
 #ifdef USE_ESP8266
 #include "sntp.h"
 #endif
+#ifdef USE_RP2040
+#include "lwip/apps/sntp.h"
+#endif
 
 // Yes, the server names are leaked, but that's fine.
 #ifdef CLANG_TIDY
diff --git a/esphome/components/time/real_time_clock.cpp b/esphome/components/time/real_time_clock.cpp
index 7b5f0aa49b..de76676a4d 100644
--- a/esphome/components/time/real_time_clock.cpp
+++ b/esphome/components/time/real_time_clock.cpp
@@ -4,6 +4,9 @@
 #ifdef USE_ESP8266
 #include "sys/time.h"
 #endif
+#ifdef USE_RP2040
+#include <sys/time.h>
+#endif
 #include <cerrno>
 
 namespace esphome {

From 3bd6456fbe42b2d7d7a820442708fdaefe500970 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 14 Nov 2022 13:29:53 +1300
Subject: [PATCH 246/838] Mark mqtt as unavailable on rp2040 (#4025)

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

diff --git a/esphome/components/mqtt/__init__.py b/esphome/components/mqtt/__init__.py
index 3f9275e231..7207eaddc1 100644
--- a/esphome/components/mqtt/__init__.py
+++ b/esphome/components/mqtt/__init__.py
@@ -250,6 +250,7 @@ CONFIG_SCHEMA = cv.All(
         }
     ),
     validate_config,
+    cv.only_on(["esp32", "esp8266"]),
 )
 
 

From 6a73699a3831be69e16357a517ffec7dbac173ad Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 14 Nov 2022 13:31:48 +1300
Subject: [PATCH 247/838] Bump version to 2022.11.0b4

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

diff --git a/esphome/const.py b/esphome/const.py
index e3de750798..beeb7d62b4 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.11.0b3"
+__version__ = "2022.11.0b4"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 2f62426f0952a48ce327a4e5c7c951b0e4acb690 Mon Sep 17 00:00:00 2001
From: 2mikrobi <2mikrobi@gmail.com>
Date: Tue, 15 Nov 2022 20:12:09 +0100
Subject: [PATCH 248/838] Update_interval less that 1 second in QMC5883L
 integration (#4031)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/qmc5883l/sensor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/qmc5883l/sensor.py b/esphome/components/qmc5883l/sensor.py
index 100ac93520..cce4d93843 100644
--- a/esphome/components/qmc5883l/sensor.py
+++ b/esphome/components/qmc5883l/sensor.py
@@ -103,7 +103,7 @@ CONFIG_SCHEMA = (
 
 
 def auto_data_rate(config):
-    interval_sec = config[CONF_UPDATE_INTERVAL].seconds
+    interval_sec = config[CONF_UPDATE_INTERVAL].total_milliseconds / 1000
     interval_hz = 1.0 / interval_sec
     for datarate in sorted(QMC5883LDatarates.keys()):
         if float(datarate) >= interval_hz:

From 392dc8b0dbe75a8961cdde530a85cdccd7e5cd52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Tue, 15 Nov 2022 20:14:20 +0100
Subject: [PATCH 249/838] Add reset_reason text sensor to debug component
 (#3814)

---
 esphome/components/debug/debug_component.cpp |  9 +++++++--
 esphome/components/debug/debug_component.h   |  2 ++
 esphome/components/debug/text_sensor.py      | 18 ++++++++++++++++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/esphome/components/debug/debug_component.cpp b/esphome/components/debug/debug_component.cpp
index 97d5aeb8a8..a594dc7a50 100644
--- a/esphome/components/debug/debug_component.cpp
+++ b/esphome/components/debug/debug_component.cpp
@@ -38,6 +38,7 @@ static uint32_t get_free_heap() {
 
 void DebugComponent::dump_config() {
   std::string device_info;
+  std::string reset_reason;
   device_info.reserve(256);
 
 #ifndef ESPHOME_LOG_HAS_DEBUG
@@ -146,7 +147,6 @@ void DebugComponent::dump_config() {
   device_info += "|EFuse MAC: ";
   device_info += mac;
 
-  const char *reset_reason;
   switch (rtc_get_reset_reason(0)) {
     case POWERON_RESET:
       reset_reason = "Power On Reset";
@@ -196,7 +196,7 @@ void DebugComponent::dump_config() {
     default:
       reset_reason = "Unknown Reset Reason";
   }
-  ESP_LOGD(TAG, "Reset Reason: %s", reset_reason);
+  ESP_LOGD(TAG, "Reset Reason: %s", reset_reason.c_str());
   device_info += "|Reset: ";
   device_info += reset_reason;
 
@@ -270,6 +270,8 @@ void DebugComponent::dump_config() {
   device_info += ESP.getResetReason().c_str();
   device_info += "|";
   device_info += ESP.getResetInfo().c_str();
+
+  reset_reason = ESP.getResetReason().c_str();
 #endif
 
 #ifdef USE_TEXT_SENSOR
@@ -278,6 +280,9 @@ void DebugComponent::dump_config() {
       device_info.resize(255);
     this->device_info_->publish_state(device_info);
   }
+  if (this->reset_reason_ != nullptr) {
+    this->reset_reason_->publish_state(reset_reason);
+  }
 #endif  // USE_TEXT_SENSOR
 }
 
diff --git a/esphome/components/debug/debug_component.h b/esphome/components/debug/debug_component.h
index 4dc1659616..b80fda55eb 100644
--- a/esphome/components/debug/debug_component.h
+++ b/esphome/components/debug/debug_component.h
@@ -24,6 +24,7 @@ class DebugComponent : public PollingComponent {
 
 #ifdef USE_TEXT_SENSOR
   void set_device_info_sensor(text_sensor::TextSensor *device_info) { device_info_ = device_info; }
+  void set_reset_reason_sensor(text_sensor::TextSensor *reset_reason) { reset_reason_ = reset_reason; }
 #endif  // USE_TEXT_SENSOR
 #ifdef USE_SENSOR
   void set_free_sensor(sensor::Sensor *free_sensor) { free_sensor_ = free_sensor; }
@@ -50,6 +51,7 @@ class DebugComponent : public PollingComponent {
 
 #ifdef USE_TEXT_SENSOR
   text_sensor::TextSensor *device_info_{nullptr};
+  text_sensor::TextSensor *reset_reason_{nullptr};
 #endif  // USE_TEXT_SENSOR
 };
 
diff --git a/esphome/components/debug/text_sensor.py b/esphome/components/debug/text_sensor.py
index 11e6354f57..24f938a0e2 100644
--- a/esphome/components/debug/text_sensor.py
+++ b/esphome/components/debug/text_sensor.py
@@ -1,18 +1,29 @@
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 import esphome.codegen as cg
-from esphome.const import CONF_DEVICE, ENTITY_CATEGORY_DIAGNOSTIC
+from esphome.const import (
+    CONF_DEVICE,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+    ICON_CHIP,
+    ICON_RESTART,
+)
 
 from . import CONF_DEBUG_ID, DebugComponent
 
 DEPENDENCIES = ["debug"]
 
 
+CONF_RESET_REASON = "reset_reason"
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(CONF_DEBUG_ID): cv.use_id(DebugComponent),
         cv.Optional(CONF_DEVICE): text_sensor.text_sensor_schema(
-            entity_category=ENTITY_CATEGORY_DIAGNOSTIC
+            icon=ICON_CHIP,
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        ),
+        cv.Optional(CONF_RESET_REASON): text_sensor.text_sensor_schema(
+            icon=ICON_RESTART,
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         ),
     }
 )
@@ -24,3 +35,6 @@ async def to_code(config):
     if CONF_DEVICE in config:
         sens = await text_sensor.new_text_sensor(config[CONF_DEVICE])
         cg.add(debug_component.set_device_info_sensor(sens))
+    if CONF_RESET_REASON in config:
+        sens = await text_sensor.new_text_sensor(config[CONF_RESET_REASON])
+        cg.add(debug_component.set_reset_reason_sensor(sens))

From e3a454d1a60724a1c0cf0f3e1b7029ecf8a1c96d Mon Sep 17 00:00:00 2001
From: 2mikrobi <2mikrobi@gmail.com>
Date: Tue, 15 Nov 2022 20:12:09 +0100
Subject: [PATCH 250/838] Update_interval less that 1 second in QMC5883L
 integration (#4031)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/qmc5883l/sensor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/qmc5883l/sensor.py b/esphome/components/qmc5883l/sensor.py
index 100ac93520..cce4d93843 100644
--- a/esphome/components/qmc5883l/sensor.py
+++ b/esphome/components/qmc5883l/sensor.py
@@ -103,7 +103,7 @@ CONFIG_SCHEMA = (
 
 
 def auto_data_rate(config):
-    interval_sec = config[CONF_UPDATE_INTERVAL].seconds
+    interval_sec = config[CONF_UPDATE_INTERVAL].total_milliseconds / 1000
     interval_hz = 1.0 / interval_sec
     for datarate in sorted(QMC5883LDatarates.keys()):
         if float(datarate) >= interval_hz:

From e8784ba3834898a7b756ae4522667f25c2adc5a7 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 16 Nov 2022 12:30:41 +1300
Subject: [PATCH 251/838] Bump version to 2022.11.0b5

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

diff --git a/esphome/const.py b/esphome/const.py
index beeb7d62b4..fe8fedad48 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.11.0b4"
+__version__ = "2022.11.0b5"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 147b113b62bf95768a8744ba6635b8a5bf47136e Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 16 Nov 2022 15:46:33 +1300
Subject: [PATCH 252/838] Always save user wifi credentials if non in config
 (#4036)

---
 esphome/components/captive_portal/__init__.py | 24 +------------------
 esphome/components/wifi/wifi_component.cpp    |  7 ++----
 2 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/esphome/components/captive_portal/__init__.py b/esphome/components/captive_portal/__init__.py
index f7b103d299..ff5266e84f 100644
--- a/esphome/components/captive_portal/__init__.py
+++ b/esphome/components/captive_portal/__init__.py
@@ -1,9 +1,8 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-import esphome.final_validate as fv
 from esphome.components import web_server_base
 from esphome.components.web_server_base import CONF_WEB_SERVER_BASE_ID
-from esphome.const import CONF_ID, CONF_NETWORKS, CONF_PASSWORD, CONF_SSID, CONF_WIFI
+from esphome.const import CONF_ID
 from esphome.core import coroutine_with_priority, CORE
 
 AUTO_LOAD = ["web_server_base"]
@@ -13,7 +12,6 @@ CODEOWNERS = ["@OttoWinter"]
 captive_portal_ns = cg.esphome_ns.namespace("captive_portal")
 CaptivePortal = captive_portal_ns.class_("CaptivePortal", cg.Component)
 
-CONF_KEEP_USER_CREDENTIALS = "keep_user_credentials"
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
         {
@@ -21,7 +19,6 @@ CONFIG_SCHEMA = cv.All(
             cv.GenerateID(CONF_WEB_SERVER_BASE_ID): cv.use_id(
                 web_server_base.WebServerBase
             ),
-            cv.Optional(CONF_KEEP_USER_CREDENTIALS, default=False): cv.boolean,
         }
     ).extend(cv.COMPONENT_SCHEMA),
     cv.only_with_arduino,
@@ -29,22 +26,6 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def validate_wifi(config):
-    wifi_conf = fv.full_config.get()[CONF_WIFI]
-    if config.get(CONF_KEEP_USER_CREDENTIALS, False) and (
-        CONF_SSID in wifi_conf
-        or CONF_PASSWORD in wifi_conf
-        or CONF_NETWORKS in wifi_conf
-    ):
-        raise cv.Invalid(
-            f"WiFi credentials cannot be used together with {CONF_KEEP_USER_CREDENTIALS}"
-        )
-    return config
-
-
-FINAL_VALIDATE_SCHEMA = validate_wifi
-
-
 @coroutine_with_priority(64.0)
 async def to_code(config):
     paren = await cg.get_variable(config[CONF_WEB_SERVER_BASE_ID])
@@ -58,6 +39,3 @@ async def to_code(config):
         cg.add_library("WiFi", None)
     if CORE.is_esp8266:
         cg.add_library("DNSServer", None)
-
-    if config.get(CONF_KEEP_USER_CREDENTIALS, False):
-        cg.add_define("USE_CAPTIVE_PORTAL_KEEP_USER_CREDENTIALS")
diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index ac7314d603..d4636c81cd 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -39,11 +39,8 @@ void WiFiComponent::setup() {
   this->last_connected_ = millis();
   this->wifi_pre_setup_();
 
-#ifndef USE_CAPTIVE_PORTAL_KEEP_USER_CREDENTIALS
-  uint32_t hash = fnv1_hash(App.get_compilation_time());
-#else
-  uint32_t hash = 88491487UL;
-#endif
+  uint32_t hash = this->has_sta() ? fnv1_hash(App.get_compilation_time()) : 88491487UL;
+
   this->pref_ = global_preferences->make_preference<wifi::SavedWifiSettings>(hash, true);
 
   SavedWifiSettings save{};

From 7c19b961e2c9186fcf7f8dbd4f8b50740d342260 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 16 Nov 2022 15:46:33 +1300
Subject: [PATCH 253/838] Always save user wifi credentials if non in config
 (#4036)

---
 esphome/components/captive_portal/__init__.py | 24 +------------------
 esphome/components/wifi/wifi_component.cpp    |  7 ++----
 2 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/esphome/components/captive_portal/__init__.py b/esphome/components/captive_portal/__init__.py
index f7b103d299..ff5266e84f 100644
--- a/esphome/components/captive_portal/__init__.py
+++ b/esphome/components/captive_portal/__init__.py
@@ -1,9 +1,8 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-import esphome.final_validate as fv
 from esphome.components import web_server_base
 from esphome.components.web_server_base import CONF_WEB_SERVER_BASE_ID
-from esphome.const import CONF_ID, CONF_NETWORKS, CONF_PASSWORD, CONF_SSID, CONF_WIFI
+from esphome.const import CONF_ID
 from esphome.core import coroutine_with_priority, CORE
 
 AUTO_LOAD = ["web_server_base"]
@@ -13,7 +12,6 @@ CODEOWNERS = ["@OttoWinter"]
 captive_portal_ns = cg.esphome_ns.namespace("captive_portal")
 CaptivePortal = captive_portal_ns.class_("CaptivePortal", cg.Component)
 
-CONF_KEEP_USER_CREDENTIALS = "keep_user_credentials"
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
         {
@@ -21,7 +19,6 @@ CONFIG_SCHEMA = cv.All(
             cv.GenerateID(CONF_WEB_SERVER_BASE_ID): cv.use_id(
                 web_server_base.WebServerBase
             ),
-            cv.Optional(CONF_KEEP_USER_CREDENTIALS, default=False): cv.boolean,
         }
     ).extend(cv.COMPONENT_SCHEMA),
     cv.only_with_arduino,
@@ -29,22 +26,6 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def validate_wifi(config):
-    wifi_conf = fv.full_config.get()[CONF_WIFI]
-    if config.get(CONF_KEEP_USER_CREDENTIALS, False) and (
-        CONF_SSID in wifi_conf
-        or CONF_PASSWORD in wifi_conf
-        or CONF_NETWORKS in wifi_conf
-    ):
-        raise cv.Invalid(
-            f"WiFi credentials cannot be used together with {CONF_KEEP_USER_CREDENTIALS}"
-        )
-    return config
-
-
-FINAL_VALIDATE_SCHEMA = validate_wifi
-
-
 @coroutine_with_priority(64.0)
 async def to_code(config):
     paren = await cg.get_variable(config[CONF_WEB_SERVER_BASE_ID])
@@ -58,6 +39,3 @@ async def to_code(config):
         cg.add_library("WiFi", None)
     if CORE.is_esp8266:
         cg.add_library("DNSServer", None)
-
-    if config.get(CONF_KEEP_USER_CREDENTIALS, False):
-        cg.add_define("USE_CAPTIVE_PORTAL_KEEP_USER_CREDENTIALS")
diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index ac7314d603..d4636c81cd 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -39,11 +39,8 @@ void WiFiComponent::setup() {
   this->last_connected_ = millis();
   this->wifi_pre_setup_();
 
-#ifndef USE_CAPTIVE_PORTAL_KEEP_USER_CREDENTIALS
-  uint32_t hash = fnv1_hash(App.get_compilation_time());
-#else
-  uint32_t hash = 88491487UL;
-#endif
+  uint32_t hash = this->has_sta() ? fnv1_hash(App.get_compilation_time()) : 88491487UL;
+
   this->pref_ = global_preferences->make_preference<wifi::SavedWifiSettings>(hash, true);
 
   SavedWifiSettings save{};

From d453b42b1ad516493e042c56881d37e9fc24e78d Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 16 Nov 2022 15:48:50 +1300
Subject: [PATCH 254/838] Bump version to 2022.11.0b6

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

diff --git a/esphome/const.py b/esphome/const.py
index fe8fedad48..1608e796d6 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.11.0b5"
+__version__ = "2022.11.0b6"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 7e88eea5326b68b7f9bb3f25d7bd8d802e6bc2b2 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 17 Nov 2022 07:17:42 +1300
Subject: [PATCH 255/838] Bump version to 2022.11.0

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

diff --git a/esphome/const.py b/esphome/const.py
index 1608e796d6..da386cb3d8 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.11.0b6"
+__version__ = "2022.11.0"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From f7b1602adf3016e1a265d7be432c352f0df8ec76 Mon Sep 17 00:00:00 2001
From: John Moxley <55776034+johnmoxley@users.noreply.github.com>
Date: Wed, 16 Nov 2022 13:44:17 -0500
Subject: [PATCH 256/838] bump nginx-light 1.18.0-6.1+deb11u2 to
 1.18.0-6.1+deb11u3 (#4034)

fixes https://github.com/esphome/issues/issues/3793
---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index aa4bd5fc53..102ef46461 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -94,7 +94,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+deb11u2 \
+        nginx-light=1.18.0-6.1+deb11u3 \
     && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \

From 816df5ad4714807b2def63c8d7d53710d19735b5 Mon Sep 17 00:00:00 2001
From: John Moxley <55776034+johnmoxley@users.noreply.github.com>
Date: Wed, 16 Nov 2022 13:44:17 -0500
Subject: [PATCH 257/838] bump nginx-light 1.18.0-6.1+deb11u2 to
 1.18.0-6.1+deb11u3 (#4034)

fixes https://github.com/esphome/issues/issues/3793
---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index aa4bd5fc53..102ef46461 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -94,7 +94,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+deb11u2 \
+        nginx-light=1.18.0-6.1+deb11u3 \
     && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \

From 65030e1c377f8787c1ad0ce6c59943052e0b6f44 Mon Sep 17 00:00:00 2001
From: Brian Kaufman <bkaufx@gmail.com>
Date: Wed, 16 Nov 2022 17:45:58 -0700
Subject: [PATCH 258/838] remove unused variable last_save_ in
 total_daily_energy (#4039)

---
 esphome/components/total_daily_energy/total_daily_energy.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/esphome/components/total_daily_energy/total_daily_energy.h b/esphome/components/total_daily_energy/total_daily_energy.h
index a40c56a7db..1a9d5d1a49 100644
--- a/esphome/components/total_daily_energy/total_daily_energy.h
+++ b/esphome/components/total_daily_energy/total_daily_energy.h
@@ -37,7 +37,6 @@ class TotalDailyEnergy : public sensor::Sensor, public Component {
   TotalDailyEnergyMethod method_;
   uint16_t last_day_of_year_{};
   uint32_t last_update_{0};
-  uint32_t last_save_{0};
   bool restore_;
   float total_energy_{0.0f};
   float last_power_state_{0.0f};

From 719c212009cb2336a2564a0b480d90e29c70b860 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 17 Nov 2022 13:51:08 +1300
Subject: [PATCH 259/838] Support ADC on RP2040 (#4040)

---
 esphome/components/adc/adc_sensor.cpp | 51 +++++++++++++++++++++++++--
 esphome/components/adc/adc_sensor.h   |  8 +++++
 esphome/components/adc/sensor.py      | 11 ++++++
 esphome/config_validation.py          |  1 +
 4 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/esphome/components/adc/adc_sensor.cpp b/esphome/components/adc/adc_sensor.cpp
index 5a29d86404..1e8d740062 100644
--- a/esphome/components/adc/adc_sensor.cpp
+++ b/esphome/components/adc/adc_sensor.cpp
@@ -11,6 +11,10 @@ ADC_MODE(ADC_VCC)
 #endif
 #endif
 
+#ifdef USE_RP2040
+#include <hardware/adc.h>
+#endif
+
 namespace esphome {
 namespace adc {
 
@@ -32,9 +36,13 @@ static const int ADC_MAX = (1 << SOC_ADC_RTC_MAX_BITWIDTH) - 1;    // 4095 (12 b
 static const int ADC_HALF = (1 << SOC_ADC_RTC_MAX_BITWIDTH) >> 1;  // 2048 (12 bit) or 4096 (13 bit)
 #endif
 
-void ADCSensor::setup() {
+#ifdef USE_RP2040
+extern "C"
+#endif
+    void
+    ADCSensor::setup() {
   ESP_LOGCONFIG(TAG, "Setting up ADC '%s'...", this->get_name().c_str());
-#ifndef USE_ADC_SENSOR_VCC
+#if !defined(USE_ADC_SENSOR_VCC) && !defined(USE_RP2040)
   pin_->setup();
 #endif
 
@@ -63,6 +71,16 @@ void ADCSensor::setup() {
   }
 
 #endif  // USE_ESP32
+
+#ifdef USE_RP2040
+  static bool initialized = false;
+  if (!initialized) {
+    adc_init();
+    initialized = true;
+  }
+#endif
+
+  ESP_LOGCONFIG(TAG, "ADC '%s' setup finished!", this->get_name().c_str());
 }
 
 void ADCSensor::dump_config() {
@@ -98,6 +116,12 @@ void ADCSensor::dump_config() {
     }
   }
 #endif  // USE_ESP32
+#ifdef USE_RP2040
+  if (this->is_temperature_)
+    ESP_LOGCONFIG(TAG, "  Pin: Temperature");
+  else
+    LOG_PIN("  Pin: ", pin_);
+#endif
   LOG_UPDATE_INTERVAL(this);
 }
 
@@ -175,6 +199,29 @@ float ADCSensor::sample() {
 }
 #endif  // USE_ESP32
 
+#ifdef USE_RP2040
+float ADCSensor::sample() {
+  if (this->is_temperature_) {
+    adc_set_temp_sensor_enabled(true);
+    delay(1);
+    adc_select_input(4);
+  } else {
+    uint8_t pin = this->pin_->get_pin();
+    adc_gpio_init(pin);
+    adc_select_input(pin - 26);
+  }
+
+  int raw = adc_read();
+  if (this->is_temperature_) {
+    adc_set_temp_sensor_enabled(false);
+  }
+  if (output_raw_) {
+    return raw;
+  }
+  return raw * 3.3f / 4096.0f;
+}
+#endif
+
 #ifdef USE_ESP8266
 std::string ADCSensor::unique_id() { return get_mac_address() + "-adc"; }
 #endif
diff --git a/esphome/components/adc/adc_sensor.h b/esphome/components/adc/adc_sensor.h
index 12272a1577..22cddde6f8 100644
--- a/esphome/components/adc/adc_sensor.h
+++ b/esphome/components/adc/adc_sensor.h
@@ -38,10 +38,18 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
   std::string unique_id() override;
 #endif
 
+#ifdef USE_RP2040
+  void set_is_temperature() { is_temperature_ = true; }
+#endif
+
  protected:
   InternalGPIOPin *pin_;
   bool output_raw_{false};
 
+#ifdef USE_RP2040
+  bool is_temperature_{false};
+#endif
+
 #ifdef USE_ESP32
   adc_atten_t attenuation_{ADC_ATTEN_DB_0};
   adc1_channel_t channel_{};
diff --git a/esphome/components/adc/sensor.py b/esphome/components/adc/sensor.py
index 5443b9875a..1a519d7506 100644
--- a/esphome/components/adc/sensor.py
+++ b/esphome/components/adc/sensor.py
@@ -94,6 +94,9 @@ def validate_adc_pin(value):
     if str(value).upper() == "VCC":
         return cv.only_on_esp8266("VCC")
 
+    if str(value).upper() == "TEMPERATURE":
+        return cv.only_on_rp2040("TEMPERATURE")
+
     if CORE.is_esp32:
         value = pins.internal_gpio_input_pin_number(value)
         variant = get_esp32_variant()
@@ -117,6 +120,12 @@ def validate_adc_pin(value):
             {CONF_ANALOG: True, CONF_INPUT: True}, internal=True
         )(value)
 
+    if CORE.is_rp2040:
+        value = pins.internal_gpio_input_pin_number(value)
+        if value not in (26, 27, 28, 29):
+            raise cv.Invalid("RP2040: Only pins 26, 27, 28 and 29 support ADC.")
+        return pins.internal_gpio_input_pin_schema(value)
+
     raise NotImplementedError
 
 
@@ -160,6 +169,8 @@ async def to_code(config):
 
     if config[CONF_PIN] == "VCC":
         cg.add_define("USE_ADC_SENSOR_VCC")
+    elif config[CONF_PIN] == "TEMPERATURE":
+        cg.add(var.set_is_temperature())
     else:
         pin = await cg.gpio_pin_expression(config[CONF_PIN])
         cg.add(var.set_pin(pin))
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index afc800f3f2..90018b4d56 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -548,6 +548,7 @@ def only_with_framework(frameworks):
 
 only_on_esp32 = only_on("esp32")
 only_on_esp8266 = only_on("esp8266")
+only_on_rp2040 = only_on("rp2040")
 only_with_arduino = only_with_framework("arduino")
 only_with_esp_idf = only_with_framework("esp-idf")
 

From 9944ca414e45c52f560349c420212a7cbb875bdb Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 17 Nov 2022 13:51:08 +1300
Subject: [PATCH 260/838] Support ADC on RP2040 (#4040)

---
 esphome/components/adc/adc_sensor.cpp | 51 +++++++++++++++++++++++++--
 esphome/components/adc/adc_sensor.h   |  8 +++++
 esphome/components/adc/sensor.py      | 11 ++++++
 esphome/config_validation.py          |  1 +
 4 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/esphome/components/adc/adc_sensor.cpp b/esphome/components/adc/adc_sensor.cpp
index 5a29d86404..1e8d740062 100644
--- a/esphome/components/adc/adc_sensor.cpp
+++ b/esphome/components/adc/adc_sensor.cpp
@@ -11,6 +11,10 @@ ADC_MODE(ADC_VCC)
 #endif
 #endif
 
+#ifdef USE_RP2040
+#include <hardware/adc.h>
+#endif
+
 namespace esphome {
 namespace adc {
 
@@ -32,9 +36,13 @@ static const int ADC_MAX = (1 << SOC_ADC_RTC_MAX_BITWIDTH) - 1;    // 4095 (12 b
 static const int ADC_HALF = (1 << SOC_ADC_RTC_MAX_BITWIDTH) >> 1;  // 2048 (12 bit) or 4096 (13 bit)
 #endif
 
-void ADCSensor::setup() {
+#ifdef USE_RP2040
+extern "C"
+#endif
+    void
+    ADCSensor::setup() {
   ESP_LOGCONFIG(TAG, "Setting up ADC '%s'...", this->get_name().c_str());
-#ifndef USE_ADC_SENSOR_VCC
+#if !defined(USE_ADC_SENSOR_VCC) && !defined(USE_RP2040)
   pin_->setup();
 #endif
 
@@ -63,6 +71,16 @@ void ADCSensor::setup() {
   }
 
 #endif  // USE_ESP32
+
+#ifdef USE_RP2040
+  static bool initialized = false;
+  if (!initialized) {
+    adc_init();
+    initialized = true;
+  }
+#endif
+
+  ESP_LOGCONFIG(TAG, "ADC '%s' setup finished!", this->get_name().c_str());
 }
 
 void ADCSensor::dump_config() {
@@ -98,6 +116,12 @@ void ADCSensor::dump_config() {
     }
   }
 #endif  // USE_ESP32
+#ifdef USE_RP2040
+  if (this->is_temperature_)
+    ESP_LOGCONFIG(TAG, "  Pin: Temperature");
+  else
+    LOG_PIN("  Pin: ", pin_);
+#endif
   LOG_UPDATE_INTERVAL(this);
 }
 
@@ -175,6 +199,29 @@ float ADCSensor::sample() {
 }
 #endif  // USE_ESP32
 
+#ifdef USE_RP2040
+float ADCSensor::sample() {
+  if (this->is_temperature_) {
+    adc_set_temp_sensor_enabled(true);
+    delay(1);
+    adc_select_input(4);
+  } else {
+    uint8_t pin = this->pin_->get_pin();
+    adc_gpio_init(pin);
+    adc_select_input(pin - 26);
+  }
+
+  int raw = adc_read();
+  if (this->is_temperature_) {
+    adc_set_temp_sensor_enabled(false);
+  }
+  if (output_raw_) {
+    return raw;
+  }
+  return raw * 3.3f / 4096.0f;
+}
+#endif
+
 #ifdef USE_ESP8266
 std::string ADCSensor::unique_id() { return get_mac_address() + "-adc"; }
 #endif
diff --git a/esphome/components/adc/adc_sensor.h b/esphome/components/adc/adc_sensor.h
index 12272a1577..22cddde6f8 100644
--- a/esphome/components/adc/adc_sensor.h
+++ b/esphome/components/adc/adc_sensor.h
@@ -38,10 +38,18 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
   std::string unique_id() override;
 #endif
 
+#ifdef USE_RP2040
+  void set_is_temperature() { is_temperature_ = true; }
+#endif
+
  protected:
   InternalGPIOPin *pin_;
   bool output_raw_{false};
 
+#ifdef USE_RP2040
+  bool is_temperature_{false};
+#endif
+
 #ifdef USE_ESP32
   adc_atten_t attenuation_{ADC_ATTEN_DB_0};
   adc1_channel_t channel_{};
diff --git a/esphome/components/adc/sensor.py b/esphome/components/adc/sensor.py
index 5443b9875a..1a519d7506 100644
--- a/esphome/components/adc/sensor.py
+++ b/esphome/components/adc/sensor.py
@@ -94,6 +94,9 @@ def validate_adc_pin(value):
     if str(value).upper() == "VCC":
         return cv.only_on_esp8266("VCC")
 
+    if str(value).upper() == "TEMPERATURE":
+        return cv.only_on_rp2040("TEMPERATURE")
+
     if CORE.is_esp32:
         value = pins.internal_gpio_input_pin_number(value)
         variant = get_esp32_variant()
@@ -117,6 +120,12 @@ def validate_adc_pin(value):
             {CONF_ANALOG: True, CONF_INPUT: True}, internal=True
         )(value)
 
+    if CORE.is_rp2040:
+        value = pins.internal_gpio_input_pin_number(value)
+        if value not in (26, 27, 28, 29):
+            raise cv.Invalid("RP2040: Only pins 26, 27, 28 and 29 support ADC.")
+        return pins.internal_gpio_input_pin_schema(value)
+
     raise NotImplementedError
 
 
@@ -160,6 +169,8 @@ async def to_code(config):
 
     if config[CONF_PIN] == "VCC":
         cg.add_define("USE_ADC_SENSOR_VCC")
+    elif config[CONF_PIN] == "TEMPERATURE":
+        cg.add(var.set_is_temperature())
     else:
         pin = await cg.gpio_pin_expression(config[CONF_PIN])
         cg.add(var.set_pin(pin))
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index afc800f3f2..90018b4d56 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -548,6 +548,7 @@ def only_with_framework(frameworks):
 
 only_on_esp32 = only_on("esp32")
 only_on_esp8266 = only_on("esp8266")
+only_on_rp2040 = only_on("rp2040")
 only_with_arduino = only_with_framework("arduino")
 only_with_esp_idf = only_with_framework("esp-idf")
 

From 98f8feb625d79b1b71b5f013ad385c4c97a218ee Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 17 Nov 2022 13:52:15 +1300
Subject: [PATCH 261/838] Bump version to 2022.11.1

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

diff --git a/esphome/const.py b/esphome/const.py
index da386cb3d8..67345c8849 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.11.0"
+__version__ = "2022.11.1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From eead72333e8d8a51fb590cb1896c2d2a3c1a042a Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 17 Nov 2022 16:14:10 +1300
Subject: [PATCH 262/838] Bump base image versions to latest (#4016)

---
 docker/Dockerfile                                | 16 +++++-----------
 .../ha-addon-rootfs/etc/cont-init.d/30-dirs.sh   |  0
 .../etc/services.d/esphome/finish                | 12 +++++++++---
 .../ha-addon-rootfs/etc/services.d/nginx/finish  | 12 +++++++++---
 4 files changed, 23 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 docker/ha-addon-rootfs/etc/cont-init.d/30-dirs.sh

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 102ef46461..a49ad5a9ef 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,17 +6,11 @@
 ARG BASEIMGTYPE=docker
 
 # https://github.com/hassio-addons/addon-debian-base/releases
-FROM ghcr.io/hassio-addons/debian-base/amd64:5.3.0 AS base-hassio-amd64
-FROM ghcr.io/hassio-addons/debian-base/aarch64:5.3.0 AS base-hassio-arm64
-FROM ghcr.io/hassio-addons/debian-base/armv7:5.3.0 AS base-hassio-armv7
+FROM ghcr.io/hassio-addons/debian-base:6.1.3 AS base-hassio
 # https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye
-FROM debian:bullseye-20220328-slim AS base-docker-amd64
-FROM debian:bullseye-20220328-slim AS base-docker-arm64
-FROM debian:bullseye-20220328-slim AS base-docker-armv7
+FROM debian:bullseye-20221024-slim AS base-docker
 
-# Use TARGETARCH/TARGETVARIANT defined by docker
-# https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
-FROM base-${BASEIMGTYPE}-${TARGETARCH}${TARGETVARIANT} AS base
+FROM base-${BASEIMGTYPE} AS base
 
 RUN \
     apt-get update \
@@ -29,8 +23,8 @@ RUN \
         python3-cryptography=3.3.2-1 \
         iputils-ping=3:20210202-1 \
         git=1:2.30.2-1 \
-        curl=7.74.0-1.3+deb11u1 \
-        openssh-client=1:8.4p1-5 \
+        curl=7.74.0-1.3+deb11u3 \
+        openssh-client=1:8.4p1-5+deb11u1 \
     && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \
diff --git a/docker/ha-addon-rootfs/etc/cont-init.d/30-dirs.sh b/docker/ha-addon-rootfs/etc/cont-init.d/30-dirs.sh
old mode 100644
new mode 100755
diff --git a/docker/ha-addon-rootfs/etc/services.d/esphome/finish b/docker/ha-addon-rootfs/etc/services.d/esphome/finish
index 789a65e90c..fed449ce61 100755
--- a/docker/ha-addon-rootfs/etc/services.d/esphome/finish
+++ b/docker/ha-addon-rootfs/etc/services.d/esphome/finish
@@ -3,7 +3,13 @@
 # Community Hass.io Add-ons: ESPHome
 # Take down the S6 supervision tree when ESPHome fails
 # ==============================================================================
-if -n { s6-test $# -ne 0 }
-if -n { s6-test ${1} -eq 256 }
 
-s6-svscanctl -t /var/run/s6/services
+declare APP_EXIT_CODE=${1}
+
+if [[ "${APP_EXIT_CODE}" -ne 0 ]] && [[ "${APP_EXIT_CODE}" -ne 256 ]]; then
+  bashio::log.warning "Halt add-on with exit code ${APP_EXIT_CODE}"
+  echo "${APP_EXIT_CODE}" > /run/s6-linux-init-container-results/exitcode
+  exec /run/s6/basedir/bin/halt
+fi
+
+bashio::log.info "Service restart after closing"
diff --git a/docker/ha-addon-rootfs/etc/services.d/nginx/finish b/docker/ha-addon-rootfs/etc/services.d/nginx/finish
index 953f3771e0..8030841ec8 100755
--- a/docker/ha-addon-rootfs/etc/services.d/nginx/finish
+++ b/docker/ha-addon-rootfs/etc/services.d/nginx/finish
@@ -3,7 +3,13 @@
 # Community Hass.io Add-ons: ESPHome
 # Take down the S6 supervision tree when NGINX fails
 # ==============================================================================
-if -n { s6-test $# -ne 0 }
-if -n { s6-test ${1} -eq 256 }
 
-s6-svscanctl -t /var/run/s6/services
+declare APP_EXIT_CODE=${1}
+
+if [[ "${APP_EXIT_CODE}" -ne 0 ]] && [[ "${APP_EXIT_CODE}" -ne 256 ]]; then
+  bashio::log.warning "Halt add-on with exit code ${APP_EXIT_CODE}"
+  echo "${APP_EXIT_CODE}" > /run/s6-linux-init-container-results/exitcode
+  exec /run/s6/basedir/bin/halt
+fi
+
+bashio::log.info "Service restart after closing"

From d8746266625c5a4c9127577297876e445cffe859 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Thu, 17 Nov 2022 20:01:28 +0100
Subject: [PATCH 263/838] Add number device class support (#4042)

---
 esphome/components/api/api.proto            |  1 +
 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_number.cpp     |  2 +
 esphome/components/number/__init__.py       | 81 +++++++++++++++++++++
 esphome/components/number/number.h          |  3 +
 esphome/components/number/number_traits.cpp |  8 ++
 esphome/components/number/number_traits.h   |  5 ++
 tests/test5.yaml                            |  1 +
 10 files changed, 112 insertions(+)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 5df35f7978..623ab6b009 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -915,6 +915,7 @@ message ListEntitiesNumberResponse {
   EntityCategory entity_category = 10;
   string unit_of_measurement = 11;
   NumberMode mode = 12;
+  string device_class = 13;
 }
 message NumberStateResponse {
   option (id) = 50;
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 5227750cc0..d56f4e7a40 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -616,6 +616,7 @@ bool APIConnection::send_number_info(number::Number *number) {
   msg.entity_category = static_cast<enums::EntityCategory>(number->get_entity_category());
   msg.unit_of_measurement = number->traits.get_unit_of_measurement();
   msg.mode = static_cast<enums::NumberMode>(number->traits.get_mode());
+  msg.device_class = number->traits.get_device_class();
 
   msg.min_value = number->traits.get_min_value();
   msg.max_value = number->traits.get_max_value();
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 03d09a0913..bbe1da3209 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -3942,6 +3942,10 @@ bool ListEntitiesNumberResponse::decode_length(uint32_t field_id, ProtoLengthDel
       this->unit_of_measurement = value.as_string();
       return true;
     }
+    case 13: {
+      this->device_class = value.as_string();
+      return true;
+    }
     default:
       return false;
   }
@@ -3981,6 +3985,7 @@ void ListEntitiesNumberResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_enum<enums::EntityCategory>(10, this->entity_category);
   buffer.encode_string(11, this->unit_of_measurement);
   buffer.encode_enum<enums::NumberMode>(12, this->mode);
+  buffer.encode_string(13, this->device_class);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesNumberResponse::dump_to(std::string &out) const {
@@ -4037,6 +4042,10 @@ void ListEntitiesNumberResponse::dump_to(std::string &out) const {
   out.append("  mode: ");
   out.append(proto_enum_to_string<enums::NumberMode>(this->mode));
   out.append("\n");
+
+  out.append("  device_class: ");
+  out.append("'").append(this->device_class).append("'");
+  out.append("\n");
   out.append("}");
 }
 #endif
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 2ca0853951..3aee31b1bf 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -1004,6 +1004,7 @@ class ListEntitiesNumberResponse : public ProtoMessage {
   enums::EntityCategory entity_category{};
   std::string unit_of_measurement{};
   enums::NumberMode mode{};
+  std::string device_class{};
   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_number.cpp b/esphome/components/mqtt/mqtt_number.cpp
index 7018792283..3a6ea97967 100644
--- a/esphome/components/mqtt/mqtt_number.cpp
+++ b/esphome/components/mqtt/mqtt_number.cpp
@@ -55,6 +55,8 @@ void MQTTNumberComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryCon
       root[MQTT_MODE] = "slider";
       break;
   }
+  if (!this->number_->traits.get_device_class().empty())
+    root[MQTT_DEVICE_CLASS] = this->number_->traits.get_device_class();
 
   config.command_topic = true;
 }
diff --git a/esphome/components/number/__init__.py b/esphome/components/number/__init__.py
index f809fff529..ec4dead42e 100644
--- a/esphome/components/number/__init__.py
+++ b/esphome/components/number/__init__.py
@@ -6,6 +6,7 @@ from esphome.components import mqtt
 from esphome.const import (
     CONF_ABOVE,
     CONF_BELOW,
+    CONF_DEVICE_CLASS,
     CONF_ID,
     CONF_MODE,
     CONF_ON_VALUE,
@@ -16,11 +17,87 @@ from esphome.const import (
     CONF_VALUE,
     CONF_OPERATION,
     CONF_CYCLE,
+    DEVICE_CLASS_DISTANCE,
+    DEVICE_CLASS_EMPTY,
+    DEVICE_CLASS_APPARENT_POWER,
+    DEVICE_CLASS_AQI,
+    DEVICE_CLASS_BATTERY,
+    DEVICE_CLASS_CARBON_DIOXIDE,
+    DEVICE_CLASS_CARBON_MONOXIDE,
+    DEVICE_CLASS_CURRENT,
+    DEVICE_CLASS_ENERGY,
+    DEVICE_CLASS_FREQUENCY,
+    DEVICE_CLASS_GAS,
+    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_ILLUMINANCE,
+    DEVICE_CLASS_MOISTURE,
+    DEVICE_CLASS_MONETARY,
+    DEVICE_CLASS_NITROGEN_DIOXIDE,
+    DEVICE_CLASS_NITROGEN_MONOXIDE,
+    DEVICE_CLASS_NITROUS_OXIDE,
+    DEVICE_CLASS_OZONE,
+    DEVICE_CLASS_PM1,
+    DEVICE_CLASS_PM10,
+    DEVICE_CLASS_PM25,
+    DEVICE_CLASS_POWER,
+    DEVICE_CLASS_POWER_FACTOR,
+    DEVICE_CLASS_PRECIPITATION_INTENSITY,
+    DEVICE_CLASS_PRESSURE,
+    DEVICE_CLASS_REACTIVE_POWER,
+    DEVICE_CLASS_SIGNAL_STRENGTH,
+    DEVICE_CLASS_SPEED,
+    DEVICE_CLASS_SULPHUR_DIOXIDE,
+    DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
+    DEVICE_CLASS_VOLTAGE,
+    DEVICE_CLASS_VOLUME,
+    DEVICE_CLASS_WATER,
+    DEVICE_CLASS_WIND_SPEED,
+    DEVICE_CLASS_WEIGHT,
 )
 from esphome.core import CORE, coroutine_with_priority
 from esphome.cpp_helpers import setup_entity
 
 CODEOWNERS = ["@esphome/core"]
+DEVICE_CLASSES = [
+    DEVICE_CLASS_APPARENT_POWER,
+    DEVICE_CLASS_AQI,
+    DEVICE_CLASS_BATTERY,
+    DEVICE_CLASS_CARBON_DIOXIDE,
+    DEVICE_CLASS_CARBON_MONOXIDE,
+    DEVICE_CLASS_CURRENT,
+    DEVICE_CLASS_DISTANCE,
+    DEVICE_CLASS_EMPTY,
+    DEVICE_CLASS_ENERGY,
+    DEVICE_CLASS_FREQUENCY,
+    DEVICE_CLASS_GAS,
+    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_ILLUMINANCE,
+    DEVICE_CLASS_MOISTURE,
+    DEVICE_CLASS_MONETARY,
+    DEVICE_CLASS_NITROGEN_DIOXIDE,
+    DEVICE_CLASS_NITROGEN_MONOXIDE,
+    DEVICE_CLASS_NITROUS_OXIDE,
+    DEVICE_CLASS_OZONE,
+    DEVICE_CLASS_PM1,
+    DEVICE_CLASS_PM10,
+    DEVICE_CLASS_PM25,
+    DEVICE_CLASS_POWER_FACTOR,
+    DEVICE_CLASS_POWER,
+    DEVICE_CLASS_PRECIPITATION_INTENSITY,
+    DEVICE_CLASS_PRESSURE,
+    DEVICE_CLASS_REACTIVE_POWER,
+    DEVICE_CLASS_SIGNAL_STRENGTH,
+    DEVICE_CLASS_SPEED,
+    DEVICE_CLASS_SULPHUR_DIOXIDE,
+    DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
+    DEVICE_CLASS_VOLTAGE,
+    DEVICE_CLASS_VOLUME,
+    DEVICE_CLASS_WATER,
+    DEVICE_CLASS_WEIGHT,
+    DEVICE_CLASS_WIND_SPEED,
+]
 IS_PLATFORM_COMPONENT = True
 
 number_ns = cg.esphome_ns.namespace("number")
@@ -62,6 +139,7 @@ NUMBER_OPERATION_OPTIONS = {
 }
 
 icon = cv.icon
+validate_device_class = cv.one_of(*DEVICE_CLASSES, lower=True, space="_")
 
 NUMBER_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).extend(
     {
@@ -82,6 +160,7 @@ NUMBER_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).e
         ),
         cv.Optional(CONF_UNIT_OF_MEASUREMENT): cv.string_strict,
         cv.Optional(CONF_MODE, default="AUTO"): cv.enum(NUMBER_MODES, upper=True),
+        cv.Optional(CONF_DEVICE_CLASS): validate_device_class,
     }
 )
 
@@ -117,6 +196,8 @@ async def setup_number_core_(
     if CONF_MQTT_ID in config:
         mqtt_ = cg.new_Pvariable(config[CONF_MQTT_ID], var)
         await mqtt.register_mqtt_component(mqtt_, config)
+    if CONF_DEVICE_CLASS in config:
+        cg.add(var.traits.set_device_class(config[CONF_DEVICE_CLASS]))
 
 
 async def register_number(
diff --git a/esphome/components/number/number.h b/esphome/components/number/number.h
index 7f360cad7b..4f63e0480c 100644
--- a/esphome/components/number/number.h
+++ b/esphome/components/number/number.h
@@ -18,6 +18,9 @@ namespace number {
     if (!(obj)->traits.get_unit_of_measurement().empty()) { \
       ESP_LOGCONFIG(TAG, "%s  Unit of Measurement: '%s'", prefix, (obj)->traits.get_unit_of_measurement().c_str()); \
     } \
+    if (!(obj)->traits.get_device_class().empty()) { \
+      ESP_LOGCONFIG(TAG, "%s  Device Class: '%s'", prefix, (obj)->traits.get_device_class().c_str()); \
+    } \
   }
 
 class Number;
diff --git a/esphome/components/number/number_traits.cpp b/esphome/components/number/number_traits.cpp
index dcd05daa2a..1554f8d9c9 100644
--- a/esphome/components/number/number_traits.cpp
+++ b/esphome/components/number/number_traits.cpp
@@ -16,5 +16,13 @@ std::string NumberTraits::get_unit_of_measurement() {
   return "";
 }
 
+void NumberTraits::set_device_class(const std::string &device_class) { this->device_class_ = device_class; }
+
+std::string NumberTraits::get_device_class() {
+  if (this->device_class_.has_value())
+    return *this->device_class_;
+  return "";
+}
+
 }  // namespace number
 }  // namespace esphome
diff --git a/esphome/components/number/number_traits.h b/esphome/components/number/number_traits.h
index 47756ff66f..ee10b0010c 100644
--- a/esphome/components/number/number_traits.h
+++ b/esphome/components/number/number_traits.h
@@ -32,12 +32,17 @@ class NumberTraits {
   void set_mode(NumberMode mode) { this->mode_ = mode; }
   NumberMode get_mode() const { return this->mode_; }
 
+  // Set/get the device class.
+  void set_device_class(const std::string &device_class);
+  std::string get_device_class();
+
  protected:
   float min_value_ = NAN;
   float max_value_ = NAN;
   float step_ = NAN;
   optional<std::string> unit_of_measurement_;  ///< Unit of measurement override
   NumberMode mode_{NUMBER_MODE_AUTO};
+  optional<std::string> device_class_;
 };
 
 }  // namespace number
diff --git a/tests/test5.yaml b/tests/test5.yaml
index 131d2f5b7f..30416fad01 100644
--- a/tests/test5.yaml
+++ b/tests/test5.yaml
@@ -240,6 +240,7 @@ number:
     step: 5
     unit_of_measurement: "%"
     mode: slider
+    device_class: humidity
     on_value:
       - logger.log:
           format: Number changed to %f

From c2e198311ca73112fa7c9c213101277200085a6f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 21 Nov 2022 11:49:30 +1300
Subject: [PATCH 264/838] Update esp32 arduino and platform versions (#3564)

---
 esphome/components/dallas/esp_one_wire.cpp    |   4 +-
 esphome/components/esp32/__init__.py          |   8 +-
 esphome/components/esp32/boards.py            |  49 ++++-
 .../esp32/{gpio_idf.cpp => gpio.cpp}          |  30 ++-
 .../components/esp32/{gpio_idf.h => gpio.h}   |   6 +-
 esphome/components/esp32/gpio.py              |  21 +-
 esphome/components/esp32/gpio_arduino.cpp     | 114 -----------
 esphome/components/esp32/gpio_arduino.h       |  36 ----
 .../components/esp32_camera/esp32_camera.cpp  |   6 +-
 esphome/components/ethernet/__init__.py       |  15 +-
 .../ethernet/ethernet_component.cpp           | 193 ++++++++++--------
 .../components/ethernet/ethernet_component.h  |  29 +--
 .../ethernet_info/ethernet_info_text_sensor.h |   4 +-
 esphome/components/shelly_dimmer/dev_table.h  |   3 +-
 esphome/components/shelly_dimmer/light.py     |   2 +-
 .../shelly_dimmer/shelly_dimmer.cpp           |   4 +
 .../components/shelly_dimmer/shelly_dimmer.h  |   4 +
 .../components/shelly_dimmer/stm32flash.cpp   |   3 +-
 .../wifi/wifi_component_esp32_arduino.cpp     |   3 +-
 esphome/core/defines.h                        |  17 +-
 platformio.ini                                |   4 +-
 script/clang-tidy                             |   1 +
 tests/test1.yaml                              |  12 --
 tests/test3.yaml                              |  15 ++
 24 files changed, 256 insertions(+), 327 deletions(-)
 rename esphome/components/esp32/{gpio_idf.cpp => gpio.cpp} (81%)
 rename esphome/components/esp32/{gpio_idf.h => gpio.h} (90%)
 delete mode 100644 esphome/components/esp32/gpio_arduino.cpp
 delete mode 100644 esphome/components/esp32/gpio_arduino.h

diff --git a/esphome/components/dallas/esp_one_wire.cpp b/esphome/components/dallas/esp_one_wire.cpp
index 5bd0f42855..32ddf07fb6 100644
--- a/esphome/components/dallas/esp_one_wire.cpp
+++ b/esphome/components/dallas/esp_one_wire.cpp
@@ -85,9 +85,7 @@ bool HOT IRAM_ATTR ESPOneWire::read_bit() {
   // whereas on esp-idf it already happens during the pin_mode(OUTPUT)
   // manually correct for this with these constants.
 
-#ifdef USE_ESP32_FRAMEWORK_ARDUINO
-  uint32_t timing_constant = 14;
-#elif defined(USE_ESP32_FRAMEWORK_ESP_IDF)
+#ifdef USE_ESP32
   uint32_t timing_constant = 12;
 #else
   uint32_t timing_constant = 14;
diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index 478c9701b8..1a52ee7314 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -129,11 +129,11 @@ def _format_framework_espidf_version(ver: cv.Version) -> str:
 # The default/recommended arduino framework version
 #  - https://github.com/espressif/arduino-esp32/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/tool/framework-arduinoespressif32
-RECOMMENDED_ARDUINO_FRAMEWORK_VERSION = cv.Version(1, 0, 6)
+RECOMMENDED_ARDUINO_FRAMEWORK_VERSION = cv.Version(2, 0, 5)
 # The platformio/espressif32 version to use for arduino frameworks
 #  - https://github.com/platformio/platform-espressif32/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif32
-ARDUINO_PLATFORM_VERSION = cv.Version(3, 5, 0)
+ARDUINO_PLATFORM_VERSION = cv.Version(5, 2, 0)
 
 # The default/recommended esp-idf framework version
 #  - https://github.com/espressif/esp-idf/releases
@@ -148,8 +148,8 @@ ESP_IDF_PLATFORM_VERSION = cv.Version(3, 5, 0)
 def _arduino_check_versions(value):
     value = value.copy()
     lookups = {
-        "dev": (cv.Version(2, 0, 0), "https://github.com/espressif/arduino-esp32.git"),
-        "latest": (cv.Version(1, 0, 6), None),
+        "dev": (cv.Version(2, 0, 5), "https://github.com/espressif/arduino-esp32.git"),
+        "latest": (cv.Version(2, 0, 5), None),
         "recommended": (RECOMMENDED_ARDUINO_FRAMEWORK_VERSION, None),
     }
 
diff --git a/esphome/components/esp32/boards.py b/esphome/components/esp32/boards.py
index f14aeefea2..e92c7e64dc 100644
--- a/esphome/components/esp32/boards.py
+++ b/esphome/components/esp32/boards.py
@@ -1,4 +1,4 @@
-from .const import VARIANT_ESP32, VARIANT_ESP32S2, VARIANT_ESP32C3
+from .const import VARIANT_ESP32, VARIANT_ESP32S2, VARIANT_ESP32C3, VARIANT_ESP32S3
 
 ESP32_BASE_PINS = {
     "TX": 1,
@@ -1000,12 +1000,30 @@ done | sort
 """
 
 BOARD_TO_VARIANT = {
+    "adafruit_feather_esp32s2_tft": VARIANT_ESP32S2,
+    "adafruit_feather_esp32s3": VARIANT_ESP32S3,
+    "adafruit_feather_esp32_v2": VARIANT_ESP32,
+    "adafruit_funhouse_esp32s2": VARIANT_ESP32S2,
+    "adafruit_magtag29_esp32s2": VARIANT_ESP32S2,
+    "adafruit_metro_esp32s2": VARIANT_ESP32S2,
+    "adafruit_qtpy_esp32c3": VARIANT_ESP32C3,
+    "adafruit_qtpy_esp32s2": VARIANT_ESP32S2,
+    "adafruit_qtpy_esp32s3": VARIANT_ESP32S3,
+    "adafruit_qtpy_esp32": VARIANT_ESP32,
+    "airm2m_core_esp32c3": VARIANT_ESP32C3,
     "alksesp32": VARIANT_ESP32,
+    "atmegazero_esp32s2": VARIANT_ESP32S2,
     "az-delivery-devkit-v4": VARIANT_ESP32,
     "bpi-bit": VARIANT_ESP32,
     "briki_abc_esp32": VARIANT_ESP32,
     "briki_mbc-wb_esp32": VARIANT_ESP32,
     "d-duino-32": VARIANT_ESP32,
+    "deneyapkart1A": VARIANT_ESP32,
+    "deneyapkart": VARIANT_ESP32,
+    "deneyapmini": VARIANT_ESP32S2,
+    "denky32": VARIANT_ESP32,
+    "denky_d4": VARIANT_ESP32,
+    "dpu_esp32": VARIANT_ESP32,
     "esp320": VARIANT_ESP32,
     "esp32-c3-devkitm-1": VARIANT_ESP32C3,
     "esp32cam": VARIANT_ESP32,
@@ -1018,8 +1036,12 @@ BOARD_TO_VARIANT = {
     "esp32-poe-iso": VARIANT_ESP32,
     "esp32-poe": VARIANT_ESP32,
     "esp32-pro": VARIANT_ESP32,
+    "esp32-s2-franzininho": VARIANT_ESP32S2,
     "esp32-s2-kaluga-1": VARIANT_ESP32S2,
     "esp32-s2-saola-1": VARIANT_ESP32S2,
+    "esp32s3box": VARIANT_ESP32S3,
+    "esp32s3camlcd": VARIANT_ESP32S3,
+    "esp32-s3-devkitc-1": VARIANT_ESP32S3,
     "esp32thing_plus": VARIANT_ESP32,
     "esp32thing": VARIANT_ESP32,
     "esp32vn-iot-uno": VARIANT_ESP32,
@@ -1032,6 +1054,8 @@ BOARD_TO_VARIANT = {
     "featheresp32": VARIANT_ESP32,
     "firebeetle32": VARIANT_ESP32,
     "fm-devkit": VARIANT_ESP32,
+    "franzininho_wifi_esp32s2": VARIANT_ESP32S2,
+    "franzininho_wifi_msc_esp32s2": VARIANT_ESP32S2,
     "frogboard": VARIANT_ESP32,
     "healthypi4": VARIANT_ESP32,
     "heltec_wifi_kit_32_v2": VARIANT_ESP32,
@@ -1049,13 +1073,17 @@ BOARD_TO_VARIANT = {
     "iotaap_magnolia": VARIANT_ESP32,
     "iotbusio": VARIANT_ESP32,
     "iotbusproteus": VARIANT_ESP32,
+    "kb32-ft": VARIANT_ESP32,
     "kits-edu": VARIANT_ESP32,
     "labplus_mpython": VARIANT_ESP32,
+    "lionbit": VARIANT_ESP32,
     "lolin32_lite": VARIANT_ESP32,
     "lolin32": VARIANT_ESP32,
     "lolin_c3_mini": VARIANT_ESP32C3,
     "lolin_d32_pro": VARIANT_ESP32,
     "lolin_d32": VARIANT_ESP32,
+    "lolin_s2_mini": VARIANT_ESP32S2,
+    "lolin_s2_pico": VARIANT_ESP32S2,
     "lopy4": VARIANT_ESP32,
     "lopy": VARIANT_ESP32,
     "m5stack-atom": VARIANT_ESP32,
@@ -1072,6 +1100,7 @@ BOARD_TO_VARIANT = {
     "mhetesp32devkit": VARIANT_ESP32,
     "mhetesp32minikit": VARIANT_ESP32,
     "microduino-core-esp32": VARIANT_ESP32,
+    "micros2": VARIANT_ESP32S2,
     "nano32": VARIANT_ESP32,
     "nina_w10": VARIANT_ESP32,
     "node32s": VARIANT_ESP32,
@@ -1089,8 +1118,13 @@ BOARD_TO_VARIANT = {
     "sensesiot_weizen": VARIANT_ESP32,
     "sg-o_airMon": VARIANT_ESP32,
     "s_odi_ultra": VARIANT_ESP32,
+    "sparkfun_esp32micromod": VARIANT_ESP32,
+    "sparkfun_esp32s2_thing_plus": VARIANT_ESP32S2,
     "sparkfun_lora_gateway_1-channel": VARIANT_ESP32,
     "tinypico": VARIANT_ESP32,
+    "trueverit-iot-driver-mk2": VARIANT_ESP32,
+    "trueverit-iot-driver-mk3": VARIANT_ESP32,
+    "trueverit-iot-driver": VARIANT_ESP32,
     "ttgo-lora32-v1": VARIANT_ESP32,
     "ttgo-lora32-v21": VARIANT_ESP32,
     "ttgo-lora32-v2": VARIANT_ESP32,
@@ -1098,13 +1132,26 @@ BOARD_TO_VARIANT = {
     "ttgo-t7-v13-mini32": VARIANT_ESP32,
     "ttgo-t7-v14-mini32": VARIANT_ESP32,
     "ttgo-t-beam": VARIANT_ESP32,
+    "ttgo-t-oi-plus": VARIANT_ESP32C3,
     "ttgo-t-watch": VARIANT_ESP32,
     "turta_iot_node": VARIANT_ESP32,
+    "um_feathers2_neo": VARIANT_ESP32S2,
+    "um_feathers2": VARIANT_ESP32S2,
+    "um_feathers3": VARIANT_ESP32S3,
+    "um_pros3": VARIANT_ESP32S3,
+    "um_rmp": VARIANT_ESP32S2,
+    "um_tinys2": VARIANT_ESP32S2,
+    "um_tinys3": VARIANT_ESP32S3,
+    "upesy_wroom": VARIANT_ESP32,
+    "upesy_wrover": VARIANT_ESP32,
     "vintlabs-devkit-v1": VARIANT_ESP32,
+    "watchy": VARIANT_ESP32,
     "wemosbat": VARIANT_ESP32,
     "wemos_d1_mini32": VARIANT_ESP32,
     "wesp32": VARIANT_ESP32,
     "widora-air": VARIANT_ESP32,
     "wifiduino32": VARIANT_ESP32,
+    "wipy3": VARIANT_ESP32,
+    "wt32-eth01": VARIANT_ESP32,
     "xinabox_cw02": VARIANT_ESP32,
 }
diff --git a/esphome/components/esp32/gpio_idf.cpp b/esphome/components/esp32/gpio.cpp
similarity index 81%
rename from esphome/components/esp32/gpio_idf.cpp
rename to esphome/components/esp32/gpio.cpp
index 498843ebff..c7146c8872 100644
--- a/esphome/components/esp32/gpio_idf.cpp
+++ b/esphome/components/esp32/gpio.cpp
@@ -1,6 +1,6 @@
-#ifdef USE_ESP32_FRAMEWORK_ESP_IDF
+#ifdef USE_ESP32
 
-#include "gpio_idf.h"
+#include "gpio.h"
 #include "esphome/core/log.h"
 
 namespace esphome {
@@ -8,13 +8,11 @@ namespace esp32 {
 
 static const char *const TAG = "esp32";
 
-bool IDFInternalGPIOPin::isr_service_installed = false;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+bool ESP32InternalGPIOPin::isr_service_installed = false;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
 static gpio_mode_t IRAM_ATTR flags_to_mode(gpio::Flags flags) {
   flags = (gpio::Flags)(flags & ~(gpio::FLAG_PULLUP | gpio::FLAG_PULLDOWN));
-  if (flags == gpio::FLAG_NONE) {
-    return GPIO_MODE_DISABLE;
-  } else if (flags == gpio::FLAG_INPUT) {
+  if (flags == gpio::FLAG_INPUT) {
     return GPIO_MODE_INPUT;
   } else if (flags == gpio::FLAG_OUTPUT) {
     return GPIO_MODE_OUTPUT;
@@ -25,7 +23,7 @@ static gpio_mode_t IRAM_ATTR flags_to_mode(gpio::Flags flags) {
   } else if (flags == (gpio::FLAG_INPUT | gpio::FLAG_OUTPUT)) {
     return GPIO_MODE_INPUT_OUTPUT;
   } else {
-    // unsupported
+    // unsupported or gpio::FLAG_NONE
     return GPIO_MODE_DISABLE;
   }
 }
@@ -35,14 +33,14 @@ struct ISRPinArg {
   bool inverted;
 };
 
-ISRInternalGPIOPin IDFInternalGPIOPin::to_isr() const {
+ISRInternalGPIOPin ESP32InternalGPIOPin::to_isr() const {
   auto *arg = new ISRPinArg{};  // NOLINT(cppcoreguidelines-owning-memory)
   arg->pin = pin_;
   arg->inverted = inverted_;
   return ISRInternalGPIOPin((void *) arg);
 }
 
-void IDFInternalGPIOPin::attach_interrupt(void (*func)(void *), void *arg, gpio::InterruptType type) const {
+void ESP32InternalGPIOPin::attach_interrupt(void (*func)(void *), void *arg, gpio::InterruptType type) const {
   gpio_int_type_t idf_type = GPIO_INTR_ANYEDGE;
   switch (type) {
     case gpio::INTERRUPT_RISING_EDGE:
@@ -74,13 +72,13 @@ void IDFInternalGPIOPin::attach_interrupt(void (*func)(void *), void *arg, gpio:
   gpio_isr_handler_add(pin_, func, arg);
 }
 
-std::string IDFInternalGPIOPin::dump_summary() const {
+std::string ESP32InternalGPIOPin::dump_summary() const {
   char buffer[32];
   snprintf(buffer, sizeof(buffer), "GPIO%u", static_cast<uint32_t>(pin_));
   return buffer;
 }
 
-void IDFInternalGPIOPin::setup() {
+void ESP32InternalGPIOPin::setup() {
   gpio_config_t conf{};
   conf.pin_bit_mask = 1ULL << static_cast<uint32_t>(pin_);
   conf.mode = flags_to_mode(flags_);
@@ -91,7 +89,7 @@ void IDFInternalGPIOPin::setup() {
   gpio_set_drive_capability(pin_, drive_strength_);
 }
 
-void IDFInternalGPIOPin::pin_mode(gpio::Flags flags) {
+void ESP32InternalGPIOPin::pin_mode(gpio::Flags flags) {
   // can't call gpio_config here because that logs in esp-idf which may cause issues
   gpio_set_direction(pin_, flags_to_mode(flags));
   gpio_pull_mode_t pull_mode = GPIO_FLOATING;
@@ -105,9 +103,9 @@ void IDFInternalGPIOPin::pin_mode(gpio::Flags flags) {
   gpio_set_pull_mode(pin_, pull_mode);
 }
 
-bool IDFInternalGPIOPin::digital_read() { return bool(gpio_get_level(pin_)) != inverted_; }
-void IDFInternalGPIOPin::digital_write(bool value) { gpio_set_level(pin_, value != inverted_ ? 1 : 0); }
-void IDFInternalGPIOPin::detach_interrupt() const { gpio_intr_disable(pin_); }
+bool ESP32InternalGPIOPin::digital_read() { return bool(gpio_get_level(pin_)) != inverted_; }
+void ESP32InternalGPIOPin::digital_write(bool value) { gpio_set_level(pin_, value != inverted_ ? 1 : 0); }
+void ESP32InternalGPIOPin::detach_interrupt() const { gpio_intr_disable(pin_); }
 
 }  // namespace esp32
 
@@ -140,4 +138,4 @@ void IRAM_ATTR ISRInternalGPIOPin::pin_mode(gpio::Flags flags) {
 
 }  // namespace esphome
 
-#endif  // USE_ESP32_FRAMEWORK_ESP_IDF
+#endif  // USE_ESP32
diff --git a/esphome/components/esp32/gpio_idf.h b/esphome/components/esp32/gpio.h
similarity index 90%
rename from esphome/components/esp32/gpio_idf.h
rename to esphome/components/esp32/gpio.h
index a07d11378a..23b723e0b4 100644
--- a/esphome/components/esp32/gpio_idf.h
+++ b/esphome/components/esp32/gpio.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#ifdef USE_ESP32_FRAMEWORK_ESP_IDF
+#ifdef USE_ESP32
 #include "esphome/core/hal.h"
 #include <driver/gpio.h>
 
 namespace esphome {
 namespace esp32 {
 
-class IDFInternalGPIOPin : public InternalGPIOPin {
+class ESP32InternalGPIOPin : public InternalGPIOPin {
  public:
   void set_pin(gpio_num_t pin) { pin_ = pin; }
   void set_inverted(bool inverted) { inverted_ = inverted; }
@@ -37,4 +37,4 @@ class IDFInternalGPIOPin : public InternalGPIOPin {
 }  // namespace esp32
 }  // namespace esphome
 
-#endif  // USE_ESP32_FRAMEWORK_ESP_IDF
+#endif  // USE_ESP32
diff --git a/esphome/components/esp32/gpio.py b/esphome/components/esp32/gpio.py
index 518514a6a3..cde9964545 100644
--- a/esphome/components/esp32/gpio.py
+++ b/esphome/components/esp32/gpio.py
@@ -38,8 +38,7 @@ from .gpio_esp32_s3 import esp32_s3_validate_gpio_pin, esp32_s3_validate_support
 from .gpio_esp32_h2 import esp32_h2_validate_gpio_pin, esp32_h2_validate_supports
 
 
-IDFInternalGPIOPin = esp32_ns.class_("IDFInternalGPIOPin", cg.InternalGPIOPin)
-ArduinoInternalGPIOPin = esp32_ns.class_("ArduinoInternalGPIOPin", cg.InternalGPIOPin)
+ESP32InternalGPIOPin = esp32_ns.class_("ESP32InternalGPIOPin", cg.InternalGPIOPin)
 
 
 def _lookup_pin(value):
@@ -169,18 +168,10 @@ DRIVE_STRENGTHS = {
 gpio_num_t = cg.global_ns.enum("gpio_num_t")
 
 
-def _choose_pin_declaration(value):
-    if CORE.using_esp_idf:
-        return cv.declare_id(IDFInternalGPIOPin)(value)
-    if CORE.using_arduino:
-        return cv.declare_id(ArduinoInternalGPIOPin)(value)
-    raise NotImplementedError
-
-
 CONF_DRIVE_STRENGTH = "drive_strength"
 ESP32_PIN_SCHEMA = cv.All(
     {
-        cv.GenerateID(): _choose_pin_declaration,
+        cv.GenerateID(): cv.declare_id(ESP32InternalGPIOPin),
         cv.Required(CONF_NUMBER): validate_gpio_pin,
         cv.Optional(CONF_MODE, default={}): cv.Schema(
             {
@@ -192,8 +183,7 @@ ESP32_PIN_SCHEMA = cv.All(
             }
         ),
         cv.Optional(CONF_INVERTED, default=False): cv.boolean,
-        cv.SplitDefault(CONF_DRIVE_STRENGTH, esp32_idf="20mA"): cv.All(
-            cv.only_with_esp_idf,
+        cv.Optional(CONF_DRIVE_STRENGTH, default="20mA"): cv.All(
             cv.float_with_unit("current", "mA", optional_unit=True),
             cv.enum(DRIVE_STRENGTHS),
         ),
@@ -206,10 +196,7 @@ ESP32_PIN_SCHEMA = cv.All(
 async def esp32_pin_to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     num = config[CONF_NUMBER]
-    if CORE.using_esp_idf:
-        cg.add(var.set_pin(getattr(gpio_num_t, f"GPIO_NUM_{num}")))
-    else:
-        cg.add(var.set_pin(num))
+    cg.add(var.set_pin(getattr(gpio_num_t, f"GPIO_NUM_{num}")))
     cg.add(var.set_inverted(config[CONF_INVERTED]))
     if CONF_DRIVE_STRENGTH in config:
         cg.add(var.set_drive_strength(config[CONF_DRIVE_STRENGTH]))
diff --git a/esphome/components/esp32/gpio_arduino.cpp b/esphome/components/esp32/gpio_arduino.cpp
deleted file mode 100644
index ba92894f97..0000000000
--- a/esphome/components/esp32/gpio_arduino.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-#ifdef USE_ESP32_FRAMEWORK_ARDUINO
-
-#include "gpio_arduino.h"
-#include "esphome/core/log.h"
-#include <esp32-hal-gpio.h>
-
-namespace esphome {
-namespace esp32 {
-
-static const char *const TAG = "esp32";
-
-static int IRAM_ATTR flags_to_mode(gpio::Flags flags) {
-  if (flags == gpio::FLAG_INPUT) {
-    return INPUT;
-  } else if (flags == gpio::FLAG_OUTPUT) {
-    return OUTPUT;
-  } else if (flags == (gpio::FLAG_INPUT | gpio::FLAG_PULLUP)) {
-    return INPUT_PULLUP;
-  } else if (flags == (gpio::FLAG_INPUT | gpio::FLAG_PULLDOWN)) {
-    return INPUT_PULLDOWN;
-  } else if (flags == (gpio::FLAG_OUTPUT | gpio::FLAG_OPEN_DRAIN)) {
-    return OUTPUT_OPEN_DRAIN;
-  } else {
-    return 0;
-  }
-}
-
-struct ISRPinArg {
-  uint8_t pin;
-  bool inverted;
-};
-
-ISRInternalGPIOPin ArduinoInternalGPIOPin::to_isr() const {
-  auto *arg = new ISRPinArg{};  // NOLINT(cppcoreguidelines-owning-memory)
-  arg->pin = pin_;
-  arg->inverted = inverted_;
-  return ISRInternalGPIOPin((void *) arg);
-}
-
-void ArduinoInternalGPIOPin::attach_interrupt(void (*func)(void *), void *arg, gpio::InterruptType type) const {
-  uint8_t arduino_mode = DISABLED;
-  switch (type) {
-    case gpio::INTERRUPT_RISING_EDGE:
-      arduino_mode = inverted_ ? FALLING : RISING;
-      break;
-    case gpio::INTERRUPT_FALLING_EDGE:
-      arduino_mode = inverted_ ? RISING : FALLING;
-      break;
-    case gpio::INTERRUPT_ANY_EDGE:
-      arduino_mode = CHANGE;
-      break;
-    case gpio::INTERRUPT_LOW_LEVEL:
-      arduino_mode = inverted_ ? ONHIGH : ONLOW;
-      break;
-    case gpio::INTERRUPT_HIGH_LEVEL:
-      arduino_mode = inverted_ ? ONLOW : ONHIGH;
-      break;
-  }
-
-  attachInterruptArg(pin_, func, arg, arduino_mode);
-}
-
-void ArduinoInternalGPIOPin::pin_mode(gpio::Flags flags) {
-  pinMode(pin_, flags_to_mode(flags));  // NOLINT
-}
-
-std::string ArduinoInternalGPIOPin::dump_summary() const {
-  char buffer[32];
-  snprintf(buffer, sizeof(buffer), "GPIO%u", pin_);
-  return buffer;
-}
-
-bool ArduinoInternalGPIOPin::digital_read() {
-  return bool(digitalRead(pin_)) != inverted_;  // NOLINT
-}
-void ArduinoInternalGPIOPin::digital_write(bool value) {
-  digitalWrite(pin_, value != inverted_ ? 1 : 0);  // NOLINT
-}
-void ArduinoInternalGPIOPin::detach_interrupt() const {
-  detachInterrupt(pin_);  // NOLINT
-}
-
-}  // namespace esp32
-
-using namespace esp32;
-
-bool IRAM_ATTR ISRInternalGPIOPin::digital_read() {
-  auto *arg = reinterpret_cast<ISRPinArg *>(arg_);
-  return bool(digitalRead(arg->pin)) != arg->inverted;  // NOLINT
-}
-void IRAM_ATTR ISRInternalGPIOPin::digital_write(bool value) {
-  auto *arg = reinterpret_cast<ISRPinArg *>(arg_);
-  digitalWrite(arg->pin, value != arg->inverted ? 1 : 0);  // NOLINT
-}
-void IRAM_ATTR ISRInternalGPIOPin::clear_interrupt() {
-  auto *arg = reinterpret_cast<ISRPinArg *>(arg_);
-#ifdef CONFIG_IDF_TARGET_ESP32C3
-  GPIO.status_w1tc.val = 1UL << arg->pin;
-#else
-  if (arg->pin < 32) {
-    GPIO.status_w1tc = 1UL << arg->pin;
-  } else {
-    GPIO.status1_w1tc.intr_st = 1UL << (arg->pin - 32);
-  }
-#endif
-}
-void IRAM_ATTR ISRInternalGPIOPin::pin_mode(gpio::Flags flags) {
-  auto *arg = reinterpret_cast<ISRPinArg *>(arg_);
-  pinMode(arg->pin, flags_to_mode(flags));  // NOLINT
-}
-
-}  // namespace esphome
-
-#endif  // USE_ESP32_FRAMEWORK_ARDUINO
diff --git a/esphome/components/esp32/gpio_arduino.h b/esphome/components/esp32/gpio_arduino.h
deleted file mode 100644
index e88d39b1a8..0000000000
--- a/esphome/components/esp32/gpio_arduino.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#ifdef USE_ESP32_FRAMEWORK_ARDUINO
-#include "esphome/core/hal.h"
-
-namespace esphome {
-namespace esp32 {
-
-class ArduinoInternalGPIOPin : public InternalGPIOPin {
- public:
-  void set_pin(uint8_t pin) { pin_ = pin; }
-  void set_inverted(bool inverted) { inverted_ = inverted; }
-  void set_flags(gpio::Flags flags) { flags_ = flags; }
-
-  void setup() override { pin_mode(flags_); }
-  void pin_mode(gpio::Flags flags) override;
-  bool digital_read() override;
-  void digital_write(bool value) override;
-  std::string dump_summary() const override;
-  void detach_interrupt() const override;
-  ISRInternalGPIOPin to_isr() const override;
-  uint8_t get_pin() const override { return pin_; }
-  bool is_inverted() const override { return inverted_; }
-
- protected:
-  void attach_interrupt(void (*func)(void *), void *arg, gpio::InterruptType type) const override;
-
-  uint8_t pin_;
-  bool inverted_;
-  gpio::Flags flags_;
-};
-
-}  // namespace esp32
-}  // namespace esphome
-
-#endif  // USE_ESP32_FRAMEWORK_ARDUINO
diff --git a/esphome/components/esp32_camera/esp32_camera.cpp b/esphome/components/esp32_camera/esp32_camera.cpp
index 7e23c9dc6e..9598541143 100644
--- a/esphome/components/esp32_camera/esp32_camera.cpp
+++ b/esphome/components/esp32_camera/esp32_camera.cpp
@@ -54,7 +54,7 @@ void ESP32Camera::dump_config() {
   ESP_LOGCONFIG(TAG, "  HREF Pin: %d", conf.pin_href);
   ESP_LOGCONFIG(TAG, "  Pixel Clock Pin: %d", conf.pin_pclk);
   ESP_LOGCONFIG(TAG, "  External Clock: Pin:%d Frequency:%u", conf.pin_xclk, conf.xclk_freq_hz);
-  ESP_LOGCONFIG(TAG, "  I2C Pins: SDA:%d SCL:%d", conf.pin_sscb_sda, conf.pin_sscb_scl);
+  ESP_LOGCONFIG(TAG, "  I2C Pins: SDA:%d SCL:%d", conf.pin_sccb_sda, conf.pin_sccb_scl);
   ESP_LOGCONFIG(TAG, "  Reset Pin: %d", conf.pin_reset);
   switch (this->config_.frame_size) {
     case FRAMESIZE_QQVGA:
@@ -209,8 +209,8 @@ void ESP32Camera::set_external_clock(uint8_t pin, uint32_t frequency) {
   this->config_.xclk_freq_hz = frequency;
 }
 void ESP32Camera::set_i2c_pins(uint8_t sda, uint8_t scl) {
-  this->config_.pin_sscb_sda = sda;
-  this->config_.pin_sscb_scl = scl;
+  this->config_.pin_sccb_sda = sda;
+  this->config_.pin_sccb_scl = scl;
 }
 void ESP32Camera::set_reset_pin(uint8_t pin) { this->config_.pin_reset = pin; }
 void ESP32Camera::set_power_down_pin(uint8_t pin) { this->config_.pin_pwdn = pin; }
diff --git a/esphome/components/ethernet/__init__.py b/esphome/components/ethernet/__init__.py
index 696cc62e75..79ee48f32b 100644
--- a/esphome/components/ethernet/__init__.py
+++ b/esphome/components/ethernet/__init__.py
@@ -30,16 +30,17 @@ CONF_POWER_PIN = "power_pin"
 EthernetType = ethernet_ns.enum("EthernetType")
 ETHERNET_TYPES = {
     "LAN8720": EthernetType.ETHERNET_TYPE_LAN8720,
-    "TLK110": EthernetType.ETHERNET_TYPE_TLK110,
+    "RTL8201": EthernetType.ETHERNET_TYPE_RTL8201,
+    "DP83848": EthernetType.ETHERNET_TYPE_DP83848,
     "IP101": EthernetType.ETHERNET_TYPE_IP101,
 }
 
-eth_clock_mode_t = cg.global_ns.enum("eth_clock_mode_t")
+emac_rmii_clock_gpio_t = cg.global_ns.enum("emac_rmii_clock_gpio_t")
 CLK_MODES = {
-    "GPIO0_IN": eth_clock_mode_t.ETH_CLOCK_GPIO0_IN,
-    "GPIO0_OUT": eth_clock_mode_t.ETH_CLOCK_GPIO0_OUT,
-    "GPIO16_OUT": eth_clock_mode_t.ETH_CLOCK_GPIO16_OUT,
-    "GPIO17_OUT": eth_clock_mode_t.ETH_CLOCK_GPIO17_OUT,
+    "GPIO0_IN": emac_rmii_clock_gpio_t.EMAC_CLK_IN_GPIO,
+    "GPIO0_OUT": emac_rmii_clock_gpio_t.EMAC_APPL_CLK_OUT_GPIO,
+    "GPIO16_OUT": emac_rmii_clock_gpio_t.EMAC_CLK_OUT_GPIO,
+    "GPIO17_OUT": emac_rmii_clock_gpio_t.EMAC_CLK_OUT_180_GPIO,
 }
 
 
@@ -125,5 +126,5 @@ async def to_code(config):
 
     cg.add_define("USE_ETHERNET")
 
-    if CORE.is_esp32:
+    if CORE.using_arduino:
         cg.add_library("WiFi", None)
diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index d768964017..e3baa417df 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -5,19 +5,8 @@
 
 #ifdef USE_ESP32_FRAMEWORK_ARDUINO
 
-#include <eth_phy/phy_lan8720.h>
-#include <eth_phy/phy_ip101.h>
-#include <eth_phy/phy_tlk110.h>
 #include <lwip/dns.h>
-
-/// Macro for IDF version comparison
-#ifndef ESP_IDF_VERSION_VAL
-#define ESP_IDF_VERSION_VAL(major, minor, patch) (((major) << 16) | ((minor) << 8) | (patch))
-#endif
-
-// Defined in WiFiGeneric.cpp, sets global initialized flag, starts network event task queue and calls
-// tcpip_adapter_init()
-extern void tcpipInit();  // NOLINT(readability-identifier-naming)
+#include "esp_event.h"
 
 namespace esphome {
 namespace ethernet {
@@ -37,25 +26,51 @@ EthernetComponent::EthernetComponent() { global_eth_component = this; }
 
 void EthernetComponent::setup() {
   ESP_LOGCONFIG(TAG, "Setting up Ethernet...");
-
-  auto f = std::bind(&EthernetComponent::on_wifi_event_, this, std::placeholders::_1, std::placeholders::_2);
-  WiFi.onEvent(f);
+  // Delay here to allow power to stabilise before Ethernet is initialised.
+  delay(300);  // NOLINT
 
   if (this->power_pin_ != nullptr) {
     this->power_pin_->setup();
   }
 
+  esp_err_t err;
+  err = esp_netif_init();
+  ESPHL_ERROR_CHECK(err, "ETH netif init error");
+  err = esp_event_loop_create_default();
+  ESPHL_ERROR_CHECK(err, "ETH event loop error");
+
+  esp_netif_config_t cfg = ESP_NETIF_DEFAULT_ETH();
+  this->eth_netif_ = esp_netif_new(&cfg);
+
+  // Init MAC and PHY configs to default
+  eth_mac_config_t mac_config = ETH_MAC_DEFAULT_CONFIG();
+  eth_phy_config_t phy_config = ETH_PHY_DEFAULT_CONFIG();
+
+  phy_config.phy_addr = this->phy_addr_;
+
+  mac_config.smi_mdc_gpio_num = this->mdc_pin_;
+  mac_config.smi_mdio_gpio_num = this->mdio_pin_;
+  mac_config.clock_config.rmii.clock_mode = this->clk_mode_ == EMAC_CLK_IN_GPIO ? EMAC_CLK_EXT_IN : EMAC_CLK_OUT;
+  mac_config.clock_config.rmii.clock_gpio = this->clk_mode_;
+
+  esp_eth_mac_t *mac = esp_eth_mac_new_esp32(&mac_config);
+
+  esp_eth_phy_t *phy;
   switch (this->type_) {
     case ETHERNET_TYPE_LAN8720: {
-      memcpy(&this->eth_config_, &phy_lan8720_default_ethernet_config, sizeof(eth_config_t));
+      phy = esp_eth_phy_new_lan87xx(&phy_config);
       break;
     }
-    case ETHERNET_TYPE_TLK110: {
-      memcpy(&this->eth_config_, &phy_tlk110_default_ethernet_config, sizeof(eth_config_t));
+    case ETHERNET_TYPE_RTL8201: {
+      phy = esp_eth_phy_new_rtl8201(&phy_config);
+      break;
+    }
+    case ETHERNET_TYPE_DP83848: {
+      phy = esp_eth_phy_new_dp83848(&phy_config);
       break;
     }
     case ETHERNET_TYPE_IP101: {
-      memcpy(&this->eth_config_, &phy_ip101_default_ethernet_config, sizeof(eth_config_t));
+      phy = esp_eth_phy_new_ip101(&phy_config);
       break;
     }
     default: {
@@ -64,23 +79,28 @@ void EthernetComponent::setup() {
     }
   }
 
-  this->eth_config_.phy_addr = static_cast<eth_phy_base_t>(this->phy_addr_);
-  this->eth_config_.clock_mode = this->clk_mode_;
-  this->eth_config_.gpio_config = EthernetComponent::eth_phy_config_gpio;
-  this->eth_config_.tcpip_input = tcpip_adapter_eth_input;
+  esp_eth_config_t eth_config = ETH_DEFAULT_CONFIG(mac, phy);
+  this->eth_handle_ = nullptr;
+  err = esp_eth_driver_install(&eth_config, &this->eth_handle_);
+  ESPHL_ERROR_CHECK(err, "ETH driver install error");
+  /* attach Ethernet driver to TCP/IP stack */
+  err = esp_netif_attach(this->eth_netif_, esp_eth_new_netif_glue(this->eth_handle_));
+  ESPHL_ERROR_CHECK(err, "ETH netif attach error");
+
+  // Register user defined event handers
+  err = esp_event_handler_register(ETH_EVENT, ESP_EVENT_ANY_ID, &EthernetComponent::eth_event_handler, nullptr);
+  ESPHL_ERROR_CHECK(err, "ETH event handler register error");
+  err = esp_event_handler_register(IP_EVENT, IP_EVENT_ETH_GOT_IP, &EthernetComponent::got_ip_event_handler, nullptr);
+  ESPHL_ERROR_CHECK(err, "GOT IP event handler register error");
+
+  /* start Ethernet driver state machine */
+  err = esp_eth_start(this->eth_handle_);
+  ESPHL_ERROR_CHECK(err, "ETH start error");
 
   if (this->power_pin_ != nullptr) {
-    this->orig_power_enable_fun_ = this->eth_config_.phy_power_enable;
-    this->eth_config_.phy_power_enable = EthernetComponent::eth_phy_power_enable;
+    this->orig_power_control_fun_ = phy->pwrctl;
+    phy->pwrctl = EthernetComponent::eth_phy_power_control;
   }
-
-  tcpipInit();
-
-  esp_err_t err;
-  err = esp_eth_init(&this->eth_config_);
-  ESPHL_ERROR_CHECK(err, "ETH init error");
-  err = esp_eth_enable();
-  ESPHL_ERROR_CHECK(err, "ETH enable error");
 }
 
 void EthernetComponent::loop() {
@@ -130,8 +150,12 @@ void EthernetComponent::dump_config() {
       eth_type = "LAN8720";
       break;
 
-    case ETHERNET_TYPE_TLK110:
-      eth_type = "TLK110";
+    case ETHERNET_TYPE_RTL8201:
+      eth_type = "RTL8201";
+      break;
+
+    case ETHERNET_TYPE_DP83848:
+      eth_type = "DP83848";
       break;
 
     case ETHERNET_TYPE_IP101:
@@ -156,34 +180,30 @@ float EthernetComponent::get_setup_priority() const { return setup_priority::WIF
 bool EthernetComponent::can_proceed() { return this->is_connected(); }
 
 network::IPAddress EthernetComponent::get_ip_address() {
-  tcpip_adapter_ip_info_t ip;
-  tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_ETH, &ip);
+  esp_netif_ip_info_t ip;
+  esp_netif_get_ip_info(this->eth_netif_, &ip);
   return {ip.ip.addr};
 }
 
-void EthernetComponent::on_wifi_event_(system_event_id_t event, system_event_info_t info) {
+void EthernetComponent::eth_event_handler(void *arg, esp_event_base_t event_base, int32_t event, void *event_data) {
   const char *event_name;
 
   switch (event) {
-    case SYSTEM_EVENT_ETH_START:
+    case ETHERNET_EVENT_START:
       event_name = "ETH started";
-      this->started_ = true;
+      global_eth_component->started_ = true;
       break;
-    case SYSTEM_EVENT_ETH_STOP:
+    case ETHERNET_EVENT_STOP:
       event_name = "ETH stopped";
-      this->started_ = false;
-      this->connected_ = false;
+      global_eth_component->started_ = false;
+      global_eth_component->connected_ = false;
       break;
-    case SYSTEM_EVENT_ETH_CONNECTED:
+    case ETHERNET_EVENT_CONNECTED:
       event_name = "ETH connected";
       break;
-    case SYSTEM_EVENT_ETH_DISCONNECTED:
+    case ETHERNET_EVENT_DISCONNECTED:
       event_name = "ETH disconnected";
-      this->connected_ = false;
-      break;
-    case SYSTEM_EVENT_ETH_GOT_IP:
-      event_name = "ETH Got IP";
-      this->connected_ = true;
+      global_eth_component->connected_ = false;
       break;
     default:
       return;
@@ -192,17 +212,23 @@ void EthernetComponent::on_wifi_event_(system_event_id_t event, system_event_inf
   ESP_LOGV(TAG, "[Ethernet event] %s (num=%d)", event_name, event);
 }
 
+void EthernetComponent::got_ip_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id,
+                                             void *event_data) {
+  global_eth_component->connected_ = true;
+  ESP_LOGV(TAG, "[Ethernet event] ETH Got IP (num=%d)", event_id);
+}
+
 void EthernetComponent::start_connect_() {
   this->connect_begin_ = millis();
   this->status_set_warning();
 
   esp_err_t err;
-  err = tcpip_adapter_set_hostname(TCPIP_ADAPTER_IF_ETH, App.get_name().c_str());
+  err = esp_netif_set_hostname(this->eth_netif_, App.get_name().c_str());
   if (err != ERR_OK) {
-    ESP_LOGW(TAG, "tcpip_adapter_set_hostname failed: %s", esp_err_to_name(err));
+    ESP_LOGW(TAG, "esp_netif_set_hostname failed: %s", esp_err_to_name(err));
   }
 
-  tcpip_adapter_ip_info_t info;
+  esp_netif_ip_info_t info;
   if (this->manual_ip_.has_value()) {
     info.ip.addr = static_cast<uint32_t>(this->manual_ip_->static_ip);
     info.gw.addr = static_cast<uint32_t>(this->manual_ip_->gateway);
@@ -213,11 +239,19 @@ void EthernetComponent::start_connect_() {
     info.netmask.addr = 0;
   }
 
-  err = tcpip_adapter_dhcpc_stop(TCPIP_ADAPTER_IF_ETH);
-  if (err != ESP_ERR_TCPIP_ADAPTER_DHCP_ALREADY_STOPPED) {
+  esp_netif_dhcp_status_t status = ESP_NETIF_DHCP_INIT;
+
+  err = esp_netif_dhcpc_get_status(this->eth_netif_, &status);
+  ESPHL_ERROR_CHECK(err, "DHCPC Get Status Failed!");
+
+  ESP_LOGV(TAG, "DHCP Client Status: %d", status);
+
+  err = esp_netif_dhcpc_stop(this->eth_netif_);
+  if (err != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STOPPED) {
     ESPHL_ERROR_CHECK(err, "DHCPC stop error");
   }
-  err = tcpip_adapter_set_ip_info(TCPIP_ADAPTER_IF_ETH, &info);
+
+  err = esp_netif_set_ip_info(this->eth_netif_, &info);
   ESPHL_ERROR_CHECK(err, "DHCPC set IP info error");
 
   if (this->manual_ip_.has_value()) {
@@ -234,8 +268,8 @@ void EthernetComponent::start_connect_() {
       dns_setserver(1, &d);
     }
   } else {
-    err = tcpip_adapter_dhcpc_start(TCPIP_ADAPTER_IF_ETH);
-    if (err != ESP_ERR_TCPIP_ADAPTER_DHCP_ALREADY_STARTED) {
+    err = esp_netif_dhcpc_start(this->eth_netif_);
+    if (err != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STARTED) {
       ESPHL_ERROR_CHECK(err, "DHCPC start error");
     }
   }
@@ -243,46 +277,45 @@ void EthernetComponent::start_connect_() {
   this->connect_begin_ = millis();
   this->status_set_warning();
 }
-
-void EthernetComponent::eth_phy_config_gpio() {
-  phy_rmii_configure_data_interface_pins();
-  phy_rmii_smi_configure_pins(global_eth_component->mdc_pin_, global_eth_component->mdio_pin_);
-}
-
-void EthernetComponent::eth_phy_power_enable(bool enable) {
+esp_err_t EthernetComponent::eth_phy_power_control(esp_eth_phy_t *phy, bool enable) {
   global_eth_component->power_pin_->digital_write(enable);
   // power up takes some time, datasheet says max 300µs
   delay(1);
-  global_eth_component->orig_power_enable_fun_(enable);
+  return global_eth_component->orig_power_control_fun_(phy, enable);
 }
 
 bool EthernetComponent::is_connected() { return this->state_ == EthernetComponentState::CONNECTED; }
 
 void EthernetComponent::dump_connect_params_() {
-  tcpip_adapter_ip_info_t ip;
-  tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_ETH, &ip);
+  esp_netif_ip_info_t ip;
+  esp_netif_get_ip_info(this->eth_netif_, &ip);
   ESP_LOGCONFIG(TAG, "  IP Address: %s", network::IPAddress(ip.ip.addr).str().c_str());
   ESP_LOGCONFIG(TAG, "  Hostname: '%s'", App.get_name().c_str());
   ESP_LOGCONFIG(TAG, "  Subnet: %s", network::IPAddress(ip.netmask.addr).str().c_str());
   ESP_LOGCONFIG(TAG, "  Gateway: %s", network::IPAddress(ip.gw.addr).str().c_str());
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(3, 3, 4)
   const ip_addr_t *dns_ip1 = dns_getserver(0);
   const ip_addr_t *dns_ip2 = dns_getserver(1);
-#else
-  ip_addr_t tmp_ip1 = dns_getserver(0);
-  const ip_addr_t *dns_ip1 = &tmp_ip1;
-  ip_addr_t tmp_ip2 = dns_getserver(1);
-  const ip_addr_t *dns_ip2 = &tmp_ip2;
-#endif
+
   ESP_LOGCONFIG(TAG, "  DNS1: %s", network::IPAddress(dns_ip1->u_addr.ip4.addr).str().c_str());
   ESP_LOGCONFIG(TAG, "  DNS2: %s", network::IPAddress(dns_ip2->u_addr.ip4.addr).str().c_str());
+
+  esp_err_t err;
+
   uint8_t mac[6];
-  esp_eth_get_mac(mac);
+  err = esp_eth_ioctl(this->eth_handle_, ETH_CMD_G_MAC_ADDR, &mac);
+  ESPHL_ERROR_CHECK(err, "ETH_CMD_G_MAC error");
   ESP_LOGCONFIG(TAG, "  MAC Address: %02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-  ESP_LOGCONFIG(TAG, "  Is Full Duplex: %s", YESNO(this->eth_config_.phy_get_duplex_mode()));
-  ESP_LOGCONFIG(TAG, "  Link Up: %s", YESNO(this->eth_config_.phy_check_link()));
-  ESP_LOGCONFIG(TAG, "  Link Speed: %u", this->eth_config_.phy_get_speed_mode() ? 100 : 10);
+
+  eth_duplex_t duplex_mode;
+  err = esp_eth_ioctl(this->eth_handle_, ETH_CMD_G_DUPLEX_MODE, &duplex_mode);
+  ESPHL_ERROR_CHECK(err, "ETH_CMD_G_DUPLEX_MODE error");
+  ESP_LOGCONFIG(TAG, "  Is Full Duplex: %s", YESNO(duplex_mode == ETH_DUPLEX_FULL));
+
+  eth_speed_t speed;
+  err = esp_eth_ioctl(this->eth_handle_, ETH_CMD_G_SPEED, &speed);
+  ESPHL_ERROR_CHECK(err, "ETH_CMD_G_SPEED error");
+  ESP_LOGCONFIG(TAG, "  Link Speed: %u", speed == ETH_SPEED_100M ? 100 : 10);
 }
 
 void EthernetComponent::set_phy_addr(uint8_t phy_addr) { this->phy_addr_ = phy_addr; }
@@ -290,7 +323,7 @@ void EthernetComponent::set_power_pin(GPIOPin *power_pin) { this->power_pin_ = p
 void EthernetComponent::set_mdc_pin(uint8_t mdc_pin) { this->mdc_pin_ = mdc_pin; }
 void EthernetComponent::set_mdio_pin(uint8_t mdio_pin) { this->mdio_pin_ = mdio_pin; }
 void EthernetComponent::set_type(EthernetType type) { this->type_ = type; }
-void EthernetComponent::set_clk_mode(eth_clock_mode_t clk_mode) { this->clk_mode_ = clk_mode; }
+void EthernetComponent::set_clk_mode(emac_rmii_clock_gpio_t clk_mode) { this->clk_mode_ = clk_mode; }
 void EthernetComponent::set_manual_ip(const ManualIP &manual_ip) { this->manual_ip_ = manual_ip; }
 
 std::string EthernetComponent::get_use_address() const {
diff --git a/esphome/components/ethernet/ethernet_component.h b/esphome/components/ethernet/ethernet_component.h
index 0924405521..abf8b7791f 100644
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -1,22 +1,22 @@
 #pragma once
 
-#ifdef USE_ESP32_FRAMEWORK_ARDUINO
-
 #include "esphome/core/component.h"
 #include "esphome/core/hal.h"
 #include "esphome/components/network/ip_address.h"
 
+#ifdef USE_ESP32_FRAMEWORK_ARDUINO
+
 #include "esp_eth.h"
-#include <esp_wifi.h>
-#include <WiFiType.h>
-#include <WiFi.h>
+#include "esp_eth_mac.h"
+#include "esp_netif.h"
 
 namespace esphome {
 namespace ethernet {
 
 enum EthernetType {
   ETHERNET_TYPE_LAN8720 = 0,
-  ETHERNET_TYPE_TLK110,
+  ETHERNET_TYPE_RTL8201,
+  ETHERNET_TYPE_DP83848,
   ETHERNET_TYPE_IP101,
 };
 
@@ -49,7 +49,7 @@ class EthernetComponent : public Component {
   void set_mdc_pin(uint8_t mdc_pin);
   void set_mdio_pin(uint8_t mdio_pin);
   void set_type(EthernetType type);
-  void set_clk_mode(eth_clock_mode_t clk_mode);
+  void set_clk_mode(emac_rmii_clock_gpio_t clk_mode);
   void set_manual_ip(const ManualIP &manual_ip);
 
   network::IPAddress get_ip_address();
@@ -57,12 +57,13 @@ class EthernetComponent : public Component {
   void set_use_address(const std::string &use_address);
 
  protected:
-  void on_wifi_event_(system_event_id_t event, system_event_info_t info);
+  static void eth_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data);
+  static void got_ip_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data);
+
   void start_connect_();
   void dump_connect_params_();
 
-  static void eth_phy_config_gpio();
-  static void eth_phy_power_enable(bool enable);
+  static esp_err_t eth_phy_power_control(esp_eth_phy_t *phy, bool enable);
 
   std::string use_address_;
   uint8_t phy_addr_{0};
@@ -70,15 +71,17 @@ class EthernetComponent : public Component {
   uint8_t mdc_pin_{23};
   uint8_t mdio_pin_{18};
   EthernetType type_{ETHERNET_TYPE_LAN8720};
-  eth_clock_mode_t clk_mode_{ETH_CLOCK_GPIO0_IN};
+  emac_rmii_clock_gpio_t clk_mode_{EMAC_CLK_IN_GPIO};
   optional<ManualIP> manual_ip_{};
 
   bool started_{false};
   bool connected_{false};
   EthernetComponentState state_{EthernetComponentState::STOPPED};
   uint32_t connect_begin_;
-  eth_config_t eth_config_;
-  eth_phy_power_enable_func orig_power_enable_fun_;
+  esp_netif_t *eth_netif_{nullptr};
+  esp_eth_handle_t eth_handle_;
+
+  std::function<esp_err_t(esp_eth_phy_t *, bool)> orig_power_control_fun_;
 };
 
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
diff --git a/esphome/components/ethernet_info/ethernet_info_text_sensor.h b/esphome/components/ethernet_info/ethernet_info_text_sensor.h
index c683b68080..aad8f362b5 100644
--- a/esphome/components/ethernet_info/ethernet_info_text_sensor.h
+++ b/esphome/components/ethernet_info/ethernet_info_text_sensor.h
@@ -12,9 +12,7 @@ namespace ethernet_info {
 class IPAddressEthernetInfo : public PollingComponent, public text_sensor::TextSensor {
  public:
   void update() override {
-    tcpip_adapter_ip_info_t tcpip;
-    tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_ETH, &tcpip);
-    auto ip = tcpip.ip.addr;
+    auto ip = ethernet::global_eth_component->get_ip_address();
     if (ip != this->last_ip_) {
       this->last_ip_ = ip;
       this->publish_state(network::IPAddress(ip).str());
diff --git a/esphome/components/shelly_dimmer/dev_table.h b/esphome/components/shelly_dimmer/dev_table.h
index f4bf7778f2..e73cd1271c 100644
--- a/esphome/components/shelly_dimmer/dev_table.h
+++ b/esphome/components/shelly_dimmer/dev_table.h
@@ -155,4 +155,5 @@ constexpr stm32_dev_t DEVICES[] = {
 
 }  // namespace shelly_dimmer
 }  // namespace esphome
-#endif
+
+#endif  // USE_SHD_FIRMWARE_DATA
diff --git a/esphome/components/shelly_dimmer/light.py b/esphome/components/shelly_dimmer/light.py
index 3978d37c0b..9050a872b1 100644
--- a/esphome/components/shelly_dimmer/light.py
+++ b/esphome/components/shelly_dimmer/light.py
@@ -26,7 +26,7 @@ from esphome.const import (
 from esphome.core import HexInt, CORE
 
 DOMAIN = "shelly_dimmer"
-DEPENDENCIES = ["sensor", "uart"]
+DEPENDENCIES = ["sensor", "uart", "esp8266"]
 
 shelly_dimmer_ns = cg.esphome_ns.namespace("shelly_dimmer")
 ShellyDimmer = shelly_dimmer_ns.class_(
diff --git a/esphome/components/shelly_dimmer/shelly_dimmer.cpp b/esphome/components/shelly_dimmer/shelly_dimmer.cpp
index 94fe836742..144236bfe1 100644
--- a/esphome/components/shelly_dimmer/shelly_dimmer.cpp
+++ b/esphome/components/shelly_dimmer/shelly_dimmer.cpp
@@ -1,6 +1,8 @@
 #include "esphome/core/defines.h"
 #include "esphome/core/helpers.h"
 
+#ifdef USE_ESP8266
+
 #include "shelly_dimmer.h"
 #ifdef USE_SHD_FIRMWARE_DATA
 #include "stm32flash.h"
@@ -521,3 +523,5 @@ void ShellyDimmer::reset_dfu_boot_() {
 
 }  // namespace shelly_dimmer
 }  // namespace esphome
+
+#endif  // USE_ESP8266
diff --git a/esphome/components/shelly_dimmer/shelly_dimmer.h b/esphome/components/shelly_dimmer/shelly_dimmer.h
index b7d476279e..4701f3a32a 100644
--- a/esphome/components/shelly_dimmer/shelly_dimmer.h
+++ b/esphome/components/shelly_dimmer/shelly_dimmer.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#ifdef USE_ESP8266
+
 #include "esphome/core/component.h"
 #include "esphome/core/log.h"
 #include "esphome/components/light/light_output.h"
@@ -115,3 +117,5 @@ class ShellyDimmer : public PollingComponent, public light::LightOutput, public
 
 }  // namespace shelly_dimmer
 }  // namespace esphome
+
+#endif  // USE_ESP8266
diff --git a/esphome/components/shelly_dimmer/stm32flash.cpp b/esphome/components/shelly_dimmer/stm32flash.cpp
index e688f2de36..3612142972 100644
--- a/esphome/components/shelly_dimmer/stm32flash.cpp
+++ b/esphome/components/shelly_dimmer/stm32flash.cpp
@@ -1061,4 +1061,5 @@ stm32_err_t stm32_crc_wrapper(const stm32_unique_ptr &stm, uint32_t address, uin
 
 }  // namespace shelly_dimmer
 }  // namespace esphome
-#endif
+
+#endif  // USE_SHD_FIRMWARE_DATA
diff --git a/esphome/components/wifi/wifi_component_esp32_arduino.cpp b/esphome/components/wifi/wifi_component_esp32_arduino.cpp
index e893712287..54ed7638d2 100644
--- a/esphome/components/wifi/wifi_component_esp32_arduino.cpp
+++ b/esphome/components/wifi/wifi_component_esp32_arduino.cpp
@@ -266,8 +266,7 @@ bool WiFiComponent::wifi_sta_connect_(const WiFiAP &ap) {
         ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_set_password failed! %d", err);
       }
     }
-    esp_wpa2_config_t wpa2_config = WPA2_CONFIG_INIT_DEFAULT();
-    err = esp_wifi_sta_wpa2_ent_enable(&wpa2_config);
+    err = esp_wifi_sta_wpa2_ent_enable();
     if (err != ESP_OK) {
       ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_enable failed! %d", err);
     }
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index cea53b8545..c1ec7d2213 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -68,19 +68,19 @@
 #define USE_ESP32_BLE_CLIENT
 #define USE_ESP32_BLE_SERVER
 #define USE_ESP32_CAMERA
-#define USE_ESP32_IGNORE_EFUSE_MAC_CRC
 #define USE_IMPROV
 #define USE_SOCKET_IMPL_BSD_SOCKETS
 #define USE_WIFI_11KV_SUPPORT
 #define USE_BLUETOOTH_PROXY
 
 #ifdef USE_ARDUINO
-#define USE_ARDUINO_VERSION_CODE VERSION_CODE(1, 0, 6)
+#define USE_ARDUINO_VERSION_CODE VERSION_CODE(2, 0, 5)
 #define USE_ETHERNET
 #endif
 
 #ifdef USE_ESP_IDF
 #define USE_ARDUINO_VERSION_CODE VERSION_CODE(4, 3, 0)
+#define USE_ESP32_IGNORE_EFUSE_MAC_CRC
 #endif
 #endif
 
@@ -91,15 +91,16 @@
 #define USE_ESP8266_PREFERENCES_FLASH
 #define USE_HTTP_REQUEST_ESP8266_HTTPS
 #define USE_SOCKET_IMPL_LWIP_TCP
-#endif
-
-// Disabled feature flags
-//#define USE_BSEC  // Requires a library with proprietary license.
-
-#define USE_DASHBOARD_IMPORT
 
 // Dummy firmware payload for shelly_dimmer
 #define USE_SHD_FIRMWARE_MAJOR_VERSION 56
 #define USE_SHD_FIRMWARE_MINOR_VERSION 5
 #define USE_SHD_FIRMWARE_DATA \
   {}
+
+#endif
+
+// Disabled feature flags
+//#define USE_BSEC  // Requires a library with proprietary license.
+
+#define USE_DASHBOARD_IMPORT
diff --git a/platformio.ini b/platformio.ini
index ae0578de05..144dd83229 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -103,9 +103,9 @@ extra_scripts = post:esphome/components/esp8266/post_build.py.script
 ; This are common settings for the ESP32 (all variants) using Arduino.
 [common:esp32-arduino]
 extends = common:arduino
-platform = platformio/espressif32 @ 3.5.0
+platform = platformio/espressif32 @ 5.2.0
 platform_packages =
-    platformio/framework-arduinoespressif32 @ ~3.10006.0
+    platformio/framework-arduinoespressif32 @ ~3.20005.0
 
 framework = arduino
 board = nodemcu-32s
diff --git a/script/clang-tidy b/script/clang-tidy
index 327b593008..5d2cba6eb5 100755
--- a/script/clang-tidy
+++ b/script/clang-tidy
@@ -82,6 +82,7 @@ def clang_options(idedata):
             "-mtext-section-literals",
             "-mfix-esp32-psram-cache-issue",
             "-mfix-esp32-psram-cache-strategy=memw",
+            "-fno-tree-switch-conversion",
         )
     )
 
diff --git a/tests/test1.yaml b/tests/test1.yaml
index eacaf9b38c..88cdb43fca 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1823,18 +1823,6 @@ light:
         to: 25
       - single_light_id: ${roomname}_lights
 
-  - platform: shelly_dimmer
-    name: Shelly Dimmer Light
-    power:
-      name: Shelly Dimmer Power
-    voltage:
-      name: Shelly Dimmer Voltage
-    current:
-      name: Shelly Dimmer Current
-    max_brightness: 500
-    firmware: "51.6"
-    uart_id: uart0
-
 remote_transmitter:
   - pin: 32
     carrier_duty_percent: 100%
diff --git a/tests/test3.yaml b/tests/test3.yaml
index da704d90a3..546df1efb5 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -279,6 +279,10 @@ uart:
     tx_pin: GPIO4
     rx_pin: GPIO5
     baud_rate: 9600
+  - id: uart11
+    tx_pin: GPIO4
+    rx_pin: GPIO5
+    baud_rate: 9600
 
 modbus:
   uart_id: uart1
@@ -1358,6 +1362,17 @@ light:
     name: Sonoff D1 Dimmer
     id: d1_light
     restore_mode: RESTORE_DEFAULT_OFF
+  - platform: shelly_dimmer
+    name: "Shelly Dimmer Light"
+    power:
+      name: "Shelly Dimmer Power"
+    voltage:
+      name: "Shelly Dimmer Voltage"
+    current:
+      name: "Shelly Dimmer Current"
+    max_brightness: 500
+    firmware: "51.6"
+    uart_id: uart11
 
 servo:
   id: my_servo

From e6db61c2f07d4a7992b39074f1071ae4566195dc Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 21 Nov 2022 14:15:32 +1300
Subject: [PATCH 265/838] Update esp32 boards list (#4056)

---
 esphome/components/esp32/boards.py | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/esphome/components/esp32/boards.py b/esphome/components/esp32/boards.py
index e92c7e64dc..6ab151cc7a 100644
--- a/esphome/components/esp32/boards.py
+++ b/esphome/components/esp32/boards.py
@@ -1001,28 +1001,40 @@ done | sort
 
 BOARD_TO_VARIANT = {
     "adafruit_feather_esp32s2_tft": VARIANT_ESP32S2,
+    "adafruit_feather_esp32s3_nopsram": VARIANT_ESP32S3,
+    "adafruit_feather_esp32s3_tft": VARIANT_ESP32S3,
     "adafruit_feather_esp32s3": VARIANT_ESP32S3,
     "adafruit_feather_esp32_v2": VARIANT_ESP32,
     "adafruit_funhouse_esp32s2": VARIANT_ESP32S2,
+    "adafruit_itsybitsy_esp32": VARIANT_ESP32,
     "adafruit_magtag29_esp32s2": VARIANT_ESP32S2,
     "adafruit_metro_esp32s2": VARIANT_ESP32S2,
     "adafruit_qtpy_esp32c3": VARIANT_ESP32C3,
     "adafruit_qtpy_esp32s2": VARIANT_ESP32S2,
-    "adafruit_qtpy_esp32s3": VARIANT_ESP32S3,
+    "adafruit_qtpy_esp32s3_nopsram": VARIANT_ESP32S3,
     "adafruit_qtpy_esp32": VARIANT_ESP32,
     "airm2m_core_esp32c3": VARIANT_ESP32C3,
     "alksesp32": VARIANT_ESP32,
     "atmegazero_esp32s2": VARIANT_ESP32S2,
     "az-delivery-devkit-v4": VARIANT_ESP32,
+    "bee_motion_mini": VARIANT_ESP32C3,
+    "bee_motion_s3": VARIANT_ESP32S3,
+    "bee_motion": VARIANT_ESP32S2,
+    "bee_s3": VARIANT_ESP32S3,
     "bpi-bit": VARIANT_ESP32,
     "briki_abc_esp32": VARIANT_ESP32,
     "briki_mbc-wb_esp32": VARIANT_ESP32,
+    "cnrs_aw2eth": VARIANT_ESP32,
+    "connaxio_espoir": VARIANT_ESP32,
     "d-duino-32": VARIANT_ESP32,
     "deneyapkart1A": VARIANT_ESP32,
+    "deneyapkartg": VARIANT_ESP32C3,
     "deneyapkart": VARIANT_ESP32,
     "deneyapmini": VARIANT_ESP32S2,
     "denky32": VARIANT_ESP32,
     "denky_d4": VARIANT_ESP32,
+    "dfrobot_beetle_esp32c3": VARIANT_ESP32C3,
+    "dfrobot_firebeetle2_esp32s3": VARIANT_ESP32S3,
     "dpu_esp32": VARIANT_ESP32,
     "esp320": VARIANT_ESP32,
     "esp32-c3-devkitm-1": VARIANT_ESP32C3,
@@ -1084,6 +1096,7 @@ BOARD_TO_VARIANT = {
     "lolin_d32": VARIANT_ESP32,
     "lolin_s2_mini": VARIANT_ESP32S2,
     "lolin_s2_pico": VARIANT_ESP32S2,
+    "lolin_s3": VARIANT_ESP32S3,
     "lopy4": VARIANT_ESP32,
     "lopy": VARIANT_ESP32,
     "m5stack-atom": VARIANT_ESP32,
@@ -1092,6 +1105,7 @@ BOARD_TO_VARIANT = {
     "m5stack-coreink": VARIANT_ESP32,
     "m5stack-fire": VARIANT_ESP32,
     "m5stack-grey": VARIANT_ESP32,
+    "m5stack-station": VARIANT_ESP32,
     "m5stack-timer-cam": VARIANT_ESP32,
     "m5stick-c": VARIANT_ESP32,
     "magicbit": VARIANT_ESP32,
@@ -1101,9 +1115,11 @@ BOARD_TO_VARIANT = {
     "mhetesp32minikit": VARIANT_ESP32,
     "microduino-core-esp32": VARIANT_ESP32,
     "micros2": VARIANT_ESP32S2,
+    "minimain_esp32s2": VARIANT_ESP32S2,
     "nano32": VARIANT_ESP32,
     "nina_w10": VARIANT_ESP32,
     "node32s": VARIANT_ESP32,
+    "nodemcu-32s2": VARIANT_ESP32S2,
     "nodemcu-32s": VARIANT_ESP32,
     "nscreen-32": VARIANT_ESP32,
     "odroid_esp32": VARIANT_ESP32,
@@ -1115,12 +1131,16 @@ BOARD_TO_VARIANT = {
     "pycom_gpy": VARIANT_ESP32,
     "qchip": VARIANT_ESP32,
     "quantum": VARIANT_ESP32,
+    "seeed_xiao_esp32c3": VARIANT_ESP32C3,
     "sensesiot_weizen": VARIANT_ESP32,
     "sg-o_airMon": VARIANT_ESP32,
     "s_odi_ultra": VARIANT_ESP32,
+    "sparkfun_esp32_iot_redboard": VARIANT_ESP32,
     "sparkfun_esp32micromod": VARIANT_ESP32,
+    "sparkfun_esp32s2_thing_plus_c": VARIANT_ESP32,
     "sparkfun_esp32s2_thing_plus": VARIANT_ESP32S2,
     "sparkfun_lora_gateway_1-channel": VARIANT_ESP32,
+    "tamc_termod_s3": VARIANT_ESP32S3,
     "tinypico": VARIANT_ESP32,
     "trueverit-iot-driver-mk2": VARIANT_ESP32,
     "trueverit-iot-driver-mk3": VARIANT_ESP32,
@@ -1142,14 +1162,20 @@ BOARD_TO_VARIANT = {
     "um_rmp": VARIANT_ESP32S2,
     "um_tinys2": VARIANT_ESP32S2,
     "um_tinys3": VARIANT_ESP32S3,
+    "unphone7": VARIANT_ESP32,
+    "unphone8": VARIANT_ESP32S3,
+    "unphone9": VARIANT_ESP32S3,
     "upesy_wroom": VARIANT_ESP32,
     "upesy_wrover": VARIANT_ESP32,
     "vintlabs-devkit-v1": VARIANT_ESP32,
     "watchy": VARIANT_ESP32,
     "wemosbat": VARIANT_ESP32,
     "wemos_d1_mini32": VARIANT_ESP32,
+    "wemos_d1_uno32": VARIANT_ESP32,
     "wesp32": VARIANT_ESP32,
     "widora-air": VARIANT_ESP32,
+    "wifiduino32c3": VARIANT_ESP32C3,
+    "wifiduino32s3": VARIANT_ESP32S3,
     "wifiduino32": VARIANT_ESP32,
     "wipy3": VARIANT_ESP32,
     "wt32-eth01": VARIANT_ESP32,

From 5e1b7246973f8ad735d54c1341d245b0a8efed8f Mon Sep 17 00:00:00 2001
From: Yuval Brik <jhamhader@users.noreply.github.com>
Date: Mon, 21 Nov 2022 08:03:21 +0200
Subject: [PATCH 266/838] Add Lolin S2 Mini board (#3264)

fixes https://github.com/esphome/feature-requests/issues/1626
---
 esphome/components/esp32/boards.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/esphome/components/esp32/boards.py b/esphome/components/esp32/boards.py
index 6ab151cc7a..9f170f7644 100644
--- a/esphome/components/esp32/boards.py
+++ b/esphome/components/esp32/boards.py
@@ -550,6 +550,25 @@ ESP32_BOARD_PINS = {
     },
     "lolin_d32": {"LED": 5, "_VBAT": 35},
     "lolin_d32_pro": {"LED": 5, "_VBAT": 35},
+    "lolin_s2_mini": {
+        "TX": 43,
+        "RX": 44,
+        "SPICS1": 29,
+        "SPIHD": 31,
+        "SPIWP": 32,
+        "SPICS0": 33,
+        "SPICLK": 34,
+        "SPIQ": 35,
+        "SPID": 36,
+        "MISO": 9,
+        "MOSI": 11,
+        "SCK": 7,
+        "SCL": 35,
+        "SDA": 33,
+        "DAC1": 17,
+        "DAC2": 18,
+        "LED": 15,
+    },
     "lopy": {
         "A1": 37,
         "A2": 38,

From 2b032e86064b76f32d087192bdd0d363435f8633 Mon Sep 17 00:00:00 2001
From: uPesy Electronics <upesy.electronics@gmail.com>
Date: Mon, 21 Nov 2022 07:03:59 +0100
Subject: [PATCH 267/838] Add pin aliases for upesy boards (#3794)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/esp32/boards.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/components/esp32/boards.py b/esphome/components/esp32/boards.py
index 9f170f7644..d2d060f33f 100644
--- a/esphome/components/esp32/boards.py
+++ b/esphome/components/esp32/boards.py
@@ -1003,6 +1003,8 @@ ESP32_BOARD_PINS = {
         "D13": 2,
     },
     "xinabox_cw02": {"LED": 27},
+    "upesy_wroom": {"LED": 2},
+    "upesy_wrover": {"LED": 2},
 }
 
 """

From 621771e1ee35fbebf50177cd905d13b443d881dc Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 22 Nov 2022 12:19:52 +1300
Subject: [PATCH 268/838] Fix rp2040 pwm to use pico-sdk, not mbed (#4059)

---
 esphome/components/rp2040_pwm/rp2040_pwm.cpp | 26 ++++++++++++++------
 esphome/components/rp2040_pwm/rp2040_pwm.h   |  8 +++---
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/esphome/components/rp2040_pwm/rp2040_pwm.cpp b/esphome/components/rp2040_pwm/rp2040_pwm.cpp
index bf2a446edf..3f95125578 100644
--- a/esphome/components/rp2040_pwm/rp2040_pwm.cpp
+++ b/esphome/components/rp2040_pwm/rp2040_pwm.cpp
@@ -6,7 +6,9 @@
 #include "esphome/core/log.h"
 #include "esphome/core/macros.h"
 
-#include <PinNames.h>
+#include <hardware/clocks.h>
+#include <hardware/gpio.h>
+#include <hardware/pwm.h>
 
 namespace esphome {
 namespace rp2040_pwm {
@@ -15,10 +17,17 @@ static const char *const TAG = "rp2040_pwm";
 
 void RP2040PWM::setup() {
   ESP_LOGCONFIG(TAG, "Setting up RP2040 PWM Output...");
-  this->pin_->setup();
-  this->pwm_ = new mbed::PwmOut((PinName) this->pin_->get_pin());
-  this->turn_off();
+
+  this->setup_pwm_();
 }
+
+void RP2040PWM::setup_pwm_() {
+  pwm_config config = pwm_get_default_config();
+  pwm_config_set_clkdiv(&config, clock_get_hz(clk_sys) / (255.0f * this->frequency_));
+  pwm_config_set_wrap(&config, 254);
+  pwm_init(pwm_gpio_to_slice_num(this->pin_->get_pin()), &config, true);
+}
+
 void RP2040PWM::dump_config() {
   ESP_LOGCONFIG(TAG, "RP2040 PWM:");
   LOG_PIN("  Pin: ", this->pin_);
@@ -33,10 +42,13 @@ void HOT RP2040PWM::write_state(float state) {
     state = 1.0f - state;
   }
 
-  auto total_time_us = static_cast<uint32_t>(roundf(1e6f / this->frequency_));
+  if (frequency_changed_) {
+    this->setup_pwm_();
+    frequency_changed_ = false;
+  }
 
-  this->pwm_->period_us(total_time_us);
-  this->pwm_->write(state);
+  gpio_set_function(this->pin_->get_pin(), GPIO_FUNC_PWM);
+  pwm_set_gpio_level(this->pin_->get_pin(), state * 255.0f);
 }
 
 }  // namespace rp2040_pwm
diff --git a/esphome/components/rp2040_pwm/rp2040_pwm.h b/esphome/components/rp2040_pwm/rp2040_pwm.h
index e348f131c2..903079df17 100644
--- a/esphome/components/rp2040_pwm/rp2040_pwm.h
+++ b/esphome/components/rp2040_pwm/rp2040_pwm.h
@@ -7,11 +7,11 @@
 #include "esphome/core/component.h"
 #include "esphome/core/hal.h"
 
-#include "drivers/PwmOut.h"
-
 namespace esphome {
 namespace rp2040_pwm {
 
+static bool frequency_changed_ = false;
+
 class RP2040PWM : public output::FloatOutput, public Component {
  public:
   void set_pin(InternalGPIOPin *pin) { pin_ = pin; }
@@ -19,6 +19,7 @@ class RP2040PWM : public output::FloatOutput, public Component {
   /// Dynamically update frequency
   void update_frequency(float frequency) override {
     this->set_frequency(frequency);
+    frequency_changed_ = true;
     this->write_state(this->last_output_);
   }
 
@@ -31,8 +32,9 @@ class RP2040PWM : public output::FloatOutput, public Component {
  protected:
   void write_state(float state) override;
 
+  void setup_pwm_();
+
   InternalGPIOPin *pin_;
-  mbed::PwmOut *pwm_;
   float frequency_{1000.0};
   /// Cache last output level for dynamic frequency updating
   float last_output_{0.0};

From 7896a7783b27787f46de5a14f5c14ee3cdf66e0b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 22 Nov 2022 12:41:51 +1300
Subject: [PATCH 269/838] Update web_server index (#4060)

---
 esphome/components/web_server/server_index.h | 378 ++++++++++---------
 1 file changed, 190 insertions(+), 188 deletions(-)

diff --git a/esphome/components/web_server/server_index.h b/esphome/components/web_server/server_index.h
index 88c62baf50..8eaaaf4581 100644
--- a/esphome/components/web_server/server_index.h
+++ b/esphome/components/web_server/server_index.h
@@ -395,194 +395,196 @@ const uint8_t INDEX_GZ[] PROGMEM = {
     0x5e, 0x6e, 0x73, 0x19, 0x48, 0x16, 0xa1, 0x79, 0x8d, 0x2a, 0xa5, 0x48, 0xda, 0x93, 0x28, 0x5d, 0xd7, 0x14, 0xa0,
     0x9f, 0x33, 0x36, 0xf6, 0x6c, 0x0b, 0xe4, 0xab, 0x78, 0xfe, 0x98, 0xb0, 0x53, 0x26, 0x3f, 0xcc, 0xa2, 0x07, 0xd1,
     0x95, 0x23, 0xb0, 0x00, 0xb8, 0xbc, 0x33, 0x2a, 0xd9, 0x53, 0xe1, 0x28, 0x29, 0x51, 0x47, 0xc4, 0xb3, 0x8d, 0x41,
-    0x9b, 0x73, 0xb4, 0xeb, 0xc3, 0x7a, 0xa0, 0x93, 0x6c, 0x5b, 0xc0, 0x4b, 0x66, 0xe3, 0xcd, 0xc8, 0xc1, 0x00, 0x6c,
-    0x32, 0x81, 0xed, 0xa2, 0x02, 0xd9, 0x5a, 0x3e, 0x08, 0xa8, 0xc0, 0x07, 0xf6, 0x6c, 0xd1, 0xc2, 0xae, 0xda, 0xea,
-    0x27, 0x49, 0x1c, 0xd0, 0x9f, 0x9f, 0xd6, 0xcc, 0x05, 0xdc, 0xb1, 0x21, 0x02, 0xbb, 0x0d, 0x99, 0x67, 0xff, 0xeb,
-    0x3f, 0xfd, 0xaf, 0xff, 0x06, 0x03, 0x53, 0x3f, 0xb7, 0xb4, 0xae, 0x6e, 0xf5, 0x3f, 0xa1, 0xd5, 0x22, 0xbd, 0xa1,
-    0xdd, 0x5f, 0xff, 0xe1, 0xbf, 0x43, 0x33, 0xba, 0x00, 0x04, 0xb2, 0x84, 0x20, 0x1a, 0xa1, 0xcd, 0xf5, 0x59, 0x20,
-    0xd5, 0x06, 0xb9, 0x72, 0xa6, 0x7f, 0x44, 0xb0, 0x0b, 0x9e, 0xcd, 0xaf, 0x05, 0x07, 0xa1, 0x1e, 0x25, 0x59, 0xc1,
-    0x34, 0x3c, 0x42, 0xfe, 0x7e, 0x1e, 0x40, 0x34, 0xd7, 0x1c, 0xb8, 0xbc, 0xb0, 0xf4, 0x38, 0x62, 0x79, 0xd6, 0x8d,
-    0xd3, 0x58, 0xbd, 0x82, 0x71, 0x42, 0x87, 0xc2, 0x18, 0xb0, 0x5e, 0xe2, 0x09, 0x1e, 0x48, 0x20, 0xb8, 0xf5, 0x8f,
-    0x8a, 0xad, 0x1f, 0x4c, 0xf3, 0xa7, 0x18, 0x4b, 0x44, 0x6e, 0xd4, 0x08, 0xf0, 0x13, 0x84, 0xd6, 0x47, 0xfd, 0x1c,
-    0x9d, 0xeb, 0x67, 0x14, 0x6c, 0x62, 0x02, 0xd0, 0x4f, 0x33, 0x34, 0x3d, 0xcc, 0x19, 0x44, 0xd6, 0x41, 0xe5, 0xb6,
-    0x1a, 0xc9, 0x2b, 0x42, 0x78, 0x7d, 0xc4, 0x1c, 0x4f, 0xbc, 0xd1, 0xb3, 0xc8, 0xd9, 0xc7, 0x24, 0x3b, 0xc3, 0x58,
-    0x18, 0x12, 0xe9, 0xaa, 0xfa, 0xf2, 0x5f, 0xfe, 0xd9, 0xf7, 0xff, 0xe5, 0x9f, 0xaf, 0x68, 0x30, 0x85, 0x7d, 0x00,
-    0xc6, 0x2b, 0x0f, 0x35, 0x9d, 0x1b, 0x68, 0xad, 0x1f, 0x14, 0xf1, 0x5c, 0x5f, 0x23, 0x11, 0xc7, 0x52, 0x89, 0xb7,
-    0x7c, 0x24, 0xb4, 0x35, 0x53, 0xdc, 0x3c, 0x0b, 0x42, 0x76, 0xc5, 0x34, 0x58, 0x75, 0xc3, 0x3c, 0x47, 0x6e, 0x70,
-    0x0d, 0x5d, 0x3e, 0x13, 0xe3, 0xf5, 0x60, 0xdc, 0x08, 0x81, 0x07, 0xd2, 0x5f, 0xe8, 0x87, 0x27, 0x42, 0xba, 0x07,
-    0x62, 0x19, 0xa4, 0xac, 0xaf, 0x01, 0xe4, 0x59, 0x07, 0x34, 0x01, 0x35, 0x89, 0x2b, 0xdd, 0x4a, 0xe6, 0xc9, 0x71,
-    0xde, 0x7f, 0x85, 0x97, 0xf8, 0x2c, 0xec, 0x8d, 0x9a, 0xb5, 0x20, 0x43, 0x80, 0x93, 0x21, 0x20, 0x35, 0x90, 0xa9,
-    0x83, 0xd1, 0xa1, 0xc9, 0xd6, 0xeb, 0xda, 0x8f, 0xd8, 0xbd, 0xa6, 0x2d, 0xb9, 0xd4, 0x96, 0xb1, 0xb4, 0x6e, 0xa5,
-    0xb6, 0xc4, 0x4f, 0xb5, 0x34, 0xb4, 0x65, 0x7c, 0xa5, 0xb6, 0x44, 0xca, 0x0d, 0x70, 0xe4, 0xd0, 0xde, 0xc4, 0xa8,
-    0x8d, 0xa1, 0x9b, 0x39, 0xda, 0x25, 0xe0, 0xaa, 0x8f, 0x3e, 0x49, 0xb3, 0x84, 0x10, 0xc0, 0xb0, 0x85, 0x36, 0xbe,
-    0x04, 0x06, 0xa0, 0x62, 0x8f, 0x4a, 0xbd, 0xe9, 0xf1, 0xd1, 0x98, 0x80, 0xbb, 0xcb, 0x09, 0x43, 0x91, 0x0c, 0x6b,
-    0xf6, 0x35, 0x2b, 0xb7, 0x70, 0x1c, 0xb1, 0x61, 0xc4, 0x33, 0x60, 0xb6, 0x85, 0x83, 0x1d, 0x79, 0x4b, 0x11, 0x04,
-    0x0b, 0xec, 0xb7, 0x6f, 0xf6, 0x0f, 0x6c, 0xef, 0x38, 0x1b, 0x5f, 0x04, 0x36, 0x78, 0x19, 0x60, 0x7d, 0xb8, 0x3e,
-    0x9f, 0xb2, 0xd4, 0x51, 0x76, 0x7e, 0x96, 0x80, 0x0b, 0x95, 0x9d, 0x88, 0x6f, 0x36, 0x34, 0x03, 0xf8, 0x40, 0x58,
-    0xfa, 0xa8, 0x63, 0x7f, 0x97, 0x8b, 0xef, 0x9d, 0xf2, 0x1c, 0x1f, 0xfb, 0x98, 0xc2, 0xb0, 0xbb, 0x05, 0x0f, 0xf8,
-    0xb2, 0x8f, 0xfa, 0x48, 0xbf, 0x09, 0x60, 0x0b, 0xf1, 0xbe, 0x85, 0xed, 0xb7, 0x54, 0x5f, 0x84, 0xa2, 0x2f, 0xb9,
-    0x4d, 0x9b, 0xe2, 0x95, 0x2d, 0x47, 0x63, 0x8f, 0xd1, 0x54, 0x23, 0x53, 0x1c, 0x48, 0xc2, 0xc7, 0xba, 0x44, 0xa8,
-    0x7f, 0xa3, 0x88, 0x46, 0xa9, 0x94, 0xb5, 0xac, 0xc2, 0x09, 0xc9, 0xbc, 0x13, 0x93, 0xc1, 0x4f, 0x02, 0xff, 0xc8,
-    0xfc, 0x3e, 0x99, 0xf8, 0x94, 0x90, 0x46, 0xf2, 0xf0, 0x2f, 0xde, 0x19, 0xf3, 0x2e, 0x8e, 0xa8, 0xa5, 0x72, 0x86,
-    0x31, 0x4a, 0x83, 0x41, 0x83, 0xb6, 0x8a, 0x7a, 0x80, 0x7d, 0x92, 0x44, 0xf3, 0x82, 0x05, 0xea, 0x41, 0xfa, 0xc5,
-    0xe8, 0x5e, 0xaf, 0x06, 0x22, 0x4c, 0x3b, 0xa6, 0xe4, 0xd3, 0xa5, 0xe9, 0x38, 0x3f, 0x00, 0xc7, 0x19, 0x93, 0xfe,
-    0x5b, 0x11, 0x68, 0xdf, 0x34, 0x48, 0xd8, 0x84, 0x97, 0x1c, 0x6f, 0x95, 0x2f, 0x55, 0xa4, 0xc2, 0xef, 0xee, 0x80,
-    0x33, 0x6d, 0xf9, 0xf8, 0xff, 0x4d, 0x63, 0x8f, 0x83, 0x14, 0x9c, 0x5f, 0xba, 0x66, 0x82, 0x57, 0xf8, 0x00, 0x22,
-    0xf3, 0x7d, 0x69, 0x4c, 0x34, 0x62, 0x18, 0xc5, 0x29, 0x79, 0x0e, 0x72, 0xdb, 0xe3, 0xb9, 0xd9, 0x0e, 0xe4, 0xed,
-    0x4a, 0x28, 0x67, 0x35, 0x98, 0xb0, 0xed, 0x4a, 0xbf, 0x60, 0xb5, 0xb1, 0x8a, 0xc8, 0xd4, 0xdf, 0x56, 0x28, 0x64,
-    0xc4, 0x8e, 0x4a, 0xa1, 0x6a, 0x96, 0xa2, 0x87, 0x89, 0xd3, 0x6a, 0x54, 0xe9, 0x46, 0x4b, 0xb1, 0xa4, 0x6d, 0x7f,
-    0x48, 0xdb, 0x9e, 0xc4, 0xd8, 0x70, 0x29, 0xe6, 0x1e, 0x45, 0xc9, 0xc8, 0x41, 0x00, 0xac, 0x96, 0xf5, 0x08, 0xa8,
-    0xe9, 0xaa, 0xc8, 0x86, 0xff, 0x10, 0x89, 0x5b, 0x0a, 0xa1, 0xb7, 0x86, 0x4a, 0x47, 0xc3, 0xb2, 0xec, 0x5d, 0x30,
-    0xe7, 0xf0, 0x37, 0x79, 0x49, 0x41, 0xdc, 0x4d, 0xd5, 0xdf, 0xf7, 0x6b, 0x97, 0xee, 0x10, 0x9c, 0x79, 0xe3, 0xab,
-    0x69, 0xb6, 0xe2, 0x68, 0xdb, 0xeb, 0x92, 0x9f, 0x8f, 0xbd, 0x5f, 0x39, 0x36, 0x1a, 0x97, 0x54, 0x75, 0xd1, 0x22,
-    0x0e, 0xb3, 0xa9, 0xa3, 0x88, 0xb2, 0x7f, 0x73, 0x55, 0xb0, 0xe4, 0xdb, 0x9b, 0x83, 0x25, 0xfc, 0x96, 0xc1, 0x92,
-    0x6f, 0xff, 0xe0, 0x60, 0xc9, 0x37, 0x66, 0xb0, 0x04, 0x65, 0xe5, 0x8b, 0xcf, 0x89, 0x68, 0xe4, 0xd9, 0x59, 0x11,
-    0x76, 0xe4, 0xe1, 0x3c, 0x88, 0x9d, 0xff, 0x98, 0xd0, 0x06, 0x4c, 0xd4, 0x08, 0x6c, 0x50, 0x24, 0x43, 0xe4, 0x13,
-    0x82, 0x84, 0x97, 0x71, 0x84, 0xb6, 0x4e, 0xdc, 0x6b, 0xdd, 0x57, 0x37, 0x95, 0xc0, 0x6b, 0x73, 0x75, 0x38, 0xa7,
-    0xab, 0x22, 0x0d, 0x01, 0x7d, 0x6a, 0x54, 0x77, 0xec, 0x6e, 0xaa, 0x8c, 0x31, 0x73, 0x84, 0x9e, 0x3a, 0x08, 0x10,
-    0x1c, 0xb4, 0xb4, 0xff, 0xf3, 0x61, 0xa7, 0xb7, 0xdd, 0x99, 0x41, 0x6f, 0xd0, 0xa5, 0xf0, 0xd6, 0xee, 0x6d, 0x6f,
-    0xe3, 0xdb, 0x99, 0x7a, 0xeb, 0xe2, 0x5b, 0xac, 0xde, 0x76, 0xf0, 0x6d, 0xa4, 0xde, 0x1e, 0xe0, 0xdb, 0x58, 0xbd,
-    0x3d, 0xc4, 0xb7, 0x53, 0xbb, 0x3c, 0xe4, 0x1a, 0xb8, 0x87, 0xc0, 0x58, 0x64, 0xf0, 0x07, 0xaa, 0x0c, 0xf6, 0x2d,
-    0xde, 0xf0, 0x8b, 0x4e, 0x82, 0xd8, 0x13, 0x8e, 0x51, 0x90, 0x7b, 0x67, 0x20, 0xfc, 0x03, 0x4a, 0x68, 0x7b, 0x8a,
-    0x9f, 0x7a, 0x00, 0x3f, 0xe2, 0x20, 0x9e, 0x31, 0xf5, 0xcd, 0x5b, 0x85, 0x35, 0xd8, 0x92, 0x87, 0xed, 0x61, 0xd9,
-    0xd3, 0xeb, 0x24, 0x02, 0x29, 0x2a, 0x61, 0x80, 0x56, 0xae, 0xaa, 0x13, 0xd3, 0xb5, 0xf4, 0x0a, 0x5f, 0xa1, 0x4a,
-    0x0c, 0x57, 0x7a, 0x02, 0x36, 0x52, 0xeb, 0x1c, 0x9c, 0xaf, 0xb5, 0xea, 0x05, 0x21, 0xd2, 0x0a, 0x85, 0x70, 0xd2,
-    0x6f, 0x07, 0xd1, 0x89, 0x7e, 0x7e, 0x05, 0x46, 0x6f, 0x74, 0xc2, 0x6e, 0x52, 0x35, 0x04, 0xa2, 0xa9, 0x66, 0x14,
-    0x10, 0x64, 0x15, 0xc1, 0xd2, 0xa0, 0x13, 0x28, 0xd5, 0x0c, 0x52, 0xa7, 0xae, 0x78, 0x68, 0xfa, 0x7a, 0x11, 0x50,
-    0xb4, 0x2a, 0xd8, 0x05, 0xdb, 0x9b, 0x4a, 0x05, 0x85, 0xa1, 0x02, 0x0b, 0xae, 0xd5, 0x46, 0xda, 0x4f, 0xbe, 0x52,
-    0x27, 0x59, 0x4a, 0x1d, 0x99, 0x07, 0x08, 0xfa, 0xf4, 0x60, 0x55, 0x42, 0x7e, 0xd1, 0x19, 0xe1, 0x1f, 0x29, 0x7f,
-    0xbf, 0x98, 0x4c, 0x26, 0xd7, 0xaa, 0xa7, 0x2f, 0xc6, 0x13, 0xd6, 0x65, 0x3b, 0x3d, 0x0c, 0x2e, 0xb7, 0xa4, 0x44,
-    0xec, 0x94, 0x44, 0xbb, 0xe5, 0xed, 0x1a, 0xa3, 0xf0, 0x04, 0x8d, 0x75, 0x7b, 0x3d, 0x56, 0x02, 0x55, 0x96, 0x20,
-    0xbf, 0x4f, 0xe2, 0x34, 0x68, 0x97, 0xfe, 0xa9, 0x14, 0xfc, 0x5f, 0x3c, 0x7a, 0xf4, 0xa8, 0xf4, 0xc7, 0xea, 0xad,
-    0x3d, 0x1e, 0x97, 0xfe, 0x68, 0xa9, 0xd1, 0x68, 0xb7, 0x27, 0x93, 0xd2, 0x8f, 0x55, 0xc1, 0x76, 0x77, 0x34, 0xde,
-    0xee, 0x96, 0xfe, 0x99, 0xd1, 0xa2, 0xf4, 0x99, 0x7c, 0xcb, 0xd9, 0xb8, 0x16, 0xa1, 0x7e, 0xd8, 0x86, 0x4a, 0xc1,
-    0x68, 0x4b, 0x74, 0xf4, 0xc4, 0x63, 0x10, 0x2d, 0x78, 0x06, 0x36, 0x16, 0xf0, 0x36, 0x08, 0xe8, 0x89, 0x14, 0xef,
-    0xe2, 0x93, 0xb2, 0x28, 0xd4, 0x5f, 0x98, 0x32, 0x1d, 0x99, 0x99, 0xe4, 0x39, 0x27, 0x55, 0xd0, 0xac, 0x46, 0xce,
-    0xa2, 0xea, 0x17, 0x21, 0xaf, 0xa4, 0x3d, 0x4a, 0x1b, 0x6c, 0x29, 0x64, 0xfc, 0x8f, 0x57, 0xc9, 0xf8, 0x1f, 0x6e,
-    0x96, 0xf1, 0xc7, 0xb7, 0x13, 0xf1, 0x3f, 0xfc, 0xc1, 0x22, 0xfe, 0x47, 0x53, 0xc4, 0x0b, 0x21, 0xb6, 0x07, 0x56,
-    0x2c, 0x99, 0xaf, 0xc7, 0xd9, 0x79, 0x0b, 0xb7, 0x44, 0x6e, 0x93, 0xf4, 0xdc, 0xb8, 0x95, 0xf0, 0x5f, 0x93, 0x72,
-    0xa4, 0x06, 0x33, 0xbe, 0x4f, 0xcb, 0xb3, 0x93, 0x93, 0x84, 0x29, 0x19, 0x6f, 0x54, 0x90, 0x65, 0xfc, 0x26, 0x0d,
-    0xed, 0x37, 0xe0, 0xa4, 0x1a, 0x25, 0x93, 0x09, 0x14, 0x4d, 0x26, 0xb6, 0x4a, 0xc9, 0x05, 0x79, 0x46, 0xad, 0x5e,
-    0xd7, 0x4a, 0xa8, 0xd5, 0x57, 0x5f, 0x99, 0x65, 0x66, 0x81, 0x8c, 0x46, 0x99, 0xf6, 0x84, 0xac, 0x19, 0xc7, 0x05,
-    0xee, 0xc1, 0xea, 0x7b, 0xba, 0x68, 0xb2, 0xcc, 0x40, 0xa9, 0xc4, 0x23, 0xfc, 0x50, 0x4b, 0xf3, 0xdb, 0x25, 0x22,
-    0x7d, 0x7a, 0x15, 0xb9, 0xea, 0x88, 0xd5, 0xf8, 0x4c, 0x5e, 0x75, 0xac, 0x0a, 0x8b, 0x2f, 0x53, 0x28, 0x1e, 0x5f,
-    0xbc, 0x18, 0x3b, 0x7b, 0x60, 0xca, 0xc6, 0xc5, 0x9b, 0xb4, 0x91, 0x9a, 0x26, 0xc0, 0x0e, 0x43, 0x13, 0xd3, 0x52,
-    0x10, 0xac, 0xca, 0xd1, 0xaf, 0x2a, 0x7b, 0x46, 0x27, 0x99, 0xc1, 0x84, 0x43, 0x0e, 0x6a, 0x64, 0x09, 0xcc, 0xc1,
-    0xa4, 0x2e, 0xa4, 0xef, 0xa5, 0x8b, 0xbc, 0x8e, 0x53, 0xf9, 0x61, 0x6d, 0x3a, 0x15, 0x58, 0x4a, 0xfd, 0x21, 0x4f,
-    0xfc, 0xab, 0x9e, 0x18, 0x88, 0x17, 0x33, 0x8c, 0x4b, 0x15, 0x7c, 0x07, 0xc2, 0xcd, 0xf1, 0x2b, 0x40, 0x62, 0x08,
-    0x15, 0xe3, 0xae, 0xa8, 0x77, 0x79, 0x69, 0x7e, 0x8c, 0xb2, 0xf6, 0xe1, 0xc2, 0x06, 0x0f, 0x30, 0xfc, 0x8a, 0x2c,
-    0x6a, 0x83, 0x6c, 0xc1, 0x1d, 0x87, 0x5a, 0x39, 0x6e, 0xe9, 0xed, 0xb4, 0xdb, 0xa0, 0x62, 0x7c, 0xf1, 0xa9, 0x21,
-    0x47, 0x77, 0x96, 0xf8, 0x5e, 0x15, 0x52, 0x5f, 0xf9, 0xf4, 0x97, 0x26, 0x31, 0x7e, 0x9b, 0x44, 0x20, 0x6a, 0x5c,
-    0x4f, 0x51, 0x8b, 0xd8, 0x7c, 0xf7, 0x95, 0x1b, 0x67, 0x10, 0xd6, 0x5d, 0xc7, 0xc1, 0x32, 0x56, 0x56, 0x2f, 0xc4,
-    0xb6, 0xc2, 0xaa, 0x59, 0x05, 0xe7, 0x06, 0x9d, 0x59, 0x9c, 0x19, 0xb1, 0xe7, 0xda, 0x36, 0x28, 0x55, 0xf0, 0x59,
-    0x44, 0x90, 0xf7, 0x30, 0x4e, 0x2a, 0x7c, 0x60, 0x05, 0x74, 0xdd, 0xfb, 0x34, 0x20, 0x47, 0xbf, 0x54, 0x33, 0xba,
-    0xaa, 0x52, 0x05, 0xa5, 0x79, 0x7a, 0x60, 0x20, 0x43, 0x41, 0x60, 0x58, 0xe3, 0x54, 0xe8, 0x2d, 0x98, 0x86, 0x04,
-    0xb0, 0x76, 0xca, 0xd0, 0x33, 0xb1, 0x15, 0xd8, 0x42, 0x5a, 0x80, 0xd2, 0xc3, 0x0e, 0x7d, 0xab, 0x06, 0x7a, 0xba,
-    0x1a, 0x3b, 0xbe, 0xce, 0x4f, 0xbb, 0x38, 0xf2, 0x8b, 0x33, 0x0f, 0xfe, 0x59, 0x7f, 0x5a, 0x82, 0x94, 0x3f, 0xfe,
-    0x14, 0x73, 0x30, 0xaa, 0xe7, 0x2d, 0x8c, 0x84, 0x50, 0x28, 0x53, 0xaa, 0x43, 0x3a, 0xed, 0x14, 0xb7, 0x92, 0x7a,
-    0x8b, 0x02, 0xdd, 0x39, 0xf2, 0x5b, 0x82, 0x34, 0x4b, 0x59, 0xaf, 0x7e, 0xaa, 0x6d, 0xba, 0x0e, 0x8a, 0x58, 0xc3,
-    0x65, 0x86, 0xee, 0x1f, 0xbf, 0x00, 0xf7, 0x4f, 0xa8, 0xd1, 0xb6, 0xf2, 0x1b, 0xda, 0x6b, 0xdb, 0x07, 0x92, 0xb6,
-    0x9b, 0x64, 0x2d, 0xe4, 0xab, 0xfe, 0xd1, 0x55, 0xfe, 0xcd, 0x4d, 0x67, 0xbc, 0xdd, 0x9d, 0x1d, 0x4f, 0xfd, 0x33,
-    0x0e, 0xc7, 0x9b, 0xc5, 0x74, 0xc6, 0x7b, 0x1b, 0xc8, 0x82, 0x68, 0x82, 0x1f, 0xf1, 0xbb, 0x4d, 0xcb, 0x63, 0x4a,
-    0xb0, 0x5c, 0xa2, 0x5a, 0x0f, 0x3a, 0x8f, 0xc0, 0x61, 0xbb, 0xf5, 0xf0, 0xd7, 0xa3, 0x5f, 0x4a, 0x1a, 0xa9, 0x7b,
-    0xb2, 0xb6, 0xdd, 0x43, 0x79, 0x91, 0x44, 0x17, 0xe0, 0x37, 0x92, 0x8d, 0x71, 0x8c, 0x81, 0xdc, 0xde, 0x3c, 0x93,
-    0xc9, 0x0a, 0x39, 0x4b, 0xe8, 0x37, 0x65, 0xc8, 0xa5, 0xd8, 0x7e, 0x30, 0x3f, 0x57, 0xab, 0xd1, 0x69, 0x24, 0x21,
-    0xfc, 0xa1, 0xb9, 0x06, 0x57, 0x27, 0x37, 0xd4, 0xcf, 0xcb, 0x77, 0x00, 0x06, 0x61, 0xd8, 0xb4, 0x72, 0x01, 0x55,
-    0x1b, 0x4a, 0x8c, 0x6c, 0x8b, 0x6a, 0x20, 0xcb, 0xdf, 0x06, 0x55, 0x19, 0x15, 0xac, 0x87, 0x5f, 0x53, 0x8c, 0xc1,
-    0x3b, 0x95, 0xc6, 0xd3, 0x2c, 0x1e, 0x8f, 0x13, 0xd6, 0x53, 0xf6, 0x91, 0xd5, 0x79, 0x80, 0xc9, 0x0a, 0xe6, 0x92,
-    0xd5, 0x57, 0xc5, 0x20, 0x9e, 0xa6, 0x53, 0x74, 0x0c, 0xf6, 0x1a, 0x7e, 0x12, 0x71, 0x2d, 0x39, 0xe5, 0x29, 0x7e,
-    0xbb, 0x22, 0x1e, 0x3d, 0xd7, 0x71, 0xd9, 0x01, 0x63, 0x91, 0x16, 0xbc, 0xdd, 0xe3, 0xd9, 0x3c, 0x68, 0x6d, 0xd7,
-    0x11, 0xc1, 0x2a, 0x8d, 0x82, 0xb7, 0x06, 0x2d, 0x0f, 0xad, 0x03, 0xa1, 0xe5, 0x2c, 0xbf, 0x23, 0xcb, 0x68, 0x00,
-    0xfc, 0xec, 0x9e, 0x2e, 0x2a, 0xeb, 0xc8, 0xfc, 0xfb, 0xec, 0x96, 0x2f, 0xd7, 0xef, 0x96, 0x2f, 0xd5, 0x6e, 0xb9,
-    0x9e, 0x63, 0xbf, 0x98, 0x74, 0xf0, 0x4f, 0xaf, 0x42, 0x08, 0x56, 0x05, 0xc8, 0x61, 0xa1, 0x5d, 0xdc, 0xea, 0xc2,
-    0x7f, 0x34, 0x74, 0xdb, 0xc3, 0x3f, 0x3e, 0x58, 0x80, 0x6d, 0x0b, 0x0b, 0xf1, 0x5f, 0xbb, 0x56, 0xd5, 0xb9, 0x8f,
-    0x75, 0xd8, 0x6b, 0x67, 0xb5, 0xae, 0x7b, 0xfd, 0xa6, 0x05, 0x79, 0xc5, 0x9d, 0x40, 0x09, 0x63, 0x70, 0xd5, 0xa2,
-    0xe3, 0x63, 0x28, 0x9d, 0x64, 0xa3, 0x45, 0xf1, 0x77, 0x12, 0x7e, 0x49, 0xc4, 0x6b, 0xb7, 0x74, 0x63, 0x1c, 0xd5,
-    0x55, 0x64, 0xbe, 0xa8, 0x11, 0x96, 0x7a, 0x9d, 0x82, 0x02, 0x18, 0x93, 0x39, 0x5d, 0xff, 0xfe, 0x9a, 0x4d, 0xf0,
-    0x1f, 0xb2, 0x36, 0x6b, 0x91, 0xf9, 0xb7, 0x12, 0xe3, 0x5a, 0x22, 0x7c, 0x16, 0x0d, 0xcc, 0x35, 0x6c, 0x3f, 0x5a,
-    0x0f, 0xee, 0xa1, 0x9a, 0x69, 0xa8, 0x94, 0x82, 0xd4, 0x3b, 0xe0, 0x05, 0x44, 0x8b, 0x84, 0x5f, 0x3f, 0xea, 0x55,
-    0x9c, 0xb1, 0x32, 0xea, 0x35, 0x02, 0xbd, 0x6a, 0x7b, 0x4b, 0x29, 0xfd, 0xc5, 0x97, 0xf7, 0xf1, 0x8f, 0x88, 0x7d,
-    0x1d, 0x57, 0xbe, 0x91, 0x88, 0x0d, 0xa0, 0x6f, 0xb4, 0x51, 0x73, 0x7e, 0x84, 0x06, 0x27, 0xff, 0xe7, 0xb6, 0xad,
-    0xd1, 0x58, 0xbf, 0x55, 0x73, 0x69, 0x95, 0x7e, 0x56, 0xeb, 0xcf, 0x1b, 0xfc, 0x96, 0x6d, 0x47, 0xc2, 0x21, 0xa8,
-    0xb7, 0x95, 0xbf, 0xb5, 0x64, 0xa5, 0xb1, 0xa2, 0xf8, 0x6d, 0xdb, 0x57, 0x26, 0x31, 0xf5, 0xd8, 0x08, 0x8f, 0xb5,
-    0x13, 0x29, 0xcf, 0x9d, 0xb1, 0x87, 0xf0, 0x23, 0xff, 0xc2, 0xc2, 0x7b, 0xf8, 0xc1, 0x2f, 0xeb, 0x7c, 0x96, 0xa4,
-    0x60, 0x56, 0x4d, 0x39, 0x9f, 0x07, 0x5b, 0x5b, 0x67, 0x67, 0x67, 0xfe, 0xd9, 0xb6, 0x9f, 0xe5, 0x27, 0x5b, 0xdd,
-    0x76, 0xbb, 0x8d, 0xdf, 0x69, 0xb2, 0xad, 0xd3, 0x98, 0x9d, 0x3d, 0x06, 0xf7, 0xc3, 0x7e, 0x68, 0x3d, 0xb2, 0x1e,
-    0x6e, 0x5b, 0x3b, 0x0f, 0x6c, 0x8b, 0x14, 0x00, 0x94, 0x6c, 0xdb, 0x96, 0x50, 0x00, 0xa1, 0x0d, 0xc5, 0xfd, 0xdd,
-    0x13, 0x65, 0xc3, 0x61, 0x1e, 0xbc, 0xb0, 0x90, 0xc0, 0x7f, 0xcb, 0x3e, 0xb1, 0xfa, 0x56, 0x17, 0x65, 0x2d, 0xa9,
-    0x46, 0xd4, 0x2b, 0xee, 0xf7, 0x51, 0x34, 0x0f, 0x88, 0x8d, 0xcc, 0x42, 0x0c, 0x93, 0x89, 0x52, 0x9a, 0x02, 0xed,
-    0xd2, 0x63, 0x78, 0xc2, 0xcc, 0x29, 0x0b, 0x9e, 0x5f, 0x75, 0x1f, 0x82, 0x8e, 0x3b, 0x6d, 0xdd, 0x1f, 0xb5, 0x5b,
-    0x1d, 0xab, 0xd3, 0xea, 0xfa, 0x0f, 0xad, 0xae, 0xf8, 0x1f, 0x64, 0xe4, 0xb6, 0xd5, 0x81, 0xa7, 0x6d, 0x0b, 0xde,
-    0x4f, 0xef, 0x8b, 0xb4, 0x88, 0xc8, 0xde, 0xea, 0xef, 0xe2, 0xaf, 0x2d, 0x02, 0xa4, 0xbe, 0xb4, 0xc5, 0x2f, 0x5a,
-    0xb3, 0xbf, 0x30, 0x4b, 0x3b, 0x8f, 0xd6, 0x16, 0x77, 0x1f, 0xae, 0x2d, 0xde, 0x7e, 0xb0, 0xb6, 0xf8, 0xfe, 0x4e,
-    0xbd, 0x78, 0xeb, 0x44, 0x54, 0x69, 0xb9, 0x10, 0xda, 0xb3, 0x08, 0x18, 0xe5, 0xdc, 0xe9, 0x00, 0x9c, 0x6d, 0xab,
-    0x85, 0x3f, 0x1e, 0x76, 0x5d, 0xdd, 0xeb, 0x18, 0x7b, 0x69, 0x2c, 0x1f, 0x3e, 0x02, 0x2c, 0x9f, 0x77, 0x1f, 0x8c,
-    0xb0, 0x1d, 0x21, 0x0a, 0xff, 0x4e, 0xb7, 0x1f, 0x8d, 0x40, 0x23, 0x58, 0xf8, 0x0f, 0xfe, 0x4c, 0x77, 0xba, 0x23,
-    0xf1, 0xd2, 0xc6, 0xfa, 0x0f, 0x9d, 0x87, 0x05, 0x34, 0xc5, 0x3f, 0xbf, 0x69, 0x13, 0x1a, 0x0d, 0x78, 0x73, 0xdc,
-    0xfb, 0x40, 0xa3, 0x47, 0xd3, 0xae, 0xff, 0xe5, 0xe9, 0x43, 0xff, 0xd1, 0xb4, 0xf3, 0xf0, 0x83, 0x78, 0x4b, 0x80,
-    0x82, 0x5f, 0xe2, 0xbf, 0x0f, 0xdb, 0xed, 0x69, 0xab, 0xe3, 0x3f, 0x3a, 0xdd, 0xf6, 0xb7, 0x93, 0xd6, 0x03, 0xff,
-    0x11, 0xfe, 0xab, 0x86, 0x9b, 0x66, 0x33, 0x66, 0x5b, 0xb8, 0xde, 0x0d, 0xbf, 0xd7, 0x9c, 0xa3, 0x7b, 0xdf, 0xda,
-    0xb9, 0xff, 0xfc, 0x11, 0xac, 0xd1, 0xb4, 0xd3, 0x85, 0xff, 0xaf, 0x7a, 0xfc, 0x80, 0x84, 0x97, 0x03, 0x47, 0x0c,
-    0x33, 0x58, 0x15, 0xe1, 0xe8, 0x9b, 0x61, 0xf7, 0xbc, 0xef, 0xaf, 0x0a, 0x80, 0x30, 0x7e, 0x73, 0x90, 0x9b, 0xdf,
-    0x2e, 0x02, 0x42, 0x1f, 0xb4, 0xff, 0x03, 0x23, 0x20, 0xdf, 0x37, 0x83, 0xdc, 0xe7, 0xab, 0x79, 0x7b, 0x4d, 0x67,
-    0xed, 0x35, 0x73, 0x0e, 0xff, 0xc2, 0x86, 0x98, 0xad, 0x0d, 0xad, 0x39, 0x37, 0xe3, 0x41, 0x19, 0x6e, 0xe4, 0x73,
-    0x19, 0xf5, 0x2f, 0xf8, 0x15, 0x04, 0x89, 0x6f, 0x26, 0xc8, 0xaf, 0xb7, 0xa3, 0x47, 0xfc, 0x07, 0xd3, 0xa3, 0xe0,
-    0x06, 0x3d, 0x6a, 0x11, 0x77, 0x8a, 0x18, 0x90, 0xa3, 0xbf, 0x4f, 0xef, 0xce, 0xf7, 0xf8, 0xb5, 0xaf, 0x2d, 0x86,
-    0x25, 0x85, 0x2d, 0x72, 0x05, 0xdf, 0x7d, 0xce, 0x09, 0x81, 0x48, 0x68, 0x0e, 0x6d, 0x19, 0x84, 0x99, 0xe3, 0x67,
-    0x71, 0xd5, 0xcb, 0xa9, 0xb8, 0x34, 0x13, 0xd2, 0x8d, 0xb7, 0x1d, 0x1d, 0xc0, 0xc1, 0x1c, 0xf3, 0x70, 0x99, 0xf1,
-    0x08, 0x7f, 0xef, 0x12, 0x8f, 0x79, 0x82, 0xf7, 0x71, 0xe5, 0xdd, 0x35, 0x4c, 0x89, 0xfe, 0x16, 0xd3, 0xb9, 0xd5,
-    0x41, 0xc1, 0x0c, 0x83, 0x06, 0xaf, 0xd8, 0x38, 0x8e, 0x1c, 0xdb, 0x99, 0xc3, 0xae, 0x85, 0x31, 0x5b, 0xb5, 0x5c,
-    0x6a, 0x4a, 0xa3, 0x76, 0x6d, 0xf5, 0xab, 0x7e, 0x72, 0xfc, 0x74, 0x5a, 0x78, 0x28, 0x83, 0x8c, 0xb6, 0xf4, 0x02,
-    0x60, 0x7c, 0x55, 0x92, 0xa3, 0xc0, 0xaf, 0x2c, 0x07, 0x5b, 0x98, 0x0e, 0x1d, 0xbf, 0x0b, 0xae, 0x04, 0x15, 0xe3,
-    0xa7, 0xa8, 0x7e, 0x70, 0x5a, 0xdb, 0x60, 0xda, 0x18, 0xdd, 0xf4, 0x40, 0xc3, 0x95, 0x50, 0x92, 0x08, 0x10, 0x34,
-    0x4a, 0x3d, 0xfd, 0xbb, 0xcf, 0xaa, 0x90, 0x51, 0xf1, 0xf8, 0xe2, 0x40, 0x5e, 0x37, 0xb7, 0x31, 0x7a, 0x4b, 0x51,
-    0xfb, 0xea, 0x53, 0x57, 0x9b, 0xa0, 0x32, 0xe8, 0x17, 0x50, 0xd2, 0x19, 0x38, 0x6a, 0x05, 0xcc, 0xf6, 0xb6, 0xa4,
-    0xf7, 0x10, 0xda, 0x42, 0x27, 0x8c, 0xd9, 0x69, 0x3c, 0x92, 0xa2, 0xdd, 0xb3, 0xe4, 0x2d, 0x95, 0x16, 0x61, 0x11,
-    0x76, 0x3c, 0xe1, 0x3f, 0xc3, 0x0b, 0x6a, 0xb6, 0x30, 0xcd, 0xec, 0xfe, 0xbd, 0x9e, 0x86, 0xa4, 0x9e, 0x28, 0x6f,
-    0xe3, 0x6f, 0xc3, 0x3c, 0x04, 0x7f, 0xed, 0xef, 0xc2, 0x7b, 0xf8, 0xfb, 0x30, 0xef, 0x0d, 0x6d, 0xd7, 0x27, 0xc1,
-    0x78, 0xaf, 0xfa, 0xa5, 0x98, 0x28, 0x15, 0x36, 0x41, 0x87, 0x79, 0xb7, 0x55, 0x66, 0x52, 0x71, 0x75, 0x77, 0x2a,
-    0xc5, 0x05, 0xcf, 0x86, 0xa4, 0x02, 0x21, 0xda, 0xf5, 0x77, 0x0c, 0x71, 0x78, 0xda, 0xc2, 0x9f, 0x35, 0x81, 0x78,
-    0x1f, 0x1a, 0x28, 0x89, 0xf8, 0x12, 0x9a, 0x6f, 0x0b, 0xe1, 0x0b, 0xfd, 0x7e, 0x24, 0x71, 0x25, 0x44, 0x55, 0x9d,
-    0x63, 0xd6, 0x1c, 0x24, 0x89, 0x7c, 0x01, 0xdb, 0x33, 0x62, 0x4e, 0x82, 0x5d, 0x65, 0x44, 0xe5, 0x29, 0xf4, 0x75,
-    0xf4, 0x17, 0xa4, 0xd7, 0xd5, 0x79, 0xb5, 0xdd, 0xb3, 0x66, 0x0a, 0x64, 0xf8, 0xc6, 0x61, 0x15, 0xdd, 0x9a, 0x10,
-    0x5f, 0x52, 0x13, 0x5b, 0xb9, 0xfa, 0xd6, 0xdc, 0x9a, 0xec, 0x5c, 0x73, 0x53, 0xb0, 0x8a, 0x69, 0x68, 0x5f, 0x60,
-    0xfa, 0x0c, 0xfe, 0xac, 0x8a, 0xd5, 0x83, 0x64, 0x28, 0x3f, 0x89, 0xf0, 0x17, 0xc1, 0xd0, 0x8f, 0xb2, 0xda, 0x80,
-    0x9c, 0x3e, 0x95, 0x49, 0x90, 0xbe, 0x18, 0x97, 0x4d, 0x24, 0xc0, 0x66, 0xc0, 0xdf, 0x2b, 0x58, 0xdd, 0xd2, 0x90,
-    0xd7, 0x2f, 0x31, 0xb5, 0x60, 0x1c, 0xe7, 0x74, 0xab, 0x57, 0xe1, 0x5f, 0x8b, 0x6a, 0x56, 0xa4, 0xa6, 0x5d, 0xc9,
-    0x8a, 0x81, 0x8d, 0x45, 0x76, 0x20, 0x13, 0xd3, 0xcc, 0x6f, 0x45, 0x9b, 0xd7, 0x2e, 0xc7, 0x22, 0x27, 0x0d, 0xbf,
-    0xa5, 0x6f, 0x0b, 0x22, 0xdb, 0x20, 0xca, 0xae, 0xc4, 0x89, 0x0c, 0x1c, 0xbc, 0xad, 0x58, 0xfd, 0x72, 0x24, 0x73,
-    0xc3, 0xdb, 0xe6, 0x6a, 0xe9, 0x71, 0x69, 0x1d, 0x5c, 0x19, 0xc3, 0x3b, 0x66, 0x11, 0xf7, 0xa3, 0x94, 0xf2, 0x94,
-    0x1c, 0x43, 0x2c, 0x78, 0x1d, 0xb6, 0xed, 0x96, 0x20, 0x79, 0x8c, 0xdf, 0x1e, 0x25, 0x48, 0xef, 0x43, 0xa1, 0xca,
-    0x71, 0xfe, 0xbe, 0x96, 0xa2, 0x3b, 0xed, 0xf6, 0xdf, 0x1c, 0xec, 0x59, 0x62, 0x63, 0xef, 0x6e, 0xc1, 0xeb, 0x2e,
-    0x79, 0xc7, 0x22, 0x63, 0x23, 0x14, 0x19, 0x1b, 0x96, 0xc8, 0xf3, 0x12, 0x29, 0xad, 0x5b, 0x02, 0x6b, 0xdb, 0x62,
-    0xe9, 0x48, 0x84, 0xf5, 0x66, 0xe0, 0x41, 0xc4, 0xf8, 0x79, 0xb1, 0x2d, 0xec, 0xda, 0xc2, 0x85, 0xb7, 0x55, 0xf2,
-    0x8b, 0xb2, 0x19, 0x78, 0xaa, 0x82, 0x80, 0xa0, 0xe9, 0x99, 0xca, 0x83, 0x91, 0x43, 0xe9, 0x74, 0xd5, 0xd5, 0xd6,
-    0xc5, 0xe2, 0x78, 0x06, 0x62, 0x49, 0xe5, 0xae, 0xbc, 0x97, 0x1d, 0x76, 0x69, 0xaa, 0xfe, 0x51, 0xb9, 0x2e, 0x4a,
-    0x39, 0xed, 0xf4, 0x77, 0x23, 0x69, 0x03, 0xe1, 0x5e, 0x2e, 0x60, 0x33, 0x83, 0xea, 0x43, 0x43, 0xc3, 0x8f, 0xb3,
-    0xad, 0x33, 0x76, 0xdc, 0x8a, 0xe6, 0x71, 0x15, 0x12, 0x44, 0x8d, 0xd8, 0xdf, 0x55, 0xca, 0x51, 0xa6, 0x60, 0xca,
-    0xc7, 0xc8, 0x48, 0xee, 0x40, 0x42, 0x12, 0xc3, 0x96, 0x32, 0xde, 0x48, 0x86, 0x24, 0x2c, 0x06, 0x00, 0x4b, 0xfc,
-    0xac, 0xe2, 0x92, 0x52, 0x33, 0x94, 0x76, 0xff, 0xaf, 0xff, 0xfb, 0xff, 0xc8, 0x50, 0x23, 0xd0, 0x16, 0xc0, 0xc2,
-    0xec, 0x98, 0xea, 0xd4, 0x91, 0x9d, 0x83, 0x73, 0x1a, 0x8f, 0x5b, 0xd3, 0x28, 0x99, 0x00, 0x04, 0x05, 0x13, 0xb9,
-    0xfe, 0xb2, 0x1e, 0xb8, 0x42, 0x82, 0x65, 0x9e, 0xd8, 0x4b, 0xf0, 0xea, 0x45, 0xb8, 0x6c, 0xbf, 0x2b, 0xa7, 0x55,
-    0xe5, 0x12, 0x13, 0x83, 0x1b, 0x19, 0xae, 0x06, 0x0f, 0xd6, 0xb2, 0x5c, 0xd5, 0xef, 0x6a, 0x92, 0xc2, 0x84, 0xd5,
-    0x52, 0x5c, 0xa1, 0xa5, 0x3e, 0x1c, 0xf9, 0xd7, 0x7f, 0xfa, 0x2f, 0xff, 0x43, 0xbd, 0xe2, 0x99, 0xc7, 0x5f, 0xff,
-    0xf1, 0xef, 0xff, 0xdf, 0xff, 0xfd, 0xaf, 0x98, 0x41, 0x2c, 0xcf, 0x45, 0x68, 0x6b, 0x59, 0xd5, 0xa1, 0x88, 0xd8,
-    0x63, 0x56, 0xe5, 0x84, 0xd4, 0x53, 0x61, 0xf7, 0x69, 0x42, 0x62, 0x50, 0x09, 0x1d, 0xf1, 0x39, 0xa5, 0x4e, 0x13,
-    0xd5, 0xae, 0x21, 0x1f, 0x2c, 0xa5, 0x45, 0x47, 0xfd, 0xf6, 0x4e, 0xdb, 0xae, 0x96, 0xb7, 0x6f, 0xf4, 0xdd, 0xc2,
-    0x85, 0xb9, 0x55, 0x62, 0x8e, 0xaf, 0x97, 0x6d, 0xa9, 0x42, 0x5b, 0x58, 0x52, 0x56, 0xe5, 0x16, 0xc6, 0x9c, 0x97,
-    0xf8, 0x1a, 0x74, 0x8d, 0x62, 0x5a, 0xe5, 0x5a, 0x9f, 0xde, 0x2f, 0x0b, 0x40, 0x74, 0x82, 0x4b, 0x23, 0x02, 0x68,
-    0x74, 0x9e, 0xda, 0x42, 0x6b, 0x25, 0xb9, 0x28, 0x69, 0x14, 0xe1, 0xe1, 0xdc, 0x7f, 0xf4, 0xb7, 0xe5, 0x9f, 0x67,
-    0x68, 0x25, 0x58, 0xce, 0x2c, 0x3a, 0x97, 0x7e, 0xcf, 0x83, 0x76, 0x7b, 0x7e, 0xee, 0x2e, 0xab, 0x19, 0xbc, 0xab,
-    0x26, 0xa3, 0xa0, 0x9b, 0x39, 0x20, 0x1d, 0xc4, 0xea, 0xf8, 0x1e, 0x98, 0xfa, 0x6d, 0x0c, 0x07, 0x95, 0xe5, 0x9f,
-    0x96, 0x14, 0x62, 0x8a, 0x7f, 0xc3, 0x03, 0x53, 0x19, 0x8d, 0x83, 0x12, 0x03, 0x8b, 0xa5, 0xd1, 0xab, 0x2b, 0x7a,
-    0x4d, 0x3b, 0xab, 0x29, 0x2b, 0xe6, 0x81, 0xaf, 0x79, 0x54, 0x7b, 0x1f, 0x0f, 0x5f, 0xa7, 0x1d, 0x6f, 0xda, 0x5d,
-    0xea, 0xe1, 0x39, 0xcf, 0x66, 0xe6, 0x09, 0x2f, 0x8b, 0xd8, 0x88, 0x4d, 0x54, 0x14, 0x53, 0xd6, 0x8b, 0xd3, 0xdb,
-    0xf2, 0x0b, 0xdc, 0x6e, 0x40, 0xdb, 0x2c, 0xe2, 0x01, 0x31, 0x6d, 0xcf, 0x3c, 0x03, 0x8e, 0xf0, 0x74, 0x3d, 0x5b,
-    0x1a, 0x73, 0xf5, 0x44, 0x53, 0x8c, 0x15, 0xd6, 0xd3, 0x81, 0x4a, 0x9f, 0xba, 0x9b, 0x43, 0x89, 0x50, 0xc3, 0xaf,
-    0xf2, 0x68, 0xf5, 0x5d, 0xcd, 0x47, 0x97, 0xa2, 0x19, 0xdc, 0xe2, 0xb5, 0xf5, 0x42, 0x4d, 0x8a, 0xda, 0x0f, 0x60,
-    0xfd, 0x10, 0x98, 0x76, 0xb3, 0x15, 0x15, 0x62, 0xab, 0x77, 0xe1, 0xaf, 0xda, 0x1e, 0x8f, 0xe6, 0x73, 0x6a, 0xe8,
-    0x02, 0x37, 0x92, 0x5d, 0x8d, 0x92, 0x82, 0xd2, 0x06, 0xc4, 0x29, 0xbd, 0x6c, 0x23, 0xd9, 0x56, 0x3c, 0xc9, 0xf3,
-    0x7b, 0xfa, 0xd5, 0xdf, 0xff, 0x1f, 0x2a, 0x12, 0x27, 0x08, 0x10, 0x7c, 0x00, 0x00};
+    0x9b, 0x73, 0xb4, 0xeb, 0xc3, 0x7a, 0xa0, 0x93, 0x6c, 0x5b, 0xc0, 0x4b, 0x66, 0xe3, 0xcd, 0xc8, 0xc1, 0x00, 0xc7,
+    0x39, 0x36, 0x4d, 0x59, 0x51, 0xac, 0x03, 0x0b, 0x9c, 0x60, 0xcf, 0xae, 0x9a, 0xd8, 0xb5, 0x0e, 0x00, 0x40, 0x77,
+    0x67, 0x47, 0x4c, 0x0b, 0x15, 0x6c, 0x32, 0x81, 0x8d, 0x87, 0x1a, 0x23, 0xe1, 0x18, 0xf6, 0x0f, 0xfb, 0xf6, 0x6b,
+    0xd8, 0xe3, 0x36, 0xf8, 0x57, 0xae, 0x3e, 0xc0, 0xa5, 0xe9, 0x95, 0x10, 0x32, 0xe6, 0x10, 0x9d, 0x8d, 0x61, 0xf4,
+    0x93, 0x81, 0x54, 0x36, 0xfa, 0xb4, 0x06, 0x27, 0xe0, 0xc2, 0x0d, 0x11, 0x40, 0x6e, 0xc8, 0x56, 0xfb, 0x5f, 0xff,
+    0xe9, 0x7f, 0xfd, 0x37, 0x18, 0x9b, 0xfa, 0xb9, 0xa5, 0x75, 0x75, 0xab, 0xff, 0x09, 0xad, 0x16, 0xe9, 0x0d, 0xed,
+    0xfe, 0xfa, 0x0f, 0xff, 0x1d, 0x9a, 0xd1, 0x45, 0x23, 0x90, 0x59, 0x04, 0xd1, 0x08, 0x6d, 0xbb, 0xcf, 0x02, 0xa9,
+    0x36, 0xc8, 0x95, 0x33, 0xfd, 0x23, 0x82, 0x5d, 0xf0, 0x6c, 0x7e, 0x2d, 0x38, 0x08, 0xf5, 0x28, 0xc9, 0x0a, 0xa6,
+    0xe1, 0x11, 0x72, 0xfe, 0xf3, 0x00, 0xa2, 0xb9, 0xe6, 0xb0, 0x9b, 0x0a, 0x4b, 0x8f, 0x23, 0x56, 0x68, 0xdd, 0x38,
+    0x8d, 0x05, 0x2c, 0x18, 0x27, 0x74, 0x28, 0x5c, 0x02, 0x4b, 0x26, 0x9e, 0xe0, 0x81, 0x04, 0x8f, 0x5b, 0xff, 0x78,
+    0xd9, 0xfa, 0xc1, 0x34, 0xc3, 0x89, 0xb1, 0x44, 0x84, 0x48, 0x8d, 0x00, 0x3f, 0x41, 0x38, 0x7e, 0xd4, 0xcf, 0xd1,
+    0xb9, 0x7e, 0x46, 0x01, 0x2a, 0x26, 0x00, 0x3d, 0x38, 0x43, 0x13, 0xc7, 0x9c, 0x41, 0x64, 0x37, 0x54, 0xee, 0xb1,
+    0x91, 0x24, 0x23, 0x84, 0xe4, 0x47, 0xcc, 0x25, 0xc5, 0x9b, 0x43, 0x8b, 0x9c, 0x7d, 0x4c, 0xb2, 0x33, 0x8c, 0xb9,
+    0x21, 0x91, 0xae, 0xaa, 0x2f, 0xff, 0xe5, 0x9f, 0x7d, 0xff, 0x5f, 0xfe, 0xf9, 0x8a, 0x06, 0x53, 0xd8, 0x13, 0x60,
+    0x24, 0xf3, 0x50, 0xd3, 0xb9, 0x81, 0xd6, 0xfa, 0x41, 0x11, 0xcf, 0xf5, 0x35, 0x12, 0x71, 0x2c, 0x95, 0x78, 0xcb,
+    0x47, 0x42, 0x5b, 0x33, 0xc5, 0xcd, 0xb3, 0x20, 0x64, 0x57, 0x4c, 0x83, 0x55, 0x37, 0xcc, 0x73, 0xe4, 0x06, 0xd7,
+    0xd0, 0xe5, 0x33, 0x31, 0x5e, 0x0f, 0xc6, 0x8d, 0x10, 0x78, 0xa0, 0x65, 0x84, 0x1e, 0x7a, 0x22, 0xb4, 0x48, 0x20,
+    0x96, 0x41, 0xea, 0x94, 0x1a, 0x40, 0x9e, 0x75, 0x40, 0x13, 0x50, 0x93, 0xb8, 0xd2, 0xe1, 0x64, 0x06, 0x1d, 0xe7,
+    0xfd, 0x57, 0x78, 0x59, 0xd0, 0xc2, 0xde, 0xa8, 0xc1, 0x0b, 0x32, 0x38, 0x38, 0x19, 0x1c, 0x52, 0xd3, 0x99, 0xba,
+    0x1e, 0x1d, 0xa7, 0x6c, 0xbd, 0x4e, 0xff, 0x88, 0xdd, 0x6b, 0x5a, 0x99, 0x4b, 0xad, 0x1c, 0x4b, 0x2b, 0x5a, 0x6a,
+    0x65, 0xfc, 0x24, 0x4c, 0x43, 0x2b, 0xc7, 0x57, 0x6a, 0x65, 0xa4, 0xdc, 0x00, 0x47, 0x0e, 0xed, 0x4d, 0x8c, 0x0e,
+    0x19, 0x36, 0x00, 0x47, 0xfb, 0x67, 0x34, 0x65, 0xa3, 0x4f, 0xd2, 0xfc, 0x21, 0x04, 0x30, 0x3c, 0xa2, 0x8d, 0x3c,
+    0x81, 0x01, 0xa8, 0xf2, 0xa3, 0x52, 0x6f, 0x7a, 0x7c, 0x34, 0x26, 0xe0, 0xee, 0x72, 0xc2, 0x50, 0xf4, 0xc3, 0x9a,
+    0x7d, 0xcd, 0xca, 0x2d, 0x1c, 0x47, 0x6c, 0x18, 0xf1, 0x0c, 0x98, 0x6d, 0xe1, 0x60, 0x47, 0xde, 0x52, 0x04, 0xdb,
+    0x02, 0xfb, 0xed, 0x9b, 0xfd, 0x03, 0xdb, 0x3b, 0xce, 0xc6, 0x17, 0x81, 0x0d, 0xde, 0x0c, 0x58, 0x39, 0xae, 0xcf,
+    0xa7, 0x2c, 0x75, 0x94, 0x3f, 0x91, 0x25, 0xe0, 0xaa, 0x65, 0x27, 0xe2, 0xdb, 0x10, 0xcd, 0x83, 0x02, 0x20, 0x2c,
+    0x7d, 0x3c, 0xb2, 0xbf, 0xcb, 0xc5, 0x77, 0x55, 0x79, 0x8e, 0x8f, 0x7d, 0x4c, 0x95, 0xd8, 0xdd, 0x82, 0x07, 0x7c,
+    0xd9, 0x47, 0xbd, 0xa7, 0xdf, 0x04, 0xb0, 0x85, 0x78, 0xdf, 0xc2, 0xf6, 0x5b, 0xaa, 0x2f, 0x42, 0xd1, 0x97, 0xdc,
+    0xa6, 0x4d, 0xfe, 0xca, 0x66, 0xa4, 0xb1, 0xc7, 0x68, 0x12, 0x92, 0xc9, 0x0f, 0x24, 0xe1, 0x63, 0x5d, 0x22, 0xcc,
+    0x0c, 0xa3, 0x88, 0x46, 0xa9, 0x8c, 0x02, 0x59, 0x85, 0x13, 0x92, 0x19, 0x29, 0x26, 0x83, 0x9f, 0x04, 0xfe, 0x91,
+    0xf9, 0x1d, 0x34, 0xf1, 0xc9, 0x22, 0x8d, 0xe4, 0xe1, 0x5f, 0xbc, 0x33, 0xe6, 0x5d, 0x1c, 0x51, 0x4b, 0xe5, 0x74,
+    0x63, 0x34, 0x08, 0x83, 0x13, 0x6d, 0x15, 0x5d, 0x01, 0x3b, 0x28, 0x89, 0xe6, 0x05, 0x0b, 0xd4, 0x83, 0xf4, 0xbf,
+    0xd1, 0x8d, 0x5f, 0x0d, 0x78, 0x98, 0xf6, 0x52, 0xc9, 0xa7, 0x4b, 0xd3, 0x41, 0x7f, 0x00, 0x0e, 0x3a, 0x5e, 0x2e,
+    0x68, 0x45, 0xa0, 0xe5, 0xd3, 0x20, 0x61, 0x13, 0x5e, 0x72, 0xbc, 0xbd, 0xbe, 0x54, 0x11, 0x11, 0xbf, 0xbb, 0x03,
+    0x4e, 0xbb, 0xe5, 0xe3, 0xff, 0x37, 0x8d, 0x3d, 0x0e, 0x52, 0x70, 0xb2, 0xe9, 0x3a, 0x0b, 0x5e, 0x15, 0x04, 0x88,
+    0xcc, 0xf7, 0xa5, 0x31, 0xd1, 0x88, 0x61, 0xb4, 0xa8, 0xe4, 0x39, 0xc8, 0x6d, 0x8f, 0xe7, 0x66, 0x3b, 0x90, 0xb7,
+    0x2b, 0x21, 0xa3, 0xd5, 0xa0, 0xc5, 0xb6, 0x2b, 0xfd, 0x8f, 0xd5, 0xc6, 0x2a, 0xf2, 0x53, 0x7f, 0x5b, 0xa1, 0x90,
+    0x11, 0xa3, 0x2a, 0x85, 0xaa, 0x59, 0x8a, 0x1e, 0x26, 0x4e, 0xab, 0xd1, 0xab, 0x1b, 0x2d, 0xd2, 0x92, 0xb6, 0xfd,
+    0x21, 0x6d, 0x7b, 0x12, 0x63, 0xc3, 0xa5, 0x98, 0x7b, 0x14, 0x25, 0x23, 0x07, 0x01, 0xb0, 0x5a, 0xd6, 0x23, 0xa0,
+    0xa6, 0xab, 0x22, 0x28, 0xfe, 0x43, 0x24, 0x6e, 0x29, 0x84, 0xde, 0x1a, 0x2a, 0x1d, 0x0d, 0xcb, 0xb2, 0x77, 0xc1,
+    0x9c, 0xc3, 0xdf, 0xe4, 0x65, 0x08, 0x71, 0x07, 0x56, 0x7f, 0x47, 0xb0, 0x5d, 0xba, 0x43, 0x8f, 0x31, 0xe3, 0xeb,
+    0x6c, 0xb6, 0xe2, 0x68, 0xdb, 0xeb, 0x52, 0x3c, 0x01, 0x7b, 0xbf, 0x72, 0x6c, 0x34, 0x62, 0xa9, 0xea, 0xa2, 0x45,
+    0x1c, 0x66, 0x53, 0x47, 0x11, 0xcd, 0xff, 0xe6, 0xaa, 0xa0, 0xcc, 0xb7, 0x37, 0x07, 0x65, 0xf8, 0x2d, 0x83, 0x32,
+    0xdf, 0xfe, 0xc1, 0x41, 0x99, 0x6f, 0xcc, 0xa0, 0x0c, 0xca, 0xca, 0x17, 0x9f, 0x13, 0x39, 0xc9, 0xb3, 0xb3, 0x22,
+    0xec, 0xc8, 0x24, 0x00, 0x10, 0x3b, 0xff, 0x31, 0x21, 0x14, 0x98, 0xa8, 0x11, 0x40, 0xa1, 0x88, 0x89, 0xc8, 0x5b,
+    0x04, 0x09, 0x2f, 0xe3, 0x15, 0x6d, 0x9d, 0x20, 0xd8, 0xba, 0xaf, 0x6e, 0x44, 0x81, 0x77, 0xe8, 0xea, 0xb0, 0x51,
+    0x57, 0x45, 0x34, 0x02, 0xfa, 0xa4, 0xa9, 0xee, 0xd8, 0xdd, 0x54, 0x99, 0x69, 0xe6, 0x08, 0x3d, 0x75, 0xe0, 0x20,
+    0x38, 0x68, 0x69, 0xff, 0xe7, 0xc3, 0x4e, 0x6f, 0xbb, 0x33, 0x83, 0xde, 0xa0, 0x4b, 0xe1, 0xad, 0xdd, 0xdb, 0xde,
+    0xc6, 0xb7, 0x33, 0xf5, 0xd6, 0xc5, 0xb7, 0x58, 0xbd, 0xed, 0xe0, 0xdb, 0x48, 0xbd, 0x3d, 0xc0, 0xb7, 0xb1, 0x7a,
+    0x7b, 0x88, 0x6f, 0xa7, 0x76, 0x79, 0xc8, 0x35, 0x70, 0x0f, 0x81, 0xb1, 0xc8, 0xb1, 0x08, 0x54, 0x19, 0xec, 0x5b,
+    0xbc, 0x49, 0x18, 0x9d, 0x04, 0xb1, 0x27, 0x1c, 0xb0, 0x20, 0xf7, 0xce, 0x40, 0xf8, 0x07, 0x94, 0x38, 0xf7, 0x14,
+    0x3f, 0x29, 0x01, 0xfe, 0xca, 0x41, 0x3c, 0x63, 0xea, 0xdb, 0xba, 0x0a, 0x6b, 0xb0, 0x25, 0x0f, 0xdb, 0xc3, 0xb2,
+    0xa7, 0xd7, 0x49, 0x04, 0x6c, 0x54, 0x62, 0x02, 0xad, 0x5c, 0x55, 0x27, 0xa6, 0x6b, 0xe9, 0x15, 0xbe, 0x42, 0x95,
+    0x18, 0x2e, 0xfb, 0x04, 0x6c, 0xa4, 0xd6, 0x39, 0x38, 0x79, 0x6b, 0xd5, 0x0b, 0x42, 0xa4, 0x15, 0x0a, 0xe1, 0xa4,
+    0xdf, 0x0e, 0xa2, 0x13, 0xfd, 0xfc, 0x0a, 0x8c, 0xde, 0xe8, 0x84, 0xdd, 0xa4, 0x6a, 0x08, 0x44, 0x53, 0xcd, 0x28,
+    0x20, 0xc8, 0x2a, 0x82, 0xa5, 0x41, 0x67, 0x53, 0xaa, 0x19, 0xa4, 0x4e, 0x5d, 0xf1, 0xd0, 0xf4, 0xf5, 0x22, 0xa0,
+    0x68, 0x55, 0xb0, 0x0b, 0xb6, 0x37, 0x95, 0x0a, 0x0a, 0x43, 0x05, 0x16, 0x5c, 0xab, 0x8d, 0xb4, 0x3f, 0x7e, 0xa5,
+    0x4e, 0xb2, 0x94, 0x3a, 0x32, 0x0f, 0x2a, 0xf4, 0x29, 0xc5, 0xaa, 0x84, 0xfc, 0xa2, 0x33, 0xc2, 0x3f, 0x52, 0xfe,
+    0x7e, 0x31, 0x99, 0x4c, 0xae, 0x55, 0x4f, 0x5f, 0x8c, 0x27, 0xac, 0xcb, 0x76, 0x7a, 0x18, 0xc4, 0x6e, 0x49, 0x89,
+    0xd8, 0x29, 0x89, 0x76, 0xcb, 0xdb, 0x35, 0x46, 0xe1, 0x09, 0x1a, 0xeb, 0xf6, 0x7a, 0xac, 0x04, 0xaa, 0x2c, 0x41,
+    0x7e, 0x9f, 0xc4, 0x69, 0xd0, 0x2e, 0xfd, 0x53, 0x29, 0xf8, 0xbf, 0x78, 0xf4, 0xe8, 0x51, 0xe9, 0x8f, 0xd5, 0x5b,
+    0x7b, 0x3c, 0x2e, 0xfd, 0xd1, 0x52, 0xa3, 0xd1, 0x6e, 0x4f, 0x26, 0xa5, 0x1f, 0xab, 0x82, 0xed, 0xee, 0x68, 0xbc,
+    0xdd, 0x2d, 0xfd, 0x33, 0xa3, 0x45, 0xe9, 0x33, 0xf9, 0x96, 0xb3, 0x71, 0x2d, 0x12, 0xfe, 0xb0, 0x0d, 0x95, 0x82,
+    0xd1, 0x96, 0xe8, 0xe8, 0x89, 0xc7, 0x20, 0x5a, 0xf0, 0x0c, 0x6c, 0x2c, 0xe0, 0x6d, 0x10, 0xd0, 0x13, 0x29, 0xde,
+    0xc5, 0xa7, 0x6b, 0x51, 0xa8, 0xbf, 0x30, 0x65, 0x3a, 0x32, 0x33, 0xc9, 0x73, 0x4e, 0xaa, 0xa0, 0x59, 0x8d, 0x9c,
+    0x45, 0xd5, 0x2f, 0x42, 0x5e, 0x49, 0x7b, 0x94, 0x36, 0xd8, 0x52, 0xc8, 0xf8, 0x1f, 0xaf, 0x92, 0xf1, 0x3f, 0xdc,
+    0x2c, 0xe3, 0x8f, 0x6f, 0x27, 0xe2, 0x7f, 0xf8, 0x83, 0x45, 0xfc, 0x8f, 0xa6, 0x88, 0x17, 0x42, 0x6c, 0x0f, 0xac,
+    0x58, 0x32, 0x5f, 0x8f, 0xb3, 0xf3, 0x16, 0x6e, 0x89, 0xdc, 0x26, 0xe9, 0xb9, 0x71, 0x2b, 0xe1, 0xbf, 0x26, 0xb5,
+    0x49, 0x0d, 0x66, 0x7c, 0x07, 0x97, 0x67, 0x27, 0x27, 0x09, 0x53, 0x32, 0xde, 0xa8, 0x20, 0xcb, 0xf8, 0x4d, 0x1a,
+    0xda, 0x6f, 0xc0, 0x49, 0x35, 0x4a, 0x26, 0x13, 0x28, 0x9a, 0x4c, 0x6c, 0x95, 0xfa, 0x0b, 0xf2, 0x8c, 0x5a, 0xbd,
+    0xae, 0x95, 0x50, 0xab, 0xaf, 0xbe, 0x32, 0xcb, 0xcc, 0x02, 0x19, 0xf5, 0x32, 0xed, 0x09, 0x59, 0x33, 0x8e, 0x0b,
+    0xdc, 0x83, 0xd5, 0x77, 0x7b, 0xd1, 0x64, 0x99, 0x81, 0x52, 0x89, 0x47, 0xf8, 0x41, 0x98, 0xe6, 0x37, 0x52, 0x44,
+    0x9a, 0xf6, 0x2a, 0x72, 0xd5, 0x51, 0xae, 0xf1, 0x39, 0xbe, 0xea, 0xf8, 0x16, 0x16, 0x5f, 0xa6, 0x6a, 0x3c, 0xbe,
+    0x78, 0x31, 0x76, 0xf6, 0xc0, 0x94, 0x8d, 0x8b, 0x37, 0x69, 0x23, 0x05, 0x4e, 0x80, 0x1d, 0x86, 0x26, 0xa6, 0xa5,
+    0x20, 0x58, 0x75, 0x17, 0xa0, 0xaa, 0xec, 0x19, 0x9d, 0x64, 0xa6, 0x14, 0x0e, 0x39, 0xa8, 0x91, 0x25, 0x30, 0x07,
+    0x93, 0xba, 0x90, 0xbe, 0xcb, 0x2e, 0xf2, 0x47, 0x4e, 0xe5, 0x07, 0xbc, 0xe9, 0xf4, 0x61, 0x29, 0xf5, 0x87, 0xcc,
+    0x2c, 0xa8, 0x7a, 0x62, 0xc0, 0x5f, 0xcc, 0x30, 0x2e, 0x55, 0x90, 0x1f, 0x08, 0x37, 0xc7, 0xaf, 0x0d, 0x89, 0x21,
+    0x54, 0x2c, 0xbd, 0xa2, 0xde, 0xe5, 0xa5, 0xf9, 0xd1, 0xcb, 0xda, 0x07, 0x12, 0x1b, 0x3c, 0xc0, 0xf0, 0x6b, 0xb5,
+    0xa8, 0x0d, 0xb2, 0x05, 0x77, 0x1c, 0x6a, 0xe5, 0xb8, 0xa5, 0xb7, 0xd3, 0x6e, 0x83, 0x8a, 0xf1, 0xc5, 0x27, 0x8d,
+    0x1c, 0xdd, 0x59, 0xe2, 0x7b, 0x55, 0xe8, 0x7e, 0xe5, 0x13, 0x63, 0x9a, 0xc4, 0xf8, 0x0d, 0x14, 0x81, 0xa8, 0x71,
+    0x0d, 0x46, 0x2d, 0x62, 0xf3, 0xdd, 0x57, 0x6e, 0x9c, 0x41, 0x58, 0x77, 0x1d, 0x07, 0xcb, 0x34, 0xd1, 0x7a, 0x21,
+    0xb6, 0x15, 0x56, 0xcd, 0x2a, 0x38, 0x37, 0xe8, 0xcc, 0xe2, 0xcc, 0x88, 0x71, 0xd7, 0xb6, 0x41, 0xa9, 0x82, 0xdc,
+    0x22, 0x52, 0xbd, 0x87, 0xf1, 0x58, 0xe1, 0x03, 0x2b, 0xa0, 0xeb, 0xde, 0xa7, 0x01, 0x39, 0xfa, 0xa5, 0x9a, 0xd1,
+    0x55, 0x95, 0x2a, 0x28, 0xcd, 0x53, 0x0a, 0x03, 0x19, 0x0a, 0x36, 0xc3, 0x1a, 0xa7, 0x42, 0x6f, 0xc1, 0x34, 0x24,
+    0x80, 0xb5, 0x53, 0x86, 0x9e, 0x89, 0xad, 0xc0, 0x16, 0xd2, 0x02, 0x94, 0x1e, 0x76, 0xe8, 0x5b, 0x35, 0xd0, 0xd3,
+    0xd5, 0x18, 0xf5, 0x75, 0x7e, 0xda, 0xc5, 0x91, 0x5f, 0x9c, 0x79, 0xf0, 0xcf, 0xfa, 0xd3, 0x12, 0xa4, 0xfc, 0xf1,
+    0xa7, 0x98, 0x83, 0x51, 0x3d, 0x6f, 0x61, 0x24, 0x84, 0x42, 0xa6, 0x52, 0x1d, 0xd2, 0xa9, 0xaa, 0xb8, 0xfd, 0xd4,
+    0x5b, 0x14, 0xe8, 0xce, 0x91, 0xdf, 0x12, 0xa4, 0x59, 0xca, 0x7a, 0xf5, 0xd3, 0x73, 0xd3, 0x75, 0x50, 0xc4, 0x1a,
+    0x2e, 0x33, 0x74, 0xff, 0xf8, 0x05, 0xb8, 0x7f, 0x42, 0x8d, 0xb6, 0x95, 0xdf, 0xd0, 0x5e, 0xdb, 0x3e, 0x90, 0xb4,
+    0xdd, 0x24, 0x6b, 0x21, 0x5f, 0xf5, 0x8f, 0xae, 0xf2, 0x6f, 0x6e, 0x3a, 0x4b, 0xc6, 0xf8, 0xac, 0xfa, 0x67, 0x1c,
+    0xc2, 0x37, 0x8b, 0xe9, 0x2c, 0xf9, 0x36, 0x90, 0x05, 0xd1, 0x04, 0x3f, 0x16, 0x78, 0x9b, 0x96, 0xc7, 0x94, 0xc8,
+    0xb9, 0x44, 0xb5, 0x1e, 0x74, 0x1e, 0x81, 0xc3, 0x76, 0xeb, 0xe1, 0xaf, 0x47, 0xbf, 0x94, 0x34, 0x52, 0xf7, 0x71,
+    0x6d, 0xbb, 0x87, 0xf2, 0x22, 0x89, 0x2e, 0xc0, 0x6f, 0x24, 0x1b, 0xe3, 0x18, 0x03, 0xb9, 0xbd, 0x79, 0x26, 0x93,
+    0x22, 0x72, 0x96, 0xd0, 0x6f, 0xe4, 0x90, 0x4b, 0xb1, 0xfd, 0x60, 0x7e, 0xae, 0x56, 0xa3, 0xd3, 0x48, 0x76, 0xf8,
+    0x43, 0x73, 0x1a, 0xae, 0x4e, 0xa2, 0xa8, 0x9f, 0xcb, 0xef, 0x00, 0x0c, 0xc2, 0xb0, 0x69, 0xe5, 0x02, 0xaa, 0x36,
+    0x94, 0x18, 0x59, 0x1d, 0xd5, 0x40, 0x96, 0xbf, 0x0d, 0xaa, 0x32, 0x2a, 0x58, 0x0f, 0xbf, 0xda, 0x18, 0x83, 0x77,
+    0x2a, 0x8d, 0xa7, 0x59, 0x3c, 0x1e, 0x27, 0xac, 0xa7, 0xec, 0x23, 0xab, 0xf3, 0x00, 0x93, 0x22, 0xcc, 0x25, 0xab,
+    0xaf, 0x8a, 0x41, 0x3c, 0x4d, 0xa7, 0xe8, 0x18, 0xec, 0x35, 0xfc, 0xf4, 0xe2, 0x5a, 0x72, 0xca, 0x6c, 0x81, 0x76,
+    0x45, 0x3c, 0x7a, 0xae, 0xe3, 0xb2, 0x03, 0xc6, 0x22, 0x2d, 0x78, 0xbb, 0xc7, 0xb3, 0x79, 0xd0, 0xda, 0xae, 0x23,
+    0x82, 0x55, 0x1a, 0x05, 0x6f, 0x0d, 0x5a, 0x1e, 0x5a, 0x07, 0x42, 0xcb, 0x59, 0x7e, 0x47, 0x96, 0xd1, 0x00, 0xf8,
+    0x79, 0x3f, 0x5d, 0x54, 0xd6, 0x91, 0xf9, 0xf7, 0xd9, 0x2d, 0x5f, 0xae, 0xdf, 0x2d, 0x5f, 0xaa, 0xdd, 0x72, 0x3d,
+    0xc7, 0x7e, 0x31, 0xe9, 0xe0, 0x9f, 0x5e, 0x85, 0x10, 0xac, 0x0a, 0x90, 0xc3, 0x42, 0xbb, 0xb8, 0xd5, 0x85, 0xff,
+    0x68, 0xe8, 0xb6, 0x87, 0x7f, 0x7c, 0xb0, 0x00, 0xdb, 0x16, 0x16, 0xe2, 0xbf, 0x76, 0xad, 0xaa, 0x73, 0x1f, 0xeb,
+    0xb0, 0xd7, 0xce, 0x6a, 0x5d, 0xf7, 0xfa, 0x4d, 0x0b, 0xf2, 0x8a, 0x3b, 0x81, 0x12, 0xc6, 0xe0, 0xaa, 0x45, 0xc7,
+    0xc7, 0x50, 0x3a, 0xc9, 0x46, 0x8b, 0xe2, 0xef, 0x24, 0xfc, 0x92, 0x88, 0xd7, 0x6e, 0xe9, 0xc6, 0x38, 0xaa, 0xab,
+    0xc8, 0xb0, 0x51, 0x23, 0x2c, 0xf5, 0x3a, 0x05, 0x05, 0x30, 0x26, 0x73, 0xba, 0xfe, 0xfd, 0x35, 0x9b, 0xe0, 0x3f,
+    0x64, 0x6d, 0xd6, 0x22, 0xf3, 0x6f, 0x25, 0xc6, 0xb5, 0x44, 0xf8, 0x2c, 0x1a, 0x98, 0x6b, 0xd8, 0x7e, 0xb4, 0x1e,
+    0xdc, 0x43, 0x35, 0xd3, 0x50, 0x29, 0x05, 0xa9, 0x77, 0xc0, 0x0b, 0x88, 0x16, 0x09, 0xbf, 0x7e, 0xd4, 0xab, 0x38,
+    0x63, 0x65, 0xd4, 0x6b, 0x04, 0x7a, 0xd5, 0xf6, 0x96, 0x52, 0xfa, 0x8b, 0x2f, 0xef, 0xe3, 0x1f, 0x11, 0xfb, 0x3a,
+    0xae, 0x7c, 0x23, 0x11, 0x1b, 0x40, 0xdf, 0x68, 0xa3, 0xe6, 0xfc, 0x08, 0x0d, 0x4e, 0xfe, 0xcf, 0x6d, 0x5b, 0xa3,
+    0xb1, 0x7e, 0xab, 0xe6, 0xd2, 0x2a, 0xfd, 0xac, 0xd6, 0x9f, 0x37, 0xf8, 0x2d, 0xdb, 0x8e, 0x84, 0x43, 0x50, 0x6f,
+    0x2b, 0x7f, 0x3b, 0xca, 0x4a, 0x63, 0x45, 0xf1, 0xdb, 0xb6, 0xaf, 0x4c, 0x62, 0xea, 0xb1, 0x11, 0x1e, 0x6b, 0x27,
+    0x52, 0x9e, 0x6f, 0x63, 0x0f, 0xe1, 0x47, 0xfe, 0x85, 0x85, 0xf7, 0xf0, 0xc3, 0x62, 0xd6, 0xf9, 0x2c, 0x49, 0xc1,
+    0xac, 0x9a, 0x72, 0x3e, 0x0f, 0xb6, 0xb6, 0xce, 0xce, 0xce, 0xfc, 0xb3, 0x6d, 0x3f, 0xcb, 0x4f, 0xb6, 0xba, 0xed,
+    0x76, 0x1b, 0xbf, 0x07, 0x65, 0x5b, 0xa7, 0x31, 0x3b, 0x7b, 0x0c, 0xee, 0x87, 0xfd, 0xd0, 0x7a, 0x64, 0x3d, 0xdc,
+    0xb6, 0x76, 0x1e, 0xd8, 0x16, 0x29, 0x00, 0x28, 0xd9, 0xb6, 0x2d, 0xa1, 0x00, 0x42, 0x1b, 0x8a, 0xfb, 0xbb, 0x27,
+    0xca, 0x86, 0xc3, 0x7c, 0x7b, 0x61, 0x21, 0x81, 0xff, 0x96, 0x7d, 0x62, 0xf5, 0xad, 0x2e, 0xca, 0x5a, 0x52, 0x8d,
+    0xa8, 0x57, 0xdc, 0xef, 0xa3, 0x68, 0x1e, 0x10, 0x1b, 0x99, 0x85, 0x18, 0x26, 0x13, 0xa5, 0x34, 0x05, 0xda, 0xa5,
+    0xc7, 0xf0, 0x84, 0x19, 0x5a, 0x16, 0x3c, 0xbf, 0xea, 0x3e, 0x04, 0x1d, 0x77, 0xda, 0xba, 0x3f, 0x6a, 0xb7, 0x3a,
+    0x56, 0xa7, 0xd5, 0xf5, 0x1f, 0x5a, 0x5d, 0xf1, 0x3f, 0xc8, 0xc8, 0x6d, 0xab, 0x03, 0x4f, 0xdb, 0x16, 0xbc, 0x9f,
+    0xde, 0x17, 0xe9, 0x17, 0x91, 0xbd, 0xd5, 0xdf, 0xc5, 0x5f, 0x8f, 0x04, 0x48, 0x7d, 0x69, 0x8b, 0x5f, 0xe8, 0x66,
+    0x7f, 0x61, 0x96, 0x76, 0x1e, 0xad, 0x2d, 0xee, 0x3e, 0x5c, 0x5b, 0xbc, 0xfd, 0x60, 0x6d, 0xf1, 0xfd, 0x9d, 0x7a,
+    0xf1, 0xd6, 0x89, 0xa8, 0xd2, 0x72, 0x21, 0xb4, 0x67, 0x11, 0x30, 0xca, 0xb9, 0xd3, 0x01, 0x38, 0xdb, 0x56, 0x0b,
+    0x7f, 0x3c, 0xec, 0xba, 0xba, 0xd7, 0x31, 0xf6, 0xd2, 0x58, 0x3e, 0x7c, 0x04, 0x58, 0x3e, 0xef, 0x3e, 0x18, 0x61,
+    0x3b, 0x42, 0x14, 0xfe, 0x9d, 0x6e, 0x3f, 0x1a, 0x81, 0x46, 0xb0, 0xf0, 0x1f, 0xfc, 0x99, 0xee, 0x74, 0x47, 0xe2,
+    0xa5, 0x8d, 0xf5, 0x1f, 0x3a, 0x0f, 0x0b, 0x68, 0x8a, 0x7f, 0x7e, 0xd3, 0x26, 0x34, 0x1a, 0xf0, 0xe6, 0xb8, 0xf7,
+    0x81, 0x46, 0x8f, 0xa6, 0x5d, 0xff, 0xcb, 0xd3, 0x87, 0xfe, 0xa3, 0x69, 0xe7, 0xe1, 0x07, 0xf1, 0x96, 0x00, 0x05,
+    0xbf, 0xc4, 0x7f, 0x1f, 0xb6, 0xdb, 0xd3, 0x56, 0xc7, 0x7f, 0x74, 0xba, 0xed, 0x6f, 0x27, 0xad, 0x07, 0xfe, 0x23,
+    0xfc, 0x57, 0x0d, 0x37, 0xcd, 0x66, 0xcc, 0xb6, 0x70, 0xbd, 0x1b, 0x7e, 0xaf, 0x39, 0x47, 0xf7, 0xbe, 0xb5, 0x73,
+    0xff, 0xf9, 0x23, 0x58, 0xa3, 0x69, 0xa7, 0x0b, 0xff, 0x5f, 0xf5, 0xf8, 0x01, 0x09, 0x2f, 0x07, 0x8e, 0x18, 0x66,
+    0xca, 0x2a, 0xc2, 0xd1, 0xb7, 0xc9, 0xee, 0x79, 0xdf, 0x5f, 0x15, 0x00, 0x61, 0xfc, 0xe6, 0x20, 0x37, 0xbf, 0x5d,
+    0x04, 0x84, 0x3e, 0x9c, 0xff, 0x07, 0x46, 0x40, 0xbe, 0x6f, 0x06, 0xb9, 0xcf, 0x57, 0xf3, 0x03, 0x9b, 0xce, 0xda,
+    0x6b, 0xe6, 0x1c, 0xfe, 0x85, 0x0d, 0x31, 0x2b, 0x1c, 0x5a, 0x73, 0x6e, 0xc6, 0x83, 0x32, 0xdc, 0xc8, 0xe7, 0x32,
+    0xea, 0x5f, 0xf0, 0x2b, 0x08, 0x12, 0xdf, 0x4c, 0x90, 0x5f, 0x6f, 0x47, 0x8f, 0xf8, 0x0f, 0xa6, 0x47, 0xc1, 0x0d,
+    0x7a, 0xd4, 0x22, 0xee, 0x14, 0x31, 0x20, 0x47, 0x7f, 0x9f, 0xde, 0x9d, 0xef, 0xf1, 0xab, 0x62, 0x5b, 0x0c, 0x4b,
+    0x0a, 0x5b, 0xe4, 0x24, 0xbe, 0xfb, 0x9c, 0x13, 0x02, 0x91, 0x38, 0x1d, 0xda, 0x32, 0x08, 0x33, 0xc7, 0xcf, 0xef,
+    0xaa, 0x97, 0x53, 0x71, 0x39, 0x27, 0xa4, 0x9b, 0x75, 0x3b, 0x3a, 0x80, 0x83, 0xb9, 0xec, 0xe1, 0x32, 0xe3, 0x11,
+    0xfe, 0x7e, 0x27, 0x1e, 0xf3, 0x04, 0xef, 0xfd, 0xca, 0x3b, 0x72, 0x98, 0x7a, 0xfd, 0x2d, 0xa6, 0x8d, 0xab, 0x83,
+    0x82, 0x19, 0x06, 0x0d, 0x5e, 0xb1, 0x71, 0x1c, 0x39, 0xb6, 0x33, 0x87, 0x5d, 0x0b, 0x63, 0xb6, 0x6a, 0x39, 0xdb,
+    0x94, 0xae, 0xed, 0xda, 0xea, 0x57, 0x0a, 0xe5, 0xf8, 0x89, 0xb6, 0xf0, 0x50, 0x06, 0x19, 0x6d, 0xe9, 0x05, 0xc0,
+    0xf8, 0xaa, 0x24, 0x47, 0x81, 0x5f, 0x59, 0x0e, 0xb6, 0x30, 0x1d, 0x3a, 0x7e, 0x17, 0x5c, 0x09, 0x2a, 0xc6, 0x4f,
+    0x5e, 0xfd, 0xe0, 0xb4, 0xb6, 0xc1, 0xb4, 0x31, 0xba, 0xe9, 0x81, 0x86, 0x2b, 0xa1, 0x24, 0x11, 0x20, 0x68, 0x94,
+    0x7a, 0xfa, 0x77, 0xac, 0x55, 0x21, 0xa3, 0xe2, 0xf1, 0xc5, 0x81, 0xbc, 0xd6, 0x6e, 0x63, 0xf4, 0x96, 0xa2, 0xf6,
+    0xd5, 0x27, 0xb5, 0x36, 0x41, 0x65, 0xd0, 0x2f, 0xba, 0xa4, 0x33, 0x70, 0xd4, 0x0a, 0x98, 0x55, 0x6e, 0x49, 0xef,
+    0x21, 0xb4, 0x85, 0x4e, 0x18, 0xb3, 0xd3, 0x78, 0x24, 0x45, 0xbb, 0x67, 0xc9, 0xdb, 0x30, 0x2d, 0xc2, 0x22, 0xec,
+    0x78, 0xc2, 0x7f, 0x86, 0x17, 0xd4, 0x6c, 0x61, 0x9a, 0xd9, 0xfd, 0x7b, 0x3d, 0x0d, 0x49, 0x3d, 0x21, 0xdf, 0xc6,
+    0xdf, 0xba, 0x79, 0x08, 0xfe, 0xda, 0xdf, 0x85, 0xf7, 0xf0, 0xf7, 0x6e, 0xde, 0x1b, 0xda, 0xae, 0x4f, 0x82, 0xf1,
+    0x5e, 0xf5, 0xcb, 0x37, 0x51, 0x2a, 0x6c, 0x82, 0x0e, 0xf3, 0x6e, 0xab, 0xcc, 0xa4, 0xe2, 0xea, 0xee, 0x54, 0x8a,
+    0x0b, 0x9e, 0x0d, 0x49, 0x05, 0x42, 0xb4, 0xeb, 0xef, 0x18, 0xe2, 0xf0, 0xb4, 0x85, 0x3f, 0x6b, 0x02, 0xf1, 0x3e,
+    0x34, 0x50, 0x12, 0xf1, 0x25, 0x34, 0xdf, 0x16, 0xc2, 0x17, 0xfa, 0xfd, 0x48, 0xe2, 0x4a, 0x88, 0xaa, 0x3a, 0xc7,
+    0xac, 0x39, 0x48, 0x12, 0xf9, 0x02, 0xb6, 0x67, 0xc4, 0x9c, 0x04, 0xbb, 0xca, 0x88, 0xca, 0x53, 0xe8, 0xeb, 0xe8,
+    0x2f, 0x55, 0xaf, 0xab, 0xf3, 0x6a, 0xbb, 0x67, 0xcd, 0x14, 0xc8, 0xf0, 0x8d, 0xc3, 0x2a, 0xba, 0x9d, 0x21, 0xbe,
+    0xd8, 0x26, 0xb6, 0x72, 0xf5, 0x4d, 0xbb, 0x35, 0x59, 0xc0, 0xe6, 0xa6, 0x60, 0x15, 0xd3, 0xd0, 0xbe, 0xc0, 0xf4,
+    0x19, 0xfc, 0x59, 0x15, 0xab, 0x07, 0xc9, 0x50, 0x7e, 0x12, 0xe1, 0x2f, 0x9c, 0xa1, 0x1f, 0x65, 0xb5, 0x01, 0x39,
+    0x7d, 0x92, 0x93, 0x20, 0x7d, 0x31, 0x2e, 0x9b, 0x48, 0x80, 0xcd, 0x80, 0xbf, 0xbf, 0xb0, 0xba, 0x0d, 0x22, 0xaf,
+    0x79, 0x62, 0x6a, 0xc1, 0x38, 0xce, 0xe9, 0xf6, 0xb0, 0xc2, 0xbf, 0x16, 0xd5, 0xac, 0x48, 0x4d, 0xbb, 0x92, 0x15,
+    0x03, 0x1b, 0x8b, 0xec, 0x40, 0x26, 0xc0, 0x99, 0xdf, 0xa4, 0x36, 0xaf, 0x77, 0x8e, 0x45, 0xee, 0x1b, 0x7e, 0xb3,
+    0xdf, 0x16, 0x44, 0xb6, 0x41, 0x94, 0x5d, 0x89, 0x13, 0x19, 0x38, 0x78, 0x2b, 0xb2, 0xfa, 0x25, 0x4c, 0xe6, 0x86,
+    0xb7, 0xcd, 0xd5, 0xd2, 0xe3, 0xd2, 0x3a, 0xb8, 0x32, 0x86, 0x77, 0xcc, 0x22, 0xee, 0x47, 0x29, 0xe5, 0x29, 0x39,
+    0x86, 0x58, 0xf0, 0x3a, 0x6c, 0xdb, 0x2d, 0x41, 0xf2, 0x18, 0xbf, 0xa5, 0x4a, 0x90, 0xde, 0x87, 0x42, 0x95, 0x4b,
+    0xfd, 0x7d, 0x2d, 0x15, 0x78, 0xda, 0xed, 0xbf, 0x39, 0xd8, 0xb3, 0xc4, 0xc6, 0xde, 0xdd, 0x82, 0xd7, 0x5d, 0xf2,
+    0x8e, 0x45, 0xc6, 0x46, 0x28, 0x32, 0x36, 0x2c, 0x91, 0xe7, 0x25, 0x52, 0x67, 0xb7, 0x04, 0xd6, 0xb6, 0xc5, 0xd2,
+    0x91, 0x08, 0xeb, 0xcd, 0xc0, 0x83, 0x88, 0xf1, 0x33, 0x66, 0x5b, 0xd8, 0xb5, 0x85, 0x0b, 0x6f, 0xab, 0xe4, 0x17,
+    0x65, 0x33, 0xf0, 0x54, 0x05, 0x01, 0x41, 0xd3, 0x33, 0x95, 0x07, 0x23, 0x87, 0xd2, 0x69, 0xb1, 0xab, 0xad, 0x8b,
+    0xc5, 0xf1, 0x0c, 0xc4, 0x92, 0xca, 0x5d, 0x79, 0x2f, 0x3b, 0xec, 0xd2, 0x54, 0xfd, 0xa3, 0x72, 0x5d, 0x94, 0x72,
+    0xda, 0xe9, 0xef, 0x46, 0xd2, 0x06, 0xc2, 0xbd, 0x5c, 0xc0, 0x66, 0x06, 0xd5, 0x87, 0x86, 0x86, 0x1f, 0x67, 0x5b,
+    0x67, 0xec, 0xb8, 0x15, 0xcd, 0xe3, 0x2a, 0x24, 0x88, 0x1a, 0xb1, 0xbf, 0xab, 0x94, 0xa3, 0x4c, 0xf5, 0x94, 0x8f,
+    0x91, 0x91, 0xdc, 0x81, 0x84, 0x24, 0x86, 0x2d, 0x65, 0xbc, 0x91, 0x0c, 0x49, 0x58, 0x0c, 0x00, 0x96, 0xf8, 0x59,
+    0xc5, 0x25, 0xa5, 0x66, 0x28, 0xed, 0xfe, 0x5f, 0xff, 0xf7, 0xff, 0x91, 0xa1, 0x46, 0xa0, 0x2d, 0x80, 0x85, 0xd9,
+    0x31, 0xd5, 0xa9, 0x23, 0x3b, 0x07, 0xe7, 0x34, 0x1e, 0xb7, 0xa6, 0x51, 0x32, 0x01, 0x08, 0x0a, 0x26, 0xee, 0x14,
+    0xc8, 0x7a, 0xe0, 0x0a, 0x09, 0x96, 0x79, 0x62, 0x2f, 0xc1, 0xab, 0x17, 0xe1, 0xb2, 0xfd, 0xae, 0xdc, 0x59, 0x95,
+    0xb3, 0x4c, 0x0c, 0x6e, 0x64, 0xd2, 0x1a, 0x3c, 0x58, 0xcb, 0xa6, 0x55, 0xbf, 0x13, 0x4a, 0x0a, 0x13, 0x56, 0x4b,
+    0xa5, 0x85, 0x96, 0xfa, 0x70, 0xe4, 0x5f, 0xff, 0xe9, 0xbf, 0xfc, 0x0f, 0xf5, 0x8a, 0x67, 0x1e, 0x7f, 0xfd, 0xc7,
+    0xbf, 0xff, 0x7f, 0xff, 0xf7, 0xbf, 0x62, 0xa6, 0xb2, 0x3c, 0x17, 0xa1, 0xad, 0x65, 0x55, 0x87, 0x22, 0x62, 0x8f,
+    0x59, 0x95, 0x13, 0x52, 0x4f, 0xb9, 0xdd, 0xa7, 0x09, 0x89, 0x41, 0x25, 0x74, 0xc4, 0xe7, 0x94, 0xa2, 0x4d, 0x54,
+    0xbb, 0x86, 0x7c, 0xb0, 0x94, 0x16, 0x1d, 0xf5, 0xdb, 0x3b, 0x6d, 0xbb, 0x5a, 0xde, 0xbe, 0xd1, 0x77, 0x0b, 0x17,
+    0xe6, 0x56, 0x89, 0x39, 0xbe, 0x5e, 0xb6, 0xa5, 0x0a, 0x6d, 0x61, 0x49, 0x59, 0x95, 0x5b, 0x18, 0x73, 0x5e, 0xe2,
+    0x6b, 0xd0, 0x35, 0x8a, 0x69, 0x95, 0x6b, 0x7d, 0x7a, 0xbf, 0x2c, 0x00, 0xd1, 0x09, 0x2e, 0x8d, 0x08, 0xa0, 0xd1,
+    0x79, 0x6a, 0x0b, 0xad, 0x95, 0xe4, 0xa2, 0xa4, 0x51, 0x84, 0x87, 0x73, 0xff, 0xd1, 0xdf, 0x96, 0x7f, 0x9e, 0xa1,
+    0x95, 0x60, 0x39, 0xb3, 0xe8, 0x5c, 0xfa, 0x3d, 0x0f, 0xda, 0xed, 0xf9, 0xb9, 0xbb, 0xac, 0x66, 0xf0, 0xae, 0x9a,
+    0x8c, 0x82, 0x6e, 0xe6, 0x80, 0x74, 0x10, 0xab, 0xe3, 0x7b, 0x60, 0xea, 0xb7, 0x31, 0x1c, 0x54, 0x96, 0x7f, 0x5a,
+    0x52, 0x88, 0x29, 0xfe, 0x0d, 0x0f, 0x4c, 0x65, 0x34, 0x0e, 0x4a, 0x0c, 0x2c, 0x96, 0x46, 0xaf, 0xae, 0xe8, 0x35,
+    0xed, 0xac, 0xa6, 0xac, 0x98, 0x07, 0xbe, 0xe6, 0x51, 0xed, 0x7d, 0x3c, 0x7c, 0x9d, 0x76, 0xbc, 0x69, 0x77, 0xa9,
+    0x87, 0xe7, 0x3c, 0x9b, 0x99, 0x27, 0xbc, 0x2c, 0x62, 0x23, 0x36, 0x51, 0x51, 0x4c, 0x59, 0x2f, 0x4e, 0x6f, 0xcb,
+    0x2f, 0x70, 0xbb, 0x01, 0x6d, 0xb3, 0x88, 0x07, 0xc4, 0xb4, 0x3d, 0xf3, 0x0c, 0x38, 0xc2, 0xd3, 0xf5, 0x6c, 0x69,
+    0xcc, 0xd5, 0x13, 0x4d, 0x31, 0x56, 0x58, 0x4f, 0x07, 0x2a, 0x7d, 0xea, 0x6e, 0x0e, 0x25, 0x42, 0x0d, 0xbf, 0xca,
+    0xa3, 0xd5, 0x77, 0x35, 0x1f, 0x5d, 0x8a, 0x66, 0x70, 0x8b, 0xd7, 0xd6, 0x0b, 0x35, 0x29, 0x6a, 0x3f, 0x80, 0xf5,
+    0x43, 0x60, 0xda, 0xcd, 0x56, 0x54, 0x88, 0xad, 0xde, 0x85, 0xbf, 0x6a, 0x7b, 0x3c, 0x9a, 0xcf, 0xa9, 0xa1, 0x0b,
+    0xdc, 0x48, 0x76, 0x35, 0x4a, 0x0a, 0x4a, 0x1b, 0x10, 0xa7, 0xf4, 0xb2, 0x8d, 0x64, 0x5b, 0xf1, 0x24, 0xcf, 0xef,
+    0xe9, 0x57, 0x8c, 0xff, 0x7f, 0x2a, 0xa5, 0xd0, 0x17, 0x78, 0x7c, 0x00, 0x00};
 
 }  // namespace web_server
 }  // namespace esphome

From f2b63d9c67e423a50e33843c359eaeb896ed3801 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Nov 2022 12:51:11 +1300
Subject: [PATCH 270/838] Bump pylint from 2.15.5 to 2.15.6 (#4058)

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 06deb4df18..e422490443 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,4 +1,4 @@
-pylint==2.15.5
+pylint==2.15.6
 flake8==5.0.4  # also change in .pre-commit-config.yaml when updating
 black==22.10.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.2.2  # also change in .pre-commit-config.yaml when updating

From c1f696c32a4048a34bc1b6f1924c3955904a9cf6 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Mon, 21 Nov 2022 21:43:01 -0300
Subject: [PATCH 271/838] fix display_menu recursive schema gen (#4045)

---
 script/build_language_schema.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/script/build_language_schema.py b/script/build_language_schema.py
index 0b3cdf976d..234082c91e 100644
--- a/script/build_language_schema.py
+++ b/script/build_language_schema.py
@@ -283,6 +283,32 @@ def fix_script():
     config_schema["is_list"] = True
 
 
+def fix_menu():
+    # # Menu has a recursive schema which is not kept properly
+    schemas = output["display_menu_base"][S_SCHEMAS]
+    # 1. Move items to a new schema
+    schemas["MENU_TYPES"] = {
+        S_TYPE: S_SCHEMA,
+        S_SCHEMA: {
+            S_CONFIG_VARS: {
+                "items": schemas["DISPLAY_MENU_BASE_SCHEMA"][S_SCHEMA][S_CONFIG_VARS][
+                    "items"
+                ]
+            }
+        },
+    }
+    # 2. Remove items from the base schema
+    schemas["DISPLAY_MENU_BASE_SCHEMA"][S_SCHEMA][S_CONFIG_VARS].pop("items")
+    # 3. Add extends to this
+    schemas["DISPLAY_MENU_BASE_SCHEMA"][S_SCHEMA][S_EXTENDS].append(
+        "display_menu_base.MENU_TYPES"
+    )
+    # 4. Configure menu items inside as recursive
+    menu = schemas["MENU_TYPES"][S_SCHEMA][S_CONFIG_VARS]["items"]["types"]["menu"]
+    menu[S_CONFIG_VARS].pop("items")
+    menu[S_EXTENDS] = ["display_menu_base.MENU_TYPES"]
+
+
 def get_logger_tags():
     pattern = re.compile(r'^static const char \*const TAG = "(\w.*)";', re.MULTILINE)
     # tags not in components dir
@@ -565,6 +591,7 @@ def build_schema():
     fix_script()
     add_logger_tags()
     shrink()
+    fix_menu()
 
     # aggregate components, so all component info is in same file, otherwise we have dallas.json, dallas.sensor.json, etc.
     data = {}

From 7258a8287582c366ab808750b5e9357db7308818 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 22 Nov 2022 21:12:33 +1300
Subject: [PATCH 272/838] rp2040_pwm frequency is per pair of pins (#4061)

---
 esphome/components/rp2040_pwm/rp2040_pwm.cpp | 4 ++--
 esphome/components/rp2040_pwm/rp2040_pwm.h   | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/esphome/components/rp2040_pwm/rp2040_pwm.cpp b/esphome/components/rp2040_pwm/rp2040_pwm.cpp
index 3f95125578..664a3734f7 100644
--- a/esphome/components/rp2040_pwm/rp2040_pwm.cpp
+++ b/esphome/components/rp2040_pwm/rp2040_pwm.cpp
@@ -42,9 +42,9 @@ void HOT RP2040PWM::write_state(float state) {
     state = 1.0f - state;
   }
 
-  if (frequency_changed_) {
+  if (this->frequency_changed_) {
     this->setup_pwm_();
-    frequency_changed_ = false;
+    this->frequency_changed_ = false;
   }
 
   gpio_set_function(this->pin_->get_pin(), GPIO_FUNC_PWM);
diff --git a/esphome/components/rp2040_pwm/rp2040_pwm.h b/esphome/components/rp2040_pwm/rp2040_pwm.h
index 903079df17..9c88826ae9 100644
--- a/esphome/components/rp2040_pwm/rp2040_pwm.h
+++ b/esphome/components/rp2040_pwm/rp2040_pwm.h
@@ -10,8 +10,6 @@
 namespace esphome {
 namespace rp2040_pwm {
 
-static bool frequency_changed_ = false;
-
 class RP2040PWM : public output::FloatOutput, public Component {
  public:
   void set_pin(InternalGPIOPin *pin) { pin_ = pin; }
@@ -19,7 +17,7 @@ class RP2040PWM : public output::FloatOutput, public Component {
   /// Dynamically update frequency
   void update_frequency(float frequency) override {
     this->set_frequency(frequency);
-    frequency_changed_ = true;
+    this->frequency_changed_ = true;
     this->write_state(this->last_output_);
   }
 
@@ -38,6 +36,7 @@ class RP2040PWM : public output::FloatOutput, public Component {
   float frequency_{1000.0};
   /// Cache last output level for dynamic frequency updating
   float last_output_{0.0};
+  bool frequency_changed_{false};
 };
 
 template<typename... Ts> class SetFrequencyAction : public Action<Ts...> {

From 0f9c956c04fedb8bdec62187686489893ae0a57d Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 23 Nov 2022 09:43:43 +1300
Subject: [PATCH 273/838] Remove manual handling of ethernet power pin (#4062)

---
 esphome/components/ethernet/__init__.py       |  5 ++---
 .../ethernet/ethernet_component.cpp           | 22 +++++--------------
 .../components/ethernet/ethernet_component.h  |  8 ++-----
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/esphome/components/ethernet/__init__.py b/esphome/components/ethernet/__init__.py
index 79ee48f32b..9b7a086d8d 100644
--- a/esphome/components/ethernet/__init__.py
+++ b/esphome/components/ethernet/__init__.py
@@ -79,7 +79,7 @@ CONFIG_SCHEMA = cv.All(
                 CLK_MODES, upper=True, space="_"
             ),
             cv.Optional(CONF_PHY_ADDR, default=0): cv.int_range(min=0, max=31),
-            cv.Optional(CONF_POWER_PIN): pins.gpio_output_pin_schema,
+            cv.Optional(CONF_POWER_PIN): pins.internal_gpio_output_pin_number,
             cv.Optional(CONF_MANUAL_IP): MANUAL_IP_SCHEMA,
             cv.Optional(CONF_DOMAIN, default=".local"): cv.domain_name,
             cv.Optional(CONF_USE_ADDRESS): cv.string_strict,
@@ -118,8 +118,7 @@ async def to_code(config):
     cg.add(var.set_use_address(config[CONF_USE_ADDRESS]))
 
     if CONF_POWER_PIN in config:
-        pin = await cg.gpio_pin_expression(config[CONF_POWER_PIN])
-        cg.add(var.set_power_pin(pin))
+        cg.add(var.set_power_pin(config[CONF_POWER_PIN]))
 
     if CONF_MANUAL_IP in config:
         cg.add(var.set_manual_ip(manual_ip(config[CONF_MANUAL_IP])))
diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index e3baa417df..c125b45ec1 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -29,10 +29,6 @@ void EthernetComponent::setup() {
   // Delay here to allow power to stabilise before Ethernet is initialised.
   delay(300);  // NOLINT
 
-  if (this->power_pin_ != nullptr) {
-    this->power_pin_->setup();
-  }
-
   esp_err_t err;
   err = esp_netif_init();
   ESPHL_ERROR_CHECK(err, "ETH netif init error");
@@ -47,6 +43,8 @@ void EthernetComponent::setup() {
   eth_phy_config_t phy_config = ETH_PHY_DEFAULT_CONFIG();
 
   phy_config.phy_addr = this->phy_addr_;
+  if (this->power_pin_ != -1)
+    phy_config.reset_gpio_num = this->power_pin_;
 
   mac_config.smi_mdc_gpio_num = this->mdc_pin_;
   mac_config.smi_mdio_gpio_num = this->mdio_pin_;
@@ -96,11 +94,6 @@ void EthernetComponent::setup() {
   /* start Ethernet driver state machine */
   err = esp_eth_start(this->eth_handle_);
   ESPHL_ERROR_CHECK(err, "ETH start error");
-
-  if (this->power_pin_ != nullptr) {
-    this->orig_power_control_fun_ = phy->pwrctl;
-    phy->pwrctl = EthernetComponent::eth_phy_power_control;
-  }
 }
 
 void EthernetComponent::loop() {
@@ -169,7 +162,8 @@ void EthernetComponent::dump_config() {
 
   ESP_LOGCONFIG(TAG, "Ethernet:");
   this->dump_connect_params_();
-  LOG_PIN("  Power Pin: ", this->power_pin_);
+  if (this->power_pin_ != -1)
+    ESP_LOGCONFIG(TAG, "  Power Pin: %u", this->power_pin_);
   ESP_LOGCONFIG(TAG, "  MDC Pin: %u", this->mdc_pin_);
   ESP_LOGCONFIG(TAG, "  MDIO Pin: %u", this->mdio_pin_);
   ESP_LOGCONFIG(TAG, "  Type: %s", eth_type.c_str());
@@ -277,12 +271,6 @@ void EthernetComponent::start_connect_() {
   this->connect_begin_ = millis();
   this->status_set_warning();
 }
-esp_err_t EthernetComponent::eth_phy_power_control(esp_eth_phy_t *phy, bool enable) {
-  global_eth_component->power_pin_->digital_write(enable);
-  // power up takes some time, datasheet says max 300µs
-  delay(1);
-  return global_eth_component->orig_power_control_fun_(phy, enable);
-}
 
 bool EthernetComponent::is_connected() { return this->state_ == EthernetComponentState::CONNECTED; }
 
@@ -319,7 +307,7 @@ void EthernetComponent::dump_connect_params_() {
 }
 
 void EthernetComponent::set_phy_addr(uint8_t phy_addr) { this->phy_addr_ = phy_addr; }
-void EthernetComponent::set_power_pin(GPIOPin *power_pin) { this->power_pin_ = power_pin; }
+void EthernetComponent::set_power_pin(int power_pin) { this->power_pin_ = power_pin; }
 void EthernetComponent::set_mdc_pin(uint8_t mdc_pin) { this->mdc_pin_ = mdc_pin; }
 void EthernetComponent::set_mdio_pin(uint8_t mdio_pin) { this->mdio_pin_ = mdio_pin; }
 void EthernetComponent::set_type(EthernetType type) { this->type_ = type; }
diff --git a/esphome/components/ethernet/ethernet_component.h b/esphome/components/ethernet/ethernet_component.h
index abf8b7791f..409dbd8ca5 100644
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -45,7 +45,7 @@ class EthernetComponent : public Component {
   bool is_connected();
 
   void set_phy_addr(uint8_t phy_addr);
-  void set_power_pin(GPIOPin *power_pin);
+  void set_power_pin(int power_pin);
   void set_mdc_pin(uint8_t mdc_pin);
   void set_mdio_pin(uint8_t mdio_pin);
   void set_type(EthernetType type);
@@ -63,11 +63,9 @@ class EthernetComponent : public Component {
   void start_connect_();
   void dump_connect_params_();
 
-  static esp_err_t eth_phy_power_control(esp_eth_phy_t *phy, bool enable);
-
   std::string use_address_;
   uint8_t phy_addr_{0};
-  GPIOPin *power_pin_{nullptr};
+  int power_pin_{-1};
   uint8_t mdc_pin_{23};
   uint8_t mdio_pin_{18};
   EthernetType type_{ETHERNET_TYPE_LAN8720};
@@ -80,8 +78,6 @@ class EthernetComponent : public Component {
   uint32_t connect_begin_;
   esp_netif_t *eth_netif_{nullptr};
   esp_eth_handle_t eth_handle_;
-
-  std::function<esp_err_t(esp_eth_phy_t *, bool)> orig_power_control_fun_;
 };
 
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)

From 195c78846fcc0398eca4ce771c9d8805519e70f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Nov 2022 09:45:07 +1300
Subject: [PATCH 274/838] Bump aioesphomeapi from 11.4.3 to 12.0.0 (#4070)

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 90408a7e14..d9814c55ce 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.5  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
 esphome-dashboard==20221109.0
-aioesphomeapi==11.4.3
+aioesphomeapi==12.0.0
 zeroconf==0.39.4
 
 # esp-idf requires this, but doesn't bundle it by default

From fef60e335ed47b2fd314a6163621d4d0ea23df7e Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 22 Nov 2022 14:46:23 -0600
Subject: [PATCH 275/838] Avoid 128bit uuid loop for 16/32 bit uuids (#4068)

---
 .../esp32_ble_tracker/esp32_ble_tracker.cpp           | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 4aaa6dfa32..223034578b 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -449,10 +449,13 @@ ESPBTUUID ESPBTUUID::from_raw(const std::string &data) {
 ESPBTUUID ESPBTUUID::from_uuid(esp_bt_uuid_t uuid) {
   ESPBTUUID ret;
   ret.uuid_.len = uuid.len;
-  ret.uuid_.uuid.uuid16 = uuid.uuid.uuid16;
-  ret.uuid_.uuid.uuid32 = uuid.uuid.uuid32;
-  for (size_t i = 0; i < ESP_UUID_LEN_128; i++)
-    ret.uuid_.uuid.uuid128[i] = uuid.uuid.uuid128[i];
+  if (uuid.len == ESP_UUID_LEN_16) {
+    ret.uuid_.uuid.uuid16 = uuid.uuid.uuid16;
+  } else if (uuid.len == ESP_UUID_LEN_32) {
+    ret.uuid_.uuid.uuid32 = uuid.uuid.uuid32;
+  } else if (uuid.len == ESP_UUID_LEN_128) {
+    memcpy(ret.uuid_.uuid.uuid128, uuid.uuid.uuid128, ESP_UUID_LEN_128);
+  }
   return ret;
 }
 ESPBTUUID ESPBTUUID::as_128bit() const {

From 1f33ad037d42ae2522cc4075e04fb5794703a5cd Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 22 Nov 2022 14:46:59 -0600
Subject: [PATCH 276/838] Avoid creating a new espbt::ESPBTUUID each loop when
 registering for notify (#4069)

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

diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 3579d93c5a..964ff29771 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -299,7 +299,7 @@ BLEDescriptor *BLEClientBase::get_config_descriptor(uint16_t handle) {
   auto *chr = this->get_characteristic(handle);
   if (chr != nullptr) {
     for (auto &desc : chr->descriptors) {
-      if (desc->uuid == espbt::ESPBTUUID::from_uint16(0x2902))
+      if (desc->uuid.get_uuid().uuid.uuid16 == 0x2902)
         return desc;
     }
   }

From 91925b1826f8cbefe01cdfedf66a247f68130f22 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 23 Nov 2022 09:54:55 +1300
Subject: [PATCH 277/838] Update ESP-IDF and platform version (#3565)

Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 esphome/components/esp32/__init__.py               | 6 +++---
 esphome/components/ethernet/__init__.py            | 1 -
 esphome/components/ethernet/ethernet_component.cpp | 4 ++--
 esphome/components/ethernet/ethernet_component.h   | 4 ++--
 esphome/core/defines.h                             | 3 +--
 esphome/core/helpers.cpp                           | 2 +-
 esphome/core/helpers.h                             | 2 +-
 platformio.ini                                     | 4 ++--
 8 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index 1a52ee7314..2e9d9708a5 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -138,11 +138,11 @@ ARDUINO_PLATFORM_VERSION = cv.Version(5, 2, 0)
 # The default/recommended esp-idf framework version
 #  - https://github.com/espressif/esp-idf/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/tool/framework-espidf
-RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 3, 2)
+RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 4, 2)
 # The platformio/espressif32 version to use for esp-idf frameworks
 #  - https://github.com/platformio/platform-espressif32/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif32
-ESP_IDF_PLATFORM_VERSION = cv.Version(3, 5, 0)
+ESP_IDF_PLATFORM_VERSION = cv.Version(5, 2, 0)
 
 
 def _arduino_check_versions(value):
@@ -184,7 +184,7 @@ def _esp_idf_check_versions(value):
     value = value.copy()
     lookups = {
         "dev": (cv.Version(5, 0, 0), "https://github.com/espressif/esp-idf.git"),
-        "latest": (cv.Version(4, 3, 2), None),
+        "latest": (cv.Version(4, 4, 2), None),
         "recommended": (RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION, None),
     }
 
diff --git a/esphome/components/ethernet/__init__.py b/esphome/components/ethernet/__init__.py
index 9b7a086d8d..b3614d8fcf 100644
--- a/esphome/components/ethernet/__init__.py
+++ b/esphome/components/ethernet/__init__.py
@@ -90,7 +90,6 @@ CONFIG_SCHEMA = cv.All(
         }
     ).extend(cv.COMPONENT_SCHEMA),
     _validate,
-    cv.only_with_arduino,
 )
 
 
diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index c125b45ec1..c4be83d5d3 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -3,7 +3,7 @@
 #include "esphome/core/util.h"
 #include "esphome/core/application.h"
 
-#ifdef USE_ESP32_FRAMEWORK_ARDUINO
+#ifdef USE_ESP32
 
 #include <lwip/dns.h>
 #include "esp_event.h"
@@ -326,4 +326,4 @@ void EthernetComponent::set_use_address(const std::string &use_address) { this->
 }  // namespace ethernet
 }  // namespace esphome
 
-#endif  // USE_ESP32_FRAMEWORK_ARDUINO
+#endif  // USE_ESP32
diff --git a/esphome/components/ethernet/ethernet_component.h b/esphome/components/ethernet/ethernet_component.h
index 409dbd8ca5..ed784e1bc0 100644
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -4,7 +4,7 @@
 #include "esphome/core/hal.h"
 #include "esphome/components/network/ip_address.h"
 
-#ifdef USE_ESP32_FRAMEWORK_ARDUINO
+#ifdef USE_ESP32
 
 #include "esp_eth.h"
 #include "esp_eth_mac.h"
@@ -86,4 +86,4 @@ extern EthernetComponent *global_eth_component;
 }  // namespace ethernet
 }  // namespace esphome
 
-#endif  // USE_ESP32_FRAMEWORK_ARDUINO
+#endif  // USE_ESP32
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index c1ec7d2213..01fc16cc02 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -79,8 +79,7 @@
 #endif
 
 #ifdef USE_ESP_IDF
-#define USE_ARDUINO_VERSION_CODE VERSION_CODE(4, 3, 0)
-#define USE_ESP32_IGNORE_EFUSE_MAC_CRC
+#define USE_ESP_IDF_VERSION_CODE VERSION_CODE(4, 4, 2)
 #endif
 #endif
 
diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index 9f9a1f10b1..7ec5d9d23c 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -422,7 +422,7 @@ void HighFrequencyLoopRequester::stop() {
 }
 bool HighFrequencyLoopRequester::is_high_frequency() { return num_requests > 0; }
 
-void get_mac_address_raw(uint8_t *mac) {
+void get_mac_address_raw(uint8_t *mac) {  // NOLINT(readability-non-const-parameter)
 #if defined(USE_ESP32)
 #if defined(USE_ESP32_IGNORE_EFUSE_MAC_CRC)
   // On some devices, the MAC address that is burnt into EFuse does not
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index 6f3b5805cf..477dadc187 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -568,7 +568,7 @@ class HighFrequencyLoopRequester {
 };
 
 /// Get the device MAC address as raw bytes, written into the provided byte array (6 bytes).
-void get_mac_address_raw(uint8_t *mac);
+void get_mac_address_raw(uint8_t *mac);  // NOLINT(readability-non-const-parameter)
 
 /// Get the device MAC address as a string, in lowercase hex notation.
 std::string get_mac_address();
diff --git a/platformio.ini b/platformio.ini
index 144dd83229..918cd40888 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -133,9 +133,9 @@ extra_scripts = post:esphome/components/esp32/post_build.py.script
 ; This are common settings for the ESP32 (all variants) using IDF.
 [common:esp32-idf]
 extends = common:idf
-platform = platformio/espressif32 @ 3.5.0
+platform = platformio/espressif32 @ 5.2.0
 platform_packages =
-    platformio/framework-espidf @ ~3.40302.0
+    platformio/framework-espidf @ ~3.40402.0
 
 framework = espidf
 lib_deps =

From ef26677b67bbfa30631dfbde16f3750f5484f575 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 23 Nov 2022 10:32:51 +1300
Subject: [PATCH 278/838] Always use brackets around single log macros (#4072)

---
 esphome/components/adc/adc_sensor.cpp         |  5 ++--
 esphome/components/aht10/aht10.cpp            |  3 ++-
 esphome/components/am43/am43.cpp              |  3 ++-
 esphome/components/am43/cover/am43_cover.cpp  | 15 +++++++----
 esphome/components/anova/anova.cpp            |  9 ++++---
 esphome/components/climate/climate.cpp        |  9 ++++---
 esphome/components/dac7678/dac7678_output.cpp |  9 ++++---
 .../deep_sleep/deep_sleep_component.cpp       |  4 +--
 esphome/components/dfplayer/dfplayer.cpp      |  6 +++--
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   |  3 ++-
 .../esp32_improv/esp32_improv_component.cpp   |  3 ++-
 .../ethernet/ethernet_component.cpp           |  3 ++-
 esphome/components/ezo/ezo.cpp                |  3 ++-
 esphome/components/ezo_pmp/ezo_pmp.cpp        |  3 ++-
 esphome/components/fan/fan.cpp                | 27 ++++++++++++-------
 esphome/components/nextion/nextion.cpp        |  3 ++-
 esphome/components/ota/ota_component.cpp      |  3 ++-
 .../components/pn532/pn532_mifare_classic.cpp | 15 +++++++----
 .../remote_base/pronto_protocol.cpp           |  3 ++-
 esphome/components/rf_bridge/rf_bridge.cpp    |  3 ++-
 .../components/shelly_dimmer/stm32flash.cpp   |  3 ++-
 esphome/components/sim800l/sim800l.cpp        |  3 ++-
 .../components/slow_pwm/slow_pwm_output.cpp   |  9 ++++---
 esphome/components/sonoff_d1/sonoff_d1.cpp    |  3 ++-
 .../thermostat/thermostat_climate.cpp         |  6 +++--
 .../components/tuya/climate/tuya_climate.cpp  | 15 +++++++----
 esphome/components/tuya/cover/tuya_cover.cpp  | 12 ++++++---
 esphome/components/tuya/fan/tuya_fan.cpp      | 12 ++++++---
 esphome/components/tuya/light/tuya_light.cpp  |  6 +++--
 29 files changed, 133 insertions(+), 68 deletions(-)

diff --git a/esphome/components/adc/adc_sensor.cpp b/esphome/components/adc/adc_sensor.cpp
index 1e8d740062..9bfe0f5eed 100644
--- a/esphome/components/adc/adc_sensor.cpp
+++ b/esphome/components/adc/adc_sensor.cpp
@@ -117,10 +117,11 @@ void ADCSensor::dump_config() {
   }
 #endif  // USE_ESP32
 #ifdef USE_RP2040
-  if (this->is_temperature_)
+  if (this->is_temperature_) {
     ESP_LOGCONFIG(TAG, "  Pin: Temperature");
-  else
+  } else {
     LOG_PIN("  Pin: ", pin_);
+  }
 #endif
   LOG_UPDATE_INTERVAL(this);
 }
diff --git a/esphome/components/aht10/aht10.cpp b/esphome/components/aht10/aht10.cpp
index 3c690c39b5..ad1a68498b 100644
--- a/esphome/components/aht10/aht10.cpp
+++ b/esphome/components/aht10/aht10.cpp
@@ -122,8 +122,9 @@ void AHT10Component::update() {
     this->temperature_sensor_->publish_state(temperature);
   }
   if (this->humidity_sensor_ != nullptr) {
-    if (std::isnan(humidity))
+    if (std::isnan(humidity)) {
       ESP_LOGW(TAG, "Invalid humidity! Sensor reported 0%% Hum");
+    }
     this->humidity_sensor_->publish_state(humidity);
   }
   this->status_clear_warning();
diff --git a/esphome/components/am43/am43.cpp b/esphome/components/am43/am43.cpp
index 9a0e5999d2..09723496d9 100644
--- a/esphome/components/am43/am43.cpp
+++ b/esphome/components/am43/am43.cpp
@@ -104,8 +104,9 @@ void Am43::update() {
       auto status =
           esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
                                    packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-      if (status)
+      if (status) {
         ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
+      }
     }
     this->current_sensor_++;
   }
diff --git a/esphome/components/am43/cover/am43_cover.cpp b/esphome/components/am43/cover/am43_cover.cpp
index ba8e350732..b09f5ab767 100644
--- a/esphome/components/am43/cover/am43_cover.cpp
+++ b/esphome/components/am43/cover/am43_cover.cpp
@@ -56,8 +56,9 @@ void Am43Component::control(const CoverCall &call) {
     auto status =
         esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
                                  packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-    if (status)
+    if (status) {
       ESP_LOGW(TAG, "[%s] Error writing stop command to device, error = %d", this->get_name().c_str(), status);
+    }
   }
   if (call.get_position().has_value()) {
     auto pos = *call.get_position();
@@ -68,8 +69,9 @@ void Am43Component::control(const CoverCall &call) {
     auto status =
         esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
                                  packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-    if (status)
+    if (status) {
       ESP_LOGW(TAG, "[%s] Error writing set_position command to device, error = %d", this->get_name().c_str(), status);
+    }
   }
 }
 
@@ -126,18 +128,21 @@ void Am43Component::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
           auto status = esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(),
                                                  this->char_handle_, packet->length, packet->data,
                                                  ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-          if (status)
+          if (status) {
             ESP_LOGW(TAG, "[%s] Error writing set_position to device, error = %d", this->get_name().c_str(), status);
+          }
         } else {
           ESP_LOGW(TAG, "[%s] AM43 pin rejected!", this->get_name().c_str());
         }
       }
 
-      if (this->decoder_->has_set_position_response() && !this->decoder_->set_position_ok_)
+      if (this->decoder_->has_set_position_response() && !this->decoder_->set_position_ok_) {
         ESP_LOGW(TAG, "[%s] Got nack after sending set_position. Bad pin?", this->get_name().c_str());
+      }
 
-      if (this->decoder_->has_set_state_response() && !this->decoder_->set_state_ok_)
+      if (this->decoder_->has_set_state_response() && !this->decoder_->set_state_ok_) {
         ESP_LOGW(TAG, "[%s] Got nack after sending set_state. Bad pin?", this->get_name().c_str());
+      }
       break;
     }
     default:
diff --git a/esphome/components/anova/anova.cpp b/esphome/components/anova/anova.cpp
index cafd30149d..ebf6c1d037 100644
--- a/esphome/components/anova/anova.cpp
+++ b/esphome/components/anova/anova.cpp
@@ -37,16 +37,18 @@ void Anova::control(const ClimateCall &call) {
     auto status =
         esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
                                  pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-    if (status)
+    if (status) {
       ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
+    }
   }
   if (call.get_target_temperature().has_value()) {
     auto *pkt = this->codec_->get_set_target_temp_request(*call.get_target_temperature());
     auto status =
         esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
                                  pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-    if (status)
+    if (status) {
       ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
+    }
   }
 }
 
@@ -143,8 +145,9 @@ void Anova::update() {
     auto status =
         esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
                                  pkt->length, pkt->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
-    if (status)
+    if (status) {
       ESP_LOGW(TAG, "[%s] esp_ble_gattc_write_char failed, status=%d", this->parent_->address_str().c_str(), status);
+    }
     this->current_request_++;
   }
 }
diff --git a/esphome/components/climate/climate.cpp b/esphome/components/climate/climate.cpp
index 776a54f59d..512dbdd6dd 100644
--- a/esphome/components/climate/climate.cpp
+++ b/esphome/components/climate/climate.cpp
@@ -540,12 +540,15 @@ void Climate::dump_traits_(const char *tag) {
   ESP_LOGCONFIG(tag, "      - Min: %.1f", traits.get_visual_min_temperature());
   ESP_LOGCONFIG(tag, "      - Max: %.1f", traits.get_visual_max_temperature());
   ESP_LOGCONFIG(tag, "      - Step: %.1f", traits.get_visual_temperature_step());
-  if (traits.get_supports_current_temperature())
+  if (traits.get_supports_current_temperature()) {
     ESP_LOGCONFIG(tag, "  [x] Supports current temperature");
-  if (traits.get_supports_two_point_target_temperature())
+  }
+  if (traits.get_supports_two_point_target_temperature()) {
     ESP_LOGCONFIG(tag, "  [x] Supports two-point target temperature");
-  if (traits.get_supports_action())
+  }
+  if (traits.get_supports_action()) {
     ESP_LOGCONFIG(tag, "  [x] Supports action");
+  }
   if (!traits.get_supported_modes().empty()) {
     ESP_LOGCONFIG(tag, "  [x] Supported modes:");
     for (ClimateMode m : traits.get_supported_modes())
diff --git a/esphome/components/dac7678/dac7678_output.cpp b/esphome/components/dac7678/dac7678_output.cpp
index bfb18e4a4e..b6de615b30 100644
--- a/esphome/components/dac7678/dac7678_output.cpp
+++ b/esphome/components/dac7678/dac7678_output.cpp
@@ -29,8 +29,9 @@ void DAC7678Output::setup() {
     ESP_LOGE(TAG, "Reset failed");
     this->mark_failed();
     return;
-  } else
+  } else {
     ESP_LOGV(TAG, "Reset succeeded");
+  }
 
   delayMicroseconds(1000);
 
@@ -40,16 +41,18 @@ void DAC7678Output::setup() {
       ESP_LOGE(TAG, "Set internal reference failed");
       this->mark_failed();
       return;
-    } else
+    } else {
       ESP_LOGV(TAG, "Internal reference enabled");
+    }
   }
 }
 
 void DAC7678Output::dump_config() {
   if (this->is_failed()) {
     ESP_LOGE(TAG, "Setting up DAC7678 failed!");
-  } else
+  } else {
     ESP_LOGCONFIG(TAG, "DAC7678 initialised");
+  }
 }
 
 void DAC7678Output::register_channel(DAC7678Channel *channel) {
diff --git a/esphome/components/deep_sleep/deep_sleep_component.cpp b/esphome/components/deep_sleep/deep_sleep_component.cpp
index 8db100f236..2261106b12 100644
--- a/esphome/components/deep_sleep/deep_sleep_component.cpp
+++ b/esphome/components/deep_sleep/deep_sleep_component.cpp
@@ -114,9 +114,9 @@ void DeepSleepComponent::begin_sleep(bool manual) {
 #endif
 
   ESP_LOGI(TAG, "Beginning Deep Sleep");
-  if (this->sleep_duration_.has_value())
+  if (this->sleep_duration_.has_value()) {
     ESP_LOGI(TAG, "Sleeping for %" PRId64 "us", *this->sleep_duration_);
-
+  }
   App.run_safe_shutdown_hooks();
 
 #if defined(USE_ESP32)
diff --git a/esphome/components/dfplayer/dfplayer.cpp b/esphome/components/dfplayer/dfplayer.cpp
index 7df551f5d2..dcba95e20c 100644
--- a/esphome/components/dfplayer/dfplayer.cpp
+++ b/esphome/components/dfplayer/dfplayer.cpp
@@ -77,14 +77,16 @@ void DFPlayer::loop() {
           case 0x3A:
             if (argument == 1) {
               ESP_LOGI(TAG, "USB loaded");
-            } else if (argument == 2)
+            } else if (argument == 2) {
               ESP_LOGI(TAG, "TF Card loaded");
+            }
             break;
           case 0x3B:
             if (argument == 1) {
               ESP_LOGI(TAG, "USB unloaded");
-            } else if (argument == 2)
+            } else if (argument == 2) {
               ESP_LOGI(TAG, "TF Card unloaded");
+            }
             break;
           case 0x3F:
             if (argument == 1) {
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 223034578b..ed373e4c54 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -831,8 +831,9 @@ void ESP32BLETracker::print_bt_device_info(const ESPBTDevice &device) {
   }
 
   ESP_LOGD(TAG, "  Address Type: %s", address_type_s);
-  if (!device.get_name().empty())
+  if (!device.get_name().empty()) {
     ESP_LOGD(TAG, "  Name: '%s'", device.get_name().c_str());
+  }
   for (auto &tx_power : device.get_tx_powers()) {
     ESP_LOGD(TAG, "  TX Power: %d", tx_power);
   }
diff --git a/esphome/components/esp32_improv/esp32_improv_component.cpp b/esphome/components/esp32_improv/esp32_improv_component.cpp
index 956934abc1..5ff4b0827d 100644
--- a/esphome/components/esp32_improv/esp32_improv_component.cpp
+++ b/esphome/components/esp32_improv/esp32_improv_component.cpp
@@ -177,8 +177,9 @@ void ESP32ImprovComponent::set_state_(improv::State state) {
 }
 
 void ESP32ImprovComponent::set_error_(improv::Error error) {
-  if (error != improv::ERROR_NONE)
+  if (error != improv::ERROR_NONE) {
     ESP_LOGE(TAG, "Error: %d", error);
+  }
   if (this->error_->get_value().empty() || this->error_->get_value()[0] != error) {
     uint8_t data[1]{error};
     this->error_->set_value(data, 1);
diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index c4be83d5d3..fa66d824be 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -162,8 +162,9 @@ void EthernetComponent::dump_config() {
 
   ESP_LOGCONFIG(TAG, "Ethernet:");
   this->dump_connect_params_();
-  if (this->power_pin_ != -1)
+  if (this->power_pin_ != -1) {
     ESP_LOGCONFIG(TAG, "  Power Pin: %u", this->power_pin_);
+  }
   ESP_LOGCONFIG(TAG, "  MDC Pin: %u", this->mdc_pin_);
   ESP_LOGCONFIG(TAG, "  MDIO Pin: %u", this->mdio_pin_);
   ESP_LOGCONFIG(TAG, "  Type: %s", eth_type.c_str());
diff --git a/esphome/components/ezo/ezo.cpp b/esphome/components/ezo/ezo.cpp
index 2efdc1b984..9d4343e004 100644
--- a/esphome/components/ezo/ezo.cpp
+++ b/esphome/components/ezo/ezo.cpp
@@ -14,8 +14,9 @@ static const char *const EZO_CALIBRATION_TYPE_STRINGS[] = {"LOW", "MID", "HIGH"}
 void EZOSensor::dump_config() {
   LOG_SENSOR("", "EZO", this);
   LOG_I2C_DEVICE(this);
-  if (this->is_failed())
+  if (this->is_failed()) {
     ESP_LOGE(TAG, "Communication with EZO circuit failed!");
+  }
   LOG_UPDATE_INTERVAL(this);
 }
 
diff --git a/esphome/components/ezo_pmp/ezo_pmp.cpp b/esphome/components/ezo_pmp/ezo_pmp.cpp
index 9c96ce2af0..6e5779a12e 100644
--- a/esphome/components/ezo_pmp/ezo_pmp.cpp
+++ b/esphome/components/ezo_pmp/ezo_pmp.cpp
@@ -40,8 +40,9 @@ static const std::string DOSING_MODE_CONTINUOUS = "Continuous";
 
 void EzoPMP::dump_config() {
   LOG_I2C_DEVICE(this);
-  if (this->is_failed())
+  if (this->is_failed()) {
     ESP_LOGE(TAG, "Communication with EZO-PMP circuit failed!");
+  }
   LOG_UPDATE_INTERVAL(this);
 }
 
diff --git a/esphome/components/fan/fan.cpp b/esphome/components/fan/fan.cpp
index 961ed6142a..c8a3064f6c 100644
--- a/esphome/components/fan/fan.cpp
+++ b/esphome/components/fan/fan.cpp
@@ -20,14 +20,18 @@ const LogString *fan_direction_to_string(FanDirection direction) {
 void FanCall::perform() {
   ESP_LOGD(TAG, "'%s' - Setting:", this->parent_.get_name().c_str());
   this->validate_();
-  if (this->binary_state_.has_value())
+  if (this->binary_state_.has_value()) {
     ESP_LOGD(TAG, "  State: %s", ONOFF(*this->binary_state_));
-  if (this->oscillating_.has_value())
+  }
+  if (this->oscillating_.has_value()) {
     ESP_LOGD(TAG, "  Oscillating: %s", YESNO(*this->oscillating_));
-  if (this->speed_.has_value())
+  }
+  if (this->speed_.has_value()) {
     ESP_LOGD(TAG, "  Speed: %d", *this->speed_);
-  if (this->direction_.has_value())
+  }
+  if (this->direction_.has_value()) {
     ESP_LOGD(TAG, "  Direction: %s", LOG_STR_ARG(fan_direction_to_string(*this->direction_)));
+  }
 
   this->parent_.control(*this);
 }
@@ -90,12 +94,15 @@ void Fan::publish_state() {
 
   ESP_LOGD(TAG, "'%s' - Sending state:", this->name_.c_str());
   ESP_LOGD(TAG, "  State: %s", ONOFF(this->state));
-  if (traits.supports_speed())
+  if (traits.supports_speed()) {
     ESP_LOGD(TAG, "  Speed: %d", this->speed);
-  if (traits.supports_oscillation())
+  }
+  if (traits.supports_oscillation()) {
     ESP_LOGD(TAG, "  Oscillating: %s", YESNO(this->oscillating));
-  if (traits.supports_direction())
+  }
+  if (traits.supports_direction()) {
     ESP_LOGD(TAG, "  Direction: %s", LOG_STR_ARG(fan_direction_to_string(this->direction)));
+  }
 
   this->state_callback_.call();
   this->save_state_();
@@ -147,10 +154,12 @@ void Fan::dump_traits_(const char *tag, const char *prefix) {
     ESP_LOGCONFIG(tag, "%s  Speed: YES", prefix);
     ESP_LOGCONFIG(tag, "%s  Speed count: %d", prefix, this->get_traits().supported_speed_count());
   }
-  if (this->get_traits().supports_oscillation())
+  if (this->get_traits().supports_oscillation()) {
     ESP_LOGCONFIG(tag, "%s  Oscillation: YES", prefix);
-  if (this->get_traits().supports_direction())
+  }
+  if (this->get_traits().supports_direction()) {
     ESP_LOGCONFIG(tag, "%s  Direction: YES", prefix);
+  }
 }
 
 }  // namespace fan
diff --git a/esphome/components/nextion/nextion.cpp b/esphome/components/nextion/nextion.cpp
index 5dfff4327c..f8beaeab78 100644
--- a/esphome/components/nextion/nextion.cpp
+++ b/esphome/components/nextion/nextion.cpp
@@ -256,8 +256,9 @@ void Nextion::loop() {
 
 bool Nextion::remove_from_q_(bool report_empty) {
   if (this->nextion_queue_.empty()) {
-    if (report_empty)
+    if (report_empty) {
       ESP_LOGE(TAG, "Nextion queue is empty!");
+    }
     return false;
   }
 
diff --git a/esphome/components/ota/ota_component.cpp b/esphome/components/ota/ota_component.cpp
index 1f1ecd9867..0195cb4616 100644
--- a/esphome/components/ota/ota_component.cpp
+++ b/esphome/components/ota/ota_component.cpp
@@ -472,8 +472,9 @@ bool OTAComponent::should_enter_safe_mode(uint8_t num_attempts, uint32_t enable_
   if (this->safe_mode_rtc_value_ >= num_attempts || is_manual_safe_mode) {
     this->clean_rtc();
 
-    if (!is_manual_safe_mode)
+    if (!is_manual_safe_mode) {
       ESP_LOGE(TAG, "Boot loop detected. Proceeding to safe mode.");
+    }
 
     this->status_set_error();
     this->set_timeout(enable_time, []() {
diff --git a/esphome/components/pn532/pn532_mifare_classic.cpp b/esphome/components/pn532/pn532_mifare_classic.cpp
index 81d135d8e6..17d7aa123c 100644
--- a/esphome/components/pn532/pn532_mifare_classic.cpp
+++ b/esphome/components/pn532/pn532_mifare_classic.cpp
@@ -166,18 +166,23 @@ bool PN532::format_mifare_classic_ndef_(std::vector<uint8_t> &uid) {
       return false;
     }
     if (block == 4) {
-      if (!this->write_mifare_classic_block_(block, empty_ndef_message))
+      if (!this->write_mifare_classic_block_(block, empty_ndef_message)) {
         ESP_LOGE(TAG, "Unable to write block %d", block);
+      }
     } else {
-      if (!this->write_mifare_classic_block_(block, blank_block))
+      if (!this->write_mifare_classic_block_(block, blank_block)) {
         ESP_LOGE(TAG, "Unable to write block %d", block);
+      }
     }
-    if (!this->write_mifare_classic_block_(block + 1, blank_block))
+    if (!this->write_mifare_classic_block_(block + 1, blank_block)) {
       ESP_LOGE(TAG, "Unable to write block %d", block + 1);
-    if (!this->write_mifare_classic_block_(block + 2, blank_block))
+    }
+    if (!this->write_mifare_classic_block_(block + 2, blank_block)) {
       ESP_LOGE(TAG, "Unable to write block %d", block + 2);
-    if (!this->write_mifare_classic_block_(block + 3, ndef_trailer))
+    }
+    if (!this->write_mifare_classic_block_(block + 3, ndef_trailer)) {
       ESP_LOGE(TAG, "Unable to write trailer block %d", block + 3);
+    }
   }
   return true;
 }
diff --git a/esphome/components/remote_base/pronto_protocol.cpp b/esphome/components/remote_base/pronto_protocol.cpp
index d8798d4ab9..4951b12bb1 100644
--- a/esphome/components/remote_base/pronto_protocol.cpp
+++ b/esphome/components/remote_base/pronto_protocol.cpp
@@ -236,8 +236,9 @@ void ProntoProtocol::dump(const ProntoData &data) {
     rest = data.data.substr(230);
   }
   ESP_LOGD(TAG, "Received Pronto: data=%s", first.c_str());
-  if (!rest.empty())
+  if (!rest.empty()) {
     ESP_LOGD(TAG, "%s", rest.c_str());
+  }
 }
 
 }  // namespace remote_base
diff --git a/esphome/components/rf_bridge/rf_bridge.cpp b/esphome/components/rf_bridge/rf_bridge.cpp
index d8c8047496..c34b3d2dc4 100644
--- a/esphome/components/rf_bridge/rf_bridge.cpp
+++ b/esphome/components/rf_bridge/rf_bridge.cpp
@@ -49,8 +49,9 @@ bool RFBridgeComponent::parse_bridge_byte_(uint8_t byte) {
       data.high = (raw[6] << 8) | raw[7];
       data.code = (raw[8] << 16) | (raw[9] << 8) | raw[10];
 
-      if (action == RF_CODE_LEARN_OK)
+      if (action == RF_CODE_LEARN_OK) {
         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);
diff --git a/esphome/components/shelly_dimmer/stm32flash.cpp b/esphome/components/shelly_dimmer/stm32flash.cpp
index 3612142972..3871d89a2f 100644
--- a/esphome/components/shelly_dimmer/stm32flash.cpp
+++ b/esphome/components/shelly_dimmer/stm32flash.cpp
@@ -613,8 +613,9 @@ stm32_unique_ptr stm32_init(uart::UARTDevice *stream, const uint8_t flags, const
         }
     }
   }
-  if (new_cmds)
+  if (new_cmds) {
     ESP_LOGD(TAG, ")");
+  }
   if (stm32_get_ack(stm) != STM32_ERR_OK) {
     return make_stm32_with_deletor(nullptr);
   }
diff --git a/esphome/components/sim800l/sim800l.cpp b/esphome/components/sim800l/sim800l.cpp
index 3ae5de491a..7015933e73 100644
--- a/esphome/components/sim800l/sim800l.cpp
+++ b/esphome/components/sim800l/sim800l.cpp
@@ -196,8 +196,9 @@ void Sim800LComponent::parse_cmd_(std::string message) {
       //           "+CREG: -,-" means not registered ok
       bool registered = message.compare(0, 6, "+CREG:") == 0 && (message[9] == '1' || message[9] == '5');
       if (registered) {
-        if (!this->registered_)
+        if (!this->registered_) {
           ESP_LOGD(TAG, "Registered OK");
+        }
         this->state_ = STATE_CSQ;
         this->expect_ack_ = true;
       } else {
diff --git a/esphome/components/slow_pwm/slow_pwm_output.cpp b/esphome/components/slow_pwm/slow_pwm_output.cpp
index 6af0283483..81c721a866 100644
--- a/esphome/components/slow_pwm/slow_pwm_output.cpp
+++ b/esphome/components/slow_pwm/slow_pwm_output.cpp
@@ -53,12 +53,15 @@ void SlowPWMOutput::loop() {
 void SlowPWMOutput::dump_config() {
   ESP_LOGCONFIG(TAG, "Slow PWM Output:");
   LOG_PIN("  Pin: ", this->pin_);
-  if (this->state_change_trigger_)
+  if (this->state_change_trigger_) {
     ESP_LOGCONFIG(TAG, "  State change automation configured");
-  if (this->turn_on_trigger_)
+  }
+  if (this->turn_on_trigger_) {
     ESP_LOGCONFIG(TAG, "  Turn on automation configured");
-  if (this->turn_off_trigger_)
+  }
+  if (this->turn_off_trigger_) {
     ESP_LOGCONFIG(TAG, "  Turn off automation configured");
+  }
   ESP_LOGCONFIG(TAG, "  Period: %d ms", this->period_);
   ESP_LOGCONFIG(TAG, "  Restart cycle on state change: %s", YESNO(this->restart_cycle_on_state_change_));
   LOG_FLOAT_OUTPUT(this);
diff --git a/esphome/components/sonoff_d1/sonoff_d1.cpp b/esphome/components/sonoff_d1/sonoff_d1.cpp
index dc6b719f1b..6ae80296fd 100644
--- a/esphome/components/sonoff_d1/sonoff_d1.cpp
+++ b/esphome/components/sonoff_d1/sonoff_d1.cpp
@@ -71,8 +71,9 @@ void SonoffD1Output::skip_command_() {
   }
 
   // Warn about unexpected bytes in the protocol with UART dimmer
-  if (garbage)
+  if (garbage) {
     ESP_LOGW(TAG, "[%04d] Skip %d bytes from the dimmer", this->write_count_, garbage);
+  }
 }
 
 // This assumes some data is already available
diff --git a/esphome/components/thermostat/thermostat_climate.cpp b/esphome/components/thermostat/thermostat_climate.cpp
index 61e279d4a6..1fbbbe022c 100644
--- a/esphome/components/thermostat/thermostat_climate.cpp
+++ b/esphome/components/thermostat/thermostat_climate.cpp
@@ -1307,10 +1307,12 @@ void ThermostatClimate::dump_config() {
   ESP_LOGCONFIG(TAG, "  Supports FAN_ONLY_ACTION_USES_FAN_MODE_TIMER: %s",
                 YESNO(this->supports_fan_only_action_uses_fan_mode_timer_));
   ESP_LOGCONFIG(TAG, "  Supports FAN_ONLY_COOLING: %s", YESNO(this->supports_fan_only_cooling_));
-  if (this->supports_cool_)
+  if (this->supports_cool_) {
     ESP_LOGCONFIG(TAG, "  Supports FAN_WITH_COOLING: %s", YESNO(this->supports_fan_with_cooling_));
-  if (this->supports_heat_)
+  }
+  if (this->supports_heat_) {
     ESP_LOGCONFIG(TAG, "  Supports FAN_WITH_HEATING: %s", YESNO(this->supports_fan_with_heating_));
+  }
   ESP_LOGCONFIG(TAG, "  Supports HEAT: %s", YESNO(this->supports_heat_));
   ESP_LOGCONFIG(TAG, "  Supports FAN MODE ON: %s", YESNO(this->supports_fan_mode_on_));
   ESP_LOGCONFIG(TAG, "  Supports FAN MODE OFF: %s", YESNO(this->supports_fan_mode_off_));
diff --git a/esphome/components/tuya/climate/tuya_climate.cpp b/esphome/components/tuya/climate/tuya_climate.cpp
index 39d4203684..280e172c7a 100644
--- a/esphome/components/tuya/climate/tuya_climate.cpp
+++ b/esphome/components/tuya/climate/tuya_climate.cpp
@@ -138,18 +138,23 @@ climate::ClimateTraits TuyaClimate::traits() {
 
 void TuyaClimate::dump_config() {
   LOG_CLIMATE("", "Tuya Climate", this);
-  if (this->switch_id_.has_value())
+  if (this->switch_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "  Switch has datapoint ID %u", *this->switch_id_);
-  if (this->active_state_id_.has_value())
+  }
+  if (this->active_state_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "  Active state has datapoint ID %u", *this->active_state_id_);
-  if (this->target_temperature_id_.has_value())
+  }
+  if (this->target_temperature_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "  Target Temperature has datapoint ID %u", *this->target_temperature_id_);
-  if (this->current_temperature_id_.has_value())
+  }
+  if (this->current_temperature_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "  Current Temperature has datapoint ID %u", *this->current_temperature_id_);
+  }
   LOG_PIN("  Heating State Pin: ", this->heating_state_pin_);
   LOG_PIN("  Cooling State Pin: ", this->cooling_state_pin_);
-  if (this->eco_id_.has_value())
+  if (this->eco_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "  Eco has datapoint ID %u", *this->eco_id_);
+  }
 }
 
 void TuyaClimate::compute_preset_() {
diff --git a/esphome/components/tuya/cover/tuya_cover.cpp b/esphome/components/tuya/cover/tuya_cover.cpp
index b55873c3c1..11a458449f 100644
--- a/esphome/components/tuya/cover/tuya_cover.cpp
+++ b/esphome/components/tuya/cover/tuya_cover.cpp
@@ -112,14 +112,18 @@ void TuyaCover::dump_config() {
       ESP_LOGCONFIG(TAG, "   Configured as Inverted, but direction_datapoint isn't configured");
     }
   }
-  if (this->control_id_.has_value())
+  if (this->control_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "   Control has datapoint ID %u", *this->control_id_);
-  if (this->direction_id_.has_value())
+  }
+  if (this->direction_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "   Direction has datapoint ID %u", *this->direction_id_);
-  if (this->position_id_.has_value())
+  }
+  if (this->position_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "   Position has datapoint ID %u", *this->position_id_);
-  if (this->position_report_id_.has_value())
+  }
+  if (this->position_report_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "   Position Report has datapoint ID %u", *this->position_report_id_);
+  }
 }
 
 cover::CoverTraits TuyaCover::get_traits() {
diff --git a/esphome/components/tuya/fan/tuya_fan.cpp b/esphome/components/tuya/fan/tuya_fan.cpp
index 813aee4aa0..1b03ea50fa 100644
--- a/esphome/components/tuya/fan/tuya_fan.cpp
+++ b/esphome/components/tuya/fan/tuya_fan.cpp
@@ -49,14 +49,18 @@ void TuyaFan::setup() {
 
 void TuyaFan::dump_config() {
   LOG_FAN("", "Tuya Fan", this);
-  if (this->speed_id_.has_value())
+  if (this->speed_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "  Speed has datapoint ID %u", *this->speed_id_);
-  if (this->switch_id_.has_value())
+  }
+  if (this->switch_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "  Switch has datapoint ID %u", *this->switch_id_);
-  if (this->oscillation_id_.has_value())
+  }
+  if (this->oscillation_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "  Oscillation has datapoint ID %u", *this->oscillation_id_);
-  if (this->direction_id_.has_value())
+  }
+  if (this->direction_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "  Direction has datapoint ID %u", *this->direction_id_);
+  }
 }
 
 fan::FanTraits TuyaFan::get_traits() {
diff --git a/esphome/components/tuya/light/tuya_light.cpp b/esphome/components/tuya/light/tuya_light.cpp
index 4d8bc9e37b..b75e85bc14 100644
--- a/esphome/components/tuya/light/tuya_light.cpp
+++ b/esphome/components/tuya/light/tuya_light.cpp
@@ -92,10 +92,12 @@ void TuyaLight::setup() {
 
 void TuyaLight::dump_config() {
   ESP_LOGCONFIG(TAG, "Tuya Dimmer:");
-  if (this->dimmer_id_.has_value())
+  if (this->dimmer_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "   Dimmer has datapoint ID %u", *this->dimmer_id_);
-  if (this->switch_id_.has_value())
+  }
+  if (this->switch_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "   Switch has datapoint ID %u", *this->switch_id_);
+  }
   if (this->rgb_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "   RGB has datapoint ID %u", *this->rgb_id_);
   } else if (this->hsv_id_.has_value()) {

From 20da03f8c6c0a6b3c50d4902a6481dc689116c71 Mon Sep 17 00:00:00 2001
From: Alex Reid <alex.reid@reid-projects.com>
Date: Tue, 22 Nov 2022 18:53:48 -0500
Subject: [PATCH 279/838] Midea ir templatable code (#4053)

---
 esphome/components/remote_base/__init__.py     | 15 +++++++++++----
 .../components/remote_base/midea_protocol.h    | 18 +++++++++++++++---
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/esphome/components/remote_base/__init__.py b/esphome/components/remote_base/__init__.py
index e4d1e115e7..b979a050db 100644
--- a/esphome/components/remote_base/__init__.py
+++ b/esphome/components/remote_base/__init__.py
@@ -1308,9 +1308,11 @@ MideaData, MideaBinarySensor, MideaTrigger, MideaAction, MideaDumper = declare_p
 MideaAction = ns.class_("MideaAction", RemoteTransmitterActionBase)
 MIDEA_SCHEMA = cv.Schema(
     {
-        cv.Required(CONF_CODE): cv.All(
-            [cv.Any(cv.hex_uint8_t, cv.uint8_t)],
-            cv.Length(min=5, max=5),
+        cv.Required(CONF_CODE): cv.templatable(
+            cv.All(
+                [cv.Any(cv.hex_uint8_t, cv.uint8_t)],
+                cv.Length(min=5, max=5),
+            )
         ),
     }
 )
@@ -1337,7 +1339,12 @@ def midea_dumper(var, config):
     MIDEA_SCHEMA,
 )
 async def midea_action(var, config, args):
-    cg.add(var.set_code(config[CONF_CODE]))
+    code_ = config[CONF_CODE]
+    if cg.is_template(code_):
+        template_ = await cg.templatable(code_, args, cg.std_vector.template(cg.uint8))
+        cg.add(var.set_code_template(template_))
+    else:
+        cg.add(var.set_code_static(code_))
 
 
 # AEHA
diff --git a/esphome/components/remote_base/midea_protocol.h b/esphome/components/remote_base/midea_protocol.h
index 135a93b36d..2bcaa879c4 100644
--- a/esphome/components/remote_base/midea_protocol.h
+++ b/esphome/components/remote_base/midea_protocol.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <array>
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
 #include "remote_base.h"
+#include <array>
+#include <utility>
 
 namespace esphome {
 namespace remote_base {
@@ -84,12 +85,23 @@ using MideaDumper = RemoteReceiverDumper<MideaProtocol, MideaData>;
 
 template<typename... Ts> class MideaAction : public RemoteTransmitterActionBase<Ts...> {
   TEMPLATABLE_VALUE(std::vector<uint8_t>, code)
-  void set_code(const std::vector<uint8_t> &code) { code_ = code; }
+  void set_code_static(std::vector<uint8_t> code) { code_static_ = std::move(code); }
+  void set_code_template(std::function<std::vector<uint8_t>(Ts...)> func) { this->code_func_ = func; }
+
   void encode(RemoteTransmitData *dst, Ts... x) override {
-    MideaData data = this->code_.value(x...);
+    MideaData data;
+    if (!this->code_static_.empty()) {
+      data = MideaData(this->code_static_);
+    } else {
+      data = MideaData(this->code_func_(x...));
+    }
     data.finalize();
     MideaProtocol().encode(dst, data);
   }
+
+ protected:
+  std::function<std::vector<uint8_t>(Ts...)> code_func_{};
+  std::vector<uint8_t> code_static_{};
 };
 
 }  // namespace remote_base

From 8975b4b3f620162b1139518120a0a6f65b66a840 Mon Sep 17 00:00:00 2001
From: Jens-Christian Skibakk <jens.christian@skibakk.no>
Date: Wed, 23 Nov 2022 00:54:40 +0100
Subject: [PATCH 280/838] Boards: Adafruit QT Py ESP32 Pico/C3/S2 (#4064)

---
 esphome/components/esp32/boards.py | 58 ++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/esphome/components/esp32/boards.py b/esphome/components/esp32/boards.py
index d2d060f33f..7a61c6ae3d 100644
--- a/esphome/components/esp32/boards.py
+++ b/esphome/components/esp32/boards.py
@@ -42,6 +42,64 @@ ESP32_BASE_PINS = {
 }
 
 ESP32_BOARD_PINS = {
+    "adafruit_qtpy_esp32c3": {
+        "A0": 4,
+        "A1": 3,
+        "A2": 1,
+        "A3": 0,
+        "SDA": 5,
+        "SCL": 6,
+        "MOSI": 7,
+        "MISO": 8,
+        "SCK": 10,
+        "RX": 20,
+        "TX": 21,
+        "NEOPIXEL": 2,
+        "PIN_NEOPIXEL": 2,
+        "BUTTON": 9,
+        "SWITCH": 9,
+    },
+    "adafruit_qtpy_esp32s2": {
+        "A0": 18,
+        "A1": 17,
+        "A2": 9,
+        "A3": 8,
+        "SDA": 7,
+        "SCL": 6,
+        "MOSI": 35,
+        "MISO": 37,
+        "SCK": 36,
+        "RX": 16,
+        "TX": 5,
+        "SDA1": 41,
+        "SCL1": 40,
+        "NEOPIXEL": 39,
+        "PIN_NEOPIXEL": 39,
+        "NEOPIXEL_POWER": 38,
+        "D0": 0,
+        "BUTTON": 0,
+        "SWITCH": 0,
+    },
+    "adafruit_qtpy_esp32": {
+        "A0": 26,
+        "A1": 25,
+        "A2": 27,
+        "A3": 15,
+        "SDA": 4,
+        "SCL": 33,
+        "MOSI": 13,
+        "MISO": 12,
+        "SCK": 14,
+        "RX": 7,
+        "TX": 32,
+        "SDA1": 22,
+        "SCL1": 19,
+        "NEOPIXEL": 5,
+        "PIN_NEOPIXEL": 5,
+        "NEOPIXEL_POWER": 8,
+        "BUTTON": 0,
+        "SWITCH": 0,
+    },
     "alksesp32": {
         "A0": 32,
         "A1": 33,

From 5c2c1560bbfa5e5a162fe5e158d3dc3be6c199ac Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 22 Nov 2022 12:19:52 +1300
Subject: [PATCH 281/838] Fix rp2040 pwm to use pico-sdk, not mbed (#4059)

---
 esphome/components/rp2040_pwm/rp2040_pwm.cpp | 26 ++++++++++++++------
 esphome/components/rp2040_pwm/rp2040_pwm.h   |  8 +++---
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/esphome/components/rp2040_pwm/rp2040_pwm.cpp b/esphome/components/rp2040_pwm/rp2040_pwm.cpp
index bf2a446edf..3f95125578 100644
--- a/esphome/components/rp2040_pwm/rp2040_pwm.cpp
+++ b/esphome/components/rp2040_pwm/rp2040_pwm.cpp
@@ -6,7 +6,9 @@
 #include "esphome/core/log.h"
 #include "esphome/core/macros.h"
 
-#include <PinNames.h>
+#include <hardware/clocks.h>
+#include <hardware/gpio.h>
+#include <hardware/pwm.h>
 
 namespace esphome {
 namespace rp2040_pwm {
@@ -15,10 +17,17 @@ static const char *const TAG = "rp2040_pwm";
 
 void RP2040PWM::setup() {
   ESP_LOGCONFIG(TAG, "Setting up RP2040 PWM Output...");
-  this->pin_->setup();
-  this->pwm_ = new mbed::PwmOut((PinName) this->pin_->get_pin());
-  this->turn_off();
+
+  this->setup_pwm_();
 }
+
+void RP2040PWM::setup_pwm_() {
+  pwm_config config = pwm_get_default_config();
+  pwm_config_set_clkdiv(&config, clock_get_hz(clk_sys) / (255.0f * this->frequency_));
+  pwm_config_set_wrap(&config, 254);
+  pwm_init(pwm_gpio_to_slice_num(this->pin_->get_pin()), &config, true);
+}
+
 void RP2040PWM::dump_config() {
   ESP_LOGCONFIG(TAG, "RP2040 PWM:");
   LOG_PIN("  Pin: ", this->pin_);
@@ -33,10 +42,13 @@ void HOT RP2040PWM::write_state(float state) {
     state = 1.0f - state;
   }
 
-  auto total_time_us = static_cast<uint32_t>(roundf(1e6f / this->frequency_));
+  if (frequency_changed_) {
+    this->setup_pwm_();
+    frequency_changed_ = false;
+  }
 
-  this->pwm_->period_us(total_time_us);
-  this->pwm_->write(state);
+  gpio_set_function(this->pin_->get_pin(), GPIO_FUNC_PWM);
+  pwm_set_gpio_level(this->pin_->get_pin(), state * 255.0f);
 }
 
 }  // namespace rp2040_pwm
diff --git a/esphome/components/rp2040_pwm/rp2040_pwm.h b/esphome/components/rp2040_pwm/rp2040_pwm.h
index e348f131c2..903079df17 100644
--- a/esphome/components/rp2040_pwm/rp2040_pwm.h
+++ b/esphome/components/rp2040_pwm/rp2040_pwm.h
@@ -7,11 +7,11 @@
 #include "esphome/core/component.h"
 #include "esphome/core/hal.h"
 
-#include "drivers/PwmOut.h"
-
 namespace esphome {
 namespace rp2040_pwm {
 
+static bool frequency_changed_ = false;
+
 class RP2040PWM : public output::FloatOutput, public Component {
  public:
   void set_pin(InternalGPIOPin *pin) { pin_ = pin; }
@@ -19,6 +19,7 @@ class RP2040PWM : public output::FloatOutput, public Component {
   /// Dynamically update frequency
   void update_frequency(float frequency) override {
     this->set_frequency(frequency);
+    frequency_changed_ = true;
     this->write_state(this->last_output_);
   }
 
@@ -31,8 +32,9 @@ class RP2040PWM : public output::FloatOutput, public Component {
  protected:
   void write_state(float state) override;
 
+  void setup_pwm_();
+
   InternalGPIOPin *pin_;
-  mbed::PwmOut *pwm_;
   float frequency_{1000.0};
   /// Cache last output level for dynamic frequency updating
   float last_output_{0.0};

From 2bfaf9dce36cbfd8e0ec6ed2c5028d861d91d716 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 22 Nov 2022 12:41:51 +1300
Subject: [PATCH 282/838] Update web_server index (#4060)

---
 esphome/components/web_server/server_index.h | 378 ++++++++++---------
 1 file changed, 190 insertions(+), 188 deletions(-)

diff --git a/esphome/components/web_server/server_index.h b/esphome/components/web_server/server_index.h
index 88c62baf50..8eaaaf4581 100644
--- a/esphome/components/web_server/server_index.h
+++ b/esphome/components/web_server/server_index.h
@@ -395,194 +395,196 @@ const uint8_t INDEX_GZ[] PROGMEM = {
     0x5e, 0x6e, 0x73, 0x19, 0x48, 0x16, 0xa1, 0x79, 0x8d, 0x2a, 0xa5, 0x48, 0xda, 0x93, 0x28, 0x5d, 0xd7, 0x14, 0xa0,
     0x9f, 0x33, 0x36, 0xf6, 0x6c, 0x0b, 0xe4, 0xab, 0x78, 0xfe, 0x98, 0xb0, 0x53, 0x26, 0x3f, 0xcc, 0xa2, 0x07, 0xd1,
     0x95, 0x23, 0xb0, 0x00, 0xb8, 0xbc, 0x33, 0x2a, 0xd9, 0x53, 0xe1, 0x28, 0x29, 0x51, 0x47, 0xc4, 0xb3, 0x8d, 0x41,
-    0x9b, 0x73, 0xb4, 0xeb, 0xc3, 0x7a, 0xa0, 0x93, 0x6c, 0x5b, 0xc0, 0x4b, 0x66, 0xe3, 0xcd, 0xc8, 0xc1, 0x00, 0x6c,
-    0x32, 0x81, 0xed, 0xa2, 0x02, 0xd9, 0x5a, 0x3e, 0x08, 0xa8, 0xc0, 0x07, 0xf6, 0x6c, 0xd1, 0xc2, 0xae, 0xda, 0xea,
-    0x27, 0x49, 0x1c, 0xd0, 0x9f, 0x9f, 0xd6, 0xcc, 0x05, 0xdc, 0xb1, 0x21, 0x02, 0xbb, 0x0d, 0x99, 0x67, 0xff, 0xeb,
-    0x3f, 0xfd, 0xaf, 0xff, 0x06, 0x03, 0x53, 0x3f, 0xb7, 0xb4, 0xae, 0x6e, 0xf5, 0x3f, 0xa1, 0xd5, 0x22, 0xbd, 0xa1,
-    0xdd, 0x5f, 0xff, 0xe1, 0xbf, 0x43, 0x33, 0xba, 0x00, 0x04, 0xb2, 0x84, 0x20, 0x1a, 0xa1, 0xcd, 0xf5, 0x59, 0x20,
-    0xd5, 0x06, 0xb9, 0x72, 0xa6, 0x7f, 0x44, 0xb0, 0x0b, 0x9e, 0xcd, 0xaf, 0x05, 0x07, 0xa1, 0x1e, 0x25, 0x59, 0xc1,
-    0x34, 0x3c, 0x42, 0xfe, 0x7e, 0x1e, 0x40, 0x34, 0xd7, 0x1c, 0xb8, 0xbc, 0xb0, 0xf4, 0x38, 0x62, 0x79, 0xd6, 0x8d,
-    0xd3, 0x58, 0xbd, 0x82, 0x71, 0x42, 0x87, 0xc2, 0x18, 0xb0, 0x5e, 0xe2, 0x09, 0x1e, 0x48, 0x20, 0xb8, 0xf5, 0x8f,
-    0x8a, 0xad, 0x1f, 0x4c, 0xf3, 0xa7, 0x18, 0x4b, 0x44, 0x6e, 0xd4, 0x08, 0xf0, 0x13, 0x84, 0xd6, 0x47, 0xfd, 0x1c,
-    0x9d, 0xeb, 0x67, 0x14, 0x6c, 0x62, 0x02, 0xd0, 0x4f, 0x33, 0x34, 0x3d, 0xcc, 0x19, 0x44, 0xd6, 0x41, 0xe5, 0xb6,
-    0x1a, 0xc9, 0x2b, 0x42, 0x78, 0x7d, 0xc4, 0x1c, 0x4f, 0xbc, 0xd1, 0xb3, 0xc8, 0xd9, 0xc7, 0x24, 0x3b, 0xc3, 0x58,
-    0x18, 0x12, 0xe9, 0xaa, 0xfa, 0xf2, 0x5f, 0xfe, 0xd9, 0xf7, 0xff, 0xe5, 0x9f, 0xaf, 0x68, 0x30, 0x85, 0x7d, 0x00,
-    0xc6, 0x2b, 0x0f, 0x35, 0x9d, 0x1b, 0x68, 0xad, 0x1f, 0x14, 0xf1, 0x5c, 0x5f, 0x23, 0x11, 0xc7, 0x52, 0x89, 0xb7,
-    0x7c, 0x24, 0xb4, 0x35, 0x53, 0xdc, 0x3c, 0x0b, 0x42, 0x76, 0xc5, 0x34, 0x58, 0x75, 0xc3, 0x3c, 0x47, 0x6e, 0x70,
-    0x0d, 0x5d, 0x3e, 0x13, 0xe3, 0xf5, 0x60, 0xdc, 0x08, 0x81, 0x07, 0xd2, 0x5f, 0xe8, 0x87, 0x27, 0x42, 0xba, 0x07,
-    0x62, 0x19, 0xa4, 0xac, 0xaf, 0x01, 0xe4, 0x59, 0x07, 0x34, 0x01, 0x35, 0x89, 0x2b, 0xdd, 0x4a, 0xe6, 0xc9, 0x71,
-    0xde, 0x7f, 0x85, 0x97, 0xf8, 0x2c, 0xec, 0x8d, 0x9a, 0xb5, 0x20, 0x43, 0x80, 0x93, 0x21, 0x20, 0x35, 0x90, 0xa9,
-    0x83, 0xd1, 0xa1, 0xc9, 0xd6, 0xeb, 0xda, 0x8f, 0xd8, 0xbd, 0xa6, 0x2d, 0xb9, 0xd4, 0x96, 0xb1, 0xb4, 0x6e, 0xa5,
-    0xb6, 0xc4, 0x4f, 0xb5, 0x34, 0xb4, 0x65, 0x7c, 0xa5, 0xb6, 0x44, 0xca, 0x0d, 0x70, 0xe4, 0xd0, 0xde, 0xc4, 0xa8,
-    0x8d, 0xa1, 0x9b, 0x39, 0xda, 0x25, 0xe0, 0xaa, 0x8f, 0x3e, 0x49, 0xb3, 0x84, 0x10, 0xc0, 0xb0, 0x85, 0x36, 0xbe,
-    0x04, 0x06, 0xa0, 0x62, 0x8f, 0x4a, 0xbd, 0xe9, 0xf1, 0xd1, 0x98, 0x80, 0xbb, 0xcb, 0x09, 0x43, 0x91, 0x0c, 0x6b,
-    0xf6, 0x35, 0x2b, 0xb7, 0x70, 0x1c, 0xb1, 0x61, 0xc4, 0x33, 0x60, 0xb6, 0x85, 0x83, 0x1d, 0x79, 0x4b, 0x11, 0x04,
-    0x0b, 0xec, 0xb7, 0x6f, 0xf6, 0x0f, 0x6c, 0xef, 0x38, 0x1b, 0x5f, 0x04, 0x36, 0x78, 0x19, 0x60, 0x7d, 0xb8, 0x3e,
-    0x9f, 0xb2, 0xd4, 0x51, 0x76, 0x7e, 0x96, 0x80, 0x0b, 0x95, 0x9d, 0x88, 0x6f, 0x36, 0x34, 0x03, 0xf8, 0x40, 0x58,
-    0xfa, 0xa8, 0x63, 0x7f, 0x97, 0x8b, 0xef, 0x9d, 0xf2, 0x1c, 0x1f, 0xfb, 0x98, 0xc2, 0xb0, 0xbb, 0x05, 0x0f, 0xf8,
-    0xb2, 0x8f, 0xfa, 0x48, 0xbf, 0x09, 0x60, 0x0b, 0xf1, 0xbe, 0x85, 0xed, 0xb7, 0x54, 0x5f, 0x84, 0xa2, 0x2f, 0xb9,
-    0x4d, 0x9b, 0xe2, 0x95, 0x2d, 0x47, 0x63, 0x8f, 0xd1, 0x54, 0x23, 0x53, 0x1c, 0x48, 0xc2, 0xc7, 0xba, 0x44, 0xa8,
-    0x7f, 0xa3, 0x88, 0x46, 0xa9, 0x94, 0xb5, 0xac, 0xc2, 0x09, 0xc9, 0xbc, 0x13, 0x93, 0xc1, 0x4f, 0x02, 0xff, 0xc8,
-    0xfc, 0x3e, 0x99, 0xf8, 0x94, 0x90, 0x46, 0xf2, 0xf0, 0x2f, 0xde, 0x19, 0xf3, 0x2e, 0x8e, 0xa8, 0xa5, 0x72, 0x86,
-    0x31, 0x4a, 0x83, 0x41, 0x83, 0xb6, 0x8a, 0x7a, 0x80, 0x7d, 0x92, 0x44, 0xf3, 0x82, 0x05, 0xea, 0x41, 0xfa, 0xc5,
-    0xe8, 0x5e, 0xaf, 0x06, 0x22, 0x4c, 0x3b, 0xa6, 0xe4, 0xd3, 0xa5, 0xe9, 0x38, 0x3f, 0x00, 0xc7, 0x19, 0x93, 0xfe,
-    0x5b, 0x11, 0x68, 0xdf, 0x34, 0x48, 0xd8, 0x84, 0x97, 0x1c, 0x6f, 0x95, 0x2f, 0x55, 0xa4, 0xc2, 0xef, 0xee, 0x80,
-    0x33, 0x6d, 0xf9, 0xf8, 0xff, 0x4d, 0x63, 0x8f, 0x83, 0x14, 0x9c, 0x5f, 0xba, 0x66, 0x82, 0x57, 0xf8, 0x00, 0x22,
-    0xf3, 0x7d, 0x69, 0x4c, 0x34, 0x62, 0x18, 0xc5, 0x29, 0x79, 0x0e, 0x72, 0xdb, 0xe3, 0xb9, 0xd9, 0x0e, 0xe4, 0xed,
-    0x4a, 0x28, 0x67, 0x35, 0x98, 0xb0, 0xed, 0x4a, 0xbf, 0x60, 0xb5, 0xb1, 0x8a, 0xc8, 0xd4, 0xdf, 0x56, 0x28, 0x64,
-    0xc4, 0x8e, 0x4a, 0xa1, 0x6a, 0x96, 0xa2, 0x87, 0x89, 0xd3, 0x6a, 0x54, 0xe9, 0x46, 0x4b, 0xb1, 0xa4, 0x6d, 0x7f,
-    0x48, 0xdb, 0x9e, 0xc4, 0xd8, 0x70, 0x29, 0xe6, 0x1e, 0x45, 0xc9, 0xc8, 0x41, 0x00, 0xac, 0x96, 0xf5, 0x08, 0xa8,
-    0xe9, 0xaa, 0xc8, 0x86, 0xff, 0x10, 0x89, 0x5b, 0x0a, 0xa1, 0xb7, 0x86, 0x4a, 0x47, 0xc3, 0xb2, 0xec, 0x5d, 0x30,
-    0xe7, 0xf0, 0x37, 0x79, 0x49, 0x41, 0xdc, 0x4d, 0xd5, 0xdf, 0xf7, 0x6b, 0x97, 0xee, 0x10, 0x9c, 0x79, 0xe3, 0xab,
-    0x69, 0xb6, 0xe2, 0x68, 0xdb, 0xeb, 0x92, 0x9f, 0x8f, 0xbd, 0x5f, 0x39, 0x36, 0x1a, 0x97, 0x54, 0x75, 0xd1, 0x22,
-    0x0e, 0xb3, 0xa9, 0xa3, 0x88, 0xb2, 0x7f, 0x73, 0x55, 0xb0, 0xe4, 0xdb, 0x9b, 0x83, 0x25, 0xfc, 0x96, 0xc1, 0x92,
-    0x6f, 0xff, 0xe0, 0x60, 0xc9, 0x37, 0x66, 0xb0, 0x04, 0x65, 0xe5, 0x8b, 0xcf, 0x89, 0x68, 0xe4, 0xd9, 0x59, 0x11,
-    0x76, 0xe4, 0xe1, 0x3c, 0x88, 0x9d, 0xff, 0x98, 0xd0, 0x06, 0x4c, 0xd4, 0x08, 0x6c, 0x50, 0x24, 0x43, 0xe4, 0x13,
-    0x82, 0x84, 0x97, 0x71, 0x84, 0xb6, 0x4e, 0xdc, 0x6b, 0xdd, 0x57, 0x37, 0x95, 0xc0, 0x6b, 0x73, 0x75, 0x38, 0xa7,
-    0xab, 0x22, 0x0d, 0x01, 0x7d, 0x6a, 0x54, 0x77, 0xec, 0x6e, 0xaa, 0x8c, 0x31, 0x73, 0x84, 0x9e, 0x3a, 0x08, 0x10,
-    0x1c, 0xb4, 0xb4, 0xff, 0xf3, 0x61, 0xa7, 0xb7, 0xdd, 0x99, 0x41, 0x6f, 0xd0, 0xa5, 0xf0, 0xd6, 0xee, 0x6d, 0x6f,
-    0xe3, 0xdb, 0x99, 0x7a, 0xeb, 0xe2, 0x5b, 0xac, 0xde, 0x76, 0xf0, 0x6d, 0xa4, 0xde, 0x1e, 0xe0, 0xdb, 0x58, 0xbd,
-    0x3d, 0xc4, 0xb7, 0x53, 0xbb, 0x3c, 0xe4, 0x1a, 0xb8, 0x87, 0xc0, 0x58, 0x64, 0xf0, 0x07, 0xaa, 0x0c, 0xf6, 0x2d,
-    0xde, 0xf0, 0x8b, 0x4e, 0x82, 0xd8, 0x13, 0x8e, 0x51, 0x90, 0x7b, 0x67, 0x20, 0xfc, 0x03, 0x4a, 0x68, 0x7b, 0x8a,
-    0x9f, 0x7a, 0x00, 0x3f, 0xe2, 0x20, 0x9e, 0x31, 0xf5, 0xcd, 0x5b, 0x85, 0x35, 0xd8, 0x92, 0x87, 0xed, 0x61, 0xd9,
-    0xd3, 0xeb, 0x24, 0x02, 0x29, 0x2a, 0x61, 0x80, 0x56, 0xae, 0xaa, 0x13, 0xd3, 0xb5, 0xf4, 0x0a, 0x5f, 0xa1, 0x4a,
-    0x0c, 0x57, 0x7a, 0x02, 0x36, 0x52, 0xeb, 0x1c, 0x9c, 0xaf, 0xb5, 0xea, 0x05, 0x21, 0xd2, 0x0a, 0x85, 0x70, 0xd2,
-    0x6f, 0x07, 0xd1, 0x89, 0x7e, 0x7e, 0x05, 0x46, 0x6f, 0x74, 0xc2, 0x6e, 0x52, 0x35, 0x04, 0xa2, 0xa9, 0x66, 0x14,
-    0x10, 0x64, 0x15, 0xc1, 0xd2, 0xa0, 0x13, 0x28, 0xd5, 0x0c, 0x52, 0xa7, 0xae, 0x78, 0x68, 0xfa, 0x7a, 0x11, 0x50,
-    0xb4, 0x2a, 0xd8, 0x05, 0xdb, 0x9b, 0x4a, 0x05, 0x85, 0xa1, 0x02, 0x0b, 0xae, 0xd5, 0x46, 0xda, 0x4f, 0xbe, 0x52,
-    0x27, 0x59, 0x4a, 0x1d, 0x99, 0x07, 0x08, 0xfa, 0xf4, 0x60, 0x55, 0x42, 0x7e, 0xd1, 0x19, 0xe1, 0x1f, 0x29, 0x7f,
-    0xbf, 0x98, 0x4c, 0x26, 0xd7, 0xaa, 0xa7, 0x2f, 0xc6, 0x13, 0xd6, 0x65, 0x3b, 0x3d, 0x0c, 0x2e, 0xb7, 0xa4, 0x44,
-    0xec, 0x94, 0x44, 0xbb, 0xe5, 0xed, 0x1a, 0xa3, 0xf0, 0x04, 0x8d, 0x75, 0x7b, 0x3d, 0x56, 0x02, 0x55, 0x96, 0x20,
-    0xbf, 0x4f, 0xe2, 0x34, 0x68, 0x97, 0xfe, 0xa9, 0x14, 0xfc, 0x5f, 0x3c, 0x7a, 0xf4, 0xa8, 0xf4, 0xc7, 0xea, 0xad,
-    0x3d, 0x1e, 0x97, 0xfe, 0x68, 0xa9, 0xd1, 0x68, 0xb7, 0x27, 0x93, 0xd2, 0x8f, 0x55, 0xc1, 0x76, 0x77, 0x34, 0xde,
-    0xee, 0x96, 0xfe, 0x99, 0xd1, 0xa2, 0xf4, 0x99, 0x7c, 0xcb, 0xd9, 0xb8, 0x16, 0xa1, 0x7e, 0xd8, 0x86, 0x4a, 0xc1,
-    0x68, 0x4b, 0x74, 0xf4, 0xc4, 0x63, 0x10, 0x2d, 0x78, 0x06, 0x36, 0x16, 0xf0, 0x36, 0x08, 0xe8, 0x89, 0x14, 0xef,
-    0xe2, 0x93, 0xb2, 0x28, 0xd4, 0x5f, 0x98, 0x32, 0x1d, 0x99, 0x99, 0xe4, 0x39, 0x27, 0x55, 0xd0, 0xac, 0x46, 0xce,
-    0xa2, 0xea, 0x17, 0x21, 0xaf, 0xa4, 0x3d, 0x4a, 0x1b, 0x6c, 0x29, 0x64, 0xfc, 0x8f, 0x57, 0xc9, 0xf8, 0x1f, 0x6e,
-    0x96, 0xf1, 0xc7, 0xb7, 0x13, 0xf1, 0x3f, 0xfc, 0xc1, 0x22, 0xfe, 0x47, 0x53, 0xc4, 0x0b, 0x21, 0xb6, 0x07, 0x56,
-    0x2c, 0x99, 0xaf, 0xc7, 0xd9, 0x79, 0x0b, 0xb7, 0x44, 0x6e, 0x93, 0xf4, 0xdc, 0xb8, 0x95, 0xf0, 0x5f, 0x93, 0x72,
-    0xa4, 0x06, 0x33, 0xbe, 0x4f, 0xcb, 0xb3, 0x93, 0x93, 0x84, 0x29, 0x19, 0x6f, 0x54, 0x90, 0x65, 0xfc, 0x26, 0x0d,
-    0xed, 0x37, 0xe0, 0xa4, 0x1a, 0x25, 0x93, 0x09, 0x14, 0x4d, 0x26, 0xb6, 0x4a, 0xc9, 0x05, 0x79, 0x46, 0xad, 0x5e,
-    0xd7, 0x4a, 0xa8, 0xd5, 0x57, 0x5f, 0x99, 0x65, 0x66, 0x81, 0x8c, 0x46, 0x99, 0xf6, 0x84, 0xac, 0x19, 0xc7, 0x05,
-    0xee, 0xc1, 0xea, 0x7b, 0xba, 0x68, 0xb2, 0xcc, 0x40, 0xa9, 0xc4, 0x23, 0xfc, 0x50, 0x4b, 0xf3, 0xdb, 0x25, 0x22,
-    0x7d, 0x7a, 0x15, 0xb9, 0xea, 0x88, 0xd5, 0xf8, 0x4c, 0x5e, 0x75, 0xac, 0x0a, 0x8b, 0x2f, 0x53, 0x28, 0x1e, 0x5f,
-    0xbc, 0x18, 0x3b, 0x7b, 0x60, 0xca, 0xc6, 0xc5, 0x9b, 0xb4, 0x91, 0x9a, 0x26, 0xc0, 0x0e, 0x43, 0x13, 0xd3, 0x52,
-    0x10, 0xac, 0xca, 0xd1, 0xaf, 0x2a, 0x7b, 0x46, 0x27, 0x99, 0xc1, 0x84, 0x43, 0x0e, 0x6a, 0x64, 0x09, 0xcc, 0xc1,
-    0xa4, 0x2e, 0xa4, 0xef, 0xa5, 0x8b, 0xbc, 0x8e, 0x53, 0xf9, 0x61, 0x6d, 0x3a, 0x15, 0x58, 0x4a, 0xfd, 0x21, 0x4f,
-    0xfc, 0xab, 0x9e, 0x18, 0x88, 0x17, 0x33, 0x8c, 0x4b, 0x15, 0x7c, 0x07, 0xc2, 0xcd, 0xf1, 0x2b, 0x40, 0x62, 0x08,
-    0x15, 0xe3, 0xae, 0xa8, 0x77, 0x79, 0x69, 0x7e, 0x8c, 0xb2, 0xf6, 0xe1, 0xc2, 0x06, 0x0f, 0x30, 0xfc, 0x8a, 0x2c,
-    0x6a, 0x83, 0x6c, 0xc1, 0x1d, 0x87, 0x5a, 0x39, 0x6e, 0xe9, 0xed, 0xb4, 0xdb, 0xa0, 0x62, 0x7c, 0xf1, 0xa9, 0x21,
-    0x47, 0x77, 0x96, 0xf8, 0x5e, 0x15, 0x52, 0x5f, 0xf9, 0xf4, 0x97, 0x26, 0x31, 0x7e, 0x9b, 0x44, 0x20, 0x6a, 0x5c,
-    0x4f, 0x51, 0x8b, 0xd8, 0x7c, 0xf7, 0x95, 0x1b, 0x67, 0x10, 0xd6, 0x5d, 0xc7, 0xc1, 0x32, 0x56, 0x56, 0x2f, 0xc4,
-    0xb6, 0xc2, 0xaa, 0x59, 0x05, 0xe7, 0x06, 0x9d, 0x59, 0x9c, 0x19, 0xb1, 0xe7, 0xda, 0x36, 0x28, 0x55, 0xf0, 0x59,
-    0x44, 0x90, 0xf7, 0x30, 0x4e, 0x2a, 0x7c, 0x60, 0x05, 0x74, 0xdd, 0xfb, 0x34, 0x20, 0x47, 0xbf, 0x54, 0x33, 0xba,
-    0xaa, 0x52, 0x05, 0xa5, 0x79, 0x7a, 0x60, 0x20, 0x43, 0x41, 0x60, 0x58, 0xe3, 0x54, 0xe8, 0x2d, 0x98, 0x86, 0x04,
-    0xb0, 0x76, 0xca, 0xd0, 0x33, 0xb1, 0x15, 0xd8, 0x42, 0x5a, 0x80, 0xd2, 0xc3, 0x0e, 0x7d, 0xab, 0x06, 0x7a, 0xba,
-    0x1a, 0x3b, 0xbe, 0xce, 0x4f, 0xbb, 0x38, 0xf2, 0x8b, 0x33, 0x0f, 0xfe, 0x59, 0x7f, 0x5a, 0x82, 0x94, 0x3f, 0xfe,
-    0x14, 0x73, 0x30, 0xaa, 0xe7, 0x2d, 0x8c, 0x84, 0x50, 0x28, 0x53, 0xaa, 0x43, 0x3a, 0xed, 0x14, 0xb7, 0x92, 0x7a,
-    0x8b, 0x02, 0xdd, 0x39, 0xf2, 0x5b, 0x82, 0x34, 0x4b, 0x59, 0xaf, 0x7e, 0xaa, 0x6d, 0xba, 0x0e, 0x8a, 0x58, 0xc3,
-    0x65, 0x86, 0xee, 0x1f, 0xbf, 0x00, 0xf7, 0x4f, 0xa8, 0xd1, 0xb6, 0xf2, 0x1b, 0xda, 0x6b, 0xdb, 0x07, 0x92, 0xb6,
-    0x9b, 0x64, 0x2d, 0xe4, 0xab, 0xfe, 0xd1, 0x55, 0xfe, 0xcd, 0x4d, 0x67, 0xbc, 0xdd, 0x9d, 0x1d, 0x4f, 0xfd, 0x33,
-    0x0e, 0xc7, 0x9b, 0xc5, 0x74, 0xc6, 0x7b, 0x1b, 0xc8, 0x82, 0x68, 0x82, 0x1f, 0xf1, 0xbb, 0x4d, 0xcb, 0x63, 0x4a,
-    0xb0, 0x5c, 0xa2, 0x5a, 0x0f, 0x3a, 0x8f, 0xc0, 0x61, 0xbb, 0xf5, 0xf0, 0xd7, 0xa3, 0x5f, 0x4a, 0x1a, 0xa9, 0x7b,
-    0xb2, 0xb6, 0xdd, 0x43, 0x79, 0x91, 0x44, 0x17, 0xe0, 0x37, 0x92, 0x8d, 0x71, 0x8c, 0x81, 0xdc, 0xde, 0x3c, 0x93,
-    0xc9, 0x0a, 0x39, 0x4b, 0xe8, 0x37, 0x65, 0xc8, 0xa5, 0xd8, 0x7e, 0x30, 0x3f, 0x57, 0xab, 0xd1, 0x69, 0x24, 0x21,
-    0xfc, 0xa1, 0xb9, 0x06, 0x57, 0x27, 0x37, 0xd4, 0xcf, 0xcb, 0x77, 0x00, 0x06, 0x61, 0xd8, 0xb4, 0x72, 0x01, 0x55,
-    0x1b, 0x4a, 0x8c, 0x6c, 0x8b, 0x6a, 0x20, 0xcb, 0xdf, 0x06, 0x55, 0x19, 0x15, 0xac, 0x87, 0x5f, 0x53, 0x8c, 0xc1,
-    0x3b, 0x95, 0xc6, 0xd3, 0x2c, 0x1e, 0x8f, 0x13, 0xd6, 0x53, 0xf6, 0x91, 0xd5, 0x79, 0x80, 0xc9, 0x0a, 0xe6, 0x92,
-    0xd5, 0x57, 0xc5, 0x20, 0x9e, 0xa6, 0x53, 0x74, 0x0c, 0xf6, 0x1a, 0x7e, 0x12, 0x71, 0x2d, 0x39, 0xe5, 0x29, 0x7e,
-    0xbb, 0x22, 0x1e, 0x3d, 0xd7, 0x71, 0xd9, 0x01, 0x63, 0x91, 0x16, 0xbc, 0xdd, 0xe3, 0xd9, 0x3c, 0x68, 0x6d, 0xd7,
-    0x11, 0xc1, 0x2a, 0x8d, 0x82, 0xb7, 0x06, 0x2d, 0x0f, 0xad, 0x03, 0xa1, 0xe5, 0x2c, 0xbf, 0x23, 0xcb, 0x68, 0x00,
-    0xfc, 0xec, 0x9e, 0x2e, 0x2a, 0xeb, 0xc8, 0xfc, 0xfb, 0xec, 0x96, 0x2f, 0xd7, 0xef, 0x96, 0x2f, 0xd5, 0x6e, 0xb9,
-    0x9e, 0x63, 0xbf, 0x98, 0x74, 0xf0, 0x4f, 0xaf, 0x42, 0x08, 0x56, 0x05, 0xc8, 0x61, 0xa1, 0x5d, 0xdc, 0xea, 0xc2,
-    0x7f, 0x34, 0x74, 0xdb, 0xc3, 0x3f, 0x3e, 0x58, 0x80, 0x6d, 0x0b, 0x0b, 0xf1, 0x5f, 0xbb, 0x56, 0xd5, 0xb9, 0x8f,
-    0x75, 0xd8, 0x6b, 0x67, 0xb5, 0xae, 0x7b, 0xfd, 0xa6, 0x05, 0x79, 0xc5, 0x9d, 0x40, 0x09, 0x63, 0x70, 0xd5, 0xa2,
-    0xe3, 0x63, 0x28, 0x9d, 0x64, 0xa3, 0x45, 0xf1, 0x77, 0x12, 0x7e, 0x49, 0xc4, 0x6b, 0xb7, 0x74, 0x63, 0x1c, 0xd5,
-    0x55, 0x64, 0xbe, 0xa8, 0x11, 0x96, 0x7a, 0x9d, 0x82, 0x02, 0x18, 0x93, 0x39, 0x5d, 0xff, 0xfe, 0x9a, 0x4d, 0xf0,
-    0x1f, 0xb2, 0x36, 0x6b, 0x91, 0xf9, 0xb7, 0x12, 0xe3, 0x5a, 0x22, 0x7c, 0x16, 0x0d, 0xcc, 0x35, 0x6c, 0x3f, 0x5a,
-    0x0f, 0xee, 0xa1, 0x9a, 0x69, 0xa8, 0x94, 0x82, 0xd4, 0x3b, 0xe0, 0x05, 0x44, 0x8b, 0x84, 0x5f, 0x3f, 0xea, 0x55,
-    0x9c, 0xb1, 0x32, 0xea, 0x35, 0x02, 0xbd, 0x6a, 0x7b, 0x4b, 0x29, 0xfd, 0xc5, 0x97, 0xf7, 0xf1, 0x8f, 0x88, 0x7d,
-    0x1d, 0x57, 0xbe, 0x91, 0x88, 0x0d, 0xa0, 0x6f, 0xb4, 0x51, 0x73, 0x7e, 0x84, 0x06, 0x27, 0xff, 0xe7, 0xb6, 0xad,
-    0xd1, 0x58, 0xbf, 0x55, 0x73, 0x69, 0x95, 0x7e, 0x56, 0xeb, 0xcf, 0x1b, 0xfc, 0x96, 0x6d, 0x47, 0xc2, 0x21, 0xa8,
-    0xb7, 0x95, 0xbf, 0xb5, 0x64, 0xa5, 0xb1, 0xa2, 0xf8, 0x6d, 0xdb, 0x57, 0x26, 0x31, 0xf5, 0xd8, 0x08, 0x8f, 0xb5,
-    0x13, 0x29, 0xcf, 0x9d, 0xb1, 0x87, 0xf0, 0x23, 0xff, 0xc2, 0xc2, 0x7b, 0xf8, 0xc1, 0x2f, 0xeb, 0x7c, 0x96, 0xa4,
-    0x60, 0x56, 0x4d, 0x39, 0x9f, 0x07, 0x5b, 0x5b, 0x67, 0x67, 0x67, 0xfe, 0xd9, 0xb6, 0x9f, 0xe5, 0x27, 0x5b, 0xdd,
-    0x76, 0xbb, 0x8d, 0xdf, 0x69, 0xb2, 0xad, 0xd3, 0x98, 0x9d, 0x3d, 0x06, 0xf7, 0xc3, 0x7e, 0x68, 0x3d, 0xb2, 0x1e,
-    0x6e, 0x5b, 0x3b, 0x0f, 0x6c, 0x8b, 0x14, 0x00, 0x94, 0x6c, 0xdb, 0x96, 0x50, 0x00, 0xa1, 0x0d, 0xc5, 0xfd, 0xdd,
-    0x13, 0x65, 0xc3, 0x61, 0x1e, 0xbc, 0xb0, 0x90, 0xc0, 0x7f, 0xcb, 0x3e, 0xb1, 0xfa, 0x56, 0x17, 0x65, 0x2d, 0xa9,
-    0x46, 0xd4, 0x2b, 0xee, 0xf7, 0x51, 0x34, 0x0f, 0x88, 0x8d, 0xcc, 0x42, 0x0c, 0x93, 0x89, 0x52, 0x9a, 0x02, 0xed,
-    0xd2, 0x63, 0x78, 0xc2, 0xcc, 0x29, 0x0b, 0x9e, 0x5f, 0x75, 0x1f, 0x82, 0x8e, 0x3b, 0x6d, 0xdd, 0x1f, 0xb5, 0x5b,
-    0x1d, 0xab, 0xd3, 0xea, 0xfa, 0x0f, 0xad, 0xae, 0xf8, 0x1f, 0x64, 0xe4, 0xb6, 0xd5, 0x81, 0xa7, 0x6d, 0x0b, 0xde,
-    0x4f, 0xef, 0x8b, 0xb4, 0x88, 0xc8, 0xde, 0xea, 0xef, 0xe2, 0xaf, 0x2d, 0x02, 0xa4, 0xbe, 0xb4, 0xc5, 0x2f, 0x5a,
-    0xb3, 0xbf, 0x30, 0x4b, 0x3b, 0x8f, 0xd6, 0x16, 0x77, 0x1f, 0xae, 0x2d, 0xde, 0x7e, 0xb0, 0xb6, 0xf8, 0xfe, 0x4e,
-    0xbd, 0x78, 0xeb, 0x44, 0x54, 0x69, 0xb9, 0x10, 0xda, 0xb3, 0x08, 0x18, 0xe5, 0xdc, 0xe9, 0x00, 0x9c, 0x6d, 0xab,
-    0x85, 0x3f, 0x1e, 0x76, 0x5d, 0xdd, 0xeb, 0x18, 0x7b, 0x69, 0x2c, 0x1f, 0x3e, 0x02, 0x2c, 0x9f, 0x77, 0x1f, 0x8c,
-    0xb0, 0x1d, 0x21, 0x0a, 0xff, 0x4e, 0xb7, 0x1f, 0x8d, 0x40, 0x23, 0x58, 0xf8, 0x0f, 0xfe, 0x4c, 0x77, 0xba, 0x23,
-    0xf1, 0xd2, 0xc6, 0xfa, 0x0f, 0x9d, 0x87, 0x05, 0x34, 0xc5, 0x3f, 0xbf, 0x69, 0x13, 0x1a, 0x0d, 0x78, 0x73, 0xdc,
-    0xfb, 0x40, 0xa3, 0x47, 0xd3, 0xae, 0xff, 0xe5, 0xe9, 0x43, 0xff, 0xd1, 0xb4, 0xf3, 0xf0, 0x83, 0x78, 0x4b, 0x80,
-    0x82, 0x5f, 0xe2, 0xbf, 0x0f, 0xdb, 0xed, 0x69, 0xab, 0xe3, 0x3f, 0x3a, 0xdd, 0xf6, 0xb7, 0x93, 0xd6, 0x03, 0xff,
-    0x11, 0xfe, 0xab, 0x86, 0x9b, 0x66, 0x33, 0x66, 0x5b, 0xb8, 0xde, 0x0d, 0xbf, 0xd7, 0x9c, 0xa3, 0x7b, 0xdf, 0xda,
-    0xb9, 0xff, 0xfc, 0x11, 0xac, 0xd1, 0xb4, 0xd3, 0x85, 0xff, 0xaf, 0x7a, 0xfc, 0x80, 0x84, 0x97, 0x03, 0x47, 0x0c,
-    0x33, 0x58, 0x15, 0xe1, 0xe8, 0x9b, 0x61, 0xf7, 0xbc, 0xef, 0xaf, 0x0a, 0x80, 0x30, 0x7e, 0x73, 0x90, 0x9b, 0xdf,
-    0x2e, 0x02, 0x42, 0x1f, 0xb4, 0xff, 0x03, 0x23, 0x20, 0xdf, 0x37, 0x83, 0xdc, 0xe7, 0xab, 0x79, 0x7b, 0x4d, 0x67,
-    0xed, 0x35, 0x73, 0x0e, 0xff, 0xc2, 0x86, 0x98, 0xad, 0x0d, 0xad, 0x39, 0x37, 0xe3, 0x41, 0x19, 0x6e, 0xe4, 0x73,
-    0x19, 0xf5, 0x2f, 0xf8, 0x15, 0x04, 0x89, 0x6f, 0x26, 0xc8, 0xaf, 0xb7, 0xa3, 0x47, 0xfc, 0x07, 0xd3, 0xa3, 0xe0,
-    0x06, 0x3d, 0x6a, 0x11, 0x77, 0x8a, 0x18, 0x90, 0xa3, 0xbf, 0x4f, 0xef, 0xce, 0xf7, 0xf8, 0xb5, 0xaf, 0x2d, 0x86,
-    0x25, 0x85, 0x2d, 0x72, 0x05, 0xdf, 0x7d, 0xce, 0x09, 0x81, 0x48, 0x68, 0x0e, 0x6d, 0x19, 0x84, 0x99, 0xe3, 0x67,
-    0x71, 0xd5, 0xcb, 0xa9, 0xb8, 0x34, 0x13, 0xd2, 0x8d, 0xb7, 0x1d, 0x1d, 0xc0, 0xc1, 0x1c, 0xf3, 0x70, 0x99, 0xf1,
-    0x08, 0x7f, 0xef, 0x12, 0x8f, 0x79, 0x82, 0xf7, 0x71, 0xe5, 0xdd, 0x35, 0x4c, 0x89, 0xfe, 0x16, 0xd3, 0xb9, 0xd5,
-    0x41, 0xc1, 0x0c, 0x83, 0x06, 0xaf, 0xd8, 0x38, 0x8e, 0x1c, 0xdb, 0x99, 0xc3, 0xae, 0x85, 0x31, 0x5b, 0xb5, 0x5c,
-    0x6a, 0x4a, 0xa3, 0x76, 0x6d, 0xf5, 0xab, 0x7e, 0x72, 0xfc, 0x74, 0x5a, 0x78, 0x28, 0x83, 0x8c, 0xb6, 0xf4, 0x02,
-    0x60, 0x7c, 0x55, 0x92, 0xa3, 0xc0, 0xaf, 0x2c, 0x07, 0x5b, 0x98, 0x0e, 0x1d, 0xbf, 0x0b, 0xae, 0x04, 0x15, 0xe3,
-    0xa7, 0xa8, 0x7e, 0x70, 0x5a, 0xdb, 0x60, 0xda, 0x18, 0xdd, 0xf4, 0x40, 0xc3, 0x95, 0x50, 0x92, 0x08, 0x10, 0x34,
-    0x4a, 0x3d, 0xfd, 0xbb, 0xcf, 0xaa, 0x90, 0x51, 0xf1, 0xf8, 0xe2, 0x40, 0x5e, 0x37, 0xb7, 0x31, 0x7a, 0x4b, 0x51,
-    0xfb, 0xea, 0x53, 0x57, 0x9b, 0xa0, 0x32, 0xe8, 0x17, 0x50, 0xd2, 0x19, 0x38, 0x6a, 0x05, 0xcc, 0xf6, 0xb6, 0xa4,
-    0xf7, 0x10, 0xda, 0x42, 0x27, 0x8c, 0xd9, 0x69, 0x3c, 0x92, 0xa2, 0xdd, 0xb3, 0xe4, 0x2d, 0x95, 0x16, 0x61, 0x11,
-    0x76, 0x3c, 0xe1, 0x3f, 0xc3, 0x0b, 0x6a, 0xb6, 0x30, 0xcd, 0xec, 0xfe, 0xbd, 0x9e, 0x86, 0xa4, 0x9e, 0x28, 0x6f,
-    0xe3, 0x6f, 0xc3, 0x3c, 0x04, 0x7f, 0xed, 0xef, 0xc2, 0x7b, 0xf8, 0xfb, 0x30, 0xef, 0x0d, 0x6d, 0xd7, 0x27, 0xc1,
-    0x78, 0xaf, 0xfa, 0xa5, 0x98, 0x28, 0x15, 0x36, 0x41, 0x87, 0x79, 0xb7, 0x55, 0x66, 0x52, 0x71, 0x75, 0x77, 0x2a,
-    0xc5, 0x05, 0xcf, 0x86, 0xa4, 0x02, 0x21, 0xda, 0xf5, 0x77, 0x0c, 0x71, 0x78, 0xda, 0xc2, 0x9f, 0x35, 0x81, 0x78,
-    0x1f, 0x1a, 0x28, 0x89, 0xf8, 0x12, 0x9a, 0x6f, 0x0b, 0xe1, 0x0b, 0xfd, 0x7e, 0x24, 0x71, 0x25, 0x44, 0x55, 0x9d,
-    0x63, 0xd6, 0x1c, 0x24, 0x89, 0x7c, 0x01, 0xdb, 0x33, 0x62, 0x4e, 0x82, 0x5d, 0x65, 0x44, 0xe5, 0x29, 0xf4, 0x75,
-    0xf4, 0x17, 0xa4, 0xd7, 0xd5, 0x79, 0xb5, 0xdd, 0xb3, 0x66, 0x0a, 0x64, 0xf8, 0xc6, 0x61, 0x15, 0xdd, 0x9a, 0x10,
-    0x5f, 0x52, 0x13, 0x5b, 0xb9, 0xfa, 0xd6, 0xdc, 0x9a, 0xec, 0x5c, 0x73, 0x53, 0xb0, 0x8a, 0x69, 0x68, 0x5f, 0x60,
-    0xfa, 0x0c, 0xfe, 0xac, 0x8a, 0xd5, 0x83, 0x64, 0x28, 0x3f, 0x89, 0xf0, 0x17, 0xc1, 0xd0, 0x8f, 0xb2, 0xda, 0x80,
-    0x9c, 0x3e, 0x95, 0x49, 0x90, 0xbe, 0x18, 0x97, 0x4d, 0x24, 0xc0, 0x66, 0xc0, 0xdf, 0x2b, 0x58, 0xdd, 0xd2, 0x90,
-    0xd7, 0x2f, 0x31, 0xb5, 0x60, 0x1c, 0xe7, 0x74, 0xab, 0x57, 0xe1, 0x5f, 0x8b, 0x6a, 0x56, 0xa4, 0xa6, 0x5d, 0xc9,
-    0x8a, 0x81, 0x8d, 0x45, 0x76, 0x20, 0x13, 0xd3, 0xcc, 0x6f, 0x45, 0x9b, 0xd7, 0x2e, 0xc7, 0x22, 0x27, 0x0d, 0xbf,
-    0xa5, 0x6f, 0x0b, 0x22, 0xdb, 0x20, 0xca, 0xae, 0xc4, 0x89, 0x0c, 0x1c, 0xbc, 0xad, 0x58, 0xfd, 0x72, 0x24, 0x73,
-    0xc3, 0xdb, 0xe6, 0x6a, 0xe9, 0x71, 0x69, 0x1d, 0x5c, 0x19, 0xc3, 0x3b, 0x66, 0x11, 0xf7, 0xa3, 0x94, 0xf2, 0x94,
-    0x1c, 0x43, 0x2c, 0x78, 0x1d, 0xb6, 0xed, 0x96, 0x20, 0x79, 0x8c, 0xdf, 0x1e, 0x25, 0x48, 0xef, 0x43, 0xa1, 0xca,
-    0x71, 0xfe, 0xbe, 0x96, 0xa2, 0x3b, 0xed, 0xf6, 0xdf, 0x1c, 0xec, 0x59, 0x62, 0x63, 0xef, 0x6e, 0xc1, 0xeb, 0x2e,
-    0x79, 0xc7, 0x22, 0x63, 0x23, 0x14, 0x19, 0x1b, 0x96, 0xc8, 0xf3, 0x12, 0x29, 0xad, 0x5b, 0x02, 0x6b, 0xdb, 0x62,
-    0xe9, 0x48, 0x84, 0xf5, 0x66, 0xe0, 0x41, 0xc4, 0xf8, 0x79, 0xb1, 0x2d, 0xec, 0xda, 0xc2, 0x85, 0xb7, 0x55, 0xf2,
-    0x8b, 0xb2, 0x19, 0x78, 0xaa, 0x82, 0x80, 0xa0, 0xe9, 0x99, 0xca, 0x83, 0x91, 0x43, 0xe9, 0x74, 0xd5, 0xd5, 0xd6,
-    0xc5, 0xe2, 0x78, 0x06, 0x62, 0x49, 0xe5, 0xae, 0xbc, 0x97, 0x1d, 0x76, 0x69, 0xaa, 0xfe, 0x51, 0xb9, 0x2e, 0x4a,
-    0x39, 0xed, 0xf4, 0x77, 0x23, 0x69, 0x03, 0xe1, 0x5e, 0x2e, 0x60, 0x33, 0x83, 0xea, 0x43, 0x43, 0xc3, 0x8f, 0xb3,
-    0xad, 0x33, 0x76, 0xdc, 0x8a, 0xe6, 0x71, 0x15, 0x12, 0x44, 0x8d, 0xd8, 0xdf, 0x55, 0xca, 0x51, 0xa6, 0x60, 0xca,
-    0xc7, 0xc8, 0x48, 0xee, 0x40, 0x42, 0x12, 0xc3, 0x96, 0x32, 0xde, 0x48, 0x86, 0x24, 0x2c, 0x06, 0x00, 0x4b, 0xfc,
-    0xac, 0xe2, 0x92, 0x52, 0x33, 0x94, 0x76, 0xff, 0xaf, 0xff, 0xfb, 0xff, 0xc8, 0x50, 0x23, 0xd0, 0x16, 0xc0, 0xc2,
-    0xec, 0x98, 0xea, 0xd4, 0x91, 0x9d, 0x83, 0x73, 0x1a, 0x8f, 0x5b, 0xd3, 0x28, 0x99, 0x00, 0x04, 0x05, 0x13, 0xb9,
-    0xfe, 0xb2, 0x1e, 0xb8, 0x42, 0x82, 0x65, 0x9e, 0xd8, 0x4b, 0xf0, 0xea, 0x45, 0xb8, 0x6c, 0xbf, 0x2b, 0xa7, 0x55,
-    0xe5, 0x12, 0x13, 0x83, 0x1b, 0x19, 0xae, 0x06, 0x0f, 0xd6, 0xb2, 0x5c, 0xd5, 0xef, 0x6a, 0x92, 0xc2, 0x84, 0xd5,
-    0x52, 0x5c, 0xa1, 0xa5, 0x3e, 0x1c, 0xf9, 0xd7, 0x7f, 0xfa, 0x2f, 0xff, 0x43, 0xbd, 0xe2, 0x99, 0xc7, 0x5f, 0xff,
-    0xf1, 0xef, 0xff, 0xdf, 0xff, 0xfd, 0xaf, 0x98, 0x41, 0x2c, 0xcf, 0x45, 0x68, 0x6b, 0x59, 0xd5, 0xa1, 0x88, 0xd8,
-    0x63, 0x56, 0xe5, 0x84, 0xd4, 0x53, 0x61, 0xf7, 0x69, 0x42, 0x62, 0x50, 0x09, 0x1d, 0xf1, 0x39, 0xa5, 0x4e, 0x13,
-    0xd5, 0xae, 0x21, 0x1f, 0x2c, 0xa5, 0x45, 0x47, 0xfd, 0xf6, 0x4e, 0xdb, 0xae, 0x96, 0xb7, 0x6f, 0xf4, 0xdd, 0xc2,
-    0x85, 0xb9, 0x55, 0x62, 0x8e, 0xaf, 0x97, 0x6d, 0xa9, 0x42, 0x5b, 0x58, 0x52, 0x56, 0xe5, 0x16, 0xc6, 0x9c, 0x97,
-    0xf8, 0x1a, 0x74, 0x8d, 0x62, 0x5a, 0xe5, 0x5a, 0x9f, 0xde, 0x2f, 0x0b, 0x40, 0x74, 0x82, 0x4b, 0x23, 0x02, 0x68,
-    0x74, 0x9e, 0xda, 0x42, 0x6b, 0x25, 0xb9, 0x28, 0x69, 0x14, 0xe1, 0xe1, 0xdc, 0x7f, 0xf4, 0xb7, 0xe5, 0x9f, 0x67,
-    0x68, 0x25, 0x58, 0xce, 0x2c, 0x3a, 0x97, 0x7e, 0xcf, 0x83, 0x76, 0x7b, 0x7e, 0xee, 0x2e, 0xab, 0x19, 0xbc, 0xab,
-    0x26, 0xa3, 0xa0, 0x9b, 0x39, 0x20, 0x1d, 0xc4, 0xea, 0xf8, 0x1e, 0x98, 0xfa, 0x6d, 0x0c, 0x07, 0x95, 0xe5, 0x9f,
-    0x96, 0x14, 0x62, 0x8a, 0x7f, 0xc3, 0x03, 0x53, 0x19, 0x8d, 0x83, 0x12, 0x03, 0x8b, 0xa5, 0xd1, 0xab, 0x2b, 0x7a,
-    0x4d, 0x3b, 0xab, 0x29, 0x2b, 0xe6, 0x81, 0xaf, 0x79, 0x54, 0x7b, 0x1f, 0x0f, 0x5f, 0xa7, 0x1d, 0x6f, 0xda, 0x5d,
-    0xea, 0xe1, 0x39, 0xcf, 0x66, 0xe6, 0x09, 0x2f, 0x8b, 0xd8, 0x88, 0x4d, 0x54, 0x14, 0x53, 0xd6, 0x8b, 0xd3, 0xdb,
-    0xf2, 0x0b, 0xdc, 0x6e, 0x40, 0xdb, 0x2c, 0xe2, 0x01, 0x31, 0x6d, 0xcf, 0x3c, 0x03, 0x8e, 0xf0, 0x74, 0x3d, 0x5b,
-    0x1a, 0x73, 0xf5, 0x44, 0x53, 0x8c, 0x15, 0xd6, 0xd3, 0x81, 0x4a, 0x9f, 0xba, 0x9b, 0x43, 0x89, 0x50, 0xc3, 0xaf,
-    0xf2, 0x68, 0xf5, 0x5d, 0xcd, 0x47, 0x97, 0xa2, 0x19, 0xdc, 0xe2, 0xb5, 0xf5, 0x42, 0x4d, 0x8a, 0xda, 0x0f, 0x60,
-    0xfd, 0x10, 0x98, 0x76, 0xb3, 0x15, 0x15, 0x62, 0xab, 0x77, 0xe1, 0xaf, 0xda, 0x1e, 0x8f, 0xe6, 0x73, 0x6a, 0xe8,
-    0x02, 0x37, 0x92, 0x5d, 0x8d, 0x92, 0x82, 0xd2, 0x06, 0xc4, 0x29, 0xbd, 0x6c, 0x23, 0xd9, 0x56, 0x3c, 0xc9, 0xf3,
-    0x7b, 0xfa, 0xd5, 0xdf, 0xff, 0x1f, 0x2a, 0x12, 0x27, 0x08, 0x10, 0x7c, 0x00, 0x00};
+    0x9b, 0x73, 0xb4, 0xeb, 0xc3, 0x7a, 0xa0, 0x93, 0x6c, 0x5b, 0xc0, 0x4b, 0x66, 0xe3, 0xcd, 0xc8, 0xc1, 0x00, 0xc7,
+    0x39, 0x36, 0x4d, 0x59, 0x51, 0xac, 0x03, 0x0b, 0x9c, 0x60, 0xcf, 0xae, 0x9a, 0xd8, 0xb5, 0x0e, 0x00, 0x40, 0x77,
+    0x67, 0x47, 0x4c, 0x0b, 0x15, 0x6c, 0x32, 0x81, 0x8d, 0x87, 0x1a, 0x23, 0xe1, 0x18, 0xf6, 0x0f, 0xfb, 0xf6, 0x6b,
+    0xd8, 0xe3, 0x36, 0xf8, 0x57, 0xae, 0x3e, 0xc0, 0xa5, 0xe9, 0x95, 0x10, 0x32, 0xe6, 0x10, 0x9d, 0x8d, 0x61, 0xf4,
+    0x93, 0x81, 0x54, 0x36, 0xfa, 0xb4, 0x06, 0x27, 0xe0, 0xc2, 0x0d, 0x11, 0x40, 0x6e, 0xc8, 0x56, 0xfb, 0x5f, 0xff,
+    0xe9, 0x7f, 0xfd, 0x37, 0x18, 0x9b, 0xfa, 0xb9, 0xa5, 0x75, 0x75, 0xab, 0xff, 0x09, 0xad, 0x16, 0xe9, 0x0d, 0xed,
+    0xfe, 0xfa, 0x0f, 0xff, 0x1d, 0x9a, 0xd1, 0x45, 0x23, 0x90, 0x59, 0x04, 0xd1, 0x08, 0x6d, 0xbb, 0xcf, 0x02, 0xa9,
+    0x36, 0xc8, 0x95, 0x33, 0xfd, 0x23, 0x82, 0x5d, 0xf0, 0x6c, 0x7e, 0x2d, 0x38, 0x08, 0xf5, 0x28, 0xc9, 0x0a, 0xa6,
+    0xe1, 0x11, 0x72, 0xfe, 0xf3, 0x00, 0xa2, 0xb9, 0xe6, 0xb0, 0x9b, 0x0a, 0x4b, 0x8f, 0x23, 0x56, 0x68, 0xdd, 0x38,
+    0x8d, 0x05, 0x2c, 0x18, 0x27, 0x74, 0x28, 0x5c, 0x02, 0x4b, 0x26, 0x9e, 0xe0, 0x81, 0x04, 0x8f, 0x5b, 0xff, 0x78,
+    0xd9, 0xfa, 0xc1, 0x34, 0xc3, 0x89, 0xb1, 0x44, 0x84, 0x48, 0x8d, 0x00, 0x3f, 0x41, 0x38, 0x7e, 0xd4, 0xcf, 0xd1,
+    0xb9, 0x7e, 0x46, 0x01, 0x2a, 0x26, 0x00, 0x3d, 0x38, 0x43, 0x13, 0xc7, 0x9c, 0x41, 0x64, 0x37, 0x54, 0xee, 0xb1,
+    0x91, 0x24, 0x23, 0x84, 0xe4, 0x47, 0xcc, 0x25, 0xc5, 0x9b, 0x43, 0x8b, 0x9c, 0x7d, 0x4c, 0xb2, 0x33, 0x8c, 0xb9,
+    0x21, 0x91, 0xae, 0xaa, 0x2f, 0xff, 0xe5, 0x9f, 0x7d, 0xff, 0x5f, 0xfe, 0xf9, 0x8a, 0x06, 0x53, 0xd8, 0x13, 0x60,
+    0x24, 0xf3, 0x50, 0xd3, 0xb9, 0x81, 0xd6, 0xfa, 0x41, 0x11, 0xcf, 0xf5, 0x35, 0x12, 0x71, 0x2c, 0x95, 0x78, 0xcb,
+    0x47, 0x42, 0x5b, 0x33, 0xc5, 0xcd, 0xb3, 0x20, 0x64, 0x57, 0x4c, 0x83, 0x55, 0x37, 0xcc, 0x73, 0xe4, 0x06, 0xd7,
+    0xd0, 0xe5, 0x33, 0x31, 0x5e, 0x0f, 0xc6, 0x8d, 0x10, 0x78, 0xa0, 0x65, 0x84, 0x1e, 0x7a, 0x22, 0xb4, 0x48, 0x20,
+    0x96, 0x41, 0xea, 0x94, 0x1a, 0x40, 0x9e, 0x75, 0x40, 0x13, 0x50, 0x93, 0xb8, 0xd2, 0xe1, 0x64, 0x06, 0x1d, 0xe7,
+    0xfd, 0x57, 0x78, 0x59, 0xd0, 0xc2, 0xde, 0xa8, 0xc1, 0x0b, 0x32, 0x38, 0x38, 0x19, 0x1c, 0x52, 0xd3, 0x99, 0xba,
+    0x1e, 0x1d, 0xa7, 0x6c, 0xbd, 0x4e, 0xff, 0x88, 0xdd, 0x6b, 0x5a, 0x99, 0x4b, 0xad, 0x1c, 0x4b, 0x2b, 0x5a, 0x6a,
+    0x65, 0xfc, 0x24, 0x4c, 0x43, 0x2b, 0xc7, 0x57, 0x6a, 0x65, 0xa4, 0xdc, 0x00, 0x47, 0x0e, 0xed, 0x4d, 0x8c, 0x0e,
+    0x19, 0x36, 0x00, 0x47, 0xfb, 0x67, 0x34, 0x65, 0xa3, 0x4f, 0xd2, 0xfc, 0x21, 0x04, 0x30, 0x3c, 0xa2, 0x8d, 0x3c,
+    0x81, 0x01, 0xa8, 0xf2, 0xa3, 0x52, 0x6f, 0x7a, 0x7c, 0x34, 0x26, 0xe0, 0xee, 0x72, 0xc2, 0x50, 0xf4, 0xc3, 0x9a,
+    0x7d, 0xcd, 0xca, 0x2d, 0x1c, 0x47, 0x6c, 0x18, 0xf1, 0x0c, 0x98, 0x6d, 0xe1, 0x60, 0x47, 0xde, 0x52, 0x04, 0xdb,
+    0x02, 0xfb, 0xed, 0x9b, 0xfd, 0x03, 0xdb, 0x3b, 0xce, 0xc6, 0x17, 0x81, 0x0d, 0xde, 0x0c, 0x58, 0x39, 0xae, 0xcf,
+    0xa7, 0x2c, 0x75, 0x94, 0x3f, 0x91, 0x25, 0xe0, 0xaa, 0x65, 0x27, 0xe2, 0xdb, 0x10, 0xcd, 0x83, 0x02, 0x20, 0x2c,
+    0x7d, 0x3c, 0xb2, 0xbf, 0xcb, 0xc5, 0x77, 0x55, 0x79, 0x8e, 0x8f, 0x7d, 0x4c, 0x95, 0xd8, 0xdd, 0x82, 0x07, 0x7c,
+    0xd9, 0x47, 0xbd, 0xa7, 0xdf, 0x04, 0xb0, 0x85, 0x78, 0xdf, 0xc2, 0xf6, 0x5b, 0xaa, 0x2f, 0x42, 0xd1, 0x97, 0xdc,
+    0xa6, 0x4d, 0xfe, 0xca, 0x66, 0xa4, 0xb1, 0xc7, 0x68, 0x12, 0x92, 0xc9, 0x0f, 0x24, 0xe1, 0x63, 0x5d, 0x22, 0xcc,
+    0x0c, 0xa3, 0x88, 0x46, 0xa9, 0x8c, 0x02, 0x59, 0x85, 0x13, 0x92, 0x19, 0x29, 0x26, 0x83, 0x9f, 0x04, 0xfe, 0x91,
+    0xf9, 0x1d, 0x34, 0xf1, 0xc9, 0x22, 0x8d, 0xe4, 0xe1, 0x5f, 0xbc, 0x33, 0xe6, 0x5d, 0x1c, 0x51, 0x4b, 0xe5, 0x74,
+    0x63, 0x34, 0x08, 0x83, 0x13, 0x6d, 0x15, 0x5d, 0x01, 0x3b, 0x28, 0x89, 0xe6, 0x05, 0x0b, 0xd4, 0x83, 0xf4, 0xbf,
+    0xd1, 0x8d, 0x5f, 0x0d, 0x78, 0x98, 0xf6, 0x52, 0xc9, 0xa7, 0x4b, 0xd3, 0x41, 0x7f, 0x00, 0x0e, 0x3a, 0x5e, 0x2e,
+    0x68, 0x45, 0xa0, 0xe5, 0xd3, 0x20, 0x61, 0x13, 0x5e, 0x72, 0xbc, 0xbd, 0xbe, 0x54, 0x11, 0x11, 0xbf, 0xbb, 0x03,
+    0x4e, 0xbb, 0xe5, 0xe3, 0xff, 0x37, 0x8d, 0x3d, 0x0e, 0x52, 0x70, 0xb2, 0xe9, 0x3a, 0x0b, 0x5e, 0x15, 0x04, 0x88,
+    0xcc, 0xf7, 0xa5, 0x31, 0xd1, 0x88, 0x61, 0xb4, 0xa8, 0xe4, 0x39, 0xc8, 0x6d, 0x8f, 0xe7, 0x66, 0x3b, 0x90, 0xb7,
+    0x2b, 0x21, 0xa3, 0xd5, 0xa0, 0xc5, 0xb6, 0x2b, 0xfd, 0x8f, 0xd5, 0xc6, 0x2a, 0xf2, 0x53, 0x7f, 0x5b, 0xa1, 0x90,
+    0x11, 0xa3, 0x2a, 0x85, 0xaa, 0x59, 0x8a, 0x1e, 0x26, 0x4e, 0xab, 0xd1, 0xab, 0x1b, 0x2d, 0xd2, 0x92, 0xb6, 0xfd,
+    0x21, 0x6d, 0x7b, 0x12, 0x63, 0xc3, 0xa5, 0x98, 0x7b, 0x14, 0x25, 0x23, 0x07, 0x01, 0xb0, 0x5a, 0xd6, 0x23, 0xa0,
+    0xa6, 0xab, 0x22, 0x28, 0xfe, 0x43, 0x24, 0x6e, 0x29, 0x84, 0xde, 0x1a, 0x2a, 0x1d, 0x0d, 0xcb, 0xb2, 0x77, 0xc1,
+    0x9c, 0xc3, 0xdf, 0xe4, 0x65, 0x08, 0x71, 0x07, 0x56, 0x7f, 0x47, 0xb0, 0x5d, 0xba, 0x43, 0x8f, 0x31, 0xe3, 0xeb,
+    0x6c, 0xb6, 0xe2, 0x68, 0xdb, 0xeb, 0x52, 0x3c, 0x01, 0x7b, 0xbf, 0x72, 0x6c, 0x34, 0x62, 0xa9, 0xea, 0xa2, 0x45,
+    0x1c, 0x66, 0x53, 0x47, 0x11, 0xcd, 0xff, 0xe6, 0xaa, 0xa0, 0xcc, 0xb7, 0x37, 0x07, 0x65, 0xf8, 0x2d, 0x83, 0x32,
+    0xdf, 0xfe, 0xc1, 0x41, 0x99, 0x6f, 0xcc, 0xa0, 0x0c, 0xca, 0xca, 0x17, 0x9f, 0x13, 0x39, 0xc9, 0xb3, 0xb3, 0x22,
+    0xec, 0xc8, 0x24, 0x00, 0x10, 0x3b, 0xff, 0x31, 0x21, 0x14, 0x98, 0xa8, 0x11, 0x40, 0xa1, 0x88, 0x89, 0xc8, 0x5b,
+    0x04, 0x09, 0x2f, 0xe3, 0x15, 0x6d, 0x9d, 0x20, 0xd8, 0xba, 0xaf, 0x6e, 0x44, 0x81, 0x77, 0xe8, 0xea, 0xb0, 0x51,
+    0x57, 0x45, 0x34, 0x02, 0xfa, 0xa4, 0xa9, 0xee, 0xd8, 0xdd, 0x54, 0x99, 0x69, 0xe6, 0x08, 0x3d, 0x75, 0xe0, 0x20,
+    0x38, 0x68, 0x69, 0xff, 0xe7, 0xc3, 0x4e, 0x6f, 0xbb, 0x33, 0x83, 0xde, 0xa0, 0x4b, 0xe1, 0xad, 0xdd, 0xdb, 0xde,
+    0xc6, 0xb7, 0x33, 0xf5, 0xd6, 0xc5, 0xb7, 0x58, 0xbd, 0xed, 0xe0, 0xdb, 0x48, 0xbd, 0x3d, 0xc0, 0xb7, 0xb1, 0x7a,
+    0x7b, 0x88, 0x6f, 0xa7, 0x76, 0x79, 0xc8, 0x35, 0x70, 0x0f, 0x81, 0xb1, 0xc8, 0xb1, 0x08, 0x54, 0x19, 0xec, 0x5b,
+    0xbc, 0x49, 0x18, 0x9d, 0x04, 0xb1, 0x27, 0x1c, 0xb0, 0x20, 0xf7, 0xce, 0x40, 0xf8, 0x07, 0x94, 0x38, 0xf7, 0x14,
+    0x3f, 0x29, 0x01, 0xfe, 0xca, 0x41, 0x3c, 0x63, 0xea, 0xdb, 0xba, 0x0a, 0x6b, 0xb0, 0x25, 0x0f, 0xdb, 0xc3, 0xb2,
+    0xa7, 0xd7, 0x49, 0x04, 0x6c, 0x54, 0x62, 0x02, 0xad, 0x5c, 0x55, 0x27, 0xa6, 0x6b, 0xe9, 0x15, 0xbe, 0x42, 0x95,
+    0x18, 0x2e, 0xfb, 0x04, 0x6c, 0xa4, 0xd6, 0x39, 0x38, 0x79, 0x6b, 0xd5, 0x0b, 0x42, 0xa4, 0x15, 0x0a, 0xe1, 0xa4,
+    0xdf, 0x0e, 0xa2, 0x13, 0xfd, 0xfc, 0x0a, 0x8c, 0xde, 0xe8, 0x84, 0xdd, 0xa4, 0x6a, 0x08, 0x44, 0x53, 0xcd, 0x28,
+    0x20, 0xc8, 0x2a, 0x82, 0xa5, 0x41, 0x67, 0x53, 0xaa, 0x19, 0xa4, 0x4e, 0x5d, 0xf1, 0xd0, 0xf4, 0xf5, 0x22, 0xa0,
+    0x68, 0x55, 0xb0, 0x0b, 0xb6, 0x37, 0x95, 0x0a, 0x0a, 0x43, 0x05, 0x16, 0x5c, 0xab, 0x8d, 0xb4, 0x3f, 0x7e, 0xa5,
+    0x4e, 0xb2, 0x94, 0x3a, 0x32, 0x0f, 0x2a, 0xf4, 0x29, 0xc5, 0xaa, 0x84, 0xfc, 0xa2, 0x33, 0xc2, 0x3f, 0x52, 0xfe,
+    0x7e, 0x31, 0x99, 0x4c, 0xae, 0x55, 0x4f, 0x5f, 0x8c, 0x27, 0xac, 0xcb, 0x76, 0x7a, 0x18, 0xc4, 0x6e, 0x49, 0x89,
+    0xd8, 0x29, 0x89, 0x76, 0xcb, 0xdb, 0x35, 0x46, 0xe1, 0x09, 0x1a, 0xeb, 0xf6, 0x7a, 0xac, 0x04, 0xaa, 0x2c, 0x41,
+    0x7e, 0x9f, 0xc4, 0x69, 0xd0, 0x2e, 0xfd, 0x53, 0x29, 0xf8, 0xbf, 0x78, 0xf4, 0xe8, 0x51, 0xe9, 0x8f, 0xd5, 0x5b,
+    0x7b, 0x3c, 0x2e, 0xfd, 0xd1, 0x52, 0xa3, 0xd1, 0x6e, 0x4f, 0x26, 0xa5, 0x1f, 0xab, 0x82, 0xed, 0xee, 0x68, 0xbc,
+    0xdd, 0x2d, 0xfd, 0x33, 0xa3, 0x45, 0xe9, 0x33, 0xf9, 0x96, 0xb3, 0x71, 0x2d, 0x12, 0xfe, 0xb0, 0x0d, 0x95, 0x82,
+    0xd1, 0x96, 0xe8, 0xe8, 0x89, 0xc7, 0x20, 0x5a, 0xf0, 0x0c, 0x6c, 0x2c, 0xe0, 0x6d, 0x10, 0xd0, 0x13, 0x29, 0xde,
+    0xc5, 0xa7, 0x6b, 0x51, 0xa8, 0xbf, 0x30, 0x65, 0x3a, 0x32, 0x33, 0xc9, 0x73, 0x4e, 0xaa, 0xa0, 0x59, 0x8d, 0x9c,
+    0x45, 0xd5, 0x2f, 0x42, 0x5e, 0x49, 0x7b, 0x94, 0x36, 0xd8, 0x52, 0xc8, 0xf8, 0x1f, 0xaf, 0x92, 0xf1, 0x3f, 0xdc,
+    0x2c, 0xe3, 0x8f, 0x6f, 0x27, 0xe2, 0x7f, 0xf8, 0x83, 0x45, 0xfc, 0x8f, 0xa6, 0x88, 0x17, 0x42, 0x6c, 0x0f, 0xac,
+    0x58, 0x32, 0x5f, 0x8f, 0xb3, 0xf3, 0x16, 0x6e, 0x89, 0xdc, 0x26, 0xe9, 0xb9, 0x71, 0x2b, 0xe1, 0xbf, 0x26, 0xb5,
+    0x49, 0x0d, 0x66, 0x7c, 0x07, 0x97, 0x67, 0x27, 0x27, 0x09, 0x53, 0x32, 0xde, 0xa8, 0x20, 0xcb, 0xf8, 0x4d, 0x1a,
+    0xda, 0x6f, 0xc0, 0x49, 0x35, 0x4a, 0x26, 0x13, 0x28, 0x9a, 0x4c, 0x6c, 0x95, 0xfa, 0x0b, 0xf2, 0x8c, 0x5a, 0xbd,
+    0xae, 0x95, 0x50, 0xab, 0xaf, 0xbe, 0x32, 0xcb, 0xcc, 0x02, 0x19, 0xf5, 0x32, 0xed, 0x09, 0x59, 0x33, 0x8e, 0x0b,
+    0xdc, 0x83, 0xd5, 0x77, 0x7b, 0xd1, 0x64, 0x99, 0x81, 0x52, 0x89, 0x47, 0xf8, 0x41, 0x98, 0xe6, 0x37, 0x52, 0x44,
+    0x9a, 0xf6, 0x2a, 0x72, 0xd5, 0x51, 0xae, 0xf1, 0x39, 0xbe, 0xea, 0xf8, 0x16, 0x16, 0x5f, 0xa6, 0x6a, 0x3c, 0xbe,
+    0x78, 0x31, 0x76, 0xf6, 0xc0, 0x94, 0x8d, 0x8b, 0x37, 0x69, 0x23, 0x05, 0x4e, 0x80, 0x1d, 0x86, 0x26, 0xa6, 0xa5,
+    0x20, 0x58, 0x75, 0x17, 0xa0, 0xaa, 0xec, 0x19, 0x9d, 0x64, 0xa6, 0x14, 0x0e, 0x39, 0xa8, 0x91, 0x25, 0x30, 0x07,
+    0x93, 0xba, 0x90, 0xbe, 0xcb, 0x2e, 0xf2, 0x47, 0x4e, 0xe5, 0x07, 0xbc, 0xe9, 0xf4, 0x61, 0x29, 0xf5, 0x87, 0xcc,
+    0x2c, 0xa8, 0x7a, 0x62, 0xc0, 0x5f, 0xcc, 0x30, 0x2e, 0x55, 0x90, 0x1f, 0x08, 0x37, 0xc7, 0xaf, 0x0d, 0x89, 0x21,
+    0x54, 0x2c, 0xbd, 0xa2, 0xde, 0xe5, 0xa5, 0xf9, 0xd1, 0xcb, 0xda, 0x07, 0x12, 0x1b, 0x3c, 0xc0, 0xf0, 0x6b, 0xb5,
+    0xa8, 0x0d, 0xb2, 0x05, 0x77, 0x1c, 0x6a, 0xe5, 0xb8, 0xa5, 0xb7, 0xd3, 0x6e, 0x83, 0x8a, 0xf1, 0xc5, 0x27, 0x8d,
+    0x1c, 0xdd, 0x59, 0xe2, 0x7b, 0x55, 0xe8, 0x7e, 0xe5, 0x13, 0x63, 0x9a, 0xc4, 0xf8, 0x0d, 0x14, 0x81, 0xa8, 0x71,
+    0x0d, 0x46, 0x2d, 0x62, 0xf3, 0xdd, 0x57, 0x6e, 0x9c, 0x41, 0x58, 0x77, 0x1d, 0x07, 0xcb, 0x34, 0xd1, 0x7a, 0x21,
+    0xb6, 0x15, 0x56, 0xcd, 0x2a, 0x38, 0x37, 0xe8, 0xcc, 0xe2, 0xcc, 0x88, 0x71, 0xd7, 0xb6, 0x41, 0xa9, 0x82, 0xdc,
+    0x22, 0x52, 0xbd, 0x87, 0xf1, 0x58, 0xe1, 0x03, 0x2b, 0xa0, 0xeb, 0xde, 0xa7, 0x01, 0x39, 0xfa, 0xa5, 0x9a, 0xd1,
+    0x55, 0x95, 0x2a, 0x28, 0xcd, 0x53, 0x0a, 0x03, 0x19, 0x0a, 0x36, 0xc3, 0x1a, 0xa7, 0x42, 0x6f, 0xc1, 0x34, 0x24,
+    0x80, 0xb5, 0x53, 0x86, 0x9e, 0x89, 0xad, 0xc0, 0x16, 0xd2, 0x02, 0x94, 0x1e, 0x76, 0xe8, 0x5b, 0x35, 0xd0, 0xd3,
+    0xd5, 0x18, 0xf5, 0x75, 0x7e, 0xda, 0xc5, 0x91, 0x5f, 0x9c, 0x79, 0xf0, 0xcf, 0xfa, 0xd3, 0x12, 0xa4, 0xfc, 0xf1,
+    0xa7, 0x98, 0x83, 0x51, 0x3d, 0x6f, 0x61, 0x24, 0x84, 0x42, 0xa6, 0x52, 0x1d, 0xd2, 0xa9, 0xaa, 0xb8, 0xfd, 0xd4,
+    0x5b, 0x14, 0xe8, 0xce, 0x91, 0xdf, 0x12, 0xa4, 0x59, 0xca, 0x7a, 0xf5, 0xd3, 0x73, 0xd3, 0x75, 0x50, 0xc4, 0x1a,
+    0x2e, 0x33, 0x74, 0xff, 0xf8, 0x05, 0xb8, 0x7f, 0x42, 0x8d, 0xb6, 0x95, 0xdf, 0xd0, 0x5e, 0xdb, 0x3e, 0x90, 0xb4,
+    0xdd, 0x24, 0x6b, 0x21, 0x5f, 0xf5, 0x8f, 0xae, 0xf2, 0x6f, 0x6e, 0x3a, 0x4b, 0xc6, 0xf8, 0xac, 0xfa, 0x67, 0x1c,
+    0xc2, 0x37, 0x8b, 0xe9, 0x2c, 0xf9, 0x36, 0x90, 0x05, 0xd1, 0x04, 0x3f, 0x16, 0x78, 0x9b, 0x96, 0xc7, 0x94, 0xc8,
+    0xb9, 0x44, 0xb5, 0x1e, 0x74, 0x1e, 0x81, 0xc3, 0x76, 0xeb, 0xe1, 0xaf, 0x47, 0xbf, 0x94, 0x34, 0x52, 0xf7, 0x71,
+    0x6d, 0xbb, 0x87, 0xf2, 0x22, 0x89, 0x2e, 0xc0, 0x6f, 0x24, 0x1b, 0xe3, 0x18, 0x03, 0xb9, 0xbd, 0x79, 0x26, 0x93,
+    0x22, 0x72, 0x96, 0xd0, 0x6f, 0xe4, 0x90, 0x4b, 0xb1, 0xfd, 0x60, 0x7e, 0xae, 0x56, 0xa3, 0xd3, 0x48, 0x76, 0xf8,
+    0x43, 0x73, 0x1a, 0xae, 0x4e, 0xa2, 0xa8, 0x9f, 0xcb, 0xef, 0x00, 0x0c, 0xc2, 0xb0, 0x69, 0xe5, 0x02, 0xaa, 0x36,
+    0x94, 0x18, 0x59, 0x1d, 0xd5, 0x40, 0x96, 0xbf, 0x0d, 0xaa, 0x32, 0x2a, 0x58, 0x0f, 0xbf, 0xda, 0x18, 0x83, 0x77,
+    0x2a, 0x8d, 0xa7, 0x59, 0x3c, 0x1e, 0x27, 0xac, 0xa7, 0xec, 0x23, 0xab, 0xf3, 0x00, 0x93, 0x22, 0xcc, 0x25, 0xab,
+    0xaf, 0x8a, 0x41, 0x3c, 0x4d, 0xa7, 0xe8, 0x18, 0xec, 0x35, 0xfc, 0xf4, 0xe2, 0x5a, 0x72, 0xca, 0x6c, 0x81, 0x76,
+    0x45, 0x3c, 0x7a, 0xae, 0xe3, 0xb2, 0x03, 0xc6, 0x22, 0x2d, 0x78, 0xbb, 0xc7, 0xb3, 0x79, 0xd0, 0xda, 0xae, 0x23,
+    0x82, 0x55, 0x1a, 0x05, 0x6f, 0x0d, 0x5a, 0x1e, 0x5a, 0x07, 0x42, 0xcb, 0x59, 0x7e, 0x47, 0x96, 0xd1, 0x00, 0xf8,
+    0x79, 0x3f, 0x5d, 0x54, 0xd6, 0x91, 0xf9, 0xf7, 0xd9, 0x2d, 0x5f, 0xae, 0xdf, 0x2d, 0x5f, 0xaa, 0xdd, 0x72, 0x3d,
+    0xc7, 0x7e, 0x31, 0xe9, 0xe0, 0x9f, 0x5e, 0x85, 0x10, 0xac, 0x0a, 0x90, 0xc3, 0x42, 0xbb, 0xb8, 0xd5, 0x85, 0xff,
+    0x68, 0xe8, 0xb6, 0x87, 0x7f, 0x7c, 0xb0, 0x00, 0xdb, 0x16, 0x16, 0xe2, 0xbf, 0x76, 0xad, 0xaa, 0x73, 0x1f, 0xeb,
+    0xb0, 0xd7, 0xce, 0x6a, 0x5d, 0xf7, 0xfa, 0x4d, 0x0b, 0xf2, 0x8a, 0x3b, 0x81, 0x12, 0xc6, 0xe0, 0xaa, 0x45, 0xc7,
+    0xc7, 0x50, 0x3a, 0xc9, 0x46, 0x8b, 0xe2, 0xef, 0x24, 0xfc, 0x92, 0x88, 0xd7, 0x6e, 0xe9, 0xc6, 0x38, 0xaa, 0xab,
+    0xc8, 0xb0, 0x51, 0x23, 0x2c, 0xf5, 0x3a, 0x05, 0x05, 0x30, 0x26, 0x73, 0xba, 0xfe, 0xfd, 0x35, 0x9b, 0xe0, 0x3f,
+    0x64, 0x6d, 0xd6, 0x22, 0xf3, 0x6f, 0x25, 0xc6, 0xb5, 0x44, 0xf8, 0x2c, 0x1a, 0x98, 0x6b, 0xd8, 0x7e, 0xb4, 0x1e,
+    0xdc, 0x43, 0x35, 0xd3, 0x50, 0x29, 0x05, 0xa9, 0x77, 0xc0, 0x0b, 0x88, 0x16, 0x09, 0xbf, 0x7e, 0xd4, 0xab, 0x38,
+    0x63, 0x65, 0xd4, 0x6b, 0x04, 0x7a, 0xd5, 0xf6, 0x96, 0x52, 0xfa, 0x8b, 0x2f, 0xef, 0xe3, 0x1f, 0x11, 0xfb, 0x3a,
+    0xae, 0x7c, 0x23, 0x11, 0x1b, 0x40, 0xdf, 0x68, 0xa3, 0xe6, 0xfc, 0x08, 0x0d, 0x4e, 0xfe, 0xcf, 0x6d, 0x5b, 0xa3,
+    0xb1, 0x7e, 0xab, 0xe6, 0xd2, 0x2a, 0xfd, 0xac, 0xd6, 0x9f, 0x37, 0xf8, 0x2d, 0xdb, 0x8e, 0x84, 0x43, 0x50, 0x6f,
+    0x2b, 0x7f, 0x3b, 0xca, 0x4a, 0x63, 0x45, 0xf1, 0xdb, 0xb6, 0xaf, 0x4c, 0x62, 0xea, 0xb1, 0x11, 0x1e, 0x6b, 0x27,
+    0x52, 0x9e, 0x6f, 0x63, 0x0f, 0xe1, 0x47, 0xfe, 0x85, 0x85, 0xf7, 0xf0, 0xc3, 0x62, 0xd6, 0xf9, 0x2c, 0x49, 0xc1,
+    0xac, 0x9a, 0x72, 0x3e, 0x0f, 0xb6, 0xb6, 0xce, 0xce, 0xce, 0xfc, 0xb3, 0x6d, 0x3f, 0xcb, 0x4f, 0xb6, 0xba, 0xed,
+    0x76, 0x1b, 0xbf, 0x07, 0x65, 0x5b, 0xa7, 0x31, 0x3b, 0x7b, 0x0c, 0xee, 0x87, 0xfd, 0xd0, 0x7a, 0x64, 0x3d, 0xdc,
+    0xb6, 0x76, 0x1e, 0xd8, 0x16, 0x29, 0x00, 0x28, 0xd9, 0xb6, 0x2d, 0xa1, 0x00, 0x42, 0x1b, 0x8a, 0xfb, 0xbb, 0x27,
+    0xca, 0x86, 0xc3, 0x7c, 0x7b, 0x61, 0x21, 0x81, 0xff, 0x96, 0x7d, 0x62, 0xf5, 0xad, 0x2e, 0xca, 0x5a, 0x52, 0x8d,
+    0xa8, 0x57, 0xdc, 0xef, 0xa3, 0x68, 0x1e, 0x10, 0x1b, 0x99, 0x85, 0x18, 0x26, 0x13, 0xa5, 0x34, 0x05, 0xda, 0xa5,
+    0xc7, 0xf0, 0x84, 0x19, 0x5a, 0x16, 0x3c, 0xbf, 0xea, 0x3e, 0x04, 0x1d, 0x77, 0xda, 0xba, 0x3f, 0x6a, 0xb7, 0x3a,
+    0x56, 0xa7, 0xd5, 0xf5, 0x1f, 0x5a, 0x5d, 0xf1, 0x3f, 0xc8, 0xc8, 0x6d, 0xab, 0x03, 0x4f, 0xdb, 0x16, 0xbc, 0x9f,
+    0xde, 0x17, 0xe9, 0x17, 0x91, 0xbd, 0xd5, 0xdf, 0xc5, 0x5f, 0x8f, 0x04, 0x48, 0x7d, 0x69, 0x8b, 0x5f, 0xe8, 0x66,
+    0x7f, 0x61, 0x96, 0x76, 0x1e, 0xad, 0x2d, 0xee, 0x3e, 0x5c, 0x5b, 0xbc, 0xfd, 0x60, 0x6d, 0xf1, 0xfd, 0x9d, 0x7a,
+    0xf1, 0xd6, 0x89, 0xa8, 0xd2, 0x72, 0x21, 0xb4, 0x67, 0x11, 0x30, 0xca, 0xb9, 0xd3, 0x01, 0x38, 0xdb, 0x56, 0x0b,
+    0x7f, 0x3c, 0xec, 0xba, 0xba, 0xd7, 0x31, 0xf6, 0xd2, 0x58, 0x3e, 0x7c, 0x04, 0x58, 0x3e, 0xef, 0x3e, 0x18, 0x61,
+    0x3b, 0x42, 0x14, 0xfe, 0x9d, 0x6e, 0x3f, 0x1a, 0x81, 0x46, 0xb0, 0xf0, 0x1f, 0xfc, 0x99, 0xee, 0x74, 0x47, 0xe2,
+    0xa5, 0x8d, 0xf5, 0x1f, 0x3a, 0x0f, 0x0b, 0x68, 0x8a, 0x7f, 0x7e, 0xd3, 0x26, 0x34, 0x1a, 0xf0, 0xe6, 0xb8, 0xf7,
+    0x81, 0x46, 0x8f, 0xa6, 0x5d, 0xff, 0xcb, 0xd3, 0x87, 0xfe, 0xa3, 0x69, 0xe7, 0xe1, 0x07, 0xf1, 0x96, 0x00, 0x05,
+    0xbf, 0xc4, 0x7f, 0x1f, 0xb6, 0xdb, 0xd3, 0x56, 0xc7, 0x7f, 0x74, 0xba, 0xed, 0x6f, 0x27, 0xad, 0x07, 0xfe, 0x23,
+    0xfc, 0x57, 0x0d, 0x37, 0xcd, 0x66, 0xcc, 0xb6, 0x70, 0xbd, 0x1b, 0x7e, 0xaf, 0x39, 0x47, 0xf7, 0xbe, 0xb5, 0x73,
+    0xff, 0xf9, 0x23, 0x58, 0xa3, 0x69, 0xa7, 0x0b, 0xff, 0x5f, 0xf5, 0xf8, 0x01, 0x09, 0x2f, 0x07, 0x8e, 0x18, 0x66,
+    0xca, 0x2a, 0xc2, 0xd1, 0xb7, 0xc9, 0xee, 0x79, 0xdf, 0x5f, 0x15, 0x00, 0x61, 0xfc, 0xe6, 0x20, 0x37, 0xbf, 0x5d,
+    0x04, 0x84, 0x3e, 0x9c, 0xff, 0x07, 0x46, 0x40, 0xbe, 0x6f, 0x06, 0xb9, 0xcf, 0x57, 0xf3, 0x03, 0x9b, 0xce, 0xda,
+    0x6b, 0xe6, 0x1c, 0xfe, 0x85, 0x0d, 0x31, 0x2b, 0x1c, 0x5a, 0x73, 0x6e, 0xc6, 0x83, 0x32, 0xdc, 0xc8, 0xe7, 0x32,
+    0xea, 0x5f, 0xf0, 0x2b, 0x08, 0x12, 0xdf, 0x4c, 0x90, 0x5f, 0x6f, 0x47, 0x8f, 0xf8, 0x0f, 0xa6, 0x47, 0xc1, 0x0d,
+    0x7a, 0xd4, 0x22, 0xee, 0x14, 0x31, 0x20, 0x47, 0x7f, 0x9f, 0xde, 0x9d, 0xef, 0xf1, 0xab, 0x62, 0x5b, 0x0c, 0x4b,
+    0x0a, 0x5b, 0xe4, 0x24, 0xbe, 0xfb, 0x9c, 0x13, 0x02, 0x91, 0x38, 0x1d, 0xda, 0x32, 0x08, 0x33, 0xc7, 0xcf, 0xef,
+    0xaa, 0x97, 0x53, 0x71, 0x39, 0x27, 0xa4, 0x9b, 0x75, 0x3b, 0x3a, 0x80, 0x83, 0xb9, 0xec, 0xe1, 0x32, 0xe3, 0x11,
+    0xfe, 0x7e, 0x27, 0x1e, 0xf3, 0x04, 0xef, 0xfd, 0xca, 0x3b, 0x72, 0x98, 0x7a, 0xfd, 0x2d, 0xa6, 0x8d, 0xab, 0x83,
+    0x82, 0x19, 0x06, 0x0d, 0x5e, 0xb1, 0x71, 0x1c, 0x39, 0xb6, 0x33, 0x87, 0x5d, 0x0b, 0x63, 0xb6, 0x6a, 0x39, 0xdb,
+    0x94, 0xae, 0xed, 0xda, 0xea, 0x57, 0x0a, 0xe5, 0xf8, 0x89, 0xb6, 0xf0, 0x50, 0x06, 0x19, 0x6d, 0xe9, 0x05, 0xc0,
+    0xf8, 0xaa, 0x24, 0x47, 0x81, 0x5f, 0x59, 0x0e, 0xb6, 0x30, 0x1d, 0x3a, 0x7e, 0x17, 0x5c, 0x09, 0x2a, 0xc6, 0x4f,
+    0x5e, 0xfd, 0xe0, 0xb4, 0xb6, 0xc1, 0xb4, 0x31, 0xba, 0xe9, 0x81, 0x86, 0x2b, 0xa1, 0x24, 0x11, 0x20, 0x68, 0x94,
+    0x7a, 0xfa, 0x77, 0xac, 0x55, 0x21, 0xa3, 0xe2, 0xf1, 0xc5, 0x81, 0xbc, 0xd6, 0x6e, 0x63, 0xf4, 0x96, 0xa2, 0xf6,
+    0xd5, 0x27, 0xb5, 0x36, 0x41, 0x65, 0xd0, 0x2f, 0xba, 0xa4, 0x33, 0x70, 0xd4, 0x0a, 0x98, 0x55, 0x6e, 0x49, 0xef,
+    0x21, 0xb4, 0x85, 0x4e, 0x18, 0xb3, 0xd3, 0x78, 0x24, 0x45, 0xbb, 0x67, 0xc9, 0xdb, 0x30, 0x2d, 0xc2, 0x22, 0xec,
+    0x78, 0xc2, 0x7f, 0x86, 0x17, 0xd4, 0x6c, 0x61, 0x9a, 0xd9, 0xfd, 0x7b, 0x3d, 0x0d, 0x49, 0x3d, 0x21, 0xdf, 0xc6,
+    0xdf, 0xba, 0x79, 0x08, 0xfe, 0xda, 0xdf, 0x85, 0xf7, 0xf0, 0xf7, 0x6e, 0xde, 0x1b, 0xda, 0xae, 0x4f, 0x82, 0xf1,
+    0x5e, 0xf5, 0xcb, 0x37, 0x51, 0x2a, 0x6c, 0x82, 0x0e, 0xf3, 0x6e, 0xab, 0xcc, 0xa4, 0xe2, 0xea, 0xee, 0x54, 0x8a,
+    0x0b, 0x9e, 0x0d, 0x49, 0x05, 0x42, 0xb4, 0xeb, 0xef, 0x18, 0xe2, 0xf0, 0xb4, 0x85, 0x3f, 0x6b, 0x02, 0xf1, 0x3e,
+    0x34, 0x50, 0x12, 0xf1, 0x25, 0x34, 0xdf, 0x16, 0xc2, 0x17, 0xfa, 0xfd, 0x48, 0xe2, 0x4a, 0x88, 0xaa, 0x3a, 0xc7,
+    0xac, 0x39, 0x48, 0x12, 0xf9, 0x02, 0xb6, 0x67, 0xc4, 0x9c, 0x04, 0xbb, 0xca, 0x88, 0xca, 0x53, 0xe8, 0xeb, 0xe8,
+    0x2f, 0x55, 0xaf, 0xab, 0xf3, 0x6a, 0xbb, 0x67, 0xcd, 0x14, 0xc8, 0xf0, 0x8d, 0xc3, 0x2a, 0xba, 0x9d, 0x21, 0xbe,
+    0xd8, 0x26, 0xb6, 0x72, 0xf5, 0x4d, 0xbb, 0x35, 0x59, 0xc0, 0xe6, 0xa6, 0x60, 0x15, 0xd3, 0xd0, 0xbe, 0xc0, 0xf4,
+    0x19, 0xfc, 0x59, 0x15, 0xab, 0x07, 0xc9, 0x50, 0x7e, 0x12, 0xe1, 0x2f, 0x9c, 0xa1, 0x1f, 0x65, 0xb5, 0x01, 0x39,
+    0x7d, 0x92, 0x93, 0x20, 0x7d, 0x31, 0x2e, 0x9b, 0x48, 0x80, 0xcd, 0x80, 0xbf, 0xbf, 0xb0, 0xba, 0x0d, 0x22, 0xaf,
+    0x79, 0x62, 0x6a, 0xc1, 0x38, 0xce, 0xe9, 0xf6, 0xb0, 0xc2, 0xbf, 0x16, 0xd5, 0xac, 0x48, 0x4d, 0xbb, 0x92, 0x15,
+    0x03, 0x1b, 0x8b, 0xec, 0x40, 0x26, 0xc0, 0x99, 0xdf, 0xa4, 0x36, 0xaf, 0x77, 0x8e, 0x45, 0xee, 0x1b, 0x7e, 0xb3,
+    0xdf, 0x16, 0x44, 0xb6, 0x41, 0x94, 0x5d, 0x89, 0x13, 0x19, 0x38, 0x78, 0x2b, 0xb2, 0xfa, 0x25, 0x4c, 0xe6, 0x86,
+    0xb7, 0xcd, 0xd5, 0xd2, 0xe3, 0xd2, 0x3a, 0xb8, 0x32, 0x86, 0x77, 0xcc, 0x22, 0xee, 0x47, 0x29, 0xe5, 0x29, 0x39,
+    0x86, 0x58, 0xf0, 0x3a, 0x6c, 0xdb, 0x2d, 0x41, 0xf2, 0x18, 0xbf, 0xa5, 0x4a, 0x90, 0xde, 0x87, 0x42, 0x95, 0x4b,
+    0xfd, 0x7d, 0x2d, 0x15, 0x78, 0xda, 0xed, 0xbf, 0x39, 0xd8, 0xb3, 0xc4, 0xc6, 0xde, 0xdd, 0x82, 0xd7, 0x5d, 0xf2,
+    0x8e, 0x45, 0xc6, 0x46, 0x28, 0x32, 0x36, 0x2c, 0x91, 0xe7, 0x25, 0x52, 0x67, 0xb7, 0x04, 0xd6, 0xb6, 0xc5, 0xd2,
+    0x91, 0x08, 0xeb, 0xcd, 0xc0, 0x83, 0x88, 0xf1, 0x33, 0x66, 0x5b, 0xd8, 0xb5, 0x85, 0x0b, 0x6f, 0xab, 0xe4, 0x17,
+    0x65, 0x33, 0xf0, 0x54, 0x05, 0x01, 0x41, 0xd3, 0x33, 0x95, 0x07, 0x23, 0x87, 0xd2, 0x69, 0xb1, 0xab, 0xad, 0x8b,
+    0xc5, 0xf1, 0x0c, 0xc4, 0x92, 0xca, 0x5d, 0x79, 0x2f, 0x3b, 0xec, 0xd2, 0x54, 0xfd, 0xa3, 0x72, 0x5d, 0x94, 0x72,
+    0xda, 0xe9, 0xef, 0x46, 0xd2, 0x06, 0xc2, 0xbd, 0x5c, 0xc0, 0x66, 0x06, 0xd5, 0x87, 0x86, 0x86, 0x1f, 0x67, 0x5b,
+    0x67, 0xec, 0xb8, 0x15, 0xcd, 0xe3, 0x2a, 0x24, 0x88, 0x1a, 0xb1, 0xbf, 0xab, 0x94, 0xa3, 0x4c, 0xf5, 0x94, 0x8f,
+    0x91, 0x91, 0xdc, 0x81, 0x84, 0x24, 0x86, 0x2d, 0x65, 0xbc, 0x91, 0x0c, 0x49, 0x58, 0x0c, 0x00, 0x96, 0xf8, 0x59,
+    0xc5, 0x25, 0xa5, 0x66, 0x28, 0xed, 0xfe, 0x5f, 0xff, 0xf7, 0xff, 0x91, 0xa1, 0x46, 0xa0, 0x2d, 0x80, 0x85, 0xd9,
+    0x31, 0xd5, 0xa9, 0x23, 0x3b, 0x07, 0xe7, 0x34, 0x1e, 0xb7, 0xa6, 0x51, 0x32, 0x01, 0x08, 0x0a, 0x26, 0xee, 0x14,
+    0xc8, 0x7a, 0xe0, 0x0a, 0x09, 0x96, 0x79, 0x62, 0x2f, 0xc1, 0xab, 0x17, 0xe1, 0xb2, 0xfd, 0xae, 0xdc, 0x59, 0x95,
+    0xb3, 0x4c, 0x0c, 0x6e, 0x64, 0xd2, 0x1a, 0x3c, 0x58, 0xcb, 0xa6, 0x55, 0xbf, 0x13, 0x4a, 0x0a, 0x13, 0x56, 0x4b,
+    0xa5, 0x85, 0x96, 0xfa, 0x70, 0xe4, 0x5f, 0xff, 0xe9, 0xbf, 0xfc, 0x0f, 0xf5, 0x8a, 0x67, 0x1e, 0x7f, 0xfd, 0xc7,
+    0xbf, 0xff, 0x7f, 0xff, 0xf7, 0xbf, 0x62, 0xa6, 0xb2, 0x3c, 0x17, 0xa1, 0xad, 0x65, 0x55, 0x87, 0x22, 0x62, 0x8f,
+    0x59, 0x95, 0x13, 0x52, 0x4f, 0xb9, 0xdd, 0xa7, 0x09, 0x89, 0x41, 0x25, 0x74, 0xc4, 0xe7, 0x94, 0xa2, 0x4d, 0x54,
+    0xbb, 0x86, 0x7c, 0xb0, 0x94, 0x16, 0x1d, 0xf5, 0xdb, 0x3b, 0x6d, 0xbb, 0x5a, 0xde, 0xbe, 0xd1, 0x77, 0x0b, 0x17,
+    0xe6, 0x56, 0x89, 0x39, 0xbe, 0x5e, 0xb6, 0xa5, 0x0a, 0x6d, 0x61, 0x49, 0x59, 0x95, 0x5b, 0x18, 0x73, 0x5e, 0xe2,
+    0x6b, 0xd0, 0x35, 0x8a, 0x69, 0x95, 0x6b, 0x7d, 0x7a, 0xbf, 0x2c, 0x00, 0xd1, 0x09, 0x2e, 0x8d, 0x08, 0xa0, 0xd1,
+    0x79, 0x6a, 0x0b, 0xad, 0x95, 0xe4, 0xa2, 0xa4, 0x51, 0x84, 0x87, 0x73, 0xff, 0xd1, 0xdf, 0x96, 0x7f, 0x9e, 0xa1,
+    0x95, 0x60, 0x39, 0xb3, 0xe8, 0x5c, 0xfa, 0x3d, 0x0f, 0xda, 0xed, 0xf9, 0xb9, 0xbb, 0xac, 0x66, 0xf0, 0xae, 0x9a,
+    0x8c, 0x82, 0x6e, 0xe6, 0x80, 0x74, 0x10, 0xab, 0xe3, 0x7b, 0x60, 0xea, 0xb7, 0x31, 0x1c, 0x54, 0x96, 0x7f, 0x5a,
+    0x52, 0x88, 0x29, 0xfe, 0x0d, 0x0f, 0x4c, 0x65, 0x34, 0x0e, 0x4a, 0x0c, 0x2c, 0x96, 0x46, 0xaf, 0xae, 0xe8, 0x35,
+    0xed, 0xac, 0xa6, 0xac, 0x98, 0x07, 0xbe, 0xe6, 0x51, 0xed, 0x7d, 0x3c, 0x7c, 0x9d, 0x76, 0xbc, 0x69, 0x77, 0xa9,
+    0x87, 0xe7, 0x3c, 0x9b, 0x99, 0x27, 0xbc, 0x2c, 0x62, 0x23, 0x36, 0x51, 0x51, 0x4c, 0x59, 0x2f, 0x4e, 0x6f, 0xcb,
+    0x2f, 0x70, 0xbb, 0x01, 0x6d, 0xb3, 0x88, 0x07, 0xc4, 0xb4, 0x3d, 0xf3, 0x0c, 0x38, 0xc2, 0xd3, 0xf5, 0x6c, 0x69,
+    0xcc, 0xd5, 0x13, 0x4d, 0x31, 0x56, 0x58, 0x4f, 0x07, 0x2a, 0x7d, 0xea, 0x6e, 0x0e, 0x25, 0x42, 0x0d, 0xbf, 0xca,
+    0xa3, 0xd5, 0x77, 0x35, 0x1f, 0x5d, 0x8a, 0x66, 0x70, 0x8b, 0xd7, 0xd6, 0x0b, 0x35, 0x29, 0x6a, 0x3f, 0x80, 0xf5,
+    0x43, 0x60, 0xda, 0xcd, 0x56, 0x54, 0x88, 0xad, 0xde, 0x85, 0xbf, 0x6a, 0x7b, 0x3c, 0x9a, 0xcf, 0xa9, 0xa1, 0x0b,
+    0xdc, 0x48, 0x76, 0x35, 0x4a, 0x0a, 0x4a, 0x1b, 0x10, 0xa7, 0xf4, 0xb2, 0x8d, 0x64, 0x5b, 0xf1, 0x24, 0xcf, 0xef,
+    0xe9, 0x57, 0x8c, 0xff, 0x7f, 0x2a, 0xa5, 0xd0, 0x17, 0x78, 0x7c, 0x00, 0x00};
 
 }  // namespace web_server
 }  // namespace esphome

From 7623f6384688d909d1d2e22217942bc59668a2c6 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 22 Nov 2022 21:12:33 +1300
Subject: [PATCH 283/838] rp2040_pwm frequency is per pair of pins (#4061)

---
 esphome/components/rp2040_pwm/rp2040_pwm.cpp | 4 ++--
 esphome/components/rp2040_pwm/rp2040_pwm.h   | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/esphome/components/rp2040_pwm/rp2040_pwm.cpp b/esphome/components/rp2040_pwm/rp2040_pwm.cpp
index 3f95125578..664a3734f7 100644
--- a/esphome/components/rp2040_pwm/rp2040_pwm.cpp
+++ b/esphome/components/rp2040_pwm/rp2040_pwm.cpp
@@ -42,9 +42,9 @@ void HOT RP2040PWM::write_state(float state) {
     state = 1.0f - state;
   }
 
-  if (frequency_changed_) {
+  if (this->frequency_changed_) {
     this->setup_pwm_();
-    frequency_changed_ = false;
+    this->frequency_changed_ = false;
   }
 
   gpio_set_function(this->pin_->get_pin(), GPIO_FUNC_PWM);
diff --git a/esphome/components/rp2040_pwm/rp2040_pwm.h b/esphome/components/rp2040_pwm/rp2040_pwm.h
index 903079df17..9c88826ae9 100644
--- a/esphome/components/rp2040_pwm/rp2040_pwm.h
+++ b/esphome/components/rp2040_pwm/rp2040_pwm.h
@@ -10,8 +10,6 @@
 namespace esphome {
 namespace rp2040_pwm {
 
-static bool frequency_changed_ = false;
-
 class RP2040PWM : public output::FloatOutput, public Component {
  public:
   void set_pin(InternalGPIOPin *pin) { pin_ = pin; }
@@ -19,7 +17,7 @@ class RP2040PWM : public output::FloatOutput, public Component {
   /// Dynamically update frequency
   void update_frequency(float frequency) override {
     this->set_frequency(frequency);
-    frequency_changed_ = true;
+    this->frequency_changed_ = true;
     this->write_state(this->last_output_);
   }
 
@@ -38,6 +36,7 @@ class RP2040PWM : public output::FloatOutput, public Component {
   float frequency_{1000.0};
   /// Cache last output level for dynamic frequency updating
   float last_output_{0.0};
+  bool frequency_changed_{false};
 };
 
 template<typename... Ts> class SetFrequencyAction : public Action<Ts...> {

From b2e6b9d31f6df32b9a436bed043d3889b42c47be Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 22 Nov 2022 14:46:23 -0600
Subject: [PATCH 284/838] Avoid 128bit uuid loop for 16/32 bit uuids (#4068)

---
 .../esp32_ble_tracker/esp32_ble_tracker.cpp           | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 4aaa6dfa32..223034578b 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -449,10 +449,13 @@ ESPBTUUID ESPBTUUID::from_raw(const std::string &data) {
 ESPBTUUID ESPBTUUID::from_uuid(esp_bt_uuid_t uuid) {
   ESPBTUUID ret;
   ret.uuid_.len = uuid.len;
-  ret.uuid_.uuid.uuid16 = uuid.uuid.uuid16;
-  ret.uuid_.uuid.uuid32 = uuid.uuid.uuid32;
-  for (size_t i = 0; i < ESP_UUID_LEN_128; i++)
-    ret.uuid_.uuid.uuid128[i] = uuid.uuid.uuid128[i];
+  if (uuid.len == ESP_UUID_LEN_16) {
+    ret.uuid_.uuid.uuid16 = uuid.uuid.uuid16;
+  } else if (uuid.len == ESP_UUID_LEN_32) {
+    ret.uuid_.uuid.uuid32 = uuid.uuid.uuid32;
+  } else if (uuid.len == ESP_UUID_LEN_128) {
+    memcpy(ret.uuid_.uuid.uuid128, uuid.uuid.uuid128, ESP_UUID_LEN_128);
+  }
   return ret;
 }
 ESPBTUUID ESPBTUUID::as_128bit() const {

From 1c9c700d7f2081bd43ddebb3805b36d88f3be2fd Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 22 Nov 2022 14:46:59 -0600
Subject: [PATCH 285/838] Avoid creating a new espbt::ESPBTUUID each loop when
 registering for notify (#4069)

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

diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 3579d93c5a..964ff29771 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -299,7 +299,7 @@ BLEDescriptor *BLEClientBase::get_config_descriptor(uint16_t handle) {
   auto *chr = this->get_characteristic(handle);
   if (chr != nullptr) {
     for (auto &desc : chr->descriptors) {
-      if (desc->uuid == espbt::ESPBTUUID::from_uint16(0x2902))
+      if (desc->uuid.get_uuid().uuid.uuid16 == 0x2902)
         return desc;
     }
   }

From 366e29439e73b981674e7aed10202a9eae959fcd Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 23 Nov 2022 13:04:21 +1300
Subject: [PATCH 286/838] Bump version to 2022.11.2

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

diff --git a/esphome/const.py b/esphome/const.py
index 67345c8849..f88280a4ac 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.11.1"
+__version__ = "2022.11.2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From d067c8f80b8905a61744f36424ac563c122c3ad0 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 23 Nov 2022 20:39:19 +1300
Subject: [PATCH 287/838] Dont set esp32 pin drive strength unless pin is set
 for output (#4075)

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

diff --git a/esphome/components/esp32/gpio.cpp b/esphome/components/esp32/gpio.cpp
index c7146c8872..d0805e4dd2 100644
--- a/esphome/components/esp32/gpio.cpp
+++ b/esphome/components/esp32/gpio.cpp
@@ -86,7 +86,9 @@ void ESP32InternalGPIOPin::setup() {
   conf.pull_down_en = flags_ & gpio::FLAG_PULLDOWN ? GPIO_PULLDOWN_ENABLE : GPIO_PULLDOWN_DISABLE;
   conf.intr_type = GPIO_INTR_DISABLE;
   gpio_config(&conf);
-  gpio_set_drive_capability(pin_, drive_strength_);
+  if (flags_ & gpio::FLAG_OUTPUT) {
+    gpio_set_drive_capability(pin_, drive_strength_);
+  }
 }
 
 void ESP32InternalGPIOPin::pin_mode(gpio::Flags flags) {

From 81b407887114be6b72ce7d806836237ab73a8bf7 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 23 Nov 2022 22:42:20 +1300
Subject: [PATCH 288/838] Don't allow debug component if you don't have at
 least debug logging level (#4076)

---
 esphome/components/debug/__init__.py         | 26 ++++++++++++++++----
 esphome/components/debug/debug_component.cpp |  6 -----
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/esphome/components/debug/__init__.py b/esphome/components/debug/__init__.py
index ff9b9c5314..223c3c8df1 100644
--- a/esphome/components/debug/__init__.py
+++ b/esphome/components/debug/__init__.py
@@ -1,11 +1,15 @@
-import esphome.config_validation as cv
 import esphome.codegen as cg
+import esphome.config_validation as cv
+import esphome.final_validate as fv
+from esphome.components import logger
 from esphome.const import (
-    CONF_ID,
-    CONF_DEVICE,
-    CONF_FREE,
-    CONF_FRAGMENTATION,
     CONF_BLOCK,
+    CONF_DEVICE,
+    CONF_FRAGMENTATION,
+    CONF_FREE,
+    CONF_ID,
+    CONF_LEVEL,
+    CONF_LOGGER,
     CONF_LOOP_TIME,
 )
 
@@ -39,6 +43,18 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.polling_component_schema("60s"))
 
 
+def _final_validate(_):
+    logger_conf = fv.full_config.get()[CONF_LOGGER]
+    severity = logger.LOG_LEVEL_SEVERITY.index(logger_conf[CONF_LEVEL])
+    if severity < logger.LOG_LEVEL_SEVERITY.index("DEBUG"):
+        raise cv.Invalid(
+            "The debug component requires the logger to be at least at DEBUG level"
+        )
+
+
+FINAL_VALIDATE_SCHEMA = _final_validate
+
+
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
diff --git a/esphome/components/debug/debug_component.cpp b/esphome/components/debug/debug_component.cpp
index a594dc7a50..c1ede684e6 100644
--- a/esphome/components/debug/debug_component.cpp
+++ b/esphome/components/debug/debug_component.cpp
@@ -41,12 +41,6 @@ void DebugComponent::dump_config() {
   std::string reset_reason;
   device_info.reserve(256);
 
-#ifndef ESPHOME_LOG_HAS_DEBUG
-  ESP_LOGE(TAG, "Debug Component requires debug log level!");
-  this->status_set_error();
-  return;
-#endif
-
   ESP_LOGCONFIG(TAG, "Debug component:");
 #ifdef USE_TEXT_SENSOR
   LOG_TEXT_SENSOR("  ", "Device info", this->device_info_);

From b184b01600c9cb20f8d130dbac270809ac706c24 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 24 Nov 2022 11:09:19 +1300
Subject: [PATCH 289/838] Remove a bunch of unnecessary pylint disabling
 (#4079)

---
 .../components/modbus_controller/__init__.py  |  1 -
 esphome/components/stepper/__init__.py        |  1 -
 esphome/components/text_sensor/__init__.py    |  1 -
 esphome/config.py                             |  4 ++--
 esphome/config_helpers.py                     |  5 ++---
 esphome/config_validation.py                  |  4 +---
 esphome/core/__init__.py                      |  4 +---
 esphome/cpp_generator.py                      | 22 ++++++-------------
 esphome/cpp_helpers.py                        |  1 -
 esphome/dashboard/dashboard.py                | 21 ++++++------------
 esphome/platformio_api.py                     |  1 -
 esphome/storage_json.py                       |  1 -
 esphome/voluptuous_schema.py                  |  1 -
 esphome/vscode.py                             |  6 ++---
 esphome/wizard.py                             |  1 -
 esphome/yaml_util.py                          |  4 ++--
 16 files changed, 24 insertions(+), 54 deletions(-)

diff --git a/esphome/components/modbus_controller/__init__.py b/esphome/components/modbus_controller/__init__.py
index 41beb67e1c..46bb2c4233 100644
--- a/esphome/components/modbus_controller/__init__.py
+++ b/esphome/components/modbus_controller/__init__.py
@@ -24,7 +24,6 @@ AUTO_LOAD = ["modbus"]
 
 MULTI_CONF = True
 
-# pylint: disable=invalid-name
 modbus_controller_ns = cg.esphome_ns.namespace("modbus_controller")
 ModbusController = modbus_controller_ns.class_(
     "ModbusController", cg.PollingComponent, modbus.ModbusDevice
diff --git a/esphome/components/stepper/__init__.py b/esphome/components/stepper/__init__.py
index 54f6aa4205..f2367fd62a 100644
--- a/esphome/components/stepper/__init__.py
+++ b/esphome/components/stepper/__init__.py
@@ -14,7 +14,6 @@ from esphome.core import CORE, coroutine_with_priority
 
 IS_PLATFORM_COMPONENT = True
 
-# pylint: disable=invalid-name
 stepper_ns = cg.esphome_ns.namespace("stepper")
 Stepper = stepper_ns.class_("Stepper")
 
diff --git a/esphome/components/text_sensor/__init__.py b/esphome/components/text_sensor/__init__.py
index dd3dbddc43..3ed6b72d8f 100644
--- a/esphome/components/text_sensor/__init__.py
+++ b/esphome/components/text_sensor/__init__.py
@@ -23,7 +23,6 @@ from esphome.util import Registry
 
 IS_PLATFORM_COMPONENT = True
 
-# pylint: disable=invalid-name
 text_sensor_ns = cg.esphome_ns.namespace("text_sensor")
 TextSensor = text_sensor_ns.class_("TextSensor", cg.EntityBase)
 TextSensorPtr = TextSensor.operator("ptr")
diff --git a/esphome/config.py b/esphome/config.py
index 0bf4ec8df3..e63cddf347 100644
--- a/esphome/config.py
+++ b/esphome/config.py
@@ -4,7 +4,8 @@ import heapq
 import logging
 import re
 
-# pylint: disable=unused-import, wrong-import-order
+from typing import Optional, Union
+
 from contextlib import contextmanager
 
 import voluptuous as vol
@@ -23,7 +24,6 @@ from esphome.core import CORE, EsphomeError
 from esphome.helpers import indent
 from esphome.util import safe_print, OrderedDict
 
-from typing import Optional, Union
 from esphome.loader import get_component, get_platform, ComponentManifest
 from esphome.yaml_util import is_secret, ESPHomeDataBase, ESPForceValue
 from esphome.voluptuous_schema import ExtraKeysInvalid
diff --git a/esphome/config_helpers.py b/esphome/config_helpers.py
index bfb0f65417..d36a2f1e7f 100644
--- a/esphome/config_helpers.py
+++ b/esphome/config_helpers.py
@@ -26,7 +26,6 @@ def read_config_file(path: str) -> str:
 
 def merge_config(full_old, full_new):
     def merge(old, new):
-        # pylint: disable=no-else-return
         if isinstance(new, dict):
             if not isinstance(old, dict):
                 return new
@@ -34,11 +33,11 @@ def merge_config(full_old, full_new):
             for k, v in new.items():
                 res[k] = merge(old[k], v) if k in old else v
             return res
-        elif isinstance(new, list):
+        if isinstance(new, list):
             if not isinstance(old, list):
                 return new
             return old + new
-        elif new is None:
+        if new is None:
             return old
 
         return new
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 90018b4d56..910d624552 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -1053,9 +1053,8 @@ def mqtt_qos(value):
 
 def requires_component(comp):
     """Validate that this option can only be specified when the component `comp` is loaded."""
-    # pylint: disable=unsupported-membership-test
+
     def validator(value):
-        # pylint: disable=unsupported-membership-test
         if comp not in CORE.loaded_integrations:
             raise Invalid(f"This option requires component {comp}")
         return value
@@ -1482,7 +1481,6 @@ class OnlyWith(Optional):
 
     @property
     def default(self):
-        # pylint: disable=unsupported-membership-test
         if self._component in CORE.loaded_integrations:
             return self._default
         return vol.UNDEFINED
diff --git a/esphome/core/__init__.py b/esphome/core/__init__.py
index ef44b31fa3..09115c2791 100644
--- a/esphome/core/__init__.py
+++ b/esphome/core/__init__.py
@@ -443,7 +443,7 @@ class Library:
         return NotImplemented
 
 
-# pylint: disable=too-many-instance-attributes,too-many-public-methods
+# pylint: disable=too-many-public-methods
 class EsphomeCore:
     def __init__(self):
         # True if command is run from dashboard
@@ -553,7 +553,6 @@ class EsphomeCore:
         return os.path.basename(self.config_path)
 
     def relative_config_path(self, *path):
-        # pylint: disable=no-value-for-parameter
         path_ = os.path.expanduser(os.path.join(*path))
         return os.path.join(self.config_dir, path_)
 
@@ -561,7 +560,6 @@ class EsphomeCore:
         return self.relative_config_path(".esphome", *path)
 
     def relative_build_path(self, *path):
-        # pylint: disable=no-value-for-parameter
         path_ = os.path.expanduser(os.path.join(*path))
         return os.path.join(self.build_path, path_)
 
diff --git a/esphome/cpp_generator.py b/esphome/cpp_generator.py
index a0f60e1ff8..a423554d10 100644
--- a/esphome/cpp_generator.py
+++ b/esphome/cpp_generator.py
@@ -2,34 +2,26 @@ import abc
 import inspect
 import math
 import re
-from esphome.yaml_util import ESPHomeDataBase
-
-# pylint: disable=unused-import, wrong-import-order
-from typing import (
-    Any,
-    Callable,
-    Optional,
-    Union,
-)
 from collections.abc import Generator, Sequence
+from typing import Any, Callable, Optional, Union
 
-from esphome.core import (  # noqa
+from esphome.core import (
     CORE,
-    HexInt,
     ID,
+    Define,
+    EnumValue,
+    HexInt,
     Lambda,
+    Library,
     TimePeriod,
     TimePeriodMicroseconds,
     TimePeriodMilliseconds,
     TimePeriodMinutes,
     TimePeriodSeconds,
-    coroutine,
-    Library,
-    Define,
-    EnumValue,
 )
 from esphome.helpers import cpp_string_escape, indent_all_but_first_and_last
 from esphome.util import OrderedDict
+from esphome.yaml_util import ESPHomeDataBase
 
 
 class Expression(abc.ABC):
diff --git a/esphome/cpp_helpers.py b/esphome/cpp_helpers.py
index 0ab4b75a16..02d339441f 100644
--- a/esphome/cpp_helpers.py
+++ b/esphome/cpp_helpers.py
@@ -11,7 +11,6 @@ from esphome.const import (
     CONF_TYPE_ID,
 )
 
-# pylint: disable=unused-import
 from esphome.core import coroutine, ID, CORE
 from esphome.types import ConfigType, ConfigFragmentType
 from esphome.cpp_generator import add, get_variable
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index b7c24f9e2e..d38eb0027e 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -1,5 +1,3 @@
-# pylint: disable=wrong-import-position
-
 import base64
 import codecs
 import collections
@@ -10,11 +8,12 @@ import json
 import logging
 import multiprocessing
 import os
-from pathlib import Path
 import secrets
 import shutil
 import subprocess
 import threading
+from pathlib import Path
+from typing import Optional
 
 import tornado
 import tornado.concurrent
@@ -22,15 +21,15 @@ import tornado.gen
 import tornado.httpserver
 import tornado.ioloop
 import tornado.iostream
-from tornado.log import access_log
 import tornado.netutil
 import tornado.process
 import tornado.web
 import tornado.websocket
+from tornado.log import access_log
 
 from esphome import const, platformio_api, util, yaml_util
 from esphome.core import EsphomeError
-from esphome.helpers import mkdir_p, get_bool_env, run_system_command
+from esphome.helpers import get_bool_env, mkdir_p, run_system_command
 from esphome.storage_json import (
     EsphomeStorageJSON,
     StorageJSON,
@@ -38,14 +37,11 @@ from esphome.storage_json import (
     ext_storage_path,
     trash_storage_path,
 )
-from esphome.util import shlex_quote, get_serial_ports
-from .util import password_hash
-
-# pylint: disable=unused-import, wrong-import-order
-from typing import Optional  # noqa
-
+from esphome.util import get_serial_ports, shlex_quote
 from esphome.zeroconf import DashboardImportDiscovery, DashboardStatus, EsphomeZeroconf
 
+from .util import password_hash
+
 _LOGGER = logging.getLogger(__name__)
 
 ENV_DEV = "ESPHOME_DASHBOARD_DEV"
@@ -190,7 +186,6 @@ def websocket_method(name):
     return wrap
 
 
-# pylint: disable=abstract-method, arguments-differ
 @websocket_class
 class EsphomeCommandWebSocket(tornado.websocket.WebSocketHandler):
     def __init__(self, application, request, **kwargs):
@@ -797,7 +792,6 @@ class EditRequestHandler(BaseHandler):
         filename = settings.rel_path(configuration)
         content = ""
         if os.path.isfile(filename):
-            # pylint: disable=no-value-for-parameter
             with open(file=filename, encoding="utf-8") as f:
                 content = f.read()
         self.write(content)
@@ -805,7 +799,6 @@ class EditRequestHandler(BaseHandler):
     @authenticated
     @bind_config
     def post(self, configuration=None):
-        # pylint: disable=no-value-for-parameter
         with open(file=settings.rel_path(configuration), mode="wb") as f:
             f.write(self.request.body)
         self.set_status(200)
diff --git a/esphome/platformio_api.py b/esphome/platformio_api.py
index 70576bec11..ef62e62ce7 100644
--- a/esphome/platformio_api.py
+++ b/esphome/platformio_api.py
@@ -37,7 +37,6 @@ def patch_structhash():
         if not isdir(build_dir):
             makedirs(build_dir)
 
-    # pylint: disable=protected-access
     helpers.clean_build_dir = patched_clean_build_dir
     cli.clean_build_dir = patched_clean_build_dir
 
diff --git a/esphome/storage_json.py b/esphome/storage_json.py
index 1cc2180747..c2c8b91a36 100644
--- a/esphome/storage_json.py
+++ b/esphome/storage_json.py
@@ -31,7 +31,6 @@ def trash_storage_path(base_path: str) -> str:
     return os.path.join(base_path, ".esphome", "trash")
 
 
-# pylint: disable=too-many-instance-attributes
 class StorageJSON:
     def __init__(
         self,
diff --git a/esphome/voluptuous_schema.py b/esphome/voluptuous_schema.py
index f4ed2fe03b..281ef10964 100644
--- a/esphome/voluptuous_schema.py
+++ b/esphome/voluptuous_schema.py
@@ -204,7 +204,6 @@ class _Schema(vol.Schema):
         return self
 
     @schema_extractor_extended
-    # pylint: disable=signature-differs
     def extend(self, *schemas, **kwargs):
         extra = kwargs.pop("extra", None)
         if kwargs:
diff --git a/esphome/vscode.py b/esphome/vscode.py
index 32a6b524f6..cb2f51976f 100644
--- a/esphome/vscode.py
+++ b/esphome/vscode.py
@@ -1,14 +1,12 @@
 import json
 import os
 
-# pylint: disable=unused-import
+from typing import Optional
+
 from esphome.config import load_config, _format_vol_invalid, Config
 from esphome.core import CORE, DocumentRange
 import esphome.config_validation as cv
 
-# pylint: disable=unused-import, wrong-import-order
-from typing import Optional
-
 
 def _get_invalid_range(res: Config, invalid: cv.Invalid) -> Optional[DocumentRange]:
     return res.get_deepest_document_range_for_path(
diff --git a/esphome/wizard.py b/esphome/wizard.py
index 6273eec25d..0fcccfc3f6 100644
--- a/esphome/wizard.py
+++ b/esphome/wizard.py
@@ -9,7 +9,6 @@ import esphome.config_validation as cv
 from esphome.helpers import get_bool_env, write_file
 from esphome.log import color, Fore
 
-# pylint: disable=anomalous-backslash-in-string
 from esphome.storage_json import StorageJSON, ext_storage_path
 from esphome.util import safe_print
 from esphome.const import ALLOWED_NAME_CHARS, ENV_QUICKWIZARD
diff --git a/esphome/yaml_util.py b/esphome/yaml_util.py
index 75aec0edc8..2689ce9245 100644
--- a/esphome/yaml_util.py
+++ b/esphome/yaml_util.py
@@ -88,7 +88,7 @@ def _add_data_ref(fn):
     return wrapped
 
 
-class ESPHomeLoader(yaml.SafeLoader):  # pylint: disable=too-many-ancestors
+class ESPHomeLoader(yaml.SafeLoader):
     """Loader class that keeps track of line numbers."""
 
     @_add_data_ref
@@ -419,7 +419,7 @@ def is_secret(value):
         return None
 
 
-class ESPHomeDumper(yaml.SafeDumper):  # pylint: disable=too-many-ancestors
+class ESPHomeDumper(yaml.SafeDumper):
     def represent_mapping(self, tag, mapping, flow_style=None):
         value = []
         node = yaml.MappingNode(tag, value, flow_style=flow_style)

From ce5cedb466c30fde28082a2b45fa560de12ee3ab Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 24 Nov 2022 11:16:05 +1300
Subject: [PATCH 290/838] Update ESP32-audioI2S library (#4073)

---
 esphome/components/i2s_audio/media_player.py | 2 +-
 platformio.ini                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/i2s_audio/media_player.py b/esphome/components/i2s_audio/media_player.py
index e2bdbe2d88..e80780b28f 100644
--- a/esphome/components/i2s_audio/media_player.py
+++ b/esphome/components/i2s_audio/media_player.py
@@ -90,5 +90,5 @@ async def to_code(config):
     if CORE.is_esp32:
         cg.add_library("WiFiClientSecure", None)
         cg.add_library("HTTPClient", None)
-        cg.add_library("esphome/ESP32-audioI2S", "2.1.0")
+        cg.add_library("esphome/ESP32-audioI2S", "2.0.6")
         cg.add_build_flag("-DAUDIO_NO_SD_FS")
diff --git a/platformio.ini b/platformio.ini
index 918cd40888..b92a1407ed 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -121,7 +121,7 @@ lib_deps =
     HTTPClient                           ; http_request,nextion (Arduino built-in)
     ESPmDNS                              ; mdns (Arduino built-in)
     DNSServer                            ; captive_portal (Arduino built-in)
-    esphome/ESP32-audioI2S@2.1.0         ; i2s_audio
+    esphome/ESP32-audioI2S@2.0.6         ; i2s_audio
     crankyoldgit/IRremoteESP8266@2.7.12  ; heatpumpir
 build_flags =
     ${common:arduino.build_flags}

From 9273e3775b09d1c7f2bdf55bfa4da2dfd99cdbd6 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 24 Nov 2022 13:12:55 +1300
Subject: [PATCH 291/838] Add vector includes (#4080)

---
 .../addressable_light/addressable_light_display.h      |  2 ++
 esphome/components/ade7953/ade7953.h                   |  2 ++
 esphome/components/ads1115/ads1115.h                   |  2 ++
 esphome/components/api/api_connection.h                |  2 ++
 esphome/components/api/api_server.h                    |  2 ++
 esphome/components/api/homeassistant_service.h         |  2 ++
 esphome/components/api/proto.h                         |  2 ++
 esphome/components/api/user_services.h                 |  1 +
 .../components/atc_mithermometer/atc_mithermometer.h   |  2 ++
 esphome/components/bedjet/bedjet_hub.h                 |  2 ++
 esphome/components/binary_sensor/automation.h          |  1 +
 esphome/components/binary_sensor/binary_sensor.h       |  2 ++
 esphome/components/binary_sensor/filter.h              |  2 ++
 .../components/binary_sensor_map/binary_sensor_map.h   |  2 ++
 esphome/components/ble_client/automation.h             |  1 +
 esphome/components/ble_client/ble_client.h             |  9 +++++----
 esphome/components/ble_client/sensor/ble_sensor.h      |  2 ++
 esphome/components/bluetooth_proxy/bluetooth_proxy.h   |  1 +
 esphome/components/canbus/canbus.h                     |  2 ++
 esphome/components/cap1188/cap1188.h                   |  2 ++
 .../custom/binary_sensor/custom_binary_sensor.h        |  2 ++
 esphome/components/custom/climate/custom_climate.h     |  2 ++
 esphome/components/custom/cover/custom_cover.h         |  2 ++
 esphome/components/custom/light/custom_light_output.h  |  2 ++
 esphome/components/custom/output/custom_output.h       |  2 ++
 esphome/components/custom/sensor/custom_sensor.h       |  2 ++
 esphome/components/custom/switch/custom_switch.h       |  2 ++
 .../components/custom/text_sensor/custom_text_sensor.h |  2 ++
 esphome/components/custom_component/custom_component.h |  2 ++
 esphome/components/dallas/dallas_component.h           |  2 ++
 esphome/components/daly_bms/daly_bms.h                 |  2 ++
 esphome/components/display/display_buffer.h            |  2 ++
 esphome/components/dsmr/dsmr.h                         |  2 ++
 esphome/components/ektf2232/ektf2232.cpp               |  2 ++
 .../components/esp32_ble_client/ble_characteristic.h   |  2 ++
 esphome/components/esp32_ble_client/ble_client_base.h  |  1 +
 esphome/components/esp32_ble_client/ble_service.h      |  2 ++
 esphome/components/esp32_ble_server/ble_server.h       |  1 +
 esphome/components/esp32_ble_server/ble_service.h      |  2 ++
 .../components/esp32_ble_tracker/esp32_ble_tracker.h   |  6 ++++--
 esphome/components/esp32_ble_tracker/queue.h           |  5 +++--
 .../components/esp32_improv/esp32_improv_component.h   |  2 ++
 esphome/components/esp32_touch/esp32_touch.h           |  2 ++
 esphome/components/esp8266/preferences.cpp             | 10 ++++++----
 esphome/components/fingerprint_grow/fingerprint_grow.h |  2 ++
 esphome/components/gpio/switch/gpio_switch.h           |  2 ++
 esphome/components/gps/gps.h                           |  2 ++
 esphome/components/graph/graph.h                       |  5 +++--
 esphome/components/growatt_solar/growatt_solar.h       |  2 ++
 esphome/components/havells_solar/havells_solar.h       |  2 ++
 esphome/components/http_request/http_request.h         |  4 +++-
 .../components/improv_serial/improv_serial_component.h |  1 +
 esphome/components/lcd_base/lcd_display.h              |  1 +
 esphome/components/light/addressable_light_effect.h    |  1 +
 esphome/components/light/base_light_effects.h          |  1 +
 esphome/components/light/light_state.h                 |  2 ++
 esphome/components/logger/logger.h                     |  5 +++--
 esphome/components/ltr390/ltr390.h                     |  7 ++++---
 esphome/components/max7219digit/max7219digit.h         |  2 ++
 esphome/components/modbus/modbus.h                     |  2 ++
 .../binary_sensor/modbus_binarysensor.h                |  2 ++
 .../modbus_controller/number/modbus_number.h           |  2 ++
 .../modbus_controller/output/modbus_output.cpp         |  3 +--
 .../modbus_controller/output/modbus_output.h           |  2 ++
 .../modbus_controller/select/modbus_select.h           |  1 +
 .../modbus_controller/sensor/modbus_sensor.h           |  2 ++
 .../modbus_controller/switch/modbus_switch.h           |  2 ++
 .../modbus_controller/text_sensor/modbus_textsensor.h  |  2 ++
 esphome/components/mopeka_ble/mopeka_ble.h             |  2 ++
 esphome/components/mopeka_pro_check/mopeka_pro_check.h |  2 ++
 esphome/components/mpr121/mpr121.h                     |  2 ++
 esphome/components/mqtt/mqtt_client.h                  |  2 ++
 esphome/components/nextion/nextion.h                   |  2 ++
 esphome/components/nextion/nextion_component_base.h    |  1 +
 esphome/components/nfc/ndef_message.h                  |  1 +
 esphome/components/nfc/ndef_record.h                   |  2 ++
 esphome/components/nfc/ndef_record_text.h              |  2 ++
 esphome/components/nfc/ndef_record_uri.h               |  2 ++
 esphome/components/nfc/nfc.h                           |  2 ++
 esphome/components/nfc/nfc_tag.h                       |  1 +
 esphome/components/partition/light_partition.h         |  1 +
 esphome/components/pid/pid_autotuner.h                 |  2 ++
 esphome/components/pid/pid_simulator.h                 |  2 ++
 esphome/components/pipsolar/output/pipsolar_output.h   |  2 ++
 esphome/components/pn532/pn532.h                       |  2 ++
 esphome/components/pn532_i2c/pn532_i2c.h               |  2 ++
 esphome/components/pn532_spi/pn532_spi.h               |  2 ++
 .../components/pvvx_mithermometer/pvvx_mithermometer.h |  2 ++
 esphome/components/pzemac/pzemac.h                     |  2 ++
 esphome/components/pzemdc/pzemdc.h                     |  2 ++
 esphome/components/rc522/rc522.h                       |  2 ++
 esphome/components/rdm6300/rdm6300.h                   |  2 ++
 esphome/components/remote_base/aeha_protocol.h         |  2 ++
 esphome/components/remote_base/midea_protocol.h        |  1 +
 esphome/components/remote_base/pronto_protocol.h       |  2 ++
 esphome/components/remote_base/raw_protocol.h          |  2 ++
 esphome/components/remote_base/remote_base.h           |  1 +
 .../components/remote_transmitter/remote_transmitter.h |  2 ++
 esphome/components/rf_bridge/rf_bridge.h               |  1 +
 esphome/components/rp2040/preferences.cpp              |  2 ++
 esphome/components/sdm_meter/sdm_meter.h               |  2 ++
 esphome/components/selec_meter/selec_meter.h           |  2 ++
 esphome/components/sensirion_common/i2c_sensirion.h    |  2 ++
 esphome/components/sensor/filter.h                     |  5 +++--
 esphome/components/sensor/sensor.h                     |  2 ++
 esphome/components/sprinkler/sprinkler.h               |  2 ++
 esphome/components/sx1509/sx1509.h                     |  2 ++
 esphome/components/teleinfo/teleinfo.h                 |  2 ++
 esphome/components/text_sensor/filter.h                |  1 +
 esphome/components/text_sensor/text_sensor.h           |  2 ++
 esphome/components/thermostat/thermostat_climate.h     |  2 ++
 esphome/components/time/automation.h                   |  2 ++
 esphome/components/tm1637/tm1637.h                     |  2 ++
 esphome/components/tm1638/tm1638.h                     |  2 ++
 esphome/components/toshiba/toshiba.cpp                 |  2 ++
 esphome/components/ttp229_bsf/ttp229_bsf.h             |  2 ++
 esphome/components/ttp229_lsf/ttp229_lsf.h             |  2 ++
 esphome/components/tuya/automation.h                   |  2 ++
 esphome/components/tuya/select/tuya_select.h           |  2 ++
 esphome/components/tuya/tuya.h                         |  2 ++
 esphome/components/tx20/tx20.cpp                       |  2 ++
 esphome/components/uart/automation.h                   |  2 ++
 esphome/components/uart/switch/uart_switch.h           |  2 ++
 esphome/components/web_server_base/web_server_base.h   |  2 ++
 esphome/components/wifi/wifi_component.h               |  2 ++
 esphome/components/xiaomi_ble/xiaomi_ble.h             |  2 ++
 esphome/components/xiaomi_miscale/xiaomi_miscale.h     |  2 ++
 esphome/core/base_automation.h                         |  2 ++
 128 files changed, 252 insertions(+), 24 deletions(-)

diff --git a/esphome/components/addressable_light/addressable_light_display.h b/esphome/components/addressable_light/addressable_light_display.h
index dfafe9d98d..8893c39be6 100644
--- a/esphome/components/addressable_light/addressable_light_display.h
+++ b/esphome/components/addressable_light/addressable_light_display.h
@@ -5,6 +5,8 @@
 #include "esphome/components/display/display_buffer.h"
 #include "esphome/components/light/addressable_light.h"
 
+#include <vector>
+
 namespace esphome {
 namespace addressable_light {
 
diff --git a/esphome/components/ade7953/ade7953.h b/esphome/components/ade7953/ade7953.h
index 418ad1c9e7..c0c1cc4db8 100644
--- a/esphome/components/ade7953/ade7953.h
+++ b/esphome/components/ade7953/ade7953.h
@@ -5,6 +5,8 @@
 #include "esphome/components/i2c/i2c.h"
 #include "esphome/components/sensor/sensor.h"
 
+#include <vector>
+
 namespace esphome {
 namespace ade7953 {
 
diff --git a/esphome/components/ads1115/ads1115.h b/esphome/components/ads1115/ads1115.h
index 059436d142..17d5a910d8 100644
--- a/esphome/components/ads1115/ads1115.h
+++ b/esphome/components/ads1115/ads1115.h
@@ -5,6 +5,8 @@
 #include "esphome/components/i2c/i2c.h"
 #include "esphome/components/voltage_sampler/voltage_sampler.h"
 
+#include <vector>
+
 namespace esphome {
 namespace ads1115 {
 
diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h
index 028fb80175..b2076635b0 100644
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -7,6 +7,8 @@
 #include "esphome/core/application.h"
 #include "esphome/core/component.h"
 
+#include <vector>
+
 namespace esphome {
 namespace api {
 
diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index 1aefa31400..8e69a77475 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -12,6 +12,8 @@
 #include "user_services.h"
 #include "api_noise_context.h"
 
+#include <vector>
+
 namespace esphome {
 namespace api {
 
diff --git a/esphome/components/api/homeassistant_service.h b/esphome/components/api/homeassistant_service.h
index 90cfe751b6..f04181e5b2 100644
--- a/esphome/components/api/homeassistant_service.h
+++ b/esphome/components/api/homeassistant_service.h
@@ -5,6 +5,8 @@
 #include "api_pb2.h"
 #include "api_server.h"
 
+#include <vector>
+
 namespace esphome {
 namespace api {
 
diff --git a/esphome/components/api/proto.h b/esphome/components/api/proto.h
index 11cd4330ce..fea219ecb9 100644
--- a/esphome/components/api/proto.h
+++ b/esphome/components/api/proto.h
@@ -4,6 +4,8 @@
 #include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
 
+#include <vector>
+
 #ifdef ESPHOME_LOG_HAS_VERY_VERBOSE
 #define HAS_PROTO_MESSAGE_DUMP
 #endif
diff --git a/esphome/components/api/user_services.h b/esphome/components/api/user_services.h
index df6f6924aa..673bcf5693 100644
--- a/esphome/components/api/user_services.h
+++ b/esphome/components/api/user_services.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <utility>
+#include <vector>
 
 #include "esphome/core/component.h"
 #include "esphome/core/automation.h"
diff --git a/esphome/components/atc_mithermometer/atc_mithermometer.h b/esphome/components/atc_mithermometer/atc_mithermometer.h
index 9398c02bcf..31fb77ac7f 100644
--- a/esphome/components/atc_mithermometer/atc_mithermometer.h
+++ b/esphome/components/atc_mithermometer/atc_mithermometer.h
@@ -4,6 +4,8 @@
 #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/bedjet/bedjet_hub.h b/esphome/components/bedjet/bedjet_hub.h
index f1479710a7..fb757dfdf8 100644
--- a/esphome/components/bedjet/bedjet_hub.h
+++ b/esphome/components/bedjet/bedjet_hub.h
@@ -8,6 +8,8 @@
 #include "bedjet_child.h"
 #include "bedjet_codec.h"
 
+#include <vector>
+
 #ifdef USE_TIME
 #include "esphome/components/time/real_time_clock.h"
 #endif
diff --git a/esphome/components/binary_sensor/automation.h b/esphome/components/binary_sensor/automation.h
index 31bf1a5565..de527d1070 100644
--- a/esphome/components/binary_sensor/automation.h
+++ b/esphome/components/binary_sensor/automation.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <utility>
+#include <vector>
 
 #include "esphome/core/component.h"
 #include "esphome/core/automation.h"
diff --git a/esphome/components/binary_sensor/binary_sensor.h b/esphome/components/binary_sensor/binary_sensor.h
index b0c39a2c9b..730ded3f94 100644
--- a/esphome/components/binary_sensor/binary_sensor.h
+++ b/esphome/components/binary_sensor/binary_sensor.h
@@ -5,6 +5,8 @@
 #include "esphome/core/helpers.h"
 #include "esphome/components/binary_sensor/filter.h"
 
+#include <vector>
+
 namespace esphome {
 
 namespace binary_sensor {
diff --git a/esphome/components/binary_sensor/filter.h b/esphome/components/binary_sensor/filter.h
index 59068634af..64a33f6e34 100644
--- a/esphome/components/binary_sensor/filter.h
+++ b/esphome/components/binary_sensor/filter.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
 
+#include <vector>
+
 namespace esphome {
 
 namespace binary_sensor {
diff --git a/esphome/components/binary_sensor_map/binary_sensor_map.h b/esphome/components/binary_sensor_map/binary_sensor_map.h
index a880be9623..a1d6f95009 100644
--- a/esphome/components/binary_sensor_map/binary_sensor_map.h
+++ b/esphome/components/binary_sensor_map/binary_sensor_map.h
@@ -4,6 +4,8 @@
 #include "esphome/components/binary_sensor/binary_sensor.h"
 #include "esphome/components/sensor/sensor.h"
 
+#include <vector>
+
 namespace esphome {
 namespace binary_sensor_map {
 
diff --git a/esphome/components/ble_client/automation.h b/esphome/components/ble_client/automation.h
index 98c19dedf8..ef38333698 100644
--- a/esphome/components/ble_client/automation.h
+++ b/esphome/components/ble_client/automation.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <utility>
+#include <vector>
 
 #include "esphome/core/automation.h"
 #include "esphome/components/ble_client/ble_client.h"
diff --git a/esphome/components/ble_client/ble_client.h b/esphome/components/ble_client/ble_client.h
index 54f5f298fc..ceca94c86a 100644
--- a/esphome/components/ble_client/ble_client.h
+++ b/esphome/components/ble_client/ble_client.h
@@ -7,12 +7,13 @@
 
 #ifdef USE_ESP32
 
-#include <string>
-#include <array>
-#include <esp_gap_ble_api.h>
-#include <esp_gattc_api.h>
 #include <esp_bt_defs.h>
+#include <esp_gap_ble_api.h>
 #include <esp_gatt_common_api.h>
+#include <esp_gattc_api.h>
+#include <array>
+#include <string>
+#include <vector>
 
 namespace esphome {
 namespace ble_client {
diff --git a/esphome/components/ble_client/sensor/ble_sensor.h b/esphome/components/ble_client/sensor/ble_sensor.h
index d3d037572a..b11a010ee4 100644
--- a/esphome/components/ble_client/sensor/ble_sensor.h
+++ b/esphome/components/ble_client/sensor/ble_sensor.h
@@ -5,6 +5,8 @@
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 #include "esphome/components/sensor/sensor.h"
 
+#include <vector>
+
 #ifdef USE_ESP32
 #include <esp_gattc_api.h>
 
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.h b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
index 129b042277..b33e084b70 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -3,6 +3,7 @@
 #ifdef USE_ESP32
 
 #include <map>
+#include <vector>
 
 #include "esphome/components/api/api_pb2.h"
 #include "esphome/components/esp32_ble_client/ble_client_base.h"
diff --git a/esphome/components/canbus/canbus.h b/esphome/components/canbus/canbus.h
index 06b15c0db5..4a12742627 100644
--- a/esphome/components/canbus/canbus.h
+++ b/esphome/components/canbus/canbus.h
@@ -4,6 +4,8 @@
 #include "esphome/core/component.h"
 #include "esphome/core/optional.h"
 
+#include <vector>
+
 namespace esphome {
 namespace canbus {
 
diff --git a/esphome/components/cap1188/cap1188.h b/esphome/components/cap1188/cap1188.h
index a1433deb0f..fa0ed622fa 100644
--- a/esphome/components/cap1188/cap1188.h
+++ b/esphome/components/cap1188/cap1188.h
@@ -6,6 +6,8 @@
 #include "esphome/components/output/binary_output.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"
 
+#include <vector>
+
 namespace esphome {
 namespace cap1188 {
 
diff --git a/esphome/components/custom/binary_sensor/custom_binary_sensor.h b/esphome/components/custom/binary_sensor/custom_binary_sensor.h
index 314b9b0832..b7d5458d9e 100644
--- a/esphome/components/custom/binary_sensor/custom_binary_sensor.h
+++ b/esphome/components/custom/binary_sensor/custom_binary_sensor.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"
 
+#include <vector>
+
 namespace esphome {
 namespace custom {
 
diff --git a/esphome/components/custom/climate/custom_climate.h b/esphome/components/custom/climate/custom_climate.h
index 250d83f69f..37876f7115 100644
--- a/esphome/components/custom/climate/custom_climate.h
+++ b/esphome/components/custom/climate/custom_climate.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "esphome/components/climate/climate.h"
 
+#include <vector>
+
 namespace esphome {
 namespace custom {
 
diff --git a/esphome/components/custom/cover/custom_cover.h b/esphome/components/custom/cover/custom_cover.h
index 71f271bc86..58330b9d54 100644
--- a/esphome/components/custom/cover/custom_cover.h
+++ b/esphome/components/custom/cover/custom_cover.h
@@ -2,6 +2,8 @@
 
 #include "esphome/components/cover/cover.h"
 
+#include <vector>
+
 namespace esphome {
 namespace custom {
 
diff --git a/esphome/components/custom/light/custom_light_output.h b/esphome/components/custom/light/custom_light_output.h
index 744e99b889..c2c83ebe97 100644
--- a/esphome/components/custom/light/custom_light_output.h
+++ b/esphome/components/custom/light/custom_light_output.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "esphome/components/light/light_output.h"
 
+#include <vector>
+
 namespace esphome {
 namespace custom {
 
diff --git a/esphome/components/custom/output/custom_output.h b/esphome/components/custom/output/custom_output.h
index 1b55d51e29..4624642420 100644
--- a/esphome/components/custom/output/custom_output.h
+++ b/esphome/components/custom/output/custom_output.h
@@ -4,6 +4,8 @@
 #include "esphome/components/output/binary_output.h"
 #include "esphome/components/output/float_output.h"
 
+#include <vector>
+
 namespace esphome {
 namespace custom {
 
diff --git a/esphome/components/custom/sensor/custom_sensor.h b/esphome/components/custom/sensor/custom_sensor.h
index 5ef3658e5d..d8f4fbc109 100644
--- a/esphome/components/custom/sensor/custom_sensor.h
+++ b/esphome/components/custom/sensor/custom_sensor.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
 
+#include <vector>
+
 namespace esphome {
 namespace custom {
 
diff --git a/esphome/components/custom/switch/custom_switch.h b/esphome/components/custom/switch/custom_switch.h
index 186e7473fe..9657e4b44d 100644
--- a/esphome/components/custom/switch/custom_switch.h
+++ b/esphome/components/custom/switch/custom_switch.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "esphome/components/switch/switch.h"
 
+#include <vector>
+
 namespace esphome {
 namespace custom {
 
diff --git a/esphome/components/custom/text_sensor/custom_text_sensor.h b/esphome/components/custom/text_sensor/custom_text_sensor.h
index f1e9c7665e..13732c00b6 100644
--- a/esphome/components/custom/text_sensor/custom_text_sensor.h
+++ b/esphome/components/custom/text_sensor/custom_text_sensor.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "esphome/components/text_sensor/text_sensor.h"
 
+#include <vector>
+
 namespace esphome {
 namespace custom {
 
diff --git a/esphome/components/custom_component/custom_component.h b/esphome/components/custom_component/custom_component.h
index 3f5760e4cf..3b34019a7a 100644
--- a/esphome/components/custom_component/custom_component.h
+++ b/esphome/components/custom_component/custom_component.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "esphome/core/application.h"
 
+#include <vector>
+
 namespace esphome {
 namespace custom_component {
 
diff --git a/esphome/components/dallas/dallas_component.h b/esphome/components/dallas/dallas_component.h
index 37c098283a..b21bc02e54 100644
--- a/esphome/components/dallas/dallas_component.h
+++ b/esphome/components/dallas/dallas_component.h
@@ -4,6 +4,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esp_one_wire.h"
 
+#include <vector>
+
 namespace esphome {
 namespace dallas {
 
diff --git a/esphome/components/daly_bms/daly_bms.h b/esphome/components/daly_bms/daly_bms.h
index 44915368ee..d4fe84fe46 100644
--- a/esphome/components/daly_bms/daly_bms.h
+++ b/esphome/components/daly_bms/daly_bms.h
@@ -6,6 +6,8 @@
 #include "esphome/components/binary_sensor/binary_sensor.h"
 #include "esphome/components/uart/uart.h"
 
+#include <vector>
+
 namespace esphome {
 namespace daly_bms {
 
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index d2d3f2ed77..41052b3ffd 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -4,7 +4,9 @@
 #include "esphome/core/defines.h"
 #include "esphome/core/automation.h"
 #include "display_color_utils.h"
+
 #include <cstdarg>
+#include <vector>
 
 #ifdef USE_TIME
 #include "esphome/components/time/real_time_clock.h"
diff --git a/esphome/components/dsmr/dsmr.h b/esphome/components/dsmr/dsmr.h
index 76f79ee55c..6621d02cae 100644
--- a/esphome/components/dsmr/dsmr.h
+++ b/esphome/components/dsmr/dsmr.h
@@ -13,6 +13,8 @@
 #include <dsmr/parser.h>
 #include <dsmr/fields.h>
 
+#include <vector>
+
 namespace esphome {
 namespace dsmr {
 
diff --git a/esphome/components/ektf2232/ektf2232.cpp b/esphome/components/ektf2232/ektf2232.cpp
index 8df25fce24..80f5f8a8e2 100644
--- a/esphome/components/ektf2232/ektf2232.cpp
+++ b/esphome/components/ektf2232/ektf2232.cpp
@@ -2,6 +2,8 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
+#include <vector>
+
 namespace esphome {
 namespace ektf2232 {
 
diff --git a/esphome/components/esp32_ble_client/ble_characteristic.h b/esphome/components/esp32_ble_client/ble_characteristic.h
index d290b282fc..d56516f1fd 100644
--- a/esphome/components/esp32_ble_client/ble_characteristic.h
+++ b/esphome/components/esp32_ble_client/ble_characteristic.h
@@ -6,6 +6,8 @@
 
 #include "ble_descriptor.h"
 
+#include <vector>
+
 namespace esphome {
 namespace esp32_ble_client {
 
diff --git a/esphome/components/esp32_ble_client/ble_client_base.h b/esphome/components/esp32_ble_client/ble_client_base.h
index 90cd8dbddc..38fd6a5ba4 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.h
+++ b/esphome/components/esp32_ble_client/ble_client_base.h
@@ -9,6 +9,7 @@
 
 #include <array>
 #include <string>
+#include <vector>
 
 #include <esp_bt_defs.h>
 #include <esp_gap_ble_api.h>
diff --git a/esphome/components/esp32_ble_client/ble_service.h b/esphome/components/esp32_ble_client/ble_service.h
index 04f2212e0e..7b072f5fae 100644
--- a/esphome/components/esp32_ble_client/ble_service.h
+++ b/esphome/components/esp32_ble_client/ble_service.h
@@ -6,6 +6,8 @@
 
 #include "ble_characteristic.h"
 
+#include <vector>
+
 namespace esphome {
 namespace esp32_ble_client {
 
diff --git a/esphome/components/esp32_ble_server/ble_server.h b/esphome/components/esp32_ble_server/ble_server.h
index d275eeab01..f82e854090 100644
--- a/esphome/components/esp32_ble_server/ble_server.h
+++ b/esphome/components/esp32_ble_server/ble_server.h
@@ -12,6 +12,7 @@
 
 #include <map>
 #include <memory>
+#include <vector>
 
 #ifdef USE_ESP32
 
diff --git a/esphome/components/esp32_ble_server/ble_service.h b/esphome/components/esp32_ble_server/ble_service.h
index 16cc897238..2766c931a7 100644
--- a/esphome/components/esp32_ble_server/ble_service.h
+++ b/esphome/components/esp32_ble_server/ble_service.h
@@ -3,6 +3,8 @@
 #include "ble_characteristic.h"
 #include "esphome/components/esp32_ble/ble_uuid.h"
 
+#include <vector>
+
 #ifdef USE_ESP32
 
 #include <esp_gap_ble_api.h>
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 4fbf7b12e1..153a224378 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -5,10 +5,12 @@
 #include "esphome/core/helpers.h"
 #include "queue.h"
 
+#include <array>
+#include <string>
+#include <vector>
+
 #ifdef USE_ESP32
 
-#include <string>
-#include <array>
 #include <esp_gap_ble_api.h>
 #include <esp_gattc_api.h>
 #include <esp_bt_defs.h>
diff --git a/esphome/components/esp32_ble_tracker/queue.h b/esphome/components/esp32_ble_tracker/queue.h
index f3a2b3cb3c..f1dcc337e8 100644
--- a/esphome/components/esp32_ble_tracker/queue.h
+++ b/esphome/components/esp32_ble_tracker/queue.h
@@ -4,9 +4,10 @@
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
 
-#include <queue>
-#include <mutex>
 #include <cstring>
+#include <mutex>
+#include <queue>
+#include <vector>
 
 #include <esp_gap_ble_api.h>
 #include <esp_gattc_api.h>
diff --git a/esphome/components/esp32_improv/esp32_improv_component.h b/esphome/components/esp32_improv/esp32_improv_component.h
index 45639f2f63..1a142c94b6 100644
--- a/esphome/components/esp32_improv/esp32_improv_component.h
+++ b/esphome/components/esp32_improv/esp32_improv_component.h
@@ -9,6 +9,8 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/preferences.h"
 
+#include <vector>
+
 #ifdef USE_ESP32
 
 #include <improv.h>
diff --git a/esphome/components/esp32_touch/esp32_touch.h b/esphome/components/esp32_touch/esp32_touch.h
index d49e4703a7..c954a14654 100644
--- a/esphome/components/esp32_touch/esp32_touch.h
+++ b/esphome/components/esp32_touch/esp32_touch.h
@@ -6,6 +6,8 @@
 #include "esphome/components/binary_sensor/binary_sensor.h"
 #include <esp_idf_version.h>
 
+#include <vector>
+
 #if ESP_IDF_VERSION_MAJOR >= 4
 #include <driver/touch_sensor.h>
 #else
diff --git a/esphome/components/esp8266/preferences.cpp b/esphome/components/esp8266/preferences.cpp
index 1bd20f16ae..8ee5a8225a 100644
--- a/esphome/components/esp8266/preferences.cpp
+++ b/esphome/components/esp8266/preferences.cpp
@@ -5,12 +5,14 @@ extern "C" {
 #include "spi_flash.h"
 }
 
-#include "preferences.h"
-#include <cstring>
-#include "esphome/core/preferences.h"
+#include "esphome/core/defines.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
-#include "esphome/core/defines.h"
+#include "esphome/core/preferences.h"
+#include "preferences.h"
+
+#include <cstring>
+#include <vector>
 
 namespace esphome {
 namespace esp8266 {
diff --git a/esphome/components/fingerprint_grow/fingerprint_grow.h b/esphome/components/fingerprint_grow/fingerprint_grow.h
index e50418a768..96d02a1e8c 100644
--- a/esphome/components/fingerprint_grow/fingerprint_grow.h
+++ b/esphome/components/fingerprint_grow/fingerprint_grow.h
@@ -6,6 +6,8 @@
 #include "esphome/components/binary_sensor/binary_sensor.h"
 #include "esphome/components/uart/uart.h"
 
+#include <vector>
+
 namespace esphome {
 namespace fingerprint_grow {
 
diff --git a/esphome/components/gpio/switch/gpio_switch.h b/esphome/components/gpio/switch/gpio_switch.h
index 99f8060efa..b28ba3a851 100644
--- a/esphome/components/gpio/switch/gpio_switch.h
+++ b/esphome/components/gpio/switch/gpio_switch.h
@@ -4,6 +4,8 @@
 #include "esphome/core/hal.h"
 #include "esphome/components/switch/switch.h"
 
+#include <vector>
+
 namespace esphome {
 namespace gpio {
 
diff --git a/esphome/components/gps/gps.h b/esphome/components/gps/gps.h
index 40cda145ca..0626fb0b0e 100644
--- a/esphome/components/gps/gps.h
+++ b/esphome/components/gps/gps.h
@@ -7,6 +7,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include <TinyGPS++.h>
 
+#include <vector>
+
 namespace esphome {
 namespace gps {
 
diff --git a/esphome/components/graph/graph.h b/esphome/components/graph/graph.h
index 15d2d1c7c4..69c1167f54 100644
--- a/esphome/components/graph/graph.h
+++ b/esphome/components/graph/graph.h
@@ -1,9 +1,10 @@
 #pragma once
+#include <cstdint>
+#include <utility>
+#include <vector>
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/core/color.h"
 #include "esphome/core/component.h"
-#include <cstdint>
-#include <utility>
 
 namespace esphome {
 
diff --git a/esphome/components/growatt_solar/growatt_solar.h b/esphome/components/growatt_solar/growatt_solar.h
index 0067998133..d1b08b534a 100644
--- a/esphome/components/growatt_solar/growatt_solar.h
+++ b/esphome/components/growatt_solar/growatt_solar.h
@@ -4,6 +4,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/modbus/modbus.h"
 
+#include <vector>
+
 namespace esphome {
 namespace growatt_solar {
 
diff --git a/esphome/components/havells_solar/havells_solar.h b/esphome/components/havells_solar/havells_solar.h
index 2ccc8be3d4..f3ac8fafcf 100644
--- a/esphome/components/havells_solar/havells_solar.h
+++ b/esphome/components/havells_solar/havells_solar.h
@@ -4,6 +4,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/modbus/modbus.h"
 
+#include <vector>
+
 namespace esphome {
 namespace havells_solar {
 
diff --git a/esphome/components/http_request/http_request.h b/esphome/components/http_request/http_request.h
index 4590163f2c..eab3045fdc 100644
--- a/esphome/components/http_request/http_request.h
+++ b/esphome/components/http_request/http_request.h
@@ -6,10 +6,12 @@
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/defines.h"
+
 #include <list>
 #include <map>
-#include <utility>
 #include <memory>
+#include <utility>
+#include <vector>
 
 #ifdef USE_ESP32
 #include <HTTPClient.h>
diff --git a/esphome/components/improv_serial/improv_serial_component.h b/esphome/components/improv_serial/improv_serial_component.h
index 6be5704b71..3d8478252d 100644
--- a/esphome/components/improv_serial/improv_serial_component.h
+++ b/esphome/components/improv_serial/improv_serial_component.h
@@ -6,6 +6,7 @@
 #include "esphome/core/helpers.h"
 
 #include <improv.h>
+#include <vector>
 
 #ifdef USE_ARDUINO
 #include <HardwareSerial.h>
diff --git a/esphome/components/lcd_base/lcd_display.h b/esphome/components/lcd_base/lcd_display.h
index c8ba39f0d4..c1dc54a9ed 100644
--- a/esphome/components/lcd_base/lcd_display.h
+++ b/esphome/components/lcd_base/lcd_display.h
@@ -8,6 +8,7 @@
 #endif
 
 #include <map>
+#include <vector>
 
 namespace esphome {
 namespace lcd_base {
diff --git a/esphome/components/light/addressable_light_effect.h b/esphome/components/light/addressable_light_effect.h
index d404898edf..0482cf53b9 100644
--- a/esphome/components/light/addressable_light_effect.h
+++ b/esphome/components/light/addressable_light_effect.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <utility>
+#include <vector>
 
 #include "esphome/core/component.h"
 #include "esphome/components/light/light_state.h"
diff --git a/esphome/components/light/base_light_effects.h b/esphome/components/light/base_light_effects.h
index a6ab299308..6291aa0610 100644
--- a/esphome/components/light/base_light_effects.h
+++ b/esphome/components/light/base_light_effects.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <utility>
+#include <vector>
 
 #include "light_effect.h"
 #include "esphome/core/automation.h"
diff --git a/esphome/components/light/light_state.h b/esphome/components/light/light_state.h
index 2834836c0e..81f8be7207 100644
--- a/esphome/components/light/light_state.h
+++ b/esphome/components/light/light_state.h
@@ -10,6 +10,8 @@
 #include "light_traits.h"
 #include "light_transformer.h"
 
+#include <vector>
+
 namespace esphome {
 namespace light {
 
diff --git a/esphome/components/logger/logger.h b/esphome/components/logger/logger.h
index 0e12acacd8..88d5e8ee97 100644
--- a/esphome/components/logger/logger.h
+++ b/esphome/components/logger/logger.h
@@ -1,10 +1,11 @@
 #pragma once
 
+#include <cstdarg>
+#include <vector>
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
-#include "esphome/core/helpers.h"
 #include "esphome/core/defines.h"
-#include <cstdarg>
+#include "esphome/core/helpers.h"
 
 #ifdef USE_ARDUINO
 #if defined(USE_ESP8266) || defined(USE_ESP32)
diff --git a/esphome/components/ltr390/ltr390.h b/esphome/components/ltr390/ltr390.h
index d607a3e55f..1bb7a8fa22 100644
--- a/esphome/components/ltr390/ltr390.h
+++ b/esphome/components/ltr390/ltr390.h
@@ -1,10 +1,11 @@
 #pragma once
 
+#include <tuple>
+#include <vector>
+#include "esphome/components/i2c/i2c.h"
+#include "esphome/components/sensor/sensor.h"
 #include "esphome/core/component.h"
 #include "esphome/core/optional.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/i2c/i2c.h"
-#include <tuple>
 
 namespace esphome {
 namespace ltr390 {
diff --git a/esphome/components/max7219digit/max7219digit.h b/esphome/components/max7219digit/max7219digit.h
index 3552c6b9d5..3619478697 100644
--- a/esphome/components/max7219digit/max7219digit.h
+++ b/esphome/components/max7219digit/max7219digit.h
@@ -5,6 +5,8 @@
 #include "esphome/components/display/display_buffer.h"
 #include "esphome/components/spi/spi.h"
 
+#include <vector>
+
 #ifdef USE_TIME
 #include "esphome/components/time/real_time_clock.h"
 #endif
diff --git a/esphome/components/modbus/modbus.h b/esphome/components/modbus/modbus.h
index 629ab6dcce..95414ba090 100644
--- a/esphome/components/modbus/modbus.h
+++ b/esphome/components/modbus/modbus.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "esphome/components/uart/uart.h"
 
+#include <vector>
+
 namespace esphome {
 namespace modbus {
 
diff --git a/esphome/components/modbus_controller/binary_sensor/modbus_binarysensor.h b/esphome/components/modbus_controller/binary_sensor/modbus_binarysensor.h
index 3a8e175c26..3782416d4f 100644
--- a/esphome/components/modbus_controller/binary_sensor/modbus_binarysensor.h
+++ b/esphome/components/modbus_controller/binary_sensor/modbus_binarysensor.h
@@ -4,6 +4,8 @@
 #include "esphome/components/modbus_controller/modbus_controller.h"
 #include "esphome/core/component.h"
 
+#include <vector>
+
 namespace esphome {
 namespace modbus_controller {
 
diff --git a/esphome/components/modbus_controller/number/modbus_number.h b/esphome/components/modbus_controller/number/modbus_number.h
index aa5c8d1500..9b447d831c 100644
--- a/esphome/components/modbus_controller/number/modbus_number.h
+++ b/esphome/components/modbus_controller/number/modbus_number.h
@@ -4,6 +4,8 @@
 #include "esphome/components/modbus_controller/modbus_controller.h"
 #include "esphome/core/component.h"
 
+#include <vector>
+
 namespace esphome {
 namespace modbus_controller {
 
diff --git a/esphome/components/modbus_controller/output/modbus_output.cpp b/esphome/components/modbus_controller/output/modbus_output.cpp
index b647312f52..79cd2d49c2 100644
--- a/esphome/components/modbus_controller/output/modbus_output.cpp
+++ b/esphome/components/modbus_controller/output/modbus_output.cpp
@@ -1,7 +1,6 @@
-#include <vector>
 #include "modbus_output.h"
-#include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
 
 namespace esphome {
 namespace modbus_controller {
diff --git a/esphome/components/modbus_controller/output/modbus_output.h b/esphome/components/modbus_controller/output/modbus_output.h
index f089775c0c..f424671cd1 100644
--- a/esphome/components/modbus_controller/output/modbus_output.h
+++ b/esphome/components/modbus_controller/output/modbus_output.h
@@ -4,6 +4,8 @@
 #include "esphome/components/modbus_controller/modbus_controller.h"
 #include "esphome/core/component.h"
 
+#include <vector>
+
 namespace esphome {
 namespace modbus_controller {
 
diff --git a/esphome/components/modbus_controller/select/modbus_select.h b/esphome/components/modbus_controller/select/modbus_select.h
index 2a31dfd7cc..ffbbba390b 100644
--- a/esphome/components/modbus_controller/select/modbus_select.h
+++ b/esphome/components/modbus_controller/select/modbus_select.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <utility>
+#include <vector>
 
 #include "esphome/components/modbus_controller/modbus_controller.h"
 #include "esphome/components/select/select.h"
diff --git a/esphome/components/modbus_controller/sensor/modbus_sensor.h b/esphome/components/modbus_controller/sensor/modbus_sensor.h
index ababcc33d2..848d5f63de 100644
--- a/esphome/components/modbus_controller/sensor/modbus_sensor.h
+++ b/esphome/components/modbus_controller/sensor/modbus_sensor.h
@@ -4,6 +4,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/core/component.h"
 
+#include <vector>
+
 namespace esphome {
 namespace modbus_controller {
 
diff --git a/esphome/components/modbus_controller/switch/modbus_switch.h b/esphome/components/modbus_controller/switch/modbus_switch.h
index eccfc3b64a..0f2d8f6e59 100644
--- a/esphome/components/modbus_controller/switch/modbus_switch.h
+++ b/esphome/components/modbus_controller/switch/modbus_switch.h
@@ -4,6 +4,8 @@
 #include "esphome/components/switch/switch.h"
 #include "esphome/core/component.h"
 
+#include <vector>
+
 namespace esphome {
 namespace modbus_controller {
 
diff --git a/esphome/components/modbus_controller/text_sensor/modbus_textsensor.h b/esphome/components/modbus_controller/text_sensor/modbus_textsensor.h
index c52c6cd072..2e3be72034 100644
--- a/esphome/components/modbus_controller/text_sensor/modbus_textsensor.h
+++ b/esphome/components/modbus_controller/text_sensor/modbus_textsensor.h
@@ -4,6 +4,8 @@
 #include "esphome/components/text_sensor/text_sensor.h"
 #include "esphome/core/component.h"
 
+#include <vector>
+
 namespace esphome {
 namespace modbus_controller {
 
diff --git a/esphome/components/mopeka_ble/mopeka_ble.h b/esphome/components/mopeka_ble/mopeka_ble.h
index 7b797a3bbe..f88bad4f3a 100644
--- a/esphome/components/mopeka_ble/mopeka_ble.h
+++ b/esphome/components/mopeka_ble/mopeka_ble.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 
+#include <vector>
+
 #ifdef USE_ESP32
 
 namespace esphome {
diff --git a/esphome/components/mopeka_pro_check/mopeka_pro_check.h b/esphome/components/mopeka_pro_check/mopeka_pro_check.h
index dfdce9353e..e6cc1fd6f1 100644
--- a/esphome/components/mopeka_pro_check/mopeka_pro_check.h
+++ b/esphome/components/mopeka_pro_check/mopeka_pro_check.h
@@ -4,6 +4,8 @@
 #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/mpr121/mpr121.h b/esphome/components/mpr121/mpr121.h
index 3388f04926..8b7735fa28 100644
--- a/esphome/components/mpr121/mpr121.h
+++ b/esphome/components/mpr121/mpr121.h
@@ -4,6 +4,8 @@
 #include "esphome/components/i2c/i2c.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"
 
+#include <vector>
+
 namespace esphome {
 namespace mpr121 {
 
diff --git a/esphome/components/mqtt/mqtt_client.h b/esphome/components/mqtt/mqtt_client.h
index 0310655146..188a027b91 100644
--- a/esphome/components/mqtt/mqtt_client.h
+++ b/esphome/components/mqtt/mqtt_client.h
@@ -16,6 +16,8 @@
 #endif
 #include "lwip/ip_addr.h"
 
+#include <vector>
+
 namespace esphome {
 namespace mqtt {
 
diff --git a/esphome/components/nextion/nextion.h b/esphome/components/nextion/nextion.h
index ad696d0e83..86610ef564 100644
--- a/esphome/components/nextion/nextion.h
+++ b/esphome/components/nextion/nextion.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <deque>
+#include <vector>
+
 #include "esphome/core/defines.h"
 #include "esphome/components/uart/uart.h"
 #include "nextion_base.h"
diff --git a/esphome/components/nextion/nextion_component_base.h b/esphome/components/nextion/nextion_component_base.h
index 71ad803bc4..e0ef8f93bc 100644
--- a/esphome/components/nextion/nextion_component_base.h
+++ b/esphome/components/nextion/nextion_component_base.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <utility>
+#include <vector>
 #include "esphome/core/defines.h"
 
 namespace esphome {
diff --git a/esphome/components/nfc/ndef_message.h b/esphome/components/nfc/ndef_message.h
index 5e44a06011..2e81fb216c 100644
--- a/esphome/components/nfc/ndef_message.h
+++ b/esphome/components/nfc/ndef_message.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <memory>
+#include <vector>
 
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
diff --git a/esphome/components/nfc/ndef_record.h b/esphome/components/nfc/ndef_record.h
index 4fab1c03e4..27083fdaca 100644
--- a/esphome/components/nfc/ndef_record.h
+++ b/esphome/components/nfc/ndef_record.h
@@ -3,6 +3,8 @@
 #include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
 
+#include <vector>
+
 namespace esphome {
 namespace nfc {
 
diff --git a/esphome/components/nfc/ndef_record_text.h b/esphome/components/nfc/ndef_record_text.h
index 94375cc860..aa8f13bb4b 100644
--- a/esphome/components/nfc/ndef_record_text.h
+++ b/esphome/components/nfc/ndef_record_text.h
@@ -4,6 +4,8 @@
 #include "esphome/core/helpers.h"
 #include "ndef_record.h"
 
+#include <vector>
+
 namespace esphome {
 namespace nfc {
 
diff --git a/esphome/components/nfc/ndef_record_uri.h b/esphome/components/nfc/ndef_record_uri.h
index 4c21724c5c..fc8f2d9a73 100644
--- a/esphome/components/nfc/ndef_record_uri.h
+++ b/esphome/components/nfc/ndef_record_uri.h
@@ -4,6 +4,8 @@
 #include "esphome/core/helpers.h"
 #include "ndef_record.h"
 
+#include <vector>
+
 namespace esphome {
 namespace nfc {
 
diff --git a/esphome/components/nfc/nfc.h b/esphome/components/nfc/nfc.h
index d482131057..1a4e8f1c1d 100644
--- a/esphome/components/nfc/nfc.h
+++ b/esphome/components/nfc/nfc.h
@@ -6,6 +6,8 @@
 #include "ndef_message.h"
 #include "nfc_tag.h"
 
+#include <vector>
+
 namespace esphome {
 namespace nfc {
 
diff --git a/esphome/components/nfc/nfc_tag.h b/esphome/components/nfc/nfc_tag.h
index 2dfc431428..58875a744d 100644
--- a/esphome/components/nfc/nfc_tag.h
+++ b/esphome/components/nfc/nfc_tag.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <memory>
+#include <vector>
 
 #include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
diff --git a/esphome/components/partition/light_partition.h b/esphome/components/partition/light_partition.h
index 5790fd2b39..bd90b4c4f1 100644
--- a/esphome/components/partition/light_partition.h
+++ b/esphome/components/partition/light_partition.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <utility>
+#include <vector>
 
 #include "esphome/core/component.h"
 #include "esphome/components/light/addressable_light.h"
diff --git a/esphome/components/pid/pid_autotuner.h b/esphome/components/pid/pid_autotuner.h
index 7dfe0c056d..88716d2b89 100644
--- a/esphome/components/pid/pid_autotuner.h
+++ b/esphome/components/pid/pid_autotuner.h
@@ -5,6 +5,8 @@
 #include "pid_controller.h"
 #include "pid_simulator.h"
 
+#include <vector>
+
 namespace esphome {
 namespace pid {
 
diff --git a/esphome/components/pid/pid_simulator.h b/esphome/components/pid/pid_simulator.h
index fe145b7330..30222f2f7a 100644
--- a/esphome/components/pid/pid_simulator.h
+++ b/esphome/components/pid/pid_simulator.h
@@ -5,6 +5,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/output/float_output.h"
 
+#include <vector>
+
 namespace esphome {
 namespace pid {
 
diff --git a/esphome/components/pipsolar/output/pipsolar_output.h b/esphome/components/pipsolar/output/pipsolar_output.h
index fe783cf034..29b2d116f2 100644
--- a/esphome/components/pipsolar/output/pipsolar_output.h
+++ b/esphome/components/pipsolar/output/pipsolar_output.h
@@ -4,6 +4,8 @@
 #include "esphome/components/output/float_output.h"
 #include "esphome/core/component.h"
 
+#include <vector>
+
 namespace esphome {
 namespace pipsolar {
 
diff --git a/esphome/components/pn532/pn532.h b/esphome/components/pn532/pn532.h
index 4f688dacc2..fee94a29b8 100644
--- a/esphome/components/pn532/pn532.h
+++ b/esphome/components/pn532/pn532.h
@@ -7,6 +7,8 @@
 #include "esphome/components/nfc/nfc.h"
 #include "esphome/components/nfc/automation.h"
 
+#include <vector>
+
 namespace esphome {
 namespace pn532 {
 
diff --git a/esphome/components/pn532_i2c/pn532_i2c.h b/esphome/components/pn532_i2c/pn532_i2c.h
index 296d73e042..95cf8eeb36 100644
--- a/esphome/components/pn532_i2c/pn532_i2c.h
+++ b/esphome/components/pn532_i2c/pn532_i2c.h
@@ -4,6 +4,8 @@
 #include "esphome/components/pn532/pn532.h"
 #include "esphome/components/i2c/i2c.h"
 
+#include <vector>
+
 namespace esphome {
 namespace pn532_i2c {
 
diff --git a/esphome/components/pn532_spi/pn532_spi.h b/esphome/components/pn532_spi/pn532_spi.h
index d98bd447c8..2d8312813d 100644
--- a/esphome/components/pn532_spi/pn532_spi.h
+++ b/esphome/components/pn532_spi/pn532_spi.h
@@ -4,6 +4,8 @@
 #include "esphome/components/pn532/pn532.h"
 #include "esphome/components/spi/spi.h"
 
+#include <vector>
+
 namespace esphome {
 namespace pn532_spi {
 
diff --git a/esphome/components/pvvx_mithermometer/pvvx_mithermometer.h b/esphome/components/pvvx_mithermometer/pvvx_mithermometer.h
index 9b8e2d9cfe..99455a1663 100644
--- a/esphome/components/pvvx_mithermometer/pvvx_mithermometer.h
+++ b/esphome/components/pvvx_mithermometer/pvvx_mithermometer.h
@@ -4,6 +4,8 @@
 #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/pzemac/pzemac.h b/esphome/components/pzemac/pzemac.h
index 8f2cf1460d..7a229b49ce 100644
--- a/esphome/components/pzemac/pzemac.h
+++ b/esphome/components/pzemac/pzemac.h
@@ -5,6 +5,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/modbus/modbus.h"
 
+#include <vector>
+
 namespace esphome {
 namespace pzemac {
 
diff --git a/esphome/components/pzemdc/pzemdc.h b/esphome/components/pzemdc/pzemdc.h
index a78a48a6fb..dff904476b 100644
--- a/esphome/components/pzemdc/pzemdc.h
+++ b/esphome/components/pzemdc/pzemdc.h
@@ -4,6 +4,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/modbus/modbus.h"
 
+#include <vector>
+
 namespace esphome {
 namespace pzemdc {
 
diff --git a/esphome/components/rc522/rc522.h b/esphome/components/rc522/rc522.h
index d853d2f5ff..5eea3c665e 100644
--- a/esphome/components/rc522/rc522.h
+++ b/esphome/components/rc522/rc522.h
@@ -5,6 +5,8 @@
 #include "esphome/core/automation.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"
 
+#include <vector>
+
 namespace esphome {
 namespace rc522 {
 
diff --git a/esphome/components/rdm6300/rdm6300.h b/esphome/components/rdm6300/rdm6300.h
index 13df400754..0aeabef2bc 100644
--- a/esphome/components/rdm6300/rdm6300.h
+++ b/esphome/components/rdm6300/rdm6300.h
@@ -5,6 +5,8 @@
 #include "esphome/components/binary_sensor/binary_sensor.h"
 #include "esphome/components/uart/uart.h"
 
+#include <vector>
+
 namespace esphome {
 namespace rdm6300 {
 
diff --git a/esphome/components/remote_base/aeha_protocol.h b/esphome/components/remote_base/aeha_protocol.h
index 6cb4706506..c41f3f8df1 100644
--- a/esphome/components/remote_base/aeha_protocol.h
+++ b/esphome/components/remote_base/aeha_protocol.h
@@ -2,6 +2,8 @@
 
 #include "remote_base.h"
 
+#include <vector>
+
 namespace esphome {
 namespace remote_base {
 
diff --git a/esphome/components/remote_base/midea_protocol.h b/esphome/components/remote_base/midea_protocol.h
index 2bcaa879c4..a7f5636b06 100644
--- a/esphome/components/remote_base/midea_protocol.h
+++ b/esphome/components/remote_base/midea_protocol.h
@@ -5,6 +5,7 @@
 #include "remote_base.h"
 #include <array>
 #include <utility>
+#include <vector>
 
 namespace esphome {
 namespace remote_base {
diff --git a/esphome/components/remote_base/pronto_protocol.h b/esphome/components/remote_base/pronto_protocol.h
index 291bb8a99b..8c491257d3 100644
--- a/esphome/components/remote_base/pronto_protocol.h
+++ b/esphome/components/remote_base/pronto_protocol.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "remote_base.h"
 
+#include <vector>
+
 namespace esphome {
 namespace remote_base {
 
diff --git a/esphome/components/remote_base/raw_protocol.h b/esphome/components/remote_base/raw_protocol.h
index 054f02ff7c..dc22282d1c 100644
--- a/esphome/components/remote_base/raw_protocol.h
+++ b/esphome/components/remote_base/raw_protocol.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "remote_base.h"
 
+#include <vector>
+
 namespace esphome {
 namespace remote_base {
 
diff --git a/esphome/components/remote_base/remote_base.h b/esphome/components/remote_base/remote_base.h
index 3c76da84e3..fdb6d45e5f 100644
--- a/esphome/components/remote_base/remote_base.h
+++ b/esphome/components/remote_base/remote_base.h
@@ -1,4 +1,5 @@
 #include <utility>
+#include <vector>
 
 #pragma once
 
diff --git a/esphome/components/remote_transmitter/remote_transmitter.h b/esphome/components/remote_transmitter/remote_transmitter.h
index a4235e875f..560d83802e 100644
--- a/esphome/components/remote_transmitter/remote_transmitter.h
+++ b/esphome/components/remote_transmitter/remote_transmitter.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "esphome/components/remote_base/remote_base.h"
 
+#include <vector>
+
 namespace esphome {
 namespace remote_transmitter {
 
diff --git a/esphome/components/rf_bridge/rf_bridge.h b/esphome/components/rf_bridge/rf_bridge.h
index 9156d995bc..fe6dd96b38 100644
--- a/esphome/components/rf_bridge/rf_bridge.h
+++ b/esphome/components/rf_bridge/rf_bridge.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <utility>
+#include <vector>
 
 #include "esphome/core/component.h"
 #include "esphome/components/uart/uart.h"
diff --git a/esphome/components/rp2040/preferences.cpp b/esphome/components/rp2040/preferences.cpp
index c98344541c..e7aa9ab28d 100644
--- a/esphome/components/rp2040/preferences.cpp
+++ b/esphome/components/rp2040/preferences.cpp
@@ -8,6 +8,8 @@
 #include "preferences.h"
 
 #include <cstring>
+#include <vector>
+
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include "esphome/core/preferences.h"
diff --git a/esphome/components/sdm_meter/sdm_meter.h b/esphome/components/sdm_meter/sdm_meter.h
index 66f0fb8c5e..f8a3014a89 100644
--- a/esphome/components/sdm_meter/sdm_meter.h
+++ b/esphome/components/sdm_meter/sdm_meter.h
@@ -4,6 +4,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/modbus/modbus.h"
 
+#include <vector>
+
 namespace esphome {
 namespace sdm_meter {
 
diff --git a/esphome/components/selec_meter/selec_meter.h b/esphome/components/selec_meter/selec_meter.h
index 0477cd2a62..730791c91b 100644
--- a/esphome/components/selec_meter/selec_meter.h
+++ b/esphome/components/selec_meter/selec_meter.h
@@ -4,6 +4,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/modbus/modbus.h"
 
+#include <vector>
+
 namespace esphome {
 namespace selec_meter {
 
diff --git a/esphome/components/sensirion_common/i2c_sensirion.h b/esphome/components/sensirion_common/i2c_sensirion.h
index 3f0282a5d4..24b706cf36 100644
--- a/esphome/components/sensirion_common/i2c_sensirion.h
+++ b/esphome/components/sensirion_common/i2c_sensirion.h
@@ -1,6 +1,8 @@
 #pragma once
 #include "esphome/components/i2c/i2c.h"
 
+#include <vector>
+
 namespace esphome {
 namespace sensirion_common {
 
diff --git a/esphome/components/sensor/filter.h b/esphome/components/sensor/filter.h
index 6344d34661..c17d14583b 100644
--- a/esphome/components/sensor/filter.h
+++ b/esphome/components/sensor/filter.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include "esphome/core/component.h"
-#include "esphome/core/helpers.h"
 #include <queue>
 #include <utility>
+#include <vector>
+#include "esphome/core/component.h"
+#include "esphome/core/helpers.h"
 
 namespace esphome {
 namespace sensor {
diff --git a/esphome/components/sensor/sensor.h b/esphome/components/sensor/sensor.h
index ba9edd68d0..958230cb3c 100644
--- a/esphome/components/sensor/sensor.h
+++ b/esphome/components/sensor/sensor.h
@@ -6,6 +6,8 @@
 #include "esphome/core/helpers.h"
 #include "esphome/components/sensor/filter.h"
 
+#include <vector>
+
 namespace esphome {
 namespace sensor {
 
diff --git a/esphome/components/sprinkler/sprinkler.h b/esphome/components/sprinkler/sprinkler.h
index acd168d791..625118d9e5 100644
--- a/esphome/components/sprinkler/sprinkler.h
+++ b/esphome/components/sprinkler/sprinkler.h
@@ -5,6 +5,8 @@
 #include "esphome/core/hal.h"
 #include "esphome/components/switch/switch.h"
 
+#include <vector>
+
 namespace esphome {
 namespace sprinkler {
 
diff --git a/esphome/components/sx1509/sx1509.h b/esphome/components/sx1509/sx1509.h
index 5f0697b534..50230b1086 100644
--- a/esphome/components/sx1509/sx1509.h
+++ b/esphome/components/sx1509/sx1509.h
@@ -6,6 +6,8 @@
 #include "sx1509_gpio_pin.h"
 #include "sx1509_registers.h"
 
+#include <vector>
+
 namespace esphome {
 namespace sx1509 {
 
diff --git a/esphome/components/teleinfo/teleinfo.h b/esphome/components/teleinfo/teleinfo.h
index 2be34cfb78..0c6217853e 100644
--- a/esphome/components/teleinfo/teleinfo.h
+++ b/esphome/components/teleinfo/teleinfo.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "esphome/components/uart/uart.h"
 
+#include <vector>
+
 namespace esphome {
 namespace teleinfo {
 /*
diff --git a/esphome/components/text_sensor/filter.h b/esphome/components/text_sensor/filter.h
index 38f35e6172..4e36532945 100644
--- a/esphome/components/text_sensor/filter.h
+++ b/esphome/components/text_sensor/filter.h
@@ -5,6 +5,7 @@
 #include <queue>
 #include <utility>
 #include <map>
+#include <vector>
 
 namespace esphome {
 namespace text_sensor {
diff --git a/esphome/components/text_sensor/text_sensor.h b/esphome/components/text_sensor/text_sensor.h
index 340f7ff9ed..a7673ed9ff 100644
--- a/esphome/components/text_sensor/text_sensor.h
+++ b/esphome/components/text_sensor/text_sensor.h
@@ -5,6 +5,8 @@
 #include "esphome/core/helpers.h"
 #include "esphome/components/text_sensor/filter.h"
 
+#include <vector>
+
 namespace esphome {
 namespace text_sensor {
 
diff --git a/esphome/components/thermostat/thermostat_climate.h b/esphome/components/thermostat/thermostat_climate.h
index 68cbb17e34..124f95de33 100644
--- a/esphome/components/thermostat/thermostat_climate.h
+++ b/esphome/components/thermostat/thermostat_climate.h
@@ -4,7 +4,9 @@
 #include "esphome/core/automation.h"
 #include "esphome/components/climate/climate.h"
 #include "esphome/components/sensor/sensor.h"
+
 #include <map>
+#include <vector>
 
 namespace esphome {
 namespace thermostat {
diff --git a/esphome/components/time/automation.h b/esphome/components/time/automation.h
index 6167aac4f7..e97413e420 100644
--- a/esphome/components/time/automation.h
+++ b/esphome/components/time/automation.h
@@ -4,6 +4,8 @@
 #include "esphome/core/automation.h"
 #include "real_time_clock.h"
 
+#include <vector>
+
 namespace esphome {
 namespace time {
 
diff --git a/esphome/components/tm1637/tm1637.h b/esphome/components/tm1637/tm1637.h
index 0a77acaabe..2fb572bc55 100644
--- a/esphome/components/tm1637/tm1637.h
+++ b/esphome/components/tm1637/tm1637.h
@@ -4,6 +4,8 @@
 #include "esphome/core/defines.h"
 #include "esphome/core/hal.h"
 
+#include <vector>
+
 #ifdef USE_TIME
 #include "esphome/components/time/real_time_clock.h"
 #endif
diff --git a/esphome/components/tm1638/tm1638.h b/esphome/components/tm1638/tm1638.h
index 44160ad227..2e1ac6fad3 100644
--- a/esphome/components/tm1638/tm1638.h
+++ b/esphome/components/tm1638/tm1638.h
@@ -5,6 +5,8 @@
 #include "esphome/core/automation.h"
 #include "esphome/core/hal.h"
 
+#include <vector>
+
 #ifdef USE_TIME
 #include "esphome/components/time/real_time_clock.h"
 #endif
diff --git a/esphome/components/toshiba/toshiba.cpp b/esphome/components/toshiba/toshiba.cpp
index c7a5b72852..104e885aab 100644
--- a/esphome/components/toshiba/toshiba.cpp
+++ b/esphome/components/toshiba/toshiba.cpp
@@ -1,5 +1,7 @@
 #include "toshiba.h"
 
+#include <vector>
+
 namespace esphome {
 namespace toshiba {
 
diff --git a/esphome/components/ttp229_bsf/ttp229_bsf.h b/esphome/components/ttp229_bsf/ttp229_bsf.h
index 59749a4fa7..2663afcec9 100644
--- a/esphome/components/ttp229_bsf/ttp229_bsf.h
+++ b/esphome/components/ttp229_bsf/ttp229_bsf.h
@@ -4,6 +4,8 @@
 #include "esphome/core/hal.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"
 
+#include <vector>
+
 namespace esphome {
 namespace ttp229_bsf {
 
diff --git a/esphome/components/ttp229_lsf/ttp229_lsf.h b/esphome/components/ttp229_lsf/ttp229_lsf.h
index 2064d9b654..f8775a17f0 100644
--- a/esphome/components/ttp229_lsf/ttp229_lsf.h
+++ b/esphome/components/ttp229_lsf/ttp229_lsf.h
@@ -4,6 +4,8 @@
 #include "esphome/components/binary_sensor/binary_sensor.h"
 #include "esphome/components/i2c/i2c.h"
 
+#include <vector>
+
 namespace esphome {
 namespace ttp229_lsf {
 
diff --git a/esphome/components/tuya/automation.h b/esphome/components/tuya/automation.h
index d7706e1d60..8d91cfdfbf 100644
--- a/esphome/components/tuya/automation.h
+++ b/esphome/components/tuya/automation.h
@@ -4,6 +4,8 @@
 #include "esphome/core/automation.h"
 #include "tuya.h"
 
+#include <vector>
+
 namespace esphome {
 namespace tuya {
 
diff --git a/esphome/components/tuya/select/tuya_select.h b/esphome/components/tuya/select/tuya_select.h
index ab233dc501..6a7e5c7ed0 100644
--- a/esphome/components/tuya/select/tuya_select.h
+++ b/esphome/components/tuya/select/tuya_select.h
@@ -4,6 +4,8 @@
 #include "esphome/components/tuya/tuya.h"
 #include "esphome/components/select/select.h"
 
+#include <vector>
+
 namespace esphome {
 namespace tuya {
 
diff --git a/esphome/components/tuya/tuya.h b/esphome/components/tuya/tuya.h
index 1f21b09c0c..5839dfbec0 100644
--- a/esphome/components/tuya/tuya.h
+++ b/esphome/components/tuya/tuya.h
@@ -9,6 +9,8 @@
 #include "esphome/components/time/real_time_clock.h"
 #endif
 
+#include <vector>
+
 namespace esphome {
 namespace tuya {
 
diff --git a/esphome/components/tx20/tx20.cpp b/esphome/components/tx20/tx20.cpp
index fefcc8f4d5..a2a3baa46e 100644
--- a/esphome/components/tx20/tx20.cpp
+++ b/esphome/components/tx20/tx20.cpp
@@ -2,6 +2,8 @@
 #include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
 
+#include <vector>
+
 namespace esphome {
 namespace tx20 {
 
diff --git a/esphome/components/uart/automation.h b/esphome/components/uart/automation.h
index 9686f94413..b6a50ea22d 100644
--- a/esphome/components/uart/automation.h
+++ b/esphome/components/uart/automation.h
@@ -3,6 +3,8 @@
 #include "uart.h"
 #include "esphome/core/automation.h"
 
+#include <vector>
+
 namespace esphome {
 namespace uart {
 
diff --git a/esphome/components/uart/switch/uart_switch.h b/esphome/components/uart/switch/uart_switch.h
index 4c82d5680a..4f24d76d0c 100644
--- a/esphome/components/uart/switch/uart_switch.h
+++ b/esphome/components/uart/switch/uart_switch.h
@@ -4,6 +4,8 @@
 #include "esphome/components/uart/uart.h"
 #include "esphome/components/switch/switch.h"
 
+#include <vector>
+
 namespace esphome {
 namespace uart {
 
diff --git a/esphome/components/web_server_base/web_server_base.h b/esphome/components/web_server_base/web_server_base.h
index cdabe66d44..f6d3a84f89 100644
--- a/esphome/components/web_server_base/web_server_base.h
+++ b/esphome/components/web_server_base/web_server_base.h
@@ -4,6 +4,8 @@
 
 #include <memory>
 #include <utility>
+#include <vector>
+
 #include "esphome/core/component.h"
 
 #include <ESPAsyncWebServer.h>
diff --git a/esphome/components/wifi/wifi_component.h b/esphome/components/wifi/wifi_component.h
index dba0d48724..544cb3dc61 100644
--- a/esphome/components/wifi/wifi_component.h
+++ b/esphome/components/wifi/wifi_component.h
@@ -5,7 +5,9 @@
 #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>
diff --git a/esphome/components/xiaomi_ble/xiaomi_ble.h b/esphome/components/xiaomi_ble/xiaomi_ble.h
index 399bef83b8..c1086605d1 100644
--- a/esphome/components/xiaomi_ble/xiaomi_ble.h
+++ b/esphome/components/xiaomi_ble/xiaomi_ble.h
@@ -3,6 +3,8 @@
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 #include "esphome/core/component.h"
 
+#include <vector>
+
 #ifdef USE_ESP32
 
 namespace esphome {
diff --git a/esphome/components/xiaomi_miscale/xiaomi_miscale.h b/esphome/components/xiaomi_miscale/xiaomi_miscale.h
index cff61f153b..4523bbc82b 100644
--- a/esphome/components/xiaomi_miscale/xiaomi_miscale.h
+++ b/esphome/components/xiaomi_miscale/xiaomi_miscale.h
@@ -4,6 +4,8 @@
 #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/core/base_automation.h b/esphome/core/base_automation.h
index 6ac6e596c1..b36a64b82a 100644
--- a/esphome/core/base_automation.h
+++ b/esphome/core/base_automation.h
@@ -3,6 +3,8 @@
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 
+#include <vector>
+
 namespace esphome {
 
 template<typename... Ts> class AndCondition : public Condition<Ts...> {

From ec576bf9f9df5d037ea980be11b666fa9031330c Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Wed, 23 Nov 2022 16:22:04 -0800
Subject: [PATCH 292/838] fix missing library (#4051)

---
 esphome/components/nextion/display.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/components/nextion/display.py b/esphome/components/nextion/display.py
index c6372fbaf0..72f56bd6f3 100644
--- a/esphome/components/nextion/display.py
+++ b/esphome/components/nextion/display.py
@@ -86,6 +86,8 @@ async def to_code(config):
         if CORE.is_esp32:
             cg.add_library("WiFiClientSecure", None)
             cg.add_library("HTTPClient", None)
+        if CORE.is_esp8266:
+            cg.add_library("ESP8266HTTPClient", None)
 
     if CONF_TOUCH_SLEEP_TIMEOUT in config:
         cg.add(var.set_touch_sleep_timeout_internal(config[CONF_TOUCH_SLEEP_TIMEOUT]))

From 294901fbe952813362a945abf1ded99e58a362d5 Mon Sep 17 00:00:00 2001
From: Brian Kaufman <bkaufx@gmail.com>
Date: Wed, 23 Nov 2022 17:31:37 -0700
Subject: [PATCH 293/838] Fix units for refresh: never (#4048)

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

diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 910d624552..054ee194c1 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -1678,7 +1678,7 @@ def source_refresh(value: str):
     if value.lower() == "always":
         return source_refresh("0s")
     if value.lower() == "never":
-        return source_refresh("1000y")
+        return source_refresh("365250d")
     return positive_time_period_seconds(value)
 
 

From 555bba7698d0354cb1512015dd6faa3b8ab6fb0e Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 24 Nov 2022 16:00:09 +1300
Subject: [PATCH 294/838] Don't convert climate temperature step (#4082)

---
 esphome/components/climate/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/esphome/components/climate/__init__.py b/esphome/components/climate/__init__.py
index 1de9aa3f3a..8a3cd38444 100644
--- a/esphome/components/climate/__init__.py
+++ b/esphome/components/climate/__init__.py
@@ -113,7 +113,9 @@ CLIMATE_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).
             {
                 cv.Optional(CONF_MIN_TEMPERATURE): cv.temperature,
                 cv.Optional(CONF_MAX_TEMPERATURE): cv.temperature,
-                cv.Optional(CONF_TEMPERATURE_STEP): cv.temperature,
+                cv.Optional(CONF_TEMPERATURE_STEP): cv.float_with_unit(
+                    "visual_temperature", "(°C|° C|°|C|° K|° K|K|°F|° F|F)?"
+                ),
             }
         ),
         cv.Optional(CONF_ACTION_STATE_TOPIC): cv.All(

From ae74189fc25bec5715b69b3feea38cd29b62bb95 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Wed, 23 Nov 2022 16:22:04 -0800
Subject: [PATCH 295/838] fix missing library (#4051)

---
 esphome/components/nextion/display.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/components/nextion/display.py b/esphome/components/nextion/display.py
index c6372fbaf0..72f56bd6f3 100644
--- a/esphome/components/nextion/display.py
+++ b/esphome/components/nextion/display.py
@@ -86,6 +86,8 @@ async def to_code(config):
         if CORE.is_esp32:
             cg.add_library("WiFiClientSecure", None)
             cg.add_library("HTTPClient", None)
+        if CORE.is_esp8266:
+            cg.add_library("ESP8266HTTPClient", None)
 
     if CONF_TOUCH_SLEEP_TIMEOUT in config:
         cg.add(var.set_touch_sleep_timeout_internal(config[CONF_TOUCH_SLEEP_TIMEOUT]))

From 81b6562c2501a17372264754005f98c2af02f74c Mon Sep 17 00:00:00 2001
From: Brian Kaufman <bkaufx@gmail.com>
Date: Wed, 23 Nov 2022 17:31:37 -0700
Subject: [PATCH 296/838] Fix units for refresh: never (#4048)

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

diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 90018b4d56..7498f7c505 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -1680,7 +1680,7 @@ def source_refresh(value: str):
     if value.lower() == "always":
         return source_refresh("0s")
     if value.lower() == "never":
-        return source_refresh("1000y")
+        return source_refresh("365250d")
     return positive_time_period_seconds(value)
 
 

From 25bc6761f64357aab9b21f31add73b01eeb61a62 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 24 Nov 2022 16:00:09 +1300
Subject: [PATCH 297/838] Don't convert climate temperature step (#4082)

---
 esphome/components/climate/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/esphome/components/climate/__init__.py b/esphome/components/climate/__init__.py
index 1de9aa3f3a..8a3cd38444 100644
--- a/esphome/components/climate/__init__.py
+++ b/esphome/components/climate/__init__.py
@@ -113,7 +113,9 @@ CLIMATE_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).
             {
                 cv.Optional(CONF_MIN_TEMPERATURE): cv.temperature,
                 cv.Optional(CONF_MAX_TEMPERATURE): cv.temperature,
-                cv.Optional(CONF_TEMPERATURE_STEP): cv.temperature,
+                cv.Optional(CONF_TEMPERATURE_STEP): cv.float_with_unit(
+                    "visual_temperature", "(°C|° C|°|C|° K|° K|K|°F|° F|F)?"
+                ),
             }
         ),
         cv.Optional(CONF_ACTION_STATE_TOPIC): cv.All(

From 4ec0ef75481fe4813e176210b0fb78c8f4330788 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 24 Nov 2022 17:01:52 +1300
Subject: [PATCH 298/838] Bump version to 2022.11.3

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

diff --git a/esphome/const.py b/esphome/const.py
index f88280a4ac..8ac844b2b1 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.11.2"
+__version__ = "2022.11.3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From b089a4ea804c8d1e103cb220d5454c7377c3d331 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 25 Nov 2022 13:47:02 +1300
Subject: [PATCH 299/838] Allow manually specifying binary file to OTA (#4054)

---
 esphome/__main__.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index cf2d161d04..a4f010c6ad 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -298,6 +298,8 @@ def upload_program(config, args, host):
     ota_conf = config[CONF_OTA]
     remote_port = ota_conf[CONF_PORT]
     password = ota_conf.get(CONF_PASSWORD, "")
+    if args.file is not None:
+        return espota2.run_ota(host, remote_port, password, args.file)
     return espota2.run_ota(host, remote_port, password, CORE.firmware_bin)
 
 
@@ -687,6 +689,10 @@ def parse_args(argv):
         "--device",
         help="Manually specify the serial port/address to use, for example /dev/ttyUSB0.",
     )
+    parser_upload.add_argument(
+        "--file",
+        help="Manually specify the binary file to upload.",
+    )
 
     parser_logs = subparsers.add_parser(
         "logs",

From c5f59fad626534c55d58ad6927ab994cafc6a7b3 Mon Sep 17 00:00:00 2001
From: Maurice Makaay <account+github@makaay.nl>
Date: Sat, 26 Nov 2022 20:17:07 +0100
Subject: [PATCH 300/838] Fix regressed 'esphome run' (#4094)

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

diff --git a/esphome/__main__.py b/esphome/__main__.py
index a4f010c6ad..3ad69d27cd 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -298,7 +298,7 @@ def upload_program(config, args, host):
     ota_conf = config[CONF_OTA]
     remote_port = ota_conf[CONF_PORT]
     password = ota_conf.get(CONF_PASSWORD, "")
-    if args.file is not None:
+    if getattr(args, "file", None) is not None:
         return espota2.run_ota(host, remote_port, password, args.file)
     return espota2.run_ota(host, remote_port, password, CORE.firmware_bin)
 

From 53e0af18fb20e494ac5695f57d99307a722b25cf Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 27 Nov 2022 14:28:02 -1000
Subject: [PATCH 301/838] Make parse_characteristics and parse_descriptors lazy
 to reduce memory pressure (#4063)

---
 .../components/bluetooth_proxy/bluetooth_proxy.cpp    | 11 +++++++++++
 .../esp32_ble_client/ble_characteristic.cpp           |  5 +++++
 .../components/esp32_ble_client/ble_characteristic.h  |  1 +
 .../components/esp32_ble_client/ble_client_base.cpp   | 10 +++++++++-
 esphome/components/esp32_ble_client/ble_service.cpp   |  4 +++-
 esphome/components/esp32_ble_client/ble_service.h     |  1 +
 6 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index 7798bb1e85..834901fbdc 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -72,11 +72,15 @@ void BluetoothProxy::loop() {
       api::BluetoothGATTService service_resp;
       service_resp.uuid = {service->uuid.get_128bit_high(), service->uuid.get_128bit_low()};
       service_resp.handle = service->start_handle;
+      if (!service->parsed)
+        service->parse_characteristics();
       for (auto &characteristic : service->characteristics) {
         api::BluetoothGATTCharacteristic characteristic_resp;
         characteristic_resp.uuid = {characteristic->uuid.get_128bit_high(), characteristic->uuid.get_128bit_low()};
         characteristic_resp.handle = characteristic->handle;
         characteristic_resp.properties = characteristic->properties;
+        if (!characteristic->parsed)
+          characteristic->parse_descriptors();
         for (auto &descriptor : characteristic->descriptors) {
           api::BluetoothGATTDescriptor descriptor_resp;
           descriptor_resp.uuid = {descriptor->uuid.get_128bit_high(), descriptor->uuid.get_128bit_low()};
@@ -87,6 +91,13 @@ void BluetoothProxy::loop() {
       }
       resp.services.push_back(std::move(service_resp));
       api::global_api_server->send_bluetooth_gatt_services(resp);
+      // Descriptors are rarely used and can be quite large so we clear them
+      // after sending them to save memory. If something actually needs them
+      // it can parse them again.
+      for (auto &characteristic : service->characteristics) {
+        characteristic->parsed = false;
+        characteristic->descriptors.clear();
+      }
       connection->send_service_++;
     }
   }
diff --git a/esphome/components/esp32_ble_client/ble_characteristic.cpp b/esphome/components/esp32_ble_client/ble_characteristic.cpp
index fbc9ba16dc..ce27628c77 100644
--- a/esphome/components/esp32_ble_client/ble_characteristic.cpp
+++ b/esphome/components/esp32_ble_client/ble_characteristic.cpp
@@ -17,6 +17,7 @@ BLECharacteristic::~BLECharacteristic() {
 }
 
 void BLECharacteristic::parse_descriptors() {
+  this->parsed = true;
   uint16_t offset = 0;
   esp_gattc_descr_elem_t result;
 
@@ -49,6 +50,8 @@ void BLECharacteristic::parse_descriptors() {
 }
 
 BLEDescriptor *BLECharacteristic::get_descriptor(espbt::ESPBTUUID uuid) {
+  if (!this->parsed)
+    this->parse_descriptors();
   for (auto &desc : this->descriptors) {
     if (desc->uuid == uuid)
       return desc;
@@ -59,6 +62,8 @@ BLEDescriptor *BLECharacteristic::get_descriptor(uint16_t uuid) {
   return this->get_descriptor(espbt::ESPBTUUID::from_uint16(uuid));
 }
 BLEDescriptor *BLECharacteristic::get_descriptor_by_handle(uint16_t handle) {
+  if (!this->parsed)
+    this->parse_descriptors();
   for (auto &desc : this->descriptors) {
     if (desc->handle == handle)
       return desc;
diff --git a/esphome/components/esp32_ble_client/ble_characteristic.h b/esphome/components/esp32_ble_client/ble_characteristic.h
index d56516f1fd..746ed600d8 100644
--- a/esphome/components/esp32_ble_client/ble_characteristic.h
+++ b/esphome/components/esp32_ble_client/ble_characteristic.h
@@ -18,6 +18,7 @@ class BLEService;
 class BLECharacteristic {
  public:
   ~BLECharacteristic();
+  bool parsed = false;
   espbt::ESPBTUUID uuid;
   uint16_t handle;
   esp_gatt_char_prop_t properties;
diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 964ff29771..23a55727e4 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -135,6 +135,7 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       for (auto &svc : this->services_)
         delete svc;  // NOLINT(cppcoreguidelines-owning-memory)
       this->services_.clear();
+      esp_ble_gattc_cache_clean(this->remote_bda_);
       this->set_state(espbt::ClientState::IDLE);
       break;
     }
@@ -154,7 +155,6 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
                  svc->uuid.to_string().c_str());
         ESP_LOGI(TAG, "[%d] [%s]  start_handle: 0x%x  end_handle: 0x%x", this->connection_index_,
                  this->address_str_.c_str(), svc->start_handle, svc->end_handle);
-        svc->parse_characteristics();
       }
       this->set_state(espbt::ClientState::CONNECTED);
       this->state_ = espbt::ClientState::ESTABLISHED;
@@ -287,6 +287,8 @@ BLECharacteristic *BLEClientBase::get_characteristic(uint16_t service, uint16_t
 
 BLECharacteristic *BLEClientBase::get_characteristic(uint16_t handle) {
   for (auto *svc : this->services_) {
+    if (!svc->parsed)
+      svc->parse_characteristics();
     for (auto *chr : svc->characteristics) {
       if (chr->handle == handle)
         return chr;
@@ -298,6 +300,8 @@ BLECharacteristic *BLEClientBase::get_characteristic(uint16_t handle) {
 BLEDescriptor *BLEClientBase::get_config_descriptor(uint16_t handle) {
   auto *chr = this->get_characteristic(handle);
   if (chr != nullptr) {
+    if (!chr->parsed)
+      chr->parse_descriptors();
     for (auto &desc : chr->descriptors) {
       if (desc->uuid.get_uuid().uuid.uuid16 == 0x2902)
         return desc;
@@ -323,7 +327,11 @@ BLEDescriptor *BLEClientBase::get_descriptor(uint16_t service, uint16_t chr, uin
 
 BLEDescriptor *BLEClientBase::get_descriptor(uint16_t handle) {
   for (auto *svc : this->services_) {
+    if (!svc->parsed)
+      svc->parse_characteristics();
     for (auto *chr : svc->characteristics) {
+      if (!chr->parsed)
+        chr->parse_descriptors();
       for (auto *desc : chr->descriptors) {
         if (desc->handle == handle)
           return desc;
diff --git a/esphome/components/esp32_ble_client/ble_service.cpp b/esphome/components/esp32_ble_client/ble_service.cpp
index 2f8a55f928..3c95dad684 100644
--- a/esphome/components/esp32_ble_client/ble_service.cpp
+++ b/esphome/components/esp32_ble_client/ble_service.cpp
@@ -11,6 +11,8 @@ namespace esp32_ble_client {
 static const char *const TAG = "esp32_ble_client";
 
 BLECharacteristic *BLEService::get_characteristic(espbt::ESPBTUUID uuid) {
+  if (!this->parsed)
+    this->parse_characteristics();
   for (auto &chr : this->characteristics) {
     if (chr->uuid == uuid)
       return chr;
@@ -28,6 +30,7 @@ BLEService::~BLEService() {
 }
 
 void BLEService::parse_characteristics() {
+  this->parsed = true;
   uint16_t offset = 0;
   esp_gattc_char_elem_t result;
 
@@ -57,7 +60,6 @@ void BLEService::parse_characteristics() {
     ESP_LOGI(TAG, "[%d] [%s]  characteristic %s, handle 0x%x, properties 0x%x", this->client->get_connection_index(),
              this->client->address_str().c_str(), characteristic->uuid.to_string().c_str(), characteristic->handle,
              characteristic->properties);
-    characteristic->parse_descriptors();
     offset++;
   }
 }
diff --git a/esphome/components/esp32_ble_client/ble_service.h b/esphome/components/esp32_ble_client/ble_service.h
index 7b072f5fae..1b1e86611f 100644
--- a/esphome/components/esp32_ble_client/ble_service.h
+++ b/esphome/components/esp32_ble_client/ble_service.h
@@ -18,6 +18,7 @@ class BLEClientBase;
 class BLEService {
  public:
   ~BLEService();
+  bool parsed = false;
   espbt::ESPBTUUID uuid;
   uint16_t start_handle;
   uint16_t end_handle;

From 9052947a7137c9e3065a1240f77b772d55274d29 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 27 Nov 2022 14:30:05 -1000
Subject: [PATCH 302/838] Speed up BLE connections (#4093)

---
 .../bluetooth_proxy/bluetooth_connection.cpp  | 23 +++++++++++++++++++
 .../bluetooth_proxy/bluetooth_connection.h    |  1 +
 .../esp32_ble_client/ble_client_base.cpp      |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
index 1911701632..efd258a456 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
@@ -35,11 +35,34 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
         api::global_api_server->send_bluetooth_connections_free(this->proxy_->get_bluetooth_connections_free(),
                                                                 this->proxy_->get_bluetooth_connections_limit());
       }
+      this->seen_mtu_or_services_ = false;
+      break;
+    }
+    case ESP_GATTC_CFG_MTU_EVT: {
+      if (param->cfg_mtu.conn_id != this->conn_id_)
+        break;
+      if (!this->seen_mtu_or_services_) {
+        // We don't know if we will get the MTU or the services first, so
+        // only send the device connection true if we have already received
+        // the services.
+        this->seen_mtu_or_services_ = true;
+        break;
+      }
+      api::global_api_server->send_bluetooth_device_connection(this->address_, true, this->mtu_);
+      api::global_api_server->send_bluetooth_connections_free(this->proxy_->get_bluetooth_connections_free(),
+                                                              this->proxy_->get_bluetooth_connections_limit());
       break;
     }
     case ESP_GATTC_SEARCH_CMPL_EVT: {
       if (param->search_cmpl.conn_id != this->conn_id_)
         break;
+      if (!this->seen_mtu_or_services_) {
+        // We don't know if we will get the MTU or the services first, so
+        // only send the device connection true if we have already received
+        // the mtu.
+        this->seen_mtu_or_services_ = true;
+        break;
+      }
       api::global_api_server->send_bluetooth_device_connection(this->address_, true, this->mtu_);
       api::global_api_server->send_bluetooth_connections_free(this->proxy_->get_bluetooth_connections_free(),
                                                               this->proxy_->get_bluetooth_connections_limit());
diff --git a/esphome/components/bluetooth_proxy/bluetooth_connection.h b/esphome/components/bluetooth_proxy/bluetooth_connection.h
index 1f759c3485..fa0233d2fb 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.h
@@ -23,6 +23,7 @@ class BluetoothConnection : public esp32_ble_client::BLEClientBase {
 
  protected:
   friend class BluetoothProxy;
+  bool seen_mtu_or_services_{false};
 
   int16_t send_service_{-1};
   BluetoothProxy *proxy_;
diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 23a55727e4..9c7f98470b 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -112,6 +112,7 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
         ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_send_mtu_req failed, status=%x", this->connection_index_,
                  this->address_str_.c_str(), ret);
       }
+      esp_ble_gattc_search_service(esp_gattc_if, param->cfg_mtu.conn_id, nullptr);
       break;
     }
     case ESP_GATTC_CFG_MTU_EVT: {
@@ -124,7 +125,6 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       ESP_LOGV(TAG, "[%d] [%s] cfg_mtu status %d, mtu %d", this->connection_index_, this->address_str_.c_str(),
                param->cfg_mtu.status, param->cfg_mtu.mtu);
       this->mtu_ = param->cfg_mtu.mtu;
-      esp_ble_gattc_search_service(esp_gattc_if, param->cfg_mtu.conn_id, nullptr);
       break;
     }
     case ESP_GATTC_DISCONNECT_EVT: {

From ed42cefeeedd2b89165689d188a692f577cb5069 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 27 Nov 2022 14:30:41 -1000
Subject: [PATCH 303/838] Align BLE service logging (#4095)

---
 esphome/components/esp32_ble_client/ble_client_base.cpp | 4 ++--
 esphome/components/esp32_ble_client/ble_service.cpp     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 9c7f98470b..512d43cfcc 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -151,9 +151,9 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
     case ESP_GATTC_SEARCH_CMPL_EVT: {
       ESP_LOGV(TAG, "[%d] [%s] ESP_GATTC_SEARCH_CMPL_EVT", this->connection_index_, this->address_str_.c_str());
       for (auto &svc : this->services_) {
-        ESP_LOGI(TAG, "[%d] [%s] Service UUID: %s", this->connection_index_, this->address_str_.c_str(),
+        ESP_LOGV(TAG, "[%d] [%s] Service UUID: %s", this->connection_index_, this->address_str_.c_str(),
                  svc->uuid.to_string().c_str());
-        ESP_LOGI(TAG, "[%d] [%s]  start_handle: 0x%x  end_handle: 0x%x", this->connection_index_,
+        ESP_LOGV(TAG, "[%d] [%s]  start_handle: 0x%x  end_handle: 0x%x", this->connection_index_,
                  this->address_str_.c_str(), svc->start_handle, svc->end_handle);
       }
       this->set_state(espbt::ClientState::CONNECTED);
diff --git a/esphome/components/esp32_ble_client/ble_service.cpp b/esphome/components/esp32_ble_client/ble_service.cpp
index 3c95dad684..7ccf686d9a 100644
--- a/esphome/components/esp32_ble_client/ble_service.cpp
+++ b/esphome/components/esp32_ble_client/ble_service.cpp
@@ -57,7 +57,7 @@ void BLEService::parse_characteristics() {
     characteristic->handle = result.char_handle;
     characteristic->service = this;
     this->characteristics.push_back(characteristic);
-    ESP_LOGI(TAG, "[%d] [%s]  characteristic %s, handle 0x%x, properties 0x%x", this->client->get_connection_index(),
+    ESP_LOGV(TAG, "[%d] [%s]  characteristic %s, handle 0x%x, properties 0x%x", this->client->get_connection_index(),
              this->client->address_str().c_str(), characteristic->uuid.to_string().c_str(), characteristic->handle,
              characteristic->properties);
     offset++;

From fb56b5388ec6d5d8e6383c9c9d3fc39eea955498 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 27 Nov 2022 14:31:13 -1000
Subject: [PATCH 304/838] Suppress logging unhandled ESP_BLE_AD_TYPE_INT_RANGE
 (#4096)

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

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index ed373e4c54..642fa27bdc 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -777,6 +777,9 @@ void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_p
         this->service_datas_.push_back(data);
         break;
       }
+      case ESP_BLE_AD_TYPE_INT_RANGE:
+        // Avoid logging this as it's very verbose
+        break;
       default: {
         ESP_LOGV(TAG, "Unhandled type: advType: 0x%02x", record_type);
         break;

From cee45c12217f92be340b6b87e1b6472e322632f5 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 27 Nov 2022 14:33:17 -1000
Subject: [PATCH 305/838] Make sure all BLE address strings are uppercase
 (#4097)

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

diff --git a/esphome/components/esp32_ble_client/ble_client_base.h b/esphome/components/esp32_ble_client/ble_client_base.h
index 38fd6a5ba4..1e4b015824 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.h
+++ b/esphome/components/esp32_ble_client/ble_client_base.h
@@ -43,7 +43,7 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
       memset(this->remote_bda_, 0, sizeof(this->remote_bda_));
       this->address_str_ = "";
     } else {
-      this->address_str_ = str_snprintf("%02x:%02x:%02x:%02x:%02x:%02x", 17, (uint8_t)(this->address_ >> 40) & 0xff,
+      this->address_str_ = str_snprintf("%02X:%02X:%02X:%02X:%02X:%02X", 17, (uint8_t)(this->address_ >> 40) & 0xff,
                                         (uint8_t)(this->address_ >> 32) & 0xff, (uint8_t)(this->address_ >> 24) & 0xff,
                                         (uint8_t)(this->address_ >> 16) & 0xff, (uint8_t)(this->address_ >> 8) & 0xff,
                                         (uint8_t)(this->address_ >> 0) & 0xff);

From ac112a32c998d4cd84144d7bce58bb0d1040b43d Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 27 Nov 2022 14:39:35 -1000
Subject: [PATCH 306/838] Add logging for BLE connection slots (#4098)

---
 .../components/bluetooth_proxy/bluetooth_proxy.cpp | 14 ++++++++++++++
 .../components/bluetooth_proxy/bluetooth_proxy.h   | 10 +---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index 834901fbdc..eead2a8aea 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -52,6 +52,20 @@ void BluetoothProxy::dump_config() {
   ESP_LOGCONFIG(TAG, "  Active: %s", YESNO(this->active_));
 }
 
+int BluetoothProxy::get_bluetooth_connections_free() {
+  int free = 0;
+  for (auto *connection : this->connections_) {
+    if (connection->address_ == 0) {
+      free++;
+      ESP_LOGV(TAG, "[%d] Free connection", connection->get_connection_index());
+    } else {
+      ESP_LOGV(TAG, "[%d] Used connection by [%s]", connection->get_connection_index(),
+               connection->address_str().c_str());
+    }
+  }
+  return free;
+}
+
 void BluetoothProxy::loop() {
   if (!api::global_api_server->is_connected()) {
     for (auto *connection : this->connections_) {
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.h b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
index b33e084b70..b1353b13da 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -41,15 +41,7 @@ class BluetoothProxy : public esp32_ble_tracker::ESPBTDeviceListener, public Com
   void bluetooth_gatt_send_services(const api::BluetoothGATTGetServicesRequest &msg);
   void bluetooth_gatt_notify(const api::BluetoothGATTNotifyRequest &msg);
 
-  int get_bluetooth_connections_free() {
-    int free = 0;
-    for (auto *connection : this->connections_) {
-      if (connection->address_ == 0) {
-        free++;
-      }
-    }
-    return free;
-  }
+  int get_bluetooth_connections_free();
   int get_bluetooth_connections_limit() { return this->connections_.size(); }
 
   void set_active(bool active) { this->active_ = active; }

From 1166d9380586455f374ed8a9311682c1a4d13bdb Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 27 Nov 2022 15:03:33 -1000
Subject: [PATCH 307/838] Fix registering for gatt notify when characteristic
 only support indicate (#4092)

---
 esphome/components/esp32_ble_client/ble_client_base.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 512d43cfcc..c6ee9e174c 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -168,7 +168,12 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
                  this->address_str_.c_str(), param->reg_for_notify.handle, descr->uuid.to_string().c_str());
         break;
       }
-      uint16_t notify_en = 1;
+      /*
+        1 = notify
+        2 = indicate
+      */
+      uint16_t notify_en = descr->characteristic->properties & ESP_GATT_CHAR_PROP_BIT_NOTIFY ? 1 : 2;
+
       auto status =
           esp_ble_gattc_write_char_descr(this->gattc_if_, this->conn_id_, descr->handle, sizeof(notify_en),
                                          (uint8_t *) &notify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);

From 75573a3ed1bd16f717d12607d0cfa6540fb3e6ab Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 28 Nov 2022 08:49:41 -1000
Subject: [PATCH 308/838] Fix descriptors not being deleted (#4104)

---
 .../components/bluetooth_proxy/bluetooth_proxy.cpp   |  3 +--
 .../esp32_ble_client/ble_characteristic.cpp          |  7 +++++++
 .../components/esp32_ble_client/ble_characteristic.h |  1 +
 .../components/esp32_ble_client/ble_client_base.cpp  | 12 ++++++++----
 .../components/esp32_ble_client/ble_client_base.h    |  1 +
 esphome/components/esp32_ble_client/ble_service.cpp  |  7 +++++++
 esphome/components/esp32_ble_client/ble_service.h    |  1 +
 7 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index eead2a8aea..3cb4d9c0ad 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -109,8 +109,7 @@ void BluetoothProxy::loop() {
       // after sending them to save memory. If something actually needs them
       // it can parse them again.
       for (auto &characteristic : service->characteristics) {
-        characteristic->parsed = false;
-        characteristic->descriptors.clear();
+        characteristic->release_descriptors();
       }
       connection->send_service_++;
     }
diff --git a/esphome/components/esp32_ble_client/ble_characteristic.cpp b/esphome/components/esp32_ble_client/ble_characteristic.cpp
index ce27628c77..2fd7fe9871 100644
--- a/esphome/components/esp32_ble_client/ble_characteristic.cpp
+++ b/esphome/components/esp32_ble_client/ble_characteristic.cpp
@@ -16,6 +16,13 @@ BLECharacteristic::~BLECharacteristic() {
     delete desc;  // NOLINT(cppcoreguidelines-owning-memory)
 }
 
+void BLECharacteristic::release_descriptors() {
+  this->parsed = false;
+  for (auto &desc : this->descriptors)
+    delete desc;  // NOLINT(cppcoreguidelines-owning-memory)
+  this->descriptors.clear();
+}
+
 void BLECharacteristic::parse_descriptors() {
   this->parsed = true;
   uint16_t offset = 0;
diff --git a/esphome/components/esp32_ble_client/ble_characteristic.h b/esphome/components/esp32_ble_client/ble_characteristic.h
index 746ed600d8..a014788e65 100644
--- a/esphome/components/esp32_ble_client/ble_characteristic.h
+++ b/esphome/components/esp32_ble_client/ble_characteristic.h
@@ -24,6 +24,7 @@ class BLECharacteristic {
   esp_gatt_char_prop_t properties;
   std::vector<BLEDescriptor *> descriptors;
   void parse_descriptors();
+  void release_descriptors();
   BLEDescriptor *get_descriptor(espbt::ESPBTUUID uuid);
   BLEDescriptor *get_descriptor(uint16_t uuid);
   BLEDescriptor *get_descriptor_by_handle(uint16_t handle);
diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index c6ee9e174c..9254e13277 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -76,6 +76,13 @@ void BLEClientBase::disconnect() {
   }
 }
 
+void BLEClientBase::release_services() {
+  for (auto &svc : this->services_)
+    delete svc;  // NOLINT(cppcoreguidelines-owning-memory)
+  this->services_.clear();
+  esp_ble_gattc_cache_clean(this->remote_bda_);
+}
+
 bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t esp_gattc_if,
                                         esp_ble_gattc_cb_param_t *param) {
   if (event == ESP_GATTC_REG_EVT && this->app_id != param->reg.app_id)
@@ -132,10 +139,7 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
         return false;
       ESP_LOGV(TAG, "[%d] [%s] ESP_GATTC_DISCONNECT_EVT, reason %d", this->connection_index_,
                this->address_str_.c_str(), param->disconnect.reason);
-      for (auto &svc : this->services_)
-        delete svc;  // NOLINT(cppcoreguidelines-owning-memory)
-      this->services_.clear();
-      esp_ble_gattc_cache_clean(this->remote_bda_);
+      this->release_services();
       this->set_state(espbt::ClientState::IDLE);
       break;
     }
diff --git a/esphome/components/esp32_ble_client/ble_client_base.h b/esphome/components/esp32_ble_client/ble_client_base.h
index 1e4b015824..c97f3c2747 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.h
+++ b/esphome/components/esp32_ble_client/ble_client_base.h
@@ -34,6 +34,7 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
   void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) override;
   void connect() override;
   void disconnect();
+  void release_services();
 
   bool connected() { return this->state_ == espbt::ClientState::ESTABLISHED; }
 
diff --git a/esphome/components/esp32_ble_client/ble_service.cpp b/esphome/components/esp32_ble_client/ble_service.cpp
index 7ccf686d9a..b22d2a1788 100644
--- a/esphome/components/esp32_ble_client/ble_service.cpp
+++ b/esphome/components/esp32_ble_client/ble_service.cpp
@@ -29,6 +29,13 @@ BLEService::~BLEService() {
     delete chr;  // NOLINT(cppcoreguidelines-owning-memory)
 }
 
+void BLEService::release_characteristics() {
+  this->parsed = false;
+  for (auto &chr : this->characteristics)
+    delete chr;  // NOLINT(cppcoreguidelines-owning-memory)
+  this->characteristics.clear();
+}
+
 void BLEService::parse_characteristics() {
   this->parsed = true;
   uint16_t offset = 0;
diff --git a/esphome/components/esp32_ble_client/ble_service.h b/esphome/components/esp32_ble_client/ble_service.h
index 1b1e86611f..41fc3e838b 100644
--- a/esphome/components/esp32_ble_client/ble_service.h
+++ b/esphome/components/esp32_ble_client/ble_service.h
@@ -25,6 +25,7 @@ class BLEService {
   std::vector<BLECharacteristic *> characteristics;
   BLEClientBase *client;
   void parse_characteristics();
+  void release_characteristics();
   BLECharacteristic *get_characteristic(espbt::ESPBTUUID uuid);
   BLECharacteristic *get_characteristic(uint16_t uuid);
 };

From 73c82862cf76270815b69cf82f82268533e11f21 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 28 Nov 2022 09:15:40 -1000
Subject: [PATCH 309/838] Improve reliability of bluetooth active connections
 (#4049)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .../bluetooth_proxy/bluetooth_proxy.cpp       |  20 ++-
 .../esp32_ble_client/ble_client_base.cpp      |  14 +-
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   | 161 +++++++++++-------
 .../esp32_ble_tracker/esp32_ble_tracker.h     |   6 +
 4 files changed, 130 insertions(+), 71 deletions(-)

diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index 3cb4d9c0ad..b5cb8be359 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -128,6 +128,11 @@ BluetoothConnection *BluetoothProxy::get_connection_(uint64_t address, bool rese
   for (auto *connection : this->connections_) {
     if (connection->get_address() == 0) {
       connection->set_address(address);
+      // All connections must start at INIT
+      // We only set the state if we allocate the connection
+      // to avoid a race where multiple connection attempts
+      // are made.
+      connection->set_state(espbt::ClientState::INIT);
       return connection;
     }
   }
@@ -144,8 +149,19 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
         api::global_api_server->send_bluetooth_device_connection(msg.address, false);
         return;
       }
-      ESP_LOGV(TAG, "[%d] [%s] Searching to connect", connection->get_connection_index(),
-               connection->address_str().c_str());
+      if (connection->state() == espbt::ClientState::CONNECTED ||
+          connection->state() == espbt::ClientState::ESTABLISHED) {
+        ESP_LOGW(TAG, "[%d] [%s] Connection already established", connection->get_connection_index(),
+                 connection->address_str().c_str());
+        api::global_api_server->send_bluetooth_device_connection(msg.address, true);
+        api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
+                                                                this->get_bluetooth_connections_limit());
+        return;
+      } else if (connection->state() != espbt::ClientState::INIT) {
+        ESP_LOGW(TAG, "[%d] [%s] Connection already in progress", connection->get_connection_index(),
+                 connection->address_str().c_str());
+        return;
+      }
       connection->set_state(espbt::ClientState::SEARCHING);
       api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
                                                               this->get_bluetooth_connections_limit());
diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 9254e13277..c1e67108ca 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -23,7 +23,9 @@ void BLEClientBase::setup() {
 }
 
 void BLEClientBase::loop() {
-  if (this->state_ == espbt::ClientState::DISCOVERED) {
+  // READY_TO_CONNECT means we have discovered the device
+  // and the scanner has been stopped by the tracker.
+  if (this->state_ == espbt::ClientState::READY_TO_CONNECT) {
     this->connect();
   }
 }
@@ -51,7 +53,8 @@ bool BLEClientBase::parse_device(const espbt::ESPBTDevice &device) {
 }
 
 void BLEClientBase::connect() {
-  ESP_LOGI(TAG, "[%d] [%s] Attempting BLE connection", this->connection_index_, this->address_str_.c_str());
+  ESP_LOGI(TAG, "[%d] [%s] 0x%02x Attempting BLE connection", this->connection_index_, this->address_str_.c_str(),
+           this->remote_addr_type_);
   auto ret = esp_ble_gattc_open(this->gattc_if_, this->remote_bda_, this->remote_addr_type_, true);
   if (ret) {
     ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_open error, status=%d", this->connection_index_, this->address_str_.c_str(),
@@ -63,6 +66,8 @@ void BLEClientBase::connect() {
 }
 
 void BLEClientBase::disconnect() {
+  if (this->state_ == espbt::ClientState::IDLE || this->state_ == espbt::ClientState::DISCONNECTING)
+    return;
   ESP_LOGI(TAG, "[%d] [%s] Disconnecting.", this->connection_index_, this->address_str_.c_str());
   auto err = esp_ble_gattc_close(this->gattc_if_, this->conn_id_);
   if (err != ESP_OK) {
@@ -70,9 +75,12 @@ void BLEClientBase::disconnect() {
              err);
   }
 
-  if (this->state_ == espbt::ClientState::SEARCHING) {
+  if (this->state_ == espbt::ClientState::SEARCHING || this->state_ == espbt::ClientState::READY_TO_CONNECT ||
+      this->state_ == espbt::ClientState::DISCOVERED) {
     this->set_address(0);
     this->set_state(espbt::ClientState::IDLE);
+  } else {
+    this->set_state(espbt::ClientState::DISCONNECTING);
   }
 }
 
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 642fa27bdc..cdefd31288 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -66,7 +66,11 @@ void ESP32BLETracker::setup() {
 #endif
 
   if (this->scan_continuous_) {
-    this->start_scan_(true);
+    if (xSemaphoreTake(this->scan_end_lock_, 0L)) {
+      this->start_scan_(true);
+    } else {
+      ESP_LOGW(TAG, "Cannot start scan!");
+    }
   }
 }
 
@@ -83,86 +87,106 @@ void ESP32BLETracker::loop() {
     ble_event = this->ble_events_.pop();
   }
 
-  if (this->scanner_idle_) {
-    return;
-  }
-
-  bool connecting = false;
+  int connecting = 0;
+  int discovered = 0;
+  int searching = 0;
   for (auto *client : this->clients_) {
-    if (client->state() == ClientState::CONNECTING || client->state() == ClientState::DISCOVERED)
-      connecting = true;
-  }
-
-  if (!connecting && xSemaphoreTake(this->scan_end_lock_, 0L)) {
-    xSemaphoreGive(this->scan_end_lock_);
-    if (this->scan_continuous_) {
-      this->start_scan_(false);
-    } else if (xSemaphoreTake(this->scan_end_lock_, 0L) && !this->scanner_idle_) {
-      xSemaphoreGive(this->scan_end_lock_);
-      this->end_of_scan_();
-      return;
+    switch (client->state()) {
+      case ClientState::DISCOVERED:
+        discovered++;
+        break;
+      case ClientState::SEARCHING:
+        searching++;
+        break;
+      case ClientState::CONNECTING:
+      case ClientState::READY_TO_CONNECT:
+        connecting++;
+        break;
+      default:
+        break;
     }
   }
+  bool promote_to_connecting = discovered && !searching && !connecting;
 
-  if (xSemaphoreTake(this->scan_result_lock_, 5L / portTICK_PERIOD_MS)) {
-    uint32_t index = this->scan_result_index_;
-    xSemaphoreGive(this->scan_result_lock_);
+  if (!this->scanner_idle_) {
+    if (this->scan_result_index_ &&  // if it looks like we have a scan result we will take the lock
+        xSemaphoreTake(this->scan_result_lock_, 5L / portTICK_PERIOD_MS)) {
+      uint32_t index = this->scan_result_index_;
+      if (index) {
+        if (index >= 16) {
+          ESP_LOGW(TAG, "Too many BLE events to process. Some devices may not show up.");
+        }
+        for (size_t i = 0; i < index; i++) {
+          ESPBTDevice device;
+          device.parse_scan_rst(this->scan_result_buffer_[i]);
 
-    if (index >= 16) {
-      ESP_LOGW(TAG, "Too many BLE events to process. Some devices may not show up.");
-    }
-    for (size_t i = 0; i < index; i++) {
-      ESPBTDevice device;
-      device.parse_scan_rst(this->scan_result_buffer_[i]);
+          bool found = false;
+          for (auto *listener : this->listeners_) {
+            if (listener->parse_device(device))
+              found = true;
+          }
 
-      bool found = false;
-      for (auto *listener : this->listeners_) {
-        if (listener->parse_device(device))
-          found = true;
-      }
-
-      for (auto *client : this->clients_) {
-        if (client->parse_device(device)) {
-          found = true;
-          if (client->state() == ClientState::DISCOVERED) {
-            esp_ble_gap_stop_scanning();
-#ifdef USE_ARDUINO
-            constexpr TickType_t block_time = 10L / portTICK_PERIOD_MS;
-#else
-            constexpr TickType_t block_time = 0L;  // PR #3594
-#endif
-            if (xSemaphoreTake(this->scan_end_lock_, block_time)) {
-              xSemaphoreGive(this->scan_end_lock_);
+          for (auto *client : this->clients_) {
+            if (client->parse_device(device)) {
+              found = true;
+              if (!connecting && client->state() == ClientState::DISCOVERED) {
+                promote_to_connecting = true;
+              }
             }
           }
+
+          if (!found && !this->scan_continuous_) {
+            this->print_bt_device_info(device);
+          }
         }
+        this->scan_result_index_ = 0;
       }
-
-      if (!found) {
-        this->print_bt_device_info(device);
-      }
-    }
-
-    if (xSemaphoreTake(this->scan_result_lock_, 10L / portTICK_PERIOD_MS)) {
-      this->scan_result_index_ = 0;
       xSemaphoreGive(this->scan_result_lock_);
     }
+
+    if (this->scan_set_param_failed_) {
+      ESP_LOGE(TAG, "Scan set param failed: %d", this->scan_set_param_failed_);
+      esp_ble_gap_stop_scanning();
+      this->scan_set_param_failed_ = ESP_BT_STATUS_SUCCESS;
+    }
+
+    if (this->scan_start_failed_) {
+      ESP_LOGE(TAG, "Scan start failed: %d", this->scan_start_failed_);
+      esp_ble_gap_stop_scanning();
+      this->scan_start_failed_ = ESP_BT_STATUS_SUCCESS;
+    }
+
+    if (!connecting && xSemaphoreTake(this->scan_end_lock_, 0L)) {
+      if (this->scan_continuous_) {
+        if (!promote_to_connecting) {
+          this->start_scan_(false);
+        }
+      } else if (!this->scanner_idle_) {
+        this->end_of_scan_();
+        return;
+      }
+    }
   }
 
-  if (this->scan_set_param_failed_) {
-    ESP_LOGE(TAG, "Scan set param failed: %d", this->scan_set_param_failed_);
-    this->scan_set_param_failed_ = ESP_BT_STATUS_SUCCESS;
-  }
-
-  if (this->scan_start_failed_) {
-    ESP_LOGE(TAG, "Scan start failed: %d", this->scan_start_failed_);
-    this->scan_start_failed_ = ESP_BT_STATUS_SUCCESS;
+  // If there is a discovered client and no connecting
+  // clients and no clients using the scanner to search for
+  // devices, then stop scanning and promote the discovered
+  // client to ready to connect.
+  if (promote_to_connecting) {
+    for (auto *client : this->clients_) {
+      if (client->state() == ClientState::DISCOVERED) {
+        ESP_LOGD(TAG, "Pausing scan to make connection...");
+        esp_ble_gap_stop_scanning();
+        // We only want to promote one client at a time.
+        client->set_state(ClientState::READY_TO_CONNECT);
+        break;
+      }
+    }
   }
 }
 
 void ESP32BLETracker::start_scan() {
   if (xSemaphoreTake(this->scan_end_lock_, 0L)) {
-    xSemaphoreGive(this->scan_end_lock_);
     this->start_scan_(true);
   } else {
     ESP_LOGW(TAG, "Scan requested when a scan is already in progress. Ignoring.");
@@ -256,8 +280,9 @@ bool ESP32BLETracker::ble_setup() {
 }
 
 void ESP32BLETracker::start_scan_(bool first) {
-  if (!xSemaphoreTake(this->scan_end_lock_, 0L)) {
-    ESP_LOGW(TAG, "Cannot start scan!");
+  // 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_");
     return;
   }
 
@@ -284,8 +309,9 @@ void ESP32BLETracker::start_scan_(bool first) {
 }
 
 void ESP32BLETracker::end_of_scan_() {
-  if (!xSemaphoreTake(this->scan_end_lock_, 0L)) {
-    ESP_LOGW(TAG, "Cannot clean up end of scan!");
+  // The lock must be held when calling this function.
+  if (xSemaphoreTake(this->scan_end_lock_, 0L)) {
+    ESP_LOGE(TAG, "end_of_scan_ called without holding the scan_end_lock_");
     return;
   }
 
@@ -337,6 +363,9 @@ void ESP32BLETracker::gap_scan_set_param_complete_(const esp_ble_gap_cb_param_t:
 
 void ESP32BLETracker::gap_scan_start_complete_(const esp_ble_gap_cb_param_t::ble_scan_start_cmpl_evt_param &param) {
   this->scan_start_failed_ = param.status;
+  if (param.status != ESP_BT_STATUS_SUCCESS) {
+    xSemaphoreGive(this->scan_end_lock_);
+  }
 }
 
 void ESP32BLETracker::gap_scan_stop_complete_(const esp_ble_gap_cb_param_t::ble_scan_stop_cmpl_evt_param &param) {
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 153a224378..0e980e9923 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -145,12 +145,18 @@ class ESPBTDeviceListener {
 };
 
 enum class ClientState {
+  // Connection is allocated
+  INIT,
+  // Client is disconnecting
+  DISCONNECTING,
   // Connection is idle, no device detected.
   IDLE,
   // Searching for device.
   SEARCHING,
   // Device advertisement found.
   DISCOVERED,
+  // Device is discovered and the scanner is stopped
+  READY_TO_CONNECT,
   // Connection in progress.
   CONNECTING,
   // Initial connection established.

From 56de8e5cc44c58ab2f5d692b71058d340397b213 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 29 Nov 2022 16:14:45 +1300
Subject: [PATCH 310/838] Always use generated api options from aioesphomeapi
 (#4116)

---
 script/api_protobuf/api_options_pb2.py | 251 -------------------------
 script/api_protobuf/api_protobuf.py    |   2 +-
 2 files changed, 1 insertion(+), 252 deletions(-)
 delete mode 100644 script/api_protobuf/api_options_pb2.py

diff --git a/script/api_protobuf/api_options_pb2.py b/script/api_protobuf/api_options_pb2.py
deleted file mode 100644
index f5297c062c..0000000000
--- a/script/api_protobuf/api_options_pb2.py
+++ /dev/null
@@ -1,251 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: api_options.proto
-
-import sys
-
-_b = sys.version_info[0] < 3 and (lambda x: x) or (lambda x: x.encode("latin1"))
-from google.protobuf.internal import enum_type_wrapper
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from google.protobuf import descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-    name="api_options.proto",
-    package="",
-    syntax="proto2",
-    serialized_options=None,
-    serialized_pb=_b(
-        '\n\x11\x61pi_options.proto\x1a google/protobuf/descriptor.proto"\x06\n\x04void*F\n\rAPISourceType\x12\x0f\n\x0bSOURCE_BOTH\x10\x00\x12\x11\n\rSOURCE_SERVER\x10\x01\x12\x11\n\rSOURCE_CLIENT\x10\x02:E\n\x16needs_setup_connection\x12\x1e.google.protobuf.MethodOptions\x18\x8e\x08 \x01(\x08:\x04true:C\n\x14needs_authentication\x12\x1e.google.protobuf.MethodOptions\x18\x8f\x08 \x01(\x08:\x04true:/\n\x02id\x12\x1f.google.protobuf.MessageOptions\x18\x8c\x08 \x01(\r:\x01\x30:M\n\x06source\x12\x1f.google.protobuf.MessageOptions\x18\x8d\x08 \x01(\x0e\x32\x0e.APISourceType:\x0bSOURCE_BOTH:/\n\x05ifdef\x12\x1f.google.protobuf.MessageOptions\x18\x8e\x08 \x01(\t:3\n\x03log\x12\x1f.google.protobuf.MessageOptions\x18\x8f\x08 \x01(\x08:\x04true:9\n\x08no_delay\x12\x1f.google.protobuf.MessageOptions\x18\x90\x08 \x01(\x08:\x05\x66\x61lse'
-    ),
-    dependencies=[
-        google_dot_protobuf_dot_descriptor__pb2.DESCRIPTOR,
-    ],
-)
-
-_APISOURCETYPE = _descriptor.EnumDescriptor(
-    name="APISourceType",
-    full_name="APISourceType",
-    filename=None,
-    file=DESCRIPTOR,
-    values=[
-        _descriptor.EnumValueDescriptor(
-            name="SOURCE_BOTH", index=0, number=0, serialized_options=None, type=None
-        ),
-        _descriptor.EnumValueDescriptor(
-            name="SOURCE_SERVER", index=1, number=1, serialized_options=None, type=None
-        ),
-        _descriptor.EnumValueDescriptor(
-            name="SOURCE_CLIENT", index=2, number=2, serialized_options=None, type=None
-        ),
-    ],
-    containing_type=None,
-    serialized_options=None,
-    serialized_start=63,
-    serialized_end=133,
-)
-_sym_db.RegisterEnumDescriptor(_APISOURCETYPE)
-
-APISourceType = enum_type_wrapper.EnumTypeWrapper(_APISOURCETYPE)
-SOURCE_BOTH = 0
-SOURCE_SERVER = 1
-SOURCE_CLIENT = 2
-
-NEEDS_SETUP_CONNECTION_FIELD_NUMBER = 1038
-needs_setup_connection = _descriptor.FieldDescriptor(
-    name="needs_setup_connection",
-    full_name="needs_setup_connection",
-    index=0,
-    number=1038,
-    type=8,
-    cpp_type=7,
-    label=1,
-    has_default_value=True,
-    default_value=True,
-    message_type=None,
-    enum_type=None,
-    containing_type=None,
-    is_extension=True,
-    extension_scope=None,
-    serialized_options=None,
-    file=DESCRIPTOR,
-)
-NEEDS_AUTHENTICATION_FIELD_NUMBER = 1039
-needs_authentication = _descriptor.FieldDescriptor(
-    name="needs_authentication",
-    full_name="needs_authentication",
-    index=1,
-    number=1039,
-    type=8,
-    cpp_type=7,
-    label=1,
-    has_default_value=True,
-    default_value=True,
-    message_type=None,
-    enum_type=None,
-    containing_type=None,
-    is_extension=True,
-    extension_scope=None,
-    serialized_options=None,
-    file=DESCRIPTOR,
-)
-ID_FIELD_NUMBER = 1036
-id = _descriptor.FieldDescriptor(
-    name="id",
-    full_name="id",
-    index=2,
-    number=1036,
-    type=13,
-    cpp_type=3,
-    label=1,
-    has_default_value=True,
-    default_value=0,
-    message_type=None,
-    enum_type=None,
-    containing_type=None,
-    is_extension=True,
-    extension_scope=None,
-    serialized_options=None,
-    file=DESCRIPTOR,
-)
-SOURCE_FIELD_NUMBER = 1037
-source = _descriptor.FieldDescriptor(
-    name="source",
-    full_name="source",
-    index=3,
-    number=1037,
-    type=14,
-    cpp_type=8,
-    label=1,
-    has_default_value=True,
-    default_value=0,
-    message_type=None,
-    enum_type=None,
-    containing_type=None,
-    is_extension=True,
-    extension_scope=None,
-    serialized_options=None,
-    file=DESCRIPTOR,
-)
-IFDEF_FIELD_NUMBER = 1038
-ifdef = _descriptor.FieldDescriptor(
-    name="ifdef",
-    full_name="ifdef",
-    index=4,
-    number=1038,
-    type=9,
-    cpp_type=9,
-    label=1,
-    has_default_value=False,
-    default_value=_b("").decode("utf-8"),
-    message_type=None,
-    enum_type=None,
-    containing_type=None,
-    is_extension=True,
-    extension_scope=None,
-    serialized_options=None,
-    file=DESCRIPTOR,
-)
-LOG_FIELD_NUMBER = 1039
-log = _descriptor.FieldDescriptor(
-    name="log",
-    full_name="log",
-    index=5,
-    number=1039,
-    type=8,
-    cpp_type=7,
-    label=1,
-    has_default_value=True,
-    default_value=True,
-    message_type=None,
-    enum_type=None,
-    containing_type=None,
-    is_extension=True,
-    extension_scope=None,
-    serialized_options=None,
-    file=DESCRIPTOR,
-)
-NO_DELAY_FIELD_NUMBER = 1040
-no_delay = _descriptor.FieldDescriptor(
-    name="no_delay",
-    full_name="no_delay",
-    index=6,
-    number=1040,
-    type=8,
-    cpp_type=7,
-    label=1,
-    has_default_value=True,
-    default_value=False,
-    message_type=None,
-    enum_type=None,
-    containing_type=None,
-    is_extension=True,
-    extension_scope=None,
-    serialized_options=None,
-    file=DESCRIPTOR,
-)
-
-
-_VOID = _descriptor.Descriptor(
-    name="void",
-    full_name="void",
-    filename=None,
-    file=DESCRIPTOR,
-    containing_type=None,
-    fields=[],
-    extensions=[],
-    nested_types=[],
-    enum_types=[],
-    serialized_options=None,
-    is_extendable=False,
-    syntax="proto2",
-    extension_ranges=[],
-    oneofs=[],
-    serialized_start=55,
-    serialized_end=61,
-)
-
-DESCRIPTOR.message_types_by_name["void"] = _VOID
-DESCRIPTOR.enum_types_by_name["APISourceType"] = _APISOURCETYPE
-DESCRIPTOR.extensions_by_name["needs_setup_connection"] = needs_setup_connection
-DESCRIPTOR.extensions_by_name["needs_authentication"] = needs_authentication
-DESCRIPTOR.extensions_by_name["id"] = id
-DESCRIPTOR.extensions_by_name["source"] = source
-DESCRIPTOR.extensions_by_name["ifdef"] = ifdef
-DESCRIPTOR.extensions_by_name["log"] = log
-DESCRIPTOR.extensions_by_name["no_delay"] = no_delay
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-void = _reflection.GeneratedProtocolMessageType(
-    "void",
-    (_message.Message,),
-    dict(
-        DESCRIPTOR=_VOID,
-        __module__="api_options_pb2"
-        # @@protoc_insertion_point(class_scope:void)
-    ),
-)
-_sym_db.RegisterMessage(void)
-
-google_dot_protobuf_dot_descriptor__pb2.MethodOptions.RegisterExtension(
-    needs_setup_connection
-)
-google_dot_protobuf_dot_descriptor__pb2.MethodOptions.RegisterExtension(
-    needs_authentication
-)
-google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(id)
-source.enum_type = _APISOURCETYPE
-google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(source)
-google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(ifdef)
-google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(log)
-google_dot_protobuf_dot_descriptor__pb2.MessageOptions.RegisterExtension(no_delay)
-
-# @@protoc_insertion_point(module_scope)
diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py
index 26bf8647af..ea57b0ddcd 100755
--- a/script/api_protobuf/api_protobuf.py
+++ b/script/api_protobuf/api_protobuf.py
@@ -25,7 +25,7 @@ from subprocess import call
 # Generate with
 # protoc --python_out=script/api_protobuf -I esphome/components/api/ api_options.proto
 
-import api_options_pb2 as pb
+import aioesphomeapi.api_options_pb2 as pb
 import google.protobuf.descriptor_pb2 as descriptor
 
 file_header = "// This file was automatically generated with a tool.\n"

From 873de13b3d4663a7428b592b83bfa6acd3470261 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 28 Nov 2022 18:10:02 -1000
Subject: [PATCH 311/838] Fix bluetooth_gatt_write_descriptor never getting a
 response (#4112)

---
 .../components/bluetooth_proxy/bluetooth_connection.cpp   | 8 ++++----
 esphome/components/bluetooth_proxy/bluetooth_connection.h | 2 +-
 esphome/components/bluetooth_proxy/bluetooth_proxy.cpp    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
index efd258a456..1fd6f08bb5 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
@@ -236,7 +236,7 @@ esp_err_t BluetoothConnection::read_descriptor(uint16_t handle) {
   return ESP_OK;
 }
 
-esp_err_t BluetoothConnection::write_descriptor(uint16_t handle, const std::string &data) {
+esp_err_t BluetoothConnection::write_descriptor(uint16_t handle, const std::string &data, bool response) {
   if (!this->connected()) {
     ESP_LOGW(TAG, "[%d] [%s] Cannot write GATT descriptor, not connected.", this->connection_index_,
              this->address_str_.c_str());
@@ -252,9 +252,9 @@ esp_err_t BluetoothConnection::write_descriptor(uint16_t handle, const std::stri
   ESP_LOGV(TAG, "[%d] [%s] Writing GATT descriptor %s", this->connection_index_, this->address_str_.c_str(),
            descriptor->uuid.to_string().c_str());
 
-  auto err =
-      esp_ble_gattc_write_char_descr(this->gattc_if_, this->conn_id_, descriptor->handle, data.size(),
-                                     (uint8_t *) data.data(), ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
+  esp_err_t err = esp_ble_gattc_write_char_descr(
+      this->gattc_if_, this->conn_id_, handle, data.size(), (uint8_t *) data.data(),
+      response ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
   if (err != ERR_OK) {
     ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_write_char_descr error, err=%d", this->connection_index_,
              this->address_str_.c_str(), err);
diff --git a/esphome/components/bluetooth_proxy/bluetooth_connection.h b/esphome/components/bluetooth_proxy/bluetooth_connection.h
index fa0233d2fb..43346ef3e7 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.h
@@ -17,7 +17,7 @@ class BluetoothConnection : public esp32_ble_client::BLEClientBase {
   esp_err_t read_characteristic(uint16_t handle);
   esp_err_t write_characteristic(uint16_t handle, const std::string &data, bool response);
   esp_err_t read_descriptor(uint16_t handle);
-  esp_err_t write_descriptor(uint16_t handle, const std::string &data);
+  esp_err_t write_descriptor(uint16_t handle, const std::string &data, bool response);
 
   esp_err_t notify_characteristic(uint16_t handle, bool enable);
 
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index b5cb8be359..188e3dd5a5 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -241,7 +241,7 @@ void BluetoothProxy::bluetooth_gatt_write_descriptor(const api::BluetoothGATTWri
     return;
   }
 
-  auto err = connection->write_descriptor(msg.handle, msg.data);
+  auto err = connection->write_descriptor(msg.handle, msg.data, true);
   if (err != ESP_OK) {
     api::global_api_server->send_bluetooth_gatt_error(msg.address, msg.handle, err);
   }

From ad0d6f6337afc9d8592c8b26456c3c27090e3ead Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 28 Nov 2022 18:11:54 -1000
Subject: [PATCH 312/838] Combine the scanner failure check so we only stop the
 scanner once (#4111)

---
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index cdefd31288..50e59537f9 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -144,28 +144,31 @@ void ESP32BLETracker::loop() {
       xSemaphoreGive(this->scan_result_lock_);
     }
 
-    if (this->scan_set_param_failed_) {
-      ESP_LOGE(TAG, "Scan set param failed: %d", this->scan_set_param_failed_);
-      esp_ble_gap_stop_scanning();
-      this->scan_set_param_failed_ = ESP_BT_STATUS_SUCCESS;
-    }
-
-    if (this->scan_start_failed_) {
-      ESP_LOGE(TAG, "Scan start failed: %d", this->scan_start_failed_);
-      esp_ble_gap_stop_scanning();
-      this->scan_start_failed_ = ESP_BT_STATUS_SUCCESS;
-    }
-
     if (!connecting && xSemaphoreTake(this->scan_end_lock_, 0L)) {
       if (this->scan_continuous_) {
-        if (!promote_to_connecting) {
+        if (!promote_to_connecting && !this->scan_start_failed_ && !this->scan_set_param_failed_) {
           this->start_scan_(false);
+        } else {
+          // We didn't start the scan, so we need to release the lock
+          xSemaphoreGive(this->scan_end_lock_);
         }
       } else if (!this->scanner_idle_) {
         this->end_of_scan_();
         return;
       }
     }
+
+    if (this->scan_start_failed_ || this->scan_set_param_failed_) {
+      esp_ble_gap_stop_scanning();
+      if (this->scan_start_failed_) {
+        ESP_LOGE(TAG, "Scan start failed: %d", this->scan_start_failed_);
+        this->scan_start_failed_ = ESP_BT_STATUS_SUCCESS;
+      }
+      if (this->scan_set_param_failed_) {
+        ESP_LOGE(TAG, "Scan set param failed: %d", this->scan_set_param_failed_);
+        this->scan_set_param_failed_ = ESP_BT_STATUS_SUCCESS;
+      }
+    }
   }
 
   // If there is a discovered client and no connecting

From d5ff8f611785d158889c0af4677e6dd29e686ebf Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 28 Nov 2022 18:14:29 -1000
Subject: [PATCH 313/838] Reduce memory needed to send the services list
 (#4110)

---
 .../bluetooth_proxy/bluetooth_proxy.cpp       | 62 ++++++++++++++-----
 1 file changed, 45 insertions(+), 17 deletions(-)

diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index 188e3dd5a5..602edc2fa6 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -86,31 +86,59 @@ void BluetoothProxy::loop() {
       api::BluetoothGATTService service_resp;
       service_resp.uuid = {service->uuid.get_128bit_high(), service->uuid.get_128bit_low()};
       service_resp.handle = service->start_handle;
-      if (!service->parsed)
-        service->parse_characteristics();
-      for (auto &characteristic : service->characteristics) {
+      uint16_t char_offset = 0;
+      esp_gattc_char_elem_t char_result;
+      while (true) {  // characteristics
+        uint16_t char_count = 1;
+        esp_gatt_status_t char_status =
+            esp_ble_gattc_get_all_char(connection->get_gattc_if(), connection->get_conn_id(), service->start_handle,
+                                       service->end_handle, &char_result, &char_count, char_offset);
+        if (char_status == ESP_GATT_INVALID_OFFSET || char_status == ESP_GATT_NOT_FOUND) {
+          break;
+        }
+        if (char_status != ESP_GATT_OK) {
+          ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_get_all_char error, status=%d", connection->get_connection_index(),
+                   connection->address_str().c_str(), char_status);
+          break;
+        }
+        if (char_count == 0) {
+          break;
+        }
         api::BluetoothGATTCharacteristic characteristic_resp;
-        characteristic_resp.uuid = {characteristic->uuid.get_128bit_high(), characteristic->uuid.get_128bit_low()};
-        characteristic_resp.handle = characteristic->handle;
-        characteristic_resp.properties = characteristic->properties;
-        if (!characteristic->parsed)
-          characteristic->parse_descriptors();
-        for (auto &descriptor : characteristic->descriptors) {
+        auto char_uuid = espbt::ESPBTUUID::from_uuid(char_result.uuid);
+        characteristic_resp.uuid = {char_uuid.get_128bit_high(), char_uuid.get_128bit_low()};
+        characteristic_resp.handle = char_result.char_handle;
+        characteristic_resp.properties = char_result.properties;
+        char_offset++;
+        uint16_t desc_offset = 0;
+        esp_gattc_descr_elem_t desc_result;
+        while (true) {  // descriptors
+          uint16_t desc_count = 1;
+          esp_gatt_status_t desc_status =
+              esp_ble_gattc_get_all_descr(connection->get_gattc_if(), connection->get_conn_id(),
+                                          char_result.char_handle, &desc_result, &desc_count, desc_offset);
+          if (desc_status == ESP_GATT_INVALID_OFFSET || desc_status == ESP_GATT_NOT_FOUND) {
+            break;
+          }
+          if (desc_status != ESP_GATT_OK) {
+            ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_get_all_descr error, status=%d", connection->get_connection_index(),
+                     connection->address_str().c_str(), desc_status);
+            break;
+          }
+          if (desc_count == 0) {
+            break;
+          }
           api::BluetoothGATTDescriptor descriptor_resp;
-          descriptor_resp.uuid = {descriptor->uuid.get_128bit_high(), descriptor->uuid.get_128bit_low()};
-          descriptor_resp.handle = descriptor->handle;
+          auto desc_uuid = espbt::ESPBTUUID::from_uuid(desc_result.uuid);
+          descriptor_resp.uuid = {desc_uuid.get_128bit_high(), desc_uuid.get_128bit_low()};
+          descriptor_resp.handle = desc_result.handle;
           characteristic_resp.descriptors.push_back(std::move(descriptor_resp));
+          desc_offset++;
         }
         service_resp.characteristics.push_back(std::move(characteristic_resp));
       }
       resp.services.push_back(std::move(service_resp));
       api::global_api_server->send_bluetooth_gatt_services(resp);
-      // Descriptors are rarely used and can be quite large so we clear them
-      // after sending them to save memory. If something actually needs them
-      // it can parse them again.
-      for (auto &characteristic : service->characteristics) {
-        characteristic->release_descriptors();
-      }
       connection->send_service_++;
     }
   }

From bc5c2d4eb477c659ac84f0f9d7fb139b465a545e Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 28 Nov 2022 18:16:25 -1000
Subject: [PATCH 314/838] Avoid parsing characteristics and descriptors to
 reduce memory pressure (#4109)

---
 .../bluetooth_proxy/bluetooth_connection.cpp  |  4 --
 .../esp32_ble_client/ble_client_base.cpp      | 39 ++++++++++++++-----
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
index 1fd6f08bb5..b14641fd86 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
@@ -105,8 +105,6 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
       break;
     }
     case ESP_GATTC_UNREG_FOR_NOTIFY_EVT: {
-      if (this->get_characteristic(param->unreg_for_notify.handle) == nullptr)  // No conn_id in this event
-        break;
       if (param->unreg_for_notify.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "[%d] [%s] Error unregistering notifications for handle 0x%2X, status=%d",
                  this->connection_index_, this->address_str_.c_str(), param->unreg_for_notify.handle,
@@ -122,8 +120,6 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
       break;
     }
     case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
-      if (this->get_characteristic(param->reg_for_notify.handle) == nullptr)  // No conn_id in this event
-        break;
       if (param->reg_for_notify.status != ESP_GATT_OK) {
         ESP_LOGW(TAG, "[%d] [%s] Error registering notifications for handle 0x%2X, status=%d", this->connection_index_,
                  this->address_str_.c_str(), param->reg_for_notify.handle, param->reg_for_notify.status);
diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index c1e67108ca..065d56e5fb 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -9,6 +9,13 @@ namespace esphome {
 namespace esp32_ble_client {
 
 static const char *const TAG = "esp32_ble_client";
+static const esp_bt_uuid_t NOTIFY_DESC_UUID = {
+    .len = ESP_UUID_LEN_16,
+    .uuid =
+        {
+            .uuid16 = ESP_GATT_UUID_CHAR_CLIENT_CONFIG,
+        },
+};
 
 void BLEClientBase::setup() {
   static uint8_t connection_index = 0;
@@ -173,21 +180,33 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       break;
     }
     case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
-      auto *descr = this->get_config_descriptor(param->reg_for_notify.handle);
-      if (descr->uuid.get_uuid().len != ESP_UUID_LEN_16 ||
-          descr->uuid.get_uuid().uuid.uuid16 != ESP_GATT_UUID_CHAR_CLIENT_CONFIG) {
-        ESP_LOGW(TAG, "[%d] [%s] Handle 0x%x (uuid %s) is not a client config char uuid", this->connection_index_,
-                 this->address_str_.c_str(), param->reg_for_notify.handle, descr->uuid.to_string().c_str());
+      esp_gattc_descr_elem_t desc_result;
+      uint16_t count = 1;
+      esp_gatt_status_t descr_status =
+          esp_ble_gattc_get_descr_by_char_handle(this->gattc_if_, this->connection_index_, param->reg_for_notify.handle,
+                                                 NOTIFY_DESC_UUID, &desc_result, &count);
+      if (descr_status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_get_descr_by_char_handle error, status=%d", this->connection_index_,
+                 this->address_str_.c_str(), descr_status);
         break;
       }
+      esp_gattc_char_elem_t char_result;
+      esp_gatt_status_t char_status =
+          esp_ble_gattc_get_all_char(this->gattc_if_, this->connection_index_, param->reg_for_notify.handle,
+                                     param->reg_for_notify.handle, &char_result, &count, 0);
+      if (char_status != ESP_GATT_OK) {
+        ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_get_all_char error, status=%d", this->connection_index_,
+                 this->address_str_.c_str(), char_status);
+        break;
+      }
+
       /*
         1 = notify
         2 = indicate
       */
-      uint16_t notify_en = descr->characteristic->properties & ESP_GATT_CHAR_PROP_BIT_NOTIFY ? 1 : 2;
-
-      auto status =
-          esp_ble_gattc_write_char_descr(this->gattc_if_, this->conn_id_, descr->handle, sizeof(notify_en),
+      uint16_t notify_en = char_result.properties & ESP_GATT_CHAR_PROP_BIT_NOTIFY ? 1 : 2;
+      esp_err_t status =
+          esp_ble_gattc_write_char_descr(this->gattc_if_, this->conn_id_, desc_result.handle, sizeof(notify_en),
                                          (uint8_t *) &notify_en, ESP_GATT_WRITE_TYPE_RSP, ESP_GATT_AUTH_REQ_NONE);
       if (status) {
         ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_write_char_descr error, status=%d", this->connection_index_,
@@ -320,7 +339,7 @@ BLEDescriptor *BLEClientBase::get_config_descriptor(uint16_t handle) {
     if (!chr->parsed)
       chr->parse_descriptors();
     for (auto &desc : chr->descriptors) {
-      if (desc->uuid.get_uuid().uuid.uuid16 == 0x2902)
+      if (desc->uuid.get_uuid().uuid.uuid16 == ESP_GATT_UUID_CHAR_CLIENT_CONFIG)
         return desc;
     }
   }

From 120327866fe7b61782a80e2bcc37c4599d859210 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 29 Nov 2022 17:24:21 +1300
Subject: [PATCH 315/838] Send device address type alongside ble advertisements
 (#4115)

---
 esphome/components/api/api.proto              |  4 +++
 esphome/components/api/api_pb2.cpp            | 29 +++++++++++++++++++
 esphome/components/api/api_pb2.h              |  3 ++
 .../bluetooth_proxy/bluetooth_proxy.cpp       | 14 ++++++++-
 .../esp32_ble_client/ble_client_base.h        |  1 +
 5 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 623ab6b009..3a6f514f91 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -1141,6 +1141,8 @@ message BluetoothLEAdvertisementResponse {
   repeated string service_uuids = 4;
   repeated BluetoothServiceData service_data = 5;
   repeated BluetoothServiceData manufacturer_data = 6;
+
+  uint32 address_type = 7;
 }
 
 enum BluetoothDeviceRequestType {
@@ -1157,6 +1159,8 @@ message BluetoothDeviceRequest {
 
   uint64 address = 1;
   BluetoothDeviceRequestType request_type = 2;
+  bool has_address_type = 3;
+  uint32 address_type = 4;
 }
 
 message BluetoothDeviceConnectionResponse {
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index bbe1da3209..e82a77974e 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -4993,6 +4993,10 @@ bool BluetoothLEAdvertisementResponse::decode_varint(uint32_t field_id, ProtoVar
       this->rssi = value.as_sint32();
       return true;
     }
+    case 7: {
+      this->address_type = value.as_uint32();
+      return true;
+    }
     default:
       return false;
   }
@@ -5032,6 +5036,7 @@ void BluetoothLEAdvertisementResponse::encode(ProtoWriteBuffer buffer) const {
   for (auto &it : this->manufacturer_data) {
     buffer.encode_message<BluetoothServiceData>(6, it, true);
   }
+  buffer.encode_uint32(7, this->address_type);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothLEAdvertisementResponse::dump_to(std::string &out) const {
@@ -5068,6 +5073,11 @@ void BluetoothLEAdvertisementResponse::dump_to(std::string &out) const {
     it.dump_to(out);
     out.append("\n");
   }
+
+  out.append("  address_type: ");
+  sprintf(buffer, "%u", this->address_type);
+  out.append(buffer);
+  out.append("\n");
   out.append("}");
 }
 #endif
@@ -5081,6 +5091,14 @@ bool BluetoothDeviceRequest::decode_varint(uint32_t field_id, ProtoVarInt value)
       this->request_type = value.as_enum<enums::BluetoothDeviceRequestType>();
       return true;
     }
+    case 3: {
+      this->has_address_type = value.as_bool();
+      return true;
+    }
+    case 4: {
+      this->address_type = value.as_uint32();
+      return true;
+    }
     default:
       return false;
   }
@@ -5088,6 +5106,8 @@ bool BluetoothDeviceRequest::decode_varint(uint32_t field_id, ProtoVarInt value)
 void BluetoothDeviceRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint64(1, this->address);
   buffer.encode_enum<enums::BluetoothDeviceRequestType>(2, this->request_type);
+  buffer.encode_bool(3, this->has_address_type);
+  buffer.encode_uint32(4, this->address_type);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothDeviceRequest::dump_to(std::string &out) const {
@@ -5101,6 +5121,15 @@ void BluetoothDeviceRequest::dump_to(std::string &out) const {
   out.append("  request_type: ");
   out.append(proto_enum_to_string<enums::BluetoothDeviceRequestType>(this->request_type));
   out.append("\n");
+
+  out.append("  has_address_type: ");
+  out.append(YESNO(this->has_address_type));
+  out.append("\n");
+
+  out.append("  address_type: ");
+  sprintf(buffer, "%u", this->address_type);
+  out.append(buffer);
+  out.append("\n");
   out.append("}");
 }
 #endif
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 3aee31b1bf..67ffa5c2dd 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -1257,6 +1257,7 @@ class BluetoothLEAdvertisementResponse : public ProtoMessage {
   std::vector<std::string> service_uuids{};
   std::vector<BluetoothServiceData> service_data{};
   std::vector<BluetoothServiceData> manufacturer_data{};
+  uint32_t address_type{0};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1270,6 +1271,8 @@ class BluetoothDeviceRequest : public ProtoMessage {
  public:
   uint64_t address{0};
   enums::BluetoothDeviceRequestType request_type{};
+  bool has_address_type{false};
+  uint32_t address_type{0};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index 602edc2fa6..567874e5a2 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -26,6 +26,7 @@ bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device)
 void BluetoothProxy::send_api_packet_(const esp32_ble_tracker::ESPBTDevice &device) {
   api::BluetoothLEAdvertisementResponse resp;
   resp.address = device.address_uint64();
+  resp.address_type = device.get_address_type();
   if (!device.get_name().empty())
     resp.name = device.get_name();
   resp.rssi = device.get_rssi();
@@ -190,7 +191,18 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
                  connection->address_str().c_str());
         return;
       }
-      connection->set_state(espbt::ClientState::SEARCHING);
+      if (msg.has_address_type) {
+        connection->remote_bda_[0] = (msg.address >> 40) & 0xFF;
+        connection->remote_bda_[1] = (msg.address >> 32) & 0xFF;
+        connection->remote_bda_[2] = (msg.address >> 24) & 0xFF;
+        connection->remote_bda_[3] = (msg.address >> 16) & 0xFF;
+        connection->remote_bda_[4] = (msg.address >> 8) & 0xFF;
+        connection->remote_bda_[5] = (msg.address >> 0) & 0xFF;
+        connection->set_remote_addr_type(static_cast<esp_ble_addr_type_t>(msg.address_type));
+        connection->set_state(espbt::ClientState::DISCOVERED);
+      } else {
+        connection->set_state(espbt::ClientState::SEARCHING);
+      }
       api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
                                                               this->get_bluetooth_connections_limit());
       break;
diff --git a/esphome/components/esp32_ble_client/ble_client_base.h b/esphome/components/esp32_ble_client/ble_client_base.h
index c97f3c2747..7dd740b703 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.h
+++ b/esphome/components/esp32_ble_client/ble_client_base.h
@@ -68,6 +68,7 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
   int get_gattc_if() const { return this->gattc_if_; }
   uint8_t *get_remote_bda() { return this->remote_bda_; }
   esp_ble_addr_type_t get_remote_addr_type() const { return this->remote_addr_type_; }
+  void set_remote_addr_type(esp_ble_addr_type_t address_type) { this->remote_addr_type_ = address_type; }
   uint16_t get_conn_id() const { return this->conn_id_; }
   uint64_t get_address() const { return this->address_; }
 

From ccef7c322f1fc2295f5a5ef6b87c9b0c31e03479 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 28 Nov 2022 18:30:19 -1000
Subject: [PATCH 316/838] Remove uuid lookups from BLE read/write/notify
 characteristics (#4102)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .../bluetooth_proxy/bluetooth_connection.cpp  | 72 +++++--------------
 1 file changed, 19 insertions(+), 53 deletions(-)

diff --git a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
index b14641fd86..488d56bc95 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
@@ -160,18 +160,11 @@ esp_err_t BluetoothConnection::read_characteristic(uint16_t handle) {
              this->address_str_.c_str());
     return ESP_GATT_NOT_CONNECTED;
   }
-  auto *characteristic = this->get_characteristic(handle);
-  if (characteristic == nullptr) {
-    ESP_LOGW(TAG, "[%d] [%s] Cannot read GATT characteristic, not found.", this->connection_index_,
-             this->address_str_.c_str());
-    return ESP_GATT_INVALID_HANDLE;
-  }
 
-  ESP_LOGV(TAG, "[%d] [%s] Reading GATT characteristic %s", this->connection_index_, this->address_str_.c_str(),
-           characteristic->uuid.to_string().c_str());
+  ESP_LOGV(TAG, "[%d] [%s] Reading GATT characteristic handle %d", this->connection_index_, this->address_str_.c_str(),
+           handle);
 
-  esp_err_t err =
-      esp_ble_gattc_read_char(this->gattc_if_, this->conn_id_, characteristic->handle, ESP_GATT_AUTH_REQ_NONE);
+  esp_err_t err = esp_ble_gattc_read_char(this->gattc_if_, this->conn_id_, handle, ESP_GATT_AUTH_REQ_NONE);
   if (err != ERR_OK) {
     ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_read_char error, err=%d", this->connection_index_,
              this->address_str_.c_str(), err);
@@ -186,18 +179,12 @@ esp_err_t BluetoothConnection::write_characteristic(uint16_t handle, const std::
              this->address_str_.c_str());
     return ESP_GATT_NOT_CONNECTED;
   }
-  auto *characteristic = this->get_characteristic(handle);
-  if (characteristic == nullptr) {
-    ESP_LOGW(TAG, "[%d] [%s] Cannot write GATT characteristic, not found.", this->connection_index_,
-             this->address_str_.c_str());
-    return ESP_GATT_INVALID_HANDLE;
-  }
+  ESP_LOGV(TAG, "[%d] [%s] Writing GATT characteristic handle %d", this->connection_index_, this->address_str_.c_str(),
+           handle);
 
-  ESP_LOGV(TAG, "[%d] [%s] Writing GATT characteristic %s", this->connection_index_, this->address_str_.c_str(),
-           characteristic->uuid.to_string().c_str());
-
-  auto err = characteristic->write_value((uint8_t *) data.data(), data.size(),
-                                         response ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP);
+  esp_err_t err =
+      esp_ble_gattc_write_char(this->gattc_if_, this->conn_id_, handle, data.size(), (uint8_t *) data.data(),
+                               response ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
   if (err != ERR_OK) {
     ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_write_char error, err=%d", this->connection_index_,
              this->address_str_.c_str(), err);
@@ -212,18 +199,10 @@ esp_err_t BluetoothConnection::read_descriptor(uint16_t handle) {
              this->address_str_.c_str());
     return ESP_GATT_NOT_CONNECTED;
   }
-  auto *descriptor = this->get_descriptor(handle);
-  if (descriptor == nullptr) {
-    ESP_LOGW(TAG, "[%d] [%s] Cannot read GATT descriptor, not found.", this->connection_index_,
-             this->address_str_.c_str());
-    return ESP_GATT_INVALID_HANDLE;
-  }
+  ESP_LOGV(TAG, "[%d] [%s] Reading GATT descriptor handle %d", this->connection_index_, this->address_str_.c_str(),
+           handle);
 
-  ESP_LOGV(TAG, "[%d] [%s] Reading GATT descriptor %s", this->connection_index_, this->address_str_.c_str(),
-           descriptor->uuid.to_string().c_str());
-
-  esp_err_t err =
-      esp_ble_gattc_read_char_descr(this->gattc_if_, this->conn_id_, descriptor->handle, ESP_GATT_AUTH_REQ_NONE);
+  esp_err_t err = esp_ble_gattc_read_char_descr(this->gattc_if_, this->conn_id_, handle, ESP_GATT_AUTH_REQ_NONE);
   if (err != ERR_OK) {
     ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_read_char_descr error, err=%d", this->connection_index_,
              this->address_str_.c_str(), err);
@@ -238,15 +217,8 @@ esp_err_t BluetoothConnection::write_descriptor(uint16_t handle, const std::stri
              this->address_str_.c_str());
     return ESP_GATT_NOT_CONNECTED;
   }
-  auto *descriptor = this->get_descriptor(handle);
-  if (descriptor == nullptr) {
-    ESP_LOGW(TAG, "[%d] [%s] Cannot write GATT descriptor, not found.", this->connection_index_,
-             this->address_str_.c_str());
-    return ESP_GATT_INVALID_HANDLE;
-  }
-
-  ESP_LOGV(TAG, "[%d] [%s] Writing GATT descriptor %s", this->connection_index_, this->address_str_.c_str(),
-           descriptor->uuid.to_string().c_str());
+  ESP_LOGV(TAG, "[%d] [%s] Writing GATT descriptor handle %d", this->connection_index_, this->address_str_.c_str(),
+           handle);
 
   esp_err_t err = esp_ble_gattc_write_char_descr(
       this->gattc_if_, this->conn_id_, handle, data.size(), (uint8_t *) data.data(),
@@ -265,26 +237,20 @@ esp_err_t BluetoothConnection::notify_characteristic(uint16_t handle, bool enabl
              this->address_str_.c_str());
     return ESP_GATT_NOT_CONNECTED;
   }
-  auto *characteristic = this->get_characteristic(handle);
-  if (characteristic == nullptr) {
-    ESP_LOGW(TAG, "[%d] [%s] Cannot notify GATT characteristic, not found.", this->connection_index_,
-             this->address_str_.c_str());
-    return ESP_GATT_INVALID_HANDLE;
-  }
 
   if (enable) {
-    ESP_LOGV(TAG, "[%d] [%s] Registering for GATT characteristic notifications %s", this->connection_index_,
-             this->address_str_.c_str(), characteristic->uuid.to_string().c_str());
-    esp_err_t err = esp_ble_gattc_register_for_notify(this->gattc_if_, this->remote_bda_, characteristic->handle);
+    ESP_LOGV(TAG, "[%d] [%s] Registering for GATT characteristic notifications handle %d", this->connection_index_,
+             this->address_str_.c_str(), handle);
+    esp_err_t err = esp_ble_gattc_register_for_notify(this->gattc_if_, this->remote_bda_, handle);
     if (err != ESP_OK) {
       ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_register_for_notify failed, err=%d", this->connection_index_,
                this->address_str_.c_str(), err);
       return err;
     }
   } else {
-    ESP_LOGV(TAG, "[%d] [%s] Unregistering for GATT characteristic notifications %s", this->connection_index_,
-             this->address_str_.c_str(), characteristic->uuid.to_string().c_str());
-    esp_err_t err = esp_ble_gattc_unregister_for_notify(this->gattc_if_, this->remote_bda_, characteristic->handle);
+    ESP_LOGV(TAG, "[%d] [%s] Unregistering for GATT characteristic notifications handle %d", this->connection_index_,
+             this->address_str_.c_str(), handle);
+    esp_err_t err = esp_ble_gattc_unregister_for_notify(this->gattc_if_, this->remote_bda_, handle);
     if (err != ESP_OK) {
       ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_unregister_for_notify failed, err=%d", this->connection_index_,
                this->address_str_.c_str(), err);

From 8414bb9a7ad637eeb95c1820e30dc59618843180 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 29 Nov 2022 08:53:32 -1000
Subject: [PATCH 317/838] Active BLE connection v3 (#4113)

Co-authored-by: Daniel Cousens <413395+dcousens@users.noreply.github.com>
Co-authored-by: Maurice Makaay <account+github@makaay.nl>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/api/api.proto              |  2 +
 esphome/components/api/api_connection.cpp     |  2 +-
 esphome/components/api/api_pb2.cpp            |  6 +++
 esphome/components/api/api_pb2.h              |  2 +
 .../bluetooth_proxy/bluetooth_connection.cpp  |  4 ++
 .../bluetooth_proxy/bluetooth_proxy.cpp       | 38 +++++++++++++++++++
 .../esp32_ble_client/ble_client_base.cpp      | 11 ++++++
 .../esp32_ble_client/ble_client_base.h        |  3 ++
 .../esp32_ble_tracker/esp32_ble_tracker.h     | 12 ++++++
 9 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 3a6f514f91..e1bc7b0a57 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -1150,6 +1150,8 @@ enum BluetoothDeviceRequestType {
   BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT = 1;
   BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR = 2;
   BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR = 3;
+  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE = 4;
+  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE = 5;
 }
 
 message BluetoothDeviceRequest {
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index d56f4e7a40..aac58587d1 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -950,7 +950,7 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
   resp.webserver_port = USE_WEBSERVER_PORT;
 #endif
 #ifdef USE_BLUETOOTH_PROXY
-  resp.bluetooth_proxy_version = bluetooth_proxy::global_bluetooth_proxy->has_active() ? 2 : 1;
+  resp.bluetooth_proxy_version = bluetooth_proxy::global_bluetooth_proxy->has_active() ? 3 : 1;
 #endif
   return resp;
 }
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index e82a77974e..1401cc00f7 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -6,6 +6,7 @@
 namespace esphome {
 namespace api {
 
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::EntityCategory>(enums::EntityCategory value) {
   switch (value) {
     case enums::ENTITY_CATEGORY_NONE:
@@ -351,10 +352,15 @@ const char *proto_enum_to_string<enums::BluetoothDeviceRequestType>(enums::Bluet
       return "BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR";
     case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR:
       return "BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR";
+    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE:
+      return "BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE";
+    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE:
+      return "BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE";
     default:
       return "UNKNOWN";
   }
 }
+#endif
 bool HelloRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 2: {
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 67ffa5c2dd..8a78f1ad03 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -160,6 +160,8 @@ enum BluetoothDeviceRequestType : uint32_t {
   BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT = 1,
   BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR = 2,
   BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR = 3,
+  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE = 4,
+  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE = 5,
 };
 
 }  // namespace enums
diff --git a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
index 488d56bc95..09611b6174 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
@@ -34,6 +34,10 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
         this->set_address(0);
         api::global_api_server->send_bluetooth_connections_free(this->proxy_->get_bluetooth_connections_free(),
                                                                 this->proxy_->get_bluetooth_connections_limit());
+      } else if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE) {
+        api::global_api_server->send_bluetooth_device_connection(this->address_, true, this->mtu_);
+        api::global_api_server->send_bluetooth_connections_free(this->proxy_->get_bluetooth_connections_free(),
+                                                                this->proxy_->get_bluetooth_connections_limit());
       }
       this->seen_mtu_or_services_ = false;
       break;
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index 567874e5a2..fe873665e8 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -80,6 +80,10 @@ void BluetoothProxy::loop() {
     if (connection->send_service_ == connection->services_.size()) {
       connection->send_service_ = -1;
       api::global_api_server->send_bluetooth_gatt_services_done(connection->get_address());
+      if (connection->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE ||
+          connection->connection_type_ == espbt::ConnectionType::V3_WITHOUT_CACHE) {
+        connection->release_services();
+      }
     } else if (connection->send_service_ >= 0) {
       auto &service = connection->services_[connection->send_service_];
       api::BluetoothGATTGetServicesResponse resp;
@@ -171,6 +175,8 @@ BluetoothConnection *BluetoothProxy::get_connection_(uint64_t address, bool rese
 
 void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest &msg) {
   switch (msg.request_type) {
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE:
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE:
     case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT: {
       auto *connection = this->get_connection_(msg.address, true);
       if (connection == nullptr) {
@@ -186,11 +192,43 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
         api::global_api_server->send_bluetooth_connections_free(this->get_bluetooth_connections_free(),
                                                                 this->get_bluetooth_connections_limit());
         return;
+      } else if (connection->state() == espbt::ClientState::SEARCHING) {
+        ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, already searching for device",
+                 connection->get_connection_index(), connection->address_str().c_str());
+        return;
+      } else if (connection->state() == espbt::ClientState::DISCOVERED) {
+        ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, device already discovered",
+                 connection->get_connection_index(), connection->address_str().c_str());
+        return;
+      } else if (connection->state() == espbt::ClientState::READY_TO_CONNECT) {
+        ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, waiting in line to connect",
+                 connection->get_connection_index(), connection->address_str().c_str());
+        return;
+      } else if (connection->state() == espbt::ClientState::CONNECTING) {
+        ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, already connecting", connection->get_connection_index(),
+                 connection->address_str().c_str());
+        return;
+      } else if (connection->state() == espbt::ClientState::DISCONNECTING) {
+        ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, device is disconnecting",
+                 connection->get_connection_index(), connection->address_str().c_str());
+        return;
       } else if (connection->state() != espbt::ClientState::INIT) {
         ESP_LOGW(TAG, "[%d] [%s] Connection already in progress", connection->get_connection_index(),
                  connection->address_str().c_str());
         return;
       }
+      if (msg.request_type == api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE) {
+        connection->set_connection_type(espbt::ConnectionType::V3_WITH_CACHE);
+        ESP_LOGI(TAG, "[%d] [%s] Connecting v3 with cache", connection->get_connection_index(),
+                 connection->address_str().c_str());
+      } else if (msg.request_type == api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE) {
+        connection->set_connection_type(espbt::ConnectionType::V3_WITHOUT_CACHE);
+        ESP_LOGI(TAG, "[%d] [%s] Connecting v3 without cache", connection->get_connection_index(),
+                 connection->address_str().c_str());
+      } else {
+        connection->set_connection_type(espbt::ConnectionType::V1);
+        ESP_LOGI(TAG, "[%d] [%s] Connecting v1", connection->get_connection_index(), connection->address_str().c_str());
+      }
       if (msg.has_address_type) {
         connection->remote_bda_[0] = (msg.address >> 40) & 0xFF;
         connection->remote_bda_[1] = (msg.address >> 32) & 0xFF;
diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 065d56e5fb..74f030dafd 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -129,6 +129,11 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
         this->set_state(espbt::ClientState::IDLE);
         break;
       }
+      if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE) {
+        this->set_state(espbt::ClientState::CONNECTED);
+        this->state_ = espbt::ClientState::ESTABLISHED;
+        break;
+      }
       auto ret = esp_ble_gattc_send_mtu_req(this->gattc_if_, param->open.conn_id);
       if (ret) {
         ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_send_mtu_req failed, status=%x", this->connection_index_,
@@ -180,6 +185,12 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       break;
     }
     case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
+      if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE ||
+          this->connection_type_ == espbt::ConnectionType::V3_WITHOUT_CACHE) {
+        // Client is responsible for flipping the descriptor value
+        // when using the cache
+        break;
+      }
       esp_gattc_descr_elem_t desc_result;
       uint16_t count = 1;
       esp_gatt_status_t descr_status =
diff --git a/esphome/components/esp32_ble_client/ble_client_base.h b/esphome/components/esp32_ble_client/ble_client_base.h
index 7dd740b703..f536c24d98 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.h
+++ b/esphome/components/esp32_ble_client/ble_client_base.h
@@ -74,6 +74,8 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
 
   uint8_t get_connection_index() const { return this->connection_index_; }
 
+  virtual void set_connection_type(espbt::ConnectionType ct) { this->connection_type_ = ct; }
+
  protected:
   int gattc_if_;
   esp_bd_addr_t remote_bda_;
@@ -83,6 +85,7 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
   std::string address_str_{};
   uint8_t connection_index_;
   uint16_t mtu_{23};
+  espbt::ConnectionType connection_type_{espbt::ConnectionType::V1};
 
   std::vector<BLEService *> services_;
 };
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 0e980e9923..9052e620cf 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -165,6 +165,18 @@ enum class ClientState {
   ESTABLISHED,
 };
 
+enum class ConnectionType {
+  // The default connection type, we hold all the services in ram
+  // for the duration of the connection.
+  V1,
+  // The client has a cache of the services and mtu so we should not
+  // fetch them again
+  V3_WITH_CACHE,
+  // The client does not need the services and mtu once we send them
+  // so we should wipe them from memory as soon as we send them
+  V3_WITHOUT_CACHE
+};
+
 class ESPBTClient : public ESPBTDeviceListener {
  public:
   virtual bool gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,

From eb664b99badc3643bd6379fea8a3dad0baf71e89 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 30 Nov 2022 08:30:00 +1300
Subject: [PATCH 318/838] preprocess out proto_enum_to_string if not needed
 (#4119)

---
 esphome/components/api/api_pb2.cpp  | 42 +++++++++++++++++++++++++++++
 script/api_protobuf/api_protobuf.py |  4 ++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 1401cc00f7..f108d38e8f 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -19,6 +19,8 @@ template<> const char *proto_enum_to_string<enums::EntityCategory>(enums::Entity
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::LegacyCoverState>(enums::LegacyCoverState value) {
   switch (value) {
     case enums::LEGACY_COVER_STATE_OPEN:
@@ -29,6 +31,8 @@ template<> const char *proto_enum_to_string<enums::LegacyCoverState>(enums::Lega
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::CoverOperation>(enums::CoverOperation value) {
   switch (value) {
     case enums::COVER_OPERATION_IDLE:
@@ -41,6 +45,8 @@ template<> const char *proto_enum_to_string<enums::CoverOperation>(enums::CoverO
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::LegacyCoverCommand>(enums::LegacyCoverCommand value) {
   switch (value) {
     case enums::LEGACY_COVER_COMMAND_OPEN:
@@ -53,6 +59,8 @@ template<> const char *proto_enum_to_string<enums::LegacyCoverCommand>(enums::Le
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::FanSpeed>(enums::FanSpeed value) {
   switch (value) {
     case enums::FAN_SPEED_LOW:
@@ -65,6 +73,8 @@ template<> const char *proto_enum_to_string<enums::FanSpeed>(enums::FanSpeed val
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::FanDirection>(enums::FanDirection value) {
   switch (value) {
     case enums::FAN_DIRECTION_FORWARD:
@@ -75,6 +85,8 @@ template<> const char *proto_enum_to_string<enums::FanDirection>(enums::FanDirec
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::ColorMode>(enums::ColorMode value) {
   switch (value) {
     case enums::COLOR_MODE_UNKNOWN:
@@ -101,6 +113,8 @@ template<> const char *proto_enum_to_string<enums::ColorMode>(enums::ColorMode v
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::SensorStateClass>(enums::SensorStateClass value) {
   switch (value) {
     case enums::STATE_CLASS_NONE:
@@ -115,6 +129,8 @@ template<> const char *proto_enum_to_string<enums::SensorStateClass>(enums::Sens
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::SensorLastResetType>(enums::SensorLastResetType value) {
   switch (value) {
     case enums::LAST_RESET_NONE:
@@ -127,6 +143,8 @@ template<> const char *proto_enum_to_string<enums::SensorLastResetType>(enums::S
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::LogLevel>(enums::LogLevel value) {
   switch (value) {
     case enums::LOG_LEVEL_NONE:
@@ -149,6 +167,8 @@ template<> const char *proto_enum_to_string<enums::LogLevel>(enums::LogLevel val
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::ServiceArgType>(enums::ServiceArgType value) {
   switch (value) {
     case enums::SERVICE_ARG_TYPE_BOOL:
@@ -171,6 +191,8 @@ template<> const char *proto_enum_to_string<enums::ServiceArgType>(enums::Servic
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::ClimateMode>(enums::ClimateMode value) {
   switch (value) {
     case enums::CLIMATE_MODE_OFF:
@@ -191,6 +213,8 @@ template<> const char *proto_enum_to_string<enums::ClimateMode>(enums::ClimateMo
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::ClimateFanMode>(enums::ClimateFanMode value) {
   switch (value) {
     case enums::CLIMATE_FAN_ON:
@@ -215,6 +239,8 @@ template<> const char *proto_enum_to_string<enums::ClimateFanMode>(enums::Climat
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::ClimateSwingMode>(enums::ClimateSwingMode value) {
   switch (value) {
     case enums::CLIMATE_SWING_OFF:
@@ -229,6 +255,8 @@ template<> const char *proto_enum_to_string<enums::ClimateSwingMode>(enums::Clim
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::ClimateAction>(enums::ClimateAction value) {
   switch (value) {
     case enums::CLIMATE_ACTION_OFF:
@@ -247,6 +275,8 @@ template<> const char *proto_enum_to_string<enums::ClimateAction>(enums::Climate
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::ClimatePreset>(enums::ClimatePreset value) {
   switch (value) {
     case enums::CLIMATE_PRESET_NONE:
@@ -269,6 +299,8 @@ template<> const char *proto_enum_to_string<enums::ClimatePreset>(enums::Climate
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::NumberMode>(enums::NumberMode value) {
   switch (value) {
     case enums::NUMBER_MODE_AUTO:
@@ -281,6 +313,8 @@ template<> const char *proto_enum_to_string<enums::NumberMode>(enums::NumberMode
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::LockState>(enums::LockState value) {
   switch (value) {
     case enums::LOCK_STATE_NONE:
@@ -299,6 +333,8 @@ template<> const char *proto_enum_to_string<enums::LockState>(enums::LockState v
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::LockCommand>(enums::LockCommand value) {
   switch (value) {
     case enums::LOCK_UNLOCK:
@@ -311,6 +347,8 @@ template<> const char *proto_enum_to_string<enums::LockCommand>(enums::LockComma
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::MediaPlayerState>(enums::MediaPlayerState value) {
   switch (value) {
     case enums::MEDIA_PLAYER_STATE_NONE:
@@ -325,6 +363,8 @@ template<> const char *proto_enum_to_string<enums::MediaPlayerState>(enums::Medi
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<> const char *proto_enum_to_string<enums::MediaPlayerCommand>(enums::MediaPlayerCommand value) {
   switch (value) {
     case enums::MEDIA_PLAYER_COMMAND_PLAY:
@@ -341,6 +381,8 @@ template<> const char *proto_enum_to_string<enums::MediaPlayerCommand>(enums::Me
       return "UNKNOWN";
   }
 }
+#endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
 template<>
 const char *proto_enum_to_string<enums::BluetoothDeviceRequestType>(enums::BluetoothDeviceRequestType value) {
   switch (value) {
diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py
index ea57b0ddcd..dba6f47d43 100755
--- a/script/api_protobuf/api_protobuf.py
+++ b/script/api_protobuf/api_protobuf.py
@@ -546,7 +546,8 @@ def build_enum_type(desc):
         out += f"  {v.name} = {v.number},\n"
     out += "};\n"
 
-    cpp = f"template<> const char *proto_enum_to_string<enums::{name}>(enums::{name} value) {{\n"
+    cpp = f"#ifdef HAS_PROTO_MESSAGE_DUMP\n"
+    cpp += f"template<> const char *proto_enum_to_string<enums::{name}>(enums::{name} value) {{\n"
     cpp += f"  switch (value) {{\n"
     for v in desc.value:
         cpp += f"    case enums::{v.name}:\n"
@@ -555,6 +556,7 @@ def build_enum_type(desc):
     cpp += f'      return "UNKNOWN";\n'
     cpp += f"  }}\n"
     cpp += f"}}\n"
+    cpp += f"#endif\n"
 
     return out, cpp
 

From a6196267c9785102d1ffa92ebc5febfd9116e834 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Nov 2022 08:30:18 +1300
Subject: [PATCH 319/838] Bump aioesphomeapi from 12.0.0 to 12.2.0 (#4120)

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 d9814c55ce..1d50934c00 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.5  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
 esphome-dashboard==20221109.0
-aioesphomeapi==12.0.0
+aioesphomeapi==12.2.0
 zeroconf==0.39.4
 
 # esp-idf requires this, but doesn't bundle it by default

From a59ce7bfa268be1bb6dca157e80a7c97d03fa1cf Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 29 Nov 2022 10:40:31 -1000
Subject: [PATCH 320/838] Avoid parsing services with v3 connections without
 cache (#4117)

Co-authored-by: Daniel Cousens <413395+dcousens@users.noreply.github.com>
Co-authored-by: Maurice Makaay <account+github@makaay.nl>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .../bluetooth_proxy/bluetooth_connection.h    |  2 +-
 .../bluetooth_proxy/bluetooth_proxy.cpp       | 45 +++++++++++++------
 .../bluetooth_proxy/bluetooth_proxy.h         |  1 -
 .../esp32_ble_client/ble_client_base.cpp      |  7 +++
 .../esp32_ble_client/ble_client_base.h        |  1 +
 5 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/esphome/components/bluetooth_proxy/bluetooth_connection.h b/esphome/components/bluetooth_proxy/bluetooth_connection.h
index 43346ef3e7..fde074d17f 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.h
@@ -25,7 +25,7 @@ class BluetoothConnection : public esp32_ble_client::BLEClientBase {
   friend class BluetoothProxy;
   bool seen_mtu_or_services_{false};
 
-  int16_t send_service_{-1};
+  int16_t send_service_{-2};
   BluetoothProxy *proxy_;
 };
 
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index fe873665e8..629ff41da6 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -10,6 +10,7 @@ namespace esphome {
 namespace bluetooth_proxy {
 
 static const char *const TAG = "bluetooth_proxy";
+static const int DONE_SENDING_SERVICES = -2;
 
 BluetoothProxy::BluetoothProxy() { global_bluetooth_proxy = this; }
 
@@ -77,32 +78,49 @@ void BluetoothProxy::loop() {
     return;
   }
   for (auto *connection : this->connections_) {
-    if (connection->send_service_ == connection->services_.size()) {
-      connection->send_service_ = -1;
+    if (connection->send_service_ == connection->service_count_) {
+      connection->send_service_ = DONE_SENDING_SERVICES;
       api::global_api_server->send_bluetooth_gatt_services_done(connection->get_address());
       if (connection->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE ||
           connection->connection_type_ == espbt::ConnectionType::V3_WITHOUT_CACHE) {
         connection->release_services();
       }
     } else if (connection->send_service_ >= 0) {
-      auto &service = connection->services_[connection->send_service_];
+      esp_gattc_service_elem_t service_result;
+      uint16_t service_count = 1;
+      esp_gatt_status_t service_status =
+          esp_ble_gattc_get_service(connection->get_gattc_if(), connection->get_conn_id(), nullptr, &service_result,
+                                    &service_count, connection->send_service_);
+      connection->send_service_++;
+      if (service_status != ESP_GATT_OK) {
+        ESP_LOGE(TAG, "[%d] [%s] esp_ble_gattc_get_service error at offset=%d, status=%d",
+                 connection->get_connection_index(), connection->address_str().c_str(), connection->send_service_ - 1,
+                 service_status);
+        continue;
+      }
+      if (service_count == 0) {
+        ESP_LOGE(TAG, "[%d] [%s] esp_ble_gattc_get_service missing, service_count=%d",
+                 connection->get_connection_index(), connection->address_str().c_str(), service_count);
+        continue;
+      }
       api::BluetoothGATTGetServicesResponse resp;
       resp.address = connection->get_address();
       api::BluetoothGATTService service_resp;
-      service_resp.uuid = {service->uuid.get_128bit_high(), service->uuid.get_128bit_low()};
-      service_resp.handle = service->start_handle;
+      auto service_uuid = espbt::ESPBTUUID::from_uuid(service_result.uuid);
+      service_resp.uuid = {service_uuid.get_128bit_high(), service_uuid.get_128bit_low()};
+      service_resp.handle = service_result.start_handle;
       uint16_t char_offset = 0;
       esp_gattc_char_elem_t char_result;
       while (true) {  // characteristics
         uint16_t char_count = 1;
-        esp_gatt_status_t char_status =
-            esp_ble_gattc_get_all_char(connection->get_gattc_if(), connection->get_conn_id(), service->start_handle,
-                                       service->end_handle, &char_result, &char_count, char_offset);
+        esp_gatt_status_t char_status = esp_ble_gattc_get_all_char(
+            connection->get_gattc_if(), connection->get_conn_id(), service_result.start_handle,
+            service_result.end_handle, &char_result, &char_count, char_offset);
         if (char_status == ESP_GATT_INVALID_OFFSET || char_status == ESP_GATT_NOT_FOUND) {
           break;
         }
         if (char_status != ESP_GATT_OK) {
-          ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_get_all_char error, status=%d", connection->get_connection_index(),
+          ESP_LOGE(TAG, "[%d] [%s] esp_ble_gattc_get_all_char error, status=%d", connection->get_connection_index(),
                    connection->address_str().c_str(), char_status);
           break;
         }
@@ -126,7 +144,7 @@ void BluetoothProxy::loop() {
             break;
           }
           if (desc_status != ESP_GATT_OK) {
-            ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_get_all_descr error, status=%d", connection->get_connection_index(),
+            ESP_LOGE(TAG, "[%d] [%s] esp_ble_gattc_get_all_descr error, status=%d", connection->get_connection_index(),
                      connection->address_str().c_str(), desc_status);
             break;
           }
@@ -144,7 +162,6 @@ void BluetoothProxy::loop() {
       }
       resp.services.push_back(std::move(service_resp));
       api::global_api_server->send_bluetooth_gatt_services(resp);
-      connection->send_service_++;
     }
   }
 }
@@ -160,6 +177,7 @@ BluetoothConnection *BluetoothProxy::get_connection_(uint64_t address, bool rese
 
   for (auto *connection : this->connections_) {
     if (connection->get_address() == 0) {
+      connection->send_service_ = DONE_SENDING_SERVICES;
       connection->set_address(address);
       // All connections must start at INIT
       // We only set the state if we allocate the connection
@@ -332,12 +350,13 @@ void BluetoothProxy::bluetooth_gatt_send_services(const api::BluetoothGATTGetSer
     api::global_api_server->send_bluetooth_gatt_error(msg.address, 0, ESP_GATT_NOT_CONNECTED);
     return;
   }
-  if (connection->services_.empty()) {
+  if (!connection->service_count_) {
     ESP_LOGW(TAG, "[%d] [%s] No GATT services found", connection->connection_index_, connection->address_str().c_str());
     api::global_api_server->send_bluetooth_gatt_services_done(msg.address);
     return;
   }
-  if (connection->send_service_ == -1)  // Don't start sending services again if we're already sending them
+  if (connection->send_service_ ==
+      DONE_SENDING_SERVICES)  // Only start sending services if we're not already sending them
     connection->send_service_ = 0;
 }
 
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.h b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
index b1353b13da..5d3b385bec 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -52,7 +52,6 @@ class BluetoothProxy : public esp32_ble_tracker::ESPBTDeviceListener, public Com
 
   BluetoothConnection *get_connection_(uint64_t address, bool reserve);
 
-  int16_t send_service_{-1};
   bool active_;
 
   std::vector<BluetoothConnection *> connections_{};
diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 74f030dafd..658f6c464e 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -123,6 +123,7 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
     case ESP_GATTC_OPEN_EVT: {
       ESP_LOGV(TAG, "[%d] [%s] ESP_GATTC_OPEN_EVT", this->connection_index_, this->address_str_.c_str());
       this->conn_id_ = param->open.conn_id;
+      this->service_count_ = 0;
       if (param->open.status != ESP_GATT_OK && param->open.status != ESP_GATT_ALREADY_OPEN) {
         ESP_LOGW(TAG, "[%d] [%s] Connection failed, status=%d", this->connection_index_, this->address_str_.c_str(),
                  param->open.status);
@@ -164,6 +165,12 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
       break;
     }
     case ESP_GATTC_SEARCH_RES_EVT: {
+      this->service_count_++;
+      if (this->connection_type_ == espbt::ConnectionType::V3_WITHOUT_CACHE) {
+        // V3 clients don't need services initialized since
+        // they only request by handle after receiving the services.
+        break;
+      }
       BLEService *ble_service = new BLEService();  // NOLINT(cppcoreguidelines-owning-memory)
       ble_service->uuid = espbt::ESPBTUUID::from_uuid(param->search_res.srvc_id.uuid);
       ble_service->start_handle = param->search_res.start_handle;
diff --git a/esphome/components/esp32_ble_client/ble_client_base.h b/esphome/components/esp32_ble_client/ble_client_base.h
index f536c24d98..9adf239512 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.h
+++ b/esphome/components/esp32_ble_client/ble_client_base.h
@@ -84,6 +84,7 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
   uint64_t address_{0};
   std::string address_str_{};
   uint8_t connection_index_;
+  int16_t service_count_{0};
   uint16_t mtu_{23};
   espbt::ConnectionType connection_type_{espbt::ConnectionType::V1};
 

From c55e01ff3f0f1b62cf1cea0612867f0c2453c3ee Mon Sep 17 00:00:00 2001
From: Javier Peletier <jpeletier@users.noreply.github.com>
Date: Tue, 29 Nov 2022 22:05:40 +0100
Subject: [PATCH 321/838] FIX: Unnecessary flash writes by ModbusSwitch
 component (#3648)

---
 esphome/components/gpio/switch/__init__.py    | 17 +------
 .../components/gpio/switch/gpio_switch.cpp    | 45 +----------------
 esphome/components/gpio/switch/gpio_switch.h  | 12 -----
 .../modbus_controller/switch/__init__.py      |  2 +-
 .../switch/modbus_switch.cpp                  |  6 +--
 esphome/components/output/switch/__init__.py  | 16 +-----
 .../output/switch/output_switch.cpp           | 24 ++-------
 .../components/output/switch/output_switch.h  | 12 -----
 esphome/components/switch/__init__.py         | 30 +++++++++++-
 esphome/components/switch/switch.cpp          | 45 ++++++++++++++++-
 esphome/components/switch/switch.h            | 49 +++++++++++++------
 11 files changed, 114 insertions(+), 144 deletions(-)

diff --git a/esphome/components/gpio/switch/__init__.py b/esphome/components/gpio/switch/__init__.py
index f81cd5b6fb..9da6870a46 100644
--- a/esphome/components/gpio/switch/__init__.py
+++ b/esphome/components/gpio/switch/__init__.py
@@ -2,20 +2,10 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import pins
 from esphome.components import switch
-from esphome.const import CONF_INTERLOCK, CONF_PIN, CONF_RESTORE_MODE
+from esphome.const import CONF_INTERLOCK, CONF_PIN
 from .. import gpio_ns
 
 GPIOSwitch = gpio_ns.class_("GPIOSwitch", switch.Switch, cg.Component)
-GPIOSwitchRestoreMode = gpio_ns.enum("GPIOSwitchRestoreMode")
-
-RESTORE_MODES = {
-    "RESTORE_DEFAULT_OFF": GPIOSwitchRestoreMode.GPIO_SWITCH_RESTORE_DEFAULT_OFF,
-    "RESTORE_DEFAULT_ON": GPIOSwitchRestoreMode.GPIO_SWITCH_RESTORE_DEFAULT_ON,
-    "ALWAYS_OFF": GPIOSwitchRestoreMode.GPIO_SWITCH_ALWAYS_OFF,
-    "ALWAYS_ON": GPIOSwitchRestoreMode.GPIO_SWITCH_ALWAYS_ON,
-    "RESTORE_INVERTED_DEFAULT_OFF": GPIOSwitchRestoreMode.GPIO_SWITCH_RESTORE_INVERTED_DEFAULT_OFF,
-    "RESTORE_INVERTED_DEFAULT_ON": GPIOSwitchRestoreMode.GPIO_SWITCH_RESTORE_INVERTED_DEFAULT_ON,
-}
 
 CONF_INTERLOCK_WAIT_TIME = "interlock_wait_time"
 CONFIG_SCHEMA = (
@@ -23,9 +13,6 @@ CONFIG_SCHEMA = (
     .extend(
         {
             cv.Required(CONF_PIN): pins.gpio_output_pin_schema,
-            cv.Optional(CONF_RESTORE_MODE, default="RESTORE_DEFAULT_OFF"): cv.enum(
-                RESTORE_MODES, upper=True, space="_"
-            ),
             cv.Optional(CONF_INTERLOCK): cv.ensure_list(cv.use_id(switch.Switch)),
             cv.Optional(
                 CONF_INTERLOCK_WAIT_TIME, default="0ms"
@@ -43,8 +30,6 @@ async def to_code(config):
     pin = await cg.gpio_pin_expression(config[CONF_PIN])
     cg.add(var.set_pin(pin))
 
-    cg.add(var.set_restore_mode(config[CONF_RESTORE_MODE]))
-
     if CONF_INTERLOCK in config:
         interlock = []
         for it in config[CONF_INTERLOCK]:
diff --git a/esphome/components/gpio/switch/gpio_switch.cpp b/esphome/components/gpio/switch/gpio_switch.cpp
index 714f2ea6d8..3085fa33dc 100644
--- a/esphome/components/gpio/switch/gpio_switch.cpp
+++ b/esphome/components/gpio/switch/gpio_switch.cpp
@@ -10,27 +10,7 @@ float GPIOSwitch::get_setup_priority() const { return setup_priority::HARDWARE;
 void GPIOSwitch::setup() {
   ESP_LOGCONFIG(TAG, "Setting up GPIO Switch '%s'...", this->name_.c_str());
 
-  bool initial_state = false;
-  switch (this->restore_mode_) {
-    case GPIO_SWITCH_RESTORE_DEFAULT_OFF:
-      initial_state = this->get_initial_state().value_or(false);
-      break;
-    case GPIO_SWITCH_RESTORE_DEFAULT_ON:
-      initial_state = this->get_initial_state().value_or(true);
-      break;
-    case GPIO_SWITCH_RESTORE_INVERTED_DEFAULT_OFF:
-      initial_state = !this->get_initial_state().value_or(true);
-      break;
-    case GPIO_SWITCH_RESTORE_INVERTED_DEFAULT_ON:
-      initial_state = !this->get_initial_state().value_or(false);
-      break;
-    case GPIO_SWITCH_ALWAYS_OFF:
-      initial_state = false;
-      break;
-    case GPIO_SWITCH_ALWAYS_ON:
-      initial_state = true;
-      break;
-  }
+  bool initial_state = Switch::get_initial_state_with_restore_mode();
 
   // write state before setup
   if (initial_state) {
@@ -49,28 +29,6 @@ void GPIOSwitch::setup() {
 void GPIOSwitch::dump_config() {
   LOG_SWITCH("", "GPIO Switch", this);
   LOG_PIN("  Pin: ", this->pin_);
-  const LogString *restore_mode = LOG_STR("");
-  switch (this->restore_mode_) {
-    case GPIO_SWITCH_RESTORE_DEFAULT_OFF:
-      restore_mode = LOG_STR("Restore (Defaults to OFF)");
-      break;
-    case GPIO_SWITCH_RESTORE_DEFAULT_ON:
-      restore_mode = LOG_STR("Restore (Defaults to ON)");
-      break;
-    case GPIO_SWITCH_RESTORE_INVERTED_DEFAULT_ON:
-      restore_mode = LOG_STR("Restore inverted (Defaults to ON)");
-      break;
-    case GPIO_SWITCH_RESTORE_INVERTED_DEFAULT_OFF:
-      restore_mode = LOG_STR("Restore inverted (Defaults to OFF)");
-      break;
-    case GPIO_SWITCH_ALWAYS_OFF:
-      restore_mode = LOG_STR("Always OFF");
-      break;
-    case GPIO_SWITCH_ALWAYS_ON:
-      restore_mode = LOG_STR("Always ON");
-      break;
-  }
-  ESP_LOGCONFIG(TAG, "  Restore Mode: %s", LOG_STR_ARG(restore_mode));
   if (!this->interlock_.empty()) {
     ESP_LOGCONFIG(TAG, "  Interlocks:");
     for (auto *lock : this->interlock_) {
@@ -111,7 +69,6 @@ void GPIOSwitch::write_state(bool state) {
   this->pin_->digital_write(state);
   this->publish_state(state);
 }
-void GPIOSwitch::set_restore_mode(GPIOSwitchRestoreMode restore_mode) { this->restore_mode_ = restore_mode; }
 void GPIOSwitch::set_interlock(const std::vector<Switch *> &interlock) { this->interlock_ = interlock; }
 
 }  // namespace gpio
diff --git a/esphome/components/gpio/switch/gpio_switch.h b/esphome/components/gpio/switch/gpio_switch.h
index b28ba3a851..94d49745b5 100644
--- a/esphome/components/gpio/switch/gpio_switch.h
+++ b/esphome/components/gpio/switch/gpio_switch.h
@@ -9,21 +9,10 @@
 namespace esphome {
 namespace gpio {
 
-enum GPIOSwitchRestoreMode {
-  GPIO_SWITCH_RESTORE_DEFAULT_OFF,
-  GPIO_SWITCH_RESTORE_DEFAULT_ON,
-  GPIO_SWITCH_ALWAYS_OFF,
-  GPIO_SWITCH_ALWAYS_ON,
-  GPIO_SWITCH_RESTORE_INVERTED_DEFAULT_OFF,
-  GPIO_SWITCH_RESTORE_INVERTED_DEFAULT_ON,
-};
-
 class GPIOSwitch : public switch_::Switch, public Component {
  public:
   void set_pin(GPIOPin *pin) { pin_ = pin; }
 
-  void set_restore_mode(GPIOSwitchRestoreMode restore_mode);
-
   // ========== INTERNAL METHODS ==========
   // (In most use cases you won't need these)
   float get_setup_priority() const override;
@@ -37,7 +26,6 @@ class GPIOSwitch : public switch_::Switch, public Component {
   void write_state(bool state) override;
 
   GPIOPin *pin_;
-  GPIOSwitchRestoreMode restore_mode_{GPIO_SWITCH_RESTORE_DEFAULT_OFF};
   std::vector<Switch *> interlock_;
   uint32_t interlock_wait_time_{0};
 };
diff --git a/esphome/components/modbus_controller/switch/__init__.py b/esphome/components/modbus_controller/switch/__init__.py
index 9673a066e3..9490325968 100644
--- a/esphome/components/modbus_controller/switch/__init__.py
+++ b/esphome/components/modbus_controller/switch/__init__.py
@@ -32,7 +32,7 @@ ModbusSwitch = modbus_controller_ns.class_(
 )
 
 CONFIG_SCHEMA = cv.All(
-    switch.switch_schema(ModbusSwitch)
+    switch.switch_schema(ModbusSwitch, default_restore_mode="DISABLED")
     .extend(cv.COMPONENT_SCHEMA)
     .extend(ModbusItemBaseSchema)
     .extend(
diff --git a/esphome/components/modbus_controller/switch/modbus_switch.cpp b/esphome/components/modbus_controller/switch/modbus_switch.cpp
index ca8d0be720..dd12e2867f 100644
--- a/esphome/components/modbus_controller/switch/modbus_switch.cpp
+++ b/esphome/components/modbus_controller/switch/modbus_switch.cpp
@@ -6,11 +6,7 @@ namespace modbus_controller {
 
 static const char *const TAG = "modbus_controller.switch";
 
-void ModbusSwitch::setup() {
-  // value isn't required
-  // without it we crash on save
-  this->get_initial_state();
-}
+void ModbusSwitch::setup() {}
 void ModbusSwitch::dump_config() { LOG_SWITCH(TAG, "Modbus Controller Switch", this); }
 
 void ModbusSwitch::parse_and_publish(const std::vector<uint8_t> &data) {
diff --git a/esphome/components/output/switch/__init__.py b/esphome/components/output/switch/__init__.py
index 3a23c1e33f..f5325643a7 100644
--- a/esphome/components/output/switch/__init__.py
+++ b/esphome/components/output/switch/__init__.py
@@ -1,29 +1,19 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import output, switch
-from esphome.const import CONF_OUTPUT, CONF_RESTORE_MODE
+from esphome.const import CONF_OUTPUT
 from .. import output_ns
 
 OutputSwitch = output_ns.class_("OutputSwitch", switch.Switch, cg.Component)
 
 OutputSwitchRestoreMode = output_ns.enum("OutputSwitchRestoreMode")
-RESTORE_MODES = {
-    "RESTORE_DEFAULT_OFF": OutputSwitchRestoreMode.OUTPUT_SWITCH_RESTORE_DEFAULT_OFF,
-    "RESTORE_DEFAULT_ON": OutputSwitchRestoreMode.OUTPUT_SWITCH_RESTORE_DEFAULT_ON,
-    "ALWAYS_OFF": OutputSwitchRestoreMode.OUTPUT_SWITCH_ALWAYS_OFF,
-    "ALWAYS_ON": OutputSwitchRestoreMode.OUTPUT_SWITCH_ALWAYS_ON,
-    "RESTORE_INVERTED_DEFAULT_OFF": OutputSwitchRestoreMode.OUTPUT_SWITCH_RESTORE_INVERTED_DEFAULT_OFF,
-    "RESTORE_INVERTED_DEFAULT_ON": OutputSwitchRestoreMode.OUTPUT_SWITCH_RESTORE_INVERTED_DEFAULT_ON,
-}
+
 
 CONFIG_SCHEMA = (
     switch.switch_schema(OutputSwitch)
     .extend(
         {
             cv.Required(CONF_OUTPUT): cv.use_id(output.BinaryOutput),
-            cv.Optional(CONF_RESTORE_MODE, default="RESTORE_DEFAULT_OFF"): cv.enum(
-                RESTORE_MODES, upper=True, space="_"
-            ),
         }
     )
     .extend(cv.COMPONENT_SCHEMA)
@@ -36,5 +26,3 @@ async def to_code(config):
 
     output_ = await cg.get_variable(config[CONF_OUTPUT])
     cg.add(var.set_output(output_))
-
-    cg.add(var.set_restore_mode(config[CONF_RESTORE_MODE]))
diff --git a/esphome/components/output/switch/output_switch.cpp b/esphome/components/output/switch/output_switch.cpp
index ec9c8afc01..7254451370 100644
--- a/esphome/components/output/switch/output_switch.cpp
+++ b/esphome/components/output/switch/output_switch.cpp
@@ -8,27 +8,9 @@ static const char *const TAG = "output.switch";
 
 void OutputSwitch::dump_config() { LOG_SWITCH("", "Output Switch", this); }
 void OutputSwitch::setup() {
-  bool initial_state = false;
-  switch (this->restore_mode_) {
-    case OUTPUT_SWITCH_RESTORE_DEFAULT_OFF:
-      initial_state = this->get_initial_state().value_or(false);
-      break;
-    case OUTPUT_SWITCH_RESTORE_DEFAULT_ON:
-      initial_state = this->get_initial_state().value_or(true);
-      break;
-    case OUTPUT_SWITCH_RESTORE_INVERTED_DEFAULT_OFF:
-      initial_state = !this->get_initial_state().value_or(true);
-      break;
-    case OUTPUT_SWITCH_RESTORE_INVERTED_DEFAULT_ON:
-      initial_state = !this->get_initial_state().value_or(false);
-      break;
-    case OUTPUT_SWITCH_ALWAYS_OFF:
-      initial_state = false;
-      break;
-    case OUTPUT_SWITCH_ALWAYS_ON:
-      initial_state = true;
-      break;
-  }
+  ESP_LOGCONFIG(TAG, "Setting up Output Switch '%s'...", this->name_.c_str());
+
+  bool initial_state = Switch::get_initial_state_with_restore_mode();
 
   if (initial_state) {
     this->turn_on();
diff --git a/esphome/components/output/switch/output_switch.h b/esphome/components/output/switch/output_switch.h
index fc2c110662..a184a342fe 100644
--- a/esphome/components/output/switch/output_switch.h
+++ b/esphome/components/output/switch/output_switch.h
@@ -7,21 +7,10 @@
 namespace esphome {
 namespace output {
 
-enum OutputSwitchRestoreMode {
-  OUTPUT_SWITCH_RESTORE_DEFAULT_OFF,
-  OUTPUT_SWITCH_RESTORE_DEFAULT_ON,
-  OUTPUT_SWITCH_ALWAYS_OFF,
-  OUTPUT_SWITCH_ALWAYS_ON,
-  OUTPUT_SWITCH_RESTORE_INVERTED_DEFAULT_OFF,
-  OUTPUT_SWITCH_RESTORE_INVERTED_DEFAULT_ON,
-};
-
 class OutputSwitch : public switch_::Switch, public Component {
  public:
   void set_output(BinaryOutput *output) { output_ = output; }
 
-  void set_restore_mode(OutputSwitchRestoreMode restore_mode) { restore_mode_ = restore_mode; }
-
   void setup() override;
   float get_setup_priority() const override { return setup_priority::HARDWARE - 1.0f; }
   void dump_config() override;
@@ -30,7 +19,6 @@ class OutputSwitch : public switch_::Switch, public Component {
   void write_state(bool state) override;
 
   output::BinaryOutput *output_;
-  OutputSwitchRestoreMode restore_mode_;
 };
 
 }  // namespace output
diff --git a/esphome/components/switch/__init__.py b/esphome/components/switch/__init__.py
index 336c7d38d6..c9bf81982a 100644
--- a/esphome/components/switch/__init__.py
+++ b/esphome/components/switch/__init__.py
@@ -12,6 +12,7 @@ from esphome.const import (
     CONF_MQTT_ID,
     CONF_ON_TURN_OFF,
     CONF_ON_TURN_ON,
+    CONF_RESTORE_MODE,
     CONF_TRIGGER_ID,
     DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_OUTLET,
@@ -33,6 +34,19 @@ switch_ns = cg.esphome_ns.namespace("switch_")
 Switch = switch_ns.class_("Switch", cg.EntityBase)
 SwitchPtr = Switch.operator("ptr")
 
+SwitchRestoreMode = switch_ns.enum("SwitchRestoreMode")
+
+RESTORE_MODES = {
+    "RESTORE_DEFAULT_OFF": SwitchRestoreMode.SWITCH_RESTORE_DEFAULT_OFF,
+    "RESTORE_DEFAULT_ON": SwitchRestoreMode.SWITCH_RESTORE_DEFAULT_ON,
+    "ALWAYS_OFF": SwitchRestoreMode.SWITCH_ALWAYS_OFF,
+    "ALWAYS_ON": SwitchRestoreMode.SWITCH_ALWAYS_ON,
+    "RESTORE_INVERTED_DEFAULT_OFF": SwitchRestoreMode.SWITCH_RESTORE_INVERTED_DEFAULT_OFF,
+    "RESTORE_INVERTED_DEFAULT_ON": SwitchRestoreMode.SWITCH_RESTORE_INVERTED_DEFAULT_ON,
+    "DISABLED": SwitchRestoreMode.SWITCH_RESTORE_DISABLED,
+}
+
+
 ToggleAction = switch_ns.class_("ToggleAction", automation.Action)
 TurnOffAction = switch_ns.class_("TurnOffAction", automation.Action)
 TurnOnAction = switch_ns.class_("TurnOnAction", automation.Action)
@@ -50,7 +64,7 @@ SwitchTurnOffTrigger = switch_ns.class_(
 validate_device_class = cv.one_of(*DEVICE_CLASSES, lower=True)
 
 
-SWITCH_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).extend(
+_SWITCH_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).extend(
     {
         cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(mqtt.MQTTSwitchComponent),
         cv.Optional(CONF_INVERTED): cv.boolean,
@@ -78,8 +92,15 @@ def switch_schema(
     device_class: str = _UNDEF,
     icon: str = _UNDEF,
     block_inverted: bool = False,
+    default_restore_mode: str = "RESTORE_DEFAULT_OFF",
 ):
-    schema = SWITCH_SCHEMA
+    schema = _SWITCH_SCHEMA.extend(
+        {
+            cv.Optional(CONF_RESTORE_MODE, default=default_restore_mode): cv.enum(
+                RESTORE_MODES, upper=True, space="_"
+            ),
+        }
+    )
     if class_ is not _UNDEF:
         schema = schema.extend({cv.GenerateID(): cv.declare_id(class_)})
     if entity_category is not _UNDEF:
@@ -111,6 +132,9 @@ def switch_schema(
     return schema
 
 
+SWITCH_SCHEMA = switch_schema()  # for compatibility
+
+
 async def setup_switch_core_(var, config):
     await setup_entity(var, config)
 
@@ -130,6 +154,8 @@ async def setup_switch_core_(var, config):
     if CONF_DEVICE_CLASS in config:
         cg.add(var.set_device_class(config[CONF_DEVICE_CLASS]))
 
+    cg.add(var.set_restore_mode(config[CONF_RESTORE_MODE]))
+
 
 async def register_switch(var, config):
     if not CORE.has_id(config[CONF_ID]):
diff --git a/esphome/components/switch/switch.cpp b/esphome/components/switch/switch.cpp
index 099bd4819b..99df5091c3 100644
--- a/esphome/components/switch/switch.cpp
+++ b/esphome/components/switch/switch.cpp
@@ -22,18 +22,36 @@ void Switch::toggle() {
   this->write_state(this->inverted_ == this->state);
 }
 optional<bool> Switch::get_initial_state() {
+  if (!(restore_mode & RESTORE_MODE_PERSISTENT_MASK))
+    return {};
+
   this->rtc_ = global_preferences->make_preference<bool>(this->get_object_id_hash());
   bool initial_state;
   if (!this->rtc_.load(&initial_state))
     return {};
   return initial_state;
 }
+optional<bool> Switch::get_initial_state_with_restore_mode() {
+  if (restore_mode & RESTORE_MODE_DISABLED_MASK) {
+    return {};
+  }
+  bool initial_state = restore_mode & RESTORE_MODE_ON_MASK;
+  if (restore_mode & RESTORE_MODE_INVERTED_MASK)
+    initial_state = !initial_state;
+  if (restore_mode & RESTORE_MODE_PERSISTENT_MASK) {
+    initial_state = this->get_initial_state().value_or(initial_state);
+  }
+
+  return initial_state;
+}
 void Switch::publish_state(bool state) {
   if (!this->publish_dedup_.next(state))
     return;
   this->state = state != this->inverted_;
 
-  this->rtc_.save(&this->state);
+  if (restore_mode & RESTORE_MODE_PERSISTENT_MASK)
+    this->rtc_.save(&this->state);
+
   ESP_LOGD(TAG, "'%s': Sending state %s", this->name_.c_str(), ONOFF(this->state));
   this->state_callback_.call(this->state);
 }
@@ -52,5 +70,30 @@ std::string Switch::get_device_class() {
 }
 void Switch::set_device_class(const std::string &device_class) { this->device_class_ = device_class; }
 
+void log_switch(const char *tag, const char *prefix, const char *type, Switch *obj) {
+  if (obj != nullptr) {
+    ESP_LOGCONFIG(tag, "%s%s '%s'", prefix, type, obj->get_name().c_str());
+    if (!obj->get_icon().empty()) {
+      ESP_LOGCONFIG(tag, "%s  Icon: '%s'", prefix, obj->get_icon().c_str());
+    }
+    if (obj->assumed_state()) {
+      ESP_LOGCONFIG(tag, "%s  Assumed State: YES", prefix);
+    }
+    if (obj->is_inverted()) {
+      ESP_LOGCONFIG(tag, "%s  Inverted: YES", prefix);
+    }
+    if (!obj->get_device_class().empty()) {
+      ESP_LOGCONFIG(tag, "%s  Device Class: '%s'", prefix, obj->get_device_class().c_str());
+    }
+    const LogString *onoff = obj->restore_mode & RESTORE_MODE_ON_MASK ? LOG_STR("ON") : LOG_STR("OFF");
+    const LogString *inverted = obj->restore_mode & RESTORE_MODE_INVERTED_MASK ? LOG_STR("inverted ") : LOG_STR("");
+    const LogString *restore =
+        obj->restore_mode & RESTORE_MODE_PERSISTENT_MASK ? LOG_STR("restore defaults to") : LOG_STR("always");
+
+    ESP_LOGCONFIG(tag, "%s  Restore Mode: %s%s %s", prefix, LOG_STR_ARG(inverted), LOG_STR_ARG(restore),
+                  LOG_STR_ARG(onoff));
+  }
+}
+
 }  // namespace switch_
 }  // namespace esphome
diff --git a/esphome/components/switch/switch.h b/esphome/components/switch/switch.h
index c521c4024b..b89d8db6a5 100644
--- a/esphome/components/switch/switch.h
+++ b/esphome/components/switch/switch.h
@@ -8,22 +8,21 @@
 namespace esphome {
 namespace switch_ {
 
-#define LOG_SWITCH(prefix, type, obj) \
-  if ((obj) != nullptr) { \
-    ESP_LOGCONFIG(TAG, "%s%s '%s'", prefix, LOG_STR_LITERAL(type), (obj)->get_name().c_str()); \
-    if (!(obj)->get_icon().empty()) { \
-      ESP_LOGCONFIG(TAG, "%s  Icon: '%s'", prefix, (obj)->get_icon().c_str()); \
-    } \
-    if ((obj)->assumed_state()) { \
-      ESP_LOGCONFIG(TAG, "%s  Assumed State: YES", prefix); \
-    } \
-    if ((obj)->is_inverted()) { \
-      ESP_LOGCONFIG(TAG, "%s  Inverted: YES", prefix); \
-    } \
-    if (!(obj)->get_device_class().empty()) { \
-      ESP_LOGCONFIG(TAG, "%s  Device Class: '%s'", prefix, (obj)->get_device_class().c_str()); \
-    } \
-  }
+// bit0: on/off. bit1: persistent. bit2: inverted. bit3: disabled
+const int RESTORE_MODE_ON_MASK = 0x01;
+const int RESTORE_MODE_PERSISTENT_MASK = 0x02;
+const int RESTORE_MODE_INVERTED_MASK = 0x04;
+const int RESTORE_MODE_DISABLED_MASK = 0x08;
+
+enum SwitchRestoreMode {
+  SWITCH_ALWAYS_OFF = !RESTORE_MODE_ON_MASK,
+  SWITCH_ALWAYS_ON = RESTORE_MODE_ON_MASK,
+  SWITCH_RESTORE_DEFAULT_OFF = RESTORE_MODE_PERSISTENT_MASK,
+  SWITCH_RESTORE_DEFAULT_ON = RESTORE_MODE_PERSISTENT_MASK | RESTORE_MODE_ON_MASK,
+  SWITCH_RESTORE_INVERTED_DEFAULT_OFF = RESTORE_MODE_PERSISTENT_MASK | RESTORE_MODE_INVERTED_MASK,
+  SWITCH_RESTORE_INVERTED_DEFAULT_ON = RESTORE_MODE_PERSISTENT_MASK | RESTORE_MODE_INVERTED_MASK | RESTORE_MODE_ON_MASK,
+  SWITCH_RESTORE_DISABLED = RESTORE_MODE_DISABLED_MASK,
+};
 
 /** Base class for all switches.
  *
@@ -47,6 +46,9 @@ class Switch : public EntityBase {
   /// The current reported state of the binary sensor.
   bool state;
 
+  /// Indicates whether or not state is to be retrieved from flash and how
+  SwitchRestoreMode restore_mode{SWITCH_RESTORE_DEFAULT_OFF};
+
   /** Turn this switch on. This is called by the front-end.
    *
    * For implementing switches, please override write_state.
@@ -80,8 +82,19 @@ class Switch : public EntityBase {
    */
   void add_on_state_callback(std::function<void(bool)> &&callback);
 
+  /** Returns the initial state of the switch, as persisted previously,
+    or empty if never persisted.
+   */
   optional<bool> get_initial_state();
 
+  /** Returns the initial state of the switch, after applying restore mode rules.
+   * If restore mode is disabled, this function will return an optional with no value
+   * (.has_value() is false), leaving it up to the component to decide the state.
+   * For example, the component could read the state from hardware and determine the current
+   * state.
+   */
+  optional<bool> get_initial_state_with_restore_mode();
+
   /** Return whether this switch uses an assumed state - i.e. if both the ON/OFF actions should be displayed in Home
    * Assistant because the real state is unknown.
    *
@@ -95,6 +108,7 @@ class Switch : public EntityBase {
   std::string get_device_class();
   /// Set the Home Assistant device class for this switch.
   void set_device_class(const std::string &device_class);
+  void set_restore_mode(SwitchRestoreMode restore_mode) { this->restore_mode = restore_mode; }
 
  protected:
   /** Write the given state to hardware. You should implement this
@@ -114,5 +128,8 @@ class Switch : public EntityBase {
   optional<std::string> device_class_;
 };
 
+#define LOG_SWITCH(prefix, type, obj) log_switch((TAG), (prefix), LOG_STR_LITERAL(type), (obj))
+void log_switch(const char *tag, const char *prefix, const char *type, Switch *obj);
+
 }  // namespace switch_
 }  // namespace esphome

From 027284c29c4d2c119935f5d343bdb7ae6492502e Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 29 Nov 2022 11:11:48 -1000
Subject: [PATCH 322/838] Speed up uuid parsing when fetching the service list
 (#4121)

---
 .../bluetooth_proxy/bluetooth_proxy.cpp       | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index 629ff41da6..017e1bf83f 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -12,6 +12,18 @@ namespace bluetooth_proxy {
 static const char *const TAG = "bluetooth_proxy";
 static const int DONE_SENDING_SERVICES = -2;
 
+std::vector<uint64_t> get_128bit_uuid_vec(esp_bt_uuid_t uuid_source) {
+  esp_bt_uuid_t uuid = espbt::ESPBTUUID::from_uuid(uuid_source).as_128bit().get_uuid();
+  return std::vector<uint64_t>{((uint64_t) uuid.uuid.uuid128[15] << 56) | ((uint64_t) uuid.uuid.uuid128[14] << 48) |
+                                   ((uint64_t) uuid.uuid.uuid128[13] << 40) | ((uint64_t) uuid.uuid.uuid128[12] << 32) |
+                                   ((uint64_t) uuid.uuid.uuid128[11] << 24) | ((uint64_t) uuid.uuid.uuid128[10] << 16) |
+                                   ((uint64_t) uuid.uuid.uuid128[9] << 8) | ((uint64_t) uuid.uuid.uuid128[8]),
+                               ((uint64_t) uuid.uuid.uuid128[7] << 56) | ((uint64_t) uuid.uuid.uuid128[6] << 48) |
+                                   ((uint64_t) uuid.uuid.uuid128[5] << 40) | ((uint64_t) uuid.uuid.uuid128[4] << 32) |
+                                   ((uint64_t) uuid.uuid.uuid128[3] << 24) | ((uint64_t) uuid.uuid.uuid128[2] << 16) |
+                                   ((uint64_t) uuid.uuid.uuid128[1] << 8) | ((uint64_t) uuid.uuid.uuid128[0])};
+}
+
 BluetoothProxy::BluetoothProxy() { global_bluetooth_proxy = this; }
 
 bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
@@ -106,8 +118,7 @@ void BluetoothProxy::loop() {
       api::BluetoothGATTGetServicesResponse resp;
       resp.address = connection->get_address();
       api::BluetoothGATTService service_resp;
-      auto service_uuid = espbt::ESPBTUUID::from_uuid(service_result.uuid);
-      service_resp.uuid = {service_uuid.get_128bit_high(), service_uuid.get_128bit_low()};
+      service_resp.uuid = get_128bit_uuid_vec(service_result.uuid);
       service_resp.handle = service_result.start_handle;
       uint16_t char_offset = 0;
       esp_gattc_char_elem_t char_result;
@@ -128,8 +139,7 @@ void BluetoothProxy::loop() {
           break;
         }
         api::BluetoothGATTCharacteristic characteristic_resp;
-        auto char_uuid = espbt::ESPBTUUID::from_uuid(char_result.uuid);
-        characteristic_resp.uuid = {char_uuid.get_128bit_high(), char_uuid.get_128bit_low()};
+        characteristic_resp.uuid = get_128bit_uuid_vec(char_result.uuid);
         characteristic_resp.handle = char_result.char_handle;
         characteristic_resp.properties = char_result.properties;
         char_offset++;
@@ -152,8 +162,7 @@ void BluetoothProxy::loop() {
             break;
           }
           api::BluetoothGATTDescriptor descriptor_resp;
-          auto desc_uuid = espbt::ESPBTUUID::from_uuid(desc_result.uuid);
-          descriptor_resp.uuid = {desc_uuid.get_128bit_high(), desc_uuid.get_128bit_low()};
+          descriptor_resp.uuid = get_128bit_uuid_vec(desc_result.uuid);
           descriptor_resp.handle = desc_result.handle;
           characteristic_resp.descriptors.push_back(std::move(descriptor_resp));
           desc_offset++;

From d706f40ce1f8b946434c010c83e148b38690082d Mon Sep 17 00:00:00 2001
From: Javier Peletier <jpeletier@users.noreply.github.com>
Date: Tue, 29 Nov 2022 22:44:31 +0100
Subject: [PATCH 323/838] modbus_switch: honor switch:restore_mode (#4122)

---
 .../modbus_controller/switch/modbus_switch.cpp       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/esphome/components/modbus_controller/switch/modbus_switch.cpp b/esphome/components/modbus_controller/switch/modbus_switch.cpp
index dd12e2867f..3a679fbeb8 100644
--- a/esphome/components/modbus_controller/switch/modbus_switch.cpp
+++ b/esphome/components/modbus_controller/switch/modbus_switch.cpp
@@ -6,7 +6,17 @@ namespace modbus_controller {
 
 static const char *const TAG = "modbus_controller.switch";
 
-void ModbusSwitch::setup() {}
+void ModbusSwitch::setup() {
+  optional<bool> initial_state = Switch::get_initial_state_with_restore_mode();
+  if (initial_state.has_value()) {
+    // if it has a value, restore_mode is not "DISABLED", therefore act on the switch:
+    if (initial_state.value()) {
+      this->turn_on();
+    } else {
+      this->turn_off();
+    }
+  }
+}
 void ModbusSwitch::dump_config() { LOG_SWITCH(TAG, "Modbus Controller Switch", this); }
 
 void ModbusSwitch::parse_and_publish(const std::vector<uint8_t> &data) {

From 366932039891fc415902e37786036753960fb773 Mon Sep 17 00:00:00 2001
From: Patrick Collins <pcollins1@gmail.com>
Date: Wed, 30 Nov 2022 08:58:43 +1100
Subject: [PATCH 324/838] PID Climate - deadband and output sampling (#3254)

---
 esphome/components/pid/climate.py         |  46 ++++++++
 esphome/components/pid/pid_climate.cpp    |  18 +++-
 esphome/components/pid/pid_climate.h      |  50 ++++++---
 esphome/components/pid/pid_controller.cpp | 124 ++++++++++++++++++++++
 esphome/components/pid/pid_controller.h   |  99 ++++++++---------
 tests/test3.yaml                          |  12 +++
 6 files changed, 278 insertions(+), 71 deletions(-)
 create mode 100644 esphome/components/pid/pid_controller.cpp

diff --git a/esphome/components/pid/climate.py b/esphome/components/pid/climate.py
index ffc6392ec2..7cd414f912 100644
--- a/esphome/components/pid/climate.py
+++ b/esphome/components/pid/climate.py
@@ -18,6 +18,7 @@ CONF_DEFAULT_TARGET_TEMPERATURE = "default_target_temperature"
 
 CONF_KP = "kp"
 CONF_KI = "ki"
+CONF_STARTING_INTEGRAL_TERM = "starting_integral_term"
 CONF_KD = "kd"
 CONF_CONTROL_PARAMETERS = "control_parameters"
 CONF_COOL_OUTPUT = "cool_output"
@@ -27,6 +28,17 @@ CONF_POSITIVE_OUTPUT = "positive_output"
 CONF_NEGATIVE_OUTPUT = "negative_output"
 CONF_MIN_INTEGRAL = "min_integral"
 CONF_MAX_INTEGRAL = "max_integral"
+CONF_OUTPUT_AVERAGING_SAMPLES = "output_averaging_samples"
+CONF_DERIVATIVE_AVERAGING_SAMPLES = "derivative_averaging_samples"
+
+# Deadband parameters
+CONF_DEADBAND_PARAMETERS = "deadband_parameters"
+CONF_THRESHOLD_HIGH = "threshold_high"
+CONF_THRESHOLD_LOW = "threshold_low"
+CONF_DEADBAND_OUTPUT_AVERAGING_SAMPLES = "deadband_output_averaging_samples"
+CONF_KP_MULTIPLIER = "kp_multiplier"
+CONF_KI_MULTIPLIER = "ki_multiplier"
+CONF_KD_MULTIPLIER = "kd_multiplier"
 
 CONFIG_SCHEMA = cv.All(
     climate.CLIMATE_SCHEMA.extend(
@@ -36,13 +48,28 @@ CONFIG_SCHEMA = cv.All(
             cv.Required(CONF_DEFAULT_TARGET_TEMPERATURE): cv.temperature,
             cv.Optional(CONF_COOL_OUTPUT): cv.use_id(output.FloatOutput),
             cv.Optional(CONF_HEAT_OUTPUT): cv.use_id(output.FloatOutput),
+            cv.Optional(CONF_DEADBAND_PARAMETERS): cv.Schema(
+                {
+                    cv.Required(CONF_THRESHOLD_HIGH): cv.temperature,
+                    cv.Required(CONF_THRESHOLD_LOW): cv.temperature,
+                    cv.Optional(CONF_KP_MULTIPLIER, default=0.1): cv.float_,
+                    cv.Optional(CONF_KI_MULTIPLIER, default=0.0): cv.float_,
+                    cv.Optional(CONF_KD_MULTIPLIER, default=0.0): cv.float_,
+                    cv.Optional(
+                        CONF_DEADBAND_OUTPUT_AVERAGING_SAMPLES, default=1
+                    ): cv.int_,
+                }
+            ),
             cv.Required(CONF_CONTROL_PARAMETERS): cv.Schema(
                 {
                     cv.Required(CONF_KP): cv.float_,
                     cv.Optional(CONF_KI, default=0.0): cv.float_,
                     cv.Optional(CONF_KD, default=0.0): cv.float_,
+                    cv.Optional(CONF_STARTING_INTEGRAL_TERM, default=0.0): cv.float_,
                     cv.Optional(CONF_MIN_INTEGRAL, default=-1): cv.float_,
                     cv.Optional(CONF_MAX_INTEGRAL, default=1): cv.float_,
+                    cv.Optional(CONF_DERIVATIVE_AVERAGING_SAMPLES, default=1): cv.int_,
+                    cv.Optional(CONF_OUTPUT_AVERAGING_SAMPLES, default=1): cv.int_,
                 }
             ),
         }
@@ -69,11 +96,29 @@ async def to_code(config):
     cg.add(var.set_kp(params[CONF_KP]))
     cg.add(var.set_ki(params[CONF_KI]))
     cg.add(var.set_kd(params[CONF_KD]))
+    cg.add(var.set_starting_integral_term(params[CONF_STARTING_INTEGRAL_TERM]))
+    cg.add(var.set_derivative_samples(params[CONF_DERIVATIVE_AVERAGING_SAMPLES]))
+
+    cg.add(var.set_output_samples(params[CONF_OUTPUT_AVERAGING_SAMPLES]))
+
     if CONF_MIN_INTEGRAL in params:
         cg.add(var.set_min_integral(params[CONF_MIN_INTEGRAL]))
     if CONF_MAX_INTEGRAL in params:
         cg.add(var.set_max_integral(params[CONF_MAX_INTEGRAL]))
 
+    if CONF_DEADBAND_PARAMETERS in config:
+        params = config[CONF_DEADBAND_PARAMETERS]
+        cg.add(var.set_threshold_low(params[CONF_THRESHOLD_LOW]))
+        cg.add(var.set_threshold_high(params[CONF_THRESHOLD_HIGH]))
+        cg.add(var.set_kp_multiplier(params[CONF_KP_MULTIPLIER]))
+        cg.add(var.set_ki_multiplier(params[CONF_KI_MULTIPLIER]))
+        cg.add(var.set_kd_multiplier(params[CONF_KD_MULTIPLIER]))
+        cg.add(
+            var.set_deadband_output_samples(
+                params[CONF_DEADBAND_OUTPUT_AVERAGING_SAMPLES]
+            )
+        )
+
     cg.add(var.set_default_target_temperature(config[CONF_DEFAULT_TARGET_TEMPERATURE]))
 
 
@@ -140,4 +185,5 @@ async def set_control_parameters(config, action_id, template_arg, args):
 
     kd_template_ = await cg.templatable(config[CONF_KD], args, float)
     cg.add(var.set_kd(kd_template_))
+
     return var
diff --git a/esphome/components/pid/pid_climate.cpp b/esphome/components/pid/pid_climate.cpp
index 3f8377c720..81c3e1f12e 100644
--- a/esphome/components/pid/pid_climate.cpp
+++ b/esphome/components/pid/pid_climate.cpp
@@ -61,7 +61,17 @@ climate::ClimateTraits PIDClimate::traits() {
 void PIDClimate::dump_config() {
   LOG_CLIMATE("", "PID Climate", this);
   ESP_LOGCONFIG(TAG, "  Control Parameters:");
-  ESP_LOGCONFIG(TAG, "    kp: %.5f, ki: %.5f, kd: %.5f", controller_.kp, controller_.ki, controller_.kd);
+  ESP_LOGCONFIG(TAG, "    kp: %.5f, ki: %.5f, kd: %.5f, output samples: %d", controller_.kp_, controller_.ki_,
+                controller_.kd_, controller_.output_samples_);
+
+  if (controller_.threshold_low_ == 0 && controller_.threshold_high_ == 0) {
+    ESP_LOGCONFIG(TAG, "  Deadband disabled.");
+  } else {
+    ESP_LOGCONFIG(TAG, "  Deadband Parameters:");
+    ESP_LOGCONFIG(TAG, "    threshold: %0.5f to %0.5f, multipliers(kp: %.5f, ki: %.5f, kd: %.5f), output samples: %d",
+                  controller_.threshold_low_, controller_.threshold_high_, controller_.kp_multiplier_,
+                  controller_.ki_multiplier_, controller_.kd_multiplier_, controller_.deadband_output_samples_);
+  }
 
   if (this->autotuner_ != nullptr) {
     this->autotuner_->dump_config();
@@ -114,9 +124,9 @@ void PIDClimate::update_pid_() {
     if (this->autotuner_ != nullptr && !this->autotuner_->is_finished()) {
       auto res = this->autotuner_->update(this->target_temperature, this->current_temperature);
       if (res.result_params.has_value()) {
-        this->controller_.kp = res.result_params->kp;
-        this->controller_.ki = res.result_params->ki;
-        this->controller_.kd = res.result_params->kd;
+        this->controller_.kp_ = res.result_params->kp;
+        this->controller_.ki_ = res.result_params->ki;
+        this->controller_.kd_ = res.result_params->kd;
         // keep autotuner instance so that subsequent dump_configs will print the long result message.
       } else {
         value = res.output;
diff --git a/esphome/components/pid/pid_climate.h b/esphome/components/pid/pid_climate.h
index 095c00eb49..da57209a7e 100644
--- a/esphome/components/pid/pid_climate.h
+++ b/esphome/components/pid/pid_climate.h
@@ -21,20 +21,46 @@ class PIDClimate : public climate::Climate, public Component {
   void set_sensor(sensor::Sensor *sensor) { sensor_ = sensor; }
   void set_cool_output(output::FloatOutput *cool_output) { cool_output_ = cool_output; }
   void set_heat_output(output::FloatOutput *heat_output) { heat_output_ = heat_output; }
-  void set_kp(float kp) { controller_.kp = kp; }
-  void set_ki(float ki) { controller_.ki = ki; }
-  void set_kd(float kd) { controller_.kd = kd; }
-  void set_min_integral(float min_integral) { controller_.min_integral = min_integral; }
-  void set_max_integral(float max_integral) { controller_.max_integral = max_integral; }
+  void set_kp(float kp) { controller_.kp_ = kp; }
+  void set_ki(float ki) { controller_.ki_ = ki; }
+  void set_kd(float kd) { controller_.kd_ = kd; }
+  void set_min_integral(float min_integral) { controller_.min_integral_ = min_integral; }
+  void set_max_integral(float max_integral) { controller_.max_integral_ = max_integral; }
+  void set_output_samples(int in) { controller_.output_samples_ = in; }
+  void set_derivative_samples(int in) { controller_.derivative_samples_ = in; }
+
+  void set_threshold_low(float in) { controller_.threshold_low_ = in; }
+  void set_threshold_high(float in) { controller_.threshold_high_ = in; }
+  void set_kp_multiplier(float in) { controller_.kp_multiplier_ = in; }
+  void set_ki_multiplier(float in) { controller_.ki_multiplier_ = in; }
+  void set_kd_multiplier(float in) { controller_.kd_multiplier_ = in; }
+  void set_starting_integral_term(float in) { controller_.set_starting_integral_term(in); }
+
+  void set_deadband_output_samples(int in) { controller_.deadband_output_samples_ = in; }
 
   float get_output_value() const { return output_value_; }
-  float get_error_value() const { return controller_.error; }
-  float get_kp() { return controller_.kp; }
-  float get_ki() { return controller_.ki; }
-  float get_kd() { return controller_.kd; }
-  float get_proportional_term() const { return controller_.proportional_term; }
-  float get_integral_term() const { return controller_.integral_term; }
-  float get_derivative_term() const { return controller_.derivative_term; }
+  float get_error_value() const { return controller_.error_; }
+  float get_kp() { return controller_.kp_; }
+  float get_ki() { return controller_.ki_; }
+  float get_kd() { return controller_.kd_; }
+  float get_proportional_term() const { return controller_.proportional_term_; }
+  float get_integral_term() const { return controller_.integral_term_; }
+  float get_derivative_term() const { return controller_.derivative_term_; }
+  int get_output_samples() { return controller_.output_samples_; }
+  int get_derivative_samples() { return controller_.derivative_samples_; }
+
+  float get_threshold_low() { return controller_.threshold_low_; }
+  float get_threshold_high() { return controller_.threshold_high_; }
+  float get_kp_multiplier() { return controller_.kp_multiplier_; }
+  float get_ki_multiplier() { return controller_.ki_multiplier_; }
+  float get_kd_multiplier() { return controller_.kd_multiplier_; }
+  int get_deadband_output_samples() { return controller_.deadband_output_samples_; }
+  bool in_deadband() { return controller_.in_deadband(); }
+
+  // int get_derivative_samples() const { return controller_.derivative_samples; }
+  // float get_deadband() const { return controller_.deadband; }
+  // float get_proportional_deadband_multiplier() const { return controller_.proportional_deadband_multiplier; }
+
   void add_on_pid_computed_callback(std::function<void()> &&callback) {
     pid_computed_callback_.add(std::move(callback));
   }
diff --git a/esphome/components/pid/pid_controller.cpp b/esphome/components/pid/pid_controller.cpp
new file mode 100644
index 0000000000..afc2d91000
--- /dev/null
+++ b/esphome/components/pid/pid_controller.cpp
@@ -0,0 +1,124 @@
+#include "pid_controller.h"
+
+namespace esphome {
+namespace pid {
+
+float PIDController::update(float setpoint, float process_value) {
+  // e(t) ... error at timestamp t
+  // r(t) ... setpoint
+  // y(t) ... process value (sensor reading)
+  // u(t) ... output value
+
+  dt_ = calculate_relative_time_();
+
+  // e(t) := r(t) - y(t)
+  error_ = setpoint - process_value;
+
+  calculate_proportional_term_();
+  calculate_integral_term_();
+  calculate_derivative_term_();
+
+  // u(t) := p(t) + i(t) + d(t)
+  float output = proportional_term_ + integral_term_ + derivative_term_;
+
+  // smooth/sample the output
+  int samples = in_deadband() ? deadband_output_samples_ : output_samples_;
+  return weighted_average_(output_list_, output, samples);
+}
+
+bool PIDController::in_deadband() {
+  // return (fabs(error) < deadband_threshold);
+  float err = -error_;
+  return ((err > 0 && err < threshold_high_) || (err < 0 && err > threshold_low_));
+}
+
+void PIDController::calculate_proportional_term_() {
+  // p(t) := K_p * e(t)
+  proportional_term_ = kp_ * error_;
+
+  // set dead-zone to -X to +X
+  if (in_deadband()) {
+    // shallow the proportional_term in the deadband by the pdm
+    proportional_term_ *= kp_multiplier_;
+
+  } else {
+    // pdm_offset prevents a jump when leaving the deadband
+    float threshold = (error_ < 0) ? threshold_high_ : threshold_low_;
+    float pdm_offset = (threshold - (kp_multiplier_ * threshold)) * kp_;
+    proportional_term_ += pdm_offset;
+  }
+}
+
+void PIDController::calculate_integral_term_() {
+  // i(t) := K_i * \int_{0}^{t} e(t) dt
+  float new_integral = error_ * dt_ * ki_;
+
+  if (in_deadband()) {
+    // shallow the integral when in the deadband
+    accumulated_integral_ += new_integral * ki_multiplier_;
+  } else {
+    accumulated_integral_ += new_integral;
+  }
+
+  // constrain accumulated integral value
+  if (!std::isnan(min_integral_) && accumulated_integral_ < min_integral_)
+    accumulated_integral_ = min_integral_;
+  if (!std::isnan(max_integral_) && accumulated_integral_ > max_integral_)
+    accumulated_integral_ = max_integral_;
+
+  integral_term_ = accumulated_integral_;
+}
+
+void PIDController::calculate_derivative_term_() {
+  // derivative_term_
+  // d(t) := K_d * de(t)/dt
+  float derivative = 0.0f;
+  if (dt_ != 0.0f)
+    derivative = (error_ - previous_error_) / dt_;
+  previous_error_ = error_;
+
+  // smooth the derivative samples
+  derivative = weighted_average_(derivative_list_, derivative, derivative_samples_);
+
+  derivative_term_ = kd_ * derivative;
+
+  if (in_deadband()) {
+    // shallow the derivative when in the deadband
+    derivative_term_ *= kd_multiplier_;
+  }
+}
+
+float PIDController::weighted_average_(std::deque<float> &list, float new_value, int samples) {
+  // if only 1 sample needed, clear the list and return
+  if (samples == 1) {
+    list.clear();
+    return new_value;
+  }
+
+  // add the new item to the list
+  list.push_front(new_value);
+
+  // keep only 'samples' readings, by popping off the back of the list
+  while (list.size() > samples)
+    list.pop_back();
+
+  // calculate and return the average of all values in the list
+  float sum = 0;
+  for (auto &elem : list)
+    sum += elem;
+  return sum / list.size();
+}
+
+float PIDController::calculate_relative_time_() {
+  uint32_t now = millis();
+  uint32_t dt = now - this->last_time_;
+  if (last_time_ == 0) {
+    last_time_ = now;
+    return 0.0f;
+  }
+  last_time_ = now;
+  return dt / 1000.0f;
+}
+
+}  // namespace pid
+}  // namespace esphome
diff --git a/esphome/components/pid/pid_controller.h b/esphome/components/pid/pid_controller.h
index 35e3eb9fc0..05ce5f9224 100644
--- a/esphome/components/pid/pid_controller.h
+++ b/esphome/components/pid/pid_controller.h
@@ -1,81 +1,70 @@
 #pragma once
-
 #include "esphome/core/hal.h"
+#include <deque>
+#include <cmath>
 
 namespace esphome {
 namespace pid {
 
 struct PIDController {
-  float update(float setpoint, float process_value) {
-    // e(t) ... error at timestamp t
-    // r(t) ... setpoint
-    // y(t) ... process value (sensor reading)
-    // u(t) ... output value
-
-    float dt = calculate_relative_time_();
-
-    // e(t) := r(t) - y(t)
-    error = setpoint - process_value;
-
-    // p(t) := K_p * e(t)
-    proportional_term = kp * error;
-
-    // i(t) := K_i * \int_{0}^{t} e(t) dt
-    accumulated_integral_ += error * dt * ki;
-    // constrain accumulated integral value
-    if (!std::isnan(min_integral) && accumulated_integral_ < min_integral)
-      accumulated_integral_ = min_integral;
-    if (!std::isnan(max_integral) && accumulated_integral_ > max_integral)
-      accumulated_integral_ = max_integral;
-    integral_term = accumulated_integral_;
-
-    // d(t) := K_d * de(t)/dt
-    float derivative = 0.0f;
-    if (dt != 0.0f)
-      derivative = (error - previous_error_) / dt;
-    previous_error_ = error;
-    derivative_term = kd * derivative;
-
-    // u(t) := p(t) + i(t) + d(t)
-    return proportional_term + integral_term + derivative_term;
-  }
+  float update(float setpoint, float process_value);
 
   void reset_accumulated_integral() { accumulated_integral_ = 0; }
+  void set_starting_integral_term(float in) { accumulated_integral_ = in; }
 
+  bool in_deadband();
+
+  friend class PIDClimate;
+
+ private:
   /// Proportional gain K_p.
-  float kp = 0;
+  float kp_ = 0;
   /// Integral gain K_i.
-  float ki = 0;
+  float ki_ = 0;
   /// Differential gain K_d.
-  float kd = 0;
+  float kd_ = 0;
 
-  float min_integral = NAN;
-  float max_integral = NAN;
+  // smooth the derivative value using a weighted average over X samples
+  int derivative_samples_ = 8;
+
+  /// smooth the output value using a weighted average over X values
+  int output_samples_ = 1;
+
+  float threshold_low_ = 0.0f;
+  float threshold_high_ = 0.0f;
+  float kp_multiplier_ = 0.0f;
+  float ki_multiplier_ = 0.0f;
+  float kd_multiplier_ = 0.0f;
+  int deadband_output_samples_ = 1;
+
+  float min_integral_ = NAN;
+  float max_integral_ = NAN;
 
   // Store computed values in struct so that values can be monitored through sensors
-  float error;
-  float proportional_term;
-  float integral_term;
-  float derivative_term;
+  float error_;
+  float dt_;
+  float proportional_term_;
+  float integral_term_;
+  float derivative_term_;
 
- protected:
-  float calculate_relative_time_() {
-    uint32_t now = millis();
-    uint32_t dt = now - this->last_time_;
-    if (last_time_ == 0) {
-      last_time_ = now;
-      return 0.0f;
-    }
-    last_time_ = now;
-    return dt / 1000.0f;
-  }
+  void calculate_proportional_term_();
+  void calculate_integral_term_();
+  void calculate_derivative_term_();
+  float weighted_average_(std::deque<float> &list, float new_value, int samples);
+  float calculate_relative_time_();
 
   /// Error from previous update used for derivative term
   float previous_error_ = 0;
   /// Accumulated integral value
   float accumulated_integral_ = 0;
   uint32_t last_time_ = 0;
-};
 
+  // this is a list of derivative values for smoothing.
+  std::deque<float> derivative_list_;
+
+  // this is a list of output values for smoothing.
+  std::deque<float> output_list_;
+
+};  // Struct PID Controller
 }  // namespace pid
 }  // namespace esphome
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 546df1efb5..9b4e530fbd 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -1162,6 +1162,18 @@ climate:
       kp: 0.0
       ki: 0.0
       kd: 0.0
+      max_integral: 0.0
+      output_averaging_samples: 1
+      derivative_averaging_samples: 1
+    deadband_parameters:
+      threshold_high: 0.4
+      threshold_low: -2.0
+      kp_multiplier: 0.0
+      ki_multiplier: 0.0
+      kd_multiplier: 0.0
+      deadband_output_averaging_samples: 1
+
+
 
 sprinkler:
   - id: yard_sprinkler_ctrlr

From 2b4fdd6c394b82b981120a217b91c5df9e22690a Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 30 Nov 2022 10:59:02 +1300
Subject: [PATCH 325/838] Allow auto setting of ble client id if there is only
 1 in config (#4125)

---
 esphome/components/ble_client/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/ble_client/__init__.py b/esphome/components/ble_client/__init__.py
index 44812d29b5..03e8f0b0b2 100644
--- a/esphome/components/ble_client/__init__.py
+++ b/esphome/components/ble_client/__init__.py
@@ -66,7 +66,7 @@ CONF_BLE_CLIENT_ID = "ble_client_id"
 
 BLE_CLIENT_SCHEMA = cv.Schema(
     {
-        cv.Required(CONF_BLE_CLIENT_ID): cv.use_id(BLEClient),
+        cv.GenerateID(CONF_BLE_CLIENT_ID): cv.use_id(BLEClient),
     }
 )
 
@@ -78,7 +78,7 @@ async def register_ble_node(var, config):
 
 BLE_WRITE_ACTION_SCHEMA = cv.Schema(
     {
-        cv.Required(CONF_ID): cv.use_id(BLEClient),
+        cv.GenerateID(CONF_ID): cv.use_id(BLEClient),
         cv.Required(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
         cv.Required(CONF_CHARACTERISTIC_UUID): esp32_ble_tracker.bt_uuid,
         cv.Required(CONF_VALUE): cv.templatable(cv.ensure_list(cv.hex_uint8_t)),

From eb2a0f45dba1aec61f5272faf2c98266005a3812 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 30 Nov 2022 10:59:20 +1300
Subject: [PATCH 326/838] current-based cover fix copy paste mistake (#4124)

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

diff --git a/esphome/components/current_based/current_based_cover.cpp b/esphome/components/current_based/current_based_cover.cpp
index 3d7a9b8425..7edbdf5a72 100644
--- a/esphome/components/current_based/current_based_cover.cpp
+++ b/esphome/components/current_based/current_based_cover.cpp
@@ -179,7 +179,7 @@ bool CurrentBasedCover::is_closing_blocked_() const {
   if (this->close_obstacle_current_threshold_ == FLT_MAX) {
     return false;
   }
-  return this->open_sensor_->get_state() > this->open_obstacle_current_threshold_;
+  return this->close_sensor_->get_state() > this->close_obstacle_current_threshold_;
 }
 bool CurrentBasedCover::is_initial_delay_finished_() const {
   return millis() - this->start_dir_time_ > this->start_sensing_delay_;

From 106c1bfac262a16d977ca464fde2c18598e18b75 Mon Sep 17 00:00:00 2001
From: Javier Peletier <jpeletier@users.noreply.github.com>
Date: Thu, 1 Dec 2022 00:49:15 +0100
Subject: [PATCH 327/838] fix RESTORE_INVERTED switch:restore_mode (#4129)

fixes https://github.com/esphome/esphome/pull/3648
---
 esphome/components/switch/switch.cpp | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/esphome/components/switch/switch.cpp b/esphome/components/switch/switch.cpp
index 99df5091c3..caa072b1ea 100644
--- a/esphome/components/switch/switch.cpp
+++ b/esphome/components/switch/switch.cpp
@@ -35,13 +35,14 @@ optional<bool> Switch::get_initial_state_with_restore_mode() {
   if (restore_mode & RESTORE_MODE_DISABLED_MASK) {
     return {};
   }
-  bool initial_state = restore_mode & RESTORE_MODE_ON_MASK;
-  if (restore_mode & RESTORE_MODE_INVERTED_MASK)
-    initial_state = !initial_state;
-  if (restore_mode & RESTORE_MODE_PERSISTENT_MASK) {
-    initial_state = this->get_initial_state().value_or(initial_state);
+  bool initial_state = restore_mode & RESTORE_MODE_ON_MASK;  // default value *_OFF or *_ON
+  if (restore_mode & RESTORE_MODE_PERSISTENT_MASK) {         // For RESTORE_*
+    optional<bool> restored_state = this->get_initial_state();
+    if (restored_state.has_value()) {
+      // Invert value if any of the *_INVERTED_* modes
+      initial_state = restore_mode & RESTORE_MODE_INVERTED_MASK ? !restored_state.value() : restored_state.value();
+    }
   }
-
   return initial_state;
 }
 void Switch::publish_state(bool state) {
@@ -85,10 +86,14 @@ void log_switch(const char *tag, const char *prefix, const char *type, Switch *o
     if (!obj->get_device_class().empty()) {
       ESP_LOGCONFIG(tag, "%s  Device Class: '%s'", prefix, obj->get_device_class().c_str());
     }
-    const LogString *onoff = obj->restore_mode & RESTORE_MODE_ON_MASK ? LOG_STR("ON") : LOG_STR("OFF");
-    const LogString *inverted = obj->restore_mode & RESTORE_MODE_INVERTED_MASK ? LOG_STR("inverted ") : LOG_STR("");
-    const LogString *restore =
-        obj->restore_mode & RESTORE_MODE_PERSISTENT_MASK ? LOG_STR("restore defaults to") : LOG_STR("always");
+    const LogString *onoff = LOG_STR(""), *inverted = onoff, *restore;
+    if (obj->restore_mode & RESTORE_MODE_DISABLED_MASK) {
+      restore = LOG_STR("disabled");
+    } else {
+      onoff = obj->restore_mode & RESTORE_MODE_ON_MASK ? LOG_STR("ON") : LOG_STR("OFF");
+      inverted = obj->restore_mode & RESTORE_MODE_INVERTED_MASK ? LOG_STR("inverted ") : LOG_STR("");
+      restore = obj->restore_mode & RESTORE_MODE_PERSISTENT_MASK ? LOG_STR("restore defaults to") : LOG_STR("always");
+    }
 
     ESP_LOGCONFIG(tag, "%s  Restore Mode: %s%s %s", prefix, LOG_STR_ARG(inverted), LOG_STR_ARG(restore),
                   LOG_STR_ARG(onoff));

From db0ed055dd983071c30a0fb3ef303140adc8996a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 12:49:37 +1300
Subject: [PATCH 328/838] Bump pylint from 2.15.6 to 2.15.7 (#4127)

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 e422490443..5d23776604 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,4 +1,4 @@
-pylint==2.15.6
+pylint==2.15.7
 flake8==5.0.4  # also change in .pre-commit-config.yaml when updating
 black==22.10.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.2.2  # also change in .pre-commit-config.yaml when updating

From 2dd032475bb21a20e0555e8db3068455fefe3b03 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 1 Dec 2022 12:51:01 +1300
Subject: [PATCH 329/838] Allow global setting of compile process limit (#4081)

---
 docker/ha-addon-rootfs/etc/services.d/esphome/run |  8 ++++++++
 esphome/core/config.py                            | 15 ++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/docker/ha-addon-rootfs/etc/services.d/esphome/run b/docker/ha-addon-rootfs/etc/services.d/esphome/run
index 2c821bf4ee..747c64728e 100755
--- a/docker/ha-addon-rootfs/etc/services.d/esphome/run
+++ b/docker/ha-addon-rootfs/etc/services.d/esphome/run
@@ -22,6 +22,14 @@ if bashio::config.has_value 'relative_url'; then
     export ESPHOME_DASHBOARD_RELATIVE_URL=$(bashio::config 'relative_url')
 fi
 
+if bashio::config.has_value 'default_compile_process_limit'; then
+    export ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT=$(bashio::config 'default_compile_process_limit')
+else
+    if grep -q 'Raspberry Pi 3' /proc/cpuinfo; then
+        export ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT=1;
+    fi
+fi
+
 pio_cache_base=/data/cache/platformio
 # we can't set core_dir, because the settings file is stored in `core_dir/appstate.json`
 # setting `core_dir` would therefore prevent pio from accessing
diff --git a/esphome/core/config.py b/esphome/core/config.py
index a40542c662..bf0beea2ef 100644
--- a/esphome/core/config.py
+++ b/esphome/core/config.py
@@ -110,6 +110,15 @@ def validate_version(value: str):
     return value
 
 
+if "ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT" in os.environ:
+    _compile_process_limit_default = min(
+        int(os.environ["ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT"]),
+        multiprocessing.cpu_count(),
+    )
+else:
+    _compile_process_limit_default = cv.UNDEFINED
+
+
 CONF_ESP8266_RESTORE_FROM_FLASH = "esp8266_restore_from_flash"
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
@@ -153,9 +162,9 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_MIN_VERSION, default=ESPHOME_VERSION): cv.All(
                 cv.version_number, validate_version
             ),
-            cv.Optional(CONF_COMPILE_PROCESS_LIMIT): cv.int_range(
-                min=1, max=multiprocessing.cpu_count()
-            ),
+            cv.Optional(
+                CONF_COMPILE_PROCESS_LIMIT, default=_compile_process_limit_default
+            ): cv.int_range(min=1, max=multiprocessing.cpu_count()),
         }
     ),
     validate_hostname,

From 6e4267b79779b6a52aab70b1b823b0dcbb696236 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 13:11:31 +1300
Subject: [PATCH 330/838] Bump flake8 from 5.0.4 to 6.0.0 (#4084)

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 5d23776604..6d902ef2d7 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,5 +1,5 @@
 pylint==2.15.7
-flake8==5.0.4  # also change in .pre-commit-config.yaml when updating
+flake8==6.0.0  # also change in .pre-commit-config.yaml when updating
 black==22.10.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.2.2  # also change in .pre-commit-config.yaml when updating
 pre-commit

From f117d4f50a1dcc1e63b6ec613f1f72b4f0105285 Mon Sep 17 00:00:00 2001
From: Nicolas Graziano <nicolas.graziano@free.fr>
Date: Thu, 1 Dec 2022 01:15:32 +0100
Subject: [PATCH 331/838] Dashboard,  after login use relative url. (#4103)

---
 esphome/dashboard/dashboard.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index d38eb0027e..c43a9e0ecb 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -842,7 +842,7 @@ PING_REQUEST = threading.Event()
 class LoginHandler(BaseHandler):
     def get(self):
         if is_authenticated(self):
-            self.redirect("/")
+            self.redirect("./")
         else:
             self.render_login_page()
 
@@ -887,7 +887,7 @@ class LoginHandler(BaseHandler):
         password = self.get_argument("password", "")
         if settings.check_password(username, password):
             self.set_secure_cookie("authenticated", cookie_authenticated_yes)
-            self.redirect("/")
+            self.redirect("./")
             return
         error_str = (
             "Invalid username or password" if settings.username else "Invalid password"

From b63ade298f03e671bc7f93d8538e1e7e2e254505 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 1 Dec 2022 13:17:44 +1300
Subject: [PATCH 332/838] Fix queuing scripts not compiling (#4077)

---
 esphome/components/script/script.h | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/esphome/components/script/script.h b/esphome/components/script/script.h
index f3a83cd6ec..165f90ed11 100644
--- a/esphome/components/script/script.h
+++ b/esphome/components/script/script.h
@@ -4,6 +4,7 @@
 #include "esphome/core/component.h"
 #include "esphome/core/log.h"
 
+#include <queue>
 namespace esphome {
 namespace script {
 
@@ -88,7 +89,7 @@ template<typename... Ts> class RestartScript : public Script<Ts...> {
 template<typename... Ts> class QueueingScript : public Script<Ts...>, public Component {
  public:
   void execute(Ts... x) override {
-    if (this->is_action_running()) {
+    if (this->is_action_running() || this->num_runs_ > 0) {
       // num_runs_ is the number of *queued* instances, so total number of instances is
       // num_runs_ + 1
       if (this->max_runs_ != 0 && this->num_runs_ + 1 >= this->max_runs_) {
@@ -98,6 +99,7 @@ template<typename... Ts> class QueueingScript : public Script<Ts...>, public Com
 
       this->esp_logd_(__LINE__, "Script '%s' queueing new instance (mode: queued)", this->name_.c_str());
       this->num_runs_++;
+      this->var_queue_.push(std::make_tuple(x...));
       return;
     }
 
@@ -114,15 +116,22 @@ template<typename... Ts> class QueueingScript : public Script<Ts...>, public Com
   void loop() override {
     if (this->num_runs_ != 0 && !this->is_action_running()) {
       this->num_runs_--;
-      this->trigger();
+      auto &vars = this->var_queue_.front();
+      this->var_queue_.pop();
+      this->trigger_tuple_(vars, typename gens<sizeof...(Ts)>::type());
     }
   }
 
   void set_max_runs(int max_runs) { max_runs_ = max_runs; }
 
  protected:
+  template<int... S> void trigger_tuple_(const std::tuple<Ts...> &tuple, seq<S...> /*unused*/) {
+    this->trigger(std::get<S>(tuple)...);
+  }
+
   int num_runs_ = 0;
   int max_runs_ = 0;
+  std::queue<std::tuple<Ts...>> var_queue_;
 };
 
 /** A script type that executes new instances in parallel.

From bae9a950c03f2036456c40b1e7fff4f1f59f9894 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 30 Nov 2022 10:59:20 +1300
Subject: [PATCH 333/838] current-based cover fix copy paste mistake (#4124)

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

diff --git a/esphome/components/current_based/current_based_cover.cpp b/esphome/components/current_based/current_based_cover.cpp
index 3d7a9b8425..7edbdf5a72 100644
--- a/esphome/components/current_based/current_based_cover.cpp
+++ b/esphome/components/current_based/current_based_cover.cpp
@@ -179,7 +179,7 @@ bool CurrentBasedCover::is_closing_blocked_() const {
   if (this->close_obstacle_current_threshold_ == FLT_MAX) {
     return false;
   }
-  return this->open_sensor_->get_state() > this->open_obstacle_current_threshold_;
+  return this->close_sensor_->get_state() > this->close_obstacle_current_threshold_;
 }
 bool CurrentBasedCover::is_initial_delay_finished_() const {
   return millis() - this->start_dir_time_ > this->start_sensing_delay_;

From 0a19b1e32c7d4ad06c22a6056216b94a4dfee7d5 Mon Sep 17 00:00:00 2001
From: Nicolas Graziano <nicolas.graziano@free.fr>
Date: Thu, 1 Dec 2022 01:15:32 +0100
Subject: [PATCH 334/838] Dashboard,  after login use relative url. (#4103)

---
 esphome/dashboard/dashboard.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index b7c24f9e2e..2153f15a35 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -849,7 +849,7 @@ PING_REQUEST = threading.Event()
 class LoginHandler(BaseHandler):
     def get(self):
         if is_authenticated(self):
-            self.redirect("/")
+            self.redirect("./")
         else:
             self.render_login_page()
 
@@ -894,7 +894,7 @@ class LoginHandler(BaseHandler):
         password = self.get_argument("password", "")
         if settings.check_password(username, password):
             self.set_secure_cookie("authenticated", cookie_authenticated_yes)
-            self.redirect("/")
+            self.redirect("./")
             return
         error_str = (
             "Invalid username or password" if settings.username else "Invalid password"

From e16ba2adb5edfb041545ae05050cfeef2a16a953 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 1 Dec 2022 13:17:44 +1300
Subject: [PATCH 335/838] Fix queuing scripts not compiling (#4077)

---
 esphome/components/script/script.h | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/esphome/components/script/script.h b/esphome/components/script/script.h
index f3a83cd6ec..165f90ed11 100644
--- a/esphome/components/script/script.h
+++ b/esphome/components/script/script.h
@@ -4,6 +4,7 @@
 #include "esphome/core/component.h"
 #include "esphome/core/log.h"
 
+#include <queue>
 namespace esphome {
 namespace script {
 
@@ -88,7 +89,7 @@ template<typename... Ts> class RestartScript : public Script<Ts...> {
 template<typename... Ts> class QueueingScript : public Script<Ts...>, public Component {
  public:
   void execute(Ts... x) override {
-    if (this->is_action_running()) {
+    if (this->is_action_running() || this->num_runs_ > 0) {
       // num_runs_ is the number of *queued* instances, so total number of instances is
       // num_runs_ + 1
       if (this->max_runs_ != 0 && this->num_runs_ + 1 >= this->max_runs_) {
@@ -98,6 +99,7 @@ template<typename... Ts> class QueueingScript : public Script<Ts...>, public Com
 
       this->esp_logd_(__LINE__, "Script '%s' queueing new instance (mode: queued)", this->name_.c_str());
       this->num_runs_++;
+      this->var_queue_.push(std::make_tuple(x...));
       return;
     }
 
@@ -114,15 +116,22 @@ template<typename... Ts> class QueueingScript : public Script<Ts...>, public Com
   void loop() override {
     if (this->num_runs_ != 0 && !this->is_action_running()) {
       this->num_runs_--;
-      this->trigger();
+      auto &vars = this->var_queue_.front();
+      this->var_queue_.pop();
+      this->trigger_tuple_(vars, typename gens<sizeof...(Ts)>::type());
     }
   }
 
   void set_max_runs(int max_runs) { max_runs_ = max_runs; }
 
  protected:
+  template<int... S> void trigger_tuple_(const std::tuple<Ts...> &tuple, seq<S...> /*unused*/) {
+    this->trigger(std::get<S>(tuple)...);
+  }
+
   int num_runs_ = 0;
   int max_runs_ = 0;
+  std::queue<std::tuple<Ts...>> var_queue_;
 };
 
 /** A script type that executes new instances in parallel.

From 47b3267ed4e57fca2a005abd4fb3db4a5318cdf4 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 1 Dec 2022 13:47:50 +1300
Subject: [PATCH 336/838] Bump version to 2022.11.4

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

diff --git a/esphome/const.py b/esphome/const.py
index 8ac844b2b1..f36d776ee4 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.11.3"
+__version__ = "2022.11.4"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From f28f71282747dfaed8efb3ebbb6a5c7c57a3c81d Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 5 Dec 2022 08:55:38 +1300
Subject: [PATCH 337/838] Bump arduino pico and update wifi methods (#4144)

---
 esphome/components/rp2040/__init__.py             |  6 +++---
 esphome/components/wifi/wifi_component_pico_w.cpp | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/esphome/components/rp2040/__init__.py b/esphome/components/rp2040/__init__.py
index c759576e4d..c6fbcf8deb 100644
--- a/esphome/components/rp2040/__init__.py
+++ b/esphome/components/rp2040/__init__.py
@@ -56,7 +56,7 @@ def _format_framework_arduino_version(ver: cv.Version) -> str:
 # The default/recommended arduino framework version
 #  - https://github.com/earlephilhower/arduino-pico/releases
 #  - https://api.registry.platformio.org/v3/packages/earlephilhower/tool/framework-arduinopico
-RECOMMENDED_ARDUINO_FRAMEWORK_VERSION = cv.Version(2, 6, 2)
+RECOMMENDED_ARDUINO_FRAMEWORK_VERSION = cv.Version(2, 6, 4)
 
 # The platformio/raspberrypi version to use for arduino frameworks
 #  - https://github.com/platformio/platform-raspberrypi/releases
@@ -67,8 +67,8 @@ ARDUINO_PLATFORM_VERSION = cv.Version(1, 7, 0)
 def _arduino_check_versions(value):
     value = value.copy()
     lookups = {
-        "dev": (cv.Version(2, 6, 2), "https://github.com/earlephilhower/arduino-pico"),
-        "latest": (cv.Version(2, 6, 2), None),
+        "dev": (cv.Version(2, 6, 4), "https://github.com/earlephilhower/arduino-pico"),
+        "latest": (cv.Version(2, 6, 4), None),
         "recommended": (RECOMMENDED_ARDUINO_FRAMEWORK_VERSION, None),
     }
 
diff --git a/esphome/components/wifi/wifi_component_pico_w.cpp b/esphome/components/wifi/wifi_component_pico_w.cpp
index 794ab34219..8e64878f8e 100644
--- a/esphome/components/wifi/wifi_component_pico_w.cpp
+++ b/esphome/components/wifi/wifi_component_pico_w.cpp
@@ -156,7 +156,7 @@ bool WiFiComponent::wifi_disconnect_() {
   int err = cyw43_wifi_leave(&cyw43_state, CYW43_ITF_STA);
   return err == 0;
 }
-// NOTE: The driver does not provide an interface to get this
+
 bssid_t WiFiComponent::wifi_bssid() {
   bssid_t bssid{};
   uint8_t raw_bssid[6];
@@ -165,12 +165,10 @@ bssid_t WiFiComponent::wifi_bssid() {
     bssid[i] = raw_bssid[i];
   return bssid;
 }
-// NOTE: The driver does not provide an interface to get this
-std::string WiFiComponent::wifi_ssid() { return WiFi.SSID(); }
-// NOTE: The driver does not provide an interface to get this
+std::string WiFiComponent::wifi_ssid() { return WiFi.SSID().c_str(); }
 int8_t WiFiComponent::wifi_rssi() { return WiFi.RSSI(); }
-// NOTE: The driver does not provide an interface to get this
-int32_t WiFiComponent::wifi_channel_() { return 0; }
+int32_t WiFiComponent::wifi_channel_() { return WiFi.channel(); }
+
 network::IPAddress WiFiComponent::wifi_sta_ip() { return {WiFi.localIP()}; }
 network::IPAddress WiFiComponent::wifi_subnet_mask_() { return {WiFi.subnetMask()}; }
 network::IPAddress WiFiComponent::wifi_gateway_ip_() { return {WiFi.gatewayIP()}; }

From c30068fc976cba9d7153289b4f0c67bf2b828286 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Dec 2022 10:00:25 +1300
Subject: [PATCH 338/838] Bump aioesphomeapi from 12.2.0 to 12.2.1 (#4133)

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 1d50934c00..2de77c8d4f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.5  # When updating platformio, also update Dockerfile
 esptool==3.3.1
 click==8.1.3
 esphome-dashboard==20221109.0
-aioesphomeapi==12.2.0
+aioesphomeapi==12.2.1
 zeroconf==0.39.4
 
 # esp-idf requires this, but doesn't bundle it by default

From de352c160957d528ca0f52fc7665ec0e54e77a57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Dec 2022 10:08:22 +1300
Subject: [PATCH 339/838] Bump esptool from 3.3.1 to 4.4 (#4071)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/__main__.py | 3 +--
 requirements.txt    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index 3ad69d27cd..9b6043ef50 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -254,8 +254,7 @@ def upload_using_esptool(config, port):
         if os.environ.get("ESPHOME_USE_SUBPROCESS") is None:
             import esptool
 
-            # pylint: disable=protected-access
-            return run_external_command(esptool._main, *cmd)
+            return run_external_command(esptool.main, *cmd)  # pylint: disable=no-member
 
         return run_external_process(*cmd)
 
diff --git a/requirements.txt b/requirements.txt
index 2de77c8d4f..a92cae7047 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ tzlocal==4.2    # from time
 tzdata>=2021.1  # from time
 pyserial==3.5
 platformio==6.1.5  # When updating platformio, also update Dockerfile
-esptool==3.3.1
+esptool==4.4
 click==8.1.3
 esphome-dashboard==20221109.0
 aioesphomeapi==12.2.1

From dfcccda69e27f6e299d72cbcde320fc4796b6cc1 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 5 Dec 2022 19:46:00 +1300
Subject: [PATCH 340/838] Fix board pin alias lookup (#4147)

---
 esphome/components/esp32/gpio.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/esphome/components/esp32/gpio.py b/esphome/components/esp32/gpio.py
index cde9964545..b97a5e0457 100644
--- a/esphome/components/esp32/gpio.py
+++ b/esphome/components/esp32/gpio.py
@@ -107,6 +107,10 @@ def validate_gpio_pin(value):
     board = CORE.data[KEY_ESP32][KEY_BOARD]
     board_pins = boards.ESP32_BOARD_PINS.get(board, {})
 
+    # Resolved aliased board pins (shorthand when two boards have the same pin configuration)
+    while isinstance(board_pins, str):
+        board_pins = boards.ESP32_BOARD_PINS[board_pins]
+
     if value in board_pins.values():
         return value
 

From 54caed36f7339d90bfb769278f3910c28af2d5ef Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 5 Dec 2022 19:50:11 +1300
Subject: [PATCH 341/838] Fix mismatched flake8 version in pre-commit (#4145)

---
 .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 e4fcf6f27e..8fa7563667 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: 5.0.4
+    rev: 6.0.0
     hooks:
       - id: flake8
         additional_dependencies:

From 3b2bbd306fe560f59d1fd77eb360cfdec94cfb7b Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 5 Dec 2022 08:42:51 -1000
Subject: [PATCH 342/838] Detect BLE stack unrecoverable state (#4128)

---
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   | 30 +++++++++++++++++--
 .../esp32_ble_tracker/esp32_ble_tracker.h     |  1 +
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 50e59537f9..9df81a8905 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -90,8 +90,12 @@ void ESP32BLETracker::loop() {
   int connecting = 0;
   int discovered = 0;
   int searching = 0;
+  int disconnecting = 0;
   for (auto *client : this->clients_) {
     switch (client->state()) {
+      case ClientState::DISCONNECTING:
+        disconnecting++;
+        break;
       case ClientState::DISCOVERED:
         discovered++;
         break;
@@ -144,7 +148,20 @@ void ESP32BLETracker::loop() {
       xSemaphoreGive(this->scan_result_lock_);
     }
 
-    if (!connecting && xSemaphoreTake(this->scan_end_lock_, 0L)) {
+    /*
+
+      Avoid starting the scanner if:
+      - we are already scanning
+      - we are connecting to a device
+      - we are disconnecting from a device
+
+      Otherwise the scanner could fail to ever start again
+      and our only way to recover is to reboot.
+
+      https://github.com/espressif/esp-idf/issues/6688
+
+    */
+    if (!connecting && !disconnecting && xSemaphoreTake(this->scan_end_lock_, 0L)) {
       if (this->scan_continuous_) {
         if (!promote_to_connecting && !this->scan_start_failed_ && !this->scan_set_param_failed_) {
           this->start_scan_(false);
@@ -159,6 +176,10 @@ void ESP32BLETracker::loop() {
     }
 
     if (this->scan_start_failed_ || this->scan_set_param_failed_) {
+      if (this->scan_start_fail_count_ == 255) {
+        ESP_LOGE(TAG, "ESP-IDF BLE scan could not restart after 255 attempts, rebooting to restore BLE stack...");
+        App.reboot();
+      }
       esp_ble_gap_stop_scanning();
       if (this->scan_start_failed_) {
         ESP_LOGE(TAG, "Scan start failed: %d", this->scan_start_failed_);
@@ -306,7 +327,7 @@ void ESP32BLETracker::start_scan_(bool first) {
   esp_ble_gap_start_scanning(this->scan_duration_);
 
   this->set_timeout("scan", this->scan_duration_ * 2000, []() {
-    ESP_LOGW(TAG, "ESP-IDF BLE scan never terminated, rebooting to restore BLE stack...");
+    ESP_LOGE(TAG, "ESP-IDF BLE scan never terminated, rebooting to restore BLE stack...");
     App.reboot();
   });
 }
@@ -366,7 +387,10 @@ void ESP32BLETracker::gap_scan_set_param_complete_(const esp_ble_gap_cb_param_t:
 
 void ESP32BLETracker::gap_scan_start_complete_(const esp_ble_gap_cb_param_t::ble_scan_start_cmpl_evt_param &param) {
   this->scan_start_failed_ = param.status;
-  if (param.status != ESP_BT_STATUS_SUCCESS) {
+  if (param.status == ESP_BT_STATUS_SUCCESS) {
+    this->scan_start_fail_count_ = 0;
+  } else {
+    this->scan_start_fail_count_++;
     xSemaphoreGive(this->scan_end_lock_);
   }
 }
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 9052e620cf..e6f7829353 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -253,6 +253,7 @@ class ESP32BLETracker : public Component {
   uint32_t scan_duration_;
   uint32_t scan_interval_;
   uint32_t scan_window_;
+  uint8_t scan_start_fail_count_;
   bool scan_continuous_;
   bool scan_active_;
   bool scanner_idle_;

From 16e523ca680d9cedfd8b70ab35c6dc235ad442d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 08:46:29 +1300
Subject: [PATCH 343/838] Bump pylint from 2.15.7 to 2.15.8 (#4148)

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 6d902ef2d7..8870876f65 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,4 +1,4 @@
-pylint==2.15.7
+pylint==2.15.8
 flake8==6.0.0  # also change in .pre-commit-config.yaml when updating
 black==22.10.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.2.2  # also change in .pre-commit-config.yaml when updating

From dbbbba3cf8ff5ad73f200c085f0a7f84c6be9aa1 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 5 Dec 2022 09:49:39 -1000
Subject: [PATCH 344/838] Fix crash with bluetooth tracker and esp-idf (#4140)

---
 .../components/esp32_ble_tracker/__init__.py  |  5 ++++
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   | 24 +++++++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index 0d7abe32f9..a3938faff2 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -238,6 +238,11 @@ async def to_code(config):
 
     if CORE.using_esp_idf:
         add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)
+        # https://github.com/espressif/esp-idf/issues/4101
+        # https://github.com/espressif/esp-idf/issues/2503
+        # Match arduino CONFIG_BTU_TASK_STACK_SIZE
+        # https://github.com/espressif/arduino-esp32/blob/fd72cf46ad6fc1a6de99c1d83ba8eba17d80a4ee/tools/sdk/esp32/sdkconfig#L1866
+        add_idf_sdkconfig_option("CONFIG_BTU_TASK_STACK_SIZE", 8192)
 
     cg.add_define("USE_OTA_STATE_CALLBACK")  # To be notified when an OTA update starts
 
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 9df81a8905..853e998c80 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -180,7 +180,13 @@ void ESP32BLETracker::loop() {
         ESP_LOGE(TAG, "ESP-IDF BLE scan could not restart after 255 attempts, rebooting to restore BLE stack...");
         App.reboot();
       }
-      esp_ble_gap_stop_scanning();
+      if (xSemaphoreTake(this->scan_end_lock_, 0L)) {
+        xSemaphoreGive(this->scan_end_lock_);
+      } else {
+        ESP_LOGD(TAG, "Stopping scan after failure...");
+        esp_ble_gap_stop_scanning();
+        this->cancel_timeout("scan");
+      }
       if (this->scan_start_failed_) {
         ESP_LOGE(TAG, "Scan start failed: %d", this->scan_start_failed_);
         this->scan_start_failed_ = ESP_BT_STATUS_SUCCESS;
@@ -199,10 +205,18 @@ void ESP32BLETracker::loop() {
   if (promote_to_connecting) {
     for (auto *client : this->clients_) {
       if (client->state() == ClientState::DISCOVERED) {
-        ESP_LOGD(TAG, "Pausing scan to make connection...");
-        esp_ble_gap_stop_scanning();
-        // We only want to promote one client at a time.
-        client->set_state(ClientState::READY_TO_CONNECT);
+        if (xSemaphoreTake(this->scan_end_lock_, 0L)) {
+          // Scanner is not running since we got the
+          // lock, so we can promote the client.
+          xSemaphoreGive(this->scan_end_lock_);
+          // We only want to promote one client at a time.
+          // once the scanner is fully stopped.
+          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");
+        }
         break;
       }
     }

From 6911639617b9857adc06d424b25b1d92b4a0ae91 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 5 Dec 2022 19:46:00 +1300
Subject: [PATCH 345/838] Fix board pin alias lookup (#4147)

---
 esphome/components/esp32/gpio.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/esphome/components/esp32/gpio.py b/esphome/components/esp32/gpio.py
index 518514a6a3..0c46bc9801 100644
--- a/esphome/components/esp32/gpio.py
+++ b/esphome/components/esp32/gpio.py
@@ -108,6 +108,10 @@ def validate_gpio_pin(value):
     board = CORE.data[KEY_ESP32][KEY_BOARD]
     board_pins = boards.ESP32_BOARD_PINS.get(board, {})
 
+    # Resolved aliased board pins (shorthand when two boards have the same pin configuration)
+    while isinstance(board_pins, str):
+        board_pins = boards.ESP32_BOARD_PINS[board_pins]
+
     if value in board_pins.values():
         return value
 

From ab736c89bbf4bd3ba0f4728aadbd7e6d4b0162ff Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 6 Dec 2022 12:52:48 +1300
Subject: [PATCH 346/838] Bump version to 2022.11.5

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

diff --git a/esphome/const.py b/esphome/const.py
index f36d776ee4..0dc5af2894 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.11.4"
+__version__ = "2022.11.5"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 48da5ef1c489a3c17fa7cc766180da75341b1d64 Mon Sep 17 00:00:00 2001
From: Matthew Schinckel <matt@schinckel.net>
Date: Tue, 6 Dec 2022 13:30:48 +1030
Subject: [PATCH 347/838] Use ENTITY_CATEGORY_CONFIG for sprinkler config
 switches. (#4141)

Update esphome/components/sprinkler/__init__.py

Co-Authored-By: Keith Burzinski <kbx81x@gmail.com>

Co-authored-by: Keith Burzinski <kbx81x@gmail.com>
---
 esphome/components/sprinkler/__init__.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/esphome/components/sprinkler/__init__.py b/esphome/components/sprinkler/__init__.py
index 4e80cfa021..52de290c85 100644
--- a/esphome/components/sprinkler/__init__.py
+++ b/esphome/components/sprinkler/__init__.py
@@ -8,6 +8,7 @@ from esphome.const import (
     CONF_NAME,
     CONF_REPEAT,
     CONF_RUN_DURATION,
+    ENTITY_CATEGORY_CONFIG,
 )
 
 AUTO_LOAD = ["switch"]
@@ -223,7 +224,9 @@ SPRINKLER_ACTION_QUEUE_VALVE_SCHEMA = cv.Schema(
 SPRINKLER_VALVE_SCHEMA = cv.Schema(
     {
         cv.Optional(CONF_ENABLE_SWITCH): cv.maybe_simple_value(
-            switch.switch_schema(SprinklerControllerSwitch),
+            switch.switch_schema(
+                SprinklerControllerSwitch, entity_category=ENTITY_CATEGORY_CONFIG
+            ),
             key=CONF_NAME,
         ),
         cv.Optional(CONF_PUMP_OFF_SWITCH_ID): cv.use_id(switch.Switch),
@@ -244,7 +247,9 @@ SPRINKLER_CONTROLLER_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(Sprinkler),
         cv.Optional(CONF_AUTO_ADVANCE_SWITCH): cv.maybe_simple_value(
-            switch.switch_schema(SprinklerControllerSwitch),
+            switch.switch_schema(
+                SprinklerControllerSwitch, entity_category=ENTITY_CATEGORY_CONFIG
+            ),
             key=CONF_NAME,
         ),
         cv.Optional(CONF_MAIN_SWITCH): cv.maybe_simple_value(
@@ -252,11 +257,15 @@ SPRINKLER_CONTROLLER_SCHEMA = cv.Schema(
             key=CONF_NAME,
         ),
         cv.Optional(CONF_QUEUE_ENABLE_SWITCH): cv.maybe_simple_value(
-            switch.switch_schema(SprinklerControllerSwitch),
+            switch.switch_schema(
+                SprinklerControllerSwitch, entity_category=ENTITY_CATEGORY_CONFIG
+            ),
             key=CONF_NAME,
         ),
         cv.Optional(CONF_REVERSE_SWITCH): cv.maybe_simple_value(
-            switch.switch_schema(SprinklerControllerSwitch),
+            switch.switch_schema(
+                SprinklerControllerSwitch, entity_category=ENTITY_CATEGORY_CONFIG
+            ),
             key=CONF_NAME,
         ),
         cv.Optional(CONF_MANUAL_SELECTION_DELAY): cv.positive_time_period_seconds,

From 30a2fc127366bd5053db85ce46d5bd906d52a9b8 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Tue, 6 Dec 2022 02:25:19 -0800
Subject: [PATCH 348/838] fix switch initialization (#4153)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
fixes https://github.com/esphome/issues/issues/3878
---
 esphome/components/gpio/switch/gpio_switch.cpp     | 2 +-
 esphome/components/output/switch/output_switch.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/gpio/switch/gpio_switch.cpp b/esphome/components/gpio/switch/gpio_switch.cpp
index 3085fa33dc..5033315b5e 100644
--- a/esphome/components/gpio/switch/gpio_switch.cpp
+++ b/esphome/components/gpio/switch/gpio_switch.cpp
@@ -10,7 +10,7 @@ float GPIOSwitch::get_setup_priority() const { return setup_priority::HARDWARE;
 void GPIOSwitch::setup() {
   ESP_LOGCONFIG(TAG, "Setting up GPIO Switch '%s'...", this->name_.c_str());
 
-  bool initial_state = Switch::get_initial_state_with_restore_mode();
+  bool initial_state = this->get_initial_state_with_restore_mode().value_or(false);
 
   // write state before setup
   if (initial_state) {
diff --git a/esphome/components/output/switch/output_switch.cpp b/esphome/components/output/switch/output_switch.cpp
index 7254451370..0e045d18b4 100644
--- a/esphome/components/output/switch/output_switch.cpp
+++ b/esphome/components/output/switch/output_switch.cpp
@@ -10,7 +10,7 @@ void OutputSwitch::dump_config() { LOG_SWITCH("", "Output Switch", this); }
 void OutputSwitch::setup() {
   ESP_LOGCONFIG(TAG, "Setting up Output Switch '%s'...", this->name_.c_str());
 
-  bool initial_state = Switch::get_initial_state_with_restore_mode();
+  bool initial_state = this->get_initial_state_with_restore_mode().value_or(false);
 
   if (initial_state) {
     this->turn_on();

From f34e797a0d9baa7ad8df082226322140f0a07b68 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 7 Dec 2022 07:23:07 +1300
Subject: [PATCH 349/838] Change 4 chip limit on sn74hc595 to 256 (#4108)

---
 esphome/components/sn74hc595/__init__.py   | 14 +++++------
 esphome/components/sn74hc595/sn74hc595.cpp | 29 +++++++++-------------
 esphome/components/sn74hc595/sn74hc595.h   | 23 +++++++++--------
 3 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/esphome/components/sn74hc595/__init__.py b/esphome/components/sn74hc595/__init__.py
index 630abc8bca..92b6d8d0e5 100644
--- a/esphome/components/sn74hc595/__init__.py
+++ b/esphome/components/sn74hc595/__init__.py
@@ -17,7 +17,9 @@ MULTI_CONF = True
 sn74hc595_ns = cg.esphome_ns.namespace("sn74hc595")
 
 SN74HC595Component = sn74hc595_ns.class_("SN74HC595Component", cg.Component)
-SN74HC595GPIOPin = sn74hc595_ns.class_("SN74HC595GPIOPin", cg.GPIOPin)
+SN74HC595GPIOPin = sn74hc595_ns.class_(
+    "SN74HC595GPIOPin", cg.GPIOPin, cg.Parented.template(SN74HC595Component)
+)
 
 CONF_SN74HC595 = "sn74hc595"
 CONF_LATCH_PIN = "latch_pin"
@@ -30,7 +32,7 @@ CONFIG_SCHEMA = cv.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(1, 4),
+        cv.Optional(CONF_SR_COUNT, default=1): cv.int_range(min=1, max=256),
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
@@ -60,7 +62,7 @@ SN74HC595_PIN_SCHEMA = cv.All(
     {
         cv.GenerateID(): cv.declare_id(SN74HC595GPIOPin),
         cv.Required(CONF_SN74HC595): cv.use_id(SN74HC595Component),
-        cv.Required(CONF_NUMBER): cv.int_range(min=0, max=31),
+        cv.Required(CONF_NUMBER): cv.int_range(min=0, max=2048, max_included=False),
         cv.Optional(CONF_MODE, default={}): cv.All(
             {
                 cv.Optional(CONF_OUTPUT, default=True): cv.All(
@@ -76,10 +78,8 @@ SN74HC595_PIN_SCHEMA = cv.All(
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_SN74HC595, SN74HC595_PIN_SCHEMA)
 async def sn74hc595_pin_to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
-    parent = await cg.get_variable(config[CONF_SN74HC595])
-    cg.add(var.set_parent(parent))
+    await cg.register_parented(var, config[CONF_SN74HC595])
 
-    num = config[CONF_NUMBER]
-    cg.add(var.set_pin(num))
+    cg.add(var.set_pin(config[CONF_NUMBER]))
     cg.add(var.set_inverted(config[CONF_INVERTED]))
     return var
diff --git a/esphome/components/sn74hc595/sn74hc595.cpp b/esphome/components/sn74hc595/sn74hc595.cpp
index 5ebf50e5cb..1895b1d5a6 100644
--- a/esphome/components/sn74hc595/sn74hc595.cpp
+++ b/esphome/components/sn74hc595/sn74hc595.cpp
@@ -28,24 +28,21 @@ void SN74HC595Component::setup() {
 
 void SN74HC595Component::dump_config() { ESP_LOGCONFIG(TAG, "SN74HC595:"); }
 
-bool SN74HC595Component::digital_read_(uint8_t pin) { return this->output_bits_ >> pin; }
-
-void SN74HC595Component::digital_write_(uint8_t pin, bool value) {
-  uint32_t mask = 1UL << pin;
-  this->output_bits_ &= ~mask;
-  if (value)
-    this->output_bits_ |= mask;
+void SN74HC595Component::digital_write_(uint16_t pin, bool value) {
+  if (pin >= this->sr_count_ * 8) {
+    ESP_LOGE(TAG, "Pin %u is out of range! Maximum pin number with %u chips in series is %u", pin, this->sr_count_,
+             (this->sr_count_ * 8) - 1);
+    return;
+  }
+  this->output_bits_[pin] = value;
   this->write_gpio_();
 }
 
-bool SN74HC595Component::write_gpio_() {
-  for (int i = this->sr_count_ - 1; i >= 0; i--) {
-    uint8_t data = (uint8_t)(this->output_bits_ >> (8 * i) & 0xff);
-    for (int j = 0; j < 8; j++) {
-      this->data_pin_->digital_write(data & (1 << (7 - j)));
-      this->clock_pin_->digital_write(true);
-      this->clock_pin_->digital_write(false);
-    }
+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);
   }
 
   // pulse latch to activate new values
@@ -56,8 +53,6 @@ bool SN74HC595Component::write_gpio_() {
   if (this->have_oe_pin_) {
     this->oe_pin_->digital_write(false);
   }
-
-  return true;
 }
 
 float SN74HC595Component::get_setup_priority() const { return setup_priority::IO; }
diff --git a/esphome/components/sn74hc595/sn74hc595.h b/esphome/components/sn74hc595/sn74hc595.h
index 784019c3a6..64bf06d881 100644
--- a/esphome/components/sn74hc595/sn74hc595.h
+++ b/esphome/components/sn74hc595/sn74hc595.h
@@ -2,6 +2,9 @@
 
 #include "esphome/core/component.h"
 #include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
+
+#include <vector>
 
 namespace esphome {
 namespace sn74hc595 {
@@ -21,13 +24,15 @@ class SN74HC595Component : public Component {
     oe_pin_ = pin;
     have_oe_pin_ = true;
   }
-  void set_sr_count(uint8_t count) { sr_count_ = count; }
+  void set_sr_count(uint8_t count) {
+    sr_count_ = count;
+    this->output_bits_.resize(count * 8);
+  }
 
  protected:
   friend class SN74HC595GPIOPin;
-  bool digital_read_(uint8_t pin);
-  void digital_write_(uint8_t pin, bool value);
-  bool write_gpio_();
+  void digital_write_(uint16_t pin, bool value);
+  void write_gpio_();
 
   GPIOPin *data_pin_;
   GPIOPin *clock_pin_;
@@ -35,11 +40,11 @@ class SN74HC595Component : public Component {
   GPIOPin *oe_pin_;
   uint8_t sr_count_;
   bool have_oe_pin_{false};
-  uint32_t output_bits_{0x00};
+  std::vector<bool> output_bits_;
 };
 
 /// Helper class to expose a SC74HC595 pin as an internal output GPIO pin.
-class SN74HC595GPIOPin : public GPIOPin {
+class SN74HC595GPIOPin : public GPIOPin, public Parented<SN74HC595Component> {
  public:
   void setup() override {}
   void pin_mode(gpio::Flags flags) override {}
@@ -47,13 +52,11 @@ class SN74HC595GPIOPin : public GPIOPin {
   void digital_write(bool value) override;
   std::string dump_summary() const override;
 
-  void set_parent(SN74HC595Component *parent) { parent_ = parent; }
-  void set_pin(uint8_t pin) { pin_ = pin; }
+  void set_pin(uint16_t pin) { pin_ = pin; }
   void set_inverted(bool inverted) { inverted_ = inverted; }
 
  protected:
-  SN74HC595Component *parent_;
-  uint8_t pin_;
+  uint16_t pin_;
   bool inverted_;
 };
 

From 2053b02c61cea203d2eb5bce8218647a978a27f1 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 7 Dec 2022 07:29:18 +1300
Subject: [PATCH 350/838] Add reports fahrenheit to tuya climate (#4032)

---
 esphome/components/tuya/climate/__init__.py      |  5 +++++
 esphome/components/tuya/climate/tuya_climate.cpp | 15 +++++++++++++--
 esphome/components/tuya/climate/tuya_climate.h   |  3 +++
 tests/test4.yaml                                 |  1 +
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/esphome/components/tuya/climate/__init__.py b/esphome/components/tuya/climate/__init__.py
index 7d4b37ad22..199c2eabeb 100644
--- a/esphome/components/tuya/climate/__init__.py
+++ b/esphome/components/tuya/climate/__init__.py
@@ -25,6 +25,7 @@ CONF_CURRENT_TEMPERATURE_MULTIPLIER = "current_temperature_multiplier"
 CONF_TARGET_TEMPERATURE_MULTIPLIER = "target_temperature_multiplier"
 CONF_ECO_DATAPOINT = "eco_datapoint"
 CONF_ECO_TEMPERATURE = "eco_temperature"
+CONF_REPORTS_FAHRENHEIT = "reports_fahrenheit"
 
 TuyaClimate = tuya_ns.class_("TuyaClimate", climate.Climate, cg.Component)
 
@@ -110,6 +111,7 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_TARGET_TEMPERATURE_MULTIPLIER): cv.positive_float,
             cv.Optional(CONF_ECO_DATAPOINT): cv.uint8_t,
             cv.Optional(CONF_ECO_TEMPERATURE): cv.temperature,
+            cv.Optional(CONF_REPORTS_FAHRENHEIT, default=False): cv.boolean,
         }
     ).extend(cv.COMPONENT_SCHEMA),
     cv.has_at_least_one_key(CONF_TARGET_TEMPERATURE_DATAPOINT, CONF_SWITCH_DATAPOINT),
@@ -186,3 +188,6 @@ async def to_code(config):
         cg.add(var.set_eco_id(config[CONF_ECO_DATAPOINT]))
         if CONF_ECO_TEMPERATURE in config:
             cg.add(var.set_eco_temperature(config[CONF_ECO_TEMPERATURE]))
+
+    if config[CONF_REPORTS_FAHRENHEIT]:
+        cg.add(var.set_reports_fahrenheit())
diff --git a/esphome/components/tuya/climate/tuya_climate.cpp b/esphome/components/tuya/climate/tuya_climate.cpp
index 280e172c7a..687764e30f 100644
--- a/esphome/components/tuya/climate/tuya_climate.cpp
+++ b/esphome/components/tuya/climate/tuya_climate.cpp
@@ -1,5 +1,5 @@
-#include "esphome/core/log.h"
 #include "tuya_climate.h"
+#include "esphome/core/log.h"
 
 namespace esphome {
 namespace tuya {
@@ -44,6 +44,10 @@ void TuyaClimate::setup() {
   if (this->target_temperature_id_.has_value()) {
     this->parent_->register_listener(*this->target_temperature_id_, [this](const TuyaDatapoint &datapoint) {
       this->manual_temperature_ = datapoint.value_int * this->target_temperature_multiplier_;
+      if (this->reports_fahrenheit_) {
+        this->manual_temperature_ = (this->manual_temperature_ - 32) * 5 / 9;
+      }
+
       ESP_LOGV(TAG, "MCU reported manual target temperature is: %.1f", this->manual_temperature_);
       this->compute_target_temperature_();
       this->compute_state_();
@@ -53,6 +57,10 @@ void TuyaClimate::setup() {
   if (this->current_temperature_id_.has_value()) {
     this->parent_->register_listener(*this->current_temperature_id_, [this](const TuyaDatapoint &datapoint) {
       this->current_temperature = datapoint.value_int * this->current_temperature_multiplier_;
+      if (this->reports_fahrenheit_) {
+        this->current_temperature = (this->current_temperature - 32) * 5 / 9;
+      }
+
       ESP_LOGV(TAG, "MCU reported current temperature is: %.1f", this->current_temperature);
       this->compute_state_();
       this->publish_state();
@@ -105,7 +113,10 @@ void TuyaClimate::control(const climate::ClimateCall &call) {
   }
 
   if (call.get_target_temperature().has_value()) {
-    const float target_temperature = *call.get_target_temperature();
+    float target_temperature = *call.get_target_temperature();
+    if (this->reports_fahrenheit_)
+      target_temperature = (target_temperature * 9 / 5) + 32;
+
     ESP_LOGV(TAG, "Setting target temperature: %.1f", target_temperature);
     this->parent_->set_integer_datapoint_value(*this->target_temperature_id_,
                                                (int) (target_temperature / this->target_temperature_multiplier_));
diff --git a/esphome/components/tuya/climate/tuya_climate.h b/esphome/components/tuya/climate/tuya_climate.h
index ec19d05308..7c18625c4e 100644
--- a/esphome/components/tuya/climate/tuya_climate.h
+++ b/esphome/components/tuya/climate/tuya_climate.h
@@ -35,6 +35,8 @@ class TuyaClimate : public climate::Climate, public Component {
   void set_eco_id(uint8_t eco_id) { this->eco_id_ = eco_id; }
   void set_eco_temperature(float eco_temperature) { this->eco_temperature_ = eco_temperature; }
 
+  void set_reports_fahrenheit() { this->reports_fahrenheit_ = true; }
+
   void set_tuya_parent(Tuya *parent) { this->parent_ = parent; }
 
  protected:
@@ -77,6 +79,7 @@ class TuyaClimate : public climate::Climate, public Component {
   bool cooling_state_{false};
   float manual_temperature_;
   bool eco_;
+  bool reports_fahrenheit_{false};
 };
 
 }  // namespace tuya
diff --git a/tests/test4.yaml b/tests/test4.yaml
index a8077c625f..db7a123dbc 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -381,6 +381,7 @@ climate:
     target_temperature_datapoint: 3
     current_temperature_multiplier: 0.5
     target_temperature_multiplier: 0.5
+    reports_fahrenheit: true
 
 switch:
   - platform: tuya

From 9370ff3dfa109832afd1ec06e6876fbdbfd0b5a1 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 7 Dec 2022 07:29:56 +1300
Subject: [PATCH 351/838] Allow dashboard import to pull complete file from
 github (#3982)

---
 .../components/dashboard_import/__init__.py   | 45 +++++++++----
 esphome/components/packages/__init__.py       | 29 +++------
 esphome/dashboard/dashboard.py                |  4 ++
 esphome/git.py                                | 65 +++++++++++++++++--
 4 files changed, 107 insertions(+), 36 deletions(-)

diff --git a/esphome/components/dashboard_import/__init__.py b/esphome/components/dashboard_import/__init__.py
index b795c85b12..4742c77785 100644
--- a/esphome/components/dashboard_import/__init__.py
+++ b/esphome/components/dashboard_import/__init__.py
@@ -1,4 +1,5 @@
 from pathlib import Path
+import requests
 
 import esphome.codegen as cg
 import esphome.config_validation as cv
@@ -6,6 +7,7 @@ from esphome.components.packages import validate_source_shorthand
 from esphome.const import CONF_WIFI
 from esphome.wizard import wizard_file
 from esphome.yaml_util import dump
+from esphome import git
 
 
 dashboard_import_ns = cg.esphome_ns.namespace("dashboard_import")
@@ -25,9 +27,12 @@ def validate_import_url(value):
 
 
 CONF_PACKAGE_IMPORT_URL = "package_import_url"
+CONF_IMPORT_FULL_CONFIG = "import_full_config"
+
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.Required(CONF_PACKAGE_IMPORT_URL): validate_import_url,
+        cv.Optional(CONF_IMPORT_FULL_CONFIG, default=False): cv.boolean,
     }
 )
 
@@ -41,6 +46,9 @@ wifi:
 
 async def to_code(config):
     cg.add_define("USE_DASHBOARD_IMPORT")
+    url = config[CONF_PACKAGE_IMPORT_URL]
+    if config[CONF_IMPORT_FULL_CONFIG]:
+        url += "?full_config"
     cg.add(dashboard_import_ns.set_package_import_url(config[CONF_PACKAGE_IMPORT_URL]))
 
 
@@ -64,17 +72,30 @@ def import_config(
             encoding="utf8",
         )
     else:
-        config = {
-            "substitutions": {"name": name},
-            "packages": {project_name: import_url},
-            "esphome": {
-                "name": "${name}",
-                "name_add_mac_suffix": False,
-            },
-        }
-        output = dump(config)
+        git_file = git.GitFile.from_shorthand(import_url)
 
-        if network == CONF_WIFI:
-            output += WIFI_CONFIG
+        if git_file.query and "full_config" in git_file.query:
+            url = git_file.raw_url
+            try:
+                req = requests.get(url, timeout=30)
+                req.raise_for_status()
+            except requests.exceptions.RequestException as e:
+                raise ValueError(f"Error while fetching {url}: {e}") from e
 
-        p.write_text(output, encoding="utf8")
+            p.write_text(req.text, encoding="utf8")
+
+        else:
+            config = {
+                "substitutions": {"name": name},
+                "packages": {project_name: import_url},
+                "esphome": {
+                    "name": "${name}",
+                    "name_add_mac_suffix": False,
+                },
+            }
+            output = dump(config)
+
+            if network == CONF_WIFI:
+                output += WIFI_CONFIG
+
+            p.write_text(output, encoding="utf8")
diff --git a/esphome/components/packages/__init__.py b/esphome/components/packages/__init__.py
index 3b5a6a5908..8392008222 100644
--- a/esphome/components/packages/__init__.py
+++ b/esphome/components/packages/__init__.py
@@ -1,23 +1,22 @@
-import re
 from pathlib import Path
-from esphome.core import EsphomeError
-from esphome.config_helpers import merge_config
 
+import esphome.config_validation as cv
 from esphome import git, yaml_util
+from esphome.config_helpers import merge_config
 from esphome.const import (
     CONF_ESPHOME,
     CONF_FILE,
     CONF_FILES,
     CONF_MIN_VERSION,
     CONF_PACKAGES,
+    CONF_PASSWORD,
     CONF_REF,
     CONF_REFRESH,
     CONF_URL,
     CONF_USERNAME,
-    CONF_PASSWORD,
-    __version__ as ESPHOME_VERSION,
 )
-import esphome.config_validation as cv
+from esphome.const import __version__ as ESPHOME_VERSION
+from esphome.core import EsphomeError
 
 DOMAIN = CONF_PACKAGES
 
@@ -55,23 +54,15 @@ def validate_source_shorthand(value):
     if not isinstance(value, str):
         raise cv.Invalid("Shorthand only for strings")
 
-    m = re.match(
-        r"github://([a-zA-Z0-9\-]+)/([a-zA-Z0-9\-\._]+)/([a-zA-Z0-9\-_.\./]+)(?:@([a-zA-Z0-9\-_.\./]+))?",
-        value,
-    )
-    if m is None:
-        raise cv.Invalid(
-            "Source is not a file system path or in expected github://username/name/[sub-folder/]file-path.yml[@branch-or-tag] format!"
-        )
+    git_file = git.GitFile.from_shorthand(value)
 
     conf = {
-        CONF_URL: f"https://github.com/{m.group(1)}/{m.group(2)}.git",
-        CONF_FILE: m.group(3),
+        CONF_URL: git_file.git_url,
+        CONF_FILE: git_file.filename,
     }
-    if m.group(4):
-        conf[CONF_REF] = m.group(4)
+    if git_file.ref:
+        conf[CONF_REF] = git_file.ref
 
-    # print(conf)
     return BASE_SCHEMA(conf)
 
 
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index c43a9e0ecb..84eea6ab23 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -416,6 +416,10 @@ class ImportRequestHandler(BaseHandler):
             self.set_status(500)
             self.write("File already exists")
             return
+        except ValueError:
+            self.set_status(422)
+            self.write("Invalid package url")
+            return
 
         self.set_status(200)
         self.finish()
diff --git a/esphome/git.py b/esphome/git.py
index 54fedc035f..d3d5996fe3 100644
--- a/esphome/git.py
+++ b/esphome/git.py
@@ -1,14 +1,15 @@
-from pathlib import Path
-import subprocess
 import hashlib
 import logging
-from typing import Callable, Optional
+import re
+import subprocess
 import urllib.parse
-
+from dataclasses import dataclass
 from datetime import datetime
+from pathlib import Path
+from typing import Callable, Optional
 
-from esphome.core import CORE, TimePeriodSeconds
 import esphome.config_validation as cv
+from esphome.core import CORE, TimePeriodSeconds
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -103,3 +104,57 @@ def clone_or_update(
             return repo_dir, revert
 
     return repo_dir, None
+
+
+GIT_DOMAINS = {
+    "github": "github.com",
+    "gitlab": "gitlab.com",
+}
+
+
+@dataclass(frozen=True)
+class GitFile:
+    domain: str
+    owner: str
+    repo: str
+    filename: str
+    ref: str = None
+    query: str = None
+
+    @property
+    def git_url(self) -> str:
+        return f"https://{self.domain}/{self.owner}/{self.repo}.git"
+
+    @property
+    def raw_url(self) -> str:
+        if self.ref is None:
+            raise ValueError("URL has no ref")
+        if self.domain == "github":
+            return f"https://raw.githubusercontent.com/{self.owner}/{self.repo}/{self.ref}/{self.filename}"
+        if self.domain == "gitlab":
+            return f"https://gitlab.com/{self.owner}/{self.repo}/-/raw/{self.ref}/{self.filename}"
+        raise NotImplementedError(f"Git domain {self.domain} not supported")
+
+    @classmethod
+    def from_shorthand(cls, shorthand):
+        """Parse a git shorthand URL into its components."""
+        if not isinstance(shorthand, str):
+            raise ValueError("Git shorthand must be a string")
+        m = re.match(
+            r"(?P<domain>[a-zA-Z0-9\-]+)://(?P<owner>[a-zA-Z0-9\-]+)/(?P<repo>[a-zA-Z0-9\-\._]+)/(?P<filename>[a-zA-Z0-9\-_.\./]+)(?:@(?P<ref>[a-zA-Z0-9\-_.\./]+))?(?:\?(?P<query>[a-zA-Z0-9\-_.\./]+))?",
+            shorthand,
+        )
+        if m is None:
+            raise ValueError(
+                "URL is not in expected github://username/name/[sub-folder/]file-path.yml[@branch-or-tag] format!"
+            )
+        if m.group("domain") not in GIT_DOMAINS:
+            raise ValueError(f"Unknown git domain {m.group('domain')}")
+        return cls(
+            domain=GIT_DOMAINS[m.group("domain")],
+            owner=m.group("owner"),
+            repo=m.group("repo"),
+            filename=m.group("filename"),
+            ref=m.group("ref"),
+            query=m.group("query"),
+        )

From f83f1bff19fec8ed19df9aa6ae29a89150a704c2 Mon Sep 17 00:00:00 2001
From: Dennis <Nizzle@users.noreply.github.com>
Date: Tue, 6 Dec 2022 23:53:20 +0100
Subject: [PATCH 352/838] Invalid config for waveshare models with no
 full_update_every (#4066)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/waveshare_epaper/display.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/esphome/components/waveshare_epaper/display.py b/esphome/components/waveshare_epaper/display.py
index a9d8350404..46da3f6fb4 100644
--- a/esphome/components/waveshare_epaper/display.py
+++ b/esphome/components/waveshare_epaper/display.py
@@ -88,13 +88,17 @@ MODELS = {
 }
 
 
-def validate_full_update_every_only_type_a(value):
+def validate_full_update_every_only_types_ac(value):
     if CONF_FULL_UPDATE_EVERY not in value:
         return value
     if MODELS[value[CONF_MODEL]][0] == "b":
+        full_models = []
+        for key, val in sorted(MODELS.items()):
+            if val[0] != "b":
+                full_models.append(key)
         raise cv.Invalid(
             "The 'full_update_every' option is only available for models "
-            "'1.54in', '1.54inV2', '2.13in', '2.90in', and '2.90inV2'."
+            + ", ".join(full_models)
         )
     return value
 
@@ -116,7 +120,7 @@ CONFIG_SCHEMA = cv.All(
     )
     .extend(cv.polling_component_schema("1s"))
     .extend(spi.spi_device_schema()),
-    validate_full_update_every_only_type_a,
+    validate_full_update_every_only_types_ac,
     cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA),
 )
 

From 4ffdc38cf54a56ecc1e6910fe3799e829a598547 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 7 Dec 2022 12:10:25 +1300
Subject: [PATCH 353/838] Add sn74hc165 input shift register (#4151)

---
 CODEOWNERS                                 |  1 +
 esphome/components/sn74hc165/__init__.py   | 87 ++++++++++++++++++++++
 esphome/components/sn74hc165/sn74hc165.cpp | 67 +++++++++++++++++
 esphome/components/sn74hc165/sn74hc165.h   | 61 +++++++++++++++
 tests/test5.yaml                           | 13 ++++
 5 files changed, 229 insertions(+)
 create mode 100644 esphome/components/sn74hc165/__init__.py
 create mode 100644 esphome/components/sn74hc165/sn74hc165.cpp
 create mode 100644 esphome/components/sn74hc165/sn74hc165.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 1da55891fd..d30060fe3b 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -208,6 +208,7 @@ esphome/components/sim800l/* @glmnet
 esphome/components/sm2135/* @BoukeHaarsma23
 esphome/components/sml/* @alengwenus
 esphome/components/smt100/* @piechade
+esphome/components/sn74hc165/* @jesserockz
 esphome/components/socket/* @esphome/core
 esphome/components/sonoff_d1/* @anatoly-savchenkov
 esphome/components/spi/* @esphome/core
diff --git a/esphome/components/sn74hc165/__init__.py b/esphome/components/sn74hc165/__init__.py
new file mode 100644
index 0000000000..85d0220a88
--- /dev/null
+++ b/esphome/components/sn74hc165/__init__.py
@@ -0,0 +1,87 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.const import (
+    CONF_ID,
+    CONF_MODE,
+    CONF_NUMBER,
+    CONF_INVERTED,
+    CONF_DATA_PIN,
+    CONF_CLOCK_PIN,
+    CONF_INPUT,
+)
+
+CODEOWNERS = ["@jesserockz"]
+DEPENDENCIES = []
+MULTI_CONF = True
+
+sn74hc165_ns = cg.esphome_ns.namespace("sn74hc165")
+
+SN74HC165Component = sn74hc165_ns.class_("SN74HC165Component", cg.Component)
+SN74HC165GPIOPin = sn74hc165_ns.class_(
+    "SN74HC165GPIOPin", cg.GPIOPin, cg.Parented.template(SN74HC165Component)
+)
+
+CONF_SN74HC165 = "sn74hc165"
+CONF_LOAD_PIN = "load_pin"
+CONF_CLOCK_INHIBIT_PIN = "clock_inhibit_pin"
+CONF_SR_COUNT = "sr_count"
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_ID): cv.declare_id(SN74HC165Component),
+        cv.Required(CONF_DATA_PIN): pins.gpio_input_pin_schema,
+        cv.Required(CONF_CLOCK_PIN): pins.gpio_output_pin_schema,
+        cv.Required(CONF_LOAD_PIN): pins.gpio_output_pin_schema,
+        cv.Optional(CONF_CLOCK_INHIBIT_PIN): pins.gpio_output_pin_schema,
+        cv.Optional(CONF_SR_COUNT, default=1): cv.int_range(min=1, max=256),
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+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))
+    load_pin = await cg.gpio_pin_expression(config[CONF_LOAD_PIN])
+    cg.add(var.set_load_pin(load_pin))
+    if CONF_CLOCK_INHIBIT_PIN in config:
+        clock_inhibit_pin = await cg.gpio_pin_expression(config[CONF_CLOCK_INHIBIT_PIN])
+        cg.add(var.set_clock_inhibit_pin(clock_inhibit_pin))
+
+    cg.add(var.set_sr_count(config[CONF_SR_COUNT]))
+
+
+def _validate_input_mode(value):
+    if value is not True:
+        raise cv.Invalid("Only input mode is supported")
+    return value
+
+
+SN74HC165_PIN_SCHEMA = cv.All(
+    {
+        cv.GenerateID(): cv.declare_id(SN74HC165GPIOPin),
+        cv.Required(CONF_SN74HC165): cv.use_id(SN74HC165Component),
+        cv.Required(CONF_NUMBER): cv.int_range(min=0, max=2048, max_included=False),
+        cv.Optional(CONF_MODE, default={}): cv.All(
+            {
+                cv.Optional(CONF_INPUT, default=True): cv.All(
+                    cv.boolean, _validate_input_mode
+                ),
+            },
+        ),
+        cv.Optional(CONF_INVERTED, default=False): cv.boolean,
+    }
+)
+
+
+@pins.PIN_SCHEMA_REGISTRY.register(CONF_SN74HC165, SN74HC165_PIN_SCHEMA)
+async def sn74hc165_pin_to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_parented(var, config[CONF_SN74HC165])
+
+    cg.add(var.set_pin(config[CONF_NUMBER]))
+    cg.add(var.set_inverted(config[CONF_INVERTED]))
+    return var
diff --git a/esphome/components/sn74hc165/sn74hc165.cpp b/esphome/components/sn74hc165/sn74hc165.cpp
new file mode 100644
index 0000000000..6c89544db4
--- /dev/null
+++ b/esphome/components/sn74hc165/sn74hc165.cpp
@@ -0,0 +1,67 @@
+#include "sn74hc165.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace sn74hc165 {
+
+static const char *const TAG = "sn74hc165";
+
+void SN74HC165Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up SN74HC165...");
+
+  // initialize pins
+  this->clock_pin_->setup();
+  this->data_pin_->setup();
+  this->load_pin_->setup();
+  this->clock_pin_->digital_write(false);
+  this->load_pin_->digital_write(false);
+
+  if (this->clock_inhibit_pin_ != nullptr) {
+    this->clock_inhibit_pin_->setup();
+    this->clock_inhibit_pin_->digital_write(true);
+  }
+
+  // read state from shift register
+  this->read_gpio_();
+}
+
+void SN74HC165Component::loop() { this->read_gpio_(); }
+
+void SN74HC165Component::dump_config() { ESP_LOGCONFIG(TAG, "SN74HC165:"); }
+
+bool SN74HC165Component::digital_read_(uint16_t pin) {
+  if (pin >= this->sr_count_ * 8) {
+    ESP_LOGE(TAG, "Pin %u is out of range! Maximum pin number with %u chips in series is %u", pin, this->sr_count_,
+             (this->sr_count_ * 8) - 1);
+    return false;
+  }
+  return this->input_bits_[pin];
+}
+
+void SN74HC165Component::read_gpio_() {
+  this->load_pin_->digital_write(false);
+  delayMicroseconds(5);
+  this->load_pin_->digital_write(true);
+  delayMicroseconds(5);
+
+  if (this->clock_inhibit_pin_ != nullptr)
+    this->clock_inhibit_pin_->digital_write(false);
+
+  for (int16_t i = (this->sr_count_ * 8) - 1; i >= 0; i--) {
+    this->input_bits_[i] = this->data_pin_->digital_read();
+    this->clock_pin_->digital_write(true);
+    this->clock_pin_->digital_write(false);
+  }
+
+  if (this->clock_inhibit_pin_ != nullptr)
+    this->clock_inhibit_pin_->digital_write(true);
+}
+
+float SN74HC165Component::get_setup_priority() const { return setup_priority::IO; }
+
+bool SN74HC165GPIOPin::digital_read() { return this->parent_->digital_read_(this->pin_); }
+
+std::string SN74HC165GPIOPin::dump_summary() const { return str_snprintf("%u via SN74HC165", 18, pin_); }
+
+}  // namespace sn74hc165
+}  // namespace esphome
diff --git a/esphome/components/sn74hc165/sn74hc165.h b/esphome/components/sn74hc165/sn74hc165.h
new file mode 100644
index 0000000000..c349d079ae
--- /dev/null
+++ b/esphome/components/sn74hc165/sn74hc165.h
@@ -0,0 +1,61 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
+
+#include <vector>
+
+namespace esphome {
+namespace sn74hc165 {
+
+class SN74HC165Component : public Component {
+ public:
+  SN74HC165Component() = default;
+
+  void setup() override;
+  void loop() override;
+  float get_setup_priority() const override;
+  void dump_config() override;
+
+  void set_data_pin(GPIOPin *pin) { this->data_pin_ = pin; }
+  void set_clock_pin(GPIOPin *pin) { this->clock_pin_ = pin; }
+  void set_load_pin(GPIOPin *pin) { this->load_pin_ = pin; }
+  void set_clock_inhibit_pin(GPIOPin *pin) { this->clock_inhibit_pin_ = pin; }
+  void set_sr_count(uint8_t count) {
+    this->sr_count_ = count;
+    this->input_bits_.resize(count * 8);
+  }
+
+ protected:
+  friend class SN74HC165GPIOPin;
+  bool digital_read_(uint16_t pin);
+  void read_gpio_();
+
+  GPIOPin *data_pin_;
+  GPIOPin *clock_pin_;
+  GPIOPin *load_pin_;
+  GPIOPin *clock_inhibit_pin_;
+  uint8_t sr_count_;
+  std::vector<bool> input_bits_;
+};
+
+/// Helper class to expose a SC74HC165 pin as an internal input GPIO pin.
+class SN74HC165GPIOPin : public GPIOPin, public Parented<SN74HC165Component> {
+ public:
+  void setup() override {}
+  void pin_mode(gpio::Flags flags) override {}
+  bool digital_read() override;
+  void digital_write(bool value) override{};
+  std::string dump_summary() const override;
+
+  void set_pin(uint16_t pin) { pin_ = pin; }
+  void set_inverted(bool inverted) { inverted_ = inverted; }
+
+ protected:
+  uint16_t pin_;
+  bool inverted_;
+};
+
+}  // namespace sn74hc165
+}  // namespace esphome
diff --git a/tests/test5.yaml b/tests/test5.yaml
index 30416fad01..596ba5de4e 100644
--- a/tests/test5.yaml
+++ b/tests/test5.yaml
@@ -162,6 +162,11 @@ binary_sensor:
       then:
         - output.turn_off: Led7
 
+  - platform: gpio
+    id: sn74hc165_pin_0
+    pin:
+      sn74hc165: sn74hc165_hub
+      number: 0
 
 
 
@@ -542,3 +547,11 @@ text_sensor:
         - ezo_pmp.arbitrary_command:
             id: hcl_pump
             command: D,?
+
+sn74hc165:
+  id: sn74hc165_hub
+  data_pin: GPIO12
+  clock_pin: GPIO14
+  load_pin: GPIO27
+  clock_inhibit_pin: GPIO26
+  sr_count: 4

From 4a3b62894659e69aca302ade9ca1b7e8e61295e8 Mon Sep 17 00:00:00 2001
From: pistifonok <57877162+pistifonok@users.noreply.github.com>
Date: Wed, 7 Dec 2022 03:59:25 +0100
Subject: [PATCH 354/838] Fixed deep sleep for ESP32C3 (#4143)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/deep_sleep/deep_sleep_component.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/deep_sleep/deep_sleep_component.cpp b/esphome/components/deep_sleep/deep_sleep_component.cpp
index 2261106b12..f6472a123c 100644
--- a/esphome/components/deep_sleep/deep_sleep_component.cpp
+++ b/esphome/components/deep_sleep/deep_sleep_component.cpp
@@ -147,7 +147,7 @@ void DeepSleepComponent::begin_sleep(bool manual) {
     if (this->wakeup_pin_mode_ == WAKEUP_PIN_MODE_INVERT_WAKEUP && this->wakeup_pin_->digital_read()) {
       level = !level;
     }
-    esp_deep_sleep_enable_gpio_wakeup(gpio_num_t(this->wakeup_pin_->get_pin()),
+    esp_deep_sleep_enable_gpio_wakeup(1 << this->wakeup_pin_->get_pin(),
                                       static_cast<esp_deepsleep_gpio_wake_up_mode_t>(level));
   }
 #endif

From f84392530107bf8716bd8b37b52e586c272e28af Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 7 Dec 2022 16:01:26 +1300
Subject: [PATCH 355/838] ESP32 IDF: Override toolchain-esp32ulp with
 espressifs own published version (#4155)

---
 esphome/components/esp32/__init__.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index 2e9d9708a5..b1c8b3ff74 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -327,6 +327,11 @@ async def to_code(config):
             "platform_packages",
             [f"platformio/framework-espidf @ {conf[CONF_SOURCE]}"],
         )
+        # platformio/toolchain-esp32ulp does not support linux_aarch64 yet and has not been updated for over 2 years
+        # This is espressif's own published version which is more up to date.
+        cg.add_platformio_option(
+            "platform_packages", ["espressif/toolchain-esp32ulp @ 2.35.0-20220830"]
+        )
         add_idf_sdkconfig_option("CONFIG_PARTITION_TABLE_SINGLE_APP", False)
         add_idf_sdkconfig_option("CONFIG_PARTITION_TABLE_CUSTOM", True)
         add_idf_sdkconfig_option(

From 6ad9baa870cbd6e49d2398635892dab2913b6f72 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 7 Dec 2022 16:07:51 +1300
Subject: [PATCH 356/838] Add API for dashboard to get boards list (#4154)

---
 esphome/components/esp32/__init__.py   |   6 +-
 esphome/components/esp32/boards.py     | 907 ++++++++++++++++++++-----
 esphome/components/esp8266/__init__.py |   7 +-
 esphome/components/esp8266/boards.py   | 242 +++++--
 esphome/components/esp8266/const.py    |   1 +
 esphome/components/rp2040/boards.py    |   9 +
 esphome/const.py                       |   1 +
 esphome/dashboard/dashboard.py         |  19 +
 script/build_language_schema.py        |   2 +-
 9 files changed, 960 insertions(+), 234 deletions(-)

diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index b1c8b3ff74..75dc68020f 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -33,7 +33,7 @@ from .const import (  # noqa
     VARIANT_FRIENDLY,
     VARIANTS,
 )
-from .boards import BOARD_TO_VARIANT
+from .boards import BOARDS
 
 # force import gpio to register pin schema
 from .gpio import esp32_pin_to_code  # noqa
@@ -230,14 +230,14 @@ def _parse_platform_version(value):
 def _detect_variant(value):
     if CONF_VARIANT not in value:
         board = value[CONF_BOARD]
-        if board not in BOARD_TO_VARIANT:
+        if board not in BOARDS:
             raise cv.Invalid(
                 "This board is unknown, please set the variant manually",
                 path=[CONF_BOARD],
             )
 
         value = value.copy()
-        value[CONF_VARIANT] = BOARD_TO_VARIANT[board]
+        value[CONF_VARIANT] = BOARDS[board][KEY_VARIANT]
 
     return value
 
diff --git a/esphome/components/esp32/boards.py b/esphome/components/esp32/boards.py
index 7a61c6ae3d..e4fdaec0aa 100644
--- a/esphome/components/esp32/boards.py
+++ b/esphome/components/esp32/boards.py
@@ -1066,197 +1066,738 @@ ESP32_BOARD_PINS = {
 }
 
 """
-BOARD_TO_VARIANT generated with:
+BOARDS generated with:
 
 git clone https://github.com/platformio/platform-espressif32
 for x in platform-espressif32/boards/*.json; do
   mcu=$(jq -r .build.mcu <"$x");
+  name=$(jq -r .name <"$x");
   fname=$(basename "$x")
   board="${fname%.*}"
   variant=$(echo "$mcu" | tr '[:lower:]' '[:upper:]')
-  echo "    \"$board\": VARIANT_${variant},"
+  echo "    \"$board\": {\"name\": \"$name\", \"variant\": VARIANT_${variant},},"
 done | sort
 """
 
-BOARD_TO_VARIANT = {
-    "adafruit_feather_esp32s2_tft": VARIANT_ESP32S2,
-    "adafruit_feather_esp32s3_nopsram": VARIANT_ESP32S3,
-    "adafruit_feather_esp32s3_tft": VARIANT_ESP32S3,
-    "adafruit_feather_esp32s3": VARIANT_ESP32S3,
-    "adafruit_feather_esp32_v2": VARIANT_ESP32,
-    "adafruit_funhouse_esp32s2": VARIANT_ESP32S2,
-    "adafruit_itsybitsy_esp32": VARIANT_ESP32,
-    "adafruit_magtag29_esp32s2": VARIANT_ESP32S2,
-    "adafruit_metro_esp32s2": VARIANT_ESP32S2,
-    "adafruit_qtpy_esp32c3": VARIANT_ESP32C3,
-    "adafruit_qtpy_esp32s2": VARIANT_ESP32S2,
-    "adafruit_qtpy_esp32s3_nopsram": VARIANT_ESP32S3,
-    "adafruit_qtpy_esp32": VARIANT_ESP32,
-    "airm2m_core_esp32c3": VARIANT_ESP32C3,
-    "alksesp32": VARIANT_ESP32,
-    "atmegazero_esp32s2": VARIANT_ESP32S2,
-    "az-delivery-devkit-v4": VARIANT_ESP32,
-    "bee_motion_mini": VARIANT_ESP32C3,
-    "bee_motion_s3": VARIANT_ESP32S3,
-    "bee_motion": VARIANT_ESP32S2,
-    "bee_s3": VARIANT_ESP32S3,
-    "bpi-bit": VARIANT_ESP32,
-    "briki_abc_esp32": VARIANT_ESP32,
-    "briki_mbc-wb_esp32": VARIANT_ESP32,
-    "cnrs_aw2eth": VARIANT_ESP32,
-    "connaxio_espoir": VARIANT_ESP32,
-    "d-duino-32": VARIANT_ESP32,
-    "deneyapkart1A": VARIANT_ESP32,
-    "deneyapkartg": VARIANT_ESP32C3,
-    "deneyapkart": VARIANT_ESP32,
-    "deneyapmini": VARIANT_ESP32S2,
-    "denky32": VARIANT_ESP32,
-    "denky_d4": VARIANT_ESP32,
-    "dfrobot_beetle_esp32c3": VARIANT_ESP32C3,
-    "dfrobot_firebeetle2_esp32s3": VARIANT_ESP32S3,
-    "dpu_esp32": VARIANT_ESP32,
-    "esp320": VARIANT_ESP32,
-    "esp32-c3-devkitm-1": VARIANT_ESP32C3,
-    "esp32cam": VARIANT_ESP32,
-    "esp32-devkitlipo": VARIANT_ESP32,
-    "esp32dev": VARIANT_ESP32,
-    "esp32doit-devkit-v1": VARIANT_ESP32,
-    "esp32doit-espduino": VARIANT_ESP32,
-    "esp32-evb": VARIANT_ESP32,
-    "esp32-gateway": VARIANT_ESP32,
-    "esp32-poe-iso": VARIANT_ESP32,
-    "esp32-poe": VARIANT_ESP32,
-    "esp32-pro": VARIANT_ESP32,
-    "esp32-s2-franzininho": VARIANT_ESP32S2,
-    "esp32-s2-kaluga-1": VARIANT_ESP32S2,
-    "esp32-s2-saola-1": VARIANT_ESP32S2,
-    "esp32s3box": VARIANT_ESP32S3,
-    "esp32s3camlcd": VARIANT_ESP32S3,
-    "esp32-s3-devkitc-1": VARIANT_ESP32S3,
-    "esp32thing_plus": VARIANT_ESP32,
-    "esp32thing": VARIANT_ESP32,
-    "esp32vn-iot-uno": VARIANT_ESP32,
-    "espea32": VARIANT_ESP32,
-    "espectro32": VARIANT_ESP32,
-    "espino32": VARIANT_ESP32,
-    "esp-wrover-kit": VARIANT_ESP32,
-    "etboard": VARIANT_ESP32,
-    "featheresp32-s2": VARIANT_ESP32S2,
-    "featheresp32": VARIANT_ESP32,
-    "firebeetle32": VARIANT_ESP32,
-    "fm-devkit": VARIANT_ESP32,
-    "franzininho_wifi_esp32s2": VARIANT_ESP32S2,
-    "franzininho_wifi_msc_esp32s2": VARIANT_ESP32S2,
-    "frogboard": VARIANT_ESP32,
-    "healthypi4": VARIANT_ESP32,
-    "heltec_wifi_kit_32_v2": VARIANT_ESP32,
-    "heltec_wifi_kit_32": VARIANT_ESP32,
-    "heltec_wifi_lora_32_V2": VARIANT_ESP32,
-    "heltec_wifi_lora_32": VARIANT_ESP32,
-    "heltec_wireless_stick_lite": VARIANT_ESP32,
-    "heltec_wireless_stick": VARIANT_ESP32,
-    "honeylemon": VARIANT_ESP32,
-    "hornbill32dev": VARIANT_ESP32,
-    "hornbill32minima": VARIANT_ESP32,
-    "imbrios-logsens-v1p1": VARIANT_ESP32,
-    "inex_openkb": VARIANT_ESP32,
-    "intorobot": VARIANT_ESP32,
-    "iotaap_magnolia": VARIANT_ESP32,
-    "iotbusio": VARIANT_ESP32,
-    "iotbusproteus": VARIANT_ESP32,
-    "kb32-ft": VARIANT_ESP32,
-    "kits-edu": VARIANT_ESP32,
-    "labplus_mpython": VARIANT_ESP32,
-    "lionbit": VARIANT_ESP32,
-    "lolin32_lite": VARIANT_ESP32,
-    "lolin32": VARIANT_ESP32,
-    "lolin_c3_mini": VARIANT_ESP32C3,
-    "lolin_d32_pro": VARIANT_ESP32,
-    "lolin_d32": VARIANT_ESP32,
-    "lolin_s2_mini": VARIANT_ESP32S2,
-    "lolin_s2_pico": VARIANT_ESP32S2,
-    "lolin_s3": VARIANT_ESP32S3,
-    "lopy4": VARIANT_ESP32,
-    "lopy": VARIANT_ESP32,
-    "m5stack-atom": VARIANT_ESP32,
-    "m5stack-core2": VARIANT_ESP32,
-    "m5stack-core-esp32": VARIANT_ESP32,
-    "m5stack-coreink": VARIANT_ESP32,
-    "m5stack-fire": VARIANT_ESP32,
-    "m5stack-grey": VARIANT_ESP32,
-    "m5stack-station": VARIANT_ESP32,
-    "m5stack-timer-cam": VARIANT_ESP32,
-    "m5stick-c": VARIANT_ESP32,
-    "magicbit": VARIANT_ESP32,
-    "mgbot-iotik32a": VARIANT_ESP32,
-    "mgbot-iotik32b": VARIANT_ESP32,
-    "mhetesp32devkit": VARIANT_ESP32,
-    "mhetesp32minikit": VARIANT_ESP32,
-    "microduino-core-esp32": VARIANT_ESP32,
-    "micros2": VARIANT_ESP32S2,
-    "minimain_esp32s2": VARIANT_ESP32S2,
-    "nano32": VARIANT_ESP32,
-    "nina_w10": VARIANT_ESP32,
-    "node32s": VARIANT_ESP32,
-    "nodemcu-32s2": VARIANT_ESP32S2,
-    "nodemcu-32s": VARIANT_ESP32,
-    "nscreen-32": VARIANT_ESP32,
-    "odroid_esp32": VARIANT_ESP32,
-    "onehorse32dev": VARIANT_ESP32,
-    "oroca_edubot": VARIANT_ESP32,
-    "pico32": VARIANT_ESP32,
-    "piranha_esp32": VARIANT_ESP32,
-    "pocket_32": VARIANT_ESP32,
-    "pycom_gpy": VARIANT_ESP32,
-    "qchip": VARIANT_ESP32,
-    "quantum": VARIANT_ESP32,
-    "seeed_xiao_esp32c3": VARIANT_ESP32C3,
-    "sensesiot_weizen": VARIANT_ESP32,
-    "sg-o_airMon": VARIANT_ESP32,
-    "s_odi_ultra": VARIANT_ESP32,
-    "sparkfun_esp32_iot_redboard": VARIANT_ESP32,
-    "sparkfun_esp32micromod": VARIANT_ESP32,
-    "sparkfun_esp32s2_thing_plus_c": VARIANT_ESP32,
-    "sparkfun_esp32s2_thing_plus": VARIANT_ESP32S2,
-    "sparkfun_lora_gateway_1-channel": VARIANT_ESP32,
-    "tamc_termod_s3": VARIANT_ESP32S3,
-    "tinypico": VARIANT_ESP32,
-    "trueverit-iot-driver-mk2": VARIANT_ESP32,
-    "trueverit-iot-driver-mk3": VARIANT_ESP32,
-    "trueverit-iot-driver": VARIANT_ESP32,
-    "ttgo-lora32-v1": VARIANT_ESP32,
-    "ttgo-lora32-v21": VARIANT_ESP32,
-    "ttgo-lora32-v2": VARIANT_ESP32,
-    "ttgo-t1": VARIANT_ESP32,
-    "ttgo-t7-v13-mini32": VARIANT_ESP32,
-    "ttgo-t7-v14-mini32": VARIANT_ESP32,
-    "ttgo-t-beam": VARIANT_ESP32,
-    "ttgo-t-oi-plus": VARIANT_ESP32C3,
-    "ttgo-t-watch": VARIANT_ESP32,
-    "turta_iot_node": VARIANT_ESP32,
-    "um_feathers2_neo": VARIANT_ESP32S2,
-    "um_feathers2": VARIANT_ESP32S2,
-    "um_feathers3": VARIANT_ESP32S3,
-    "um_pros3": VARIANT_ESP32S3,
-    "um_rmp": VARIANT_ESP32S2,
-    "um_tinys2": VARIANT_ESP32S2,
-    "um_tinys3": VARIANT_ESP32S3,
-    "unphone7": VARIANT_ESP32,
-    "unphone8": VARIANT_ESP32S3,
-    "unphone9": VARIANT_ESP32S3,
-    "upesy_wroom": VARIANT_ESP32,
-    "upesy_wrover": VARIANT_ESP32,
-    "vintlabs-devkit-v1": VARIANT_ESP32,
-    "watchy": VARIANT_ESP32,
-    "wemosbat": VARIANT_ESP32,
-    "wemos_d1_mini32": VARIANT_ESP32,
-    "wemos_d1_uno32": VARIANT_ESP32,
-    "wesp32": VARIANT_ESP32,
-    "widora-air": VARIANT_ESP32,
-    "wifiduino32c3": VARIANT_ESP32C3,
-    "wifiduino32s3": VARIANT_ESP32S3,
-    "wifiduino32": VARIANT_ESP32,
-    "wipy3": VARIANT_ESP32,
-    "wt32-eth01": VARIANT_ESP32,
-    "xinabox_cw02": VARIANT_ESP32,
+BOARDS = {
+    "adafruit_feather_esp32s2_tft": {
+        "name": "Adafruit Feather ESP32-S2 TFT",
+        "variant": VARIANT_ESP32S2,
+    },
+    "adafruit_feather_esp32s3": {
+        "name": "Adafruit Feather ESP32-S3 2MB PSRAM",
+        "variant": VARIANT_ESP32S3,
+    },
+    "adafruit_feather_esp32s3_nopsram": {
+        "name": "Adafruit Feather ESP32-S3 No PSRAM",
+        "variant": VARIANT_ESP32S3,
+    },
+    "adafruit_feather_esp32s3_tft": {
+        "name": "Adafruit Feather ESP32-S3 TFT",
+        "variant": VARIANT_ESP32S3,
+    },
+    "adafruit_feather_esp32_v2": {
+        "name": "Adafruit Feather ESP32 V2",
+        "variant": VARIANT_ESP32,
+    },
+    "adafruit_funhouse_esp32s2": {
+        "name": "Adafruit FunHouse",
+        "variant": VARIANT_ESP32S2,
+    },
+    "adafruit_itsybitsy_esp32": {
+        "name": "Adafruit ItsyBitsy ESP32",
+        "variant": VARIANT_ESP32,
+    },
+    "adafruit_magtag29_esp32s2": {
+        "name": "Adafruit MagTag 2.9",
+        "variant": VARIANT_ESP32S2,
+    },
+    "adafruit_metro_esp32s2": {
+        "name": "Adafruit Metro ESP32-S2",
+        "variant": VARIANT_ESP32S2,
+    },
+    "adafruit_qtpy_esp32c3": {
+        "name": "Adafruit QT Py ESP32-C3",
+        "variant": VARIANT_ESP32C3,
+    },
+    "adafruit_qtpy_esp32": {
+        "name": "Adafruit QT Py ESP32",
+        "variant": VARIANT_ESP32,
+    },
+    "adafruit_qtpy_esp32s2": {
+        "name": "Adafruit QT Py ESP32-S2",
+        "variant": VARIANT_ESP32S2,
+    },
+    "adafruit_qtpy_esp32s3_nopsram": {
+        "name": "Adafruit QT Py ESP32-S3 No PSRAM",
+        "variant": VARIANT_ESP32S3,
+    },
+    "airm2m_core_esp32c3": {
+        "name": "AirM2M CORE ESP32C3",
+        "variant": VARIANT_ESP32C3,
+    },
+    "alksesp32": {
+        "name": "ALKS ESP32",
+        "variant": VARIANT_ESP32,
+    },
+    "atmegazero_esp32s2": {
+        "name": "EspinalLab ATMegaZero ESP32-S2",
+        "variant": VARIANT_ESP32S2,
+    },
+    "az-delivery-devkit-v4": {
+        "name": "AZ-Delivery ESP-32 Dev Kit C V4",
+        "variant": VARIANT_ESP32,
+    },
+    "bee_motion_mini": {
+        "name": "Smart Bee Motion Mini",
+        "variant": VARIANT_ESP32C3,
+    },
+    "bee_motion": {
+        "name": "Smart Bee Motion",
+        "variant": VARIANT_ESP32S2,
+    },
+    "bee_motion_s3": {
+        "name": "Smart Bee Motion S3",
+        "variant": VARIANT_ESP32S3,
+    },
+    "bee_s3": {
+        "name": "Smart Bee S3",
+        "variant": VARIANT_ESP32S3,
+    },
+    "bpi-bit": {
+        "name": "BPI-Bit",
+        "variant": VARIANT_ESP32,
+    },
+    "briki_abc_esp32": {
+        "name": "Briki ABC (MBC-WB) - ESP32",
+        "variant": VARIANT_ESP32,
+    },
+    "briki_mbc-wb_esp32": {
+        "name": "Briki MBC-WB - ESP32",
+        "variant": VARIANT_ESP32,
+    },
+    "cnrs_aw2eth": {
+        "name": "CNRS AW2ETH",
+        "variant": VARIANT_ESP32,
+    },
+    "connaxio_espoir": {
+        "name": "Connaxio's Espoir",
+        "variant": VARIANT_ESP32,
+    },
+    "d-duino-32": {
+        "name": "D-duino-32",
+        "variant": VARIANT_ESP32,
+    },
+    "deneyapkart1A": {
+        "name": "Deneyap Kart 1A",
+        "variant": VARIANT_ESP32,
+    },
+    "deneyapkartg": {
+        "name": "Deneyap Kart G",
+        "variant": VARIANT_ESP32C3,
+    },
+    "deneyapkart": {
+        "name": "Deneyap Kart",
+        "variant": VARIANT_ESP32,
+    },
+    "deneyapmini": {
+        "name": "Deneyap Mini",
+        "variant": VARIANT_ESP32S2,
+    },
+    "denky32": {
+        "name": "Denky32 (WROOM32)",
+        "variant": VARIANT_ESP32,
+    },
+    "denky_d4": {
+        "name": "Denky D4 (PICO-V3-02)",
+        "variant": VARIANT_ESP32,
+    },
+    "dfrobot_beetle_esp32c3": {
+        "name": "DFRobot Beetle ESP32-C3",
+        "variant": VARIANT_ESP32C3,
+    },
+    "dfrobot_firebeetle2_esp32s3": {
+        "name": "DFRobot Firebeetle 2 ESP32-S3",
+        "variant": VARIANT_ESP32S3,
+    },
+    "dpu_esp32": {
+        "name": "TAMC DPU ESP32",
+        "variant": VARIANT_ESP32,
+    },
+    "esp320": {
+        "name": "Electronic SweetPeas ESP320",
+        "variant": VARIANT_ESP32,
+    },
+    "esp32-c3-devkitm-1": {
+        "name": "Espressif ESP32-C3-DevKitM-1",
+        "variant": VARIANT_ESP32C3,
+    },
+    "esp32cam": {
+        "name": "AI Thinker ESP32-CAM",
+        "variant": VARIANT_ESP32,
+    },
+    "esp32-devkitlipo": {
+        "name": "OLIMEX ESP32-DevKit-LiPo",
+        "variant": VARIANT_ESP32,
+    },
+    "esp32dev": {
+        "name": "Espressif ESP32 Dev Module",
+        "variant": VARIANT_ESP32,
+    },
+    "esp32doit-devkit-v1": {
+        "name": "DOIT ESP32 DEVKIT V1",
+        "variant": VARIANT_ESP32,
+    },
+    "esp32doit-espduino": {
+        "name": "DOIT ESPduino32",
+        "variant": VARIANT_ESP32,
+    },
+    "esp32-evb": {
+        "name": "OLIMEX ESP32-EVB",
+        "variant": VARIANT_ESP32,
+    },
+    "esp32-gateway": {
+        "name": "OLIMEX ESP32-GATEWAY",
+        "variant": VARIANT_ESP32,
+    },
+    "esp32-poe-iso": {
+        "name": "OLIMEX ESP32-PoE-ISO",
+        "variant": VARIANT_ESP32,
+    },
+    "esp32-poe": {
+        "name": "OLIMEX ESP32-PoE",
+        "variant": VARIANT_ESP32,
+    },
+    "esp32-pro": {
+        "name": "OLIMEX ESP32-PRO",
+        "variant": VARIANT_ESP32,
+    },
+    "esp32-s2-franzininho": {
+        "name": "Franzininho WiFi Board",
+        "variant": VARIANT_ESP32S2,
+    },
+    "esp32-s2-kaluga-1": {
+        "name": "Espressif ESP32-S2-Kaluga-1 Kit",
+        "variant": VARIANT_ESP32S2,
+    },
+    "esp32-s2-saola-1": {
+        "name": "Espressif ESP32-S2-Saola-1",
+        "variant": VARIANT_ESP32S2,
+    },
+    "esp32s3box": {
+        "name": "Espressif ESP32-S3-Box",
+        "variant": VARIANT_ESP32S3,
+    },
+    "esp32s3camlcd": {
+        "name": "ESP32S3 CAM LCD",
+        "variant": VARIANT_ESP32S3,
+    },
+    "esp32-s3-devkitc-1": {
+        "name": "Espressif ESP32-S3-DevKitC-1-N8 (8 MB QD, No PSRAM)",
+        "variant": VARIANT_ESP32S3,
+    },
+    "esp32thing": {
+        "name": "SparkFun ESP32 Thing",
+        "variant": VARIANT_ESP32,
+    },
+    "esp32thing_plus": {
+        "name": "SparkFun ESP32 Thing Plus",
+        "variant": VARIANT_ESP32,
+    },
+    "esp32vn-iot-uno": {
+        "name": "ESP32vn IoT Uno",
+        "variant": VARIANT_ESP32,
+    },
+    "espea32": {
+        "name": "April Brother ESPea32",
+        "variant": VARIANT_ESP32,
+    },
+    "espectro32": {
+        "name": "ESPectro32",
+        "variant": VARIANT_ESP32,
+    },
+    "espino32": {
+        "name": "ESPino32",
+        "variant": VARIANT_ESP32,
+    },
+    "esp-wrover-kit": {
+        "name": "Espressif ESP-WROVER-KIT",
+        "variant": VARIANT_ESP32,
+    },
+    "etboard": {
+        "name": "ETBoard",
+        "variant": VARIANT_ESP32,
+    },
+    "featheresp32": {
+        "name": "Adafruit ESP32 Feather",
+        "variant": VARIANT_ESP32,
+    },
+    "featheresp32-s2": {
+        "name": "Adafruit ESP32-S2 Feather Development Board",
+        "variant": VARIANT_ESP32S2,
+    },
+    "firebeetle32": {
+        "name": "FireBeetle-ESP32",
+        "variant": VARIANT_ESP32,
+    },
+    "fm-devkit": {
+        "name": "ESP32 FM DevKit",
+        "variant": VARIANT_ESP32,
+    },
+    "franzininho_wifi_esp32s2": {
+        "name": "Franzininho WiFi",
+        "variant": VARIANT_ESP32S2,
+    },
+    "franzininho_wifi_msc_esp32s2": {
+        "name": "Franzininho WiFi MSC",
+        "variant": VARIANT_ESP32S2,
+    },
+    "frogboard": {
+        "name": "Frog Board ESP32",
+        "variant": VARIANT_ESP32,
+    },
+    "healthypi4": {
+        "name": "ProtoCentral HealthyPi 4",
+        "variant": VARIANT_ESP32,
+    },
+    "heltec_wifi_kit_32": {
+        "name": "Heltec WiFi Kit 32",
+        "variant": VARIANT_ESP32,
+    },
+    "heltec_wifi_kit_32_v2": {
+        "name": "Heltec WiFi Kit 32 (V2)",
+        "variant": VARIANT_ESP32,
+    },
+    "heltec_wifi_lora_32": {
+        "name": "Heltec WiFi LoRa 32",
+        "variant": VARIANT_ESP32,
+    },
+    "heltec_wifi_lora_32_V2": {
+        "name": "Heltec WiFi LoRa 32 (V2)",
+        "variant": VARIANT_ESP32,
+    },
+    "heltec_wireless_stick_lite": {
+        "name": "Heltec Wireless Stick Lite",
+        "variant": VARIANT_ESP32,
+    },
+    "heltec_wireless_stick": {
+        "name": "Heltec Wireless Stick",
+        "variant": VARIANT_ESP32,
+    },
+    "honeylemon": {
+        "name": "HONEYLemon",
+        "variant": VARIANT_ESP32,
+    },
+    "hornbill32dev": {
+        "name": "Hornbill ESP32 Dev",
+        "variant": VARIANT_ESP32,
+    },
+    "hornbill32minima": {
+        "name": "Hornbill ESP32 Minima",
+        "variant": VARIANT_ESP32,
+    },
+    "imbrios-logsens-v1p1": {
+        "name": "Imbrios LogSens V1P1",
+        "variant": VARIANT_ESP32,
+    },
+    "inex_openkb": {
+        "name": "INEX OpenKB",
+        "variant": VARIANT_ESP32,
+    },
+    "intorobot": {
+        "name": "IntoRobot Fig",
+        "variant": VARIANT_ESP32,
+    },
+    "iotaap_magnolia": {
+        "name": "IoTaaP Magnolia",
+        "variant": VARIANT_ESP32,
+    },
+    "iotbusio": {
+        "name": "oddWires IoT-Bus Io",
+        "variant": VARIANT_ESP32,
+    },
+    "iotbusproteus": {
+        "name": "oddWires IoT-Bus Proteus",
+        "variant": VARIANT_ESP32,
+    },
+    "kb32-ft": {
+        "name": "MakerAsia KB32-FT",
+        "variant": VARIANT_ESP32,
+    },
+    "kits-edu": {
+        "name": "KITS ESP32 EDU",
+        "variant": VARIANT_ESP32,
+    },
+    "labplus_mpython": {
+        "name": "Labplus mPython",
+        "variant": VARIANT_ESP32,
+    },
+    "lionbit": {
+        "name": "Lion:Bit Dev Board",
+        "variant": VARIANT_ESP32,
+    },
+    "lolin32_lite": {
+        "name": "WEMOS LOLIN32 Lite",
+        "variant": VARIANT_ESP32,
+    },
+    "lolin32": {
+        "name": "WEMOS LOLIN32",
+        "variant": VARIANT_ESP32,
+    },
+    "lolin_c3_mini": {
+        "name": "WEMOS LOLIN C3 Mini",
+        "variant": VARIANT_ESP32C3,
+    },
+    "lolin_d32": {
+        "name": "WEMOS LOLIN D32",
+        "variant": VARIANT_ESP32,
+    },
+    "lolin_d32_pro": {
+        "name": "WEMOS LOLIN D32 PRO",
+        "variant": VARIANT_ESP32,
+    },
+    "lolin_s2_mini": {
+        "name": "WEMOS LOLIN S2 Mini",
+        "variant": VARIANT_ESP32S2,
+    },
+    "lolin_s2_pico": {
+        "name": "WEMOS LOLIN S2 PICO",
+        "variant": VARIANT_ESP32S2,
+    },
+    "lolin_s3": {
+        "name": "WEMOS LOLIN S3",
+        "variant": VARIANT_ESP32S3,
+    },
+    "lopy4": {
+        "name": "Pycom LoPy4",
+        "variant": VARIANT_ESP32,
+    },
+    "lopy": {
+        "name": "Pycom LoPy",
+        "variant": VARIANT_ESP32,
+    },
+    "m5stack-atom": {
+        "name": "M5Stack-ATOM",
+        "variant": VARIANT_ESP32,
+    },
+    "m5stack-core2": {
+        "name": "M5Stack Core2",
+        "variant": VARIANT_ESP32,
+    },
+    "m5stack-core-esp32": {
+        "name": "M5Stack Core ESP32",
+        "variant": VARIANT_ESP32,
+    },
+    "m5stack-coreink": {
+        "name": "M5Stack-Core Ink",
+        "variant": VARIANT_ESP32,
+    },
+    "m5stack-fire": {
+        "name": "M5Stack FIRE",
+        "variant": VARIANT_ESP32,
+    },
+    "m5stack-grey": {
+        "name": "M5Stack GREY ESP32",
+        "variant": VARIANT_ESP32,
+    },
+    "m5stack-station": {
+        "name": "M5Stack Station",
+        "variant": VARIANT_ESP32,
+    },
+    "m5stack-timer-cam": {
+        "name": "M5Stack Timer CAM",
+        "variant": VARIANT_ESP32,
+    },
+    "m5stick-c": {
+        "name": "M5Stick-C",
+        "variant": VARIANT_ESP32,
+    },
+    "magicbit": {
+        "name": "MagicBit",
+        "variant": VARIANT_ESP32,
+    },
+    "mgbot-iotik32a": {
+        "name": "MGBOT IOTIK 32A",
+        "variant": VARIANT_ESP32,
+    },
+    "mgbot-iotik32b": {
+        "name": "MGBOT IOTIK 32B",
+        "variant": VARIANT_ESP32,
+    },
+    "mhetesp32devkit": {
+        "name": "MH ET LIVE ESP32DevKIT",
+        "variant": VARIANT_ESP32,
+    },
+    "mhetesp32minikit": {
+        "name": "MH ET LIVE ESP32MiniKit",
+        "variant": VARIANT_ESP32,
+    },
+    "microduino-core-esp32": {
+        "name": "Microduino Core ESP32",
+        "variant": VARIANT_ESP32,
+    },
+    "micros2": {
+        "name": "microS2",
+        "variant": VARIANT_ESP32S2,
+    },
+    "minimain_esp32s2": {
+        "name": "Deparment of Alchemy MiniMain ESP32-S2",
+        "variant": VARIANT_ESP32S2,
+    },
+    "nano32": {
+        "name": "MakerAsia Nano32",
+        "variant": VARIANT_ESP32,
+    },
+    "nina_w10": {
+        "name": "u-blox NINA-W10 series",
+        "variant": VARIANT_ESP32,
+    },
+    "node32s": {
+        "name": "Node32s",
+        "variant": VARIANT_ESP32,
+    },
+    "nodemcu-32s2": {
+        "name": "Ai-Thinker NodeMCU-32S2 (ESP-12K)",
+        "variant": VARIANT_ESP32S2,
+    },
+    "nodemcu-32s": {
+        "name": "NodeMCU-32S",
+        "variant": VARIANT_ESP32,
+    },
+    "nscreen-32": {
+        "name": "YeaCreate NSCREEN-32",
+        "variant": VARIANT_ESP32,
+    },
+    "odroid_esp32": {
+        "name": "ODROID-GO",
+        "variant": VARIANT_ESP32,
+    },
+    "onehorse32dev": {
+        "name": "Onehorse ESP32 Dev Module",
+        "variant": VARIANT_ESP32,
+    },
+    "oroca_edubot": {
+        "name": "OROCA EduBot",
+        "variant": VARIANT_ESP32,
+    },
+    "pico32": {
+        "name": "ESP32 Pico Kit",
+        "variant": VARIANT_ESP32,
+    },
+    "piranha_esp32": {
+        "name": "Fishino Piranha ESP-32",
+        "variant": VARIANT_ESP32,
+    },
+    "pocket_32": {
+        "name": "Dongsen Tech Pocket 32",
+        "variant": VARIANT_ESP32,
+    },
+    "pycom_gpy": {
+        "name": "Pycom GPy",
+        "variant": VARIANT_ESP32,
+    },
+    "qchip": {
+        "name": "Qchip",
+        "variant": VARIANT_ESP32,
+    },
+    "quantum": {
+        "name": "Noduino Quantum",
+        "variant": VARIANT_ESP32,
+    },
+    "seeed_xiao_esp32c3": {
+        "name": "Seeed Studio XIAO ESP32C3",
+        "variant": VARIANT_ESP32C3,
+    },
+    "sensesiot_weizen": {
+        "name": "LOGISENSES Senses Weizen",
+        "variant": VARIANT_ESP32,
+    },
+    "sg-o_airMon": {
+        "name": "SG-O AirMon",
+        "variant": VARIANT_ESP32,
+    },
+    "s_odi_ultra": {
+        "name": "S.ODI Ultra v1",
+        "variant": VARIANT_ESP32,
+    },
+    "sparkfun_esp32_iot_redboard": {
+        "name": "SparkFun ESP32 IoT RedBoard",
+        "variant": VARIANT_ESP32,
+    },
+    "sparkfun_esp32micromod": {
+        "name": "SparkFun ESP32 MicroMod",
+        "variant": VARIANT_ESP32,
+    },
+    "sparkfun_esp32s2_thing_plus_c": {
+        "name": "SparkFun ESP32 Thing Plus C",
+        "variant": VARIANT_ESP32,
+    },
+    "sparkfun_esp32s2_thing_plus": {
+        "name": "SparkFun ESP32-S2 Thing Plus",
+        "variant": VARIANT_ESP32S2,
+    },
+    "sparkfun_lora_gateway_1-channel": {
+        "name": "SparkFun LoRa Gateway 1-Channel",
+        "variant": VARIANT_ESP32,
+    },
+    "tamc_termod_s3": {
+        "name": "TAMC Termod S3",
+        "variant": VARIANT_ESP32S3,
+    },
+    "tinypico": {
+        "name": "Unexpected Maker TinyPICO",
+        "variant": VARIANT_ESP32,
+    },
+    "trueverit-iot-driver-mk2": {
+        "name": "Trueverit ESP32 Universal IoT Driver MK II",
+        "variant": VARIANT_ESP32,
+    },
+    "trueverit-iot-driver-mk3": {
+        "name": "Trueverit ESP32 Universal IoT Driver MK III",
+        "variant": VARIANT_ESP32,
+    },
+    "trueverit-iot-driver": {
+        "name": "Trueverit ESP32 Universal IoT Driver",
+        "variant": VARIANT_ESP32,
+    },
+    "ttgo-lora32-v1": {
+        "name": "TTGO LoRa32-OLED V1",
+        "variant": VARIANT_ESP32,
+    },
+    "ttgo-lora32-v21": {
+        "name": "TTGO LoRa32-OLED v2.1.6",
+        "variant": VARIANT_ESP32,
+    },
+    "ttgo-lora32-v2": {
+        "name": "TTGO LoRa32-OLED V2",
+        "variant": VARIANT_ESP32,
+    },
+    "ttgo-t1": {
+        "name": "TTGO T1",
+        "variant": VARIANT_ESP32,
+    },
+    "ttgo-t7-v13-mini32": {
+        "name": "TTGO T7 V1.3 Mini32",
+        "variant": VARIANT_ESP32,
+    },
+    "ttgo-t7-v14-mini32": {
+        "name": "TTGO T7 V1.4 Mini32",
+        "variant": VARIANT_ESP32,
+    },
+    "ttgo-t-beam": {
+        "name": "TTGO T-Beam",
+        "variant": VARIANT_ESP32,
+    },
+    "ttgo-t-oi-plus": {
+        "name": "TTGO T-OI PLUS RISC-V ESP32-C3",
+        "variant": VARIANT_ESP32C3,
+    },
+    "ttgo-t-watch": {
+        "name": "TTGO T-Watch",
+        "variant": VARIANT_ESP32,
+    },
+    "turta_iot_node": {
+        "name": "Turta IoT Node",
+        "variant": VARIANT_ESP32,
+    },
+    "um_feathers2": {
+        "name": "Unexpected Maker FeatherS2",
+        "variant": VARIANT_ESP32S2,
+    },
+    "um_feathers2_neo": {
+        "name": "Unexpected Maker FeatherS2 Neo",
+        "variant": VARIANT_ESP32S2,
+    },
+    "um_feathers3": {
+        "name": "Unexpected Maker FeatherS3",
+        "variant": VARIANT_ESP32S3,
+    },
+    "um_pros3": {
+        "name": "Unexpected Maker PROS3",
+        "variant": VARIANT_ESP32S3,
+    },
+    "um_rmp": {
+        "name": "Unexpected Maker RMP",
+        "variant": VARIANT_ESP32S2,
+    },
+    "um_tinys2": {
+        "name": "Unexpected Maker TinyS2",
+        "variant": VARIANT_ESP32S2,
+    },
+    "um_tinys3": {
+        "name": "Unexpected Maker TinyS3",
+        "variant": VARIANT_ESP32S3,
+    },
+    "unphone7": {
+        "name": "unPhone 7",
+        "variant": VARIANT_ESP32,
+    },
+    "unphone8": {
+        "name": "unPhone 8",
+        "variant": VARIANT_ESP32S3,
+    },
+    "unphone9": {
+        "name": "unPhone 9",
+        "variant": VARIANT_ESP32S3,
+    },
+    "upesy_wroom": {
+        "name": "uPesy ESP32 Wroom DevKit",
+        "variant": VARIANT_ESP32,
+    },
+    "upesy_wrover": {
+        "name": "uPesy ESP32 Wrover DevKit",
+        "variant": VARIANT_ESP32,
+    },
+    "vintlabs-devkit-v1": {
+        "name": "VintLabs ESP32 Devkit",
+        "variant": VARIANT_ESP32,
+    },
+    "watchy": {
+        "name": "SQFMI Watchy v2.0",
+        "variant": VARIANT_ESP32,
+    },
+    "wemosbat": {
+        "name": "WeMos WiFi and Bluetooth Battery",
+        "variant": VARIANT_ESP32,
+    },
+    "wemos_d1_mini32": {
+        "name": "WEMOS D1 MINI ESP32",
+        "variant": VARIANT_ESP32,
+    },
+    "wemos_d1_uno32": {
+        "name": "WEMOS D1 R32",
+        "variant": VARIANT_ESP32,
+    },
+    "wesp32": {
+        "name": "Silicognition wESP32",
+        "variant": VARIANT_ESP32,
+    },
+    "widora-air": {
+        "name": "Widora AIR",
+        "variant": VARIANT_ESP32,
+    },
+    "wifiduino32c3": {
+        "name": "Blinker WiFiduinoV2 (ESP32-C3)",
+        "variant": VARIANT_ESP32C3,
+    },
+    "wifiduino32": {
+        "name": "Blinker WiFiduino32",
+        "variant": VARIANT_ESP32,
+    },
+    "wifiduino32s3": {
+        "name": "Blinker WiFiduino32S3",
+        "variant": VARIANT_ESP32S3,
+    },
+    "wipy3": {
+        "name": "Pycom WiPy3",
+        "variant": VARIANT_ESP32,
+    },
+    "wt32-eth01": {
+        "name": "Wireless-Tag WT32-ETH01 Ethernet Module",
+        "variant": VARIANT_ESP32,
+    },
+    "xinabox_cw02": {
+        "name": "XinaBox CW02",
+        "variant": VARIANT_ESP32,
+    },
 }
diff --git a/esphome/components/esp8266/__init__.py b/esphome/components/esp8266/__init__.py
index 41d7688d44..8715a3b4e6 100644
--- a/esphome/components/esp8266/__init__.py
+++ b/esphome/components/esp8266/__init__.py
@@ -22,10 +22,11 @@ from .const import (
     CONF_EARLY_PIN_INIT,
     KEY_BOARD,
     KEY_ESP8266,
+    KEY_FLASH_SIZE,
     KEY_PIN_INITIAL_STATES,
     esp8266_ns,
 )
-from .boards import ESP8266_FLASH_SIZES, ESP8266_LD_SCRIPTS
+from .boards import BOARDS, ESP8266_LD_SCRIPTS
 
 from .gpio import PinInitialState, add_pin_initial_states_array
 
@@ -218,8 +219,8 @@ async def to_code(config):
         cg.RawExpression(f"VERSION_CODE({ver.major}, {ver.minor}, {ver.patch})"),
     )
 
-    if config[CONF_BOARD] in ESP8266_FLASH_SIZES:
-        flash_size = ESP8266_FLASH_SIZES[config[CONF_BOARD]]
+    if config[CONF_BOARD] in BOARDS:
+        flash_size = BOARDS[config[CONF_BOARD]][KEY_FLASH_SIZE]
         ld_scripts = ESP8266_LD_SCRIPTS[flash_size]
 
         if ver <= cv.Version(2, 3, 0):
diff --git a/esphome/components/esp8266/boards.py b/esphome/components/esp8266/boards.py
index 8b0a23a00f..02bfa9e662 100644
--- a/esphome/components/esp8266/boards.py
+++ b/esphome/components/esp8266/boards.py
@@ -4,50 +4,6 @@ FLASH_SIZE_2_MB = 2 * FLASH_SIZE_1_MB
 FLASH_SIZE_4_MB = 4 * FLASH_SIZE_1_MB
 FLASH_SIZE_16_MB = 16 * FLASH_SIZE_1_MB
 
-ESP8266_FLASH_SIZES = {
-    "d1": FLASH_SIZE_4_MB,
-    "d1_mini": FLASH_SIZE_4_MB,
-    "d1_mini_lite": FLASH_SIZE_1_MB,
-    "d1_mini_pro": FLASH_SIZE_16_MB,
-    "esp01": FLASH_SIZE_512_KB,
-    "esp01_1m": FLASH_SIZE_1_MB,
-    "esp07": FLASH_SIZE_4_MB,
-    "esp12e": FLASH_SIZE_4_MB,
-    "esp210": FLASH_SIZE_4_MB,
-    "esp8285": FLASH_SIZE_1_MB,
-    "esp_wroom_02": FLASH_SIZE_2_MB,
-    "espduino": FLASH_SIZE_4_MB,
-    "espectro": FLASH_SIZE_4_MB,
-    "espino": FLASH_SIZE_4_MB,
-    "espinotee": FLASH_SIZE_4_MB,
-    "espmxdevkit": FLASH_SIZE_1_MB,
-    "espresso_lite_v1": FLASH_SIZE_4_MB,
-    "espresso_lite_v2": FLASH_SIZE_4_MB,
-    "gen4iod": FLASH_SIZE_512_KB,
-    "heltec_wifi_kit_8": FLASH_SIZE_4_MB,
-    "huzzah": FLASH_SIZE_4_MB,
-    "inventone": FLASH_SIZE_4_MB,
-    "modwifi": FLASH_SIZE_2_MB,
-    "nodemcu": FLASH_SIZE_4_MB,
-    "nodemcuv2": FLASH_SIZE_4_MB,
-    "oak": FLASH_SIZE_4_MB,
-    "phoenix_v1": FLASH_SIZE_4_MB,
-    "phoenix_v2": FLASH_SIZE_4_MB,
-    "sonoff_basic": FLASH_SIZE_1_MB,
-    "sonoff_s20": FLASH_SIZE_1_MB,
-    "sonoff_sv": FLASH_SIZE_1_MB,
-    "sonoff_th": FLASH_SIZE_1_MB,
-    "sparkfunBlynk": FLASH_SIZE_4_MB,
-    "thing": FLASH_SIZE_512_KB,
-    "thingdev": FLASH_SIZE_512_KB,
-    "wifi_slot": FLASH_SIZE_1_MB,
-    "wifiduino": FLASH_SIZE_4_MB,
-    "wifinfo": FLASH_SIZE_1_MB,
-    "wio_link": FLASH_SIZE_4_MB,
-    "wio_node": FLASH_SIZE_4_MB,
-    "xinabox_cw01": FLASH_SIZE_4_MB,
-}
-
 ESP8266_LD_SCRIPTS = {
     FLASH_SIZE_512_KB: ("eagle.flash.512k0.ld", "eagle.flash.512k.ld"),
     FLASH_SIZE_1_MB: ("eagle.flash.1m0.ld", "eagle.flash.1m.ld"),
@@ -206,3 +162,201 @@ ESP8266_BOARD_PINS = {
     "wio_node": {"LED": 2, "GROVE": 15, "D0": 3, "D1": 5, "BUTTON": 0},
     "xinabox_cw01": {"SDA": 2, "SCL": 14, "LED": 5, "LED_RED": 12, "LED_GREEN": 13},
 }
+
+"""
+BOARDS generate with:
+
+git clone https://github.com/platformio/platform-espressif8266
+for x in platform-espressif8266/boards/*.json; do
+  max_size=$(jq -r .upload.maximum_size <"$x")
+  name=$(jq -r .name <"$x")
+  fname=$(basename "$x")
+  board="${fname%.*}"
+  size_mb=$((max_size / (1024 * 1024)))
+  if [[ $size_mb -gt 0 ]]; then
+    size="${size_mb}_MB"
+  else
+    size="${$((max_size / 1024))}_KB"
+  fi
+  echo "    \"$board\": {\"name\": \"$name\", \"flash_size\": FLASH_SIZE_$size,},"
+done | sort
+"""
+
+BOARDS = {
+    "agruminolemon": {
+        "name": "Lifely Agrumino Lemon v4",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "d1_mini_lite": {
+        "name": "WeMos D1 mini Lite",
+        "flash_size": FLASH_SIZE_1_MB,
+    },
+    "d1_mini": {
+        "name": "WeMos D1 R2 and mini",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "d1_mini_pro": {
+        "name": "WeMos D1 mini Pro",
+        "flash_size": FLASH_SIZE_16_MB,
+    },
+    "d1": {
+        "name": "WEMOS D1 R1",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "eduinowifi": {
+        "name": "Schirmilabs Eduino WiFi",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "esp01_1m": {
+        "name": "Espressif Generic ESP8266 ESP-01 1M",
+        "flash_size": FLASH_SIZE_1_MB,
+    },
+    "esp01": {
+        "name": "Espressif Generic ESP8266 ESP-01 512k",
+        "flash_size": FLASH_SIZE_512_KB,
+    },
+    "esp07": {
+        "name": "Espressif Generic ESP8266 ESP-07 1MB",
+        "flash_size": FLASH_SIZE_1_MB,
+    },
+    "esp07s": {
+        "name": "Espressif Generic ESP8266 ESP-07S",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "esp12e": {
+        "name": "Espressif ESP8266 ESP-12E",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "esp210": {
+        "name": "SweetPea ESP-210",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "esp8285": {
+        "name": "Generic ESP8285 Module",
+        "flash_size": FLASH_SIZE_1_MB,
+    },
+    "espduino": {
+        "name": "ESPDuino (ESP-13 Module)",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "espectro": {
+        "name": "ESPectro Core",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "espino": {
+        "name": "ESPino",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "espinotee": {
+        "name": "ThaiEasyElec ESPino",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "espmxdevkit": {
+        "name": "ESP-Mx DevKit (ESP8285)",
+        "flash_size": FLASH_SIZE_1_MB,
+    },
+    "espresso_lite_v1": {
+        "name": "ESPresso Lite 1.0",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "espresso_lite_v2": {
+        "name": "ESPresso Lite 2.0",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "esp_wroom_02": {
+        "name": "ESP-WROOM-02",
+        "flash_size": FLASH_SIZE_2_MB,
+    },
+    "gen4iod": {
+        "name": "4D Systems gen4 IoD Range",
+        "flash_size": FLASH_SIZE_512_KB,
+    },
+    "heltec_wifi_kit_8": {
+        "name": "Heltec Wifi kit 8",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "huzzah": {
+        "name": "Adafruit HUZZAH ESP8266",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "inventone": {
+        "name": "Invent One",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "modwifi": {
+        "name": "Olimex MOD-WIFI-ESP8266(-DEV)",
+        "flash_size": FLASH_SIZE_2_MB,
+    },
+    "nodemcu": {
+        "name": "NodeMCU 0.9 (ESP-12 Module)",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "nodemcuv2": {
+        "name": "NodeMCU 1.0 (ESP-12E Module)",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "oak": {
+        "name": "DigiStump Oak",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "phoenix_v1": {
+        "name": "Phoenix 1.0",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "phoenix_v2": {
+        "name": "Phoenix 2.0",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "sonoff_basic": {
+        "name": "Sonoff Basic",
+        "flash_size": FLASH_SIZE_1_MB,
+    },
+    "sonoff_s20": {
+        "name": "Sonoff S20",
+        "flash_size": FLASH_SIZE_1_MB,
+    },
+    "sonoff_sv": {
+        "name": "Sonoff SV",
+        "flash_size": FLASH_SIZE_1_MB,
+    },
+    "sonoff_th": {
+        "name": "Sonoff TH",
+        "flash_size": FLASH_SIZE_1_MB,
+    },
+    "sparkfunBlynk": {
+        "name": "SparkFun Blynk Board",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "thingdev": {
+        "name": "SparkFun ESP8266 Thing Dev",
+        "flash_size": FLASH_SIZE_512_KB,
+    },
+    "thing": {
+        "name": "SparkFun ESP8266 Thing",
+        "flash_size": FLASH_SIZE_512_KB,
+    },
+    "wifiduino": {
+        "name": "WiFiduino",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "wifinfo": {
+        "name": "WifInfo",
+        "flash_size": FLASH_SIZE_1_MB,
+    },
+    "wifi_slot": {
+        "name": "WiFi Slot",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "wio_link": {
+        "name": "Wio Link",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "wio_node": {
+        "name": "Wio Node",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+    "xinabox_cw01": {
+        "name": "XinaBox CW01",
+        "flash_size": FLASH_SIZE_4_MB,
+    },
+}
diff --git a/esphome/components/esp8266/const.py b/esphome/components/esp8266/const.py
index 7740a97ff4..b718306b01 100644
--- a/esphome/components/esp8266/const.py
+++ b/esphome/components/esp8266/const.py
@@ -5,6 +5,7 @@ KEY_BOARD = "board"
 KEY_PIN_INITIAL_STATES = "pin_initial_states"
 CONF_RESTORE_FROM_FLASH = "restore_from_flash"
 CONF_EARLY_PIN_INIT = "early_pin_init"
+KEY_FLASH_SIZE = "flash_size"
 
 # esp8266 namespace is already defined by arduino, manually prefix esphome
 esp8266_ns = cg.global_ns.namespace("esphome").namespace("esp8266")
diff --git a/esphome/components/rp2040/boards.py b/esphome/components/rp2040/boards.py
index 6063b6d77d..c761efba58 100644
--- a/esphome/components/rp2040/boards.py
+++ b/esphome/components/rp2040/boards.py
@@ -17,3 +17,12 @@ RP2040_BOARD_PINS = {
         "SCL1": 27,
     },
 }
+
+BOARDS = {
+    "rpipico": {
+        "name": "Raspberry Pi Pico",
+    },
+    "rpipicow": {
+        "name": "Raspberry Pi Pico W",
+    },
+}
diff --git a/esphome/const.py b/esphome/const.py
index af5adcf26d..f0005d7e08 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -992,6 +992,7 @@ KEY_CORE = "core"
 KEY_TARGET_PLATFORM = "target_platform"
 KEY_TARGET_FRAMEWORK = "target_framework"
 KEY_FRAMEWORK_VERSION = "framework_version"
+KEY_NAME = "name"
 
 # Entity categories
 ENTITY_CATEGORY_NONE = ""
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 84eea6ab23..2cf826dea9 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -693,6 +693,24 @@ class PrometheusServiceDiscoveryHandler(BaseHandler):
         self.write(json.dumps(sd))
 
 
+class BoardsRequestHandler(BaseHandler):
+    @authenticated
+    def get(self):
+        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
+
+        boards = {
+            "esp32": {key: val[const.KEY_NAME] for key, val in ESP32_BOARDS.items()},
+            "esp8266": {
+                key: val[const.KEY_NAME] for key, val in ESP8266_BOARDS.items()
+            },
+            "rp2040": {key: val[const.KEY_NAME] for key, val in RP2040_BOARDS.items()},
+        }
+        self.set_header("content-type", "application/json")
+        self.write(json.dumps(boards))
+
+
 class MDNSStatusThread(threading.Thread):
     def run(self):
         global IMPORT_RESULT
@@ -1063,6 +1081,7 @@ def make_app(debug=get_bool_env(ENV_DEV)):
             (f"{rel}json-config", JsonConfigRequestHandler),
             (f"{rel}rename", EsphomeRenameHandler),
             (f"{rel}prometheus-sd", PrometheusServiceDiscoveryHandler),
+            (f"{rel}boards", BoardsRequestHandler),
         ],
         **app_settings,
     )
diff --git a/script/build_language_schema.py b/script/build_language_schema.py
index 234082c91e..4c8639a1b3 100644
--- a/script/build_language_schema.py
+++ b/script/build_language_schema.py
@@ -245,7 +245,7 @@ def do_esp32():
 
     setEnum(
         output["esp32"]["schemas"]["CONFIG_SCHEMA"]["schema"]["config_vars"]["board"],
-        list(esp32_boards.BOARD_TO_VARIANT.keys()),
+        list(esp32_boards.BOARDS.keys()),
     )
 
 

From f500f448b12d10c62df0ca31d82729e9612aa342 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Dec 2022 16:08:26 +1300
Subject: [PATCH 357/838] Bump pytest-asyncio from 0.20.1 to 0.20.2 (#4019)

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 8870876f65..987f819d52 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -8,6 +8,6 @@ pre-commit
 pytest==7.2.0
 pytest-cov==4.0.0
 pytest-mock==3.10.0
-pytest-asyncio==0.20.1
+pytest-asyncio==0.20.2
 asyncmock==0.4.2
 hypothesis==5.49.0

From 6f198a473603037fae7e78e1ddb06746e49c2113 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Dec 2022 16:09:21 +1300
Subject: [PATCH 358/838] Bump pyupgrade from 3.2.2 to 3.3.0 (#4137)

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 8fa7563667..b8c0a22e81 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.2.2
+    rev: v3.3.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
diff --git a/requirements_test.txt b/requirements_test.txt
index 987f819d52..fbc8f63613 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,7 +1,7 @@
 pylint==2.15.8
 flake8==6.0.0  # also change in .pre-commit-config.yaml when updating
 black==22.10.0  # also change in .pre-commit-config.yaml when updating
-pyupgrade==3.2.2  # also change in .pre-commit-config.yaml when updating
+pyupgrade==3.3.0  # also change in .pre-commit-config.yaml when updating
 pre-commit
 
 # Unit tests

From 499e120aa457a0ec09d68bedfc33b134f3a787ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Dec 2022 16:10:43 +1300
Subject: [PATCH 359/838] Bump dessant/lock-threads from 3 to 4 (#4150)

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

diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml
index 1cf82895f3..e762512ff6 100644
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -18,7 +18,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v3
+      - uses: dessant/lock-threads@v4
         with:
           pr-inactive-days: "1"
           pr-lock-reason: ""

From 8b8efb57afbdf7b2c2585bfd4016309d2a13277e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Dec 2022 16:16:32 +1300
Subject: [PATCH 360/838] Bump aioesphomeapi from 12.2.1 to 13.0.1 (#4149)

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 a92cae7047..6ca999d5dc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.5  # When updating platformio, also update Dockerfile
 esptool==4.4
 click==8.1.3
 esphome-dashboard==20221109.0
-aioesphomeapi==12.2.1
+aioesphomeapi==13.0.1
 zeroconf==0.39.4
 
 # esp-idf requires this, but doesn't bundle it by default

From c6885c1bf42fbdc2b68a5e60adb92dd4c49b3708 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 7 Dec 2022 16:47:45 +1300
Subject: [PATCH 361/838] Bump esphome-dashboard to 20221207.0 (#4156)

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

diff --git a/requirements.txt b/requirements.txt
index 6ca999d5dc..6366a252fa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.1.5  # When updating platformio, also update Dockerfile
 esptool==4.4
 click==8.1.3
-esphome-dashboard==20221109.0
+esphome-dashboard==20221207.0
 aioesphomeapi==13.0.1
 zeroconf==0.39.4
 

From dee4d0ccb7b9bb64a1fda768085a02fabd5e823b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 7 Dec 2022 17:00:10 +1300
Subject: [PATCH 362/838] Bump version to 2022.12.0b1

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

diff --git a/esphome/const.py b/esphome/const.py
index f0005d7e08..1fc09b400f 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.12.0-dev"
+__version__ = "2022.12.0b1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 34387adbcdd91491812d2e2aaff04ff20dacf133 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 7 Dec 2022 17:00:11 +1300
Subject: [PATCH 363/838] Bump version to 2023.1.0-dev

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

diff --git a/esphome/const.py b/esphome/const.py
index f0005d7e08..19fc226dd9 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.12.0-dev"
+__version__ = "2023.1.0-dev"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 92e44b8238d0190ec2b7c04303f766e43b3509f8 Mon Sep 17 00:00:00 2001
From: John Britton <public@johndbritton.com>
Date: Wed, 7 Dec 2022 01:27:14 -0500
Subject: [PATCH 364/838] Expose lambda action to reset a cycle in `slow_pwm`
 (#4158)

---
 esphome/components/slow_pwm/slow_pwm_output.cpp | 2 +-
 esphome/components/slow_pwm/slow_pwm_output.h   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/esphome/components/slow_pwm/slow_pwm_output.cpp b/esphome/components/slow_pwm/slow_pwm_output.cpp
index 81c721a866..d6b2cdfe12 100644
--- a/esphome/components/slow_pwm/slow_pwm_output.cpp
+++ b/esphome/components/slow_pwm/slow_pwm_output.cpp
@@ -70,7 +70,7 @@ void SlowPWMOutput::dump_config() {
 void SlowPWMOutput::write_state(float state) {
   this->state_ = state;
   if (this->restart_cycle_on_state_change_)
-    this->period_start_time_ = millis();
+    this->restart_cycle();
 }
 
 }  // namespace slow_pwm
diff --git a/esphome/components/slow_pwm/slow_pwm_output.h b/esphome/components/slow_pwm/slow_pwm_output.h
index be45736864..3e5a3e2a40 100644
--- a/esphome/components/slow_pwm/slow_pwm_output.h
+++ b/esphome/components/slow_pwm/slow_pwm_output.h
@@ -14,6 +14,7 @@ class SlowPWMOutput : public output::FloatOutput, public Component {
   void set_restart_cycle_on_state_change(bool restart_cycle_on_state_change) {
     restart_cycle_on_state_change_ = restart_cycle_on_state_change;
   }
+  void restart_cycle() { this->period_start_time_ = millis(); }
 
   /// Initialize pin
   void setup() override;

From 0c24d951ff07bccd982443733ecce0675e93833d Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 8 Dec 2022 13:39:33 +1300
Subject: [PATCH 365/838] Fix ble parsing with zero padded advertisements
 (#4162)

---
 esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 853e998c80..fb377e2be2 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -705,8 +705,13 @@ void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_p
 
   while (offset + 2 < len) {
     const uint8_t field_length = payload[offset++];  // First byte is length of adv record
-    if (field_length == 0)
+    if (field_length == 0) {
+      if (offset < param.adv_data_len && param.scan_rsp_len > 0) {  // Zero padded advertisement data
+        offset = param.adv_data_len;
+        continue;
+      }
       break;
+    }
 
     // first byte of adv record is adv record type
     const uint8_t record_type = payload[offset++];

From 21679cf2ba4e1288bcb87007a8cf688b18b53232 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 8 Dec 2022 13:39:33 +1300
Subject: [PATCH 366/838] Fix ble parsing with zero padded advertisements
 (#4162)

---
 esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 853e998c80..fb377e2be2 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -705,8 +705,13 @@ void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_p
 
   while (offset + 2 < len) {
     const uint8_t field_length = payload[offset++];  // First byte is length of adv record
-    if (field_length == 0)
+    if (field_length == 0) {
+      if (offset < param.adv_data_len && param.scan_rsp_len > 0) {  // Zero padded advertisement data
+        offset = param.adv_data_len;
+        continue;
+      }
       break;
+    }
 
     // first byte of adv record is adv record type
     const uint8_t record_type = payload[offset++];

From 7b0a298497512682bff744cac96970b96a964f0b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 8 Dec 2022 13:42:25 +1300
Subject: [PATCH 367/838] Bump version to 2022.12.0b2

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

diff --git a/esphome/const.py b/esphome/const.py
index 1fc09b400f..851dcbe1d2 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.12.0b1"
+__version__ = "2022.12.0b2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From cc45945fcf784efa6c2068c203d5ac15ed6d8029 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <bjorn@haxx.se>
Date: Thu, 8 Dec 2022 21:13:10 +0100
Subject: [PATCH 368/838] climate: Add features to generic Toshiba model
 (#3912)

Add fan speed modes, dry and fan-only operation modes.
This reduce differences between generic and PT14111 models.
---
 esphome/components/toshiba/toshiba.cpp | 32 ++++++++++++++++++++++----
 esphome/components/toshiba/toshiba.h   | 17 ++++----------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/esphome/components/toshiba/toshiba.cpp b/esphome/components/toshiba/toshiba.cpp
index 104e885aab..a070ccceb2 100644
--- a/esphome/components/toshiba/toshiba.cpp
+++ b/esphome/components/toshiba/toshiba.cpp
@@ -124,9 +124,6 @@ void ToshibaClimate::setup() {
   // Set supported modes & temperatures based on model
   this->minimum_temperature_ = this->temperature_min_();
   this->maximum_temperature_ = this->temperature_max_();
-  this->supports_dry_ = this->toshiba_supports_dry_();
-  this->supports_fan_only_ = this->toshiba_supports_fan_only_();
-  this->fan_modes_ = this->toshiba_fan_modes_();
   this->swing_modes_ = this->toshiba_swing_modes_();
   // Never send nan to HA
   if (std::isnan(this->target_temperature))
@@ -178,12 +175,39 @@ void ToshibaClimate::transmit_generic_() {
       mode = TOSHIBA_MODE_COOL;
       break;
 
+    case climate::CLIMATE_MODE_DRY:
+      mode = TOSHIBA_MODE_DRY;
+      break;
+
+    case climate::CLIMATE_MODE_FAN_ONLY:
+      mode = TOSHIBA_MODE_FAN_ONLY;
+      break;
+
     case climate::CLIMATE_MODE_HEAT_COOL:
     default:
       mode = TOSHIBA_MODE_AUTO;
   }
 
-  message[6] |= mode | TOSHIBA_FAN_SPEED_AUTO;
+  uint8_t fan;
+  switch (this->fan_mode.value()) {
+    case climate::CLIMATE_FAN_LOW:
+      fan = TOSHIBA_FAN_SPEED_1;
+      break;
+
+    case climate::CLIMATE_FAN_MEDIUM:
+      fan = TOSHIBA_FAN_SPEED_3;
+      break;
+
+    case climate::CLIMATE_FAN_HIGH:
+      fan = TOSHIBA_FAN_SPEED_5;
+      break;
+
+    case climate::CLIMATE_FAN_AUTO:
+    default:
+      fan = TOSHIBA_FAN_SPEED_AUTO;
+      break;
+  }
+  message[6] = fan | mode;
 
   // Zero
   message[7] = 0x00;
diff --git a/esphome/components/toshiba/toshiba.h b/esphome/components/toshiba/toshiba.h
index 36e8760169..729548e747 100644
--- a/esphome/components/toshiba/toshiba.h
+++ b/esphome/components/toshiba/toshiba.h
@@ -22,7 +22,10 @@ const float TOSHIBA_RAC_PT1411HWRU_TEMP_F_MAX = 86.0;
 
 class ToshibaClimate : public climate_ir::ClimateIR {
  public:
-  ToshibaClimate() : climate_ir::ClimateIR(TOSHIBA_GENERIC_TEMP_C_MIN, TOSHIBA_GENERIC_TEMP_C_MAX, 1.0f) {}
+  ToshibaClimate()
+      : climate_ir::ClimateIR(TOSHIBA_GENERIC_TEMP_C_MIN, TOSHIBA_GENERIC_TEMP_C_MAX, 1.0f, true, true,
+                              {climate::CLIMATE_FAN_AUTO, climate::CLIMATE_FAN_LOW, climate::CLIMATE_FAN_MEDIUM,
+                               climate::CLIMATE_FAN_HIGH}) {}
 
   void setup() override;
   void set_model(Model model) { this->model_ = model; }
@@ -46,18 +49,6 @@ class ToshibaClimate : public climate_ir::ClimateIR {
   float temperature_max_() {
     return (this->model_ == MODEL_GENERIC) ? TOSHIBA_GENERIC_TEMP_C_MAX : TOSHIBA_RAC_PT1411HWRU_TEMP_C_MAX;
   }
-  bool toshiba_supports_dry_() {
-    return ((this->model_ == MODEL_RAC_PT1411HWRU_C) || (this->model_ == MODEL_RAC_PT1411HWRU_F));
-  }
-  bool toshiba_supports_fan_only_() {
-    return ((this->model_ == MODEL_RAC_PT1411HWRU_C) || (this->model_ == MODEL_RAC_PT1411HWRU_F));
-  }
-  std::set<climate::ClimateFanMode> toshiba_fan_modes_() {
-    return (this->model_ == MODEL_GENERIC)
-               ? std::set<climate::ClimateFanMode>{}
-               : std::set<climate::ClimateFanMode>{climate::CLIMATE_FAN_AUTO, climate::CLIMATE_FAN_LOW,
-                                                   climate::CLIMATE_FAN_MEDIUM, climate::CLIMATE_FAN_HIGH};
-  }
   std::set<climate::ClimateSwingMode> toshiba_swing_modes_() {
     return (this->model_ == MODEL_GENERIC)
                ? std::set<climate::ClimateSwingMode>{}

From d4e232f267c2ec3c6d4ea726412bf366e8f90ea4 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 12 Dec 2022 16:16:24 +1300
Subject: [PATCH 369/838] Increase watchdog timeout when starting OTA (#4172)

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

diff --git a/esphome/components/ota/ota_backend_esp_idf.cpp b/esphome/components/ota/ota_backend_esp_idf.cpp
index 167f8c059b..2fdc00c54d 100644
--- a/esphome/components/ota/ota_backend_esp_idf.cpp
+++ b/esphome/components/ota/ota_backend_esp_idf.cpp
@@ -1,6 +1,8 @@
 #include "esphome/core/defines.h"
 #ifdef USE_ESP_IDF
 
+#include <esp_task_wdt.h>
+
 #include "ota_backend_esp_idf.h"
 #include "ota_component.h"
 #include <esp_ota_ops.h>
@@ -14,7 +16,9 @@ OTAResponseTypes IDFOTABackend::begin(size_t image_size) {
   if (this->partition_ == nullptr) {
     return OTA_RESPONSE_ERROR_NO_UPDATE_PARTITION;
   }
+  esp_task_wdt_init(15, false);  // The following function takes longer than the 5 seconds timeout of WDT
   esp_err_t err = esp_ota_begin(this->partition_, image_size, &this->update_handle_);
+  esp_task_wdt_init(CONFIG_ESP_TASK_WDT_TIMEOUT_S, false);  // Set the WDT back to the configured timeout
   if (err != ESP_OK) {
     esp_ota_abort(this->update_handle_);
     this->update_handle_ = 0;

From 5d98e2923b67fdf33097506a1521cd8ad233162c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 12 Dec 2022 16:16:24 +1300
Subject: [PATCH 370/838] Increase watchdog timeout when starting OTA (#4172)

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

diff --git a/esphome/components/ota/ota_backend_esp_idf.cpp b/esphome/components/ota/ota_backend_esp_idf.cpp
index 167f8c059b..2fdc00c54d 100644
--- a/esphome/components/ota/ota_backend_esp_idf.cpp
+++ b/esphome/components/ota/ota_backend_esp_idf.cpp
@@ -1,6 +1,8 @@
 #include "esphome/core/defines.h"
 #ifdef USE_ESP_IDF
 
+#include <esp_task_wdt.h>
+
 #include "ota_backend_esp_idf.h"
 #include "ota_component.h"
 #include <esp_ota_ops.h>
@@ -14,7 +16,9 @@ OTAResponseTypes IDFOTABackend::begin(size_t image_size) {
   if (this->partition_ == nullptr) {
     return OTA_RESPONSE_ERROR_NO_UPDATE_PARTITION;
   }
+  esp_task_wdt_init(15, false);  // The following function takes longer than the 5 seconds timeout of WDT
   esp_err_t err = esp_ota_begin(this->partition_, image_size, &this->update_handle_);
+  esp_task_wdt_init(CONFIG_ESP_TASK_WDT_TIMEOUT_S, false);  // Set the WDT back to the configured timeout
   if (err != ESP_OK) {
     esp_ota_abort(this->update_handle_);
     this->update_handle_ = 0;

From cc7e2bf8db5d07b04d7edef5f12e3c512921d834 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 12 Dec 2022 17:19:12 +1300
Subject: [PATCH 371/838] Bump version to 2022.12.0b3

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

diff --git a/esphome/const.py b/esphome/const.py
index 851dcbe1d2..415ff8c6ec 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.12.0b2"
+__version__ = "2022.12.0b3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From eef578f4b85547ada9f6e5950af198b5210ee293 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 13 Dec 2022 08:14:18 +1300
Subject: [PATCH 372/838] Bump esphome-dashboard to 20221213.0 (#4176)

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

diff --git a/requirements.txt b/requirements.txt
index 6366a252fa..9c12253160 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.1.5  # When updating platformio, also update Dockerfile
 esptool==4.4
 click==8.1.3
-esphome-dashboard==20221207.0
+esphome-dashboard==20221213.0
 aioesphomeapi==13.0.1
 zeroconf==0.39.4
 

From fc0347c86c96f648850613500ae1a1c607ec7087 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 13 Dec 2022 08:14:18 +1300
Subject: [PATCH 373/838] Bump esphome-dashboard to 20221213.0 (#4176)

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

diff --git a/requirements.txt b/requirements.txt
index 6366a252fa..9c12253160 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.1.5  # When updating platformio, also update Dockerfile
 esptool==4.4
 click==8.1.3
-esphome-dashboard==20221207.0
+esphome-dashboard==20221213.0
 aioesphomeapi==13.0.1
 zeroconf==0.39.4
 

From bcae2596a60e3e2269b54bbc09a6abd853b7fff2 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 13 Dec 2022 09:13:28 +1300
Subject: [PATCH 374/838] Bump version to 2022.12.0b4

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

diff --git a/esphome/const.py b/esphome/const.py
index 415ff8c6ec..4783d868d7 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.12.0b3"
+__version__ = "2022.12.0b4"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From db3096c6e19ce414a82b5d086c3dba2cc1f56726 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 13 Dec 2022 13:44:52 +1300
Subject: [PATCH 375/838] Remove internal pin restriction from cd74hc4067
 (#4179)

---
 esphome/components/cd74hc4067/__init__.py  |  8 ++++----
 esphome/components/cd74hc4067/cd74hc4067.h | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/esphome/components/cd74hc4067/__init__.py b/esphome/components/cd74hc4067/__init__.py
index 4fb15d1bf3..d57061b710 100644
--- a/esphome/components/cd74hc4067/__init__.py
+++ b/esphome/components/cd74hc4067/__init__.py
@@ -27,10 +27,10 @@ DEFAULT_DELAY = "2ms"
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(CD74HC4067Component),
-        cv.Required(CONF_PIN_S0): pins.internal_gpio_output_pin_schema,
-        cv.Required(CONF_PIN_S1): pins.internal_gpio_output_pin_schema,
-        cv.Required(CONF_PIN_S2): pins.internal_gpio_output_pin_schema,
-        cv.Required(CONF_PIN_S3): pins.internal_gpio_output_pin_schema,
+        cv.Required(CONF_PIN_S0): pins.gpio_output_pin_schema,
+        cv.Required(CONF_PIN_S1): pins.gpio_output_pin_schema,
+        cv.Required(CONF_PIN_S2): pins.gpio_output_pin_schema,
+        cv.Required(CONF_PIN_S3): pins.gpio_output_pin_schema,
         cv.Optional(
             CONF_DELAY, default=DEFAULT_DELAY
         ): cv.positive_time_period_milliseconds,
diff --git a/esphome/components/cd74hc4067/cd74hc4067.h b/esphome/components/cd74hc4067/cd74hc4067.h
index 4a5c2e4e35..6193513575 100644
--- a/esphome/components/cd74hc4067/cd74hc4067.h
+++ b/esphome/components/cd74hc4067/cd74hc4067.h
@@ -19,22 +19,22 @@ class CD74HC4067Component : public Component {
   void activate_pin(uint8_t pin);
 
   /// set the pin connected to multiplexer control pin 0
-  void set_pin_s0(InternalGPIOPin *pin) { this->pin_s0_ = pin; }
+  void set_pin_s0(GPIOPin *pin) { this->pin_s0_ = pin; }
   /// set the pin connected to multiplexer control pin 1
-  void set_pin_s1(InternalGPIOPin *pin) { this->pin_s1_ = pin; }
+  void set_pin_s1(GPIOPin *pin) { this->pin_s1_ = pin; }
   /// set the pin connected to multiplexer control pin 2
-  void set_pin_s2(InternalGPIOPin *pin) { this->pin_s2_ = pin; }
+  void set_pin_s2(GPIOPin *pin) { this->pin_s2_ = pin; }
   /// set the pin connected to multiplexer control pin 3
-  void set_pin_s3(InternalGPIOPin *pin) { this->pin_s3_ = pin; }
+  void set_pin_s3(GPIOPin *pin) { this->pin_s3_ = pin; }
 
   /// set the delay needed after an input switch
   void set_switch_delay(uint32_t switch_delay) { this->switch_delay_ = switch_delay; }
 
  private:
-  InternalGPIOPin *pin_s0_;
-  InternalGPIOPin *pin_s1_;
-  InternalGPIOPin *pin_s2_;
-  InternalGPIOPin *pin_s3_;
+  GPIOPin *pin_s0_;
+  GPIOPin *pin_s1_;
+  GPIOPin *pin_s2_;
+  GPIOPin *pin_s3_;
   /// the currently active pin
   uint8_t active_pin_;
   uint32_t switch_delay_;

From c47dc09d34c89b25af6153f7e85d1092fe53b883 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 12 Dec 2022 14:57:12 -1000
Subject: [PATCH 376/838] Speed up bluetooth proxy connections when using
 esp-idf (#4171)

---
 esphome/components/bluetooth_proxy/__init__.py          | 8 ++++++++
 esphome/components/esp32/__init__.py                    | 2 +-
 esphome/components/esp32_ble_client/ble_client_base.cpp | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/esphome/components/bluetooth_proxy/__init__.py b/esphome/components/bluetooth_proxy/__init__.py
index 9c566c56a5..bec1579d8e 100644
--- a/esphome/components/bluetooth_proxy/__init__.py
+++ b/esphome/components/bluetooth_proxy/__init__.py
@@ -2,11 +2,13 @@ from esphome.components import esp32_ble_tracker, esp32_ble_client
 import esphome.config_validation as cv
 import esphome.codegen as cg
 from esphome.const import CONF_ACTIVE, CONF_ID
+from esphome.components.esp32 import add_idf_sdkconfig_option
 
 AUTO_LOAD = ["esp32_ble_client", "esp32_ble_tracker"]
 DEPENDENCIES = ["api", "esp32"]
 CODEOWNERS = ["@jesserockz"]
 
+CONF_CACHE_SERVICES = "cache_services"
 CONF_CONNECTIONS = "connections"
 MAX_CONNECTIONS = 3
 
@@ -47,6 +49,9 @@ CONFIG_SCHEMA = cv.All(
         {
             cv.GenerateID(): cv.declare_id(BluetoothProxy),
             cv.Optional(CONF_ACTIVE, default=False): cv.boolean,
+            cv.SplitDefault(CONF_CACHE_SERVICES, esp32_idf=True): cv.All(
+                cv.only_with_esp_idf, cv.boolean
+            ),
             cv.Optional(CONF_CONNECTIONS): cv.All(
                 cv.ensure_list(CONNECTION_SCHEMA),
                 cv.Length(min=1, max=MAX_CONNECTIONS),
@@ -72,4 +77,7 @@ async def to_code(config):
         cg.add(var.register_connection(connection_var))
         await esp32_ble_tracker.register_client(connection_var, connection_conf)
 
+    if config.get(CONF_CACHE_SERVICES):
+        add_idf_sdkconfig_option("CONFIG_BT_GATTC_CACHE_NVS_FLASH", True)
+
     cg.add_define("USE_BLUETOOTH_PROXY")
diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index 75dc68020f..3989b62842 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -398,11 +398,11 @@ spiffs,   data, spiffs,  0x391000, 0x00F000
 
 IDF_PARTITIONS_CSV = """\
 # Name,   Type, SubType, Offset,   Size, Flags
-nvs,      data, nvs,     ,        0x4000,
 otadata,  data, ota,     ,        0x2000,
 phy_init, data, phy,     ,        0x1000,
 app0,     app,  ota_0,   ,      0x1C0000,
 app1,     app,  ota_1,   ,      0x1C0000,
+nvs,      data, nvs,     ,       0x6d000,
 """
 
 
diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 658f6c464e..dd6fc94127 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -95,7 +95,9 @@ void BLEClientBase::release_services() {
   for (auto &svc : this->services_)
     delete svc;  // NOLINT(cppcoreguidelines-owning-memory)
   this->services_.clear();
+#ifndef CONFIG_BT_GATTC_CACHE_NVS_FLASH
   esp_ble_gattc_cache_clean(this->remote_bda_);
+#endif
 }
 
 bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t esp_gattc_if,

From 1952c1880bd67533b63131eccc2cf78d749a3588 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 13 Dec 2022 13:44:52 +1300
Subject: [PATCH 377/838] Remove internal pin restriction from cd74hc4067
 (#4179)

---
 esphome/components/cd74hc4067/__init__.py  |  8 ++++----
 esphome/components/cd74hc4067/cd74hc4067.h | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/esphome/components/cd74hc4067/__init__.py b/esphome/components/cd74hc4067/__init__.py
index 4fb15d1bf3..d57061b710 100644
--- a/esphome/components/cd74hc4067/__init__.py
+++ b/esphome/components/cd74hc4067/__init__.py
@@ -27,10 +27,10 @@ DEFAULT_DELAY = "2ms"
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(CD74HC4067Component),
-        cv.Required(CONF_PIN_S0): pins.internal_gpio_output_pin_schema,
-        cv.Required(CONF_PIN_S1): pins.internal_gpio_output_pin_schema,
-        cv.Required(CONF_PIN_S2): pins.internal_gpio_output_pin_schema,
-        cv.Required(CONF_PIN_S3): pins.internal_gpio_output_pin_schema,
+        cv.Required(CONF_PIN_S0): pins.gpio_output_pin_schema,
+        cv.Required(CONF_PIN_S1): pins.gpio_output_pin_schema,
+        cv.Required(CONF_PIN_S2): pins.gpio_output_pin_schema,
+        cv.Required(CONF_PIN_S3): pins.gpio_output_pin_schema,
         cv.Optional(
             CONF_DELAY, default=DEFAULT_DELAY
         ): cv.positive_time_period_milliseconds,
diff --git a/esphome/components/cd74hc4067/cd74hc4067.h b/esphome/components/cd74hc4067/cd74hc4067.h
index 4a5c2e4e35..6193513575 100644
--- a/esphome/components/cd74hc4067/cd74hc4067.h
+++ b/esphome/components/cd74hc4067/cd74hc4067.h
@@ -19,22 +19,22 @@ class CD74HC4067Component : public Component {
   void activate_pin(uint8_t pin);
 
   /// set the pin connected to multiplexer control pin 0
-  void set_pin_s0(InternalGPIOPin *pin) { this->pin_s0_ = pin; }
+  void set_pin_s0(GPIOPin *pin) { this->pin_s0_ = pin; }
   /// set the pin connected to multiplexer control pin 1
-  void set_pin_s1(InternalGPIOPin *pin) { this->pin_s1_ = pin; }
+  void set_pin_s1(GPIOPin *pin) { this->pin_s1_ = pin; }
   /// set the pin connected to multiplexer control pin 2
-  void set_pin_s2(InternalGPIOPin *pin) { this->pin_s2_ = pin; }
+  void set_pin_s2(GPIOPin *pin) { this->pin_s2_ = pin; }
   /// set the pin connected to multiplexer control pin 3
-  void set_pin_s3(InternalGPIOPin *pin) { this->pin_s3_ = pin; }
+  void set_pin_s3(GPIOPin *pin) { this->pin_s3_ = pin; }
 
   /// set the delay needed after an input switch
   void set_switch_delay(uint32_t switch_delay) { this->switch_delay_ = switch_delay; }
 
  private:
-  InternalGPIOPin *pin_s0_;
-  InternalGPIOPin *pin_s1_;
-  InternalGPIOPin *pin_s2_;
-  InternalGPIOPin *pin_s3_;
+  GPIOPin *pin_s0_;
+  GPIOPin *pin_s1_;
+  GPIOPin *pin_s2_;
+  GPIOPin *pin_s3_;
   /// the currently active pin
   uint8_t active_pin_;
   uint32_t switch_delay_;

From 0a1f705fdabc0088b3738319a402cd56829ef9de Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 12 Dec 2022 14:57:12 -1000
Subject: [PATCH 378/838] Speed up bluetooth proxy connections when using
 esp-idf (#4171)

---
 esphome/components/bluetooth_proxy/__init__.py          | 8 ++++++++
 esphome/components/esp32/__init__.py                    | 2 +-
 esphome/components/esp32_ble_client/ble_client_base.cpp | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/esphome/components/bluetooth_proxy/__init__.py b/esphome/components/bluetooth_proxy/__init__.py
index 9c566c56a5..bec1579d8e 100644
--- a/esphome/components/bluetooth_proxy/__init__.py
+++ b/esphome/components/bluetooth_proxy/__init__.py
@@ -2,11 +2,13 @@ from esphome.components import esp32_ble_tracker, esp32_ble_client
 import esphome.config_validation as cv
 import esphome.codegen as cg
 from esphome.const import CONF_ACTIVE, CONF_ID
+from esphome.components.esp32 import add_idf_sdkconfig_option
 
 AUTO_LOAD = ["esp32_ble_client", "esp32_ble_tracker"]
 DEPENDENCIES = ["api", "esp32"]
 CODEOWNERS = ["@jesserockz"]
 
+CONF_CACHE_SERVICES = "cache_services"
 CONF_CONNECTIONS = "connections"
 MAX_CONNECTIONS = 3
 
@@ -47,6 +49,9 @@ CONFIG_SCHEMA = cv.All(
         {
             cv.GenerateID(): cv.declare_id(BluetoothProxy),
             cv.Optional(CONF_ACTIVE, default=False): cv.boolean,
+            cv.SplitDefault(CONF_CACHE_SERVICES, esp32_idf=True): cv.All(
+                cv.only_with_esp_idf, cv.boolean
+            ),
             cv.Optional(CONF_CONNECTIONS): cv.All(
                 cv.ensure_list(CONNECTION_SCHEMA),
                 cv.Length(min=1, max=MAX_CONNECTIONS),
@@ -72,4 +77,7 @@ async def to_code(config):
         cg.add(var.register_connection(connection_var))
         await esp32_ble_tracker.register_client(connection_var, connection_conf)
 
+    if config.get(CONF_CACHE_SERVICES):
+        add_idf_sdkconfig_option("CONFIG_BT_GATTC_CACHE_NVS_FLASH", True)
+
     cg.add_define("USE_BLUETOOTH_PROXY")
diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index 75dc68020f..3989b62842 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -398,11 +398,11 @@ spiffs,   data, spiffs,  0x391000, 0x00F000
 
 IDF_PARTITIONS_CSV = """\
 # Name,   Type, SubType, Offset,   Size, Flags
-nvs,      data, nvs,     ,        0x4000,
 otadata,  data, ota,     ,        0x2000,
 phy_init, data, phy,     ,        0x1000,
 app0,     app,  ota_0,   ,      0x1C0000,
 app1,     app,  ota_1,   ,      0x1C0000,
+nvs,      data, nvs,     ,       0x6d000,
 """
 
 
diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 658f6c464e..dd6fc94127 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -95,7 +95,9 @@ void BLEClientBase::release_services() {
   for (auto &svc : this->services_)
     delete svc;  // NOLINT(cppcoreguidelines-owning-memory)
   this->services_.clear();
+#ifndef CONFIG_BT_GATTC_CACHE_NVS_FLASH
   esp_ble_gattc_cache_clean(this->remote_bda_);
+#endif
 }
 
 bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t esp_gattc_if,

From 7d8d563c6294eca347d259bfe9f7fa4f02c7c8ca Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 13 Dec 2022 13:58:44 +1300
Subject: [PATCH 379/838] Bump version to 2022.12.0b5

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

diff --git a/esphome/const.py b/esphome/const.py
index 4783d868d7..4b14ce7e40 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.12.0b4"
+__version__ = "2022.12.0b5"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 24bf3674f30afacb710f8ec1ce28bcd60c023ea7 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 14 Dec 2022 11:45:43 +1300
Subject: [PATCH 380/838] Remove warnings when falling through switch cases on
 purpose (#4181)

---
 esphome/components/esp32_ble_client/ble_client_base.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index dd6fc94127..017d65573d 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -290,14 +290,17 @@ float BLEClientBase::parse_char_value(uint8_t *value, uint16_t length) {
       if (length > 2) {
         return (float) encode_uint16(value[1], value[2]);
       }
+      // fall through
     case 0x7:  // uint24.
       if (length > 3) {
         return (float) encode_uint24(value[1], value[2], value[3]);
       }
+      // fall through
     case 0x8:  // uint32.
       if (length > 4) {
         return (float) encode_uint32(value[1], value[2], value[3], value[4]);
       }
+      // fall through
     case 0xC:  // int8.
       return (float) ((int8_t) value[1]);
     case 0xD:  // int12.
@@ -305,10 +308,12 @@ float BLEClientBase::parse_char_value(uint8_t *value, uint16_t length) {
       if (length > 2) {
         return (float) ((int16_t)(value[1] << 8) + (int16_t) value[2]);
       }
+      // fall through
     case 0xF:  // int24.
       if (length > 3) {
         return (float) ((int32_t)(value[1] << 16) + (int32_t)(value[2] << 8) + (int32_t)(value[3]));
       }
+      // fall through
     case 0x10:  // int32.
       if (length > 4) {
         return (float) ((int32_t)(value[1] << 24) + (int32_t)(value[2] << 16) + (int32_t)(value[3] << 8) +

From 9bf7c977751d3b4e5cef123372a07f43f35f597b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 14 Dec 2022 11:45:51 +1300
Subject: [PATCH 381/838] Revert camera config change for esp-idf (#4182)

---
 esphome/components/esp32_camera/esp32_camera.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/esphome/components/esp32_camera/esp32_camera.cpp b/esphome/components/esp32_camera/esp32_camera.cpp
index 9598541143..b1bf1d8532 100644
--- a/esphome/components/esp32_camera/esp32_camera.cpp
+++ b/esphome/components/esp32_camera/esp32_camera.cpp
@@ -54,7 +54,11 @@ void ESP32Camera::dump_config() {
   ESP_LOGCONFIG(TAG, "  HREF Pin: %d", conf.pin_href);
   ESP_LOGCONFIG(TAG, "  Pixel Clock Pin: %d", conf.pin_pclk);
   ESP_LOGCONFIG(TAG, "  External Clock: Pin:%d Frequency:%u", conf.pin_xclk, conf.xclk_freq_hz);
+#ifdef USE_ESP_IDF  // Temporary until the espressif/esp32-camera library is updated
+  ESP_LOGCONFIG(TAG, "  I2C Pins: SDA:%d SCL:%d", conf.pin_sscb_sda, conf.pin_sscb_scl);
+#else
   ESP_LOGCONFIG(TAG, "  I2C Pins: SDA:%d SCL:%d", conf.pin_sccb_sda, conf.pin_sccb_scl);
+#endif
   ESP_LOGCONFIG(TAG, "  Reset Pin: %d", conf.pin_reset);
   switch (this->config_.frame_size) {
     case FRAMESIZE_QQVGA:
@@ -209,8 +213,13 @@ void ESP32Camera::set_external_clock(uint8_t pin, uint32_t frequency) {
   this->config_.xclk_freq_hz = frequency;
 }
 void ESP32Camera::set_i2c_pins(uint8_t sda, uint8_t scl) {
+#ifdef USE_ESP_IDF  // Temporary until the espressif/esp32-camera library is updated
+  this->config_.pin_sscb_sda = sda;
+  this->config_.pin_sscb_scl = scl;
+#else
   this->config_.pin_sccb_sda = sda;
   this->config_.pin_sccb_scl = scl;
+#endif
 }
 void ESP32Camera::set_reset_pin(uint8_t pin) { this->config_.pin_reset = pin; }
 void ESP32Camera::set_power_down_pin(uint8_t pin) { this->config_.pin_pwdn = pin; }

From fcb9b51978bb17c8def7f29b2bff44e4c90ab44c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 14 Dec 2022 11:45:43 +1300
Subject: [PATCH 382/838] Remove warnings when falling through switch cases on
 purpose (#4181)

---
 esphome/components/esp32_ble_client/ble_client_base.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index dd6fc94127..017d65573d 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -290,14 +290,17 @@ float BLEClientBase::parse_char_value(uint8_t *value, uint16_t length) {
       if (length > 2) {
         return (float) encode_uint16(value[1], value[2]);
       }
+      // fall through
     case 0x7:  // uint24.
       if (length > 3) {
         return (float) encode_uint24(value[1], value[2], value[3]);
       }
+      // fall through
     case 0x8:  // uint32.
       if (length > 4) {
         return (float) encode_uint32(value[1], value[2], value[3], value[4]);
       }
+      // fall through
     case 0xC:  // int8.
       return (float) ((int8_t) value[1]);
     case 0xD:  // int12.
@@ -305,10 +308,12 @@ float BLEClientBase::parse_char_value(uint8_t *value, uint16_t length) {
       if (length > 2) {
         return (float) ((int16_t)(value[1] << 8) + (int16_t) value[2]);
       }
+      // fall through
     case 0xF:  // int24.
       if (length > 3) {
         return (float) ((int32_t)(value[1] << 16) + (int32_t)(value[2] << 8) + (int32_t)(value[3]));
       }
+      // fall through
     case 0x10:  // int32.
       if (length > 4) {
         return (float) ((int32_t)(value[1] << 24) + (int32_t)(value[2] << 16) + (int32_t)(value[3] << 8) +

From 96512b80cc65ea0a78ceebd5987e1248b9773218 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 14 Dec 2022 11:45:51 +1300
Subject: [PATCH 383/838] Revert camera config change for esp-idf (#4182)

---
 esphome/components/esp32_camera/esp32_camera.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/esphome/components/esp32_camera/esp32_camera.cpp b/esphome/components/esp32_camera/esp32_camera.cpp
index 9598541143..b1bf1d8532 100644
--- a/esphome/components/esp32_camera/esp32_camera.cpp
+++ b/esphome/components/esp32_camera/esp32_camera.cpp
@@ -54,7 +54,11 @@ void ESP32Camera::dump_config() {
   ESP_LOGCONFIG(TAG, "  HREF Pin: %d", conf.pin_href);
   ESP_LOGCONFIG(TAG, "  Pixel Clock Pin: %d", conf.pin_pclk);
   ESP_LOGCONFIG(TAG, "  External Clock: Pin:%d Frequency:%u", conf.pin_xclk, conf.xclk_freq_hz);
+#ifdef USE_ESP_IDF  // Temporary until the espressif/esp32-camera library is updated
+  ESP_LOGCONFIG(TAG, "  I2C Pins: SDA:%d SCL:%d", conf.pin_sscb_sda, conf.pin_sscb_scl);
+#else
   ESP_LOGCONFIG(TAG, "  I2C Pins: SDA:%d SCL:%d", conf.pin_sccb_sda, conf.pin_sccb_scl);
+#endif
   ESP_LOGCONFIG(TAG, "  Reset Pin: %d", conf.pin_reset);
   switch (this->config_.frame_size) {
     case FRAMESIZE_QQVGA:
@@ -209,8 +213,13 @@ void ESP32Camera::set_external_clock(uint8_t pin, uint32_t frequency) {
   this->config_.xclk_freq_hz = frequency;
 }
 void ESP32Camera::set_i2c_pins(uint8_t sda, uint8_t scl) {
+#ifdef USE_ESP_IDF  // Temporary until the espressif/esp32-camera library is updated
+  this->config_.pin_sscb_sda = sda;
+  this->config_.pin_sscb_scl = scl;
+#else
   this->config_.pin_sccb_sda = sda;
   this->config_.pin_sccb_scl = scl;
+#endif
 }
 void ESP32Camera::set_reset_pin(uint8_t pin) { this->config_.pin_reset = pin; }
 void ESP32Camera::set_power_down_pin(uint8_t pin) { this->config_.pin_pwdn = pin; }

From 2f241383450eaaac34a53206983ed1fde176782b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 14 Dec 2022 12:03:03 +1300
Subject: [PATCH 384/838] Bump version to 2022.12.0b6

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

diff --git a/esphome/const.py b/esphome/const.py
index 4b14ce7e40..60752d0578 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.12.0b5"
+__version__ = "2022.12.0b6"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 391316c9b56f074870083e73b37370fddd377317 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 14 Dec 2022 16:37:39 +1300
Subject: [PATCH 385/838] Bump version to 2022.12.0

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

diff --git a/esphome/const.py b/esphome/const.py
index 60752d0578..7c2b9a624e 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.12.0b6"
+__version__ = "2022.12.0"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 1eacbd50fadec3ea4b881d5f2dfa181e5e1f69b1 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Thu, 15 Dec 2022 21:27:59 +0100
Subject: [PATCH 386/838] Support non-multiarch toolchains on 32-bit ARM
 (#4191)

fixes https://github.com/esphome/issues/issues/3904
---
 docker/Dockerfile | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a49ad5a9ef..0dd505a9b8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,6 +12,9 @@ FROM debian:bullseye-20221024-slim AS base-docker
 
 FROM base-${BASEIMGTYPE} AS base
 
+ARG TARGETARCH
+ARG TARGETVARIANT
+
 RUN \
     apt-get update \
     # Use pinned versions so that we get updates with build caching
@@ -36,6 +39,14 @@ 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
+RUN \
+    if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
+        ln -s /lib/arm-linux-gnueabihf/ld-linux.so.3 /lib/ld-linux.so.3; \
+    fi
+
 RUN \
     # Ubuntu python3-pip is missing wheel
     pip3 install --no-cache-dir \

From 83b5e01a28195df5f9e6088395fbb6059f3d24db Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 16 Dec 2022 10:09:07 +1300
Subject: [PATCH 387/838] Mark ESP32-S2 as not having Bluetooth (#4194)

---
 esphome/components/esp32_ble/__init__.py         | 13 ++++++++++++-
 esphome/components/esp32_ble_beacon/__init__.py  |  3 +++
 esphome/components/esp32_ble_tracker/__init__.py |  3 +++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/esphome/components/esp32_ble/__init__.py b/esphome/components/esp32_ble/__init__.py
index 4b5c741ad9..c6bb296cdc 100644
--- a/esphome/components/esp32_ble/__init__.py
+++ b/esphome/components/esp32_ble/__init__.py
@@ -2,12 +2,14 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
 from esphome.core import CORE
-from esphome.components.esp32 import add_idf_sdkconfig_option
+from esphome.components.esp32 import add_idf_sdkconfig_option, get_esp32_variant, const
 
 DEPENDENCIES = ["esp32"]
 CODEOWNERS = ["@jesserockz"]
 CONFLICTS_WITH = ["esp32_ble_tracker", "esp32_ble_beacon"]
 
+NO_BLUTOOTH_VARIANTS = [const.VARIANT_ESP32S2]
+
 esp32_ble_ns = cg.esphome_ns.namespace("esp32_ble")
 ESP32BLE = esp32_ble_ns.class_("ESP32BLE", cg.Component)
 
@@ -19,6 +21,15 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
+def validate_variant(_):
+    variant = get_esp32_variant()
+    if variant in NO_BLUTOOTH_VARIANTS:
+        raise cv.Invalid(f"{variant} does not support Bluetooth")
+
+
+FINAL_VALIDATE_SCHEMA = validate_variant
+
+
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
diff --git a/esphome/components/esp32_ble_beacon/__init__.py b/esphome/components/esp32_ble_beacon/__init__.py
index c3bd4ee418..311919dcd4 100644
--- a/esphome/components/esp32_ble_beacon/__init__.py
+++ b/esphome/components/esp32_ble_beacon/__init__.py
@@ -3,6 +3,7 @@ import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_TYPE, CONF_UUID, CONF_TX_POWER
 from esphome.core import CORE, TimePeriod
 from esphome.components.esp32 import add_idf_sdkconfig_option
+from esphome.components import esp32_ble
 
 DEPENDENCIES = ["esp32"]
 CONFLICTS_WITH = ["esp32_ble_tracker"]
@@ -54,6 +55,8 @@ CONFIG_SCHEMA = cv.All(
     validate_config,
 )
 
+FINAL_VALIDATE_SCHEMA = esp32_ble.validate_variant
+
 
 async def to_code(config):
     uuid = config[CONF_UUID].hex
diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index a3938faff2..c20491e701 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -17,6 +17,7 @@ from esphome.const import (
 )
 from esphome.core import CORE
 from esphome.components.esp32 import add_idf_sdkconfig_option
+from esphome.components import esp32_ble
 
 DEPENDENCIES = ["esp32"]
 
@@ -187,6 +188,8 @@ CONFIG_SCHEMA = cv.Schema(
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
+FINAL_VALIDATE_SCHEMA = esp32_ble.validate_variant
+
 ESP_BLE_DEVICE_SCHEMA = cv.Schema(
     {
         cv.GenerateID(CONF_ESP32_BLE_ID): cv.use_id(ESP32BLETracker),

From 39af967433ae35c1bd45c4cc84a139701835c9aa Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 16 Dec 2022 10:38:52 +1300
Subject: [PATCH 388/838] Fix i2s_audio media_player compiling for esp32-s2
 (#4195)

---
 .../i2s_audio/i2s_audio_media_player.cpp          |  6 ++++++
 .../components/i2s_audio/i2s_audio_media_player.h |  4 ++++
 esphome/components/i2s_audio/media_player.py      | 15 ++++++++++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/esphome/components/i2s_audio/i2s_audio_media_player.cpp b/esphome/components/i2s_audio/i2s_audio_media_player.cpp
index f1f1dc0d51..2b00a5ec26 100644
--- a/esphome/components/i2s_audio/i2s_audio_media_player.cpp
+++ b/esphome/components/i2s_audio/i2s_audio_media_player.cpp
@@ -103,9 +103,11 @@ void I2SAudioMediaPlayer::stop_() {
 
 void I2SAudioMediaPlayer::setup() {
   ESP_LOGCONFIG(TAG, "Setting up Audio...");
+#if SOC_I2S_SUPPORTS_DAC
   if (this->internal_dac_mode_ != I2S_DAC_CHANNEL_DISABLE) {
     this->audio_ = make_unique<Audio>(true, this->internal_dac_mode_);
   } else {
+#endif
     this->audio_ = make_unique<Audio>(false);
     this->audio_->setPinout(this->bclk_pin_, this->lrclk_pin_, this->dout_pin_);
     this->audio_->forceMono(this->external_dac_channels_ == 1);
@@ -113,7 +115,9 @@ void I2SAudioMediaPlayer::setup() {
       this->mute_pin_->setup();
       this->mute_pin_->digital_write(false);
     }
+#if SOC_I2S_SUPPORTS_DAC
   }
+#endif
   this->state = media_player::MEDIA_PLAYER_STATE_IDLE;
 }
 
@@ -137,6 +141,7 @@ void I2SAudioMediaPlayer::dump_config() {
     ESP_LOGCONFIG(TAG, "Audio failed to initialize!");
     return;
   }
+#if SOC_I2S_SUPPORTS_DAC
   if (this->internal_dac_mode_ != I2S_DAC_CHANNEL_DISABLE) {
     switch (this->internal_dac_mode_) {
       case I2S_DAC_CHANNEL_LEFT_EN:
@@ -152,6 +157,7 @@ void I2SAudioMediaPlayer::dump_config() {
         break;
     }
   }
+#endif
 }
 
 }  // namespace i2s_audio
diff --git a/esphome/components/i2s_audio/i2s_audio_media_player.h b/esphome/components/i2s_audio/i2s_audio_media_player.h
index 89bd128a33..40906d9ea5 100644
--- a/esphome/components/i2s_audio/i2s_audio_media_player.h
+++ b/esphome/components/i2s_audio/i2s_audio_media_player.h
@@ -25,7 +25,9 @@ class I2SAudioMediaPlayer : public Component, public media_player::MediaPlayer {
   void set_bclk_pin(uint8_t pin) { this->bclk_pin_ = pin; }
   void set_lrclk_pin(uint8_t pin) { this->lrclk_pin_ = pin; }
   void set_mute_pin(GPIOPin *mute_pin) { this->mute_pin_ = mute_pin; }
+#if SOC_I2S_SUPPORTS_DAC
   void set_internal_dac_mode(i2s_dac_mode_t mode) { this->internal_dac_mode_ = mode; }
+#endif
   void set_external_dac_channels(uint8_t channels) { this->external_dac_channels_ = channels; }
 
   media_player::MediaPlayerTraits get_traits() override;
@@ -51,7 +53,9 @@ class I2SAudioMediaPlayer : public Component, public media_player::MediaPlayer {
   bool muted_{false};
   float unmuted_volume_{0};
 
+#if SOC_I2S_SUPPORTS_DAC
   i2s_dac_mode_t internal_dac_mode_{I2S_DAC_CHANNEL_DISABLE};
+#endif
   uint8_t external_dac_channels_;
 
   HighFrequencyLoopRequester high_freq_;
diff --git a/esphome/components/i2s_audio/media_player.py b/esphome/components/i2s_audio/media_player.py
index e80780b28f..43a48a721e 100644
--- a/esphome/components/i2s_audio/media_player.py
+++ b/esphome/components/i2s_audio/media_player.py
@@ -1,5 +1,5 @@
 import esphome.codegen as cg
-from esphome.components import media_player
+from esphome.components import media_player, esp32
 import esphome.config_validation as cv
 
 from esphome import pins
@@ -33,6 +33,18 @@ INTERNAL_DAC_OPTIONS = {
 
 EXTERNAL_DAC_OPTIONS = ["mono", "stereo"]
 
+NO_INTERNAL_DAC_VARIANTS = [esp32.const.VARIANT_ESP32S2]
+
+
+def validate_esp32_variant(config):
+    if config[CONF_DAC_TYPE] != "internal":
+        return config
+    variant = esp32.get_esp32_variant()
+    if variant in NO_INTERNAL_DAC_VARIANTS:
+        raise cv.Invalid(f"{variant} does not have an internal DAC")
+    return config
+
+
 CONFIG_SCHEMA = cv.All(
     cv.typed_schema(
         {
@@ -68,6 +80,7 @@ CONFIG_SCHEMA = cv.All(
         key=CONF_DAC_TYPE,
     ),
     cv.only_with_arduino,
+    validate_esp32_variant,
 )
 
 

From 3f1af1690b7387a20a939325441aca8b28e1042e Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Thu, 15 Dec 2022 21:27:59 +0100
Subject: [PATCH 389/838] Support non-multiarch toolchains on 32-bit ARM
 (#4191)

fixes https://github.com/esphome/issues/issues/3904
---
 docker/Dockerfile | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a49ad5a9ef..0dd505a9b8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,6 +12,9 @@ FROM debian:bullseye-20221024-slim AS base-docker
 
 FROM base-${BASEIMGTYPE} AS base
 
+ARG TARGETARCH
+ARG TARGETVARIANT
+
 RUN \
     apt-get update \
     # Use pinned versions so that we get updates with build caching
@@ -36,6 +39,14 @@ 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
+RUN \
+    if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
+        ln -s /lib/arm-linux-gnueabihf/ld-linux.so.3 /lib/ld-linux.so.3; \
+    fi
+
 RUN \
     # Ubuntu python3-pip is missing wheel
     pip3 install --no-cache-dir \

From e6d8ef98d3ddbccbda644fc088e92e2977b62938 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 16 Dec 2022 10:09:07 +1300
Subject: [PATCH 390/838] Mark ESP32-S2 as not having Bluetooth (#4194)

---
 esphome/components/esp32_ble/__init__.py         | 13 ++++++++++++-
 esphome/components/esp32_ble_beacon/__init__.py  |  3 +++
 esphome/components/esp32_ble_tracker/__init__.py |  3 +++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/esphome/components/esp32_ble/__init__.py b/esphome/components/esp32_ble/__init__.py
index 4b5c741ad9..c6bb296cdc 100644
--- a/esphome/components/esp32_ble/__init__.py
+++ b/esphome/components/esp32_ble/__init__.py
@@ -2,12 +2,14 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
 from esphome.core import CORE
-from esphome.components.esp32 import add_idf_sdkconfig_option
+from esphome.components.esp32 import add_idf_sdkconfig_option, get_esp32_variant, const
 
 DEPENDENCIES = ["esp32"]
 CODEOWNERS = ["@jesserockz"]
 CONFLICTS_WITH = ["esp32_ble_tracker", "esp32_ble_beacon"]
 
+NO_BLUTOOTH_VARIANTS = [const.VARIANT_ESP32S2]
+
 esp32_ble_ns = cg.esphome_ns.namespace("esp32_ble")
 ESP32BLE = esp32_ble_ns.class_("ESP32BLE", cg.Component)
 
@@ -19,6 +21,15 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
+def validate_variant(_):
+    variant = get_esp32_variant()
+    if variant in NO_BLUTOOTH_VARIANTS:
+        raise cv.Invalid(f"{variant} does not support Bluetooth")
+
+
+FINAL_VALIDATE_SCHEMA = validate_variant
+
+
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
diff --git a/esphome/components/esp32_ble_beacon/__init__.py b/esphome/components/esp32_ble_beacon/__init__.py
index c3bd4ee418..311919dcd4 100644
--- a/esphome/components/esp32_ble_beacon/__init__.py
+++ b/esphome/components/esp32_ble_beacon/__init__.py
@@ -3,6 +3,7 @@ import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_TYPE, CONF_UUID, CONF_TX_POWER
 from esphome.core import CORE, TimePeriod
 from esphome.components.esp32 import add_idf_sdkconfig_option
+from esphome.components import esp32_ble
 
 DEPENDENCIES = ["esp32"]
 CONFLICTS_WITH = ["esp32_ble_tracker"]
@@ -54,6 +55,8 @@ CONFIG_SCHEMA = cv.All(
     validate_config,
 )
 
+FINAL_VALIDATE_SCHEMA = esp32_ble.validate_variant
+
 
 async def to_code(config):
     uuid = config[CONF_UUID].hex
diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index a3938faff2..c20491e701 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -17,6 +17,7 @@ from esphome.const import (
 )
 from esphome.core import CORE
 from esphome.components.esp32 import add_idf_sdkconfig_option
+from esphome.components import esp32_ble
 
 DEPENDENCIES = ["esp32"]
 
@@ -187,6 +188,8 @@ CONFIG_SCHEMA = cv.Schema(
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
+FINAL_VALIDATE_SCHEMA = esp32_ble.validate_variant
+
 ESP_BLE_DEVICE_SCHEMA = cv.Schema(
     {
         cv.GenerateID(CONF_ESP32_BLE_ID): cv.use_id(ESP32BLETracker),

From 9c69b98a49ff85c91d4c8a796788b458258696c1 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 16 Dec 2022 10:38:52 +1300
Subject: [PATCH 391/838] Fix i2s_audio media_player compiling for esp32-s2
 (#4195)

---
 .../i2s_audio/i2s_audio_media_player.cpp          |  6 ++++++
 .../components/i2s_audio/i2s_audio_media_player.h |  4 ++++
 esphome/components/i2s_audio/media_player.py      | 15 ++++++++++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/esphome/components/i2s_audio/i2s_audio_media_player.cpp b/esphome/components/i2s_audio/i2s_audio_media_player.cpp
index f1f1dc0d51..2b00a5ec26 100644
--- a/esphome/components/i2s_audio/i2s_audio_media_player.cpp
+++ b/esphome/components/i2s_audio/i2s_audio_media_player.cpp
@@ -103,9 +103,11 @@ void I2SAudioMediaPlayer::stop_() {
 
 void I2SAudioMediaPlayer::setup() {
   ESP_LOGCONFIG(TAG, "Setting up Audio...");
+#if SOC_I2S_SUPPORTS_DAC
   if (this->internal_dac_mode_ != I2S_DAC_CHANNEL_DISABLE) {
     this->audio_ = make_unique<Audio>(true, this->internal_dac_mode_);
   } else {
+#endif
     this->audio_ = make_unique<Audio>(false);
     this->audio_->setPinout(this->bclk_pin_, this->lrclk_pin_, this->dout_pin_);
     this->audio_->forceMono(this->external_dac_channels_ == 1);
@@ -113,7 +115,9 @@ void I2SAudioMediaPlayer::setup() {
       this->mute_pin_->setup();
       this->mute_pin_->digital_write(false);
     }
+#if SOC_I2S_SUPPORTS_DAC
   }
+#endif
   this->state = media_player::MEDIA_PLAYER_STATE_IDLE;
 }
 
@@ -137,6 +141,7 @@ void I2SAudioMediaPlayer::dump_config() {
     ESP_LOGCONFIG(TAG, "Audio failed to initialize!");
     return;
   }
+#if SOC_I2S_SUPPORTS_DAC
   if (this->internal_dac_mode_ != I2S_DAC_CHANNEL_DISABLE) {
     switch (this->internal_dac_mode_) {
       case I2S_DAC_CHANNEL_LEFT_EN:
@@ -152,6 +157,7 @@ void I2SAudioMediaPlayer::dump_config() {
         break;
     }
   }
+#endif
 }
 
 }  // namespace i2s_audio
diff --git a/esphome/components/i2s_audio/i2s_audio_media_player.h b/esphome/components/i2s_audio/i2s_audio_media_player.h
index 89bd128a33..40906d9ea5 100644
--- a/esphome/components/i2s_audio/i2s_audio_media_player.h
+++ b/esphome/components/i2s_audio/i2s_audio_media_player.h
@@ -25,7 +25,9 @@ class I2SAudioMediaPlayer : public Component, public media_player::MediaPlayer {
   void set_bclk_pin(uint8_t pin) { this->bclk_pin_ = pin; }
   void set_lrclk_pin(uint8_t pin) { this->lrclk_pin_ = pin; }
   void set_mute_pin(GPIOPin *mute_pin) { this->mute_pin_ = mute_pin; }
+#if SOC_I2S_SUPPORTS_DAC
   void set_internal_dac_mode(i2s_dac_mode_t mode) { this->internal_dac_mode_ = mode; }
+#endif
   void set_external_dac_channels(uint8_t channels) { this->external_dac_channels_ = channels; }
 
   media_player::MediaPlayerTraits get_traits() override;
@@ -51,7 +53,9 @@ class I2SAudioMediaPlayer : public Component, public media_player::MediaPlayer {
   bool muted_{false};
   float unmuted_volume_{0};
 
+#if SOC_I2S_SUPPORTS_DAC
   i2s_dac_mode_t internal_dac_mode_{I2S_DAC_CHANNEL_DISABLE};
+#endif
   uint8_t external_dac_channels_;
 
   HighFrequencyLoopRequester high_freq_;
diff --git a/esphome/components/i2s_audio/media_player.py b/esphome/components/i2s_audio/media_player.py
index e80780b28f..43a48a721e 100644
--- a/esphome/components/i2s_audio/media_player.py
+++ b/esphome/components/i2s_audio/media_player.py
@@ -1,5 +1,5 @@
 import esphome.codegen as cg
-from esphome.components import media_player
+from esphome.components import media_player, esp32
 import esphome.config_validation as cv
 
 from esphome import pins
@@ -33,6 +33,18 @@ INTERNAL_DAC_OPTIONS = {
 
 EXTERNAL_DAC_OPTIONS = ["mono", "stereo"]
 
+NO_INTERNAL_DAC_VARIANTS = [esp32.const.VARIANT_ESP32S2]
+
+
+def validate_esp32_variant(config):
+    if config[CONF_DAC_TYPE] != "internal":
+        return config
+    variant = esp32.get_esp32_variant()
+    if variant in NO_INTERNAL_DAC_VARIANTS:
+        raise cv.Invalid(f"{variant} does not have an internal DAC")
+    return config
+
+
 CONFIG_SCHEMA = cv.All(
     cv.typed_schema(
         {
@@ -68,6 +80,7 @@ CONFIG_SCHEMA = cv.All(
         key=CONF_DAC_TYPE,
     ),
     cv.only_with_arduino,
+    validate_esp32_variant,
 )
 
 

From 78500fa93323dcc1b6f2c721c4a5c38c84ea9fad Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 16 Dec 2022 13:36:11 +1300
Subject: [PATCH 392/838] Bump version to 2022.12.1

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

diff --git a/esphome/const.py b/esphome/const.py
index 7c2b9a624e..465c0a5d83 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.12.0"
+__version__ = "2022.12.1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From b48b5d6cc72232daa68c6f1a27524e1b5ae6c455 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 16 Dec 2022 19:46:56 +1300
Subject: [PATCH 393/838] Fix import_full_config for adoption configs (#4197)

* Fix git raw url

* Fix setting full config query param

* Force dashboard import urls to have a branch or tag reference for full import
---
 .../components/dashboard_import/__init__.py   | 29 ++++++++++++++-----
 esphome/git.py                                |  4 +--
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/esphome/components/dashboard_import/__init__.py b/esphome/components/dashboard_import/__init__.py
index 4742c77785..0eb65579f9 100644
--- a/esphome/components/dashboard_import/__init__.py
+++ b/esphome/components/dashboard_import/__init__.py
@@ -4,7 +4,7 @@ import requests
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components.packages import validate_source_shorthand
-from esphome.const import CONF_WIFI
+from esphome.const import CONF_WIFI, CONF_REF
 from esphome.wizard import wizard_file
 from esphome.yaml_util import dump
 from esphome import git
@@ -21,19 +21,32 @@ CODEOWNERS = ["@esphome/core"]
 def validate_import_url(value):
     value = cv.string_strict(value)
     value = cv.Length(max=255)(value)
-    # ignore result, only check if it's a valid shorthand
     validate_source_shorthand(value)
     return value
 
 
+def validate_full_url(config):
+    if not config[CONF_IMPORT_FULL_CONFIG]:
+        return config
+    source = validate_source_shorthand(config[CONF_PACKAGE_IMPORT_URL])
+    if CONF_REF not in source:
+        raise cv.Invalid(
+            "Must specify a ref (branch or tag) to import from when importing full config"
+        )
+    return config
+
+
 CONF_PACKAGE_IMPORT_URL = "package_import_url"
 CONF_IMPORT_FULL_CONFIG = "import_full_config"
 
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_PACKAGE_IMPORT_URL): validate_import_url,
-        cv.Optional(CONF_IMPORT_FULL_CONFIG, default=False): cv.boolean,
-    }
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.Required(CONF_PACKAGE_IMPORT_URL): validate_import_url,
+            cv.Optional(CONF_IMPORT_FULL_CONFIG, default=False): cv.boolean,
+        }
+    ),
+    validate_full_url,
 )
 
 WIFI_CONFIG = """
@@ -49,7 +62,7 @@ async def to_code(config):
     url = config[CONF_PACKAGE_IMPORT_URL]
     if config[CONF_IMPORT_FULL_CONFIG]:
         url += "?full_config"
-    cg.add(dashboard_import_ns.set_package_import_url(config[CONF_PACKAGE_IMPORT_URL]))
+    cg.add(dashboard_import_ns.set_package_import_url(url))
 
 
 def import_config(
diff --git a/esphome/git.py b/esphome/git.py
index d3d5996fe3..130cd4f5e1 100644
--- a/esphome/git.py
+++ b/esphome/git.py
@@ -129,9 +129,9 @@ class GitFile:
     def raw_url(self) -> str:
         if self.ref is None:
             raise ValueError("URL has no ref")
-        if self.domain == "github":
+        if self.domain == "github.com":
             return f"https://raw.githubusercontent.com/{self.owner}/{self.repo}/{self.ref}/{self.filename}"
-        if self.domain == "gitlab":
+        if self.domain == "gitlab.com":
             return f"https://gitlab.com/{self.owner}/{self.repo}/-/raw/{self.ref}/{self.filename}"
         raise NotImplementedError(f"Git domain {self.domain} not supported")
 

From 573ea5518703ed284b452908a028045453ccb84a Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 19 Dec 2022 11:40:01 -1000
Subject: [PATCH 394/838] Handle zero padding anywhere in the combined adv data
 (#4208)

fixes https://github.com/esphome/issues/issues/3913
---
 esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index fb377e2be2..b1d469025b 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -706,11 +706,7 @@ void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_p
   while (offset + 2 < len) {
     const uint8_t field_length = payload[offset++];  // First byte is length of adv record
     if (field_length == 0) {
-      if (offset < param.adv_data_len && param.scan_rsp_len > 0) {  // Zero padded advertisement data
-        offset = param.adv_data_len;
-        continue;
-      }
-      break;
+      continue;  // Possible zero padded advertisement data
     }
 
     // first byte of adv record is adv record type

From 1824c8131e343b2601e290c5db06df12b2706b75 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 16 Dec 2022 19:46:56 +1300
Subject: [PATCH 395/838] Fix import_full_config for adoption configs (#4197)

* Fix git raw url

* Fix setting full config query param

* Force dashboard import urls to have a branch or tag reference for full import
---
 .../components/dashboard_import/__init__.py   | 29 ++++++++++++++-----
 esphome/git.py                                |  4 +--
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/esphome/components/dashboard_import/__init__.py b/esphome/components/dashboard_import/__init__.py
index 4742c77785..0eb65579f9 100644
--- a/esphome/components/dashboard_import/__init__.py
+++ b/esphome/components/dashboard_import/__init__.py
@@ -4,7 +4,7 @@ import requests
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components.packages import validate_source_shorthand
-from esphome.const import CONF_WIFI
+from esphome.const import CONF_WIFI, CONF_REF
 from esphome.wizard import wizard_file
 from esphome.yaml_util import dump
 from esphome import git
@@ -21,19 +21,32 @@ CODEOWNERS = ["@esphome/core"]
 def validate_import_url(value):
     value = cv.string_strict(value)
     value = cv.Length(max=255)(value)
-    # ignore result, only check if it's a valid shorthand
     validate_source_shorthand(value)
     return value
 
 
+def validate_full_url(config):
+    if not config[CONF_IMPORT_FULL_CONFIG]:
+        return config
+    source = validate_source_shorthand(config[CONF_PACKAGE_IMPORT_URL])
+    if CONF_REF not in source:
+        raise cv.Invalid(
+            "Must specify a ref (branch or tag) to import from when importing full config"
+        )
+    return config
+
+
 CONF_PACKAGE_IMPORT_URL = "package_import_url"
 CONF_IMPORT_FULL_CONFIG = "import_full_config"
 
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_PACKAGE_IMPORT_URL): validate_import_url,
-        cv.Optional(CONF_IMPORT_FULL_CONFIG, default=False): cv.boolean,
-    }
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.Required(CONF_PACKAGE_IMPORT_URL): validate_import_url,
+            cv.Optional(CONF_IMPORT_FULL_CONFIG, default=False): cv.boolean,
+        }
+    ),
+    validate_full_url,
 )
 
 WIFI_CONFIG = """
@@ -49,7 +62,7 @@ async def to_code(config):
     url = config[CONF_PACKAGE_IMPORT_URL]
     if config[CONF_IMPORT_FULL_CONFIG]:
         url += "?full_config"
-    cg.add(dashboard_import_ns.set_package_import_url(config[CONF_PACKAGE_IMPORT_URL]))
+    cg.add(dashboard_import_ns.set_package_import_url(url))
 
 
 def import_config(
diff --git a/esphome/git.py b/esphome/git.py
index d3d5996fe3..130cd4f5e1 100644
--- a/esphome/git.py
+++ b/esphome/git.py
@@ -129,9 +129,9 @@ class GitFile:
     def raw_url(self) -> str:
         if self.ref is None:
             raise ValueError("URL has no ref")
-        if self.domain == "github":
+        if self.domain == "github.com":
             return f"https://raw.githubusercontent.com/{self.owner}/{self.repo}/{self.ref}/{self.filename}"
-        if self.domain == "gitlab":
+        if self.domain == "gitlab.com":
             return f"https://gitlab.com/{self.owner}/{self.repo}/-/raw/{self.ref}/{self.filename}"
         raise NotImplementedError(f"Git domain {self.domain} not supported")
 

From 42454806561262cc212266fd104cc964f793bfa9 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 19 Dec 2022 11:40:01 -1000
Subject: [PATCH 396/838] Handle zero padding anywhere in the combined adv data
 (#4208)

fixes https://github.com/esphome/issues/issues/3913
---
 esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index fb377e2be2..b1d469025b 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -706,11 +706,7 @@ void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_p
   while (offset + 2 < len) {
     const uint8_t field_length = payload[offset++];  // First byte is length of adv record
     if (field_length == 0) {
-      if (offset < param.adv_data_len && param.scan_rsp_len > 0) {  // Zero padded advertisement data
-        offset = param.adv_data_len;
-        continue;
-      }
-      break;
+      continue;  // Possible zero padded advertisement data
     }
 
     // first byte of adv record is adv record type

From de7f6c3f5f59362975cc44b379d83ab22f6312df Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 20 Dec 2022 10:49:36 +1300
Subject: [PATCH 397/838] Bump version to 2022.12.2

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

diff --git a/esphome/const.py b/esphome/const.py
index 465c0a5d83..191af784d2 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.12.1"
+__version__ = "2022.12.2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 8b06135b412d31ad63074ce8f2c8228b70c1ab26 Mon Sep 17 00:00:00 2001
From: Deun Lee <54697735+deunlee@users.noreply.github.com>
Date: Tue, 20 Dec 2022 13:36:16 +0900
Subject: [PATCH 398/838] Fix UUID displaying incorrectly in BLE Tracker logs
 (#4187)

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

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index b1d469025b..45509c489c 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -601,9 +601,9 @@ std::string ESPBTUUID::to_string() const {
     default:
     case ESP_UUID_LEN_128:
       std::string buf;
-      for (int8_t i = 15; i >= 0; i--) {
+      for (uint8_t i = 0; i < 16; i++) {
         buf += str_snprintf("%02X", 2, this->uuid_.uuid.uuid128[i]);
-        if (i == 6 || i == 8 || i == 10 || i == 12)
+        if (i == 3 || i == 5 || i == 7 || i == 9)
           buf += "-";
       }
       return buf;

From 0d50caa179d95081f72ca6d426be5219b431b530 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 20 Dec 2022 23:09:33 +1300
Subject: [PATCH 399/838] Fix ESP32 GPIO when using INPUT PULLUP mode (#4213)

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

diff --git a/esphome/components/esp32/gpio.cpp b/esphome/components/esp32/gpio.cpp
index d0805e4dd2..758a707531 100644
--- a/esphome/components/esp32/gpio.cpp
+++ b/esphome/components/esp32/gpio.cpp
@@ -95,7 +95,7 @@ void ESP32InternalGPIOPin::pin_mode(gpio::Flags flags) {
   // can't call gpio_config here because that logs in esp-idf which may cause issues
   gpio_set_direction(pin_, flags_to_mode(flags));
   gpio_pull_mode_t pull_mode = GPIO_FLOATING;
-  if (flags & (gpio::FLAG_PULLUP | gpio::FLAG_PULLDOWN)) {
+  if ((flags & gpio::FLAG_PULLUP) && (flags & gpio::FLAG_PULLDOWN)) {
     pull_mode = GPIO_PULLUP_PULLDOWN;
   } else if (flags & gpio::FLAG_PULLUP) {
     pull_mode = GPIO_PULLUP_ONLY;

From 5750591df2a291af909204f69f1bb30e8dae0afa Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 20 Dec 2022 23:09:33 +1300
Subject: [PATCH 400/838] Fix ESP32 GPIO when using INPUT PULLUP mode (#4213)

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

diff --git a/esphome/components/esp32/gpio.cpp b/esphome/components/esp32/gpio.cpp
index d0805e4dd2..758a707531 100644
--- a/esphome/components/esp32/gpio.cpp
+++ b/esphome/components/esp32/gpio.cpp
@@ -95,7 +95,7 @@ void ESP32InternalGPIOPin::pin_mode(gpio::Flags flags) {
   // can't call gpio_config here because that logs in esp-idf which may cause issues
   gpio_set_direction(pin_, flags_to_mode(flags));
   gpio_pull_mode_t pull_mode = GPIO_FLOATING;
-  if (flags & (gpio::FLAG_PULLUP | gpio::FLAG_PULLDOWN)) {
+  if ((flags & gpio::FLAG_PULLUP) && (flags & gpio::FLAG_PULLDOWN)) {
     pull_mode = GPIO_PULLUP_PULLDOWN;
   } else if (flags & gpio::FLAG_PULLUP) {
     pull_mode = GPIO_PULLUP_ONLY;

From 60e6b4d21e6776ba5e495fcdb6a3d42244c6da82 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 20 Dec 2022 23:15:39 +1300
Subject: [PATCH 401/838] Bump version to 2022.12.3

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

diff --git a/esphome/const.py b/esphome/const.py
index 191af784d2..91c5165c99 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.12.2"
+__version__ = "2022.12.3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 8db3b59e0f3ad158cd2f457d1779129fa5e82dc5 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 21 Dec 2022 14:03:00 +1300
Subject: [PATCH 402/838] Fix gpio pin mode for ISR pins (#4216)

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

diff --git a/esphome/components/esp32/gpio.cpp b/esphome/components/esp32/gpio.cpp
index 758a707531..aafdf80726 100644
--- a/esphome/components/esp32/gpio.cpp
+++ b/esphome/components/esp32/gpio.cpp
@@ -128,7 +128,7 @@ void IRAM_ATTR ISRInternalGPIOPin::pin_mode(gpio::Flags flags) {
   auto *arg = reinterpret_cast<ISRPinArg *>(arg_);
   gpio_set_direction(arg->pin, flags_to_mode(flags));
   gpio_pull_mode_t pull_mode = GPIO_FLOATING;
-  if (flags & (gpio::FLAG_PULLUP | gpio::FLAG_PULLDOWN)) {
+  if ((flags & gpio::FLAG_PULLUP) && (flags & gpio::FLAG_PULLDOWN)) {
     pull_mode = GPIO_PULLUP_PULLDOWN;
   } else if (flags & gpio::FLAG_PULLUP) {
     pull_mode = GPIO_PULLUP_ONLY;

From 322158cccb9ac0f43f41e2942f147780faa71c16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Dec 2022 16:55:47 +1300
Subject: [PATCH 403/838] Bump actions/stale from 6 to 7 (#4217)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/stale.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 6cb3b659c4..a2ba086394 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -18,7 +18,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v7
         with:
           days-before-pr-stale: 90
           days-before-pr-close: 7
@@ -38,7 +38,7 @@ jobs:
   close-issues:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v7
         with:
           days-before-pr-stale: -1
           days-before-pr-close: -1

From c0a4e07e5a35e561dce4623b56ac2e6722d42a0d Mon Sep 17 00:00:00 2001
From: Steve Rodgers <hwstar@users.noreply.github.com>
Date: Wed, 21 Dec 2022 21:39:25 -0800
Subject: [PATCH 404/838] Add Pca9554 component (#4192)

---
 CODEOWNERS                             |   1 +
 esphome/components/pca9554/__init__.py |  76 +++++++++++++++++
 esphome/components/pca9554/pca9554.cpp | 112 +++++++++++++++++++++++++
 esphome/components/pca9554/pca9554.h   |  64 ++++++++++++++
 tests/test1.yaml                       |  19 +++++
 5 files changed, 272 insertions(+)
 create mode 100644 esphome/components/pca9554/__init__.py
 create mode 100644 esphome/components/pca9554/pca9554.cpp
 create mode 100644 esphome/components/pca9554/pca9554.h

diff --git a/CODEOWNERS b/CODEOWNERS
index d30060fe3b..3fa7fd169a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -164,6 +164,7 @@ esphome/components/nfc/* @jesserockz
 esphome/components/number/* @esphome/core
 esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
+esphome/components/pca9554/* @hwstar
 esphome/components/pid/* @OttoWinter
 esphome/components/pipsolar/* @andreashergert1984
 esphome/components/pm1006/* @habbie
diff --git a/esphome/components/pca9554/__init__.py b/esphome/components/pca9554/__init__.py
new file mode 100644
index 0000000000..76d6ddaf32
--- /dev/null
+++ b/esphome/components/pca9554/__init__.py
@@ -0,0 +1,76 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import i2c
+from esphome.const import (
+    CONF_ID,
+    CONF_INPUT,
+    CONF_NUMBER,
+    CONF_MODE,
+    CONF_INVERTED,
+    CONF_OUTPUT,
+)
+
+CODEOWNERS = ["@hwstar"]
+DEPENDENCIES = ["i2c"]
+MULTI_CONF = True
+pca9554_ns = cg.esphome_ns.namespace("pca9554")
+
+PCA9554Component = pca9554_ns.class_("PCA9554Component", cg.Component, i2c.I2CDevice)
+PCA9554GPIOPin = pca9554_ns.class_(
+    "PCA9554GPIOPin", cg.GPIOPin, cg.Parented.template(PCA9554Component)
+)
+
+CONF_PCA9554 = "pca9554"
+CONFIG_SCHEMA = (
+    cv.Schema({cv.Required(CONF_ID): cv.declare_id(PCA9554Component)})
+    .extend(cv.COMPONENT_SCHEMA)
+    .extend(
+        i2c.i2c_device_schema(0x20)
+    )  # Note: 0x20 for the non-A part. The PCA9554A parts start at addess 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)
+
+
+def validate_mode(value):
+    if not (value[CONF_INPUT] or value[CONF_OUTPUT]):
+        raise cv.Invalid("Mode must be either input or output")
+    if value[CONF_INPUT] and value[CONF_OUTPUT]:
+        raise cv.Invalid("Mode must be either input or output")
+    return value
+
+
+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.Optional(CONF_MODE, default={}): cv.All(
+            {
+                cv.Optional(CONF_INPUT, default=False): cv.boolean,
+                cv.Optional(CONF_OUTPUT, default=False): cv.boolean,
+            },
+            validate_mode,
+        ),
+        cv.Optional(CONF_INVERTED, default=False): cv.boolean,
+    }
+)
+
+
+@pins.PIN_SCHEMA_REGISTRY.register("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])
+
+    cg.add(var.set_parent(parent))
+
+    num = config[CONF_NUMBER]
+    cg.add(var.set_pin(num))
+    cg.add(var.set_inverted(config[CONF_INVERTED]))
+    cg.add(var.set_flags(pins.gpio_flags_expr(config[CONF_MODE])))
+    return var
diff --git a/esphome/components/pca9554/pca9554.cpp b/esphome/components/pca9554/pca9554.cpp
new file mode 100644
index 0000000000..39093fcf54
--- /dev/null
+++ b/esphome/components/pca9554/pca9554.cpp
@@ -0,0 +1,112 @@
+#include "pca9554.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace pca9554 {
+
+const uint8_t INPUT_REG = 0;
+const uint8_t OUTPUT_REG = 1;
+const uint8_t INVERT_REG = 2;
+const uint8_t CONFIG_REG = 3;
+
+static const char *const TAG = "pca9554";
+
+void PCA9554Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up PCA9554/PCA9554A...");
+  // Test to see if device exists
+  if (!this->read_inputs_()) {
+    ESP_LOGE(TAG, "PCA9554 not available under 0x%02X", this->address_);
+    this->mark_failed();
+    return;
+  }
+
+  // No polarity inversion
+  this->write_register_(INVERT_REG, 0);
+  // All inputs at initialization
+  this->config_mask_ = 0;
+  // Invert mask as the part sees a 1 as an input
+  this->write_register_(CONFIG_REG, ~this->config_mask_);
+  // All ouputs low
+  this->output_mask_ = 0;
+  this->write_register_(OUTPUT_REG, this->output_mask_);
+  // Read the inputs
+  this->read_inputs_();
+  ESP_LOGD(TAG, "Initialization complete. Warning: %d, Error: %d", this->status_has_warning(),
+           this->status_has_error());
+}
+void PCA9554Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "PCA9554:");
+  LOG_I2C_DEVICE(this)
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication with PCA9554 failed!");
+  }
+}
+
+bool PCA9554Component::digital_read(uint8_t pin) {
+  this->read_inputs_();
+  return this->input_mask_ & (1 << pin);
+}
+
+void PCA9554Component::digital_write(uint8_t pin, bool value) {
+  if (value) {
+    this->output_mask_ |= (1 << pin);
+  } else {
+    this->output_mask_ &= ~(1 << pin);
+  }
+  this->write_register_(OUTPUT_REG, this->output_mask_);
+}
+
+void PCA9554Component::pin_mode(uint8_t pin, gpio::Flags flags) {
+  if (flags == gpio::FLAG_INPUT) {
+    // Clear mode mask bit
+    this->config_mask_ &= ~(1 << pin);
+  } else if (flags == gpio::FLAG_OUTPUT) {
+    // Set mode mask bit
+    this->config_mask_ |= 1 << pin;
+  }
+  this->write_register_(CONFIG_REG, ~this->config_mask_);
+}
+
+bool PCA9554Component::read_inputs_() {
+  uint8_t inputs;
+
+  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) {
+    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;
+  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) {
+    this->status_set_warning();
+    ESP_LOGE(TAG, "write_register_(): I2C I/O error: %d", (int) this->last_error_);
+    return false;
+  }
+
+  this->status_clear_warning();
+  return true;
+}
+
+float PCA9554Component::get_setup_priority() const { return setup_priority::IO; }
+
+void PCA9554GPIOPin::setup() { pin_mode(flags_); }
+void PCA9554GPIOPin::pin_mode(gpio::Flags flags) { this->parent_->pin_mode(this->pin_, flags); }
+bool PCA9554GPIOPin::digital_read() { return this->parent_->digital_read(this->pin_) != this->inverted_; }
+void PCA9554GPIOPin::digital_write(bool value) { this->parent_->digital_write(this->pin_, value != this->inverted_); }
+std::string PCA9554GPIOPin::dump_summary() const {
+  char buffer[32];
+  snprintf(buffer, sizeof(buffer), "%u via PCA9554", pin_);
+  return buffer;
+}
+
+}  // namespace pca9554
+}  // namespace esphome
diff --git a/esphome/components/pca9554/pca9554.h b/esphome/components/pca9554/pca9554.h
new file mode 100644
index 0000000000..d1bfc36bec
--- /dev/null
+++ b/esphome/components/pca9554/pca9554.h
@@ -0,0 +1,64 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace pca9554 {
+
+class PCA9554Component : public Component, public i2c::I2CDevice {
+ public:
+  PCA9554Component() = default;
+
+  /// Check i2c availability and setup masks
+  void setup() override;
+  /// Helper function to read the value of a pin.
+  bool digital_read(uint8_t pin);
+  /// Helper function to write the value of a pin.
+  void digital_write(uint8_t pin, bool value);
+  /// Helper function to set the pin mode of a pin.
+  void pin_mode(uint8_t pin, gpio::Flags flags);
+
+  float get_setup_priority() const override;
+
+  void dump_config() override;
+
+ protected:
+  bool read_inputs_();
+
+  bool write_register_(uint8_t reg, uint8_t value);
+
+  /// Mask for the pin config - 1 means OUTPUT, 0 means INPUT
+  uint8_t config_mask_{0x00};
+  /// The mask to write as output state - 1 means HIGH, 0 means LOW
+  uint8_t output_mask_{0x00};
+  /// The state of the actual input pin states - 1 means HIGH, 0 means LOW
+  uint8_t input_mask_{0x00};
+  /// Storage for last I2C error seen
+  esphome::i2c::ErrorCode last_error_;
+};
+
+/// Helper class to expose a PCA9554 pin as an internal input GPIO pin.
+class PCA9554GPIOPin : public GPIOPin {
+ public:
+  void setup() override;
+  void pin_mode(gpio::Flags flags) override;
+  bool digital_read() override;
+  void digital_write(bool value) override;
+  std::string dump_summary() const override;
+
+  void set_parent(PCA9554Component *parent) { parent_ = parent; }
+  void set_pin(uint8_t pin) { pin_ = pin; }
+  void set_inverted(bool inverted) { inverted_ = inverted; }
+  void set_flags(gpio::Flags flags) { flags_ = flags; }
+
+ protected:
+  PCA9554Component *parent_;
+  uint8_t pin_;
+  bool inverted_;
+  gpio::Flags flags_;
+};
+
+}  // namespace pca9554
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 88cdb43fca..b8951c9817 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1341,6 +1341,13 @@ binary_sensor:
       number: 1
       mode: INPUT
       inverted: true
+  - platform: gpio
+    name: PCA9554 binary sensor
+    pin:
+      pca9554: pca9554_hub
+      number: 1
+      mode: INPUT
+      inverted: true
   - platform: gpio
     name: MCP21 binary sensor
     pin:
@@ -1537,6 +1544,13 @@ output:
       number: 0
       mode: OUTPUT
       inverted: false
+  - platform: gpio
+    id: id26
+    pin:
+      pca9554: pca9554_hub
+      number: 0
+      mode: OUTPUT
+      inverted: false
   - platform: gpio
     id: id22
     pin:
@@ -2716,6 +2730,11 @@ pcf8574:
     pcf8575: false
     i2c_id: i2c_bus
 
+pca9554:
+  - id: pca9554_hub
+    address: 0x3F
+    i2c_id: i2c_bus
+
 mcp23017:
   - id: mcp23017_hub
     open_drain_interrupt: true

From 7a2bb32843abc0bd473162cf5ac80021498cda84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Dec 2022 18:40:00 +1300
Subject: [PATCH 405/838] Bump aioesphomeapi from 13.0.1 to 13.0.2 (#4188)

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 9c12253160..75e7dd8e12 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.5  # When updating platformio, also update Dockerfile
 esptool==4.4
 click==8.1.3
 esphome-dashboard==20221213.0
-aioesphomeapi==13.0.1
+aioesphomeapi==13.0.2
 zeroconf==0.39.4
 
 # esp-idf requires this, but doesn't bundle it by default

From 5b23331751135958704de8c354a7ec8ddd59e02a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Dec 2022 18:44:41 +1300
Subject: [PATCH 406/838] Bump pytest-asyncio from 0.20.2 to 0.20.3 (#4164)

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 fbc8f63613..591258b49a 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -8,6 +8,6 @@ pre-commit
 pytest==7.2.0
 pytest-cov==4.0.0
 pytest-mock==3.10.0
-pytest-asyncio==0.20.2
+pytest-asyncio==0.20.3
 asyncmock==0.4.2
 hypothesis==5.49.0

From 22b384363b4a384c08d967c693a9fb68acad4531 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 22 Dec 2022 19:07:39 +1300
Subject: [PATCH 407/838] Bump nano version in lint docker image (#4218)

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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0dd505a9b8..8243f85f29 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -139,7 +139,7 @@ RUN \
         clang-tidy-11=1:11.0.1-2 \
         patch=2.7.6-7 \
         software-properties-common=0.96.20.2-2.1 \
-        nano=5.4-2+deb11u1 \
+        nano=5.4-2+deb11u2 \
         build-essential=12.9 \
         python3-dev=3.9.2-3 \
     && rm -rf \

From c1f09684e6d6df8e87812a405fc54305f812b9ba Mon Sep 17 00:00:00 2001
From: Maurice Makaay <account+github@makaay.nl>
Date: Thu, 22 Dec 2022 07:27:47 +0100
Subject: [PATCH 408/838] Handle deprecated sdkconfig option (#4204)

Co-authored-by: Maurice Makaay <maurice@h2b.nl>
fixes https://github.com/mmakaay/esphome-xiaomi_bslamp2/issues/104
---
 esphome/components/esp32/__init__.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index 3989b62842..f30fa9a7b2 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -356,9 +356,14 @@ async def to_code(config):
 
         if conf[CONF_ADVANCED][CONF_IGNORE_EFUSE_MAC_CRC]:
             cg.add_define("USE_ESP32_IGNORE_EFUSE_MAC_CRC")
-            add_idf_sdkconfig_option(
-                "CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE", False
-            )
+            if (framework_ver.major, framework_ver.minor) >= (4, 4):
+                add_idf_sdkconfig_option(
+                    "CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE", False
+                )
+            else:
+                add_idf_sdkconfig_option(
+                    "CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE", False
+                )
 
         cg.add_define(
             "USE_ESP_IDF_VERSION_CODE",

From 97678567847e22920b319282c647128ecdc6df19 Mon Sep 17 00:00:00 2001
From: "Francisco J. Solis" <siscomagma@gmail.com>
Date: Thu, 22 Dec 2022 00:34:00 -0600
Subject: [PATCH 409/838] feat: set a wider range for jpeg quality (#3872)

fixes https://github.com/esphome/issues/issues/3570
---
 esphome/components/esp32_camera/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/esp32_camera/__init__.py b/esphome/components/esp32_camera/__init__.py
index 753b6ed9da..b3abbd5c13 100644
--- a/esphome/components/esp32_camera/__init__.py
+++ b/esphome/components/esp32_camera/__init__.py
@@ -156,7 +156,7 @@ CONFIG_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
         cv.Optional(CONF_RESOLUTION, default="640X480"): cv.enum(
             FRAME_SIZES, upper=True
         ),
-        cv.Optional(CONF_JPEG_QUALITY, default=10): cv.int_range(min=10, max=63),
+        cv.Optional(CONF_JPEG_QUALITY, default=10): cv.int_range(min=6, max=63),
         cv.Optional(CONF_CONTRAST, default=0): camera_range_param,
         cv.Optional(CONF_BRIGHTNESS, default=0): camera_range_param,
         cv.Optional(CONF_SATURATION, default=0): camera_range_param,

From 0b0984f9a018db24c94b66469122b1ada944d8b8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Dec 2022 19:42:49 +1300
Subject: [PATCH 410/838] Bump black from 22.10.0 to 22.12.0 (#4167)

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 b8c0a22e81..e5ae80da3b 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/ambv/black
-    rev: 22.10.0
+    rev: 22.12.0
     hooks:
       - id: black
         args:
diff --git a/requirements_test.txt b/requirements_test.txt
index 591258b49a..0376fcd93a 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,6 +1,6 @@
 pylint==2.15.8
 flake8==6.0.0  # also change in .pre-commit-config.yaml when updating
-black==22.10.0  # also change in .pre-commit-config.yaml when updating
+black==22.12.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.3.0  # also change in .pre-commit-config.yaml when updating
 pre-commit
 

From b76c7a0131cad8df8499bdfe4933a267cb04cbfc Mon Sep 17 00:00:00 2001
From: Matthew Donoughe <mdonoughe@pm.me>
Date: Thu, 22 Dec 2022 01:50:37 -0500
Subject: [PATCH 411/838] Use NAN values for TSL2591 saturation (#3931)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/tsl2591/tsl2591.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/tsl2591/tsl2591.cpp b/esphome/components/tsl2591/tsl2591.cpp
index f8c59a53c6..e3df467aeb 100644
--- a/esphome/components/tsl2591/tsl2591.cpp
+++ b/esphome/components/tsl2591/tsl2591.cpp
@@ -347,8 +347,8 @@ float TSL2591Component::get_calculated_lux(uint16_t full_spectrum, uint16_t infr
   uint16_t max_count = (this->integration_time_ == TSL2591_INTEGRATION_TIME_100MS ? 36863 : 65535);
   if ((full_spectrum == max_count) || (infrared == max_count)) {
     // Signal an overflow
-    ESP_LOGW(TAG, "Apparent saturation on TSL2591 (%s). You could reduce the gain.", this->name_);
-    return -1.0F;
+    ESP_LOGW(TAG, "Apparent saturation on TSL2591 (%s). You could reduce the gain or integration time.", this->name_);
+    return NAN;
   }
 
   if ((full_spectrum == 0) && (infrared == 0)) {

From ecbbf2d3f43e3b85fc02a5152f2ea6a2d35caebc Mon Sep 17 00:00:00 2001
From: Dave T <17680170+davet2001@users.noreply.github.com>
Date: Thu, 22 Dec 2022 06:53:53 +0000
Subject: [PATCH 412/838] Ili9341 8bit indexed mode pt2 (#2502)

---
 esphome/components/ili9341/display.py         | 66 +++++++++++++++++--
 .../components/ili9341/ili9341_display.cpp    |  7 +-
 2 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/esphome/components/ili9341/display.py b/esphome/components/ili9341/display.py
index 3122b45bbe..0b87a0c4eb 100644
--- a/esphome/components/ili9341/display.py
+++ b/esphome/components/ili9341/display.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome import pins
+from esphome import core, pins
 from esphome.components import display, spi
 from esphome.const import (
     CONF_COLOR_PALETTE,
@@ -12,10 +12,11 @@ from esphome.const import (
     CONF_RAW_DATA_ID,
     CONF_RESET_PIN,
 )
-from esphome.core import HexInt
+from esphome.core import CORE, HexInt
 
 DEPENDENCIES = ["spi"]
 
+CONF_COLOR_PALETTE_IMAGES = "color_palette_images"
 CONF_LED_PIN = "led_pin"
 
 ili9341_ns = cg.esphome_ns.namespace("ili9341")
@@ -37,7 +38,25 @@ MODELS = {
 
 ILI9341_MODEL = cv.enum(MODELS, upper=True, space="_")
 
-COLOR_PALETTE = cv.one_of("NONE", "GRAYSCALE")
+COLOR_PALETTE = cv.one_of("NONE", "GRAYSCALE", "IMAGE_ADAPTIVE")
+
+
+def _validate(config):
+    if config.get(CONF_COLOR_PALETTE) == "IMAGE_ADAPTIVE" and not config.get(
+        CONF_COLOR_PALETTE_IMAGES
+    ):
+        raise cv.Invalid(
+            "Color palette in IMAGE_ADAPTIVE mode requires at least one 'color_palette_images' entry to generate palette"
+        )
+    if (
+        config.get(CONF_COLOR_PALETTE_IMAGES)
+        and config.get(CONF_COLOR_PALETTE) != "IMAGE_ADAPTIVE"
+    ):
+        raise cv.Invalid(
+            "Providing color palette images requires palette mode to be 'IMAGE_ADAPTIVE'"
+        )
+    return config
+
 
 CONFIG_SCHEMA = cv.All(
     display.FULL_DISPLAY_SCHEMA.extend(
@@ -48,12 +67,16 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
             cv.Optional(CONF_LED_PIN): pins.gpio_output_pin_schema,
             cv.Optional(CONF_COLOR_PALETTE, default="NONE"): COLOR_PALETTE,
+            cv.Optional(CONF_COLOR_PALETTE_IMAGES, default=[]): cv.ensure_list(
+                cv.file_
+            ),
             cv.GenerateID(CONF_RAW_DATA_ID): cv.declare_id(cg.uint8),
         }
     )
     .extend(cv.polling_component_schema("1s"))
     .extend(spi.spi_device_schema(False)),
     cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA),
+    _validate,
 )
 
 
@@ -86,12 +109,45 @@ async def to_code(config):
         led_pin = await cg.gpio_pin_expression(config[CONF_LED_PIN])
         cg.add(var.set_led_pin(led_pin))
 
+    rhs = None
     if config[CONF_COLOR_PALETTE] == "GRAYSCALE":
         cg.add(var.set_buffer_color_mode(ILI9341ColorMode.BITS_8_INDEXED))
         rhs = []
         for x in range(256):
             rhs.extend([HexInt(x), HexInt(x), HexInt(x)])
+    elif config[CONF_COLOR_PALETTE] == "IMAGE_ADAPTIVE":
+        cg.add(var.set_buffer_color_mode(ILI9341ColorMode.BITS_8_INDEXED))
+        from PIL import Image
+
+        def load_image(filename):
+            path = CORE.relative_config_path(filename)
+            try:
+                return Image.open(path)
+            except Exception as e:
+                raise core.EsphomeError(f"Could not load image file {path}: {e}")
+
+        # make a wide horizontal combined image.
+        images = [load_image(x) for x in config[CONF_COLOR_PALETTE_IMAGES]]
+        total_width = sum(i.width for i in images)
+        max_height = max(i.height for i in images)
+
+        ref_image = Image.new("RGB", (total_width, max_height))
+        x = 0
+        for i in images:
+            ref_image.paste(i, (x, 0))
+            x = x + i.width
+
+        # reduce the colors on combined image to 256.
+        converted = ref_image.convert("P", palette=Image.ADAPTIVE, colors=256)
+        # if you want to verify how the images look use
+        # ref_image.save("ref_in.png")
+        # converted.save("ref_out.png")
+        palette = converted.getpalette()
+        assert len(palette) == 256 * 3
+        rhs = palette
+    else:
+        cg.add(var.set_buffer_color_mode(ILI9341ColorMode.BITS_8))
+
+    if rhs is not None:
         prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
         cg.add(var.set_palette(prog_arr))
-    else:
-        pass
diff --git a/esphome/components/ili9341/ili9341_display.cpp b/esphome/components/ili9341/ili9341_display.cpp
index 117de3de89..9f9edcf21f 100644
--- a/esphome/components/ili9341/ili9341_display.cpp
+++ b/esphome/components/ili9341/ili9341_display.cpp
@@ -122,7 +122,12 @@ void ILI9341Display::display_() {
 }
 
 void ILI9341Display::fill(Color color) {
-  uint8_t color332 = display::ColorUtil::color_to_332(color, display::ColorOrder::COLOR_ORDER_RGB);
+  uint8_t color332 = 0;
+  if (this->buffer_color_mode_ == BITS_8) {
+    color332 = display::ColorUtil::color_to_332(color);
+  } else {  // if (this->buffer_color_mode_ == BITS_8_INDEXED)
+    color332 = display::ColorUtil::color_to_index8_palette888(color, this->palette_);
+  }
   memset(this->buffer_, color332, this->get_buffer_length_());
   this->x_low_ = 0;
   this->y_low_ = 0;

From f2df542cb1c8d20102af3d752b6487f49aac038c Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan@faked.org>
Date: Thu, 22 Dec 2022 08:14:11 +0100
Subject: [PATCH 413/838] Allow ignoring of failed Modbus response CRC (#3930)

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

diff --git a/esphome/components/modbus/__init__.py b/esphome/components/modbus/__init__.py
index 254322d097..6fea7033f2 100644
--- a/esphome/components/modbus/__init__.py
+++ b/esphome/components/modbus/__init__.py
@@ -6,6 +6,7 @@ from esphome.const import (
     CONF_FLOW_CONTROL_PIN,
     CONF_ID,
     CONF_ADDRESS,
+    CONF_DISABLE_CRC,
 )
 from esphome import pins
 
@@ -27,6 +28,7 @@ CONFIG_SCHEMA = (
             cv.Optional(
                 CONF_SEND_WAIT_TIME, default="250ms"
             ): cv.positive_time_period_milliseconds,
+            cv.Optional(CONF_DISABLE_CRC, default=False): cv.boolean,
         }
     )
     .extend(cv.COMPONENT_SCHEMA)
@@ -45,8 +47,8 @@ async def to_code(config):
         pin = await gpio_pin_expression(config[CONF_FLOW_CONTROL_PIN])
         cg.add(var.set_flow_control_pin(pin))
 
-    if CONF_SEND_WAIT_TIME in config:
-        cg.add(var.set_send_wait_time(config[CONF_SEND_WAIT_TIME]))
+    cg.add(var.set_send_wait_time(config[CONF_SEND_WAIT_TIME]))
+    cg.add(var.set_disable_crc(config[CONF_DISABLE_CRC]))
 
 
 def modbus_device_schema(default_address):
diff --git a/esphome/components/modbus/modbus.cpp b/esphome/components/modbus/modbus.cpp
index 4d75675d0f..137fb0b26b 100644
--- a/esphome/components/modbus/modbus.cpp
+++ b/esphome/components/modbus/modbus.cpp
@@ -102,8 +102,12 @@ bool Modbus::parse_modbus_byte_(uint8_t byte) {
     uint16_t computed_crc = crc16(raw, data_offset + data_len);
     uint16_t remote_crc = uint16_t(raw[data_offset + data_len]) | (uint16_t(raw[data_offset + data_len + 1]) << 8);
     if (computed_crc != remote_crc) {
-      ESP_LOGW(TAG, "Modbus CRC Check failed! %02X!=%02X", computed_crc, remote_crc);
-      return false;
+      if (this->disable_crc_) {
+        ESP_LOGD(TAG, "Modbus CRC Check failed, but ignored! %02X!=%02X", computed_crc, remote_crc);
+      } else {
+        ESP_LOGW(TAG, "Modbus CRC Check failed! %02X!=%02X", computed_crc, remote_crc);
+        return false;
+      }
     }
   }
   std::vector<uint8_t> data(this->rx_buffer_.begin() + data_offset, this->rx_buffer_.begin() + data_offset + data_len);
@@ -139,6 +143,7 @@ void Modbus::dump_config() {
   ESP_LOGCONFIG(TAG, "Modbus:");
   LOG_PIN("  Flow Control Pin: ", this->flow_control_pin_);
   ESP_LOGCONFIG(TAG, "  Send Wait Time: %d ms", this->send_wait_time_);
+  ESP_LOGCONFIG(TAG, "  CRC Disabled: %s", YESNO(this->disable_crc_));
 }
 float Modbus::get_setup_priority() const {
   // After UART bus
diff --git a/esphome/components/modbus/modbus.h b/esphome/components/modbus/modbus.h
index 95414ba090..dd8732c6e9 100644
--- a/esphome/components/modbus/modbus.h
+++ b/esphome/components/modbus/modbus.h
@@ -30,12 +30,14 @@ class Modbus : public uart::UARTDevice, public Component {
   void set_flow_control_pin(GPIOPin *flow_control_pin) { this->flow_control_pin_ = flow_control_pin; }
   uint8_t waiting_for_response{0};
   void set_send_wait_time(uint16_t time_in_ms) { send_wait_time_ = time_in_ms; }
+  void set_disable_crc(bool disable_crc) { disable_crc_ = disable_crc; }
 
  protected:
   GPIOPin *flow_control_pin_{nullptr};
 
   bool parse_modbus_byte_(uint8_t byte);
   uint16_t send_wait_time_{250};
+  bool disable_crc_;
   std::vector<uint8_t> rx_buffer_;
   uint32_t last_modbus_byte_{0};
   uint32_t last_send_{0};
diff --git a/esphome/const.py b/esphome/const.py
index 19fc226dd9..f0b0c089bf 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -175,6 +175,7 @@ CONF_DIO_PIN = "dio_pin"
 CONF_DIR_PIN = "dir_pin"
 CONF_DIRECTION = "direction"
 CONF_DIRECTION_OUTPUT = "direction_output"
+CONF_DISABLE_CRC = "disable_crc"
 CONF_DISABLED_BY_DEFAULT = "disabled_by_default"
 CONF_DISCONNECT_DELAY = "disconnect_delay"
 CONF_DISCOVERY = "discovery"

From 33b1a853b9afa55c4f26cacbda1133f3bc36fdb6 Mon Sep 17 00:00:00 2001
From: Martin Flasskamp <github@flasskamp.net>
Date: Thu, 22 Dec 2022 08:21:44 +0100
Subject: [PATCH 414/838] calc LEDC PWM Resolution with LEDC_TIMER_BIT_MAX
 (#3820)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
fixes https://github.com/esphome/issues/issues/3128
---
 esphome/components/ledc/ledc_output.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/esphome/components/ledc/ledc_output.cpp b/esphome/components/ledc/ledc_output.cpp
index a56dccfd72..34cf4cd1f6 100644
--- a/esphome/components/ledc/ledc_output.cpp
+++ b/esphome/components/ledc/ledc_output.cpp
@@ -6,17 +6,15 @@
 #ifdef USE_ARDUINO
 #include <esp32-hal-ledc.h>
 #endif
-#ifdef USE_ESP_IDF
 #include <driver/ledc.h>
-#endif
 
 namespace esphome {
 namespace ledc {
 
 static const char *const TAG = "ledc.output";
 
-#ifdef USE_ESP_IDF
 static const int MAX_RES_BITS = LEDC_TIMER_BIT_MAX - 1;
+#ifdef USE_ESP_IDF
 #if SOC_LEDC_SUPPORT_HS_MODE
 // Only ESP32 has LEDC_HIGH_SPEED_MODE
 inline ledc_mode_t get_speed_mode(uint8_t channel) { return channel < 8 ? LEDC_HIGH_SPEED_MODE : LEDC_LOW_SPEED_MODE; }
@@ -26,8 +24,6 @@ inline ledc_mode_t get_speed_mode(uint8_t channel) { return channel < 8 ? LEDC_H
 // https://docs.espressif.com/projects/esp-idf/en/latest/esp32c3/api-reference/peripherals/ledc.html#functionality-overview
 inline ledc_mode_t get_speed_mode(uint8_t) { return LEDC_LOW_SPEED_MODE; }
 #endif
-#else
-static const int MAX_RES_BITS = 20;
 #endif
 
 float ledc_max_frequency_for_bit_depth(uint8_t bit_depth) { return 80e6f / float(1 << bit_depth); }

From ff4fd497c42e53968d5a001bcbab91f17f858c81 Mon Sep 17 00:00:00 2001
From: Dan Jackson <dan@djackson.org>
Date: Wed, 21 Dec 2022 23:48:15 -0800
Subject: [PATCH 415/838] Component::set_retry updates (#3305)

---
 esphome/core/component.h   | 22 ++++++++++++++++------
 esphome/core/scheduler.cpp | 14 ++++++++++++--
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/esphome/core/component.h b/esphome/core/component.h
index 1d8499e262..3b873cbc9f 100644
--- a/esphome/core/component.h
+++ b/esphome/core/component.h
@@ -185,19 +185,29 @@ class Component {
 
   /** Set an retry function with a unique name. Empty name means no cancelling possible.
    *
-   * This will call f. If f returns RetryResult::RETRY f is called again after initial_wait_time ms.
-   * f should return RetryResult::DONE if no repeat is required. The initial wait time will be increased
-   * by backoff_increase_factor for each iteration. Default is doubling the time between iterations
-   * Can be cancelled via cancel_retry().
+   * This will call the retry function f on the next scheduler loop. f should return RetryResult::DONE if
+   * it is successful and no repeat is required. Otherwise, returning RetryResult::RETRY will call f
+   * again in the future.
+   *
+   * The first retry of f happens after `initial_wait_time` milliseconds. The delay between retries is
+   * increased by multipling by `backoff_increase_factor` each time. If no backoff_increase_factor is
+   * supplied (default = 1.0), the wait time will stay constant.
+   *
+   * This retry function can also be cancelled by name via cancel_retry().
    *
    * IMPORTANT: Do not rely on this having correct timing. This is only called from
    * loop() and therefore can be significantly delayed.
    *
+   * REMARK: It is an error to supply a negative or zero `backoff_increase_factor`, and 1.0 will be used instead.
+   *
+   * REMARK: The interval between retries is stored into a `uint32_t`, so this doesn't behave correctly
+   * if `initial_wait_time * (backoff_increase_factor ** (max_attempts - 2))` overflows.
+   *
    * @param name The identifier for this retry function.
    * @param initial_wait_time The time in ms before f is called again
-   * @param max_attempts The maximum number of retries
+   * @param max_attempts The maximum number of executions
    * @param f The function (or lambda) that should be called
-   * @param backoff_increase_factor time between retries is increased by this factor on every retry
+   * @param backoff_increase_factor time between retries is multiplied by this factor on every retry after the first
    * @see cancel_retry()
    */
   void set_retry(const std::string &name, uint32_t initial_wait_time, uint8_t max_attempts,  // NOLINT
diff --git a/esphome/core/scheduler.cpp b/esphome/core/scheduler.cpp
index cc4074b94d..dfec4fcaa2 100644
--- a/esphome/core/scheduler.cpp
+++ b/esphome/core/scheduler.cpp
@@ -87,8 +87,10 @@ static void retry_handler(const std::shared_ptr<RetryArgs> &args) {
   RetryResult retry_result = args->func();
   if (retry_result == RetryResult::DONE || --args->retry_countdown <= 0)
     return;
-  args->current_interval *= args->backoff_increase_factor;
+  // second execution of `func` hapens after `initial_wait_time`
   args->scheduler->set_timeout(args->component, args->name, args->current_interval, [args]() { retry_handler(args); });
+  // backoff_increase_factor applied to third & later executions
+  args->current_interval *= args->backoff_increase_factor;
 }
 
 void HOT Scheduler::set_retry(Component *component, const std::string &name, uint32_t initial_wait_time,
@@ -102,6 +104,13 @@ void HOT Scheduler::set_retry(Component *component, const std::string &name, uin
   ESP_LOGVV(TAG, "set_retry(name='%s', initial_wait_time=%u, max_attempts=%u, backoff_factor=%0.1f)", name.c_str(),
             initial_wait_time, max_attempts, backoff_increase_factor);
 
+  if (backoff_increase_factor < 0.0001) {
+    ESP_LOGE(TAG,
+             "set_retry(name='%s'): backoff_factor cannot be close to zero nor negative (%0.1f). Using 1.0 instead",
+             name.c_str(), backoff_increase_factor);
+    backoff_increase_factor = 1;
+  }
+
   auto args = std::make_shared<RetryArgs>();
   args->func = std::move(func);
   args->retry_countdown = max_attempts;
@@ -111,7 +120,8 @@ void HOT Scheduler::set_retry(Component *component, const std::string &name, uin
   args->backoff_increase_factor = backoff_increase_factor;
   args->scheduler = this;
 
-  this->set_timeout(component, args->name, initial_wait_time, [args]() { retry_handler(args); });
+  // First exectuion of `func` immediately
+  this->set_timeout(component, args->name, 0, [args]() { retry_handler(args); });
 }
 bool HOT Scheduler::cancel_retry(Component *component, const std::string &name) {
   return this->cancel_timeout(component, "retry$" + name);

From 50e8e92f0bf08725127db1ca899911fac1493508 Mon Sep 17 00:00:00 2001
From: tomaszduda23 <tomaszduda23@gmail.com>
Date: Thu, 22 Dec 2022 16:51:24 +0900
Subject: [PATCH 416/838] Fix race condition in web_server scheduler on ESP32
 (#3951)

---
 esphome/components/web_server/web_server.cpp | 71 +++++++++++++++-----
 esphome/components/web_server/web_server.h   | 13 +++-
 2 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index 30ac959e43..1f043b43fc 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -83,6 +83,13 @@ UrlMatch match_url(const std::string &url, bool only_domain = false) {
   return match;
 }
 
+WebServer::WebServer(web_server_base::WebServerBase *base)
+    : base_(base), entities_iterator_(ListEntitiesIterator(this)) {
+#ifdef USE_ESP32
+  to_schedule_lock_ = xSemaphoreCreateMutex();
+#endif
+}
+
 void WebServer::set_css_url(const char *css_url) { this->css_url_ = css_url; }
 void WebServer::set_css_include(const char *css_include) { this->css_include_ = css_include; }
 void WebServer::set_js_url(const char *js_url) { this->js_url_ = js_url; }
@@ -120,7 +127,25 @@ void WebServer::setup() {
 
   this->set_interval(10000, [this]() { this->events_.send("", "ping", millis(), 30000); });
 }
-void WebServer::loop() { this->entities_iterator_.advance(); }
+void WebServer::loop() {
+#ifdef USE_ESP32
+  if (xSemaphoreTake(this->to_schedule_lock_, 0L)) {
+    std::function<void()> fn;
+    if (!to_schedule_.empty()) {
+      // scheduler execute things out of order which may lead to incorrect state
+      // this->defer(std::move(to_schedule_.front()));
+      // let's execute it directly from the loop
+      fn = std::move(to_schedule_.front());
+      to_schedule_.pop_front();
+    }
+    xSemaphoreGive(this->to_schedule_lock_);
+    if (fn) {
+      fn();
+    }
+  }
+#endif
+  this->entities_iterator_.advance();
+}
 void WebServer::dump_config() {
   ESP_LOGCONFIG(TAG, "Web Server:");
   ESP_LOGCONFIG(TAG, "  Address: %s:%u", network::get_use_address().c_str(), this->base_->get_port());
@@ -413,13 +438,13 @@ void WebServer::handle_switch_request(AsyncWebServerRequest *request, const UrlM
       std::string data = this->switch_json(obj, obj->state, DETAIL_STATE);
       request->send(200, "application/json", data.c_str());
     } else if (match.method == "toggle") {
-      this->defer([obj]() { obj->toggle(); });
+      this->schedule_([obj]() { obj->toggle(); });
       request->send(200);
     } else if (match.method == "turn_on") {
-      this->defer([obj]() { obj->turn_on(); });
+      this->schedule_([obj]() { obj->turn_on(); });
       request->send(200);
     } else if (match.method == "turn_off") {
-      this->defer([obj]() { obj->turn_off(); });
+      this->schedule_([obj]() { obj->turn_off(); });
       request->send(200);
     } else {
       request->send(404);
@@ -441,7 +466,7 @@ void WebServer::handle_button_request(AsyncWebServerRequest *request, const UrlM
     if (obj->get_object_id() != match.id)
       continue;
     if (request->method() == HTTP_POST && match.method == "press") {
-      this->defer([obj]() { obj->press(); });
+      this->schedule_([obj]() { obj->press(); });
       request->send(200);
       return;
     } else {
@@ -497,7 +522,7 @@ void WebServer::handle_fan_request(AsyncWebServerRequest *request, const UrlMatc
       std::string data = this->fan_json(obj, DETAIL_STATE);
       request->send(200, "application/json", data.c_str());
     } else if (match.method == "toggle") {
-      this->defer([obj]() { obj->toggle().perform(); });
+      this->schedule_([obj]() { obj->toggle().perform(); });
       request->send(200);
     } else if (match.method == "turn_on") {
       auto call = obj->turn_on();
@@ -531,10 +556,10 @@ void WebServer::handle_fan_request(AsyncWebServerRequest *request, const UrlMatc
             return;
         }
       }
-      this->defer([call]() mutable { call.perform(); });
+      this->schedule_([call]() mutable { call.perform(); });
       request->send(200);
     } else if (match.method == "turn_off") {
-      this->defer([obj]() { obj->turn_off().perform(); });
+      this->schedule_([obj]() { obj->turn_off().perform(); });
       request->send(200);
     } else {
       request->send(404);
@@ -558,7 +583,7 @@ void WebServer::handle_light_request(AsyncWebServerRequest *request, const UrlMa
       std::string data = this->light_json(obj, DETAIL_STATE);
       request->send(200, "application/json", data.c_str());
     } else if (match.method == "toggle") {
-      this->defer([obj]() { obj->toggle().perform(); });
+      this->schedule_([obj]() { obj->toggle().perform(); });
       request->send(200);
     } else if (match.method == "turn_on") {
       auto call = obj->turn_on();
@@ -590,7 +615,7 @@ void WebServer::handle_light_request(AsyncWebServerRequest *request, const UrlMa
         call.set_effect(effect);
       }
 
-      this->defer([call]() mutable { call.perform(); });
+      this->schedule_([call]() mutable { call.perform(); });
       request->send(200);
     } else if (match.method == "turn_off") {
       auto call = obj->turn_off();
@@ -598,7 +623,7 @@ void WebServer::handle_light_request(AsyncWebServerRequest *request, const UrlMa
         auto length = (uint32_t) request->getParam("transition")->value().toFloat() * 1000;
         call.set_transition_length(length);
       }
-      this->defer([call]() mutable { call.perform(); });
+      this->schedule_([call]() mutable { call.perform(); });
       request->send(200);
     } else {
       request->send(404);
@@ -663,7 +688,7 @@ void WebServer::handle_cover_request(AsyncWebServerRequest *request, const UrlMa
     if (request->hasParam("tilt"))
       call.set_tilt(request->getParam("tilt")->value().toFloat());
 
-    this->defer([call]() mutable { call.perform(); });
+    this->schedule_([call]() mutable { call.perform(); });
     request->send(200);
     return;
   }
@@ -708,7 +733,7 @@ void WebServer::handle_number_request(AsyncWebServerRequest *request, const UrlM
         call.set_value(*value_f);
     }
 
-    this->defer([call]() mutable { call.perform(); });
+    this->schedule_([call]() mutable { call.perform(); });
     request->send(200);
     return;
   }
@@ -765,7 +790,7 @@ void WebServer::handle_select_request(AsyncWebServerRequest *request, const UrlM
       call.set_option(option.c_str());  // NOLINT(clang-diagnostic-deprecated-declarations)
     }
 
-    this->defer([call]() mutable { call.perform(); });
+    this->schedule_([call]() mutable { call.perform(); });
     request->send(200);
     return;
   }
@@ -833,7 +858,7 @@ void WebServer::handle_climate_request(AsyncWebServerRequest *request, const Url
         call.set_target_temperature(*value_f);
     }
 
-    this->defer([call]() mutable { call.perform(); });
+    this->schedule_([call]() mutable { call.perform(); });
     request->send(200);
     return;
   }
@@ -949,13 +974,13 @@ void WebServer::handle_lock_request(AsyncWebServerRequest *request, const UrlMat
       std::string data = this->lock_json(obj, obj->state, DETAIL_STATE);
       request->send(200, "application/json", data.c_str());
     } else if (match.method == "lock") {
-      this->defer([obj]() { obj->lock(); });
+      this->schedule_([obj]() { obj->lock(); });
       request->send(200);
     } else if (match.method == "unlock") {
-      this->defer([obj]() { obj->unlock(); });
+      this->schedule_([obj]() { obj->unlock(); });
       request->send(200);
     } else if (match.method == "open") {
-      this->defer([obj]() { obj->open(); });
+      this->schedule_([obj]() { obj->open(); });
       request->send(200);
     } else {
       request->send(404);
@@ -1154,6 +1179,16 @@ void WebServer::handleRequest(AsyncWebServerRequest *request) {
 
 bool WebServer::isRequestHandlerTrivial() { return false; }
 
+void WebServer::schedule_(std::function<void()> &&f) {
+#ifdef USE_ESP32
+  xSemaphoreTake(this->to_schedule_lock_, portMAX_DELAY);
+  to_schedule_.push_back(std::move(f));
+  xSemaphoreGive(this->to_schedule_lock_);
+#else
+  this->defer(std::move(f));
+#endif
+}
+
 }  // namespace web_server
 }  // namespace esphome
 
diff --git a/esphome/components/web_server/web_server.h b/esphome/components/web_server/web_server.h
index 78d0597e61..f4122ef754 100644
--- a/esphome/components/web_server/web_server.h
+++ b/esphome/components/web_server/web_server.h
@@ -9,7 +9,11 @@
 #include "esphome/core/controller.h"
 
 #include <vector>
-
+#ifdef USE_ESP32
+#include <deque>
+#include <freertos/FreeRTOS.h>
+#include <freertos/semphr.h>
+#endif
 namespace esphome {
 namespace web_server {
 
@@ -34,7 +38,7 @@ enum JsonDetail { DETAIL_ALL, DETAIL_STATE };
  */
 class WebServer : public Controller, public Component, public AsyncWebHandler {
  public:
-  WebServer(web_server_base::WebServerBase *base) : base_(base), entities_iterator_(ListEntitiesIterator(this)) {}
+  WebServer(web_server_base::WebServerBase *base);
 
   /** Set the URL to the CSS <link> that's sent to each client. Defaults to
    * https://esphome.io/_static/webserver-v1.min.css
@@ -220,6 +224,7 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
   bool isRequestHandlerTrivial() override;
 
  protected:
+  void schedule_(std::function<void()> &&f);
   friend ListEntitiesIterator;
   web_server_base::WebServerBase *base_;
   AsyncEventSource events_{"/events"};
@@ -230,6 +235,10 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
   const char *js_include_{nullptr};
   bool include_internal_{false};
   bool allow_ota_{true};
+#ifdef USE_ESP32
+  std::deque<std::function<void()>> to_schedule_;
+  SemaphoreHandle_t to_schedule_lock_;
+#endif
 };
 
 }  // namespace web_server

From 57a1c207c2df36015a970629b45fbbb1a9146476 Mon Sep 17 00:00:00 2001
From: myhomeiot <70070601+myhomeiot@users.noreply.github.com>
Date: Thu, 22 Dec 2022 09:57:53 +0200
Subject: [PATCH 417/838] Fix saving light state for restore modes
 LIGHT_RESTORE_AND_OFF/ON (#4131)

---
 esphome/components/light/light_state.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/esphome/components/light/light_state.cpp b/esphome/components/light/light_state.cpp
index 00c03eb5f0..64c29a346b 100644
--- a/esphome/components/light/light_state.cpp
+++ b/esphome/components/light/light_state.cpp
@@ -276,7 +276,15 @@ void LightState::set_immediately_(const LightColorValues &target, bool set_remot
 void LightState::save_remote_values_() {
   LightStateRTCState saved;
   saved.color_mode = this->remote_values.get_color_mode();
-  saved.state = this->remote_values.is_on();
+  switch (this->restore_mode_) {
+    case LIGHT_RESTORE_AND_OFF:
+    case LIGHT_RESTORE_AND_ON:
+      saved.state = (this->restore_mode_ == LIGHT_RESTORE_AND_ON);
+      break;
+    default:
+      saved.state = this->remote_values.is_on();
+      break;
+  }
   saved.brightness = this->remote_values.get_brightness();
   saved.color_brightness = this->remote_values.get_color_brightness();
   saved.red = this->remote_values.get_red();

From 7e376ae952458b75074c61a48155460c41dd3341 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 22 Dec 2022 21:18:58 +1300
Subject: [PATCH 418/838] Add precipitation device class (#4219)

---
 esphome/components/number/__init__.py | 2 ++
 esphome/components/sensor/__init__.py | 4 +++-
 esphome/const.py                      | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/esphome/components/number/__init__.py b/esphome/components/number/__init__.py
index ec4dead42e..463557e3b3 100644
--- a/esphome/components/number/__init__.py
+++ b/esphome/components/number/__init__.py
@@ -41,6 +41,7 @@ from esphome.const import (
     DEVICE_CLASS_PM25,
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_POWER_FACTOR,
+    DEVICE_CLASS_PRECIPITATION,
     DEVICE_CLASS_PRECIPITATION_INTENSITY,
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_REACTIVE_POWER,
@@ -84,6 +85,7 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_PM25,
     DEVICE_CLASS_POWER_FACTOR,
     DEVICE_CLASS_POWER,
+    DEVICE_CLASS_PRECIPITATION,
     DEVICE_CLASS_PRECIPITATION_INTENSITY,
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_REACTIVE_POWER,
diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index 2859dc6e5a..7842cef4de 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -55,6 +55,7 @@ from esphome.const import (
     DEVICE_CLASS_PM25,
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_POWER_FACTOR,
+    DEVICE_CLASS_PRECIPITATION,
     DEVICE_CLASS_PRECIPITATION_INTENSITY,
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_REACTIVE_POWER,
@@ -103,6 +104,7 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_PM25,
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_POWER_FACTOR,
+    DEVICE_CLASS_PRECIPITATION,
     DEVICE_CLASS_PRECIPITATION_INTENSITY,
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_REACTIVE_POWER,
@@ -115,8 +117,8 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_VOLUME,
     DEVICE_CLASS_WATER,
-    DEVICE_CLASS_WIND_SPEED,
     DEVICE_CLASS_WEIGHT,
+    DEVICE_CLASS_WIND_SPEED,
 ]
 
 sensor_ns = cg.esphome_ns.namespace("sensor")
diff --git a/esphome/const.py b/esphome/const.py
index f0b0c089bf..0e8de3f4ff 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -954,6 +954,7 @@ DEVICE_CLASS_PM1 = "pm1"
 DEVICE_CLASS_PM10 = "pm10"
 DEVICE_CLASS_PM25 = "pm25"
 DEVICE_CLASS_POWER_FACTOR = "power_factor"
+DEVICE_CLASS_PRECIPITATION = "precipitation"
 DEVICE_CLASS_PRECIPITATION_INTENSITY = "precipitation_intensity"
 DEVICE_CLASS_PRESSURE = "pressure"
 DEVICE_CLASS_REACTIVE_POWER = "reactive_power"

From 917488bbc3b4e89f415f30abdb6299b1cffe4837 Mon Sep 17 00:00:00 2001
From: Cossid <83468485+Cossid@users.noreply.github.com>
Date: Thu, 22 Dec 2022 15:24:46 -0600
Subject: [PATCH 419/838] Add support for BP5758D LED driver (#4021)

---
 CODEOWNERS                             |   1 +
 esphome/components/bp5758d/__init__.py |  33 ++++++
 esphome/components/bp5758d/bp5758d.cpp | 147 +++++++++++++++++++++++++
 esphome/components/bp5758d/bp5758d.h   |  64 +++++++++++
 esphome/components/bp5758d/output.py   |  29 +++++
 tests/test1.yaml                       |  24 ++++
 6 files changed, 298 insertions(+)
 create mode 100644 esphome/components/bp5758d/__init__.py
 create mode 100644 esphome/components/bp5758d/bp5758d.cpp
 create mode 100644 esphome/components/bp5758d/bp5758d.h
 create mode 100644 esphome/components/bp5758d/output.py

diff --git a/CODEOWNERS b/CODEOWNERS
index 3fa7fd169a..87e1951044 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -41,6 +41,7 @@ esphome/components/ble_client/* @buxtronix
 esphome/components/bluetooth_proxy/* @jesserockz
 esphome/components/bme680_bsec/* @trvrnrth
 esphome/components/bmp3xx/* @martgras
+esphome/components/bp5758d/* @Cossid
 esphome/components/button/* @esphome/core
 esphome/components/canbus/* @danielschramm @mvturnho
 esphome/components/cap1188/* @MrEditor97
diff --git a/esphome/components/bp5758d/__init__.py b/esphome/components/bp5758d/__init__.py
new file mode 100644
index 0000000000..eeeab2a1bd
--- /dev/null
+++ b/esphome/components/bp5758d/__init__.py
@@ -0,0 +1,33 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.const import (
+    CONF_CLOCK_PIN,
+    CONF_DATA_PIN,
+    CONF_ID,
+)
+
+CODEOWNERS = ["@Cossid"]
+MULTI_CONF = True
+
+AUTO_LOAD = ["output"]
+bp5758d_ns = cg.esphome_ns.namespace("bp5758d")
+BP5758D = bp5758d_ns.class_("BP5758D", cg.Component)
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(BP5758D),
+        cv.Required(CONF_DATA_PIN): pins.gpio_output_pin_schema,
+        cv.Required(CONF_CLOCK_PIN): pins.gpio_output_pin_schema,
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+
+    data = await cg.gpio_pin_expression(config[CONF_DATA_PIN])
+    cg.add(var.set_data_pin(data))
+    clock = await cg.gpio_pin_expression(config[CONF_CLOCK_PIN])
+    cg.add(var.set_clock_pin(clock))
diff --git a/esphome/components/bp5758d/bp5758d.cpp b/esphome/components/bp5758d/bp5758d.cpp
new file mode 100644
index 0000000000..111fd6b68e
--- /dev/null
+++ b/esphome/components/bp5758d/bp5758d.cpp
@@ -0,0 +1,147 @@
+#include "bp5758d.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace bp5758d {
+
+static const char *const TAG = "bp5758d";
+
+static const uint8_t BP5758D_MODEL_ID = 0b10000000;
+static const uint8_t BP5758D_ADDR_STANDBY = 0b00000000;
+// Note, channel start address seems ambiguous and mis-translated.
+// Documentation states all are "invalid sleep"
+// All 3 values appear to activate all 5 channels.  Using the mapping
+// from BP1658CJ ordering since it won't break anything.
+static const uint8_t BP5758D_ADDR_START_3CH = 0b00010000;
+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;
+
+void BP5758D::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up BP5758D Output Component...");
+  this->data_pin_->setup();
+  this->data_pin_->digital_write(false);
+  this->clock_pin_->setup();
+  this->clock_pin_->digital_write(false);
+  this->channel_current_.resize(5, 0);
+  this->pwm_amounts_.resize(5, 0);
+}
+void BP5758D::dump_config() {
+  ESP_LOGCONFIG(TAG, "BP5758D:");
+  LOG_PIN("  Data Pin: ", this->data_pin_);
+  LOG_PIN("  Clock Pin: ", this->clock_pin_);
+}
+
+void BP5758D::loop() {
+  if (!this->update_)
+    return;
+
+  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) {
+    // Off / Sleep
+    data[0] = BP5758D_MODEL_ID + BP5758D_ADDR_STANDBY;
+    for (int i = 1; i < 16; i++)
+      data[i] = 0;
+    this->write_buffer_(data, 17);
+  } 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)) {
+    // Only data on white channels
+    data[0] = BP5758D_MODEL_ID + BP5758D_ADDR_START_2CH;
+    data[1] = BP5758D_ALL_DATA_CHANNEL_ENABLEMENT;
+    data[2] = 0;
+    data[3] = 0;
+    data[4] = 0;
+    data[5] = this->pwm_amounts_[3] > 0 ? correct_current_level_bits_(this->channel_current_[3]) : 0;
+    data[6] = this->pwm_amounts_[4] > 0 ? correct_current_level_bits_(this->channel_current_[4]) : 0;
+    for (int i = 7, j = 0; i <= 15; i += 2, j++) {
+      data[i] = this->pwm_amounts_[j] & 0x1F;
+      data[i + 1] = (this->pwm_amounts_[j] >> 5) & 0x1F;
+    }
+    this->write_buffer_(data, 17);
+  } 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) {
+    // Only data on RGB channels
+    data[0] = BP5758D_MODEL_ID + BP5758D_ADDR_START_3CH;
+    data[1] = BP5758D_ALL_DATA_CHANNEL_ENABLEMENT;
+    data[2] = this->pwm_amounts_[0] > 0 ? correct_current_level_bits_(this->channel_current_[0]) : 0;
+    data[3] = this->pwm_amounts_[1] > 0 ? correct_current_level_bits_(this->channel_current_[1]) : 0;
+    data[4] = this->pwm_amounts_[2] > 0 ? correct_current_level_bits_(this->channel_current_[2]) : 0;
+    data[5] = 0;
+    data[6] = 0;
+    for (int i = 7, j = 0; i <= 15; i += 2, j++) {
+      data[i] = this->pwm_amounts_[j] & 0x1F;
+      data[i + 1] = (this->pwm_amounts_[j] >> 5) & 0x1F;
+    }
+    this->write_buffer_(data, 17);
+  } else {
+    // All channels
+    data[0] = BP5758D_MODEL_ID + BP5758D_ADDR_START_5CH;
+    data[1] = BP5758D_ALL_DATA_CHANNEL_ENABLEMENT;
+    data[2] = this->pwm_amounts_[0] > 0 ? correct_current_level_bits_(this->channel_current_[0]) : 0;
+    data[3] = this->pwm_amounts_[1] > 0 ? correct_current_level_bits_(this->channel_current_[1]) : 0;
+    data[4] = this->pwm_amounts_[2] > 0 ? correct_current_level_bits_(this->channel_current_[2]) : 0;
+    data[5] = this->pwm_amounts_[3] > 0 ? correct_current_level_bits_(this->channel_current_[3]) : 0;
+    data[6] = this->pwm_amounts_[4] > 0 ? correct_current_level_bits_(this->channel_current_[4]) : 0;
+    for (int i = 7, j = 0; i <= 15; i += 2, j++) {
+      data[i] = this->pwm_amounts_[j] & 0x1F;
+      data[i + 1] = (this->pwm_amounts_[j] >> 5) & 0x1F;
+    }
+    this->write_buffer_(data, 17);
+  }
+
+  this->update_ = false;
+}
+
+uint8_t BP5758D::correct_current_level_bits_(uint8_t current) {
+  // Anything below 64 uses normal bitmapping.
+  if (current < 64) {
+    return current;
+  }
+
+  // Anything above 63 needs to be offset by +34 because the driver remaps bit 7 (normally 64) to 30.
+  // (no idea why(!) but it is documented)
+  // Example:
+  // integer 64 would normally put out 0b01000000 but here 0b01000000 = 30 whereas everything lower
+  // is normal, so we add 34 to the integer where
+  // integer 98 = 0b01100010 which is 30 (7th bit adjusted) + 34 (1st-6th bits).
+  return current + 34;
+}
+
+void BP5758D::set_channel_value_(uint8_t channel, uint16_t value) {
+  if (this->pwm_amounts_[channel] != value) {
+    this->update_ = true;
+    this->update_channel_ = channel;
+  }
+  this->pwm_amounts_[channel] = 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);
+  this->clock_pin_->digital_write(true);
+}
+
+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);
+  this->clock_pin_->digital_write(true);
+}
+
+void BP5758D::write_buffer_(uint8_t *buffer, uint8_t size) {
+  this->data_pin_->digital_write(false);
+  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);
+  this->data_pin_->digital_write(true);
+}
+
+}  // namespace bp5758d
+}  // namespace esphome
diff --git a/esphome/components/bp5758d/bp5758d.h b/esphome/components/bp5758d/bp5758d.h
new file mode 100644
index 0000000000..cc7cc3d5f8
--- /dev/null
+++ b/esphome/components/bp5758d/bp5758d.h
@@ -0,0 +1,64 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/components/output/float_output.h"
+#include <vector>
+
+namespace esphome {
+namespace bp5758d {
+
+class BP5758D : public Component {
+ public:
+  class Channel;
+
+  void set_data_pin(GPIOPin *data_pin) { data_pin_ = data_pin; }
+  void set_clock_pin(GPIOPin *clock_pin) { clock_pin_ = clock_pin; }
+
+  void setup() override;
+
+  void dump_config() override;
+
+  float get_setup_priority() const override { return setup_priority::HARDWARE; }
+
+  /// Send new values if they were updated.
+  void loop() override;
+
+  class Channel : public output::FloatOutput {
+   public:
+    void set_parent(BP5758D *parent) { parent_ = parent; }
+    void set_channel(uint8_t channel) { channel_ = channel; }
+    void set_current(uint8_t current) { current_ = current; }
+
+   protected:
+    void write_state(float state) override {
+      auto amount = static_cast<uint16_t>(state * 0x3FF);
+      // We're enforcing channels start at 1 to mach OUT1-OUT5, we must adjust
+      // to our 0-based array internally here by subtracting 1.
+      this->parent_->set_channel_value_(this->channel_ - 1, amount);
+      this->parent_->set_channel_current_(this->channel_ - 1, this->current_);
+    }
+
+    BP5758D *parent_;
+    uint8_t channel_;
+    uint8_t current_;
+  };
+
+ protected:
+  uint8_t correct_current_level_bits_(uint8_t current);
+  void set_channel_value_(uint8_t channel, uint16_t value);
+  void set_channel_current_(uint8_t channel, uint8_t current);
+  void write_bit_(bool value);
+  void write_byte_(uint8_t data);
+  void write_buffer_(uint8_t *buffer, uint8_t size);
+
+  GPIOPin *data_pin_;
+  GPIOPin *clock_pin_;
+  uint8_t update_channel_;
+  std::vector<uint8_t> channel_current_;
+  std::vector<uint16_t> pwm_amounts_;
+  bool update_{true};
+};
+
+}  // namespace bp5758d
+}  // namespace esphome
diff --git a/esphome/components/bp5758d/output.py b/esphome/components/bp5758d/output.py
new file mode 100644
index 0000000000..d0083fb33f
--- /dev/null
+++ b/esphome/components/bp5758d/output.py
@@ -0,0 +1,29 @@
+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_CURRENT
+from . import BP5758D
+
+DEPENDENCIES = ["bp5758d"]
+
+Channel = BP5758D.class_("Channel", output.FloatOutput)
+
+CONF_BP5758D_ID = "bp5758d_id"
+CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
+    {
+        cv.GenerateID(CONF_BP5758D_ID): cv.use_id(BP5758D),
+        cv.Required(CONF_ID): cv.declare_id(Channel),
+        cv.Required(CONF_CHANNEL): cv.int_range(min=1, max=5),
+        cv.Optional(CONF_CURRENT, default=10): cv.int_range(min=0, max=90),
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await output.register_output(var, config)
+
+    parent = await cg.get_variable(config[CONF_BP5758D_ID])
+    cg.add(var.set_parent(parent))
+    cg.add(var.set_channel(config[CONF_CHANNEL]))
+    cg.add(var.set_current(config[CONF_CURRENT]))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index b8951c9817..7453946594 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1465,6 +1465,10 @@ my9231:
   num_chips: 2
   bit_depth: 16
 
+bp5758d:
+  data_pin: GPIO3
+  clock_pin: GPIO5
+
 output:
   - platform: gpio
     pin: GPIO26
@@ -1626,6 +1630,26 @@ output:
     vref: internal
     gain: X2
     power_down: gnd_500k
+  - platform: bp5758d
+    id: bp5758d_red
+    channel: 2
+    current: 10
+  - platform: bp5758d
+    id: bp5758d_green
+    channel: 3
+    current: 10
+  - platform: bp5758d
+    id: bp5758d_blue
+    channel: 1
+    current: 10
+  - platform: bp5758d
+    id: bp5758d_coldwhite
+    channel: 5
+    current: 10
+  - platform: bp5758d
+    id: bp5758d_warmwhite
+    channel: 4
+    current: 10
 
 e131:
 

From a18ab748fd4936b9472b2f59f8c760b49e05fb87 Mon Sep 17 00:00:00 2001
From: Cossid <83468485+Cossid@users.noreply.github.com>
Date: Thu, 22 Dec 2022 15:39:44 -0600
Subject: [PATCH 420/838] Add support for BP1658CJ LED driver (#4020)

---
 CODEOWNERS                               |   1 +
 esphome/components/bp1658cj/__init__.py  |  44 +++++++++
 esphome/components/bp1658cj/bp1658cj.cpp | 110 +++++++++++++++++++++++
 esphome/components/bp1658cj/bp1658cj.h   |  64 +++++++++++++
 esphome/components/bp1658cj/output.py    |  27 ++++++
 tests/test1.yaml                         |  21 +++++
 6 files changed, 267 insertions(+)
 create mode 100644 esphome/components/bp1658cj/__init__.py
 create mode 100644 esphome/components/bp1658cj/bp1658cj.cpp
 create mode 100644 esphome/components/bp1658cj/bp1658cj.h
 create mode 100644 esphome/components/bp1658cj/output.py

diff --git a/CODEOWNERS b/CODEOWNERS
index 87e1951044..6f17bdaf68 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -41,6 +41,7 @@ esphome/components/ble_client/* @buxtronix
 esphome/components/bluetooth_proxy/* @jesserockz
 esphome/components/bme680_bsec/* @trvrnrth
 esphome/components/bmp3xx/* @martgras
+esphome/components/bp1658cj/* @Cossid
 esphome/components/bp5758d/* @Cossid
 esphome/components/button/* @esphome/core
 esphome/components/canbus/* @danielschramm @mvturnho
diff --git a/esphome/components/bp1658cj/__init__.py b/esphome/components/bp1658cj/__init__.py
new file mode 100644
index 0000000000..8388b16df9
--- /dev/null
+++ b/esphome/components/bp1658cj/__init__.py
@@ -0,0 +1,44 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.const import (
+    CONF_CLOCK_PIN,
+    CONF_DATA_PIN,
+    CONF_ID,
+)
+
+CODEOWNERS = ["@Cossid"]
+MULTI_CONF = True
+
+CONF_MAX_POWER_COLOR_CHANNELS = "max_power_color_channels"
+CONF_MAX_POWER_WHITE_CHANNELS = "max_power_white_channels"
+
+AUTO_LOAD = ["output"]
+bp1658cj_ns = cg.esphome_ns.namespace("bp1658cj")
+BP1658CJ = bp1658cj_ns.class_("BP1658CJ", cg.Component)
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(BP1658CJ),
+        cv.Required(CONF_DATA_PIN): pins.gpio_output_pin_schema,
+        cv.Required(CONF_CLOCK_PIN): pins.gpio_output_pin_schema,
+        cv.Optional(CONF_MAX_POWER_COLOR_CHANNELS, default=2): cv.int_range(
+            min=0, max=15
+        ),
+        cv.Optional(CONF_MAX_POWER_WHITE_CHANNELS, default=4): cv.int_range(
+            min=0, max=15
+        ),
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+
+    data = await cg.gpio_pin_expression(config[CONF_DATA_PIN])
+    cg.add(var.set_data_pin(data))
+    clock = await cg.gpio_pin_expression(config[CONF_CLOCK_PIN])
+    cg.add(var.set_clock_pin(clock))
+    cg.add(var.set_max_power_color_channels(config[CONF_MAX_POWER_COLOR_CHANNELS]))
+    cg.add(var.set_max_power_white_channels(config[CONF_MAX_POWER_WHITE_CHANNELS]))
diff --git a/esphome/components/bp1658cj/bp1658cj.cpp b/esphome/components/bp1658cj/bp1658cj.cpp
new file mode 100644
index 0000000000..5b9e4a5a2c
--- /dev/null
+++ b/esphome/components/bp1658cj/bp1658cj.cpp
@@ -0,0 +1,110 @@
+#include "bp1658cj.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace bp1658cj {
+
+static const char *const TAG = "bp1658cj";
+
+static const uint8_t BP1658CJ_MODEL_ID = 0x80;
+static const uint8_t BP1658CJ_ADDR_STANDBY = 0x0;
+static const uint8_t BP1658CJ_ADDR_START_3CH = 0x10;
+static const uint8_t BP1658CJ_ADDR_START_2CH = 0x20;
+static const uint8_t BP1658CJ_ADDR_START_5CH = 0x30;
+
+void BP1658CJ::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up BP1658CJ Output Component...");
+  this->data_pin_->setup();
+  this->data_pin_->digital_write(false);
+  this->clock_pin_->setup();
+  this->clock_pin_->digital_write(false);
+  this->pwm_amounts_.resize(5, 0);
+}
+void BP1658CJ::dump_config() {
+  ESP_LOGCONFIG(TAG, "BP1658CJ:");
+  LOG_PIN("  Data Pin: ", this->data_pin_);
+  LOG_PIN("  Clock Pin: ", this->clock_pin_);
+  ESP_LOGCONFIG(TAG, "  Color Channels Max Power: %u", this->max_power_color_channels_);
+  ESP_LOGCONFIG(TAG, "  White Channels Max Power: %u", this->max_power_white_channels_);
+}
+
+void BP1658CJ::loop() {
+  if (!this->update_)
+    return;
+
+  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;
+    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)) {
+    // Only data on white channels
+    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_START_2CH;
+    data[1] = 0 << 4 | this->max_power_white_channels_;
+    for (int i = 2, j = 0; i < 12; i += 2, j++) {
+      data[i] = this->pwm_amounts_[j] & 0x1F;
+      data[i + 1] = (this->pwm_amounts_[j] >> 5) & 0x1F;
+    }
+    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) {
+    // Only data on RGB channels
+    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_START_3CH;
+    data[1] = this->max_power_color_channels_ << 4 | 0;
+    for (int i = 2, j = 0; i < 12; i += 2, j++) {
+      data[i] = this->pwm_amounts_[j] & 0x1F;
+      data[i + 1] = (this->pwm_amounts_[j] >> 5) & 0x1F;
+    }
+    this->write_buffer_(data, 12);
+  } else {
+    // All channels
+    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_START_5CH;
+    data[1] = this->max_power_color_channels_ << 4 | this->max_power_white_channels_;
+    for (int i = 2, j = 0; i < 12; i += 2, j++) {
+      data[i] = this->pwm_amounts_[j] & 0x1F;
+      data[i + 1] = (this->pwm_amounts_[j] >> 5) & 0x1F;
+    }
+    this->write_buffer_(data, 12);
+  }
+
+  this->update_ = false;
+}
+
+void BP1658CJ::set_channel_value_(uint8_t channel, uint16_t value) {
+  if (this->pwm_amounts_[channel] != value) {
+    this->update_ = true;
+    this->update_channel_ = channel;
+  }
+  this->pwm_amounts_[channel] = value;
+}
+void BP1658CJ::write_bit_(bool value) {
+  this->clock_pin_->digital_write(false);
+  this->data_pin_->digital_write(value);
+  this->clock_pin_->digital_write(true);
+}
+
+void BP1658CJ::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);
+  this->clock_pin_->digital_write(true);
+}
+
+void BP1658CJ::write_buffer_(uint8_t *buffer, uint8_t size) {
+  this->data_pin_->digital_write(false);
+  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);
+  this->data_pin_->digital_write(true);
+}
+
+}  // namespace bp1658cj
+}  // namespace esphome
diff --git a/esphome/components/bp1658cj/bp1658cj.h b/esphome/components/bp1658cj/bp1658cj.h
new file mode 100644
index 0000000000..778f49b3e9
--- /dev/null
+++ b/esphome/components/bp1658cj/bp1658cj.h
@@ -0,0 +1,64 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/components/output/float_output.h"
+#include <vector>
+
+namespace esphome {
+namespace bp1658cj {
+
+class BP1658CJ : public Component {
+ public:
+  class Channel;
+
+  void set_data_pin(GPIOPin *data_pin) { data_pin_ = data_pin; }
+  void set_clock_pin(GPIOPin *clock_pin) { clock_pin_ = clock_pin; }
+  void set_max_power_color_channels(uint8_t max_power_color_channels) {
+    max_power_color_channels_ = max_power_color_channels;
+  }
+  void set_max_power_white_channels(uint8_t max_power_white_channels) {
+    max_power_white_channels_ = max_power_white_channels;
+  }
+
+  void setup() override;
+
+  void dump_config() override;
+
+  float get_setup_priority() const override { return setup_priority::HARDWARE; }
+
+  /// Send new values if they were updated.
+  void loop() override;
+
+  class Channel : public output::FloatOutput {
+   public:
+    void set_parent(BP1658CJ *parent) { parent_ = parent; }
+    void set_channel(uint8_t channel) { channel_ = channel; }
+
+   protected:
+    void write_state(float state) override {
+      auto amount = static_cast<uint16_t>(state * 0x3FF);
+      this->parent_->set_channel_value_(this->channel_, amount);
+    }
+
+    BP1658CJ *parent_;
+    uint8_t channel_;
+  };
+
+ protected:
+  void set_channel_value_(uint8_t channel, uint16_t value);
+  void write_bit_(bool value);
+  void write_byte_(uint8_t data);
+  void write_buffer_(uint8_t *buffer, uint8_t size);
+
+  GPIOPin *data_pin_;
+  GPIOPin *clock_pin_;
+  uint8_t max_power_color_channels_{4};
+  uint8_t max_power_white_channels_{6};
+  uint8_t update_channel_;
+  std::vector<uint16_t> pwm_amounts_;
+  bool update_{true};
+};
+
+}  // namespace bp1658cj
+}  // namespace esphome
diff --git a/esphome/components/bp1658cj/output.py b/esphome/components/bp1658cj/output.py
new file mode 100644
index 0000000000..3b89518621
--- /dev/null
+++ b/esphome/components/bp1658cj/output.py
@@ -0,0 +1,27 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import output
+from esphome.const import CONF_CHANNEL, CONF_ID
+from . import BP1658CJ
+
+DEPENDENCIES = ["bp1658cj"]
+
+Channel = BP1658CJ.class_("Channel", output.FloatOutput)
+
+CONF_BP1658CJ_ID = "bp1658cj_id"
+CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
+    {
+        cv.GenerateID(CONF_BP1658CJ_ID): cv.use_id(BP1658CJ),
+        cv.Required(CONF_ID): cv.declare_id(Channel),
+        cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=65535),
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await output.register_output(var, config)
+
+    parent = await cg.get_variable(config[CONF_BP1658CJ_ID])
+    cg.add(var.set_parent(parent))
+    cg.add(var.set_channel(config[CONF_CHANNEL]))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 7453946594..51b34d9785 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1465,6 +1465,12 @@ my9231:
   num_chips: 2
   bit_depth: 16
 
+bp1658cj:
+  data_pin: GPIO3
+  clock_pin: GPIO5
+  max_power_color_channels: 4
+  max_power_white_channels: 6
+
 bp5758d:
   data_pin: GPIO3
   clock_pin: GPIO5
@@ -1630,6 +1636,21 @@ output:
     vref: internal
     gain: X2
     power_down: gnd_500k
+  - platform: bp1658cj
+    id: bp1658cj_red
+    channel: 1
+  - platform: bp1658cj
+    id: bp1658cj_green
+    channel: 2
+  - platform: bp1658cj
+    id: bp1658cj_blue
+    channel: 0
+  - platform: bp1658cj
+    id: bp1658cj_coldwhite
+    channel: 3
+  - platform: bp1658cj
+    id: bp1658cj_warmwhite
+    channel: 4
   - platform: bp5758d
     id: bp5758d_red
     channel: 2

From 53b60ac817755f2a8fb3631e92f7e2dfe388ca58 Mon Sep 17 00:00:00 2001
From: Cossid <83468485+Cossid@users.noreply.github.com>
Date: Thu, 22 Dec 2022 16:04:21 -0600
Subject: [PATCH 421/838] Add support for SM2235 and SM2335 LED drivers (#3924)

---
 CODEOWNERS                                    |   3 +
 esphome/components/sm10bit_base/__init__.py   |  44 +++++++
 .../components/sm10bit_base/sm10bit_base.cpp  | 112 ++++++++++++++++++
 .../components/sm10bit_base/sm10bit_base.h    |  63 ++++++++++
 esphome/components/sm2235/__init__.py         |  22 ++++
 esphome/components/sm2235/output.py           |  28 +++++
 esphome/components/sm2235/sm2235.cpp          |  27 +++++
 esphome/components/sm2235/sm2235.h            |  19 +++
 esphome/components/sm2335/__init__.py         |  22 ++++
 esphome/components/sm2335/output.py           |  28 +++++
 esphome/components/sm2335/sm2335.cpp          |  27 +++++
 esphome/components/sm2335/sm2335.h            |  19 +++
 tests/test1.yaml                              |  42 +++++++
 13 files changed, 456 insertions(+)
 create mode 100644 esphome/components/sm10bit_base/__init__.py
 create mode 100644 esphome/components/sm10bit_base/sm10bit_base.cpp
 create mode 100644 esphome/components/sm10bit_base/sm10bit_base.h
 create mode 100644 esphome/components/sm2235/__init__.py
 create mode 100644 esphome/components/sm2235/output.py
 create mode 100644 esphome/components/sm2235/sm2235.cpp
 create mode 100644 esphome/components/sm2235/sm2235.h
 create mode 100644 esphome/components/sm2335/__init__.py
 create mode 100644 esphome/components/sm2335/output.py
 create mode 100644 esphome/components/sm2335/sm2335.cpp
 create mode 100644 esphome/components/sm2335/sm2335.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 6f17bdaf68..a0c62ffe24 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -208,7 +208,10 @@ esphome/components/shelly_dimmer/* @edge90 @rnauber
 esphome/components/sht4x/* @sjtrny
 esphome/components/shutdown/* @esphome/core @jsuanet
 esphome/components/sim800l/* @glmnet
+esphome/components/sm10bit_base/* @Cossid
 esphome/components/sm2135/* @BoukeHaarsma23
+esphome/components/sm2235/* @Cossid
+esphome/components/sm2335/* @Cossid
 esphome/components/sml/* @alengwenus
 esphome/components/smt100/* @piechade
 esphome/components/sn74hc165/* @jesserockz
diff --git a/esphome/components/sm10bit_base/__init__.py b/esphome/components/sm10bit_base/__init__.py
new file mode 100644
index 0000000000..8722bd35a9
--- /dev/null
+++ b/esphome/components/sm10bit_base/__init__.py
@@ -0,0 +1,44 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.const import (
+    CONF_CLOCK_PIN,
+    CONF_DATA_PIN,
+    CONF_ID,
+)
+
+CODEOWNERS = ["@Cossid"]
+MULTI_CONF = True
+
+CONF_MAX_POWER_COLOR_CHANNELS = "max_power_color_channels"
+CONF_MAX_POWER_WHITE_CHANNELS = "max_power_white_channels"
+
+sm10bit_base_ns = cg.esphome_ns.namespace("sm10bit_base")
+Sm10BitBase = sm10bit_base_ns.class_("Sm10BitBase", cg.Component)
+
+SM10BIT_BASE_CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_DATA_PIN): pins.gpio_output_pin_schema,
+        cv.Required(CONF_CLOCK_PIN): pins.gpio_output_pin_schema,
+        cv.Optional(CONF_MAX_POWER_COLOR_CHANNELS, default=2): cv.int_range(
+            min=0, max=15
+        ),
+        cv.Optional(CONF_MAX_POWER_WHITE_CHANNELS, default=4): cv.int_range(
+            min=0, max=15
+        ),
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+async def register_sm10bit_base(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+
+    data = await cg.gpio_pin_expression(config[CONF_DATA_PIN])
+    cg.add(var.set_data_pin(data))
+    clock = await cg.gpio_pin_expression(config[CONF_CLOCK_PIN])
+    cg.add(var.set_clock_pin(clock))
+    cg.add(var.set_max_power_color_channels(config[CONF_MAX_POWER_COLOR_CHANNELS]))
+    cg.add(var.set_max_power_white_channels(config[CONF_MAX_POWER_WHITE_CHANNELS]))
+
+    return var
diff --git a/esphome/components/sm10bit_base/sm10bit_base.cpp b/esphome/components/sm10bit_base/sm10bit_base.cpp
new file mode 100644
index 0000000000..9c7abb48e2
--- /dev/null
+++ b/esphome/components/sm10bit_base/sm10bit_base.cpp
@@ -0,0 +1,112 @@
+#include "sm10bit_base.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace sm10bit_base {
+
+static const char *const TAG = "sm10bit_base";
+
+static const uint8_t SM10BIT_ADDR_STANDBY = 0x0;
+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;
+
+// Power current values
+// HEX | Binary | RGB level | White level | Config value
+// 0x0 | 0000   | RGB 10mA  | CW 5mA      | 0
+// 0x1 | 0001   | RGB 20mA  | CW 10mA     | 1
+// 0x2 | 0010   | RGB 30mA  | CW 15mA     | 2 - Default spec color value
+// 0x3 | 0011   | RGB 40mA  | CW 20mA     | 3
+// 0x4 | 0100   | RGB 50mA  | CW 25mA     | 4 - Default spec white value
+// 0x5 | 0101   | RGB 60mA  | CW 30mA     | 5
+// 0x6 | 0110   | RGB 70mA  | CW 35mA     | 6
+// 0x7 | 0111   | RGB 80mA  | CW 40mA     | 7
+// 0x8 | 1000   | RGB 90mA  | CW 45mA     | 8
+// 0x9 | 1001   | RGB 100mA | CW 50mA     | 9
+// 0xA | 1010   | RGB 110mA | CW 55mA     | 10
+// 0xB | 1011   | RGB 120mA | CW 60mA     | 11
+// 0xC | 1100   | RGB 130mA | CW 65mA     | 12
+// 0xD | 1101   | RGB 140mA | CW 70mA     | 13
+// 0xE | 1110   | RGB 150mA | CW 75mA     | 14
+// 0xF | 1111   | RGB 160mA | CW 80mA     | 15
+
+void Sm10BitBase::loop() {
+  if (!this->update_)
+    return;
+
+  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;
+    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)) {
+    // Only data on white channels
+    data[0] = this->model_id_ + SM10BIT_ADDR_START_2CH;
+    data[1] = 0 << 4 | this->max_power_white_channels_;
+    for (int i = 2, j = 0; i < 12; i += 2, j++) {
+      data[i] = this->pwm_amounts_[j] >> 0x8;
+      data[i + 1] = this->pwm_amounts_[j] & 0xFF;
+    }
+    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) {
+    // Only data on RGB channels
+    data[0] = this->model_id_ + SM10BIT_ADDR_START_3CH;
+    data[1] = this->max_power_color_channels_ << 4 | 0;
+    for (int i = 2, j = 0; i < 12; i += 2, j++) {
+      data[i] = this->pwm_amounts_[j] >> 0x8;
+      data[i + 1] = this->pwm_amounts_[j] & 0xFF;
+    }
+    this->write_buffer_(data, 12);
+  } else {
+    // All channels
+    data[0] = this->model_id_ + SM10BIT_ADDR_START_5CH;
+    data[1] = this->max_power_color_channels_ << 4 | this->max_power_white_channels_;
+    for (int i = 2, j = 0; i < 12; i += 2, j++) {
+      data[i] = this->pwm_amounts_[j] >> 0x8;
+      data[i + 1] = this->pwm_amounts_[j] & 0xFF;
+    }
+    this->write_buffer_(data, 12);
+  }
+
+  this->update_ = false;
+}
+
+void Sm10BitBase::set_channel_value_(uint8_t channel, uint16_t value) {
+  if (this->pwm_amounts_[channel] != value) {
+    this->update_ = true;
+    this->update_channel_ = channel;
+  }
+  this->pwm_amounts_[channel] = value;
+}
+void Sm10BitBase::write_bit_(bool value) {
+  this->clock_pin_->digital_write(false);
+  this->data_pin_->digital_write(value);
+  this->clock_pin_->digital_write(true);
+}
+
+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);
+  this->clock_pin_->digital_write(true);
+}
+
+void Sm10BitBase::write_buffer_(uint8_t *buffer, uint8_t size) {
+  this->data_pin_->digital_write(false);
+  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);
+  this->data_pin_->digital_write(true);
+}
+
+}  // namespace sm10bit_base
+}  // namespace esphome
diff --git a/esphome/components/sm10bit_base/sm10bit_base.h b/esphome/components/sm10bit_base/sm10bit_base.h
new file mode 100644
index 0000000000..c8e92e352f
--- /dev/null
+++ b/esphome/components/sm10bit_base/sm10bit_base.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/components/output/float_output.h"
+#include <vector>
+
+namespace esphome {
+namespace sm10bit_base {
+
+class Sm10BitBase : public Component {
+ public:
+  class Channel;
+
+  void set_model(uint8_t model_id) { model_id_ = model_id; }
+  void set_data_pin(GPIOPin *data_pin) { data_pin_ = data_pin; }
+  void set_clock_pin(GPIOPin *clock_pin) { clock_pin_ = clock_pin; }
+  void set_max_power_color_channels(uint8_t max_power_color_channels) {
+    max_power_color_channels_ = max_power_color_channels;
+  }
+  void set_max_power_white_channels(uint8_t max_power_white_channels) {
+    max_power_white_channels_ = max_power_white_channels;
+  }
+
+  float get_setup_priority() const override { return setup_priority::HARDWARE; }
+
+  void setup() override;
+  void dump_config() override;
+  void loop() override;
+
+  class Channel : public output::FloatOutput {
+   public:
+    void set_parent(Sm10BitBase *parent) { parent_ = parent; }
+    void set_channel(uint8_t channel) { channel_ = channel; }
+
+   protected:
+    void write_state(float state) override {
+      auto amount = static_cast<uint16_t>(state * 0x3FF);
+      this->parent_->set_channel_value_(this->channel_, amount);
+    }
+
+    Sm10BitBase *parent_;
+    uint8_t channel_;
+  };
+
+ protected:
+  void set_channel_value_(uint8_t channel, uint16_t value);
+  void write_bit_(bool value);
+  void write_byte_(uint8_t data);
+  void write_buffer_(uint8_t *buffer, uint8_t size);
+
+  GPIOPin *data_pin_;
+  GPIOPin *clock_pin_;
+  uint8_t model_id_;
+  uint8_t max_power_color_channels_{2};
+  uint8_t max_power_white_channels_{4};
+  uint8_t update_channel_;
+  std::vector<uint16_t> pwm_amounts_;
+  bool update_{true};
+};
+
+}  // namespace sm10bit_base
+}  // namespace esphome
diff --git a/esphome/components/sm2235/__init__.py b/esphome/components/sm2235/__init__.py
new file mode 100644
index 0000000000..ae6cb336ad
--- /dev/null
+++ b/esphome/components/sm2235/__init__.py
@@ -0,0 +1,22 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sm10bit_base
+
+AUTO_LOAD = ["sm10bit_base", "output"]
+CODEOWNERS = ["@Cossid"]
+MULTI_CONF = True
+
+sm2235_ns = cg.esphome_ns.namespace("sm2235")
+
+SM2235 = sm2235_ns.class_("SM2235", sm10bit_base.Sm10BitBase)
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(SM2235),
+    }
+).extend(sm10bit_base.SM10BIT_BASE_CONFIG_SCHEMA)
+
+
+async def to_code(config):
+    var = await sm10bit_base.register_sm10bit_base(config)
+    cg.add(var.set_model(0xC0))
diff --git a/esphome/components/sm2235/output.py b/esphome/components/sm2235/output.py
new file mode 100644
index 0000000000..c4f63b451a
--- /dev/null
+++ b/esphome/components/sm2235/output.py
@@ -0,0 +1,28 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import output
+from esphome.const import CONF_CHANNEL, CONF_ID
+from . import SM2235
+
+DEPENDENCIES = ["sm2235"]
+CODEOWNERS = ["@Cossid"]
+
+Channel = SM2235.class_("Channel", output.FloatOutput)
+
+CONF_SM2235_ID = "sm2235_id"
+CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
+    {
+        cv.GenerateID(CONF_SM2235_ID): cv.use_id(SM2235),
+        cv.Required(CONF_ID): cv.declare_id(Channel),
+        cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=65535),
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await output.register_output(var, config)
+
+    parent = await cg.get_variable(config[CONF_SM2235_ID])
+    cg.add(var.set_parent(parent))
+    cg.add(var.set_channel(config[CONF_CHANNEL]))
diff --git a/esphome/components/sm2235/sm2235.cpp b/esphome/components/sm2235/sm2235.cpp
new file mode 100644
index 0000000000..f953d41957
--- /dev/null
+++ b/esphome/components/sm2235/sm2235.cpp
@@ -0,0 +1,27 @@
+#include "sm2235.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace sm2235 {
+
+static const char *const TAG = "sm2235";
+
+void SM2235::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up sm2235 Output Component...");
+  this->data_pin_->setup();
+  this->data_pin_->digital_write(true);
+  this->clock_pin_->setup();
+  this->clock_pin_->digital_write(true);
+  this->pwm_amounts_.resize(5, 0);
+}
+
+void SM2235::dump_config() {
+  ESP_LOGCONFIG(TAG, "sm2235:");
+  LOG_PIN("  Data Pin: ", this->data_pin_);
+  LOG_PIN("  Clock Pin: ", this->clock_pin_);
+  ESP_LOGCONFIG(TAG, "  Color Channels Max Power: %u", this->max_power_color_channels_);
+  ESP_LOGCONFIG(TAG, "  White Channels Max Power: %u", this->max_power_white_channels_);
+}
+
+}  // namespace sm2235
+}  // namespace esphome
diff --git a/esphome/components/sm2235/sm2235.h b/esphome/components/sm2235/sm2235.h
new file mode 100644
index 0000000000..56d1782055
--- /dev/null
+++ b/esphome/components/sm2235/sm2235.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sm10bit_base/sm10bit_base.h"
+#include "esphome/core/hal.h"
+
+namespace esphome {
+namespace sm2235 {
+
+class SM2235 : public sm10bit_base::Sm10BitBase {
+ public:
+  SM2235() = default;
+
+  void setup() override;
+  void dump_config() override;
+};
+
+}  // namespace sm2235
+}  // namespace esphome
diff --git a/esphome/components/sm2335/__init__.py b/esphome/components/sm2335/__init__.py
new file mode 100644
index 0000000000..6d6e0e311c
--- /dev/null
+++ b/esphome/components/sm2335/__init__.py
@@ -0,0 +1,22 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sm10bit_base
+
+AUTO_LOAD = ["sm10bit_base", "output"]
+CODEOWNERS = ["@Cossid"]
+MULTI_CONF = True
+
+sm2335_ns = cg.esphome_ns.namespace("sm2335")
+
+SM2335 = sm2335_ns.class_("SM2335", sm10bit_base.Sm10BitBase)
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(SM2335),
+    }
+).extend(sm10bit_base.SM10BIT_BASE_CONFIG_SCHEMA)
+
+
+async def to_code(config):
+    var = await sm10bit_base.register_sm10bit_base(config)
+    cg.add(var.set_model(0xC0))
diff --git a/esphome/components/sm2335/output.py b/esphome/components/sm2335/output.py
new file mode 100644
index 0000000000..52b6321db1
--- /dev/null
+++ b/esphome/components/sm2335/output.py
@@ -0,0 +1,28 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import output
+from esphome.const import CONF_CHANNEL, CONF_ID
+from . import SM2335
+
+DEPENDENCIES = ["sm2335"]
+CODEOWNERS = ["@Cossid"]
+
+Channel = SM2335.class_("Channel", output.FloatOutput)
+
+CONF_SM2335_ID = "sm2335_id"
+CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
+    {
+        cv.GenerateID(CONF_SM2335_ID): cv.use_id(SM2335),
+        cv.Required(CONF_ID): cv.declare_id(Channel),
+        cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=65535),
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await output.register_output(var, config)
+
+    parent = await cg.get_variable(config[CONF_SM2335_ID])
+    cg.add(var.set_parent(parent))
+    cg.add(var.set_channel(config[CONF_CHANNEL]))
diff --git a/esphome/components/sm2335/sm2335.cpp b/esphome/components/sm2335/sm2335.cpp
new file mode 100644
index 0000000000..b6c482b5bb
--- /dev/null
+++ b/esphome/components/sm2335/sm2335.cpp
@@ -0,0 +1,27 @@
+#include "sm2335.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace sm2335 {
+
+static const char *const TAG = "sm2335";
+
+void SM2335::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up sm2335 Output Component...");
+  this->data_pin_->setup();
+  this->data_pin_->digital_write(true);
+  this->clock_pin_->setup();
+  this->clock_pin_->digital_write(true);
+  this->pwm_amounts_.resize(5, 0);
+}
+
+void SM2335::dump_config() {
+  ESP_LOGCONFIG(TAG, "sm2335:");
+  LOG_PIN("  Data Pin: ", this->data_pin_);
+  LOG_PIN("  Clock Pin: ", this->clock_pin_);
+  ESP_LOGCONFIG(TAG, "  Color Channels Max Power: %u", this->max_power_color_channels_);
+  ESP_LOGCONFIG(TAG, "  White Channels Max Power: %u", this->max_power_white_channels_);
+}
+
+}  // namespace sm2335
+}  // namespace esphome
diff --git a/esphome/components/sm2335/sm2335.h b/esphome/components/sm2335/sm2335.h
new file mode 100644
index 0000000000..c8cf825189
--- /dev/null
+++ b/esphome/components/sm2335/sm2335.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sm10bit_base/sm10bit_base.h"
+#include "esphome/core/hal.h"
+
+namespace esphome {
+namespace sm2335 {
+
+class SM2335 : public sm10bit_base::Sm10BitBase {
+ public:
+  SM2335() = default;
+
+  void setup() override;
+  void dump_config() override;
+};
+
+}  // namespace sm2335
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 51b34d9785..2137fd442d 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1465,6 +1465,18 @@ my9231:
   num_chips: 2
   bit_depth: 16
 
+sm2235:
+  data_pin: GPIO4
+  clock_pin: GPIO5
+  max_power_color_channels: 9
+  max_power_white_channels: 9
+
+sm2335:
+  data_pin: GPIO4
+  clock_pin: GPIO5
+  max_power_color_channels: 9
+  max_power_white_channels: 9
+
 bp1658cj:
   data_pin: GPIO3
   clock_pin: GPIO5
@@ -1600,6 +1612,36 @@ output:
   - platform: my9231
     id: my_5
     channel: 5
+  - platform: sm2235
+    id: sm2235_red
+    channel: 1
+  - platform: sm2235
+    id: sm2235_green
+    channel: 0
+  - platform: sm2235
+    id: sm2235_blue
+    channel: 2
+  - platform: sm2235
+    id: sm2235_coldwhite
+    channel: 4
+  - platform: sm2235
+    id: sm2235_warmwhite
+    channel: 3
+  - platform: sm2335
+    id: sm2335_red
+    channel: 1
+  - platform: sm2335
+    id: sm2335_green
+    channel: 0
+  - platform: sm2335
+    id: sm2335_blue
+    channel: 2
+  - platform: sm2335
+    id: sm2335_coldwhite
+    channel: 4
+  - platform: sm2335
+    id: sm2335_warmwhite
+    channel: 3
   - platform: slow_pwm
     id: id24
     pin: GPIO26

From 8237e13c44132f639d79a2582fe589604cc664e4 Mon Sep 17 00:00:00 2001
From: cstaahl <44496349+cstaahl@users.noreply.github.com>
Date: Thu, 22 Dec 2022 23:07:45 +0100
Subject: [PATCH 422/838] Fix broken PULSE_METER (#4199)

fixes https://github.com/esphome/issues/issues/3730
---
 .../pulse_meter/pulse_meter_sensor.cpp        | 170 +++++++++++-------
 .../pulse_meter/pulse_meter_sensor.h          |  12 +-
 2 files changed, 113 insertions(+), 69 deletions(-)

diff --git a/esphome/components/pulse_meter/pulse_meter_sensor.cpp b/esphome/components/pulse_meter/pulse_meter_sensor.cpp
index 52b7261f8b..d0c627313c 100644
--- a/esphome/components/pulse_meter/pulse_meter_sensor.cpp
+++ b/esphome/components/pulse_meter/pulse_meter_sensor.cpp
@@ -11,43 +11,48 @@ void PulseMeterSensor::setup() {
   this->isr_pin_ = pin_->to_isr();
   this->pin_->attach_interrupt(PulseMeterSensor::gpio_intr, this, gpio::INTERRUPT_ANY_EDGE);
 
-  this->pulse_width_us_ = 0;
   this->last_detected_edge_us_ = 0;
-  this->last_valid_high_edge_us_ = 0;
-  this->last_valid_low_edge_us_ = 0;
+  this->last_valid_edge_us_ = 0;
+  this->pulse_width_us_ = 0;
   this->sensor_is_high_ = this->isr_pin_.digital_read();
-  this->has_valid_high_edge_ = false;
-  this->has_valid_low_edge_ = false;
+  this->has_valid_edge_ = false;
+  this->pending_state_change_ = NONE;
 }
+// In PULSE mode we set a flag (pending_state_change_) for every interrupt
+// that constitutes a state change. In the loop() method we check if a time
+// interval greater than the internal_filter time has passed without any
+// interrupts.
 
 void PulseMeterSensor::loop() {
-  // Get a local copy of the volatile sensor values, to make sure they are not
-  // modified by the ISR. This could cause overflow in the following arithmetic
-  const uint32_t last_valid_high_edge_us = this->last_valid_high_edge_us_;
-  const bool has_valid_high_edge = this->has_valid_high_edge_;
+  // Get a snapshot of the needed volatile sensor values, to make sure they are not
+  // modified by the ISR while we are in the loop() method. If they are changed
+  // after we the variable "now" has been set, overflow will occur in the
+  // subsequent arithmetic
+  const bool has_valid_edge = this->has_valid_edge_;
+  const uint32_t last_detected_edge_us = this->last_detected_edge_us_;
+  const uint32_t last_valid_edge_us = this->last_valid_edge_us_;
+  // Get the current time after the snapshot of saved times
   const uint32_t now = micros();
 
-  // If we've exceeded our timeout interval without receiving any pulses, assume
-  // 0 pulses/min until we get at least two valid pulses.
-  const uint32_t time_since_valid_edge_us = now - last_valid_high_edge_us;
-  if ((has_valid_high_edge) && (time_since_valid_edge_us > this->timeout_us_)) {
+  this->handle_state_change_(now, last_detected_edge_us, last_valid_edge_us, has_valid_edge);
+
+  // If we've exceeded our timeout interval without receiving any pulses, assume 0 pulses/min until
+  // we get at least two valid pulses.
+  const uint32_t time_since_valid_edge_us = now - last_detected_edge_us;
+  if ((has_valid_edge) && (time_since_valid_edge_us > this->timeout_us_)) {
     ESP_LOGD(TAG, "No pulse detected for %us, assuming 0 pulses/min", time_since_valid_edge_us / 1000000);
 
+    this->last_valid_edge_us_ = 0;
     this->pulse_width_us_ = 0;
+    this->has_valid_edge_ = false;
     this->last_detected_edge_us_ = 0;
-    this->last_valid_high_edge_us_ = 0;
-    this->last_valid_low_edge_us_ = 0;
-    this->has_detected_edge_ = false;
-    this->has_valid_high_edge_ = false;
-    this->has_valid_low_edge_ = false;
   }
 
   // We quantize our pulse widths to 1 ms to avoid unnecessary jitter
   const uint32_t pulse_width_ms = this->pulse_width_us_ / 1000;
   if (this->pulse_width_dedupe_.next(pulse_width_ms)) {
     if (pulse_width_ms == 0) {
-      // Treat 0 pulse width as 0 pulses/min (normally because we've not
-      // detected any pulses for a while)
+      // Treat 0 pulse width as 0 pulses/min (normally because we've not detected any pulses for a while)
       this->publish_state(0);
     } else {
       // Calculate pulses/min from the pulse width in ms
@@ -77,58 +82,95 @@ void PulseMeterSensor::dump_config() {
 }
 
 void IRAM_ATTR PulseMeterSensor::gpio_intr(PulseMeterSensor *sensor) {
-  // This is an interrupt handler - we can't call any virtual method from this
-  // method
-
-  // Get the current time before we do anything else so the measurements are
-  // consistent
+  // This is an interrupt handler - we can't call any virtual method from this method
+  // Get the current time before we do anything else so the measurements are consistent
   const uint32_t now = micros();
+  const bool pin_val = sensor->isr_pin_.digital_read();
 
-  // We only look at rising edges in EDGE mode, and all edges in PULSE mode
   if (sensor->filter_mode_ == FILTER_EDGE) {
-    if (sensor->isr_pin_.digital_read()) {
-      sensor->last_detected_edge_us_ = now;
-    }
-  }
-
-  // Check to see if we should filter this edge out
-  if (sensor->filter_mode_ == FILTER_EDGE) {
-    if ((sensor->last_detected_edge_us_ - sensor->last_valid_high_edge_us_) >= sensor->filter_us_) {
-      // Don't measure the first valid pulse (we need at least two pulses to
-      // measure the width)
-      if (sensor->has_valid_high_edge_) {
-        sensor->pulse_width_us_ = (sensor->last_detected_edge_us_ - sensor->last_valid_high_edge_us_);
-      }
-      sensor->total_pulses_++;
-      sensor->last_valid_high_edge_us_ = sensor->last_detected_edge_us_;
-      sensor->has_valid_high_edge_ = true;
-    }
-  } else {
-    // Filter Mode is PULSE
-    bool pin_val = sensor->isr_pin_.digital_read();
-    // Ignore false edges that may be caused by bouncing and exit the ISR ASAP
-    if (pin_val == sensor->sensor_is_high_) {
+    // We only look at rising edges
+    if (!pin_val) {
       return;
     }
-    // Make sure the signal has been stable long enough
-    if (sensor->has_detected_edge_ && (now - sensor->last_detected_edge_us_ >= sensor->filter_us_)) {
-      if (pin_val) {
-        sensor->has_valid_high_edge_ = true;
-        sensor->last_valid_high_edge_us_ = sensor->last_detected_edge_us_;
-        sensor->sensor_is_high_ = true;
-      } else {
-        // Count pulses when a sufficiently long high pulse is concluded.
-        sensor->total_pulses_++;
-        if (sensor->has_valid_low_edge_) {
-          sensor->pulse_width_us_ = sensor->last_detected_edge_us_ - sensor->last_valid_low_edge_us_;
-        }
-        sensor->has_valid_low_edge_ = true;
-        sensor->last_valid_low_edge_us_ = sensor->last_detected_edge_us_;
-        sensor->sensor_is_high_ = false;
+    // Check to see if we should filter this edge out
+    if ((now - sensor->last_detected_edge_us_) >= sensor->filter_us_) {
+      // Don't measure the first valid pulse (we need at least two pulses to measure the width)
+      if (sensor->has_valid_edge_) {
+        sensor->pulse_width_us_ = (now - sensor->last_valid_edge_us_);
       }
+      sensor->total_pulses_++;
+      sensor->last_valid_edge_us_ = now;
+      sensor->has_valid_edge_ = true;
     }
-    sensor->has_detected_edge_ = true;
     sensor->last_detected_edge_us_ = now;
+  } else {
+    // Filter Mode is PULSE
+    const uint32_t delta_t_us = now - sensor->last_detected_edge_us_;
+    // We need to check if we have missed to handle a state change in the
+    // loop() function. This can happen when the filter_us value is less than
+    // the loop() interval, which is ~50-60ms
+    // The section below is essentially a modified repeat of the
+    // handle_state_change method. Ideally i would refactor and call the
+    // method here as well. However functions called in ISRs need to meet
+    // strict criteria and I don't think the methos would meet them.
+    if (sensor->pending_state_change_ != NONE && (delta_t_us > sensor->filter_us_)) {
+      // We have missed to handle a state change in the loop function.
+      sensor->sensor_is_high_ = sensor->pending_state_change_ == TO_HIGH;
+      if (sensor->sensor_is_high_) {
+        // We need to handle a pulse that would have been missed by the loop function
+        sensor->total_pulses_++;
+        if (sensor->has_valid_edge_) {
+          sensor->pulse_width_us_ = sensor->last_detected_edge_us_ - sensor->last_valid_edge_us_;
+          sensor->has_valid_edge_ = true;
+          sensor->last_valid_edge_us_ = sensor->last_detected_edge_us_;
+        }
+      }
+    }  // End of checking for and handling of change in state
+
+    // Ignore false edges that may be caused by bouncing and exit the ISR ASAP
+    if (pin_val == sensor->sensor_is_high_) {
+      sensor->pending_state_change_ = NONE;
+      return;
+    }
+    sensor->pending_state_change_ = pin_val ? TO_HIGH : TO_LOW;
+    sensor->last_detected_edge_us_ = now;
+  }
+}
+
+void PulseMeterSensor::handle_state_change_(uint32_t now, uint32_t last_detected_edge_us, uint32_t last_valid_edge_us,
+                                            bool has_valid_edge) {
+  if (this->pending_state_change_ == NONE) {
+    return;
+  }
+
+  const bool pin_val = this->isr_pin_.digital_read();
+  if (pin_val == this->sensor_is_high_) {
+    // Most likely caused by high frequency bouncing. Theoretically we should
+    // expect interrupts of alternating state. Here we are registering an
+    // interrupt with no change in state. Another interrupt will likely trigger
+    // just after this one and have an alternate state.
+    this->pending_state_change_ = NONE;
+    return;
+  }
+
+  if ((now - last_detected_edge_us) > this->filter_us_) {
+    this->sensor_is_high_ = pin_val;
+    ESP_LOGVV(TAG, "State is now %s", pin_val ? "high" : "low");
+
+    // Increment with valid rising edges only
+    if (pin_val) {
+      this->total_pulses_++;
+      ESP_LOGVV(TAG, "Incremented pulses to %u", this->total_pulses_);
+
+      if (has_valid_edge) {
+        this->pulse_width_us_ = last_detected_edge_us - last_valid_edge_us;
+        ESP_LOGVV(TAG, "Set pulse width to %u", this->pulse_width_us_);
+      }
+      this->has_valid_edge_ = true;
+      this->last_valid_edge_us_ = last_detected_edge_us;
+      ESP_LOGVV(TAG, "last_valid_edge_us_ is now %u", this->last_valid_edge_us_);
+    }
+    this->pending_state_change_ = NONE;
   }
 }
 
diff --git a/esphome/components/pulse_meter/pulse_meter_sensor.h b/esphome/components/pulse_meter/pulse_meter_sensor.h
index ed4fb2a1f4..47af6e2398 100644
--- a/esphome/components/pulse_meter/pulse_meter_sensor.h
+++ b/esphome/components/pulse_meter/pulse_meter_sensor.h
@@ -29,7 +29,11 @@ class PulseMeterSensor : public sensor::Sensor, public Component {
   void dump_config() override;
 
  protected:
+  enum StateChange { TO_LOW = 0, TO_HIGH, NONE };
+
   static void gpio_intr(PulseMeterSensor *sensor);
+  void handle_state_change_(uint32_t now, uint32_t last_detected_edge_us, uint32_t last_valid_edge_us,
+                            bool has_valid_edge);
 
   InternalGPIOPin *pin_{nullptr};
   ISRInternalGPIOPin isr_pin_;
@@ -42,14 +46,12 @@ class PulseMeterSensor : public sensor::Sensor, public Component {
   Deduplicator<uint32_t> total_dedupe_;
 
   volatile uint32_t last_detected_edge_us_ = 0;
-  volatile uint32_t last_valid_high_edge_us_ = 0;
-  volatile uint32_t last_valid_low_edge_us_ = 0;
+  volatile uint32_t last_valid_edge_us_ = 0;
   volatile uint32_t pulse_width_us_ = 0;
   volatile uint32_t total_pulses_ = 0;
   volatile bool sensor_is_high_ = false;
-  volatile bool has_detected_edge_ = false;
-  volatile bool has_valid_high_edge_ = false;
-  volatile bool has_valid_low_edge_ = false;
+  volatile bool has_valid_edge_ = false;
+  volatile StateChange pending_state_change_{NONE};
 };
 
 }  // namespace pulse_meter

From 119a6920f2a82a9f77e42158c8fdf69755803a11 Mon Sep 17 00:00:00 2001
From: brogon <brogon@palandor.net>
Date: Fri, 23 Dec 2022 00:33:31 +0100
Subject: [PATCH 423/838] PCF85063 RTC chip (#3873)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                               |   1 +
 esphome/components/pcf85063/__init__.py  |   0
 esphome/components/pcf85063/pcf85063.cpp | 105 +++++++++++++++++++++++
 esphome/components/pcf85063/pcf85063.h   |  96 +++++++++++++++++++++
 esphome/components/pcf85063/time.py      |  60 +++++++++++++
 tests/test5.yaml                         |   3 +
 6 files changed, 265 insertions(+)
 create mode 100644 esphome/components/pcf85063/__init__.py
 create mode 100644 esphome/components/pcf85063/pcf85063.cpp
 create mode 100644 esphome/components/pcf85063/pcf85063.h
 create mode 100644 esphome/components/pcf85063/time.py

diff --git a/CODEOWNERS b/CODEOWNERS
index a0c62ffe24..7b3ce637de 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -167,6 +167,7 @@ esphome/components/number/* @esphome/core
 esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
 esphome/components/pca9554/* @hwstar
+esphome/components/pcf85063/* @brogon
 esphome/components/pid/* @OttoWinter
 esphome/components/pipsolar/* @andreashergert1984
 esphome/components/pm1006/* @habbie
diff --git a/esphome/components/pcf85063/__init__.py b/esphome/components/pcf85063/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/pcf85063/pcf85063.cpp b/esphome/components/pcf85063/pcf85063.cpp
new file mode 100644
index 0000000000..c6a8624ca7
--- /dev/null
+++ b/esphome/components/pcf85063/pcf85063.cpp
@@ -0,0 +1,105 @@
+#include "pcf85063.h"
+#include "esphome/core/log.h"
+
+// Datasheet:
+// - https://datasheets.maximintegrated.com/en/ds/DS1307.pdf
+
+namespace esphome {
+namespace pcf85063 {
+
+static const char *const TAG = "pcf85063";
+
+void PCF85063Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up PCF85063...");
+  if (!this->read_rtc_()) {
+    this->mark_failed();
+  }
+}
+
+void PCF85063Component::update() { this->read_time(); }
+
+void PCF85063Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "PCF85063:");
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication with PCF85063 failed!");
+  }
+  ESP_LOGCONFIG(TAG, "  Timezone: '%s'", this->timezone_.c_str());
+}
+
+float PCF85063Component::get_setup_priority() const { return setup_priority::DATA; }
+
+void PCF85063Component::read_time() {
+  if (!this->read_rtc_()) {
+    return;
+  }
+  if (pcf85063_.reg.osc_stop) {
+    ESP_LOGW(TAG, "RTC halted, not syncing to system clock.");
+    return;
+  }
+  time::ESPTime rtc_time{.second = uint8_t(pcf85063_.reg.second + 10 * pcf85063_.reg.second_10),
+                         .minute = uint8_t(pcf85063_.reg.minute + 10u * pcf85063_.reg.minute_10),
+                         .hour = uint8_t(pcf85063_.reg.hour + 10u * pcf85063_.reg.hour_10),
+                         .day_of_week = uint8_t(pcf85063_.reg.weekday),
+                         .day_of_month = uint8_t(pcf85063_.reg.day + 10u * pcf85063_.reg.day_10),
+                         .day_of_year = 1,  // ignored by recalc_timestamp_utc(false)
+                         .month = uint8_t(pcf85063_.reg.month + 10u * pcf85063_.reg.month_10),
+                         .year = uint16_t(pcf85063_.reg.year + 10u * pcf85063_.reg.year_10 + 2000)};
+  rtc_time.recalc_timestamp_utc(false);
+  if (!rtc_time.is_valid()) {
+    ESP_LOGE(TAG, "Invalid RTC time, not syncing to system clock.");
+    return;
+  }
+  time::RealTimeClock::synchronize_epoch_(rtc_time.timestamp);
+}
+
+void PCF85063Component::write_time() {
+  auto now = time::RealTimeClock::utcnow();
+  if (!now.is_valid()) {
+    ESP_LOGE(TAG, "Invalid system time, not syncing to RTC.");
+    return;
+  }
+  pcf85063_.reg.year = (now.year - 2000) % 10;
+  pcf85063_.reg.year_10 = (now.year - 2000) / 10 % 10;
+  pcf85063_.reg.month = now.month % 10;
+  pcf85063_.reg.month_10 = now.month / 10;
+  pcf85063_.reg.day = now.day_of_month % 10;
+  pcf85063_.reg.day_10 = now.day_of_month / 10;
+  pcf85063_.reg.weekday = now.day_of_week;
+  pcf85063_.reg.hour = now.hour % 10;
+  pcf85063_.reg.hour_10 = now.hour / 10;
+  pcf85063_.reg.minute = now.minute % 10;
+  pcf85063_.reg.minute_10 = now.minute / 10;
+  pcf85063_.reg.second = now.second % 10;
+  pcf85063_.reg.second_10 = now.second / 10;
+  pcf85063_.reg.osc_stop = false;
+
+  this->write_rtc_();
+}
+
+bool PCF85063Component::read_rtc_() {
+  if (!this->read_bytes(0, this->pcf85063_.raw, sizeof(this->pcf85063_.raw))) {
+    ESP_LOGE(TAG, "Can't read I2C data.");
+    return false;
+  }
+  ESP_LOGD(TAG, "Read  %0u%0u:%0u%0u:%0u%0u 20%0u%0u-%0u%0u-%0u%0u  OSC:%s CLKOUT:%0u", pcf85063_.reg.hour_10,
+           pcf85063_.reg.hour, pcf85063_.reg.minute_10, pcf85063_.reg.minute, pcf85063_.reg.second_10,
+           pcf85063_.reg.second, pcf85063_.reg.year_10, pcf85063_.reg.year, pcf85063_.reg.month_10, pcf85063_.reg.month,
+           pcf85063_.reg.day_10, pcf85063_.reg.day, ONOFF(!pcf85063_.reg.osc_stop), pcf85063_.reg.clkout_control);
+
+  return true;
+}
+
+bool PCF85063Component::write_rtc_() {
+  if (!this->write_bytes(0, this->pcf85063_.raw, sizeof(this->pcf85063_.raw))) {
+    ESP_LOGE(TAG, "Can't write I2C data.");
+    return false;
+  }
+  ESP_LOGD(TAG, "Write %0u%0u:%0u%0u:%0u%0u 20%0u%0u-%0u%0u-%0u%0u  OSC:%s CLKOUT:%0u", pcf85063_.reg.hour_10,
+           pcf85063_.reg.hour, pcf85063_.reg.minute_10, pcf85063_.reg.minute, pcf85063_.reg.second_10,
+           pcf85063_.reg.second, pcf85063_.reg.year_10, pcf85063_.reg.year, pcf85063_.reg.month_10, pcf85063_.reg.month,
+           pcf85063_.reg.day_10, pcf85063_.reg.day, ONOFF(!pcf85063_.reg.osc_stop), pcf85063_.reg.clkout_control);
+  return true;
+}
+}  // namespace pcf85063
+}  // namespace esphome
diff --git a/esphome/components/pcf85063/pcf85063.h b/esphome/components/pcf85063/pcf85063.h
new file mode 100644
index 0000000000..1a3fd704e5
--- /dev/null
+++ b/esphome/components/pcf85063/pcf85063.h
@@ -0,0 +1,96 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/i2c/i2c.h"
+#include "esphome/components/time/real_time_clock.h"
+
+namespace esphome {
+namespace pcf85063 {
+
+class PCF85063Component : public time::RealTimeClock, public i2c::I2CDevice {
+ public:
+  void setup() override;
+  void update() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void read_time();
+  void write_time();
+
+ protected:
+  bool read_rtc_();
+  bool write_rtc_();
+  union PCF85063Reg {
+    struct {
+      // Control_1 register
+      bool cap_12pf : 1;
+      bool am_pm : 1;
+      bool correction_int_enable : 1;
+      bool : 1;
+      bool soft_reset : 1;
+      bool stop : 1;
+      bool : 1;
+      bool ext_test : 1;
+
+      // Control_2 register
+      uint8_t clkout_control : 3;
+      bool timer_flag : 1;
+      bool halfminute_int : 1;
+      bool minute_int : 1;
+      bool alarm_flag : 1;
+      bool alarm_int : 1;
+
+      // Offset register
+      uint8_t offset : 7;
+      bool coarse_mode : 1;
+
+      // nvRAM register
+      uint8_t nvram : 8;
+
+      // Seconds register
+      uint8_t second : 4;
+      uint8_t second_10 : 3;
+      bool osc_stop : 1;
+
+      // Minutes register
+      uint8_t minute : 4;
+      uint8_t minute_10 : 3;
+      uint8_t : 1;
+
+      // Hours register
+      uint8_t hour : 4;
+      uint8_t hour_10 : 2;
+      uint8_t : 2;
+
+      // Days register
+      uint8_t day : 4;
+      uint8_t day_10 : 2;
+      uint8_t : 2;
+
+      // Weekdays register
+      uint8_t weekday : 3;
+      uint8_t unused_3 : 5;
+
+      // Months register
+      uint8_t month : 4;
+      uint8_t month_10 : 1;
+      uint8_t : 3;
+
+      // Years register
+      uint8_t year : 4;
+      uint8_t year_10 : 4;
+    } reg;
+    mutable uint8_t raw[sizeof(reg)];
+  } pcf85063_;
+};
+
+template<typename... Ts> class WriteAction : public Action<Ts...>, public Parented<PCF85063Component> {
+ public:
+  void play(Ts... x) override { this->parent_->write_time(); }
+};
+
+template<typename... Ts> class ReadAction : public Action<Ts...>, public Parented<PCF85063Component> {
+ public:
+  void play(Ts... x) override { this->parent_->read_time(); }
+};
+}  // namespace pcf85063
+}  // namespace esphome
diff --git a/esphome/components/pcf85063/time.py b/esphome/components/pcf85063/time.py
new file mode 100644
index 0000000000..67ec230b5f
--- /dev/null
+++ b/esphome/components/pcf85063/time.py
@@ -0,0 +1,60 @@
+import esphome.config_validation as cv
+import esphome.codegen as cg
+from esphome import automation
+from esphome.components import i2c, time
+from esphome.const import CONF_ID
+
+
+CODEOWNERS = ["@brogon"]
+DEPENDENCIES = ["i2c"]
+pcf85063_ns = cg.esphome_ns.namespace("pcf85063")
+PCF85063Component = pcf85063_ns.class_(
+    "PCF85063Component", time.RealTimeClock, i2c.I2CDevice
+)
+WriteAction = pcf85063_ns.class_("WriteAction", automation.Action)
+ReadAction = pcf85063_ns.class_("ReadAction", automation.Action)
+
+
+CONFIG_SCHEMA = time.TIME_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(PCF85063Component),
+    }
+).extend(i2c.i2c_device_schema(0x51))
+
+
+@automation.register_action(
+    "pcf85063.write_time",
+    WriteAction,
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.use_id(PCF85063Component),
+        }
+    ),
+)
+async def pcf85063_write_time_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
+
+
+@automation.register_action(
+    "pcf85063.read_time",
+    ReadAction,
+    automation.maybe_simple_id(
+        {
+            cv.GenerateID(): cv.use_id(PCF85063Component),
+        }
+    ),
+)
+async def pcf85063_read_time_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
+
+
+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)
+    await time.register_time(var, config)
diff --git a/tests/test5.yaml b/tests/test5.yaml
index 596ba5de4e..118b206454 100644
--- a/tests/test5.yaml
+++ b/tests/test5.yaml
@@ -517,6 +517,9 @@ display:
     lambda: |-
       it.print("81818181");
 
+time:
+  - platform: pcf85063
+
 text_sensor:
   - platform: ezo_pmp
     dosing_mode:

From 19bf9b1e364ac1d54354164511244eb1f823f166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Sat, 31 Dec 2022 20:02:56 +0100
Subject: [PATCH 424/838] Add API for dashboard to get boards list by platform
 (#4168)

* Add API for dashboard to get boards list by platform

* Dashboard API: add board list for ESP32 S2/S3/C3

* Dashboard API: remove endpoint for all boards

* Dashboard API: hide group titles for all platforms

* Dashboard API: fix Python lint

* Dashboard API: refactor /boards to use list output

* Dashboard API: filter boards for selected platform

* Dashboard API: do not duplicate esp32 boards

Co-authored-by: Paulus Schoutsen <paulus@home-assistant.io>

Co-authored-by: Paulus Schoutsen <paulus@home-assistant.io>
---
 esphome/const.py               |  1 +
 esphome/dashboard/dashboard.py | 32 +++++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/esphome/const.py b/esphome/const.py
index 0e8de3f4ff..75c686188f 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -995,6 +995,7 @@ KEY_TARGET_PLATFORM = "target_platform"
 KEY_TARGET_FRAMEWORK = "target_framework"
 KEY_FRAMEWORK_VERSION = "framework_version"
 KEY_NAME = "name"
+KEY_VARIANT = "variant"
 
 # Entity categories
 ENTITY_CATEGORY_NONE = ""
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 2cf826dea9..c224990319 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -695,20 +695,34 @@ class PrometheusServiceDiscoveryHandler(BaseHandler):
 
 class BoardsRequestHandler(BaseHandler):
     @authenticated
-    def get(self):
+    def get(self, platform: str):
         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
 
-        boards = {
-            "esp32": {key: val[const.KEY_NAME] for key, val in ESP32_BOARDS.items()},
-            "esp8266": {
-                key: val[const.KEY_NAME] for key, val in ESP8266_BOARDS.items()
-            },
-            "rp2040": {key: val[const.KEY_NAME] for key, val in RP2040_BOARDS.items()},
+        platform_to_boards = {
+            "esp32": ESP32_BOARDS,
+            "esp8266": ESP8266_BOARDS,
+            "rp2040": RP2040_BOARDS,
         }
+        # filter all ESP32 variants by requested platform
+        if platform.startswith("esp32"):
+            boards = {
+                k: v
+                for k, v in platform_to_boards["esp32"].items()
+                if v[const.KEY_VARIANT] == platform.upper()
+            }
+        else:
+            boards = platform_to_boards[platform]
+
+        # map to a {board_name: board_title} dict
+        platform_boards = {key: val[const.KEY_NAME] for key, val in boards.items()}
+        # sort by board title
+        boards_items = sorted(platform_boards.items(), key=lambda item: item[1])
+        output = [dict(items=dict(boards_items))]
+
         self.set_header("content-type", "application/json")
-        self.write(json.dumps(boards))
+        self.write(json.dumps(output))
 
 
 class MDNSStatusThread(threading.Thread):
@@ -1081,7 +1095,7 @@ def make_app(debug=get_bool_env(ENV_DEV)):
             (f"{rel}json-config", JsonConfigRequestHandler),
             (f"{rel}rename", EsphomeRenameHandler),
             (f"{rel}prometheus-sd", PrometheusServiceDiscoveryHandler),
-            (f"{rel}boards", BoardsRequestHandler),
+            (f"{rel}boards/([a-z0-9]+)", BoardsRequestHandler),
         ],
         **app_settings,
     )

From ecac26aebaa7aa8c27f58be2fa6a1330f92bc92d Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sat, 31 Dec 2022 14:40:50 -0500
Subject: [PATCH 425/838] Bump dashboard to 20221231.0 (#4248)

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

diff --git a/requirements.txt b/requirements.txt
index 75e7dd8e12..4022ca7d7f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.1.5  # When updating platformio, also update Dockerfile
 esptool==4.4
 click==8.1.3
-esphome-dashboard==20221213.0
+esphome-dashboard==20221231.0
 aioesphomeapi==13.0.2
 zeroconf==0.39.4
 

From 1511a6ebcdb62cb970a32aec67bfad1893ce19a0 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 8 Jan 2023 15:14:06 -1000
Subject: [PATCH 426/838] Bump zeroconf to 0.47.1 (#4268)

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

diff --git a/requirements.txt b/requirements.txt
index 4022ca7d7f..382d3fe2a0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ esptool==4.4
 click==8.1.3
 esphome-dashboard==20221231.0
 aioesphomeapi==13.0.2
-zeroconf==0.39.4
+zeroconf==0.47.1
 
 # esp-idf requires this, but doesn't bundle it by default
 # https://github.com/espressif/esp-idf/blob/220590d599e134d7a5e7f1e683cc4550349ffbf8/requirements.txt#L24

From 657fd9d0d5e59f55b9eac9e99efdeeec97aab5c1 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Mon, 9 Jan 2023 16:54:15 -0800
Subject: [PATCH 427/838] Don't match words containing "id" (#4265)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
fixes https://github.com/esphome/issues/issues/3507
---
 esphome/config_validation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 054ee194c1..359b9ba88e 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -1240,7 +1240,7 @@ def enum(mapping, **kwargs):
     return validator
 
 
-LAMBDA_ENTITY_ID_PROG = re.compile(r"id\(\s*([a-zA-Z0-9_]+\.[.a-zA-Z0-9_]+)\s*\)")
+LAMBDA_ENTITY_ID_PROG = re.compile(r"\Wid\(\s*([a-zA-Z0-9_]+\.[.a-zA-Z0-9_]+)\s*\)")
 
 
 def lambda_(value):

From fe55f3a43d9fdbb24d1746277d9e61f765ad3ef3 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Mon, 9 Jan 2023 19:06:54 -0800
Subject: [PATCH 428/838] Add support for matrix keypads (#4241)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 CODEOWNERS                                    |   2 +
 esphome/components/key_provider/__init__.py   |   6 ++
 .../components/key_provider/key_provider.cpp  |  13 +++
 .../components/key_provider/key_provider.h    |  21 ++++
 esphome/components/matrix_keypad/__init__.py  |  71 ++++++++++++
 .../matrix_keypad/binary_sensor/__init__.py   |  53 +++++++++
 .../matrix_keypad_binary_sensor.h             |  51 +++++++++
 .../matrix_keypad/matrix_keypad.cpp           | 102 ++++++++++++++++++
 .../components/matrix_keypad/matrix_keypad.h  |  46 ++++++++
 9 files changed, 365 insertions(+)
 create mode 100644 esphome/components/key_provider/__init__.py
 create mode 100644 esphome/components/key_provider/key_provider.cpp
 create mode 100644 esphome/components/key_provider/key_provider.h
 create mode 100644 esphome/components/matrix_keypad/__init__.py
 create mode 100644 esphome/components/matrix_keypad/binary_sensor/__init__.py
 create mode 100644 esphome/components/matrix_keypad/binary_sensor/matrix_keypad_binary_sensor.h
 create mode 100644 esphome/components/matrix_keypad/matrix_keypad.cpp
 create mode 100644 esphome/components/matrix_keypad/matrix_keypad.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 7b3ce637de..a642274147 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -113,6 +113,7 @@ esphome/components/integration/* @OttoWinter
 esphome/components/interval/* @esphome/core
 esphome/components/json/* @OttoWinter
 esphome/components/kalman_combinator/* @Cat-Ion
+esphome/components/key_provider/* @ssieb
 esphome/components/lcd_menu/* @numo68
 esphome/components/ledc/* @OttoWinter
 esphome/components/light/* @esphome/core
@@ -120,6 +121,7 @@ esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
 esphome/components/lock/* @esphome/core
 esphome/components/logger/* @esphome/core
 esphome/components/ltr390/* @sjtrny
+esphome/components/matrix_keypad/* @ssieb
 esphome/components/max31865/* @DAVe3283
 esphome/components/max44009/* @berfenger
 esphome/components/max7219digit/* @rspaargaren
diff --git a/esphome/components/key_provider/__init__.py b/esphome/components/key_provider/__init__.py
new file mode 100644
index 0000000000..f397382ff2
--- /dev/null
+++ b/esphome/components/key_provider/__init__.py
@@ -0,0 +1,6 @@
+import esphome.codegen as cg
+
+CODEOWNERS = ["@ssieb"]
+
+key_provider_ns = cg.esphome_ns.namespace("key_provider")
+KeyProvider = key_provider_ns.class_("KeyProvider")
diff --git a/esphome/components/key_provider/key_provider.cpp b/esphome/components/key_provider/key_provider.cpp
new file mode 100644
index 0000000000..5a0e24b13f
--- /dev/null
+++ b/esphome/components/key_provider/key_provider.cpp
@@ -0,0 +1,13 @@
+#include "key_provider.h"
+
+namespace esphome {
+namespace key_provider {
+
+void KeyProvider::add_on_key_callback(std::function<void(uint8_t)> &&callback) {
+  this->key_callback_.add(std::move(callback));
+}
+
+void KeyProvider::send_key_(uint8_t key) { this->key_callback_.call(key); }
+
+}  // namespace key_provider
+}  // namespace esphome
diff --git a/esphome/components/key_provider/key_provider.h b/esphome/components/key_provider/key_provider.h
new file mode 100644
index 0000000000..272d3eecad
--- /dev/null
+++ b/esphome/components/key_provider/key_provider.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "esphome/core/automation.h"
+#include "esphome/core/component.h"
+
+namespace esphome {
+namespace key_provider {
+
+/// interface for components that provide keypresses
+class KeyProvider {
+ public:
+  void add_on_key_callback(std::function<void(uint8_t)> &&callback);
+
+ protected:
+  void send_key_(uint8_t key);
+
+  CallbackManager<void(uint8_t)> key_callback_{};
+};
+
+}  // namespace key_provider
+}  // namespace esphome
diff --git a/esphome/components/matrix_keypad/__init__.py b/esphome/components/matrix_keypad/__init__.py
new file mode 100644
index 0000000000..1c549007b9
--- /dev/null
+++ b/esphome/components/matrix_keypad/__init__.py
@@ -0,0 +1,71 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import key_provider
+from esphome.const import CONF_ID, CONF_PIN
+
+CODEOWNERS = ["@ssieb"]
+
+AUTO_LOAD = ["key_provider"]
+
+MULTI_CONF = True
+
+matrix_keypad_ns = cg.esphome_ns.namespace("matrix_keypad")
+MatrixKeypad = matrix_keypad_ns.class_(
+    "MatrixKeypad", key_provider.KeyProvider, cg.Component
+)
+
+CONF_KEYPAD_ID = "keypad_id"
+CONF_ROWS = "rows"
+CONF_COLUMNS = "columns"
+CONF_KEYS = "keys"
+CONF_DEBOUNCE_TIME = "debounce_time"
+CONF_HAS_DIODES = "has_diodes"
+
+
+def check_keys(obj):
+    if CONF_KEYS in obj:
+        if len(obj[CONF_KEYS]) != len(obj[CONF_ROWS]) * len(obj[CONF_COLUMNS]):
+            raise cv.Invalid("The number of key codes must equal the number of buttons")
+    return obj
+
+
+CONFIG_SCHEMA = cv.All(
+    cv.COMPONENT_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(MatrixKeypad),
+            cv.Required(CONF_ROWS): cv.All(
+                cv.ensure_list({cv.Required(CONF_PIN): pins.gpio_output_pin_schema}),
+                cv.Length(min=1),
+            ),
+            cv.Required(CONF_COLUMNS): cv.All(
+                cv.ensure_list({cv.Required(CONF_PIN): pins.gpio_input_pin_schema}),
+                cv.Length(min=1),
+            ),
+            cv.Optional(CONF_KEYS): cv.string,
+            cv.Optional(CONF_DEBOUNCE_TIME, default=1): cv.int_range(min=1, max=100),
+            cv.Optional(CONF_HAS_DIODES): cv.boolean,
+        }
+    ),
+    check_keys,
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    row_pins = []
+    for conf in config[CONF_ROWS]:
+        pin = await cg.gpio_pin_expression(conf[CONF_PIN])
+        row_pins.append(pin)
+    cg.add(var.set_rows(row_pins))
+    col_pins = []
+    for conf in config[CONF_COLUMNS]:
+        pin = await cg.gpio_pin_expression(conf[CONF_PIN])
+        col_pins.append(pin)
+    cg.add(var.set_columns(col_pins))
+    if CONF_KEYS in config:
+        cg.add(var.set_keys(config[CONF_KEYS]))
+    cg.add(var.set_debounce_time(config[CONF_DEBOUNCE_TIME]))
+    if CONF_HAS_DIODES in config:
+        cg.add(var.set_has_diodes(config[CONF_HAS_DIODES]))
diff --git a/esphome/components/matrix_keypad/binary_sensor/__init__.py b/esphome/components/matrix_keypad/binary_sensor/__init__.py
new file mode 100644
index 0000000000..204db98650
--- /dev/null
+++ b/esphome/components/matrix_keypad/binary_sensor/__init__.py
@@ -0,0 +1,53 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import binary_sensor
+from esphome.const import CONF_ID, CONF_KEY
+from .. import MatrixKeypad, matrix_keypad_ns, CONF_KEYPAD_ID
+
+CONF_ROW = "row"
+CONF_COL = "col"
+
+DEPENDENCIES = ["matrix_keypad"]
+
+MatrixKeypadBinarySensor = matrix_keypad_ns.class_(
+    "MatrixKeypadBinarySensor", binary_sensor.BinarySensor
+)
+
+
+def check_button(obj):
+    if CONF_ROW in obj or CONF_COL in obj:
+        if CONF_KEY in obj:
+            raise cv.Invalid("You can't provide both a key and a position")
+        if CONF_ROW not in obj:
+            raise cv.Invalid("Missing row")
+        if CONF_COL not in obj:
+            raise cv.Invalid("Missing col")
+    elif CONF_KEY not in obj:
+        raise cv.Invalid("Missing key or position")
+    elif len(obj[CONF_KEY]) != 1:
+        raise cv.Invalid("Key must be one character")
+    return obj
+
+
+CONFIG_SCHEMA = cv.All(
+    binary_sensor.BINARY_SENSOR_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(MatrixKeypadBinarySensor),
+            cv.GenerateID(CONF_KEYPAD_ID): cv.use_id(MatrixKeypad),
+            cv.Optional(CONF_ROW): cv.int_,
+            cv.Optional(CONF_COL): cv.int_,
+            cv.Optional(CONF_KEY): cv.string,
+        }
+    ),
+    check_button,
+)
+
+
+async def to_code(config):
+    if CONF_KEY in config:
+        var = cg.new_Pvariable(config[CONF_ID], config[CONF_KEY][0])
+    else:
+        var = cg.new_Pvariable(config[CONF_ID], config[CONF_ROW], config[CONF_COL])
+    await binary_sensor.register_binary_sensor(var, config)
+    matrix_keypad = await cg.get_variable(config[CONF_KEYPAD_ID])
+    cg.add(matrix_keypad.register_listener(var))
diff --git a/esphome/components/matrix_keypad/binary_sensor/matrix_keypad_binary_sensor.h b/esphome/components/matrix_keypad/binary_sensor/matrix_keypad_binary_sensor.h
new file mode 100644
index 0000000000..d8a217f55e
--- /dev/null
+++ b/esphome/components/matrix_keypad/binary_sensor/matrix_keypad_binary_sensor.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include "esphome/components/matrix_keypad/matrix_keypad.h"
+#include "esphome/components/binary_sensor/binary_sensor.h"
+
+namespace esphome {
+namespace matrix_keypad {
+
+class MatrixKeypadBinarySensor : public MatrixKeypadListener, public binary_sensor::BinarySensor {
+ public:
+  MatrixKeypadBinarySensor(uint8_t key) : has_key_(true), key_(key){};
+  MatrixKeypadBinarySensor(const char *key) : has_key_(true), key_((uint8_t) key[0]){};
+  MatrixKeypadBinarySensor(int row, int col) : has_key_(false), row_(row), col_(col){};
+
+  void key_pressed(uint8_t key) override {
+    if (!this->has_key_)
+      return;
+    if (key == this->key_)
+      this->publish_state(true);
+  }
+
+  void key_released(uint8_t key) override {
+    if (!this->has_key_)
+      return;
+    if (key == this->key_)
+      this->publish_state(false);
+  }
+
+  void button_pressed(int row, int col) override {
+    if (this->has_key_)
+      return;
+    if ((row == this->row_) && (col == this->col_))
+      this->publish_state(true);
+  }
+
+  void button_released(int row, int col) override {
+    if (this->has_key_)
+      return;
+    if ((row == this->row_) && (col == this->col_))
+      this->publish_state(false);
+  }
+
+ protected:
+  bool has_key_;
+  uint8_t key_;
+  int row_;
+  int col_;
+};
+
+}  // namespace matrix_keypad
+}  // namespace esphome
diff --git a/esphome/components/matrix_keypad/matrix_keypad.cpp b/esphome/components/matrix_keypad/matrix_keypad.cpp
new file mode 100644
index 0000000000..f4e7bf4d23
--- /dev/null
+++ b/esphome/components/matrix_keypad/matrix_keypad.cpp
@@ -0,0 +1,102 @@
+#include "matrix_keypad.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace matrix_keypad {
+
+static const char *const TAG = "matrix_keypad";
+
+void MatrixKeypad::setup() {
+  for (auto *pin : this->rows_) {
+    if (!has_diodes_) {
+      pin->pin_mode(gpio::FLAG_INPUT);
+    } else {
+      pin->digital_write(true);
+    }
+  }
+  for (auto *pin : this->columns_)
+    pin->pin_mode(gpio::FLAG_INPUT | gpio::FLAG_PULLUP);
+}
+
+void MatrixKeypad::loop() {
+  static uint32_t active_start = 0;
+  static int active_key = -1;
+  uint32_t now = millis();
+  int key = -1;
+  bool error = false;
+  int pos = 0, row, col;
+  for (auto *row : this->rows_) {
+    if (!has_diodes_)
+      row->pin_mode(gpio::FLAG_OUTPUT);
+    row->digital_write(false);
+    for (auto *col : this->columns_) {
+      if (!col->digital_read()) {
+        if (key != -1) {
+          error = true;
+        } else {
+          key = pos;
+        }
+      }
+      pos++;
+    }
+    row->digital_write(true);
+    if (!has_diodes_)
+      row->pin_mode(gpio::FLAG_INPUT);
+  }
+  if (error)
+    return;
+
+  if (key != active_key) {
+    if ((active_key != -1) && (this->pressed_key_ == active_key)) {
+      row = this->pressed_key_ / this->columns_.size();
+      col = this->pressed_key_ % this->columns_.size();
+      ESP_LOGD(TAG, "key @ row %d, col %d released", row, col);
+      for (auto &listener : this->listeners_)
+        listener->button_released(row, col);
+      if (!this->keys_.empty()) {
+        uint8_t keycode = this->keys_[this->pressed_key_];
+        ESP_LOGD(TAG, "key '%c' released", keycode);
+        for (auto &listener : this->listeners_)
+          listener->key_released(keycode);
+      }
+      this->pressed_key_ = -1;
+    }
+
+    active_key = key;
+    if (key == -1)
+      return;
+    active_start = now;
+  }
+
+  if ((this->pressed_key_ == key) || (now - active_start < this->debounce_time_))
+    return;
+
+  row = key / this->columns_.size();
+  col = key % this->columns_.size();
+  ESP_LOGD(TAG, "key @ row %d, col %d pressed", row, col);
+  for (auto &listener : this->listeners_)
+    listener->button_pressed(row, col);
+  if (!this->keys_.empty()) {
+    uint8_t keycode = this->keys_[key];
+    ESP_LOGD(TAG, "key '%c' pressed", keycode);
+    for (auto &listener : this->listeners_)
+      listener->key_pressed(keycode);
+    this->send_key_(keycode);
+  }
+  this->pressed_key_ = key;
+}
+
+void MatrixKeypad::dump_config() {
+  ESP_LOGCONFIG(TAG, "Matrix Keypad:");
+  ESP_LOGCONFIG(TAG, " Rows:");
+  for (auto &pin : this->rows_)
+    LOG_PIN("  Pin: ", pin);
+  ESP_LOGCONFIG(TAG, " Cols:");
+  for (auto &pin : this->columns_)
+    LOG_PIN("  Pin: ", pin);
+}
+
+void MatrixKeypad::register_listener(MatrixKeypadListener *listener) { this->listeners_.push_back(listener); }
+
+}  // namespace matrix_keypad
+}  // namespace esphome
diff --git a/esphome/components/matrix_keypad/matrix_keypad.h b/esphome/components/matrix_keypad/matrix_keypad.h
new file mode 100644
index 0000000000..9f5942be9a
--- /dev/null
+++ b/esphome/components/matrix_keypad/matrix_keypad.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include "esphome/components/key_provider/key_provider.h"
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
+#include <cstdlib>
+#include <utility>
+
+namespace esphome {
+namespace matrix_keypad {
+
+class MatrixKeypadListener {
+ public:
+  virtual void button_pressed(int row, int col){};
+  virtual void button_released(int row, int col){};
+  virtual void key_pressed(uint8_t key){};
+  virtual void key_released(uint8_t key){};
+};
+
+class MatrixKeypad : public key_provider::KeyProvider, public Component {
+ public:
+  void setup() override;
+  void loop() override;
+  void dump_config() override;
+  void set_columns(std::vector<GPIOPin *> pins) { columns_ = std::move(pins); };
+  void set_rows(std::vector<GPIOPin *> pins) { rows_ = std::move(pins); };
+  void set_keys(std::string keys) { keys_ = std::move(keys); };
+  void set_debounce_time(int debounce_time) { debounce_time_ = debounce_time; };
+  void set_has_diodes(int has_diodes) { has_diodes_ = has_diodes; };
+
+  void register_listener(MatrixKeypadListener *listener);
+
+ protected:
+  std::vector<GPIOPin *> rows_;
+  std::vector<GPIOPin *> columns_;
+  std::string keys_;
+  int debounce_time_ = 0;
+  bool has_diodes_{false};
+  int pressed_key_ = -1;
+
+  std::vector<MatrixKeypadListener *> listeners_{};
+};
+
+}  // namespace matrix_keypad
+}  // namespace esphome

From 75dff1e1025615971d092bab4ac63b5986bf2ffa Mon Sep 17 00:00:00 2001
From: Fabio Todaro <fbregist@gmail.com>
Date: Tue, 10 Jan 2023 04:20:16 +0100
Subject: [PATCH 429/838] Fix Template Switch restore_mode support (#4280)

fixes https://github.com/esphome/issues/issues/4020
---
 .../template/switch/template_switch.cpp         | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/esphome/components/template/switch/template_switch.cpp b/esphome/components/template/switch/template_switch.cpp
index b3e545d3e9..5db346b99f 100644
--- a/esphome/components/template/switch/template_switch.cpp
+++ b/esphome/components/template/switch/template_switch.cpp
@@ -43,15 +43,16 @@ void TemplateSwitch::setup() {
   if (!this->restore_state_)
     return;
 
-  auto restored = this->get_initial_state();
-  if (!restored.has_value())
-    return;
+  optional<bool> initial_state = this->get_initial_state_with_restore_mode();
 
-  ESP_LOGD(TAG, "  Restored state %s", ONOFF(*restored));
-  if (*restored) {
-    this->turn_on();
-  } else {
-    this->turn_off();
+  if (initial_state.has_value()) {
+    ESP_LOGD(TAG, "  Restored state %s", ONOFF(initial_state.value()));
+    // if it has a value, restore_mode is not "DISABLED", therefore act on the switch:
+    if (initial_state.value()) {
+      this->turn_on();
+    } else {
+      this->turn_off();
+    }
   }
 }
 void TemplateSwitch::dump_config() {

From b1f1329cee52a528910d95de90335a4456e26cfa Mon Sep 17 00:00:00 2001
From: Robin Pronk <robin.pronk@nedap.com>
Date: Tue, 10 Jan 2023 04:21:55 +0100
Subject: [PATCH 430/838] Correct decimals in Growatt energy reporting (#4277)

fixes https://github.com/esphome/issues/issues/3888
---
 esphome/components/growatt_solar/sensor.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/esphome/components/growatt_solar/sensor.py b/esphome/components/growatt_solar/sensor.py
index 4961595505..f95d679c3e 100644
--- a/esphome/components/growatt_solar/sensor.py
+++ b/esphome/components/growatt_solar/sensor.py
@@ -52,7 +52,7 @@ GrowattSolar = growatt_solar_ns.class_(
 PHASE_SENSORS = {
     CONF_VOLTAGE: sensor.sensor_schema(
         unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=2,
+        accuracy_decimals=1,
         device_class=DEVICE_CLASS_VOLTAGE,
     ),
     CONF_CURRENT: sensor.sensor_schema(
@@ -71,7 +71,7 @@ PHASE_SENSORS = {
 PV_SENSORS = {
     CONF_VOLTAGE: sensor.sensor_schema(
         unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=2,
+        accuracy_decimals=1,
         device_class=DEVICE_CLASS_VOLTAGE,
     ),
     CONF_CURRENT: sensor.sensor_schema(
@@ -135,13 +135,13 @@ CONFIG_SCHEMA = (
             ),
             cv.Optional(CONF_ENERGY_PRODUCTION_DAY): sensor.sensor_schema(
                 unit_of_measurement=UNIT_KILOWATT_HOURS,
-                accuracy_decimals=2,
+                accuracy_decimals=1,
                 device_class=DEVICE_CLASS_ENERGY,
                 state_class=STATE_CLASS_TOTAL_INCREASING,
             ),
             cv.Optional(CONF_TOTAL_ENERGY_PRODUCTION): sensor.sensor_schema(
                 unit_of_measurement=UNIT_KILOWATT_HOURS,
-                accuracy_decimals=0,
+                accuracy_decimals=1,
                 device_class=DEVICE_CLASS_ENERGY,
                 state_class=STATE_CLASS_TOTAL_INCREASING,
             ),

From 630634837961ed14aa5a81be41d07fc3ea04133d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 16:46:13 +1300
Subject: [PATCH 431/838] Bump pylint from 2.15.8 to 2.15.10 (#4278)

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 0376fcd93a..26d7c2785d 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,4 +1,4 @@
-pylint==2.15.8
+pylint==2.15.10
 flake8==6.0.0  # also change in .pre-commit-config.yaml when updating
 black==22.12.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.3.0  # also change in .pre-commit-config.yaml when updating

From 48340d41d6cd09cf1cf4e401bfe2196dc083c5f0 Mon Sep 17 00:00:00 2001
From: Joscha Wagner <joscha@arvernus.info>
Date: Tue, 10 Jan 2023 05:39:04 +0100
Subject: [PATCH 432/838] Fix frequency limit for MCP9600 (#4276)

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

diff --git a/esphome/components/mcp9600/sensor.py b/esphome/components/mcp9600/sensor.py
index 4c10df2dab..392ee4e773 100644
--- a/esphome/components/mcp9600/sensor.py
+++ b/esphome/components/mcp9600/sensor.py
@@ -58,7 +58,7 @@ CONFIG_SCHEMA = (
 )
 
 FINAL_VALIDATE_SCHEMA = i2c.final_validate_device_schema(
-    "mcp9600", min_frequency="100khz"
+    "mcp9600", min_frequency="10khz"
 )
 
 

From 74556b28a805657ec4887a049dcbf38dc5e5a07a Mon Sep 17 00:00:00 2001
From: Tom Keller <1083460+kellertk@users.noreply.github.com>
Date: Mon, 9 Jan 2023 20:40:04 -0800
Subject: [PATCH 433/838] fix: json compilation error on rp2040 (#4273)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/json/json_util.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/esphome/components/json/json_util.cpp b/esphome/components/json/json_util.cpp
index 7e701af48b..f105280b23 100644
--- a/esphome/components/json/json_util.cpp
+++ b/esphome/components/json/json_util.cpp
@@ -7,6 +7,9 @@
 #ifdef USE_ESP32
 #include <esp_heap_caps.h>
 #endif
+#ifdef USE_RP2040
+#include <Arduino.h>
+#endif
 
 namespace esphome {
 namespace json {
@@ -24,6 +27,8 @@ std::string build_json(const json_build_t &f) {
   const size_t free_heap = ESP.getMaxFreeBlockSize();  // NOLINT(readability-static-accessed-through-instance)
 #elif defined(USE_ESP32)
   const size_t free_heap = heap_caps_get_largest_free_block(MALLOC_CAP_8BIT);
+#elif defined(USE_RP2040)
+  const size_t free_heap = rp2040.getFreeHeap();
 #endif
 
   size_t request_size = std::min(free_heap, (size_t) 512);
@@ -64,6 +69,8 @@ void parse_json(const std::string &data, const json_parse_t &f) {
   const size_t free_heap = ESP.getMaxFreeBlockSize();  // NOLINT(readability-static-accessed-through-instance)
 #elif defined(USE_ESP32)
   const size_t free_heap = heap_caps_get_largest_free_block(MALLOC_CAP_8BIT);
+#elif defined(USE_RP2040)
+  const size_t free_heap = rp2040.getFreeHeap();
 #endif
   bool pass = false;
   size_t request_size = std::min(free_heap, (size_t)(data.size() * 1.5));

From c16c0b11cb5c27159e651429139c1f02fff78d68 Mon Sep 17 00:00:00 2001
From: Stas <s.slunkov@gmail.com>
Date: Tue, 10 Jan 2023 07:40:42 +0300
Subject: [PATCH 434/838] http_request: add request duration logging (#4272)

---
 esphome/components/http_request/__init__.py      |  4 +++-
 esphome/components/http_request/http_request.cpp | 15 ++++++++++-----
 esphome/components/http_request/http_request.h   |  4 ++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/esphome/components/http_request/__init__.py b/esphome/components/http_request/__init__.py
index c8c0ca5369..0c3e249512 100644
--- a/esphome/components/http_request/__init__.py
+++ b/esphome/components/http_request/__init__.py
@@ -195,6 +195,8 @@ async def http_request_action_to_code(config, action_id, template_arg, args):
     for conf in config.get(CONF_ON_RESPONSE, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID])
         cg.add(var.register_response_trigger(trigger))
-        await automation.build_automation(trigger, [(int, "status_code")], conf)
+        await automation.build_automation(
+            trigger, [(int, "status_code"), (cg.uint32, "duration_ms")], conf
+        )
 
     return var
diff --git a/esphome/components/http_request/http_request.cpp b/esphome/components/http_request/http_request.cpp
index 4e1cfe94b3..46894a9afd 100644
--- a/esphome/components/http_request/http_request.cpp
+++ b/esphome/components/http_request/http_request.cpp
@@ -66,6 +66,9 @@ void HttpRequestComponent::send(const std::vector<HttpRequestResponseTrigger *>
   }
 
   this->client_.setTimeout(this->timeout_);
+#if defined(USE_ESP32)
+  this->client_.setConnectTimeout(this->timeout_);
+#endif
   if (this->useragent_ != nullptr) {
     this->client_.setUserAgent(this->useragent_);
   }
@@ -73,25 +76,27 @@ void HttpRequestComponent::send(const std::vector<HttpRequestResponseTrigger *>
     this->client_.addHeader(header.name, header.value, false, true);
   }
 
+  uint32_t start_time = millis();
   int http_code = this->client_.sendRequest(this->method_, this->body_.c_str());
+  uint32_t duration = millis() - start_time;
   for (auto *trigger : response_triggers)
-    trigger->process(http_code);
+    trigger->process(http_code, duration);
 
   if (http_code < 0) {
-    ESP_LOGW(TAG, "HTTP Request failed; URL: %s; Error: %s", this->url_.c_str(),
-             HTTPClient::errorToString(http_code).c_str());
+    ESP_LOGW(TAG, "HTTP Request failed; URL: %s; Error: %s; Duration: %u ms", this->url_.c_str(),
+             HTTPClient::errorToString(http_code).c_str(), duration);
     this->status_set_warning();
     return;
   }
 
   if (http_code < 200 || http_code >= 300) {
-    ESP_LOGW(TAG, "HTTP Request failed; URL: %s; Code: %d", this->url_.c_str(), http_code);
+    ESP_LOGW(TAG, "HTTP Request failed; URL: %s; Code: %d; Duration: %u ms", this->url_.c_str(), http_code, duration);
     this->status_set_warning();
     return;
   }
 
   this->status_clear_warning();
-  ESP_LOGD(TAG, "HTTP Request completed; URL: %s; Code: %d", this->url_.c_str(), http_code);
+  ESP_LOGD(TAG, "HTTP Request completed; URL: %s; Code: %d; Duration: %u ms", this->url_.c_str(), http_code, duration);
 }
 
 #ifdef USE_ESP8266
diff --git a/esphome/components/http_request/http_request.h b/esphome/components/http_request/http_request.h
index eab3045fdc..3b15a6c89a 100644
--- a/esphome/components/http_request/http_request.h
+++ b/esphome/components/http_request/http_request.h
@@ -138,9 +138,9 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
   std::vector<HttpRequestResponseTrigger *> response_triggers_;
 };
 
-class HttpRequestResponseTrigger : public Trigger<int> {
+class HttpRequestResponseTrigger : public Trigger<int, uint32_t> {
  public:
-  void process(int status_code) { this->trigger(status_code); }
+  void process(int status_code, uint32_t duration_ms) { this->trigger(status_code, duration_ms); }
 };
 
 }  // namespace http_request

From 530df910442a11192f7bcea92719bddaefb3be91 Mon Sep 17 00:00:00 2001
From: Garret Buell <gmbuell@gmail.com>
Date: Tue, 10 Jan 2023 15:27:30 -0800
Subject: [PATCH 435/838] Fix HttpRequestResponseTrigger (#4270)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
fixes https://github.com/esphome/issues/issues/4010
---
 esphome/components/http_request/http_request.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/esphome/components/http_request/http_request.h b/esphome/components/http_request/http_request.h
index 3b15a6c89a..48163a70aa 100644
--- a/esphome/components/http_request/http_request.h
+++ b/esphome/components/http_request/http_request.h
@@ -31,7 +31,10 @@ struct Header {
   const char *value;
 };
 
-class HttpRequestResponseTrigger;
+class HttpRequestResponseTrigger : public Trigger<int, uint32_t> {
+ public:
+  void process(int status_code, uint32_t duration_ms) { this->trigger(status_code, duration_ms); }
+};
 
 class HttpRequestComponent : public Component {
  public:
@@ -138,11 +141,6 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
   std::vector<HttpRequestResponseTrigger *> response_triggers_;
 };
 
-class HttpRequestResponseTrigger : public Trigger<int, uint32_t> {
- public:
-  void process(int status_code, uint32_t duration_ms) { this->trigger(status_code, duration_ms); }
-};
-
 }  // namespace http_request
 }  // namespace esphome
 

From a19f0c0db0a1d7dd1799b44845fdb3598c8a085b Mon Sep 17 00:00:00 2001
From: Garret Buell <gmbuell@gmail.com>
Date: Tue, 10 Jan 2023 17:50:01 -0800
Subject: [PATCH 436/838] Fix HttpRequestResponseTrigger again (#4285)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
fixes https://github.com/esphome/issues/issues/4010
---
 .github/workflows/ci.yml                      |  4 +++
 .../components/http_request/http_request.h    |  4 +--
 tests/README.md                               |  1 +
 tests/test7.yaml                              | 33 +++++++++++++++++++
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 tests/test7.yaml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3baaf02506..c32dc11b61 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,6 +52,10 @@ jobs:
             file: tests/test6.yaml
             name: Test tests/test6.yaml
             pio_cache_key: test6
+          - id: test
+            file: tests/test7.yaml
+            name: Test tests/test7.yaml
+            pio_cache_key: test7
           - id: pytest
             name: Run pytest
           - id: clang-format
diff --git a/esphome/components/http_request/http_request.h b/esphome/components/http_request/http_request.h
index 48163a70aa..0958c07683 100644
--- a/esphome/components/http_request/http_request.h
+++ b/esphome/components/http_request/http_request.h
@@ -31,9 +31,9 @@ struct Header {
   const char *value;
 };
 
-class HttpRequestResponseTrigger : public Trigger<int, uint32_t> {
+class HttpRequestResponseTrigger : public Trigger<int32_t, uint32_t> {
  public:
-  void process(int status_code, uint32_t duration_ms) { this->trigger(status_code, duration_ms); }
+  void process(int32_t status_code, uint32_t duration_ms) { this->trigger(status_code, duration_ms); }
 };
 
 class HttpRequestComponent : public Component {
diff --git a/tests/README.md b/tests/README.md
index ed78b3e7d1..3238acaa79 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -25,3 +25,4 @@ Current test_.yaml file contents.
 | test4.yaml | ESP32 | ethernet | None
 | test5.yaml | ESP32 | wifi | ble_server
 | test6.yaml | RP2040 | wifi | N/A
+| test7.yaml | ESP32-C3 | wifi | N/A
diff --git a/tests/test7.yaml b/tests/test7.yaml
new file mode 100644
index 0000000000..10e1b035ab
--- /dev/null
+++ b/tests/test7.yaml
@@ -0,0 +1,33 @@
+# Tests for ESP32-C3 boards which use toolchain-riscv32-esp
+---
+wifi:
+  ssid: 'ssid'
+
+esp32:
+  board: lolin_c3_mini
+  framework:
+    type: arduino
+
+esphome:
+  name: 'on-response-test'
+  on_boot:
+    then:
+      - http_request.send:
+          method: PUT
+          url: https://esphome.io
+          headers:
+            Content-Type: application/json
+          body: Some data
+          verify_ssl: false
+          on_response:
+            then:
+              - logger.log:
+                  format: "Response status: %d"
+                  args:
+                    - status_code
+
+logger:
+
+http_request:
+  useragent: esphome/tagreader
+  timeout: 10s

From 1cf3424ebe0b4a91aca016a057a8ad5b70cbb1b6 Mon Sep 17 00:00:00 2001
From: EtienneMD <etienne.md@me.com>
Date: Tue, 10 Jan 2023 20:51:50 -0500
Subject: [PATCH 437/838] Add X9C Potentiometer component (#4183)

fixes https://github.com/esphome/feature-requests/issues/1270
---
 CODEOWNERS                         |  1 +
 esphome/components/x9c/__init__.py |  0
 esphome/components/x9c/output.py   | 46 +++++++++++++++++++
 esphome/components/x9c/x9c.cpp     | 72 ++++++++++++++++++++++++++++++
 esphome/components/x9c/x9c.h       | 32 +++++++++++++
 esphome/const.py                   |  2 +
 tests/test1.yaml                   |  6 +++
 7 files changed, 159 insertions(+)
 create mode 100644 esphome/components/x9c/__init__.py
 create mode 100644 esphome/components/x9c/output.py
 create mode 100644 esphome/components/x9c/x9c.cpp
 create mode 100644 esphome/components/x9c/x9c.h

diff --git a/CODEOWNERS b/CODEOWNERS
index a642274147..a5a4fc2552 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -273,6 +273,7 @@ esphome/components/web_server_base/* @OttoWinter
 esphome/components/whirlpool/* @glmnet
 esphome/components/whynter/* @aeonsablaze
 esphome/components/wl_134/* @hobbypunk90
+esphome/components/x9c/* @EtienneMD
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
 esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs
diff --git a/esphome/components/x9c/__init__.py b/esphome/components/x9c/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/x9c/output.py b/esphome/components/x9c/output.py
new file mode 100644
index 0000000000..44e9d729b3
--- /dev/null
+++ b/esphome/components/x9c/output.py
@@ -0,0 +1,46 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import output
+from esphome.const import (
+    CONF_ID,
+    CONF_CS_PIN,
+    CONF_INC_PIN,
+    CONF_UD_PIN,
+    CONF_INITIAL_VALUE,
+)
+
+CODEOWNERS = ["@EtienneMD"]
+
+x9c_ns = cg.esphome_ns.namespace("x9c")
+
+X9cOutput = x9c_ns.class_("X9cOutput", output.FloatOutput, cg.Component)
+
+CONFIG_SCHEMA = cv.All(
+    output.FLOAT_OUTPUT_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(X9cOutput),
+            cv.Required(CONF_CS_PIN): pins.internal_gpio_output_pin_schema,
+            cv.Required(CONF_INC_PIN): pins.internal_gpio_output_pin_schema,
+            cv.Required(CONF_UD_PIN): pins.internal_gpio_output_pin_schema,
+            cv.Optional(CONF_INITIAL_VALUE, default=1.0): cv.float_range(
+                min=0.01, max=1.0
+            ),
+        }
+    )
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await output.register_output(var, config)
+
+    cs_pin = await cg.gpio_pin_expression(config[CONF_CS_PIN])
+    cg.add(var.set_cs_pin(cs_pin))
+    inc_pin = await cg.gpio_pin_expression(config[CONF_INC_PIN])
+    cg.add(var.set_inc_pin(inc_pin))
+    ud_pin = await cg.gpio_pin_expression(config[CONF_UD_PIN])
+    cg.add(var.set_ud_pin(ud_pin))
+
+    cg.add(var.set_initial_value(config[CONF_INITIAL_VALUE]))
diff --git a/esphome/components/x9c/x9c.cpp b/esphome/components/x9c/x9c.cpp
new file mode 100644
index 0000000000..ff7777e71f
--- /dev/null
+++ b/esphome/components/x9c/x9c.cpp
@@ -0,0 +1,72 @@
+#include "x9c.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace x9c {
+
+static const char *const TAG = "x9c.output";
+
+void X9cOutput::trim_value(int change_amount) {
+  if (change_amount > 0) {  // Set change direction
+    this->ud_pin_->digital_write(true);
+  } else {
+    this->ud_pin_->digital_write(false);
+  }
+
+  this->inc_pin_->digital_write(true);
+  this->cs_pin_->digital_write(false);  // Select chip
+
+  for (int i = 0; i < abs(change_amount); i++) {  // Move wiper
+    this->inc_pin_->digital_write(true);
+    delayMicroseconds(1);
+    this->inc_pin_->digital_write(false);
+    delayMicroseconds(1);
+  }
+
+  delayMicroseconds(100);  // Let value settle
+
+  this->inc_pin_->digital_write(false);
+  this->cs_pin_->digital_write(true);  // Deselect chip safely (no save)
+}
+
+void X9cOutput::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up X9C Potentiometer with initial value of %f", this->initial_value_);
+
+  this->inc_pin_->get_pin();
+  this->inc_pin_->setup();
+  this->inc_pin_->digital_write(false);
+
+  this->cs_pin_->get_pin();
+  this->cs_pin_->setup();
+  this->cs_pin_->digital_write(true);
+
+  this->ud_pin_->get_pin();
+  this->ud_pin_->setup();
+
+  if (this->initial_value_ <= 0.50) {
+    this->trim_value(-101);  // Set min value (beyond 0)
+    this->trim_value((int) (this->initial_value_ * 100));
+  } else {
+    this->trim_value(101);  // Set max value (beyond 100)
+    this->trim_value((int) (this->initial_value_ * 100) - 100);
+  }
+  this->pot_value_ = this->initial_value_;
+  this->write_state(this->initial_value_);
+}
+
+void X9cOutput::write_state(float state) {
+  this->trim_value((int) ((state - this->pot_value_) * 100));
+  this->pot_value_ = state;
+}
+
+void X9cOutput::dump_config() {
+  ESP_LOGCONFIG(TAG, "X9C Potentiometer Output:");
+  LOG_PIN("  Chip Select Pin: ", this->cs_pin_);
+  LOG_PIN("  Increment Pin: ", this->inc_pin_);
+  LOG_PIN("  Up/Down Pin: ", this->ud_pin_);
+  ESP_LOGCONFIG(TAG, "  Initial Value: %f", this->initial_value_);
+  LOG_FLOAT_OUTPUT(this);
+}
+
+}  // namespace x9c
+}  // namespace esphome
diff --git a/esphome/components/x9c/x9c.h b/esphome/components/x9c/x9c.h
new file mode 100644
index 0000000000..924460c841
--- /dev/null
+++ b/esphome/components/x9c/x9c.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/components/output/float_output.h"
+
+namespace esphome {
+namespace x9c {
+
+class X9cOutput : public output::FloatOutput, public Component {
+ public:
+  void set_cs_pin(InternalGPIOPin *pin) { cs_pin_ = pin; }
+  void set_inc_pin(InternalGPIOPin *pin) { inc_pin_ = pin; }
+  void set_ud_pin(InternalGPIOPin *pin) { ud_pin_ = pin; }
+  void set_initial_value(float initial_value) { initial_value_ = initial_value; }
+
+  void setup() override;
+  void dump_config() override;
+
+  void trim_value(int change_amount);
+
+ protected:
+  void write_state(float state) override;
+  InternalGPIOPin *cs_pin_;
+  InternalGPIOPin *inc_pin_;
+  InternalGPIOPin *ud_pin_;
+  float initial_value_;
+  float pot_value_;
+};
+
+}  // namespace x9c
+}  // namespace esphome
diff --git a/esphome/const.py b/esphome/const.py
index 75c686188f..b98126ed34 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -307,6 +307,7 @@ CONF_ILLUMINANCE = "illuminance"
 CONF_IMPEDANCE = "impedance"
 CONF_IMPORT_ACTIVE_ENERGY = "import_active_energy"
 CONF_IMPORT_REACTIVE_ENERGY = "import_reactive_energy"
+CONF_INC_PIN = "inc_pin"
 CONF_INCLUDE_INTERNAL = "include_internal"
 CONF_INCLUDES = "includes"
 CONF_INDEX = "index"
@@ -742,6 +743,7 @@ CONF_TX_POWER = "tx_power"
 CONF_TYPE = "type"
 CONF_TYPE_ID = "type_id"
 CONF_UART_ID = "uart_id"
+CONF_UD_PIN = "ud_pin"
 CONF_UID = "uid"
 CONF_UNIQUE = "unique"
 CONF_UNIT_OF_MEASUREMENT = "unit_of_measurement"
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 2137fd442d..53ef50d809 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1713,6 +1713,12 @@ output:
     id: bp5758d_warmwhite
     channel: 4
     current: 10
+  - platform: x9c
+    id: test_x9c
+    cs_pin: GPIO25
+    inc_pin: GPIO26
+    ud_pin: GPIO27
+    initial_value: 0.5
 
 e131:
 

From 86a8e1f4a65c863d55fcf5e66584887186e12cf5 Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Wed, 11 Jan 2023 02:55:02 +0100
Subject: [PATCH 438/838] small DisplayBuffer images and font update (#4044)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/animation/__init__.py      |  2 +-
 esphome/components/display/display_buffer.cpp |  5 +++--
 esphome/components/display/display_buffer.h   | 10 +++++++---
 esphome/components/image/__init__.py          |  5 +++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/esphome/components/animation/__init__.py b/esphome/components/animation/__init__.py
index 87d72254e8..ce9f057496 100644
--- a/esphome/components/animation/__init__.py
+++ b/esphome/components/animation/__init__.py
@@ -117,7 +117,7 @@ async def to_code(config):
                 data[pos] = rgb & 255
                 pos += 1
 
-    elif config[CONF_TYPE] == "BINARY":
+    elif config[CONF_TYPE] in ["BINARY", "TRANSPARENT_BINARY"]:
         width8 = ((width + 7) // 8) * 8
         data = [0 for _ in range((height * width8 // 8) * frames)]
         for frameIndex in range(frames):
diff --git a/esphome/components/display/display_buffer.cpp b/esphome/components/display/display_buffer.cpp
index 97c08dae24..cfd73509ea 100644
--- a/esphome/components/display/display_buffer.cpp
+++ b/esphome/components/display/display_buffer.cpp
@@ -452,7 +452,7 @@ int Font::match_next_glyph(const char *str, int *match_length) {
 }
 void Font::measure(const char *str, int *width, int *x_offset, int *baseline, int *height) {
   *baseline = this->baseline_;
-  *height = this->bottom_;
+  *height = this->height_;
   int i = 0;
   int min_x = 0;
   bool has_char = false;
@@ -483,7 +483,7 @@ void Font::measure(const char *str, int *width, int *x_offset, int *baseline, in
   *width = x - min_x;
 }
 const std::vector<Glyph> &Font::get_glyphs() const { return this->glyphs_; }
-Font::Font(const GlyphData *data, int data_nr, int baseline, int bottom) : baseline_(baseline), bottom_(bottom) {
+Font::Font(const GlyphData *data, int data_nr, int baseline, int height) : baseline_(baseline), height_(height) {
   for (int i = 0; i < data_nr; ++i)
     glyphs_.emplace_back(data + i);
 }
@@ -527,6 +527,7 @@ int Image::get_height() const { return this->height_; }
 ImageType Image::get_type() const { return this->type_; }
 Image::Image(const uint8_t *data_start, int width, int height, ImageType type)
     : width_(width), height_(height), type_(type), data_start_(data_start) {}
+int Image::get_current_frame() const { return 0; }
 
 bool Animation::get_pixel(int x, int y) const {
   if (x < 0 || x >= this->width_ || y < 0 || y >= this->height_)
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index 41052b3ffd..b652989067 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -448,18 +448,20 @@ class Font {
    * @param baseline The y-offset from the top of the text to the baseline.
    * @param bottom The y-offset from the top of the text to the bottom (i.e. height).
    */
-  Font(const GlyphData *data, int data_nr, int baseline, int bottom);
+  Font(const GlyphData *data, int data_nr, int baseline, int height);
 
   int match_next_glyph(const char *str, int *match_length);
 
   void measure(const char *str, int *width, int *x_offset, int *baseline, int *height);
+  inline int get_baseline() { return this->baseline_; }
+  inline int get_height() { return this->height_; }
 
   const std::vector<Glyph> &get_glyphs() const;
 
  protected:
   std::vector<Glyph> glyphs_;
   int baseline_;
-  int bottom_;
+  int height_;
 };
 
 class Image {
@@ -473,6 +475,8 @@ class Image {
   int get_height() const;
   ImageType get_type() const;
 
+  virtual int get_current_frame() const;
+
  protected:
   int width_;
   int height_;
@@ -489,7 +493,7 @@ class Animation : public Image {
   Color get_grayscale_pixel(int x, int y) const override;
 
   int get_animation_frame_count() const;
-  int get_current_frame() const;
+  int get_current_frame() const override;
   void next_frame();
   void prev_frame();
 
diff --git a/esphome/components/image/__init__.py b/esphome/components/image/__init__.py
index 0004391f20..88c625961b 100644
--- a/esphome/components/image/__init__.py
+++ b/esphome/components/image/__init__.py
@@ -26,6 +26,7 @@ IMAGE_TYPE = {
     "RGB24": ImageType.IMAGE_TYPE_RGB24,
     "TRANSPARENT_BINARY": ImageType.IMAGE_TYPE_TRANSPARENT_BINARY,
     "RGB565": ImageType.IMAGE_TYPE_RGB565,
+    "TRANSPARENT_IMAGE": ImageType.IMAGE_TYPE_TRANSPARENT_BINARY,
 }
 
 Image_ = display.display_ns.class_("Image")
@@ -105,7 +106,7 @@ async def to_code(config):
             data[pos] = rgb & 255
             pos += 1
 
-    elif config[CONF_TYPE] == "BINARY":
+    elif (config[CONF_TYPE] == "BINARY") or (config[CONF_TYPE] == "TRANSPARENT_BINARY"):
         image = image.convert("1", dither=dither)
         width8 = ((width + 7) // 8) * 8
         data = [0 for _ in range(height * width8 // 8)]
@@ -116,7 +117,7 @@ async def to_code(config):
                 pos = x + y * width8
                 data[pos // 8] |= 0x80 >> (pos % 8)
 
-    elif config[CONF_TYPE] == "TRANSPARENT_BINARY":
+    elif config[CONF_TYPE] == "TRANSPARENT_IMAGE":
         image = image.convert("RGBA")
         width8 = ((width + 7) // 8) * 8
         data = [0 for _ in range(height * width8 // 8)]

From 351ea045175c7f9fbd1afc3ff51cf1b61098a416 Mon Sep 17 00:00:00 2001
From: Adam Liddell <git@aliddell.com>
Date: Wed, 11 Jan 2023 03:31:04 +0000
Subject: [PATCH 439/838] Fix use of dangling pointers in esp-idf MQTT backend
 (#4239)

fixes https://github.com/esphome/issues/issues/3406
---
 esphome/components/mqtt/mqtt_backend_idf.cpp | 30 ++++++++-----------
 esphome/components/mqtt/mqtt_backend_idf.h   | 31 ++++++++++++++++++--
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/esphome/components/mqtt/mqtt_backend_idf.cpp b/esphome/components/mqtt/mqtt_backend_idf.cpp
index 0726f72567..812e36d522 100644
--- a/esphome/components/mqtt/mqtt_backend_idf.cpp
+++ b/esphome/components/mqtt/mqtt_backend_idf.cpp
@@ -69,7 +69,7 @@ void MQTTBackendIDF::loop() {
   }
 }
 
-void MQTTBackendIDF::mqtt_event_handler_(const esp_mqtt_event_t &event) {
+void MQTTBackendIDF::mqtt_event_handler_(const Event &event) {
   ESP_LOGV(TAG, "Event dispatched from event loop event_id=%d", event.event_id);
   switch (event.event_id) {
     case MQTT_EVENT_BEFORE_CONNECT:
@@ -104,28 +104,24 @@ void MQTTBackendIDF::mqtt_event_handler_(const esp_mqtt_event_t &event) {
       break;
     case MQTT_EVENT_DATA: {
       static std::string topic;
-      if (event.topic) {
-        // not 0 terminated - create a string from it
-        topic = std::string(event.topic, event.topic_len);
+      if (event.topic.length() > 0) {
+        topic = event.topic;
       }
       ESP_LOGV(TAG, "MQTT_EVENT_DATA %s", topic.c_str());
-      auto data_len = event.data_len;
-      if (data_len == 0)
-        data_len = strlen(event.data);
-      this->on_message_.call(event.topic ? const_cast<char *>(topic.c_str()) : nullptr, event.data, data_len,
+      this->on_message_.call(event.topic.length() > 0 ? topic.c_str() : nullptr, event.data.data(), event.data.size(),
                              event.current_data_offset, event.total_data_len);
     } break;
     case MQTT_EVENT_ERROR:
       ESP_LOGE(TAG, "MQTT_EVENT_ERROR");
-      if (event.error_handle->error_type == MQTT_ERROR_TYPE_TCP_TRANSPORT) {
-        ESP_LOGE(TAG, "Last error code reported from esp-tls: 0x%x", event.error_handle->esp_tls_last_esp_err);
-        ESP_LOGE(TAG, "Last tls stack error number: 0x%x", event.error_handle->esp_tls_stack_err);
-        ESP_LOGE(TAG, "Last captured errno : %d (%s)", event.error_handle->esp_transport_sock_errno,
-                 strerror(event.error_handle->esp_transport_sock_errno));
-      } else if (event.error_handle->error_type == MQTT_ERROR_TYPE_CONNECTION_REFUSED) {
-        ESP_LOGE(TAG, "Connection refused error: 0x%x", event.error_handle->connect_return_code);
+      if (event.error_handle.error_type == MQTT_ERROR_TYPE_TCP_TRANSPORT) {
+        ESP_LOGE(TAG, "Last error code reported from esp-tls: 0x%x", event.error_handle.esp_tls_last_esp_err);
+        ESP_LOGE(TAG, "Last tls stack error number: 0x%x", event.error_handle.esp_tls_stack_err);
+        ESP_LOGE(TAG, "Last captured errno : %d (%s)", event.error_handle.esp_transport_sock_errno,
+                 strerror(event.error_handle.esp_transport_sock_errno));
+      } else if (event.error_handle.error_type == MQTT_ERROR_TYPE_CONNECTION_REFUSED) {
+        ESP_LOGE(TAG, "Connection refused error: 0x%x", event.error_handle.connect_return_code);
       } else {
-        ESP_LOGE(TAG, "Unknown error type: 0x%x", event.error_handle->error_type);
+        ESP_LOGE(TAG, "Unknown error type: 0x%x", event.error_handle.error_type);
       }
       break;
     default:
@@ -140,7 +136,7 @@ void MQTTBackendIDF::mqtt_event_handler(void *handler_args, esp_event_base_t bas
   // queue event to decouple processing
   if (instance) {
     auto event = *static_cast<esp_mqtt_event_t *>(event_data);
-    instance->mqtt_events_.push(event);
+    instance->mqtt_events_.push(Event(event));
   }
 }
 
diff --git a/esphome/components/mqtt/mqtt_backend_idf.h b/esphome/components/mqtt/mqtt_backend_idf.h
index 77b5592d72..900ee9709b 100644
--- a/esphome/components/mqtt/mqtt_backend_idf.h
+++ b/esphome/components/mqtt/mqtt_backend_idf.h
@@ -12,6 +12,33 @@
 namespace esphome {
 namespace mqtt {
 
+struct Event {
+  esp_mqtt_event_id_t event_id;
+  std::vector<char> data;
+  int total_data_len;
+  int current_data_offset;
+  std::string topic;
+  int msg_id;
+  bool retain;
+  int qos;
+  bool dup;
+  esp_mqtt_error_codes_t error_handle;
+
+  // Construct from esp_mqtt_event_t
+  // Any pointer values that are unsafe to keep are converted to safe copies
+  Event(const esp_mqtt_event_t &event)
+      : event_id(event.event_id),
+        data(event.data, event.data + event.data_len),
+        total_data_len(event.total_data_len),
+        current_data_offset(event.current_data_offset),
+        topic(event.topic, event.topic_len),
+        msg_id(event.msg_id),
+        retain(event.retain),
+        qos(event.qos),
+        dup(event.dup),
+        error_handle(*event.error_handle) {}
+};
+
 class MQTTBackendIDF final : public MQTTBackend {
  public:
   static const size_t MQTT_BUFFER_SIZE = 4096;
@@ -99,7 +126,7 @@ class MQTTBackendIDF final : public MQTTBackend {
 
  protected:
   bool initialize_();
-  void mqtt_event_handler_(const esp_mqtt_event_t &event);
+  void mqtt_event_handler_(const Event &event);
   static void mqtt_event_handler(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data);
 
   struct MqttClientDeleter {
@@ -134,7 +161,7 @@ class MQTTBackendIDF final : public MQTTBackend {
   CallbackManager<on_unsubscribe_callback_t> on_unsubscribe_;
   CallbackManager<on_message_callback_t> on_message_;
   CallbackManager<on_publish_user_callback_t> on_publish_;
-  std::queue<esp_mqtt_event_t> mqtt_events_;
+  std::queue<Event> mqtt_events_;
 };
 
 }  // namespace mqtt

From ed4a7210d3e1be2dc470919a802e8f1084c71199 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 15 Jan 2023 14:24:32 -1000
Subject: [PATCH 440/838] Ensure we never write zero bytes (#4284)

---
 esphome/components/api/api_frame_helper.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/esphome/components/api/api_frame_helper.cpp b/esphome/components/api/api_frame_helper.cpp
index b19a55764f..c18e045a99 100644
--- a/esphome/components/api/api_frame_helper.cpp
+++ b/esphome/components/api/api_frame_helper.cpp
@@ -616,6 +616,9 @@ APIError APINoiseFrameHelper::write_frame_(const uint8_t *data, size_t len) {
   struct iovec iov[2];
   iov[0].iov_base = header;
   iov[0].iov_len = 3;
+  if (len == 0) {
+    return write_raw_(iov, 1);
+  }
   iov[1].iov_base = const_cast<uint8_t *>(data);
   iov[1].iov_len = len;
 
@@ -913,6 +916,9 @@ APIError APIPlaintextFrameHelper::write_packet(uint16_t type, const uint8_t *pay
   struct iovec iov[2];
   iov[0].iov_base = &header[0];
   iov[0].iov_len = header.size();
+  if (payload_len == 0) {
+    return write_raw_(iov, 1);
+  }
   iov[1].iov_base = const_cast<uint8_t *>(payload);
   iov[1].iov_len = payload_len;
 

From a9b7d981949d36e542a3e0644911320136db961c Mon Sep 17 00:00:00 2001
From: Joe <madcoder@gmail.com>
Date: Sun, 15 Jan 2023 19:27:34 -0500
Subject: [PATCH 441/838] Fix off-by-one bedjet fan speed (#3873) (#4292)

fixes https://github.com/esphome/issues/issues/3873
---
 esphome/components/bedjet/fan/bedjet_fan.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/esphome/components/bedjet/fan/bedjet_fan.cpp b/esphome/components/bedjet/fan/bedjet_fan.cpp
index 02ac289e0e..e272241040 100644
--- a/esphome/components/bedjet/fan/bedjet_fan.cpp
+++ b/esphome/components/bedjet/fan/bedjet_fan.cpp
@@ -37,9 +37,13 @@ void BedJetFan::control(const fan::FanCall &call) {
 
   // ignore speed changes if not on or turning on
   if (this->state && call.get_speed().has_value()) {
-    this->speed = *call.get_speed();
-    this->parent_->set_fan_index(this->speed);
-    did_change = true;
+    auto speed = *call.get_speed();
+    if (speed >= 1) {
+      this->speed = speed;
+      // Fan.speed is 1-20, but Bedjet expects 0-19, so subtract 1
+      this->parent_->set_fan_index(this->speed - 1);
+      did_change = true;
+    }
   }
 
   if (did_change) {
@@ -57,8 +61,9 @@ void BedJetFan::on_status(const BedjetStatusPacket *data) {
     did_change = true;
   }
 
-  if (data->fan_step != this->speed) {
-    this->speed = data->fan_step;
+  // BedjetStatusPacket.fan_step is in range 0-19, but Fan.speed wants 1-20.
+  if (data->fan_step + 1 != this->speed) {
+    this->speed = data->fan_step + 1;
     did_change = true;
   }
 

From 27185265f6f350decd7842e238f8d8ba4ad57093 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sun, 15 Jan 2023 19:31:03 -0500
Subject: [PATCH 442/838] Clean up dashboard ping result post-rename/delete
 (#4170)

---
 esphome/dashboard/dashboard.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index c224990319..d995614c2a 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -281,8 +281,11 @@ class EsphomeLogsHandler(EsphomeCommandWebSocket):
 
 
 class EsphomeRenameHandler(EsphomeCommandWebSocket):
+    old_name: str
+
     def build_command(self, json_message):
         config_file = settings.rel_path(json_message["configuration"])
+        self.old_name = json_message["configuration"]
         return [
             "esphome",
             "--dashboard",
@@ -291,6 +294,15 @@ class EsphomeRenameHandler(EsphomeCommandWebSocket):
             json_message["newName"],
         ]
 
+    def _proc_on_exit(self, returncode):
+        super()._proc_on_exit(returncode)
+
+        if returncode != 0:
+            return
+
+        # Remove the old ping result from the cache
+        PING_RESULT.pop(self.old_name, None)
+
 
 class EsphomeUploadHandler(EsphomeCommandWebSocket):
     def build_command(self, json_message):
@@ -859,6 +871,9 @@ class DeleteRequestHandler(BaseHandler):
             if build_folder is not None:
                 shutil.rmtree(build_folder, os.path.join(trash_path, name))
 
+        # Remove the old ping result from the cache
+        PING_RESULT.pop(configuration, None)
+
 
 class UndoDeleteRequestHandler(BaseHandler):
     @authenticated

From a45646af1bf0985f4376dcf017559662113ee5fd Mon Sep 17 00:00:00 2001
From: tradeJmark <tim@timmeredith.com>
Date: Sun, 15 Jan 2023 21:17:57 -0400
Subject: [PATCH 443/838] Calculate PWM wrap dynamically whenever the frequency
 is changed (#4294)

fixes https://github.com/esphome/issues/issues/3841
---
 esphome/components/rp2040_pwm/rp2040_pwm.cpp | 13 ++++++++++---
 esphome/components/rp2040_pwm/rp2040_pwm.h   |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/esphome/components/rp2040_pwm/rp2040_pwm.cpp b/esphome/components/rp2040_pwm/rp2040_pwm.cpp
index 664a3734f7..3c5591885e 100644
--- a/esphome/components/rp2040_pwm/rp2040_pwm.cpp
+++ b/esphome/components/rp2040_pwm/rp2040_pwm.cpp
@@ -9,6 +9,7 @@
 #include <hardware/clocks.h>
 #include <hardware/gpio.h>
 #include <hardware/pwm.h>
+#include <cmath>
 
 namespace esphome {
 namespace rp2040_pwm {
@@ -23,8 +24,14 @@ void RP2040PWM::setup() {
 
 void RP2040PWM::setup_pwm_() {
   pwm_config config = pwm_get_default_config();
-  pwm_config_set_clkdiv(&config, clock_get_hz(clk_sys) / (255.0f * this->frequency_));
-  pwm_config_set_wrap(&config, 254);
+
+  uint32_t clock = clock_get_hz(clk_sys);
+  float divider = ceil(clock / (4096 * this->frequency_)) / 16.0f;
+  uint16_t wrap = clock / divider / this->frequency_ - 1;
+  this->wrap_ = wrap;
+
+  pwm_config_set_clkdiv(&config, divider);
+  pwm_config_set_wrap(&config, wrap);
   pwm_init(pwm_gpio_to_slice_num(this->pin_->get_pin()), &config, true);
 }
 
@@ -48,7 +55,7 @@ void HOT RP2040PWM::write_state(float state) {
   }
 
   gpio_set_function(this->pin_->get_pin(), GPIO_FUNC_PWM);
-  pwm_set_gpio_level(this->pin_->get_pin(), state * 255.0f);
+  pwm_set_gpio_level(this->pin_->get_pin(), state * this->wrap_);
 }
 
 }  // namespace rp2040_pwm
diff --git a/esphome/components/rp2040_pwm/rp2040_pwm.h b/esphome/components/rp2040_pwm/rp2040_pwm.h
index 9c88826ae9..e499e72b06 100644
--- a/esphome/components/rp2040_pwm/rp2040_pwm.h
+++ b/esphome/components/rp2040_pwm/rp2040_pwm.h
@@ -34,6 +34,7 @@ class RP2040PWM : public output::FloatOutput, public Component {
 
   InternalGPIOPin *pin_;
   float frequency_{1000.0};
+  uint16_t wrap_{65535};
   /// Cache last output level for dynamic frequency updating
   float last_output_{0.0};
   bool frequency_changed_{false};

From 3d2d681a7bd3313434e1a69922e95ce79babaa82 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 16 Jan 2023 17:32:15 +1300
Subject: [PATCH 444/838] Remove baud check in tuya dump_config (#4298)

---
 esphome/components/tuya/tuya.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/esphome/components/tuya/tuya.cpp b/esphome/components/tuya/tuya.cpp
index 7b580986e1..89a687e5a6 100644
--- a/esphome/components/tuya/tuya.cpp
+++ b/esphome/components/tuya/tuya.cpp
@@ -66,7 +66,6 @@ void Tuya::dump_config() {
     LOG_PIN("  Status Pin: ", this->status_pin_.value());
   }
   ESP_LOGCONFIG(TAG, "  Product: '%s'", this->product_.c_str());
-  this->check_uart_settings(9600);
 }
 
 bool Tuya::validate_message_() {

From c301ae3645fec945ef907be1314198f2e6411bd9 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 17 Jan 2023 10:28:09 +1300
Subject: [PATCH 445/838] Add friendly_name to device (#4296)

---
 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 +
 .../components/dashboard_import/__init__.py   | 27 +++++++++++------
 esphome/components/mdns/mdns_component.cpp    |  3 ++
 esphome/components/web_server/web_server.cpp  |  2 +-
 esphome/const.py                              |  1 +
 esphome/core/__init__.py                      |  3 ++
 esphome/core/application.h                    | 13 +++++++-
 esphome/core/config.py                        |  4 +++
 esphome/dashboard/dashboard.py                | 30 +++++++++++++++++--
 esphome/dashboard/util.py                     | 23 ++++++++++++++
 esphome/storage_json.py                       | 12 +++++++-
 esphome/wizard.py                             | 14 +++++++--
 esphome/zeroconf.py                           |  6 ++++
 requirements.txt                              |  2 +-
 tests/dummy_main.cpp                          |  2 +-
 18 files changed, 137 insertions(+), 18 deletions(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index e1bc7b0a57..013bb123f9 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -206,6 +206,8 @@ message DeviceInfoResponse {
   uint32 bluetooth_proxy_version = 11;
 
   string manufacturer = 12;
+
+  string friendly_name = 13;
 }
 
 message ListEntitiesRequest {
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index aac58587d1..65659941d6 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -930,6 +930,7 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
   DeviceInfoResponse resp{};
   resp.uses_password = this->parent_->uses_password();
   resp.name = App.get_name();
+  resp.friendly_name = App.get_friendly_name();
   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 f108d38e8f..67c011e76c 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -628,6 +628,10 @@ bool DeviceInfoResponse::decode_length(uint32_t field_id, ProtoLengthDelimited v
       this->manufacturer = value.as_string();
       return true;
     }
+    case 13: {
+      this->friendly_name = value.as_string();
+      return true;
+    }
     default:
       return false;
   }
@@ -645,6 +649,7 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(10, this->webserver_port);
   buffer.encode_uint32(11, this->bluetooth_proxy_version);
   buffer.encode_string(12, this->manufacturer);
+  buffer.encode_string(13, this->friendly_name);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DeviceInfoResponse::dump_to(std::string &out) const {
@@ -699,6 +704,10 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   out.append("  manufacturer: ");
   out.append("'").append(this->manufacturer).append("'");
   out.append("\n");
+
+  out.append("  friendly_name: ");
+  out.append("'").append(this->friendly_name).append("'");
+  out.append("\n");
   out.append("}");
 }
 #endif
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 8a78f1ad03..3b804f1de7 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -276,6 +276,7 @@ class DeviceInfoResponse : public ProtoMessage {
   uint32_t webserver_port{0};
   uint32_t bluetooth_proxy_version{0};
   std::string manufacturer{};
+  std::string friendly_name{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
diff --git a/esphome/components/dashboard_import/__init__.py b/esphome/components/dashboard_import/__init__.py
index 0eb65579f9..d377c257a7 100644
--- a/esphome/components/dashboard_import/__init__.py
+++ b/esphome/components/dashboard_import/__init__.py
@@ -1,14 +1,15 @@
 from pathlib import Path
+from typing import Optional
+
 import requests
 
 import esphome.codegen as cg
 import esphome.config_validation as cv
+from esphome import git
 from esphome.components.packages import validate_source_shorthand
-from esphome.const import CONF_WIFI, CONF_REF
+from esphome.const import CONF_REF, CONF_WIFI
 from esphome.wizard import wizard_file
 from esphome.yaml_util import dump
-from esphome import git
-
 
 dashboard_import_ns = cg.esphome_ns.namespace("dashboard_import")
 
@@ -66,7 +67,12 @@ async def to_code(config):
 
 
 def import_config(
-    path: str, name: str, project_name: str, import_url: str, network: str = CONF_WIFI
+    path: str,
+    name: str,
+    friendly_name: Optional[str],
+    project_name: str,
+    import_url: str,
+    network: str = CONF_WIFI,
 ) -> None:
     p = Path(path)
 
@@ -77,6 +83,7 @@ def import_config(
         p.write_text(
             wizard_file(
                 name=name,
+                friendly_name=friendly_name,
                 platform="ESP32" if "esp32" in import_url else "ESP8266",
                 board="esp32dev" if "esp32" in import_url else "esp01_1m",
                 ssid="!secret wifi_ssid",
@@ -98,13 +105,15 @@ def import_config(
             p.write_text(req.text, encoding="utf8")
 
         else:
+            substitutions = {"name": name}
+            esphome_core = {"name": "${name}", "name_add_mac_suffix": False}
+            if friendly_name:
+                substitutions["friendly_name"] = friendly_name
+                esphome_core["friendly_name"] = "${friendly_name}"
             config = {
-                "substitutions": {"name": name},
+                "substitutions": substitutions,
                 "packages": {project_name: import_url},
-                "esphome": {
-                    "name": "${name}",
-                    "name_add_mac_suffix": False,
-                },
+                "esphome": esphome_core,
             }
             output = dump(config)
 
diff --git a/esphome/components/mdns/mdns_component.cpp b/esphome/components/mdns/mdns_component.cpp
index a3f38322b3..db47c8823c 100644
--- a/esphome/components/mdns/mdns_component.cpp
+++ b/esphome/components/mdns/mdns_component.cpp
@@ -30,6 +30,9 @@ void MDNSComponent::compile_records_() {
     service.service_type = "_esphomelib";
     service.proto = "_tcp";
     service.port = api::global_api_server->get_port();
+    if (App.get_friendly_name().empty()) {
+      service.txt_records.push_back({"friendly_name", App.get_friendly_name()});
+    }
     service.txt_records.push_back({"version", ESPHOME_VERSION});
     service.txt_records.push_back({"mac", get_mac_address()});
     const char *platform = nullptr;
diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index 1f043b43fc..ad9ced0614 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -104,7 +104,7 @@ void WebServer::setup() {
     // Configure reconnect timeout and send config
 
     client->send(json::build_json([this](JsonObject root) {
-                   root["title"] = App.get_name();
+                   root["title"] = App.get_friendly_name().empty() ? App.get_name() : App.get_friendly_name();
                    root["ota"] = this->allow_ota_;
                    root["lang"] = "en";
                  }).c_str(),
diff --git a/esphome/const.py b/esphome/const.py
index b98126ed34..3799e55e35 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -260,6 +260,7 @@ CONF_FRAGMENTATION = "fragmentation"
 CONF_FRAMEWORK = "framework"
 CONF_FREE = "free"
 CONF_FREQUENCY = "frequency"
+CONF_FRIENDLY_NAME = "friendly_name"
 CONF_FROM = "from"
 CONF_FULL_SPECTRUM = "full_spectrum"
 CONF_FULL_UPDATE_EVERY = "full_update_every"
diff --git a/esphome/core/__init__.py b/esphome/core/__init__.py
index 09115c2791..545fae381f 100644
--- a/esphome/core/__init__.py
+++ b/esphome/core/__init__.py
@@ -453,6 +453,8 @@ class EsphomeCore:
         self.ace = False
         # The name of the node
         self.name: Optional[str] = None
+        # The friendly name of the node
+        self.friendly_name: 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 = {}
@@ -492,6 +494,7 @@ class EsphomeCore:
     def reset(self):
         self.dashboard = False
         self.name = None
+        self.friendly_name = None
         self.data = {}
         self.config_path = None
         self.build_path = None
diff --git a/esphome/core/application.h b/esphome/core/application.h
index 6376987f66..eaae34635f 100644
--- a/esphome/core/application.h
+++ b/esphome/core/application.h
@@ -53,13 +53,20 @@ namespace esphome {
 
 class Application {
  public:
-  void pre_setup(const std::string &name, const char *compilation_time, bool name_add_mac_suffix) {
+  void pre_setup(const std::string &name, const std::string &friendly_name, 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) {
       this->name_ = name + "-" + get_mac_address().substr(6);
+      if (friendly_name.empty()) {
+        this->friendly_name_ = "";
+      } else {
+        this->friendly_name_ = friendly_name + " " + get_mac_address().substr(6);
+      }
     } else {
       this->name_ = name;
+      this->friendly_name_ = friendly_name;
     }
     this->compilation_time_ = compilation_time;
   }
@@ -134,6 +141,9 @@ class Application {
   /// Get the name of this Application set by set_name().
   const std::string &get_name() const { return this->name_; }
 
+  /// Get the friendly name of this Application set by set_friendly_name().
+  const std::string &get_friendly_name() const { return this->friendly_name_; }
+
   bool is_name_add_mac_suffix_enabled() const { return this->name_add_mac_suffix_; }
 
   const std::string &get_compilation_time() const { return this->compilation_time_; }
@@ -338,6 +348,7 @@ class Application {
 #endif
 
   std::string name_;
+  std::string friendly_name_;
   std::string compilation_time_;
   bool name_add_mac_suffix_;
   uint32_t last_loop_{0};
diff --git a/esphome/core/config.py b/esphome/core/config.py
index bf0beea2ef..2057ad356e 100644
--- a/esphome/core/config.py
+++ b/esphome/core/config.py
@@ -19,6 +19,7 @@ from esphome.const import (
     CONF_LIBRARIES,
     CONF_MIN_VERSION,
     CONF_NAME,
+    CONF_FRIENDLY_NAME,
     CONF_ON_BOOT,
     CONF_ON_LOOP,
     CONF_ON_SHUTDOWN,
@@ -124,6 +125,7 @@ CONFIG_SCHEMA = cv.All(
     cv.Schema(
         {
             cv.Required(CONF_NAME): cv.valid_name,
+            cv.Optional(CONF_FRIENDLY_NAME, ""): cv.string,
             cv.Optional(CONF_COMMENT): cv.string,
             cv.Required(CONF_BUILD_PATH): cv.string,
             cv.Optional(CONF_PLATFORMIO_OPTIONS, default={}): cv.Schema(
@@ -192,6 +194,7 @@ def preload_core_config(config, result):
         conf = PRELOAD_CONFIG_SCHEMA(config[CONF_ESPHOME])
 
     CORE.name = conf[CONF_NAME]
+    CORE.friendly_name = conf.get(CONF_FRIENDLY_NAME, CORE.name)
     CORE.data[KEY_CORE] = {}
 
     if CONF_BUILD_PATH not in conf:
@@ -346,6 +349,7 @@ async def to_code(config):
     cg.add(
         cg.App.pre_setup(
             config[CONF_NAME],
+            config[CONF_FRIENDLY_NAME],
             cg.RawExpression('__DATE__ ", " __TIME__'),
             config[CONF_NAME_ADD_MAC_SUFFIX],
         )
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index d995614c2a..0c12640a2e 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -40,7 +40,7 @@ from esphome.storage_json import (
 from esphome.util import get_serial_ports, shlex_quote
 from esphome.zeroconf import DashboardImportDiscovery, DashboardStatus, EsphomeZeroconf
 
-from .util import password_hash
+from .util import password_hash, friendly_name_slugify
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -390,12 +390,24 @@ class WizardRequestHandler(BaseHandler):
             for k, v in json.loads(self.request.body.decode()).items()
             if k in ("name", "platform", "board", "ssid", "psk", "password")
         }
+        if not kwargs["name"]:
+            self.set_status(422)
+            self.set_header("content-type", "application/json")
+            self.write(json.dumps({"error": "Name is required"}))
+            return
+
+        kwargs["friendly_name"] = kwargs["name"]
+        kwargs["name"] = friendly_name_slugify(kwargs["friendly_name"])
+
         kwargs["ota_password"] = secrets.token_hex(16)
         noise_psk = secrets.token_bytes(32)
         kwargs["api_encryption_key"] = base64.b64encode(noise_psk).decode()
-        destination = settings.rel_path(f"{kwargs['name']}.yaml")
+        filename = f"{kwargs['name']}.yaml"
+        destination = settings.rel_path(filename)
         wizard.wizard_write(path=destination, **kwargs)
         self.set_status(200)
+        self.set_header("content-type", "application/json")
+        self.write(json.dumps({"configuration": filename}))
         self.finish()
 
 
@@ -407,6 +419,7 @@ class ImportRequestHandler(BaseHandler):
         args = json.loads(self.request.body.decode())
         try:
             name = args["name"]
+            friendly_name = args.get("friendly_name")
 
             imported_device = next(
                 (res for res in IMPORT_RESULT.values() if res.device_name == name), None
@@ -414,12 +427,15 @@ class ImportRequestHandler(BaseHandler):
 
             if imported_device is not None:
                 network = imported_device.network
+                if friendly_name is None:
+                    friendly_name = imported_device.friendly_name
             else:
                 network = const.CONF_WIFI
 
             import_config(
                 settings.rel_path(f"{name}.yaml"),
                 name,
+                friendly_name,
                 args["project_name"],
                 args["package_import_url"],
                 network,
@@ -434,6 +450,8 @@ class ImportRequestHandler(BaseHandler):
             return
 
         self.set_status(200)
+        self.set_header("content-type", "application/json")
+        self.write(json.dumps({"configuration": f"{name}.yaml"}))
         self.finish()
 
 
@@ -581,6 +599,12 @@ class DashboardEntry:
             return self.filename.replace(".yml", "").replace(".yaml", "")
         return self.storage.name
 
+    @property
+    def friendly_name(self):
+        if self.storage is None:
+            return self.name
+        return self.storage.friendly_name
+
     @property
     def comment(self):
         if self.storage is None:
@@ -628,6 +652,7 @@ class ListDevicesHandler(BaseHandler):
                     "configured": [
                         {
                             "name": entry.name,
+                            "friendly_name": entry.friendly_name,
                             "configuration": entry.filename,
                             "loaded_integrations": entry.loaded_integrations,
                             "deployed_version": entry.update_old,
@@ -643,6 +668,7 @@ class ListDevicesHandler(BaseHandler):
                     "importable": [
                         {
                             "name": res.device_name,
+                            "friendly_name": res.friendly_name,
                             "package_import_url": res.package_import_url,
                             "project_name": res.project_name,
                             "project_version": res.project_version,
diff --git a/esphome/dashboard/util.py b/esphome/dashboard/util.py
index 3e3864aa17..a2ad530b74 100644
--- a/esphome/dashboard/util.py
+++ b/esphome/dashboard/util.py
@@ -1,4 +1,7 @@
 import hashlib
+import unicodedata
+
+from esphome.const import ALLOWED_NAME_CHARS
 
 
 def password_hash(password: str) -> bytes:
@@ -7,3 +10,23 @@ def password_hash(password: str) -> bytes:
     Note this is not meant for secure storage, but for securely comparing passwords.
     """
     return hashlib.sha256(password.encode()).digest()
+
+
+def strip_accents(value):
+    return "".join(
+        c
+        for c in unicodedata.normalize("NFD", str(value))
+        if unicodedata.category(c) != "Mn"
+    )
+
+
+def friendly_name_slugify(value):
+    value = (
+        strip_accents(value)
+        .lower()
+        .replace(" ", "-")
+        .replace("_", "-")
+        .replace("--", "-")
+        .strip("-")
+    )
+    return "".join(c for c in value if c in ALLOWED_NAME_CHARS)
diff --git a/esphome/storage_json.py b/esphome/storage_json.py
index c2c8b91a36..bbdfbbc8a2 100644
--- a/esphome/storage_json.py
+++ b/esphome/storage_json.py
@@ -36,6 +36,7 @@ class StorageJSON:
         self,
         storage_version,
         name,
+        friendly_name,
         comment,
         esphome_version,
         src_version,
@@ -51,6 +52,8 @@ class StorageJSON:
         self.storage_version: int = storage_version
         # The name of the node
         self.name: str = name
+        # The friendly name of the node
+        self.friendly_name: str = friendly_name
         # The comment of the node
         self.comment: str = comment
         # The esphome version this was compiled with
@@ -77,6 +80,7 @@ class StorageJSON:
         return {
             "storage_version": self.storage_version,
             "name": self.name,
+            "friendly_name": self.friendly_name,
             "comment": self.comment,
             "esphome_version": self.esphome_version,
             "src_version": self.src_version,
@@ -106,6 +110,7 @@ class StorageJSON:
         return StorageJSON(
             storage_version=1,
             name=esph.name,
+            friendly_name=esph.friendly_name,
             comment=esph.comment,
             esphome_version=const.__version__,
             src_version=1,
@@ -118,10 +123,13 @@ class StorageJSON:
         )
 
     @staticmethod
-    def from_wizard(name: str, address: str, platform: str) -> "StorageJSON":
+    def from_wizard(
+        name: str, friendly_name: str, address: str, platform: str
+    ) -> "StorageJSON":
         return StorageJSON(
             storage_version=1,
             name=name,
+            friendly_name=friendly_name,
             comment=None,
             esphome_version=None,
             src_version=1,
@@ -139,6 +147,7 @@ class StorageJSON:
             storage = json.load(f_handle)
         storage_version = storage["storage_version"]
         name = storage.get("name")
+        friendly_name = storage.get("friendly_name")
         comment = storage.get("comment")
         esphome_version = storage.get(
             "esphome_version", storage.get("esphomeyaml_version")
@@ -153,6 +162,7 @@ class StorageJSON:
         return StorageJSON(
             storage_version,
             name,
+            friendly_name,
             comment,
             esphome_version,
             src_version,
diff --git a/esphome/wizard.py b/esphome/wizard.py
index 0fcccfc3f6..fd661af639 100644
--- a/esphome/wizard.py
+++ b/esphome/wizard.py
@@ -46,6 +46,11 @@ BASE_CONFIG = """esphome:
   name: {name}
 """
 
+BASE_CONFIG_FRIENDLY = """esphome:
+  name: {name}
+  friendly_name: {friendly_name}
+"""
+
 LOGGER_API_CONFIG = """
 # Enable logging
 logger:
@@ -110,7 +115,12 @@ def wizard_file(**kwargs):
     kwargs["fallback_name"] = ap_name
     kwargs["fallback_psk"] = "".join(random.choice(letters) for _ in range(12))
 
-    config = BASE_CONFIG.format(**kwargs)
+    if kwargs.get("friendly_name"):
+        base = BASE_CONFIG_FRIENDLY
+    else:
+        base = BASE_CONFIG
+
+    config = base.format(**kwargs)
 
     config += HARDWARE_BASE_CONFIGS[kwargs["platform"]].format(**kwargs)
 
@@ -192,7 +202,7 @@ def wizard_write(path, **kwargs):
     hardware = kwargs["platform"]
 
     write_file(path, wizard_file(**kwargs))
-    storage = StorageJSON.from_wizard(name, f"{name}.local", hardware)
+    storage = StorageJSON.from_wizard(name, name, f"{name}.local", hardware)
     storage_path = ext_storage_path(os.path.dirname(path), os.path.basename(path))
     storage.save(storage_path)
 
diff --git a/esphome/zeroconf.py b/esphome/zeroconf.py
index 3743f650f3..1ba8397e14 100644
--- a/esphome/zeroconf.py
+++ b/esphome/zeroconf.py
@@ -119,10 +119,12 @@ TXT_RECORD_PACKAGE_IMPORT_URL = b"package_import_url"
 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"
 
 
 @dataclass
 class DiscoveredImport:
+    friendly_name: Optional[str]
     device_name: str
     package_import_url: str
     project_name: str
@@ -174,8 +176,12 @@ class DashboardImportDiscovery:
         project_name = info.properties[TXT_RECORD_PROJECT_NAME].decode()
         project_version = info.properties[TXT_RECORD_PROJECT_VERSION].decode()
         network = info.properties.get(TXT_RECORD_NETWORK, b"wifi").decode()
+        friendly_name = info.properties.get(TXT_RECORD_FRIENDLY_NAME)
+        if friendly_name is not None:
+            friendly_name = friendly_name.decode()
 
         self.import_state[name] = DiscoveredImport(
+            friendly_name=friendly_name,
             device_name=node_name,
             package_import_url=import_url,
             project_name=project_name,
diff --git a/requirements.txt b/requirements.txt
index 382d3fe2a0..1c5ae391e9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.1.5  # When updating platformio, also update Dockerfile
 esptool==4.4
 click==8.1.3
-esphome-dashboard==20221231.0
+esphome-dashboard==20230117.0
 aioesphomeapi==13.0.2
 zeroconf==0.47.1
 
diff --git a/tests/dummy_main.cpp b/tests/dummy_main.cpp
index 8cc1838d94..c49a67c9a2 100644
--- a/tests/dummy_main.cpp
+++ b/tests/dummy_main.cpp
@@ -12,7 +12,7 @@
 using namespace esphome;
 
 void setup() {
-  App.pre_setup("livingroom", __DATE__ ", " __TIME__, false);
+  App.pre_setup("livingroom", "LivingRoom", __DATE__ ", " __TIME__, false);
   auto *log = new logger::Logger(115200, 512);  // NOLINT
   log->pre_setup();
   log->set_uart_selection(logger::UART_SELECTION_UART0);

From 62c68f4d6072c3eb19b36a20f6d6ffffd9c59339 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Mon, 16 Jan 2023 13:36:44 -0800
Subject: [PATCH 446/838] allow multiple dsmr (#4299)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
fixes https://github.com/esphome/feature-requests/issues/2062
---
 esphome/components/dsmr/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/components/dsmr/__init__.py b/esphome/components/dsmr/__init__.py
index 284733cca6..f4f8305ba6 100644
--- a/esphome/components/dsmr/__init__.py
+++ b/esphome/components/dsmr/__init__.py
@@ -10,6 +10,8 @@ from esphome.const import (
 
 CODEOWNERS = ["@glmnet", "@zuidwijk"]
 
+MULTI_CONF = True
+
 DEPENDENCIES = ["uart"]
 AUTO_LOAD = ["sensor", "text_sensor"]
 

From 442faf92c60c76ec02368599e4e09d8c4152dbd7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Jan 2023 10:37:03 +1300
Subject: [PATCH 447/838] Bump pytest from 7.2.0 to 7.2.1 (#4300)

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 26d7c2785d..8404818c95 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -5,7 +5,7 @@ pyupgrade==3.3.0  # also change in .pre-commit-config.yaml when updating
 pre-commit
 
 # Unit tests
-pytest==7.2.0
+pytest==7.2.1
 pytest-cov==4.0.0
 pytest-mock==3.10.0
 pytest-asyncio==0.20.3

From 05420291ced2984b37c5419648c7213bf1cfce29 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Jan 2023 12:08:11 +1300
Subject: [PATCH 448/838] Bump aioesphomeapi from 13.0.2 to 13.1.0 (#4301)

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 1c5ae391e9..6ab495a797 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.5  # When updating platformio, also update Dockerfile
 esptool==4.4
 click==8.1.3
 esphome-dashboard==20230117.0
-aioesphomeapi==13.0.2
+aioesphomeapi==13.1.0
 zeroconf==0.47.1
 
 # esp-idf requires this, but doesn't bundle it by default

From 11518364a1c3e85e99471b2d46a1e85607213b02 Mon Sep 17 00:00:00 2001
From: Gil Peeters <gil@cancas.com>
Date: Tue, 17 Jan 2023 11:02:54 +1100
Subject: [PATCH 449/838] Display the configured esphome:comment on the
 WebServer (#4246)

---
 esphome/components/web_server/web_server.cpp |  9 +++++----
 esphome/core/application.h                   | 16 ++++++++++------
 esphome/core/config.py                       |  1 +
 tests/dummy_main.cpp                         | 10 +++++-----
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index ad9ced0614..513399e257 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -2,12 +2,12 @@
 
 #include "web_server.h"
 
-#include "esphome/core/log.h"
-#include "esphome/core/application.h"
-#include "esphome/core/entity_base.h"
-#include "esphome/core/util.h"
 #include "esphome/components/json/json_util.h"
 #include "esphome/components/network/util.h"
+#include "esphome/core/application.h"
+#include "esphome/core/entity_base.h"
+#include "esphome/core/log.h"
+#include "esphome/core/util.h"
 
 #include "StreamString.h"
 
@@ -105,6 +105,7 @@ void WebServer::setup() {
 
     client->send(json::build_json([this](JsonObject root) {
                    root["title"] = App.get_friendly_name().empty() ? App.get_name() : App.get_friendly_name();
+                   root["comment"] = App.get_comment();
                    root["ota"] = this->allow_ota_;
                    root["lang"] = "en";
                  }).c_str(),
diff --git a/esphome/core/application.h b/esphome/core/application.h
index eaae34635f..0992a4df39 100644
--- a/esphome/core/application.h
+++ b/esphome/core/application.h
@@ -2,11 +2,11 @@
 
 #include <string>
 #include <vector>
-#include "esphome/core/defines.h"
-#include "esphome/core/preferences.h"
 #include "esphome/core/component.h"
+#include "esphome/core/defines.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
+#include "esphome/core/preferences.h"
 #include "esphome/core/scheduler.h"
 
 #ifdef USE_BINARY_SENSOR
@@ -53,8 +53,8 @@ namespace esphome {
 
 class Application {
  public:
-  void pre_setup(const std::string &name, const std::string &friendly_name, const char *compilation_time,
-                 bool name_add_mac_suffix) {
+  void pre_setup(const std::string &name, const std::string &friendly_name, const std::string &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) {
@@ -68,6 +68,7 @@ class Application {
       this->name_ = name;
       this->friendly_name_ = friendly_name;
     }
+    this->comment_ = comment;
     this->compilation_time_ = compilation_time;
   }
 
@@ -138,11 +139,13 @@ class Application {
   /// Make a loop iteration. Call this in your loop() function.
   void loop();
 
-  /// Get the name of this Application set by set_name().
+  /// Get the name of this Application set by pre_setup().
   const std::string &get_name() const { return this->name_; }
 
-  /// Get the friendly name of this Application set by set_friendly_name().
+  /// Get the friendly name of this Application set by pre_setup().
   const std::string &get_friendly_name() const { return this->friendly_name_; }
+  /// Get the comment of this Application set by pre_setup().
+  const std::string &get_comment() const { return this->comment_; }
 
   bool is_name_add_mac_suffix_enabled() const { return this->name_add_mac_suffix_; }
 
@@ -349,6 +352,7 @@ class Application {
 
   std::string name_;
   std::string friendly_name_;
+  std::string comment_;
   std::string compilation_time_;
   bool name_add_mac_suffix_;
   uint32_t last_loop_{0};
diff --git a/esphome/core/config.py b/esphome/core/config.py
index 2057ad356e..5501f484af 100644
--- a/esphome/core/config.py
+++ b/esphome/core/config.py
@@ -350,6 +350,7 @@ async def to_code(config):
         cg.App.pre_setup(
             config[CONF_NAME],
             config[CONF_FRIENDLY_NAME],
+            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 c49a67c9a2..236b9f5fc2 100644
--- a/tests/dummy_main.cpp
+++ b/tests/dummy_main.cpp
@@ -3,16 +3,16 @@
 // matter at all, as long as it compiles).
 // Not used during runtime nor for CI.
 
-#include <esphome/core/application.h>
-#include <esphome/components/logger/logger.h>
-#include <esphome/components/wifi/wifi_component.h>
-#include <esphome/components/ota/ota_component.h>
 #include <esphome/components/gpio/switch/gpio_switch.h>
+#include <esphome/components/logger/logger.h>
+#include <esphome/components/ota/ota_component.h>
+#include <esphome/components/wifi/wifi_component.h>
+#include <esphome/core/application.h>
 
 using namespace esphome;
 
 void setup() {
-  App.pre_setup("livingroom", "LivingRoom", __DATE__ ", " __TIME__, false);
+  App.pre_setup("livingroom", "LivingRoom", "comment", __DATE__ ", " __TIME__, false);
   auto *log = new logger::Logger(115200, 512);  // NOLINT
   log->pre_setup();
   log->set_uart_selection(logger::UART_SELECTION_UART0);

From e35f90d6e478cd86d2dfd51d7c070d3df9e3886c Mon Sep 17 00:00:00 2001
From: Reuben <4957964+reubn@users.noreply.github.com>
Date: Tue, 17 Jan 2023 00:14:45 +0000
Subject: [PATCH 450/838] Allow 0xA8 ID for APDS9960 (#4287)

fixes https://github.com/esphome/issues/issues/736
---
 esphome/components/apds9960/apds9960.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/apds9960/apds9960.cpp b/esphome/components/apds9960/apds9960.cpp
index 05091f3f7d..1c6ec5c14a 100644
--- a/esphome/components/apds9960/apds9960.cpp
+++ b/esphome/components/apds9960/apds9960.cpp
@@ -23,7 +23,7 @@ void APDS9960::setup() {
     return;
   }
 
-  if (id != 0xAB && id != 0x9C) {  // APDS9960 all should have one of these IDs
+  if (id != 0xAB && id != 0x9C && id != 0xA8) {  // APDS9960 all should have one of these IDs
     this->error_code_ = WRONG_ID;
     this->mark_failed();
     return;

From efc6a8df35b48c46a9c27a8b7e444719af23589b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 17 Jan 2023 13:15:47 +1300
Subject: [PATCH 451/838] Dont default CORE.friendly_name (#4305)

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

diff --git a/esphome/core/config.py b/esphome/core/config.py
index 5501f484af..ef6553026e 100644
--- a/esphome/core/config.py
+++ b/esphome/core/config.py
@@ -194,7 +194,7 @@ def preload_core_config(config, result):
         conf = PRELOAD_CONFIG_SCHEMA(config[CONF_ESPHOME])
 
     CORE.name = conf[CONF_NAME]
-    CORE.friendly_name = conf.get(CONF_FRIENDLY_NAME, CORE.name)
+    CORE.friendly_name = conf.get(CONF_FRIENDLY_NAME)
     CORE.data[KEY_CORE] = {}
 
     if CONF_BUILD_PATH not in conf:

From 1bb90f304cb0bacb86c610e928e187ffdf61ffb3 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Mon, 16 Jan 2023 20:18:34 -0800
Subject: [PATCH 452/838] add key collector component (#4242)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 CODEOWNERS                                    |  1 +
 esphome/components/key_collector/__init__.py  | 95 +++++++++++++++++++
 .../key_collector/key_collector.cpp           | 95 +++++++++++++++++++
 .../components/key_collector/key_collector.h  | 52 ++++++++++
 esphome/const.py                              |  1 +
 tests/test5.yaml                              | 30 +++++-
 6 files changed, 272 insertions(+), 2 deletions(-)
 create mode 100644 esphome/components/key_collector/__init__.py
 create mode 100644 esphome/components/key_collector/key_collector.cpp
 create mode 100644 esphome/components/key_collector/key_collector.h

diff --git a/CODEOWNERS b/CODEOWNERS
index a5a4fc2552..026a57a423 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -113,6 +113,7 @@ esphome/components/integration/* @OttoWinter
 esphome/components/interval/* @esphome/core
 esphome/components/json/* @OttoWinter
 esphome/components/kalman_combinator/* @Cat-Ion
+esphome/components/key_collector/* @ssieb
 esphome/components/key_provider/* @ssieb
 esphome/components/lcd_menu/* @numo68
 esphome/components/ledc/* @OttoWinter
diff --git a/esphome/components/key_collector/__init__.py b/esphome/components/key_collector/__init__.py
new file mode 100644
index 0000000000..2099e28109
--- /dev/null
+++ b/esphome/components/key_collector/__init__.py
@@ -0,0 +1,95 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import automation
+from esphome.components import key_provider
+from esphome.const import (
+    CONF_ID,
+    CONF_MAX_LENGTH,
+    CONF_MIN_LENGTH,
+    CONF_ON_TIMEOUT,
+    CONF_SOURCE_ID,
+    CONF_TIMEOUT,
+)
+
+CODEOWNERS = ["@ssieb"]
+
+MULTI_CONF = True
+
+AUTO_LOAD = ["key_provider"]
+
+CONF_START_KEYS = "start_keys"
+CONF_END_KEYS = "end_keys"
+CONF_END_KEY_REQUIRED = "end_key_required"
+CONF_BACK_KEYS = "back_keys"
+CONF_CLEAR_KEYS = "clear_keys"
+CONF_ALLOWED_KEYS = "allowed_keys"
+CONF_ON_PROGRESS = "on_progress"
+CONF_ON_RESULT = "on_result"
+
+key_collector_ns = cg.esphome_ns.namespace("key_collector")
+KeyCollector = key_collector_ns.class_("KeyCollector", cg.Component)
+
+CONFIG_SCHEMA = cv.All(
+    cv.COMPONENT_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(KeyCollector),
+            cv.GenerateID(CONF_SOURCE_ID): cv.use_id(key_provider.KeyProvider),
+            cv.Optional(CONF_MIN_LENGTH): cv.int_,
+            cv.Optional(CONF_MAX_LENGTH): cv.int_,
+            cv.Optional(CONF_START_KEYS): cv.string,
+            cv.Optional(CONF_END_KEYS): cv.string,
+            cv.Optional(CONF_END_KEY_REQUIRED): cv.boolean,
+            cv.Optional(CONF_BACK_KEYS): cv.string,
+            cv.Optional(CONF_CLEAR_KEYS): cv.string,
+            cv.Optional(CONF_ALLOWED_KEYS): cv.string,
+            cv.Optional(CONF_ON_PROGRESS): automation.validate_automation(single=True),
+            cv.Optional(CONF_ON_RESULT): automation.validate_automation(single=True),
+            cv.Optional(CONF_ON_TIMEOUT): automation.validate_automation(single=True),
+            cv.Optional(CONF_TIMEOUT): cv.positive_time_period_milliseconds,
+        }
+    ),
+    cv.has_at_least_one_key(CONF_END_KEYS, CONF_MAX_LENGTH),
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    source = await cg.get_variable(config[CONF_SOURCE_ID])
+    cg.add(var.set_provider(source))
+    if CONF_MIN_LENGTH in config:
+        cg.add(var.set_min_length(config[CONF_MIN_LENGTH]))
+    if CONF_MAX_LENGTH in config:
+        cg.add(var.set_max_length(config[CONF_MAX_LENGTH]))
+    if CONF_START_KEYS in config:
+        cg.add(var.set_start_keys(config[CONF_START_KEYS]))
+    if CONF_END_KEYS in config:
+        cg.add(var.set_end_keys(config[CONF_END_KEYS]))
+    if CONF_END_KEY_REQUIRED in config:
+        cg.add(var.set_end_key_required(config[CONF_END_KEY_REQUIRED]))
+    if CONF_BACK_KEYS in config:
+        cg.add(var.set_back_keys(config[CONF_BACK_KEYS]))
+    if CONF_CLEAR_KEYS in config:
+        cg.add(var.set_clear_keys(config[CONF_CLEAR_KEYS]))
+    if CONF_ALLOWED_KEYS in config:
+        cg.add(var.set_allowed_keys(config[CONF_ALLOWED_KEYS]))
+    if CONF_ON_PROGRESS in config:
+        await automation.build_automation(
+            var.get_progress_trigger(),
+            [(cg.std_string, "x"), (cg.uint8, "start")],
+            config[CONF_ON_PROGRESS],
+        )
+    if CONF_ON_RESULT in config:
+        await automation.build_automation(
+            var.get_result_trigger(),
+            [(cg.std_string, "x"), (cg.uint8, "start"), (cg.uint8, "end")],
+            config[CONF_ON_RESULT],
+        )
+    if CONF_ON_TIMEOUT in config:
+        await automation.build_automation(
+            var.get_timeout_trigger(),
+            [(cg.std_string, "x"), (cg.uint8, "start")],
+            config[CONF_ON_TIMEOUT],
+        )
+    if CONF_TIMEOUT in config:
+        cg.add(var.set_timeout(config[CONF_TIMEOUT]))
diff --git a/esphome/components/key_collector/key_collector.cpp b/esphome/components/key_collector/key_collector.cpp
new file mode 100644
index 0000000000..a9213890ee
--- /dev/null
+++ b/esphome/components/key_collector/key_collector.cpp
@@ -0,0 +1,95 @@
+#include "key_collector.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace key_collector {
+
+static const char *const TAG = "key_collector";
+
+KeyCollector::KeyCollector()
+    : progress_trigger_(new Trigger<std::string, uint8_t>()),
+      result_trigger_(new Trigger<std::string, uint8_t, uint8_t>()),
+      timeout_trigger_(new Trigger<std::string, uint8_t>()) {}
+
+void KeyCollector::loop() {
+  if ((this->timeout_ == 0) || this->result_.empty() || (millis() - this->last_key_time_ < this->timeout_))
+    return;
+  this->timeout_trigger_->trigger(this->result_, this->start_key_);
+  this->clear();
+}
+
+void KeyCollector::dump_config() {
+  ESP_LOGCONFIG(TAG, "Key Collector:");
+  if (this->min_length_ > 0)
+    ESP_LOGCONFIG(TAG, "  min length: %d", this->min_length_);
+  if (this->max_length_ > 0)
+    ESP_LOGCONFIG(TAG, "  max length: %d", this->max_length_);
+  if (!this->back_keys_.empty())
+    ESP_LOGCONFIG(TAG, "  erase keys '%s'", this->back_keys_.c_str());
+  if (!this->clear_keys_.empty())
+    ESP_LOGCONFIG(TAG, "  clear keys '%s'", this->clear_keys_.c_str());
+  if (!this->start_keys_.empty())
+    ESP_LOGCONFIG(TAG, "  start keys '%s'", this->start_keys_.c_str());
+  if (!this->end_keys_.empty()) {
+    ESP_LOGCONFIG(TAG, "  end keys '%s'", this->end_keys_.c_str());
+    ESP_LOGCONFIG(TAG, "  end key is required: %s", ONOFF(this->end_key_required_));
+  }
+  if (!this->allowed_keys_.empty())
+    ESP_LOGCONFIG(TAG, "  allowed keys '%s'", this->allowed_keys_.c_str());
+  if (this->timeout_ > 0)
+    ESP_LOGCONFIG(TAG, "  entry timeout: %0.1f", this->timeout_ / 1000.0);
+}
+
+void KeyCollector::set_provider(key_provider::KeyProvider *provider) {
+  provider->add_on_key_callback([this](uint8_t key) { this->key_pressed_(key); });
+}
+
+void KeyCollector::clear(bool progress_update) {
+  this->result_.clear();
+  this->start_key_ = 0;
+  if (progress_update)
+    this->progress_trigger_->trigger(this->result_, 0);
+}
+
+void KeyCollector::key_pressed_(uint8_t key) {
+  this->last_key_time_ = millis();
+  if (!this->start_keys_.empty() && !this->start_key_) {
+    if (this->start_keys_.find(key) != std::string::npos) {
+      this->start_key_ = key;
+      this->progress_trigger_->trigger(this->result_, this->start_key_);
+    }
+    return;
+  }
+  if (this->back_keys_.find(key) != std::string::npos) {
+    if (!this->result_.empty()) {
+      this->result_.pop_back();
+      this->progress_trigger_->trigger(this->result_, this->start_key_);
+    }
+    return;
+  }
+  if (this->clear_keys_.find(key) != std::string::npos) {
+    if (!this->result_.empty())
+      this->clear();
+    return;
+  }
+  if (this->end_keys_.find(key) != std::string::npos) {
+    if ((this->min_length_ == 0) || (this->result_.size() >= this->min_length_)) {
+      this->result_trigger_->trigger(this->result_, this->start_key_, key);
+      this->clear();
+    }
+    return;
+  }
+  if (!this->allowed_keys_.empty() && (this->allowed_keys_.find(key) == std::string::npos))
+    return;
+  if ((this->max_length_ == 0) || (this->result_.size() < this->max_length_))
+    this->result_.push_back(key);
+  if ((this->max_length_ > 0) && (this->result_.size() == this->max_length_) && (!this->end_key_required_)) {
+    this->result_trigger_->trigger(this->result_, this->start_key_, 0);
+    this->clear(false);
+  }
+  this->progress_trigger_->trigger(this->result_, this->start_key_);
+}
+
+}  // namespace key_collector
+}  // namespace esphome
diff --git a/esphome/components/key_collector/key_collector.h b/esphome/components/key_collector/key_collector.h
new file mode 100644
index 0000000000..5e63397839
--- /dev/null
+++ b/esphome/components/key_collector/key_collector.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#include <utility>
+#include "esphome/components/key_provider/key_provider.h"
+#include "esphome/core/automation.h"
+
+namespace esphome {
+namespace key_collector {
+
+class KeyCollector : public Component {
+ public:
+  KeyCollector();
+  void loop() override;
+  void dump_config() override;
+  void set_provider(key_provider::KeyProvider *provider);
+  void set_min_length(int min_length) { this->min_length_ = min_length; };
+  void set_max_length(int max_length) { this->max_length_ = max_length; };
+  void set_start_keys(std::string start_keys) { this->start_keys_ = std::move(start_keys); };
+  void set_end_keys(std::string end_keys) { this->end_keys_ = std::move(end_keys); };
+  void set_end_key_required(bool end_key_required) { this->end_key_required_ = end_key_required; };
+  void set_back_keys(std::string back_keys) { this->back_keys_ = std::move(back_keys); };
+  void set_clear_keys(std::string clear_keys) { this->clear_keys_ = std::move(clear_keys); };
+  void set_allowed_keys(std::string allowed_keys) { this->allowed_keys_ = std::move(allowed_keys); };
+  Trigger<std::string, uint8_t> *get_progress_trigger() const { return this->progress_trigger_; };
+  Trigger<std::string, uint8_t, uint8_t> *get_result_trigger() const { return this->result_trigger_; };
+  Trigger<std::string, uint8_t> *get_timeout_trigger() const { return this->timeout_trigger_; };
+  void set_timeout(int timeout) { this->timeout_ = timeout; };
+
+  void clear(bool progress_update = true);
+
+ protected:
+  void key_pressed_(uint8_t key);
+
+  int min_length_{0};
+  int max_length_{0};
+  std::string start_keys_;
+  std::string end_keys_;
+  bool end_key_required_{false};
+  std::string back_keys_;
+  std::string clear_keys_;
+  std::string allowed_keys_;
+  std::string result_;
+  uint8_t start_key_{0};
+  Trigger<std::string, uint8_t> *progress_trigger_;
+  Trigger<std::string, uint8_t, uint8_t> *result_trigger_;
+  Trigger<std::string, uint8_t> *timeout_trigger_;
+  uint32_t last_key_time_;
+  uint32_t timeout_{0};
+};
+
+}  // namespace key_collector
+}  // namespace esphome
diff --git a/esphome/const.py b/esphome/const.py
index 3799e55e35..5662531a5e 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -465,6 +465,7 @@ CONF_ON_TAG = "on_tag"
 CONF_ON_TAG_REMOVED = "on_tag_removed"
 CONF_ON_TIME = "on_time"
 CONF_ON_TIME_SYNC = "on_time_sync"
+CONF_ON_TIMEOUT = "on_timeout"
 CONF_ON_TOUCH = "on_touch"
 CONF_ON_TURN_OFF = "on_turn_off"
 CONF_ON_TURN_ON = "on_turn_on"
diff --git a/tests/test5.yaml b/tests/test5.yaml
index 118b206454..23046939d5 100644
--- a/tests/test5.yaml
+++ b/tests/test5.yaml
@@ -168,14 +168,22 @@ binary_sensor:
       sn74hc165: sn74hc165_hub
       number: 0
 
-
-
   - platform: ezo_pmp
     pump_state:
       name: "Pump State"
     is_paused:
       name: "Is Paused"
 
+  - platform: matrix_keypad
+    keypad_id: keypad
+    id: key4
+    row: 1
+    col: 1
+  - platform: matrix_keypad
+    id: key1
+    key: 1
+
+
 tlc5947:
   data_pin: GPIO12
   clock_pin: GPIO14
@@ -558,3 +566,21 @@ sn74hc165:
   load_pin: GPIO27
   clock_inhibit_pin: GPIO26
   sr_count: 4
+
+
+matrix_keypad:
+  id: keypad
+  rows:
+    - pin: 21
+    - pin: 19
+  columns:
+    - pin: 17
+    - pin: 16
+  keys: "1234"
+
+key_collector:
+  - id: reader
+    source_id: keypad
+    min_length: 4
+    max_length: 4
+

From ddedc1cd762e8cffbc7e9a19068a96016785be10 Mon Sep 17 00:00:00 2001
From: Z3LIFF <z3liff@users.noreply.github.com>
Date: Tue, 17 Jan 2023 16:17:31 -0500
Subject: [PATCH 453/838] Tsl2591 gain publish (#4291)

fixes https://github.com/esphome/issues/issues/4031
---
 esphome/components/tsl2591/sensor.py   | 13 +++++++++-
 esphome/components/tsl2591/tsl2591.cpp | 36 +++++++++++++++++++++++---
 esphome/components/tsl2591/tsl2591.h   | 10 ++++++-
 esphome/const.py                       |  1 +
 4 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/esphome/components/tsl2591/sensor.py b/esphome/components/tsl2591/sensor.py
index 63a0733365..5435ed4b62 100644
--- a/esphome/components/tsl2591/sensor.py
+++ b/esphome/components/tsl2591/sensor.py
@@ -24,6 +24,7 @@ import esphome.config_validation as cv
 from esphome.components import i2c, sensor
 from esphome.const import (
     CONF_GAIN,
+    CONF_ACTUAL_GAIN,
     CONF_ID,
     CONF_NAME,
     CONF_INTEGRATION_TIME,
@@ -79,7 +80,6 @@ TSL2591Component = tsl2591_ns.class_(
     "TSL2591Component", cg.PollingComponent, i2c.I2CDevice
 )
 
-
 CONFIG_SCHEMA = (
     cv.Schema(
         {
@@ -106,6 +106,12 @@ CONFIG_SCHEMA = (
                 device_class=DEVICE_CLASS_ILLUMINANCE,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
+            cv.Optional(CONF_ACTUAL_GAIN): sensor.sensor_schema(
+                icon=ICON_BRIGHTNESS_6,
+                accuracy_decimals=0,
+                device_class=DEVICE_CLASS_ILLUMINANCE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
             cv.Optional(
                 CONF_INTEGRATION_TIME, default="100ms"
             ): validate_integration_time,
@@ -150,6 +156,11 @@ async def to_code(config):
         sens = await sensor.new_sensor(conf)
         cg.add(var.set_calculated_lux_sensor(sens))
 
+    if CONF_ACTUAL_GAIN in config:
+        conf = config[CONF_ACTUAL_GAIN]
+        sens = await sensor.new_sensor(conf)
+        cg.add(var.set_actual_gain_sensor(sens))
+
     cg.add(var.set_name(config[CONF_NAME]))
     cg.add(var.set_power_save_mode(config[CONF_POWER_SAVE_MODE]))
     cg.add(var.set_integration_time(config[CONF_INTEGRATION_TIME]))
diff --git a/esphome/components/tsl2591/tsl2591.cpp b/esphome/components/tsl2591/tsl2591.cpp
index e3df467aeb..5086a38408 100644
--- a/esphome/components/tsl2591/tsl2591.cpp
+++ b/esphome/components/tsl2591/tsl2591.cpp
@@ -130,6 +130,7 @@ void TSL2591Component::dump_config() {
   LOG_SENSOR("  ", "Infrared:", this->infrared_sensor_);
   LOG_SENSOR("  ", "Visible:", this->visible_sensor_);
   LOG_SENSOR("  ", "Calculated lux:", this->calculated_lux_sensor_);
+  LOG_SENSOR("  ", "Actual gain:", this->actual_gain_sensor_);
 
   LOG_UPDATE_INTERVAL(this);
 }
@@ -140,8 +141,9 @@ void TSL2591Component::process_update_() {
   uint16_t infrared = this->get_illuminance(TSL2591_SENSOR_CHANNEL_INFRARED, combined);
   uint16_t full = this->get_illuminance(TSL2591_SENSOR_CHANNEL_FULL_SPECTRUM, combined);
   float lux = this->get_calculated_lux(full, infrared);
-  ESP_LOGD(TAG, "Got illuminance: combined 0x%X, full %d, IR %d, vis %d. Calc lux: %f", combined, full, infrared,
-           visible, lux);
+  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);
   if (this->full_spectrum_sensor_ != nullptr) {
     this->full_spectrum_sensor_->publish_state(full);
   }
@@ -154,9 +156,14 @@ void TSL2591Component::process_update_() {
   if (this->calculated_lux_sensor_ != nullptr) {
     this->calculated_lux_sensor_->publish_state(lux);
   }
+
   if (this->component_gain_ == TSL2591_CGAIN_AUTO) {
     this->automatic_gain_update(full);
   }
+
+  if (this->actual_gain_sensor_ != nullptr) {
+    this->actual_gain_sensor_->publish_state(actual_gain);
+  }
   this->status_clear_warning();
 }
 
@@ -207,6 +214,10 @@ void TSL2591Component::set_calculated_lux_sensor(sensor::Sensor *calculated_lux_
   this->calculated_lux_sensor_ = calculated_lux_sensor;
 }
 
+void TSL2591Component::set_actual_gain_sensor(sensor::Sensor *actual_gain_sensor) {
+  this->actual_gain_sensor_ = actual_gain_sensor;
+}
+
 void TSL2591Component::set_integration_time(TSL2591IntegrationTime integration_time) {
   this->integration_time_ = integration_time;
 }
@@ -377,7 +388,6 @@ float TSL2591Component::get_calculated_lux(uint16_t full_spectrum, uint16_t infr
       again = 1.0F;
       break;
   }
-
   // This lux equation is copied from the Adafruit TSL2591 v1.4.0 and modified slightly.
   // See: https://github.com/adafruit/Adafruit_TSL2591_Library/issues/14
   // and that library code.
@@ -448,5 +458,25 @@ void TSL2591Component::automatic_gain_update(uint16_t full_spectrum) {
   ESP_LOGD(TAG, "Gain setting: %d", this->gain_);
 }
 
+/** Reads the actual gain used
+ *
+ * Useful for exposing the real gain used when configured in "auto" gain mode
+ */
+float TSL2591Component::get_actual_gain() {
+  switch (this->gain_) {
+    case TSL2591_GAIN_LOW:
+      return 1.0F;
+    case TSL2591_GAIN_MED:
+      return 25.0F;
+    case TSL2591_GAIN_HIGH:
+      return 400.0F;
+    case TSL2591_GAIN_MAX:
+      return 9500.0F;
+    default:
+      // Shouldn't get here, but just in case.
+      return NAN;
+  }
+}
+
 }  // namespace tsl2591
 }  // namespace esphome
diff --git a/esphome/components/tsl2591/tsl2591.h b/esphome/components/tsl2591/tsl2591.h
index 5b7eea35ec..d7c5230276 100644
--- a/esphome/components/tsl2591/tsl2591.h
+++ b/esphome/components/tsl2591/tsl2591.h
@@ -217,14 +217,21 @@ class TSL2591Component : public PollingComponent, public i2c::I2CDevice {
    *
    * This gets called on update and tries to keep the ADC readings in the middle of the range
    */
-
   void automatic_gain_update(uint16_t full_spectrum);
 
+  /** Reads the actual gain used
+   *
+   * Useful for exposing the real gain used when configured in "auto" gain mode
+   */
+  float get_actual_gain();
+
   // ========== INTERNAL METHODS ==========
   // (In most use cases you won't need these. They're for ESPHome integration use.)
   /** Used by ESPHome framework. */
   void set_full_spectrum_sensor(sensor::Sensor *full_spectrum_sensor);
   /** Used by ESPHome framework. */
+  void set_actual_gain_sensor(sensor::Sensor *actual_gain_sensor);
+  /** Used by ESPHome framework. */
   void set_infrared_sensor(sensor::Sensor *infrared_sensor);
   /** Used by ESPHome framework. */
   void set_visible_sensor(sensor::Sensor *visible_sensor);
@@ -249,6 +256,7 @@ class TSL2591Component : public PollingComponent, public i2c::I2CDevice {
   sensor::Sensor *infrared_sensor_{nullptr};
   sensor::Sensor *visible_sensor_{nullptr};
   sensor::Sensor *calculated_lux_sensor_{nullptr};
+  sensor::Sensor *actual_gain_sensor_{nullptr};
   TSL2591IntegrationTime integration_time_;
   TSL2591ComponentGain component_gain_;
   TSL2591Gain gain_;
diff --git a/esphome/const.py b/esphome/const.py
index 5662531a5e..6c898ff3ec 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -26,6 +26,7 @@ CONF_ACTION_ID = "action_id"
 CONF_ACTION_STATE_TOPIC = "action_state_topic"
 CONF_ACTIVE = "active"
 CONF_ACTIVE_POWER = "active_power"
+CONF_ACTUAL_GAIN = "actual_gain"
 CONF_ADDRESS = "address"
 CONF_ADDRESSABLE_LIGHT_ID = "addressable_light_id"
 CONF_ADVANCED = "advanced"

From 4bf5faf80831e91f6ba8e24ff25ef1e5d3ad35ec Mon Sep 17 00:00:00 2001
From: Mathias Stock <89242257+Stock-M@users.noreply.github.com>
Date: Tue, 17 Jan 2023 22:42:43 +0100
Subject: [PATCH 454/838] Add support for EE895 (#3771)

---
 CODEOWNERS                           |   1 +
 esphome/components/ee895/__init__.py |   0
 esphome/components/ee895/ee895.cpp   | 115 +++++++++++++++++++++++++++
 esphome/components/ee895/ee895.h     |  34 ++++++++
 esphome/components/ee895/sensor.py   |  69 ++++++++++++++++
 tests/test1.yaml                     |   9 +++
 6 files changed, 228 insertions(+)
 create mode 100644 esphome/components/ee895/__init__.py
 create mode 100644 esphome/components/ee895/ee895.cpp
 create mode 100644 esphome/components/ee895/ee895.h
 create mode 100644 esphome/components/ee895/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index 026a57a423..fb748c0e70 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -71,6 +71,7 @@ esphome/components/display_menu_base/* @numo68
 esphome/components/dps310/* @kbx81
 esphome/components/ds1307/* @badbadc0ffee
 esphome/components/dsmr/* @glmnet @zuidwijk
+esphome/components/ee895/* @Stock-M
 esphome/components/ektf2232/* @jesserockz
 esphome/components/ens210/* @itn3rd77
 esphome/components/esp32/* @esphome/core
diff --git a/esphome/components/ee895/__init__.py b/esphome/components/ee895/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/ee895/ee895.cpp b/esphome/components/ee895/ee895.cpp
new file mode 100644
index 0000000000..a7186ffbbc
--- /dev/null
+++ b/esphome/components/ee895/ee895.cpp
@@ -0,0 +1,115 @@
+#include "ee895.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace ee895 {
+
+static const char *const TAG = "ee895";
+
+static const uint16_t CRC16_ONEWIRE_START = 0xFFFF;
+static const uint8_t FUNCTION_CODE_READ = 0x03;
+static const uint16_t SERIAL_NUMBER = 0x0000;
+static const uint16_t TEMPERATURE_ADDRESS = 0x03EA;
+static const uint16_t CO2_ADDRESS = 0x0424;
+static const uint16_t PRESSURE_ADDRESS = 0x04B0;
+
+void EE895Component::setup() {
+  uint16_t crc16_check = 0;
+  ESP_LOGCONFIG(TAG, "Setting up EE895...");
+  write_command_(SERIAL_NUMBER, 8);
+  uint8_t serial_number[20];
+  this->read(serial_number, 20);
+
+  crc16_check = (serial_number[19] << 8) + serial_number[18];
+  if (crc16_check != calc_crc16_(serial_number, 19)) {
+    this->error_code_ = CRC_CHECK_FAILED;
+    this->mark_failed();
+    return;
+  }
+  ESP_LOGV(TAG, "    Serial Number: 0x%s", format_hex(serial_number + 2, 16).c_str());
+}
+
+void EE895Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "EE895:");
+  LOG_I2C_DEVICE(this);
+  switch (this->error_code_) {
+    case COMMUNICATION_FAILED:
+      ESP_LOGE(TAG, "Communication with EE895 failed!");
+      break;
+    case CRC_CHECK_FAILED:
+      ESP_LOGE(TAG, "The crc check failed");
+      break;
+    case NONE:
+    default:
+      break;
+  }
+  LOG_UPDATE_INTERVAL(this);
+  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
+  LOG_SENSOR("  ", "CO2", this->co2_sensor_);
+  LOG_SENSOR("  ", "Pressure", this->pressure_sensor_);
+}
+
+float EE895Component::get_setup_priority() const { return setup_priority::DATA; }
+
+void EE895Component::update() {
+  write_command_(TEMPERATURE_ADDRESS, 2);
+  this->set_timeout(50, [this]() {
+    float temperature = read_float_();
+
+    write_command_(CO2_ADDRESS, 2);
+    float co2 = read_float_();
+
+    write_command_(PRESSURE_ADDRESS, 2);
+    float pressure = read_float_();
+    ESP_LOGD(TAG, "Got temperature=%.1f°C co2=%.0fppm pressure=%.1f%mbar", temperature, co2, pressure);
+    if (this->temperature_sensor_ != nullptr)
+      this->temperature_sensor_->publish_state(temperature);
+    if (this->co2_sensor_ != nullptr)
+      this->co2_sensor_->publish_state(co2);
+    if (this->pressure_sensor_ != nullptr)
+      this->pressure_sensor_->publish_state(pressure);
+    this->status_clear_warning();
+  });
+}
+
+void EE895Component::write_command_(uint16_t addr, uint16_t reg_cnt) {
+  uint8_t address[7];
+  uint16_t crc16 = 0;
+  address[0] = FUNCTION_CODE_READ;
+  address[1] = (addr >> 8) & 0xFF;
+  address[2] = addr & 0xFF;
+  address[3] = (reg_cnt >> 8) & 0xFF;
+  address[4] = reg_cnt & 0xFF;
+  crc16 = calc_crc16_(address, 6);
+  address[5] = crc16 & 0xFF;
+  address[6] = (crc16 >> 8) & 0xFF;
+  this->write(address, 7, true);
+}
+
+float EE895Component::read_float_() {
+  uint16_t crc16_check = 0;
+  uint8_t i2c_response[8];
+  this->read(i2c_response, 8);
+  crc16_check = (i2c_response[7] << 8) + i2c_response[6];
+  if (crc16_check != calc_crc16_(i2c_response, 7)) {
+    this->error_code_ = CRC_CHECK_FAILED;
+    this->status_set_warning();
+    return 0;
+  }
+  uint32_t x = encode_uint32(i2c_response[4], i2c_response[5], i2c_response[2], i2c_response[3]);
+  float value;
+  memcpy(&value, &x, sizeof(value));  // convert uin32_t IEEE-754 format to float
+  return value;
+}
+
+uint16_t EE895Component::calc_crc16_(const uint8_t buf[], uint8_t len) {
+  uint8_t crc_check_buf[22];
+  for (int i = 0; i < len; i++) {
+    crc_check_buf[i + 1] = buf[i];
+  }
+  crc_check_buf[0] = this->address_;
+  return crc16(crc_check_buf, len);
+}
+}  // namespace ee895
+}  // namespace esphome
diff --git a/esphome/components/ee895/ee895.h b/esphome/components/ee895/ee895.h
new file mode 100644
index 0000000000..83bd7c6e82
--- /dev/null
+++ b/esphome/components/ee895/ee895.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace ee895 {
+
+/// This class implements support for the ee895 of temperature i2c sensors.
+class EE895Component : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void set_co2_sensor(sensor::Sensor *co2) { co2_sensor_ = co2; }
+  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
+  void set_pressure_sensor(sensor::Sensor *pressure_sensor) { pressure_sensor_ = pressure_sensor; }
+
+  float get_setup_priority() const override;
+  void setup() override;
+  void dump_config() override;
+  void update() override;
+
+ protected:
+  void write_command_(uint16_t addr, uint16_t reg_cnt);
+  float read_float_();
+  uint16_t calc_crc16_(const uint8_t buf[], uint8_t len);
+  sensor::Sensor *co2_sensor_;
+  sensor::Sensor *temperature_sensor_;
+  sensor::Sensor *pressure_sensor_;
+
+  enum ErrorCode { NONE = 0, COMMUNICATION_FAILED, CRC_CHECK_FAILED } error_code_{NONE};
+};
+
+}  // namespace ee895
+}  // namespace esphome
diff --git a/esphome/components/ee895/sensor.py b/esphome/components/ee895/sensor.py
new file mode 100644
index 0000000000..d06f9ca02f
--- /dev/null
+++ b/esphome/components/ee895/sensor.py
@@ -0,0 +1,69 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import (
+    CONF_ID,
+    CONF_PRESSURE,
+    CONF_TEMPERATURE,
+    CONF_CO2,
+    DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_PRESSURE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_HECTOPASCAL,
+    UNIT_CELSIUS,
+    ICON_MOLECULE_CO2,
+    UNIT_PARTS_PER_MILLION,
+)
+
+CODEOWNERS = ["@Stock-M"]
+
+DEPENDENCIES = ["i2c"]
+
+ee895_ns = cg.esphome_ns.namespace("ee895")
+EE895Component = ee895_ns.class_("EE895Component", cg.PollingComponent, i2c.I2CDevice)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(EE895Component),
+            cv.Required(CONF_TEMPERATURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_CELSIUS,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_TEMPERATURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Required(CONF_CO2): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PARTS_PER_MILLION,
+                icon=ICON_MOLECULE_CO2,
+                accuracy_decimals=0,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Required(CONF_PRESSURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_HECTOPASCAL,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_PRESSURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x5F))
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
+
+    if CONF_TEMPERATURE in config:
+        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
+        cg.add(var.set_temperature_sensor(sens))
+
+    if CONF_CO2 in config:
+        sens = await sensor.new_sensor(config[CONF_CO2])
+        cg.add(var.set_co2_sensor(sens))
+
+    if CONF_PRESSURE in config:
+        sens = await sensor.new_sensor(config[CONF_PRESSURE])
+        cg.add(var.set_pressure_sensor(sens))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 53ef50d809..5caef0cafa 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -568,6 +568,15 @@ sensor:
   - platform: duty_cycle
     pin: GPIO25
     name: Duty Cycle Sensor
+  - platform: ee895
+    co2:
+      name: Office CO2 1
+    temperature:
+      name: Office Temperature 1
+    pressure:
+      name: Office Pressure 1
+    address: 0x5F
+    i2c_id: i2c_bus
   - platform: esp32_hall
     name: ESP32 Hall Sensor
     update_interval: 15s

From 37d17feecf1c1fa872b09e06225dc098802e770f Mon Sep 17 00:00:00 2001
From: Mathias Stock <89242257+Stock-M@users.noreply.github.com>
Date: Tue, 17 Jan 2023 22:42:47 +0100
Subject: [PATCH 455/838] Add support for HTE501 (#3772)

---
 CODEOWNERS                            |  1 +
 esphome/components/hte501/__init__.py |  0
 esphome/components/hte501/hte501.cpp  | 90 +++++++++++++++++++++++++++
 esphome/components/hte501/hte501.h    | 30 +++++++++
 esphome/components/hte501/sensor.py   | 58 +++++++++++++++++
 tests/test1.yaml                      |  7 +++
 6 files changed, 186 insertions(+)
 create mode 100644 esphome/components/hte501/__init__.py
 create mode 100644 esphome/components/hte501/hte501.cpp
 create mode 100644 esphome/components/hte501/hte501.h
 create mode 100644 esphome/components/hte501/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index fb748c0e70..34ac0a7aa9 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -103,6 +103,7 @@ esphome/components/hitachi_ac424/* @sourabhjaiswal
 esphome/components/homeassistant/* @OttoWinter
 esphome/components/honeywellabp/* @RubyBailey
 esphome/components/hrxl_maxsonar_wr/* @netmikey
+esphome/components/hte501/* @Stock-M
 esphome/components/hydreon_rgxx/* @functionpointer
 esphome/components/i2c/* @esphome/core
 esphome/components/i2s_audio/* @jesserockz
diff --git a/esphome/components/hte501/__init__.py b/esphome/components/hte501/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/hte501/hte501.cpp b/esphome/components/hte501/hte501.cpp
new file mode 100644
index 0000000000..68edd07a22
--- /dev/null
+++ b/esphome/components/hte501/hte501.cpp
@@ -0,0 +1,90 @@
+#include "hte501.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace hte501 {
+
+static const char *const TAG = "hte501";
+
+void HTE501Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up HTE501...");
+  uint8_t address[] = {0x70, 0x29};
+  this->write(address, 2, false);
+  uint8_t identification[9];
+  this->read(identification, 9);
+  if (identification[8] != calc_crc8_(identification, 0, 7)) {
+    this->error_code_ = CRC_CHECK_FAILED;
+    this->mark_failed();
+    return;
+  }
+  ESP_LOGV(TAG, "    Serial Number: 0x%s", format_hex(identification + 0, 7).c_str());
+}
+
+void HTE501Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "HTE501:");
+  LOG_I2C_DEVICE(this);
+  switch (this->error_code_) {
+    case COMMUNICATION_FAILED:
+      ESP_LOGE(TAG, "Communication with HTE501 failed!");
+      break;
+    case CRC_CHECK_FAILED:
+      ESP_LOGE(TAG, "The crc check failed");
+      break;
+    case NONE:
+    default:
+      break;
+  }
+  LOG_UPDATE_INTERVAL(this);
+  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
+  LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
+}
+
+float HTE501Component::get_setup_priority() const { return setup_priority::DATA; }
+void HTE501Component::update() {
+  uint8_t address_1[] = {0x2C, 0x1B};
+  this->write(address_1, 2, true);
+  this->set_timeout(50, [this]() {
+    uint8_t i2c_response[6];
+    this->read(i2c_response, 6);
+    if (i2c_response[2] != calc_crc8_(i2c_response, 0, 1) && i2c_response[5] != calc_crc8_(i2c_response, 3, 4)) {
+      this->error_code_ = CRC_CHECK_FAILED;
+      this->status_set_warning();
+      return;
+    }
+    float temperature = (float) encode_uint16(i2c_response[0], i2c_response[1]);
+    if (temperature > 55536) {
+      temperature = (temperature - 65536) / 100;
+    } else {
+      temperature = temperature / 100;
+    }
+    float humidity = ((float) encode_uint16(i2c_response[3], i2c_response[4])) / 100.0f;
+
+    ESP_LOGD(TAG, "Got temperature=%.2f°C humidity=%.2f%%", temperature, humidity);
+    if (this->temperature_sensor_ != nullptr)
+      this->temperature_sensor_->publish_state(temperature);
+    if (this->humidity_sensor_ != nullptr)
+      this->humidity_sensor_->publish_state(humidity);
+    this->status_clear_warning();
+  });
+}
+
+unsigned char HTE501Component::calc_crc8_(const unsigned char buf[], unsigned char from, unsigned char to) {
+  unsigned char crc_val = 0xFF;
+  unsigned char i = 0;
+  unsigned char j = 0;
+  for (i = from; i <= to; i++) {
+    int cur_val = buf[i];
+    for (j = 0; j < 8; j++) {
+      if (((crc_val ^ cur_val) & 0x80) != 0)  // If MSBs are not equal
+      {
+        crc_val = ((crc_val << 1) ^ 0x31);
+      } else {
+        crc_val = (crc_val << 1);
+      }
+      cur_val = cur_val << 1;
+    }
+  }
+  return crc_val;
+}
+}  // namespace hte501
+}  // namespace esphome
diff --git a/esphome/components/hte501/hte501.h b/esphome/components/hte501/hte501.h
new file mode 100644
index 0000000000..0d2c952e81
--- /dev/null
+++ b/esphome/components/hte501/hte501.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace hte501 {
+
+/// This class implements support for the hte501 of temperature i2c sensors.
+class HTE501Component : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
+  void set_humidity_sensor(sensor::Sensor *humidity_sensor) { humidity_sensor_ = humidity_sensor; }
+
+  float get_setup_priority() const override;
+  void setup() override;
+  void dump_config() override;
+  void update() override;
+
+ protected:
+  unsigned char calc_crc8_(const unsigned char buf[], unsigned char from, unsigned char to);
+  sensor::Sensor *temperature_sensor_;
+  sensor::Sensor *humidity_sensor_;
+
+  enum ErrorCode { NONE = 0, COMMUNICATION_FAILED, CRC_CHECK_FAILED } error_code_{NONE};
+};
+
+}  // namespace hte501
+}  // namespace esphome
diff --git a/esphome/components/hte501/sensor.py b/esphome/components/hte501/sensor.py
new file mode 100644
index 0000000000..8bd6160038
--- /dev/null
+++ b/esphome/components/hte501/sensor.py
@@ -0,0 +1,58 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import (
+    CONF_ID,
+    CONF_HUMIDITY,
+    CONF_TEMPERATURE,
+    DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_HUMIDITY,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_CELSIUS,
+    UNIT_PERCENT,
+)
+
+CODEOWNERS = ["@Stock-M"]
+
+DEPENDENCIES = ["i2c"]
+
+hte501_ns = cg.esphome_ns.namespace("hte501")
+HTE501Component = hte501_ns.class_(
+    "HTE501Component", cg.PollingComponent, i2c.I2CDevice
+)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(HTE501Component),
+            cv.Required(CONF_TEMPERATURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_CELSIUS,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_TEMPERATURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Required(CONF_HUMIDITY): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PERCENT,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_HUMIDITY,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x40))
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
+
+    if CONF_TEMPERATURE in config:
+        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
+        cg.add(var.set_temperature_sensor(sens))
+
+    if CONF_HUMIDITY in config:
+        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
+        cg.add(var.set_humidity_sensor(sens))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 5caef0cafa..a26c24d7fa 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -647,6 +647,13 @@ sensor:
     temperature:
       name: Honeywell temperature
     cs_pin: GPIO5
+  - platform: hte501
+    temperature:
+      name: Office Temperature 2
+    humidity:
+      name: Office Humidity 1
+    address: 0x40
+    i2c_id: i2c_bus
   - platform: qmc5883l
     address: 0x0D
     field_strength_x:

From bbb0105c2fc3711251e163e4972b4291fb911e13 Mon Sep 17 00:00:00 2001
From: Mathias Stock <89242257+Stock-M@users.noreply.github.com>
Date: Tue, 17 Jan 2023 22:43:16 +0100
Subject: [PATCH 456/838] Add support for TEE501 (#3773)

---
 CODEOWNERS                            |  1 +
 esphome/components/tee501/__init__.py |  0
 esphome/components/tee501/sensor.py   | 36 ++++++++++++
 esphome/components/tee501/tee501.cpp  | 85 +++++++++++++++++++++++++++
 esphome/components/tee501/tee501.h    | 25 ++++++++
 tests/test1.yaml                      |  4 ++
 6 files changed, 151 insertions(+)
 create mode 100644 esphome/components/tee501/__init__.py
 create mode 100644 esphome/components/tee501/sensor.py
 create mode 100644 esphome/components/tee501/tee501.cpp
 create mode 100644 esphome/components/tee501/tee501.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 34ac0a7aa9..3592e448cf 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -246,6 +246,7 @@ esphome/components/switch/* @esphome/core
 esphome/components/t6615/* @tylermenezes
 esphome/components/tca9548a/* @andreashergert1984
 esphome/components/tcl112/* @glmnet
+esphome/components/tee501/* @Stock-M
 esphome/components/teleinfo/* @0hax
 esphome/components/thermostat/* @kbx81
 esphome/components/time/* @OttoWinter
diff --git a/esphome/components/tee501/__init__.py b/esphome/components/tee501/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/tee501/sensor.py b/esphome/components/tee501/sensor.py
new file mode 100644
index 0000000000..329fc724bd
--- /dev/null
+++ b/esphome/components/tee501/sensor.py
@@ -0,0 +1,36 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import (
+    DEVICE_CLASS_TEMPERATURE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_CELSIUS,
+)
+
+CODEOWNERS = ["@Stock-M"]
+
+DEPENDENCIES = ["i2c"]
+
+tee501_ns = cg.esphome_ns.namespace("tee501")
+
+TEE501Component = tee501_ns.class_(
+    "TEE501Component", sensor.Sensor, cg.PollingComponent, i2c.I2CDevice
+)
+
+CONFIG_SCHEMA = (
+    sensor.sensor_schema(
+        TEE501Component,
+        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(0x48))
+)
+
+
+async def to_code(config):
+    var = await sensor.new_sensor(config)
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/tee501/tee501.cpp b/esphome/components/tee501/tee501.cpp
new file mode 100644
index 0000000000..22329d40cd
--- /dev/null
+++ b/esphome/components/tee501/tee501.cpp
@@ -0,0 +1,85 @@
+#include "tee501.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace tee501 {
+
+static const char *const TAG = "tee501";
+
+void TEE501Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up TEE501...");
+  uint8_t address[] = {0x70, 0x29};
+  this->write(address, 2, false);
+  uint8_t identification[9];
+  this->read(identification, 9);
+  if (identification[8] != calc_crc8_(identification, 0, 7)) {
+    this->error_code_ = CRC_CHECK_FAILED;
+    this->mark_failed();
+    return;
+  }
+  ESP_LOGV(TAG, "    Serial Number: 0x%s", format_hex(identification + 0, 7).c_str());
+}
+
+void TEE501Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "TEE501:");
+  LOG_I2C_DEVICE(this);
+  switch (this->error_code_) {
+    case COMMUNICATION_FAILED:
+      ESP_LOGE(TAG, "Communication with TEE501 failed!");
+      break;
+    case CRC_CHECK_FAILED:
+      ESP_LOGE(TAG, "The crc check failed");
+      break;
+    case NONE:
+    default:
+      break;
+  }
+  LOG_UPDATE_INTERVAL(this);
+  LOG_SENSOR("  ", "TEE501", this);
+}
+
+float TEE501Component::get_setup_priority() const { return setup_priority::DATA; }
+void TEE501Component::update() {
+  uint8_t address_1[] = {0x2C, 0x1B};
+  this->write(address_1, 2, true);
+  this->set_timeout(50, [this]() {
+    uint8_t i2c_response[3];
+    this->read(i2c_response, 3);
+    if (i2c_response[2] != calc_crc8_(i2c_response, 0, 1)) {
+      this->error_code_ = CRC_CHECK_FAILED;
+      this->status_set_warning();
+      return;
+    }
+    float temperature = (float) encode_uint16(i2c_response[0], i2c_response[1]);
+    if (temperature > 55536) {
+      temperature = (temperature - 65536) / 100;
+    } else {
+      temperature = temperature / 100;
+    }
+    ESP_LOGD(TAG, "Got temperature=%.2f°C", temperature);
+    this->publish_state(temperature);
+    this->status_clear_warning();
+  });
+}
+
+unsigned char TEE501Component::calc_crc8_(const unsigned char buf[], unsigned char from, unsigned char to) {
+  unsigned char crc_val = 0xFF;
+  unsigned char i = 0;
+  unsigned char j = 0;
+  for (i = from; i <= to; i++) {
+    int cur_val = buf[i];
+    for (j = 0; j < 8; j++) {
+      if (((crc_val ^ cur_val) & 0x80) != 0)  // If MSBs are not equal
+      {
+        crc_val = ((crc_val << 1) ^ 0x31);
+      } else {
+        crc_val = (crc_val << 1);
+      }
+      cur_val = cur_val << 1;
+    }
+  }
+  return crc_val;
+}
+
+}  // namespace tee501
+}  // namespace esphome
diff --git a/esphome/components/tee501/tee501.h b/esphome/components/tee501/tee501.h
new file mode 100644
index 0000000000..fc655e58c9
--- /dev/null
+++ b/esphome/components/tee501/tee501.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace tee501 {
+
+/// This class implements support for the tee501 of temperature i2c sensors.
+class TEE501Component : public sensor::Sensor, public PollingComponent, public i2c::I2CDevice {
+ public:
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void update() override;
+
+ protected:
+  unsigned char calc_crc8_(const unsigned char buf[], unsigned char from, unsigned char to);
+
+  enum ErrorCode { NONE = 0, COMMUNICATION_FAILED, CRC_CHECK_FAILED } error_code_{NONE};
+};
+
+}  // namespace tee501
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index a26c24d7fa..0448093001 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1056,6 +1056,10 @@ sensor:
       name: tsl2591 calculated_lux
       id: tsl2591_cl
     i2c_id: i2c_bus
+  - platform: tee501
+    name: Office Temperature 3
+    address: 0x48
+    i2c_id: i2c_bus
   - platform: ultrasonic
     trigger_pin: GPIO25
     echo_pin:

From 582d90ad72498af404bdf52da34d4a23d4387384 Mon Sep 17 00:00:00 2001
From: Stanislav Habich <stanislavhabich@gmail.com>
Date: Wed, 18 Jan 2023 01:00:35 +0100
Subject: [PATCH 457/838] PCA9685, fix reset device and add option EXTCLK
 (#3845)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/pca9685/__init__.py        | 28 +++++++++++++---
 esphome/components/pca9685/pca9685_output.cpp | 33 ++++++++++++++-----
 esphome/components/pca9685/pca9685_output.h   |  6 ++--
 esphome/const.py                              |  1 +
 4 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/esphome/components/pca9685/__init__.py b/esphome/components/pca9685/__init__.py
index 1a5ccc3247..b22577bf9f 100644
--- a/esphome/components/pca9685/__init__.py
+++ b/esphome/components/pca9685/__init__.py
@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c
-from esphome.const import CONF_FREQUENCY, CONF_ID
+from esphome.const import CONF_FREQUENCY, CONF_ID, CONF_EXTERNAL_CLOCK_INPUT
 
 DEPENDENCIES = ["i2c"]
 MULTI_CONF = True
@@ -9,21 +9,39 @@ MULTI_CONF = True
 pca9685_ns = cg.esphome_ns.namespace("pca9685")
 PCA9685Output = pca9685_ns.class_("PCA9685Output", cg.Component, i2c.I2CDevice)
 
-CONFIG_SCHEMA = (
+
+def validate_frequency(config):
+    if config[CONF_EXTERNAL_CLOCK_INPUT]:
+        if CONF_FREQUENCY in config:
+            raise cv.Invalid(
+                "Frequency cannot be set when using an external clock input"
+            )
+        return config
+    if CONF_FREQUENCY not in config:
+        raise cv.Invalid("Frequency is required")
+    return config
+
+
+CONFIG_SCHEMA = cv.All(
     cv.Schema(
         {
             cv.GenerateID(): cv.declare_id(PCA9685Output),
-            cv.Required(CONF_FREQUENCY): cv.All(
+            cv.Optional(CONF_FREQUENCY): cv.All(
                 cv.frequency, cv.Range(min=23.84, max=1525.88)
             ),
+            cv.Optional(CONF_EXTERNAL_CLOCK_INPUT, default=False): cv.boolean,
         }
     )
     .extend(cv.COMPONENT_SCHEMA)
-    .extend(i2c.i2c_device_schema(0x40))
+    .extend(i2c.i2c_device_schema(0x40)),
+    validate_frequency,
 )
 
 
 async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID], config[CONF_FREQUENCY])
+    var = cg.new_Pvariable(config[CONF_ID])
+    if CONF_FREQUENCY in config:
+        cg.add(var.set_frequency(config[CONF_FREQUENCY]))
+    cg.add(var.set_extclk(config[CONF_EXTERNAL_CLOCK_INPUT]))
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/pca9685/pca9685_output.cpp b/esphome/components/pca9685/pca9685_output.cpp
index 957f4062fc..c61251b66f 100644
--- a/esphome/components/pca9685/pca9685_output.cpp
+++ b/esphome/components/pca9685/pca9685_output.cpp
@@ -21,6 +21,7 @@ static const uint8_t PCA9685_REGISTER_LED0 = 0x06;
 static const uint8_t PCA9685_REGISTER_PRE_SCALE = 0xFE;
 
 static const uint8_t PCA9685_MODE1_RESTART = 0b10000000;
+static const uint8_t PCA9685_MODE1_EXTCLK = 0b01000000;
 static const uint8_t PCA9685_MODE1_AUTOINC = 0b00100000;
 static const uint8_t PCA9685_MODE1_SLEEP = 0b00010000;
 
@@ -28,10 +29,13 @@ void PCA9685Output::setup() {
   ESP_LOGCONFIG(TAG, "Setting up PCA9685OutputComponent...");
 
   ESP_LOGV(TAG, "  Resetting devices...");
+  uint8_t address_tmp = this->address_;
+  this->set_i2c_address(0x00);
   if (!this->write_bytes(PCA9685_REGISTER_SOFTWARE_RESET, nullptr, 0)) {
     this->mark_failed();
     return;
   }
+  this->set_i2c_address(address_tmp);
 
   if (!this->write_byte(PCA9685_REGISTER_MODE1, PCA9685_MODE1_RESTART | PCA9685_MODE1_AUTOINC)) {
     this->mark_failed();
@@ -42,14 +46,6 @@ void PCA9685Output::setup() {
     return;
   }
 
-  int pre_scaler = static_cast<int>((25000000 / (4096 * this->frequency_)) - 1);
-  if (pre_scaler > 255)
-    pre_scaler = 255;
-  if (pre_scaler < 3)
-    pre_scaler = 3;
-
-  ESP_LOGV(TAG, "  -> Prescaler: %d", pre_scaler);
-
   uint8_t mode1;
   if (!this->read_byte(PCA9685_REGISTER_MODE1, &mode1)) {
     this->mark_failed();
@@ -60,6 +56,20 @@ void PCA9685Output::setup() {
     this->mark_failed();
     return;
   }
+
+  int pre_scaler = 3;
+  if (this->extclk_) {
+    mode1 = mode1 | PCA9685_MODE1_EXTCLK;
+    if (!this->write_byte(PCA9685_REGISTER_MODE1, mode1)) {
+      this->mark_failed();
+      return;
+    }
+  } else {
+    pre_scaler = static_cast<int>((25000000 / (4096 * this->frequency_)) - 1);
+    pre_scaler = clamp(pre_scaler, 3, 255);
+
+    ESP_LOGV(TAG, "  -> Prescaler: %d", pre_scaler);
+  }
   if (!this->write_byte(PCA9685_REGISTER_PRE_SCALE, pre_scaler)) {
     this->mark_failed();
     return;
@@ -78,7 +88,12 @@ void PCA9685Output::setup() {
 void PCA9685Output::dump_config() {
   ESP_LOGCONFIG(TAG, "PCA9685:");
   ESP_LOGCONFIG(TAG, "  Mode: 0x%02X", this->mode_);
-  ESP_LOGCONFIG(TAG, "  Frequency: %.0f Hz", this->frequency_);
+  if (this->extclk_) {
+    ESP_LOGCONFIG(TAG, "  EXTCLK: enabled");
+  } else {
+    ESP_LOGCONFIG(TAG, "  EXTCLK: disabled");
+    ESP_LOGCONFIG(TAG, "  Frequency: %.0f Hz", this->frequency_);
+  }
   if (this->is_failed()) {
     ESP_LOGE(TAG, "Setting up PCA9685 failed!");
   }
diff --git a/esphome/components/pca9685/pca9685_output.h b/esphome/components/pca9685/pca9685_output.h
index 5dd52b5510..8e547d0032 100644
--- a/esphome/components/pca9685/pca9685_output.h
+++ b/esphome/components/pca9685/pca9685_output.h
@@ -37,8 +37,7 @@ class PCA9685Channel : public output::FloatOutput {
 /// PCA9685 float output component.
 class PCA9685Output : public Component, public i2c::I2CDevice {
  public:
-  PCA9685Output(float frequency, uint8_t mode = PCA9685_MODE_OUTPUT_ONACK | PCA9685_MODE_OUTPUT_TOTEM_POLE)
-      : frequency_(frequency), mode_(mode) {}
+  PCA9685Output(uint8_t mode = PCA9685_MODE_OUTPUT_ONACK | PCA9685_MODE_OUTPUT_TOTEM_POLE) : mode_(mode) {}
 
   void register_channel(PCA9685Channel *channel);
 
@@ -46,6 +45,8 @@ class PCA9685Output : public Component, public i2c::I2CDevice {
   void dump_config() override;
   float get_setup_priority() const override { return setup_priority::HARDWARE; }
   void loop() override;
+  void set_extclk(bool extclk) { this->extclk_ = extclk; }
+  void set_frequency(float frequency) { this->frequency_ = frequency; }
 
  protected:
   friend PCA9685Channel;
@@ -58,6 +59,7 @@ class PCA9685Output : public Component, public i2c::I2CDevice {
 
   float frequency_;
   uint8_t mode_;
+  bool extclk_ = false;
 
   uint8_t min_channel_{0xFF};
   uint8_t max_channel_{0x00};
diff --git a/esphome/const.py b/esphome/const.py
index 6c898ff3ec..6739271de0 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -219,6 +219,7 @@ CONF_EVENT = "event"
 CONF_EXPIRE_AFTER = "expire_after"
 CONF_EXPORT_ACTIVE_ENERGY = "export_active_energy"
 CONF_EXPORT_REACTIVE_ENERGY = "export_reactive_energy"
+CONF_EXTERNAL_CLOCK_INPUT = "external_clock_input"
 CONF_EXTERNAL_COMPONENTS = "external_components"
 CONF_EXTERNAL_VCC = "external_vcc"
 CONF_FALLING_EDGE = "falling_edge"

From 3aa5953cd9ef1ed15d6d60d610117ab3e0f4e0db Mon Sep 17 00:00:00 2001
From: Valentin Ochs <Cat-Ion@users.noreply.github.com>
Date: Wed, 18 Jan 2023 01:42:32 +0100
Subject: [PATCH 458/838] Implement a slow sigma-delta modulation based output
 (#4132)

---
 CODEOWNERS                                    |  1 +
 .../components/sigma_delta_output/__init__.py |  1 +
 .../components/sigma_delta_output/output.py   | 66 +++++++++++++++++++
 .../sigma_delta_output/sigma_delta_output.h   | 66 +++++++++++++++++++
 tests/test3.yaml                              | 15 +++++
 5 files changed, 149 insertions(+)
 create mode 100644 esphome/components/sigma_delta_output/__init__.py
 create mode 100644 esphome/components/sigma_delta_output/output.py
 create mode 100644 esphome/components/sigma_delta_output/sigma_delta_output.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 3592e448cf..57108f32b3 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -213,6 +213,7 @@ esphome/components/sgp4x/* @SenexCrenshaw @martgras
 esphome/components/shelly_dimmer/* @edge90 @rnauber
 esphome/components/sht4x/* @sjtrny
 esphome/components/shutdown/* @esphome/core @jsuanet
+esphome/components/sigma_delta_output/* @Cat-Ion
 esphome/components/sim800l/* @glmnet
 esphome/components/sm10bit_base/* @Cossid
 esphome/components/sm2135/* @BoukeHaarsma23
diff --git a/esphome/components/sigma_delta_output/__init__.py b/esphome/components/sigma_delta_output/__init__.py
new file mode 100644
index 0000000000..3356e61bb2
--- /dev/null
+++ b/esphome/components/sigma_delta_output/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@Cat-Ion"]
diff --git a/esphome/components/sigma_delta_output/output.py b/esphome/components/sigma_delta_output/output.py
new file mode 100644
index 0000000000..49ac9e685a
--- /dev/null
+++ b/esphome/components/sigma_delta_output/output.py
@@ -0,0 +1,66 @@
+from esphome import automation, pins
+from esphome.components import output
+import esphome.config_validation as cv
+import esphome.codegen as cg
+from esphome.const import (
+    CONF_ID,
+    CONF_PIN,
+    CONF_TURN_ON_ACTION,
+    CONF_TURN_OFF_ACTION,
+)
+
+DEPENDENCIES = []
+
+
+sigma_delta_output_ns = cg.esphome_ns.namespace("sigma_delta_output")
+SigmaDeltaOutput = sigma_delta_output_ns.class_(
+    "SigmaDeltaOutput", output.FloatOutput, cg.PollingComponent
+)
+
+CONF_STATE_CHANGE_ACTION = "state_change_action"
+
+CONFIG_SCHEMA = cv.All(
+    output.FLOAT_OUTPUT_SCHEMA.extend(cv.polling_component_schema("60s")).extend(
+        {
+            cv.Required(CONF_ID): cv.declare_id(SigmaDeltaOutput),
+            cv.Optional(CONF_PIN): pins.gpio_output_pin_schema,
+            cv.Optional(CONF_STATE_CHANGE_ACTION): automation.validate_automation(
+                single=True
+            ),
+            cv.Inclusive(
+                CONF_TURN_ON_ACTION,
+                "on_off",
+                f"{CONF_TURN_ON_ACTION} and {CONF_TURN_OFF_ACTION} must both be defined",
+            ): automation.validate_automation(single=True),
+            cv.Inclusive(
+                CONF_TURN_OFF_ACTION,
+                "on_off",
+                f"{CONF_TURN_ON_ACTION} and {CONF_TURN_OFF_ACTION} must both be defined",
+            ): automation.validate_automation(single=True),
+        }
+    ),
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await output.register_output(var, config)
+
+    if CONF_PIN in config:
+        pin = await cg.gpio_pin_expression(config[CONF_PIN])
+        cg.add(var.set_pin(pin))
+
+    if CONF_STATE_CHANGE_ACTION in config:
+        await automation.build_automation(
+            var.get_state_change_trigger(),
+            [(bool, "state")],
+            config[CONF_STATE_CHANGE_ACTION],
+        )
+    if CONF_TURN_ON_ACTION in config:
+        await automation.build_automation(
+            var.get_turn_on_trigger(), [], config[CONF_TURN_ON_ACTION]
+        )
+        await automation.build_automation(
+            var.get_turn_off_trigger(), [], config[CONF_TURN_OFF_ACTION]
+        )
diff --git a/esphome/components/sigma_delta_output/sigma_delta_output.h b/esphome/components/sigma_delta_output/sigma_delta_output.h
new file mode 100644
index 0000000000..5a5acd2dfb
--- /dev/null
+++ b/esphome/components/sigma_delta_output/sigma_delta_output.h
@@ -0,0 +1,66 @@
+#pragma once
+#include "esphome/core/component.h"
+#include "esphome/components/output/float_output.h"
+
+namespace esphome {
+namespace sigma_delta_output {
+class SigmaDeltaOutput : public PollingComponent, public output::FloatOutput {
+ public:
+  Trigger<> *get_turn_on_trigger() {
+    if (!this->turn_on_trigger_)
+      this->turn_on_trigger_ = make_unique<Trigger<>>();
+    return this->turn_on_trigger_.get();
+  }
+  Trigger<> *get_turn_off_trigger() {
+    if (!this->turn_off_trigger_)
+      this->turn_off_trigger_ = make_unique<Trigger<>>();
+    return this->turn_off_trigger_.get();
+  }
+
+  Trigger<bool> *get_state_change_trigger() {
+    if (!this->state_change_trigger_)
+      this->state_change_trigger_ = make_unique<Trigger<bool>>();
+    return this->state_change_trigger_.get();
+  }
+
+  void set_pin(GPIOPin *pin) { this->pin_ = pin; };
+  void write_state(float state) override { this->state_ = state; }
+  void update() override {
+    this->accum_ += this->state_;
+    const bool next_value = this->accum_ > 0;
+
+    if (next_value) {
+      this->accum_ -= 1.;
+    }
+
+    if (next_value != this->value_) {
+      this->value_ = next_value;
+      if (this->pin_) {
+        this->pin_->digital_write(next_value);
+      }
+
+      if (this->state_change_trigger_) {
+        this->state_change_trigger_->trigger(next_value);
+      }
+
+      if (next_value && this->turn_on_trigger_) {
+        this->turn_on_trigger_->trigger();
+      } else if (!next_value && this->turn_off_trigger_) {
+        this->turn_off_trigger_->trigger();
+      }
+    }
+  }
+
+ protected:
+  GPIOPin *pin_{nullptr};
+
+  std::unique_ptr<Trigger<>> turn_on_trigger_{nullptr};
+  std::unique_ptr<Trigger<>> turn_off_trigger_{nullptr};
+  std::unique_ptr<Trigger<bool>> state_change_trigger_{nullptr};
+
+  float accum_{0};
+  float state_{0.};
+  bool value_{false};
+};
+}  // namespace sigma_delta_output
+}  // namespace esphome
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 9b4e530fbd..5244f41d9a 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -1313,6 +1313,21 @@ output:
       return {s};
     outputs:
       - id: custom_binary
+  - platform: sigma_delta_output
+    id: sddac
+    update_interval: 60s
+    pin: D4
+    turn_on_action:
+      then:
+        - logger.log: "Turned on"
+    turn_off_action:
+      then:
+        - logger.log: "Turned off"
+    state_change_action:
+      then:
+        - logger.log:
+            format: "Changed state: %d"
+            args: [ 'state' ]
   - platform: custom
     type: float
     lambda: |-

From 029ac75a0437c14f302b77a91625276d465a0437 Mon Sep 17 00:00:00 2001
From: Dan Jackson <dan@djackson.org>
Date: Tue, 17 Jan 2023 17:26:32 -0800
Subject: [PATCH 459/838] set_retry: add retries remaining parameter to the
 provided function (#4251)

---
 esphome/core/component.cpp |  4 ++--
 esphome/core/component.h   | 11 +++++++----
 esphome/core/scheduler.cpp | 11 ++++++-----
 esphome/core/scheduler.h   |  2 +-
 tests/test2.yaml           |  9 +++++++++
 5 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/esphome/core/component.cpp b/esphome/core/component.cpp
index 7505e1f39b..b1ace8b2d1 100644
--- a/esphome/core/component.cpp
+++ b/esphome/core/component.cpp
@@ -57,7 +57,7 @@ bool Component::cancel_interval(const std::string &name) {  // NOLINT
 }
 
 void Component::set_retry(const std::string &name, uint32_t initial_wait_time, uint8_t max_attempts,
-                          std::function<RetryResult()> &&f, float backoff_increase_factor) {  // NOLINT
+                          std::function<RetryResult(uint8_t)> &&f, float backoff_increase_factor) {  // NOLINT
   App.scheduler.set_retry(this, name, initial_wait_time, max_attempts, std::move(f), backoff_increase_factor);
 }
 
@@ -130,7 +130,7 @@ void Component::set_timeout(uint32_t timeout, std::function<void()> &&f) {  // N
 void Component::set_interval(uint32_t interval, std::function<void()> &&f) {  // NOLINT
   App.scheduler.set_interval(this, "", interval, std::move(f));
 }
-void Component::set_retry(uint32_t initial_wait_time, uint8_t max_attempts, std::function<RetryResult()> &&f,
+void Component::set_retry(uint32_t initial_wait_time, uint8_t max_attempts, std::function<RetryResult(uint8_t)> &&f,
                           float backoff_increase_factor) {  // NOLINT
   App.scheduler.set_retry(this, "", initial_wait_time, max_attempts, std::move(f), backoff_increase_factor);
 }
diff --git a/esphome/core/component.h b/esphome/core/component.h
index 3b873cbc9f..769e74e645 100644
--- a/esphome/core/component.h
+++ b/esphome/core/component.h
@@ -193,6 +193,9 @@ class Component {
    * increased by multipling by `backoff_increase_factor` each time. If no backoff_increase_factor is
    * supplied (default = 1.0), the wait time will stay constant.
    *
+   * The retry function f needs to accept a single argument: the number of attempts remaining. On the
+   * final retry of f, this value will be 0.
+   *
    * This retry function can also be cancelled by name via cancel_retry().
    *
    * IMPORTANT: Do not rely on this having correct timing. This is only called from
@@ -210,11 +213,11 @@ class Component {
    * @param backoff_increase_factor time between retries is multiplied by this factor on every retry after the first
    * @see cancel_retry()
    */
-  void set_retry(const std::string &name, uint32_t initial_wait_time, uint8_t max_attempts,  // NOLINT
-                 std::function<RetryResult()> &&f, float backoff_increase_factor = 1.0f);    // NOLINT
+  void set_retry(const std::string &name, uint32_t initial_wait_time, uint8_t max_attempts,       // NOLINT
+                 std::function<RetryResult(uint8_t)> &&f, float backoff_increase_factor = 1.0f);  // NOLINT
 
-  void set_retry(uint32_t initial_wait_time, uint8_t max_attempts, std::function<RetryResult()> &&f,  // NOLINT
-                 float backoff_increase_factor = 1.0f);                                               // NOLINT
+  void set_retry(uint32_t initial_wait_time, uint8_t max_attempts, std::function<RetryResult(uint8_t)> &&f,  // NOLINT
+                 float backoff_increase_factor = 1.0f);                                                      // NOLINT
 
   /** Cancel a retry function.
    *
diff --git a/esphome/core/scheduler.cpp b/esphome/core/scheduler.cpp
index dfec4fcaa2..d880f0fda4 100644
--- a/esphome/core/scheduler.cpp
+++ b/esphome/core/scheduler.cpp
@@ -74,7 +74,7 @@ bool HOT Scheduler::cancel_interval(Component *component, const std::string &nam
 }
 
 struct RetryArgs {
-  std::function<RetryResult()> func;
+  std::function<RetryResult(uint8_t)> func;
   uint8_t retry_countdown;
   uint32_t current_interval;
   Component *component;
@@ -84,17 +84,18 @@ struct RetryArgs {
 };
 
 static void retry_handler(const std::shared_ptr<RetryArgs> &args) {
-  RetryResult retry_result = args->func();
-  if (retry_result == RetryResult::DONE || --args->retry_countdown <= 0)
+  RetryResult const retry_result = args->func(--args->retry_countdown);
+  if (retry_result == RetryResult::DONE || args->retry_countdown <= 0)
     return;
-  // second execution of `func` hapens after `initial_wait_time`
+  // second execution of `func` happens after `initial_wait_time`
   args->scheduler->set_timeout(args->component, args->name, args->current_interval, [args]() { retry_handler(args); });
   // backoff_increase_factor applied to third & later executions
   args->current_interval *= args->backoff_increase_factor;
 }
 
 void HOT Scheduler::set_retry(Component *component, const std::string &name, uint32_t initial_wait_time,
-                              uint8_t max_attempts, std::function<RetryResult()> func, float backoff_increase_factor) {
+                              uint8_t max_attempts, std::function<RetryResult(uint8_t)> func,
+                              float backoff_increase_factor) {
   if (!name.empty())
     this->cancel_retry(component, name);
 
diff --git a/esphome/core/scheduler.h b/esphome/core/scheduler.h
index 111bee1df2..a758198b8d 100644
--- a/esphome/core/scheduler.h
+++ b/esphome/core/scheduler.h
@@ -16,7 +16,7 @@ class Scheduler {
   bool cancel_interval(Component *component, const std::string &name);
 
   void set_retry(Component *component, const std::string &name, uint32_t initial_wait_time, uint8_t max_attempts,
-                 std::function<RetryResult()> func, float backoff_increase_factor = 1.0f);
+                 std::function<RetryResult(uint8_t)> func, float backoff_increase_factor = 1.0f);
   bool cancel_retry(Component *component, const std::string &name);
 
   optional<uint32_t> next_schedule_in();
diff --git a/tests/test2.yaml b/tests/test2.yaml
index 7d4cb4cbb2..2c94333c03 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -462,6 +462,15 @@ binary_sensor:
       name: Mi Motion Sensor 2 Light
     button:
       name: Mi Motion Sensor 2 Button
+  - platform: gpio
+    id: gpio_set_retry_test
+    pin: GPIO9
+    on_press:
+      then:
+        - lambda: |-
+            App.scheduler.set_retry(id(gpio_set_retry_test), "set_retry_test", 100, 3, [](const uint8_t remaining) {
+              return remaining ? RetryResult::RETRY : RetryResult::DONE; // just to reference both symbols
+            }, 5.0f);
 
 esp32_ble_tracker:
   on_ble_advertise:

From 5e2f33fde5734af0552f9f88a3915f57472fe8d2 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Tue, 17 Jan 2023 17:37:54 -0800
Subject: [PATCH 460/838] add Wiegand reader component (#4288)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 CODEOWNERS                             |   1 +
 esphome/components/wiegand/__init__.py |  78 +++++++++++++++++
 esphome/components/wiegand/wiegand.cpp | 117 +++++++++++++++++++++++++
 esphome/components/wiegand/wiegand.h   |  54 ++++++++++++
 4 files changed, 250 insertions(+)
 create mode 100644 esphome/components/wiegand/__init__.py
 create mode 100644 esphome/components/wiegand/wiegand.cpp
 create mode 100644 esphome/components/wiegand/wiegand.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 57108f32b3..cdcf1ae2d0 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -277,6 +277,7 @@ esphome/components/wake_on_lan/* @willwill2will54
 esphome/components/web_server_base/* @OttoWinter
 esphome/components/whirlpool/* @glmnet
 esphome/components/whynter/* @aeonsablaze
+esphome/components/wiegand/* @ssieb
 esphome/components/wl_134/* @hobbypunk90
 esphome/components/x9c/* @EtienneMD
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
diff --git a/esphome/components/wiegand/__init__.py b/esphome/components/wiegand/__init__.py
new file mode 100644
index 0000000000..7b05c43198
--- /dev/null
+++ b/esphome/components/wiegand/__init__.py
@@ -0,0 +1,78 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins, automation
+from esphome.components import key_provider
+from esphome.const import CONF_ID, CONF_ON_TAG, CONF_TRIGGER_ID
+
+CODEOWNERS = ["@ssieb"]
+
+AUTO_LOAD = ["key_provider"]
+
+MULTI_CONF = True
+
+wiegand_ns = cg.esphome_ns.namespace("wiegand")
+
+Wiegand = wiegand_ns.class_("Wiegand", key_provider.KeyProvider, cg.Component)
+WiegandTagTrigger = wiegand_ns.class_(
+    "WiegandTagTrigger", automation.Trigger.template(cg.std_string)
+)
+WiegandRawTrigger = wiegand_ns.class_(
+    "WiegandRawTrigger", automation.Trigger.template(cg.uint8, cg.uint64)
+)
+WiegandKeyTrigger = wiegand_ns.class_(
+    "WiegandKeyTrigger", automation.Trigger.template(cg.uint8)
+)
+
+CONF_D0 = "d0"
+CONF_D1 = "d1"
+CONF_ON_KEY = "on_key"
+CONF_ON_RAW = "on_raw"
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(Wiegand),
+        cv.Required(CONF_D0): pins.internal_gpio_input_pin_schema,
+        cv.Required(CONF_D1): pins.internal_gpio_input_pin_schema,
+        cv.Optional(CONF_ON_TAG): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(WiegandTagTrigger),
+            }
+        ),
+        cv.Optional(CONF_ON_RAW): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(WiegandRawTrigger),
+            }
+        ),
+        cv.Optional(CONF_ON_KEY): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(WiegandKeyTrigger),
+            }
+        ),
+    }
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    pin = await cg.gpio_pin_expression(config[CONF_D0])
+    cg.add(var.set_d0_pin(pin))
+    pin = await cg.gpio_pin_expression(config[CONF_D1])
+    cg.add(var.set_d1_pin(pin))
+
+    for conf in config.get(CONF_ON_TAG, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID])
+        cg.add(var.register_tag_trigger(trigger))
+        await automation.build_automation(trigger, [(cg.std_string, "x")], conf)
+
+    for conf in config.get(CONF_ON_RAW, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID])
+        cg.add(var.register_raw_trigger(trigger))
+        await automation.build_automation(
+            trigger, [(cg.uint8, "bits"), (cg.uint64, "value")], conf
+        )
+
+    for conf in config.get(CONF_ON_KEY, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID])
+        cg.add(var.register_key_trigger(trigger))
+        await automation.build_automation(trigger, [(cg.uint8, "x")], conf)
diff --git a/esphome/components/wiegand/wiegand.cpp b/esphome/components/wiegand/wiegand.cpp
new file mode 100644
index 0000000000..67558da731
--- /dev/null
+++ b/esphome/components/wiegand/wiegand.cpp
@@ -0,0 +1,117 @@
+#include "wiegand.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace wiegand {
+
+static const char *const TAG = "wiegand";
+static const char *const KEYS = "0123456789*#";
+
+void IRAM_ATTR HOT WiegandStore::d0_gpio_intr(WiegandStore *arg) {
+  if (arg->d0.digital_read())
+    return;
+  arg->count++;
+  arg->value <<= 1;
+  arg->last_bit_time = millis();
+  arg->done = false;
+}
+
+void IRAM_ATTR HOT WiegandStore::d1_gpio_intr(WiegandStore *arg) {
+  if (arg->d1.digital_read())
+    return;
+  arg->count++;
+  arg->value = (arg->value << 1) | 1;
+  arg->last_bit_time = millis();
+  arg->done = false;
+}
+
+void Wiegand::setup() {
+  this->d0_pin_->setup();
+  this->store_.d0 = this->d0_pin_->to_isr();
+  this->d1_pin_->setup();
+  this->store_.d1 = this->d1_pin_->to_isr();
+  this->d0_pin_->attach_interrupt(WiegandStore::d0_gpio_intr, &this->store_, gpio::INTERRUPT_FALLING_EDGE);
+  this->d1_pin_->attach_interrupt(WiegandStore::d1_gpio_intr, &this->store_, gpio::INTERRUPT_FALLING_EDGE);
+}
+
+bool check_eparity(uint64_t value, int start, int length) {
+  int parity = 0;
+  uint64_t mask = 1LL << start;
+  for (int i = 0; i <= length; i++, mask <<= 1) {
+    if (value & i)
+      parity++;
+  }
+  return !(parity & 1);
+}
+
+bool check_oparity(uint64_t value, int start, int length) {
+  int parity = 0;
+  uint64_t mask = 1LL << start;
+  for (int i = 0; i <= length; i++, mask <<= 1) {
+    if (value & i)
+      parity++;
+  }
+  return parity & 1;
+}
+
+void Wiegand::loop() {
+  if (this->store_.done)
+    return;
+  if (millis() - this->store_.last_bit_time < 100)
+    return;
+  uint8_t count = this->store_.count;
+  uint64_t value = this->store_.value;
+  this->store_.count = 0;
+  this->store_.value = 0;
+  this->store_.done = true;
+  ESP_LOGV(TAG, "received %d-bit value: %llx", count, value);
+  for (auto *trigger : this->raw_triggers_)
+    trigger->trigger(count, value);
+  if (count == 26) {
+    std::string tag = to_string((value >> 1) & 0xffffff);
+    ESP_LOGD(TAG, "received 26-bit tag: %s", tag.c_str());
+    if (!check_eparity(value, 13, 13) || !check_oparity(value, 0, 13)) {
+      ESP_LOGW(TAG, "invalid parity");
+      return;
+    }
+    for (auto *trigger : this->tag_triggers_)
+      trigger->trigger(tag);
+  } else if (count == 34) {
+    std::string tag = to_string((value >> 1) & 0xffffffff);
+    ESP_LOGD(TAG, "received 34-bit tag: %s", tag.c_str());
+    if (!check_eparity(value, 17, 17) || !check_oparity(value, 0, 17)) {
+      ESP_LOGW(TAG, "invalid parity");
+      return;
+    }
+    for (auto *trigger : this->tag_triggers_)
+      trigger->trigger(tag);
+  } else if (count == 37) {
+    std::string tag = to_string((value >> 1) & 0x7ffffffff);
+    ESP_LOGD(TAG, "received 37-bit tag: %s", tag.c_str());
+    if (!check_eparity(value, 18, 19) || !check_oparity(value, 0, 19)) {
+      ESP_LOGW(TAG, "invalid parity");
+      return;
+    }
+    for (auto *trigger : this->tag_triggers_)
+      trigger->trigger(tag);
+  } else if (count == 4) {
+    for (auto *trigger : this->key_triggers_)
+      trigger->trigger(value);
+    if (value < 12) {
+      uint8_t key = KEYS[value];
+      this->send_key_(key);
+    }
+  } else {
+    ESP_LOGD(TAG, "received unknown %d-bit value: %llx", count, value);
+  }
+}
+
+void Wiegand::dump_config() {
+  ESP_LOGCONFIG(TAG, "Wiegand reader:");
+  LOG_PIN("  D0 pin: ", this->d0_pin_);
+  LOG_PIN("  D1 pin: ", this->d1_pin_);
+}
+
+}  // namespace wiegand
+}  // namespace esphome
diff --git a/esphome/components/wiegand/wiegand.h b/esphome/components/wiegand/wiegand.h
new file mode 100644
index 0000000000..994631a3a3
--- /dev/null
+++ b/esphome/components/wiegand/wiegand.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include "esphome/components/key_provider/key_provider.h"
+#include "esphome/core/automation.h"
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+
+namespace esphome {
+namespace wiegand {
+
+class Wiegand;
+
+struct WiegandStore {
+  ISRInternalGPIOPin d0;
+  ISRInternalGPIOPin d1;
+  volatile uint64_t value{0};
+  volatile uint32_t last_bit_time{0};
+  volatile bool done{true};
+  volatile uint8_t count{0};
+
+  static void d0_gpio_intr(WiegandStore *arg);
+  static void d1_gpio_intr(WiegandStore *arg);
+};
+
+class WiegandTagTrigger : public Trigger<std::string> {};
+
+class WiegandRawTrigger : public Trigger<uint8_t, uint64_t> {};
+
+class WiegandKeyTrigger : public Trigger<uint8_t> {};
+
+class Wiegand : public key_provider::KeyProvider, public Component {
+ public:
+  float get_setup_priority() const override { return setup_priority::HARDWARE; }
+  void setup() override;
+  void loop() override;
+  void dump_config() override;
+
+  void set_d0_pin(InternalGPIOPin *pin) { this->d0_pin_ = pin; };
+  void set_d1_pin(InternalGPIOPin *pin) { this->d1_pin_ = pin; };
+  void register_tag_trigger(WiegandTagTrigger *trig) { this->tag_triggers_.push_back(trig); }
+  void register_raw_trigger(WiegandRawTrigger *trig) { this->raw_triggers_.push_back(trig); }
+  void register_key_trigger(WiegandKeyTrigger *trig) { this->key_triggers_.push_back(trig); }
+
+ protected:
+  InternalGPIOPin *d0_pin_;
+  InternalGPIOPin *d1_pin_;
+  WiegandStore store_{};
+  std::vector<WiegandTagTrigger *> tag_triggers_;
+  std::vector<WiegandRawTrigger *> raw_triggers_;
+  std::vector<WiegandKeyTrigger *> key_triggers_;
+};
+
+}  // namespace wiegand
+}  // namespace esphome

From 8cad9dfc83b402fbbfd1182c76088bdb1ea32e7c Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Wed, 18 Jan 2023 17:23:35 +0100
Subject: [PATCH 461/838] Upgrades add-on base image to 6.2.0 (#4310)

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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8243f85f29..66b708f522 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,7 +6,7 @@
 ARG BASEIMGTYPE=docker
 
 # https://github.com/hassio-addons/addon-debian-base/releases
-FROM ghcr.io/hassio-addons/debian-base:6.1.3 AS base-hassio
+FROM ghcr.io/hassio-addons/debian-base:6.2.0 AS base-hassio
 # https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye
 FROM debian:bullseye-20221024-slim AS base-docker
 

From fd6d6cfb6c8508af7e92832630c364956c7047f6 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Wed, 18 Jan 2023 18:22:35 +0100
Subject: [PATCH 462/838] Migrate old-style S6 scripts to s6-rc.d (#4311)

---
 .../etc/cont-init.d/10-requirements.sh        | 41 ------------
 .../etc/cont-init.d/20-nginx.sh               | 34 ----------
 .../etc/cont-init.d/30-dirs.sh                |  9 ---
 .../s6-rc.d/esphome/dependencies.d/base       |  0
 .../etc/s6-overlay/s6-rc.d/esphome/finish     | 26 ++++++++
 .../s6-rc.d}/esphome/run                      | 20 +++---
 .../etc/s6-overlay/s6-rc.d/esphome/type       |  1 +
 .../s6-rc.d/init-nginx/dependencies.d/base    |  0
 .../etc/s6-overlay/s6-rc.d/init-nginx/run     | 63 +++++++++++++++++++
 .../etc/s6-overlay/s6-rc.d/init-nginx/type    |  1 +
 .../etc/s6-overlay/s6-rc.d/init-nginx/up      |  1 +
 .../s6-rc.d/nginx/dependencies.d/esphome      |  0
 .../s6-rc.d/nginx/dependencies.d/init-nginx   |  0
 .../etc/s6-overlay/s6-rc.d/nginx/finish       | 25 ++++++++
 .../s6-rc.d}/nginx/run                        |  5 +-
 .../etc/s6-overlay/s6-rc.d/nginx/type         |  1 +
 .../s6-rc.d/user/contents.d/esphome           |  0
 .../s6-rc.d/user/contents.d/init-nginx        |  0
 .../s6-overlay/s6-rc.d/user/contents.d/nginx  |  0
 .../etc/services.d/esphome/finish             | 15 -----
 .../etc/services.d/nginx/finish               | 15 -----
 21 files changed, 132 insertions(+), 125 deletions(-)
 delete mode 100755 docker/ha-addon-rootfs/etc/cont-init.d/10-requirements.sh
 delete mode 100755 docker/ha-addon-rootfs/etc/cont-init.d/20-nginx.sh
 delete mode 100755 docker/ha-addon-rootfs/etc/cont-init.d/30-dirs.sh
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/dependencies.d/base
 create mode 100755 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/finish
 rename docker/ha-addon-rootfs/etc/{services.d => s6-overlay/s6-rc.d}/esphome/run (91%)
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/type
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/dependencies.d/base
 create mode 100755 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/esphome
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx
 create mode 100755 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/finish
 rename docker/ha-addon-rootfs/etc/{services.d => s6-overlay/s6-rc.d}/nginx/run (73%)
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/type
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/esphome
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx
 delete mode 100755 docker/ha-addon-rootfs/etc/services.d/esphome/finish
 delete mode 100755 docker/ha-addon-rootfs/etc/services.d/nginx/finish

diff --git a/docker/ha-addon-rootfs/etc/cont-init.d/10-requirements.sh b/docker/ha-addon-rootfs/etc/cont-init.d/10-requirements.sh
deleted file mode 100755
index 544787d568..0000000000
--- a/docker/ha-addon-rootfs/etc/cont-init.d/10-requirements.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# This files check if all user configuration requirements are met
-# ==============================================================================
-
-# Check SSL requirements, if enabled
-if bashio::config.true 'ssl'; then
-    if ! bashio::config.has_value 'certfile'; then
-        bashio::log.fatal 'SSL is enabled, but no certfile was specified.'
-        bashio::exit.nok
-    fi
-
-    if ! bashio::config.has_value 'keyfile'; then
-        bashio::log.fatal 'SSL is enabled, but no keyfile was specified'
-        bashio::exit.nok
-    fi
-
-
-    certfile="/ssl/$(bashio::config 'certfile')"
-    keyfile="/ssl/$(bashio::config 'keyfile')"
-
-    if ! bashio::fs.file_exists "${certfile}"; then
-        if ! bashio::fs.file_exists "${keyfile}"; then
-            # Both files are missing, let's print a friendlier error message
-            bashio::log.fatal 'You enabled encrypted connections using the "ssl": true option.'
-            bashio::log.fatal "However, the SSL files '${certfile}' and '${keyfile}'"
-            bashio::log.fatal "were not found. If you're using Hass.io on your local network and don't want"
-            bashio::log.fatal 'to encrypt connections to the ESPHome dashboard, you can manually disable'
-            bashio::log.fatal 'SSL by setting "ssl" to false."'
-            bashio::exit.nok
-        fi
-        bashio::log.fatal "The configured certfile '${certfile}' was not found."
-        bashio::exit.nok
-    fi
-
-    if ! bashio::fs.file_exists "/ssl/$(bashio::config 'keyfile')"; then
-        bashio::log.fatal "The configured keyfile '${keyfile}' was not found."
-        bashio::exit.nok
-    fi
-fi
diff --git a/docker/ha-addon-rootfs/etc/cont-init.d/20-nginx.sh b/docker/ha-addon-rootfs/etc/cont-init.d/20-nginx.sh
deleted file mode 100755
index 107a25c47a..0000000000
--- a/docker/ha-addon-rootfs/etc/cont-init.d/20-nginx.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Configures NGINX for use with ESPHome
-# ==============================================================================
-
-declare certfile
-declare keyfile
-declare direct_port
-declare ingress_interface
-declare ingress_port
-
-mkdir -p /var/log/nginx
-
-direct_port=$(bashio::addon.port 6052)
-if bashio::var.has_value "${direct_port}"; then
-    if bashio::config.true 'ssl'; then
-        certfile=$(bashio::config 'certfile')
-        keyfile=$(bashio::config 'keyfile')
-
-        mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf
-        sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf
-        sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf
-    else
-        mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
-    fi
-
-    sed -i "s/%%port%%/${direct_port}/g" /etc/nginx/servers/direct.conf
-fi
-
-ingress_port=$(bashio::addon.ingress_port)
-ingress_interface=$(bashio::addon.ip_address)
-sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
-sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
diff --git a/docker/ha-addon-rootfs/etc/cont-init.d/30-dirs.sh b/docker/ha-addon-rootfs/etc/cont-init.d/30-dirs.sh
deleted file mode 100755
index 1073a2fa45..0000000000
--- a/docker/ha-addon-rootfs/etc/cont-init.d/30-dirs.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# This files creates all directories used by esphome
-# ==============================================================================
-
-pio_cache_base=/data/cache/platformio
-
-mkdir -p "${pio_cache_base}"
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/dependencies.d/base b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/dependencies.d/base
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/finish b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/finish
new file mode 100755
index 0000000000..6e0f8fe23a
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/finish
@@ -0,0 +1,26 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Home Assistant Community Add-on: ESPHome
+# Take down the S6 supervision tree when ESPHome dashboard fails
+# ==============================================================================
+declare exit_code
+readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
+readonly exit_code_service="${1}"
+readonly exit_code_signal="${2}"
+
+bashio::log.info \
+  "Service ESPHome dashboard exited with code ${exit_code_service}" \
+  "(by signal ${exit_code_signal})"
+
+if [[ "${exit_code_service}" -eq 256 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
+  fi
+  [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
+elif [[ "${exit_code_service}" -ne 0 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
+  fi
+  exec /run/s6/basedir/bin/halt
+fi
diff --git a/docker/ha-addon-rootfs/etc/services.d/esphome/run b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/run
similarity index 91%
rename from docker/ha-addon-rootfs/etc/services.d/esphome/run
rename to docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/run
index 747c64728e..277f26ea49 100755
--- a/docker/ha-addon-rootfs/etc/services.d/esphome/run
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/run
@@ -1,10 +1,19 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Community Hass.io Add-ons: ESPHome
 # Runs the ESPHome dashboard
 # ==============================================================================
+readonly pio_cache_base=/data/cache/platformio
 
 export ESPHOME_IS_HA_ADDON=true
+export PLATFORMIO_GLOBALLIB_DIR=/piolibs
+
+# we can't set core_dir, because the settings file is stored in `core_dir/appstate.json`
+# setting `core_dir` would therefore prevent pio from accessing
+export PLATFORMIO_PLATFORMS_DIR="${pio_cache_base}/platforms"
+export PLATFORMIO_PACKAGES_DIR="${pio_cache_base}/packages"
+export PLATFORMIO_CACHE_DIR="${pio_cache_base}/cache"
 
 if bashio::config.true 'leave_front_door_open'; then
     export DISABLE_HA_AUTHENTICATION=true
@@ -30,14 +39,7 @@ else
     fi
 fi
 
-pio_cache_base=/data/cache/platformio
-# we can't set core_dir, because the settings file is stored in `core_dir/appstate.json`
-# setting `core_dir` would therefore prevent pio from accessing
-export PLATFORMIO_PLATFORMS_DIR="${pio_cache_base}/platforms"
-export PLATFORMIO_PACKAGES_DIR="${pio_cache_base}/packages"
-export PLATFORMIO_CACHE_DIR="${pio_cache_base}/cache"
-
-export PLATFORMIO_GLOBALLIB_DIR=/piolibs
+mkdir -p "${pio_cache_base}"
 
 bashio::log.info "Starting ESPHome dashboard..."
 exec esphome dashboard /config/esphome --socket /var/run/esphome.sock --ha-addon
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/type b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/type
new file mode 100644
index 0000000000..5883cff0cd
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/type
@@ -0,0 +1 @@
+longrun
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/dependencies.d/base b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/dependencies.d/base
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
new file mode 100755
index 0000000000..52a211b99f
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
@@ -0,0 +1,63 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# Configures NGINX for use with ESPHome
+# ==============================================================================
+declare certfile
+declare direct_port
+declare ingress_interface
+declare ingress_port
+declare keyfile
+
+mkdir -p /var/log/nginx
+
+direct_port=$(bashio::addon.port 6052)
+if bashio::var.has_value "${direct_port}"; then
+    # Check SSL requirements, if enabled
+    if bashio::config.true 'ssl'; then
+        if ! bashio::config.has_value 'certfile'; then
+            bashio::log.fatal 'SSL is enabled, but no certfile was specified.'
+            bashio::exit.nok
+        fi
+
+        if ! bashio::config.has_value 'keyfile'; then
+            bashio::log.fatal 'SSL is enabled, but no keyfile was specified'
+            bashio::exit.nok
+        fi
+
+        certfile="/ssl/$(bashio::config 'certfile')"
+        keyfile="/ssl/$(bashio::config 'keyfile')"
+
+        if ! bashio::fs.file_exists "/ssl/${certfile}"; then
+            if ! bashio::fs.file_exists "/ssl/${keyfile}"; then
+                # Both files are missing, let's print a friendlier error message
+                bashio::log.fatal 'You enabled encrypted connections using the "ssl": true option.'
+                bashio::log.fatal "However, the SSL files '${certfile}' and '${keyfile}'"
+                bashio::log.fatal "were not found. If you're using Hass.io on your local network and don't want"
+                bashio::log.fatal 'to encrypt connections to the ESPHome dashboard, you can manually disable'
+                bashio::log.fatal 'SSL by setting "ssl" to false."'
+                bashio::exit.nok
+            fi
+            bashio::log.fatal "The configured certfile '/ssl/${certfile}' was not found."
+            bashio::exit.nok
+        fi
+
+        if ! bashio::fs.file_exists "/ssl/${keyfile}"; then
+            bashio::log.fatal "The configured keyfile '/ssl/${keyfile}' was not found."
+            bashio::exit.nok
+        fi
+        mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf
+        sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf
+        sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf
+    else
+        mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
+    fi
+
+    sed -i "s/%%port%%/${direct_port}/g" /etc/nginx/servers/direct.conf
+fi
+
+ingress_port=$(bashio::addon.ingress_port)
+ingress_interface=$(bashio::addon.ip_address)
+sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
+sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type
new file mode 100644
index 0000000000..bdd22a1850
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type
@@ -0,0 +1 @@
+oneshot
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up
new file mode 100644
index 0000000000..b3b5b494b5
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-nginx/run
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/esphome b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/esphome
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/finish b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/finish
new file mode 100755
index 0000000000..bbd6d8fecf
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/finish
@@ -0,0 +1,25 @@
+#!/command/with-contenv bashio
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# Take down the S6 supervision tree when NGINX fails
+# ==============================================================================
+declare exit_code
+readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
+readonly exit_code_service="${1}"
+readonly exit_code_signal="${2}"
+
+bashio::log.info \
+  "Service NGINX exited with code ${exit_code_service}" \
+  "(by signal ${exit_code_signal})"
+
+if [[ "${exit_code_service}" -eq 256 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
+  fi
+  [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
+elif [[ "${exit_code_service}" -ne 0 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
+  fi
+  exec /run/s6/basedir/bin/halt
+fi
diff --git a/docker/ha-addon-rootfs/etc/services.d/nginx/run b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/run
similarity index 73%
rename from docker/ha-addon-rootfs/etc/services.d/nginx/run
rename to docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/run
index 8582167b96..e96991cdd1 100755
--- a/docker/ha-addon-rootfs/etc/services.d/nginx/run
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/run
@@ -1,10 +1,11 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Community Hass.io Add-ons: ESPHome
 # Runs the NGINX proxy
 # ==============================================================================
 
-bashio::log.info "Waiting for dashboard to come up..."
+bashio::log.info "Waiting for ESPHome dashboard to come up..."
 
 while [[ ! -S /var/run/esphome.sock ]]; do
   sleep 0.5
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/type b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/type
new file mode 100644
index 0000000000..5883cff0cd
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/type
@@ -0,0 +1 @@
+longrun
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/esphome b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/esphome
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/services.d/esphome/finish b/docker/ha-addon-rootfs/etc/services.d/esphome/finish
deleted file mode 100755
index fed449ce61..0000000000
--- a/docker/ha-addon-rootfs/etc/services.d/esphome/finish
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/execlineb -S0
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Take down the S6 supervision tree when ESPHome fails
-# ==============================================================================
-
-declare APP_EXIT_CODE=${1}
-
-if [[ "${APP_EXIT_CODE}" -ne 0 ]] && [[ "${APP_EXIT_CODE}" -ne 256 ]]; then
-  bashio::log.warning "Halt add-on with exit code ${APP_EXIT_CODE}"
-  echo "${APP_EXIT_CODE}" > /run/s6-linux-init-container-results/exitcode
-  exec /run/s6/basedir/bin/halt
-fi
-
-bashio::log.info "Service restart after closing"
diff --git a/docker/ha-addon-rootfs/etc/services.d/nginx/finish b/docker/ha-addon-rootfs/etc/services.d/nginx/finish
deleted file mode 100755
index 8030841ec8..0000000000
--- a/docker/ha-addon-rootfs/etc/services.d/nginx/finish
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/execlineb -S0
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Take down the S6 supervision tree when NGINX fails
-# ==============================================================================
-
-declare APP_EXIT_CODE=${1}
-
-if [[ "${APP_EXIT_CODE}" -ne 0 ]] && [[ "${APP_EXIT_CODE}" -ne 256 ]]; then
-  bashio::log.warning "Halt add-on with exit code ${APP_EXIT_CODE}"
-  echo "${APP_EXIT_CODE}" > /run/s6-linux-init-container-results/exitcode
-  exec /run/s6/basedir/bin/halt
-fi
-
-bashio::log.info "Service restart after closing"

From 84698ae888c7a67c76564fab5727489583239dc9 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Wed, 18 Jan 2023 19:54:27 +0100
Subject: [PATCH 463/838] Refactor NGINX configuration of Home Assistant Add-on
 (#4312)

---
 .../etc/nginx/includes/proxy_params.conf      | 12 ++--
 .../etc/nginx/includes/server_params.conf     |  6 +-
 .../etc/nginx/includes/ssl_params.conf        |  7 +-
 .../etc/nginx/includes/upstream.conf          |  3 +
 docker/ha-addon-rootfs/etc/nginx/nginx.conf   | 25 +++----
 .../etc/nginx/servers/.gitkeep                |  1 +
 .../etc/nginx/servers/direct.disabled         | 12 ----
 .../direct.gtpl}                              | 20 ++++--
 .../ingress.conf => templates/ingress.gtpl}   |  4 +-
 .../etc/s6-overlay/s6-rc.d/init-nginx/run     | 70 +++++--------------
 10 files changed, 60 insertions(+), 100 deletions(-)
 create mode 100644 docker/ha-addon-rootfs/etc/nginx/includes/upstream.conf
 create mode 100644 docker/ha-addon-rootfs/etc/nginx/servers/.gitkeep
 delete mode 100644 docker/ha-addon-rootfs/etc/nginx/servers/direct.disabled
 rename docker/ha-addon-rootfs/etc/nginx/{servers/direct-ssl.disabled => templates/direct.gtpl} (61%)
 rename docker/ha-addon-rootfs/etc/nginx/{servers/ingress.conf => templates/ingress.gtpl} (76%)

diff --git a/docker/ha-addon-rootfs/etc/nginx/includes/proxy_params.conf b/docker/ha-addon-rootfs/etc/nginx/includes/proxy_params.conf
index c00b4800e8..a1ebb5079a 100644
--- a/docker/ha-addon-rootfs/etc/nginx/includes/proxy_params.conf
+++ b/docker/ha-addon-rootfs/etc/nginx/includes/proxy_params.conf
@@ -1,9 +1,9 @@
-proxy_http_version 1.1;
-proxy_ignore_client_abort off;
-proxy_read_timeout 86400s;
-proxy_redirect off;
-proxy_send_timeout 86400s;
-proxy_max_temp_file_size 0;
+proxy_http_version          1.1;
+proxy_ignore_client_abort   off;
+proxy_read_timeout          86400s;
+proxy_redirect              off;
+proxy_send_timeout          86400s;
+proxy_max_temp_file_size    0;
 
 proxy_set_header Accept-Encoding "";
 proxy_set_header Connection $connection_upgrade;
diff --git a/docker/ha-addon-rootfs/etc/nginx/includes/server_params.conf b/docker/ha-addon-rootfs/etc/nginx/includes/server_params.conf
index 479dfa10f6..debdf83a8c 100644
--- a/docker/ha-addon-rootfs/etc/nginx/includes/server_params.conf
+++ b/docker/ha-addon-rootfs/etc/nginx/includes/server_params.conf
@@ -1,5 +1,7 @@
-root /dev/null;
-server_name $hostname;
+root            /dev/null;
+server_name     $hostname;
+
+client_max_body_size 512m;
 
 add_header X-Content-Type-Options nosniff;
 add_header X-XSS-Protection "1; mode=block";
diff --git a/docker/ha-addon-rootfs/etc/nginx/includes/ssl_params.conf b/docker/ha-addon-rootfs/etc/nginx/includes/ssl_params.conf
index 6f15005998..e6789cbb9b 100644
--- a/docker/ha-addon-rootfs/etc/nginx/includes/ssl_params.conf
+++ b/docker/ha-addon-rootfs/etc/nginx/includes/ssl_params.conf
@@ -1,7 +1,6 @@
-ssl_protocols TLSv1.2;
-ssl_prefer_server_ciphers on;
-ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA;
-ssl_ecdh_curve secp384r1;
+ssl_protocols TLSv1.2 TLSv1.3;
+ssl_prefer_server_ciphers off;
+ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
 ssl_session_timeout  10m;
 ssl_session_cache shared:SSL:10m;
 ssl_session_tickets off;
diff --git a/docker/ha-addon-rootfs/etc/nginx/includes/upstream.conf b/docker/ha-addon-rootfs/etc/nginx/includes/upstream.conf
new file mode 100644
index 0000000000..8e782bdc88
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/nginx/includes/upstream.conf
@@ -0,0 +1,3 @@
+upstream esphome {
+    server unix:/var/run/esphome.sock;
+}
diff --git a/docker/ha-addon-rootfs/etc/nginx/nginx.conf b/docker/ha-addon-rootfs/etc/nginx/nginx.conf
index 8ebf572816..497427596d 100644
--- a/docker/ha-addon-rootfs/etc/nginx/nginx.conf
+++ b/docker/ha-addon-rootfs/etc/nginx/nginx.conf
@@ -2,7 +2,6 @@ daemon off;
 user root;
 pid /var/run/nginx.pid;
 worker_processes 1;
-# Hass.io addon log
 error_log /proc/1/fd/1 error;
 events {
     worker_connections 1024;
@@ -10,24 +9,22 @@ events {
 
 http {
     include /etc/nginx/includes/mime.types;
-    access_log stdout;
-    default_type application/octet-stream;
-    gzip on;
-    keepalive_timeout 65;
-    sendfile on;
-    server_tokens off;
+
+    access_log              off;
+    default_type            application/octet-stream;
+    gzip                    on;
+    keepalive_timeout       65;
+    sendfile                on;
+    server_tokens           off;
+
+    tcp_nodelay             on;
+    tcp_nopush              on;
 
     map $http_upgrade $connection_upgrade {
         default upgrade;
         ''      close;
     }
 
-    # Use Hass.io supervisor as resolver
-    resolver 172.30.32.2;
-
-    upstream esphome {
-        server unix:/var/run/esphome.sock;
-    }
-
+    include /etc/nginx/includes/upstream.conf;
     include /etc/nginx/servers/*.conf;
 }
diff --git a/docker/ha-addon-rootfs/etc/nginx/servers/.gitkeep b/docker/ha-addon-rootfs/etc/nginx/servers/.gitkeep
new file mode 100644
index 0000000000..85ad51be5f
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/nginx/servers/.gitkeep
@@ -0,0 +1 @@
+Without requirements or design, programming is the art of adding bugs to an empty text file. (Louis Srygley)
diff --git a/docker/ha-addon-rootfs/etc/nginx/servers/direct.disabled b/docker/ha-addon-rootfs/etc/nginx/servers/direct.disabled
deleted file mode 100644
index 80300fc6aa..0000000000
--- a/docker/ha-addon-rootfs/etc/nginx/servers/direct.disabled
+++ /dev/null
@@ -1,12 +0,0 @@
-server {
-    listen %%port%% default_server;
-
-    include /etc/nginx/includes/server_params.conf;
-    include /etc/nginx/includes/proxy_params.conf;
-    # Clear Hass.io Ingress header
-    proxy_set_header X-HA-Ingress "";
-
-    location / {
-        proxy_pass http://esphome;
-    }
-}
diff --git a/docker/ha-addon-rootfs/etc/nginx/servers/direct-ssl.disabled b/docker/ha-addon-rootfs/etc/nginx/templates/direct.gtpl
similarity index 61%
rename from docker/ha-addon-rootfs/etc/nginx/servers/direct-ssl.disabled
rename to docker/ha-addon-rootfs/etc/nginx/templates/direct.gtpl
index 4ebc435dbb..4fb0ca3f90 100644
--- a/docker/ha-addon-rootfs/etc/nginx/servers/direct-ssl.disabled
+++ b/docker/ha-addon-rootfs/etc/nginx/templates/direct.gtpl
@@ -1,20 +1,26 @@
 server {
-    listen %%port%% default_server ssl http2;
+    {{ if not .ssl }}
+    listen 6052 default_server;
+    {{ else }}
+    listen 6052 default_server ssl http2;
+    {{ end }}
 
     include /etc/nginx/includes/server_params.conf;
     include /etc/nginx/includes/proxy_params.conf;
+
+    {{ if .ssl }}
     include /etc/nginx/includes/ssl_params.conf;
 
-    ssl on;
-    ssl_certificate /ssl/%%certfile%%;
-    ssl_certificate_key /ssl/%%keyfile%%;
-
-    # Clear Hass.io Ingress header
-    proxy_set_header X-HA-Ingress "";
+    ssl_certificate /ssl/{{ .certfile }};
+    ssl_certificate_key /ssl/{{ .keyfile }};
 
     # Redirect http requests to https on the same port.
     # https://rageagainstshell.com/2016/11/redirect-http-to-https-on-the-same-port-in-nginx/
     error_page 497 https://$http_host$request_uri;
+    {{ end }}
+
+    # Clear Home Assistant Ingress header
+    proxy_set_header X-HA-Ingress "";
 
     location / {
         proxy_pass http://esphome;
diff --git a/docker/ha-addon-rootfs/etc/nginx/servers/ingress.conf b/docker/ha-addon-rootfs/etc/nginx/templates/ingress.gtpl
similarity index 76%
rename from docker/ha-addon-rootfs/etc/nginx/servers/ingress.conf
rename to docker/ha-addon-rootfs/etc/nginx/templates/ingress.gtpl
index 9d0d2d3e66..91bd40d537 100644
--- a/docker/ha-addon-rootfs/etc/nginx/servers/ingress.conf
+++ b/docker/ha-addon-rootfs/etc/nginx/templates/ingress.gtpl
@@ -1,13 +1,13 @@
 server {
-    listen %%interface%%:%%port%% default_server;
+    listen {{ .interface }}:{{ .port }} default_server;
 
     include /etc/nginx/includes/server_params.conf;
     include /etc/nginx/includes/proxy_params.conf;
+
     # Set Home Assistant Ingress header
     proxy_set_header X-HA-Ingress "YES";
 
     location / {
-        # Only allow from Hass.io supervisor
         allow   172.30.32.2;
         deny    all;
 
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
index 52a211b99f..2725f56670 100755
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
@@ -4,60 +4,24 @@
 # Community Hass.io Add-ons: ESPHome
 # Configures NGINX for use with ESPHome
 # ==============================================================================
-declare certfile
-declare direct_port
-declare ingress_interface
-declare ingress_port
-declare keyfile
-
 mkdir -p /var/log/nginx
 
-direct_port=$(bashio::addon.port 6052)
-if bashio::var.has_value "${direct_port}"; then
-    # Check SSL requirements, if enabled
-    if bashio::config.true 'ssl'; then
-        if ! bashio::config.has_value 'certfile'; then
-            bashio::log.fatal 'SSL is enabled, but no certfile was specified.'
-            bashio::exit.nok
-        fi
+# Generate Ingress configuration
+bashio::var.json \
+    interface "$(bashio::addon.ip_address)" \
+    port "^$(bashio::addon.ingress_port)" \
+    | tempio \
+        -template /etc/nginx/templates/ingress.gtpl \
+        -out /etc/nginx/servers/ingress.conf
 
-        if ! bashio::config.has_value 'keyfile'; then
-            bashio::log.fatal 'SSL is enabled, but no keyfile was specified'
-            bashio::exit.nok
-        fi
-
-        certfile="/ssl/$(bashio::config 'certfile')"
-        keyfile="/ssl/$(bashio::config 'keyfile')"
-
-        if ! bashio::fs.file_exists "/ssl/${certfile}"; then
-            if ! bashio::fs.file_exists "/ssl/${keyfile}"; then
-                # Both files are missing, let's print a friendlier error message
-                bashio::log.fatal 'You enabled encrypted connections using the "ssl": true option.'
-                bashio::log.fatal "However, the SSL files '${certfile}' and '${keyfile}'"
-                bashio::log.fatal "were not found. If you're using Hass.io on your local network and don't want"
-                bashio::log.fatal 'to encrypt connections to the ESPHome dashboard, you can manually disable'
-                bashio::log.fatal 'SSL by setting "ssl" to false."'
-                bashio::exit.nok
-            fi
-            bashio::log.fatal "The configured certfile '/ssl/${certfile}' was not found."
-            bashio::exit.nok
-        fi
-
-        if ! bashio::fs.file_exists "/ssl/${keyfile}"; then
-            bashio::log.fatal "The configured keyfile '/ssl/${keyfile}' was not found."
-            bashio::exit.nok
-        fi
-        mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf
-        sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf
-        sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf
-    else
-        mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
-    fi
-
-    sed -i "s/%%port%%/${direct_port}/g" /etc/nginx/servers/direct.conf
+# Generate direct access configuration, if enabled.
+if bashio::var.has_value "$(bashio::addon.port 6052)"; then
+    bashio::config.require.ssl
+    bashio::var.json \
+        certfile "$(bashio::config 'certfile')" \
+        keyfile "$(bashio::config 'keyfile')" \
+        ssl "^$(bashio::config 'ssl')" \
+        | tempio \
+            -template /etc/nginx/templates/direct.gtpl \
+            -out /etc/nginx/servers/direct.conf
 fi
-
-ingress_port=$(bashio::addon.ingress_port)
-ingress_interface=$(bashio::addon.ip_address)
-sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
-sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf

From e4ca3b18ccfa49b68edc21452f79321e066079f1 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 19 Jan 2023 12:04:51 +1300
Subject: [PATCH 464/838] Format docker/build.py (#4313)

---
 docker/build.py | 77 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 27 deletions(-)

diff --git a/docker/build.py b/docker/build.py
index ae977f87c1..47461ddf97 100755
--- a/docker/build.py
+++ b/docker/build.py
@@ -8,32 +8,49 @@ import re
 import sys
 
 
-CHANNEL_DEV = 'dev'
-CHANNEL_BETA = 'beta'
-CHANNEL_RELEASE = 'release'
+CHANNEL_DEV = "dev"
+CHANNEL_BETA = "beta"
+CHANNEL_RELEASE = "release"
 CHANNELS = [CHANNEL_DEV, CHANNEL_BETA, CHANNEL_RELEASE]
 
-ARCH_AMD64 = 'amd64'
-ARCH_ARMV7 = 'armv7'
-ARCH_AARCH64 = 'aarch64'
+ARCH_AMD64 = "amd64"
+ARCH_ARMV7 = "armv7"
+ARCH_AARCH64 = "aarch64"
 ARCHS = [ARCH_AMD64, ARCH_ARMV7, ARCH_AARCH64]
 
-TYPE_DOCKER = 'docker'
-TYPE_HA_ADDON = 'ha-addon'
-TYPE_LINT = 'lint'
+TYPE_DOCKER = "docker"
+TYPE_HA_ADDON = "ha-addon"
+TYPE_LINT = "lint"
 TYPES = [TYPE_DOCKER, TYPE_HA_ADDON, TYPE_LINT]
 
 
 parser = argparse.ArgumentParser()
-parser.add_argument("--tag", type=str, required=True, help="The main docker tag to push to. If a version number also adds latest and/or beta tag")
-parser.add_argument("--arch", choices=ARCHS, required=False, help="The architecture to build for")
-parser.add_argument("--build-type", choices=TYPES, required=True, help="The type of build to run")
-parser.add_argument("--dry-run", action="store_true", help="Don't run any commands, just print them")
-subparsers = parser.add_subparsers(help="Action to perform", dest="command", required=True)
+parser.add_argument(
+    "--tag",
+    type=str,
+    required=True,
+    help="The main docker tag to push to. If a version number also adds latest and/or beta tag",
+)
+parser.add_argument(
+    "--arch", choices=ARCHS, required=False, help="The architecture to build for"
+)
+parser.add_argument(
+    "--build-type", choices=TYPES, required=True, help="The type of build to run"
+)
+parser.add_argument(
+    "--dry-run", action="store_true", help="Don't run any commands, just print them"
+)
+subparsers = parser.add_subparsers(
+    help="Action to perform", dest="command", required=True
+)
 build_parser = subparsers.add_parser("build", help="Build the image")
 build_parser.add_argument("--push", help="Also push the images", action="store_true")
-build_parser.add_argument("--load", help="Load the docker image locally", action="store_true")
-manifest_parser = subparsers.add_parser("manifest", help="Create a manifest from already pushed images")
+build_parser.add_argument(
+    "--load", help="Load the docker image locally", action="store_true"
+)
+manifest_parser = subparsers.add_parser(
+    "manifest", help="Create a manifest from already pushed images"
+)
 
 
 @dataclass(frozen=True)
@@ -49,7 +66,7 @@ class DockerParams:
         prefix = {
             TYPE_DOCKER: "esphome/esphome",
             TYPE_HA_ADDON: "esphome/esphome-hassio",
-            TYPE_LINT: "esphome/esphome-lint"
+            TYPE_LINT: "esphome/esphome-lint",
         }[build_type]
         build_to = f"{prefix}-{arch}"
         baseimgtype = {
@@ -128,13 +145,21 @@ def main():
 
         # 3. build
         cmd = [
-            "docker", "buildx", "build",
-            "--build-arg", f"BASEIMGTYPE={params.baseimgtype}",
-            "--build-arg", f"BUILD_VERSION={args.tag}",
-            "--cache-from", f"type=registry,ref={cache_img}",
-            "--file", "docker/Dockerfile",
-            "--platform", params.platform,
-            "--target", params.target,
+            "docker",
+            "buildx",
+            "build",
+            "--build-arg",
+            f"BASEIMGTYPE={params.baseimgtype}",
+            "--build-arg",
+            f"BUILD_VERSION={args.tag}",
+            "--cache-from",
+            f"type=registry,ref={cache_img}",
+            "--file",
+            "docker/Dockerfile",
+            "--platform",
+            params.platform,
+            "--target",
+            params.target,
         ]
         for img in imgs:
             cmd += ["--tag", img]
@@ -160,9 +185,7 @@ def main():
             run_command(*cmd)
         # 2. Push manifests
         for target in targets:
-            run_command(
-                "docker", "manifest", "push", target
-            )
+            run_command("docker", "manifest", "push", target)
 
 
 if __name__ == "__main__":

From f2eafa8fbee9dfd63d8fb183648820b243662079 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 19 Jan 2023 17:36:43 +1300
Subject: [PATCH 465/838] Add macro for sub sensor defining (#4315)

---
 esphome/components/sensor/sensor.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/esphome/components/sensor/sensor.h b/esphome/components/sensor/sensor.h
index 958230cb3c..bba69ed0bb 100644
--- a/esphome/components/sensor/sensor.h
+++ b/esphome/components/sensor/sensor.h
@@ -31,6 +31,13 @@ namespace sensor {
     } \
   }
 
+#define SUB_SENSOR(name) \
+ protected: \
+  sensor::Sensor *name##_sensor_{nullptr}; \
+\
+ public: \
+  void set_##name##_sensor(sensor::Sensor *sensor) { this->name##_sensor_ = sensor; }
+
 /**
  * Sensor state classes
  */

From 6d65671f922600b7073fad63abca3eaf225d6ec7 Mon Sep 17 00:00:00 2001
From: Stroe Andrei Catalin <catalin.stroe@conceptapps.ro>
Date: Thu, 19 Jan 2023 22:13:18 +0200
Subject: [PATCH 466/838] Add friendly name in MDNS records if it is not empty
 (#4317)

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

diff --git a/esphome/components/mdns/mdns_component.cpp b/esphome/components/mdns/mdns_component.cpp
index db47c8823c..656e0382bf 100644
--- a/esphome/components/mdns/mdns_component.cpp
+++ b/esphome/components/mdns/mdns_component.cpp
@@ -30,7 +30,7 @@ void MDNSComponent::compile_records_() {
     service.service_type = "_esphomelib";
     service.proto = "_tcp";
     service.port = api::global_api_server->get_port();
-    if (App.get_friendly_name().empty()) {
+    if (!App.get_friendly_name().empty()) {
       service.txt_records.push_back({"friendly_name", App.get_friendly_name()});
     }
     service.txt_records.push_back({"version", ESPHOME_VERSION});

From 13cfe11a19991c4900e6e8a2e8a1c39936789f7c Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Thu, 19 Jan 2023 15:28:28 -0500
Subject: [PATCH 467/838] Add upload dashboard api (#4318)

---
 esphome/dashboard/dashboard.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 0c12640a2e..8b8414c62c 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -305,6 +305,19 @@ class EsphomeRenameHandler(EsphomeCommandWebSocket):
 
 
 class EsphomeUploadHandler(EsphomeCommandWebSocket):
+    def build_command(self, json_message):
+        config_file = settings.rel_path(json_message["configuration"])
+        return [
+            "esphome",
+            "--dashboard",
+            "upload",
+            config_file,
+            "--device",
+            json_message["port"],
+        ]
+
+
+class EsphomeRunHandler(EsphomeCommandWebSocket):
     def build_command(self, json_message):
         config_file = settings.rel_path(json_message["configuration"])
         return [
@@ -1113,6 +1126,7 @@ def make_app(debug=get_bool_env(ENV_DEV)):
             (f"{rel}logout", LogoutHandler),
             (f"{rel}logs", EsphomeLogsHandler),
             (f"{rel}upload", EsphomeUploadHandler),
+            (f"{rel}run", EsphomeRunHandler),
             (f"{rel}compile", EsphomeCompileHandler),
             (f"{rel}validate", EsphomeValidateHandler),
             (f"{rel}clean-mqtt", EsphomeCleanMqttHandler),

From 66a3361e9d3638783f0fabc480b34fcf0688d46f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 20 Jan 2023 11:29:37 +1300
Subject: [PATCH 468/838] Bump esphome-dashboard to 20230120.0 (#4319)

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

diff --git a/requirements.txt b/requirements.txt
index 6ab495a797..9d59e0a1d2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.1.5  # When updating platformio, also update Dockerfile
 esptool==4.4
 click==8.1.3
-esphome-dashboard==20230117.0
+esphome-dashboard==20230120.0
 aioesphomeapi==13.1.0
 zeroconf==0.47.1
 

From a127e60e1badafcae95781dceb4bf78f88f9231e Mon Sep 17 00:00:00 2001
From: functionpointer <suspendfunction@gmail.com>
Date: Fri, 20 Jan 2023 01:56:26 +0100
Subject: [PATCH 469/838] Hydreon: Use new device classes water and
 precipitation_intensity (#3993)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/hydreon_rgxx/sensor.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/esphome/components/hydreon_rgxx/sensor.py b/esphome/components/hydreon_rgxx/sensor.py
index 730499a493..c2dbbd6737 100644
--- a/esphome/components/hydreon_rgxx/sensor.py
+++ b/esphome/components/hydreon_rgxx/sensor.py
@@ -6,8 +6,10 @@ from esphome.const import (
     CONF_MODEL,
     CONF_MOISTURE,
     CONF_TEMPERATURE,
-    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_PRECIPITATION_INTENSITY,
+    DEVICE_CLASS_PRECIPITATION,
     STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_TOTAL_INCREASING,
     UNIT_CELSIUS,
     ICON_THERMOMETER,
 )
@@ -70,31 +72,31 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_ACC): sensor.sensor_schema(
                 unit_of_measurement=UNIT_MILLIMETERS,
                 accuracy_decimals=2,
-                device_class=DEVICE_CLASS_HUMIDITY,
+                device_class=DEVICE_CLASS_PRECIPITATION,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_EVENT_ACC): sensor.sensor_schema(
                 unit_of_measurement=UNIT_MILLIMETERS,
                 accuracy_decimals=2,
-                device_class=DEVICE_CLASS_HUMIDITY,
+                device_class=DEVICE_CLASS_PRECIPITATION,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_TOTAL_ACC): sensor.sensor_schema(
                 unit_of_measurement=UNIT_MILLIMETERS,
                 accuracy_decimals=2,
-                device_class=DEVICE_CLASS_HUMIDITY,
-                state_class=STATE_CLASS_MEASUREMENT,
+                device_class=DEVICE_CLASS_PRECIPITATION,
+                state_class=STATE_CLASS_TOTAL_INCREASING,
             ),
             cv.Optional(CONF_R_INT): sensor.sensor_schema(
                 unit_of_measurement=UNIT_MILLIMETERS_PER_HOUR,
                 accuracy_decimals=2,
-                device_class=DEVICE_CLASS_HUMIDITY,
+                device_class=DEVICE_CLASS_PRECIPITATION_INTENSITY,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_MOISTURE): sensor.sensor_schema(
                 unit_of_measurement=UNIT_INTENSITY,
                 accuracy_decimals=0,
-                device_class=DEVICE_CLASS_HUMIDITY,
+                device_class=DEVICE_CLASS_PRECIPITATION_INTENSITY,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(

From 10c7055b411e4c1091ea923ed204a561f386cadb Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 20 Jan 2023 14:01:29 +1300
Subject: [PATCH 470/838] Move from docker manifest command to buildx with
 platforms (#4320)

---
 .github/workflows/release.yml | 88 ++++++++++++++++-------------------
 docker/generate_tags.py       | 68 +++++++++++++++++++++++++++
 2 files changed, 107 insertions(+), 49 deletions(-)
 create mode 100755 docker/generate_tags.py

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 432aee9938..835e853a1e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,6 +30,10 @@ jobs:
             TAG=$(cat esphome/const.py | sed -n -E "s/^__version__\s+=\s+\"(.+)\"$/\1/p")
             today="$(date --utc '+%Y%m%d')"
             TAG="${TAG}${today}"
+            BRANCH=${GITHUB_REF#refs/heads/}
+            if [[ "$BRANCH" != "dev" ]]; then
+              TAG="${TAG}-${BRANCH}"
+            fi
           fi
           echo "tag=${TAG}" >> $GITHUB_OUTPUT
         # yamllint enable rule:line-length
@@ -57,7 +61,7 @@ jobs:
         run: twine upload dist/*
 
   deploy-docker:
-    name: Build and publish docker containers
+    name: Build and publish ESPHome ${{ matrix.image.title}}
     if: github.repository == 'esphome/esphome'
     permissions:
       contents: read
@@ -66,8 +70,19 @@ jobs:
     needs: [init]
     strategy:
       matrix:
-        arch: [amd64, armv7, aarch64]
-        build_type: ["ha-addon", "docker", "lint"]
+        image:
+          - title: "ha-addon"
+            suffix: "hassio"
+            target: "hassio"
+            baseimg: "hassio"
+          - title: "docker"
+            suffix: ""
+            target: "docker"
+            baseimg: "docker"
+          - title: "lint"
+            suffix: "lint"
+            target: "lint"
+            baseimg: "docker"
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
@@ -92,54 +107,29 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Generate short tags
+        id: tags
+        run: |
+          docker/generate_tags.py \
+            --tag "${{ needs.init.outputs.tag }}" \
+            --suffix "${{ matrix.image.suffix }}"
+
       - name: Build and push
-        run: |
-          docker/build.py \
-            --tag "${{ needs.init.outputs.tag }}" \
-            --arch "${{ matrix.arch }}" \
-            --build-type "${{ matrix.build_type }}" \
-            build \
-            --push
-
-  deploy-docker-manifest:
-    if: github.repository == 'esphome/esphome'
-    permissions:
-      contents: read
-      packages: write
-    runs-on: ubuntu-latest
-    needs: [init, deploy-docker]
-    strategy:
-      matrix:
-        build_type: ["ha-addon", "docker", "lint"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: docker/build-push-action@v3
         with:
-          python-version: "3.9"
-      - name: Enable experimental manifest support
-        run: |
-          mkdir -p ~/.docker
-          echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
-
-      - name: Log in to docker hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Log in to the GitHub container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Run manifest
-        run: |
-          docker/build.py \
-            --tag "${{ needs.init.outputs.tag }}" \
-            --build-type "${{ matrix.build_type }}" \
-            manifest
+          context: .
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          target: ${{ matrix.image.target }}
+          push: true
+          # yamllint disable rule:line-length
+          cache-from: type=registry,ref=ghcr.io/${{ steps.tags.output.image }}:cache-${{ steps.tags.outputs.channel }}
+          cache-to: type=registry,ref=ghcr.io/${{ steps.tags.output.image }}:cache-${{ steps.tags.outputs.channel }},mode=max
+          # yamllint enable rule:line-length
+          tags: ${{ steps.tags.outputs.tags }}
+          build-args: |
+            BASEIMGTYPE=${{ matrix.image.baseimg }}
+            BUILD_VERSION=${{ needs.init.outputs.tag }}
 
   deploy-ha-addon-repo:
     if: github.repository == 'esphome/esphome' && github.event_name == 'release'
diff --git a/docker/generate_tags.py b/docker/generate_tags.py
new file mode 100755
index 0000000000..71d0735526
--- /dev/null
+++ b/docker/generate_tags.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+import re
+import os
+import argparse
+import json
+
+CHANNEL_DEV = "dev"
+CHANNEL_BETA = "beta"
+CHANNEL_RELEASE = "release"
+
+parser = argparse.ArgumentParser()
+parser.add_argument(
+    "--tag",
+    type=str,
+    required=True,
+    help="The main docker tag to push to. If a version number also adds latest and/or beta tag",
+)
+parser.add_argument(
+    "--suffix",
+    type=str,
+    required=True,
+    help="The suffix of the tag.",
+)
+
+
+def main():
+    args = parser.parse_args()
+
+    # detect channel from tag
+    match = re.match(r"^(\d+\.\d+)(?:\.\d+)?(b\d+)?$", args.tag)
+    major_minor_version = None
+    if match is None:
+        channel = CHANNEL_DEV
+    elif match.group(2) is None:
+        major_minor_version = match.group(1)
+        channel = CHANNEL_RELEASE
+    else:
+        channel = CHANNEL_BETA
+
+    tags_to_push = [args.tag]
+    if channel == CHANNEL_DEV:
+        tags_to_push.append("dev")
+    elif channel == CHANNEL_BETA:
+        tags_to_push.append("beta")
+    elif channel == CHANNEL_RELEASE:
+        # Additionally push to beta
+        tags_to_push.append("beta")
+        tags_to_push.append("latest")
+
+        if major_minor_version:
+            tags_to_push.append("stable")
+            tags_to_push.append(major_minor_version)
+
+    suffix = f"-{args.suffix}" if args.suffix else ""
+
+    with open(os.environ["GITHUB_OUTPUT"], "w") as f:
+        print(f"channel={channel}", file=f)
+        print(f"image=esphome/esphome{suffix}", file=f)
+        full_tags = []
+
+        for tag in tags_to_push:
+            full_tags += [f"ghcr.io/esphome/esphome{suffix}:{tag}"]
+            full_tags += [f"esphome/esphome{suffix}:{tag}"]
+        print(f"tags={','.join(full_tags)}", file=f)
+
+
+if __name__ == "__main__":
+    main()

From e236c53f050ad4f5796896a5b8343f7962d70ea9 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 20 Jan 2023 14:06:47 +1300
Subject: [PATCH 471/838] Fix missing s

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 835e853a1e..2ec2d6d0ec 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -123,8 +123,8 @@ jobs:
           target: ${{ matrix.image.target }}
           push: true
           # yamllint disable rule:line-length
-          cache-from: type=registry,ref=ghcr.io/${{ steps.tags.output.image }}:cache-${{ steps.tags.outputs.channel }}
-          cache-to: type=registry,ref=ghcr.io/${{ steps.tags.output.image }}:cache-${{ steps.tags.outputs.channel }},mode=max
+          cache-from: type=registry,ref=ghcr.io/${{ steps.tags.outputs.image }}:cache-${{ steps.tags.outputs.channel }}
+          cache-to: type=registry,ref=ghcr.io/${{ steps.tags.outputs.image }}:cache-${{ steps.tags.outputs.channel }},mode=max
           # yamllint enable rule:line-length
           tags: ${{ steps.tags.outputs.tags }}
           build-args: |

From 615d5913672a86d43a5c188e01b71327835384ff Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 19 Jan 2023 19:31:00 -1000
Subject: [PATCH 472/838] Always send the MTU request for BLE v3 cached
 connections (#4322)

closes https://github.com/esphome/esphome/pull/4321
fixes https://github.com/esphome/issues/issues/4041
fixes https://github.com/esphome/issues/issues/3951
---
 .../components/esp32_ble_client/ble_client_base.cpp    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 017d65573d..2337a5fe93 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -132,16 +132,16 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
         this->set_state(espbt::ClientState::IDLE);
         break;
       }
-      if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE) {
-        this->set_state(espbt::ClientState::CONNECTED);
-        this->state_ = espbt::ClientState::ESTABLISHED;
-        break;
-      }
       auto ret = esp_ble_gattc_send_mtu_req(this->gattc_if_, param->open.conn_id);
       if (ret) {
         ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_send_mtu_req failed, status=%x", this->connection_index_,
                  this->address_str_.c_str(), ret);
       }
+      if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE) {
+        this->set_state(espbt::ClientState::CONNECTED);
+        this->state_ = espbt::ClientState::ESTABLISHED;
+        break;
+      }
       esp_ble_gattc_search_service(esp_gattc_if, param->cfg_mtu.conn_id, nullptr);
       break;
     }

From 074f5029eb0432487ed8de7a2f91d76e6c25f3b4 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 21 Dec 2022 14:03:00 +1300
Subject: [PATCH 473/838] Fix gpio pin mode for ISR pins (#4216)

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

diff --git a/esphome/components/esp32/gpio.cpp b/esphome/components/esp32/gpio.cpp
index 758a707531..aafdf80726 100644
--- a/esphome/components/esp32/gpio.cpp
+++ b/esphome/components/esp32/gpio.cpp
@@ -128,7 +128,7 @@ void IRAM_ATTR ISRInternalGPIOPin::pin_mode(gpio::Flags flags) {
   auto *arg = reinterpret_cast<ISRPinArg *>(arg_);
   gpio_set_direction(arg->pin, flags_to_mode(flags));
   gpio_pull_mode_t pull_mode = GPIO_FLOATING;
-  if (flags & (gpio::FLAG_PULLUP | gpio::FLAG_PULLDOWN)) {
+  if ((flags & gpio::FLAG_PULLUP) && (flags & gpio::FLAG_PULLDOWN)) {
     pull_mode = GPIO_PULLUP_PULLDOWN;
   } else if (flags & gpio::FLAG_PULLUP) {
     pull_mode = GPIO_PULLUP_ONLY;

From 00f2655f1aa1a1c89251734e0d03292034434aa8 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 19 Jan 2023 19:31:00 -1000
Subject: [PATCH 474/838] Always send the MTU request for BLE v3 cached
 connections (#4322)

closes https://github.com/esphome/esphome/pull/4321
fixes https://github.com/esphome/issues/issues/4041
fixes https://github.com/esphome/issues/issues/3951
---
 .../components/esp32_ble_client/ble_client_base.cpp    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 017d65573d..2337a5fe93 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -132,16 +132,16 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
         this->set_state(espbt::ClientState::IDLE);
         break;
       }
-      if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE) {
-        this->set_state(espbt::ClientState::CONNECTED);
-        this->state_ = espbt::ClientState::ESTABLISHED;
-        break;
-      }
       auto ret = esp_ble_gattc_send_mtu_req(this->gattc_if_, param->open.conn_id);
       if (ret) {
         ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_send_mtu_req failed, status=%x", this->connection_index_,
                  this->address_str_.c_str(), ret);
       }
+      if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE) {
+        this->set_state(espbt::ClientState::CONNECTED);
+        this->state_ = espbt::ClientState::ESTABLISHED;
+        break;
+      }
       esp_ble_gattc_search_service(esp_gattc_if, param->cfg_mtu.conn_id, nullptr);
       break;
     }

From 958cadeca83360956ab62d30a9582833f748744d Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 20 Jan 2023 18:33:09 +1300
Subject: [PATCH 475/838] Bump version to 2022.12.4

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

diff --git a/esphome/const.py b/esphome/const.py
index 91c5165c99..ab11b2faf3 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.12.3"
+__version__ = "2022.12.4"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From a8b1ceb4e9d40431cdddb2c88697c13f8d24505b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 22 Dec 2022 19:07:39 +1300
Subject: [PATCH 476/838] Bump nano version in lint docker image (#4218)

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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0dd505a9b8..8243f85f29 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -139,7 +139,7 @@ RUN \
         clang-tidy-11=1:11.0.1-2 \
         patch=2.7.6-7 \
         software-properties-common=0.96.20.2-2.1 \
-        nano=5.4-2+deb11u1 \
+        nano=5.4-2+deb11u2 \
         build-essential=12.9 \
         python3-dev=3.9.2-3 \
     && rm -rf \

From a1f180411247226bf43939744eaa914da90d87ae Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 23 Jan 2023 09:06:20 +1300
Subject: [PATCH 477/838] Bump version to 2022.12.5

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

diff --git a/esphome/const.py b/esphome/const.py
index ab11b2faf3..6b2cb9dd9f 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.12.4"
+__version__ = "2022.12.5"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 2b41886819a91645dec0dfbdc0259960b4816d5d Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 20 Jan 2023 14:01:29 +1300
Subject: [PATCH 478/838] Move from docker manifest command to buildx with
 platforms (#4320)

---
 .github/workflows/release.yml | 88 ++++++++++++++++-------------------
 docker/generate_tags.py       | 68 +++++++++++++++++++++++++++
 2 files changed, 107 insertions(+), 49 deletions(-)
 create mode 100755 docker/generate_tags.py

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 432aee9938..835e853a1e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,6 +30,10 @@ jobs:
             TAG=$(cat esphome/const.py | sed -n -E "s/^__version__\s+=\s+\"(.+)\"$/\1/p")
             today="$(date --utc '+%Y%m%d')"
             TAG="${TAG}${today}"
+            BRANCH=${GITHUB_REF#refs/heads/}
+            if [[ "$BRANCH" != "dev" ]]; then
+              TAG="${TAG}-${BRANCH}"
+            fi
           fi
           echo "tag=${TAG}" >> $GITHUB_OUTPUT
         # yamllint enable rule:line-length
@@ -57,7 +61,7 @@ jobs:
         run: twine upload dist/*
 
   deploy-docker:
-    name: Build and publish docker containers
+    name: Build and publish ESPHome ${{ matrix.image.title}}
     if: github.repository == 'esphome/esphome'
     permissions:
       contents: read
@@ -66,8 +70,19 @@ jobs:
     needs: [init]
     strategy:
       matrix:
-        arch: [amd64, armv7, aarch64]
-        build_type: ["ha-addon", "docker", "lint"]
+        image:
+          - title: "ha-addon"
+            suffix: "hassio"
+            target: "hassio"
+            baseimg: "hassio"
+          - title: "docker"
+            suffix: ""
+            target: "docker"
+            baseimg: "docker"
+          - title: "lint"
+            suffix: "lint"
+            target: "lint"
+            baseimg: "docker"
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
@@ -92,54 +107,29 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Generate short tags
+        id: tags
+        run: |
+          docker/generate_tags.py \
+            --tag "${{ needs.init.outputs.tag }}" \
+            --suffix "${{ matrix.image.suffix }}"
+
       - name: Build and push
-        run: |
-          docker/build.py \
-            --tag "${{ needs.init.outputs.tag }}" \
-            --arch "${{ matrix.arch }}" \
-            --build-type "${{ matrix.build_type }}" \
-            build \
-            --push
-
-  deploy-docker-manifest:
-    if: github.repository == 'esphome/esphome'
-    permissions:
-      contents: read
-      packages: write
-    runs-on: ubuntu-latest
-    needs: [init, deploy-docker]
-    strategy:
-      matrix:
-        build_type: ["ha-addon", "docker", "lint"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: docker/build-push-action@v3
         with:
-          python-version: "3.9"
-      - name: Enable experimental manifest support
-        run: |
-          mkdir -p ~/.docker
-          echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
-
-      - name: Log in to docker hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Log in to the GitHub container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Run manifest
-        run: |
-          docker/build.py \
-            --tag "${{ needs.init.outputs.tag }}" \
-            --build-type "${{ matrix.build_type }}" \
-            manifest
+          context: .
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          target: ${{ matrix.image.target }}
+          push: true
+          # yamllint disable rule:line-length
+          cache-from: type=registry,ref=ghcr.io/${{ steps.tags.output.image }}:cache-${{ steps.tags.outputs.channel }}
+          cache-to: type=registry,ref=ghcr.io/${{ steps.tags.output.image }}:cache-${{ steps.tags.outputs.channel }},mode=max
+          # yamllint enable rule:line-length
+          tags: ${{ steps.tags.outputs.tags }}
+          build-args: |
+            BASEIMGTYPE=${{ matrix.image.baseimg }}
+            BUILD_VERSION=${{ needs.init.outputs.tag }}
 
   deploy-ha-addon-repo:
     if: github.repository == 'esphome/esphome' && github.event_name == 'release'
diff --git a/docker/generate_tags.py b/docker/generate_tags.py
new file mode 100755
index 0000000000..71d0735526
--- /dev/null
+++ b/docker/generate_tags.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+import re
+import os
+import argparse
+import json
+
+CHANNEL_DEV = "dev"
+CHANNEL_BETA = "beta"
+CHANNEL_RELEASE = "release"
+
+parser = argparse.ArgumentParser()
+parser.add_argument(
+    "--tag",
+    type=str,
+    required=True,
+    help="The main docker tag to push to. If a version number also adds latest and/or beta tag",
+)
+parser.add_argument(
+    "--suffix",
+    type=str,
+    required=True,
+    help="The suffix of the tag.",
+)
+
+
+def main():
+    args = parser.parse_args()
+
+    # detect channel from tag
+    match = re.match(r"^(\d+\.\d+)(?:\.\d+)?(b\d+)?$", args.tag)
+    major_minor_version = None
+    if match is None:
+        channel = CHANNEL_DEV
+    elif match.group(2) is None:
+        major_minor_version = match.group(1)
+        channel = CHANNEL_RELEASE
+    else:
+        channel = CHANNEL_BETA
+
+    tags_to_push = [args.tag]
+    if channel == CHANNEL_DEV:
+        tags_to_push.append("dev")
+    elif channel == CHANNEL_BETA:
+        tags_to_push.append("beta")
+    elif channel == CHANNEL_RELEASE:
+        # Additionally push to beta
+        tags_to_push.append("beta")
+        tags_to_push.append("latest")
+
+        if major_minor_version:
+            tags_to_push.append("stable")
+            tags_to_push.append(major_minor_version)
+
+    suffix = f"-{args.suffix}" if args.suffix else ""
+
+    with open(os.environ["GITHUB_OUTPUT"], "w") as f:
+        print(f"channel={channel}", file=f)
+        print(f"image=esphome/esphome{suffix}", file=f)
+        full_tags = []
+
+        for tag in tags_to_push:
+            full_tags += [f"ghcr.io/esphome/esphome{suffix}:{tag}"]
+            full_tags += [f"esphome/esphome{suffix}:{tag}"]
+        print(f"tags={','.join(full_tags)}", file=f)
+
+
+if __name__ == "__main__":
+    main()

From 5cc91cdd9558ae0419626556a5dadf3dc59b084e Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 24 Jan 2023 08:30:42 +1300
Subject: [PATCH 479/838] Bump version to 2022.12.6

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

diff --git a/esphome/const.py b/esphome/const.py
index 6b2cb9dd9f..89292c9434 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.12.5"
+__version__ = "2022.12.6"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 925e3cb6c9cde8c9a8ce2ac81c4bac0378429714 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 20 Jan 2023 14:06:47 +1300
Subject: [PATCH 480/838] Fix missing s

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 835e853a1e..2ec2d6d0ec 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -123,8 +123,8 @@ jobs:
           target: ${{ matrix.image.target }}
           push: true
           # yamllint disable rule:line-length
-          cache-from: type=registry,ref=ghcr.io/${{ steps.tags.output.image }}:cache-${{ steps.tags.outputs.channel }}
-          cache-to: type=registry,ref=ghcr.io/${{ steps.tags.output.image }}:cache-${{ steps.tags.outputs.channel }},mode=max
+          cache-from: type=registry,ref=ghcr.io/${{ steps.tags.outputs.image }}:cache-${{ steps.tags.outputs.channel }}
+          cache-to: type=registry,ref=ghcr.io/${{ steps.tags.outputs.image }}:cache-${{ steps.tags.outputs.channel }},mode=max
           # yamllint enable rule:line-length
           tags: ${{ steps.tags.outputs.tags }}
           build-args: |

From 92e66a276403b3a93967f168f5e04b1dc30ad140 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 24 Jan 2023 12:51:14 +1300
Subject: [PATCH 481/838] Dont fail workflows if lint building fails (#4336)

---
 .github/workflows/release.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2ec2d6d0ec..27843e28a6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -67,8 +67,10 @@ jobs:
       contents: read
       packages: write
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.image.title == 'lint' }}
     needs: [init]
     strategy:
+      fail-fast: false
       matrix:
         image:
           - title: "ha-addon"

From 0ea97df1afa0cf5fbd8cfd34028749a3422ef170 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 25 Jan 2023 09:58:44 +1300
Subject: [PATCH 482/838] Add MICS-4514 gas sensor (#4316)

---
 CODEOWNERS                                 |   1 +
 esphome/components/mics_4514/__init__.py   |   0
 esphome/components/mics_4514/mics_4514.cpp | 145 +++++++++++++++++++++
 esphome/components/mics_4514/mics_4514.h   |  34 +++++
 esphome/components/mics_4514/sensor.py     |  71 ++++++++++
 tests/test2.yaml                           |  14 ++
 6 files changed, 265 insertions(+)
 create mode 100644 esphome/components/mics_4514/__init__.py
 create mode 100644 esphome/components/mics_4514/mics_4514.cpp
 create mode 100644 esphome/components/mics_4514/mics_4514.h
 create mode 100644 esphome/components/mics_4514/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index cdcf1ae2d0..c9b59c099a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -145,6 +145,7 @@ esphome/components/mcp9808/* @k7hpn
 esphome/components/md5/* @esphome/core
 esphome/components/mdns/* @esphome/core
 esphome/components/media_player/* @jesserockz
+esphome/components/mics_4514/* @jesserockz
 esphome/components/midea/* @dudanov
 esphome/components/midea_ir/* @dudanov
 esphome/components/mitsubishi/* @RubyBailey
diff --git a/esphome/components/mics_4514/__init__.py b/esphome/components/mics_4514/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/mics_4514/mics_4514.cpp b/esphome/components/mics_4514/mics_4514.cpp
new file mode 100644
index 0000000000..8dc1a9f639
--- /dev/null
+++ b/esphome/components/mics_4514/mics_4514.cpp
@@ -0,0 +1,145 @@
+#include "mics_4514.h"
+
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace mics_4514 {
+
+static const char *const TAG = "mics_4514";
+
+static const uint8_t SENSOR_REGISTER = 0x04;
+static const uint8_t POWER_MODE_REGISTER = 0x0a;
+
+void MICS4514Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up MICS 4514...");
+  uint8_t power_mode;
+  this->read_register(POWER_MODE_REGISTER, &power_mode, 1);
+  if (power_mode == 0x00) {
+    ESP_LOGCONFIG(TAG, "Waking up MICS 4514");
+    power_mode = 0x01;
+    this->write_register(POWER_MODE_REGISTER, &power_mode, 1);
+    delay(100);  // NOLINT
+    this->set_timeout("warmup", 3 * 60 * 1000, [this]() {
+      this->warmed_up_ = true;
+      ESP_LOGCONFIG(TAG, "MICS 4514 setup complete.");
+    });
+    this->status_set_warning();
+    return;
+  }
+  ESP_LOGCONFIG(TAG, "Device already awake.");
+  this->warmed_up_ = true;
+  ESP_LOGCONFIG(TAG, "MICS 4514 setup complete.");
+}
+void MICS4514Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "MICS 4514:");
+  LOG_I2C_DEVICE(this);
+  LOG_UPDATE_INTERVAL(this);
+  LOG_SENSOR("  ", "Nitrogen Dioxide", this->nitrogen_dioxide_sensor_);
+  LOG_SENSOR("  ", "Carbon Monoxide", this->carbon_monoxide_sensor_);
+  LOG_SENSOR("  ", "Methane", this->methane_sensor_);
+  LOG_SENSOR("  ", "Ethanol", this->ethanol_sensor_);
+  LOG_SENSOR("  ", "Hydrogen", this->hydrogen_sensor_);
+  LOG_SENSOR("  ", "Ammonia", this->ammonia_sensor_);
+}
+float MICS4514Component::get_setup_priority() const { return setup_priority::DATA; }
+void MICS4514Component::update() {
+  if (!this->warmed_up_) {
+    return;
+  }
+  uint8_t data[6];
+  if (this->read_register(SENSOR_REGISTER, data, 6) != i2c::ERROR_OK) {
+    this->status_set_warning();
+    return;
+  }
+  this->status_clear_warning();
+  ESP_LOGV(TAG, "Got data: %02X %02X %02X %02X %02X %02X", data[0], data[1], data[2], data[3], data[4], data[5]);
+  uint16_t ox = encode_uint16(data[0], data[1]);
+  uint16_t red = encode_uint16(data[2], data[3]);
+  uint16_t power = encode_uint16(data[4], data[5]);
+
+  if (this->initial_) {
+    this->initial_ = false;
+    this->ox_calibration_ = (float) (power - ox);
+    this->red_calibration_ = (float) (power - red);
+    return;
+  }
+
+  float red_f = (float) (power - red) / this->red_calibration_;
+  float ox_f = (float) (power - ox) / this->ox_calibration_;
+
+  if (this->carbon_monoxide_sensor_ != nullptr) {
+    float co = 0.0f;
+    if (red_f <= 0.425f) {
+      co = (0.425f - red_f) / 0.000405f;
+      if (co < 1.0f)
+        co = 0.0f;
+      if (co > 1000.0f)
+        co = 1000.0f;
+    }
+    this->carbon_monoxide_sensor_->publish_state(co);
+  }
+
+  if (this->nitrogen_dioxide_sensor_ != nullptr) {
+    float nitrogendioxide = 0.0f;
+    if (ox_f >= 1.1f) {
+      nitrogendioxide = (ox_f - 0.045f) / 6.13f;
+      if (nitrogendioxide < 0.1f)
+        nitrogendioxide = 0.0f;
+      if (nitrogendioxide > 10.0f)
+        nitrogendioxide = 10.0f;
+    }
+    this->nitrogen_dioxide_sensor_->publish_state(nitrogendioxide);
+  }
+
+  if (this->methane_sensor_ != nullptr) {
+    float methane = 0.0f;
+    if (red_f <= 0.786f) {
+      methane = (0.786f - red_f) / 0.000023f;
+      if (methane < 1000.0f)
+        methane = 0.0f;
+      if (methane > 25000.0f)
+        methane = 25000.0f;
+    }
+    this->methane_sensor_->publish_state(methane);
+  }
+
+  if (this->ethanol_sensor_ != nullptr) {
+    float ethanol = 0.0f;
+    if (red_f <= 0.306f) {
+      ethanol = (0.306f - red_f) / 0.00057f;
+      if (ethanol < 10.0f)
+        ethanol = 0.0f;
+      if (ethanol > 500.0f)
+        ethanol = 500.0f;
+    }
+    this->ethanol_sensor_->publish_state(ethanol);
+  }
+
+  if (this->hydrogen_sensor_ != nullptr) {
+    float hydrogen = 0.0f;
+    if (red_f <= 0.279f) {
+      hydrogen = (0.279f - red_f) / 0.00026f;
+      if (hydrogen < 1.0f)
+        hydrogen = 0.0f;
+      if (hydrogen > 1000.0f)
+        hydrogen = 1000.0f;
+    }
+    this->hydrogen_sensor_->publish_state(hydrogen);
+  }
+
+  if (this->ammonia_sensor_ != nullptr) {
+    float ammonia = 0.0f;
+    if (red_f <= 0.8f) {
+      ammonia = (0.8f - red_f) / 0.0015f;
+      if (ammonia < 1.0f)
+        ammonia = 0.0f;
+      if (ammonia > 500.0f)
+        ammonia = 500.0f;
+    }
+    this->ammonia_sensor_->publish_state(ammonia);
+  }
+}
+
+}  // namespace mics_4514
+}  // namespace esphome
diff --git a/esphome/components/mics_4514/mics_4514.h b/esphome/components/mics_4514/mics_4514.h
new file mode 100644
index 0000000000..d2fefc3630
--- /dev/null
+++ b/esphome/components/mics_4514/mics_4514.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "esphome/components/i2c/i2c.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+
+namespace esphome {
+namespace mics_4514 {
+
+class MICS4514Component : public PollingComponent, public i2c::I2CDevice {
+  SUB_SENSOR(carbon_monoxide)
+  SUB_SENSOR(nitrogen_dioxide)
+  SUB_SENSOR(methane)
+  SUB_SENSOR(ethanol)
+  SUB_SENSOR(hydrogen)
+  SUB_SENSOR(ammonia)
+
+ public:
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void update() override;
+
+ protected:
+  bool warmed_up_{false};
+  bool initial_{true};
+
+  float ox_calibration_{0};
+  float red_calibration_{0};
+};
+
+}  // namespace mics_4514
+}  // namespace esphome
diff --git a/esphome/components/mics_4514/sensor.py b/esphome/components/mics_4514/sensor.py
new file mode 100644
index 0000000000..80c3524f66
--- /dev/null
+++ b/esphome/components/mics_4514/sensor.py
@@ -0,0 +1,71 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+
+from esphome.components import sensor, i2c
+
+from esphome.const import (
+    CONF_ID,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_PARTS_PER_MILLION,
+)
+
+CODEOWNERS = ["@jesserockz"]
+DEPENDENCIES = ["i2c"]
+
+CONF_CARBON_MONOXIDE = "carbon_monoxide"
+CONF_NITROGEN_DIOXIDE = "nitrogen_dioxide"
+CONF_METHANE = "methane"
+CONF_ETHANOL = "ethanol"
+CONF_HYDROGEN = "hydrogen"
+CONF_AMMONIA = "ammonia"
+
+
+mics_4514_ns = cg.esphome_ns.namespace("mics_4514")
+MICS4514Component = mics_4514_ns.class_(
+    "MICS4514Component", cg.PollingComponent, i2c.I2CDevice
+)
+
+SENSORS = [
+    CONF_CARBON_MONOXIDE,
+    CONF_METHANE,
+    CONF_ETHANOL,
+    CONF_HYDROGEN,
+    CONF_AMMONIA,
+]
+
+common_sensor_schema = sensor.sensor_schema(
+    unit_of_measurement=UNIT_PARTS_PER_MILLION,
+    state_class=STATE_CLASS_MEASUREMENT,
+    accuracy_decimals=2,
+)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(MICS4514Component),
+            cv.Optional(CONF_NITROGEN_DIOXIDE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PARTS_PER_MILLION,
+                state_class=STATE_CLASS_MEASUREMENT,
+                accuracy_decimals=2,
+            ),
+        }
+    )
+    .extend({cv.Optional(sensor_type): common_sensor_schema for sensor_type in SENSORS})
+    .extend(i2c.i2c_device_schema(0x75))
+    .extend(cv.polling_component_schema("60s"))
+)
+
+
+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 sensor_type in SENSORS:
+        if sensor_type in config:
+            sens = await sensor.new_sensor(config[sensor_type])
+            cg.add(getattr(var, f"set_{sensor_type}_sensor")(sens))
+
+    if CONF_NITROGEN_DIOXIDE in config:
+        sens = await sensor.new_sensor(config[CONF_NITROGEN_DIOXIDE])
+        cg.add(var.set_nitrogen_dioxide_sensor(sens))
diff --git a/tests/test2.yaml b/tests/test2.yaml
index 2c94333c03..3e6a186320 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -381,6 +381,20 @@ sensor:
     temperature_sensor: ha_hello_world_temperature
     ph:
       name: Ufire pH
+  - platform: mics_4514
+    update_interval: 60s
+    nitrogen_dioxide:
+      name: MICS-4514 NO2
+    carbon_monoxide:
+      name: MICS-4514 CO
+    methane:
+      name: MICS-4514 CH4
+    hydrogen:
+      name: MICS-4514 H2
+    ethanol:
+      name: MICS-4514 C2H5OH
+    ammonia:
+      name: MICS-4514 NH3
 
 time:
   - platform: homeassistant

From 4aac76c549800ee22ef83730eb6d5dddef2c985c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 25 Jan 2023 14:36:30 +1300
Subject: [PATCH 483/838] Refactor esp32_ble_tracker to use esp32_ble core ble
 setup code (#4173)

---
 esphome/components/esp32_ble/__init__.py      |   8 +-
 esphome/components/esp32_ble/ble.cpp          |  60 ++--
 esphome/components/esp32_ble/ble.h            |  48 +--
 .../queue.h => esp32_ble/ble_event.h}         |  95 +++---
 esphome/components/esp32_ble/ble_uuid.cpp     |  40 ++-
 esphome/components/esp32_ble/ble_uuid.h       |   4 +-
 esphome/components/esp32_ble/queue.h          |  87 +----
 .../components/esp32_ble_server/__init__.py   |  20 +-
 .../esp32_ble_server/ble_server.cpp           |   3 +-
 .../components/esp32_ble_server/ble_server.h  |   6 +-
 .../components/esp32_ble_tracker/__init__.py  |  19 +-
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   | 311 +-----------------
 .../esp32_ble_tracker/esp32_ble_tracker.h     |  57 +---
 esphome/components/esp32_improv/__init__.py   |   2 +-
 14 files changed, 192 insertions(+), 568 deletions(-)
 rename esphome/components/{esp32_ble_tracker/queue.h => esp32_ble/ble_event.h} (50%)

diff --git a/esphome/components/esp32_ble/__init__.py b/esphome/components/esp32_ble/__init__.py
index c6bb296cdc..3dc4af1058 100644
--- a/esphome/components/esp32_ble/__init__.py
+++ b/esphome/components/esp32_ble/__init__.py
@@ -6,13 +6,19 @@ from esphome.components.esp32 import add_idf_sdkconfig_option, get_esp32_variant
 
 DEPENDENCIES = ["esp32"]
 CODEOWNERS = ["@jesserockz"]
-CONFLICTS_WITH = ["esp32_ble_tracker", "esp32_ble_beacon"]
+CONFLICTS_WITH = ["esp32_ble_beacon"]
+
+CONF_BLE_ID = "ble_id"
 
 NO_BLUTOOTH_VARIANTS = [const.VARIANT_ESP32S2]
 
 esp32_ble_ns = cg.esphome_ns.namespace("esp32_ble")
 ESP32BLE = esp32_ble_ns.class_("ESP32BLE", cg.Component)
 
+GAPEventHandler = esp32_ble_ns.class_("GAPEventHandler")
+GATTcEventHandler = esp32_ble_ns.class_("GATTcEventHandler")
+GATTsEventHandler = esp32_ble_ns.class_("GATTsEventHandler")
+
 
 CONFIG_SCHEMA = cv.Schema(
     {
diff --git a/esphome/components/esp32_ble/ble.cpp b/esphome/components/esp32_ble/ble.cpp
index ecd591d169..456332b748 100644
--- a/esphome/components/esp32_ble/ble.cpp
+++ b/esphome/components/esp32_ble/ble.cpp
@@ -4,13 +4,13 @@
 #include "esphome/core/application.h"
 #include "esphome/core/log.h"
 
-#include <nvs_flash.h>
-#include <freertos/FreeRTOSConfig.h>
-#include <esp_bt_main.h>
 #include <esp_bt.h>
-#include <freertos/FreeRTOS.h>
-#include <freertos/task.h>
+#include <esp_bt_main.h>
 #include <esp_gap_ble_api.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/FreeRTOSConfig.h>
+#include <freertos/task.h>
+#include <nvs_flash.h>
 
 #ifdef USE_ARDUINO
 #include <esp32-hal-bt.h>
@@ -40,15 +40,6 @@ void ESP32BLE::setup() {
   ESP_LOGD(TAG, "BLE setup complete");
 }
 
-void ESP32BLE::mark_failed() {
-  Component::mark_failed();
-#ifdef USE_ESP32_BLE_SERVER
-  if (this->server_ != nullptr) {
-    this->server_->mark_failed();
-  }
-#endif
-}
-
 bool ESP32BLE::ble_setup_() {
   esp_err_t err = nvs_flash_init();
   if (err != ESP_OK) {
@@ -100,13 +91,16 @@ bool ESP32BLE::ble_setup_() {
     ESP_LOGE(TAG, "esp_bluedroid_enable failed: %d", err);
     return false;
   }
-  err = esp_ble_gap_register_callback(ESP32BLE::gap_event_handler);
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "esp_ble_gap_register_callback failed: %d", err);
-    return false;
+
+  if (!this->gap_event_handlers_.empty()) {
+    err = esp_ble_gap_register_callback(ESP32BLE::gap_event_handler);
+    if (err != ESP_OK) {
+      ESP_LOGE(TAG, "esp_ble_gap_register_callback failed: %d", err);
+      return false;
+    }
   }
 
-  if (this->has_server()) {
+  if (!this->gatts_event_handlers_.empty()) {
     err = esp_ble_gatts_register_callback(ESP32BLE::gatts_event_handler);
     if (err != ESP_OK) {
       ESP_LOGE(TAG, "esp_ble_gatts_register_callback failed: %d", err);
@@ -114,7 +108,7 @@ bool ESP32BLE::ble_setup_() {
     }
   }
 
-  if (this->has_client()) {
+  if (!this->gattc_event_handlers_.empty()) {
     err = esp_ble_gattc_register_callback(ESP32BLE::gattc_event_handler);
     if (err != ESP_OK) {
       ESP_LOGE(TAG, "esp_ble_gattc_register_callback failed: %d", err);
@@ -158,6 +152,10 @@ void ESP32BLE::loop() {
         this->real_gatts_event_handler_(ble_event->event_.gatts.gatts_event, ble_event->event_.gatts.gatts_if,
                                         &ble_event->event_.gatts.gatts_param);
         break;
+      case BLEEvent::GATTC:
+        this->real_gattc_event_handler_(ble_event->event_.gattc.gattc_event, ble_event->event_.gattc.gattc_if,
+                                        &ble_event->event_.gattc.gattc_param);
+        break;
       case BLEEvent::GAP:
         this->real_gap_event_handler_(ble_event->event_.gap.gap_event, &ble_event->event_.gap.gap_param);
         break;
@@ -176,9 +174,8 @@ void ESP32BLE::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_pa
 
 void ESP32BLE::real_gap_event_handler_(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
   ESP_LOGV(TAG, "(BLE) gap_event_handler - %d", event);
-  switch (event) {
-    default:
-      break;
+  for (auto *gap_handler : this->gap_event_handlers_) {
+    gap_handler->gap_event_handler(event, param);
   }
 }
 
@@ -191,14 +188,23 @@ void ESP32BLE::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gat
 void ESP32BLE::real_gatts_event_handler_(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if,
                                          esp_ble_gatts_cb_param_t *param) {
   ESP_LOGV(TAG, "(BLE) gatts_event [esp_gatt_if: %d] - %d", gatts_if, event);
-#ifdef USE_ESP32_BLE_SERVER
-  this->server_->gatts_event_handler(event, gatts_if, param);
-#endif
+  for (auto *gatts_handler : this->gatts_event_handlers_) {
+    gatts_handler->gatts_event_handler(event, gatts_if, param);
+  }
 }
 
+void ESP32BLE::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+                                   esp_ble_gattc_cb_param_t *param) {
+  BLEEvent *new_event = new BLEEvent(event, gattc_if, param);  // NOLINT(cppcoreguidelines-owning-memory)
+  global_ble->ble_events_.push(new_event);
+}  // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks)
+
 void ESP32BLE::real_gattc_event_handler_(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                                          esp_ble_gattc_cb_param_t *param) {
-  // this->client_->gattc_event_handler(event, gattc_if, param);
+  ESP_LOGV(TAG, "(BLE) gattc_event [esp_gatt_if: %d] - %d", gattc_if, event);
+  for (auto *gattc_handler : this->gattc_event_handlers_) {
+    gattc_handler->gattc_event_handler(event, gattc_if, param);
+  }
 }
 
 float ESP32BLE::get_setup_priority() const { return setup_priority::BLUETOOTH; }
diff --git a/esphome/components/esp32_ble/ble.h b/esphome/components/esp32_ble/ble.h
index 0477dee070..5970b43688 100644
--- a/esphome/components/esp32_ble/ble.h
+++ b/esphome/components/esp32_ble/ble.h
@@ -5,17 +5,16 @@
 #include "esphome/core/component.h"
 #include "esphome/core/defines.h"
 #include "esphome/core/helpers.h"
-#include "queue.h"
 
-#ifdef USE_ESP32_BLE_SERVER
-#include "esphome/components/esp32_ble_server/ble_server.h"
-#endif
+#include "queue.h"
+#include "ble_event.h"
 
 #ifdef USE_ESP32
 
 #include <esp_gap_ble_api.h>
 #include <esp_gatts_api.h>
 #include <esp_gattc_api.h>
+
 namespace esphome {
 namespace esp32_ble {
 
@@ -26,28 +25,36 @@ typedef struct {
   uint16_t mtu;
 } conn_status_t;
 
+class GAPEventHandler {
+ public:
+  virtual void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) = 0;
+};
+
+class GATTcEventHandler {
+ public:
+  virtual void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+                                   esp_ble_gattc_cb_param_t *param) = 0;
+};
+
+class GATTsEventHandler {
+ public:
+  virtual void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if,
+                                   esp_ble_gatts_cb_param_t *param) = 0;
+};
+
 class ESP32BLE : public Component {
  public:
   void setup() override;
   void loop() override;
   void dump_config() override;
   float get_setup_priority() const override;
-  void mark_failed() override;
-
-  bool has_server() {
-#ifdef USE_ESP32_BLE_SERVER
-    return this->server_ != nullptr;
-#else
-    return false;
-#endif
-  }
-  bool has_client() { return false; }
 
   BLEAdvertising *get_advertising() { return this->advertising_; }
 
-#ifdef USE_ESP32_BLE_SERVER
-  void set_server(esp32_ble_server::BLEServer *server) { this->server_ = server; }
-#endif
+  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); }
+
  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);
   static void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if, esp_ble_gattc_cb_param_t *param);
@@ -59,9 +66,10 @@ class ESP32BLE : public Component {
 
   bool ble_setup_();
 
-#ifdef USE_ESP32_BLE_SERVER
-  esp32_ble_server::BLEServer *server_{nullptr};
-#endif
+  std::vector<GAPEventHandler *> gap_event_handlers_;
+  std::vector<GATTcEventHandler *> gattc_event_handlers_;
+  std::vector<GATTsEventHandler *> gatts_event_handlers_;
+
   Queue<BLEEvent> ble_events_;
   BLEAdvertising *advertising_;
 };
diff --git a/esphome/components/esp32_ble_tracker/queue.h b/esphome/components/esp32_ble/ble_event.h
similarity index 50%
rename from esphome/components/esp32_ble_tracker/queue.h
rename to esphome/components/esp32_ble/ble_event.h
index f1dcc337e8..1cf63b2fab 100644
--- a/esphome/components/esp32_ble_tracker/queue.h
+++ b/esphome/components/esp32_ble/ble_event.h
@@ -1,69 +1,23 @@
 #pragma once
 
 #ifdef USE_ESP32
-#include "esphome/core/component.h"
-#include "esphome/core/helpers.h"
 
-#include <cstring>
-#include <mutex>
-#include <queue>
 #include <vector>
 
 #include <esp_gap_ble_api.h>
 #include <esp_gattc_api.h>
-#include <freertos/FreeRTOS.h>
-#include <freertos/semphr.h>
-
-/*
- * BLE events come in from a separate Task (thread) in the ESP32 stack. Rather
- * than trying to deal with various locking strategies, all incoming GAP and GATT
- * events will simply be placed on a semaphore guarded queue. The next time the
- * component runs loop(), these events are popped off the queue and handed at
- * this safer time.
- */
+#include <esp_gatts_api.h>
 
 namespace esphome {
-namespace esp32_ble_tracker {
-
-template<class T> class Queue {
- public:
-  Queue() { m_ = xSemaphoreCreateMutex(); }
-
-  void push(T *element) {
-    if (element == nullptr)
-      return;
-    if (xSemaphoreTake(m_, 5L / portTICK_PERIOD_MS)) {
-      q_.push(element);
-      xSemaphoreGive(m_);
-    }
-  }
-
-  T *pop() {
-    T *element = nullptr;
-
-    if (xSemaphoreTake(m_, 5L / portTICK_PERIOD_MS)) {
-      if (!q_.empty()) {
-        element = q_.front();
-        q_.pop();
-      }
-      xSemaphoreGive(m_);
-    }
-    return element;
-  }
-
- protected:
-  std::queue<T *> q_;
-  SemaphoreHandle_t m_;
-};
-
-// Received GAP and GATTC events are only queued, and get processed in the main loop().
+namespace esp32_ble {
+// Received GAP, GATTC and GATTS events are only queued, and get processed in the main loop().
 // This class stores each event in a single type.
 class BLEEvent {
  public:
   BLEEvent(esp_gap_ble_cb_event_t e, esp_ble_gap_cb_param_t *p) {
     this->event_.gap.gap_event = e;
     memcpy(&this->event_.gap.gap_param, p, sizeof(esp_ble_gap_cb_param_t));
-    this->type_ = 0;
+    this->type_ = GAP;
   };
 
   BLEEvent(esp_gattc_cb_event_t e, esp_gatt_if_t i, esp_ble_gattc_cb_param_t *p) {
@@ -84,26 +38,57 @@ class BLEEvent {
       default:
         break;
     }
-    this->type_ = 1;
+    this->type_ = GATTC;
+  };
+
+  BLEEvent(esp_gatts_cb_event_t e, esp_gatt_if_t i, esp_ble_gatts_cb_param_t *p) {
+    this->event_.gatts.gatts_event = e;
+    this->event_.gatts.gatts_if = i;
+    memcpy(&this->event_.gatts.gatts_param, p, sizeof(esp_ble_gatts_cb_param_t));
+    // Need to also make a copy of relevant event data.
+    switch (e) {
+      case ESP_GATTS_WRITE_EVT:
+        this->data.assign(p->write.value, p->write.value + p->write.len);
+        this->event_.gatts.gatts_param.write.value = this->data.data();
+        break;
+      default:
+        break;
+    }
+    this->type_ = GATTS;
   };
 
   union {
-    struct gap_event {  // NOLINT(readability-identifier-naming)
+    // NOLINTNEXTLINE(readability-identifier-naming)
+    struct gap_event {
       esp_gap_ble_cb_event_t gap_event;
       esp_ble_gap_cb_param_t gap_param;
     } gap;
 
-    struct gattc_event {  // NOLINT(readability-identifier-naming)
+    // NOLINTNEXTLINE(readability-identifier-naming)
+    struct gattc_event {
       esp_gattc_cb_event_t gattc_event;
       esp_gatt_if_t gattc_if;
       esp_ble_gattc_cb_param_t gattc_param;
     } gattc;
+
+    // NOLINTNEXTLINE(readability-identifier-naming)
+    struct gatts_event {
+      esp_gatts_cb_event_t gatts_event;
+      esp_gatt_if_t gatts_if;
+      esp_ble_gatts_cb_param_t gatts_param;
+    } gatts;
   } event_;
+
   std::vector<uint8_t> data{};
-  uint8_t type_;  // 0=gap 1=gattc
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  enum ble_event_t : uint8_t {
+    GAP,
+    GATTC,
+    GATTS,
+  } type_;
 };
 
-}  // namespace esp32_ble_tracker
+}  // namespace esp32_ble
 }  // namespace esphome
 
 #endif
diff --git a/esphome/components/esp32_ble/ble_uuid.cpp b/esphome/components/esp32_ble/ble_uuid.cpp
index 8556aa87df..a50d3dbd42 100644
--- a/esphome/components/esp32_ble/ble_uuid.cpp
+++ b/esphome/components/esp32_ble/ble_uuid.cpp
@@ -27,8 +27,7 @@ ESPBTUUID ESPBTUUID::from_uint32(uint32_t uuid) {
 ESPBTUUID ESPBTUUID::from_raw(const uint8_t *data) {
   ESPBTUUID ret;
   ret.uuid_.len = ESP_UUID_LEN_128;
-  for (size_t i = 0; i < ESP_UUID_LEN_128; i++)
-    ret.uuid_.uuid.uuid128[i] = data[i];
+  memcpy(ret.uuid_.uuid.uuid128, data, ESP_UUID_LEN_128);
   return ret;
 }
 ESPBTUUID ESPBTUUID::from_raw(const std::string &data) {
@@ -91,10 +90,13 @@ ESPBTUUID ESPBTUUID::from_raw(const std::string &data) {
 ESPBTUUID ESPBTUUID::from_uuid(esp_bt_uuid_t uuid) {
   ESPBTUUID ret;
   ret.uuid_.len = uuid.len;
-  ret.uuid_.uuid.uuid16 = uuid.uuid.uuid16;
-  ret.uuid_.uuid.uuid32 = uuid.uuid.uuid32;
-  for (size_t i = 0; i < ESP_UUID_LEN_128; i++)
-    ret.uuid_.uuid.uuid128[i] = uuid.uuid.uuid128[i];
+  if (uuid.len == ESP_UUID_LEN_16) {
+    ret.uuid_.uuid.uuid16 = uuid.uuid.uuid16;
+  } else if (uuid.len == ESP_UUID_LEN_32) {
+    ret.uuid_.uuid.uuid32 = uuid.uuid.uuid32;
+  } else if (uuid.len == ESP_UUID_LEN_128) {
+    memcpy(ret.uuid_.uuid.uuid128, uuid.uuid.uuid128, ESP_UUID_LEN_128);
+  }
   return ret;
 }
 ESPBTUUID ESPBTUUID::as_128bit() const {
@@ -158,30 +160,26 @@ bool ESPBTUUID::operator==(const ESPBTUUID &uuid) const {
   }
   return false;
 }
-esp_bt_uuid_t ESPBTUUID::get_uuid() { return this->uuid_; }
-std::string ESPBTUUID::to_string() {
-  char sbuf[64];
+esp_bt_uuid_t ESPBTUUID::get_uuid() const { return this->uuid_; }
+std::string ESPBTUUID::to_string() const {
   switch (this->uuid_.len) {
     case ESP_UUID_LEN_16:
-      sprintf(sbuf, "0x%02X%02X", this->uuid_.uuid.uuid16 >> 8, this->uuid_.uuid.uuid16 & 0xff);
-      break;
+      return str_snprintf("0x%02X%02X", 6, this->uuid_.uuid.uuid16 >> 8, this->uuid_.uuid.uuid16 & 0xff);
     case ESP_UUID_LEN_32:
-      sprintf(sbuf, "0x%02X%02X%02X%02X", this->uuid_.uuid.uuid32 >> 24, (this->uuid_.uuid.uuid32 >> 16 & 0xff),
-              (this->uuid_.uuid.uuid32 >> 8 & 0xff), this->uuid_.uuid.uuid32 & 0xff);
-      break;
+      return str_snprintf("0x%02X%02X%02X%02X", 10, this->uuid_.uuid.uuid32 >> 24,
+                          (this->uuid_.uuid.uuid32 >> 16 & 0xff), (this->uuid_.uuid.uuid32 >> 8 & 0xff),
+                          this->uuid_.uuid.uuid32 & 0xff);
     default:
     case ESP_UUID_LEN_128:
-      char *bpos = sbuf;
+      std::string buf;
       for (int8_t i = 15; i >= 0; i--) {
-        sprintf(bpos, "%02X", this->uuid_.uuid.uuid128[i]);
-        bpos += 2;
+        buf += str_snprintf("%02X", 2, this->uuid_.uuid.uuid128[i]);
         if (i == 6 || i == 8 || i == 10 || i == 12)
-          sprintf(bpos++, "-");
+          buf += "-";
       }
-      sbuf[47] = '\0';
-      break;
+      return buf;
   }
-  return sbuf;
+  return "";
 }
 
 }  // namespace esp32_ble
diff --git a/esphome/components/esp32_ble/ble_uuid.h b/esphome/components/esp32_ble/ble_uuid.h
index f953f9fede..790a57c59d 100644
--- a/esphome/components/esp32_ble/ble_uuid.h
+++ b/esphome/components/esp32_ble/ble_uuid.h
@@ -32,9 +32,9 @@ class ESPBTUUID {
   bool operator==(const ESPBTUUID &uuid) const;
   bool operator!=(const ESPBTUUID &uuid) const { return !(*this == uuid); }
 
-  esp_bt_uuid_t get_uuid();
+  esp_bt_uuid_t get_uuid() const;
 
-  std::string to_string();
+  std::string to_string() const;
 
  protected:
   esp_bt_uuid_t uuid_;
diff --git a/esphome/components/esp32_ble/queue.h b/esphome/components/esp32_ble/queue.h
index 8d05eca058..5b31b97ae2 100644
--- a/esphome/components/esp32_ble/queue.h
+++ b/esphome/components/esp32_ble/queue.h
@@ -2,16 +2,9 @@
 
 #ifdef USE_ESP32
 
-#include "esphome/core/component.h"
-#include "esphome/core/helpers.h"
-
-#include <queue>
 #include <mutex>
-#include <cstring>
+#include <queue>
 
-#include <esp_gap_ble_api.h>
-#include <esp_gatts_api.h>
-#include <esp_gattc_api.h>
 #include <freertos/FreeRTOS.h>
 #include <freertos/semphr.h>
 
@@ -57,84 +50,6 @@ template<class T> class Queue {
   SemaphoreHandle_t m_;
 };
 
-// Received GAP, GATTC and GATTS events are only queued, and get processed in the main loop().
-// This class stores each event in a single type.
-class BLEEvent {
- public:
-  BLEEvent(esp_gap_ble_cb_event_t e, esp_ble_gap_cb_param_t *p) {
-    this->event_.gap.gap_event = e;
-    memcpy(&this->event_.gap.gap_param, p, sizeof(esp_ble_gap_cb_param_t));
-    this->type_ = GAP;
-  };
-
-  BLEEvent(esp_gattc_cb_event_t e, esp_gatt_if_t i, esp_ble_gattc_cb_param_t *p) {
-    this->event_.gattc.gattc_event = e;
-    this->event_.gattc.gattc_if = i;
-    memcpy(&this->event_.gattc.gattc_param, p, sizeof(esp_ble_gattc_cb_param_t));
-    // Need to also make a copy of notify event data.
-    switch (e) {
-      case ESP_GATTC_NOTIFY_EVT:
-        memcpy(this->event_.gattc.data, p->notify.value, p->notify.value_len);
-        this->event_.gattc.gattc_param.notify.value = this->event_.gattc.data;
-        break;
-      case ESP_GATTC_READ_CHAR_EVT:
-      case ESP_GATTC_READ_DESCR_EVT:
-        memcpy(this->event_.gattc.data, p->read.value, p->read.value_len);
-        this->event_.gattc.gattc_param.read.value = this->event_.gattc.data;
-        break;
-      default:
-        break;
-    }
-    this->type_ = GATTC;
-  };
-
-  BLEEvent(esp_gatts_cb_event_t e, esp_gatt_if_t i, esp_ble_gatts_cb_param_t *p) {
-    this->event_.gatts.gatts_event = e;
-    this->event_.gatts.gatts_if = i;
-    memcpy(&this->event_.gatts.gatts_param, p, sizeof(esp_ble_gatts_cb_param_t));
-    // Need to also make a copy of write data.
-    switch (e) {
-      case ESP_GATTS_WRITE_EVT:
-        memcpy(this->event_.gatts.data, p->write.value, p->write.len);
-        this->event_.gatts.gatts_param.write.value = this->event_.gatts.data;
-        break;
-      default:
-        break;
-    }
-    this->type_ = GATTS;
-  };
-
-  union {
-    // NOLINTNEXTLINE(readability-identifier-naming)
-    struct gap_event {
-      esp_gap_ble_cb_event_t gap_event;
-      esp_ble_gap_cb_param_t gap_param;
-    } gap;
-
-    // NOLINTNEXTLINE(readability-identifier-naming)
-    struct gattc_event {
-      esp_gattc_cb_event_t gattc_event;
-      esp_gatt_if_t gattc_if;
-      esp_ble_gattc_cb_param_t gattc_param;
-      uint8_t data[64];
-    } gattc;
-
-    // NOLINTNEXTLINE(readability-identifier-naming)
-    struct gatts_event {
-      esp_gatts_cb_event_t gatts_event;
-      esp_gatt_if_t gatts_if;
-      esp_ble_gatts_cb_param_t gatts_param;
-      uint8_t data[64];
-    } gatts;
-  } event_;
-  // NOLINTNEXTLINE(readability-identifier-naming)
-  enum ble_event_t : uint8_t {
-    GAP,
-    GATTC,
-    GATTS,
-  } type_;
-};
-
 }  // namespace esp32_ble
 }  // namespace esphome
 
diff --git a/esphome/components/esp32_ble_server/__init__.py b/esphome/components/esp32_ble_server/__init__.py
index 2fcc5c7743..0ddfa62c1b 100644
--- a/esphome/components/esp32_ble_server/__init__.py
+++ b/esphome/components/esp32_ble_server/__init__.py
@@ -7,21 +7,25 @@ from esphome.components.esp32 import add_idf_sdkconfig_option
 
 AUTO_LOAD = ["esp32_ble"]
 CODEOWNERS = ["@jesserockz"]
-CONFLICTS_WITH = ["esp32_ble_tracker", "esp32_ble_beacon"]
+CONFLICTS_WITH = ["esp32_ble_beacon"]
 DEPENDENCIES = ["esp32"]
 
 CONF_MANUFACTURER = "manufacturer"
-CONF_BLE_ID = "ble_id"
 
 esp32_ble_server_ns = cg.esphome_ns.namespace("esp32_ble_server")
-BLEServer = esp32_ble_server_ns.class_("BLEServer", cg.Component)
+BLEServer = esp32_ble_server_ns.class_(
+    "BLEServer",
+    cg.Component,
+    esp32_ble.GATTsEventHandler,
+    cg.Parented.template(esp32_ble.ESP32BLE),
+)
 BLEServiceComponent = esp32_ble_server_ns.class_("BLEServiceComponent")
 
 
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(BLEServer),
-        cv.GenerateID(CONF_BLE_ID): cv.use_id(esp32_ble.ESP32BLE),
+        cv.GenerateID(esp32_ble.CONF_BLE_ID): cv.use_id(esp32_ble.ESP32BLE),
         cv.Optional(CONF_MANUFACTURER, default="ESPHome"): cv.string,
         cv.Optional(CONF_MODEL): cv.string,
     }
@@ -29,16 +33,18 @@ CONFIG_SCHEMA = cv.Schema(
 
 
 async def to_code(config):
-    parent = await cg.get_variable(config[CONF_BLE_ID])
     var = cg.new_Pvariable(config[CONF_ID])
+
     await cg.register_component(var, config)
 
+    parent = await cg.get_variable(config[esp32_ble.CONF_BLE_ID])
+    cg.add(parent.register_gatts_event_handler(var))
+    cg.add(var.set_parent(parent))
+
     cg.add(var.set_manufacturer(config[CONF_MANUFACTURER]))
     if CONF_MODEL in config:
         cg.add(var.set_model(config[CONF_MODEL]))
     cg.add_define("USE_ESP32_BLE_SERVER")
 
-    cg.add(parent.set_server(var))
-
     if CORE.using_esp_idf:
         add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)
diff --git a/esphome/components/esp32_ble_server/ble_server.cpp b/esphome/components/esp32_ble_server/ble_server.cpp
index 15bea07021..7cbf40c076 100644
--- a/esphome/components/esp32_ble_server/ble_server.cpp
+++ b/esphome/components/esp32_ble_server/ble_server.cpp
@@ -25,7 +25,8 @@ static const uint16_t VERSION_UUID = 0x2A26;
 static const uint16_t MANUFACTURER_UUID = 0x2A29;
 
 void BLEServer::setup() {
-  if (this->is_failed()) {
+  if (this->parent_->is_failed()) {
+    this->mark_failed();
     ESP_LOGE(TAG, "BLE Server was marked failed by ESP32BLE");
     return;
   }
diff --git a/esphome/components/esp32_ble_server/ble_server.h b/esphome/components/esp32_ble_server/ble_server.h
index f82e854090..ac759f2dcd 100644
--- a/esphome/components/esp32_ble_server/ble_server.h
+++ b/esphome/components/esp32_ble_server/ble_server.h
@@ -3,6 +3,7 @@
 #include "ble_service.h"
 #include "ble_characteristic.h"
 
+#include "esphome/components/esp32_ble/ble.h"
 #include "esphome/components/esp32_ble/ble_advertising.h"
 #include "esphome/components/esp32_ble/ble_uuid.h"
 #include "esphome/components/esp32_ble/queue.h"
@@ -32,7 +33,7 @@ class BLEServiceComponent {
   virtual void stop();
 };
 
-class BLEServer : public Component {
+class BLEServer : public Component, public GATTsEventHandler, public Parented<ESP32BLE> {
  public:
   void setup() override;
   void loop() override;
@@ -55,7 +56,8 @@ class BLEServer : public Component {
   uint32_t get_connected_client_count() { return this->connected_clients_; }
   const std::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);
+  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 register_service_component(BLEServiceComponent *component) { this->service_components_.push_back(component); }
 
diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index c20491e701..23f109b5ac 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -15,10 +15,11 @@ from esphome.const import (
     CONF_ON_BLE_SERVICE_DATA_ADVERTISE,
     CONF_ON_BLE_MANUFACTURER_DATA_ADVERTISE,
 )
+from esphome.components import esp32_ble
 from esphome.core import CORE
 from esphome.components.esp32 import add_idf_sdkconfig_option
-from esphome.components import esp32_ble
 
+AUTO_LOAD = ["esp32_ble"]
 DEPENDENCIES = ["esp32"]
 
 CONF_ESP32_BLE_ID = "esp32_ble_id"
@@ -27,7 +28,13 @@ CONF_WINDOW = "window"
 CONF_CONTINUOUS = "continuous"
 CONF_ON_SCAN_END = "on_scan_end"
 esp32_ble_tracker_ns = cg.esphome_ns.namespace("esp32_ble_tracker")
-ESP32BLETracker = esp32_ble_tracker_ns.class_("ESP32BLETracker", cg.Component)
+ESP32BLETracker = esp32_ble_tracker_ns.class_(
+    "ESP32BLETracker",
+    cg.Component,
+    esp32_ble.GAPEventHandler,
+    esp32_ble.GATTcEventHandler,
+    cg.Parented.template(esp32_ble.ESP32BLE),
+)
 ESPBTClient = esp32_ble_tracker_ns.class_("ESPBTClient")
 ESPBTDeviceListener = esp32_ble_tracker_ns.class_("ESPBTDeviceListener")
 ESPBTDevice = esp32_ble_tracker_ns.class_("ESPBTDevice")
@@ -138,6 +145,7 @@ def as_reversed_hex_array(value):
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(ESP32BLETracker),
+        cv.GenerateID(esp32_ble.CONF_BLE_ID): cv.use_id(esp32_ble.ESP32BLE),
         cv.Optional(CONF_SCAN_PARAMETERS, default={}): cv.All(
             cv.Schema(
                 {
@@ -200,6 +208,12 @@ ESP_BLE_DEVICE_SCHEMA = cv.Schema(
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, 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(var.set_parent(parent))
+
     params = config[CONF_SCAN_PARAMETERS]
     cg.add(var.set_scan_duration(params[CONF_DURATION]))
     cg.add(var.set_scan_interval(int(params[CONF_INTERVAL].total_milliseconds / 0.625)))
@@ -248,6 +262,7 @@ async def to_code(config):
         add_idf_sdkconfig_option("CONFIG_BTU_TASK_STACK_SIZE", 8192)
 
     cg.add_define("USE_OTA_STATE_CALLBACK")  # To be notified when an OTA update starts
+    cg.add_define("USE_ESP32_BLE_CLIENT")
 
 
 ESP32_BLE_START_SCAN_ACTION_SCHEMA = cv.Schema(
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 45509c489c..ea911d21e5 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -7,14 +7,14 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-#include <nvs_flash.h>
-#include <freertos/FreeRTOSConfig.h>
-#include <esp_bt_main.h>
 #include <esp_bt.h>
-#include <freertos/FreeRTOS.h>
-#include <freertos/task.h>
-#include <esp_gap_ble_api.h>
 #include <esp_bt_defs.h>
+#include <esp_bt_main.h>
+#include <esp_gap_ble_api.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/FreeRTOSConfig.h>
+#include <freertos/task.h>
+#include <nvs_flash.h>
 
 #ifdef USE_OTA
 #include "esphome/components/ota/ota_component.h"
@@ -48,14 +48,16 @@ uint64_t ble_addr_to_uint64(const esp_bd_addr_t address) {
 float ESP32BLETracker::get_setup_priority() const { return setup_priority::BLUETOOTH; }
 
 void ESP32BLETracker::setup() {
+  if (this->parent_->is_failed()) {
+    this->mark_failed();
+    ESP_LOGE(TAG, "BLE Tracker was marked failed by ESP32BLE");
+    return;
+  }
+
   global_esp32_ble_tracker = this;
   this->scan_result_lock_ = xSemaphoreCreateMutex();
   this->scan_end_lock_ = xSemaphoreCreateMutex();
   this->scanner_idle_ = true;
-  if (!ESP32BLETracker::ble_setup()) {
-    this->mark_failed();
-    return;
-  }
 
 #ifdef USE_OTA
   ota::global_ota_component->add_on_state_callback([this](ota::OTAState state, float progress, uint8_t error) {
@@ -75,18 +77,6 @@ void ESP32BLETracker::setup() {
 }
 
 void ESP32BLETracker::loop() {
-  BLEEvent *ble_event = this->ble_events_.pop();
-  while (ble_event != nullptr) {
-    if (ble_event->type_) {
-      this->real_gattc_event_handler_(ble_event->event_.gattc.gattc_event, ble_event->event_.gattc.gattc_if,
-                                      &ble_event->event_.gattc.gattc_param);
-    } else {
-      this->real_gap_event_handler_(ble_event->event_.gap.gap_event, &ble_event->event_.gap.gap_param);
-    }
-    delete ble_event;  // NOLINT(cppcoreguidelines-owning-memory)
-    ble_event = this->ble_events_.pop();
-  }
-
   int connecting = 0;
   int discovered = 0;
   int searching = 0;
@@ -238,85 +228,6 @@ void ESP32BLETracker::stop_scan() {
   this->cancel_timeout("scan");
 }
 
-bool ESP32BLETracker::ble_setup() {
-  // Initialize non-volatile storage for the bluetooth controller
-  esp_err_t err = nvs_flash_init();
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "nvs_flash_init failed: %d", err);
-    return false;
-  }
-
-#ifdef USE_ARDUINO
-  if (!btStart()) {
-    ESP_LOGE(TAG, "btStart failed: %d", esp_bt_controller_get_status());
-    return false;
-  }
-#else
-  if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_ENABLED) {
-    // start bt controller
-    if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE) {
-      esp_bt_controller_config_t cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
-      err = esp_bt_controller_init(&cfg);
-      if (err != ESP_OK) {
-        ESP_LOGE(TAG, "esp_bt_controller_init failed: %s", esp_err_to_name(err));
-        return false;
-      }
-      while (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE)
-        ;
-    }
-    if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_INITED) {
-      err = esp_bt_controller_enable(ESP_BT_MODE_BLE);
-      if (err != ESP_OK) {
-        ESP_LOGE(TAG, "esp_bt_controller_enable failed: %s", esp_err_to_name(err));
-        return false;
-      }
-    }
-    if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_ENABLED) {
-      ESP_LOGE(TAG, "esp bt controller enable failed");
-      return false;
-    }
-  }
-#endif
-
-  esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT);
-
-  err = esp_bluedroid_init();
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "esp_bluedroid_init failed: %d", err);
-    return false;
-  }
-  err = esp_bluedroid_enable();
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "esp_bluedroid_enable failed: %d", err);
-    return false;
-  }
-  err = esp_ble_gap_register_callback(ESP32BLETracker::gap_event_handler);
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "esp_ble_gap_register_callback failed: %d", err);
-    return false;
-  }
-  err = esp_ble_gattc_register_callback(ESP32BLETracker::gattc_event_handler);
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "esp_ble_gattc_register_callback failed: %d", err);
-    return false;
-  }
-
-  // Empty name
-  esp_ble_gap_set_device_name("");
-
-  esp_ble_io_cap_t iocap = ESP_IO_CAP_NONE;
-  err = esp_ble_gap_set_security_param(ESP_BLE_SM_IOCAP_MODE, &iocap, sizeof(uint8_t));
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "esp_ble_gap_set_security_param failed: %d", err);
-    return false;
-  }
-
-  // BLE takes some time to be fully set up, 200ms should be more than enough
-  delay(200);  // NOLINT
-
-  return true;
-}
-
 void ESP32BLETracker::start_scan_(bool first) {
   // The lock must be held when calling this function.
   if (xSemaphoreTake(this->scan_end_lock_, 0L)) {
@@ -369,11 +280,6 @@ void ESP32BLETracker::register_client(ESPBTClient *client) {
 }
 
 void ESP32BLETracker::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
-  BLEEvent *gap_event = new BLEEvent(event, param);  // NOLINT(cppcoreguidelines-owning-memory)
-  global_esp32_ble_tracker->ble_events_.push(gap_event);
-}  // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks)
-
-void ESP32BLETracker::real_gap_event_handler_(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
   switch (event) {
     case ESP_GAP_BLE_SCAN_RESULT_EVT:
       this->gap_scan_result_(param->scan_rst);
@@ -428,204 +334,11 @@ void ESP32BLETracker::gap_scan_result_(const esp_ble_gap_cb_param_t::ble_scan_re
 
 void ESP32BLETracker::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                                           esp_ble_gattc_cb_param_t *param) {
-  BLEEvent *gattc_event = new BLEEvent(event, gattc_if, param);  // NOLINT(cppcoreguidelines-owning-memory)
-  global_esp32_ble_tracker->ble_events_.push(gattc_event);
-}  // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks)
-
-void ESP32BLETracker::real_gattc_event_handler_(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                                                esp_ble_gattc_cb_param_t *param) {
   for (auto *client : this->clients_) {
     client->gattc_event_handler(event, gattc_if, param);
   }
 }
 
-ESPBTUUID::ESPBTUUID() : uuid_() {}
-ESPBTUUID ESPBTUUID::from_uint16(uint16_t uuid) {
-  ESPBTUUID ret;
-  ret.uuid_.len = ESP_UUID_LEN_16;
-  ret.uuid_.uuid.uuid16 = uuid;
-  return ret;
-}
-ESPBTUUID ESPBTUUID::from_uint32(uint32_t uuid) {
-  ESPBTUUID ret;
-  ret.uuid_.len = ESP_UUID_LEN_32;
-  ret.uuid_.uuid.uuid32 = uuid;
-  return ret;
-}
-ESPBTUUID ESPBTUUID::from_raw(const uint8_t *data) {
-  ESPBTUUID ret;
-  ret.uuid_.len = ESP_UUID_LEN_128;
-  for (size_t i = 0; i < ESP_UUID_LEN_128; i++)
-    ret.uuid_.uuid.uuid128[i] = data[i];
-  return ret;
-}
-ESPBTUUID ESPBTUUID::from_raw(const std::string &data) {
-  ESPBTUUID ret;
-  if (data.length() == 4) {
-    ret.uuid_.len = ESP_UUID_LEN_16;
-    ret.uuid_.uuid.uuid16 = 0;
-    for (int i = 0; i < data.length();) {
-      uint8_t msb = data.c_str()[i];
-      uint8_t lsb = data.c_str()[i + 1];
-
-      if (msb > '9')
-        msb -= 7;
-      if (lsb > '9')
-        lsb -= 7;
-      ret.uuid_.uuid.uuid16 += (((msb & 0x0F) << 4) | (lsb & 0x0F)) << (2 - i) * 4;
-      i += 2;
-    }
-  } else if (data.length() == 8) {
-    ret.uuid_.len = ESP_UUID_LEN_32;
-    ret.uuid_.uuid.uuid32 = 0;
-    for (int i = 0; i < data.length();) {
-      uint8_t msb = data.c_str()[i];
-      uint8_t lsb = data.c_str()[i + 1];
-
-      if (msb > '9')
-        msb -= 7;
-      if (lsb > '9')
-        lsb -= 7;
-      ret.uuid_.uuid.uuid32 += (((msb & 0x0F) << 4) | (lsb & 0x0F)) << (6 - i) * 4;
-      i += 2;
-    }
-  } else if (data.length() == 16) {  // how we can have 16 byte length string reprezenting 128 bit uuid??? needs to be
-                                     // investigated (lack of time)
-    ret.uuid_.len = ESP_UUID_LEN_128;
-    memcpy(ret.uuid_.uuid.uuid128, (uint8_t *) data.data(), 16);
-  } else if (data.length() == 36) {
-    // If the length of the string is 36 bytes then we will assume it is a long hex string in
-    // UUID format.
-    ret.uuid_.len = ESP_UUID_LEN_128;
-    int n = 0;
-    for (int i = 0; i < data.length();) {
-      if (data.c_str()[i] == '-')
-        i++;
-      uint8_t msb = data.c_str()[i];
-      uint8_t lsb = data.c_str()[i + 1];
-
-      if (msb > '9')
-        msb -= 7;
-      if (lsb > '9')
-        lsb -= 7;
-      ret.uuid_.uuid.uuid128[15 - n++] = ((msb & 0x0F) << 4) | (lsb & 0x0F);
-      i += 2;
-    }
-  } else {
-    ESP_LOGE(TAG, "ERROR: UUID value not 2, 4, 16 or 36 bytes - %s", data.c_str());
-  }
-  return ret;
-}
-ESPBTUUID ESPBTUUID::from_uuid(esp_bt_uuid_t uuid) {
-  ESPBTUUID ret;
-  ret.uuid_.len = uuid.len;
-  if (uuid.len == ESP_UUID_LEN_16) {
-    ret.uuid_.uuid.uuid16 = uuid.uuid.uuid16;
-  } else if (uuid.len == ESP_UUID_LEN_32) {
-    ret.uuid_.uuid.uuid32 = uuid.uuid.uuid32;
-  } else if (uuid.len == ESP_UUID_LEN_128) {
-    memcpy(ret.uuid_.uuid.uuid128, uuid.uuid.uuid128, ESP_UUID_LEN_128);
-  }
-  return ret;
-}
-ESPBTUUID ESPBTUUID::as_128bit() const {
-  if (this->uuid_.len == ESP_UUID_LEN_128) {
-    return *this;
-  }
-  uint8_t data[] = {0xFB, 0x34, 0x9B, 0x5F, 0x80, 0x00, 0x00, 0x80, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-  uint32_t uuid32;
-  if (this->uuid_.len == ESP_UUID_LEN_32) {
-    uuid32 = this->uuid_.uuid.uuid32;
-  } else {
-    uuid32 = this->uuid_.uuid.uuid16;
-  }
-  for (uint8_t i = 0; i < this->uuid_.len; i++) {
-    data[12 + i] = ((uuid32 >> i * 8) & 0xFF);
-  }
-  return ESPBTUUID::from_raw(data);
-}
-bool ESPBTUUID::contains(uint8_t data1, uint8_t data2) const {
-  if (this->uuid_.len == ESP_UUID_LEN_16) {
-    return (this->uuid_.uuid.uuid16 >> 8) == data2 && (this->uuid_.uuid.uuid16 & 0xFF) == data1;
-  } else if (this->uuid_.len == ESP_UUID_LEN_32) {
-    for (uint8_t i = 0; i < 3; i++) {
-      bool a = ((this->uuid_.uuid.uuid32 >> i * 8) & 0xFF) == data1;
-      bool b = ((this->uuid_.uuid.uuid32 >> (i + 1) * 8) & 0xFF) == data2;
-      if (a && b)
-        return true;
-    }
-  } else {
-    for (uint8_t i = 0; i < 15; i++) {
-      if (this->uuid_.uuid.uuid128[i] == data1 && this->uuid_.uuid.uuid128[i + 1] == data2)
-        return true;
-    }
-  }
-  return false;
-}
-bool ESPBTUUID::operator==(const ESPBTUUID &uuid) const {
-  if (this->uuid_.len == uuid.uuid_.len) {
-    switch (this->uuid_.len) {
-      case ESP_UUID_LEN_16:
-        if (uuid.uuid_.uuid.uuid16 == this->uuid_.uuid.uuid16) {
-          return true;
-        }
-        break;
-      case ESP_UUID_LEN_32:
-        if (uuid.uuid_.uuid.uuid32 == this->uuid_.uuid.uuid32) {
-          return true;
-        }
-        break;
-      case ESP_UUID_LEN_128:
-        for (int i = 0; i < ESP_UUID_LEN_128; i++) {
-          if (uuid.uuid_.uuid.uuid128[i] != this->uuid_.uuid.uuid128[i]) {
-            return false;
-          }
-        }
-        return true;
-        break;
-    }
-  } else {
-    return this->as_128bit() == uuid.as_128bit();
-  }
-  return false;
-}
-esp_bt_uuid_t ESPBTUUID::get_uuid() const { return this->uuid_; }
-std::string ESPBTUUID::to_string() const {
-  switch (this->uuid_.len) {
-    case ESP_UUID_LEN_16:
-      return str_snprintf("0x%02X%02X", 6, this->uuid_.uuid.uuid16 >> 8, this->uuid_.uuid.uuid16 & 0xff);
-    case ESP_UUID_LEN_32:
-      return str_snprintf("0x%02X%02X%02X%02X", 10, this->uuid_.uuid.uuid32 >> 24,
-                          (this->uuid_.uuid.uuid32 >> 16 & 0xff), (this->uuid_.uuid.uuid32 >> 8 & 0xff),
-                          this->uuid_.uuid.uuid32 & 0xff);
-    default:
-    case ESP_UUID_LEN_128:
-      std::string buf;
-      for (uint8_t i = 0; i < 16; i++) {
-        buf += str_snprintf("%02X", 2, this->uuid_.uuid.uuid128[i]);
-        if (i == 3 || i == 5 || i == 7 || i == 9)
-          buf += "-";
-      }
-      return buf;
-  }
-  return "";
-}
-
-uint64_t ESPBTUUID::get_128bit_high() const {
-  esp_bt_uuid_t uuid = this->as_128bit().get_uuid();
-  return ((uint64_t) uuid.uuid.uuid128[15] << 56) | ((uint64_t) uuid.uuid.uuid128[14] << 48) |
-         ((uint64_t) uuid.uuid.uuid128[13] << 40) | ((uint64_t) uuid.uuid.uuid128[12] << 32) |
-         ((uint64_t) uuid.uuid.uuid128[11] << 24) | ((uint64_t) uuid.uuid.uuid128[10] << 16) |
-         ((uint64_t) uuid.uuid.uuid128[9] << 8) | ((uint64_t) uuid.uuid.uuid128[8]);
-}
-uint64_t ESPBTUUID::get_128bit_low() const {
-  esp_bt_uuid_t uuid = this->as_128bit().get_uuid();
-  return ((uint64_t) uuid.uuid.uuid128[7] << 56) | ((uint64_t) uuid.uuid.uuid128[6] << 48) |
-         ((uint64_t) uuid.uuid.uuid128[5] << 40) | ((uint64_t) uuid.uuid.uuid128[4] << 32) |
-         ((uint64_t) uuid.uuid.uuid128[3] << 24) | ((uint64_t) uuid.uuid.uuid128[2] << 16) |
-         ((uint64_t) uuid.uuid.uuid128[1] << 8) | ((uint64_t) uuid.uuid.uuid128[0]);
-}
-
 ESPBLEiBeacon::ESPBLEiBeacon(const uint8_t *data) { memcpy(&this->beacon_data_, data, sizeof(beacon_data_)); }
 optional<ESPBLEiBeacon> ESPBLEiBeacon::from_manufacturer_data(const ServiceData &data) {
   if (!data.uuid.contains(0x4C, 0x00))
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index e6f7829353..d1f72cf78d 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "esphome/core/component.h"
 #include "esphome/core/automation.h"
+#include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
-#include "queue.h"
 
 #include <array>
 #include <string>
@@ -15,40 +14,16 @@
 #include <esp_gattc_api.h>
 #include <esp_bt_defs.h>
 
+#include <freertos/FreeRTOS.h>
+#include <freertos/semphr.h>
+
+#include "esphome/components/esp32_ble/ble.h"
+#include "esphome/components/esp32_ble/ble_uuid.h"
+
 namespace esphome {
 namespace esp32_ble_tracker {
 
-class ESPBTUUID {
- public:
-  ESPBTUUID();
-
-  static ESPBTUUID from_uint16(uint16_t uuid);
-
-  static ESPBTUUID from_uint32(uint32_t uuid);
-
-  static ESPBTUUID from_raw(const uint8_t *data);
-
-  static ESPBTUUID from_raw(const std::string &data);
-
-  static ESPBTUUID from_uuid(esp_bt_uuid_t uuid);
-
-  ESPBTUUID as_128bit() const;
-
-  bool contains(uint8_t data1, uint8_t data2) const;
-
-  bool operator==(const ESPBTUUID &uuid) const;
-  bool operator!=(const ESPBTUUID &uuid) const { return !(*this == uuid); }
-
-  esp_bt_uuid_t get_uuid() const;
-
-  std::string to_string() const;
-
-  uint64_t get_128bit_high() const;
-  uint64_t get_128bit_low() const;
-
- protected:
-  esp_bt_uuid_t uuid_;
-};
+using namespace esp32_ble;
 
 using adv_data_t = std::vector<uint8_t>;
 
@@ -191,7 +166,7 @@ class ESPBTClient : public ESPBTDeviceListener {
   ClientState state_;
 };
 
-class ESP32BLETracker : public Component {
+class ESP32BLETracker : public Component, public GAPEventHandler, public GATTcEventHandler, 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; }
@@ -218,16 +193,15 @@ class ESP32BLETracker : public Component {
   void start_scan();
   void stop_scan();
 
+  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;
+
  protected:
-  /// The FreeRTOS task managing the bluetooth interface.
-  static bool ble_setup();
   /// 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
   void end_of_scan_();
-  /// Callback that will handle all GAP events and redistribute them to other callbacks.
-  static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param);
-  void real_gap_event_handler_(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param);
   /// Called when a `ESP_GAP_BLE_SCAN_RESULT_EVT` event is received.
   void gap_scan_result_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param);
   /// Called when a `ESP_GAP_BLE_SCAN_PARAM_SET_COMPLETE_EVT` event is received.
@@ -238,9 +212,6 @@ class ESP32BLETracker : public Component {
   void gap_scan_stop_complete_(const esp_ble_gap_cb_param_t::ble_scan_stop_cmpl_evt_param &param);
 
   int app_id_;
-  /// Callback that will handle all GATTC events and redistribute them to other callbacks.
-  static void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if, esp_ble_gattc_cb_param_t *param);
-  void real_gattc_event_handler_(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if, esp_ble_gattc_cb_param_t *param);
 
   /// Vector of addresses that have already been printed in print_bt_device_info
   std::vector<uint64_t> already_discovered_;
@@ -263,8 +234,6 @@ class ESP32BLETracker : public Component {
   esp_ble_gap_cb_param_t::ble_scan_result_evt_param scan_result_buffer_[16];
   esp_bt_status_t scan_start_failed_{ESP_BT_STATUS_SUCCESS};
   esp_bt_status_t scan_set_param_failed_{ESP_BT_STATUS_SUCCESS};
-
-  Queue<BLEEvent> ble_events_;
 };
 
 // NOLINTNEXTLINE
diff --git a/esphome/components/esp32_improv/__init__.py b/esphome/components/esp32_improv/__init__.py
index 1e50418e01..7170a6dabf 100644
--- a/esphome/components/esp32_improv/__init__.py
+++ b/esphome/components/esp32_improv/__init__.py
@@ -6,7 +6,7 @@ from esphome.const import CONF_ID
 
 AUTO_LOAD = ["binary_sensor", "output", "esp32_ble_server"]
 CODEOWNERS = ["@jesserockz"]
-CONFLICTS_WITH = ["esp32_ble_tracker", "esp32_ble_beacon"]
+CONFLICTS_WITH = ["esp32_ble_beacon"]
 DEPENDENCIES = ["wifi", "esp32"]
 
 CONF_AUTHORIZED_DURATION = "authorized_duration"

From 79040c116d00b95eaf85c65b3e861cb64398c01a Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 25 Jan 2023 14:37:01 +1300
Subject: [PATCH 484/838] Add next_url to improv serial component config
 (#4343)

---
 CODEOWNERS                                    |  1 +
 esphome/components/improv_base/__init__.py    | 42 +++++++++++++++++++
 .../components/improv_base/improv_base.cpp    | 32 ++++++++++++++
 esphome/components/improv_base/improv_base.h  | 18 ++++++++
 esphome/components/improv_serial/__init__.py  | 18 +++++---
 .../improv_serial/improv_serial_component.cpp |  3 ++
 .../improv_serial/improv_serial_component.h   |  3 +-
 tests/test3.yaml                              |  1 +
 8 files changed, 111 insertions(+), 7 deletions(-)
 create mode 100644 esphome/components/improv_base/__init__.py
 create mode 100644 esphome/components/improv_base/improv_base.cpp
 create mode 100644 esphome/components/improv_base/improv_base.h

diff --git a/CODEOWNERS b/CODEOWNERS
index c9b59c099a..49b3df9b50 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -107,6 +107,7 @@ esphome/components/hte501/* @Stock-M
 esphome/components/hydreon_rgxx/* @functionpointer
 esphome/components/i2c/* @esphome/core
 esphome/components/i2s_audio/* @jesserockz
+esphome/components/improv_base/* @esphome/core
 esphome/components/improv_serial/* @esphome/core
 esphome/components/ina260/* @MrEditor97
 esphome/components/inkbird_ibsth1_mini/* @fkirill
diff --git a/esphome/components/improv_base/__init__.py b/esphome/components/improv_base/__init__.py
new file mode 100644
index 0000000000..5c2853a5c6
--- /dev/null
+++ b/esphome/components/improv_base/__init__.py
@@ -0,0 +1,42 @@
+import re
+
+import esphome.config_validation as cv
+import esphome.codegen as cg
+
+from esphome.const import __version__
+
+CODEOWNERS = ["@esphome/core"]
+
+CONF_NEXT_URL = "next_url"
+
+VALID_SUBSTITUTIONS = ["esphome_version", "ip_address", "device_name"]
+
+
+def validate_next_url(value):
+    value = cv.url(value)
+    test = r"{{(?!" + r"\b|".join(VALID_SUBSTITUTIONS) + r"\b)(\w+)}}"
+    result = re.search(test, value)
+    if result:
+        raise cv.Invalid(
+            f"Invalid substitution(s) ({', '.join(result.groups())}) in next_url. Valid substitutions are: {', '.join(VALID_SUBSTITUTIONS)}"
+        )
+    return value
+
+
+IMPROV_SCHEMA = cv.Schema(
+    {
+        cv.Optional(CONF_NEXT_URL): validate_next_url,
+    }
+)
+
+
+def _process_next_url(url: str):
+    if "{{esphome_version}}" in url:
+        url = url.replace("{{esphome_version}}", __version__)
+    return url
+
+
+async def setup_improv_core(var, config):
+    if CONF_NEXT_URL in config:
+        cg.add(var.set_next_url(_process_next_url(config[CONF_NEXT_URL])))
+    cg.add_library("esphome/Improv", "1.2.3")
diff --git a/esphome/components/improv_base/improv_base.cpp b/esphome/components/improv_base/improv_base.cpp
new file mode 100644
index 0000000000..c95b3a77ec
--- /dev/null
+++ b/esphome/components/improv_base/improv_base.cpp
@@ -0,0 +1,32 @@
+#include "improv_base.h"
+
+#include "esphome/components/network/util.h"
+#include "esphome/core/application.h"
+
+namespace esphome {
+namespace improv_base {
+
+std::string ImprovBase::get_formatted_next_url_() {
+  if (this->next_url_.empty()) {
+    return "";
+  }
+  std::string copy = this->next_url_;
+  // Device name
+  std::size_t pos = this->next_url_.find("{{device_name}}");
+  if (pos != std::string::npos) {
+    const std::string &device_name = App.get_name();
+    copy.replace(pos, 15, device_name);
+  }
+
+  // Ip address
+  pos = this->next_url_.find("{{ip_address}}");
+  if (pos != std::string::npos) {
+    std::string ip = network::IPAddress(network::get_ip_address()).str();
+    copy.replace(pos, 14, ip);
+  }
+
+  return copy;
+}
+
+}  // namespace improv_base
+}  // namespace esphome
diff --git a/esphome/components/improv_base/improv_base.h b/esphome/components/improv_base/improv_base.h
new file mode 100644
index 0000000000..90cd02a4ab
--- /dev/null
+++ b/esphome/components/improv_base/improv_base.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <string>
+
+namespace esphome {
+namespace improv_base {
+
+class ImprovBase {
+ public:
+  void set_next_url(const std::string &next_url) { this->next_url_ = next_url; }
+
+ protected:
+  std::string get_formatted_next_url_();
+  std::string next_url_;
+};
+
+}  // namespace improv_base
+}  // namespace esphome
diff --git a/esphome/components/improv_serial/__init__.py b/esphome/components/improv_serial/__init__.py
index 4a6da6bee0..311256804b 100644
--- a/esphome/components/improv_serial/__init__.py
+++ b/esphome/components/improv_serial/__init__.py
@@ -4,7 +4,9 @@ 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"]
 DEPENDENCIES = ["logger", "wifi"]
 
@@ -12,11 +14,15 @@ improv_serial_ns = cg.esphome_ns.namespace("improv_serial")
 
 ImprovSerialComponent = improv_serial_ns.class_("ImprovSerialComponent", cg.Component)
 
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(ImprovSerialComponent),
-    }
-).extend(cv.COMPONENT_SCHEMA)
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(ImprovSerialComponent),
+        }
+    )
+    .extend(improv_base.IMPROV_SCHEMA)
+    .extend(cv.COMPONENT_SCHEMA)
+)
 
 
 def validate_logger(config):
@@ -37,4 +43,4 @@ FINAL_VALIDATE_SCHEMA = validate_logger
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
-    cg.add_library("esphome/Improv", "1.2.3")
+    await improv_base.setup_improv_core(var, config)
diff --git a/esphome/components/improv_serial/improv_serial_component.cpp b/esphome/components/improv_serial/improv_serial_component.cpp
index 0dab71060c..fe19e2f085 100644
--- a/esphome/components/improv_serial/improv_serial_component.cpp
+++ b/esphome/components/improv_serial/improv_serial_component.cpp
@@ -95,6 +95,9 @@ void ImprovSerialComponent::loop() {
 
 std::vector<uint8_t> ImprovSerialComponent::build_rpc_settings_response_(improv::Command command) {
   std::vector<std::string> urls;
+  if (!this->next_url_.empty()) {
+    urls.push_back(this->get_formatted_next_url_());
+  }
 #ifdef USE_WEBSERVER
   auto ip = wifi::global_wifi_component->wifi_sta_ip();
   std::string webserver_url = "http://" + ip.str() + ":" + to_string(USE_WEBSERVER_PORT);
diff --git a/esphome/components/improv_serial/improv_serial_component.h b/esphome/components/improv_serial/improv_serial_component.h
index 3d8478252d..731f9f9984 100644
--- a/esphome/components/improv_serial/improv_serial_component.h
+++ b/esphome/components/improv_serial/improv_serial_component.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "esphome/components/improv_base/improv_base.h"
 #include "esphome/components/wifi/wifi_component.h"
 #include "esphome/core/component.h"
 #include "esphome/core/defines.h"
@@ -27,7 +28,7 @@ enum ImprovSerialType : uint8_t {
 
 static const uint8_t IMPROV_SERIAL_VERSION = 1;
 
-class ImprovSerialComponent : public Component {
+class ImprovSerialComponent : public Component, public improv_base::ImprovBase {
  public:
   void setup() override;
   void loop() override;
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 5244f41d9a..2856a3c7d7 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -298,6 +298,7 @@ logger:
   esp8266_store_log_strings_in_flash: true
 
 improv_serial:
+  next_url: https://esphome.io/?name={{device_name}}&version={{esphome_version}}&ip={{ip_address}}
 
 deep_sleep:
   run_duration: 20s

From 36c2e770bfd5b43a5471590be0d10033049eb3ea Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 25 Jan 2023 15:58:47 +1300
Subject: [PATCH 485/838] Remove state class from uptime sensor (#4345)

---
 esphome/components/uptime/sensor.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/esphome/components/uptime/sensor.py b/esphome/components/uptime/sensor.py
index 07d7d8f2cf..50e584f5d5 100644
--- a/esphome/components/uptime/sensor.py
+++ b/esphome/components/uptime/sensor.py
@@ -3,7 +3,6 @@ import esphome.config_validation as cv
 from esphome.components import sensor
 from esphome.const import (
     ENTITY_CATEGORY_DIAGNOSTIC,
-    STATE_CLASS_TOTAL_INCREASING,
     UNIT_SECOND,
     ICON_TIMER,
     DEVICE_CLASS_DURATION,
@@ -17,7 +16,6 @@ CONFIG_SCHEMA = sensor.sensor_schema(
     unit_of_measurement=UNIT_SECOND,
     icon=ICON_TIMER,
     accuracy_decimals=0,
-    state_class=STATE_CLASS_TOTAL_INCREASING,
     device_class=DEVICE_CLASS_DURATION,
     entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
 ).extend(cv.polling_component_schema("60s"))

From d94e9d92ca8262f0c652634ae8d8ccdc6f9ce7d6 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 26 Jan 2023 07:56:36 +1300
Subject: [PATCH 486/838] Fix esp32_ble_tracker setup priority (#4346)

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

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index ea911d21e5..6b0f4dc897 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -45,7 +45,7 @@ uint64_t ble_addr_to_uint64(const esp_bd_addr_t address) {
   return u;
 }
 
-float ESP32BLETracker::get_setup_priority() const { return setup_priority::BLUETOOTH; }
+float ESP32BLETracker::get_setup_priority() const { return setup_priority::AFTER_BLUETOOTH; }
 
 void ESP32BLETracker::setup() {
   if (this->parent_->is_failed()) {

From b27a328d1e8a575bfa674a0d05b8972941a03356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= <joasoe@gmail.com>
Date: Wed, 25 Jan 2023 23:55:06 +0100
Subject: [PATCH 487/838] Add "content" to deploy-ha-addon-repo dispatch
 (#4349)

---
 .github/workflows/release.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 27843e28a6..3a1a13628f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -142,11 +142,10 @@ jobs:
           TOKEN: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
         # yamllint disable rule:line-length
         run: |
-          TAG="${GITHUB_REF#refs/tags/}"
           curl \
             -u ":$TOKEN" \
             -X POST \
             -H "Accept: application/vnd.github.v3+json" \
             https://api.github.com/repos/esphome/home-assistant-addon/actions/workflows/bump-version.yml/dispatches \
-            -d "{\"ref\":\"main\",\"inputs\":{\"version\":\"$TAG\"}}"
+            -d '{"ref":"main","inputs":{"version":"${{ github.event.release.tag_name }}","content":${{ toJSON(github.event.release.body) }}}}'
         # yamllint enable rule:line-length

From 4a374a466a3fed50f14db572f5ae098270074e05 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 26 Jan 2023 12:02:53 +1300
Subject: [PATCH 488/838] Fix in ble client base address parsing (#4347)

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

diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 2337a5fe93..2793a74c5a 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -40,7 +40,7 @@ void BLEClientBase::loop() {
 float BLEClientBase::get_setup_priority() const { return setup_priority::AFTER_BLUETOOTH; }
 
 bool BLEClientBase::parse_device(const espbt::ESPBTDevice &device) {
-  if (device.address_uint64() != this->address_)
+  if (this->address_ == 0 || device.address_uint64() != this->address_)
     return false;
   if (this->state_ != espbt::ClientState::IDLE && this->state_ != espbt::ClientState::SEARCHING)
     return false;
@@ -138,6 +138,7 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
                  this->address_str_.c_str(), ret);
       }
       if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE) {
+        ESP_LOGI(TAG, "[%d] [%s] Connected", this->connection_index_, this->address_str_.c_str());
         this->set_state(espbt::ClientState::CONNECTED);
         this->state_ = espbt::ClientState::ESTABLISHED;
         break;
@@ -189,6 +190,7 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
         ESP_LOGV(TAG, "[%d] [%s]  start_handle: 0x%x  end_handle: 0x%x", this->connection_index_,
                  this->address_str_.c_str(), svc->start_handle, svc->end_handle);
       }
+      ESP_LOGI(TAG, "[%d] [%s] Connected", this->connection_index_, this->address_str_.c_str());
       this->set_state(espbt::ClientState::CONNECTED);
       this->state_ = espbt::ClientState::ESTABLISHED;
       break;

From 267f0587c6a9421f7db8688bf1f43b9c2f029659 Mon Sep 17 00:00:00 2001
From: "Denis Bodor (aka Lefinnois)" <dbodor@protonmail.com>
Date: Thu, 26 Jan 2023 00:06:46 +0100
Subject: [PATCH 489/838] fix stepper jump back with small steps (#4339)

---
 esphome/components/a4988/a4988.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/a4988/a4988.cpp b/esphome/components/a4988/a4988.cpp
index 429fa25648..ae2df3233a 100644
--- a/esphome/components/a4988/a4988.cpp
+++ b/esphome/components/a4988/a4988.cpp
@@ -46,6 +46,7 @@ void A4988::loop() {
     return;
 
   this->dir_pin_->digital_write(dir == 1);
+  delayMicroseconds(50);
   this->step_pin_->digital_write(true);
   delayMicroseconds(5);
   this->step_pin_->digital_write(false);

From 4d72eb42a5541ee957952c5be217e747812458e9 Mon Sep 17 00:00:00 2001
From: Stephan Martin <designer2k2@gmail.com>
Date: Thu, 26 Jan 2023 00:08:55 +0100
Subject: [PATCH 490/838] rename esp32 CAN to TWAI, so it compiles again
 (#4334)

fixes https://github.com/esphome/issues/issues/4023
---
 esphome/components/esp32_can/esp32_can.cpp | 50 +++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/esphome/components/esp32_can/esp32_can.cpp b/esphome/components/esp32_can/esp32_can.cpp
index baae683988..3eb2d1f035 100644
--- a/esphome/components/esp32_can/esp32_can.cpp
+++ b/esphome/components/esp32_can/esp32_can.cpp
@@ -2,7 +2,7 @@
 #include "esp32_can.h"
 #include "esphome/core/log.h"
 
-#include <driver/can.h>
+#include <driver/twai.h>
 
 // WORKAROUND, because CAN_IO_UNUSED is just defined as (-1) in this version
 // of the framework which does not work with -fpermissive
@@ -14,25 +14,25 @@ namespace esp32_can {
 
 static const char *const TAG = "esp32_can";
 
-static bool get_bitrate(canbus::CanSpeed bitrate, can_timing_config_t *t_config) {
+static bool get_bitrate(canbus::CanSpeed bitrate, twai_timing_config_t *t_config) {
   switch (bitrate) {
     case canbus::CAN_50KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_50KBITS();
+      *t_config = (twai_timing_config_t) TWAI_TIMING_CONFIG_50KBITS();
       return true;
     case canbus::CAN_100KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_100KBITS();
+      *t_config = (twai_timing_config_t) TWAI_TIMING_CONFIG_100KBITS();
       return true;
     case canbus::CAN_125KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_125KBITS();
+      *t_config = (twai_timing_config_t) TWAI_TIMING_CONFIG_125KBITS();
       return true;
     case canbus::CAN_250KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_250KBITS();
+      *t_config = (twai_timing_config_t) TWAI_TIMING_CONFIG_250KBITS();
       return true;
     case canbus::CAN_500KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_500KBITS();
+      *t_config = (twai_timing_config_t) TWAI_TIMING_CONFIG_500KBITS();
       return true;
     case canbus::CAN_1000KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_1MBITS();
+      *t_config = (twai_timing_config_t) TWAI_TIMING_CONFIG_1MBITS();
       return true;
     default:
       return false;
@@ -40,10 +40,10 @@ static bool get_bitrate(canbus::CanSpeed bitrate, can_timing_config_t *t_config)
 }
 
 bool ESP32Can::setup_internal() {
-  can_general_config_t g_config =
-      CAN_GENERAL_CONFIG_DEFAULT((gpio_num_t) this->tx_, (gpio_num_t) this->rx_, CAN_MODE_NORMAL);
-  can_filter_config_t f_config = CAN_FILTER_CONFIG_ACCEPT_ALL();
-  can_timing_config_t t_config;
+  twai_general_config_t g_config =
+      TWAI_GENERAL_CONFIG_DEFAULT((gpio_num_t) this->tx_, (gpio_num_t) this->rx_, TWAI_MODE_NORMAL);
+  twai_filter_config_t f_config = TWAI_FILTER_CONFIG_ACCEPT_ALL();
+  twai_timing_config_t t_config;
 
   if (!get_bitrate(this->bit_rate_, &t_config)) {
     // invalid bit rate
@@ -51,15 +51,15 @@ bool ESP32Can::setup_internal() {
     return false;
   }
 
-  // Install CAN driver
-  if (can_driver_install(&g_config, &t_config, &f_config) != ESP_OK) {
+  // Install TWAI driver
+  if (twai_driver_install(&g_config, &t_config, &f_config) != ESP_OK) {
     // Failed to install driver
     this->mark_failed();
     return false;
   }
 
-  // Start CAN driver
-  if (can_start() != ESP_OK) {
+  // Start TWAI driver
+  if (twai_start() != ESP_OK) {
     // Failed to start driver
     this->mark_failed();
     return false;
@@ -72,15 +72,15 @@ canbus::Error ESP32Can::send_message(struct canbus::CanFrame *frame) {
     return canbus::ERROR_FAILTX;
   }
 
-  uint32_t flags = CAN_MSG_FLAG_NONE;
+  uint32_t flags = TWAI_MSG_FLAG_NONE;
   if (frame->use_extended_id) {
-    flags |= CAN_MSG_FLAG_EXTD;
+    flags |= TWAI_MSG_FLAG_EXTD;
   }
   if (frame->remote_transmission_request) {
-    flags |= CAN_MSG_FLAG_RTR;
+    flags |= TWAI_MSG_FLAG_RTR;
   }
 
-  can_message_t message = {
+  twai_message_t message = {
       .flags = flags,
       .identifier = frame->can_id,
       .data_length_code = frame->can_data_length_code,
@@ -89,7 +89,7 @@ canbus::Error ESP32Can::send_message(struct canbus::CanFrame *frame) {
     memcpy(message.data, frame->data, frame->can_data_length_code);
   }
 
-  if (can_transmit(&message, pdMS_TO_TICKS(1000)) == ESP_OK) {
+  if (twai_transmit(&message, pdMS_TO_TICKS(1000)) == ESP_OK) {
     return canbus::ERROR_OK;
   } else {
     return canbus::ERROR_ALLTXBUSY;
@@ -97,15 +97,15 @@ canbus::Error ESP32Can::send_message(struct canbus::CanFrame *frame) {
 }
 
 canbus::Error ESP32Can::read_message(struct canbus::CanFrame *frame) {
-  can_message_t message;
+  twai_message_t message;
 
-  if (can_receive(&message, 0) != ESP_OK) {
+  if (twai_receive(&message, 0) != ESP_OK) {
     return canbus::ERROR_NOMSG;
   }
 
   frame->can_id = message.identifier;
-  frame->use_extended_id = message.flags & CAN_MSG_FLAG_EXTD;
-  frame->remote_transmission_request = message.flags & CAN_MSG_FLAG_RTR;
+  frame->use_extended_id = message.flags & TWAI_MSG_FLAG_EXTD;
+  frame->remote_transmission_request = message.flags & TWAI_MSG_FLAG_RTR;
   frame->can_data_length_code = message.data_length_code;
 
   if (!frame->remote_transmission_request) {

From ded86493c28e8a118658e7ea51b50772882cb0e5 Mon Sep 17 00:00:00 2001
From: Alex <alexpetro000@gmail.com>
Date: Thu, 26 Jan 2023 02:09:38 +0300
Subject: [PATCH 491/838] Fix BME280 initialization before wifi setup (#4190)

fixes https://github.com/esphome/issues/issues/3530
---
 esphome/components/bme280/bme280.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/esphome/components/bme280/bme280.cpp b/esphome/components/bme280/bme280.cpp
index d8124f5dc3..786fc01d28 100644
--- a/esphome/components/bme280/bme280.cpp
+++ b/esphome/components/bme280/bme280.cpp
@@ -88,7 +88,10 @@ void BME280Component::setup() {
 
   // Mark as not failed before initializing. Some devices will turn off sensors to save on batteries
   // and when they come back on, the COMPONENT_STATE_FAILED bit must be unset on the component.
-  this->component_state_ &= ~COMPONENT_STATE_FAILED;
+  if ((this->component_state_ & COMPONENT_STATE_MASK) == COMPONENT_STATE_FAILED) {
+    this->component_state_ &= ~COMPONENT_STATE_MASK;
+    this->component_state_ |= COMPONENT_STATE_CONSTRUCTION;
+  }
 
   if (!this->read_byte(BME280_REGISTER_CHIPID, &chip_id)) {
     this->error_code_ = COMMUNICATION_FAILED;

From e778a445d946aec64893a9278ee9dd2ab37fcaf9 Mon Sep 17 00:00:00 2001
From: melyux <10296053+melyux@users.noreply.github.com>
Date: Wed, 25 Jan 2023 15:11:10 -0800
Subject: [PATCH 492/838] Add a soft reset in setup() for bmp280 (#4329)

fixes https://github.com/esphome/issues/issues/3383
---
 esphome/components/bmp280/bmp280.cpp | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/esphome/components/bmp280/bmp280.cpp b/esphome/components/bmp280/bmp280.cpp
index bda34e6c2b..a5b2517893 100644
--- a/esphome/components/bmp280/bmp280.cpp
+++ b/esphome/components/bmp280/bmp280.cpp
@@ -1,4 +1,5 @@
 #include "bmp280.h"
+#include "esphome/core/hal.h"
 #include "esphome/core/log.h"
 
 namespace esphome {
@@ -11,8 +12,11 @@ static const uint8_t BMP280_REGISTER_CONTROL = 0xF4;
 static const uint8_t BMP280_REGISTER_CONFIG = 0xF5;
 static const uint8_t BMP280_REGISTER_PRESSUREDATA = 0xF7;
 static const uint8_t BMP280_REGISTER_TEMPDATA = 0xFA;
+static const uint8_t BMP280_REGISTER_RESET = 0xE0;
 
 static const uint8_t BMP280_MODE_FORCED = 0b01;
+static const uint8_t BMP280_SOFT_RESET = 0xB6;
+static const uint8_t BMP280_STATUS_IM_UPDATE = 0b01;
 
 inline uint16_t combine_bytes(uint8_t msb, uint8_t lsb) { return ((msb & 0xFF) << 8) | (lsb & 0xFF); }
 
@@ -66,6 +70,28 @@ void BMP280Component::setup() {
     return;
   }
 
+  // Send a soft reset.
+  if (!this->write_byte(BMP280_REGISTER_RESET, BMP280_SOFT_RESET)) {
+    this->mark_failed();
+    return;
+  }
+  // Wait until the NVM data has finished loading.
+  uint8_t status;
+  uint8_t retry = 5;
+  do {
+    delay(2);
+    if (!this->read_byte(BMP280_REGISTER_STATUS, &status)) {
+      ESP_LOGW(TAG, "Error reading status register.");
+      this->mark_failed();
+      return;
+    }
+  } while ((status & BMP280_STATUS_IM_UPDATE) && (--retry));
+  if (status & BMP280_STATUS_IM_UPDATE) {
+    ESP_LOGW(TAG, "Timeout loading NVM.");
+    this->mark_failed();
+    return;
+  }
+
   // Read calibration
   this->calibration_.t1 = this->read_u16_le_(0x88);
   this->calibration_.t2 = this->read_s16_le_(0x8A);

From d2380756b2a4982e98b4d3a5ab41391dc40e7a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= <joasoe@gmail.com>
Date: Wed, 25 Jan 2023 23:55:06 +0100
Subject: [PATCH 493/838] Add "content" to deploy-ha-addon-repo dispatch
 (#4349)

---
 .github/workflows/release.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2ec2d6d0ec..d3b96141c4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -140,11 +140,10 @@ jobs:
           TOKEN: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
         # yamllint disable rule:line-length
         run: |
-          TAG="${GITHUB_REF#refs/tags/}"
           curl \
             -u ":$TOKEN" \
             -X POST \
             -H "Accept: application/vnd.github.v3+json" \
             https://api.github.com/repos/esphome/home-assistant-addon/actions/workflows/bump-version.yml/dispatches \
-            -d "{\"ref\":\"main\",\"inputs\":{\"version\":\"$TAG\"}}"
+            -d '{"ref":"main","inputs":{"version":"${{ github.event.release.tag_name }}","content":${{ toJSON(github.event.release.body) }}}}'
         # yamllint enable rule:line-length

From 2d0a08442e2571f11be3661a61c48f608ec91fbc Mon Sep 17 00:00:00 2001
From: "Denis Bodor (aka Lefinnois)" <dbodor@protonmail.com>
Date: Thu, 26 Jan 2023 00:06:46 +0100
Subject: [PATCH 494/838] fix stepper jump back with small steps (#4339)

---
 esphome/components/a4988/a4988.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/a4988/a4988.cpp b/esphome/components/a4988/a4988.cpp
index 429fa25648..ae2df3233a 100644
--- a/esphome/components/a4988/a4988.cpp
+++ b/esphome/components/a4988/a4988.cpp
@@ -46,6 +46,7 @@ void A4988::loop() {
     return;
 
   this->dir_pin_->digital_write(dir == 1);
+  delayMicroseconds(50);
   this->step_pin_->digital_write(true);
   delayMicroseconds(5);
   this->step_pin_->digital_write(false);

From aa7f3569ec15664631a49063454803a806a95cca Mon Sep 17 00:00:00 2001
From: Stephan Martin <designer2k2@gmail.com>
Date: Thu, 26 Jan 2023 00:08:55 +0100
Subject: [PATCH 495/838] rename esp32 CAN to TWAI, so it compiles again
 (#4334)

fixes https://github.com/esphome/issues/issues/4023
---
 esphome/components/esp32_can/esp32_can.cpp | 50 +++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/esphome/components/esp32_can/esp32_can.cpp b/esphome/components/esp32_can/esp32_can.cpp
index baae683988..3eb2d1f035 100644
--- a/esphome/components/esp32_can/esp32_can.cpp
+++ b/esphome/components/esp32_can/esp32_can.cpp
@@ -2,7 +2,7 @@
 #include "esp32_can.h"
 #include "esphome/core/log.h"
 
-#include <driver/can.h>
+#include <driver/twai.h>
 
 // WORKAROUND, because CAN_IO_UNUSED is just defined as (-1) in this version
 // of the framework which does not work with -fpermissive
@@ -14,25 +14,25 @@ namespace esp32_can {
 
 static const char *const TAG = "esp32_can";
 
-static bool get_bitrate(canbus::CanSpeed bitrate, can_timing_config_t *t_config) {
+static bool get_bitrate(canbus::CanSpeed bitrate, twai_timing_config_t *t_config) {
   switch (bitrate) {
     case canbus::CAN_50KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_50KBITS();
+      *t_config = (twai_timing_config_t) TWAI_TIMING_CONFIG_50KBITS();
       return true;
     case canbus::CAN_100KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_100KBITS();
+      *t_config = (twai_timing_config_t) TWAI_TIMING_CONFIG_100KBITS();
       return true;
     case canbus::CAN_125KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_125KBITS();
+      *t_config = (twai_timing_config_t) TWAI_TIMING_CONFIG_125KBITS();
       return true;
     case canbus::CAN_250KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_250KBITS();
+      *t_config = (twai_timing_config_t) TWAI_TIMING_CONFIG_250KBITS();
       return true;
     case canbus::CAN_500KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_500KBITS();
+      *t_config = (twai_timing_config_t) TWAI_TIMING_CONFIG_500KBITS();
       return true;
     case canbus::CAN_1000KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_1MBITS();
+      *t_config = (twai_timing_config_t) TWAI_TIMING_CONFIG_1MBITS();
       return true;
     default:
       return false;
@@ -40,10 +40,10 @@ static bool get_bitrate(canbus::CanSpeed bitrate, can_timing_config_t *t_config)
 }
 
 bool ESP32Can::setup_internal() {
-  can_general_config_t g_config =
-      CAN_GENERAL_CONFIG_DEFAULT((gpio_num_t) this->tx_, (gpio_num_t) this->rx_, CAN_MODE_NORMAL);
-  can_filter_config_t f_config = CAN_FILTER_CONFIG_ACCEPT_ALL();
-  can_timing_config_t t_config;
+  twai_general_config_t g_config =
+      TWAI_GENERAL_CONFIG_DEFAULT((gpio_num_t) this->tx_, (gpio_num_t) this->rx_, TWAI_MODE_NORMAL);
+  twai_filter_config_t f_config = TWAI_FILTER_CONFIG_ACCEPT_ALL();
+  twai_timing_config_t t_config;
 
   if (!get_bitrate(this->bit_rate_, &t_config)) {
     // invalid bit rate
@@ -51,15 +51,15 @@ bool ESP32Can::setup_internal() {
     return false;
   }
 
-  // Install CAN driver
-  if (can_driver_install(&g_config, &t_config, &f_config) != ESP_OK) {
+  // Install TWAI driver
+  if (twai_driver_install(&g_config, &t_config, &f_config) != ESP_OK) {
     // Failed to install driver
     this->mark_failed();
     return false;
   }
 
-  // Start CAN driver
-  if (can_start() != ESP_OK) {
+  // Start TWAI driver
+  if (twai_start() != ESP_OK) {
     // Failed to start driver
     this->mark_failed();
     return false;
@@ -72,15 +72,15 @@ canbus::Error ESP32Can::send_message(struct canbus::CanFrame *frame) {
     return canbus::ERROR_FAILTX;
   }
 
-  uint32_t flags = CAN_MSG_FLAG_NONE;
+  uint32_t flags = TWAI_MSG_FLAG_NONE;
   if (frame->use_extended_id) {
-    flags |= CAN_MSG_FLAG_EXTD;
+    flags |= TWAI_MSG_FLAG_EXTD;
   }
   if (frame->remote_transmission_request) {
-    flags |= CAN_MSG_FLAG_RTR;
+    flags |= TWAI_MSG_FLAG_RTR;
   }
 
-  can_message_t message = {
+  twai_message_t message = {
       .flags = flags,
       .identifier = frame->can_id,
       .data_length_code = frame->can_data_length_code,
@@ -89,7 +89,7 @@ canbus::Error ESP32Can::send_message(struct canbus::CanFrame *frame) {
     memcpy(message.data, frame->data, frame->can_data_length_code);
   }
 
-  if (can_transmit(&message, pdMS_TO_TICKS(1000)) == ESP_OK) {
+  if (twai_transmit(&message, pdMS_TO_TICKS(1000)) == ESP_OK) {
     return canbus::ERROR_OK;
   } else {
     return canbus::ERROR_ALLTXBUSY;
@@ -97,15 +97,15 @@ canbus::Error ESP32Can::send_message(struct canbus::CanFrame *frame) {
 }
 
 canbus::Error ESP32Can::read_message(struct canbus::CanFrame *frame) {
-  can_message_t message;
+  twai_message_t message;
 
-  if (can_receive(&message, 0) != ESP_OK) {
+  if (twai_receive(&message, 0) != ESP_OK) {
     return canbus::ERROR_NOMSG;
   }
 
   frame->can_id = message.identifier;
-  frame->use_extended_id = message.flags & CAN_MSG_FLAG_EXTD;
-  frame->remote_transmission_request = message.flags & CAN_MSG_FLAG_RTR;
+  frame->use_extended_id = message.flags & TWAI_MSG_FLAG_EXTD;
+  frame->remote_transmission_request = message.flags & TWAI_MSG_FLAG_RTR;
   frame->can_data_length_code = message.data_length_code;
 
   if (!frame->remote_transmission_request) {

From 7f97f4255226472fce6be0d02898e70c1d1b8545 Mon Sep 17 00:00:00 2001
From: Alex <alexpetro000@gmail.com>
Date: Thu, 26 Jan 2023 02:09:38 +0300
Subject: [PATCH 496/838] Fix BME280 initialization before wifi setup (#4190)

fixes https://github.com/esphome/issues/issues/3530
---
 esphome/components/bme280/bme280.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/esphome/components/bme280/bme280.cpp b/esphome/components/bme280/bme280.cpp
index d8124f5dc3..786fc01d28 100644
--- a/esphome/components/bme280/bme280.cpp
+++ b/esphome/components/bme280/bme280.cpp
@@ -88,7 +88,10 @@ void BME280Component::setup() {
 
   // Mark as not failed before initializing. Some devices will turn off sensors to save on batteries
   // and when they come back on, the COMPONENT_STATE_FAILED bit must be unset on the component.
-  this->component_state_ &= ~COMPONENT_STATE_FAILED;
+  if ((this->component_state_ & COMPONENT_STATE_MASK) == COMPONENT_STATE_FAILED) {
+    this->component_state_ &= ~COMPONENT_STATE_MASK;
+    this->component_state_ |= COMPONENT_STATE_CONSTRUCTION;
+  }
 
   if (!this->read_byte(BME280_REGISTER_CHIPID, &chip_id)) {
     this->error_code_ = COMMUNICATION_FAILED;

From e1cdeb7c8f82c143e03a00b9f44886874987196d Mon Sep 17 00:00:00 2001
From: melyux <10296053+melyux@users.noreply.github.com>
Date: Wed, 25 Jan 2023 15:11:10 -0800
Subject: [PATCH 497/838] Add a soft reset in setup() for bmp280 (#4329)

fixes https://github.com/esphome/issues/issues/3383
---
 esphome/components/bmp280/bmp280.cpp | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/esphome/components/bmp280/bmp280.cpp b/esphome/components/bmp280/bmp280.cpp
index bda34e6c2b..a5b2517893 100644
--- a/esphome/components/bmp280/bmp280.cpp
+++ b/esphome/components/bmp280/bmp280.cpp
@@ -1,4 +1,5 @@
 #include "bmp280.h"
+#include "esphome/core/hal.h"
 #include "esphome/core/log.h"
 
 namespace esphome {
@@ -11,8 +12,11 @@ static const uint8_t BMP280_REGISTER_CONTROL = 0xF4;
 static const uint8_t BMP280_REGISTER_CONFIG = 0xF5;
 static const uint8_t BMP280_REGISTER_PRESSUREDATA = 0xF7;
 static const uint8_t BMP280_REGISTER_TEMPDATA = 0xFA;
+static const uint8_t BMP280_REGISTER_RESET = 0xE0;
 
 static const uint8_t BMP280_MODE_FORCED = 0b01;
+static const uint8_t BMP280_SOFT_RESET = 0xB6;
+static const uint8_t BMP280_STATUS_IM_UPDATE = 0b01;
 
 inline uint16_t combine_bytes(uint8_t msb, uint8_t lsb) { return ((msb & 0xFF) << 8) | (lsb & 0xFF); }
 
@@ -66,6 +70,28 @@ void BMP280Component::setup() {
     return;
   }
 
+  // Send a soft reset.
+  if (!this->write_byte(BMP280_REGISTER_RESET, BMP280_SOFT_RESET)) {
+    this->mark_failed();
+    return;
+  }
+  // Wait until the NVM data has finished loading.
+  uint8_t status;
+  uint8_t retry = 5;
+  do {
+    delay(2);
+    if (!this->read_byte(BMP280_REGISTER_STATUS, &status)) {
+      ESP_LOGW(TAG, "Error reading status register.");
+      this->mark_failed();
+      return;
+    }
+  } while ((status & BMP280_STATUS_IM_UPDATE) && (--retry));
+  if (status & BMP280_STATUS_IM_UPDATE) {
+    ESP_LOGW(TAG, "Timeout loading NVM.");
+    this->mark_failed();
+    return;
+  }
+
   // Read calibration
   this->calibration_.t1 = this->read_u16_le_(0x88);
   this->calibration_.t2 = this->read_s16_le_(0x8A);

From c8c0bd3351d6348aab241594828bff21a18ef3b8 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 26 Jan 2023 15:00:18 +1300
Subject: [PATCH 498/838] Bump version to 2022.12.7

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

diff --git a/esphome/const.py b/esphome/const.py
index 89292c9434..12e7045a49 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.12.6"
+__version__ = "2022.12.7"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From aca56fcdcc0840d1ec590a6b36592b15079c58cb Mon Sep 17 00:00:00 2001
From: WitchKing <31471327+xvil@users.noreply.github.com>
Date: Thu, 26 Jan 2023 05:20:45 +0100
Subject: [PATCH 499/838] Added support for ADS1015 (#4281)

Co-authored-by: vilrexa-at-412611259294 <pdzBdl8EkgUikpOWsRCKzTVHMEX2wLnZJRdLhK38oNk=>
---
 esphome/components/ads1115/ads1115.cpp | 36 +++++++++++++++++++++-----
 esphome/components/ads1115/ads1115.h   |  9 ++++++-
 esphome/components/ads1115/sensor.py   | 11 ++++++++
 3 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/esphome/components/ads1115/ads1115.cpp b/esphome/components/ads1115/ads1115.cpp
index beb379db93..c3f3c00c63 100644
--- a/esphome/components/ads1115/ads1115.cpp
+++ b/esphome/components/ads1115/ads1115.cpp
@@ -9,7 +9,7 @@ static const char *const TAG = "ads1115";
 static const uint8_t ADS1115_REGISTER_CONVERSION = 0x00;
 static const uint8_t ADS1115_REGISTER_CONFIG = 0x01;
 
-static const uint8_t ADS1115_DATA_RATE_860_SPS = 0b111;
+static const uint8_t ADS1115_DATA_RATE_860_SPS = 0b111;  // 3300_SPS for ADS1015
 
 void ADS1115Component::setup() {
   ESP_LOGCONFIG(TAG, "Setting up ADS1115...");
@@ -18,6 +18,9 @@ void ADS1115Component::setup() {
     this->mark_failed();
     return;
   }
+
+  ESP_LOGCONFIG(TAG, "Configuring ADS1115...");
+
   uint16_t config = 0;
   // Clear single-shot bit
   //        0b0xxxxxxxxxxxxxxx
@@ -77,6 +80,7 @@ void ADS1115Component::dump_config() {
     LOG_SENSOR("  ", "Sensor", sensor);
     ESP_LOGCONFIG(TAG, "    Multiplexer: %u", sensor->get_multiplexer());
     ESP_LOGCONFIG(TAG, "    Gain: %u", sensor->get_gain());
+    ESP_LOGCONFIG(TAG, "    Resolution: %u", sensor->get_resolution());
   }
 }
 float ADS1115Component::request_measurement(ADS1115Sensor *sensor) {
@@ -127,27 +131,45 @@ float ADS1115Component::request_measurement(ADS1115Sensor *sensor) {
     this->status_set_warning();
     return NAN;
   }
+
+  if (sensor->get_resolution() == ADS1015_12_BITS) {
+    bool negative = (raw_conversion >> 15) == 1;
+
+    // shift raw_conversion as it's only 12-bits, left justified
+    raw_conversion = raw_conversion >> (16 - ADS1015_12_BITS);
+
+    // check if number was negative in order to keep the sign
+    if (negative) {
+      // the number was negative
+      // 1) set the negative bit back
+      raw_conversion |= 0x8000;
+      // 2) reset the former (shifted) negative bit
+      raw_conversion &= 0xF7FF;
+    }
+  }
+
   auto signed_conversion = static_cast<int16_t>(raw_conversion);
 
   float millivolts;
+  float divider = (sensor->get_resolution() == ADS1115_16_BITS) ? 32768.0f : 2048.0f;
   switch (sensor->get_gain()) {
     case ADS1115_GAIN_6P144:
-      millivolts = signed_conversion * 0.187500f;
+      millivolts = (signed_conversion * 6144) / divider;
       break;
     case ADS1115_GAIN_4P096:
-      millivolts = signed_conversion * 0.125000f;
+      millivolts = (signed_conversion * 4096) / divider;
       break;
     case ADS1115_GAIN_2P048:
-      millivolts = signed_conversion * 0.062500f;
+      millivolts = (signed_conversion * 2048) / divider;
       break;
     case ADS1115_GAIN_1P024:
-      millivolts = signed_conversion * 0.031250f;
+      millivolts = (signed_conversion * 1024) / divider;
       break;
     case ADS1115_GAIN_0P512:
-      millivolts = signed_conversion * 0.015625f;
+      millivolts = (signed_conversion * 512) / divider;
       break;
     case ADS1115_GAIN_0P256:
-      millivolts = signed_conversion * 0.007813f;
+      millivolts = (signed_conversion * 256) / divider;
       break;
     default:
       millivolts = NAN;
diff --git a/esphome/components/ads1115/ads1115.h b/esphome/components/ads1115/ads1115.h
index 17d5a910d8..0b8bfb339b 100644
--- a/esphome/components/ads1115/ads1115.h
+++ b/esphome/components/ads1115/ads1115.h
@@ -30,6 +30,11 @@ enum ADS1115Gain {
   ADS1115_GAIN_0P256 = 0b101,
 };
 
+enum ADS1115Resolution {
+  ADS1115_16_BITS = 16,
+  ADS1015_12_BITS = 12,
+};
+
 class ADS1115Sensor;
 
 class ADS1115Component : public Component, public i2c::I2CDevice {
@@ -58,15 +63,17 @@ class ADS1115Sensor : public sensor::Sensor, public PollingComponent, public vol
   void update() override;
   void set_multiplexer(ADS1115Multiplexer multiplexer) { multiplexer_ = multiplexer; }
   void set_gain(ADS1115Gain gain) { gain_ = gain; }
-
+  void set_resolution(ADS1115Resolution resolution) { resolution_ = resolution; }
   float sample() override;
   uint8_t get_multiplexer() const { return multiplexer_; }
   uint8_t get_gain() const { return gain_; }
+  uint8_t get_resolution() const { return resolution_; }
 
  protected:
   ADS1115Component *parent_;
   ADS1115Multiplexer multiplexer_;
   ADS1115Gain gain_;
+  ADS1115Resolution resolution_;
 };
 
 }  // namespace ads1115
diff --git a/esphome/components/ads1115/sensor.py b/esphome/components/ads1115/sensor.py
index 190e641ca3..f0d894e2af 100644
--- a/esphome/components/ads1115/sensor.py
+++ b/esphome/components/ads1115/sensor.py
@@ -4,6 +4,7 @@ from esphome.components import sensor, voltage_sampler
 from esphome.const import (
     CONF_GAIN,
     CONF_MULTIPLEXER,
+    CONF_RESOLUTION,
     DEVICE_CLASS_VOLTAGE,
     STATE_CLASS_MEASUREMENT,
     UNIT_VOLT,
@@ -35,6 +36,12 @@ GAIN = {
     "0.256": ADS1115Gain.ADS1115_GAIN_0P256,
 }
 
+ADS1115Resolution = ads1115_ns.enum("ADS1115Resolution")
+RESOLUTION = {
+    "16_BITS": ADS1115Resolution.ADS1115_16_BITS,
+    "12_BITS": ADS1115Resolution.ADS1015_12_BITS,
+}
+
 
 def validate_gain(value):
     if isinstance(value, float):
@@ -63,6 +70,9 @@ CONFIG_SCHEMA = (
             cv.GenerateID(CONF_ADS1115_ID): cv.use_id(ADS1115Component),
             cv.Required(CONF_MULTIPLEXER): cv.enum(MUX, upper=True, space="_"),
             cv.Required(CONF_GAIN): validate_gain,
+            cv.Optional(CONF_RESOLUTION, default="16_BITS"): cv.enum(
+                RESOLUTION, upper=True, space="_"
+            ),
         }
     )
     .extend(cv.polling_component_schema("60s"))
@@ -77,5 +87,6 @@ async def to_code(config):
 
     cg.add(var.set_multiplexer(config[CONF_MULTIPLEXER]))
     cg.add(var.set_gain(config[CONF_GAIN]))
+    cg.add(var.set_resolution(config[CONF_RESOLUTION]))
 
     cg.add(paren.register_sensor(var))

From 3e017efa3025fabe204618a19bed240ea5d23e9e Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Thu, 26 Jan 2023 17:48:04 +0100
Subject: [PATCH 500/838] Add Home Assistant integration discovery (#4328)

---
 .../etc/nginx/templates/ingress.gtpl          |  2 ++
 .../s6-rc.d/discovery/dependencies.d/esphome  |  0
 .../s6-rc.d/discovery/dependencies.d/nginx    |  0
 .../etc/s6-overlay/s6-rc.d/discovery/run      | 32 +++++++++++++++++++
 .../etc/s6-overlay/s6-rc.d/discovery/type     |  1 +
 .../etc/s6-overlay/s6-rc.d/discovery/up       |  1 +
 .../s6-rc.d/user/contents.d/discovery         |  0
 7 files changed, 36 insertions(+)
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/esphome
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/nginx
 create mode 100755 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/run
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/type
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/up
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/discovery

diff --git a/docker/ha-addon-rootfs/etc/nginx/templates/ingress.gtpl b/docker/ha-addon-rootfs/etc/nginx/templates/ingress.gtpl
index 91bd40d537..105ddde710 100644
--- a/docker/ha-addon-rootfs/etc/nginx/templates/ingress.gtpl
+++ b/docker/ha-addon-rootfs/etc/nginx/templates/ingress.gtpl
@@ -1,4 +1,5 @@
 server {
+    listen 127.0.0.1:{{ .port }} default_server;
     listen {{ .interface }}:{{ .port }} default_server;
 
     include /etc/nginx/includes/server_params.conf;
@@ -9,6 +10,7 @@ server {
 
     location / {
         allow   172.30.32.2;
+        allow   127.0.0.1;
         deny    all;
 
         proxy_pass http://esphome;
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/esphome b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/esphome
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/nginx b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/nginx
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/run b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/run
new file mode 100755
index 0000000000..111157d301
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/run
@@ -0,0 +1,32 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Home Assistant Add-on: ESPHome
+# Sends discovery information to Home Assistant.
+# ==============================================================================
+declare config
+declare port
+
+# We only disable it when disabled explicitly
+if bashio::config.false 'home_assistant_dashboard_integration';
+then
+    bashio::log.info "Home Assistant discovery is disabled for this add-on."
+    bashio::exit.ok
+fi
+
+port=$(bashio::addon.ingress_port)
+
+# Wait for NGINX to become available
+bashio::net.wait_for "${port}" "127.0.0.1" 300
+
+config=$(\
+    bashio::var.json \
+        host "127.0.0.1" \
+        port "^${port}" \
+)
+
+if bashio::discovery "esphome" "${config}" > /dev/null; then
+    bashio::log.info "Successfully send discovery information to Home Assistant."
+else
+    bashio::log.error "Discovery message to Home Assistant failed!"
+fi
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/type b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/type
new file mode 100644
index 0000000000..bdd22a1850
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/type
@@ -0,0 +1 @@
+oneshot
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/up b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/up
new file mode 100644
index 0000000000..c51c2ba820
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/discovery/run
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/discovery b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/discovery
new file mode 100644
index 0000000000..e69de29bb2

From 034b47c23a08f9980bdae07bcafbcf22fc43dc2e Mon Sep 17 00:00:00 2001
From: Mat931 <49403702+Mat931@users.noreply.github.com>
Date: Thu, 26 Jan 2023 19:09:22 +0000
Subject: [PATCH 501/838] Fix "BLE server / advertising always on" (#4353)

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

diff --git a/esphome/components/esp32_ble/ble.cpp b/esphome/components/esp32_ble/ble.cpp
index 456332b748..160084b913 100644
--- a/esphome/components/esp32_ble/ble.cpp
+++ b/esphome/components/esp32_ble/ble.cpp
@@ -31,11 +31,13 @@ void ESP32BLE::setup() {
     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");
 }

From 73748e9e200f6ea9250d023efe54ebdb4f714fa7 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Wed, 18 Jan 2023 17:23:35 +0100
Subject: [PATCH 502/838] Upgrades add-on base image to 6.2.0 (#4310)

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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8243f85f29..66b708f522 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,7 +6,7 @@
 ARG BASEIMGTYPE=docker
 
 # https://github.com/hassio-addons/addon-debian-base/releases
-FROM ghcr.io/hassio-addons/debian-base:6.1.3 AS base-hassio
+FROM ghcr.io/hassio-addons/debian-base:6.2.0 AS base-hassio
 # https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye
 FROM debian:bullseye-20221024-slim AS base-docker
 

From a2925b1d37fbcb59cf918bc508dbf9cba682950c Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Wed, 18 Jan 2023 18:22:35 +0100
Subject: [PATCH 503/838] Migrate old-style S6 scripts to s6-rc.d (#4311)

---
 .../etc/cont-init.d/10-requirements.sh        | 41 ------------
 .../etc/cont-init.d/20-nginx.sh               | 34 ----------
 .../etc/cont-init.d/30-dirs.sh                |  9 ---
 .../s6-rc.d/esphome/dependencies.d/base       |  0
 .../etc/s6-overlay/s6-rc.d/esphome/finish     | 26 ++++++++
 .../s6-rc.d}/esphome/run                      | 20 +++---
 .../etc/s6-overlay/s6-rc.d/esphome/type       |  1 +
 .../s6-rc.d/init-nginx/dependencies.d/base    |  0
 .../etc/s6-overlay/s6-rc.d/init-nginx/run     | 63 +++++++++++++++++++
 .../etc/s6-overlay/s6-rc.d/init-nginx/type    |  1 +
 .../etc/s6-overlay/s6-rc.d/init-nginx/up      |  1 +
 .../s6-rc.d/nginx/dependencies.d/esphome      |  0
 .../s6-rc.d/nginx/dependencies.d/init-nginx   |  0
 .../etc/s6-overlay/s6-rc.d/nginx/finish       | 25 ++++++++
 .../s6-rc.d}/nginx/run                        |  5 +-
 .../etc/s6-overlay/s6-rc.d/nginx/type         |  1 +
 .../s6-rc.d/user/contents.d/esphome           |  0
 .../s6-rc.d/user/contents.d/init-nginx        |  0
 .../s6-overlay/s6-rc.d/user/contents.d/nginx  |  0
 .../etc/services.d/esphome/finish             | 15 -----
 .../etc/services.d/nginx/finish               | 15 -----
 21 files changed, 132 insertions(+), 125 deletions(-)
 delete mode 100755 docker/ha-addon-rootfs/etc/cont-init.d/10-requirements.sh
 delete mode 100755 docker/ha-addon-rootfs/etc/cont-init.d/20-nginx.sh
 delete mode 100755 docker/ha-addon-rootfs/etc/cont-init.d/30-dirs.sh
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/dependencies.d/base
 create mode 100755 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/finish
 rename docker/ha-addon-rootfs/etc/{services.d => s6-overlay/s6-rc.d}/esphome/run (91%)
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/type
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/dependencies.d/base
 create mode 100755 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/esphome
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx
 create mode 100755 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/finish
 rename docker/ha-addon-rootfs/etc/{services.d => s6-overlay/s6-rc.d}/nginx/run (73%)
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/type
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/esphome
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx
 delete mode 100755 docker/ha-addon-rootfs/etc/services.d/esphome/finish
 delete mode 100755 docker/ha-addon-rootfs/etc/services.d/nginx/finish

diff --git a/docker/ha-addon-rootfs/etc/cont-init.d/10-requirements.sh b/docker/ha-addon-rootfs/etc/cont-init.d/10-requirements.sh
deleted file mode 100755
index 544787d568..0000000000
--- a/docker/ha-addon-rootfs/etc/cont-init.d/10-requirements.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# This files check if all user configuration requirements are met
-# ==============================================================================
-
-# Check SSL requirements, if enabled
-if bashio::config.true 'ssl'; then
-    if ! bashio::config.has_value 'certfile'; then
-        bashio::log.fatal 'SSL is enabled, but no certfile was specified.'
-        bashio::exit.nok
-    fi
-
-    if ! bashio::config.has_value 'keyfile'; then
-        bashio::log.fatal 'SSL is enabled, but no keyfile was specified'
-        bashio::exit.nok
-    fi
-
-
-    certfile="/ssl/$(bashio::config 'certfile')"
-    keyfile="/ssl/$(bashio::config 'keyfile')"
-
-    if ! bashio::fs.file_exists "${certfile}"; then
-        if ! bashio::fs.file_exists "${keyfile}"; then
-            # Both files are missing, let's print a friendlier error message
-            bashio::log.fatal 'You enabled encrypted connections using the "ssl": true option.'
-            bashio::log.fatal "However, the SSL files '${certfile}' and '${keyfile}'"
-            bashio::log.fatal "were not found. If you're using Hass.io on your local network and don't want"
-            bashio::log.fatal 'to encrypt connections to the ESPHome dashboard, you can manually disable'
-            bashio::log.fatal 'SSL by setting "ssl" to false."'
-            bashio::exit.nok
-        fi
-        bashio::log.fatal "The configured certfile '${certfile}' was not found."
-        bashio::exit.nok
-    fi
-
-    if ! bashio::fs.file_exists "/ssl/$(bashio::config 'keyfile')"; then
-        bashio::log.fatal "The configured keyfile '${keyfile}' was not found."
-        bashio::exit.nok
-    fi
-fi
diff --git a/docker/ha-addon-rootfs/etc/cont-init.d/20-nginx.sh b/docker/ha-addon-rootfs/etc/cont-init.d/20-nginx.sh
deleted file mode 100755
index 107a25c47a..0000000000
--- a/docker/ha-addon-rootfs/etc/cont-init.d/20-nginx.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Configures NGINX for use with ESPHome
-# ==============================================================================
-
-declare certfile
-declare keyfile
-declare direct_port
-declare ingress_interface
-declare ingress_port
-
-mkdir -p /var/log/nginx
-
-direct_port=$(bashio::addon.port 6052)
-if bashio::var.has_value "${direct_port}"; then
-    if bashio::config.true 'ssl'; then
-        certfile=$(bashio::config 'certfile')
-        keyfile=$(bashio::config 'keyfile')
-
-        mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf
-        sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf
-        sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf
-    else
-        mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
-    fi
-
-    sed -i "s/%%port%%/${direct_port}/g" /etc/nginx/servers/direct.conf
-fi
-
-ingress_port=$(bashio::addon.ingress_port)
-ingress_interface=$(bashio::addon.ip_address)
-sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
-sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
diff --git a/docker/ha-addon-rootfs/etc/cont-init.d/30-dirs.sh b/docker/ha-addon-rootfs/etc/cont-init.d/30-dirs.sh
deleted file mode 100755
index 1073a2fa45..0000000000
--- a/docker/ha-addon-rootfs/etc/cont-init.d/30-dirs.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# This files creates all directories used by esphome
-# ==============================================================================
-
-pio_cache_base=/data/cache/platformio
-
-mkdir -p "${pio_cache_base}"
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/dependencies.d/base b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/dependencies.d/base
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/finish b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/finish
new file mode 100755
index 0000000000..6e0f8fe23a
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/finish
@@ -0,0 +1,26 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Home Assistant Community Add-on: ESPHome
+# Take down the S6 supervision tree when ESPHome dashboard fails
+# ==============================================================================
+declare exit_code
+readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
+readonly exit_code_service="${1}"
+readonly exit_code_signal="${2}"
+
+bashio::log.info \
+  "Service ESPHome dashboard exited with code ${exit_code_service}" \
+  "(by signal ${exit_code_signal})"
+
+if [[ "${exit_code_service}" -eq 256 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
+  fi
+  [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
+elif [[ "${exit_code_service}" -ne 0 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
+  fi
+  exec /run/s6/basedir/bin/halt
+fi
diff --git a/docker/ha-addon-rootfs/etc/services.d/esphome/run b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/run
similarity index 91%
rename from docker/ha-addon-rootfs/etc/services.d/esphome/run
rename to docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/run
index 747c64728e..277f26ea49 100755
--- a/docker/ha-addon-rootfs/etc/services.d/esphome/run
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/run
@@ -1,10 +1,19 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Community Hass.io Add-ons: ESPHome
 # Runs the ESPHome dashboard
 # ==============================================================================
+readonly pio_cache_base=/data/cache/platformio
 
 export ESPHOME_IS_HA_ADDON=true
+export PLATFORMIO_GLOBALLIB_DIR=/piolibs
+
+# we can't set core_dir, because the settings file is stored in `core_dir/appstate.json`
+# setting `core_dir` would therefore prevent pio from accessing
+export PLATFORMIO_PLATFORMS_DIR="${pio_cache_base}/platforms"
+export PLATFORMIO_PACKAGES_DIR="${pio_cache_base}/packages"
+export PLATFORMIO_CACHE_DIR="${pio_cache_base}/cache"
 
 if bashio::config.true 'leave_front_door_open'; then
     export DISABLE_HA_AUTHENTICATION=true
@@ -30,14 +39,7 @@ else
     fi
 fi
 
-pio_cache_base=/data/cache/platformio
-# we can't set core_dir, because the settings file is stored in `core_dir/appstate.json`
-# setting `core_dir` would therefore prevent pio from accessing
-export PLATFORMIO_PLATFORMS_DIR="${pio_cache_base}/platforms"
-export PLATFORMIO_PACKAGES_DIR="${pio_cache_base}/packages"
-export PLATFORMIO_CACHE_DIR="${pio_cache_base}/cache"
-
-export PLATFORMIO_GLOBALLIB_DIR=/piolibs
+mkdir -p "${pio_cache_base}"
 
 bashio::log.info "Starting ESPHome dashboard..."
 exec esphome dashboard /config/esphome --socket /var/run/esphome.sock --ha-addon
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/type b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/type
new file mode 100644
index 0000000000..5883cff0cd
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/type
@@ -0,0 +1 @@
+longrun
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/dependencies.d/base b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/dependencies.d/base
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
new file mode 100755
index 0000000000..52a211b99f
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
@@ -0,0 +1,63 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# Configures NGINX for use with ESPHome
+# ==============================================================================
+declare certfile
+declare direct_port
+declare ingress_interface
+declare ingress_port
+declare keyfile
+
+mkdir -p /var/log/nginx
+
+direct_port=$(bashio::addon.port 6052)
+if bashio::var.has_value "${direct_port}"; then
+    # Check SSL requirements, if enabled
+    if bashio::config.true 'ssl'; then
+        if ! bashio::config.has_value 'certfile'; then
+            bashio::log.fatal 'SSL is enabled, but no certfile was specified.'
+            bashio::exit.nok
+        fi
+
+        if ! bashio::config.has_value 'keyfile'; then
+            bashio::log.fatal 'SSL is enabled, but no keyfile was specified'
+            bashio::exit.nok
+        fi
+
+        certfile="/ssl/$(bashio::config 'certfile')"
+        keyfile="/ssl/$(bashio::config 'keyfile')"
+
+        if ! bashio::fs.file_exists "/ssl/${certfile}"; then
+            if ! bashio::fs.file_exists "/ssl/${keyfile}"; then
+                # Both files are missing, let's print a friendlier error message
+                bashio::log.fatal 'You enabled encrypted connections using the "ssl": true option.'
+                bashio::log.fatal "However, the SSL files '${certfile}' and '${keyfile}'"
+                bashio::log.fatal "were not found. If you're using Hass.io on your local network and don't want"
+                bashio::log.fatal 'to encrypt connections to the ESPHome dashboard, you can manually disable'
+                bashio::log.fatal 'SSL by setting "ssl" to false."'
+                bashio::exit.nok
+            fi
+            bashio::log.fatal "The configured certfile '/ssl/${certfile}' was not found."
+            bashio::exit.nok
+        fi
+
+        if ! bashio::fs.file_exists "/ssl/${keyfile}"; then
+            bashio::log.fatal "The configured keyfile '/ssl/${keyfile}' was not found."
+            bashio::exit.nok
+        fi
+        mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf
+        sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf
+        sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf
+    else
+        mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
+    fi
+
+    sed -i "s/%%port%%/${direct_port}/g" /etc/nginx/servers/direct.conf
+fi
+
+ingress_port=$(bashio::addon.ingress_port)
+ingress_interface=$(bashio::addon.ip_address)
+sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
+sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type
new file mode 100644
index 0000000000..bdd22a1850
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type
@@ -0,0 +1 @@
+oneshot
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up
new file mode 100644
index 0000000000..b3b5b494b5
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-nginx/run
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/esphome b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/esphome
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/finish b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/finish
new file mode 100755
index 0000000000..bbd6d8fecf
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/finish
@@ -0,0 +1,25 @@
+#!/command/with-contenv bashio
+# ==============================================================================
+# Community Hass.io Add-ons: ESPHome
+# Take down the S6 supervision tree when NGINX fails
+# ==============================================================================
+declare exit_code
+readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
+readonly exit_code_service="${1}"
+readonly exit_code_signal="${2}"
+
+bashio::log.info \
+  "Service NGINX exited with code ${exit_code_service}" \
+  "(by signal ${exit_code_signal})"
+
+if [[ "${exit_code_service}" -eq 256 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo $((128 + $exit_code_signal)) > /run/s6-linux-init-container-results/exitcode
+  fi
+  [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt
+elif [[ "${exit_code_service}" -ne 0 ]]; then
+  if [[ "${exit_code_container}" -eq 0 ]]; then
+    echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode
+  fi
+  exec /run/s6/basedir/bin/halt
+fi
diff --git a/docker/ha-addon-rootfs/etc/services.d/nginx/run b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/run
similarity index 73%
rename from docker/ha-addon-rootfs/etc/services.d/nginx/run
rename to docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/run
index 8582167b96..e96991cdd1 100755
--- a/docker/ha-addon-rootfs/etc/services.d/nginx/run
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/run
@@ -1,10 +1,11 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Community Hass.io Add-ons: ESPHome
 # Runs the NGINX proxy
 # ==============================================================================
 
-bashio::log.info "Waiting for dashboard to come up..."
+bashio::log.info "Waiting for ESPHome dashboard to come up..."
 
 while [[ ! -S /var/run/esphome.sock ]]; do
   sleep 0.5
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/type b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/type
new file mode 100644
index 0000000000..5883cff0cd
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/nginx/type
@@ -0,0 +1 @@
+longrun
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/esphome b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/esphome
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/services.d/esphome/finish b/docker/ha-addon-rootfs/etc/services.d/esphome/finish
deleted file mode 100755
index fed449ce61..0000000000
--- a/docker/ha-addon-rootfs/etc/services.d/esphome/finish
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/execlineb -S0
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Take down the S6 supervision tree when ESPHome fails
-# ==============================================================================
-
-declare APP_EXIT_CODE=${1}
-
-if [[ "${APP_EXIT_CODE}" -ne 0 ]] && [[ "${APP_EXIT_CODE}" -ne 256 ]]; then
-  bashio::log.warning "Halt add-on with exit code ${APP_EXIT_CODE}"
-  echo "${APP_EXIT_CODE}" > /run/s6-linux-init-container-results/exitcode
-  exec /run/s6/basedir/bin/halt
-fi
-
-bashio::log.info "Service restart after closing"
diff --git a/docker/ha-addon-rootfs/etc/services.d/nginx/finish b/docker/ha-addon-rootfs/etc/services.d/nginx/finish
deleted file mode 100755
index 8030841ec8..0000000000
--- a/docker/ha-addon-rootfs/etc/services.d/nginx/finish
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/execlineb -S0
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Take down the S6 supervision tree when NGINX fails
-# ==============================================================================
-
-declare APP_EXIT_CODE=${1}
-
-if [[ "${APP_EXIT_CODE}" -ne 0 ]] && [[ "${APP_EXIT_CODE}" -ne 256 ]]; then
-  bashio::log.warning "Halt add-on with exit code ${APP_EXIT_CODE}"
-  echo "${APP_EXIT_CODE}" > /run/s6-linux-init-container-results/exitcode
-  exec /run/s6/basedir/bin/halt
-fi
-
-bashio::log.info "Service restart after closing"

From 3c5de77ae9994820c463f74f2344c6bd32713831 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Wed, 18 Jan 2023 19:54:27 +0100
Subject: [PATCH 504/838] Refactor NGINX configuration of Home Assistant Add-on
 (#4312)

---
 .../etc/nginx/includes/proxy_params.conf      | 12 ++--
 .../etc/nginx/includes/server_params.conf     |  6 +-
 .../etc/nginx/includes/ssl_params.conf        |  7 +-
 .../etc/nginx/includes/upstream.conf          |  3 +
 docker/ha-addon-rootfs/etc/nginx/nginx.conf   | 25 +++----
 .../etc/nginx/servers/.gitkeep                |  1 +
 .../etc/nginx/servers/direct.disabled         | 12 ----
 .../direct.gtpl}                              | 20 ++++--
 .../ingress.conf => templates/ingress.gtpl}   |  4 +-
 .../etc/s6-overlay/s6-rc.d/init-nginx/run     | 70 +++++--------------
 10 files changed, 60 insertions(+), 100 deletions(-)
 create mode 100644 docker/ha-addon-rootfs/etc/nginx/includes/upstream.conf
 create mode 100644 docker/ha-addon-rootfs/etc/nginx/servers/.gitkeep
 delete mode 100644 docker/ha-addon-rootfs/etc/nginx/servers/direct.disabled
 rename docker/ha-addon-rootfs/etc/nginx/{servers/direct-ssl.disabled => templates/direct.gtpl} (61%)
 rename docker/ha-addon-rootfs/etc/nginx/{servers/ingress.conf => templates/ingress.gtpl} (76%)

diff --git a/docker/ha-addon-rootfs/etc/nginx/includes/proxy_params.conf b/docker/ha-addon-rootfs/etc/nginx/includes/proxy_params.conf
index c00b4800e8..a1ebb5079a 100644
--- a/docker/ha-addon-rootfs/etc/nginx/includes/proxy_params.conf
+++ b/docker/ha-addon-rootfs/etc/nginx/includes/proxy_params.conf
@@ -1,9 +1,9 @@
-proxy_http_version 1.1;
-proxy_ignore_client_abort off;
-proxy_read_timeout 86400s;
-proxy_redirect off;
-proxy_send_timeout 86400s;
-proxy_max_temp_file_size 0;
+proxy_http_version          1.1;
+proxy_ignore_client_abort   off;
+proxy_read_timeout          86400s;
+proxy_redirect              off;
+proxy_send_timeout          86400s;
+proxy_max_temp_file_size    0;
 
 proxy_set_header Accept-Encoding "";
 proxy_set_header Connection $connection_upgrade;
diff --git a/docker/ha-addon-rootfs/etc/nginx/includes/server_params.conf b/docker/ha-addon-rootfs/etc/nginx/includes/server_params.conf
index 479dfa10f6..debdf83a8c 100644
--- a/docker/ha-addon-rootfs/etc/nginx/includes/server_params.conf
+++ b/docker/ha-addon-rootfs/etc/nginx/includes/server_params.conf
@@ -1,5 +1,7 @@
-root /dev/null;
-server_name $hostname;
+root            /dev/null;
+server_name     $hostname;
+
+client_max_body_size 512m;
 
 add_header X-Content-Type-Options nosniff;
 add_header X-XSS-Protection "1; mode=block";
diff --git a/docker/ha-addon-rootfs/etc/nginx/includes/ssl_params.conf b/docker/ha-addon-rootfs/etc/nginx/includes/ssl_params.conf
index 6f15005998..e6789cbb9b 100644
--- a/docker/ha-addon-rootfs/etc/nginx/includes/ssl_params.conf
+++ b/docker/ha-addon-rootfs/etc/nginx/includes/ssl_params.conf
@@ -1,7 +1,6 @@
-ssl_protocols TLSv1.2;
-ssl_prefer_server_ciphers on;
-ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA;
-ssl_ecdh_curve secp384r1;
+ssl_protocols TLSv1.2 TLSv1.3;
+ssl_prefer_server_ciphers off;
+ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
 ssl_session_timeout  10m;
 ssl_session_cache shared:SSL:10m;
 ssl_session_tickets off;
diff --git a/docker/ha-addon-rootfs/etc/nginx/includes/upstream.conf b/docker/ha-addon-rootfs/etc/nginx/includes/upstream.conf
new file mode 100644
index 0000000000..8e782bdc88
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/nginx/includes/upstream.conf
@@ -0,0 +1,3 @@
+upstream esphome {
+    server unix:/var/run/esphome.sock;
+}
diff --git a/docker/ha-addon-rootfs/etc/nginx/nginx.conf b/docker/ha-addon-rootfs/etc/nginx/nginx.conf
index 8ebf572816..497427596d 100644
--- a/docker/ha-addon-rootfs/etc/nginx/nginx.conf
+++ b/docker/ha-addon-rootfs/etc/nginx/nginx.conf
@@ -2,7 +2,6 @@ daemon off;
 user root;
 pid /var/run/nginx.pid;
 worker_processes 1;
-# Hass.io addon log
 error_log /proc/1/fd/1 error;
 events {
     worker_connections 1024;
@@ -10,24 +9,22 @@ events {
 
 http {
     include /etc/nginx/includes/mime.types;
-    access_log stdout;
-    default_type application/octet-stream;
-    gzip on;
-    keepalive_timeout 65;
-    sendfile on;
-    server_tokens off;
+
+    access_log              off;
+    default_type            application/octet-stream;
+    gzip                    on;
+    keepalive_timeout       65;
+    sendfile                on;
+    server_tokens           off;
+
+    tcp_nodelay             on;
+    tcp_nopush              on;
 
     map $http_upgrade $connection_upgrade {
         default upgrade;
         ''      close;
     }
 
-    # Use Hass.io supervisor as resolver
-    resolver 172.30.32.2;
-
-    upstream esphome {
-        server unix:/var/run/esphome.sock;
-    }
-
+    include /etc/nginx/includes/upstream.conf;
     include /etc/nginx/servers/*.conf;
 }
diff --git a/docker/ha-addon-rootfs/etc/nginx/servers/.gitkeep b/docker/ha-addon-rootfs/etc/nginx/servers/.gitkeep
new file mode 100644
index 0000000000..85ad51be5f
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/nginx/servers/.gitkeep
@@ -0,0 +1 @@
+Without requirements or design, programming is the art of adding bugs to an empty text file. (Louis Srygley)
diff --git a/docker/ha-addon-rootfs/etc/nginx/servers/direct.disabled b/docker/ha-addon-rootfs/etc/nginx/servers/direct.disabled
deleted file mode 100644
index 80300fc6aa..0000000000
--- a/docker/ha-addon-rootfs/etc/nginx/servers/direct.disabled
+++ /dev/null
@@ -1,12 +0,0 @@
-server {
-    listen %%port%% default_server;
-
-    include /etc/nginx/includes/server_params.conf;
-    include /etc/nginx/includes/proxy_params.conf;
-    # Clear Hass.io Ingress header
-    proxy_set_header X-HA-Ingress "";
-
-    location / {
-        proxy_pass http://esphome;
-    }
-}
diff --git a/docker/ha-addon-rootfs/etc/nginx/servers/direct-ssl.disabled b/docker/ha-addon-rootfs/etc/nginx/templates/direct.gtpl
similarity index 61%
rename from docker/ha-addon-rootfs/etc/nginx/servers/direct-ssl.disabled
rename to docker/ha-addon-rootfs/etc/nginx/templates/direct.gtpl
index 4ebc435dbb..4fb0ca3f90 100644
--- a/docker/ha-addon-rootfs/etc/nginx/servers/direct-ssl.disabled
+++ b/docker/ha-addon-rootfs/etc/nginx/templates/direct.gtpl
@@ -1,20 +1,26 @@
 server {
-    listen %%port%% default_server ssl http2;
+    {{ if not .ssl }}
+    listen 6052 default_server;
+    {{ else }}
+    listen 6052 default_server ssl http2;
+    {{ end }}
 
     include /etc/nginx/includes/server_params.conf;
     include /etc/nginx/includes/proxy_params.conf;
+
+    {{ if .ssl }}
     include /etc/nginx/includes/ssl_params.conf;
 
-    ssl on;
-    ssl_certificate /ssl/%%certfile%%;
-    ssl_certificate_key /ssl/%%keyfile%%;
-
-    # Clear Hass.io Ingress header
-    proxy_set_header X-HA-Ingress "";
+    ssl_certificate /ssl/{{ .certfile }};
+    ssl_certificate_key /ssl/{{ .keyfile }};
 
     # Redirect http requests to https on the same port.
     # https://rageagainstshell.com/2016/11/redirect-http-to-https-on-the-same-port-in-nginx/
     error_page 497 https://$http_host$request_uri;
+    {{ end }}
+
+    # Clear Home Assistant Ingress header
+    proxy_set_header X-HA-Ingress "";
 
     location / {
         proxy_pass http://esphome;
diff --git a/docker/ha-addon-rootfs/etc/nginx/servers/ingress.conf b/docker/ha-addon-rootfs/etc/nginx/templates/ingress.gtpl
similarity index 76%
rename from docker/ha-addon-rootfs/etc/nginx/servers/ingress.conf
rename to docker/ha-addon-rootfs/etc/nginx/templates/ingress.gtpl
index 9d0d2d3e66..91bd40d537 100644
--- a/docker/ha-addon-rootfs/etc/nginx/servers/ingress.conf
+++ b/docker/ha-addon-rootfs/etc/nginx/templates/ingress.gtpl
@@ -1,13 +1,13 @@
 server {
-    listen %%interface%%:%%port%% default_server;
+    listen {{ .interface }}:{{ .port }} default_server;
 
     include /etc/nginx/includes/server_params.conf;
     include /etc/nginx/includes/proxy_params.conf;
+
     # Set Home Assistant Ingress header
     proxy_set_header X-HA-Ingress "YES";
 
     location / {
-        # Only allow from Hass.io supervisor
         allow   172.30.32.2;
         deny    all;
 
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
index 52a211b99f..2725f56670 100755
--- a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run
@@ -4,60 +4,24 @@
 # Community Hass.io Add-ons: ESPHome
 # Configures NGINX for use with ESPHome
 # ==============================================================================
-declare certfile
-declare direct_port
-declare ingress_interface
-declare ingress_port
-declare keyfile
-
 mkdir -p /var/log/nginx
 
-direct_port=$(bashio::addon.port 6052)
-if bashio::var.has_value "${direct_port}"; then
-    # Check SSL requirements, if enabled
-    if bashio::config.true 'ssl'; then
-        if ! bashio::config.has_value 'certfile'; then
-            bashio::log.fatal 'SSL is enabled, but no certfile was specified.'
-            bashio::exit.nok
-        fi
+# Generate Ingress configuration
+bashio::var.json \
+    interface "$(bashio::addon.ip_address)" \
+    port "^$(bashio::addon.ingress_port)" \
+    | tempio \
+        -template /etc/nginx/templates/ingress.gtpl \
+        -out /etc/nginx/servers/ingress.conf
 
-        if ! bashio::config.has_value 'keyfile'; then
-            bashio::log.fatal 'SSL is enabled, but no keyfile was specified'
-            bashio::exit.nok
-        fi
-
-        certfile="/ssl/$(bashio::config 'certfile')"
-        keyfile="/ssl/$(bashio::config 'keyfile')"
-
-        if ! bashio::fs.file_exists "/ssl/${certfile}"; then
-            if ! bashio::fs.file_exists "/ssl/${keyfile}"; then
-                # Both files are missing, let's print a friendlier error message
-                bashio::log.fatal 'You enabled encrypted connections using the "ssl": true option.'
-                bashio::log.fatal "However, the SSL files '${certfile}' and '${keyfile}'"
-                bashio::log.fatal "were not found. If you're using Hass.io on your local network and don't want"
-                bashio::log.fatal 'to encrypt connections to the ESPHome dashboard, you can manually disable'
-                bashio::log.fatal 'SSL by setting "ssl" to false."'
-                bashio::exit.nok
-            fi
-            bashio::log.fatal "The configured certfile '/ssl/${certfile}' was not found."
-            bashio::exit.nok
-        fi
-
-        if ! bashio::fs.file_exists "/ssl/${keyfile}"; then
-            bashio::log.fatal "The configured keyfile '/ssl/${keyfile}' was not found."
-            bashio::exit.nok
-        fi
-        mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf
-        sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf
-        sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf
-    else
-        mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
-    fi
-
-    sed -i "s/%%port%%/${direct_port}/g" /etc/nginx/servers/direct.conf
+# Generate direct access configuration, if enabled.
+if bashio::var.has_value "$(bashio::addon.port 6052)"; then
+    bashio::config.require.ssl
+    bashio::var.json \
+        certfile "$(bashio::config 'certfile')" \
+        keyfile "$(bashio::config 'keyfile')" \
+        ssl "^$(bashio::config 'ssl')" \
+        | tempio \
+            -template /etc/nginx/templates/direct.gtpl \
+            -out /etc/nginx/servers/direct.conf
 fi
-
-ingress_port=$(bashio::addon.ingress_port)
-ingress_interface=$(bashio::addon.ip_address)
-sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
-sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf

From 4ac96ccea264c81078758d153faa1008dc3e13db Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Thu, 26 Jan 2023 17:48:04 +0100
Subject: [PATCH 505/838] Add Home Assistant integration discovery (#4328)

---
 .../etc/nginx/templates/ingress.gtpl          |  2 ++
 .../s6-rc.d/discovery/dependencies.d/esphome  |  0
 .../s6-rc.d/discovery/dependencies.d/nginx    |  0
 .../etc/s6-overlay/s6-rc.d/discovery/run      | 32 +++++++++++++++++++
 .../etc/s6-overlay/s6-rc.d/discovery/type     |  1 +
 .../etc/s6-overlay/s6-rc.d/discovery/up       |  1 +
 .../s6-rc.d/user/contents.d/discovery         |  0
 7 files changed, 36 insertions(+)
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/esphome
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/nginx
 create mode 100755 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/run
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/type
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/up
 create mode 100644 docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/discovery

diff --git a/docker/ha-addon-rootfs/etc/nginx/templates/ingress.gtpl b/docker/ha-addon-rootfs/etc/nginx/templates/ingress.gtpl
index 91bd40d537..105ddde710 100644
--- a/docker/ha-addon-rootfs/etc/nginx/templates/ingress.gtpl
+++ b/docker/ha-addon-rootfs/etc/nginx/templates/ingress.gtpl
@@ -1,4 +1,5 @@
 server {
+    listen 127.0.0.1:{{ .port }} default_server;
     listen {{ .interface }}:{{ .port }} default_server;
 
     include /etc/nginx/includes/server_params.conf;
@@ -9,6 +10,7 @@ server {
 
     location / {
         allow   172.30.32.2;
+        allow   127.0.0.1;
         deny    all;
 
         proxy_pass http://esphome;
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/esphome b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/esphome
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/nginx b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/dependencies.d/nginx
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/run b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/run
new file mode 100755
index 0000000000..111157d301
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/run
@@ -0,0 +1,32 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+# Home Assistant Add-on: ESPHome
+# Sends discovery information to Home Assistant.
+# ==============================================================================
+declare config
+declare port
+
+# We only disable it when disabled explicitly
+if bashio::config.false 'home_assistant_dashboard_integration';
+then
+    bashio::log.info "Home Assistant discovery is disabled for this add-on."
+    bashio::exit.ok
+fi
+
+port=$(bashio::addon.ingress_port)
+
+# Wait for NGINX to become available
+bashio::net.wait_for "${port}" "127.0.0.1" 300
+
+config=$(\
+    bashio::var.json \
+        host "127.0.0.1" \
+        port "^${port}" \
+)
+
+if bashio::discovery "esphome" "${config}" > /dev/null; then
+    bashio::log.info "Successfully send discovery information to Home Assistant."
+else
+    bashio::log.error "Discovery message to Home Assistant failed!"
+fi
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/type b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/type
new file mode 100644
index 0000000000..bdd22a1850
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/type
@@ -0,0 +1 @@
+oneshot
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/up b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/up
new file mode 100644
index 0000000000..c51c2ba820
--- /dev/null
+++ b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/discovery/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/discovery/run
diff --git a/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/discovery b/docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/discovery
new file mode 100644
index 0000000000..e69de29bb2

From 8bcddef39da70d0bf79fc85fe4151e959954f16d Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 27 Jan 2023 09:44:41 +1300
Subject: [PATCH 506/838] Bump version to 2022.12.8

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

diff --git a/esphome/const.py b/esphome/const.py
index 12e7045a49..163ddc75b2 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2022.12.7"
+__version__ = "2022.12.8"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From d4a8df04b8e6beaa0511930a1291f22cb2f49d6b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 1 Feb 2023 15:57:45 +1300
Subject: [PATCH 507/838] Bump version to 2023.2.0-dev

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

diff --git a/esphome/const.py b/esphome/const.py
index 6739271de0..889c6e94d7 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.1.0-dev"
+__version__ = "2023.2.0-dev"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From e847766514957f6ceb81de0b678399918ed532a2 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 1 Feb 2023 16:59:51 +1300
Subject: [PATCH 508/838] Dump full parsed config to json-config api call
 (#4373)

---
 esphome/__main__.py            |  5 ++++-
 esphome/dashboard/dashboard.py | 34 ++++++++++++++++++++++------------
 esphome/yaml_util.py           |  5 ++++-
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index 9b6043ef50..24c2ce1d13 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -339,7 +339,7 @@ def command_config(args, config):
     _LOGGER.info("Configuration is valid!")
     if not CORE.verbose:
         config = strip_default_ids(config)
-    safe_print(yaml_util.dump(config))
+    safe_print(yaml_util.dump(config, args.show_secrets))
     return 0
 
 
@@ -665,6 +665,9 @@ def parse_args(argv):
     parser_config.add_argument(
         "configuration", help="Your YAML configuration file(s).", nargs="+"
     )
+    parser_config.add_argument(
+        "--show-secrets", help="Show secrets in output.", action="store_true"
+    )
 
     parser_compile = subparsers.add_parser(
         "compile", help="Read the configuration and compile a program."
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 8b8414c62c..66e627dffe 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -25,10 +25,10 @@ import tornado.netutil
 import tornado.process
 import tornado.web
 import tornado.websocket
+import yaml
 from tornado.log import access_log
 
 from esphome import const, platformio_api, util, yaml_util
-from esphome.core import EsphomeError
 from esphome.helpers import get_bool_env, mkdir_p, run_system_command
 from esphome.storage_json import (
     EsphomeStorageJSON,
@@ -40,7 +40,7 @@ from esphome.storage_json import (
 from esphome.util import get_serial_ports, shlex_quote
 from esphome.zeroconf import DashboardImportDiscovery, DashboardStatus, EsphomeZeroconf
 
-from .util import password_hash, friendly_name_slugify
+from .util import friendly_name_slugify, password_hash
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -1021,6 +1021,14 @@ class SecretKeysRequestHandler(BaseHandler):
         self.write(json.dumps(secret_keys))
 
 
+class SafeLoaderIgnoreUnknown(yaml.SafeLoader):
+    def ignore_unknown(self, node):
+        return f"{node.tag} {node.value}"
+
+
+SafeLoaderIgnoreUnknown.add_constructor(None, SafeLoaderIgnoreUnknown.ignore_unknown)
+
+
 class JsonConfigRequestHandler(BaseHandler):
     @authenticated
     @bind_config
@@ -1030,16 +1038,18 @@ class JsonConfigRequestHandler(BaseHandler):
             self.send_error(404)
             return
 
-        try:
-            content = yaml_util.load_yaml(filename, clear_secrets=False)
-            json_content = json.dumps(
-                content, default=lambda o: {"__type": str(type(o)), "repr": repr(o)}
-            )
-            self.set_header("content-type", "application/json")
-            self.write(json_content)
-        except EsphomeError as err:
-            _LOGGER.warning("Error translating file %s to JSON: %s", filename, err)
-            self.send_error(500)
+        args = ["esphome", "config", settings.rel_path(configuration), "--show-secrets"]
+
+        rc, stdout, _ = run_system_command(*args)
+
+        if rc != 0:
+            self.send_error(422)
+            return
+
+        data = yaml.load(stdout, Loader=SafeLoaderIgnoreUnknown)
+        self.set_header("content-type", "application/json")
+        self.write(json.dumps(data))
+        self.finish()
 
 
 def get_base_frontend_path():
diff --git a/esphome/yaml_util.py b/esphome/yaml_util.py
index 2689ce9245..b8aa8dd53f 100644
--- a/esphome/yaml_util.py
+++ b/esphome/yaml_util.py
@@ -390,8 +390,11 @@ def _load_yaml_internal(fname):
         loader.dispose()
 
 
-def dump(dict_):
+def dump(dict_, show_secrets=False):
     """Dump YAML to a string and remove null."""
+    if show_secrets:
+        _SECRET_VALUES.clear()
+        _SECRET_CACHE.clear()
     return yaml.dump(
         dict_, default_flow_style=False, allow_unicode=True, Dumper=ESPHomeDumper
     )

From e3d9c44bdc3e06ec04043d893ffa1717a4c68a1a Mon Sep 17 00:00:00 2001
From: Carlos Garcia Saura <CarlosGS@users.noreply.github.com>
Date: Thu, 2 Feb 2023 01:22:23 +0100
Subject: [PATCH 509/838] Fix pressure compensation in SCD4X (#4357)

---
 esphome/components/scd4x/scd4x.cpp | 17 ++++++++++-------
 esphome/components/scd4x/scd4x.h   |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/esphome/components/scd4x/scd4x.cpp b/esphome/components/scd4x/scd4x.cpp
index 681324fa18..117b92b901 100644
--- a/esphome/components/scd4x/scd4x.cpp
+++ b/esphome/components/scd4x/scd4x.cpp
@@ -149,9 +149,9 @@ void SCD4XComponent::update() {
   }
 
   if (this->ambient_pressure_source_ != nullptr) {
-    float pressure = this->ambient_pressure_source_->state / 1000.0f;
+    float pressure = this->ambient_pressure_source_->state;
     if (!std::isnan(pressure)) {
-      set_ambient_pressure_compensation(this->ambient_pressure_source_->state / 1000.0f);
+      set_ambient_pressure_compensation(pressure);
     }
   }
 
@@ -254,12 +254,15 @@ bool SCD4XComponent::factory_reset() {
   return true;
 }
 
-// Note pressure in bar here. Convert to hPa
-void SCD4XComponent::set_ambient_pressure_compensation(float pressure_in_bar) {
+void SCD4XComponent::set_ambient_pressure_compensation(float pressure_in_hpa) {
   ambient_pressure_compensation_ = true;
-  uint16_t new_ambient_pressure = (uint16_t)(pressure_in_bar * 1000);
-  // remove millibar from comparison to avoid frequent updates +/- 10 millibar doesn't matter
-  if (initialized_ && (new_ambient_pressure / 10 != ambient_pressure_ / 10)) {
+  uint16_t new_ambient_pressure = (uint16_t) pressure_in_hpa;
+  if (!initialized_) {
+    ambient_pressure_ = new_ambient_pressure;
+    return;
+  }
+  // Only send pressure value if it has changed since last update
+  if (new_ambient_pressure != ambient_pressure_) {
     update_ambient_pressure_compensation_(new_ambient_pressure);
     ambient_pressure_ = new_ambient_pressure;
   } else {
diff --git a/esphome/components/scd4x/scd4x.h b/esphome/components/scd4x/scd4x.h
index 23c3766e60..22055e78d0 100644
--- a/esphome/components/scd4x/scd4x.h
+++ b/esphome/components/scd4x/scd4x.h
@@ -26,7 +26,7 @@ class SCD4XComponent : public PollingComponent, public sensirion_common::Sensiri
 
   void set_automatic_self_calibration(bool asc) { enable_asc_ = asc; }
   void set_altitude_compensation(uint16_t altitude) { altitude_compensation_ = altitude; }
-  void set_ambient_pressure_compensation(float pressure_in_bar);
+  void set_ambient_pressure_compensation(float pressure_in_hpa);
   void set_ambient_pressure_source(sensor::Sensor *pressure) { ambient_pressure_source_ = pressure; }
   void set_temperature_offset(float offset) { temperature_offset_ = offset; };
 

From 0554b06b7e968901dd54c45ecb4ceb03fb4e7f5d Mon Sep 17 00:00:00 2001
From: Joakim Plate <elupus@ecce.se>
Date: Thu, 2 Feb 2023 05:18:58 +0100
Subject: [PATCH 510/838] Allow mdns services to be exposed by config (#4202)

---
 esphome/components/mdns/__init__.py        | 54 +++++++++++++++++++++-
 esphome/components/mdns/mdns_component.cpp |  2 +
 esphome/components/mdns/mdns_component.h   |  3 ++
 3 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/esphome/components/mdns/__init__.py b/esphome/components/mdns/__init__.py
index 154e6b099f..e27786a98b 100644
--- a/esphome/components/mdns/__init__.py
+++ b/esphome/components/mdns/__init__.py
@@ -1,4 +1,10 @@
-from esphome.const import CONF_ID
+from esphome.const import (
+    CONF_ID,
+    CONF_PORT,
+    CONF_PROTOCOL,
+    CONF_SERVICES,
+    CONF_SERVICE,
+)
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.core import CORE, coroutine_with_priority
@@ -8,6 +14,8 @@ DEPENDENCIES = ["network"]
 
 mdns_ns = cg.esphome_ns.namespace("mdns")
 MDNSComponent = mdns_ns.class_("MDNSComponent", cg.Component)
+MDNSTXTRecord = mdns_ns.struct("MDNSTXTRecord")
+MDNSService = mdns_ns.struct("MDNSService")
 
 
 def _remove_id_if_disabled(value):
@@ -17,18 +25,50 @@ def _remove_id_if_disabled(value):
     return value
 
 
+CONF_TXT = "txt"
+
+SERVICE_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_SERVICE): cv.string,
+        cv.Required(CONF_PROTOCOL): cv.string,
+        cv.Optional(CONF_PORT, default=0): cv.Any(0, cv.port),
+        cv.Optional(CONF_TXT, default={}): {cv.string: cv.string},
+    }
+)
+
 CONF_DISABLED = "disabled"
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
         {
             cv.GenerateID(): cv.declare_id(MDNSComponent),
             cv.Optional(CONF_DISABLED, default=False): cv.boolean,
+            cv.Optional(CONF_SERVICES, default=[]): cv.ensure_list(SERVICE_SCHEMA),
         }
     ),
     _remove_id_if_disabled,
 )
 
 
+def mdns_txt_record(key: str, value: str):
+    return cg.StructInitializer(
+        MDNSTXTRecord,
+        ("key", key),
+        ("value", value),
+    )
+
+
+def mdns_service(
+    service: str, proto: str, port: int, txt_records: list[dict[str, str]]
+):
+    return cg.StructInitializer(
+        MDNSService,
+        ("service_type", service),
+        ("proto", proto),
+        ("port", port),
+        ("txt_records", txt_records),
+    )
+
+
 @coroutine_with_priority(55.0)
 async def to_code(config):
     if CORE.using_arduino:
@@ -46,3 +86,15 @@ async def to_code(config):
 
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+
+    for service in config[CONF_SERVICES]:
+        txt = [
+            mdns_txt_record(txt_key, txt_value)
+            for txt_key, txt_value in service[CONF_TXT].items()
+        ]
+
+        exp = mdns_service(
+            service[CONF_SERVICE], service[CONF_PROTOCOL], service[CONF_PORT], txt
+        )
+
+        cg.add(var.add_extra_service(exp))
diff --git a/esphome/components/mdns/mdns_component.cpp b/esphome/components/mdns/mdns_component.cpp
index 656e0382bf..cdb9aa8e74 100644
--- a/esphome/components/mdns/mdns_component.cpp
+++ b/esphome/components/mdns/mdns_component.cpp
@@ -90,6 +90,8 @@ void MDNSComponent::compile_records_() {
   }
 #endif
 
+  this->services_.insert(this->services_.end(), this->services_extra_.begin(), this->services_extra_.end());
+
   if (this->services_.empty()) {
     // Publish "http" service if not using native API
     // This is just to have *some* mDNS service so that .local resolution works
diff --git a/esphome/components/mdns/mdns_component.h b/esphome/components/mdns/mdns_component.h
index dbf7482f1f..5f9179b799 100644
--- a/esphome/components/mdns/mdns_component.h
+++ b/esphome/components/mdns/mdns_component.h
@@ -33,7 +33,10 @@ class MDNSComponent : public Component {
 #endif
   float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
 
+  void add_extra_service(MDNSService service) { services_extra_.push_back(std::move(service)); }
+
  protected:
+  std::vector<MDNSService> services_extra_{};
   std::vector<MDNSService> services_{};
   std::string hostname_;
   void compile_records_();

From e95d6041d8dbde0982cad712d2404797f185398c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 2 Feb 2023 19:34:25 +1300
Subject: [PATCH 511/838] Allow final validate of uart stop bits and parity
 (#4376)

---
 esphome/components/uart/__init__.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/esphome/components/uart/__init__.py b/esphome/components/uart/__init__.py
index 01a1049568..ed60a9f880 100644
--- a/esphome/components/uart/__init__.py
+++ b/esphome/components/uart/__init__.py
@@ -246,11 +246,13 @@ def final_validate_device_schema(
     baud_rate: Optional[int] = None,
     require_tx: bool = False,
     require_rx: bool = False,
+    parity: Optional[str] = None,
+    stop_bits: Optional[int] = None,
 ):
     def validate_baud_rate(value):
         if value != baud_rate:
             raise cv.Invalid(
-                f"Component {name} required baud rate {baud_rate} for the uart bus"
+                f"Component {name} requires baud rate {baud_rate} for the uart bus"
             )
         return value
 
@@ -266,6 +268,20 @@ def final_validate_device_schema(
 
         return validator
 
+    def validate_parity(value):
+        if value != parity:
+            raise cv.Invalid(
+                f"Component {name} requires parity {parity} for the uart bus"
+            )
+        return value
+
+    def validate_stop_bits(value):
+        if value != stop_bits:
+            raise cv.Invalid(
+                f"Component {name} requires stop bits {stop_bits} for the uart bus"
+            )
+        return value
+
     def validate_hub(hub_config):
         hub_schema = {}
         uart_id = hub_config[CONF_ID]
@@ -288,6 +304,10 @@ def final_validate_device_schema(
             ] = validate_pin(CONF_RX_PIN, device)
         if baud_rate is not None:
             hub_schema[cv.Required(CONF_BAUD_RATE)] = validate_baud_rate
+        if parity is not None:
+            hub_schema[cv.Required(CONF_PARITY)] = validate_parity
+        if stop_bits is not None:
+            hub_schema[cv.Required(CONF_STOP_BITS)] = validate_stop_bits
         return cv.Schema(hub_schema, extra=cv.ALLOW_EXTRA)(hub_config)
 
     return cv.Schema(

From 8d6ffb91698d4fe7d5ffdc47bd6b55b267f3be00 Mon Sep 17 00:00:00 2001
From: Florian idB <fbeek@users.noreply.github.com>
Date: Thu, 2 Feb 2023 19:53:46 +0100
Subject: [PATCH 512/838] Update sim800l.cpp (#4223)

---
 esphome/components/sim800l/sim800l.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/sim800l/sim800l.cpp b/esphome/components/sim800l/sim800l.cpp
index 7015933e73..4f7aa228e9 100644
--- a/esphome/components/sim800l/sim800l.cpp
+++ b/esphome/components/sim800l/sim800l.cpp
@@ -156,6 +156,7 @@ void Sim800LComponent::parse_cmd_(std::string message) {
     case STATE_SEND_USSD1:
       this->send_cmd_("AT+CUSD=1, \"" + this->ussd_ + "\"");
       this->state_ = STATE_SEND_USSD2;
+      this->expect_ack_ = true;
       break;
     case STATE_SEND_USSD2:
       ESP_LOGD(TAG, "SendUssd2: '%s'", message.c_str());

From 6b7b0768755b21cca0e4b67515de93b9ca7b3821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Tr=C3=BCck?= <ftrueck@gmail.com>
Date: Fri, 3 Feb 2023 09:13:27 +0100
Subject: [PATCH 513/838] SCD30 Added support for manual calibration (#4362)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/scd30/automation.h | 23 ++++++++++++++++++++
 esphome/components/scd30/scd30.cpp    | 22 +++++++++++++++++++
 esphome/components/scd30/scd30.h      |  3 +++
 esphome/components/scd30/sensor.py    | 31 ++++++++++++++++++++++++++-
 4 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 esphome/components/scd30/automation.h

diff --git a/esphome/components/scd30/automation.h b/esphome/components/scd30/automation.h
new file mode 100644
index 0000000000..37b3bc1674
--- /dev/null
+++ b/esphome/components/scd30/automation.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/automation.h"
+#include "scd30.h"
+
+namespace esphome {
+namespace scd30 {
+
+template<typename... Ts> class ForceRecalibrationWithReference : public Action<Ts...>, public Parented<SCD30Component> {
+ public:
+  void play(Ts... x) override {
+    if (this->value_.has_value()) {
+      this->parent_->force_recalibration_with_reference(this->value_.value(x...));
+    }
+  }
+
+ protected:
+  TEMPLATABLE_VALUE(uint16_t, value)
+};
+
+}  // namespace scd30
+}  // namespace esphome
diff --git a/esphome/components/scd30/scd30.cpp b/esphome/components/scd30/scd30.cpp
index 103b7a255d..c25ed107b7 100644
--- a/esphome/components/scd30/scd30.cpp
+++ b/esphome/components/scd30/scd30.cpp
@@ -202,5 +202,27 @@ bool SCD30Component::is_data_ready_() {
   return is_data_ready == 1;
 }
 
+bool SCD30Component::force_recalibration_with_reference(uint16_t co2_reference) {
+  ESP_LOGD(TAG, "Performing CO2 force recalibration with reference %dppm.", co2_reference);
+  if (this->write_command(SCD30_CMD_FORCED_CALIBRATION, co2_reference)) {
+    ESP_LOGD(TAG, "Force recalibration complete.");
+    return true;
+  } else {
+    ESP_LOGE(TAG, "Failed to force recalibration with reference.");
+    this->error_code_ = FORCE_RECALIBRATION_FAILED;
+    this->status_set_warning();
+    return false;
+  }
+}
+
+uint16_t SCD30Component::get_forced_calibration_reference() {
+  uint16_t forced_calibration_reference;
+  // Get current CO2 calibration
+  if (!this->get_register(SCD30_CMD_FORCED_CALIBRATION, forced_calibration_reference)) {
+    ESP_LOGE(TAG, "Unable to read forced calibration reference.");
+  }
+  return forced_calibration_reference;
+}
+
 }  // namespace scd30
 }  // namespace esphome
diff --git a/esphome/components/scd30/scd30.h b/esphome/components/scd30/scd30.h
index c434bf0dea..4a4ca832bf 100644
--- a/esphome/components/scd30/scd30.h
+++ b/esphome/components/scd30/scd30.h
@@ -20,6 +20,8 @@ class SCD30Component : public Component, public sensirion_common::SensirionI2CDe
   }
   void set_temperature_offset(float offset) { temperature_offset_ = offset; }
   void set_update_interval(uint16_t interval) { update_interval_ = interval; }
+  bool force_recalibration_with_reference(uint16_t co2_reference);
+  uint16_t get_forced_calibration_reference();
 
   void setup() override;
   void update();
@@ -33,6 +35,7 @@ class SCD30Component : public Component, public sensirion_common::SensirionI2CDe
     COMMUNICATION_FAILED,
     FIRMWARE_IDENTIFICATION_FAILED,
     MEASUREMENT_INIT_FAILED,
+    FORCE_RECALIBRATION_FAILED,
     UNKNOWN
   } error_code_{UNKNOWN};
   bool enable_asc_{true};
diff --git a/esphome/components/scd30/sensor.py b/esphome/components/scd30/sensor.py
index 3cfd861a63..ffbf90338f 100644
--- a/esphome/components/scd30/sensor.py
+++ b/esphome/components/scd30/sensor.py
@@ -1,4 +1,4 @@
-from esphome import core
+from esphome import automation, core
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, sensor
@@ -9,6 +9,7 @@ from esphome.const import (
     CONF_TEMPERATURE,
     CONF_CO2,
     CONF_UPDATE_INTERVAL,
+    CONF_VALUE,
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_TEMPERATURE,
     STATE_CLASS_MEASUREMENT,
@@ -26,6 +27,11 @@ SCD30Component = scd30_ns.class_(
     "SCD30Component", cg.Component, sensirion_common.SensirionI2CDevice
 )
 
+# Actions
+ForceRecalibrationWithReference = scd30_ns.class_(
+    "ForceRecalibrationWithReference", automation.Action
+)
+
 CONF_AUTOMATIC_SELF_CALIBRATION = "automatic_self_calibration"
 CONF_ALTITUDE_COMPENSATION = "altitude_compensation"
 CONF_AMBIENT_PRESSURE_COMPENSATION = "ambient_pressure_compensation"
@@ -106,3 +112,26 @@ async def to_code(config):
     if CONF_TEMPERATURE in config:
         sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
         cg.add(var.set_temperature_sensor(sens))
+
+
+@automation.register_action(
+    "scd30.force_recalibration_with_reference",
+    ForceRecalibrationWithReference,
+    cv.maybe_simple_value(
+        {
+            cv.GenerateID(): cv.use_id(SCD30Component),
+            cv.Required(CONF_VALUE): cv.templatable(
+                cv.int_range(min=400, max=2000, max_included=True)
+            ),
+        },
+        key=CONF_VALUE,
+    ),
+)
+async def scd30_force_recalibration_with_reference_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_ = await cg.templatable(config[CONF_VALUE], args, cg.uint16)
+    cg.add(var.set_value(template_))
+    return var

From 0bf6e21e1a862b5a2686b8c7815ad08314b52c83 Mon Sep 17 00:00:00 2001
From: sebcaps <sebastien.carecolin@gmail.com>
Date: Mon, 6 Feb 2023 23:47:50 +0100
Subject: [PATCH 514/838] Add Ld2410 Support (#3919)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                                 |   1 +
 esphome/components/ld2410/__init__.py      | 158 +++++++++++
 esphome/components/ld2410/binary_sensor.py |  36 +++
 esphome/components/ld2410/ld2410.cpp       | 313 +++++++++++++++++++++
 esphome/components/ld2410/ld2410.h         | 146 ++++++++++
 esphome/components/ld2410/sensor.py        |  55 ++++
 esphome/const.py                           |   1 +
 tests/test1.yaml                           |  37 +++
 8 files changed, 747 insertions(+)
 create mode 100644 esphome/components/ld2410/__init__.py
 create mode 100644 esphome/components/ld2410/binary_sensor.py
 create mode 100644 esphome/components/ld2410/ld2410.cpp
 create mode 100644 esphome/components/ld2410/ld2410.h
 create mode 100644 esphome/components/ld2410/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index 49b3df9b50..da48761551 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -119,6 +119,7 @@ esphome/components/kalman_combinator/* @Cat-Ion
 esphome/components/key_collector/* @ssieb
 esphome/components/key_provider/* @ssieb
 esphome/components/lcd_menu/* @numo68
+esphome/components/ld2410/* @sebcaps
 esphome/components/ledc/* @OttoWinter
 esphome/components/light/* @esphome/core
 esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
diff --git a/esphome/components/ld2410/__init__.py b/esphome/components/ld2410/__init__.py
new file mode 100644
index 0000000000..be39cc2979
--- /dev/null
+++ b/esphome/components/ld2410/__init__.py
@@ -0,0 +1,158 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import uart
+from esphome.const import CONF_ID, CONF_TIMEOUT
+from esphome import automation
+from esphome.automation import maybe_simple_id
+
+DEPENDENCIES = ["uart"]
+CODEOWNERS = ["@sebcaps"]
+MULTI_CONF = True
+
+ld2410_ns = cg.esphome_ns.namespace("ld2410")
+LD2410Component = ld2410_ns.class_("LD2410Component", cg.Component, uart.UARTDevice)
+LD2410Restart = ld2410_ns.class_("LD2410Restart", automation.Action)
+CONF_LD2410_ID = "ld2410_id"
+CONF_MAX_MOVE_DISTANCE = "max_move_distance"
+CONF_MAX_STILL_DISTANCE = "max_still_distance"
+CONF_G0_MOVE_THRESHOLD = "g0_move_threshold"
+CONF_G0_STILL_THRESHOLD = "g0_still_threshold"
+CONF_G1_MOVE_THRESHOLD = "g1_move_threshold"
+CONF_G1_STILL_THRESHOLD = "g1_still_threshold"
+CONF_G2_MOVE_THRESHOLD = "g2_move_threshold"
+CONF_G2_STILL_THRESHOLD = "g2_still_threshold"
+CONF_G3_MOVE_THRESHOLD = "g3_move_threshold"
+CONF_G3_STILL_THRESHOLD = "g3_still_threshold"
+CONF_G4_MOVE_THRESHOLD = "g4_move_threshold"
+CONF_G4_STILL_THRESHOLD = "g4_still_threshold"
+CONF_G5_MOVE_THRESHOLD = "g5_move_threshold"
+CONF_G5_STILL_THRESHOLD = "g5_still_threshold"
+CONF_G6_MOVE_THRESHOLD = "g6_move_threshold"
+CONF_G6_STILL_THRESHOLD = "g6_still_threshold"
+CONF_G7_MOVE_THRESHOLD = "g7_move_threshold"
+CONF_G7_STILL_THRESHOLD = "g7_still_threshold"
+CONF_G8_MOVE_THRESHOLD = "g8_move_threshold"
+CONF_G8_STILL_THRESHOLD = "g8_still_threshold"
+
+DISTANCES = [0.75, 1.5, 2.25, 3, 3.75, 4.5, 5.25, 6]
+
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(LD2410Component),
+            cv.Optional(CONF_MAX_MOVE_DISTANCE, default="4.5m"): cv.All(
+                cv.distance, cv.one_of(*DISTANCES, float=True)
+            ),
+            cv.Optional(CONF_MAX_STILL_DISTANCE, default="4.5m"): cv.All(
+                cv.distance, cv.one_of(*DISTANCES, float=True)
+            ),
+            cv.Optional(CONF_TIMEOUT, default="5s"): cv.All(
+                cv.positive_time_period_seconds,
+                cv.Range(max=cv.TimePeriod(seconds=32767)),
+            ),
+            cv.Optional(CONF_G0_MOVE_THRESHOLD, default=50): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G0_STILL_THRESHOLD, default=0): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G1_MOVE_THRESHOLD, default=50): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G1_STILL_THRESHOLD, default=0): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G2_MOVE_THRESHOLD, default=40): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G2_STILL_THRESHOLD, default=40): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G3_MOVE_THRESHOLD, default=40): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G3_STILL_THRESHOLD, default=40): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G4_MOVE_THRESHOLD, default=40): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G4_STILL_THRESHOLD, default=40): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G5_MOVE_THRESHOLD, default=40): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G5_STILL_THRESHOLD, default=40): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G6_MOVE_THRESHOLD, default=30): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G6_STILL_THRESHOLD, default=15): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G7_MOVE_THRESHOLD, default=30): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G7_STILL_THRESHOLD, default=15): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G8_MOVE_THRESHOLD, default=30): cv.int_range(
+                min=0, max=100
+            ),
+            cv.Optional(CONF_G8_STILL_THRESHOLD, default=15): cv.int_range(
+                min=0, max=100
+            ),
+        }
+    )
+    .extend(uart.UART_DEVICE_SCHEMA)
+    .extend(cv.COMPONENT_SCHEMA)
+)
+
+FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
+    "ld2410",
+    baud_rate=256000,
+    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)
+    cg.add(var.set_timeout(config[CONF_TIMEOUT]))
+    cg.add(var.set_max_move_distance(int(config[CONF_MAX_MOVE_DISTANCE] / 0.75)))
+    cg.add(var.set_max_still_distance(int(config[CONF_MAX_STILL_DISTANCE] / 0.75)))
+    cg.add(
+        var.set_range_config(
+            config[CONF_G0_MOVE_THRESHOLD],
+            config[CONF_G0_STILL_THRESHOLD],
+            config[CONF_G1_MOVE_THRESHOLD],
+            config[CONF_G1_STILL_THRESHOLD],
+            config[CONF_G2_MOVE_THRESHOLD],
+            config[CONF_G2_STILL_THRESHOLD],
+            config[CONF_G3_MOVE_THRESHOLD],
+            config[CONF_G3_STILL_THRESHOLD],
+            config[CONF_G4_MOVE_THRESHOLD],
+            config[CONF_G4_STILL_THRESHOLD],
+            config[CONF_G5_MOVE_THRESHOLD],
+            config[CONF_G5_STILL_THRESHOLD],
+            config[CONF_G6_MOVE_THRESHOLD],
+            config[CONF_G6_STILL_THRESHOLD],
+            config[CONF_G7_MOVE_THRESHOLD],
+            config[CONF_G7_STILL_THRESHOLD],
+            config[CONF_G8_MOVE_THRESHOLD],
+            config[CONF_G8_STILL_THRESHOLD],
+        )
+    )
+
+
+CALIBRATION_ACTION_SCHEMA = maybe_simple_id(
+    {
+        cv.Required(CONF_ID): cv.use_id(LD2410Component),
+    }
+)
diff --git a/esphome/components/ld2410/binary_sensor.py b/esphome/components/ld2410/binary_sensor.py
new file mode 100644
index 0000000000..02f73d57b7
--- /dev/null
+++ b/esphome/components/ld2410/binary_sensor.py
@@ -0,0 +1,36 @@
+import esphome.codegen as cg
+from esphome.components import binary_sensor
+import esphome.config_validation as cv
+from esphome.const import DEVICE_CLASS_MOTION, DEVICE_CLASS_OCCUPANCY
+from . import CONF_LD2410_ID, LD2410Component
+
+DEPENDENCIES = ["ld2410"]
+CONF_HAS_TARGET = "has_target"
+CONF_HAS_MOVING_TARGET = "has_moving_target"
+CONF_HAS_STILL_TARGET = "has_still_target"
+
+CONFIG_SCHEMA = {
+    cv.GenerateID(CONF_LD2410_ID): cv.use_id(LD2410Component),
+    cv.Optional(CONF_HAS_TARGET): binary_sensor.binary_sensor_schema(
+        device_class=DEVICE_CLASS_OCCUPANCY
+    ),
+    cv.Optional(CONF_HAS_MOVING_TARGET): binary_sensor.binary_sensor_schema(
+        device_class=DEVICE_CLASS_MOTION
+    ),
+    cv.Optional(CONF_HAS_STILL_TARGET): binary_sensor.binary_sensor_schema(
+        device_class=DEVICE_CLASS_OCCUPANCY
+    ),
+}
+
+
+async def to_code(config):
+    ld2410_component = await cg.get_variable(config[CONF_LD2410_ID])
+    if CONF_HAS_TARGET in config:
+        sens = await binary_sensor.new_binary_sensor(config[CONF_HAS_TARGET])
+        cg.add(ld2410_component.set_target_sensor(sens))
+    if CONF_HAS_MOVING_TARGET in config:
+        sens = await binary_sensor.new_binary_sensor(config[CONF_HAS_MOVING_TARGET])
+        cg.add(ld2410_component.set_moving_target_sensor(sens))
+    if CONF_HAS_STILL_TARGET in config:
+        sens = await binary_sensor.new_binary_sensor(config[CONF_HAS_STILL_TARGET])
+        cg.add(ld2410_component.set_still_target_sensor(sens))
diff --git a/esphome/components/ld2410/ld2410.cpp b/esphome/components/ld2410/ld2410.cpp
new file mode 100644
index 0000000000..8fb84d785e
--- /dev/null
+++ b/esphome/components/ld2410/ld2410.cpp
@@ -0,0 +1,313 @@
+#include "ld2410.h"
+
+#define highbyte(val) (uint8_t)((val) >> 8)
+#define lowbyte(val) (uint8_t)((val) &0xff)
+
+namespace esphome {
+namespace ld2410 {
+
+static const char *const TAG = "ld2410";
+
+void LD2410Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "LD2410:");
+#ifdef USE_BINARY_SENSOR
+  LOG_BINARY_SENSOR("  ", "HasTargetSensor", this->target_binary_sensor_);
+  LOG_BINARY_SENSOR("  ", "MovingSensor", this->moving_binary_sensor_);
+  LOG_BINARY_SENSOR("  ", "StillSensor", this->still_binary_sensor_);
+#endif
+#ifdef USE_SENSOR
+  LOG_SENSOR("  ", "Moving Distance", this->moving_target_distance_sensor_);
+  LOG_SENSOR("  ", "Still Distance", this->still_target_distance_sensor_);
+  LOG_SENSOR("  ", "Moving Energy", this->moving_target_energy_sensor_);
+  LOG_SENSOR("  ", "Still Energy", this->still_target_energy_sensor_);
+  LOG_SENSOR("  ", "Detection Distance", this->detection_distance_sensor_);
+#endif
+  this->set_config_mode_(true);
+  this->get_version_();
+  this->set_config_mode_(false);
+  ESP_LOGCONFIG("  ", "Firmware Version : %u.%u.%u%u%u%u", this->version_[0], this->version_[1], this->version_[2],
+                this->version_[3], this->version_[4], this->version_[5]);
+}
+
+void LD2410Component::setup() {
+  this->set_config_mode_(true);
+  this->set_max_distances_timeout_(this->max_move_distance_, this->max_still_distance_, this->timeout_);
+  // Configure Gates sensitivity
+  this->set_gate_threshold_(0, this->rg0_move_threshold_, this->rg0_still_threshold_);
+  this->set_gate_threshold_(1, this->rg1_move_threshold_, this->rg1_still_threshold_);
+  this->set_gate_threshold_(2, this->rg2_move_threshold_, this->rg2_still_threshold_);
+  this->set_gate_threshold_(3, this->rg3_move_threshold_, this->rg3_still_threshold_);
+  this->set_gate_threshold_(4, this->rg4_move_threshold_, this->rg4_still_threshold_);
+  this->set_gate_threshold_(5, this->rg5_move_threshold_, this->rg5_still_threshold_);
+  this->set_gate_threshold_(6, this->rg6_move_threshold_, this->rg6_still_threshold_);
+  this->set_gate_threshold_(7, this->rg7_move_threshold_, this->rg7_still_threshold_);
+  this->set_gate_threshold_(8, this->rg8_move_threshold_, this->rg8_still_threshold_);
+  this->get_version_();
+  this->set_config_mode_(false);
+  ESP_LOGI("  ", "Firmware Version : %u.%u.%u%u%u%u", this->version_[0], this->version_[1], this->version_[2],
+           this->version_[3], this->version_[4], this->version_[5]);
+}
+
+void LD2410Component::loop() {
+  const int max_line_length = 80;
+  static uint8_t buffer[max_line_length];
+
+  while (available()) {
+    this->readline_(read(), buffer, max_line_length);
+  }
+}
+
+void LD2410Component::send_command_(uint8_t command, uint8_t *command_value, int command_value_len) {
+  // lastCommandSuccess->publish_state(false);
+
+  // frame start bytes
+  this->write_array(CMD_FRAME_HEADER, 4);
+  // length bytes
+  int len = 2;
+  if (command_value != nullptr)
+    len += command_value_len;
+  this->write_byte(lowbyte(len));
+  this->write_byte(highbyte(len));
+
+  // command
+  this->write_byte(lowbyte(command));
+  this->write_byte(highbyte(command));
+
+  // command value bytes
+  if (command_value != nullptr) {
+    for (int i = 0; i < command_value_len; i++) {
+      this->write_byte(command_value[i]);
+    }
+  }
+  // frame end bytes
+  this->write_array(CMD_FRAME_END, 4);
+  // FIXME to remove
+  delay(50);  // NOLINT
+}
+
+void LD2410Component::handle_periodic_data_(uint8_t *buffer, int len) {
+  if (len < 12)
+    return;  // 4 frame start bytes + 2 length bytes + 1 data end byte + 1 crc byte + 4 frame end bytes
+  if (buffer[0] != 0xF4 || buffer[1] != 0xF3 || buffer[2] != 0xF2 || buffer[3] != 0xF1)  // check 4 frame start bytes
+    return;
+  if (buffer[7] != HEAD || buffer[len - 6] != END || buffer[len - 5] != CHECK)  // Check constant values
+    return;  // data head=0xAA, data end=0x55, crc=0x00
+
+    /*
+      Data Type: 6th
+      0x01: Engineering mode
+      0x02: Normal mode
+    */
+    // char data_type = buffer[DATA_TYPES];
+    /*
+      Target states: 9th
+      0x00 = No target
+      0x01 = Moving targets
+      0x02 = Still targets
+      0x03 = Moving+Still targets
+    */
+#ifdef USE_BINARY_SENSOR
+  char target_state = buffer[TARGET_STATES];
+  if (this->target_binary_sensor_ != nullptr) {
+    this->target_binary_sensor_->publish_state(target_state != 0x00);
+  }
+#endif
+
+  /*
+    Reduce data update rate to prevent home assistant database size grow fast
+  */
+  int32_t current_millis = millis();
+  if (current_millis - last_periodic_millis < 1000)
+    return;
+  last_periodic_millis = current_millis;
+
+#ifdef USE_BINARY_SENSOR
+  if (this->moving_binary_sensor_ != nullptr) {
+    this->moving_binary_sensor_->publish_state(CHECK_BIT(target_state, 0));
+  }
+  if (this->still_binary_sensor_ != nullptr) {
+    this->still_binary_sensor_->publish_state(CHECK_BIT(target_state, 1));
+  }
+#endif
+  /*
+    Moving target distance: 10~11th bytes
+    Moving target energy: 12th byte
+    Still target distance: 13~14th bytes
+    Still target energy: 15th byte
+    Detect distance: 16~17th bytes
+  */
+#ifdef USE_SENSOR
+  if (this->moving_target_distance_sensor_ != nullptr) {
+    int new_moving_target_distance = this->two_byte_to_int_(buffer[MOVING_TARGET_LOW], buffer[MOVING_TARGET_HIGH]);
+    if (this->moving_target_distance_sensor_->get_state() != new_moving_target_distance)
+      this->moving_target_distance_sensor_->publish_state(new_moving_target_distance);
+  }
+  if (this->moving_target_energy_sensor_ != nullptr) {
+    int new_moving_target_energy = buffer[MOVING_ENERGY];
+    if (this->moving_target_energy_sensor_->get_state() != new_moving_target_energy)
+      this->moving_target_energy_sensor_->publish_state(new_moving_target_energy);
+  }
+  if (this->still_target_distance_sensor_ != nullptr) {
+    int new_still_target_distance = this->two_byte_to_int_(buffer[STILL_TARGET_LOW], buffer[STILL_TARGET_HIGH]);
+    if (this->still_target_distance_sensor_->get_state() != new_still_target_distance)
+      this->still_target_distance_sensor_->publish_state(new_still_target_distance);
+  }
+  if (this->still_target_energy_sensor_ != nullptr) {
+    int new_still_target_energy = buffer[STILL_ENERGY];
+    if (this->still_target_energy_sensor_->get_state() != new_still_target_energy)
+      this->still_target_energy_sensor_->publish_state(new_still_target_energy);
+  }
+  if (this->detection_distance_sensor_ != nullptr) {
+    int new_detect_distance = this->two_byte_to_int_(buffer[DETECT_DISTANCE_LOW], buffer[DETECT_DISTANCE_HIGH]);
+    if (this->detection_distance_sensor_->get_state() != new_detect_distance)
+      this->detection_distance_sensor_->publish_state(new_detect_distance);
+  }
+#endif
+}
+
+void LD2410Component::handle_ack_data_(uint8_t *buffer, int len) {
+  ESP_LOGI(TAG, "Handling ACK DATA for COMMAND");
+  if (len < 10) {
+    ESP_LOGE(TAG, "Error with last command : incorrect length");
+    return;
+  }
+  if (buffer[0] != 0xFD || buffer[1] != 0xFC || buffer[2] != 0xFB || buffer[3] != 0xFA) {  // check 4 frame start bytes
+    ESP_LOGE(TAG, "Error with last command : incorrect Header");
+    return;
+  }
+  if (buffer[COMMAND_STATUS] != 0x01) {
+    ESP_LOGE(TAG, "Error with last command : status != 0x01");
+    return;
+  }
+  if (this->two_byte_to_int_(buffer[8], buffer[9]) != 0x00) {
+    ESP_LOGE(TAG, "Error with last command , last buffer was: %u , %u", buffer[8], buffer[9]);
+    return;
+  }
+
+  switch (buffer[COMMAND]) {
+    case lowbyte(CMD_ENABLE_CONF):
+      ESP_LOGD(TAG, "Handled Enable conf command");
+      break;
+    case lowbyte(CMD_DISABLE_CONF):
+      ESP_LOGD(TAG, "Handled Disabled conf command");
+      break;
+    case lowbyte(CMD_VERSION):
+      ESP_LOGD(TAG, "FW Version is: %u.%u.%u%u%u%u", buffer[13], buffer[12], buffer[17], buffer[16], buffer[15],
+               buffer[14]);
+      this->version_[0] = buffer[13];
+      this->version_[1] = buffer[12];
+      this->version_[2] = buffer[17];
+      this->version_[3] = buffer[16];
+      this->version_[4] = buffer[15];
+      this->version_[5] = buffer[14];
+
+      break;
+    case lowbyte(CMD_GATE_SENS):
+      ESP_LOGD(TAG, "Handled sensitivity command");
+      break;
+    case lowbyte(CMD_QUERY):  // Query parameters response
+    {
+      if (buffer[10] != 0xAA)
+        return;  // value head=0xAA
+      /*
+        Moving distance range: 13th byte
+        Still distance range: 14th byte
+      */
+      // TODO
+      // maxMovingDistanceRange->publish_state(buffer[12]);
+      // maxStillDistanceRange->publish_state(buffer[13]);
+      /*
+        Moving Sensitivities: 15~23th bytes
+        Still Sensitivities: 24~32th bytes
+      */
+      for (int i = 0; i < 9; i++) {
+        moving_sensitivities[i] = buffer[14 + i];
+      }
+      for (int i = 0; i < 9; i++) {
+        still_sensitivities[i] = buffer[23 + i];
+      }
+      /*
+        None Duration: 33~34th bytes
+      */
+      // noneDuration->publish_state(this->two_byte_to_int_(buffer[32], buffer[33]));
+    } break;
+    default:
+      break;
+  }
+}
+
+void LD2410Component::readline_(int readch, uint8_t *buffer, int len) {
+  static int pos = 0;
+
+  if (readch >= 0) {
+    if (pos < len - 1) {
+      buffer[pos++] = readch;
+      buffer[pos] = 0;
+    } else {
+      pos = 0;
+    }
+    if (pos >= 4) {
+      if (buffer[pos - 4] == 0xF8 && buffer[pos - 3] == 0xF7 && buffer[pos - 2] == 0xF6 && buffer[pos - 1] == 0xF5) {
+        ESP_LOGV(TAG, "Will handle Periodic Data");
+        this->handle_periodic_data_(buffer, pos);
+        pos = 0;  // Reset position index ready for next time
+      } else if (buffer[pos - 4] == 0x04 && buffer[pos - 3] == 0x03 && buffer[pos - 2] == 0x02 &&
+                 buffer[pos - 1] == 0x01) {
+        ESP_LOGV(TAG, "Will handle ACK Data");
+        this->handle_ack_data_(buffer, pos);
+        pos = 0;  // Reset position index ready for next time
+      }
+    }
+  }
+}
+
+void LD2410Component::set_config_mode_(bool enable) {
+  uint8_t cmd = enable ? CMD_ENABLE_CONF : CMD_DISABLE_CONF;
+  uint8_t cmd_value[2] = {0x01, 0x00};
+  this->send_command_(cmd, enable ? cmd_value : nullptr, 2);
+}
+
+void LD2410Component::query_parameters_() { this->send_command_(CMD_QUERY, nullptr, 0); }
+void LD2410Component::get_version_() { this->send_command_(CMD_VERSION, nullptr, 0); }
+
+void LD2410Component::set_max_distances_timeout_(uint8_t max_moving_distance_range, uint8_t max_still_distance_range,
+                                                 uint16_t timeout) {
+  uint8_t value[18] = {0x00,
+                       0x00,
+                       lowbyte(max_moving_distance_range),
+                       highbyte(max_moving_distance_range),
+                       0x00,
+                       0x00,
+                       0x01,
+                       0x00,
+                       lowbyte(max_still_distance_range),
+                       highbyte(max_still_distance_range),
+                       0x00,
+                       0x00,
+                       0x02,
+                       0x00,
+                       lowbyte(timeout),
+                       highbyte(timeout),
+                       0x00,
+                       0x00};
+  this->send_command_(CMD_MAXDIST_DURATION, value, 18);
+  this->query_parameters_();
+}
+void LD2410Component::set_gate_threshold_(uint8_t gate, uint8_t motionsens, uint8_t stillsens) {
+  // reference
+  // https://drive.google.com/drive/folders/1p4dhbEJA3YubyIjIIC7wwVsSo8x29Fq-?spm=a2g0o.detail.1000023.17.93465697yFwVxH
+  //   Send data: configure the motion sensitivity of distance gate 3 to 40, and the static sensitivity of 40
+  // 00 00 (gate)
+  // 03 00 00 00 (gate number)
+  // 01 00 (motion sensitivity)
+  // 28 00 00 00 (value)
+  // 02 00 (still sensitivtiy)
+  // 28 00 00 00 (value)
+  uint8_t value[18] = {0x00, 0x00, lowbyte(gate),       highbyte(gate),       0x00, 0x00,
+                       0x01, 0x00, lowbyte(motionsens), highbyte(motionsens), 0x00, 0x00,
+                       0x02, 0x00, lowbyte(stillsens),  highbyte(stillsens),  0x00, 0x00};
+  this->send_command_(CMD_GATE_SENS, value, 18);
+}
+
+}  // namespace ld2410
+}  // namespace esphome
diff --git a/esphome/components/ld2410/ld2410.h b/esphome/components/ld2410/ld2410.h
new file mode 100644
index 0000000000..5a35798bc2
--- /dev/null
+++ b/esphome/components/ld2410/ld2410.h
@@ -0,0 +1,146 @@
+#pragma once
+#include "esphome/core/defines.h"
+#include "esphome/core/component.h"
+#ifdef USE_BINARY_SENSOR
+#include "esphome/components/binary_sensor/binary_sensor.h"
+#endif
+#ifdef USE_SENSOR
+#include "esphome/components/sensor/sensor.h"
+#endif
+#include "esphome/components/uart/uart.h"
+#include "esphome/core/automation.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace ld2410 {
+
+#define CHECK_BIT(var, pos) (((var) >> (pos)) & 1)
+
+// Commands
+static const uint8_t CMD_ENABLE_CONF = 0x00FF;
+static const uint8_t CMD_DISABLE_CONF = 0x00FE;
+static const uint8_t CMD_MAXDIST_DURATION = 0x0060;
+static const uint8_t CMD_QUERY = 0x0061;
+static const uint8_t CMD_GATE_SENS = 0x0064;
+static const uint8_t CMD_VERSION = 0x00A0;
+
+// Commands values
+static const uint8_t CMD_MAX_MOVE_VALUE = 0x0000;
+static const uint8_t CMD_MAX_STILL_VALUE = 0x0001;
+static const uint8_t CMD_DURATION_VALUE = 0x0002;
+// Command Header & Footer
+static const uint8_t CMD_FRAME_HEADER[4] = {0xFD, 0xFC, 0xFB, 0xFA};
+static const uint8_t CMD_FRAME_END[4] = {0x04, 0x03, 0x02, 0x01};
+// Data Header & Footer
+static const uint8_t DATA_FRAME_HEADER[4] = {0xF4, 0xF3, 0xF2, 0xF1};
+static const uint8_t DATA_FRAME_END[4] = {0xF8, 0xF7, 0xF6, 0xF5};
+/*
+Data Type: 6th byte
+Target states: 9th byte
+    Moving target distance: 10~11th bytes
+    Moving target energy: 12th byte
+    Still target distance: 13~14th bytes
+    Still target energy: 15th byte
+    Detect distance: 16~17th bytes
+*/
+enum PeriodicDataStructure : uint8_t {
+  DATA_TYPES = 5,
+  TARGET_STATES = 8,
+  MOVING_TARGET_LOW = 9,
+  MOVING_TARGET_HIGH = 10,
+  MOVING_ENERGY = 11,
+  STILL_TARGET_LOW = 12,
+  STILL_TARGET_HIGH = 13,
+  STILL_ENERGY = 14,
+  DETECT_DISTANCE_LOW = 15,
+  DETECT_DISTANCE_HIGH = 16,
+};
+enum PeriodicDataValue : uint8_t { HEAD = 0XAA, END = 0x55, CHECK = 0x00 };
+
+enum AckDataStructure : uint8_t { COMMAND = 6, COMMAND_STATUS = 7 };
+
+//  char cmd[2] = {enable ? 0xFF : 0xFE, 0x00};
+class LD2410Component : public Component, public uart::UARTDevice {
+#ifdef USE_SENSOR
+  SUB_SENSOR(moving_target_distance)
+  SUB_SENSOR(still_target_distance)
+  SUB_SENSOR(moving_target_energy)
+  SUB_SENSOR(still_target_energy)
+  SUB_SENSOR(detection_distance)
+#endif
+
+ public:
+  void setup() override;
+  void dump_config() override;
+  void loop() override;
+
+#ifdef USE_BINARY_SENSOR
+  void set_target_sensor(binary_sensor::BinarySensor *sens) { this->target_binary_sensor_ = sens; };
+  void set_moving_target_sensor(binary_sensor::BinarySensor *sens) { this->moving_binary_sensor_ = sens; };
+  void set_still_target_sensor(binary_sensor::BinarySensor *sens) { this->still_binary_sensor_ = sens; };
+#endif
+
+  void set_timeout(uint16_t value) { this->timeout_ = value; };
+  void set_max_move_distance(uint8_t value) { this->max_move_distance_ = value; };
+  void set_max_still_distance(uint8_t value) { this->max_still_distance_ = value; };
+  void set_range_config(int rg0_move, int rg0_still, int rg1_move, int rg1_still, int rg2_move, int rg2_still,
+                        int rg3_move, int rg3_still, int rg4_move, int rg4_still, int rg5_move, int rg5_still,
+                        int rg6_move, int rg6_still, int rg7_move, int rg7_still, int rg8_move, int rg8_still) {
+    this->rg0_move_threshold_ = rg0_move;
+    this->rg0_still_threshold_ = rg0_still;
+    this->rg1_move_threshold_ = rg1_move;
+    this->rg1_still_threshold_ = rg1_still;
+    this->rg2_move_threshold_ = rg2_move;
+    this->rg2_still_threshold_ = rg2_still;
+    this->rg3_move_threshold_ = rg3_move;
+    this->rg3_still_threshold_ = rg3_still;
+    this->rg4_move_threshold_ = rg4_move;
+    this->rg4_still_threshold_ = rg4_still;
+    this->rg5_move_threshold_ = rg5_move;
+    this->rg5_still_threshold_ = rg5_still;
+    this->rg6_move_threshold_ = rg6_move;
+    this->rg6_still_threshold_ = rg6_still;
+    this->rg7_move_threshold_ = rg7_move;
+    this->rg7_still_threshold_ = rg7_still;
+    this->rg8_move_threshold_ = rg8_move;
+    this->rg8_still_threshold_ = rg8_still;
+  };
+  int moving_sensitivities[9] = {0};
+  int still_sensitivities[9] = {0};
+
+  int32_t last_periodic_millis = millis();
+
+ protected:
+#ifdef USE_BINARY_SENSOR
+  binary_sensor::BinarySensor *target_binary_sensor_{nullptr};
+  binary_sensor::BinarySensor *moving_binary_sensor_{nullptr};
+  binary_sensor::BinarySensor *still_binary_sensor_{nullptr};
+#endif
+
+  std::vector<uint8_t> rx_buffer_;
+  int two_byte_to_int_(char firstbyte, char secondbyte) { return (int16_t)(secondbyte << 8) + firstbyte; }
+  void send_command_(uint8_t command_str, uint8_t *command_value, int command_value_len);
+
+  void set_max_distances_timeout_(uint8_t max_moving_distance_range, uint8_t max_still_distance_range,
+                                  uint16_t timeout);
+  void set_gate_threshold_(uint8_t gate, uint8_t motionsens, uint8_t stillsens);
+  void set_config_mode_(bool enable);
+  void handle_periodic_data_(uint8_t *buffer, int len);
+  void handle_ack_data_(uint8_t *buffer, int len);
+  void readline_(int readch, uint8_t *buffer, int len);
+  void query_parameters_();
+  void get_version_();
+
+  uint16_t timeout_;
+  uint8_t max_move_distance_;
+  uint8_t max_still_distance_;
+
+  uint8_t version_[6];
+  uint8_t rg0_move_threshold_, rg0_still_threshold_, rg1_move_threshold_, rg1_still_threshold_, rg2_move_threshold_,
+      rg2_still_threshold_, rg3_move_threshold_, rg3_still_threshold_, rg4_move_threshold_, rg4_still_threshold_,
+      rg5_move_threshold_, rg5_still_threshold_, rg6_move_threshold_, rg6_still_threshold_, rg7_move_threshold_,
+      rg7_still_threshold_, rg8_move_threshold_, rg8_still_threshold_;
+};
+
+}  // namespace ld2410
+}  // namespace esphome
diff --git a/esphome/components/ld2410/sensor.py b/esphome/components/ld2410/sensor.py
new file mode 100644
index 0000000000..b941263134
--- /dev/null
+++ b/esphome/components/ld2410/sensor.py
@@ -0,0 +1,55 @@
+import esphome.codegen as cg
+from esphome.components import sensor
+import esphome.config_validation as cv
+from esphome.const import (
+    DEVICE_CLASS_DISTANCE,
+    DEVICE_CLASS_ENERGY,
+    UNIT_CENTIMETER,
+    UNIT_PERCENT,
+)
+from . import CONF_LD2410_ID, LD2410Component
+
+DEPENDENCIES = ["ld2410"]
+CONF_MOVING_DISTANCE = "moving_distance"
+CONF_STILL_DISTANCE = "still_distance"
+CONF_MOVING_ENERGY = "moving_energy"
+CONF_STILL_ENERGY = "still_energy"
+CONF_DETECTION_DISTANCE = "detection_distance"
+
+CONFIG_SCHEMA = {
+    cv.GenerateID(CONF_LD2410_ID): cv.use_id(LD2410Component),
+    cv.Optional(CONF_MOVING_DISTANCE): sensor.sensor_schema(
+        device_class=DEVICE_CLASS_DISTANCE, unit_of_measurement=UNIT_CENTIMETER
+    ),
+    cv.Optional(CONF_STILL_DISTANCE): sensor.sensor_schema(
+        device_class=DEVICE_CLASS_DISTANCE, unit_of_measurement=UNIT_CENTIMETER
+    ),
+    cv.Optional(CONF_MOVING_ENERGY): sensor.sensor_schema(
+        device_class=DEVICE_CLASS_ENERGY, unit_of_measurement=UNIT_PERCENT
+    ),
+    cv.Optional(CONF_STILL_ENERGY): sensor.sensor_schema(
+        device_class=DEVICE_CLASS_ENERGY, unit_of_measurement=UNIT_PERCENT
+    ),
+    cv.Optional(CONF_DETECTION_DISTANCE): sensor.sensor_schema(
+        device_class=DEVICE_CLASS_DISTANCE, unit_of_measurement=UNIT_CENTIMETER
+    ),
+}
+
+
+async def to_code(config):
+    ld2410_component = await cg.get_variable(config[CONF_LD2410_ID])
+    if CONF_MOVING_DISTANCE in config:
+        sens = await sensor.new_sensor(config[CONF_MOVING_DISTANCE])
+        cg.add(ld2410_component.set_moving_target_distance_sensor(sens))
+    if CONF_STILL_DISTANCE in config:
+        sens = await sensor.new_sensor(config[CONF_STILL_DISTANCE])
+        cg.add(ld2410_component.set_still_target_distance_sensor(sens))
+    if CONF_MOVING_ENERGY in config:
+        sens = await sensor.new_sensor(config[CONF_MOVING_ENERGY])
+        cg.add(ld2410_component.set_moving_target_energy_sensor(sens))
+    if CONF_STILL_ENERGY in config:
+        sens = await sensor.new_sensor(config[CONF_STILL_ENERGY])
+        cg.add(ld2410_component.set_still_target_energy_sensor(sens))
+    if CONF_DETECTION_DISTANCE in config:
+        sens = await sensor.new_sensor(config[CONF_DETECTION_DISTANCE])
+        cg.add(ld2410_component.set_detection_distance_sensor(sens))
diff --git a/esphome/const.py b/esphome/const.py
index 889c6e94d7..b02088ffbb 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -862,6 +862,7 @@ UNIT_AMPERE = "A"
 UNIT_BECQUEREL_PER_CUBIC_METER = "Bq/m³"
 UNIT_BYTES = "B"
 UNIT_CELSIUS = "°C"
+UNIT_CENTIMETER = "cm"
 UNIT_COUNT_DECILITRE = "/dL"
 UNIT_COUNTS_PER_CUBIC_METER = "#/m³"
 UNIT_CUBIC_METER = "m³"
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 0448093001..abbfe8adec 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -222,6 +222,12 @@ uart:
     rx_pin: GPIO26
     baud_rate: 115200
     rx_buffer_size: 1024
+  - id: ld2410_uart
+    tx_pin: 18
+    rx_pin: 23
+    baud_rate: 256000
+    parity: NONE
+    stop_bits: 1
 
 ota:
   safe_mode: true
@@ -1200,6 +1206,17 @@ sensor:
     pressure:
       name: "MPL3115A2 Pressure"
     update_interval: 10s
+  - platform: ld2410
+    moving_distance:
+      name: "Moving distance (cm)"
+    still_distance:
+      name: "Still Distance (cm)"
+    moving_energy:
+      name: "Move Energy"
+    still_energy:
+      name: "Still Energy"
+    detection_distance:
+      name: "Distance Detection"
 
 esp32_touch:
   setup_mode: false
@@ -1461,6 +1478,13 @@ binary_sensor:
     id: close_sensor
   - platform: template
     id: close_obstacle_sensor
+  - platform: ld2410
+    has_target:
+      name: presence
+    has_moving_target:
+      name: movement
+    has_still_target:
+      name: still
 
 pca9685:
   frequency: 500
@@ -3143,6 +3167,19 @@ button:
     on_press:
       midea_ac.power_toggle:
 
+ld2410:
+  id: my_ld2410
+  uart_id: ld2410_uart
+  timeout: 150s
+  max_move_distance: 6m
+  max_still_distance: 0.75m
+  g0_move_threshold: 10
+  g0_still_threshold: 20
+  g2_move_threshold: 20
+  g2_still_threshold: 21
+  g8_move_threshold: 80
+  g8_still_threshold: 81
+
 lcd_menu:
   display_id: my_lcd_gpio
   mark_back: 0x5e

From 93ddce2e798f07b641a7d41e2a523a9b723d36af Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Mon, 6 Feb 2023 15:17:17 -0800
Subject: [PATCH 515/838] add Resol VBus support (#3976)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
fixes https://github.com/esphome/feature-requests/issues/1949
---
 CODEOWNERS                                    |   1 +
 .../components/display_menu_base/__init__.py  |   2 +-
 esphome/components/vbus/__init__.py           |  32 +
 .../components/vbus/binary_sensor/__init__.py | 296 +++++++++
 .../vbus/binary_sensor/vbus_binary_sensor.cpp | 142 +++++
 .../vbus/binary_sensor/vbus_binary_sensor.h   | 115 ++++
 esphome/components/vbus/sensor/__init__.py    | 568 ++++++++++++++++++
 .../components/vbus/sensor/vbus_sensor.cpp    | 208 +++++++
 esphome/components/vbus/sensor/vbus_sensor.h  | 151 +++++
 esphome/components/vbus/vbus.cpp              | 124 ++++
 esphome/components/vbus/vbus.h                |  52 ++
 esphome/const.py                              |   3 +
 tests/test3.yaml                              |  13 +
 tests/test5.yaml                              |  40 ++
 14 files changed, 1746 insertions(+), 1 deletion(-)
 create mode 100644 esphome/components/vbus/__init__.py
 create mode 100644 esphome/components/vbus/binary_sensor/__init__.py
 create mode 100644 esphome/components/vbus/binary_sensor/vbus_binary_sensor.cpp
 create mode 100644 esphome/components/vbus/binary_sensor/vbus_binary_sensor.h
 create mode 100644 esphome/components/vbus/sensor/__init__.py
 create mode 100644 esphome/components/vbus/sensor/vbus_sensor.cpp
 create mode 100644 esphome/components/vbus/sensor/vbus_sensor.h
 create mode 100644 esphome/components/vbus/vbus.cpp
 create mode 100644 esphome/components/vbus/vbus.h

diff --git a/CODEOWNERS b/CODEOWNERS
index da48761551..ca1da2f153 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -275,6 +275,7 @@ esphome/components/uart/* @esphome/core
 esphome/components/ufire_ec/* @pvizeli
 esphome/components/ufire_ise/* @pvizeli
 esphome/components/ultrasonic/* @OttoWinter
+esphome/components/vbus/* @ssieb
 esphome/components/version/* @esphome/core
 esphome/components/wake_on_lan/* @willwill2will54
 esphome/components/web_server_base/* @OttoWinter
diff --git a/esphome/components/display_menu_base/__init__.py b/esphome/components/display_menu_base/__init__.py
index eb66737fdb..d7326cdc65 100644
--- a/esphome/components/display_menu_base/__init__.py
+++ b/esphome/components/display_menu_base/__init__.py
@@ -8,6 +8,7 @@ from esphome.const import (
     CONF_TRIGGER_ID,
     CONF_ON_VALUE,
     CONF_COMMAND,
+    CONF_CUSTOM,
     CONF_NUMBER,
     CONF_FORMAT,
     CONF_MODE,
@@ -32,7 +33,6 @@ CONF_BACK = "back"
 CONF_TEXT = "text"
 CONF_SELECT = "select"
 CONF_SWITCH = "switch"
-CONF_CUSTOM = "custom"
 CONF_ITEMS = "items"
 CONF_ON_TEXT = "on_text"
 CONF_OFF_TEXT = "off_text"
diff --git a/esphome/components/vbus/__init__.py b/esphome/components/vbus/__init__.py
new file mode 100644
index 0000000000..70f130e23b
--- /dev/null
+++ b/esphome/components/vbus/__init__.py
@@ -0,0 +1,32 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import uart
+from esphome.const import CONF_ID
+
+CODEOWNERS = ["@ssieb"]
+
+DEPENDENCIES = ["uart"]
+
+MULTI_CONF = True
+
+vbus_ns = cg.esphome_ns.namespace("vbus")
+VBus = vbus_ns.class_("VBus", uart.UARTDevice, cg.Component)
+
+CONF_VBUS_ID = "vbus_id"
+
+CONF_DELTASOL_BS_PLUS = "deltasol_bs_plus"
+CONF_DELTASOL_C = "deltasol_c"
+CONF_DELTASOL_CS2 = "deltasol_cs2"
+CONF_DELTASOL_CS_PLUS = "deltasol_cs_plus"
+
+CONFIG_SCHEMA = uart.UART_DEVICE_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(VBus),
+    }
+)
+
+
+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/vbus/binary_sensor/__init__.py b/esphome/components/vbus/binary_sensor/__init__.py
new file mode 100644
index 0000000000..9901fb2724
--- /dev/null
+++ b/esphome/components/vbus/binary_sensor/__init__.py
@@ -0,0 +1,296 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import binary_sensor
+from esphome.const import (
+    CONF_ID,
+    CONF_BINARY_SENSORS,
+    CONF_COMMAND,
+    CONF_CUSTOM,
+    CONF_DEST,
+    CONF_LAMBDA,
+    CONF_MODEL,
+    CONF_SOURCE,
+    DEVICE_CLASS_PROBLEM,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+)
+from .. import (
+    vbus_ns,
+    VBus,
+    CONF_VBUS_ID,
+    CONF_DELTASOL_BS_PLUS,
+    CONF_DELTASOL_C,
+    CONF_DELTASOL_CS2,
+    CONF_DELTASOL_CS_PLUS,
+)
+
+DeltaSol_BS_Plus = vbus_ns.class_("DeltaSolBSPlusBSensor", cg.Component)
+DeltaSol_C = vbus_ns.class_("DeltaSolCBSensor", cg.Component)
+DeltaSol_CS2 = vbus_ns.class_("DeltaSolCS2BSensor", cg.Component)
+DeltaSol_CS_Plus = vbus_ns.class_("DeltaSolCSPlusBSensor", cg.Component)
+VBusCustom = vbus_ns.class_("VBusCustomBSensor", cg.Component)
+VBusCustomSub = vbus_ns.class_("VBusCustomSubBSensor", cg.Component)
+
+CONF_RELAY1 = "relay1"
+CONF_RELAY2 = "relay2"
+CONF_SENSOR1_ERROR = "sensor1_error"
+CONF_SENSOR2_ERROR = "sensor2_error"
+CONF_SENSOR3_ERROR = "sensor3_error"
+CONF_SENSOR4_ERROR = "sensor4_error"
+CONF_COLLECTOR_MAX = "collector_max"
+CONF_COLLECTOR_MIN = "collector_min"
+CONF_COLLECTOR_FROST = "collector_frost"
+CONF_TUBE_COLLECTOR = "tube_collector"
+CONF_RECOOLING = "recooling"
+CONF_HQM = "hqm"
+
+CONFIG_SCHEMA = cv.typed_schema(
+    {
+        CONF_DELTASOL_BS_PLUS: cv.COMPONENT_SCHEMA.extend(
+            {
+                cv.GenerateID(): cv.declare_id(DeltaSol_BS_Plus),
+                cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
+                cv.Optional(CONF_RELAY1): binary_sensor.binary_sensor_schema(),
+                cv.Optional(CONF_RELAY2): binary_sensor.binary_sensor_schema(),
+                cv.Optional(CONF_SENSOR1_ERROR): binary_sensor.binary_sensor_schema(
+                    device_class=DEVICE_CLASS_PROBLEM,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_SENSOR2_ERROR): binary_sensor.binary_sensor_schema(
+                    device_class=DEVICE_CLASS_PROBLEM,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_SENSOR3_ERROR): binary_sensor.binary_sensor_schema(
+                    device_class=DEVICE_CLASS_PROBLEM,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_SENSOR4_ERROR): binary_sensor.binary_sensor_schema(
+                    device_class=DEVICE_CLASS_PROBLEM,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_COLLECTOR_MAX): binary_sensor.binary_sensor_schema(
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_COLLECTOR_MIN): binary_sensor.binary_sensor_schema(
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_COLLECTOR_FROST): binary_sensor.binary_sensor_schema(
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_TUBE_COLLECTOR): binary_sensor.binary_sensor_schema(
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_RECOOLING): binary_sensor.binary_sensor_schema(
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_HQM): binary_sensor.binary_sensor_schema(
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+            }
+        ),
+        CONF_DELTASOL_C: cv.COMPONENT_SCHEMA.extend(
+            {
+                cv.GenerateID(): cv.declare_id(DeltaSol_C),
+                cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
+                cv.Optional(CONF_SENSOR1_ERROR): binary_sensor.binary_sensor_schema(
+                    device_class=DEVICE_CLASS_PROBLEM,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_SENSOR2_ERROR): binary_sensor.binary_sensor_schema(
+                    device_class=DEVICE_CLASS_PROBLEM,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_SENSOR3_ERROR): binary_sensor.binary_sensor_schema(
+                    device_class=DEVICE_CLASS_PROBLEM,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_SENSOR4_ERROR): binary_sensor.binary_sensor_schema(
+                    device_class=DEVICE_CLASS_PROBLEM,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+            }
+        ),
+        CONF_DELTASOL_CS2: cv.COMPONENT_SCHEMA.extend(
+            {
+                cv.GenerateID(): cv.declare_id(DeltaSol_CS2),
+                cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
+                cv.Optional(CONF_SENSOR1_ERROR): binary_sensor.binary_sensor_schema(
+                    device_class=DEVICE_CLASS_PROBLEM,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_SENSOR2_ERROR): binary_sensor.binary_sensor_schema(
+                    device_class=DEVICE_CLASS_PROBLEM,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_SENSOR3_ERROR): binary_sensor.binary_sensor_schema(
+                    device_class=DEVICE_CLASS_PROBLEM,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_SENSOR4_ERROR): binary_sensor.binary_sensor_schema(
+                    device_class=DEVICE_CLASS_PROBLEM,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+            }
+        ),
+        CONF_DELTASOL_CS_PLUS: cv.COMPONENT_SCHEMA.extend(
+            {
+                cv.GenerateID(): cv.declare_id(DeltaSol_CS_Plus),
+                cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
+                cv.Optional(CONF_SENSOR1_ERROR): binary_sensor.binary_sensor_schema(
+                    device_class=DEVICE_CLASS_PROBLEM,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_SENSOR2_ERROR): binary_sensor.binary_sensor_schema(
+                    device_class=DEVICE_CLASS_PROBLEM,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_SENSOR3_ERROR): binary_sensor.binary_sensor_schema(
+                    device_class=DEVICE_CLASS_PROBLEM,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_SENSOR4_ERROR): binary_sensor.binary_sensor_schema(
+                    device_class=DEVICE_CLASS_PROBLEM,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+            }
+        ),
+        CONF_CUSTOM: cv.COMPONENT_SCHEMA.extend(
+            {
+                cv.GenerateID(): cv.declare_id(VBusCustom),
+                cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
+                cv.Optional(CONF_COMMAND): cv.uint16_t,
+                cv.Optional(CONF_SOURCE): cv.uint16_t,
+                cv.Optional(CONF_DEST): cv.uint16_t,
+                cv.Optional(CONF_BINARY_SENSORS): cv.ensure_list(
+                    binary_sensor.binary_sensor_schema().extend(
+                        {
+                            cv.GenerateID(): cv.declare_id(VBusCustomSub),
+                            cv.Required(CONF_LAMBDA): cv.lambda_,
+                        }
+                    )
+                ),
+            }
+        ),
+    },
+    key=CONF_MODEL,
+    lower=True,
+    space="_",
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+
+    if config[CONF_MODEL] == CONF_DELTASOL_BS_PLUS:
+        cg.add(var.set_command(0x0100))
+        cg.add(var.set_source(0x4221))
+        cg.add(var.set_dest(0x0010))
+        if CONF_RELAY1 in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_RELAY1])
+            cg.add(var.set_relay1_bsensor(sens))
+        if CONF_RELAY2 in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_RELAY2])
+            cg.add(var.set_relay2_bsensor(sens))
+        if CONF_SENSOR1_ERROR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_SENSOR1_ERROR])
+            cg.add(var.set_s1_error_bsensor(sens))
+        if CONF_SENSOR2_ERROR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_SENSOR2_ERROR])
+            cg.add(var.set_s2_error_bsensor(sens))
+        if CONF_SENSOR3_ERROR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_SENSOR3_ERROR])
+            cg.add(var.set_s3_error_bsensor(sens))
+        if CONF_SENSOR4_ERROR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_SENSOR4_ERROR])
+            cg.add(var.set_s4_error_bsensor(sens))
+        if CONF_COLLECTOR_MAX in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_COLLECTOR_MAX])
+            cg.add(var.set_collector_max_bsensor(sens))
+        if CONF_COLLECTOR_MIN in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_COLLECTOR_MIN])
+            cg.add(var.set_collector_min_bsensor(sens))
+        if CONF_COLLECTOR_FROST in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_COLLECTOR_FROST])
+            cg.add(var.set_collector_frost_bsensor(sens))
+        if CONF_TUBE_COLLECTOR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_TUBE_COLLECTOR])
+            cg.add(var.set_tube_collector_bsensor(sens))
+        if CONF_RECOOLING in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_RECOOLING])
+            cg.add(var.set_recooling_bsensor(sens))
+        if CONF_HQM in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_HQM])
+            cg.add(var.set_hqm_bsensor(sens))
+
+    elif config[CONF_MODEL] == CONF_DELTASOL_C:
+        cg.add(var.set_command(0x0100))
+        cg.add(var.set_source(0x4212))
+        cg.add(var.set_dest(0x0010))
+        if CONF_SENSOR1_ERROR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_SENSOR1_ERROR])
+            cg.add(var.set_s1_error_bsensor(sens))
+        if CONF_SENSOR2_ERROR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_SENSOR2_ERROR])
+            cg.add(var.set_s2_error_bsensor(sens))
+        if CONF_SENSOR3_ERROR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_SENSOR3_ERROR])
+            cg.add(var.set_s3_error_bsensor(sens))
+        if CONF_SENSOR4_ERROR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_SENSOR4_ERROR])
+            cg.add(var.set_s4_error_bsensor(sens))
+
+    elif config[CONF_MODEL] == CONF_DELTASOL_CS2:
+        cg.add(var.set_command(0x0100))
+        cg.add(var.set_source(0x1121))
+        cg.add(var.set_dest(0x0010))
+        if CONF_SENSOR1_ERROR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_SENSOR1_ERROR])
+            cg.add(var.set_s1_error_bsensor(sens))
+        if CONF_SENSOR2_ERROR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_SENSOR2_ERROR])
+            cg.add(var.set_s2_error_bsensor(sens))
+        if CONF_SENSOR3_ERROR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_SENSOR3_ERROR])
+            cg.add(var.set_s3_error_bsensor(sens))
+        if CONF_SENSOR4_ERROR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_SENSOR4_ERROR])
+            cg.add(var.set_s4_error_bsensor(sens))
+
+    elif config[CONF_MODEL] == CONF_DELTASOL_CS_PLUS:
+        cg.add(var.set_command(0x0100))
+        cg.add(var.set_source(0x2211))
+        cg.add(var.set_dest(0x0010))
+        if CONF_SENSOR1_ERROR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_SENSOR1_ERROR])
+            cg.add(var.set_s1_error_bsensor(sens))
+        if CONF_SENSOR2_ERROR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_SENSOR2_ERROR])
+            cg.add(var.set_s2_error_bsensor(sens))
+        if CONF_SENSOR3_ERROR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_SENSOR3_ERROR])
+            cg.add(var.set_s3_error_bsensor(sens))
+        if CONF_SENSOR4_ERROR in config:
+            sens = await binary_sensor.new_binary_sensor(config[CONF_SENSOR4_ERROR])
+            cg.add(var.set_s4_error_bsensor(sens))
+
+    elif config[CONF_MODEL] == CONF_CUSTOM:
+        if CONF_COMMAND in config:
+            cg.add(var.set_command(config[CONF_COMMAND]))
+        if CONF_SOURCE in config:
+            cg.add(var.set_source(config[CONF_SOURCE]))
+        if CONF_DEST in config:
+            cg.add(var.set_dest(config[CONF_DEST]))
+        bsensors = []
+        for conf in config[CONF_BINARY_SENSORS]:
+            bsens = await binary_sensor.new_binary_sensor(conf)
+            lambda_ = await cg.process_lambda(
+                conf[CONF_LAMBDA],
+                [(cg.std_vector.template(cg.uint8), "x")],
+                return_type=cg.bool_,
+            )
+            cg.add(bsens.set_message_parser(lambda_))
+            bsensors.append(bsens)
+        cg.add(var.set_bsensors(bsensors))
+
+    vbus = await cg.get_variable(config[CONF_VBUS_ID])
+    cg.add(vbus.register_listener(var))
diff --git a/esphome/components/vbus/binary_sensor/vbus_binary_sensor.cpp b/esphome/components/vbus/binary_sensor/vbus_binary_sensor.cpp
new file mode 100644
index 0000000000..6edbae22ba
--- /dev/null
+++ b/esphome/components/vbus/binary_sensor/vbus_binary_sensor.cpp
@@ -0,0 +1,142 @@
+#include "vbus_binary_sensor.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace vbus {
+
+static const char *const TAG = "vbus.binary_sensor";
+
+void DeltaSolBSPlusBSensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "Deltasol BS Plus:");
+  LOG_BINARY_SENSOR("  ", "Relay 1 On", this->relay1_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Relay 2 On", this->relay2_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Sensor 1 Error", this->s1_error_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Sensor 2 Error", this->s2_error_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Sensor 3 Error", this->s3_error_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Sensor 4 Error", this->s4_error_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Option Collector Max", this->collector_max_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Option Collector Min", this->collector_min_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Option Collector Frost", this->collector_frost_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Option Tube Collector", this->tube_collector_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Option Recooling", this->recooling_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Option Heat Quantity Measurement", this->hqm_bsensor_);
+}
+
+void DeltaSolBSPlusBSensor::handle_message(std::vector<uint8_t> &message) {
+  if (this->relay1_bsensor_ != nullptr)
+    this->relay1_bsensor_->publish_state(message[10] & 1);
+  if (this->relay2_bsensor_ != nullptr)
+    this->relay2_bsensor_->publish_state(message[10] & 2);
+  if (this->s1_error_bsensor_ != nullptr)
+    this->s1_error_bsensor_->publish_state(message[11] & 1);
+  if (this->s2_error_bsensor_ != nullptr)
+    this->s2_error_bsensor_->publish_state(message[11] & 2);
+  if (this->s3_error_bsensor_ != nullptr)
+    this->s3_error_bsensor_->publish_state(message[11] & 4);
+  if (this->s4_error_bsensor_ != nullptr)
+    this->s4_error_bsensor_->publish_state(message[11] & 8);
+  if (this->collector_max_bsensor_ != nullptr)
+    this->collector_max_bsensor_->publish_state(message[15] & 1);
+  if (this->collector_min_bsensor_ != nullptr)
+    this->collector_min_bsensor_->publish_state(message[15] & 2);
+  if (this->collector_frost_bsensor_ != nullptr)
+    this->collector_frost_bsensor_->publish_state(message[15] & 4);
+  if (this->tube_collector_bsensor_ != nullptr)
+    this->tube_collector_bsensor_->publish_state(message[15] & 8);
+  if (this->recooling_bsensor_ != nullptr)
+    this->recooling_bsensor_->publish_state(message[15] & 0x10);
+  if (this->hqm_bsensor_ != nullptr)
+    this->hqm_bsensor_->publish_state(message[15] & 0x20);
+}
+
+void DeltaSolCBSensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "Deltasol C:");
+  LOG_BINARY_SENSOR("  ", "Sensor 1 Error", this->s1_error_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Sensor 2 Error", this->s2_error_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Sensor 3 Error", this->s3_error_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Sensor 4 Error", this->s4_error_bsensor_);
+}
+
+void DeltaSolCBSensor::handle_message(std::vector<uint8_t> &message) {
+  if (this->s1_error_bsensor_ != nullptr)
+    this->s1_error_bsensor_->publish_state(message[10] & 1);
+  if (this->s2_error_bsensor_ != nullptr)
+    this->s2_error_bsensor_->publish_state(message[10] & 2);
+  if (this->s3_error_bsensor_ != nullptr)
+    this->s3_error_bsensor_->publish_state(message[10] & 4);
+  if (this->s4_error_bsensor_ != nullptr)
+    this->s4_error_bsensor_->publish_state(message[10] & 8);
+}
+
+void DeltaSolCS2BSensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "Deltasol CS2:");
+  LOG_BINARY_SENSOR("  ", "Sensor 1 Error", this->s1_error_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Sensor 2 Error", this->s2_error_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Sensor 3 Error", this->s3_error_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Sensor 4 Error", this->s4_error_bsensor_);
+}
+
+void DeltaSolCS2BSensor::handle_message(std::vector<uint8_t> &message) {
+  if (this->s1_error_bsensor_ != nullptr)
+    this->s1_error_bsensor_->publish_state(message[18] & 1);
+  if (this->s2_error_bsensor_ != nullptr)
+    this->s2_error_bsensor_->publish_state(message[18] & 2);
+  if (this->s3_error_bsensor_ != nullptr)
+    this->s3_error_bsensor_->publish_state(message[18] & 4);
+  if (this->s4_error_bsensor_ != nullptr)
+    this->s4_error_bsensor_->publish_state(message[18] & 8);
+}
+
+void DeltaSolCSPlusBSensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "Deltasol CS Plus:");
+  LOG_BINARY_SENSOR("  ", "Sensor 1 Error", this->s1_error_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Sensor 2 Error", this->s2_error_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Sensor 3 Error", this->s3_error_bsensor_);
+  LOG_BINARY_SENSOR("  ", "Sensor 4 Error", this->s4_error_bsensor_);
+}
+
+void DeltaSolCSPlusBSensor::handle_message(std::vector<uint8_t> &message) {
+  if (this->s1_error_bsensor_ != nullptr)
+    this->s1_error_bsensor_->publish_state(message[20] & 1);
+  if (this->s2_error_bsensor_ != nullptr)
+    this->s2_error_bsensor_->publish_state(message[20] & 2);
+  if (this->s3_error_bsensor_ != nullptr)
+    this->s3_error_bsensor_->publish_state(message[20] & 4);
+  if (this->s4_error_bsensor_ != nullptr)
+    this->s4_error_bsensor_->publish_state(message[20] & 8);
+}
+
+void VBusCustomBSensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "VBus Custom Binary Sensor:");
+  if (this->source_ == 0xffff) {
+    ESP_LOGCONFIG(TAG, "  Source address: ANY");
+  } else {
+    ESP_LOGCONFIG(TAG, "  Source address: 0x%04x", this->source_);
+  }
+  if (this->dest_ == 0xffff) {
+    ESP_LOGCONFIG(TAG, "  Dest address: ANY");
+  } else {
+    ESP_LOGCONFIG(TAG, "  Dest address: 0x%04x", this->dest_);
+  }
+  if (this->command_ == 0xffff) {
+    ESP_LOGCONFIG(TAG, "  Command: ANY");
+  } else {
+    ESP_LOGCONFIG(TAG, "  Command: 0x%04x", this->command_);
+  }
+  ESP_LOGCONFIG(TAG, "  Binary Sensors:");
+  for (VBusCustomSubBSensor *bsensor : this->bsensors_)
+    LOG_BINARY_SENSOR("  ", "-", bsensor);
+}
+
+void VBusCustomBSensor::handle_message(std::vector<uint8_t> &message) {
+  for (VBusCustomSubBSensor *bsensor : this->bsensors_)
+    bsensor->parse_message(message);
+}
+
+void VBusCustomSubBSensor::parse_message(std::vector<uint8_t> &message) {
+  this->publish_state(this->message_parser_(message));
+}
+
+}  // namespace vbus
+}  // namespace esphome
diff --git a/esphome/components/vbus/binary_sensor/vbus_binary_sensor.h b/esphome/components/vbus/binary_sensor/vbus_binary_sensor.h
new file mode 100644
index 0000000000..c0a823a0ab
--- /dev/null
+++ b/esphome/components/vbus/binary_sensor/vbus_binary_sensor.h
@@ -0,0 +1,115 @@
+#pragma once
+
+#include "../vbus.h"
+#include "esphome/components/binary_sensor/binary_sensor.h"
+
+namespace esphome {
+namespace vbus {
+
+class DeltaSolBSPlusBSensor : public VBusListener, public Component {
+ public:
+  void dump_config() override;
+  void set_relay1_bsensor(binary_sensor::BinarySensor *bsensor) { this->relay1_bsensor_ = bsensor; }
+  void set_relay2_bsensor(binary_sensor::BinarySensor *bsensor) { this->relay2_bsensor_ = bsensor; }
+  void set_s1_error_bsensor(binary_sensor::BinarySensor *bsensor) { this->s1_error_bsensor_ = bsensor; }
+  void set_s2_error_bsensor(binary_sensor::BinarySensor *bsensor) { this->s2_error_bsensor_ = bsensor; }
+  void set_s3_error_bsensor(binary_sensor::BinarySensor *bsensor) { this->s3_error_bsensor_ = bsensor; }
+  void set_s4_error_bsensor(binary_sensor::BinarySensor *bsensor) { this->s4_error_bsensor_ = bsensor; }
+  void set_collector_max_bsensor(binary_sensor::BinarySensor *bsensor) { this->collector_max_bsensor_ = bsensor; }
+  void set_collector_min_bsensor(binary_sensor::BinarySensor *bsensor) { this->collector_min_bsensor_ = bsensor; }
+  void set_collector_frost_bsensor(binary_sensor::BinarySensor *bsensor) { this->collector_frost_bsensor_ = bsensor; }
+  void set_tube_collector_bsensor(binary_sensor::BinarySensor *bsensor) { this->tube_collector_bsensor_ = bsensor; }
+  void set_recooling_bsensor(binary_sensor::BinarySensor *bsensor) { this->recooling_bsensor_ = bsensor; }
+  void set_hqm_bsensor(binary_sensor::BinarySensor *bsensor) { this->hqm_bsensor_ = bsensor; }
+
+ protected:
+  binary_sensor::BinarySensor *relay1_bsensor_{nullptr};
+  binary_sensor::BinarySensor *relay2_bsensor_{nullptr};
+  binary_sensor::BinarySensor *s1_error_bsensor_{nullptr};
+  binary_sensor::BinarySensor *s2_error_bsensor_{nullptr};
+  binary_sensor::BinarySensor *s3_error_bsensor_{nullptr};
+  binary_sensor::BinarySensor *s4_error_bsensor_{nullptr};
+  binary_sensor::BinarySensor *collector_max_bsensor_{nullptr};
+  binary_sensor::BinarySensor *collector_min_bsensor_{nullptr};
+  binary_sensor::BinarySensor *collector_frost_bsensor_{nullptr};
+  binary_sensor::BinarySensor *tube_collector_bsensor_{nullptr};
+  binary_sensor::BinarySensor *recooling_bsensor_{nullptr};
+  binary_sensor::BinarySensor *hqm_bsensor_{nullptr};
+
+  void handle_message(std::vector<uint8_t> &message) override;
+};
+
+class DeltaSolCBSensor : public VBusListener, public Component {
+ public:
+  void dump_config() override;
+  void set_s1_error_bsensor(binary_sensor::BinarySensor *bsensor) { this->s1_error_bsensor_ = bsensor; }
+  void set_s2_error_bsensor(binary_sensor::BinarySensor *bsensor) { this->s2_error_bsensor_ = bsensor; }
+  void set_s3_error_bsensor(binary_sensor::BinarySensor *bsensor) { this->s3_error_bsensor_ = bsensor; }
+  void set_s4_error_bsensor(binary_sensor::BinarySensor *bsensor) { this->s4_error_bsensor_ = bsensor; }
+
+ protected:
+  binary_sensor::BinarySensor *s1_error_bsensor_{nullptr};
+  binary_sensor::BinarySensor *s2_error_bsensor_{nullptr};
+  binary_sensor::BinarySensor *s3_error_bsensor_{nullptr};
+  binary_sensor::BinarySensor *s4_error_bsensor_{nullptr};
+
+  void handle_message(std::vector<uint8_t> &message) override;
+};
+
+class DeltaSolCS2BSensor : public VBusListener, public Component {
+ public:
+  void dump_config() override;
+  void set_s1_error_bsensor(binary_sensor::BinarySensor *bsensor) { this->s1_error_bsensor_ = bsensor; }
+  void set_s2_error_bsensor(binary_sensor::BinarySensor *bsensor) { this->s2_error_bsensor_ = bsensor; }
+  void set_s3_error_bsensor(binary_sensor::BinarySensor *bsensor) { this->s3_error_bsensor_ = bsensor; }
+  void set_s4_error_bsensor(binary_sensor::BinarySensor *bsensor) { this->s4_error_bsensor_ = bsensor; }
+
+ protected:
+  binary_sensor::BinarySensor *s1_error_bsensor_{nullptr};
+  binary_sensor::BinarySensor *s2_error_bsensor_{nullptr};
+  binary_sensor::BinarySensor *s3_error_bsensor_{nullptr};
+  binary_sensor::BinarySensor *s4_error_bsensor_{nullptr};
+
+  void handle_message(std::vector<uint8_t> &message) override;
+};
+
+class DeltaSolCSPlusBSensor : public VBusListener, public Component {
+ public:
+  void dump_config() override;
+  void set_s1_error_bsensor(binary_sensor::BinarySensor *bsensor) { this->s1_error_bsensor_ = bsensor; }
+  void set_s2_error_bsensor(binary_sensor::BinarySensor *bsensor) { this->s2_error_bsensor_ = bsensor; }
+  void set_s3_error_bsensor(binary_sensor::BinarySensor *bsensor) { this->s3_error_bsensor_ = bsensor; }
+  void set_s4_error_bsensor(binary_sensor::BinarySensor *bsensor) { this->s4_error_bsensor_ = bsensor; }
+
+ protected:
+  binary_sensor::BinarySensor *s1_error_bsensor_{nullptr};
+  binary_sensor::BinarySensor *s2_error_bsensor_{nullptr};
+  binary_sensor::BinarySensor *s3_error_bsensor_{nullptr};
+  binary_sensor::BinarySensor *s4_error_bsensor_{nullptr};
+
+  void handle_message(std::vector<uint8_t> &message) override;
+};
+
+class VBusCustomSubBSensor;
+
+class VBusCustomBSensor : public VBusListener, public Component {
+ public:
+  void dump_config() override;
+  void set_bsensors(std::vector<VBusCustomSubBSensor *> bsensors) { this->bsensors_ = std::move(bsensors); };
+
+ protected:
+  std::vector<VBusCustomSubBSensor *> bsensors_;
+  void handle_message(std::vector<uint8_t> &message) override;
+};
+
+class VBusCustomSubBSensor : public binary_sensor::BinarySensor, public Component {
+ public:
+  void set_message_parser(message_parser_t parser) { this->message_parser_ = std::move(parser); };
+  void parse_message(std::vector<uint8_t> &message);
+
+ protected:
+  message_parser_t message_parser_;
+};
+
+}  // namespace vbus
+}  // namespace esphome
diff --git a/esphome/components/vbus/sensor/__init__.py b/esphome/components/vbus/sensor/__init__.py
new file mode 100644
index 0000000000..bce28758ce
--- /dev/null
+++ b/esphome/components/vbus/sensor/__init__.py
@@ -0,0 +1,568 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome.const import (
+    CONF_ID,
+    CONF_COMMAND,
+    CONF_CUSTOM,
+    CONF_DEST,
+    CONF_LAMBDA,
+    CONF_MODEL,
+    CONF_SENSORS,
+    CONF_SOURCE,
+    CONF_TIME,
+    CONF_VERSION,
+    DEVICE_CLASS_DURATION,
+    DEVICE_CLASS_EMPTY,
+    DEVICE_CLASS_ENERGY,
+    DEVICE_CLASS_TEMPERATURE,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+    ICON_PERCENT,
+    ICON_RADIATOR,
+    ICON_THERMOMETER,
+    ICON_TIMER,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_CELSIUS,
+    UNIT_HOUR,
+    UNIT_MINUTE,
+    UNIT_PERCENT,
+    UNIT_WATT_HOURS,
+)
+from .. import (
+    vbus_ns,
+    VBus,
+    CONF_VBUS_ID,
+    CONF_DELTASOL_BS_PLUS,
+    CONF_DELTASOL_C,
+    CONF_DELTASOL_CS2,
+    CONF_DELTASOL_CS_PLUS,
+)
+
+DeltaSol_BS_Plus = vbus_ns.class_("DeltaSolBSPlusSensor", cg.Component)
+DeltaSol_C = vbus_ns.class_("DeltaSolCSensor", cg.Component)
+DeltaSol_CS2 = vbus_ns.class_("DeltaSolCS2Sensor", cg.Component)
+DeltaSol_CS_Plus = vbus_ns.class_("DeltaSolCSPlusSensor", cg.Component)
+VBusCustom = vbus_ns.class_("VBusCustomSensor", cg.Component)
+VBusCustomSub = vbus_ns.class_("VBusCustomSubSensor", cg.Component)
+
+CONF_FLOW_RATE = "flow_rate"
+CONF_HEAT_QUANTITY = "heat_quantity"
+CONF_OPERATING_HOURS = "operating_hours"
+CONF_OPERATING_HOURS_1 = "operating_hours_1"
+CONF_OPERATING_HOURS_2 = "operating_hours_2"
+CONF_PUMP_SPEED = "pump_speed"
+CONF_PUMP_SPEED_1 = "pump_speed_1"
+CONF_PUMP_SPEED_2 = "pump_speed_2"
+CONF_TEMPERATURE_1 = "temperature_1"
+CONF_TEMPERATURE_2 = "temperature_2"
+CONF_TEMPERATURE_3 = "temperature_3"
+CONF_TEMPERATURE_4 = "temperature_4"
+CONF_TEMPERATURE_5 = "temperature_5"
+
+CONFIG_SCHEMA = cv.typed_schema(
+    {
+        CONF_DELTASOL_BS_PLUS: cv.COMPONENT_SCHEMA.extend(
+            {
+                cv.GenerateID(): cv.declare_id(DeltaSol_BS_Plus),
+                cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
+                cv.Optional(CONF_TEMPERATURE_1): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_TEMPERATURE_2): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_TEMPERATURE_3): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_TEMPERATURE_4): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_PUMP_SPEED_1): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_PERCENT,
+                    icon=ICON_PERCENT,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_EMPTY,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_PUMP_SPEED_2): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_PERCENT,
+                    icon=ICON_PERCENT,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_EMPTY,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_OPERATING_HOURS_1): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_HOUR,
+                    icon=ICON_TIMER,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_DURATION,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_OPERATING_HOURS_2): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_HOUR,
+                    icon=ICON_TIMER,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_DURATION,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_HEAT_QUANTITY): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_WATT_HOURS,
+                    icon=ICON_RADIATOR,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_ENERGY,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_TIME): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_MINUTE,
+                    icon=ICON_TIMER,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_DURATION,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_VERSION): sensor.sensor_schema(
+                    accuracy_decimals=2,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+            }
+        ),
+        CONF_DELTASOL_C: cv.COMPONENT_SCHEMA.extend(
+            {
+                cv.GenerateID(): cv.declare_id(DeltaSol_C),
+                cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
+                cv.Optional(CONF_TEMPERATURE_1): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_TEMPERATURE_2): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_TEMPERATURE_3): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_TEMPERATURE_4): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_PUMP_SPEED_1): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_PERCENT,
+                    icon=ICON_PERCENT,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_EMPTY,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_PUMP_SPEED_2): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_PERCENT,
+                    icon=ICON_PERCENT,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_EMPTY,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_OPERATING_HOURS_1): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_HOUR,
+                    icon=ICON_TIMER,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_DURATION,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_OPERATING_HOURS_2): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_HOUR,
+                    icon=ICON_TIMER,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_DURATION,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_HEAT_QUANTITY): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_WATT_HOURS,
+                    icon=ICON_RADIATOR,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_ENERGY,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_TIME): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_MINUTE,
+                    icon=ICON_TIMER,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_DURATION,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+            }
+        ),
+        CONF_DELTASOL_CS2: cv.COMPONENT_SCHEMA.extend(
+            {
+                cv.GenerateID(): cv.declare_id(DeltaSol_CS2),
+                cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
+                cv.Optional(CONF_TEMPERATURE_1): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_TEMPERATURE_2): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_TEMPERATURE_3): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_TEMPERATURE_4): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_PUMP_SPEED): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_PERCENT,
+                    icon=ICON_PERCENT,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_EMPTY,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_OPERATING_HOURS): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_HOUR,
+                    icon=ICON_TIMER,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_DURATION,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_HEAT_QUANTITY): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_WATT_HOURS,
+                    icon=ICON_RADIATOR,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_ENERGY,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_VERSION): sensor.sensor_schema(
+                    accuracy_decimals=2,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+            }
+        ),
+        CONF_DELTASOL_CS_PLUS: cv.COMPONENT_SCHEMA.extend(
+            {
+                cv.GenerateID(): cv.declare_id(DeltaSol_CS_Plus),
+                cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
+                cv.Optional(CONF_TEMPERATURE_1): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_TEMPERATURE_2): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_TEMPERATURE_3): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_TEMPERATURE_4): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_TEMPERATURE_5): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_CELSIUS,
+                    icon=ICON_THERMOMETER,
+                    accuracy_decimals=1,
+                    device_class=DEVICE_CLASS_TEMPERATURE,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_PUMP_SPEED_1): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_PERCENT,
+                    icon=ICON_PERCENT,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_EMPTY,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_PUMP_SPEED_2): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_PERCENT,
+                    icon=ICON_PERCENT,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_EMPTY,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_OPERATING_HOURS_1): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_HOUR,
+                    icon=ICON_TIMER,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_DURATION,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_OPERATING_HOURS_2): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_HOUR,
+                    icon=ICON_TIMER,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_DURATION,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_HEAT_QUANTITY): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_WATT_HOURS,
+                    icon=ICON_RADIATOR,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_ENERGY,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+                cv.Optional(CONF_TIME): sensor.sensor_schema(
+                    unit_of_measurement=UNIT_MINUTE,
+                    icon=ICON_TIMER,
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_DURATION,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_VERSION): sensor.sensor_schema(
+                    accuracy_decimals=2,
+                    entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+                ),
+                cv.Optional(CONF_FLOW_RATE): sensor.sensor_schema(
+                    accuracy_decimals=0,
+                    device_class=DEVICE_CLASS_EMPTY,
+                    state_class=STATE_CLASS_MEASUREMENT,
+                ),
+            }
+        ),
+        CONF_CUSTOM: cv.COMPONENT_SCHEMA.extend(
+            {
+                cv.GenerateID(): cv.declare_id(VBusCustom),
+                cv.GenerateID(CONF_VBUS_ID): cv.use_id(VBus),
+                cv.Optional(CONF_COMMAND): cv.uint16_t,
+                cv.Optional(CONF_SOURCE): cv.uint16_t,
+                cv.Optional(CONF_DEST): cv.uint16_t,
+                cv.Optional(CONF_SENSORS): cv.ensure_list(
+                    sensor.sensor_schema().extend(
+                        {
+                            cv.GenerateID(): cv.declare_id(VBusCustomSub),
+                            cv.Required(CONF_LAMBDA): cv.lambda_,
+                        }
+                    )
+                ),
+            }
+        ),
+    },
+    key=CONF_MODEL,
+    lower=True,
+    space="_",
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+
+    if config[CONF_MODEL] == CONF_DELTASOL_BS_PLUS:
+        cg.add(var.set_command(0x0100))
+        cg.add(var.set_source(0x4221))
+        cg.add(var.set_dest(0x0010))
+        if CONF_TEMPERATURE_1 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_1])
+            cg.add(var.set_temperature1_sensor(sens))
+        if CONF_TEMPERATURE_2 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_2])
+            cg.add(var.set_temperature2_sensor(sens))
+        if CONF_TEMPERATURE_3 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_3])
+            cg.add(var.set_temperature3_sensor(sens))
+        if CONF_TEMPERATURE_4 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_4])
+            cg.add(var.set_temperature4_sensor(sens))
+        if CONF_PUMP_SPEED_1 in config:
+            sens = await sensor.new_sensor(config[CONF_PUMP_SPEED_1])
+            cg.add(var.set_pump_speed1_sensor(sens))
+        if CONF_PUMP_SPEED_2 in config:
+            sens = await sensor.new_sensor(config[CONF_PUMP_SPEED_2])
+            cg.add(var.set_pump_speed2_sensor(sens))
+        if CONF_OPERATING_HOURS_1 in config:
+            sens = await sensor.new_sensor(config[CONF_OPERATING_HOURS_1])
+            cg.add(var.set_operating_hours1_sensor(sens))
+        if CONF_OPERATING_HOURS_2 in config:
+            sens = await sensor.new_sensor(config[CONF_OPERATING_HOURS_2])
+            cg.add(var.set_operating_hours2_sensor(sens))
+        if CONF_HEAT_QUANTITY in config:
+            sens = await sensor.new_sensor(config[CONF_HEAT_QUANTITY])
+            cg.add(var.set_heat_quantity_sensor(sens))
+        if CONF_TIME in config:
+            sens = await sensor.new_sensor(config[CONF_TIME])
+            cg.add(var.set_time_sensor(sens))
+        if CONF_VERSION in config:
+            sens = await sensor.new_sensor(config[CONF_VERSION])
+            cg.add(var.set_version_sensor(sens))
+
+    elif config[CONF_MODEL] == CONF_DELTASOL_C:
+        cg.add(var.set_command(0x0100))
+        cg.add(var.set_source(0x4212))
+        cg.add(var.set_dest(0x0010))
+        if CONF_TEMPERATURE_1 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_1])
+            cg.add(var.set_temperature1_sensor(sens))
+        if CONF_TEMPERATURE_2 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_2])
+            cg.add(var.set_temperature2_sensor(sens))
+        if CONF_TEMPERATURE_3 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_3])
+            cg.add(var.set_temperature3_sensor(sens))
+        if CONF_TEMPERATURE_4 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_4])
+            cg.add(var.set_temperature4_sensor(sens))
+        if CONF_PUMP_SPEED_1 in config:
+            sens = await sensor.new_sensor(config[CONF_PUMP_SPEED_1])
+            cg.add(var.set_pump_speed1_sensor(sens))
+        if CONF_PUMP_SPEED_2 in config:
+            sens = await sensor.new_sensor(config[CONF_PUMP_SPEED_2])
+            cg.add(var.set_pump_speed2_sensor(sens))
+        if CONF_OPERATING_HOURS_1 in config:
+            sens = await sensor.new_sensor(config[CONF_OPERATING_HOURS_1])
+            cg.add(var.set_operating_hours1_sensor(sens))
+        if CONF_OPERATING_HOURS_2 in config:
+            sens = await sensor.new_sensor(config[CONF_OPERATING_HOURS_2])
+            cg.add(var.set_operating_hours2_sensor(sens))
+        if CONF_HEAT_QUANTITY in config:
+            sens = await sensor.new_sensor(config[CONF_HEAT_QUANTITY])
+            cg.add(var.set_heat_quantity_sensor(sens))
+        if CONF_TIME in config:
+            sens = await sensor.new_sensor(config[CONF_TIME])
+            cg.add(var.set_time_sensor(sens))
+
+    elif config[CONF_MODEL] == CONF_DELTASOL_CS2:
+        cg.add(var.set_command(0x0100))
+        cg.add(var.set_source(0x1121))
+        cg.add(var.set_dest(0x0010))
+        if CONF_TEMPERATURE_1 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_1])
+            cg.add(var.set_temperature1_sensor(sens))
+        if CONF_TEMPERATURE_2 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_2])
+            cg.add(var.set_temperature2_sensor(sens))
+        if CONF_TEMPERATURE_3 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_3])
+            cg.add(var.set_temperature3_sensor(sens))
+        if CONF_TEMPERATURE_4 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_4])
+            cg.add(var.set_temperature4_sensor(sens))
+        if CONF_PUMP_SPEED in config:
+            sens = await sensor.new_sensor(config[CONF_PUMP_SPEED])
+            cg.add(var.set_pump_speed_sensor(sens))
+        if CONF_OPERATING_HOURS in config:
+            sens = await sensor.new_sensor(config[CONF_OPERATING_HOURS])
+            cg.add(var.set_operating_hours_sensor(sens))
+        if CONF_HEAT_QUANTITY in config:
+            sens = await sensor.new_sensor(config[CONF_HEAT_QUANTITY])
+            cg.add(var.set_heat_quantity_sensor(sens))
+        if CONF_VERSION in config:
+            sens = await sensor.new_sensor(config[CONF_VERSION])
+            cg.add(var.set_version_sensor(sens))
+
+    if config[CONF_MODEL] == CONF_DELTASOL_CS_PLUS:
+        cg.add(var.set_command(0x0100))
+        cg.add(var.set_source(0x2211))
+        cg.add(var.set_dest(0x0010))
+        if CONF_TEMPERATURE_1 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_1])
+            cg.add(var.set_temperature1_sensor(sens))
+        if CONF_TEMPERATURE_2 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_2])
+            cg.add(var.set_temperature2_sensor(sens))
+        if CONF_TEMPERATURE_3 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_3])
+            cg.add(var.set_temperature3_sensor(sens))
+        if CONF_TEMPERATURE_4 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_4])
+            cg.add(var.set_temperature4_sensor(sens))
+        if CONF_TEMPERATURE_5 in config:
+            sens = await sensor.new_sensor(config[CONF_TEMPERATURE_5])
+            cg.add(var.set_temperature5_sensor(sens))
+        if CONF_PUMP_SPEED_1 in config:
+            sens = await sensor.new_sensor(config[CONF_PUMP_SPEED_1])
+            cg.add(var.set_pump_speed1_sensor(sens))
+        if CONF_PUMP_SPEED_2 in config:
+            sens = await sensor.new_sensor(config[CONF_PUMP_SPEED_2])
+            cg.add(var.set_pump_speed2_sensor(sens))
+        if CONF_OPERATING_HOURS_1 in config:
+            sens = await sensor.new_sensor(config[CONF_OPERATING_HOURS_1])
+            cg.add(var.set_operating_hours1_sensor(sens))
+        if CONF_OPERATING_HOURS_2 in config:
+            sens = await sensor.new_sensor(config[CONF_OPERATING_HOURS_2])
+            cg.add(var.set_operating_hours2_sensor(sens))
+        if CONF_HEAT_QUANTITY in config:
+            sens = await sensor.new_sensor(config[CONF_HEAT_QUANTITY])
+            cg.add(var.set_heat_quantity_sensor(sens))
+        if CONF_TIME in config:
+            sens = await sensor.new_sensor(config[CONF_TIME])
+            cg.add(var.set_time_sensor(sens))
+        if CONF_VERSION in config:
+            sens = await sensor.new_sensor(config[CONF_VERSION])
+            cg.add(var.set_version_sensor(sens))
+        if CONF_FLOW_RATE in config:
+            sens = await sensor.new_sensor(config[CONF_FLOW_RATE])
+            cg.add(var.set_flow_rate_sensor(sens))
+
+    elif config[CONF_MODEL] == CONF_CUSTOM:
+        if CONF_COMMAND in config:
+            cg.add(var.set_command(config[CONF_COMMAND]))
+        if CONF_SOURCE in config:
+            cg.add(var.set_source(config[CONF_SOURCE]))
+        if CONF_DEST in config:
+            cg.add(var.set_dest(config[CONF_DEST]))
+        sensors = []
+        for conf in config[CONF_SENSORS]:
+            sens = await sensor.new_sensor(conf)
+            lambda_ = await cg.process_lambda(
+                conf[CONF_LAMBDA],
+                [(cg.std_vector.template(cg.uint8), "x")],
+                return_type=cg.float_,
+            )
+            cg.add(sens.set_message_parser(lambda_))
+            sensors.append(sens)
+        cg.add(var.set_sensors(sensors))
+
+    vbus = await cg.get_variable(config[CONF_VBUS_ID])
+    cg.add(vbus.register_listener(var))
diff --git a/esphome/components/vbus/sensor/vbus_sensor.cpp b/esphome/components/vbus/sensor/vbus_sensor.cpp
new file mode 100644
index 0000000000..57d5a355ad
--- /dev/null
+++ b/esphome/components/vbus/sensor/vbus_sensor.cpp
@@ -0,0 +1,208 @@
+#include "vbus_sensor.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace vbus {
+
+static const char *const TAG = "vbus.sensor";
+
+static inline uint16_t get_u16(std::vector<uint8_t> &message, int start) {
+  return (message[start + 1] << 8) + message[start];
+}
+
+static inline int16_t get_i16(std::vector<uint8_t> &message, int start) {
+  return (int16_t)((message[start + 1] << 8) + message[start]);
+}
+
+void DeltaSolBSPlusSensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "Deltasol BS Plus:");
+  LOG_SENSOR("  ", "Temperature 1", this->temperature1_sensor_);
+  LOG_SENSOR("  ", "Temperature 2", this->temperature2_sensor_);
+  LOG_SENSOR("  ", "Temperature 3", this->temperature3_sensor_);
+  LOG_SENSOR("  ", "Temperature 4", this->temperature4_sensor_);
+  LOG_SENSOR("  ", "Pump Speed 1", this->pump_speed1_sensor_);
+  LOG_SENSOR("  ", "Pump Speed 2", this->pump_speed2_sensor_);
+  LOG_SENSOR("  ", "Operating Hours 1", this->operating_hours1_sensor_);
+  LOG_SENSOR("  ", "Operating Hours 2", this->operating_hours2_sensor_);
+  LOG_SENSOR("  ", "Heat Quantity", this->heat_quantity_sensor_);
+  LOG_SENSOR("  ", "System Time", this->time_sensor_);
+  LOG_SENSOR("  ", "FW Version", this->version_sensor_);
+}
+
+void DeltaSolBSPlusSensor::handle_message(std::vector<uint8_t> &message) {
+  if (this->temperature1_sensor_ != nullptr)
+    this->temperature1_sensor_->publish_state(get_i16(message, 0) * 0.1f);
+  if (this->temperature2_sensor_ != nullptr)
+    this->temperature2_sensor_->publish_state(get_i16(message, 2) * 0.1f);
+  if (this->temperature3_sensor_ != nullptr)
+    this->temperature3_sensor_->publish_state(get_i16(message, 4) * 0.1f);
+  if (this->temperature4_sensor_ != nullptr)
+    this->temperature4_sensor_->publish_state(get_i16(message, 6) * 0.1f);
+  if (this->pump_speed1_sensor_ != nullptr)
+    this->pump_speed1_sensor_->publish_state(message[8]);
+  if (this->pump_speed2_sensor_ != nullptr)
+    this->pump_speed2_sensor_->publish_state(message[9]);
+  if (this->operating_hours1_sensor_ != nullptr)
+    this->operating_hours1_sensor_->publish_state(get_u16(message, 16));
+  if (this->operating_hours2_sensor_ != nullptr)
+    this->operating_hours2_sensor_->publish_state(get_u16(message, 18));
+  if (this->heat_quantity_sensor_ != nullptr) {
+    this->heat_quantity_sensor_->publish_state(get_u16(message, 20) + get_u16(message, 22) * 1000 +
+                                               get_u16(message, 24) * 1000000);
+  }
+  if (this->time_sensor_ != nullptr)
+    this->time_sensor_->publish_state(get_u16(message, 12));
+  if (this->version_sensor_ != nullptr)
+    this->version_sensor_->publish_state(get_u16(message, 26) * 0.01f);
+}
+
+void DeltaSolCSensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "Deltasol C:");
+  LOG_SENSOR("  ", "Temperature 1", this->temperature1_sensor_);
+  LOG_SENSOR("  ", "Temperature 2", this->temperature2_sensor_);
+  LOG_SENSOR("  ", "Temperature 3", this->temperature3_sensor_);
+  LOG_SENSOR("  ", "Temperature 4", this->temperature4_sensor_);
+  LOG_SENSOR("  ", "Pump Speed 1", this->pump_speed1_sensor_);
+  LOG_SENSOR("  ", "Pump Speed 2", this->pump_speed2_sensor_);
+  LOG_SENSOR("  ", "Operating Hours 1", this->operating_hours1_sensor_);
+  LOG_SENSOR("  ", "Operating Hours 2", this->operating_hours2_sensor_);
+  LOG_SENSOR("  ", "Heat Quantity", this->heat_quantity_sensor_);
+  LOG_SENSOR("  ", "System Time", this->time_sensor_);
+}
+
+void DeltaSolCSensor::handle_message(std::vector<uint8_t> &message) {
+  if (this->temperature1_sensor_ != nullptr)
+    this->temperature1_sensor_->publish_state(get_i16(message, 0) * 0.1f);
+  if (this->temperature2_sensor_ != nullptr)
+    this->temperature2_sensor_->publish_state(get_i16(message, 2) * 0.1f);
+  if (this->temperature3_sensor_ != nullptr)
+    this->temperature3_sensor_->publish_state(get_i16(message, 4) * 0.1f);
+  if (this->temperature4_sensor_ != nullptr)
+    this->temperature4_sensor_->publish_state(get_i16(message, 6) * 0.1f);
+  if (this->pump_speed1_sensor_ != nullptr)
+    this->pump_speed1_sensor_->publish_state(message[8]);
+  if (this->pump_speed2_sensor_ != nullptr)
+    this->pump_speed2_sensor_->publish_state(message[9]);
+  if (this->operating_hours1_sensor_ != nullptr)
+    this->operating_hours1_sensor_->publish_state(get_u16(message, 12));
+  if (this->operating_hours2_sensor_ != nullptr)
+    this->operating_hours2_sensor_->publish_state(get_u16(message, 14));
+  if (this->heat_quantity_sensor_ != nullptr) {
+    this->heat_quantity_sensor_->publish_state(get_u16(message, 16) + get_u16(message, 18) * 1000 +
+                                               get_u16(message, 20) * 1000000);
+  }
+  if (this->time_sensor_ != nullptr)
+    this->time_sensor_->publish_state(get_u16(message, 22));
+}
+
+void DeltaSolCS2Sensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "Deltasol CS2:");
+  LOG_SENSOR("  ", "Temperature 1", this->temperature1_sensor_);
+  LOG_SENSOR("  ", "Temperature 2", this->temperature2_sensor_);
+  LOG_SENSOR("  ", "Temperature 3", this->temperature3_sensor_);
+  LOG_SENSOR("  ", "Temperature 4", this->temperature4_sensor_);
+  LOG_SENSOR("  ", "Pump Speed", this->pump_speed_sensor_);
+  LOG_SENSOR("  ", "Operating Hours", this->operating_hours_sensor_);
+  LOG_SENSOR("  ", "Heat Quantity", this->heat_quantity_sensor_);
+  LOG_SENSOR("  ", "FW Version", this->version_sensor_);
+}
+
+void DeltaSolCS2Sensor::handle_message(std::vector<uint8_t> &message) {
+  if (this->temperature1_sensor_ != nullptr)
+    this->temperature1_sensor_->publish_state(get_i16(message, 0) * 0.1f);
+  if (this->temperature2_sensor_ != nullptr)
+    this->temperature2_sensor_->publish_state(get_i16(message, 2) * 0.1f);
+  if (this->temperature3_sensor_ != nullptr)
+    this->temperature3_sensor_->publish_state(get_i16(message, 4) * 0.1f);
+  if (this->temperature4_sensor_ != nullptr)
+    this->temperature4_sensor_->publish_state(get_i16(message, 6) * 0.1f);
+  if (this->pump_speed_sensor_ != nullptr)
+    this->pump_speed_sensor_->publish_state(message[12]);
+  if (this->operating_hours_sensor_ != nullptr)
+    this->operating_hours_sensor_->publish_state(get_u16(message, 14));
+  if (this->heat_quantity_sensor_ != nullptr)
+    this->heat_quantity_sensor_->publish_state((get_u16(message, 26) << 16) + get_u16(message, 24));
+  if (this->version_sensor_ != nullptr)
+    this->version_sensor_->publish_state(get_u16(message, 28) * 0.01f);
+}
+
+void DeltaSolCSPlusSensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "Deltasol CS Plus:");
+  LOG_SENSOR("  ", "Temperature 1", this->temperature1_sensor_);
+  LOG_SENSOR("  ", "Temperature 2", this->temperature2_sensor_);
+  LOG_SENSOR("  ", "Temperature 3", this->temperature3_sensor_);
+  LOG_SENSOR("  ", "Temperature 4", this->temperature4_sensor_);
+  LOG_SENSOR("  ", "Temperature 5", this->temperature5_sensor_);
+  LOG_SENSOR("  ", "Pump Speed 1", this->pump_speed1_sensor_);
+  LOG_SENSOR("  ", "Pump Speed 2", this->pump_speed2_sensor_);
+  LOG_SENSOR("  ", "Operating Hours 1", this->operating_hours1_sensor_);
+  LOG_SENSOR("  ", "Operating Hours 2", this->operating_hours2_sensor_);
+  LOG_SENSOR("  ", "Heat Quantity", this->heat_quantity_sensor_);
+  LOG_SENSOR("  ", "System Time", this->time_sensor_);
+  LOG_SENSOR("  ", "FW Version", this->version_sensor_);
+  LOG_SENSOR("  ", "Flow Rate", this->flow_rate_sensor_);
+}
+
+void DeltaSolCSPlusSensor::handle_message(std::vector<uint8_t> &message) {
+  if (this->temperature1_sensor_ != nullptr)
+    this->temperature1_sensor_->publish_state(get_i16(message, 0) * 0.1f);
+  if (this->temperature2_sensor_ != nullptr)
+    this->temperature2_sensor_->publish_state(get_i16(message, 2) * 0.1f);
+  if (this->temperature3_sensor_ != nullptr)
+    this->temperature3_sensor_->publish_state(get_i16(message, 4) * 0.1f);
+  if (this->temperature4_sensor_ != nullptr)
+    this->temperature4_sensor_->publish_state(get_i16(message, 6) * 0.1f);
+  if (this->temperature5_sensor_ != nullptr)
+    this->temperature5_sensor_->publish_state(get_i16(message, 36) * 0.1f);
+  if (this->pump_speed1_sensor_ != nullptr)
+    this->pump_speed1_sensor_->publish_state(message[8]);
+  if (this->pump_speed2_sensor_ != nullptr)
+    this->pump_speed2_sensor_->publish_state(message[12]);
+  if (this->operating_hours1_sensor_ != nullptr)
+    this->operating_hours1_sensor_->publish_state(get_u16(message, 10));
+  if (this->operating_hours2_sensor_ != nullptr)
+    this->operating_hours2_sensor_->publish_state(get_u16(message, 14));
+  if (this->heat_quantity_sensor_ != nullptr)
+    this->heat_quantity_sensor_->publish_state((get_u16(message, 30) << 16) + get_u16(message, 28));
+  if (this->time_sensor_ != nullptr)
+    this->time_sensor_->publish_state(get_u16(message, 12));
+  if (this->version_sensor_ != nullptr)
+    this->version_sensor_->publish_state(get_u16(message, 26) * 0.01f);
+  if (this->flow_rate_sensor_ != nullptr)
+    this->flow_rate_sensor_->publish_state(get_u16(message, 38));
+}
+
+void VBusCustomSensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "VBus Custom Sensor:");
+  if (this->source_ == 0xffff) {
+    ESP_LOGCONFIG(TAG, "  Source address: ANY");
+  } else {
+    ESP_LOGCONFIG(TAG, "  Source address: 0x%04x", this->source_);
+  }
+  if (this->dest_ == 0xffff) {
+    ESP_LOGCONFIG(TAG, "  Dest address: ANY");
+  } else {
+    ESP_LOGCONFIG(TAG, "  Dest address: 0x%04x", this->dest_);
+  }
+  if (this->command_ == 0xffff) {
+    ESP_LOGCONFIG(TAG, "  Command: ANY");
+  } else {
+    ESP_LOGCONFIG(TAG, "  Command: 0x%04x", this->command_);
+  }
+  ESP_LOGCONFIG(TAG, "  Sensors:");
+  for (VBusCustomSubSensor *sensor : this->sensors_)
+    LOG_SENSOR("  ", "-", sensor);
+}
+
+void VBusCustomSensor::handle_message(std::vector<uint8_t> &message) {
+  for (VBusCustomSubSensor *sensor : this->sensors_)
+    sensor->parse_message(message);
+}
+
+void VBusCustomSubSensor::parse_message(std::vector<uint8_t> &message) {
+  this->publish_state(this->message_parser_(message));
+}
+
+}  // namespace vbus
+}  // namespace esphome
diff --git a/esphome/components/vbus/sensor/vbus_sensor.h b/esphome/components/vbus/sensor/vbus_sensor.h
new file mode 100644
index 0000000000..6ba752b68c
--- /dev/null
+++ b/esphome/components/vbus/sensor/vbus_sensor.h
@@ -0,0 +1,151 @@
+#pragma once
+
+#include "../vbus.h"
+#include "esphome/components/sensor/sensor.h"
+
+namespace esphome {
+namespace vbus {
+
+class DeltaSolBSPlusSensor : public VBusListener, public Component {
+ public:
+  void dump_config() override;
+  void set_temperature1_sensor(sensor::Sensor *sensor) { this->temperature1_sensor_ = sensor; }
+  void set_temperature2_sensor(sensor::Sensor *sensor) { this->temperature2_sensor_ = sensor; }
+  void set_temperature3_sensor(sensor::Sensor *sensor) { this->temperature3_sensor_ = sensor; }
+  void set_temperature4_sensor(sensor::Sensor *sensor) { this->temperature4_sensor_ = sensor; }
+  void set_pump_speed1_sensor(sensor::Sensor *sensor) { this->pump_speed1_sensor_ = sensor; }
+  void set_pump_speed2_sensor(sensor::Sensor *sensor) { this->pump_speed2_sensor_ = sensor; }
+  void set_operating_hours1_sensor(sensor::Sensor *sensor) { this->operating_hours1_sensor_ = sensor; }
+  void set_operating_hours2_sensor(sensor::Sensor *sensor) { this->operating_hours2_sensor_ = sensor; }
+  void set_heat_quantity_sensor(sensor::Sensor *sensor) { this->heat_quantity_sensor_ = sensor; }
+  void set_time_sensor(sensor::Sensor *sensor) { this->time_sensor_ = sensor; }
+  void set_version_sensor(sensor::Sensor *sensor) { this->version_sensor_ = sensor; }
+
+ protected:
+  sensor::Sensor *temperature1_sensor_{nullptr};
+  sensor::Sensor *temperature2_sensor_{nullptr};
+  sensor::Sensor *temperature3_sensor_{nullptr};
+  sensor::Sensor *temperature4_sensor_{nullptr};
+  sensor::Sensor *pump_speed1_sensor_{nullptr};
+  sensor::Sensor *pump_speed2_sensor_{nullptr};
+  sensor::Sensor *operating_hours1_sensor_{nullptr};
+  sensor::Sensor *operating_hours2_sensor_{nullptr};
+  sensor::Sensor *heat_quantity_sensor_{nullptr};
+  sensor::Sensor *time_sensor_{nullptr};
+  sensor::Sensor *version_sensor_{nullptr};
+
+  void handle_message(std::vector<uint8_t> &message) override;
+};
+
+class DeltaSolCSensor : public VBusListener, public Component {
+ public:
+  void dump_config() override;
+  void set_temperature1_sensor(sensor::Sensor *sensor) { this->temperature1_sensor_ = sensor; }
+  void set_temperature2_sensor(sensor::Sensor *sensor) { this->temperature2_sensor_ = sensor; }
+  void set_temperature3_sensor(sensor::Sensor *sensor) { this->temperature3_sensor_ = sensor; }
+  void set_temperature4_sensor(sensor::Sensor *sensor) { this->temperature4_sensor_ = sensor; }
+  void set_pump_speed1_sensor(sensor::Sensor *sensor) { this->pump_speed1_sensor_ = sensor; }
+  void set_pump_speed2_sensor(sensor::Sensor *sensor) { this->pump_speed2_sensor_ = sensor; }
+  void set_operating_hours1_sensor(sensor::Sensor *sensor) { this->operating_hours1_sensor_ = sensor; }
+  void set_operating_hours2_sensor(sensor::Sensor *sensor) { this->operating_hours2_sensor_ = sensor; }
+  void set_heat_quantity_sensor(sensor::Sensor *sensor) { this->heat_quantity_sensor_ = sensor; }
+  void set_time_sensor(sensor::Sensor *sensor) { this->time_sensor_ = sensor; }
+
+ protected:
+  sensor::Sensor *temperature1_sensor_{nullptr};
+  sensor::Sensor *temperature2_sensor_{nullptr};
+  sensor::Sensor *temperature3_sensor_{nullptr};
+  sensor::Sensor *temperature4_sensor_{nullptr};
+  sensor::Sensor *pump_speed1_sensor_{nullptr};
+  sensor::Sensor *pump_speed2_sensor_{nullptr};
+  sensor::Sensor *operating_hours1_sensor_{nullptr};
+  sensor::Sensor *operating_hours2_sensor_{nullptr};
+  sensor::Sensor *heat_quantity_sensor_{nullptr};
+  sensor::Sensor *time_sensor_{nullptr};
+
+  void handle_message(std::vector<uint8_t> &message) override;
+};
+
+class DeltaSolCS2Sensor : public VBusListener, public Component {
+ public:
+  void dump_config() override;
+  void set_temperature1_sensor(sensor::Sensor *sensor) { this->temperature1_sensor_ = sensor; }
+  void set_temperature2_sensor(sensor::Sensor *sensor) { this->temperature2_sensor_ = sensor; }
+  void set_temperature3_sensor(sensor::Sensor *sensor) { this->temperature3_sensor_ = sensor; }
+  void set_temperature4_sensor(sensor::Sensor *sensor) { this->temperature4_sensor_ = sensor; }
+  void set_pump_speed_sensor(sensor::Sensor *sensor) { this->pump_speed_sensor_ = sensor; }
+  void set_operating_hours_sensor(sensor::Sensor *sensor) { this->operating_hours_sensor_ = sensor; }
+  void set_heat_quantity_sensor(sensor::Sensor *sensor) { this->heat_quantity_sensor_ = sensor; }
+  void set_version_sensor(sensor::Sensor *sensor) { this->version_sensor_ = sensor; }
+
+ protected:
+  sensor::Sensor *temperature1_sensor_{nullptr};
+  sensor::Sensor *temperature2_sensor_{nullptr};
+  sensor::Sensor *temperature3_sensor_{nullptr};
+  sensor::Sensor *temperature4_sensor_{nullptr};
+  sensor::Sensor *pump_speed_sensor_{nullptr};
+  sensor::Sensor *operating_hours_sensor_{nullptr};
+  sensor::Sensor *heat_quantity_sensor_{nullptr};
+  sensor::Sensor *version_sensor_{nullptr};
+
+  void handle_message(std::vector<uint8_t> &message) override;
+};
+
+class DeltaSolCSPlusSensor : public VBusListener, public Component {
+ public:
+  void dump_config() override;
+  void set_temperature1_sensor(sensor::Sensor *sensor) { this->temperature1_sensor_ = sensor; }
+  void set_temperature2_sensor(sensor::Sensor *sensor) { this->temperature2_sensor_ = sensor; }
+  void set_temperature3_sensor(sensor::Sensor *sensor) { this->temperature3_sensor_ = sensor; }
+  void set_temperature4_sensor(sensor::Sensor *sensor) { this->temperature4_sensor_ = sensor; }
+  void set_temperature5_sensor(sensor::Sensor *sensor) { this->temperature5_sensor_ = sensor; }
+  void set_pump_speed1_sensor(sensor::Sensor *sensor) { this->pump_speed1_sensor_ = sensor; }
+  void set_pump_speed2_sensor(sensor::Sensor *sensor) { this->pump_speed2_sensor_ = sensor; }
+  void set_operating_hours1_sensor(sensor::Sensor *sensor) { this->operating_hours1_sensor_ = sensor; }
+  void set_operating_hours2_sensor(sensor::Sensor *sensor) { this->operating_hours2_sensor_ = sensor; }
+  void set_heat_quantity_sensor(sensor::Sensor *sensor) { this->heat_quantity_sensor_ = sensor; }
+  void set_time_sensor(sensor::Sensor *sensor) { this->time_sensor_ = sensor; }
+  void set_version_sensor(sensor::Sensor *sensor) { this->version_sensor_ = sensor; }
+  void set_flow_rate_sensor(sensor::Sensor *sensor) { this->flow_rate_sensor_ = sensor; }
+
+ protected:
+  sensor::Sensor *temperature1_sensor_{nullptr};
+  sensor::Sensor *temperature2_sensor_{nullptr};
+  sensor::Sensor *temperature3_sensor_{nullptr};
+  sensor::Sensor *temperature4_sensor_{nullptr};
+  sensor::Sensor *temperature5_sensor_{nullptr};
+  sensor::Sensor *pump_speed1_sensor_{nullptr};
+  sensor::Sensor *pump_speed2_sensor_{nullptr};
+  sensor::Sensor *operating_hours1_sensor_{nullptr};
+  sensor::Sensor *operating_hours2_sensor_{nullptr};
+  sensor::Sensor *heat_quantity_sensor_{nullptr};
+  sensor::Sensor *time_sensor_{nullptr};
+  sensor::Sensor *version_sensor_{nullptr};
+  sensor::Sensor *flow_rate_sensor_{nullptr};
+
+  void handle_message(std::vector<uint8_t> &message) override;
+};
+
+class VBusCustomSubSensor;
+
+class VBusCustomSensor : public VBusListener, public Component {
+ public:
+  void dump_config() override;
+  void set_sensors(std::vector<VBusCustomSubSensor *> sensors) { this->sensors_ = std::move(sensors); };
+
+ protected:
+  std::vector<VBusCustomSubSensor *> sensors_;
+  void handle_message(std::vector<uint8_t> &message) override;
+};
+
+class VBusCustomSubSensor : public sensor::Sensor, public Component {
+ public:
+  void set_message_parser(message_parser_t parser) { this->message_parser_ = std::move(parser); };
+  void parse_message(std::vector<uint8_t> &message);
+
+ protected:
+  message_parser_t message_parser_;
+};
+
+}  // namespace vbus
+}  // namespace esphome
diff --git a/esphome/components/vbus/vbus.cpp b/esphome/components/vbus/vbus.cpp
new file mode 100644
index 0000000000..c9758891cc
--- /dev/null
+++ b/esphome/components/vbus/vbus.cpp
@@ -0,0 +1,124 @@
+#include "vbus.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace vbus {
+
+static const char *const TAG = "vbus";
+
+void VBus::dump_config() {
+  ESP_LOGCONFIG(TAG, "VBus:");
+  check_uart_settings(9600);
+}
+
+static void septet_spread(uint8_t *data, int start, int count, uint8_t septet) {
+  for (int i = 0; i < count; i++, septet >>= 1) {
+    if (septet & 1)
+      data[start + i] |= 0x80;
+  }
+}
+
+static bool checksum(const uint8_t *data, int start, int count) {
+  uint8_t csum = 0x7f;
+  for (int i = 0; i < count; i++)
+    csum = (csum - data[start + i]) & 0x7f;
+  return csum == 0;
+}
+
+void VBus::loop() {
+  if (!available())
+    return;
+
+  while (available()) {
+    uint8_t c;
+    read_byte(&c);
+
+    if (c == 0xaa) {
+      this->state_ = 1;
+      this->buffer_.clear();
+      continue;
+    }
+    if (c & 0x80) {
+      this->state_ = 0;
+      continue;
+    }
+    if (this->state_ == 0)
+      continue;
+
+    if (this->state_ == 1) {
+      this->buffer_.push_back(c);
+      if (this->buffer_.size() == 7) {
+        this->protocol_ = this->buffer_[4];
+        this->source_ = (this->buffer_[3] << 8) + this->buffer_[2];
+        this->dest_ = (this->buffer_[1] << 8) + this->buffer_[0];
+        this->command_ = (this->buffer_[6] << 8) + this->buffer_[5];
+      }
+      if ((this->protocol_ == 0x20) && (this->buffer_.size() == 15)) {
+        this->state_ = 0;
+        if (!checksum(this->buffer_.data(), 0, 15)) {
+          ESP_LOGE(TAG, "P2 checksum failed");
+          continue;
+        }
+        septet_spread(this->buffer_.data(), 7, 6, this->buffer_[13]);
+        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);
+      } else if ((this->protocol_ == 0x10) && (this->buffer_.size() == 9)) {
+        if (!checksum(this->buffer_.data(), 0, 9)) {
+          ESP_LOGE(TAG, "P1 checksum failed");
+          this->state_ = 0;
+          continue;
+        }
+        this->frames_ = this->buffer_[7];
+        if (this->frames_) {
+          this->state_ = 2;
+          this->cframe_ = 0;
+          this->fbcount_ = 0;
+          this->buffer_.clear();
+        } else {
+          this->state_ = 0;
+          ESP_LOGD(TAG, "P1 empty message");
+        }
+      }
+      continue;
+    }
+
+    if (this->state_ == 2) {
+      this->fbytes_[this->fbcount_++] = c;
+      if (this->fbcount_ < 6)
+        continue;
+      this->fbcount_ = 0;
+      if (!checksum(this->fbytes_, 0, 6)) {
+        ESP_LOGE(TAG, "frame checksum failed");
+        continue;
+      }
+      septet_spread(this->fbytes_, 0, 4, this->fbytes_[4]);
+      for (int i = 0; i < 4; i++)
+        this->buffer_.push_back(this->fbytes_[i]);
+      if (++this->cframe_ < this->frames_)
+        continue;
+      ESP_LOGV(TAG, "P2 C%04x %04x->%04x: %s", this->command_, this->source_, this->dest_,
+               format_hex(this->buffer_).c_str());
+      for (auto &listener : this->listeners_)
+        listener->on_message(this->command_, this->source_, this->dest_, this->buffer_);
+      this->state_ = 0;
+      continue;
+    }
+  }
+}
+
+void VBusListener::on_message(uint16_t command, uint16_t source, uint16_t dest, std::vector<uint8_t> &message) {
+  if ((this->command_ != 0xffff) && (this->command_ != command))
+    return;
+  if ((this->source_ != 0xffff) && (this->source_ != source))
+    return;
+  if ((this->dest_ != 0xffff) && (this->dest_ != dest))
+    return;
+  this->handle_message(message);
+}
+
+}  // namespace vbus
+}  // namespace esphome
diff --git a/esphome/components/vbus/vbus.h b/esphome/components/vbus/vbus.h
new file mode 100644
index 0000000000..7e97b5049a
--- /dev/null
+++ b/esphome/components/vbus/vbus.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/uart/uart.h"
+
+namespace esphome {
+namespace vbus {
+
+using message_parser_t = std::function<float(std::vector<uint8_t> &)>;
+
+class VBus;
+
+class VBusListener {
+ public:
+  void set_command(uint16_t command) { this->command_ = command; }
+  void set_source(uint16_t source) { this->source_ = source; }
+  void set_dest(uint16_t dest) { this->dest_ = dest; }
+
+  void on_message(uint16_t command, uint16_t source, uint16_t dest, std::vector<uint8_t> &message);
+
+ protected:
+  uint16_t command_{0xffff};
+  uint16_t source_{0xffff};
+  uint16_t dest_{0xffff};
+
+  virtual void handle_message(std::vector<uint8_t> &message) = 0;
+};
+
+class VBus : public uart::UARTDevice, public Component {
+ public:
+  void dump_config() override;
+  void loop() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
+  void register_listener(VBusListener *listener) { this->listeners_.push_back(listener); }
+
+ protected:
+  int state_{0};
+  std::vector<uint8_t> buffer_;
+  uint8_t protocol_;
+  uint16_t source_;
+  uint16_t dest_;
+  uint16_t command_;
+  uint8_t frames_;
+  uint8_t cframe_;
+  uint8_t fbytes_[6];
+  int fbcount_;
+  std::vector<VBusListener *> listeners_{};
+};
+
+}  // namespace vbus
+}  // namespace esphome
diff --git a/esphome/const.py b/esphome/const.py
index b02088ffbb..dde5e9016a 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -141,6 +141,7 @@ CONF_CURRENT = "current"
 CONF_CURRENT_OPERATION = "current_operation"
 CONF_CURRENT_RESISTOR = "current_resistor"
 CONF_CURRENT_TEMPERATURE_STATE_TOPIC = "current_temperature_state_topic"
+CONF_CUSTOM = "custom"
 CONF_CUSTOM_FAN_MODE = "custom_fan_mode"
 CONF_CUSTOM_FAN_MODES = "custom_fan_modes"
 CONF_CUSTOM_PRESET = "custom_preset"
@@ -167,6 +168,7 @@ CONF_DEFAULT_TRANSITION_LENGTH = "default_transition_length"
 CONF_DELAY = "delay"
 CONF_DELIMITER = "delimiter"
 CONF_DELTA = "delta"
+CONF_DEST = "dest"
 CONF_DEVICE = "device"
 CONF_DEVICE_CLASS = "device_class"
 CONF_DEVICE_FACTOR = "device_factor"
@@ -874,6 +876,7 @@ UNIT_EMPTY = ""
 UNIT_G = "G"
 UNIT_HECTOPASCAL = "hPa"
 UNIT_HERTZ = "Hz"
+UNIT_HOUR = "h"
 UNIT_KELVIN = "K"
 UNIT_KILOGRAM = "kg"
 UNIT_KILOMETER = "km"
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 2856a3c7d7..6578def72d 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -287,6 +287,9 @@ uart:
 modbus:
   uart_id: uart1
 
+vbus:
+  uart_id: uart4
+
 ota:
   safe_mode: true
   port: 3286
@@ -799,6 +802,11 @@ sensor:
     id: adc128s102_channel_0
     channel: 0
 
+  - platform: vbus
+    model: deltasol c
+    temperature_1:
+      name: Temperature 1
+
 time:
   - platform: homeassistant
 
@@ -904,6 +912,11 @@ binary_sensor:
       then:
         - pzemac.reset_energy: pzemac1
 
+  - platform: vbus
+    model: deltasol_bs_plus
+    relay1:
+      name: Relay 1 On
+
 globals:
   - id: my_global_string
     type: std::string
diff --git a/tests/test5.yaml b/tests/test5.yaml
index 23046939d5..5f72579d08 100644
--- a/tests/test5.yaml
+++ b/tests/test5.yaml
@@ -66,6 +66,9 @@ mqtt:
           ESP_LOGD("Mqtt Test", "testing/sensor/testing_sensor/state=[%s]", x.c_str());
       # yamllint enable rule:line-length
 
+vbus:
+  - uart_id: uart2
+
 binary_sensor:
   - platform: gpio
     pin: GPIO0
@@ -183,6 +186,22 @@ binary_sensor:
     id: key1
     key: 1
 
+  - platform: vbus
+    model: deltasol_bs_plus
+    relay2:
+      name: Relay 2 On
+    sensor1_error:
+      name: Sensor 1 Error
+
+  - platform: vbus
+    model: custom
+    command: 0x100
+    source: 0x1234
+    dest: 0x10
+    binary_sensors:
+      - id: vcustom_b
+        name: VBus Custom Binary Sensor
+        lambda: return x[0] & 1;
 
 tlc5947:
   data_pin: GPIO12
@@ -478,6 +497,27 @@ sensor:
     max_flow_rate:
       name: Max Flow Rate
 
+  - platform: vbus
+    model: deltasol c
+    temperature_3:
+      name: Temperature 3
+    operating_hours_1:
+      name: Operating Hours 1
+    heat_quantity:
+      name: Heat Quantity
+    time:
+      name: System Time
+
+  - platform: vbus
+    model: custom
+    command: 0x100
+    source: 0x1234
+    dest: 0x10
+    sensors:
+      - id: vcustom
+        name: VBus Custom Sensor
+        lambda: return x[0] / 10.0;
+
 script:
   - id: automation_test
     then:

From 3facfa5c215c533c8bd69f15b7e4ddbe2f9c6e49 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 7 Feb 2023 12:27:07 +1300
Subject: [PATCH 516/838] Allow dashboard import to specify if api encryption
 key should be generated (#4393)

---
 .../components/dashboard_import/__init__.py   | 30 ++++++++++++++-----
 esphome/dashboard/dashboard.py                |  2 ++
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/esphome/components/dashboard_import/__init__.py b/esphome/components/dashboard_import/__init__.py
index d377c257a7..e1bd6a7f08 100644
--- a/esphome/components/dashboard_import/__init__.py
+++ b/esphome/components/dashboard_import/__init__.py
@@ -1,3 +1,5 @@
+import base64
+import secrets
 from pathlib import Path
 from typing import Optional
 
@@ -73,6 +75,7 @@ def import_config(
     project_name: str,
     import_url: str,
     network: str = CONF_WIFI,
+    encryption: bool = False,
 ) -> None:
     p = Path(path)
 
@@ -80,15 +83,21 @@ def import_config(
         raise FileExistsError
 
     if project_name == "esphome.web":
+        kwargs = {
+            "name": name,
+            "friendly_name": friendly_name,
+            "platform": "ESP32" if "esp32" in import_url else "ESP8266",
+            "board": "esp32dev" if "esp32" in import_url else "esp01_1m",
+            "ssid": "!secret wifi_ssid",
+            "psk": "!secret wifi_password",
+        }
+        if encryption:
+            noise_psk = secrets.token_bytes(32)
+            key = base64.b64encode(noise_psk).decode()
+            kwargs["api_encryption_key"] = key
+
         p.write_text(
-            wizard_file(
-                name=name,
-                friendly_name=friendly_name,
-                platform="ESP32" if "esp32" in import_url else "ESP8266",
-                board="esp32dev" if "esp32" in import_url else "esp01_1m",
-                ssid="!secret wifi_ssid",
-                psk="!secret wifi_password",
-            ),
+            wizard_file(**kwargs),
             encoding="utf8",
         )
     else:
@@ -115,6 +124,11 @@ def import_config(
                 "packages": {project_name: import_url},
                 "esphome": esphome_core,
             }
+            if encryption:
+                noise_psk = secrets.token_bytes(32)
+                key = base64.b64encode(noise_psk).decode()
+                config["api"] = {"encryption": {"key": key}}
+
             output = dump(config)
 
             if network == CONF_WIFI:
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 66e627dffe..1a5d9e19f4 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -433,6 +433,7 @@ class ImportRequestHandler(BaseHandler):
         try:
             name = args["name"]
             friendly_name = args.get("friendly_name")
+            encryption = args.get("encryption", False)
 
             imported_device = next(
                 (res for res in IMPORT_RESULT.values() if res.device_name == name), None
@@ -452,6 +453,7 @@ class ImportRequestHandler(BaseHandler):
                 args["project_name"],
                 args["package_import_url"],
                 network,
+                encryption,
             )
         except FileExistsError:
             self.set_status(500)

From 9494c27ad85d2e499e79c993cf64690201e13f81 Mon Sep 17 00:00:00 2001
From: alexd321 <69210910+alexd321@users.noreply.github.com>
Date: Mon, 6 Feb 2023 23:35:09 +0000
Subject: [PATCH 517/838] modify SGP4X integration to report device_class as
 air quality index (#4327)

---
 esphome/components/sgp4x/sensor.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/esphome/components/sgp4x/sensor.py b/esphome/components/sgp4x/sensor.py
index 1f6c5006a5..3d24f6c409 100644
--- a/esphome/components/sgp4x/sensor.py
+++ b/esphome/components/sgp4x/sensor.py
@@ -6,8 +6,7 @@ from esphome.const import (
     CONF_STORE_BASELINE,
     CONF_TEMPERATURE_SOURCE,
     ICON_RADIATOR,
-    DEVICE_CLASS_NITROUS_OXIDE,
-    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
+    DEVICE_CLASS_AQI,
     STATE_CLASS_MEASUREMENT,
 )
 
@@ -67,13 +66,13 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_VOC): sensor.sensor_schema(
                 icon=ICON_RADIATOR,
                 accuracy_decimals=0,
-                device_class=DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
+                device_class=DEVICE_CLASS_AQI,
                 state_class=STATE_CLASS_MEASUREMENT,
             ).extend(GAS_SENSOR),
             cv.Optional(CONF_NOX): sensor.sensor_schema(
                 icon=ICON_RADIATOR,
                 accuracy_decimals=0,
-                device_class=DEVICE_CLASS_NITROUS_OXIDE,
+                device_class=DEVICE_CLASS_AQI,
                 state_class=STATE_CLASS_MEASUREMENT,
             ).extend(GAS_SENSOR),
             cv.Optional(CONF_STORE_BASELINE, default=True): cv.boolean,

From 1b66fa500431522648a5766ae90edc2c78fba12f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 7 Feb 2023 12:43:30 +1300
Subject: [PATCH 518/838] Remove unneeded validation for esp32 gpio pins
 (#4394)

---
 esphome/components/esp32/gpio.py | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/esphome/components/esp32/gpio.py b/esphome/components/esp32/gpio.py
index b97a5e0457..7848d1d552 100644
--- a/esphome/components/esp32/gpio.py
+++ b/esphome/components/esp32/gpio.py
@@ -123,11 +123,8 @@ def validate_gpio_pin(value):
 
 def validate_supports(value):
     mode = value[CONF_MODE]
-    is_input = mode[CONF_INPUT]
     is_output = mode[CONF_OUTPUT]
     is_open_drain = mode[CONF_OPEN_DRAIN]
-    is_pullup = mode[CONF_PULLUP]
-    is_pulldown = mode[CONF_PULLDOWN]
     variant = CORE.data[KEY_ESP32][KEY_VARIANT]
     if variant not in _esp32_validations:
         raise cv.Invalid(f"Unsupported ESP32 variant {variant}")
@@ -138,26 +135,6 @@ def validate_supports(value):
         )
 
     value = _esp32_validations[variant].usage_validation(value)
-    if CORE.using_arduino:
-        # (input, output, open_drain, pullup, pulldown)
-        supported_modes = {
-            # INPUT
-            (True, False, False, False, False),
-            # OUTPUT
-            (False, True, False, False, False),
-            # INPUT_PULLUP
-            (True, False, False, True, False),
-            # INPUT_PULLDOWN
-            (True, False, False, False, True),
-            # OUTPUT_OPEN_DRAIN
-            (False, True, True, False, False),
-        }
-        key = (is_input, is_output, is_open_drain, is_pullup, is_pulldown)
-        if key not in supported_modes:
-            raise cv.Invalid(
-                "This pin mode is not supported on ESP32 for arduino frameworks",
-                [CONF_MODE],
-            )
     return value
 
 

From 124ab31f22fc0be0bff719f0d7a033b896c33cad Mon Sep 17 00:00:00 2001
From: Trevor North <trevor@freedisc.co.uk>
Date: Mon, 6 Feb 2023 23:46:06 +0000
Subject: [PATCH 519/838] Fix shelly dimmer current sensor device class (#4385)

fixes https://github.com/esphome/issues/issues/4086
---
 esphome/components/shelly_dimmer/light.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esphome/components/shelly_dimmer/light.py b/esphome/components/shelly_dimmer/light.py
index 9050a872b1..20e0e8156b 100644
--- a/esphome/components/shelly_dimmer/light.py
+++ b/esphome/components/shelly_dimmer/light.py
@@ -22,6 +22,7 @@ from esphome.const import (
     UNIT_WATT,
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_VOLTAGE,
+    DEVICE_CLASS_CURRENT,
 )
 from esphome.core import HexInt, CORE
 
@@ -169,7 +170,7 @@ CONFIG_SCHEMA = (
             ),
             cv.Optional(CONF_CURRENT): sensor.sensor_schema(
                 unit_of_measurement=UNIT_AMPERE,
-                device_class=DEVICE_CLASS_POWER,
+                device_class=DEVICE_CLASS_CURRENT,
                 accuracy_decimals=2,
             ),
             # Change the default gamma_correct setting.

From d3627f097235068f00edd37e97da305de64f4052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Obrembski?= <michal@obrembski.dev>
Date: Tue, 7 Feb 2023 00:54:59 +0100
Subject: [PATCH 520/838] Added Ethernet Component for ESP IDF with JL1101 PHY
 driver (#4009)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michał Obrembski <michal@obrembski.com>
---
 esphome/components/ethernet/__init__.py       |   1 +
 .../components/ethernet/esp_eth_phy_jl1101.c  | 339 ++++++++++++++++++
 .../ethernet/ethernet_component.cpp           |   4 +
 .../components/ethernet/ethernet_component.h  |   2 +
 4 files changed, 346 insertions(+)
 create mode 100644 esphome/components/ethernet/esp_eth_phy_jl1101.c

diff --git a/esphome/components/ethernet/__init__.py b/esphome/components/ethernet/__init__.py
index b3614d8fcf..a0f8b557b0 100644
--- a/esphome/components/ethernet/__init__.py
+++ b/esphome/components/ethernet/__init__.py
@@ -33,6 +33,7 @@ ETHERNET_TYPES = {
     "RTL8201": EthernetType.ETHERNET_TYPE_RTL8201,
     "DP83848": EthernetType.ETHERNET_TYPE_DP83848,
     "IP101": EthernetType.ETHERNET_TYPE_IP101,
+    "JL1101": EthernetType.ETHERNET_TYPE_JL1101,
 }
 
 emac_rmii_clock_gpio_t = cg.global_ns.enum("emac_rmii_clock_gpio_t")
diff --git a/esphome/components/ethernet/esp_eth_phy_jl1101.c b/esphome/components/ethernet/esp_eth_phy_jl1101.c
new file mode 100644
index 0000000000..6011795033
--- /dev/null
+++ b/esphome/components/ethernet/esp_eth_phy_jl1101.c
@@ -0,0 +1,339 @@
+// Copyright 2019 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifdef USE_ESP32
+
+#include <string.h>
+#include <stdlib.h>
+#include <sys/cdefs.h>
+#include "esp_log.h"
+#include "esp_eth.h"
+#include "eth_phy_regs_struct.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "driver/gpio.h"
+#include "esp_rom_gpio.h"
+#include "esp_rom_sys.h"
+
+static const char *TAG = "jl1101";
+#define PHY_CHECK(a, str, goto_tag, ...) \
+  do { \
+    if (!(a)) { \
+      ESP_LOGE(TAG, "%s(%d): " str, __FUNCTION__, __LINE__, ##__VA_ARGS__); \
+      goto goto_tag; \
+    } \
+  } while (0)
+
+/***************Vendor Specific Register***************/
+
+/**
+ * @brief PSR(Page Select Register)
+ *
+ */
+typedef union {
+  struct {
+    uint16_t page_select : 8; /* Select register page, default is 0 */
+    uint16_t reserved : 8;    /* Reserved */
+  };
+  uint16_t val;
+} psr_reg_t;
+#define ETH_PHY_PSR_REG_ADDR (0x1F)
+
+typedef struct {
+  esp_eth_phy_t parent;
+  esp_eth_mediator_t *eth;
+  int addr;
+  uint32_t reset_timeout_ms;
+  uint32_t autonego_timeout_ms;
+  eth_link_t link_status;
+  int reset_gpio_num;
+} phy_jl1101_t;
+
+static esp_err_t jl1101_page_select(phy_jl1101_t *jl1101, uint32_t page) {
+  esp_eth_mediator_t *eth = jl1101->eth;
+  psr_reg_t psr = {.page_select = page};
+  PHY_CHECK(eth->phy_reg_write(eth, jl1101->addr, ETH_PHY_PSR_REG_ADDR, psr.val) == ESP_OK, "write PSR failed", err);
+  return ESP_OK;
+err:
+  return ESP_FAIL;
+}
+
+static esp_err_t jl1101_update_link_duplex_speed(phy_jl1101_t *jl1101) {
+  esp_eth_mediator_t *eth = jl1101->eth;
+  eth_speed_t speed = ETH_SPEED_10M;
+  eth_duplex_t duplex = ETH_DUPLEX_HALF;
+  bmcr_reg_t bmcr;
+  bmsr_reg_t bmsr;
+  uint32_t peer_pause_ability = false;
+  anlpar_reg_t anlpar;
+  PHY_CHECK(jl1101_page_select(jl1101, 0) == ESP_OK, "select page 0 failed", err);
+  PHY_CHECK(eth->phy_reg_read(eth, jl1101->addr, ETH_PHY_BMSR_REG_ADDR, &(bmsr.val)) == ESP_OK, "read BMSR failed",
+            err);
+  PHY_CHECK(eth->phy_reg_read(eth, jl1101->addr, ETH_PHY_ANLPAR_REG_ADDR, &(anlpar.val)) == ESP_OK,
+            "read ANLPAR failed", err);
+  eth_link_t link = bmsr.link_status ? ETH_LINK_UP : ETH_LINK_DOWN;
+  /* check if link status changed */
+  if (jl1101->link_status != link) {
+    /* when link up, read negotiation result */
+    if (link == ETH_LINK_UP) {
+      PHY_CHECK(eth->phy_reg_read(eth, jl1101->addr, ETH_PHY_BMCR_REG_ADDR, &(bmcr.val)) == ESP_OK, "read BMCR failed",
+                err);
+      if (bmcr.speed_select) {
+        speed = ETH_SPEED_100M;
+      } else {
+        speed = ETH_SPEED_10M;
+      }
+      if (bmcr.duplex_mode) {
+        duplex = ETH_DUPLEX_FULL;
+      } else {
+        duplex = ETH_DUPLEX_HALF;
+      }
+      PHY_CHECK(eth->on_state_changed(eth, ETH_STATE_SPEED, (void *) speed) == ESP_OK, "change speed failed", err);
+      PHY_CHECK(eth->on_state_changed(eth, ETH_STATE_DUPLEX, (void *) duplex) == ESP_OK, "change duplex failed", err);
+      /* if we're in duplex mode, and peer has the flow control ability */
+      if (duplex == ETH_DUPLEX_FULL && anlpar.symmetric_pause) {
+        peer_pause_ability = 1;
+      } else {
+        peer_pause_ability = 0;
+      }
+      PHY_CHECK(eth->on_state_changed(eth, ETH_STATE_PAUSE, (void *) peer_pause_ability) == ESP_OK,
+                "change pause ability failed", err);
+    }
+    PHY_CHECK(eth->on_state_changed(eth, ETH_STATE_LINK, (void *) link) == ESP_OK, "change link failed", err);
+    jl1101->link_status = link;
+  }
+  return ESP_OK;
+err:
+  return ESP_FAIL;
+}
+
+static esp_err_t jl1101_set_mediator(esp_eth_phy_t *phy, esp_eth_mediator_t *eth) {
+  PHY_CHECK(eth, "can't set mediator to null", err);
+  phy_jl1101_t *jl1101 = __containerof(phy, phy_jl1101_t, parent);
+  jl1101->eth = eth;
+  return ESP_OK;
+err:
+  return ESP_ERR_INVALID_ARG;
+}
+
+static esp_err_t jl1101_get_link(esp_eth_phy_t *phy) {
+  phy_jl1101_t *jl1101 = __containerof(phy, phy_jl1101_t, parent);
+  /* Updata information about link, speed, duplex */
+  PHY_CHECK(jl1101_update_link_duplex_speed(jl1101) == ESP_OK, "update link duplex speed failed", err);
+  return ESP_OK;
+err:
+  return ESP_FAIL;
+}
+
+static esp_err_t jl1101_reset(esp_eth_phy_t *phy) {
+  phy_jl1101_t *jl1101 = __containerof(phy, phy_jl1101_t, parent);
+  jl1101->link_status = ETH_LINK_DOWN;
+  esp_eth_mediator_t *eth = jl1101->eth;
+  bmcr_reg_t bmcr = {.reset = 1};
+  PHY_CHECK(eth->phy_reg_write(eth, jl1101->addr, ETH_PHY_BMCR_REG_ADDR, bmcr.val) == ESP_OK, "write BMCR failed", err);
+  /* Wait for reset complete */
+  uint32_t to = 0;
+  for (to = 0; to < jl1101->reset_timeout_ms / 50; to++) {
+    vTaskDelay(pdMS_TO_TICKS(50));
+    PHY_CHECK(eth->phy_reg_read(eth, jl1101->addr, ETH_PHY_BMCR_REG_ADDR, &(bmcr.val)) == ESP_OK, "read BMCR failed",
+              err);
+    if (!bmcr.reset) {
+      break;
+    }
+  }
+  PHY_CHECK(to < jl1101->reset_timeout_ms / 50, "reset timeout", err);
+  return ESP_OK;
+err:
+  return ESP_FAIL;
+}
+
+static esp_err_t jl1101_reset_hw(esp_eth_phy_t *phy) {
+  phy_jl1101_t *jl1101 = __containerof(phy, phy_jl1101_t, parent);
+  if (jl1101->reset_gpio_num >= 0) {
+    esp_rom_gpio_pad_select_gpio(jl1101->reset_gpio_num);
+    gpio_set_direction(jl1101->reset_gpio_num, GPIO_MODE_OUTPUT);
+    gpio_set_level(jl1101->reset_gpio_num, 0);
+    esp_rom_delay_us(100);  // insert min input assert time
+    gpio_set_level(jl1101->reset_gpio_num, 1);
+  }
+  return ESP_OK;
+}
+
+static esp_err_t jl1101_negotiate(esp_eth_phy_t *phy) {
+  phy_jl1101_t *jl1101 = __containerof(phy, phy_jl1101_t, parent);
+  esp_eth_mediator_t *eth = jl1101->eth;
+  /* in case any link status has changed, let's assume we're in link down status */
+  jl1101->link_status = ETH_LINK_DOWN;
+  /* Restart auto negotiation */
+  bmcr_reg_t bmcr = {
+      .speed_select = 1,     /* 100Mbps */
+      .duplex_mode = 1,      /* Full Duplex */
+      .en_auto_nego = 1,     /* Auto Negotiation */
+      .restart_auto_nego = 1 /* Restart Auto Negotiation */
+  };
+  PHY_CHECK(eth->phy_reg_write(eth, jl1101->addr, ETH_PHY_BMCR_REG_ADDR, bmcr.val) == ESP_OK, "write BMCR failed", err);
+  /* Wait for auto negotiation complete */
+  bmsr_reg_t bmsr;
+  uint32_t to = 0;
+  for (to = 0; to < jl1101->autonego_timeout_ms / 100; to++) {
+    vTaskDelay(pdMS_TO_TICKS(100));
+    PHY_CHECK(eth->phy_reg_read(eth, jl1101->addr, ETH_PHY_BMSR_REG_ADDR, &(bmsr.val)) == ESP_OK, "read BMSR failed",
+              err);
+    if (bmsr.auto_nego_complete) {
+      break;
+    }
+  }
+  /* Auto negotiation failed, maybe no network cable plugged in, so output a warning */
+  if (to >= jl1101->autonego_timeout_ms / 100) {
+    ESP_LOGW(TAG, "auto negotiation timeout");
+  }
+  return ESP_OK;
+err:
+  return ESP_FAIL;
+}
+
+static esp_err_t jl1101_pwrctl(esp_eth_phy_t *phy, bool enable) {
+  phy_jl1101_t *jl1101 = __containerof(phy, phy_jl1101_t, parent);
+  esp_eth_mediator_t *eth = jl1101->eth;
+  bmcr_reg_t bmcr;
+  PHY_CHECK(eth->phy_reg_read(eth, jl1101->addr, ETH_PHY_BMCR_REG_ADDR, &(bmcr.val)) == ESP_OK, "read BMCR failed",
+            err);
+  if (!enable) {
+    /* Enable IEEE Power Down Mode */
+    bmcr.power_down = 1;
+  } else {
+    /* Disable IEEE Power Down Mode */
+    bmcr.power_down = 0;
+  }
+  PHY_CHECK(eth->phy_reg_write(eth, jl1101->addr, ETH_PHY_BMCR_REG_ADDR, bmcr.val) == ESP_OK, "write BMCR failed", err);
+  if (!enable) {
+    PHY_CHECK(eth->phy_reg_read(eth, jl1101->addr, ETH_PHY_BMCR_REG_ADDR, &(bmcr.val)) == ESP_OK, "read BMCR failed",
+              err);
+    PHY_CHECK(bmcr.power_down == 1, "power down failed", err);
+  } else {
+    /* wait for power up complete */
+    uint32_t to = 0;
+    for (to = 0; to < jl1101->reset_timeout_ms / 10; to++) {
+      vTaskDelay(pdMS_TO_TICKS(10));
+      PHY_CHECK(eth->phy_reg_read(eth, jl1101->addr, ETH_PHY_BMCR_REG_ADDR, &(bmcr.val)) == ESP_OK, "read BMCR failed",
+                err);
+      if (bmcr.power_down == 0) {
+        break;
+      }
+    }
+    PHY_CHECK(to < jl1101->reset_timeout_ms / 10, "power up timeout", err);
+  }
+  return ESP_OK;
+err:
+  return ESP_FAIL;
+}
+
+static esp_err_t jl1101_set_addr(esp_eth_phy_t *phy, uint32_t addr) {
+  phy_jl1101_t *jl1101 = __containerof(phy, phy_jl1101_t, parent);
+  jl1101->addr = addr;
+  return ESP_OK;
+}
+
+static esp_err_t jl1101_get_addr(esp_eth_phy_t *phy, uint32_t *addr) {
+  PHY_CHECK(addr, "addr can't be null", err);
+  phy_jl1101_t *jl1101 = __containerof(phy, phy_jl1101_t, parent);
+  *addr = jl1101->addr;
+  return ESP_OK;
+err:
+  return ESP_ERR_INVALID_ARG;
+}
+
+static esp_err_t jl1101_del(esp_eth_phy_t *phy) {
+  phy_jl1101_t *jl1101 = __containerof(phy, phy_jl1101_t, parent);
+  free(jl1101);
+  return ESP_OK;
+}
+
+static esp_err_t jl1101_advertise_pause_ability(esp_eth_phy_t *phy, uint32_t ability) {
+  phy_jl1101_t *jl1101 = __containerof(phy, phy_jl1101_t, parent);
+  esp_eth_mediator_t *eth = jl1101->eth;
+  /* Set PAUSE function ability */
+  anar_reg_t anar;
+  PHY_CHECK(eth->phy_reg_read(eth, jl1101->addr, ETH_PHY_ANAR_REG_ADDR, &(anar.val)) == ESP_OK, "read ANAR failed",
+            err);
+  if (ability) {
+    anar.asymmetric_pause = 1;
+    anar.symmetric_pause = 1;
+  } else {
+    anar.asymmetric_pause = 0;
+    anar.symmetric_pause = 0;
+  }
+  PHY_CHECK(eth->phy_reg_write(eth, jl1101->addr, ETH_PHY_ANAR_REG_ADDR, anar.val) == ESP_OK, "write ANAR failed", err);
+  return ESP_OK;
+err:
+  return ESP_FAIL;
+}
+
+static esp_err_t jl1101_init(esp_eth_phy_t *phy) {
+  phy_jl1101_t *jl1101 = __containerof(phy, phy_jl1101_t, parent);
+  esp_eth_mediator_t *eth = jl1101->eth;
+  // Detect PHY address
+  if (jl1101->addr == ESP_ETH_PHY_ADDR_AUTO) {
+    PHY_CHECK(esp_eth_detect_phy_addr(eth, &jl1101->addr) == ESP_OK, "Detect PHY address failed", err);
+  }
+  /* Power on Ethernet PHY */
+  PHY_CHECK(jl1101_pwrctl(phy, true) == ESP_OK, "power control failed", err);
+  /* Reset Ethernet PHY */
+  PHY_CHECK(jl1101_reset(phy) == ESP_OK, "reset failed", err);
+  /* Check PHY ID */
+  phyidr1_reg_t id1;
+  phyidr2_reg_t id2;
+  PHY_CHECK(eth->phy_reg_read(eth, jl1101->addr, ETH_PHY_IDR1_REG_ADDR, &(id1.val)) == ESP_OK, "read ID1 failed", err);
+  PHY_CHECK(eth->phy_reg_read(eth, jl1101->addr, ETH_PHY_IDR2_REG_ADDR, &(id2.val)) == ESP_OK, "read ID2 failed", err);
+  PHY_CHECK(id1.oui_msb == 0x937C && id2.oui_lsb == 0x10 && id2.vendor_model == 0x2, "wrong chip ID", err);
+  return ESP_OK;
+err:
+  return ESP_FAIL;
+}
+
+static esp_err_t jl1101_deinit(esp_eth_phy_t *phy) {
+  /* Power off Ethernet PHY */
+  PHY_CHECK(jl1101_pwrctl(phy, false) == ESP_OK, "power control failed", err);
+  return ESP_OK;
+err:
+  return ESP_FAIL;
+}
+
+esp_eth_phy_t *esp_eth_phy_new_jl1101(const eth_phy_config_t *config) {
+  PHY_CHECK(config, "can't set phy config to null", err);
+  phy_jl1101_t *jl1101 = calloc(1, sizeof(phy_jl1101_t));
+  PHY_CHECK(jl1101, "calloc jl1101 failed", err);
+  jl1101->addr = config->phy_addr;
+  jl1101->reset_gpio_num = config->reset_gpio_num;
+  jl1101->reset_timeout_ms = config->reset_timeout_ms;
+  jl1101->link_status = ETH_LINK_DOWN;
+  jl1101->autonego_timeout_ms = config->autonego_timeout_ms;
+  jl1101->parent.reset = jl1101_reset;
+  jl1101->parent.reset_hw = jl1101_reset_hw;
+  jl1101->parent.init = jl1101_init;
+  jl1101->parent.deinit = jl1101_deinit;
+  jl1101->parent.set_mediator = jl1101_set_mediator;
+  jl1101->parent.negotiate = jl1101_negotiate;
+  jl1101->parent.get_link = jl1101_get_link;
+  jl1101->parent.pwrctl = jl1101_pwrctl;
+  jl1101->parent.get_addr = jl1101_get_addr;
+  jl1101->parent.set_addr = jl1101_set_addr;
+  jl1101->parent.advertise_pause_ability = jl1101_advertise_pause_ability;
+  jl1101->parent.del = jl1101_del;
+
+  return &(jl1101->parent);
+err:
+  return NULL;
+}
+#endif /* USE_ESP32 */
diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index fa66d824be..a3f0ae715f 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -71,6 +71,10 @@ void EthernetComponent::setup() {
       phy = esp_eth_phy_new_ip101(&phy_config);
       break;
     }
+    case ETHERNET_TYPE_JL1101: {
+      phy = esp_eth_phy_new_jl1101(&phy_config);
+      break;
+    }
     default: {
       this->mark_failed();
       return;
diff --git a/esphome/components/ethernet/ethernet_component.h b/esphome/components/ethernet/ethernet_component.h
index ed784e1bc0..a538a5c77d 100644
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -18,6 +18,7 @@ enum EthernetType {
   ETHERNET_TYPE_RTL8201,
   ETHERNET_TYPE_DP83848,
   ETHERNET_TYPE_IP101,
+  ETHERNET_TYPE_JL1101,
 };
 
 struct ManualIP {
@@ -82,6 +83,7 @@ class EthernetComponent : public Component {
 
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 extern EthernetComponent *global_eth_component;
+extern "C" esp_eth_phy_t *esp_eth_phy_new_jl1101(const eth_phy_config_t *config);
 
 }  // namespace ethernet
 }  // namespace esphome

From 393ca64d709730b009f50f2a156c4f83932df03a Mon Sep 17 00:00:00 2001
From: tomaszduda23 <tomaszduda23@gmail.com>
Date: Tue, 7 Feb 2023 00:55:35 +0100
Subject: [PATCH 521/838] adds gpio INPUT_OUTPUT_OPEN_DRAIN (#4360)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/pins.py  | 5 +++++
 tests/test1.yaml | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/esphome/pins.py b/esphome/pins.py
index 2b3adce86d..2ac4cd4b54 100644
--- a/esphome/pins.py
+++ b/esphome/pins.py
@@ -49,6 +49,11 @@ def _set_mode(value, default_mode):
             CONF_INPUT: True,
             CONF_PULLDOWN: True,
         },
+        "INPUT_OUTPUT_OPEN_DRAIN": {
+            CONF_INPUT: True,
+            CONF_OUTPUT: True,
+            CONF_OPEN_DRAIN: True,
+        },
     }
     if mode.upper() not in PIN_MODES:
         raise cv.Invalid(f"Unknown pin mode {mode}", [CONF_MODE])
diff --git a/tests/test1.yaml b/tests/test1.yaml
index abbfe8adec..a567c41f2a 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1321,6 +1321,11 @@ binary_sensor:
       number: GPIO9
       mode: INPUT_PULLUP
     name: Living Room Window 2
+  - platform: gpio
+    pin:
+      number: GPIO9
+      mode: INPUT_OUTPUT_OPEN_DRAIN
+    name: Living Room Button
   - platform: status
     name: Living Room Status
   - platform: esp32_touch

From 40df3aa55e0938dbc6ff0012f18f844b63a35a24 Mon Sep 17 00:00:00 2001
From: Quentin Smith <quentin@mit.edu>
Date: Mon, 6 Feb 2023 20:08:40 -0500
Subject: [PATCH 522/838] Merge components in packages (#3555)

Co-authored-by: Paul Monigatti <pm@paul.pm>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/packages/__init__.py       |   2 +-
 esphome/config.py                             |   9 +
 esphome/config_helpers.py                     |  37 +-
 esphome/config_validation.py                  |   3 +
 esphome/yaml_util.py                          |   7 +-
 .../component_tests/packages/test_packages.py | 351 ++++++++++++++++++
 tests/test1.yaml                              |   2 +
 7 files changed, 408 insertions(+), 3 deletions(-)
 create mode 100644 tests/component_tests/packages/test_packages.py

diff --git a/esphome/components/packages/__init__.py b/esphome/components/packages/__init__.py
index 8392008222..98483e8ae9 100644
--- a/esphome/components/packages/__init__.py
+++ b/esphome/components/packages/__init__.py
@@ -165,7 +165,7 @@ def do_packages_pass(config: dict):
                 f"Packages must be a key to value mapping, got {type(packages)} instead"
             )
 
-        for package_name, package_config in packages.items():
+        for package_name, package_config in reversed(packages.items()):
             with cv.prepend_path(package_name):
                 recursive_package = package_config
                 if CONF_URL in package_config:
diff --git a/esphome/config.py b/esphome/config.py
index e63cddf347..b04de020e0 100644
--- a/esphome/config.py
+++ b/esphome/config.py
@@ -14,6 +14,7 @@ from esphome import core, yaml_util, loader
 import esphome.core.config as core_config
 from esphome.const import (
     CONF_ESPHOME,
+    CONF_ID,
     CONF_PLATFORM,
     CONF_PACKAGES,
     CONF_SUBSTITUTIONS,
@@ -24,6 +25,7 @@ from esphome.core import CORE, EsphomeError
 from esphome.helpers import indent
 from esphome.util import safe_print, OrderedDict
 
+from esphome.config_helpers import Extend
 from esphome.loader import get_component, get_platform, ComponentManifest
 from esphome.yaml_util import is_secret, ESPHomeDataBase, ESPForceValue
 from esphome.voluptuous_schema import ExtraKeysInvalid
@@ -334,6 +336,13 @@ class LoadValidationStep(ConfigValidationStep):
                 continue
             p_name = p_config.get("platform")
             if p_name is None:
+                p_id = p_config.get(CONF_ID)
+                if isinstance(p_id, Extend):
+                    result.add_str_error(
+                        f"Source for extension of ID '{p_id.value}' was not found.",
+                        path + [CONF_ID],
+                    )
+                    continue
                 result.add_str_error("No platform specified! See 'platform' key.", path)
                 continue
             # Remove temp output path and construct new one
diff --git a/esphome/config_helpers.py b/esphome/config_helpers.py
index d36a2f1e7f..e1d63775bb 100644
--- a/esphome/config_helpers.py
+++ b/esphome/config_helpers.py
@@ -1,10 +1,27 @@
 import json
 import os
 
+from esphome.const import CONF_ID
 from esphome.core import CORE
 from esphome.helpers import read_file
 
 
+class Extend:
+    def __init__(self, value):
+        self.value = value
+
+    def __str__(self):
+        return f"!extend {self.value}"
+
+    def __eq__(self, b):
+        """
+        Check if two Extend objects contain the same ID.
+
+        Only used in unit tests.
+        """
+        return isinstance(b, Extend) and self.value == b.value
+
+
 def read_config_file(path: str) -> str:
     if CORE.vscode and (
         not CORE.ace or os.path.abspath(path) == os.path.abspath(CORE.config_path)
@@ -36,7 +53,25 @@ def merge_config(full_old, full_new):
         if isinstance(new, list):
             if not isinstance(old, list):
                 return new
-            return old + new
+            res = old.copy()
+            ids = {
+                v[CONF_ID]: i
+                for i, v in enumerate(res)
+                if CONF_ID in v and isinstance(v[CONF_ID], str)
+            }
+            for v in new:
+                if CONF_ID in v:
+                    new_id = v[CONF_ID]
+                    if isinstance(new_id, Extend):
+                        new_id = new_id.value
+                        if new_id in ids:
+                            v[CONF_ID] = new_id
+                            res[ids[new_id]] = merge(res[ids[new_id]], v)
+                            continue
+                    else:
+                        ids[new_id] = len(res)
+                res.append(v)
+            return res
         if new is None:
             return old
 
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 359b9ba88e..7440f71790 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -13,6 +13,7 @@ import voluptuous as vol
 
 from esphome import core
 import esphome.codegen as cg
+from esphome.config_helpers import Extend
 from esphome.const import (
     ALLOWED_NAME_CHARS,
     CONF_AVAILABILITY,
@@ -490,6 +491,8 @@ def declare_id(type):
         if value is None:
             return core.ID(None, is_declaration=True, type=type)
 
+        if isinstance(value, Extend):
+            raise Invalid(f"Source for extension of ID '{value.value}' was not found.")
         return core.ID(validate_id_name(value), is_declaration=True, type=type)
 
     return validator
diff --git a/esphome/yaml_util.py b/esphome/yaml_util.py
index b8aa8dd53f..8a03c431a7 100644
--- a/esphome/yaml_util.py
+++ b/esphome/yaml_util.py
@@ -10,7 +10,7 @@ import yaml
 import yaml.constructor
 
 from esphome import core
-from esphome.config_helpers import read_config_file
+from esphome.config_helpers import read_config_file, Extend
 from esphome.core import (
     EsphomeError,
     IPAddress,
@@ -338,6 +338,10 @@ class ESPHomeLoader(yaml.SafeLoader):
         obj = self.construct_scalar(node)
         return add_class_to_obj(obj, ESPForceValue)
 
+    @_add_data_ref
+    def construct_extend(self, node):
+        return Extend(str(node.value))
+
 
 ESPHomeLoader.add_constructor("tag:yaml.org,2002:int", ESPHomeLoader.construct_yaml_int)
 ESPHomeLoader.add_constructor(
@@ -369,6 +373,7 @@ ESPHomeLoader.add_constructor(
 )
 ESPHomeLoader.add_constructor("!lambda", ESPHomeLoader.construct_lambda)
 ESPHomeLoader.add_constructor("!force", ESPHomeLoader.construct_force)
+ESPHomeLoader.add_constructor("!extend", ESPHomeLoader.construct_extend)
 
 
 def load_yaml(fname, clear_secrets=True):
diff --git a/tests/component_tests/packages/test_packages.py b/tests/component_tests/packages/test_packages.py
new file mode 100644
index 0000000000..0e24d78f5c
--- /dev/null
+++ b/tests/component_tests/packages/test_packages.py
@@ -0,0 +1,351 @@
+"""Tests for the packages component."""
+
+import pytest
+
+
+from esphome.const import (
+    CONF_DOMAIN,
+    CONF_ESPHOME,
+    CONF_FILTERS,
+    CONF_ID,
+    CONF_MULTIPLY,
+    CONF_NAME,
+    CONF_OFFSET,
+    CONF_PACKAGES,
+    CONF_PASSWORD,
+    CONF_PLATFORM,
+    CONF_SENSOR,
+    CONF_SSID,
+    CONF_UPDATE_INTERVAL,
+    CONF_WIFI,
+)
+from esphome.components.packages import do_packages_pass
+from esphome.config_helpers import Extend
+import esphome.config_validation as cv
+
+# Test strings
+TEST_DEVICE_NAME = "test_device_name"
+TEST_PLATFORM = "test_platform"
+TEST_WIFI_SSID = "test_wifi_ssid"
+TEST_PACKAGE_WIFI_SSID = "test_package_wifi_ssid"
+TEST_PACKAGE_WIFI_PASSWORD = "test_package_wifi_password"
+TEST_DOMAIN = "test_domain_name"
+TEST_SENSOR_PLATFORM_1 = "test_sensor_platform_1"
+TEST_SENSOR_PLATFORM_2 = "test_sensor_platform_2"
+TEST_SENSOR_NAME_1 = "test_sensor_name_1"
+TEST_SENSOR_NAME_2 = "test_sensor_name_2"
+TEST_SENSOR_ID_1 = "test_sensor_id_1"
+TEST_SENSOR_ID_2 = "test_sensor_id_2"
+TEST_SENSOR_UPDATE_INTERVAL = "test_sensor_update_interval"
+
+
+@pytest.fixture(name="basic_wifi")
+def fixture_basic_wifi():
+    return {
+        CONF_SSID: TEST_PACKAGE_WIFI_SSID,
+        CONF_PASSWORD: TEST_PACKAGE_WIFI_PASSWORD,
+    }
+
+
+@pytest.fixture(name="basic_esphome")
+def fixture_basic_esphome():
+    return {CONF_NAME: TEST_DEVICE_NAME, CONF_PLATFORM: TEST_PLATFORM}
+
+
+def test_package_unused(basic_esphome, basic_wifi):
+    """
+    Ensures do_package_pass does not change a config if packages aren't used.
+    """
+    config = {CONF_ESPHOME: basic_esphome, CONF_WIFI: basic_wifi}
+
+    actual = do_packages_pass(config)
+    assert actual == config
+
+
+def test_package_invalid_dict(basic_esphome, basic_wifi):
+    """
+    Ensures an error is raised if packages is not valid.
+
+    """
+    config = {CONF_ESPHOME: basic_esphome, CONF_PACKAGES: basic_wifi}
+
+    with pytest.raises(cv.Invalid):
+        do_packages_pass(config)
+
+
+def test_package_include(basic_wifi, basic_esphome):
+    """
+    Tests the simple case where an independent config present in a package is added to the top-level config as is.
+
+    In this test, the CONF_WIFI config is expected to be simply added to the top-level config.
+    """
+    config = {
+        CONF_ESPHOME: basic_esphome,
+        CONF_PACKAGES: {"network": {CONF_WIFI: basic_wifi}},
+    }
+
+    expected = {CONF_ESPHOME: basic_esphome, CONF_WIFI: basic_wifi}
+
+    actual = do_packages_pass(config)
+    assert actual == expected
+
+
+def test_package_append(basic_wifi, basic_esphome):
+    """
+    Tests the case where a key is present in both a package and top-level config.
+
+    In this test, CONF_WIFI is defined in a package, and CONF_DOMAIN is added to it at the top level.
+    """
+    config = {
+        CONF_ESPHOME: basic_esphome,
+        CONF_PACKAGES: {"network": {CONF_WIFI: basic_wifi}},
+        CONF_WIFI: {CONF_DOMAIN: TEST_DOMAIN},
+    }
+
+    expected = {
+        CONF_ESPHOME: basic_esphome,
+        CONF_WIFI: {
+            CONF_SSID: TEST_PACKAGE_WIFI_SSID,
+            CONF_PASSWORD: TEST_PACKAGE_WIFI_PASSWORD,
+            CONF_DOMAIN: TEST_DOMAIN,
+        },
+    }
+
+    actual = do_packages_pass(config)
+    assert actual == expected
+
+
+def test_package_override(basic_wifi, basic_esphome):
+    """
+    Ensures that the top-level configuration takes precedence over duplicate keys defined in a package.
+
+    In this test, CONF_SSID should be overwritten by that defined in the top-level config.
+    """
+    config = {
+        CONF_ESPHOME: basic_esphome,
+        CONF_PACKAGES: {"network": {CONF_WIFI: basic_wifi}},
+        CONF_WIFI: {CONF_SSID: TEST_WIFI_SSID},
+    }
+
+    expected = {
+        CONF_ESPHOME: basic_esphome,
+        CONF_WIFI: {
+            CONF_SSID: TEST_WIFI_SSID,
+            CONF_PASSWORD: TEST_PACKAGE_WIFI_PASSWORD,
+        },
+    }
+
+    actual = do_packages_pass(config)
+    assert actual == expected
+
+
+def test_multiple_package_order():
+    """
+    Ensures that mutiple packages are merged in order.
+    """
+    config = {
+        CONF_PACKAGES: {
+            "package1": {
+                "logger": {
+                    "level": "DEBUG",
+                },
+            },
+            "package2": {
+                "logger": {
+                    "level": "VERBOSE",
+                },
+            },
+        },
+    }
+
+    expected = {
+        "logger": {
+            "level": "VERBOSE",
+        },
+    }
+
+    actual = do_packages_pass(config)
+    assert actual == expected
+
+
+def test_package_list_merge():
+    """
+    Ensures lists defined in both a package and the top-level config are merged correctly
+    """
+    config = {
+        CONF_PACKAGES: {
+            "package_sensors": {
+                CONF_SENSOR: [
+                    {
+                        CONF_PLATFORM: TEST_SENSOR_PLATFORM_1,
+                        CONF_NAME: TEST_SENSOR_NAME_1,
+                    },
+                    {
+                        CONF_PLATFORM: TEST_SENSOR_PLATFORM_1,
+                        CONF_NAME: TEST_SENSOR_NAME_2,
+                    },
+                ]
+            }
+        },
+        CONF_SENSOR: [
+            {CONF_PLATFORM: TEST_SENSOR_PLATFORM_2, CONF_NAME: TEST_SENSOR_NAME_1},
+            {CONF_PLATFORM: TEST_SENSOR_PLATFORM_2, CONF_NAME: TEST_SENSOR_NAME_2},
+        ],
+    }
+
+    expected = {
+        CONF_SENSOR: [
+            {CONF_PLATFORM: TEST_SENSOR_PLATFORM_1, CONF_NAME: TEST_SENSOR_NAME_1},
+            {CONF_PLATFORM: TEST_SENSOR_PLATFORM_1, CONF_NAME: TEST_SENSOR_NAME_2},
+            {CONF_PLATFORM: TEST_SENSOR_PLATFORM_2, CONF_NAME: TEST_SENSOR_NAME_1},
+            {CONF_PLATFORM: TEST_SENSOR_PLATFORM_2, CONF_NAME: TEST_SENSOR_NAME_2},
+        ]
+    }
+
+    actual = do_packages_pass(config)
+    assert actual == expected
+
+
+def test_package_list_merge_by_id():
+    """
+    Ensures that components with matching IDs are merged correctly.
+
+    In this test, a sensor is defined in a package, and a CONF_UPDATE_INTERVAL is added at the top level,
+    and a sensor name is overridden in another sensor.
+    """
+    config = {
+        CONF_PACKAGES: {
+            "package_sensors": {
+                CONF_SENSOR: [
+                    {
+                        CONF_ID: TEST_SENSOR_ID_1,
+                        CONF_PLATFORM: TEST_SENSOR_PLATFORM_1,
+                        CONF_NAME: TEST_SENSOR_NAME_1,
+                    },
+                    {
+                        CONF_ID: TEST_SENSOR_ID_2,
+                        CONF_PLATFORM: TEST_SENSOR_PLATFORM_1,
+                        CONF_NAME: TEST_SENSOR_NAME_2,
+                    },
+                ]
+            },
+            "package2": {
+                CONF_SENSOR: [
+                    {
+                        CONF_ID: Extend(TEST_SENSOR_ID_1),
+                        CONF_DOMAIN: "2",
+                    }
+                ],
+            },
+            "package3": {
+                CONF_SENSOR: [
+                    {
+                        CONF_ID: Extend(TEST_SENSOR_ID_1),
+                        CONF_DOMAIN: "3",
+                    }
+                ],
+            },
+        },
+        CONF_SENSOR: [
+            {
+                CONF_ID: Extend(TEST_SENSOR_ID_1),
+                CONF_UPDATE_INTERVAL: TEST_SENSOR_UPDATE_INTERVAL,
+            },
+            {CONF_ID: Extend(TEST_SENSOR_ID_2), CONF_NAME: TEST_SENSOR_NAME_1},
+            {CONF_PLATFORM: TEST_SENSOR_PLATFORM_2, CONF_NAME: TEST_SENSOR_NAME_2},
+        ],
+    }
+
+    expected = {
+        CONF_SENSOR: [
+            {
+                CONF_ID: TEST_SENSOR_ID_1,
+                CONF_PLATFORM: TEST_SENSOR_PLATFORM_1,
+                CONF_NAME: TEST_SENSOR_NAME_1,
+                CONF_UPDATE_INTERVAL: TEST_SENSOR_UPDATE_INTERVAL,
+                CONF_DOMAIN: "3",
+            },
+            {
+                CONF_ID: TEST_SENSOR_ID_2,
+                CONF_PLATFORM: TEST_SENSOR_PLATFORM_1,
+                CONF_NAME: TEST_SENSOR_NAME_1,
+            },
+            {CONF_PLATFORM: TEST_SENSOR_PLATFORM_2, CONF_NAME: TEST_SENSOR_NAME_2},
+        ]
+    }
+
+    actual = do_packages_pass(config)
+    assert actual == expected
+
+
+def test_package_merge_by_id_with_list():
+    """
+    Ensures that components with matching IDs are merged correctly when their configuration contains lists.
+
+    For example, a sensor with filters defined in both a package and the top level config should be merged.
+    """
+
+    config = {
+        CONF_PACKAGES: {
+            "sensors": {
+                CONF_SENSOR: [
+                    {CONF_ID: TEST_SENSOR_ID_1, CONF_FILTERS: [{CONF_MULTIPLY: 42.0}]}
+                ]
+            }
+        },
+        CONF_SENSOR: [
+            {CONF_ID: Extend(TEST_SENSOR_ID_1), CONF_FILTERS: [{CONF_OFFSET: 146.0}]}
+        ],
+    }
+
+    expected = {
+        CONF_SENSOR: [
+            {
+                CONF_ID: TEST_SENSOR_ID_1,
+                CONF_FILTERS: [{CONF_MULTIPLY: 42.0}, {CONF_OFFSET: 146.0}],
+            }
+        ]
+    }
+
+    actual = do_packages_pass(config)
+    assert actual == expected
+
+
+def test_package_merge_by_missing_id():
+    """
+    Ensures that components with missing IDs are not merged.
+    """
+
+    config = {
+        CONF_PACKAGES: {
+            "sensors": {
+                CONF_SENSOR: [
+                    {CONF_ID: TEST_SENSOR_ID_1, CONF_FILTERS: [{CONF_MULTIPLY: 42.0}]},
+                ]
+            }
+        },
+        CONF_SENSOR: [
+            {CONF_ID: TEST_SENSOR_ID_1, CONF_FILTERS: [{CONF_MULTIPLY: 10.0}]},
+            {CONF_ID: Extend(TEST_SENSOR_ID_2), CONF_FILTERS: [{CONF_OFFSET: 146.0}]},
+        ],
+    }
+
+    expected = {
+        CONF_SENSOR: [
+            {
+                CONF_ID: TEST_SENSOR_ID_1,
+                CONF_FILTERS: [{CONF_MULTIPLY: 42.0}],
+            },
+            {
+                CONF_ID: TEST_SENSOR_ID_1,
+                CONF_FILTERS: [{CONF_MULTIPLY: 10.0}],
+            },
+            {
+                CONF_ID: Extend(TEST_SENSOR_ID_2),
+                CONF_FILTERS: [{CONF_OFFSET: 146.0}],
+            },
+        ]
+    }
+
+    actual = do_packages_pass(config)
+    assert actual == expected
diff --git a/tests/test1.yaml b/tests/test1.yaml
index a567c41f2a..a77f8802b9 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1076,6 +1076,8 @@ sensor:
     id: ultrasonic_sensor1
   - platform: uptime
     name: Uptime Sensor
+  - id: !extend ${devicename}_uptime_pcg
+    unit_of_measurement: s
   - platform: wifi_signal
     name: WiFi Signal Sensor
     update_interval: 15s

From b5c47b966950c608bc6ed202504b69903d04ced0 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Feb 2023 07:30:00 +1300
Subject: [PATCH 523/838] Update ld2410 logging (#4395)

---
 esphome/components/ld2410/ld2410.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/esphome/components/ld2410/ld2410.cpp b/esphome/components/ld2410/ld2410.cpp
index 8fb84d785e..8e67ba54d7 100644
--- a/esphome/components/ld2410/ld2410.cpp
+++ b/esphome/components/ld2410/ld2410.cpp
@@ -25,11 +25,12 @@ void LD2410Component::dump_config() {
   this->set_config_mode_(true);
   this->get_version_();
   this->set_config_mode_(false);
-  ESP_LOGCONFIG("  ", "Firmware Version : %u.%u.%u%u%u%u", this->version_[0], this->version_[1], this->version_[2],
+  ESP_LOGCONFIG(TAG, "  Firmware Version : %u.%u.%u%u%u%u", this->version_[0], this->version_[1], this->version_[2],
                 this->version_[3], this->version_[4], this->version_[5]);
 }
 
 void LD2410Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up LD2410...");
   this->set_config_mode_(true);
   this->set_max_distances_timeout_(this->max_move_distance_, this->max_still_distance_, this->timeout_);
   // Configure Gates sensitivity
@@ -44,8 +45,9 @@ void LD2410Component::setup() {
   this->set_gate_threshold_(8, this->rg8_move_threshold_, this->rg8_still_threshold_);
   this->get_version_();
   this->set_config_mode_(false);
-  ESP_LOGI("  ", "Firmware Version : %u.%u.%u%u%u%u", this->version_[0], this->version_[1], this->version_[2],
-           this->version_[3], this->version_[4], this->version_[5]);
+  ESP_LOGCONFIG(TAG, "Firmware Version : %u.%u.%u%u%u%u", this->version_[0], this->version_[1], this->version_[2],
+                this->version_[3], this->version_[4], this->version_[5]);
+  ESP_LOGCONFIG(TAG, "LD2410 setup complete.");
 }
 
 void LD2410Component::loop() {
@@ -166,7 +168,7 @@ void LD2410Component::handle_periodic_data_(uint8_t *buffer, int len) {
 }
 
 void LD2410Component::handle_ack_data_(uint8_t *buffer, int len) {
-  ESP_LOGI(TAG, "Handling ACK DATA for COMMAND");
+  ESP_LOGV(TAG, "Handling ACK DATA for COMMAND");
   if (len < 10) {
     ESP_LOGE(TAG, "Error with last command : incorrect length");
     return;
@@ -186,13 +188,13 @@ void LD2410Component::handle_ack_data_(uint8_t *buffer, int len) {
 
   switch (buffer[COMMAND]) {
     case lowbyte(CMD_ENABLE_CONF):
-      ESP_LOGD(TAG, "Handled Enable conf command");
+      ESP_LOGV(TAG, "Handled Enable conf command");
       break;
     case lowbyte(CMD_DISABLE_CONF):
-      ESP_LOGD(TAG, "Handled Disabled conf command");
+      ESP_LOGV(TAG, "Handled Disabled conf command");
       break;
     case lowbyte(CMD_VERSION):
-      ESP_LOGD(TAG, "FW Version is: %u.%u.%u%u%u%u", buffer[13], buffer[12], buffer[17], buffer[16], buffer[15],
+      ESP_LOGV(TAG, "FW Version is: %u.%u.%u%u%u%u", buffer[13], buffer[12], buffer[17], buffer[16], buffer[15],
                buffer[14]);
       this->version_[0] = buffer[13];
       this->version_[1] = buffer[12];
@@ -203,7 +205,7 @@ void LD2410Component::handle_ack_data_(uint8_t *buffer, int len) {
 
       break;
     case lowbyte(CMD_GATE_SENS):
-      ESP_LOGD(TAG, "Handled sensitivity command");
+      ESP_LOGV(TAG, "Handled sensitivity command");
       break;
     case lowbyte(CMD_QUERY):  // Query parameters response
     {

From c6742117d3984b534618773b64218a64b4962a70 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Feb 2023 07:30:19 +1300
Subject: [PATCH 524/838] Update log for mics4514 to state 3 minute start time.
 (#4396)

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

diff --git a/esphome/components/mics_4514/mics_4514.cpp b/esphome/components/mics_4514/mics_4514.cpp
index 8dc1a9f639..a14d7f2f80 100644
--- a/esphome/components/mics_4514/mics_4514.cpp
+++ b/esphome/components/mics_4514/mics_4514.cpp
@@ -16,7 +16,7 @@ void MICS4514Component::setup() {
   uint8_t power_mode;
   this->read_register(POWER_MODE_REGISTER, &power_mode, 1);
   if (power_mode == 0x00) {
-    ESP_LOGCONFIG(TAG, "Waking up MICS 4514");
+    ESP_LOGCONFIG(TAG, "Waking up MICS 4514, sensors will have data after 3 minutes...");
     power_mode = 0x01;
     this->write_register(POWER_MODE_REGISTER, &power_mode, 1);
     delay(100);  // NOLINT

From ac6693f17768d519e7f2fe0206602b7dea2f2050 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Feb 2023 10:25:44 +1300
Subject: [PATCH 525/838] mDNS updates (#4399)

---
 esphome/components/mdns/mdns_component.h      |  2 ++
 .../mdns/{mdns_esp_idf.cpp => mdns_esp32.cpp} | 14 +++++++---
 .../components/mdns/mdns_esp32_arduino.cpp    | 26 -------------------
 esphome/components/mdns/mdns_esp8266.cpp      | 12 ++++++---
 esphome/components/mdns/mdns_rp2040.cpp       |  5 ++++
 esphome/zeroconf.py                           |  5 ++++
 6 files changed, 31 insertions(+), 33 deletions(-)
 rename esphome/components/mdns/{mdns_esp_idf.cpp => mdns_esp32.cpp} (87%)
 delete mode 100644 esphome/components/mdns/mdns_esp32_arduino.cpp

diff --git a/esphome/components/mdns/mdns_component.h b/esphome/components/mdns/mdns_component.h
index 5f9179b799..b2cb10db62 100644
--- a/esphome/components/mdns/mdns_component.h
+++ b/esphome/components/mdns/mdns_component.h
@@ -35,6 +35,8 @@ class MDNSComponent : public Component {
 
   void add_extra_service(MDNSService service) { services_extra_.push_back(std::move(service)); }
 
+  void on_shutdown() override;
+
  protected:
   std::vector<MDNSService> services_extra_{};
   std::vector<MDNSService> services_{};
diff --git a/esphome/components/mdns/mdns_esp_idf.cpp b/esphome/components/mdns/mdns_esp32.cpp
similarity index 87%
rename from esphome/components/mdns/mdns_esp_idf.cpp
rename to esphome/components/mdns/mdns_esp32.cpp
index 40d9f1d5f3..6081c96637 100644
--- a/esphome/components/mdns/mdns_esp_idf.cpp
+++ b/esphome/components/mdns/mdns_esp32.cpp
@@ -1,9 +1,10 @@
-#ifdef USE_ESP_IDF
+#ifdef USE_ESP32
 
-#include "mdns_component.h"
-#include "esphome/core/log.h"
 #include <mdns.h>
 #include <cstring>
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+#include "mdns_component.h"
 
 namespace esphome {
 namespace mdns {
@@ -47,7 +48,12 @@ void MDNSComponent::setup() {
   }
 }
 
+void MDNSComponent::on_shutdown() {
+  mdns_free();
+  delay(40);  // Allow the mdns packets announcing service removal to be sent
+}
+
 }  // namespace mdns
 }  // namespace esphome
 
-#endif
+#endif  // USE_ESP32
diff --git a/esphome/components/mdns/mdns_esp32_arduino.cpp b/esphome/components/mdns/mdns_esp32_arduino.cpp
deleted file mode 100644
index 6a66beef92..0000000000
--- a/esphome/components/mdns/mdns_esp32_arduino.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifdef USE_ESP32_FRAMEWORK_ARDUINO
-
-#include "mdns_component.h"
-#include "esphome/core/log.h"
-#include <ESPmDNS.h>
-
-namespace esphome {
-namespace mdns {
-
-void MDNSComponent::setup() {
-  this->compile_records_();
-
-  MDNS.begin(this->hostname_.c_str());
-
-  for (const auto &service : this->services_) {
-    MDNS.addService(service.service_type.c_str(), service.proto.c_str(), service.port);
-    for (const auto &record : service.txt_records) {
-      MDNS.addServiceTxt(service.service_type.c_str(), service.proto.c_str(), record.key.c_str(), record.value.c_str());
-    }
-  }
-}
-
-}  // namespace mdns
-}  // namespace esphome
-
-#endif  // USE_ESP32_FRAMEWORK_ARDUINO
diff --git a/esphome/components/mdns/mdns_esp8266.cpp b/esphome/components/mdns/mdns_esp8266.cpp
index b91f60cb6b..4ccfe42baa 100644
--- a/esphome/components/mdns/mdns_esp8266.cpp
+++ b/esphome/components/mdns/mdns_esp8266.cpp
@@ -1,10 +1,11 @@
 #if defined(USE_ESP8266) && defined(USE_ARDUINO)
 
-#include "mdns_component.h"
-#include "esphome/core/log.h"
+#include <ESP8266mDNS.h>
 #include "esphome/components/network/ip_address.h"
 #include "esphome/components/network/util.h"
-#include <ESP8266mDNS.h>
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+#include "mdns_component.h"
 
 namespace esphome {
 namespace mdns {
@@ -37,6 +38,11 @@ void MDNSComponent::setup() {
 
 void MDNSComponent::loop() { MDNS.update(); }
 
+void MDNSComponent::on_shutdown() {
+  MDNS.close();
+  delay(10);
+}
+
 }  // namespace mdns
 }  // namespace esphome
 
diff --git a/esphome/components/mdns/mdns_rp2040.cpp b/esphome/components/mdns/mdns_rp2040.cpp
index e443a78c48..b30a3a4ee7 100644
--- a/esphome/components/mdns/mdns_rp2040.cpp
+++ b/esphome/components/mdns/mdns_rp2040.cpp
@@ -38,6 +38,11 @@ void MDNSComponent::setup() {
 
 void MDNSComponent::loop() { MDNS.update(); }
 
+void MDNSComponent::on_shutdown() {
+  MDNS.close();
+  delay(40);
+}
+
 }  // namespace mdns
 }  // namespace esphome
 
diff --git a/esphome/zeroconf.py b/esphome/zeroconf.py
index 1ba8397e14..b0dddfd152 100644
--- a/esphome/zeroconf.py
+++ b/esphome/zeroconf.py
@@ -157,6 +157,11 @@ class DashboardImportDiscovery:
             return
         if state_change == ServiceStateChange.Removed:
             self.import_state.pop(name, None)
+            return
+
+        if state_change == ServiceStateChange.Updated and name not in self.import_state:
+            # Ignore updates for devices that are not in the import state
+            return
 
         info = zeroconf.get_service_info(service_type, name)
         _LOGGER.debug("-> resolved info: %s", info)

From a9dc491a5449232910ba2388e268a8664bc6a29e Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Feb 2023 10:25:57 +1300
Subject: [PATCH 526/838] Dont keep logging on improv start (#4401)

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

diff --git a/esphome/components/esp32_improv/esp32_improv_component.cpp b/esphome/components/esp32_improv/esp32_improv_component.cpp
index 5ff4b0827d..85013c006b 100644
--- a/esphome/components/esp32_improv/esp32_improv_component.cpp
+++ b/esphome/components/esp32_improv/esp32_improv_component.cpp
@@ -195,7 +195,7 @@ void ESP32ImprovComponent::send_response_(std::vector<uint8_t> &response) {
 }
 
 void ESP32ImprovComponent::start() {
-  if (this->state_ != improv::STATE_STOPPED)
+  if (this->should_start_ || this->state_ != improv::STATE_STOPPED)
     return;
 
   ESP_LOGD(TAG, "Setting Improv to start");

From e460792c43dadee8d225cc70e317e92934fe5bc8 Mon Sep 17 00:00:00 2001
From: Bob Perciaccante <Bob@perciaccante.net>
Date: Wed, 8 Feb 2023 17:07:41 -0500
Subject: [PATCH 527/838] Add support for Lippert LP sensors in
 mopeka_pro_check component (#4118)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
fixes https://github.com/esphome/feature-requests/issues/1988
---
 esphome/components/mopeka_pro_check/mopeka_pro_check.cpp | 1 +
 esphome/components/mopeka_pro_check/mopeka_pro_check.h   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/esphome/components/mopeka_pro_check/mopeka_pro_check.cpp b/esphome/components/mopeka_pro_check/mopeka_pro_check.cpp
index fc57318a81..60592b00ad 100644
--- a/esphome/components/mopeka_pro_check/mopeka_pro_check.cpp
+++ b/esphome/components/mopeka_pro_check/mopeka_pro_check.cpp
@@ -53,6 +53,7 @@ bool MopekaProCheck::parse_device(const esp32_ble_tracker::ESPBTDevice &device)
   // Now parse the data - See Datasheet for definition
 
   if (static_cast<SensorType>(manu_data.data[0]) != STANDARD_BOTTOM_UP &&
+      static_cast<SensorType>(manu_data.data[0]) != LIPPERT_BOTTOM_UP &&
       static_cast<SensorType>(manu_data.data[0]) != PLUS_BOTTOM_UP) {
     ESP_LOGE(TAG, "Unsupported Sensor Type (0x%X)", manu_data.data[0]);
     return false;
diff --git a/esphome/components/mopeka_pro_check/mopeka_pro_check.h b/esphome/components/mopeka_pro_check/mopeka_pro_check.h
index e6cc1fd6f1..8b126a204c 100644
--- a/esphome/components/mopeka_pro_check/mopeka_pro_check.h
+++ b/esphome/components/mopeka_pro_check/mopeka_pro_check.h
@@ -15,6 +15,7 @@ enum SensorType {
   STANDARD_BOTTOM_UP = 0x03,
   TOP_DOWN_AIR_ABOVE = 0x04,
   BOTTOM_UP_WATER = 0x05,
+  LIPPERT_BOTTOM_UP = 0x06,
   PLUS_BOTTOM_UP = 0x08
   // all other values are reserved
 };

From dfafc41ce618d7378fdba0ba66bd8d867e6d96ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Mur=C3=A9?= <batolettre@gmail.com>
Date: Wed, 8 Feb 2023 23:28:16 +0100
Subject: [PATCH 528/838] climate: add support for quiet fan mode (#3609)

---
 esphome/components/api/api.proto                  |  1 +
 esphome/components/api/api_pb2.cpp                |  2 ++
 esphome/components/api/api_pb2.h                  |  1 +
 esphome/components/climate/__init__.py            |  1 +
 esphome/components/climate/climate.cpp            |  2 ++
 esphome/components/climate/climate_mode.cpp       |  2 ++
 esphome/components/climate/climate_mode.h         |  2 ++
 esphome/components/climate/climate_traits.h       |  2 +-
 esphome/components/demo/demo_climate.h            |  1 +
 esphome/components/mqtt/mqtt_climate.cpp          |  5 +++++
 esphome/components/thermostat/climate.py          | 14 +++++++++++++-
 .../components/thermostat/thermostat_climate.cpp  | 15 ++++++++++++++-
 .../components/thermostat/thermostat_climate.h    |  6 ++++++
 esphome/const.py                                  |  1 +
 tests/test3.yaml                                  | 10 ++++++----
 15 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 013bb123f9..ffb3bcb07e 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -787,6 +787,7 @@ enum ClimateFanMode {
   CLIMATE_FAN_MIDDLE = 6;
   CLIMATE_FAN_FOCUS = 7;
   CLIMATE_FAN_DIFFUSE = 8;
+  CLIMATE_FAN_QUIET = 9;
 }
 enum ClimateSwingMode {
   CLIMATE_SWING_OFF = 0;
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 67c011e76c..9df05d2978 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -235,6 +235,8 @@ template<> const char *proto_enum_to_string<enums::ClimateFanMode>(enums::Climat
       return "CLIMATE_FAN_FOCUS";
     case enums::CLIMATE_FAN_DIFFUSE:
       return "CLIMATE_FAN_DIFFUSE";
+    case enums::CLIMATE_FAN_QUIET:
+      return "CLIMATE_FAN_QUIET";
     default:
       return "UNKNOWN";
   }
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 3b804f1de7..2db1c6fafa 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -99,6 +99,7 @@ enum ClimateFanMode : uint32_t {
   CLIMATE_FAN_MIDDLE = 6,
   CLIMATE_FAN_FOCUS = 7,
   CLIMATE_FAN_DIFFUSE = 8,
+  CLIMATE_FAN_QUIET = 9,
 };
 enum ClimateSwingMode : uint32_t {
   CLIMATE_SWING_OFF = 0,
diff --git a/esphome/components/climate/__init__.py b/esphome/components/climate/__init__.py
index 8a3cd38444..b83b57002a 100644
--- a/esphome/components/climate/__init__.py
+++ b/esphome/components/climate/__init__.py
@@ -73,6 +73,7 @@ CLIMATE_FAN_MODES = {
     "MIDDLE": ClimateFanMode.CLIMATE_FAN_MIDDLE,
     "FOCUS": ClimateFanMode.CLIMATE_FAN_FOCUS,
     "DIFFUSE": ClimateFanMode.CLIMATE_FAN_DIFFUSE,
+    "QUIET": ClimateFanMode.CLIMATE_FAN_QUIET,
 }
 
 validate_climate_fan_mode = cv.enum(CLIMATE_FAN_MODES, upper=True)
diff --git a/esphome/components/climate/climate.cpp b/esphome/components/climate/climate.cpp
index 512dbdd6dd..e1611d2fa9 100644
--- a/esphome/components/climate/climate.cpp
+++ b/esphome/components/climate/climate.cpp
@@ -174,6 +174,8 @@ ClimateCall &ClimateCall::set_fan_mode(const std::string &fan_mode) {
     this->set_fan_mode(CLIMATE_FAN_FOCUS);
   } else if (str_equals_case_insensitive(fan_mode, "DIFFUSE")) {
     this->set_fan_mode(CLIMATE_FAN_DIFFUSE);
+  } else if (str_equals_case_insensitive(fan_mode, "QUIET")) {
+    this->set_fan_mode(CLIMATE_FAN_QUIET);
   } else {
     if (this->parent_->get_traits().supports_custom_fan_mode(fan_mode)) {
       this->custom_fan_mode_ = fan_mode;
diff --git a/esphome/components/climate/climate_mode.cpp b/esphome/components/climate/climate_mode.cpp
index e46159a750..794f45ccd6 100644
--- a/esphome/components/climate/climate_mode.cpp
+++ b/esphome/components/climate/climate_mode.cpp
@@ -62,6 +62,8 @@ const LogString *climate_fan_mode_to_string(ClimateFanMode fan_mode) {
       return LOG_STR("FOCUS");
     case climate::CLIMATE_FAN_DIFFUSE:
       return LOG_STR("DIFFUSE");
+    case climate::CLIMATE_FAN_QUIET:
+      return LOG_STR("QUIET");
     default:
       return LOG_STR("UNKNOWN");
   }
diff --git a/esphome/components/climate/climate_mode.h b/esphome/components/climate/climate_mode.h
index 139400a08a..c5245812c7 100644
--- a/esphome/components/climate/climate_mode.h
+++ b/esphome/components/climate/climate_mode.h
@@ -62,6 +62,8 @@ enum ClimateFanMode : uint8_t {
   CLIMATE_FAN_FOCUS = 7,
   /// The fan mode is set to Diffuse
   CLIMATE_FAN_DIFFUSE = 8,
+  /// The fan mode is set to Quiet
+  CLIMATE_FAN_QUIET = 9,
 };
 
 /// Enum for all modes a climate swing can be in
diff --git a/esphome/components/climate/climate_traits.h b/esphome/components/climate/climate_traits.h
index 3ec51bc3c2..9da9bb7374 100644
--- a/esphome/components/climate/climate_traits.h
+++ b/esphome/components/climate/climate_traits.h
@@ -28,7 +28,7 @@ namespace climate {
  *  - supports action - if the climate device supports reporting the active
  *    current action of the device with the action property.
  *  - supports fan modes - optionally, if it has a fan which can be configured in different ways:
- *    - on, off, auto, high, medium, low, middle, focus, diffuse
+ *    - on, off, auto, high, medium, low, middle, focus, diffuse, quiet
  *  - supports swing modes - optionally, if it has a swing which can be configured in different ways:
  *    - off, both, vertical, horizontal
  *
diff --git a/esphome/components/demo/demo_climate.h b/esphome/components/demo/demo_climate.h
index 0cf48dd4ee..1ba80aabf5 100644
--- a/esphome/components/demo/demo_climate.h
+++ b/esphome/components/demo/demo_climate.h
@@ -111,6 +111,7 @@ class DemoClimate : public climate::Climate, public Component {
             climate::CLIMATE_FAN_MIDDLE,
             climate::CLIMATE_FAN_FOCUS,
             climate::CLIMATE_FAN_DIFFUSE,
+            climate::CLIMATE_FAN_QUIET,
         });
         traits.set_supported_custom_fan_modes({"Auto Low", "Auto High"});
         traits.set_supported_swing_modes({
diff --git a/esphome/components/mqtt/mqtt_climate.cpp b/esphome/components/mqtt/mqtt_climate.cpp
index 7c3c414b3a..349c185fcc 100644
--- a/esphome/components/mqtt/mqtt_climate.cpp
+++ b/esphome/components/mqtt/mqtt_climate.cpp
@@ -102,6 +102,8 @@ void MQTTClimateComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryCo
       fan_modes.add("focus");
     if (traits.supports_fan_mode(CLIMATE_FAN_DIFFUSE))
       fan_modes.add("diffuse");
+    if (traits.supports_fan_mode(CLIMATE_FAN_QUIET))
+      fan_modes.add("quiet");
     for (const auto &fan_mode : traits.get_supported_custom_fan_modes())
       fan_modes.add(fan_mode);
   }
@@ -328,6 +330,9 @@ bool MQTTClimateComponent::publish_state_() {
         case CLIMATE_FAN_DIFFUSE:
           payload = "diffuse";
           break;
+        case CLIMATE_FAN_QUIET:
+          payload = "quiet";
+          break;
       }
     }
     if (this->device_->custom_fan_mode.has_value())
diff --git a/esphome/components/thermostat/climate.py b/esphome/components/thermostat/climate.py
index 8aa61dbb93..9a57f6a337 100644
--- a/esphome/components/thermostat/climate.py
+++ b/esphome/components/thermostat/climate.py
@@ -24,6 +24,7 @@ from esphome.const import (
     CONF_FAN_MODE_MIDDLE_ACTION,
     CONF_FAN_MODE_FOCUS_ACTION,
     CONF_FAN_MODE_DIFFUSE_ACTION,
+    CONF_FAN_MODE_QUIET_ACTION,
     CONF_FAN_ONLY_ACTION,
     CONF_FAN_ONLY_ACTION_USES_FAN_MODE_TIMER,
     CONF_FAN_ONLY_COOLING,
@@ -273,6 +274,7 @@ def validate_thermostat(config):
             CONF_FAN_MODE_MIDDLE_ACTION,
             CONF_FAN_MODE_FOCUS_ACTION,
             CONF_FAN_MODE_DIFFUSE_ACTION,
+            CONF_FAN_MODE_QUIET_ACTION,
         ],
     }
     for req_config_item, config_triggers in requirements.items():
@@ -413,6 +415,7 @@ def validate_thermostat(config):
             "MIDDLE": [CONF_FAN_MODE_MIDDLE_ACTION],
             "FOCUS": [CONF_FAN_MODE_FOCUS_ACTION],
             "DIFFUSE": [CONF_FAN_MODE_DIFFUSE_ACTION],
+            "QUIET": [CONF_FAN_MODE_QUIET_ACTION],
         }
 
         for preset_config in config[CONF_PRESET]:
@@ -500,12 +503,13 @@ def validate_thermostat(config):
             CONF_FAN_MODE_MIDDLE_ACTION,
             CONF_FAN_MODE_FOCUS_ACTION,
             CONF_FAN_MODE_DIFFUSE_ACTION,
+            CONF_FAN_MODE_QUIET_ACTION,
         ]
         for config_req_action in requirements:
             if config_req_action in config:
                 return config
         raise cv.Invalid(
-            f"At least one of {CONF_FAN_MODE_ON_ACTION}, {CONF_FAN_MODE_OFF_ACTION}, {CONF_FAN_MODE_AUTO_ACTION}, {CONF_FAN_MODE_LOW_ACTION}, {CONF_FAN_MODE_MEDIUM_ACTION}, {CONF_FAN_MODE_HIGH_ACTION}, {CONF_FAN_MODE_MIDDLE_ACTION}, {CONF_FAN_MODE_FOCUS_ACTION}, {CONF_FAN_MODE_DIFFUSE_ACTION} must be defined to use {CONF_MIN_FAN_MODE_SWITCHING_TIME}"
+            f"At least one of {CONF_FAN_MODE_ON_ACTION}, {CONF_FAN_MODE_OFF_ACTION}, {CONF_FAN_MODE_AUTO_ACTION}, {CONF_FAN_MODE_LOW_ACTION}, {CONF_FAN_MODE_MEDIUM_ACTION}, {CONF_FAN_MODE_HIGH_ACTION}, {CONF_FAN_MODE_MIDDLE_ACTION}, {CONF_FAN_MODE_FOCUS_ACTION}, {CONF_FAN_MODE_DIFFUSE_ACTION}, {CONF_FAN_MODE_QUIET_ACTION} must be defined to use {CONF_MIN_FAN_MODE_SWITCHING_TIME}"
         )
     return config
 
@@ -563,6 +567,9 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_FAN_MODE_DIFFUSE_ACTION): automation.validate_automation(
                 single=True
             ),
+            cv.Optional(CONF_FAN_MODE_QUIET_ACTION): automation.validate_automation(
+                single=True
+            ),
             cv.Optional(CONF_SWING_BOTH_ACTION): automation.validate_automation(
                 single=True
             ),
@@ -836,6 +843,11 @@ async def to_code(config):
             var.get_fan_mode_diffuse_trigger(), [], config[CONF_FAN_MODE_DIFFUSE_ACTION]
         )
         cg.add(var.set_supports_fan_mode_diffuse(True))
+    if CONF_FAN_MODE_QUIET_ACTION in config:
+        await automation.build_automation(
+            var.get_fan_mode_quiet_trigger(), [], config[CONF_FAN_MODE_QUIET_ACTION]
+        )
+        cg.add(var.set_supports_fan_mode_quiet(True))
     if CONF_SWING_BOTH_ACTION in config:
         await automation.build_automation(
             var.get_swing_mode_both_trigger(), [], config[CONF_SWING_BOTH_ACTION]
diff --git a/esphome/components/thermostat/thermostat_climate.cpp b/esphome/components/thermostat/thermostat_climate.cpp
index 1fbbbe022c..51da663a0c 100644
--- a/esphome/components/thermostat/thermostat_climate.cpp
+++ b/esphome/components/thermostat/thermostat_climate.cpp
@@ -247,6 +247,8 @@ climate::ClimateTraits ThermostatClimate::traits() {
     traits.add_supported_fan_mode(climate::CLIMATE_FAN_FOCUS);
   if (supports_fan_mode_diffuse_)
     traits.add_supported_fan_mode(climate::CLIMATE_FAN_DIFFUSE);
+  if (supports_fan_mode_quiet_)
+    traits.add_supported_fan_mode(climate::CLIMATE_FAN_QUIET);
 
   if (supports_swing_mode_both_)
     traits.add_supported_swing_mode(climate::CLIMATE_SWING_BOTH);
@@ -594,6 +596,10 @@ void ThermostatClimate::switch_to_fan_mode_(climate::ClimateFanMode fan_mode, bo
         trig = this->fan_mode_diffuse_trigger_;
         ESP_LOGVV(TAG, "Switching to FAN_DIFFUSE mode");
         break;
+      case climate::CLIMATE_FAN_QUIET:
+        trig = this->fan_mode_quiet_trigger_;
+        ESP_LOGVV(TAG, "Switching to FAN_QUIET mode");
+        break;
       default:
         // we cannot report an invalid mode back to HA (even if it asked for one)
         //  and must assume some valid value
@@ -1093,6 +1099,7 @@ ThermostatClimate::ThermostatClimate()
       fan_mode_middle_trigger_(new Trigger<>()),
       fan_mode_focus_trigger_(new Trigger<>()),
       fan_mode_diffuse_trigger_(new Trigger<>()),
+      fan_mode_quiet_trigger_(new Trigger<>()),
       swing_mode_both_trigger_(new Trigger<>()),
       swing_mode_off_trigger_(new Trigger<>()),
       swing_mode_horizontal_trigger_(new Trigger<>()),
@@ -1208,6 +1215,9 @@ void ThermostatClimate::set_supports_fan_mode_focus(bool supports_fan_mode_focus
 void ThermostatClimate::set_supports_fan_mode_diffuse(bool supports_fan_mode_diffuse) {
   this->supports_fan_mode_diffuse_ = supports_fan_mode_diffuse;
 }
+void ThermostatClimate::set_supports_fan_mode_quiet(bool supports_fan_mode_quiet) {
+  this->supports_fan_mode_quiet_ = supports_fan_mode_quiet;
+}
 void ThermostatClimate::set_supports_swing_mode_both(bool supports_swing_mode_both) {
   this->supports_swing_mode_both_ = supports_swing_mode_both;
 }
@@ -1250,6 +1260,7 @@ Trigger<> *ThermostatClimate::get_fan_mode_high_trigger() const { return this->f
 Trigger<> *ThermostatClimate::get_fan_mode_middle_trigger() const { return this->fan_mode_middle_trigger_; }
 Trigger<> *ThermostatClimate::get_fan_mode_focus_trigger() const { return this->fan_mode_focus_trigger_; }
 Trigger<> *ThermostatClimate::get_fan_mode_diffuse_trigger() const { return this->fan_mode_diffuse_trigger_; }
+Trigger<> *ThermostatClimate::get_fan_mode_quiet_trigger() const { return this->fan_mode_quiet_trigger_; }
 Trigger<> *ThermostatClimate::get_swing_mode_both_trigger() const { return this->swing_mode_both_trigger_; }
 Trigger<> *ThermostatClimate::get_swing_mode_off_trigger() const { return this->swing_mode_off_trigger_; }
 Trigger<> *ThermostatClimate::get_swing_mode_horizontal_trigger() const { return this->swing_mode_horizontal_trigger_; }
@@ -1294,7 +1305,8 @@ void ThermostatClimate::dump_config() {
   }
   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_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",
                   this->timer_duration_(thermostat::TIMER_FAN_MODE) / 1000);
   }
@@ -1323,6 +1335,7 @@ void ThermostatClimate::dump_config() {
   ESP_LOGCONFIG(TAG, "  Supports FAN MODE MIDDLE: %s", YESNO(this->supports_fan_mode_middle_));
   ESP_LOGCONFIG(TAG, "  Supports FAN MODE FOCUS: %s", YESNO(this->supports_fan_mode_focus_));
   ESP_LOGCONFIG(TAG, "  Supports FAN MODE DIFFUSE: %s", YESNO(this->supports_fan_mode_diffuse_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE QUIET: %s", YESNO(this->supports_fan_mode_quiet_));
   ESP_LOGCONFIG(TAG, "  Supports SWING MODE BOTH: %s", YESNO(this->supports_swing_mode_both_));
   ESP_LOGCONFIG(TAG, "  Supports SWING MODE OFF: %s", YESNO(this->supports_swing_mode_off_));
   ESP_LOGCONFIG(TAG, "  Supports SWING MODE HORIZONTAL: %s", YESNO(this->supports_swing_mode_horizontal_));
diff --git a/esphome/components/thermostat/thermostat_climate.h b/esphome/components/thermostat/thermostat_climate.h
index 124f95de33..677b4ad324 100644
--- a/esphome/components/thermostat/thermostat_climate.h
+++ b/esphome/components/thermostat/thermostat_climate.h
@@ -101,6 +101,7 @@ class ThermostatClimate : public climate::Climate, public Component {
   void set_supports_fan_mode_middle(bool supports_fan_mode_middle);
   void set_supports_fan_mode_focus(bool supports_fan_mode_focus);
   void set_supports_fan_mode_diffuse(bool supports_fan_mode_diffuse);
+  void set_supports_fan_mode_quiet(bool supports_fan_mode_quiet);
   void set_supports_swing_mode_both(bool supports_swing_mode_both);
   void set_supports_swing_mode_horizontal(bool supports_swing_mode_horizontal);
   void set_supports_swing_mode_off(bool supports_swing_mode_off);
@@ -132,6 +133,7 @@ class ThermostatClimate : public climate::Climate, public Component {
   Trigger<> *get_fan_mode_middle_trigger() const;
   Trigger<> *get_fan_mode_focus_trigger() const;
   Trigger<> *get_fan_mode_diffuse_trigger() const;
+  Trigger<> *get_fan_mode_quiet_trigger() const;
   Trigger<> *get_swing_mode_both_trigger() const;
   Trigger<> *get_swing_mode_horizontal_trigger() const;
   Trigger<> *get_swing_mode_off_trigger() const;
@@ -277,6 +279,7 @@ class ThermostatClimate : public climate::Climate, public Component {
   bool supports_fan_mode_middle_{false};
   bool supports_fan_mode_focus_{false};
   bool supports_fan_mode_diffuse_{false};
+  bool supports_fan_mode_quiet_{false};
 
   /// Whether the controller supports various swing modes.
   ///
@@ -372,6 +375,9 @@ class ThermostatClimate : public climate::Climate, public Component {
   /// The trigger to call when the controller should switch the fan to "diffuse" position.
   Trigger<> *fan_mode_diffuse_trigger_{nullptr};
 
+  /// The trigger to call when the controller should switch the fan to "quiet" position.
+  Trigger<> *fan_mode_quiet_trigger_{nullptr};
+
   /// The trigger to call when the controller should switch the swing mode to "both".
   Trigger<> *swing_mode_both_trigger_{nullptr};
 
diff --git a/esphome/const.py b/esphome/const.py
index dde5e9016a..802f4fd000 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -237,6 +237,7 @@ CONF_FAN_MODE_MEDIUM_ACTION = "fan_mode_medium_action"
 CONF_FAN_MODE_MIDDLE_ACTION = "fan_mode_middle_action"
 CONF_FAN_MODE_OFF_ACTION = "fan_mode_off_action"
 CONF_FAN_MODE_ON_ACTION = "fan_mode_on_action"
+CONF_FAN_MODE_QUIET_ACTION = "fan_mode_quiet_action"
 CONF_FAN_MODE_STATE_TOPIC = "fan_mode_state_topic"
 CONF_FAN_ONLY_ACTION = "fan_only_action"
 CONF_FAN_ONLY_ACTION_USES_FAN_MODE_TIMER = "fan_only_action_uses_fan_mode_timer"
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 6578def72d..4827b7cbcd 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -1136,14 +1136,16 @@ climate:
       - switch.turn_on: gpio_switch1
     fan_mode_diffuse_action:
       - switch.turn_on: gpio_switch2
+    fan_mode_quiet_action:
+      - switch.turn_on: gpio_switch1
     swing_off_action:
-      - switch.turn_on: gpio_switch1
+      - switch.turn_on: gpio_switch2
     swing_horizontal_action:
-      - switch.turn_on: gpio_switch2
-    swing_vertical_action:
       - switch.turn_on: gpio_switch1
-    swing_both_action:
+    swing_vertical_action:
       - switch.turn_on: gpio_switch2
+    swing_both_action:
+      - switch.turn_on: gpio_switch1
     startup_delay: true
     supplemental_cooling_delta: 2.0
     cool_deadband: 0.5

From 7e1e799b3ad43c7c2b8e0d3f219e40f046fc6552 Mon Sep 17 00:00:00 2001
From: jmichiel <194387+jmichiel@users.noreply.github.com>
Date: Thu, 9 Feb 2023 00:46:01 +0100
Subject: [PATCH 529/838] add MQTT preset support for Climate components
 (#4379)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Co-authored-by: Michiel, Jeroen <jeroen.michiel@teledyneflir.com>
---
 esphome/components/climate/__init__.py   | 15 ++++-
 esphome/components/mqtt/mqtt_climate.cpp | 80 ++++++++++++++++++++++--
 esphome/components/mqtt/mqtt_climate.h   |  2 +
 esphome/const.py                         |  2 +
 4 files changed, 92 insertions(+), 7 deletions(-)

diff --git a/esphome/components/climate/__init__.py b/esphome/components/climate/__init__.py
index b83b57002a..eaa87afcb1 100644
--- a/esphome/components/climate/__init__.py
+++ b/esphome/components/climate/__init__.py
@@ -22,6 +22,8 @@ from esphome.const import (
     CONF_MODE_STATE_TOPIC,
     CONF_ON_STATE,
     CONF_PRESET,
+    CONF_PRESET_COMMAND_TOPIC,
+    CONF_PRESET_STATE_TOPIC,
     CONF_SWING_MODE,
     CONF_SWING_MODE_COMMAND_TOPIC,
     CONF_SWING_MODE_STATE_TOPIC,
@@ -143,6 +145,12 @@ CLIMATE_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).
         cv.Optional(CONF_MODE_STATE_TOPIC): cv.All(
             cv.requires_component("mqtt"), cv.publish_topic
         ),
+        cv.Optional(CONF_PRESET_COMMAND_TOPIC): cv.All(
+            cv.requires_component("mqtt"), cv.publish_topic
+        ),
+        cv.Optional(CONF_PRESET_STATE_TOPIC): cv.All(
+            cv.requires_component("mqtt"), cv.publish_topic
+        ),
         cv.Optional(CONF_SWING_MODE_COMMAND_TOPIC): cv.All(
             cv.requires_component("mqtt"), cv.publish_topic
         ),
@@ -217,7 +225,12 @@ async def setup_climate_core_(var, config):
             cg.add(mqtt_.set_custom_mode_command_topic(config[CONF_MODE_COMMAND_TOPIC]))
         if CONF_MODE_STATE_TOPIC in config:
             cg.add(mqtt_.set_custom_mode_state_topic(config[CONF_MODE_STATE_TOPIC]))
-
+        if CONF_PRESET_COMMAND_TOPIC in config:
+            cg.add(
+                mqtt_.set_custom_preset_command_topic(config[CONF_PRESET_COMMAND_TOPIC])
+            )
+        if CONF_PRESET_STATE_TOPIC in config:
+            cg.add(mqtt_.set_custom_preset_state_topic(config[CONF_PRESET_STATE_TOPIC]))
         if CONF_SWING_MODE_COMMAND_TOPIC in config:
             cg.add(
                 mqtt_.set_custom_swing_mode_command_topic(
diff --git a/esphome/components/mqtt/mqtt_climate.cpp b/esphome/components/mqtt/mqtt_climate.cpp
index 349c185fcc..8dd03dd5c8 100644
--- a/esphome/components/mqtt/mqtt_climate.cpp
+++ b/esphome/components/mqtt/mqtt_climate.cpp
@@ -66,18 +66,42 @@ void MQTTClimateComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryCo
   // temperature units are always coerced to Celsius internally
   root[MQTT_TEMPERATURE_UNIT] = "C";
 
-  if (traits.supports_preset(CLIMATE_PRESET_AWAY)) {
-    // away_mode_command_topic
-    root[MQTT_AWAY_MODE_COMMAND_TOPIC] = this->get_away_command_topic();
-    // away_mode_state_topic
-    root[MQTT_AWAY_MODE_STATE_TOPIC] = this->get_away_state_topic();
+  if (traits.get_supports_presets() || !traits.get_supported_custom_presets().empty()) {
+    // preset_mode_command_topic
+    root[MQTT_PRESET_MODE_COMMAND_TOPIC] = this->get_preset_command_topic();
+    // preset_mode_state_topic
+    root[MQTT_PRESET_MODE_STATE_TOPIC] = this->get_preset_state_topic();
+    // presets
+    JsonArray presets = root.createNestedArray("presets");
+    if (traits.supports_preset(CLIMATE_PRESET_HOME))
+      presets.add("home");
+    if (traits.supports_preset(CLIMATE_PRESET_AWAY)) {
+      // away_mode_command_topic
+      root[MQTT_AWAY_MODE_COMMAND_TOPIC] = this->get_away_command_topic();
+      // away_mode_state_topic
+      root[MQTT_AWAY_MODE_STATE_TOPIC] = this->get_away_state_topic();
+      presets.add("away");
+    }
+    if (traits.supports_preset(CLIMATE_PRESET_BOOST))
+      presets.add("boost");
+    if (traits.supports_preset(CLIMATE_PRESET_COMFORT))
+      presets.add("comfort");
+    if (traits.supports_preset(CLIMATE_PRESET_ECO))
+      presets.add("eco");
+    if (traits.supports_preset(CLIMATE_PRESET_SLEEP))
+      presets.add("sleep");
+    if (traits.supports_preset(CLIMATE_PRESET_ACTIVITY))
+      presets.add("activity");
+    for (const auto &preset : traits.get_supported_custom_presets())
+      presets.add(preset);
   }
+
   if (traits.get_supports_action()) {
     // action_topic
     root[MQTT_ACTION_TOPIC] = this->get_action_state_topic();
   }
 
-  if (traits.get_supports_fan_modes() || !traits.get_supported_custom_fan_modes().empty()) {
+  if (traits.get_supports_fan_modes()) {
     // fan_mode_command_topic
     root[MQTT_FAN_MODE_COMMAND_TOPIC] = this->get_fan_mode_command_topic();
     // fan_mode_state_topic
@@ -196,6 +220,14 @@ void MQTTClimateComponent::setup() {
     });
   }
 
+  if (traits.get_supports_presets() || !traits.get_supported_custom_presets().empty()) {
+    this->subscribe(this->get_preset_command_topic(), [this](const std::string &topic, const std::string &payload) {
+      auto call = this->device_->make_call();
+      call.set_preset(payload);
+      call.perform();
+    });
+  }
+
   if (traits.get_supports_fan_modes()) {
     this->subscribe(this->get_fan_mode_command_topic(), [this](const std::string &topic, const std::string &payload) {
       auto call = this->device_->make_call();
@@ -273,6 +305,42 @@ bool MQTTClimateComponent::publish_state_() {
     if (!this->publish(this->get_away_state_topic(), payload))
       success = false;
   }
+  if (traits.get_supports_presets() || !traits.get_supported_custom_presets().empty()) {
+    std::string payload;
+    if (this->device_->preset.has_value()) {
+      switch (this->device_->preset.value()) {
+        case CLIMATE_PRESET_NONE:
+          payload = "none";
+          break;
+        case CLIMATE_PRESET_HOME:
+          payload = "home";
+          break;
+        case CLIMATE_PRESET_AWAY:
+          payload = "away";
+          break;
+        case CLIMATE_PRESET_BOOST:
+          payload = "boost";
+          break;
+        case CLIMATE_PRESET_COMFORT:
+          payload = "comfort";
+          break;
+        case CLIMATE_PRESET_ECO:
+          payload = "eco";
+          break;
+        case CLIMATE_PRESET_SLEEP:
+          payload = "sleep";
+          break;
+        case CLIMATE_PRESET_ACTIVITY:
+          payload = "activity";
+          break;
+      }
+    }
+    if (this->device_->custom_preset.has_value())
+      payload = this->device_->custom_preset.value();
+    if (!this->publish(this->get_preset_state_topic(), payload))
+      success = false;
+  }
+
   if (traits.get_supports_action()) {
     const char *payload = "unknown";
     switch (this->device_->action) {
diff --git a/esphome/components/mqtt/mqtt_climate.h b/esphome/components/mqtt/mqtt_climate.h
index ea3e2ab3fa..a93070fe66 100644
--- a/esphome/components/mqtt/mqtt_climate.h
+++ b/esphome/components/mqtt/mqtt_climate.h
@@ -35,6 +35,8 @@ class MQTTClimateComponent : public mqtt::MQTTComponent {
   MQTT_COMPONENT_CUSTOM_TOPIC(fan_mode, command)
   MQTT_COMPONENT_CUSTOM_TOPIC(swing_mode, state)
   MQTT_COMPONENT_CUSTOM_TOPIC(swing_mode, command)
+  MQTT_COMPONENT_CUSTOM_TOPIC(preset, state)
+  MQTT_COMPONENT_CUSTOM_TOPIC(preset, command)
 
  protected:
   const EntityBase *get_entity() const override;
diff --git a/esphome/const.py b/esphome/const.py
index 802f4fd000..95e00bdca0 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -551,8 +551,10 @@ CONF_POWER_SAVE_MODE = "power_save_mode"
 CONF_POWER_SUPPLY = "power_supply"
 CONF_PRESET = "preset"
 CONF_PRESET_BOOST = "preset_boost"
+CONF_PRESET_COMMAND_TOPIC = "preset_command_topic"
 CONF_PRESET_ECO = "preset_eco"
 CONF_PRESET_SLEEP = "preset_sleep"
+CONF_PRESET_STATE_TOPIC = "preset_state_topic"
 CONF_PRESSURE = "pressure"
 CONF_PRIORITY = "priority"
 CONF_PROJECT = "project"

From 7810ad40d7c0b5f06cc0c65294b3be502ab5827a Mon Sep 17 00:00:00 2001
From: Eric van Blokland <8546466+Emrvb@users.noreply.github.com>
Date: Thu, 9 Feb 2023 01:22:05 +0100
Subject: [PATCH 530/838] Added CanalSat and CanalSatLD protocol support
 (#3513)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/remote_base/__init__.py    | 101 ++++++++++++++++
 .../remote_base/canalsat_protocol.cpp         | 108 ++++++++++++++++++
 .../remote_base/canalsat_protocol.h           |  78 +++++++++++++
 3 files changed, 287 insertions(+)
 create mode 100644 esphome/components/remote_base/canalsat_protocol.cpp
 create mode 100644 esphome/components/remote_base/canalsat_protocol.h

diff --git a/esphome/components/remote_base/__init__.py b/esphome/components/remote_base/__init__.py
index b979a050db..c3149ce430 100644
--- a/esphome/components/remote_base/__init__.py
+++ b/esphome/components/remote_base/__init__.py
@@ -237,6 +237,107 @@ async def build_dumpers(config):
     return dumpers
 
 
+# CanalSat
+(
+    CanalSatData,
+    CanalSatBinarySensor,
+    CanalSatTrigger,
+    CanalSatAction,
+    CanalSatDumper,
+) = declare_protocol("CanalSat")
+CANALSAT_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_DEVICE): cv.hex_uint8_t,
+        cv.Optional(CONF_ADDRESS, default=0): cv.hex_uint8_t,
+        cv.Required(CONF_COMMAND): cv.hex_uint8_t,
+    }
+)
+
+
+@register_binary_sensor("canalsat", CanalSatBinarySensor, CANALSAT_SCHEMA)
+def canalsat_binary_sensor(var, config):
+    cg.add(
+        var.set_data(
+            cg.StructInitializer(
+                CanalSatData,
+                ("device", config[CONF_DEVICE]),
+                ("address", config[CONF_ADDRESS]),
+                ("command", config[CONF_COMMAND]),
+            )
+        )
+    )
+
+
+@register_trigger("canalsat", CanalSatTrigger, CanalSatData)
+def canalsat_trigger(var, config):
+    pass
+
+
+@register_dumper("canalsat", CanalSatDumper)
+def canalsat_dumper(var, config):
+    pass
+
+
+@register_action("canalsat", CanalSatAction, CANALSAT_SCHEMA)
+async def canalsat_action(var, config, args):
+    template_ = await cg.templatable(config[CONF_DEVICE], args, cg.uint8)
+    cg.add(var.set_device(template_))
+    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_))
+
+
+(
+    CanalSatLDData,
+    CanalSatLDBinarySensor,
+    CanalSatLDTrigger,
+    CanalSatLDAction,
+    CanalSatLDDumper,
+) = declare_protocol("CanalSatLD")
+CANALSATLD_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_DEVICE): cv.hex_uint8_t,
+        cv.Optional(CONF_ADDRESS, default=0): cv.hex_uint8_t,
+        cv.Required(CONF_COMMAND): cv.hex_uint8_t,
+    }
+)
+
+
+@register_binary_sensor("canalsatld", CanalSatLDBinarySensor, CANALSAT_SCHEMA)
+def canalsatld_binary_sensor(var, config):
+    cg.add(
+        var.set_data(
+            cg.StructInitializer(
+                CanalSatLDData,
+                ("device", config[CONF_DEVICE]),
+                ("address", config[CONF_ADDRESS]),
+                ("command", config[CONF_COMMAND]),
+            )
+        )
+    )
+
+
+@register_trigger("canalsatld", CanalSatLDTrigger, CanalSatLDData)
+def canalsatld_trigger(var, config):
+    pass
+
+
+@register_dumper("canalsatld", CanalSatLDDumper)
+def canalsatld_dumper(var, config):
+    pass
+
+
+@register_action("canalsatld", CanalSatLDAction, CANALSATLD_SCHEMA)
+async def canalsatld_action(var, config, args):
+    template_ = await cg.templatable(config[CONF_DEVICE], args, cg.uint8)
+    cg.add(var.set_device(template_))
+    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_))
+
+
 # Coolix
 (
     CoolixData,
diff --git a/esphome/components/remote_base/canalsat_protocol.cpp b/esphome/components/remote_base/canalsat_protocol.cpp
new file mode 100644
index 0000000000..1ea47750fd
--- /dev/null
+++ b/esphome/components/remote_base/canalsat_protocol.cpp
@@ -0,0 +1,108 @@
+#include "canalsat_protocol.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace remote_base {
+
+static const char *const CANALSAT_TAG = "remote.canalsat";
+static const char *const CANALSATLD_TAG = "remote.canalsatld";
+
+static const uint16_t CANALSAT_FREQ = 55500;
+static const uint16_t CANALSATLD_FREQ = 56000;
+static const uint16_t CANALSAT_UNIT = 250;
+static const uint16_t CANALSATLD_UNIT = 320;
+
+CanalSatProtocol::CanalSatProtocol() {
+  this->frequency_ = CANALSAT_FREQ;
+  this->unit_ = CANALSAT_UNIT;
+  this->tag_ = CANALSAT_TAG;
+}
+
+CanalSatLDProtocol::CanalSatLDProtocol() {
+  this->frequency_ = CANALSATLD_FREQ;
+  this->unit_ = CANALSATLD_UNIT;
+  this->tag_ = CANALSATLD_TAG;
+}
+
+void CanalSatBaseProtocol::encode(RemoteTransmitData *dst, const CanalSatData &data) {
+  dst->reserve(48);
+  dst->set_carrier_frequency(this->frequency_);
+
+  uint32_t raw{
+      static_cast<uint32_t>((1 << 23) | (data.device << 16) | (data.address << 10) | (0 << 9) | (data.command << 1))};
+  bool was_high{true};
+
+  for (uint32_t mask = 0x800000; mask; mask >>= 1) {
+    if (raw & mask) {
+      if (was_high) {
+        dst->mark(this->unit_);
+      }
+      was_high = true;
+      if (raw & mask >> 1) {
+        dst->space(this->unit_);
+      } else {
+        dst->space(this->unit_ * 2);
+      }
+    } else {
+      if (!was_high) {
+        dst->space(this->unit_);
+      }
+      was_high = false;
+      if (raw & mask >> 1) {
+        dst->mark(this->unit_ * 2);
+      } else {
+        dst->mark(this->unit_);
+      }
+    }
+  }
+}
+
+optional<CanalSatData> CanalSatBaseProtocol::decode(RemoteReceiveData src) {
+  CanalSatData data{
+      .device = 0,
+      .address = 0,
+      .repeat = 0,
+      .command = 0,
+  };
+
+  // Check if initial mark and spaces match
+  if (!src.peek_mark(this->unit_) || !(src.peek_space(this->unit_, 1) || src.peek_space(this->unit_ * 2, 1))) {
+    return {};
+  }
+
+  uint8_t bit{1};
+  uint8_t offset{1};
+  uint32_t buffer{0};
+
+  while (offset < 24) {
+    buffer = buffer | (bit << (24 - offset++));
+    src.advance();
+    if (src.peek_mark(this->unit_) || src.peek_space(this->unit_)) {
+      src.advance();
+    } else if (src.peek_mark(this->unit_ * 2) || src.peek_space(this->unit_ * 2)) {
+      bit = !bit;
+    } else if (offset != 24 && bit != 1) {  // If last bit is high, final space is indistinguishable
+      return {};
+    }
+  }
+
+  data.device = (0xFF0000 & buffer) >> 16;
+  data.address = (0x00FF00 & buffer) >> 10;
+  data.repeat = (0x00FF00 & buffer) >> 9;
+  data.command = (0x0000FF & buffer) >> 1;
+
+  return data;
+}
+
+void CanalSatBaseProtocol::dump(const CanalSatData &data) {
+  if (this->tag_ == CANALSATLD_TAG) {
+    ESP_LOGD(this->tag_, "Received CanalSatLD: device=0x%02X, address=0x%02X, command=0x%02X, repeat=0x%X", data.device,
+             data.address, data.command, data.repeat);
+  } else {
+    ESP_LOGD(this->tag_, "Received CanalSat: device=0x%02X, address=0x%02X, command=0x%02X, repeat=0x%X", data.device,
+             data.address, data.command, data.repeat);
+  }
+}
+
+}  // namespace remote_base
+}  // namespace esphome
diff --git a/esphome/components/remote_base/canalsat_protocol.h b/esphome/components/remote_base/canalsat_protocol.h
new file mode 100644
index 0000000000..180989ef99
--- /dev/null
+++ b/esphome/components/remote_base/canalsat_protocol.h
@@ -0,0 +1,78 @@
+#pragma once
+
+#include "remote_base.h"
+
+namespace esphome {
+namespace remote_base {
+
+struct CanalSatData {
+  uint8_t device : 7;
+  uint8_t address : 6;
+  uint8_t repeat : 1;
+  uint8_t command : 7;
+
+  bool operator==(const CanalSatData &rhs) const {
+    return device == rhs.device && address == rhs.address && command == rhs.command;
+  }
+};
+
+struct CanalSatLDData : public CanalSatData {};
+
+class CanalSatBaseProtocol : public RemoteProtocol<CanalSatData> {
+ public:
+  void encode(RemoteTransmitData *dst, const CanalSatData &data) override;
+  optional<CanalSatData> decode(RemoteReceiveData src) override;
+  void dump(const CanalSatData &data) override;
+
+ protected:
+  uint16_t frequency_;
+  uint16_t unit_;
+  const char *tag_;
+};
+
+class CanalSatProtocol : public CanalSatBaseProtocol {
+ public:
+  CanalSatProtocol();
+};
+
+class CanalSatLDProtocol : public CanalSatBaseProtocol {
+ public:
+  CanalSatLDProtocol();
+};
+
+DECLARE_REMOTE_PROTOCOL(CanalSat)
+
+template<typename... Ts> class CanalSatAction : public RemoteTransmitterActionBase<Ts...> {
+ public:
+  TEMPLATABLE_VALUE(uint8_t, device)
+  TEMPLATABLE_VALUE(uint8_t, address)
+  TEMPLATABLE_VALUE(uint8_t, command)
+
+  void encode(RemoteTransmitData *dst, Ts... x) {
+    CanalSatData data{};
+    data.device = this->device_.value(x...);
+    data.address = this->address_.value(x...);
+    data.command = this->command_.value(x...);
+    CanalSatProtocol().encode(dst, data);
+  }
+};
+
+DECLARE_REMOTE_PROTOCOL(CanalSatLD)
+
+template<typename... Ts> class CanalSatLDAction : public RemoteTransmitterActionBase<Ts...> {
+ public:
+  TEMPLATABLE_VALUE(uint8_t, device)
+  TEMPLATABLE_VALUE(uint8_t, address)
+  TEMPLATABLE_VALUE(uint8_t, command)
+
+  void encode(RemoteTransmitData *dst, Ts... x) {
+    CanalSatData data{};
+    data.device = this->device_.value(x...);
+    data.address = this->address_.value(x...);
+    data.command = this->command_.value(x...);
+    CanalSatLDProtocol().encode(dst, data);
+  }
+};
+
+}  // namespace remote_base
+}  // namespace esphome

From d20d4947acdcabec6b9fd7351c3d093cb9c76fcc Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 8 Feb 2023 19:41:59 -0500
Subject: [PATCH 531/838] Remove unused manifest handler (#4169)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/dashboard/dashboard.py | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 1a5d9e19f4..d72be7731e 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -540,38 +540,6 @@ class DownloadBinaryRequestHandler(BaseHandler):
         self.finish()
 
 
-class ManifestRequestHandler(BaseHandler):
-    @authenticated
-    @bind_config
-    def get(self, configuration=None):
-        args = ["esphome", "idedata", settings.rel_path(configuration)]
-        rc, stdout, _ = run_system_command(*args)
-
-        if rc != 0:
-            self.send_error(404 if rc == 2 else 500)
-            return
-
-        idedata = platformio_api.IDEData(json.loads(stdout))
-
-        firmware_offset = "0x10000" if idedata.extra_flash_images else "0x0"
-        flash_images = [
-            {
-                "path": f"./download.bin?configuration={configuration}&type=firmware.bin",
-                "offset": firmware_offset,
-            }
-        ] + [
-            {
-                "path": f"./download.bin?configuration={configuration}&type={os.path.basename(image.path)}",
-                "offset": image.offset,
-            }
-            for image in idedata.extra_flash_images
-        ]
-
-        self.set_header("Content-Type", "application/json")
-        self.write(json.dumps(flash_images))
-        self.finish()
-
-
 def _list_dashboard_entries():
     files = settings.list_yaml_files()
     return [DashboardEntry(file) for file in files]
@@ -1149,7 +1117,6 @@ def make_app(debug=get_bool_env(ENV_DEV)):
             (f"{rel}info", InfoRequestHandler),
             (f"{rel}edit", EditRequestHandler),
             (f"{rel}download.bin", DownloadBinaryRequestHandler),
-            (f"{rel}manifest.json", ManifestRequestHandler),
             (f"{rel}serial-ports", SerialPortRequestHandler),
             (f"{rel}ping", PingRequestHandler),
             (f"{rel}delete", DeleteRequestHandler),

From cf3977f088178903b67c7b3c112973cbe3e70aed Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Feb 2023 13:51:24 +1300
Subject: [PATCH 532/838] Use the github-script action to call the workflow
 (#4400)

---
 .github/workflows/release.yml | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3a1a13628f..738bb5a6df 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -138,14 +138,18 @@ jobs:
     runs-on: ubuntu-latest
     needs: [deploy-docker]
     steps:
-      - env:
-          TOKEN: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
-        # yamllint disable rule:line-length
-        run: |
-          curl \
-            -u ":$TOKEN" \
-            -X POST \
-            -H "Accept: application/vnd.github.v3+json" \
-            https://api.github.com/repos/esphome/home-assistant-addon/actions/workflows/bump-version.yml/dispatches \
-            -d '{"ref":"main","inputs":{"version":"${{ github.event.release.tag_name }}","content":${{ toJSON(github.event.release.body) }}}}'
-        # yamllint enable rule:line-length
+      - name: Trigger Workflow
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
+          script: |
+            github.rest.actions.createWorkflowDispatch({
+              owner: "esphome",
+              repo: "home-assistant-addon",
+              workflow_id: "bump-version.yml",
+              ref: "main",
+              inputs: {
+                version: "${{ github.event.release.tag_name }}",
+                content: "${{ toJSON(github.event.release.body) }}"
+              }
+            })

From 2fbd33267e99786a710c3dc956e312511b973293 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 8 Feb 2023 20:00:58 -0500
Subject: [PATCH 533/838] Convert secrets constant to a tuple (#4245)

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

diff --git a/esphome/const.py b/esphome/const.py
index 95e00bdca0..0c4c5a22e8 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -12,7 +12,7 @@ TARGET_PLATFORMS = [PLATFORM_ESP32, PLATFORM_ESP8266, PLATFORM_RP2040]
 
 SOURCE_FILE_EXTENSIONS = {".cpp", ".hpp", ".h", ".c", ".tcc", ".ino"}
 HEADER_FILE_EXTENSIONS = {".h", ".hpp", ".tcc"}
-SECRETS_FILES = {"secrets.yaml", "secrets.yml"}
+SECRETS_FILES = ("secrets.yaml", "secrets.yml")
 
 
 CONF_ABOVE = "above"

From 17ea0efb089cf37d0fe03af0f5149b2cd7802412 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 8 Feb 2023 20:20:30 -0500
Subject: [PATCH 534/838] Verify rel_path output is relative (#4247)

---
 esphome/dashboard/dashboard.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index d72be7731e..0ff5362670 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -55,6 +55,7 @@ class DashboardSettings:
         self.using_password = False
         self.on_ha_addon = False
         self.cookie_secret = None
+        self.absolute_config_dir = None
 
     def parse_args(self, args):
         self.on_ha_addon = args.ha_addon
@@ -65,6 +66,7 @@ class DashboardSettings:
         if self.using_password:
             self.password_hash = password_hash(password)
         self.config_dir = args.configuration
+        self.absolute_config_dir = Path(self.config_dir).resolve()
 
     @property
     def relative_url(self):
@@ -94,7 +96,10 @@ class DashboardSettings:
         return hmac.compare_digest(self.password_hash, password_hash(password))
 
     def rel_path(self, *args):
-        return os.path.join(self.config_dir, *args)
+        joined_path = os.path.join(self.config_dir, *args)
+        # Raises ValueError if not relative to ESPHome config folder
+        Path(joined_path).resolve().relative_to(self.absolute_config_dir)
+        return joined_path
 
     def list_yaml_files(self):
         return util.list_yaml_files([self.config_dir])

From 43acc7dc2ce8e2d0c52ba2dc52b1c93a3f8b9546 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Feb 2023 15:33:02 +1300
Subject: [PATCH 535/838] Bump version to 2023.2.0b1

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

diff --git a/esphome/const.py b/esphome/const.py
index 0c4c5a22e8..cbf024c64d 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.2.0-dev"
+__version__ = "2023.2.0b1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 881cd535b9c61bffde6a183945dda139a0c3d8dc Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Feb 2023 15:33:02 +1300
Subject: [PATCH 536/838] Bump version to 2023.3.0-dev

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

diff --git a/esphome/const.py b/esphome/const.py
index 0c4c5a22e8..e5d0b0bb10 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.2.0-dev"
+__version__ = "2023.3.0-dev"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 9dd01b30bd4e3023b30b446e48eb0e844dc75f92 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Feb 2023 16:26:06 +1300
Subject: [PATCH 537/838] Bump curl version in docker (#4403)

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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 66b708f522..ddc666cf6a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -26,7 +26,7 @@ RUN \
         python3-cryptography=3.3.2-1 \
         iputils-ping=3:20210202-1 \
         git=1:2.30.2-1 \
-        curl=7.74.0-1.3+deb11u3 \
+        curl=7.74.0-1.3+deb11u5 \
         openssh-client=1:8.4p1-5+deb11u1 \
     && rm -rf \
         /tmp/* \

From bd8e470726c3633c57972b275079f4b57cd859b0 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Feb 2023 16:26:06 +1300
Subject: [PATCH 538/838] Bump curl version in docker (#4403)

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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 66b708f522..ddc666cf6a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -26,7 +26,7 @@ RUN \
         python3-cryptography=3.3.2-1 \
         iputils-ping=3:20210202-1 \
         git=1:2.30.2-1 \
-        curl=7.74.0-1.3+deb11u3 \
+        curl=7.74.0-1.3+deb11u5 \
         openssh-client=1:8.4p1-5+deb11u1 \
     && rm -rf \
         /tmp/* \

From ecde4c1d2d2bfd9be97c15573686e9448ae0b6a9 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Feb 2023 16:27:25 +1300
Subject: [PATCH 539/838] Bump version to 2023.2.0b2

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

diff --git a/esphome/const.py b/esphome/const.py
index cbf024c64d..e65b4adc92 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.2.0b1"
+__version__ = "2023.2.0b2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 4d192c7387028c0e9989bf5e8f726d0d42a08862 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Feb 2023 17:37:55 +1300
Subject: [PATCH 540/838] Fix release workflow (#4405)

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 738bb5a6df..3904834dc9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -150,6 +150,6 @@ jobs:
               ref: "main",
               inputs: {
                 version: "${{ github.event.release.tag_name }}",
-                content: "${{ toJSON(github.event.release.body) }}"
+                content: ${{ toJSON(github.event.release.body) }}
               }
             })

From 68683e3a50a608447cd7cf1cbbf1c629aab04ac7 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Feb 2023 17:37:55 +1300
Subject: [PATCH 541/838] Fix release workflow (#4405)

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 738bb5a6df..3904834dc9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -150,6 +150,6 @@ jobs:
               ref: "main",
               inputs: {
                 version: "${{ github.event.release.tag_name }}",
-                content: "${{ toJSON(github.event.release.body) }}"
+                content: ${{ toJSON(github.event.release.body) }}
               }
             })

From 9b57e1ac1d9632dd4a8d60c3353bb07916efb98f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Feb 2023 17:38:54 +1300
Subject: [PATCH 542/838] Bump version to 2023.2.0b3

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

diff --git a/esphome/const.py b/esphome/const.py
index e65b4adc92..ebadf84dc7 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.2.0b2"
+__version__ = "2023.2.0b3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 499cb615f10a7ed2ce814791b6e57206d9c87e2e Mon Sep 17 00:00:00 2001
From: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Date: Thu, 9 Feb 2023 06:17:45 +0100
Subject: [PATCH 543/838] socket: Format IPv4-mapped IPv6 addresses as regular
 IPv4 address (#4382)

---
 esphome/components/socket/bsd_sockets_impl.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/esphome/components/socket/bsd_sockets_impl.cpp b/esphome/components/socket/bsd_sockets_impl.cpp
index 6636bcb3eb..b21341e4d6 100644
--- a/esphome/components/socket/bsd_sockets_impl.cpp
+++ b/esphome/components/socket/bsd_sockets_impl.cpp
@@ -18,17 +18,19 @@ std::string format_sockaddr(const struct sockaddr_storage &storage) {
   if (storage.ss_family == AF_INET) {
     const struct sockaddr_in *addr = reinterpret_cast<const struct sockaddr_in *>(&storage);
     char buf[INET_ADDRSTRLEN];
-    const char *ret = inet_ntop(AF_INET, &addr->sin_addr, buf, sizeof(buf));
-    if (ret == nullptr)
-      return {};
-    return std::string{buf};
+    if (inet_ntop(AF_INET, &addr->sin_addr, buf, sizeof(buf)) != nullptr)
+      return std::string{buf};
   } else if (storage.ss_family == AF_INET6) {
     const struct sockaddr_in6 *addr = reinterpret_cast<const struct sockaddr_in6 *>(&storage);
     char buf[INET6_ADDRSTRLEN];
-    const char *ret = inet_ntop(AF_INET6, &addr->sin6_addr, buf, sizeof(buf));
-    if (ret == nullptr)
-      return {};
-    return std::string{buf};
+    // Format IPv4-mapped IPv6 addresses as regular IPv4 addresses
+    if (addr->sin6_addr.un.u32_addr[0] == 0 && addr->sin6_addr.un.u32_addr[1] == 0 &&
+        addr->sin6_addr.un.u32_addr[2] == htonl(0xFFFF) &&
+        inet_ntop(AF_INET, &addr->sin6_addr.un.u32_addr[3], buf, sizeof(buf)) != nullptr) {
+      return std::string{buf};
+    }
+    if (inet_ntop(AF_INET6, &addr->sin6_addr, buf, sizeof(buf)) != nullptr)
+      return std::string{buf};
   }
   return {};
 }

From 2a8745d7e0b524ef22b34a75c7e559aee3ad02c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Feb 2023 18:27:30 +1300
Subject: [PATCH 544/838] Bump frenck/action-yamllint from 1.3.1 to 1.4.0
 (#4289)

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c32dc11b61..c28c8c485c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -181,7 +181,7 @@ jobs:
 
       - name: Run yamllint
         if: matrix.id == 'yamllint'
-        uses: frenck/action-yamllint@v1.3.1
+        uses: frenck/action-yamllint@v1.4.0
 
       - name: Suggested changes
         run: script/ci-suggest-changes

From b14e774a27a01084647a39357a24cd347df53029 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Feb 2023 18:27:58 +1300
Subject: [PATCH 545/838] Bump pyupgrade from 3.3.0 to 3.3.1 (#4160)

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 e5ae80da3b..7a954af4a6 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.3.0
+    rev: v3.3.1
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
diff --git a/requirements_test.txt b/requirements_test.txt
index 8404818c95..6f03f005d5 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,7 +1,7 @@
 pylint==2.15.10
 flake8==6.0.0  # also change in .pre-commit-config.yaml when updating
 black==22.12.0  # also change in .pre-commit-config.yaml when updating
-pyupgrade==3.3.0  # also change in .pre-commit-config.yaml when updating
+pyupgrade==3.3.1  # also change in .pre-commit-config.yaml when updating
 pre-commit
 
 # Unit tests

From 045489e6d7c9b772509feda0f962be35d7b766b2 Mon Sep 17 00:00:00 2001
From: Patrick Collins <pcollins1@gmail.com>
Date: Thu, 9 Feb 2023 20:37:31 +1100
Subject: [PATCH 546/838] Climate PID Autotune Logging fixes (#4136)

* pid autotune logging fixes

* fixed clang-format request

* improved and clarified logging

* changed logging not to alter the TAG

* logging now does not alter TAG. fixed clang formattting

* fixed string issues

* playing with strings to please the clang gods

* playing with strings

* Delete secrets.yaml

* Delete console-fan-autotune-test.yaml

* Update esphome/components/pid/pid_autotuner.cpp

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/pid/pid_autotuner.cpp

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/pid/pid_autotuner.cpp

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/pid/pid_autotuner.cpp

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/pid/pid_autotuner.cpp

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/pid/pid_autotuner.cpp | 28 +++++++++++++-----------
 esphome/components/pid/pid_autotuner.h   |  3 +++
 esphome/components/pid/pid_climate.cpp   | 17 +++++++++++---
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/esphome/components/pid/pid_autotuner.cpp b/esphome/components/pid/pid_autotuner.cpp
index fc012aaa39..1b3ddebcc5 100644
--- a/esphome/components/pid/pid_autotuner.cpp
+++ b/esphome/components/pid/pid_autotuner.cpp
@@ -1,6 +1,10 @@
 #include "pid_autotuner.h"
 #include "esphome/core/log.h"
 
+#ifndef M_PI
+#define M_PI 3.1415926535897932384626433
+#endif
+
 namespace esphome {
 namespace pid {
 
@@ -73,7 +77,7 @@ PIDAutotuner::PIDAutotuneResult PIDAutotuner::update(float setpoint, float proce
   }
 
   if (!std::isnan(this->setpoint_) && this->setpoint_ != setpoint) {
-    ESP_LOGW(TAG, "Setpoint changed during autotune! The result will not be accurate!");
+    ESP_LOGW(TAG, "%s: Setpoint changed during autotune! The result will not be accurate!", this->id_.c_str());
   }
   this->setpoint_ = setpoint;
 
@@ -87,7 +91,7 @@ PIDAutotuner::PIDAutotuneResult PIDAutotuner::update(float setpoint, float proce
 
   if (!this->frequency_detector_.has_enough_data() || !this->amplitude_detector_.has_enough_data()) {
     // not enough data for calculation yet
-    ESP_LOGV(TAG, "  Not enough data yet for aututuner");
+    ESP_LOGV(TAG, "%s:   Not enough data yet for autotuner", this->id_.c_str());
     return res;
   }
 
@@ -97,12 +101,13 @@ PIDAutotuner::PIDAutotuneResult PIDAutotuner::update(float setpoint, float proce
     // The frequency/amplitude is not fully accurate yet, try to wait
     // until the fault clears, or terminate after a while anyway
     if (zc_symmetrical) {
-      ESP_LOGVV(TAG, "  ZC is not symmetrical");
+      ESP_LOGVV(TAG, "%s:   ZC is not symmetrical", this->id_.c_str());
     }
     if (amplitude_convergent) {
-      ESP_LOGVV(TAG, "  Amplitude is not convergent");
+      ESP_LOGVV(TAG, "%s:   Amplitude is not convergent", this->id_.c_str());
     }
     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_);
 
     if (this->enough_data_phase_ == 0) {
@@ -116,7 +121,7 @@ PIDAutotuner::PIDAutotuneResult PIDAutotuner::update(float setpoint, float proce
     }
   }
 
-  ESP_LOGI(TAG, "PID Autotune finished!");
+  ESP_LOGI(TAG, "%s: PID Autotune finished!", this->id_.c_str());
 
   float osc_ampl = this->amplitude_detector_.get_mean_oscillation_amplitude();
   float d = (this->relay_function_.output_positive - this->relay_function_.output_negative) / 2.0f;
@@ -131,12 +136,12 @@ PIDAutotuner::PIDAutotuneResult PIDAutotuner::update(float setpoint, float proce
   return res;
 }
 void PIDAutotuner::dump_config() {
-  ESP_LOGI(TAG, "PID Autotune:");
   if (this->state_ == AUTOTUNE_SUCCEEDED) {
+    ESP_LOGI(TAG, "%s: PID Autotune:", this->id_.c_str());
     ESP_LOGI(TAG, "  State: Succeeded!");
     bool has_issue = false;
     if (!this->amplitude_detector_.is_amplitude_convergent()) {
-      ESP_LOGW(TAG, "  Could not reliable determine oscillation amplitude, PID parameters may be inaccurate!");
+      ESP_LOGW(TAG, "  Could not reliably determine oscillation amplitude, PID parameters may be inaccurate!");
       ESP_LOGW(TAG, "    Please make sure you eliminate all outside influences on the measured temperature.");
       has_issue = true;
     }
@@ -173,10 +178,12 @@ void PIDAutotuner::dump_config() {
     print_rule_("Pessen Integral PID", 0.7f, 1.75f, 0.105f);
     print_rule_("Some Overshoot PID", 0.333f, 0.667f, 0.111f);
     print_rule_("No Overshoot PID", 0.2f, 0.4f, 0.0625f);
+    ESP_LOGI(TAG, "%s: Autotune completed", this->id_.c_str());
   }
 
   if (this->state_ == AUTOTUNE_RUNNING) {
-    ESP_LOGI(TAG, "  Autotune is still running!");
+    ESP_LOGD(TAG, "%s: PID Autotune:", this->id_.c_str());
+    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);
@@ -221,7 +228,6 @@ float PIDAutotuner::RelayFunction::update(float error) {
   float output = state == RELAY_FUNCTION_POSITIVE ? output_positive : output_negative;
   if (change) {
     this->phase_count++;
-    ESP_LOGV(TAG, "Autotune: Turning output to %.1f%%", output * 100);
   }
 
   return output;
@@ -245,10 +251,8 @@ void PIDAutotuner::OscillationFrequencyDetector::update(uint32_t now, float erro
 
   if (had_crossing) {
     // Had crossing above hysteresis threshold, record
-    ESP_LOGV(TAG, "Autotune: Detected Zero-Cross at %u", now);
     if (this->last_zerocross != 0) {
       uint32_t dt = now - this->last_zerocross;
-      ESP_LOGV(TAG, "  dt: %u", dt);
       this->zerocrossing_intervals.push_back(dt);
     }
     this->last_zerocross = now;
@@ -297,13 +301,11 @@ void PIDAutotuner::OscillationAmplitudeDetector::update(float error,
       // The positive error peak must have been in previous segment (180° shifted)
       // record phase_max
       this->phase_maxs.push_back(phase_max);
-      ESP_LOGV(TAG, "Autotune: Phase Max: %f", phase_max);
     } else if (last_relay_state == RelayFunction::RELAY_FUNCTION_NEGATIVE) {
       // Transitioned from negative error to positive error.
       // The negative error peak must have been in previous segment (180° shifted)
       // record phase_min
       this->phase_mins.push_back(phase_min);
-      ESP_LOGV(TAG, "Autotune: Phase Min: %f", phase_min);
     }
     // reset phase values for next phase
     this->phase_min = error;
diff --git a/esphome/components/pid/pid_autotuner.h b/esphome/components/pid/pid_autotuner.h
index 88716d2b89..98dc02bcc4 100644
--- a/esphome/components/pid/pid_autotuner.h
+++ b/esphome/components/pid/pid_autotuner.h
@@ -31,6 +31,8 @@ class PIDAutotuner {
 
   void dump_config();
 
+  void set_autotuner_id(std::string id) { this->id_ = std::move(id); }
+
   void set_noiseband(float noiseband) {
     relay_function_.noiseband = noiseband;
     // ZC detector uses 1/4 the noiseband of relay function (noise suppression)
@@ -106,6 +108,7 @@ class PIDAutotuner {
   } state_ = AUTOTUNE_RUNNING;
   float ku_;
   float pu_;
+  std::string id_;
 };
 
 }  // namespace pid
diff --git a/esphome/components/pid/pid_climate.cpp b/esphome/components/pid/pid_climate.cpp
index 81c3e1f12e..dab4502d40 100644
--- a/esphome/components/pid/pid_climate.cpp
+++ b/esphome/components/pid/pid_climate.cpp
@@ -130,9 +130,6 @@ void PIDClimate::update_pid_() {
         // keep autotuner instance so that subsequent dump_configs will print the long result message.
       } else {
         value = res.output;
-        if (mode != climate::CLIMATE_MODE_HEAT_COOL) {
-          ESP_LOGW(TAG, "For PID autotuner you need to set AUTO (also called heat/cool) mode!");
-        }
       }
     }
   }
@@ -151,10 +148,24 @@ void PIDClimate::start_autotune(std::unique_ptr<PIDAutotuner> &&autotune) {
   float min_value = this->supports_cool_() ? -1.0f : 0.0f;
   float max_value = this->supports_heat_() ? 1.0f : 0.0f;
   this->autotuner_->config(min_value, max_value);
+  this->autotuner_->set_autotuner_id(this->get_object_id());
+
+  ESP_LOGI(TAG,
+           "%s: Autotune has started. This can take a long time depending on the "
+           "responsiveness of your system. Your system "
+           "output will be altered to deliberately oscillate above and below the setpoint multiple times. "
+           "Until your sensor provides a reading, the autotuner may display \'nan\'",
+           this->get_object_id().c_str());
+
   this->set_interval("autotune-progress", 10000, [this]() {
     if (this->autotuner_ != nullptr && !this->autotuner_->is_finished())
       this->autotuner_->dump_config();
   });
+
+  if (mode != climate::CLIMATE_MODE_HEAT_COOL) {
+    ESP_LOGW(TAG, "%s: !!! For PID autotuner you need to set AUTO (also called heat/cool) mode!",
+             this->get_object_id().c_str());
+  }
 }
 
 void PIDClimate::reset_integral_term() { this->controller_.reset_accumulated_integral(); }

From b7ab00b6994f1feae81df88a42e20e29c0737d29 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Feb 2023 07:40:04 +1300
Subject: [PATCH 547/838] Bump black from 22.12.0 to 23.1.0 (#4375)

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/b_parasite/sensor.py       | 2 +-
 esphome/components/esp8266/__init__.py        | 1 -
 esphome/components/honeywellabp/sensor.py     | 1 -
 esphome/components/nextion/base_component.py  | 1 -
 esphome/components/nextion/sensor/__init__.py | 1 -
 esphome/components/pmsa003i/sensor.py         | 1 -
 esphome/components/script/__init__.py         | 1 -
 esphome/components/sht4x/sensor.py            | 1 -
 esphome/dashboard/dashboard.py                | 1 -
 requirements_test.txt                         | 2 +-
 11 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7a954af4a6..0de82cf2de 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/ambv/black
-    rev: 22.12.0
+    rev: 23.1.0
     hooks:
       - id: black
         args:
diff --git a/esphome/components/b_parasite/sensor.py b/esphome/components/b_parasite/sensor.py
index 201685adc4..1b65bf7f1d 100644
--- a/esphome/components/b_parasite/sensor.py
+++ b/esphome/components/b_parasite/sensor.py
@@ -80,7 +80,7 @@ async def to_code(config):
 
     cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
 
-    for (config_key, setter) in [
+    for config_key, setter in [
         (CONF_TEMPERATURE, var.set_temperature),
         (CONF_HUMIDITY, var.set_humidity),
         (CONF_BATTERY_VOLTAGE, var.set_battery_voltage),
diff --git a/esphome/components/esp8266/__init__.py b/esphome/components/esp8266/__init__.py
index 8715a3b4e6..59a1f2cd85 100644
--- a/esphome/components/esp8266/__init__.py
+++ b/esphome/components/esp8266/__init__.py
@@ -240,7 +240,6 @@ async def to_code(config):
 
 # Called by writer.py
 def copy_files():
-
     dir = os.path.dirname(__file__)
     post_build_file = os.path.join(dir, "post_build.py.script")
     copy_file_if_changed(
diff --git a/esphome/components/honeywellabp/sensor.py b/esphome/components/honeywellabp/sensor.py
index 720a96b93c..ed8bff6e9b 100644
--- a/esphome/components/honeywellabp/sensor.py
+++ b/esphome/components/honeywellabp/sensor.py
@@ -52,7 +52,6 @@ CONFIG_SCHEMA = (
 
 
 async def to_code(config):
-
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/nextion/base_component.py b/esphome/components/nextion/base_component.py
index 06216e9ce0..b2a857c888 100644
--- a/esphome/components/nextion/base_component.py
+++ b/esphome/components/nextion/base_component.py
@@ -92,7 +92,6 @@ CONFIG_SWITCH_COMPONENT_SCHEMA = CONFIG_SENSOR_COMPONENT_SCHEMA.extend(
 
 
 async def setup_component_core_(var, config, arg):
-
     if CONF_VARIABLE_NAME in config:
         cg.add(var.set_variable_name(config[CONF_VARIABLE_NAME]))
     elif CONF_COMPONENT_NAME in config:
diff --git a/esphome/components/nextion/sensor/__init__.py b/esphome/components/nextion/sensor/__init__.py
index b022007ddd..eefbe34d58 100644
--- a/esphome/components/nextion/sensor/__init__.py
+++ b/esphome/components/nextion/sensor/__init__.py
@@ -69,7 +69,6 @@ CONFIG_SCHEMA = cv.All(
 
 
 async def to_code(config):
-
     hub = await cg.get_variable(config[CONF_NEXTION_ID])
     var = cg.new_Pvariable(config[CONF_ID], hub)
     await cg.register_component(var, config)
diff --git a/esphome/components/pmsa003i/sensor.py b/esphome/components/pmsa003i/sensor.py
index ceca791cd6..ef620614a2 100644
--- a/esphome/components/pmsa003i/sensor.py
+++ b/esphome/components/pmsa003i/sensor.py
@@ -122,7 +122,6 @@ async def to_code(config):
     cg.add(var.set_standard_units(config[CONF_STANDARD_UNITS]))
 
     for key, funcName in TYPES.items():
-
         if key in config:
             sens = await sensor.new_sensor(config[key])
             cg.add(getattr(var, funcName)(sens))
diff --git a/esphome/components/script/__init__.py b/esphome/components/script/__init__.py
index 907d7bf0e3..6337d89bcd 100644
--- a/esphome/components/script/__init__.py
+++ b/esphome/components/script/__init__.py
@@ -62,7 +62,6 @@ def assign_declare_id(value):
 
 
 def parameters_to_template(args):
-
     template_args = []
     func_args = []
     script_arg_names = []
diff --git a/esphome/components/sht4x/sensor.py b/esphome/components/sht4x/sensor.py
index 9fb8fc969e..e195bb9acc 100644
--- a/esphome/components/sht4x/sensor.py
+++ b/esphome/components/sht4x/sensor.py
@@ -98,7 +98,6 @@ async def to_code(config):
     cg.add(var.set_heater_duty_value(config[CONF_HEATER_MAX_DUTY]))
 
     for key, funcName in TYPES.items():
-
         if key in config:
             sens = await sensor.new_sensor(config[key])
             cg.add(getattr(var, funcName)(sens))
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 0ff5362670..6c7188a4ac 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -977,7 +977,6 @@ class LogoutHandler(BaseHandler):
 class SecretKeysRequestHandler(BaseHandler):
     @authenticated
     def get(self):
-
         filename = None
 
         for secret_filename in const.SECRETS_FILES:
diff --git a/requirements_test.txt b/requirements_test.txt
index 6f03f005d5..a1c0845089 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,6 +1,6 @@
 pylint==2.15.10
 flake8==6.0.0  # also change in .pre-commit-config.yaml when updating
-black==22.12.0  # also change in .pre-commit-config.yaml when updating
+black==23.1.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.3.1  # also change in .pre-commit-config.yaml when updating
 pre-commit
 

From f8acc45be4340075fd07f91c5a424c29500f00d8 Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Fri, 10 Feb 2023 21:56:15 +0100
Subject: [PATCH 548/838] Add Clipping to displaybuffer (#4271)

* adding Clipping support to the displaybuffer
- add rect structure

* removed unused define

* add missing property for storing the clipped areas

* include log header

* Move Rect method's code to cpp file
- removed obsolete remarks

* fixed reported issues

* make Rect class methods public

* clang fix

* Remove commented code

* Renaming clipping methods

* Multiple changes:
- replaced 32766 with VALUE_NO_SET
- fixed the way *_clipping(left, top, right, bottom) is stored
- add `is_clipping();`
- make sure that all clipped region are closed after `do_update_()`
- rename de parameters for `Rect::expand();`

* remove unneeded space

* replace define with static const uint8_t

* correcting my copy paste mistake

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .gitignore                                    |   2 +
 esphome/components/display/display_buffer.cpp | 121 ++++++++++++++++++
 esphome/components/display/display_buffer.h   |  84 +++++++++++-
 3 files changed, 206 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 110437c368..71b66b2499 100644
--- a/.gitignore
+++ b/.gitignore
@@ -128,3 +128,5 @@ tests/.esphome/
 
 sdkconfig.*
 !sdkconfig.defaults
+
+.tests/
\ No newline at end of file
diff --git a/esphome/components/display/display_buffer.cpp b/esphome/components/display/display_buffer.cpp
index cfd73509ea..1b24ca94b9 100644
--- a/esphome/components/display/display_buffer.cpp
+++ b/esphome/components/display/display_buffer.cpp
@@ -15,6 +15,84 @@ static const char *const TAG = "display";
 const Color COLOR_OFF(0, 0, 0, 0);
 const Color COLOR_ON(255, 255, 255, 255);
 
+void Rect::expand(int16_t horizontal, int16_t vertical) {
+  if ((*this).is_set() && ((*this).w >= (-2 * horizontal)) && ((*this).h >= (-2 * vertical))) {
+    (*this).x = (*this).x - horizontal;
+    (*this).y = (*this).y - vertical;
+    (*this).w = (*this).w + (2 * horizontal);
+    (*this).h = (*this).h + (2 * vertical);
+  }
+}
+
+void Rect::extend(Rect rect) {
+  if (!this->is_set()) {
+    this->x = rect.x;
+    this->y = rect.y;
+    this->w = rect.w;
+    this->h = rect.h;
+  } else {
+    if (this->x > rect.x) {
+      this->x = rect.x;
+    }
+    if (this->y > rect.y) {
+      this->y = rect.y;
+    }
+    if (this->x2() < rect.x2()) {
+      this->w = rect.x2() - this->x;
+    }
+    if (this->y2() < rect.y2()) {
+      this->h = rect.y2() - this->y;
+    }
+  }
+}
+void Rect::shrink(Rect rect) {
+  if (!this->inside(rect)) {
+    (*this) = Rect();
+  } else {
+    if (this->x < rect.x) {
+      this->x = rect.x;
+    }
+    if (this->y < rect.y) {
+      this->y = rect.y;
+    }
+    if (this->x2() > rect.x2()) {
+      this->w = rect.x2() - this->x;
+    }
+    if (this->y2() > rect.y2()) {
+      this->h = rect.y2() - this->y;
+    }
+  }
+}
+
+bool Rect::inside(int16_t x, int16_t y, bool absolute) {  // NOLINT
+  if (!this->is_set()) {
+    return true;
+  }
+  if (absolute) {
+    return ((x >= 0) && (x <= this->w) && (y >= 0) && (y <= this->h));
+  } else {
+    return ((x >= this->x) && (x <= this->x2()) && (y >= this->y) && (y <= this->y2()));
+  }
+}
+
+bool Rect::inside(Rect rect, bool absolute) {
+  if (!this->is_set() || !rect.is_set()) {
+    return true;
+  }
+  if (absolute) {
+    return ((rect.x <= this->w) && (rect.w >= 0) && (rect.y <= this->h) && (rect.h >= 0));
+  } else {
+    return ((rect.x <= this->x2()) && (rect.x2() >= this->x) && (rect.y <= this->y2()) && (rect.y2() >= this->y));
+  }
+}
+
+void Rect::info(const std::string &prefix) {
+  if (this->is_set()) {
+    ESP_LOGI(TAG, "%s [%3d,%3d,%3d,%3d]", prefix.c_str(), this->x, this->y, this->w, this->h);
+  } else
+    ESP_LOGI(TAG, "%s ** IS NOT SET **", prefix.c_str());
+}
+
 void DisplayBuffer::init_internal_(uint32_t buffer_length) {
   ExternalRAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
   this->buffer_ = allocator.allocate(buffer_length);
@@ -24,6 +102,7 @@ void DisplayBuffer::init_internal_(uint32_t buffer_length) {
   }
   this->clear();
 }
+
 void DisplayBuffer::fill(Color color) { this->filled_rectangle(0, 0, this->get_width(), this->get_height(), color); }
 void DisplayBuffer::clear() { this->fill(COLOR_OFF); }
 int DisplayBuffer::get_width() {
@@ -50,6 +129,9 @@ int DisplayBuffer::get_height() {
 }
 void DisplayBuffer::set_rotation(DisplayRotation rotation) { this->rotation_ = rotation; }
 void HOT DisplayBuffer::draw_pixel_at(int x, int y, Color color) {
+  if (!this->get_clipping().inside(x, y))
+    return;  // NOLINT
+
   switch (this->rotation_) {
     case DISPLAY_ROTATION_0_DEGREES:
       break;
@@ -368,6 +450,10 @@ void DisplayBuffer::do_update_() {
   } else if (this->writer_.has_value()) {
     (*this->writer_)(*this);
   }
+  // remove all not ended clipping regions
+  while (is_clipping()) {
+    end_clipping();
+  }
 }
 void DisplayOnPageChangeTrigger::process(DisplayPage *from, DisplayPage *to) {
   if ((this->from_ == nullptr || this->from_ == from) && (this->to_ == nullptr || this->to_ == to))
@@ -392,6 +478,41 @@ void DisplayBuffer::strftime(int x, int y, Font *font, const char *format, time:
 }
 #endif
 
+void DisplayBuffer::start_clipping(Rect rect) {
+  if (!this->clipping_rectangle_.empty()) {
+    Rect r = this->clipping_rectangle_.back();
+    rect.shrink(r);
+  }
+  this->clipping_rectangle_.push_back(rect);
+}
+void DisplayBuffer::end_clipping() {
+  if (this->clipping_rectangle_.empty()) {
+    ESP_LOGE(TAG, "clear: Clipping is not set.");
+  } else {
+    this->clipping_rectangle_.pop_back();
+  }
+}
+void DisplayBuffer::extend_clipping(Rect add_rect) {
+  if (this->clipping_rectangle_.empty()) {
+    ESP_LOGE(TAG, "add: Clipping is not set.");
+  } else {
+    this->clipping_rectangle_.back().extend(add_rect);
+  }
+}
+void DisplayBuffer::shrink_clipping(Rect add_rect) {
+  if (this->clipping_rectangle_.empty()) {
+    ESP_LOGE(TAG, "add: Clipping is not set.");
+  } else {
+    this->clipping_rectangle_.back().shrink(add_rect);
+  }
+}
+Rect DisplayBuffer::get_clipping() {
+  if (this->clipping_rectangle_.empty()) {
+    return Rect();
+  } else {
+    return this->clipping_rectangle_.back();
+  }
+}
 bool Glyph::get_pixel(int x, int y) const {
   const int x_data = x - this->glyph_data_->offset_x;
   const int y_data = y - this->glyph_data_->offset_y;
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index b652989067..03d64f80d3 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -4,7 +4,6 @@
 #include "esphome/core/defines.h"
 #include "esphome/core/automation.h"
 #include "display_color_utils.h"
-
 #include <cstdarg>
 #include <vector>
 
@@ -100,6 +99,32 @@ enum DisplayRotation {
   DISPLAY_ROTATION_270_DEGREES = 270,
 };
 
+static const int16_t VALUE_NO_SET = 32766;
+
+class Rect {
+ public:
+  int16_t x;  ///< X coordinate of corner
+  int16_t y;  ///< Y coordinate of corner
+  int16_t w;  ///< Width of region
+  int16_t h;  ///< Height of region
+
+  Rect() : x(VALUE_NO_SET), y(VALUE_NO_SET), w(VALUE_NO_SET), h(VALUE_NO_SET) {}  // NOLINT
+  inline Rect(int16_t x, int16_t y, int16_t w, int16_t h) ALWAYS_INLINE : x(x), y(y), w(w), h(h) {}
+  inline int16_t x2() { return this->x + this->w; };  ///< X coordinate of corner
+  inline int16_t y2() { return this->y + this->h; };  ///< Y coordinate of corner
+
+  inline bool is_set() ALWAYS_INLINE { return (this->h != VALUE_NO_SET) && (this->w != VALUE_NO_SET); }
+
+  void expand(int16_t horizontal, int16_t vertical);
+
+  void extend(Rect rect);
+  void shrink(Rect rect);
+
+  bool inside(Rect rect, bool absolute = false);
+  bool inside(int16_t x, int16_t y, bool absolute = false);
+  void info(const std::string &prefix = "rect info:");
+};
+
 class Font;
 class Image;
 class DisplayBuffer;
@@ -126,6 +151,7 @@ class DisplayBuffer {
   int get_width();
   /// Get the height of the image in pixels with rotation applied.
   int get_height();
+
   /// Set a single pixel at the specified coordinates to the given color.
   void draw_pixel_at(int x, int y, Color color = COLOR_ON);
 
@@ -374,6 +400,61 @@ class DisplayBuffer {
    */
   virtual DisplayType get_display_type() = 0;
 
+  ///
+  /// Set the clipping rectangle for further drawing
+  ///
+  /// \param[in]  rect:       Pointer to Rect for clipping (or NULL for entire screen)
+  ///
+  /// \return true if success, false if error
+  ///
+  void start_clipping(Rect rect);
+  void start_clipping(int16_t left, int16_t top, int16_t right, int16_t bottom) {
+    start_clipping(Rect(left, top, right - left, bottom - top));
+  };
+
+  ///
+  /// Add a rectangular region to the invalidation region
+  /// - This is usually called when an element has been modified
+  ///
+  /// \param[in]  rect: Rectangle to add to the invalidation region
+  ///
+  /// \return none
+  ///
+  void extend_clipping(Rect rect);
+  void extend_clipping(int16_t left, int16_t top, int16_t right, int16_t bottom) {
+    this->extend_clipping(Rect(left, top, right - left, bottom - top));
+  };
+
+  ///
+  /// substract a rectangular region to the invalidation region
+  /// - This is usually called when an element has been modified
+  ///
+  /// \param[in]  rect: Rectangle to add to the invalidation region
+  ///
+  /// \return none
+  ///
+  void shrink_clipping(Rect rect);
+  void shrink_clipping(uint16_t left, uint16_t top, uint16_t right, uint16_t bottom) {
+    this->shrink_clipping(Rect(left, top, right - left, bottom - top));
+  };
+
+  ///
+  /// Reset the invalidation region
+  ///
+  /// \return none
+  ///
+  void end_clipping();
+
+  ///
+  /// Get the current the clipping rectangle
+  ///
+  ///
+  /// \return rect for active clipping region
+  ///
+  Rect get_clipping();
+
+  bool is_clipping() const { return this->clipping_rectangle_.empty(); }
+
  protected:
   void vprintf_(int x, int y, Font *font, Color color, TextAlign align, const char *format, va_list arg);
 
@@ -390,6 +471,7 @@ class DisplayBuffer {
   DisplayPage *previous_page_{nullptr};
   std::vector<DisplayOnPageChangeTrigger *> on_page_change_triggers_;
   bool auto_clear_enabled_{true};
+  std::vector<Rect> clipping_rectangle_;
 };
 
 class DisplayPage {

From 58eeb6b1b8362c1811510988545553e3544731a5 Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Sun, 12 Feb 2023 17:03:53 +0100
Subject: [PATCH 549/838] Fix check for empty clipping array (#4421)

---
 esphome/components/display/display_buffer.cpp | 10 ++--
 esphome/components/display/display_buffer.h   | 58 ++++++++-----------
 2 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/esphome/components/display/display_buffer.cpp b/esphome/components/display/display_buffer.cpp
index 1b24ca94b9..9fe4137a14 100644
--- a/esphome/components/display/display_buffer.cpp
+++ b/esphome/components/display/display_buffer.cpp
@@ -16,11 +16,11 @@ const Color COLOR_OFF(0, 0, 0, 0);
 const Color COLOR_ON(255, 255, 255, 255);
 
 void Rect::expand(int16_t horizontal, int16_t vertical) {
-  if ((*this).is_set() && ((*this).w >= (-2 * horizontal)) && ((*this).h >= (-2 * vertical))) {
-    (*this).x = (*this).x - horizontal;
-    (*this).y = (*this).y - vertical;
-    (*this).w = (*this).w + (2 * horizontal);
-    (*this).h = (*this).h + (2 * vertical);
+  if (this->is_set() && (this->w >= (-2 * horizontal)) && (this->h >= (-2 * vertical))) {
+    this->x = this->x - horizontal;
+    this->y = this->y - vertical;
+    this->w = this->w + (2 * horizontal);
+    this->h = this->h + (2 * vertical);
   }
 }
 
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index 03d64f80d3..3763da8041 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -400,60 +400,48 @@ class DisplayBuffer {
    */
   virtual DisplayType get_display_type() = 0;
 
-  ///
-  /// Set the clipping rectangle for further drawing
-  ///
-  /// \param[in]  rect:       Pointer to Rect for clipping (or NULL for entire screen)
-  ///
-  /// \return true if success, false if error
-  ///
+  /** Set the clipping rectangle for further drawing
+   *
+   * @param[in]  rect:       Pointer to Rect for clipping (or NULL for entire screen)
+   *
+   * return true if success, false if error
+   */
   void start_clipping(Rect rect);
   void start_clipping(int16_t left, int16_t top, int16_t right, int16_t bottom) {
     start_clipping(Rect(left, top, right - left, bottom - top));
   };
 
-  ///
-  /// Add a rectangular region to the invalidation region
-  /// - This is usually called when an element has been modified
-  ///
-  /// \param[in]  rect: Rectangle to add to the invalidation region
-  ///
-  /// \return none
-  ///
+  /** Add a rectangular region to the invalidation region
+   * - This is usually called when an element has been modified
+   *
+   * @param[in]  rect: Rectangle to add to the invalidation region
+   */
   void extend_clipping(Rect rect);
   void extend_clipping(int16_t left, int16_t top, int16_t right, int16_t bottom) {
     this->extend_clipping(Rect(left, top, right - left, bottom - top));
   };
 
-  ///
-  /// substract a rectangular region to the invalidation region
-  /// - This is usually called when an element has been modified
-  ///
-  /// \param[in]  rect: Rectangle to add to the invalidation region
-  ///
-  /// \return none
-  ///
+  /** substract a rectangular region to the invalidation region
+   *  - This is usually called when an element has been modified
+   *
+   * @param[in]  rect: Rectangle to add to the invalidation region
+   */
   void shrink_clipping(Rect rect);
   void shrink_clipping(uint16_t left, uint16_t top, uint16_t right, uint16_t bottom) {
     this->shrink_clipping(Rect(left, top, right - left, bottom - top));
   };
 
-  ///
-  /// Reset the invalidation region
-  ///
-  /// \return none
-  ///
+  /** Reset the invalidation region
+   */
   void end_clipping();
 
-  ///
-  /// Get the current the clipping rectangle
-  ///
-  ///
-  /// \return rect for active clipping region
-  ///
+  /** Get the current the clipping rectangle
+   *
+   * return rect for active clipping region
+   */
   Rect get_clipping();
 
-  bool is_clipping() const { return this->clipping_rectangle_.empty(); }
+  bool is_clipping() const { return !this->clipping_rectangle_.empty(); }
 
  protected:
   void vprintf_(int x, int y, Font *font, Color color, TextAlign align, const char *format, va_list arg);

From b15a10f9052a53f1635210fa91911170c9ae4645 Mon Sep 17 00:00:00 2001
From: Patrick Collins <pcollins1@gmail.com>
Date: Thu, 9 Feb 2023 20:37:31 +1100
Subject: [PATCH 550/838] Climate PID Autotune Logging fixes (#4136)

* pid autotune logging fixes

* fixed clang-format request

* improved and clarified logging

* changed logging not to alter the TAG

* logging now does not alter TAG. fixed clang formattting

* fixed string issues

* playing with strings to please the clang gods

* playing with strings

* Delete secrets.yaml

* Delete console-fan-autotune-test.yaml

* Update esphome/components/pid/pid_autotuner.cpp

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/pid/pid_autotuner.cpp

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/pid/pid_autotuner.cpp

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/pid/pid_autotuner.cpp

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/pid/pid_autotuner.cpp

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/pid/pid_autotuner.cpp | 28 +++++++++++++-----------
 esphome/components/pid/pid_autotuner.h   |  3 +++
 esphome/components/pid/pid_climate.cpp   | 17 +++++++++++---
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/esphome/components/pid/pid_autotuner.cpp b/esphome/components/pid/pid_autotuner.cpp
index fc012aaa39..1b3ddebcc5 100644
--- a/esphome/components/pid/pid_autotuner.cpp
+++ b/esphome/components/pid/pid_autotuner.cpp
@@ -1,6 +1,10 @@
 #include "pid_autotuner.h"
 #include "esphome/core/log.h"
 
+#ifndef M_PI
+#define M_PI 3.1415926535897932384626433
+#endif
+
 namespace esphome {
 namespace pid {
 
@@ -73,7 +77,7 @@ PIDAutotuner::PIDAutotuneResult PIDAutotuner::update(float setpoint, float proce
   }
 
   if (!std::isnan(this->setpoint_) && this->setpoint_ != setpoint) {
-    ESP_LOGW(TAG, "Setpoint changed during autotune! The result will not be accurate!");
+    ESP_LOGW(TAG, "%s: Setpoint changed during autotune! The result will not be accurate!", this->id_.c_str());
   }
   this->setpoint_ = setpoint;
 
@@ -87,7 +91,7 @@ PIDAutotuner::PIDAutotuneResult PIDAutotuner::update(float setpoint, float proce
 
   if (!this->frequency_detector_.has_enough_data() || !this->amplitude_detector_.has_enough_data()) {
     // not enough data for calculation yet
-    ESP_LOGV(TAG, "  Not enough data yet for aututuner");
+    ESP_LOGV(TAG, "%s:   Not enough data yet for autotuner", this->id_.c_str());
     return res;
   }
 
@@ -97,12 +101,13 @@ PIDAutotuner::PIDAutotuneResult PIDAutotuner::update(float setpoint, float proce
     // The frequency/amplitude is not fully accurate yet, try to wait
     // until the fault clears, or terminate after a while anyway
     if (zc_symmetrical) {
-      ESP_LOGVV(TAG, "  ZC is not symmetrical");
+      ESP_LOGVV(TAG, "%s:   ZC is not symmetrical", this->id_.c_str());
     }
     if (amplitude_convergent) {
-      ESP_LOGVV(TAG, "  Amplitude is not convergent");
+      ESP_LOGVV(TAG, "%s:   Amplitude is not convergent", this->id_.c_str());
     }
     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_);
 
     if (this->enough_data_phase_ == 0) {
@@ -116,7 +121,7 @@ PIDAutotuner::PIDAutotuneResult PIDAutotuner::update(float setpoint, float proce
     }
   }
 
-  ESP_LOGI(TAG, "PID Autotune finished!");
+  ESP_LOGI(TAG, "%s: PID Autotune finished!", this->id_.c_str());
 
   float osc_ampl = this->amplitude_detector_.get_mean_oscillation_amplitude();
   float d = (this->relay_function_.output_positive - this->relay_function_.output_negative) / 2.0f;
@@ -131,12 +136,12 @@ PIDAutotuner::PIDAutotuneResult PIDAutotuner::update(float setpoint, float proce
   return res;
 }
 void PIDAutotuner::dump_config() {
-  ESP_LOGI(TAG, "PID Autotune:");
   if (this->state_ == AUTOTUNE_SUCCEEDED) {
+    ESP_LOGI(TAG, "%s: PID Autotune:", this->id_.c_str());
     ESP_LOGI(TAG, "  State: Succeeded!");
     bool has_issue = false;
     if (!this->amplitude_detector_.is_amplitude_convergent()) {
-      ESP_LOGW(TAG, "  Could not reliable determine oscillation amplitude, PID parameters may be inaccurate!");
+      ESP_LOGW(TAG, "  Could not reliably determine oscillation amplitude, PID parameters may be inaccurate!");
       ESP_LOGW(TAG, "    Please make sure you eliminate all outside influences on the measured temperature.");
       has_issue = true;
     }
@@ -173,10 +178,12 @@ void PIDAutotuner::dump_config() {
     print_rule_("Pessen Integral PID", 0.7f, 1.75f, 0.105f);
     print_rule_("Some Overshoot PID", 0.333f, 0.667f, 0.111f);
     print_rule_("No Overshoot PID", 0.2f, 0.4f, 0.0625f);
+    ESP_LOGI(TAG, "%s: Autotune completed", this->id_.c_str());
   }
 
   if (this->state_ == AUTOTUNE_RUNNING) {
-    ESP_LOGI(TAG, "  Autotune is still running!");
+    ESP_LOGD(TAG, "%s: PID Autotune:", this->id_.c_str());
+    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);
@@ -221,7 +228,6 @@ float PIDAutotuner::RelayFunction::update(float error) {
   float output = state == RELAY_FUNCTION_POSITIVE ? output_positive : output_negative;
   if (change) {
     this->phase_count++;
-    ESP_LOGV(TAG, "Autotune: Turning output to %.1f%%", output * 100);
   }
 
   return output;
@@ -245,10 +251,8 @@ void PIDAutotuner::OscillationFrequencyDetector::update(uint32_t now, float erro
 
   if (had_crossing) {
     // Had crossing above hysteresis threshold, record
-    ESP_LOGV(TAG, "Autotune: Detected Zero-Cross at %u", now);
     if (this->last_zerocross != 0) {
       uint32_t dt = now - this->last_zerocross;
-      ESP_LOGV(TAG, "  dt: %u", dt);
       this->zerocrossing_intervals.push_back(dt);
     }
     this->last_zerocross = now;
@@ -297,13 +301,11 @@ void PIDAutotuner::OscillationAmplitudeDetector::update(float error,
       // The positive error peak must have been in previous segment (180° shifted)
       // record phase_max
       this->phase_maxs.push_back(phase_max);
-      ESP_LOGV(TAG, "Autotune: Phase Max: %f", phase_max);
     } else if (last_relay_state == RelayFunction::RELAY_FUNCTION_NEGATIVE) {
       // Transitioned from negative error to positive error.
       // The negative error peak must have been in previous segment (180° shifted)
       // record phase_min
       this->phase_mins.push_back(phase_min);
-      ESP_LOGV(TAG, "Autotune: Phase Min: %f", phase_min);
     }
     // reset phase values for next phase
     this->phase_min = error;
diff --git a/esphome/components/pid/pid_autotuner.h b/esphome/components/pid/pid_autotuner.h
index 88716d2b89..98dc02bcc4 100644
--- a/esphome/components/pid/pid_autotuner.h
+++ b/esphome/components/pid/pid_autotuner.h
@@ -31,6 +31,8 @@ class PIDAutotuner {
 
   void dump_config();
 
+  void set_autotuner_id(std::string id) { this->id_ = std::move(id); }
+
   void set_noiseband(float noiseband) {
     relay_function_.noiseband = noiseband;
     // ZC detector uses 1/4 the noiseband of relay function (noise suppression)
@@ -106,6 +108,7 @@ class PIDAutotuner {
   } state_ = AUTOTUNE_RUNNING;
   float ku_;
   float pu_;
+  std::string id_;
 };
 
 }  // namespace pid
diff --git a/esphome/components/pid/pid_climate.cpp b/esphome/components/pid/pid_climate.cpp
index 81c3e1f12e..dab4502d40 100644
--- a/esphome/components/pid/pid_climate.cpp
+++ b/esphome/components/pid/pid_climate.cpp
@@ -130,9 +130,6 @@ void PIDClimate::update_pid_() {
         // keep autotuner instance so that subsequent dump_configs will print the long result message.
       } else {
         value = res.output;
-        if (mode != climate::CLIMATE_MODE_HEAT_COOL) {
-          ESP_LOGW(TAG, "For PID autotuner you need to set AUTO (also called heat/cool) mode!");
-        }
       }
     }
   }
@@ -151,10 +148,24 @@ void PIDClimate::start_autotune(std::unique_ptr<PIDAutotuner> &&autotune) {
   float min_value = this->supports_cool_() ? -1.0f : 0.0f;
   float max_value = this->supports_heat_() ? 1.0f : 0.0f;
   this->autotuner_->config(min_value, max_value);
+  this->autotuner_->set_autotuner_id(this->get_object_id());
+
+  ESP_LOGI(TAG,
+           "%s: Autotune has started. This can take a long time depending on the "
+           "responsiveness of your system. Your system "
+           "output will be altered to deliberately oscillate above and below the setpoint multiple times. "
+           "Until your sensor provides a reading, the autotuner may display \'nan\'",
+           this->get_object_id().c_str());
+
   this->set_interval("autotune-progress", 10000, [this]() {
     if (this->autotuner_ != nullptr && !this->autotuner_->is_finished())
       this->autotuner_->dump_config();
   });
+
+  if (mode != climate::CLIMATE_MODE_HEAT_COOL) {
+    ESP_LOGW(TAG, "%s: !!! For PID autotuner you need to set AUTO (also called heat/cool) mode!",
+             this->get_object_id().c_str());
+  }
 }
 
 void PIDClimate::reset_integral_term() { this->controller_.reset_accumulated_integral(); }

From 8cf26d6f3cc92ef87fa4f465c00b6cd67c30d9be Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Fri, 10 Feb 2023 21:56:15 +0100
Subject: [PATCH 551/838] Add Clipping to displaybuffer (#4271)

* adding Clipping support to the displaybuffer
- add rect structure

* removed unused define

* add missing property for storing the clipped areas

* include log header

* Move Rect method's code to cpp file
- removed obsolete remarks

* fixed reported issues

* make Rect class methods public

* clang fix

* Remove commented code

* Renaming clipping methods

* Multiple changes:
- replaced 32766 with VALUE_NO_SET
- fixed the way *_clipping(left, top, right, bottom) is stored
- add `is_clipping();`
- make sure that all clipped region are closed after `do_update_()`
- rename de parameters for `Rect::expand();`

* remove unneeded space

* replace define with static const uint8_t

* correcting my copy paste mistake

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .gitignore                                    |   2 +
 esphome/components/display/display_buffer.cpp | 121 ++++++++++++++++++
 esphome/components/display/display_buffer.h   |  84 +++++++++++-
 3 files changed, 206 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 110437c368..71b66b2499 100644
--- a/.gitignore
+++ b/.gitignore
@@ -128,3 +128,5 @@ tests/.esphome/
 
 sdkconfig.*
 !sdkconfig.defaults
+
+.tests/
\ No newline at end of file
diff --git a/esphome/components/display/display_buffer.cpp b/esphome/components/display/display_buffer.cpp
index cfd73509ea..1b24ca94b9 100644
--- a/esphome/components/display/display_buffer.cpp
+++ b/esphome/components/display/display_buffer.cpp
@@ -15,6 +15,84 @@ static const char *const TAG = "display";
 const Color COLOR_OFF(0, 0, 0, 0);
 const Color COLOR_ON(255, 255, 255, 255);
 
+void Rect::expand(int16_t horizontal, int16_t vertical) {
+  if ((*this).is_set() && ((*this).w >= (-2 * horizontal)) && ((*this).h >= (-2 * vertical))) {
+    (*this).x = (*this).x - horizontal;
+    (*this).y = (*this).y - vertical;
+    (*this).w = (*this).w + (2 * horizontal);
+    (*this).h = (*this).h + (2 * vertical);
+  }
+}
+
+void Rect::extend(Rect rect) {
+  if (!this->is_set()) {
+    this->x = rect.x;
+    this->y = rect.y;
+    this->w = rect.w;
+    this->h = rect.h;
+  } else {
+    if (this->x > rect.x) {
+      this->x = rect.x;
+    }
+    if (this->y > rect.y) {
+      this->y = rect.y;
+    }
+    if (this->x2() < rect.x2()) {
+      this->w = rect.x2() - this->x;
+    }
+    if (this->y2() < rect.y2()) {
+      this->h = rect.y2() - this->y;
+    }
+  }
+}
+void Rect::shrink(Rect rect) {
+  if (!this->inside(rect)) {
+    (*this) = Rect();
+  } else {
+    if (this->x < rect.x) {
+      this->x = rect.x;
+    }
+    if (this->y < rect.y) {
+      this->y = rect.y;
+    }
+    if (this->x2() > rect.x2()) {
+      this->w = rect.x2() - this->x;
+    }
+    if (this->y2() > rect.y2()) {
+      this->h = rect.y2() - this->y;
+    }
+  }
+}
+
+bool Rect::inside(int16_t x, int16_t y, bool absolute) {  // NOLINT
+  if (!this->is_set()) {
+    return true;
+  }
+  if (absolute) {
+    return ((x >= 0) && (x <= this->w) && (y >= 0) && (y <= this->h));
+  } else {
+    return ((x >= this->x) && (x <= this->x2()) && (y >= this->y) && (y <= this->y2()));
+  }
+}
+
+bool Rect::inside(Rect rect, bool absolute) {
+  if (!this->is_set() || !rect.is_set()) {
+    return true;
+  }
+  if (absolute) {
+    return ((rect.x <= this->w) && (rect.w >= 0) && (rect.y <= this->h) && (rect.h >= 0));
+  } else {
+    return ((rect.x <= this->x2()) && (rect.x2() >= this->x) && (rect.y <= this->y2()) && (rect.y2() >= this->y));
+  }
+}
+
+void Rect::info(const std::string &prefix) {
+  if (this->is_set()) {
+    ESP_LOGI(TAG, "%s [%3d,%3d,%3d,%3d]", prefix.c_str(), this->x, this->y, this->w, this->h);
+  } else
+    ESP_LOGI(TAG, "%s ** IS NOT SET **", prefix.c_str());
+}
+
 void DisplayBuffer::init_internal_(uint32_t buffer_length) {
   ExternalRAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
   this->buffer_ = allocator.allocate(buffer_length);
@@ -24,6 +102,7 @@ void DisplayBuffer::init_internal_(uint32_t buffer_length) {
   }
   this->clear();
 }
+
 void DisplayBuffer::fill(Color color) { this->filled_rectangle(0, 0, this->get_width(), this->get_height(), color); }
 void DisplayBuffer::clear() { this->fill(COLOR_OFF); }
 int DisplayBuffer::get_width() {
@@ -50,6 +129,9 @@ int DisplayBuffer::get_height() {
 }
 void DisplayBuffer::set_rotation(DisplayRotation rotation) { this->rotation_ = rotation; }
 void HOT DisplayBuffer::draw_pixel_at(int x, int y, Color color) {
+  if (!this->get_clipping().inside(x, y))
+    return;  // NOLINT
+
   switch (this->rotation_) {
     case DISPLAY_ROTATION_0_DEGREES:
       break;
@@ -368,6 +450,10 @@ void DisplayBuffer::do_update_() {
   } else if (this->writer_.has_value()) {
     (*this->writer_)(*this);
   }
+  // remove all not ended clipping regions
+  while (is_clipping()) {
+    end_clipping();
+  }
 }
 void DisplayOnPageChangeTrigger::process(DisplayPage *from, DisplayPage *to) {
   if ((this->from_ == nullptr || this->from_ == from) && (this->to_ == nullptr || this->to_ == to))
@@ -392,6 +478,41 @@ void DisplayBuffer::strftime(int x, int y, Font *font, const char *format, time:
 }
 #endif
 
+void DisplayBuffer::start_clipping(Rect rect) {
+  if (!this->clipping_rectangle_.empty()) {
+    Rect r = this->clipping_rectangle_.back();
+    rect.shrink(r);
+  }
+  this->clipping_rectangle_.push_back(rect);
+}
+void DisplayBuffer::end_clipping() {
+  if (this->clipping_rectangle_.empty()) {
+    ESP_LOGE(TAG, "clear: Clipping is not set.");
+  } else {
+    this->clipping_rectangle_.pop_back();
+  }
+}
+void DisplayBuffer::extend_clipping(Rect add_rect) {
+  if (this->clipping_rectangle_.empty()) {
+    ESP_LOGE(TAG, "add: Clipping is not set.");
+  } else {
+    this->clipping_rectangle_.back().extend(add_rect);
+  }
+}
+void DisplayBuffer::shrink_clipping(Rect add_rect) {
+  if (this->clipping_rectangle_.empty()) {
+    ESP_LOGE(TAG, "add: Clipping is not set.");
+  } else {
+    this->clipping_rectangle_.back().shrink(add_rect);
+  }
+}
+Rect DisplayBuffer::get_clipping() {
+  if (this->clipping_rectangle_.empty()) {
+    return Rect();
+  } else {
+    return this->clipping_rectangle_.back();
+  }
+}
 bool Glyph::get_pixel(int x, int y) const {
   const int x_data = x - this->glyph_data_->offset_x;
   const int y_data = y - this->glyph_data_->offset_y;
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index b652989067..03d64f80d3 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -4,7 +4,6 @@
 #include "esphome/core/defines.h"
 #include "esphome/core/automation.h"
 #include "display_color_utils.h"
-
 #include <cstdarg>
 #include <vector>
 
@@ -100,6 +99,32 @@ enum DisplayRotation {
   DISPLAY_ROTATION_270_DEGREES = 270,
 };
 
+static const int16_t VALUE_NO_SET = 32766;
+
+class Rect {
+ public:
+  int16_t x;  ///< X coordinate of corner
+  int16_t y;  ///< Y coordinate of corner
+  int16_t w;  ///< Width of region
+  int16_t h;  ///< Height of region
+
+  Rect() : x(VALUE_NO_SET), y(VALUE_NO_SET), w(VALUE_NO_SET), h(VALUE_NO_SET) {}  // NOLINT
+  inline Rect(int16_t x, int16_t y, int16_t w, int16_t h) ALWAYS_INLINE : x(x), y(y), w(w), h(h) {}
+  inline int16_t x2() { return this->x + this->w; };  ///< X coordinate of corner
+  inline int16_t y2() { return this->y + this->h; };  ///< Y coordinate of corner
+
+  inline bool is_set() ALWAYS_INLINE { return (this->h != VALUE_NO_SET) && (this->w != VALUE_NO_SET); }
+
+  void expand(int16_t horizontal, int16_t vertical);
+
+  void extend(Rect rect);
+  void shrink(Rect rect);
+
+  bool inside(Rect rect, bool absolute = false);
+  bool inside(int16_t x, int16_t y, bool absolute = false);
+  void info(const std::string &prefix = "rect info:");
+};
+
 class Font;
 class Image;
 class DisplayBuffer;
@@ -126,6 +151,7 @@ class DisplayBuffer {
   int get_width();
   /// Get the height of the image in pixels with rotation applied.
   int get_height();
+
   /// Set a single pixel at the specified coordinates to the given color.
   void draw_pixel_at(int x, int y, Color color = COLOR_ON);
 
@@ -374,6 +400,61 @@ class DisplayBuffer {
    */
   virtual DisplayType get_display_type() = 0;
 
+  ///
+  /// Set the clipping rectangle for further drawing
+  ///
+  /// \param[in]  rect:       Pointer to Rect for clipping (or NULL for entire screen)
+  ///
+  /// \return true if success, false if error
+  ///
+  void start_clipping(Rect rect);
+  void start_clipping(int16_t left, int16_t top, int16_t right, int16_t bottom) {
+    start_clipping(Rect(left, top, right - left, bottom - top));
+  };
+
+  ///
+  /// Add a rectangular region to the invalidation region
+  /// - This is usually called when an element has been modified
+  ///
+  /// \param[in]  rect: Rectangle to add to the invalidation region
+  ///
+  /// \return none
+  ///
+  void extend_clipping(Rect rect);
+  void extend_clipping(int16_t left, int16_t top, int16_t right, int16_t bottom) {
+    this->extend_clipping(Rect(left, top, right - left, bottom - top));
+  };
+
+  ///
+  /// substract a rectangular region to the invalidation region
+  /// - This is usually called when an element has been modified
+  ///
+  /// \param[in]  rect: Rectangle to add to the invalidation region
+  ///
+  /// \return none
+  ///
+  void shrink_clipping(Rect rect);
+  void shrink_clipping(uint16_t left, uint16_t top, uint16_t right, uint16_t bottom) {
+    this->shrink_clipping(Rect(left, top, right - left, bottom - top));
+  };
+
+  ///
+  /// Reset the invalidation region
+  ///
+  /// \return none
+  ///
+  void end_clipping();
+
+  ///
+  /// Get the current the clipping rectangle
+  ///
+  ///
+  /// \return rect for active clipping region
+  ///
+  Rect get_clipping();
+
+  bool is_clipping() const { return this->clipping_rectangle_.empty(); }
+
  protected:
   void vprintf_(int x, int y, Font *font, Color color, TextAlign align, const char *format, va_list arg);
 
@@ -390,6 +471,7 @@ class DisplayBuffer {
   DisplayPage *previous_page_{nullptr};
   std::vector<DisplayOnPageChangeTrigger *> on_page_change_triggers_;
   bool auto_clear_enabled_{true};
+  std::vector<Rect> clipping_rectangle_;
 };
 
 class DisplayPage {

From 310355a00b2de6dd86d0e7c2dc9c41e4ad691ceb Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Sun, 12 Feb 2023 17:03:53 +0100
Subject: [PATCH 552/838] Fix check for empty clipping array (#4421)

---
 esphome/components/display/display_buffer.cpp | 10 ++--
 esphome/components/display/display_buffer.h   | 58 ++++++++-----------
 2 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/esphome/components/display/display_buffer.cpp b/esphome/components/display/display_buffer.cpp
index 1b24ca94b9..9fe4137a14 100644
--- a/esphome/components/display/display_buffer.cpp
+++ b/esphome/components/display/display_buffer.cpp
@@ -16,11 +16,11 @@ const Color COLOR_OFF(0, 0, 0, 0);
 const Color COLOR_ON(255, 255, 255, 255);
 
 void Rect::expand(int16_t horizontal, int16_t vertical) {
-  if ((*this).is_set() && ((*this).w >= (-2 * horizontal)) && ((*this).h >= (-2 * vertical))) {
-    (*this).x = (*this).x - horizontal;
-    (*this).y = (*this).y - vertical;
-    (*this).w = (*this).w + (2 * horizontal);
-    (*this).h = (*this).h + (2 * vertical);
+  if (this->is_set() && (this->w >= (-2 * horizontal)) && (this->h >= (-2 * vertical))) {
+    this->x = this->x - horizontal;
+    this->y = this->y - vertical;
+    this->w = this->w + (2 * horizontal);
+    this->h = this->h + (2 * vertical);
   }
 }
 
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index 03d64f80d3..3763da8041 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -400,60 +400,48 @@ class DisplayBuffer {
    */
   virtual DisplayType get_display_type() = 0;
 
-  ///
-  /// Set the clipping rectangle for further drawing
-  ///
-  /// \param[in]  rect:       Pointer to Rect for clipping (or NULL for entire screen)
-  ///
-  /// \return true if success, false if error
-  ///
+  /** Set the clipping rectangle for further drawing
+   *
+   * @param[in]  rect:       Pointer to Rect for clipping (or NULL for entire screen)
+   *
+   * return true if success, false if error
+   */
   void start_clipping(Rect rect);
   void start_clipping(int16_t left, int16_t top, int16_t right, int16_t bottom) {
     start_clipping(Rect(left, top, right - left, bottom - top));
   };
 
-  ///
-  /// Add a rectangular region to the invalidation region
-  /// - This is usually called when an element has been modified
-  ///
-  /// \param[in]  rect: Rectangle to add to the invalidation region
-  ///
-  /// \return none
-  ///
+  /** Add a rectangular region to the invalidation region
+   * - This is usually called when an element has been modified
+   *
+   * @param[in]  rect: Rectangle to add to the invalidation region
+   */
   void extend_clipping(Rect rect);
   void extend_clipping(int16_t left, int16_t top, int16_t right, int16_t bottom) {
     this->extend_clipping(Rect(left, top, right - left, bottom - top));
   };
 
-  ///
-  /// substract a rectangular region to the invalidation region
-  /// - This is usually called when an element has been modified
-  ///
-  /// \param[in]  rect: Rectangle to add to the invalidation region
-  ///
-  /// \return none
-  ///
+  /** substract a rectangular region to the invalidation region
+   *  - This is usually called when an element has been modified
+   *
+   * @param[in]  rect: Rectangle to add to the invalidation region
+   */
   void shrink_clipping(Rect rect);
   void shrink_clipping(uint16_t left, uint16_t top, uint16_t right, uint16_t bottom) {
     this->shrink_clipping(Rect(left, top, right - left, bottom - top));
   };
 
-  ///
-  /// Reset the invalidation region
-  ///
-  /// \return none
-  ///
+  /** Reset the invalidation region
+   */
   void end_clipping();
 
-  ///
-  /// Get the current the clipping rectangle
-  ///
-  ///
-  /// \return rect for active clipping region
-  ///
+  /** Get the current the clipping rectangle
+   *
+   * return rect for active clipping region
+   */
   Rect get_clipping();
 
-  bool is_clipping() const { return this->clipping_rectangle_.empty(); }
+  bool is_clipping() const { return !this->clipping_rectangle_.empty(); }
 
  protected:
   void vprintf_(int x, int y, Font *font, Color color, TextAlign align, const char *format, va_list arg);

From d6b6e94059cbd518f1ae20144eb08628f2a03c31 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 13 Feb 2023 11:54:27 +1300
Subject: [PATCH 553/838] Bump version to 2023.2.0b4

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

diff --git a/esphome/const.py b/esphome/const.py
index ebadf84dc7..d62c4689ad 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.2.0b3"
+__version__ = "2023.2.0b4"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From b8c0f884404f3c5950d36d8715050186948e37fc Mon Sep 17 00:00:00 2001
From: Andre Borie <hi@rjevski.io>
Date: Mon, 13 Feb 2023 01:14:35 +0000
Subject: [PATCH 554/838] Improve tuya network status command (#4415)

---
 esphome/components/tuya/tuya.cpp | 29 +++++++++++++++++++++++++++--
 esphome/components/tuya/tuya.h   |  2 ++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/esphome/components/tuya/tuya.cpp b/esphome/components/tuya/tuya.cpp
index 89a687e5a6..efe214f6a3 100644
--- a/esphome/components/tuya/tuya.cpp
+++ b/esphome/components/tuya/tuya.cpp
@@ -5,6 +5,10 @@
 #include "esphome/core/util.h"
 #include "esphome/core/gpio.h"
 
+#ifdef USE_CAPTIVE_PORTAL
+#include "esphome/components/captive_portal/captive_portal.h"
+#endif
+
 namespace esphome {
 namespace tuya {
 
@@ -243,6 +247,14 @@ void Tuya::handle_command_(uint8_t command, uint8_t version, const uint8_t *buff
       ESP_LOGE(TAG, "LOCAL_TIME_QUERY is not handled");
 #endif
       break;
+    case TuyaCommandType::GET_NETWORK_STATUS: {
+      uint8_t wifi_status = this->get_wifi_status_code_();
+
+      this->send_command_(
+          TuyaCommand{.cmd = TuyaCommandType::GET_NETWORK_STATUS, .payload = std::vector<uint8_t>{wifi_status}});
+      ESP_LOGV(TAG, "Network status requested, reported as %i", wifi_status);
+      break;
+    }
     default:
       ESP_LOGE(TAG, "Invalid command (0x%02X) received", command);
   }
@@ -437,8 +449,9 @@ void Tuya::set_status_pin_() {
   this->status_pin_.value()->digital_write(is_network_ready);
 }
 
-void Tuya::send_wifi_status_() {
+uint8_t Tuya::get_wifi_status_code_() {
   uint8_t status = 0x02;
+
   if (network::is_connected()) {
     status = 0x03;
 
@@ -446,7 +459,19 @@ void Tuya::send_wifi_status_() {
     if (this->protocol_version_ >= 0x03 && remote_is_connected()) {
       status = 0x04;
     }
-  }
+  } else {
+#ifdef USE_CAPTIVE_PORTAL
+    if (captive_portal::global_captive_portal != nullptr && captive_portal::global_captive_portal->is_active()) {
+      status = 0x01;
+    }
+#endif
+  };
+
+  return status;
+}
+
+void Tuya::send_wifi_status_() {
+  uint8_t status = this->get_wifi_status_code_();
 
   if (status == this->wifi_status_) {
     return;
diff --git a/esphome/components/tuya/tuya.h b/esphome/components/tuya/tuya.h
index 5839dfbec0..cc13a64bdb 100644
--- a/esphome/components/tuya/tuya.h
+++ b/esphome/components/tuya/tuya.h
@@ -55,6 +55,7 @@ enum class TuyaCommandType : uint8_t {
   DATAPOINT_QUERY = 0x08,
   WIFI_TEST = 0x0E,
   LOCAL_TIME_QUERY = 0x1C,
+  GET_NETWORK_STATUS = 0x2B,
 };
 
 enum class TuyaInitState : uint8_t {
@@ -120,6 +121,7 @@ class Tuya : public Component, public uart::UARTDevice {
   void send_datapoint_command_(uint8_t datapoint_id, TuyaDatapointType datapoint_type, std::vector<uint8_t> data);
   void set_status_pin_();
   void send_wifi_status_();
+  uint8_t get_wifi_status_code_();
 
 #ifdef USE_TIME
   void send_local_time_();

From 78f5c417a42386814934648459fc370a82b06f47 Mon Sep 17 00:00:00 2001
From: Andre Borie <hi@rjevski.io>
Date: Mon, 13 Feb 2023 01:43:11 +0000
Subject: [PATCH 555/838] Gracefully reject vacuum map upload requests (#4414)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/tuya/tuya.cpp | 5 +++++
 esphome/components/tuya/tuya.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/esphome/components/tuya/tuya.cpp b/esphome/components/tuya/tuya.cpp
index efe214f6a3..fad4bb0bac 100644
--- a/esphome/components/tuya/tuya.cpp
+++ b/esphome/components/tuya/tuya.cpp
@@ -247,6 +247,11 @@ void Tuya::handle_command_(uint8_t command, uint8_t version, const uint8_t *buff
       ESP_LOGE(TAG, "LOCAL_TIME_QUERY is not handled");
 #endif
       break;
+    case TuyaCommandType::VACUUM_MAP_UPLOAD:
+      this->send_command_(
+          TuyaCommand{.cmd = TuyaCommandType::VACUUM_MAP_UPLOAD, .payload = std::vector<uint8_t>{0x01}});
+      ESP_LOGW(TAG, "Vacuum map upload requested, responding that it is not enabled.");
+      break;
     case TuyaCommandType::GET_NETWORK_STATUS: {
       uint8_t wifi_status = this->get_wifi_status_code_();
 
diff --git a/esphome/components/tuya/tuya.h b/esphome/components/tuya/tuya.h
index cc13a64bdb..b9c917f672 100644
--- a/esphome/components/tuya/tuya.h
+++ b/esphome/components/tuya/tuya.h
@@ -55,6 +55,7 @@ enum class TuyaCommandType : uint8_t {
   DATAPOINT_QUERY = 0x08,
   WIFI_TEST = 0x0E,
   LOCAL_TIME_QUERY = 0x1C,
+  VACUUM_MAP_UPLOAD = 0x28,
   GET_NETWORK_STATUS = 0x2B,
 };
 

From 7a2d7fdd19093c2170cbafdda7427c8a869f0dd7 Mon Sep 17 00:00:00 2001
From: Expaso <Expaso@users.noreply.github.com>
Date: Mon, 13 Feb 2023 03:43:52 +0100
Subject: [PATCH 556/838] Fixed PlatformIO Build on DEV (#4422)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/bedjet/bedjet_hub.cpp      |  4 ++++
 esphome/components/bedjet/bedjet_hub.h        |  3 +--
 esphome/components/ble_client/automation.cpp  |  4 ++++
 esphome/components/ble_client/automation.h    |  4 ++--
 esphome/components/esp32/post_build.py.script | 24 +++++++++++++------
 esphome/components/mqtt/mqtt_light.cpp        |  2 ++
 esphome/core/defines.h                        |  2 +-
 platformio.ini                                |  1 +
 8 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/esphome/components/bedjet/bedjet_hub.cpp b/esphome/components/bedjet/bedjet_hub.cpp
index f90ca5cf54..fbd2876dc9 100644
--- a/esphome/components/bedjet/bedjet_hub.cpp
+++ b/esphome/components/bedjet/bedjet_hub.cpp
@@ -1,3 +1,5 @@
+#ifdef USE_ESP32
+
 #include "bedjet_hub.h"
 #include "bedjet_child.h"
 #include "bedjet_const.h"
@@ -541,3 +543,5 @@ void BedJetHub::register_child(BedJetClient *obj) {
 
 }  // namespace bedjet
 }  // namespace esphome
+
+#endif
diff --git a/esphome/components/bedjet/bedjet_hub.h b/esphome/components/bedjet/bedjet_hub.h
index fb757dfdf8..e4af2bca51 100644
--- a/esphome/components/bedjet/bedjet_hub.h
+++ b/esphome/components/bedjet/bedjet_hub.h
@@ -1,4 +1,5 @@
 #pragma once
+#ifdef USE_ESP32
 
 #include "esphome/components/ble_client/ble_client.h"
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
@@ -14,8 +15,6 @@
 #include "esphome/components/time/real_time_clock.h"
 #endif
 
-#ifdef USE_ESP32
-
 #include <esp_gattc_api.h>
 
 namespace esphome {
diff --git a/esphome/components/ble_client/automation.cpp b/esphome/components/ble_client/automation.cpp
index 395950dd26..429f906a5f 100644
--- a/esphome/components/ble_client/automation.cpp
+++ b/esphome/components/ble_client/automation.cpp
@@ -1,3 +1,5 @@
+#ifdef USE_ESP32
+
 #include "automation.h"
 
 #include <esp_bt_defs.h>
@@ -73,3 +75,5 @@ void BLEWriterClientNode::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
 
 }  // namespace ble_client
 }  // namespace esphome
+
+#endif
diff --git a/esphome/components/ble_client/automation.h b/esphome/components/ble_client/automation.h
index ef38333698..45ddba9782 100644
--- a/esphome/components/ble_client/automation.h
+++ b/esphome/components/ble_client/automation.h
@@ -1,13 +1,13 @@
 #pragma once
 
+#ifdef USE_ESP32
+
 #include <utility>
 #include <vector>
 
 #include "esphome/core/automation.h"
 #include "esphome/components/ble_client/ble_client.h"
 
-#ifdef USE_ESP32
-
 namespace esphome {
 namespace ble_client {
 class BLEClientConnectTrigger : public Trigger<>, public BLEClientNode {
diff --git a/esphome/components/esp32/post_build.py.script b/esphome/components/esp32/post_build.py.script
index 406516a102..c941bdb386 100644
--- a/esphome/components/esp32/post_build.py.script
+++ b/esphome/components/esp32/post_build.py.script
@@ -1,15 +1,25 @@
 # Source https://github.com/letscontrolit/ESPEasy/pull/3845#issuecomment-1005864664
 
-import os
-if os.environ.get("ESPHOME_USE_SUBPROCESS") is None:
-    import esptool
-else:
-    import subprocess
-from SCons.Script import ARGUMENTS
-
 # pylint: disable=E0602
 Import("env")  # noqa
 
+import os
+import shutil
+
+if os.environ.get("ESPHOME_USE_SUBPROCESS") is None:
+    try:
+        import esptool
+    except ImportError:
+        env.Execute("$PYTHONEXE -m pip install esptool")
+else:
+    import subprocess
+from SCons.Script import ARGUMENTS
+
+# Copy over the default sdkconfig.
+from os import path
+if path.exists("./sdkconfig.defaults"):
+    os.makedirs(".temp", exist_ok=True)
+    shutil.copy("./sdkconfig.defaults", "./.temp/sdkconfig-esp32-idf")
 
 def esp32_create_combined_bin(source, target, env):
     verbose = bool(int(ARGUMENTS.get("PIOVERBOSE", "0")))
diff --git a/esphome/components/mqtt/mqtt_light.cpp b/esphome/components/mqtt/mqtt_light.cpp
index e2480acd62..f970da7d8c 100644
--- a/esphome/components/mqtt/mqtt_light.cpp
+++ b/esphome/components/mqtt/mqtt_light.cpp
@@ -3,6 +3,7 @@
 
 #include "mqtt_const.h"
 
+#ifdef USE_JSON
 #ifdef USE_MQTT
 #ifdef USE_LIGHT
 
@@ -83,3 +84,4 @@ void MQTTJSONLightComponent::dump_config() {
 
 #endif
 #endif  // USE_MQTT
+#endif  // USE_JSON
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index 01fc16cc02..c3738c0365 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -25,6 +25,7 @@
 #define USE_FAN
 #define USE_GRAPH
 #define USE_HOMEASSISTANT_TIME
+#define USE_JSON
 #define USE_LIGHT
 #define USE_LOCK
 #define USE_LOGGER
@@ -50,7 +51,6 @@
 // Arduino-specific feature flags
 #ifdef USE_ARDUINO
 #define USE_CAPTIVE_PORTAL
-#define USE_JSON
 #define USE_NEXTION_TFT_UPLOAD
 #define USE_PROMETHEUS
 #define USE_WEBSERVER
diff --git a/platformio.ini b/platformio.ini
index b92a1407ed..ef5820c4ad 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -185,6 +185,7 @@ build_flags =
 [env:esp32-arduino]
 extends = common:esp32-arduino
 board = esp32dev
+board_build.partitions = huge_app.csv
 build_flags =
     ${common:esp32-arduino.build_flags}
     ${flags:runtime.build_flags}

From 3a101e8ec54524eb5f7859b6e14641f54eee910c Mon Sep 17 00:00:00 2001
From: WitchKing <31471327+xvil@users.noreply.github.com>
Date: Mon, 13 Feb 2023 03:53:40 +0100
Subject: [PATCH 557/838] Ledc fix (#4338)

---
 esphome/components/ledc/ledc_output.cpp | 140 +++++++++++++++++++-----
 1 file changed, 115 insertions(+), 25 deletions(-)

diff --git a/esphome/components/ledc/ledc_output.cpp b/esphome/components/ledc/ledc_output.cpp
index 34cf4cd1f6..d6241dd5b0 100644
--- a/esphome/components/ledc/ledc_output.cpp
+++ b/esphome/components/ledc/ledc_output.cpp
@@ -8,6 +8,20 @@
 #endif
 #include <driver/ledc.h>
 
+#define CLOCK_FREQUENCY 80e6f
+
+#ifdef USE_ARDUINO
+#ifdef SOC_LEDC_SUPPORT_XTAL_CLOCK
+#undef CLOCK_FREQUENCY
+// starting with ESP32 Arduino 2.0.2, the 40MHz crystal is used as clock by default if supported
+#define CLOCK_FREQUENCY 40e6f
+#endif
+#else
+#define DEFAULT_CLK LEDC_USE_APB_CLK
+#endif
+
+static const uint8_t SETUP_ATTEMPT_COUNT_MAX = 5;
+
 namespace esphome {
 namespace ledc {
 
@@ -26,11 +40,11 @@ inline ledc_mode_t get_speed_mode(uint8_t) { return LEDC_LOW_SPEED_MODE; }
 #endif
 #endif
 
-float ledc_max_frequency_for_bit_depth(uint8_t bit_depth) { return 80e6f / float(1 << bit_depth); }
+float ledc_max_frequency_for_bit_depth(uint8_t bit_depth) { return CLOCK_FREQUENCY / float(1 << bit_depth); }
 
 float ledc_min_frequency_for_bit_depth(uint8_t bit_depth, bool low_frequency) {
   const float max_div_num = ((1 << MAX_RES_BITS) - 1) / (low_frequency ? 32.0f : 256.0f);
-  return 80e6f / (max_div_num * float(1 << bit_depth));
+  return CLOCK_FREQUENCY / (max_div_num * float(1 << bit_depth));
 }
 
 optional<uint8_t> ledc_bit_depth_for_frequency(float frequency) {
@@ -46,6 +60,38 @@ optional<uint8_t> ledc_bit_depth_for_frequency(float frequency) {
   return {};
 }
 
+#ifdef USE_ESP_IDF
+esp_err_t configure_timer_frequency(ledc_mode_t speed_mode, ledc_timer_t timer_num, ledc_channel_t chan_num,
+                                    uint8_t channel, uint8_t &bit_depth, float frequency) {
+  bit_depth = *ledc_bit_depth_for_frequency(frequency);
+  if (bit_depth < 1) {
+    ESP_LOGE(TAG, "Frequency %f can't be achieved with any bit depth", frequency);
+  }
+
+  ledc_timer_config_t timer_conf{};
+  timer_conf.speed_mode = speed_mode;
+  timer_conf.duty_resolution = static_cast<ledc_timer_bit_t>(bit_depth);
+  timer_conf.timer_num = timer_num;
+  timer_conf.freq_hz = (uint32_t) frequency;
+  timer_conf.clk_cfg = DEFAULT_CLK;
+
+  // Configure the time with fallback in case of error
+  int attempt_count_max = SETUP_ATTEMPT_COUNT_MAX;
+  esp_err_t init_result = ESP_FAIL;
+  while (attempt_count_max > 0 && init_result != ESP_OK) {
+    init_result = ledc_timer_config(&timer_conf);
+    if (init_result != ESP_OK) {
+      ESP_LOGW(TAG, "Unable to initialize timer with frequency %.1f and bit depth of %u", frequency, bit_depth);
+      // try again with a lower bit depth
+      timer_conf.duty_resolution = static_cast<ledc_timer_bit_t>(--bit_depth);
+    }
+    attempt_count_max--;
+  }
+
+  return init_result;
+}
+#endif
+
 void LEDCOutput::write_state(float state) {
   if (!initialized_) {
     ESP_LOGW(TAG, "LEDC output hasn't been initialized yet!");
@@ -61,6 +107,7 @@ void LEDCOutput::write_state(float state) {
   auto duty = static_cast<uint32_t>(duty_rounded);
 
 #ifdef USE_ARDUINO
+  ESP_LOGV(TAG, "Setting duty: %u on channel %u", duty, this->channel_);
   ledcWrite(this->channel_, duty);
 #endif
 #ifdef USE_ESP_IDF
@@ -72,6 +119,7 @@ void LEDCOutput::write_state(float state) {
 }
 
 void LEDCOutput::setup() {
+  ESP_LOGV(TAG, "Entering setup...");
 #ifdef USE_ARDUINO
   this->update_frequency(this->frequency_);
   this->turn_off();
@@ -83,19 +131,16 @@ void LEDCOutput::setup() {
   auto timer_num = static_cast<ledc_timer_t>((channel_ % 8) / 2);
   auto chan_num = static_cast<ledc_channel_t>(channel_ % 8);
 
-  bit_depth_ = *ledc_bit_depth_for_frequency(frequency_);
-  if (bit_depth_ < 1) {
-    ESP_LOGW(TAG, "Frequency %f can't be achieved with any bit depth", frequency_);
-    this->status_set_warning();
+  esp_err_t timer_init_result =
+      configure_timer_frequency(speed_mode, timer_num, chan_num, this->channel_, this->bit_depth_, this->frequency_);
+
+  if (timer_init_result != ESP_OK) {
+    ESP_LOGE(TAG, "Frequency %f can't be achieved with computed bit depth %u", this->frequency_, this->bit_depth_);
+    this->status_set_error();
+    return;
   }
 
-  ledc_timer_config_t timer_conf{};
-  timer_conf.speed_mode = speed_mode;
-  timer_conf.duty_resolution = static_cast<ledc_timer_bit_t>(bit_depth_);
-  timer_conf.timer_num = timer_num;
-  timer_conf.freq_hz = (uint32_t) frequency_;
-  timer_conf.clk_cfg = LEDC_AUTO_CLK;
-  ledc_timer_config(&timer_conf);
+  ESP_LOGV(TAG, "Configured frequency %f with a bit depth of %u bits", this->frequency_, this->bit_depth_);
 
   ledc_channel_config_t chan_conf{};
   chan_conf.gpio_num = pin_->get_pin();
@@ -107,6 +152,7 @@ void LEDCOutput::setup() {
   chan_conf.hpoint = 0;
   ledc_channel_config(&chan_conf);
   initialized_ = true;
+  this->status_clear_error();
 #endif
 }
 
@@ -114,36 +160,80 @@ void LEDCOutput::dump_config() {
   ESP_LOGCONFIG(TAG, "LEDC Output:");
   LOG_PIN("  Pin ", this->pin_);
   ESP_LOGCONFIG(TAG, "  LEDC Channel: %u", this->channel_);
-  ESP_LOGCONFIG(TAG, "  Frequency: %.1f Hz", this->frequency_);
+  ESP_LOGCONFIG(TAG, "  PWM Frequency: %.1f Hz", this->frequency_);
+  ESP_LOGCONFIG(TAG, "  Bit depth: %u", this->bit_depth_);
+  ESP_LOGV(TAG, "  Max frequency for bit depth: %f", ledc_max_frequency_for_bit_depth(this->bit_depth_));
+  ESP_LOGV(TAG, "  Min frequency for bit depth: %f",
+           ledc_min_frequency_for_bit_depth(this->bit_depth_, (this->frequency_ < 100)));
+  ESP_LOGV(TAG, "  Max frequency for bit depth-1: %f", ledc_max_frequency_for_bit_depth(this->bit_depth_ - 1));
+  ESP_LOGV(TAG, "  Min frequency for bit depth-1: %f",
+           ledc_min_frequency_for_bit_depth(this->bit_depth_ - 1, (this->frequency_ < 100)));
+  ESP_LOGV(TAG, "  Max frequency for bit depth+1: %f", ledc_max_frequency_for_bit_depth(this->bit_depth_ + 1));
+  ESP_LOGV(TAG, "  Min frequency for bit depth+1: %f",
+           ledc_min_frequency_for_bit_depth(this->bit_depth_ + 1, (this->frequency_ < 100)));
+  ESP_LOGV(TAG, "  Max res bits: %d", MAX_RES_BITS);
+  ESP_LOGV(TAG, "  Clock frequency: %f", CLOCK_FREQUENCY);
 }
 
 void LEDCOutput::update_frequency(float frequency) {
   auto bit_depth_opt = ledc_bit_depth_for_frequency(frequency);
   if (!bit_depth_opt.has_value()) {
-    ESP_LOGW(TAG, "Frequency %f can't be achieved with any bit depth", frequency);
-    this->status_set_warning();
+    ESP_LOGE(TAG, "Frequency %f can't be achieved with any bit depth", this->frequency_);
+    this->status_set_error();
   }
   this->bit_depth_ = bit_depth_opt.value_or(8);
   this->frequency_ = frequency;
 #ifdef USE_ARDUINO
-  ledcSetup(this->channel_, frequency, this->bit_depth_);
-  initialized_ = true;
+  ESP_LOGV(TAG, "Using Arduino API - Trying to define channel, frequency and bit depth...");
+  u_int32_t configured_frequency = 0;
+
+  // Configure LEDC channel, frequency and bit depth with fallback
+  int attempt_count_max = SETUP_ATTEMPT_COUNT_MAX;
+  while (attempt_count_max > 0 && configured_frequency == 0) {
+    ESP_LOGV(TAG, "Trying initialize channel %u with frequency %.1f and bit depth of %u...", this->channel_,
+             this->frequency_, this->bit_depth_);
+    configured_frequency = ledcSetup(this->channel_, frequency, this->bit_depth_);
+    if (configured_frequency != 0) {
+      initialized_ = true;
+      this->status_clear_error();
+      ESP_LOGV(TAG, "Configured frequency: %u with bit depth: %u", configured_frequency, this->bit_depth_);
+    } else {
+      ESP_LOGW(TAG, "Unable to initialize channel %u with frequency %.1f and bit depth of %u", this->channel_,
+               this->frequency_, this->bit_depth_);
+      // try again with a lower bit depth
+      this->bit_depth_--;
+    }
+    attempt_count_max--;
+  }
+
+  if (configured_frequency == 0) {
+    ESP_LOGE(TAG, "Permanently failed to initialize channel %u with frequency %.1f and bit depth of %u", this->channel_,
+             this->frequency_, this->bit_depth_);
+    this->status_set_error();
+    return;
+  }
+
 #endif  // USE_ARDUINO
 #ifdef USE_ESP_IDF
   if (!initialized_) {
     ESP_LOGW(TAG, "LEDC output hasn't been initialized yet!");
     return;
   }
+
   auto speed_mode = get_speed_mode(channel_);
   auto timer_num = static_cast<ledc_timer_t>((channel_ % 8) / 2);
+  auto chan_num = static_cast<ledc_channel_t>(channel_ % 8);
 
-  ledc_timer_config_t timer_conf{};
-  timer_conf.speed_mode = speed_mode;
-  timer_conf.duty_resolution = static_cast<ledc_timer_bit_t>(bit_depth_);
-  timer_conf.timer_num = timer_num;
-  timer_conf.freq_hz = (uint32_t) frequency_;
-  timer_conf.clk_cfg = LEDC_AUTO_CLK;
-  ledc_timer_config(&timer_conf);
+  esp_err_t timer_init_result =
+      configure_timer_frequency(speed_mode, timer_num, chan_num, this->channel_, this->bit_depth_, this->frequency_);
+
+  if (timer_init_result != ESP_OK) {
+    ESP_LOGE(TAG, "Frequency %f can't be achieved with computed bit depth %u", this->frequency_, this->bit_depth_);
+    this->status_set_error();
+    return;
+  }
+
+  this->status_clear_error();
 #endif
   // re-apply duty
   this->write_state(this->duty_);

From dfeeccfcca2ad452535cc9864d63f98e6dcf1b1c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 14 Feb 2023 11:38:05 +1300
Subject: [PATCH 558/838] Add version api endpoint (#4429)

---
 esphome/dashboard/dashboard.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 6c7188a4ac..7fffdee00c 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -545,6 +545,14 @@ class DownloadBinaryRequestHandler(BaseHandler):
         self.finish()
 
 
+class EsphomeVersionHandler(BaseHandler):
+    @authenticated
+    def get(self):
+        self.set_header("Content-Type", "application/json")
+        self.write(json.dumps({"version": const.__version__}))
+        self.finish()
+
+
 def _list_dashboard_entries():
     files = settings.list_yaml_files()
     return [DashboardEntry(file) for file in files]
@@ -1134,6 +1142,7 @@ def make_app(debug=get_bool_env(ENV_DEV)):
             (f"{rel}rename", EsphomeRenameHandler),
             (f"{rel}prometheus-sd", PrometheusServiceDiscoveryHandler),
             (f"{rel}boards/([a-z0-9]+)", BoardsRequestHandler),
+            (f"{rel}version", EsphomeVersionHandler),
         ],
         **app_settings,
     )

From 4f4ca61ada3f023a103768508ae621cf468f3fe7 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 14 Feb 2023 11:38:21 +1300
Subject: [PATCH 559/838] Handle uart.write in json-config endpoint (#4430)

---
 esphome/dashboard/dashboard.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 7fffdee00c..0bc1b0886a 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -1007,8 +1007,14 @@ class SafeLoaderIgnoreUnknown(yaml.SafeLoader):
     def ignore_unknown(self, node):
         return f"{node.tag} {node.value}"
 
+    def construct_yaml_binary(self, node) -> str:
+        return super().construct_yaml_binary(node).decode("ascii")
+
 
 SafeLoaderIgnoreUnknown.add_constructor(None, SafeLoaderIgnoreUnknown.ignore_unknown)
+SafeLoaderIgnoreUnknown.add_constructor(
+    "tag:yaml.org,2002:binary", SafeLoaderIgnoreUnknown.construct_yaml_binary
+)
 
 
 class JsonConfigRequestHandler(BaseHandler):

From 458d6e24fc1c71346a2f99e37376f802796c9b89 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 14 Feb 2023 11:38:37 +1300
Subject: [PATCH 560/838] Bump esphome-dashboard to 20230214.0 (#4431)

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

diff --git a/requirements.txt b/requirements.txt
index 9d59e0a1d2..9f4d34528c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.1.5  # When updating platformio, also update Dockerfile
 esptool==4.4
 click==8.1.3
-esphome-dashboard==20230120.0
+esphome-dashboard==20230214.0
 aioesphomeapi==13.1.0
 zeroconf==0.47.1
 

From b4068dac565dcacfccf914a8a3831595e81582a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Feb 2023 11:41:14 +1300
Subject: [PATCH 561/838] Bump platformio from 6.1.5 to 6.1.6 (#4341)

* Bump platformio from 6.1.5 to 6.1.6

Bumps [platformio](https://github.com/platformio/platformio) from 6.1.5 to 6.1.6.
- [Release notes](https://github.com/platformio/platformio/releases)
- [Changelog](https://github.com/platformio/platformio-core/blob/develop/HISTORY.rst)
- [Commits](https://github.com/platformio/platformio/compare/v6.1.5...v6.1.6)

---
updated-dependencies:
- dependency-name: platformio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update dockerfile

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 docker/Dockerfile | 2 +-
 requirements.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index ddc666cf6a..dc9c4b7101 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -51,7 +51,7 @@ RUN \
     # Ubuntu python3-pip is missing wheel
     pip3 install --no-cache-dir \
         wheel==0.37.1 \
-        platformio==6.1.5 \
+        platformio==6.1.6 \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
     && platformio settings set check_platformio_interval 1000000 \
diff --git a/requirements.txt b/requirements.txt
index 9f4d34528c..f59f458e00 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ tornado==6.2
 tzlocal==4.2    # from time
 tzdata>=2021.1  # from time
 pyserial==3.5
-platformio==6.1.5  # When updating platformio, also update Dockerfile
+platformio==6.1.6  # When updating platformio, also update Dockerfile
 esptool==4.4
 click==8.1.3
 esphome-dashboard==20230214.0

From 5997401e9e9ab19e24ae6bba33ef6bd8670b4df0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Feb 2023 11:55:36 +1300
Subject: [PATCH 562/838] Bump pylint from 2.15.10 to 2.16.2 (#4426)

* Bump pylint from 2.15.10 to 2.16.2

Bumps [pylint](https://github.com/PyCQA/pylint) from 2.15.10 to 2.16.2.
- [Release notes](https://github.com/PyCQA/pylint/releases)
- [Commits](https://github.com/PyCQA/pylint/compare/v2.15.10...v2.16.2)

---
updated-dependencies:
- dependency-name: pylint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Lint

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/cpp_generator.py       | 7 +++----
 esphome/dashboard/dashboard.py | 2 +-
 esphome/loader.py              | 8 ++++----
 requirements_test.txt          | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/esphome/cpp_generator.py b/esphome/cpp_generator.py
index a423554d10..789bd58e5c 100644
--- a/esphome/cpp_generator.py
+++ b/esphome/cpp_generator.py
@@ -174,10 +174,9 @@ class ArrayInitializer(Expression):
         if not self.args:
             return "{}"
         if self.multiline:
-            cpp = "{\n"
-            for arg in self.args:
-                cpp += f"  {arg},\n"
-            cpp += "}"
+            cpp = "{\n  "
+            cpp += ",\n  ".join(str(arg) for arg in self.args)
+            cpp += ",\n}"
         else:
             cpp = f"{{{', '.join(str(arg) for arg in self.args)}}}"
         return cpp
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 0bc1b0886a..1a50592a2d 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -753,7 +753,7 @@ class BoardsRequestHandler(BaseHandler):
         platform_boards = {key: val[const.KEY_NAME] for key, val in boards.items()}
         # sort by board title
         boards_items = sorted(platform_boards.items(), key=lambda item: item[1])
-        output = [dict(items=dict(boards_items))]
+        output = [{"items": dict(boards_items)}]
 
         self.set_header("content-type", "application/json")
         self.write(json.dumps(output))
diff --git a/esphome/loader.py b/esphome/loader.py
index a0676eb90e..b245fa1610 100644
--- a/esphome/loader.py
+++ b/esphome/loader.py
@@ -167,10 +167,10 @@ def _lookup_module(domain):
     except Exception:  # pylint: disable=broad-except
         _LOGGER.error("Unable to load component %s:", domain, exc_info=True)
         return None
-    else:
-        manif = ComponentManifest(module)
-        _COMPONENT_CACHE[domain] = manif
-        return manif
+
+    manif = ComponentManifest(module)
+    _COMPONENT_CACHE[domain] = manif
+    return manif
 
 
 def get_component(domain):
diff --git a/requirements_test.txt b/requirements_test.txt
index a1c0845089..1e63f79b5e 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,4 +1,4 @@
-pylint==2.15.10
+pylint==2.16.2
 flake8==6.0.0  # also change in .pre-commit-config.yaml when updating
 black==23.1.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.3.1  # also change in .pre-commit-config.yaml when updating

From 025cf6320fc291b2bb9c942aa1b95dcdbe39054d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Feb 2023 11:56:14 +1300
Subject: [PATCH 563/838] Bump aioesphomeapi from 13.1.0 to 13.3.1 (#4427)

Bumps [aioesphomeapi](https://github.com/esphome/aioesphomeapi) from 13.1.0 to 13.3.1.
- [Release notes](https://github.com/esphome/aioesphomeapi/releases)
- [Commits](https://github.com/esphome/aioesphomeapi/compare/v13.1.0...v13.3.1)

---
updated-dependencies:
- dependency-name: aioesphomeapi
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
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 f59f458e00..00295af2b9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.6  # When updating platformio, also update Dockerfile
 esptool==4.4
 click==8.1.3
 esphome-dashboard==20230214.0
-aioesphomeapi==13.1.0
+aioesphomeapi==13.3.1
 zeroconf==0.47.1
 
 # esp-idf requires this, but doesn't bundle it by default

From 0d52f555b28570fee356332947e71234568f0dad Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 14 Feb 2023 12:07:09 +1300
Subject: [PATCH 564/838] Add concurrency limit to ci-docker (#4407)

---
 .github/workflows/ci-docker.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index 86035b9259..1d2a1b5323 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -23,6 +23,11 @@ permissions:
   contents: read
   packages: read
 
+concurrency:
+  # yamllint disable-line rule:line-length
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check-docker:
     name: Build docker containers

From c02871fdfefe683de3d2a9e234b6e79be503aa29 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 14 Feb 2023 12:54:38 +1300
Subject: [PATCH 565/838] Add final job so branch protection can require matrix
 ci steps (#4432)

---
 .github/workflows/ci.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c28c8c485c..782fc5cb32 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -187,3 +187,16 @@ jobs:
         run: script/ci-suggest-changes
         # yamllint disable-line rule:line-length
         if: always() && (matrix.id == 'clang-tidy' || matrix.id == 'clang-format' || matrix.id == 'lint-python')
+
+  ci-status:
+    name: CI Status
+    runs-on: ubuntu-latest
+    needs: [ci]
+    if: always()
+    steps:
+      - name: Successful deploy
+        if: ${{ !(contains(needs.*.result, 'failure')) }}
+        run: exit 0
+      - name: Failing deploy
+        if: ${{ contains(needs.*.result, 'failure') }}
+        run: exit 1

From a0d04ba091c76bd09d4d4be0a6a97cf6f86ff8df Mon Sep 17 00:00:00 2001
From: Sergey Dudanov <sergey.dudanov@gmail.com>
Date: Tue, 14 Feb 2023 04:34:50 +0400
Subject: [PATCH 566/838] Fix setting wrong traits on midea climate component
 (#4425)

* Fix issue3914

* Remove also default presets and modes

* Fix traits after autoconf
---
 esphome/components/midea/air_conditioner.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/esphome/components/midea/air_conditioner.cpp b/esphome/components/midea/air_conditioner.cpp
index 1ad5ade53d..b5bf43b64f 100644
--- a/esphome/components/midea/air_conditioner.cpp
+++ b/esphome/components/midea/air_conditioner.cpp
@@ -84,18 +84,18 @@ ClimateTraits AirConditioner::traits() {
   traits.set_supported_custom_presets(this->supported_custom_presets_);
   traits.set_supported_custom_fan_modes(this->supported_custom_fan_modes_);
   /* + MINIMAL SET OF CAPABILITIES */
-  traits.add_supported_mode(ClimateMode::CLIMATE_MODE_OFF);
-  traits.add_supported_mode(ClimateMode::CLIMATE_MODE_FAN_ONLY);
   traits.add_supported_fan_mode(ClimateFanMode::CLIMATE_FAN_AUTO);
   traits.add_supported_fan_mode(ClimateFanMode::CLIMATE_FAN_LOW);
   traits.add_supported_fan_mode(ClimateFanMode::CLIMATE_FAN_MEDIUM);
   traits.add_supported_fan_mode(ClimateFanMode::CLIMATE_FAN_HIGH);
-  traits.add_supported_swing_mode(ClimateSwingMode::CLIMATE_SWING_OFF);
-  traits.add_supported_swing_mode(ClimateSwingMode::CLIMATE_SWING_VERTICAL);
-  traits.add_supported_preset(ClimatePreset::CLIMATE_PRESET_NONE);
-  traits.add_supported_preset(ClimatePreset::CLIMATE_PRESET_SLEEP);
   if (this->base_.getAutoconfStatus() == dudanov::midea::AUTOCONF_OK)
     Converters::to_climate_traits(traits, this->base_.getCapabilities());
+  if (!traits.get_supported_modes().empty())
+    traits.add_supported_mode(ClimateMode::CLIMATE_MODE_OFF);
+  if (!traits.get_supported_swing_modes().empty())
+    traits.add_supported_swing_mode(ClimateSwingMode::CLIMATE_SWING_OFF);
+  if (!traits.get_supported_presets().empty())
+    traits.add_supported_preset(ClimatePreset::CLIMATE_PRESET_NONE);
   return traits;
 }
 

From 78e18256f740acb6d4cf607fc6fb9b2e6bfa9470 Mon Sep 17 00:00:00 2001
From: WitchKing <31471327+xvil@users.noreply.github.com>
Date: Mon, 13 Feb 2023 03:53:40 +0100
Subject: [PATCH 567/838] Ledc fix (#4338)

---
 esphome/components/ledc/ledc_output.cpp | 140 +++++++++++++++++++-----
 1 file changed, 115 insertions(+), 25 deletions(-)

diff --git a/esphome/components/ledc/ledc_output.cpp b/esphome/components/ledc/ledc_output.cpp
index 34cf4cd1f6..d6241dd5b0 100644
--- a/esphome/components/ledc/ledc_output.cpp
+++ b/esphome/components/ledc/ledc_output.cpp
@@ -8,6 +8,20 @@
 #endif
 #include <driver/ledc.h>
 
+#define CLOCK_FREQUENCY 80e6f
+
+#ifdef USE_ARDUINO
+#ifdef SOC_LEDC_SUPPORT_XTAL_CLOCK
+#undef CLOCK_FREQUENCY
+// starting with ESP32 Arduino 2.0.2, the 40MHz crystal is used as clock by default if supported
+#define CLOCK_FREQUENCY 40e6f
+#endif
+#else
+#define DEFAULT_CLK LEDC_USE_APB_CLK
+#endif
+
+static const uint8_t SETUP_ATTEMPT_COUNT_MAX = 5;
+
 namespace esphome {
 namespace ledc {
 
@@ -26,11 +40,11 @@ inline ledc_mode_t get_speed_mode(uint8_t) { return LEDC_LOW_SPEED_MODE; }
 #endif
 #endif
 
-float ledc_max_frequency_for_bit_depth(uint8_t bit_depth) { return 80e6f / float(1 << bit_depth); }
+float ledc_max_frequency_for_bit_depth(uint8_t bit_depth) { return CLOCK_FREQUENCY / float(1 << bit_depth); }
 
 float ledc_min_frequency_for_bit_depth(uint8_t bit_depth, bool low_frequency) {
   const float max_div_num = ((1 << MAX_RES_BITS) - 1) / (low_frequency ? 32.0f : 256.0f);
-  return 80e6f / (max_div_num * float(1 << bit_depth));
+  return CLOCK_FREQUENCY / (max_div_num * float(1 << bit_depth));
 }
 
 optional<uint8_t> ledc_bit_depth_for_frequency(float frequency) {
@@ -46,6 +60,38 @@ optional<uint8_t> ledc_bit_depth_for_frequency(float frequency) {
   return {};
 }
 
+#ifdef USE_ESP_IDF
+esp_err_t configure_timer_frequency(ledc_mode_t speed_mode, ledc_timer_t timer_num, ledc_channel_t chan_num,
+                                    uint8_t channel, uint8_t &bit_depth, float frequency) {
+  bit_depth = *ledc_bit_depth_for_frequency(frequency);
+  if (bit_depth < 1) {
+    ESP_LOGE(TAG, "Frequency %f can't be achieved with any bit depth", frequency);
+  }
+
+  ledc_timer_config_t timer_conf{};
+  timer_conf.speed_mode = speed_mode;
+  timer_conf.duty_resolution = static_cast<ledc_timer_bit_t>(bit_depth);
+  timer_conf.timer_num = timer_num;
+  timer_conf.freq_hz = (uint32_t) frequency;
+  timer_conf.clk_cfg = DEFAULT_CLK;
+
+  // Configure the time with fallback in case of error
+  int attempt_count_max = SETUP_ATTEMPT_COUNT_MAX;
+  esp_err_t init_result = ESP_FAIL;
+  while (attempt_count_max > 0 && init_result != ESP_OK) {
+    init_result = ledc_timer_config(&timer_conf);
+    if (init_result != ESP_OK) {
+      ESP_LOGW(TAG, "Unable to initialize timer with frequency %.1f and bit depth of %u", frequency, bit_depth);
+      // try again with a lower bit depth
+      timer_conf.duty_resolution = static_cast<ledc_timer_bit_t>(--bit_depth);
+    }
+    attempt_count_max--;
+  }
+
+  return init_result;
+}
+#endif
+
 void LEDCOutput::write_state(float state) {
   if (!initialized_) {
     ESP_LOGW(TAG, "LEDC output hasn't been initialized yet!");
@@ -61,6 +107,7 @@ void LEDCOutput::write_state(float state) {
   auto duty = static_cast<uint32_t>(duty_rounded);
 
 #ifdef USE_ARDUINO
+  ESP_LOGV(TAG, "Setting duty: %u on channel %u", duty, this->channel_);
   ledcWrite(this->channel_, duty);
 #endif
 #ifdef USE_ESP_IDF
@@ -72,6 +119,7 @@ void LEDCOutput::write_state(float state) {
 }
 
 void LEDCOutput::setup() {
+  ESP_LOGV(TAG, "Entering setup...");
 #ifdef USE_ARDUINO
   this->update_frequency(this->frequency_);
   this->turn_off();
@@ -83,19 +131,16 @@ void LEDCOutput::setup() {
   auto timer_num = static_cast<ledc_timer_t>((channel_ % 8) / 2);
   auto chan_num = static_cast<ledc_channel_t>(channel_ % 8);
 
-  bit_depth_ = *ledc_bit_depth_for_frequency(frequency_);
-  if (bit_depth_ < 1) {
-    ESP_LOGW(TAG, "Frequency %f can't be achieved with any bit depth", frequency_);
-    this->status_set_warning();
+  esp_err_t timer_init_result =
+      configure_timer_frequency(speed_mode, timer_num, chan_num, this->channel_, this->bit_depth_, this->frequency_);
+
+  if (timer_init_result != ESP_OK) {
+    ESP_LOGE(TAG, "Frequency %f can't be achieved with computed bit depth %u", this->frequency_, this->bit_depth_);
+    this->status_set_error();
+    return;
   }
 
-  ledc_timer_config_t timer_conf{};
-  timer_conf.speed_mode = speed_mode;
-  timer_conf.duty_resolution = static_cast<ledc_timer_bit_t>(bit_depth_);
-  timer_conf.timer_num = timer_num;
-  timer_conf.freq_hz = (uint32_t) frequency_;
-  timer_conf.clk_cfg = LEDC_AUTO_CLK;
-  ledc_timer_config(&timer_conf);
+  ESP_LOGV(TAG, "Configured frequency %f with a bit depth of %u bits", this->frequency_, this->bit_depth_);
 
   ledc_channel_config_t chan_conf{};
   chan_conf.gpio_num = pin_->get_pin();
@@ -107,6 +152,7 @@ void LEDCOutput::setup() {
   chan_conf.hpoint = 0;
   ledc_channel_config(&chan_conf);
   initialized_ = true;
+  this->status_clear_error();
 #endif
 }
 
@@ -114,36 +160,80 @@ void LEDCOutput::dump_config() {
   ESP_LOGCONFIG(TAG, "LEDC Output:");
   LOG_PIN("  Pin ", this->pin_);
   ESP_LOGCONFIG(TAG, "  LEDC Channel: %u", this->channel_);
-  ESP_LOGCONFIG(TAG, "  Frequency: %.1f Hz", this->frequency_);
+  ESP_LOGCONFIG(TAG, "  PWM Frequency: %.1f Hz", this->frequency_);
+  ESP_LOGCONFIG(TAG, "  Bit depth: %u", this->bit_depth_);
+  ESP_LOGV(TAG, "  Max frequency for bit depth: %f", ledc_max_frequency_for_bit_depth(this->bit_depth_));
+  ESP_LOGV(TAG, "  Min frequency for bit depth: %f",
+           ledc_min_frequency_for_bit_depth(this->bit_depth_, (this->frequency_ < 100)));
+  ESP_LOGV(TAG, "  Max frequency for bit depth-1: %f", ledc_max_frequency_for_bit_depth(this->bit_depth_ - 1));
+  ESP_LOGV(TAG, "  Min frequency for bit depth-1: %f",
+           ledc_min_frequency_for_bit_depth(this->bit_depth_ - 1, (this->frequency_ < 100)));
+  ESP_LOGV(TAG, "  Max frequency for bit depth+1: %f", ledc_max_frequency_for_bit_depth(this->bit_depth_ + 1));
+  ESP_LOGV(TAG, "  Min frequency for bit depth+1: %f",
+           ledc_min_frequency_for_bit_depth(this->bit_depth_ + 1, (this->frequency_ < 100)));
+  ESP_LOGV(TAG, "  Max res bits: %d", MAX_RES_BITS);
+  ESP_LOGV(TAG, "  Clock frequency: %f", CLOCK_FREQUENCY);
 }
 
 void LEDCOutput::update_frequency(float frequency) {
   auto bit_depth_opt = ledc_bit_depth_for_frequency(frequency);
   if (!bit_depth_opt.has_value()) {
-    ESP_LOGW(TAG, "Frequency %f can't be achieved with any bit depth", frequency);
-    this->status_set_warning();
+    ESP_LOGE(TAG, "Frequency %f can't be achieved with any bit depth", this->frequency_);
+    this->status_set_error();
   }
   this->bit_depth_ = bit_depth_opt.value_or(8);
   this->frequency_ = frequency;
 #ifdef USE_ARDUINO
-  ledcSetup(this->channel_, frequency, this->bit_depth_);
-  initialized_ = true;
+  ESP_LOGV(TAG, "Using Arduino API - Trying to define channel, frequency and bit depth...");
+  u_int32_t configured_frequency = 0;
+
+  // Configure LEDC channel, frequency and bit depth with fallback
+  int attempt_count_max = SETUP_ATTEMPT_COUNT_MAX;
+  while (attempt_count_max > 0 && configured_frequency == 0) {
+    ESP_LOGV(TAG, "Trying initialize channel %u with frequency %.1f and bit depth of %u...", this->channel_,
+             this->frequency_, this->bit_depth_);
+    configured_frequency = ledcSetup(this->channel_, frequency, this->bit_depth_);
+    if (configured_frequency != 0) {
+      initialized_ = true;
+      this->status_clear_error();
+      ESP_LOGV(TAG, "Configured frequency: %u with bit depth: %u", configured_frequency, this->bit_depth_);
+    } else {
+      ESP_LOGW(TAG, "Unable to initialize channel %u with frequency %.1f and bit depth of %u", this->channel_,
+               this->frequency_, this->bit_depth_);
+      // try again with a lower bit depth
+      this->bit_depth_--;
+    }
+    attempt_count_max--;
+  }
+
+  if (configured_frequency == 0) {
+    ESP_LOGE(TAG, "Permanently failed to initialize channel %u with frequency %.1f and bit depth of %u", this->channel_,
+             this->frequency_, this->bit_depth_);
+    this->status_set_error();
+    return;
+  }
+
 #endif  // USE_ARDUINO
 #ifdef USE_ESP_IDF
   if (!initialized_) {
     ESP_LOGW(TAG, "LEDC output hasn't been initialized yet!");
     return;
   }
+
   auto speed_mode = get_speed_mode(channel_);
   auto timer_num = static_cast<ledc_timer_t>((channel_ % 8) / 2);
+  auto chan_num = static_cast<ledc_channel_t>(channel_ % 8);
 
-  ledc_timer_config_t timer_conf{};
-  timer_conf.speed_mode = speed_mode;
-  timer_conf.duty_resolution = static_cast<ledc_timer_bit_t>(bit_depth_);
-  timer_conf.timer_num = timer_num;
-  timer_conf.freq_hz = (uint32_t) frequency_;
-  timer_conf.clk_cfg = LEDC_AUTO_CLK;
-  ledc_timer_config(&timer_conf);
+  esp_err_t timer_init_result =
+      configure_timer_frequency(speed_mode, timer_num, chan_num, this->channel_, this->bit_depth_, this->frequency_);
+
+  if (timer_init_result != ESP_OK) {
+    ESP_LOGE(TAG, "Frequency %f can't be achieved with computed bit depth %u", this->frequency_, this->bit_depth_);
+    this->status_set_error();
+    return;
+  }
+
+  this->status_clear_error();
 #endif
   // re-apply duty
   this->write_state(this->duty_);

From 0f1ec515c1a1ec4571a657a20413fbd5fe136680 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 14 Feb 2023 11:38:05 +1300
Subject: [PATCH 568/838] Add version api endpoint (#4429)

---
 esphome/dashboard/dashboard.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 0ff5362670..f426215d29 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -545,6 +545,14 @@ class DownloadBinaryRequestHandler(BaseHandler):
         self.finish()
 
 
+class EsphomeVersionHandler(BaseHandler):
+    @authenticated
+    def get(self):
+        self.set_header("Content-Type", "application/json")
+        self.write(json.dumps({"version": const.__version__}))
+        self.finish()
+
+
 def _list_dashboard_entries():
     files = settings.list_yaml_files()
     return [DashboardEntry(file) for file in files]
@@ -1135,6 +1143,7 @@ def make_app(debug=get_bool_env(ENV_DEV)):
             (f"{rel}rename", EsphomeRenameHandler),
             (f"{rel}prometheus-sd", PrometheusServiceDiscoveryHandler),
             (f"{rel}boards/([a-z0-9]+)", BoardsRequestHandler),
+            (f"{rel}version", EsphomeVersionHandler),
         ],
         **app_settings,
     )

From d981d7859dd29ef78c5164a812c3408eb7da417a Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 14 Feb 2023 11:38:21 +1300
Subject: [PATCH 569/838] Handle uart.write in json-config endpoint (#4430)

---
 esphome/dashboard/dashboard.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index f426215d29..f7d471586d 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -1008,8 +1008,14 @@ class SafeLoaderIgnoreUnknown(yaml.SafeLoader):
     def ignore_unknown(self, node):
         return f"{node.tag} {node.value}"
 
+    def construct_yaml_binary(self, node) -> str:
+        return super().construct_yaml_binary(node).decode("ascii")
+
 
 SafeLoaderIgnoreUnknown.add_constructor(None, SafeLoaderIgnoreUnknown.ignore_unknown)
+SafeLoaderIgnoreUnknown.add_constructor(
+    "tag:yaml.org,2002:binary", SafeLoaderIgnoreUnknown.construct_yaml_binary
+)
 
 
 class JsonConfigRequestHandler(BaseHandler):

From df6cc14201aafd541d828e59a386e7997207d632 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 14 Feb 2023 11:38:37 +1300
Subject: [PATCH 570/838] Bump esphome-dashboard to 20230214.0 (#4431)

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

diff --git a/requirements.txt b/requirements.txt
index 9d59e0a1d2..9f4d34528c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.1.5  # When updating platformio, also update Dockerfile
 esptool==4.4
 click==8.1.3
-esphome-dashboard==20230120.0
+esphome-dashboard==20230214.0
 aioesphomeapi==13.1.0
 zeroconf==0.47.1
 

From b724ae9e0e4993d20b55df7e9056c03259206954 Mon Sep 17 00:00:00 2001
From: Sergey Dudanov <sergey.dudanov@gmail.com>
Date: Tue, 14 Feb 2023 04:34:50 +0400
Subject: [PATCH 571/838] Fix setting wrong traits on midea climate component
 (#4425)

* Fix issue3914

* Remove also default presets and modes

* Fix traits after autoconf
---
 esphome/components/midea/air_conditioner.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/esphome/components/midea/air_conditioner.cpp b/esphome/components/midea/air_conditioner.cpp
index 1ad5ade53d..b5bf43b64f 100644
--- a/esphome/components/midea/air_conditioner.cpp
+++ b/esphome/components/midea/air_conditioner.cpp
@@ -84,18 +84,18 @@ ClimateTraits AirConditioner::traits() {
   traits.set_supported_custom_presets(this->supported_custom_presets_);
   traits.set_supported_custom_fan_modes(this->supported_custom_fan_modes_);
   /* + MINIMAL SET OF CAPABILITIES */
-  traits.add_supported_mode(ClimateMode::CLIMATE_MODE_OFF);
-  traits.add_supported_mode(ClimateMode::CLIMATE_MODE_FAN_ONLY);
   traits.add_supported_fan_mode(ClimateFanMode::CLIMATE_FAN_AUTO);
   traits.add_supported_fan_mode(ClimateFanMode::CLIMATE_FAN_LOW);
   traits.add_supported_fan_mode(ClimateFanMode::CLIMATE_FAN_MEDIUM);
   traits.add_supported_fan_mode(ClimateFanMode::CLIMATE_FAN_HIGH);
-  traits.add_supported_swing_mode(ClimateSwingMode::CLIMATE_SWING_OFF);
-  traits.add_supported_swing_mode(ClimateSwingMode::CLIMATE_SWING_VERTICAL);
-  traits.add_supported_preset(ClimatePreset::CLIMATE_PRESET_NONE);
-  traits.add_supported_preset(ClimatePreset::CLIMATE_PRESET_SLEEP);
   if (this->base_.getAutoconfStatus() == dudanov::midea::AUTOCONF_OK)
     Converters::to_climate_traits(traits, this->base_.getCapabilities());
+  if (!traits.get_supported_modes().empty())
+    traits.add_supported_mode(ClimateMode::CLIMATE_MODE_OFF);
+  if (!traits.get_supported_swing_modes().empty())
+    traits.add_supported_swing_mode(ClimateSwingMode::CLIMATE_SWING_OFF);
+  if (!traits.get_supported_presets().empty())
+    traits.add_supported_preset(ClimatePreset::CLIMATE_PRESET_NONE);
   return traits;
 }
 

From 227d94f38de70a9afade32aa14b77e96685ac080 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 14 Feb 2023 13:59:49 +1300
Subject: [PATCH 572/838] Bump version to 2023.2.0b5

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

diff --git a/esphome/const.py b/esphome/const.py
index d62c4689ad..ce3eac9ed6 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.2.0b4"
+__version__ = "2023.2.0b5"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 8b5b9e508b63313410151735e115dd260b0a6f03 Mon Sep 17 00:00:00 2001
From: Dominik Wagenknecht <dominik@wagenknecht.cc>
Date: Tue, 14 Feb 2023 22:09:07 +0100
Subject: [PATCH 573/838] Deep Sleep capable ports for ESP32S3 (#4230)

Update to provide RTC capable ports for ESP32S3.
Fresh from [espressif gpio docs](https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/api-reference/peripherals/gpio.html)
---
 esphome/components/deep_sleep/__init__.py | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/esphome/components/deep_sleep/__init__.py b/esphome/components/deep_sleep/__init__.py
index 8b60b4eb5f..bbd10d58c5 100644
--- a/esphome/components/deep_sleep/__init__.py
+++ b/esphome/components/deep_sleep/__init__.py
@@ -21,6 +21,7 @@ from esphome.components.esp32.const import (
     VARIANT_ESP32,
     VARIANT_ESP32C3,
     VARIANT_ESP32S2,
+    VARIANT_ESP32S3,
 )
 
 WAKEUP_PINS = {
@@ -69,6 +70,30 @@ WAKEUP_PINS = {
         20,
         21,
     ],
+    VARIANT_ESP32S3: [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        15,
+        16,
+        17,
+        18,
+        19,
+        20,
+        21,
+    ],
 }
 
 

From 5307dfee2159026bf8b3ec483d6a5717087e8236 Mon Sep 17 00:00:00 2001
From: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Date: Tue, 14 Feb 2023 23:45:27 +0100
Subject: [PATCH 574/838] Initialize all fields in ESPTime in PCF85063 (#4439)

---
 esphome/components/pcf85063/pcf85063.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/esphome/components/pcf85063/pcf85063.cpp b/esphome/components/pcf85063/pcf85063.cpp
index c6a8624ca7..5073522655 100644
--- a/esphome/components/pcf85063/pcf85063.cpp
+++ b/esphome/components/pcf85063/pcf85063.cpp
@@ -37,14 +37,18 @@ void PCF85063Component::read_time() {
     ESP_LOGW(TAG, "RTC halted, not syncing to system clock.");
     return;
   }
-  time::ESPTime rtc_time{.second = uint8_t(pcf85063_.reg.second + 10 * pcf85063_.reg.second_10),
-                         .minute = uint8_t(pcf85063_.reg.minute + 10u * pcf85063_.reg.minute_10),
-                         .hour = uint8_t(pcf85063_.reg.hour + 10u * pcf85063_.reg.hour_10),
-                         .day_of_week = uint8_t(pcf85063_.reg.weekday),
-                         .day_of_month = uint8_t(pcf85063_.reg.day + 10u * pcf85063_.reg.day_10),
-                         .day_of_year = 1,  // ignored by recalc_timestamp_utc(false)
-                         .month = uint8_t(pcf85063_.reg.month + 10u * pcf85063_.reg.month_10),
-                         .year = uint16_t(pcf85063_.reg.year + 10u * pcf85063_.reg.year_10 + 2000)};
+  time::ESPTime rtc_time{
+      .second = uint8_t(pcf85063_.reg.second + 10 * pcf85063_.reg.second_10),
+      .minute = uint8_t(pcf85063_.reg.minute + 10u * pcf85063_.reg.minute_10),
+      .hour = uint8_t(pcf85063_.reg.hour + 10u * pcf85063_.reg.hour_10),
+      .day_of_week = uint8_t(pcf85063_.reg.weekday),
+      .day_of_month = uint8_t(pcf85063_.reg.day + 10u * pcf85063_.reg.day_10),
+      .day_of_year = 1,  // ignored by recalc_timestamp_utc(false)
+      .month = uint8_t(pcf85063_.reg.month + 10u * pcf85063_.reg.month_10),
+      .year = uint16_t(pcf85063_.reg.year + 10u * pcf85063_.reg.year_10 + 2000),
+      .is_dst = false,  // not used
+      .timestamp = 0,   // overwritten by recalc_timestamp_utc(false)
+  };
   rtc_time.recalc_timestamp_utc(false);
   if (!rtc_time.is_valid()) {
     ESP_LOGE(TAG, "Invalid RTC time, not syncing to system clock.");

From 30eec5adee147c7926b5a553814db5f9b70a6d48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Feb 2023 19:19:03 +1300
Subject: [PATCH 575/838] Bump zeroconf from 0.47.1 to 0.47.3 (#4437)

Bumps [zeroconf](https://github.com/python-zeroconf/python-zeroconf) from 0.47.1 to 0.47.3.
- [Release notes](https://github.com/python-zeroconf/python-zeroconf/releases)
- [Changelog](https://github.com/python-zeroconf/python-zeroconf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/python-zeroconf/python-zeroconf/compare/0.47.1...0.47.3)

---
updated-dependencies:
- dependency-name: zeroconf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
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 00295af2b9..c2490f36a4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ esptool==4.4
 click==8.1.3
 esphome-dashboard==20230214.0
 aioesphomeapi==13.3.1
-zeroconf==0.47.1
+zeroconf==0.47.3
 
 # esp-idf requires this, but doesn't bundle it by default
 # https://github.com/espressif/esp-idf/blob/220590d599e134d7a5e7f1e683cc4550349ffbf8/requirements.txt#L24

From ce1f034bac399116a3c47f6638f1aa048c7e970b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 15 Feb 2023 19:29:02 +1300
Subject: [PATCH 576/838] Bump version to 2023.2.0

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

diff --git a/esphome/const.py b/esphome/const.py
index ce3eac9ed6..01135d5e6f 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.2.0b5"
+__version__ = "2023.2.0"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 27ec517084aebc5f224612a517d102b0dd9685d0 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 15 Feb 2023 21:39:17 +1300
Subject: [PATCH 577/838] Remove dup line

---
 esphome/components/esp32_ble_tracker/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index c5af845987..23f109b5ac 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -18,7 +18,6 @@ from esphome.const import (
 from esphome.components import esp32_ble
 from esphome.core import CORE
 from esphome.components.esp32 import add_idf_sdkconfig_option
-from esphome.components import esp32_ble
 
 AUTO_LOAD = ["esp32_ble"]
 DEPENDENCIES = ["esp32"]

From dbe5587806f742baca223a117b056996686a309c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 16 Feb 2023 13:27:32 +1300
Subject: [PATCH 578/838] Add ESPHome version to generated platformio.ini
 (#4443)

* Add ESPHome version to generated platformio.ini

* Move description to platformio section
---
 esphome/writer.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/esphome/writer.py b/esphome/writer.py
index 7a3c13e80b..2bf665c2b2 100644
--- a/esphome/writer.py
+++ b/esphome/writer.py
@@ -142,7 +142,10 @@ def get_ini_content():
     # Sort to avoid changing build flags order
     CORE.add_platformio_option("build_flags", sorted(CORE.build_flags))
 
-    content = f"[env:{CORE.name}]\n"
+    content = "[platformio]\n"
+    content += f"description = ESPHome {__version__}\n"
+
+    content += f"[env:{CORE.name}]\n"
     content += format_ini(CORE.platformio_options)
 
     return content

From 9aed758d1badf76270f1a81d1a5a62c78a41659f Mon Sep 17 00:00:00 2001
From: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Date: Thu, 16 Feb 2023 01:28:12 +0100
Subject: [PATCH 579/838] Automate syncing device classes with HA (#4438)

* Sync device classes with HA

* Rename blacklist
---
 esphome/components/binary_sensor/__init__.py |  4 +-
 esphome/components/button/__init__.py        |  2 +
 esphome/components/cover/__init__.py         | 33 +++++---
 esphome/components/number/__init__.py        | 18 +++-
 esphome/components/sensor/__init__.py        | 20 +++--
 esphome/const.py                             | 87 +++++++++++---------
 script/sync-device_class.py                  | 67 +++++++++++++++
 7 files changed, 169 insertions(+), 62 deletions(-)
 create mode 100755 script/sync-device_class.py

diff --git a/esphome/components/binary_sensor/__init__.py b/esphome/components/binary_sensor/__init__.py
index 600c9efe5a..91f63de9e3 100644
--- a/esphome/components/binary_sensor/__init__.py
+++ b/esphome/components/binary_sensor/__init__.py
@@ -27,13 +27,13 @@ from esphome.const import (
     CONF_TIMING,
     CONF_TRIGGER_ID,
     CONF_MQTT_ID,
-    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_BATTERY_CHARGING,
     DEVICE_CLASS_CARBON_MONOXIDE,
     DEVICE_CLASS_COLD,
     DEVICE_CLASS_CONNECTIVITY,
     DEVICE_CLASS_DOOR,
+    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_GARAGE_DOOR,
     DEVICE_CLASS_GAS,
     DEVICE_CLASS_HEAT,
@@ -62,13 +62,13 @@ from esphome.util import Registry
 
 CODEOWNERS = ["@esphome/core"]
 DEVICE_CLASSES = [
-    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_BATTERY_CHARGING,
     DEVICE_CLASS_CARBON_MONOXIDE,
     DEVICE_CLASS_COLD,
     DEVICE_CLASS_CONNECTIVITY,
     DEVICE_CLASS_DOOR,
+    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_GARAGE_DOOR,
     DEVICE_CLASS_GAS,
     DEVICE_CLASS_HEAT,
diff --git a/esphome/components/button/__init__.py b/esphome/components/button/__init__.py
index b0611a62e9..7329a7955d 100644
--- a/esphome/components/button/__init__.py
+++ b/esphome/components/button/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_ON_PRESS,
     CONF_TRIGGER_ID,
     CONF_MQTT_ID,
+    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_RESTART,
     DEVICE_CLASS_UPDATE,
 )
@@ -21,6 +22,7 @@ CODEOWNERS = ["@esphome/core"]
 IS_PLATFORM_COMPONENT = True
 
 DEVICE_CLASSES = [
+    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_RESTART,
     DEVICE_CLASS_UPDATE,
 ]
diff --git a/esphome/components/cover/__init__.py b/esphome/components/cover/__init__.py
index d2421f07d9..90e5ee1f03 100644
--- a/esphome/components/cover/__init__.py
+++ b/esphome/components/cover/__init__.py
@@ -17,6 +17,17 @@ from esphome.const import (
     CONF_STOP,
     CONF_MQTT_ID,
     CONF_TRIGGER_ID,
+    DEVICE_CLASS_AWNING,
+    DEVICE_CLASS_BLIND,
+    DEVICE_CLASS_CURTAIN,
+    DEVICE_CLASS_DAMPER,
+    DEVICE_CLASS_DOOR,
+    DEVICE_CLASS_EMPTY,
+    DEVICE_CLASS_GARAGE,
+    DEVICE_CLASS_GATE,
+    DEVICE_CLASS_SHADE,
+    DEVICE_CLASS_SHUTTER,
+    DEVICE_CLASS_WINDOW,
 )
 from esphome.core import CORE, coroutine_with_priority
 from esphome.cpp_helpers import setup_entity
@@ -25,17 +36,17 @@ IS_PLATFORM_COMPONENT = True
 
 CODEOWNERS = ["@esphome/core"]
 DEVICE_CLASSES = [
-    "",
-    "awning",
-    "blind",
-    "curtain",
-    "damper",
-    "door",
-    "garage",
-    "gate",
-    "shade",
-    "shutter",
-    "window",
+    DEVICE_CLASS_AWNING,
+    DEVICE_CLASS_BLIND,
+    DEVICE_CLASS_CURTAIN,
+    DEVICE_CLASS_DAMPER,
+    DEVICE_CLASS_DOOR,
+    DEVICE_CLASS_EMPTY,
+    DEVICE_CLASS_GARAGE,
+    DEVICE_CLASS_GATE,
+    DEVICE_CLASS_SHADE,
+    DEVICE_CLASS_SHUTTER,
+    DEVICE_CLASS_WINDOW,
 ]
 
 cover_ns = cg.esphome_ns.namespace("cover")
diff --git a/esphome/components/number/__init__.py b/esphome/components/number/__init__.py
index 463557e3b3..1d2dac9bde 100644
--- a/esphome/components/number/__init__.py
+++ b/esphome/components/number/__init__.py
@@ -17,19 +17,23 @@ from esphome.const import (
     CONF_VALUE,
     CONF_OPERATION,
     CONF_CYCLE,
-    DEVICE_CLASS_DISTANCE,
-    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_APPARENT_POWER,
     DEVICE_CLASS_AQI,
+    DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_CARBON_DIOXIDE,
     DEVICE_CLASS_CARBON_MONOXIDE,
     DEVICE_CLASS_CURRENT,
+    DEVICE_CLASS_DATA_RATE,
+    DEVICE_CLASS_DATA_SIZE,
+    DEVICE_CLASS_DISTANCE,
+    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_ENERGY,
     DEVICE_CLASS_FREQUENCY,
     DEVICE_CLASS_GAS,
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_ILLUMINANCE,
+    DEVICE_CLASS_IRRADIANCE,
     DEVICE_CLASS_MOISTURE,
     DEVICE_CLASS_MONETARY,
     DEVICE_CLASS_NITROGEN_DIOXIDE,
@@ -46,6 +50,7 @@ from esphome.const import (
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_REACTIVE_POWER,
     DEVICE_CLASS_SIGNAL_STRENGTH,
+    DEVICE_CLASS_SOUND_PRESSURE,
     DEVICE_CLASS_SPEED,
     DEVICE_CLASS_SULPHUR_DIOXIDE,
     DEVICE_CLASS_TEMPERATURE,
@@ -53,8 +58,8 @@ from esphome.const import (
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_VOLUME,
     DEVICE_CLASS_WATER,
-    DEVICE_CLASS_WIND_SPEED,
     DEVICE_CLASS_WEIGHT,
+    DEVICE_CLASS_WIND_SPEED,
 )
 from esphome.core import CORE, coroutine_with_priority
 from esphome.cpp_helpers import setup_entity
@@ -63,10 +68,13 @@ CODEOWNERS = ["@esphome/core"]
 DEVICE_CLASSES = [
     DEVICE_CLASS_APPARENT_POWER,
     DEVICE_CLASS_AQI,
+    DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_CARBON_DIOXIDE,
     DEVICE_CLASS_CARBON_MONOXIDE,
     DEVICE_CLASS_CURRENT,
+    DEVICE_CLASS_DATA_RATE,
+    DEVICE_CLASS_DATA_SIZE,
     DEVICE_CLASS_DISTANCE,
     DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_ENERGY,
@@ -74,6 +82,7 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_GAS,
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_ILLUMINANCE,
+    DEVICE_CLASS_IRRADIANCE,
     DEVICE_CLASS_MOISTURE,
     DEVICE_CLASS_MONETARY,
     DEVICE_CLASS_NITROGEN_DIOXIDE,
@@ -83,13 +92,14 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_PM1,
     DEVICE_CLASS_PM10,
     DEVICE_CLASS_PM25,
-    DEVICE_CLASS_POWER_FACTOR,
     DEVICE_CLASS_POWER,
+    DEVICE_CLASS_POWER_FACTOR,
     DEVICE_CLASS_PRECIPITATION,
     DEVICE_CLASS_PRECIPITATION_INTENSITY,
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_REACTIVE_POWER,
     DEVICE_CLASS_SIGNAL_STRENGTH,
+    DEVICE_CLASS_SOUND_PRESSURE,
     DEVICE_CLASS_SPEED,
     DEVICE_CLASS_SULPHUR_DIOXIDE,
     DEVICE_CLASS_TEMPERATURE,
diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index 7842cef4de..54fdfcffdc 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -29,21 +29,25 @@ from esphome.const import (
     CONF_WINDOW_SIZE,
     CONF_MQTT_ID,
     CONF_FORCE_UPDATE,
-    DEVICE_CLASS_DISTANCE,
-    DEVICE_CLASS_DURATION,
-    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_APPARENT_POWER,
     DEVICE_CLASS_AQI,
+    DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_CARBON_DIOXIDE,
     DEVICE_CLASS_CARBON_MONOXIDE,
     DEVICE_CLASS_CURRENT,
+    DEVICE_CLASS_DATA_RATE,
+    DEVICE_CLASS_DATA_SIZE,
     DEVICE_CLASS_DATE,
+    DEVICE_CLASS_DISTANCE,
+    DEVICE_CLASS_DURATION,
+    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_ENERGY,
     DEVICE_CLASS_FREQUENCY,
     DEVICE_CLASS_GAS,
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_ILLUMINANCE,
+    DEVICE_CLASS_IRRADIANCE,
     DEVICE_CLASS_MOISTURE,
     DEVICE_CLASS_MONETARY,
     DEVICE_CLASS_NITROGEN_DIOXIDE,
@@ -60,6 +64,7 @@ from esphome.const import (
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_REACTIVE_POWER,
     DEVICE_CLASS_SIGNAL_STRENGTH,
+    DEVICE_CLASS_SOUND_PRESSURE,
     DEVICE_CLASS_SPEED,
     DEVICE_CLASS_SULPHUR_DIOXIDE,
     DEVICE_CLASS_TEMPERATURE,
@@ -68,8 +73,8 @@ from esphome.const import (
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_VOLUME,
     DEVICE_CLASS_WATER,
-    DEVICE_CLASS_WIND_SPEED,
     DEVICE_CLASS_WEIGHT,
+    DEVICE_CLASS_WIND_SPEED,
 )
 from esphome.core import CORE, coroutine_with_priority
 from esphome.cpp_generator import MockObjClass
@@ -78,21 +83,25 @@ from esphome.util import Registry
 
 CODEOWNERS = ["@esphome/core"]
 DEVICE_CLASSES = [
-    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_APPARENT_POWER,
     DEVICE_CLASS_AQI,
+    DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_CARBON_DIOXIDE,
     DEVICE_CLASS_CARBON_MONOXIDE,
     DEVICE_CLASS_CURRENT,
+    DEVICE_CLASS_DATA_RATE,
+    DEVICE_CLASS_DATA_SIZE,
     DEVICE_CLASS_DATE,
     DEVICE_CLASS_DISTANCE,
     DEVICE_CLASS_DURATION,
+    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_ENERGY,
     DEVICE_CLASS_FREQUENCY,
     DEVICE_CLASS_GAS,
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_ILLUMINANCE,
+    DEVICE_CLASS_IRRADIANCE,
     DEVICE_CLASS_MOISTURE,
     DEVICE_CLASS_MONETARY,
     DEVICE_CLASS_NITROGEN_DIOXIDE,
@@ -109,6 +118,7 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_REACTIVE_POWER,
     DEVICE_CLASS_SIGNAL_STRENGTH,
+    DEVICE_CLASS_SOUND_PRESSURE,
     DEVICE_CLASS_SPEED,
     DEVICE_CLASS_SULPHUR_DIOXIDE,
     DEVICE_CLASS_TEMPERATURE,
diff --git a/esphome/const.py b/esphome/const.py
index e5d0b0bb10..bd593bbc80 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -916,80 +916,87 @@ UNIT_VOLT_AMPS_REACTIVE_HOURS = "VARh"
 UNIT_WATT = "W"
 UNIT_WATT_HOURS = "Wh"
 
-# device classes of binary_sensor component
-DEVICE_CLASS_BATTERY_CHARGING = "battery_charging"
-DEVICE_CLASS_COLD = "cold"
-DEVICE_CLASS_CONNECTIVITY = "connectivity"
-DEVICE_CLASS_DOOR = "door"
-DEVICE_CLASS_GARAGE_DOOR = "garage_door"
-DEVICE_CLASS_HEAT = "heat"
-DEVICE_CLASS_LIGHT = "light"
-DEVICE_CLASS_LOCK = "lock"
-DEVICE_CLASS_MOTION = "motion"
-DEVICE_CLASS_MOVING = "moving"
-DEVICE_CLASS_OCCUPANCY = "occupancy"
-DEVICE_CLASS_OPENING = "opening"
-DEVICE_CLASS_PLUG = "plug"
-DEVICE_CLASS_PRESENCE = "presence"
-DEVICE_CLASS_PROBLEM = "problem"
-DEVICE_CLASS_RUNNING = "running"
-DEVICE_CLASS_SAFETY = "safety"
-DEVICE_CLASS_SMOKE = "smoke"
-DEVICE_CLASS_SOUND = "sound"
-DEVICE_CLASS_TAMPER = "tamper"
-DEVICE_CLASS_VIBRATION = "vibration"
-DEVICE_CLASS_WINDOW = "window"
-# device classes of both binary_sensor and sensor component
-DEVICE_CLASS_EMPTY = ""
-DEVICE_CLASS_BATTERY = "battery"
-DEVICE_CLASS_CARBON_MONOXIDE = "carbon_monoxide"
-DEVICE_CLASS_GAS = "gas"
-DEVICE_CLASS_MOISTURE = "moisture"
-DEVICE_CLASS_POWER = "power"
-# device classes of sensor component
+# device classes
 DEVICE_CLASS_APPARENT_POWER = "apparent_power"
 DEVICE_CLASS_AQI = "aqi"
+DEVICE_CLASS_ATMOSPHERIC_PRESSURE = "atmospheric_pressure"
+DEVICE_CLASS_AWNING = "awning"
+DEVICE_CLASS_BATTERY = "battery"
+DEVICE_CLASS_BATTERY_CHARGING = "battery_charging"
+DEVICE_CLASS_BLIND = "blind"
 DEVICE_CLASS_CARBON_DIOXIDE = "carbon_dioxide"
+DEVICE_CLASS_CARBON_MONOXIDE = "carbon_monoxide"
+DEVICE_CLASS_COLD = "cold"
+DEVICE_CLASS_CONNECTIVITY = "connectivity"
 DEVICE_CLASS_CURRENT = "current"
+DEVICE_CLASS_CURTAIN = "curtain"
+DEVICE_CLASS_DAMPER = "damper"
+DEVICE_CLASS_DATA_RATE = "data_rate"
+DEVICE_CLASS_DATA_SIZE = "data_size"
 DEVICE_CLASS_DATE = "date"
 DEVICE_CLASS_DISTANCE = "distance"
+DEVICE_CLASS_DOOR = "door"
 DEVICE_CLASS_DURATION = "duration"
+DEVICE_CLASS_EMPTY = ""
 DEVICE_CLASS_ENERGY = "energy"
 DEVICE_CLASS_FREQUENCY = "frequency"
+DEVICE_CLASS_GARAGE = "garage"
+DEVICE_CLASS_GARAGE_DOOR = "garage_door"
+DEVICE_CLASS_GAS = "gas"
+DEVICE_CLASS_GATE = "gate"
+DEVICE_CLASS_HEAT = "heat"
 DEVICE_CLASS_HUMIDITY = "humidity"
 DEVICE_CLASS_ILLUMINANCE = "illuminance"
+DEVICE_CLASS_IRRADIANCE = "irradiance"
+DEVICE_CLASS_LIGHT = "light"
+DEVICE_CLASS_LOCK = "lock"
+DEVICE_CLASS_MOISTURE = "moisture"
 DEVICE_CLASS_MONETARY = "monetary"
+DEVICE_CLASS_MOTION = "motion"
+DEVICE_CLASS_MOVING = "moving"
 DEVICE_CLASS_NITROGEN_DIOXIDE = "nitrogen_dioxide"
 DEVICE_CLASS_NITROGEN_MONOXIDE = "nitrogen_monoxide"
 DEVICE_CLASS_NITROUS_OXIDE = "nitrous_oxide"
+DEVICE_CLASS_OCCUPANCY = "occupancy"
+DEVICE_CLASS_OPENING = "opening"
+DEVICE_CLASS_OUTLET = "outlet"
 DEVICE_CLASS_OZONE = "ozone"
+DEVICE_CLASS_PLUG = "plug"
 DEVICE_CLASS_PM1 = "pm1"
 DEVICE_CLASS_PM10 = "pm10"
 DEVICE_CLASS_PM25 = "pm25"
+DEVICE_CLASS_POWER = "power"
 DEVICE_CLASS_POWER_FACTOR = "power_factor"
 DEVICE_CLASS_PRECIPITATION = "precipitation"
 DEVICE_CLASS_PRECIPITATION_INTENSITY = "precipitation_intensity"
+DEVICE_CLASS_PRESENCE = "presence"
 DEVICE_CLASS_PRESSURE = "pressure"
+DEVICE_CLASS_PROBLEM = "problem"
 DEVICE_CLASS_REACTIVE_POWER = "reactive_power"
+DEVICE_CLASS_RESTART = "restart"
+DEVICE_CLASS_RUNNING = "running"
+DEVICE_CLASS_SAFETY = "safety"
+DEVICE_CLASS_SHADE = "shade"
+DEVICE_CLASS_SHUTTER = "shutter"
 DEVICE_CLASS_SIGNAL_STRENGTH = "signal_strength"
+DEVICE_CLASS_SMOKE = "smoke"
+DEVICE_CLASS_SOUND = "sound"
+DEVICE_CLASS_SOUND_PRESSURE = "sound_pressure"
 DEVICE_CLASS_SPEED = "speed"
 DEVICE_CLASS_SULPHUR_DIOXIDE = "sulphur_dioxide"
+DEVICE_CLASS_SWITCH = "switch"
+DEVICE_CLASS_TAMPER = "tamper"
 DEVICE_CLASS_TEMPERATURE = "temperature"
 DEVICE_CLASS_TIMESTAMP = "timestamp"
+DEVICE_CLASS_UPDATE = "update"
+DEVICE_CLASS_VIBRATION = "vibration"
 DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS = "volatile_organic_compounds"
 DEVICE_CLASS_VOLTAGE = "voltage"
 DEVICE_CLASS_VOLUME = "volume"
 DEVICE_CLASS_WATER = "water"
-DEVICE_CLASS_WIND_SPEED = "wind_speed"
 DEVICE_CLASS_WEIGHT = "weight"
-# device classes of both binary_sensor and button component
-DEVICE_CLASS_UPDATE = "update"
-# device classes of button component
-DEVICE_CLASS_RESTART = "restart"
-# device classes of switch component
-DEVICE_CLASS_OUTLET = "outlet"
-DEVICE_CLASS_SWITCH = "switch"
-
+DEVICE_CLASS_WINDOW = "window"
+DEVICE_CLASS_WIND_SPEED = "wind_speed"
 
 # state classes
 STATE_CLASS_NONE = ""
diff --git a/script/sync-device_class.py b/script/sync-device_class.py
new file mode 100755
index 0000000000..882655561b
--- /dev/null
+++ b/script/sync-device_class.py
@@ -0,0 +1,67 @@
+#!/usr/bin/env python3
+
+import re
+
+from homeassistant.components.binary_sensor import BinarySensorDeviceClass
+from homeassistant.components.button import ButtonDeviceClass
+from homeassistant.components.cover import CoverDeviceClass
+from homeassistant.components.number import NumberDeviceClass
+from homeassistant.components.sensor import SensorDeviceClass
+from homeassistant.components.switch import SwitchDeviceClass
+
+BLOCKLIST = (
+    # requires special support on HA side
+    "enum",
+)
+
+DOMAINS = {
+    "binary_sensor": BinarySensorDeviceClass,
+    "button": ButtonDeviceClass,
+    "cover": CoverDeviceClass,
+    "number": NumberDeviceClass,
+    "sensor": SensorDeviceClass,
+    "switch": SwitchDeviceClass,
+}
+
+
+def sub(path, pattern, repl):
+    with open(path, "r") as handle:
+        content = handle.read()
+    content = re.sub(pattern, repl, content, flags=re.MULTILINE, count=1)
+    with open(path, "w") as handle:
+        handle.write(content)
+
+
+def main():
+    classes = {"EMPTY": ""}
+    allowed = {}
+
+    for domain, enum in DOMAINS.items():
+        available = {
+            cls.value.upper(): cls.value for cls in enum if cls.value not in BLOCKLIST
+        }
+
+        classes.update(available)
+        allowed[domain] = list(available.keys()) + ["EMPTY"]
+
+    # replace constant defines in const.py
+    out = ""
+    for cls in sorted(classes):
+        out += f'DEVICE_CLASS_{cls.upper()} = "{classes[cls]}"\n'
+    sub("esphome/const.py", '(DEVICE_CLASS_\w+ = "\w*"\r?\n)+', out)
+
+    for domain in sorted(allowed):
+        # replace imports
+        out = ""
+        for item in sorted(allowed[domain]):
+            out += f"    DEVICE_CLASS_{item.upper()},\n"
+
+        sub(
+            f"esphome/components/{domain}/__init__.py",
+            "(    DEVICE_CLASS_\w+,\r?\n)+",
+            out,
+        )
+
+
+if __name__ == "__main__":
+    main()

From 44494ad18e98910836c549b3701b467af45ed5ff Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 16 Feb 2023 13:27:32 +1300
Subject: [PATCH 580/838] Add ESPHome version to generated platformio.ini
 (#4443)

* Add ESPHome version to generated platformio.ini

* Move description to platformio section
---
 esphome/writer.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/esphome/writer.py b/esphome/writer.py
index 7a3c13e80b..2bf665c2b2 100644
--- a/esphome/writer.py
+++ b/esphome/writer.py
@@ -142,7 +142,10 @@ def get_ini_content():
     # Sort to avoid changing build flags order
     CORE.add_platformio_option("build_flags", sorted(CORE.build_flags))
 
-    content = f"[env:{CORE.name}]\n"
+    content = "[platformio]\n"
+    content += f"description = ESPHome {__version__}\n"
+
+    content += f"[env:{CORE.name}]\n"
     content += format_ini(CORE.platformio_options)
 
     return content

From 45180d98f6d6e79f44e28830dc46203d7f7f9082 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 16 Feb 2023 14:06:42 +1300
Subject: [PATCH 581/838] Bump version to 2023.2.1

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

diff --git a/esphome/const.py b/esphome/const.py
index 01135d5e6f..8535e92370 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.2.0"
+__version__ = "2023.2.1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 37d55b55fcc6f7f0428361ed0516218ec617a510 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 17 Feb 2023 19:06:18 +1300
Subject: [PATCH 582/838] Fix adoption of variants and pico-w (#4455)

---
 .../components/dashboard_import/__init__.py   | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/esphome/components/dashboard_import/__init__.py b/esphome/components/dashboard_import/__init__.py
index e1bd6a7f08..6b6750cbf4 100644
--- a/esphome/components/dashboard_import/__init__.py
+++ b/esphome/components/dashboard_import/__init__.py
@@ -83,11 +83,30 @@ def import_config(
         raise FileExistsError
 
     if project_name == "esphome.web":
+        if "esp32c3" in import_url:
+            board = "esp32-c3-devkitm-1"
+            platform = "ESP32"
+        elif "esp32s2" in import_url:
+            board = "esp32-s2-saola-1"
+            platform = "ESP32"
+        elif "esp32s3" in import_url:
+            board = "esp32-s3-devkitc-1"
+            platform = "ESP32"
+        elif "esp32" in import_url:
+            board = "esp32dev"
+            platform = "ESP32"
+        elif "esp8266" in import_url:
+            board = "esp01_1m"
+            platform = "ESP8266"
+        elif "pico-w" in import_url:
+            board = "pico-w"
+            platform = "RP2040"
+
         kwargs = {
             "name": name,
             "friendly_name": friendly_name,
-            "platform": "ESP32" if "esp32" in import_url else "ESP8266",
-            "board": "esp32dev" if "esp32" in import_url else "esp01_1m",
+            "platform": platform,
+            "board": board,
             "ssid": "!secret wifi_ssid",
             "psk": "!secret wifi_password",
         }

From c12408326c893a4b6474be924534ce89825ef533 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 17 Feb 2023 19:06:18 +1300
Subject: [PATCH 583/838] Fix adoption of variants and pico-w (#4455)

---
 .../components/dashboard_import/__init__.py   | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/esphome/components/dashboard_import/__init__.py b/esphome/components/dashboard_import/__init__.py
index e1bd6a7f08..6b6750cbf4 100644
--- a/esphome/components/dashboard_import/__init__.py
+++ b/esphome/components/dashboard_import/__init__.py
@@ -83,11 +83,30 @@ def import_config(
         raise FileExistsError
 
     if project_name == "esphome.web":
+        if "esp32c3" in import_url:
+            board = "esp32-c3-devkitm-1"
+            platform = "ESP32"
+        elif "esp32s2" in import_url:
+            board = "esp32-s2-saola-1"
+            platform = "ESP32"
+        elif "esp32s3" in import_url:
+            board = "esp32-s3-devkitc-1"
+            platform = "ESP32"
+        elif "esp32" in import_url:
+            board = "esp32dev"
+            platform = "ESP32"
+        elif "esp8266" in import_url:
+            board = "esp01_1m"
+            platform = "ESP8266"
+        elif "pico-w" in import_url:
+            board = "pico-w"
+            platform = "RP2040"
+
         kwargs = {
             "name": name,
             "friendly_name": friendly_name,
-            "platform": "ESP32" if "esp32" in import_url else "ESP8266",
-            "board": "esp32dev" if "esp32" in import_url else "esp01_1m",
+            "platform": platform,
+            "board": board,
             "ssid": "!secret wifi_ssid",
             "psk": "!secret wifi_password",
         }

From 1cf4107e1c42e70314d61e913c3a4767ea51151e Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 17 Feb 2023 19:11:15 +1300
Subject: [PATCH 584/838] Bump version to 2023.2.2

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

diff --git a/esphome/const.py b/esphome/const.py
index 8535e92370..d0c3412d34 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.2.1"
+__version__ = "2023.2.2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From c03b1fae68731719c7deb515ef6cd5c2c7290212 Mon Sep 17 00:00:00 2001
From: jmichiel <194387+jmichiel@users.noreply.github.com>
Date: Sun, 19 Feb 2023 14:33:52 +0100
Subject: [PATCH 585/838] fix preset discovery config (#4451)

Co-authored-by: Michiel, Jeroen <jeroen.michiel@teledyneflir.com>
---
 esphome/components/mqtt/mqtt_climate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/mqtt/mqtt_climate.cpp b/esphome/components/mqtt/mqtt_climate.cpp
index 8dd03dd5c8..1947e02b9e 100644
--- a/esphome/components/mqtt/mqtt_climate.cpp
+++ b/esphome/components/mqtt/mqtt_climate.cpp
@@ -72,7 +72,7 @@ void MQTTClimateComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryCo
     // preset_mode_state_topic
     root[MQTT_PRESET_MODE_STATE_TOPIC] = this->get_preset_state_topic();
     // presets
-    JsonArray presets = root.createNestedArray("presets");
+    JsonArray presets = root.createNestedArray("preset_modes");
     if (traits.supports_preset(CLIMATE_PRESET_HOME))
       presets.add("home");
     if (traits.supports_preset(CLIMATE_PRESET_AWAY)) {

From 66eecd36758f5d36e802edde6101473fd73a9207 Mon Sep 17 00:00:00 2001
From: Adam Jacques <ajacques@users.noreply.github.com>
Date: Sun, 19 Feb 2023 05:38:27 -0800
Subject: [PATCH 586/838] NeoPixel - Add support for ESP32-S3 (#4435)

---
 esphome/components/neopixelbus/_methods.py |  3 +++
 esphome/components/neopixelbus/light.py    |  3 ++-
 script/test                                |  1 +
 tests/README.md                            |  1 +
 tests/test8.yaml                           | 27 ++++++++++++++++++++++
 5 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 tests/test8.yaml

diff --git a/esphome/components/neopixelbus/_methods.py b/esphome/components/neopixelbus/_methods.py
index 98a2d152e1..a290257d6b 100644
--- a/esphome/components/neopixelbus/_methods.py
+++ b/esphome/components/neopixelbus/_methods.py
@@ -15,6 +15,7 @@ from esphome.components.esp32.const import (
     VARIANT_ESP32,
     VARIANT_ESP32S2,
     VARIANT_ESP32C3,
+    VARIANT_ESP32S3,
 )
 from esphome.core import CORE
 from .const import (
@@ -58,6 +59,7 @@ SPI_SPEEDS = [40e6, 20e6, 10e6, 5e6, 2e6, 1e6, 500e3]
 def _esp32_rmt_default_channel():
     return {
         VARIANT_ESP32S2: 1,
+        VARIANT_ESP32S3: 1,
         VARIANT_ESP32C3: 1,
     }.get(get_esp32_variant(), 6)
 
@@ -70,6 +72,7 @@ def _validate_esp32_rmt_channel(value):
     variant_channels = {
         VARIANT_ESP32: [0, 1, 2, 3, 4, 5, 6, 7, CHANNEL_DYNAMIC],
         VARIANT_ESP32S2: [0, 1, 2, 3, CHANNEL_DYNAMIC],
+        VARIANT_ESP32S3: [0, 1, 2, 3, CHANNEL_DYNAMIC],
         VARIANT_ESP32C3: [0, 1, CHANNEL_DYNAMIC],
     }
     variant = get_esp32_variant()
diff --git a/esphome/components/neopixelbus/light.py b/esphome/components/neopixelbus/light.py
index 722e6f5b06..072a565eda 100644
--- a/esphome/components/neopixelbus/light.py
+++ b/esphome/components/neopixelbus/light.py
@@ -220,4 +220,5 @@ async def to_code(config):
     cg.add(var.set_pixel_order(getattr(ESPNeoPixelOrder, config[CONF_TYPE])))
 
     # https://github.com/Makuna/NeoPixelBus/blob/master/library.json
-    cg.add_library("makuna/NeoPixelBus", "2.6.9")
+    # Version Listed Here: https://registry.platformio.org/libraries/makuna/NeoPixelBus/versions
+    cg.add_library("makuna/NeoPixelBus", "2.7.3")
diff --git a/script/test b/script/test
index 9f5dca65fa..36be9118ed 100755
--- a/script/test
+++ b/script/test
@@ -11,3 +11,4 @@ esphome compile tests/test2.yaml
 esphome compile tests/test3.yaml
 esphome compile tests/test4.yaml
 esphome compile tests/test5.yaml
+esphome compile tests/test8.yaml
diff --git a/tests/README.md b/tests/README.md
index 3238acaa79..6d83fc6886 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -26,3 +26,4 @@ Current test_.yaml file contents.
 | test5.yaml | ESP32 | wifi | ble_server
 | test6.yaml | RP2040 | wifi | N/A
 | test7.yaml | ESP32-C3 | wifi | N/A
+| test8.yaml | ESP32-S3 | wifi | None
diff --git a/tests/test8.yaml b/tests/test8.yaml
new file mode 100644
index 0000000000..c423ecbce6
--- /dev/null
+++ b/tests/test8.yaml
@@ -0,0 +1,27 @@
+# Tests for ESP32-S3 boards
+---
+wifi:
+  ssid: "ssid"
+
+esp32:
+  board: esp32-c3-devkitm-1
+  variant: ESP32S3
+  framework:
+    type: arduino
+
+esphome:
+  name: "esp32-s3-test"
+
+logger:
+
+light:
+  - platform: neopixelbus
+    type: GRB
+    variant: WS2812
+    pin: 33
+    num_leds: 1
+    id: neopixel
+    method: esp32_rmt
+    name: "neopixel-enable"
+    internal: false
+    restore_mode: ALWAYS_OFF

From 77db8c84015350ce46191cf8ca58e2d00e950600 Mon Sep 17 00:00:00 2001
From: Regev Brody <regevbr@gmail.com>
Date: Sun, 19 Feb 2023 21:11:21 +0200
Subject: [PATCH 587/838] add SUB_BINARY_SENSOR macro (#4447)

---
 esphome/components/binary_sensor/binary_sensor.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/esphome/components/binary_sensor/binary_sensor.h b/esphome/components/binary_sensor/binary_sensor.h
index 730ded3f94..fbfff63a38 100644
--- a/esphome/components/binary_sensor/binary_sensor.h
+++ b/esphome/components/binary_sensor/binary_sensor.h
@@ -19,6 +19,15 @@ namespace binary_sensor {
     } \
   }
 
+#define SUB_BINARY_SENSOR(name) \
+ protected: \
+  binary_sensor::BinarySensor *name##_binary_sensor_{nullptr}; \
+\
+ public: \
+  void set_##name##_binary_sensor(binary_sensor::BinarySensor *binary_sensor) { \
+    this->name##_binary_sensor_ = binary_sensor; \
+  }
+
 /** Base class for all binary_sensor-type classes.
  *
  * This class includes a callback that components such as MQTT can subscribe to for state changes.

From 12bef16d54686cb6a52a579c3fb1b6fdd11a2c45 Mon Sep 17 00:00:00 2001
From: Regev Brody <regevbr@gmail.com>
Date: Sun, 19 Feb 2023 21:11:24 +0200
Subject: [PATCH 588/838] add SUB_TEXT_SENSOR macro (#4448)

---
 esphome/components/text_sensor/text_sensor.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/esphome/components/text_sensor/text_sensor.h b/esphome/components/text_sensor/text_sensor.h
index a7673ed9ff..60e9e30b6e 100644
--- a/esphome/components/text_sensor/text_sensor.h
+++ b/esphome/components/text_sensor/text_sensor.h
@@ -21,6 +21,13 @@ namespace text_sensor {
     } \
   }
 
+#define SUB_TEXT_SENSOR(name) \
+ protected: \
+  text_sensor::TextSensor *name##_text_sensor_{nullptr}; \
+\
+ public: \
+  void set_##name##_text_sensor(text_sensor::TextSensor *text_sensor) { this->name##_text_sensor_ = text_sensor; }
+
 class TextSensor : public EntityBase {
  public:
   explicit TextSensor();

From 36a1f6cfb11b05de2c2cc199832f053ee50e01cb Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 20 Feb 2023 08:12:29 +1300
Subject: [PATCH 589/838] Update Manifest to rmeove unused dashboard files and
 include .c ethernet drivers (#4459)

---
 MANIFEST.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index a3126404f2..45d5e86672 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,8 +1,6 @@
 include LICENSE
 include README.md
 include requirements.txt
-include esphome/dashboard/templates/*.html
-recursive-include esphome/dashboard/static *.ico *.js *.css *.woff* LICENSE
-recursive-include esphome *.cpp *.h *.tcc
+recursive-include esphome *.cpp *.h *.tcc *.c
 recursive-include esphome *.py.script
 recursive-include esphome LICENSE.txt

From d10f891f5101779bed2a84062d2e328d956c3410 Mon Sep 17 00:00:00 2001
From: jmichiel <194387+jmichiel@users.noreply.github.com>
Date: Sun, 19 Feb 2023 14:33:52 +0100
Subject: [PATCH 590/838] fix preset discovery config (#4451)

Co-authored-by: Michiel, Jeroen <jeroen.michiel@teledyneflir.com>
---
 esphome/components/mqtt/mqtt_climate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/mqtt/mqtt_climate.cpp b/esphome/components/mqtt/mqtt_climate.cpp
index 8dd03dd5c8..1947e02b9e 100644
--- a/esphome/components/mqtt/mqtt_climate.cpp
+++ b/esphome/components/mqtt/mqtt_climate.cpp
@@ -72,7 +72,7 @@ void MQTTClimateComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryCo
     // preset_mode_state_topic
     root[MQTT_PRESET_MODE_STATE_TOPIC] = this->get_preset_state_topic();
     // presets
-    JsonArray presets = root.createNestedArray("presets");
+    JsonArray presets = root.createNestedArray("preset_modes");
     if (traits.supports_preset(CLIMATE_PRESET_HOME))
       presets.add("home");
     if (traits.supports_preset(CLIMATE_PRESET_AWAY)) {

From 414cf1b33356576de4b02adda1ab22f00e46c597 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 20 Feb 2023 08:12:29 +1300
Subject: [PATCH 591/838] Update Manifest to rmeove unused dashboard files and
 include .c ethernet drivers (#4459)

---
 MANIFEST.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index a3126404f2..45d5e86672 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,8 +1,6 @@
 include LICENSE
 include README.md
 include requirements.txt
-include esphome/dashboard/templates/*.html
-recursive-include esphome/dashboard/static *.ico *.js *.css *.woff* LICENSE
-recursive-include esphome *.cpp *.h *.tcc
+recursive-include esphome *.cpp *.h *.tcc *.c
 recursive-include esphome *.py.script
 recursive-include esphome LICENSE.txt

From 18fecf8c09270ebf79fa283bb242000cb0fb9a24 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 20 Feb 2023 08:16:47 +1300
Subject: [PATCH 592/838] Bump version to 2023.2.3

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

diff --git a/esphome/const.py b/esphome/const.py
index d0c3412d34..bcac2b105e 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.2.2"
+__version__ = "2023.2.3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 40e2832e67fe24c0d581f387cfacf1a5fd781b01 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Sun, 19 Feb 2023 14:20:13 -0500
Subject: [PATCH 593/838] Simplify sensor schema generation (#4462)

* Simplify sensor schema generation

* Mark class not optional

* Fix assignment
---
 esphome/components/sensor/__init__.py | 58 ++++++++-------------------
 1 file changed, 17 insertions(+), 41 deletions(-)

diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index 54fdfcffdc..d3cb39c2f6 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -272,48 +272,24 @@ def sensor_schema(
     state_class: str = _UNDEF,
     entity_category: str = _UNDEF,
 ) -> cv.Schema:
-    schema = SENSOR_SCHEMA
+    schema = {}
+
     if class_ is not _UNDEF:
-        schema = schema.extend({cv.GenerateID(): cv.declare_id(class_)})
-    if unit_of_measurement is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_UNIT_OF_MEASUREMENT, default=unit_of_measurement
-                ): validate_unit_of_measurement
-            }
-        )
-    if icon is not _UNDEF:
-        schema = schema.extend({cv.Optional(CONF_ICON, default=icon): validate_icon})
-    if accuracy_decimals is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_ACCURACY_DECIMALS, default=accuracy_decimals
-                ): validate_accuracy_decimals,
-            }
-        )
-    if device_class is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_DEVICE_CLASS, default=device_class
-                ): validate_device_class
-            }
-        )
-    if state_class is not _UNDEF:
-        schema = schema.extend(
-            {cv.Optional(CONF_STATE_CLASS, default=state_class): validate_state_class}
-        )
-    if entity_category is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_ENTITY_CATEGORY, default=entity_category
-                ): cv.entity_category
-            }
-        )
-    return schema
+        # Not optional.
+        schema[cv.GenerateID()] = cv.declare_id(class_)
+
+    for key, default, validator in [
+        (CONF_UNIT_OF_MEASUREMENT, unit_of_measurement, validate_unit_of_measurement),
+        (CONF_ICON, icon, validate_icon),
+        (CONF_ACCURACY_DECIMALS, accuracy_decimals, validate_accuracy_decimals),
+        (CONF_DEVICE_CLASS, device_class, validate_device_class),
+        (CONF_STATE_CLASS, state_class, validate_state_class),
+        (CONF_ENTITY_CATEGORY, entity_category, cv.entity_category),
+    ]:
+        if default is not _UNDEF:
+            schema[cv.Optional(key, default=default)] = validator
+
+    return SENSOR_SCHEMA.extend(schema)
 
 
 @FILTER_REGISTRY.register("offset", OffsetFilter, cv.float_)

From e68beb8a439e1e94278a412fb8853e8034178293 Mon Sep 17 00:00:00 2001
From: Regev Brody <regevbr@gmail.com>
Date: Sun, 19 Feb 2023 21:54:00 +0200
Subject: [PATCH 594/838] add SUB_NUMBER macro and schema to number (#4449)

* add SUB_NUMBER macro and schema

* add SUB_NUMBER macro and schema

* add SUB_NUMBER macro and schema
---
 esphome/components/copy/number/__init__.py    | 15 +++---
 esphome/components/demo/__init__.py           |  5 +-
 .../modbus_controller/number/__init__.py      |  5 +-
 esphome/components/number/__init__.py         | 49 ++++++++++++++++++-
 esphome/components/number/number.h            |  7 +++
 .../components/template/number/__init__.py    |  7 +--
 esphome/components/tuya/number/__init__.py    |  7 +--
 7 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/esphome/components/copy/number/__init__.py b/esphome/components/copy/number/__init__.py
index 4e78627a1f..204518da39 100644
--- a/esphome/components/copy/number/__init__.py
+++ b/esphome/components/copy/number/__init__.py
@@ -15,12 +15,15 @@ from .. import copy_ns
 CopyNumber = copy_ns.class_("CopyNumber", number.Number, cg.Component)
 
 
-CONFIG_SCHEMA = number.NUMBER_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(CopyNumber),
-        cv.Required(CONF_SOURCE_ID): cv.use_id(number.Number),
-    }
-).extend(cv.COMPONENT_SCHEMA)
+CONFIG_SCHEMA = (
+    number.number_schema(CopyNumber)
+    .extend(
+        {
+            cv.Required(CONF_SOURCE_ID): cv.use_id(number.Number),
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+)
 
 FINAL_VALIDATE_SCHEMA = cv.All(
     inherit_property_from(CONF_ICON, CONF_SOURCE_ID),
diff --git a/esphome/components/demo/__init__.py b/esphome/components/demo/__init__.py
index 19b35828a5..05160bf8cb 100644
--- a/esphome/components/demo/__init__.py
+++ b/esphome/components/demo/__init__.py
@@ -284,9 +284,10 @@ CONFIG_SCHEMA = cv.Schema(
                 },
             ],
         ): [
-            number.NUMBER_SCHEMA.extend(cv.COMPONENT_SCHEMA).extend(
+            number.number_schema(DemoNumber)
+            .extend(cv.COMPONENT_SCHEMA)
+            .extend(
                 {
-                    cv.GenerateID(): cv.declare_id(DemoNumber),
                     cv.Required(CONF_TYPE): cv.enum(NUMBER_TYPES, int=True),
                     cv.Required(CONF_MIN_VALUE): cv.float_,
                     cv.Required(CONF_MAX_VALUE): cv.float_,
diff --git a/esphome/components/modbus_controller/number/__init__.py b/esphome/components/modbus_controller/number/__init__.py
index 52f63e791b..fe99b28a00 100644
--- a/esphome/components/modbus_controller/number/__init__.py
+++ b/esphome/components/modbus_controller/number/__init__.py
@@ -60,9 +60,10 @@ def validate_modbus_number(config):
 
 
 CONFIG_SCHEMA = cv.All(
-    number.NUMBER_SCHEMA.extend(ModbusItemBaseSchema).extend(
+    number.number_schema(ModbusNumber)
+    .extend(ModbusItemBaseSchema)
+    .extend(
         {
-            cv.GenerateID(): cv.declare_id(ModbusNumber),
             cv.Optional(CONF_REGISTER_TYPE, default="holding"): cv.enum(
                 MODBUS_WRITE_REGISTER_TYPE
             ),
diff --git a/esphome/components/number/__init__.py b/esphome/components/number/__init__.py
index 1d2dac9bde..a51cf13124 100644
--- a/esphome/components/number/__init__.py
+++ b/esphome/components/number/__init__.py
@@ -7,7 +7,9 @@ from esphome.const import (
     CONF_ABOVE,
     CONF_BELOW,
     CONF_DEVICE_CLASS,
+    CONF_ENTITY_CATEGORY,
     CONF_ID,
+    CONF_ICON,
     CONF_MODE,
     CONF_ON_VALUE,
     CONF_ON_VALUE_RANGE,
@@ -63,6 +65,7 @@ from esphome.const import (
 )
 from esphome.core import CORE, coroutine_with_priority
 from esphome.cpp_helpers import setup_entity
+from esphome.cpp_generator import MockObjClass
 
 CODEOWNERS = ["@esphome/core"]
 DEVICE_CLASSES = [
@@ -150,8 +153,8 @@ NUMBER_OPERATION_OPTIONS = {
     "TO_MAX": NumberOperation.NUMBER_OP_TO_MAX,
 }
 
-icon = cv.icon
 validate_device_class = cv.one_of(*DEVICE_CLASSES, lower=True, space="_")
+validate_unit_of_measurement = cv.string_strict
 
 NUMBER_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).extend(
     {
@@ -170,12 +173,54 @@ NUMBER_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).e
             },
             cv.has_at_least_one_key(CONF_ABOVE, CONF_BELOW),
         ),
-        cv.Optional(CONF_UNIT_OF_MEASUREMENT): cv.string_strict,
+        cv.Optional(CONF_UNIT_OF_MEASUREMENT): validate_unit_of_measurement,
         cv.Optional(CONF_MODE, default="AUTO"): cv.enum(NUMBER_MODES, upper=True),
         cv.Optional(CONF_DEVICE_CLASS): validate_device_class,
     }
 )
 
+_UNDEF = object()
+
+
+def number_schema(
+    class_: MockObjClass = _UNDEF,
+    *,
+    icon: str = _UNDEF,
+    entity_category: str = _UNDEF,
+    device_class: str = _UNDEF,
+    unit_of_measurement: str = _UNDEF,
+) -> cv.Schema:
+    schema = NUMBER_SCHEMA
+    if class_ is not _UNDEF:
+        schema = schema.extend({cv.GenerateID(): cv.declare_id(class_)})
+    if icon is not _UNDEF:
+        schema = schema.extend({cv.Optional(CONF_ICON, default=icon): cv.icon})
+    if entity_category is not _UNDEF:
+        schema = schema.extend(
+            {
+                cv.Optional(
+                    CONF_ENTITY_CATEGORY, default=entity_category
+                ): cv.entity_category
+            }
+        )
+    if device_class is not _UNDEF:
+        schema = schema.extend(
+            {
+                cv.Optional(
+                    CONF_DEVICE_CLASS, default=device_class
+                ): validate_device_class
+            }
+        )
+    if unit_of_measurement is not _UNDEF:
+        schema = schema.extend(
+            {
+                cv.Optional(
+                    CONF_UNIT_OF_MEASUREMENT, default=unit_of_measurement
+                ): validate_unit_of_measurement
+            }
+        )
+    return schema
+
 
 async def setup_number_core_(
     var, config, *, min_value: float, max_value: float, step: Optional[float]
diff --git a/esphome/components/number/number.h b/esphome/components/number/number.h
index 4f63e0480c..d839d12ad1 100644
--- a/esphome/components/number/number.h
+++ b/esphome/components/number/number.h
@@ -23,6 +23,13 @@ namespace number {
     } \
   }
 
+#define SUB_NUMBER(name) \
+ protected: \
+  number::Number *name##_number_{nullptr}; \
+\
+ public: \
+  void set_##name##_number(number::Number *number) { this->name##_number_ = number; }
+
 class Number;
 
 /** Base-class for all numbers.
diff --git a/esphome/components/template/number/__init__.py b/esphome/components/template/number/__init__.py
index 3dec7066d3..b9a507c7e9 100644
--- a/esphome/components/template/number/__init__.py
+++ b/esphome/components/template/number/__init__.py
@@ -46,9 +46,9 @@ def validate(config):
 
 
 CONFIG_SCHEMA = cv.All(
-    number.NUMBER_SCHEMA.extend(
+    number.number_schema(TemplateNumber)
+    .extend(
         {
-            cv.GenerateID(): cv.declare_id(TemplateNumber),
             cv.Required(CONF_MAX_VALUE): cv.float_,
             cv.Required(CONF_MIN_VALUE): cv.float_,
             cv.Required(CONF_STEP): cv.positive_float,
@@ -58,7 +58,8 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_INITIAL_VALUE): cv.float_,
             cv.Optional(CONF_RESTORE_VALUE): cv.boolean,
         }
-    ).extend(cv.polling_component_schema("60s")),
+    )
+    .extend(cv.polling_component_schema("60s")),
     validate_min_max,
     validate,
 )
diff --git a/esphome/components/tuya/number/__init__.py b/esphome/components/tuya/number/__init__.py
index 12c0c0f6e5..42ac9fcfbe 100644
--- a/esphome/components/tuya/number/__init__.py
+++ b/esphome/components/tuya/number/__init__.py
@@ -23,16 +23,17 @@ def validate_min_max(config):
 
 
 CONFIG_SCHEMA = cv.All(
-    number.NUMBER_SCHEMA.extend(
+    number.number_schema(TuyaNumber)
+    .extend(
         {
-            cv.GenerateID(): cv.declare_id(TuyaNumber),
             cv.GenerateID(CONF_TUYA_ID): cv.use_id(Tuya),
             cv.Required(CONF_NUMBER_DATAPOINT): cv.uint8_t,
             cv.Required(CONF_MAX_VALUE): cv.float_,
             cv.Required(CONF_MIN_VALUE): cv.float_,
             cv.Required(CONF_STEP): cv.positive_float,
         }
-    ).extend(cv.COMPONENT_SCHEMA),
+    )
+    .extend(cv.COMPONENT_SCHEMA),
     validate_min_max,
 )
 

From 72391389a31c6000a02af63a80fb3806b8a2910c Mon Sep 17 00:00:00 2001
From: Regev Brody <regevbr@gmail.com>
Date: Sun, 19 Feb 2023 21:54:03 +0200
Subject: [PATCH 595/838] add SUB_BUTTON macro and ability to button schema to
 define the class (#4450)

* add ability to button schema to define the class

* add SUB_BUTTON macro
---
 esphome/components/button/__init__.py             |  5 +++++
 esphome/components/button/button.h                |  7 +++++++
 esphome/components/copy/button/__init__.py        |  3 +--
 .../components/factory_reset/button/__init__.py   | 15 ++++++---------
 esphome/components/restart/button/__init__.py     | 12 +++++-------
 esphome/components/safe_mode/button/__init__.py   |  2 +-
 esphome/components/shutdown/button/__init__.py    |  8 +++-----
 7 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/esphome/components/button/__init__.py b/esphome/components/button/__init__.py
index 7329a7955d..9d250bbc8b 100644
--- a/esphome/components/button/__init__.py
+++ b/esphome/components/button/__init__.py
@@ -17,6 +17,7 @@ from esphome.const import (
 )
 from esphome.core import CORE, coroutine_with_priority
 from esphome.cpp_helpers import setup_entity
+from esphome.cpp_generator import MockObjClass
 
 CODEOWNERS = ["@esphome/core"]
 IS_PLATFORM_COMPONENT = True
@@ -56,11 +57,15 @@ _UNDEF = object()
 
 
 def button_schema(
+    class_: MockObjClass = _UNDEF,
+    *,
     icon: str = _UNDEF,
     entity_category: str = _UNDEF,
     device_class: str = _UNDEF,
 ) -> cv.Schema:
     schema = BUTTON_SCHEMA
+    if class_ is not _UNDEF:
+        schema = schema.extend({cv.GenerateID(): cv.declare_id(class_)})
     if icon is not _UNDEF:
         schema = schema.extend({cv.Optional(CONF_ICON, default=icon): cv.icon})
     if entity_category is not _UNDEF:
diff --git a/esphome/components/button/button.h b/esphome/components/button/button.h
index 398d398cd9..3b5f338887 100644
--- a/esphome/components/button/button.h
+++ b/esphome/components/button/button.h
@@ -15,6 +15,13 @@ namespace button {
     } \
   }
 
+#define SUB_BUTTON(name) \
+ protected: \
+  button::Button *name##_button_{nullptr}; \
+\
+ public: \
+  void set_##name##_button(button::Button *button) { this->name##_button_ = button; }
+
 /** Base class for all buttons.
  *
  * A button is just a momentary switch that does not have a state, only a trigger.
diff --git a/esphome/components/copy/button/__init__.py b/esphome/components/copy/button/__init__.py
index 65d956601a..626a5a8db1 100644
--- a/esphome/components/copy/button/__init__.py
+++ b/esphome/components/copy/button/__init__.py
@@ -16,10 +16,9 @@ CopyButton = copy_ns.class_("CopyButton", button.Button, cg.Component)
 
 
 CONFIG_SCHEMA = (
-    button.button_schema()
+    button.button_schema(CopyButton)
     .extend(
         {
-            cv.GenerateID(): cv.declare_id(CopyButton),
             cv.Required(CONF_SOURCE_ID): cv.use_id(button.Button),
         }
     )
diff --git a/esphome/components/factory_reset/button/__init__.py b/esphome/components/factory_reset/button/__init__.py
index d5beac34b5..010691ac7f 100644
--- a/esphome/components/factory_reset/button/__init__.py
+++ b/esphome/components/factory_reset/button/__init__.py
@@ -13,15 +13,12 @@ FactoryResetButton = factory_reset_ns.class_(
     "FactoryResetButton", button.Button, cg.Component
 )
 
-CONFIG_SCHEMA = (
-    button.button_schema(
-        device_class=DEVICE_CLASS_RESTART,
-        entity_category=ENTITY_CATEGORY_CONFIG,
-        icon=ICON_RESTART_ALERT,
-    )
-    .extend({cv.GenerateID(): cv.declare_id(FactoryResetButton)})
-    .extend(cv.COMPONENT_SCHEMA)
-)
+CONFIG_SCHEMA = button.button_schema(
+    FactoryResetButton,
+    device_class=DEVICE_CLASS_RESTART,
+    entity_category=ENTITY_CATEGORY_CONFIG,
+    icon=ICON_RESTART_ALERT,
+).extend(cv.COMPONENT_SCHEMA)
 
 
 async def to_code(config):
diff --git a/esphome/components/restart/button/__init__.py b/esphome/components/restart/button/__init__.py
index 1a0e9cdc3d..1b2c991261 100644
--- a/esphome/components/restart/button/__init__.py
+++ b/esphome/components/restart/button/__init__.py
@@ -10,13 +10,11 @@ from esphome.const import (
 restart_ns = cg.esphome_ns.namespace("restart")
 RestartButton = restart_ns.class_("RestartButton", button.Button, cg.Component)
 
-CONFIG_SCHEMA = (
-    button.button_schema(
-        device_class=DEVICE_CLASS_RESTART, entity_category=ENTITY_CATEGORY_CONFIG
-    )
-    .extend({cv.GenerateID(): cv.declare_id(RestartButton)})
-    .extend(cv.COMPONENT_SCHEMA)
-)
+CONFIG_SCHEMA = button.button_schema(
+    RestartButton,
+    device_class=DEVICE_CLASS_RESTART,
+    entity_category=ENTITY_CATEGORY_CONFIG,
+).extend(cv.COMPONENT_SCHEMA)
 
 
 async def to_code(config):
diff --git a/esphome/components/safe_mode/button/__init__.py b/esphome/components/safe_mode/button/__init__.py
index 2cd8892afb..307e4e372e 100644
--- a/esphome/components/safe_mode/button/__init__.py
+++ b/esphome/components/safe_mode/button/__init__.py
@@ -17,11 +17,11 @@ SafeModeButton = safe_mode_ns.class_("SafeModeButton", button.Button, cg.Compone
 
 CONFIG_SCHEMA = (
     button.button_schema(
+        SafeModeButton,
         device_class=DEVICE_CLASS_RESTART,
         entity_category=ENTITY_CATEGORY_CONFIG,
         icon=ICON_RESTART_ALERT,
     )
-    .extend({cv.GenerateID(): cv.declare_id(SafeModeButton)})
     .extend({cv.GenerateID(CONF_OTA): cv.use_id(OTAComponent)})
     .extend(cv.COMPONENT_SCHEMA)
 )
diff --git a/esphome/components/shutdown/button/__init__.py b/esphome/components/shutdown/button/__init__.py
index 51cd6d6da2..79d0b23935 100644
--- a/esphome/components/shutdown/button/__init__.py
+++ b/esphome/components/shutdown/button/__init__.py
@@ -10,11 +10,9 @@ from esphome.const import (
 shutdown_ns = cg.esphome_ns.namespace("shutdown")
 ShutdownButton = shutdown_ns.class_("ShutdownButton", button.Button, cg.Component)
 
-CONFIG_SCHEMA = (
-    button.button_schema(entity_category=ENTITY_CATEGORY_CONFIG, icon=ICON_POWER)
-    .extend({cv.GenerateID(): cv.declare_id(ShutdownButton)})
-    .extend(cv.COMPONENT_SCHEMA)
-)
+CONFIG_SCHEMA = button.button_schema(
+    ShutdownButton, entity_category=ENTITY_CATEGORY_CONFIG, icon=ICON_POWER
+).extend(cv.COMPONENT_SCHEMA)
 
 
 async def to_code(config):

From add40c765299a959db67a77047df3022e8aeb48d Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 20 Feb 2023 10:13:35 +1300
Subject: [PATCH 596/838] Simplify number_schema function (#4467)

---
 esphome/components/number/__init__.py | 45 ++++++++-------------------
 1 file changed, 13 insertions(+), 32 deletions(-)

diff --git a/esphome/components/number/__init__.py b/esphome/components/number/__init__.py
index a51cf13124..70c53cace3 100644
--- a/esphome/components/number/__init__.py
+++ b/esphome/components/number/__init__.py
@@ -159,7 +159,6 @@ validate_unit_of_measurement = cv.string_strict
 NUMBER_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).extend(
     {
         cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(mqtt.MQTTNumberComponent),
-        cv.GenerateID(): cv.declare_id(Number),
         cv.Optional(CONF_ON_VALUE): automation.validate_automation(
             {
                 cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(NumberStateTrigger),
@@ -183,43 +182,25 @@ _UNDEF = object()
 
 
 def number_schema(
-    class_: MockObjClass = _UNDEF,
+    class_: MockObjClass,
     *,
     icon: str = _UNDEF,
     entity_category: str = _UNDEF,
     device_class: str = _UNDEF,
     unit_of_measurement: str = _UNDEF,
 ) -> cv.Schema:
-    schema = NUMBER_SCHEMA
-    if class_ is not _UNDEF:
-        schema = schema.extend({cv.GenerateID(): cv.declare_id(class_)})
-    if icon is not _UNDEF:
-        schema = schema.extend({cv.Optional(CONF_ICON, default=icon): cv.icon})
-    if entity_category is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_ENTITY_CATEGORY, default=entity_category
-                ): cv.entity_category
-            }
-        )
-    if device_class is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_DEVICE_CLASS, default=device_class
-                ): validate_device_class
-            }
-        )
-    if unit_of_measurement is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_UNIT_OF_MEASUREMENT, default=unit_of_measurement
-                ): validate_unit_of_measurement
-            }
-        )
-    return schema
+    schema = {cv.GenerateID(): cv.declare_id(class_)}
+
+    for key, default, validator in [
+        (CONF_ICON, icon, cv.icon),
+        (CONF_ENTITY_CATEGORY, entity_category, cv.entity_category),
+        (CONF_DEVICE_CLASS, device_class, validate_device_class),
+        (CONF_UNIT_OF_MEASUREMENT, unit_of_measurement, validate_unit_of_measurement),
+    ]:
+        if default is not _UNDEF:
+            schema[cv.Optional(key, default=default)] = validator
+
+    return NUMBER_SCHEMA.extend(schema)
 
 
 async def setup_number_core_(

From 04c12823b5187f40ed99812f715a2e853b1a54ca Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 20 Feb 2023 10:13:37 +1300
Subject: [PATCH 597/838] Simplify button_schema function (#4468)

---
 esphome/components/button/__init__.py         | 35 +++++++------------
 esphome/components/output/button/__init__.py  | 17 +++++----
 .../components/template/button/__init__.py    |  7 +---
 esphome/components/wake_on_lan/button.py      |  5 +--
 4 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/esphome/components/button/__init__.py b/esphome/components/button/__init__.py
index 9d250bbc8b..55f2fe794a 100644
--- a/esphome/components/button/__init__.py
+++ b/esphome/components/button/__init__.py
@@ -57,34 +57,23 @@ _UNDEF = object()
 
 
 def button_schema(
-    class_: MockObjClass = _UNDEF,
+    class_: MockObjClass,
     *,
     icon: str = _UNDEF,
     entity_category: str = _UNDEF,
     device_class: str = _UNDEF,
 ) -> cv.Schema:
-    schema = BUTTON_SCHEMA
-    if class_ is not _UNDEF:
-        schema = schema.extend({cv.GenerateID(): cv.declare_id(class_)})
-    if icon is not _UNDEF:
-        schema = schema.extend({cv.Optional(CONF_ICON, default=icon): cv.icon})
-    if entity_category is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_ENTITY_CATEGORY, default=entity_category
-                ): cv.entity_category
-            }
-        )
-    if device_class is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_DEVICE_CLASS, default=device_class
-                ): validate_device_class
-            }
-        )
-    return schema
+    schema = {cv.GenerateID(): cv.declare_id(class_)}
+
+    for key, default, validator in [
+        (CONF_ICON, icon, cv.icon),
+        (CONF_ENTITY_CATEGORY, entity_category, cv.entity_category),
+        (CONF_DEVICE_CLASS, device_class, validate_device_class),
+    ]:
+        if default is not _UNDEF:
+            schema[cv.Optional(key, default=default)] = validator
+
+    return BUTTON_SCHEMA.extend(schema)
 
 
 async def setup_button_core_(var, config):
diff --git a/esphome/components/output/button/__init__.py b/esphome/components/output/button/__init__.py
index 4b81cedc0c..c31865ccfb 100644
--- a/esphome/components/output/button/__init__.py
+++ b/esphome/components/output/button/__init__.py
@@ -6,13 +6,16 @@ from .. import output_ns
 
 OutputButton = output_ns.class_("OutputButton", button.Button, cg.Component)
 
-CONFIG_SCHEMA = button.BUTTON_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(OutputButton),
-        cv.Required(CONF_OUTPUT): cv.use_id(output.BinaryOutput),
-        cv.Required(CONF_DURATION): cv.positive_time_period_milliseconds,
-    }
-).extend(cv.COMPONENT_SCHEMA)
+CONFIG_SCHEMA = (
+    button.button_schema(OutputButton)
+    .extend(
+        {
+            cv.Required(CONF_OUTPUT): cv.use_id(output.BinaryOutput),
+            cv.Required(CONF_DURATION): cv.positive_time_period_milliseconds,
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+)
 
 
 async def to_code(config):
diff --git a/esphome/components/template/button/__init__.py b/esphome/components/template/button/__init__.py
index 2ad5e54c80..e0101dfc8f 100644
--- a/esphome/components/template/button/__init__.py
+++ b/esphome/components/template/button/__init__.py
@@ -1,15 +1,10 @@
-import esphome.config_validation as cv
 from esphome.components import button
 
 from .. import template_ns
 
 TemplateButton = template_ns.class_("TemplateButton", button.Button)
 
-CONFIG_SCHEMA = button.BUTTON_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(TemplateButton),
-    }
-)
+CONFIG_SCHEMA = button.button_schema(TemplateButton)
 
 
 async def to_code(config):
diff --git a/esphome/components/wake_on_lan/button.py b/esphome/components/wake_on_lan/button.py
index 2710eb3df9..778ea60cfa 100644
--- a/esphome/components/wake_on_lan/button.py
+++ b/esphome/components/wake_on_lan/button.py
@@ -12,11 +12,12 @@ WakeOnLanButton = wake_on_lan_ns.class_("WakeOnLanButton", button.Button, cg.Com
 DEPENDENCIES = ["network"]
 
 CONFIG_SCHEMA = cv.All(
-    button.BUTTON_SCHEMA.extend(cv.COMPONENT_SCHEMA).extend(
+    button.button_schema(WakeOnLanButton)
+    .extend(cv.COMPONENT_SCHEMA)
+    .extend(
         cv.Schema(
             {
                 cv.Required(CONF_TARGET_MAC_ADDRESS): cv.mac_address,
-                cv.GenerateID(): cv.declare_id(WakeOnLanButton),
             }
         ),
     ),

From 5c49730cb9c7132e58a7991c6f9f9d6a840a12c7 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 20 Feb 2023 10:13:40 +1300
Subject: [PATCH 598/838] Simplify binary_sensor_schema function (#4469)

---
 .../analog_threshold/binary_sensor.py         | 28 +++++++++------
 esphome/components/binary_sensor/__init__.py  | 35 ++++++++-----------
 .../matrix_keypad/binary_sensor/__init__.py   |  3 +-
 esphome/components/tm1637/binary_sensor.py    |  3 +-
 .../tm1638/binary_sensor/__init__.py          |  3 +-
 5 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/esphome/components/analog_threshold/binary_sensor.py b/esphome/components/analog_threshold/binary_sensor.py
index ef4a6044bf..7b964dfae6 100644
--- a/esphome/components/analog_threshold/binary_sensor.py
+++ b/esphome/components/analog_threshold/binary_sensor.py
@@ -15,18 +15,24 @@ AnalogThresholdBinarySensor = analog_threshold_ns.class_(
 CONF_UPPER = "upper"
 CONF_LOWER = "lower"
 
-CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(AnalogThresholdBinarySensor),
-        cv.Required(CONF_SENSOR_ID): cv.use_id(sensor.Sensor),
-        cv.Required(CONF_THRESHOLD): cv.Any(
-            cv.float_,
-            cv.Schema(
-                {cv.Required(CONF_UPPER): cv.float_, cv.Required(CONF_LOWER): cv.float_}
+CONFIG_SCHEMA = (
+    binary_sensor.binary_sensor_schema(AnalogThresholdBinarySensor)
+    .extend(
+        {
+            cv.Required(CONF_SENSOR_ID): cv.use_id(sensor.Sensor),
+            cv.Required(CONF_THRESHOLD): cv.Any(
+                cv.float_,
+                cv.Schema(
+                    {
+                        cv.Required(CONF_UPPER): cv.float_,
+                        cv.Required(CONF_LOWER): cv.float_,
+                    }
+                ),
             ),
-        ),
-    }
-).extend(cv.COMPONENT_SCHEMA)
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+)
 
 
 async def to_code(config):
diff --git a/esphome/components/binary_sensor/__init__.py b/esphome/components/binary_sensor/__init__.py
index 91f63de9e3..f4a5c95b12 100644
--- a/esphome/components/binary_sensor/__init__.py
+++ b/esphome/components/binary_sensor/__init__.py
@@ -393,28 +393,21 @@ def binary_sensor_schema(
     entity_category: str = _UNDEF,
     device_class: str = _UNDEF,
 ) -> cv.Schema:
-    schema = BINARY_SENSOR_SCHEMA
+    schema = {}
+
     if class_ is not _UNDEF:
-        schema = schema.extend({cv.GenerateID(): cv.declare_id(class_)})
-    if icon is not _UNDEF:
-        schema = schema.extend({cv.Optional(CONF_ICON, default=icon): cv.icon})
-    if entity_category is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_ENTITY_CATEGORY, default=entity_category
-                ): cv.entity_category
-            }
-        )
-    if device_class is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_DEVICE_CLASS, default=device_class
-                ): validate_device_class
-            }
-        )
-    return schema
+        # Not cv.optional
+        schema[cv.GenerateID()] = cv.declare_id(class_)
+
+    for key, default, validator in [
+        (CONF_ICON, icon, cv.icon),
+        (CONF_ENTITY_CATEGORY, entity_category, cv.entity_category),
+        (CONF_DEVICE_CLASS, device_class, validate_device_class),
+    ]:
+        if default is not _UNDEF:
+            schema[cv.Optional(key, default=default)] = validator
+
+    return BINARY_SENSOR_SCHEMA.extend(schema)
 
 
 async def setup_binary_sensor_core_(var, config):
diff --git a/esphome/components/matrix_keypad/binary_sensor/__init__.py b/esphome/components/matrix_keypad/binary_sensor/__init__.py
index 204db98650..9ad909f60a 100644
--- a/esphome/components/matrix_keypad/binary_sensor/__init__.py
+++ b/esphome/components/matrix_keypad/binary_sensor/__init__.py
@@ -30,9 +30,8 @@ def check_button(obj):
 
 
 CONFIG_SCHEMA = cv.All(
-    binary_sensor.BINARY_SENSOR_SCHEMA.extend(
+    binary_sensor.binary_sensor_schema(MatrixKeypadBinarySensor).extend(
         {
-            cv.GenerateID(): cv.declare_id(MatrixKeypadBinarySensor),
             cv.GenerateID(CONF_KEYPAD_ID): cv.use_id(MatrixKeypad),
             cv.Optional(CONF_ROW): cv.int_,
             cv.Optional(CONF_COL): cv.int_,
diff --git a/esphome/components/tm1637/binary_sensor.py b/esphome/components/tm1637/binary_sensor.py
index 66b5172358..f14b9bd018 100644
--- a/esphome/components/tm1637/binary_sensor.py
+++ b/esphome/components/tm1637/binary_sensor.py
@@ -9,9 +9,8 @@ tm1637_ns = cg.esphome_ns.namespace("tm1637")
 TM1637Display = tm1637_ns.class_("TM1637Display", cg.PollingComponent)
 TM1637Key = tm1637_ns.class_("TM1637Key", binary_sensor.BinarySensor)
 
-CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
+CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(TM1637Key).extend(
     {
-        cv.GenerateID(): cv.declare_id(TM1637Key),
         cv.GenerateID(CONF_TM1637_ID): cv.use_id(TM1637Display),
         cv.Required(CONF_KEY): cv.int_range(min=0, max=15),
     }
diff --git a/esphome/components/tm1638/binary_sensor/__init__.py b/esphome/components/tm1638/binary_sensor/__init__.py
index 7262d9e9e1..6623228555 100644
--- a/esphome/components/tm1638/binary_sensor/__init__.py
+++ b/esphome/components/tm1638/binary_sensor/__init__.py
@@ -6,9 +6,8 @@ from ..display import tm1638_ns, TM1638Component, CONF_TM1638_ID
 
 TM1638Key = tm1638_ns.class_("TM1638Key", binary_sensor.BinarySensor)
 
-CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
+CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(TM1638Key).extend(
     {
-        cv.GenerateID(): cv.declare_id(TM1638Key),
         cv.GenerateID(CONF_TM1638_ID): cv.use_id(TM1638Component),
         cv.Required(CONF_KEY): cv.int_range(min=0, max=15),
     }

From f68d5779868b595e812d817c124feb56e09948a0 Mon Sep 17 00:00:00 2001
From: irtimaled <irtimaled@gmail.com>
Date: Sun, 19 Feb 2023 13:50:46 -0800
Subject: [PATCH 599/838] Add configurable color datapoint (#4383)

* Add configurable color datapoint

* Lint fixes

* Review comments

* Linting
---
 esphome/components/tuya/light/__init__.py    |  30 +++--
 esphome/components/tuya/light/tuya_light.cpp | 116 +++++++++++--------
 esphome/components/tuya/light/tuya_light.h   |  14 ++-
 3 files changed, 97 insertions(+), 63 deletions(-)

diff --git a/esphome/components/tuya/light/__init__.py b/esphome/components/tuya/light/__init__.py
index b983e3f84e..d806060018 100644
--- a/esphome/components/tuya/light/__init__.py
+++ b/esphome/components/tuya/light/__init__.py
@@ -23,9 +23,23 @@ CONF_COLOR_TEMPERATURE_INVERT = "color_temperature_invert"
 CONF_COLOR_TEMPERATURE_MAX_VALUE = "color_temperature_max_value"
 CONF_RGB_DATAPOINT = "rgb_datapoint"
 CONF_HSV_DATAPOINT = "hsv_datapoint"
+CONF_COLOR_DATAPOINT = "color_datapoint"
+CONF_COLOR_TYPE = "color_type"
+
+TuyaColorType = tuya_ns.enum("TuyaColorType")
+
+COLOR_TYPES = {
+    "RGB": TuyaColorType.RGB,
+    "HSV": TuyaColorType.HSV,
+    "RGBHSV": TuyaColorType.RGBHSV,
+}
 
 TuyaLight = tuya_ns.class_("TuyaLight", light.LightOutput, cg.Component)
 
+COLOR_CONFIG_ERROR = (
+    "This option has been removed, use color_datapoint and color_type instead."
+)
+
 CONFIG_SCHEMA = cv.All(
     light.BRIGHTNESS_ONLY_LIGHT_SCHEMA.extend(
         {
@@ -34,8 +48,10 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_DIMMER_DATAPOINT): cv.uint8_t,
             cv.Optional(CONF_MIN_VALUE_DATAPOINT): cv.uint8_t,
             cv.Optional(CONF_SWITCH_DATAPOINT): cv.uint8_t,
-            cv.Exclusive(CONF_RGB_DATAPOINT, "color"): cv.uint8_t,
-            cv.Exclusive(CONF_HSV_DATAPOINT, "color"): cv.uint8_t,
+            cv.Optional(CONF_RGB_DATAPOINT): cv.invalid(COLOR_CONFIG_ERROR),
+            cv.Optional(CONF_HSV_DATAPOINT): cv.invalid(COLOR_CONFIG_ERROR),
+            cv.Inclusive(CONF_COLOR_DATAPOINT, "color"): cv.uint8_t,
+            cv.Inclusive(CONF_COLOR_TYPE, "color"): cv.enum(COLOR_TYPES, upper=True),
             cv.Optional(CONF_COLOR_INTERLOCK, default=False): cv.boolean,
             cv.Inclusive(
                 CONF_COLOR_TEMPERATURE_DATAPOINT, "color_temperature"
@@ -61,8 +77,7 @@ CONFIG_SCHEMA = cv.All(
     cv.has_at_least_one_key(
         CONF_DIMMER_DATAPOINT,
         CONF_SWITCH_DATAPOINT,
-        CONF_RGB_DATAPOINT,
-        CONF_HSV_DATAPOINT,
+        CONF_COLOR_DATAPOINT,
     ),
 )
 
@@ -78,10 +93,9 @@ async def to_code(config):
         cg.add(var.set_min_value_datapoint_id(config[CONF_MIN_VALUE_DATAPOINT]))
     if CONF_SWITCH_DATAPOINT in config:
         cg.add(var.set_switch_id(config[CONF_SWITCH_DATAPOINT]))
-    if CONF_RGB_DATAPOINT in config:
-        cg.add(var.set_rgb_id(config[CONF_RGB_DATAPOINT]))
-    elif CONF_HSV_DATAPOINT in config:
-        cg.add(var.set_hsv_id(config[CONF_HSV_DATAPOINT]))
+    if CONF_COLOR_DATAPOINT in config:
+        cg.add(var.set_color_id(config[CONF_COLOR_DATAPOINT]))
+        cg.add(var.set_color_type(config[CONF_COLOR_TYPE]))
     if CONF_COLOR_TEMPERATURE_DATAPOINT in config:
         cg.add(var.set_color_temperature_id(config[CONF_COLOR_TEMPERATURE_DATAPOINT]))
         cg.add(var.set_color_temperature_invert(config[CONF_COLOR_TEMPERATURE_INVERT]))
diff --git a/esphome/components/tuya/light/tuya_light.cpp b/esphome/components/tuya/light/tuya_light.cpp
index b75e85bc14..869e20871d 100644
--- a/esphome/components/tuya/light/tuya_light.cpp
+++ b/esphome/components/tuya/light/tuya_light.cpp
@@ -50,38 +50,39 @@ void TuyaLight::setup() {
       call.perform();
     });
   }
-  if (rgb_id_.has_value()) {
-    this->parent_->register_listener(*this->rgb_id_, [this](const TuyaDatapoint &datapoint) {
-      auto red = parse_hex<uint8_t>(datapoint.value_string.substr(0, 2));
-      auto green = parse_hex<uint8_t>(datapoint.value_string.substr(2, 2));
-      auto blue = parse_hex<uint8_t>(datapoint.value_string.substr(4, 2));
-      if (red.has_value() && green.has_value() && blue.has_value()) {
-        if (this->state_->current_values != this->state_->remote_values) {
-          ESP_LOGD(TAG, "Light is transitioning, datapoint change ignored");
-          return;
-        }
-
-        auto call = this->state_->make_call();
-        call.set_rgb(float(*red) / 255, float(*green) / 255, float(*blue) / 255);
-        call.perform();
+  if (color_id_.has_value()) {
+    this->parent_->register_listener(*this->color_id_, [this](const TuyaDatapoint &datapoint) {
+      if (this->state_->current_values != this->state_->remote_values) {
+        ESP_LOGD(TAG, "Light is transitioning, datapoint change ignored");
+        return;
       }
-    });
-  } else if (hsv_id_.has_value()) {
-    this->parent_->register_listener(*this->hsv_id_, [this](const TuyaDatapoint &datapoint) {
-      auto hue = parse_hex<uint16_t>(datapoint.value_string.substr(0, 4));
-      auto saturation = parse_hex<uint16_t>(datapoint.value_string.substr(4, 4));
-      auto value = parse_hex<uint16_t>(datapoint.value_string.substr(8, 4));
-      if (hue.has_value() && saturation.has_value() && value.has_value()) {
-        if (this->state_->current_values != this->state_->remote_values) {
-          ESP_LOGD(TAG, "Light is transitioning, datapoint change ignored");
-          return;
-        }
 
-        float red, green, blue;
-        hsv_to_rgb(*hue, float(*saturation) / 1000, float(*value) / 1000, red, green, blue);
-        auto call = this->state_->make_call();
-        call.set_rgb(red, green, blue);
-        call.perform();
+      switch (*this->color_type_) {
+        case TuyaColorType::RGBHSV:
+        case TuyaColorType::RGB: {
+          auto red = parse_hex<uint8_t>(datapoint.value_string.substr(0, 2));
+          auto green = parse_hex<uint8_t>(datapoint.value_string.substr(2, 2));
+          auto blue = parse_hex<uint8_t>(datapoint.value_string.substr(4, 2));
+          if (red.has_value() && green.has_value() && blue.has_value()) {
+            auto rgb_call = this->state_->make_call();
+            rgb_call.set_rgb(float(*red) / 255, float(*green) / 255, float(*blue) / 255);
+            rgb_call.perform();
+          }
+          break;
+        }
+        case TuyaColorType::HSV: {
+          auto hue = parse_hex<uint16_t>(datapoint.value_string.substr(0, 4));
+          auto saturation = parse_hex<uint16_t>(datapoint.value_string.substr(4, 4));
+          auto value = parse_hex<uint16_t>(datapoint.value_string.substr(8, 4));
+          if (hue.has_value() && saturation.has_value() && value.has_value()) {
+            float red, green, blue;
+            hsv_to_rgb(*hue, float(*saturation) / 1000, float(*value) / 1000, red, green, blue);
+            auto rgb_call = this->state_->make_call();
+            rgb_call.set_rgb(red, green, blue);
+            rgb_call.perform();
+          }
+          break;
+        }
       }
     });
   }
@@ -98,17 +99,15 @@ void TuyaLight::dump_config() {
   if (this->switch_id_.has_value()) {
     ESP_LOGCONFIG(TAG, "   Switch has datapoint ID %u", *this->switch_id_);
   }
-  if (this->rgb_id_.has_value()) {
-    ESP_LOGCONFIG(TAG, "   RGB has datapoint ID %u", *this->rgb_id_);
-  } else if (this->hsv_id_.has_value()) {
-    ESP_LOGCONFIG(TAG, "   HSV has datapoint ID %u", *this->hsv_id_);
+  if (this->color_id_.has_value()) {
+    ESP_LOGCONFIG(TAG, "   Color has datapoint ID %u", *this->color_id_);
   }
 }
 
 light::LightTraits TuyaLight::get_traits() {
   auto traits = light::LightTraits();
   if (this->color_temperature_id_.has_value() && this->dimmer_id_.has_value()) {
-    if (this->rgb_id_.has_value() || this->hsv_id_.has_value()) {
+    if (this->color_id_.has_value()) {
       if (this->color_interlock_) {
         traits.set_supported_color_modes({light::ColorMode::RGB, light::ColorMode::COLOR_TEMPERATURE});
       } else {
@@ -119,7 +118,7 @@ light::LightTraits TuyaLight::get_traits() {
       traits.set_supported_color_modes({light::ColorMode::COLOR_TEMPERATURE});
     traits.set_min_mireds(this->cold_white_temperature_);
     traits.set_max_mireds(this->warm_white_temperature_);
-  } else if (this->rgb_id_.has_value() || this->hsv_id_.has_value()) {
+  } else if (this->color_id_.has_value()) {
     if (this->dimmer_id_.has_value()) {
       if (this->color_interlock_) {
         traits.set_supported_color_modes({light::ColorMode::RGB, light::ColorMode::WHITE});
@@ -142,7 +141,7 @@ void TuyaLight::write_state(light::LightState *state) {
   float red = 0.0f, green = 0.0f, blue = 0.0f;
   float color_temperature = 0.0f, brightness = 0.0f;
 
-  if (this->rgb_id_.has_value() || this->hsv_id_.has_value()) {
+  if (this->color_id_.has_value()) {
     if (this->color_temperature_id_.has_value()) {
       state->current_values_as_rgbct(&red, &green, &blue, &color_temperature, &brightness);
     } else if (this->dimmer_id_.has_value()) {
@@ -178,21 +177,36 @@ void TuyaLight::write_state(light::LightState *state) {
     }
   }
 
-  if (brightness == 0.0f || !color_interlock_) {
-    if (this->rgb_id_.has_value()) {
-      char buffer[7];
-      sprintf(buffer, "%02X%02X%02X", int(red * 255), int(green * 255), int(blue * 255));
-      std::string rgb_value = buffer;
-      this->parent_->set_string_datapoint_value(*this->rgb_id_, rgb_value);
-    } else if (this->hsv_id_.has_value()) {
-      int hue;
-      float saturation, value;
-      rgb_to_hsv(red, green, blue, hue, saturation, value);
-      char buffer[13];
-      sprintf(buffer, "%04X%04X%04X", hue, int(saturation * 1000), int(value * 1000));
-      std::string hsv_value = buffer;
-      this->parent_->set_string_datapoint_value(*this->hsv_id_, hsv_value);
+  if (this->color_id_.has_value() && (brightness == 0.0f || !color_interlock_)) {
+    std::string color_value;
+    switch (*this->color_type_) {
+      case TuyaColorType::RGB: {
+        char buffer[7];
+        sprintf(buffer, "%02X%02X%02X", int(red * 255), int(green * 255), int(blue * 255));
+        color_value = buffer;
+        break;
+      }
+      case TuyaColorType::HSV: {
+        int hue;
+        float saturation, value;
+        rgb_to_hsv(red, green, blue, hue, saturation, value);
+        char buffer[13];
+        sprintf(buffer, "%04X%04X%04X", hue, int(saturation * 1000), int(value * 1000));
+        color_value = buffer;
+        break;
+      }
+      case TuyaColorType::RGBHSV: {
+        int hue;
+        float saturation, value;
+        rgb_to_hsv(red, green, blue, hue, saturation, value);
+        char buffer[15];
+        sprintf(buffer, "%02X%02X%02X%04X%02X%02X", int(red * 255), int(green * 255), int(blue * 255), hue,
+                int(saturation * 255), int(value * 255));
+        color_value = buffer;
+        break;
+      }
     }
+    this->parent_->set_string_datapoint_value(*this->color_id_, color_value);
   }
 
   if (this->switch_id_.has_value()) {
diff --git a/esphome/components/tuya/light/tuya_light.h b/esphome/components/tuya/light/tuya_light.h
index 3d9f25271c..bd9920f18f 100644
--- a/esphome/components/tuya/light/tuya_light.h
+++ b/esphome/components/tuya/light/tuya_light.h
@@ -7,6 +7,12 @@
 namespace esphome {
 namespace tuya {
 
+enum TuyaColorType {
+  RGB,
+  HSV,
+  RGBHSV,
+};
+
 class TuyaLight : public Component, public light::LightOutput {
  public:
   void setup() override;
@@ -16,8 +22,8 @@ class TuyaLight : public Component, public light::LightOutput {
     this->min_value_datapoint_id_ = min_value_datapoint_id;
   }
   void set_switch_id(uint8_t switch_id) { this->switch_id_ = switch_id; }
-  void set_rgb_id(uint8_t rgb_id) { this->rgb_id_ = rgb_id; }
-  void set_hsv_id(uint8_t hsv_id) { this->hsv_id_ = hsv_id; }
+  void set_color_id(uint8_t color_id) { this->color_id_ = color_id; }
+  void set_color_type(TuyaColorType color_type) { this->color_type_ = color_type; }
   void set_color_temperature_id(uint8_t color_temperature_id) { this->color_temperature_id_ = color_temperature_id; }
   void set_color_temperature_invert(bool color_temperature_invert) {
     this->color_temperature_invert_ = color_temperature_invert;
@@ -48,8 +54,8 @@ class TuyaLight : public Component, public light::LightOutput {
   optional<uint8_t> dimmer_id_{};
   optional<uint8_t> min_value_datapoint_id_{};
   optional<uint8_t> switch_id_{};
-  optional<uint8_t> rgb_id_{};
-  optional<uint8_t> hsv_id_{};
+  optional<uint8_t> color_id_{};
+  optional<TuyaColorType> color_type_{};
   optional<uint8_t> color_temperature_id_{};
   uint32_t min_value_ = 0;
   uint32_t max_value_ = 255;

From ed801f7a279f9d4f9a166d3fb5c311de8a5cea21 Mon Sep 17 00:00:00 2001
From: Mat931 <49403702+Mat931@users.noreply.github.com>
Date: Mon, 20 Feb 2023 02:47:37 +0000
Subject: [PATCH 600/838] Add internal_temperature component (#4330)

* Add cpu_temperature component

* Add tests

* Fix formatting

* Possible fix for "sensor not shown in HomeAssistant"

* Rename component to internal_temperature

* Update esphome/components/internal_temperature/internal_temperature.cpp

Co-authored-by: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>

* Update esphome/components/internal_temperature/internal_temperature.cpp

Co-authored-by: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>

* Update esphome/components/internal_temperature/internal_temperature.cpp

Co-authored-by: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>

* Update internal_temperature.h

* Remove unique_id

* Update ESP32 variant detection

---------

Co-authored-by: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
---
 CODEOWNERS                                    |  1 +
 .../internal_temperature/__init__.py          |  1 +
 .../internal_temperature.cpp                  | 58 +++++++++++++++++++
 .../internal_temperature.h                    | 17 ++++++
 .../components/internal_temperature/sensor.py | 31 ++++++++++
 tests/test1.yaml                              |  2 +
 tests/test5.yaml                              |  2 +
 tests/test6.yaml                              |  4 ++
 8 files changed, 116 insertions(+)
 create mode 100644 esphome/components/internal_temperature/__init__.py
 create mode 100644 esphome/components/internal_temperature/internal_temperature.cpp
 create mode 100644 esphome/components/internal_temperature/internal_temperature.h
 create mode 100644 esphome/components/internal_temperature/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index ca1da2f153..9cfa81b36c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -113,6 +113,7 @@ esphome/components/ina260/* @MrEditor97
 esphome/components/inkbird_ibsth1_mini/* @fkirill
 esphome/components/inkplate6/* @jesserockz
 esphome/components/integration/* @OttoWinter
+esphome/components/internal_temperature/* @Mat931
 esphome/components/interval/* @esphome/core
 esphome/components/json/* @OttoWinter
 esphome/components/kalman_combinator/* @Cat-Ion
diff --git a/esphome/components/internal_temperature/__init__.py b/esphome/components/internal_temperature/__init__.py
new file mode 100644
index 0000000000..9433ade13f
--- /dev/null
+++ b/esphome/components/internal_temperature/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@Mat931"]
diff --git a/esphome/components/internal_temperature/internal_temperature.cpp b/esphome/components/internal_temperature/internal_temperature.cpp
new file mode 100644
index 0000000000..9a22a77f63
--- /dev/null
+++ b/esphome/components/internal_temperature/internal_temperature.cpp
@@ -0,0 +1,58 @@
+#include "internal_temperature.h"
+#include "esphome/core/log.h"
+
+#ifdef USE_ESP32
+#if defined(USE_ESP32_VARIANT_ESP32)
+// there is no official API available on the original ESP32
+extern "C" {
+uint8_t temprature_sens_read();
+}
+#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+#include "driver/temp_sensor.h"
+#endif  // USE_ESP32_VARIANT
+#endif  // USE_ESP32
+#ifdef USE_RP2040
+#include "Arduino.h"
+#endif  // USE_RP2040
+
+namespace esphome {
+namespace internal_temperature {
+
+static const char *const TAG = "internal_temperature";
+
+void InternalTemperatureSensor::update() {
+  float temperature = NAN;
+  bool success = false;
+#ifdef USE_ESP32
+#if defined(USE_ESP32_VARIANT_ESP32)
+  uint8_t raw = temprature_sens_read();
+  ESP_LOGV(TAG, "Raw temperature value: %d", raw);
+  temperature = (raw - 32) / 1.8f;
+  success = (raw != 128);
+#elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+  temp_sensor_config_t tsens = TSENS_CONFIG_DEFAULT();
+  temp_sensor_set_config(tsens);
+  temp_sensor_start();
+  esp_err_t result = temp_sensor_read_celsius(&temperature);
+  temp_sensor_stop();
+  success = (result == ESP_OK);
+#endif  // USE_ESP32_VARIANT
+#endif  // USE_ESP32
+#ifdef USE_RP2040
+  temperature = analogReadTemp();
+  success = (temperature != 0.0f);
+#endif  // USE_RP2040
+  if (success && std::isfinite(temperature)) {
+    this->publish_state(temperature);
+  } else {
+    ESP_LOGD(TAG, "Ignoring invalid temperature (success=%d, value=%.1f)", success, temperature);
+    if (!this->has_state()) {
+      this->publish_state(NAN);
+    }
+  }
+}
+
+void InternalTemperatureSensor::dump_config() { LOG_SENSOR("", "Internal Temperature Sensor", this); }
+
+}  // namespace internal_temperature
+}  // namespace esphome
diff --git a/esphome/components/internal_temperature/internal_temperature.h b/esphome/components/internal_temperature/internal_temperature.h
new file mode 100644
index 0000000000..0e46a69769
--- /dev/null
+++ b/esphome/components/internal_temperature/internal_temperature.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+
+namespace esphome {
+namespace internal_temperature {
+
+class InternalTemperatureSensor : public sensor::Sensor, public PollingComponent {
+ public:
+  void dump_config() override;
+
+  void update() override;
+};
+
+}  // namespace internal_temperature
+}  // namespace esphome
diff --git a/esphome/components/internal_temperature/sensor.py b/esphome/components/internal_temperature/sensor.py
new file mode 100644
index 0000000000..2655711bb5
--- /dev/null
+++ b/esphome/components/internal_temperature/sensor.py
@@ -0,0 +1,31 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome.const import (
+    STATE_CLASS_MEASUREMENT,
+    UNIT_CELSIUS,
+    DEVICE_CLASS_TEMPERATURE,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+)
+
+internal_temperature_ns = cg.esphome_ns.namespace("internal_temperature")
+InternalTemperatureSensor = internal_temperature_ns.class_(
+    "InternalTemperatureSensor", sensor.Sensor, cg.PollingComponent
+)
+
+CONFIG_SCHEMA = cv.All(
+    sensor.sensor_schema(
+        InternalTemperatureSensor,
+        unit_of_measurement=UNIT_CELSIUS,
+        accuracy_decimals=1,
+        device_class=DEVICE_CLASS_TEMPERATURE,
+        state_class=STATE_CLASS_MEASUREMENT,
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+    ).extend(cv.polling_component_schema("60s")),
+    cv.only_on(["esp32", "rp2040"]),
+)
+
+
+async def to_code(config):
+    var = await sensor.new_sensor(config)
+    await cg.register_component(var, config)
diff --git a/tests/test1.yaml b/tests/test1.yaml
index a77f8802b9..bdc6da3406 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -324,6 +324,8 @@ mcp23s17:
     deviceaddress: 1
 
 sensor:
+  - platform: internal_temperature
+    name: "Internal Temperature"
   - platform: ble_client
     type: characteristic
     ble_client_id: ble_foo
diff --git a/tests/test5.yaml b/tests/test5.yaml
index 5f72579d08..21419692e4 100644
--- a/tests/test5.yaml
+++ b/tests/test5.yaml
@@ -373,6 +373,8 @@ select:
       "Three": 3
 
 sensor:
+  - platform: internal_temperature
+    name: "Internal Temperature"
   - platform: selec_meter
     total_active_energy:
       name: SelecEM2M Total Active Energy
diff --git a/tests/test6.yaml b/tests/test6.yaml
index 264773331e..2930400e34 100644
--- a/tests/test6.yaml
+++ b/tests/test6.yaml
@@ -37,3 +37,7 @@ switch:
   - platform: output
     output: pin_4
     id: pin_4_switch
+
+sensor:
+  - platform: internal_temperature
+    name: "Internal Temperature"

From 247916fe895ce6d3cb6a1973109d0667c25721d6 Mon Sep 17 00:00:00 2001
From: konsulten <nordmarkclaes@gmail.com>
Date: Mon, 20 Feb 2023 03:48:59 +0100
Subject: [PATCH 601/838] BL0939 state_class set for energy sensors (#4463)

BL0939 was missing TOTAL_INCREASING for energy (kWh) thus it did not show as statistics in home assistant
---
 esphome/components/bl0939/sensor.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/esphome/components/bl0939/sensor.py b/esphome/components/bl0939/sensor.py
index bcc72ad61a..4c6e3ea4d9 100644
--- a/esphome/components/bl0939/sensor.py
+++ b/esphome/components/bl0939/sensor.py
@@ -9,6 +9,7 @@ from esphome.const import (
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_VOLTAGE,
     STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_TOTAL_INCREASING,
     UNIT_AMPERE,
     UNIT_KILOWATT_HOURS,
     UNIT_VOLT,
@@ -66,16 +67,19 @@ CONFIG_SCHEMA = (
                 unit_of_measurement=UNIT_KILOWATT_HOURS,
                 accuracy_decimals=3,
                 device_class=DEVICE_CLASS_ENERGY,
+                state_class=STATE_CLASS_TOTAL_INCREASING,
             ),
             cv.Optional(CONF_ENERGY_2): sensor.sensor_schema(
                 unit_of_measurement=UNIT_KILOWATT_HOURS,
                 accuracy_decimals=3,
                 device_class=DEVICE_CLASS_ENERGY,
+                state_class=STATE_CLASS_TOTAL_INCREASING,
             ),
             cv.Optional(CONF_ENERGY_TOTAL): sensor.sensor_schema(
                 unit_of_measurement=UNIT_KILOWATT_HOURS,
                 accuracy_decimals=3,
                 device_class=DEVICE_CLASS_ENERGY,
+                state_class=STATE_CLASS_TOTAL_INCREASING,
             ),
         }
     )

From 50fbbf2d3ba32f696277529f1ea5413da330ede3 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 20 Feb 2023 16:22:37 +1300
Subject: [PATCH 602/838] Move remaining SENSOR_SCHEMA to use sensor_schema()
 (#4471)

---
 .../components/adc128s102/sensor/__init__.py  | 17 +++++-----
 esphome/components/custom/sensor/__init__.py  |  2 +-
 esphome/components/ezo/sensor.py              |  4 +--
 esphome/components/integration/sensor.py      | 31 ++++++++++---------
 .../components/kalman_combinator/sensor.py    | 29 +++++++++--------
 esphome/components/mcp3008/sensor.py          | 19 +++++++-----
 esphome/components/mcp3204/sensor/__init__.py | 17 +++++-----
 .../modbus_controller/sensor/__init__.py      |  4 +--
 esphome/components/tuya/sensor/__init__.py    | 17 +++++-----
 9 files changed, 79 insertions(+), 61 deletions(-)

diff --git a/esphome/components/adc128s102/sensor/__init__.py b/esphome/components/adc128s102/sensor/__init__.py
index 3ab6fc4c38..640a1b628e 100644
--- a/esphome/components/adc128s102/sensor/__init__.py
+++ b/esphome/components/adc128s102/sensor/__init__.py
@@ -16,13 +16,16 @@ ADC128S102Sensor = adc128s102_ns.class_(
 )
 CONF_ADC128S102_ID = "adc128s102_id"
 
-CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(ADC128S102Sensor),
-        cv.GenerateID(CONF_ADC128S102_ID): cv.use_id(ADC128S102),
-        cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=7),
-    }
-).extend(cv.polling_component_schema("60s"))
+CONFIG_SCHEMA = (
+    sensor.sensor_schema(ADC128S102Sensor)
+    .extend(
+        {
+            cv.GenerateID(CONF_ADC128S102_ID): cv.use_id(ADC128S102),
+            cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=7),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+)
 
 
 async def to_code(config):
diff --git a/esphome/components/custom/sensor/__init__.py b/esphome/components/custom/sensor/__init__.py
index bf9421e43e..be17d9a334 100644
--- a/esphome/components/custom/sensor/__init__.py
+++ b/esphome/components/custom/sensor/__init__.py
@@ -10,7 +10,7 @@ CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(CustomSensorConstructor),
         cv.Required(CONF_LAMBDA): cv.returning_lambda,
-        cv.Required(CONF_SENSORS): cv.ensure_list(sensor.SENSOR_SCHEMA),
+        cv.Required(CONF_SENSORS): cv.ensure_list(sensor.sensor_schema()),
     }
 )
 
diff --git a/esphome/components/ezo/sensor.py b/esphome/components/ezo/sensor.py
index 049b1bf4d0..486ba0126e 100644
--- a/esphome/components/ezo/sensor.py
+++ b/esphome/components/ezo/sensor.py
@@ -41,9 +41,9 @@ DeviceInformationTrigger = ezo_ns.class_(
 LedTrigger = ezo_ns.class_("LedTrigger", automation.Trigger.template(cg.bool_))
 
 CONFIG_SCHEMA = (
-    sensor.SENSOR_SCHEMA.extend(
+    sensor.sensor_schema(EZOSensor)
+    .extend(
         {
-            cv.GenerateID(): cv.declare_id(EZOSensor),
             cv.Optional(CONF_ON_CUSTOM): automation.validate_automation(
                 {
                     cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(CustomTrigger),
diff --git a/esphome/components/integration/sensor.py b/esphome/components/integration/sensor.py
index 3d7cf03882..d57f909662 100644
--- a/esphome/components/integration/sensor.py
+++ b/esphome/components/integration/sensor.py
@@ -48,20 +48,23 @@ def inherit_accuracy_decimals(decimals, config):
     return decimals + 2
 
 
-CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(IntegrationSensor),
-        cv.Required(CONF_SENSOR): cv.use_id(sensor.Sensor),
-        cv.Required(CONF_TIME_UNIT): cv.enum(INTEGRATION_TIMES, lower=True),
-        cv.Optional(CONF_INTEGRATION_METHOD, default="trapezoid"): cv.enum(
-            INTEGRATION_METHODS, lower=True
-        ),
-        cv.Optional(CONF_RESTORE, default=False): cv.boolean,
-        cv.Optional("min_save_interval"): cv.invalid(
-            "min_save_interval was removed in 2022.8.0. Please use the `preferences` -> `flash_write_interval` to adjust."
-        ),
-    }
-).extend(cv.COMPONENT_SCHEMA)
+CONFIG_SCHEMA = (
+    sensor.sensor_schema(IntegrationSensor)
+    .extend(
+        {
+            cv.Required(CONF_SENSOR): cv.use_id(sensor.Sensor),
+            cv.Required(CONF_TIME_UNIT): cv.enum(INTEGRATION_TIMES, lower=True),
+            cv.Optional(CONF_INTEGRATION_METHOD, default="trapezoid"): cv.enum(
+                INTEGRATION_METHODS, lower=True
+            ),
+            cv.Optional(CONF_RESTORE, default=False): cv.boolean,
+            cv.Optional("min_save_interval"): cv.invalid(
+                "min_save_interval was removed in 2022.8.0. Please use the `preferences` -> `flash_write_interval` to adjust."
+            ),
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+)
 
 
 FINAL_VALIDATE_SCHEMA = cv.All(
diff --git a/esphome/components/kalman_combinator/sensor.py b/esphome/components/kalman_combinator/sensor.py
index 9223f883b2..28b96077cc 100644
--- a/esphome/components/kalman_combinator/sensor.py
+++ b/esphome/components/kalman_combinator/sensor.py
@@ -23,20 +23,23 @@ CONF_PROCESS_STD_DEV = "process_std_dev"
 CONF_STD_DEV = "std_dev"
 
 
-CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend(cv.COMPONENT_SCHEMA).extend(
-    {
-        cv.GenerateID(): cv.declare_id(KalmanCombinatorComponent),
-        cv.Required(CONF_PROCESS_STD_DEV): cv.positive_float,
-        cv.Required(CONF_SOURCES): cv.ensure_list(
-            cv.Schema(
-                {
-                    cv.Required(CONF_SOURCE): cv.use_id(sensor.Sensor),
-                    cv.Required(CONF_ERROR): cv.templatable(cv.positive_float),
-                }
+CONFIG_SCHEMA = (
+    sensor.sensor_schema(KalmanCombinatorComponent)
+    .extend(cv.COMPONENT_SCHEMA)
+    .extend(
+        {
+            cv.Required(CONF_PROCESS_STD_DEV): cv.positive_float,
+            cv.Required(CONF_SOURCES): cv.ensure_list(
+                cv.Schema(
+                    {
+                        cv.Required(CONF_SOURCE): cv.use_id(sensor.Sensor),
+                        cv.Required(CONF_ERROR): cv.templatable(cv.positive_float),
+                    }
+                ),
             ),
-        ),
-        cv.Optional(CONF_STD_DEV): sensor.SENSOR_SCHEMA,
-    }
+            cv.Optional(CONF_STD_DEV): sensor.sensor_schema(),
+        }
+    )
 )
 
 # Inherit some sensor values from the first source, for both the state and the error value
diff --git a/esphome/components/mcp3008/sensor.py b/esphome/components/mcp3008/sensor.py
index d4b9e979ce..dd5141484b 100644
--- a/esphome/components/mcp3008/sensor.py
+++ b/esphome/components/mcp3008/sensor.py
@@ -14,14 +14,17 @@ MCP3008Sensor = mcp3008_ns.class_(
 CONF_REFERENCE_VOLTAGE = "reference_voltage"
 CONF_MCP3008_ID = "mcp3008_id"
 
-CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(MCP3008Sensor),
-        cv.GenerateID(CONF_MCP3008_ID): cv.use_id(MCP3008),
-        cv.Required(CONF_NUMBER): cv.int_,
-        cv.Optional(CONF_REFERENCE_VOLTAGE, default="3.3V"): cv.voltage,
-    }
-).extend(cv.polling_component_schema("1s"))
+CONFIG_SCHEMA = (
+    sensor.sensor_schema(MCP3008Sensor)
+    .extend(
+        {
+            cv.GenerateID(CONF_MCP3008_ID): cv.use_id(MCP3008),
+            cv.Required(CONF_NUMBER): cv.int_,
+            cv.Optional(CONF_REFERENCE_VOLTAGE, default="3.3V"): cv.voltage,
+        }
+    )
+    .extend(cv.polling_component_schema("1s"))
+)
 
 
 async def to_code(config):
diff --git a/esphome/components/mcp3204/sensor/__init__.py b/esphome/components/mcp3204/sensor/__init__.py
index 404880d405..6a81c6ec84 100644
--- a/esphome/components/mcp3204/sensor/__init__.py
+++ b/esphome/components/mcp3204/sensor/__init__.py
@@ -13,13 +13,16 @@ MCP3204Sensor = mcp3204_ns.class_(
 )
 CONF_MCP3204_ID = "mcp3204_id"
 
-CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(MCP3204Sensor),
-        cv.GenerateID(CONF_MCP3204_ID): cv.use_id(MCP3204),
-        cv.Required(CONF_NUMBER): cv.int_range(min=0, max=7),
-    }
-).extend(cv.polling_component_schema("60s"))
+CONFIG_SCHEMA = (
+    sensor.sensor_schema(MCP3204Sensor)
+    .extend(
+        {
+            cv.GenerateID(CONF_MCP3204_ID): cv.use_id(MCP3204),
+            cv.Required(CONF_NUMBER): cv.int_range(min=0, max=7),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+)
 
 
 async def to_code(config):
diff --git a/esphome/components/modbus_controller/sensor/__init__.py b/esphome/components/modbus_controller/sensor/__init__.py
index da7b8928b4..0e4588cfef 100644
--- a/esphome/components/modbus_controller/sensor/__init__.py
+++ b/esphome/components/modbus_controller/sensor/__init__.py
@@ -32,11 +32,11 @@ ModbusSensor = modbus_controller_ns.class_(
 )
 
 CONFIG_SCHEMA = cv.All(
-    sensor.SENSOR_SCHEMA.extend(cv.COMPONENT_SCHEMA)
+    sensor.sensor_schema(ModbusSensor)
+    .extend(cv.COMPONENT_SCHEMA)
     .extend(ModbusItemBaseSchema)
     .extend(
         {
-            cv.GenerateID(): cv.declare_id(ModbusSensor),
             cv.Optional(CONF_REGISTER_TYPE): cv.enum(MODBUS_REGISTER_TYPE),
             cv.Optional(CONF_VALUE_TYPE, default="U_WORD"): cv.enum(SENSOR_VALUE_TYPE),
             cv.Optional(CONF_REGISTER_COUNT, default=0): cv.positive_int,
diff --git a/esphome/components/tuya/sensor/__init__.py b/esphome/components/tuya/sensor/__init__.py
index 441400fa43..69711204a8 100644
--- a/esphome/components/tuya/sensor/__init__.py
+++ b/esphome/components/tuya/sensor/__init__.py
@@ -9,13 +9,16 @@ CODEOWNERS = ["@jesserockz"]
 
 TuyaSensor = tuya_ns.class_("TuyaSensor", sensor.Sensor, cg.Component)
 
-CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(TuyaSensor),
-        cv.GenerateID(CONF_TUYA_ID): cv.use_id(Tuya),
-        cv.Required(CONF_SENSOR_DATAPOINT): cv.uint8_t,
-    }
-).extend(cv.COMPONENT_SCHEMA)
+CONFIG_SCHEMA = (
+    sensor.sensor_schema(TuyaSensor)
+    .extend(
+        {
+            cv.GenerateID(CONF_TUYA_ID): cv.use_id(Tuya),
+            cv.Required(CONF_SENSOR_DATAPOINT): cv.uint8_t,
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+)
 
 
 async def to_code(config):

From 0e1d018ce3f51f555e71ef14ba50c5244218d5f8 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 21 Feb 2023 11:22:43 +1300
Subject: [PATCH 603/838] Allow specifying target and current visual steps for
 climate (#4440)

* Allow specifying target and current visual steps for climate

* Fixes

* format

* format
---
 esphome/components/api/api.proto              |  3 +-
 esphome/components/api/api_connection.cpp     |  4 +-
 esphome/components/api/api_pb2.cpp            | 18 ++++++--
 esphome/components/api/api_pb2.h              |  3 +-
 esphome/components/climate/__init__.py        | 41 +++++++++++++++++--
 esphome/components/climate/climate.cpp        | 15 ++++---
 esphome/components/climate/climate.h          |  5 ++-
 esphome/components/climate/climate_traits.cpp |  8 +++-
 esphome/components/climate/climate_traits.h   | 20 +++++++--
 esphome/components/mqtt/mqtt_climate.cpp      | 13 +++---
 esphome/components/web_server/web_server.cpp  | 21 +++++-----
 11 files changed, 111 insertions(+), 40 deletions(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index ffb3bcb07e..eb639f2065 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -829,7 +829,7 @@ message ListEntitiesClimateResponse {
   repeated ClimateMode supported_modes = 7;
   float visual_min_temperature = 8;
   float visual_max_temperature = 9;
-  float visual_temperature_step = 10;
+  float visual_target_temperature_step = 10;
   // for older peer versions - in new system this
   // is if CLIMATE_PRESET_AWAY exists is supported_presets
   bool legacy_supports_away = 11;
@@ -842,6 +842,7 @@ message ListEntitiesClimateResponse {
   bool disabled_by_default = 18;
   string icon = 19;
   EntityCategory entity_category = 20;
+  float visual_current_temperature_step = 21;
 }
 message ClimateStateResponse {
   option (id) = 47;
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 65659941d6..487aa53193 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -548,7 +548,9 @@ bool APIConnection::send_climate_info(climate::Climate *climate) {
 
   msg.visual_min_temperature = traits.get_visual_min_temperature();
   msg.visual_max_temperature = traits.get_visual_max_temperature();
-  msg.visual_temperature_step = traits.get_visual_temperature_step();
+  msg.visual_target_temperature_step = traits.get_visual_target_temperature_step();
+  msg.visual_current_temperature_step = traits.get_visual_current_temperature_step();
+
   msg.legacy_supports_away = traits.supports_preset(climate::CLIMATE_PRESET_AWAY);
   msg.supports_action = traits.get_supports_action();
 
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 9df05d2978..3fc1bfa95d 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -3451,7 +3451,11 @@ bool ListEntitiesClimateResponse::decode_32bit(uint32_t field_id, Proto32Bit val
       return true;
     }
     case 10: {
-      this->visual_temperature_step = value.as_float();
+      this->visual_target_temperature_step = value.as_float();
+      return true;
+    }
+    case 21: {
+      this->visual_current_temperature_step = value.as_float();
       return true;
     }
     default:
@@ -3470,7 +3474,7 @@ void ListEntitiesClimateResponse::encode(ProtoWriteBuffer buffer) const {
   }
   buffer.encode_float(8, this->visual_min_temperature);
   buffer.encode_float(9, this->visual_max_temperature);
-  buffer.encode_float(10, this->visual_temperature_step);
+  buffer.encode_float(10, this->visual_target_temperature_step);
   buffer.encode_bool(11, this->legacy_supports_away);
   buffer.encode_bool(12, this->supports_action);
   for (auto &it : this->supported_fan_modes) {
@@ -3491,6 +3495,7 @@ void ListEntitiesClimateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(18, this->disabled_by_default);
   buffer.encode_string(19, this->icon);
   buffer.encode_enum<enums::EntityCategory>(20, this->entity_category);
+  buffer.encode_float(21, this->visual_current_temperature_step);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesClimateResponse::dump_to(std::string &out) const {
@@ -3537,8 +3542,8 @@ void ListEntitiesClimateResponse::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
-  out.append("  visual_temperature_step: ");
-  sprintf(buffer, "%g", this->visual_temperature_step);
+  out.append("  visual_target_temperature_step: ");
+  sprintf(buffer, "%g", this->visual_target_temperature_step);
   out.append(buffer);
   out.append("\n");
 
@@ -3591,6 +3596,11 @@ void ListEntitiesClimateResponse::dump_to(std::string &out) const {
   out.append("  entity_category: ");
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
+
+  out.append("  visual_current_temperature_step: ");
+  sprintf(buffer, "%g", this->visual_current_temperature_step);
+  out.append(buffer);
+  out.append("\n");
   out.append("}");
 }
 #endif
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 2db1c6fafa..e192892e72 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -915,7 +915,7 @@ class ListEntitiesClimateResponse : public ProtoMessage {
   std::vector<enums::ClimateMode> supported_modes{};
   float visual_min_temperature{0.0f};
   float visual_max_temperature{0.0f};
-  float visual_temperature_step{0.0f};
+  float visual_target_temperature_step{0.0f};
   bool legacy_supports_away{false};
   bool supports_action{false};
   std::vector<enums::ClimateFanMode> supported_fan_modes{};
@@ -926,6 +926,7 @@ class ListEntitiesClimateResponse : public ProtoMessage {
   bool disabled_by_default{false};
   std::string icon{};
   enums::EntityCategory entity_category{};
+  float visual_current_temperature_step{0.0f};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
diff --git a/esphome/components/climate/__init__.py b/esphome/components/climate/__init__.py
index eaa87afcb1..709d0d12ed 100644
--- a/esphome/components/climate/__init__.py
+++ b/esphome/components/climate/__init__.py
@@ -104,10 +104,40 @@ CLIMATE_SWING_MODES = {
 
 validate_climate_swing_mode = cv.enum(CLIMATE_SWING_MODES, upper=True)
 
+CONF_CURRENT_TEMPERATURE = "current_temperature"
+
+visual_temperature = cv.float_with_unit(
+    "visual_temperature", "(°C|° C|°|C|° K|° K|K|°F|° F|F)?"
+)
+
+
+def single_visual_temperature(value):
+    if isinstance(value, dict):
+        return value
+
+    value = visual_temperature(value)
+    return VISUAL_TEMPERATURE_STEP_SCHEMA(
+        {
+            CONF_TARGET_TEMPERATURE: value,
+            CONF_CURRENT_TEMPERATURE: value,
+        }
+    )
+
+
 # Actions
 ControlAction = climate_ns.class_("ControlAction", automation.Action)
 StateTrigger = climate_ns.class_("StateTrigger", automation.Trigger.template())
 
+VISUAL_TEMPERATURE_STEP_SCHEMA = cv.Any(
+    single_visual_temperature,
+    cv.Schema(
+        {
+            cv.Required(CONF_TARGET_TEMPERATURE): visual_temperature,
+            cv.Required(CONF_CURRENT_TEMPERATURE): visual_temperature,
+        }
+    ),
+)
+
 CLIMATE_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).extend(
     {
         cv.GenerateID(): cv.declare_id(Climate),
@@ -116,9 +146,7 @@ CLIMATE_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).
             {
                 cv.Optional(CONF_MIN_TEMPERATURE): cv.temperature,
                 cv.Optional(CONF_MAX_TEMPERATURE): cv.temperature,
-                cv.Optional(CONF_TEMPERATURE_STEP): cv.float_with_unit(
-                    "visual_temperature", "(°C|° C|°|C|° K|° K|K|°F|° F|F)?"
-                ),
+                cv.Optional(CONF_TEMPERATURE_STEP): VISUAL_TEMPERATURE_STEP_SCHEMA,
             }
         ),
         cv.Optional(CONF_ACTION_STATE_TOPIC): cv.All(
@@ -193,7 +221,12 @@ async def setup_climate_core_(var, config):
     if CONF_MAX_TEMPERATURE in visual:
         cg.add(var.set_visual_max_temperature_override(visual[CONF_MAX_TEMPERATURE]))
     if CONF_TEMPERATURE_STEP in visual:
-        cg.add(var.set_visual_temperature_step_override(visual[CONF_TEMPERATURE_STEP]))
+        cg.add(
+            var.set_visual_temperature_step_override(
+                visual[CONF_TEMPERATURE_STEP][CONF_TARGET_TEMPERATURE],
+                visual[CONF_TEMPERATURE_STEP][CONF_CURRENT_TEMPERATURE],
+            )
+        )
 
     if CONF_MQTT_ID in config:
         mqtt_ = cg.new_Pvariable(config[CONF_MQTT_ID], var)
diff --git a/esphome/components/climate/climate.cpp b/esphome/components/climate/climate.cpp
index e1611d2fa9..b80fe640c8 100644
--- a/esphome/components/climate/climate.cpp
+++ b/esphome/components/climate/climate.cpp
@@ -430,9 +430,11 @@ ClimateTraits Climate::get_traits() {
   if (this->visual_max_temperature_override_.has_value()) {
     traits.set_visual_max_temperature(*this->visual_max_temperature_override_);
   }
-  if (this->visual_temperature_step_override_.has_value()) {
-    traits.set_visual_temperature_step(*this->visual_temperature_step_override_);
+  if (this->visual_target_temperature_step_override_.has_value()) {
+    traits.set_visual_target_temperature_step(*this->visual_target_temperature_step_override_);
+    traits.set_visual_current_temperature_step(*this->visual_current_temperature_step_override_);
   }
+
   return traits;
 }
 
@@ -442,8 +444,9 @@ void Climate::set_visual_min_temperature_override(float visual_min_temperature_o
 void Climate::set_visual_max_temperature_override(float visual_max_temperature_override) {
   this->visual_max_temperature_override_ = visual_max_temperature_override;
 }
-void Climate::set_visual_temperature_step_override(float visual_temperature_step_override) {
-  this->visual_temperature_step_override_ = visual_temperature_step_override;
+void Climate::set_visual_temperature_step_override(float target, float current) {
+  this->visual_target_temperature_step_override_ = target;
+  this->visual_current_temperature_step_override_ = current;
 }
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
@@ -541,7 +544,9 @@ void Climate::dump_traits_(const char *tag) {
   ESP_LOGCONFIG(tag, "  [x] Visual settings:");
   ESP_LOGCONFIG(tag, "      - Min: %.1f", traits.get_visual_min_temperature());
   ESP_LOGCONFIG(tag, "      - Max: %.1f", traits.get_visual_max_temperature());
-  ESP_LOGCONFIG(tag, "      - Step: %.1f", traits.get_visual_temperature_step());
+  ESP_LOGCONFIG(tag, "      - Step:");
+  ESP_LOGCONFIG(tag, "          Target: %.1f", traits.get_visual_target_temperature_step());
+  ESP_LOGCONFIG(tag, "          Current: %.1f", traits.get_visual_current_temperature_step());
   if (traits.get_supports_current_temperature()) {
     ESP_LOGCONFIG(tag, "  [x] Supports current temperature");
   }
diff --git a/esphome/components/climate/climate.h b/esphome/components/climate/climate.h
index d508bb31b0..8cc260abbe 100644
--- a/esphome/components/climate/climate.h
+++ b/esphome/components/climate/climate.h
@@ -241,7 +241,7 @@ class Climate : public EntityBase {
 
   void set_visual_min_temperature_override(float visual_min_temperature_override);
   void set_visual_max_temperature_override(float visual_max_temperature_override);
-  void set_visual_temperature_step_override(float visual_temperature_step_override);
+  void set_visual_temperature_step_override(float target, float current);
 
  protected:
   friend ClimateCall;
@@ -288,7 +288,8 @@ class Climate : public EntityBase {
   ESPPreferenceObject rtc_;
   optional<float> visual_min_temperature_override_{};
   optional<float> visual_max_temperature_override_{};
-  optional<float> visual_temperature_step_override_{};
+  optional<float> visual_target_temperature_step_override_{};
+  optional<float> visual_current_temperature_step_override_{};
 };
 
 }  // namespace climate
diff --git a/esphome/components/climate/climate_traits.cpp b/esphome/components/climate/climate_traits.cpp
index 38ded6cdf7..342dffaad6 100644
--- a/esphome/components/climate/climate_traits.cpp
+++ b/esphome/components/climate/climate_traits.cpp
@@ -3,8 +3,12 @@
 namespace esphome {
 namespace climate {
 
-int8_t ClimateTraits::get_temperature_accuracy_decimals() const {
-  return step_to_accuracy_decimals(this->visual_temperature_step_);
+int8_t ClimateTraits::get_target_temperature_accuracy_decimals() const {
+  return step_to_accuracy_decimals(this->visual_target_temperature_step_);
+}
+
+int8_t ClimateTraits::get_current_temperature_accuracy_decimals() const {
+  return step_to_accuracy_decimals(this->visual_current_temperature_step_);
 }
 
 }  // namespace climate
diff --git a/esphome/components/climate/climate_traits.h b/esphome/components/climate/climate_traits.h
index 9da9bb7374..ffbd8c5ae0 100644
--- a/esphome/components/climate/climate_traits.h
+++ b/esphome/components/climate/climate_traits.h
@@ -147,9 +147,20 @@ class ClimateTraits {
   void set_visual_min_temperature(float visual_min_temperature) { visual_min_temperature_ = visual_min_temperature; }
   float get_visual_max_temperature() const { return visual_max_temperature_; }
   void set_visual_max_temperature(float visual_max_temperature) { visual_max_temperature_ = visual_max_temperature; }
-  float get_visual_temperature_step() const { return visual_temperature_step_; }
-  int8_t get_temperature_accuracy_decimals() const;
-  void set_visual_temperature_step(float temperature_step) { visual_temperature_step_ = temperature_step; }
+  float get_visual_target_temperature_step() const { return visual_target_temperature_step_; }
+  float get_visual_current_temperature_step() const { return visual_current_temperature_step_; }
+  void set_visual_target_temperature_step(float temperature_step) {
+    visual_target_temperature_step_ = temperature_step;
+  }
+  void set_visual_current_temperature_step(float temperature_step) {
+    visual_current_temperature_step_ = temperature_step;
+  }
+  void set_visual_temperature_step(float temperature_step) {
+    visual_target_temperature_step_ = temperature_step;
+    visual_current_temperature_step_ = temperature_step;
+  }
+  int8_t get_target_temperature_accuracy_decimals() const;
+  int8_t get_current_temperature_accuracy_decimals() const;
 
  protected:
   void set_mode_support_(climate::ClimateMode mode, bool supported) {
@@ -186,7 +197,8 @@ class ClimateTraits {
 
   float visual_min_temperature_{10};
   float visual_max_temperature_{30};
-  float visual_temperature_step_{0.1};
+  float visual_target_temperature_step_{0.1};
+  float visual_current_temperature_step_{0.1};
 };
 
 }  // namespace climate
diff --git a/esphome/components/mqtt/mqtt_climate.cpp b/esphome/components/mqtt/mqtt_climate.cpp
index 1947e02b9e..e88ffcc37c 100644
--- a/esphome/components/mqtt/mqtt_climate.cpp
+++ b/esphome/components/mqtt/mqtt_climate.cpp
@@ -62,7 +62,7 @@ void MQTTClimateComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryCo
   // max_temp
   root[MQTT_MAX_TEMP] = traits.get_visual_max_temperature();
   // temp_step
-  root["temp_step"] = traits.get_visual_temperature_step();
+  root["temp_step"] = traits.get_visual_target_temperature_step();
   // temperature units are always coerced to Celsius internally
   root[MQTT_TEMPERATURE_UNIT] = "C";
 
@@ -281,21 +281,22 @@ bool MQTTClimateComponent::publish_state_() {
   bool success = true;
   if (!this->publish(this->get_mode_state_topic(), mode_s))
     success = false;
-  int8_t accuracy = traits.get_temperature_accuracy_decimals();
+  int8_t target_accuracy = traits.get_target_temperature_accuracy_decimals();
+  int8_t current_accuracy = traits.get_current_temperature_accuracy_decimals();
   if (traits.get_supports_current_temperature() && !std::isnan(this->device_->current_temperature)) {
-    std::string payload = value_accuracy_to_string(this->device_->current_temperature, accuracy);
+    std::string payload = value_accuracy_to_string(this->device_->current_temperature, current_accuracy);
     if (!this->publish(this->get_current_temperature_state_topic(), payload))
       success = false;
   }
   if (traits.get_supports_two_point_target_temperature()) {
-    std::string payload = value_accuracy_to_string(this->device_->target_temperature_low, accuracy);
+    std::string payload = value_accuracy_to_string(this->device_->target_temperature_low, target_accuracy);
     if (!this->publish(this->get_target_temperature_low_state_topic(), payload))
       success = false;
-    payload = value_accuracy_to_string(this->device_->target_temperature_high, accuracy);
+    payload = value_accuracy_to_string(this->device_->target_temperature_high, target_accuracy);
     if (!this->publish(this->get_target_temperature_high_state_topic(), payload))
       success = false;
   } else {
-    std::string payload = value_accuracy_to_string(this->device_->target_temperature, accuracy);
+    std::string payload = value_accuracy_to_string(this->device_->target_temperature, target_accuracy);
     if (!this->publish(this->get_target_temperature_state_topic(), payload))
       success = false;
   }
diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index 513399e257..6c74c79ce6 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -873,7 +873,8 @@ std::string WebServer::climate_json(climate::Climate *obj, JsonDetail start_conf
   return json::build_json([obj, start_config](JsonObject root) {
     set_json_id(root, obj, "climate-" + obj->get_object_id(), start_config);
     const auto traits = obj->get_traits();
-    int8_t accuracy = traits.get_temperature_accuracy_decimals();
+    int8_t target_accuracy = traits.get_target_temperature_accuracy_decimals();
+    int8_t current_accuracy = traits.get_current_temperature_accuracy_decimals();
     char __buf[16];
 
     if (start_config == DETAIL_ALL) {
@@ -910,9 +911,9 @@ std::string WebServer::climate_json(climate::Climate *obj, JsonDetail start_conf
 
     bool has_state = false;
     root["mode"] = PSTR_LOCAL(climate_mode_to_string(obj->mode));
-    root["max_temp"] = value_accuracy_to_string(traits.get_visual_max_temperature(), accuracy);
-    root["min_temp"] = value_accuracy_to_string(traits.get_visual_min_temperature(), accuracy);
-    root["step"] = traits.get_visual_temperature_step();
+    root["max_temp"] = value_accuracy_to_string(traits.get_visual_max_temperature(), target_accuracy);
+    root["min_temp"] = value_accuracy_to_string(traits.get_visual_min_temperature(), target_accuracy);
+    root["step"] = traits.get_visual_target_temperature_step();
     if (traits.get_supports_action()) {
       root["action"] = PSTR_LOCAL(climate_action_to_string(obj->action));
       root["state"] = root["action"];
@@ -935,20 +936,20 @@ std::string WebServer::climate_json(climate::Climate *obj, JsonDetail start_conf
     }
     if (traits.get_supports_current_temperature()) {
       if (!std::isnan(obj->current_temperature)) {
-        root["current_temperature"] = value_accuracy_to_string(obj->current_temperature, accuracy);
+        root["current_temperature"] = value_accuracy_to_string(obj->current_temperature, current_accuracy);
       } else {
         root["current_temperature"] = "NA";
       }
     }
     if (traits.get_supports_two_point_target_temperature()) {
-      root["target_temperature_low"] = value_accuracy_to_string(obj->target_temperature_low, accuracy);
-      root["target_temperature_high"] = value_accuracy_to_string(obj->target_temperature_high, accuracy);
+      root["target_temperature_low"] = value_accuracy_to_string(obj->target_temperature_low, target_accuracy);
+      root["target_temperature_high"] = value_accuracy_to_string(obj->target_temperature_high, target_accuracy);
       if (!has_state) {
-        root["state"] =
-            value_accuracy_to_string((obj->target_temperature_high + obj->target_temperature_low) / 2.0f, accuracy);
+        root["state"] = value_accuracy_to_string((obj->target_temperature_high + obj->target_temperature_low) / 2.0f,
+                                                 target_accuracy);
       }
     } else {
-      root["target_temperature"] = value_accuracy_to_string(obj->target_temperature, accuracy);
+      root["target_temperature"] = value_accuracy_to_string(obj->target_temperature, target_accuracy);
       if (!has_state)
         root["state"] = root["target_temperature"];
     }

From 48e76e15387ed6e4ea35c51b5b294c3bd6277694 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 11:29:20 +1300
Subject: [PATCH 604/838] Bump aioesphomeapi from 13.3.1 to 13.4.0 (#4472)

Bumps [aioesphomeapi](https://github.com/esphome/aioesphomeapi) from 13.3.1 to 13.4.0.
- [Release notes](https://github.com/esphome/aioesphomeapi/releases)
- [Commits](https://github.com/esphome/aioesphomeapi/compare/v13.3.1...v13.4.0)

---
updated-dependencies:
- dependency-name: aioesphomeapi
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
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 c2490f36a4..2c64639fd2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.6  # When updating platformio, also update Dockerfile
 esptool==4.4
 click==8.1.3
 esphome-dashboard==20230214.0
-aioesphomeapi==13.3.1
+aioesphomeapi==13.4.0
 zeroconf==0.47.3
 
 # esp-idf requires this, but doesn't bundle it by default

From ba6f89a757fdafa0b0b21a782e2840fe94048154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Mur=C3=A9?= <batolettre@gmail.com>
Date: Mon, 20 Feb 2023 23:31:25 +0100
Subject: [PATCH 605/838] toshiba: add support for quiet fan mode (#4283)

---
 esphome/components/toshiba/toshiba.cpp | 28 ++++++++++++++++++++++++++
 esphome/components/toshiba/toshiba.h   |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/esphome/components/toshiba/toshiba.cpp b/esphome/components/toshiba/toshiba.cpp
index a070ccceb2..33d36d6a69 100644
--- a/esphome/components/toshiba/toshiba.cpp
+++ b/esphome/components/toshiba/toshiba.cpp
@@ -190,6 +190,10 @@ void ToshibaClimate::transmit_generic_() {
 
   uint8_t fan;
   switch (this->fan_mode.value()) {
+    case climate::CLIMATE_FAN_QUIET:
+      fan = TOSHIBA_FAN_SPEED_QUIET;
+      break;
+
     case climate::CLIMATE_FAN_LOW:
       fan = TOSHIBA_FAN_SPEED_1;
       break;
@@ -692,6 +696,30 @@ bool ToshibaClimate::on_receive(remote_base::RemoteReceiveData data) {
           this->mode = climate::CLIMATE_MODE_HEAT_COOL;
       }
 
+      // Get the fan mode
+      switch (message[6] & 0xF0) {
+        case TOSHIBA_FAN_SPEED_QUIET:
+          this->fan_mode = climate::CLIMATE_FAN_QUIET;
+          break;
+
+        case TOSHIBA_FAN_SPEED_1:
+          this->fan_mode = climate::CLIMATE_FAN_LOW;
+          break;
+
+        case TOSHIBA_FAN_SPEED_3:
+          this->fan_mode = climate::CLIMATE_FAN_MEDIUM;
+          break;
+
+        case TOSHIBA_FAN_SPEED_5:
+          this->fan_mode = climate::CLIMATE_FAN_HIGH;
+          break;
+
+        case TOSHIBA_FAN_SPEED_AUTO:
+        default:
+          this->fan_mode = climate::CLIMATE_FAN_AUTO;
+          break;
+      }
+
       // Get the target temperature
       this->target_temperature = (message[5] >> 4) + TOSHIBA_GENERIC_TEMP_C_MIN;
   }
diff --git a/esphome/components/toshiba/toshiba.h b/esphome/components/toshiba/toshiba.h
index 729548e747..83e85c34db 100644
--- a/esphome/components/toshiba/toshiba.h
+++ b/esphome/components/toshiba/toshiba.h
@@ -25,7 +25,7 @@ class ToshibaClimate : public climate_ir::ClimateIR {
   ToshibaClimate()
       : climate_ir::ClimateIR(TOSHIBA_GENERIC_TEMP_C_MIN, TOSHIBA_GENERIC_TEMP_C_MAX, 1.0f, true, true,
                               {climate::CLIMATE_FAN_AUTO, climate::CLIMATE_FAN_LOW, climate::CLIMATE_FAN_MEDIUM,
-                               climate::CLIMATE_FAN_HIGH}) {}
+                               climate::CLIMATE_FAN_HIGH, climate::CLIMATE_FAN_QUIET}) {}
 
   void setup() override;
   void set_model(Model model) { this->model_ = model; }

From 8fb481751f08df357dc4b0ab04cbe9b8164f0350 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 12:01:49 +1300
Subject: [PATCH 606/838] Bump esptool from 4.4 to 4.5 (#4428)

Bumps [esptool](https://github.com/espressif/esptool) from 4.4 to 4.5.
- [Release notes](https://github.com/espressif/esptool/releases)
- [Commits](https://github.com/espressif/esptool/compare/v4.4...v4.5)

---
updated-dependencies:
- dependency-name: esptool
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
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 2c64639fd2..bfad2433c6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ tzlocal==4.2    # from time
 tzdata>=2021.1  # from time
 pyserial==3.5
 platformio==6.1.6  # When updating platformio, also update Dockerfile
-esptool==4.4
+esptool==4.5
 click==8.1.3
 esphome-dashboard==20230214.0
 aioesphomeapi==13.4.0

From d16eff5039a7503cc8274464290c7a0f1eec47b2 Mon Sep 17 00:00:00 2001
From: Fabian <Fabian-Schmidt@users.noreply.github.com>
Date: Tue, 21 Feb 2023 22:48:29 +0100
Subject: [PATCH 607/838] Support Mopeka Standard LPG tank bluetooth sensor
 (#4351)

* Add mopeka standard tank sensor.

* Enhance mopeka ble to find standard sensors.

* Updated `CODEOWNERS` file

* Move default from cpp to py.

* Format documents with esphome settings.

* Linter wants changes.

* Update name of `get_lpg_speed_of_sound`.

* manually update `CODEOWNERS`.

* Manually update CODEOWNER, because `build_codeowners.py. is failing.

* Add comments.

* Use percentage for `propane_butane_mix`.

* add config to `dump_config()`

* Formatting

* Use struct for data parsing and find best data.

* Add `this`.

* Consistant naming of configuration.

* Fix format issues.

* Make clang-tidy happy.

* Adjust loop variable.

---------

Co-authored-by: Your Name <you@example.com>
---
 CODEOWNERS                                    |   3 +-
 esphome/components/mopeka_ble/__init__.py     |   9 +-
 esphome/components/mopeka_ble/mopeka_ble.cpp  |  77 ++++--
 esphome/components/mopeka_ble/mopeka_ble.h    |  11 +-
 .../components/mopeka_std_check/__init__.py   |   1 +
 .../mopeka_std_check/mopeka_std_check.cpp     | 226 ++++++++++++++++++
 .../mopeka_std_check/mopeka_std_check.h       |  78 ++++++
 esphome/components/mopeka_std_check/sensor.py | 139 +++++++++++
 8 files changed, 520 insertions(+), 24 deletions(-)
 create mode 100644 esphome/components/mopeka_std_check/__init__.py
 create mode 100644 esphome/components/mopeka_std_check/mopeka_std_check.cpp
 create mode 100644 esphome/components/mopeka_std_check/mopeka_std_check.h
 create mode 100644 esphome/components/mopeka_std_check/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index 9cfa81b36c..79c9c4f94b 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -161,8 +161,9 @@ esphome/components/modbus_controller/select/* @martgras @stegm
 esphome/components/modbus_controller/sensor/* @martgras
 esphome/components/modbus_controller/switch/* @martgras
 esphome/components/modbus_controller/text_sensor/* @martgras
-esphome/components/mopeka_ble/* @spbrogan
+esphome/components/mopeka_ble/* @Fabian-Schmidt @spbrogan
 esphome/components/mopeka_pro_check/* @spbrogan
+esphome/components/mopeka_std_check/* @Fabian-Schmidt
 esphome/components/mpl3115a2/* @kbickar
 esphome/components/mpu6886/* @fabaff
 esphome/components/network/* @esphome/core
diff --git a/esphome/components/mopeka_ble/__init__.py b/esphome/components/mopeka_ble/__init__.py
index 47396435a8..c89eae7933 100644
--- a/esphome/components/mopeka_ble/__init__.py
+++ b/esphome/components/mopeka_ble/__init__.py
@@ -3,9 +3,11 @@ import esphome.config_validation as cv
 from esphome.components import esp32_ble_tracker
 from esphome.const import CONF_ID
 
-CODEOWNERS = ["@spbrogan"]
+CODEOWNERS = ["@spbrogan", "@Fabian-Schmidt"]
 DEPENDENCIES = ["esp32_ble_tracker"]
 
+CONF_SHOW_SENSORS_WITHOUT_SYNC = "show_sensors_without_sync"
+
 mopeka_ble_ns = cg.esphome_ns.namespace("mopeka_ble")
 MopekaListener = mopeka_ble_ns.class_(
     "MopekaListener", esp32_ble_tracker.ESPBTDeviceListener
@@ -14,10 +16,15 @@ MopekaListener = mopeka_ble_ns.class_(
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(MopekaListener),
+        cv.Optional(CONF_SHOW_SENSORS_WITHOUT_SYNC, default=False): cv.boolean,
     }
 ).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
 
 
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
+    if CONF_SHOW_SENSORS_WITHOUT_SYNC in config:
+        cg.add(
+            var.set_show_sensors_without_sync(config[CONF_SHOW_SENSORS_WITHOUT_SYNC])
+        )
     await esp32_ble_tracker.register_ble_device(var, config)
diff --git a/esphome/components/mopeka_ble/mopeka_ble.cpp b/esphome/components/mopeka_ble/mopeka_ble.cpp
index 844d3a7dfd..07c8ac5d71 100644
--- a/esphome/components/mopeka_ble/mopeka_ble.cpp
+++ b/esphome/components/mopeka_ble/mopeka_ble.cpp
@@ -1,4 +1,5 @@
 #include "mopeka_ble.h"
+
 #include "esphome/core/log.h"
 
 #ifdef USE_ESP32
@@ -7,43 +8,83 @@ namespace esphome {
 namespace mopeka_ble {
 
 static const char *const TAG = "mopeka_ble";
-static const uint8_t MANUFACTURER_DATA_LENGTH = 10;
-static const uint16_t MANUFACTURER_ID = 0x0059;
+
+// Mopeka Std (CC2540) sensor details
+static const uint16_t SERVICE_UUID_CC2540 = 0xADA0;
+static const uint16_t MANUFACTURER_CC2540_ID = 0x000D;  // Texas Instruments (TI)
+static const uint8_t MANUFACTURER_CC2540_DATA_LENGTH = 23;
+
+// Mopeka Pro (NRF52) sensor details
+static const uint16_t SERVICE_UUID_NRF52 = 0xFEE5;
+static const uint16_t MANUFACTURER_NRF52_ID = 0x0059;  // Nordic
+static const uint8_t MANUFACTURER_NRF52_DATA_LENGTH = 10;
 
 /**
  * Parse all incoming BLE payloads to see if it is a Mopeka BLE advertisement.
  * Currently this supports the following products:
  *
- *   Mopeka Pro Check.
- *    If the sync button is pressed, report the MAC so a user can add this as a sensor.
+ *  - Mopeka Std Check - uses the chip CC2540 by Texas Instruments (TI)
+ *  - Mopeka Pro Check - uses the chip NRF52 by Nordic
+ *
+ *    If the sync button is pressed, report the MAC so a user can add this as a sensor. Or if user has configured
+ * `show_sensors_without_sync_` than report all visible sensors.
+ * Three points are used to identify a sensor:
+ *
+ * - Bluetooth service uuid
+ * - Bluetooth manufacturer id
+ * - Bluetooth data frame size
  */
 
 bool MopekaListener::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
-  const auto &manu_datas = device.get_manufacturer_datas();
+  // Fetch information about BLE device.
+  const auto &service_uuids = device.get_service_uuids();
+  if (service_uuids.size() != 1) {
+    return false;
+  }
+  const auto &service_uuid = service_uuids[0];
 
+  const auto &manu_datas = device.get_manufacturer_datas();
   if (manu_datas.size() != 1) {
     return false;
   }
-
   const auto &manu_data = manu_datas[0];
 
-  if (manu_data.data.size() != MANUFACTURER_DATA_LENGTH) {
-    return false;
+  // Is the device maybe a Mopeka Std (CC2540) sensor.
+  if (service_uuid == esp32_ble_tracker::ESPBTUUID::from_uint16(SERVICE_UUID_CC2540)) {
+    if (manu_data.uuid != esp32_ble_tracker::ESPBTUUID::from_uint16(MANUFACTURER_CC2540_ID)) {
+      return false;
+    }
+
+    if (manu_data.data.size() != MANUFACTURER_CC2540_DATA_LENGTH) {
+      return false;
+    }
+
+    const bool sync_button_pressed = (manu_data.data[3] & 0x80) != 0;
+
+    if (this->show_sensors_without_sync_ || sync_button_pressed) {
+      ESP_LOGI(TAG, "MOPEKA STD (CC2540) SENSOR FOUND: %s", device.address_str().c_str());
+    }
+
+    // Is the device maybe a Mopeka Pro (NRF52) sensor.
+  } else if (service_uuid == esp32_ble_tracker::ESPBTUUID::from_uint16(SERVICE_UUID_NRF52)) {
+    if (manu_data.uuid != esp32_ble_tracker::ESPBTUUID::from_uint16(MANUFACTURER_NRF52_ID)) {
+      return false;
+    }
+
+    if (manu_data.data.size() != MANUFACTURER_NRF52_DATA_LENGTH) {
+      return false;
+    }
+
+    const bool sync_button_pressed = (manu_data.data[2] & 0x80) != 0;
+
+    if (this->show_sensors_without_sync_ || sync_button_pressed) {
+      ESP_LOGI(TAG, "MOPEKA PRO (NRF52) SENSOR FOUND: %s", device.address_str().c_str());
+    }
   }
 
-  if (manu_data.uuid != esp32_ble_tracker::ESPBTUUID::from_uint16(MANUFACTURER_ID)) {
-    return false;
-  }
-
-  if (this->parse_sync_button_(manu_data.data)) {
-    // button pressed
-    ESP_LOGI(TAG, "SENSOR FOUND: %s", device.address_str().c_str());
-  }
   return false;
 }
 
-bool MopekaListener::parse_sync_button_(const std::vector<uint8_t> &message) { return (message[2] & 0x80) != 0; }
-
 }  // namespace mopeka_ble
 }  // namespace esphome
 
diff --git a/esphome/components/mopeka_ble/mopeka_ble.h b/esphome/components/mopeka_ble/mopeka_ble.h
index f88bad4f3a..b7d0c5a9c5 100644
--- a/esphome/components/mopeka_ble/mopeka_ble.h
+++ b/esphome/components/mopeka_ble/mopeka_ble.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "esphome/core/component.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-
 #include <vector>
 
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/core/component.h"
+
 #ifdef USE_ESP32
 
 namespace esphome {
@@ -13,9 +13,12 @@ namespace mopeka_ble {
 class MopekaListener : public esp32_ble_tracker::ESPBTDeviceListener {
  public:
   bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
+  void set_show_sensors_without_sync(bool show_sensors_without_sync) {
+    show_sensors_without_sync_ = show_sensors_without_sync;
+  }
 
  protected:
-  bool parse_sync_button_(const std::vector<uint8_t> &message);
+  bool show_sensors_without_sync_;
 };
 
 }  // namespace mopeka_ble
diff --git a/esphome/components/mopeka_std_check/__init__.py b/esphome/components/mopeka_std_check/__init__.py
new file mode 100644
index 0000000000..88e344464f
--- /dev/null
+++ b/esphome/components/mopeka_std_check/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@Fabian-Schmidt"]
diff --git a/esphome/components/mopeka_std_check/mopeka_std_check.cpp b/esphome/components/mopeka_std_check/mopeka_std_check.cpp
new file mode 100644
index 0000000000..cbe51b8f2d
--- /dev/null
+++ b/esphome/components/mopeka_std_check/mopeka_std_check.cpp
@@ -0,0 +1,226 @@
+#include "mopeka_std_check.h"
+
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+#ifdef USE_ESP32
+
+namespace esphome {
+namespace mopeka_std_check {
+
+static const char *const TAG = "mopeka_std_check";
+static const uint16_t SERVICE_UUID = 0xADA0;
+static const uint8_t MANUFACTURER_DATA_LENGTH = 23;
+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_);
+  LOG_SENSOR("  ", "Level", this->level_);
+  LOG_SENSOR("  ", "Temperature", this->temperature_);
+  LOG_SENSOR("  ", "Battery Level", this->battery_level_);
+  LOG_SENSOR("  ", "Reading Distance", this->distance_);
+}
+
+/**
+ * Main parse function that gets called for all ble advertisements.
+ * Check if advertisement is for our sensor and if so decode it and
+ * update the sensor state data.
+ */
+bool MopekaStdCheck::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  {
+    // Validate address.
+    if (device.address_uint64() != this->address_) {
+      return false;
+    }
+
+    ESP_LOGVV(TAG, "parse_device(): MAC address %s found.", device.address_str().c_str());
+  }
+
+  {
+    // Validate service uuid
+    const auto &service_uuids = device.get_service_uuids();
+    if (service_uuids.size() != 1) {
+      return false;
+    }
+    const auto &service_uuid = service_uuids[0];
+    if (service_uuid != esp32_ble_tracker::ESPBTUUID::from_uint16(SERVICE_UUID)) {
+      return false;
+    }
+  }
+
+  const auto &manu_datas = device.get_manufacturer_datas();
+
+  if (manu_datas.size() != 1) {
+    ESP_LOGE(TAG, "%s: Unexpected manu_datas size (%d)", device.address_str().c_str(), manu_datas.size());
+    return false;
+  }
+
+  const auto &manu_data = manu_datas[0];
+
+  ESP_LOGVV(TAG, "%s: Manufacturer data: %s", device.address_str().c_str(), format_hex_pretty(manu_data.data).c_str());
+
+  if (manu_data.data.size() != MANUFACTURER_DATA_LENGTH) {
+    ESP_LOGE(TAG, "%s: Unexpected manu_data size (%d)", device.address_str().c_str(), manu_data.data.size());
+    return false;
+  }
+
+  // Now parse the data
+  const auto *mopeka_data = (const mopeka_std_package *) manu_data.data.data();
+
+  const u_int8_t hardware_id = mopeka_data->data_1 & 0xCF;
+  if (static_cast<SensorType>(hardware_id) != STANDARD && static_cast<SensorType>(hardware_id) != XL) {
+    ESP_LOGE(TAG, "%s: Unsupported Sensor Type (0x%X)", device.address_str().c_str(), hardware_id);
+    return false;
+  }
+
+  ESP_LOGVV(TAG, "%s: Sensor slow update rate: %d", device.address_str().c_str(), mopeka_data->slow_update_rate);
+  ESP_LOGVV(TAG, "%s: Sensor sync pressed: %d", device.address_str().c_str(), mopeka_data->sync_pressed);
+  for (u_int8_t i = 0; i < 3; i++) {
+    ESP_LOGVV(TAG, "%s: %u. Sensor data %u time %u.", device.address_str().c_str(), (i * 4) + 1,
+              mopeka_data->val[i].value_0, mopeka_data->val[i].time_0);
+    ESP_LOGVV(TAG, "%s: %u. Sensor data %u time %u.", device.address_str().c_str(), (i * 4) + 2,
+              mopeka_data->val[i].value_1, mopeka_data->val[i].time_1);
+    ESP_LOGVV(TAG, "%s: %u. Sensor data %u time %u.", device.address_str().c_str(), (i * 4) + 3,
+              mopeka_data->val[i].value_2, mopeka_data->val[i].time_2);
+    ESP_LOGVV(TAG, "%s: %u. Sensor data %u time %u.", device.address_str().c_str(), (i * 4) + 4,
+              mopeka_data->val[i].value_3, mopeka_data->val[i].time_3);
+  }
+
+  // Get battery level first
+  if (this->battery_level_ != nullptr) {
+    uint8_t level = this->parse_battery_level_(mopeka_data);
+    this->battery_level_->publish_state(level);
+  }
+
+  // Get temperature of sensor
+  uint8_t temp_in_c = this->parse_temperature_(mopeka_data);
+  if (this->temperature_ != nullptr) {
+    this->temperature_->publish_state(temp_in_c);
+  }
+
+  // Get distance and level if either are sensors
+  if ((this->distance_ != nullptr) || (this->level_ != nullptr)) {
+    // Message contains 12 sensor dataset each 10 bytes long.
+    // each sensor dataset contains 5 byte time and 5 byte value.
+
+    // time in 10us ticks.
+    // value is amplitude.
+
+    std::array<u_int8_t, 12> measurements_time = {};
+    std::array<u_int8_t, 12> measurements_value = {};
+    // Copy measurements over into my array.
+    {
+      u_int8_t measurements_index = 0;
+      for (u_int8_t i = 0; i < 3; i++) {
+        measurements_time[measurements_index] = mopeka_data->val[i].time_0 + 1;
+        measurements_value[measurements_index] = mopeka_data->val[i].value_0;
+        measurements_index++;
+        measurements_time[measurements_index] = mopeka_data->val[i].time_1 + 1;
+        measurements_value[measurements_index] = mopeka_data->val[i].value_1;
+        measurements_index++;
+        measurements_time[measurements_index] = mopeka_data->val[i].time_2 + 1;
+        measurements_value[measurements_index] = mopeka_data->val[i].value_2;
+        measurements_index++;
+        measurements_time[measurements_index] = mopeka_data->val[i].time_3 + 1;
+        measurements_value[measurements_index] = mopeka_data->val[i].value_3;
+        measurements_index++;
+      }
+    }
+
+    // Find best(strongest) value(amplitude) and it's belonging time in sensor dataset.
+    u_int8_t number_of_usable_values = 0;
+    u_int16_t best_value = 0;
+    u_int16_t best_time = 0;
+    {
+      u_int16_t measurement_time = 0;
+      for (u_int8_t i = 0; i < 12; i++) {
+        // Time is summed up until a value is reported. This allows time values larger than the 5 bits in transport.
+        measurement_time += measurements_time[i];
+        if (measurements_value[i] != 0) {
+          // I got a value
+          number_of_usable_values++;
+          if (measurements_value[i] > best_value) {
+            // This value is better than a previous one.
+            best_value = measurements_value[i];
+            best_time = measurement_time;
+            // Reset measurement_time or next values.
+            measurement_time = 0;
+          }
+        }
+      }
+    }
+
+    ESP_LOGV(TAG, "%s: Found %u values with best data %u time %u.", device.address_str().c_str(),
+             number_of_usable_values, best_value, best_time);
+
+    if (number_of_usable_values < 2 || best_value < 2 || best_time < 2) {
+      // At least two measurement values must be present.
+      ESP_LOGW(TAG, "%s: Poor read quality. Setting distance to 0.", device.address_str().c_str());
+      if (this->distance_ != nullptr) {
+        this->distance_->publish_state(0);
+      }
+      if (this->level_ != nullptr) {
+        this->level_->publish_state(0);
+      }
+    } else {
+      float lpg_speed_of_sound = this->get_lpg_speed_of_sound_(temp_in_c);
+      ESP_LOGV(TAG, "%s: Speed of sound in current fluid %f m/s", device.address_str().c_str(), lpg_speed_of_sound);
+
+      uint32_t distance_value = lpg_speed_of_sound * best_time / 100.0f;
+
+      // update distance sensor
+      if (this->distance_ != nullptr) {
+        this->distance_->publish_state(distance_value);
+      }
+
+      // update level sensor
+      if (this->level_ != nullptr) {
+        uint8_t tank_level = 0;
+        if (distance_value >= this->full_mm_) {
+          tank_level = 100;  // cap at 100%
+        } else if (distance_value > this->empty_mm_) {
+          tank_level = ((100.0f / (this->full_mm_ - this->empty_mm_)) * (distance_value - this->empty_mm_));
+        }
+        this->level_->publish_state(tank_level);
+      }
+    }
+  }
+
+  return true;
+}
+
+float MopekaStdCheck::get_lpg_speed_of_sound_(float temperature) {
+  return 1040.71f - 4.87f * temperature - 137.5f * this->propane_butane_mix_ - 0.0107f * temperature * temperature -
+         1.63f * temperature * this->propane_butane_mix_;
+}
+
+uint8_t MopekaStdCheck::parse_battery_level_(const mopeka_std_package *message) {
+  const float voltage = (float) ((message->raw_voltage / 256.0f) * 2.0f + 1.5f);
+  ESP_LOGVV(TAG, "Sensor battery voltage: %f V", voltage);
+  // convert voltage and scale for CR2032
+  const float percent = (voltage - 2.2f) / 0.65f * 100.0f;
+  if (percent < 0.0f) {
+    return 0;
+  }
+  if (percent > 100.0f) {
+    return 100;
+  }
+  return (uint8_t) percent;
+}
+
+uint8_t MopekaStdCheck::parse_temperature_(const mopeka_std_package *message) {
+  uint8_t tmp = message->raw_temp;
+  if (tmp == 0x0) {
+    return -40;
+  } else {
+    return (uint8_t)((tmp - 25.0f) * 1.776964f);
+  }
+}
+
+}  // namespace mopeka_std_check
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/mopeka_std_check/mopeka_std_check.h b/esphome/components/mopeka_std_check/mopeka_std_check.h
new file mode 100644
index 0000000000..e4d81afbd7
--- /dev/null
+++ b/esphome/components/mopeka_std_check/mopeka_std_check.h
@@ -0,0 +1,78 @@
+#pragma once
+
+#include <vector>
+
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/core/component.h"
+
+#ifdef USE_ESP32
+
+namespace esphome {
+namespace mopeka_std_check {
+
+enum SensorType {
+  STANDARD = 0x02,
+  XL = 0x03,
+};
+
+// 4 values in one struct so it aligns to 8 byte. One `mopeka_std_values` is 40 bit long.
+struct mopeka_std_values {  // NOLINT(readability-identifier-naming,altera-struct-pack-align)
+  u_int16_t time_0 : 5;
+  u_int16_t value_0 : 5;
+  u_int16_t time_1 : 5;
+  u_int16_t value_1 : 5;
+  u_int16_t time_2 : 5;
+  u_int16_t value_2 : 5;
+  u_int16_t time_3 : 5;
+  u_int16_t value_3 : 5;
+} __attribute__((packed));
+
+struct mopeka_std_package {  // NOLINT(readability-identifier-naming,altera-struct-pack-align)
+  u_int8_t data_0 : 8;
+  u_int8_t data_1 : 8;
+  u_int8_t raw_voltage : 8;
+
+  u_int8_t raw_temp : 6;
+  bool slow_update_rate : 1;
+  bool sync_pressed : 1;
+
+  mopeka_std_values val[4];
+} __attribute__((packed));
+
+class MopekaStdCheck : public Component, public esp32_ble_tracker::ESPBTDeviceListener {
+ public:
+  void set_address(uint64_t address) { address_ = address; };
+
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
+  void set_level(sensor::Sensor *level) { this->level_ = level; };
+  void set_temperature(sensor::Sensor *temperature) { this->temperature_ = temperature; };
+  void set_battery_level(sensor::Sensor *bat) { this->battery_level_ = bat; };
+  void set_distance(sensor::Sensor *distance) { this->distance_ = distance; };
+  void set_propane_butane_mix(float val) { this->propane_butane_mix_ = val; };
+  void set_tank_full(float full) { this->full_mm_ = full; };
+  void set_tank_empty(float empty) { this->empty_mm_ = empty; };
+
+ protected:
+  uint64_t address_;
+  sensor::Sensor *level_{nullptr};
+  sensor::Sensor *temperature_{nullptr};
+  sensor::Sensor *distance_{nullptr};
+  sensor::Sensor *battery_level_{nullptr};
+
+  float propane_butane_mix_;
+  uint32_t full_mm_;
+  uint32_t empty_mm_;
+
+  float get_lpg_speed_of_sound_(float temperature);
+  uint8_t parse_battery_level_(const mopeka_std_package *message);
+  uint8_t parse_temperature_(const mopeka_std_package *message);
+};
+
+}  // namespace mopeka_std_check
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/mopeka_std_check/sensor.py b/esphome/components/mopeka_std_check/sensor.py
new file mode 100644
index 0000000000..bbba798e95
--- /dev/null
+++ b/esphome/components/mopeka_std_check/sensor.py
@@ -0,0 +1,139 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, esp32_ble_tracker
+from esphome.const import (
+    CONF_DISTANCE,
+    CONF_MAC_ADDRESS,
+    CONF_ID,
+    ICON_THERMOMETER,
+    ICON_RULER,
+    UNIT_PERCENT,
+    CONF_LEVEL,
+    CONF_TEMPERATURE,
+    DEVICE_CLASS_TEMPERATURE,
+    UNIT_CELSIUS,
+    STATE_CLASS_MEASUREMENT,
+    CONF_BATTERY_LEVEL,
+    DEVICE_CLASS_BATTERY,
+)
+
+CONF_TANK_TYPE = "tank_type"
+CONF_CUSTOM_DISTANCE_FULL = "custom_distance_full"
+CONF_CUSTOM_DISTANCE_EMPTY = "custom_distance_empty"
+CONF_PROPANE_BUTANE_MIX = "propane_butane_mix"
+
+ICON_PROPANE_TANK = "mdi:propane-tank"
+
+TANK_TYPE_CUSTOM = "CUSTOM"
+
+UNIT_MILLIMETER = "mm"
+
+
+def small_distance(value):
+    """small_distance is stored in mm"""
+    meters = cv.distance(value)
+    return meters * 1000
+
+
+#
+# Map of standard tank types to their
+# empty and full distance values.
+# Format is - tank name: (empty distance in mm, full distance in mm)
+#
+CONF_SUPPORTED_TANKS_MAP = {
+    TANK_TYPE_CUSTOM: (38, 100),
+    "NORTH_AMERICA_20LB_VERTICAL": (38, 254),  # empty/full readings for 20lb US tank
+    "NORTH_AMERICA_30LB_VERTICAL": (38, 381),
+    "NORTH_AMERICA_40LB_VERTICAL": (38, 508),
+    "EUROPE_6KG": (38, 336),
+    "EUROPE_11KG": (38, 366),
+    "EUROPE_14KG": (38, 467),
+}
+
+CODEOWNERS = ["@Fabian-Schmidt"]
+DEPENDENCIES = ["esp32_ble_tracker"]
+
+mopeka_std_check_ns = cg.esphome_ns.namespace("mopeka_std_check")
+MopekaStdCheck = mopeka_std_check_ns.class_(
+    "MopekaStdCheck", esp32_ble_tracker.ESPBTDeviceListener, cg.Component
+)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(MopekaStdCheck),
+            cv.Required(CONF_MAC_ADDRESS): cv.mac_address,
+            cv.Optional(CONF_CUSTOM_DISTANCE_FULL): small_distance,
+            cv.Optional(CONF_CUSTOM_DISTANCE_EMPTY): small_distance,
+            cv.Optional(CONF_PROPANE_BUTANE_MIX, default="100%"): cv.percentage,
+            cv.Required(CONF_TANK_TYPE): cv.enum(CONF_SUPPORTED_TANKS_MAP, upper=True),
+            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_CELSIUS,
+                icon=ICON_THERMOMETER,
+                accuracy_decimals=0,
+                device_class=DEVICE_CLASS_TEMPERATURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_LEVEL): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PERCENT,
+                icon=ICON_PROPANE_TANK,
+                accuracy_decimals=0,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_DISTANCE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_MILLIMETER,
+                icon=ICON_RULER,
+                accuracy_decimals=0,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PERCENT,
+                accuracy_decimals=0,
+                device_class=DEVICE_CLASS_BATTERY,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+        }
+    )
+    .extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
+    .extend(cv.COMPONENT_SCHEMA)
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await esp32_ble_tracker.register_ble_device(var, config)
+
+    cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
+
+    if config[CONF_TANK_TYPE] == TANK_TYPE_CUSTOM:
+        # Support custom tank min/max
+        if CONF_CUSTOM_DISTANCE_EMPTY in config:
+            cg.add(var.set_tank_empty(config[CONF_CUSTOM_DISTANCE_EMPTY]))
+        else:
+            cg.add(var.set_tank_empty(CONF_SUPPORTED_TANKS_MAP[TANK_TYPE_CUSTOM][0]))
+        if CONF_CUSTOM_DISTANCE_FULL in config:
+            cg.add(var.set_tank_full(config[CONF_CUSTOM_DISTANCE_FULL]))
+        else:
+            cg.add(var.set_tank_full(CONF_SUPPORTED_TANKS_MAP[TANK_TYPE_CUSTOM][1]))
+    else:
+        # Set the Tank empty and full based on map - User is requesting standard tank
+        t = config[CONF_TANK_TYPE]
+        cg.add(var.set_tank_empty(CONF_SUPPORTED_TANKS_MAP[t][0]))
+        cg.add(var.set_tank_full(CONF_SUPPORTED_TANKS_MAP[t][1]))
+
+    if CONF_PROPANE_BUTANE_MIX in config:
+        cg.add(var.set_propane_butane_mix(config[CONF_PROPANE_BUTANE_MIX]))
+
+    if CONF_TEMPERATURE in config:
+        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
+        cg.add(var.set_temperature(sens))
+    if CONF_LEVEL in config:
+        sens = await sensor.new_sensor(config[CONF_LEVEL])
+        cg.add(var.set_level(sens))
+    if CONF_DISTANCE in config:
+        sens = await sensor.new_sensor(config[CONF_DISTANCE])
+        cg.add(var.set_distance(sens))
+    if CONF_BATTERY_LEVEL in config:
+        sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
+        cg.add(var.set_battery_level(sens))

From 38a01988a533c526196f06f7c72fb72205abccb3 Mon Sep 17 00:00:00 2001
From: Mikhail Zakharov <mzakharo@users.noreply.github.com>
Date: Tue, 21 Feb 2023 16:52:06 -0500
Subject: [PATCH 608/838] fix library override logic (#4474)

* fix library override logic

* formatting
---
 esphome/core/__init__.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/esphome/core/__init__.py b/esphome/core/__init__.py
index 545fae381f..117b19a6ae 100644
--- a/esphome/core/__init__.py
+++ b/esphome/core/__init__.py
@@ -653,7 +653,15 @@ class EsphomeCore:
                 f"Library {library} must be instance of Library, not {type(library)}"
             )
         for other in self.libraries[:]:
-            if other.name != library.name or other.name is None or library.name is None:
+            if other.name is None or library.name is None:
+                continue
+            library_name = (
+                library.name if "/" not in library.name else library.name.split("/")[1]
+            )
+            other_name = (
+                other.name if "/" not in other.name else other.name.split("/")[1]
+            )
+            if other_name != library_name:
                 continue
             if other.repository is not None:
                 if library.repository is None or other.repository == library.repository:

From 98b3d294aab333e73c92117bbb38e25969d73c6c Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Tue, 21 Feb 2023 19:47:50 -0600
Subject: [PATCH 609/838] Sprinkler "v2" updates (#4159)

* Add standby switch

* Add support for arbitrary run duration in start_single_valve action

* Add divider feature

* Allow zero multiplier

* Fixes for #3740, misc. cleanup and polishing

* Integrate number components for multiplier, repeat and run duration

* Add various methods to get time remaining

* Add next_prev_ignore_disabled flag

* Optimize next/previous valve selection methods

* Add numbers_use_minutes flag

* Initialize switch states as they are set up

* Ensure SprinklerControllerSwitch has state if it's not restored

* Add repeat validation

* Misc. clean-up and tweaking

* Fix bugprone-integer-division

* More clean-up

* Set entity_category for standby_switch

* Set default entity_category for numbers

* More housekeeping

* Add run request tracking

* Fix time remaining calculation

* Use native unit_of_measurement for run duration numbers

* Unstack some ifs
---
 esphome/components/sprinkler/__init__.py   | 264 ++++++++-
 esphome/components/sprinkler/automation.h  |  18 +-
 esphome/components/sprinkler/sprinkler.cpp | 633 ++++++++++++++++-----
 esphome/components/sprinkler/sprinkler.h   | 115 +++-
 4 files changed, 854 insertions(+), 176 deletions(-)

diff --git a/esphome/components/sprinkler/__init__.py b/esphome/components/sprinkler/__init__.py
index 52de290c85..cf3f471234 100644
--- a/esphome/components/sprinkler/__init__.py
+++ b/esphome/components/sprinkler/__init__.py
@@ -2,23 +2,36 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
 from esphome.automation import maybe_simple_id
+from esphome.components import number
 from esphome.components import switch
 from esphome.const import (
+    CONF_ENTITY_CATEGORY,
     CONF_ID,
+    CONF_INITIAL_VALUE,
+    CONF_MAX_VALUE,
+    CONF_MIN_VALUE,
     CONF_NAME,
     CONF_REPEAT,
+    CONF_RESTORE_VALUE,
     CONF_RUN_DURATION,
+    CONF_STEP,
+    CONF_UNIT_OF_MEASUREMENT,
     ENTITY_CATEGORY_CONFIG,
+    UNIT_MINUTE,
+    UNIT_SECOND,
 )
 
-AUTO_LOAD = ["switch"]
+AUTO_LOAD = ["number", "switch"]
 CODEOWNERS = ["@kbx81"]
 
 CONF_AUTO_ADVANCE_SWITCH = "auto_advance_switch"
+CONF_DIVIDER = "divider"
 CONF_ENABLE_SWITCH = "enable_switch"
 CONF_MAIN_SWITCH = "main_switch"
 CONF_MANUAL_SELECTION_DELAY = "manual_selection_delay"
 CONF_MULTIPLIER = "multiplier"
+CONF_MULTIPLIER_NUMBER = "multiplier_number"
+CONF_NEXT_PREV_IGNORE_DISABLED = "next_prev_ignore_disabled"
 CONF_PUMP_OFF_SWITCH_ID = "pump_off_switch_id"
 CONF_PUMP_ON_SWITCH_ID = "pump_on_switch_id"
 CONF_PUMP_PULSE_DURATION = "pump_pulse_duration"
@@ -30,7 +43,11 @@ CONF_PUMP_SWITCH = "pump_switch"
 CONF_PUMP_SWITCH_ID = "pump_switch_id"
 CONF_PUMP_SWITCH_OFF_DURING_VALVE_OPEN_DELAY = "pump_switch_off_during_valve_open_delay"
 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"
 CONF_VALVE_OVERLAP = "valve_overlap"
@@ -43,10 +60,14 @@ CONF_VALVES = "valves"
 
 sprinkler_ns = cg.esphome_ns.namespace("sprinkler")
 Sprinkler = sprinkler_ns.class_("Sprinkler", cg.Component)
+SprinklerControllerNumber = sprinkler_ns.class_(
+    "SprinklerControllerNumber", number.Number, cg.Component
+)
 SprinklerControllerSwitch = sprinkler_ns.class_(
     "SprinklerControllerSwitch", switch.Switch, cg.Component
 )
 
+SetDividerAction = sprinkler_ns.class_("SetDividerAction", automation.Action)
 SetMultiplierAction = sprinkler_ns.class_("SetMultiplierAction", automation.Action)
 QueueValveAction = sprinkler_ns.class_("QueueValveAction", automation.Action)
 ClearQueuedValvesAction = sprinkler_ns.class_(
@@ -67,6 +88,19 @@ ResumeAction = sprinkler_ns.class_("ResumeAction", automation.Action)
 ResumeOrStartAction = sprinkler_ns.class_("ResumeOrStartAction", automation.Action)
 
 
+def validate_min_max(config):
+    if config[CONF_MAX_VALUE] <= config[CONF_MIN_VALUE]:
+        raise cv.Invalid(f"{CONF_MAX_VALUE} must be greater than {CONF_MIN_VALUE}")
+
+    if (config[CONF_INITIAL_VALUE] > config[CONF_MAX_VALUE]) or (
+        config[CONF_INITIAL_VALUE] < config[CONF_MIN_VALUE]
+    ):
+        raise cv.Invalid(
+            f"{CONF_INITIAL_VALUE} must be a value between {CONF_MAX_VALUE} and {CONF_MIN_VALUE}"
+        )
+    return config
+
+
 def validate_sprinkler(config):
     for sprinkler_controller_index, sprinkler_controller in enumerate(config):
         if len(sprinkler_controller[CONF_VALVES]) <= 1:
@@ -104,9 +138,18 @@ def validate_sprinkler(config):
                     f"{CONF_VALVE_OPEN_DELAY} must be defined when {CONF_PUMP_SWITCH_OFF_DURING_VALVE_OPEN_DELAY} is enabled"
                 )
 
+        if (
+            CONF_REPEAT in sprinkler_controller
+            and CONF_REPEAT_NUMBER in sprinkler_controller
+        ):
+            raise cv.Invalid(
+                f"Do not specify {CONF_REPEAT} when using {CONF_REPEAT_NUMBER}; use number component's {CONF_INITIAL_VALUE} instead"
+            )
+
         for valve in sprinkler_controller[CONF_VALVES]:
             if (
                 CONF_VALVE_OVERLAP in sprinkler_controller
+                and CONF_RUN_DURATION in valve
                 and valve[CONF_RUN_DURATION] <= sprinkler_controller[CONF_VALVE_OVERLAP]
             ):
                 raise cv.Invalid(
@@ -114,6 +157,7 @@ def validate_sprinkler(config):
                 )
             if (
                 CONF_VALVE_OPEN_DELAY in sprinkler_controller
+                and CONF_RUN_DURATION in valve
                 and valve[CONF_RUN_DURATION]
                 <= sprinkler_controller[CONF_VALVE_OPEN_DELAY]
             ):
@@ -170,6 +214,14 @@ def validate_sprinkler(config):
                 raise cv.Invalid(
                     f"Either {CONF_VALVE_SWITCH_ID} or {CONF_VALVE_OFF_SWITCH_ID} and {CONF_VALVE_ON_SWITCH_ID} must be specified in valve configuration"
                 )
+            if CONF_RUN_DURATION not in valve and CONF_RUN_DURATION_NUMBER not in valve:
+                raise cv.Invalid(
+                    f"Either {CONF_RUN_DURATION} or {CONF_RUN_DURATION_NUMBER} must be specified for each valve"
+                )
+            if CONF_RUN_DURATION in valve and CONF_RUN_DURATION_NUMBER in valve:
+                raise cv.Invalid(
+                    f"Do not specify {CONF_RUN_DURATION} when using {CONF_RUN_DURATION_NUMBER}; use number component's {CONF_INITIAL_VALUE} instead"
+                )
     return config
 
 
@@ -190,11 +242,20 @@ SPRINKLER_ACTION_REPEAT_SCHEMA = cv.maybe_simple_value(
 SPRINKLER_ACTION_SINGLE_VALVE_SCHEMA = cv.maybe_simple_value(
     {
         cv.GenerateID(): cv.use_id(Sprinkler),
+        cv.Optional(CONF_RUN_DURATION): cv.templatable(cv.positive_time_period_seconds),
         cv.Required(CONF_VALVE_NUMBER): cv.templatable(cv.positive_int),
     },
     key=CONF_VALVE_NUMBER,
 )
 
+SPRINKLER_ACTION_SET_DIVIDER_SCHEMA = cv.maybe_simple_value(
+    {
+        cv.GenerateID(): cv.use_id(Sprinkler),
+        cv.Required(CONF_DIVIDER): cv.templatable(cv.positive_int),
+    },
+    key=CONF_DIVIDER,
+)
+
 SPRINKLER_ACTION_SET_MULTIPLIER_SCHEMA = cv.maybe_simple_value(
     {
         cv.GenerateID(): cv.use_id(Sprinkler),
@@ -232,7 +293,30 @@ SPRINKLER_VALVE_SCHEMA = cv.Schema(
         cv.Optional(CONF_PUMP_OFF_SWITCH_ID): cv.use_id(switch.Switch),
         cv.Optional(CONF_PUMP_ON_SWITCH_ID): cv.use_id(switch.Switch),
         cv.Optional(CONF_PUMP_SWITCH_ID): cv.use_id(switch.Switch),
-        cv.Required(CONF_RUN_DURATION): cv.positive_time_period_seconds,
+        cv.Optional(CONF_RUN_DURATION): cv.positive_time_period_seconds,
+        cv.Optional(CONF_RUN_DURATION_NUMBER): cv.maybe_simple_value(
+            number.NUMBER_SCHEMA.extend(
+                {
+                    cv.GenerateID(): cv.declare_id(SprinklerControllerNumber),
+                    cv.Optional(
+                        CONF_ENTITY_CATEGORY, default=ENTITY_CATEGORY_CONFIG
+                    ): cv.entity_category,
+                    cv.Optional(CONF_INITIAL_VALUE, default=900): cv.positive_int,
+                    cv.Optional(CONF_MAX_VALUE, default=86400): cv.positive_int,
+                    cv.Optional(CONF_MIN_VALUE, default=1): cv.positive_int,
+                    cv.Optional(CONF_RESTORE_VALUE, default=True): cv.boolean,
+                    cv.Optional(CONF_STEP, default=1): cv.positive_int,
+                    cv.Optional(CONF_SET_ACTION): automation.validate_automation(
+                        single=True
+                    ),
+                    cv.Optional(
+                        CONF_UNIT_OF_MEASUREMENT, default=UNIT_SECOND
+                    ): cv.one_of(UNIT_MINUTE, UNIT_SECOND, lower="True"),
+                }
+            ).extend(cv.COMPONENT_SCHEMA),
+            validate_min_max,
+            key=CONF_NAME,
+        ),
         cv.Required(CONF_VALVE_SWITCH): cv.maybe_simple_value(
             switch.switch_schema(SprinklerControllerSwitch),
             key=CONF_NAME,
@@ -268,8 +352,55 @@ SPRINKLER_CONTROLLER_SCHEMA = cv.Schema(
             ),
             key=CONF_NAME,
         ),
+        cv.Optional(CONF_STANDBY_SWITCH): cv.maybe_simple_value(
+            switch.switch_schema(
+                SprinklerControllerSwitch, entity_category=ENTITY_CATEGORY_CONFIG
+            ),
+            key=CONF_NAME,
+        ),
+        cv.Optional(CONF_NEXT_PREV_IGNORE_DISABLED, default=False): cv.boolean,
         cv.Optional(CONF_MANUAL_SELECTION_DELAY): cv.positive_time_period_seconds,
+        cv.Optional(CONF_MULTIPLIER_NUMBER): cv.maybe_simple_value(
+            number.NUMBER_SCHEMA.extend(
+                {
+                    cv.GenerateID(): cv.declare_id(SprinklerControllerNumber),
+                    cv.Optional(
+                        CONF_ENTITY_CATEGORY, default=ENTITY_CATEGORY_CONFIG
+                    ): cv.entity_category,
+                    cv.Optional(CONF_INITIAL_VALUE, default=1): cv.positive_float,
+                    cv.Optional(CONF_MAX_VALUE, default=10): cv.positive_float,
+                    cv.Optional(CONF_MIN_VALUE, default=0): cv.positive_float,
+                    cv.Optional(CONF_RESTORE_VALUE, default=True): cv.boolean,
+                    cv.Optional(CONF_STEP, default=0.1): cv.positive_float,
+                    cv.Optional(CONF_SET_ACTION): automation.validate_automation(
+                        single=True
+                    ),
+                }
+            ).extend(cv.COMPONENT_SCHEMA),
+            validate_min_max,
+            key=CONF_NAME,
+        ),
         cv.Optional(CONF_REPEAT): cv.positive_int,
+        cv.Optional(CONF_REPEAT_NUMBER): cv.maybe_simple_value(
+            number.NUMBER_SCHEMA.extend(
+                {
+                    cv.GenerateID(): cv.declare_id(SprinklerControllerNumber),
+                    cv.Optional(
+                        CONF_ENTITY_CATEGORY, default=ENTITY_CATEGORY_CONFIG
+                    ): cv.entity_category,
+                    cv.Optional(CONF_INITIAL_VALUE, default=0): cv.positive_int,
+                    cv.Optional(CONF_MAX_VALUE, default=10): cv.positive_int,
+                    cv.Optional(CONF_MIN_VALUE, default=0): cv.positive_int,
+                    cv.Optional(CONF_RESTORE_VALUE, default=True): cv.boolean,
+                    cv.Optional(CONF_STEP, default=1): cv.positive_int,
+                    cv.Optional(CONF_SET_ACTION): automation.validate_automation(
+                        single=True
+                    ),
+                }
+            ).extend(cv.COMPONENT_SCHEMA),
+            validate_min_max,
+            key=CONF_NAME,
+        ),
         cv.Optional(CONF_PUMP_PULSE_DURATION): cv.positive_time_period_milliseconds,
         cv.Optional(CONF_VALVE_PULSE_DURATION): cv.positive_time_period_milliseconds,
         cv.Exclusive(
@@ -301,6 +432,19 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
+@automation.register_action(
+    "sprinkler.set_divider",
+    SetDividerAction,
+    SPRINKLER_ACTION_SET_DIVIDER_SCHEMA,
+)
+async def sprinkler_set_divider_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_DIVIDER], args, cg.float_)
+    cg.add(var.set_divider(template_))
+    return var
+
+
 @automation.register_action(
     "sprinkler.set_multiplier",
     SetMultiplierAction,
@@ -385,6 +529,9 @@ async def sprinkler_start_single_valve_to_code(config, action_id, template_arg,
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_VALVE_NUMBER], args, cg.uint8)
     cg.add(var.set_valve_to_start(template_))
+    if CONF_RUN_DURATION in config:
+        template_ = await cg.templatable(config[CONF_RUN_DURATION], args, cg.uint32)
+        cg.add(var.set_valve_run_duration(template_))
     return var
 
 
@@ -455,6 +602,79 @@ async def to_code(config):
                 )
                 cg.add(var.set_controller_reverse_switch(sw_rev_var))
 
+            if CONF_STANDBY_SWITCH in sprinkler_controller:
+                sw_stb_var = await switch.new_switch(
+                    sprinkler_controller[CONF_STANDBY_SWITCH]
+                )
+                await cg.register_component(
+                    sw_stb_var, sprinkler_controller[CONF_STANDBY_SWITCH]
+                )
+                cg.add(var.set_controller_standby_switch(sw_stb_var))
+
+            if CONF_MULTIPLIER_NUMBER in sprinkler_controller:
+                num_mult_var = await number.new_number(
+                    sprinkler_controller[CONF_MULTIPLIER_NUMBER],
+                    min_value=sprinkler_controller[CONF_MULTIPLIER_NUMBER][
+                        CONF_MIN_VALUE
+                    ],
+                    max_value=sprinkler_controller[CONF_MULTIPLIER_NUMBER][
+                        CONF_MAX_VALUE
+                    ],
+                    step=sprinkler_controller[CONF_MULTIPLIER_NUMBER][CONF_STEP],
+                )
+                await cg.register_component(
+                    num_mult_var, sprinkler_controller[CONF_MULTIPLIER_NUMBER]
+                )
+                cg.add(
+                    num_mult_var.set_initial_value(
+                        sprinkler_controller[CONF_MULTIPLIER_NUMBER][CONF_INITIAL_VALUE]
+                    )
+                )
+                cg.add(
+                    num_mult_var.set_restore_value(
+                        sprinkler_controller[CONF_MULTIPLIER_NUMBER][CONF_RESTORE_VALUE]
+                    )
+                )
+
+                if CONF_SET_ACTION in sprinkler_controller[CONF_MULTIPLIER_NUMBER]:
+                    await automation.build_automation(
+                        num_mult_var.get_set_trigger(),
+                        [(float, "x")],
+                        sprinkler_controller[CONF_MULTIPLIER_NUMBER][CONF_SET_ACTION],
+                    )
+
+                cg.add(var.set_controller_multiplier_number(num_mult_var))
+
+            if CONF_REPEAT_NUMBER in sprinkler_controller:
+                num_repeat_var = await number.new_number(
+                    sprinkler_controller[CONF_REPEAT_NUMBER],
+                    min_value=sprinkler_controller[CONF_REPEAT_NUMBER][CONF_MIN_VALUE],
+                    max_value=sprinkler_controller[CONF_REPEAT_NUMBER][CONF_MAX_VALUE],
+                    step=sprinkler_controller[CONF_REPEAT_NUMBER][CONF_STEP],
+                )
+                await cg.register_component(
+                    num_repeat_var, sprinkler_controller[CONF_REPEAT_NUMBER]
+                )
+                cg.add(
+                    num_repeat_var.set_initial_value(
+                        sprinkler_controller[CONF_REPEAT_NUMBER][CONF_INITIAL_VALUE]
+                    )
+                )
+                cg.add(
+                    num_repeat_var.set_restore_value(
+                        sprinkler_controller[CONF_REPEAT_NUMBER][CONF_RESTORE_VALUE]
+                    )
+                )
+
+                if CONF_SET_ACTION in sprinkler_controller[CONF_REPEAT_NUMBER]:
+                    await automation.build_automation(
+                        num_repeat_var.get_set_trigger(),
+                        [(float, "x")],
+                        sprinkler_controller[CONF_REPEAT_NUMBER][CONF_SET_ACTION],
+                    )
+
+                cg.add(var.set_controller_repeat_number(num_repeat_var))
+
         for valve in sprinkler_controller[CONF_VALVES]:
             sw_valve_var = await switch.new_switch(valve[CONF_VALVE_SWITCH])
             await cg.register_component(sw_valve_var, valve[CONF_VALVE_SWITCH])
@@ -470,6 +690,12 @@ async def to_code(config):
             else:
                 cg.add(var.add_valve(sw_valve_var))
 
+        cg.add(
+            var.set_next_prev_ignore_disabled_valves(
+                sprinkler_controller[CONF_NEXT_PREV_IGNORE_DISABLED]
+            )
+        )
+
         if CONF_MANUAL_SELECTION_DELAY in sprinkler_controller:
             cg.add(
                 var.set_manual_selection_delay(
@@ -524,6 +750,11 @@ async def to_code(config):
     for sprinkler_controller in config:
         var = await cg.get_variable(sprinkler_controller[CONF_ID])
         for valve_index, valve in enumerate(sprinkler_controller[CONF_VALVES]):
+            if CONF_RUN_DURATION not in valve:
+                valve[CONF_RUN_DURATION] = valve[CONF_RUN_DURATION_NUMBER][
+                    CONF_INITIAL_VALUE
+                ]
+
             if CONF_VALVE_SWITCH_ID in valve:
                 valve_switch = await cg.get_variable(valve[CONF_VALVE_SWITCH_ID])
                 cg.add(
@@ -561,6 +792,35 @@ async def to_code(config):
                     )
                 )
 
+            if CONF_RUN_DURATION_NUMBER in valve:
+                num_rd_var = await number.new_number(
+                    valve[CONF_RUN_DURATION_NUMBER],
+                    min_value=valve[CONF_RUN_DURATION_NUMBER][CONF_MIN_VALUE],
+                    max_value=valve[CONF_RUN_DURATION_NUMBER][CONF_MAX_VALUE],
+                    step=valve[CONF_RUN_DURATION_NUMBER][CONF_STEP],
+                )
+                await cg.register_component(num_rd_var, valve[CONF_RUN_DURATION_NUMBER])
+
+                cg.add(
+                    num_rd_var.set_initial_value(
+                        valve[CONF_RUN_DURATION_NUMBER][CONF_INITIAL_VALUE]
+                    )
+                )
+                cg.add(
+                    num_rd_var.set_restore_value(
+                        valve[CONF_RUN_DURATION_NUMBER][CONF_RESTORE_VALUE]
+                    )
+                )
+
+                if CONF_SET_ACTION in valve[CONF_RUN_DURATION_NUMBER]:
+                    await automation.build_automation(
+                        num_rd_var.get_set_trigger(),
+                        [(float, "x")],
+                        valve[CONF_RUN_DURATION_NUMBER][CONF_SET_ACTION],
+                    )
+
+                cg.add(var.configure_valve_run_duration_number(valve_index, num_rd_var))
+
     for sprinkler_controller in config:
         var = await cg.get_variable(sprinkler_controller[CONF_ID])
         for controller_to_add in config:
diff --git a/esphome/components/sprinkler/automation.h b/esphome/components/sprinkler/automation.h
index dd0ea44633..59c6cd50e1 100644
--- a/esphome/components/sprinkler/automation.h
+++ b/esphome/components/sprinkler/automation.h
@@ -7,6 +7,18 @@
 namespace esphome {
 namespace sprinkler {
 
+template<typename... Ts> class SetDividerAction : public Action<Ts...> {
+ public:
+  explicit SetDividerAction(Sprinkler *a_sprinkler) : sprinkler_(a_sprinkler) {}
+
+  TEMPLATABLE_VALUE(uint32_t, divider)
+
+  void play(Ts... x) override { this->sprinkler_->set_divider(this->divider_.optional_value(x...)); }
+
+ protected:
+  Sprinkler *sprinkler_;
+};
+
 template<typename... Ts> class SetMultiplierAction : public Action<Ts...> {
  public:
   explicit SetMultiplierAction(Sprinkler *a_sprinkler) : sprinkler_(a_sprinkler) {}
@@ -98,8 +110,12 @@ template<typename... Ts> class StartSingleValveAction : public Action<Ts...> {
   explicit StartSingleValveAction(Sprinkler *a_sprinkler) : sprinkler_(a_sprinkler) {}
 
   TEMPLATABLE_VALUE(size_t, valve_to_start)
+  TEMPLATABLE_VALUE(uint32_t, valve_run_duration)
 
-  void play(Ts... x) override { this->sprinkler_->start_single_valve(this->valve_to_start_.optional_value(x...)); }
+  void play(Ts... x) override {
+    this->sprinkler_->start_single_valve(this->valve_to_start_.optional_value(x...),
+                                         this->valve_run_duration_.optional_value(x...));
+  }
 
  protected:
   Sprinkler *sprinkler_;
diff --git a/esphome/components/sprinkler/sprinkler.cpp b/esphome/components/sprinkler/sprinkler.cpp
index 2be71a08d0..9d3044802d 100644
--- a/esphome/components/sprinkler/sprinkler.cpp
+++ b/esphome/components/sprinkler/sprinkler.cpp
@@ -75,6 +75,34 @@ void SprinklerSwitch::sync_valve_state(bool latch_state) {
   }
 }
 
+void SprinklerControllerNumber::setup() {
+  float value;
+  if (!this->restore_value_) {
+    value = this->initial_value_;
+  } else {
+    this->pref_ = global_preferences->make_preference<float>(this->get_object_id_hash());
+    if (!this->pref_.load(&value)) {
+      if (!std::isnan(this->initial_value_)) {
+        value = this->initial_value_;
+      } else {
+        value = this->traits.get_min_value();
+      }
+    }
+  }
+  this->publish_state(value);
+}
+
+void SprinklerControllerNumber::control(float value) {
+  this->set_trigger_->trigger(value);
+
+  this->publish_state(value);
+
+  if (this->restore_value_)
+    this->pref_.save(&value);
+}
+
+void SprinklerControllerNumber::dump_config() { LOG_NUMBER("", "Sprinkler Controller Number", this); }
+
 SprinklerControllerSwitch::SprinklerControllerSwitch()
     : turn_on_trigger_(new Trigger<>()), turn_off_trigger_(new Trigger<>()) {}
 
@@ -101,12 +129,9 @@ void SprinklerControllerSwitch::write_state(bool state) {
     this->turn_off_trigger_->trigger();
   }
 
-  if (this->optimistic_)
-    this->publish_state(state);
+  this->publish_state(state);
 }
 
-void SprinklerControllerSwitch::set_optimistic(bool optimistic) { this->optimistic_ = optimistic; }
-bool SprinklerControllerSwitch::assumed_state() { return this->assumed_state_; }
 void SprinklerControllerSwitch::set_state_lambda(std::function<optional<bool>()> &&f) { this->f_ = f; }
 float SprinklerControllerSwitch::get_setup_priority() const { return setup_priority::HARDWARE; }
 
@@ -114,30 +139,16 @@ Trigger<> *SprinklerControllerSwitch::get_turn_on_trigger() const { return this-
 Trigger<> *SprinklerControllerSwitch::get_turn_off_trigger() const { return this->turn_off_trigger_; }
 
 void SprinklerControllerSwitch::setup() {
-  if (!this->restore_state_)
-    return;
+  this->state = this->get_initial_state_with_restore_mode().value_or(false);
 
-  auto restored = this->get_initial_state();
-  if (!restored.has_value())
-    return;
-
-  ESP_LOGD(TAG, "  Restored state %s", ONOFF(*restored));
-  if (*restored) {
+  if (this->state) {
     this->turn_on();
   } else {
     this->turn_off();
   }
 }
 
-void SprinklerControllerSwitch::dump_config() {
-  LOG_SWITCH("", "Sprinkler Switch", this);
-  ESP_LOGCONFIG(TAG, "  Restore State: %s", YESNO(this->restore_state_));
-  ESP_LOGCONFIG(TAG, "  Optimistic: %s", YESNO(this->optimistic_));
-}
-
-void SprinklerControllerSwitch::set_restore_state(bool restore_state) { this->restore_state_ = restore_state; }
-
-void SprinklerControllerSwitch::set_assumed_state(bool assumed_state) { this->assumed_state_ = assumed_state; }
+void SprinklerControllerSwitch::dump_config() { LOG_SWITCH("", "Sprinkler Switch", this); }
 
 SprinklerValveOperator::SprinklerValveOperator() {}
 SprinklerValveOperator::SprinklerValveOperator(SprinklerValve *valve, Sprinkler *controller)
@@ -328,6 +339,8 @@ SprinklerValveRunRequest::SprinklerValveRunRequest(size_t valve_number, uint32_t
 bool SprinklerValveRunRequest::has_request() { return this->has_valve_; }
 bool SprinklerValveRunRequest::has_valve_operator() { return !(this->valve_op_ == nullptr); }
 
+void SprinklerValveRunRequest::set_request_from(SprinklerValveRunRequestOrigin origin) { this->origin_ = origin; }
+
 void SprinklerValveRunRequest::set_run_duration(uint32_t run_duration) { this->run_duration_ = run_duration; }
 
 void SprinklerValveRunRequest::set_valve(size_t valve_number) {
@@ -345,6 +358,7 @@ void SprinklerValveRunRequest::set_valve_operator(SprinklerValveOperator *valve_
 
 void SprinklerValveRunRequest::reset() {
   this->has_valve_ = false;
+  this->origin_ = USER;
   this->run_duration_ = 0;
   this->valve_op_ = nullptr;
 }
@@ -362,6 +376,8 @@ optional<size_t> SprinklerValveRunRequest::valve_as_opt() {
 
 SprinklerValveOperator *SprinklerValveRunRequest::valve_operator() { return this->valve_op_; }
 
+SprinklerValveRunRequestOrigin SprinklerValveRunRequest::request_is_from() { return this->origin_; }
+
 Sprinkler::Sprinkler() {}
 Sprinkler::Sprinkler(const std::string &name) : EntityBase(name) {}
 
@@ -404,8 +420,6 @@ void Sprinkler::add_valve(SprinklerControllerSwitch *valve_sw, SprinklerControll
 
   if (enable_sw != nullptr) {
     new_valve->enable_switch = enable_sw;
-    new_valve->enable_switch->set_optimistic(true);
-    new_valve->enable_switch->set_restore_state(true);
   }
 }
 
@@ -433,26 +447,37 @@ void Sprinkler::set_controller_main_switch(SprinklerControllerSwitch *controller
 
 void Sprinkler::set_controller_auto_adv_switch(SprinklerControllerSwitch *auto_adv_switch) {
   this->auto_adv_sw_ = auto_adv_switch;
-  auto_adv_switch->set_optimistic(true);
-  auto_adv_switch->set_restore_state(true);
 }
 
 void Sprinkler::set_controller_queue_enable_switch(SprinklerControllerSwitch *queue_enable_switch) {
   this->queue_enable_sw_ = queue_enable_switch;
-  queue_enable_switch->set_optimistic(true);
-  queue_enable_switch->set_restore_state(true);
 }
 
 void Sprinkler::set_controller_reverse_switch(SprinklerControllerSwitch *reverse_switch) {
   this->reverse_sw_ = reverse_switch;
-  reverse_switch->set_optimistic(true);
-  reverse_switch->set_restore_state(true);
+}
+
+void Sprinkler::set_controller_standby_switch(SprinklerControllerSwitch *standby_switch) {
+  this->standby_sw_ = standby_switch;
+
+  this->sprinkler_standby_turn_on_automation_ = make_unique<Automation<>>(standby_switch->get_turn_on_trigger());
+  this->sprinkler_standby_shutdown_action_ = make_unique<sprinkler::ShutdownAction<>>(this);
+  this->sprinkler_standby_turn_on_automation_->add_actions({sprinkler_standby_shutdown_action_.get()});
+}
+
+void Sprinkler::set_controller_multiplier_number(SprinklerControllerNumber *multiplier_number) {
+  this->multiplier_number_ = multiplier_number;
+}
+
+void Sprinkler::set_controller_repeat_number(SprinklerControllerNumber *repeat_number) {
+  this->repeat_number_ = repeat_number;
 }
 
 void Sprinkler::configure_valve_switch(size_t valve_number, switch_::Switch *valve_switch, uint32_t run_duration) {
   if (this->is_a_valid_valve(valve_number)) {
     this->valve_[valve_number].valve_switch.set_on_switch(valve_switch);
     this->valve_[valve_number].run_duration = run_duration;
+    valve_switch->turn_off();
   }
 }
 
@@ -464,6 +489,8 @@ void Sprinkler::configure_valve_switch_pulsed(size_t valve_number, switch_::Swit
     this->valve_[valve_number].valve_switch.set_on_switch(valve_switch_on);
     this->valve_[valve_number].valve_switch.set_pulse_duration(pulse_duration);
     this->valve_[valve_number].run_duration = run_duration;
+    valve_switch_off->turn_off();
+    valve_switch_on->turn_off();
   }
 }
 
@@ -478,6 +505,7 @@ void Sprinkler::configure_valve_pump_switch(size_t valve_number, switch_::Switch
     this->pump_.resize(this->pump_.size() + 1);
     this->pump_.back().set_on_switch(pump_switch);
     this->valve_[valve_number].pump_switch_index = this->pump_.size() - 1;  // save the index to the new pump
+    pump_switch->turn_off();
   }
 }
 
@@ -496,15 +524,49 @@ void Sprinkler::configure_valve_pump_switch_pulsed(size_t valve_number, switch_:
     this->pump_.back().set_on_switch(pump_switch_on);
     this->pump_.back().set_pulse_duration(pulse_duration);
     this->valve_[valve_number].pump_switch_index = this->pump_.size() - 1;  // save the index to the new pump
+    pump_switch_off->turn_off();
+    pump_switch_on->turn_off();
+  }
+}
+
+void Sprinkler::configure_valve_run_duration_number(size_t valve_number,
+                                                    SprinklerControllerNumber *run_duration_number) {
+  if (this->is_a_valid_valve(valve_number)) {
+    this->valve_[valve_number].run_duration_number = run_duration_number;
+  }
+}
+
+void Sprinkler::set_divider(optional<uint32_t> divider) {
+  if (!divider.has_value()) {
+    return;
+  }
+  if (divider.value() > 0) {
+    this->set_multiplier(1.0 / divider.value());
+    this->set_repeat(divider.value() - 1);
+  } else if (divider.value() == 0) {
+    this->set_multiplier(1.0);
+    this->set_repeat(0);
   }
 }
 
 void Sprinkler::set_multiplier(const optional<float> multiplier) {
-  if (multiplier.has_value()) {
-    if (multiplier.value() > 0) {
-      this->multiplier_ = multiplier.value();
-    }
+  if ((!multiplier.has_value()) || (multiplier.value() < 0)) {
+    return;
   }
+  this->multiplier_ = multiplier.value();
+  if (this->multiplier_number_ == nullptr) {
+    return;
+  }
+  if (this->multiplier_number_->state == multiplier.value()) {
+    return;
+  }
+  auto call = this->multiplier_number_->make_call();
+  call.set_value(multiplier.value());
+  call.perform();
+}
+
+void Sprinkler::set_next_prev_ignore_disabled_valves(bool ignore_disabled) {
+  this->next_prev_ignore_disabled_ = ignore_disabled;
 }
 
 void Sprinkler::set_pump_start_delay(uint32_t start_delay) {
@@ -559,47 +621,118 @@ void Sprinkler::set_manual_selection_delay(uint32_t manual_selection_delay) {
 }
 
 void Sprinkler::set_valve_run_duration(const optional<size_t> valve_number, const optional<uint32_t> run_duration) {
-  if (valve_number.has_value() && run_duration.has_value()) {
-    if (this->is_a_valid_valve(valve_number.value())) {
-      this->valve_[valve_number.value()].run_duration = run_duration.value();
-    }
+  if (!valve_number.has_value() || !run_duration.has_value()) {
+    return;
   }
+  if (!this->is_a_valid_valve(valve_number.value())) {
+    return;
+  }
+  this->valve_[valve_number.value()].run_duration = run_duration.value();
+  if (this->valve_[valve_number.value()].run_duration_number == nullptr) {
+    return;
+  }
+  if (this->valve_[valve_number.value()].run_duration_number->state == run_duration.value()) {
+    return;
+  }
+  auto call = this->valve_[valve_number.value()].run_duration_number->make_call();
+  if (this->valve_[valve_number.value()].run_duration_number->traits.get_unit_of_measurement() == min_str) {
+    call.set_value(run_duration.value() / 60.0);
+  } else {
+    call.set_value(run_duration.value());
+  }
+  call.perform();
 }
 
 void Sprinkler::set_auto_advance(const bool auto_advance) {
-  if (this->auto_adv_sw_ != nullptr) {
-    this->auto_adv_sw_->publish_state(auto_advance);
+  if (this->auto_adv_sw_ == nullptr) {
+    return;
+  }
+  if (this->auto_adv_sw_->state == auto_advance) {
+    return;
+  }
+  if (auto_advance) {
+    this->auto_adv_sw_->turn_on();
+  } else {
+    this->auto_adv_sw_->turn_off();
   }
 }
 
-void Sprinkler::set_repeat(optional<uint32_t> repeat) { this->target_repeats_ = repeat; }
+void Sprinkler::set_repeat(optional<uint32_t> repeat) {
+  this->target_repeats_ = repeat;
+  if (this->repeat_number_ == nullptr) {
+    return;
+  }
+  if (this->repeat_number_->state == repeat.value()) {
+    return;
+  }
+  auto call = this->repeat_number_->make_call();
+  call.set_value(repeat.value_or(0));
+  call.perform();
+}
 
 void Sprinkler::set_queue_enable(bool queue_enable) {
-  if (this->queue_enable_sw_ != nullptr) {
-    this->queue_enable_sw_->publish_state(queue_enable);
+  if (this->queue_enable_sw_ == nullptr) {
+    return;
+  }
+  if (this->queue_enable_sw_->state == queue_enable) {
+    return;
+  }
+  if (queue_enable) {
+    this->queue_enable_sw_->turn_on();
+  } else {
+    this->queue_enable_sw_->turn_off();
   }
 }
 
 void Sprinkler::set_reverse(const bool reverse) {
-  if (this->reverse_sw_ != nullptr) {
-    this->reverse_sw_->publish_state(reverse);
+  if (this->reverse_sw_ == nullptr) {
+    return;
+  }
+  if (this->reverse_sw_->state == reverse) {
+    return;
+  }
+  if (reverse) {
+    this->reverse_sw_->turn_on();
+  } else {
+    this->reverse_sw_->turn_off();
+  }
+}
+
+void Sprinkler::set_standby(const bool standby) {
+  if (this->standby_sw_ == nullptr) {
+    return;
+  }
+  if (this->standby_sw_->state == standby) {
+    return;
+  }
+  if (standby) {
+    this->standby_sw_->turn_on();
+  } else {
+    this->standby_sw_->turn_off();
   }
 }
 
 uint32_t Sprinkler::valve_run_duration(const size_t valve_number) {
-  if (this->is_a_valid_valve(valve_number)) {
-    return this->valve_[valve_number].run_duration;
+  if (!this->is_a_valid_valve(valve_number)) {
+    return 0;
   }
-  return 0;
+  if (this->valve_[valve_number].run_duration_number != nullptr) {
+    if (this->valve_[valve_number].run_duration_number->traits.get_unit_of_measurement() == min_str) {
+      return static_cast<uint32_t>(roundf(this->valve_[valve_number].run_duration_number->state * 60));
+    } else {
+      return static_cast<uint32_t>(roundf(this->valve_[valve_number].run_duration_number->state));
+    }
+  }
+  return this->valve_[valve_number].run_duration;
 }
 
 uint32_t Sprinkler::valve_run_duration_adjusted(const size_t valve_number) {
   uint32_t run_duration = 0;
 
   if (this->is_a_valid_valve(valve_number)) {
-    run_duration = this->valve_[valve_number].run_duration;
+    run_duration = this->valve_run_duration(valve_number);
   }
-  run_duration = static_cast<uint32_t>(roundf(run_duration * this->multiplier_));
+  run_duration = static_cast<uint32_t>(roundf(run_duration * this->multiplier()));
   // run_duration must not be less than any of these
   if ((run_duration < this->start_delay_) || (run_duration < this->stop_delay_) ||
       (run_duration < this->switching_delay_.value_or(0) * 2)) {
@@ -615,16 +748,24 @@ bool Sprinkler::auto_advance() {
   return false;
 }
 
-float Sprinkler::multiplier() { return this->multiplier_; }
+float Sprinkler::multiplier() {
+  if (this->multiplier_number_ != nullptr) {
+    return this->multiplier_number_->state;
+  }
+  return this->multiplier_;
+}
 
-optional<uint32_t> Sprinkler::repeat() { return this->target_repeats_; }
+optional<uint32_t> Sprinkler::repeat() {
+  if (this->repeat_number_ != nullptr) {
+    return static_cast<uint32_t>(roundf(this->repeat_number_->state));
+  }
+  return this->target_repeats_;
+}
 
 optional<uint32_t> Sprinkler::repeat_count() {
   // if there is an active valve and auto-advance is enabled, we may be repeating, so return the count
-  if (this->auto_adv_sw_ != nullptr) {
-    if (this->active_req_.has_request() && this->auto_adv_sw_->state) {
-      return this->repeat_count_;
-    }
+  if (this->active_req_.has_request() && this->auto_advance()) {
+    return this->repeat_count_;
   }
   return nullopt;
 }
@@ -643,7 +784,22 @@ bool Sprinkler::reverse() {
   return false;
 }
 
+bool Sprinkler::standby() {
+  if (this->standby_sw_ != nullptr) {
+    return this->standby_sw_->state;
+  }
+  return false;
+}
+
 void Sprinkler::start_from_queue() {
+  if (this->standby()) {
+    ESP_LOGD(TAG, "start_from_queue called but standby is enabled; no action taken");
+    return;
+  }
+  if (this->multiplier() == 0) {
+    ESP_LOGD(TAG, "start_from_queue called but multiplier is set to zero; no action taken");
+    return;
+  }
   if (this->queued_valves_.empty()) {
     return;  // if there is nothing in the queue, don't do anything
   }
@@ -651,25 +807,29 @@ void Sprinkler::start_from_queue() {
     return;  // if there is already a valve running from the queue, do nothing
   }
 
-  if (this->auto_adv_sw_ != nullptr) {
-    this->auto_adv_sw_->publish_state(false);
-  }
-  if (this->queue_enable_sw_ != nullptr) {
-    this->queue_enable_sw_->publish_state(true);
-  }
+  this->set_auto_advance(false);
+  this->set_queue_enable(true);
+
   this->reset_cycle_states_();  // just in case auto-advance is switched on later
   this->repeat_count_ = 0;
   this->fsm_kick_();  // will automagically pick up from the queue (it has priority)
 }
 
 void Sprinkler::start_full_cycle() {
+  if (this->standby()) {
+    ESP_LOGD(TAG, "start_full_cycle called but standby is enabled; no action taken");
+    return;
+  }
+  if (this->multiplier() == 0) {
+    ESP_LOGD(TAG, "start_full_cycle called but multiplier is set to zero; no action taken");
+    return;
+  }
   if (this->auto_advance() && this->active_valve().has_value()) {
     return;  // if auto-advance is already enabled and there is already a valve running, do nothing
   }
 
-  if (this->queue_enable_sw_ != nullptr) {
-    this->queue_enable_sw_->publish_state(false);
-  }
+  this->set_queue_enable(false);
+
   this->prep_full_cycle_();
   this->repeat_count_ = 0;
   // if there is no active valve already, start the first valve in the cycle
@@ -678,20 +838,25 @@ void Sprinkler::start_full_cycle() {
   }
 }
 
-void Sprinkler::start_single_valve(const optional<size_t> valve_number) {
+void Sprinkler::start_single_valve(const optional<size_t> valve_number, optional<uint32_t> run_duration) {
+  if (this->standby()) {
+    ESP_LOGD(TAG, "start_single_valve called but standby is enabled; no action taken");
+    return;
+  }
+  if (this->multiplier() == 0) {
+    ESP_LOGD(TAG, "start_single_valve called but multiplier is set to zero; no action taken");
+    return;
+  }
   if (!valve_number.has_value() || (valve_number == this->active_valve())) {
     return;
   }
 
-  if (this->auto_adv_sw_ != nullptr) {
-    this->auto_adv_sw_->publish_state(false);
-  }
-  if (this->queue_enable_sw_ != nullptr) {
-    this->queue_enable_sw_->publish_state(false);
-  }
+  this->set_auto_advance(false);
+  this->set_queue_enable(false);
+
   this->reset_cycle_states_();  // just in case auto-advance is switched on later
   this->repeat_count_ = 0;
-  this->fsm_request_(valve_number.value());
+  this->fsm_request_(valve_number.value(), run_duration.value_or(0));
 }
 
 void Sprinkler::queue_valve(optional<size_t> valve_number, optional<uint32_t> run_duration) {
@@ -714,8 +879,17 @@ void Sprinkler::next_valve() {
   if (this->state_ == IDLE) {
     this->reset_cycle_states_();  // just in case auto-advance is switched on later
   }
+
   this->manual_valve_ = this->next_valve_number_(
-      this->manual_valve_.value_or(this->active_req_.valve_as_opt().value_or(this->number_of_valves() - 1)));
+      this->manual_valve_.value_or(this->active_req_.valve_as_opt().value_or(this->number_of_valves() - 1)),
+      !this->next_prev_ignore_disabled_, true);
+
+  if (!this->manual_valve_.has_value()) {
+    ESP_LOGD(TAG, "next_valve was called but no valve could be started; perhaps next_prev_ignore_disabled allows only "
+                  "enabled valves and no valves are enabled?");
+    return;
+  }
+
   if (this->manual_selection_delay_.has_value()) {
     this->set_timer_duration_(sprinkler::TIMER_VALVE_SELECTION, this->manual_selection_delay_.value());
     this->start_timer_(sprinkler::TIMER_VALVE_SELECTION);
@@ -728,8 +902,17 @@ void Sprinkler::previous_valve() {
   if (this->state_ == IDLE) {
     this->reset_cycle_states_();  // just in case auto-advance is switched on later
   }
+
   this->manual_valve_ =
-      this->previous_valve_number_(this->manual_valve_.value_or(this->active_req_.valve_as_opt().value_or(0)));
+      this->previous_valve_number_(this->manual_valve_.value_or(this->active_req_.valve_as_opt().value_or(0)),
+                                   !this->next_prev_ignore_disabled_, true);
+
+  if (!this->manual_valve_.has_value()) {
+    ESP_LOGD(TAG, "previous_valve was called but no valve could be started; perhaps next_prev_ignore_disabled allows "
+                  "only enabled valves and no valves are enabled?");
+    return;
+  }
+
   if (this->manual_selection_delay_.has_value()) {
     this->set_timer_duration_(sprinkler::TIMER_VALVE_SELECTION, this->manual_selection_delay_.value());
     this->start_timer_(sprinkler::TIMER_VALVE_SELECTION);
@@ -758,7 +941,7 @@ void Sprinkler::pause() {
     return;  // we can't pause if we're already paused or if there is no active valve
   }
   this->paused_valve_ = this->active_valve();
-  this->resume_duration_ = this->time_remaining();
+  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),
            this->resume_duration_.value_or(0));
@@ -795,6 +978,13 @@ const char *Sprinkler::valve_name(const size_t valve_number) {
   return nullptr;
 }
 
+optional<SprinklerValveRunRequestOrigin> Sprinkler::active_valve_request_is_from() {
+  if (this->active_req_.has_request()) {
+    return this->active_req_.request_is_from();
+  }
+  return nullopt;
+}
+
 optional<size_t> Sprinkler::active_valve() { return this->active_req_.valve_as_opt(); }
 optional<size_t> Sprinkler::paused_valve() { return this->paused_valve_; }
 
@@ -829,8 +1019,7 @@ bool Sprinkler::pump_in_use(SprinklerSwitch *pump_switch) {
       if ((vo.pump_switch()->off_switch() == pump_switch->off_switch()) &&
           (vo.pump_switch()->on_switch() == pump_switch->on_switch())) {
         // now if the SprinklerValveOperator has a pump and it is either ACTIVE, is STARTING with a valve delay or
-        // is
-        //  STOPPING with a valve delay, its pump can be considered "in use", so just return indicating this now
+        //  is STOPPING with a valve delay, its pump can be considered "in use", so just return indicating this now
         if ((vo.state() == ACTIVE) ||
             ((vo.state() == STARTING) && this->start_delay_ && this->start_delay_is_valve_delay_) ||
             ((vo.state() == STOPPING) && this->stop_delay_ && this->stop_delay_is_valve_delay_)) {
@@ -881,7 +1070,93 @@ void Sprinkler::set_pump_state(SprinklerSwitch *pump_switch, bool state) {
   }
 }
 
-optional<uint32_t> Sprinkler::time_remaining() {
+uint32_t Sprinkler::total_cycle_time_all_valves() {
+  uint32_t total_time_remaining = 0;
+
+  for (size_t valve = 0; valve < this->number_of_valves(); valve++) {
+    total_time_remaining += this->valve_run_duration_adjusted(valve);
+  }
+
+  if (this->valve_overlap_) {
+    total_time_remaining -= this->switching_delay_.value_or(0) * (this->number_of_valves() - 1);
+  } else {
+    total_time_remaining += this->switching_delay_.value_or(0) * (this->number_of_valves() - 1);
+  }
+
+  return total_time_remaining;
+}
+
+uint32_t Sprinkler::total_cycle_time_enabled_valves() {
+  uint32_t total_time_remaining = 0;
+  uint32_t valve_count = 0;
+
+  for (size_t valve = 0; valve < this->number_of_valves(); valve++) {
+    if (this->valve_is_enabled_(valve)) {
+      total_time_remaining += this->valve_run_duration_adjusted(valve);
+      valve_count++;
+    }
+  }
+
+  if (valve_count) {
+    if (this->valve_overlap_) {
+      total_time_remaining -= this->switching_delay_.value_or(0) * (valve_count - 1);
+    } else {
+      total_time_remaining += this->switching_delay_.value_or(0) * (valve_count - 1);
+    }
+  }
+
+  return total_time_remaining;
+}
+
+uint32_t Sprinkler::total_cycle_time_enabled_incomplete_valves() {
+  uint32_t total_time_remaining = 0;
+  uint32_t valve_count = 0;
+
+  for (size_t valve = 0; valve < this->number_of_valves(); valve++) {
+    if (this->valve_is_enabled_(valve) && !this->valve_cycle_complete_(valve)) {
+      if (!this->active_valve().has_value() || (valve != this->active_valve().value())) {
+        total_time_remaining += this->valve_run_duration_adjusted(valve);
+        valve_count++;
+      }
+    }
+  }
+
+  if (valve_count) {
+    if (this->valve_overlap_) {
+      total_time_remaining -= this->switching_delay_.value_or(0) * (valve_count - 1);
+    } else {
+      total_time_remaining += this->switching_delay_.value_or(0) * (valve_count - 1);
+    }
+  }
+
+  return total_time_remaining;
+}
+
+uint32_t Sprinkler::total_queue_time() {
+  uint32_t total_time_remaining = 0;
+  uint32_t valve_count = 0;
+
+  for (auto &valve : this->queued_valves_) {
+    if (valve.run_duration) {
+      total_time_remaining += valve.run_duration;
+    } else {
+      total_time_remaining += this->valve_run_duration_adjusted(valve.valve_number);
+    }
+    valve_count++;
+  }
+
+  if (valve_count) {
+    if (this->valve_overlap_) {
+      total_time_remaining -= this->switching_delay_.value_or(0) * (valve_count - 1);
+    } else {
+      total_time_remaining += this->switching_delay_.value_or(0) * (valve_count - 1);
+    }
+  }
+
+  return total_time_remaining;
+}
+
+optional<uint32_t> Sprinkler::time_remaining_active_valve() {
   if (this->active_req_.has_request()) {  // first try to return the value based on active_req_...
     if (this->active_req_.valve_operator() != nullptr) {
       return this->active_req_.valve_operator()->time_remaining();
@@ -895,6 +1170,25 @@ optional<uint32_t> Sprinkler::time_remaining() {
   return nullopt;
 }
 
+optional<uint32_t> Sprinkler::time_remaining_current_operation() {
+  auto total_time_remaining = this->time_remaining_active_valve();
+
+  if (total_time_remaining.has_value()) {
+    if (this->auto_advance()) {
+      total_time_remaining = total_time_remaining.value() + this->total_cycle_time_enabled_incomplete_valves();
+      total_time_remaining =
+          total_time_remaining.value() +
+          (this->total_cycle_time_enabled_valves() * (this->repeat().value_or(0) - this->repeat_count().value_or(0)));
+    }
+
+    if (this->queue_enabled()) {
+      total_time_remaining = total_time_remaining.value() + this->total_queue_time();
+    }
+    return total_time_remaining;
+  }
+  return nullopt;
+}
+
 SprinklerControllerSwitch *Sprinkler::control_switch(size_t valve_number) {
   if (this->is_a_valid_valve(valve_number)) {
     return this->valve_[valve_number].controller_switch;
@@ -957,30 +1251,60 @@ bool Sprinkler::valve_cycle_complete_(const size_t valve_number) {
   return false;
 }
 
-size_t Sprinkler::next_valve_number_(const size_t first_valve) {
-  if (this->is_a_valid_valve(first_valve) && (first_valve + 1 < this->number_of_valves()))
-    return first_valve + 1;
+optional<size_t> Sprinkler::next_valve_number_(const optional<size_t> first_valve, const bool include_disabled,
+                                               const bool include_complete) {
+  auto valve = first_valve.value_or(0);
+  size_t start = first_valve.has_value() ? 1 : 0;
 
-  return 0;
+  if (!this->is_a_valid_valve(valve)) {
+    valve = 0;
+  }
+
+  for (size_t offset = start; offset < this->number_of_valves(); offset++) {
+    auto valve_of_interest = valve + offset;
+    if (!this->is_a_valid_valve(valve_of_interest)) {
+      valve_of_interest -= this->number_of_valves();
+    }
+
+    if ((this->valve_is_enabled_(valve_of_interest) || include_disabled) &&
+        (!this->valve_cycle_complete_(valve_of_interest) || include_complete)) {
+      return valve_of_interest;
+    }
+  }
+  return nullopt;
 }
 
-size_t Sprinkler::previous_valve_number_(const size_t first_valve) {
-  if (this->is_a_valid_valve(first_valve) && (first_valve - 1 >= 0))
-    return first_valve - 1;
+optional<size_t> Sprinkler::previous_valve_number_(const optional<size_t> first_valve, const bool include_disabled,
+                                                   const bool include_complete) {
+  auto valve = first_valve.value_or(this->number_of_valves() - 1);
+  size_t start = first_valve.has_value() ? 1 : 0;
 
-  return this->number_of_valves() - 1;
+  if (!this->is_a_valid_valve(valve)) {
+    valve = this->number_of_valves() - 1;
+  }
+
+  for (size_t offset = start; offset < this->number_of_valves(); offset++) {
+    auto valve_of_interest = valve - offset;
+    if (!this->is_a_valid_valve(valve_of_interest)) {
+      valve_of_interest += this->number_of_valves();
+    }
+
+    if ((this->valve_is_enabled_(valve_of_interest) || include_disabled) &&
+        (!this->valve_cycle_complete_(valve_of_interest) || include_complete)) {
+      return valve_of_interest;
+    }
+  }
+  return nullopt;
 }
 
 optional<size_t> Sprinkler::next_valve_number_in_cycle_(const optional<size_t> first_valve) {
-  if (this->reverse_sw_ != nullptr) {
-    if (this->reverse_sw_->state) {
-      return this->previous_enabled_incomplete_valve_number_(first_valve);
-    }
+  if (this->reverse()) {
+    return this->previous_valve_number_(first_valve, false, false);
   }
-  return this->next_enabled_incomplete_valve_number_(first_valve);
+  return this->next_valve_number_(first_valve, false, false);
 }
 
-void Sprinkler::load_next_valve_run_request_(optional<size_t> first_valve) {
+void Sprinkler::load_next_valve_run_request_(const optional<size_t> first_valve) {
   if (this->next_req_.has_request()) {
     if (!this->next_req_.run_duration()) {  // ensure the run duration is set correctly for consumption later on
       this->next_req_.set_run_duration(this->valve_run_duration_adjusted(this->next_req_.valve()));
@@ -988,58 +1312,37 @@ void Sprinkler::load_next_valve_run_request_(optional<size_t> first_valve) {
     return;  // there is already a request pending
   } else if (this->queue_enabled() && !this->queued_valves_.empty()) {
     this->next_req_.set_valve(this->queued_valves_.back().valve_number);
+    this->next_req_.set_request_from(QUEUE);
     if (this->queued_valves_.back().run_duration) {
       this->next_req_.set_run_duration(this->queued_valves_.back().run_duration);
-    } else {
+      this->queued_valves_.pop_back();
+    } else if (this->multiplier()) {
       this->next_req_.set_run_duration(this->valve_run_duration_adjusted(this->queued_valves_.back().valve_number));
+      this->queued_valves_.pop_back();
+    } else {
+      this->next_req_.reset();
     }
-    this->queued_valves_.pop_back();
-  } else if (this->auto_adv_sw_ != nullptr) {
-    if (this->auto_adv_sw_->state) {
-      if (this->next_valve_number_in_cycle_(first_valve).has_value()) {
-        // if there is another valve to run as a part of a cycle, load that
-        this->next_req_.set_valve(this->next_valve_number_in_cycle_(first_valve).value_or(0));
+  } else if (this->auto_advance() && this->multiplier()) {
+    if (this->next_valve_number_in_cycle_(first_valve).has_value()) {
+      // if there is another valve to run as a part of a cycle, load that
+      this->next_req_.set_valve(this->next_valve_number_in_cycle_(first_valve).value_or(0));
+      this->next_req_.set_request_from(CYCLE);
+      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);
+      // 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...
+        this->next_req_.set_valve(this->next_valve_number_in_cycle_().value_or(0));
+        this->next_req_.set_request_from(CYCLE);
         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->target_repeats_.value_or(0))) {
-        ESP_LOGD(TAG, "Repeating - starting cycle %u of %u", this->repeat_count_ + 1,
-                 this->target_repeats_.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_();
-        this->next_req_.set_valve(this->next_valve_number_in_cycle_(first_valve).value_or(0));
-        this->next_req_.set_run_duration(
-            this->valve_run_duration_adjusted(this->next_valve_number_in_cycle_(first_valve).value_or(0)));
+            this->valve_run_duration_adjusted(this->next_valve_number_in_cycle_().value_or(0)));
       }
     }
   }
 }
 
-optional<size_t> Sprinkler::next_enabled_incomplete_valve_number_(const optional<size_t> first_valve) {
-  auto new_valve_number = this->next_valve_number_(first_valve.value_or(this->number_of_valves() - 1));
-
-  while (new_valve_number != first_valve.value_or(this->number_of_valves() - 1)) {
-    if (this->valve_is_enabled_(new_valve_number) && (!this->valve_cycle_complete_(new_valve_number))) {
-      return new_valve_number;
-    } else {
-      new_valve_number = this->next_valve_number_(new_valve_number);
-    }
-  }
-  return nullopt;
-}
-
-optional<size_t> Sprinkler::previous_enabled_incomplete_valve_number_(const optional<size_t> first_valve) {
-  auto new_valve_number = this->previous_valve_number_(first_valve.value_or(0));
-
-  while (new_valve_number != first_valve.value_or(0)) {
-    if (this->valve_is_enabled_(new_valve_number) && (!this->valve_cycle_complete_(new_valve_number))) {
-      return new_valve_number;
-    } else {
-      new_valve_number = this->previous_valve_number_(new_valve_number);
-    }
-  }
-  return nullopt;
-}
-
 bool Sprinkler::any_valve_is_enabled_() {
   for (size_t valve_number = 0; valve_number < this->number_of_valves(); valve_number++) {
     if (this->valve_is_enabled_(valve_number))
@@ -1058,8 +1361,9 @@ 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, "Starting valve %u for %u seconds, cycle %u of %u", req->valve(), run_duration,
-               this->repeat_count_ + 1, this->target_repeats_.value_or(0) + 1);
+      ESP_LOGD(TAG, "%s is starting valve %u for %u seconds, cycle %u of %u",
+               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);
       vo.set_controller(this);
       vo.set_valve(&this->valve_[req->valve()]);
@@ -1085,15 +1389,14 @@ void Sprinkler::all_valves_off_(const bool include_pump) {
 }
 
 void Sprinkler::prep_full_cycle_() {
-  if (this->auto_adv_sw_ != nullptr) {
-    if (!this->auto_adv_sw_->state) {
-      this->auto_adv_sw_->publish_state(true);
-    }
-  }
+  this->set_auto_advance(true);
+
   if (!this->any_valve_is_enabled_()) {
     for (auto &valve : this->valve_) {
       if (valve.enable_switch != nullptr) {
-        valve.enable_switch->publish_state(true);
+        if (!valve.enable_switch->state) {
+          valve.enable_switch->turn_on();
+        }
       }
     }
   }
@@ -1169,14 +1472,19 @@ void Sprinkler::fsm_transition_() {
 
 void Sprinkler::fsm_transition_from_shutdown_() {
   this->load_next_valve_run_request_();
-  this->active_req_.set_valve(this->next_req_.valve());
-  this->active_req_.set_run_duration(this->next_req_.run_duration());
-  this->next_req_.reset();
 
-  this->set_timer_duration_(sprinkler::TIMER_SM, this->active_req_.run_duration() - this->switching_delay_.value_or(0));
-  this->start_timer_(sprinkler::TIMER_SM);
-  this->start_valve_(&this->active_req_);
-  this->state_ = ACTIVE;
+  if (this->next_req_.has_request()) {  // there is a valve to run...
+    this->active_req_.set_valve(this->next_req_.valve());
+    this->active_req_.set_request_from(this->next_req_.request_is_from());
+    this->active_req_.set_run_duration(this->next_req_.run_duration());
+    this->next_req_.reset();
+
+    this->set_timer_duration_(sprinkler::TIMER_SM,
+                              this->active_req_.run_duration() - this->switching_delay_.value_or(0));
+    this->start_timer_(sprinkler::TIMER_SM);
+    this->start_valve_(&this->active_req_);
+    this->state_ = ACTIVE;
+  }
 }
 
 void Sprinkler::fsm_transition_from_valve_run_() {
@@ -1186,7 +1494,9 @@ void Sprinkler::fsm_transition_from_valve_run_() {
   }
 
   if (!this->timer_active_(sprinkler::TIMER_SM)) {  // only flag the valve as "complete" if the timer finished
-    this->mark_valve_cycle_complete_(this->active_req_.valve());
+    if ((this->active_req_.request_is_from() == CYCLE) || (this->active_req_.request_is_from() == USER)) {
+      this->mark_valve_cycle_complete_(this->active_req_.valve());
+    }
   } else {
     ESP_LOGD(TAG, "Valve cycle interrupted - NOT flagging valve as complete and stopping current valve");
     for (auto &vo : this->valve_op_) {
@@ -1201,6 +1511,7 @@ void Sprinkler::fsm_transition_from_valve_run_() {
         this->valve_pump_switch(this->active_req_.valve()) == this->valve_pump_switch(this->next_req_.valve());
 
     this->active_req_.set_valve(this->next_req_.valve());
+    this->active_req_.set_request_from(this->next_req_.request_is_from());
     this->active_req_.set_run_duration(this->next_req_.run_duration());
     this->next_req_.reset();
 
@@ -1230,6 +1541,22 @@ void Sprinkler::fsm_transition_to_shutdown_() {
   this->start_timer_(sprinkler::TIMER_SM);
 }
 
+std::string Sprinkler::req_as_str_(SprinklerValveRunRequestOrigin origin) {
+  switch (origin) {
+    case USER:
+      return "USER";
+
+    case CYCLE:
+      return "CYCLE";
+
+    case QUEUE:
+      return "QUEUE";
+
+    default:
+      return "UNKNOWN";
+  }
+}
+
 std::string Sprinkler::state_as_str_(SprinklerState state) {
   switch (state) {
     case IDLE:
@@ -1300,8 +1627,8 @@ void Sprinkler::dump_config() {
   if (this->manual_selection_delay_.has_value()) {
     ESP_LOGCONFIG(TAG, "  Manual Selection Delay: %u seconds", this->manual_selection_delay_.value_or(0));
   }
-  if (this->target_repeats_.has_value()) {
-    ESP_LOGCONFIG(TAG, "  Repeat Cycles: %u times", this->target_repeats_.value_or(0));
+  if (this->repeat().has_value()) {
+    ESP_LOGCONFIG(TAG, "  Repeat Cycles: %u times", this->repeat().value_or(0));
   }
   if (this->start_delay_) {
     if (this->start_delay_is_valve_delay_) {
@@ -1329,7 +1656,7 @@ void Sprinkler::dump_config() {
   for (size_t valve_number = 0; valve_number < this->number_of_valves(); valve_number++) {
     ESP_LOGCONFIG(TAG, "  Valve %u:", valve_number);
     ESP_LOGCONFIG(TAG, "    Name: %s", this->valve_name(valve_number));
-    ESP_LOGCONFIG(TAG, "    Run Duration: %u seconds", this->valve_[valve_number].run_duration);
+    ESP_LOGCONFIG(TAG, "    Run Duration: %u seconds", this->valve_run_duration(valve_number));
     if (this->valve_[valve_number].valve_switch.pulse_duration()) {
       ESP_LOGCONFIG(TAG, "    Pulse Duration: %u milliseconds",
                     this->valve_[valve_number].valve_switch.pulse_duration());
diff --git a/esphome/components/sprinkler/sprinkler.h b/esphome/components/sprinkler/sprinkler.h
index 625118d9e5..1b8c7e4528 100644
--- a/esphome/components/sprinkler/sprinkler.h
+++ b/esphome/components/sprinkler/sprinkler.h
@@ -3,6 +3,7 @@
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/hal.h"
+#include "esphome/components/number/number.h"
 #include "esphome/components/switch/switch.h"
 
 #include <vector>
@@ -10,6 +11,8 @@
 namespace esphome {
 namespace sprinkler {
 
+const std::string min_str = "min";
+
 enum SprinklerState : uint8_t {
   // NOTE: these states are used by both SprinklerValveOperator and Sprinkler (the controller)!
   IDLE,      // system/valve is off
@@ -24,7 +27,14 @@ enum SprinklerTimerIndex : uint8_t {
   TIMER_VALVE_SELECTION = 1,
 };
 
+enum SprinklerValveRunRequestOrigin : uint8_t {
+  USER,
+  CYCLE,
+  QUEUE,
+};
+
 class Sprinkler;                  // this component
+class SprinklerControllerNumber;  // number components that appear in the front end; based on number core
 class SprinklerControllerSwitch;  // switches that appear in the front end; based on switch core
 class SprinklerSwitch;            // switches representing any valve or pump; provides abstraction for latching valves
 class SprinklerValveOperator;     // manages all switching on/off of valves and associated pumps
@@ -76,6 +86,7 @@ struct SprinklerTimer {
 };
 
 struct SprinklerValve {
+  SprinklerControllerNumber *run_duration_number;
   SprinklerControllerSwitch *controller_switch;
   SprinklerControllerSwitch *enable_switch;
   SprinklerSwitch valve_switch;
@@ -88,6 +99,25 @@ struct SprinklerValve {
   std::unique_ptr<Automation<>> valve_turn_on_automation;
 };
 
+class SprinklerControllerNumber : public number::Number, public Component {
+ public:
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::HARDWARE; }
+
+  Trigger<float> *get_set_trigger() const { return set_trigger_; }
+  void set_initial_value(float initial_value) { initial_value_ = initial_value; }
+  void set_restore_value(bool restore_value) { this->restore_value_ = restore_value; }
+
+ protected:
+  void control(float value) override;
+  float initial_value_{NAN};
+  bool restore_value_{true};
+  Trigger<float> *set_trigger_ = new Trigger<float>();
+
+  ESPPreferenceObject pref_;
+};
+
 class SprinklerControllerSwitch : public switch_::Switch, public Component {
  public:
   SprinklerControllerSwitch();
@@ -96,27 +126,19 @@ class SprinklerControllerSwitch : public switch_::Switch, public Component {
   void dump_config() override;
 
   void set_state_lambda(std::function<optional<bool>()> &&f);
-  void set_restore_state(bool restore_state);
   Trigger<> *get_turn_on_trigger() const;
   Trigger<> *get_turn_off_trigger() const;
-  void set_optimistic(bool optimistic);
-  void set_assumed_state(bool assumed_state);
   void loop() override;
 
   float get_setup_priority() const override;
 
  protected:
-  bool assumed_state() override;
-
   void write_state(bool state) override;
 
   optional<std::function<optional<bool>()>> f_;
-  bool optimistic_{false};
-  bool assumed_state_{false};
   Trigger<> *turn_on_trigger_;
   Trigger<> *turn_off_trigger_;
   Trigger<> *prev_trigger_{nullptr};
-  bool restore_state_{false};
 };
 
 class SprinklerValveOperator {
@@ -160,6 +182,7 @@ class SprinklerValveRunRequest {
   SprinklerValveRunRequest(size_t valve_number, uint32_t run_duration, SprinklerValveOperator *valve_op);
   bool has_request();
   bool has_valve_operator();
+  void set_request_from(SprinklerValveRunRequestOrigin origin);
   void set_run_duration(uint32_t run_duration);
   void set_valve(size_t valve_number);
   void set_valve_operator(SprinklerValveOperator *valve_op);
@@ -168,12 +191,14 @@ class SprinklerValveRunRequest {
   size_t valve();
   optional<size_t> valve_as_opt();
   SprinklerValveOperator *valve_operator();
+  SprinklerValveRunRequestOrigin request_is_from();
 
  protected:
   bool has_valve_{false};
   size_t valve_number_{0};
   uint32_t run_duration_{0};
   SprinklerValveOperator *valve_op_{nullptr};
+  SprinklerValveRunRequestOrigin origin_{USER};
 };
 
 class Sprinkler : public Component, public EntityBase {
@@ -196,6 +221,11 @@ class Sprinkler : public Component, public EntityBase {
   void set_controller_auto_adv_switch(SprinklerControllerSwitch *auto_adv_switch);
   void set_controller_queue_enable_switch(SprinklerControllerSwitch *queue_enable_switch);
   void set_controller_reverse_switch(SprinklerControllerSwitch *reverse_switch);
+  void set_controller_standby_switch(SprinklerControllerSwitch *standby_switch);
+
+  /// configure important controller number components
+  void set_controller_multiplier_number(SprinklerControllerNumber *multiplier_number);
+  void set_controller_repeat_number(SprinklerControllerNumber *repeat_number);
 
   /// configure a valve's switch object and run duration. run_duration is time in seconds.
   void configure_valve_switch(size_t valve_number, switch_::Switch *valve_switch, uint32_t run_duration);
@@ -207,9 +237,18 @@ class Sprinkler : public Component, public EntityBase {
   void configure_valve_pump_switch_pulsed(size_t valve_number, switch_::Switch *pump_switch_off,
                                           switch_::Switch *pump_switch_on, uint32_t pulse_duration);
 
+  /// configure a valve's run duration number component
+  void configure_valve_run_duration_number(size_t valve_number, SprinklerControllerNumber *run_duration_number);
+
+  /// sets the multiplier value to '1 / divider' and sets repeat value to divider
+  void set_divider(optional<uint32_t> divider);
+
   /// value multiplied by configured run times -- used to extend or shorten the cycle
   void set_multiplier(optional<float> multiplier);
 
+  /// enable/disable skipping of disabled valves by the next and previous actions
+  void set_next_prev_ignore_disabled_valves(bool ignore_disabled);
+
   /// set how long the pump should start after the valve (when the pump is starting)
   void set_pump_start_delay(uint32_t start_delay);
 
@@ -250,6 +289,9 @@ class Sprinkler : public Component, public EntityBase {
   /// if reverse is true, controller will iterate through all enabled valves in reverse (descending) order
   void set_reverse(bool reverse);
 
+  /// if standby is true, controller will refuse to activate any valves
+  void set_standby(bool standby);
+
   /// returns valve_number's run duration in seconds
   uint32_t valve_run_duration(size_t valve_number);
 
@@ -274,6 +316,9 @@ class Sprinkler : public Component, public EntityBase {
   /// returns true if reverse is enabled
   bool reverse();
 
+  /// returns true if standby is enabled
+  bool standby();
+
   /// starts the controller from the first valve in the queue and disables auto_advance.
   /// if the queue is empty, does nothing.
   void start_from_queue();
@@ -283,7 +328,7 @@ class Sprinkler : public Component, public EntityBase {
   void start_full_cycle();
 
   /// activates a single valve and disables auto_advance.
-  void start_single_valve(optional<size_t> valve_number);
+  void start_single_valve(optional<size_t> valve_number, optional<uint32_t> run_duration = nullopt);
 
   /// adds a valve into the queue. queued valves have priority over valves to be run as a part of a full cycle.
   /// NOTE: queued valves will always run, regardless of auto-advance and/or valve enable switches.
@@ -316,6 +361,9 @@ class Sprinkler : public Component, public EntityBase {
   /// returns a pointer to a valve's name string object; returns nullptr if valve_number is invalid
   const char *valve_name(size_t valve_number);
 
+  /// returns what invoked the valve that is currently active, if any. check with 'has_value()'
+  optional<SprinklerValveRunRequestOrigin> active_valve_request_is_from();
+
   /// returns the number of the valve that is currently active, if any. check with 'has_value()'
   optional<size_t> active_valve();
 
@@ -341,8 +389,23 @@ class Sprinkler : public Component, public EntityBase {
   /// switches on/off a pump "safely" by checking that the new state will not conflict with another controller
   void set_pump_state(SprinklerSwitch *pump_switch, bool state);
 
-  /// returns the amount of time remaining in seconds for the active valve, if any. check with 'has_value()'
-  optional<uint32_t> time_remaining();
+  /// returns the amount of time in seconds required for all valves
+  uint32_t total_cycle_time_all_valves();
+
+  /// returns the amount of time in seconds required for all enabled valves
+  uint32_t total_cycle_time_enabled_valves();
+
+  /// returns the amount of time in seconds required for all enabled & incomplete valves, not including the active valve
+  uint32_t total_cycle_time_enabled_incomplete_valves();
+
+  /// returns the amount of time in seconds required for all valves in the queue
+  uint32_t total_queue_time();
+
+  /// returns the amount of time remaining in seconds for the active valve, if any
+  optional<uint32_t> time_remaining_active_valve();
+
+  /// returns the amount of time remaining in seconds for all valves remaining, including the active valve, if any
+  optional<uint32_t> time_remaining_current_operation();
 
   /// returns a pointer to a valve's control switch object
   SprinklerControllerSwitch *control_switch(size_t valve_number);
@@ -371,9 +434,13 @@ class Sprinkler : public Component, public EntityBase {
   /// returns true if valve's cycle is flagged as complete
   bool valve_cycle_complete_(size_t valve_number);
 
-  /// returns the number of the next/previous valve in the vector
-  size_t next_valve_number_(size_t first_valve);
-  size_t previous_valve_number_(size_t first_valve);
+  /// returns the number of the next valve in the vector or nullopt if no valves match criteria
+  optional<size_t> next_valve_number_(optional<size_t> first_valve = nullopt, bool include_disabled = true,
+                                      bool include_complete = true);
+
+  /// returns the number of the previous valve in the vector or nullopt if no valves match criteria
+  optional<size_t> previous_valve_number_(optional<size_t> first_valve = nullopt, bool include_disabled = true,
+                                          bool include_complete = true);
 
   /// returns the number of the next valve that should be activated in a full cycle.
   ///  if no valve is next (cycle is complete), returns no value (check with 'has_value()')
@@ -385,11 +452,6 @@ class Sprinkler : public Component, public EntityBase {
   ///  if no valve is next (for example, a full cycle is complete), next_req_ is reset via reset().
   void load_next_valve_run_request_(optional<size_t> first_valve = nullopt);
 
-  /// returns the number of the next/previous valve that should be activated.
-  ///  if no valve is next (cycle is complete), returns no value (check with 'has_value()')
-  optional<size_t> next_enabled_incomplete_valve_number_(optional<size_t> first_valve);
-  optional<size_t> previous_enabled_incomplete_valve_number_(optional<size_t> first_valve);
-
   /// returns true if any valve is enabled
   bool any_valve_is_enabled_();
 
@@ -424,7 +486,10 @@ class Sprinkler : public Component, public EntityBase {
   /// starts up the system from IDLE state
   void fsm_transition_to_shutdown_();
 
-  /// return the current FSM state as a string
+  /// return the specified SprinklerValveRunRequestOrigin as a string
+  std::string req_as_str_(SprinklerValveRunRequestOrigin origin);
+
+  /// return the specified SprinklerState state as a string
   std::string state_as_str_(SprinklerState state);
 
   /// Start/cancel/get status of valve timers
@@ -446,6 +511,9 @@ class Sprinkler : public Component, public EntityBase {
   /// Maximum allowed queue size
   const uint8_t max_queue_size_{100};
 
+  /// When set to true, the next and previous actions will skip disabled valves
+  bool next_prev_ignore_disabled_{false};
+
   /// Pump should be off during valve_open_delay interval
   bool pump_switch_off_during_valve_open_delay_{false};
 
@@ -518,12 +586,19 @@ class Sprinkler : public Component, public EntityBase {
   SprinklerControllerSwitch *controller_sw_{nullptr};
   SprinklerControllerSwitch *queue_enable_sw_{nullptr};
   SprinklerControllerSwitch *reverse_sw_{nullptr};
+  SprinklerControllerSwitch *standby_sw_{nullptr};
+
+  /// Number components we'll present to the front end
+  SprinklerControllerNumber *multiplier_number_{nullptr};
+  SprinklerControllerNumber *repeat_number_{nullptr};
 
   std::unique_ptr<ShutdownAction<>> sprinkler_shutdown_action_;
+  std::unique_ptr<ShutdownAction<>> sprinkler_standby_shutdown_action_;
   std::unique_ptr<ResumeOrStartAction<>> sprinkler_resumeorstart_action_;
 
   std::unique_ptr<Automation<>> sprinkler_turn_off_automation_;
   std::unique_ptr<Automation<>> sprinkler_turn_on_automation_;
+  std::unique_ptr<Automation<>> sprinkler_standby_turn_on_automation_;
 };
 
 }  // namespace sprinkler

From 8e1430243e4955a711db2c40a2543f781a51408a Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Wed, 22 Feb 2023 15:40:20 -0800
Subject: [PATCH 610/838] fix parity (#4476)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 esphome/components/wiegand/wiegand.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/esphome/components/wiegand/wiegand.cpp b/esphome/components/wiegand/wiegand.cpp
index 67558da731..c4e834c85a 100644
--- a/esphome/components/wiegand/wiegand.cpp
+++ b/esphome/components/wiegand/wiegand.cpp
@@ -38,8 +38,8 @@ void Wiegand::setup() {
 bool check_eparity(uint64_t value, int start, int length) {
   int parity = 0;
   uint64_t mask = 1LL << start;
-  for (int i = 0; i <= length; i++, mask <<= 1) {
-    if (value & i)
+  for (int i = 0; i < length; i++, mask <<= 1) {
+    if (value & mask)
       parity++;
   }
   return !(parity & 1);
@@ -48,8 +48,8 @@ bool check_eparity(uint64_t value, int start, int length) {
 bool check_oparity(uint64_t value, int start, int length) {
   int parity = 0;
   uint64_t mask = 1LL << start;
-  for (int i = 0; i <= length; i++, mask <<= 1) {
-    if (value & i)
+  for (int i = 0; i < length; i++, mask <<= 1) {
+    if (value & mask)
       parity++;
   }
   return parity & 1;

From 91e037346bc23019d7a57d7d787cbb2e560dc1e5 Mon Sep 17 00:00:00 2001
From: Shreyas Karnik <311217+shreyaskarnik@users.noreply.github.com>
Date: Wed, 22 Feb 2023 16:37:23 -0800
Subject: [PATCH 611/838] add person sensor (SEN21231) from usefulsensors
 (#4454)

* add person sensor (SEN21231) from usefulsensors

* add person sensor (SEN21231) from usefulsensors

* change file mode

* fix tests

* fix tests

* rollback un-intended changes

* Update esphome/components/sen21231/sen21231.cpp

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/sen21231/sen21231.cpp

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/sen21231/sen21231.cpp

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/sen21231/sen21231.cpp

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/sen21231/sen21231.cpp

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/sen21231/sen21231.h

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/sen21231/sensor.py

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/sen21231/sensor.py

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/sen21231/sensor.py

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/sen21231/sensor.py

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* remove unused import

* Update esphome/components/sen21231/sen21231.h

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/sen21231/sensor.py

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/sen21231/sensor.py

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/sen21231/sen21231.h

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update esphome/components/sen21231/sen21231.h

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* remove unused import

* Update sen21231.h

* lint changes

* linting

* linting

* Update sen21231.h

* Update sen21231.cpp linting

* linting fixes

* fix codeowners

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                               |  1 +
 esphome/components/sen21231/__init__.py  |  0
 esphome/components/sen21231/sen21231.cpp | 32 ++++++++++
 esphome/components/sen21231/sen21231.h   | 77 ++++++++++++++++++++++++
 esphome/components/sen21231/sensor.py    | 24 ++++++++
 tests/test1.yaml                         |  4 +-
 6 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 esphome/components/sen21231/__init__.py
 create mode 100644 esphome/components/sen21231/sen21231.cpp
 create mode 100644 esphome/components/sen21231/sen21231.h
 create mode 100644 esphome/components/sen21231/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index 79c9c4f94b..d24a19adb1 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -210,6 +210,7 @@ esphome/components/sdm_meter/* @jesserockz @polyfaces
 esphome/components/sdp3x/* @Azimath
 esphome/components/selec_meter/* @sourabhjaiswal
 esphome/components/select/* @esphome/core
+esphome/components/sen21231/* @shreyaskarnik
 esphome/components/sen5x/* @martgras
 esphome/components/sensirion_common/* @martgras
 esphome/components/sensor/* @esphome/core
diff --git a/esphome/components/sen21231/__init__.py b/esphome/components/sen21231/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/sen21231/sen21231.cpp b/esphome/components/sen21231/sen21231.cpp
new file mode 100644
index 0000000000..aa123dff62
--- /dev/null
+++ b/esphome/components/sen21231/sen21231.cpp
@@ -0,0 +1,32 @@
+#include "sen21231.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace sen21231_sensor {
+
+static const char *const TAG = "sen21231_sensor.sensor";
+
+void Sen21231Sensor::update() { this->read_data_(); }
+
+void Sen21231Sensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "SEN21231:");
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication with SEN21231 failed!");
+  }
+  ESP_LOGI(TAG, "SEN21231: %s", this->is_failed() ? "FAILED" : "OK");
+  LOG_UPDATE_INTERVAL(this);
+}
+
+void Sen21231Sensor::read_data_() {
+  person_sensor_results_t results;
+  this->read_bytes(PERSON_SENSOR_I2C_ADDRESS, (uint8_t *) &results, sizeof(results));
+  ESP_LOGD(TAG, "SEN21231: %d faces detected", results.num_faces);
+  this->publish_state(results.num_faces);
+  if (results.num_faces == 1) {
+    ESP_LOGD(TAG, "SEN21231: is facing towards camera: %d", results.faces[0].is_facing);
+  }
+}
+
+}  // namespace sen21231_sensor
+}  // namespace esphome
diff --git a/esphome/components/sen21231/sen21231.h b/esphome/components/sen21231/sen21231.h
new file mode 100644
index 0000000000..b4d540df55
--- /dev/null
+++ b/esphome/components/sen21231/sen21231.h
@@ -0,0 +1,77 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+// ref:
+// https://github.com/usefulsensors/person_sensor_pico_c/blob/main/person_sensor.h
+
+namespace esphome {
+namespace sen21231_sensor {
+// The I2C address of the person sensor board.
+static const uint8_t PERSON_SENSOR_I2C_ADDRESS = 0x62;
+static const uint8_t PERSON_SENSOR_REG_MODE = 0x01;
+static const uint8_t PERSON_SENSOR_REG_ENABLE_ID = 0x02;
+static const uint8_t PERSON_SENSOR_REG_SINGLE_SHOT = 0x03;
+static const uint8_t PERSON_SENSOR_REG_CALIBRATE_ID = 0x04;
+static const uint8_t PERSON_SENSOR_REG_PERSIST_IDS = 0x05;
+static const uint8_t PERSON_SENSOR_REG_ERASE_IDS = 0x06;
+static const uint8_t PERSON_SENSOR_REG_DEBUG_MODE = 0x07;
+
+static const uint8_t PERSON_SENSOR_MAX_FACES_COUNT = 4;
+static const uint8_t PERSON_SENSOR_MAX_IDS_COUNT = 7;
+
+// The results returned from the sensor have a short header providing
+// information about the length of the data packet:
+//   reserved: Currently unused bytes.
+//   data_size: Length of the entire packet, excluding the header and
+//   checksum.
+//     For version 1.0 of the sensor, this should be 40.
+using person_sensor_results_header_t = struct {
+  uint8_t reserved[2];  // Bytes 0-1.
+  uint16_t data_size;   // Bytes 2-3.
+};
+
+// Each face found has a set of information associated with it:
+//   box_confidence: How certain we are we have found a face, from 0 to 255.
+//   box_left: X coordinate of the left side of the box, from 0 to 255.
+//   box_top: Y coordinate of the top edge of the box, from 0 to 255.
+//   box_width: Width of the box, where 255 is the full view port size.
+//   box_height: Height of the box, where 255 is the full view port size.
+//   id_confidence: How sure the sensor is about the recognition result.
+//   id: Numerical ID assigned to this face.
+//   is_looking_at: Whether the person is facing the camera, 0 or 1.
+using person_sensor_face_t = struct __attribute__((__packed__)) {
+  uint8_t box_confidence;  // Byte 1.
+  uint8_t box_left;        // Byte 2.
+  uint8_t box_top;         // Byte 3.
+  uint8_t box_right;       // Byte 4.
+  uint8_t box_bottom;      // Byte 5.
+  int8_t id_confidence;    // Byte 6.
+  int8_t id;               // Byte 7
+  uint8_t is_facing;       // Byte 8.
+};
+
+// This is the full structure of the packet returned over the wire from the
+// sensor when we do an I2C read from the peripheral address.
+// The checksum should be the CRC16 of bytes 0 to 38. You shouldn't need to
+// verify this in practice, but we found it useful during our own debugging.
+using person_sensor_results_t = struct __attribute__((__packed__)) {
+  person_sensor_results_header_t header;                      // Bytes 0-4.
+  int8_t num_faces;                                           // Byte 5.
+  person_sensor_face_t faces[PERSON_SENSOR_MAX_FACES_COUNT];  // Bytes 6-37.
+  uint16_t checksum;                                          // Bytes 38-39.
+};
+
+class Sen21231Sensor : public sensor::Sensor, public PollingComponent, public i2c::I2CDevice {
+ public:
+  void update() override;
+  void dump_config() override;
+
+ protected:
+  void read_data_();
+};
+
+}  // namespace sen21231_sensor
+}  // namespace esphome
diff --git a/esphome/components/sen21231/sensor.py b/esphome/components/sen21231/sensor.py
new file mode 100644
index 0000000000..fb1dc19278
--- /dev/null
+++ b/esphome/components/sen21231/sensor.py
@@ -0,0 +1,24 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import ICON_MOTION_SENSOR
+
+CODEOWNERS = ["@shreyaskarnik"]
+DEPENDENCIES = ["i2c"]
+
+sen21231_sensor_ns = cg.esphome_ns.namespace("sen21231_sensor")
+Sen21231Sensor = sen21231_sensor_ns.class_(
+    "Sen21231Sensor", cg.PollingComponent, i2c.I2CDevice
+)
+
+CONFIG_SCHEMA = (
+    sensor.sensor_schema(Sen21231Sensor, icon=ICON_MOTION_SENSOR, accuracy_decimals=1)
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x62))
+)
+
+
+async def to_code(config):
+    var = await sensor.new_sensor(config)
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
diff --git a/tests/test1.yaml b/tests/test1.yaml
index bdc6da3406..d43490c8cc 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1221,7 +1221,9 @@ sensor:
       name: "Still Energy"
     detection_distance:
       name: "Distance Detection"
-
+  - platform: sen21231
+    name: "Person Sensor"
+    i2c_id: i2c_bus
 esp32_touch:
   setup_mode: false
   iir_filter: 10ms

From f98d93efa8b754210e931943eb8ffc5f9c174646 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 23 Feb 2023 13:38:45 +1300
Subject: [PATCH 612/838] Fix multiple remote_receivers with triggers (#4477)

---
 esphome/components/remote_base/__init__.py     | 9 ++++++---
 esphome/components/remote_receiver/__init__.py | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/esphome/components/remote_base/__init__.py b/esphome/components/remote_base/__init__.py
index c3149ce430..c5c8921e20 100644
--- a/esphome/components/remote_base/__init__.py
+++ b/esphome/components/remote_base/__init__.py
@@ -79,7 +79,9 @@ def register_trigger(name, type, data_type):
     validator = automation.validate_automation(
         {
             cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(type),
-            cv.GenerateID(CONF_RECEIVER_ID): cv.use_id(RemoteReceiverBase),
+            cv.Optional(CONF_RECEIVER_ID): cv.invalid(
+                "This has been removed in ESPHome 2022.3.0 and the trigger attaches directly to the parent receiver."
+            ),
         }
     )
     registerer = TRIGGER_REGISTRY.register(f"on_{name}", validator)
@@ -87,7 +89,6 @@ def register_trigger(name, type, data_type):
     def decorator(func):
         async def new_func(config):
             var = cg.new_Pvariable(config[CONF_TRIGGER_ID])
-            await register_listener(var, config)
             await coroutine(func)(var, config)
             await automation.build_automation(var, [(data_type, "x")], config)
             return var
@@ -223,10 +224,12 @@ async def build_binary_sensor(full_config):
 
 
 async def build_triggers(full_config):
+    triggers = []
     for key in TRIGGER_REGISTRY:
         for config in full_config.get(key, []):
             func = TRIGGER_REGISTRY[key][0]
-            await func(config)
+            triggers.append(await func(config))
+    return triggers
 
 
 async def build_dumpers(config):
diff --git a/esphome/components/remote_receiver/__init__.py b/esphome/components/remote_receiver/__init__.py
index 253204bd1a..1ed9161ec7 100644
--- a/esphome/components/remote_receiver/__init__.py
+++ b/esphome/components/remote_receiver/__init__.py
@@ -56,7 +56,9 @@ async def to_code(config):
     for dumper in dumpers:
         cg.add(var.register_dumper(dumper))
 
-    await remote_base.build_triggers(config)
+    triggers = await remote_base.build_triggers(config)
+    for trigger in triggers:
+        cg.add(var.register_listener(trigger))
     await cg.register_component(var, config)
 
     cg.add(var.set_tolerance(config[CONF_TOLERANCE]))

From 3a36d0b13f9e27a23ba48d232efcf207b7044082 Mon Sep 17 00:00:00 2001
From: konsulten <nordmarkclaes@gmail.com>
Date: Mon, 20 Feb 2023 03:48:59 +0100
Subject: [PATCH 613/838] BL0939 state_class set for energy sensors (#4463)

BL0939 was missing TOTAL_INCREASING for energy (kWh) thus it did not show as statistics in home assistant
---
 esphome/components/bl0939/sensor.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/esphome/components/bl0939/sensor.py b/esphome/components/bl0939/sensor.py
index bcc72ad61a..4c6e3ea4d9 100644
--- a/esphome/components/bl0939/sensor.py
+++ b/esphome/components/bl0939/sensor.py
@@ -9,6 +9,7 @@ from esphome.const import (
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_VOLTAGE,
     STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_TOTAL_INCREASING,
     UNIT_AMPERE,
     UNIT_KILOWATT_HOURS,
     UNIT_VOLT,
@@ -66,16 +67,19 @@ CONFIG_SCHEMA = (
                 unit_of_measurement=UNIT_KILOWATT_HOURS,
                 accuracy_decimals=3,
                 device_class=DEVICE_CLASS_ENERGY,
+                state_class=STATE_CLASS_TOTAL_INCREASING,
             ),
             cv.Optional(CONF_ENERGY_2): sensor.sensor_schema(
                 unit_of_measurement=UNIT_KILOWATT_HOURS,
                 accuracy_decimals=3,
                 device_class=DEVICE_CLASS_ENERGY,
+                state_class=STATE_CLASS_TOTAL_INCREASING,
             ),
             cv.Optional(CONF_ENERGY_TOTAL): sensor.sensor_schema(
                 unit_of_measurement=UNIT_KILOWATT_HOURS,
                 accuracy_decimals=3,
                 device_class=DEVICE_CLASS_ENERGY,
+                state_class=STATE_CLASS_TOTAL_INCREASING,
             ),
         }
     )

From 069b5f81a00eac8a5fb06b2c97069792415d86a5 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Wed, 22 Feb 2023 15:40:20 -0800
Subject: [PATCH 614/838] fix parity (#4476)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 esphome/components/wiegand/wiegand.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/esphome/components/wiegand/wiegand.cpp b/esphome/components/wiegand/wiegand.cpp
index 67558da731..c4e834c85a 100644
--- a/esphome/components/wiegand/wiegand.cpp
+++ b/esphome/components/wiegand/wiegand.cpp
@@ -38,8 +38,8 @@ void Wiegand::setup() {
 bool check_eparity(uint64_t value, int start, int length) {
   int parity = 0;
   uint64_t mask = 1LL << start;
-  for (int i = 0; i <= length; i++, mask <<= 1) {
-    if (value & i)
+  for (int i = 0; i < length; i++, mask <<= 1) {
+    if (value & mask)
       parity++;
   }
   return !(parity & 1);
@@ -48,8 +48,8 @@ bool check_eparity(uint64_t value, int start, int length) {
 bool check_oparity(uint64_t value, int start, int length) {
   int parity = 0;
   uint64_t mask = 1LL << start;
-  for (int i = 0; i <= length; i++, mask <<= 1) {
-    if (value & i)
+  for (int i = 0; i < length; i++, mask <<= 1) {
+    if (value & mask)
       parity++;
   }
   return parity & 1;

From 7f46d9e0f976d20e881e80bb90280cb4f7c9fb4f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 23 Feb 2023 13:38:45 +1300
Subject: [PATCH 615/838] Fix multiple remote_receivers with triggers (#4477)

---
 esphome/components/remote_base/__init__.py     | 9 ++++++---
 esphome/components/remote_receiver/__init__.py | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/esphome/components/remote_base/__init__.py b/esphome/components/remote_base/__init__.py
index c3149ce430..c5c8921e20 100644
--- a/esphome/components/remote_base/__init__.py
+++ b/esphome/components/remote_base/__init__.py
@@ -79,7 +79,9 @@ def register_trigger(name, type, data_type):
     validator = automation.validate_automation(
         {
             cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(type),
-            cv.GenerateID(CONF_RECEIVER_ID): cv.use_id(RemoteReceiverBase),
+            cv.Optional(CONF_RECEIVER_ID): cv.invalid(
+                "This has been removed in ESPHome 2022.3.0 and the trigger attaches directly to the parent receiver."
+            ),
         }
     )
     registerer = TRIGGER_REGISTRY.register(f"on_{name}", validator)
@@ -87,7 +89,6 @@ def register_trigger(name, type, data_type):
     def decorator(func):
         async def new_func(config):
             var = cg.new_Pvariable(config[CONF_TRIGGER_ID])
-            await register_listener(var, config)
             await coroutine(func)(var, config)
             await automation.build_automation(var, [(data_type, "x")], config)
             return var
@@ -223,10 +224,12 @@ async def build_binary_sensor(full_config):
 
 
 async def build_triggers(full_config):
+    triggers = []
     for key in TRIGGER_REGISTRY:
         for config in full_config.get(key, []):
             func = TRIGGER_REGISTRY[key][0]
-            await func(config)
+            triggers.append(await func(config))
+    return triggers
 
 
 async def build_dumpers(config):
diff --git a/esphome/components/remote_receiver/__init__.py b/esphome/components/remote_receiver/__init__.py
index 253204bd1a..1ed9161ec7 100644
--- a/esphome/components/remote_receiver/__init__.py
+++ b/esphome/components/remote_receiver/__init__.py
@@ -56,7 +56,9 @@ async def to_code(config):
     for dumper in dumpers:
         cg.add(var.register_dumper(dumper))
 
-    await remote_base.build_triggers(config)
+    triggers = await remote_base.build_triggers(config)
+    for trigger in triggers:
+        cg.add(var.register_listener(trigger))
     await cg.register_component(var, config)
 
     cg.add(var.set_tolerance(config[CONF_TOLERANCE]))

From 2e1b35959f448f5439a2b736ccb280bb5abab589 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 23 Feb 2023 13:42:02 +1300
Subject: [PATCH 616/838] Bump version to 2023.2.4

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

diff --git a/esphome/const.py b/esphome/const.py
index bcac2b105e..4d3a5c61e5 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.2.3"
+__version__ = "2023.2.4"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 23f47d0ad29a3641217020a64b0ccef0aed6a605 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 23 Feb 2023 14:22:39 +1300
Subject: [PATCH 617/838] Initial stab at importing idf components (#4000)

* Initial stab at importing idf components

* Handle repo with multiple components
Allow components directly from yaml

* Actually use the refresh config var

* Update esphome/components/esp32/__init__.py
---
 esphome/components/esp32/__init__.py          | 86 ++++++++++++++++++-
 esphome/components/esp32/const.py             |  5 ++
 .../external_components/__init__.py           | 74 ++--------------
 esphome/config_validation.py                  | 63 ++++++++++++++
 esphome/const.py                              |  3 +
 5 files changed, 163 insertions(+), 68 deletions(-)

diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index f30fa9a7b2..0f16fc9293 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -4,29 +4,43 @@ from pathlib import Path
 import logging
 import os
 
-from esphome.helpers import copy_file_if_changed, write_file_if_changed
+from esphome.helpers import copy_file_if_changed, write_file_if_changed, mkdir_p
 from esphome.const import (
     CONF_BOARD,
+    CONF_COMPONENTS,
     CONF_FRAMEWORK,
+    CONF_NAME,
     CONF_SOURCE,
     CONF_TYPE,
     CONF_VARIANT,
     CONF_VERSION,
     CONF_ADVANCED,
+    CONF_REFRESH,
+    CONF_PATH,
+    CONF_URL,
+    CONF_REF,
     CONF_IGNORE_EFUSE_MAC_CRC,
     KEY_CORE,
     KEY_FRAMEWORK_VERSION,
     KEY_TARGET_FRAMEWORK,
     KEY_TARGET_PLATFORM,
+    TYPE_GIT,
+    TYPE_LOCAL,
     __version__,
 )
-from esphome.core import CORE, HexInt
+from esphome.core import CORE, HexInt, TimePeriod
 import esphome.config_validation as cv
 import esphome.codegen as cg
+from esphome import git
 
 from .const import (  # noqa
     KEY_BOARD,
+    KEY_COMPONENTS,
     KEY_ESP32,
+    KEY_PATH,
+    KEY_REF,
+    KEY_REFRESH,
+    KEY_REPO,
     KEY_SDKCONFIG_OPTIONS,
     KEY_VARIANT,
     VARIANT_ESP32C3,
@@ -51,6 +65,7 @@ def set_core_data(config):
     if conf[CONF_TYPE] == FRAMEWORK_ESP_IDF:
         CORE.data[KEY_CORE][KEY_TARGET_FRAMEWORK] = "esp-idf"
         CORE.data[KEY_ESP32][KEY_SDKCONFIG_OPTIONS] = {}
+        CORE.data[KEY_ESP32][KEY_COMPONENTS] = {}
     elif conf[CONF_TYPE] == FRAMEWORK_ARDUINO:
         CORE.data[KEY_CORE][KEY_TARGET_FRAMEWORK] = "arduino"
     CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] = cv.Version.parse(
@@ -104,6 +119,21 @@ def add_idf_sdkconfig_option(name: str, value: SdkconfigValueType):
     CORE.data[KEY_ESP32][KEY_SDKCONFIG_OPTIONS][name] = value
 
 
+def add_idf_component(
+    name: str, repo: str, ref: str = None, path: str = None, refresh: TimePeriod = None
+):
+    """Add an esp-idf component to the project."""
+    if not CORE.using_esp_idf:
+        raise ValueError("Not an esp-idf project")
+    if name not in CORE.data[KEY_ESP32][KEY_COMPONENTS]:
+        CORE.data[KEY_ESP32][KEY_COMPONENTS][name] = {
+            KEY_REPO: repo,
+            KEY_REF: ref,
+            KEY_PATH: path,
+            KEY_REFRESH: refresh,
+        }
+
+
 def _format_framework_arduino_version(ver: cv.Version) -> str:
     # format the given arduino (https://github.com/espressif/arduino-esp32/releases) version to
     # a PIO platformio/framework-arduinoespressif32 value
@@ -270,6 +300,18 @@ ESP_IDF_FRAMEWORK_SCHEMA = cv.All(
                     cv.Optional(CONF_IGNORE_EFUSE_MAC_CRC, default=False): cv.boolean,
                 }
             ),
+            cv.Optional(CONF_COMPONENTS, default=[]): cv.ensure_list(
+                cv.Schema(
+                    {
+                        cv.Required(CONF_NAME): cv.string_strict,
+                        cv.Required(CONF_SOURCE): cv.SOURCE_SCHEMA,
+                        cv.Optional(CONF_PATH): cv.string,
+                        cv.Optional(CONF_REFRESH, default="1d"): cv.All(
+                            cv.string, cv.source_refresh
+                        ),
+                    }
+                )
+            ),
         }
     ),
     _esp_idf_check_versions,
@@ -372,6 +414,19 @@ async def to_code(config):
             ),
         )
 
+        for component in conf[CONF_COMPONENTS]:
+            source = component[CONF_SOURCE]
+            if source[CONF_TYPE] == TYPE_GIT:
+                add_idf_component(
+                    name=component[CONF_NAME],
+                    repo=source[CONF_URL],
+                    ref=source.get(CONF_REF),
+                    path=component.get(CONF_PATH),
+                    refresh=component[CONF_REFRESH],
+                )
+            elif source[CONF_TYPE] == TYPE_LOCAL:
+                _LOGGER.warning("Local components are not implemented yet.")
+
     elif conf[CONF_TYPE] == FRAMEWORK_ARDUINO:
         cg.add_platformio_option("framework", "arduino")
         cg.add_build_flag("-DUSE_ARDUINO")
@@ -468,6 +523,33 @@ def copy_files():
             __version__,
         )
 
+        if CORE.data[KEY_ESP32][KEY_COMPONENTS]:
+            import shutil
+
+            shutil.rmtree(CORE.relative_build_path("components"), ignore_errors=True)
+
+            components: dict = CORE.data[KEY_ESP32][KEY_COMPONENTS]
+
+            for name, component in components.items():
+
+                repo_dir, _ = git.clone_or_update(
+                    url=component[KEY_REPO],
+                    ref=component[KEY_REF],
+                    refresh=component[KEY_REFRESH],
+                    domain="idf_components",
+                )
+                mkdir_p(CORE.relative_build_path("components"))
+                component_dir = repo_dir
+                if component[KEY_PATH] is not None:
+                    component_dir = component_dir / component[KEY_PATH]
+
+                shutil.copytree(
+                    component_dir,
+                    CORE.relative_build_path(f"components/{name}"),
+                    dirs_exist_ok=True,
+                    ignore=shutil.ignore_patterns(".git", ".github"),
+                )
+
     dir = os.path.dirname(__file__)
     post_build_file = os.path.join(dir, "post_build.py.script")
     copy_file_if_changed(
diff --git a/esphome/components/esp32/const.py b/esphome/components/esp32/const.py
index d92b449ee9..d13df01d3a 100644
--- a/esphome/components/esp32/const.py
+++ b/esphome/components/esp32/const.py
@@ -4,6 +4,11 @@ KEY_ESP32 = "esp32"
 KEY_BOARD = "board"
 KEY_VARIANT = "variant"
 KEY_SDKCONFIG_OPTIONS = "sdkconfig_options"
+KEY_COMPONENTS = "components"
+KEY_REPO = "repo"
+KEY_REF = "ref"
+KEY_REFRESH = "refresh"
+KEY_PATH = "path"
 
 VARIANT_ESP32 = "ESP32"
 VARIANT_ESP32S2 = "ESP32S2"
diff --git a/esphome/components/external_components/__init__.py b/esphome/components/external_components/__init__.py
index 53fd337ed8..bbb703dc5c 100644
--- a/esphome/components/external_components/__init__.py
+++ b/esphome/components/external_components/__init__.py
@@ -1,90 +1,32 @@
-import re
 import logging
 from pathlib import Path
 
 import esphome.config_validation as cv
+from esphome import git, loader
 from esphome.const import (
     CONF_COMPONENTS,
+    CONF_EXTERNAL_COMPONENTS,
+    CONF_PASSWORD,
+    CONF_PATH,
     CONF_REF,
     CONF_REFRESH,
     CONF_SOURCE,
-    CONF_URL,
     CONF_TYPE,
-    CONF_EXTERNAL_COMPONENTS,
-    CONF_PATH,
+    CONF_URL,
     CONF_USERNAME,
-    CONF_PASSWORD,
+    TYPE_GIT,
+    TYPE_LOCAL,
 )
 from esphome.core import CORE
-from esphome import git, loader
 
 _LOGGER = logging.getLogger(__name__)
 
 DOMAIN = CONF_EXTERNAL_COMPONENTS
 
-TYPE_GIT = "git"
-TYPE_LOCAL = "local"
-
-
-GIT_SCHEMA = {
-    cv.Required(CONF_URL): cv.url,
-    cv.Optional(CONF_REF): cv.git_ref,
-    cv.Optional(CONF_USERNAME): cv.string,
-    cv.Optional(CONF_PASSWORD): cv.string,
-}
-LOCAL_SCHEMA = {
-    cv.Required(CONF_PATH): cv.directory,
-}
-
-
-def validate_source_shorthand(value):
-    if not isinstance(value, str):
-        raise cv.Invalid("Shorthand only for strings")
-    try:
-        return SOURCE_SCHEMA({CONF_TYPE: TYPE_LOCAL, CONF_PATH: value})
-    except cv.Invalid:
-        pass
-    # Regex for GitHub repo name with optional branch/tag
-    # Note: git allows other branch/tag names as well, but never seen them used before
-    m = re.match(
-        r"github://(?:([a-zA-Z0-9\-]+)/([a-zA-Z0-9\-\._]+)(?:@([a-zA-Z0-9\-_.\./]+))?|pr#([0-9]+))",
-        value,
-    )
-    if m is None:
-        raise cv.Invalid(
-            "Source is not a file system path, in expected github://username/name[@branch-or-tag] or github://pr#1234 format!"
-        )
-    if m.group(4):
-        conf = {
-            CONF_TYPE: TYPE_GIT,
-            CONF_URL: "https://github.com/esphome/esphome.git",
-            CONF_REF: f"pull/{m.group(4)}/head",
-        }
-    else:
-        conf = {
-            CONF_TYPE: TYPE_GIT,
-            CONF_URL: f"https://github.com/{m.group(1)}/{m.group(2)}.git",
-        }
-        if m.group(3):
-            conf[CONF_REF] = m.group(3)
-
-    return SOURCE_SCHEMA(conf)
-
-
-SOURCE_SCHEMA = cv.Any(
-    validate_source_shorthand,
-    cv.typed_schema(
-        {
-            TYPE_GIT: cv.Schema(GIT_SCHEMA),
-            TYPE_LOCAL: cv.Schema(LOCAL_SCHEMA),
-        }
-    ),
-)
-
 
 CONFIG_SCHEMA = cv.ensure_list(
     {
-        cv.Required(CONF_SOURCE): SOURCE_SCHEMA,
+        cv.Required(CONF_SOURCE): cv.SOURCE_SCHEMA,
         cv.Optional(CONF_REFRESH, default="1d"): cv.All(cv.string, cv.source_refresh),
         cv.Optional(CONF_COMPONENTS, default="all"): cv.Any(
             "all", cv.ensure_list(cv.string)
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 7440f71790..a46d14053b 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -39,6 +39,11 @@ from esphome.const import (
     CONF_UPDATE_INTERVAL,
     CONF_TYPE_ID,
     CONF_TYPE,
+    CONF_REF,
+    CONF_URL,
+    CONF_PATH,
+    CONF_USERNAME,
+    CONF_PASSWORD,
     ENTITY_CATEGORY_CONFIG,
     ENTITY_CATEGORY_DIAGNOSTIC,
     ENTITY_CATEGORY_NONE,
@@ -46,6 +51,8 @@ from esphome.const import (
     KEY_FRAMEWORK_VERSION,
     KEY_TARGET_FRAMEWORK,
     KEY_TARGET_PLATFORM,
+    TYPE_GIT,
+    TYPE_LOCAL,
 )
 from esphome.core import (
     CORE,
@@ -1820,3 +1827,59 @@ def suppress_invalid():
         yield
     except vol.Invalid:
         pass
+
+
+GIT_SCHEMA = {
+    Required(CONF_URL): url,
+    Optional(CONF_REF): git_ref,
+    Optional(CONF_USERNAME): string,
+    Optional(CONF_PASSWORD): string,
+}
+LOCAL_SCHEMA = {
+    Required(CONF_PATH): directory,
+}
+
+
+def validate_source_shorthand(value):
+    if not isinstance(value, str):
+        raise Invalid("Shorthand only for strings")
+    try:
+        return SOURCE_SCHEMA({CONF_TYPE: TYPE_LOCAL, CONF_PATH: value})
+    except Invalid:
+        pass
+    # Regex for GitHub repo name with optional branch/tag
+    # Note: git allows other branch/tag names as well, but never seen them used before
+    m = re.match(
+        r"github://(?:([a-zA-Z0-9\-]+)/([a-zA-Z0-9\-\._]+)(?:@([a-zA-Z0-9\-_.\./]+))?|pr#([0-9]+))",
+        value,
+    )
+    if m is None:
+        raise Invalid(
+            "Source is not a file system path, in expected github://username/name[@branch-or-tag] or github://pr#1234 format!"
+        )
+    if m.group(4):
+        conf = {
+            CONF_TYPE: TYPE_GIT,
+            CONF_URL: "https://github.com/esphome/esphome.git",
+            CONF_REF: f"pull/{m.group(4)}/head",
+        }
+    else:
+        conf = {
+            CONF_TYPE: TYPE_GIT,
+            CONF_URL: f"https://github.com/{m.group(1)}/{m.group(2)}.git",
+        }
+        if m.group(3):
+            conf[CONF_REF] = m.group(3)
+
+    return SOURCE_SCHEMA(conf)
+
+
+SOURCE_SCHEMA = Any(
+    validate_source_shorthand,
+    typed_schema(
+        {
+            TYPE_GIT: Schema(GIT_SCHEMA),
+            TYPE_LOCAL: Schema(LOCAL_SCHEMA),
+        }
+    ),
+)
diff --git a/esphome/const.py b/esphome/const.py
index bd593bbc80..d821a76b75 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -797,6 +797,9 @@ CONF_X_GRID = "x_grid"
 CONF_Y_GRID = "y_grid"
 CONF_ZERO = "zero"
 
+TYPE_GIT = "git"
+TYPE_LOCAL = "local"
+
 ENV_NOGITIGNORE = "ESPHOME_NOGITIGNORE"
 ENV_QUICKWIZARD = "ESPHOME_QUICKWIZARD"
 

From 350d4e5071c21ed3acc0fb6b4c6d571dfc35efd9 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Wed, 22 Feb 2023 17:31:35 -0800
Subject: [PATCH 618/838] add kuntze component (#4411)

* add kuntze component

* fixes

* more lint

---------

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 CODEOWNERS                            |   1 +
 esphome/components/kuntze/__init__.py |   0
 esphome/components/kuntze/kuntze.cpp  |  91 +++++++++++++++++++
 esphome/components/kuntze/kuntze.h    |  42 +++++++++
 esphome/components/kuntze/sensor.py   | 123 ++++++++++++++++++++++++++
 tests/test3.yaml                      |   6 ++
 tests/test5.yaml                      |   6 ++
 7 files changed, 269 insertions(+)
 create mode 100644 esphome/components/kuntze/__init__.py
 create mode 100644 esphome/components/kuntze/kuntze.cpp
 create mode 100644 esphome/components/kuntze/kuntze.h
 create mode 100644 esphome/components/kuntze/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index d24a19adb1..00f207862a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -119,6 +119,7 @@ esphome/components/json/* @OttoWinter
 esphome/components/kalman_combinator/* @Cat-Ion
 esphome/components/key_collector/* @ssieb
 esphome/components/key_provider/* @ssieb
+esphome/components/kuntze/* @ssieb
 esphome/components/lcd_menu/* @numo68
 esphome/components/ld2410/* @sebcaps
 esphome/components/ledc/* @OttoWinter
diff --git a/esphome/components/kuntze/__init__.py b/esphome/components/kuntze/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/kuntze/kuntze.cpp b/esphome/components/kuntze/kuntze.cpp
new file mode 100644
index 0000000000..e50dafca86
--- /dev/null
+++ b/esphome/components/kuntze/kuntze.cpp
@@ -0,0 +1,91 @@
+#include "kuntze.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace kuntze {
+
+static const char *const TAG = "kuntze";
+
+static const uint8_t CMD_READ_REG = 0x03;
+static const uint16_t REGISTER[] = {4136, 4160, 4680, 6000, 4688, 4728, 5832};
+
+void Kuntze::on_modbus_data(const std::vector<uint8_t> &data) {
+  auto get_16bit = [&](int i) -> uint16_t { return (uint16_t(data[i * 2]) << 8) | uint16_t(data[i * 2 + 1]); };
+
+  this->waiting_ = false;
+  ESP_LOGV(TAG, "Data: %s", hexencode(data).c_str());
+
+  float value = (float) get_16bit(0);
+  for (int i = 0; i < data[3]; i++)
+    value /= 10.0;
+  switch (this->state_) {
+    case 1:
+      ESP_LOGD(TAG, "pH=%.1f", value);
+      if (this->ph_sensor_ != nullptr)
+        this->ph_sensor_->publish_state(value);
+      break;
+    case 2:
+      ESP_LOGD(TAG, "temperature=%.1f", value);
+      if (this->temperature_sensor_ != nullptr)
+        this->temperature_sensor_->publish_state(value);
+      break;
+    case 3:
+      ESP_LOGD(TAG, "DIS1=%.1f", value);
+      if (this->dis1_sensor_ != nullptr)
+        this->dis1_sensor_->publish_state(value);
+      break;
+    case 4:
+      ESP_LOGD(TAG, "DIS2=%.1f", value);
+      if (this->dis2_sensor_ != nullptr)
+        this->dis2_sensor_->publish_state(value);
+      break;
+    case 5:
+      ESP_LOGD(TAG, "REDOX=%.1f", value);
+      if (this->redox_sensor_ != nullptr)
+        this->redox_sensor_->publish_state(value);
+      break;
+    case 6:
+      ESP_LOGD(TAG, "EC=%.1f", value);
+      if (this->ec_sensor_ != nullptr)
+        this->ec_sensor_->publish_state(value);
+      break;
+    case 7:
+      ESP_LOGD(TAG, "OCI=%.1f", value);
+      if (this->oci_sensor_ != nullptr)
+        this->oci_sensor_->publish_state(value);
+      break;
+  }
+  if (++this->state_ > 7)
+    this->state_ = 0;
+}
+
+void Kuntze::loop() {
+  uint32_t now = millis();
+  // timeout after 15 seconds
+  if (this->waiting_ && (now - this->last_send_ > 15000)) {
+    ESP_LOGW(TAG, "timed out waiting for response");
+    this->waiting_ = false;
+  }
+  if (this->waiting_ || (this->state_ == 0))
+    return;
+  this->last_send_ = now;
+  send(CMD_READ_REG, REGISTER[this->state_ - 1], 2);
+  this->waiting_ = true;
+}
+
+void Kuntze::update() { this->state_ = 1; }
+
+void Kuntze::dump_config() {
+  ESP_LOGCONFIG(TAG, "Kuntze:");
+  ESP_LOGCONFIG(TAG, "  Address: 0x%02X", this->address_);
+  LOG_SENSOR("", "pH", this->ph_sensor_);
+  LOG_SENSOR("", "temperature", this->temperature_sensor_);
+  LOG_SENSOR("", "DIS1", this->dis1_sensor_);
+  LOG_SENSOR("", "DIS2", this->dis2_sensor_);
+  LOG_SENSOR("", "REDOX", this->redox_sensor_);
+  LOG_SENSOR("", "EC", this->ec_sensor_);
+  LOG_SENSOR("", "OCI", this->oci_sensor_);
+}
+
+}  // namespace kuntze
+}  // namespace esphome
diff --git a/esphome/components/kuntze/kuntze.h b/esphome/components/kuntze/kuntze.h
new file mode 100644
index 0000000000..aad7c1cbbf
--- /dev/null
+++ b/esphome/components/kuntze/kuntze.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/modbus/modbus.h"
+
+namespace esphome {
+namespace kuntze {
+
+class Kuntze : public PollingComponent, public modbus::ModbusDevice {
+ public:
+  void set_ph_sensor(sensor::Sensor *ph_sensor) { ph_sensor_ = ph_sensor; }
+  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
+  void set_dis1_sensor(sensor::Sensor *dis1_sensor) { dis1_sensor_ = dis1_sensor; }
+  void set_dis2_sensor(sensor::Sensor *dis2_sensor) { dis2_sensor_ = dis2_sensor; }
+  void set_redox_sensor(sensor::Sensor *redox_sensor) { redox_sensor_ = redox_sensor; }
+  void set_ec_sensor(sensor::Sensor *ec_sensor) { ec_sensor_ = ec_sensor; }
+  void set_oci_sensor(sensor::Sensor *oci_sensor) { oci_sensor_ = oci_sensor; }
+
+  void loop() override;
+  void update() override;
+
+  void on_modbus_data(const std::vector<uint8_t> &data) override;
+
+  void dump_config() override;
+
+ protected:
+  int state_{0};
+  bool waiting_{false};
+  uint32_t last_send_{0};
+
+  sensor::Sensor *ph_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *dis1_sensor_{nullptr};
+  sensor::Sensor *dis2_sensor_{nullptr};
+  sensor::Sensor *redox_sensor_{nullptr};
+  sensor::Sensor *ec_sensor_{nullptr};
+  sensor::Sensor *oci_sensor_{nullptr};
+};
+
+}  // namespace kuntze
+}  // namespace esphome
diff --git a/esphome/components/kuntze/sensor.py b/esphome/components/kuntze/sensor.py
new file mode 100644
index 0000000000..96c874fa5c
--- /dev/null
+++ b/esphome/components/kuntze/sensor.py
@@ -0,0 +1,123 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, modbus
+from esphome.const import (
+    CONF_ID,
+    CONF_EC,
+    CONF_PH,
+    CONF_TEMPERATURE,
+    ICON_EMPTY,
+    ICON_THERMOMETER,
+    UNIT_CELSIUS,
+    UNIT_EMPTY,
+    UNIT_PH,
+    STATE_CLASS_MEASUREMENT,
+    DEVICE_CLASS_EMPTY,
+    DEVICE_CLASS_TEMPERATURE,
+)
+
+CODEOWNERS = ["@ssieb"]
+
+AUTO_LOAD = ["modbus"]
+
+kuntze_ns = cg.esphome_ns.namespace("kuntze")
+Kuntze = kuntze_ns.class_("Kuntze", cg.PollingComponent, modbus.ModbusDevice)
+
+CONF_DIS1 = "dis1"
+CONF_DIS2 = "dis2"
+CONF_REDOX = "redox"
+CONF_OCI = "oci"
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(Kuntze),
+            cv.Optional(CONF_PH): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PH,
+                icon=ICON_EMPTY,
+                accuracy_decimals=1,
+                state_class=STATE_CLASS_MEASUREMENT,
+                device_class=DEVICE_CLASS_EMPTY,
+            ),
+            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_CELSIUS,
+                icon=ICON_THERMOMETER,
+                accuracy_decimals=1,
+                state_class=STATE_CLASS_MEASUREMENT,
+                device_class=DEVICE_CLASS_TEMPERATURE,
+            ),
+            cv.Optional(CONF_DIS1): sensor.sensor_schema(
+                unit_of_measurement=UNIT_EMPTY,
+                icon=ICON_EMPTY,
+                accuracy_decimals=1,
+                state_class=STATE_CLASS_MEASUREMENT,
+                device_class=DEVICE_CLASS_EMPTY,
+            ),
+            cv.Optional(CONF_DIS2): sensor.sensor_schema(
+                unit_of_measurement=UNIT_EMPTY,
+                icon=ICON_EMPTY,
+                accuracy_decimals=1,
+                state_class=STATE_CLASS_MEASUREMENT,
+                device_class=DEVICE_CLASS_EMPTY,
+            ),
+            cv.Optional(CONF_REDOX): sensor.sensor_schema(
+                unit_of_measurement=UNIT_EMPTY,
+                icon=ICON_EMPTY,
+                accuracy_decimals=1,
+                state_class=STATE_CLASS_MEASUREMENT,
+                device_class=DEVICE_CLASS_EMPTY,
+            ),
+            cv.Optional(CONF_EC): sensor.sensor_schema(
+                unit_of_measurement=UNIT_EMPTY,
+                icon=ICON_EMPTY,
+                accuracy_decimals=1,
+                state_class=STATE_CLASS_MEASUREMENT,
+                device_class=DEVICE_CLASS_EMPTY,
+            ),
+            cv.Optional(CONF_OCI): sensor.sensor_schema(
+                unit_of_measurement=UNIT_EMPTY,
+                icon=ICON_EMPTY,
+                accuracy_decimals=1,
+                state_class=STATE_CLASS_MEASUREMENT,
+                device_class=DEVICE_CLASS_EMPTY,
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(modbus.modbus_device_schema(0x01))
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await modbus.register_modbus_device(var, config)
+
+    if CONF_PH in config:
+        conf = config[CONF_PH]
+        sens = await sensor.new_sensor(conf)
+        cg.add(var.set_ph_sensor(sens))
+    if CONF_TEMPERATURE in config:
+        conf = config[CONF_TEMPERATURE]
+        sens = await sensor.new_sensor(conf)
+        cg.add(var.set_temperature_sensor(sens))
+    if CONF_DIS1 in config:
+        conf = config[CONF_DIS1]
+        sens = await sensor.new_sensor(conf)
+        cg.add(var.set_dis1_sensor(sens))
+    if CONF_DIS2 in config:
+        conf = config[CONF_DIS2]
+        sens = await sensor.new_sensor(conf)
+        cg.add(var.set_dis2_sensor(sens))
+    if CONF_REDOX in config:
+        conf = config[CONF_REDOX]
+        sens = await sensor.new_sensor(conf)
+        cg.add(var.set_redox_sensor(sens))
+    if CONF_EC in config:
+        conf = config[CONF_EC]
+        sens = await sensor.new_sensor(conf)
+        cg.add(var.set_ec_sensor(sens))
+    if CONF_OCI in config:
+        conf = config[CONF_OCI]
+        sens = await sensor.new_sensor(conf)
+        cg.add(var.set_oci_sensor(sens))
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 4827b7cbcd..6755be9f14 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -807,6 +807,12 @@ sensor:
     temperature_1:
       name: Temperature 1
 
+  - platform: kuntze
+    ph:
+      name: Kuntze pH
+    temperature:
+      name: Kuntze temperature
+
 time:
   - platform: homeassistant
 
diff --git a/tests/test5.yaml b/tests/test5.yaml
index 21419692e4..5708f1f093 100644
--- a/tests/test5.yaml
+++ b/tests/test5.yaml
@@ -520,6 +520,12 @@ sensor:
         name: VBus Custom Sensor
         lambda: return x[0] / 10.0;
 
+  - platform: kuntze
+    ph:
+      name: Kuntze pH
+    temperature:
+      name: Kuntze temperature
+
 script:
   - id: automation_test
     then:

From fe4fb5f1ac796180c25711da2af624f5b2e8c663 Mon Sep 17 00:00:00 2001
From: Yaroslav Heriatovych <184247+Yarikx@users.noreply.github.com>
Date: Thu, 23 Feb 2023 02:05:33 +0000
Subject: [PATCH 619/838] Add Haier climate component (#4001)

* Basic functionality works

* Cleanup

* Add tests

* Separate header

* Fix send_data_

* Formatting fix

* Add __init__.py

* Fix type

* Add codeowners

* Rename supported_swing_modes

* Use multiple swing modes, same as midea platform

* Add CLIMATE_FAN_QUIET handler

* PR fixes
---
 CODEOWNERS                           |   1 +
 esphome/components/haier/__init__.py |   1 +
 esphome/components/haier/climate.py  |  43 ++++
 esphome/components/haier/haier.cpp   | 302 +++++++++++++++++++++++++++
 esphome/components/haier/haier.h     |  37 ++++
 tests/test3.yaml                     |  14 +-
 6 files changed, 396 insertions(+), 2 deletions(-)
 create mode 100644 esphome/components/haier/__init__.py
 create mode 100644 esphome/components/haier/climate.py
 create mode 100644 esphome/components/haier/haier.cpp
 create mode 100644 esphome/components/haier/haier.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 00f207862a..4e3c6c3510 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -95,6 +95,7 @@ esphome/components/gpio/* @esphome/core
 esphome/components/gps/* @coogle
 esphome/components/graph/* @synco
 esphome/components/growatt_solar/* @leeuwte
+esphome/components/haier/* @Yarikx
 esphome/components/havells_solar/* @sourabhjaiswal
 esphome/components/hbridge/fan/* @WeekendWarrior
 esphome/components/hbridge/light/* @DotNetDann
diff --git a/esphome/components/haier/__init__.py b/esphome/components/haier/__init__.py
new file mode 100644
index 0000000000..b9ea055a41
--- /dev/null
+++ b/esphome/components/haier/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@Yarikx"]
diff --git a/esphome/components/haier/climate.py b/esphome/components/haier/climate.py
new file mode 100644
index 0000000000..cee83232a1
--- /dev/null
+++ b/esphome/components/haier/climate.py
@@ -0,0 +1,43 @@
+from esphome.components import climate
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import uart
+from esphome.components.climate import ClimateSwingMode
+from esphome.const import CONF_ID, CONF_SUPPORTED_SWING_MODES
+
+DEPENDENCIES = ["uart"]
+
+haier_ns = cg.esphome_ns.namespace("haier")
+HaierClimate = haier_ns.class_(
+    "HaierClimate", climate.Climate, cg.PollingComponent, uart.UARTDevice
+)
+
+ALLOWED_CLIMATE_SWING_MODES = {
+    "BOTH": ClimateSwingMode.CLIMATE_SWING_BOTH,
+    "VERTICAL": ClimateSwingMode.CLIMATE_SWING_VERTICAL,
+    "HORIZONTAL": ClimateSwingMode.CLIMATE_SWING_HORIZONTAL,
+}
+
+validate_swing_modes = cv.enum(ALLOWED_CLIMATE_SWING_MODES, upper=True)
+
+CONFIG_SCHEMA = cv.All(
+    climate.CLIMATE_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(HaierClimate),
+            cv.Optional(CONF_SUPPORTED_SWING_MODES): cv.ensure_list(
+                validate_swing_modes
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("5s"))
+    .extend(uart.UART_DEVICE_SCHEMA),
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await climate.register_climate(var, config)
+    await uart.register_uart_device(var, config)
+    if CONF_SUPPORTED_SWING_MODES in config:
+        cg.add(var.set_supported_swing_modes(config[CONF_SUPPORTED_SWING_MODES]))
diff --git a/esphome/components/haier/haier.cpp b/esphome/components/haier/haier.cpp
new file mode 100644
index 0000000000..cf69d483b5
--- /dev/null
+++ b/esphome/components/haier/haier.cpp
@@ -0,0 +1,302 @@
+#include <cmath>
+#include "haier.h"
+#include "esphome/core/macros.h"
+
+namespace esphome {
+namespace haier {
+
+static const char *const TAG = "haier";
+
+static const uint8_t TEMPERATURE = 13;
+static const uint8_t HUMIDITY = 15;
+
+static const uint8_t MODE = 23;
+
+static const uint8_t FAN_SPEED = 25;
+
+static const uint8_t SWING = 27;
+
+static const uint8_t POWER = 29;
+static const uint8_t POWER_MASK = 1;
+
+static const uint8_t SET_TEMPERATURE = 35;
+static const uint8_t DECIMAL_MASK = (1 << 5);
+
+static const uint8_t CRC = 36;
+
+static const uint8_t COMFORT_PRESET_MASK = (1 << 3);
+
+static const uint8_t MIN_VALID_TEMPERATURE = 16;
+static const uint8_t MAX_VALID_TEMPERATURE = 50;
+static const float TEMPERATURE_STEP = 0.5f;
+
+static const uint8_t POLL_REQ[13] = {255, 255, 10, 0, 0, 0, 0, 0, 1, 1, 77, 1, 90};
+static const uint8_t OFF_REQ[13] = {255, 255, 10, 0, 0, 0, 0, 0, 1, 1, 77, 3, 92};
+
+void HaierClimate::dump_config() {
+  ESP_LOGCONFIG(TAG, "Haier:");
+  ESP_LOGCONFIG(TAG, "  Update interval: %u", this->get_update_interval());
+  this->dump_traits_(TAG);
+  this->check_uart_settings(9600);
+}
+
+void HaierClimate::loop() {
+  if (this->available() >= sizeof(this->data_)) {
+    this->read_array(this->data_, sizeof(this->data_));
+    if (this->data_[0] != 255 || this->data_[1] != 255)
+      return;
+
+    read_state_(this->data_, sizeof(this->data_));
+  }
+}
+
+void HaierClimate::update() {
+  this->write_array(POLL_REQ, sizeof(POLL_REQ));
+  dump_message_("Poll sent", POLL_REQ, sizeof(POLL_REQ));
+}
+
+climate::ClimateTraits HaierClimate::traits() {
+  auto traits = climate::ClimateTraits();
+
+  traits.set_visual_min_temperature(MIN_VALID_TEMPERATURE);
+  traits.set_visual_max_temperature(MAX_VALID_TEMPERATURE);
+  traits.set_visual_temperature_step(TEMPERATURE_STEP);
+
+  traits.set_supported_modes({climate::CLIMATE_MODE_OFF, climate::CLIMATE_MODE_HEAT_COOL, climate::CLIMATE_MODE_COOL,
+                              climate::CLIMATE_MODE_HEAT, climate::CLIMATE_MODE_FAN_ONLY, climate::CLIMATE_MODE_DRY});
+
+  traits.set_supported_fan_modes({
+      climate::CLIMATE_FAN_AUTO,
+      climate::CLIMATE_FAN_LOW,
+      climate::CLIMATE_FAN_MEDIUM,
+      climate::CLIMATE_FAN_HIGH,
+  });
+
+  traits.set_supported_swing_modes(this->supported_swing_modes_);
+  traits.set_supports_current_temperature(true);
+  traits.set_supports_two_point_target_temperature(false);
+
+  traits.add_supported_preset(climate::CLIMATE_PRESET_NONE);
+  traits.add_supported_preset(climate::CLIMATE_PRESET_COMFORT);
+
+  return traits;
+}
+
+void HaierClimate::read_state_(const uint8_t *data, uint8_t size) {
+  dump_message_("Received state", data, size);
+
+  uint8_t check = data[CRC];
+
+  uint8_t crc = get_checksum_(data, size);
+
+  if (check != crc) {
+    ESP_LOGW(TAG, "Invalid checksum");
+    return;
+  }
+
+  this->current_temperature = data[TEMPERATURE];
+
+  this->target_temperature = data[SET_TEMPERATURE] + MIN_VALID_TEMPERATURE;
+
+  if (data[POWER] & DECIMAL_MASK) {
+    this->target_temperature += 0.5f;
+  }
+
+  switch (data[MODE]) {
+    case MODE_SMART:
+      this->mode = climate::CLIMATE_MODE_HEAT_COOL;
+      break;
+    case MODE_COOL:
+      this->mode = climate::CLIMATE_MODE_COOL;
+      break;
+    case MODE_HEAT:
+      this->mode = climate::CLIMATE_MODE_HEAT;
+      break;
+    case MODE_ONLY_FAN:
+      this->mode = climate::CLIMATE_MODE_FAN_ONLY;
+      break;
+    case MODE_DRY:
+      this->mode = climate::CLIMATE_MODE_DRY;
+      break;
+    default:  // other modes are unsupported
+      this->mode = climate::CLIMATE_MODE_HEAT_COOL;
+  }
+
+  switch (data[FAN_SPEED]) {
+    case FAN_AUTO:
+      this->fan_mode = climate::CLIMATE_FAN_AUTO;
+      break;
+
+    case FAN_MIN:
+      this->fan_mode = climate::CLIMATE_FAN_LOW;
+      break;
+
+    case FAN_MIDDLE:
+      this->fan_mode = climate::CLIMATE_FAN_MEDIUM;
+      break;
+
+    case FAN_MAX:
+      this->fan_mode = climate::CLIMATE_FAN_HIGH;
+      break;
+  }
+
+  switch (data[SWING]) {
+    case SWING_OFF:
+      this->swing_mode = climate::CLIMATE_SWING_OFF;
+      break;
+
+    case SWING_VERTICAL:
+      this->swing_mode = climate::CLIMATE_SWING_VERTICAL;
+      break;
+
+    case SWING_HORIZONTAL:
+      this->swing_mode = climate::CLIMATE_SWING_HORIZONTAL;
+      break;
+
+    case SWING_BOTH:
+      this->swing_mode = climate::CLIMATE_SWING_BOTH;
+      break;
+  }
+
+  if (data[POWER] & COMFORT_PRESET_MASK) {
+    this->preset = climate::CLIMATE_PRESET_COMFORT;
+  } else {
+    this->preset = climate::CLIMATE_PRESET_NONE;
+  }
+
+  if ((data[POWER] & POWER_MASK) == 0) {
+    this->mode = climate::CLIMATE_MODE_OFF;
+  }
+
+  this->publish_state();
+}
+
+void HaierClimate::control(const climate::ClimateCall &call) {
+  if (call.get_mode().has_value()) {
+    switch (call.get_mode().value()) {
+      case climate::CLIMATE_MODE_OFF:
+        send_data_(OFF_REQ, sizeof(OFF_REQ));
+        break;
+
+      case climate::CLIMATE_MODE_HEAT_COOL:
+      case climate::CLIMATE_MODE_AUTO:
+        data_[POWER] |= POWER_MASK;
+        data_[MODE] = MODE_SMART;
+        break;
+      case climate::CLIMATE_MODE_HEAT:
+        data_[POWER] |= POWER_MASK;
+        data_[MODE] = MODE_HEAT;
+        break;
+      case climate::CLIMATE_MODE_COOL:
+        data_[POWER] |= POWER_MASK;
+        data_[MODE] = MODE_COOL;
+        break;
+
+      case climate::CLIMATE_MODE_FAN_ONLY:
+        data_[POWER] |= POWER_MASK;
+        data_[MODE] = MODE_ONLY_FAN;
+        break;
+
+      case climate::CLIMATE_MODE_DRY:
+        data_[POWER] |= POWER_MASK;
+        data_[MODE] = MODE_DRY;
+        break;
+    }
+  }
+
+  if (call.get_preset().has_value()) {
+    if (call.get_preset().value() == climate::CLIMATE_PRESET_COMFORT) {
+      data_[POWER] |= COMFORT_PRESET_MASK;
+    } else {
+      data_[POWER] &= ~COMFORT_PRESET_MASK;
+    }
+  }
+
+  if (call.get_target_temperature().has_value()) {
+    float target = call.get_target_temperature().value() - MIN_VALID_TEMPERATURE;
+
+    data_[SET_TEMPERATURE] = (uint8_t) target;
+
+    if ((int) target == std::lroundf(target)) {
+      data_[POWER] &= ~DECIMAL_MASK;
+    } else {
+      data_[POWER] |= DECIMAL_MASK;
+    }
+  }
+
+  if (call.get_fan_mode().has_value()) {
+    switch (call.get_fan_mode().value()) {
+      case climate::CLIMATE_FAN_AUTO:
+        data_[FAN_SPEED] = FAN_AUTO;
+        break;
+      case climate::CLIMATE_FAN_LOW:
+        data_[FAN_SPEED] = FAN_MIN;
+        break;
+      case climate::CLIMATE_FAN_MEDIUM:
+        data_[FAN_SPEED] = FAN_MIDDLE;
+        break;
+      case climate::CLIMATE_FAN_HIGH:
+        data_[FAN_SPEED] = FAN_MAX;
+        break;
+
+      default:  // other modes are unsupported
+        break;
+    }
+  }
+
+  if (call.get_swing_mode().has_value()) {
+    switch (call.get_swing_mode().value()) {
+      case climate::CLIMATE_SWING_OFF:
+        data_[SWING] = SWING_OFF;
+        break;
+      case climate::CLIMATE_SWING_VERTICAL:
+        data_[SWING] = SWING_VERTICAL;
+        break;
+      case climate::CLIMATE_SWING_HORIZONTAL:
+        data_[SWING] = SWING_HORIZONTAL;
+        break;
+      case climate::CLIMATE_SWING_BOTH:
+        data_[SWING] = SWING_BOTH;
+        break;
+    }
+  }
+
+  // Parts of the message that must have specific values for "send" command.
+  // The meaning of those values is unknown at the moment.
+  data_[9] = 1;
+  data_[10] = 77;
+  data_[11] = 95;
+  data_[17] = 0;
+
+  // Compute checksum
+  uint8_t crc = get_checksum_(data_, sizeof(data_));
+  data_[CRC] = crc;
+
+  send_data_(data_, sizeof(data_));
+}
+
+void HaierClimate::send_data_(const uint8_t *message, uint8_t size) {
+  this->write_array(message, size);
+
+  dump_message_("Sent message", message, size);
+}
+
+void HaierClimate::dump_message_(const char *title, const uint8_t *message, uint8_t size) {
+  ESP_LOGV(TAG, "%s:", title);
+  for (int i = 0; i < size; i++) {
+    ESP_LOGV(TAG, "  byte %02d - %d", i, message[i]);
+  }
+}
+
+uint8_t HaierClimate::get_checksum_(const uint8_t *message, size_t size) {
+  uint8_t position = size - 1;
+  uint8_t crc = 0;
+
+  for (int i = 2; i < position; i++)
+    crc += message[i];
+
+  return crc;
+}
+
+}  // namespace haier
+}  // namespace esphome
diff --git a/esphome/components/haier/haier.h b/esphome/components/haier/haier.h
new file mode 100644
index 0000000000..5399fd187b
--- /dev/null
+++ b/esphome/components/haier/haier.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/climate/climate.h"
+#include "esphome/components/uart/uart.h"
+
+namespace esphome {
+namespace haier {
+
+enum Mode : uint8_t { MODE_SMART = 0, MODE_COOL = 1, MODE_HEAT = 2, MODE_ONLY_FAN = 3, MODE_DRY = 4 };
+enum FanSpeed : uint8_t { FAN_MAX = 0, FAN_MIDDLE = 1, FAN_MIN = 2, FAN_AUTO = 3 };
+enum SwingMode : uint8_t { SWING_OFF = 0, SWING_VERTICAL = 1, SWING_HORIZONTAL = 2, SWING_BOTH = 3 };
+
+class HaierClimate : public climate::Climate, public uart::UARTDevice, public PollingComponent {
+ public:
+  void loop() override;
+  void update() override;
+  void dump_config() override;
+  void control(const climate::ClimateCall &call) override;
+  void set_supported_swing_modes(const std::set<climate::ClimateSwingMode> &modes) {
+    this->supported_swing_modes_ = modes;
+  }
+
+ protected:
+  climate::ClimateTraits traits() override;
+  void read_state_(const uint8_t *data, uint8_t size);
+  void send_data_(const uint8_t *message, uint8_t size);
+  void dump_message_(const char *title, const uint8_t *message, uint8_t size);
+  uint8_t get_checksum_(const uint8_t *message, size_t size);
+
+ private:
+  uint8_t data_[37];
+  std::set<climate::ClimateSwingMode> supported_swing_modes_{};
+};
+
+}  // namespace haier
+}  // namespace esphome
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 6755be9f14..16489335af 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -283,6 +283,10 @@ uart:
     tx_pin: GPIO4
     rx_pin: GPIO5
     baud_rate: 9600
+  - id: uart12
+    tx_pin: GPIO4
+    rx_pin: GPIO5
+    baud_rate: 9600
 
 modbus:
   uart_id: uart1
@@ -1194,8 +1198,14 @@ climate:
       ki_multiplier: 0.0
       kd_multiplier: 0.0
       deadband_output_averaging_samples: 1
-
-
+  - platform: haier
+    name: Haier AC
+    supported_swing_modes:
+      - vertical
+      - horizontal
+      - both
+    update_interval: 10s
+    uart_id: uart12
 
 sprinkler:
   - id: yard_sprinkler_ctrlr

From 6704b2cedfd310ba6a62f8ae96d59ea9d8e3a01a Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 22 Feb 2023 21:08:06 -0500
Subject: [PATCH 620/838] Bump esp-idf to 4.4.3 via platformio/espressif32 @
 5.3.0 (#4254)

* Bump esp-idf to 3.4.3 via platformio/espressif32 @ 5.3.0

The new version appears to improve the stability of
BLE + WiFi

* bump recommended version as well
---
 esphome/components/esp32/__init__.py | 4 ++--
 platformio.ini                       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index 0f16fc9293..0566d12f97 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -168,11 +168,11 @@ ARDUINO_PLATFORM_VERSION = cv.Version(5, 2, 0)
 # The default/recommended esp-idf framework version
 #  - https://github.com/espressif/esp-idf/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/tool/framework-espidf
-RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 4, 2)
+RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 4, 3)
 # The platformio/espressif32 version to use for esp-idf frameworks
 #  - https://github.com/platformio/platform-espressif32/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif32
-ESP_IDF_PLATFORM_VERSION = cv.Version(5, 2, 0)
+ESP_IDF_PLATFORM_VERSION = cv.Version(5, 3, 0)
 
 
 def _arduino_check_versions(value):
diff --git a/platformio.ini b/platformio.ini
index ef5820c4ad..f2588e918a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -133,9 +133,9 @@ extra_scripts = post:esphome/components/esp32/post_build.py.script
 ; This are common settings for the ESP32 (all variants) using IDF.
 [common:esp32-idf]
 extends = common:idf
-platform = platformio/espressif32 @ 5.2.0
+platform = platformio/espressif32 @ 5.3.0
 platform_packages =
-    platformio/framework-espidf @ ~3.40402.0
+    platformio/framework-espidf @ ~3.40403.0
 
 framework = espidf
 lib_deps =

From 4d674392e8953cbb530c318f6d931d89f50ac5c4 Mon Sep 17 00:00:00 2001
From: Andreas Hergert <36455093+andreashergert1984@users.noreply.github.com>
Date: Thu, 23 Feb 2023 18:38:34 +0100
Subject: [PATCH 621/838] Add energy to pzemdc (#3626)

* added energy to pzemdc

* fixed calculation

* added test

* moved tests

---------

Co-authored-by: Andreas Hergert <andreas.hergert@otrs.com>
---
 esphome/components/pzemdc/pzemdc.cpp |  6 ++++++
 esphome/components/pzemdc/pzemdc.h   |  2 ++
 esphome/components/pzemdc/sensor.py  | 14 ++++++++++++++
 tests/test3.yaml                     |  2 ++
 tests/test5.yaml                     |  1 -
 5 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/esphome/components/pzemdc/pzemdc.cpp b/esphome/components/pzemdc/pzemdc.cpp
index 6a31a723a1..c914edefc8 100644
--- a/esphome/components/pzemdc/pzemdc.cpp
+++ b/esphome/components/pzemdc/pzemdc.cpp
@@ -37,6 +37,9 @@ void PZEMDC::on_modbus_data(const std::vector<uint8_t> &data) {
   uint32_t raw_power = pzem_get_32bit(4);
   float power = raw_power / 10.0f;  // max 429496729.5 W
 
+  uint32_t raw_energy = pzem_get_32bit(8);
+  float energy = raw_energy / 1000.0f;  // max 4294967.295 kWh
+
   ESP_LOGD(TAG, "PZEM DC: V=%.1f V, I=%.3f A, P=%.1f W", voltage, current, power);
   if (this->voltage_sensor_ != nullptr)
     this->voltage_sensor_->publish_state(voltage);
@@ -44,6 +47,8 @@ void PZEMDC::on_modbus_data(const std::vector<uint8_t> &data) {
     this->current_sensor_->publish_state(current);
   if (this->power_sensor_ != nullptr)
     this->power_sensor_->publish_state(power);
+  if (this->energy_sensor_ != nullptr)
+    this->energy_sensor_->publish_state(energy);
 }
 
 void PZEMDC::update() { this->send(PZEM_CMD_READ_IN_REGISTERS, 0, 8); }
@@ -53,6 +58,7 @@ void PZEMDC::dump_config() {
   LOG_SENSOR("", "Voltage", this->voltage_sensor_);
   LOG_SENSOR("", "Current", this->current_sensor_);
   LOG_SENSOR("", "Power", this->power_sensor_);
+  LOG_SENSOR("", "Energy", this->energy_sensor_);
 }
 
 }  // namespace pzemdc
diff --git a/esphome/components/pzemdc/pzemdc.h b/esphome/components/pzemdc/pzemdc.h
index dff904476b..54df6c484c 100644
--- a/esphome/components/pzemdc/pzemdc.h
+++ b/esphome/components/pzemdc/pzemdc.h
@@ -14,6 +14,7 @@ class PZEMDC : public PollingComponent, public modbus::ModbusDevice {
   void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
   void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
   void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
+  void set_energy_sensor(sensor::Sensor *energy_sensor) { energy_sensor_ = energy_sensor; }
   void set_frequency_sensor(sensor::Sensor *frequency_sensor) { frequency_sensor_ = frequency_sensor; }
   void set_powerfactor_sensor(sensor::Sensor *powerfactor_sensor) { power_factor_sensor_ = powerfactor_sensor; }
 
@@ -29,6 +30,7 @@ class PZEMDC : public PollingComponent, public modbus::ModbusDevice {
   sensor::Sensor *power_sensor_{nullptr};
   sensor::Sensor *frequency_sensor_{nullptr};
   sensor::Sensor *power_factor_sensor_{nullptr};
+  sensor::Sensor *energy_sensor_{nullptr};
 };
 
 }  // namespace pzemdc
diff --git a/esphome/components/pzemdc/sensor.py b/esphome/components/pzemdc/sensor.py
index 08ec688afb..4234ce19ad 100644
--- a/esphome/components/pzemdc/sensor.py
+++ b/esphome/components/pzemdc/sensor.py
@@ -5,14 +5,18 @@ from esphome.const import (
     CONF_CURRENT,
     CONF_ID,
     CONF_POWER,
+    CONF_ENERGY,
     CONF_VOLTAGE,
     DEVICE_CLASS_CURRENT,
+    DEVICE_CLASS_ENERGY,
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_VOLTAGE,
     STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_TOTAL_INCREASING,
     UNIT_VOLT,
     UNIT_AMPERE,
     UNIT_WATT,
+    UNIT_KILOWATT_HOURS,
 )
 
 AUTO_LOAD = ["modbus"]
@@ -42,6 +46,12 @@ CONFIG_SCHEMA = (
                 device_class=DEVICE_CLASS_POWER,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
+            cv.Optional(CONF_ENERGY): sensor.sensor_schema(
+                unit_of_measurement=UNIT_KILOWATT_HOURS,
+                accuracy_decimals=3,
+                device_class=DEVICE_CLASS_ENERGY,
+                state_class=STATE_CLASS_TOTAL_INCREASING,
+            ),
         }
     )
     .extend(cv.polling_component_schema("60s"))
@@ -66,3 +76,7 @@ async def to_code(config):
         conf = config[CONF_POWER]
         sens = await sensor.new_sensor(conf)
         cg.add(var.set_power_sensor(sens))
+    if CONF_ENERGY in config:
+        conf = config[CONF_ENERGY]
+        sens = await sensor.new_sensor(conf)
+        cg.add(var.set_energy_sensor(sens))
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 16489335af..5776e1fc10 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -583,6 +583,8 @@ sensor:
       name: PZEMDC Current
     power:
       name: PZEMDC Power
+    energy:
+      name: PZEMDC Energy
   - platform: tmp102
     name: TMP102 Temperature
   - platform: hm3301
diff --git a/tests/test5.yaml b/tests/test5.yaml
index 5708f1f093..ec3fef5e19 100644
--- a/tests/test5.yaml
+++ b/tests/test5.yaml
@@ -477,7 +477,6 @@ sensor:
     acceleration_mode: low
     store_baseline: true
     address: 0x69
-
   - platform: mcp9600
     thermocouple_type: K
     hot_junction:

From 6ec18fc63056a8d9a5636268ec1b1eaf3f2914e7 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 27 Feb 2023 07:25:22 +1300
Subject: [PATCH 622/838] Update esp32 esp-idf dev and latest version numbers
 (#4479)

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

diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index 0566d12f97..69fc8d3262 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -178,8 +178,8 @@ ESP_IDF_PLATFORM_VERSION = cv.Version(5, 3, 0)
 def _arduino_check_versions(value):
     value = value.copy()
     lookups = {
-        "dev": (cv.Version(2, 0, 5), "https://github.com/espressif/arduino-esp32.git"),
-        "latest": (cv.Version(2, 0, 5), None),
+        "dev": (cv.Version(2, 1, 0), "https://github.com/espressif/arduino-esp32.git"),
+        "latest": (cv.Version(2, 0, 7), None),
         "recommended": (RECOMMENDED_ARDUINO_FRAMEWORK_VERSION, None),
     }
 
@@ -213,8 +213,8 @@ def _arduino_check_versions(value):
 def _esp_idf_check_versions(value):
     value = value.copy()
     lookups = {
-        "dev": (cv.Version(5, 0, 0), "https://github.com/espressif/esp-idf.git"),
-        "latest": (cv.Version(4, 4, 2), None),
+        "dev": (cv.Version(5, 1, 0), "https://github.com/espressif/esp-idf.git"),
+        "latest": (cv.Version(5, 0, 1), None),
         "recommended": (RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION, None),
     }
 
@@ -531,7 +531,6 @@ def copy_files():
             components: dict = CORE.data[KEY_ESP32][KEY_COMPONENTS]
 
             for name, component in components.items():
-
                 repo_dir, _ = git.clone_or_update(
                     url=component[KEY_REPO],
                     ref=component[KEY_REF],

From 1a9141877d261334393183dfe66e372e9d67832b Mon Sep 17 00:00:00 2001
From: Fabian <Fabian-Schmidt@users.noreply.github.com>
Date: Sun, 26 Feb 2023 19:42:29 +0100
Subject: [PATCH 623/838] use same `heap_caps_malloc` parameter as `ps_malloc`.
 (#4484)

Co-authored-by: Your Name <you@example.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/core/helpers.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index 477dadc187..cef303941e 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -612,7 +612,7 @@ template<class T> class ExternalRAMAllocator {
     size_t size = n * sizeof(T);
     T *ptr = nullptr;
 #ifdef USE_ESP32
-    ptr = static_cast<T *>(heap_caps_malloc(size, MALLOC_CAP_SPIRAM));
+    ptr = static_cast<T *>(heap_caps_malloc(size, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT));
 #endif
     if (ptr == nullptr && (this->flags_ & Flags::REFUSE_INTERNAL) == 0)
       ptr = static_cast<T *>(malloc(size));  // NOLINT(cppcoreguidelines-owning-memory,cppcoreguidelines-no-malloc)

From 86c0e6114f3a8babd3d1217fbc0cc33380ce0ae5 Mon Sep 17 00:00:00 2001
From: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Date: Sun, 26 Feb 2023 19:43:08 +0100
Subject: [PATCH 624/838] Lock scheduler items while modifying them  (#4410)

* Cosmetic fixes to scheduler code

* Add generic Mutex API

* Lock scheduler items while modifying them

* Always defer MQTT callbacks on Arduino
---
 esphome/components/mqtt/mqtt_client.cpp |  8 ++---
 esphome/core/helpers.cpp                | 12 +++++++
 esphome/core/helpers.h                  | 41 ++++++++++++++++++++++
 esphome/core/scheduler.cpp              | 46 +++++++++++++++++++++----
 esphome/core/scheduler.h                |  5 ++-
 5 files changed, 100 insertions(+), 12 deletions(-)

diff --git a/esphome/components/mqtt/mqtt_client.cpp b/esphome/components/mqtt/mqtt_client.cpp
index aa0cf56c51..acb863244e 100644
--- a/esphome/components/mqtt/mqtt_client.cpp
+++ b/esphome/components/mqtt/mqtt_client.cpp
@@ -485,16 +485,16 @@ static bool topic_match(const char *message, const char *subscription) {
 }
 
 void MQTTClientComponent::on_message(const std::string &topic, const std::string &payload) {
-#ifdef USE_ESP8266
-  // on ESP8266, this is called in LWiP thread; some components do not like running
-  // in an ISR.
+#ifdef USE_ARDUINO
+  // on Arduino, this is called in lwIP/AsyncTCP task; some components do not like running
+  // from a different task.
   this->defer([this, topic, payload]() {
 #endif
     for (auto &subscription : this->subscriptions_) {
       if (topic_match(topic.c_str(), subscription.topic.c_str()))
         subscription.callback(topic, payload);
     }
-#ifdef USE_ESP8266
+#ifdef USE_ARDUINO
   });
 #endif
 }
diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index 7ec5d9d23c..4ac9303b20 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -393,6 +393,18 @@ void hsv_to_rgb(int hue, float saturation, float value, float &red, float &green
 }
 
 // System APIs
+#if defined(USE_ESP8266)
+// ESP8266 doesn't have mutexes, but that shouldn't be an issue as it's single-core and non-preemptive OS.
+Mutex::Mutex() {}
+void Mutex::lock() {}
+bool Mutex::try_lock() { return true; }
+void Mutex::unlock() {}
+#elif defined(USE_ESP32) || defined(USE_RP2040)
+Mutex::Mutex() { handle_ = xSemaphoreCreateMutex(); }
+void Mutex::lock() { xSemaphoreTake(this->handle_, portMAX_DELAY); }
+bool Mutex::try_lock() { return xSemaphoreTake(this->handle_, 0) == pdTRUE; }
+void Mutex::unlock() { xSemaphoreGive(this->handle_); }
+#endif
 
 #if defined(USE_ESP8266)
 IRAM_ATTR InterruptLock::InterruptLock() { state_ = xt_rsil(15); }
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index cef303941e..0d2a7e298a 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -14,6 +14,14 @@
 #include <esp_heap_caps.h>
 #endif
 
+#if defined(USE_ESP32)
+#include <freertos/FreeRTOS.h>
+#include <freertos/semphr.h>
+#elif defined(USE_RP2040)
+#include <FreeRTOS.h>
+#include <semphr.h>
+#endif
+
 #define HOT __attribute__((hot))
 #define ESPDEPRECATED(msg, when) __attribute__((deprecated(msg)))
 #define ALWAYS_INLINE __attribute__((always_inline))
@@ -516,6 +524,39 @@ template<typename T> class Parented {
 /// @name System APIs
 ///@{
 
+/** Mutex implementation, with API based on the unavailable std::mutex.
+ *
+ * @note This mutex is non-recursive, so take care not to try to obtain the mutex while it is already taken.
+ */
+class Mutex {
+ public:
+  Mutex();
+  Mutex(const Mutex &) = delete;
+  void lock();
+  bool try_lock();
+  void unlock();
+
+  Mutex &operator=(const Mutex &) = delete;
+
+ private:
+#if defined(USE_ESP32) || defined(USE_RP2040)
+  SemaphoreHandle_t handle_;
+#endif
+};
+
+/** Helper class that wraps a mutex with a RAII-style API.
+ *
+ * This behaves like std::lock_guard: as long as the object is alive, the mutex is held.
+ */
+class LockGuard {
+ public:
+  LockGuard(Mutex &mutex) : mutex_{mutex} { mutex_.lock(); }
+  ~LockGuard() { mutex_.unlock(); }
+
+ private:
+  Mutex &mutex_;
+};
+
 /** Helper class to disable interrupts.
  *
  * This behaves like std::lock_guard: as long as the object is alive, all interrupts are disabled.
diff --git a/esphome/core/scheduler.cpp b/esphome/core/scheduler.cpp
index d880f0fda4..0cb148ec13 100644
--- a/esphome/core/scheduler.cpp
+++ b/esphome/core/scheduler.cpp
@@ -13,6 +13,11 @@ static const uint32_t MAX_LOGICALLY_DELETED_ITEMS = 10;
 // Uncomment to debug scheduler
 // #define ESPHOME_DEBUG_SCHEDULER
 
+// A note on locking: the `lock_` lock protects the `items_` and `to_add_` containers. It must be taken when writing to
+// them (i.e. when adding/removing items, but not when changing items). As items are only deleted from the loop task,
+// iterating over them from the loop task is fine; but iterating from any other context requires the lock to be held to
+// avoid the main thread modifying the list while it is being accessed.
+
 void HOT Scheduler::set_timeout(Component *component, const std::string &name, uint32_t timeout,
                                 std::function<void()> func) {
   const uint32_t now = this->millis_();
@@ -121,7 +126,7 @@ void HOT Scheduler::set_retry(Component *component, const std::string &name, uin
   args->backoff_increase_factor = backoff_increase_factor;
   args->scheduler = this;
 
-  // First exectuion of `func` immediately
+  // First execution of `func` immediately
   this->set_timeout(component, args->name, 0, [args]() { retry_handler(args); });
 }
 bool HOT Scheduler::cancel_retry(Component *component, const std::string &name) {
@@ -150,30 +155,42 @@ void HOT Scheduler::call() {
     std::vector<std::unique_ptr<SchedulerItem>> old_items;
     ESP_LOGVV(TAG, "Items: count=%u, now=%u", this->items_.size(), now);
     while (!this->empty_()) {
+      this->lock_.lock();
       auto item = std::move(this->items_[0]);
+      this->pop_raw_();
+      this->lock_.unlock();
+
       ESP_LOGVV(TAG, "  %s '%s' interval=%u last_execution=%u (%u) next=%u (%u)", item->get_type_str(),
                 item->name.c_str(), item->interval, item->last_execution, item->last_execution_major,
                 item->next_execution(), item->next_execution_major());
 
-      this->pop_raw_();
       old_items.push_back(std::move(item));
     }
     ESP_LOGVV(TAG, "\n");
-    this->items_ = std::move(old_items);
+
+    {
+      LockGuard guard{this->lock_};
+      this->items_ = std::move(old_items);
+    }
   }
 #endif  // ESPHOME_DEBUG_SCHEDULER
 
   auto to_remove_was = to_remove_;
-  auto items_was = items_.size();
+  auto items_was = this->items_.size();
   // If we have too many items to remove
   if (to_remove_ > MAX_LOGICALLY_DELETED_ITEMS) {
     std::vector<std::unique_ptr<SchedulerItem>> valid_items;
     while (!this->empty_()) {
+      LockGuard guard{this->lock_};
       auto item = std::move(this->items_[0]);
       this->pop_raw_();
       valid_items.push_back(std::move(item));
     }
-    this->items_ = std::move(valid_items);
+
+    {
+      LockGuard guard{this->lock_};
+      this->items_ = std::move(valid_items);
+    }
 
     // The following should not happen unless I'm missing something
     if (to_remove_ != 0) {
@@ -198,6 +215,7 @@ void HOT Scheduler::call() {
 
       // Don't run on failed components
       if (item->component != nullptr && item->component->is_failed()) {
+        LockGuard guard{this->lock_};
         this->pop_raw_();
         continue;
       }
@@ -217,6 +235,8 @@ void HOT Scheduler::call() {
     }
 
     {
+      this->lock_.lock();
+
       // new scope, item from before might have been moved in the vector
       auto item = std::move(this->items_[0]);
 
@@ -224,6 +244,8 @@ void HOT Scheduler::call() {
       // during the function call and know if we were cancelled.
       this->pop_raw_();
 
+      this->lock_.unlock();
+
       if (item->remove) {
         // We were removed/cancelled in the function call, stop
         to_remove_--;
@@ -246,6 +268,7 @@ void HOT Scheduler::call() {
   this->process_to_add();
 }
 void HOT Scheduler::process_to_add() {
+  LockGuard guard{this->lock_};
   for (auto &it : this->to_add_) {
     if (it->remove) {
       continue;
@@ -263,15 +286,24 @@ void HOT Scheduler::cleanup_() {
       return;
 
     to_remove_--;
-    this->pop_raw_();
+
+    {
+      LockGuard guard{this->lock_};
+      this->pop_raw_();
+    }
   }
 }
 void HOT Scheduler::pop_raw_() {
   std::pop_heap(this->items_.begin(), this->items_.end(), SchedulerItem::cmp);
   this->items_.pop_back();
 }
-void HOT Scheduler::push_(std::unique_ptr<Scheduler::SchedulerItem> item) { this->to_add_.push_back(std::move(item)); }
+void HOT Scheduler::push_(std::unique_ptr<Scheduler::SchedulerItem> item) {
+  LockGuard guard{this->lock_};
+  this->to_add_.push_back(std::move(item));
+}
 bool HOT Scheduler::cancel_item_(Component *component, const std::string &name, Scheduler::SchedulerItem::Type type) {
+  // obtain lock because this function iterates and can be called from non-loop task context
+  LockGuard guard{this->lock_};
   bool ret = false;
   for (auto &it : this->items_) {
     if (it->component == component && it->name == name && it->type == type && !it->remove) {
diff --git a/esphome/core/scheduler.h b/esphome/core/scheduler.h
index a758198b8d..44a58f37f5 100644
--- a/esphome/core/scheduler.h
+++ b/esphome/core/scheduler.h
@@ -1,9 +1,11 @@
 #pragma once
 
-#include "esphome/core/component.h"
 #include <vector>
 #include <memory>
 
+#include "esphome/core/component.h"
+#include "esphome/core/helpers.h"
+
 namespace esphome {
 
 class Component;
@@ -71,6 +73,7 @@ class Scheduler {
     return this->items_.empty();
   }
 
+  Mutex lock_;
   std::vector<std::unique_ptr<SchedulerItem>> items_;
   std::vector<std::unique_ptr<SchedulerItem>> to_add_;
   uint32_t last_millis_{0};

From 62459a8ae1d9a2182772d55ddf7d6ad983277f2e Mon Sep 17 00:00:00 2001
From: Fabian <Fabian-Schmidt@users.noreply.github.com>
Date: Sun, 26 Feb 2023 19:45:30 +0100
Subject: [PATCH 625/838] Move Font glyphs to SPI RAM. (#4485)

Co-authored-by: Your Name <you@example.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/display/display_buffer.cpp | 19 +++++++++++++------
 esphome/components/display/display_buffer.h   |  6 ++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/esphome/components/display/display_buffer.cpp b/esphome/components/display/display_buffer.cpp
index 9fe4137a14..85ebd2567b 100644
--- a/esphome/components/display/display_buffer.cpp
+++ b/esphome/components/display/display_buffer.cpp
@@ -256,7 +256,7 @@ void DisplayBuffer::print(int x, int y, Font *font, Color color, TextAlign align
     if (glyph_n < 0) {
       // Unknown char, skip
       ESP_LOGW(TAG, "Encountered character without representation in font: '%c'", text[i]);
-      if (!font->get_glyphs().empty()) {
+      if (font->get_glyphs_size() > 0) {
         uint8_t glyph_width = font->get_glyphs()[0].glyph_data_->width;
         for (int glyph_x = 0; glyph_x < glyph_width; glyph_x++) {
           for (int glyph_y = 0; glyph_y < height; glyph_y++)
@@ -557,7 +557,7 @@ void Glyph::scan_area(int *x1, int *y1, int *width, int *height) const {
 }
 int Font::match_next_glyph(const char *str, int *match_length) {
   int lo = 0;
-  int hi = this->glyphs_.size() - 1;
+  int hi = this->glyphs_size_ - 1;
   while (lo != hi) {
     int mid = (lo + hi + 1) / 2;
     if (this->glyphs_[mid].compare_to(str)) {
@@ -583,7 +583,7 @@ void Font::measure(const char *str, int *width, int *x_offset, int *baseline, in
     int glyph_n = this->match_next_glyph(str + i, &match_length);
     if (glyph_n < 0) {
       // Unknown char, skip
-      if (!this->get_glyphs().empty())
+      if (this->glyphs_size_ > 0)
         x += this->get_glyphs()[0].glyph_data_->width;
       i++;
       continue;
@@ -603,10 +603,17 @@ void Font::measure(const char *str, int *width, int *x_offset, int *baseline, in
   *x_offset = min_x;
   *width = x - min_x;
 }
-const std::vector<Glyph> &Font::get_glyphs() const { return this->glyphs_; }
 Font::Font(const GlyphData *data, int data_nr, int baseline, int height) : baseline_(baseline), height_(height) {
-  for (int i = 0; i < data_nr; ++i)
-    glyphs_.emplace_back(data + i);
+  ExternalRAMAllocator<Glyph> allocator(ExternalRAMAllocator<Glyph>::ALLOW_FAILURE);
+  this->glyphs_ = allocator.allocate(data_nr);
+  if (this->glyphs_ == nullptr) {
+    ESP_LOGE(TAG, "Could not allocate buffer for Glyphs!");
+    return;
+  }
+  for (int i = 0; i < data_nr; ++i) {
+    this->glyphs_[i] = Glyph(data + i);
+  }
+  this->glyphs_size_ = data_nr;
 }
 
 bool Image::get_pixel(int x, int y) const {
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index 3763da8041..815ba8d2e1 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -526,10 +526,12 @@ class Font {
   inline int get_baseline() { return this->baseline_; }
   inline int get_height() { return this->height_; }
 
-  const std::vector<Glyph> &get_glyphs() const;
+  Glyph *&get_glyphs() { return this->glyphs_; }
+  const u_int16_t &get_glyphs_size() const { return this->glyphs_size_; }
 
  protected:
-  std::vector<Glyph> glyphs_;
+  Glyph *glyphs_{nullptr};
+  u_int16_t glyphs_size_;
   int baseline_;
   int height_;
 };

From 14e7b8a1ef1895ccc751b718583025a4494918cf Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 27 Feb 2023 09:13:45 +1300
Subject: [PATCH 626/838] Run CI on merge group (#4489)

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 782fc5cb32..60c987f6c4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,6 +7,7 @@ on:
     branches: [dev, beta, release]
 
   pull_request:
+  merge_group:
 
 permissions:
   contents: read

From 43fb68f8a087bbd2dd18736513ececa531568ea5 Mon Sep 17 00:00:00 2001
From: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Date: Sun, 26 Feb 2023 23:23:04 +0100
Subject: [PATCH 627/838] Fix parallel invocations of repeat action (#4480)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/automation.py          |  6 +++++-
 esphome/core/base_automation.h | 16 +++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/esphome/automation.py b/esphome/automation.py
index 4aede00c5e..0c4bda09d1 100644
--- a/esphome/automation.py
+++ b/esphome/automation.py
@@ -254,7 +254,11 @@ async def repeat_action_to_code(config, action_id, template_arg, args):
     var = cg.new_Pvariable(action_id, template_arg)
     count_template = await cg.templatable(config[CONF_COUNT], args, cg.uint32)
     cg.add(var.set_count(count_template))
-    actions = await build_action_list(config[CONF_THEN], template_arg, args)
+    actions = await build_action_list(
+        config[CONF_THEN],
+        cg.TemplateArguments(cg.uint32, *template_arg.args),
+        [(cg.uint32, "iteration"), *args],
+    )
     cg.add(var.add_then(actions))
     return var
 
diff --git a/esphome/core/base_automation.h b/esphome/core/base_automation.h
index b36a64b82a..5a4fb65198 100644
--- a/esphome/core/base_automation.h
+++ b/esphome/core/base_automation.h
@@ -235,22 +235,21 @@ template<typename... Ts> class RepeatAction : public Action<Ts...> {
  public:
   TEMPLATABLE_VALUE(uint32_t, count)
 
-  void add_then(const std::vector<Action<Ts...> *> &actions) {
+  void add_then(const std::vector<Action<uint32_t, Ts...> *> &actions) {
     this->then_.add_actions(actions);
-    this->then_.add_action(new LambdaAction<Ts...>([this](Ts... x) {
-      this->iteration_++;
-      if (this->iteration_ == this->count_.value(x...))
+    this->then_.add_action(new LambdaAction<uint32_t, Ts...>([this](uint32_t iteration, Ts... x) {
+      iteration++;
+      if (iteration >= this->count_.value(x...))
         this->play_next_tuple_(this->var_);
       else
-        this->then_.play_tuple(this->var_);
+        this->then_.play(iteration, x...);
     }));
   }
 
   void play_complex(Ts... x) override {
     this->num_running_++;
     this->var_ = std::make_tuple(x...);
-    this->iteration_ = 0;
-    this->then_.play_tuple(this->var_);
+    this->then_.play(0, x...);
   }
 
   void play(Ts... x) override { /* ignore - see play_complex */
@@ -259,8 +258,7 @@ template<typename... Ts> class RepeatAction : public Action<Ts...> {
   void stop() override { this->then_.stop(); }
 
  protected:
-  uint32_t iteration_;
-  ActionList<Ts...> then_;
+  ActionList<uint32_t, Ts...> then_;
   std::tuple<Ts...> var_;
 };
 

From eceb79ceabe381007d1714e3094ed229acba9219 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 27 Feb 2023 11:34:51 +1300
Subject: [PATCH 628/838] Make test3 use huge_app (#4488)

---
 tests/test3.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/test3.yaml b/tests/test3.yaml
index 5776e1fc10..549d8f8557 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -3,6 +3,8 @@ esphome:
   name: $device_name
   comment: $device_comment
   build_path: build/test3
+  platformio_options:
+    board_build.partitions: huge_app.csv5
   on_boot:
     - if:
         condition:

From 86407b9f6f95b24c798e4f64fe81b4ef5173fc89 Mon Sep 17 00:00:00 2001
From: GitforZhangXL <263866345@qq.com>
Date: Mon, 27 Feb 2023 06:35:00 +0800
Subject: [PATCH 629/838] Change variable "skip_updates" and
 "skip_updates_counter" type from "uint8_t" to "uint16_t" (#4487)

* change 'skip_updates'from 'uint8' to 'uint16_t'

* Delete modbus_controller_fix.md

* Update modbus_controller.h

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .../modbus_controller/binary_sensor/modbus_binarysensor.h | 2 +-
 esphome/components/modbus_controller/modbus_controller.h  | 8 ++++----
 .../components/modbus_controller/number/modbus_number.h   | 2 +-
 .../components/modbus_controller/select/modbus_select.h   | 2 +-
 .../components/modbus_controller/sensor/modbus_sensor.h   | 2 +-
 .../components/modbus_controller/switch/modbus_switch.h   | 2 +-
 .../modbus_controller/text_sensor/modbus_textsensor.h     | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/esphome/components/modbus_controller/binary_sensor/modbus_binarysensor.h b/esphome/components/modbus_controller/binary_sensor/modbus_binarysensor.h
index 3782416d4f..3a017c6f88 100644
--- a/esphome/components/modbus_controller/binary_sensor/modbus_binarysensor.h
+++ b/esphome/components/modbus_controller/binary_sensor/modbus_binarysensor.h
@@ -12,7 +12,7 @@ namespace modbus_controller {
 class ModbusBinarySensor : public Component, public binary_sensor::BinarySensor, public SensorItem {
  public:
   ModbusBinarySensor(ModbusRegisterType register_type, uint16_t start_address, uint8_t offset, uint32_t bitmask,
-                     uint8_t skip_updates, bool force_new_range) {
+                     uint16_t skip_updates, bool force_new_range) {
     this->register_type = register_type;
     this->start_address = start_address;
     this->offset = offset;
diff --git a/esphome/components/modbus_controller/modbus_controller.h b/esphome/components/modbus_controller/modbus_controller.h
index 512fe0b25d..ccb0edf9c6 100644
--- a/esphome/components/modbus_controller/modbus_controller.h
+++ b/esphome/components/modbus_controller/modbus_controller.h
@@ -246,7 +246,7 @@ class SensorItem {
   uint8_t offset;
   uint8_t register_count;
   uint8_t response_bytes{0};
-  uint8_t skip_updates;
+  uint16_t skip_updates;
   std::vector<uint8_t> custom_data{};
   bool force_new_range{false};
 };
@@ -288,9 +288,9 @@ struct RegisterRange {
   uint16_t start_address;
   ModbusRegisterType register_type;
   uint8_t register_count;
-  uint8_t skip_updates;          // the config value
-  SensorSet sensors;             // all sensors of this range
-  uint8_t skip_updates_counter;  // the running value
+  uint16_t skip_updates;          // the config value
+  SensorSet sensors;              // all sensors of this range
+  uint16_t skip_updates_counter;  // the running value
 };
 
 class ModbusCommandItem {
diff --git a/esphome/components/modbus_controller/number/modbus_number.h b/esphome/components/modbus_controller/number/modbus_number.h
index 9b447d831c..544d161cbc 100644
--- a/esphome/components/modbus_controller/number/modbus_number.h
+++ b/esphome/components/modbus_controller/number/modbus_number.h
@@ -14,7 +14,7 @@ using value_to_data_t = std::function<float>(float);
 class ModbusNumber : public number::Number, public Component, public SensorItem {
  public:
   ModbusNumber(ModbusRegisterType register_type, uint16_t start_address, uint8_t offset, uint32_t bitmask,
-               SensorValueType value_type, int register_count, uint8_t skip_updates, bool force_new_range) {
+               SensorValueType value_type, int register_count, uint16_t skip_updates, bool force_new_range) {
     this->register_type = register_type;
     this->start_address = start_address;
     this->offset = offset;
diff --git a/esphome/components/modbus_controller/select/modbus_select.h b/esphome/components/modbus_controller/select/modbus_select.h
index ffbbba390b..1c046b11d0 100644
--- a/esphome/components/modbus_controller/select/modbus_select.h
+++ b/esphome/components/modbus_controller/select/modbus_select.h
@@ -12,7 +12,7 @@ namespace modbus_controller {
 
 class ModbusSelect : public Component, public select::Select, public SensorItem {
  public:
-  ModbusSelect(SensorValueType sensor_value_type, uint16_t start_address, uint8_t register_count, uint8_t skip_updates,
+  ModbusSelect(SensorValueType sensor_value_type, uint16_t start_address, uint8_t register_count, uint16_t skip_updates,
                bool force_new_range, std::vector<int64_t> mapping) {
     this->register_type = ModbusRegisterType::HOLDING;  // not configurable
     this->sensor_value_type = sensor_value_type;
diff --git a/esphome/components/modbus_controller/sensor/modbus_sensor.h b/esphome/components/modbus_controller/sensor/modbus_sensor.h
index 848d5f63de..65eb487c1c 100644
--- a/esphome/components/modbus_controller/sensor/modbus_sensor.h
+++ b/esphome/components/modbus_controller/sensor/modbus_sensor.h
@@ -12,7 +12,7 @@ namespace modbus_controller {
 class ModbusSensor : public Component, public sensor::Sensor, public SensorItem {
  public:
   ModbusSensor(ModbusRegisterType register_type, uint16_t start_address, uint8_t offset, uint32_t bitmask,
-               SensorValueType value_type, int register_count, uint8_t skip_updates, bool force_new_range) {
+               SensorValueType value_type, int register_count, uint16_t skip_updates, bool force_new_range) {
     this->register_type = register_type;
     this->start_address = start_address;
     this->offset = offset;
diff --git a/esphome/components/modbus_controller/switch/modbus_switch.h b/esphome/components/modbus_controller/switch/modbus_switch.h
index 0f2d8f6e59..bfe46f3ac8 100644
--- a/esphome/components/modbus_controller/switch/modbus_switch.h
+++ b/esphome/components/modbus_controller/switch/modbus_switch.h
@@ -12,7 +12,7 @@ namespace modbus_controller {
 class ModbusSwitch : public Component, public switch_::Switch, public SensorItem {
  public:
   ModbusSwitch(ModbusRegisterType register_type, uint16_t start_address, uint8_t offset, uint32_t bitmask,
-               uint8_t skip_updates, bool force_new_range) {
+               uint16_t skip_updates, bool force_new_range) {
     this->register_type = register_type;
     this->start_address = start_address;
     this->offset = offset;
diff --git a/esphome/components/modbus_controller/text_sensor/modbus_textsensor.h b/esphome/components/modbus_controller/text_sensor/modbus_textsensor.h
index 2e3be72034..9cc0db05a5 100644
--- a/esphome/components/modbus_controller/text_sensor/modbus_textsensor.h
+++ b/esphome/components/modbus_controller/text_sensor/modbus_textsensor.h
@@ -14,7 +14,7 @@ enum class RawEncoding { NONE = 0, HEXBYTES = 1, COMMA = 2 };
 class ModbusTextSensor : public Component, public text_sensor::TextSensor, public SensorItem {
  public:
   ModbusTextSensor(ModbusRegisterType register_type, uint16_t start_address, uint8_t offset, uint8_t register_count,
-                   uint16_t response_bytes, RawEncoding encode, uint8_t skip_updates, bool force_new_range) {
+                   uint16_t response_bytes, RawEncoding encode, uint16_t skip_updates, bool force_new_range) {
     this->register_type = register_type;
     this->start_address = start_address;
     this->offset = offset;

From a428e2b68950a85e3a8461e7270249f3d40449af Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 27 Feb 2023 14:20:56 +1300
Subject: [PATCH 630/838] Fix copy-pasta mistake (#4492)

---
 tests/test3.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test3.yaml b/tests/test3.yaml
index 549d8f8557..e62a171c95 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -4,7 +4,7 @@ esphome:
   comment: $device_comment
   build_path: build/test3
   platformio_options:
-    board_build.partitions: huge_app.csv5
+    board_build.partitions: huge_app.csv
   on_boot:
     - if:
         condition:

From df3f13ded884682dfbcbba542d79aedb1e100b0a Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sat, 4 Mar 2023 20:19:51 +1300
Subject: [PATCH 631/838] Add int16 to codegen (#4507)

---
 esphome/codegen.py   | 1 +
 esphome/cpp_types.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/esphome/codegen.py b/esphome/codegen.py
index ef5b490004..c926c94070 100644
--- a/esphome/codegen.py
+++ b/esphome/codegen.py
@@ -63,6 +63,7 @@ from esphome.cpp_types import (  # noqa
     uint16,
     uint32,
     uint64,
+    int16,
     int32,
     int64,
     size_t,
diff --git a/esphome/cpp_types.py b/esphome/cpp_types.py
index aafe765111..7d0e386b66 100644
--- a/esphome/cpp_types.py
+++ b/esphome/cpp_types.py
@@ -14,6 +14,7 @@ uint8 = global_ns.namespace("uint8_t")
 uint16 = global_ns.namespace("uint16_t")
 uint32 = global_ns.namespace("uint32_t")
 uint64 = global_ns.namespace("uint64_t")
+int16 = global_ns.namespace("int16_t")
 int32 = global_ns.namespace("int32_t")
 int64 = global_ns.namespace("int64_t")
 size_t = global_ns.namespace("size_t")

From bd86a0ac3b1f47306a9814cfd11c0374a61a33ab Mon Sep 17 00:00:00 2001
From: Aliasghar Dashkhaneh <dashkhaneh@gmail.com>
Date: Sun, 5 Mar 2023 22:15:54 +0330
Subject: [PATCH 632/838] Update __init__.py (#4514)

In some Sony remote codes, the **data** is more than 16 bits.
---
 esphome/components/remote_base/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/remote_base/__init__.py b/esphome/components/remote_base/__init__.py
index c5c8921e20..4d9196c9c5 100644
--- a/esphome/components/remote_base/__init__.py
+++ b/esphome/components/remote_base/__init__.py
@@ -713,7 +713,7 @@ def sony_dumper(var, config):
 
 @register_action("sony", SonyAction, SONY_SCHEMA)
 async def sony_action(var, config, args):
-    template_ = await cg.templatable(config[CONF_DATA], args, cg.uint16)
+    template_ = await cg.templatable(config[CONF_DATA], args, cg.uint32)
     cg.add(var.set_data(template_))
     template_ = await cg.templatable(config[CONF_NBITS], args, cg.uint32)
     cg.add(var.set_nbits(template_))

From b8ca40170e59c08d0cd002c50c54db8ba86c792d Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 6 Mar 2023 09:17:32 +1300
Subject: [PATCH 633/838] Remove idf components before checking if any in
 config (#4506)

* Remove idf components before checking if any in config

* Fix bug with no refresh time specified
---
 esphome/components/esp32/__init__.py | 8 ++++----
 esphome/git.py                       | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index 69fc8d3262..ba11aeef21 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -523,11 +523,11 @@ def copy_files():
             __version__,
         )
 
+        import shutil
+
+        shutil.rmtree(CORE.relative_build_path("components"), ignore_errors=True)
+
         if CORE.data[KEY_ESP32][KEY_COMPONENTS]:
-            import shutil
-
-            shutil.rmtree(CORE.relative_build_path("components"), ignore_errors=True)
-
             components: dict = CORE.data[KEY_ESP32][KEY_COMPONENTS]
 
             for name, component in components.items():
diff --git a/esphome/git.py b/esphome/git.py
index 130cd4f5e1..a607325b73 100644
--- a/esphome/git.py
+++ b/esphome/git.py
@@ -44,7 +44,7 @@ def clone_or_update(
     *,
     url: str,
     ref: str = None,
-    refresh: TimePeriodSeconds,
+    refresh: Optional[TimePeriodSeconds],
     domain: str,
     username: str = None,
     password: str = None,
@@ -81,7 +81,7 @@ def clone_or_update(
         if not file_timestamp.exists():
             file_timestamp = Path(repo_dir / ".git" / "HEAD")
         age = datetime.now() - datetime.fromtimestamp(file_timestamp.stat().st_mtime)
-        if age.total_seconds() > refresh.total_seconds:
+        if refresh is None or age.total_seconds() > refresh.total_seconds:
             old_sha = run_git_command(["git", "rev-parse", "HEAD"], str(repo_dir))
             _LOGGER.info("Updating %s", key)
             _LOGGER.debug("Location: %s", repo_dir)

From 7466773ac8afab753afb520514df869e4bcb54bb Mon Sep 17 00:00:00 2001
From: tljuniper <48209000+tljuniper@users.noreply.github.com>
Date: Sun, 5 Mar 2023 21:28:46 +0100
Subject: [PATCH 634/838] substitutions: Don't warn when passwords look like a
 substitution (#4161)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/substitutions/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/substitutions/__init__.py b/esphome/components/substitutions/__init__.py
index 5a3da1abbe..b65410cbed 100644
--- a/esphome/components/substitutions/__init__.py
+++ b/esphome/components/substitutions/__init__.py
@@ -66,7 +66,7 @@ def _expand_substitutions(substitutions, value, path, ignore_missing):
         if name.startswith("{") and name.endswith("}"):
             name = name[1:-1]
         if name not in substitutions:
-            if not ignore_missing:
+            if not ignore_missing and "password" not in path:
                 _LOGGER.warning(
                     "Found '%s' (see %s) which looks like a substitution, but '%s' was "
                     "not declared",

From b8538c2c12620f16fada80824f50f70fbf6de1d9 Mon Sep 17 00:00:00 2001
From: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Date: Mon, 6 Mar 2023 00:02:36 +0100
Subject: [PATCH 635/838] Fix typo (#4515)

---
 esphome/core/macros.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/core/macros.h b/esphome/core/macros.h
index 70ceaf58f4..ee53d20ad1 100644
--- a/esphome/core/macros.h
+++ b/esphome/core/macros.h
@@ -1,4 +1,4 @@
 #pragma once
 
-// Helper macro to define a version code, whos evalue can be compared against other version codes.
+// Helper macro to define a version code, whose value can be compared against other version codes.
 #define VERSION_CODE(major, minor, patch) ((major) << 16 | (minor) << 8 | (patch))

From 29571a1acd22e08f25ced2aec80c3c40fd3ee065 Mon Sep 17 00:00:00 2001
From: Fredrik Gustafsson <jagheterfredrik@gmail.com>
Date: Mon, 6 Mar 2023 19:04:35 +0100
Subject: [PATCH 636/838] implement pairing for bluetooth proxy (#4475)

* default to just-works encryption

This patch will turn on encryption when making active connections in order to comply with just-works BLE encryption.

* Revert "default to just-works encryption"

This reverts commit 05bc9e9f1cca9c41cbc7434379cbd5eb6dbb1034.

* implement pair method

* adhere to clang formatter

* fix oopsie

* bump bluetooth_proxy_version

* add auth callback

* generate new protos

* fix another oopsie

* add pairing status to connection

* clear paired on connect()

* lint

* add unpair ("forget") ble method

* compile protos

* fix oopsie

* add missing unpairing method

* add unpairing

* fix get_paired return type

* remove unused memcpy

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* change to is_paired

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Update bluetooth_proxy.cpp

* actually add missing method

* send auth cb on set_encryption failure

* cleanup from havin the worst test setup

* lint

* match auth events to bd_addr

* add second addr check to auth cb

* add addr check to third auth cb

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/api/api.proto              | 20 +++++
 esphome/components/api/api_connection.cpp     |  2 +-
 esphome/components/api/api_pb2.cpp            | 86 +++++++++++++++++++
 esphome/components/api/api_pb2.h              | 26 ++++++
 esphome/components/api/api_pb2_service.cpp    | 16 ++++
 esphome/components/api/api_pb2_service.h      |  6 ++
 esphome/components/api/api_server.cpp         | 22 +++++
 esphome/components/api/api_server.h           |  2 +
 .../bluetooth_proxy/bluetooth_connection.cpp  | 19 ++++
 .../bluetooth_proxy/bluetooth_connection.h    |  1 +
 .../bluetooth_proxy/bluetooth_proxy.cpp       | 29 +++++--
 .../bluetooth_proxy/bluetooth_proxy.h         |  9 ++
 .../esp32_ble_client/ble_client_base.cpp      |  8 ++
 .../esp32_ble_client/ble_client_base.h        |  3 +
 14 files changed, 240 insertions(+), 9 deletions(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index eb639f2065..1cebdd0cbe 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -1339,3 +1339,23 @@ message BluetoothGATTNotifyResponse {
   uint64 address = 1;
   uint32 handle = 2;
 }
+
+message BluetoothDevicePairingResponse {
+  option (id) = 85;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  bool paired = 2;
+  int32 error = 3;
+}
+
+message BluetoothDeviceUnpairingResponse {
+  option (id) = 86;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  bool success = 2;
+  int32 error = 3;
+}
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 487aa53193..40a5a230a5 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -953,7 +953,7 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
   resp.webserver_port = USE_WEBSERVER_PORT;
 #endif
 #ifdef USE_BLUETOOTH_PROXY
-  resp.bluetooth_proxy_version = bluetooth_proxy::global_bluetooth_proxy->has_active() ? 3 : 1;
+  resp.bluetooth_proxy_version = bluetooth_proxy::global_bluetooth_proxy->has_active() ? 4 : 1;
 #endif
   return resp;
 }
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 3fc1bfa95d..381f8b3c46 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -5974,6 +5974,92 @@ void BluetoothGATTNotifyResponse::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
+bool BluetoothDevicePairingResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->paired = value.as_bool();
+      return true;
+    }
+    case 3: {
+      this->error = value.as_int32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothDevicePairingResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_bool(2, this->paired);
+  buffer.encode_int32(3, this->error);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothDevicePairingResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothDevicePairingResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  paired: ");
+  out.append(YESNO(this->paired));
+  out.append("\n");
+
+  out.append("  error: ");
+  sprintf(buffer, "%d", this->error);
+  out.append(buffer);
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool BluetoothDeviceUnpairingResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->success = value.as_bool();
+      return true;
+    }
+    case 3: {
+      this->error = value.as_int32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothDeviceUnpairingResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_bool(2, this->success);
+  buffer.encode_int32(3, this->error);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothDeviceUnpairingResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothDeviceUnpairingResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  success: ");
+  out.append(YESNO(this->success));
+  out.append("\n");
+
+  out.append("  error: ");
+  sprintf(buffer, "%d", this->error);
+  out.append(buffer);
+  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 e192892e72..e9025142e9 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -1528,6 +1528,32 @@ class BluetoothGATTNotifyResponse : public ProtoMessage {
  protected:
   bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
+class BluetoothDevicePairingResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  bool paired{false};
+  int32_t error{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class BluetoothDeviceUnpairingResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  bool success{false};
+  int32_t error{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt 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 b603ade9de..7ee9e56192 100644
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -425,6 +425,22 @@ bool APIServerConnectionBase::send_bluetooth_gatt_notify_response(const Bluetoot
   return this->send_message_<BluetoothGATTNotifyResponse>(msg, 84);
 }
 #endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_device_pairing_response(const BluetoothDevicePairingResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_device_pairing_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothDevicePairingResponse>(msg, 85);
+}
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_device_unpairing_response(const BluetoothDeviceUnpairingResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_device_unpairing_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothDeviceUnpairingResponse>(msg, 86);
+}
+#endif
 bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
   switch (msg_type) {
     case 1: {
diff --git a/esphome/components/api/api_pb2_service.h b/esphome/components/api/api_pb2_service.h
index 3cb8b59ba5..f1879b2dba 100644
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -209,6 +209,12 @@ class APIServerConnectionBase : public ProtoService {
 #endif
 #ifdef USE_BLUETOOTH_PROXY
   bool send_bluetooth_gatt_notify_response(const BluetoothGATTNotifyResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_device_pairing_response(const BluetoothDevicePairingResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_device_unpairing_response(const BluetoothDeviceUnpairingResponse &msg);
 #endif
  protected:
   bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index dbd732f466..6e28637241 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -309,6 +309,28 @@ void APIServer::send_bluetooth_device_connection(uint64_t address, bool connecte
   }
 }
 
+void APIServer::send_bluetooth_device_pairing(uint64_t address, bool paired, esp_err_t error) {
+  BluetoothDevicePairingResponse call;
+  call.address = address;
+  call.paired = paired;
+  call.error = error;
+
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_device_pairing_response(call);
+  }
+}
+
+void APIServer::send_bluetooth_device_unpairing(uint64_t address, bool success, esp_err_t error) {
+  BluetoothDeviceUnpairingResponse call;
+  call.address = address;
+  call.success = success;
+  call.error = error;
+
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_device_unpairing_response(call);
+  }
+}
+
 void APIServer::send_bluetooth_connections_free(uint8_t free, uint8_t limit) {
   BluetoothConnectionsFreeResponse call;
   call.free = free;
diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index 8e69a77475..5f92e6b058 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -78,6 +78,8 @@ class APIServer : public Component, public Controller {
 #ifdef USE_BLUETOOTH_PROXY
   void send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &call);
   void send_bluetooth_device_connection(uint64_t address, bool connected, uint16_t mtu = 0, esp_err_t error = ESP_OK);
+  void send_bluetooth_device_pairing(uint64_t address, bool paired, esp_err_t error = ESP_OK);
+  void send_bluetooth_device_unpairing(uint64_t address, bool success, esp_err_t error = ESP_OK);
   void send_bluetooth_connections_free(uint8_t free, uint8_t limit);
   void send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &call);
   void send_bluetooth_gatt_write_response(const BluetoothGATTWriteResponse &call);
diff --git a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
index 09611b6174..9354ab36d6 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
@@ -158,6 +158,25 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
   return true;
 }
 
+void BluetoothConnection::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
+  BLEClientBase::gap_event_handler(event, param);
+
+  switch (event) {
+    case ESP_GAP_BLE_AUTH_CMPL_EVT:
+      if (memcmp(param->ble_security.auth_cmpl.bd_addr, this->remote_bda_, 6) != 0)
+        break;
+      if (param->ble_security.auth_cmpl.success) {
+        api::global_api_server->send_bluetooth_device_pairing(this->address_, true);
+      } else {
+        api::global_api_server->send_bluetooth_device_pairing(this->address_, false,
+                                                              param->ble_security.auth_cmpl.fail_reason);
+      }
+      break;
+    default:
+      break;
+  }
+}
+
 esp_err_t BluetoothConnection::read_characteristic(uint16_t handle) {
   if (!this->connected()) {
     ESP_LOGW(TAG, "[%d] [%s] Cannot read GATT characteristic, not connected.", this->connection_index_,
diff --git a/esphome/components/bluetooth_proxy/bluetooth_connection.h b/esphome/components/bluetooth_proxy/bluetooth_connection.h
index fde074d17f..8b13f4d1c2 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.h
@@ -13,6 +13,7 @@ class BluetoothConnection : public esp32_ble_client::BLEClientBase {
  public:
   bool 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;
 
   esp_err_t read_characteristic(uint16_t handle);
   esp_err_t write_characteristic(uint16_t handle, const std::string &data, bool response);
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index 017e1bf83f..55fabf05ef 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -257,12 +257,7 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
         ESP_LOGI(TAG, "[%d] [%s] Connecting v1", connection->get_connection_index(), connection->address_str().c_str());
       }
       if (msg.has_address_type) {
-        connection->remote_bda_[0] = (msg.address >> 40) & 0xFF;
-        connection->remote_bda_[1] = (msg.address >> 32) & 0xFF;
-        connection->remote_bda_[2] = (msg.address >> 24) & 0xFF;
-        connection->remote_bda_[3] = (msg.address >> 16) & 0xFF;
-        connection->remote_bda_[4] = (msg.address >> 8) & 0xFF;
-        connection->remote_bda_[5] = (msg.address >> 0) & 0xFF;
+        uint64_to_bd_addr(msg.address, connection->remote_bda_);
         connection->set_remote_addr_type(static_cast<esp_ble_addr_type_t>(msg.address_type));
         connection->set_state(espbt::ClientState::DISCOVERED);
       } else {
@@ -290,9 +285,27 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
       }
       break;
     }
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR:
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR:
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR: {
+      auto *connection = this->get_connection_(msg.address, false);
+      if (connection != nullptr) {
+        if (!connection->is_paired()) {
+          auto err = connection->pair();
+          if (err != ESP_OK) {
+            api::global_api_server->send_bluetooth_device_pairing(msg.address, false, err);
+          }
+        } else {
+          api::global_api_server->send_bluetooth_device_pairing(msg.address, true);
+        }
+      }
       break;
+    }
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR: {
+      esp_bd_addr_t address;
+      uint64_to_bd_addr(msg.address, address);
+      esp_err_t ret = esp_ble_remove_bond_device(address);
+      api::global_api_server->send_bluetooth_device_unpairing(msg.address, ret == ESP_OK, ret);
+      break;
+    }
   }
 }
 
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.h b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
index 5d3b385bec..b99e9a8527 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -44,6 +44,15 @@ class BluetoothProxy : public esp32_ble_tracker::ESPBTDeviceListener, public Com
   int get_bluetooth_connections_free();
   int get_bluetooth_connections_limit() { return this->connections_.size(); }
 
+  static void uint64_to_bd_addr(uint64_t address, esp_bd_addr_t bd_addr) {
+    bd_addr[0] = (address >> 40) & 0xff;
+    bd_addr[1] = (address >> 32) & 0xff;
+    bd_addr[2] = (address >> 24) & 0xff;
+    bd_addr[3] = (address >> 16) & 0xff;
+    bd_addr[4] = (address >> 8) & 0xff;
+    bd_addr[5] = (address >> 0) & 0xff;
+  }
+
   void set_active(bool active) { this->active_ = active; }
   bool has_active() { return this->active_; }
 
diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 2793a74c5a..9ca82c7239 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -62,6 +62,7 @@ bool BLEClientBase::parse_device(const espbt::ESPBTDevice &device) {
 void BLEClientBase::connect() {
   ESP_LOGI(TAG, "[%d] [%s] 0x%02x Attempting BLE connection", this->connection_index_, this->address_str_.c_str(),
            this->remote_addr_type_);
+  this->paired_ = false;
   auto ret = esp_ble_gattc_open(this->gattc_if_, this->remote_bda_, this->remote_addr_type_, true);
   if (ret) {
     ESP_LOGW(TAG, "[%d] [%s] esp_ble_gattc_open error, status=%d", this->connection_index_, this->address_str_.c_str(),
@@ -72,6 +73,8 @@ void BLEClientBase::connect() {
   }
 }
 
+esp_err_t BLEClientBase::pair() { return esp_ble_set_encryption(this->remote_bda_, ESP_BLE_SEC_ENCRYPT); }
+
 void BLEClientBase::disconnect() {
   if (this->state_ == espbt::ClientState::IDLE || this->state_ == espbt::ClientState::DISCONNECTING)
     return;
@@ -247,11 +250,15 @@ void BLEClientBase::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_
   switch (event) {
     // This event is sent by the server when it requests security
     case ESP_GAP_BLE_SEC_REQ_EVT:
+      if (memcmp(param->ble_security.auth_cmpl.bd_addr, this->remote_bda_, 6) != 0)
+        break;
       ESP_LOGV(TAG, "[%d] [%s] ESP_GAP_BLE_SEC_REQ_EVT %x", this->connection_index_, this->address_str_.c_str(), event);
       esp_ble_gap_security_rsp(param->ble_security.ble_req.bd_addr, true);
       break;
     // This event is sent once authentication has completed
     case ESP_GAP_BLE_AUTH_CMPL_EVT:
+      if (memcmp(param->ble_security.auth_cmpl.bd_addr, this->remote_bda_, 6) != 0)
+        break;
       esp_bd_addr_t bd_addr;
       memcpy(bd_addr, param->ble_security.auth_cmpl.bd_addr, sizeof(esp_bd_addr_t));
       ESP_LOGI(TAG, "[%d] [%s] auth complete. remote BD_ADDR: %s", this->connection_index_, this->address_str_.c_str(),
@@ -260,6 +267,7 @@ void BLEClientBase::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_
         ESP_LOGE(TAG, "[%d] [%s] auth fail reason = 0x%x", this->connection_index_, this->address_str_.c_str(),
                  param->ble_security.auth_cmpl.fail_reason);
       } else {
+        this->paired_ = true;
         ESP_LOGV(TAG, "[%d] [%s] auth success. address type = %d auth mode = %d", this->connection_index_,
                  this->address_str_.c_str(), param->ble_security.auth_cmpl.addr_type,
                  param->ble_security.auth_cmpl.auth_mode);
diff --git a/esphome/components/esp32_ble_client/ble_client_base.h b/esphome/components/esp32_ble_client/ble_client_base.h
index 9adf239512..2879da4d8c 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.h
+++ b/esphome/components/esp32_ble_client/ble_client_base.h
@@ -33,6 +33,7 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
                            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 connect() override;
+  esp_err_t pair();
   void disconnect();
   void release_services();
 
@@ -71,6 +72,7 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
   void set_remote_addr_type(esp_ble_addr_type_t address_type) { this->remote_addr_type_ = address_type; }
   uint16_t get_conn_id() const { return this->conn_id_; }
   uint64_t get_address() const { return this->address_; }
+  bool is_paired() const { return this->paired_; }
 
   uint8_t get_connection_index() const { return this->connection_index_; }
 
@@ -86,6 +88,7 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
   uint8_t connection_index_;
   int16_t service_count_{0};
   uint16_t mtu_{23};
+  bool paired_{false};
   espbt::ConnectionType connection_type_{espbt::ConnectionType::V1};
 
   std::vector<BLEService *> services_;

From 5a07e8d32b7466f04cc67d2d49b8f3792e9db66c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 7 Mar 2023 17:06:42 +1300
Subject: [PATCH 637/838] Bump docker dependencies (#4526)

* Bump curl to 7.74.0-1.3+deb11u7

* Bump docker base images
---
 docker/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index dc9c4b7101..59901d7b2c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,9 +6,9 @@
 ARG BASEIMGTYPE=docker
 
 # https://github.com/hassio-addons/addon-debian-base/releases
-FROM ghcr.io/hassio-addons/debian-base:6.2.0 AS base-hassio
+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-20221024-slim AS base-docker
+FROM debian:bullseye-20230208-slim AS base-docker
 
 FROM base-${BASEIMGTYPE} AS base
 
@@ -26,7 +26,7 @@ RUN \
         python3-cryptography=3.3.2-1 \
         iputils-ping=3:20210202-1 \
         git=1:2.30.2-1 \
-        curl=7.74.0-1.3+deb11u5 \
+        curl=7.74.0-1.3+deb11u7 \
         openssh-client=1:8.4p1-5+deb11u1 \
     && rm -rf \
         /tmp/* \

From 3227ef4bca1c6585258b7a256b70b1770c6c3c64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Mar 2023 17:07:15 +1300
Subject: [PATCH 638/838] Bump aioesphomeapi from 13.4.0 to 13.5.0 (#4525)

Bumps [aioesphomeapi](https://github.com/esphome/aioesphomeapi) from 13.4.0 to 13.5.0.
- [Release notes](https://github.com/esphome/aioesphomeapi/releases)
- [Commits](https://github.com/esphome/aioesphomeapi/compare/v13.4.0...v13.5.0)

---
updated-dependencies:
- dependency-name: aioesphomeapi
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
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 bfad2433c6..b49737d991 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.6  # When updating platformio, also update Dockerfile
 esptool==4.5
 click==8.1.3
 esphome-dashboard==20230214.0
-aioesphomeapi==13.4.0
+aioesphomeapi==13.5.0
 zeroconf==0.47.3
 
 # esp-idf requires this, but doesn't bundle it by default

From 3773c385c702ba64d6a9836822334db553b6c016 Mon Sep 17 00:00:00 2001
From: Fabian <Fabian-Schmidt@users.noreply.github.com>
Date: Tue, 7 Mar 2023 05:16:42 +0100
Subject: [PATCH 639/838] Ensure component is ready before update. (#4523)

Co-authored-by: Your Name <you@example.com>
---
 esphome/core/base_automation.h | 2 +-
 esphome/core/component.cpp     | 4 ++++
 esphome/core/component.h       | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/esphome/core/base_automation.h b/esphome/core/base_automation.h
index 5a4fb65198..daa09b912e 100644
--- a/esphome/core/base_automation.h
+++ b/esphome/core/base_automation.h
@@ -317,7 +317,7 @@ template<typename... Ts> class UpdateComponentAction : public Action<Ts...> {
   UpdateComponentAction(PollingComponent *component) : component_(component) {}
 
   void play(Ts... x) override {
-    if (this->component_->is_failed())
+    if (!this->component_->is_ready())
       return;
     this->component_->update();
   }
diff --git a/esphome/core/component.cpp b/esphome/core/component.cpp
index b1ace8b2d1..49ef8ecde7 100644
--- a/esphome/core/component.cpp
+++ b/esphome/core/component.cpp
@@ -135,6 +135,10 @@ void Component::set_retry(uint32_t initial_wait_time, uint8_t max_attempts, std:
   App.scheduler.set_retry(this, "", initial_wait_time, max_attempts, std::move(f), backoff_increase_factor);
 }
 bool Component::is_failed() { return (this->component_state_ & COMPONENT_STATE_MASK) == COMPONENT_STATE_FAILED; }
+bool Component::is_ready() {
+  return (this->component_state_ & COMPONENT_STATE_MASK) == COMPONENT_STATE_LOOP ||
+         (this->component_state_ & COMPONENT_STATE_MASK) == COMPONENT_STATE_SETUP;
+}
 bool Component::can_proceed() { return true; }
 bool Component::status_has_warning() { return this->component_state_ & STATUS_LED_WARNING; }
 bool Component::status_has_error() { return this->component_state_ & STATUS_LED_ERROR; }
diff --git a/esphome/core/component.h b/esphome/core/component.h
index 769e74e645..7382f1c617 100644
--- a/esphome/core/component.h
+++ b/esphome/core/component.h
@@ -119,6 +119,8 @@ class Component {
 
   bool is_failed();
 
+  bool is_ready();
+
   virtual bool can_proceed();
 
   bool status_has_warning();

From 05ab49a6152cb46a877dcbf851b1127c764725a8 Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo
 <VP331RHQ115POU58JFRLKB7OPA0L18E3@cmx.ietfng.org>
Date: Tue, 7 Mar 2023 04:19:49 +0000
Subject: [PATCH 640/838] climate: add on_control callbacks (#4511)

This lets downstream components respond to climate configuration
changes, which take place through ClimateCall objects, without also
being notified every time the state changes, which happens every time
the input sensor announces a new value.

FIXES https://github.com/esphome/feature-requests/issues/2136
---
 esphome/components/climate/__init__.py  | 7 +++++++
 esphome/components/climate/automation.h | 7 +++++++
 esphome/components/climate/climate.cpp  | 5 +++++
 esphome/components/climate/climate.h    | 9 +++++++++
 esphome/const.py                        | 1 +
 tests/test1.yaml                        | 2 ++
 6 files changed, 31 insertions(+)

diff --git a/esphome/components/climate/__init__.py b/esphome/components/climate/__init__.py
index 709d0d12ed..4a16c3fb7d 100644
--- a/esphome/components/climate/__init__.py
+++ b/esphome/components/climate/__init__.py
@@ -20,6 +20,7 @@ from esphome.const import (
     CONF_MODE,
     CONF_MODE_COMMAND_TOPIC,
     CONF_MODE_STATE_TOPIC,
+    CONF_ON_CONTROL,
     CONF_ON_STATE,
     CONF_PRESET,
     CONF_PRESET_COMMAND_TOPIC,
@@ -127,6 +128,7 @@ def single_visual_temperature(value):
 # Actions
 ControlAction = climate_ns.class_("ControlAction", automation.Action)
 StateTrigger = climate_ns.class_("StateTrigger", automation.Trigger.template())
+ControlTrigger = climate_ns.class_("ControlTrigger", automation.Trigger.template())
 
 VISUAL_TEMPERATURE_STEP_SCHEMA = cv.Any(
     single_visual_temperature,
@@ -203,6 +205,11 @@ CLIMATE_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).
         cv.Optional(CONF_TARGET_TEMPERATURE_LOW_STATE_TOPIC): cv.All(
             cv.requires_component("mqtt"), cv.publish_topic
         ),
+        cv.Optional(CONF_ON_CONTROL): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ControlTrigger),
+            }
+        ),
         cv.Optional(CONF_ON_STATE): automation.validate_automation(
             {
                 cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(StateTrigger),
diff --git a/esphome/components/climate/automation.h b/esphome/components/climate/automation.h
index 3145358dab..9b06563eb4 100644
--- a/esphome/components/climate/automation.h
+++ b/esphome/components/climate/automation.h
@@ -42,6 +42,13 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
   Climate *climate_;
 };
 
+class ControlTrigger : public Trigger<> {
+ public:
+  ControlTrigger(Climate *climate) {
+    climate->add_on_control_callback([this]() { this->trigger(); });
+  }
+};
+
 class StateTrigger : public Trigger<> {
  public:
   StateTrigger(Climate *climate) {
diff --git a/esphome/components/climate/climate.cpp b/esphome/components/climate/climate.cpp
index b80fe640c8..37572ae913 100644
--- a/esphome/components/climate/climate.cpp
+++ b/esphome/components/climate/climate.cpp
@@ -44,6 +44,7 @@ void ClimateCall::perform() {
   if (this->target_temperature_high_.has_value()) {
     ESP_LOGD(TAG, "  Target Temperature High: %.2f", *this->target_temperature_high_);
   }
+  this->parent_->control_callback_.call();
   this->parent_->control(*this);
 }
 void ClimateCall::validate_() {
@@ -317,6 +318,10 @@ void Climate::add_on_state_callback(std::function<void()> &&callback) {
   this->state_callback_.add(std::move(callback));
 }
 
+void Climate::add_on_control_callback(std::function<void()> &&callback) {
+  this->control_callback_.add(std::move(callback));
+}
+
 // Random 32bit value; If this changes existing restore preferences are invalidated
 static const uint32_t RESTORE_STATE_VERSION = 0x848EA6ADUL;
 
diff --git a/esphome/components/climate/climate.h b/esphome/components/climate/climate.h
index 8cc260abbe..520036f718 100644
--- a/esphome/components/climate/climate.h
+++ b/esphome/components/climate/climate.h
@@ -219,6 +219,14 @@ class Climate : public EntityBase {
    */
   void add_on_state_callback(std::function<void()> &&callback);
 
+  /**
+   * Add a callback for the climate device configuration; each time the configuration parameters of a climate device
+   * is updated (using perform() of a ClimateCall), this callback will be called, before any on_state callback.
+   *
+   * @param callback The callback to call.
+   */
+  void add_on_control_callback(std::function<void()> &&callback);
+
   /** Make a climate device control call, this is used to control the climate device, see the ClimateCall description
    * for more info.
    * @return A new ClimateCall instance targeting this climate device.
@@ -285,6 +293,7 @@ class Climate : public EntityBase {
   void dump_traits_(const char *tag);
 
   CallbackManager<void()> state_callback_{};
+  CallbackManager<void()> control_callback_{};
   ESPPreferenceObject rtc_;
   optional<float> visual_min_temperature_override_{};
   optional<float> visual_max_temperature_override_{};
diff --git a/esphome/const.py b/esphome/const.py
index d821a76b75..0ab9dd54bf 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -447,6 +447,7 @@ CONF_ON_BLE_SERVICE_DATA_ADVERTISE = "on_ble_service_data_advertise"
 CONF_ON_BOOT = "on_boot"
 CONF_ON_CLICK = "on_click"
 CONF_ON_CONNECT = "on_connect"
+CONF_ON_CONTROL = "on_control"
 CONF_ON_DISCONNECT = "on_disconnect"
 CONF_ON_DOUBLE_CLICK = "on_double_click"
 CONF_ON_ENROLLMENT_DONE = "on_enrollment_done"
diff --git a/tests/test1.yaml b/tests/test1.yaml
index d43490c8cc..a554d45771 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -2052,6 +2052,8 @@ climate:
     name: Midea IR
     use_fahrenheit: true
   - platform: midea
+    on_control:
+      logger.log: Control message received!
     on_state:
       logger.log: State changed!
     id: midea_unit

From 6ecf4ecac6125219253672e734d7f7f14bec9b11 Mon Sep 17 00:00:00 2001
From: kahrendt <kahrendt@gmail.com>
Date: Mon, 6 Mar 2023 23:25:14 -0500
Subject: [PATCH 641/838] FS3000 sensor (#4502)

* Add support for FS3000 sensor.

* add fs3000 to test yaml

* Clean up code with clang.

* Clean up sensor.py file.

* Update CODEOWNERS file.

* Apply suggestions from code review regarding sensor.py

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Apply suggestions from code review for basic issues regarding C++ code

- removed unnecessary default for FS3000Model
- use "this->" before any sensor update

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Move model setup to overall setup function.

* Remove unneeded CONF_ID from sensor.py

* Run clang-format

* Move set_model code to header file now that it is simplified

* Update fs3000.h

---------

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

diff --git a/CODEOWNERS b/CODEOWNERS
index 4e3c6c3510..e8f264b633 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -90,6 +90,7 @@ esphome/components/factory_reset/* @anatoly-savchenkov
 esphome/components/fastled_base/* @OttoWinter
 esphome/components/feedback/* @ianchi
 esphome/components/fingerprint_grow/* @OnFreund @loongyh
+esphome/components/fs3000/* @kahrendt
 esphome/components/globals/* @esphome/core
 esphome/components/gpio/* @esphome/core
 esphome/components/gps/* @coogle
diff --git a/esphome/components/fs3000/__init__.py b/esphome/components/fs3000/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/fs3000/fs3000.cpp b/esphome/components/fs3000/fs3000.cpp
new file mode 100644
index 0000000000..fb729ed0a0
--- /dev/null
+++ b/esphome/components/fs3000/fs3000.cpp
@@ -0,0 +1,107 @@
+#include "fs3000.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace fs3000 {
+
+static const char *const TAG = "fs3000";
+
+void FS3000Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up FS3000...");
+
+  if (model_ == FIVE) {
+    // datasheet gives 9 points to interpolate from for the 1005 model
+    static const uint16_t RAW_DATA_POINTS_1005[9] = {409, 915, 1522, 2066, 2523, 2908, 3256, 3572, 3686};
+    static const float MPS_DATA_POINTS_1005[9] = {0.0, 1.07, 2.01, 3.0, 3.97, 4.96, 5.98, 6.99, 7.23};
+
+    std::copy(RAW_DATA_POINTS_1005, RAW_DATA_POINTS_1005 + 9, this->raw_data_points_);
+    std::copy(MPS_DATA_POINTS_1005, MPS_DATA_POINTS_1005 + 9, this->mps_data_points_);
+  } else if (model_ == FIFTEEN) {
+    // datasheet gives 13 points to extrapolate from for the 1015 model
+    static const uint16_t RAW_DATA_POINTS_1015[13] = {409,  1203, 1597, 1908, 2187, 2400, 2629,
+                                                      2801, 3006, 3178, 3309, 3563, 3686};
+    static const float MPS_DATA_POINTS_1015[13] = {0.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 13.0, 15.0};
+
+    std::copy(RAW_DATA_POINTS_1015, RAW_DATA_POINTS_1015 + 13, this->raw_data_points_);
+    std::copy(MPS_DATA_POINTS_1015, MPS_DATA_POINTS_1015 + 13, this->mps_data_points_);
+  }
+}
+
+void FS3000Component::update() {
+  // 5 bytes of data read from fs3000 sensor
+  //  byte 1 - checksum
+  //  byte 2 - (lower 4 bits) high byte of sensor reading
+  //  byte 3 - (8 bits) low byte of sensor reading
+  //  byte 4 - generic checksum data
+  //  byte 5 - generic checksum data
+
+  uint8_t data[5];
+
+  if (!this->read_bytes_raw(data, 5)) {
+    this->status_set_warning();
+    ESP_LOGW(TAG, "Error reading data from FS3000");
+    this->publish_state(NAN);
+    return;
+  }
+
+  // checksum passes if the modulo 256 sum of the five bytes is 0
+  uint8_t checksum = 0;
+  for (uint8_t i : data) {
+    checksum += i;
+  }
+
+  if (checksum != 0) {
+    this->status_set_warning();
+    ESP_LOGW(TAG, "Checksum failure when reading from FS3000");
+    return;
+  }
+
+  // raw value information is 12 bits
+  uint16_t raw_value = (data[1] << 8) | data[2];
+  ESP_LOGV(TAG, "Got raw reading=%i", raw_value);
+
+  // convert and publish the raw value into m/s using the table of data points in the datasheet
+  this->publish_state(fit_raw_(raw_value));
+
+  this->status_clear_warning();
+}
+
+void FS3000Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "FS3000:");
+  LOG_I2C_DEVICE(this);
+  LOG_UPDATE_INTERVAL(this);
+  LOG_SENSOR("  ", "Air Velocity", this);
+}
+
+float FS3000Component::fit_raw_(uint16_t raw_value) {
+  // converts a raw value read from the FS3000 into a speed in m/s based on the
+  // reference data points given in the datasheet
+  // fits raw reading using a linear interpolation between each data point
+
+  uint8_t end = 8;  // assume model 1005, which has 9 data points
+  if (this->model_ == FIFTEEN)
+    end = 12;  // model 1015 has 13 data points
+
+  if (raw_value <= this->raw_data_points_[0]) {  // less than smallest data point returns first data point
+    return this->mps_data_points_[0];
+  } else if (raw_value >= this->raw_data_points_[end]) {  // greater than largest data point returns max speed
+    return this->mps_data_points_[end];
+  } else {
+    uint8_t i = 0;
+
+    // determine between which data points does the reading fall, i-1 and i
+    while (raw_value > this->raw_data_points_[i]) {
+      ++i;
+    }
+
+    // calculate the slope of the secant line between the two data points that surrounds the reading
+    float slope = (this->mps_data_points_[i] - this->mps_data_points_[i - 1]) /
+                  (this->raw_data_points_[i] - this->raw_data_points_[i - 1]);
+
+    // return the interpolated value for the reading
+    return (float(raw_value - this->raw_data_points_[i - 1])) * slope + this->mps_data_points_[i - 1];
+  }
+}
+
+}  // namespace fs3000
+}  // namespace esphome
diff --git a/esphome/components/fs3000/fs3000.h b/esphome/components/fs3000/fs3000.h
new file mode 100644
index 0000000000..be3680e7e1
--- /dev/null
+++ b/esphome/components/fs3000/fs3000.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace fs3000 {
+
+// FS3000 has two models, 1005 and 1015
+//  1005 has a max speed detection of 7.23 m/s
+//  1015 has a max speed detection of 15 m/s
+enum FS3000Model { FIVE, FIFTEEN };
+
+class FS3000Component : public PollingComponent, public i2c::I2CDevice, public sensor::Sensor {
+ public:
+  void setup() override;
+  void update() override;
+
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
+  void set_model(FS3000Model model) { this->model_ = model; }
+
+ protected:
+  FS3000Model model_{};
+
+  uint16_t raw_data_points_[13];
+  float mps_data_points_[13];
+
+  float fit_raw_(uint16_t raw_value);
+};
+
+}  // namespace fs3000
+}  // namespace esphome
diff --git a/esphome/components/fs3000/sensor.py b/esphome/components/fs3000/sensor.py
new file mode 100644
index 0000000000..0c50f52979
--- /dev/null
+++ b/esphome/components/fs3000/sensor.py
@@ -0,0 +1,50 @@
+# initially based off of TMP117 component
+
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import (
+    CONF_MODEL,
+    DEVICE_CLASS_WIND_SPEED,
+    STATE_CLASS_MEASUREMENT,
+)
+
+DEPENDENCIES = ["i2c"]
+CODEOWNERS = ["@kahrendt"]
+
+fs3000_ns = cg.esphome_ns.namespace("fs3000")
+
+FS3000Model = fs3000_ns.enum("MODEL")
+FS3000_MODEL_OPTIONS = {
+    "1005": FS3000Model.FIVE,
+    "1015": FS3000Model.FIFTEEN,
+}
+
+FS3000Component = fs3000_ns.class_(
+    "FS3000Component", cg.PollingComponent, i2c.I2CDevice, sensor.Sensor
+)
+
+CONFIG_SCHEMA = (
+    sensor.sensor_schema(
+        FS3000Component,
+        unit_of_measurement="m/s",
+        accuracy_decimals=2,
+        device_class=DEVICE_CLASS_WIND_SPEED,
+        state_class=STATE_CLASS_MEASUREMENT,
+    )
+    .extend(
+        {
+            cv.Required(CONF_MODEL): cv.enum(FS3000_MODEL_OPTIONS, lower=True),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x28))
+)
+
+
+async def to_code(config):
+    var = await sensor.new_sensor(config)
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
+
+    cg.add(var.set_model(config[CONF_MODEL]))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index a554d45771..4312f2c613 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1224,6 +1224,12 @@ sensor:
   - platform: sen21231
     name: "Person Sensor"
     i2c_id: i2c_bus
+  - platform: fs3000
+    name: "Air Velocity"
+    model: 1005
+    update_interval: 60s
+    i2c_id: i2c_bus
+
 esp32_touch:
   setup_mode: false
   iir_filter: 10ms

From bb5ab8b36d2664ebb01bebe5331bb3e19e60166b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Mar 2023 19:38:05 +1300
Subject: [PATCH 642/838] Bump esptool from 4.5 to 4.5.1 (#4497)

Bumps [esptool](https://github.com/espressif/esptool) from 4.5 to 4.5.1.
- [Release notes](https://github.com/espressif/esptool/releases)
- [Commits](https://github.com/espressif/esptool/compare/v4.5...v4.5.1)

---
updated-dependencies:
- dependency-name: esptool
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
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 b49737d991..df041db26f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ tzlocal==4.2    # from time
 tzdata>=2021.1  # from time
 pyserial==3.5
 platformio==6.1.6  # When updating platformio, also update Dockerfile
-esptool==4.5
+esptool==4.5.1
 click==8.1.3
 esphome-dashboard==20230214.0
 aioesphomeapi==13.5.0

From 356efdb92c6f61de86f4bbb8204cfae8b51fbab7 Mon Sep 17 00:00:00 2001
From: bisbastuner <104585618+bisbastuner@users.noreply.github.com>
Date: Tue, 7 Mar 2023 08:15:40 +0100
Subject: [PATCH 643/838] Add support for multiple devices in bme680_bsec
 (#3550)

* Add initial support for multiple devices

Re-introduce support for multiple I2C devices (it was suppressed in https://github.com/trvrnrth/esphome-bsec-bme680/commit/df37a7635f6acc3f7520f257d2645eda10b863a5). Devices are identified by their I2C address, and the BME680 can only have the 0x76 or 0x77 address, so this adds support for a maximum of two devices.

* Reintegrate commit ebf13a0b

Reintegrate commit https://github.com/esphome/esphome/commit/ebf13a0ba0a48453c2cc80bfc942d6a588859233 which was lost in my changes (I were working on old files)

* wrong commit

* wrong commit

* Reintegrate commit ebf13a0b

Reintegrate commit https://github.com/esphome/esphome/commit/ebf13a0ba0a48453c2cc80bfc942d6a588859233 which was lost due to me working on old files

* Reintroduce newlines at end of files

* Reintroduce newlines at end of files

* Adhere to codebase standards

Obey the "All uses of class members and member functions should be prefixed with this-> to distinguish them from global functions in code review" rule of the Codebase Standards

* Fix formatting according to clang-format

* Perform the BSEC library reinitialization+snapshot only when more than one device is present

* Fix formatting according to clang-format

* Degrade abort message in restore_state_() from warning to verbose

This always happen at initial setup, so it's not a really useful message; when some real problems arise, we'll have a more useful warning from snapshot_state_()

Co-authored-by: Trevor North <trevor@freedisc.co.uk>

* Reduce peak stack usage to avoid bootloops on ESP8266

Achieved mainly by moving the work_buffer needed by the BSEC library to the heap, as a single global work buffer shared by all instances.
::set_config_ has been reverted to a code path similar to the original, as that reduces peak stack usage enough to be OK on ESP8266 even without moving the work_buffer to the heap.

* Fix formatting according to clang-format

* Add support for devices with the same i2c address

Devices are now identified using their index in the BME680BSECComponent::instances member, which became a vector. This allows adding two devices with the same i2c address (which should be placed on different i2c buses). Since a BME680 can only have an address of 0x76 or 0x77, a maximum of 2 devices could be added before this commit. Now there is no theoretical limit on the number of devices which could be added.

* Fix formatting according to clang-format

* Fix formatting according to clang-format

---------

Co-authored-by: Trevor North <trevor@freedisc.co.uk>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/bme680_bsec/__init__.py    |   2 +
 .../components/bme680_bsec/bme680_bsec.cpp    | 272 ++++++++++++------
 esphome/components/bme680_bsec/bme680_bsec.h  |  29 +-
 3 files changed, 215 insertions(+), 88 deletions(-)

diff --git a/esphome/components/bme680_bsec/__init__.py b/esphome/components/bme680_bsec/__init__.py
index 83e519f8aa..c9813c4974 100644
--- a/esphome/components/bme680_bsec/__init__.py
+++ b/esphome/components/bme680_bsec/__init__.py
@@ -6,6 +6,7 @@ from esphome.const import CONF_ID
 CODEOWNERS = ["@trvrnrth"]
 DEPENDENCIES = ["i2c"]
 AUTO_LOAD = ["sensor", "text_sensor"]
+MULTI_CONF = True
 
 CONF_BME680_BSEC_ID = "bme680_bsec_id"
 CONF_TEMPERATURE_OFFSET = "temperature_offset"
@@ -54,6 +55,7 @@ async def to_code(config):
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
+    cg.add(var.set_device_id(str(config[CONF_ID])))
     cg.add(var.set_temperature_offset(config[CONF_TEMPERATURE_OFFSET]))
     cg.add(var.set_iaq_mode(config[CONF_IAQ_MODE]))
     cg.add(var.set_sample_rate(config[CONF_SAMPLE_RATE]))
diff --git a/esphome/components/bme680_bsec/bme680_bsec.cpp b/esphome/components/bme680_bsec/bme680_bsec.cpp
index b84ca3318b..2b1b0dc948 100644
--- a/esphome/components/bme680_bsec/bme680_bsec.cpp
+++ b/esphome/components/bme680_bsec/bme680_bsec.cpp
@@ -10,19 +10,24 @@ static const char *const TAG = "bme680_bsec.sensor";
 
 static const std::string IAQ_ACCURACY_STATES[4] = {"Stabilizing", "Uncertain", "Calibrating", "Calibrated"};
 
-BME680BSECComponent *BME680BSECComponent::instance;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+std::vector<BME680BSECComponent *>
+    BME680BSECComponent::instances;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+uint8_t BME680BSECComponent::work_buffer_[BSEC_MAX_WORKBUFFER_SIZE] = {0};
 
 void BME680BSECComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up BME680 via BSEC...");
-  BME680BSECComponent::instance = this;
+  ESP_LOGCONFIG(TAG, "Setting up BME680(%s) via BSEC...", this->device_id_.c_str());
 
-  this->bsec_status_ = bsec_init();
-  if (this->bsec_status_ != BSEC_OK) {
-    this->mark_failed();
-    return;
-  }
+  uint8_t new_idx = BME680BSECComponent::instances.size();
+  BME680BSECComponent::instances.push_back(this);
 
-  this->bme680_.dev_id = this->address_;
+  this->bsec_state_data_valid_ = false;
+
+  // Initialize the bme680_ structure (passed-in to the bme680_* functions) and the BME680 device
+  this->bme680_.dev_id =
+      new_idx;  // This is a "Place holder to store the id of the device structure" (see bme680_defs.h).
+                // This will be passed-in as first parameter to the next "read" and "write" function pointers.
+                // We currently use the index of the object in the BME680BSECComponent::instances vector to identify
+                // the different devices in the system.
   this->bme680_.intf = BME680_I2C_INTF;
   this->bme680_.read = BME680BSECComponent::read_bytes_wrapper;
   this->bme680_.write = BME680BSECComponent::write_bytes_wrapper;
@@ -35,29 +40,30 @@ void BME680BSECComponent::setup() {
     return;
   }
 
-  if (this->sample_rate_ == SAMPLE_RATE_ULP) {
-    const uint8_t bsec_config[] = {
-#include "config/generic_33v_300s_28d/bsec_iaq.txt"
-    };
-    this->set_config_(bsec_config);
-  } else {
-    const uint8_t bsec_config[] = {
-#include "config/generic_33v_3s_28d/bsec_iaq.txt"
-    };
-    this->set_config_(bsec_config);
-  }
-  this->update_subscription_();
-  if (this->bsec_status_ != BSEC_OK) {
+  // Initialize the BSEC library
+  if (this->reinit_bsec_lib_() != 0) {
     this->mark_failed();
     return;
   }
 
+  // Load the BSEC library state from storage
   this->load_state_();
 }
 
-void BME680BSECComponent::set_config_(const uint8_t *config) {
-  uint8_t work_buffer[BSEC_MAX_WORKBUFFER_SIZE];
-  this->bsec_status_ = bsec_set_configuration(config, BSEC_MAX_PROPERTY_BLOB_SIZE, work_buffer, sizeof(work_buffer));
+void BME680BSECComponent::set_config_() {
+  if (this->sample_rate_ == SAMPLE_RATE_ULP) {
+    const uint8_t config[] = {
+#include "config/generic_33v_300s_28d/bsec_iaq.txt"
+    };
+    this->bsec_status_ =
+        bsec_set_configuration(config, BSEC_MAX_PROPERTY_BLOB_SIZE, this->work_buffer_, sizeof(this->work_buffer_));
+  } else {
+    const uint8_t config[] = {
+#include "config/generic_33v_3s_28d/bsec_iaq.txt"
+    };
+    this->bsec_status_ =
+        bsec_set_configuration(config, BSEC_MAX_PROPERTY_BLOB_SIZE, this->work_buffer_, sizeof(this->work_buffer_));
+  }
 }
 
 float BME680BSECComponent::calc_sensor_sample_rate_(SampleRate sample_rate) {
@@ -118,10 +124,12 @@ void BME680BSECComponent::update_subscription_() {
   uint8_t num_sensor_settings = BSEC_MAX_PHYSICAL_SENSOR;
   this->bsec_status_ =
       bsec_update_subscription(virtual_sensors, num_virtual_sensors, sensor_settings, &num_sensor_settings);
+  ESP_LOGV(TAG, "%s: updating subscription for %d virtual sensors (out=%d sensors)", this->device_id_.c_str(),
+           num_virtual_sensors, num_sensor_settings);
 }
 
 void BME680BSECComponent::dump_config() {
-  ESP_LOGCONFIG(TAG, "BME680 via BSEC:");
+  ESP_LOGCONFIG(TAG, "%s via BSEC:", this->device_id_.c_str());
 
   bsec_version_t version;
   bsec_get_version(&version);
@@ -185,23 +193,31 @@ void BME680BSECComponent::run_() {
     return;
   }
 
-  ESP_LOGV(TAG, "Performing sensor run");
+  ESP_LOGV(TAG, "%s: Performing sensor run", this->device_id_.c_str());
 
-  bsec_bme_settings_t bme680_settings;
-  this->bsec_status_ = bsec_sensor_control(curr_time_ns, &bme680_settings);
+  // Restore BSEC library state
+  // The reinit_bsec_lib_ method is computationally expensive: it takes 1200÷2900 microseconds on a ESP32.
+  // It can be skipped entirely when there is only one device (since the BSEC library won't be shared)
+  if (BME680BSECComponent::instances.size() > 1) {
+    int res = this->reinit_bsec_lib_();
+    if (res != 0)
+      return;
+  }
+
+  this->bsec_status_ = bsec_sensor_control(curr_time_ns, &this->bme680_settings_);
   if (this->bsec_status_ < BSEC_OK) {
     ESP_LOGW(TAG, "Failed to fetch sensor control settings (BSEC Error Code %d)", this->bsec_status_);
     return;
   }
-  this->next_call_ns_ = bme680_settings.next_call;
+  this->next_call_ns_ = this->bme680_settings_.next_call;
 
-  if (bme680_settings.trigger_measurement) {
-    this->bme680_.tph_sett.os_temp = bme680_settings.temperature_oversampling;
-    this->bme680_.tph_sett.os_pres = bme680_settings.pressure_oversampling;
-    this->bme680_.tph_sett.os_hum = bme680_settings.humidity_oversampling;
-    this->bme680_.gas_sett.run_gas = bme680_settings.run_gas;
-    this->bme680_.gas_sett.heatr_temp = bme680_settings.heater_temperature;
-    this->bme680_.gas_sett.heatr_dur = bme680_settings.heating_duration;
+  if (this->bme680_settings_.trigger_measurement) {
+    this->bme680_.tph_sett.os_temp = this->bme680_settings_.temperature_oversampling;
+    this->bme680_.tph_sett.os_pres = this->bme680_settings_.pressure_oversampling;
+    this->bme680_.tph_sett.os_hum = this->bme680_settings_.humidity_oversampling;
+    this->bme680_.gas_sett.run_gas = this->bme680_settings_.run_gas;
+    this->bme680_.gas_sett.heatr_temp = this->bme680_settings_.heater_temperature;
+    this->bme680_.gas_sett.heatr_dur = this->bme680_settings_.heating_duration;
     this->bme680_.power_mode = BME680_FORCED_MODE;
     uint16_t desired_settings = BME680_OST_SEL | BME680_OSP_SEL | BME680_OSH_SEL | BME680_GAS_SENSOR_SEL;
     this->bme680_status_ = bme680_set_sensor_settings(desired_settings, &this->bme680_);
@@ -218,19 +234,26 @@ void BME680BSECComponent::run_() {
 
     uint16_t meas_dur = 0;
     bme680_get_profile_dur(&meas_dur, &this->bme680_);
+
+    // Since we are about to go "out of scope" in the loop, take a snapshot of the state now so we can restore it later
+    // TODO: it would be interesting to see if this is really needed here, or if it's needed only after each
+    // bsec_do_steps() call
+    if (BME680BSECComponent::instances.size() > 1)
+      this->snapshot_state_();
+
     ESP_LOGV(TAG, "Queueing read in %ums", meas_dur);
-    this->set_timeout("read", meas_dur,
-                      [this, curr_time_ns, bme680_settings]() { this->read_(curr_time_ns, bme680_settings); });
+    this->set_timeout("read", meas_dur, [this]() { this->read_(); });
   } else {
     ESP_LOGV(TAG, "Measurement not required");
-    this->read_(curr_time_ns, bme680_settings);
+    this->read_();
   }
 }
 
-void BME680BSECComponent::read_(int64_t trigger_time_ns, bsec_bme_settings_t bme680_settings) {
-  ESP_LOGV(TAG, "Reading data");
+void BME680BSECComponent::read_() {
+  ESP_LOGV(TAG, "%s: Reading data", this->device_id_.c_str());
+  int64_t curr_time_ns = this->get_time_ns_();
 
-  if (bme680_settings.trigger_measurement) {
+  if (this->bme680_settings_.trigger_measurement) {
     while (this->bme680_.power_mode != BME680_SLEEP_MODE) {
       this->bme680_status_ = bme680_get_sensor_mode(&this->bme680_);
       if (this->bme680_status_ != BME680_OK) {
@@ -239,7 +262,7 @@ void BME680BSECComponent::read_(int64_t trigger_time_ns, bsec_bme_settings_t bme
     }
   }
 
-  if (!bme680_settings.process_data) {
+  if (!this->bme680_settings_.process_data) {
     ESP_LOGV(TAG, "Data processing not required");
     return;
   }
@@ -259,35 +282,35 @@ void BME680BSECComponent::read_(int64_t trigger_time_ns, bsec_bme_settings_t bme
   bsec_input_t inputs[BSEC_MAX_PHYSICAL_SENSOR];  // Temperature, Pressure, Humidity & Gas Resistance
   uint8_t num_inputs = 0;
 
-  if (bme680_settings.process_data & BSEC_PROCESS_TEMPERATURE) {
+  if (this->bme680_settings_.process_data & BSEC_PROCESS_TEMPERATURE) {
     inputs[num_inputs].sensor_id = BSEC_INPUT_TEMPERATURE;
     inputs[num_inputs].signal = data.temperature / 100.0f;
-    inputs[num_inputs].time_stamp = trigger_time_ns;
+    inputs[num_inputs].time_stamp = curr_time_ns;
     num_inputs++;
 
     // Temperature offset from the real temperature due to external heat sources
     inputs[num_inputs].sensor_id = BSEC_INPUT_HEATSOURCE;
     inputs[num_inputs].signal = this->temperature_offset_;
-    inputs[num_inputs].time_stamp = trigger_time_ns;
+    inputs[num_inputs].time_stamp = curr_time_ns;
     num_inputs++;
   }
-  if (bme680_settings.process_data & BSEC_PROCESS_HUMIDITY) {
+  if (this->bme680_settings_.process_data & BSEC_PROCESS_HUMIDITY) {
     inputs[num_inputs].sensor_id = BSEC_INPUT_HUMIDITY;
     inputs[num_inputs].signal = data.humidity / 1000.0f;
-    inputs[num_inputs].time_stamp = trigger_time_ns;
+    inputs[num_inputs].time_stamp = curr_time_ns;
     num_inputs++;
   }
-  if (bme680_settings.process_data & BSEC_PROCESS_PRESSURE) {
+  if (this->bme680_settings_.process_data & BSEC_PROCESS_PRESSURE) {
     inputs[num_inputs].sensor_id = BSEC_INPUT_PRESSURE;
     inputs[num_inputs].signal = data.pressure;
-    inputs[num_inputs].time_stamp = trigger_time_ns;
+    inputs[num_inputs].time_stamp = curr_time_ns;
     num_inputs++;
   }
-  if (bme680_settings.process_data & BSEC_PROCESS_GAS) {
+  if (this->bme680_settings_.process_data & BSEC_PROCESS_GAS) {
     if (data.status & BME680_GASM_VALID_MSK) {
       inputs[num_inputs].sensor_id = BSEC_INPUT_GASRESISTOR;
       inputs[num_inputs].signal = data.gas_resistance;
-      inputs[num_inputs].time_stamp = trigger_time_ns;
+      inputs[num_inputs].time_stamp = curr_time_ns;
       num_inputs++;
     } else {
       ESP_LOGD(TAG, "BME680 did not report gas data");
@@ -298,6 +321,22 @@ void BME680BSECComponent::read_(int64_t trigger_time_ns, bsec_bme_settings_t bme
     return;
   }
 
+  // Restore BSEC library state
+  // The reinit_bsec_lib_ method is computationally expensive: it takes 1200÷2900 microseconds on a ESP32.
+  // It can be skipped entirely when there is only one device (since the BSEC library won't be shared)
+  if (BME680BSECComponent::instances.size() > 1) {
+    int res = this->reinit_bsec_lib_();
+    if (res != 0)
+      return;
+    // Now that the BSEC library has been re-initialized, bsec_sensor_control *NEEDS* to be called in order to support
+    // multiple devices with a different set of enabled sensors (even if the bme680_settings_ data is not used)
+    this->bsec_status_ = bsec_sensor_control(curr_time_ns, &this->bme680_settings_);
+    if (this->bsec_status_ < BSEC_OK) {
+      ESP_LOGW(TAG, "Failed to fetch sensor control settings (BSEC Error Code %d)", this->bsec_status_);
+      return;
+    }
+  }
+
   bsec_output_t outputs[BSEC_NUMBER_OUTPUTS];
   uint8_t num_outputs = BSEC_NUMBER_OUTPUTS;
   this->bsec_status_ = bsec_do_steps(inputs, num_inputs, outputs, &num_outputs);
@@ -305,6 +344,13 @@ void BME680BSECComponent::read_(int64_t trigger_time_ns, bsec_bme_settings_t bme
     ESP_LOGW(TAG, "BSEC failed to process signals (BSEC Error Code %d)", this->bsec_status_);
     return;
   }
+  ESP_LOGV(TAG, "%s: after bsec_do_steps: num_inputs=%d num_outputs=%d", this->device_id_.c_str(), num_inputs,
+           num_outputs);
+
+  // Since we are about to go "out of scope" in the loop, take a snapshot of the state now so we can restore it later
+  if (BME680BSECComponent::instances.size() > 1)
+    this->snapshot_state_();
+
   if (num_outputs < 1) {
     ESP_LOGD(TAG, "No signal outputs provided by BSEC");
     return;
@@ -314,7 +360,7 @@ void BME680BSECComponent::read_(int64_t trigger_time_ns, bsec_bme_settings_t bme
 }
 
 void BME680BSECComponent::publish_(const bsec_output_t *outputs, uint8_t num_outputs) {
-  ESP_LOGV(TAG, "Queuing sensor state publish actions");
+  ESP_LOGV(TAG, "%s: Queuing sensor state publish actions", this->device_id_.c_str());
   for (uint8_t i = 0; i < num_outputs; i++) {
     float signal = outputs[i].signal;
     switch (outputs[i].sensor_id) {
@@ -376,12 +422,20 @@ void BME680BSECComponent::publish_sensor_(text_sensor::TextSensor *sensor, const
   sensor->publish_state(value);
 }
 
-int8_t BME680BSECComponent::read_bytes_wrapper(uint8_t address, uint8_t a_register, uint8_t *data, uint16_t len) {
-  return BME680BSECComponent::instance->read_bytes(a_register, data, len) ? 0 : -1;
+// Communication function - read
+// First parameter is the "dev_id" member of our "bme680_" object, which is passed-back here as-is
+int8_t BME680BSECComponent::read_bytes_wrapper(uint8_t devid, uint8_t a_register, uint8_t *data, uint16_t len) {
+  BME680BSECComponent *inst = instances[devid];
+  // Use the I2CDevice::read_bytes method to perform the actual I2C register read
+  return inst->read_bytes(a_register, data, len) ? 0 : -1;
 }
 
-int8_t BME680BSECComponent::write_bytes_wrapper(uint8_t address, uint8_t a_register, uint8_t *data, uint16_t len) {
-  return BME680BSECComponent::instance->write_bytes(a_register, data, len) ? 0 : -1;
+// Communication function - write
+// First parameter is the "dev_id" member of our "bme680_" object, which is passed-back here as-is
+int8_t BME680BSECComponent::write_bytes_wrapper(uint8_t devid, uint8_t a_register, uint8_t *data, uint16_t len) {
+  BME680BSECComponent *inst = instances[devid];
+  // Use the I2CDevice::write_bytes method to perform the actual I2C register write
+  return inst->write_bytes(a_register, data, len) ? 0 : -1;
 }
 
 void BME680BSECComponent::delay_ms(uint32_t period) {
@@ -389,41 +443,97 @@ void BME680BSECComponent::delay_ms(uint32_t period) {
   delay(period);
 }
 
+// Fetch the BSEC library state and save it in the bsec_state_data_ member (volatile memory)
+// Used to share the library when using more than one sensor
+void BME680BSECComponent::snapshot_state_() {
+  uint32_t num_serialized_state = BSEC_MAX_STATE_BLOB_SIZE;
+  this->bsec_status_ = bsec_get_state(0, this->bsec_state_data_, BSEC_MAX_STATE_BLOB_SIZE, this->work_buffer_,
+                                      sizeof(this->work_buffer_), &num_serialized_state);
+  if (this->bsec_status_ != BSEC_OK) {
+    ESP_LOGW(TAG, "%s: Failed to fetch BSEC library state for snapshot (BSEC Error Code %d)", this->device_id_.c_str(),
+             this->bsec_status_);
+    return;
+  }
+  this->bsec_state_data_valid_ = true;
+}
+
+// Restores the BSEC library state from a snapshot in memory
+// Used to share the library when using more than one sensor
+void BME680BSECComponent::restore_state_() {
+  if (!this->bsec_state_data_valid_) {
+    ESP_LOGV(TAG, "%s: BSEC state data NOT valid, aborting restore_state_()", this->device_id_.c_str());
+    return;
+  }
+
+  this->bsec_status_ =
+      bsec_set_state(this->bsec_state_data_, BSEC_MAX_STATE_BLOB_SIZE, this->work_buffer_, sizeof(this->work_buffer_));
+  if (this->bsec_status_ != BSEC_OK) {
+    ESP_LOGW(TAG, "Failed to restore BSEC library state (BSEC Error Code %d)", this->bsec_status_);
+    return;
+  }
+}
+
+int BME680BSECComponent::reinit_bsec_lib_() {
+  this->bsec_status_ = bsec_init();
+  if (this->bsec_status_ != BSEC_OK) {
+    this->mark_failed();
+    return -1;
+  }
+
+  this->set_config_();
+  if (this->bsec_status_ != BSEC_OK) {
+    this->mark_failed();
+    return -2;
+  }
+
+  this->restore_state_();
+
+  this->update_subscription_();
+  if (this->bsec_status_ != BSEC_OK) {
+    this->mark_failed();
+    return -3;
+  }
+
+  return 0;
+}
+
 void BME680BSECComponent::load_state_() {
-  uint32_t hash = fnv1_hash("bme680_bsec_state_" + to_string(this->address_));
+  uint32_t hash = fnv1_hash("bme680_bsec_state_" + this->device_id_);
   this->bsec_state_ = global_preferences->make_preference<uint8_t[BSEC_MAX_STATE_BLOB_SIZE]>(hash, true);
 
-  uint8_t state[BSEC_MAX_STATE_BLOB_SIZE];
-  if (this->bsec_state_.load(&state)) {
-    ESP_LOGV(TAG, "Loading state");
-    uint8_t work_buffer[BSEC_MAX_WORKBUFFER_SIZE];
-    this->bsec_status_ = bsec_set_state(state, BSEC_MAX_STATE_BLOB_SIZE, work_buffer, sizeof(work_buffer));
-    if (this->bsec_status_ != BSEC_OK) {
-      ESP_LOGW(TAG, "Failed to load state (BSEC Error Code %d)", this->bsec_status_);
-    }
-    ESP_LOGI(TAG, "Loaded state");
+  if (!this->bsec_state_.load(&this->bsec_state_data_)) {
+    // No saved BSEC library state available
+    return;
   }
+
+  ESP_LOGV(TAG, "%s: Loading BSEC library state", this->device_id_.c_str());
+  this->bsec_status_ =
+      bsec_set_state(this->bsec_state_data_, BSEC_MAX_STATE_BLOB_SIZE, this->work_buffer_, sizeof(this->work_buffer_));
+  if (this->bsec_status_ != BSEC_OK) {
+    ESP_LOGW(TAG, "%s: Failed to load BSEC library state (BSEC Error Code %d)", this->device_id_.c_str(),
+             this->bsec_status_);
+    return;
+  }
+  // All OK: set the BSEC state data as valid
+  this->bsec_state_data_valid_ = true;
+  ESP_LOGI(TAG, "%s: Loaded BSEC library state", this->device_id_.c_str());
 }
 
 void BME680BSECComponent::save_state_(uint8_t accuracy) {
   if (accuracy < 3 || (millis() - this->last_state_save_ms_ < this->state_save_interval_ms_)) {
     return;
   }
-
-  ESP_LOGV(TAG, "Saving state");
-
-  uint8_t state[BSEC_MAX_STATE_BLOB_SIZE];
-  uint8_t work_buffer[BSEC_MAX_STATE_BLOB_SIZE];
-  uint32_t num_serialized_state = BSEC_MAX_STATE_BLOB_SIZE;
-
-  this->bsec_status_ =
-      bsec_get_state(0, state, BSEC_MAX_STATE_BLOB_SIZE, work_buffer, BSEC_MAX_STATE_BLOB_SIZE, &num_serialized_state);
-  if (this->bsec_status_ != BSEC_OK) {
-    ESP_LOGW(TAG, "Failed fetch state for save (BSEC Error Code %d)", this->bsec_status_);
-    return;
+  if (BME680BSECComponent::instances.size() <= 1) {
+    // When a single device is in use, no snapshot is taken regularly so one is taken now
+    // On multiple devices, a snapshot is taken at every loop, so there is no need to take one here
+    this->snapshot_state_();
   }
+  if (!this->bsec_state_data_valid_)
+    return;
 
-  if (!this->bsec_state_.save(&state)) {
+  ESP_LOGV(TAG, "%s: Saving state", this->device_id_.c_str());
+
+  if (!this->bsec_state_.save(&this->bsec_state_data_)) {
     ESP_LOGW(TAG, "Failed to save state");
     return;
   }
diff --git a/esphome/components/bme680_bsec/bme680_bsec.h b/esphome/components/bme680_bsec/bme680_bsec.h
index 6fe8f8fef7..a97ad2f53e 100644
--- a/esphome/components/bme680_bsec/bme680_bsec.h
+++ b/esphome/components/bme680_bsec/bme680_bsec.h
@@ -31,6 +31,7 @@ enum SampleRate {
 
 class BME680BSECComponent : public Component, public i2c::I2CDevice {
  public:
+  void set_device_id(const std::string &devid) { this->device_id_.assign(devid); }
   void set_temperature_offset(float offset) { this->temperature_offset_ = offset; }
   void set_iaq_mode(IAQMode iaq_mode) { this->iaq_mode_ = iaq_mode; }
   void set_state_save_interval(uint32_t interval) { this->state_save_interval_ms_ = interval; }
@@ -50,9 +51,9 @@ class BME680BSECComponent : public Component, public i2c::I2CDevice {
   void set_co2_equivalent_sensor(sensor::Sensor *sensor) { this->co2_equivalent_sensor_ = sensor; }
   void set_breath_voc_equivalent_sensor(sensor::Sensor *sensor) { this->breath_voc_equivalent_sensor_ = sensor; }
 
-  static BME680BSECComponent *instance;
-  static int8_t read_bytes_wrapper(uint8_t address, uint8_t a_register, uint8_t *data, uint16_t len);
-  static int8_t write_bytes_wrapper(uint8_t address, uint8_t a_register, uint8_t *data, uint16_t len);
+  static std::vector<BME680BSECComponent *> instances;
+  static int8_t read_bytes_wrapper(uint8_t devid, uint8_t a_register, uint8_t *data, uint16_t len);
+  static int8_t write_bytes_wrapper(uint8_t devid, uint8_t a_register, uint8_t *data, uint16_t len);
   static void delay_ms(uint32_t period);
 
   void setup() override;
@@ -61,23 +62,33 @@ class BME680BSECComponent : public Component, public i2c::I2CDevice {
   void loop() override;
 
  protected:
-  void set_config_(const uint8_t *config);
+  void set_config_();
   float calc_sensor_sample_rate_(SampleRate sample_rate);
   void update_subscription_();
 
   void run_();
-  void read_(int64_t trigger_time_ns, bsec_bme_settings_t bme680_settings);
+  void read_();
   void publish_(const bsec_output_t *outputs, uint8_t num_outputs);
   int64_t get_time_ns_();
 
   void publish_sensor_(sensor::Sensor *sensor, float value, bool change_only = false);
   void publish_sensor_(text_sensor::TextSensor *sensor, const std::string &value);
 
-  void load_state_();
-  void save_state_(uint8_t accuracy);
+  void snapshot_state_();  // Fetch the current BSEC library state and save it in the bsec_state_data_ member (volatile
+                           // memory)
+  void restore_state_();   // Push the state contained in the bsec_state_data_ member (volatile memory) to the BSEC
+                           // library
+  int reinit_bsec_lib_();  // Prepare the BSEC library to be used again after this object returns active
+                           // (as the library may have been used by other objects)
+  void load_state_();      // Initialize the ESP preferences object; retrieve the BSEC library state from the ESP
+                           // preferences (storage); then save it in the bsec_state_data_ member (volatile memory) and
+                           // push it to the BSEC library
+  void save_state_(
+      uint8_t accuracy);  // Save the bsec_state_data_ member (volatile memory) to the ESP preferences (storage)
 
   void queue_push_(std::function<void()> &&f) { this->queue_.push(std::move(f)); }
 
+  static uint8_t work_buffer_[BSEC_MAX_WORKBUFFER_SIZE];
   struct bme680_dev bme680_;
   bsec_library_return_t bsec_status_{BSEC_OK};
   int8_t bme680_status_{BME680_OK};
@@ -88,10 +99,14 @@ class BME680BSECComponent : public Component, public i2c::I2CDevice {
 
   std::queue<std::function<void()>> queue_;
 
+  bool bsec_state_data_valid_;
+  uint8_t bsec_state_data_[BSEC_MAX_STATE_BLOB_SIZE];  // This is the current snapshot of the BSEC library state
   ESPPreferenceObject bsec_state_;
   uint32_t state_save_interval_ms_{21600000};  // 6 hours - 4 times a day
   uint32_t last_state_save_ms_ = 0;
+  bsec_bme_settings_t bme680_settings_;
 
+  std::string device_id_;
   float temperature_offset_{0};
   IAQMode iaq_mode_{IAQ_MODE_STATIC};
 

From 06ca5354b2fe2072d4cee30183f0e9dd9f59ecae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Mar 2023 07:21:23 +0000
Subject: [PATCH 644/838] Bump pytest from 7.2.1 to 7.2.2 (#4505)

Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.2.1 to 7.2.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.2.1...7.2.2)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@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 1e63f79b5e..01de8cad14 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -5,7 +5,7 @@ pyupgrade==3.3.1  # also change in .pre-commit-config.yaml when updating
 pre-commit
 
 # Unit tests
-pytest==7.2.1
+pytest==7.2.2
 pytest-cov==4.0.0
 pytest-mock==3.10.0
 pytest-asyncio==0.20.3

From 1b328da26581a201c9aaaef7be9c7910797ee2db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Mar 2023 07:21:45 +0000
Subject: [PATCH 645/838] Bump pylint from 2.16.2 to 2.16.4 (#4524)

Bumps [pylint](https://github.com/PyCQA/pylint) from 2.16.2 to 2.16.4.
- [Release notes](https://github.com/PyCQA/pylint/releases)
- [Commits](https://github.com/PyCQA/pylint/compare/v2.16.2...v2.16.4)

---
updated-dependencies:
- dependency-name: pylint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
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 01de8cad14..771086421e 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,4 +1,4 @@
-pylint==2.16.2
+pylint==2.16.4
 flake8==6.0.0  # also change in .pre-commit-config.yaml when updating
 black==23.1.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.3.1  # also change in .pre-commit-config.yaml when updating

From b29cc581444154e074ae80d956e657ef978fb63c Mon Sep 17 00:00:00 2001
From: DAVe3283 <DAVe3283@gmail.com>
Date: Tue, 7 Mar 2023 13:47:25 -0700
Subject: [PATCH 646/838] Add absolute humidity component (#4519)

* Import Absolute Humidity component

https://PigLab.ReaperLegion.net/home-automation/hass/esphome/custom-components/absolute-humidity

* Fix terminology, add some docstrings

* Switch from double to float

https://github.com/esphome/esphome/pull/4519#pullrequestreview-1327615169
The additional precision doesn't matter in practice.

* Address code review suggestions

* Lint code
---
 CODEOWNERS                                    |   1 +
 .../components/absolute_humidity/__init__.py  |   1 +
 .../absolute_humidity/absolute_humidity.cpp   | 182 ++++++++++++++++++
 .../absolute_humidity/absolute_humidity.h     |  76 ++++++++
 .../components/absolute_humidity/sensor.py    |  56 ++++++
 esphome/const.py                              |   3 +
 tests/test1.yaml                              |   4 +
 7 files changed, 323 insertions(+)
 create mode 100644 esphome/components/absolute_humidity/__init__.py
 create mode 100644 esphome/components/absolute_humidity/absolute_humidity.cpp
 create mode 100644 esphome/components/absolute_humidity/absolute_humidity.h
 create mode 100644 esphome/components/absolute_humidity/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index e8f264b633..1ff9661add 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -11,6 +11,7 @@ esphome/*.py @esphome/core
 esphome/core/* @esphome/core
 
 # Integrations
+esphome/components/absolute_humidity/* @DAVe3283
 esphome/components/ac_dimmer/* @glmnet
 esphome/components/adc/* @esphome/core
 esphome/components/adc128s102/* @DeerMaximum
diff --git a/esphome/components/absolute_humidity/__init__.py b/esphome/components/absolute_humidity/__init__.py
new file mode 100644
index 0000000000..8f113b48f6
--- /dev/null
+++ b/esphome/components/absolute_humidity/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@DAVe3283"]
diff --git a/esphome/components/absolute_humidity/absolute_humidity.cpp b/esphome/components/absolute_humidity/absolute_humidity.cpp
new file mode 100644
index 0000000000..13f30c996f
--- /dev/null
+++ b/esphome/components/absolute_humidity/absolute_humidity.cpp
@@ -0,0 +1,182 @@
+#include "esphome/core/log.h"
+#include "absolute_humidity.h"
+
+namespace esphome {
+namespace absolute_humidity {
+
+static const char *const TAG = "absolute_humidity.sensor";
+
+void AbsoluteHumidityComponent::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up absolute humidity '%s'...", this->get_name().c_str());
+
+  ESP_LOGD(TAG, "  Added callback for temperature '%s'", this->temperature_sensor_->get_name().c_str());
+  this->temperature_sensor_->add_on_state_callback([this](float state) { this->temperature_callback_(state); });
+  if (this->temperature_sensor_->has_state()) {
+    this->temperature_callback_(this->temperature_sensor_->get_state());
+  }
+
+  ESP_LOGD(TAG, "  Added callback for relative humidity '%s'", this->humidity_sensor_->get_name().c_str());
+  this->humidity_sensor_->add_on_state_callback([this](float state) { this->humidity_callback_(state); });
+  if (this->humidity_sensor_->has_state()) {
+    this->humidity_callback_(this->humidity_sensor_->get_state());
+  }
+}
+
+void AbsoluteHumidityComponent::dump_config() {
+  LOG_SENSOR("", "Absolute Humidity", this);
+
+  switch (this->equation_) {
+    case BUCK:
+      ESP_LOGCONFIG(TAG, "Saturation Vapor Pressure Equation: Buck");
+      break;
+    case TETENS:
+      ESP_LOGCONFIG(TAG, "Saturation Vapor Pressure Equation: Tetens");
+      break;
+    case WOBUS:
+      ESP_LOGCONFIG(TAG, "Saturation Vapor Pressure Equation: Wobus");
+      break;
+    default:
+      ESP_LOGE(TAG, "Invalid saturation vapor pressure equation selection!");
+      break;
+  }
+
+  ESP_LOGCONFIG(TAG, "Sources");
+  ESP_LOGCONFIG(TAG, "  Temperature: '%s'", this->temperature_sensor_->get_name().c_str());
+  ESP_LOGCONFIG(TAG, "  Relative Humidity: '%s'", this->humidity_sensor_->get_name().c_str());
+}
+
+float AbsoluteHumidityComponent::get_setup_priority() const { return setup_priority::DATA; }
+
+void AbsoluteHumidityComponent::loop() {
+  if (!this->next_update_) {
+    return;
+  }
+  this->next_update_ = false;
+
+  // Ensure we have source data
+  const bool no_temperature = std::isnan(this->temperature_);
+  const bool no_humidity = std::isnan(this->humidity_);
+  if (no_temperature || no_humidity) {
+    if (no_temperature) {
+      ESP_LOGW(TAG, "No valid state from temperature sensor!");
+    }
+    if (no_humidity) {
+      ESP_LOGW(TAG, "No valid state from temperature sensor!");
+    }
+    ESP_LOGW(TAG, "Unable to calculate absolute humidity.");
+    this->publish_state(NAN);
+    this->status_set_warning();
+    return;
+  }
+
+  // Convert to desired units
+  const float temperature_c = this->temperature_;
+  const float temperature_k = temperature_c + 273.15;
+  const float hr = this->humidity_ / 100;
+
+  // Calculate saturation vapor pressure
+  float es;
+  switch (this->equation_) {
+    case BUCK:
+      es = es_buck(temperature_c);
+      break;
+    case TETENS:
+      es = es_tetens(temperature_c);
+      break;
+    case WOBUS:
+      es = es_wobus(temperature_c);
+      break;
+    default:
+      ESP_LOGE(TAG, "Invalid saturation vapor pressure equation selection!");
+      this->publish_state(NAN);
+      this->status_set_error();
+      return;
+  }
+  ESP_LOGD(TAG, "Saturation vapor pressure %f kPa", es);
+
+  // Calculate absolute humidity
+  const float absolute_humidity = vapor_density(es, hr, temperature_k);
+
+  // Publish absolute humidity
+  ESP_LOGD(TAG, "Publishing absolute humidity %f g/m³", absolute_humidity);
+  this->status_clear_warning();
+  this->publish_state(absolute_humidity);
+}
+
+// Buck equation (https://en.wikipedia.org/wiki/Arden_Buck_equation)
+// More accurate than Tetens in normal meteorologic conditions
+float AbsoluteHumidityComponent::es_buck(float temperature_c) {
+  float a, b, c, d;
+  if (temperature_c >= 0) {
+    a = 0.61121;
+    b = 18.678;
+    c = 234.5;
+    d = 257.14;
+  } else {
+    a = 0.61115;
+    b = 18.678;
+    c = 233.7;
+    d = 279.82;
+  }
+  return a * expf((b - (temperature_c / c)) * (temperature_c / (d + temperature_c)));
+}
+
+// Tetens equation (https://en.wikipedia.org/wiki/Tetens_equation)
+float AbsoluteHumidityComponent::es_tetens(float temperature_c) {
+  float a, b;
+  if (temperature_c >= 0) {
+    a = 17.27;
+    b = 237.3;
+  } else {
+    a = 21.875;
+    b = 265.5;
+  }
+  return 0.61078 * expf((a * temperature_c) / (temperature_c + b));
+}
+
+// Wobus equation
+// https://wahiduddin.net/calc/density_altitude.htm
+// https://wahiduddin.net/calc/density_algorithms.htm
+// Calculate the saturation vapor pressure (kPa)
+float AbsoluteHumidityComponent::es_wobus(float t) {
+  // THIS FUNCTION RETURNS THE SATURATION VAPOR PRESSURE ESW (MILLIBARS)
+  // OVER LIQUID WATER GIVEN THE TEMPERATURE T (CELSIUS). THE POLYNOMIAL
+  // APPROXIMATION BELOW IS DUE TO HERMAN WOBUS, A MATHEMATICIAN WHO
+  // WORKED AT THE NAVY WEATHER RESEARCH FACILITY, NORFOLK, VIRGINIA,
+  // BUT WHO IS NOW RETIRED. THE COEFFICIENTS OF THE POLYNOMIAL WERE
+  // CHOSEN TO FIT THE VALUES IN TABLE 94 ON PP. 351-353 OF THE SMITH-
+  // SONIAN METEOROLOGICAL TABLES BY ROLAND LIST (6TH EDITION). THE
+  // APPROXIMATION IS VALID FOR -50 < T < 100C.
+  //
+  //     Baker, Schlatter  17-MAY-1982     Original version.
+
+  const float c0 = +0.99999683e00;
+  const float c1 = -0.90826951e-02;
+  const float c2 = +0.78736169e-04;
+  const float c3 = -0.61117958e-06;
+  const float c4 = +0.43884187e-08;
+  const float c5 = -0.29883885e-10;
+  const float c6 = +0.21874425e-12;
+  const float c7 = -0.17892321e-14;
+  const float c8 = +0.11112018e-16;
+  const float c9 = -0.30994571e-19;
+  const float p = c0 + t * (c1 + t * (c2 + t * (c3 + t * (c4 + t * (c5 + t * (c6 + t * (c7 + t * (c8 + t * (c9)))))))));
+  return 0.61078 / pow(p, 8);
+}
+
+// From https://www.environmentalbiophysics.org/chalk-talk-how-to-calculate-absolute-humidity/
+// H/T to https://esphome.io/cookbook/bme280_environment.html
+// H/T to https://carnotcycle.wordpress.com/2012/08/04/how-to-convert-relative-humidity-to-absolute-humidity/
+float AbsoluteHumidityComponent::vapor_density(float es, float hr, float ta) {
+  // es = saturated vapor pressure (kPa)
+  // hr = relative humidity [0-1]
+  // ta = absolute temperature (K)
+
+  const float ea = hr * es * 1000;   // vapor pressure of the air (Pa)
+  const float mw = 18.01528;         // molar mass of water (g⋅mol⁻¹)
+  const float r = 8.31446261815324;  // molar gas constant (J⋅K⁻¹)
+  return (ea * mw) / (r * ta);
+}
+
+}  // namespace absolute_humidity
+}  // namespace esphome
diff --git a/esphome/components/absolute_humidity/absolute_humidity.h b/esphome/components/absolute_humidity/absolute_humidity.h
new file mode 100644
index 0000000000..9f3b9eab8b
--- /dev/null
+++ b/esphome/components/absolute_humidity/absolute_humidity.h
@@ -0,0 +1,76 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+
+namespace esphome {
+namespace absolute_humidity {
+
+/// Enum listing all implemented saturation vapor pressure equations.
+enum SaturationVaporPressureEquation {
+  BUCK,
+  TETENS,
+  WOBUS,
+};
+
+/// This class implements calculation of absolute humidity from temperature and relative humidity.
+class AbsoluteHumidityComponent : public sensor::Sensor, public Component {
+ public:
+  AbsoluteHumidityComponent() = default;
+
+  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { this->temperature_sensor_ = temperature_sensor; }
+  void set_humidity_sensor(sensor::Sensor *humidity_sensor) { this->humidity_sensor_ = humidity_sensor; }
+  void set_equation(SaturationVaporPressureEquation equation) { this->equation_ = equation; }
+
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void loop() override;
+
+ protected:
+  void temperature_callback_(float state) {
+    this->next_update_ = true;
+    this->temperature_ = state;
+  }
+  void humidity_callback_(float state) {
+    this->next_update_ = true;
+    this->humidity_ = state;
+  }
+
+  /** Buck equation for saturation vapor pressure in kPa.
+   *
+   * @param temperature_c Air temperature in °C.
+   */
+  static float es_buck(float temperature_c);
+  /** Tetens equation for saturation vapor pressure in kPa.
+   *
+   * @param temperature_c Air temperature in °C.
+   */
+  static float es_tetens(float temperature_c);
+  /** Wobus equation for saturation vapor pressure in kPa.
+   *
+   * @param temperature_c Air temperature in °C.
+   */
+  static float es_wobus(float temperature_c);
+
+  /** Calculate vapor density (absolute humidity) in g/m³.
+   *
+   * @param es Saturation vapor pressure in kPa.
+   * @param hr Relative humidity 0 to 1.
+   * @param ta Absolute temperature in K.
+   * @param heater_duration The duration in ms that the heater should turn on for when measuring.
+   */
+  static float vapor_density(float es, float hr, float ta);
+
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
+
+  bool next_update_{false};
+
+  float temperature_{NAN};
+  float humidity_{NAN};
+  SaturationVaporPressureEquation equation_;
+};
+
+}  // namespace absolute_humidity
+}  // namespace esphome
diff --git a/esphome/components/absolute_humidity/sensor.py b/esphome/components/absolute_humidity/sensor.py
new file mode 100644
index 0000000000..f2b075f4d9
--- /dev/null
+++ b/esphome/components/absolute_humidity/sensor.py
@@ -0,0 +1,56 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome.const import (
+    CONF_HUMIDITY,
+    CONF_TEMPERATURE,
+    STATE_CLASS_MEASUREMENT,
+    CONF_EQUATION,
+    ICON_WATER,
+    UNIT_GRAMS_PER_CUBIC_METER,
+)
+
+absolute_humidity_ns = cg.esphome_ns.namespace("absolute_humidity")
+AbsoluteHumidityComponent = absolute_humidity_ns.class_(
+    "AbsoluteHumidityComponent", sensor.Sensor, cg.Component
+)
+
+SaturationVaporPressureEquation = absolute_humidity_ns.enum(
+    "SaturationVaporPressureEquation"
+)
+EQUATION = {
+    "BUCK": SaturationVaporPressureEquation.BUCK,
+    "TETENS": SaturationVaporPressureEquation.TETENS,
+    "WOBUS": SaturationVaporPressureEquation.WOBUS,
+}
+
+CONFIG_SCHEMA = (
+    sensor.sensor_schema(
+        unit_of_measurement=UNIT_GRAMS_PER_CUBIC_METER,
+        icon=ICON_WATER,
+        accuracy_decimals=2,
+        state_class=STATE_CLASS_MEASUREMENT,
+    )
+    .extend(
+        {
+            cv.GenerateID(): cv.declare_id(AbsoluteHumidityComponent),
+            cv.Required(CONF_TEMPERATURE): cv.use_id(sensor.Sensor),
+            cv.Required(CONF_HUMIDITY): cv.use_id(sensor.Sensor),
+            cv.Optional(CONF_EQUATION, default="WOBUS"): cv.enum(EQUATION, upper=True),
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+)
+
+
+async def to_code(config):
+    var = await sensor.new_sensor(config)
+    await cg.register_component(var, config)
+
+    temperature_sensor = await cg.get_variable(config[CONF_TEMPERATURE])
+    cg.add(var.set_temperature_sensor(temperature_sensor))
+
+    humidity_sensor = await cg.get_variable(config[CONF_HUMIDITY])
+    cg.add(var.set_humidity_sensor(humidity_sensor))
+
+    cg.add(var.set_equation(config[CONF_EQUATION]))
diff --git a/esphome/const.py b/esphome/const.py
index 0ab9dd54bf..289a59b424 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -214,6 +214,7 @@ CONF_ENERGY = "energy"
 CONF_ENTITY_CATEGORY = "entity_category"
 CONF_ENTITY_ID = "entity_id"
 CONF_ENUM_DATAPOINT = "enum_datapoint"
+CONF_EQUATION = "equation"
 CONF_ESP8266_DISABLE_SSL_SUPPORT = "esp8266_disable_ssl_support"
 CONF_ESPHOME = "esphome"
 CONF_ETHERNET = "ethernet"
@@ -860,6 +861,7 @@ ICON_SIGNAL_DISTANCE_VARIANT = "mdi:signal"
 ICON_THERMOMETER = "mdi:thermometer"
 ICON_TIMELAPSE = "mdi:timelapse"
 ICON_TIMER = "mdi:timer-outline"
+ICON_WATER = "mdi:water"
 ICON_WATER_PERCENT = "mdi:water-percent"
 ICON_WEATHER_SUNSET = "mdi:weather-sunset"
 ICON_WEATHER_SUNSET_DOWN = "mdi:weather-sunset-down"
@@ -881,6 +883,7 @@ UNIT_DEGREE_PER_SECOND = "°/s"
 UNIT_DEGREES = "°"
 UNIT_EMPTY = ""
 UNIT_G = "G"
+UNIT_GRAMS_PER_CUBIC_METER = "g/m³"
 UNIT_HECTOPASCAL = "hPa"
 UNIT_HERTZ = "Hz"
 UNIT_HOUR = "h"
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 4312f2c613..8180400730 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1229,6 +1229,10 @@ sensor:
     model: 1005
     update_interval: 60s
     i2c_id: i2c_bus
+  - platform: absolute_humidity
+    name: DHT Absolute Humidity
+    temperature: dht_temperature
+    humidity: dht_humidity
 
 esp32_touch:
   setup_mode: false

From ceebe1462884fcec3c1453abd5c887c087377c02 Mon Sep 17 00:00:00 2001
From: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Date: Tue, 7 Mar 2023 22:29:45 +0100
Subject: [PATCH 647/838] Add ability to await safe mode in codegen (#4529)

* Add ability to await OTA safe mode

* Make pylint happy
---
 esphome/codegen.py                 |  1 +
 esphome/components/ota/__init__.py |  5 +++++
 esphome/const.py                   |  1 +
 esphome/cpp_helpers.py             | 20 ++++++++++++++++++++
 4 files changed, 27 insertions(+)

diff --git a/esphome/codegen.py b/esphome/codegen.py
index c926c94070..43b44256e2 100644
--- a/esphome/codegen.py
+++ b/esphome/codegen.py
@@ -47,6 +47,7 @@ from esphome.cpp_helpers import (  # noqa
     build_registry_list,
     extract_registry_entry_config,
     register_parented,
+    past_safe_mode,
 )
 from esphome.cpp_types import (  # noqa
     global_ns,
diff --git a/esphome/components/ota/__init__.py b/esphome/components/ota/__init__.py
index 32ea1fd363..a966157ffa 100644
--- a/esphome/components/ota/__init__.py
+++ b/esphome/components/ota/__init__.py
@@ -10,6 +10,8 @@ from esphome.const import (
     CONF_REBOOT_TIMEOUT,
     CONF_SAFE_MODE,
     CONF_TRIGGER_ID,
+    CONF_OTA,
+    KEY_PAST_SAFE_MODE,
 )
 from esphome.core import CORE, coroutine_with_priority
 
@@ -76,6 +78,8 @@ CONFIG_SCHEMA = cv.Schema(
 
 @coroutine_with_priority(50.0)
 async def to_code(config):
+    CORE.data[CONF_OTA] = {}
+
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_port(config[CONF_PORT]))
     cg.add_define("USE_OTA")
@@ -90,6 +94,7 @@ async def to_code(config):
             config[CONF_NUM_ATTEMPTS], config[CONF_REBOOT_TIMEOUT]
         )
         cg.add(RawExpression(f"if ({condition}) return"))
+        CORE.data[CONF_OTA][KEY_PAST_SAFE_MODE] = True
 
     if CORE.is_esp32 and CORE.using_arduino:
         cg.add_library("Update", None)
diff --git a/esphome/const.py b/esphome/const.py
index 289a59b424..4d6c7623bc 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1023,6 +1023,7 @@ KEY_TARGET_FRAMEWORK = "target_framework"
 KEY_FRAMEWORK_VERSION = "framework_version"
 KEY_NAME = "name"
 KEY_VARIANT = "variant"
+KEY_PAST_SAFE_MODE = "past_safe_mode"
 
 # Entity categories
 ENTITY_CATEGORY_NONE = ""
diff --git a/esphome/cpp_helpers.py b/esphome/cpp_helpers.py
index 02d339441f..ab5231e055 100644
--- a/esphome/cpp_helpers.py
+++ b/esphome/cpp_helpers.py
@@ -9,9 +9,13 @@ from esphome.const import (
     CONF_SETUP_PRIORITY,
     CONF_UPDATE_INTERVAL,
     CONF_TYPE_ID,
+    CONF_OTA,
+    CONF_SAFE_MODE,
+    KEY_PAST_SAFE_MODE,
 )
 
 from esphome.core import coroutine, ID, CORE
+from esphome.coroutine import FakeAwaitable
 from esphome.types import ConfigType, ConfigFragmentType
 from esphome.cpp_generator import add, get_variable
 from esphome.cpp_types import App
@@ -127,3 +131,19 @@ async def build_registry_list(registry, config):
         action = await build_registry_entry(registry, conf)
         actions.append(action)
     return actions
+
+
+async def past_safe_mode():
+    safe_mode_enabled = (
+        CONF_OTA in CORE.config and CORE.config[CONF_OTA][CONF_SAFE_MODE]
+    )
+    if not safe_mode_enabled:
+        return
+
+    def _safe_mode_generator():
+        while True:
+            if CORE.data.get(CONF_OTA, {}).get(KEY_PAST_SAFE_MODE, False):
+                return
+            yield
+
+    return await FakeAwaitable(_safe_mode_generator())

From 623e31ddeef1d507446e028e3d9d6ab5443f903e Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 8 Mar 2023 14:11:12 +1300
Subject: [PATCH 648/838] sn74hc165 fixes (#4457)

* Add delay between clock changes on sn74hc165

* Increase to 10us

* Add another delay after clock low

* Print input bits every second

* Fix pin order

* Remove log

* Fix for inverted pins

* formatting
---
 esphome/components/sn74hc165/sn74hc165.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/esphome/components/sn74hc165/sn74hc165.cpp b/esphome/components/sn74hc165/sn74hc165.cpp
index 6c89544db4..7efe8a4c14 100644
--- a/esphome/components/sn74hc165/sn74hc165.cpp
+++ b/esphome/components/sn74hc165/sn74hc165.cpp
@@ -40,17 +40,22 @@ bool SN74HC165Component::digital_read_(uint16_t pin) {
 
 void SN74HC165Component::read_gpio_() {
   this->load_pin_->digital_write(false);
-  delayMicroseconds(5);
+  delayMicroseconds(10);
   this->load_pin_->digital_write(true);
-  delayMicroseconds(5);
+  delayMicroseconds(10);
 
   if (this->clock_inhibit_pin_ != nullptr)
     this->clock_inhibit_pin_->digital_write(false);
 
-  for (int16_t i = (this->sr_count_ * 8) - 1; i >= 0; i--) {
-    this->input_bits_[i] = this->data_pin_->digital_read();
-    this->clock_pin_->digital_write(true);
-    this->clock_pin_->digital_write(false);
+  for (uint8_t i = 0; i < this->sr_count_; i++) {
+    for (uint8_t j = 0; j < 8; j++) {
+      this->input_bits_[(i * 8) + (7 - j)] = this->data_pin_->digital_read();
+
+      this->clock_pin_->digital_write(true);
+      delayMicroseconds(10);
+      this->clock_pin_->digital_write(false);
+      delayMicroseconds(10);
+    }
   }
 
   if (this->clock_inhibit_pin_ != nullptr)
@@ -59,7 +64,7 @@ void SN74HC165Component::read_gpio_() {
 
 float SN74HC165Component::get_setup_priority() const { return setup_priority::IO; }
 
-bool SN74HC165GPIOPin::digital_read() { return this->parent_->digital_read_(this->pin_); }
+bool SN74HC165GPIOPin::digital_read() { return this->parent_->digital_read_(this->pin_) != this->inverted_; }
 
 std::string SN74HC165GPIOPin::dump_summary() const { return str_snprintf("%u via SN74HC165", 18, pin_); }
 

From bc28ea1fdec0febec3646d4794578f3a5bd3ae23 Mon Sep 17 00:00:00 2001
From: Morgan Robertson <mrgnr@pm.me>
Date: Wed, 8 Mar 2023 01:15:49 +0000
Subject: [PATCH 649/838] Add AS7341 spectral color sensor (#4331)

* Add support for AS7341 spectral color sensor.

* Run clang-format and clang-tidy.

* Post-review changes.

* Apply suggestions from code review

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                            |   1 +
 esphome/components/as7341/__init__.py |   0
 esphome/components/as7341/as7341.cpp  | 271 ++++++++++++++++++++++++++
 esphome/components/as7341/as7341.h    | 144 ++++++++++++++
 esphome/components/as7341/sensor.py   | 112 +++++++++++
 tests/test1.yaml                      |  26 +++
 6 files changed, 554 insertions(+)
 create mode 100644 esphome/components/as7341/__init__.py
 create mode 100644 esphome/components/as7341/as7341.cpp
 create mode 100644 esphome/components/as7341/as7341.h
 create mode 100644 esphome/components/as7341/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index 1ff9661add..3d6ea5cd32 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -25,6 +25,7 @@ esphome/components/analog_threshold/* @ianchi
 esphome/components/animation/* @syndlex
 esphome/components/anova/* @buxtronix
 esphome/components/api/* @OttoWinter
+esphome/components/as7341/* @mrgnr
 esphome/components/async_tcp/* @OttoWinter
 esphome/components/atc_mithermometer/* @ahpohl
 esphome/components/b_parasite/* @rbaron
diff --git a/esphome/components/as7341/__init__.py b/esphome/components/as7341/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/as7341/as7341.cpp b/esphome/components/as7341/as7341.cpp
new file mode 100644
index 0000000000..129a3f9e37
--- /dev/null
+++ b/esphome/components/as7341/as7341.cpp
@@ -0,0 +1,271 @@
+#include "as7341.h"
+#include "esphome/core/log.h"
+#include "esphome/core/hal.h"
+
+namespace esphome {
+namespace as7341 {
+
+static const char *const TAG = "as7341";
+
+void AS7341Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up AS7341...");
+  LOG_I2C_DEVICE(this);
+
+  // Verify device ID
+  uint8_t id;
+  this->read_byte(AS7341_ID, &id);
+  ESP_LOGCONFIG(TAG, "  Read ID: 0x%X", id);
+  if ((id & 0xFC) != (AS7341_CHIP_ID << 2)) {
+    this->mark_failed();
+    return;
+  }
+
+  // Power on (enter IDLE state)
+  if (!this->enable_power(true)) {
+    ESP_LOGE(TAG, "  Power on failed!");
+    this->mark_failed();
+    return;
+  }
+
+  // Set configuration
+  this->write_byte(AS7341_CONFIG, 0x00);
+  this->setup_atime(this->atime_);
+  this->setup_astep(this->astep_);
+  this->setup_gain(this->gain_);
+}
+
+void AS7341Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "AS7341:");
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication with AS7341 failed!");
+  }
+  LOG_UPDATE_INTERVAL(this);
+  ESP_LOGCONFIG(TAG, "  Gain: %u", get_gain());
+  ESP_LOGCONFIG(TAG, "  ATIME: %u", get_atime());
+  ESP_LOGCONFIG(TAG, "  ASTEP: %u", get_astep());
+
+  LOG_SENSOR("  ", "F1", this->f1_);
+  LOG_SENSOR("  ", "F2", this->f2_);
+  LOG_SENSOR("  ", "F3", this->f3_);
+  LOG_SENSOR("  ", "F4", this->f4_);
+  LOG_SENSOR("  ", "F5", this->f5_);
+  LOG_SENSOR("  ", "F6", this->f6_);
+  LOG_SENSOR("  ", "F7", this->f7_);
+  LOG_SENSOR("  ", "F8", this->f8_);
+  LOG_SENSOR("  ", "Clear", this->clear_);
+  LOG_SENSOR("  ", "NIR", this->nir_);
+}
+
+float AS7341Component::get_setup_priority() const { return setup_priority::DATA; }
+
+void AS7341Component::update() {
+  this->read_channels(this->channel_readings_);
+
+  if (this->f1_ != nullptr) {
+    this->f1_->publish_state(this->channel_readings_[0]);
+  }
+  if (this->f2_ != nullptr) {
+    this->f2_->publish_state(this->channel_readings_[1]);
+  }
+  if (this->f3_ != nullptr) {
+    this->f3_->publish_state(this->channel_readings_[2]);
+  }
+  if (this->f4_ != nullptr) {
+    this->f4_->publish_state(this->channel_readings_[3]);
+  }
+  if (this->f5_ != nullptr) {
+    this->f5_->publish_state(this->channel_readings_[6]);
+  }
+  if (this->f6_ != nullptr) {
+    this->f6_->publish_state(this->channel_readings_[7]);
+  }
+  if (this->f7_ != nullptr) {
+    this->f7_->publish_state(this->channel_readings_[8]);
+  }
+  if (this->f8_ != nullptr) {
+    this->f8_->publish_state(this->channel_readings_[9]);
+  }
+  if (this->clear_ != nullptr) {
+    this->clear_->publish_state(this->channel_readings_[10]);
+  }
+  if (this->nir_ != nullptr) {
+    this->nir_->publish_state(this->channel_readings_[11]);
+  }
+}
+
+AS7341Gain AS7341Component::get_gain() {
+  uint8_t data;
+  this->read_byte(AS7341_CFG1, &data);
+  return (AS7341Gain) data;
+}
+
+uint8_t AS7341Component::get_atime() {
+  uint8_t data;
+  this->read_byte(AS7341_ATIME, &data);
+  return data;
+}
+
+uint16_t AS7341Component::get_astep() {
+  uint16_t data;
+  this->read_byte_16(AS7341_ASTEP, &data);
+  return this->swap_bytes(data);
+}
+
+bool AS7341Component::setup_gain(AS7341Gain gain) { return this->write_byte(AS7341_CFG1, gain); }
+
+bool AS7341Component::setup_atime(uint8_t atime) { return this->write_byte(AS7341_ATIME, atime); }
+
+bool AS7341Component::setup_astep(uint16_t astep) { return this->write_byte_16(AS7341_ASTEP, swap_bytes(astep)); }
+
+bool AS7341Component::read_channels(uint16_t *data) {
+  this->set_smux_low_channels(true);
+  this->enable_spectral_measurement(true);
+  this->wait_for_data();
+  bool low_success = this->read_bytes_16(AS7341_CH0_DATA_L, data, 6);
+
+  this->set_smux_low_channels(false);
+  this->enable_spectral_measurement(true);
+  this->wait_for_data();
+  bool high_sucess = this->read_bytes_16(AS7341_CH0_DATA_L, &data[6], 6);
+
+  return low_success && high_sucess;
+}
+
+void AS7341Component::set_smux_low_channels(bool enable) {
+  this->enable_spectral_measurement(false);
+  this->set_smux_command(AS7341_SMUX_CMD_WRITE);
+
+  if (enable) {
+    this->configure_smux_low_channels();
+
+  } else {
+    this->configure_smux_high_channels();
+  }
+  this->enable_smux();
+}
+
+bool AS7341Component::set_smux_command(AS7341SmuxCommand command) {
+  uint8_t data = command << 3;  // Write to bits 4:3 of the register
+  return this->write_byte(AS7341_CFG6, data);
+}
+
+void AS7341Component::configure_smux_low_channels() {
+  // SMUX Config for F1,F2,F3,F4,NIR,Clear
+  this->write_byte(0x00, 0x30);  // F3 left set to ADC2
+  this->write_byte(0x01, 0x01);  // F1 left set to ADC0
+  this->write_byte(0x02, 0x00);  // Reserved or disabled
+  this->write_byte(0x03, 0x00);  // F8 left disabled
+  this->write_byte(0x04, 0x00);  // F6 left disabled
+  this->write_byte(0x05, 0x42);  // F4 left connected to ADC3/f2 left connected to ADC1
+  this->write_byte(0x06, 0x00);  // F5 left disbled
+  this->write_byte(0x07, 0x00);  // F7 left disbled
+  this->write_byte(0x08, 0x50);  // CLEAR connected to ADC4
+  this->write_byte(0x09, 0x00);  // F5 right disabled
+  this->write_byte(0x0A, 0x00);  // F7 right disabled
+  this->write_byte(0x0B, 0x00);  // Reserved or disabled
+  this->write_byte(0x0C, 0x20);  // F2 right connected to ADC1
+  this->write_byte(0x0D, 0x04);  // F4 right connected to ADC3
+  this->write_byte(0x0E, 0x00);  // F6/F8 right disabled
+  this->write_byte(0x0F, 0x30);  // F3 right connected to AD2
+  this->write_byte(0x10, 0x01);  // F1 right connected to AD0
+  this->write_byte(0x11, 0x50);  // CLEAR right connected to AD4
+  this->write_byte(0x12, 0x00);  // Reserved or disabled
+  this->write_byte(0x13, 0x06);  // NIR connected to ADC5
+}
+
+void AS7341Component::configure_smux_high_channels() {
+  // SMUX Config for F5,F6,F7,F8,NIR,Clear
+  this->write_byte(0x00, 0x00);  // F3 left disable
+  this->write_byte(0x01, 0x00);  // F1 left disable
+  this->write_byte(0x02, 0x00);  // reserved/disable
+  this->write_byte(0x03, 0x40);  // F8 left connected to ADC3
+  this->write_byte(0x04, 0x02);  // F6 left connected to ADC1
+  this->write_byte(0x05, 0x00);  // F4/ F2 disabled
+  this->write_byte(0x06, 0x10);  // F5 left connected to ADC0
+  this->write_byte(0x07, 0x03);  // F7 left connected to ADC2
+  this->write_byte(0x08, 0x50);  // CLEAR Connected to ADC4
+  this->write_byte(0x09, 0x10);  // F5 right connected to ADC0
+  this->write_byte(0x0A, 0x03);  // F7 right connected to ADC2
+  this->write_byte(0x0B, 0x00);  // Reserved or disabled
+  this->write_byte(0x0C, 0x00);  // F2 right disabled
+  this->write_byte(0x0D, 0x00);  // F4 right disabled
+  this->write_byte(0x0E, 0x24);  // F8 right connected to ADC2/ F6 right connected to ADC1
+  this->write_byte(0x0F, 0x00);  // F3 right disabled
+  this->write_byte(0x10, 0x00);  // F1 right disabled
+  this->write_byte(0x11, 0x50);  // CLEAR right connected to AD4
+  this->write_byte(0x12, 0x00);  // Reserved or disabled
+  this->write_byte(0x13, 0x06);  // NIR connected to ADC5
+}
+
+bool AS7341Component::enable_smux() {
+  this->set_register_bit(AS7341_ENABLE, 4);
+
+  uint16_t timeout = 1000;
+  for (uint16_t time = 0; time < timeout; time++) {
+    // The SMUXEN bit is cleared once the SMUX operation is finished
+    bool smuxen = this->read_register_bit(AS7341_ENABLE, 4);
+    if (!smuxen) {
+      return true;
+    }
+
+    delay(1);
+  }
+
+  return false;
+}
+
+bool AS7341Component::wait_for_data() {
+  uint16_t timeout = 1000;
+  for (uint16_t time = 0; time < timeout; time++) {
+    if (this->is_data_ready()) {
+      return true;
+    }
+
+    delay(1);
+  }
+
+  return false;
+}
+
+bool AS7341Component::is_data_ready() { return this->read_register_bit(AS7341_STATUS2, 6); }
+
+bool AS7341Component::enable_power(bool enable) { return this->write_register_bit(AS7341_ENABLE, enable, 0); }
+
+bool AS7341Component::enable_spectral_measurement(bool enable) {
+  return this->write_register_bit(AS7341_ENABLE, enable, 1);
+}
+
+bool AS7341Component::read_register_bit(uint8_t address, uint8_t bit_position) {
+  uint8_t data;
+  this->read_byte(address, &data);
+  bool bit = (data & (1 << bit_position)) > 0;
+  return bit;
+}
+
+bool AS7341Component::write_register_bit(uint8_t address, bool value, uint8_t bit_position) {
+  if (value) {
+    return this->set_register_bit(address, bit_position);
+  }
+
+  return this->clear_register_bit(address, bit_position);
+}
+
+bool AS7341Component::set_register_bit(uint8_t address, uint8_t bit_position) {
+  uint8_t data;
+  this->read_byte(address, &data);
+  data |= (1 << bit_position);
+  return this->write_byte(address, data);
+}
+
+bool AS7341Component::clear_register_bit(uint8_t address, uint8_t bit_position) {
+  uint8_t data;
+  this->read_byte(address, &data);
+  data &= ~(1 << bit_position);
+  return this->write_byte(address, data);
+}
+
+uint16_t AS7341Component::swap_bytes(uint16_t data) { return (data >> 8) | (data << 8); }
+
+}  // namespace as7341
+}  // namespace esphome
diff --git a/esphome/components/as7341/as7341.h b/esphome/components/as7341/as7341.h
new file mode 100644
index 0000000000..e517e1d2bf
--- /dev/null
+++ b/esphome/components/as7341/as7341.h
@@ -0,0 +1,144 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace as7341 {
+
+static const uint8_t AS7341_CHIP_ID = 0X09;
+
+static const uint8_t AS7341_CONFIG = 0x70;
+static const uint8_t AS7341_LED = 0x74;
+
+static const uint8_t AS7341_ENABLE = 0x80;
+static const uint8_t AS7341_ATIME = 0x81;
+
+static const uint8_t AS7341_WTIME = 0x83;
+
+static const uint8_t AS7341_AUXID = 0x90;
+static const uint8_t AS7341_REVID = 0x91;
+static const uint8_t AS7341_ID = 0x92;
+static const uint8_t AS7341_STATUS = 0x93;
+
+static const uint8_t AS7341_CH0_DATA_L = 0x95;
+static const uint8_t AS7341_CH0_DATA_H = 0x96;
+static const uint8_t AS7341_CH1_DATA_L = 0x97;
+static const uint8_t AS7341_CH1_DATA_H = 0x98;
+static const uint8_t AS7341_CH2_DATA_L = 0x99;
+static const uint8_t AS7341_CH2_DATA_H = 0x9A;
+static const uint8_t AS7341_CH3_DATA_L = 0x9B;
+static const uint8_t AS7341_CH3_DATA_H = 0x9C;
+static const uint8_t AS7341_CH4_DATA_L = 0x9D;
+static const uint8_t AS7341_CH4_DATA_H = 0x9E;
+static const uint8_t AS7341_CH5_DATA_L = 0x9F;
+static const uint8_t AS7341_CH5_DATA_H = 0xA0;
+
+static const uint8_t AS7341_STATUS2 = 0xA3;
+
+static const uint8_t AS7341_CFG1 = 0xAA;  ///< Controls ADC Gain
+
+static const uint8_t AS7341_CFG6 = 0xAF;  // Stores SMUX command
+static const uint8_t AS7341_CFG9 = 0xB2;  // Config for system interrupts (SMUX, Flicker detection)
+
+static const uint8_t AS7341_ASTEP = 0xCA;      // LSB
+static const uint8_t AS7341_ASTEP_MSB = 0xCB;  // MSB
+
+enum AS7341AdcChannel {
+  AS7341_ADC_CHANNEL_0,
+  AS7341_ADC_CHANNEL_1,
+  AS7341_ADC_CHANNEL_2,
+  AS7341_ADC_CHANNEL_3,
+  AS7341_ADC_CHANNEL_4,
+  AS7341_ADC_CHANNEL_5,
+};
+
+enum AS7341SmuxCommand {
+  AS7341_SMUX_CMD_ROM_RESET,  ///< ROM code initialization of SMUX
+  AS7341_SMUX_CMD_READ,       ///< Read SMUX configuration to RAM from SMUX chain
+  AS7341_SMUX_CMD_WRITE,      ///< Write SMUX configuration from RAM to SMUX chain
+};
+
+enum AS7341Gain {
+  AS7341_GAIN_0_5X,
+  AS7341_GAIN_1X,
+  AS7341_GAIN_2X,
+  AS7341_GAIN_4X,
+  AS7341_GAIN_8X,
+  AS7341_GAIN_16X,
+  AS7341_GAIN_32X,
+  AS7341_GAIN_64X,
+  AS7341_GAIN_128X,
+  AS7341_GAIN_256X,
+  AS7341_GAIN_512X,
+};
+
+class AS7341Component : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void update() override;
+
+  void set_f1_sensor(sensor::Sensor *f1_sensor) { this->f1_ = f1_sensor; }
+  void set_f2_sensor(sensor::Sensor *f2_sensor) { f2_ = f2_sensor; }
+  void set_f3_sensor(sensor::Sensor *f3_sensor) { f3_ = f3_sensor; }
+  void set_f4_sensor(sensor::Sensor *f4_sensor) { f4_ = f4_sensor; }
+  void set_f5_sensor(sensor::Sensor *f5_sensor) { f5_ = f5_sensor; }
+  void set_f6_sensor(sensor::Sensor *f6_sensor) { f6_ = f6_sensor; }
+  void set_f7_sensor(sensor::Sensor *f7_sensor) { f7_ = f7_sensor; }
+  void set_f8_sensor(sensor::Sensor *f8_sensor) { f8_ = f8_sensor; }
+  void set_clear_sensor(sensor::Sensor *clear_sensor) { clear_ = clear_sensor; }
+  void set_nir_sensor(sensor::Sensor *nir_sensor) { nir_ = nir_sensor; }
+
+  void set_gain(AS7341Gain gain) { gain_ = gain; }
+  void set_atime(uint8_t atime) { atime_ = atime; }
+  void set_astep(uint16_t astep) { astep_ = astep; }
+
+  AS7341Gain get_gain();
+  uint8_t get_atime();
+  uint16_t get_astep();
+  bool setup_gain(AS7341Gain gain);
+  bool setup_atime(uint8_t atime);
+  bool setup_astep(uint16_t astep);
+
+  uint16_t read_channel(AS7341AdcChannel channel);
+  bool read_channels(uint16_t *data);
+  void set_smux_low_channels(bool enable);
+  bool set_smux_command(AS7341SmuxCommand command);
+  void configure_smux_low_channels();
+  void configure_smux_high_channels();
+  bool enable_smux();
+
+  bool wait_for_data();
+  bool is_data_ready();
+  bool enable_power(bool enable);
+  bool enable_spectral_measurement(bool enable);
+
+  bool read_register_bit(uint8_t address, uint8_t bit_position);
+  bool write_register_bit(uint8_t address, bool value, uint8_t bit_position);
+  bool set_register_bit(uint8_t address, uint8_t bit_position);
+  bool clear_register_bit(uint8_t address, uint8_t bit_position);
+  uint16_t swap_bytes(uint16_t data);
+
+ protected:
+  sensor::Sensor *f1_{nullptr};
+  sensor::Sensor *f2_{nullptr};
+  sensor::Sensor *f3_{nullptr};
+  sensor::Sensor *f4_{nullptr};
+  sensor::Sensor *f5_{nullptr};
+  sensor::Sensor *f6_{nullptr};
+  sensor::Sensor *f7_{nullptr};
+  sensor::Sensor *f8_{nullptr};
+  sensor::Sensor *clear_{nullptr};
+  sensor::Sensor *nir_{nullptr};
+
+  uint16_t astep_;
+  AS7341Gain gain_;
+  uint8_t atime_;
+  uint16_t channel_readings_[12];
+};
+
+}  // namespace as7341
+}  // namespace esphome
diff --git a/esphome/components/as7341/sensor.py b/esphome/components/as7341/sensor.py
new file mode 100644
index 0000000000..2424087c35
--- /dev/null
+++ b/esphome/components/as7341/sensor.py
@@ -0,0 +1,112 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import (
+    CONF_GAIN,
+    CONF_ID,
+    DEVICE_CLASS_ILLUMINANCE,
+    ICON_BRIGHTNESS_5,
+    STATE_CLASS_MEASUREMENT,
+)
+
+
+CODEOWNERS = ["@mrgnr"]
+DEPENDENCIES = ["i2c"]
+
+as7341_ns = cg.esphome_ns.namespace("as7341")
+
+AS7341Component = as7341_ns.class_(
+    "AS7341Component", cg.PollingComponent, i2c.I2CDevice
+)
+
+CONF_ATIME = "atime"
+CONF_ASTEP = "astep"
+
+CONF_F1 = "f1"
+CONF_F2 = "f2"
+CONF_F3 = "f3"
+CONF_F4 = "f4"
+CONF_F5 = "f5"
+CONF_F6 = "f6"
+CONF_F7 = "f7"
+CONF_F8 = "f8"
+CONF_CLEAR = "clear"
+CONF_NIR = "nir"
+
+UNIT_COUNTS = "#"
+
+AS7341_GAIN = as7341_ns.enum("AS7341Gain")
+GAIN_OPTIONS = {
+    "X0.5": AS7341_GAIN.AS7341_GAIN_0_5X,
+    "X1": AS7341_GAIN.AS7341_GAIN_1X,
+    "X2": AS7341_GAIN.AS7341_GAIN_2X,
+    "X4": AS7341_GAIN.AS7341_GAIN_4X,
+    "X8": AS7341_GAIN.AS7341_GAIN_8X,
+    "X16": AS7341_GAIN.AS7341_GAIN_16X,
+    "X32": AS7341_GAIN.AS7341_GAIN_32X,
+    "X64": AS7341_GAIN.AS7341_GAIN_64X,
+    "X128": AS7341_GAIN.AS7341_GAIN_128X,
+    "X256": AS7341_GAIN.AS7341_GAIN_256X,
+    "X512": AS7341_GAIN.AS7341_GAIN_512X,
+}
+
+
+SENSOR_SCHEMA = sensor.sensor_schema(
+    unit_of_measurement=UNIT_COUNTS,
+    icon=ICON_BRIGHTNESS_5,
+    accuracy_decimals=0,
+    device_class=DEVICE_CLASS_ILLUMINANCE,
+    state_class=STATE_CLASS_MEASUREMENT,
+)
+
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(AS7341Component),
+            cv.Optional(CONF_F1): SENSOR_SCHEMA,
+            cv.Optional(CONF_F2): SENSOR_SCHEMA,
+            cv.Optional(CONF_F3): SENSOR_SCHEMA,
+            cv.Optional(CONF_F4): SENSOR_SCHEMA,
+            cv.Optional(CONF_F5): SENSOR_SCHEMA,
+            cv.Optional(CONF_F6): SENSOR_SCHEMA,
+            cv.Optional(CONF_F7): SENSOR_SCHEMA,
+            cv.Optional(CONF_F8): SENSOR_SCHEMA,
+            cv.Optional(CONF_CLEAR): SENSOR_SCHEMA,
+            cv.Optional(CONF_NIR): SENSOR_SCHEMA,
+            cv.Optional(CONF_GAIN, default="X8"): cv.enum(GAIN_OPTIONS),
+            cv.Optional(CONF_ATIME, default=29): cv.int_range(min=0, max=255),
+            cv.Optional(CONF_ASTEP, default=599): cv.int_range(min=0, max=65534),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x39))
+)
+
+SENSORS = {
+    CONF_F1: "set_f1_sensor",
+    CONF_F2: "set_f2_sensor",
+    CONF_F3: "set_f3_sensor",
+    CONF_F4: "set_f4_sensor",
+    CONF_F5: "set_f5_sensor",
+    CONF_F6: "set_f6_sensor",
+    CONF_F7: "set_f7_sensor",
+    CONF_F8: "set_f8_sensor",
+    CONF_CLEAR: "set_clear_sensor",
+    CONF_NIR: "set_nir_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)
+
+    cg.add(var.set_gain(config[CONF_GAIN]))
+    cg.add(var.set_atime(config[CONF_ATIME]))
+    cg.add(var.set_astep(config[CONF_ASTEP]))
+
+    for conf_id, set_sensor_func in SENSORS.items():
+        if conf_id in config:
+            sens = await sensor.new_sensor(config[conf_id])
+            cg.add(getattr(var, set_sensor_func)(sens))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 8180400730..b599eb2666 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -439,6 +439,32 @@ sensor:
     state_topic: hi/me
     retain: false
     availability:
+  - platform: as7341
+    update_interval: 15s
+    gain: X8
+    atime: 120
+    astep: 99
+    f1:
+      name: F1
+    f2:
+      name: F2
+    f3:
+      name: F3
+    f4:
+      name: F4
+    f5:
+      name: F5
+    f6:
+      name: F6
+    f7:
+      name: F7
+    f8:
+      name: F8
+    clear:
+      name: Clear
+    nir:
+      name: NIR
+    i2c_id: i2c_bus
   - platform: atm90e32
     cs_pin: 5
     phase_a:

From 2ef25f31532bedc302e7cf8aa669b5eeba67c8fe Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 8 Mar 2023 20:12:07 +1300
Subject: [PATCH 650/838] Fix ethernet driver setting gpio 5 high when no power
 pin defined (#4531)

---
 esphome/components/ethernet/ethernet_component.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index a3f0ae715f..9152b33a14 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -43,8 +43,7 @@ void EthernetComponent::setup() {
   eth_phy_config_t phy_config = ETH_PHY_DEFAULT_CONFIG();
 
   phy_config.phy_addr = this->phy_addr_;
-  if (this->power_pin_ != -1)
-    phy_config.reset_gpio_num = this->power_pin_;
+  phy_config.reset_gpio_num = this->power_pin_;
 
   mac_config.smi_mdc_gpio_num = this->mdc_pin_;
   mac_config.smi_mdio_gpio_num = this->mdio_pin_;

From 5e6665494d739e339dda45c52ce756a22f9df227 Mon Sep 17 00:00:00 2001
From: Fabian <Fabian-Schmidt@users.noreply.github.com>
Date: Wed, 8 Mar 2023 19:23:02 +0100
Subject: [PATCH 651/838] Use PSRam for BLE scan results. (#4486)

* Use PSRam for BLE scan results.

* Format Document

* Use generic define `CONFIG_SPIRAM`.

* Formatting changes.

* Memory allocation is allowed to fail.

* Use mark_failed instead of abort.

---------

Co-authored-by: Your Name <you@example.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .../esp32_ble_tracker/esp32_ble_tracker.cpp          | 12 ++++++++++--
 .../components/esp32_ble_tracker/esp32_ble_tracker.h |  9 +++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 6b0f4dc897..26687ba9cc 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -53,6 +53,14 @@ void ESP32BLETracker::setup() {
     ESP_LOGE(TAG, "BLE Tracker was marked failed by ESP32BLE");
     return;
   }
+  ExternalRAMAllocator<esp_ble_gap_cb_param_t::ble_scan_result_evt_param> allocator(
+      ExternalRAMAllocator<esp_ble_gap_cb_param_t::ble_scan_result_evt_param>::ALLOW_FAILURE);
+  this->scan_result_buffer_ = allocator.allocate(ESP32BLETracker::SCAN_RESULT_BUFFER_SIZE);
+
+  if (this->scan_result_buffer_ == nullptr) {
+    ESP_LOGE(TAG, "Could not allocate buffer for BLE Tracker!");
+    this->mark_failed();
+  }
 
   global_esp32_ble_tracker = this;
   this->scan_result_lock_ = xSemaphoreCreateMutex();
@@ -107,7 +115,7 @@ void ESP32BLETracker::loop() {
         xSemaphoreTake(this->scan_result_lock_, 5L / portTICK_PERIOD_MS)) {
       uint32_t index = this->scan_result_index_;
       if (index) {
-        if (index >= 16) {
+        if (index >= ESP32BLETracker::SCAN_RESULT_BUFFER_SIZE) {
           ESP_LOGW(TAG, "Too many BLE events to process. Some devices may not show up.");
         }
         for (size_t i = 0; i < index; i++) {
@@ -322,7 +330,7 @@ void ESP32BLETracker::gap_scan_stop_complete_(const esp_ble_gap_cb_param_t::ble_
 void ESP32BLETracker::gap_scan_result_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {
   if (param.search_evt == ESP_GAP_SEARCH_INQ_RES_EVT) {
     if (xSemaphoreTake(this->scan_result_lock_, 0L)) {
-      if (this->scan_result_index_ < 16) {
+      if (this->scan_result_index_ < ESP32BLETracker::SCAN_RESULT_BUFFER_SIZE) {
         this->scan_result_buffer_[this->scan_result_index_++] = param;
       }
       xSemaphoreGive(this->scan_result_lock_);
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index d1f72cf78d..798f68f2bd 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -101,7 +101,7 @@ class ESPBTDevice {
   std::vector<int8_t> tx_powers_{};
   optional<uint16_t> appearance_{};
   optional<uint8_t> ad_flag_{};
-  std::vector<ESPBTUUID> service_uuids_;
+  std::vector<ESPBTUUID> service_uuids_{};
   std::vector<ServiceData> manufacturer_datas_{};
   std::vector<ServiceData> service_datas_{};
   esp_ble_gap_cb_param_t::ble_scan_result_evt_param scan_result_{};
@@ -231,7 +231,12 @@ class ESP32BLETracker : public Component, public GAPEventHandler, public GATTcEv
   SemaphoreHandle_t scan_result_lock_;
   SemaphoreHandle_t scan_end_lock_;
   size_t scan_result_index_{0};
-  esp_ble_gap_cb_param_t::ble_scan_result_evt_param scan_result_buffer_[16];
+#if CONFIG_SPIRAM
+  const static u_int8_t SCAN_RESULT_BUFFER_SIZE = 32;
+#else
+  const static u_int8_t SCAN_RESULT_BUFFER_SIZE = 16;
+#endif  // CONFIG_SPIRAM
+  esp_ble_gap_cb_param_t::ble_scan_result_evt_param *scan_result_buffer_;
   esp_bt_status_t scan_start_failed_{ESP_BT_STATUS_SUCCESS};
   esp_bt_status_t scan_set_param_failed_{ESP_BT_STATUS_SUCCESS};
 };

From 600f4be2c424e0f15376406981c3198e09f6b039 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 8 Mar 2023 08:25:25 -1000
Subject: [PATCH 652/838] Bump esp-idf to 4.4.4 (#4528)

There are some nice BLE fixes and this uses about ~5000-8000 bytes
less RAM

https://github.com/espressif/esp-idf/releases/tag/v4.4.4
---
 esphome/components/esp32/__init__.py | 2 +-
 platformio.ini                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index ba11aeef21..62021afea9 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -168,7 +168,7 @@ ARDUINO_PLATFORM_VERSION = cv.Version(5, 2, 0)
 # The default/recommended esp-idf framework version
 #  - https://github.com/espressif/esp-idf/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/tool/framework-espidf
-RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 4, 3)
+RECOMMENDED_ESP_IDF_FRAMEWORK_VERSION = cv.Version(4, 4, 4)
 # The platformio/espressif32 version to use for esp-idf frameworks
 #  - https://github.com/platformio/platform-espressif32/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif32
diff --git a/platformio.ini b/platformio.ini
index f2588e918a..65dccde3b9 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -135,7 +135,7 @@ extra_scripts = post:esphome/components/esp32/post_build.py.script
 extends = common:idf
 platform = platformio/espressif32 @ 5.3.0
 platform_packages =
-    platformio/framework-espidf @ ~3.40403.0
+    platformio/framework-espidf @ ~3.40404.0
 
 framework = espidf
 lib_deps =

From 1087cb55b4b04a6ca1e0c2fc31e47df9404b10df Mon Sep 17 00:00:00 2001
From: Kai Gerken <Kai.Gerken@custom-coding.net>
Date: Wed, 8 Mar 2023 20:00:44 +0100
Subject: [PATCH 653/838] Added pzemdc reset energy action (#4481)

* remove unused sensors on pzemdc

* add reset energy action for pzemdc

* fix lint errors

* remove trailing space on pzemdc.h

* make method reset_energy of pzemdc public

* Apply suggestions from code review

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/pzemdc/pzemdc.cpp |  8 ++++++++
 esphome/components/pzemdc/pzemdc.h   | 16 ++++++++++++----
 esphome/components/pzemdc/sensor.py  | 19 +++++++++++++++++++
 tests/test3.yaml                     |  6 ++++++
 4 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/esphome/components/pzemdc/pzemdc.cpp b/esphome/components/pzemdc/pzemdc.cpp
index c914edefc8..28e4210ff7 100644
--- a/esphome/components/pzemdc/pzemdc.cpp
+++ b/esphome/components/pzemdc/pzemdc.cpp
@@ -7,6 +7,7 @@ namespace pzemdc {
 static const char *const TAG = "pzemdc";
 
 static const uint8_t PZEM_CMD_READ_IN_REGISTERS = 0x04;
+static const uint8_t PZEM_CMD_RESET_ENERGY = 0x42;
 static const uint8_t PZEM_REGISTER_COUNT = 10;  // 10x 16-bit registers
 
 void PZEMDC::on_modbus_data(const std::vector<uint8_t> &data) {
@@ -61,5 +62,12 @@ void PZEMDC::dump_config() {
   LOG_SENSOR("", "Energy", this->energy_sensor_);
 }
 
+void PZEMDC::reset_energy() {
+  std::vector<uint8_t> cmd;
+  cmd.push_back(this->address_);
+  cmd.push_back(PZEM_CMD_RESET_ENERGY);
+  this->send_raw(cmd);
+}
+
 }  // namespace pzemdc
 }  // namespace esphome
diff --git a/esphome/components/pzemdc/pzemdc.h b/esphome/components/pzemdc/pzemdc.h
index 54df6c484c..21676e3422 100644
--- a/esphome/components/pzemdc/pzemdc.h
+++ b/esphome/components/pzemdc/pzemdc.h
@@ -15,8 +15,6 @@ class PZEMDC : public PollingComponent, public modbus::ModbusDevice {
   void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
   void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
   void set_energy_sensor(sensor::Sensor *energy_sensor) { energy_sensor_ = energy_sensor; }
-  void set_frequency_sensor(sensor::Sensor *frequency_sensor) { frequency_sensor_ = frequency_sensor; }
-  void set_powerfactor_sensor(sensor::Sensor *powerfactor_sensor) { power_factor_sensor_ = powerfactor_sensor; }
 
   void update() override;
 
@@ -24,14 +22,24 @@ class PZEMDC : public PollingComponent, public modbus::ModbusDevice {
 
   void dump_config() override;
 
+  void reset_energy();
+
  protected:
   sensor::Sensor *voltage_sensor_{nullptr};
   sensor::Sensor *current_sensor_{nullptr};
   sensor::Sensor *power_sensor_{nullptr};
-  sensor::Sensor *frequency_sensor_{nullptr};
-  sensor::Sensor *power_factor_sensor_{nullptr};
   sensor::Sensor *energy_sensor_{nullptr};
 };
 
+template<typename... Ts> class ResetEnergyAction : public Action<Ts...> {
+ public:
+  ResetEnergyAction(PZEMDC *pzemdc) : pzemdc_(pzemdc) {}
+
+  void play(Ts... x) override { this->pzemdc_->reset_energy(); }
+
+ protected:
+  PZEMDC *pzemdc_;
+};
+
 }  // namespace pzemdc
 }  // namespace esphome
diff --git a/esphome/components/pzemdc/sensor.py b/esphome/components/pzemdc/sensor.py
index 4234ce19ad..097b1c1cfd 100644
--- a/esphome/components/pzemdc/sensor.py
+++ b/esphome/components/pzemdc/sensor.py
@@ -1,5 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
+from esphome import automation
+from esphome.automation import maybe_simple_id
 from esphome.components import sensor, modbus
 from esphome.const import (
     CONF_CURRENT,
@@ -24,6 +26,9 @@ AUTO_LOAD = ["modbus"]
 pzemdc_ns = cg.esphome_ns.namespace("pzemdc")
 PZEMDC = pzemdc_ns.class_("PZEMDC", cg.PollingComponent, modbus.ModbusDevice)
 
+# Actions
+ResetEnergyAction = pzemdc_ns.class_("ResetEnergyAction", automation.Action)
+
 CONFIG_SCHEMA = (
     cv.Schema(
         {
@@ -59,6 +64,20 @@ CONFIG_SCHEMA = (
 )
 
 
+@automation.register_action(
+    "pzemdc.reset_energy",
+    ResetEnergyAction,
+    maybe_simple_id(
+        {
+            cv.GenerateID(CONF_ID): cv.use_id(PZEMDC),
+        }
+    ),
+)
+async def reset_energy_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)
+
+
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
diff --git a/tests/test3.yaml b/tests/test3.yaml
index e62a171c95..f1b64b3389 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -579,6 +579,7 @@ sensor:
     power_factor:
       name: PZEMAC Power Factor
   - platform: pzemdc
+    id: pzemdc1
     voltage:
       name: PZEMDC Voltage
     current:
@@ -925,6 +926,11 @@ binary_sensor:
     on_press:
       then:
         - pzemac.reset_energy: pzemac1
+  - platform: template
+    id: pzemdc_reset_energy
+    on_press:
+      then:
+        - pzemdc.reset_energy: pzemdc1
 
   - platform: vbus
     model: deltasol_bs_plus

From 4f138c600bc4582753c513ca0f443fd1fe4b9bab Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Mar 2023 09:09:39 +1300
Subject: [PATCH 654/838] Bump version to 2023.4.0-dev

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

diff --git a/esphome/const.py b/esphome/const.py
index 4d6c7623bc..7b2fdfc3a4 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.3.0-dev"
+__version__ = "2023.4.0-dev"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From f58ffe41f8f681741e09ca466d594e3d0b841da3 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Mar 2023 09:09:39 +1300
Subject: [PATCH 655/838] Bump version to 2023.3.0b1

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

diff --git a/esphome/const.py b/esphome/const.py
index 4d6c7623bc..a78fb6948f 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.3.0-dev"
+__version__ = "2023.3.0b1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From c12dd77c647fe143a7ba7c1c2112935c62c526d0 Mon Sep 17 00:00:00 2001
From: Jared Sanson <jared@jared.geek.nz>
Date: Thu, 9 Mar 2023 10:03:11 +1300
Subject: [PATCH 656/838] Fix ethernet clk_mode for GPIO0_OUT (#4307)

* Fix GPIO0_OUT definition for ethernet component

* Formatting

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/ethernet/__init__.py       | 23 +++++++++++++++----
 .../ethernet/ethernet_component.cpp           |  9 +++++---
 .../components/ethernet/ethernet_component.h  |  5 ++--
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/esphome/components/ethernet/__init__.py b/esphome/components/ethernet/__init__.py
index a0f8b557b0..f6ca376681 100644
--- a/esphome/components/ethernet/__init__.py
+++ b/esphome/components/ethernet/__init__.py
@@ -36,12 +36,25 @@ ETHERNET_TYPES = {
     "JL1101": EthernetType.ETHERNET_TYPE_JL1101,
 }
 
+emac_rmii_clock_mode_t = cg.global_ns.enum("emac_rmii_clock_mode_t")
 emac_rmii_clock_gpio_t = cg.global_ns.enum("emac_rmii_clock_gpio_t")
 CLK_MODES = {
-    "GPIO0_IN": emac_rmii_clock_gpio_t.EMAC_CLK_IN_GPIO,
-    "GPIO0_OUT": emac_rmii_clock_gpio_t.EMAC_APPL_CLK_OUT_GPIO,
-    "GPIO16_OUT": emac_rmii_clock_gpio_t.EMAC_CLK_OUT_GPIO,
-    "GPIO17_OUT": emac_rmii_clock_gpio_t.EMAC_CLK_OUT_180_GPIO,
+    "GPIO0_IN": (
+        emac_rmii_clock_mode_t.EMAC_CLK_EXT_IN,
+        emac_rmii_clock_gpio_t.EMAC_CLK_IN_GPIO,
+    ),
+    "GPIO0_OUT": (
+        emac_rmii_clock_mode_t.EMAC_CLK_OUT,
+        emac_rmii_clock_gpio_t.EMAC_APPL_CLK_OUT_GPIO,
+    ),
+    "GPIO16_OUT": (
+        emac_rmii_clock_mode_t.EMAC_CLK_OUT,
+        emac_rmii_clock_gpio_t.EMAC_CLK_OUT_GPIO,
+    ),
+    "GPIO17_OUT": (
+        emac_rmii_clock_mode_t.EMAC_CLK_OUT,
+        emac_rmii_clock_gpio_t.EMAC_CLK_OUT_180_GPIO,
+    ),
 }
 
 
@@ -114,7 +127,7 @@ async def to_code(config):
     cg.add(var.set_mdc_pin(config[CONF_MDC_PIN]))
     cg.add(var.set_mdio_pin(config[CONF_MDIO_PIN]))
     cg.add(var.set_type(config[CONF_TYPE]))
-    cg.add(var.set_clk_mode(CLK_MODES[config[CONF_CLK_MODE]]))
+    cg.add(var.set_clk_mode(*CLK_MODES[config[CONF_CLK_MODE]]))
     cg.add(var.set_use_address(config[CONF_USE_ADDRESS]))
 
     if CONF_POWER_PIN in config:
diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index 9152b33a14..7120223cc9 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -47,8 +47,8 @@ void EthernetComponent::setup() {
 
   mac_config.smi_mdc_gpio_num = this->mdc_pin_;
   mac_config.smi_mdio_gpio_num = this->mdio_pin_;
-  mac_config.clock_config.rmii.clock_mode = this->clk_mode_ == EMAC_CLK_IN_GPIO ? EMAC_CLK_EXT_IN : EMAC_CLK_OUT;
-  mac_config.clock_config.rmii.clock_gpio = this->clk_mode_;
+  mac_config.clock_config.rmii.clock_mode = this->clk_mode_;
+  mac_config.clock_config.rmii.clock_gpio = this->clk_gpio_;
 
   esp_eth_mac_t *mac = esp_eth_mac_new_esp32(&mac_config);
 
@@ -315,7 +315,10 @@ void EthernetComponent::set_power_pin(int power_pin) { this->power_pin_ = power_
 void EthernetComponent::set_mdc_pin(uint8_t mdc_pin) { this->mdc_pin_ = mdc_pin; }
 void EthernetComponent::set_mdio_pin(uint8_t mdio_pin) { this->mdio_pin_ = mdio_pin; }
 void EthernetComponent::set_type(EthernetType type) { this->type_ = type; }
-void EthernetComponent::set_clk_mode(emac_rmii_clock_gpio_t clk_mode) { this->clk_mode_ = clk_mode; }
+void EthernetComponent::set_clk_mode(emac_rmii_clock_mode_t clk_mode, emac_rmii_clock_gpio_t clk_gpio) {
+  this->clk_mode_ = clk_mode;
+  this->clk_gpio_ = clk_gpio;
+}
 void EthernetComponent::set_manual_ip(const ManualIP &manual_ip) { this->manual_ip_ = manual_ip; }
 
 std::string EthernetComponent::get_use_address() const {
diff --git a/esphome/components/ethernet/ethernet_component.h b/esphome/components/ethernet/ethernet_component.h
index a538a5c77d..872ed17044 100644
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -50,7 +50,7 @@ class EthernetComponent : public Component {
   void set_mdc_pin(uint8_t mdc_pin);
   void set_mdio_pin(uint8_t mdio_pin);
   void set_type(EthernetType type);
-  void set_clk_mode(emac_rmii_clock_gpio_t clk_mode);
+  void set_clk_mode(emac_rmii_clock_mode_t clk_mode, emac_rmii_clock_gpio_t clk_gpio);
   void set_manual_ip(const ManualIP &manual_ip);
 
   network::IPAddress get_ip_address();
@@ -70,7 +70,8 @@ class EthernetComponent : public Component {
   uint8_t mdc_pin_{23};
   uint8_t mdio_pin_{18};
   EthernetType type_{ETHERNET_TYPE_LAN8720};
-  emac_rmii_clock_gpio_t clk_mode_{EMAC_CLK_IN_GPIO};
+  emac_rmii_clock_mode_t clk_mode_{EMAC_CLK_EXT_IN};
+  emac_rmii_clock_gpio_t clk_gpio_{EMAC_CLK_IN_GPIO};
   optional<ManualIP> manual_ip_{};
 
   bool started_{false};

From f3a969d35cdd22efd649a6084c0c5e86801713f7 Mon Sep 17 00:00:00 2001
From: Russell Cloran <rcloran+github@gmail.com>
Date: Wed, 8 Mar 2023 14:35:40 -0800
Subject: [PATCH 657/838] Add ESP32-S3 support in NeoPixelBus component (#4114)

* Add ESP32-S3 support in NeoPixelBus component

* Update NeoPixelBus version in platformio.ini
---
 esphome/components/neopixelbus/_methods.py | 6 +++---
 esphome/components/neopixelbus/light.py    | 3 ++-
 platformio.ini                             | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/esphome/components/neopixelbus/_methods.py b/esphome/components/neopixelbus/_methods.py
index a290257d6b..4059d040d0 100644
--- a/esphome/components/neopixelbus/_methods.py
+++ b/esphome/components/neopixelbus/_methods.py
@@ -13,8 +13,8 @@ from esphome.const import (
 from esphome.components.esp32 import get_esp32_variant
 from esphome.components.esp32.const import (
     VARIANT_ESP32,
-    VARIANT_ESP32S2,
     VARIANT_ESP32C3,
+    VARIANT_ESP32S2,
     VARIANT_ESP32S3,
 )
 from esphome.core import CORE
@@ -58,9 +58,9 @@ SPI_SPEEDS = [40e6, 20e6, 10e6, 5e6, 2e6, 1e6, 500e3]
 
 def _esp32_rmt_default_channel():
     return {
+        VARIANT_ESP32C3: 1,
         VARIANT_ESP32S2: 1,
         VARIANT_ESP32S3: 1,
-        VARIANT_ESP32C3: 1,
     }.get(get_esp32_variant(), 6)
 
 
@@ -71,9 +71,9 @@ def _validate_esp32_rmt_channel(value):
         value = cv.int_(value)
     variant_channels = {
         VARIANT_ESP32: [0, 1, 2, 3, 4, 5, 6, 7, CHANNEL_DYNAMIC],
+        VARIANT_ESP32C3: [0, 1, CHANNEL_DYNAMIC],
         VARIANT_ESP32S2: [0, 1, 2, 3, CHANNEL_DYNAMIC],
         VARIANT_ESP32S3: [0, 1, 2, 3, CHANNEL_DYNAMIC],
-        VARIANT_ESP32C3: [0, 1, CHANNEL_DYNAMIC],
     }
     variant = get_esp32_variant()
     if variant not in variant_channels:
diff --git a/esphome/components/neopixelbus/light.py b/esphome/components/neopixelbus/light.py
index 072a565eda..9bd9215936 100644
--- a/esphome/components/neopixelbus/light.py
+++ b/esphome/components/neopixelbus/light.py
@@ -17,6 +17,7 @@ from esphome.const import (
 from esphome.components.esp32 import get_esp32_variant
 from esphome.components.esp32.const import (
     VARIANT_ESP32C3,
+    VARIANT_ESP32S3,
 )
 from esphome.core import CORE
 from ._methods import (
@@ -96,7 +97,7 @@ def _choose_default_method(config):
             config[CONF_METHOD] = _validate_method(METHOD_BIT_BANG)
 
     if CORE.is_esp32:
-        if get_esp32_variant() == VARIANT_ESP32C3:
+        if get_esp32_variant() in (VARIANT_ESP32C3, VARIANT_ESP32S3):
             config[CONF_METHOD] = _validate_method(METHOD_ESP32_RMT)
         else:
             config[CONF_METHOD] = _validate_method(METHOD_ESP32_I2S)
diff --git a/platformio.ini b/platformio.ini
index 65dccde3b9..3df6446ff1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -34,7 +34,7 @@ build_flags =
 [common]
 lib_deps =
     esphome/noise-c@0.1.4                  ; api
-    makuna/NeoPixelBus@2.6.9               ; neopixelbus
+    makuna/NeoPixelBus@2.7.3               ; neopixelbus
     esphome/Improv@1.2.3                   ; improv_serial / esp32_improv
     bblanchon/ArduinoJson@6.18.5           ; json
     wjtje/qr-code-generator-library@1.7.0  ; qr_code

From 336c2d34e646f6b4bead6ad903d10486337cc52a Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Thu, 9 Mar 2023 00:03:49 +0100
Subject: [PATCH 658/838] Renaming and extending the ili9341 to the ili9xxx
 component (#4275)

* - Removed cleaning the screen twice.
  \Should be handled by  `DisplayBuffer::init_internal_();`
- Made ili9341::initalize() protected and renamed
  \ it to ili9341::initalize().
- ili9341::initalize() should only init the display
  \ and set the width and heigth.

* removed to much

* clang format fixes

* removing trailing underscors for
protected virtual methods

* removed the "override"  on display()

* clang fixes

* restored old changes

* Renamed the ili9341 platform to ili9xxx and added
multiple drivers as well. including PR #3848

* fixed most of the clang reported issues

* fixed reported issues

* last fixes

* Setting the right codeowners

* missing changes

* fixed naming Display() method.

* clang again

* clang fix

* fixes reported by @jesserockz & @gpambrozio

* a change to display.py removing an unneeded var

* re-introduce **backlight** option.

* update the ili9488 initialization

* update the ili9488 initialization and fix typo

* fixed typo

* add missing constants

* swap height and width back for the ili9488

* init fixes ili9488

* fixed lint issue
testing the init code

* oeps

* init fixes ili9488

* fixed wrong define

* fixed wrong define again

* removed some spaces

* revert to ili9341

* Remove parts that where used for
the switchplate

* lint fixes and removing unused function

* fix error and introducing 16bit color option

* fix error and introducing 16bit color option

* fix clang issue

* clang fix

* clang issue again

* is this what clang exprect

* clang fix

* clang fix

* try again

* let try again

* and again

* and the last clang fix

* remove the need of wifi

* update dimentions

* update ili8488 init code.

* update dimentions

* allow to change height and width

* dump color mode config

* fix

* fix

* modify logging

* referd back unrelated change

* code formatting commit and moving functions around

* add missing ;

* update code

* update code

* use the correct write_array for sending uint16_t

* fix panic loop

* fix panic loop

* - update the test file
- fixed sending display data

* clang fixes

* clang fixes

* clang fixes again

* remove .gitignore items

* remove .gitignore items

* make sure Update() can can not be called while
called

* clang correction

* adding a test yaml for the ili9341

* Update ili9341 example

* Make test ili9xxx/tests only local

* restore back old ili9341 driver code

* Add a new config for the M5Core

* fix clang request

* reverd to restore of the old ili9341
there is no proper way to say it is depricated.

* Remove the backlight/led pin from the config.
You need to use a proper light platform component

* Ili9488init changes (#88)

Fixed ILI9488 init settings, and adjusted pixel handling code to push pixels in 18 bit format.
This does not change the internal 16-bit representation.

* fixed some leftover clang issues from the merge.

* fixed the slang-tidy request.

* remove `backlight_pin` warning.

---------

Co-authored-by: JD Steffen <jdsteffen81@gmail.com>
---
 CODEOWNERS                                    |   1 +
 esphome/components/ili9341/display.py         | 154 +------
 esphome/components/ili9341/ili9341_defines.h  |  83 ----
 .../components/ili9341/ili9341_display.cpp    | 308 -------------
 esphome/components/ili9341/ili9341_init.h     |  70 ---
 esphome/components/ili9xxx/__init__.py        |   0
 esphome/components/ili9xxx/display.py         | 159 +++++++
 esphome/components/ili9xxx/ili9xxx_defines.h  |  96 ++++
 .../components/ili9xxx/ili9xxx_display.cpp    | 416 ++++++++++++++++++
 .../ili9xxx_display.h}                        | 118 ++---
 esphome/components/ili9xxx/ili9xxx_init.h     | 174 ++++++++
 tests/test1.yaml                              |  10 +-
 12 files changed, 917 insertions(+), 672 deletions(-)
 delete mode 100644 esphome/components/ili9341/ili9341_defines.h
 delete mode 100644 esphome/components/ili9341/ili9341_display.cpp
 delete mode 100644 esphome/components/ili9341/ili9341_init.h
 create mode 100644 esphome/components/ili9xxx/__init__.py
 create mode 100644 esphome/components/ili9xxx/display.py
 create mode 100644 esphome/components/ili9xxx/ili9xxx_defines.h
 create mode 100644 esphome/components/ili9xxx/ili9xxx_display.cpp
 rename esphome/components/{ili9341/ili9341_display.h => ili9xxx/ili9xxx_display.h} (51%)
 create mode 100644 esphome/components/ili9xxx/ili9xxx_init.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 3d6ea5cd32..c006db2a6a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -111,6 +111,7 @@ esphome/components/hte501/* @Stock-M
 esphome/components/hydreon_rgxx/* @functionpointer
 esphome/components/i2c/* @esphome/core
 esphome/components/i2s_audio/* @jesserockz
+esphome/components/ili9xxx/* @nielsnl68
 esphome/components/improv_base/* @esphome/core
 esphome/components/improv_serial/* @esphome/core
 esphome/components/ina260/* @MrEditor97
diff --git a/esphome/components/ili9341/display.py b/esphome/components/ili9341/display.py
index 0b87a0c4eb..6ab6a5e8ef 100644
--- a/esphome/components/ili9341/display.py
+++ b/esphome/components/ili9341/display.py
@@ -1,153 +1,5 @@
-import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome import core, pins
-from esphome.components import display, spi
-from esphome.const import (
-    CONF_COLOR_PALETTE,
-    CONF_DC_PIN,
-    CONF_ID,
-    CONF_LAMBDA,
-    CONF_MODEL,
-    CONF_PAGES,
-    CONF_RAW_DATA_ID,
-    CONF_RESET_PIN,
+
+CONFIG_SCHEMA = cv.invalid(
+    "The ili9341 platform component has been renamed to ili9xxx."
 )
-from esphome.core import CORE, HexInt
-
-DEPENDENCIES = ["spi"]
-
-CONF_COLOR_PALETTE_IMAGES = "color_palette_images"
-CONF_LED_PIN = "led_pin"
-
-ili9341_ns = cg.esphome_ns.namespace("ili9341")
-ili9341 = ili9341_ns.class_(
-    "ILI9341Display", cg.PollingComponent, spi.SPIDevice, display.DisplayBuffer
-)
-ILI9341M5Stack = ili9341_ns.class_("ILI9341M5Stack", ili9341)
-ILI9341TFT24 = ili9341_ns.class_("ILI9341TFT24", ili9341)
-ILI9341TFT24R = ili9341_ns.class_("ILI9341TFT24R", ili9341)
-
-ILI9341Model = ili9341_ns.enum("ILI9341Model")
-ILI9341ColorMode = ili9341_ns.enum("ILI9341ColorMode")
-
-MODELS = {
-    "M5STACK": ILI9341Model.M5STACK,
-    "TFT_2.4": ILI9341Model.TFT_24,
-    "TFT_2.4R": ILI9341Model.TFT_24R,
-}
-
-ILI9341_MODEL = cv.enum(MODELS, upper=True, space="_")
-
-COLOR_PALETTE = cv.one_of("NONE", "GRAYSCALE", "IMAGE_ADAPTIVE")
-
-
-def _validate(config):
-    if config.get(CONF_COLOR_PALETTE) == "IMAGE_ADAPTIVE" and not config.get(
-        CONF_COLOR_PALETTE_IMAGES
-    ):
-        raise cv.Invalid(
-            "Color palette in IMAGE_ADAPTIVE mode requires at least one 'color_palette_images' entry to generate palette"
-        )
-    if (
-        config.get(CONF_COLOR_PALETTE_IMAGES)
-        and config.get(CONF_COLOR_PALETTE) != "IMAGE_ADAPTIVE"
-    ):
-        raise cv.Invalid(
-            "Providing color palette images requires palette mode to be 'IMAGE_ADAPTIVE'"
-        )
-    return config
-
-
-CONFIG_SCHEMA = cv.All(
-    display.FULL_DISPLAY_SCHEMA.extend(
-        {
-            cv.GenerateID(): cv.declare_id(ili9341),
-            cv.Required(CONF_MODEL): ILI9341_MODEL,
-            cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
-            cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
-            cv.Optional(CONF_LED_PIN): pins.gpio_output_pin_schema,
-            cv.Optional(CONF_COLOR_PALETTE, default="NONE"): COLOR_PALETTE,
-            cv.Optional(CONF_COLOR_PALETTE_IMAGES, default=[]): cv.ensure_list(
-                cv.file_
-            ),
-            cv.GenerateID(CONF_RAW_DATA_ID): cv.declare_id(cg.uint8),
-        }
-    )
-    .extend(cv.polling_component_schema("1s"))
-    .extend(spi.spi_device_schema(False)),
-    cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA),
-    _validate,
-)
-
-
-async def to_code(config):
-    if config[CONF_MODEL] == "M5STACK":
-        lcd_type = ILI9341M5Stack
-    if config[CONF_MODEL] == "TFT_2.4":
-        lcd_type = ILI9341TFT24
-    if config[CONF_MODEL] == "TFT_2.4R":
-        lcd_type = ILI9341TFT24R
-    rhs = lcd_type.new()
-    var = cg.Pvariable(config[CONF_ID], rhs)
-
-    await cg.register_component(var, config)
-    await display.register_display(var, config)
-    await spi.register_spi_device(var, config)
-    cg.add(var.set_model(config[CONF_MODEL]))
-    dc = await cg.gpio_pin_expression(config[CONF_DC_PIN])
-    cg.add(var.set_dc_pin(dc))
-
-    if CONF_LAMBDA in config:
-        lambda_ = await cg.process_lambda(
-            config[CONF_LAMBDA], [(display.DisplayBufferRef, "it")], return_type=cg.void
-        )
-        cg.add(var.set_writer(lambda_))
-    if CONF_RESET_PIN in config:
-        reset = await cg.gpio_pin_expression(config[CONF_RESET_PIN])
-        cg.add(var.set_reset_pin(reset))
-    if CONF_LED_PIN in config:
-        led_pin = await cg.gpio_pin_expression(config[CONF_LED_PIN])
-        cg.add(var.set_led_pin(led_pin))
-
-    rhs = None
-    if config[CONF_COLOR_PALETTE] == "GRAYSCALE":
-        cg.add(var.set_buffer_color_mode(ILI9341ColorMode.BITS_8_INDEXED))
-        rhs = []
-        for x in range(256):
-            rhs.extend([HexInt(x), HexInt(x), HexInt(x)])
-    elif config[CONF_COLOR_PALETTE] == "IMAGE_ADAPTIVE":
-        cg.add(var.set_buffer_color_mode(ILI9341ColorMode.BITS_8_INDEXED))
-        from PIL import Image
-
-        def load_image(filename):
-            path = CORE.relative_config_path(filename)
-            try:
-                return Image.open(path)
-            except Exception as e:
-                raise core.EsphomeError(f"Could not load image file {path}: {e}")
-
-        # make a wide horizontal combined image.
-        images = [load_image(x) for x in config[CONF_COLOR_PALETTE_IMAGES]]
-        total_width = sum(i.width for i in images)
-        max_height = max(i.height for i in images)
-
-        ref_image = Image.new("RGB", (total_width, max_height))
-        x = 0
-        for i in images:
-            ref_image.paste(i, (x, 0))
-            x = x + i.width
-
-        # reduce the colors on combined image to 256.
-        converted = ref_image.convert("P", palette=Image.ADAPTIVE, colors=256)
-        # if you want to verify how the images look use
-        # ref_image.save("ref_in.png")
-        # converted.save("ref_out.png")
-        palette = converted.getpalette()
-        assert len(palette) == 256 * 3
-        rhs = palette
-    else:
-        cg.add(var.set_buffer_color_mode(ILI9341ColorMode.BITS_8))
-
-    if rhs is not None:
-        prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
-        cg.add(var.set_palette(prog_arr))
diff --git a/esphome/components/ili9341/ili9341_defines.h b/esphome/components/ili9341/ili9341_defines.h
deleted file mode 100644
index 6b3d4c0dcf..0000000000
--- a/esphome/components/ili9341/ili9341_defines.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#pragma once
-
-namespace esphome {
-namespace ili9341 {
-
-// Color definitions
-// clang-format off
-static const uint8_t MADCTL_MY    = 0x80;   ///< Bit 7 Bottom to top
-static const uint8_t MADCTL_MX    = 0x40;   ///< Bit 6 Right to left
-static const uint8_t MADCTL_MV    = 0x20;   ///< Bit 5 Reverse Mode
-static const uint8_t MADCTL_ML    = 0x10;   ///< Bit 4 LCD refresh Bottom to top
-static const uint8_t MADCTL_RGB   = 0x00;  ///< Bit 3 Red-Green-Blue pixel order
-static const uint8_t MADCTL_BGR   = 0x08;  ///< Bit 3 Blue-Green-Red pixel order
-static const uint8_t MADCTL_MH    = 0x04;   ///< Bit 2 LCD refresh right to left
-// clang-format on
-
-static const uint16_t ILI9341_TFTWIDTH = 320;   ///< ILI9341 max TFT width
-static const uint16_t ILI9341_TFTHEIGHT = 240;  ///< ILI9341 max TFT height
-
-// All ILI9341 specific commands some are used by init()
-static const uint8_t ILI9341_NOP = 0x00;
-static const uint8_t ILI9341_SWRESET = 0x01;
-static const uint8_t ILI9341_RDDID = 0x04;
-static const uint8_t ILI9341_RDDST = 0x09;
-
-static const uint8_t ILI9341_SLPIN = 0x10;
-static const uint8_t ILI9341_SLPOUT = 0x11;
-static const uint8_t ILI9341_PTLON = 0x12;
-static const uint8_t ILI9341_NORON = 0x13;
-
-static const uint8_t ILI9341_RDMODE = 0x0A;
-static const uint8_t ILI9341_RDMADCTL = 0x0B;
-static const uint8_t ILI9341_RDPIXFMT = 0x0C;
-static const uint8_t ILI9341_RDIMGFMT = 0x0A;
-static const uint8_t ILI9341_RDSELFDIAG = 0x0F;
-
-static const uint8_t ILI9341_INVOFF = 0x20;
-static const uint8_t ILI9341_INVON = 0x21;
-static const uint8_t ILI9341_GAMMASET = 0x26;
-static const uint8_t ILI9341_DISPOFF = 0x28;
-static const uint8_t ILI9341_DISPON = 0x29;
-
-static const uint8_t ILI9341_CASET = 0x2A;
-static const uint8_t ILI9341_PASET = 0x2B;
-static const uint8_t ILI9341_RAMWR = 0x2C;
-static const uint8_t ILI9341_RAMRD = 0x2E;
-
-static const uint8_t ILI9341_PTLAR = 0x30;
-static const uint8_t ILI9341_VSCRDEF = 0x33;
-static const uint8_t ILI9341_MADCTL = 0x36;
-static const uint8_t ILI9341_VSCRSADD = 0x37;
-static const uint8_t ILI9341_PIXFMT = 0x3A;
-
-static const uint8_t ILI9341_WRDISBV = 0x51;
-static const uint8_t ILI9341_RDDISBV = 0x52;
-static const uint8_t ILI9341_WRCTRLD = 0x53;
-
-static const uint8_t ILI9341_FRMCTR1 = 0xB1;
-static const uint8_t ILI9341_FRMCTR2 = 0xB2;
-static const uint8_t ILI9341_FRMCTR3 = 0xB3;
-static const uint8_t ILI9341_INVCTR = 0xB4;
-static const uint8_t ILI9341_DFUNCTR = 0xB6;
-
-static const uint8_t ILI9341_PWCTR1 = 0xC0;
-static const uint8_t ILI9341_PWCTR2 = 0xC1;
-static const uint8_t ILI9341_PWCTR3 = 0xC2;
-static const uint8_t ILI9341_PWCTR4 = 0xC3;
-static const uint8_t ILI9341_PWCTR5 = 0xC4;
-static const uint8_t ILI9341_VMCTR1 = 0xC5;
-static const uint8_t ILI9341_VMCTR2 = 0xC7;
-
-static const uint8_t ILI9341_RDID4 = 0xD3;
-static const uint8_t ILI9341_RDINDEX = 0xD9;
-static const uint8_t ILI9341_RDID1 = 0xDA;
-static const uint8_t ILI9341_RDID2 = 0xDB;
-static const uint8_t ILI9341_RDID3 = 0xDC;
-static const uint8_t ILI9341_RDIDX = 0xDD;  // TBC
-
-static const uint8_t ILI9341_GMCTRP1 = 0xE0;
-static const uint8_t ILI9341_GMCTRN1 = 0xE1;
-
-}  // namespace ili9341
-}  // namespace esphome
diff --git a/esphome/components/ili9341/ili9341_display.cpp b/esphome/components/ili9341/ili9341_display.cpp
deleted file mode 100644
index 9f9edcf21f..0000000000
--- a/esphome/components/ili9341/ili9341_display.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-#include "ili9341_display.h"
-#include "esphome/core/log.h"
-#include "esphome/core/application.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/hal.h"
-
-namespace esphome {
-namespace ili9341 {
-
-static const char *const TAG = "ili9341";
-
-void ILI9341Display::setup_pins_() {
-  this->dc_pin_->setup();  // OUTPUT
-  this->dc_pin_->digital_write(false);
-  if (this->reset_pin_ != nullptr) {
-    this->reset_pin_->setup();  // OUTPUT
-    this->reset_pin_->digital_write(true);
-  }
-  if (this->led_pin_ != nullptr) {
-    this->led_pin_->setup();
-    this->led_pin_->digital_write(true);
-  }
-  this->spi_setup();
-
-  this->reset_();
-}
-
-void ILI9341Display::dump_config() {
-  LOG_DISPLAY("", "ili9341", this);
-  LOG_PIN("  Reset Pin: ", this->reset_pin_);
-  LOG_PIN("  DC Pin: ", this->dc_pin_);
-  LOG_PIN("  Busy Pin: ", this->busy_pin_);
-  LOG_UPDATE_INTERVAL(this);
-}
-
-float ILI9341Display::get_setup_priority() const { return setup_priority::HARDWARE; }
-
-void ILI9341Display::command(uint8_t value) {
-  this->start_command_();
-  this->write_byte(value);
-  this->end_command_();
-}
-
-void ILI9341Display::reset_() {
-  if (this->reset_pin_ != nullptr) {
-    this->reset_pin_->digital_write(false);
-    delay(10);
-    this->reset_pin_->digital_write(true);
-    delay(10);
-  }
-}
-
-void ILI9341Display::data(uint8_t value) {
-  this->start_data_();
-  this->write_byte(value);
-  this->end_data_();
-}
-
-void ILI9341Display::send_command(uint8_t command_byte, const uint8_t *data_bytes, uint8_t num_data_bytes) {
-  this->command(command_byte);  // Send the command byte
-  this->start_data_();
-  this->write_array(data_bytes, num_data_bytes);
-  this->end_data_();
-}
-
-uint8_t ILI9341Display::read_command(uint8_t command_byte, uint8_t index) {
-  uint8_t data = 0x10 + index;
-  this->send_command(0xD9, &data, 1);  // Set Index Register
-  uint8_t result;
-  this->start_command_();
-  this->write_byte(command_byte);
-  this->start_data_();
-  do {
-    result = this->read_byte();
-  } while (index--);
-  this->end_data_();
-  return result;
-}
-
-void ILI9341Display::update() {
-  this->do_update_();
-  this->display_();
-}
-
-void ILI9341Display::display_() {
-  // we will only update the changed window to the display
-  uint16_t w = this->x_high_ - this->x_low_ + 1;
-  uint16_t h = this->y_high_ - this->y_low_ + 1;
-  uint32_t start_pos = ((this->y_low_ * this->width_) + x_low_);
-
-  // check if something was displayed
-  if ((this->x_high_ < this->x_low_) || (this->y_high_ < this->y_low_)) {
-    return;
-  }
-
-  set_addr_window_(this->x_low_, this->y_low_, w, h);
-
-  ESP_LOGVV("ILI9341", "Start ILI9341Display::display_(xl:%d, xh:%d, yl:%d, yh:%d, w:%d, h:%d, start_pos:%d)",
-            this->x_low_, this->x_high_, this->y_low_, this->y_high_, w, h, start_pos);
-
-  this->start_data_();
-  for (uint16_t row = 0; row < h; row++) {
-    uint32_t pos = start_pos + (row * width_);
-    uint32_t rem = w;
-
-    while (rem > 0) {
-      uint32_t sz = buffer_to_transfer_(pos, rem);
-      this->write_array(transfer_buffer_, 2 * sz);
-      pos += sz;
-      rem -= sz;
-      App.feed_wdt();
-    }
-    App.feed_wdt();
-  }
-  this->end_data_();
-
-  // invalidate watermarks
-  this->x_low_ = this->width_;
-  this->y_low_ = this->height_;
-  this->x_high_ = 0;
-  this->y_high_ = 0;
-}
-
-void ILI9341Display::fill(Color color) {
-  uint8_t color332 = 0;
-  if (this->buffer_color_mode_ == BITS_8) {
-    color332 = display::ColorUtil::color_to_332(color);
-  } else {  // if (this->buffer_color_mode_ == BITS_8_INDEXED)
-    color332 = display::ColorUtil::color_to_index8_palette888(color, this->palette_);
-  }
-  memset(this->buffer_, color332, this->get_buffer_length_());
-  this->x_low_ = 0;
-  this->y_low_ = 0;
-  this->x_high_ = this->get_width_internal() - 1;
-  this->y_high_ = this->get_height_internal() - 1;
-}
-
-void ILI9341Display::fill_internal_(uint8_t color) {
-  memset(transfer_buffer_, color, sizeof(transfer_buffer_));
-
-  uint32_t rem = (this->get_buffer_length_() * 2);
-
-  this->set_addr_window_(0, 0, this->get_width_internal(), this->get_height_internal());
-  this->start_data_();
-
-  while (rem > 0) {
-    size_t sz = rem <= sizeof(transfer_buffer_) ? rem : sizeof(transfer_buffer_);
-    this->write_array(transfer_buffer_, sz);
-    rem -= sz;
-  }
-
-  this->end_data_();
-
-  memset(buffer_, color, this->get_buffer_length_());
-}
-
-void ILI9341Display::rotate_my_(uint8_t m) {
-  uint8_t rotation = m & 3;  // can't be higher than 3
-  switch (rotation) {
-    case 0:
-      m = (MADCTL_MX | MADCTL_BGR);
-      // _width = ILI9341_TFTWIDTH;
-      // _height = ILI9341_TFTHEIGHT;
-      break;
-    case 1:
-      m = (MADCTL_MV | MADCTL_BGR);
-      // _width = ILI9341_TFTHEIGHT;
-      // _height = ILI9341_TFTWIDTH;
-      break;
-    case 2:
-      m = (MADCTL_MY | MADCTL_BGR);
-      // _width = ILI9341_TFTWIDTH;
-      // _height = ILI9341_TFTHEIGHT;
-      break;
-    case 3:
-      m = (MADCTL_MX | MADCTL_MY | MADCTL_MV | MADCTL_BGR);
-      // _width = ILI9341_TFTHEIGHT;
-      // _height = ILI9341_TFTWIDTH;
-      break;
-  }
-
-  this->command(ILI9341_MADCTL);
-  this->data(m);
-}
-
-void HOT ILI9341Display::draw_absolute_pixel_internal(int x, int y, Color color) {
-  if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0)
-    return;
-
-  uint32_t pos = (y * width_) + x;
-  uint8_t new_color;
-
-  if (this->buffer_color_mode_ == BITS_8) {
-    new_color = display::ColorUtil::color_to_332(color, display::ColorOrder::COLOR_ORDER_RGB);
-  } else {  // if (this->buffer_color_mode_ == BITS_8_INDEXED) {
-    new_color = display::ColorUtil::color_to_index8_palette888(color, this->palette_);
-  }
-
-  if (buffer_[pos] != new_color) {
-    buffer_[pos] = new_color;
-    // low and high watermark may speed up drawing from buffer
-    this->x_low_ = (x < this->x_low_) ? x : this->x_low_;
-    this->y_low_ = (y < this->y_low_) ? y : this->y_low_;
-    this->x_high_ = (x > this->x_high_) ? x : this->x_high_;
-    this->y_high_ = (y > this->y_high_) ? y : this->y_high_;
-  }
-}
-
-// should return the total size: return this->get_width_internal() * this->get_height_internal() * 2 // 16bit color
-// values per bit is huge
-uint32_t ILI9341Display::get_buffer_length_() { return this->get_width_internal() * this->get_height_internal(); }
-
-void ILI9341Display::start_command_() {
-  this->dc_pin_->digital_write(false);
-  this->enable();
-}
-
-void ILI9341Display::end_command_() { this->disable(); }
-void ILI9341Display::start_data_() {
-  this->dc_pin_->digital_write(true);
-  this->enable();
-}
-void ILI9341Display::end_data_() { this->disable(); }
-
-void ILI9341Display::init_lcd_(const uint8_t *init_cmd) {
-  uint8_t cmd, x, num_args;
-  const uint8_t *addr = init_cmd;
-  while ((cmd = progmem_read_byte(addr++)) > 0) {
-    x = progmem_read_byte(addr++);
-    num_args = x & 0x7F;
-    send_command(cmd, addr, num_args);
-    addr += num_args;
-    if (x & 0x80)
-      delay(150);  // NOLINT
-  }
-}
-
-void ILI9341Display::set_addr_window_(uint16_t x1, uint16_t y1, uint16_t w, uint16_t h) {
-  uint16_t x2 = (x1 + w - 1), y2 = (y1 + h - 1);
-  this->command(ILI9341_CASET);  // Column address set
-  this->start_data_();
-  this->write_byte(x1 >> 8);
-  this->write_byte(x1);
-  this->write_byte(x2 >> 8);
-  this->write_byte(x2);
-  this->end_data_();
-  this->command(ILI9341_PASET);  // Row address set
-  this->start_data_();
-  this->write_byte(y1 >> 8);
-  this->write_byte(y1);
-  this->write_byte(y2 >> 8);
-  this->write_byte(y2);
-  this->end_data_();
-  this->command(ILI9341_RAMWR);  // Write to RAM
-}
-
-void ILI9341Display::invert_display_(bool invert) { this->command(invert ? ILI9341_INVON : ILI9341_INVOFF); }
-
-int ILI9341Display::get_width_internal() { return this->width_; }
-int ILI9341Display::get_height_internal() { return this->height_; }
-
-uint32_t ILI9341Display::buffer_to_transfer_(uint32_t pos, uint32_t sz) {
-  uint8_t *src = buffer_ + pos;
-  uint8_t *dst = transfer_buffer_;
-
-  if (sz > sizeof(transfer_buffer_) / 2) {
-    sz = sizeof(transfer_buffer_) / 2;
-  }
-
-  for (uint32_t i = 0; i < sz; ++i) {
-    uint16_t color;
-    if (this->buffer_color_mode_ == BITS_8) {
-      color = display::ColorUtil::color_to_565(display::ColorUtil::rgb332_to_color(*src++));
-    } else {  //  if (this->buffer_color_mode == BITS_8_INDEXED) {
-      Color col = display::ColorUtil::index8_to_color_palette888(*src++, this->palette_);
-      color = display::ColorUtil::color_to_565(col);
-    }
-    *dst++ = (uint8_t)(color >> 8);
-    *dst++ = (uint8_t) color;
-  }
-
-  return sz;
-}
-
-//   M5Stack display
-void ILI9341M5Stack::initialize() {
-  this->init_lcd_(INITCMD_M5STACK);
-  this->width_ = 320;
-  this->height_ = 240;
-  this->invert_display_(true);
-}
-
-//   24_TFT display
-void ILI9341TFT24::initialize() {
-  this->init_lcd_(INITCMD_TFT);
-  this->width_ = 240;
-  this->height_ = 320;
-}
-
-//   24_TFT rotated display
-void ILI9341TFT24R::initialize() {
-  this->init_lcd_(INITCMD_TFT);
-  this->width_ = 320;
-  this->height_ = 240;
-}
-
-}  // namespace ili9341
-}  // namespace esphome
diff --git a/esphome/components/ili9341/ili9341_init.h b/esphome/components/ili9341/ili9341_init.h
deleted file mode 100644
index b4f67ff19a..0000000000
--- a/esphome/components/ili9341/ili9341_init.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#pragma once
-#include "esphome/core/helpers.h"
-
-namespace esphome {
-namespace ili9341 {
-
-// clang-format off
-static const uint8_t PROGMEM INITCMD_M5STACK[] = {
-  0xEF, 3, 0x03, 0x80, 0x02,
-  0xCF, 3, 0x00, 0xC1, 0x30,
-  0xED, 4, 0x64, 0x03, 0x12, 0x81,
-  0xE8, 3, 0x85, 0x00, 0x78,
-  0xCB, 5, 0x39, 0x2C, 0x00, 0x34, 0x02,
-  0xF7, 1, 0x20,
-  0xEA, 2, 0x00, 0x00,
-  ILI9341_PWCTR1  , 1, 0x23,             // Power control VRH[5:0]
-  ILI9341_PWCTR2  , 1, 0x10,             // Power control SAP[2:0];BT[3:0]
-  ILI9341_VMCTR1  , 2, 0x3e, 0x28,       // VCM control
-  ILI9341_VMCTR2  , 1, 0x86,             // VCM control2
-  ILI9341_MADCTL  , 1, MADCTL_BGR,       // Memory Access Control
-  ILI9341_VSCRSADD, 1, 0x00,             // Vertical scroll zero
-  ILI9341_PIXFMT  , 1, 0x55,
-  ILI9341_FRMCTR1 , 2, 0x00, 0x13,
-  ILI9341_DFUNCTR , 3, 0x08, 0x82, 0x27, // Display Function Control
-  0xF2, 1, 0x00,                         // 3Gamma Function Disable
-  ILI9341_GAMMASET , 1, 0x01,             // Gamma curve selected
-  ILI9341_GMCTRP1 , 15, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, // Set Gamma
-                        0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03,
-                        0x0E, 0x09, 0x00,
-  ILI9341_GMCTRN1 , 15, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, // Set Gamma
-                        0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C,
-                        0x31, 0x36, 0x0F,
-  ILI9341_SLPOUT  , 0x80,                // Exit Sleep
-  ILI9341_DISPON  , 0x80,                // Display on
-  0x00                                   // End of list
-};
-
-static const uint8_t PROGMEM INITCMD_TFT[] = {
-  0xEF, 3, 0x03, 0x80, 0x02,
-  0xCF, 3, 0x00, 0xC1, 0x30,
-  0xED, 4, 0x64, 0x03, 0x12, 0x81,
-  0xE8, 3, 0x85, 0x00, 0x78,
-  0xCB, 5, 0x39, 0x2C, 0x00, 0x34, 0x02,
-  0xF7, 1, 0x20,
-  0xEA, 2, 0x00, 0x00,
-  ILI9341_PWCTR1  , 1, 0x23,             // Power control VRH[5:0]
-  ILI9341_PWCTR2  , 1, 0x10,             // Power control SAP[2:0];BT[3:0]
-  ILI9341_VMCTR1  , 2, 0x3e, 0x28,       // VCM control
-  ILI9341_VMCTR2  , 1, 0x86,             // VCM control2
-  ILI9341_MADCTL  , 1, 0x48,             // Memory Access Control
-  ILI9341_VSCRSADD, 1, 0x00,             // Vertical scroll zero
-  ILI9341_PIXFMT  , 1, 0x55,
-  ILI9341_FRMCTR1 , 2, 0x00, 0x18,
-  ILI9341_DFUNCTR , 3, 0x08, 0x82, 0x27, // Display Function Control
-  0xF2, 1, 0x00,                         // 3Gamma Function Disable
-  ILI9341_GAMMASET , 1, 0x01,             // Gamma curve selected
-  ILI9341_GMCTRP1 , 15, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, // Set Gamma
-                        0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03,
-                        0x0E, 0x09, 0x00,
-  ILI9341_GMCTRN1 , 15, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, // Set Gamma
-                        0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C,
-                        0x31, 0x36, 0x0F,
-  ILI9341_SLPOUT  , 0x80,                // Exit Sleep
-  ILI9341_DISPON  , 0x80,                // Display on
-  0x00                                   // End of list
-};
-
-// clang-format on
-}  // namespace ili9341
-}  // namespace esphome
diff --git a/esphome/components/ili9xxx/__init__.py b/esphome/components/ili9xxx/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/ili9xxx/display.py b/esphome/components/ili9xxx/display.py
new file mode 100644
index 0000000000..437fc93b89
--- /dev/null
+++ b/esphome/components/ili9xxx/display.py
@@ -0,0 +1,159 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import core, pins
+from esphome.components import display, spi
+from esphome.core import CORE, HexInt
+from esphome.const import (
+    CONF_COLOR_PALETTE,
+    CONF_DC_PIN,
+    CONF_ID,
+    CONF_LAMBDA,
+    CONF_MODEL,
+    CONF_RAW_DATA_ID,
+    CONF_PAGES,
+    CONF_RESET_PIN,
+    CONF_DIMENSIONS,
+)
+
+DEPENDENCIES = ["spi"]
+AUTO_LOAD = ["psram"]
+
+CODEOWNERS = ["@nielsnl68"]
+
+ili9XXX_ns = cg.esphome_ns.namespace("ili9xxx")
+ili9XXXSPI = ili9XXX_ns.class_(
+    "ILI9XXXDisplay", cg.PollingComponent, spi.SPIDevice, display.DisplayBuffer
+)
+
+ILI9XXXColorMode = ili9XXX_ns.enum("ILI9XXXColorMode")
+
+MODELS = {
+    "M5STACK": ili9XXX_ns.class_("ILI9XXXM5Stack", ili9XXXSPI),
+    "M5CORE": ili9XXX_ns.class_("ILI9XXXM5CORE", ili9XXXSPI),
+    "TFT_2.4": ili9XXX_ns.class_("ILI9XXXILI9341", ili9XXXSPI),
+    "TFT_2.4R": ili9XXX_ns.class_("ILI9XXXILI9342", ili9XXXSPI),
+    "ILI9341": ili9XXX_ns.class_("ILI9XXXILI9341", ili9XXXSPI),
+    "ILI9342": ili9XXX_ns.class_("ILI9XXXILI9342", ili9XXXSPI),
+    "ILI9481": ili9XXX_ns.class_("ILI9XXXILI9481", ili9XXXSPI),
+    "ILI9486": ili9XXX_ns.class_("ILI9XXXILI9486", ili9XXXSPI),
+    "ILI9488": ili9XXX_ns.class_("ILI9XXXILI9488", ili9XXXSPI),
+    "ST7796": ili9XXX_ns.class_("ILI9XXXST7796", ili9XXXSPI),
+}
+
+COLOR_PALETTE = cv.one_of("NONE", "GRAYSCALE", "IMAGE_ADAPTIVE")
+
+CONF_LED_PIN = "led_pin"
+CONF_COLOR_PALETTE_IMAGES = "color_palette_images"
+
+
+def _validate(config):
+    if config.get(CONF_COLOR_PALETTE) == "IMAGE_ADAPTIVE" and not config.get(
+        CONF_COLOR_PALETTE_IMAGES
+    ):
+        raise cv.Invalid(
+            "Color palette in IMAGE_ADAPTIVE mode requires at least one 'color_palette_images' entry to generate palette"
+        )
+    if (
+        config.get(CONF_COLOR_PALETTE_IMAGES)
+        and config.get(CONF_COLOR_PALETTE) != "IMAGE_ADAPTIVE"
+    ):
+        raise cv.Invalid(
+            "Providing color palette images requires palette mode to be 'IMAGE_ADAPTIVE'"
+        )
+    return config
+
+
+CONFIG_SCHEMA = cv.All(
+    display.FULL_DISPLAY_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(ili9XXXSPI),
+            cv.Required(CONF_MODEL): cv.enum(MODELS, upper=True, space="_"),
+            cv.Optional(CONF_DIMENSIONS): cv.dimensions,
+            cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
+            cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
+            cv.Optional(CONF_LED_PIN): cv.invalid(
+                "This property is removed. To use the backlight use proper light component."
+            ),
+            cv.Optional(CONF_COLOR_PALETTE, default="NONE"): COLOR_PALETTE,
+            cv.GenerateID(CONF_RAW_DATA_ID): cv.declare_id(cg.uint8),
+            cv.Optional(CONF_COLOR_PALETTE_IMAGES, default=[]): cv.ensure_list(
+                cv.file_
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("1s"))
+    .extend(spi.spi_device_schema(False)),
+    cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA),
+    _validate,
+)
+
+
+async def to_code(config):
+    rhs = MODELS[config[CONF_MODEL]].new()
+    var = cg.Pvariable(config[CONF_ID], rhs)
+
+    await cg.register_component(var, config)
+    await display.register_display(var, config)
+    await spi.register_spi_device(var, config)
+    dc = await cg.gpio_pin_expression(config[CONF_DC_PIN])
+    cg.add(var.set_dc_pin(dc))
+
+    if CONF_LAMBDA in config:
+        lambda_ = await cg.process_lambda(
+            config[CONF_LAMBDA], [(display.DisplayBufferRef, "it")], return_type=cg.void
+        )
+        cg.add(var.set_writer(lambda_))
+
+    if CONF_RESET_PIN in config:
+        reset = await cg.gpio_pin_expression(config[CONF_RESET_PIN])
+        cg.add(var.set_reset_pin(reset))
+
+    if CONF_DIMENSIONS in config:
+        cg.add(
+            var.set_dimentions(config[CONF_DIMENSIONS][0], config[CONF_DIMENSIONS][1])
+        )
+
+    rhs = None
+    if config[CONF_COLOR_PALETTE] == "GRAYSCALE":
+        cg.add(var.set_buffer_color_mode(ILI9XXXColorMode.BITS_8_INDEXED))
+        rhs = []
+        for x in range(256):
+            rhs.extend([HexInt(x), HexInt(x), HexInt(x)])
+        prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
+        cg.add(var.set_palette(prog_arr))
+    elif config[CONF_COLOR_PALETTE] == "IMAGE_ADAPTIVE":
+        cg.add(var.set_buffer_color_mode(ILI9XXXColorMode.BITS_8_INDEXED))
+        from PIL import Image
+
+        def load_image(filename):
+            path = CORE.relative_config_path(filename)
+            try:
+                return Image.open(path)
+            except Exception as e:
+                raise core.EsphomeError(f"Could not load image file {path}: {e}")
+
+        # make a wide horizontal combined image.
+        images = [load_image(x) for x in config[CONF_COLOR_PALETTE_IMAGES]]
+        total_width = sum(i.width for i in images)
+        max_height = max(i.height for i in images)
+
+        ref_image = Image.new("RGB", (total_width, max_height))
+        x = 0
+        for i in images:
+            ref_image.paste(i, (x, 0))
+            x = x + i.width
+
+        # reduce the colors on combined image to 256.
+        converted = ref_image.convert("P", palette=Image.ADAPTIVE, colors=256)
+        # if you want to verify how the images look use
+        # ref_image.save("ref_in.png")
+        # converted.save("ref_out.png")
+        palette = converted.getpalette()
+        assert len(palette) == 256 * 3
+        rhs = palette
+    else:
+        cg.add(var.set_buffer_color_mode(ILI9XXXColorMode.BITS_16))
+
+    if rhs is not None:
+        prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
+        cg.add(var.set_palette(prog_arr))
diff --git a/esphome/components/ili9xxx/ili9xxx_defines.h b/esphome/components/ili9xxx/ili9xxx_defines.h
new file mode 100644
index 0000000000..29483ee15e
--- /dev/null
+++ b/esphome/components/ili9xxx/ili9xxx_defines.h
@@ -0,0 +1,96 @@
+#pragma once
+
+namespace esphome {
+namespace ili9xxx {
+
+// Color definitions
+// clang-format off
+static const uint8_t MADCTL_MY    = 0x80;   ///< Bit 7 Bottom to top
+static const uint8_t MADCTL_MX    = 0x40;   ///< Bit 6 Right to left
+static const uint8_t MADCTL_MV    = 0x20;   ///< Bit 5 Reverse Mode
+static const uint8_t MADCTL_ML    = 0x10;   ///< Bit 4 LCD refresh Bottom to top
+static const uint8_t MADCTL_RGB   = 0x00;  ///< Bit 3 Red-Green-Blue pixel order
+static const uint8_t MADCTL_BGR   = 0x08;  ///< Bit 3 Blue-Green-Red pixel order
+static const uint8_t MADCTL_MH    = 0x04;   ///< Bit 2 LCD refresh right to left
+// clang-format on
+
+// All ILI9XXX specific commands some are used by init()
+static const uint8_t ILI9XXX_NOP = 0x00;
+static const uint8_t ILI9XXX_SWRESET = 0x01;
+static const uint8_t ILI9XXX_RDDID = 0x04;
+static const uint8_t ILI9XXX_RDDST = 0x09;
+
+static const uint8_t ILI9XXX_SLPIN = 0x10;
+static const uint8_t ILI9XXX_SLPOUT = 0x11;
+static const uint8_t ILI9XXX_PTLON = 0x12;
+static const uint8_t ILI9XXX_NORON = 0x13;
+
+static const uint8_t ILI9XXX_RDMODE = 0x0A;
+static const uint8_t ILI9XXX_RDMADCTL = 0x0B;
+static const uint8_t ILI9XXX_RDPIXFMT = 0x0C;
+static const uint8_t ILI9XXX_RDIMGFMT = 0x0D;
+static const uint8_t ILI9XXX_RDSELFDIAG = 0x0F;
+
+static const uint8_t ILI9XXX_INVOFF = 0x20;
+static const uint8_t ILI9XXX_INVON = 0x21;
+static const uint8_t ILI9XXX_GAMMASET = 0x26;
+static const uint8_t ILI9XXX_DISPOFF = 0x28;
+static const uint8_t ILI9XXX_DISPON = 0x29;
+
+static const uint8_t ILI9XXX_CASET = 0x2A;
+static const uint8_t ILI9XXX_PASET = 0x2B;
+static const uint8_t ILI9XXX_RAMWR = 0x2C;
+static const uint8_t ILI9XXX_RAMRD = 0x2E;
+
+static const uint8_t ILI9XXX_PTLAR = 0x30;
+static const uint8_t ILI9XXX_VSCRDEF = 0x33;
+static const uint8_t ILI9XXX_MADCTL = 0x36;
+static const uint8_t ILI9XXX_VSCRSADD = 0x37;
+static const uint8_t ILI9XXX_IDMOFF = 0x38;
+static const uint8_t ILI9XXX_IDMON = 0x39;
+static const uint8_t ILI9XXX_PIXFMT = 0x3A;
+static const uint8_t ILI9XXX_COLMOD = 0x3A;
+
+static const uint8_t ILI9XXX_GETSCANLINE = 0x45;
+
+static const uint8_t ILI9XXX_WRDISBV = 0x51;
+static const uint8_t ILI9XXX_RDDISBV = 0x52;
+static const uint8_t ILI9XXX_WRCTRLD = 0x53;
+
+static const uint8_t ILI9XXX_IFMODE = 0xB0;
+static const uint8_t ILI9XXX_FRMCTR1 = 0xB1;
+static const uint8_t ILI9XXX_FRMCTR2 = 0xB2;
+static const uint8_t ILI9XXX_FRMCTR3 = 0xB3;
+static const uint8_t ILI9XXX_INVCTR = 0xB4;
+static const uint8_t ILI9XXX_DFUNCTR = 0xB6;
+static const uint8_t ILI9XXX_ETMOD = 0xB7;
+
+static const uint8_t ILI9XXX_PWCTR1 = 0xC0;
+static const uint8_t ILI9XXX_PWCTR2 = 0xC1;
+static const uint8_t ILI9XXX_PWCTR3 = 0xC2;
+static const uint8_t ILI9XXX_PWCTR4 = 0xC3;
+static const uint8_t ILI9XXX_PWCTR5 = 0xC4;
+static const uint8_t ILI9XXX_VMCTR1 = 0xC5;
+static const uint8_t ILI9XXX_IFCTR = 0xC6;
+static const uint8_t ILI9XXX_VMCTR2 = 0xC7;
+static const uint8_t ILI9XXX_GMCTR = 0xC8;
+static const uint8_t ILI9XXX_SETEXTC = 0xC8;
+
+static const uint8_t ILI9XXX_PWSET = 0xD0;
+static const uint8_t ILI9XXX_VMCTR = 0xD1;
+static const uint8_t ILI9XXX_PWSETN = 0xD2;
+static const uint8_t ILI9XXX_RDID4 = 0xD3;
+static const uint8_t ILI9XXX_RDINDEX = 0xD9;
+static const uint8_t ILI9XXX_RDID1 = 0xDA;
+static const uint8_t ILI9XXX_RDID2 = 0xDB;
+static const uint8_t ILI9XXX_RDID3 = 0xDC;
+static const uint8_t ILI9XXX_RDIDX = 0xDD;  // TBC
+
+static const uint8_t ILI9XXX_GMCTRP1 = 0xE0;
+static const uint8_t ILI9XXX_GMCTRN1 = 0xE1;
+
+static const uint8_t ILI9XXX_CSCON = 0xF0;
+static const uint8_t ILI9XXX_ADJCTL3 = 0xF7;
+
+}  // namespace ili9xxx
+}  // namespace esphome
diff --git a/esphome/components/ili9xxx/ili9xxx_display.cpp b/esphome/components/ili9xxx/ili9xxx_display.cpp
new file mode 100644
index 0000000000..0091a2aabc
--- /dev/null
+++ b/esphome/components/ili9xxx/ili9xxx_display.cpp
@@ -0,0 +1,416 @@
+#include "ili9xxx_display.h"
+#include "esphome/core/log.h"
+#include "esphome/core/application.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/hal.h"
+
+namespace esphome {
+namespace ili9xxx {
+
+static const char *const TAG = "ili9xxx";
+
+void ILI9XXXDisplay::setup() {
+  this->setup_pins_();
+  this->initialize();
+
+  this->x_low_ = this->width_;
+  this->y_low_ = this->height_;
+  this->x_high_ = 0;
+  this->y_high_ = 0;
+  if (this->buffer_color_mode_ == BITS_16) {
+    this->init_internal_(this->get_buffer_length_() * 2);
+    if (this->buffer_ != nullptr) {
+      return;
+    }
+    this->buffer_color_mode_ = BITS_8;
+  }
+  this->init_internal_(this->get_buffer_length_());
+  if (this->buffer_ == nullptr) {
+    this->mark_failed();
+  }
+}
+
+void ILI9XXXDisplay::setup_pins_() {
+  this->dc_pin_->setup();  // OUTPUT
+  this->dc_pin_->digital_write(false);
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->setup();  // OUTPUT
+    this->reset_pin_->digital_write(true);
+  }
+
+  this->spi_setup();
+
+  this->reset_();
+}
+
+void ILI9XXXDisplay::dump_config() {
+  LOG_DISPLAY("", "ili9xxx", this);
+  switch (this->buffer_color_mode_) {
+    case BITS_8_INDEXED:
+      ESP_LOGCONFIG(TAG, "  Color mode: 8bit Indexed");
+      break;
+    case BITS_16:
+      ESP_LOGCONFIG(TAG, "  Color mode: 16bit");
+      break;
+    default:
+      ESP_LOGCONFIG(TAG, "  Color mode: 8bit 332 mode");
+      break;
+  }
+  if (this->is_18bitdisplay_) {
+    ESP_LOGCONFIG(TAG, "  18-Bit Mode: YES");
+  }
+
+  LOG_PIN("  Reset Pin: ", this->reset_pin_);
+  LOG_PIN("  DC Pin: ", this->dc_pin_);
+  LOG_PIN("  Busy Pin: ", this->busy_pin_);
+
+  if (this->is_failed()) {
+    ESP_LOGCONFIG(TAG, "  => Failed to init Memory: YES!");
+  }
+  LOG_UPDATE_INTERVAL(this);
+}
+
+float ILI9XXXDisplay::get_setup_priority() const { return setup_priority::HARDWARE; }
+
+void ILI9XXXDisplay::fill(Color color) {
+  uint16_t new_color = 0;
+  this->x_low_ = 0;
+  this->y_low_ = 0;
+  this->x_high_ = this->get_width_internal() - 1;
+  this->y_high_ = this->get_height_internal() - 1;
+  switch (this->buffer_color_mode_) {
+    case BITS_8_INDEXED:
+      new_color = display::ColorUtil::color_to_index8_palette888(color, this->palette_);
+      break;
+    case BITS_16:
+      new_color = display::ColorUtil::color_to_565(color);
+      for (uint32_t i = 0; i < this->get_buffer_length_() * 2; i = i + 2) {
+        this->buffer_[i] = (uint8_t)(new_color >> 8);
+        this->buffer_[i + 1] = (uint8_t) new_color;
+      }
+      return;
+      break;
+    default:
+      new_color = display::ColorUtil::color_to_332(color, display::ColorOrder::COLOR_ORDER_RGB);
+      break;
+  }
+  memset(this->buffer_, (uint8_t) new_color, this->get_buffer_length_());
+}
+
+void HOT ILI9XXXDisplay::draw_absolute_pixel_internal(int x, int y, Color color) {
+  if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0) {
+    return;
+  }
+  uint32_t pos = (y * width_) + x;
+  uint16_t new_color;
+  bool updated = false;
+  switch (this->buffer_color_mode_) {
+    case BITS_8_INDEXED:
+      new_color = display::ColorUtil::color_to_index8_palette888(color, this->palette_);
+      break;
+    case BITS_16:
+      pos = pos * 2;
+      new_color = display::ColorUtil::color_to_565(color, display::ColorOrder::COLOR_ORDER_RGB);
+      if (this->buffer_[pos] != (uint8_t)(new_color >> 8)) {
+        this->buffer_[pos] = (uint8_t)(new_color >> 8);
+        updated = true;
+      }
+      pos = pos + 1;
+      new_color = new_color & 0xFF;
+      break;
+    default:
+      new_color = display::ColorUtil::color_to_332(color, display::ColorOrder::COLOR_ORDER_RGB);
+      break;
+  }
+
+  if (this->buffer_[pos] != new_color) {
+    this->buffer_[pos] = new_color;
+    updated = true;
+  }
+  if (updated) {
+    // low and high watermark may speed up drawing from buffer
+    this->x_low_ = (x < this->x_low_) ? x : this->x_low_;
+    this->y_low_ = (y < this->y_low_) ? y : this->y_low_;
+    this->x_high_ = (x > this->x_high_) ? x : this->x_high_;
+    this->y_high_ = (y > this->y_high_) ? y : this->y_high_;
+    // ESP_LOGVV(TAG, "=>>> pixel (x:%d, y:%d) (xl:%d, xh:%d, yl:%d, yh:%d", x, y, this->x_low_, this->x_high_,
+    //           this->y_low_, this->y_high_);
+  }
+}
+
+void ILI9XXXDisplay::update() {
+  if (this->prossing_update_) {
+    this->need_update_ = true;
+    return;
+  }
+  do {
+    this->prossing_update_ = true;
+    this->need_update_ = false;
+    if (!this->need_update_) {
+      this->do_update_();
+    }
+  } while (this->need_update_);
+  this->prossing_update_ = false;
+  this->display_();
+}
+
+void ILI9XXXDisplay::display_() {
+  // we will only update the changed window to the display
+  uint16_t w = this->x_high_ - this->x_low_ + 1;  // NOLINT
+  uint16_t h = this->y_high_ - this->y_low_ + 1;  // NOLINT
+  uint32_t start_pos = ((this->y_low_ * this->width_) + x_low_);
+
+  // check if something was displayed
+  if ((this->x_high_ < this->x_low_) || (this->y_high_ < this->y_low_)) {
+    ESP_LOGV(TAG, "Nothing to display");
+    return;
+  }
+
+  set_addr_window_(this->x_low_, this->y_low_, w, h);
+
+  ESP_LOGV(TAG,
+           "Start display(xlow:%d, ylow:%d, xhigh:%d, yhigh:%d, width:%d, "
+           "heigth:%d, start_pos:%d)",
+           this->x_low_, this->y_low_, this->x_high_, this->y_high_, w, h, start_pos);
+
+  this->start_data_();
+  for (uint16_t row = 0; row < h; row++) {
+    uint32_t pos = start_pos + (row * width_);
+    uint32_t rem = w;
+
+    while (rem > 0) {
+      uint32_t sz = std::min(rem, ILI9XXX_TRANSFER_BUFFER_SIZE);
+      // ESP_LOGVV(TAG, "Send to display(pos:%d, rem:%d, zs:%d)", pos, rem, sz);
+      buffer_to_transfer_(pos, sz);
+      if (this->is_18bitdisplay_) {
+        for (uint32_t i = 0; i < sz; ++i) {
+          uint16_t color_val = transfer_buffer_[i];
+
+          uint8_t red = color_val & 0x1F;
+          uint8_t green = (color_val & 0x7E0) >> 5;
+          uint8_t blue = (color_val & 0xF800) >> 11;
+
+          uint8_t pass_buff[3];
+
+          pass_buff[2] = (uint8_t)((red / 32.0) * 64) << 2;
+          pass_buff[1] = (uint8_t) green << 2;
+          pass_buff[0] = (uint8_t)((blue / 32.0) * 64) << 2;
+
+          this->write_array(pass_buff, sizeof(pass_buff));
+        }
+      } else {
+        this->write_array16(transfer_buffer_, sz);
+      }
+      pos += sz;
+      rem -= sz;
+    }
+    App.feed_wdt();
+  }
+  this->end_data_();
+
+  // invalidate watermarks
+  this->x_low_ = this->width_;
+  this->y_low_ = this->height_;
+  this->x_high_ = 0;
+  this->y_high_ = 0;
+}
+
+uint32_t ILI9XXXDisplay::buffer_to_transfer_(uint32_t pos, uint32_t sz) {
+  for (uint32_t i = 0; i < sz; ++i) {
+    switch (this->buffer_color_mode_) {
+      case BITS_8_INDEXED:
+        transfer_buffer_[i] = display::ColorUtil::color_to_565(
+            display::ColorUtil::index8_to_color_palette888(this->buffer_[pos + i], this->palette_));
+        break;
+      case BITS_16:
+        transfer_buffer_[i] = ((uint16_t) this->buffer_[(pos + i) * 2] << 8) | this->buffer_[((pos + i) * 2) + 1];
+        continue;
+        break;
+      default:
+        transfer_buffer_[i] =
+            display::ColorUtil::color_to_565(display::ColorUtil::rgb332_to_color(this->buffer_[pos + i]));
+        break;
+    }
+  }
+  return sz;
+}
+
+// should return the total size: return this->get_width_internal() * this->get_height_internal() * 2 // 16bit color
+// values per bit is huge
+uint32_t ILI9XXXDisplay::get_buffer_length_() { return this->get_width_internal() * this->get_height_internal(); }
+
+void ILI9XXXDisplay::command(uint8_t value) {
+  this->start_command_();
+  this->write_byte(value);
+  this->end_command_();
+}
+
+void ILI9XXXDisplay::data(uint8_t value) {
+  this->start_data_();
+  this->write_byte(value);
+  this->end_data_();
+}
+
+void ILI9XXXDisplay::send_command(uint8_t command_byte, const uint8_t *data_bytes, uint8_t num_data_bytes) {
+  this->command(command_byte);  // Send the command byte
+  this->start_data_();
+  this->write_array(data_bytes, num_data_bytes);
+  this->end_data_();
+}
+
+uint8_t ILI9XXXDisplay::read_command(uint8_t command_byte, uint8_t index) {
+  uint8_t data = 0x10 + index;
+  this->send_command(0xD9, &data, 1);  // Set Index Register
+  uint8_t result;
+  this->start_command_();
+  this->write_byte(command_byte);
+  this->start_data_();
+  do {
+    result = this->read_byte();
+  } while (index--);
+  this->end_data_();
+  return result;
+}
+
+void ILI9XXXDisplay::start_command_() {
+  this->dc_pin_->digital_write(false);
+  this->enable();
+}
+void ILI9XXXDisplay::start_data_() {
+  this->dc_pin_->digital_write(true);
+  this->enable();
+}
+
+void ILI9XXXDisplay::end_command_() { this->disable(); }
+void ILI9XXXDisplay::end_data_() { this->disable(); }
+
+void ILI9XXXDisplay::reset_() {
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->digital_write(false);
+    delay(10);
+    this->reset_pin_->digital_write(true);
+    delay(10);
+  }
+}
+
+void ILI9XXXDisplay::init_lcd_(const uint8_t *init_cmd) {
+  uint8_t cmd, x, num_args;
+  const uint8_t *addr = init_cmd;
+  while ((cmd = progmem_read_byte(addr++)) > 0) {
+    x = progmem_read_byte(addr++);
+    num_args = x & 0x7F;
+    send_command(cmd, addr, num_args);
+    addr += num_args;
+    if (x & 0x80)
+      delay(150);  // NOLINT
+  }
+}
+
+void ILI9XXXDisplay::set_addr_window_(uint16_t x1, uint16_t y1, uint16_t w, uint16_t h) {
+  uint16_t x2 = (x1 + w - 1), y2 = (y1 + h - 1);
+  this->command(ILI9XXX_CASET);  // Column address set
+  this->start_data_();
+  this->write_byte(x1 >> 8);
+  this->write_byte(x1);
+  this->write_byte(x2 >> 8);
+  this->write_byte(x2);
+  this->end_data_();
+  this->command(ILI9XXX_PASET);  // Row address set
+  this->start_data_();
+  this->write_byte(y1 >> 8);
+  this->write_byte(y1);
+  this->write_byte(y2 >> 8);
+  this->write_byte(y2);
+  this->end_data_();
+  this->command(ILI9XXX_RAMWR);  // Write to RAM
+}
+
+void ILI9XXXDisplay::invert_display_(bool invert) { this->command(invert ? ILI9XXX_INVON : ILI9XXX_INVOFF); }
+
+int ILI9XXXDisplay::get_width_internal() { return this->width_; }
+int ILI9XXXDisplay::get_height_internal() { return this->height_; }
+
+//   M5Stack display
+void ILI9XXXM5Stack::initialize() {
+  this->init_lcd_(INITCMD_M5STACK);
+  if (this->width_ == 0)
+    this->width_ = 320;
+  if (this->height_ == 0)
+    this->height_ = 240;
+  this->invert_display_(true);
+}
+
+//   M5CORE display // Based on the configuration settings of M5stact's M5GFX code.
+void ILI9XXXM5CORE::initialize() {
+  this->init_lcd_(INITCMD_M5CORE);
+  if (this->width_ == 0)
+    this->width_ = 320;
+  if (this->height_ == 0)
+    this->height_ = 240;
+  this->invert_display_(true);
+}
+
+//   24_TFT display
+void ILI9XXXILI9341::initialize() {
+  this->init_lcd_(INITCMD_ILI9341);
+  if (this->width_ == 0)
+    this->width_ = 240;
+  if (this->height_ == 0)
+    this->height_ = 320;
+}
+//   24_TFT rotated display
+void ILI9XXXILI9342::initialize() {
+  this->init_lcd_(INITCMD_ILI9341);
+  if (this->width_ == 0) {
+    this->width_ = 320;
+  }
+  if (this->height_ == 0) {
+    this->height_ = 240;
+  }
+}
+
+//   35_TFT display
+void ILI9XXXILI9481::initialize() {
+  this->init_lcd_(INITCMD_ILI9481);
+  if (this->width_ == 0) {
+    this->width_ = 480;
+  }
+  if (this->height_ == 0) {
+    this->height_ = 320;
+  }
+}
+
+//   35_TFT display
+void ILI9XXXILI9486::initialize() {
+  this->init_lcd_(INITCMD_ILI9486);
+  if (this->width_ == 0) {
+    this->width_ = 480;
+  }
+  if (this->height_ == 0) {
+    this->height_ = 320;
+  }
+}
+//    40_TFT display
+void ILI9XXXILI9488::initialize() {
+  this->init_lcd_(INITCMD_ILI9488);
+  if (this->width_ == 0) {
+    this->width_ = 480;
+  }
+  if (this->height_ == 0) {
+    this->height_ = 320;
+  }
+  this->is_18bitdisplay_ = true;
+}
+//    40_TFT display
+void ILI9XXXST7796::initialize() {
+  this->init_lcd_(INITCMD_ST7796);
+  if (this->width_ == 0) {
+    this->width_ = 320;
+  }
+  if (this->height_ == 0) {
+    this->height_ = 480;
+  }
+}
+
+}  // namespace ili9xxx
+}  // namespace esphome
diff --git a/esphome/components/ili9341/ili9341_display.h b/esphome/components/ili9xxx/ili9xxx_display.h
similarity index 51%
rename from esphome/components/ili9341/ili9341_display.h
rename to esphome/components/ili9xxx/ili9xxx_display.h
index 547c608ae8..8a8cd4bb44 100644
--- a/esphome/components/ili9341/ili9341_display.h
+++ b/esphome/components/ili9xxx/ili9xxx_display.h
@@ -1,27 +1,21 @@
 #pragma once
-
-#include "esphome/core/component.h"
 #include "esphome/components/spi/spi.h"
 #include "esphome/components/display/display_buffer.h"
-#include "ili9341_defines.h"
-#include "ili9341_init.h"
-#include "esphome/core/log.h"
+#include "ili9xxx_defines.h"
+#include "ili9xxx_init.h"
 
 namespace esphome {
-namespace ili9341 {
+namespace ili9xxx {
 
-enum ILI9341Model {
-  M5STACK = 0,
-  TFT_24,
-  TFT_24R,
+const uint32_t ILI9XXX_TRANSFER_BUFFER_SIZE = 64;
+
+enum ILI9XXXColorMode {
+  BITS_8 = 0x08,
+  BITS_8_INDEXED = 0x09,
+  BITS_16 = 0x10,
 };
 
-enum ILI9341ColorMode {
-  BITS_8,
-  BITS_8_INDEXED,
-};
-
-class ILI9341Display : public PollingComponent,
+class ILI9XXXDisplay : public PollingComponent,
                        public display::DisplayBuffer,
                        public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
                                              spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_40MHZ> {
@@ -29,59 +23,46 @@ class ILI9341Display : public PollingComponent,
   void set_dc_pin(GPIOPin *dc_pin) { dc_pin_ = dc_pin; }
   float get_setup_priority() const override;
   void set_reset_pin(GPIOPin *reset) { this->reset_pin_ = reset; }
-  void set_led_pin(GPIOPin *led) { this->led_pin_ = led; }
-  void set_model(ILI9341Model model) { this->model_ = model; }
   void set_palette(const uint8_t *palette) { this->palette_ = palette; }
-  void set_buffer_color_mode(ILI9341ColorMode color_mode) { this->buffer_color_mode_ = color_mode; }
-
+  void set_buffer_color_mode(ILI9XXXColorMode color_mode) { this->buffer_color_mode_ = color_mode; }
+  void set_dimentions(int16_t width, int16_t height) {
+    this->height_ = height;
+    this->width_ = width;
+  }
   void command(uint8_t value);
   void data(uint8_t value);
   void send_command(uint8_t command_byte, const uint8_t *data_bytes, uint8_t num_data_bytes);
   uint8_t read_command(uint8_t command_byte, uint8_t index);
-  virtual void initialize() = 0;
 
   void update() override;
 
   void fill(Color color) override;
 
   void dump_config() override;
-  void setup() override {
-    this->setup_pins_();
-    this->initialize();
-
-    this->x_low_ = this->width_;
-    this->y_low_ = this->height_;
-    this->x_high_ = 0;
-    this->y_high_ = 0;
-
-    this->init_internal_(this->get_buffer_length_());
-    this->fill_internal_(0x00);
-  }
+  void setup() override;
 
   display::DisplayType get_display_type() override { return display::DisplayType::DISPLAY_TYPE_COLOR; }
 
  protected:
   void draw_absolute_pixel_internal(int x, int y, Color color) override;
   void setup_pins_();
+  virtual void initialize() = 0;
 
+  void display_();
   void init_lcd_(const uint8_t *init_cmd);
   void set_addr_window_(uint16_t x, uint16_t y, uint16_t w, uint16_t h);
   void invert_display_(bool invert);
   void reset_();
-  void fill_internal_(uint8_t color);
-  void display_();
-  void rotate_my_(uint8_t m);
 
-  ILI9341Model model_;
-  int16_t width_{320};   ///< Display width as modified by current rotation
-  int16_t height_{240};  ///< Display height as modified by current rotation
+  int16_t width_{0};   ///< Display width as modified by current rotation
+  int16_t height_{0};  ///< Display height as modified by current rotation
   uint16_t x_low_{0};
   uint16_t y_low_{0};
   uint16_t x_high_{0};
   uint16_t y_high_{0};
   const uint8_t *palette_;
 
-  ILI9341ColorMode buffer_color_mode_{BITS_8};
+  ILI9XXXColorMode buffer_color_mode_{BITS_16};
 
   uint32_t get_buffer_length_();
   int get_width_internal() override;
@@ -92,33 +73,66 @@ class ILI9341Display : public PollingComponent,
   void start_data_();
   void end_data_();
 
-  uint8_t transfer_buffer_[64];
+  uint16_t transfer_buffer_[ILI9XXX_TRANSFER_BUFFER_SIZE];
 
   uint32_t buffer_to_transfer_(uint32_t pos, uint32_t sz);
 
   GPIOPin *reset_pin_{nullptr};
-  GPIOPin *led_pin_{nullptr};
-  GPIOPin *dc_pin_;
+  GPIOPin *dc_pin_{nullptr};
   GPIOPin *busy_pin_{nullptr};
+
+  bool prossing_update_ = false;
+  bool need_update_ = false;
+  bool is_18bitdisplay_ = false;
 };
 
 //-----------   M5Stack display --------------
-class ILI9341M5Stack : public ILI9341Display {
- public:
+class ILI9XXXM5Stack : public ILI9XXXDisplay {
+ protected:
   void initialize() override;
 };
 
-//-----------   ILI9341_24_TFT display --------------
-class ILI9341TFT24 : public ILI9341Display {
- public:
+//-----------   M5Stack display --------------
+class ILI9XXXM5CORE : public ILI9XXXDisplay {
+ protected:
   void initialize() override;
 };
 
-//-----------   ILI9341_24_TFT rotated display --------------
-class ILI9341TFT24R : public ILI9341Display {
- public:
+//-----------   ILI9XXX_24_TFT display --------------
+class ILI9XXXILI9341 : public ILI9XXXDisplay {
+ protected:
   void initialize() override;
 };
 
-}  // namespace ili9341
+//-----------   ILI9XXX_24_TFT rotated display --------------
+class ILI9XXXILI9342 : public ILI9XXXDisplay {
+ protected:
+  void initialize() override;
+};
+
+//-----------   ILI9XXX_??_TFT rotated display --------------
+class ILI9XXXILI9481 : public ILI9XXXDisplay {
+ protected:
+  void initialize() override;
+};
+
+//-----------   ILI9XXX_35_TFT rotated display --------------
+class ILI9XXXILI9486 : public ILI9XXXDisplay {
+ protected:
+  void initialize() override;
+};
+
+//-----------   ILI9XXX_35_TFT rotated display --------------
+class ILI9XXXILI9488 : public ILI9XXXDisplay {
+ protected:
+  void initialize() override;
+};
+
+//-----------   ILI9XXX_35_TFT rotated display --------------
+class ILI9XXXST7796 : public ILI9XXXDisplay {
+ protected:
+  void initialize() override;
+};
+
+}  // namespace ili9xxx
 }  // namespace esphome
diff --git a/esphome/components/ili9xxx/ili9xxx_init.h b/esphome/components/ili9xxx/ili9xxx_init.h
new file mode 100644
index 0000000000..e8d3614a1d
--- /dev/null
+++ b/esphome/components/ili9xxx/ili9xxx_init.h
@@ -0,0 +1,174 @@
+#pragma once
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace ili9xxx {
+
+// clang-format off
+static const uint8_t PROGMEM INITCMD_M5STACK[] = {
+  0xEF, 3, 0x03, 0x80, 0x02,
+  0xCF, 3, 0x00, 0xC1, 0x30,
+  0xED, 4, 0x64, 0x03, 0x12, 0x81,
+  0xE8, 3, 0x85, 0x00, 0x78,
+  0xCB, 5, 0x39, 0x2C, 0x00, 0x34, 0x02,
+  0xF7, 1, 0x20,
+  0xEA, 2, 0x00, 0x00,
+  ILI9XXX_PWCTR1  , 1, 0x23,             // Power control VRH[5:0]
+  ILI9XXX_PWCTR2  , 1, 0x10,             // Power control SAP[2:0];BT[3:0]
+  ILI9XXX_VMCTR1  , 2, 0x3e, 0x28,       // VCM control
+  ILI9XXX_VMCTR2  , 1, 0x86,             // VCM control2
+  ILI9XXX_MADCTL  , 1, MADCTL_BGR,       // Memory Access Control
+  ILI9XXX_VSCRSADD, 1, 0x00,             // Vertical scroll zero
+  ILI9XXX_PIXFMT  , 1, 0x55,
+  ILI9XXX_FRMCTR1 , 2, 0x00, 0x13,
+  ILI9XXX_DFUNCTR , 3, 0x08, 0x82, 0x27, // Display Function Control
+  0xF2, 1, 0x00,                         // 3Gamma Function Disable
+  ILI9XXX_GAMMASET , 1, 0x01,             // Gamma curve selected
+  ILI9XXX_GMCTRP1 , 15, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, // Set Gamma
+                        0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03,
+                        0x0E, 0x09, 0x00,
+  ILI9XXX_GMCTRN1 , 15, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, // Set Gamma
+                        0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C,
+                        0x31, 0x36, 0x0F,
+  ILI9XXX_SLPOUT  , 0x80,                // Exit Sleep
+  ILI9XXX_DISPON  , 0x80,                // Display on
+  0x00                                   // End of list
+};
+
+static const uint8_t PROGMEM INITCMD_M5CORE[] = {
+  ILI9XXX_SETEXTC, 3, 0xFF,0x93,0x42,   // Turn on the external command
+  ILI9XXX_PWCTR1 , 2, 0x12, 0x12,
+  ILI9XXX_PWCTR2 , 1, 0x03,
+  ILI9XXX_VMCTR1 , 1, 0xF2,
+  ILI9XXX_IFMODE , 1, 0xE0,
+  0xF6           , 3, 0x01, 0x00, 0x00,
+  ILI9XXX_GMCTRP1,15, 0x00,0x0C,0x11,0x04,0x11,0x08,0x37,0x89,0x4C,0x06,0x0C,0x0A,0x2E,0x34,0x0F,
+  ILI9XXX_GMCTRN1,15, 0x00,0x0B,0x11,0x05,0x13,0x09,0x33,0x67,0x48,0x07,0x0E,0x0B,0x2E,0x33,0x0F,
+  ILI9XXX_DFUNCTR, 4, 0x08,0x82,0x1D,0x04,
+  ILI9XXX_IDMOFF , 0,
+  ILI9XXX_DISPON , 0x80,                // Display on
+  ILI9XXX_SLPOUT , 0x80,                // Exit Sleep
+
+  0x00                                   // End of list
+};
+
+
+
+static const uint8_t PROGMEM INITCMD_ILI9341[] = {
+  0xEF, 3, 0x03, 0x80, 0x02,
+  0xCF, 3, 0x00, 0xC1, 0x30,
+  0xED, 4, 0x64, 0x03, 0x12, 0x81,
+  0xE8, 3, 0x85, 0x00, 0x78,
+  0xCB, 5, 0x39, 0x2C, 0x00, 0x34, 0x02,
+  0xF7, 1, 0x20,
+  0xEA, 2, 0x00, 0x00,
+  ILI9XXX_PWCTR1  , 1, 0x23,             // Power control VRH[5:0]
+  ILI9XXX_PWCTR2  , 1, 0x10,             // Power control SAP[2:0];BT[3:0]
+  ILI9XXX_VMCTR1  , 2, 0x3e, 0x28,       // VCM control
+  ILI9XXX_VMCTR2  , 1, 0x86,             // VCM control2
+  ILI9XXX_MADCTL  , 1, 0x48,             // Memory Access Control
+  ILI9XXX_VSCRSADD, 1, 0x00,             // Vertical scroll zero
+  ILI9XXX_PIXFMT  , 1, 0x55,
+  ILI9XXX_FRMCTR1 , 2, 0x00, 0x18,
+  ILI9XXX_DFUNCTR , 3, 0x08, 0x82, 0x27, // Display Function Control
+  0xF2, 1, 0x00,                         // 3Gamma Function Disable
+  ILI9XXX_GAMMASET , 1, 0x01,             // Gamma curve selected
+  ILI9XXX_GMCTRP1 , 15, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, // Set Gamma
+                        0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03,
+                        0x0E, 0x09, 0x00,
+  ILI9XXX_GMCTRN1 , 15, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, // Set Gamma
+                        0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C,
+                        0x31, 0x36, 0x0F,
+  ILI9XXX_SLPOUT  , 0x80,                // Exit Sleep
+  ILI9XXX_DISPON  , 0x80,                // Display on
+  0x00                                   // End of list
+};
+
+static const uint8_t PROGMEM INITCMD_ILI9481[] = {
+  ILI9XXX_SLPOUT ,  0x80,    // Exit sleep mode
+  ILI9XXX_PWSET  , 3, 0x07, 0x41, 0x1D,
+  ILI9XXX_VMCTR  , 3, 0x00, 0x1C, 0x1F,
+  ILI9XXX_PWSETN , 2, 0x01, 0x11,
+  ILI9XXX_PWCTR1 , 5, 0x10, 0x3B, 0x00, 0x02, 0x11,
+  ILI9XXX_VMCTR1 , 1, 0x03,
+  ILI9XXX_IFCTR  , 1, 0x83,
+  ILI9XXX_GMCTR  ,12, 0x00, 0x26, 0x21, 0x00, 0x00, 0x1F, 0x65, 0x23, 0x77, 0x00, 0x0F, 0x00,
+  ILI9XXX_IFMODE , 1, 0x00,  // CommandAccessProtect
+  0xE4        , 1, 0xA0,
+  ILI9XXX_CSCON , 1, 0x01,
+  ILI9XXX_DISPON, 0x80,     // Set display on
+  0x00 // end
+};
+
+static const uint8_t PROGMEM INITCMD_ILI9486[] = {
+  ILI9XXX_SLPOUT, 0x80,
+  ILI9XXX_PIXFMT, 1, 0x55,
+  ILI9XXX_PWCTR3, 1, 0x44,
+  ILI9XXX_VMCTR1, 4, 0x00, 0x00, 0x00, 0x00,
+  ILI9XXX_GMCTRP1, 15, 0x0f,0x1f,0x1c,0x0c,0x0f,0x08,0x48,0x98,0x37,0x0a,0x13,0x04,0x11,0x0d,0x00,
+  ILI9XXX_GMCTRN1, 15, 0x0f,0x32,0x2e,0x0b,0x0d,0x05,0x47,0x75,0x37,0x06,0x10,0x03,0x24,0x20,0x00,
+  ILI9XXX_INVOFF, 0x80,
+  ILI9XXX_MADCTL, 1, 0x48,
+  ILI9XXX_DISPON, 0x80,
+
+  // ILI9XXX_MADCTL, 1, MADCTL_BGR | MADCTL_MV, //hardware rotation
+  0x00                                   // End of list
+};
+
+static const uint8_t PROGMEM INITCMD_ILI9488[] = {
+  ILI9XXX_GMCTRP1,15, 0x00, 0x03, 0x09, 0x08, 0x16, 0x0A, 0x3F, 0x78, 0x4C, 0x09, 0x0A, 0x08, 0x16, 0x1A, 0x0F,
+  ILI9XXX_GMCTRN1,15, 0x00, 0x16, 0x19, 0x03, 0x0F, 0x05, 0x32, 0x45, 0x46, 0x04, 0x0E, 0x0D, 0x35, 0x37, 0x0F,
+
+  ILI9XXX_PWCTR1,  2, 0x17, 0x15,  // VRH1 VRH2
+  ILI9XXX_PWCTR2,  1, 0x41,  // VGH, VGL
+  ILI9XXX_VMCTR1,  3, 0x00, 0x12, 0x80,    // nVM VCM_REG VCM_REG_EN
+
+  ILI9XXX_IFMODE,  1, 0x00,
+  ILI9XXX_FRMCTR1, 1, 0xA0,  // Frame rate = 60Hz
+  ILI9XXX_INVCTR,  1, 0x02,  // Display Inversion Control = 2dot
+
+  ILI9XXX_DFUNCTR, 2, 0x02, 0x02, // Nomal scan
+
+  0xE9, 1, 0x00,   // Set Image Functio. Disable 24 bit data
+
+  ILI9XXX_ADJCTL3, 4, 0xA9, 0x51, 0x2C, 0x82,  // Adjust Control 3
+
+  ILI9XXX_MADCTL,  1, 0x28,
+  //ILI9XXX_PIXFMT,  1, 0x55,  // Interface Pixel Format = 16bit
+  ILI9XXX_PIXFMT, 1, 0x66,   //ILI9488 only supports 18-bit pixel format in 4/3 wire SPI mode
+
+
+
+  // 5 frames
+  //ILI9XXX_ETMOD,   1, 0xC6,  //
+
+
+  ILI9XXX_SLPOUT,  0x80,    // Exit sleep mode
+  //ILI9XXX_INVON  , 0,
+  ILI9XXX_DISPON,  0x80,    // Set display on
+  0x00 // end
+};
+
+static const uint8_t PROGMEM INITCMD_ST7796[] = {
+  // This ST7796S initilization routine was copied from https://github.com/prenticedavid/Adafruit_ST7796S_kbv/blob/master/Adafruit_ST7796S_kbv.cpp
+  ILI9XXX_SWRESET, 0x80,         // Soft reset, then delay 150 ms
+  ILI9XXX_CSCON, 1, 0xC3,              // ?? Unlock Manufacturer
+  ILI9XXX_CSCON, 1, 0x96,
+  ILI9XXX_VMCTR1, 1, 0x1C,              //VCOM  Control 1 [1C]
+  ILI9XXX_MADCTL, 1, 0x48,              //Memory Access [00]
+  ILI9XXX_PIXFMT, 1, 0x55,              //565
+  ILI9XXX_IFMODE, 1, 0x80,              //Interface     [00]
+  ILI9XXX_INVCTR, 1, 0x01,              //Inversion Control [01]
+  ILI9XXX_DFUNCTR, 3, 0x80, 0x02, 0x3B,  // Display Function Control [80 02 3B] .kbv SS=1, NL=480
+  ILI9XXX_ETMOD, 1, 0xC6,              //Entry Mode      [06]
+
+  ILI9XXX_CSCON, 1, 0x69,              //?? lock manufacturer commands
+  ILI9XXX_CSCON, 1, 0x3C,              //
+  ILI9XXX_SLPOUT, 0x80, // Exit Sleep, then delay 150 ms
+  ILI9XXX_DISPON, 0x80, // Main screen turn on, delay 150 ms
+  0x00                                   // End of list
+};
+
+// clang-format on
+}  // namespace ili9xxx
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index b599eb2666..21cdb6bc6f 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -2693,24 +2693,18 @@ display:
     row_start: 0
     lambda: |-
       it.rectangle(0, 0, it.get_width(), it.get_height());
-  - platform: ili9341
+  - platform: ili9xxx
     model: TFT 2.4
     cs_pin: GPIO5
     dc_pin: GPIO4
     reset_pin: GPIO22
-    led_pin:
-      number: GPIO15
-      inverted: true
     lambda: |-
       it.rectangle(0, 0, it.get_width(), it.get_height());
-  - platform: ili9341
+  - platform: ili9xxx
     model: TFT 2.4
     cs_pin: GPIO5
     dc_pin: GPIO4
     reset_pin: GPIO22
-    led_pin:
-      number: GPIO15
-      inverted: true
     auto_clear_enabled: false
     rotation: 90
     lambda: |-

From da056866ff6633b5b3f158008a5f309f847daf87 Mon Sep 17 00:00:00 2001
From: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Date: Thu, 9 Mar 2023 01:03:33 +0100
Subject: [PATCH 659/838] Drop broken logging macros (#4534)

---
 esphome/core/log.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/esphome/core/log.h b/esphome/core/log.h
index b1b1cf9115..bef5e5c633 100644
--- a/esphome/core/log.h
+++ b/esphome/core/log.h
@@ -144,19 +144,12 @@ int esp_idf_log_vprintf_(const char *format, va_list args);  // NOLINT
 #endif
 
 #define ESP_LOGE(tag, ...) esph_log_e(tag, __VA_ARGS__)
-#define LOG_E(tag, ...) ESP_LOGE(tag, __VA__ARGS__)
 #define ESP_LOGW(tag, ...) esph_log_w(tag, __VA_ARGS__)
-#define LOG_W(tag, ...) ESP_LOGW(tag, __VA__ARGS__)
 #define ESP_LOGI(tag, ...) esph_log_i(tag, __VA_ARGS__)
-#define LOG_I(tag, ...) ESP_LOGI(tag, __VA__ARGS__)
 #define ESP_LOGD(tag, ...) esph_log_d(tag, __VA_ARGS__)
-#define LOG_D(tag, ...) ESP_LOGD(tag, __VA__ARGS__)
 #define ESP_LOGCONFIG(tag, ...) esph_log_config(tag, __VA_ARGS__)
-#define LOG_CONFIG(tag, ...) ESP_LOGCONFIG(tag, __VA__ARGS__)
 #define ESP_LOGV(tag, ...) esph_log_v(tag, __VA_ARGS__)
-#define LOG_V(tag, ...) ESP_LOGV(tag, __VA__ARGS__)
 #define ESP_LOGVV(tag, ...) esph_log_vv(tag, __VA_ARGS__)
-#define LOG_VV(tag, ...) ESP_LOGVV(tag, __VA__ARGS__)
 
 #define BYTE_TO_BINARY_PATTERN "%c%c%c%c%c%c%c%c"
 #define BYTE_TO_BINARY(byte) \

From afc1c83af45da1ed2a95c2cd5a2567342b497497 Mon Sep 17 00:00:00 2001
From: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Date: Thu, 9 Mar 2023 01:06:20 +0100
Subject: [PATCH 660/838] Mark unique_id() override as deprecated (#4538)

---
 esphome/components/sensor/sensor.h           | 5 ++---
 esphome/components/text_sensor/text_sensor.h | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/esphome/components/sensor/sensor.h b/esphome/components/sensor/sensor.h
index bba69ed0bb..4a6b1fe3dc 100644
--- a/esphome/components/sensor/sensor.h
+++ b/esphome/components/sensor/sensor.h
@@ -150,10 +150,9 @@ class Sensor : public EntityBase {
   /// Return whether this sensor has gotten a full state (that passed through all filters) yet.
   bool has_state() const;
 
-  /** A unique ID for this sensor, empty for no unique id. See unique ID requirements:
-   * https://developers.home-assistant.io/docs/en/entity_registry_index.html#unique-id-requirements
+  /** Override this method to set the unique ID of this sensor.
    *
-   * @return The unique id as a string.
+   * @deprecated Do not use for new sensors, a suitable unique ID is automatically generated (2023.4).
    */
   virtual std::string unique_id();
 
diff --git a/esphome/components/text_sensor/text_sensor.h b/esphome/components/text_sensor/text_sensor.h
index 60e9e30b6e..cf7b6b86ef 100644
--- a/esphome/components/text_sensor/text_sensor.h
+++ b/esphome/components/text_sensor/text_sensor.h
@@ -61,6 +61,10 @@ class TextSensor : public EntityBase {
 
   // ========== INTERNAL METHODS ==========
   // (In most use cases you won't need these)
+  /** Override this method to set the unique ID of this sensor.
+   *
+   * @deprecated Do not use for new sensors, a suitable unique ID is automatically generated (2023.4).
+   */
   virtual std::string unique_id();
 
   bool has_state();

From ba1416cc0e09e599ebcffcfd27238caf9e998995 Mon Sep 17 00:00:00 2001
From: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Date: Thu, 9 Mar 2023 01:08:45 +0100
Subject: [PATCH 661/838] Drop deprecated entity property base methods (#4539)

---
 .../binary_sensor/binary_sensor.cpp           |  7 ++----
 .../components/binary_sensor/binary_sensor.h  |  8 -------
 esphome/components/cover/cover.cpp            |  6 +----
 esphome/components/cover/cover.h              |  6 -----
 esphome/components/sensor/sensor.cpp          | 24 ++++---------------
 esphome/components/sensor/sensor.h            | 24 -------------------
 6 files changed, 7 insertions(+), 68 deletions(-)

diff --git a/esphome/components/binary_sensor/binary_sensor.cpp b/esphome/components/binary_sensor/binary_sensor.cpp
index 1f837e3ac1..bd33b2af2d 100644
--- a/esphome/components/binary_sensor/binary_sensor.cpp
+++ b/esphome/components/binary_sensor/binary_sensor.cpp
@@ -41,16 +41,13 @@ void BinarySensor::send_state_internal(bool state, bool is_initial) {
     this->state_callback_.call(state);
   }
 }
-std::string BinarySensor::device_class() { return ""; }
+
 BinarySensor::BinarySensor() : state(false) {}
 void BinarySensor::set_device_class(const std::string &device_class) { this->device_class_ = device_class; }
 std::string BinarySensor::get_device_class() {
   if (this->device_class_.has_value())
     return *this->device_class_;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  return this->device_class();
-#pragma GCC diagnostic pop
+  return "";
 }
 void BinarySensor::add_filter(Filter *filter) {
   filter->parent_ = this;
diff --git a/esphome/components/binary_sensor/binary_sensor.h b/esphome/components/binary_sensor/binary_sensor.h
index fbfff63a38..0bf8cf2cdc 100644
--- a/esphome/components/binary_sensor/binary_sensor.h
+++ b/esphome/components/binary_sensor/binary_sensor.h
@@ -80,14 +80,6 @@ class BinarySensor : public EntityBase {
 
   virtual bool is_status_binary_sensor() const;
 
-  // ========== OVERRIDE METHODS ==========
-  // (You'll only need this when creating your own custom binary sensor)
-  /** Override this to set the default device class.
-   *
-   * @deprecated This method is deprecated, set the property during config validation instead. (2022.1)
-   */
-  virtual std::string device_class();
-
  protected:
   CallbackManager<void(bool)> state_callback_{};
   optional<std::string> device_class_{};  ///< Stores the override of the device class
diff --git a/esphome/components/cover/cover.cpp b/esphome/components/cover/cover.cpp
index 3d3abffae2..902e9bca94 100644
--- a/esphome/components/cover/cover.cpp
+++ b/esphome/components/cover/cover.cpp
@@ -208,14 +208,10 @@ Cover::Cover() : Cover("") {}
 std::string Cover::get_device_class() {
   if (this->device_class_override_.has_value())
     return *this->device_class_override_;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  return this->device_class();
-#pragma GCC diagnostic pop
+  return "";
 }
 bool Cover::is_fully_open() const { return this->position == COVER_OPEN; }
 bool Cover::is_fully_closed() const { return this->position == COVER_CLOSED; }
-std::string Cover::device_class() { return ""; }
 
 CoverCall CoverRestoreState::to_call(Cover *cover) {
   auto call = cover->make_call();
diff --git a/esphome/components/cover/cover.h b/esphome/components/cover/cover.h
index 27a821215a..8ae9cfc8dd 100644
--- a/esphome/components/cover/cover.h
+++ b/esphome/components/cover/cover.h
@@ -170,12 +170,6 @@ class Cover : public EntityBase {
 
   virtual void control(const CoverCall &call) = 0;
 
-  /** Override this to set the default device class.
-   *
-   * @deprecated This method is deprecated, set the property during config validation instead. (2022.1)
-   */
-  virtual std::string device_class();
-
   optional<CoverRestoreState> restore_state_();
 
   CallbackManager<void()> state_callback_{};
diff --git a/esphome/components/sensor/sensor.cpp b/esphome/components/sensor/sensor.cpp
index a729791e7e..0de452b784 100644
--- a/esphome/components/sensor/sensor.cpp
+++ b/esphome/components/sensor/sensor.cpp
@@ -26,48 +26,32 @@ Sensor::Sensor() : Sensor("") {}
 std::string Sensor::get_unit_of_measurement() {
   if (this->unit_of_measurement_.has_value())
     return *this->unit_of_measurement_;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  return this->unit_of_measurement();
-#pragma GCC diagnostic pop
+  return "";
 }
 void Sensor::set_unit_of_measurement(const std::string &unit_of_measurement) {
   this->unit_of_measurement_ = unit_of_measurement;
 }
-std::string Sensor::unit_of_measurement() { return ""; }
 
 int8_t Sensor::get_accuracy_decimals() {
   if (this->accuracy_decimals_.has_value())
     return *this->accuracy_decimals_;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  return this->accuracy_decimals();
-#pragma GCC diagnostic pop
+  return 0;
 }
 void Sensor::set_accuracy_decimals(int8_t accuracy_decimals) { this->accuracy_decimals_ = accuracy_decimals; }
-int8_t Sensor::accuracy_decimals() { return 0; }
 
 std::string Sensor::get_device_class() {
   if (this->device_class_.has_value())
     return *this->device_class_;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  return this->device_class();
-#pragma GCC diagnostic pop
+  return "";
 }
 void Sensor::set_device_class(const std::string &device_class) { this->device_class_ = device_class; }
-std::string Sensor::device_class() { return ""; }
 
 void Sensor::set_state_class(StateClass state_class) { this->state_class_ = state_class; }
 StateClass Sensor::get_state_class() {
   if (this->state_class_.has_value())
     return *this->state_class_;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  return this->state_class();
-#pragma GCC diagnostic pop
+  return StateClass::STATE_CLASS_NONE;
 }
-StateClass Sensor::state_class() { return StateClass::STATE_CLASS_NONE; }
 
 void Sensor::publish_state(float state) {
   this->raw_state = state;
diff --git a/esphome/components/sensor/sensor.h b/esphome/components/sensor/sensor.h
index 4a6b1fe3dc..e3651752cf 100644
--- a/esphome/components/sensor/sensor.h
+++ b/esphome/components/sensor/sensor.h
@@ -159,30 +159,6 @@ class Sensor : public EntityBase {
   void internal_send_state_to_frontend(float state);
 
  protected:
-  /** Override this to set the default unit of measurement.
-   *
-   * @deprecated This method is deprecated, set the property during config validation instead. (2022.1)
-   */
-  virtual std::string unit_of_measurement();  // NOLINT
-
-  /** Override this to set the default accuracy in decimals.
-   *
-   * @deprecated This method is deprecated, set the property during config validation instead. (2022.1)
-   */
-  virtual int8_t accuracy_decimals();  // NOLINT
-
-  /** Override this to set the default device class.
-   *
-   * @deprecated This method is deprecated, set the property during config validation instead. (2022.1)
-   */
-  virtual std::string device_class();  // NOLINT
-
-  /** Override this to set the default state class.
-   *
-   * @deprecated This method is deprecated, set the property during config validation instead. (2022.1)
-   */
-  virtual StateClass state_class();  // NOLINT
-
   CallbackManager<void(float)> raw_callback_;  ///< Storage for raw state callbacks.
   CallbackManager<void(float)> callback_;      ///< Storage for filtered state callbacks.
 

From 801fbf44c5e356bcd614b33fa86868ce757d6f95 Mon Sep 17 00:00:00 2001
From: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Date: Thu, 9 Mar 2023 01:14:34 +0100
Subject: [PATCH 662/838] Revert storing Font glyphs in manually-allocated
 memory (#4516)

This partially reverts commit 62459a8ae1d9a2182772d55ddf7d6ad983277f2e.
---
 esphome/components/display/display_buffer.cpp | 19 ++++++-------------
 esphome/components/display/display_buffer.h   |  6 ++----
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/esphome/components/display/display_buffer.cpp b/esphome/components/display/display_buffer.cpp
index 85ebd2567b..420801f863 100644
--- a/esphome/components/display/display_buffer.cpp
+++ b/esphome/components/display/display_buffer.cpp
@@ -256,7 +256,7 @@ void DisplayBuffer::print(int x, int y, Font *font, Color color, TextAlign align
     if (glyph_n < 0) {
       // Unknown char, skip
       ESP_LOGW(TAG, "Encountered character without representation in font: '%c'", text[i]);
-      if (font->get_glyphs_size() > 0) {
+      if (!font->get_glyphs().empty()) {
         uint8_t glyph_width = font->get_glyphs()[0].glyph_data_->width;
         for (int glyph_x = 0; glyph_x < glyph_width; glyph_x++) {
           for (int glyph_y = 0; glyph_y < height; glyph_y++)
@@ -557,7 +557,7 @@ void Glyph::scan_area(int *x1, int *y1, int *width, int *height) const {
 }
 int Font::match_next_glyph(const char *str, int *match_length) {
   int lo = 0;
-  int hi = this->glyphs_size_ - 1;
+  int hi = this->glyphs_.size() - 1;
   while (lo != hi) {
     int mid = (lo + hi + 1) / 2;
     if (this->glyphs_[mid].compare_to(str)) {
@@ -583,7 +583,7 @@ void Font::measure(const char *str, int *width, int *x_offset, int *baseline, in
     int glyph_n = this->match_next_glyph(str + i, &match_length);
     if (glyph_n < 0) {
       // Unknown char, skip
-      if (this->glyphs_size_ > 0)
+      if (!this->get_glyphs().empty())
         x += this->get_glyphs()[0].glyph_data_->width;
       i++;
       continue;
@@ -604,16 +604,9 @@ void Font::measure(const char *str, int *width, int *x_offset, int *baseline, in
   *width = x - min_x;
 }
 Font::Font(const GlyphData *data, int data_nr, int baseline, int height) : baseline_(baseline), height_(height) {
-  ExternalRAMAllocator<Glyph> allocator(ExternalRAMAllocator<Glyph>::ALLOW_FAILURE);
-  this->glyphs_ = allocator.allocate(data_nr);
-  if (this->glyphs_ == nullptr) {
-    ESP_LOGE(TAG, "Could not allocate buffer for Glyphs!");
-    return;
-  }
-  for (int i = 0; i < data_nr; ++i) {
-    this->glyphs_[i] = Glyph(data + i);
-  }
-  this->glyphs_size_ = data_nr;
+  glyphs_.reserve(data_nr);
+  for (int i = 0; i < data_nr; ++i)
+    glyphs_.emplace_back(&data[i]);
 }
 
 bool Image::get_pixel(int x, int y) const {
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index 815ba8d2e1..0402826594 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -526,12 +526,10 @@ class Font {
   inline int get_baseline() { return this->baseline_; }
   inline int get_height() { return this->height_; }
 
-  Glyph *&get_glyphs() { return this->glyphs_; }
-  const u_int16_t &get_glyphs_size() const { return this->glyphs_size_; }
+  const std::vector<Glyph, ExternalRAMAllocator<Glyph>> &get_glyphs() const { return glyphs_; }
 
  protected:
-  Glyph *glyphs_{nullptr};
-  u_int16_t glyphs_size_;
+  std::vector<Glyph, ExternalRAMAllocator<Glyph>> glyphs_;
   int baseline_;
   int height_;
 };

From 01687a9d57fa6b36c10e4905383abe77a1641149 Mon Sep 17 00:00:00 2001
From: Carlos Garcia Saura <CarlosGS@users.noreply.github.com>
Date: Thu, 9 Mar 2023 01:34:06 +0100
Subject: [PATCH 663/838] Correct BME680 gas calculation and heater_off (#4498)

* Fix missing data array

* Fix incorrect bit offset

* Correct variable types

* Do same conversions as in original library

* Correct clang-format

* Move out float conversion for clarity

* Added check for heater stability

* Correct clang format

* Allow reporting gas resistance when heater is disabled

* Correct clang format

* Better error reporting by @DAVe3283

* Correct signed operation, range switching error was positive all the time
---
 esphome/components/bme680/bme680.cpp | 64 ++++++++++++++++++++--------
 esphome/components/bme680/bme680.h   |  8 ++--
 2 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/esphome/components/bme680/bme680.cpp b/esphome/components/bme680/bme680.cpp
index 64770ac0d5..e5704a8f9f 100644
--- a/esphome/components/bme680/bme680.cpp
+++ b/esphome/components/bme680/bme680.cpp
@@ -117,18 +117,24 @@ void BME680Component::setup() {
   this->calibration_.gh2 = cal2[12] << 8 | cal2[13];
   this->calibration_.gh3 = cal2[15];
 
-  if (!this->read_byte(0x02, &this->calibration_.res_heat_range)) {
+  uint8_t temp_var = 0;
+  if (!this->read_byte(0x02, &temp_var)) {
     this->mark_failed();
     return;
   }
-  if (!this->read_byte(0x00, &this->calibration_.res_heat_val)) {
+  this->calibration_.res_heat_range = ((temp_var & 0x30) / 16);
+
+  if (!this->read_byte(0x00, &temp_var)) {
     this->mark_failed();
     return;
   }
-  if (!this->read_byte(0x04, &this->calibration_.range_sw_err)) {
+  this->calibration_.res_heat_val = (int8_t) temp_var;
+
+  if (!this->read_byte(0x04, &temp_var)) {
     this->mark_failed();
     return;
   }
+  this->calibration_.range_sw_err = ((int8_t) temp_var & (int8_t) 0xf0) / 16;
 
   this->calibration_.ambient_temperature = 25;  // prime ambient temperature
 
@@ -181,7 +187,7 @@ void BME680Component::setup() {
     return;
   }
   gas0_control &= ~0b00001000;
-  gas0_control |= heat_off ? 0b100 : 0b000;
+  gas0_control |= heat_off << 3;
   if (!this->write_byte(BME680_REGISTER_CONTROL_GAS0, gas0_control)) {
     this->mark_failed();
     return;
@@ -249,12 +255,12 @@ uint8_t BME680Component::calc_heater_resistance_(uint16_t temperature) {
   if (temperature > 400)
     temperature = 400;
 
-  const uint8_t ambient_temperature = this->calibration_.ambient_temperature;
+  const int8_t ambient_temperature = this->calibration_.ambient_temperature;
   const int8_t gh1 = this->calibration_.gh1;
   const int16_t gh2 = this->calibration_.gh2;
   const int8_t gh3 = this->calibration_.gh3;
   const uint8_t res_heat_range = this->calibration_.res_heat_range;
-  const uint8_t res_heat_val = this->calibration_.res_heat_val;
+  const int8_t res_heat_val = this->calibration_.res_heat_val;
 
   uint8_t heatr_res;
   int32_t var1;
@@ -293,35 +299,57 @@ uint8_t BME680Component::calc_heater_duration_(uint16_t duration) {
 void BME680Component::read_data_() {
   uint8_t data[15];
   if (!this->read_bytes(BME680_REGISTER_FIELD0, data, 15)) {
+    if (this->temperature_sensor_ != nullptr)
+      this->temperature_sensor_->publish_state(NAN);
+    if (this->pressure_sensor_ != nullptr)
+      this->pressure_sensor_->publish_state(NAN);
+    if (this->humidity_sensor_ != nullptr)
+      this->humidity_sensor_->publish_state(NAN);
+    if (this->gas_resistance_sensor_ != nullptr)
+      this->gas_resistance_sensor_->publish_state(NAN);
+    ESP_LOGW(TAG, "Communication with BME680 failed!");
     this->status_set_warning();
     return;
   }
+  this->status_clear_warning();
 
   uint32_t raw_temperature = (uint32_t(data[5]) << 12) | (uint32_t(data[6]) << 4) | (uint32_t(data[7]) >> 4);
   uint32_t raw_pressure = (uint32_t(data[2]) << 12) | (uint32_t(data[3]) << 4) | (uint32_t(data[4]) >> 4);
   uint32_t raw_humidity = (uint32_t(data[8]) << 8) | uint32_t(data[9]);
-  uint16_t raw_gas = (uint16_t(data[13]) << 2) | (uint16_t(14) >> 6);
+  uint16_t raw_gas = (uint16_t)((uint32_t) data[13] * 4 | (((uint32_t) data[14]) / 64));
   uint8_t gas_range = data[14] & 0x0F;
 
   float temperature = this->calc_temperature_(raw_temperature);
   float pressure = this->calc_pressure_(raw_pressure);
   float humidity = this->calc_humidity_(raw_humidity);
-  float gas_resistance = NAN;
-  if (data[14] & 0x20) {
-    gas_resistance = this->calc_gas_resistance_(raw_gas, gas_range);
-  }
+  float gas_resistance = this->calc_gas_resistance_(raw_gas, gas_range);
+
+  bool gas_valid = (data[14] >> 5) & 1;
+  bool heat_stable = (data[14] >> 4) & 1;
+  if (this->heater_temperature_ == 0 || this->heater_duration_ == 0)
+    heat_stable = true;  // Allow reporting gas resistance when heater is disabled
 
   ESP_LOGD(TAG, "Got temperature=%.1f°C pressure=%.1fhPa humidity=%.1f%% gas_resistance=%.1fΩ", temperature, pressure,
            humidity, gas_resistance);
+  if (!gas_valid)
+    ESP_LOGW(TAG, "Gas measurement unsuccessful, reading invalid!");
+  if (!heat_stable)
+    ESP_LOGW(TAG, "Heater unstable, reading invalid! (Normal for a few readings after a power cycle)");
+
   if (this->temperature_sensor_ != nullptr)
     this->temperature_sensor_->publish_state(temperature);
   if (this->pressure_sensor_ != nullptr)
     this->pressure_sensor_->publish_state(pressure);
   if (this->humidity_sensor_ != nullptr)
     this->humidity_sensor_->publish_state(humidity);
-  if (this->gas_resistance_sensor_ != nullptr)
-    this->gas_resistance_sensor_->publish_state(gas_resistance);
-  this->status_clear_warning();
+  if (this->gas_resistance_sensor_ != nullptr) {
+    if (gas_valid && heat_stable) {
+      this->gas_resistance_sensor_->publish_state(gas_resistance);
+    } else {
+      this->status_set_warning();
+      this->gas_resistance_sensor_->publish_state(NAN);
+    }
+  }
 }
 
 float BME680Component::calc_temperature_(uint32_t raw_temperature) {
@@ -428,20 +456,22 @@ float BME680Component::calc_humidity_(uint16_t raw_humidity) {
 
   return calc_hum;
 }
-uint32_t BME680Component::calc_gas_resistance_(uint16_t raw_gas, uint8_t range) {
+float BME680Component::calc_gas_resistance_(uint16_t raw_gas, uint8_t range) {
   float calc_gas_res;
   float var1 = 0;
   float var2 = 0;
   float var3 = 0;
+  float raw_gas_f = raw_gas;
+  float range_f = 1U << range;
   const float range_sw_err = this->calibration_.range_sw_err;
 
   var1 = 1340.0f + (5.0f * range_sw_err);
   var2 = var1 * (1.0f + BME680_GAS_LOOKUP_TABLE_1[range] / 100.0f);
   var3 = 1.0f + (BME680_GAS_LOOKUP_TABLE_2[range] / 100.0f);
 
-  calc_gas_res = 1.0f / (var3 * 0.000000125f * float(1 << range) * (((float(raw_gas) - 512.0f) / var2) + 1.0f));
+  calc_gas_res = 1.0f / (var3 * 0.000000125f * range_f * (((raw_gas_f - 512.0f) / var2) + 1.0f));
 
-  return static_cast<uint32_t>(calc_gas_res);
+  return calc_gas_res;
 }
 uint32_t BME680Component::calc_meas_duration_() {
   uint32_t tph_dur;  // Calculate in us
diff --git a/esphome/components/bme680/bme680.h b/esphome/components/bme680/bme680.h
index 6446449742..cfa7aaca20 100644
--- a/esphome/components/bme680/bme680.h
+++ b/esphome/components/bme680/bme680.h
@@ -59,11 +59,11 @@ struct BME680CalibrationData {
   int8_t gh3;
 
   uint8_t res_heat_range;
-  uint8_t res_heat_val;
-  uint8_t range_sw_err;
+  int8_t res_heat_val;
+  int8_t range_sw_err;
 
   float tfine;
-  uint8_t ambient_temperature;
+  int8_t ambient_temperature;
 };
 
 class BME680Component : public PollingComponent, public i2c::I2CDevice {
@@ -117,7 +117,7 @@ class BME680Component : public PollingComponent, public i2c::I2CDevice {
   /// Calculate the relative humidity in % using the provided raw ADC value.
   float calc_humidity_(uint16_t raw_humidity);
   /// Calculate the gas resistance in Ω using the provided raw ADC value.
-  uint32_t calc_gas_resistance_(uint16_t raw_gas, uint8_t range);
+  float calc_gas_resistance_(uint16_t raw_gas, uint8_t range);
   /// Calculate how long the sensor will take until we can retrieve data.
   uint32_t calc_meas_duration_();
 

From 647136171512436e9726d15303b6f9aa37a2b3f5 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Mar 2023 14:54:51 +1300
Subject: [PATCH 664/838] Format test files (#4541)

---
 tests/test1.yaml |  26 ++++++------
 tests/test2.yaml |   5 +--
 tests/test3.yaml | 102 +++++++++++++++++++++++------------------------
 tests/test4.yaml |   1 -
 tests/test5.yaml |   6 +--
 tests/test6.yaml |   3 +-
 tests/test8.yaml |   4 +-
 7 files changed, 69 insertions(+), 78 deletions(-)

diff --git a/tests/test1.yaml b/tests/test1.yaml
index 21cdb6bc6f..2af71ea745 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -325,7 +325,7 @@ mcp23s17:
 
 sensor:
   - platform: internal_temperature
-    name: "Internal Temperature"
+    name: Internal Temperature
   - platform: ble_client
     type: characteristic
     ble_client_id: ble_foo
@@ -3239,25 +3239,25 @@ lcd_menu:
       lambda: 'ESP_LOGI("lcd_menu", "root leave");'
   items:
     - type: back
-      text: 'Back'
+      text: Back
     - type: label
     - type: menu
-      text: 'Submenu 1'
+      text: Submenu 1
       items:
         - type: back
-          text: 'Back'
+          text: Back
         - type: menu
-          text: 'Submenu 21'
+          text: Submenu 21
           items:
             - type: back
-              text: 'Back'
+              text: Back
             - type: command
-              text: 'Show Main'
+              text: Show Main
               on_value:
                 then:
                   - display_menu.show_main:
     - type: select
-      text: 'Enum Item'
+      text: Enum Item
       immediate_edit: true
       select: test_select
       on_enter:
@@ -3270,7 +3270,7 @@ lcd_menu:
         then:
           lambda: 'ESP_LOGI("lcd_menu", "select value: %s, %s", it->get_text().c_str(), it->get_value_text().c_str());'
     - type: number
-      text: 'Number'
+      text: Number
       number: test_number
       on_enter:
         then:
@@ -3282,15 +3282,15 @@ lcd_menu:
         then:
           lambda: 'ESP_LOGI("lcd_menu", "number value: %s, %s", it->get_text().c_str(), it->get_value_text().c_str());'
     - type: command
-      text: 'Hide'
+      text: Hide
       on_value:
         then:
           - display_menu.hide:
     - type: switch
-      text: 'Switch'
+      text: Switch
       switch: my_switch
-      on_text: 'Bright'
-      off_text: 'Dark'
+      on_text: Bright
+      off_text: Dark
       immediate_edit: false
       on_value:
         then:
diff --git a/tests/test2.yaml b/tests/test2.yaml
index 3e6a186320..51ec69ef34 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -399,7 +399,7 @@ sensor:
 time:
   - platform: homeassistant
     on_time:
-      - at: '16:00:00'
+      - at: "16:00:00"
         then:
           - logger.log: It's 16:00
 
@@ -518,7 +518,6 @@ ble_client:
   - mac_address: 01:02:03:04:05:06
     id: radon_eye_ble_id
 
-
 airthings_ble:
 
 radon_eye_ble:
@@ -535,7 +534,7 @@ bluetooth_proxy:
 xiaomi_rtcgq02lm:
   - id: motion_rtcgq02lm
     mac_address: 01:02:03:04:05:06
-    bindkey: '48403ebe2d385db8d0c187f81e62cb64'
+    bindkey: "48403ebe2d385db8d0c187f81e62cb64"
 
 status_led:
   pin: GPIO2
diff --git a/tests/test3.yaml b/tests/test3.yaml
index f1b64b3389..85c0fccc0b 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -54,7 +54,7 @@ api:
         - logger.log: Something happened
         - stepper.set_target:
             id: my_stepper2
-            target: !lambda 'return int_;'
+            target: !lambda "return int_;"
     - service: array_types
       variables:
         bool_arr: bool[]
@@ -64,7 +64,7 @@ api:
       then:
         - logger.log:
             # yamllint disable rule:line-length
-            format: 'Bool: %s (%u), Int: %d (%u), Float: %f (%u), String: %s (%u)'
+            format: "Bool: %s (%u), Int: %d (%u), Float: %f (%u), String: %s (%u)"
             # yamllint enable rule:line-length
             args:
               - YESNO(bool_arr[0])
@@ -85,30 +85,30 @@ api:
       variables:
         file: int
       then:
-        - dfplayer.play: !lambda 'return file;'
+        - dfplayer.play: !lambda "return file;"
     - service: dfplayer_play_loop
       variables:
         file: int
         loop_: bool
       then:
         - dfplayer.play:
-            file: !lambda 'return file;'
-            loop: !lambda 'return loop_;'
+            file: !lambda "return file;"
+            loop: !lambda "return loop_;"
     - service: dfplayer_play_folder
       variables:
         folder: int
         file: int
       then:
         - dfplayer.play_folder:
-            folder: !lambda 'return folder;'
-            file: !lambda 'return file;'
+            folder: !lambda "return folder;"
+            file: !lambda "return file;"
 
     - service: dfplayer_play_loo_folder
       variables:
         folder: int
       then:
         - dfplayer.play_folder:
-            folder: !lambda 'return folder;'
+            folder: !lambda "return folder;"
             loop: true
 
     - service: dfplayer_set_device
@@ -122,13 +122,13 @@ api:
       variables:
         volume: int
       then:
-        - dfplayer.set_volume: !lambda 'return volume;'
+        - dfplayer.set_volume: !lambda "return volume;"
     - service: dfplayer_set_eq
       variables:
         preset: int
       then:
         # yamllint disable rule:line-length
-        - dfplayer.set_eq: !lambda 'return static_cast<dfplayer::EqPreset>(preset);'
+        - dfplayer.set_eq: !lambda "return static_cast<dfplayer::EqPreset>(preset);"
         # yamllint enable rule:line-length
 
     - service: dfplayer_sleep
@@ -169,21 +169,21 @@ api:
       then:
         - tm1651.set_level_percent:
             id: tm1651_battery
-            level_percent: !lambda 'return level_percent;'
+            level_percent: !lambda "return level_percent;"
     - service: battery_level
       variables:
         level: int
       then:
         - tm1651.set_level:
             id: tm1651_battery
-            level: !lambda 'return level;'
+            level: !lambda "return level;"
     - service: battery_brightness
       variables:
         brightness: int
       then:
         - tm1651.set_brightness:
             id: tm1651_battery
-            brightness: !lambda 'return brightness;'
+            brightness: !lambda "return brightness;"
     - service: battery_turn_on
       then:
         - tm1651.turn_on:
@@ -205,8 +205,8 @@ api:
         num_scans: int
       then:
         - fingerprint_grow.enroll:
-            finger_id: !lambda 'return finger_id;'
-            num_scans: !lambda 'return num_scans;'
+            finger_id: !lambda "return finger_id;"
+            num_scans: !lambda "return num_scans;"
     - service: fingerprint_grow_cancel_enroll
       then:
         - fingerprint_grow.cancel_enroll:
@@ -215,14 +215,14 @@ api:
         finger_id: int
       then:
         - fingerprint_grow.delete:
-            finger_id: !lambda 'return finger_id;'
+            finger_id: !lambda "return finger_id;"
     - service: fingerprint_grow_delete_all
       then:
         - fingerprint_grow.delete_all:
 
 wifi:
-  ssid: 'MySSID'
-  password: 'password1'
+  ssid: "MySSID"
+  password: "password1"
 
 i2c:
   sda: 4
@@ -317,7 +317,6 @@ wled:
 
 adalight:
 
-
 sensor:
   - platform: daly_bms
     voltage:
@@ -416,7 +415,7 @@ sensor:
           send_every: 5
           send_first_at: 3
           quantile: .8
-      - lambda: 'return 0;'
+      - lambda: "return 0;"
       - delta: 100
       - throttle: 100ms
       - debounce: 500s
@@ -547,15 +546,15 @@ sensor:
   - platform: bl0942
     uart_id: uart3
     voltage:
-      name: 'BL0942 Voltage'
+      name: BL0942 Voltage
     current:
-      name: 'BL0942 Current'
+      name: BL0942 Current
     power:
-      name: 'BL0942 Power'
+      name: BL0942 Power
     energy:
-      name: 'BL0942 Energy'
+      name: BL0942 Energy
     frequency:
-      name: "BL0942 Frequency"
+      name: BL0942 Frequency
   - platform: pzem004t
     uart_id: uart3
     voltage:
@@ -847,7 +846,7 @@ binary_sensor:
       - invert
       - delayed_on: 20ms
       - delayed_off: 20ms
-      - lambda: 'return false;'
+      - lambda: "return false;"
     on_state:
       - logger.log: New state
     id: my_binary_sensor
@@ -1079,13 +1078,13 @@ interval:
         target: 500
     - stepper.set_target:
         id: my_stepper
-        target: !lambda 'return 0;'
+        target: !lambda "return 0;"
     - stepper.report_position:
         id: my_stepper2
         position: 0
     - stepper.report_position:
         id: my_stepper
-        position: !lambda 'return 50/100.0;'
+        position: !lambda "return 50/100.0;"
 
 climate:
   - platform: bang_bang
@@ -1106,12 +1105,12 @@ climate:
     name: Thermostat Climate
     sensor: ha_hello_world
     preset:
-    - name: Default Preset
-      default_target_temperature_low: 18°C
-      default_target_temperature_high: 24°C
-    - name: Away
-      default_target_temperature_low: 16°C
-      default_target_temperature_high: 20°C
+      - name: Default Preset
+        default_target_temperature_low: 18°C
+        default_target_temperature_high: 24°C
+      - name: Away
+        default_target_temperature_low: 16°C
+        default_target_temperature_high: 20°C
     idle_action:
       - switch.turn_on: gpio_switch1
     cool_action:
@@ -1259,7 +1258,6 @@ sprinkler:
         run_duration: 10s
         valve_switch_id: gpio_switch2
 
-
 cover:
   - platform: endstop
     name: Endstop Cover
@@ -1281,13 +1279,13 @@ cover:
           frequency: 500.0Hz
       - output.esp8266_pwm.set_frequency:
           id: out
-          frequency: !lambda 'return 500.0;'
+          frequency: !lambda "return 500.0;"
       - servo.write:
           id: my_servo
           level: -100%
       - servo.write:
           id: my_servo
-          level: !lambda 'return -1.0;'
+          level: !lambda "return -1.0;"
       - delay: 2s
       - servo.detach: my_servo
     close_duration: 4.5min
@@ -1329,15 +1327,15 @@ cover:
         - logger.log: Malfunction Detected
   - platform: template
     name: Template Cover with Tilt
-    tilt_lambda: 'return 0.5;'
+    tilt_lambda: "return 0.5;"
     tilt_action:
       - output.set_level:
           id: out
-          level: !lambda 'return tilt;'
+          level: !lambda "return tilt;"
     position_action:
       - output.set_level:
           id: out
-          level: !lambda 'return pos;'
+          level: !lambda "return pos;"
 
 output:
   - platform: esp8266_pwm
@@ -1369,7 +1367,7 @@ output:
       then:
         - logger.log:
             format: "Changed state: %d"
-            args: [ 'state' ]
+            args: ["state"]
   - platform: custom
     type: float
     lambda: |-
@@ -1465,9 +1463,9 @@ sim800l:
         str = message;
     - sim800l.send_sms:
         message: hello you
-        recipient: '+1234'
+        recipient: "+1234"
     - sim800l.dial:
-        recipient: '+1234'
+        recipient: "+1234"
 
 dfplayer:
   uart_id: uart5
@@ -1511,9 +1509,9 @@ rf_bridge:
     - rf_bridge.send_advanced_code:
         length: 0x04
         protocol: 0x01
-        code: 'ABC123'
+        code: "ABC123"
     - rf_bridge.send_raw:
-        raw: 'AAA5070008001000ABC12355'
+        raw: "AAA5070008001000ABC12355"
     - http_request.get:
         url: https://esphome.io
         headers:
@@ -1561,7 +1559,6 @@ display:
       then:
         lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
 
-
 http_request:
   useragent: esphome/device
   timeout: 10s
@@ -1574,8 +1571,8 @@ fingerprint_grow:
     - homeassistant.event:
         event: esphome.${device_name}_fingerprint_grow_finger_scan_matched
         data:
-          finger_id: !lambda 'return finger_id;'
-          confidence: !lambda 'return confidence;'
+          finger_id: !lambda "return finger_id;"
+          confidence: !lambda "return confidence;"
   on_finger_scan_unmatched:
     - homeassistant.event:
         event: esphome.${device_name}_fingerprint_grow_finger_scan_unmatched
@@ -1583,18 +1580,18 @@ fingerprint_grow:
     - homeassistant.event:
         event: esphome.${device_name}_fingerprint_grow_enrollment_scan
         data:
-          finger_id: !lambda 'return finger_id;'
-          scan_num: !lambda 'return scan_num;'
+          finger_id: !lambda "return finger_id;"
+          scan_num: !lambda "return scan_num;"
   on_enrollment_done:
     - homeassistant.event:
         event: esphome.${device_name}_fingerprint_grow_node_enrollment_done
         data:
-          finger_id: !lambda 'return finger_id;'
+          finger_id: !lambda "return finger_id;"
   on_enrollment_failed:
     - homeassistant.event:
         event: esphome.${device_name}_fingerprint_grow_enrollment_failed
         data:
-          finger_id: !lambda 'return finger_id;'
+          finger_id: !lambda "return finger_id;"
   uart_id: uart6
 
 dsmr:
@@ -1625,7 +1622,6 @@ button:
   - platform: factory_reset
     name: Restart Button (Factory Default Settings)
 
-
 cd74hc4067:
   pin_s0: GPIO12
   pin_s1: GPIO13
diff --git a/tests/test4.yaml b/tests/test4.yaml
index db7a123dbc..54bb6f40a6 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -644,7 +644,6 @@ touchscreen:
           format: Touch at (%d, %d)
           args: [touch.x, touch.y]
 
-
   - platform: lilygo_t5_47
     id: lilygo_touchscreen
     interrupt_pin: GPIO36
diff --git a/tests/test5.yaml b/tests/test5.yaml
index ec3fef5e19..bb55887d75 100644
--- a/tests/test5.yaml
+++ b/tests/test5.yaml
@@ -80,7 +80,7 @@ binary_sensor:
     id: modbus_binsensortest
     register_type: read
     address: 0x3200
-    bitmask: 0x80  # (bit 8)
+    bitmask: 0x80 # (bit 8)
     lambda: "return x;"
 
   - platform: tm1638
@@ -374,7 +374,7 @@ select:
 
 sensor:
   - platform: internal_temperature
-    name: "Internal Temperature"
+    name: Internal Temperature
   - platform: selec_meter
     total_active_energy:
       name: SelecEM2M Total Active Energy
@@ -614,7 +614,6 @@ sn74hc165:
   clock_inhibit_pin: GPIO26
   sr_count: 4
 
-
 matrix_keypad:
   id: keypad
   rows:
@@ -630,4 +629,3 @@ key_collector:
     source_id: keypad
     min_length: 4
     max_length: 4
-
diff --git a/tests/test6.yaml b/tests/test6.yaml
index 2930400e34..7d4bd7bb19 100644
--- a/tests/test6.yaml
+++ b/tests/test6.yaml
@@ -11,7 +11,6 @@ rp2040:
     # Waiting for https://github.com/platformio/platform-raspberrypi/pull/36
     platform_version: https://github.com/maxgerhardt/platform-raspberrypi.git
 
-
 wifi:
   networks:
     - ssid: "MySSID"
@@ -40,4 +39,4 @@ switch:
 
 sensor:
   - platform: internal_temperature
-    name: "Internal Temperature"
+    name: Internal Temperature
diff --git a/tests/test8.yaml b/tests/test8.yaml
index c423ecbce6..1d3c8a31f4 100644
--- a/tests/test8.yaml
+++ b/tests/test8.yaml
@@ -10,7 +10,7 @@ esp32:
     type: arduino
 
 esphome:
-  name: "esp32-s3-test"
+  name: esp32-s3-test
 
 logger:
 
@@ -22,6 +22,6 @@ light:
     num_leds: 1
     id: neopixel
     method: esp32_rmt
-    name: "neopixel-enable"
+    name: neopixel-enable
     internal: false
     restore_mode: ALWAYS_OFF

From fb5eb57345ab0f9c84a9acf276987d2fff12f7bc Mon Sep 17 00:00:00 2001
From: Jared Sanson <jared@jared.geek.nz>
Date: Thu, 9 Mar 2023 10:03:11 +1300
Subject: [PATCH 665/838] Fix ethernet clk_mode for GPIO0_OUT (#4307)

* Fix GPIO0_OUT definition for ethernet component

* Formatting

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/ethernet/__init__.py       | 23 +++++++++++++++----
 .../ethernet/ethernet_component.cpp           |  9 +++++---
 .../components/ethernet/ethernet_component.h  |  5 ++--
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/esphome/components/ethernet/__init__.py b/esphome/components/ethernet/__init__.py
index a0f8b557b0..f6ca376681 100644
--- a/esphome/components/ethernet/__init__.py
+++ b/esphome/components/ethernet/__init__.py
@@ -36,12 +36,25 @@ ETHERNET_TYPES = {
     "JL1101": EthernetType.ETHERNET_TYPE_JL1101,
 }
 
+emac_rmii_clock_mode_t = cg.global_ns.enum("emac_rmii_clock_mode_t")
 emac_rmii_clock_gpio_t = cg.global_ns.enum("emac_rmii_clock_gpio_t")
 CLK_MODES = {
-    "GPIO0_IN": emac_rmii_clock_gpio_t.EMAC_CLK_IN_GPIO,
-    "GPIO0_OUT": emac_rmii_clock_gpio_t.EMAC_APPL_CLK_OUT_GPIO,
-    "GPIO16_OUT": emac_rmii_clock_gpio_t.EMAC_CLK_OUT_GPIO,
-    "GPIO17_OUT": emac_rmii_clock_gpio_t.EMAC_CLK_OUT_180_GPIO,
+    "GPIO0_IN": (
+        emac_rmii_clock_mode_t.EMAC_CLK_EXT_IN,
+        emac_rmii_clock_gpio_t.EMAC_CLK_IN_GPIO,
+    ),
+    "GPIO0_OUT": (
+        emac_rmii_clock_mode_t.EMAC_CLK_OUT,
+        emac_rmii_clock_gpio_t.EMAC_APPL_CLK_OUT_GPIO,
+    ),
+    "GPIO16_OUT": (
+        emac_rmii_clock_mode_t.EMAC_CLK_OUT,
+        emac_rmii_clock_gpio_t.EMAC_CLK_OUT_GPIO,
+    ),
+    "GPIO17_OUT": (
+        emac_rmii_clock_mode_t.EMAC_CLK_OUT,
+        emac_rmii_clock_gpio_t.EMAC_CLK_OUT_180_GPIO,
+    ),
 }
 
 
@@ -114,7 +127,7 @@ async def to_code(config):
     cg.add(var.set_mdc_pin(config[CONF_MDC_PIN]))
     cg.add(var.set_mdio_pin(config[CONF_MDIO_PIN]))
     cg.add(var.set_type(config[CONF_TYPE]))
-    cg.add(var.set_clk_mode(CLK_MODES[config[CONF_CLK_MODE]]))
+    cg.add(var.set_clk_mode(*CLK_MODES[config[CONF_CLK_MODE]]))
     cg.add(var.set_use_address(config[CONF_USE_ADDRESS]))
 
     if CONF_POWER_PIN in config:
diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index 9152b33a14..7120223cc9 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -47,8 +47,8 @@ void EthernetComponent::setup() {
 
   mac_config.smi_mdc_gpio_num = this->mdc_pin_;
   mac_config.smi_mdio_gpio_num = this->mdio_pin_;
-  mac_config.clock_config.rmii.clock_mode = this->clk_mode_ == EMAC_CLK_IN_GPIO ? EMAC_CLK_EXT_IN : EMAC_CLK_OUT;
-  mac_config.clock_config.rmii.clock_gpio = this->clk_mode_;
+  mac_config.clock_config.rmii.clock_mode = this->clk_mode_;
+  mac_config.clock_config.rmii.clock_gpio = this->clk_gpio_;
 
   esp_eth_mac_t *mac = esp_eth_mac_new_esp32(&mac_config);
 
@@ -315,7 +315,10 @@ void EthernetComponent::set_power_pin(int power_pin) { this->power_pin_ = power_
 void EthernetComponent::set_mdc_pin(uint8_t mdc_pin) { this->mdc_pin_ = mdc_pin; }
 void EthernetComponent::set_mdio_pin(uint8_t mdio_pin) { this->mdio_pin_ = mdio_pin; }
 void EthernetComponent::set_type(EthernetType type) { this->type_ = type; }
-void EthernetComponent::set_clk_mode(emac_rmii_clock_gpio_t clk_mode) { this->clk_mode_ = clk_mode; }
+void EthernetComponent::set_clk_mode(emac_rmii_clock_mode_t clk_mode, emac_rmii_clock_gpio_t clk_gpio) {
+  this->clk_mode_ = clk_mode;
+  this->clk_gpio_ = clk_gpio;
+}
 void EthernetComponent::set_manual_ip(const ManualIP &manual_ip) { this->manual_ip_ = manual_ip; }
 
 std::string EthernetComponent::get_use_address() const {
diff --git a/esphome/components/ethernet/ethernet_component.h b/esphome/components/ethernet/ethernet_component.h
index a538a5c77d..872ed17044 100644
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -50,7 +50,7 @@ class EthernetComponent : public Component {
   void set_mdc_pin(uint8_t mdc_pin);
   void set_mdio_pin(uint8_t mdio_pin);
   void set_type(EthernetType type);
-  void set_clk_mode(emac_rmii_clock_gpio_t clk_mode);
+  void set_clk_mode(emac_rmii_clock_mode_t clk_mode, emac_rmii_clock_gpio_t clk_gpio);
   void set_manual_ip(const ManualIP &manual_ip);
 
   network::IPAddress get_ip_address();
@@ -70,7 +70,8 @@ class EthernetComponent : public Component {
   uint8_t mdc_pin_{23};
   uint8_t mdio_pin_{18};
   EthernetType type_{ETHERNET_TYPE_LAN8720};
-  emac_rmii_clock_gpio_t clk_mode_{EMAC_CLK_IN_GPIO};
+  emac_rmii_clock_mode_t clk_mode_{EMAC_CLK_EXT_IN};
+  emac_rmii_clock_gpio_t clk_gpio_{EMAC_CLK_IN_GPIO};
   optional<ManualIP> manual_ip_{};
 
   bool started_{false};

From 2bed5b18c15ed11e0d0236a1d2ec7200dc3d4cf5 Mon Sep 17 00:00:00 2001
From: Russell Cloran <rcloran+github@gmail.com>
Date: Wed, 8 Mar 2023 14:35:40 -0800
Subject: [PATCH 666/838] Add ESP32-S3 support in NeoPixelBus component (#4114)

* Add ESP32-S3 support in NeoPixelBus component

* Update NeoPixelBus version in platformio.ini
---
 esphome/components/neopixelbus/_methods.py | 6 +++---
 esphome/components/neopixelbus/light.py    | 3 ++-
 platformio.ini                             | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/esphome/components/neopixelbus/_methods.py b/esphome/components/neopixelbus/_methods.py
index a290257d6b..4059d040d0 100644
--- a/esphome/components/neopixelbus/_methods.py
+++ b/esphome/components/neopixelbus/_methods.py
@@ -13,8 +13,8 @@ from esphome.const import (
 from esphome.components.esp32 import get_esp32_variant
 from esphome.components.esp32.const import (
     VARIANT_ESP32,
-    VARIANT_ESP32S2,
     VARIANT_ESP32C3,
+    VARIANT_ESP32S2,
     VARIANT_ESP32S3,
 )
 from esphome.core import CORE
@@ -58,9 +58,9 @@ SPI_SPEEDS = [40e6, 20e6, 10e6, 5e6, 2e6, 1e6, 500e3]
 
 def _esp32_rmt_default_channel():
     return {
+        VARIANT_ESP32C3: 1,
         VARIANT_ESP32S2: 1,
         VARIANT_ESP32S3: 1,
-        VARIANT_ESP32C3: 1,
     }.get(get_esp32_variant(), 6)
 
 
@@ -71,9 +71,9 @@ def _validate_esp32_rmt_channel(value):
         value = cv.int_(value)
     variant_channels = {
         VARIANT_ESP32: [0, 1, 2, 3, 4, 5, 6, 7, CHANNEL_DYNAMIC],
+        VARIANT_ESP32C3: [0, 1, CHANNEL_DYNAMIC],
         VARIANT_ESP32S2: [0, 1, 2, 3, CHANNEL_DYNAMIC],
         VARIANT_ESP32S3: [0, 1, 2, 3, CHANNEL_DYNAMIC],
-        VARIANT_ESP32C3: [0, 1, CHANNEL_DYNAMIC],
     }
     variant = get_esp32_variant()
     if variant not in variant_channels:
diff --git a/esphome/components/neopixelbus/light.py b/esphome/components/neopixelbus/light.py
index 072a565eda..9bd9215936 100644
--- a/esphome/components/neopixelbus/light.py
+++ b/esphome/components/neopixelbus/light.py
@@ -17,6 +17,7 @@ from esphome.const import (
 from esphome.components.esp32 import get_esp32_variant
 from esphome.components.esp32.const import (
     VARIANT_ESP32C3,
+    VARIANT_ESP32S3,
 )
 from esphome.core import CORE
 from ._methods import (
@@ -96,7 +97,7 @@ def _choose_default_method(config):
             config[CONF_METHOD] = _validate_method(METHOD_BIT_BANG)
 
     if CORE.is_esp32:
-        if get_esp32_variant() == VARIANT_ESP32C3:
+        if get_esp32_variant() in (VARIANT_ESP32C3, VARIANT_ESP32S3):
             config[CONF_METHOD] = _validate_method(METHOD_ESP32_RMT)
         else:
             config[CONF_METHOD] = _validate_method(METHOD_ESP32_I2S)
diff --git a/platformio.ini b/platformio.ini
index 65dccde3b9..3df6446ff1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -34,7 +34,7 @@ build_flags =
 [common]
 lib_deps =
     esphome/noise-c@0.1.4                  ; api
-    makuna/NeoPixelBus@2.6.9               ; neopixelbus
+    makuna/NeoPixelBus@2.7.3               ; neopixelbus
     esphome/Improv@1.2.3                   ; improv_serial / esp32_improv
     bblanchon/ArduinoJson@6.18.5           ; json
     wjtje/qr-code-generator-library@1.7.0  ; qr_code

From 58a8e1859e3c9c63afd13a01bb17ec4b7c686ae8 Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Thu, 9 Mar 2023 00:03:49 +0100
Subject: [PATCH 667/838] Renaming and extending the ili9341 to the ili9xxx
 component (#4275)

* - Removed cleaning the screen twice.
  \Should be handled by  `DisplayBuffer::init_internal_();`
- Made ili9341::initalize() protected and renamed
  \ it to ili9341::initalize().
- ili9341::initalize() should only init the display
  \ and set the width and heigth.

* removed to much

* clang format fixes

* removing trailing underscors for
protected virtual methods

* removed the "override"  on display()

* clang fixes

* restored old changes

* Renamed the ili9341 platform to ili9xxx and added
multiple drivers as well. including PR #3848

* fixed most of the clang reported issues

* fixed reported issues

* last fixes

* Setting the right codeowners

* missing changes

* fixed naming Display() method.

* clang again

* clang fix

* fixes reported by @jesserockz & @gpambrozio

* a change to display.py removing an unneeded var

* re-introduce **backlight** option.

* update the ili9488 initialization

* update the ili9488 initialization and fix typo

* fixed typo

* add missing constants

* swap height and width back for the ili9488

* init fixes ili9488

* fixed lint issue
testing the init code

* oeps

* init fixes ili9488

* fixed wrong define

* fixed wrong define again

* removed some spaces

* revert to ili9341

* Remove parts that where used for
the switchplate

* lint fixes and removing unused function

* fix error and introducing 16bit color option

* fix error and introducing 16bit color option

* fix clang issue

* clang fix

* clang issue again

* is this what clang exprect

* clang fix

* clang fix

* try again

* let try again

* and again

* and the last clang fix

* remove the need of wifi

* update dimentions

* update ili8488 init code.

* update dimentions

* allow to change height and width

* dump color mode config

* fix

* fix

* modify logging

* referd back unrelated change

* code formatting commit and moving functions around

* add missing ;

* update code

* update code

* use the correct write_array for sending uint16_t

* fix panic loop

* fix panic loop

* - update the test file
- fixed sending display data

* clang fixes

* clang fixes

* clang fixes again

* remove .gitignore items

* remove .gitignore items

* make sure Update() can can not be called while
called

* clang correction

* adding a test yaml for the ili9341

* Update ili9341 example

* Make test ili9xxx/tests only local

* restore back old ili9341 driver code

* Add a new config for the M5Core

* fix clang request

* reverd to restore of the old ili9341
there is no proper way to say it is depricated.

* Remove the backlight/led pin from the config.
You need to use a proper light platform component

* Ili9488init changes (#88)

Fixed ILI9488 init settings, and adjusted pixel handling code to push pixels in 18 bit format.
This does not change the internal 16-bit representation.

* fixed some leftover clang issues from the merge.

* fixed the slang-tidy request.

* remove `backlight_pin` warning.

---------

Co-authored-by: JD Steffen <jdsteffen81@gmail.com>
---
 CODEOWNERS                                    |   1 +
 esphome/components/ili9341/display.py         | 154 +------
 esphome/components/ili9341/ili9341_defines.h  |  83 ----
 .../components/ili9341/ili9341_display.cpp    | 308 -------------
 esphome/components/ili9341/ili9341_init.h     |  70 ---
 esphome/components/ili9xxx/__init__.py        |   0
 esphome/components/ili9xxx/display.py         | 159 +++++++
 esphome/components/ili9xxx/ili9xxx_defines.h  |  96 ++++
 .../components/ili9xxx/ili9xxx_display.cpp    | 416 ++++++++++++++++++
 .../ili9xxx_display.h}                        | 118 ++---
 esphome/components/ili9xxx/ili9xxx_init.h     | 174 ++++++++
 tests/test1.yaml                              |  10 +-
 12 files changed, 917 insertions(+), 672 deletions(-)
 delete mode 100644 esphome/components/ili9341/ili9341_defines.h
 delete mode 100644 esphome/components/ili9341/ili9341_display.cpp
 delete mode 100644 esphome/components/ili9341/ili9341_init.h
 create mode 100644 esphome/components/ili9xxx/__init__.py
 create mode 100644 esphome/components/ili9xxx/display.py
 create mode 100644 esphome/components/ili9xxx/ili9xxx_defines.h
 create mode 100644 esphome/components/ili9xxx/ili9xxx_display.cpp
 rename esphome/components/{ili9341/ili9341_display.h => ili9xxx/ili9xxx_display.h} (51%)
 create mode 100644 esphome/components/ili9xxx/ili9xxx_init.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 3d6ea5cd32..c006db2a6a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -111,6 +111,7 @@ esphome/components/hte501/* @Stock-M
 esphome/components/hydreon_rgxx/* @functionpointer
 esphome/components/i2c/* @esphome/core
 esphome/components/i2s_audio/* @jesserockz
+esphome/components/ili9xxx/* @nielsnl68
 esphome/components/improv_base/* @esphome/core
 esphome/components/improv_serial/* @esphome/core
 esphome/components/ina260/* @MrEditor97
diff --git a/esphome/components/ili9341/display.py b/esphome/components/ili9341/display.py
index 0b87a0c4eb..6ab6a5e8ef 100644
--- a/esphome/components/ili9341/display.py
+++ b/esphome/components/ili9341/display.py
@@ -1,153 +1,5 @@
-import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome import core, pins
-from esphome.components import display, spi
-from esphome.const import (
-    CONF_COLOR_PALETTE,
-    CONF_DC_PIN,
-    CONF_ID,
-    CONF_LAMBDA,
-    CONF_MODEL,
-    CONF_PAGES,
-    CONF_RAW_DATA_ID,
-    CONF_RESET_PIN,
+
+CONFIG_SCHEMA = cv.invalid(
+    "The ili9341 platform component has been renamed to ili9xxx."
 )
-from esphome.core import CORE, HexInt
-
-DEPENDENCIES = ["spi"]
-
-CONF_COLOR_PALETTE_IMAGES = "color_palette_images"
-CONF_LED_PIN = "led_pin"
-
-ili9341_ns = cg.esphome_ns.namespace("ili9341")
-ili9341 = ili9341_ns.class_(
-    "ILI9341Display", cg.PollingComponent, spi.SPIDevice, display.DisplayBuffer
-)
-ILI9341M5Stack = ili9341_ns.class_("ILI9341M5Stack", ili9341)
-ILI9341TFT24 = ili9341_ns.class_("ILI9341TFT24", ili9341)
-ILI9341TFT24R = ili9341_ns.class_("ILI9341TFT24R", ili9341)
-
-ILI9341Model = ili9341_ns.enum("ILI9341Model")
-ILI9341ColorMode = ili9341_ns.enum("ILI9341ColorMode")
-
-MODELS = {
-    "M5STACK": ILI9341Model.M5STACK,
-    "TFT_2.4": ILI9341Model.TFT_24,
-    "TFT_2.4R": ILI9341Model.TFT_24R,
-}
-
-ILI9341_MODEL = cv.enum(MODELS, upper=True, space="_")
-
-COLOR_PALETTE = cv.one_of("NONE", "GRAYSCALE", "IMAGE_ADAPTIVE")
-
-
-def _validate(config):
-    if config.get(CONF_COLOR_PALETTE) == "IMAGE_ADAPTIVE" and not config.get(
-        CONF_COLOR_PALETTE_IMAGES
-    ):
-        raise cv.Invalid(
-            "Color palette in IMAGE_ADAPTIVE mode requires at least one 'color_palette_images' entry to generate palette"
-        )
-    if (
-        config.get(CONF_COLOR_PALETTE_IMAGES)
-        and config.get(CONF_COLOR_PALETTE) != "IMAGE_ADAPTIVE"
-    ):
-        raise cv.Invalid(
-            "Providing color palette images requires palette mode to be 'IMAGE_ADAPTIVE'"
-        )
-    return config
-
-
-CONFIG_SCHEMA = cv.All(
-    display.FULL_DISPLAY_SCHEMA.extend(
-        {
-            cv.GenerateID(): cv.declare_id(ili9341),
-            cv.Required(CONF_MODEL): ILI9341_MODEL,
-            cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
-            cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
-            cv.Optional(CONF_LED_PIN): pins.gpio_output_pin_schema,
-            cv.Optional(CONF_COLOR_PALETTE, default="NONE"): COLOR_PALETTE,
-            cv.Optional(CONF_COLOR_PALETTE_IMAGES, default=[]): cv.ensure_list(
-                cv.file_
-            ),
-            cv.GenerateID(CONF_RAW_DATA_ID): cv.declare_id(cg.uint8),
-        }
-    )
-    .extend(cv.polling_component_schema("1s"))
-    .extend(spi.spi_device_schema(False)),
-    cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA),
-    _validate,
-)
-
-
-async def to_code(config):
-    if config[CONF_MODEL] == "M5STACK":
-        lcd_type = ILI9341M5Stack
-    if config[CONF_MODEL] == "TFT_2.4":
-        lcd_type = ILI9341TFT24
-    if config[CONF_MODEL] == "TFT_2.4R":
-        lcd_type = ILI9341TFT24R
-    rhs = lcd_type.new()
-    var = cg.Pvariable(config[CONF_ID], rhs)
-
-    await cg.register_component(var, config)
-    await display.register_display(var, config)
-    await spi.register_spi_device(var, config)
-    cg.add(var.set_model(config[CONF_MODEL]))
-    dc = await cg.gpio_pin_expression(config[CONF_DC_PIN])
-    cg.add(var.set_dc_pin(dc))
-
-    if CONF_LAMBDA in config:
-        lambda_ = await cg.process_lambda(
-            config[CONF_LAMBDA], [(display.DisplayBufferRef, "it")], return_type=cg.void
-        )
-        cg.add(var.set_writer(lambda_))
-    if CONF_RESET_PIN in config:
-        reset = await cg.gpio_pin_expression(config[CONF_RESET_PIN])
-        cg.add(var.set_reset_pin(reset))
-    if CONF_LED_PIN in config:
-        led_pin = await cg.gpio_pin_expression(config[CONF_LED_PIN])
-        cg.add(var.set_led_pin(led_pin))
-
-    rhs = None
-    if config[CONF_COLOR_PALETTE] == "GRAYSCALE":
-        cg.add(var.set_buffer_color_mode(ILI9341ColorMode.BITS_8_INDEXED))
-        rhs = []
-        for x in range(256):
-            rhs.extend([HexInt(x), HexInt(x), HexInt(x)])
-    elif config[CONF_COLOR_PALETTE] == "IMAGE_ADAPTIVE":
-        cg.add(var.set_buffer_color_mode(ILI9341ColorMode.BITS_8_INDEXED))
-        from PIL import Image
-
-        def load_image(filename):
-            path = CORE.relative_config_path(filename)
-            try:
-                return Image.open(path)
-            except Exception as e:
-                raise core.EsphomeError(f"Could not load image file {path}: {e}")
-
-        # make a wide horizontal combined image.
-        images = [load_image(x) for x in config[CONF_COLOR_PALETTE_IMAGES]]
-        total_width = sum(i.width for i in images)
-        max_height = max(i.height for i in images)
-
-        ref_image = Image.new("RGB", (total_width, max_height))
-        x = 0
-        for i in images:
-            ref_image.paste(i, (x, 0))
-            x = x + i.width
-
-        # reduce the colors on combined image to 256.
-        converted = ref_image.convert("P", palette=Image.ADAPTIVE, colors=256)
-        # if you want to verify how the images look use
-        # ref_image.save("ref_in.png")
-        # converted.save("ref_out.png")
-        palette = converted.getpalette()
-        assert len(palette) == 256 * 3
-        rhs = palette
-    else:
-        cg.add(var.set_buffer_color_mode(ILI9341ColorMode.BITS_8))
-
-    if rhs is not None:
-        prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
-        cg.add(var.set_palette(prog_arr))
diff --git a/esphome/components/ili9341/ili9341_defines.h b/esphome/components/ili9341/ili9341_defines.h
deleted file mode 100644
index 6b3d4c0dcf..0000000000
--- a/esphome/components/ili9341/ili9341_defines.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#pragma once
-
-namespace esphome {
-namespace ili9341 {
-
-// Color definitions
-// clang-format off
-static const uint8_t MADCTL_MY    = 0x80;   ///< Bit 7 Bottom to top
-static const uint8_t MADCTL_MX    = 0x40;   ///< Bit 6 Right to left
-static const uint8_t MADCTL_MV    = 0x20;   ///< Bit 5 Reverse Mode
-static const uint8_t MADCTL_ML    = 0x10;   ///< Bit 4 LCD refresh Bottom to top
-static const uint8_t MADCTL_RGB   = 0x00;  ///< Bit 3 Red-Green-Blue pixel order
-static const uint8_t MADCTL_BGR   = 0x08;  ///< Bit 3 Blue-Green-Red pixel order
-static const uint8_t MADCTL_MH    = 0x04;   ///< Bit 2 LCD refresh right to left
-// clang-format on
-
-static const uint16_t ILI9341_TFTWIDTH = 320;   ///< ILI9341 max TFT width
-static const uint16_t ILI9341_TFTHEIGHT = 240;  ///< ILI9341 max TFT height
-
-// All ILI9341 specific commands some are used by init()
-static const uint8_t ILI9341_NOP = 0x00;
-static const uint8_t ILI9341_SWRESET = 0x01;
-static const uint8_t ILI9341_RDDID = 0x04;
-static const uint8_t ILI9341_RDDST = 0x09;
-
-static const uint8_t ILI9341_SLPIN = 0x10;
-static const uint8_t ILI9341_SLPOUT = 0x11;
-static const uint8_t ILI9341_PTLON = 0x12;
-static const uint8_t ILI9341_NORON = 0x13;
-
-static const uint8_t ILI9341_RDMODE = 0x0A;
-static const uint8_t ILI9341_RDMADCTL = 0x0B;
-static const uint8_t ILI9341_RDPIXFMT = 0x0C;
-static const uint8_t ILI9341_RDIMGFMT = 0x0A;
-static const uint8_t ILI9341_RDSELFDIAG = 0x0F;
-
-static const uint8_t ILI9341_INVOFF = 0x20;
-static const uint8_t ILI9341_INVON = 0x21;
-static const uint8_t ILI9341_GAMMASET = 0x26;
-static const uint8_t ILI9341_DISPOFF = 0x28;
-static const uint8_t ILI9341_DISPON = 0x29;
-
-static const uint8_t ILI9341_CASET = 0x2A;
-static const uint8_t ILI9341_PASET = 0x2B;
-static const uint8_t ILI9341_RAMWR = 0x2C;
-static const uint8_t ILI9341_RAMRD = 0x2E;
-
-static const uint8_t ILI9341_PTLAR = 0x30;
-static const uint8_t ILI9341_VSCRDEF = 0x33;
-static const uint8_t ILI9341_MADCTL = 0x36;
-static const uint8_t ILI9341_VSCRSADD = 0x37;
-static const uint8_t ILI9341_PIXFMT = 0x3A;
-
-static const uint8_t ILI9341_WRDISBV = 0x51;
-static const uint8_t ILI9341_RDDISBV = 0x52;
-static const uint8_t ILI9341_WRCTRLD = 0x53;
-
-static const uint8_t ILI9341_FRMCTR1 = 0xB1;
-static const uint8_t ILI9341_FRMCTR2 = 0xB2;
-static const uint8_t ILI9341_FRMCTR3 = 0xB3;
-static const uint8_t ILI9341_INVCTR = 0xB4;
-static const uint8_t ILI9341_DFUNCTR = 0xB6;
-
-static const uint8_t ILI9341_PWCTR1 = 0xC0;
-static const uint8_t ILI9341_PWCTR2 = 0xC1;
-static const uint8_t ILI9341_PWCTR3 = 0xC2;
-static const uint8_t ILI9341_PWCTR4 = 0xC3;
-static const uint8_t ILI9341_PWCTR5 = 0xC4;
-static const uint8_t ILI9341_VMCTR1 = 0xC5;
-static const uint8_t ILI9341_VMCTR2 = 0xC7;
-
-static const uint8_t ILI9341_RDID4 = 0xD3;
-static const uint8_t ILI9341_RDINDEX = 0xD9;
-static const uint8_t ILI9341_RDID1 = 0xDA;
-static const uint8_t ILI9341_RDID2 = 0xDB;
-static const uint8_t ILI9341_RDID3 = 0xDC;
-static const uint8_t ILI9341_RDIDX = 0xDD;  // TBC
-
-static const uint8_t ILI9341_GMCTRP1 = 0xE0;
-static const uint8_t ILI9341_GMCTRN1 = 0xE1;
-
-}  // namespace ili9341
-}  // namespace esphome
diff --git a/esphome/components/ili9341/ili9341_display.cpp b/esphome/components/ili9341/ili9341_display.cpp
deleted file mode 100644
index 9f9edcf21f..0000000000
--- a/esphome/components/ili9341/ili9341_display.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-#include "ili9341_display.h"
-#include "esphome/core/log.h"
-#include "esphome/core/application.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/hal.h"
-
-namespace esphome {
-namespace ili9341 {
-
-static const char *const TAG = "ili9341";
-
-void ILI9341Display::setup_pins_() {
-  this->dc_pin_->setup();  // OUTPUT
-  this->dc_pin_->digital_write(false);
-  if (this->reset_pin_ != nullptr) {
-    this->reset_pin_->setup();  // OUTPUT
-    this->reset_pin_->digital_write(true);
-  }
-  if (this->led_pin_ != nullptr) {
-    this->led_pin_->setup();
-    this->led_pin_->digital_write(true);
-  }
-  this->spi_setup();
-
-  this->reset_();
-}
-
-void ILI9341Display::dump_config() {
-  LOG_DISPLAY("", "ili9341", this);
-  LOG_PIN("  Reset Pin: ", this->reset_pin_);
-  LOG_PIN("  DC Pin: ", this->dc_pin_);
-  LOG_PIN("  Busy Pin: ", this->busy_pin_);
-  LOG_UPDATE_INTERVAL(this);
-}
-
-float ILI9341Display::get_setup_priority() const { return setup_priority::HARDWARE; }
-
-void ILI9341Display::command(uint8_t value) {
-  this->start_command_();
-  this->write_byte(value);
-  this->end_command_();
-}
-
-void ILI9341Display::reset_() {
-  if (this->reset_pin_ != nullptr) {
-    this->reset_pin_->digital_write(false);
-    delay(10);
-    this->reset_pin_->digital_write(true);
-    delay(10);
-  }
-}
-
-void ILI9341Display::data(uint8_t value) {
-  this->start_data_();
-  this->write_byte(value);
-  this->end_data_();
-}
-
-void ILI9341Display::send_command(uint8_t command_byte, const uint8_t *data_bytes, uint8_t num_data_bytes) {
-  this->command(command_byte);  // Send the command byte
-  this->start_data_();
-  this->write_array(data_bytes, num_data_bytes);
-  this->end_data_();
-}
-
-uint8_t ILI9341Display::read_command(uint8_t command_byte, uint8_t index) {
-  uint8_t data = 0x10 + index;
-  this->send_command(0xD9, &data, 1);  // Set Index Register
-  uint8_t result;
-  this->start_command_();
-  this->write_byte(command_byte);
-  this->start_data_();
-  do {
-    result = this->read_byte();
-  } while (index--);
-  this->end_data_();
-  return result;
-}
-
-void ILI9341Display::update() {
-  this->do_update_();
-  this->display_();
-}
-
-void ILI9341Display::display_() {
-  // we will only update the changed window to the display
-  uint16_t w = this->x_high_ - this->x_low_ + 1;
-  uint16_t h = this->y_high_ - this->y_low_ + 1;
-  uint32_t start_pos = ((this->y_low_ * this->width_) + x_low_);
-
-  // check if something was displayed
-  if ((this->x_high_ < this->x_low_) || (this->y_high_ < this->y_low_)) {
-    return;
-  }
-
-  set_addr_window_(this->x_low_, this->y_low_, w, h);
-
-  ESP_LOGVV("ILI9341", "Start ILI9341Display::display_(xl:%d, xh:%d, yl:%d, yh:%d, w:%d, h:%d, start_pos:%d)",
-            this->x_low_, this->x_high_, this->y_low_, this->y_high_, w, h, start_pos);
-
-  this->start_data_();
-  for (uint16_t row = 0; row < h; row++) {
-    uint32_t pos = start_pos + (row * width_);
-    uint32_t rem = w;
-
-    while (rem > 0) {
-      uint32_t sz = buffer_to_transfer_(pos, rem);
-      this->write_array(transfer_buffer_, 2 * sz);
-      pos += sz;
-      rem -= sz;
-      App.feed_wdt();
-    }
-    App.feed_wdt();
-  }
-  this->end_data_();
-
-  // invalidate watermarks
-  this->x_low_ = this->width_;
-  this->y_low_ = this->height_;
-  this->x_high_ = 0;
-  this->y_high_ = 0;
-}
-
-void ILI9341Display::fill(Color color) {
-  uint8_t color332 = 0;
-  if (this->buffer_color_mode_ == BITS_8) {
-    color332 = display::ColorUtil::color_to_332(color);
-  } else {  // if (this->buffer_color_mode_ == BITS_8_INDEXED)
-    color332 = display::ColorUtil::color_to_index8_palette888(color, this->palette_);
-  }
-  memset(this->buffer_, color332, this->get_buffer_length_());
-  this->x_low_ = 0;
-  this->y_low_ = 0;
-  this->x_high_ = this->get_width_internal() - 1;
-  this->y_high_ = this->get_height_internal() - 1;
-}
-
-void ILI9341Display::fill_internal_(uint8_t color) {
-  memset(transfer_buffer_, color, sizeof(transfer_buffer_));
-
-  uint32_t rem = (this->get_buffer_length_() * 2);
-
-  this->set_addr_window_(0, 0, this->get_width_internal(), this->get_height_internal());
-  this->start_data_();
-
-  while (rem > 0) {
-    size_t sz = rem <= sizeof(transfer_buffer_) ? rem : sizeof(transfer_buffer_);
-    this->write_array(transfer_buffer_, sz);
-    rem -= sz;
-  }
-
-  this->end_data_();
-
-  memset(buffer_, color, this->get_buffer_length_());
-}
-
-void ILI9341Display::rotate_my_(uint8_t m) {
-  uint8_t rotation = m & 3;  // can't be higher than 3
-  switch (rotation) {
-    case 0:
-      m = (MADCTL_MX | MADCTL_BGR);
-      // _width = ILI9341_TFTWIDTH;
-      // _height = ILI9341_TFTHEIGHT;
-      break;
-    case 1:
-      m = (MADCTL_MV | MADCTL_BGR);
-      // _width = ILI9341_TFTHEIGHT;
-      // _height = ILI9341_TFTWIDTH;
-      break;
-    case 2:
-      m = (MADCTL_MY | MADCTL_BGR);
-      // _width = ILI9341_TFTWIDTH;
-      // _height = ILI9341_TFTHEIGHT;
-      break;
-    case 3:
-      m = (MADCTL_MX | MADCTL_MY | MADCTL_MV | MADCTL_BGR);
-      // _width = ILI9341_TFTHEIGHT;
-      // _height = ILI9341_TFTWIDTH;
-      break;
-  }
-
-  this->command(ILI9341_MADCTL);
-  this->data(m);
-}
-
-void HOT ILI9341Display::draw_absolute_pixel_internal(int x, int y, Color color) {
-  if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0)
-    return;
-
-  uint32_t pos = (y * width_) + x;
-  uint8_t new_color;
-
-  if (this->buffer_color_mode_ == BITS_8) {
-    new_color = display::ColorUtil::color_to_332(color, display::ColorOrder::COLOR_ORDER_RGB);
-  } else {  // if (this->buffer_color_mode_ == BITS_8_INDEXED) {
-    new_color = display::ColorUtil::color_to_index8_palette888(color, this->palette_);
-  }
-
-  if (buffer_[pos] != new_color) {
-    buffer_[pos] = new_color;
-    // low and high watermark may speed up drawing from buffer
-    this->x_low_ = (x < this->x_low_) ? x : this->x_low_;
-    this->y_low_ = (y < this->y_low_) ? y : this->y_low_;
-    this->x_high_ = (x > this->x_high_) ? x : this->x_high_;
-    this->y_high_ = (y > this->y_high_) ? y : this->y_high_;
-  }
-}
-
-// should return the total size: return this->get_width_internal() * this->get_height_internal() * 2 // 16bit color
-// values per bit is huge
-uint32_t ILI9341Display::get_buffer_length_() { return this->get_width_internal() * this->get_height_internal(); }
-
-void ILI9341Display::start_command_() {
-  this->dc_pin_->digital_write(false);
-  this->enable();
-}
-
-void ILI9341Display::end_command_() { this->disable(); }
-void ILI9341Display::start_data_() {
-  this->dc_pin_->digital_write(true);
-  this->enable();
-}
-void ILI9341Display::end_data_() { this->disable(); }
-
-void ILI9341Display::init_lcd_(const uint8_t *init_cmd) {
-  uint8_t cmd, x, num_args;
-  const uint8_t *addr = init_cmd;
-  while ((cmd = progmem_read_byte(addr++)) > 0) {
-    x = progmem_read_byte(addr++);
-    num_args = x & 0x7F;
-    send_command(cmd, addr, num_args);
-    addr += num_args;
-    if (x & 0x80)
-      delay(150);  // NOLINT
-  }
-}
-
-void ILI9341Display::set_addr_window_(uint16_t x1, uint16_t y1, uint16_t w, uint16_t h) {
-  uint16_t x2 = (x1 + w - 1), y2 = (y1 + h - 1);
-  this->command(ILI9341_CASET);  // Column address set
-  this->start_data_();
-  this->write_byte(x1 >> 8);
-  this->write_byte(x1);
-  this->write_byte(x2 >> 8);
-  this->write_byte(x2);
-  this->end_data_();
-  this->command(ILI9341_PASET);  // Row address set
-  this->start_data_();
-  this->write_byte(y1 >> 8);
-  this->write_byte(y1);
-  this->write_byte(y2 >> 8);
-  this->write_byte(y2);
-  this->end_data_();
-  this->command(ILI9341_RAMWR);  // Write to RAM
-}
-
-void ILI9341Display::invert_display_(bool invert) { this->command(invert ? ILI9341_INVON : ILI9341_INVOFF); }
-
-int ILI9341Display::get_width_internal() { return this->width_; }
-int ILI9341Display::get_height_internal() { return this->height_; }
-
-uint32_t ILI9341Display::buffer_to_transfer_(uint32_t pos, uint32_t sz) {
-  uint8_t *src = buffer_ + pos;
-  uint8_t *dst = transfer_buffer_;
-
-  if (sz > sizeof(transfer_buffer_) / 2) {
-    sz = sizeof(transfer_buffer_) / 2;
-  }
-
-  for (uint32_t i = 0; i < sz; ++i) {
-    uint16_t color;
-    if (this->buffer_color_mode_ == BITS_8) {
-      color = display::ColorUtil::color_to_565(display::ColorUtil::rgb332_to_color(*src++));
-    } else {  //  if (this->buffer_color_mode == BITS_8_INDEXED) {
-      Color col = display::ColorUtil::index8_to_color_palette888(*src++, this->palette_);
-      color = display::ColorUtil::color_to_565(col);
-    }
-    *dst++ = (uint8_t)(color >> 8);
-    *dst++ = (uint8_t) color;
-  }
-
-  return sz;
-}
-
-//   M5Stack display
-void ILI9341M5Stack::initialize() {
-  this->init_lcd_(INITCMD_M5STACK);
-  this->width_ = 320;
-  this->height_ = 240;
-  this->invert_display_(true);
-}
-
-//   24_TFT display
-void ILI9341TFT24::initialize() {
-  this->init_lcd_(INITCMD_TFT);
-  this->width_ = 240;
-  this->height_ = 320;
-}
-
-//   24_TFT rotated display
-void ILI9341TFT24R::initialize() {
-  this->init_lcd_(INITCMD_TFT);
-  this->width_ = 320;
-  this->height_ = 240;
-}
-
-}  // namespace ili9341
-}  // namespace esphome
diff --git a/esphome/components/ili9341/ili9341_init.h b/esphome/components/ili9341/ili9341_init.h
deleted file mode 100644
index b4f67ff19a..0000000000
--- a/esphome/components/ili9341/ili9341_init.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#pragma once
-#include "esphome/core/helpers.h"
-
-namespace esphome {
-namespace ili9341 {
-
-// clang-format off
-static const uint8_t PROGMEM INITCMD_M5STACK[] = {
-  0xEF, 3, 0x03, 0x80, 0x02,
-  0xCF, 3, 0x00, 0xC1, 0x30,
-  0xED, 4, 0x64, 0x03, 0x12, 0x81,
-  0xE8, 3, 0x85, 0x00, 0x78,
-  0xCB, 5, 0x39, 0x2C, 0x00, 0x34, 0x02,
-  0xF7, 1, 0x20,
-  0xEA, 2, 0x00, 0x00,
-  ILI9341_PWCTR1  , 1, 0x23,             // Power control VRH[5:0]
-  ILI9341_PWCTR2  , 1, 0x10,             // Power control SAP[2:0];BT[3:0]
-  ILI9341_VMCTR1  , 2, 0x3e, 0x28,       // VCM control
-  ILI9341_VMCTR2  , 1, 0x86,             // VCM control2
-  ILI9341_MADCTL  , 1, MADCTL_BGR,       // Memory Access Control
-  ILI9341_VSCRSADD, 1, 0x00,             // Vertical scroll zero
-  ILI9341_PIXFMT  , 1, 0x55,
-  ILI9341_FRMCTR1 , 2, 0x00, 0x13,
-  ILI9341_DFUNCTR , 3, 0x08, 0x82, 0x27, // Display Function Control
-  0xF2, 1, 0x00,                         // 3Gamma Function Disable
-  ILI9341_GAMMASET , 1, 0x01,             // Gamma curve selected
-  ILI9341_GMCTRP1 , 15, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, // Set Gamma
-                        0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03,
-                        0x0E, 0x09, 0x00,
-  ILI9341_GMCTRN1 , 15, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, // Set Gamma
-                        0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C,
-                        0x31, 0x36, 0x0F,
-  ILI9341_SLPOUT  , 0x80,                // Exit Sleep
-  ILI9341_DISPON  , 0x80,                // Display on
-  0x00                                   // End of list
-};
-
-static const uint8_t PROGMEM INITCMD_TFT[] = {
-  0xEF, 3, 0x03, 0x80, 0x02,
-  0xCF, 3, 0x00, 0xC1, 0x30,
-  0xED, 4, 0x64, 0x03, 0x12, 0x81,
-  0xE8, 3, 0x85, 0x00, 0x78,
-  0xCB, 5, 0x39, 0x2C, 0x00, 0x34, 0x02,
-  0xF7, 1, 0x20,
-  0xEA, 2, 0x00, 0x00,
-  ILI9341_PWCTR1  , 1, 0x23,             // Power control VRH[5:0]
-  ILI9341_PWCTR2  , 1, 0x10,             // Power control SAP[2:0];BT[3:0]
-  ILI9341_VMCTR1  , 2, 0x3e, 0x28,       // VCM control
-  ILI9341_VMCTR2  , 1, 0x86,             // VCM control2
-  ILI9341_MADCTL  , 1, 0x48,             // Memory Access Control
-  ILI9341_VSCRSADD, 1, 0x00,             // Vertical scroll zero
-  ILI9341_PIXFMT  , 1, 0x55,
-  ILI9341_FRMCTR1 , 2, 0x00, 0x18,
-  ILI9341_DFUNCTR , 3, 0x08, 0x82, 0x27, // Display Function Control
-  0xF2, 1, 0x00,                         // 3Gamma Function Disable
-  ILI9341_GAMMASET , 1, 0x01,             // Gamma curve selected
-  ILI9341_GMCTRP1 , 15, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, // Set Gamma
-                        0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03,
-                        0x0E, 0x09, 0x00,
-  ILI9341_GMCTRN1 , 15, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, // Set Gamma
-                        0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C,
-                        0x31, 0x36, 0x0F,
-  ILI9341_SLPOUT  , 0x80,                // Exit Sleep
-  ILI9341_DISPON  , 0x80,                // Display on
-  0x00                                   // End of list
-};
-
-// clang-format on
-}  // namespace ili9341
-}  // namespace esphome
diff --git a/esphome/components/ili9xxx/__init__.py b/esphome/components/ili9xxx/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/ili9xxx/display.py b/esphome/components/ili9xxx/display.py
new file mode 100644
index 0000000000..437fc93b89
--- /dev/null
+++ b/esphome/components/ili9xxx/display.py
@@ -0,0 +1,159 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import core, pins
+from esphome.components import display, spi
+from esphome.core import CORE, HexInt
+from esphome.const import (
+    CONF_COLOR_PALETTE,
+    CONF_DC_PIN,
+    CONF_ID,
+    CONF_LAMBDA,
+    CONF_MODEL,
+    CONF_RAW_DATA_ID,
+    CONF_PAGES,
+    CONF_RESET_PIN,
+    CONF_DIMENSIONS,
+)
+
+DEPENDENCIES = ["spi"]
+AUTO_LOAD = ["psram"]
+
+CODEOWNERS = ["@nielsnl68"]
+
+ili9XXX_ns = cg.esphome_ns.namespace("ili9xxx")
+ili9XXXSPI = ili9XXX_ns.class_(
+    "ILI9XXXDisplay", cg.PollingComponent, spi.SPIDevice, display.DisplayBuffer
+)
+
+ILI9XXXColorMode = ili9XXX_ns.enum("ILI9XXXColorMode")
+
+MODELS = {
+    "M5STACK": ili9XXX_ns.class_("ILI9XXXM5Stack", ili9XXXSPI),
+    "M5CORE": ili9XXX_ns.class_("ILI9XXXM5CORE", ili9XXXSPI),
+    "TFT_2.4": ili9XXX_ns.class_("ILI9XXXILI9341", ili9XXXSPI),
+    "TFT_2.4R": ili9XXX_ns.class_("ILI9XXXILI9342", ili9XXXSPI),
+    "ILI9341": ili9XXX_ns.class_("ILI9XXXILI9341", ili9XXXSPI),
+    "ILI9342": ili9XXX_ns.class_("ILI9XXXILI9342", ili9XXXSPI),
+    "ILI9481": ili9XXX_ns.class_("ILI9XXXILI9481", ili9XXXSPI),
+    "ILI9486": ili9XXX_ns.class_("ILI9XXXILI9486", ili9XXXSPI),
+    "ILI9488": ili9XXX_ns.class_("ILI9XXXILI9488", ili9XXXSPI),
+    "ST7796": ili9XXX_ns.class_("ILI9XXXST7796", ili9XXXSPI),
+}
+
+COLOR_PALETTE = cv.one_of("NONE", "GRAYSCALE", "IMAGE_ADAPTIVE")
+
+CONF_LED_PIN = "led_pin"
+CONF_COLOR_PALETTE_IMAGES = "color_palette_images"
+
+
+def _validate(config):
+    if config.get(CONF_COLOR_PALETTE) == "IMAGE_ADAPTIVE" and not config.get(
+        CONF_COLOR_PALETTE_IMAGES
+    ):
+        raise cv.Invalid(
+            "Color palette in IMAGE_ADAPTIVE mode requires at least one 'color_palette_images' entry to generate palette"
+        )
+    if (
+        config.get(CONF_COLOR_PALETTE_IMAGES)
+        and config.get(CONF_COLOR_PALETTE) != "IMAGE_ADAPTIVE"
+    ):
+        raise cv.Invalid(
+            "Providing color palette images requires palette mode to be 'IMAGE_ADAPTIVE'"
+        )
+    return config
+
+
+CONFIG_SCHEMA = cv.All(
+    display.FULL_DISPLAY_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(ili9XXXSPI),
+            cv.Required(CONF_MODEL): cv.enum(MODELS, upper=True, space="_"),
+            cv.Optional(CONF_DIMENSIONS): cv.dimensions,
+            cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
+            cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
+            cv.Optional(CONF_LED_PIN): cv.invalid(
+                "This property is removed. To use the backlight use proper light component."
+            ),
+            cv.Optional(CONF_COLOR_PALETTE, default="NONE"): COLOR_PALETTE,
+            cv.GenerateID(CONF_RAW_DATA_ID): cv.declare_id(cg.uint8),
+            cv.Optional(CONF_COLOR_PALETTE_IMAGES, default=[]): cv.ensure_list(
+                cv.file_
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("1s"))
+    .extend(spi.spi_device_schema(False)),
+    cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA),
+    _validate,
+)
+
+
+async def to_code(config):
+    rhs = MODELS[config[CONF_MODEL]].new()
+    var = cg.Pvariable(config[CONF_ID], rhs)
+
+    await cg.register_component(var, config)
+    await display.register_display(var, config)
+    await spi.register_spi_device(var, config)
+    dc = await cg.gpio_pin_expression(config[CONF_DC_PIN])
+    cg.add(var.set_dc_pin(dc))
+
+    if CONF_LAMBDA in config:
+        lambda_ = await cg.process_lambda(
+            config[CONF_LAMBDA], [(display.DisplayBufferRef, "it")], return_type=cg.void
+        )
+        cg.add(var.set_writer(lambda_))
+
+    if CONF_RESET_PIN in config:
+        reset = await cg.gpio_pin_expression(config[CONF_RESET_PIN])
+        cg.add(var.set_reset_pin(reset))
+
+    if CONF_DIMENSIONS in config:
+        cg.add(
+            var.set_dimentions(config[CONF_DIMENSIONS][0], config[CONF_DIMENSIONS][1])
+        )
+
+    rhs = None
+    if config[CONF_COLOR_PALETTE] == "GRAYSCALE":
+        cg.add(var.set_buffer_color_mode(ILI9XXXColorMode.BITS_8_INDEXED))
+        rhs = []
+        for x in range(256):
+            rhs.extend([HexInt(x), HexInt(x), HexInt(x)])
+        prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
+        cg.add(var.set_palette(prog_arr))
+    elif config[CONF_COLOR_PALETTE] == "IMAGE_ADAPTIVE":
+        cg.add(var.set_buffer_color_mode(ILI9XXXColorMode.BITS_8_INDEXED))
+        from PIL import Image
+
+        def load_image(filename):
+            path = CORE.relative_config_path(filename)
+            try:
+                return Image.open(path)
+            except Exception as e:
+                raise core.EsphomeError(f"Could not load image file {path}: {e}")
+
+        # make a wide horizontal combined image.
+        images = [load_image(x) for x in config[CONF_COLOR_PALETTE_IMAGES]]
+        total_width = sum(i.width for i in images)
+        max_height = max(i.height for i in images)
+
+        ref_image = Image.new("RGB", (total_width, max_height))
+        x = 0
+        for i in images:
+            ref_image.paste(i, (x, 0))
+            x = x + i.width
+
+        # reduce the colors on combined image to 256.
+        converted = ref_image.convert("P", palette=Image.ADAPTIVE, colors=256)
+        # if you want to verify how the images look use
+        # ref_image.save("ref_in.png")
+        # converted.save("ref_out.png")
+        palette = converted.getpalette()
+        assert len(palette) == 256 * 3
+        rhs = palette
+    else:
+        cg.add(var.set_buffer_color_mode(ILI9XXXColorMode.BITS_16))
+
+    if rhs is not None:
+        prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
+        cg.add(var.set_palette(prog_arr))
diff --git a/esphome/components/ili9xxx/ili9xxx_defines.h b/esphome/components/ili9xxx/ili9xxx_defines.h
new file mode 100644
index 0000000000..29483ee15e
--- /dev/null
+++ b/esphome/components/ili9xxx/ili9xxx_defines.h
@@ -0,0 +1,96 @@
+#pragma once
+
+namespace esphome {
+namespace ili9xxx {
+
+// Color definitions
+// clang-format off
+static const uint8_t MADCTL_MY    = 0x80;   ///< Bit 7 Bottom to top
+static const uint8_t MADCTL_MX    = 0x40;   ///< Bit 6 Right to left
+static const uint8_t MADCTL_MV    = 0x20;   ///< Bit 5 Reverse Mode
+static const uint8_t MADCTL_ML    = 0x10;   ///< Bit 4 LCD refresh Bottom to top
+static const uint8_t MADCTL_RGB   = 0x00;  ///< Bit 3 Red-Green-Blue pixel order
+static const uint8_t MADCTL_BGR   = 0x08;  ///< Bit 3 Blue-Green-Red pixel order
+static const uint8_t MADCTL_MH    = 0x04;   ///< Bit 2 LCD refresh right to left
+// clang-format on
+
+// All ILI9XXX specific commands some are used by init()
+static const uint8_t ILI9XXX_NOP = 0x00;
+static const uint8_t ILI9XXX_SWRESET = 0x01;
+static const uint8_t ILI9XXX_RDDID = 0x04;
+static const uint8_t ILI9XXX_RDDST = 0x09;
+
+static const uint8_t ILI9XXX_SLPIN = 0x10;
+static const uint8_t ILI9XXX_SLPOUT = 0x11;
+static const uint8_t ILI9XXX_PTLON = 0x12;
+static const uint8_t ILI9XXX_NORON = 0x13;
+
+static const uint8_t ILI9XXX_RDMODE = 0x0A;
+static const uint8_t ILI9XXX_RDMADCTL = 0x0B;
+static const uint8_t ILI9XXX_RDPIXFMT = 0x0C;
+static const uint8_t ILI9XXX_RDIMGFMT = 0x0D;
+static const uint8_t ILI9XXX_RDSELFDIAG = 0x0F;
+
+static const uint8_t ILI9XXX_INVOFF = 0x20;
+static const uint8_t ILI9XXX_INVON = 0x21;
+static const uint8_t ILI9XXX_GAMMASET = 0x26;
+static const uint8_t ILI9XXX_DISPOFF = 0x28;
+static const uint8_t ILI9XXX_DISPON = 0x29;
+
+static const uint8_t ILI9XXX_CASET = 0x2A;
+static const uint8_t ILI9XXX_PASET = 0x2B;
+static const uint8_t ILI9XXX_RAMWR = 0x2C;
+static const uint8_t ILI9XXX_RAMRD = 0x2E;
+
+static const uint8_t ILI9XXX_PTLAR = 0x30;
+static const uint8_t ILI9XXX_VSCRDEF = 0x33;
+static const uint8_t ILI9XXX_MADCTL = 0x36;
+static const uint8_t ILI9XXX_VSCRSADD = 0x37;
+static const uint8_t ILI9XXX_IDMOFF = 0x38;
+static const uint8_t ILI9XXX_IDMON = 0x39;
+static const uint8_t ILI9XXX_PIXFMT = 0x3A;
+static const uint8_t ILI9XXX_COLMOD = 0x3A;
+
+static const uint8_t ILI9XXX_GETSCANLINE = 0x45;
+
+static const uint8_t ILI9XXX_WRDISBV = 0x51;
+static const uint8_t ILI9XXX_RDDISBV = 0x52;
+static const uint8_t ILI9XXX_WRCTRLD = 0x53;
+
+static const uint8_t ILI9XXX_IFMODE = 0xB0;
+static const uint8_t ILI9XXX_FRMCTR1 = 0xB1;
+static const uint8_t ILI9XXX_FRMCTR2 = 0xB2;
+static const uint8_t ILI9XXX_FRMCTR3 = 0xB3;
+static const uint8_t ILI9XXX_INVCTR = 0xB4;
+static const uint8_t ILI9XXX_DFUNCTR = 0xB6;
+static const uint8_t ILI9XXX_ETMOD = 0xB7;
+
+static const uint8_t ILI9XXX_PWCTR1 = 0xC0;
+static const uint8_t ILI9XXX_PWCTR2 = 0xC1;
+static const uint8_t ILI9XXX_PWCTR3 = 0xC2;
+static const uint8_t ILI9XXX_PWCTR4 = 0xC3;
+static const uint8_t ILI9XXX_PWCTR5 = 0xC4;
+static const uint8_t ILI9XXX_VMCTR1 = 0xC5;
+static const uint8_t ILI9XXX_IFCTR = 0xC6;
+static const uint8_t ILI9XXX_VMCTR2 = 0xC7;
+static const uint8_t ILI9XXX_GMCTR = 0xC8;
+static const uint8_t ILI9XXX_SETEXTC = 0xC8;
+
+static const uint8_t ILI9XXX_PWSET = 0xD0;
+static const uint8_t ILI9XXX_VMCTR = 0xD1;
+static const uint8_t ILI9XXX_PWSETN = 0xD2;
+static const uint8_t ILI9XXX_RDID4 = 0xD3;
+static const uint8_t ILI9XXX_RDINDEX = 0xD9;
+static const uint8_t ILI9XXX_RDID1 = 0xDA;
+static const uint8_t ILI9XXX_RDID2 = 0xDB;
+static const uint8_t ILI9XXX_RDID3 = 0xDC;
+static const uint8_t ILI9XXX_RDIDX = 0xDD;  // TBC
+
+static const uint8_t ILI9XXX_GMCTRP1 = 0xE0;
+static const uint8_t ILI9XXX_GMCTRN1 = 0xE1;
+
+static const uint8_t ILI9XXX_CSCON = 0xF0;
+static const uint8_t ILI9XXX_ADJCTL3 = 0xF7;
+
+}  // namespace ili9xxx
+}  // namespace esphome
diff --git a/esphome/components/ili9xxx/ili9xxx_display.cpp b/esphome/components/ili9xxx/ili9xxx_display.cpp
new file mode 100644
index 0000000000..0091a2aabc
--- /dev/null
+++ b/esphome/components/ili9xxx/ili9xxx_display.cpp
@@ -0,0 +1,416 @@
+#include "ili9xxx_display.h"
+#include "esphome/core/log.h"
+#include "esphome/core/application.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/hal.h"
+
+namespace esphome {
+namespace ili9xxx {
+
+static const char *const TAG = "ili9xxx";
+
+void ILI9XXXDisplay::setup() {
+  this->setup_pins_();
+  this->initialize();
+
+  this->x_low_ = this->width_;
+  this->y_low_ = this->height_;
+  this->x_high_ = 0;
+  this->y_high_ = 0;
+  if (this->buffer_color_mode_ == BITS_16) {
+    this->init_internal_(this->get_buffer_length_() * 2);
+    if (this->buffer_ != nullptr) {
+      return;
+    }
+    this->buffer_color_mode_ = BITS_8;
+  }
+  this->init_internal_(this->get_buffer_length_());
+  if (this->buffer_ == nullptr) {
+    this->mark_failed();
+  }
+}
+
+void ILI9XXXDisplay::setup_pins_() {
+  this->dc_pin_->setup();  // OUTPUT
+  this->dc_pin_->digital_write(false);
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->setup();  // OUTPUT
+    this->reset_pin_->digital_write(true);
+  }
+
+  this->spi_setup();
+
+  this->reset_();
+}
+
+void ILI9XXXDisplay::dump_config() {
+  LOG_DISPLAY("", "ili9xxx", this);
+  switch (this->buffer_color_mode_) {
+    case BITS_8_INDEXED:
+      ESP_LOGCONFIG(TAG, "  Color mode: 8bit Indexed");
+      break;
+    case BITS_16:
+      ESP_LOGCONFIG(TAG, "  Color mode: 16bit");
+      break;
+    default:
+      ESP_LOGCONFIG(TAG, "  Color mode: 8bit 332 mode");
+      break;
+  }
+  if (this->is_18bitdisplay_) {
+    ESP_LOGCONFIG(TAG, "  18-Bit Mode: YES");
+  }
+
+  LOG_PIN("  Reset Pin: ", this->reset_pin_);
+  LOG_PIN("  DC Pin: ", this->dc_pin_);
+  LOG_PIN("  Busy Pin: ", this->busy_pin_);
+
+  if (this->is_failed()) {
+    ESP_LOGCONFIG(TAG, "  => Failed to init Memory: YES!");
+  }
+  LOG_UPDATE_INTERVAL(this);
+}
+
+float ILI9XXXDisplay::get_setup_priority() const { return setup_priority::HARDWARE; }
+
+void ILI9XXXDisplay::fill(Color color) {
+  uint16_t new_color = 0;
+  this->x_low_ = 0;
+  this->y_low_ = 0;
+  this->x_high_ = this->get_width_internal() - 1;
+  this->y_high_ = this->get_height_internal() - 1;
+  switch (this->buffer_color_mode_) {
+    case BITS_8_INDEXED:
+      new_color = display::ColorUtil::color_to_index8_palette888(color, this->palette_);
+      break;
+    case BITS_16:
+      new_color = display::ColorUtil::color_to_565(color);
+      for (uint32_t i = 0; i < this->get_buffer_length_() * 2; i = i + 2) {
+        this->buffer_[i] = (uint8_t)(new_color >> 8);
+        this->buffer_[i + 1] = (uint8_t) new_color;
+      }
+      return;
+      break;
+    default:
+      new_color = display::ColorUtil::color_to_332(color, display::ColorOrder::COLOR_ORDER_RGB);
+      break;
+  }
+  memset(this->buffer_, (uint8_t) new_color, this->get_buffer_length_());
+}
+
+void HOT ILI9XXXDisplay::draw_absolute_pixel_internal(int x, int y, Color color) {
+  if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0) {
+    return;
+  }
+  uint32_t pos = (y * width_) + x;
+  uint16_t new_color;
+  bool updated = false;
+  switch (this->buffer_color_mode_) {
+    case BITS_8_INDEXED:
+      new_color = display::ColorUtil::color_to_index8_palette888(color, this->palette_);
+      break;
+    case BITS_16:
+      pos = pos * 2;
+      new_color = display::ColorUtil::color_to_565(color, display::ColorOrder::COLOR_ORDER_RGB);
+      if (this->buffer_[pos] != (uint8_t)(new_color >> 8)) {
+        this->buffer_[pos] = (uint8_t)(new_color >> 8);
+        updated = true;
+      }
+      pos = pos + 1;
+      new_color = new_color & 0xFF;
+      break;
+    default:
+      new_color = display::ColorUtil::color_to_332(color, display::ColorOrder::COLOR_ORDER_RGB);
+      break;
+  }
+
+  if (this->buffer_[pos] != new_color) {
+    this->buffer_[pos] = new_color;
+    updated = true;
+  }
+  if (updated) {
+    // low and high watermark may speed up drawing from buffer
+    this->x_low_ = (x < this->x_low_) ? x : this->x_low_;
+    this->y_low_ = (y < this->y_low_) ? y : this->y_low_;
+    this->x_high_ = (x > this->x_high_) ? x : this->x_high_;
+    this->y_high_ = (y > this->y_high_) ? y : this->y_high_;
+    // ESP_LOGVV(TAG, "=>>> pixel (x:%d, y:%d) (xl:%d, xh:%d, yl:%d, yh:%d", x, y, this->x_low_, this->x_high_,
+    //           this->y_low_, this->y_high_);
+  }
+}
+
+void ILI9XXXDisplay::update() {
+  if (this->prossing_update_) {
+    this->need_update_ = true;
+    return;
+  }
+  do {
+    this->prossing_update_ = true;
+    this->need_update_ = false;
+    if (!this->need_update_) {
+      this->do_update_();
+    }
+  } while (this->need_update_);
+  this->prossing_update_ = false;
+  this->display_();
+}
+
+void ILI9XXXDisplay::display_() {
+  // we will only update the changed window to the display
+  uint16_t w = this->x_high_ - this->x_low_ + 1;  // NOLINT
+  uint16_t h = this->y_high_ - this->y_low_ + 1;  // NOLINT
+  uint32_t start_pos = ((this->y_low_ * this->width_) + x_low_);
+
+  // check if something was displayed
+  if ((this->x_high_ < this->x_low_) || (this->y_high_ < this->y_low_)) {
+    ESP_LOGV(TAG, "Nothing to display");
+    return;
+  }
+
+  set_addr_window_(this->x_low_, this->y_low_, w, h);
+
+  ESP_LOGV(TAG,
+           "Start display(xlow:%d, ylow:%d, xhigh:%d, yhigh:%d, width:%d, "
+           "heigth:%d, start_pos:%d)",
+           this->x_low_, this->y_low_, this->x_high_, this->y_high_, w, h, start_pos);
+
+  this->start_data_();
+  for (uint16_t row = 0; row < h; row++) {
+    uint32_t pos = start_pos + (row * width_);
+    uint32_t rem = w;
+
+    while (rem > 0) {
+      uint32_t sz = std::min(rem, ILI9XXX_TRANSFER_BUFFER_SIZE);
+      // ESP_LOGVV(TAG, "Send to display(pos:%d, rem:%d, zs:%d)", pos, rem, sz);
+      buffer_to_transfer_(pos, sz);
+      if (this->is_18bitdisplay_) {
+        for (uint32_t i = 0; i < sz; ++i) {
+          uint16_t color_val = transfer_buffer_[i];
+
+          uint8_t red = color_val & 0x1F;
+          uint8_t green = (color_val & 0x7E0) >> 5;
+          uint8_t blue = (color_val & 0xF800) >> 11;
+
+          uint8_t pass_buff[3];
+
+          pass_buff[2] = (uint8_t)((red / 32.0) * 64) << 2;
+          pass_buff[1] = (uint8_t) green << 2;
+          pass_buff[0] = (uint8_t)((blue / 32.0) * 64) << 2;
+
+          this->write_array(pass_buff, sizeof(pass_buff));
+        }
+      } else {
+        this->write_array16(transfer_buffer_, sz);
+      }
+      pos += sz;
+      rem -= sz;
+    }
+    App.feed_wdt();
+  }
+  this->end_data_();
+
+  // invalidate watermarks
+  this->x_low_ = this->width_;
+  this->y_low_ = this->height_;
+  this->x_high_ = 0;
+  this->y_high_ = 0;
+}
+
+uint32_t ILI9XXXDisplay::buffer_to_transfer_(uint32_t pos, uint32_t sz) {
+  for (uint32_t i = 0; i < sz; ++i) {
+    switch (this->buffer_color_mode_) {
+      case BITS_8_INDEXED:
+        transfer_buffer_[i] = display::ColorUtil::color_to_565(
+            display::ColorUtil::index8_to_color_palette888(this->buffer_[pos + i], this->palette_));
+        break;
+      case BITS_16:
+        transfer_buffer_[i] = ((uint16_t) this->buffer_[(pos + i) * 2] << 8) | this->buffer_[((pos + i) * 2) + 1];
+        continue;
+        break;
+      default:
+        transfer_buffer_[i] =
+            display::ColorUtil::color_to_565(display::ColorUtil::rgb332_to_color(this->buffer_[pos + i]));
+        break;
+    }
+  }
+  return sz;
+}
+
+// should return the total size: return this->get_width_internal() * this->get_height_internal() * 2 // 16bit color
+// values per bit is huge
+uint32_t ILI9XXXDisplay::get_buffer_length_() { return this->get_width_internal() * this->get_height_internal(); }
+
+void ILI9XXXDisplay::command(uint8_t value) {
+  this->start_command_();
+  this->write_byte(value);
+  this->end_command_();
+}
+
+void ILI9XXXDisplay::data(uint8_t value) {
+  this->start_data_();
+  this->write_byte(value);
+  this->end_data_();
+}
+
+void ILI9XXXDisplay::send_command(uint8_t command_byte, const uint8_t *data_bytes, uint8_t num_data_bytes) {
+  this->command(command_byte);  // Send the command byte
+  this->start_data_();
+  this->write_array(data_bytes, num_data_bytes);
+  this->end_data_();
+}
+
+uint8_t ILI9XXXDisplay::read_command(uint8_t command_byte, uint8_t index) {
+  uint8_t data = 0x10 + index;
+  this->send_command(0xD9, &data, 1);  // Set Index Register
+  uint8_t result;
+  this->start_command_();
+  this->write_byte(command_byte);
+  this->start_data_();
+  do {
+    result = this->read_byte();
+  } while (index--);
+  this->end_data_();
+  return result;
+}
+
+void ILI9XXXDisplay::start_command_() {
+  this->dc_pin_->digital_write(false);
+  this->enable();
+}
+void ILI9XXXDisplay::start_data_() {
+  this->dc_pin_->digital_write(true);
+  this->enable();
+}
+
+void ILI9XXXDisplay::end_command_() { this->disable(); }
+void ILI9XXXDisplay::end_data_() { this->disable(); }
+
+void ILI9XXXDisplay::reset_() {
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->digital_write(false);
+    delay(10);
+    this->reset_pin_->digital_write(true);
+    delay(10);
+  }
+}
+
+void ILI9XXXDisplay::init_lcd_(const uint8_t *init_cmd) {
+  uint8_t cmd, x, num_args;
+  const uint8_t *addr = init_cmd;
+  while ((cmd = progmem_read_byte(addr++)) > 0) {
+    x = progmem_read_byte(addr++);
+    num_args = x & 0x7F;
+    send_command(cmd, addr, num_args);
+    addr += num_args;
+    if (x & 0x80)
+      delay(150);  // NOLINT
+  }
+}
+
+void ILI9XXXDisplay::set_addr_window_(uint16_t x1, uint16_t y1, uint16_t w, uint16_t h) {
+  uint16_t x2 = (x1 + w - 1), y2 = (y1 + h - 1);
+  this->command(ILI9XXX_CASET);  // Column address set
+  this->start_data_();
+  this->write_byte(x1 >> 8);
+  this->write_byte(x1);
+  this->write_byte(x2 >> 8);
+  this->write_byte(x2);
+  this->end_data_();
+  this->command(ILI9XXX_PASET);  // Row address set
+  this->start_data_();
+  this->write_byte(y1 >> 8);
+  this->write_byte(y1);
+  this->write_byte(y2 >> 8);
+  this->write_byte(y2);
+  this->end_data_();
+  this->command(ILI9XXX_RAMWR);  // Write to RAM
+}
+
+void ILI9XXXDisplay::invert_display_(bool invert) { this->command(invert ? ILI9XXX_INVON : ILI9XXX_INVOFF); }
+
+int ILI9XXXDisplay::get_width_internal() { return this->width_; }
+int ILI9XXXDisplay::get_height_internal() { return this->height_; }
+
+//   M5Stack display
+void ILI9XXXM5Stack::initialize() {
+  this->init_lcd_(INITCMD_M5STACK);
+  if (this->width_ == 0)
+    this->width_ = 320;
+  if (this->height_ == 0)
+    this->height_ = 240;
+  this->invert_display_(true);
+}
+
+//   M5CORE display // Based on the configuration settings of M5stact's M5GFX code.
+void ILI9XXXM5CORE::initialize() {
+  this->init_lcd_(INITCMD_M5CORE);
+  if (this->width_ == 0)
+    this->width_ = 320;
+  if (this->height_ == 0)
+    this->height_ = 240;
+  this->invert_display_(true);
+}
+
+//   24_TFT display
+void ILI9XXXILI9341::initialize() {
+  this->init_lcd_(INITCMD_ILI9341);
+  if (this->width_ == 0)
+    this->width_ = 240;
+  if (this->height_ == 0)
+    this->height_ = 320;
+}
+//   24_TFT rotated display
+void ILI9XXXILI9342::initialize() {
+  this->init_lcd_(INITCMD_ILI9341);
+  if (this->width_ == 0) {
+    this->width_ = 320;
+  }
+  if (this->height_ == 0) {
+    this->height_ = 240;
+  }
+}
+
+//   35_TFT display
+void ILI9XXXILI9481::initialize() {
+  this->init_lcd_(INITCMD_ILI9481);
+  if (this->width_ == 0) {
+    this->width_ = 480;
+  }
+  if (this->height_ == 0) {
+    this->height_ = 320;
+  }
+}
+
+//   35_TFT display
+void ILI9XXXILI9486::initialize() {
+  this->init_lcd_(INITCMD_ILI9486);
+  if (this->width_ == 0) {
+    this->width_ = 480;
+  }
+  if (this->height_ == 0) {
+    this->height_ = 320;
+  }
+}
+//    40_TFT display
+void ILI9XXXILI9488::initialize() {
+  this->init_lcd_(INITCMD_ILI9488);
+  if (this->width_ == 0) {
+    this->width_ = 480;
+  }
+  if (this->height_ == 0) {
+    this->height_ = 320;
+  }
+  this->is_18bitdisplay_ = true;
+}
+//    40_TFT display
+void ILI9XXXST7796::initialize() {
+  this->init_lcd_(INITCMD_ST7796);
+  if (this->width_ == 0) {
+    this->width_ = 320;
+  }
+  if (this->height_ == 0) {
+    this->height_ = 480;
+  }
+}
+
+}  // namespace ili9xxx
+}  // namespace esphome
diff --git a/esphome/components/ili9341/ili9341_display.h b/esphome/components/ili9xxx/ili9xxx_display.h
similarity index 51%
rename from esphome/components/ili9341/ili9341_display.h
rename to esphome/components/ili9xxx/ili9xxx_display.h
index 547c608ae8..8a8cd4bb44 100644
--- a/esphome/components/ili9341/ili9341_display.h
+++ b/esphome/components/ili9xxx/ili9xxx_display.h
@@ -1,27 +1,21 @@
 #pragma once
-
-#include "esphome/core/component.h"
 #include "esphome/components/spi/spi.h"
 #include "esphome/components/display/display_buffer.h"
-#include "ili9341_defines.h"
-#include "ili9341_init.h"
-#include "esphome/core/log.h"
+#include "ili9xxx_defines.h"
+#include "ili9xxx_init.h"
 
 namespace esphome {
-namespace ili9341 {
+namespace ili9xxx {
 
-enum ILI9341Model {
-  M5STACK = 0,
-  TFT_24,
-  TFT_24R,
+const uint32_t ILI9XXX_TRANSFER_BUFFER_SIZE = 64;
+
+enum ILI9XXXColorMode {
+  BITS_8 = 0x08,
+  BITS_8_INDEXED = 0x09,
+  BITS_16 = 0x10,
 };
 
-enum ILI9341ColorMode {
-  BITS_8,
-  BITS_8_INDEXED,
-};
-
-class ILI9341Display : public PollingComponent,
+class ILI9XXXDisplay : public PollingComponent,
                        public display::DisplayBuffer,
                        public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
                                              spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_40MHZ> {
@@ -29,59 +23,46 @@ class ILI9341Display : public PollingComponent,
   void set_dc_pin(GPIOPin *dc_pin) { dc_pin_ = dc_pin; }
   float get_setup_priority() const override;
   void set_reset_pin(GPIOPin *reset) { this->reset_pin_ = reset; }
-  void set_led_pin(GPIOPin *led) { this->led_pin_ = led; }
-  void set_model(ILI9341Model model) { this->model_ = model; }
   void set_palette(const uint8_t *palette) { this->palette_ = palette; }
-  void set_buffer_color_mode(ILI9341ColorMode color_mode) { this->buffer_color_mode_ = color_mode; }
-
+  void set_buffer_color_mode(ILI9XXXColorMode color_mode) { this->buffer_color_mode_ = color_mode; }
+  void set_dimentions(int16_t width, int16_t height) {
+    this->height_ = height;
+    this->width_ = width;
+  }
   void command(uint8_t value);
   void data(uint8_t value);
   void send_command(uint8_t command_byte, const uint8_t *data_bytes, uint8_t num_data_bytes);
   uint8_t read_command(uint8_t command_byte, uint8_t index);
-  virtual void initialize() = 0;
 
   void update() override;
 
   void fill(Color color) override;
 
   void dump_config() override;
-  void setup() override {
-    this->setup_pins_();
-    this->initialize();
-
-    this->x_low_ = this->width_;
-    this->y_low_ = this->height_;
-    this->x_high_ = 0;
-    this->y_high_ = 0;
-
-    this->init_internal_(this->get_buffer_length_());
-    this->fill_internal_(0x00);
-  }
+  void setup() override;
 
   display::DisplayType get_display_type() override { return display::DisplayType::DISPLAY_TYPE_COLOR; }
 
  protected:
   void draw_absolute_pixel_internal(int x, int y, Color color) override;
   void setup_pins_();
+  virtual void initialize() = 0;
 
+  void display_();
   void init_lcd_(const uint8_t *init_cmd);
   void set_addr_window_(uint16_t x, uint16_t y, uint16_t w, uint16_t h);
   void invert_display_(bool invert);
   void reset_();
-  void fill_internal_(uint8_t color);
-  void display_();
-  void rotate_my_(uint8_t m);
 
-  ILI9341Model model_;
-  int16_t width_{320};   ///< Display width as modified by current rotation
-  int16_t height_{240};  ///< Display height as modified by current rotation
+  int16_t width_{0};   ///< Display width as modified by current rotation
+  int16_t height_{0};  ///< Display height as modified by current rotation
   uint16_t x_low_{0};
   uint16_t y_low_{0};
   uint16_t x_high_{0};
   uint16_t y_high_{0};
   const uint8_t *palette_;
 
-  ILI9341ColorMode buffer_color_mode_{BITS_8};
+  ILI9XXXColorMode buffer_color_mode_{BITS_16};
 
   uint32_t get_buffer_length_();
   int get_width_internal() override;
@@ -92,33 +73,66 @@ class ILI9341Display : public PollingComponent,
   void start_data_();
   void end_data_();
 
-  uint8_t transfer_buffer_[64];
+  uint16_t transfer_buffer_[ILI9XXX_TRANSFER_BUFFER_SIZE];
 
   uint32_t buffer_to_transfer_(uint32_t pos, uint32_t sz);
 
   GPIOPin *reset_pin_{nullptr};
-  GPIOPin *led_pin_{nullptr};
-  GPIOPin *dc_pin_;
+  GPIOPin *dc_pin_{nullptr};
   GPIOPin *busy_pin_{nullptr};
+
+  bool prossing_update_ = false;
+  bool need_update_ = false;
+  bool is_18bitdisplay_ = false;
 };
 
 //-----------   M5Stack display --------------
-class ILI9341M5Stack : public ILI9341Display {
- public:
+class ILI9XXXM5Stack : public ILI9XXXDisplay {
+ protected:
   void initialize() override;
 };
 
-//-----------   ILI9341_24_TFT display --------------
-class ILI9341TFT24 : public ILI9341Display {
- public:
+//-----------   M5Stack display --------------
+class ILI9XXXM5CORE : public ILI9XXXDisplay {
+ protected:
   void initialize() override;
 };
 
-//-----------   ILI9341_24_TFT rotated display --------------
-class ILI9341TFT24R : public ILI9341Display {
- public:
+//-----------   ILI9XXX_24_TFT display --------------
+class ILI9XXXILI9341 : public ILI9XXXDisplay {
+ protected:
   void initialize() override;
 };
 
-}  // namespace ili9341
+//-----------   ILI9XXX_24_TFT rotated display --------------
+class ILI9XXXILI9342 : public ILI9XXXDisplay {
+ protected:
+  void initialize() override;
+};
+
+//-----------   ILI9XXX_??_TFT rotated display --------------
+class ILI9XXXILI9481 : public ILI9XXXDisplay {
+ protected:
+  void initialize() override;
+};
+
+//-----------   ILI9XXX_35_TFT rotated display --------------
+class ILI9XXXILI9486 : public ILI9XXXDisplay {
+ protected:
+  void initialize() override;
+};
+
+//-----------   ILI9XXX_35_TFT rotated display --------------
+class ILI9XXXILI9488 : public ILI9XXXDisplay {
+ protected:
+  void initialize() override;
+};
+
+//-----------   ILI9XXX_35_TFT rotated display --------------
+class ILI9XXXST7796 : public ILI9XXXDisplay {
+ protected:
+  void initialize() override;
+};
+
+}  // namespace ili9xxx
 }  // namespace esphome
diff --git a/esphome/components/ili9xxx/ili9xxx_init.h b/esphome/components/ili9xxx/ili9xxx_init.h
new file mode 100644
index 0000000000..e8d3614a1d
--- /dev/null
+++ b/esphome/components/ili9xxx/ili9xxx_init.h
@@ -0,0 +1,174 @@
+#pragma once
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace ili9xxx {
+
+// clang-format off
+static const uint8_t PROGMEM INITCMD_M5STACK[] = {
+  0xEF, 3, 0x03, 0x80, 0x02,
+  0xCF, 3, 0x00, 0xC1, 0x30,
+  0xED, 4, 0x64, 0x03, 0x12, 0x81,
+  0xE8, 3, 0x85, 0x00, 0x78,
+  0xCB, 5, 0x39, 0x2C, 0x00, 0x34, 0x02,
+  0xF7, 1, 0x20,
+  0xEA, 2, 0x00, 0x00,
+  ILI9XXX_PWCTR1  , 1, 0x23,             // Power control VRH[5:0]
+  ILI9XXX_PWCTR2  , 1, 0x10,             // Power control SAP[2:0];BT[3:0]
+  ILI9XXX_VMCTR1  , 2, 0x3e, 0x28,       // VCM control
+  ILI9XXX_VMCTR2  , 1, 0x86,             // VCM control2
+  ILI9XXX_MADCTL  , 1, MADCTL_BGR,       // Memory Access Control
+  ILI9XXX_VSCRSADD, 1, 0x00,             // Vertical scroll zero
+  ILI9XXX_PIXFMT  , 1, 0x55,
+  ILI9XXX_FRMCTR1 , 2, 0x00, 0x13,
+  ILI9XXX_DFUNCTR , 3, 0x08, 0x82, 0x27, // Display Function Control
+  0xF2, 1, 0x00,                         // 3Gamma Function Disable
+  ILI9XXX_GAMMASET , 1, 0x01,             // Gamma curve selected
+  ILI9XXX_GMCTRP1 , 15, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, // Set Gamma
+                        0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03,
+                        0x0E, 0x09, 0x00,
+  ILI9XXX_GMCTRN1 , 15, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, // Set Gamma
+                        0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C,
+                        0x31, 0x36, 0x0F,
+  ILI9XXX_SLPOUT  , 0x80,                // Exit Sleep
+  ILI9XXX_DISPON  , 0x80,                // Display on
+  0x00                                   // End of list
+};
+
+static const uint8_t PROGMEM INITCMD_M5CORE[] = {
+  ILI9XXX_SETEXTC, 3, 0xFF,0x93,0x42,   // Turn on the external command
+  ILI9XXX_PWCTR1 , 2, 0x12, 0x12,
+  ILI9XXX_PWCTR2 , 1, 0x03,
+  ILI9XXX_VMCTR1 , 1, 0xF2,
+  ILI9XXX_IFMODE , 1, 0xE0,
+  0xF6           , 3, 0x01, 0x00, 0x00,
+  ILI9XXX_GMCTRP1,15, 0x00,0x0C,0x11,0x04,0x11,0x08,0x37,0x89,0x4C,0x06,0x0C,0x0A,0x2E,0x34,0x0F,
+  ILI9XXX_GMCTRN1,15, 0x00,0x0B,0x11,0x05,0x13,0x09,0x33,0x67,0x48,0x07,0x0E,0x0B,0x2E,0x33,0x0F,
+  ILI9XXX_DFUNCTR, 4, 0x08,0x82,0x1D,0x04,
+  ILI9XXX_IDMOFF , 0,
+  ILI9XXX_DISPON , 0x80,                // Display on
+  ILI9XXX_SLPOUT , 0x80,                // Exit Sleep
+
+  0x00                                   // End of list
+};
+
+
+
+static const uint8_t PROGMEM INITCMD_ILI9341[] = {
+  0xEF, 3, 0x03, 0x80, 0x02,
+  0xCF, 3, 0x00, 0xC1, 0x30,
+  0xED, 4, 0x64, 0x03, 0x12, 0x81,
+  0xE8, 3, 0x85, 0x00, 0x78,
+  0xCB, 5, 0x39, 0x2C, 0x00, 0x34, 0x02,
+  0xF7, 1, 0x20,
+  0xEA, 2, 0x00, 0x00,
+  ILI9XXX_PWCTR1  , 1, 0x23,             // Power control VRH[5:0]
+  ILI9XXX_PWCTR2  , 1, 0x10,             // Power control SAP[2:0];BT[3:0]
+  ILI9XXX_VMCTR1  , 2, 0x3e, 0x28,       // VCM control
+  ILI9XXX_VMCTR2  , 1, 0x86,             // VCM control2
+  ILI9XXX_MADCTL  , 1, 0x48,             // Memory Access Control
+  ILI9XXX_VSCRSADD, 1, 0x00,             // Vertical scroll zero
+  ILI9XXX_PIXFMT  , 1, 0x55,
+  ILI9XXX_FRMCTR1 , 2, 0x00, 0x18,
+  ILI9XXX_DFUNCTR , 3, 0x08, 0x82, 0x27, // Display Function Control
+  0xF2, 1, 0x00,                         // 3Gamma Function Disable
+  ILI9XXX_GAMMASET , 1, 0x01,             // Gamma curve selected
+  ILI9XXX_GMCTRP1 , 15, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, // Set Gamma
+                        0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03,
+                        0x0E, 0x09, 0x00,
+  ILI9XXX_GMCTRN1 , 15, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, // Set Gamma
+                        0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C,
+                        0x31, 0x36, 0x0F,
+  ILI9XXX_SLPOUT  , 0x80,                // Exit Sleep
+  ILI9XXX_DISPON  , 0x80,                // Display on
+  0x00                                   // End of list
+};
+
+static const uint8_t PROGMEM INITCMD_ILI9481[] = {
+  ILI9XXX_SLPOUT ,  0x80,    // Exit sleep mode
+  ILI9XXX_PWSET  , 3, 0x07, 0x41, 0x1D,
+  ILI9XXX_VMCTR  , 3, 0x00, 0x1C, 0x1F,
+  ILI9XXX_PWSETN , 2, 0x01, 0x11,
+  ILI9XXX_PWCTR1 , 5, 0x10, 0x3B, 0x00, 0x02, 0x11,
+  ILI9XXX_VMCTR1 , 1, 0x03,
+  ILI9XXX_IFCTR  , 1, 0x83,
+  ILI9XXX_GMCTR  ,12, 0x00, 0x26, 0x21, 0x00, 0x00, 0x1F, 0x65, 0x23, 0x77, 0x00, 0x0F, 0x00,
+  ILI9XXX_IFMODE , 1, 0x00,  // CommandAccessProtect
+  0xE4        , 1, 0xA0,
+  ILI9XXX_CSCON , 1, 0x01,
+  ILI9XXX_DISPON, 0x80,     // Set display on
+  0x00 // end
+};
+
+static const uint8_t PROGMEM INITCMD_ILI9486[] = {
+  ILI9XXX_SLPOUT, 0x80,
+  ILI9XXX_PIXFMT, 1, 0x55,
+  ILI9XXX_PWCTR3, 1, 0x44,
+  ILI9XXX_VMCTR1, 4, 0x00, 0x00, 0x00, 0x00,
+  ILI9XXX_GMCTRP1, 15, 0x0f,0x1f,0x1c,0x0c,0x0f,0x08,0x48,0x98,0x37,0x0a,0x13,0x04,0x11,0x0d,0x00,
+  ILI9XXX_GMCTRN1, 15, 0x0f,0x32,0x2e,0x0b,0x0d,0x05,0x47,0x75,0x37,0x06,0x10,0x03,0x24,0x20,0x00,
+  ILI9XXX_INVOFF, 0x80,
+  ILI9XXX_MADCTL, 1, 0x48,
+  ILI9XXX_DISPON, 0x80,
+
+  // ILI9XXX_MADCTL, 1, MADCTL_BGR | MADCTL_MV, //hardware rotation
+  0x00                                   // End of list
+};
+
+static const uint8_t PROGMEM INITCMD_ILI9488[] = {
+  ILI9XXX_GMCTRP1,15, 0x00, 0x03, 0x09, 0x08, 0x16, 0x0A, 0x3F, 0x78, 0x4C, 0x09, 0x0A, 0x08, 0x16, 0x1A, 0x0F,
+  ILI9XXX_GMCTRN1,15, 0x00, 0x16, 0x19, 0x03, 0x0F, 0x05, 0x32, 0x45, 0x46, 0x04, 0x0E, 0x0D, 0x35, 0x37, 0x0F,
+
+  ILI9XXX_PWCTR1,  2, 0x17, 0x15,  // VRH1 VRH2
+  ILI9XXX_PWCTR2,  1, 0x41,  // VGH, VGL
+  ILI9XXX_VMCTR1,  3, 0x00, 0x12, 0x80,    // nVM VCM_REG VCM_REG_EN
+
+  ILI9XXX_IFMODE,  1, 0x00,
+  ILI9XXX_FRMCTR1, 1, 0xA0,  // Frame rate = 60Hz
+  ILI9XXX_INVCTR,  1, 0x02,  // Display Inversion Control = 2dot
+
+  ILI9XXX_DFUNCTR, 2, 0x02, 0x02, // Nomal scan
+
+  0xE9, 1, 0x00,   // Set Image Functio. Disable 24 bit data
+
+  ILI9XXX_ADJCTL3, 4, 0xA9, 0x51, 0x2C, 0x82,  // Adjust Control 3
+
+  ILI9XXX_MADCTL,  1, 0x28,
+  //ILI9XXX_PIXFMT,  1, 0x55,  // Interface Pixel Format = 16bit
+  ILI9XXX_PIXFMT, 1, 0x66,   //ILI9488 only supports 18-bit pixel format in 4/3 wire SPI mode
+
+
+
+  // 5 frames
+  //ILI9XXX_ETMOD,   1, 0xC6,  //
+
+
+  ILI9XXX_SLPOUT,  0x80,    // Exit sleep mode
+  //ILI9XXX_INVON  , 0,
+  ILI9XXX_DISPON,  0x80,    // Set display on
+  0x00 // end
+};
+
+static const uint8_t PROGMEM INITCMD_ST7796[] = {
+  // This ST7796S initilization routine was copied from https://github.com/prenticedavid/Adafruit_ST7796S_kbv/blob/master/Adafruit_ST7796S_kbv.cpp
+  ILI9XXX_SWRESET, 0x80,         // Soft reset, then delay 150 ms
+  ILI9XXX_CSCON, 1, 0xC3,              // ?? Unlock Manufacturer
+  ILI9XXX_CSCON, 1, 0x96,
+  ILI9XXX_VMCTR1, 1, 0x1C,              //VCOM  Control 1 [1C]
+  ILI9XXX_MADCTL, 1, 0x48,              //Memory Access [00]
+  ILI9XXX_PIXFMT, 1, 0x55,              //565
+  ILI9XXX_IFMODE, 1, 0x80,              //Interface     [00]
+  ILI9XXX_INVCTR, 1, 0x01,              //Inversion Control [01]
+  ILI9XXX_DFUNCTR, 3, 0x80, 0x02, 0x3B,  // Display Function Control [80 02 3B] .kbv SS=1, NL=480
+  ILI9XXX_ETMOD, 1, 0xC6,              //Entry Mode      [06]
+
+  ILI9XXX_CSCON, 1, 0x69,              //?? lock manufacturer commands
+  ILI9XXX_CSCON, 1, 0x3C,              //
+  ILI9XXX_SLPOUT, 0x80, // Exit Sleep, then delay 150 ms
+  ILI9XXX_DISPON, 0x80, // Main screen turn on, delay 150 ms
+  0x00                                   // End of list
+};
+
+// clang-format on
+}  // namespace ili9xxx
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index b599eb2666..21cdb6bc6f 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -2693,24 +2693,18 @@ display:
     row_start: 0
     lambda: |-
       it.rectangle(0, 0, it.get_width(), it.get_height());
-  - platform: ili9341
+  - platform: ili9xxx
     model: TFT 2.4
     cs_pin: GPIO5
     dc_pin: GPIO4
     reset_pin: GPIO22
-    led_pin:
-      number: GPIO15
-      inverted: true
     lambda: |-
       it.rectangle(0, 0, it.get_width(), it.get_height());
-  - platform: ili9341
+  - platform: ili9xxx
     model: TFT 2.4
     cs_pin: GPIO5
     dc_pin: GPIO4
     reset_pin: GPIO22
-    led_pin:
-      number: GPIO15
-      inverted: true
     auto_clear_enabled: false
     rotation: 90
     lambda: |-

From a4f21db272e24c14d6f6a22a609042df0e91c740 Mon Sep 17 00:00:00 2001
From: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Date: Thu, 9 Mar 2023 01:03:33 +0100
Subject: [PATCH 668/838] Drop broken logging macros (#4534)

---
 esphome/core/log.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/esphome/core/log.h b/esphome/core/log.h
index b1b1cf9115..bef5e5c633 100644
--- a/esphome/core/log.h
+++ b/esphome/core/log.h
@@ -144,19 +144,12 @@ int esp_idf_log_vprintf_(const char *format, va_list args);  // NOLINT
 #endif
 
 #define ESP_LOGE(tag, ...) esph_log_e(tag, __VA_ARGS__)
-#define LOG_E(tag, ...) ESP_LOGE(tag, __VA__ARGS__)
 #define ESP_LOGW(tag, ...) esph_log_w(tag, __VA_ARGS__)
-#define LOG_W(tag, ...) ESP_LOGW(tag, __VA__ARGS__)
 #define ESP_LOGI(tag, ...) esph_log_i(tag, __VA_ARGS__)
-#define LOG_I(tag, ...) ESP_LOGI(tag, __VA__ARGS__)
 #define ESP_LOGD(tag, ...) esph_log_d(tag, __VA_ARGS__)
-#define LOG_D(tag, ...) ESP_LOGD(tag, __VA__ARGS__)
 #define ESP_LOGCONFIG(tag, ...) esph_log_config(tag, __VA_ARGS__)
-#define LOG_CONFIG(tag, ...) ESP_LOGCONFIG(tag, __VA__ARGS__)
 #define ESP_LOGV(tag, ...) esph_log_v(tag, __VA_ARGS__)
-#define LOG_V(tag, ...) ESP_LOGV(tag, __VA__ARGS__)
 #define ESP_LOGVV(tag, ...) esph_log_vv(tag, __VA_ARGS__)
-#define LOG_VV(tag, ...) ESP_LOGVV(tag, __VA__ARGS__)
 
 #define BYTE_TO_BINARY_PATTERN "%c%c%c%c%c%c%c%c"
 #define BYTE_TO_BINARY(byte) \

From 7c91b4474ab3d31c7fcff125a4250fa7b81d30ce Mon Sep 17 00:00:00 2001
From: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Date: Thu, 9 Mar 2023 01:14:34 +0100
Subject: [PATCH 669/838] Revert storing Font glyphs in manually-allocated
 memory (#4516)

This partially reverts commit 62459a8ae1d9a2182772d55ddf7d6ad983277f2e.
---
 esphome/components/display/display_buffer.cpp | 19 ++++++-------------
 esphome/components/display/display_buffer.h   |  6 ++----
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/esphome/components/display/display_buffer.cpp b/esphome/components/display/display_buffer.cpp
index 85ebd2567b..420801f863 100644
--- a/esphome/components/display/display_buffer.cpp
+++ b/esphome/components/display/display_buffer.cpp
@@ -256,7 +256,7 @@ void DisplayBuffer::print(int x, int y, Font *font, Color color, TextAlign align
     if (glyph_n < 0) {
       // Unknown char, skip
       ESP_LOGW(TAG, "Encountered character without representation in font: '%c'", text[i]);
-      if (font->get_glyphs_size() > 0) {
+      if (!font->get_glyphs().empty()) {
         uint8_t glyph_width = font->get_glyphs()[0].glyph_data_->width;
         for (int glyph_x = 0; glyph_x < glyph_width; glyph_x++) {
           for (int glyph_y = 0; glyph_y < height; glyph_y++)
@@ -557,7 +557,7 @@ void Glyph::scan_area(int *x1, int *y1, int *width, int *height) const {
 }
 int Font::match_next_glyph(const char *str, int *match_length) {
   int lo = 0;
-  int hi = this->glyphs_size_ - 1;
+  int hi = this->glyphs_.size() - 1;
   while (lo != hi) {
     int mid = (lo + hi + 1) / 2;
     if (this->glyphs_[mid].compare_to(str)) {
@@ -583,7 +583,7 @@ void Font::measure(const char *str, int *width, int *x_offset, int *baseline, in
     int glyph_n = this->match_next_glyph(str + i, &match_length);
     if (glyph_n < 0) {
       // Unknown char, skip
-      if (this->glyphs_size_ > 0)
+      if (!this->get_glyphs().empty())
         x += this->get_glyphs()[0].glyph_data_->width;
       i++;
       continue;
@@ -604,16 +604,9 @@ void Font::measure(const char *str, int *width, int *x_offset, int *baseline, in
   *width = x - min_x;
 }
 Font::Font(const GlyphData *data, int data_nr, int baseline, int height) : baseline_(baseline), height_(height) {
-  ExternalRAMAllocator<Glyph> allocator(ExternalRAMAllocator<Glyph>::ALLOW_FAILURE);
-  this->glyphs_ = allocator.allocate(data_nr);
-  if (this->glyphs_ == nullptr) {
-    ESP_LOGE(TAG, "Could not allocate buffer for Glyphs!");
-    return;
-  }
-  for (int i = 0; i < data_nr; ++i) {
-    this->glyphs_[i] = Glyph(data + i);
-  }
-  this->glyphs_size_ = data_nr;
+  glyphs_.reserve(data_nr);
+  for (int i = 0; i < data_nr; ++i)
+    glyphs_.emplace_back(&data[i]);
 }
 
 bool Image::get_pixel(int x, int y) const {
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index 815ba8d2e1..0402826594 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -526,12 +526,10 @@ class Font {
   inline int get_baseline() { return this->baseline_; }
   inline int get_height() { return this->height_; }
 
-  Glyph *&get_glyphs() { return this->glyphs_; }
-  const u_int16_t &get_glyphs_size() const { return this->glyphs_size_; }
+  const std::vector<Glyph, ExternalRAMAllocator<Glyph>> &get_glyphs() const { return glyphs_; }
 
  protected:
-  Glyph *glyphs_{nullptr};
-  u_int16_t glyphs_size_;
+  std::vector<Glyph, ExternalRAMAllocator<Glyph>> glyphs_;
   int baseline_;
   int height_;
 };

From d82c6df57e7e2126026f73599142efcf220ff83b Mon Sep 17 00:00:00 2001
From: Carlos Garcia Saura <CarlosGS@users.noreply.github.com>
Date: Thu, 9 Mar 2023 01:34:06 +0100
Subject: [PATCH 670/838] Correct BME680 gas calculation and heater_off (#4498)

* Fix missing data array

* Fix incorrect bit offset

* Correct variable types

* Do same conversions as in original library

* Correct clang-format

* Move out float conversion for clarity

* Added check for heater stability

* Correct clang format

* Allow reporting gas resistance when heater is disabled

* Correct clang format

* Better error reporting by @DAVe3283

* Correct signed operation, range switching error was positive all the time
---
 esphome/components/bme680/bme680.cpp | 64 ++++++++++++++++++++--------
 esphome/components/bme680/bme680.h   |  8 ++--
 2 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/esphome/components/bme680/bme680.cpp b/esphome/components/bme680/bme680.cpp
index 64770ac0d5..e5704a8f9f 100644
--- a/esphome/components/bme680/bme680.cpp
+++ b/esphome/components/bme680/bme680.cpp
@@ -117,18 +117,24 @@ void BME680Component::setup() {
   this->calibration_.gh2 = cal2[12] << 8 | cal2[13];
   this->calibration_.gh3 = cal2[15];
 
-  if (!this->read_byte(0x02, &this->calibration_.res_heat_range)) {
+  uint8_t temp_var = 0;
+  if (!this->read_byte(0x02, &temp_var)) {
     this->mark_failed();
     return;
   }
-  if (!this->read_byte(0x00, &this->calibration_.res_heat_val)) {
+  this->calibration_.res_heat_range = ((temp_var & 0x30) / 16);
+
+  if (!this->read_byte(0x00, &temp_var)) {
     this->mark_failed();
     return;
   }
-  if (!this->read_byte(0x04, &this->calibration_.range_sw_err)) {
+  this->calibration_.res_heat_val = (int8_t) temp_var;
+
+  if (!this->read_byte(0x04, &temp_var)) {
     this->mark_failed();
     return;
   }
+  this->calibration_.range_sw_err = ((int8_t) temp_var & (int8_t) 0xf0) / 16;
 
   this->calibration_.ambient_temperature = 25;  // prime ambient temperature
 
@@ -181,7 +187,7 @@ void BME680Component::setup() {
     return;
   }
   gas0_control &= ~0b00001000;
-  gas0_control |= heat_off ? 0b100 : 0b000;
+  gas0_control |= heat_off << 3;
   if (!this->write_byte(BME680_REGISTER_CONTROL_GAS0, gas0_control)) {
     this->mark_failed();
     return;
@@ -249,12 +255,12 @@ uint8_t BME680Component::calc_heater_resistance_(uint16_t temperature) {
   if (temperature > 400)
     temperature = 400;
 
-  const uint8_t ambient_temperature = this->calibration_.ambient_temperature;
+  const int8_t ambient_temperature = this->calibration_.ambient_temperature;
   const int8_t gh1 = this->calibration_.gh1;
   const int16_t gh2 = this->calibration_.gh2;
   const int8_t gh3 = this->calibration_.gh3;
   const uint8_t res_heat_range = this->calibration_.res_heat_range;
-  const uint8_t res_heat_val = this->calibration_.res_heat_val;
+  const int8_t res_heat_val = this->calibration_.res_heat_val;
 
   uint8_t heatr_res;
   int32_t var1;
@@ -293,35 +299,57 @@ uint8_t BME680Component::calc_heater_duration_(uint16_t duration) {
 void BME680Component::read_data_() {
   uint8_t data[15];
   if (!this->read_bytes(BME680_REGISTER_FIELD0, data, 15)) {
+    if (this->temperature_sensor_ != nullptr)
+      this->temperature_sensor_->publish_state(NAN);
+    if (this->pressure_sensor_ != nullptr)
+      this->pressure_sensor_->publish_state(NAN);
+    if (this->humidity_sensor_ != nullptr)
+      this->humidity_sensor_->publish_state(NAN);
+    if (this->gas_resistance_sensor_ != nullptr)
+      this->gas_resistance_sensor_->publish_state(NAN);
+    ESP_LOGW(TAG, "Communication with BME680 failed!");
     this->status_set_warning();
     return;
   }
+  this->status_clear_warning();
 
   uint32_t raw_temperature = (uint32_t(data[5]) << 12) | (uint32_t(data[6]) << 4) | (uint32_t(data[7]) >> 4);
   uint32_t raw_pressure = (uint32_t(data[2]) << 12) | (uint32_t(data[3]) << 4) | (uint32_t(data[4]) >> 4);
   uint32_t raw_humidity = (uint32_t(data[8]) << 8) | uint32_t(data[9]);
-  uint16_t raw_gas = (uint16_t(data[13]) << 2) | (uint16_t(14) >> 6);
+  uint16_t raw_gas = (uint16_t)((uint32_t) data[13] * 4 | (((uint32_t) data[14]) / 64));
   uint8_t gas_range = data[14] & 0x0F;
 
   float temperature = this->calc_temperature_(raw_temperature);
   float pressure = this->calc_pressure_(raw_pressure);
   float humidity = this->calc_humidity_(raw_humidity);
-  float gas_resistance = NAN;
-  if (data[14] & 0x20) {
-    gas_resistance = this->calc_gas_resistance_(raw_gas, gas_range);
-  }
+  float gas_resistance = this->calc_gas_resistance_(raw_gas, gas_range);
+
+  bool gas_valid = (data[14] >> 5) & 1;
+  bool heat_stable = (data[14] >> 4) & 1;
+  if (this->heater_temperature_ == 0 || this->heater_duration_ == 0)
+    heat_stable = true;  // Allow reporting gas resistance when heater is disabled
 
   ESP_LOGD(TAG, "Got temperature=%.1f°C pressure=%.1fhPa humidity=%.1f%% gas_resistance=%.1fΩ", temperature, pressure,
            humidity, gas_resistance);
+  if (!gas_valid)
+    ESP_LOGW(TAG, "Gas measurement unsuccessful, reading invalid!");
+  if (!heat_stable)
+    ESP_LOGW(TAG, "Heater unstable, reading invalid! (Normal for a few readings after a power cycle)");
+
   if (this->temperature_sensor_ != nullptr)
     this->temperature_sensor_->publish_state(temperature);
   if (this->pressure_sensor_ != nullptr)
     this->pressure_sensor_->publish_state(pressure);
   if (this->humidity_sensor_ != nullptr)
     this->humidity_sensor_->publish_state(humidity);
-  if (this->gas_resistance_sensor_ != nullptr)
-    this->gas_resistance_sensor_->publish_state(gas_resistance);
-  this->status_clear_warning();
+  if (this->gas_resistance_sensor_ != nullptr) {
+    if (gas_valid && heat_stable) {
+      this->gas_resistance_sensor_->publish_state(gas_resistance);
+    } else {
+      this->status_set_warning();
+      this->gas_resistance_sensor_->publish_state(NAN);
+    }
+  }
 }
 
 float BME680Component::calc_temperature_(uint32_t raw_temperature) {
@@ -428,20 +456,22 @@ float BME680Component::calc_humidity_(uint16_t raw_humidity) {
 
   return calc_hum;
 }
-uint32_t BME680Component::calc_gas_resistance_(uint16_t raw_gas, uint8_t range) {
+float BME680Component::calc_gas_resistance_(uint16_t raw_gas, uint8_t range) {
   float calc_gas_res;
   float var1 = 0;
   float var2 = 0;
   float var3 = 0;
+  float raw_gas_f = raw_gas;
+  float range_f = 1U << range;
   const float range_sw_err = this->calibration_.range_sw_err;
 
   var1 = 1340.0f + (5.0f * range_sw_err);
   var2 = var1 * (1.0f + BME680_GAS_LOOKUP_TABLE_1[range] / 100.0f);
   var3 = 1.0f + (BME680_GAS_LOOKUP_TABLE_2[range] / 100.0f);
 
-  calc_gas_res = 1.0f / (var3 * 0.000000125f * float(1 << range) * (((float(raw_gas) - 512.0f) / var2) + 1.0f));
+  calc_gas_res = 1.0f / (var3 * 0.000000125f * range_f * (((raw_gas_f - 512.0f) / var2) + 1.0f));
 
-  return static_cast<uint32_t>(calc_gas_res);
+  return calc_gas_res;
 }
 uint32_t BME680Component::calc_meas_duration_() {
   uint32_t tph_dur;  // Calculate in us
diff --git a/esphome/components/bme680/bme680.h b/esphome/components/bme680/bme680.h
index 6446449742..cfa7aaca20 100644
--- a/esphome/components/bme680/bme680.h
+++ b/esphome/components/bme680/bme680.h
@@ -59,11 +59,11 @@ struct BME680CalibrationData {
   int8_t gh3;
 
   uint8_t res_heat_range;
-  uint8_t res_heat_val;
-  uint8_t range_sw_err;
+  int8_t res_heat_val;
+  int8_t range_sw_err;
 
   float tfine;
-  uint8_t ambient_temperature;
+  int8_t ambient_temperature;
 };
 
 class BME680Component : public PollingComponent, public i2c::I2CDevice {
@@ -117,7 +117,7 @@ class BME680Component : public PollingComponent, public i2c::I2CDevice {
   /// Calculate the relative humidity in % using the provided raw ADC value.
   float calc_humidity_(uint16_t raw_humidity);
   /// Calculate the gas resistance in Ω using the provided raw ADC value.
-  uint32_t calc_gas_resistance_(uint16_t raw_gas, uint8_t range);
+  float calc_gas_resistance_(uint16_t raw_gas, uint8_t range);
   /// Calculate how long the sensor will take until we can retrieve data.
   uint32_t calc_meas_duration_();
 

From 1a9aedf1527703b2d451a0bf3802dc81caf2d059 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 9 Mar 2023 15:47:57 +1300
Subject: [PATCH 671/838] Bump version to 2023.3.0b2

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

diff --git a/esphome/const.py b/esphome/const.py
index a78fb6948f..a66dfbc0fd 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.3.0b1"
+__version__ = "2023.3.0b2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 29113808ee7fe079285139ca09c2a1d71b3de037 Mon Sep 17 00:00:00 2001
From: jakehdk <94864542+jakehdk@users.noreply.github.com>
Date: Sun, 12 Mar 2023 21:14:00 +0100
Subject: [PATCH 672/838] Add support for new clones of mpu6050 responding with
 0x70 address (#4546)

Co-authored-by: jakehdk <Jake@Jakobs-MacBook-Pro.local>
---
 esphome/components/mpu6050/mpu6050.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esphome/components/mpu6050/mpu6050.cpp b/esphome/components/mpu6050/mpu6050.cpp
index cc426e58a2..51e3ec2383 100644
--- a/esphome/components/mpu6050/mpu6050.cpp
+++ b/esphome/components/mpu6050/mpu6050.cpp
@@ -23,7 +23,8 @@ const float GRAVITY_EARTH = 9.80665f;
 void MPU6050Component::setup() {
   ESP_LOGCONFIG(TAG, "Setting up MPU6050...");
   uint8_t who_am_i;
-  if (!this->read_byte(MPU6050_REGISTER_WHO_AM_I, &who_am_i) || (who_am_i != 0x68 && who_am_i != 0x98)) {
+  if (!this->read_byte(MPU6050_REGISTER_WHO_AM_I, &who_am_i) ||
+      (who_am_i != 0x68 && who_am_i != 0x70 && who_am_i != 0x98)) {
     this->mark_failed();
     return;
   }

From 5a56644702dc3fe277144ad12e115b5a75f4d3e2 Mon Sep 17 00:00:00 2001
From: Martin Murray <martin.murray@gmail.com>
Date: Sun, 12 Mar 2023 16:16:48 -0400
Subject: [PATCH 673/838] Add carbon dioxide device class to scd30 sensor
 schema. (#4547)

---
 esphome/components/scd30/sensor.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/components/scd30/sensor.py b/esphome/components/scd30/sensor.py
index ffbf90338f..1ddf0f1e85 100644
--- a/esphome/components/scd30/sensor.py
+++ b/esphome/components/scd30/sensor.py
@@ -10,6 +10,7 @@ from esphome.const import (
     CONF_CO2,
     CONF_UPDATE_INTERVAL,
     CONF_VALUE,
+    DEVICE_CLASS_CARBON_DIOXIDE,
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_TEMPERATURE,
     STATE_CLASS_MEASUREMENT,
@@ -46,6 +47,7 @@ CONFIG_SCHEMA = (
                 unit_of_measurement=UNIT_PARTS_PER_MILLION,
                 icon=ICON_MOLECULE_CO2,
                 accuracy_decimals=0,
+                device_class=DEVICE_CLASS_CARBON_DIOXIDE,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(

From 32a0a604807fb81382b254d755fdff149f286bf6 Mon Sep 17 00:00:00 2001
From: Dorian Zedler <dorian@itsblue.de>
Date: Sun, 12 Mar 2023 21:26:27 +0100
Subject: [PATCH 674/838] Feat: add support for hex color in color component
 (#4493)

* Feat: add support for hex color in color component

* Chore: move hex color validator to color component

* Chore: add test

* Chore: fix formatting

* Chore: make linter happy

* Chore: make linter happy

* Fix: parse correct offsets

Co-authored-by: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>

* Chore: use cv.Invalid

* Fix: remove # because it indicates a comment in yaml

* Fix: only allow hex if no other color value is set

* Fix: tests

* Fix: mutual exclusion of raw and hex colors

* Chore: format file

* Update __init__.py

---------

Co-authored-by: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/color/__init__.py | 59 +++++++++++++++++++++-------
 tests/test1.yaml                     |  2 +
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/esphome/components/color/__init__.py b/esphome/components/color/__init__.py
index 47679fcc68..9a85eace75 100644
--- a/esphome/components/color/__init__.py
+++ b/esphome/components/color/__init__.py
@@ -10,23 +10,42 @@ CONF_RED_INT = "red_int"
 CONF_GREEN_INT = "green_int"
 CONF_BLUE_INT = "blue_int"
 CONF_WHITE_INT = "white_int"
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_ID): cv.declare_id(ColorStruct),
-        cv.Exclusive(CONF_RED, "red"): cv.percentage,
-        cv.Exclusive(CONF_RED_INT, "red"): cv.uint8_t,
-        cv.Exclusive(CONF_GREEN, "green"): cv.percentage,
-        cv.Exclusive(CONF_GREEN_INT, "green"): cv.uint8_t,
-        cv.Exclusive(CONF_BLUE, "blue"): cv.percentage,
-        cv.Exclusive(CONF_BLUE_INT, "blue"): cv.uint8_t,
-        cv.Exclusive(CONF_WHITE, "white"): cv.percentage,
-        cv.Exclusive(CONF_WHITE_INT, "white"): cv.uint8_t,
-    }
-).extend(cv.COMPONENT_SCHEMA)
+CONF_HEX = "hex"
 
 
-async def to_code(config):
+def hex_color(value):
+    if len(value) != 6:
+        raise cv.Invalid("Color must have six digits")
+    try:
+        return (int(value[0:2], 16), int(value[2:4], 16), int(value[4:6], 16))
+    except ValueError as exc:
+        raise cv.Invalid("Color must be hexadecimal") from exc
+
+
+CONFIG_SCHEMA = cv.Any(
+    cv.Schema(
+        {
+            cv.Required(CONF_ID): cv.declare_id(ColorStruct),
+            cv.Exclusive(CONF_RED, "red"): cv.percentage,
+            cv.Exclusive(CONF_RED_INT, "red"): cv.uint8_t,
+            cv.Exclusive(CONF_GREEN, "green"): cv.percentage,
+            cv.Exclusive(CONF_GREEN_INT, "green"): cv.uint8_t,
+            cv.Exclusive(CONF_BLUE, "blue"): cv.percentage,
+            cv.Exclusive(CONF_BLUE_INT, "blue"): cv.uint8_t,
+            cv.Exclusive(CONF_WHITE, "white"): cv.percentage,
+            cv.Exclusive(CONF_WHITE_INT, "white"): cv.uint8_t,
+        }
+    ).extend(cv.COMPONENT_SCHEMA),
+    cv.Schema(
+        {
+            cv.Required(CONF_ID): cv.declare_id(ColorStruct),
+            cv.Required(CONF_HEX): hex_color,
+        }
+    ).extend(cv.COMPONENT_SCHEMA),
+)
+
+
+def from_rgbw(config):
     r = 0
     if CONF_RED in config:
         r = int(config[CONF_RED] * 255)
@@ -51,6 +70,16 @@ async def to_code(config):
     elif CONF_WHITE_INT in config:
         w = config[CONF_WHITE_INT]
 
+    return (r, g, b, w)
+
+
+async def to_code(config):
+    if CONF_HEX in config:
+        r, g, b = config[CONF_HEX]
+        w = 0
+    else:
+        r, g, b, w = from_rgbw(config)
+
     cg.new_variable(
         config[CONF_ID],
         cg.StructInitializer(ColorStruct, ("r", r), ("g", g), ("b", b), ("w", w)),
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 2af71ea745..ef389ea712 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -2528,6 +2528,8 @@ color:
     red: 0%
     green: 1%
     blue: 100%
+  - id: kbx_green
+    hex: "3DEC55"
 
 display:
   - platform: lcd_gpio

From ea17a92dbc6bc663482374fe22806c5b246c5f98 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 13 Mar 2023 11:43:31 +1300
Subject: [PATCH 675/838] Allow AUTO_LOAD to be a function (#4550)

---
 esphome/loader.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/esphome/loader.py b/esphome/loader.py
index b245fa1610..cd21e5a509 100644
--- a/esphome/loader.py
+++ b/esphome/loader.py
@@ -71,7 +71,10 @@ class ComponentManifest:
 
     @property
     def auto_load(self) -> list[str]:
-        return getattr(self.module, "AUTO_LOAD", [])
+        al = getattr(self.module, "AUTO_LOAD", [])
+        if callable(al):
+            return al()
+        return al
 
     @property
     def codeowners(self) -> list[str]:

From 6a6aee510d3bedbc2407dfd7870be4865a613bdc Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Mon, 13 Mar 2023 01:13:19 +0100
Subject: [PATCH 676/838] On the ILI9xxx display's enable the psram on esp32
 and allow big screen (#4551)

* enable the psram on esp32 and allow big screen

* update CODEOWNERS

* small update

* update CODEOWNERS again.

* Removed the M5STACK because it is a ESP32 device.

* i removed the wrong model

* update the error message.
---
 esphome/components/ili9xxx/display.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/esphome/components/ili9xxx/display.py b/esphome/components/ili9xxx/display.py
index 437fc93b89..780c64ec70 100644
--- a/esphome/components/ili9xxx/display.py
+++ b/esphome/components/ili9xxx/display.py
@@ -16,7 +16,13 @@ from esphome.const import (
 )
 
 DEPENDENCIES = ["spi"]
-AUTO_LOAD = ["psram"]
+
+
+def AUTO_LOAD():
+    if CORE.is_esp32:
+        return ["psram"]
+    return []
+
 
 CODEOWNERS = ["@nielsnl68"]
 
@@ -60,6 +66,16 @@ def _validate(config):
         raise cv.Invalid(
             "Providing color palette images requires palette mode to be 'IMAGE_ADAPTIVE'"
         )
+    if CORE.is_esp8266 and config.get(CONF_MODEL) not in [
+        "M5STACK",
+        "TFT_2.4",
+        "TFT_2.4R",
+        "ILI9341",
+        "ILI9342",
+    ]:
+        raise cv.Invalid(
+            "Provided model can't run on ESP8266. Use an ESP32 with PSRAM onboard"
+        )
     return config
 
 

From d642aeba0ff5049661d3f36134a35966fa121582 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 13 Mar 2023 13:13:36 +1300
Subject: [PATCH 677/838] Map gpio pins for touch on esp32-s2/s3 (#4552)

* Map gpio pins for touch on esp32-s2/s3

* fix value
---
 .../components/esp32_touch/binary_sensor.py   | 73 +++++++++++++++----
 1 file changed, 60 insertions(+), 13 deletions(-)

diff --git a/esphome/components/esp32_touch/binary_sensor.py b/esphome/components/esp32_touch/binary_sensor.py
index 326f559830..2cdf1343c3 100644
--- a/esphome/components/esp32_touch/binary_sensor.py
+++ b/esphome/components/esp32_touch/binary_sensor.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
+from esphome.core import CORE
 from esphome.components import binary_sensor
 from esphome.const import (
     CONF_PIN,
@@ -7,6 +8,13 @@ from esphome.const import (
     CONF_ID,
 )
 from esphome.components.esp32 import gpio
+from esphome.components.esp32.const import (
+    KEY_ESP32,
+    KEY_VARIANT,
+    VARIANT_ESP32,
+    VARIANT_ESP32S2,
+    VARIANT_ESP32S3,
+)
 from . import esp32_touch_ns, ESP32TouchComponent
 
 DEPENDENCIES = ["esp32_touch", "esp32"]
@@ -15,24 +23,63 @@ CONF_ESP32_TOUCH_ID = "esp32_touch_id"
 CONF_WAKEUP_THRESHOLD = "wakeup_threshold"
 
 TOUCH_PADS = {
-    4: cg.global_ns.TOUCH_PAD_NUM0,
-    0: cg.global_ns.TOUCH_PAD_NUM1,
-    2: cg.global_ns.TOUCH_PAD_NUM2,
-    15: cg.global_ns.TOUCH_PAD_NUM3,
-    13: cg.global_ns.TOUCH_PAD_NUM4,
-    12: cg.global_ns.TOUCH_PAD_NUM5,
-    14: cg.global_ns.TOUCH_PAD_NUM6,
-    27: cg.global_ns.TOUCH_PAD_NUM7,
-    33: cg.global_ns.TOUCH_PAD_NUM8,
-    32: cg.global_ns.TOUCH_PAD_NUM9,
+    VARIANT_ESP32: {
+        4: cg.global_ns.TOUCH_PAD_NUM0,
+        0: cg.global_ns.TOUCH_PAD_NUM1,
+        2: cg.global_ns.TOUCH_PAD_NUM2,
+        15: cg.global_ns.TOUCH_PAD_NUM3,
+        13: cg.global_ns.TOUCH_PAD_NUM4,
+        12: cg.global_ns.TOUCH_PAD_NUM5,
+        14: cg.global_ns.TOUCH_PAD_NUM6,
+        27: cg.global_ns.TOUCH_PAD_NUM7,
+        33: cg.global_ns.TOUCH_PAD_NUM8,
+        32: cg.global_ns.TOUCH_PAD_NUM9,
+    },
+    VARIANT_ESP32S2: {
+        1: cg.global_ns.TOUCH_PAD_NUM1,
+        2: cg.global_ns.TOUCH_PAD_NUM2,
+        3: cg.global_ns.TOUCH_PAD_NUM3,
+        4: cg.global_ns.TOUCH_PAD_NUM4,
+        5: cg.global_ns.TOUCH_PAD_NUM5,
+        6: cg.global_ns.TOUCH_PAD_NUM6,
+        7: cg.global_ns.TOUCH_PAD_NUM7,
+        8: cg.global_ns.TOUCH_PAD_NUM8,
+        9: cg.global_ns.TOUCH_PAD_NUM9,
+        10: cg.global_ns.TOUCH_PAD_NUM10,
+        11: cg.global_ns.TOUCH_PAD_NUM11,
+        12: cg.global_ns.TOUCH_PAD_NUM12,
+        13: cg.global_ns.TOUCH_PAD_NUM13,
+        14: cg.global_ns.TOUCH_PAD_NUM14,
+    },
+    VARIANT_ESP32S3: {
+        1: cg.global_ns.TOUCH_PAD_NUM1,
+        2: cg.global_ns.TOUCH_PAD_NUM2,
+        3: cg.global_ns.TOUCH_PAD_NUM3,
+        4: cg.global_ns.TOUCH_PAD_NUM4,
+        5: cg.global_ns.TOUCH_PAD_NUM5,
+        6: cg.global_ns.TOUCH_PAD_NUM6,
+        7: cg.global_ns.TOUCH_PAD_NUM7,
+        8: cg.global_ns.TOUCH_PAD_NUM8,
+        9: cg.global_ns.TOUCH_PAD_NUM9,
+        10: cg.global_ns.TOUCH_PAD_NUM10,
+        11: cg.global_ns.TOUCH_PAD_NUM11,
+        12: cg.global_ns.TOUCH_PAD_NUM12,
+        13: cg.global_ns.TOUCH_PAD_NUM13,
+        14: cg.global_ns.TOUCH_PAD_NUM14,
+    },
 }
 
 
 def validate_touch_pad(value):
     value = gpio.validate_gpio_pin(value)
-    if value not in TOUCH_PADS:
+    variant = CORE.data[KEY_ESP32][KEY_VARIANT]
+    if variant not in TOUCH_PADS:
+        raise cv.Invalid(f"ESP32 variant {variant} does not support touch pads.")
+
+    pads = TOUCH_PADS[variant]
+    if value not in pads:
         raise cv.Invalid(f"Pin {value} does not support touch pads.")
-    return value
+    return cv.enum(pads)(value)
 
 
 ESP32TouchBinarySensor = esp32_touch_ns.class_(
@@ -53,7 +100,7 @@ async def to_code(config):
     hub = await cg.get_variable(config[CONF_ESP32_TOUCH_ID])
     var = cg.new_Pvariable(
         config[CONF_ID],
-        TOUCH_PADS[config[CONF_PIN]],
+        config[CONF_PIN],
         config[CONF_THRESHOLD],
         config[CONF_WAKEUP_THRESHOLD],
     )

From cdeb6e750f39a057f20dd2bafe880171924af58a Mon Sep 17 00:00:00 2001
From: jakehdk <94864542+jakehdk@users.noreply.github.com>
Date: Sun, 12 Mar 2023 21:14:00 +0100
Subject: [PATCH 678/838] Add support for new clones of mpu6050 responding with
 0x70 address (#4546)

Co-authored-by: jakehdk <Jake@Jakobs-MacBook-Pro.local>
---
 esphome/components/mpu6050/mpu6050.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esphome/components/mpu6050/mpu6050.cpp b/esphome/components/mpu6050/mpu6050.cpp
index cc426e58a2..51e3ec2383 100644
--- a/esphome/components/mpu6050/mpu6050.cpp
+++ b/esphome/components/mpu6050/mpu6050.cpp
@@ -23,7 +23,8 @@ const float GRAVITY_EARTH = 9.80665f;
 void MPU6050Component::setup() {
   ESP_LOGCONFIG(TAG, "Setting up MPU6050...");
   uint8_t who_am_i;
-  if (!this->read_byte(MPU6050_REGISTER_WHO_AM_I, &who_am_i) || (who_am_i != 0x68 && who_am_i != 0x98)) {
+  if (!this->read_byte(MPU6050_REGISTER_WHO_AM_I, &who_am_i) ||
+      (who_am_i != 0x68 && who_am_i != 0x70 && who_am_i != 0x98)) {
     this->mark_failed();
     return;
   }

From bf79a700b769667cc738029987428464aa572077 Mon Sep 17 00:00:00 2001
From: Martin Murray <martin.murray@gmail.com>
Date: Sun, 12 Mar 2023 16:16:48 -0400
Subject: [PATCH 679/838] Add carbon dioxide device class to scd30 sensor
 schema. (#4547)

---
 esphome/components/scd30/sensor.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/components/scd30/sensor.py b/esphome/components/scd30/sensor.py
index ffbf90338f..1ddf0f1e85 100644
--- a/esphome/components/scd30/sensor.py
+++ b/esphome/components/scd30/sensor.py
@@ -10,6 +10,7 @@ from esphome.const import (
     CONF_CO2,
     CONF_UPDATE_INTERVAL,
     CONF_VALUE,
+    DEVICE_CLASS_CARBON_DIOXIDE,
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_TEMPERATURE,
     STATE_CLASS_MEASUREMENT,
@@ -46,6 +47,7 @@ CONFIG_SCHEMA = (
                 unit_of_measurement=UNIT_PARTS_PER_MILLION,
                 icon=ICON_MOLECULE_CO2,
                 accuracy_decimals=0,
+                device_class=DEVICE_CLASS_CARBON_DIOXIDE,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(

From b6f628ee40906d0ab59c0d46e7f1709cd824e5cd Mon Sep 17 00:00:00 2001
From: Dorian Zedler <dorian@itsblue.de>
Date: Sun, 12 Mar 2023 21:26:27 +0100
Subject: [PATCH 680/838] Feat: add support for hex color in color component
 (#4493)

* Feat: add support for hex color in color component

* Chore: move hex color validator to color component

* Chore: add test

* Chore: fix formatting

* Chore: make linter happy

* Chore: make linter happy

* Fix: parse correct offsets

Co-authored-by: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>

* Chore: use cv.Invalid

* Fix: remove # because it indicates a comment in yaml

* Fix: only allow hex if no other color value is set

* Fix: tests

* Fix: mutual exclusion of raw and hex colors

* Chore: format file

* Update __init__.py

---------

Co-authored-by: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/color/__init__.py | 59 +++++++++++++++++++++-------
 tests/test1.yaml                     |  2 +
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/esphome/components/color/__init__.py b/esphome/components/color/__init__.py
index 47679fcc68..9a85eace75 100644
--- a/esphome/components/color/__init__.py
+++ b/esphome/components/color/__init__.py
@@ -10,23 +10,42 @@ CONF_RED_INT = "red_int"
 CONF_GREEN_INT = "green_int"
 CONF_BLUE_INT = "blue_int"
 CONF_WHITE_INT = "white_int"
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_ID): cv.declare_id(ColorStruct),
-        cv.Exclusive(CONF_RED, "red"): cv.percentage,
-        cv.Exclusive(CONF_RED_INT, "red"): cv.uint8_t,
-        cv.Exclusive(CONF_GREEN, "green"): cv.percentage,
-        cv.Exclusive(CONF_GREEN_INT, "green"): cv.uint8_t,
-        cv.Exclusive(CONF_BLUE, "blue"): cv.percentage,
-        cv.Exclusive(CONF_BLUE_INT, "blue"): cv.uint8_t,
-        cv.Exclusive(CONF_WHITE, "white"): cv.percentage,
-        cv.Exclusive(CONF_WHITE_INT, "white"): cv.uint8_t,
-    }
-).extend(cv.COMPONENT_SCHEMA)
+CONF_HEX = "hex"
 
 
-async def to_code(config):
+def hex_color(value):
+    if len(value) != 6:
+        raise cv.Invalid("Color must have six digits")
+    try:
+        return (int(value[0:2], 16), int(value[2:4], 16), int(value[4:6], 16))
+    except ValueError as exc:
+        raise cv.Invalid("Color must be hexadecimal") from exc
+
+
+CONFIG_SCHEMA = cv.Any(
+    cv.Schema(
+        {
+            cv.Required(CONF_ID): cv.declare_id(ColorStruct),
+            cv.Exclusive(CONF_RED, "red"): cv.percentage,
+            cv.Exclusive(CONF_RED_INT, "red"): cv.uint8_t,
+            cv.Exclusive(CONF_GREEN, "green"): cv.percentage,
+            cv.Exclusive(CONF_GREEN_INT, "green"): cv.uint8_t,
+            cv.Exclusive(CONF_BLUE, "blue"): cv.percentage,
+            cv.Exclusive(CONF_BLUE_INT, "blue"): cv.uint8_t,
+            cv.Exclusive(CONF_WHITE, "white"): cv.percentage,
+            cv.Exclusive(CONF_WHITE_INT, "white"): cv.uint8_t,
+        }
+    ).extend(cv.COMPONENT_SCHEMA),
+    cv.Schema(
+        {
+            cv.Required(CONF_ID): cv.declare_id(ColorStruct),
+            cv.Required(CONF_HEX): hex_color,
+        }
+    ).extend(cv.COMPONENT_SCHEMA),
+)
+
+
+def from_rgbw(config):
     r = 0
     if CONF_RED in config:
         r = int(config[CONF_RED] * 255)
@@ -51,6 +70,16 @@ async def to_code(config):
     elif CONF_WHITE_INT in config:
         w = config[CONF_WHITE_INT]
 
+    return (r, g, b, w)
+
+
+async def to_code(config):
+    if CONF_HEX in config:
+        r, g, b = config[CONF_HEX]
+        w = 0
+    else:
+        r, g, b, w = from_rgbw(config)
+
     cg.new_variable(
         config[CONF_ID],
         cg.StructInitializer(ColorStruct, ("r", r), ("g", g), ("b", b), ("w", w)),
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 21cdb6bc6f..25c481db04 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -2528,6 +2528,8 @@ color:
     red: 0%
     green: 1%
     blue: 100%
+  - id: kbx_green
+    hex: "3DEC55"
 
 display:
   - platform: lcd_gpio

From 6e8e9c2aa9f0753a8c9c6fb5c947b279da2c9799 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 13 Mar 2023 11:43:31 +1300
Subject: [PATCH 681/838] Allow AUTO_LOAD to be a function (#4550)

---
 esphome/loader.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/esphome/loader.py b/esphome/loader.py
index b245fa1610..cd21e5a509 100644
--- a/esphome/loader.py
+++ b/esphome/loader.py
@@ -71,7 +71,10 @@ class ComponentManifest:
 
     @property
     def auto_load(self) -> list[str]:
-        return getattr(self.module, "AUTO_LOAD", [])
+        al = getattr(self.module, "AUTO_LOAD", [])
+        if callable(al):
+            return al()
+        return al
 
     @property
     def codeowners(self) -> list[str]:

From 4b7c233f1a00bf5b719b4c97a3a371f0761b6f4f Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Mon, 13 Mar 2023 01:13:19 +0100
Subject: [PATCH 682/838] On the ILI9xxx display's enable the psram on esp32
 and allow big screen (#4551)

* enable the psram on esp32 and allow big screen

* update CODEOWNERS

* small update

* update CODEOWNERS again.

* Removed the M5STACK because it is a ESP32 device.

* i removed the wrong model

* update the error message.
---
 esphome/components/ili9xxx/display.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/esphome/components/ili9xxx/display.py b/esphome/components/ili9xxx/display.py
index 437fc93b89..780c64ec70 100644
--- a/esphome/components/ili9xxx/display.py
+++ b/esphome/components/ili9xxx/display.py
@@ -16,7 +16,13 @@ from esphome.const import (
 )
 
 DEPENDENCIES = ["spi"]
-AUTO_LOAD = ["psram"]
+
+
+def AUTO_LOAD():
+    if CORE.is_esp32:
+        return ["psram"]
+    return []
+
 
 CODEOWNERS = ["@nielsnl68"]
 
@@ -60,6 +66,16 @@ def _validate(config):
         raise cv.Invalid(
             "Providing color palette images requires palette mode to be 'IMAGE_ADAPTIVE'"
         )
+    if CORE.is_esp8266 and config.get(CONF_MODEL) not in [
+        "M5STACK",
+        "TFT_2.4",
+        "TFT_2.4R",
+        "ILI9341",
+        "ILI9342",
+    ]:
+        raise cv.Invalid(
+            "Provided model can't run on ESP8266. Use an ESP32 with PSRAM onboard"
+        )
     return config
 
 

From c149a3033c89f42c4791b25a97180d8c740fad20 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 13 Mar 2023 13:13:36 +1300
Subject: [PATCH 683/838] Map gpio pins for touch on esp32-s2/s3 (#4552)

* Map gpio pins for touch on esp32-s2/s3

* fix value
---
 .../components/esp32_touch/binary_sensor.py   | 73 +++++++++++++++----
 1 file changed, 60 insertions(+), 13 deletions(-)

diff --git a/esphome/components/esp32_touch/binary_sensor.py b/esphome/components/esp32_touch/binary_sensor.py
index 326f559830..2cdf1343c3 100644
--- a/esphome/components/esp32_touch/binary_sensor.py
+++ b/esphome/components/esp32_touch/binary_sensor.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
+from esphome.core import CORE
 from esphome.components import binary_sensor
 from esphome.const import (
     CONF_PIN,
@@ -7,6 +8,13 @@ from esphome.const import (
     CONF_ID,
 )
 from esphome.components.esp32 import gpio
+from esphome.components.esp32.const import (
+    KEY_ESP32,
+    KEY_VARIANT,
+    VARIANT_ESP32,
+    VARIANT_ESP32S2,
+    VARIANT_ESP32S3,
+)
 from . import esp32_touch_ns, ESP32TouchComponent
 
 DEPENDENCIES = ["esp32_touch", "esp32"]
@@ -15,24 +23,63 @@ CONF_ESP32_TOUCH_ID = "esp32_touch_id"
 CONF_WAKEUP_THRESHOLD = "wakeup_threshold"
 
 TOUCH_PADS = {
-    4: cg.global_ns.TOUCH_PAD_NUM0,
-    0: cg.global_ns.TOUCH_PAD_NUM1,
-    2: cg.global_ns.TOUCH_PAD_NUM2,
-    15: cg.global_ns.TOUCH_PAD_NUM3,
-    13: cg.global_ns.TOUCH_PAD_NUM4,
-    12: cg.global_ns.TOUCH_PAD_NUM5,
-    14: cg.global_ns.TOUCH_PAD_NUM6,
-    27: cg.global_ns.TOUCH_PAD_NUM7,
-    33: cg.global_ns.TOUCH_PAD_NUM8,
-    32: cg.global_ns.TOUCH_PAD_NUM9,
+    VARIANT_ESP32: {
+        4: cg.global_ns.TOUCH_PAD_NUM0,
+        0: cg.global_ns.TOUCH_PAD_NUM1,
+        2: cg.global_ns.TOUCH_PAD_NUM2,
+        15: cg.global_ns.TOUCH_PAD_NUM3,
+        13: cg.global_ns.TOUCH_PAD_NUM4,
+        12: cg.global_ns.TOUCH_PAD_NUM5,
+        14: cg.global_ns.TOUCH_PAD_NUM6,
+        27: cg.global_ns.TOUCH_PAD_NUM7,
+        33: cg.global_ns.TOUCH_PAD_NUM8,
+        32: cg.global_ns.TOUCH_PAD_NUM9,
+    },
+    VARIANT_ESP32S2: {
+        1: cg.global_ns.TOUCH_PAD_NUM1,
+        2: cg.global_ns.TOUCH_PAD_NUM2,
+        3: cg.global_ns.TOUCH_PAD_NUM3,
+        4: cg.global_ns.TOUCH_PAD_NUM4,
+        5: cg.global_ns.TOUCH_PAD_NUM5,
+        6: cg.global_ns.TOUCH_PAD_NUM6,
+        7: cg.global_ns.TOUCH_PAD_NUM7,
+        8: cg.global_ns.TOUCH_PAD_NUM8,
+        9: cg.global_ns.TOUCH_PAD_NUM9,
+        10: cg.global_ns.TOUCH_PAD_NUM10,
+        11: cg.global_ns.TOUCH_PAD_NUM11,
+        12: cg.global_ns.TOUCH_PAD_NUM12,
+        13: cg.global_ns.TOUCH_PAD_NUM13,
+        14: cg.global_ns.TOUCH_PAD_NUM14,
+    },
+    VARIANT_ESP32S3: {
+        1: cg.global_ns.TOUCH_PAD_NUM1,
+        2: cg.global_ns.TOUCH_PAD_NUM2,
+        3: cg.global_ns.TOUCH_PAD_NUM3,
+        4: cg.global_ns.TOUCH_PAD_NUM4,
+        5: cg.global_ns.TOUCH_PAD_NUM5,
+        6: cg.global_ns.TOUCH_PAD_NUM6,
+        7: cg.global_ns.TOUCH_PAD_NUM7,
+        8: cg.global_ns.TOUCH_PAD_NUM8,
+        9: cg.global_ns.TOUCH_PAD_NUM9,
+        10: cg.global_ns.TOUCH_PAD_NUM10,
+        11: cg.global_ns.TOUCH_PAD_NUM11,
+        12: cg.global_ns.TOUCH_PAD_NUM12,
+        13: cg.global_ns.TOUCH_PAD_NUM13,
+        14: cg.global_ns.TOUCH_PAD_NUM14,
+    },
 }
 
 
 def validate_touch_pad(value):
     value = gpio.validate_gpio_pin(value)
-    if value not in TOUCH_PADS:
+    variant = CORE.data[KEY_ESP32][KEY_VARIANT]
+    if variant not in TOUCH_PADS:
+        raise cv.Invalid(f"ESP32 variant {variant} does not support touch pads.")
+
+    pads = TOUCH_PADS[variant]
+    if value not in pads:
         raise cv.Invalid(f"Pin {value} does not support touch pads.")
-    return value
+    return cv.enum(pads)(value)
 
 
 ESP32TouchBinarySensor = esp32_touch_ns.class_(
@@ -53,7 +100,7 @@ async def to_code(config):
     hub = await cg.get_variable(config[CONF_ESP32_TOUCH_ID])
     var = cg.new_Pvariable(
         config[CONF_ID],
-        TOUCH_PADS[config[CONF_PIN]],
+        config[CONF_PIN],
         config[CONF_THRESHOLD],
         config[CONF_WAKEUP_THRESHOLD],
     )

From 65d2b806cc8f845d71748d370865bae759aeae12 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 13 Mar 2023 13:32:21 +1300
Subject: [PATCH 684/838] Bump version to 2023.3.0b3

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

diff --git a/esphome/const.py b/esphome/const.py
index a66dfbc0fd..3fa46f788e 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.3.0b2"
+__version__ = "2023.3.0b3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From b00e20c29fbba9ac23f04ce8b49a581546e58ce7 Mon Sep 17 00:00:00 2001
From: Eduardo Roldan <trazor@gmail.com>
Date: Mon, 13 Mar 2023 19:46:46 -0300
Subject: [PATCH 685/838] pipsolar component. Correct the sscanf format for
 QPIG command parsing to set pv_input_voltage as float (not int) (#4165)

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

diff --git a/esphome/components/pipsolar/pipsolar.cpp b/esphome/components/pipsolar/pipsolar.cpp
index fab4705be7..5f203645fe 100644
--- a/esphome/components/pipsolar/pipsolar.cpp
+++ b/esphome/components/pipsolar/pipsolar.cpp
@@ -448,7 +448,7 @@ void Pipsolar::loop() {
         ESP_LOGD(TAG, "Decode QPIGS");
         sscanf(                                                                                              // NOLINT
             tmp,                                                                                             // NOLINT
-            "(%f %f %f %f %d %d %d %d %f %d %d %d %d %f %f %d %1d%1d%1d%1d%1d%1d%1d%1d %d %d %d %1d%1d%1d",  // NOLINT
+            "(%f %f %f %f %d %d %d %d %f %d %d %d %f %f %f %d %1d%1d%1d%1d%1d%1d%1d%1d %d %d %d %1d%1d%1d",  // NOLINT
             &value_grid_voltage_, &value_grid_frequency_, &value_ac_output_voltage_,                         // NOLINT
             &value_ac_output_frequency_,                                                                     // NOLINT
             &value_ac_output_apparent_power_, &value_ac_output_active_power_, &value_output_load_percent_,   // NOLINT
diff --git a/esphome/components/pipsolar/pipsolar.h b/esphome/components/pipsolar/pipsolar.h
index 4f6edb4810..65fd3c670d 100644
--- a/esphome/components/pipsolar/pipsolar.h
+++ b/esphome/components/pipsolar/pipsolar.h
@@ -65,7 +65,7 @@ class Pipsolar : public uart::UARTDevice, public PollingComponent {
   PIPSOLAR_SENSOR(battery_charging_current, QPIGS, int)
   PIPSOLAR_SENSOR(battery_capacity_percent, QPIGS, int)
   PIPSOLAR_SENSOR(inverter_heat_sink_temperature, QPIGS, int)
-  PIPSOLAR_SENSOR(pv_input_current_for_battery, QPIGS, int)
+  PIPSOLAR_SENSOR(pv_input_current_for_battery, QPIGS, float)
   PIPSOLAR_SENSOR(pv_input_voltage, QPIGS, float)
   PIPSOLAR_SENSOR(battery_voltage_scc, QPIGS, float)
   PIPSOLAR_SENSOR(battery_discharge_current, QPIGS, int)

From a44e38300b6de73a5d540d30a9156e42b51a1cac Mon Sep 17 00:00:00 2001
From: DAVe3283 <DAVe3283@gmail.com>
Date: Mon, 13 Mar 2023 18:52:19 -0600
Subject: [PATCH 686/838] Revert "Remove state class from uptime sensor
 (#4345)" (#4557)

This reverts commit 36c2e770bfd5b43a5471590be0d10033049eb3ea.
Addresses esphome/issues#4193.
---
 esphome/components/uptime/sensor.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/components/uptime/sensor.py b/esphome/components/uptime/sensor.py
index 50e584f5d5..07d7d8f2cf 100644
--- a/esphome/components/uptime/sensor.py
+++ b/esphome/components/uptime/sensor.py
@@ -3,6 +3,7 @@ import esphome.config_validation as cv
 from esphome.components import sensor
 from esphome.const import (
     ENTITY_CATEGORY_DIAGNOSTIC,
+    STATE_CLASS_TOTAL_INCREASING,
     UNIT_SECOND,
     ICON_TIMER,
     DEVICE_CLASS_DURATION,
@@ -16,6 +17,7 @@ CONFIG_SCHEMA = sensor.sensor_schema(
     unit_of_measurement=UNIT_SECOND,
     icon=ICON_TIMER,
     accuracy_decimals=0,
+    state_class=STATE_CLASS_TOTAL_INCREASING,
     device_class=DEVICE_CLASS_DURATION,
     entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
 ).extend(cv.polling_component_schema("60s"))

From ee7102fcd19606403765850d1f6b1310d914f1d4 Mon Sep 17 00:00:00 2001
From: Stroe Andrei Catalin <catalin.stroe@conceptapps.ro>
Date: Tue, 14 Mar 2023 02:54:35 +0200
Subject: [PATCH 687/838] Added response for Tuya RSSI command (#4549)

* Added wifi rssi util
Added tuya mcu response to wifi rssi command

* Cleanup

* PR Comments

* PR Comments
---
 esphome/components/tuya/tuya.cpp | 17 +++++++++++++++++
 esphome/components/tuya/tuya.h   |  2 ++
 2 files changed, 19 insertions(+)

diff --git a/esphome/components/tuya/tuya.cpp b/esphome/components/tuya/tuya.cpp
index fad4bb0bac..79a9049b04 100644
--- a/esphome/components/tuya/tuya.cpp
+++ b/esphome/components/tuya/tuya.cpp
@@ -5,6 +5,10 @@
 #include "esphome/core/util.h"
 #include "esphome/core/gpio.h"
 
+#ifdef USE_WIFI
+#include "esphome/components/wifi/wifi_component.h"
+#endif
+
 #ifdef USE_CAPTIVE_PORTAL
 #include "esphome/components/captive_portal/captive_portal.h"
 #endif
@@ -234,6 +238,10 @@ void Tuya::handle_command_(uint8_t command, uint8_t version, const uint8_t *buff
     case TuyaCommandType::WIFI_TEST:
       this->send_command_(TuyaCommand{.cmd = TuyaCommandType::WIFI_TEST, .payload = std::vector<uint8_t>{0x00, 0x00}});
       break;
+    case TuyaCommandType::WIFI_RSSI:
+      this->send_command_(
+          TuyaCommand{.cmd = TuyaCommandType::WIFI_RSSI, .payload = std::vector<uint8_t>{get_wifi_rssi_()}});
+      break;
     case TuyaCommandType::LOCAL_TIME_QUERY:
 #ifdef USE_TIME
       if (this->time_id_.has_value()) {
@@ -475,6 +483,15 @@ uint8_t Tuya::get_wifi_status_code_() {
   return status;
 }
 
+uint8_t Tuya::get_wifi_rssi_() {
+#ifdef USE_WIFI
+  if (wifi::global_wifi_component != nullptr)
+    return wifi::global_wifi_component->wifi_rssi();
+#endif
+
+  return 0;
+}
+
 void Tuya::send_wifi_status_() {
   uint8_t status = this->get_wifi_status_code_();
 
diff --git a/esphome/components/tuya/tuya.h b/esphome/components/tuya/tuya.h
index b9c917f672..8d6153482f 100644
--- a/esphome/components/tuya/tuya.h
+++ b/esphome/components/tuya/tuya.h
@@ -55,6 +55,7 @@ enum class TuyaCommandType : uint8_t {
   DATAPOINT_QUERY = 0x08,
   WIFI_TEST = 0x0E,
   LOCAL_TIME_QUERY = 0x1C,
+  WIFI_RSSI = 0x24,
   VACUUM_MAP_UPLOAD = 0x28,
   GET_NETWORK_STATUS = 0x2B,
 };
@@ -123,6 +124,7 @@ class Tuya : public Component, public uart::UARTDevice {
   void set_status_pin_();
   void send_wifi_status_();
   uint8_t get_wifi_status_code_();
+  uint8_t get_wifi_rssi_();
 
 #ifdef USE_TIME
   void send_local_time_();

From 8a705bf4b042eb8aa8a29358e45a563e0492e5c5 Mon Sep 17 00:00:00 2001
From: Eduardo Roldan <trazor@gmail.com>
Date: Mon, 13 Mar 2023 19:46:46 -0300
Subject: [PATCH 688/838] pipsolar component. Correct the sscanf format for
 QPIG command parsing to set pv_input_voltage as float (not int) (#4165)

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

diff --git a/esphome/components/pipsolar/pipsolar.cpp b/esphome/components/pipsolar/pipsolar.cpp
index fab4705be7..5f203645fe 100644
--- a/esphome/components/pipsolar/pipsolar.cpp
+++ b/esphome/components/pipsolar/pipsolar.cpp
@@ -448,7 +448,7 @@ void Pipsolar::loop() {
         ESP_LOGD(TAG, "Decode QPIGS");
         sscanf(                                                                                              // NOLINT
             tmp,                                                                                             // NOLINT
-            "(%f %f %f %f %d %d %d %d %f %d %d %d %d %f %f %d %1d%1d%1d%1d%1d%1d%1d%1d %d %d %d %1d%1d%1d",  // NOLINT
+            "(%f %f %f %f %d %d %d %d %f %d %d %d %f %f %f %d %1d%1d%1d%1d%1d%1d%1d%1d %d %d %d %1d%1d%1d",  // NOLINT
             &value_grid_voltage_, &value_grid_frequency_, &value_ac_output_voltage_,                         // NOLINT
             &value_ac_output_frequency_,                                                                     // NOLINT
             &value_ac_output_apparent_power_, &value_ac_output_active_power_, &value_output_load_percent_,   // NOLINT
diff --git a/esphome/components/pipsolar/pipsolar.h b/esphome/components/pipsolar/pipsolar.h
index 4f6edb4810..65fd3c670d 100644
--- a/esphome/components/pipsolar/pipsolar.h
+++ b/esphome/components/pipsolar/pipsolar.h
@@ -65,7 +65,7 @@ class Pipsolar : public uart::UARTDevice, public PollingComponent {
   PIPSOLAR_SENSOR(battery_charging_current, QPIGS, int)
   PIPSOLAR_SENSOR(battery_capacity_percent, QPIGS, int)
   PIPSOLAR_SENSOR(inverter_heat_sink_temperature, QPIGS, int)
-  PIPSOLAR_SENSOR(pv_input_current_for_battery, QPIGS, int)
+  PIPSOLAR_SENSOR(pv_input_current_for_battery, QPIGS, float)
   PIPSOLAR_SENSOR(pv_input_voltage, QPIGS, float)
   PIPSOLAR_SENSOR(battery_voltage_scc, QPIGS, float)
   PIPSOLAR_SENSOR(battery_discharge_current, QPIGS, int)

From 0c7a3d1fffef6c9292b965bb0b9f8dc6790522e5 Mon Sep 17 00:00:00 2001
From: DAVe3283 <DAVe3283@gmail.com>
Date: Mon, 13 Mar 2023 18:52:19 -0600
Subject: [PATCH 689/838] Revert "Remove state class from uptime sensor
 (#4345)" (#4557)

This reverts commit 36c2e770bfd5b43a5471590be0d10033049eb3ea.
Addresses esphome/issues#4193.
---
 esphome/components/uptime/sensor.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/components/uptime/sensor.py b/esphome/components/uptime/sensor.py
index 50e584f5d5..07d7d8f2cf 100644
--- a/esphome/components/uptime/sensor.py
+++ b/esphome/components/uptime/sensor.py
@@ -3,6 +3,7 @@ import esphome.config_validation as cv
 from esphome.components import sensor
 from esphome.const import (
     ENTITY_CATEGORY_DIAGNOSTIC,
+    STATE_CLASS_TOTAL_INCREASING,
     UNIT_SECOND,
     ICON_TIMER,
     DEVICE_CLASS_DURATION,
@@ -16,6 +17,7 @@ CONFIG_SCHEMA = sensor.sensor_schema(
     unit_of_measurement=UNIT_SECOND,
     icon=ICON_TIMER,
     accuracy_decimals=0,
+    state_class=STATE_CLASS_TOTAL_INCREASING,
     device_class=DEVICE_CLASS_DURATION,
     entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
 ).extend(cv.polling_component_schema("60s"))

From 5e11469f50744ad3d01648cc449882f5cb425187 Mon Sep 17 00:00:00 2001
From: Stroe Andrei Catalin <catalin.stroe@conceptapps.ro>
Date: Tue, 14 Mar 2023 02:54:35 +0200
Subject: [PATCH 690/838] Added response for Tuya RSSI command (#4549)

* Added wifi rssi util
Added tuya mcu response to wifi rssi command

* Cleanup

* PR Comments

* PR Comments
---
 esphome/components/tuya/tuya.cpp | 17 +++++++++++++++++
 esphome/components/tuya/tuya.h   |  2 ++
 2 files changed, 19 insertions(+)

diff --git a/esphome/components/tuya/tuya.cpp b/esphome/components/tuya/tuya.cpp
index fad4bb0bac..79a9049b04 100644
--- a/esphome/components/tuya/tuya.cpp
+++ b/esphome/components/tuya/tuya.cpp
@@ -5,6 +5,10 @@
 #include "esphome/core/util.h"
 #include "esphome/core/gpio.h"
 
+#ifdef USE_WIFI
+#include "esphome/components/wifi/wifi_component.h"
+#endif
+
 #ifdef USE_CAPTIVE_PORTAL
 #include "esphome/components/captive_portal/captive_portal.h"
 #endif
@@ -234,6 +238,10 @@ void Tuya::handle_command_(uint8_t command, uint8_t version, const uint8_t *buff
     case TuyaCommandType::WIFI_TEST:
       this->send_command_(TuyaCommand{.cmd = TuyaCommandType::WIFI_TEST, .payload = std::vector<uint8_t>{0x00, 0x00}});
       break;
+    case TuyaCommandType::WIFI_RSSI:
+      this->send_command_(
+          TuyaCommand{.cmd = TuyaCommandType::WIFI_RSSI, .payload = std::vector<uint8_t>{get_wifi_rssi_()}});
+      break;
     case TuyaCommandType::LOCAL_TIME_QUERY:
 #ifdef USE_TIME
       if (this->time_id_.has_value()) {
@@ -475,6 +483,15 @@ uint8_t Tuya::get_wifi_status_code_() {
   return status;
 }
 
+uint8_t Tuya::get_wifi_rssi_() {
+#ifdef USE_WIFI
+  if (wifi::global_wifi_component != nullptr)
+    return wifi::global_wifi_component->wifi_rssi();
+#endif
+
+  return 0;
+}
+
 void Tuya::send_wifi_status_() {
   uint8_t status = this->get_wifi_status_code_();
 
diff --git a/esphome/components/tuya/tuya.h b/esphome/components/tuya/tuya.h
index b9c917f672..8d6153482f 100644
--- a/esphome/components/tuya/tuya.h
+++ b/esphome/components/tuya/tuya.h
@@ -55,6 +55,7 @@ enum class TuyaCommandType : uint8_t {
   DATAPOINT_QUERY = 0x08,
   WIFI_TEST = 0x0E,
   LOCAL_TIME_QUERY = 0x1C,
+  WIFI_RSSI = 0x24,
   VACUUM_MAP_UPLOAD = 0x28,
   GET_NETWORK_STATUS = 0x2B,
 };
@@ -123,6 +124,7 @@ class Tuya : public Component, public uart::UARTDevice {
   void set_status_pin_();
   void send_wifi_status_();
   uint8_t get_wifi_status_code_();
+  uint8_t get_wifi_rssi_();
 
 #ifdef USE_TIME
   void send_local_time_();

From 9a7af97b2df059159a3eaa632206dbec031e74ef Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 14 Mar 2023 14:11:55 +1300
Subject: [PATCH 691/838] Bump version to 2023.3.0b4

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

diff --git a/esphome/const.py b/esphome/const.py
index 3fa46f788e..08182728a2 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.3.0b3"
+__version__ = "2023.3.0b4"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From d3f2b93c42961fc556ceca6918938090bb81ce8b Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Wed, 15 Mar 2023 00:21:23 -0500
Subject: [PATCH 692/838] Remove switch actions during config; bump setup
 priority (#4563)

---
 esphome/components/sprinkler/sprinkler.cpp | 6 ------
 esphome/components/sprinkler/sprinkler.h   | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/esphome/components/sprinkler/sprinkler.cpp b/esphome/components/sprinkler/sprinkler.cpp
index 9d3044802d..d73d8d8fbf 100644
--- a/esphome/components/sprinkler/sprinkler.cpp
+++ b/esphome/components/sprinkler/sprinkler.cpp
@@ -477,7 +477,6 @@ void Sprinkler::configure_valve_switch(size_t valve_number, switch_::Switch *val
   if (this->is_a_valid_valve(valve_number)) {
     this->valve_[valve_number].valve_switch.set_on_switch(valve_switch);
     this->valve_[valve_number].run_duration = run_duration;
-    valve_switch->turn_off();
   }
 }
 
@@ -489,8 +488,6 @@ void Sprinkler::configure_valve_switch_pulsed(size_t valve_number, switch_::Swit
     this->valve_[valve_number].valve_switch.set_on_switch(valve_switch_on);
     this->valve_[valve_number].valve_switch.set_pulse_duration(pulse_duration);
     this->valve_[valve_number].run_duration = run_duration;
-    valve_switch_off->turn_off();
-    valve_switch_on->turn_off();
   }
 }
 
@@ -505,7 +502,6 @@ void Sprinkler::configure_valve_pump_switch(size_t valve_number, switch_::Switch
     this->pump_.resize(this->pump_.size() + 1);
     this->pump_.back().set_on_switch(pump_switch);
     this->valve_[valve_number].pump_switch_index = this->pump_.size() - 1;  // save the index to the new pump
-    pump_switch->turn_off();
   }
 }
 
@@ -524,8 +520,6 @@ void Sprinkler::configure_valve_pump_switch_pulsed(size_t valve_number, switch_:
     this->pump_.back().set_on_switch(pump_switch_on);
     this->pump_.back().set_pulse_duration(pulse_duration);
     this->valve_[valve_number].pump_switch_index = this->pump_.size() - 1;  // save the index to the new pump
-    pump_switch_off->turn_off();
-    pump_switch_on->turn_off();
   }
 }
 
diff --git a/esphome/components/sprinkler/sprinkler.h b/esphome/components/sprinkler/sprinkler.h
index 1b8c7e4528..1cde60321d 100644
--- a/esphome/components/sprinkler/sprinkler.h
+++ b/esphome/components/sprinkler/sprinkler.h
@@ -103,7 +103,7 @@ class SprinklerControllerNumber : public number::Number, public Component {
  public:
   void setup() override;
   void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::HARDWARE; }
+  float get_setup_priority() const override { return setup_priority::PROCESSOR; }
 
   Trigger<float> *get_set_trigger() const { return set_trigger_; }
   void set_initial_value(float initial_value) { initial_value_ = initial_value; }

From 215107e8ea9548cd28171103b9bf019d01da6b24 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 15 Mar 2023 20:42:33 +1300
Subject: [PATCH 693/838] Mark esp32_touch supported only on standard esp32
 variant (#4562)

* Mark esp32_touch supported only on standard esp32 variant

* Add back default
---
 esphome/components/esp32_touch/__init__.py | 56 ++++++++++++----------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/esphome/components/esp32_touch/__init__.py b/esphome/components/esp32_touch/__init__.py
index cdf6aa3abd..3c9bef9665 100644
--- a/esphome/components/esp32_touch/__init__.py
+++ b/esphome/components/esp32_touch/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_VOLTAGE_ATTENUATION,
 )
 from esphome.core import TimePeriod
+from esphome.components import esp32
 
 AUTO_LOAD = ["binary_sensor"]
 DEPENDENCIES = ["esp32"]
@@ -50,30 +51,37 @@ VOLTAGE_ATTENUATION = {
     "0V": cg.global_ns.TOUCH_HVOLT_ATTEN_0V,
 }
 
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(ESP32TouchComponent),
-        cv.Optional(CONF_SETUP_MODE, default=False): cv.boolean,
-        cv.Optional(
-            CONF_IIR_FILTER, default="0ms"
-        ): cv.positive_time_period_milliseconds,
-        cv.Optional(CONF_SLEEP_DURATION, default="27306us"): cv.All(
-            cv.positive_time_period, cv.Range(max=TimePeriod(microseconds=436906))
-        ),
-        cv.Optional(CONF_MEASUREMENT_DURATION, default="8192us"): cv.All(
-            cv.positive_time_period, cv.Range(max=TimePeriod(microseconds=8192))
-        ),
-        cv.Optional(CONF_LOW_VOLTAGE_REFERENCE, default="0.5V"): validate_voltage(
-            LOW_VOLTAGE_REFERENCE
-        ),
-        cv.Optional(CONF_HIGH_VOLTAGE_REFERENCE, default="2.7V"): validate_voltage(
-            HIGH_VOLTAGE_REFERENCE
-        ),
-        cv.Optional(CONF_VOLTAGE_ATTENUATION, default="0V"): validate_voltage(
-            VOLTAGE_ATTENUATION
-        ),
-    }
-).extend(cv.COMPONENT_SCHEMA)
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(ESP32TouchComponent),
+            cv.Optional(CONF_SETUP_MODE, default=False): cv.boolean,
+            cv.Optional(
+                CONF_IIR_FILTER, default="0ms"
+            ): cv.positive_time_period_milliseconds,
+            cv.Optional(CONF_SLEEP_DURATION, default="27306us"): cv.All(
+                cv.positive_time_period, cv.Range(max=TimePeriod(microseconds=436906))
+            ),
+            cv.Optional(CONF_MEASUREMENT_DURATION, default="8192us"): cv.All(
+                cv.positive_time_period, cv.Range(max=TimePeriod(microseconds=8192))
+            ),
+            cv.Optional(CONF_LOW_VOLTAGE_REFERENCE, default="0.5V"): validate_voltage(
+                LOW_VOLTAGE_REFERENCE
+            ),
+            cv.Optional(CONF_HIGH_VOLTAGE_REFERENCE, default="2.7V"): validate_voltage(
+                HIGH_VOLTAGE_REFERENCE
+            ),
+            cv.Optional(CONF_VOLTAGE_ATTENUATION, default="0V"): validate_voltage(
+                VOLTAGE_ATTENUATION
+            ),
+        }
+    ).extend(cv.COMPONENT_SCHEMA),
+    esp32.only_on_variant(
+        supported=[
+            esp32.const.VARIANT_ESP32,
+        ]
+    ),
+)
 
 
 async def to_code(config):

From 83f8e8424779f56c1244de4001ac3e9509dfc4fe Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Wed, 15 Mar 2023 00:21:23 -0500
Subject: [PATCH 694/838] Remove switch actions during config; bump setup
 priority (#4563)

---
 esphome/components/sprinkler/sprinkler.cpp | 6 ------
 esphome/components/sprinkler/sprinkler.h   | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/esphome/components/sprinkler/sprinkler.cpp b/esphome/components/sprinkler/sprinkler.cpp
index 9d3044802d..d73d8d8fbf 100644
--- a/esphome/components/sprinkler/sprinkler.cpp
+++ b/esphome/components/sprinkler/sprinkler.cpp
@@ -477,7 +477,6 @@ void Sprinkler::configure_valve_switch(size_t valve_number, switch_::Switch *val
   if (this->is_a_valid_valve(valve_number)) {
     this->valve_[valve_number].valve_switch.set_on_switch(valve_switch);
     this->valve_[valve_number].run_duration = run_duration;
-    valve_switch->turn_off();
   }
 }
 
@@ -489,8 +488,6 @@ void Sprinkler::configure_valve_switch_pulsed(size_t valve_number, switch_::Swit
     this->valve_[valve_number].valve_switch.set_on_switch(valve_switch_on);
     this->valve_[valve_number].valve_switch.set_pulse_duration(pulse_duration);
     this->valve_[valve_number].run_duration = run_duration;
-    valve_switch_off->turn_off();
-    valve_switch_on->turn_off();
   }
 }
 
@@ -505,7 +502,6 @@ void Sprinkler::configure_valve_pump_switch(size_t valve_number, switch_::Switch
     this->pump_.resize(this->pump_.size() + 1);
     this->pump_.back().set_on_switch(pump_switch);
     this->valve_[valve_number].pump_switch_index = this->pump_.size() - 1;  // save the index to the new pump
-    pump_switch->turn_off();
   }
 }
 
@@ -524,8 +520,6 @@ void Sprinkler::configure_valve_pump_switch_pulsed(size_t valve_number, switch_:
     this->pump_.back().set_on_switch(pump_switch_on);
     this->pump_.back().set_pulse_duration(pulse_duration);
     this->valve_[valve_number].pump_switch_index = this->pump_.size() - 1;  // save the index to the new pump
-    pump_switch_off->turn_off();
-    pump_switch_on->turn_off();
   }
 }
 
diff --git a/esphome/components/sprinkler/sprinkler.h b/esphome/components/sprinkler/sprinkler.h
index 1b8c7e4528..1cde60321d 100644
--- a/esphome/components/sprinkler/sprinkler.h
+++ b/esphome/components/sprinkler/sprinkler.h
@@ -103,7 +103,7 @@ class SprinklerControllerNumber : public number::Number, public Component {
  public:
   void setup() override;
   void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::HARDWARE; }
+  float get_setup_priority() const override { return setup_priority::PROCESSOR; }
 
   Trigger<float> *get_set_trigger() const { return set_trigger_; }
   void set_initial_value(float initial_value) { initial_value_ = initial_value; }

From 11567085d8e78888b8a73a683c15a890233fd0bc Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 15 Mar 2023 20:42:33 +1300
Subject: [PATCH 695/838] Mark esp32_touch supported only on standard esp32
 variant (#4562)

* Mark esp32_touch supported only on standard esp32 variant

* Add back default
---
 esphome/components/esp32_touch/__init__.py | 56 ++++++++++++----------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/esphome/components/esp32_touch/__init__.py b/esphome/components/esp32_touch/__init__.py
index cdf6aa3abd..3c9bef9665 100644
--- a/esphome/components/esp32_touch/__init__.py
+++ b/esphome/components/esp32_touch/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_VOLTAGE_ATTENUATION,
 )
 from esphome.core import TimePeriod
+from esphome.components import esp32
 
 AUTO_LOAD = ["binary_sensor"]
 DEPENDENCIES = ["esp32"]
@@ -50,30 +51,37 @@ VOLTAGE_ATTENUATION = {
     "0V": cg.global_ns.TOUCH_HVOLT_ATTEN_0V,
 }
 
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(ESP32TouchComponent),
-        cv.Optional(CONF_SETUP_MODE, default=False): cv.boolean,
-        cv.Optional(
-            CONF_IIR_FILTER, default="0ms"
-        ): cv.positive_time_period_milliseconds,
-        cv.Optional(CONF_SLEEP_DURATION, default="27306us"): cv.All(
-            cv.positive_time_period, cv.Range(max=TimePeriod(microseconds=436906))
-        ),
-        cv.Optional(CONF_MEASUREMENT_DURATION, default="8192us"): cv.All(
-            cv.positive_time_period, cv.Range(max=TimePeriod(microseconds=8192))
-        ),
-        cv.Optional(CONF_LOW_VOLTAGE_REFERENCE, default="0.5V"): validate_voltage(
-            LOW_VOLTAGE_REFERENCE
-        ),
-        cv.Optional(CONF_HIGH_VOLTAGE_REFERENCE, default="2.7V"): validate_voltage(
-            HIGH_VOLTAGE_REFERENCE
-        ),
-        cv.Optional(CONF_VOLTAGE_ATTENUATION, default="0V"): validate_voltage(
-            VOLTAGE_ATTENUATION
-        ),
-    }
-).extend(cv.COMPONENT_SCHEMA)
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(ESP32TouchComponent),
+            cv.Optional(CONF_SETUP_MODE, default=False): cv.boolean,
+            cv.Optional(
+                CONF_IIR_FILTER, default="0ms"
+            ): cv.positive_time_period_milliseconds,
+            cv.Optional(CONF_SLEEP_DURATION, default="27306us"): cv.All(
+                cv.positive_time_period, cv.Range(max=TimePeriod(microseconds=436906))
+            ),
+            cv.Optional(CONF_MEASUREMENT_DURATION, default="8192us"): cv.All(
+                cv.positive_time_period, cv.Range(max=TimePeriod(microseconds=8192))
+            ),
+            cv.Optional(CONF_LOW_VOLTAGE_REFERENCE, default="0.5V"): validate_voltage(
+                LOW_VOLTAGE_REFERENCE
+            ),
+            cv.Optional(CONF_HIGH_VOLTAGE_REFERENCE, default="2.7V"): validate_voltage(
+                HIGH_VOLTAGE_REFERENCE
+            ),
+            cv.Optional(CONF_VOLTAGE_ATTENUATION, default="0V"): validate_voltage(
+                VOLTAGE_ATTENUATION
+            ),
+        }
+    ).extend(cv.COMPONENT_SCHEMA),
+    esp32.only_on_variant(
+        supported=[
+            esp32.const.VARIANT_ESP32,
+        ]
+    ),
+)
 
 
 async def to_code(config):

From fce99d4b17738fe9bb53e272b6718621255c44a7 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 15 Mar 2023 21:20:08 +1300
Subject: [PATCH 696/838] Bump version to 2023.3.0b5

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

diff --git a/esphome/const.py b/esphome/const.py
index 08182728a2..6887632ed5 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.3.0b4"
+__version__ = "2023.3.0b5"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 2f50e18eb52bf4ae4d856248e51fe8e4a9abc717 Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Wed, 15 Mar 2023 20:45:50 +0100
Subject: [PATCH 697/838] fixing  `shrink` and `extend` functions of the
 displaybuffer's Rect class  (#4565)

* fixing rectangle's `shrink` and `extend`

* fixed the rect::shrink and rect::inside methods
and added rect:equal() method

* fixed internal clang issue again. When would is
this going to be fixed :(

* fixed internal clang issue again. When would is
this going to be fixed :(

* remove trailing space
---
 esphome/components/display/display_buffer.cpp | 33 ++++++++++++-------
 esphome/components/display/display_buffer.h   |  5 +--
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/esphome/components/display/display_buffer.cpp b/esphome/components/display/display_buffer.cpp
index 420801f863..7cd85dabd4 100644
--- a/esphome/components/display/display_buffer.cpp
+++ b/esphome/components/display/display_buffer.cpp
@@ -32,9 +32,11 @@ void Rect::extend(Rect rect) {
     this->h = rect.h;
   } else {
     if (this->x > rect.x) {
+      this->w = this->w + (this->x - rect.x);
       this->x = rect.x;
     }
     if (this->y > rect.y) {
+      this->h = this->h + (this->y - rect.y);
       this->y = rect.y;
     }
     if (this->x2() < rect.x2()) {
@@ -49,29 +51,35 @@ void Rect::shrink(Rect rect) {
   if (!this->inside(rect)) {
     (*this) = Rect();
   } else {
-    if (this->x < rect.x) {
-      this->x = rect.x;
-    }
-    if (this->y < rect.y) {
-      this->y = rect.y;
-    }
     if (this->x2() > rect.x2()) {
       this->w = rect.x2() - this->x;
     }
+    if (this->x < rect.x) {
+      this->w = this->w + (this->x - rect.x);
+      this->x = rect.x;
+    }
     if (this->y2() > rect.y2()) {
       this->h = rect.y2() - this->y;
     }
+    if (this->y < rect.y) {
+      this->h = this->h + (this->y - rect.y);
+      this->y = rect.y;
+    }
   }
 }
 
-bool Rect::inside(int16_t x, int16_t y, bool absolute) {  // NOLINT
+bool Rect::equal(Rect rect) {
+  return (rect.x == this->x) && (rect.w == this->w) && (rect.y == this->y) && (rect.h == this->h);
+}
+
+bool Rect::inside(int16_t test_x, int16_t test_y, bool absolute) {  // NOLINT
   if (!this->is_set()) {
     return true;
   }
   if (absolute) {
-    return ((x >= 0) && (x <= this->w) && (y >= 0) && (y <= this->h));
+    return ((test_x >= this->x) && (test_x <= this->x2()) && (test_y >= this->y) && (test_y <= this->y2()));
   } else {
-    return ((x >= this->x) && (x <= this->x2()) && (y >= this->y) && (y <= this->y2()));
+    return ((test_x >= 0) && (test_x <= this->w) && (test_y >= 0) && (test_y <= this->h));
   }
 }
 
@@ -80,15 +88,16 @@ bool Rect::inside(Rect rect, bool absolute) {
     return true;
   }
   if (absolute) {
-    return ((rect.x <= this->w) && (rect.w >= 0) && (rect.y <= this->h) && (rect.h >= 0));
-  } else {
     return ((rect.x <= this->x2()) && (rect.x2() >= this->x) && (rect.y <= this->y2()) && (rect.y2() >= this->y));
+  } else {
+    return ((rect.x <= this->w) && (rect.w >= 0) && (rect.y <= this->h) && (rect.h >= 0));
   }
 }
 
 void Rect::info(const std::string &prefix) {
   if (this->is_set()) {
-    ESP_LOGI(TAG, "%s [%3d,%3d,%3d,%3d]", prefix.c_str(), this->x, this->y, this->w, this->h);
+    ESP_LOGI(TAG, "%s [%3d,%3d,%3d,%3d] (%3d,%3d)", prefix.c_str(), this->x, this->y, this->w, this->h, this->x2(),
+             this->y2());
   } else
     ESP_LOGI(TAG, "%s ** IS NOT SET **", prefix.c_str());
 }
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index 0402826594..4477685e1b 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -120,8 +120,9 @@ class Rect {
   void extend(Rect rect);
   void shrink(Rect rect);
 
-  bool inside(Rect rect, bool absolute = false);
-  bool inside(int16_t x, int16_t y, bool absolute = false);
+  bool inside(Rect rect, bool absolute = true);
+  bool inside(int16_t test_x, int16_t test_y, bool absolute = true);
+  bool equal(Rect rect);
   void info(const std::string &prefix = "rect info:");
 };
 

From 5ffdc668642fc2812f36e275a8812af844a2580d Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Wed, 15 Mar 2023 20:45:50 +0100
Subject: [PATCH 698/838] fixing  `shrink` and `extend` functions of the
 displaybuffer's Rect class  (#4565)

* fixing rectangle's `shrink` and `extend`

* fixed the rect::shrink and rect::inside methods
and added rect:equal() method

* fixed internal clang issue again. When would is
this going to be fixed :(

* fixed internal clang issue again. When would is
this going to be fixed :(

* remove trailing space
---
 esphome/components/display/display_buffer.cpp | 33 ++++++++++++-------
 esphome/components/display/display_buffer.h   |  5 +--
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/esphome/components/display/display_buffer.cpp b/esphome/components/display/display_buffer.cpp
index 420801f863..7cd85dabd4 100644
--- a/esphome/components/display/display_buffer.cpp
+++ b/esphome/components/display/display_buffer.cpp
@@ -32,9 +32,11 @@ void Rect::extend(Rect rect) {
     this->h = rect.h;
   } else {
     if (this->x > rect.x) {
+      this->w = this->w + (this->x - rect.x);
       this->x = rect.x;
     }
     if (this->y > rect.y) {
+      this->h = this->h + (this->y - rect.y);
       this->y = rect.y;
     }
     if (this->x2() < rect.x2()) {
@@ -49,29 +51,35 @@ void Rect::shrink(Rect rect) {
   if (!this->inside(rect)) {
     (*this) = Rect();
   } else {
-    if (this->x < rect.x) {
-      this->x = rect.x;
-    }
-    if (this->y < rect.y) {
-      this->y = rect.y;
-    }
     if (this->x2() > rect.x2()) {
       this->w = rect.x2() - this->x;
     }
+    if (this->x < rect.x) {
+      this->w = this->w + (this->x - rect.x);
+      this->x = rect.x;
+    }
     if (this->y2() > rect.y2()) {
       this->h = rect.y2() - this->y;
     }
+    if (this->y < rect.y) {
+      this->h = this->h + (this->y - rect.y);
+      this->y = rect.y;
+    }
   }
 }
 
-bool Rect::inside(int16_t x, int16_t y, bool absolute) {  // NOLINT
+bool Rect::equal(Rect rect) {
+  return (rect.x == this->x) && (rect.w == this->w) && (rect.y == this->y) && (rect.h == this->h);
+}
+
+bool Rect::inside(int16_t test_x, int16_t test_y, bool absolute) {  // NOLINT
   if (!this->is_set()) {
     return true;
   }
   if (absolute) {
-    return ((x >= 0) && (x <= this->w) && (y >= 0) && (y <= this->h));
+    return ((test_x >= this->x) && (test_x <= this->x2()) && (test_y >= this->y) && (test_y <= this->y2()));
   } else {
-    return ((x >= this->x) && (x <= this->x2()) && (y >= this->y) && (y <= this->y2()));
+    return ((test_x >= 0) && (test_x <= this->w) && (test_y >= 0) && (test_y <= this->h));
   }
 }
 
@@ -80,15 +88,16 @@ bool Rect::inside(Rect rect, bool absolute) {
     return true;
   }
   if (absolute) {
-    return ((rect.x <= this->w) && (rect.w >= 0) && (rect.y <= this->h) && (rect.h >= 0));
-  } else {
     return ((rect.x <= this->x2()) && (rect.x2() >= this->x) && (rect.y <= this->y2()) && (rect.y2() >= this->y));
+  } else {
+    return ((rect.x <= this->w) && (rect.w >= 0) && (rect.y <= this->h) && (rect.h >= 0));
   }
 }
 
 void Rect::info(const std::string &prefix) {
   if (this->is_set()) {
-    ESP_LOGI(TAG, "%s [%3d,%3d,%3d,%3d]", prefix.c_str(), this->x, this->y, this->w, this->h);
+    ESP_LOGI(TAG, "%s [%3d,%3d,%3d,%3d] (%3d,%3d)", prefix.c_str(), this->x, this->y, this->w, this->h, this->x2(),
+             this->y2());
   } else
     ESP_LOGI(TAG, "%s ** IS NOT SET **", prefix.c_str());
 }
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index 0402826594..4477685e1b 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -120,8 +120,9 @@ class Rect {
   void extend(Rect rect);
   void shrink(Rect rect);
 
-  bool inside(Rect rect, bool absolute = false);
-  bool inside(int16_t x, int16_t y, bool absolute = false);
+  bool inside(Rect rect, bool absolute = true);
+  bool inside(int16_t test_x, int16_t test_y, bool absolute = true);
+  bool equal(Rect rect);
   void info(const std::string &prefix = "rect info:");
 };
 

From c3d9eef01f424951d5a1786984478ac3e8aa9d7d Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 16 Mar 2023 08:57:54 +1300
Subject: [PATCH 699/838] Bump version to 2023.3.0b6

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

diff --git a/esphome/const.py b/esphome/const.py
index 6887632ed5..ee7b8e96b1 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.3.0b5"
+__version__ = "2023.3.0b6"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 7f75832bf131f4acc5d6c3dbed881669cb7620cf Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 16 Mar 2023 09:38:19 +1300
Subject: [PATCH 700/838] Bump version to 2023.3.0

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

diff --git a/esphome/const.py b/esphome/const.py
index ee7b8e96b1..f175524796 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.3.0b6"
+__version__ = "2023.3.0"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 1b8b8cdd11eb8adf6ac152a6d8fcd41e8bad7606 Mon Sep 17 00:00:00 2001
From: Fabian <Fabian-Schmidt@users.noreply.github.com>
Date: Wed, 15 Mar 2023 23:20:12 +0100
Subject: [PATCH 701/838] EntityBase: Icon string can stay in flash. (#4566)

* Icon string can stay in flash.

* Remove redundant const.

---------

Co-authored-by: Your Name <you@example.com>
---
 esphome/core/entity_base.cpp | 9 +++++++--
 esphome/core/entity_base.h   | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/esphome/core/entity_base.cpp b/esphome/core/entity_base.cpp
index a9e1414018..6f88f069b3 100644
--- a/esphome/core/entity_base.cpp
+++ b/esphome/core/entity_base.cpp
@@ -23,8 +23,13 @@ bool EntityBase::is_disabled_by_default() const { return this->disabled_by_defau
 void EntityBase::set_disabled_by_default(bool disabled_by_default) { this->disabled_by_default_ = disabled_by_default; }
 
 // Entity Icon
-const std::string &EntityBase::get_icon() const { return this->icon_; }
-void EntityBase::set_icon(const std::string &name) { this->icon_ = name; }
+std::string EntityBase::get_icon() const {
+  if (this->icon_c_str_ == nullptr) {
+    return "";
+  }
+  return this->icon_c_str_;
+}
+void EntityBase::set_icon(const char *icon) { this->icon_c_str_ = icon; }
 
 // Entity Category
 EntityCategory EntityBase::get_entity_category() const { return this->entity_category_; }
diff --git a/esphome/core/entity_base.h b/esphome/core/entity_base.h
index a9eedfd07e..f6aae4e978 100644
--- a/esphome/core/entity_base.h
+++ b/esphome/core/entity_base.h
@@ -42,8 +42,8 @@ class EntityBase {
   void set_entity_category(EntityCategory entity_category);
 
   // Get/set this entity's icon
-  const std::string &get_icon() const;
-  void set_icon(const std::string &name);
+  std::string get_icon() const;
+  void set_icon(const char *icon);
 
  protected:
   /// The hash_base() function has been deprecated. It is kept in this
@@ -53,7 +53,7 @@ class EntityBase {
 
   std::string name_;
   std::string object_id_;
-  std::string icon_;
+  const char *icon_c_str_{nullptr};
   uint32_t object_id_hash_;
   bool internal_{false};
   bool disabled_by_default_{false};

From 25fb288016645120ebdacce4bafd9d2016e86324 Mon Sep 17 00:00:00 2001
From: Trent Houliston <trent@houliston.me>
Date: Thu, 16 Mar 2023 09:20:18 +1100
Subject: [PATCH 702/838] Update the delta filter to take a percentage value as
 well as an absolute value (#4391)

---
 esphome/components/sensor/__init__.py | 16 ++++++++++++++--
 esphome/components/sensor/filter.cpp  | 14 +++++++++-----
 esphome/components/sensor/filter.h    |  6 ++++--
 esphome/config_validation.py          |  2 +-
 tests/test1.yaml                      |  1 +
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index d3cb39c2f6..821e0afac0 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -466,9 +466,21 @@ async def lambda_filter_to_code(config, filter_id):
     return cg.new_Pvariable(filter_id, lambda_)
 
 
-@FILTER_REGISTRY.register("delta", DeltaFilter, cv.float_)
+def validate_delta(config):
+    try:
+        return (cv.positive_float(config), False)
+    except cv.Invalid:
+        pass
+    try:
+        return (cv.percentage(config), True)
+    except cv.Invalid:
+        pass
+    raise cv.Invalid("Delta filter requires a positive number or percentage value.")
+
+
+@FILTER_REGISTRY.register("delta", DeltaFilter, validate_delta)
 async def delta_filter_to_code(config, filter_id):
-    return cg.new_Pvariable(filter_id, config)
+    return cg.new_Pvariable(filter_id, *config)
 
 
 @FILTER_REGISTRY.register("or", OrFilter, validate_filters)
diff --git a/esphome/components/sensor/filter.cpp b/esphome/components/sensor/filter.cpp
index 7a2c98109c..bf65ac590f 100644
--- a/esphome/components/sensor/filter.cpp
+++ b/esphome/components/sensor/filter.cpp
@@ -315,19 +315,23 @@ optional<float> ThrottleFilter::new_value(float value) {
 }
 
 // DeltaFilter
-DeltaFilter::DeltaFilter(float min_delta) : min_delta_(min_delta), last_value_(NAN) {}
+DeltaFilter::DeltaFilter(float delta, bool percentage_mode)
+    : delta_(delta), current_delta_(delta), percentage_mode_(percentage_mode), last_value_(NAN) {}
 optional<float> DeltaFilter::new_value(float value) {
   if (std::isnan(value)) {
     if (std::isnan(this->last_value_)) {
       return {};
     } else {
+      if (this->percentage_mode_) {
+        this->current_delta_ = fabsf(value * this->delta_);
+      }
       return this->last_value_ = value;
     }
   }
-  if (std::isnan(this->last_value_)) {
-    return this->last_value_ = value;
-  }
-  if (fabsf(value - this->last_value_) >= this->min_delta_) {
+  if (std::isnan(this->last_value_) || fabsf(value - this->last_value_) >= this->current_delta_) {
+    if (this->percentage_mode_) {
+      this->current_delta_ = fabsf(value * this->delta_);
+    }
     return this->last_value_ = value;
   }
   return {};
diff --git a/esphome/components/sensor/filter.h b/esphome/components/sensor/filter.h
index c17d14583b..b560545b76 100644
--- a/esphome/components/sensor/filter.h
+++ b/esphome/components/sensor/filter.h
@@ -325,12 +325,14 @@ class HeartbeatFilter : public Filter, public Component {
 
 class DeltaFilter : public Filter {
  public:
-  explicit DeltaFilter(float min_delta);
+  explicit DeltaFilter(float delta, bool percentage_mode);
 
   optional<float> new_value(float value) override;
 
  protected:
-  float min_delta_;
+  float delta_;
+  float current_delta_;
+  bool percentage_mode_;
   float last_value_{NAN};
 };
 
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index a46d14053b..469b7031f6 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -1097,7 +1097,7 @@ def possibly_negative_percentage(value):
     if isinstance(value, str):
         try:
             if value.endswith("%"):
-                has_percent_sign = False
+                has_percent_sign = True
                 value = float(value[:-1].rstrip()) / 100.0
             else:
                 value = float(value)
diff --git a/tests/test1.yaml b/tests/test1.yaml
index ef389ea712..0ff8b60ea2 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -392,6 +392,7 @@ sensor:
       - heartbeat: 5s
       - debounce: 0.1s
       - delta: 5.0
+      - delta: 1%
       - or:
           - throttle: 1s
           - delta: 5.0

From 3d4c0e6667bfca7f39e5845f9e704f921bad2add Mon Sep 17 00:00:00 2001
From: R Huish <5207490+genestealer@users.noreply.github.com>
Date: Wed, 15 Mar 2023 22:21:10 +0000
Subject: [PATCH 703/838] Added missing PM_1_0 and PM_10_0 for PMS5003T and
 PMS5003ST  (#4560)

* Added missing PM_1_0 and PM_10_0 for PMS5003T

Added missing PM_1_0 and PM_10_0 for PMS5003T

* Revert "Added missing PM_1_0 and PM_10_0 for PMS5003T"

This reverts commit 86084f7c610bbecbcf123544297a670b91eead1d.

* Added tests for PMS5003T

* Added missing PM_1_0 and PM_10_0 for PMS5003T PMS5003ST

* Added missing PM_1_0 and PM_10_0 for PMS5003T

* lint: Trailing whitespace fixed

* tab character removed

* Clang format suggested edit
---
 esphome/components/pmsx003/pmsx003.cpp | 43 ++++++++++++++++++++++++--
 esphome/components/pmsx003/sensor.py   |  4 +--
 tests/test3.yaml                       | 18 +++++++++++
 3 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/esphome/components/pmsx003/pmsx003.cpp b/esphome/components/pmsx003/pmsx003.cpp
index 43f2e12f55..04aba4382b 100644
--- a/esphome/components/pmsx003/pmsx003.cpp
+++ b/esphome/components/pmsx003/pmsx003.cpp
@@ -264,13 +264,52 @@ void PMSX003Component::parse_data_() {
       break;
     }
     case PMSX003_TYPE_5003T: {
+      uint16_t pm_1_0_std_concentration = this->get_16_bit_uint_(4);
+      uint16_t pm_2_5_std_concentration = this->get_16_bit_uint_(6);
+      uint16_t pm_10_0_std_concentration = this->get_16_bit_uint_(8);
+
+      uint16_t pm_1_0_concentration = this->get_16_bit_uint_(10);
       uint16_t pm_2_5_concentration = this->get_16_bit_uint_(12);
+      uint16_t pm_10_0_concentration = this->get_16_bit_uint_(14);
+
+      uint16_t pm_particles_03um = this->get_16_bit_uint_(16);
+      uint16_t pm_particles_05um = this->get_16_bit_uint_(18);
+      uint16_t pm_particles_10um = this->get_16_bit_uint_(20);
+      uint16_t pm_particles_25um = this->get_16_bit_uint_(22);
+      // Note the pm particles 50um & 100um are not returned,
+      // as PMS5003T uses those data values for temperature and humidity.
+
       float temperature = this->get_16_bit_uint_(24) / 10.0f;
       float humidity = this->get_16_bit_uint_(26) / 10.0f;
-      ESP_LOGD(TAG, "Got PM2.5 Concentration: %u µg/m^3, Temperature: %.1f°C, Humidity: %.1f%%", pm_2_5_concentration,
-               temperature, humidity);
+
+      ESP_LOGD(TAG,
+               "Got PM1.0 Concentration: %u µg/m^3, PM2.5 Concentration %u µg/m^3, PM10.0 Concentration: %u µg/m^3, "
+               "Temperature: %.1f°C, Humidity: %.1f%%",
+               pm_1_0_concentration, pm_2_5_concentration, pm_10_0_concentration, temperature, humidity);
+
+      if (this->pm_1_0_std_sensor_ != nullptr)
+        this->pm_1_0_std_sensor_->publish_state(pm_1_0_std_concentration);
+      if (this->pm_2_5_std_sensor_ != nullptr)
+        this->pm_2_5_std_sensor_->publish_state(pm_2_5_std_concentration);
+      if (this->pm_10_0_std_sensor_ != nullptr)
+        this->pm_10_0_std_sensor_->publish_state(pm_10_0_std_concentration);
+
+      if (this->pm_1_0_sensor_ != nullptr)
+        this->pm_1_0_sensor_->publish_state(pm_1_0_concentration);
       if (this->pm_2_5_sensor_ != nullptr)
         this->pm_2_5_sensor_->publish_state(pm_2_5_concentration);
+      if (this->pm_10_0_sensor_ != nullptr)
+        this->pm_10_0_sensor_->publish_state(pm_10_0_concentration);
+
+      if (this->pm_particles_03um_sensor_ != nullptr)
+        this->pm_particles_03um_sensor_->publish_state(pm_particles_03um);
+      if (this->pm_particles_05um_sensor_ != nullptr)
+        this->pm_particles_05um_sensor_->publish_state(pm_particles_05um);
+      if (this->pm_particles_10um_sensor_ != nullptr)
+        this->pm_particles_10um_sensor_->publish_state(pm_particles_10um);
+      if (this->pm_particles_25um_sensor_ != nullptr)
+        this->pm_particles_25um_sensor_->publish_state(pm_particles_25um);
+
       if (this->temperature_sensor_ != nullptr)
         this->temperature_sensor_->publish_state(temperature);
       if (this->humidity_sensor_ != nullptr)
diff --git a/esphome/components/pmsx003/sensor.py b/esphome/components/pmsx003/sensor.py
index f3552f4081..eefcb529f2 100644
--- a/esphome/components/pmsx003/sensor.py
+++ b/esphome/components/pmsx003/sensor.py
@@ -55,9 +55,9 @@ PMSX003_TYPES = {
 }
 
 SENSORS_TO_TYPE = {
-    CONF_PM_1_0: [TYPE_PMSX003, TYPE_PMS5003ST, TYPE_PMS5003S],
+    CONF_PM_1_0: [TYPE_PMSX003, TYPE_PMS5003T, TYPE_PMS5003ST, TYPE_PMS5003S],
     CONF_PM_2_5: [TYPE_PMSX003, TYPE_PMS5003T, TYPE_PMS5003ST, TYPE_PMS5003S],
-    CONF_PM_10_0: [TYPE_PMSX003, TYPE_PMS5003ST, TYPE_PMS5003S],
+    CONF_PM_10_0: [TYPE_PMSX003, TYPE_PMS5003T, TYPE_PMS5003ST, TYPE_PMS5003S],
     CONF_TEMPERATURE: [TYPE_PMS5003T, TYPE_PMS5003ST],
     CONF_HUMIDITY: [TYPE_PMS5003T, TYPE_PMS5003ST],
     CONF_FORMALDEHYDE: [TYPE_PMS5003ST, TYPE_PMS5003S],
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 85c0fccc0b..651683c381 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -630,8 +630,26 @@ sensor:
   - platform: pmsx003
     uart_id: uart5
     type: PMS5003T
+    pm_1_0:
+      name: PM 1.0 Concentration
     pm_2_5:
       name: PM 2.5 Concentration
+    pm_10_0:
+      name: PM 10.0 Concentration
+    pm_1_0_std:
+      name: PM 1.0 Standard Atmospher Concentration
+    pm_2_5_std:
+      name: PM 2.5 Standard Atmospher Concentration
+    pm_10_0_std:
+      name: PM 10.0 Standard Atmospher Concentration
+    pm_0_3um:
+      name: Particulate Count >0.3um
+    pm_0_5um:
+      name: Particulate Count >0.5um
+    pm_1_0um:
+      name: Particulate Count >1.0um
+    pm_2_5um:
+      name: Particulate Count >2.5um
     temperature:
       name: PMS Temperature
     humidity:

From a8bb2a42a1f791e5f494b05866b9cd3f99e46c9c Mon Sep 17 00:00:00 2001
From: Witold Krecicki <wpk@culm.net>
Date: Wed, 15 Mar 2023 23:21:25 +0100
Subject: [PATCH 704/838] Add an option to force SPI into software mode, useful
 when (#4556)

reusing pins for different purposes.
---
 esphome/components/spi/__init__.py | 3 +++
 esphome/components/spi/spi.cpp     | 2 +-
 esphome/components/spi/spi.h       | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/esphome/components/spi/__init__.py b/esphome/components/spi/__init__.py
index eeaf37985b..e0fc9efb42 100644
--- a/esphome/components/spi/__init__.py
+++ b/esphome/components/spi/__init__.py
@@ -17,6 +17,7 @@ spi_ns = cg.esphome_ns.namespace("spi")
 SPIComponent = spi_ns.class_("SPIComponent", cg.Component)
 SPIDevice = spi_ns.class_("SPIDevice")
 MULTI_CONF = True
+CONF_FORCE_SW = "force_sw"
 
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
@@ -25,6 +26,7 @@ CONFIG_SCHEMA = cv.All(
             cv.Required(CONF_CLK_PIN): pins.gpio_output_pin_schema,
             cv.Optional(CONF_MISO_PIN): pins.gpio_input_pin_schema,
             cv.Optional(CONF_MOSI_PIN): pins.gpio_output_pin_schema,
+            cv.Optional(CONF_FORCE_SW, default=False): cv.boolean,
         }
     ),
     cv.has_at_least_one_key(CONF_MISO_PIN, CONF_MOSI_PIN),
@@ -39,6 +41,7 @@ async def to_code(config):
 
     clk = await cg.gpio_pin_expression(config[CONF_CLK_PIN])
     cg.add(var.set_clk(clk))
+    cg.add(var.set_force_sw(config[CONF_FORCE_SW]))
     if CONF_MISO_PIN in config:
         miso = await cg.gpio_pin_expression(config[CONF_MISO_PIN])
         cg.add(var.set_miso(miso))
diff --git a/esphome/components/spi/spi.cpp b/esphome/components/spi/spi.cpp
index 864f6ae39d..c3ffba4229 100644
--- a/esphome/components/spi/spi.cpp
+++ b/esphome/components/spi/spi.cpp
@@ -25,7 +25,7 @@ void SPIComponent::setup() {
   this->clk_->digital_write(true);
 
 #ifdef USE_SPI_ARDUINO_BACKEND
-  bool use_hw_spi = true;
+  bool use_hw_spi = !this->force_sw_;
   const bool has_miso = this->miso_ != nullptr;
   const bool has_mosi = this->mosi_ != nullptr;
   int8_t clk_pin = -1, miso_pin = -1, mosi_pin = -1;
diff --git a/esphome/components/spi/spi.h b/esphome/components/spi/spi.h
index b7124302f4..bacdad723b 100644
--- a/esphome/components/spi/spi.h
+++ b/esphome/components/spi/spi.h
@@ -74,6 +74,7 @@ class SPIComponent : public Component {
   void set_clk(GPIOPin *clk) { clk_ = clk; }
   void set_miso(GPIOPin *miso) { miso_ = miso; }
   void set_mosi(GPIOPin *mosi) { mosi_ = mosi; }
+  void set_force_sw(bool force_sw) { force_sw_ = force_sw; }
 
   void setup() override;
 
@@ -260,6 +261,7 @@ class SPIComponent : public Component {
   GPIOPin *miso_{nullptr};
   GPIOPin *mosi_{nullptr};
   GPIOPin *active_cs_{nullptr};
+  bool force_sw_{false};
 #ifdef USE_SPI_ARDUINO_BACKEND
   SPIClass *hw_spi_{nullptr};
 #endif  // USE_SPI_ARDUINO_BACKEND

From dfc7cd7f5d35426c8bb07af0f0312e0298772e02 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Wed, 15 Mar 2023 15:21:35 -0700
Subject: [PATCH 705/838] allow using a binary output for the status led
 (#4532)

* allow using a binary output for the status led

* lint

* output status as well

* simplify

---------

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 .../components/status_led/light/__init__.py   | 29 ++++++++++++-------
 .../status_led/light/status_led_light.cpp     | 28 +++++++++++-------
 .../status_led/light/status_led_light.h       |  6 +++-
 3 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/esphome/components/status_led/light/__init__.py b/esphome/components/status_led/light/__init__.py
index 8896046998..d6a4a245e6 100644
--- a/esphome/components/status_led/light/__init__.py
+++ b/esphome/components/status_led/light/__init__.py
@@ -1,26 +1,35 @@
 from esphome import pins
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.components import light
-from esphome.const import CONF_OUTPUT_ID, CONF_PIN
+from esphome.components import light, output
+from esphome.const import CONF_OUTPUT, CONF_OUTPUT_ID, CONF_PIN
 from .. import status_led_ns
 
+AUTO_LOAD = ["output"]
+
 StatusLEDLightOutput = status_led_ns.class_(
     "StatusLEDLightOutput", light.LightOutput, cg.Component
 )
 
-CONFIG_SCHEMA = light.BINARY_LIGHT_SCHEMA.extend(
-    {
-        cv.GenerateID(CONF_OUTPUT_ID): cv.declare_id(StatusLEDLightOutput),
-        cv.Required(CONF_PIN): pins.gpio_output_pin_schema,
-    }
+CONFIG_SCHEMA = cv.All(
+    light.BINARY_LIGHT_SCHEMA.extend(
+        {
+            cv.GenerateID(CONF_OUTPUT_ID): cv.declare_id(StatusLEDLightOutput),
+            cv.Optional(CONF_PIN): pins.gpio_output_pin_schema,
+            cv.Optional(CONF_OUTPUT): cv.use_id(output.BinaryOutput),
+        }
+    ),
+    cv.has_at_least_one_key(CONF_PIN, CONF_OUTPUT),
 )
 
 
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
-    pin = await cg.gpio_pin_expression(config[CONF_PIN])
-    cg.add(var.set_pin(pin))
+    if CONF_PIN in config:
+        pin = await cg.gpio_pin_expression(config[CONF_PIN])
+        cg.add(var.set_pin(pin))
+    if CONF_OUTPUT in config:
+        out = await cg.get_variable(config[CONF_OUTPUT])
+        cg.add(var.set_output(out))
     await cg.register_component(var, config)
-    # cg.add(cg.App.register_component(var))
     await light.register_light(var, config)
diff --git a/esphome/components/status_led/light/status_led_light.cpp b/esphome/components/status_led/light/status_led_light.cpp
index 760c89f972..b47d1f5bd0 100644
--- a/esphome/components/status_led/light/status_led_light.cpp
+++ b/esphome/components/status_led/light/status_led_light.cpp
@@ -15,10 +15,10 @@ void StatusLEDLightOutput::loop() {
   }
 
   if ((new_state & STATUS_LED_ERROR) != 0u) {
-    this->pin_->digital_write(millis() % 250u < 150u);
+    this->output_state_(millis() % 250u < 150u);
     this->last_app_state_ = new_state;
   } else if ((new_state & STATUS_LED_WARNING) != 0u) {
-    this->pin_->digital_write(millis() % 1500u < 250u);
+    this->output_state_(millis() % 1500u < 250u);
     this->last_app_state_ = new_state;
   } else if (new_state != this->last_app_state_) {
     // if no error/warning -> restore light state or turn off
@@ -26,17 +26,16 @@ void StatusLEDLightOutput::loop() {
 
     if (lightstate_)
       lightstate_->current_values_as_binary(&state);
-
-    this->pin_->digital_write(state);
-    this->last_app_state_ = new_state;
-
     ESP_LOGD(TAG, "Restoring light state %s", ONOFF(state));
+
+    this->output_state_(state);
+    this->last_app_state_ = new_state;
   }
 }
 
 void StatusLEDLightOutput::setup_state(light::LightState *state) {
   lightstate_ = state;
-  ESP_LOGD(TAG, "'%s': Setting initital state", state->get_name().c_str());
+  ESP_LOGD(TAG, "'%s': Setting initial state", state->get_name().c_str());
   this->write_state(state);
 }
 
@@ -47,16 +46,18 @@ void StatusLEDLightOutput::write_state(light::LightState *state) {
   // if in warning/error, don't overwrite the status_led
   // once it is back to OK, the loop will restore the state
   if ((App.get_app_state() & (STATUS_LED_ERROR | STATUS_LED_WARNING)) == 0u) {
-    this->pin_->digital_write(binary);
     ESP_LOGD(TAG, "'%s': Setting state %s", state->get_name().c_str(), ONOFF(binary));
+    this->output_state_(binary);
   }
 }
 
 void StatusLEDLightOutput::setup() {
   ESP_LOGCONFIG(TAG, "Setting up Status LED...");
 
-  this->pin_->setup();
-  this->pin_->digital_write(false);
+  if (this->pin_ != nullptr) {
+    this->pin_->setup();
+    this->pin_->digital_write(false);
+  }
 }
 
 void StatusLEDLightOutput::dump_config() {
@@ -64,5 +65,12 @@ void StatusLEDLightOutput::dump_config() {
   LOG_PIN("  Pin: ", this->pin_);
 }
 
+void StatusLEDLightOutput::output_state_(bool state) {
+  if (this->pin_ != nullptr)
+    this->pin_->digital_write(state);
+  if (this->output_ != nullptr)
+    this->output_->set_state(state);
+}
+
 }  // namespace status_led
 }  // namespace esphome
diff --git a/esphome/components/status_led/light/status_led_light.h b/esphome/components/status_led/light/status_led_light.h
index e90d381e3c..e711a2e749 100644
--- a/esphome/components/status_led/light/status_led_light.h
+++ b/esphome/components/status_led/light/status_led_light.h
@@ -3,6 +3,7 @@
 #include "esphome/core/component.h"
 #include "esphome/core/hal.h"
 #include "esphome/components/light/light_output.h"
+#include "esphome/components/output/binary_output.h"
 
 namespace esphome {
 namespace status_led {
@@ -10,6 +11,7 @@ namespace status_led {
 class StatusLEDLightOutput : public light::LightOutput, public Component {
  public:
   void set_pin(GPIOPin *pin) { pin_ = pin; }
+  void set_output(output::BinaryOutput *output) { output_ = output; }
 
   light::LightTraits get_traits() override {
     auto traits = light::LightTraits();
@@ -31,9 +33,11 @@ class StatusLEDLightOutput : public light::LightOutput, public Component {
   float get_loop_priority() const override { return 50.0f; }
 
  protected:
-  GPIOPin *pin_;
+  GPIOPin *pin_{nullptr};
+  output::BinaryOutput *output_{nullptr};
   light::LightState *lightstate_{};
   uint32_t last_app_state_{0xFFFF};
+  void output_state_(bool state);
 };
 
 }  // namespace status_led

From a31fb3c987b7011b7ccb7735f8210f2feaff1d90 Mon Sep 17 00:00:00 2001
From: Raph <rafal83@users.noreply.github.com>
Date: Wed, 15 Mar 2023 23:23:01 +0100
Subject: [PATCH 706/838] Add option flip_x (#4555)

* Adding flip_x

* Adding flip_x

* Adding flip_x

* Adding flip_x

* Adding flip_x

* convert tab to space

* update format
---
 esphome/components/max7219digit/display.py       |  3 +++
 esphome/components/max7219digit/max7219digit.cpp | 12 ++++++++++--
 esphome/components/max7219digit/max7219digit.h   |  2 ++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/esphome/components/max7219digit/display.py b/esphome/components/max7219digit/display.py
index 2753f70eef..faa8a08f4a 100644
--- a/esphome/components/max7219digit/display.py
+++ b/esphome/components/max7219digit/display.py
@@ -7,6 +7,7 @@ CODEOWNERS = ["@rspaargaren"]
 DEPENDENCIES = ["spi"]
 
 CONF_ROTATE_CHIP = "rotate_chip"
+CONF_FLIP_X = "flip_x"
 CONF_SCROLL_SPEED = "scroll_speed"
 CONF_SCROLL_DWELL = "scroll_dwell"
 CONF_SCROLL_DELAY = "scroll_delay"
@@ -67,6 +68,7 @@ CONFIG_SCHEMA = (
                 CONF_SCROLL_DWELL, default="1000ms"
             ): cv.positive_time_period_milliseconds,
             cv.Optional(CONF_REVERSE_ENABLE, default=False): cv.boolean,
+            cv.Optional(CONF_FLIP_X, default=False): cv.boolean,
         }
     )
     .extend(cv.polling_component_schema("500ms"))
@@ -91,6 +93,7 @@ async def to_code(config):
     cg.add(var.set_scroll(config[CONF_SCROLL_ENABLE]))
     cg.add(var.set_scroll_mode(config[CONF_SCROLL_MODE]))
     cg.add(var.set_reverse(config[CONF_REVERSE_ENABLE]))
+    cg.add(var.set_flip_x([CONF_FLIP_X]))
 
     if CONF_LAMBDA in config:
         lambda_ = await cg.process_lambda(
diff --git a/esphome/components/max7219digit/max7219digit.cpp b/esphome/components/max7219digit/max7219digit.cpp
index 1b9ae230f7..c65b8e4823 100644
--- a/esphome/components/max7219digit/max7219digit.cpp
+++ b/esphome/components/max7219digit/max7219digit.cpp
@@ -261,13 +261,21 @@ void MAX7219Component::send64pixels(uint8_t chip, const uint8_t pixels[8]) {
     if (this->orientation_ == 0) {
       for (uint8_t i = 0; i < 8; i++) {
         // run this loop 8 times for all the pixels[8] received
-        b |= ((pixels[i] >> col) & 1) << (7 - i);  // change the column bits into row bits
+        if (this->flip_x_) {
+          b |= ((pixels[i] >> col) & 1) << i;  // change the column bits into row bits
+        } else {
+          b |= ((pixels[i] >> col) & 1) << (7 - i);  // change the column bits into row bits
+        }
       }
     } else if (this->orientation_ == 1) {
       b = pixels[col];
     } else if (this->orientation_ == 2) {
       for (uint8_t i = 0; i < 8; i++) {
-        b |= ((pixels[i] >> (7 - col)) & 1) << i;
+        if (this->flip_x_) {
+          b |= ((pixels[i] >> (7 - col)) & 1) << (7 - i);
+        } else {
+          b |= ((pixels[i] >> (7 - col)) & 1) << i;
+        }
       }
     } else {
       b = pixels[7 - col];
diff --git a/esphome/components/max7219digit/max7219digit.h b/esphome/components/max7219digit/max7219digit.h
index 3619478697..17e369a9d9 100644
--- a/esphome/components/max7219digit/max7219digit.h
+++ b/esphome/components/max7219digit/max7219digit.h
@@ -67,6 +67,7 @@ class MAX7219Component : public PollingComponent,
   void set_scroll(bool on_off) { this->scroll_ = on_off; };
   void set_scroll_mode(ScrollMode mode) { this->scroll_mode_ = mode; };
   void set_reverse(bool on_off) { this->reverse_ = on_off; };
+  void set_flip_x(bool flip_x) { this->flip_x_ = flip_x; };
 
   void send_char(uint8_t chip, uint8_t data);
   void send64pixels(uint8_t chip, const uint8_t pixels[8]);
@@ -108,6 +109,7 @@ class MAX7219Component : public PollingComponent,
   ChipLinesStyle chip_lines_style_;
   bool scroll_;
   bool reverse_;
+  bool flip_x_;
   bool update_{false};
   uint16_t scroll_speed_;
   uint16_t scroll_delay_;

From ebc544e4b4005df9284be571ad9c8e1365f53f52 Mon Sep 17 00:00:00 2001
From: Kai Gerken <Kai.Gerken@custom-coding.net>
Date: Sun, 19 Mar 2023 19:31:05 +0100
Subject: [PATCH 707/838] Fix compile error on pzemdc.h (#4583)

---
 esphome/components/pzemdc/pzemdc.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/pzemdc/pzemdc.h b/esphome/components/pzemdc/pzemdc.h
index 21676e3422..b91ab4c0a5 100644
--- a/esphome/components/pzemdc/pzemdc.h
+++ b/esphome/components/pzemdc/pzemdc.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/modbus/modbus.h"

From 0de5808ed283cb82cf809c2bc6e09d66ff640356 Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Sun, 19 Mar 2023 18:54:00 +0000
Subject: [PATCH 708/838] climate: brown paper bag fix for on_configure (#4573)

I forgot this hunk in https://github.com/esphome/esphome/pull/4511 .
I'm sorry for the noise.
---
 esphome/components/climate/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/esphome/components/climate/__init__.py b/esphome/components/climate/__init__.py
index 4a16c3fb7d..6734917bf3 100644
--- a/esphome/components/climate/__init__.py
+++ b/esphome/components/climate/__init__.py
@@ -324,6 +324,10 @@ async def setup_climate_core_(var, config):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         await automation.build_automation(trigger, [], conf)
 
+    for conf in config.get(CONF_ON_CONTROL, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+
 
 async def register_climate(var, config):
     if not CORE.has_id(config[CONF_ID]):

From 48ada2eebb81d3dbff5c8bc8b71435d5d4365c9c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Mar 2023 07:54:18 +1300
Subject: [PATCH 709/838] Bump aioesphomeapi from 13.5.0 to 13.5.1 (#4572)

Bumps [aioesphomeapi](https://github.com/esphome/aioesphomeapi) from 13.5.0 to 13.5.1.
- [Release notes](https://github.com/esphome/aioesphomeapi/releases)
- [Commits](https://github.com/esphome/aioesphomeapi/compare/v13.5.0...v13.5.1)

---
updated-dependencies:
- dependency-name: aioesphomeapi
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
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 df041db26f..93a3592aed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.6  # When updating platformio, also update Dockerfile
 esptool==4.5.1
 click==8.1.3
 esphome-dashboard==20230214.0
-aioesphomeapi==13.5.0
+aioesphomeapi==13.5.1
 zeroconf==0.47.3
 
 # esp-idf requires this, but doesn't bundle it by default

From 7196fb8e829b64c53a6b85cf9c71bb2cf1329769 Mon Sep 17 00:00:00 2001
From: Fabian <Fabian-Schmidt@users.noreply.github.com>
Date: Sun, 19 Mar 2023 19:55:12 +0100
Subject: [PATCH 710/838] add define `__str__` method (#4576)

Co-authored-by: Your Name <you@example.com>
---
 esphome/core/__init__.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/esphome/core/__init__.py b/esphome/core/__init__.py
index 117b19a6ae..1866f9c9f5 100644
--- a/esphome/core/__init__.py
+++ b/esphome/core/__init__.py
@@ -409,6 +409,9 @@ class Define:
             return self.as_tuple == other.as_tuple
         return NotImplemented
 
+    def __str__(self):
+        return f"{self.name}={self.value}"
+
 
 class Library:
     def __init__(self, name, version, repository=None):

From 5207ca1d523043db8729e2e972e93e3331bce67f Mon Sep 17 00:00:00 2001
From: Peter Halicky <peto@halicky.sk>
Date: Sun, 19 Mar 2023 20:03:38 +0100
Subject: [PATCH 711/838] Add support for ESP32 CAM resolutions for 3MP and 5MP
 sensors (OV5640 for example). Also support (almost) arbitrary camera clock,
 some cameras/ESP chips need slightly lower clock than 20MHz to avoid image
 corruption. (#4580)

---
 esphome/components/esp32_camera/__init__.py   | 18 ++++++-
 .../components/esp32_camera/esp32_camera.cpp  | 48 +++++++++++++++++++
 .../components/esp32_camera/esp32_camera.h    |  8 ++++
 3 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/esphome/components/esp32_camera/__init__.py b/esphome/components/esp32_camera/__init__.py
index b3abbd5c13..d6a744d24d 100644
--- a/esphome/components/esp32_camera/__init__.py
+++ b/esphome/components/esp32_camera/__init__.py
@@ -55,6 +55,22 @@ FRAME_SIZES = {
     "SXGA": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_1280X1024,
     "1600X1200": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_1600X1200,
     "UXGA": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_1600X1200,
+    "1920X1080": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_1920X1080,
+    "FHD": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_1920X1080,
+    "720X1280": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_720X1280,
+    "PHD": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_720X1280,
+    "864X1536": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_864X1536,
+    "P3MP": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_864X1536,
+    "2048X1536": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_2048X1536,
+    "QXGA": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_2048X1536,
+    "2560X1440": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_2560X1440,
+    "QHD": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_2560X1440,
+    "2560X1600": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_2560X1600,
+    "WQXGA": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_2560X1600,
+    "1080X1920": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_1080X1920,
+    "PFHD": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_1080X1920,
+    "2560X1920": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_2560X1920,
+    "QSXGA": ESP32CameraFrameSize.ESP32_CAMERA_SIZE_2560X1920,
 }
 ESP32GainControlMode = esp32_camera_ns.enum("ESP32GainControlMode")
 ENUM_GAIN_CONTROL_MODE = {
@@ -140,7 +156,7 @@ CONFIG_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
             {
                 cv.Required(CONF_PIN): pins.internal_gpio_input_pin_number,
                 cv.Optional(CONF_FREQUENCY, default="20MHz"): cv.All(
-                    cv.frequency, cv.one_of(20e6, 10e6)
+                    cv.frequency, cv.Range(min=10e6, max=20e6)
                 ),
             }
         ),
diff --git a/esphome/components/esp32_camera/esp32_camera.cpp b/esphome/components/esp32_camera/esp32_camera.cpp
index b1bf1d8532..4a53748213 100644
--- a/esphome/components/esp32_camera/esp32_camera.cpp
+++ b/esphome/components/esp32_camera/esp32_camera.cpp
@@ -91,6 +91,30 @@ void ESP32Camera::dump_config() {
     case FRAMESIZE_UXGA:
       ESP_LOGCONFIG(TAG, "  Resolution: 1600x1200 (UXGA)");
       break;
+    case FRAMESIZE_FHD:
+      ESP_LOGCONFIG(TAG, "  Resolution: 1920x1080 (FHD)");
+      break;
+    case FRAMESIZE_P_HD:
+      ESP_LOGCONFIG(TAG, "  Resolution: 720x1280 (P_HD)");
+      break;
+    case FRAMESIZE_P_3MP:
+      ESP_LOGCONFIG(TAG, "  Resolution: 864x1536 (P_3MP)");
+      break;
+    case FRAMESIZE_QXGA:
+      ESP_LOGCONFIG(TAG, "  Resolution: 2048x1536 (QXGA)");
+      break;
+    case FRAMESIZE_QHD:
+      ESP_LOGCONFIG(TAG, "  Resolution: 2560x1440 (QHD)");
+      break;
+    case FRAMESIZE_WQXGA:
+      ESP_LOGCONFIG(TAG, "  Resolution: 2560x1600 (WQXGA)");
+      break;
+    case FRAMESIZE_P_FHD:
+      ESP_LOGCONFIG(TAG, "  Resolution: 1080x1920 (P_FHD)");
+      break;
+    case FRAMESIZE_QSXGA:
+      ESP_LOGCONFIG(TAG, "  Resolution: 2560x1920 (QSXGA)");
+      break;
     default:
       break;
   }
@@ -257,6 +281,30 @@ void ESP32Camera::set_frame_size(ESP32CameraFrameSize size) {
     case ESP32_CAMERA_SIZE_1600X1200:
       this->config_.frame_size = FRAMESIZE_UXGA;
       break;
+    case ESP32_CAMERA_SIZE_1920X1080:
+      this->config_.frame_size = FRAMESIZE_FHD;
+      break;
+    case ESP32_CAMERA_SIZE_720X1280:
+      this->config_.frame_size = FRAMESIZE_P_HD;
+      break;
+    case ESP32_CAMERA_SIZE_864X1536:
+      this->config_.frame_size = FRAMESIZE_P_3MP;
+      break;
+    case ESP32_CAMERA_SIZE_2048X1536:
+      this->config_.frame_size = FRAMESIZE_QXGA;
+      break;
+    case ESP32_CAMERA_SIZE_2560X1440:
+      this->config_.frame_size = FRAMESIZE_QHD;
+      break;
+    case ESP32_CAMERA_SIZE_2560X1600:
+      this->config_.frame_size = FRAMESIZE_WQXGA;
+      break;
+    case ESP32_CAMERA_SIZE_1080X1920:
+      this->config_.frame_size = FRAMESIZE_P_FHD;
+      break;
+    case ESP32_CAMERA_SIZE_2560X1920:
+      this->config_.frame_size = FRAMESIZE_QSXGA;
+      break;
   }
 }
 void ESP32Camera::set_jpeg_quality(uint8_t quality) { this->config_.jpeg_quality = quality; }
diff --git a/esphome/components/esp32_camera/esp32_camera.h b/esphome/components/esp32_camera/esp32_camera.h
index 87c5b0ba4a..62fdbabd06 100644
--- a/esphome/components/esp32_camera/esp32_camera.h
+++ b/esphome/components/esp32_camera/esp32_camera.h
@@ -29,6 +29,14 @@ enum ESP32CameraFrameSize {
   ESP32_CAMERA_SIZE_1024X768,   // XGA
   ESP32_CAMERA_SIZE_1280X1024,  // SXGA
   ESP32_CAMERA_SIZE_1600X1200,  // UXGA
+  ESP32_CAMERA_SIZE_1920X1080,  // FHD
+  ESP32_CAMERA_SIZE_720X1280,   // PHD
+  ESP32_CAMERA_SIZE_864X1536,   // P3MP
+  ESP32_CAMERA_SIZE_2048X1536,  // QXGA
+  ESP32_CAMERA_SIZE_2560X1440,  // QHD
+  ESP32_CAMERA_SIZE_2560X1600,  // WQXGA
+  ESP32_CAMERA_SIZE_1080X1920,  // PFHD
+  ESP32_CAMERA_SIZE_2560X1920,  // QSXGA
 };
 
 enum ESP32AgcGainCeiling {

From 48658d5a552a3615eece481f01ad52ffb670ff8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Sun, 19 Mar 2023 20:08:51 +0100
Subject: [PATCH 712/838] Add a simple 'skip_initial' filter (#4582)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add a simple 'skip' filter

This filter simply skips the first `send_first_at` values, then passes
everything as-is. This is quite useful when you know the first few sensor
readings should be ignored.

Example YAML:

```yaml
sensor:
  - platform: sgp30
    id: mysensor_sgp30
    eco2:
      id: mysensor_sgp30_co2
      name: "eCO₂"
      accuracy_decimals: 0
      filters:
        - skip:
            send_first_at: 41
```

* Rename the filter to `skip_initial` and simplify the schema

New usage:

```yaml
      filters:
        - skip_initial: 41
```

* Apply clang-format
---
 esphome/components/sensor/__init__.py |  6 ++++++
 esphome/components/sensor/filter.cpp  | 13 +++++++++++++
 esphome/components/sensor/filter.h    | 18 ++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index 821e0afac0..b63e157efb 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -194,6 +194,7 @@ SensorPublishAction = sensor_ns.class_("SensorPublishAction", automation.Action)
 Filter = sensor_ns.class_("Filter")
 QuantileFilter = sensor_ns.class_("QuantileFilter", Filter)
 MedianFilter = sensor_ns.class_("MedianFilter", Filter)
+SkipInitialFilter = sensor_ns.class_("SkipInitialFilter", Filter)
 MinFilter = sensor_ns.class_("MinFilter", Filter)
 MaxFilter = sensor_ns.class_("MaxFilter", Filter)
 SlidingWindowMovingAverageFilter = sensor_ns.class_(
@@ -365,6 +366,11 @@ MIN_SCHEMA = cv.All(
 )
 
 
+@FILTER_REGISTRY.register("skip_initial", SkipInitialFilter, cv.positive_not_null_int)
+async def skip_initial_filter_to_code(config, filter_id):
+    return cg.new_Pvariable(filter_id, config)
+
+
 @FILTER_REGISTRY.register("min", MinFilter, MIN_SCHEMA)
 async def min_filter_to_code(config, filter_id):
     return cg.new_Pvariable(
diff --git a/esphome/components/sensor/filter.cpp b/esphome/components/sensor/filter.cpp
index bf65ac590f..472649ebdc 100644
--- a/esphome/components/sensor/filter.cpp
+++ b/esphome/components/sensor/filter.cpp
@@ -74,6 +74,19 @@ optional<float> MedianFilter::new_value(float value) {
   return {};
 }
 
+// SkipInitialFilter
+SkipInitialFilter::SkipInitialFilter(size_t num_to_ignore) : num_to_ignore_(num_to_ignore) {}
+optional<float> SkipInitialFilter::new_value(float value) {
+  if (num_to_ignore_ > 0) {
+    num_to_ignore_--;
+    ESP_LOGV(TAG, "SkipInitialFilter(%p)::new_value(%f) SKIPPING, %u left", this, value, num_to_ignore_);
+    return {};
+  }
+
+  ESP_LOGV(TAG, "SkipInitialFilter(%p)::new_value(%f) SENDING", this, value);
+  return value;
+}
+
 // QuantileFilter
 QuantileFilter::QuantileFilter(size_t window_size, size_t send_every, size_t send_first_at, float quantile)
     : send_every_(send_every), send_at_(send_every - send_first_at), window_size_(window_size), quantile_(quantile) {}
diff --git a/esphome/components/sensor/filter.h b/esphome/components/sensor/filter.h
index b560545b76..05934a26e8 100644
--- a/esphome/components/sensor/filter.h
+++ b/esphome/components/sensor/filter.h
@@ -102,6 +102,24 @@ class MedianFilter : public Filter {
   size_t window_size_;
 };
 
+/** Simple skip filter.
+ *
+ * Skips the first N values, then passes everything else.
+ */
+class SkipInitialFilter : public Filter {
+ public:
+  /** Construct a SkipInitialFilter.
+   *
+   * @param num_to_ignore How many values to ignore before the filter becomes a no-op.
+   */
+  explicit SkipInitialFilter(size_t num_to_ignore);
+
+  optional<float> new_value(float value) override;
+
+ protected:
+  size_t num_to_ignore_;
+};
+
 /** Simple min filter.
  *
  * Takes the min of the last <send_every> values and pushes it out every <send_every>.

From b2cec106011f9d74524f50722fd75bd419aee7aa Mon Sep 17 00:00:00 2001
From: Michael Bisbjerg <michael@mbwarez.dk>
Date: Sun, 19 Mar 2023 20:11:18 +0100
Subject: [PATCH 713/838] Fix outdated filter string in platformio_api (#4587)

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

diff --git a/esphome/platformio_api.py b/esphome/platformio_api.py
index ef62e62ce7..c46a3fc767 100644
--- a/esphome/platformio_api.py
+++ b/esphome/platformio_api.py
@@ -47,7 +47,7 @@ FILTER_PLATFORMIO_LINES = [
     r"CONFIGURATION: https://docs.platformio.org/.*",
     r"DEBUG: Current.*",
     r"LDF Modes:.*",
-    r"LDF: Library Dependency Finder -> http://bit.ly/configure-pio-ldf.*",
+    r"LDF: Library Dependency Finder -> https://bit.ly/configure-pio-ldf.*",
     f"Looking for {IGNORE_LIB_WARNINGS} library in registry",
     f"Warning! Library `.*'{IGNORE_LIB_WARNINGS}.*` has not been found in PlatformIO Registry.",
     f"You can ignore this message, if `.*{IGNORE_LIB_WARNINGS}.*` is a built-in library.*",

From 0b383542da3d0ba54efaa9c21758032db6f46f1c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 20 Mar 2023 11:39:02 +1300
Subject: [PATCH 714/838] Split test3.yaml (#4591)

---
 .github/workflows/ci.yml |   4 +
 tests/test3.1.yaml       | 600 +++++++++++++++++++++++++++++++++++++++
 tests/test3.yaml         | 549 ++---------------------------------
 3 files changed, 627 insertions(+), 526 deletions(-)
 create mode 100644 tests/test3.1.yaml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 60c987f6c4..769456c581 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,6 +41,10 @@ jobs:
             file: tests/test3.yaml
             name: Test tests/test3.yaml
             pio_cache_key: test3
+          - id: test
+            file: tests/test3.1.yaml
+            name: Test tests/test3.1.yaml
+            pio_cache_key: test3.1
           - id: test
             file: tests/test4.yaml
             name: Test tests/test4.yaml
diff --git a/tests/test3.1.yaml b/tests/test3.1.yaml
new file mode 100644
index 0000000000..19e4341ee6
--- /dev/null
+++ b/tests/test3.1.yaml
@@ -0,0 +1,600 @@
+---
+esphome:
+  name: $device_name
+  comment: $device_comment
+  build_path: build/test3.1
+  includes:
+    - custom.h
+
+esp8266:
+  board: d1_mini
+
+substitutions:
+  device_name: test3-1
+  device_comment: test3-1 device
+  min_sub: "0.03"
+  max_sub: "12.0%"
+
+api:
+
+wifi:
+  ssid: "MySSID"
+  password: "password1"
+
+i2c:
+  sda: 4
+  scl: 5
+  scan: false
+
+spi:
+  clk_pin: GPIO12
+  mosi_pin: GPIO13
+  miso_pin: GPIO14
+
+ota:
+
+logger:
+
+sensor:
+  - platform: apds9960
+    type: proximity
+    name: APDS9960 Proximity
+  - platform: vl53l0x
+    name: VL53L0x Distance
+    address: 0x29
+    update_interval: 60s
+    enable_pin: GPIO13
+    timeout: 200us
+  - platform: apds9960
+    type: clear
+    name: APDS9960 Clear
+  - platform: apds9960
+    type: red
+    name: APDS9960 Red
+  - platform: apds9960
+    type: green
+    name: APDS9960 Green
+  - platform: apds9960
+    type: blue
+    name: APDS9960 Blue
+
+  - platform: aht10
+    temperature:
+      name: Temperature
+    humidity:
+      name: Humidity
+  - platform: am2320
+    temperature:
+      name: Temperature
+    humidity:
+      name: Humidity
+  - platform: adc
+    pin: VCC
+    id: my_sensor
+    filters:
+      - offset: 5.0
+      - multiply: 2.0
+      - filter_out: NAN
+      - sliding_window_moving_average:
+      - exponential_moving_average:
+      - quantile:
+          window_size: 5
+          send_every: 5
+          send_first_at: 3
+          quantile: .8
+      - lambda: "return 0;"
+      - delta: 100
+      - throttle: 100ms
+      - debounce: 500s
+      - calibrate_linear:
+          - 0 -> 0
+          - 100 -> 100
+      - calibrate_polynomial:
+          degree: 3
+          datapoints:
+            - 0 -> 0
+            - 100 -> 200
+            - 400 -> 500
+            - -50 -> -1000
+            - -100 -> -10000
+  - platform: cd74hc4067
+    id: cd74hc4067_0
+    number: 0
+    sensor: my_sensor
+  - platform: resistance
+    sensor: my_sensor
+    configuration: DOWNSTREAM
+    resistor: 10kΩ
+    reference_voltage: 3.3V
+    name: Resistance
+    id: resist
+  - platform: ntc
+    sensor: resist
+    name: NTC Sensor
+    calibration:
+      b_constant: 3950
+      reference_resistance: 10k
+      reference_temperature: 25°C
+  - platform: ntc
+    sensor: resist
+    name: NTC Sensor2
+    calibration:
+      - 10.0kOhm -> 25°C
+      - 27.219kOhm -> 0°C
+      - 14.674kOhm -> 15°C
+  - platform: ct_clamp
+    sensor: my_sensor
+    name: CT Clamp
+    sample_duration: 500ms
+    update_interval: 5s
+
+  - platform: tcs34725
+    red_channel:
+      name: Red Channel
+    green_channel:
+      name: Green Channel
+    blue_channel:
+      name: Blue Channel
+    clear_channel:
+      name: Clear Channel
+    illuminance:
+      name: Illuminance
+    color_temperature:
+      name: Color Temperature
+    integration_time: 614ms
+    gain: 60x
+  - platform: custom
+    lambda: |-
+      auto s = new CustomSensor();
+      App.register_component(s);
+      return {s};
+    sensors:
+      - id: custom_sensor
+        name: Custom Sensor
+
+  - platform: ade7953
+    irq_pin: GPIO16
+    voltage:
+      name: ADE7953 Voltage
+      id: ade7953_voltage
+    current_a:
+      name: ADE7953 Current A
+      id: ade7953_current_a
+    current_b:
+      name: ADE7953 Current B
+      id: ade7953_current_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
+
+  - platform: tmp102
+    name: TMP102 Temperature
+  - platform: hm3301
+    pm_1_0:
+      name: PM1.0
+    pm_2_5:
+      name: PM2.5
+    pm_10_0:
+      name: PM10.0
+    aqi:
+      name: AQI
+      calculation_type: AQI
+  - platform: ezo
+    id: ph_ezo
+    address: 99
+    unit_of_measurement: pH
+  - platform: tof10120
+    name: Distance sensor
+    update_interval: 5s
+
+  - platform: mlx90393
+    oversampling: 1
+    filter: 0
+    gain: 3X
+    x_axis:
+      name: mlxxaxis
+    y_axis:
+      name: mlxyaxis
+    z_axis:
+      name: mlxzaxis
+      resolution: 17BIT
+    temperature:
+      name: mlxtemp
+      oversampling: 2
+
+  - platform: adc128s102
+    id: adc128s102_channel_0
+    channel: 0
+
+apds9960:
+  address: 0x20
+  update_interval: 60s
+
+mpr121:
+  id: mpr121_first
+  address: 0x5A
+
+binary_sensor:
+  - platform: apds9960
+    direction: up
+    name: APDS9960 Up
+    device_class: motion
+    filters:
+      - invert
+      - delayed_on: 20ms
+      - delayed_off: 20ms
+      - lambda: "return false;"
+    on_state:
+      - logger.log: New state
+    id: my_binary_sensor
+  - platform: apds9960
+    direction: down
+    name: APDS9960 Down
+  - platform: apds9960
+    direction: left
+    name: APDS9960 Left
+  - platform: apds9960
+    direction: right
+    name: APDS9960 Right
+
+  - platform: mpr121
+    id: touchkey0
+    channel: 0
+    name: touchkey0
+  - platform: mpr121
+    channel: 1
+    name: touchkey1
+    id: bin1
+  - platform: mpr121
+    channel: 2
+    name: touchkey2
+    id: bin2
+  - platform: mpr121
+    channel: 3
+    name: touchkey3
+    id: bin3
+    on_press:
+      then:
+        - switch.toggle: mpr121_toggle
+  - platform: ttp229_lsf
+    channel: 1
+    name: TTP229 LSF Test
+  - platform: ttp229_bsf
+    channel: 1
+    name: TTP229 BSF Test
+  - platform: custom
+    lambda: |-
+      auto s = new CustomBinarySensor();
+      App.register_component(s);
+      return {s};
+    binary_sensors:
+      - id: custom_binary_sensor
+        name: Custom Binary Sensor
+
+  - platform: template
+    id: cover_toggle
+    on_press:
+      then:
+        - cover.toggle: time_based_cover
+        - cover.toggle: endstop_cover
+        - cover.toggle: current_based_cover
+
+globals:
+  - id: my_global_string
+    type: std::string
+    initial_value: '""'
+
+text_sensor:
+  - platform: custom
+    lambda: |-
+      auto s = new CustomTextSensor();
+      App.register_component(s);
+      return {s};
+    text_sensors:
+      - id: custom_text_sensor
+        name: Custom Text Sensor
+
+sm2135:
+  data_pin: GPIO12
+  clock_pin: GPIO14
+
+switch:
+  - platform: template
+    name: mpr121_toggle
+    id: mpr121_toggle
+    optimistic: true
+  - platform: gpio
+    id: gpio_switch1
+    pin:
+      mcp23xxx: mcp23017_hub
+      number: 0
+      mode: OUTPUT
+    interlock: &interlock [gpio_switch1, gpio_switch2, gpio_switch3]
+  - platform: gpio
+    id: gpio_switch2
+    pin:
+      mcp23xxx: mcp23008_hub
+      number: 0
+      mode: OUTPUT
+    interlock: *interlock
+  - platform: gpio
+    id: gpio_switch3
+    pin: GPIO1
+    interlock: *interlock
+  - platform: custom
+    lambda: |-
+      auto s = new CustomSwitch();
+      return {s};
+    switches:
+      - id: custom_switch
+        name: Custom Switch
+        on_turn_on:
+          - http_request.get:
+              url: https://esphome.io
+              headers:
+                Content-Type: application/json
+              verify_ssl: false
+          - http_request.post:
+              url: https://esphome.io
+              verify_ssl: false
+              json:
+                key: !lambda |-
+                  return id(custom_text_sensor).state;
+                greeting: Hello World
+          - http_request.send:
+              method: PUT
+              url: https://esphome.io
+              headers:
+                Content-Type: application/json
+              body: Some data
+              verify_ssl: false
+
+
+custom_component:
+  lambda: |-
+    auto s = new CustomComponent();
+    s->set_update_interval(15000);
+    return {s};
+
+stepper:
+  - platform: uln2003
+    id: my_stepper
+    pin_a: GPIO12
+    pin_b: GPIO13
+    pin_c: GPIO14
+    pin_d: GPIO15
+    sleep_when_done: false
+    step_mode: HALF_STEP
+    max_speed: 250 steps/s
+    acceleration: inf
+    deceleration: inf
+  - platform: a4988
+    id: my_stepper2
+    step_pin: GPIO1
+    dir_pin: GPIO2
+    max_speed: 0.1 steps/s
+    acceleration: 10 steps/s^2
+    deceleration: 10 steps/s^2
+
+interval:
+  interval: 5s
+  then:
+    - logger.log: Interval Run
+    - stepper.set_target:
+        id: my_stepper2
+        target: 500
+    - stepper.set_target:
+        id: my_stepper
+        target: !lambda "return 0;"
+    - stepper.report_position:
+        id: my_stepper2
+        position: 0
+    - stepper.report_position:
+        id: my_stepper
+        position: !lambda "return 50/100.0;"
+
+cover:
+  - platform: endstop
+    name: Endstop Cover
+    id: endstop_cover
+    stop_action:
+      - switch.turn_on: gpio_switch1
+    open_endstop: my_binary_sensor
+    open_action:
+      - switch.turn_on: gpio_switch1
+    open_duration: 5min
+    close_endstop: my_binary_sensor
+    close_action:
+      - switch.turn_on: gpio_switch2
+      - output.set_level:
+          id: out
+          level: 50%
+      - output.esp8266_pwm.set_frequency:
+          id: out
+          frequency: 500.0Hz
+      - output.esp8266_pwm.set_frequency:
+          id: out
+          frequency: !lambda "return 500.0;"
+      - servo.write:
+          id: my_servo
+          level: -100%
+      - servo.write:
+          id: my_servo
+          level: !lambda "return -1.0;"
+      - delay: 2s
+      - servo.detach: my_servo
+    close_duration: 4.5min
+    max_duration: 10min
+  - platform: time_based
+    name: Time Based Cover
+    id: time_based_cover
+    stop_action:
+      - switch.turn_on: gpio_switch1
+    open_action:
+      - switch.turn_on: gpio_switch1
+    open_duration: 5min
+    close_action:
+      - switch.turn_on: gpio_switch2
+    close_duration: 4.5min
+  - platform: current_based
+    name: Current Based Cover
+    id: current_based_cover
+    open_sensor: ade7953_current_a
+    open_moving_current_threshold: 0.5
+    open_obstacle_current_threshold: 0.8
+    open_duration: 12s
+    open_action:
+      - switch.turn_on: gpio_switch1
+    close_sensor: ade7953_current_b
+    close_moving_current_threshold: 0.5
+    close_obstacle_current_threshold: 0.8
+    close_duration: 10s
+    close_action:
+      - switch.turn_on: gpio_switch2
+    stop_action:
+      - switch.turn_off: gpio_switch1
+      - switch.turn_off: gpio_switch2
+    obstacle_rollback: 30%
+    start_sensing_delay: 0.8s
+    malfunction_detection: true
+    malfunction_action:
+      then:
+        - logger.log: Malfunction Detected
+  - platform: template
+    name: Template Cover with Tilt
+    tilt_lambda: "return 0.5;"
+    tilt_action:
+      - output.set_level:
+          id: out
+          level: !lambda "return tilt;"
+    position_action:
+      - output.set_level:
+          id: out
+          level: !lambda "return pos;"
+
+output:
+  - platform: esp8266_pwm
+    id: out
+    pin: D3
+    frequency: 50Hz
+  - platform: esp8266_pwm
+    id: out2
+    pin: D4
+  - platform: custom
+    type: binary
+    lambda: |-
+      auto s = new CustomBinaryOutput();
+      App.register_component(s);
+      return {s};
+    outputs:
+      - id: custom_binary
+  - platform: sigma_delta_output
+    id: sddac
+    update_interval: 60s
+    pin: D4
+    turn_on_action:
+      then:
+        - logger.log: "Turned on"
+    turn_off_action:
+      then:
+        - logger.log: "Turned off"
+    state_change_action:
+      then:
+        - logger.log:
+            format: "Changed state: %d"
+            args: ["state"]
+  - platform: custom
+    type: float
+    lambda: |-
+      auto s = new CustomFloatOutput();
+      App.register_component(s);
+      return {s};
+    outputs:
+      - id: custom_float
+  - platform: slow_pwm
+    pin: GPIO5
+    id: my_slow_pwm
+    period: 15s
+    restart_cycle_on_state_change: false
+  - platform: sm2135
+    id: sm2135_0
+    channel: 0
+  - platform: sm2135
+    id: sm2135_1
+    channel: 1
+  - platform: sm2135
+    id: sm2135_2
+    channel: 2
+  - platform: sm2135
+    id: sm2135_3
+    channel: 3
+  - platform: sm2135
+    id: sm2135_4
+    channel: 4
+
+mcp23017:
+  id: mcp23017_hub
+
+mcp23008:
+  id: mcp23008_hub
+
+
+light:
+  - platform: hbridge
+    name: Icicle Lights
+    pin_a: out
+    pin_b: out2
+
+servo:
+  id: my_servo
+  output: out
+  restore: true
+  min_level: $min_sub
+  max_level: $max_sub
+
+ttp229_lsf:
+
+ttp229_bsf:
+  sdo_pin: D2
+  scl_pin: D1
+
+
+display:
+  - platform: max7219digit
+    cs_pin: GPIO15
+    num_chips: 4
+    rotate_chip: 0
+    intensity: 10
+    scroll_mode: STOP
+    id: my_matrix
+    lambda: |-
+      it.printdigit("hello");
+
+
+http_request:
+  useragent: esphome/device
+  timeout: 10s
+
+button:
+  - platform: output
+    id: output_button
+    output: out
+    duration: 100ms
+  - platform: wake_on_lan
+    target_mac_address: 12:34:56:78:90:ab
+    name: wol_test_1
+    id: wol_1
+  - platform: factory_reset
+    name: Restart Button (Factory Default Settings)
+
+cd74hc4067:
+  pin_s0: GPIO12
+  pin_s1: GPIO13
+  pin_s2: GPIO14
+  pin_s3: GPIO15
+
+adc128s102:
+  cs_pin: GPIO12
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 651683c381..38ae099fd6 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -3,8 +3,6 @@ esphome:
   name: $device_name
   comment: $device_comment
   build_path: build/test3
-  platformio_options:
-    board_build.partitions: huge_app.csv
   on_boot:
     - if:
         condition:
@@ -13,8 +11,6 @@ esphome:
           - time.has_time
         then:
           - logger.log: Have time
-  includes:
-    - custom.h
 
 esp8266:
   board: d1_mini
@@ -23,8 +19,6 @@ esp8266:
 substitutions:
   device_name: test3
   device_comment: test3 device
-  min_sub: "0.03"
-  max_sub: "12.0%"
 
 api:
   port: 8000
@@ -52,9 +46,6 @@ api:
         string_: string
       then:
         - logger.log: Something happened
-        - stepper.set_target:
-            id: my_stepper2
-            target: !lambda "return int_;"
     - service: array_types
       variables:
         bool_arr: bool[]
@@ -224,16 +215,6 @@ wifi:
   ssid: "MySSID"
   password: "password1"
 
-i2c:
-  sda: 4
-  scl: 5
-  scan: false
-
-spi:
-  clk_pin: GPIO12
-  mosi_pin: GPIO13
-  miso_pin: GPIO14
-
 uart:
   - id: uart1
     tx_pin:
@@ -349,40 +330,11 @@ sensor:
       name: Temperature 1
     temperature_2:
       name: Temperature 2
-  - platform: apds9960
-    type: proximity
-    name: APDS9960 Proximity
-  - platform: vl53l0x
-    name: VL53L0x Distance
-    address: 0x29
-    update_interval: 60s
-    enable_pin: GPIO13
-    timeout: 200us
-  - platform: apds9960
-    type: clear
-    name: APDS9960 Clear
-  - platform: apds9960
-    type: red
-    name: APDS9960 Red
-  - platform: apds9960
-    type: green
-    name: APDS9960 Green
-  - platform: apds9960
-    type: blue
-    name: APDS9960 Blue
+
   - platform: homeassistant
     entity_id: sensor.hello_world
     id: ha_hello_world
-  - platform: aht10
-    temperature:
-      name: Temperature
-    humidity:
-      name: Humidity
-  - platform: am2320
-    temperature:
-      name: Temperature
-    humidity:
-      name: Humidity
+
   - platform: hydreon_rgxx
     model: RG 9
     uart_id: uart6
@@ -404,86 +356,7 @@ sensor:
   - platform: adc
     pin: VCC
     id: my_sensor
-    filters:
-      - offset: 5.0
-      - multiply: 2.0
-      - filter_out: NAN
-      - sliding_window_moving_average:
-      - exponential_moving_average:
-      - quantile:
-          window_size: 5
-          send_every: 5
-          send_first_at: 3
-          quantile: .8
-      - lambda: "return 0;"
-      - delta: 100
-      - throttle: 100ms
-      - debounce: 500s
-      - calibrate_linear:
-          - 0 -> 0
-          - 100 -> 100
-      - calibrate_polynomial:
-          degree: 3
-          datapoints:
-            - 0 -> 0
-            - 100 -> 200
-            - 400 -> 500
-            - -50 -> -1000
-            - -100 -> -10000
-  - platform: cd74hc4067
-    id: cd74hc4067_0
-    number: 0
-    sensor: my_sensor
-  - platform: resistance
-    sensor: my_sensor
-    configuration: DOWNSTREAM
-    resistor: 10kΩ
-    reference_voltage: 3.3V
-    name: Resistance
-    id: resist
-  - platform: ntc
-    sensor: resist
-    name: NTC Sensor
-    calibration:
-      b_constant: 3950
-      reference_resistance: 10k
-      reference_temperature: 25°C
-  - platform: ntc
-    sensor: resist
-    name: NTC Sensor2
-    calibration:
-      - 10.0kOhm -> 25°C
-      - 27.219kOhm -> 0°C
-      - 14.674kOhm -> 15°C
-  - platform: ct_clamp
-    sensor: my_sensor
-    name: CT Clamp
-    sample_duration: 500ms
-    update_interval: 5s
 
-  - platform: tcs34725
-    red_channel:
-      name: Red Channel
-    green_channel:
-      name: Green Channel
-    blue_channel:
-      name: Blue Channel
-    clear_channel:
-      name: Clear Channel
-    illuminance:
-      name: Illuminance
-    color_temperature:
-      name: Color Temperature
-    integration_time: 614ms
-    gain: 60x
-  - platform: custom
-    lambda: |-
-      auto s = new CustomSensor();
-      App.register_component(s);
-      return {s};
-    sensors:
-      - id: custom_sensor
-        name: Custom Sensor
   - platform: binary_sensor_map
     name: Binary Sensor Map
     type: group
@@ -494,23 +367,7 @@ sensor:
         value: 15.0
       - binary_sensor: bin3
         value: 100.0
-  - platform: ade7953
-    irq_pin: GPIO16
-    voltage:
-      name: ADE7953 Voltage
-      id: ade7953_voltage
-    current_a:
-      name: ADE7953 Current A
-      id: ade7953_current_a
-    current_b:
-      name: ADE7953 Current B
-      id: ade7953_current_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
+
   - platform: bl0939
     uart_id: uart8
     voltage:
@@ -587,18 +444,7 @@ sensor:
       name: PZEMDC Power
     energy:
       name: PZEMDC Energy
-  - platform: tmp102
-    name: TMP102 Temperature
-  - platform: hm3301
-    pm_1_0:
-      name: PM1.0
-    pm_2_5:
-      name: PM2.5
-    pm_10_0:
-      name: PM10.0
-    aqi:
-      name: AQI
-      calculation_type: AQI
+
   - platform: pmsx003
     uart_id: uart9
     type: PMSX003
@@ -707,13 +553,7 @@ sensor:
       name: CSE7766 Current
     power:
       name: CSE776 Power
-  - platform: ezo
-    id: ph_ezo
-    address: 99
-    unit_of_measurement: pH
-  - platform: tof10120
-    name: Distance sensor
-    update_interval: 5s
+
   - platform: fingerprint_grow
     fingerprint_count:
       name: Fingerprint Count
@@ -796,20 +636,6 @@ sensor:
     name: testwave
     component_id: 2
     wave_channel_id: 1
-  - platform: mlx90393
-    oversampling: 1
-    filter: 0
-    gain: 3X
-    x_axis:
-      name: mlxxaxis
-    y_axis:
-      name: mlxyaxis
-    z_axis:
-      name: mlxzaxis
-      resolution: 17BIT
-    temperature:
-      name: mlxtemp
-      oversampling: 2
   - platform: smt100
     uart_id: uart10
     counts:
@@ -824,10 +650,6 @@ sensor:
       name: Voltage
     update_interval: 60s
 
-  - platform: adc128s102
-    id: adc128s102_channel_0
-    channel: 0
-
   - platform: vbus
     model: deltasol c
     temperature_1:
@@ -842,79 +664,19 @@ sensor:
 time:
   - platform: homeassistant
 
-apds9960:
-  address: 0x20
-  update_interval: 60s
-
-mpr121:
-  id: mpr121_first
-  address: 0x5A
-
 binary_sensor:
   - platform: daly_bms
     charging_mos_enabled:
       name: Charging MOS
     discharging_mos_enabled:
       name: Discharging MOS
-  - platform: apds9960
-    direction: up
-    name: APDS9960 Up
-    device_class: motion
-    filters:
-      - invert
-      - delayed_on: 20ms
-      - delayed_off: 20ms
-      - lambda: "return false;"
-    on_state:
-      - logger.log: New state
-    id: my_binary_sensor
-  - platform: apds9960
-    direction: down
-    name: APDS9960 Down
-  - platform: apds9960
-    direction: left
-    name: APDS9960 Left
-  - platform: apds9960
-    direction: right
-    name: APDS9960 Right
+
   - platform: homeassistant
     entity_id: binary_sensor.hello_world
     id: ha_hello_world_binary
-  - platform: mpr121
-    id: touchkey0
-    channel: 0
-    name: touchkey0
-  - platform: mpr121
-    channel: 1
-    name: touchkey1
-    id: bin1
-  - platform: mpr121
-    channel: 2
-    name: touchkey2
-    id: bin2
-  - platform: mpr121
-    channel: 3
-    name: touchkey3
-    id: bin3
-    on_press:
-      then:
-        - switch.toggle: mpr121_toggle
-  - platform: ttp229_lsf
-    channel: 1
-    name: TTP229 LSF Test
-  - platform: ttp229_bsf
-    channel: 1
-    name: TTP229 BSF Test
+
   - platform: fingerprint_grow
     name: Fingerprint Enrolling
-  - platform: custom
-    lambda: |-
-      auto s = new CustomBinarySensor();
-      App.register_component(s);
-      return {s};
-    binary_sensors:
-      - id: custom_binary_sensor
-        name: Custom Binary Sensor
   - platform: nextion
     page_id: 0
     component_id: 2
@@ -923,13 +685,7 @@ binary_sensor:
     id: r0_sensor
     name: R0 Sensor
     component_name: page0.r0
-  - platform: template
-    id: cover_toggle
-    on_press:
-      then:
-        - cover.toggle: time_based_cover
-        - cover.toggle: endstop_cover
-        - cover.toggle: current_based_cover
+
   - platform: hydreon_rgxx
     hydreon_rgxx_id: hydreon_rg9
     too_cold:
@@ -954,6 +710,16 @@ binary_sensor:
     relay1:
       name: Relay 1 On
 
+  - platform: gpio
+    id: bin1
+    pin: 1
+  - platform: gpio
+    id: bin2
+    pin: 2
+  - platform: gpio
+    id: bin3
+    pin: 3
+
 globals:
   - id: my_global_string
     type: std::string
@@ -998,14 +764,6 @@ text_sensor:
   - platform: homeassistant
     entity_id: sensor.hello_world2
     id: ha_hello_world2
-  - platform: custom
-    lambda: |-
-      auto s = new CustomTextSensor();
-      App.register_component(s);
-      return {s};
-    text_sensors:
-      - id: custom_text_sensor
-        name: Custom Text Sensor
   - platform: nextion
     name: text0
     id: text0
@@ -1022,87 +780,22 @@ script:
     then:
       - lambda: 'ESP_LOGD("main", "Hello World!");'
 
-sm2135:
-  data_pin: GPIO12
-  clock_pin: GPIO14
-
 switch:
-  - platform: template
-    name: mpr121_toggle
-    id: mpr121_toggle
-    optimistic: true
   - platform: gpio
     id: gpio_switch1
-    pin:
-      mcp23xxx: mcp23017_hub
-      number: 0
-      mode: OUTPUT
-    interlock: &interlock [gpio_switch1, gpio_switch2, gpio_switch3]
+    pin: 1
   - platform: gpio
     id: gpio_switch2
-    pin:
-      mcp23xxx: mcp23008_hub
-      number: 0
-      mode: OUTPUT
-    interlock: *interlock
+    pin: 2
   - platform: gpio
     id: gpio_switch3
-    pin: GPIO1
-    interlock: *interlock
-  - platform: custom
-    lambda: |-
-      auto s = new CustomSwitch();
-      return {s};
-    switches:
-      - id: custom_switch
-        name: Custom Switch
+    pin: 3
+
   - platform: nextion
     id: r0
     name: R0 Switch
     component_name: page0.r0
 
-custom_component:
-  lambda: |-
-    auto s = new CustomComponent();
-    s->set_update_interval(15000);
-    return {s};
-
-stepper:
-  - platform: uln2003
-    id: my_stepper
-    pin_a: GPIO12
-    pin_b: GPIO13
-    pin_c: GPIO14
-    pin_d: GPIO15
-    sleep_when_done: false
-    step_mode: HALF_STEP
-    max_speed: 250 steps/s
-    acceleration: inf
-    deceleration: inf
-  - platform: a4988
-    id: my_stepper2
-    step_pin: GPIO1
-    dir_pin: GPIO2
-    max_speed: 0.1 steps/s
-    acceleration: 10 steps/s^2
-    deceleration: 10 steps/s^2
-
-interval:
-  interval: 5s
-  then:
-    - logger.log: Interval Run
-    - stepper.set_target:
-        id: my_stepper2
-        target: 500
-    - stepper.set_target:
-        id: my_stepper
-        target: !lambda "return 0;"
-    - stepper.report_position:
-        id: my_stepper2
-        position: 0
-    - stepper.report_position:
-        id: my_stepper
-        position: !lambda "return 50/100.0;"
 
 climate:
   - platform: bang_bang
@@ -1276,85 +969,6 @@ sprinkler:
         run_duration: 10s
         valve_switch_id: gpio_switch2
 
-cover:
-  - platform: endstop
-    name: Endstop Cover
-    id: endstop_cover
-    stop_action:
-      - switch.turn_on: gpio_switch1
-    open_endstop: my_binary_sensor
-    open_action:
-      - switch.turn_on: gpio_switch1
-    open_duration: 5min
-    close_endstop: my_binary_sensor
-    close_action:
-      - switch.turn_on: gpio_switch2
-      - output.set_level:
-          id: out
-          level: 50%
-      - output.esp8266_pwm.set_frequency:
-          id: out
-          frequency: 500.0Hz
-      - output.esp8266_pwm.set_frequency:
-          id: out
-          frequency: !lambda "return 500.0;"
-      - servo.write:
-          id: my_servo
-          level: -100%
-      - servo.write:
-          id: my_servo
-          level: !lambda "return -1.0;"
-      - delay: 2s
-      - servo.detach: my_servo
-    close_duration: 4.5min
-    max_duration: 10min
-  - platform: time_based
-    name: Time Based Cover
-    id: time_based_cover
-    stop_action:
-      - switch.turn_on: gpio_switch1
-    open_action:
-      - switch.turn_on: gpio_switch1
-    open_duration: 5min
-    close_action:
-      - switch.turn_on: gpio_switch2
-    close_duration: 4.5min
-  - platform: current_based
-    name: Current Based Cover
-    id: current_based_cover
-    open_sensor: ade7953_current_a
-    open_moving_current_threshold: 0.5
-    open_obstacle_current_threshold: 0.8
-    open_duration: 12s
-    open_action:
-      - switch.turn_on: gpio_switch1
-    close_sensor: ade7953_current_b
-    close_moving_current_threshold: 0.5
-    close_obstacle_current_threshold: 0.8
-    close_duration: 10s
-    close_action:
-      - switch.turn_on: gpio_switch2
-    stop_action:
-      - switch.turn_off: gpio_switch1
-      - switch.turn_off: gpio_switch2
-    obstacle_rollback: 30%
-    start_sensing_delay: 0.8s
-    malfunction_detection: true
-    malfunction_action:
-      then:
-        - logger.log: Malfunction Detected
-  - platform: template
-    name: Template Cover with Tilt
-    tilt_lambda: "return 0.5;"
-    tilt_action:
-      - output.set_level:
-          id: out
-          level: !lambda "return tilt;"
-    position_action:
-      - output.set_level:
-          id: out
-          level: !lambda "return pos;"
-
 output:
   - platform: esp8266_pwm
     id: out
@@ -1363,63 +977,11 @@ output:
   - platform: esp8266_pwm
     id: out2
     pin: D4
-  - platform: custom
-    type: binary
-    lambda: |-
-      auto s = new CustomBinaryOutput();
-      App.register_component(s);
-      return {s};
-    outputs:
-      - id: custom_binary
-  - platform: sigma_delta_output
-    id: sddac
-    update_interval: 60s
-    pin: D4
-    turn_on_action:
-      then:
-        - logger.log: "Turned on"
-    turn_off_action:
-      then:
-        - logger.log: "Turned off"
-    state_change_action:
-      then:
-        - logger.log:
-            format: "Changed state: %d"
-            args: ["state"]
-  - platform: custom
-    type: float
-    lambda: |-
-      auto s = new CustomFloatOutput();
-      App.register_component(s);
-      return {s};
-    outputs:
-      - id: custom_float
   - platform: slow_pwm
     pin: GPIO5
     id: my_slow_pwm
     period: 15s
     restart_cycle_on_state_change: false
-  - platform: sm2135
-    id: sm2135_0
-    channel: 0
-  - platform: sm2135
-    id: sm2135_1
-    channel: 1
-  - platform: sm2135
-    id: sm2135_2
-    channel: 2
-  - platform: sm2135
-    id: sm2135_3
-    channel: 3
-  - platform: sm2135
-    id: sm2135_4
-    channel: 4
-
-mcp23017:
-  id: mcp23017_hub
-
-mcp23008:
-  id: mcp23008_hub
 
 e131:
 
@@ -1459,19 +1021,6 @@ light:
     firmware: "51.6"
     uart_id: uart11
 
-servo:
-  id: my_servo
-  output: out
-  restore: true
-  min_level: $min_sub
-  max_level: $max_sub
-
-ttp229_lsf:
-
-ttp229_bsf:
-  sdo_pin: D2
-  scl_pin: D1
-
 sim800l:
   uart_id: uart4
   on_sms_received:
@@ -1530,36 +1079,9 @@ rf_bridge:
         code: "ABC123"
     - rf_bridge.send_raw:
         raw: "AAA5070008001000ABC12355"
-    - http_request.get:
-        url: https://esphome.io
-        headers:
-          Content-Type: application/json
-        verify_ssl: false
-    - http_request.post:
-        url: https://esphome.io
-        verify_ssl: false
-        json:
-          key: !lambda |-
-            return id(version_sensor).state;
-          greeting: Hello World
-    - http_request.send:
-        method: PUT
-        url: https://esphome.io
-        headers:
-          Content-Type: application/json
-        body: Some data
-        verify_ssl: false
+
 
 display:
-  - platform: max7219digit
-    cs_pin: GPIO15
-    num_chips: 4
-    rotate_chip: 0
-    intensity: 10
-    scroll_mode: STOP
-    id: my_matrix
-    lambda: |-
-      it.printdigit("hello");
   - platform: nextion
     uart_id: uart1
     tft_url: http://esphome.io/default35.tft
@@ -1577,10 +1099,6 @@ display:
       then:
         lambda: 'ESP_LOGD("display","Display shows new page %u", x);'
 
-http_request:
-  useragent: esphome/device
-  timeout: 10s
-
 fingerprint_grow:
   sensing_pin: 4
   password: 0x12FE37DC
@@ -1627,24 +1145,3 @@ daly_bms:
 qr_code:
   - id: homepage_qr
     value: https://esphome.io/index.html
-
-button:
-  - platform: output
-    id: output_button
-    output: out
-    duration: 100ms
-  - platform: wake_on_lan
-    target_mac_address: 12:34:56:78:90:ab
-    name: wol_test_1
-    id: wol_1
-  - platform: factory_reset
-    name: Restart Button (Factory Default Settings)
-
-cd74hc4067:
-  pin_s0: GPIO12
-  pin_s1: GPIO13
-  pin_s2: GPIO14
-  pin_s3: GPIO15
-
-adc128s102:
-  cs_pin: GPIO12

From f0f6d3f1cdc47a4247e1e6b4e0e89f265a354a4c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 20 Mar 2023 15:29:21 +1300
Subject: [PATCH 715/838] Disallow uart0/1/2 as ids in config (#4446)

* Disallow uart0/1/2 as ids in config

* Update test files
---
 esphome/config_validation.py |  3 ++
 tests/test1.yaml             | 28 +++++++-------
 tests/test3.yaml             | 74 ++++++++++++++++++------------------
 tests/test5.yaml             | 10 ++---
 4 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 469b7031f6..f0bbc368b8 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -211,6 +211,9 @@ RESERVED_IDS = [
     "open",
     "setup",
     "loop",
+    "uart0",
+    "uart1",
+    "uart2",
 ]
 
 
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 0ff8b60ea2..5be6395729 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -161,13 +161,13 @@ mqtt:
                 id: ${roomname}_lights
                 relative_brightness: 5%
             - uart.write:
-                id: uart0
+                id: uart_0
                 data: Hello World
             - uart.write:
-                id: uart0
+                id: uart_0
                 data: [0x00, 0x20, 0x30]
             - uart.write:
-                id: uart0
+                id: uart_0
                 data: !lambda |-
                   return {};
   on_connect:
@@ -199,7 +199,7 @@ uart:
       number: GPIO23
       inverted: true
     baud_rate: 115200
-    id: uart0
+    id: uart_0
     parity: NONE
     data_bits: 8
     stop_bits: 1
@@ -790,7 +790,7 @@ sensor:
     reference_resistance: 430 Ω
     rtd_nominal_resistance: 100 Ω
   - platform: mhz19
-    uart_id: uart0
+    uart_id: uart_0
     co2:
       name: MH-Z19 CO2 Value
     temperature:
@@ -930,7 +930,7 @@ sensor:
     name: Pulse Width
     pin: GPIO12
   - platform: sm300d2
-    uart_id: uart0
+    uart_id: uart_0
     co2:
       name: SM300D2 CO2 Value
     formaldehyde:
@@ -1122,7 +1122,7 @@ sensor:
             root["key"] = id(the_sensor).state;
             root["greeting"] = "Hello World";
   - platform: sds011
-    uart_id: uart0
+    uart_id: uart_0
     pm_2_5:
       name: SDS011 PM2.5
     pm_10_0:
@@ -2094,7 +2094,7 @@ climate:
     on_state:
       logger.log: State changed!
     id: midea_unit
-    uart_id: uart0
+    uart_id: uart_0
     name: Midea Climate
     transmitter_id:
     period: 1s
@@ -2419,15 +2419,15 @@ switch:
           id: my_switch
           state: !lambda "return false;"
   - platform: uart
-    uart_id: uart0
+    uart_id: uart_0
     name: UART String Output
     data: DataToSend
   - platform: uart
-    uart_id: uart0
+    uart_id: uart_0
     name: UART Bytes Output
     data: [0xDE, 0xAD, 0xBE, 0xEF]
   - platform: uart
-    uart_id: uart0
+    uart_id: uart_0
     name: UART Recurring Output
     data: [0xDE, 0xAD, 0xBE, 0xEF]
     send_every: 1s
@@ -2775,7 +2775,7 @@ pn532_i2c:
   i2c_id: i2c_bus
 
 rdm6300:
-  uart_id: uart0
+  uart_id: uart_0
 
 rc522_spi:
   cs_pin: GPIO23
@@ -2804,7 +2804,7 @@ mcp4728:
     i2c_id: i2c_bus
 
 gps:
-  uart_id: uart0
+  uart_id: uart_0
 
 time:
   - platform: sntp
@@ -3124,7 +3124,7 @@ canbus:
 
 teleinfo:
   id: myteleinfo
-  uart_id: uart0
+  uart_id: uart_0
   update_interval: 60s
   historical_mode: true
 
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 38ae099fd6..ceb9047d17 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -216,37 +216,37 @@ wifi:
   password: "password1"
 
 uart:
-  - id: uart1
+  - id: uart_1
     tx_pin:
       number: GPIO1
       inverted: true
     rx_pin: GPIO3
     baud_rate: 115200
-  - id: uart2
+  - id: uart_2
     tx_pin: GPIO4
     rx_pin: GPIO5
     baud_rate: 9600
-  - id: uart3
+  - id: uart_3
     tx_pin: GPIO4
     rx_pin: GPIO5
     baud_rate: 4800
-  - id: uart4
+  - id: uart_4
     tx_pin: GPIO4
     rx_pin: GPIO5
     baud_rate: 9600
-  - id: uart5
+  - id: uart_5
     tx_pin: GPIO4
     rx_pin: GPIO5
     baud_rate: 9600
-  - id: uart6
+  - id: uart_6
     tx_pin: GPIO4
     rx_pin: GPIO5
     baud_rate: 9600
-  - id: uart7
+  - id: uart_7
     tx_pin: GPIO4
     rx_pin: GPIO5
     baud_rate: 38400
-  - id: uart8
+  - id: uart_8
     tx_pin: GPIO4
     rx_pin: GPIO5
     baud_rate: 4800
@@ -254,28 +254,28 @@ uart:
     stop_bits: 2
     # Specifically added for testing debug with no options at all.
     debug:
-  - id: uart9
+  - id: uart_9
     tx_pin: GPIO4
     rx_pin: GPIO5
     baud_rate: 9600
-  - id: uart10
+  - id: uart_10
     tx_pin: GPIO4
     rx_pin: GPIO5
     baud_rate: 9600
-  - id: uart11
+  - id: uart_11
     tx_pin: GPIO4
     rx_pin: GPIO5
     baud_rate: 9600
-  - id: uart12
+  - id: uart_12
     tx_pin: GPIO4
     rx_pin: GPIO5
     baud_rate: 9600
 
 modbus:
-  uart_id: uart1
+  uart_id: uart_1
 
 vbus:
-  uart_id: uart4
+  uart_id: uart_4
 
 ota:
   safe_mode: true
@@ -337,14 +337,14 @@ sensor:
 
   - platform: hydreon_rgxx
     model: RG 9
-    uart_id: uart6
+    uart_id: uart_6
     id: hydreon_rg9
     moisture:
       name: hydreon_rain
       id: hydreon_rain
   - platform: hydreon_rgxx
     model: RG_15
-    uart_id: uart6
+    uart_id: uart_6
     acc:
       name: hydreon_acc
     event_acc:
@@ -369,7 +369,7 @@ sensor:
         value: 100.0
 
   - platform: bl0939
-    uart_id: uart8
+    uart_id: uart_8
     voltage:
       name: BL0939 Voltage
     current_1:
@@ -387,7 +387,7 @@ sensor:
     energy_total:
       name: BL0939 Total energy
   - platform: bl0940
-    uart_id: uart3
+    uart_id: uart_3
     voltage:
       name: BL0940 Voltage
     current:
@@ -401,7 +401,7 @@ sensor:
     external_temperature:
       name: BL0940 External temperature
   - platform: bl0942
-    uart_id: uart3
+    uart_id: uart_3
     voltage:
       name: BL0942 Voltage
     current:
@@ -413,7 +413,7 @@ sensor:
     frequency:
       name: BL0942 Frequency
   - platform: pzem004t
-    uart_id: uart3
+    uart_id: uart_3
     voltage:
       name: PZEM004T Voltage
     current:
@@ -446,7 +446,7 @@ sensor:
       name: PZEMDC Energy
 
   - platform: pmsx003
-    uart_id: uart9
+    uart_id: uart_9
     type: PMSX003
     pm_1_0:
       name: PM 1.0 Concentration
@@ -474,7 +474,7 @@ sensor:
       name: Particulate Count >10.0um
     update_interval: 30s
   - platform: pmsx003
-    uart_id: uart5
+    uart_id: uart_5
     type: PMS5003T
     pm_1_0:
       name: PM 1.0 Concentration
@@ -501,7 +501,7 @@ sensor:
     humidity:
       name: PMS Humidity
   - platform: pmsx003
-    uart_id: uart6
+    uart_id: uart_6
     type: PMS5003ST
     pm_1_0:
       name: PM 1.0 Concentration
@@ -534,7 +534,7 @@ sensor:
     formaldehyde:
       name: PMS Formaldehyde Concentration
   - platform: cse7761
-    uart_id: uart7
+    uart_id: uart_7
     voltage:
       name: CSE7761 Voltage
     current_1:
@@ -546,7 +546,7 @@ sensor:
     active_power_2:
       name: CSE7761 Active Power 2
   - platform: cse7766
-    uart_id: uart3
+    uart_id: uart_3
     voltage:
       name: CSE7766 Voltage
     current:
@@ -637,7 +637,7 @@ sensor:
     component_id: 2
     wave_channel_id: 1
   - platform: smt100
-    uart_id: uart10
+    uart_id: uart_10
     counts:
       name: Counts
     dielectric_constant:
@@ -925,7 +925,7 @@ climate:
       - horizontal
       - both
     update_interval: 10s
-    uart_id: uart12
+    uart_id: uart_12
 
 sprinkler:
   - id: yard_sprinkler_ctrlr
@@ -996,7 +996,7 @@ light:
     effects:
       - wled:
       - adalight:
-          uart_id: uart3
+          uart_id: uart_3
       - e131:
           universe: 1
   - platform: hbridge
@@ -1004,7 +1004,7 @@ light:
     pin_a: out
     pin_b: out2
   - platform: sonoff_d1
-    uart_id: uart2
+    uart_id: uart_2
     use_rm433_remote: false
     name: Sonoff D1 Dimmer
     id: d1_light
@@ -1019,10 +1019,10 @@ light:
       name: "Shelly Dimmer Current"
     max_brightness: 500
     firmware: "51.6"
-    uart_id: uart11
+    uart_id: uart_11
 
 sim800l:
-  uart_id: uart4
+  uart_id: uart_4
   on_sms_received:
     - lambda: |-
         std::string str;
@@ -1035,7 +1035,7 @@ sim800l:
         recipient: "+1234"
 
 dfplayer:
-  uart_id: uart5
+  uart_id: uart_5
   on_finished_playback:
     then:
       if:
@@ -1049,7 +1049,7 @@ tm1651:
   dio_pin: D5
 
 rf_bridge:
-  uart_id: uart5
+  uart_id: uart_5
   on_code_received:
     - lambda: |-
         uint32_t test;
@@ -1083,7 +1083,7 @@ rf_bridge:
 
 display:
   - platform: nextion
-    uart_id: uart1
+    uart_id: uart_1
     tft_url: http://esphome.io/default35.tft
     update_interval: 5s
     on_sleep:
@@ -1128,11 +1128,11 @@ fingerprint_grow:
         event: esphome.${device_name}_fingerprint_grow_enrollment_failed
         data:
           finger_id: !lambda "return finger_id;"
-  uart_id: uart6
+  uart_id: uart_6
 
 dsmr:
   decryption_key: 00112233445566778899aabbccddeeff
-  uart_id: uart6
+  uart_id: uart_6
   max_telegram_length: 1000
   request_pin: D5
   request_interval: 20s
@@ -1140,7 +1140,7 @@ dsmr:
 
 daly_bms:
   update_interval: 20s
-  uart_id: uart1
+  uart_id: uart_1
 
 qr_code:
   - id: homepage_qr
diff --git a/tests/test5.yaml b/tests/test5.yaml
index bb55887d75..0d044ac241 100644
--- a/tests/test5.yaml
+++ b/tests/test5.yaml
@@ -29,11 +29,11 @@ ota:
 logger:
 
 uart:
-  - id: uart1
+  - id: uart_1
     tx_pin: 1
     rx_pin: 3
     baud_rate: 9600
-  - id: uart2
+  - id: uart_2
     tx_pin: 17
     rx_pin: 16
     baud_rate: 19200
@@ -42,7 +42,7 @@ i2c:
   frequency: 100khz
 
 modbus:
-  uart_id: uart1
+  uart_id: uart_1
   flow_control_pin: 5
   id: mod_bus1
 
@@ -67,7 +67,7 @@ mqtt:
       # yamllint enable rule:line-length
 
 vbus:
-  - uart_id: uart2
+  - uart_id: uart_2
 
 binary_sensor:
   - platform: gpio
@@ -422,7 +422,7 @@ sensor:
     value_type: U_WORD
 
   - platform: t6615
-    uart_id: uart2
+    uart_id: uart_2
     co2:
       name: CO2 Sensor
 

From 14e38f0469a67e29189a20d51a2b6dcfa9d5e390 Mon Sep 17 00:00:00 2001
From: Oxan van Leeuwen <oxan@oxanvanleeuwen.nl>
Date: Mon, 20 Mar 2023 04:38:41 +0100
Subject: [PATCH 716/838] Upgrade clang-format to v13 (#4535)

* Upgrade clang-format to v13

* Apply clang-format-13 formatting changes

* Format

* Format bme_680

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .devcontainer/devcontainer.json               |  2 +-
 .github/workflows/ci.yml                      |  2 +-
 docker/Dockerfile                             |  2 +-
 esphome/components/am43/cover/am43_cover.cpp  |  2 +-
 esphome/components/api/api_frame_helper.cpp   | 10 ++--
 esphome/components/bme680/bme680.cpp          |  8 ++--
 esphome/components/ccs811/ccs811.cpp          |  4 +-
 esphome/components/cs5460a/cs5460a.cpp        |  2 +-
 esphome/components/daly_bms/daly_bms.cpp      |  4 +-
 esphome/components/dfplayer/dfplayer.cpp      |  2 +-
 esphome/components/display/display_buffer.cpp |  8 ++--
 esphome/components/ens210/ens210.cpp          |  4 +-
 esphome/components/esp32/core.cpp             |  2 +-
 .../esp32_ble_client/ble_client_base.cpp      |  8 ++--
 .../esp32_ble_client/ble_client_base.h        |  9 ++--
 .../esp32_ble_server/ble_characteristic.cpp   | 24 +++++-----
 .../fingerprint_grow/fingerprint_grow.cpp     | 30 ++++++------
 .../fingerprint_grow/fingerprint_grow.h       |  8 ++--
 .../hitachi_ac344/hitachi_ac344.cpp           |  2 +-
 .../hitachi_ac424/hitachi_ac424.cpp           |  2 +-
 .../components/honeywellabp/honeywellabp.cpp  |  4 +-
 .../components/ili9xxx/ili9xxx_display.cpp    | 14 +++---
 esphome/components/json/json_util.cpp         |  2 +-
 .../components/lcd_gpio/gpio_lcd_display.cpp  |  2 +-
 esphome/components/ld2410/ld2410.h            |  2 +-
 esphome/components/light/color_mode.h         | 21 +++++----
 .../touchscreen/lilygo_t5_47_touchscreen.cpp  |  8 ++--
 esphome/components/mcp2515/mcp2515.cpp        | 18 ++++----
 esphome/components/mcp9600/mcp9600.cpp        |  2 +-
 esphome/components/mcp9808/mcp9808.cpp        |  6 +--
 .../mopeka_pro_check/mopeka_pro_check.cpp     |  3 +-
 .../mopeka_std_check/mopeka_std_check.cpp     |  2 +-
 esphome/components/network/ip_address.h       |  8 ++--
 esphome/components/pipsolar/pipsolar.cpp      | 22 ++++-----
 esphome/components/qmp6988/qmp6988.cpp        | 46 +++++++++----------
 .../components/remote_base/rc5_protocol.cpp   |  2 +-
 esphome/components/scd30/scd30.cpp            |  2 +-
 esphome/components/scd30/scd30.h              |  2 +-
 esphome/components/scd4x/scd4x.cpp            |  2 +-
 esphome/components/sgp4x/sgp4x.cpp            |  4 +-
 esphome/components/sht4x/sht4x.cpp            |  2 +-
 esphome/components/st7920/st7920.cpp          |  2 +-
 esphome/components/sun/sun.cpp                |  2 +-
 esphome/components/tcs34725/tcs34725.cpp      |  2 +-
 esphome/components/tm1637/tm1637.cpp          |  2 +-
 esphome/components/tm1638/tm1638.cpp          |  2 +-
 esphome/components/tuya/tuya.cpp              |  4 +-
 .../components/vbus/sensor/vbus_sensor.cpp    |  2 +-
 esphome/components/vl53l0x/vl53l0x_sensor.cpp |  2 +-
 esphome/components/web_server/web_server.cpp  |  2 +-
 esphome/components/whirlpool/whirlpool.cpp    |  2 +-
 esphome/components/xiaomi_ble/xiaomi_ble.cpp  | 12 ++---
 esphome/components/xpt2046/xpt2046.cpp        |  6 +--
 esphome/core/log.h                            |  4 +-
 script/clang-format                           |  8 ++--
 55 files changed, 182 insertions(+), 179 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 7e5a0c19c9..1f9a98d7ec 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -51,6 +51,6 @@
     "files.associations": {
       "**/.vscode/*.json": "jsonc"
     },
-    "C_Cpp.clang_format_path": "/usr/bin/clang-format-11",
+    "C_Cpp.clang_format_path": "/usr/bin/clang-format-13",
   }
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 769456c581..d22c2b7e03 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -133,7 +133,7 @@ jobs:
       - name: Install clang tools
         run: |
           sudo apt-get install \
-              clang-format-11 \
+              clang-format-13 \
               clang-tidy-11
         if: matrix.id == 'clang-tidy' || matrix.id == 'clang-format'
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 59901d7b2c..383c73565d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -135,7 +135,7 @@ RUN \
     apt-get update \
     # Use pinned versions so that we get updates with build caching
     && apt-get install -y --no-install-recommends \
-        clang-format-11=1:11.0.1-2 \
+        clang-format-13=1:13.0.1-6~deb11u1 \
         clang-tidy-11=1:11.0.1-2 \
         patch=2.7.6-7 \
         software-properties-common=0.96.20.2-2.1 \
diff --git a/esphome/components/am43/cover/am43_cover.cpp b/esphome/components/am43/cover/am43_cover.cpp
index b09f5ab767..d0ef4a2fbb 100644
--- a/esphome/components/am43/cover/am43_cover.cpp
+++ b/esphome/components/am43/cover/am43_cover.cpp
@@ -65,7 +65,7 @@ void Am43Component::control(const CoverCall &call) {
 
     if (this->invert_position_)
       pos = 1 - pos;
-    auto *packet = this->encoder_->get_set_position_request(100 - (uint8_t)(pos * 100));
+    auto *packet = this->encoder_->get_set_position_request(100 - (uint8_t) (pos * 100));
     auto status =
         esp_ble_gattc_write_char(this->parent_->get_gattc_if(), this->parent_->get_conn_id(), this->char_handle_,
                                  packet->length, packet->data, ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
diff --git a/esphome/components/api/api_frame_helper.cpp b/esphome/components/api/api_frame_helper.cpp
index c18e045a99..f4b18a1fd6 100644
--- a/esphome/components/api/api_frame_helper.cpp
+++ b/esphome/components/api/api_frame_helper.cpp
@@ -295,7 +295,7 @@ APIError APINoiseFrameHelper::state_action_() {
     if (aerr != APIError::OK)
       return aerr;
     // ignore contents, may be used in future for flags
-    prologue_.push_back((uint8_t)(frame.msg.size() >> 8));
+    prologue_.push_back((uint8_t) (frame.msg.size() >> 8));
     prologue_.push_back((uint8_t) frame.msg.size());
     prologue_.insert(prologue_.end(), frame.msg.begin(), frame.msg.end());
 
@@ -492,9 +492,9 @@ APIError APINoiseFrameHelper::write_packet(uint16_t type, const uint8_t *payload
   // tmpbuf[1], tmpbuf[2] to be set later
   const uint8_t msg_offset = 3;
   const uint8_t payload_offset = msg_offset + 4;
-  tmpbuf[msg_offset + 0] = (uint8_t)(type >> 8);  // type
+  tmpbuf[msg_offset + 0] = (uint8_t) (type >> 8);  // type
   tmpbuf[msg_offset + 1] = (uint8_t) type;
-  tmpbuf[msg_offset + 2] = (uint8_t)(payload_len >> 8);  // data_len
+  tmpbuf[msg_offset + 2] = (uint8_t) (payload_len >> 8);  // data_len
   tmpbuf[msg_offset + 3] = (uint8_t) payload_len;
   // copy data
   std::copy(payload, payload + payload_len, &tmpbuf[payload_offset]);
@@ -512,7 +512,7 @@ APIError APINoiseFrameHelper::write_packet(uint16_t type, const uint8_t *payload
   }
 
   size_t total_len = 3 + mbuf.size;
-  tmpbuf[1] = (uint8_t)(mbuf.size >> 8);
+  tmpbuf[1] = (uint8_t) (mbuf.size >> 8);
   tmpbuf[2] = (uint8_t) mbuf.size;
 
   struct iovec iov;
@@ -610,7 +610,7 @@ APIError APINoiseFrameHelper::write_raw_(const struct iovec *iov, int iovcnt) {
 APIError APINoiseFrameHelper::write_frame_(const uint8_t *data, size_t len) {
   uint8_t header[3];
   header[0] = 0x01;  // indicator
-  header[1] = (uint8_t)(len >> 8);
+  header[1] = (uint8_t) (len >> 8);
   header[2] = (uint8_t) len;
 
   struct iovec iov[2];
diff --git a/esphome/components/bme680/bme680.cpp b/esphome/components/bme680/bme680.cpp
index e5704a8f9f..2b48f39e31 100644
--- a/esphome/components/bme680/bme680.cpp
+++ b/esphome/components/bme680/bme680.cpp
@@ -1,6 +1,6 @@
 #include "bme680.h"
-#include "esphome/core/log.h"
 #include "esphome/core/hal.h"
+#include "esphome/core/log.h"
 
 namespace esphome {
 namespace bme680 {
@@ -275,8 +275,8 @@ uint8_t BME680Component::calc_heater_resistance_(uint16_t temperature) {
   var3 = var1 + (var2 / 2);
   var4 = (var3 / (res_heat_range + 4));
   var5 = (131 * res_heat_val) + 65536;
-  heatr_res_x100 = (int32_t)(((var4 / var5) - 250) * 34);
-  heatr_res = (uint8_t)((heatr_res_x100 + 50) / 100);
+  heatr_res_x100 = (int32_t) (((var4 / var5) - 250) * 34);
+  heatr_res = (uint8_t) ((heatr_res_x100 + 50) / 100);
 
   return heatr_res;
 }
@@ -316,7 +316,7 @@ void BME680Component::read_data_() {
   uint32_t raw_temperature = (uint32_t(data[5]) << 12) | (uint32_t(data[6]) << 4) | (uint32_t(data[7]) >> 4);
   uint32_t raw_pressure = (uint32_t(data[2]) << 12) | (uint32_t(data[3]) << 4) | (uint32_t(data[4]) >> 4);
   uint32_t raw_humidity = (uint32_t(data[8]) << 8) | uint32_t(data[9]);
-  uint16_t raw_gas = (uint16_t)((uint32_t) data[13] * 4 | (((uint32_t) data[14]) / 64));
+  uint16_t raw_gas = (uint16_t) ((uint32_t) data[13] * 4 | (((uint32_t) data[14]) / 64));
   uint8_t gas_range = data[14] & 0x0F;
 
   float temperature = this->calc_temperature_(raw_temperature);
diff --git a/esphome/components/ccs811/ccs811.cpp b/esphome/components/ccs811/ccs811.cpp
index 5c60989afa..f1dadf673a 100644
--- a/esphome/components/ccs811/ccs811.cpp
+++ b/esphome/components/ccs811/ccs811.cpp
@@ -145,8 +145,8 @@ void CCS811Component::send_env_data_() {
   // https://github.com/adafruit/Adafruit_CCS811/blob/0990f5c620354d8bc087c4706bec091d8e6e5dfd/Adafruit_CCS811.cpp#L135-L142
   uint16_t hum_conv = static_cast<uint16_t>(lroundf(humidity * 512.0f + 0.5f));
   uint16_t temp_conv = static_cast<uint16_t>(lroundf(temperature * 512.0f + 0.5f));
-  this->write_bytes(0x05, {(uint8_t)((hum_conv >> 8) & 0xff), (uint8_t)((hum_conv & 0xff)),
-                           (uint8_t)((temp_conv >> 8) & 0xff), (uint8_t)((temp_conv & 0xff))});
+  this->write_bytes(0x05, {(uint8_t) ((hum_conv >> 8) & 0xff), (uint8_t) ((hum_conv & 0xff)),
+                           (uint8_t) ((temp_conv >> 8) & 0xff), (uint8_t) ((temp_conv & 0xff))});
 }
 void CCS811Component::dump_config() {
   ESP_LOGCONFIG(TAG, "CCS811");
diff --git a/esphome/components/cs5460a/cs5460a.cpp b/esphome/components/cs5460a/cs5460a.cpp
index b0c0531936..fb8e50b87a 100644
--- a/esphome/components/cs5460a/cs5460a.cpp
+++ b/esphome/components/cs5460a/cs5460a.cpp
@@ -305,7 +305,7 @@ bool CS5460AComponent::check_status_() {
       voltage_sensor_->publish_state(raw_voltage * voltage_multiplier_);
 
     if (power_sensor_ != nullptr && raw_energy != prev_raw_energy_) {
-      int32_t raw = (int32_t)(raw_energy << 8) >> 8; /* Sign-extend */
+      int32_t raw = (int32_t) (raw_energy << 8) >> 8; /* Sign-extend */
       power_sensor_->publish_state(raw * power_multiplier_);
       prev_raw_energy_ = raw_energy;
     }
diff --git a/esphome/components/daly_bms/daly_bms.cpp b/esphome/components/daly_bms/daly_bms.cpp
index 36047e02d0..3b41723327 100644
--- a/esphome/components/daly_bms/daly_bms.cpp
+++ b/esphome/components/daly_bms/daly_bms.cpp
@@ -61,8 +61,8 @@ void DalyBmsComponent::request_data_(uint8_t data_id) {
   request_message[9] = 0x00;     //     |
   request_message[10] = 0x00;    //     |
   request_message[11] = 0x00;    // Empty Data
-  request_message[12] = (uint8_t)(request_message[0] + request_message[1] + request_message[2] +
-                                  request_message[3]);  // Checksum (Lower byte of the other bytes sum)
+  request_message[12] = (uint8_t) (request_message[0] + request_message[1] + request_message[2] +
+                                   request_message[3]);  // Checksum (Lower byte of the other bytes sum)
 
   this->write_array(request_message, sizeof(request_message));
   this->flush();
diff --git a/esphome/components/dfplayer/dfplayer.cpp b/esphome/components/dfplayer/dfplayer.cpp
index dcba95e20c..e16479570f 100644
--- a/esphome/components/dfplayer/dfplayer.cpp
+++ b/esphome/components/dfplayer/dfplayer.cpp
@@ -19,7 +19,7 @@ void DFPlayer::play_folder(uint16_t folder, uint16_t file) {
 }
 
 void DFPlayer::send_cmd_(uint8_t cmd, uint16_t argument) {
-  uint8_t buffer[10]{0x7e, 0xff, 0x06, cmd, 0x01, (uint8_t)(argument >> 8), (uint8_t) argument, 0x00, 0x00, 0xef};
+  uint8_t buffer[10]{0x7e, 0xff, 0x06, cmd, 0x01, (uint8_t) (argument >> 8), (uint8_t) argument, 0x00, 0x00, 0xef};
   uint16_t checksum = 0;
   for (uint8_t i = 1; i < 7; i++)
     checksum += buffer[i];
diff --git a/esphome/components/display/display_buffer.cpp b/esphome/components/display/display_buffer.cpp
index 7cd85dabd4..19751e7355 100644
--- a/esphome/components/display/display_buffer.cpp
+++ b/esphome/components/display/display_buffer.cpp
@@ -664,7 +664,7 @@ bool Animation::get_pixel(int x, int y) const {
     return false;
   const uint32_t width_8 = ((this->width_ + 7u) / 8u) * 8u;
   const uint32_t frame_index = this->height_ * width_8 * this->current_frame_;
-  if (frame_index >= (uint32_t)(this->width_ * this->height_ * this->animation_frame_count_))
+  if (frame_index >= (uint32_t) (this->width_ * this->height_ * this->animation_frame_count_))
     return false;
   const uint32_t pos = x + y * width_8 + frame_index;
   return progmem_read_byte(this->data_start_ + (pos / 8u)) & (0x80 >> (pos % 8u));
@@ -673,7 +673,7 @@ Color Animation::get_color_pixel(int x, int y) const {
   if (x < 0 || x >= this->width_ || y < 0 || y >= this->height_)
     return Color::BLACK;
   const uint32_t frame_index = this->width_ * this->height_ * this->current_frame_;
-  if (frame_index >= (uint32_t)(this->width_ * this->height_ * this->animation_frame_count_))
+  if (frame_index >= (uint32_t) (this->width_ * this->height_ * this->animation_frame_count_))
     return Color::BLACK;
   const uint32_t pos = (x + y * this->width_ + frame_index) * 3;
   const uint32_t color32 = (progmem_read_byte(this->data_start_ + pos + 2) << 0) |
@@ -685,7 +685,7 @@ Color Animation::get_rgb565_pixel(int x, int y) const {
   if (x < 0 || x >= this->width_ || y < 0 || y >= this->height_)
     return Color::BLACK;
   const uint32_t frame_index = this->width_ * this->height_ * this->current_frame_;
-  if (frame_index >= (uint32_t)(this->width_ * this->height_ * this->animation_frame_count_))
+  if (frame_index >= (uint32_t) (this->width_ * this->height_ * this->animation_frame_count_))
     return Color::BLACK;
   const uint32_t pos = (x + y * this->width_ + frame_index) * 2;
   uint16_t rgb565 =
@@ -699,7 +699,7 @@ Color Animation::get_grayscale_pixel(int x, int y) const {
   if (x < 0 || x >= this->width_ || y < 0 || y >= this->height_)
     return Color::BLACK;
   const uint32_t frame_index = this->width_ * this->height_ * this->current_frame_;
-  if (frame_index >= (uint32_t)(this->width_ * this->height_ * this->animation_frame_count_))
+  if (frame_index >= (uint32_t) (this->width_ * this->height_ * this->animation_frame_count_))
     return Color::BLACK;
   const uint32_t pos = (x + y * this->width_ + frame_index);
   const uint8_t gray = progmem_read_byte(this->data_start_ + pos);
diff --git a/esphome/components/ens210/ens210.cpp b/esphome/components/ens210/ens210.cpp
index a9c519856b..86890c05e8 100644
--- a/esphome/components/ens210/ens210.cpp
+++ b/esphome/components/ens210/ens210.cpp
@@ -168,7 +168,7 @@ void ENS210Component::update() {
       return;
     }
     // Pack bytes for humidity
-    h_val_data = (uint32_t)((uint32_t) data[5] << 16 | (uint32_t) data[4] << 8 | (uint32_t) data[3]);
+    h_val_data = (uint32_t) ((uint32_t) data[5] << 16 | (uint32_t) data[4] << 8 | (uint32_t) data[3]);
     // Extract humidity data and update the status
     extract_measurement_(h_val_data, &humidity_data, &humidity_status);
 
@@ -183,7 +183,7 @@ void ENS210Component::update() {
       return;
     }
     // Pack bytes for temperature
-    t_val_data = (uint32_t)((uint32_t) data[2] << 16 | (uint32_t) data[1] << 8 | (uint32_t) data[0]);
+    t_val_data = (uint32_t) ((uint32_t) data[2] << 16 | (uint32_t) data[1] << 8 | (uint32_t) data[0]);
     // Extract temperature data and update the status
     extract_measurement_(t_val_data, &temperature_data, &temperature_status);
 
diff --git a/esphome/components/esp32/core.cpp b/esphome/components/esp32/core.cpp
index 6123d83a34..b47392bc6b 100644
--- a/esphome/components/esp32/core.cpp
+++ b/esphome/components/esp32/core.cpp
@@ -23,7 +23,7 @@ void loop();
 namespace esphome {
 
 void IRAM_ATTR HOT yield() { vPortYield(); }
-uint32_t IRAM_ATTR HOT millis() { return (uint32_t)(esp_timer_get_time() / 1000ULL); }
+uint32_t IRAM_ATTR HOT millis() { return (uint32_t) (esp_timer_get_time() / 1000ULL); }
 void IRAM_ATTR HOT delay(uint32_t ms) { vTaskDelay(ms / portTICK_PERIOD_MS); }
 uint32_t IRAM_ATTR HOT micros() { return (uint32_t) esp_timer_get_time(); }
 void IRAM_ATTR HOT delayMicroseconds(uint32_t us) { delay_microseconds_safe(us); }
diff --git a/esphome/components/esp32_ble_client/ble_client_base.cpp b/esphome/components/esp32_ble_client/ble_client_base.cpp
index 9ca82c7239..40eff49266 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -316,18 +316,18 @@ float BLEClientBase::parse_char_value(uint8_t *value, uint16_t length) {
     case 0xD:  // int12.
     case 0xE:  // int16.
       if (length > 2) {
-        return (float) ((int16_t)(value[1] << 8) + (int16_t) value[2]);
+        return (float) ((int16_t) (value[1] << 8) + (int16_t) value[2]);
       }
       // fall through
     case 0xF:  // int24.
       if (length > 3) {
-        return (float) ((int32_t)(value[1] << 16) + (int32_t)(value[2] << 8) + (int32_t)(value[3]));
+        return (float) ((int32_t) (value[1] << 16) + (int32_t) (value[2] << 8) + (int32_t) (value[3]));
       }
       // fall through
     case 0x10:  // int32.
       if (length > 4) {
-        return (float) ((int32_t)(value[1] << 24) + (int32_t)(value[2] << 16) + (int32_t)(value[3] << 8) +
-                        (int32_t)(value[4]));
+        return (float) ((int32_t) (value[1] << 24) + (int32_t) (value[2] << 16) + (int32_t) (value[3] << 8) +
+                        (int32_t) (value[4]));
       }
   }
   ESP_LOGW(TAG, "[%d] [%s] Cannot parse characteristic value of type 0x%x length %d", this->connection_index_,
diff --git a/esphome/components/esp32_ble_client/ble_client_base.h b/esphome/components/esp32_ble_client/ble_client_base.h
index 2879da4d8c..97886d0b19 100644
--- a/esphome/components/esp32_ble_client/ble_client_base.h
+++ b/esphome/components/esp32_ble_client/ble_client_base.h
@@ -45,10 +45,11 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
       memset(this->remote_bda_, 0, sizeof(this->remote_bda_));
       this->address_str_ = "";
     } else {
-      this->address_str_ = str_snprintf("%02X:%02X:%02X:%02X:%02X:%02X", 17, (uint8_t)(this->address_ >> 40) & 0xff,
-                                        (uint8_t)(this->address_ >> 32) & 0xff, (uint8_t)(this->address_ >> 24) & 0xff,
-                                        (uint8_t)(this->address_ >> 16) & 0xff, (uint8_t)(this->address_ >> 8) & 0xff,
-                                        (uint8_t)(this->address_ >> 0) & 0xff);
+      this->address_str_ =
+          str_snprintf("%02X:%02X:%02X:%02X:%02X:%02X", 17, (uint8_t) (this->address_ >> 40) & 0xff,
+                       (uint8_t) (this->address_ >> 32) & 0xff, (uint8_t) (this->address_ >> 24) & 0xff,
+                       (uint8_t) (this->address_ >> 16) & 0xff, (uint8_t) (this->address_ >> 8) & 0xff,
+                       (uint8_t) (this->address_ >> 0) & 0xff);
     }
   }
   std::string address_str() const { return this->address_str_; }
diff --git a/esphome/components/esp32_ble_server/ble_characteristic.cpp b/esphome/components/esp32_ble_server/ble_characteristic.cpp
index df822ac0b9..15a51f6ede 100644
--- a/esphome/components/esp32_ble_server/ble_characteristic.cpp
+++ b/esphome/components/esp32_ble_server/ble_characteristic.cpp
@@ -148,44 +148,44 @@ bool BLECharacteristic::is_failed() {
 
 void BLECharacteristic::set_broadcast_property(bool value) {
   if (value) {
-    this->properties_ = (esp_gatt_char_prop_t)(this->properties_ | ESP_GATT_CHAR_PROP_BIT_BROADCAST);
+    this->properties_ = (esp_gatt_char_prop_t) (this->properties_ | ESP_GATT_CHAR_PROP_BIT_BROADCAST);
   } else {
-    this->properties_ = (esp_gatt_char_prop_t)(this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_BROADCAST);
+    this->properties_ = (esp_gatt_char_prop_t) (this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_BROADCAST);
   }
 }
 void BLECharacteristic::set_indicate_property(bool value) {
   if (value) {
-    this->properties_ = (esp_gatt_char_prop_t)(this->properties_ | ESP_GATT_CHAR_PROP_BIT_INDICATE);
+    this->properties_ = (esp_gatt_char_prop_t) (this->properties_ | ESP_GATT_CHAR_PROP_BIT_INDICATE);
   } else {
-    this->properties_ = (esp_gatt_char_prop_t)(this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_INDICATE);
+    this->properties_ = (esp_gatt_char_prop_t) (this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_INDICATE);
   }
 }
 void BLECharacteristic::set_notify_property(bool value) {
   if (value) {
-    this->properties_ = (esp_gatt_char_prop_t)(this->properties_ | ESP_GATT_CHAR_PROP_BIT_NOTIFY);
+    this->properties_ = (esp_gatt_char_prop_t) (this->properties_ | ESP_GATT_CHAR_PROP_BIT_NOTIFY);
   } else {
-    this->properties_ = (esp_gatt_char_prop_t)(this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_NOTIFY);
+    this->properties_ = (esp_gatt_char_prop_t) (this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_NOTIFY);
   }
 }
 void BLECharacteristic::set_read_property(bool value) {
   if (value) {
-    this->properties_ = (esp_gatt_char_prop_t)(this->properties_ | ESP_GATT_CHAR_PROP_BIT_READ);
+    this->properties_ = (esp_gatt_char_prop_t) (this->properties_ | ESP_GATT_CHAR_PROP_BIT_READ);
   } else {
-    this->properties_ = (esp_gatt_char_prop_t)(this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_READ);
+    this->properties_ = (esp_gatt_char_prop_t) (this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_READ);
   }
 }
 void BLECharacteristic::set_write_property(bool value) {
   if (value) {
-    this->properties_ = (esp_gatt_char_prop_t)(this->properties_ | ESP_GATT_CHAR_PROP_BIT_WRITE);
+    this->properties_ = (esp_gatt_char_prop_t) (this->properties_ | ESP_GATT_CHAR_PROP_BIT_WRITE);
   } else {
-    this->properties_ = (esp_gatt_char_prop_t)(this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_WRITE);
+    this->properties_ = (esp_gatt_char_prop_t) (this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_WRITE);
   }
 }
 void BLECharacteristic::set_write_no_response_property(bool value) {
   if (value) {
-    this->properties_ = (esp_gatt_char_prop_t)(this->properties_ | ESP_GATT_CHAR_PROP_BIT_WRITE_NR);
+    this->properties_ = (esp_gatt_char_prop_t) (this->properties_ | ESP_GATT_CHAR_PROP_BIT_WRITE_NR);
   } else {
-    this->properties_ = (esp_gatt_char_prop_t)(this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_WRITE_NR);
+    this->properties_ = (esp_gatt_char_prop_t) (this->properties_ & ~ESP_GATT_CHAR_PROP_BIT_WRITE_NR);
   }
 }
 
diff --git a/esphome/components/fingerprint_grow/fingerprint_grow.cpp b/esphome/components/fingerprint_grow/fingerprint_grow.cpp
index 1d6cb776b7..d27b0ca4cd 100644
--- a/esphome/components/fingerprint_grow/fingerprint_grow.cpp
+++ b/esphome/components/fingerprint_grow/fingerprint_grow.cpp
@@ -95,7 +95,7 @@ void FingerprintGrowComponent::scan_and_match_() {
   }
   if (this->scan_image_(1) == OK) {
     this->waiting_removal_ = true;
-    this->data_ = {SEARCH, 0x01, 0x00, 0x00, (uint8_t)(this->capacity_ >> 8), (uint8_t)(this->capacity_ & 0xFF)};
+    this->data_ = {SEARCH, 0x01, 0x00, 0x00, (uint8_t) (this->capacity_ >> 8), (uint8_t) (this->capacity_ & 0xFF)};
     switch (this->send_command_()) {
       case OK: {
         ESP_LOGD(TAG, "Fingerprint matched");
@@ -171,7 +171,7 @@ uint8_t FingerprintGrowComponent::save_fingerprint_() {
   }
 
   ESP_LOGI(TAG, "Storing model");
-  this->data_ = {STORE, 0x01, (uint8_t)(this->enrollment_slot_ >> 8), (uint8_t)(this->enrollment_slot_ & 0xFF)};
+  this->data_ = {STORE, 0x01, (uint8_t) (this->enrollment_slot_ >> 8), (uint8_t) (this->enrollment_slot_ & 0xFF)};
   switch (this->send_command_()) {
     case OK:
       ESP_LOGI(TAG, "Stored model");
@@ -188,8 +188,8 @@ uint8_t FingerprintGrowComponent::save_fingerprint_() {
 
 bool FingerprintGrowComponent::check_password_() {
   ESP_LOGD(TAG, "Checking password");
-  this->data_ = {VERIFY_PASSWORD, (uint8_t)(this->password_ >> 24), (uint8_t)(this->password_ >> 16),
-                 (uint8_t)(this->password_ >> 8), (uint8_t)(this->password_ & 0xFF)};
+  this->data_ = {VERIFY_PASSWORD, (uint8_t) (this->password_ >> 24), (uint8_t) (this->password_ >> 16),
+                 (uint8_t) (this->password_ >> 8), (uint8_t) (this->password_ & 0xFF)};
   switch (this->send_command_()) {
     case OK:
       ESP_LOGD(TAG, "Password verified");
@@ -203,8 +203,8 @@ bool FingerprintGrowComponent::check_password_() {
 
 bool FingerprintGrowComponent::set_password_() {
   ESP_LOGI(TAG, "Setting new password: %d", 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)};
+  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) {
     ESP_LOGI(TAG, "New password successfully set");
     ESP_LOGI(TAG, "Define the new password in your configuration and reflash now");
@@ -250,7 +250,7 @@ void FingerprintGrowComponent::get_fingerprint_count_() {
 
 void FingerprintGrowComponent::delete_fingerprint(uint16_t finger_id) {
   ESP_LOGI(TAG, "Deleting fingerprint in slot %d", finger_id);
-  this->data_ = {DELETE, (uint8_t)(finger_id >> 8), (uint8_t)(finger_id & 0xFF), 0x00, 0x01};
+  this->data_ = {DELETE, (uint8_t) (finger_id >> 8), (uint8_t) (finger_id & 0xFF), 0x00, 0x01};
   switch (this->send_command_()) {
     case OK:
       ESP_LOGI(TAG, "Deleted fingerprint");
@@ -320,8 +320,8 @@ void FingerprintGrowComponent::aura_led_control(uint8_t state, uint8_t speed, ui
 }
 
 uint8_t FingerprintGrowComponent::send_command_() {
-  this->write((uint8_t)(START_CODE >> 8));
-  this->write((uint8_t)(START_CODE & 0xFF));
+  this->write((uint8_t) (START_CODE >> 8));
+  this->write((uint8_t) (START_CODE & 0xFF));
   this->write(this->address_[0]);
   this->write(this->address_[1]);
   this->write(this->address_[2]);
@@ -329,8 +329,8 @@ uint8_t FingerprintGrowComponent::send_command_() {
   this->write(COMMAND);
 
   uint16_t wire_length = this->data_.size() + 2;
-  this->write((uint8_t)(wire_length >> 8));
-  this->write((uint8_t)(wire_length & 0xFF));
+  this->write((uint8_t) (wire_length >> 8));
+  this->write((uint8_t) (wire_length & 0xFF));
 
   uint16_t sum = ((wire_length) >> 8) + ((wire_length) &0xFF) + COMMAND;
   for (auto data : this->data_) {
@@ -338,8 +338,8 @@ uint8_t FingerprintGrowComponent::send_command_() {
     sum += data;
   }
 
-  this->write((uint8_t)(sum >> 8));
-  this->write((uint8_t)(sum & 0xFF));
+  this->write((uint8_t) (sum >> 8));
+  this->write((uint8_t) (sum & 0xFF));
 
   this->data_.clear();
 
@@ -354,11 +354,11 @@ uint8_t FingerprintGrowComponent::send_command_() {
     byte = this->read();
     switch (idx) {
       case 0:
-        if (byte != (uint8_t)(START_CODE >> 8))
+        if (byte != (uint8_t) (START_CODE >> 8))
           continue;
         break;
       case 1:
-        if (byte != (uint8_t)(START_CODE & 0xFF)) {
+        if (byte != (uint8_t) (START_CODE & 0xFF)) {
           idx = 0;
           continue;
         }
diff --git a/esphome/components/fingerprint_grow/fingerprint_grow.h b/esphome/components/fingerprint_grow/fingerprint_grow.h
index 96d02a1e8c..fd316237f7 100644
--- a/esphome/components/fingerprint_grow/fingerprint_grow.h
+++ b/esphome/components/fingerprint_grow/fingerprint_grow.h
@@ -91,10 +91,10 @@ class FingerprintGrowComponent : public PollingComponent, public uart::UARTDevic
   void dump_config() override;
 
   void set_address(uint32_t address) {
-    this->address_[0] = (uint8_t)(address >> 24);
-    this->address_[1] = (uint8_t)(address >> 16);
-    this->address_[2] = (uint8_t)(address >> 8);
-    this->address_[3] = (uint8_t)(address & 0xFF);
+    this->address_[0] = (uint8_t) (address >> 24);
+    this->address_[1] = (uint8_t) (address >> 16);
+    this->address_[2] = (uint8_t) (address >> 8);
+    this->address_[3] = (uint8_t) (address & 0xFF);
   }
   void set_sensing_pin(GPIOPin *sensing_pin) { this->sensing_pin_ = sensing_pin; }
   void set_password(uint32_t password) { this->password_ = password; }
diff --git a/esphome/components/hitachi_ac344/hitachi_ac344.cpp b/esphome/components/hitachi_ac344/hitachi_ac344.cpp
index 7b93b00503..2825e4f04c 100644
--- a/esphome/components/hitachi_ac344/hitachi_ac344.cpp
+++ b/esphome/components/hitachi_ac344/hitachi_ac344.cpp
@@ -12,7 +12,7 @@ void set_bits(uint8_t *const dst, const uint8_t offset, const uint8_t nbits, con
   uint8_t mask = UINT8_MAX >> (8 - ((nbits > 8) ? 8 : nbits));
   // Calculate the mask & clear the space for the data.
   // Clear the destination bits.
-  *dst &= ~(uint8_t)(mask << offset);
+  *dst &= ~(uint8_t) (mask << offset);
   // Merge in the data.
   *dst |= ((data & mask) << offset);
 }
diff --git a/esphome/components/hitachi_ac424/hitachi_ac424.cpp b/esphome/components/hitachi_ac424/hitachi_ac424.cpp
index 65cfaa4175..0bfc3ae564 100644
--- a/esphome/components/hitachi_ac424/hitachi_ac424.cpp
+++ b/esphome/components/hitachi_ac424/hitachi_ac424.cpp
@@ -12,7 +12,7 @@ void set_bits(uint8_t *const dst, const uint8_t offset, const uint8_t nbits, con
   uint8_t mask = UINT8_MAX >> (8 - ((nbits > 8) ? 8 : nbits));
   // Calculate the mask & clear the space for the data.
   // Clear the destination bits.
-  *dst &= ~(uint8_t)(mask << offset);
+  *dst &= ~(uint8_t) (mask << offset);
   // Merge in the data.
   *dst |= ((data & mask) << offset);
 }
diff --git a/esphome/components/honeywellabp/honeywellabp.cpp b/esphome/components/honeywellabp/honeywellabp.cpp
index 910c39e8c8..124bd6bb95 100644
--- a/esphome/components/honeywellabp/honeywellabp.cpp
+++ b/esphome/components/honeywellabp/honeywellabp.cpp
@@ -35,9 +35,9 @@ uint8_t HONEYWELLABPSensor::readsensor_() {
   // if device is normal and there is new data, bitmask and save the raw data
   if (status_ == 0) {
     // 14 - bit pressure is the last 6 bits of byte 0 (high bits) & all of byte 1 (lowest 8 bits)
-    pressure_count_ = ((uint16_t)(buf_[0]) << 8 & 0x3F00) | ((uint16_t)(buf_[1]) & 0xFF);
+    pressure_count_ = ((uint16_t) (buf_[0]) << 8 & 0x3F00) | ((uint16_t) (buf_[1]) & 0xFF);
     // 11 - bit temperature is all of byte 2 (lowest 8 bits) and the first three bits of byte 3
-    temperature_count_ = (((uint16_t)(buf_[2]) << 3) & 0x7F8) | (((uint16_t)(buf_[3]) >> 5) & 0x7);
+    temperature_count_ = (((uint16_t) (buf_[2]) << 3) & 0x7F8) | (((uint16_t) (buf_[3]) >> 5) & 0x7);
     ESP_LOGV(TAG, "Sensor pressure_count_ %d", pressure_count_);
     ESP_LOGV(TAG, "Sensor temperature_count_ %d", temperature_count_);
   }
diff --git a/esphome/components/ili9xxx/ili9xxx_display.cpp b/esphome/components/ili9xxx/ili9xxx_display.cpp
index 0091a2aabc..1b5248fa29 100644
--- a/esphome/components/ili9xxx/ili9xxx_display.cpp
+++ b/esphome/components/ili9xxx/ili9xxx_display.cpp
@@ -1,8 +1,8 @@
 #include "ili9xxx_display.h"
-#include "esphome/core/log.h"
 #include "esphome/core/application.h"
-#include "esphome/core/helpers.h"
 #include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
 
 namespace esphome {
 namespace ili9xxx {
@@ -85,7 +85,7 @@ void ILI9XXXDisplay::fill(Color color) {
     case BITS_16:
       new_color = display::ColorUtil::color_to_565(color);
       for (uint32_t i = 0; i < this->get_buffer_length_() * 2; i = i + 2) {
-        this->buffer_[i] = (uint8_t)(new_color >> 8);
+        this->buffer_[i] = (uint8_t) (new_color >> 8);
         this->buffer_[i + 1] = (uint8_t) new_color;
       }
       return;
@@ -111,8 +111,8 @@ void HOT ILI9XXXDisplay::draw_absolute_pixel_internal(int x, int y, Color color)
     case BITS_16:
       pos = pos * 2;
       new_color = display::ColorUtil::color_to_565(color, display::ColorOrder::COLOR_ORDER_RGB);
-      if (this->buffer_[pos] != (uint8_t)(new_color >> 8)) {
-        this->buffer_[pos] = (uint8_t)(new_color >> 8);
+      if (this->buffer_[pos] != (uint8_t) (new_color >> 8)) {
+        this->buffer_[pos] = (uint8_t) (new_color >> 8);
         updated = true;
       }
       pos = pos + 1;
@@ -192,9 +192,9 @@ void ILI9XXXDisplay::display_() {
 
           uint8_t pass_buff[3];
 
-          pass_buff[2] = (uint8_t)((red / 32.0) * 64) << 2;
+          pass_buff[2] = (uint8_t) ((red / 32.0) * 64) << 2;
           pass_buff[1] = (uint8_t) green << 2;
-          pass_buff[0] = (uint8_t)((blue / 32.0) * 64) << 2;
+          pass_buff[0] = (uint8_t) ((blue / 32.0) * 64) << 2;
 
           this->write_array(pass_buff, sizeof(pass_buff));
         }
diff --git a/esphome/components/json/json_util.cpp b/esphome/components/json/json_util.cpp
index f105280b23..f27d441804 100644
--- a/esphome/components/json/json_util.cpp
+++ b/esphome/components/json/json_util.cpp
@@ -73,7 +73,7 @@ void parse_json(const std::string &data, const json_parse_t &f) {
   const size_t free_heap = rp2040.getFreeHeap();
 #endif
   bool pass = false;
-  size_t request_size = std::min(free_heap, (size_t)(data.size() * 1.5));
+  size_t request_size = std::min(free_heap, (size_t) (data.size() * 1.5));
   do {
     DynamicJsonDocument json_document(request_size);
     if (json_document.capacity() == 0) {
diff --git a/esphome/components/lcd_gpio/gpio_lcd_display.cpp b/esphome/components/lcd_gpio/gpio_lcd_display.cpp
index 94ddc34051..a738893816 100644
--- a/esphome/components/lcd_gpio/gpio_lcd_display.cpp
+++ b/esphome/components/lcd_gpio/gpio_lcd_display.cpp
@@ -17,7 +17,7 @@ void GPIOLCDDisplay::setup() {
   this->enable_pin_->setup();  // OUTPUT
   this->enable_pin_->digital_write(false);
 
-  for (uint8_t i = 0; i < (uint8_t)(this->is_four_bit_mode() ? 4u : 8u); i++) {
+  for (uint8_t i = 0; i < (uint8_t) (this->is_four_bit_mode() ? 4u : 8u); i++) {
     this->data_pins_[i]->setup();  // OUTPUT
     this->data_pins_[i]->digital_write(false);
   }
diff --git a/esphome/components/ld2410/ld2410.h b/esphome/components/ld2410/ld2410.h
index 5a35798bc2..8edb83a8d5 100644
--- a/esphome/components/ld2410/ld2410.h
+++ b/esphome/components/ld2410/ld2410.h
@@ -118,7 +118,7 @@ class LD2410Component : public Component, public uart::UARTDevice {
 #endif
 
   std::vector<uint8_t> rx_buffer_;
-  int two_byte_to_int_(char firstbyte, char secondbyte) { return (int16_t)(secondbyte << 8) + firstbyte; }
+  int two_byte_to_int_(char firstbyte, char secondbyte) { return (int16_t) (secondbyte << 8) + firstbyte; }
   void send_command_(uint8_t command_str, uint8_t *command_value, int command_value_len);
 
   void set_max_distances_timeout_(uint8_t max_moving_distance_range, uint8_t max_still_distance_range,
diff --git a/esphome/components/light/color_mode.h b/esphome/components/light/color_mode.h
index 77c377d39e..e524763c9f 100644
--- a/esphome/components/light/color_mode.h
+++ b/esphome/components/light/color_mode.h
@@ -52,25 +52,26 @@ enum class ColorMode : uint8_t {
   /// Only on/off control.
   ON_OFF = (uint8_t) ColorCapability::ON_OFF,
   /// Dimmable light.
-  BRIGHTNESS = (uint8_t)(ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS),
+  BRIGHTNESS = (uint8_t) (ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS),
   /// White output only (use only if the light also has another color mode such as RGB).
-  WHITE = (uint8_t)(ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS | ColorCapability::WHITE),
+  WHITE = (uint8_t) (ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS | ColorCapability::WHITE),
   /// Controllable color temperature output.
   COLOR_TEMPERATURE =
-      (uint8_t)(ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS | ColorCapability::COLOR_TEMPERATURE),
+      (uint8_t) (ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS | ColorCapability::COLOR_TEMPERATURE),
   /// Cold and warm white output with individually controllable brightness.
-  COLD_WARM_WHITE = (uint8_t)(ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS | ColorCapability::COLD_WARM_WHITE),
+  COLD_WARM_WHITE =
+      (uint8_t) (ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS | ColorCapability::COLD_WARM_WHITE),
   /// RGB color output.
-  RGB = (uint8_t)(ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS | ColorCapability::RGB),
+  RGB = (uint8_t) (ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS | ColorCapability::RGB),
   /// RGB color output and a separate white output.
   RGB_WHITE =
-      (uint8_t)(ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS | ColorCapability::RGB | ColorCapability::WHITE),
+      (uint8_t) (ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS | ColorCapability::RGB | ColorCapability::WHITE),
   /// RGB color output and a separate white output with controllable color temperature.
-  RGB_COLOR_TEMPERATURE = (uint8_t)(ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS | ColorCapability::RGB |
-                                    ColorCapability::WHITE | ColorCapability::COLOR_TEMPERATURE),
+  RGB_COLOR_TEMPERATURE = (uint8_t) (ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS | ColorCapability::RGB |
+                                     ColorCapability::WHITE | ColorCapability::COLOR_TEMPERATURE),
   /// RGB color output, and separate cold and warm white outputs.
-  RGB_COLD_WARM_WHITE = (uint8_t)(ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS | ColorCapability::RGB |
-                                  ColorCapability::COLD_WARM_WHITE),
+  RGB_COLD_WARM_WHITE = (uint8_t) (ColorCapability::ON_OFF | ColorCapability::BRIGHTNESS | ColorCapability::RGB |
+                                   ColorCapability::COLD_WARM_WHITE),
 };
 
 /// Helper class to allow bitwise operations on ColorMode with ColorCapability
diff --git a/esphome/components/lilygo_t5_47/touchscreen/lilygo_t5_47_touchscreen.cpp b/esphome/components/lilygo_t5_47/touchscreen/lilygo_t5_47_touchscreen.cpp
index b92d7d6f10..b89cf2a724 100644
--- a/esphome/components/lilygo_t5_47/touchscreen/lilygo_t5_47_touchscreen.cpp
+++ b/esphome/components/lilygo_t5_47/touchscreen/lilygo_t5_47_touchscreen.cpp
@@ -113,8 +113,8 @@ void LilygoT547Touchscreen::loop() {
       if (tp.state == 0x06)
         tp.state = 0x07;
 
-      uint16_t y = (uint16_t)((buffer[i * 5 + 1 + offset] << 4) | ((buffer[i * 5 + 3 + offset] >> 4) & 0x0F));
-      uint16_t x = (uint16_t)((buffer[i * 5 + 2 + offset] << 4) | (buffer[i * 5 + 3 + offset] & 0x0F));
+      uint16_t y = (uint16_t) ((buffer[i * 5 + 1 + offset] << 4) | ((buffer[i * 5 + 3 + offset] >> 4) & 0x0F));
+      uint16_t x = (uint16_t) ((buffer[i * 5 + 2 + offset] << 4) | (buffer[i * 5 + 3 + offset] & 0x0F));
 
       switch (this->rotation_) {
         case ROTATE_0_DEGREES:
@@ -142,8 +142,8 @@ void LilygoT547Touchscreen::loop() {
     tp.id = (buffer[0] >> 4) & 0x0F;
     tp.state = 0x06;
 
-    uint16_t y = (uint16_t)((buffer[0 * 5 + 1] << 4) | ((buffer[0 * 5 + 3] >> 4) & 0x0F));
-    uint16_t x = (uint16_t)((buffer[0 * 5 + 2] << 4) | (buffer[0 * 5 + 3] & 0x0F));
+    uint16_t y = (uint16_t) ((buffer[0 * 5 + 1] << 4) | ((buffer[0 * 5 + 3] >> 4) & 0x0F));
+    uint16_t x = (uint16_t) ((buffer[0 * 5 + 2] << 4) | (buffer[0 * 5 + 3] & 0x0F));
 
     switch (this->rotation_) {
       case ROTATE_0_DEGREES:
diff --git a/esphome/components/mcp2515/mcp2515.cpp b/esphome/components/mcp2515/mcp2515.cpp
index e845c79a64..b90b4de66d 100644
--- a/esphome/components/mcp2515/mcp2515.cpp
+++ b/esphome/components/mcp2515/mcp2515.cpp
@@ -148,19 +148,19 @@ canbus::Error MCP2515::set_clk_out_(const CanClkOut divisor) {
 }
 
 void MCP2515::prepare_id_(uint8_t *buffer, const bool extended, const uint32_t id) {
-  uint16_t canid = (uint16_t)(id & 0x0FFFF);
+  uint16_t canid = (uint16_t) (id & 0x0FFFF);
 
   if (extended) {
-    buffer[MCP_EID0] = (uint8_t)(canid & 0xFF);
-    buffer[MCP_EID8] = (uint8_t)(canid >> 8);
-    canid = (uint16_t)(id >> 16);
-    buffer[MCP_SIDL] = (uint8_t)(canid & 0x03);
-    buffer[MCP_SIDL] += (uint8_t)((canid & 0x1C) << 3);
+    buffer[MCP_EID0] = (uint8_t) (canid & 0xFF);
+    buffer[MCP_EID8] = (uint8_t) (canid >> 8);
+    canid = (uint16_t) (id >> 16);
+    buffer[MCP_SIDL] = (uint8_t) (canid & 0x03);
+    buffer[MCP_SIDL] += (uint8_t) ((canid & 0x1C) << 3);
     buffer[MCP_SIDL] |= TXB_EXIDE_MASK;
-    buffer[MCP_SIDH] = (uint8_t)(canid >> 5);
+    buffer[MCP_SIDH] = (uint8_t) (canid >> 5);
   } else {
-    buffer[MCP_SIDH] = (uint8_t)(canid >> 3);
-    buffer[MCP_SIDL] = (uint8_t)((canid & 0x07) << 5);
+    buffer[MCP_SIDH] = (uint8_t) (canid >> 3);
+    buffer[MCP_SIDL] = (uint8_t) ((canid & 0x07) << 5);
     buffer[MCP_EID0] = 0;
     buffer[MCP_EID8] = 0;
   }
diff --git a/esphome/components/mcp9600/mcp9600.cpp b/esphome/components/mcp9600/mcp9600.cpp
index 3fdd788fc6..b56c838f78 100644
--- a/esphome/components/mcp9600/mcp9600.cpp
+++ b/esphome/components/mcp9600/mcp9600.cpp
@@ -32,7 +32,7 @@ void MCP9600Component::setup() {
 
   uint16_t dev_id = 0;
   this->read_byte_16(MCP9600_REGISTER_DEVICE_ID, &dev_id);
-  this->device_id_ = (uint8_t)(dev_id >> 8);
+  this->device_id_ = (uint8_t) (dev_id >> 8);
 
   // Allows both MCP9600's and MCP9601's to be connected.
   if (this->device_id_ != (uint8_t) 0x40 && this->device_id_ != (uint8_t) 0x41) {
diff --git a/esphome/components/mcp9808/mcp9808.cpp b/esphome/components/mcp9808/mcp9808.cpp
index fca1331fc3..626fcd540d 100644
--- a/esphome/components/mcp9808/mcp9808.cpp
+++ b/esphome/components/mcp9808/mcp9808.cpp
@@ -54,16 +54,16 @@ void MCP9808Sensor::update() {
   }
 
   float temp = NAN;
-  uint8_t msb = (uint8_t)((raw_temp & 0xff00) >> 8);
+  uint8_t msb = (uint8_t) ((raw_temp & 0xff00) >> 8);
   uint8_t lsb = raw_temp & 0x00ff;
 
   msb = msb & MCP9808_AMBIENT_CLEAR_FLAGS;
 
   if ((msb & MCP9808_AMBIENT_TEMP_NEGATIVE) == MCP9808_AMBIENT_TEMP_NEGATIVE) {
     msb = msb & MCP9808_AMBIENT_CLEAR_SIGN;
-    temp = (256 - ((uint16_t)(msb) *16 + lsb / 16.0f)) * -1;
+    temp = (256 - ((uint16_t) (msb) *16 + lsb / 16.0f)) * -1;
   } else {
-    temp = (uint16_t)(msb) *16 + lsb / 16.0f;
+    temp = (uint16_t) (msb) *16 + lsb / 16.0f;
   }
 
   if (std::isnan(temp)) {
diff --git a/esphome/components/mopeka_pro_check/mopeka_pro_check.cpp b/esphome/components/mopeka_pro_check/mopeka_pro_check.cpp
index 60592b00ad..02d77a6b33 100644
--- a/esphome/components/mopeka_pro_check/mopeka_pro_check.cpp
+++ b/esphome/components/mopeka_pro_check/mopeka_pro_check.cpp
@@ -123,7 +123,8 @@ uint32_t MopekaProCheck::parse_distance_(const std::vector<uint8_t> &message) {
   double raw_level = raw & 0x3FFF;
   double raw_t = (message[2] & 0x7F);
 
-  return (uint32_t)(raw_level * (MOPEKA_LPG_COEF[0] + MOPEKA_LPG_COEF[1] * raw_t + MOPEKA_LPG_COEF[2] * raw_t * raw_t));
+  return (uint32_t) (raw_level *
+                     (MOPEKA_LPG_COEF[0] + MOPEKA_LPG_COEF[1] * raw_t + MOPEKA_LPG_COEF[2] * raw_t * raw_t));
 }
 
 uint8_t MopekaProCheck::parse_temperature_(const std::vector<uint8_t> &message) { return (message[2] & 0x7F) - 40; }
diff --git a/esphome/components/mopeka_std_check/mopeka_std_check.cpp b/esphome/components/mopeka_std_check/mopeka_std_check.cpp
index cbe51b8f2d..ae7b646b9d 100644
--- a/esphome/components/mopeka_std_check/mopeka_std_check.cpp
+++ b/esphome/components/mopeka_std_check/mopeka_std_check.cpp
@@ -216,7 +216,7 @@ uint8_t MopekaStdCheck::parse_temperature_(const mopeka_std_package *message) {
   if (tmp == 0x0) {
     return -40;
   } else {
-    return (uint8_t)((tmp - 25.0f) * 1.776964f);
+    return (uint8_t) ((tmp - 25.0f) * 1.776964f);
   }
 }
 
diff --git a/esphome/components/network/ip_address.h b/esphome/components/network/ip_address.h
index d69dee4547..af198179ba 100644
--- a/esphome/components/network/ip_address.h
+++ b/esphome/components/network/ip_address.h
@@ -12,10 +12,10 @@ struct IPAddress {
   IPAddress() : addr_({0, 0, 0, 0}) {}
   IPAddress(uint8_t first, uint8_t second, uint8_t third, uint8_t fourth) : addr_({first, second, third, fourth}) {}
   IPAddress(uint32_t raw) {
-    addr_[0] = (uint8_t)(raw >> 0);
-    addr_[1] = (uint8_t)(raw >> 8);
-    addr_[2] = (uint8_t)(raw >> 16);
-    addr_[3] = (uint8_t)(raw >> 24);
+    addr_[0] = (uint8_t) (raw >> 0);
+    addr_[1] = (uint8_t) (raw >> 8);
+    addr_[2] = (uint8_t) (raw >> 16);
+    addr_[3] = (uint8_t) (raw >> 24);
   }
   operator uint32_t() const {
     uint32_t res = 0;
diff --git a/esphome/components/pipsolar/pipsolar.cpp b/esphome/components/pipsolar/pipsolar.cpp
index 5f203645fe..c9d1ed00f6 100644
--- a/esphome/components/pipsolar/pipsolar.cpp
+++ b/esphome/components/pipsolar/pipsolar.cpp
@@ -770,15 +770,15 @@ uint8_t Pipsolar::check_incoming_crc_() {
   uint16_t crc16;
   crc16 = cal_crc_half_(read_buffer_, read_pos_ - 3);
   ESP_LOGD(TAG, "checking crc on incoming message");
-  if (((uint8_t)((crc16) >> 8)) == read_buffer_[read_pos_ - 3] &&
-      ((uint8_t)((crc16) &0xff)) == read_buffer_[read_pos_ - 2]) {
+  if (((uint8_t) ((crc16) >> 8)) == read_buffer_[read_pos_ - 3] &&
+      ((uint8_t) ((crc16) &0xff)) == read_buffer_[read_pos_ - 2]) {
     ESP_LOGD(TAG, "CRC OK");
     read_buffer_[read_pos_ - 1] = 0;
     read_buffer_[read_pos_ - 2] = 0;
     read_buffer_[read_pos_ - 3] = 0;
     return 1;
   }
-  ESP_LOGD(TAG, "CRC NOK expected: %X %X but got: %X %X", ((uint8_t)((crc16) >> 8)), ((uint8_t)((crc16) &0xff)),
+  ESP_LOGD(TAG, "CRC NOK expected: %X %X but got: %X %X", ((uint8_t) ((crc16) >> 8)), ((uint8_t) ((crc16) &0xff)),
            read_buffer_[read_pos_ - 3], read_buffer_[read_pos_ - 2]);
   return 0;
 }
@@ -800,8 +800,8 @@ uint8_t Pipsolar::send_next_command_() {
     crc16 = cal_crc_half_(byte_command, length);
     this->write_str(command);
     // checksum
-    this->write(((uint8_t)((crc16) >> 8)));   // highbyte
-    this->write(((uint8_t)((crc16) &0xff)));  // lowbyte
+    this->write(((uint8_t) ((crc16) >> 8)));   // highbyte
+    this->write(((uint8_t) ((crc16) &0xff)));  // lowbyte
     // end Byte
     this->write(0x0D);
     ESP_LOGD(TAG, "Sending command from queue: %s with length %d", command, length);
@@ -829,8 +829,8 @@ void Pipsolar::send_next_poll_() {
   this->write_array(this->used_polling_commands_[this->last_polling_command_].command,
                     this->used_polling_commands_[this->last_polling_command_].length);
   // checksum
-  this->write(((uint8_t)((crc16) >> 8)));   // highbyte
-  this->write(((uint8_t)((crc16) &0xff)));  // lowbyte
+  this->write(((uint8_t) ((crc16) >> 8)));   // highbyte
+  this->write(((uint8_t) ((crc16) &0xff)));  // lowbyte
   // end Byte
   this->write(0x0D);
   ESP_LOGD(TAG, "Sending polling command : %s with length %d",
@@ -882,7 +882,7 @@ void Pipsolar::add_polling_command_(const char *command, ENUMPollingCommand poll
       used_polling_command.command = new uint8_t[length];  // NOLINT(cppcoreguidelines-owning-memory)
       size_t i = 0;
       for (; beg != end; ++beg, ++i) {
-        used_polling_command.command[i] = (uint8_t)(*beg);
+        used_polling_command.command[i] = (uint8_t) (*beg);
       }
       used_polling_command.errors = 0;
       used_polling_command.identifier = polling_command;
@@ -907,17 +907,17 @@ uint16_t Pipsolar::cal_crc_half_(uint8_t *msg, uint8_t len) {
   crc = 0;
 
   while (len-- != 0) {
-    da = ((uint8_t)(crc >> 8)) >> 4;
+    da = ((uint8_t) (crc >> 8)) >> 4;
     crc <<= 4;
     crc ^= crc_ta[da ^ (*ptr >> 4)];
-    da = ((uint8_t)(crc >> 8)) >> 4;
+    da = ((uint8_t) (crc >> 8)) >> 4;
     crc <<= 4;
     crc ^= crc_ta[da ^ (*ptr & 0x0f)];
     ptr++;
   }
 
   b_crc_low = crc;
-  b_crc_hign = (uint8_t)(crc >> 8);
+  b_crc_hign = (uint8_t) (crc >> 8);
 
   if (b_crc_low == 0x28 || b_crc_low == 0x0d || b_crc_low == 0x0a)
     b_crc_low++;
diff --git a/esphome/components/qmp6988/qmp6988.cpp b/esphome/components/qmp6988/qmp6988.cpp
index 5bad1e4a47..c24780eb25 100644
--- a/esphome/components/qmp6988/qmp6988.cpp
+++ b/esphome/components/qmp6988/qmp6988.cpp
@@ -121,38 +121,38 @@ bool QMP6988Component::get_calibration_data_() {
   }
 
   qmp6988_data_.qmp6988_cali.COE_a0 =
-      (QMP6988_S32_t)(((a_data_uint8_tr[18] << SHIFT_LEFT_12_POSITION) |
-                       (a_data_uint8_tr[19] << SHIFT_LEFT_4_POSITION) | (a_data_uint8_tr[24] & 0x0f))
-                      << 12);
+      (QMP6988_S32_t) (((a_data_uint8_tr[18] << SHIFT_LEFT_12_POSITION) |
+                        (a_data_uint8_tr[19] << SHIFT_LEFT_4_POSITION) | (a_data_uint8_tr[24] & 0x0f))
+                       << 12);
   qmp6988_data_.qmp6988_cali.COE_a0 = qmp6988_data_.qmp6988_cali.COE_a0 >> 12;
 
   qmp6988_data_.qmp6988_cali.COE_a1 =
-      (QMP6988_S16_t)(((a_data_uint8_tr[20]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[21]);
+      (QMP6988_S16_t) (((a_data_uint8_tr[20]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[21]);
   qmp6988_data_.qmp6988_cali.COE_a2 =
-      (QMP6988_S16_t)(((a_data_uint8_tr[22]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[23]);
+      (QMP6988_S16_t) (((a_data_uint8_tr[22]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[23]);
 
   qmp6988_data_.qmp6988_cali.COE_b00 =
-      (QMP6988_S32_t)(((a_data_uint8_tr[0] << SHIFT_LEFT_12_POSITION) | (a_data_uint8_tr[1] << SHIFT_LEFT_4_POSITION) |
-                       ((a_data_uint8_tr[24] & 0xf0) >> SHIFT_RIGHT_4_POSITION))
-                      << 12);
+      (QMP6988_S32_t) (((a_data_uint8_tr[0] << SHIFT_LEFT_12_POSITION) | (a_data_uint8_tr[1] << SHIFT_LEFT_4_POSITION) |
+                        ((a_data_uint8_tr[24] & 0xf0) >> SHIFT_RIGHT_4_POSITION))
+                       << 12);
   qmp6988_data_.qmp6988_cali.COE_b00 = qmp6988_data_.qmp6988_cali.COE_b00 >> 12;
 
   qmp6988_data_.qmp6988_cali.COE_bt1 =
-      (QMP6988_S16_t)(((a_data_uint8_tr[2]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[3]);
+      (QMP6988_S16_t) (((a_data_uint8_tr[2]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[3]);
   qmp6988_data_.qmp6988_cali.COE_bt2 =
-      (QMP6988_S16_t)(((a_data_uint8_tr[4]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[5]);
+      (QMP6988_S16_t) (((a_data_uint8_tr[4]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[5]);
   qmp6988_data_.qmp6988_cali.COE_bp1 =
-      (QMP6988_S16_t)(((a_data_uint8_tr[6]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[7]);
+      (QMP6988_S16_t) (((a_data_uint8_tr[6]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[7]);
   qmp6988_data_.qmp6988_cali.COE_b11 =
-      (QMP6988_S16_t)(((a_data_uint8_tr[8]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[9]);
+      (QMP6988_S16_t) (((a_data_uint8_tr[8]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[9]);
   qmp6988_data_.qmp6988_cali.COE_bp2 =
-      (QMP6988_S16_t)(((a_data_uint8_tr[10]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[11]);
+      (QMP6988_S16_t) (((a_data_uint8_tr[10]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[11]);
   qmp6988_data_.qmp6988_cali.COE_b12 =
-      (QMP6988_S16_t)(((a_data_uint8_tr[12]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[13]);
+      (QMP6988_S16_t) (((a_data_uint8_tr[12]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[13]);
   qmp6988_data_.qmp6988_cali.COE_b21 =
-      (QMP6988_S16_t)(((a_data_uint8_tr[14]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[15]);
+      (QMP6988_S16_t) (((a_data_uint8_tr[14]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[15]);
   qmp6988_data_.qmp6988_cali.COE_bp3 =
-      (QMP6988_S16_t)(((a_data_uint8_tr[16]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[17]);
+      (QMP6988_S16_t) (((a_data_uint8_tr[16]) << SHIFT_LEFT_8_POSITION) | a_data_uint8_tr[17]);
 
   ESP_LOGV(TAG, "<-----------calibration data-------------->\r\n");
   ESP_LOGV(TAG, "COE_a0[%d] COE_a1[%d] COE_a2[%d] COE_b00[%d]\r\n", qmp6988_data_.qmp6988_cali.COE_a0,
@@ -197,7 +197,7 @@ QMP6988_S16_t QMP6988Component::get_compensated_temperature_(qmp6988_ik_data_t *
   wk2 = ((QMP6988_S64_t) ik->a2 * (QMP6988_S64_t) dt) >> 14;  // 30Q47+24-1=53 (39Q33)
   wk2 = (wk2 * (QMP6988_S64_t) dt) >> 10;                     // 39Q33+24-1=62 (52Q23)
   wk2 = ((wk1 + wk2) / 32767) >> 19;                          // 54,52->55Q23 (20Q04)
-  ret = (QMP6988_S16_t)((ik->a0 + wk2) >> 4);                 // 21Q4 -> 17Q0
+  ret = (QMP6988_S16_t) ((ik->a0 + wk2) >> 4);                // 21Q4 -> 17Q0
   return ret;
 }
 
@@ -332,13 +332,13 @@ void QMP6988Component::calculate_pressure_() {
     ESP_LOGE(TAG, "Error reading raw pressure/temp values");
     return;
   }
-  p_read = (QMP6988_U32_t)((((QMP6988_U32_t)(a_data_uint8_tr[0])) << SHIFT_LEFT_16_POSITION) |
-                           (((QMP6988_U16_t)(a_data_uint8_tr[1])) << SHIFT_LEFT_8_POSITION) | (a_data_uint8_tr[2]));
-  p_raw = (QMP6988_S32_t)(p_read - SUBTRACTOR);
+  p_read = (QMP6988_U32_t) ((((QMP6988_U32_t) (a_data_uint8_tr[0])) << SHIFT_LEFT_16_POSITION) |
+                            (((QMP6988_U16_t) (a_data_uint8_tr[1])) << SHIFT_LEFT_8_POSITION) | (a_data_uint8_tr[2]));
+  p_raw = (QMP6988_S32_t) (p_read - SUBTRACTOR);
 
-  t_read = (QMP6988_U32_t)((((QMP6988_U32_t)(a_data_uint8_tr[3])) << SHIFT_LEFT_16_POSITION) |
-                           (((QMP6988_U16_t)(a_data_uint8_tr[4])) << SHIFT_LEFT_8_POSITION) | (a_data_uint8_tr[5]));
-  t_raw = (QMP6988_S32_t)(t_read - SUBTRACTOR);
+  t_read = (QMP6988_U32_t) ((((QMP6988_U32_t) (a_data_uint8_tr[3])) << SHIFT_LEFT_16_POSITION) |
+                            (((QMP6988_U16_t) (a_data_uint8_tr[4])) << SHIFT_LEFT_8_POSITION) | (a_data_uint8_tr[5]));
+  t_raw = (QMP6988_S32_t) (t_read - SUBTRACTOR);
 
   t_int = this->get_compensated_temperature_(&(qmp6988_data_.ik), t_raw);
   p_int = this->get_compensated_pressure_(&(qmp6988_data_.ik), p_raw, t_int);
diff --git a/esphome/components/remote_base/rc5_protocol.cpp b/esphome/components/remote_base/rc5_protocol.cpp
index 47a85cda57..cb6eed4c6c 100644
--- a/esphome/components/remote_base/rc5_protocol.cpp
+++ b/esphome/components/remote_base/rc5_protocol.cpp
@@ -78,7 +78,7 @@ optional<RC5Data> RC5Protocol::decode(RemoteReceiveData src) {
     out_data |= 1;
   }
 
-  out.command = (uint8_t)(out_data & 0x3F) + (1 - field_bit) * 64u;
+  out.command = (uint8_t) (out_data & 0x3F) + (1 - field_bit) * 64u;
   out.address = (out_data >> 6) & 0x1F;
   return out;
 }
diff --git a/esphome/components/scd30/scd30.cpp b/esphome/components/scd30/scd30.cpp
index c25ed107b7..01abca0a1f 100644
--- a/esphome/components/scd30/scd30.cpp
+++ b/esphome/components/scd30/scd30.cpp
@@ -43,7 +43,7 @@ void SCD30Component::setup() {
            uint16_t(raw_firmware_version[0] & 0xFF));
 
   if (this->temperature_offset_ != 0) {
-    if (!this->write_command(SCD30_CMD_TEMPERATURE_OFFSET, (uint16_t)(temperature_offset_ * 100.0))) {
+    if (!this->write_command(SCD30_CMD_TEMPERATURE_OFFSET, (uint16_t) (temperature_offset_ * 100.0))) {
       ESP_LOGE(TAG, "Sensor SCD30 error setting temperature offset.");
       this->error_code_ = MEASUREMENT_INIT_FAILED;
       this->mark_failed();
diff --git a/esphome/components/scd30/scd30.h b/esphome/components/scd30/scd30.h
index 4a4ca832bf..40f075e673 100644
--- a/esphome/components/scd30/scd30.h
+++ b/esphome/components/scd30/scd30.h
@@ -16,7 +16,7 @@ class SCD30Component : public Component, public sensirion_common::SensirionI2CDe
   void set_automatic_self_calibration(bool asc) { enable_asc_ = asc; }
   void set_altitude_compensation(uint16_t altitude) { altitude_compensation_ = altitude; }
   void set_ambient_pressure_compensation(float pressure) {
-    ambient_pressure_compensation_ = (uint16_t)(pressure * 1000);
+    ambient_pressure_compensation_ = (uint16_t) (pressure * 1000);
   }
   void set_temperature_offset(float offset) { temperature_offset_ = offset; }
   void set_update_interval(uint16_t interval) { update_interval_ = interval; }
diff --git a/esphome/components/scd4x/scd4x.cpp b/esphome/components/scd4x/scd4x.cpp
index 117b92b901..a8a4129b48 100644
--- a/esphome/components/scd4x/scd4x.cpp
+++ b/esphome/components/scd4x/scd4x.cpp
@@ -50,7 +50,7 @@ void SCD4XComponent::setup() {
                uint16_t(raw_serial_number[0] & 0xFF), (uint16_t(raw_serial_number[1]) >> 8));
 
       if (!this->write_command(SCD4X_CMD_TEMPERATURE_OFFSET,
-                               (uint16_t)(temperature_offset_ * SCD4X_TEMPERATURE_OFFSET_MULTIPLIER))) {
+                               (uint16_t) (temperature_offset_ * SCD4X_TEMPERATURE_OFFSET_MULTIPLIER))) {
         ESP_LOGE(TAG, "Error setting temperature offset.");
         this->error_code_ = MEASUREMENT_INIT_FAILED;
         this->mark_failed();
diff --git a/esphome/components/sgp4x/sgp4x.cpp b/esphome/components/sgp4x/sgp4x.cpp
index 7fe46b9518..52f9adc808 100644
--- a/esphome/components/sgp4x/sgp4x.cpp
+++ b/esphome/components/sgp4x/sgp4x.cpp
@@ -234,8 +234,8 @@ bool SGP4xComponent::measure_raw_(uint16_t &voc_raw, uint16_t &nox_raw) {
       response_words = 2;
     }
   }
-  uint16_t rhticks = llround((uint16_t)((humidity * 65535) / 100));
-  uint16_t tempticks = (uint16_t)(((temperature + 45) * 65535) / 175);
+  uint16_t rhticks = llround((uint16_t) ((humidity * 65535) / 100));
+  uint16_t tempticks = (uint16_t) (((temperature + 45) * 65535) / 175);
   // first parameter are the relative humidity ticks
   data[0] = rhticks;
   // secomd parameter are the temperature ticks
diff --git a/esphome/components/sht4x/sht4x.cpp b/esphome/components/sht4x/sht4x.cpp
index bdc3e62d2f..0f9123434d 100644
--- a/esphome/components/sht4x/sht4x.cpp
+++ b/esphome/components/sht4x/sht4x.cpp
@@ -19,7 +19,7 @@ void SHT4XComponent::setup() {
   ESP_LOGCONFIG(TAG, "Setting up sht4x...");
 
   if (this->duty_cycle_ > 0.0) {
-    uint32_t heater_interval = (uint32_t)(this->heater_time_ / this->duty_cycle_);
+    uint32_t heater_interval = (uint32_t) (this->heater_time_ / this->duty_cycle_);
     ESP_LOGD(TAG, "Heater interval: %i", heater_interval);
 
     if (this->heater_power_ == SHT4X_HEATERPOWER_HIGH) {
diff --git a/esphome/components/st7920/st7920.cpp b/esphome/components/st7920/st7920.cpp
index 63fa0ba72f..f336d24e24 100644
--- a/esphome/components/st7920/st7920.cpp
+++ b/esphome/components/st7920/st7920.cpp
@@ -74,7 +74,7 @@ void ST7920::goto_xy_(uint16_t x, uint16_t y) {
 
 void HOT ST7920::write_display_data() {
   uint8_t i, j, b;
-  for (j = 0; j < (uint8_t)(this->get_height_internal() / 2); j++) {
+  for (j = 0; j < (uint8_t) (this->get_height_internal() / 2); j++) {
     this->goto_xy_(0, j);
     this->enable();
     for (i = 0; i < 16; i++) {  // 16 bytes from line #0+
diff --git a/esphome/components/sun/sun.cpp b/esphome/components/sun/sun.cpp
index 113c14d431..54aaf0942b 100644
--- a/esphome/components/sun/sun.cpp
+++ b/esphome/components/sun/sun.cpp
@@ -269,7 +269,7 @@ struct SunAtLocation {
     num_t jd = julian_day(date) + added_d;
 
     num_t eot = SunAtTime(jd).equation_of_time() * 240;
-    time_t new_timestamp = (time_t)(date.timestamp + added_d * 86400 - eot);
+    time_t new_timestamp = (time_t) (date.timestamp + added_d * 86400 - eot);
     return time::ESPTime::from_epoch_utc(new_timestamp);
   }
 };
diff --git a/esphome/components/tcs34725/tcs34725.cpp b/esphome/components/tcs34725/tcs34725.cpp
index 276bf65ebf..88c59eb761 100644
--- a/esphome/components/tcs34725/tcs34725.cpp
+++ b/esphome/components/tcs34725/tcs34725.cpp
@@ -287,7 +287,7 @@ void TCS34725Component::update() {
     }
 
     // calculate register value from timing
-    uint8_t regval_atime = (uint8_t)(256.f - integration_time_next / 2.4f);
+    uint8_t regval_atime = (uint8_t) (256.f - integration_time_next / 2.4f);
     ESP_LOGD(TAG, "Integration time: %.1fms, ideal: %.1fms regval_new %d Gain: %.f Clear channel raw: %d  gain reg: %d",
              this->integration_time_, integration_time_next, regval_atime, this->gain_, raw_c, this->gain_reg_);
 
diff --git a/esphome/components/tm1637/tm1637.cpp b/esphome/components/tm1637/tm1637.cpp
index be2192ea22..5b8cbc6004 100644
--- a/esphome/components/tm1637/tm1637.cpp
+++ b/esphome/components/tm1637/tm1637.cpp
@@ -168,7 +168,7 @@ uint8_t TM1637Display::get_keys() {
     //    Bit | 7  6  5  4  3  2  1  0
     //  ------+------------------------
     //     To | 0  0  0  0  K2 S2 S1 S0
-    key_code = (uint8_t)((key_code & 0x80) >> 7 | (key_code & 0x40) >> 5 | (key_code & 0x20) >> 3 | (key_code & 0x08));
+    key_code = (uint8_t) ((key_code & 0x80) >> 7 | (key_code & 0x40) >> 5 | (key_code & 0x20) >> 3 | (key_code & 0x08));
   }
   return key_code;
 }
diff --git a/esphome/components/tm1638/tm1638.cpp b/esphome/components/tm1638/tm1638.cpp
index 526b53f601..24cb4122bf 100644
--- a/esphome/components/tm1638/tm1638.cpp
+++ b/esphome/components/tm1638/tm1638.cpp
@@ -140,7 +140,7 @@ void TM1638Component::set_intensity(uint8_t brightness_level) {
   this->send_command_(TM1638_REGISTER_FIXEDADDRESS);
 
   if (brightness_level > 0) {
-    this->send_command_((uint8_t)(TM1638_REGISTER_DISPLAYON | intensity_));
+    this->send_command_((uint8_t) (TM1638_REGISTER_DISPLAYON | intensity_));
   } else {
     this->send_command_(TM1638_REGISTER_DISPLAYOFF);
   }
diff --git a/esphome/components/tuya/tuya.cpp b/esphome/components/tuya/tuya.cpp
index 79a9049b04..040b9b7ed5 100644
--- a/esphome/components/tuya/tuya.cpp
+++ b/esphome/components/tuya/tuya.cpp
@@ -381,8 +381,8 @@ void Tuya::handle_datapoints_(const uint8_t *buffer, size_t len) {
 }
 
 void Tuya::send_raw_command_(TuyaCommand command) {
-  uint8_t len_hi = (uint8_t)(command.payload.size() >> 8);
-  uint8_t len_lo = (uint8_t)(command.payload.size() & 0xFF);
+  uint8_t len_hi = (uint8_t) (command.payload.size() >> 8);
+  uint8_t len_lo = (uint8_t) (command.payload.size() & 0xFF);
   uint8_t version = 0;
 
   this->last_command_timestamp_ = millis();
diff --git a/esphome/components/vbus/sensor/vbus_sensor.cpp b/esphome/components/vbus/sensor/vbus_sensor.cpp
index 57d5a355ad..8261773431 100644
--- a/esphome/components/vbus/sensor/vbus_sensor.cpp
+++ b/esphome/components/vbus/sensor/vbus_sensor.cpp
@@ -12,7 +12,7 @@ static inline uint16_t get_u16(std::vector<uint8_t> &message, int start) {
 }
 
 static inline int16_t get_i16(std::vector<uint8_t> &message, int start) {
-  return (int16_t)((message[start + 1] << 8) + message[start]);
+  return (int16_t) ((message[start + 1] << 8) + message[start]);
 }
 
 void DeltaSolBSPlusSensor::dump_config() {
diff --git a/esphome/components/vl53l0x/vl53l0x_sensor.cpp b/esphome/components/vl53l0x/vl53l0x_sensor.cpp
index f851cf6d73..b07779a653 100644
--- a/esphome/components/vl53l0x/vl53l0x_sensor.cpp
+++ b/esphome/components/vl53l0x/vl53l0x_sensor.cpp
@@ -88,7 +88,7 @@ void VL53L0XSensor::setup() {
 
   this->timeout_start_us_ = micros();
   while (reg(0x83).get() == 0x00) {
-    if (this->timeout_us_ > 0 && ((uint16_t)(micros() - this->timeout_start_us_) > this->timeout_us_)) {
+    if (this->timeout_us_ > 0 && ((uint16_t) (micros() - this->timeout_start_us_) > this->timeout_us_)) {
       ESP_LOGE(TAG, "'%s' - setup timeout", this->name_.c_str());
       this->mark_failed();
       return;
diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index 6c74c79ce6..80a53a7515 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -867,7 +867,7 @@ void WebServer::handle_climate_request(AsyncWebServerRequest *request, const Url
 }
 
 // Longest: HORIZONTAL
-#define PSTR_LOCAL(mode_s) strncpy_P(__buf, (PGM_P)((mode_s)), 15)
+#define PSTR_LOCAL(mode_s) strncpy_P(__buf, (PGM_P) ((mode_s)), 15)
 
 std::string WebServer::climate_json(climate::Climate *obj, JsonDetail start_config) {
   return json::build_json([obj, start_config](JsonObject root) {
diff --git a/esphome/components/whirlpool/whirlpool.cpp b/esphome/components/whirlpool/whirlpool.cpp
index f354ab070d..225423b4db 100644
--- a/esphome/components/whirlpool/whirlpool.cpp
+++ b/esphome/components/whirlpool/whirlpool.cpp
@@ -78,7 +78,7 @@ void WhirlpoolClimate::transmit_state() {
 
   // Temperature
   auto temp = (uint8_t) roundf(clamp(this->target_temperature, this->temperature_min_(), this->temperature_max_()));
-  remote_state[3] |= (uint8_t)(temp - this->temperature_min_()) << 4;
+  remote_state[3] |= (uint8_t) (temp - this->temperature_min_()) << 4;
 
   // Fan speed
   switch (this->fan_mode.value()) {
diff --git a/esphome/components/xiaomi_ble/xiaomi_ble.cpp b/esphome/components/xiaomi_ble/xiaomi_ble.cpp
index 95d97defe2..95faea0446 100644
--- a/esphome/components/xiaomi_ble/xiaomi_ble.cpp
+++ b/esphome/components/xiaomi_ble/xiaomi_ble.cpp
@@ -239,12 +239,12 @@ bool decrypt_xiaomi_payload(std::vector<uint8_t> &raw, const uint8_t *bindkey, c
   }
 
   uint8_t mac_reverse[6] = {0};
-  mac_reverse[5] = (uint8_t)(address >> 40);
-  mac_reverse[4] = (uint8_t)(address >> 32);
-  mac_reverse[3] = (uint8_t)(address >> 24);
-  mac_reverse[2] = (uint8_t)(address >> 16);
-  mac_reverse[1] = (uint8_t)(address >> 8);
-  mac_reverse[0] = (uint8_t)(address >> 0);
+  mac_reverse[5] = (uint8_t) (address >> 40);
+  mac_reverse[4] = (uint8_t) (address >> 32);
+  mac_reverse[3] = (uint8_t) (address >> 24);
+  mac_reverse[2] = (uint8_t) (address >> 16);
+  mac_reverse[1] = (uint8_t) (address >> 8);
+  mac_reverse[0] = (uint8_t) (address >> 0);
 
   XiaomiAESVector vector{.key = {0},
                          .plaintext = {0},
diff --git a/esphome/components/xpt2046/xpt2046.cpp b/esphome/components/xpt2046/xpt2046.cpp
index e3317e0fd5..6c7c55a995 100644
--- a/esphome/components/xpt2046/xpt2046.cpp
+++ b/esphome/components/xpt2046/xpt2046.cpp
@@ -104,8 +104,8 @@ void XPT2046Component::check_touch_() {
         break;
     }
 
-    touchpoint.x = (int16_t)((int) touchpoint.x * this->display_->get_width() / 0xfff);
-    touchpoint.y = (int16_t)((int) touchpoint.y * this->display_->get_height() / 0xfff);
+    touchpoint.x = (int16_t) ((int) touchpoint.x * this->display_->get_width() / 0xfff);
+    touchpoint.y = (int16_t) ((int) touchpoint.y * this->display_->get_height() / 0xfff);
 
     if (!this->touched || (now - this->last_pos_ms_) >= this->report_millis_) {
       ESP_LOGV(TAG, "Touching at [%03X, %03X] => [%3d, %3d]", this->x_raw, this->y_raw, touchpoint.x, touchpoint.y);
@@ -185,7 +185,7 @@ int16_t XPT2046Component::normalize(int16_t val, int16_t min_val, int16_t max_va
   } else if (val >= max_val) {
     ret = 0xfff;
   } else {
-    ret = (int16_t)((int) 0xfff * (val - min_val) / (max_val - min_val));
+    ret = (int16_t) ((int) 0xfff * (val - min_val) / (max_val - min_val));
   }
 
   return ret;
diff --git a/esphome/core/log.h b/esphome/core/log.h
index bef5e5c633..6775aa5ac5 100644
--- a/esphome/core/log.h
+++ b/esphome/core/log.h
@@ -167,7 +167,7 @@ struct LogString;
 #include <pgmspace.h>
 
 #if USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 0)
-#define LOG_STR_ARG(s) ((PGM_P)(s))
+#define LOG_STR_ARG(s) ((PGM_P) (s))
 #else
 // Pre-Arduino 2.5, we can't pass a PSTR() to printf(). Emulate support by copying the message to a
 // local buffer first. String length is limited to 63 characters.
@@ -176,7 +176,7 @@ struct LogString;
   ({ \
     char __buf[64]; \
     __buf[63] = '\0'; \
-    strncpy_P(__buf, (PGM_P)(s), 63); \
+    strncpy_P(__buf, (PGM_P) (s), 63); \
     __buf; \
   })
 #endif
diff --git a/script/clang-format b/script/clang-format
index ae807262f1..165fbd269f 100755
--- a/script/clang-format
+++ b/script/clang-format
@@ -17,7 +17,7 @@ def run_format(args, queue, lock, failed_files):
     """Takes filenames out of queue and runs clang-format on them."""
     while True:
         path = queue.get()
-        invocation = ["clang-format-11"]
+        invocation = ["clang-format-13"]
         if args.inplace:
             invocation.append("-i")
         else:
@@ -59,14 +59,14 @@ def main():
     args = parser.parse_args()
 
     try:
-        get_output("clang-format-11", "-version")
+        get_output("clang-format-13", "-version")
     except:
         print(
             """
         Oops. It looks like clang-format is not installed. 
         
-        Please check you can run "clang-format-11 -version" in your terminal and install
-        clang-format (v11) if necessary.
+        Please check you can run "clang-format-13 -version" in your terminal and install
+        clang-format (v13) if necessary.
         
         Note you can also upload your code as a pull request on GitHub and see the CI check
         output to apply clang-format.

From d98d6ff45f7d6019ee3b5e073d7cca798af9f39e Mon Sep 17 00:00:00 2001
From: "Aaron S. Jackson" <aaron@aaronsplace.co.uk>
Date: Mon, 20 Mar 2023 03:45:50 +0000
Subject: [PATCH 717/838] B/W support for GooDisplay GDEY029T94 (as used on
 Adafruit MagTag) (#4222)

* B/W support for GooDisplay GDEY029T94

* Fix python style ci

* linter recommendations

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .../components/waveshare_epaper/display.py    |  2 +
 .../waveshare_epaper/waveshare_epaper.cpp     | 84 +++++++++++++++++++
 .../waveshare_epaper/waveshare_epaper.h       | 20 +++++
 3 files changed, 106 insertions(+)

diff --git a/esphome/components/waveshare_epaper/display.py b/esphome/components/waveshare_epaper/display.py
index 46da3f6fb4..747794b631 100644
--- a/esphome/components/waveshare_epaper/display.py
+++ b/esphome/components/waveshare_epaper/display.py
@@ -29,6 +29,7 @@ WaveshareEPaper2P7In = waveshare_epaper_ns.class_(
 WaveshareEPaper2P9InB = waveshare_epaper_ns.class_(
     "WaveshareEPaper2P9InB", WaveshareEPaper
 )
+GDEY029T94 = waveshare_epaper_ns.class_("GDEY029T94", WaveshareEPaper)
 WaveshareEPaper4P2In = waveshare_epaper_ns.class_(
     "WaveshareEPaper4P2In", WaveshareEPaper
 )
@@ -73,6 +74,7 @@ MODELS = {
     "2.13in-ttgo-b74": ("a", WaveshareEPaperTypeAModel.TTGO_EPAPER_2_13_IN_B74),
     "2.90in": ("a", WaveshareEPaperTypeAModel.WAVESHARE_EPAPER_2_9_IN),
     "2.90inv2": ("a", WaveshareEPaperTypeAModel.WAVESHARE_EPAPER_2_9_IN_V2),
+    "gdey029t94": ("c", GDEY029T94),
     "2.70in": ("b", WaveshareEPaper2P7In),
     "2.90in-b": ("b", WaveshareEPaper2P9InB),
     "4.20in": ("b", WaveshareEPaper4P2In),
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.cpp b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
index 5580674c34..8fd5c2e1f3 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.cpp
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
@@ -663,6 +663,90 @@ void WaveshareEPaper2P9InB::dump_config() {
   LOG_UPDATE_INTERVAL(this);
 }
 
+// ========================================================
+//     Good Display 2.9in black/white/grey
+// Datasheet:
+//  - https://v4.cecdn.yun300.cn/100001_1909185148/SSD1680.pdf
+//  - https://github.com/adafruit/Adafruit_EPD/blob/master/src/panels/ThinkInk_290_Grayscale4_T5.h
+// ========================================================
+
+void GDEY029T94::initialize() {
+  // from https://www.waveshare.com/w/upload/b/bb/2.9inch-e-paper-b-specification.pdf, page 37
+  // EPD hardware init start
+  this->reset_();
+
+  // COMMAND POWER SETTINGS
+  this->command(0x00);
+  this->data(0x03);
+  this->data(0x00);
+  this->data(0x2b);
+  this->data(0x2b);
+  this->data(0x03); /* for b/w */
+
+  // COMMAND BOOSTER SOFT START
+  this->command(0x06);
+  this->data(0x17);
+  this->data(0x17);
+  this->data(0x17);
+
+  // COMMAND POWER ON
+  this->command(0x04);
+  this->wait_until_idle_();
+
+  // Not sure what this does but it's in the Adafruit EPD library
+  this->command(0xFF);
+  this->wait_until_idle_();
+
+  // COMMAND PANEL SETTING
+  this->command(0x00);
+  // 128x296 resolution:        10
+  // LUT from OTP:              0
+  // B/W mode (doesn't work):   1
+  // scan-up:                   1
+  // shift-right:               1
+  // booster ON:                1
+  // no soft reset:             1
+  this->data(0b10011111);
+
+  // COMMAND RESOLUTION SETTING
+  // set to 128x296 by COMMAND PANEL SETTING
+
+  // COMMAND VCOM AND DATA INTERVAL SETTING
+  // use defaults for white border and ESPHome image polarity
+
+  // EPD hardware init end
+}
+void HOT GDEY029T94::display() {
+  // COMMAND DATA START TRANSMISSION 2 (B/W only)
+  this->command(0x13);
+  delay(2);
+  this->start_data_();
+  for (size_t i = 0; i < this->get_buffer_length_(); i++) {
+    this->write_byte(this->buffer_[i]);
+  }
+  this->end_data_();
+  delay(2);
+
+  // COMMAND DISPLAY REFRESH
+  this->command(0x12);
+  delay(2);
+  this->wait_until_idle_();
+
+  // COMMAND POWER OFF
+  // NOTE: power off < deep sleep
+  this->command(0x02);
+}
+int GDEY029T94::get_width_internal() { return 128; }
+int GDEY029T94::get_height_internal() { return 296; }
+void GDEY029T94::dump_config() {
+  LOG_DISPLAY("", "Waveshare E-Paper (Good Display)", this);
+  ESP_LOGCONFIG(TAG, "  Model: 2.9in Greyscale GDEY029T94");
+  LOG_PIN("  Reset Pin: ", this->reset_pin_);
+  LOG_PIN("  DC Pin: ", this->dc_pin_);
+  LOG_PIN("  Busy Pin: ", this->busy_pin_);
+  LOG_UPDATE_INTERVAL(this);
+}
+
 static const uint8_t LUT_VCOM_DC_4_2[] = {
     0x00, 0x17, 0x00, 0x00, 0x00, 0x02, 0x00, 0x17, 0x17, 0x00, 0x00, 0x02, 0x00, 0x0A, 0x01,
     0x00, 0x00, 0x01, 0x00, 0x0E, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.h b/esphome/components/waveshare_epaper/waveshare_epaper.h
index e613899149..848b293c45 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.h
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.h
@@ -146,6 +146,26 @@ class WaveshareEPaper2P7In : public WaveshareEPaper {
   int get_height_internal() override;
 };
 
+class GDEY029T94 : public WaveshareEPaper {
+ public:
+  void initialize() override;
+
+  void display() override;
+
+  void dump_config() override;
+
+  void deep_sleep() override {
+    // COMMAND DEEP SLEEP
+    this->command(0x07);
+    this->data(0xA5);  // check byte
+  }
+
+ protected:
+  int get_width_internal() override;
+
+  int get_height_internal() override;
+};
+
 class WaveshareEPaper2P9InB : public WaveshareEPaper {
  public:
   void initialize() override;

From cd57469e06aaf223c518c72b17c07e80722982fc Mon Sep 17 00:00:00 2001
From: jerome992 <35580081+jerome992@users.noreply.github.com>
Date: Mon, 20 Mar 2023 05:22:22 +0100
Subject: [PATCH 718/838] Fix negative sqrt root in ct_clamp_sensor.cpp (#2701)
 (#4236)

Co-authored-by: Jerome <jerome992@internet.lu>
---
 esphome/components/ct_clamp/ct_clamp_sensor.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/esphome/components/ct_clamp/ct_clamp_sensor.cpp b/esphome/components/ct_clamp/ct_clamp_sensor.cpp
index 51b0f1318c..d555befcde 100644
--- a/esphome/components/ct_clamp/ct_clamp_sensor.cpp
+++ b/esphome/components/ct_clamp/ct_clamp_sensor.cpp
@@ -33,7 +33,10 @@ void CTClampSensor::update() {
 
     const float rms_ac_dc_squared = this->sample_squared_sum_ / this->num_samples_;
     const float rms_dc = this->sample_sum_ / this->num_samples_;
-    const float rms_ac = std::sqrt(rms_ac_dc_squared - rms_dc * rms_dc);
+    const float rms_ac_squared = rms_ac_dc_squared - rms_dc * rms_dc;
+    float rms_ac = 0;
+    if (rms_ac_squared > 0)
+      rms_ac = std::sqrt(rms_ac_squared);
     ESP_LOGD(TAG, "'%s' - Raw AC Value: %.3fA after %d different samples (%d SPS)", this->name_.c_str(), rms_ac,
              this->num_samples_, 1000 * this->num_samples_ / this->sample_duration_);
     this->publish_state(rms_ac);

From d42f35de5d5416825a02fd4457e32ac781e6cd9d Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 22 Mar 2023 09:24:14 +1300
Subject: [PATCH 719/838] Wrap ipv6 code a bit more (#4574)

* Wrap ipv6 code a bit more for when ipv6 support should not be compiled in

* More checks

* More uses

* Fix
---
 esphome/components/api/api_server.cpp         |  2 +-
 .../ethernet/ethernet_component.cpp           | 13 ++++++++
 esphome/components/mqtt/mqtt_client.cpp       | 14 ++++++--
 esphome/components/network/__init__.py        |  8 +++--
 esphome/components/ota/ota_component.cpp      |  2 +-
 .../components/socket/bsd_sockets_impl.cpp    |  5 ++-
 esphome/components/socket/headers.h           | 15 +++++++--
 esphome/components/socket/socket.cpp          | 32 +++++++++++++++++--
 esphome/components/socket/socket.h            |  5 ++-
 .../wifi/wifi_component_esp32_arduino.cpp     | 20 +++++++++---
 .../wifi/wifi_component_esp_idf.cpp           | 16 +++++++++-
 11 files changed, 112 insertions(+), 20 deletions(-)

diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index 6e28637241..acde0966ba 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -45,7 +45,7 @@ void APIServer::setup() {
 
   struct sockaddr_storage server;
 
-  socklen_t sl = socket::set_sockaddr_any((struct sockaddr *) &server, sizeof(server), htons(this->port_));
+  socklen_t sl = socket::set_sockaddr_any((struct sockaddr *) &server, sizeof(server), this->port_);
   if (sl == 0) {
     ESP_LOGW(TAG, "Socket unable to set sockaddr: errno %d", errno);
     this->mark_failed();
diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index 7120223cc9..4792728a71 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -255,14 +255,22 @@ void EthernetComponent::start_connect_() {
   if (this->manual_ip_.has_value()) {
     if (uint32_t(this->manual_ip_->dns1) != 0) {
       ip_addr_t d;
+#if LWIP_IPV6
       d.type = IPADDR_TYPE_V4;
       d.u_addr.ip4.addr = static_cast<uint32_t>(this->manual_ip_->dns1);
+#else
+      d.addr = static_cast<uint32_t>(this->manual_ip_->dns1);
+#endif
       dns_setserver(0, &d);
     }
     if (uint32_t(this->manual_ip_->dns1) != 0) {
       ip_addr_t d;
+#if LWIP_IPV6
       d.type = IPADDR_TYPE_V4;
       d.u_addr.ip4.addr = static_cast<uint32_t>(this->manual_ip_->dns2);
+#else
+      d.addr = static_cast<uint32_t>(this->manual_ip_->dns2);
+#endif
       dns_setserver(1, &d);
     }
   } else {
@@ -289,8 +297,13 @@ void EthernetComponent::dump_connect_params_() {
   const ip_addr_t *dns_ip1 = dns_getserver(0);
   const ip_addr_t *dns_ip2 = dns_getserver(1);
 
+#if LWIP_IPV6
   ESP_LOGCONFIG(TAG, "  DNS1: %s", network::IPAddress(dns_ip1->u_addr.ip4.addr).str().c_str());
   ESP_LOGCONFIG(TAG, "  DNS2: %s", network::IPAddress(dns_ip2->u_addr.ip4.addr).str().c_str());
+#else
+  ESP_LOGCONFIG(TAG, "  DNS1: %s", network::IPAddress(dns_ip1->addr).str().c_str());
+  ESP_LOGCONFIG(TAG, "  DNS2: %s", network::IPAddress(dns_ip2->addr).str().c_str());
+#endif
 
   esp_err_t err;
 
diff --git a/esphome/components/mqtt/mqtt_client.cpp b/esphome/components/mqtt/mqtt_client.cpp
index acb863244e..af2828ff15 100644
--- a/esphome/components/mqtt/mqtt_client.cpp
+++ b/esphome/components/mqtt/mqtt_client.cpp
@@ -2,16 +2,16 @@
 
 #ifdef USE_MQTT
 
+#include <utility>
+#include "esphome/components/network/util.h"
 #include "esphome/core/application.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
-#include "esphome/components/network/util.h"
-#include <utility>
 #ifdef USE_LOGGER
 #include "esphome/components/logger/logger.h"
 #endif
-#include "lwip/err.h"
 #include "lwip/dns.h"
+#include "lwip/err.h"
 #include "mqtt_component.h"
 
 namespace esphome {
@@ -104,7 +104,11 @@ void MQTTClientComponent::start_dnslookup_() {
       // Got IP immediately
       this->dns_resolved_ = true;
 #ifdef USE_ESP32
+#if LWIP_IPV6
       this->ip_ = addr.u_addr.ip4.addr;
+#else
+      this->ip_ = addr.addr;
+#endif
 #endif
 #ifdef USE_ESP8266
       this->ip_ = addr.addr;
@@ -160,8 +164,12 @@ void MQTTClientComponent::dns_found_callback(const char *name, const ip_addr_t *
     a_this->dns_resolve_error_ = true;
   } else {
 #ifdef USE_ESP32
+#if LWIP_IPV6
     a_this->ip_ = ipaddr->u_addr.ip4.addr;
+#else
+    a_this->ip_ = ipaddr->addr;
 #endif
+#endif  // USE_ESP32
 #ifdef USE_ESP8266
     a_this->ip_ = ipaddr->addr;
 #endif
diff --git a/esphome/components/network/__init__.py b/esphome/components/network/__init__.py
index 40d420c48c..96cfc51ff5 100644
--- a/esphome/components/network/__init__.py
+++ b/esphome/components/network/__init__.py
@@ -22,6 +22,8 @@ CONFIG_SCHEMA = cv.Schema(
 
 
 async def to_code(config):
-    if CONF_ENABLE_IPV6 in config and config[CONF_ENABLE_IPV6]:
-        add_idf_sdkconfig_option("CONFIG_LWIP_IPV6", True)
-        add_idf_sdkconfig_option("CONFIG_LWIP_IPV6_AUTOCONFIG", True)
+    if CONF_ENABLE_IPV6 in config:
+        add_idf_sdkconfig_option("CONFIG_LWIP_IPV6", config[CONF_ENABLE_IPV6])
+        add_idf_sdkconfig_option(
+            "CONFIG_LWIP_IPV6_AUTOCONFIG", config[CONF_ENABLE_IPV6]
+        )
diff --git a/esphome/components/ota/ota_component.cpp b/esphome/components/ota/ota_component.cpp
index 0195cb4616..39ba3dbed4 100644
--- a/esphome/components/ota/ota_component.cpp
+++ b/esphome/components/ota/ota_component.cpp
@@ -65,7 +65,7 @@ void OTAComponent::setup() {
 
   struct sockaddr_storage server;
 
-  socklen_t sl = socket::set_sockaddr_any((struct sockaddr *) &server, sizeof(server), htons(this->port_));
+  socklen_t sl = socket::set_sockaddr_any((struct sockaddr *) &server, sizeof(server), this->port_);
   if (sl == 0) {
     ESP_LOGW(TAG, "Socket unable to set sockaddr: errno %d", errno);
     this->mark_failed();
diff --git a/esphome/components/socket/bsd_sockets_impl.cpp b/esphome/components/socket/bsd_sockets_impl.cpp
index b21341e4d6..3a08e3ea52 100644
--- a/esphome/components/socket/bsd_sockets_impl.cpp
+++ b/esphome/components/socket/bsd_sockets_impl.cpp
@@ -20,7 +20,9 @@ std::string format_sockaddr(const struct sockaddr_storage &storage) {
     char buf[INET_ADDRSTRLEN];
     if (inet_ntop(AF_INET, &addr->sin_addr, buf, sizeof(buf)) != nullptr)
       return std::string{buf};
-  } else if (storage.ss_family == AF_INET6) {
+  }
+#if LWIP_IPV6
+  else if (storage.ss_family == AF_INET6) {
     const struct sockaddr_in6 *addr = reinterpret_cast<const struct sockaddr_in6 *>(&storage);
     char buf[INET6_ADDRSTRLEN];
     // Format IPv4-mapped IPv6 addresses as regular IPv4 addresses
@@ -32,6 +34,7 @@ std::string format_sockaddr(const struct sockaddr_storage &storage) {
     if (inet_ntop(AF_INET6, &addr->sin6_addr, buf, sizeof(buf)) != nullptr)
       return std::string{buf};
   }
+#endif
   return {};
 }
 
diff --git a/esphome/components/socket/headers.h b/esphome/components/socket/headers.h
index 1e79c8a1ab..20d8fdb8c9 100644
--- a/esphome/components/socket/headers.h
+++ b/esphome/components/socket/headers.h
@@ -15,19 +15,28 @@
 /* Address families.  */
 #define AF_UNSPEC 0
 #define AF_INET 2
-#define AF_INET6 10
 #define PF_INET AF_INET
-#define PF_INET6 AF_INET6
 #define PF_UNSPEC AF_UNSPEC
+
 #define IPPROTO_IP 0
 #define IPPROTO_TCP 6
+
+#if LWIP_IPV6
+#define AF_INET6 10
+#define PF_INET6 AF_INET6
+
 #define IPPROTO_IPV6 41
 #define IPPROTO_ICMPV6 58
+#endif
 
 #define TCP_NODELAY 0x01
 
 #define F_GETFL 3
 #define F_SETFL 4
+
+#ifdef O_NONBLOCK
+#undef O_NONBLOCK
+#endif
 #define O_NONBLOCK 1
 
 #define SHUT_RD 0
@@ -58,6 +67,7 @@ struct sockaddr_in {
   char sin_zero[SIN_ZERO_LEN];
 };
 
+#if LWIP_IPV6
 // NOLINTNEXTLINE(readability-identifier-naming)
 struct sockaddr_in6 {
   uint8_t sin6_len;          /* length of this structure    */
@@ -67,6 +77,7 @@ struct sockaddr_in6 {
   struct in6_addr sin6_addr; /* IPv6 address                */
   uint32_t sin6_scope_id;    /* Set of interfaces for scope */
 };
+#endif
 
 // NOLINTNEXTLINE(readability-identifier-naming)
 struct sockaddr {
diff --git a/esphome/components/socket/socket.cpp b/esphome/components/socket/socket.cpp
index 22a4c11df8..3fe7491d57 100644
--- a/esphome/components/socket/socket.cpp
+++ b/esphome/components/socket/socket.cpp
@@ -14,6 +14,34 @@ std::unique_ptr<Socket> socket_ip(int type, int protocol) {
 #endif
 }
 
+socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const char *ip_address, uint16_t port) {
+#if LWIP_IPV6
+  if (addrlen < sizeof(sockaddr_in6)) {
+    errno = EINVAL;
+    return 0;
+  }
+  auto *server = reinterpret_cast<sockaddr_in6 *>(addr);
+  memset(server, 0, sizeof(sockaddr_in6));
+  server->sin6_family = AF_INET6;
+  server->sin6_port = htons(port);
+  ip6_addr_t ip6;
+  inet6_aton(ip_address, &ip6);
+  memcpy(server->sin6_addr.un.u32_addr, ip6.addr, sizeof(ip6.addr));
+  return sizeof(sockaddr_in6);
+#else
+  if (addrlen < sizeof(sockaddr_in)) {
+    errno = EINVAL;
+    return 0;
+  }
+  auto *server = reinterpret_cast<sockaddr_in *>(addr);
+  memset(server, 0, sizeof(sockaddr_in));
+  server->sin_family = AF_INET;
+  server->sin_addr.s_addr = inet_addr(ip_address);
+  server->sin_port = htons(port);
+  return sizeof(sockaddr_in);
+#endif
+}
+
 socklen_t set_sockaddr_any(struct sockaddr *addr, socklen_t addrlen, uint16_t port) {
 #if LWIP_IPV6
   if (addrlen < sizeof(sockaddr_in6)) {
@@ -23,7 +51,7 @@ socklen_t set_sockaddr_any(struct sockaddr *addr, socklen_t addrlen, uint16_t po
   auto *server = reinterpret_cast<sockaddr_in6 *>(addr);
   memset(server, 0, sizeof(sockaddr_in6));
   server->sin6_family = AF_INET6;
-  server->sin6_port = port;
+  server->sin6_port = htons(port);
   server->sin6_addr = in6addr_any;
   return sizeof(sockaddr_in6);
 #else
@@ -35,7 +63,7 @@ socklen_t set_sockaddr_any(struct sockaddr *addr, socklen_t addrlen, uint16_t po
   memset(server, 0, sizeof(sockaddr_in));
   server->sin_family = AF_INET;
   server->sin_addr.s_addr = ESPHOME_INADDR_ANY;
-  server->sin_port = port;
+  server->sin_port = htons(port);
   return sizeof(sockaddr_in);
 #endif
 }
diff --git a/esphome/components/socket/socket.h b/esphome/components/socket/socket.h
index ecf117deeb..175cb21a4a 100644
--- a/esphome/components/socket/socket.h
+++ b/esphome/components/socket/socket.h
@@ -44,7 +44,10 @@ std::unique_ptr<Socket> socket(int domain, int type, int protocol);
 /// Create a socket in the newest available IP domain (IPv6 or IPv4) of the given type and protocol.
 std::unique_ptr<Socket> socket_ip(int type, int protocol);
 
-/// Set a sockaddr to the any address for the IP version used by socket_ip().
+/// Set a sockaddr to the specified address and port for the IP version used by socket_ip().
+socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const char *ip_address, uint16_t port);
+
+/// Set a sockaddr to the any address and specified port for the IP version used by socket_ip().
 socklen_t set_sockaddr_any(struct sockaddr *addr, socklen_t addrlen, uint16_t port);
 
 }  // namespace socket
diff --git a/esphome/components/wifi/wifi_component_esp32_arduino.cpp b/esphome/components/wifi/wifi_component_esp32_arduino.cpp
index 54ed7638d2..ab04224161 100644
--- a/esphome/components/wifi/wifi_component_esp32_arduino.cpp
+++ b/esphome/components/wifi/wifi_component_esp32_arduino.cpp
@@ -4,19 +4,19 @@
 
 #include <esp_wifi.h>
 
-#include <utility>
 #include <algorithm>
+#include <utility>
 #ifdef USE_WIFI_WPA2_EAP
 #include <esp_wpa2.h>
 #endif
-#include "lwip/err.h"
-#include "lwip/dns.h"
 #include "lwip/apps/sntp.h"
+#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/application.h"
 #include "esphome/core/util.h"
 
 namespace esphome {
@@ -128,13 +128,23 @@ bool WiFiComponent::wifi_sta_ip_config_(optional<ManualIP> manual_ip) {
   }
 
   ip_addr_t dns;
+#if LWIP_IPV6
   dns.type = IPADDR_TYPE_V4;
+#endif
   if (uint32_t(manual_ip->dns1) != 0) {
+#if LWIP_IPV6
     dns.u_addr.ip4.addr = static_cast<uint32_t>(manual_ip->dns1);
+#else
+    dns.addr = static_cast<uint32_t>(manual_ip->dns1);
+#endif
     dns_setserver(0, &dns);
   }
   if (uint32_t(manual_ip->dns2) != 0) {
+#if LWIP_IPV6
     dns.u_addr.ip4.addr = static_cast<uint32_t>(manual_ip->dns2);
+#else
+    dns.addr = static_cast<uint32_t>(manual_ip->dns2);
+#endif
     dns_setserver(1, &dns);
   }
 
diff --git a/esphome/components/wifi/wifi_component_esp_idf.cpp b/esphome/components/wifi/wifi_component_esp_idf.cpp
index 2883164495..0f3c3a0ca8 100644
--- a/esphome/components/wifi/wifi_component_esp_idf.cpp
+++ b/esphome/components/wifi/wifi_component_esp_idf.cpp
@@ -451,13 +451,23 @@ bool WiFiComponent::wifi_sta_ip_config_(optional<ManualIP> manual_ip) {
   }
 
   ip_addr_t dns;
+#if LWIP_IPV6
   dns.type = IPADDR_TYPE_V4;
+#endif
   if (uint32_t(manual_ip->dns1) != 0) {
+#if LWIP_IPV6
     dns.u_addr.ip4.addr = static_cast<uint32_t>(manual_ip->dns1);
+#else
+    dns.addr = static_cast<uint32_t>(manual_ip->dns1);
+#endif
     dns_setserver(0, &dns);
   }
   if (uint32_t(manual_ip->dns2) != 0) {
+#if LWIP_IPV6
     dns.u_addr.ip4.addr = static_cast<uint32_t>(manual_ip->dns2);
+#else
+    dns.addr = static_cast<uint32_t>(manual_ip->dns2);
+#endif
     dns_setserver(1, &dns);
   }
 
@@ -639,7 +649,7 @@ void WiFiComponent::wifi_process_event_(IDFWiFiEvent *data) {
 
   } else if (data->event_base == IP_EVENT && data->event_id == IP_EVENT_STA_GOT_IP) {
     const auto &it = data->data.ip_got_ip;
-#ifdef LWIP_IPV6_AUTOCONFIG
+#if LWIP_IPV6_AUTOCONFIG
     tcpip_adapter_create_ip6_linklocal(TCPIP_ADAPTER_IF_STA);
 #endif
     ESP_LOGV(TAG, "Event: Got IP static_ip=%s gateway=%s", format_ip4_addr(it.ip_info.ip).c_str(),
@@ -912,7 +922,11 @@ network::IPAddress WiFiComponent::wifi_gateway_ip_() {
 }
 network::IPAddress WiFiComponent::wifi_dns_ip_(int num) {
   const ip_addr_t *dns_ip = dns_getserver(num);
+#if LWIP_IPV6
   return {dns_ip->u_addr.ip4.addr};
+#else
+  return {dns_ip->addr};
+#endif
 }
 
 }  // namespace wifi

From d70e7da0ef231124504d1902d453eb5b3d0e2943 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 22 Mar 2023 09:25:19 +1300
Subject: [PATCH 720/838] rp2040: Use fake Mutex lock (#4602)

---
 esphome/core/helpers.cpp | 4 ++--
 esphome/core/helpers.h   | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index 4ac9303b20..7f5c3ad333 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -393,13 +393,13 @@ void hsv_to_rgb(int hue, float saturation, float value, float &red, float &green
 }
 
 // System APIs
-#if defined(USE_ESP8266)
+#if defined(USE_ESP8266) || defined(USE_RP2040)
 // ESP8266 doesn't have mutexes, but that shouldn't be an issue as it's single-core and non-preemptive OS.
 Mutex::Mutex() {}
 void Mutex::lock() {}
 bool Mutex::try_lock() { return true; }
 void Mutex::unlock() {}
-#elif defined(USE_ESP32) || defined(USE_RP2040)
+#elif defined(USE_ESP32)
 Mutex::Mutex() { handle_ = xSemaphoreCreateMutex(); }
 void Mutex::lock() { xSemaphoreTake(this->handle_, portMAX_DELAY); }
 bool Mutex::try_lock() { return xSemaphoreTake(this->handle_, 0) == pdTRUE; }
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index 0d2a7e298a..a107b1b849 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -17,9 +17,6 @@
 #if defined(USE_ESP32)
 #include <freertos/FreeRTOS.h>
 #include <freertos/semphr.h>
-#elif defined(USE_RP2040)
-#include <FreeRTOS.h>
-#include <semphr.h>
 #endif
 
 #define HOT __attribute__((hot))
@@ -539,7 +536,7 @@ class Mutex {
   Mutex &operator=(const Mutex &) = delete;
 
  private:
-#if defined(USE_ESP32) || defined(USE_RP2040)
+#if defined(USE_ESP32)
   SemaphoreHandle_t handle_;
 #endif
 };

From a3875af4b4786777afa6f0fb86bd88cd9ed185b5 Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Sun, 19 Mar 2023 18:54:00 +0000
Subject: [PATCH 721/838] climate: brown paper bag fix for on_configure (#4573)

I forgot this hunk in https://github.com/esphome/esphome/pull/4511 .
I'm sorry for the noise.
---
 esphome/components/climate/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/esphome/components/climate/__init__.py b/esphome/components/climate/__init__.py
index 4a16c3fb7d..6734917bf3 100644
--- a/esphome/components/climate/__init__.py
+++ b/esphome/components/climate/__init__.py
@@ -324,6 +324,10 @@ async def setup_climate_core_(var, config):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         await automation.build_automation(trigger, [], conf)
 
+    for conf in config.get(CONF_ON_CONTROL, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+
 
 async def register_climate(var, config):
     if not CORE.has_id(config[CONF_ID]):

From db5988bbe1b1984f05bc8e63391d1230231cdb13 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 22 Mar 2023 09:25:19 +1300
Subject: [PATCH 722/838] rp2040: Use fake Mutex lock (#4602)

---
 esphome/core/helpers.cpp | 4 ++--
 esphome/core/helpers.h   | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index 4ac9303b20..7f5c3ad333 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -393,13 +393,13 @@ void hsv_to_rgb(int hue, float saturation, float value, float &red, float &green
 }
 
 // System APIs
-#if defined(USE_ESP8266)
+#if defined(USE_ESP8266) || defined(USE_RP2040)
 // ESP8266 doesn't have mutexes, but that shouldn't be an issue as it's single-core and non-preemptive OS.
 Mutex::Mutex() {}
 void Mutex::lock() {}
 bool Mutex::try_lock() { return true; }
 void Mutex::unlock() {}
-#elif defined(USE_ESP32) || defined(USE_RP2040)
+#elif defined(USE_ESP32)
 Mutex::Mutex() { handle_ = xSemaphoreCreateMutex(); }
 void Mutex::lock() { xSemaphoreTake(this->handle_, portMAX_DELAY); }
 bool Mutex::try_lock() { return xSemaphoreTake(this->handle_, 0) == pdTRUE; }
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index 0d2a7e298a..a107b1b849 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -17,9 +17,6 @@
 #if defined(USE_ESP32)
 #include <freertos/FreeRTOS.h>
 #include <freertos/semphr.h>
-#elif defined(USE_RP2040)
-#include <FreeRTOS.h>
-#include <semphr.h>
 #endif
 
 #define HOT __attribute__((hot))
@@ -539,7 +536,7 @@ class Mutex {
   Mutex &operator=(const Mutex &) = delete;
 
  private:
-#if defined(USE_ESP32) || defined(USE_RP2040)
+#if defined(USE_ESP32)
   SemaphoreHandle_t handle_;
 #endif
 };

From bc427de16a2d86a9bd8069d6e7932c8f06016fdc Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 22 Mar 2023 12:03:34 +1300
Subject: [PATCH 723/838] Bump version to 2023.3.1

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

diff --git a/esphome/const.py b/esphome/const.py
index f175524796..35d1d3fa03 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.3.0"
+__version__ = "2023.3.1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From d52e425ba28d4875bd3ffe7303cd16245e6690c5 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 22 Mar 2023 20:35:16 +1300
Subject: [PATCH 724/838] Remove EntityBase from sprinkler (#4606)

* Remove EntityBase form sprinkler

* remove unneeded method

* Set name correctly
Move some timers to `setup` that rely on this->name_

* Fix SprinklerControllerSwitch setup

* Update esphome/components/sprinkler/__init__.py

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

---------

Co-authored-by: Samuel Sieb <samuel-github@sieb.net>
Co-authored-by: Keith Burzinski <kbx81x@gmail.com>
---
 esphome/components/sprinkler/__init__.py   | 25 +++++++++++++---------
 esphome/components/sprinkler/sprinkler.cpp | 21 ++++++------------
 esphome/components/sprinkler/sprinkler.h   | 15 ++++++-------
 3 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/esphome/components/sprinkler/__init__.py b/esphome/components/sprinkler/__init__.py
index cf3f471234..d49b1ba381 100644
--- a/esphome/components/sprinkler/__init__.py
+++ b/esphome/components/sprinkler/__init__.py
@@ -330,6 +330,7 @@ SPRINKLER_VALVE_SCHEMA = cv.Schema(
 SPRINKLER_CONTROLLER_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(Sprinkler),
+        cv.Optional(CONF_NAME): cv.string,
         cv.Optional(CONF_AUTO_ADVANCE_SWITCH): cv.maybe_simple_value(
             switch.switch_schema(
                 SprinklerControllerSwitch, entity_category=ENTITY_CATEGORY_CONFIG
@@ -424,7 +425,8 @@ SPRINKLER_CONTROLLER_SCHEMA = cv.Schema(
         ): cv.positive_time_period_seconds,
         cv.Required(CONF_VALVES): cv.ensure_list(SPRINKLER_VALVE_SCHEMA),
     }
-).extend(cv.ENTITY_BASE_SCHEMA)
+).extend(cv.COMPONENT_SCHEMA)
+
 
 CONFIG_SCHEMA = cv.All(
     cv.ensure_list(SPRINKLER_CONTROLLER_SCHEMA),
@@ -559,16 +561,19 @@ async def sprinkler_simple_action_to_code(config, action_id, template_arg, args)
 
 async def to_code(config):
     for sprinkler_controller in config:
-        if len(sprinkler_controller[CONF_VALVES]) > 1:
-            var = cg.new_Pvariable(
-                sprinkler_controller[CONF_ID],
-                sprinkler_controller[CONF_MAIN_SWITCH][CONF_NAME],
-            )
+        var = cg.new_Pvariable(sprinkler_controller[CONF_ID])
+
+        if CONF_NAME in sprinkler_controller:
+            cg.add(var.set_name(sprinkler_controller[CONF_NAME]))
         else:
-            var = cg.new_Pvariable(
-                sprinkler_controller[CONF_ID],
-                sprinkler_controller[CONF_VALVES][0][CONF_VALVE_SWITCH][CONF_NAME],
-            )
+            if len(sprinkler_controller[CONF_VALVES]) > 1:
+                name = sprinkler_controller[CONF_MAIN_SWITCH][CONF_NAME]
+            else:
+                name = sprinkler_controller[CONF_VALVES][0][CONF_VALVE_SWITCH][
+                    CONF_NAME
+                ]
+            cg.add(var.set_name(name))
+
         await cg.register_component(var, sprinkler_controller)
 
         if len(sprinkler_controller[CONF_VALVES]) > 1:
diff --git a/esphome/components/sprinkler/sprinkler.cpp b/esphome/components/sprinkler/sprinkler.cpp
index d73d8d8fbf..6169185d60 100644
--- a/esphome/components/sprinkler/sprinkler.cpp
+++ b/esphome/components/sprinkler/sprinkler.cpp
@@ -138,15 +138,7 @@ float SprinklerControllerSwitch::get_setup_priority() const { return setup_prior
 Trigger<> *SprinklerControllerSwitch::get_turn_on_trigger() const { return this->turn_on_trigger_; }
 Trigger<> *SprinklerControllerSwitch::get_turn_off_trigger() const { return this->turn_off_trigger_; }
 
-void SprinklerControllerSwitch::setup() {
-  this->state = this->get_initial_state_with_restore_mode().value_or(false);
-
-  if (this->state) {
-    this->turn_on();
-  } else {
-    this->turn_off();
-  }
-}
+void SprinklerControllerSwitch::setup() { this->state = this->get_initial_state_with_restore_mode().value_or(false); }
 
 void SprinklerControllerSwitch::dump_config() { LOG_SWITCH("", "Sprinkler Switch", this); }
 
@@ -378,10 +370,11 @@ SprinklerValveOperator *SprinklerValveRunRequest::valve_operator() { return this
 
 SprinklerValveRunRequestOrigin SprinklerValveRunRequest::request_is_from() { return this->origin_; }
 
-Sprinkler::Sprinkler() {}
-Sprinkler::Sprinkler(const std::string &name) : EntityBase(name) {}
-
-void Sprinkler::setup() { this->all_valves_off_(true); }
+void Sprinkler::setup() {
+  this->timer_.push_back({this->name_ + "sm", false, 0, 0, std::bind(&Sprinkler::sm_timer_callback_, this)});
+  this->timer_.push_back({this->name_ + "vs", false, 0, 0, std::bind(&Sprinkler::valve_selection_callback_, this)});
+  this->all_valves_off_(true);
+}
 
 void Sprinkler::loop() {
   for (auto &p : this->pump_) {
@@ -1218,8 +1211,6 @@ SprinklerSwitch *Sprinkler::valve_pump_switch_by_pump_index(size_t pump_index) {
   return nullptr;
 }
 
-uint32_t Sprinkler::hash_base() { return 3129891955UL; }
-
 bool Sprinkler::valve_is_enabled_(const size_t valve_number) {
   if (this->is_a_valid_valve(valve_number)) {
     if (this->valve_[valve_number].enable_switch != nullptr) {
diff --git a/esphome/components/sprinkler/sprinkler.h b/esphome/components/sprinkler/sprinkler.h
index 1cde60321d..7952c4533f 100644
--- a/esphome/components/sprinkler/sprinkler.h
+++ b/esphome/components/sprinkler/sprinkler.h
@@ -201,15 +201,14 @@ class SprinklerValveRunRequest {
   SprinklerValveRunRequestOrigin origin_{USER};
 };
 
-class Sprinkler : public Component, public EntityBase {
+class Sprinkler : public Component {
  public:
-  Sprinkler();
-  Sprinkler(const std::string &name);
-
   void setup() override;
   void loop() override;
   void dump_config() override;
 
+  void set_name(const std::string &name) { this->name_ = name; }
+
   /// add a valve to the controller
   void add_valve(SprinklerControllerSwitch *valve_sw, SprinklerControllerSwitch *enable_sw = nullptr);
 
@@ -423,8 +422,6 @@ class Sprinkler : public Component, public EntityBase {
   SprinklerSwitch *valve_pump_switch_by_pump_index(size_t pump_index);
 
  protected:
-  uint32_t hash_base() override;
-
   /// returns true if valve number is enabled
   bool valve_is_enabled_(size_t valve_number);
 
@@ -528,6 +525,8 @@ class Sprinkler : public Component, public EntityBase {
   uint32_t start_delay_{0};
   uint32_t stop_delay_{0};
 
+  std::string name_;
+
   /// Sprinkler controller state
   SprinklerState state_{IDLE};
 
@@ -574,9 +573,7 @@ class Sprinkler : public Component, public EntityBase {
   std::vector<SprinklerValveOperator> valve_op_{2};
 
   /// Valve control timers
-  std::vector<SprinklerTimer> timer_{
-      {this->name_ + "sm", false, 0, 0, std::bind(&Sprinkler::sm_timer_callback_, this)},
-      {this->name_ + "vs", false, 0, 0, std::bind(&Sprinkler::valve_selection_callback_, this)}};
+  std::vector<SprinklerTimer> timer_{};
 
   /// Other Sprinkler instances we should be aware of (used to check if pumps are in use)
   std::vector<Sprinkler *> other_controllers_;

From a1eb3b8475c92f4477d64fc3cce5e4e3275d33c4 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 22 Mar 2023 20:56:02 +1300
Subject: [PATCH 725/838] Swap curly brackets for round on LockGuard (#4610)

---
 esphome/core/helpers.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index a107b1b849..8950cc3b8a 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -547,7 +547,7 @@ class Mutex {
  */
 class LockGuard {
  public:
-  LockGuard(Mutex &mutex) : mutex_{mutex} { mutex_.lock(); }
+  LockGuard(Mutex &mutex) : mutex_(mutex) { mutex_.lock(); }
   ~LockGuard() { mutex_.unlock(); }
 
  private:

From e13eaf6706b094c35b00ede1d86ab2d716456c1f Mon Sep 17 00:00:00 2001
From: guillempages <guillempages@users.noreply.github.com>
Date: Wed, 22 Mar 2023 09:05:09 +0100
Subject: [PATCH 726/838] Fix animation resizing (#4608)

Animation resizing in RGB24 format is causing an error "Image cannot be resized to a bigger size". Other image types do not show the issue, and the only difference is the "image.thumbnail" call.

Removed the call and tested; the animation is shown with the desired size.
---
 esphome/components/animation/__init__.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/esphome/components/animation/__init__.py b/esphome/components/animation/__init__.py
index ce9f057496..68c3eee132 100644
--- a/esphome/components/animation/__init__.py
+++ b/esphome/components/animation/__init__.py
@@ -76,8 +76,6 @@ async def to_code(config):
         pos = 0
         for frameIndex in range(frames):
             image.seek(frameIndex)
-            if CONF_RESIZE in config:
-                image.thumbnail(config[CONF_RESIZE])
             frame = image.convert("RGB")
             if CONF_RESIZE in config:
                 frame = frame.resize([width, height])

From c16709ed952b166f4e4c079d6bb227dc3847b3ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Skaln=C3=ADk?= <skaldo91@gmail.com>
Date: Thu, 23 Mar 2023 19:37:40 +0100
Subject: [PATCH 727/838] fix wrong port multiplexer name in dump GPIO function
 (#4592)

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

diff --git a/esphome/components/sx1509/sx1509_gpio_pin.cpp b/esphome/components/sx1509/sx1509_gpio_pin.cpp
index 2c6e0b0c32..56b51ae311 100644
--- a/esphome/components/sx1509/sx1509_gpio_pin.cpp
+++ b/esphome/components/sx1509/sx1509_gpio_pin.cpp
@@ -13,7 +13,7 @@ bool SX1509GPIOPin::digital_read() { return this->parent_->digital_read(this->pi
 void SX1509GPIOPin::digital_write(bool value) { this->parent_->digital_write(this->pin_, value != this->inverted_); }
 std::string SX1509GPIOPin::dump_summary() const {
   char buffer[32];
-  snprintf(buffer, sizeof(buffer), "%u via MCP23016", pin_);
+  snprintf(buffer, sizeof(buffer), "%u via sx1509", pin_);
   return buffer;
 }
 

From cc317d27f569aacb3553d65db63a3bd02f53f197 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Mar 2023 18:38:20 +0000
Subject: [PATCH 728/838] Bump zeroconf from 0.47.3 to 0.47.4 (#4597)

Bumps [zeroconf](https://github.com/python-zeroconf/python-zeroconf) from 0.47.3 to 0.47.4.
- [Release notes](https://github.com/python-zeroconf/python-zeroconf/releases)
- [Changelog](https://github.com/python-zeroconf/python-zeroconf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/python-zeroconf/python-zeroconf/compare/0.47.3...0.47.4)

---
updated-dependencies:
- dependency-name: zeroconf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
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 93a3592aed..5b37be15ae 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ esptool==4.5.1
 click==8.1.3
 esphome-dashboard==20230214.0
 aioesphomeapi==13.5.1
-zeroconf==0.47.3
+zeroconf==0.47.4
 
 # esp-idf requires this, but doesn't bundle it by default
 # https://github.com/espressif/esp-idf/blob/220590d599e134d7a5e7f1e683cc4550349ffbf8/requirements.txt#L24

From be69b498804bdf8071832991bfc1ed484eae1c82 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Mar 2023 18:38:47 +0000
Subject: [PATCH 729/838] Bump pytest-asyncio from 0.20.3 to 0.21.0 (#4599)

Bumps [pytest-asyncio](https://github.com/pytest-dev/pytest-asyncio) from 0.20.3 to 0.21.0.
- [Release notes](https://github.com/pytest-dev/pytest-asyncio/releases)
- [Commits](https://github.com/pytest-dev/pytest-asyncio/compare/v0.20.3...v0.21.0)

---
updated-dependencies:
- dependency-name: pytest-asyncio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
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 771086421e..3e59023d20 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -8,6 +8,6 @@ pre-commit
 pytest==7.2.2
 pytest-cov==4.0.0
 pytest-mock==3.10.0
-pytest-asyncio==0.20.3
+pytest-asyncio==0.21.0
 asyncmock==0.4.2
 hypothesis==5.49.0

From e4ba3ff1db9a7689ad0967da3ddc9fa640f3563b Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Thu, 23 Mar 2023 19:41:14 +0100
Subject: [PATCH 730/838] Limit range on filter time period for remote_receiver
 (#4604)

* Limit range on filter time period for remote_receiver

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

diff --git a/esphome/components/remote_receiver/__init__.py b/esphome/components/remote_receiver/__init__.py
index 1ed9161ec7..d59ad5c7f1 100644
--- a/esphome/components/remote_receiver/__init__.py
+++ b/esphome/components/remote_receiver/__init__.py
@@ -12,7 +12,7 @@ from esphome.const import (
     CONF_TOLERANCE,
     CONF_MEMORY_BLOCKS,
 )
-from esphome.core import CORE
+from esphome.core import CORE, TimePeriod
 
 AUTO_LOAD = ["remote_base"]
 remote_receiver_ns = cg.esphome_ns.namespace("remote_receiver")
@@ -33,9 +33,10 @@ CONFIG_SCHEMA = remote_base.validate_triggers(
             cv.SplitDefault(
                 CONF_BUFFER_SIZE, esp32="10000b", esp8266="1000b"
             ): cv.validate_bytes,
-            cv.Optional(
-                CONF_FILTER, default="50us"
-            ): cv.positive_time_period_microseconds,
+            cv.Optional(CONF_FILTER, default="50us"): cv.All(
+                cv.positive_time_period_microseconds,
+                cv.Range(max=TimePeriod(microseconds=255)),
+            ),
             cv.Optional(
                 CONF_IDLE, default="10ms"
             ): cv.positive_time_period_microseconds,

From 36c0e2416d63e44f3876410fa668676e41347fe1 Mon Sep 17 00:00:00 2001
From: Regev Brody <regevbr@gmail.com>
Date: Sun, 26 Mar 2023 23:01:35 +0300
Subject: [PATCH 731/838] add select_schema to select component (#4545)

* add select_schema to select component

* add select_schema to select component

* fix cr
---
 esphome/components/copy/select/__init__.py    | 15 ++++++----
 .../modbus_controller/select/__init__.py      |  5 ++--
 esphome/components/select/__init__.py         | 29 +++++++++++++++++--
 .../components/template/select/__init__.py    |  7 +++--
 esphome/components/tuya/select/__init__.py    | 21 ++++++++------
 5 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/esphome/components/copy/select/__init__.py b/esphome/components/copy/select/__init__.py
index 7d4c1c7705..6254ed03e1 100644
--- a/esphome/components/copy/select/__init__.py
+++ b/esphome/components/copy/select/__init__.py
@@ -14,12 +14,15 @@ from .. import copy_ns
 CopySelect = copy_ns.class_("CopySelect", select.Select, cg.Component)
 
 
-CONFIG_SCHEMA = select.SELECT_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(CopySelect),
-        cv.Required(CONF_SOURCE_ID): cv.use_id(select.Select),
-    }
-).extend(cv.COMPONENT_SCHEMA)
+CONFIG_SCHEMA = (
+    select.select_schema(CopySelect)
+    .extend(
+        {
+            cv.Required(CONF_SOURCE_ID): cv.use_id(select.Select),
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+)
 
 FINAL_VALIDATE_SCHEMA = cv.All(
     inherit_property_from(CONF_ICON, CONF_SOURCE_ID),
diff --git a/esphome/components/modbus_controller/select/__init__.py b/esphome/components/modbus_controller/select/__init__.py
index f8ef61ddc4..5692fea3e3 100644
--- a/esphome/components/modbus_controller/select/__init__.py
+++ b/esphome/components/modbus_controller/select/__init__.py
@@ -64,9 +64,10 @@ INTEGER_SENSOR_VALUE_TYPE = {
 }
 
 CONFIG_SCHEMA = cv.All(
-    select.SELECT_SCHEMA.extend(cv.COMPONENT_SCHEMA).extend(
+    select.select_schema(ModbusSelect)
+    .extend(cv.COMPONENT_SCHEMA)
+    .extend(
         {
-            cv.GenerateID(): cv.declare_id(ModbusSelect),
             cv.GenerateID(CONF_MODBUS_CONTROLLER_ID): cv.use_id(ModbusController),
             cv.Required(CONF_ADDRESS): cv.positive_int,
             cv.Optional(CONF_VALUE_TYPE, default="U_WORD"): cv.enum(
diff --git a/esphome/components/select/__init__.py b/esphome/components/select/__init__.py
index b505d89c6f..760f7600b7 100644
--- a/esphome/components/select/__init__.py
+++ b/esphome/components/select/__init__.py
@@ -3,6 +3,8 @@ import esphome.config_validation as cv
 from esphome import automation
 from esphome.components import mqtt
 from esphome.const import (
+    CONF_ENTITY_CATEGORY,
+    CONF_ICON,
     CONF_ID,
     CONF_ON_VALUE,
     CONF_OPTION,
@@ -14,6 +16,7 @@ from esphome.const import (
     CONF_INDEX,
 )
 from esphome.core import CORE, coroutine_with_priority
+from esphome.cpp_generator import MockObjClass
 from esphome.cpp_helpers import setup_entity
 
 CODEOWNERS = ["@esphome/core"]
@@ -43,8 +46,6 @@ SELECT_OPERATION_OPTIONS = {
     "LAST": SelectOperation.SELECT_OP_LAST,
 }
 
-icon = cv.icon
-
 
 SELECT_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).extend(
     {
@@ -58,6 +59,30 @@ SELECT_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).e
     }
 )
 
+_UNDEF = object()
+
+
+def select_schema(
+    class_: MockObjClass = _UNDEF,
+    *,
+    entity_category: str = _UNDEF,
+    icon: str = _UNDEF,
+):
+    schema = cv.Schema({})
+    if class_ is not _UNDEF:
+        schema = schema.extend({cv.GenerateID(): cv.declare_id(class_)})
+    if entity_category is not _UNDEF:
+        schema = schema.extend(
+            {
+                cv.Optional(
+                    CONF_ENTITY_CATEGORY, default=entity_category
+                ): cv.entity_category
+            }
+        )
+    if icon is not _UNDEF:
+        schema = schema.extend({cv.Optional(CONF_ICON, default=icon): cv.icon})
+    return SELECT_SCHEMA.extend(schema)
+
 
 async def setup_select_core_(var, config, *, options: list[str]):
     await setup_entity(var, config)
diff --git a/esphome/components/template/select/__init__.py b/esphome/components/template/select/__init__.py
index 4eba77119d..d116cbb8ae 100644
--- a/esphome/components/template/select/__init__.py
+++ b/esphome/components/template/select/__init__.py
@@ -43,9 +43,9 @@ def validate(config):
 
 
 CONFIG_SCHEMA = cv.All(
-    select.SELECT_SCHEMA.extend(
+    select.select_schema(TemplateSelect)
+    .extend(
         {
-            cv.GenerateID(): cv.declare_id(TemplateSelect),
             cv.Required(CONF_OPTIONS): cv.All(
                 cv.ensure_list(cv.string_strict), cv.Length(min=1)
             ),
@@ -55,7 +55,8 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_INITIAL_OPTION): cv.string_strict,
             cv.Optional(CONF_RESTORE_VALUE): cv.boolean,
         }
-    ).extend(cv.polling_component_schema("60s")),
+    )
+    .extend(cv.polling_component_schema("60s")),
     validate,
 )
 
diff --git a/esphome/components/tuya/select/__init__.py b/esphome/components/tuya/select/__init__.py
index 3d65eda301..dc78b2c3db 100644
--- a/esphome/components/tuya/select/__init__.py
+++ b/esphome/components/tuya/select/__init__.py
@@ -25,15 +25,18 @@ def ensure_option_map(value):
     return value
 
 
-CONFIG_SCHEMA = select.SELECT_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(TuyaSelect),
-        cv.GenerateID(CONF_TUYA_ID): cv.use_id(Tuya),
-        cv.Required(CONF_ENUM_DATAPOINT): cv.uint8_t,
-        cv.Required(CONF_OPTIONS): ensure_option_map,
-        cv.Optional(CONF_OPTIMISTIC, default=False): cv.boolean,
-    }
-).extend(cv.COMPONENT_SCHEMA)
+CONFIG_SCHEMA = (
+    select.select_schema(TuyaSelect)
+    .extend(
+        {
+            cv.GenerateID(CONF_TUYA_ID): cv.use_id(Tuya),
+            cv.Required(CONF_ENUM_DATAPOINT): cv.uint8_t,
+            cv.Required(CONF_OPTIONS): ensure_option_map,
+            cv.Optional(CONF_OPTIMISTIC, default=False): cv.boolean,
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+)
 
 
 async def to_code(config):

From 9ee661c1e4efb2bcf11f3490942332d0a5519535 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 26 Mar 2023 11:48:56 -1000
Subject: [PATCH 732/838] Add ability to clear the gatt cache (#4621)

* Add ability to clear the gatt cache

With BlueZ we can fully clear the cache when something goes wrong with the services, however since this is also a cache on the ESP32 we need to be able to clear the on device cache as well for the proxies since if something goes wrong with the service resolution it can cache the bad resolution on NVS forever.

Our current client implementation is limited to clearing the memory cache in Home Assistant https://github.com/home-assistant/core/blob/89355e087952417a6824507fd3b197f9d0520e19/homeassistant/components/esphome/bluetooth/client.py#L512

related issue https://github.com/esphome/issues/issues/4156

https://github.com/esphome/aioesphomeapi/pull/410

* naming

* lint

* lint

* naming

* naming

* naming

* 88 now that 87 is taken

* make const

* Update esphome/components/api/api_frame_helper.cpp
---
 esphome/components/api/api.proto              | 11 +++++
 esphome/components/api/api_connection.cpp     |  4 +-
 esphome/components/api/api_pb2.cpp            | 45 +++++++++++++++++++
 esphome/components/api/api_pb2.h              | 14 ++++++
 esphome/components/api/api_pb2_service.cpp    |  8 ++++
 esphome/components/api/api_pb2_service.h      |  3 ++
 esphome/components/api/api_server.cpp         | 11 +++++
 esphome/components/api/api_server.h           |  1 +
 .../bluetooth_proxy/bluetooth_proxy.cpp       |  7 +++
 .../bluetooth_proxy/bluetooth_proxy.h         |  8 ++++
 10 files changed, 111 insertions(+), 1 deletion(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 1cebdd0cbe..a64aac52e2 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -1156,6 +1156,7 @@ enum BluetoothDeviceRequestType {
   BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR = 3;
   BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE = 4;
   BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE = 5;
+  BLUETOOTH_DEVICE_REQUEST_TYPE_CLEAR_CACHE = 6;
 }
 
 message BluetoothDeviceRequest {
@@ -1359,3 +1360,13 @@ message BluetoothDeviceUnpairingResponse {
   bool success = 2;
   int32 error = 3;
 }
+
+message BluetoothDeviceClearCacheResponse {
+  option (id) = 88;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
+
+  uint64 address = 1;
+  bool success = 2;
+  int32 error = 3;
+}
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 40a5a230a5..e607f45e3f 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -953,7 +953,9 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
   resp.webserver_port = USE_WEBSERVER_PORT;
 #endif
 #ifdef USE_BLUETOOTH_PROXY
-  resp.bluetooth_proxy_version = bluetooth_proxy::global_bluetooth_proxy->has_active() ? 4 : 1;
+  resp.bluetooth_proxy_version = bluetooth_proxy::global_bluetooth_proxy->has_active()
+                                     ? bluetooth_proxy::ACTIVE_CONNECTIONS_VERSION
+                                     : bluetooth_proxy::PASSIVE_ONLY_VERSION;
 #endif
   return resp;
 }
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 381f8b3c46..43587469af 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -400,6 +400,8 @@ const char *proto_enum_to_string<enums::BluetoothDeviceRequestType>(enums::Bluet
       return "BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE";
     case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE:
       return "BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE";
+    case enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CLEAR_CACHE:
+      return "BLUETOOTH_DEVICE_REQUEST_TYPE_CLEAR_CACHE";
     default:
       return "UNKNOWN";
   }
@@ -6060,6 +6062,49 @@ void BluetoothDeviceUnpairingResponse::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
+bool BluetoothDeviceClearCacheResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->address = value.as_uint64();
+      return true;
+    }
+    case 2: {
+      this->success = value.as_bool();
+      return true;
+    }
+    case 3: {
+      this->error = value.as_int32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void BluetoothDeviceClearCacheResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint64(1, this->address);
+  buffer.encode_bool(2, this->success);
+  buffer.encode_int32(3, this->error);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void BluetoothDeviceClearCacheResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("BluetoothDeviceClearCacheResponse {\n");
+  out.append("  address: ");
+  sprintf(buffer, "%llu", this->address);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  success: ");
+  out.append(YESNO(this->success));
+  out.append("\n");
+
+  out.append("  error: ");
+  sprintf(buffer, "%d", this->error);
+  out.append(buffer);
+  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 e9025142e9..ff581cac6f 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -163,6 +163,7 @@ enum BluetoothDeviceRequestType : uint32_t {
   BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR = 3,
   BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE = 4,
   BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE = 5,
+  BLUETOOTH_DEVICE_REQUEST_TYPE_CLEAR_CACHE = 6,
 };
 
 }  // namespace enums
@@ -1554,6 +1555,19 @@ class BluetoothDeviceUnpairingResponse : public ProtoMessage {
  protected:
   bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
+class BluetoothDeviceClearCacheResponse : public ProtoMessage {
+ public:
+  uint64_t address{0};
+  bool success{false};
+  int32_t error{0};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt 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 7ee9e56192..73015fa914 100644
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -441,6 +441,14 @@ bool APIServerConnectionBase::send_bluetooth_device_unpairing_response(const Blu
   return this->send_message_<BluetoothDeviceUnpairingResponse>(msg, 86);
 }
 #endif
+#ifdef USE_BLUETOOTH_PROXY
+bool APIServerConnectionBase::send_bluetooth_device_clear_cache_response(const BluetoothDeviceClearCacheResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_bluetooth_device_clear_cache_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<BluetoothDeviceClearCacheResponse>(msg, 88);
+}
+#endif
 bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
   switch (msg_type) {
     case 1: {
diff --git a/esphome/components/api/api_pb2_service.h b/esphome/components/api/api_pb2_service.h
index f1879b2dba..7f19292ff3 100644
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -215,6 +215,9 @@ class APIServerConnectionBase : public ProtoService {
 #endif
 #ifdef USE_BLUETOOTH_PROXY
   bool send_bluetooth_device_unpairing_response(const BluetoothDeviceUnpairingResponse &msg);
+#endif
+#ifdef USE_BLUETOOTH_PROXY
+  bool send_bluetooth_device_clear_cache_response(const BluetoothDeviceClearCacheResponse &msg);
 #endif
  protected:
   bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index acde0966ba..c60766b364 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -331,6 +331,17 @@ void APIServer::send_bluetooth_device_unpairing(uint64_t address, bool success,
   }
 }
 
+void APIServer::send_bluetooth_device_clear_cache(uint64_t address, bool success, esp_err_t error) {
+  BluetoothDeviceClearCacheResponse call;
+  call.address = address;
+  call.success = success;
+  call.error = error;
+
+  for (auto &client : this->clients_) {
+    client->send_bluetooth_device_clear_cache_response(call);
+  }
+}
+
 void APIServer::send_bluetooth_connections_free(uint8_t free, uint8_t limit) {
   BluetoothConnectionsFreeResponse call;
   call.free = free;
diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index 5f92e6b058..db87affdb8 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -80,6 +80,7 @@ class APIServer : public Component, public Controller {
   void send_bluetooth_device_connection(uint64_t address, bool connected, uint16_t mtu = 0, esp_err_t error = ESP_OK);
   void send_bluetooth_device_pairing(uint64_t address, bool paired, esp_err_t error = ESP_OK);
   void send_bluetooth_device_unpairing(uint64_t address, bool success, esp_err_t error = ESP_OK);
+  void send_bluetooth_device_clear_cache(uint64_t address, bool success, esp_err_t error = ESP_OK);
   void send_bluetooth_connections_free(uint8_t free, uint8_t limit);
   void send_bluetooth_gatt_read_response(const BluetoothGATTReadResponse &call);
   void send_bluetooth_gatt_write_response(const BluetoothGATTWriteResponse &call);
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
index 55fabf05ef..76950c944e 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -306,6 +306,13 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
       api::global_api_server->send_bluetooth_device_unpairing(msg.address, ret == ESP_OK, ret);
       break;
     }
+    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CLEAR_CACHE: {
+      esp_bd_addr_t address;
+      uint64_to_bd_addr(msg.address, address);
+      esp_err_t ret = esp_ble_gattc_cache_clean(address);
+      api::global_api_server->send_bluetooth_device_clear_cache(msg.address, ret == ESP_OK, ret);
+      break;
+    }
   }
 }
 
diff --git a/esphome/components/bluetooth_proxy/bluetooth_proxy.h b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
index b99e9a8527..a582abc8a3 100644
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -68,6 +68,14 @@ class BluetoothProxy : public esp32_ble_tracker::ESPBTDeviceListener, public Com
 
 extern BluetoothProxy *global_bluetooth_proxy;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
+// Version 1: Initial version without active connections
+// Version 2: Support for active connections
+// Version 3: New connection API
+// Version 4: Pairing support
+// Version 5: Cache clear support
+static const uint32_t ACTIVE_CONNECTIONS_VERSION = 5;
+static const uint32_t PASSIVE_ONLY_VERSION = 1;
+
 }  // namespace bluetooth_proxy
 }  // namespace esphome
 

From 29e7d00894cad7086dd7910ce3a216972c3d015c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Mar 2023 10:51:37 +1300
Subject: [PATCH 733/838] Bump actions/stale from 7 to 8 (#4615)

Bumps [actions/stale](https://github.com/actions/stale) from 7 to 8.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v7...v8)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/stale.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index a2ba086394..f5d291b49f 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -18,7 +18,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v7
+      - uses: actions/stale@v8
         with:
           days-before-pr-stale: 90
           days-before-pr-close: 7
@@ -38,7 +38,7 @@ jobs:
   close-issues:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v7
+      - uses: actions/stale@v8
         with:
           days-before-pr-stale: -1
           days-before-pr-close: -1

From 806e43c34c09fe28a3cc0d7dcf1609a30781d4f0 Mon Sep 17 00:00:00 2001
From: tracestep <16390082+tracestep@users.noreply.github.com>
Date: Sun, 26 Mar 2023 18:59:57 -0300
Subject: [PATCH 734/838] SX1509 minimum loop period (fixes
 esphome/issues#4325) (#4613)

* Minimum loop period (fixes esphome/issues#4325)

* clang-tidy suggestions

* More clang-tidy suggestions
---
 esphome/components/sx1509/sx1509.cpp | 3 +++
 esphome/components/sx1509/sx1509.h   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/esphome/components/sx1509/sx1509.cpp b/esphome/components/sx1509/sx1509.cpp
index 60cbae6aa6..d0a84b99ff 100644
--- a/esphome/components/sx1509/sx1509.cpp
+++ b/esphome/components/sx1509/sx1509.cpp
@@ -42,6 +42,9 @@ void SX1509Component::dump_config() {
 
 void SX1509Component::loop() {
   if (this->has_keypad_) {
+    if (millis() - this->last_loop_timestamp_ < min_loop_period_)
+      return;
+    this->last_loop_timestamp_ = millis();
     uint16_t key_data = this->read_key_data();
     for (auto *binary_sensor : this->keypad_binary_sensors_)
       binary_sensor->process(key_data);
diff --git a/esphome/components/sx1509/sx1509.h b/esphome/components/sx1509/sx1509.h
index 50230b1086..8e3b41e233 100644
--- a/esphome/components/sx1509/sx1509.h
+++ b/esphome/components/sx1509/sx1509.h
@@ -69,6 +69,9 @@ class SX1509Component : public Component, public i2c::I2CDevice {
   uint8_t debounce_time_ = 1;
   std::vector<SX1509Processor *> keypad_binary_sensors_;
 
+  uint32_t last_loop_timestamp_ = 0;
+  const uint32_t min_loop_period_ = 15;  // ms
+
   void setup_keypad_();
   void set_debounce_config_(uint8_t config_value);
   void set_debounce_time_(uint8_t time);

From e542e75b9e60bf285428ef14c9e87134ba5b68e5 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 27 Mar 2023 11:44:56 +1300
Subject: [PATCH 735/838] Require step to be set when calling register_number
 (#4622)

---
 esphome/components/number/__init__.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/esphome/components/number/__init__.py b/esphome/components/number/__init__.py
index 70c53cace3..7db973612b 100644
--- a/esphome/components/number/__init__.py
+++ b/esphome/components/number/__init__.py
@@ -204,14 +204,13 @@ def number_schema(
 
 
 async def setup_number_core_(
-    var, config, *, min_value: float, max_value: float, step: Optional[float]
+    var, config, *, min_value: float, max_value: float, step: float
 ):
     await setup_entity(var, config)
 
     cg.add(var.traits.set_min_value(min_value))
     cg.add(var.traits.set_max_value(max_value))
-    if step is not None:
-        cg.add(var.traits.set_step(step))
+    cg.add(var.traits.set_step(step))
 
     cg.add(var.traits.set_mode(config[CONF_MODE]))
 
@@ -239,7 +238,7 @@ async def setup_number_core_(
 
 
 async def register_number(
-    var, config, *, min_value: float, max_value: float, step: Optional[float] = None
+    var, config, *, min_value: float, max_value: float, step: float
 ):
     if not CORE.has_id(config[CONF_ID]):
         var = cg.Pvariable(config[CONF_ID], var)

From 56504692af70d34a9b2f1219fac0890d64f1f84a Mon Sep 17 00:00:00 2001
From: Berend Haan <berendhaan@gmail.com>
Date: Mon, 27 Mar 2023 00:48:17 +0200
Subject: [PATCH 736/838] Lower range of CONF_FREQUENCY (#4619)

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

diff --git a/esphome/components/esp32_camera/__init__.py b/esphome/components/esp32_camera/__init__.py
index d6a744d24d..4cbdf7ca5c 100644
--- a/esphome/components/esp32_camera/__init__.py
+++ b/esphome/components/esp32_camera/__init__.py
@@ -156,7 +156,7 @@ CONFIG_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
             {
                 cv.Required(CONF_PIN): pins.internal_gpio_input_pin_number,
                 cv.Optional(CONF_FREQUENCY, default="20MHz"): cv.All(
-                    cv.frequency, cv.Range(min=10e6, max=20e6)
+                    cv.frequency, cv.Range(min=8e6, max=20e6)
                 ),
             }
         ),

From c2756d57d8878dc7d91f36bcba8a0cf3d0b9d7a1 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 27 Mar 2023 11:49:09 +1300
Subject: [PATCH 737/838] Allow entity names to be set to None (#4607)

* Allow entity names to be set to None so they take on the device friendly_name automatically

* Use empty
---
 esphome/components/api/api_connection.cpp   | 39 ++++++++++++++-------
 esphome/components/esp32_improv/__init__.py | 10 +-----
 esphome/config_validation.py                | 29 ++++++++++++++-
 esphome/core/entity_base.cpp                |  9 ++++-
 esphome/core/entity_base.h                  |  4 +++
 5 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index e607f45e3f..77ba96291a 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -180,7 +180,8 @@ bool APIConnection::send_binary_sensor_info(binary_sensor::BinarySensor *binary_
   ListEntitiesBinarySensorResponse msg;
   msg.object_id = binary_sensor->get_object_id();
   msg.key = binary_sensor->get_object_id_hash();
-  msg.name = binary_sensor->get_name();
+  if (binary_sensor->has_own_name())
+    msg.name = binary_sensor->get_name();
   msg.unique_id = get_default_unique_id("binary_sensor", binary_sensor);
   msg.device_class = binary_sensor->get_device_class();
   msg.is_status_binary_sensor = binary_sensor->is_status_binary_sensor();
@@ -212,7 +213,8 @@ bool APIConnection::send_cover_info(cover::Cover *cover) {
   ListEntitiesCoverResponse msg;
   msg.key = cover->get_object_id_hash();
   msg.object_id = cover->get_object_id();
-  msg.name = cover->get_name();
+  if (cover->has_own_name())
+    msg.name = cover->get_name();
   msg.unique_id = get_default_unique_id("cover", cover);
   msg.assumed_state = traits.get_is_assumed_state();
   msg.supports_position = traits.get_supports_position();
@@ -275,7 +277,8 @@ bool APIConnection::send_fan_info(fan::Fan *fan) {
   ListEntitiesFanResponse msg;
   msg.key = fan->get_object_id_hash();
   msg.object_id = fan->get_object_id();
-  msg.name = fan->get_name();
+  if (fan->has_own_name())
+    msg.name = fan->get_name();
   msg.unique_id = get_default_unique_id("fan", fan);
   msg.supports_oscillation = traits.supports_oscillation();
   msg.supports_speed = traits.supports_speed();
@@ -337,7 +340,8 @@ bool APIConnection::send_light_info(light::LightState *light) {
   ListEntitiesLightResponse msg;
   msg.key = light->get_object_id_hash();
   msg.object_id = light->get_object_id();
-  msg.name = light->get_name();
+  if (light->has_own_name())
+    msg.name = light->get_name();
   msg.unique_id = get_default_unique_id("light", light);
 
   msg.disabled_by_default = light->is_disabled_by_default();
@@ -418,7 +422,8 @@ bool APIConnection::send_sensor_info(sensor::Sensor *sensor) {
   ListEntitiesSensorResponse msg;
   msg.key = sensor->get_object_id_hash();
   msg.object_id = sensor->get_object_id();
-  msg.name = sensor->get_name();
+  if (sensor->has_own_name())
+    msg.name = sensor->get_name();
   msg.unique_id = sensor->unique_id();
   if (msg.unique_id.empty())
     msg.unique_id = get_default_unique_id("sensor", sensor);
@@ -448,7 +453,8 @@ bool APIConnection::send_switch_info(switch_::Switch *a_switch) {
   ListEntitiesSwitchResponse msg;
   msg.key = a_switch->get_object_id_hash();
   msg.object_id = a_switch->get_object_id();
-  msg.name = a_switch->get_name();
+  if (a_switch->has_own_name())
+    msg.name = a_switch->get_name();
   msg.unique_id = get_default_unique_id("switch", a_switch);
   msg.icon = a_switch->get_icon();
   msg.assumed_state = a_switch->assumed_state();
@@ -533,7 +539,8 @@ bool APIConnection::send_climate_info(climate::Climate *climate) {
   ListEntitiesClimateResponse msg;
   msg.key = climate->get_object_id_hash();
   msg.object_id = climate->get_object_id();
-  msg.name = climate->get_name();
+  if (climate->has_own_name())
+    msg.name = climate->get_name();
   msg.unique_id = get_default_unique_id("climate", climate);
 
   msg.disabled_by_default = climate->is_disabled_by_default();
@@ -611,7 +618,8 @@ bool APIConnection::send_number_info(number::Number *number) {
   ListEntitiesNumberResponse msg;
   msg.key = number->get_object_id_hash();
   msg.object_id = number->get_object_id();
-  msg.name = number->get_name();
+  if (number->has_own_name())
+    msg.name = number->get_name();
   msg.unique_id = get_default_unique_id("number", number);
   msg.icon = number->get_icon();
   msg.disabled_by_default = number->is_disabled_by_default();
@@ -652,7 +660,8 @@ bool APIConnection::send_select_info(select::Select *select) {
   ListEntitiesSelectResponse msg;
   msg.key = select->get_object_id_hash();
   msg.object_id = select->get_object_id();
-  msg.name = select->get_name();
+  if (select->has_own_name())
+    msg.name = select->get_name();
   msg.unique_id = get_default_unique_id("select", select);
   msg.icon = select->get_icon();
   msg.disabled_by_default = select->is_disabled_by_default();
@@ -679,7 +688,8 @@ bool APIConnection::send_button_info(button::Button *button) {
   ListEntitiesButtonResponse msg;
   msg.key = button->get_object_id_hash();
   msg.object_id = button->get_object_id();
-  msg.name = button->get_name();
+  if (button->has_own_name())
+    msg.name = button->get_name();
   msg.unique_id = get_default_unique_id("button", button);
   msg.icon = button->get_icon();
   msg.disabled_by_default = button->is_disabled_by_default();
@@ -710,7 +720,8 @@ bool APIConnection::send_lock_info(lock::Lock *a_lock) {
   ListEntitiesLockResponse msg;
   msg.key = a_lock->get_object_id_hash();
   msg.object_id = a_lock->get_object_id();
-  msg.name = a_lock->get_name();
+  if (a_lock->has_own_name())
+    msg.name = a_lock->get_name();
   msg.unique_id = get_default_unique_id("lock", a_lock);
   msg.icon = a_lock->get_icon();
   msg.assumed_state = a_lock->traits.get_assumed_state();
@@ -755,7 +766,8 @@ bool APIConnection::send_media_player_info(media_player::MediaPlayer *media_play
   ListEntitiesMediaPlayerResponse msg;
   msg.key = media_player->get_object_id_hash();
   msg.object_id = media_player->get_object_id();
-  msg.name = media_player->get_name();
+  if (media_player->has_own_name())
+    msg.name = media_player->get_name();
   msg.unique_id = get_default_unique_id("media_player", media_player);
   msg.icon = media_player->get_icon();
   msg.disabled_by_default = media_player->is_disabled_by_default();
@@ -799,7 +811,8 @@ bool APIConnection::send_camera_info(esp32_camera::ESP32Camera *camera) {
   ListEntitiesCameraResponse msg;
   msg.key = camera->get_object_id_hash();
   msg.object_id = camera->get_object_id();
-  msg.name = camera->get_name();
+  if (camera->has_own_name())
+    msg.name = camera->get_name();
   msg.unique_id = get_default_unique_id("camera", camera);
   msg.disabled_by_default = camera->is_disabled_by_default();
   msg.icon = camera->get_icon();
diff --git a/esphome/components/esp32_improv/__init__.py b/esphome/components/esp32_improv/__init__.py
index 7170a6dabf..ae7f0b6427 100644
--- a/esphome/components/esp32_improv/__init__.py
+++ b/esphome/components/esp32_improv/__init__.py
@@ -22,20 +22,12 @@ ESP32ImprovComponent = esp32_improv_ns.class_(
 )
 
 
-def validate_none_(value):
-    if value in ("none", "None"):
-        return None
-    if cv.boolean(value) is False:
-        return None
-    raise cv.Invalid("Must be none")
-
-
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(ESP32ImprovComponent),
         cv.GenerateID(CONF_BLE_SERVER_ID): cv.use_id(esp32_ble_server.BLEServer),
         cv.Required(CONF_AUTHORIZER): cv.Any(
-            validate_none_, cv.use_id(binary_sensor.BinarySensor)
+            cv.none, cv.use_id(binary_sensor.BinarySensor)
         ),
         cv.Optional(CONF_STATUS_INDICATOR): cv.use_id(output.BinaryOutput),
         cv.Optional(
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index f0bbc368b8..4b822b46c9 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -1514,6 +1514,8 @@ def _entity_base_validator(config):
         config[CONF_NAME] = id.id
         config[CONF_INTERNAL] = True
         return config
+    if config[CONF_NAME] is None:
+        config[CONF_NAME] = ""
     return config
 
 
@@ -1573,6 +1575,23 @@ def validate_registry_entry(name, registry):
     return validator
 
 
+def none(value):
+    if value in ("none", "None"):
+        return None
+    if boolean(value) is False:
+        return None
+    raise Invalid("Must be none")
+
+
+def requires_friendly_name(message):
+    def validate(value):
+        if CORE.friendly_name is None:
+            raise Invalid(message)
+        return value
+
+    return validate
+
+
 def validate_registry(name, registry):
     return ensure_list(validate_registry_entry(name, registry))
 
@@ -1632,7 +1651,15 @@ MQTT_COMMAND_COMPONENT_SCHEMA = MQTT_COMPONENT_SCHEMA.extend(
 
 ENTITY_BASE_SCHEMA = Schema(
     {
-        Optional(CONF_NAME): string,
+        Optional(CONF_NAME): Any(
+            All(
+                none,
+                requires_friendly_name(
+                    "Name cannot be None when esphome->friendly_name is not set!"
+                ),
+            ),
+            string,
+        ),
         Optional(CONF_INTERNAL): boolean,
         Optional(CONF_DISABLED_BY_DEFAULT, default=False): boolean,
         Optional(CONF_ICON): icon,
diff --git a/esphome/core/entity_base.cpp b/esphome/core/entity_base.cpp
index 6f88f069b3..49a73854a1 100644
--- a/esphome/core/entity_base.cpp
+++ b/esphome/core/entity_base.cpp
@@ -1,4 +1,5 @@
 #include "esphome/core/entity_base.h"
+#include "esphome/core/application.h"
 #include "esphome/core/helpers.h"
 
 namespace esphome {
@@ -10,7 +11,13 @@ EntityBase::EntityBase(std::string name) : name_(std::move(name)) { this->calc_o
 // Entity Name
 const std::string &EntityBase::get_name() const { return this->name_; }
 void EntityBase::set_name(const std::string &name) {
-  this->name_ = name;
+  if (name.empty()) {
+    this->name_ = App.get_friendly_name();
+    this->has_own_name_ = false;
+  } else {
+    this->name_ = name;
+    this->has_own_name_ = true;
+  }
   this->calc_object_id_();
 }
 
diff --git a/esphome/core/entity_base.h b/esphome/core/entity_base.h
index f6aae4e978..5ab1f7b424 100644
--- a/esphome/core/entity_base.h
+++ b/esphome/core/entity_base.h
@@ -21,6 +21,9 @@ class EntityBase {
   const std::string &get_name() const;
   void set_name(const std::string &name);
 
+  // Get whether this Entity has its own name or it should use the device friendly_name.
+  bool has_own_name() const { return this->has_own_name_; }
+
   // Get the sanitized name of this Entity as an ID. Caching it internally.
   const std::string &get_object_id();
 
@@ -52,6 +55,7 @@ class EntityBase {
   void calc_object_id_();
 
   std::string name_;
+  bool has_own_name_{false};
   std::string object_id_;
   const char *icon_c_str_{nullptr};
   uint32_t object_id_hash_;

From 06f83bf1c00a7c07f1fd1981bfca7a2663b4596c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 27 Mar 2023 11:50:33 +1300
Subject: [PATCH 738/838] Fix platform restriction for bme680_bsec (#4616)

* Fix platform restriction for bme680_bsec

* Fix

* revert spi change

* Add comment back

* Dont crash on rp2040 platform
---
 esphome/components/bme680_bsec/__init__.py | 41 +++++++++++++---------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/esphome/components/bme680_bsec/__init__.py b/esphome/components/bme680_bsec/__init__.py
index c9813c4974..085d2a574b 100644
--- a/esphome/components/bme680_bsec/__init__.py
+++ b/esphome/components/bme680_bsec/__init__.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.components import i2c
+from esphome.components import i2c, esp32
 from esphome.const import CONF_ID
 
 CODEOWNERS = ["@trvrnrth"]
@@ -32,22 +32,31 @@ BME680BSECComponent = bme680_bsec_ns.class_(
     "BME680BSECComponent", cg.Component, i2c.I2CDevice
 )
 
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(BME680BSECComponent),
-        cv.Optional(CONF_TEMPERATURE_OFFSET, default=0): cv.temperature,
-        cv.Optional(CONF_IAQ_MODE, default="STATIC"): cv.enum(
-            IAQ_MODE_OPTIONS, upper=True
-        ),
-        cv.Optional(CONF_SAMPLE_RATE, default="LP"): cv.enum(
-            SAMPLE_RATE_OPTIONS, upper=True
-        ),
-        cv.Optional(
-            CONF_STATE_SAVE_INTERVAL, default="6hours"
-        ): cv.positive_time_period_minutes,
-    },
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(BME680BSECComponent),
+            cv.Optional(CONF_TEMPERATURE_OFFSET, default=0): cv.temperature,
+            cv.Optional(CONF_IAQ_MODE, default="STATIC"): cv.enum(
+                IAQ_MODE_OPTIONS, upper=True
+            ),
+            cv.Optional(CONF_SAMPLE_RATE, default="LP"): cv.enum(
+                SAMPLE_RATE_OPTIONS, upper=True
+            ),
+            cv.Optional(
+                CONF_STATE_SAVE_INTERVAL, default="6hours"
+            ): cv.positive_time_period_minutes,
+        }
+    ).extend(i2c.i2c_device_schema(0x76)),
     cv.only_with_arduino,
-).extend(i2c.i2c_device_schema(0x76))
+    cv.Any(
+        cv.only_on_esp8266,
+        cv.All(
+            cv.only_on_esp32,
+            esp32.only_on_variant(supported=[esp32.const.VARIANT_ESP32]),
+        ),
+    ),
+)
 
 
 async def to_code(config):

From 9d9725144dd5d16ec7cde58f0afa50218242da1a Mon Sep 17 00:00:00 2001
From: Kai Gerken <Kai.Gerken@custom-coding.net>
Date: Sun, 19 Mar 2023 19:31:05 +0100
Subject: [PATCH 739/838] Fix compile error on pzemdc.h (#4583)

---
 esphome/components/pzemdc/pzemdc.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/pzemdc/pzemdc.h b/esphome/components/pzemdc/pzemdc.h
index 21676e3422..b91ab4c0a5 100644
--- a/esphome/components/pzemdc/pzemdc.h
+++ b/esphome/components/pzemdc/pzemdc.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/modbus/modbus.h"

From 8d3896172d8a0fe3c7384b42b40f7b31599ccc05 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 22 Mar 2023 20:56:02 +1300
Subject: [PATCH 740/838] Swap curly brackets for round on LockGuard (#4610)

---
 esphome/core/helpers.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index a107b1b849..8950cc3b8a 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -547,7 +547,7 @@ class Mutex {
  */
 class LockGuard {
  public:
-  LockGuard(Mutex &mutex) : mutex_{mutex} { mutex_.lock(); }
+  LockGuard(Mutex &mutex) : mutex_(mutex) { mutex_.lock(); }
   ~LockGuard() { mutex_.unlock(); }
 
  private:

From 74fe135c9ca5a58e331b3eeffda67b50b5b47005 Mon Sep 17 00:00:00 2001
From: guillempages <guillempages@users.noreply.github.com>
Date: Wed, 22 Mar 2023 09:05:09 +0100
Subject: [PATCH 741/838] Fix animation resizing (#4608)

Animation resizing in RGB24 format is causing an error "Image cannot be resized to a bigger size". Other image types do not show the issue, and the only difference is the "image.thumbnail" call.

Removed the call and tested; the animation is shown with the desired size.
---
 esphome/components/animation/__init__.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/esphome/components/animation/__init__.py b/esphome/components/animation/__init__.py
index ce9f057496..68c3eee132 100644
--- a/esphome/components/animation/__init__.py
+++ b/esphome/components/animation/__init__.py
@@ -76,8 +76,6 @@ async def to_code(config):
         pos = 0
         for frameIndex in range(frames):
             image.seek(frameIndex)
-            if CONF_RESIZE in config:
-                image.thumbnail(config[CONF_RESIZE])
             frame = image.convert("RGB")
             if CONF_RESIZE in config:
                 frame = frame.resize([width, height])

From 358c59bd8d63dc94bb1aeb22d90ad7dddefd731c Mon Sep 17 00:00:00 2001
From: tracestep <16390082+tracestep@users.noreply.github.com>
Date: Sun, 26 Mar 2023 18:59:57 -0300
Subject: [PATCH 742/838] SX1509 minimum loop period (fixes
 esphome/issues#4325) (#4613)

* Minimum loop period (fixes esphome/issues#4325)

* clang-tidy suggestions

* More clang-tidy suggestions
---
 esphome/components/sx1509/sx1509.cpp | 3 +++
 esphome/components/sx1509/sx1509.h   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/esphome/components/sx1509/sx1509.cpp b/esphome/components/sx1509/sx1509.cpp
index 60cbae6aa6..d0a84b99ff 100644
--- a/esphome/components/sx1509/sx1509.cpp
+++ b/esphome/components/sx1509/sx1509.cpp
@@ -42,6 +42,9 @@ void SX1509Component::dump_config() {
 
 void SX1509Component::loop() {
   if (this->has_keypad_) {
+    if (millis() - this->last_loop_timestamp_ < min_loop_period_)
+      return;
+    this->last_loop_timestamp_ = millis();
     uint16_t key_data = this->read_key_data();
     for (auto *binary_sensor : this->keypad_binary_sensors_)
       binary_sensor->process(key_data);
diff --git a/esphome/components/sx1509/sx1509.h b/esphome/components/sx1509/sx1509.h
index 50230b1086..8e3b41e233 100644
--- a/esphome/components/sx1509/sx1509.h
+++ b/esphome/components/sx1509/sx1509.h
@@ -69,6 +69,9 @@ class SX1509Component : public Component, public i2c::I2CDevice {
   uint8_t debounce_time_ = 1;
   std::vector<SX1509Processor *> keypad_binary_sensors_;
 
+  uint32_t last_loop_timestamp_ = 0;
+  const uint32_t min_loop_period_ = 15;  // ms
+
   void setup_keypad_();
   void set_debounce_config_(uint8_t config_value);
   void set_debounce_time_(uint8_t time);

From f862b479e71e4cd0766960cf1adbd69567dd8b69 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 27 Mar 2023 15:58:29 +1300
Subject: [PATCH 743/838] Bump version to 2023.3.2

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

diff --git a/esphome/const.py b/esphome/const.py
index 35d1d3fa03..bca0973bb9 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.3.1"
+__version__ = "2023.3.2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 1f50bd064973da339ead15d9b35cea789f1426d7 Mon Sep 17 00:00:00 2001
From: Alfredo <alfredo@pironti.eu>
Date: Tue, 28 Mar 2023 00:08:26 +0200
Subject: [PATCH 744/838] Fix EzoCommandType enum (#4593)

* Fix EzoCommandType enum

Assign explicit value to EZO_CALIBRATION, and rescale all subsequent values.

* Remove enum values

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/ezo/ezo.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/esphome/components/ezo/ezo.h b/esphome/components/ezo/ezo.h
index 72e82a574f..28b46643e9 100644
--- a/esphome/components/ezo/ezo.h
+++ b/esphome/components/ezo/ezo.h
@@ -12,14 +12,14 @@ static const char *const TAG = "ezo.sensor";
 
 enum EzoCommandType : uint8_t {
   EZO_READ = 0,
-  EZO_LED = 1,
-  EZO_DEVICE_INFORMATION = 2,
-  EZO_SLOPE = 3,
+  EZO_LED,
+  EZO_DEVICE_INFORMATION,
+  EZO_SLOPE,
   EZO_CALIBRATION,
-  EZO_SLEEP = 4,
-  EZO_I2C = 5,
-  EZO_T = 6,
-  EZO_CUSTOM = 7
+  EZO_SLEEP,
+  EZO_I2C,
+  EZO_T,
+  EZO_CUSTOM
 };
 
 enum EzoCalibrationType : uint8_t { EZO_CAL_LOW = 0, EZO_CAL_MID = 1, EZO_CAL_HIGH = 2 };

From cb2fcaa9b1e076bce939700e8cc9e3d437c938a7 Mon Sep 17 00:00:00 2001
From: Fabian <Fabian-Schmidt@users.noreply.github.com>
Date: Tue, 28 Mar 2023 08:38:56 +0200
Subject: [PATCH 745/838] `EntityBase` Name can stay in flash. (#4594)

* `EntityBase`can stay in flash.

* Trying to please the CI.

---------

Co-authored-by: Your Name <you@example.com>
---
 esphome/components/button/button.cpp          |   3 -
 esphome/components/button/button.h            |   3 -
 esphome/components/climate/climate.cpp        |   5 -
 esphome/components/climate/climate.h          |   5 -
 esphome/components/cover/cover.cpp            |   3 +-
 esphome/components/cover/cover.h              |   1 -
 .../components/esp32_camera/esp32_camera.cpp  |   3 +-
 .../components/esp32_camera/esp32_camera.h    |   1 -
 esphome/components/fan/fan.cpp                |   3 -
 esphome/components/fan/fan.h                  |   4 -
 esphome/components/fan/fan_state.h            |   1 -
 esphome/components/light/light_state.cpp      |   1 -
 esphome/components/light/light_state.h        |   3 -
 esphome/components/lock/lock.cpp              |   3 +-
 esphome/components/lock/lock.h                |   1 -
 esphome/components/partition/light.py         |   2 +-
 esphome/components/sensor/sensor.cpp          |   3 +-
 esphome/components/sensor/sensor.h            |   1 -
 esphome/components/switch/switch.cpp          |   3 +-
 esphome/components/switch/switch.h            |   1 -
 .../components/text_sensor/text_sensor.cpp    |   3 -
 esphome/components/text_sensor/text_sensor.h  |   3 -
 esphome/core/entity_base.cpp                  |  12 +-
 esphome/core/entity_base.h                    |  10 +-
 esphome/core/string_ref.cpp                   |  12 ++
 esphome/core/string_ref.h                     | 134 ++++++++++++++++++
 26 files changed, 161 insertions(+), 63 deletions(-)
 create mode 100644 esphome/core/string_ref.cpp
 create mode 100644 esphome/core/string_ref.h

diff --git a/esphome/components/button/button.cpp b/esphome/components/button/button.cpp
index 3d58780d6d..dfa417de7b 100644
--- a/esphome/components/button/button.cpp
+++ b/esphome/components/button/button.cpp
@@ -6,9 +6,6 @@ namespace button {
 
 static const char *const TAG = "button";
 
-Button::Button(const std::string &name) : EntityBase(name) {}
-Button::Button() : Button("") {}
-
 void Button::press() {
   ESP_LOGD(TAG, "'%s' Pressed.", this->get_name().c_str());
   this->press_action();
diff --git a/esphome/components/button/button.h b/esphome/components/button/button.h
index 3b5f338887..a4902810b2 100644
--- a/esphome/components/button/button.h
+++ b/esphome/components/button/button.h
@@ -28,9 +28,6 @@ namespace button {
  */
 class Button : public EntityBase {
  public:
-  explicit Button();
-  explicit Button(const std::string &name);
-
   /** Press this button. This is called by the front-end.
    *
    * For implementing buttons, please override press_action.
diff --git a/esphome/components/climate/climate.cpp b/esphome/components/climate/climate.cpp
index 37572ae913..b4d5ee9685 100644
--- a/esphome/components/climate/climate.cpp
+++ b/esphome/components/climate/climate.cpp
@@ -453,12 +453,7 @@ void Climate::set_visual_temperature_step_override(float target, float current)
   this->visual_target_temperature_step_override_ = target;
   this->visual_current_temperature_step_override_ = current;
 }
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-Climate::Climate(const std::string &name) : EntityBase(name) {}
-#pragma GCC diagnostic pop
 
-Climate::Climate() : Climate("") {}
 ClimateCall Climate::make_call() { return ClimateCall(this); }
 
 ClimateCall ClimateDeviceRestoreState::to_call(Climate *climate) {
diff --git a/esphome/components/climate/climate.h b/esphome/components/climate/climate.h
index 520036f718..43bd71657d 100644
--- a/esphome/components/climate/climate.h
+++ b/esphome/components/climate/climate.h
@@ -166,11 +166,6 @@ struct ClimateDeviceRestoreState {
  */
 class Climate : public EntityBase {
  public:
-  /// Construct a climate device with empty name (will be set later).
-  Climate();
-  /// Construct a climate device with a name.
-  Climate(const std::string &name);
-
   /// The active mode of the climate device.
   ClimateMode mode{CLIMATE_MODE_OFF};
   /// The active state of the climate device.
diff --git a/esphome/components/cover/cover.cpp b/esphome/components/cover/cover.cpp
index 902e9bca94..24dd88b698 100644
--- a/esphome/components/cover/cover.cpp
+++ b/esphome/components/cover/cover.cpp
@@ -31,7 +31,7 @@ const char *cover_operation_to_str(CoverOperation op) {
   }
 }
 
-Cover::Cover(const std::string &name) : EntityBase(name), position{COVER_OPEN} {}
+Cover::Cover() : position{COVER_OPEN} {}
 
 CoverCall::CoverCall(Cover *parent) : parent_(parent) {}
 CoverCall &CoverCall::set_command(const char *command) {
@@ -204,7 +204,6 @@ optional<CoverRestoreState> Cover::restore_state_() {
     return {};
   return recovered;
 }
-Cover::Cover() : Cover("") {}
 std::string Cover::get_device_class() {
   if (this->device_class_override_.has_value())
     return *this->device_class_override_;
diff --git a/esphome/components/cover/cover.h b/esphome/components/cover/cover.h
index 8ae9cfc8dd..c6a420fa97 100644
--- a/esphome/components/cover/cover.h
+++ b/esphome/components/cover/cover.h
@@ -111,7 +111,6 @@ const char *cover_operation_to_str(CoverOperation op);
 class Cover : public EntityBase {
  public:
   explicit Cover();
-  explicit Cover(const std::string &name);
 
   /// The current operation of the cover (idle, opening, closing).
   CoverOperation current_operation{COVER_OPERATION_IDLE};
diff --git a/esphome/components/esp32_camera/esp32_camera.cpp b/esphome/components/esp32_camera/esp32_camera.cpp
index 4a53748213..e4020a902e 100644
--- a/esphome/components/esp32_camera/esp32_camera.cpp
+++ b/esphome/components/esp32_camera/esp32_camera.cpp
@@ -202,7 +202,7 @@ void ESP32Camera::loop() {
 float ESP32Camera::get_setup_priority() const { return setup_priority::DATA; }
 
 /* ---------------- constructors ---------------- */
-ESP32Camera::ESP32Camera(const std::string &name) : EntityBase(name) {
+ESP32Camera::ESP32Camera() {
   this->config_.pin_pwdn = -1;
   this->config_.pin_reset = -1;
   this->config_.pin_xclk = -1;
@@ -215,7 +215,6 @@ ESP32Camera::ESP32Camera(const std::string &name) : EntityBase(name) {
 
   global_esp32_camera = this;
 }
-ESP32Camera::ESP32Camera() : ESP32Camera("") {}
 
 /* ---------------- setters ---------------- */
 /* set pin assignment */
diff --git a/esphome/components/esp32_camera/esp32_camera.h b/esphome/components/esp32_camera/esp32_camera.h
index 62fdbabd06..5f88c6fda8 100644
--- a/esphome/components/esp32_camera/esp32_camera.h
+++ b/esphome/components/esp32_camera/esp32_camera.h
@@ -103,7 +103,6 @@ class CameraImageReader {
 /* ---------------- ESP32Camera class ---------------- */
 class ESP32Camera : public Component, public EntityBase {
  public:
-  ESP32Camera(const std::string &name);
   ESP32Camera();
 
   /* setters */
diff --git a/esphome/components/fan/fan.cpp b/esphome/components/fan/fan.cpp
index c8a3064f6c..87566bad4a 100644
--- a/esphome/components/fan/fan.cpp
+++ b/esphome/components/fan/fan.cpp
@@ -80,9 +80,6 @@ void FanRestoreState::apply(Fan &fan) {
   fan.publish_state();
 }
 
-Fan::Fan() : EntityBase("") {}
-Fan::Fan(const std::string &name) : EntityBase(name) {}
-
 FanCall Fan::turn_on() { return this->make_call().set_state(true); }
 FanCall Fan::turn_off() { return this->make_call().set_state(false); }
 FanCall Fan::toggle() { return this->make_call().set_state(!this->state); }
diff --git a/esphome/components/fan/fan.h b/esphome/components/fan/fan.h
index 337bb3935a..f9d317e675 100644
--- a/esphome/components/fan/fan.h
+++ b/esphome/components/fan/fan.h
@@ -99,10 +99,6 @@ struct FanRestoreState {
 
 class Fan : public EntityBase {
  public:
-  Fan();
-  /// Construct the fan with name.
-  explicit Fan(const std::string &name);
-
   /// The current on/off state of the fan.
   bool state{false};
   /// The current oscillation state of the fan.
diff --git a/esphome/components/fan/fan_state.h b/esphome/components/fan/fan_state.h
index 044ee59736..5926e700b0 100644
--- a/esphome/components/fan/fan_state.h
+++ b/esphome/components/fan/fan_state.h
@@ -15,7 +15,6 @@ enum ESPDEPRECATED("LegacyFanDirection members are deprecated, use FanDirection
 class ESPDEPRECATED("FanState is deprecated, use Fan instead.", "2022.2") FanState : public Fan, public Component {
  public:
   FanState() = default;
-  explicit FanState(const std::string &name) : Fan(name) {}
 
   /// Get the traits of this fan.
   FanTraits get_traits() override { return this->traits_; }
diff --git a/esphome/components/light/light_state.cpp b/esphome/components/light/light_state.cpp
index 64c29a346b..50ebd8882b 100644
--- a/esphome/components/light/light_state.cpp
+++ b/esphome/components/light/light_state.cpp
@@ -8,7 +8,6 @@ namespace light {
 
 static const char *const TAG = "light";
 
-LightState::LightState(const std::string &name, LightOutput *output) : EntityBase(name), output_(output) {}
 LightState::LightState(LightOutput *output) : output_(output) {}
 
 LightTraits LightState::get_traits() { return this->output_->get_traits(); }
diff --git a/esphome/components/light/light_state.h b/esphome/components/light/light_state.h
index 81f8be7207..ac4718ade5 100644
--- a/esphome/components/light/light_state.h
+++ b/esphome/components/light/light_state.h
@@ -33,9 +33,6 @@ enum LightRestoreMode {
  */
 class LightState : public EntityBase, public Component {
  public:
-  /// Construct this LightState using the provided traits and name.
-  LightState(const std::string &name, LightOutput *output);
-
   LightState(LightOutput *output);
 
   LightTraits get_traits();
diff --git a/esphome/components/lock/lock.cpp b/esphome/components/lock/lock.cpp
index dbb8a941ad..ddc5445349 100644
--- a/esphome/components/lock/lock.cpp
+++ b/esphome/components/lock/lock.cpp
@@ -24,8 +24,7 @@ const char *lock_state_to_string(LockState state) {
   }
 }
 
-Lock::Lock(const std::string &name) : EntityBase(name), state(LOCK_STATE_NONE) {}
-Lock::Lock() : Lock("") {}
+Lock::Lock() : state(LOCK_STATE_NONE) {}
 LockCall Lock::make_call() { return LockCall(this); }
 
 void Lock::lock() {
diff --git a/esphome/components/lock/lock.h b/esphome/components/lock/lock.h
index 52256691f6..7a98187a4f 100644
--- a/esphome/components/lock/lock.h
+++ b/esphome/components/lock/lock.h
@@ -103,7 +103,6 @@ class LockCall {
 class Lock : public EntityBase {
  public:
   explicit Lock();
-  explicit Lock(const std::string &name);
 
   /** Make a lock device control call, this is used to control the lock device, see the LockCall description
    * for more info.
diff --git a/esphome/components/partition/light.py b/esphome/components/partition/light.py
index 73cda2c926..8e45915cf3 100644
--- a/esphome/components/partition/light.py
+++ b/esphome/components/partition/light.py
@@ -102,7 +102,7 @@ async def to_code(config):
                 conf[CONF_ADDRESSABLE_LIGHT_ID],
                 await cg.get_variable(conf[CONF_SINGLE_LIGHT_ID]),
             )
-            light_state = cg.new_Pvariable(conf[CONF_LIGHT_ID], "", wrapper)
+            light_state = cg.new_Pvariable(conf[CONF_LIGHT_ID], wrapper)
             await cg.register_component(light_state, conf)
             segments.append(AddressableSegment(light_state, 0, 1, False))
 
diff --git a/esphome/components/sensor/sensor.cpp b/esphome/components/sensor/sensor.cpp
index 0de452b784..fc66e03d6b 100644
--- a/esphome/components/sensor/sensor.cpp
+++ b/esphome/components/sensor/sensor.cpp
@@ -20,8 +20,7 @@ std::string state_class_to_string(StateClass state_class) {
   }
 }
 
-Sensor::Sensor(const std::string &name) : EntityBase(name), state(NAN), raw_state(NAN) {}
-Sensor::Sensor() : Sensor("") {}
+Sensor::Sensor() : state(NAN), raw_state(NAN) {}
 
 std::string Sensor::get_unit_of_measurement() {
   if (this->unit_of_measurement_.has_value())
diff --git a/esphome/components/sensor/sensor.h b/esphome/components/sensor/sensor.h
index e3651752cf..4308eafb12 100644
--- a/esphome/components/sensor/sensor.h
+++ b/esphome/components/sensor/sensor.h
@@ -57,7 +57,6 @@ std::string state_class_to_string(StateClass state_class);
 class Sensor : public EntityBase {
  public:
   explicit Sensor();
-  explicit Sensor(const std::string &name);
 
   /// Get the unit of measurement, using the manual override if set.
   std::string get_unit_of_measurement();
diff --git a/esphome/components/switch/switch.cpp b/esphome/components/switch/switch.cpp
index caa072b1ea..72e7add158 100644
--- a/esphome/components/switch/switch.cpp
+++ b/esphome/components/switch/switch.cpp
@@ -6,8 +6,7 @@ namespace switch_ {
 
 static const char *const TAG = "switch";
 
-Switch::Switch(const std::string &name) : EntityBase(name), state(false) {}
-Switch::Switch() : Switch("") {}
+Switch::Switch() : state(false) {}
 
 void Switch::turn_on() {
   ESP_LOGD(TAG, "'%s' Turning ON.", this->get_name().c_str());
diff --git a/esphome/components/switch/switch.h b/esphome/components/switch/switch.h
index b89d8db6a5..8bea3b36db 100644
--- a/esphome/components/switch/switch.h
+++ b/esphome/components/switch/switch.h
@@ -32,7 +32,6 @@ enum SwitchRestoreMode {
 class Switch : public EntityBase {
  public:
   explicit Switch();
-  explicit Switch(const std::string &name);
 
   /** Publish a state to the front-end from the back-end.
    *
diff --git a/esphome/components/text_sensor/text_sensor.cpp b/esphome/components/text_sensor/text_sensor.cpp
index d76ab7e27d..f10cd50267 100644
--- a/esphome/components/text_sensor/text_sensor.cpp
+++ b/esphome/components/text_sensor/text_sensor.cpp
@@ -6,9 +6,6 @@ namespace text_sensor {
 
 static const char *const TAG = "text_sensor";
 
-TextSensor::TextSensor() : TextSensor("") {}
-TextSensor::TextSensor(const std::string &name) : EntityBase(name) {}
-
 void TextSensor::publish_state(const std::string &state) {
   this->raw_state = state;
   this->raw_callback_.call(state);
diff --git a/esphome/components/text_sensor/text_sensor.h b/esphome/components/text_sensor/text_sensor.h
index cf7b6b86ef..996af02f7e 100644
--- a/esphome/components/text_sensor/text_sensor.h
+++ b/esphome/components/text_sensor/text_sensor.h
@@ -30,9 +30,6 @@ namespace text_sensor {
 
 class TextSensor : public EntityBase {
  public:
-  explicit TextSensor();
-  explicit TextSensor(const std::string &name);
-
   /// Getter-syntax for .state.
   std::string get_state() const;
   /// Getter-syntax for .raw_state
diff --git a/esphome/core/entity_base.cpp b/esphome/core/entity_base.cpp
index 49a73854a1..19ab57349d 100644
--- a/esphome/core/entity_base.cpp
+++ b/esphome/core/entity_base.cpp
@@ -6,16 +6,14 @@ namespace esphome {
 
 static const char *const TAG = "entity_base";
 
-EntityBase::EntityBase(std::string name) : name_(std::move(name)) { this->calc_object_id_(); }
-
 // Entity Name
-const std::string &EntityBase::get_name() const { return this->name_; }
-void EntityBase::set_name(const std::string &name) {
-  if (name.empty()) {
-    this->name_ = App.get_friendly_name();
+const StringRef &EntityBase::get_name() const { return this->name_; }
+void EntityBase::set_name(const char *name) {
+  this->name_ = StringRef(name);
+  if (this->name_.empty()) {
+    this->name_ = StringRef(App.get_friendly_name());
     this->has_own_name_ = false;
   } else {
-    this->name_ = name;
     this->has_own_name_ = true;
   }
   this->calc_object_id_();
diff --git a/esphome/core/entity_base.h b/esphome/core/entity_base.h
index 5ab1f7b424..e25aab21a9 100644
--- a/esphome/core/entity_base.h
+++ b/esphome/core/entity_base.h
@@ -2,6 +2,7 @@
 
 #include <string>
 #include <cstdint>
+#include "string_ref.h"
 
 namespace esphome {
 
@@ -14,12 +15,9 @@ enum EntityCategory : uint8_t {
 // The generic Entity base class that provides an interface common to all Entities.
 class EntityBase {
  public:
-  EntityBase() : EntityBase("") {}
-  explicit EntityBase(std::string name);
-
   // Get/set the name of this Entity
-  const std::string &get_name() const;
-  void set_name(const std::string &name);
+  const StringRef &get_name() const;
+  void set_name(const char *name);
 
   // Get whether this Entity has its own name or it should use the device friendly_name.
   bool has_own_name() const { return this->has_own_name_; }
@@ -54,7 +52,7 @@ class EntityBase {
   virtual uint32_t hash_base() { return 0L; }
   void calc_object_id_();
 
-  std::string name_;
+  StringRef name_;
   bool has_own_name_{false};
   std::string object_id_;
   const char *icon_c_str_{nullptr};
diff --git a/esphome/core/string_ref.cpp b/esphome/core/string_ref.cpp
new file mode 100644
index 0000000000..ce1e33cbb7
--- /dev/null
+++ b/esphome/core/string_ref.cpp
@@ -0,0 +1,12 @@
+#include "string_ref.h"
+
+namespace esphome {
+
+#ifdef USE_JSON
+
+// NOLINTNEXTLINE(readability-identifier-naming)
+void convertToJson(const StringRef &src, JsonVariant dst) { dst.set(src.c_str()); }
+
+#endif  // USE_JSON
+
+}  // namespace esphome
diff --git a/esphome/core/string_ref.h b/esphome/core/string_ref.h
new file mode 100644
index 0000000000..5940a7ee65
--- /dev/null
+++ b/esphome/core/string_ref.h
@@ -0,0 +1,134 @@
+#pragma once
+
+#include <string>
+#include <iterator>
+#include <cstring>
+#include "esphome/core/defines.h"
+
+#ifdef USE_JSON
+#include "esphome/components/json/json_util.h"
+#endif  // USE_JSON
+
+namespace esphome {
+
+/**
+ * StringRef is a reference to a string owned by something else.  So it behaves like simple string, but it does not own
+ * pointer.  When it is default constructed, it has empty string.  You can freely copy or move around this struct, but
+ * never free its pointer.  str() function can be used to export the content as std::string. StringRef is adopted from
+ * <https://github.com/nghttp2/nghttp2/blob/29cbf8b83ff78faf405d1086b16adc09a8772eca/src/template.h#L376>
+ */
+class StringRef {
+ public:
+  using traits_type = std::char_traits<char>;
+  using value_type = traits_type::char_type;
+  using allocator_type = std::allocator<char>;
+  using size_type = std::allocator_traits<allocator_type>::size_type;
+  using difference_type = std::allocator_traits<allocator_type>::difference_type;
+  using const_reference = const value_type &;
+  using const_pointer = const value_type *;
+  using const_iterator = const_pointer;
+  using const_reverse_iterator = std::reverse_iterator<const_iterator>;
+
+  constexpr StringRef() : base_(""), len_(0) {}
+  explicit StringRef(const std::string &s) : base_(s.c_str()), len_(s.size()) {}
+  explicit StringRef(const char *s) : base_(s), len_(strlen(s)) {}
+  constexpr StringRef(const char *s, size_t n) : base_(s), len_(n) {}
+  template<typename CharT>
+  constexpr StringRef(const CharT *s, size_t n) : base_(reinterpret_cast<const char *>(s)), len_(n) {}
+  template<typename InputIt>
+  StringRef(InputIt first, InputIt last)
+      : base_(reinterpret_cast<const char *>(&*first)), len_(std::distance(first, last)) {}
+  template<typename InputIt>
+  StringRef(InputIt *first, InputIt *last)
+      : base_(reinterpret_cast<const char *>(first)), len_(std::distance(first, last)) {}
+  template<typename CharT, size_t N> constexpr static StringRef from_lit(const CharT (&s)[N]) {
+    return StringRef{s, N - 1};
+  }
+  static StringRef from_maybe_nullptr(const char *s) {
+    if (s == nullptr) {
+      return StringRef();
+    }
+
+    return StringRef(s);
+  }
+
+  constexpr const_iterator begin() const { return base_; };
+  constexpr const_iterator cbegin() const { return base_; };
+
+  constexpr const_iterator end() const { return base_ + len_; };
+  constexpr const_iterator cend() const { return base_ + len_; };
+
+  const_reverse_iterator rbegin() const { return const_reverse_iterator{base_ + len_}; }
+  const_reverse_iterator crbegin() const { return const_reverse_iterator{base_ + len_}; }
+
+  const_reverse_iterator rend() const { return const_reverse_iterator{base_}; }
+  const_reverse_iterator crend() const { return const_reverse_iterator{base_}; }
+
+  constexpr const char *c_str() const { return base_; }
+  constexpr size_type size() const { return len_; }
+  constexpr bool empty() const { return len_ == 0; }
+  constexpr const_reference operator[](size_type pos) const { return *(base_ + pos); }
+
+  std::string str() const { return std::string(base_, len_); }
+  const uint8_t *byte() const { return reinterpret_cast<const uint8_t *>(base_); }
+
+  operator std::string() const { return str(); }
+
+ private:
+  const char *base_;
+  size_type len_;
+};
+
+inline bool operator==(const StringRef &lhs, const StringRef &rhs) {
+  return lhs.size() == rhs.size() && std::equal(std::begin(lhs), std::end(lhs), std::begin(rhs));
+}
+
+inline bool operator==(const StringRef &lhs, const std::string &rhs) {
+  return lhs.size() == rhs.size() && std::equal(std::begin(lhs), std::end(lhs), std::begin(rhs));
+}
+
+inline bool operator==(const std::string &lhs, const StringRef &rhs) { return rhs == lhs; }
+
+inline bool operator==(const StringRef &lhs, const char *rhs) {
+  return lhs.size() == strlen(rhs) && std::equal(std::begin(lhs), std::end(lhs), rhs);
+}
+
+inline bool operator==(const char *lhs, const StringRef &rhs) { return rhs == lhs; }
+
+inline bool operator!=(const StringRef &lhs, const StringRef &rhs) { return !(lhs == rhs); }
+
+inline bool operator!=(const StringRef &lhs, const std::string &rhs) { return !(lhs == rhs); }
+
+inline bool operator!=(const std::string &lhs, const StringRef &rhs) { return !(rhs == lhs); }
+
+inline bool operator!=(const StringRef &lhs, const char *rhs) { return !(lhs == rhs); }
+
+inline bool operator!=(const char *lhs, const StringRef &rhs) { return !(rhs == lhs); }
+
+inline bool operator<(const StringRef &lhs, const StringRef &rhs) {
+  return std::lexicographical_compare(std::begin(lhs), std::end(lhs), std::begin(rhs), std::end(rhs));
+}
+
+inline std::string &operator+=(std::string &lhs, const StringRef &rhs) {
+  lhs.append(rhs.c_str(), rhs.size());
+  return lhs;
+}
+
+inline std::string operator+(const char *lhs, const StringRef &rhs) {
+  auto str = std::string(lhs);
+  str.append(rhs.c_str(), rhs.size());
+  return str;
+}
+
+inline std::string operator+(const StringRef &lhs, const char *rhs) {
+  auto str = lhs.str();
+  str.append(rhs);
+  return str;
+}
+
+#ifdef USE_JSON
+// NOLINTNEXTLINE(readability-identifier-naming)
+void convertToJson(const StringRef &src, JsonVariant dst);
+#endif  // USE_JSON
+
+}  // namespace esphome

From 922344811f66c18b08aff21c804b0ba8c4c1e4b4 Mon Sep 17 00:00:00 2001
From: richardhopton <richard@thehoptons.com>
Date: Tue, 28 Mar 2023 01:54:58 -0700
Subject: [PATCH 746/838] feat: Add support to unsubscribe from BLE
 advertisements (#4620)

* feat: Add support to unsubscribe from BLE advertisements

* Fix tests & clang

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/api/api.proto           |  7 +++++++
 esphome/components/api/api_connection.h    |  3 +++
 esphome/components/api/api_pb2.cpp         |  6 ++++++
 esphome/components/api/api_pb2.h           |  9 +++++++++
 esphome/components/api/api_pb2_service.cpp | 21 +++++++++++++++++++++
 esphome/components/api/api_pb2_service.h   |  6 ++++++
 6 files changed, 52 insertions(+)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index a64aac52e2..fd00317282 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -53,6 +53,8 @@ service APIConnection {
   rpc bluetooth_gatt_write_descriptor(BluetoothGATTWriteDescriptorRequest) returns (void) {}
   rpc bluetooth_gatt_notify(BluetoothGATTNotifyRequest) returns (void) {}
   rpc subscribe_bluetooth_connections_free(SubscribeBluetoothConnectionsFreeRequest) returns (BluetoothConnectionsFreeResponse) {}
+  rpc unsubscribe_bluetooth_le_advertisements(UnsubscribeBluetoothLEAdvertisementsRequest) returns (void) {}
+
 }
 
 
@@ -1361,6 +1363,11 @@ message BluetoothDeviceUnpairingResponse {
   int32 error = 3;
 }
 
+message UnsubscribeBluetoothLEAdvertisementsRequest {
+  option (id) = 87;
+  option (source) = SOURCE_CLIENT;
+}
+
 message BluetoothDeviceClearCacheResponse {
   option (id) = 88;
   option (source) = SOURCE_SERVER;
diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h
index b2076635b0..bc6ae5d7c3 100644
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -153,6 +153,9 @@ class APIConnection : public APIServerConnection {
   void subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) override {
     this->bluetooth_le_advertisement_subscription_ = true;
   }
+  void unsubscribe_bluetooth_le_advertisements(const UnsubscribeBluetoothLEAdvertisementsRequest &msg) override {
+    this->bluetooth_le_advertisement_subscription_ = false;
+  }
   bool is_authenticated() override { return this->connection_state_ == ConnectionState::AUTHENTICATED; }
   bool is_connection_setup() override {
     return this->connection_state_ == ConnectionState ::CONNECTED || this->is_authenticated();
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 43587469af..6260020064 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -6062,6 +6062,12 @@ void BluetoothDeviceUnpairingResponse::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
+void UnsubscribeBluetoothLEAdvertisementsRequest::encode(ProtoWriteBuffer buffer) const {}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void UnsubscribeBluetoothLEAdvertisementsRequest::dump_to(std::string &out) const {
+  out.append("UnsubscribeBluetoothLEAdvertisementsRequest {}");
+}
+#endif
 bool BluetoothDeviceClearCacheResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 1: {
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index ff581cac6f..ade9b9cc8f 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -1555,6 +1555,15 @@ class BluetoothDeviceUnpairingResponse : public ProtoMessage {
  protected:
   bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
+class UnsubscribeBluetoothLEAdvertisementsRequest : public ProtoMessage {
+ public:
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+};
 class BluetoothDeviceClearCacheResponse : public ProtoMessage {
  public:
   uint64_t address{0};
diff --git a/esphome/components/api/api_pb2_service.cpp b/esphome/components/api/api_pb2_service.cpp
index 73015fa914..e613cbcad9 100644
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -813,6 +813,15 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
 #endif
       break;
     }
+    case 87: {
+      UnsubscribeBluetoothLEAdvertisementsRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_unsubscribe_bluetooth_le_advertisements_request: %s", msg.dump().c_str());
+#endif
+      this->on_unsubscribe_bluetooth_le_advertisements_request(msg);
+      break;
+    }
     default:
       return false;
   }
@@ -1193,6 +1202,18 @@ void APIServerConnection::on_subscribe_bluetooth_connections_free_request(
   }
 }
 #endif
+void APIServerConnection::on_unsubscribe_bluetooth_le_advertisements_request(
+    const UnsubscribeBluetoothLEAdvertisementsRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->unsubscribe_bluetooth_le_advertisements(msg);
+}
 
 }  // namespace api
 }  // namespace esphome
diff --git a/esphome/components/api/api_pb2_service.h b/esphome/components/api/api_pb2_service.h
index 7f19292ff3..ad6696176c 100644
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -216,6 +216,8 @@ class APIServerConnectionBase : public ProtoService {
 #ifdef USE_BLUETOOTH_PROXY
   bool send_bluetooth_device_unpairing_response(const BluetoothDeviceUnpairingResponse &msg);
 #endif
+  virtual void on_unsubscribe_bluetooth_le_advertisements_request(
+      const UnsubscribeBluetoothLEAdvertisementsRequest &value){};
 #ifdef USE_BLUETOOTH_PROXY
   bool send_bluetooth_device_clear_cache_response(const BluetoothDeviceClearCacheResponse &msg);
 #endif
@@ -296,6 +298,8 @@ class APIServerConnection : public APIServerConnectionBase {
   virtual BluetoothConnectionsFreeResponse subscribe_bluetooth_connections_free(
       const SubscribeBluetoothConnectionsFreeRequest &msg) = 0;
 #endif
+  virtual void unsubscribe_bluetooth_le_advertisements(const UnsubscribeBluetoothLEAdvertisementsRequest &msg) = 0;
+
  protected:
   void on_hello_request(const HelloRequest &msg) override;
   void on_connect_request(const ConnectRequest &msg) override;
@@ -367,6 +371,8 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_BLUETOOTH_PROXY
   void on_subscribe_bluetooth_connections_free_request(const SubscribeBluetoothConnectionsFreeRequest &msg) override;
 #endif
+  void on_unsubscribe_bluetooth_le_advertisements_request(
+      const UnsubscribeBluetoothLEAdvertisementsRequest &msg) override;
 };
 
 }  // namespace api

From 3ac7bf3761aa050a6eec24a65a06160c88f490d1 Mon Sep 17 00:00:00 2001
From: Fabian <Fabian-Schmidt@users.noreply.github.com>
Date: Tue, 28 Mar 2023 11:00:34 +0200
Subject: [PATCH 747/838] EntityBase: Move ObjectId to Flash  (#4569)

* Move EntityBase Object Id from memory to flash.

* Sprinkler use common `setup_entity` method.

* Remove `EntityBase` from Sprinkler.

* Support for entity names set to None

* change so gh PR picks up commit.

---------

Co-authored-by: Your Name <you@example.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/core/entity_base.cpp     | 33 ++++++++++++++++++++++++++-----
 esphome/core/entity_base.h       |  7 ++++---
 esphome/cpp_helpers.py           |  5 +++++
 esphome/helpers.py               | 11 +++++++++++
 tests/unit_tests/test_helpers.py | 34 ++++++++++++++++++++++++++++++++
 5 files changed, 82 insertions(+), 8 deletions(-)

diff --git a/esphome/core/entity_base.cpp b/esphome/core/entity_base.cpp
index 19ab57349d..3d61e36fd1 100644
--- a/esphome/core/entity_base.cpp
+++ b/esphome/core/entity_base.cpp
@@ -16,7 +16,6 @@ void EntityBase::set_name(const char *name) {
   } else {
     this->has_own_name_ = true;
   }
-  this->calc_object_id_();
 }
 
 // Entity Internal
@@ -41,13 +40,37 @@ EntityCategory EntityBase::get_entity_category() const { return this->entity_cat
 void EntityBase::set_entity_category(EntityCategory entity_category) { this->entity_category_ = entity_category; }
 
 // Entity Object ID
-const std::string &EntityBase::get_object_id() { return this->object_id_; }
+std::string EntityBase::get_object_id() const {
+  // Check if `App.get_friendly_name()` is constant or dynamic.
+  if (!this->has_own_name_ && App.is_name_add_mac_suffix_enabled()) {
+    // `App.get_friendly_name()` is dynamic.
+    return str_sanitize(str_snake_case(App.get_friendly_name()));
+  } else {
+    // `App.get_friendly_name()` is constant.
+    if (this->object_id_c_str_ == nullptr) {
+      return "";
+    }
+    return this->object_id_c_str_;
+  }
+}
+void EntityBase::set_object_id(const char *object_id) {
+  this->object_id_c_str_ = object_id;
+  this->calc_object_id_();
+}
 
 // Calculate Object ID Hash from Entity Name
 void EntityBase::calc_object_id_() {
-  this->object_id_ = str_sanitize(str_snake_case(this->name_));
-  // FNV-1 hash
-  this->object_id_hash_ = fnv1_hash(this->object_id_);
+  // Check if `App.get_friendly_name()` is constant or dynamic.
+  if (!this->has_own_name_ && App.is_name_add_mac_suffix_enabled()) {
+    // `App.get_friendly_name()` is dynamic.
+    const auto object_id = str_sanitize(str_snake_case(App.get_friendly_name()));
+    // FNV-1 hash
+    this->object_id_hash_ = fnv1_hash(object_id);
+  } else {
+    // `App.get_friendly_name()` is constant.
+    // FNV-1 hash
+    this->object_id_hash_ = fnv1_hash(this->object_id_c_str_);
+  }
 }
 uint32_t EntityBase::get_object_id_hash() { return this->object_id_hash_; }
 
diff --git a/esphome/core/entity_base.h b/esphome/core/entity_base.h
index e25aab21a9..0a53c3fccc 100644
--- a/esphome/core/entity_base.h
+++ b/esphome/core/entity_base.h
@@ -22,8 +22,9 @@ class EntityBase {
   // Get whether this Entity has its own name or it should use the device friendly_name.
   bool has_own_name() const { return this->has_own_name_; }
 
-  // Get the sanitized name of this Entity as an ID. Caching it internally.
-  const std::string &get_object_id();
+  // Get the sanitized name of this Entity as an ID.
+  std::string get_object_id() const;
+  void set_object_id(const char *object_id);
 
   // Get the unique Object ID of this Entity
   uint32_t get_object_id_hash();
@@ -54,7 +55,7 @@ class EntityBase {
 
   StringRef name_;
   bool has_own_name_{false};
-  std::string object_id_;
+  const char *object_id_c_str_{nullptr};
   const char *icon_c_str_{nullptr};
   uint32_t object_id_hash_;
   bool internal_{false};
diff --git a/esphome/cpp_helpers.py b/esphome/cpp_helpers.py
index ab5231e055..cc53f491f5 100644
--- a/esphome/cpp_helpers.py
+++ b/esphome/cpp_helpers.py
@@ -20,6 +20,7 @@ from esphome.types import ConfigType, ConfigFragmentType
 from esphome.cpp_generator import add, get_variable
 from esphome.cpp_types import App
 from esphome.util import Registry, RegistryEntry
+from esphome.helpers import snake_case, sanitize
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -101,6 +102,10 @@ async def register_parented(var, value):
 async def setup_entity(var, config):
     """Set up generic properties of an Entity"""
     add(var.set_name(config[CONF_NAME]))
+    if not config[CONF_NAME]:
+        add(var.set_object_id(sanitize(snake_case(CORE.friendly_name))))
+    else:
+        add(var.set_object_id(sanitize(snake_case(config[CONF_NAME]))))
     add(var.set_disabled_by_default(config[CONF_DISABLED_BY_DEFAULT]))
     if CONF_INTERNAL in config:
         add(var.set_internal(config[CONF_INTERNAL]))
diff --git a/esphome/helpers.py b/esphome/helpers.py
index b5a6306342..884f640d7b 100644
--- a/esphome/helpers.py
+++ b/esphome/helpers.py
@@ -7,6 +7,7 @@ from pathlib import Path
 from typing import Union
 import tempfile
 from urllib.parse import urlparse
+import re
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -334,3 +335,13 @@ def add_class_to_obj(value, cls):
             if type(value) is type_:  # pylint: disable=unidiomatic-typecheck
                 return add_class_to_obj(func(value), cls)
         raise
+
+
+def snake_case(value):
+    """Same behaviour as `helpers.cpp` method `str_snake_case`."""
+    return value.replace(" ", "_").lower()
+
+
+def sanitize(value):
+    """Same behaviour as `helpers.cpp` method `str_sanitize`."""
+    return re.sub("[^-_0-9a-zA-Z]", r"", value)
diff --git a/tests/unit_tests/test_helpers.py b/tests/unit_tests/test_helpers.py
index f883b8b44f..b98838024f 100644
--- a/tests/unit_tests/test_helpers.py
+++ b/tests/unit_tests/test_helpers.py
@@ -229,3 +229,37 @@ def test_file_compare(fixture_path, file1, file2, expected):
     actual = helpers.file_compare(path1, path2)
 
     assert actual == expected
+
+
+@pytest.mark.parametrize(
+    "text, expected",
+    (
+        ("foo", "foo"),
+        ("foo bar", "foo_bar"),
+        ("foo Bar", "foo_bar"),
+        ("foo BAR", "foo_bar"),
+        ("foo.bar", "foo.bar"),
+        ("fooBAR", "foobar"),
+        ("Foo-bar_EEK", "foo-bar_eek"),
+        ("  foo", "__foo"),
+    ),
+)
+def test_snake_case(text, expected):
+    actual = helpers.snake_case(text)
+
+    assert actual == expected
+
+
+@pytest.mark.parametrize(
+    "text, expected",
+    (
+        ("foo_bar", "foo_bar"),
+        ('!"§$%&/()=?foo_bar', "foo_bar"),
+        ('foo_!"§$%&/()=?bar', "foo_bar"),
+        ('foo_bar!"§$%&/()=?', "foo_bar"),
+    ),
+)
+def test_sanitize(text, expected):
+    actual = helpers.sanitize(text)
+
+    assert actual == expected

From a2931b6774a141462b92b78bbf1e1294dd422cf5 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 29 Mar 2023 12:31:07 +1300
Subject: [PATCH 748/838] Add workflow to sync device classes with HA dev
 (#4629)

---
 .github/workflows/sync-device-classes.yml | 60 +++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 .github/workflows/sync-device-classes.yml

diff --git a/.github/workflows/sync-device-classes.yml b/.github/workflows/sync-device-classes.yml
new file mode 100644
index 0000000000..82eead332e
--- /dev/null
+++ b/.github/workflows/sync-device-classes.yml
@@ -0,0 +1,60 @@
+---
+name: Synchronise Device Classes from Home Assistant
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '45 6 * * *'
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  sync:
+    name: Sync Device Classes
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Checkout Home Assistant
+        uses: actions/checkout@v3
+        with:
+          repository: home-assistant/core
+          path: home-assistant
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.11
+
+      - name: Install Home Assistant
+        run: |
+          python -m pip install --upgrade pip
+          pip install -e home-assistant
+
+      - name: Sync
+        run: |
+          python ./script/sync-device_class.py
+
+      - name: Get PR template
+        id: pr-template-body
+        run: |
+          body=$(cat .github/PULL_REQUEST_TEMPLATE.md)
+          delimiter="$(openssl rand -hex 8)"
+          echo "body<<$delimiter" >> $GITHUB_OUTPUT
+          echo "$body" >> $GITHUB_OUTPUT
+          echo "$delimiter" >> $GITHUB_OUTPUT
+
+      - name: Commit changes
+        uses: peter-evans/create-pull-request@v4
+        with:
+          commit-message: "Synchronise Device Classes from Home Assistant"
+          committer: esphomebot <esphome@nabucasa.com>
+          author: esphomebot <esphome@nabucasa.com>
+          branch: sync/device-classes/
+          branch-suffix: timestamp
+          delete-branch: true
+          title: "Synchronise Device Classes from Home Assistant"
+          body: ${{ steps.pr-template-body.outputs.body }}

From c4ddf7697d36fe25eefa9458e1e329a0d1f48f54 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 29 Mar 2023 14:02:34 +1300
Subject: [PATCH 749/838] Update sync-device-classes.yml

---
 .github/workflows/sync-device-classes.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sync-device-classes.yml b/.github/workflows/sync-device-classes.yml
index 82eead332e..671fe1f21a 100644
--- a/.github/workflows/sync-device-classes.yml
+++ b/.github/workflows/sync-device-classes.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: home-assistant/core
-          path: home-assistant
+          path: lib/home-assistant
 
       - name: Setup Python
         uses: actions/setup-python@v4
@@ -32,7 +32,7 @@ jobs:
       - name: Install Home Assistant
         run: |
           python -m pip install --upgrade pip
-          pip install -e home-assistant
+          pip install -e lib/home-assistant
 
       - name: Sync
         run: |

From a014d853a41c01e095390ec0351714c94a66c105 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 29 Mar 2023 15:47:00 +1300
Subject: [PATCH 750/838] Synchronise Device Classes from Home Assistant
 (#4633)

* Synchronise Device Classes from Home Assistant

* Remove count do the `DEVICE_CLASSES` list is also updated

* Format file

---------

Co-authored-by: esphomebot <esphome@nabucasa.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/number/__init__.py | 4 ++++
 esphome/components/sensor/__init__.py | 4 ++++
 esphome/const.py                      | 2 ++
 script/sync-device_class.py           | 8 ++++----
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/esphome/components/number/__init__.py b/esphome/components/number/__init__.py
index 7db973612b..7dce625389 100644
--- a/esphome/components/number/__init__.py
+++ b/esphome/components/number/__init__.py
@@ -31,6 +31,7 @@ from esphome.const import (
     DEVICE_CLASS_DISTANCE,
     DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_ENERGY,
+    DEVICE_CLASS_ENERGY_STORAGE,
     DEVICE_CLASS_FREQUENCY,
     DEVICE_CLASS_GAS,
     DEVICE_CLASS_HUMIDITY,
@@ -59,6 +60,7 @@ from esphome.const import (
     DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_VOLUME,
+    DEVICE_CLASS_VOLUME_STORAGE,
     DEVICE_CLASS_WATER,
     DEVICE_CLASS_WEIGHT,
     DEVICE_CLASS_WIND_SPEED,
@@ -81,6 +83,7 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_DISTANCE,
     DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_ENERGY,
+    DEVICE_CLASS_ENERGY_STORAGE,
     DEVICE_CLASS_FREQUENCY,
     DEVICE_CLASS_GAS,
     DEVICE_CLASS_HUMIDITY,
@@ -109,6 +112,7 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_VOLUME,
+    DEVICE_CLASS_VOLUME_STORAGE,
     DEVICE_CLASS_WATER,
     DEVICE_CLASS_WEIGHT,
     DEVICE_CLASS_WIND_SPEED,
diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index b63e157efb..ac25884697 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -43,6 +43,7 @@ from esphome.const import (
     DEVICE_CLASS_DURATION,
     DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_ENERGY,
+    DEVICE_CLASS_ENERGY_STORAGE,
     DEVICE_CLASS_FREQUENCY,
     DEVICE_CLASS_GAS,
     DEVICE_CLASS_HUMIDITY,
@@ -72,6 +73,7 @@ from esphome.const import (
     DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_VOLUME,
+    DEVICE_CLASS_VOLUME_STORAGE,
     DEVICE_CLASS_WATER,
     DEVICE_CLASS_WEIGHT,
     DEVICE_CLASS_WIND_SPEED,
@@ -97,6 +99,7 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_DURATION,
     DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_ENERGY,
+    DEVICE_CLASS_ENERGY_STORAGE,
     DEVICE_CLASS_FREQUENCY,
     DEVICE_CLASS_GAS,
     DEVICE_CLASS_HUMIDITY,
@@ -126,6 +129,7 @@ DEVICE_CLASSES = [
     DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_VOLUME,
+    DEVICE_CLASS_VOLUME_STORAGE,
     DEVICE_CLASS_WATER,
     DEVICE_CLASS_WEIGHT,
     DEVICE_CLASS_WIND_SPEED,
diff --git a/esphome/const.py b/esphome/const.py
index 7b2fdfc3a4..f627b5abd4 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -946,6 +946,7 @@ DEVICE_CLASS_DOOR = "door"
 DEVICE_CLASS_DURATION = "duration"
 DEVICE_CLASS_EMPTY = ""
 DEVICE_CLASS_ENERGY = "energy"
+DEVICE_CLASS_ENERGY_STORAGE = "energy_storage"
 DEVICE_CLASS_FREQUENCY = "frequency"
 DEVICE_CLASS_GARAGE = "garage"
 DEVICE_CLASS_GARAGE_DOOR = "garage_door"
@@ -1000,6 +1001,7 @@ DEVICE_CLASS_VIBRATION = "vibration"
 DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS = "volatile_organic_compounds"
 DEVICE_CLASS_VOLTAGE = "voltage"
 DEVICE_CLASS_VOLUME = "volume"
+DEVICE_CLASS_VOLUME_STORAGE = "volume_storage"
 DEVICE_CLASS_WATER = "water"
 DEVICE_CLASS_WEIGHT = "weight"
 DEVICE_CLASS_WINDOW = "window"
diff --git a/script/sync-device_class.py b/script/sync-device_class.py
index 882655561b..ae6f4be0c8 100755
--- a/script/sync-device_class.py
+++ b/script/sync-device_class.py
@@ -25,9 +25,9 @@ DOMAINS = {
 
 
 def sub(path, pattern, repl):
-    with open(path, "r") as handle:
+    with open(path) as handle:
         content = handle.read()
-    content = re.sub(pattern, repl, content, flags=re.MULTILINE, count=1)
+    content = re.sub(pattern, repl, content, flags=re.MULTILINE)
     with open(path, "w") as handle:
         handle.write(content)
 
@@ -48,7 +48,7 @@ def main():
     out = ""
     for cls in sorted(classes):
         out += f'DEVICE_CLASS_{cls.upper()} = "{classes[cls]}"\n'
-    sub("esphome/const.py", '(DEVICE_CLASS_\w+ = "\w*"\r?\n)+', out)
+    sub("esphome/const.py", '(DEVICE_CLASS_\\w+ = "\\w*"\r?\n)+', out)
 
     for domain in sorted(allowed):
         # replace imports
@@ -58,7 +58,7 @@ def main():
 
         sub(
             f"esphome/components/{domain}/__init__.py",
-            "(    DEVICE_CLASS_\w+,\r?\n)+",
+            "(    DEVICE_CLASS_\\w+,\r?\n)+",
             out,
         )
 

From b5d0aede381d21ea6683575603805a56fddaf1a8 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 30 Mar 2023 14:08:31 +1300
Subject: [PATCH 751/838] Remove AUTO_LOAD from as3935 (#4630)

---
 esphome/components/as3935/__init__.py |  1 -
 esphome/components/as3935/as3935.cpp  | 14 ++++++++++++--
 esphome/components/as3935/as3935.h    | 23 +++++++++++++++--------
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/esphome/components/as3935/__init__.py b/esphome/components/as3935/__init__.py
index 0951d01e68..cf0580ca62 100644
--- a/esphome/components/as3935/__init__.py
+++ b/esphome/components/as3935/__init__.py
@@ -12,7 +12,6 @@ from esphome.const import (
     CONF_CAPACITANCE,
 )
 
-AUTO_LOAD = ["sensor", "binary_sensor"]
 MULTI_CONF = True
 
 CONF_AS3935_ID = "as3935_id"
diff --git a/esphome/components/as3935/as3935.cpp b/esphome/components/as3935/as3935.cpp
index b36856218a..c5651caee3 100644
--- a/esphome/components/as3935/as3935.cpp
+++ b/esphome/components/as3935/as3935.cpp
@@ -26,9 +26,13 @@ void AS3935Component::setup() {
 void AS3935Component::dump_config() {
   ESP_LOGCONFIG(TAG, "AS3935:");
   LOG_PIN("  Interrupt Pin: ", this->irq_pin_);
+#ifdef USE_BINARY_SENSOR
   LOG_BINARY_SENSOR("  ", "Thunder alert", this->thunder_alert_binary_sensor_);
+#endif
+#ifdef USE_SENSOR
   LOG_SENSOR("  ", "Distance", this->distance_sensor_);
   LOG_SENSOR("  ", "Lightning energy", this->energy_sensor_);
+#endif
 }
 
 float AS3935Component::get_setup_priority() const { return setup_priority::DATA; }
@@ -44,16 +48,22 @@ void AS3935Component::loop() {
     ESP_LOGI(TAG, "Disturber was detected - try increasing the spike rejection value!");
   } else if (int_value == LIGHTNING_INT) {
     ESP_LOGI(TAG, "Lightning has been detected!");
-    if (this->thunder_alert_binary_sensor_ != nullptr)
+#ifdef USE_BINARY_SENSOR
+    if (this->thunder_alert_binary_sensor_ != nullptr) {
       this->thunder_alert_binary_sensor_->publish_state(true);
+      this->set_timeout(10, [this]() { this->thunder_alert_binary_sensor_->publish_state(false); });
+    }
+#endif
+#ifdef USE_SENSOR
     uint8_t distance = this->get_distance_to_storm_();
     if (this->distance_sensor_ != nullptr)
       this->distance_sensor_->publish_state(distance);
+
     uint32_t energy = this->get_lightning_energy_();
     if (this->energy_sensor_ != nullptr)
       this->energy_sensor_->publish_state(energy);
+#endif
   }
-  this->thunder_alert_binary_sensor_->publish_state(false);
 }
 
 void AS3935Component::write_indoor(bool indoor) {
diff --git a/esphome/components/as3935/as3935.h b/esphome/components/as3935/as3935.h
index 2cba9b11a0..a8af703a59 100644
--- a/esphome/components/as3935/as3935.h
+++ b/esphome/components/as3935/as3935.h
@@ -1,9 +1,14 @@
 #pragma once
 
 #include "esphome/core/component.h"
+#include "esphome/core/defines.h"
 #include "esphome/core/hal.h"
+#ifdef USE_SENSOR
 #include "esphome/components/sensor/sensor.h"
+#endif
+#ifdef USE_BINARY_SENSOR
 #include "esphome/components/binary_sensor/binary_sensor.h"
+#endif
 
 namespace esphome {
 namespace as3935 {
@@ -52,6 +57,15 @@ enum AS3935Values {
 };
 
 class AS3935Component : public Component {
+#ifdef USE_SENSOR
+  SUB_SENSOR(distance)
+  SUB_SENSOR(energy)
+#endif
+
+#ifdef USE_BINARY_SENSOR
+  SUB_BINARY_SENSOR(thunder_alert)
+#endif
+
  public:
   void setup() override;
   void dump_config() override;
@@ -59,11 +73,7 @@ class AS3935Component : public Component {
   void loop() override;
 
   void set_irq_pin(GPIOPin *irq_pin) { irq_pin_ = irq_pin; }
-  void set_distance_sensor(sensor::Sensor *distance_sensor) { distance_sensor_ = distance_sensor; }
-  void set_energy_sensor(sensor::Sensor *energy_sensor) { energy_sensor_ = energy_sensor; }
-  void set_thunder_alert_binary_sensor(binary_sensor::BinarySensor *thunder_alert_binary_sensor) {
-    thunder_alert_binary_sensor_ = thunder_alert_binary_sensor;
-  }
+
   void set_indoor(bool indoor) { indoor_ = indoor; }
   void write_indoor(bool indoor);
   void set_noise_level(uint8_t noise_level) { noise_level_ = noise_level; }
@@ -92,9 +102,6 @@ class AS3935Component : public Component {
 
   virtual void write_register(uint8_t reg, uint8_t mask, uint8_t bits, uint8_t start_position) = 0;
 
-  sensor::Sensor *distance_sensor_{nullptr};
-  sensor::Sensor *energy_sensor_{nullptr};
-  binary_sensor::BinarySensor *thunder_alert_binary_sensor_{nullptr};
   GPIOPin *irq_pin_;
 
   bool indoor_;

From a546ffd490d067225b5982e809ff424a54bf3b1d Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 30 Mar 2023 14:08:51 +1300
Subject: [PATCH 752/838] Add ifdef to new bt proxy unsubscribe (#4634)

* Add ifdef to new bt proxy unsubscribe

* Also add to subscribe message and wrap api conneciton code

* Format file
---
 esphome/components/api/api.proto           |  2 ++
 esphome/components/api/api_connection.h    | 15 +++++++++------
 esphome/components/api/api_pb2_service.cpp | 12 ++++++++++++
 esphome/components/api/api_pb2_service.h   | 13 ++++++++++++-
 4 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index fd00317282..e36f0581ca 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -1127,6 +1127,7 @@ message MediaPlayerCommandRequest {
 message SubscribeBluetoothLEAdvertisementsRequest {
   option (id) = 66;
   option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
 }
 
 message BluetoothServiceData {
@@ -1366,6 +1367,7 @@ message BluetoothDeviceUnpairingResponse {
 message UnsubscribeBluetoothLEAdvertisementsRequest {
   option (id) = 87;
   option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
 }
 
 message BluetoothDeviceClearCacheResponse {
diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h
index bc6ae5d7c3..c85c69a2b9 100644
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -97,6 +97,12 @@ class APIConnection : public APIServerConnection {
     this->send_homeassistant_service_response(call);
   }
 #ifdef USE_BLUETOOTH_PROXY
+  void subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) override {
+    this->bluetooth_le_advertisement_subscription_ = true;
+  }
+  void unsubscribe_bluetooth_le_advertisements(const UnsubscribeBluetoothLEAdvertisementsRequest &msg) override {
+    this->bluetooth_le_advertisement_subscription_ = false;
+  }
   bool send_bluetooth_le_advertisement(const BluetoothLEAdvertisementResponse &msg);
 
   void bluetooth_device_request(const BluetoothDeviceRequest &msg) override;
@@ -150,12 +156,7 @@ class APIConnection : public APIServerConnection {
     return {};
   }
   void execute_service(const ExecuteServiceRequest &msg) override;
-  void subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) override {
-    this->bluetooth_le_advertisement_subscription_ = true;
-  }
-  void unsubscribe_bluetooth_le_advertisements(const UnsubscribeBluetoothLEAdvertisementsRequest &msg) override {
-    this->bluetooth_le_advertisement_subscription_ = false;
-  }
+
   bool is_authenticated() override { return this->connection_state_ == ConnectionState::AUTHENTICATED; }
   bool is_connection_setup() override {
     return this->connection_state_ == ConnectionState ::CONNECTED || this->is_authenticated();
@@ -200,7 +201,9 @@ class APIConnection : public APIServerConnection {
   uint32_t last_traffic_;
   bool sent_ping_{false};
   bool service_call_subscription_{false};
+#ifdef USE_BLUETOOTH_PROXY
   bool bluetooth_le_advertisement_subscription_{false};
+#endif
   bool next_close_ = false;
   APIServer *parent_;
   InitialStateIterator initial_state_iterator_;
diff --git a/esphome/components/api/api_pb2_service.cpp b/esphome/components/api/api_pb2_service.cpp
index e613cbcad9..7d019e1d3d 100644
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -329,6 +329,8 @@ bool APIServerConnectionBase::send_media_player_state_response(const MediaPlayer
 #ifdef USE_MEDIA_PLAYER
 #endif
 #ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
 bool APIServerConnectionBase::send_bluetooth_le_advertisement_response(const BluetoothLEAdvertisementResponse &msg) {
 #ifdef HAS_PROTO_MESSAGE_DUMP
   ESP_LOGVV(TAG, "send_bluetooth_le_advertisement_response: %s", msg.dump().c_str());
@@ -442,6 +444,8 @@ bool APIServerConnectionBase::send_bluetooth_device_unpairing_response(const Blu
 }
 #endif
 #ifdef USE_BLUETOOTH_PROXY
+#endif
+#ifdef USE_BLUETOOTH_PROXY
 bool APIServerConnectionBase::send_bluetooth_device_clear_cache_response(const BluetoothDeviceClearCacheResponse &msg) {
 #ifdef HAS_PROTO_MESSAGE_DUMP
   ESP_LOGVV(TAG, "send_bluetooth_device_clear_cache_response: %s", msg.dump().c_str());
@@ -717,12 +721,14 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
       break;
     }
     case 66: {
+#ifdef USE_BLUETOOTH_PROXY
       SubscribeBluetoothLEAdvertisementsRequest msg;
       msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
       ESP_LOGVV(TAG, "on_subscribe_bluetooth_le_advertisements_request: %s", msg.dump().c_str());
 #endif
       this->on_subscribe_bluetooth_le_advertisements_request(msg);
+#endif
       break;
     }
     case 68: {
@@ -814,12 +820,14 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
       break;
     }
     case 87: {
+#ifdef USE_BLUETOOTH_PROXY
       UnsubscribeBluetoothLEAdvertisementsRequest msg;
       msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
       ESP_LOGVV(TAG, "on_unsubscribe_bluetooth_le_advertisements_request: %s", msg.dump().c_str());
 #endif
       this->on_unsubscribe_bluetooth_le_advertisements_request(msg);
+#endif
       break;
     }
     default:
@@ -1082,6 +1090,7 @@ void APIServerConnection::on_media_player_command_request(const MediaPlayerComma
   this->media_player_command(msg);
 }
 #endif
+#ifdef USE_BLUETOOTH_PROXY
 void APIServerConnection::on_subscribe_bluetooth_le_advertisements_request(
     const SubscribeBluetoothLEAdvertisementsRequest &msg) {
   if (!this->is_connection_setup()) {
@@ -1094,6 +1103,7 @@ void APIServerConnection::on_subscribe_bluetooth_le_advertisements_request(
   }
   this->subscribe_bluetooth_le_advertisements(msg);
 }
+#endif
 #ifdef USE_BLUETOOTH_PROXY
 void APIServerConnection::on_bluetooth_device_request(const BluetoothDeviceRequest &msg) {
   if (!this->is_connection_setup()) {
@@ -1202,6 +1212,7 @@ void APIServerConnection::on_subscribe_bluetooth_connections_free_request(
   }
 }
 #endif
+#ifdef USE_BLUETOOTH_PROXY
 void APIServerConnection::on_unsubscribe_bluetooth_le_advertisements_request(
     const UnsubscribeBluetoothLEAdvertisementsRequest &msg) {
   if (!this->is_connection_setup()) {
@@ -1214,6 +1225,7 @@ void APIServerConnection::on_unsubscribe_bluetooth_le_advertisements_request(
   }
   this->unsubscribe_bluetooth_le_advertisements(msg);
 }
+#endif
 
 }  // namespace api
 }  // namespace esphome
diff --git a/esphome/components/api/api_pb2_service.h b/esphome/components/api/api_pb2_service.h
index ad6696176c..457a3d28a9 100644
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -154,8 +154,10 @@ class APIServerConnectionBase : public ProtoService {
 #ifdef USE_MEDIA_PLAYER
   virtual void on_media_player_command_request(const MediaPlayerCommandRequest &value){};
 #endif
+#ifdef USE_BLUETOOTH_PROXY
   virtual void on_subscribe_bluetooth_le_advertisements_request(
       const SubscribeBluetoothLEAdvertisementsRequest &value){};
+#endif
 #ifdef USE_BLUETOOTH_PROXY
   bool send_bluetooth_le_advertisement_response(const BluetoothLEAdvertisementResponse &msg);
 #endif
@@ -216,8 +218,10 @@ class APIServerConnectionBase : public ProtoService {
 #ifdef USE_BLUETOOTH_PROXY
   bool send_bluetooth_device_unpairing_response(const BluetoothDeviceUnpairingResponse &msg);
 #endif
+#ifdef USE_BLUETOOTH_PROXY
   virtual void on_unsubscribe_bluetooth_le_advertisements_request(
       const UnsubscribeBluetoothLEAdvertisementsRequest &value){};
+#endif
 #ifdef USE_BLUETOOTH_PROXY
   bool send_bluetooth_device_clear_cache_response(const BluetoothDeviceClearCacheResponse &msg);
 #endif
@@ -272,7 +276,9 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_MEDIA_PLAYER
   virtual void media_player_command(const MediaPlayerCommandRequest &msg) = 0;
 #endif
+#ifdef USE_BLUETOOTH_PROXY
   virtual void subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) = 0;
+#endif
 #ifdef USE_BLUETOOTH_PROXY
   virtual void bluetooth_device_request(const BluetoothDeviceRequest &msg) = 0;
 #endif
@@ -298,8 +304,9 @@ class APIServerConnection : public APIServerConnectionBase {
   virtual BluetoothConnectionsFreeResponse subscribe_bluetooth_connections_free(
       const SubscribeBluetoothConnectionsFreeRequest &msg) = 0;
 #endif
+#ifdef USE_BLUETOOTH_PROXY
   virtual void unsubscribe_bluetooth_le_advertisements(const UnsubscribeBluetoothLEAdvertisementsRequest &msg) = 0;
-
+#endif
  protected:
   void on_hello_request(const HelloRequest &msg) override;
   void on_connect_request(const ConnectRequest &msg) override;
@@ -346,7 +353,9 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_MEDIA_PLAYER
   void on_media_player_command_request(const MediaPlayerCommandRequest &msg) override;
 #endif
+#ifdef USE_BLUETOOTH_PROXY
   void on_subscribe_bluetooth_le_advertisements_request(const SubscribeBluetoothLEAdvertisementsRequest &msg) override;
+#endif
 #ifdef USE_BLUETOOTH_PROXY
   void on_bluetooth_device_request(const BluetoothDeviceRequest &msg) override;
 #endif
@@ -371,8 +380,10 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_BLUETOOTH_PROXY
   void on_subscribe_bluetooth_connections_free_request(const SubscribeBluetoothConnectionsFreeRequest &msg) override;
 #endif
+#ifdef USE_BLUETOOTH_PROXY
   void on_unsubscribe_bluetooth_le_advertisements_request(
       const UnsubscribeBluetoothLEAdvertisementsRequest &msg) override;
+#endif
 };
 
 }  // namespace api

From 616e0a21d8929672dba62472db3e57089f34f762 Mon Sep 17 00:00:00 2001
From: felixlungu <felix.lungu@gmail.com>
Date: Thu, 30 Mar 2023 04:12:06 +0300
Subject: [PATCH 753/838] add bluetooth mac address in dump_config() (#4628)

* add bluetooth mac address in dump_config()

* Update ble.cpp

* Update ble.cpp

* Update ble.cpp

* Update ble.cpp

* Update ble.cpp

* Update ble.cpp

* Update ble.cpp
---
 esphome/components/esp32_ble/ble.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/esphome/components/esp32_ble/ble.cpp b/esphome/components/esp32_ble/ble.cpp
index 160084b913..502399f97a 100644
--- a/esphome/components/esp32_ble/ble.cpp
+++ b/esphome/components/esp32_ble/ble.cpp
@@ -6,6 +6,7 @@
 
 #include <esp_bt.h>
 #include <esp_bt_main.h>
+#include <esp_bt_device.h>
 #include <esp_gap_ble_api.h>
 #include <freertos/FreeRTOS.h>
 #include <freertos/FreeRTOSConfig.h>
@@ -211,7 +212,16 @@ void ESP32BLE::real_gattc_event_handler_(esp_gattc_cb_event_t event, esp_gatt_if
 
 float ESP32BLE::get_setup_priority() const { return setup_priority::BLUETOOTH; }
 
-void ESP32BLE::dump_config() { ESP_LOGCONFIG(TAG, "ESP32 BLE:"); }
+void ESP32BLE::dump_config() {
+  const uint8_t *mac_address = esp_bt_dev_get_address();
+  if (mac_address) {
+    ESP_LOGCONFIG(TAG, "ESP32 BLE:");
+    ESP_LOGCONFIG(TAG, "  MAC address: %02X:%02X:%02X:%02X:%02X:%02X", mac_address[0], mac_address[1], mac_address[2],
+                  mac_address[3], mac_address[4], mac_address[5]);
+  } else {
+    ESP_LOGCONFIG(TAG, "ESP32 BLE: bluetooth stack is not enabled");
+  }
+}
 
 ESP32BLE *global_ble = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 

From 28534ecc61852068727e8c081b0afabbf888b62f Mon Sep 17 00:00:00 2001
From: kahrendt <kahrendt@gmail.com>
Date: Fri, 31 Mar 2023 00:27:24 -0400
Subject: [PATCH 754/838] Binary map bugfixes (#4636)

* limit configuration to 64 binary sensors to match code limitation

* remove superfluous debug logging

* improve state publishing logic eliminating NAN being sent on boot in certain cases

* adjust type for bitmask shift to match mask variable type
---
 .../binary_sensor_map/binary_sensor_map.cpp   | 29 +++++++------------
 .../components/binary_sensor_map/sensor.py    |  4 +--
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/esphome/components/binary_sensor_map/binary_sensor_map.cpp b/esphome/components/binary_sensor_map/binary_sensor_map.cpp
index b2dffaf74d..3934e0a99c 100644
--- a/esphome/components/binary_sensor_map/binary_sensor_map.cpp
+++ b/esphome/components/binary_sensor_map/binary_sensor_map.cpp
@@ -30,7 +30,7 @@ void BinarySensorMap::process_group_() {
     if (bs.binary_sensor->state) {
       num_active_sensors++;
       total_current_value += bs.sensor_value;
-      mask |= 1 << i;
+      mask |= 1ULL << i;
     }
   }
   // check if the sensor map was touched
@@ -38,12 +38,11 @@ void BinarySensorMap::process_group_() {
     // did the bit_mask change or is it a new sensor touch
     if (this->last_mask_ != mask) {
       float publish_value = total_current_value / num_active_sensors;
-      ESP_LOGD(TAG, "'%s' - Publishing %.2f", this->name_.c_str(), publish_value);
       this->publish_state(publish_value);
     }
   } else if (this->last_mask_ != 0ULL) {
     // is this a new sensor release
-    ESP_LOGD(TAG, "'%s' - No binary sensor active, publishing NAN", this->name_.c_str());
+    ESP_LOGV(TAG, "'%s' - No binary sensor active, publishing NAN", this->name_.c_str());
     this->publish_state(NAN);
   }
   this->last_mask_ = mask;
@@ -52,28 +51,22 @@ void BinarySensorMap::process_group_() {
 void BinarySensorMap::process_sum_() {
   float total_current_value = 0.0;
   uint64_t mask = 0x00;
-  // check all binary_sensors for its state. when active add its value to total_current_value.
-  // create a bitmask for the binary_sensor status on all channels
+  // - check all binary_sensor states
+  // - if active, add its value to total_current_value
+  // - creates a bitmask for the binary_sensor status on all channels
   for (size_t i = 0; i < this->channels_.size(); i++) {
     auto bs = this->channels_[i];
     if (bs.binary_sensor->state) {
       total_current_value += bs.sensor_value;
-      mask |= 1 << i;
+      mask |= 1ULL << i;
     }
   }
-  // check if the sensor map was touched
-  if (mask != 0ULL) {
-    // did the bit_mask change or is it a new sensor touch
-    if (this->last_mask_ != mask) {
-      float publish_value = total_current_value;
-      ESP_LOGD(TAG, "'%s' - Publishing %.2f", this->name_.c_str(), publish_value);
-      this->publish_state(publish_value);
-    }
-  } else if (this->last_mask_ != 0ULL) {
-    // is this a new sensor release
-    ESP_LOGD(TAG, "'%s' - No binary sensor active, publishing 0", this->name_.c_str());
-    this->publish_state(0.0);
+
+  // update state only if the binary sensor states have changed or if no state has ever been sent on boot
+  if ((this->last_mask_ != mask) || (!this->has_state())) {
+    this->publish_state(total_current_value);
   }
+
   this->last_mask_ = mask;
 }
 
diff --git a/esphome/components/binary_sensor_map/sensor.py b/esphome/components/binary_sensor_map/sensor.py
index 025be490cd..573cce9223 100644
--- a/esphome/components/binary_sensor_map/sensor.py
+++ b/esphome/components/binary_sensor_map/sensor.py
@@ -39,7 +39,7 @@ CONFIG_SCHEMA = cv.typed_schema(
         ).extend(
             {
                 cv.Required(CONF_CHANNELS): cv.All(
-                    cv.ensure_list(entry), cv.Length(min=1)
+                    cv.ensure_list(entry), cv.Length(min=1, max=64)
                 ),
             }
         ),
@@ -50,7 +50,7 @@ CONFIG_SCHEMA = cv.typed_schema(
         ).extend(
             {
                 cv.Required(CONF_CHANNELS): cv.All(
-                    cv.ensure_list(entry), cv.Length(min=1)
+                    cv.ensure_list(entry), cv.Length(min=1, max=64)
                 ),
             }
         ),

From 4faa9d109eec8d13cac74f32926237b0087d839a Mon Sep 17 00:00:00 2001
From: Fabian <Fabian-Schmidt@users.noreply.github.com>
Date: Fri, 31 Mar 2023 06:28:49 +0200
Subject: [PATCH 755/838] entity_base avoid padding bytes. (#4637)

Co-authored-by: Your Name <you@example.com>
---
 esphome/core/entity_base.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/core/entity_base.h b/esphome/core/entity_base.h
index 0a53c3fccc..e40a7013bf 100644
--- a/esphome/core/entity_base.h
+++ b/esphome/core/entity_base.h
@@ -54,10 +54,10 @@ class EntityBase {
   void calc_object_id_();
 
   StringRef name_;
-  bool has_own_name_{false};
   const char *object_id_c_str_{nullptr};
   const char *icon_c_str_{nullptr};
   uint32_t object_id_hash_;
+  bool has_own_name_{false};
   bool internal_{false};
   bool disabled_by_default_{false};
   EntityCategory entity_category_{ENTITY_CATEGORY_NONE};

From 79f861f012c7b68e531124411e474081d3491fd8 Mon Sep 17 00:00:00 2001
From: Fabian <Fabian-Schmidt@users.noreply.github.com>
Date: Fri, 31 Mar 2023 06:29:17 +0200
Subject: [PATCH 756/838] Avoid sensor padding. (#4638)

Co-authored-by: Your Name <you@example.com>
---
 esphome/components/sensor/sensor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/sensor/sensor.h b/esphome/components/sensor/sensor.h
index 4308eafb12..efcada1411 100644
--- a/esphome/components/sensor/sensor.h
+++ b/esphome/components/sensor/sensor.h
@@ -161,7 +161,6 @@ class Sensor : public EntityBase {
   CallbackManager<void(float)> raw_callback_;  ///< Storage for raw state callbacks.
   CallbackManager<void(float)> callback_;      ///< Storage for filtered state callbacks.
 
-  bool has_state_{false};
   Filter *filter_list_{nullptr};  ///< Store all active filters.
 
   optional<std::string> unit_of_measurement_;           ///< Unit of measurement override
@@ -169,6 +168,7 @@ class Sensor : public EntityBase {
   optional<std::string> device_class_;                  ///< Device class override
   optional<StateClass> state_class_{STATE_CLASS_NONE};  ///< State class override
   bool force_update_{false};                            ///< Force update mode
+  bool has_state_{false};
 };
 
 }  // namespace sensor

From 9922eb83e2851f23992d021ae59adba5d56d73d7 Mon Sep 17 00:00:00 2001
From: Fabian <Fabian-Schmidt@users.noreply.github.com>
Date: Fri, 31 Mar 2023 06:30:24 +0200
Subject: [PATCH 757/838] Support advanced UART customization (#4465)

* Add methods to get hardware uart details.

* Fix `setRxBufferSize` error.

---------

Co-authored-by: Your Name <you@example.com>
---
 esphome/components/uart/uart_component_esp32_arduino.cpp | 2 +-
 esphome/components/uart/uart_component_esp32_arduino.h   | 3 +++
 esphome/components/uart/uart_component_esp_idf.cpp       | 7 ++++++-
 esphome/components/uart/uart_component_esp_idf.h         | 4 ++++
 esphome/components/uart/uart_component_rp2040.h          | 3 +++
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/esphome/components/uart/uart_component_esp32_arduino.cpp b/esphome/components/uart/uart_component_esp32_arduino.cpp
index 402e41e0b5..8bbbc1a650 100644
--- a/esphome/components/uart/uart_component_esp32_arduino.cpp
+++ b/esphome/components/uart/uart_component_esp32_arduino.cpp
@@ -100,8 +100,8 @@ void ESP32ArduinoUARTComponent::setup() {
     invert = true;
   if (rx_pin_ != nullptr && rx_pin_->is_inverted())
     invert = true;
-  this->hw_serial_->begin(this->baud_rate_, get_config(), rx, tx, invert);
   this->hw_serial_->setRxBufferSize(this->rx_buffer_size_);
+  this->hw_serial_->begin(this->baud_rate_, get_config(), rx, tx, invert);
 }
 
 void ESP32ArduinoUARTComponent::dump_config() {
diff --git a/esphome/components/uart/uart_component_esp32_arduino.h b/esphome/components/uart/uart_component_esp32_arduino.h
index 4a000b12d2..f85c709097 100644
--- a/esphome/components/uart/uart_component_esp32_arduino.h
+++ b/esphome/components/uart/uart_component_esp32_arduino.h
@@ -28,6 +28,9 @@ class ESP32ArduinoUARTComponent : public UARTComponent, public Component {
 
   uint32_t get_config();
 
+  HardwareSerial *get_hw_serial() { return this->hw_serial_; }
+  uint8_t get_hw_serial_number() { return this->number_; }
+
  protected:
   void check_logger_conflict() override;
 
diff --git a/esphome/components/uart/uart_component_esp_idf.cpp b/esphome/components/uart/uart_component_esp_idf.cpp
index 80255ccddf..1560409772 100644
--- a/esphome/components/uart/uart_component_esp_idf.cpp
+++ b/esphome/components/uart/uart_component_esp_idf.cpp
@@ -79,7 +79,12 @@ void IDFUARTComponent::setup() {
     return;
   }
 
-  err = uart_driver_install(this->uart_num_, this->rx_buffer_size_, 0, 0, nullptr, 0);
+  err = uart_driver_install(this->uart_num_, /* UART RX ring buffer size. */ this->rx_buffer_size_,
+                            /* UART TX ring buffer size. If set to zero, driver will not use TX buffer, TX function will
+                               block task until all data have been sent out.*/
+                            0,
+                            /* UART event queue size/depth. */ 20, &(this->uart_event_queue_),
+                            /* Flags used to allocate the interrupt. */ 0);
   if (err != ESP_OK) {
     ESP_LOGW(TAG, "uart_driver_install failed: %s", esp_err_to_name(err));
     this->mark_failed();
diff --git a/esphome/components/uart/uart_component_esp_idf.h b/esphome/components/uart/uart_component_esp_idf.h
index 27fb80d2cc..fdaa4da9a7 100644
--- a/esphome/components/uart/uart_component_esp_idf.h
+++ b/esphome/components/uart/uart_component_esp_idf.h
@@ -23,9 +23,13 @@ class IDFUARTComponent : public UARTComponent, public Component {
   int available() override;
   void flush() override;
 
+  uint8_t get_hw_serial_number() { return this->uart_num_; }
+  QueueHandle_t *get_uart_event_queue() { return &this->uart_event_queue_; }
+
  protected:
   void check_logger_conflict() override;
   uart_port_t uart_num_;
+  QueueHandle_t uart_event_queue_;
   uart_config_t get_config_();
   SemaphoreHandle_t lock_;
 
diff --git a/esphome/components/uart/uart_component_rp2040.h b/esphome/components/uart/uart_component_rp2040.h
index 163315dee7..f26c913cff 100644
--- a/esphome/components/uart/uart_component_rp2040.h
+++ b/esphome/components/uart/uart_component_rp2040.h
@@ -30,6 +30,9 @@ class RP2040UartComponent : public UARTComponent, public Component {
 
   uint16_t get_config();
 
+  bool is_hw_serial() { return this->hw_serial_; }
+  HardwareSerial *get_hw_serial() { return this->serial_; }
+
  protected:
   void check_logger_conflict() override {}
   bool hw_serial_{false};

From 878155a03d5dc912125248c6d4b86d6793068326 Mon Sep 17 00:00:00 2001
From: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com>
Date: Fri, 31 Mar 2023 11:05:28 +0200
Subject: [PATCH 758/838] Log calibration results at level INFO (#4240)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/senseair/senseair.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/senseair/senseair.cpp b/esphome/components/senseair/senseair.cpp
index 7a98584201..e0504eb2b9 100644
--- a/esphome/components/senseair/senseair.cpp
+++ b/esphome/components/senseair/senseair.cpp
@@ -86,7 +86,7 @@ void SenseAirComponent::background_calibration_result() {
   }
 
   // Check if 5th bit (register CI6) is set
-  ESP_LOGD(TAG, "SenseAir Result=%s (%02x%02x%02x %02x%02x %02x%02x)", (response[4] & 0b100000) != 0 ? "OK" : "NOT_OK",
+  ESP_LOGI(TAG, "SenseAir Result=%s (%02x%02x%02x %02x%02x %02x%02x)", (response[4] & 0b100000) != 0 ? "OK" : "NOT_OK",
            response[0], response[1], response[2], response[3], response[4], response[5], response[6]);
 }
 

From d78e9e6aa8929aab3a5d6c600072f99dac831cd9 Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Mon, 3 Apr 2023 21:31:11 +0200
Subject: [PATCH 759/838] Number step not optional (#4649)

* Number step not optional

* Update __init__.py

* Update __init__.py

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/number/__init__.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/esphome/components/number/__init__.py b/esphome/components/number/__init__.py
index 7dce625389..f532f4e405 100644
--- a/esphome/components/number/__init__.py
+++ b/esphome/components/number/__init__.py
@@ -1,4 +1,3 @@
-from typing import Optional
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
@@ -252,9 +251,7 @@ async def register_number(
     )
 
 
-async def new_number(
-    config, *, min_value: float, max_value: float, step: Optional[float] = None
-):
+async def new_number(config, *, min_value: float, max_value: float, step: float):
     var = cg.new_Pvariable(config[CONF_ID])
     await register_number(
         var, config, min_value=min_value, max_value=max_value, step=step

From 99638190cb26a078135d8183825a4317b5a44841 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 4 Apr 2023 07:44:46 +1200
Subject: [PATCH 760/838] VSCode / devcontainer updates (#4647)

---
 .devcontainer/devcontainer.json | 91 ++++++++++++++++++---------------
 .vscode/tasks.json              | 15 ++++--
 script/setup                    |  6 +++
 3 files changed, 67 insertions(+), 45 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1f9a98d7ec..b3fa6d4932 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,53 +4,60 @@
   "postCreateCommand": [
     "script/devcontainer-post-create"
   ],
+  "containerEnv": {
+    "DEVCONTAINER": "1"
+  },
   "runArgs": [
     "--privileged",
     "-e",
     "ESPHOME_DASHBOARD_USE_PING=1"
   ],
   "appPort": 6052,
-  "extensions": [
-    // python
-    "ms-python.python",
-    "visualstudioexptteam.vscodeintellicode",
-    // yaml
-    "redhat.vscode-yaml",
-    // cpp
-    "ms-vscode.cpptools",
-    // editorconfig
-    "editorconfig.editorconfig",
-  ],
-  "settings": {
-    "python.languageServer": "Pylance",
-    "python.pythonPath": "/usr/bin/python3",
-    "python.linting.pylintEnabled": true,
-    "python.linting.enabled": true,
-    "python.formatting.provider": "black",
-    "editor.formatOnPaste": false,
-    "editor.formatOnSave": true,
-    "editor.formatOnType": true,
-    "files.trimTrailingWhitespace": true,
-    "terminal.integrated.defaultProfile.linux": "bash",
-    "yaml.customTags": [
-      "!secret scalar",
-      "!lambda scalar",
-      "!include_dir_named scalar",
-      "!include_dir_list scalar",
-      "!include_dir_merge_list scalar",
-      "!include_dir_merge_named scalar"
-    ],
-    "files.exclude": {
-      "**/.git": true,
-      "**/.DS_Store": true,
-      "**/*.pyc": {
-        "when": "$(basename).py"
-      },
-      "**/__pycache__": true
-    },
-    "files.associations": {
-      "**/.vscode/*.json": "jsonc"
-    },
-    "C_Cpp.clang_format_path": "/usr/bin/clang-format-13",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        // python
+        "ms-python.python",
+        "visualstudioexptteam.vscodeintellicode",
+        // yaml
+        "redhat.vscode-yaml",
+        // cpp
+        "ms-vscode.cpptools",
+        // editorconfig
+        "editorconfig.editorconfig",
+      ],
+      "settings": {
+        "python.languageServer": "Pylance",
+        "python.pythonPath": "/usr/bin/python3",
+        "python.linting.pylintEnabled": true,
+        "python.linting.enabled": true,
+        "python.formatting.provider": "black",
+        "editor.formatOnPaste": false,
+        "editor.formatOnSave": true,
+        "editor.formatOnType": true,
+        "files.trimTrailingWhitespace": true,
+        "terminal.integrated.defaultProfile.linux": "bash",
+        "yaml.customTags": [
+          "!secret scalar",
+          "!lambda scalar",
+          "!include_dir_named scalar",
+          "!include_dir_list scalar",
+          "!include_dir_merge_list scalar",
+          "!include_dir_merge_named scalar"
+        ],
+        "files.exclude": {
+          "**/.git": true,
+          "**/.DS_Store": true,
+          "**/*.pyc": {
+            "when": "$(basename).py"
+          },
+          "**/__pycache__": true
+        },
+        "files.associations": {
+          "**/.vscode/*.json": "jsonc"
+        },
+        "C_Cpp.clang_format_path": "/usr/bin/clang-format-13"
+      }
+    }
   }
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index b6584bc735..307dd496f0 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -2,15 +2,24 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "run",
+      "label": "Run Dashboard",
       "type": "shell",
-      "command": "python3 -m esphome dashboard config/",
+      "command": "${command:python.interpreterPath}",
+      "args": [
+        "-m",
+        "esphome",
+        "dashboard",
+        "config/"
+      ],
       "problemMatcher": []
     },
     {
       "label": "clang-tidy",
       "type": "shell",
-      "command": "./script/clang-tidy",
+      "command": "${command:python.interpreterPath}",
+      "args": [
+        "./script/clang-tidy"
+      ],
       "problemMatcher": [
         {
           "owner": "clang-tidy",
diff --git a/script/setup b/script/setup
index 71828deeaa..c650960f05 100755
--- a/script/setup
+++ b/script/setup
@@ -4,6 +4,12 @@
 set -e
 
 cd "$(dirname "$0")/.."
+
+if [ ! -n "$DEVCONTAINER" ] && [ ! -n "$VIRTUAL_ENV" ]; then
+  python3 -m venv venv
+  source venv/bin/activate
+fi
+
 pip3 install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
 pip3 install --no-use-pep517 -e .
 

From fbc129ccccbdb8ed9495903c8dc7a7334c909197 Mon Sep 17 00:00:00 2001
From: tracestep <16390082+tracestep@users.noreply.github.com>
Date: Mon, 3 Apr 2023 19:23:31 -0300
Subject: [PATCH 761/838] Version retry (fixes esphome/issues#3823) (#4651)

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

diff --git a/esphome/components/pn532/pn532.cpp b/esphome/components/pn532/pn532.cpp
index 7ebf328cff..dc831ef6e0 100644
--- a/esphome/components/pn532/pn532.cpp
+++ b/esphome/components/pn532/pn532.cpp
@@ -19,9 +19,12 @@ void PN532::setup() {
 
   // Get version data
   if (!this->write_command_({PN532_COMMAND_VERSION_DATA})) {
-    ESP_LOGE(TAG, "Error sending version command");
-    this->mark_failed();
-    return;
+    ESP_LOGW(TAG, "Error sending version command, trying again...");
+    if (!this->write_command_({PN532_COMMAND_VERSION_DATA})) {
+      ESP_LOGE(TAG, "Error sending version command");
+      this->mark_failed();
+      return;
+    }
   }
 
   std::vector<uint8_t> version_data;

From 9c9bc58c16a435fedb46d115a98debe8c35acaf7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 11:55:00 +1200
Subject: [PATCH 762/838] Bump pylint from 2.16.4 to 2.17.2 (#4650)

* Bump pylint from 2.16.4 to 2.17.2

Bumps [pylint](https://github.com/PyCQA/pylint) from 2.16.4 to 2.17.2.
- [Release notes](https://github.com/PyCQA/pylint/releases)
- [Commits](https://github.com/PyCQA/pylint/compare/v2.16.4...v2.17.2)

---
updated-dependencies:
- dependency-name: pylint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Add return 0 to run_miniterm

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/__main__.py   | 2 ++
 requirements_test.txt | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index 24c2ce1d13..78320a05f0 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -152,6 +152,8 @@ def run_miniterm(config, port):
         _LOGGER.error("Could not connect to serial port %s", port)
         return 1
 
+    return 0
+
 
 def wrap_to_code(name, comp):
     coro = coroutine(comp.to_code)
diff --git a/requirements_test.txt b/requirements_test.txt
index 3e59023d20..b2c60b3db3 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,4 +1,4 @@
-pylint==2.16.4
+pylint==2.17.2
 flake8==6.0.0  # also change in .pre-commit-config.yaml when updating
 black==23.1.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.3.1  # also change in .pre-commit-config.yaml when updating

From 42401775e1920431e71804913dda31d6bcdbe94d Mon Sep 17 00:00:00 2001
From: Ben Hoff <hoff.benjamin.k@gmail.com>
Date: Mon, 3 Apr 2023 22:34:14 -0400
Subject: [PATCH 763/838] Added in mmc5603 code (#4175)

* added in mmc5603 code

* added in codeowner

* fix linter errors

* whitespace linter errors

* added codeowner

* clang format

* remove clang format from python code

* fix whitespace

* add tests

* fix test

* make requested edits

* remove status manipulation

---------

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

diff --git a/CODEOWNERS b/CODEOWNERS
index c006db2a6a..76156db6e6 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -159,6 +159,7 @@ esphome/components/midea/* @dudanov
 esphome/components/midea_ir/* @dudanov
 esphome/components/mitsubishi/* @RubyBailey
 esphome/components/mlx90393/* @functionpointer
+esphome/components/mmc5603/* @benhoff
 esphome/components/modbus_controller/* @martgras
 esphome/components/modbus_controller/binary_sensor/* @martgras
 esphome/components/modbus_controller/number/* @martgras
diff --git a/esphome/components/mmc5603/__init__.py b/esphome/components/mmc5603/__init__.py
new file mode 100644
index 0000000000..cc88f26231
--- /dev/null
+++ b/esphome/components/mmc5603/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@benhoff"]
diff --git a/esphome/components/mmc5603/mmc5603.cpp b/esphome/components/mmc5603/mmc5603.cpp
new file mode 100644
index 0000000000..6fbf4810f2
--- /dev/null
+++ b/esphome/components/mmc5603/mmc5603.cpp
@@ -0,0 +1,162 @@
+#include "mmc5603.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace mmc5603 {
+
+static const char *const TAG = "mmc5603";
+static const uint8_t MMC5603_ADDRESS = 0x30;
+static const uint8_t MMC56X3_PRODUCT_ID = 0x39;
+
+static const uint8_t MMC56X3_DEFAULT_ADDRESS = 0x30;
+static const uint8_t MMC56X3_CHIP_ID = 0x10;
+
+static const uint8_t MMC56X3_ADDR_XOUT0 = 0x00;
+static const uint8_t MMC56X3_ADDR_XOUT1 = 0x01;
+static const uint8_t MMC56X3_ADDR_XOUT2 = 0x06;
+
+static const uint8_t MMC56X3_ADDR_YOUT0 = 0x02;
+static const uint8_t MMC56X3_ADDR_YOUT1 = 0x03;
+static const uint8_t MMC56X3_ADDR_YOUT2 = 0x07;
+
+static const uint8_t MMC56X3_ADDR_ZOUT0 = 0x04;
+static const uint8_t MMC56X3_ADDR_ZOUT1 = 0x05;
+static const uint8_t MMC56X3_ADDR_ZOUT2 = 0x08;
+
+static const uint8_t MMC56X3_OUT_TEMP = 0x09;
+static const uint8_t MMC56X3_STATUS_REG = 0x18;
+static const uint8_t MMC56X3_CTRL0_REG = 0x1B;
+static const uint8_t MMC56X3_CTRL1_REG = 0x1C;
+static const uint8_t MMC56X3_CTRL2_REG = 0x1D;
+static const uint8_t MMC5603_ODR_REG = 0x1A;
+
+void MMC5603Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up MMC5603...");
+  uint8_t id = 0;
+  if (!this->read_byte(MMC56X3_PRODUCT_ID, &id)) {
+    this->error_code_ = COMMUNICATION_FAILED;
+    this->mark_failed();
+    return;
+  }
+
+  if (id != MMC56X3_CHIP_ID) {
+    ESP_LOGCONFIG(TAG, "Chip Wrong");
+    this->error_code_ = ID_REGISTERS;
+    this->mark_failed();
+    return;
+  }
+
+  if (!this->write_byte(MMC56X3_CTRL1_REG, 0x80)) {  // turn on set bit
+    ESP_LOGCONFIG(TAG, "Control 1 Failed for set bit");
+    this->error_code_ = COMMUNICATION_FAILED;
+    this->mark_failed();
+    return;
+  }
+
+  if (!this->write_byte(MMC56X3_CTRL0_REG, 0x08)) {  // turn on set bit
+    ESP_LOGCONFIG(TAG, "Control 0 Failed for set bit");
+    this->error_code_ = COMMUNICATION_FAILED;
+    this->mark_failed();
+    return;
+  }
+
+  if (!this->write_byte(MMC56X3_CTRL0_REG, 0x10)) {
+    this->error_code_ = COMMUNICATION_FAILED;
+    this->mark_failed();
+    return;
+  }
+
+  uint8_t ctrl_2 = 0;
+
+  ctrl_2 &= ~0x10;  // turn off cmm_en bit
+  if (!this->write_byte(MMC56X3_CTRL2_REG, ctrl_2)) {
+    this->error_code_ = COMMUNICATION_FAILED;
+    this->mark_failed();
+    return;
+  }
+}
+void MMC5603Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "MMC5603:");
+  LOG_I2C_DEVICE(this);
+  if (this->error_code_ == COMMUNICATION_FAILED) {
+    ESP_LOGE(TAG, "Communication with MMC5603 failed!");
+  } else if (this->error_code_ == ID_REGISTERS) {
+    ESP_LOGE(TAG, "The ID registers don't match - Is this really an MMC5603?");
+  }
+  LOG_UPDATE_INTERVAL(this);
+
+  LOG_SENSOR("  ", "X Axis", this->x_sensor_);
+  LOG_SENSOR("  ", "Y Axis", this->y_sensor_);
+  LOG_SENSOR("  ", "Z Axis", this->z_sensor_);
+  LOG_SENSOR("  ", "Heading", this->heading_sensor_);
+}
+
+float MMC5603Component::get_setup_priority() const { return setup_priority::DATA; }
+
+void MMC5603Component::update() {
+  if (!this->write_byte(MMC56X3_CTRL0_REG, 0x01)) {
+    this->status_set_warning();
+    return;
+  }
+  uint8_t status = 0;
+  if (!this->read_byte(MMC56X3_STATUS_REG, &status)) {
+    this->status_set_warning();
+    return;
+  }
+
+  uint8_t buffer[9] = {0};
+
+  if (!this->read_byte(MMC56X3_ADDR_XOUT0, &buffer[0]) || !this->read_byte(MMC56X3_ADDR_XOUT1, &buffer[1]) ||
+      !this->read_byte(MMC56X3_ADDR_XOUT2, &buffer[2])) {
+    this->status_set_warning();
+    return;
+  }
+
+  if (!this->read_byte(MMC56X3_ADDR_YOUT0, &buffer[3]) || !this->read_byte(MMC56X3_ADDR_YOUT1, &buffer[4]) ||
+      !this->read_byte(MMC56X3_ADDR_YOUT2, &buffer[5])) {
+    this->status_set_warning();
+    return;
+  }
+
+  if (!this->read_byte(MMC56X3_ADDR_ZOUT0, &buffer[6]) || !this->read_byte(MMC56X3_ADDR_ZOUT1, &buffer[7]) ||
+      !this->read_byte(MMC56X3_ADDR_ZOUT2, &buffer[8])) {
+    this->status_set_warning();
+    return;
+  }
+
+  int32_t raw_x = 0;
+  raw_x |= buffer[0] << 12;
+  raw_x |= buffer[1] << 4;
+  raw_x |= buffer[2] << 0;
+
+  const float x = 0.0625 * (raw_x - 524288);
+
+  int32_t raw_y = 0;
+  raw_y |= buffer[3] << 12;
+  raw_y |= buffer[4] << 4;
+  raw_y |= buffer[5] << 0;
+
+  const float y = 0.0625 * (raw_y - 524288);
+
+  int32_t raw_z = 0;
+  raw_z |= buffer[6] << 12;
+  raw_z |= buffer[7] << 4;
+  raw_z |= buffer[8] << 0;
+
+  const float z = 0.0625 * (raw_z - 524288);
+
+  const float heading = atan2f(0.0f - x, y) * 180.0f / M_PI;
+  ESP_LOGD(TAG, "Got x=%0.02fµT y=%0.02fµT z=%0.02fµT heading=%0.01f°", x, y, z, heading);
+
+  if (this->x_sensor_ != nullptr)
+    this->x_sensor_->publish_state(x);
+  if (this->y_sensor_ != nullptr)
+    this->y_sensor_->publish_state(y);
+  if (this->z_sensor_ != nullptr)
+    this->z_sensor_->publish_state(z);
+  if (this->heading_sensor_ != nullptr)
+    this->heading_sensor_->publish_state(heading);
+}
+
+}  // namespace mmc5603
+}  // namespace esphome
diff --git a/esphome/components/mmc5603/mmc5603.h b/esphome/components/mmc5603/mmc5603.h
new file mode 100644
index 0000000000..cd0893053c
--- /dev/null
+++ b/esphome/components/mmc5603/mmc5603.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace mmc5603 {
+
+enum MMC5603Datarate {
+  MMC5603_DATARATE_75_0_HZ,
+  MMC5603_DATARATE_150_0_HZ,
+  MMC5603_DATARATE_255_0_HZ,
+};
+
+class MMC5603Component : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void update() override;
+
+  void set_datarate(MMC5603Datarate datarate) { datarate_ = datarate; }
+  void set_x_sensor(sensor::Sensor *x_sensor) { x_sensor_ = x_sensor; }
+  void set_y_sensor(sensor::Sensor *y_sensor) { y_sensor_ = y_sensor; }
+  void set_z_sensor(sensor::Sensor *z_sensor) { z_sensor_ = z_sensor; }
+  void set_heading_sensor(sensor::Sensor *heading_sensor) { heading_sensor_ = heading_sensor; }
+
+ protected:
+  MMC5603Datarate datarate_;
+  sensor::Sensor *x_sensor_{nullptr};
+  sensor::Sensor *y_sensor_{nullptr};
+  sensor::Sensor *z_sensor_{nullptr};
+  sensor::Sensor *heading_sensor_{nullptr};
+  enum ErrorCode {
+    NONE = 0,
+    COMMUNICATION_FAILED,
+    ID_REGISTERS,
+  } error_code_;
+};
+
+}  // namespace mmc5603
+}  // namespace esphome
diff --git a/esphome/components/mmc5603/sensor.py b/esphome/components/mmc5603/sensor.py
new file mode 100644
index 0000000000..348a0e7dcc
--- /dev/null
+++ b/esphome/components/mmc5603/sensor.py
@@ -0,0 +1,91 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import (
+    CONF_ADDRESS,
+    CONF_ID,
+    ICON_MAGNET,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_MICROTESLA,
+    UNIT_DEGREES,
+    ICON_SCREEN_ROTATION,
+    CONF_UPDATE_INTERVAL,
+)
+
+DEPENDENCIES = ["i2c"]
+
+mmc5603_ns = cg.esphome_ns.namespace("mmc5603")
+
+CONF_FIELD_STRENGTH_X = "field_strength_x"
+CONF_FIELD_STRENGTH_Y = "field_strength_y"
+CONF_FIELD_STRENGTH_Z = "field_strength_z"
+CONF_HEADING = "heading"
+
+MMC5603Component = mmc5603_ns.class_(
+    "MMC5603Component", cg.PollingComponent, i2c.I2CDevice
+)
+
+
+MMC5603Datarate = mmc5603_ns.enum("MMC5603Datarate")
+MMC5603Datarates = {
+    75: MMC5603Datarate.MMC5603_DATARATE_75_0_HZ,
+    150: MMC5603Datarate.MMC5603_DATARATE_150_0_HZ,
+    255: MMC5603Datarate.MMC5603_DATARATE_255_0_HZ,
+}
+
+
+field_strength_schema = sensor.sensor_schema(
+    unit_of_measurement=UNIT_MICROTESLA,
+    icon=ICON_MAGNET,
+    accuracy_decimals=1,
+    state_class=STATE_CLASS_MEASUREMENT,
+)
+heading_schema = sensor.sensor_schema(
+    unit_of_measurement=UNIT_DEGREES,
+    icon=ICON_SCREEN_ROTATION,
+    accuracy_decimals=1,
+)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(MMC5603Component),
+            cv.Optional(CONF_ADDRESS): cv.i2c_address,
+            cv.Optional(CONF_FIELD_STRENGTH_X): field_strength_schema,
+            cv.Optional(CONF_FIELD_STRENGTH_Y): field_strength_schema,
+            cv.Optional(CONF_FIELD_STRENGTH_Z): field_strength_schema,
+            cv.Optional(CONF_HEADING): heading_schema,
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x1E))
+)
+
+
+def auto_data_rate(config):
+    interval_msec = config[CONF_UPDATE_INTERVAL].total_milliseconds
+    interval_hz = 1000.0 / interval_msec
+    for datarate in sorted(MMC5603Datarates.keys()):
+        if float(datarate) >= interval_hz:
+            return MMC5603Datarates[datarate]
+    return MMC5603Datarates[75]
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
+
+    cg.add(var.set_datarate(auto_data_rate(config)))
+    if CONF_FIELD_STRENGTH_X in config:
+        sens = await sensor.new_sensor(config[CONF_FIELD_STRENGTH_X])
+        cg.add(var.set_x_sensor(sens))
+    if CONF_FIELD_STRENGTH_Y in config:
+        sens = await sensor.new_sensor(config[CONF_FIELD_STRENGTH_Y])
+        cg.add(var.set_y_sensor(sens))
+    if CONF_FIELD_STRENGTH_Z in config:
+        sens = await sensor.new_sensor(config[CONF_FIELD_STRENGTH_Z])
+        cg.add(var.set_z_sensor(sens))
+    if CONF_HEADING in config:
+        sens = await sensor.new_sensor(config[CONF_HEADING])
+        cg.add(var.set_heading_sensor(sens))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 5be6395729..c2a2ed5c95 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -831,6 +831,15 @@ sensor:
     temperature:
       name: MPU6886 Temperature
     i2c_id: i2c_bus
+  - platform: mmc5603
+    address: 0x30
+    field_strength_x:
+      name: HMC5883L Field Strength X
+    field_strength_y:
+      name: HMC5883L Field Strength Y
+    field_strength_z:
+      name: HMC5883L Field Strength Z
+    i2c_id: i2c_bus
   - platform: dps310
     temperature:
       name: DPS310 Temperature

From b56fa8c50aa302ec8bbfa4b7e29d65118636f79b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 14:34:36 +1200
Subject: [PATCH 764/838] Bump black from 23.1.0 to 23.3.0 (#4635)

* Bump black from 23.1.0 to 23.3.0

Bumps [black](https://github.com/psf/black) from 23.1.0 to 23.3.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/compare/23.1.0...23.3.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update black in pre-commit

---------

Signed-off-by: dependabot[bot] <support@github.com>
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 | 4 ++--
 requirements_test.txt   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0de82cf2de..be82fc826b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,8 +2,8 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
-  - repo: https://github.com/ambv/black
-    rev: 23.1.0
+  - repo: https://github.com/psf/black
+    rev: 23.3.0
     hooks:
       - id: black
         args:
diff --git a/requirements_test.txt b/requirements_test.txt
index b2c60b3db3..cbd0a75d8f 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,6 +1,6 @@
 pylint==2.17.2
 flake8==6.0.0  # also change in .pre-commit-config.yaml when updating
-black==23.1.0  # also change in .pre-commit-config.yaml when updating
+black==23.3.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.3.1  # also change in .pre-commit-config.yaml when updating
 pre-commit
 

From 421ebcc8b2467f1603bdde9a280559c484157037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Mon, 10 Apr 2023 23:20:02 +0100
Subject: [PATCH 765/838] use PRIx macros for printing u32/i32 ints (#4671)

This fix compilation issues with the latest esp-idf.
---
 esphome/components/api/api_connection.cpp     |  3 ++-
 esphome/components/api/proto.cpp              | 19 ++++++++++---------
 esphome/components/esp32/gpio.cpp             |  3 ++-
 esphome/components/esp32/preferences.cpp      |  3 ++-
 esphome/components/i2c/i2c_bus_esp_idf.cpp    |  3 ++-
 esphome/components/logger/logger.cpp          |  3 ++-
 esphome/components/wifi/wifi_component.cpp    |  3 ++-
 .../wifi/wifi_component_esp_idf.cpp           |  3 ++-
 esphome/core/scheduler.cpp                    |  5 +++--
 9 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 77ba96291a..104560771e 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -1,5 +1,6 @@
 #include "api_connection.h"
 #include <cerrno>
+#include <cinttypes>
 #include "esphome/components/network/util.h"
 #include "esphome/core/entity_base.h"
 #include "esphome/core/hal.h"
@@ -911,7 +912,7 @@ HelloResponse APIConnection::hello(const HelloRequest &msg) {
   this->helper_->set_log_info(client_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 %d.%d", this->client_info_.c_str(),
+  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_);
 
   HelloResponse resp;
diff --git a/esphome/components/api/proto.cpp b/esphome/components/api/proto.cpp
index ca7a4c0887..7af2e92534 100644
--- a/esphome/components/api/proto.cpp
+++ b/esphome/components/api/proto.cpp
@@ -1,4 +1,5 @@
 #include "proto.h"
+#include <cinttypes>
 #include "esphome/core/log.h"
 
 namespace esphome {
@@ -13,7 +14,7 @@ void ProtoMessage::decode(const uint8_t *buffer, size_t length) {
     uint32_t consumed;
     auto res = ProtoVarInt::parse(&buffer[i], length - i, &consumed);
     if (!res.has_value()) {
-      ESP_LOGV(TAG, "Invalid field start at %u", i);
+      ESP_LOGV(TAG, "Invalid field start at %" PRIu32, i);
       break;
     }
 
@@ -25,12 +26,12 @@ void ProtoMessage::decode(const uint8_t *buffer, size_t length) {
       case 0: {  // VarInt
         res = ProtoVarInt::parse(&buffer[i], length - i, &consumed);
         if (!res.has_value()) {
-          ESP_LOGV(TAG, "Invalid VarInt at %u", i);
+          ESP_LOGV(TAG, "Invalid VarInt at %" PRIu32, i);
           error = true;
           break;
         }
         if (!this->decode_varint(field_id, *res)) {
-          ESP_LOGV(TAG, "Cannot decode VarInt field %u with value %u!", field_id, res->as_uint32());
+          ESP_LOGV(TAG, "Cannot decode VarInt field %" PRIu32 " with value %" PRIu32 "!", field_id, res->as_uint32());
         }
         i += consumed;
         break;
@@ -38,38 +39,38 @@ void ProtoMessage::decode(const uint8_t *buffer, size_t length) {
       case 2: {  // Length-delimited
         res = ProtoVarInt::parse(&buffer[i], length - i, &consumed);
         if (!res.has_value()) {
-          ESP_LOGV(TAG, "Invalid Length Delimited at %u", i);
+          ESP_LOGV(TAG, "Invalid Length Delimited at %" PRIu32, i);
           error = true;
           break;
         }
         uint32_t field_length = res->as_uint32();
         i += consumed;
         if (field_length > length - i) {
-          ESP_LOGV(TAG, "Out-of-bounds Length Delimited at %u", i);
+          ESP_LOGV(TAG, "Out-of-bounds Length Delimited at %" PRIu32, i);
           error = true;
           break;
         }
         if (!this->decode_length(field_id, ProtoLengthDelimited(&buffer[i], field_length))) {
-          ESP_LOGV(TAG, "Cannot decode Length Delimited field %u!", field_id);
+          ESP_LOGV(TAG, "Cannot decode Length Delimited field %" PRIu32 "!", field_id);
         }
         i += field_length;
         break;
       }
       case 5: {  // 32-bit
         if (length - i < 4) {
-          ESP_LOGV(TAG, "Out-of-bounds Fixed32-bit at %u", i);
+          ESP_LOGV(TAG, "Out-of-bounds Fixed32-bit at %" PRIu32, i);
           error = true;
           break;
         }
         uint32_t val = encode_uint32(buffer[i + 3], buffer[i + 2], buffer[i + 1], buffer[i]);
         if (!this->decode_32bit(field_id, Proto32Bit(val))) {
-          ESP_LOGV(TAG, "Cannot decode 32-bit field %u with value %u!", field_id, val);
+          ESP_LOGV(TAG, "Cannot decode 32-bit field %" PRIu32 " with value %" PRIu32 "!", field_id, val);
         }
         i += 4;
         break;
       }
       default:
-        ESP_LOGV(TAG, "Invalid field type at %u", i);
+        ESP_LOGV(TAG, "Invalid field type at %" PRIu32, i);
         error = true;
         break;
     }
diff --git a/esphome/components/esp32/gpio.cpp b/esphome/components/esp32/gpio.cpp
index aafdf80726..7896597d3e 100644
--- a/esphome/components/esp32/gpio.cpp
+++ b/esphome/components/esp32/gpio.cpp
@@ -2,6 +2,7 @@
 
 #include "gpio.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace esp32 {
@@ -74,7 +75,7 @@ void ESP32InternalGPIOPin::attach_interrupt(void (*func)(void *), void *arg, gpi
 
 std::string ESP32InternalGPIOPin::dump_summary() const {
   char buffer[32];
-  snprintf(buffer, sizeof(buffer), "GPIO%u", static_cast<uint32_t>(pin_));
+  snprintf(buffer, sizeof(buffer), "GPIO%" PRIu32, static_cast<uint32_t>(pin_));
   return buffer;
 }
 
diff --git a/esphome/components/esp32/preferences.cpp b/esphome/components/esp32/preferences.cpp
index 6a6305cf87..f90b8a4603 100644
--- a/esphome/components/esp32/preferences.cpp
+++ b/esphome/components/esp32/preferences.cpp
@@ -5,6 +5,7 @@
 #include "esphome/core/log.h"
 #include <nvs_flash.h>
 #include <cstring>
+#include <cinttypes>
 #include <vector>
 #include <string>
 
@@ -101,7 +102,7 @@ class ESP32Preferences : public ESPPreferences {
     pref->nvs_handle = nvs_handle;
 
     uint32_t keyval = type;
-    pref->key = str_sprintf("%u", keyval);
+    pref->key = str_sprintf("%" PRIu32, keyval);
 
     return ESPPreferenceObject(pref);
   }
diff --git a/esphome/components/i2c/i2c_bus_esp_idf.cpp b/esphome/components/i2c/i2c_bus_esp_idf.cpp
index 1e2a7304f2..5178f6d4f2 100644
--- a/esphome/components/i2c/i2c_bus_esp_idf.cpp
+++ b/esphome/components/i2c/i2c_bus_esp_idf.cpp
@@ -5,6 +5,7 @@
 #include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
 #include <cstring>
+#include <cinttypes>
 
 namespace esphome {
 namespace i2c {
@@ -47,7 +48,7 @@ void IDFI2CBus::dump_config() {
   ESP_LOGCONFIG(TAG, "I2C Bus:");
   ESP_LOGCONFIG(TAG, "  SDA Pin: GPIO%u", this->sda_pin_);
   ESP_LOGCONFIG(TAG, "  SCL Pin: GPIO%u", this->scl_pin_);
-  ESP_LOGCONFIG(TAG, "  Frequency: %u Hz", this->frequency_);
+  ESP_LOGCONFIG(TAG, "  Frequency: %" PRIu32 " Hz", this->frequency_);
   switch (this->recovery_result_) {
     case RECOVERY_COMPLETED:
       ESP_LOGCONFIG(TAG, "  Recovery: bus successfully recovered");
diff --git a/esphome/components/logger/logger.cpp b/esphome/components/logger/logger.cpp
index 8a3c6a951d..c77e280711 100644
--- a/esphome/components/logger/logger.cpp
+++ b/esphome/components/logger/logger.cpp
@@ -1,4 +1,5 @@
 #include "logger.h"
+#include <cinttypes>
 
 #ifdef USE_ESP_IDF
 #include <driver/uart.h>
@@ -292,7 +293,7 @@ const char *const UART_SELECTIONS[] = {"UART0", "UART1", "USB_CDC"};
 void Logger::dump_config() {
   ESP_LOGCONFIG(TAG, "Logger:");
   ESP_LOGCONFIG(TAG, "  Level: %s", LOG_LEVELS[ESPHOME_LOG_LEVEL]);
-  ESP_LOGCONFIG(TAG, "  Log Baud Rate: %u", this->baud_rate_);
+  ESP_LOGCONFIG(TAG, "  Log Baud Rate: %" PRIu32, this->baud_rate_);
   ESP_LOGCONFIG(TAG, "  Hardware UART: %s", UART_SELECTIONS[this->uart_]);
   for (auto &it : this->log_levels_) {
     ESP_LOGCONFIG(TAG, "  Level for '%s': %s", it.tag.c_str(), LOG_LEVELS[it.level]);
diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index d4636c81cd..efb1af171d 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -1,4 +1,5 @@
 #include "wifi_component.h"
+#include <cinttypes>
 
 #if defined(USE_ESP32) || defined(USE_ESP_IDF)
 #include <esp_wifi.h>
@@ -370,7 +371,7 @@ void WiFiComponent::print_connect_params_() {
   if (this->selected_ap_.get_bssid().has_value()) {
     ESP_LOGV(TAG, "  Priority: %.1f", this->get_sta_priority(*this->selected_ap_.get_bssid()));
   }
-  ESP_LOGCONFIG(TAG, "  Channel: %d", wifi_channel_());
+  ESP_LOGCONFIG(TAG, "  Channel: %" PRId32, wifi_channel_());
   ESP_LOGCONFIG(TAG, "  Subnet: %s", wifi_subnet_mask_().str().c_str());
   ESP_LOGCONFIG(TAG, "  Gateway: %s", wifi_gateway_ip_().str().c_str());
   ESP_LOGCONFIG(TAG, "  DNS1: %s", wifi_dns_ip_(0).str().c_str());
diff --git a/esphome/components/wifi/wifi_component_esp_idf.cpp b/esphome/components/wifi/wifi_component_esp_idf.cpp
index 0f3c3a0ca8..1edde74743 100644
--- a/esphome/components/wifi/wifi_component_esp_idf.cpp
+++ b/esphome/components/wifi/wifi_component_esp_idf.cpp
@@ -11,6 +11,7 @@
 #include <esp_event.h>
 #include <esp_netif.h>
 
+#include <cinttypes>
 #include <utility>
 #include <algorithm>
 #ifdef USE_WIFI_WPA2_EAP
@@ -666,7 +667,7 @@ void WiFiComponent::wifi_process_event_(IDFWiFiEvent *data) {
 
   } else if (data->event_base == WIFI_EVENT && data->event_id == WIFI_EVENT_SCAN_DONE) {
     const auto &it = data->data.sta_scan_done;
-    ESP_LOGV(TAG, "Event: WiFi Scan Done status=%u number=%u scan_id=%u", it.status, it.number, it.scan_id);
+    ESP_LOGV(TAG, "Event: WiFi Scan Done status=%" PRIu32 " number=%u scan_id=%u", it.status, it.number, it.scan_id);
 
     scan_result_.clear();
     this->scan_done_ = true;
diff --git a/esphome/core/scheduler.cpp b/esphome/core/scheduler.cpp
index 0cb148ec13..7c76c8490b 100644
--- a/esphome/core/scheduler.cpp
+++ b/esphome/core/scheduler.cpp
@@ -3,6 +3,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/hal.h"
 #include <algorithm>
+#include <cinttypes>
 
 namespace esphome {
 
@@ -194,8 +195,8 @@ void HOT Scheduler::call() {
 
     // The following should not happen unless I'm missing something
     if (to_remove_ != 0) {
-      ESP_LOGW(TAG, "to_remove_ was %u now: %u items where %zu now %zu. Please report this", to_remove_was, to_remove_,
-               items_was, items_.size());
+      ESP_LOGW(TAG, "to_remove_ was %" PRIu32 " now: %" PRIu32 " items where %zu now %zu. Please report this",
+               to_remove_was, to_remove_, items_was, items_.size());
       to_remove_ = 0;
     }
   }

From 888ac2e1802165965d99e9bb7537b772bb8c4a98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Apr 2023 10:29:22 +1200
Subject: [PATCH 766/838] Bump zeroconf from 0.47.4 to 0.56.0 (#4674)

Bumps [zeroconf](https://github.com/python-zeroconf/python-zeroconf) from 0.47.4 to 0.56.0.
- [Release notes](https://github.com/python-zeroconf/python-zeroconf/releases)
- [Changelog](https://github.com/python-zeroconf/python-zeroconf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/python-zeroconf/python-zeroconf/compare/0.47.4...0.56.0)

---
updated-dependencies:
- dependency-name: zeroconf
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
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 5b37be15ae..5a57342189 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ esptool==4.5.1
 click==8.1.3
 esphome-dashboard==20230214.0
 aioesphomeapi==13.5.1
-zeroconf==0.47.4
+zeroconf==0.56.0
 
 # esp-idf requires this, but doesn't bundle it by default
 # https://github.com/espressif/esp-idf/blob/220590d599e134d7a5e7f1e683cc4550349ffbf8/requirements.txt#L24

From 80bc567c31f0b2e71e4b8750143e05d1a41de568 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Apr 2023 22:29:40 +0000
Subject: [PATCH 767/838] Bump pytest from 7.2.2 to 7.3.0 (#4673)

Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.2.2 to 7.3.0.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.2.2...7.3.0)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
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 cbd0a75d8f..b063dd2797 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -5,7 +5,7 @@ pyupgrade==3.3.1  # also change in .pre-commit-config.yaml when updating
 pre-commit
 
 # Unit tests
-pytest==7.2.2
+pytest==7.3.0
 pytest-cov==4.0.0
 pytest-mock==3.10.0
 pytest-asyncio==0.21.0

From b60c08dd2895b623a9a525cc540140ae84cdf4ff Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 12 Apr 2023 11:45:10 +1200
Subject: [PATCH 768/838] Add push to talk voice assistant (#4648)

* Add push to talk voice assistant

* Refactor most code into voice_assistant

* Make voice_assistant the component and remove push_to_talk (can be done in yaml)

* Fix component setup

* Always AF_INET to match serverside

* Fix microphone and media player co-existence

* Format

* Update codeowners

* Update test file

* Fix endifs

* nullptr not NULL

* clang-tidy

* Format

* fixup: Add VA event data

* Generate proto

* Parse and log events

* Add default to switch

* Fix

* Add mic/va to test5
---
 CODEOWNERS                                    |   4 +
 esphome/components/api/api.proto              |  55 ++++++
 esphome/components/api/api_connection.cpp     |  30 +++
 esphome/components/api/api_connection.h       |  13 ++
 esphome/components/api/api_frame_helper.h     |  13 +-
 esphome/components/api/api_pb2.cpp            | 185 ++++++++++++++++++
 esphome/components/api/api_pb2.h              |  71 +++++++
 esphome/components/api/api_pb2_service.cpp    |  60 ++++++
 esphome/components/api/api_pb2_service.h      |  18 ++
 esphome/components/api/api_server.cpp         |  13 ++
 esphome/components/api/api_server.h           |   5 +
 esphome/components/i2s_audio/__init__.py      |  70 +++++++
 esphome/components/i2s_audio/i2s_audio.cpp    |  30 +++
 esphome/components/i2s_audio/i2s_audio.h      |  64 ++++++
 .../__init__.py}                              |  53 +++--
 .../i2s_audio_media_player.cpp                |  95 ++++++---
 .../i2s_audio_media_player.h                  |  29 ++-
 .../i2s_audio/microphone/__init__.py          |  41 ++++
 .../microphone/i2s_audio_microphone.cpp       | 101 ++++++++++
 .../microphone/i2s_audio_microphone.h         |  37 ++++
 .../components/improv_base/improv_base.cpp    |   2 +-
 esphome/components/microphone/__init__.py     |  91 +++++++++
 esphome/components/microphone/automation.h    |  32 +++
 esphome/components/microphone/microphone.h    |  33 ++++
 .../components/socket/bsd_sockets_impl.cpp    |   5 +
 .../components/socket/lwip_raw_tcp_impl.cpp   |   4 +
 esphome/components/socket/socket.cpp          |  20 +-
 esphome/components/socket/socket.h            |   8 +-
 .../components/voice_assistant/__init__.py    |  57 ++++++
 .../voice_assistant/voice_assistant.cpp       | 148 ++++++++++++++
 .../voice_assistant/voice_assistant.h         |  50 +++++
 esphome/const.py                              |   1 +
 esphome/core/defines.h                        |   1 +
 esphome/core/helpers.h                        |   3 +
 tests/test4.yaml                              |  17 +-
 35 files changed, 1384 insertions(+), 75 deletions(-)
 create mode 100644 esphome/components/i2s_audio/i2s_audio.cpp
 create mode 100644 esphome/components/i2s_audio/i2s_audio.h
 rename esphome/components/i2s_audio/{media_player.py => media_player/__init__.py} (68%)
 rename esphome/components/i2s_audio/{ => media_player}/i2s_audio_media_player.cpp (72%)
 rename esphome/components/i2s_audio/{ => media_player}/i2s_audio_media_player.h (81%)
 create mode 100644 esphome/components/i2s_audio/microphone/__init__.py
 create mode 100644 esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp
 create mode 100644 esphome/components/i2s_audio/microphone/i2s_audio_microphone.h
 create mode 100644 esphome/components/microphone/__init__.py
 create mode 100644 esphome/components/microphone/automation.h
 create mode 100644 esphome/components/microphone/microphone.h
 create mode 100644 esphome/components/voice_assistant/__init__.py
 create mode 100644 esphome/components/voice_assistant/voice_assistant.cpp
 create mode 100644 esphome/components/voice_assistant/voice_assistant.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 76156db6e6..8e606d253a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -111,6 +111,8 @@ esphome/components/hte501/* @Stock-M
 esphome/components/hydreon_rgxx/* @functionpointer
 esphome/components/i2c/* @esphome/core
 esphome/components/i2s_audio/* @jesserockz
+esphome/components/i2s_audio/media_player/* @jesserockz
+esphome/components/i2s_audio/microphone/* @jesserockz
 esphome/components/ili9xxx/* @nielsnl68
 esphome/components/improv_base/* @esphome/core
 esphome/components/improv_serial/* @esphome/core
@@ -154,6 +156,7 @@ esphome/components/mcp9808/* @k7hpn
 esphome/components/md5/* @esphome/core
 esphome/components/mdns/* @esphome/core
 esphome/components/media_player/* @jesserockz
+esphome/components/microphone/* @jesserockz
 esphome/components/mics_4514/* @jesserockz
 esphome/components/midea/* @dudanov
 esphome/components/midea_ir/* @dudanov
@@ -287,6 +290,7 @@ esphome/components/ufire_ise/* @pvizeli
 esphome/components/ultrasonic/* @OttoWinter
 esphome/components/vbus/* @ssieb
 esphome/components/version/* @esphome/core
+esphome/components/voice_assistant/* @jesserockz
 esphome/components/wake_on_lan/* @willwill2will54
 esphome/components/web_server_base/* @OttoWinter
 esphome/components/whirlpool/* @glmnet
diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index e36f0581ca..f31ef3ffc0 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -55,6 +55,7 @@ service APIConnection {
   rpc subscribe_bluetooth_connections_free(SubscribeBluetoothConnectionsFreeRequest) returns (BluetoothConnectionsFreeResponse) {}
   rpc unsubscribe_bluetooth_le_advertisements(UnsubscribeBluetoothLEAdvertisementsRequest) returns (void) {}
 
+  rpc subscribe_voice_assistant(SubscribeVoiceAssistantRequest) returns (void) {}
 }
 
 
@@ -210,6 +211,8 @@ message DeviceInfoResponse {
   string manufacturer = 12;
 
   string friendly_name = 13;
+
+  uint32 voice_assistant_version = 14;
 }
 
 message ListEntitiesRequest {
@@ -1379,3 +1382,55 @@ message BluetoothDeviceClearCacheResponse {
   bool success = 2;
   int32 error = 3;
 }
+
+// ==================== PUSH TO TALK ====================
+message SubscribeVoiceAssistantRequest {
+  option (id) = 89;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_VOICE_ASSISTANT";
+
+  bool subscribe = 1;
+}
+
+message VoiceAssistantRequest {
+  option (id) = 90;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_VOICE_ASSISTANT";
+
+  bool start = 1;
+}
+
+message VoiceAssistantResponse {
+  option (id) = 91;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_VOICE_ASSISTANT";
+
+  uint32 port = 1;
+  bool error = 2;
+}
+
+enum VoiceAssistantEvent {
+  VOICE_ASSISTANT_ERROR = 0;
+  VOICE_ASSISTANT_RUN_START = 1;
+  VOICE_ASSISTANT_RUN_END = 2;
+  VOICE_ASSISTANT_STT_START = 3;
+  VOICE_ASSISTANT_STT_END = 4;
+  VOICE_ASSISTANT_INTENT_START = 5;
+  VOICE_ASSISTANT_INTENT_END = 6;
+  VOICE_ASSISTANT_TTS_START = 7;
+  VOICE_ASSISTANT_TTS_END = 8;
+}
+
+message VoiceAssistantEventData {
+  string name = 1;
+  string value = 2;
+}
+
+message VoiceAssistantEventResponse {
+  option (id) = 92;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_VOICE_ASSISTANT";
+
+  VoiceAssistantEvent event_type = 1;
+  repeated VoiceAssistantEventData data = 2;
+}
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 104560771e..96fb3ea9fa 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -16,6 +16,9 @@
 #ifdef USE_BLUETOOTH_PROXY
 #include "esphome/components/bluetooth_proxy/bluetooth_proxy.h"
 #endif
+#ifdef USE_VOICE_ASSISTANT
+#include "esphome/components/voice_assistant/voice_assistant.h"
+#endif
 
 namespace esphome {
 namespace api {
@@ -893,6 +896,30 @@ BluetoothConnectionsFreeResponse APIConnection::subscribe_bluetooth_connections_
 }
 #endif
 
+#ifdef USE_VOICE_ASSISTANT
+bool APIConnection::request_voice_assistant(bool start) {
+  if (!this->voice_assistant_subscription_)
+    return false;
+  VoiceAssistantRequest msg;
+  msg.start = start;
+  return this->send_voice_assistant_request(msg);
+}
+void APIConnection::on_voice_assistant_response(const VoiceAssistantResponse &msg) {
+  if (voice_assistant::global_voice_assistant != nullptr) {
+    struct sockaddr_storage storage;
+    socklen_t len = sizeof(storage);
+    this->helper_->getpeername((struct sockaddr *) &storage, &len);
+    voice_assistant::global_voice_assistant->start(&storage, msg.port);
+  }
+};
+void APIConnection::on_voice_assistant_event_response(const VoiceAssistantEventResponse &msg) {
+  if (voice_assistant::global_voice_assistant != nullptr) {
+    voice_assistant::global_voice_assistant->on_event(msg);
+  }
+}
+
+#endif
+
 bool APIConnection::send_log_message(int level, const char *tag, const char *line) {
   if (this->log_subscription_ < level)
     return false;
@@ -970,6 +997,9 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
   resp.bluetooth_proxy_version = bluetooth_proxy::global_bluetooth_proxy->has_active()
                                      ? bluetooth_proxy::ACTIVE_CONNECTIONS_VERSION
                                      : bluetooth_proxy::PASSIVE_ONLY_VERSION;
+#endif
+#ifdef USE_VOICE_ASSISTANT
+  resp.voice_assistant_version = 1;
 #endif
   return resp;
 }
diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h
index c85c69a2b9..78ecbb98e6 100644
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -6,6 +6,7 @@
 #include "api_server.h"
 #include "esphome/core/application.h"
 #include "esphome/core/component.h"
+#include "esphome/core/defines.h"
 
 #include <vector>
 
@@ -123,6 +124,15 @@ 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(bool start);
+  void on_voice_assistant_response(const VoiceAssistantResponse &msg) override;
+  void on_voice_assistant_event_response(const VoiceAssistantEventResponse &msg) override;
+#endif
+
   void on_disconnect_response(const DisconnectResponse &value) override;
   void on_ping_response(const PingResponse &value) override {
     // we initiated ping
@@ -203,6 +213,9 @@ class APIConnection : public APIServerConnection {
   bool service_call_subscription_{false};
 #ifdef USE_BLUETOOTH_PROXY
   bool bluetooth_le_advertisement_subscription_{false};
+#endif
+#ifdef USE_VOICE_ASSISTANT
+  bool voice_assistant_subscription_{false};
 #endif
   bool next_close_ = false;
   APIServer *parent_;
diff --git a/esphome/components/api/api_frame_helper.h b/esphome/components/api/api_frame_helper.h
index 348a9b574f..bf4872d2d6 100644
--- a/esphome/components/api/api_frame_helper.h
+++ b/esphome/components/api/api_frame_helper.h
@@ -10,8 +10,8 @@
 #include "noise/protocol.h"
 #endif
 
-#include "esphome/components/socket/socket.h"
 #include "api_noise_context.h"
+#include "esphome/components/socket/socket.h"
 
 namespace esphome {
 namespace api {
@@ -67,6 +67,7 @@ class APIFrameHelper {
   virtual bool can_write_without_blocking() = 0;
   virtual APIError write_packet(uint16_t type, const uint8_t *data, size_t len) = 0;
   virtual std::string getpeername() = 0;
+  virtual int getpeername(struct sockaddr *addr, socklen_t *addrlen) = 0;
   virtual APIError close() = 0;
   virtual APIError shutdown(int how) = 0;
   // Give this helper a name for logging
@@ -84,7 +85,10 @@ class APINoiseFrameHelper : public APIFrameHelper {
   APIError read_packet(ReadPacketBuffer *buffer) override;
   bool can_write_without_blocking() override;
   APIError write_packet(uint16_t type, const uint8_t *payload, size_t len) override;
-  std::string getpeername() override { return socket_->getpeername(); }
+  std::string getpeername() override { return this->socket_->getpeername(); }
+  int getpeername(struct sockaddr *addr, socklen_t *addrlen) override {
+    return this->socket_->getpeername(addr, addrlen);
+  }
   APIError close() override;
   APIError shutdown(int how) override;
   // Give this helper a name for logging
@@ -144,7 +148,10 @@ class APIPlaintextFrameHelper : public APIFrameHelper {
   APIError read_packet(ReadPacketBuffer *buffer) override;
   bool can_write_without_blocking() override;
   APIError write_packet(uint16_t type, const uint8_t *payload, size_t len) override;
-  std::string getpeername() override { return socket_->getpeername(); }
+  std::string getpeername() override { return this->socket_->getpeername(); }
+  int getpeername(struct sockaddr *addr, socklen_t *addrlen) override {
+    return this->socket_->getpeername(addr, addrlen);
+  }
   APIError close() override;
   APIError shutdown(int how) override;
   // Give this helper a name for logging
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 6260020064..334cde16b3 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -407,6 +407,32 @@ const char *proto_enum_to_string<enums::BluetoothDeviceRequestType>(enums::Bluet
   }
 }
 #endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
+template<> const char *proto_enum_to_string<enums::VoiceAssistantEvent>(enums::VoiceAssistantEvent value) {
+  switch (value) {
+    case enums::VOICE_ASSISTANT_ERROR:
+      return "VOICE_ASSISTANT_ERROR";
+    case enums::VOICE_ASSISTANT_RUN_START:
+      return "VOICE_ASSISTANT_RUN_START";
+    case enums::VOICE_ASSISTANT_RUN_END:
+      return "VOICE_ASSISTANT_RUN_END";
+    case enums::VOICE_ASSISTANT_STT_START:
+      return "VOICE_ASSISTANT_STT_START";
+    case enums::VOICE_ASSISTANT_STT_END:
+      return "VOICE_ASSISTANT_STT_END";
+    case enums::VOICE_ASSISTANT_INTENT_START:
+      return "VOICE_ASSISTANT_INTENT_START";
+    case enums::VOICE_ASSISTANT_INTENT_END:
+      return "VOICE_ASSISTANT_INTENT_END";
+    case enums::VOICE_ASSISTANT_TTS_START:
+      return "VOICE_ASSISTANT_TTS_START";
+    case enums::VOICE_ASSISTANT_TTS_END:
+      return "VOICE_ASSISTANT_TTS_END";
+    default:
+      return "UNKNOWN";
+  }
+}
+#endif
 bool HelloRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 2: {
@@ -594,6 +620,10 @@ bool DeviceInfoResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
       this->bluetooth_proxy_version = value.as_uint32();
       return true;
     }
+    case 14: {
+      this->voice_assistant_version = value.as_uint32();
+      return true;
+    }
     default:
       return false;
   }
@@ -654,6 +684,7 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(11, this->bluetooth_proxy_version);
   buffer.encode_string(12, this->manufacturer);
   buffer.encode_string(13, this->friendly_name);
+  buffer.encode_uint32(14, this->voice_assistant_version);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DeviceInfoResponse::dump_to(std::string &out) const {
@@ -712,6 +743,11 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   out.append("  friendly_name: ");
   out.append("'").append(this->friendly_name).append("'");
   out.append("\n");
+
+  out.append("  voice_assistant_version: ");
+  sprintf(buffer, "%u", this->voice_assistant_version);
+  out.append(buffer);
+  out.append("\n");
   out.append("}");
 }
 #endif
@@ -6111,6 +6147,155 @@ void BluetoothDeviceClearCacheResponse::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
+bool SubscribeVoiceAssistantRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->subscribe = value.as_bool();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void SubscribeVoiceAssistantRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_bool(1, this->subscribe); }
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void SubscribeVoiceAssistantRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("SubscribeVoiceAssistantRequest {\n");
+  out.append("  subscribe: ");
+  out.append(YESNO(this->subscribe));
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool VoiceAssistantRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->start = value.as_bool();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void VoiceAssistantRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_bool(1, this->start); }
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void VoiceAssistantRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("VoiceAssistantRequest {\n");
+  out.append("  start: ");
+  out.append(YESNO(this->start));
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool VoiceAssistantResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->port = value.as_uint32();
+      return true;
+    }
+    case 2: {
+      this->error = value.as_bool();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void VoiceAssistantResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_uint32(1, this->port);
+  buffer.encode_bool(2, this->error);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void VoiceAssistantResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("VoiceAssistantResponse {\n");
+  out.append("  port: ");
+  sprintf(buffer, "%u", this->port);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  error: ");
+  out.append(YESNO(this->error));
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool VoiceAssistantEventData::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 1: {
+      this->name = value.as_string();
+      return true;
+    }
+    case 2: {
+      this->value = value.as_string();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void VoiceAssistantEventData::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_string(1, this->name);
+  buffer.encode_string(2, this->value);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void VoiceAssistantEventData::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("VoiceAssistantEventData {\n");
+  out.append("  name: ");
+  out.append("'").append(this->name).append("'");
+  out.append("\n");
+
+  out.append("  value: ");
+  out.append("'").append(this->value).append("'");
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool VoiceAssistantEventResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 1: {
+      this->event_type = value.as_enum<enums::VoiceAssistantEvent>();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool VoiceAssistantEventResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 2: {
+      this->data.push_back(value.as_message<VoiceAssistantEventData>());
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void VoiceAssistantEventResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_enum<enums::VoiceAssistantEvent>(1, this->event_type);
+  for (auto &it : this->data) {
+    buffer.encode_message<VoiceAssistantEventData>(2, it, true);
+  }
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void VoiceAssistantEventResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("VoiceAssistantEventResponse {\n");
+  out.append("  event_type: ");
+  out.append(proto_enum_to_string<enums::VoiceAssistantEvent>(this->event_type));
+  out.append("\n");
+
+  for (const auto &it : this->data) {
+    out.append("  data: ");
+    it.dump_to(out);
+    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 ade9b9cc8f..9f71c07913 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -165,6 +165,17 @@ enum BluetoothDeviceRequestType : uint32_t {
   BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE = 5,
   BLUETOOTH_DEVICE_REQUEST_TYPE_CLEAR_CACHE = 6,
 };
+enum VoiceAssistantEvent : uint32_t {
+  VOICE_ASSISTANT_ERROR = 0,
+  VOICE_ASSISTANT_RUN_START = 1,
+  VOICE_ASSISTANT_RUN_END = 2,
+  VOICE_ASSISTANT_STT_START = 3,
+  VOICE_ASSISTANT_STT_END = 4,
+  VOICE_ASSISTANT_INTENT_START = 5,
+  VOICE_ASSISTANT_INTENT_END = 6,
+  VOICE_ASSISTANT_TTS_START = 7,
+  VOICE_ASSISTANT_TTS_END = 8,
+};
 
 }  // namespace enums
 
@@ -279,6 +290,7 @@ class DeviceInfoResponse : public ProtoMessage {
   uint32_t bluetooth_proxy_version{0};
   std::string manufacturer{};
   std::string friendly_name{};
+  uint32_t voice_assistant_version{0};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1577,6 +1589,65 @@ class BluetoothDeviceClearCacheResponse : public ProtoMessage {
  protected:
   bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
+class SubscribeVoiceAssistantRequest : public ProtoMessage {
+ public:
+  bool subscribe{false};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class VoiceAssistantRequest : public ProtoMessage {
+ public:
+  bool start{false};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class VoiceAssistantResponse : public ProtoMessage {
+ public:
+  uint32_t port{0};
+  bool error{false};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class VoiceAssistantEventData : public ProtoMessage {
+ public:
+  std::string name{};
+  std::string value{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+};
+class VoiceAssistantEventResponse : public ProtoMessage {
+ public:
+  enums::VoiceAssistantEvent event_type{};
+  std::vector<VoiceAssistantEventData> data{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt 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 7d019e1d3d..df36d0fdea 100644
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -453,6 +453,20 @@ bool APIServerConnectionBase::send_bluetooth_device_clear_cache_response(const B
   return this->send_message_<BluetoothDeviceClearCacheResponse>(msg, 88);
 }
 #endif
+#ifdef USE_VOICE_ASSISTANT
+#endif
+#ifdef USE_VOICE_ASSISTANT
+bool APIServerConnectionBase::send_voice_assistant_request(const VoiceAssistantRequest &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_voice_assistant_request: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<VoiceAssistantRequest>(msg, 90);
+}
+#endif
+#ifdef USE_VOICE_ASSISTANT
+#endif
+#ifdef USE_VOICE_ASSISTANT
+#endif
 bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
   switch (msg_type) {
     case 1: {
@@ -827,6 +841,39 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
       ESP_LOGVV(TAG, "on_unsubscribe_bluetooth_le_advertisements_request: %s", msg.dump().c_str());
 #endif
       this->on_unsubscribe_bluetooth_le_advertisements_request(msg);
+#endif
+      break;
+    }
+    case 89: {
+#ifdef USE_VOICE_ASSISTANT
+      SubscribeVoiceAssistantRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_subscribe_voice_assistant_request: %s", msg.dump().c_str());
+#endif
+      this->on_subscribe_voice_assistant_request(msg);
+#endif
+      break;
+    }
+    case 91: {
+#ifdef USE_VOICE_ASSISTANT
+      VoiceAssistantResponse msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_voice_assistant_response: %s", msg.dump().c_str());
+#endif
+      this->on_voice_assistant_response(msg);
+#endif
+      break;
+    }
+    case 92: {
+#ifdef USE_VOICE_ASSISTANT
+      VoiceAssistantEventResponse msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_voice_assistant_event_response: %s", msg.dump().c_str());
+#endif
+      this->on_voice_assistant_event_response(msg);
 #endif
       break;
     }
@@ -1226,6 +1273,19 @@ void APIServerConnection::on_unsubscribe_bluetooth_le_advertisements_request(
   this->unsubscribe_bluetooth_le_advertisements(msg);
 }
 #endif
+#ifdef USE_VOICE_ASSISTANT
+void APIServerConnection::on_subscribe_voice_assistant_request(const SubscribeVoiceAssistantRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->subscribe_voice_assistant(msg);
+}
+#endif
 
 }  // namespace api
 }  // namespace esphome
diff --git a/esphome/components/api/api_pb2_service.h b/esphome/components/api/api_pb2_service.h
index 457a3d28a9..3808f128a4 100644
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -224,6 +224,18 @@ class APIServerConnectionBase : public ProtoService {
 #endif
 #ifdef USE_BLUETOOTH_PROXY
   bool send_bluetooth_device_clear_cache_response(const BluetoothDeviceClearCacheResponse &msg);
+#endif
+#ifdef USE_VOICE_ASSISTANT
+  virtual void on_subscribe_voice_assistant_request(const SubscribeVoiceAssistantRequest &value){};
+#endif
+#ifdef USE_VOICE_ASSISTANT
+  bool send_voice_assistant_request(const VoiceAssistantRequest &msg);
+#endif
+#ifdef USE_VOICE_ASSISTANT
+  virtual void on_voice_assistant_response(const VoiceAssistantResponse &value){};
+#endif
+#ifdef USE_VOICE_ASSISTANT
+  virtual void on_voice_assistant_event_response(const VoiceAssistantEventResponse &value){};
 #endif
  protected:
   bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
@@ -306,6 +318,9 @@ class APIServerConnection : public APIServerConnectionBase {
 #endif
 #ifdef USE_BLUETOOTH_PROXY
   virtual void unsubscribe_bluetooth_le_advertisements(const UnsubscribeBluetoothLEAdvertisementsRequest &msg) = 0;
+#endif
+#ifdef USE_VOICE_ASSISTANT
+  virtual void subscribe_voice_assistant(const SubscribeVoiceAssistantRequest &msg) = 0;
 #endif
  protected:
   void on_hello_request(const HelloRequest &msg) override;
@@ -384,6 +399,9 @@ class APIServerConnection : public APIServerConnectionBase {
   void on_unsubscribe_bluetooth_le_advertisements_request(
       const UnsubscribeBluetoothLEAdvertisementsRequest &msg) override;
 #endif
+#ifdef USE_VOICE_ASSISTANT
+  void on_subscribe_voice_assistant_request(const SubscribeVoiceAssistantRequest &msg) override;
+#endif
 };
 
 }  // namespace api
diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index c60766b364..fbef4b253f 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -427,5 +427,18 @@ void APIServer::on_shutdown() {
   delay(10);
 }
 
+#ifdef USE_VOICE_ASSISTANT
+void APIServer::start_voice_assistant() {
+  for (auto &c : this->clients_) {
+    c->request_voice_assistant(true);
+  }
+}
+void APIServer::stop_voice_assistant() {
+  for (auto &c : this->clients_) {
+    c->request_voice_assistant(false);
+  }
+}
+#endif
+
 }  // namespace api
 }  // namespace esphome
diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index db87affdb8..30103b2e3f 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -95,6 +95,11 @@ class APIServer : public Component, public Controller {
   void request_time();
 #endif
 
+#ifdef USE_VOICE_ASSISTANT
+  void start_voice_assistant();
+  void stop_voice_assistant();
+#endif
+
   bool is_connected() const;
 
   struct HomeAssistantStateSubscription {
diff --git a/esphome/components/i2s_audio/__init__.py b/esphome/components/i2s_audio/__init__.py
index e69de29bb2..1773d3082f 100644
--- a/esphome/components/i2s_audio/__init__.py
+++ b/esphome/components/i2s_audio/__init__.py
@@ -0,0 +1,70 @@
+import esphome.config_validation as cv
+import esphome.final_validate as fv
+import esphome.codegen as cg
+
+from esphome import pins
+from esphome.const import CONF_ID
+from esphome.components.esp32 import get_esp32_variant
+from esphome.components.esp32.const import (
+    VARIANT_ESP32,
+    VARIANT_ESP32S2,
+    VARIANT_ESP32S3,
+    VARIANT_ESP32C3,
+)
+
+CODEOWNERS = ["@jesserockz"]
+DEPENDENCIES = ["esp32"]
+MULTI_CONF = True
+
+CONF_I2S_DOUT_PIN = "i2s_dout_pin"
+CONF_I2S_DIN_PIN = "i2s_din_pin"
+CONF_I2S_BCLK_PIN = "i2s_bclk_pin"
+CONF_I2S_LRCLK_PIN = "i2s_lrclk_pin"
+
+CONF_I2S_AUDIO = "i2s_audio"
+CONF_I2S_AUDIO_ID = "i2s_audio_id"
+
+i2s_audio_ns = cg.esphome_ns.namespace("i2s_audio")
+I2SAudioComponent = i2s_audio_ns.class_("I2SAudioComponent", cg.Component)
+I2SAudioIn = i2s_audio_ns.class_("I2SAudioIn", cg.Parented.template(I2SAudioComponent))
+I2SAudioOut = i2s_audio_ns.class_(
+    "I2SAudioOut", cg.Parented.template(I2SAudioComponent)
+)
+
+# https://github.com/espressif/esp-idf/blob/master/components/soc/{variant}/include/soc/soc_caps.h
+I2S_PORTS = {
+    VARIANT_ESP32: 2,
+    VARIANT_ESP32S2: 1,
+    VARIANT_ESP32S3: 2,
+    VARIANT_ESP32C3: 1,
+}
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(I2SAudioComponent),
+        cv.Required(CONF_I2S_BCLK_PIN): pins.internal_gpio_output_pin_number,
+        cv.Required(CONF_I2S_LRCLK_PIN): pins.internal_gpio_output_pin_number,
+    }
+)
+
+
+def _final_validate(_):
+    i2s_audio_configs = fv.full_config.get()[CONF_I2S_AUDIO]
+    variant = get_esp32_variant()
+    if variant not in I2S_PORTS:
+        raise cv.Invalid(f"Unsupported variant {variant}")
+    if len(i2s_audio_configs) > I2S_PORTS[variant]:
+        raise cv.Invalid(
+            f"Only {I2S_PORTS[variant]} I2S audio ports are supported on {variant}"
+        )
+
+
+FINAL_VALIDATE_SCHEMA = _final_validate
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+
+    cg.add(var.set_bclk_pin(config[CONF_I2S_BCLK_PIN]))
+    cg.add(var.set_lrclk_pin(config[CONF_I2S_LRCLK_PIN]))
diff --git a/esphome/components/i2s_audio/i2s_audio.cpp b/esphome/components/i2s_audio/i2s_audio.cpp
new file mode 100644
index 0000000000..c1a608c064
--- /dev/null
+++ b/esphome/components/i2s_audio/i2s_audio.cpp
@@ -0,0 +1,30 @@
+#include "i2s_audio.h"
+
+#ifdef USE_ESP32
+
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace i2s_audio {
+
+static const char *const TAG = "i2s_audio";
+
+void I2SAudioComponent::setup() {
+  static i2s_port_t next_port_num = I2S_NUM_0;
+
+  if (next_port_num >= I2S_NUM_MAX) {
+    ESP_LOGE(TAG, "Too many I2S Audio components!");
+    this->mark_failed();
+    return;
+  }
+
+  this->port_ = next_port_num;
+  next_port_num = (i2s_port_t) (next_port_num + 1);
+
+  ESP_LOGCONFIG(TAG, "Setting up I2S Audio...");
+}
+
+}  // namespace i2s_audio
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/i2s_audio/i2s_audio.h b/esphome/components/i2s_audio/i2s_audio.h
new file mode 100644
index 0000000000..6b3fa10f3c
--- /dev/null
+++ b/esphome/components/i2s_audio/i2s_audio.h
@@ -0,0 +1,64 @@
+#pragma once
+
+#ifdef USE_ESP32
+
+#include <driver/i2s.h>
+#include "esphome/core/component.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace i2s_audio {
+
+class I2SAudioComponent;
+
+class I2SAudioIn : public Parented<I2SAudioComponent> {};
+
+class I2SAudioOut : public Parented<I2SAudioComponent> {};
+
+class I2SAudioComponent : public Component {
+ public:
+  void setup() override;
+
+  void register_audio_in(I2SAudioIn *in) {
+    this->audio_in_ = in;
+    in->set_parent(this);
+  }
+  void register_audio_out(I2SAudioOut *out) {
+    this->audio_out_ = out;
+    out->set_parent(this);
+  }
+
+  i2s_pin_config_t get_pin_config() const {
+    return {
+        .mck_io_num = I2S_PIN_NO_CHANGE,
+        .bck_io_num = this->bclk_pin_,
+        .ws_io_num = this->lrclk_pin_,
+        .data_out_num = I2S_PIN_NO_CHANGE,
+        .data_in_num = I2S_PIN_NO_CHANGE,
+    };
+  }
+
+  void set_bclk_pin(uint8_t pin) { this->bclk_pin_ = pin; }
+  void set_lrclk_pin(uint8_t pin) { this->lrclk_pin_ = pin; }
+
+  void lock() { this->lock_.lock(); }
+  bool try_lock() { return this->lock_.try_lock(); }
+  void unlock() { this->lock_.unlock(); }
+
+  i2s_port_t get_port() const { return this->port_; }
+
+ protected:
+  Mutex lock_;
+
+  I2SAudioIn *audio_in_{nullptr};
+  I2SAudioOut *audio_out_{nullptr};
+
+  uint8_t bclk_pin_;
+  uint8_t lrclk_pin_;
+  i2s_port_t port_{};
+};
+
+}  // namespace i2s_audio
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/i2s_audio/media_player.py b/esphome/components/i2s_audio/media_player/__init__.py
similarity index 68%
rename from esphome/components/i2s_audio/media_player.py
rename to esphome/components/i2s_audio/media_player/__init__.py
index 43a48a721e..4ccb9cfc0a 100644
--- a/esphome/components/i2s_audio/media_player.py
+++ b/esphome/components/i2s_audio/media_player/__init__.py
@@ -5,22 +5,25 @@ import esphome.config_validation as cv
 from esphome import pins
 
 from esphome.const import CONF_ID, CONF_MODE
-from esphome.core import CORE
+
+from .. import (
+    i2s_audio_ns,
+    I2SAudioComponent,
+    I2SAudioOut,
+    CONF_I2S_AUDIO_ID,
+    CONF_I2S_DOUT_PIN,
+)
 
 CODEOWNERS = ["@jesserockz"]
-DEPENDENCIES = ["esp32"]
-
-i2s_audio_ns = cg.esphome_ns.namespace("i2s_audio")
+DEPENDENCIES = ["i2s_audio"]
 
 I2SAudioMediaPlayer = i2s_audio_ns.class_(
-    "I2SAudioMediaPlayer", cg.Component, media_player.MediaPlayer
+    "I2SAudioMediaPlayer", cg.Component, media_player.MediaPlayer, I2SAudioOut
 )
 
 i2s_dac_mode_t = cg.global_ns.enum("i2s_dac_mode_t")
 
-CONF_I2S_DOUT_PIN = "i2s_dout_pin"
-CONF_I2S_BCLK_PIN = "i2s_bclk_pin"
-CONF_I2S_LRCLK_PIN = "i2s_lrclk_pin"
+
 CONF_MUTE_PIN = "mute_pin"
 CONF_AUDIO_ID = "audio_id"
 CONF_DAC_TYPE = "dac_type"
@@ -48,34 +51,26 @@ def validate_esp32_variant(config):
 CONFIG_SCHEMA = cv.All(
     cv.typed_schema(
         {
-            "internal": cv.Schema(
+            "internal": media_player.MEDIA_PLAYER_SCHEMA.extend(
                 {
                     cv.GenerateID(): cv.declare_id(I2SAudioMediaPlayer),
+                    cv.GenerateID(CONF_I2S_AUDIO_ID): cv.use_id(I2SAudioComponent),
                     cv.Required(CONF_MODE): cv.enum(INTERNAL_DAC_OPTIONS, lower=True),
                 }
-            )
-            .extend(media_player.MEDIA_PLAYER_SCHEMA)
-            .extend(cv.COMPONENT_SCHEMA),
-            "external": cv.Schema(
+            ).extend(cv.COMPONENT_SCHEMA),
+            "external": media_player.MEDIA_PLAYER_SCHEMA.extend(
                 {
                     cv.GenerateID(): cv.declare_id(I2SAudioMediaPlayer),
+                    cv.GenerateID(CONF_I2S_AUDIO_ID): cv.use_id(I2SAudioComponent),
                     cv.Required(
                         CONF_I2S_DOUT_PIN
                     ): pins.internal_gpio_output_pin_number,
-                    cv.Required(
-                        CONF_I2S_BCLK_PIN
-                    ): pins.internal_gpio_output_pin_number,
-                    cv.Required(
-                        CONF_I2S_LRCLK_PIN
-                    ): pins.internal_gpio_output_pin_number,
                     cv.Optional(CONF_MUTE_PIN): pins.gpio_output_pin_schema,
                     cv.Optional(CONF_MODE, default="mono"): cv.one_of(
                         *EXTERNAL_DAC_OPTIONS, lower=True
                     ),
                 }
-            )
-            .extend(media_player.MEDIA_PLAYER_SCHEMA)
-            .extend(cv.COMPONENT_SCHEMA),
+            ).extend(cv.COMPONENT_SCHEMA),
         },
         key=CONF_DAC_TYPE,
     ),
@@ -89,19 +84,19 @@ async def to_code(config):
     await cg.register_component(var, config)
     await media_player.register_media_player(var, config)
 
+    parent = await cg.get_variable(config[CONF_I2S_AUDIO_ID])
+    cg.add(parent.register_audio_out(var))
+
     if config[CONF_DAC_TYPE] == "internal":
         cg.add(var.set_internal_dac_mode(config[CONF_MODE]))
     else:
         cg.add(var.set_dout_pin(config[CONF_I2S_DOUT_PIN]))
-        cg.add(var.set_bclk_pin(config[CONF_I2S_BCLK_PIN]))
-        cg.add(var.set_lrclk_pin(config[CONF_I2S_LRCLK_PIN]))
         if CONF_MUTE_PIN in config:
             pin = await cg.gpio_pin_expression(config[CONF_MUTE_PIN])
             cg.add(var.set_mute_pin(pin))
         cg.add(var.set_external_dac_channels(2 if config[CONF_MODE] == "stereo" else 1))
 
-    if CORE.is_esp32:
-        cg.add_library("WiFiClientSecure", None)
-        cg.add_library("HTTPClient", None)
-        cg.add_library("esphome/ESP32-audioI2S", "2.0.6")
-        cg.add_build_flag("-DAUDIO_NO_SD_FS")
+    cg.add_library("WiFiClientSecure", None)
+    cg.add_library("HTTPClient", None)
+    cg.add_library("esphome/ESP32-audioI2S", "2.0.6")
+    cg.add_build_flag("-DAUDIO_NO_SD_FS")
diff --git a/esphome/components/i2s_audio/i2s_audio_media_player.cpp b/esphome/components/i2s_audio/media_player/i2s_audio_media_player.cpp
similarity index 72%
rename from esphome/components/i2s_audio/i2s_audio_media_player.cpp
rename to esphome/components/i2s_audio/media_player/i2s_audio_media_player.cpp
index 2b00a5ec26..64f83a5ea6 100644
--- a/esphome/components/i2s_audio/i2s_audio_media_player.cpp
+++ b/esphome/components/i2s_audio/media_player/i2s_audio_media_player.cpp
@@ -11,11 +11,19 @@ static const char *const TAG = "audio";
 
 void I2SAudioMediaPlayer::control(const media_player::MediaPlayerCall &call) {
   if (call.get_media_url().has_value()) {
-    if (this->audio_->isRunning())
-      this->audio_->stopSong();
-    this->high_freq_.start();
-    this->audio_->connecttohost(call.get_media_url().value().c_str());
-    this->state = media_player::MEDIA_PLAYER_STATE_PLAYING;
+    this->current_url_ = call.get_media_url();
+
+    if (this->state == media_player::MEDIA_PLAYER_STATE_PLAYING && this->audio_ != nullptr) {
+      if (this->audio_->isRunning()) {
+        this->audio_->stopSong();
+      }
+      this->audio_->connecttohost(this->current_url_.value().c_str());
+    } else {
+      this->start();
+    }
+  }
+  if (this->i2s_state_ != I2S_STATE_RUNNING) {
+    return;
   }
   if (call.get_volume().has_value()) {
     this->volume = call.get_volume().value();
@@ -35,7 +43,7 @@ void I2SAudioMediaPlayer::control(const media_player::MediaPlayerCall &call) {
         this->state = media_player::MEDIA_PLAYER_STATE_PAUSED;
         break;
       case media_player::MEDIA_PLAYER_COMMAND_STOP:
-        this->stop_();
+        this->stop();
         break;
       case media_player::MEDIA_PLAYER_COMMAND_MUTE:
         this->mute_();
@@ -94,22 +102,51 @@ void I2SAudioMediaPlayer::set_volume_(float volume, bool publish) {
     this->volume = volume;
 }
 
-void I2SAudioMediaPlayer::stop_() {
-  if (this->audio_->isRunning())
-    this->audio_->stopSong();
-  this->high_freq_.stop();
+void I2SAudioMediaPlayer::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up Audio...");
   this->state = media_player::MEDIA_PLAYER_STATE_IDLE;
 }
 
-void I2SAudioMediaPlayer::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up Audio...");
+void I2SAudioMediaPlayer::loop() {
+  switch (this->i2s_state_) {
+    case I2S_STATE_STARTING:
+      this->start_();
+      break;
+    case I2S_STATE_RUNNING:
+      this->play_();
+      break;
+    case I2S_STATE_STOPPING:
+      this->stop_();
+      break;
+    case I2S_STATE_STOPPED:
+      break;
+  }
+}
+
+void I2SAudioMediaPlayer::play_() {
+  this->audio_->loop();
+  if (this->state == media_player::MEDIA_PLAYER_STATE_PLAYING && !this->audio_->isRunning()) {
+    this->stop();
+  }
+}
+
+void I2SAudioMediaPlayer::start() { this->i2s_state_ = I2S_STATE_STARTING; }
+void I2SAudioMediaPlayer::start_() {
+  if (this->parent_->try_lock()) {
+    return;  // Waiting for another i2s to return lock
+  }
+
 #if SOC_I2S_SUPPORTS_DAC
   if (this->internal_dac_mode_ != I2S_DAC_CHANNEL_DISABLE) {
-    this->audio_ = make_unique<Audio>(true, this->internal_dac_mode_);
+    this->audio_ = make_unique<Audio>(true, this->internal_dac_mode_, this->parent_->get_port());
   } else {
 #endif
-    this->audio_ = make_unique<Audio>(false);
-    this->audio_->setPinout(this->bclk_pin_, this->lrclk_pin_, this->dout_pin_);
+    this->audio_ = make_unique<Audio>(false, I2S_DAC_CHANNEL_BOTH_EN, this->parent_->get_port());
+
+    i2s_pin_config_t pin_config = this->parent_->get_pin_config();
+    pin_config.data_out_num = this->dout_pin_;
+    i2s_set_pin(this->parent_->get_port(), &pin_config);
+
     this->audio_->forceMono(this->external_dac_channels_ == 1);
     if (this->mute_pin_ != nullptr) {
       this->mute_pin_->setup();
@@ -118,16 +155,30 @@ void I2SAudioMediaPlayer::setup() {
 #if SOC_I2S_SUPPORTS_DAC
   }
 #endif
-  this->state = media_player::MEDIA_PLAYER_STATE_IDLE;
-}
-
-void I2SAudioMediaPlayer::loop() {
-  this->audio_->loop();
-  if (this->state == media_player::MEDIA_PLAYER_STATE_PLAYING && !this->audio_->isRunning()) {
-    this->stop_();
+  this->i2s_state_ = I2S_STATE_RUNNING;
+  this->high_freq_.start();
+  if (this->current_url_.has_value()) {
+    this->audio_->connecttohost(this->current_url_.value().c_str());
+    this->state = media_player::MEDIA_PLAYER_STATE_PLAYING;
     this->publish_state();
   }
 }
+void I2SAudioMediaPlayer::stop() { this->i2s_state_ = I2S_STATE_STOPPING; }
+void I2SAudioMediaPlayer::stop_() {
+  if (this->audio_->isRunning()) {
+    this->audio_->stopSong();
+    return;
+  }
+
+  this->audio_ = nullptr;
+  this->current_url_ = {};
+  this->parent_->unlock();
+  this->i2s_state_ = I2S_STATE_STOPPED;
+
+  this->high_freq_.stop();
+  this->state = media_player::MEDIA_PLAYER_STATE_IDLE;
+  this->publish_state();
+}
 
 media_player::MediaPlayerTraits I2SAudioMediaPlayer::get_traits() {
   auto traits = media_player::MediaPlayerTraits();
diff --git a/esphome/components/i2s_audio/i2s_audio_media_player.h b/esphome/components/i2s_audio/media_player/i2s_audio_media_player.h
similarity index 81%
rename from esphome/components/i2s_audio/i2s_audio_media_player.h
rename to esphome/components/i2s_audio/media_player/i2s_audio_media_player.h
index 40906d9ea5..dab9a85d7c 100644
--- a/esphome/components/i2s_audio/i2s_audio_media_player.h
+++ b/esphome/components/i2s_audio/media_player/i2s_audio_media_player.h
@@ -2,6 +2,10 @@
 
 #ifdef USE_ESP32_FRAMEWORK_ARDUINO
 
+#include "../i2s_audio.h"
+
+#include <driver/i2s.h>
+
 #include "esphome/components/media_player/media_player.h"
 #include "esphome/core/component.h"
 #include "esphome/core/gpio.h"
@@ -12,7 +16,14 @@
 namespace esphome {
 namespace i2s_audio {
 
-class I2SAudioMediaPlayer : public Component, public media_player::MediaPlayer {
+enum I2SState : uint8_t {
+  I2S_STATE_STOPPED = 0,
+  I2S_STATE_STARTING,
+  I2S_STATE_RUNNING,
+  I2S_STATE_STOPPING,
+};
+
+class I2SAudioMediaPlayer : public Component, public media_player::MediaPlayer, public I2SAudioOut {
  public:
   void setup() override;
   float get_setup_priority() const override { return esphome::setup_priority::LATE; }
@@ -22,8 +33,6 @@ class I2SAudioMediaPlayer : public Component, public media_player::MediaPlayer {
   void dump_config() override;
 
   void set_dout_pin(uint8_t pin) { this->dout_pin_ = pin; }
-  void set_bclk_pin(uint8_t pin) { this->bclk_pin_ = pin; }
-  void set_lrclk_pin(uint8_t pin) { this->lrclk_pin_ = pin; }
   void set_mute_pin(GPIOPin *mute_pin) { this->mute_pin_ = mute_pin; }
 #if SOC_I2S_SUPPORTS_DAC
   void set_internal_dac_mode(i2s_dac_mode_t mode) { this->internal_dac_mode_ = mode; }
@@ -34,20 +43,24 @@ class I2SAudioMediaPlayer : public Component, public media_player::MediaPlayer {
 
   bool is_muted() const override { return this->muted_; }
 
+  void start();
+  void stop();
+
  protected:
   void control(const media_player::MediaPlayerCall &call) override;
 
   void mute_();
   void unmute_();
   void set_volume_(float volume, bool publish = true);
-  void stop_();
 
+  void start_();
+  void stop_();
+  void play_();
+
+  I2SState i2s_state_{I2S_STATE_STOPPED};
   std::unique_ptr<Audio> audio_;
 
   uint8_t dout_pin_{0};
-  uint8_t din_pin_{0};
-  uint8_t bclk_pin_;
-  uint8_t lrclk_pin_;
 
   GPIOPin *mute_pin_{nullptr};
   bool muted_{false};
@@ -59,6 +72,8 @@ class I2SAudioMediaPlayer : public Component, public media_player::MediaPlayer {
   uint8_t external_dac_channels_;
 
   HighFrequencyLoopRequester high_freq_;
+
+  optional<std::string> current_url_{};
 };
 
 }  // namespace i2s_audio
diff --git a/esphome/components/i2s_audio/microphone/__init__.py b/esphome/components/i2s_audio/microphone/__init__.py
new file mode 100644
index 0000000000..08d7a5c95f
--- /dev/null
+++ b/esphome/components/i2s_audio/microphone/__init__.py
@@ -0,0 +1,41 @@
+import esphome.config_validation as cv
+import esphome.codegen as cg
+
+from esphome import pins
+from esphome.const import CONF_ID
+from esphome.components import microphone
+
+from .. import (
+    i2s_audio_ns,
+    I2SAudioComponent,
+    I2SAudioIn,
+    CONF_I2S_AUDIO_ID,
+    CONF_I2S_DIN_PIN,
+)
+
+CODEOWNERS = ["@jesserockz"]
+DEPENDENCIES = ["i2s_audio"]
+
+I2SAudioMicrophone = i2s_audio_ns.class_(
+    "I2SAudioMicrophone", I2SAudioIn, microphone.Microphone, cg.Component
+)
+
+CONFIG_SCHEMA = microphone.MICROPHONE_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(I2SAudioMicrophone),
+        cv.GenerateID(CONF_I2S_AUDIO_ID): cv.use_id(I2SAudioComponent),
+        cv.Required(CONF_I2S_DIN_PIN): pins.internal_gpio_output_pin_number,
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+
+    parent = await cg.get_variable(config[CONF_I2S_AUDIO_ID])
+    cg.add(parent.register_audio_in(var))
+
+    cg.add(var.set_din_pin(config[CONF_I2S_DIN_PIN]))
+
+    await microphone.register_microphone(var, config)
diff --git a/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp b/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp
new file mode 100644
index 0000000000..8883cdc665
--- /dev/null
+++ b/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp
@@ -0,0 +1,101 @@
+#include "i2s_audio_microphone.h"
+
+#ifdef USE_ESP32
+
+#include <driver/i2s.h>
+
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace i2s_audio {
+
+static const size_t BUFFER_SIZE = 512;
+
+static const char *const TAG = "i2s_audio.microphone";
+
+void I2SAudioMicrophone::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up I2S Audio Microphone...");
+  this->buffer_.resize(BUFFER_SIZE);
+}
+
+void I2SAudioMicrophone::start() { this->state_ = microphone::STATE_STARTING; }
+void I2SAudioMicrophone::start_() {
+  if (!this->parent_->try_lock()) {
+    return;  // Waiting for another i2s to return lock
+  }
+  i2s_driver_config_t config = {
+      .mode = (i2s_mode_t) (I2S_MODE_MASTER | I2S_MODE_RX | I2S_MODE_PDM),
+      .sample_rate = 16000,
+      .bits_per_sample = I2S_BITS_PER_SAMPLE_16BIT,
+      .channel_format = I2S_CHANNEL_FMT_ONLY_RIGHT,
+      .communication_format = I2S_COMM_FORMAT_STAND_I2S,
+      .intr_alloc_flags = ESP_INTR_FLAG_LEVEL1,
+      .dma_buf_count = 4,
+      .dma_buf_len = 256,
+      .use_apll = false,
+      .tx_desc_auto_clear = false,
+      .fixed_mclk = 0,
+      .mclk_multiple = I2S_MCLK_MULTIPLE_DEFAULT,
+      .bits_per_chan = I2S_BITS_PER_CHAN_DEFAULT,
+  };
+
+  i2s_driver_install(this->parent_->get_port(), &config, 0, nullptr);
+
+  i2s_pin_config_t pin_config = this->parent_->get_pin_config();
+  pin_config.data_in_num = this->din_pin_;
+
+  i2s_set_pin(this->parent_->get_port(), &pin_config);
+  this->state_ = microphone::STATE_RUNNING;
+  this->high_freq_.start();
+}
+
+void I2SAudioMicrophone::stop() {
+  if (this->state_ == microphone::STATE_STOPPED)
+    return;
+  this->state_ = microphone::STATE_STOPPING;
+}
+
+void I2SAudioMicrophone::stop_() {
+  i2s_stop(this->parent_->get_port());
+  i2s_driver_uninstall(this->parent_->get_port());
+  this->parent_->unlock();
+  this->state_ = microphone::STATE_STOPPED;
+  this->high_freq_.stop();
+}
+
+void I2SAudioMicrophone::read_() {
+  size_t bytes_read = 0;
+  esp_err_t err =
+      i2s_read(this->parent_->get_port(), this->buffer_.data(), BUFFER_SIZE, &bytes_read, (100 / portTICK_PERIOD_MS));
+  if (err != ESP_OK) {
+    ESP_LOGW(TAG, "Error reading from I2S microphone: %s", esp_err_to_name(err));
+    this->status_set_warning();
+    return;
+  }
+
+  this->status_clear_warning();
+
+  this->data_callbacks_.call(this->buffer_);
+}
+
+void I2SAudioMicrophone::loop() {
+  switch (this->state_) {
+    case microphone::STATE_STOPPED:
+      break;
+    case microphone::STATE_STARTING:
+      this->start_();
+      break;
+    case microphone::STATE_RUNNING:
+      this->read_();
+      break;
+    case microphone::STATE_STOPPING:
+      this->stop_();
+      break;
+  }
+}
+
+}  // namespace i2s_audio
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/i2s_audio/microphone/i2s_audio_microphone.h b/esphome/components/i2s_audio/microphone/i2s_audio_microphone.h
new file mode 100644
index 0000000000..a36cb7340c
--- /dev/null
+++ b/esphome/components/i2s_audio/microphone/i2s_audio_microphone.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#ifdef USE_ESP32
+
+#include "../i2s_audio.h"
+
+#include "esphome/components/microphone/microphone.h"
+#include "esphome/core/component.h"
+
+namespace esphome {
+namespace i2s_audio {
+
+class I2SAudioMicrophone : public I2SAudioIn, public microphone::Microphone, public Component {
+ public:
+  void setup() override;
+  void start() override;
+  void stop() override;
+
+  void loop() override;
+
+  void set_din_pin(uint8_t pin) { this->din_pin_ = pin; }
+
+ protected:
+  void start_();
+  void stop_();
+  void read_();
+
+  uint8_t din_pin_{0};
+  std::vector<uint8_t> buffer_;
+
+  HighFrequencyLoopRequester high_freq_;
+};
+
+}  // namespace i2s_audio
+}  // namespace esphome
+
+#endif  // USE_ESP32
diff --git a/esphome/components/improv_base/improv_base.cpp b/esphome/components/improv_base/improv_base.cpp
index c95b3a77ec..f18a1061fb 100644
--- a/esphome/components/improv_base/improv_base.cpp
+++ b/esphome/components/improv_base/improv_base.cpp
@@ -21,7 +21,7 @@ std::string ImprovBase::get_formatted_next_url_() {
   // Ip address
   pos = this->next_url_.find("{{ip_address}}");
   if (pos != std::string::npos) {
-    std::string ip = network::IPAddress(network::get_ip_address()).str();
+    std::string ip = network::get_ip_address().str();
     copy.replace(pos, 14, ip);
   }
 
diff --git a/esphome/components/microphone/__init__.py b/esphome/components/microphone/__init__.py
new file mode 100644
index 0000000000..ff1f7aa963
--- /dev/null
+++ b/esphome/components/microphone/__init__.py
@@ -0,0 +1,91 @@
+from esphome import automation
+import esphome.config_validation as cv
+import esphome.codegen as cg
+
+from esphome.automation import maybe_simple_id
+from esphome.const import CONF_ID, CONF_TRIGGER_ID
+from esphome.core import CORE
+from esphome.coroutine import coroutine_with_priority
+
+
+CODEOWNERS = ["@jesserockz"]
+
+IS_PLATFORM_COMPONENT = True
+
+CONF_ON_DATA = "on_data"
+
+microphone_ns = cg.esphome_ns.namespace("microphone")
+
+Microphone = microphone_ns.class_("Microphone")
+
+CaptureAction = microphone_ns.class_(
+    "CaptureAction", automation.Action, cg.Parented.template(Microphone)
+)
+StopCaptureAction = microphone_ns.class_(
+    "StopCaptureAction", automation.Action, cg.Parented.template(Microphone)
+)
+
+
+DataTrigger = microphone_ns.class_(
+    "DataTrigger",
+    automation.Trigger.template(cg.std_vector.template(cg.int16).operator("ref")),
+)
+
+IsCapturingCondition = microphone_ns.class_(
+    "IsCapturingCondition", automation.Condition
+)
+
+
+async def setup_microphone_core_(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"), "x")],
+            conf,
+        )
+
+
+async def register_microphone(var, config):
+    if not CORE.has_id(config[CONF_ID]):
+        var = cg.Pvariable(config[CONF_ID], var)
+    await setup_microphone_core_(var, config)
+
+
+MICROPHONE_SCHEMA = cv.Schema(
+    {
+        cv.Optional(CONF_ON_DATA): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(DataTrigger),
+            }
+        ),
+    }
+)
+
+
+MICROPHONE_ACTION_SCHEMA = maybe_simple_id({cv.GenerateID(): cv.use_id(Microphone)})
+
+
+async def media_player_action(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    await cg.register_parented(var, config[CONF_ID])
+    return var
+
+
+automation.register_action(
+    "microphone.capture", CaptureAction, MICROPHONE_ACTION_SCHEMA
+)(media_player_action)
+
+automation.register_action(
+    "microphone.stop_capture", StopCaptureAction, MICROPHONE_ACTION_SCHEMA
+)(media_player_action)
+
+automation.register_condition(
+    "microphone.is_capturing", IsCapturingCondition, MICROPHONE_ACTION_SCHEMA
+)(media_player_action)
+
+
+@coroutine_with_priority(100.0)
+async def to_code(config):
+    cg.add_global(microphone_ns.using)
+    cg.add_define("USE_MICROPHONE")
diff --git a/esphome/components/microphone/automation.h b/esphome/components/microphone/automation.h
new file mode 100644
index 0000000000..5f404b8d74
--- /dev/null
+++ b/esphome/components/microphone/automation.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "esphome/core/automation.h"
+#include "microphone.h"
+
+#include <vector>
+
+namespace esphome {
+namespace microphone {
+
+template<typename... Ts> class CaptureAction : public Action<Ts...>, public Parented<Microphone> {
+  void play(Ts... x) override { this->parent_->start(); }
+};
+
+template<typename... Ts> class StopCaptureAction : public Action<Ts...>, public Parented<Microphone> {
+  void play(Ts... x) override { this->parent_->stop(); }
+};
+
+class DataTrigger : public Trigger<const std::vector<uint8_t> &> {
+ public:
+  explicit DataTrigger(Microphone *mic) {
+    mic->add_data_callback([this](const std::vector<uint8_t> &data) { this->trigger(data); });
+  }
+};
+
+template<typename... Ts> class IsCapturingActon : public Condition<Ts...>, public Parented<Microphone> {
+ public:
+  bool check(Ts... x) override { return this->parent_->is_running(); }
+};
+
+}  // namespace microphone
+}  // namespace esphome
diff --git a/esphome/components/microphone/microphone.h b/esphome/components/microphone/microphone.h
new file mode 100644
index 0000000000..b725f66ad7
--- /dev/null
+++ b/esphome/components/microphone/microphone.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "esphome/core/entity_base.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace microphone {
+
+enum State : uint8_t {
+  STATE_STOPPED = 0,
+  STATE_STARTING,
+  STATE_RUNNING,
+  STATE_STOPPING,
+};
+
+class Microphone {
+ public:
+  virtual void start() = 0;
+  virtual void stop() = 0;
+  void add_data_callback(std::function<void(const std::vector<uint8_t> &)> &&data_callback) {
+    this->data_callbacks_.add(std::move(data_callback));
+  }
+
+  bool is_running() const { return this->state_ == STATE_RUNNING; }
+
+ protected:
+  State state_{STATE_STOPPED};
+
+  CallbackManager<void(const std::vector<uint8_t> &)> data_callbacks_{};
+};
+
+}  // namespace microphone
+}  // namespace esphome
diff --git a/esphome/components/socket/bsd_sockets_impl.cpp b/esphome/components/socket/bsd_sockets_impl.cpp
index 3a08e3ea52..2dea4af277 100644
--- a/esphome/components/socket/bsd_sockets_impl.cpp
+++ b/esphome/components/socket/bsd_sockets_impl.cpp
@@ -139,6 +139,11 @@ class BSDSocketImpl : public Socket {
     return ::writev(fd_, iov, iovcnt);
 #endif
   }
+
+  ssize_t sendto(const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen) override {
+    return ::sendto(fd_, buf, len, flags, to, tolen);
+  }
+
   int setblocking(bool blocking) override {
     int fl = ::fcntl(fd_, F_GETFL, 0);
     if (blocking) {
diff --git a/esphome/components/socket/lwip_raw_tcp_impl.cpp b/esphome/components/socket/lwip_raw_tcp_impl.cpp
index f5bb57bb93..bd59b81caa 100644
--- a/esphome/components/socket/lwip_raw_tcp_impl.cpp
+++ b/esphome/components/socket/lwip_raw_tcp_impl.cpp
@@ -467,6 +467,10 @@ class LWIPRawImpl : public Socket {
     }
     return written;
   }
+  ssize_t sendto(const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen) override {
+    // return ::sendto(fd_, buf, len, flags, to, tolen);
+    return 0;
+  }
   int setblocking(bool blocking) override {
     if (pcb_ == nullptr) {
       errno = ECONNRESET;
diff --git a/esphome/components/socket/socket.cpp b/esphome/components/socket/socket.cpp
index 3fe7491d57..d00ddaeae2 100644
--- a/esphome/components/socket/socket.cpp
+++ b/esphome/components/socket/socket.cpp
@@ -1,7 +1,8 @@
 #include "socket.h"
-#include "esphome/core/log.h"
-#include <cstring>
 #include <cerrno>
+#include <cstring>
+#include <string>
+#include "esphome/core/log.h"
 
 namespace esphome {
 namespace socket {
@@ -14,7 +15,7 @@ std::unique_ptr<Socket> socket_ip(int type, int protocol) {
 #endif
 }
 
-socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const char *ip_address, uint16_t port) {
+socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const std::string &ip_address, uint16_t port) {
 #if LWIP_IPV6
   if (addrlen < sizeof(sockaddr_in6)) {
     errno = EINVAL;
@@ -24,9 +25,14 @@ socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const char *ip_
   memset(server, 0, sizeof(sockaddr_in6));
   server->sin6_family = AF_INET6;
   server->sin6_port = htons(port);
-  ip6_addr_t ip6;
-  inet6_aton(ip_address, &ip6);
-  memcpy(server->sin6_addr.un.u32_addr, ip6.addr, sizeof(ip6.addr));
+
+  if (ip_address.find('.') != std::string::npos) {
+    server->sin6_addr.un.u32_addr[3] = inet_addr(ip_address.c_str());
+  } else {
+    ip6_addr_t ip6;
+    inet6_aton(ip_address.c_str(), &ip6);
+    memcpy(server->sin6_addr.un.u32_addr, ip6.addr, sizeof(ip6.addr));
+  }
   return sizeof(sockaddr_in6);
 #else
   if (addrlen < sizeof(sockaddr_in)) {
@@ -36,7 +42,7 @@ socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const char *ip_
   auto *server = reinterpret_cast<sockaddr_in *>(addr);
   memset(server, 0, sizeof(sockaddr_in));
   server->sin_family = AF_INET;
-  server->sin_addr.s_addr = inet_addr(ip_address);
+  server->sin_addr.s_addr = inet_addr(ip_address.c_str());
   server->sin_port = htons(port);
   return sizeof(sockaddr_in);
 #endif
diff --git a/esphome/components/socket/socket.h b/esphome/components/socket/socket.h
index 175cb21a4a..7400ba306f 100644
--- a/esphome/components/socket/socket.h
+++ b/esphome/components/socket/socket.h
@@ -1,9 +1,9 @@
 #pragma once
-#include <string>
 #include <memory>
+#include <string>
 
-#include "headers.h"
 #include "esphome/core/optional.h"
+#include "headers.h"
 
 namespace esphome {
 namespace socket {
@@ -34,6 +34,8 @@ class Socket {
   virtual ssize_t readv(const struct iovec *iov, int iovcnt) = 0;
   virtual ssize_t write(const void *buf, size_t len) = 0;
   virtual ssize_t writev(const struct iovec *iov, int iovcnt) = 0;
+  virtual ssize_t sendto(const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen);
+
   virtual int setblocking(bool blocking) = 0;
   virtual int loop() { return 0; };
 };
@@ -45,7 +47,7 @@ std::unique_ptr<Socket> socket(int domain, int type, int protocol);
 std::unique_ptr<Socket> socket_ip(int type, int protocol);
 
 /// Set a sockaddr to the specified address and port for the IP version used by socket_ip().
-socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const char *ip_address, uint16_t port);
+socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const std::string &ip_address, uint16_t port);
 
 /// Set a sockaddr to the any address and specified port for the IP version used by socket_ip().
 socklen_t set_sockaddr_any(struct sockaddr *addr, socklen_t addrlen, uint16_t port);
diff --git a/esphome/components/voice_assistant/__init__.py b/esphome/components/voice_assistant/__init__.py
new file mode 100644
index 0000000000..c90fd554ae
--- /dev/null
+++ b/esphome/components/voice_assistant/__init__.py
@@ -0,0 +1,57 @@
+import esphome.config_validation as cv
+import esphome.codegen as cg
+
+from esphome.const import CONF_ID, CONF_MICROPHONE
+from esphome import automation
+from esphome.automation import register_action
+from esphome.components import microphone
+
+AUTO_LOAD = ["socket"]
+DEPENDENCIES = ["api", "microphone"]
+
+CODEOWNERS = ["@jesserockz"]
+
+voice_assistant_ns = cg.esphome_ns.namespace("voice_assistant")
+VoiceAssistant = voice_assistant_ns.class_("VoiceAssistant", cg.Component)
+
+StartAction = voice_assistant_ns.class_(
+    "StartAction", automation.Action, cg.Parented.template(VoiceAssistant)
+)
+StopAction = voice_assistant_ns.class_(
+    "StopAction", automation.Action, cg.Parented.template(VoiceAssistant)
+)
+
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(VoiceAssistant),
+        cv.GenerateID(CONF_MICROPHONE): cv.use_id(microphone.Microphone),
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+
+    mic = await cg.get_variable(config[CONF_MICROPHONE])
+    cg.add(var.set_microphone(mic))
+
+    cg.add_define("USE_VOICE_ASSISTANT")
+
+
+VOICE_ASSISTANT_ACTION_SCHEMA = cv.Schema({cv.GenerateID(): cv.use_id(VoiceAssistant)})
+
+
+@register_action("voice_assistant.start", StartAction, VOICE_ASSISTANT_ACTION_SCHEMA)
+async def voice_assistant_listen_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
+
+
+@register_action("voice_assistant.stop", StopAction, VOICE_ASSISTANT_ACTION_SCHEMA)
+async def voice_assistant_stop_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
diff --git a/esphome/components/voice_assistant/voice_assistant.cpp b/esphome/components/voice_assistant/voice_assistant.cpp
new file mode 100644
index 0000000000..7f4bbf9934
--- /dev/null
+++ b/esphome/components/voice_assistant/voice_assistant.cpp
@@ -0,0 +1,148 @@
+#include "voice_assistant.h"
+
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace voice_assistant {
+
+static const char *const TAG = "voice_assistant";
+
+float VoiceAssistant::get_setup_priority() const { return setup_priority::AFTER_CONNECTION; }
+
+void VoiceAssistant::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up Voice Assistant...");
+
+  global_voice_assistant = this;
+
+  this->socket_ = socket::socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
+  if (socket_ == nullptr) {
+    ESP_LOGW(TAG, "Could not create socket.");
+    this->mark_failed();
+    return;
+  }
+  int enable = 1;
+  int err = socket_->setsockopt(SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int));
+  if (err != 0) {
+    ESP_LOGW(TAG, "Socket unable to set reuseaddr: errno %d", err);
+    // we can still continue
+  }
+  err = socket_->setblocking(false);
+  if (err != 0) {
+    ESP_LOGW(TAG, "Socket unable to set nonblocking mode: errno %d", err);
+    this->mark_failed();
+    return;
+  }
+
+  this->mic_->add_data_callback([this](const std::vector<uint8_t> &data) {
+    if (!this->running_) {
+      return;
+    }
+    this->socket_->sendto(data.data(), data.size(), 0, (struct sockaddr *) &this->dest_addr_, sizeof(this->dest_addr_));
+  });
+}
+
+void VoiceAssistant::start(struct sockaddr_storage *addr, uint16_t port) {
+  ESP_LOGD(TAG, "Starting...");
+
+  memcpy(&this->dest_addr_, addr, sizeof(this->dest_addr_));
+  if (this->dest_addr_.ss_family == AF_INET) {
+    ((struct sockaddr_in *) &this->dest_addr_)->sin_port = htons(port);
+  }
+#if LWIP_IPV6
+  else if (this->dest_addr_.ss_family == AF_INET6) {
+    ((struct sockaddr_in6 *) &this->dest_addr_)->sin6_port = htons(port);
+  }
+#endif
+  else {
+    ESP_LOGW(TAG, "Unknown address family: %d", this->dest_addr_.ss_family);
+    return;
+  }
+  this->running_ = true;
+  this->mic_->start();
+}
+
+void VoiceAssistant::request_start() {
+  ESP_LOGD(TAG, "Requesting start...");
+  api::global_api_server->start_voice_assistant();
+}
+
+void VoiceAssistant::signal_stop() {
+  ESP_LOGD(TAG, "Signaling stop...");
+  this->mic_->stop();
+  this->running_ = false;
+  api::global_api_server->stop_voice_assistant();
+  memset(&this->dest_addr_, 0, sizeof(this->dest_addr_));
+}
+
+void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
+  switch (msg.event_type) {
+    case api::enums::VOICE_ASSISTANT_RUN_END:
+      ESP_LOGD(TAG, "Voice Assistant ended.");
+      break;
+    case api::enums::VOICE_ASSISTANT_STT_END: {
+      std::string text;
+      for (auto arg : msg.data) {
+        if (arg.name == "text") {
+          text = std::move(arg.value);
+        }
+      }
+      if (text.empty()) {
+        ESP_LOGW(TAG, "No text in STT_END event.");
+        return;
+      }
+      ESP_LOGD(TAG, "Speech recognised as: \"%s\"", text.c_str());
+      // TODO `on_stt_end` trigger
+      break;
+    }
+    case api::enums::VOICE_ASSISTANT_TTS_START: {
+      std::string text;
+      for (auto arg : msg.data) {
+        if (arg.name == "text") {
+          text = std::move(arg.value);
+        }
+      }
+      if (text.empty()) {
+        ESP_LOGW(TAG, "No text in TTS_START event.");
+        return;
+      }
+      ESP_LOGD(TAG, "Response: \"%s\"", text.c_str());
+      // TODO `on_tts_start` trigger
+      break;
+    }
+    case api::enums::VOICE_ASSISTANT_TTS_END: {
+      std::string url;
+      for (auto arg : msg.data) {
+        if (arg.name == "url") {
+          url = std::move(arg.value);
+        }
+      }
+      if (url.empty()) {
+        ESP_LOGW(TAG, "No url in TTS_END event.");
+        return;
+      }
+      ESP_LOGD(TAG, "Response URL: \"%s\"", url.c_str());
+      // TODO `on_tts_end` trigger
+      break;
+    }
+    case api::enums::VOICE_ASSISTANT_ERROR: {
+      std::string code = "";
+      std::string message = "";
+      for (auto arg : msg.data) {
+        if (arg.name == "code") {
+          code = std::move(arg.value);
+        } else if (arg.name == "message") {
+          message = std::move(arg.value);
+        }
+      }
+      ESP_LOGE(TAG, "Error: %s - %s", code.c_str(), message.c_str());
+      // TODO `on_error` trigger
+    }
+    default:
+      break;
+  }
+}
+
+VoiceAssistant *global_voice_assistant = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+
+}  // namespace voice_assistant
+}  // namespace esphome
diff --git a/esphome/components/voice_assistant/voice_assistant.h b/esphome/components/voice_assistant/voice_assistant.h
new file mode 100644
index 0000000000..8cc20c31ad
--- /dev/null
+++ b/esphome/components/voice_assistant/voice_assistant.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "esphome/core/automation.h"
+#include "esphome/core/component.h"
+#include "esphome/core/helpers.h"
+
+#include "esphome/components/api/api_pb2.h"
+#include "esphome/components/api/api_server.h"
+#include "esphome/components/microphone/microphone.h"
+#include "esphome/components/socket/socket.h"
+
+namespace esphome {
+namespace voice_assistant {
+
+class VoiceAssistant : public Component {
+ public:
+  void setup() override;
+  float get_setup_priority() const override;
+  void start(struct sockaddr_storage *addr, uint16_t port);
+
+  void set_microphone(microphone::Microphone *mic) { this->mic_ = mic; }
+
+  void request_start();
+  void signal_stop();
+
+  void on_event(const api::VoiceAssistantEventResponse &msg);
+
+ protected:
+  std::unique_ptr<socket::Socket> socket_ = nullptr;
+  struct sockaddr_storage dest_addr_;
+
+  microphone::Microphone *mic_{nullptr};
+
+  bool running_{false};
+};
+
+template<typename... Ts> class StartAction : public Action<Ts...>, public Parented<VoiceAssistant> {
+ public:
+  void play(Ts... x) override { this->parent_->request_start(); }
+};
+
+template<typename... Ts> class StopAction : public Action<Ts...>, public Parented<VoiceAssistant> {
+ public:
+  void play(Ts... x) override { this->parent_->signal_stop(); }
+};
+
+extern VoiceAssistant *global_voice_assistant;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+
+}  // namespace voice_assistant
+}  // namespace esphome
diff --git a/esphome/const.py b/esphome/const.py
index f627b5abd4..534a8ade01 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -394,6 +394,7 @@ CONF_MEASUREMENT_SEQUENCE_NUMBER = "measurement_sequence_number"
 CONF_MEDIUM = "medium"
 CONF_MEMORY_BLOCKS = "memory_blocks"
 CONF_METHOD = "method"
+CONF_MICROPHONE = "microphone"
 CONF_MIN_COOLING_OFF_TIME = "min_cooling_off_time"
 CONF_MIN_COOLING_RUN_TIME = "min_cooling_run_time"
 CONF_MIN_FAN_MODE_SWITCHING_TIME = "min_fan_mode_switching_time"
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index c3738c0365..77d41e5b58 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -72,6 +72,7 @@
 #define USE_SOCKET_IMPL_BSD_SOCKETS
 #define USE_WIFI_11KV_SUPPORT
 #define USE_BLUETOOTH_PROXY
+#define USE_VOICE_ASSISTANT
 
 #ifdef USE_ARDUINO
 #define USE_ARDUINO_VERSION_CODE VERSION_CODE(2, 0, 5)
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index 8950cc3b8a..05a7eaa4cc 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -395,6 +395,9 @@ template<typename T, enable_if_t<std::is_unsigned<T>::value, int> = 0> std::stri
   val = convert_big_endian(val);
   return format_hex(reinterpret_cast<uint8_t *>(&val), sizeof(T));
 }
+template<std::size_t N> std::string format_hex(const std::array<uint8_t, N> &data) {
+  return format_hex(data.data(), data.size());
+}
 
 /// Format the byte array \p data of length \p len in pretty-printed, human-readable hex.
 std::string format_hex_pretty(const uint8_t *data, size_t length);
diff --git a/tests/test4.yaml b/tests/test4.yaml
index 54bb6f40a6..c21e71be00 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -653,13 +653,15 @@ touchscreen:
           format: Touch at (%d, %d)
           args: [touch.x, touch.y]
 
+i2s_audio:
+  i2s_lrclk_pin: GPIO26
+  i2s_bclk_pin: GPIO27
+
 media_player:
   - platform: i2s_audio
-    name: ${friendly_name}
+    name: None
     dac_type: external
-    i2s_lrclk_pin: GPIO26
     i2s_dout_pin: GPIO25
-    i2s_bclk_pin: GPIO27
     mute_pin: GPIO14
     on_state:
       - media_player.play:
@@ -685,3 +687,12 @@ prometheus:
     ha_hello_world:
       id: hellow_world
       name: Hello World
+
+microphone:
+  - platform: i2s_audio
+    id: mic_id
+    i2s_din_pin: GPIO23
+
+
+voice_assistant:
+  microphone: mic_id

From 3d7d689040dcb393c1de299b53c07dd5a781c9cc Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Tue, 11 Apr 2023 20:38:41 -0500
Subject: [PATCH 769/838] Fix ESP32 SPI hardware assignment in Arduino fw
 (#4669)

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

diff --git a/esphome/components/spi/spi.cpp b/esphome/components/spi/spi.cpp
index c3ffba4229..141bfb9448 100644
--- a/esphome/components/spi/spi.cpp
+++ b/esphome/components/spi/spi.cpp
@@ -79,7 +79,7 @@ void SPIComponent::setup() {
 #if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
       this->hw_spi_ = new SPIClass(FSPI);  // NOLINT(cppcoreguidelines-owning-memory)
 #else
-      this->hw_spi_ = new SPIClass(VSPI);  // NOLINT(cppcoreguidelines-owning-memory)
+      this->hw_spi_ = new SPIClass(HSPI);  // NOLINT(cppcoreguidelines-owning-memory)
 #endif  // USE_ESP32_VARIANT
     }
     spi_bus_num++;

From 5a4840f6417b4f8dad466842edc519f92a36a2d2 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Tue, 11 Apr 2023 21:29:06 -0500
Subject: [PATCH 770/838] Fix some NFC/PN532 crashes (#4678)

* Add + use some constants, fix some crashes

* Fix PN532 crashes
---
 esphome/components/nfc/ndef_message.cpp           |  5 +++++
 esphome/components/nfc/ndef_record.h              |  4 ++--
 esphome/components/nfc/nfc.cpp                    | 12 ++++++------
 esphome/components/nfc/nfc.h                      | 11 +++++++++++
 esphome/components/pn532/pn532_mifare_classic.cpp |  8 +++++++-
 5 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/esphome/components/nfc/ndef_message.cpp b/esphome/components/nfc/ndef_message.cpp
index d7d134aedb..461856d377 100644
--- a/esphome/components/nfc/ndef_message.cpp
+++ b/esphome/components/nfc/ndef_message.cpp
@@ -44,6 +44,11 @@ NdefMessage::NdefMessage(std::vector<uint8_t> &data) {
       index += id_length;
     }
 
+    if ((data.begin() + index > data.end()) || (data.begin() + index + payload_length > data.end())) {
+      ESP_LOGE(TAG, "Corrupt record encountered; NdefMessage constructor aborting");
+      break;
+    }
+
     std::vector<uint8_t> payload_data(data.begin() + index, data.begin() + index + payload_length);
 
     std::unique_ptr<NdefRecord> record;
diff --git a/esphome/components/nfc/ndef_record.h b/esphome/components/nfc/ndef_record.h
index 27083fdaca..20542bf24b 100644
--- a/esphome/components/nfc/ndef_record.h
+++ b/esphome/components/nfc/ndef_record.h
@@ -42,8 +42,8 @@ class NdefRecord {
   virtual const std::string &get_payload() const { return this->payload_; };
 
   virtual std::vector<uint8_t> get_encoded_payload() {
-    std::vector<uint8_t> empty_payload;
-    return empty_payload;
+    std::vector<uint8_t> payload(this->payload_.begin(), this->payload_.end());
+    return payload;
   };
 
  protected:
diff --git a/esphome/components/nfc/nfc.cpp b/esphome/components/nfc/nfc.cpp
index 09dbdcfe94..b7c7215028 100644
--- a/esphome/components/nfc/nfc.cpp
+++ b/esphome/components/nfc/nfc.cpp
@@ -89,18 +89,18 @@ uint32_t get_mifare_classic_buffer_size(uint32_t message_length) {
 }
 
 bool mifare_classic_is_first_block(uint8_t block_num) {
-  if (block_num < 128) {
-    return (block_num % 4 == 0);
+  if (block_num < MIFARE_CLASSIC_BLOCKS_PER_SECT_LOW * MIFARE_CLASSIC_16BLOCK_SECT_START) {
+    return (block_num % MIFARE_CLASSIC_BLOCKS_PER_SECT_LOW == 0);
   } else {
-    return (block_num % 16 == 0);
+    return (block_num % MIFARE_CLASSIC_BLOCKS_PER_SECT_HIGH == 0);
   }
 }
 
 bool mifare_classic_is_trailer_block(uint8_t block_num) {
-  if (block_num < 128) {
-    return ((block_num + 1) % 4 == 0);
+  if (block_num < MIFARE_CLASSIC_BLOCKS_PER_SECT_LOW * MIFARE_CLASSIC_16BLOCK_SECT_START) {
+    return ((block_num + 1) % MIFARE_CLASSIC_BLOCKS_PER_SECT_LOW == 0);
   } else {
-    return ((block_num + 1) % 16 == 0);
+    return ((block_num + 1) % MIFARE_CLASSIC_BLOCKS_PER_SECT_HIGH == 0);
   }
 }
 
diff --git a/esphome/components/nfc/nfc.h b/esphome/components/nfc/nfc.h
index 1a4e8f1c1d..d4d66f970f 100644
--- a/esphome/components/nfc/nfc.h
+++ b/esphome/components/nfc/nfc.h
@@ -14,6 +14,9 @@ namespace nfc {
 static const uint8_t MIFARE_CLASSIC_BLOCK_SIZE = 16;
 static const uint8_t MIFARE_CLASSIC_LONG_TLV_SIZE = 4;
 static const uint8_t MIFARE_CLASSIC_SHORT_TLV_SIZE = 2;
+static const uint8_t MIFARE_CLASSIC_BLOCKS_PER_SECT_LOW = 4;
+static const uint8_t MIFARE_CLASSIC_BLOCKS_PER_SECT_HIGH = 16;
+static const uint8_t MIFARE_CLASSIC_16BLOCK_SECT_START = 32;
 
 static const uint8_t MIFARE_ULTRALIGHT_PAGE_SIZE = 4;
 static const uint8_t MIFARE_ULTRALIGHT_READ_SIZE = 4;
@@ -30,10 +33,18 @@ static const uint8_t TAG_TYPE_UNKNOWN = 99;
 // Mifare Commands
 static const uint8_t MIFARE_CMD_AUTH_A = 0x60;
 static const uint8_t MIFARE_CMD_AUTH_B = 0x61;
+static const uint8_t MIFARE_CMD_HALT = 0x50;
 static const uint8_t MIFARE_CMD_READ = 0x30;
 static const uint8_t MIFARE_CMD_WRITE = 0xA0;
 static const uint8_t MIFARE_CMD_WRITE_ULTRALIGHT = 0xA2;
 
+// Mifare Ack/Nak
+static const uint8_t MIFARE_CMD_ACK = 0x0A;
+static const uint8_t MIFARE_CMD_NAK_INVALID_XFER_BUFF_VALID = 0x00;
+static const uint8_t MIFARE_CMD_NAK_CRC_ERROR_XFER_BUFF_VALID = 0x01;
+static const uint8_t MIFARE_CMD_NAK_INVALID_XFER_BUFF_INVALID = 0x04;
+static const uint8_t MIFARE_CMD_NAK_CRC_ERROR_XFER_BUFF_INVALID = 0x05;
+
 static const char *const MIFARE_CLASSIC = "Mifare Classic";
 static const char *const NFC_FORUM_TYPE_2 = "NFC Forum Type 2";
 static const char *const ERROR = "Error";
diff --git a/esphome/components/pn532/pn532_mifare_classic.cpp b/esphome/components/pn532/pn532_mifare_classic.cpp
index 17d7aa123c..943f8c5519 100644
--- a/esphome/components/pn532/pn532_mifare_classic.cpp
+++ b/esphome/components/pn532/pn532_mifare_classic.cpp
@@ -52,7 +52,13 @@ std::unique_ptr<nfc::NfcTag> PN532::read_mifare_classic_tag_(std::vector<uint8_t
       current_block++;
     }
   }
-  buffer.erase(buffer.begin(), buffer.begin() + message_start_index);
+
+  if (buffer.begin() + message_start_index < buffer.end()) {
+    buffer.erase(buffer.begin(), buffer.begin() + message_start_index);
+  } else {
+    return make_unique<nfc::NfcTag>(uid, nfc::MIFARE_CLASSIC);
+  }
+
   return make_unique<nfc::NfcTag>(uid, nfc::MIFARE_CLASSIC, buffer);
 }
 

From a3cacc0c8b5b567c37c0f6a57870f3608fd5be42 Mon Sep 17 00:00:00 2001
From: Dave Johnston <1548274+johnsto@users.noreply.github.com>
Date: Wed, 12 Apr 2023 05:02:29 +0100
Subject: [PATCH 771/838] Add support for SSD1306 72x40 displays (#4659)

* add SSD1306 72x40

* fix indents

* fix clang style
---
 esphome/components/ssd1306_base/__init__.py      |  1 +
 esphome/components/ssd1306_base/ssd1306_base.cpp | 15 +++++++++++++++
 esphome/components/ssd1306_base/ssd1306_base.h   |  1 +
 esphome/components/ssd1306_i2c/ssd1306_i2c.cpp   |  8 +++++++-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/esphome/components/ssd1306_base/__init__.py b/esphome/components/ssd1306_base/__init__.py
index f2e4ef5811..48143b9e1a 100644
--- a/esphome/components/ssd1306_base/__init__.py
+++ b/esphome/components/ssd1306_base/__init__.py
@@ -27,6 +27,7 @@ MODELS = {
     "SSD1306_96X16": SSD1306Model.SSD1306_MODEL_96_16,
     "SSD1306_64X48": SSD1306Model.SSD1306_MODEL_64_48,
     "SSD1306_64X32": SSD1306Model.SSD1306_MODEL_64_32,
+    "SSD1306_72X40": SSD1306Model.SSD1306_MODEL_72_40,
     "SH1106_128X32": SSD1306Model.SH1106_MODEL_128_32,
     "SH1106_128X64": SSD1306Model.SH1106_MODEL_128_64,
     "SH1106_96X16": SSD1306Model.SH1106_MODEL_96_16,
diff --git a/esphome/components/ssd1306_base/ssd1306_base.cpp b/esphome/components/ssd1306_base/ssd1306_base.cpp
index 2ba990637e..730e1c8f35 100644
--- a/esphome/components/ssd1306_base/ssd1306_base.cpp
+++ b/esphome/components/ssd1306_base/ssd1306_base.cpp
@@ -59,6 +59,7 @@ void SSD1306::setup() {
   // Set Y offset (0xD3)
   this->command(SSD1306_COMMAND_SET_DISPLAY_OFFSET_Y);
   this->command(0x00 + this->offset_y_);
+
   // Set start line at line 0 (0x40)
   this->command(SSD1306_COMMAND_SET_START_LINE | 0x00);
 
@@ -100,6 +101,7 @@ void SSD1306::setup() {
     case SH1107_MODEL_128_64:
     case SSD1305_MODEL_128_32:
     case SSD1305_MODEL_128_64:
+    case SSD1306_MODEL_72_40:
       this->command(0x12);
       break;
   }
@@ -118,6 +120,9 @@ void SSD1306::setup() {
     case SH1107_MODEL_128_64:
       this->command(0x35);
       break;
+    case SSD1306_MODEL_72_40:
+      this->command(0x20);
+      break;
     default:
       this->command(0x00);
       break;
@@ -156,6 +161,10 @@ void SSD1306::display() {
       this->command(0x20 + this->offset_x_);
       this->command(0x20 + this->offset_x_ + this->get_width_internal() - 1);
       break;
+    case SSD1306_MODEL_72_40:
+      this->command(0x1C + this->offset_x_);
+      this->command(0x1C + this->offset_x_ + this->get_width_internal() - 1);
+      break;
     default:
       this->command(0 + this->offset_x_);  // Page start address, 0
       this->command(this->get_width_internal() + this->offset_x_ - 1);
@@ -225,6 +234,8 @@ int SSD1306::get_height_internal() {
     case SSD1306_MODEL_64_48:
     case SH1106_MODEL_64_48:
       return 48;
+    case SSD1306_MODEL_72_40:
+      return 40;
     default:
       return 0;
   }
@@ -246,6 +257,8 @@ int SSD1306::get_width_internal() {
     case SH1106_MODEL_64_48:
     case SH1107_MODEL_128_64:
       return 64;
+    case SSD1306_MODEL_72_40:
+      return 72;
     default:
       return 0;
   }
@@ -294,6 +307,8 @@ const char *SSD1306::model_str_() {
       return "SSD1306 96x16";
     case SSD1306_MODEL_64_48:
       return "SSD1306 64x48";
+    case SSD1306_MODEL_72_40:
+      return "SSD1306 72x40";
     case SH1106_MODEL_128_32:
       return "SH1106 128x32";
     case SH1106_MODEL_128_64:
diff --git a/esphome/components/ssd1306_base/ssd1306_base.h b/esphome/components/ssd1306_base/ssd1306_base.h
index 2f5baffb69..7402ae3af2 100644
--- a/esphome/components/ssd1306_base/ssd1306_base.h
+++ b/esphome/components/ssd1306_base/ssd1306_base.h
@@ -13,6 +13,7 @@ enum SSD1306Model {
   SSD1306_MODEL_96_16,
   SSD1306_MODEL_64_48,
   SSD1306_MODEL_64_32,
+  SSD1306_MODEL_72_40,
   SH1106_MODEL_128_32,
   SH1106_MODEL_128_64,
   SH1106_MODEL_96_16,
diff --git a/esphome/components/ssd1306_i2c/ssd1306_i2c.cpp b/esphome/components/ssd1306_i2c/ssd1306_i2c.cpp
index 64b09c0672..96734eb618 100644
--- a/esphome/components/ssd1306_i2c/ssd1306_i2c.cpp
+++ b/esphome/components/ssd1306_i2c/ssd1306_i2c.cpp
@@ -53,8 +53,14 @@ void HOT I2CSSD1306::write_display_data() {
       }
     }
   } else {
+    size_t block_size = 16;
+    if ((this->get_buffer_length_() & 8) == 8) {
+      // use smaller block size for e.g. 72x40 displays where buffer size is multiple of 8, not 16
+      block_size = 8;
+    }
+
     for (uint32_t i = 0; i < this->get_buffer_length_();) {
-      uint8_t data[16];
+      uint8_t data[block_size];
       for (uint8_t &j : data)
         j = this->buffer_[i++];
       this->write_bytes(0x40, data, sizeof(data));

From 0b9e8fda342c1a6be1e754afb514bdf03d9348e6 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 12 Apr 2023 20:25:19 +1200
Subject: [PATCH 772/838] Fix pin schema for i2s microphone (#4680)

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

diff --git a/esphome/components/i2s_audio/microphone/__init__.py b/esphome/components/i2s_audio/microphone/__init__.py
index 08d7a5c95f..5abc13a044 100644
--- a/esphome/components/i2s_audio/microphone/__init__.py
+++ b/esphome/components/i2s_audio/microphone/__init__.py
@@ -24,7 +24,7 @@ CONFIG_SCHEMA = microphone.MICROPHONE_SCHEMA.extend(
     {
         cv.GenerateID(): cv.declare_id(I2SAudioMicrophone),
         cv.GenerateID(CONF_I2S_AUDIO_ID): cv.use_id(I2SAudioComponent),
-        cv.Required(CONF_I2S_DIN_PIN): pins.internal_gpio_output_pin_number,
+        cv.Required(CONF_I2S_DIN_PIN): pins.internal_gpio_input_pin_number,
     }
 ).extend(cv.COMPONENT_SCHEMA)
 

From 7963abb27a253460c9353c87b7c8ebef86c4ba8a Mon Sep 17 00:00:00 2001
From: Joe <jhansche@themeetgroup.com>
Date: Wed, 12 Apr 2023 04:33:15 -0400
Subject: [PATCH 773/838] Fix BedJet setup priority [fixes esphome/issues#3807]
 (#4677)

There is a race condition where a BedJet unit previously had its BLE
"notify" flag enabled, and it continues to broadcast these notify
packets even after the ESP32 (and BLEClient) goes away, such as during
a crash or unplugging power.

BLEClient::setup_priority=AFTER_BLUETOOTH, while
BedJetHub::setup_priority=AFTER_WIFI. When the ESP32 starts back up
again, BLEClient::setup() happens first and will start receiving the
BLE notify packets almost immediately. Since we register the BLEClient
child from codegen, BedJetHub is registered as a child already by this
point, so BLEClient dispatches the notify status packet (and other gatt
events) to the BedJetHub handler, even though BedJetHub::setup() has
not been called yet.

We initialize BedJetHub::codec_ in setup(), so if BLEClient starts
dispatching gatt events before setup() is called, then codec_ will not
be initialized yet. This causes BedJetHub's gatt notify handler to call
`this->codec_->decode_notify()` on an uninitialized null pointer. Since
invoking a method does not have to dereference the pointer, that method
invocation is allowed; but later trying to access memory on that
instance results in a StoreProhibited panic.

Changing the BedJetHub's setup_priority to BLUETOOTH causes it to be
setup before BLEClient, so that by the time BLEClient starts to receive
BLE packets, BedJetHub is ready to receive them.
---
 esphome/components/bedjet/bedjet_hub.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/bedjet/bedjet_hub.h b/esphome/components/bedjet/bedjet_hub.h
index e4af2bca51..5809827cfa 100644
--- a/esphome/components/bedjet/bedjet_hub.h
+++ b/esphome/components/bedjet/bedjet_hub.h
@@ -116,7 +116,7 @@ class BedJetHub : public esphome::ble_client::BLEClientNode, public PollingCompo
   void update() override;
   void dump_config() override;
   void setup() override { this->codec_ = make_unique<BedjetCodec>(); }
-  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
+  float get_setup_priority() const override { return setup_priority::BLUETOOTH; }
 
   /** @return The BedJet's configured name, or the MAC address if not discovered yet. */
   std::string get_name() {

From d75daa96447123d7ee8e5c9ae72094f38c23d006 Mon Sep 17 00:00:00 2001
From: X-Ryl669 <boite.pour.spam@gmail.com>
Date: Wed, 12 Apr 2023 23:16:44 +0200
Subject: [PATCH 774/838] Add always trigger stop (#4249)

* feat: Add manual control config override 1/3

* feat: Add manual control config override 2/3

* feat: Add manual control config override 3/3

* No magical number is better

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>

---------

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/time_based/cover.py             | 3 +++
 esphome/components/time_based/time_based_cover.cpp | 8 ++++++++
 esphome/components/time_based/time_based_cover.h   | 2 ++
 3 files changed, 13 insertions(+)

diff --git a/esphome/components/time_based/cover.py b/esphome/components/time_based/cover.py
index 9625781c96..a14a08ccad 100644
--- a/esphome/components/time_based/cover.py
+++ b/esphome/components/time_based/cover.py
@@ -16,6 +16,7 @@ time_based_ns = cg.esphome_ns.namespace("time_based")
 TimeBasedCover = time_based_ns.class_("TimeBasedCover", cover.Cover, cg.Component)
 
 CONF_HAS_BUILT_IN_ENDSTOP = "has_built_in_endstop"
+CONF_MANUAL_CONTROL = "manual_control"
 
 CONFIG_SCHEMA = cover.COVER_SCHEMA.extend(
     {
@@ -26,6 +27,7 @@ CONFIG_SCHEMA = cover.COVER_SCHEMA.extend(
         cv.Required(CONF_CLOSE_ACTION): automation.validate_automation(single=True),
         cv.Required(CONF_CLOSE_DURATION): cv.positive_time_period_milliseconds,
         cv.Optional(CONF_HAS_BUILT_IN_ENDSTOP, default=False): cv.boolean,
+        cv.Optional(CONF_MANUAL_CONTROL, default=False): cv.boolean,
         cv.Optional(CONF_ASSUMED_STATE, default=True): cv.boolean,
     }
 ).extend(cv.COMPONENT_SCHEMA)
@@ -51,4 +53,5 @@ async def to_code(config):
     )
 
     cg.add(var.set_has_built_in_endstop(config[CONF_HAS_BUILT_IN_ENDSTOP]))
+    cg.add(var.set_manual_control(config[CONF_MANUAL_CONTROL]))
     cg.add(var.set_assumed_state(config[CONF_ASSUMED_STATE]))
diff --git a/esphome/components/time_based/time_based_cover.cpp b/esphome/components/time_based/time_based_cover.cpp
index 522252e907..a7ba6d0595 100644
--- a/esphome/components/time_based/time_based_cover.cpp
+++ b/esphome/components/time_based/time_based_cover.cpp
@@ -79,6 +79,14 @@ void TimeBasedCover::control(const CoverCall &call) {
     auto pos = *call.get_position();
     if (pos == this->position) {
       // already at target
+      if (this->manual_control_ && (pos == COVER_OPEN || pos == COVER_CLOSED)) {
+        // for covers with manual control switch, we can't rely on the computed position, so if
+        // the command triggered again, we'll assume it's in the opposite direction anyway.
+        auto op = pos == COVER_CLOSED ? COVER_OPERATION_CLOSING : COVER_OPERATION_OPENING;
+        this->position = pos == COVER_CLOSED ? COVER_OPEN : COVER_CLOSED;
+        this->target_position_ = pos;
+        this->start_direction_(op);
+      }
       // for covers with built in end stop, we should send the command again
       if (this->has_built_in_endstop_ && (pos == COVER_OPEN || pos == COVER_CLOSED)) {
         auto op = pos == COVER_CLOSED ? COVER_OPERATION_CLOSING : COVER_OPERATION_OPENING;
diff --git a/esphome/components/time_based/time_based_cover.h b/esphome/components/time_based/time_based_cover.h
index 517ab77cb3..b7a826d237 100644
--- a/esphome/components/time_based/time_based_cover.h
+++ b/esphome/components/time_based/time_based_cover.h
@@ -21,6 +21,7 @@ class TimeBasedCover : public cover::Cover, public Component {
   void set_close_duration(uint32_t close_duration) { this->close_duration_ = close_duration; }
   cover::CoverTraits get_traits() override;
   void set_has_built_in_endstop(bool value) { this->has_built_in_endstop_ = value; }
+  void set_manual_control(bool value) { this->manual_control_ = value; }
   void set_assumed_state(bool value) { this->assumed_state_ = value; }
 
  protected:
@@ -44,6 +45,7 @@ class TimeBasedCover : public cover::Cover, public Component {
   uint32_t last_publish_time_{0};
   float target_position_{0};
   bool has_built_in_endstop_{false};
+  bool manual_control_{false};
   bool assumed_state_{false};
   cover::CoverOperation last_operation_{cover::COVER_OPERATION_OPENING};
 };

From 443c3c2a5671e17018654f9fa7671fe7959b444c Mon Sep 17 00:00:00 2001
From: unhold <c.unhold@gmail.com>
Date: Wed, 12 Apr 2023 23:18:09 +0200
Subject: [PATCH 775/838] Fix graph limits for negative values and other corner
 cases (#4253)

Fix lower graph limit for negative values by rounding down instead of truncating.
Consistently handle the corner cases: empty trace, min=max (e.g. single value)
by drawing the grid lines for a single grid division.
---
 esphome/components/graph/graph.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/esphome/components/graph/graph.cpp b/esphome/components/graph/graph.cpp
index daff89e0a6..c229f17dd8 100644
--- a/esphome/components/graph/graph.cpp
+++ b/esphome/components/graph/graph.cpp
@@ -122,11 +122,18 @@ void Graph::draw(DisplayBuffer *buff, uint16_t x_offset, uint16_t y_offset, Colo
   }
 
   // Adjust limits to nice y_per_div boundaries
-  int yn = int(ymin / y_per_div);
-  int ym = int(ymax / y_per_div) + int(1 * (fmodf(ymax, y_per_div) != 0));
-  ymin = yn * y_per_div;
-  ymax = ym * y_per_div;
-  yrange = ymax - ymin;
+  int yn = 0;
+  int ym = 1;
+  if (!std::isnan(ymin) && !std::isnan(ymax)) {
+    yn = (int) floorf(ymin / y_per_div);
+    ym = (int) ceilf(ymax / y_per_div);
+    if (yn == ym) {
+      ym++;
+    }
+    ymin = yn * y_per_div;
+    ymax = ym * y_per_div;
+    yrange = ymax - ymin;
+  }
 
   /// Draw grid
   if (!std::isnan(this->gridspacing_y_)) {

From b5fbe0b1451ac6f709c2aced14918977d284f584 Mon Sep 17 00:00:00 2001
From: unhold <c.unhold@gmail.com>
Date: Wed, 12 Apr 2023 23:19:52 +0200
Subject: [PATCH 776/838] Fix cut-off on 2.13" waveshare/ttgo epaper displays
 (#4255)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The controller of the 2.13" waveshare/ttgo epaper displays operates with a 128x250 buffer,
while only 122x250 pixels are shown. While this can be ignored for rotations 0/270°,
with roations 90/180°, 6 pixels are cut-off from the top or left edge.
This change introduces a distinction between object width and controller width,
resulting in pixel-perfect rotations.
---
 .../waveshare_epaper/waveshare_epaper.cpp     | 22 ++++++++++++++++---
 .../waveshare_epaper/waveshare_epaper.h       |  4 ++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.cpp b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
index 8fd5c2e1f3..8c4b137514 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.cpp
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
@@ -137,7 +137,7 @@ void HOT WaveshareEPaper::draw_absolute_pixel_internal(int x, int y, Color color
   if (x >= this->get_width_internal() || y >= this->get_height_internal() || x < 0 || y < 0)
     return;
 
-  const uint32_t pos = (x + y * this->get_width_internal()) / 8u;
+  const uint32_t pos = (x + y * this->get_width_controller()) / 8u;
   const uint8_t subpos = x & 0x07;
   // flip logic
   if (!color.is_on()) {
@@ -146,7 +146,9 @@ void HOT WaveshareEPaper::draw_absolute_pixel_internal(int x, int y, Color color
     this->buffer_[pos] &= ~(0x80 >> subpos);
   }
 }
-uint32_t WaveshareEPaper::get_buffer_length_() { return this->get_width_internal() * this->get_height_internal() / 8u; }
+uint32_t WaveshareEPaper::get_buffer_length_() {
+  return this->get_width_controller() * this->get_height_internal() / 8u;
+}
 void WaveshareEPaper::start_command_() {
   this->dc_pin_->digital_write(false);
   this->enable();
@@ -291,7 +293,7 @@ void HOT WaveshareEPaperTypeA::display() {
       // COMMAND SET RAM X ADDRESS START END POSITION
       this->command(0x44);
       this->data(0x00);
-      this->data((this->get_width_internal() - 1) >> 3);
+      this->data((this->get_width_controller() - 1) >> 3);
       // COMMAND SET RAM Y ADDRESS START END POSITION
       this->command(0x45);
       this->data(this->get_height_internal() - 1);
@@ -392,12 +394,26 @@ int WaveshareEPaperTypeA::get_width_internal() {
     case TTGO_EPAPER_2_13_IN_B73:
     case TTGO_EPAPER_2_13_IN_B74:
     case TTGO_EPAPER_2_13_IN_B1:
+      return 122;
     case WAVESHARE_EPAPER_2_9_IN:
     case WAVESHARE_EPAPER_2_9_IN_V2:
       return 128;
   }
   return 0;
 }
+// The controller of the 2.13" displays has a buffer larger than screen size
+int WaveshareEPaperTypeA::get_width_controller() {
+  switch (this->model_) {
+    case WAVESHARE_EPAPER_2_13_IN:
+    case TTGO_EPAPER_2_13_IN:
+    case TTGO_EPAPER_2_13_IN_B73:
+    case TTGO_EPAPER_2_13_IN_B74:
+    case TTGO_EPAPER_2_13_IN_B1:
+      return 128;
+    default:
+      return this->get_width_internal();
+  }
+}
 int WaveshareEPaperTypeA::get_height_internal() {
   switch (this->model_) {
     case WAVESHARE_EPAPER_1_54_IN:
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.h b/esphome/components/waveshare_epaper/waveshare_epaper.h
index 848b293c45..a674d3af0c 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.h
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.h
@@ -54,6 +54,8 @@ class WaveshareEPaper : public PollingComponent,
     }
   }
 
+  virtual int get_width_controller() { return this->get_width_internal(); };
+
   uint32_t get_buffer_length_();
   uint32_t reset_duration_{200};
 
@@ -111,6 +113,8 @@ class WaveshareEPaperTypeA : public WaveshareEPaper {
 
   int get_height_internal() override;
 
+  int get_width_controller() override;
+
   uint32_t full_update_every_{30};
   uint32_t at_update_{0};
   WaveshareEPaperTypeAModel model_;

From 0547f2a9316fd80712515993304a1b5049f56ea7 Mon Sep 17 00:00:00 2001
From: Fabian <Fabian-Schmidt@users.noreply.github.com>
Date: Wed, 12 Apr 2023 23:22:08 +0200
Subject: [PATCH 777/838] Add KSZ8081 support. (#4668)

Co-authored-by: Your Name <you@example.com>
---
 esphome/components/ethernet/__init__.py         |  1 +
 .../components/ethernet/ethernet_component.cpp  | 17 +++++++++++++++--
 .../components/ethernet/ethernet_component.h    |  6 ++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/esphome/components/ethernet/__init__.py b/esphome/components/ethernet/__init__.py
index f6ca376681..bedc0a4c30 100644
--- a/esphome/components/ethernet/__init__.py
+++ b/esphome/components/ethernet/__init__.py
@@ -34,6 +34,7 @@ ETHERNET_TYPES = {
     "DP83848": EthernetType.ETHERNET_TYPE_DP83848,
     "IP101": EthernetType.ETHERNET_TYPE_IP101,
     "JL1101": EthernetType.ETHERNET_TYPE_JL1101,
+    "KSZ8081": EthernetType.ETHERNET_TYPE_KSZ8081,
 }
 
 emac_rmii_clock_mode_t = cg.global_ns.enum("emac_rmii_clock_mode_t")
diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index 4792728a71..8eb4718f49 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -74,6 +74,10 @@ void EthernetComponent::setup() {
       phy = esp_eth_phy_new_jl1101(&phy_config);
       break;
     }
+    case ETHERNET_TYPE_KSZ8081: {
+      phy = esp_eth_phy_new_ksz8081(&phy_config);
+      break;
+    }
     default: {
       this->mark_failed();
       return;
@@ -140,7 +144,7 @@ void EthernetComponent::loop() {
 }
 
 void EthernetComponent::dump_config() {
-  std::string eth_type;
+  const char *eth_type;
   switch (this->type_) {
     case ETHERNET_TYPE_LAN8720:
       eth_type = "LAN8720";
@@ -158,6 +162,14 @@ void EthernetComponent::dump_config() {
       eth_type = "IP101";
       break;
 
+    case ETHERNET_TYPE_JL1101:
+      eth_type = "JL1101";
+      break;
+
+    case ETHERNET_TYPE_KSZ8081:
+      eth_type = "KSZ8081";
+      break;
+
     default:
       eth_type = "Unknown";
       break;
@@ -170,7 +182,8 @@ void EthernetComponent::dump_config() {
   }
   ESP_LOGCONFIG(TAG, "  MDC Pin: %u", this->mdc_pin_);
   ESP_LOGCONFIG(TAG, "  MDIO Pin: %u", this->mdio_pin_);
-  ESP_LOGCONFIG(TAG, "  Type: %s", eth_type.c_str());
+  ESP_LOGCONFIG(TAG, "  Type: %s", eth_type);
+  ESP_LOGCONFIG(TAG, "  PHY addr: %u", this->phy_addr_);
 }
 
 float EthernetComponent::get_setup_priority() const { return setup_priority::WIFI; }
diff --git a/esphome/components/ethernet/ethernet_component.h b/esphome/components/ethernet/ethernet_component.h
index 872ed17044..0d9ebf29a8 100644
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -14,11 +14,13 @@ namespace esphome {
 namespace ethernet {
 
 enum EthernetType {
-  ETHERNET_TYPE_LAN8720 = 0,
+  ETHERNET_TYPE_UNKNOWN = 0,
+  ETHERNET_TYPE_LAN8720,
   ETHERNET_TYPE_RTL8201,
   ETHERNET_TYPE_DP83848,
   ETHERNET_TYPE_IP101,
   ETHERNET_TYPE_JL1101,
+  ETHERNET_TYPE_KSZ8081,
 };
 
 struct ManualIP {
@@ -69,7 +71,7 @@ class EthernetComponent : public Component {
   int power_pin_{-1};
   uint8_t mdc_pin_{23};
   uint8_t mdio_pin_{18};
-  EthernetType type_{ETHERNET_TYPE_LAN8720};
+  EthernetType type_{ETHERNET_TYPE_UNKNOWN};
   emac_rmii_clock_mode_t clk_mode_{EMAC_CLK_EXT_IN};
   emac_rmii_clock_gpio_t clk_gpio_{EMAC_CLK_IN_GPIO};
   optional<ManualIP> manual_ip_{};

From 4eb69d6af5a67002ca2c1d5a79148d95ca8bd287 Mon Sep 17 00:00:00 2001
From: spacemanspiff2007 <10754716+spacemanspiff2007@users.noreply.github.com>
Date: Wed, 12 Apr 2023 23:28:02 +0200
Subject: [PATCH 778/838] Fix restore (#4655)

* ALWAYS_OFF for fan

* ALWAYS_OFF for light

* ALWAYS_OFF for switch
---
 esphome/components/fan/__init__.py    | 2 +-
 esphome/components/light/__init__.py  | 2 +-
 esphome/components/switch/__init__.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/fan/__init__.py b/esphome/components/fan/__init__.py
index eb67bbcbd7..9a05bff3a0 100644
--- a/esphome/components/fan/__init__.py
+++ b/esphome/components/fan/__init__.py
@@ -63,7 +63,7 @@ FanIsOffCondition = fan_ns.class_("FanIsOffCondition", automation.Condition.temp
 FAN_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).extend(
     {
         cv.GenerateID(): cv.declare_id(Fan),
-        cv.Optional(CONF_RESTORE_MODE, default="RESTORE_DEFAULT_OFF"): cv.enum(
+        cv.Optional(CONF_RESTORE_MODE, default="ALWAYS_OFF"): cv.enum(
             RESTORE_MODES, upper=True, space="_"
         ),
         cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(mqtt.MQTTFanComponent),
diff --git a/esphome/components/light/__init__.py b/esphome/components/light/__init__.py
index c397910ec4..ba3a26ebe5 100644
--- a/esphome/components/light/__init__.py
+++ b/esphome/components/light/__init__.py
@@ -60,7 +60,7 @@ LIGHT_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).ex
     {
         cv.GenerateID(): cv.declare_id(LightState),
         cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(mqtt.MQTTJSONLightComponent),
-        cv.Optional(CONF_RESTORE_MODE, default="restore_default_off"): cv.enum(
+        cv.Optional(CONF_RESTORE_MODE, default="ALWAYS_OFF"): cv.enum(
             RESTORE_MODES, upper=True, space="_"
         ),
         cv.Optional(CONF_ON_TURN_ON): auto.validate_automation(
diff --git a/esphome/components/switch/__init__.py b/esphome/components/switch/__init__.py
index c9bf81982a..21cbe3dfe4 100644
--- a/esphome/components/switch/__init__.py
+++ b/esphome/components/switch/__init__.py
@@ -92,7 +92,7 @@ def switch_schema(
     device_class: str = _UNDEF,
     icon: str = _UNDEF,
     block_inverted: bool = False,
-    default_restore_mode: str = "RESTORE_DEFAULT_OFF",
+    default_restore_mode: str = "ALWAYS_OFF",
 ):
     schema = _SWITCH_SCHEMA.extend(
         {

From 1a86167a47dff90c59b39a6140a7038836072307 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 13 Apr 2023 10:13:52 +1200
Subject: [PATCH 779/838] Bump version to 2023.4.0b1

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

diff --git a/esphome/const.py b/esphome/const.py
index 534a8ade01..31715df7ec 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.4.0-dev"
+__version__ = "2023.4.0b1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 04a139fe3d32f4c89fe856ed0f71feae9cdbf3f0 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 13 Apr 2023 10:13:53 +1200
Subject: [PATCH 780/838] Bump version to 2023.5.0-dev

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

diff --git a/esphome/const.py b/esphome/const.py
index 534a8ade01..2f66b47b8e 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.4.0-dev"
+__version__ = "2023.5.0-dev"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From cc1eb648f9734402018baa8f6b9acdda6463cdd1 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 13 Apr 2023 10:46:19 +1200
Subject: [PATCH 781/838] Only allow 5 jobs from each CI run to be in parallel
 (#4682)

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d22c2b7e03..affdf944a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,6 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
+      max-parallel: 5
       matrix:
         include:
           - id: ci-custom

From afc848bf22f93a650ea1641179de205b0ac5f3cb Mon Sep 17 00:00:00 2001
From: kahrendt <kahrendt@gmail.com>
Date: Wed, 12 Apr 2023 21:48:29 -0400
Subject: [PATCH 782/838] Add Bayesian type for binary_sensor_map component
 (#4640)

* initial support for Bayesian type

* Cast bool state of binary_sensor to uint64_t

* Rename channels to observations with Bayesian

* Improve/standardize comments for all types

* Use black to correct sensor.py formatting

* Add SUM and BAYESIAN binary sensor map tests

* Remove unused variable

* Update esphome/components/binary_sensor_map/binary_sensor_map.cpp

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .../binary_sensor_map/binary_sensor_map.cpp   | 82 ++++++++++++++++---
 .../binary_sensor_map/binary_sensor_map.h     | 69 ++++++++++++----
 .../components/binary_sensor_map/sensor.py    | 47 +++++++++--
 tests/test3.yaml                              | 26 ++++++
 4 files changed, 190 insertions(+), 34 deletions(-)

diff --git a/esphome/components/binary_sensor_map/binary_sensor_map.cpp b/esphome/components/binary_sensor_map/binary_sensor_map.cpp
index 3934e0a99c..0bf6202893 100644
--- a/esphome/components/binary_sensor_map/binary_sensor_map.cpp
+++ b/esphome/components/binary_sensor_map/binary_sensor_map.cpp
@@ -16,6 +16,9 @@ void BinarySensorMap::loop() {
     case BINARY_SENSOR_MAP_TYPE_SUM:
       this->process_sum_();
       break;
+    case BINARY_SENSOR_MAP_TYPE_BAYESIAN:
+      this->process_bayesian_();
+      break;
   }
 }
 
@@ -23,46 +26,51 @@ void BinarySensorMap::process_group_() {
   float total_current_value = 0.0;
   uint8_t num_active_sensors = 0;
   uint64_t mask = 0x00;
-  // check all binary_sensors for its state. when active add its value to total_current_value.
-  // create a bitmask for the binary_sensor status on all channels
+
+  // - check all binary_sensors for its state
+  //  - if active, add its value to total_current_value.
+  // - creates a bitmask for the binary_sensor states on all channels
   for (size_t i = 0; i < this->channels_.size(); i++) {
     auto bs = this->channels_[i];
     if (bs.binary_sensor->state) {
       num_active_sensors++;
-      total_current_value += bs.sensor_value;
+      total_current_value += bs.parameters.sensor_value;
       mask |= 1ULL << i;
     }
   }
-  // check if the sensor map was touched
+
+  // potentially update state only if a binary_sensor is active
   if (mask != 0ULL) {
-    // did the bit_mask change or is it a new sensor touch
+    // publish the average if the bitmask has changed
     if (this->last_mask_ != mask) {
       float publish_value = total_current_value / num_active_sensors;
       this->publish_state(publish_value);
     }
   } else if (this->last_mask_ != 0ULL) {
-    // is this a new sensor release
+    // no buttons are pressed and the states have changed since last run, so publish NAN
     ESP_LOGV(TAG, "'%s' - No binary sensor active, publishing NAN", this->name_.c_str());
     this->publish_state(NAN);
   }
+
   this->last_mask_ = mask;
 }
 
 void BinarySensorMap::process_sum_() {
   float total_current_value = 0.0;
   uint64_t mask = 0x00;
+
   // - check all binary_sensor states
   // - if active, add its value to total_current_value
-  // - creates a bitmask for the binary_sensor status on all channels
+  // - creates a bitmask for the binary_sensor states on all channels
   for (size_t i = 0; i < this->channels_.size(); i++) {
     auto bs = this->channels_[i];
     if (bs.binary_sensor->state) {
-      total_current_value += bs.sensor_value;
+      total_current_value += bs.parameters.sensor_value;
       mask |= 1ULL << i;
     }
   }
 
-  // update state only if the binary sensor states have changed or if no state has ever been sent on boot
+  // update state only if any binary_sensor states have changed or if no state has ever been sent on boot
   if ((this->last_mask_ != mask) || (!this->has_state())) {
     this->publish_state(total_current_value);
   }
@@ -70,15 +78,65 @@ void BinarySensorMap::process_sum_() {
   this->last_mask_ = mask;
 }
 
+void BinarySensorMap::process_bayesian_() {
+  float posterior_probability = this->bayesian_prior_;
+  uint64_t mask = 0x00;
+
+  // - compute the posterior probability by taking the product of the predicate probablities for each observation
+  // - create a bitmask for the binary_sensor states on all channels/observations
+  for (size_t i = 0; i < this->channels_.size(); i++) {
+    auto bs = this->channels_[i];
+
+    posterior_probability *=
+        this->bayesian_predicate_(bs.binary_sensor->state, posterior_probability,
+                                  bs.parameters.probabilities.given_true, bs.parameters.probabilities.given_false);
+
+    mask |= ((uint64_t) (bs.binary_sensor->state)) << i;
+  }
+
+  // update state only if any binary_sensor states have changed or if no state has ever been sent on boot
+  if ((this->last_mask_ != mask) || (!this->has_state())) {
+    this->publish_state(posterior_probability);
+  }
+
+  this->last_mask_ = mask;
+}
+
+float BinarySensorMap::bayesian_predicate_(bool sensor_state, float prior, float prob_given_true,
+                                           float prob_given_false) {
+  float prob_state_source_true = prob_given_true;
+  float prob_state_source_false = prob_given_false;
+
+  // if sensor is off, then we use the probabilities for the observation's complement
+  if (!sensor_state) {
+    prob_state_source_true = 1 - prob_given_true;
+    prob_state_source_false = 1 - prob_given_false;
+  }
+
+  return prob_state_source_true / (prior * prob_state_source_true + (1.0 - prior) * prob_state_source_false);
+}
+
 void BinarySensorMap::add_channel(binary_sensor::BinarySensor *sensor, float value) {
   BinarySensorMapChannel sensor_channel{
       .binary_sensor = sensor,
-      .sensor_value = value,
+      .parameters{
+          .sensor_value = value,
+      },
   };
   this->channels_.push_back(sensor_channel);
 }
 
-void BinarySensorMap::set_sensor_type(BinarySensorMapType sensor_type) { this->sensor_type_ = sensor_type; }
-
+void BinarySensorMap::add_channel(binary_sensor::BinarySensor *sensor, float prob_given_true, float prob_given_false) {
+  BinarySensorMapChannel sensor_channel{
+      .binary_sensor = sensor,
+      .parameters{
+          .probabilities{
+              .given_true = prob_given_true,
+              .given_false = prob_given_false,
+          },
+      },
+  };
+  this->channels_.push_back(sensor_channel);
+}
 }  // namespace binary_sensor_map
 }  // namespace esphome
diff --git a/esphome/components/binary_sensor_map/binary_sensor_map.h b/esphome/components/binary_sensor_map/binary_sensor_map.h
index a1d6f95009..a07154c0e8 100644
--- a/esphome/components/binary_sensor_map/binary_sensor_map.h
+++ b/esphome/components/binary_sensor_map/binary_sensor_map.h
@@ -12,51 +12,88 @@ namespace binary_sensor_map {
 enum BinarySensorMapType {
   BINARY_SENSOR_MAP_TYPE_GROUP,
   BINARY_SENSOR_MAP_TYPE_SUM,
+  BINARY_SENSOR_MAP_TYPE_BAYESIAN,
 };
 
 struct BinarySensorMapChannel {
   binary_sensor::BinarySensor *binary_sensor;
-  float sensor_value;
+  union {
+    float sensor_value;
+    struct {
+      float given_true;
+      float given_false;
+    } probabilities;
+  } parameters;
 };
 
-/** Class to group binary_sensors to one Sensor.
+/** Class to map one or more binary_sensors to one Sensor.
  *
- * Each binary sensor represents a float value in the group.
+ * Each binary sensor has configured parameters that each mapping type uses to compute the single numerical result
  */
 class BinarySensorMap : public sensor::Sensor, public Component {
  public:
   void dump_config() override;
+
   /**
-   * The loop checks all binary_sensor states
-   * When the binary_sensor reports a true value for its state, then the float value it represents is added to the
-   * total_current_value
+   * The loop calls the configured type processing method
    *
-   * Only when the total_current_value changed and at least one sensor reports an active state we publish the sensors
-   * average value. When the value changed and no sensors ar active we publish NAN.
-   * */
+   * The processing method loops through all sensors and calculates the numerical result
+   * The result is only published if a binary sensor state has changed or, for some types, on initial boot
+   */
   void loop() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-  /** Add binary_sensors to the group.
-   * Each binary_sensor represents a float value when its state is true
+
+  /**
+   * Add binary_sensors to the group when only one parameter is needed for the configured mapping type.
    *
    * @param *sensor The binary sensor.
    * @param value  The value this binary_sensor represents
    */
   void add_channel(binary_sensor::BinarySensor *sensor, float value);
-  void set_sensor_type(BinarySensorMapType sensor_type);
+
+  /**
+   * Add binary_sensors to the group when two parameters are needed for the Bayesian mapping type.
+   *
+   * @param *sensor The binary sensor.
+   * @param prob_given_true Probability this observation is on when the Bayesian event is true
+   * @param prob_given_false Probability this observation is on when the Bayesian event is false
+   */
+  void add_channel(binary_sensor::BinarySensor *sensor, float prob_given_true, float prob_given_false);
+
+  void set_sensor_type(BinarySensorMapType sensor_type) { this->sensor_type_ = sensor_type; }
+
+  void set_bayesian_prior(float prior) { this->bayesian_prior_ = prior; };
 
  protected:
   std::vector<BinarySensorMapChannel> channels_{};
   BinarySensorMapType sensor_type_{BINARY_SENSOR_MAP_TYPE_GROUP};
-  // this gives max 64 channels per binary_sensor_map
+
+  // this allows a max of 64 channels/observations in order to keep track of binary_sensor states
   uint64_t last_mask_{0x00};
+
+  // Bayesian event prior probability before taking into account any observations
+  float bayesian_prior_{};
+
   /**
-   * methods to process the types of binary_sensor_maps
-   * GROUP: process_group_() just map to a value
+   * Methods to process the binary_sensor_maps types
+   *
+   * GROUP: process_group_() averages all the values
    * ADD: process_add_() adds all the values
+   * BAYESIAN: process_bayesian_() computes the predicate probability
    * */
   void process_group_();
   void process_sum_();
+  void process_bayesian_();
+
+  /**
+   * Computes the Bayesian predicate for a specific observation
+   * If the sensor state is false, then we use the parameters' probabilities for the observatiosn complement
+   *
+   * @param sensor_state  State of observation
+   * @param prior Prior probability before accounting for this observation
+   * @param prob_given_true Probability this observation is on when the Bayesian event is true
+   * @param prob_given_false Probability this observation is on when the Bayesian event is false
+   * */
+  float bayesian_predicate_(bool sensor_state, float prior, float prob_given_true, float prob_given_false);
 };
 
 }  // namespace binary_sensor_map
diff --git a/esphome/components/binary_sensor_map/sensor.py b/esphome/components/binary_sensor_map/sensor.py
index 573cce9223..1181905f30 100644
--- a/esphome/components/binary_sensor_map/sensor.py
+++ b/esphome/components/binary_sensor_map/sensor.py
@@ -20,16 +20,29 @@ BinarySensorMap = binary_sensor_map_ns.class_(
 )
 SensorMapType = binary_sensor_map_ns.enum("SensorMapType")
 
+CONF_BAYESIAN = "bayesian"
+CONF_PRIOR = "prior"
+CONF_PROB_GIVEN_TRUE = "prob_given_true"
+CONF_PROB_GIVEN_FALSE = "prob_given_false"
+CONF_OBSERVATIONS = "observations"
+
 SENSOR_MAP_TYPES = {
     CONF_GROUP: SensorMapType.BINARY_SENSOR_MAP_TYPE_GROUP,
     CONF_SUM: SensorMapType.BINARY_SENSOR_MAP_TYPE_SUM,
+    CONF_BAYESIAN: SensorMapType.BINARY_SENSOR_MAP_TYPE_BAYESIAN,
 }
 
-entry = {
+entry_one_parameter = {
     cv.Required(CONF_BINARY_SENSOR): cv.use_id(binary_sensor.BinarySensor),
     cv.Required(CONF_VALUE): cv.float_,
 }
 
+entry_bayesian_parameters = {
+    cv.Required(CONF_BINARY_SENSOR): cv.use_id(binary_sensor.BinarySensor),
+    cv.Required(CONF_PROB_GIVEN_TRUE): cv.float_range(min=0, max=1),
+    cv.Required(CONF_PROB_GIVEN_FALSE): cv.float_range(min=0, max=1),
+}
+
 CONFIG_SCHEMA = cv.typed_schema(
     {
         CONF_GROUP: sensor.sensor_schema(
@@ -39,7 +52,7 @@ CONFIG_SCHEMA = cv.typed_schema(
         ).extend(
             {
                 cv.Required(CONF_CHANNELS): cv.All(
-                    cv.ensure_list(entry), cv.Length(min=1, max=64)
+                    cv.ensure_list(entry_one_parameter), cv.Length(min=1, max=64)
                 ),
             }
         ),
@@ -50,7 +63,18 @@ CONFIG_SCHEMA = cv.typed_schema(
         ).extend(
             {
                 cv.Required(CONF_CHANNELS): cv.All(
-                    cv.ensure_list(entry), cv.Length(min=1, max=64)
+                    cv.ensure_list(entry_one_parameter), cv.Length(min=1, max=64)
+                ),
+            }
+        ),
+        CONF_BAYESIAN: sensor.sensor_schema(
+            BinarySensorMap,
+            accuracy_decimals=2,
+        ).extend(
+            {
+                cv.Required(CONF_PRIOR): cv.float_range(min=0, max=1),
+                cv.Required(CONF_OBSERVATIONS): cv.All(
+                    cv.ensure_list(entry_bayesian_parameters), cv.Length(min=1, max=64)
                 ),
             }
         ),
@@ -66,6 +90,17 @@ async def to_code(config):
     constant = SENSOR_MAP_TYPES[config[CONF_TYPE]]
     cg.add(var.set_sensor_type(constant))
 
-    for ch in config[CONF_CHANNELS]:
-        input_var = await cg.get_variable(ch[CONF_BINARY_SENSOR])
-        cg.add(var.add_channel(input_var, ch[CONF_VALUE]))
+    if config[CONF_TYPE] == CONF_BAYESIAN:
+        cg.add(var.set_bayesian_prior(config[CONF_PRIOR]))
+
+        for obs in config[CONF_OBSERVATIONS]:
+            input_var = await cg.get_variable(obs[CONF_BINARY_SENSOR])
+            cg.add(
+                var.add_channel(
+                    input_var, obs[CONF_PROB_GIVEN_TRUE], obs[CONF_PROB_GIVEN_FALSE]
+                )
+            )
+    else:
+        for ch in config[CONF_CHANNELS]:
+            input_var = await cg.get_variable(ch[CONF_BINARY_SENSOR])
+            cg.add(var.add_channel(input_var, ch[CONF_VALUE]))
diff --git a/tests/test3.yaml b/tests/test3.yaml
index ceb9047d17..c4847725e8 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -368,6 +368,32 @@ sensor:
       - binary_sensor: bin3
         value: 100.0
 
+  - platform: binary_sensor_map
+    name: Binary Sensor Map
+    type: sum
+    channels:
+      - binary_sensor: bin1
+        value: 10.0
+      - binary_sensor: bin2
+        value: 15.0
+      - binary_sensor: bin3
+        value: 100.0
+
+  - platform: binary_sensor_map
+    name: Binary Sensor Map
+    type: bayesian
+    prior: 0.4
+    observations:
+      - binary_sensor: bin1
+        prob_given_true: 0.9
+        prob_given_false: 0.4
+      - binary_sensor: bin2
+        prob_given_true: 0.7
+        prob_given_false: 0.05
+      - binary_sensor: bin3
+        prob_given_true: 0.8
+        prob_given_false: 0.2
+
   - platform: bl0939
     uart_id: uart_8
     voltage:

From 0643b719086f70689eb5f6de572f9d1ba6f3c54a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Apr 2023 17:31:47 +1200
Subject: [PATCH 783/838] Bump aioesphomeapi from 13.5.1 to 13.7.0 (#4676)

Bumps [aioesphomeapi](https://github.com/esphome/aioesphomeapi) from 13.5.1 to 13.7.0.
- [Release notes](https://github.com/esphome/aioesphomeapi/releases)
- [Commits](https://github.com/esphome/aioesphomeapi/compare/v13.5.1...v13.7.0)

---
updated-dependencies:
- dependency-name: aioesphomeapi
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
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 5a57342189..5f73cf3a06 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.6  # When updating platformio, also update Dockerfile
 esptool==4.5.1
 click==8.1.3
 esphome-dashboard==20230214.0
-aioesphomeapi==13.5.1
+aioesphomeapi==13.7.0
 zeroconf==0.56.0
 
 # esp-idf requires this, but doesn't bundle it by default

From 47555d314a8077ec3f31ef4cef374246a1d30c26 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Apr 2023 20:12:24 +1200
Subject: [PATCH 784/838] Bump peter-evans/create-pull-request from 4 to 5
 (#4661)

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4 to 5.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v4...v5)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/sync-device-classes.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sync-device-classes.yml b/.github/workflows/sync-device-classes.yml
index 671fe1f21a..396dd64165 100644
--- a/.github/workflows/sync-device-classes.yml
+++ b/.github/workflows/sync-device-classes.yml
@@ -48,7 +48,7 @@ jobs:
           echo "$delimiter" >> $GITHUB_OUTPUT
 
       - name: Commit changes
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
         with:
           commit-message: "Synchronise Device Classes from Home Assistant"
           committer: esphomebot <esphome@nabucasa.com>

From 7b0fca6824a7f3312451d080ae68472c0eeab1b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Apr 2023 08:13:13 +0000
Subject: [PATCH 785/838] Bump docker/build-push-action from 3 to 4 (#4367)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3904834dc9..7ebd04e793 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -117,7 +117,7 @@ jobs:
             --suffix "${{ matrix.image.suffix }}"
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: .
           file: ./docker/Dockerfile

From 6b67acbeb5fc6fae713ed81f7ee549f53a3d42ff Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 14 Apr 2023 14:29:28 +1200
Subject: [PATCH 786/838] debug component, allow without debug logging (#4685)

---
 esphome/components/debug/__init__.py         | 16 ----------------
 esphome/components/debug/debug_component.cpp |  4 ++++
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/esphome/components/debug/__init__.py b/esphome/components/debug/__init__.py
index 223c3c8df1..c18baa1cca 100644
--- a/esphome/components/debug/__init__.py
+++ b/esphome/components/debug/__init__.py
@@ -1,15 +1,11 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-import esphome.final_validate as fv
-from esphome.components import logger
 from esphome.const import (
     CONF_BLOCK,
     CONF_DEVICE,
     CONF_FRAGMENTATION,
     CONF_FREE,
     CONF_ID,
-    CONF_LEVEL,
-    CONF_LOGGER,
     CONF_LOOP_TIME,
 )
 
@@ -43,18 +39,6 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.polling_component_schema("60s"))
 
 
-def _final_validate(_):
-    logger_conf = fv.full_config.get()[CONF_LOGGER]
-    severity = logger.LOG_LEVEL_SEVERITY.index(logger_conf[CONF_LEVEL])
-    if severity < logger.LOG_LEVEL_SEVERITY.index("DEBUG"):
-        raise cv.Invalid(
-            "The debug component requires the logger to be at least at DEBUG level"
-        )
-
-
-FINAL_VALIDATE_SCHEMA = _final_validate
-
-
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
diff --git a/esphome/components/debug/debug_component.cpp b/esphome/components/debug/debug_component.cpp
index c1ede684e6..9843fa1c99 100644
--- a/esphome/components/debug/debug_component.cpp
+++ b/esphome/components/debug/debug_component.cpp
@@ -37,6 +37,10 @@ static uint32_t get_free_heap() {
 }
 
 void DebugComponent::dump_config() {
+#ifndef ESPHOME_LOG_HAS_DEBUG
+  return;  // Can't log below if debug logging is disabled
+#endif
+
   std::string device_info;
   std::string reset_reason;
   device_info.reserve(256);

From 382dcddf12003b3779066a34f611c203f744fc54 Mon Sep 17 00:00:00 2001
From: Jimmy Hedman <jimmy.hedman@gmail.com>
Date: Sun, 16 Apr 2023 22:10:07 +0200
Subject: [PATCH 787/838] Fixed dns2 for ethernet (#4698)

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

diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index 8eb4718f49..447c5b8075 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -276,7 +276,7 @@ void EthernetComponent::start_connect_() {
 #endif
       dns_setserver(0, &d);
     }
-    if (uint32_t(this->manual_ip_->dns1) != 0) {
+    if (uint32_t(this->manual_ip_->dns2) != 0) {
       ip_addr_t d;
 #if LWIP_IPV6
       d.type = IPADDR_TYPE_V4;

From 8a60919e1ff145a433d090d740495b2f7064ed21 Mon Sep 17 00:00:00 2001
From: Szewcson <szewcson@gmail.com>
Date: Sun, 16 Apr 2023 22:12:13 +0200
Subject: [PATCH 788/838] Add timeout to i2c write error logs (#4697)

---
 esphome/components/i2c/i2c_bus_arduino.cpp | 29 ++++++++++++++--------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/esphome/components/i2c/i2c_bus_arduino.cpp b/esphome/components/i2c/i2c_bus_arduino.cpp
index 16d89c3450..e08622a3ae 100644
--- a/esphome/components/i2c/i2c_bus_arduino.cpp
+++ b/esphome/components/i2c/i2c_bus_arduino.cpp
@@ -154,18 +154,25 @@ ErrorCode ArduinoI2CBus::writev(uint8_t address, WriteBuffer *buffers, size_t cn
     }
   }
   uint8_t status = wire_->endTransmission(stop);
-  if (status == 0) {
-    return ERROR_OK;
-  } else if (status == 1) {
-    // transmit buffer not large enough
-    ESP_LOGVV(TAG, "TX failed: buffer not large enough");
-    return ERROR_UNKNOWN;
-  } else if (status == 2 || status == 3) {
-    ESP_LOGVV(TAG, "TX failed: not acknowledged");
-    return ERROR_NOT_ACKNOWLEDGED;
+  switch (status) {
+    case 0:
+      return ERROR_OK;
+    case 1:
+      // transmit buffer not large enough
+      ESP_LOGVV(TAG, "TX failed: buffer not large enough");
+      return ERROR_UNKNOWN;
+    case 2:
+    case 3:
+      ESP_LOGVV(TAG, "TX failed: not acknowledged");
+      return ERROR_NOT_ACKNOWLEDGED;
+    case 5:
+      ESP_LOGVV(TAG, "TX failed: timeout");
+      return ERROR_UNKNOWN;
+    case 4:
+    default:
+      ESP_LOGVV(TAG, "TX failed: unknown error %u", status);
+      return ERROR_UNKNOWN;
   }
-  ESP_LOGVV(TAG, "TX failed: unknown error %u", status);
-  return ERROR_UNKNOWN;
 }
 
 /// Perform I2C bus recovery, see:

From 3a587ea0d4f4d68f71227ff7bcf161c3070bd736 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 17 Apr 2023 14:57:28 +1200
Subject: [PATCH 789/838] Add event triggers to voice_assistant (#4699)

* Add event triggers to voice_assistant

* Add triggers to test
---
 .../components/voice_assistant/__init__.py    | 48 +++++++++++++++++++
 .../voice_assistant/voice_assistant.cpp       | 17 ++++---
 .../voice_assistant/voice_assistant.h         | 14 ++++++
 tests/test4.yaml                              | 20 ++++++++
 4 files changed, 93 insertions(+), 6 deletions(-)

diff --git a/esphome/components/voice_assistant/__init__.py b/esphome/components/voice_assistant/__init__.py
index c90fd554ae..20698a1b82 100644
--- a/esphome/components/voice_assistant/__init__.py
+++ b/esphome/components/voice_assistant/__init__.py
@@ -11,6 +11,14 @@ DEPENDENCIES = ["api", "microphone"]
 
 CODEOWNERS = ["@jesserockz"]
 
+CONF_ON_START = "on_start"
+CONF_ON_STT_END = "on_stt_end"
+CONF_ON_TTS_START = "on_tts_start"
+CONF_ON_TTS_END = "on_tts_end"
+CONF_ON_END = "on_end"
+CONF_ON_ERROR = "on_error"
+
+
 voice_assistant_ns = cg.esphome_ns.namespace("voice_assistant")
 VoiceAssistant = voice_assistant_ns.class_("VoiceAssistant", cg.Component)
 
@@ -26,6 +34,12 @@ CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(VoiceAssistant),
         cv.GenerateID(CONF_MICROPHONE): cv.use_id(microphone.Microphone),
+        cv.Optional(CONF_ON_START): automation.validate_automation(single=True),
+        cv.Optional(CONF_ON_STT_END): automation.validate_automation(single=True),
+        cv.Optional(CONF_ON_TTS_START): automation.validate_automation(single=True),
+        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),
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
@@ -37,6 +51,40 @@ async def to_code(config):
     mic = await cg.get_variable(config[CONF_MICROPHONE])
     cg.add(var.set_microphone(mic))
 
+    if CONF_ON_START in config:
+        await automation.build_automation(
+            var.get_start_trigger(), [], config[CONF_ON_START]
+        )
+
+    if CONF_ON_STT_END in config:
+        await automation.build_automation(
+            var.get_stt_end_trigger(), [(cg.std_string, "x")], config[CONF_ON_STT_END]
+        )
+
+    if CONF_ON_TTS_START in config:
+        await automation.build_automation(
+            var.get_tts_start_trigger(),
+            [(cg.std_string, "x")],
+            config[CONF_ON_TTS_START],
+        )
+
+    if CONF_ON_TTS_END in config:
+        await automation.build_automation(
+            var.get_tts_end_trigger(), [(cg.std_string, "x")], config[CONF_ON_TTS_END]
+        )
+
+    if CONF_ON_END in config:
+        await automation.build_automation(
+            var.get_end_trigger(), [], config[CONF_ON_END]
+        )
+
+    if CONF_ON_ERROR in config:
+        await automation.build_automation(
+            var.get_error_trigger(),
+            [(cg.std_string, "code"), (cg.std_string, "message")],
+            config[CONF_ON_ERROR],
+        )
+
     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 7f4bbf9934..777bef4edb 100644
--- a/esphome/components/voice_assistant/voice_assistant.cpp
+++ b/esphome/components/voice_assistant/voice_assistant.cpp
@@ -76,8 +76,9 @@ void VoiceAssistant::signal_stop() {
 
 void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
   switch (msg.event_type) {
-    case api::enums::VOICE_ASSISTANT_RUN_END:
-      ESP_LOGD(TAG, "Voice Assistant ended.");
+    case api::enums::VOICE_ASSISTANT_RUN_START:
+      ESP_LOGD(TAG, "Assist Pipeline running");
+      this->start_trigger_->trigger();
       break;
     case api::enums::VOICE_ASSISTANT_STT_END: {
       std::string text;
@@ -91,7 +92,7 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
         return;
       }
       ESP_LOGD(TAG, "Speech recognised as: \"%s\"", text.c_str());
-      // TODO `on_stt_end` trigger
+      this->stt_end_trigger_->trigger(text);
       break;
     }
     case api::enums::VOICE_ASSISTANT_TTS_START: {
@@ -106,7 +107,7 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
         return;
       }
       ESP_LOGD(TAG, "Response: \"%s\"", text.c_str());
-      // TODO `on_tts_start` trigger
+      this->tts_start_trigger_->trigger(text);
       break;
     }
     case api::enums::VOICE_ASSISTANT_TTS_END: {
@@ -121,9 +122,13 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
         return;
       }
       ESP_LOGD(TAG, "Response URL: \"%s\"", url.c_str());
-      // TODO `on_tts_end` trigger
+      this->tts_end_trigger_->trigger(url);
       break;
     }
+    case api::enums::VOICE_ASSISTANT_RUN_END:
+      ESP_LOGD(TAG, "Assist Pipeline ended");
+      this->end_trigger_->trigger();
+      break;
     case api::enums::VOICE_ASSISTANT_ERROR: {
       std::string code = "";
       std::string message = "";
@@ -135,7 +140,7 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
         }
       }
       ESP_LOGE(TAG, "Error: %s - %s", code.c_str(), message.c_str());
-      // TODO `on_error` trigger
+      this->error_trigger_->trigger(code, message);
     }
     default:
       break;
diff --git a/esphome/components/voice_assistant/voice_assistant.h b/esphome/components/voice_assistant/voice_assistant.h
index 8cc20c31ad..813c006e98 100644
--- a/esphome/components/voice_assistant/voice_assistant.h
+++ b/esphome/components/voice_assistant/voice_assistant.h
@@ -25,10 +25,24 @@ class VoiceAssistant : public Component {
 
   void on_event(const api::VoiceAssistantEventResponse &msg);
 
+  Trigger<> *get_start_trigger() const { return this->start_trigger_; }
+  Trigger<std::string> *get_stt_end_trigger() const { return this->stt_end_trigger_; }
+  Trigger<std::string> *get_tts_start_trigger() const { return this->tts_start_trigger_; }
+  Trigger<std::string> *get_tts_end_trigger() const { return this->tts_end_trigger_; }
+  Trigger<> *get_end_trigger() const { return this->end_trigger_; }
+  Trigger<std::string, std::string> *get_error_trigger() const { return this->error_trigger_; }
+
  protected:
   std::unique_ptr<socket::Socket> socket_ = nullptr;
   struct sockaddr_storage dest_addr_;
 
+  Trigger<> *start_trigger_ = new Trigger<>();
+  Trigger<std::string> *stt_end_trigger_ = new Trigger<std::string>();
+  Trigger<std::string> *tts_start_trigger_ = new Trigger<std::string>();
+  Trigger<std::string> *tts_end_trigger_ = new Trigger<std::string>();
+  Trigger<> *end_trigger_ = new Trigger<>();
+  Trigger<std::string, std::string> *error_trigger_ = new Trigger<std::string, std::string>();
+
   microphone::Microphone *mic_{nullptr};
 
   bool running_{false};
diff --git a/tests/test4.yaml b/tests/test4.yaml
index c21e71be00..7b8f139a43 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -696,3 +696,23 @@ microphone:
 
 voice_assistant:
   microphone: mic_id
+  on_start:
+    - logger.log: "Voice assistant started"
+  on_stt_end:
+    - logger.log:
+        format: "Voice assistant STT ended with result %s"
+        args: [x.c_str()]
+  on_tts_start:
+    - logger.log:
+        format: "Voice assistant TTS started with text %s"
+        args: [x.c_str()]
+  on_tts_end:
+    - logger.log:
+        format: "Voice assistant TTS ended with url %s"
+        args: [x.c_str()]
+  on_end:
+    - logger.log: "Voice assistant ended"
+  on_error:
+    - logger.log:
+        format: "Voice assistant error - code %s, message: %s"
+        args: [code.c_str(), message.c_str()]

From 9da261cb3960d72c188b3752dff67ed4b65bc327 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 14 Apr 2023 14:29:28 +1200
Subject: [PATCH 790/838] debug component, allow without debug logging (#4685)

---
 esphome/components/debug/__init__.py         | 16 ----------------
 esphome/components/debug/debug_component.cpp |  4 ++++
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/esphome/components/debug/__init__.py b/esphome/components/debug/__init__.py
index 223c3c8df1..c18baa1cca 100644
--- a/esphome/components/debug/__init__.py
+++ b/esphome/components/debug/__init__.py
@@ -1,15 +1,11 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-import esphome.final_validate as fv
-from esphome.components import logger
 from esphome.const import (
     CONF_BLOCK,
     CONF_DEVICE,
     CONF_FRAGMENTATION,
     CONF_FREE,
     CONF_ID,
-    CONF_LEVEL,
-    CONF_LOGGER,
     CONF_LOOP_TIME,
 )
 
@@ -43,18 +39,6 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.polling_component_schema("60s"))
 
 
-def _final_validate(_):
-    logger_conf = fv.full_config.get()[CONF_LOGGER]
-    severity = logger.LOG_LEVEL_SEVERITY.index(logger_conf[CONF_LEVEL])
-    if severity < logger.LOG_LEVEL_SEVERITY.index("DEBUG"):
-        raise cv.Invalid(
-            "The debug component requires the logger to be at least at DEBUG level"
-        )
-
-
-FINAL_VALIDATE_SCHEMA = _final_validate
-
-
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
diff --git a/esphome/components/debug/debug_component.cpp b/esphome/components/debug/debug_component.cpp
index c1ede684e6..9843fa1c99 100644
--- a/esphome/components/debug/debug_component.cpp
+++ b/esphome/components/debug/debug_component.cpp
@@ -37,6 +37,10 @@ static uint32_t get_free_heap() {
 }
 
 void DebugComponent::dump_config() {
+#ifndef ESPHOME_LOG_HAS_DEBUG
+  return;  // Can't log below if debug logging is disabled
+#endif
+
   std::string device_info;
   std::string reset_reason;
   device_info.reserve(256);

From 53c59cf675a39e49318aeb7ec7ebf488c45b2fca Mon Sep 17 00:00:00 2001
From: Jimmy Hedman <jimmy.hedman@gmail.com>
Date: Sun, 16 Apr 2023 22:10:07 +0200
Subject: [PATCH 791/838] Fixed dns2 for ethernet (#4698)

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

diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index 8eb4718f49..447c5b8075 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -276,7 +276,7 @@ void EthernetComponent::start_connect_() {
 #endif
       dns_setserver(0, &d);
     }
-    if (uint32_t(this->manual_ip_->dns1) != 0) {
+    if (uint32_t(this->manual_ip_->dns2) != 0) {
       ip_addr_t d;
 #if LWIP_IPV6
       d.type = IPADDR_TYPE_V4;

From 2ebacad39862d57e8cd2bf05f987ddbccefcb17b Mon Sep 17 00:00:00 2001
From: Szewcson <szewcson@gmail.com>
Date: Sun, 16 Apr 2023 22:12:13 +0200
Subject: [PATCH 792/838] Add timeout to i2c write error logs (#4697)

---
 esphome/components/i2c/i2c_bus_arduino.cpp | 29 ++++++++++++++--------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/esphome/components/i2c/i2c_bus_arduino.cpp b/esphome/components/i2c/i2c_bus_arduino.cpp
index 16d89c3450..e08622a3ae 100644
--- a/esphome/components/i2c/i2c_bus_arduino.cpp
+++ b/esphome/components/i2c/i2c_bus_arduino.cpp
@@ -154,18 +154,25 @@ ErrorCode ArduinoI2CBus::writev(uint8_t address, WriteBuffer *buffers, size_t cn
     }
   }
   uint8_t status = wire_->endTransmission(stop);
-  if (status == 0) {
-    return ERROR_OK;
-  } else if (status == 1) {
-    // transmit buffer not large enough
-    ESP_LOGVV(TAG, "TX failed: buffer not large enough");
-    return ERROR_UNKNOWN;
-  } else if (status == 2 || status == 3) {
-    ESP_LOGVV(TAG, "TX failed: not acknowledged");
-    return ERROR_NOT_ACKNOWLEDGED;
+  switch (status) {
+    case 0:
+      return ERROR_OK;
+    case 1:
+      // transmit buffer not large enough
+      ESP_LOGVV(TAG, "TX failed: buffer not large enough");
+      return ERROR_UNKNOWN;
+    case 2:
+    case 3:
+      ESP_LOGVV(TAG, "TX failed: not acknowledged");
+      return ERROR_NOT_ACKNOWLEDGED;
+    case 5:
+      ESP_LOGVV(TAG, "TX failed: timeout");
+      return ERROR_UNKNOWN;
+    case 4:
+    default:
+      ESP_LOGVV(TAG, "TX failed: unknown error %u", status);
+      return ERROR_UNKNOWN;
   }
-  ESP_LOGVV(TAG, "TX failed: unknown error %u", status);
-  return ERROR_UNKNOWN;
 }
 
 /// Perform I2C bus recovery, see:

From ebf6f8c6de4580f9fe242aee3045165af05dfd03 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 17 Apr 2023 14:57:28 +1200
Subject: [PATCH 793/838] Add event triggers to voice_assistant (#4699)

* Add event triggers to voice_assistant

* Add triggers to test
---
 .../components/voice_assistant/__init__.py    | 48 +++++++++++++++++++
 .../voice_assistant/voice_assistant.cpp       | 17 ++++---
 .../voice_assistant/voice_assistant.h         | 14 ++++++
 tests/test4.yaml                              | 20 ++++++++
 4 files changed, 93 insertions(+), 6 deletions(-)

diff --git a/esphome/components/voice_assistant/__init__.py b/esphome/components/voice_assistant/__init__.py
index c90fd554ae..20698a1b82 100644
--- a/esphome/components/voice_assistant/__init__.py
+++ b/esphome/components/voice_assistant/__init__.py
@@ -11,6 +11,14 @@ DEPENDENCIES = ["api", "microphone"]
 
 CODEOWNERS = ["@jesserockz"]
 
+CONF_ON_START = "on_start"
+CONF_ON_STT_END = "on_stt_end"
+CONF_ON_TTS_START = "on_tts_start"
+CONF_ON_TTS_END = "on_tts_end"
+CONF_ON_END = "on_end"
+CONF_ON_ERROR = "on_error"
+
+
 voice_assistant_ns = cg.esphome_ns.namespace("voice_assistant")
 VoiceAssistant = voice_assistant_ns.class_("VoiceAssistant", cg.Component)
 
@@ -26,6 +34,12 @@ CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(VoiceAssistant),
         cv.GenerateID(CONF_MICROPHONE): cv.use_id(microphone.Microphone),
+        cv.Optional(CONF_ON_START): automation.validate_automation(single=True),
+        cv.Optional(CONF_ON_STT_END): automation.validate_automation(single=True),
+        cv.Optional(CONF_ON_TTS_START): automation.validate_automation(single=True),
+        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),
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
@@ -37,6 +51,40 @@ async def to_code(config):
     mic = await cg.get_variable(config[CONF_MICROPHONE])
     cg.add(var.set_microphone(mic))
 
+    if CONF_ON_START in config:
+        await automation.build_automation(
+            var.get_start_trigger(), [], config[CONF_ON_START]
+        )
+
+    if CONF_ON_STT_END in config:
+        await automation.build_automation(
+            var.get_stt_end_trigger(), [(cg.std_string, "x")], config[CONF_ON_STT_END]
+        )
+
+    if CONF_ON_TTS_START in config:
+        await automation.build_automation(
+            var.get_tts_start_trigger(),
+            [(cg.std_string, "x")],
+            config[CONF_ON_TTS_START],
+        )
+
+    if CONF_ON_TTS_END in config:
+        await automation.build_automation(
+            var.get_tts_end_trigger(), [(cg.std_string, "x")], config[CONF_ON_TTS_END]
+        )
+
+    if CONF_ON_END in config:
+        await automation.build_automation(
+            var.get_end_trigger(), [], config[CONF_ON_END]
+        )
+
+    if CONF_ON_ERROR in config:
+        await automation.build_automation(
+            var.get_error_trigger(),
+            [(cg.std_string, "code"), (cg.std_string, "message")],
+            config[CONF_ON_ERROR],
+        )
+
     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 7f4bbf9934..777bef4edb 100644
--- a/esphome/components/voice_assistant/voice_assistant.cpp
+++ b/esphome/components/voice_assistant/voice_assistant.cpp
@@ -76,8 +76,9 @@ void VoiceAssistant::signal_stop() {
 
 void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
   switch (msg.event_type) {
-    case api::enums::VOICE_ASSISTANT_RUN_END:
-      ESP_LOGD(TAG, "Voice Assistant ended.");
+    case api::enums::VOICE_ASSISTANT_RUN_START:
+      ESP_LOGD(TAG, "Assist Pipeline running");
+      this->start_trigger_->trigger();
       break;
     case api::enums::VOICE_ASSISTANT_STT_END: {
       std::string text;
@@ -91,7 +92,7 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
         return;
       }
       ESP_LOGD(TAG, "Speech recognised as: \"%s\"", text.c_str());
-      // TODO `on_stt_end` trigger
+      this->stt_end_trigger_->trigger(text);
       break;
     }
     case api::enums::VOICE_ASSISTANT_TTS_START: {
@@ -106,7 +107,7 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
         return;
       }
       ESP_LOGD(TAG, "Response: \"%s\"", text.c_str());
-      // TODO `on_tts_start` trigger
+      this->tts_start_trigger_->trigger(text);
       break;
     }
     case api::enums::VOICE_ASSISTANT_TTS_END: {
@@ -121,9 +122,13 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
         return;
       }
       ESP_LOGD(TAG, "Response URL: \"%s\"", url.c_str());
-      // TODO `on_tts_end` trigger
+      this->tts_end_trigger_->trigger(url);
       break;
     }
+    case api::enums::VOICE_ASSISTANT_RUN_END:
+      ESP_LOGD(TAG, "Assist Pipeline ended");
+      this->end_trigger_->trigger();
+      break;
     case api::enums::VOICE_ASSISTANT_ERROR: {
       std::string code = "";
       std::string message = "";
@@ -135,7 +140,7 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
         }
       }
       ESP_LOGE(TAG, "Error: %s - %s", code.c_str(), message.c_str());
-      // TODO `on_error` trigger
+      this->error_trigger_->trigger(code, message);
     }
     default:
       break;
diff --git a/esphome/components/voice_assistant/voice_assistant.h b/esphome/components/voice_assistant/voice_assistant.h
index 8cc20c31ad..813c006e98 100644
--- a/esphome/components/voice_assistant/voice_assistant.h
+++ b/esphome/components/voice_assistant/voice_assistant.h
@@ -25,10 +25,24 @@ class VoiceAssistant : public Component {
 
   void on_event(const api::VoiceAssistantEventResponse &msg);
 
+  Trigger<> *get_start_trigger() const { return this->start_trigger_; }
+  Trigger<std::string> *get_stt_end_trigger() const { return this->stt_end_trigger_; }
+  Trigger<std::string> *get_tts_start_trigger() const { return this->tts_start_trigger_; }
+  Trigger<std::string> *get_tts_end_trigger() const { return this->tts_end_trigger_; }
+  Trigger<> *get_end_trigger() const { return this->end_trigger_; }
+  Trigger<std::string, std::string> *get_error_trigger() const { return this->error_trigger_; }
+
  protected:
   std::unique_ptr<socket::Socket> socket_ = nullptr;
   struct sockaddr_storage dest_addr_;
 
+  Trigger<> *start_trigger_ = new Trigger<>();
+  Trigger<std::string> *stt_end_trigger_ = new Trigger<std::string>();
+  Trigger<std::string> *tts_start_trigger_ = new Trigger<std::string>();
+  Trigger<std::string> *tts_end_trigger_ = new Trigger<std::string>();
+  Trigger<> *end_trigger_ = new Trigger<>();
+  Trigger<std::string, std::string> *error_trigger_ = new Trigger<std::string, std::string>();
+
   microphone::Microphone *mic_{nullptr};
 
   bool running_{false};
diff --git a/tests/test4.yaml b/tests/test4.yaml
index c21e71be00..7b8f139a43 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -696,3 +696,23 @@ microphone:
 
 voice_assistant:
   microphone: mic_id
+  on_start:
+    - logger.log: "Voice assistant started"
+  on_stt_end:
+    - logger.log:
+        format: "Voice assistant STT ended with result %s"
+        args: [x.c_str()]
+  on_tts_start:
+    - logger.log:
+        format: "Voice assistant TTS started with text %s"
+        args: [x.c_str()]
+  on_tts_end:
+    - logger.log:
+        format: "Voice assistant TTS ended with url %s"
+        args: [x.c_str()]
+  on_end:
+    - logger.log: "Voice assistant ended"
+  on_error:
+    - logger.log:
+        format: "Voice assistant error - code %s, message: %s"
+        args: [code.c_str(), message.c_str()]

From 98db604dba28100555fc963e59c021f31df84644 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 17 Apr 2023 15:45:35 +1200
Subject: [PATCH 794/838] Bump version to 2023.4.0b2

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

diff --git a/esphome/const.py b/esphome/const.py
index 31715df7ec..84363d6a5d 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.4.0b1"
+__version__ = "2023.4.0b2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 4cea74ef3b52bc794abbcf7c216b5e5f4abc67fd Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 20 Apr 2023 08:56:37 +1200
Subject: [PATCH 795/838] Call on_error if no api client connected that handles
 voice (#4709)

---
 esphome/components/api/api_server.cpp                  | 6 ++++--
 esphome/components/api/api_server.h                    | 2 +-
 esphome/components/voice_assistant/voice_assistant.cpp | 5 ++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index fbef4b253f..97a7d6fbf6 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -428,10 +428,12 @@ void APIServer::on_shutdown() {
 }
 
 #ifdef USE_VOICE_ASSISTANT
-void APIServer::start_voice_assistant() {
+bool APIServer::start_voice_assistant() {
+  bool result = false;
   for (auto &c : this->clients_) {
-    c->request_voice_assistant(true);
+    result |= c->request_voice_assistant(true);
   }
+  return result;
 }
 void APIServer::stop_voice_assistant() {
   for (auto &c : this->clients_) {
diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index 30103b2e3f..a1bec2802f 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -96,7 +96,7 @@ class APIServer : public Component, public Controller {
 #endif
 
 #ifdef USE_VOICE_ASSISTANT
-  void start_voice_assistant();
+  bool start_voice_assistant();
   void stop_voice_assistant();
 #endif
 
diff --git a/esphome/components/voice_assistant/voice_assistant.cpp b/esphome/components/voice_assistant/voice_assistant.cpp
index 777bef4edb..e2d5bea90a 100644
--- a/esphome/components/voice_assistant/voice_assistant.cpp
+++ b/esphome/components/voice_assistant/voice_assistant.cpp
@@ -63,7 +63,10 @@ void VoiceAssistant::start(struct sockaddr_storage *addr, uint16_t port) {
 
 void VoiceAssistant::request_start() {
   ESP_LOGD(TAG, "Requesting start...");
-  api::global_api_server->start_voice_assistant();
+  if (!api::global_api_server->start_voice_assistant()) {
+    ESP_LOGW(TAG, "Could not request start.");
+    this->error_trigger_->trigger("not-connected", "Could not request start.");
+  }
 }
 
 void VoiceAssistant::signal_stop() {

From 2be703b32997774cd92545e042fad53c8192dc63 Mon Sep 17 00:00:00 2001
From: tracestep <16390082+tracestep@users.noreply.github.com>
Date: Wed, 19 Apr 2023 19:10:01 -0300
Subject: [PATCH 796/838] Add ethernet powerdown (fixes esphome/issues#4420)
 (#4706)

* Add ethernet powerdown

* Add on_shutdown (fixes esphome/issues#4420

* Sync dev and clang-tidy fix

* fix typo and trainling space

* Initialize phy_ member

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Use `this` pointer

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Member initialized at declaration

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Use `this` pointer

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Use `this` pointer

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .../ethernet/ethernet_component.cpp           | 36 +++++++++++++------
 .../components/ethernet/ethernet_component.h  |  3 ++
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index 447c5b8075..0487ea5498 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -26,8 +26,10 @@ EthernetComponent::EthernetComponent() { global_eth_component = this; }
 
 void EthernetComponent::setup() {
   ESP_LOGCONFIG(TAG, "Setting up Ethernet...");
-  // Delay here to allow power to stabilise before Ethernet is initialised.
-  delay(300);  // NOLINT
+  if (esp_reset_reason() != ESP_RST_DEEPSLEEP) {
+    // Delay here to allow power to stabilise before Ethernet is initialized.
+    delay(300);  // NOLINT
+  }
 
   esp_err_t err;
   err = esp_netif_init();
@@ -52,30 +54,29 @@ void EthernetComponent::setup() {
 
   esp_eth_mac_t *mac = esp_eth_mac_new_esp32(&mac_config);
 
-  esp_eth_phy_t *phy;
   switch (this->type_) {
     case ETHERNET_TYPE_LAN8720: {
-      phy = esp_eth_phy_new_lan87xx(&phy_config);
+      this->phy_ = esp_eth_phy_new_lan87xx(&phy_config);
       break;
     }
     case ETHERNET_TYPE_RTL8201: {
-      phy = esp_eth_phy_new_rtl8201(&phy_config);
+      this->phy_ = esp_eth_phy_new_rtl8201(&phy_config);
       break;
     }
     case ETHERNET_TYPE_DP83848: {
-      phy = esp_eth_phy_new_dp83848(&phy_config);
+      this->phy_ = esp_eth_phy_new_dp83848(&phy_config);
       break;
     }
     case ETHERNET_TYPE_IP101: {
-      phy = esp_eth_phy_new_ip101(&phy_config);
+      this->phy_ = esp_eth_phy_new_ip101(&phy_config);
       break;
     }
     case ETHERNET_TYPE_JL1101: {
-      phy = esp_eth_phy_new_jl1101(&phy_config);
+      this->phy_ = esp_eth_phy_new_jl1101(&phy_config);
       break;
     }
     case ETHERNET_TYPE_KSZ8081: {
-      phy = esp_eth_phy_new_ksz8081(&phy_config);
+      this->phy_ = esp_eth_phy_new_ksz8081(&phy_config);
       break;
     }
     default: {
@@ -84,7 +85,7 @@ void EthernetComponent::setup() {
     }
   }
 
-  esp_eth_config_t eth_config = ETH_DEFAULT_CONFIG(mac, phy);
+  esp_eth_config_t eth_config = ETH_DEFAULT_CONFIG(mac, this->phy_);
   this->eth_handle_ = nullptr;
   err = esp_eth_driver_install(&eth_config, &this->eth_handle_);
   ESPHL_ERROR_CHECK(err, "ETH driver install error");
@@ -356,6 +357,21 @@ std::string EthernetComponent::get_use_address() const {
 
 void EthernetComponent::set_use_address(const std::string &use_address) { this->use_address_ = use_address; }
 
+bool EthernetComponent::powerdown() {
+  ESP_LOGI(TAG, "Powering down ethernet PHY");
+  if (this->phy_ == nullptr) {
+    ESP_LOGE(TAG, "Ethernet PHY not assigned");
+    return false;
+  }
+  this->connected_ = false;
+  this->started_ = false;
+  if (this->phy_->pwrctl(this->phy_, false) != ESP_OK) {
+    ESP_LOGE(TAG, "Error powering down ethernet PHY");
+    return false;
+  }
+  return true;
+}
+
 }  // namespace ethernet
 }  // namespace esphome
 
diff --git a/esphome/components/ethernet/ethernet_component.h b/esphome/components/ethernet/ethernet_component.h
index 0d9ebf29a8..918e47212f 100644
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -45,6 +45,7 @@ class EthernetComponent : public Component {
   void dump_config() override;
   float get_setup_priority() const override;
   bool can_proceed() override;
+  void on_shutdown() override { powerdown(); }
   bool is_connected();
 
   void set_phy_addr(uint8_t phy_addr);
@@ -58,6 +59,7 @@ class EthernetComponent : public Component {
   network::IPAddress get_ip_address();
   std::string get_use_address() const;
   void set_use_address(const std::string &use_address);
+  bool powerdown();
 
  protected:
   static void eth_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data);
@@ -82,6 +84,7 @@ class EthernetComponent : public Component {
   uint32_t connect_begin_;
   esp_netif_t *eth_netif_{nullptr};
   esp_eth_handle_t eth_handle_;
+  esp_eth_phy_t *phy_{nullptr};
 };
 
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)

From 7207b9734f067032c5c289f674bca77133b9300f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 20 Apr 2023 08:56:37 +1200
Subject: [PATCH 797/838] Call on_error if no api client connected that handles
 voice (#4709)

---
 esphome/components/api/api_server.cpp                  | 6 ++++--
 esphome/components/api/api_server.h                    | 2 +-
 esphome/components/voice_assistant/voice_assistant.cpp | 5 ++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index fbef4b253f..97a7d6fbf6 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -428,10 +428,12 @@ void APIServer::on_shutdown() {
 }
 
 #ifdef USE_VOICE_ASSISTANT
-void APIServer::start_voice_assistant() {
+bool APIServer::start_voice_assistant() {
+  bool result = false;
   for (auto &c : this->clients_) {
-    c->request_voice_assistant(true);
+    result |= c->request_voice_assistant(true);
   }
+  return result;
 }
 void APIServer::stop_voice_assistant() {
   for (auto &c : this->clients_) {
diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index 30103b2e3f..a1bec2802f 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -96,7 +96,7 @@ class APIServer : public Component, public Controller {
 #endif
 
 #ifdef USE_VOICE_ASSISTANT
-  void start_voice_assistant();
+  bool start_voice_assistant();
   void stop_voice_assistant();
 #endif
 
diff --git a/esphome/components/voice_assistant/voice_assistant.cpp b/esphome/components/voice_assistant/voice_assistant.cpp
index 777bef4edb..e2d5bea90a 100644
--- a/esphome/components/voice_assistant/voice_assistant.cpp
+++ b/esphome/components/voice_assistant/voice_assistant.cpp
@@ -63,7 +63,10 @@ void VoiceAssistant::start(struct sockaddr_storage *addr, uint16_t port) {
 
 void VoiceAssistant::request_start() {
   ESP_LOGD(TAG, "Requesting start...");
-  api::global_api_server->start_voice_assistant();
+  if (!api::global_api_server->start_voice_assistant()) {
+    ESP_LOGW(TAG, "Could not request start.");
+    this->error_trigger_->trigger("not-connected", "Could not request start.");
+  }
 }
 
 void VoiceAssistant::signal_stop() {

From 9460fb28c4c32d402e97b813fe73cbd3e7d421b9 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 20 Apr 2023 10:15:34 +1200
Subject: [PATCH 798/838] Bump version to 2023.4.0b3

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

diff --git a/esphome/const.py b/esphome/const.py
index 84363d6a5d..d35d9d39d5 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.4.0b2"
+__version__ = "2023.4.0b3"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 0f7e34e7ec4f8d38b6897f516c26de606c2ca5c0 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 20 Apr 2023 12:44:49 +1200
Subject: [PATCH 799/838] Bump arduino platform version to 5.3.0 (#4713)

* Bump arduino platform version to 5.3.0

* Update root platformio.ini
---
 esphome/components/esp32/__init__.py | 2 +-
 platformio.ini                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index 62021afea9..d0f74b7226 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -163,7 +163,7 @@ RECOMMENDED_ARDUINO_FRAMEWORK_VERSION = cv.Version(2, 0, 5)
 # The platformio/espressif32 version to use for arduino frameworks
 #  - https://github.com/platformio/platform-espressif32/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif32
-ARDUINO_PLATFORM_VERSION = cv.Version(5, 2, 0)
+ARDUINO_PLATFORM_VERSION = cv.Version(5, 3, 0)
 
 # The default/recommended esp-idf framework version
 #  - https://github.com/espressif/esp-idf/releases
diff --git a/platformio.ini b/platformio.ini
index 3df6446ff1..c8db90bacb 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -103,7 +103,7 @@ extra_scripts = post:esphome/components/esp8266/post_build.py.script
 ; This are common settings for the ESP32 (all variants) using Arduino.
 [common:esp32-arduino]
 extends = common:arduino
-platform = platformio/espressif32 @ 5.2.0
+platform = platformio/espressif32 @ 5.3.0
 platform_packages =
     platformio/framework-arduinoespressif32 @ ~3.20005.0
 

From 1bdc30a09e9c66b53a8d2813f55122c364ca5f79 Mon Sep 17 00:00:00 2001
From: tracestep <16390082+tracestep@users.noreply.github.com>
Date: Wed, 19 Apr 2023 19:10:01 -0300
Subject: [PATCH 800/838] Add ethernet powerdown (fixes esphome/issues#4420)
 (#4706)

* Add ethernet powerdown

* Add on_shutdown (fixes esphome/issues#4420

* Sync dev and clang-tidy fix

* fix typo and trainling space

* Initialize phy_ member

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Use `this` pointer

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Member initialized at declaration

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Use `this` pointer

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

* Use `this` pointer

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .../ethernet/ethernet_component.cpp           | 36 +++++++++++++------
 .../components/ethernet/ethernet_component.h  |  3 ++
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index 447c5b8075..0487ea5498 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -26,8 +26,10 @@ EthernetComponent::EthernetComponent() { global_eth_component = this; }
 
 void EthernetComponent::setup() {
   ESP_LOGCONFIG(TAG, "Setting up Ethernet...");
-  // Delay here to allow power to stabilise before Ethernet is initialised.
-  delay(300);  // NOLINT
+  if (esp_reset_reason() != ESP_RST_DEEPSLEEP) {
+    // Delay here to allow power to stabilise before Ethernet is initialized.
+    delay(300);  // NOLINT
+  }
 
   esp_err_t err;
   err = esp_netif_init();
@@ -52,30 +54,29 @@ void EthernetComponent::setup() {
 
   esp_eth_mac_t *mac = esp_eth_mac_new_esp32(&mac_config);
 
-  esp_eth_phy_t *phy;
   switch (this->type_) {
     case ETHERNET_TYPE_LAN8720: {
-      phy = esp_eth_phy_new_lan87xx(&phy_config);
+      this->phy_ = esp_eth_phy_new_lan87xx(&phy_config);
       break;
     }
     case ETHERNET_TYPE_RTL8201: {
-      phy = esp_eth_phy_new_rtl8201(&phy_config);
+      this->phy_ = esp_eth_phy_new_rtl8201(&phy_config);
       break;
     }
     case ETHERNET_TYPE_DP83848: {
-      phy = esp_eth_phy_new_dp83848(&phy_config);
+      this->phy_ = esp_eth_phy_new_dp83848(&phy_config);
       break;
     }
     case ETHERNET_TYPE_IP101: {
-      phy = esp_eth_phy_new_ip101(&phy_config);
+      this->phy_ = esp_eth_phy_new_ip101(&phy_config);
       break;
     }
     case ETHERNET_TYPE_JL1101: {
-      phy = esp_eth_phy_new_jl1101(&phy_config);
+      this->phy_ = esp_eth_phy_new_jl1101(&phy_config);
       break;
     }
     case ETHERNET_TYPE_KSZ8081: {
-      phy = esp_eth_phy_new_ksz8081(&phy_config);
+      this->phy_ = esp_eth_phy_new_ksz8081(&phy_config);
       break;
     }
     default: {
@@ -84,7 +85,7 @@ void EthernetComponent::setup() {
     }
   }
 
-  esp_eth_config_t eth_config = ETH_DEFAULT_CONFIG(mac, phy);
+  esp_eth_config_t eth_config = ETH_DEFAULT_CONFIG(mac, this->phy_);
   this->eth_handle_ = nullptr;
   err = esp_eth_driver_install(&eth_config, &this->eth_handle_);
   ESPHL_ERROR_CHECK(err, "ETH driver install error");
@@ -356,6 +357,21 @@ std::string EthernetComponent::get_use_address() const {
 
 void EthernetComponent::set_use_address(const std::string &use_address) { this->use_address_ = use_address; }
 
+bool EthernetComponent::powerdown() {
+  ESP_LOGI(TAG, "Powering down ethernet PHY");
+  if (this->phy_ == nullptr) {
+    ESP_LOGE(TAG, "Ethernet PHY not assigned");
+    return false;
+  }
+  this->connected_ = false;
+  this->started_ = false;
+  if (this->phy_->pwrctl(this->phy_, false) != ESP_OK) {
+    ESP_LOGE(TAG, "Error powering down ethernet PHY");
+    return false;
+  }
+  return true;
+}
+
 }  // namespace ethernet
 }  // namespace esphome
 
diff --git a/esphome/components/ethernet/ethernet_component.h b/esphome/components/ethernet/ethernet_component.h
index 0d9ebf29a8..918e47212f 100644
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -45,6 +45,7 @@ class EthernetComponent : public Component {
   void dump_config() override;
   float get_setup_priority() const override;
   bool can_proceed() override;
+  void on_shutdown() override { powerdown(); }
   bool is_connected();
 
   void set_phy_addr(uint8_t phy_addr);
@@ -58,6 +59,7 @@ class EthernetComponent : public Component {
   network::IPAddress get_ip_address();
   std::string get_use_address() const;
   void set_use_address(const std::string &use_address);
+  bool powerdown();
 
  protected:
   static void eth_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data);
@@ -82,6 +84,7 @@ class EthernetComponent : public Component {
   uint32_t connect_begin_;
   esp_netif_t *eth_netif_{nullptr};
   esp_eth_handle_t eth_handle_;
+  esp_eth_phy_t *phy_{nullptr};
 };
 
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)

From e993fcf80c04f9ede180d6c1daa8320def79e986 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 20 Apr 2023 12:44:49 +1200
Subject: [PATCH 801/838] Bump arduino platform version to 5.3.0 (#4713)

* Bump arduino platform version to 5.3.0

* Update root platformio.ini
---
 esphome/components/esp32/__init__.py | 2 +-
 platformio.ini                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index 62021afea9..d0f74b7226 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -163,7 +163,7 @@ RECOMMENDED_ARDUINO_FRAMEWORK_VERSION = cv.Version(2, 0, 5)
 # The platformio/espressif32 version to use for arduino frameworks
 #  - https://github.com/platformio/platform-espressif32/releases
 #  - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif32
-ARDUINO_PLATFORM_VERSION = cv.Version(5, 2, 0)
+ARDUINO_PLATFORM_VERSION = cv.Version(5, 3, 0)
 
 # The default/recommended esp-idf framework version
 #  - https://github.com/espressif/esp-idf/releases
diff --git a/platformio.ini b/platformio.ini
index 3df6446ff1..c8db90bacb 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -103,7 +103,7 @@ extra_scripts = post:esphome/components/esp8266/post_build.py.script
 ; This are common settings for the ESP32 (all variants) using Arduino.
 [common:esp32-arduino]
 extends = common:arduino
-platform = platformio/espressif32 @ 5.2.0
+platform = platformio/espressif32 @ 5.3.0
 platform_packages =
     platformio/framework-arduinoespressif32 @ ~3.20005.0
 

From ccf1bdc0b4c3d2a8f9fe79ea6112c7056a306015 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 20 Apr 2023 13:10:26 +1200
Subject: [PATCH 802/838] Bump version to 2023.4.0b4

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

diff --git a/esphome/const.py b/esphome/const.py
index d35d9d39d5..739019155f 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.4.0b3"
+__version__ = "2023.4.0b4"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From e2fefa51f59df6f4bb30099d0ed9910a79c09305 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 20 Apr 2023 14:06:53 +1200
Subject: [PATCH 803/838] Bump version to 2023.4.0

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

diff --git a/esphome/const.py b/esphome/const.py
index 739019155f..1e72c6d609 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.4.0b4"
+__version__ = "2023.4.0"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From afc2b3b74f9bc2a7cfeebb2573676331259f0b8c Mon Sep 17 00:00:00 2001
From: Fabian <Fabian-Schmidt@users.noreply.github.com>
Date: Thu, 20 Apr 2023 05:53:35 +0200
Subject: [PATCH 804/838] Keep Device Class in Flash. (#4639)

* Keep Device Class in Flash.

* Remove blank line

---------

Co-authored-by: Your Name <you@example.com>
---
 esphome/components/binary_sensor/binary_sensor.cpp |  7 +------
 esphome/components/binary_sensor/binary_sensor.h   |  9 +--------
 esphome/components/button/button.cpp               |  3 ---
 esphome/components/button/button.h                 |  9 +--------
 esphome/components/cover/cover.cpp                 |  8 ++------
 esphome/components/cover/cover.h                   |  5 +----
 esphome/components/number/number_traits.cpp        |  8 --------
 esphome/components/number/number_traits.h          |  8 ++------
 esphome/components/sensor/sensor.cpp               |  7 -------
 esphome/components/sensor/sensor.h                 |  8 +-------
 esphome/components/switch/switch.cpp               |  7 -------
 esphome/components/switch/switch.h                 |  7 +------
 esphome/core/entity_base.cpp                       | 10 ++++++++++
 esphome/core/entity_base.h                         | 11 +++++++++++
 14 files changed, 31 insertions(+), 76 deletions(-)

diff --git a/esphome/components/binary_sensor/binary_sensor.cpp b/esphome/components/binary_sensor/binary_sensor.cpp
index bd33b2af2d..20604a0b7e 100644
--- a/esphome/components/binary_sensor/binary_sensor.cpp
+++ b/esphome/components/binary_sensor/binary_sensor.cpp
@@ -43,12 +43,7 @@ void BinarySensor::send_state_internal(bool state, bool is_initial) {
 }
 
 BinarySensor::BinarySensor() : state(false) {}
-void BinarySensor::set_device_class(const std::string &device_class) { this->device_class_ = device_class; }
-std::string BinarySensor::get_device_class() {
-  if (this->device_class_.has_value())
-    return *this->device_class_;
-  return "";
-}
+
 void BinarySensor::add_filter(Filter *filter) {
   filter->parent_ = this;
   if (this->filter_list_ == nullptr) {
diff --git a/esphome/components/binary_sensor/binary_sensor.h b/esphome/components/binary_sensor/binary_sensor.h
index 0bf8cf2cdc..301a472810 100644
--- a/esphome/components/binary_sensor/binary_sensor.h
+++ b/esphome/components/binary_sensor/binary_sensor.h
@@ -34,7 +34,7 @@ namespace binary_sensor {
  * The sub classes should notify the front-end of new states via the publish_state() method which
  * handles inverted inputs for you.
  */
-class BinarySensor : public EntityBase {
+class BinarySensor : public EntityBase, public EntityBase_DeviceClass {
  public:
   explicit BinarySensor();
 
@@ -60,12 +60,6 @@ class BinarySensor : public EntityBase {
   /// The current reported state of the binary sensor.
   bool state;
 
-  /// Manually set the Home Assistant device class (see binary_sensor::device_class)
-  void set_device_class(const std::string &device_class);
-
-  /// Get the device class for this binary sensor, using the manual override if specified.
-  std::string get_device_class();
-
   void add_filter(Filter *filter);
   void add_filters(const std::vector<Filter *> &filters);
 
@@ -82,7 +76,6 @@ class BinarySensor : public EntityBase {
 
  protected:
   CallbackManager<void(bool)> state_callback_{};
-  optional<std::string> device_class_{};  ///< Stores the override of the device class
   Filter *filter_list_{nullptr};
   bool has_state_{false};
   bool publish_initial_state_{false};
diff --git a/esphome/components/button/button.cpp b/esphome/components/button/button.cpp
index dfa417de7b..4c4cb7740c 100644
--- a/esphome/components/button/button.cpp
+++ b/esphome/components/button/button.cpp
@@ -13,8 +13,5 @@ void Button::press() {
 }
 void Button::add_on_press_callback(std::function<void()> &&callback) { this->press_callback_.add(std::move(callback)); }
 
-void Button::set_device_class(const std::string &device_class) { this->device_class_ = device_class; }
-std::string Button::get_device_class() { return this->device_class_; }
-
 }  // namespace button
 }  // namespace esphome
diff --git a/esphome/components/button/button.h b/esphome/components/button/button.h
index a4902810b2..9488eca221 100644
--- a/esphome/components/button/button.h
+++ b/esphome/components/button/button.h
@@ -26,7 +26,7 @@ namespace button {
  *
  * A button is just a momentary switch that does not have a state, only a trigger.
  */
-class Button : public EntityBase {
+class Button : public EntityBase, public EntityBase_DeviceClass {
  public:
   /** Press this button. This is called by the front-end.
    *
@@ -40,19 +40,12 @@ class Button : public EntityBase {
    */
   void add_on_press_callback(std::function<void()> &&callback);
 
-  /// Set the Home Assistant device class (see button::device_class).
-  void set_device_class(const std::string &device_class);
-
-  /// Get the device class for this button.
-  std::string get_device_class();
-
  protected:
   /** You should implement this virtual method if you want to create your own button.
    */
   virtual void press_action() = 0;
 
   CallbackManager<void()> press_callback_{};
-  std::string device_class_{};
 };
 
 }  // namespace button
diff --git a/esphome/components/cover/cover.cpp b/esphome/components/cover/cover.cpp
index 24dd88b698..d139bab8ee 100644
--- a/esphome/components/cover/cover.cpp
+++ b/esphome/components/cover/cover.cpp
@@ -145,7 +145,7 @@ CoverCall &CoverCall::set_stop(bool stop) {
   return *this;
 }
 bool CoverCall::get_stop() const { return this->stop_; }
-void Cover::set_device_class(const std::string &device_class) { this->device_class_override_ = device_class; }
+
 CoverCall Cover::make_call() { return {this}; }
 void Cover::open() {
   auto call = this->make_call();
@@ -204,11 +204,7 @@ optional<CoverRestoreState> Cover::restore_state_() {
     return {};
   return recovered;
 }
-std::string Cover::get_device_class() {
-  if (this->device_class_override_.has_value())
-    return *this->device_class_override_;
-  return "";
-}
+
 bool Cover::is_fully_open() const { return this->position == COVER_OPEN; }
 bool Cover::is_fully_closed() const { return this->position == COVER_CLOSED; }
 
diff --git a/esphome/components/cover/cover.h b/esphome/components/cover/cover.h
index c6a420fa97..d21fbe02be 100644
--- a/esphome/components/cover/cover.h
+++ b/esphome/components/cover/cover.h
@@ -108,7 +108,7 @@ const char *cover_operation_to_str(CoverOperation op);
  * to control all values of the cover. Also implement get_traits() to return what operations
  * the cover supports.
  */
-class Cover : public EntityBase {
+class Cover : public EntityBase, public EntityBase_DeviceClass {
  public:
   explicit Cover();
 
@@ -156,8 +156,6 @@ class Cover : public EntityBase {
   void publish_state(bool save = true);
 
   virtual CoverTraits get_traits() = 0;
-  void set_device_class(const std::string &device_class);
-  std::string get_device_class();
 
   /// Helper method to check if the cover is fully open. Equivalent to comparing .position against 1.0
   bool is_fully_open() const;
@@ -172,7 +170,6 @@ class Cover : public EntityBase {
   optional<CoverRestoreState> restore_state_();
 
   CallbackManager<void()> state_callback_{};
-  optional<std::string> device_class_override_{};
 
   ESPPreferenceObject rtc_;
 };
diff --git a/esphome/components/number/number_traits.cpp b/esphome/components/number/number_traits.cpp
index 1554f8d9c9..dcd05daa2a 100644
--- a/esphome/components/number/number_traits.cpp
+++ b/esphome/components/number/number_traits.cpp
@@ -16,13 +16,5 @@ std::string NumberTraits::get_unit_of_measurement() {
   return "";
 }
 
-void NumberTraits::set_device_class(const std::string &device_class) { this->device_class_ = device_class; }
-
-std::string NumberTraits::get_device_class() {
-  if (this->device_class_.has_value())
-    return *this->device_class_;
-  return "";
-}
-
 }  // namespace number
 }  // namespace esphome
diff --git a/esphome/components/number/number_traits.h b/esphome/components/number/number_traits.h
index ee10b0010c..5b14b77718 100644
--- a/esphome/components/number/number_traits.h
+++ b/esphome/components/number/number_traits.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "esphome/core/entity_base.h"
 #include "esphome/core/helpers.h"
 
 namespace esphome {
@@ -11,7 +12,7 @@ enum NumberMode : uint8_t {
   NUMBER_MODE_SLIDER = 2,
 };
 
-class NumberTraits {
+class NumberTraits : public EntityBase_DeviceClass {
  public:
   // Set/get the number value boundaries.
   void set_min_value(float min_value) { min_value_ = min_value; }
@@ -32,17 +33,12 @@ class NumberTraits {
   void set_mode(NumberMode mode) { this->mode_ = mode; }
   NumberMode get_mode() const { return this->mode_; }
 
-  // Set/get the device class.
-  void set_device_class(const std::string &device_class);
-  std::string get_device_class();
-
  protected:
   float min_value_ = NAN;
   float max_value_ = NAN;
   float step_ = NAN;
   optional<std::string> unit_of_measurement_;  ///< Unit of measurement override
   NumberMode mode_{NUMBER_MODE_AUTO};
-  optional<std::string> device_class_;
 };
 
 }  // namespace number
diff --git a/esphome/components/sensor/sensor.cpp b/esphome/components/sensor/sensor.cpp
index fc66e03d6b..6ce1e193f5 100644
--- a/esphome/components/sensor/sensor.cpp
+++ b/esphome/components/sensor/sensor.cpp
@@ -38,13 +38,6 @@ int8_t Sensor::get_accuracy_decimals() {
 }
 void Sensor::set_accuracy_decimals(int8_t accuracy_decimals) { this->accuracy_decimals_ = accuracy_decimals; }
 
-std::string Sensor::get_device_class() {
-  if (this->device_class_.has_value())
-    return *this->device_class_;
-  return "";
-}
-void Sensor::set_device_class(const std::string &device_class) { this->device_class_ = device_class; }
-
 void Sensor::set_state_class(StateClass state_class) { this->state_class_ = state_class; }
 StateClass Sensor::get_state_class() {
   if (this->state_class_.has_value())
diff --git a/esphome/components/sensor/sensor.h b/esphome/components/sensor/sensor.h
index efcada1411..165d013b2a 100644
--- a/esphome/components/sensor/sensor.h
+++ b/esphome/components/sensor/sensor.h
@@ -54,7 +54,7 @@ std::string state_class_to_string(StateClass state_class);
  *
  * A sensor has unit of measurement and can use publish_state to send out a new value with the specified accuracy.
  */
-class Sensor : public EntityBase {
+class Sensor : public EntityBase, public EntityBase_DeviceClass {
  public:
   explicit Sensor();
 
@@ -68,11 +68,6 @@ class Sensor : public EntityBase {
   /// Manually set the accuracy in decimals.
   void set_accuracy_decimals(int8_t accuracy_decimals);
 
-  /// Get the device class, using the manual override if set.
-  std::string get_device_class();
-  /// Manually set the device class.
-  void set_device_class(const std::string &device_class);
-
   /// Get the state class, using the manual override if set.
   StateClass get_state_class();
   /// Manually set the state class.
@@ -165,7 +160,6 @@ class Sensor : public EntityBase {
 
   optional<std::string> unit_of_measurement_;           ///< Unit of measurement override
   optional<int8_t> accuracy_decimals_;                  ///< Accuracy in decimals override
-  optional<std::string> device_class_;                  ///< Device class override
   optional<StateClass> state_class_{STATE_CLASS_NONE};  ///< State class override
   bool force_update_{false};                            ///< Force update mode
   bool has_state_{false};
diff --git a/esphome/components/switch/switch.cpp b/esphome/components/switch/switch.cpp
index 72e7add158..96611b0b87 100644
--- a/esphome/components/switch/switch.cpp
+++ b/esphome/components/switch/switch.cpp
@@ -63,13 +63,6 @@ void Switch::add_on_state_callback(std::function<void(bool)> &&callback) {
 void Switch::set_inverted(bool inverted) { this->inverted_ = inverted; }
 bool Switch::is_inverted() const { return this->inverted_; }
 
-std::string Switch::get_device_class() {
-  if (this->device_class_.has_value())
-    return *this->device_class_;
-  return "";
-}
-void Switch::set_device_class(const std::string &device_class) { this->device_class_ = device_class; }
-
 void log_switch(const char *tag, const char *prefix, const char *type, Switch *obj) {
   if (obj != nullptr) {
     ESP_LOGCONFIG(tag, "%s%s '%s'", prefix, type, obj->get_name().c_str());
diff --git a/esphome/components/switch/switch.h b/esphome/components/switch/switch.h
index 8bea3b36db..9daac4ee23 100644
--- a/esphome/components/switch/switch.h
+++ b/esphome/components/switch/switch.h
@@ -29,7 +29,7 @@ enum SwitchRestoreMode {
  * A switch is basically just a combination of a binary sensor (for reporting switch values)
  * and a write_state method that writes a state to the hardware.
  */
-class Switch : public EntityBase {
+class Switch : public EntityBase, public EntityBase_DeviceClass {
  public:
   explicit Switch();
 
@@ -103,10 +103,6 @@ class Switch : public EntityBase {
 
   bool is_inverted() const;
 
-  /// Get the device class for this switch.
-  std::string get_device_class();
-  /// Set the Home Assistant device class for this switch.
-  void set_device_class(const std::string &device_class);
   void set_restore_mode(SwitchRestoreMode restore_mode) { this->restore_mode = restore_mode; }
 
  protected:
@@ -124,7 +120,6 @@ class Switch : public EntityBase {
   bool inverted_{false};
   Deduplicator<bool> publish_dedup_;
   ESPPreferenceObject rtc_;
-  optional<std::string> device_class_;
 };
 
 #define LOG_SWITCH(prefix, type, obj) log_switch((TAG), (prefix), LOG_STR_LITERAL(type), (obj))
diff --git a/esphome/core/entity_base.cpp b/esphome/core/entity_base.cpp
index 3d61e36fd1..1e2ccc35b5 100644
--- a/esphome/core/entity_base.cpp
+++ b/esphome/core/entity_base.cpp
@@ -72,6 +72,16 @@ void EntityBase::calc_object_id_() {
     this->object_id_hash_ = fnv1_hash(this->object_id_c_str_);
   }
 }
+
 uint32_t EntityBase::get_object_id_hash() { return this->object_id_hash_; }
 
+std::string EntityBase_DeviceClass::get_device_class() {
+  if (this->device_class_ == nullptr) {
+    return "";
+  }
+  return this->device_class_;
+}
+
+void EntityBase_DeviceClass::set_device_class(const char *device_class) { this->device_class_ = device_class; }
+
 }  // namespace esphome
diff --git a/esphome/core/entity_base.h b/esphome/core/entity_base.h
index e40a7013bf..d717674450 100644
--- a/esphome/core/entity_base.h
+++ b/esphome/core/entity_base.h
@@ -63,4 +63,15 @@ class EntityBase {
   EntityCategory entity_category_{ENTITY_CATEGORY_NONE};
 };
 
+class EntityBase_DeviceClass {
+ public:
+  /// Get the device class, using the manual override if set.
+  std::string get_device_class();
+  /// Manually set the device class.
+  void set_device_class(const char *device_class);
+
+ protected:
+  const char *device_class_{nullptr};  ///< Device class override
+};
+
 }  // namespace esphome

From 4c396314286bc459ceb780891698488fb7dbfda2 Mon Sep 17 00:00:00 2001
From: Bella Coola <31868524+BellaCoola@users.noreply.github.com>
Date: Thu, 20 Apr 2023 03:53:42 +0000
Subject: [PATCH 805/838] Add support for passive WiFi scanning (#4666)

* Add support for passive WiFi scanning.

* Apply suggestions from code review

Made changes suggested by @jesserockz

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>

---------

Co-authored-by: BellaCoola <unknown>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/wifi/__init__.py           |  3 +++
 esphome/components/wifi/wifi_component.cpp    |  4 +++-
 esphome/components/wifi/wifi_component.h      |  5 ++++-
 .../wifi/wifi_component_esp32_arduino.cpp     |  4 ++--
 .../wifi/wifi_component_esp8266.cpp           | 20 +++++++++++++------
 .../wifi/wifi_component_esp_idf.cpp           | 12 +++++++----
 .../components/wifi/wifi_component_pico_w.cpp |  3 ++-
 7 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/esphome/components/wifi/__init__.py b/esphome/components/wifi/__init__.py
index f5684f06f7..c9da07795c 100644
--- a/esphome/components/wifi/__init__.py
+++ b/esphome/components/wifi/__init__.py
@@ -252,6 +252,7 @@ def _validate(config):
 
 
 CONF_OUTPUT_POWER = "output_power"
+CONF_PASSIVE_SCAN = "passive_scan"
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
         {
@@ -280,6 +281,7 @@ CONFIG_SCHEMA = cv.All(
             cv.SplitDefault(CONF_ENABLE_RRM, esp32_idf=False): cv.All(
                 cv.boolean, cv.only_with_esp_idf
             ),
+            cv.Optional(CONF_PASSIVE_SCAN, default=False): cv.boolean,
             cv.Optional("enable_mdns"): cv.invalid(
                 "This option has been removed. Please use the [disabled] option under the "
                 "new mdns component instead."
@@ -379,6 +381,7 @@ async def to_code(config):
     cg.add(var.set_reboot_timeout(config[CONF_REBOOT_TIMEOUT]))
     cg.add(var.set_power_save_mode(config[CONF_POWER_SAVE_MODE]))
     cg.add(var.set_fast_connect(config[CONF_FAST_CONNECT]))
+    cg.add(var.set_passive_scan(config[CONF_PASSIVE_SCAN]))
     if CONF_OUTPUT_POWER in config:
         cg.add(var.set_output_power(config[CONF_OUTPUT_POWER]))
 
diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index efb1af171d..9f047dd5ed 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -385,7 +385,7 @@ void WiFiComponent::print_connect_params_() {
 void WiFiComponent::start_scanning() {
   this->action_started_ = millis();
   ESP_LOGD(TAG, "Starting scan...");
-  this->wifi_scan_start_();
+  this->wifi_scan_start_(this->passive_scan_);
   this->state_ = WIFI_COMPONENT_STATE_STA_SCANNING;
 }
 
@@ -615,6 +615,8 @@ bool WiFiComponent::is_connected() {
 }
 void WiFiComponent::set_power_save_mode(WiFiPowerSaveMode power_save) { this->power_save_ = power_save; }
 
+void WiFiComponent::set_passive_scan(bool passive) { this->passive_scan_ = passive; }
+
 std::string WiFiComponent::format_mac_addr(const uint8_t *mac) {
   char buf[20];
   sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
diff --git a/esphome/components/wifi/wifi_component.h b/esphome/components/wifi/wifi_component.h
index 544cb3dc61..3f81b94cce 100644
--- a/esphome/components/wifi/wifi_component.h
+++ b/esphome/components/wifi/wifi_component.h
@@ -217,6 +217,8 @@ class WiFiComponent : public Component {
   void set_power_save_mode(WiFiPowerSaveMode power_save);
   void set_output_power(float output_power) { output_power_ = output_power; }
 
+  void set_passive_scan(bool passive);
+
   void save_wifi_sta(const std::string &ssid, const std::string &password);
   // ========== INTERNAL METHODS ==========
   // (In most use cases you won't need these)
@@ -294,7 +296,7 @@ class WiFiComponent : public Component {
   bool wifi_sta_connect_(const WiFiAP &ap);
   void wifi_pre_setup_();
   WiFiSTAConnectStatus wifi_sta_connect_status_();
-  bool wifi_scan_start_();
+  bool wifi_scan_start_(bool passive);
   bool wifi_ap_ip_config_(optional<ManualIP> manual_ip);
   bool wifi_start_ap_(const WiFiAP &ap);
   bool wifi_disconnect_();
@@ -349,6 +351,7 @@ class WiFiComponent : public Component {
   bool scan_done_{false};
   bool ap_setup_{false};
   optional<float> output_power_;
+  bool passive_scan_{false};
   ESPPreferenceObject pref_;
   bool has_saved_wifi_settings_{false};
 #ifdef USE_WIFI_11KV_SUPPORT
diff --git a/esphome/components/wifi/wifi_component_esp32_arduino.cpp b/esphome/components/wifi/wifi_component_esp32_arduino.cpp
index ab04224161..f35f5dfc43 100644
--- a/esphome/components/wifi/wifi_component_esp32_arduino.cpp
+++ b/esphome/components/wifi/wifi_component_esp32_arduino.cpp
@@ -618,13 +618,13 @@ WiFiSTAConnectStatus WiFiComponent::wifi_sta_connect_status_() {
   }
   return WiFiSTAConnectStatus::IDLE;
 }
-bool WiFiComponent::wifi_scan_start_() {
+bool WiFiComponent::wifi_scan_start_(bool passive) {
   // enable STA
   if (!this->wifi_mode_(true, {}))
     return false;
 
   // need to use WiFi because of WiFiScanClass allocations :(
-  int16_t err = WiFi.scanNetworks(true, true, false, 200);
+  int16_t err = WiFi.scanNetworks(true, true, passive, 200);
   if (err != WIFI_SCAN_RUNNING) {
     ESP_LOGV(TAG, "WiFi.scanNetworks failed! %d", err);
     return false;
diff --git a/esphome/components/wifi/wifi_component_esp8266.cpp b/esphome/components/wifi/wifi_component_esp8266.cpp
index de4253fe41..8b38297b17 100644
--- a/esphome/components/wifi/wifi_component_esp8266.cpp
+++ b/esphome/components/wifi/wifi_component_esp8266.cpp
@@ -601,7 +601,7 @@ WiFiSTAConnectStatus WiFiComponent::wifi_sta_connect_status_() {
       return WiFiSTAConnectStatus::IDLE;
   }
 }
-bool WiFiComponent::wifi_scan_start_() {
+bool WiFiComponent::wifi_scan_start_(bool passive) {
   static bool first_scan = false;
 
   // enable STA
@@ -615,13 +615,21 @@ bool WiFiComponent::wifi_scan_start_() {
   config.channel = 0;
   config.show_hidden = 1;
 #if USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 4, 0)
-  config.scan_type = WIFI_SCAN_TYPE_ACTIVE;
+  config.scan_type = passive ? WIFI_SCAN_TYPE_PASSIVE : WIFI_SCAN_TYPE_ACTIVE;
   if (first_scan) {
-    config.scan_time.active.min = 100;
-    config.scan_time.active.max = 200;
+    if (passive) {
+      config.scan_time.passive = 200;
+    } else {
+      config.scan_time.active.min = 100;
+      config.scan_time.active.max = 200;
+    }
   } else {
-    config.scan_time.active.min = 400;
-    config.scan_time.active.max = 500;
+    if (passive) {
+      config.scan_time.passive = 500;
+    } else {
+      config.scan_time.active.min = 400;
+      config.scan_time.active.max = 500;
+    }
   }
 #endif
   first_scan = false;
diff --git a/esphome/components/wifi/wifi_component_esp_idf.cpp b/esphome/components/wifi/wifi_component_esp_idf.cpp
index 1edde74743..9b2fdaf500 100644
--- a/esphome/components/wifi/wifi_component_esp_idf.cpp
+++ b/esphome/components/wifi/wifi_component_esp_idf.cpp
@@ -736,7 +736,7 @@ WiFiSTAConnectStatus WiFiComponent::wifi_sta_connect_status_() {
   }
   return WiFiSTAConnectStatus::IDLE;
 }
-bool WiFiComponent::wifi_scan_start_() {
+bool WiFiComponent::wifi_scan_start_(bool passive) {
   // enable STA
   if (!this->wifi_mode_(true, {}))
     return false;
@@ -746,9 +746,13 @@ bool WiFiComponent::wifi_scan_start_() {
   config.bssid = nullptr;
   config.channel = 0;
   config.show_hidden = true;
-  config.scan_type = WIFI_SCAN_TYPE_ACTIVE;
-  config.scan_time.active.min = 100;
-  config.scan_time.active.max = 300;
+  config.scan_type = passive ? WIFI_SCAN_TYPE_PASSIVE : WIFI_SCAN_TYPE_ACTIVE;
+  if (passive) {
+    config.scan_time.passive = 300;
+  } else {
+    config.scan_time.active.min = 100;
+    config.scan_time.active.max = 300;
+  }
 
   esp_err_t err = esp_wifi_scan_start(&config, false);
   if (err != ESP_OK) {
diff --git a/esphome/components/wifi/wifi_component_pico_w.cpp b/esphome/components/wifi/wifi_component_pico_w.cpp
index 8e64878f8e..489ebc3699 100644
--- a/esphome/components/wifi/wifi_component_pico_w.cpp
+++ b/esphome/components/wifi/wifi_component_pico_w.cpp
@@ -125,10 +125,11 @@ void WiFiComponent::wifi_scan_result(void *env, const cyw43_ev_scan_result_t *re
   }
 }
 
-bool WiFiComponent::wifi_scan_start_() {
+bool WiFiComponent::wifi_scan_start_(bool passive) {
   this->scan_result_.clear();
   this->scan_done_ = false;
   cyw43_wifi_scan_options_t scan_options = {0};
+  scan_options.scan_type = passive ? 1 : 0;
   int err = cyw43_wifi_scan(&cyw43_state, &scan_options, nullptr, &s_wifi_scan_result);
   if (err) {
     ESP_LOGV(TAG, "cyw43_wifi_scan failed!");

From c0ad5d1d16461acf0fe6de59e38bd9f224aff16d Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Wed, 19 Apr 2023 22:54:06 -0500
Subject: [PATCH 806/838] Initial attempt at supporting ESP-IDF 5.0.0 (#4364)

* requirements: add pyparsing >= 3.0

ESP-IDF >= 5.0 requires pyparsing's rest_of_file, which was introduced
in version 3.0.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

* esp32: fix build with ESP-IDF >= 5

We need to include esp_timer.h to be able to use esp_timer_get_time().
This header existed in ESP-IDF < 5 so we don't need if guards.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

* ota: fix build with ESP-IDF >= 5

As of version 5, esp_task_wdt_init() takes a struct as argument. We also
need to include spi_flash_mmap.h.

[split unrelated change into separate commits, maintain ESP-IDF < 5
compat, use esp_task_wdt_reconfigure, add commit message]
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

* core: fix build with ESP-IDF >= 5

These header files already existed in ESP-IDF < 5 so skip if guards.

[add commit message]
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

* wifi: fix build with ESP-IDF >= 5

ESP-IDF 4.1 introduced the esp-netif API as successor to the tcp_adapter
API. The tcp_adapter API was removed in ESP-IDF 5.0.0. Part of the wifi
component was already migrated to the new API. Migrate the leftover uses
of the old API to the new API to fix build on ESP-IDF >= 5.

The version of ESP-IDF currently in use (4.4.4) supports the new API, so
we don't need any if guards to maintain backwards compatibility.

Also replace xQueueHandle, which is a pre FreeRTOS v8.0.0 data type,
with QueueHandle_t, so we don't need to enable backward compatibility
(CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY).

This reverts part of commit d42f35de5d54 to wifi_component_esp_idf.cpp,
as the esp-netif API handles that internally.

[replace pre FreeRTOS v8.0.0 data type, add commit message]
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

* mdns: fix build with ESP-IDF >= 5

In ESP-IDF 5.0.0, the mdns component was removed and moved to another
repository. Since the mdns component in esphome is always built, we
need to add the mdns component from the esp-protocols repository. This
component depends on ESP-IDF >= 5.0, so we need to add a version guard.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

* docker: install python3-venv

As of version 6.0.1, platform-espressif32 requires python3-venv.
Switching between esp-idf 4.4.4 and 5.0 causes problems with esp-idf
python dependencies installed by PlatformIO. They've solved this by
using venv. Install python3-venv so that platform-espressif32 6.0.1 and
later can be used, and we don't need to wipe the dependencies manually
when switching esp-idf versions.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

---------

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Co-authored-by: Stijn Tintel <stijn@linux-ipv6.be>
---
 docker/Dockerfile                             |  1 +
 esphome/components/esp32/core.cpp             |  1 +
 esphome/components/mdns/__init__.py           | 13 +++
 .../components/ota/ota_backend_esp_idf.cpp    | 27 +++++-
 .../wifi/wifi_component_esp_idf.cpp           | 88 ++++++++-----------
 esphome/core/helpers.cpp                      |  2 +
 requirements.txt                              |  3 +
 7 files changed, 82 insertions(+), 53 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 383c73565d..13fba50288 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -24,6 +24,7 @@ RUN \
         python3-setuptools=52.0.0-4 \
         python3-pil=8.1.2+dfsg-0.3+deb11u1 \
         python3-cryptography=3.3.2-1 \
+        python3-venv=3.9.2-3 \
         iputils-ping=3:20210202-1 \
         git=1:2.30.2-1 \
         curl=7.74.0-1.3+deb11u7 \
diff --git a/esphome/components/esp32/core.cpp b/esphome/components/esp32/core.cpp
index b47392bc6b..512a8857b6 100644
--- a/esphome/components/esp32/core.cpp
+++ b/esphome/components/esp32/core.cpp
@@ -7,6 +7,7 @@
 #include <freertos/task.h>
 #include <esp_idf_version.h>
 #include <esp_task_wdt.h>
+#include <esp_timer.h>
 #include <soc/rtc.h>
 
 #if ESP_IDF_VERSION_MAJOR >= 4
diff --git a/esphome/components/mdns/__init__.py b/esphome/components/mdns/__init__.py
index e27786a98b..66c84da8d8 100644
--- a/esphome/components/mdns/__init__.py
+++ b/esphome/components/mdns/__init__.py
@@ -4,10 +4,13 @@ from esphome.const import (
     CONF_PROTOCOL,
     CONF_SERVICES,
     CONF_SERVICE,
+    KEY_CORE,
+    KEY_FRAMEWORK_VERSION,
 )
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.core import CORE, coroutine_with_priority
+from esphome.components.esp32 import add_idf_component
 
 CODEOWNERS = ["@esphome/core"]
 DEPENDENCIES = ["network"]
@@ -79,6 +82,16 @@ async def to_code(config):
         elif CORE.is_rp2040:
             cg.add_library("LEAmDNS", None)
 
+    if CORE.using_esp_idf and CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] >= cv.Version(
+        5, 0, 0
+    ):
+        add_idf_component(
+            "mdns",
+            "https://github.com/espressif/esp-protocols.git",
+            "mdns-v1.0.9",
+            "components/mdns",
+        )
+
     if config[CONF_DISABLED]:
         return
 
diff --git a/esphome/components/ota/ota_backend_esp_idf.cpp b/esphome/components/ota/ota_backend_esp_idf.cpp
index 2fdc00c54d..7688629e39 100644
--- a/esphome/components/ota/ota_backend_esp_idf.cpp
+++ b/esphome/components/ota/ota_backend_esp_idf.cpp
@@ -8,6 +8,10 @@
 #include <esp_ota_ops.h>
 #include "esphome/components/md5/md5.h"
 
+#if ESP_IDF_VERSION_MAJOR >= 5
+#include <spi_flash_mmap.h>
+#endif
+
 namespace esphome {
 namespace ota {
 
@@ -16,9 +20,28 @@ OTAResponseTypes IDFOTABackend::begin(size_t image_size) {
   if (this->partition_ == nullptr) {
     return OTA_RESPONSE_ERROR_NO_UPDATE_PARTITION;
   }
-  esp_task_wdt_init(15, false);  // The following function takes longer than the 5 seconds timeout of WDT
+
+  // The following function takes longer than the 5 seconds timeout of WDT
+#if ESP_IDF_VERSION_MAJOR >= 5
+  esp_task_wdt_config_t wdtc;
+  wdtc.timeout_ms = 15000;
+  wdtc.idle_core_mask = 0;
+  wdtc.trigger_panic = false;
+  esp_task_wdt_reconfigure(&wdtc);
+#else
+  esp_task_wdt_init(15, false);
+#endif
+
   esp_err_t err = esp_ota_begin(this->partition_, image_size, &this->update_handle_);
-  esp_task_wdt_init(CONFIG_ESP_TASK_WDT_TIMEOUT_S, false);  // Set the WDT back to the configured timeout
+
+  // Set the WDT back to the configured timeout
+#if ESP_IDF_VERSION_MAJOR >= 5
+  wdtc.timeout_ms = CONFIG_ESP_TASK_WDT_TIMEOUT_S;
+  esp_task_wdt_reconfigure(&wdtc);
+#else
+  esp_task_wdt_init(CONFIG_ESP_TASK_WDT_TIMEOUT_S, false);
+#endif
+
   if (err != ESP_OK) {
     esp_ota_abort(this->update_handle_);
     this->update_handle_ = 0;
diff --git a/esphome/components/wifi/wifi_component_esp_idf.cpp b/esphome/components/wifi/wifi_component_esp_idf.cpp
index 9b2fdaf500..1c70f33040 100644
--- a/esphome/components/wifi/wifi_component_esp_idf.cpp
+++ b/esphome/components/wifi/wifi_component_esp_idf.cpp
@@ -17,6 +17,7 @@
 #ifdef USE_WIFI_WPA2_EAP
 #include <esp_wpa2.h>
 #endif
+#include "dhcpserver/dhcpserver.h"
 #include "lwip/err.h"
 #include "lwip/dns.h"
 
@@ -32,7 +33,7 @@ namespace wifi {
 static const char *const TAG = "wifi_esp32";
 
 static EventGroupHandle_t s_wifi_event_group;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-static xQueueHandle s_event_queue;             // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+static QueueHandle_t s_event_queue;            // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 static esp_netif_t *s_sta_netif = nullptr;     // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 static esp_netif_t *s_ap_netif = nullptr;      // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 static bool s_sta_started = false;             // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
@@ -414,17 +415,17 @@ bool WiFiComponent::wifi_sta_ip_config_(optional<ManualIP> manual_ip) {
   if (!this->wifi_mode_(true, {}))
     return false;
 
-  tcpip_adapter_dhcp_status_t dhcp_status;
-  esp_err_t err = tcpip_adapter_dhcpc_get_status(TCPIP_ADAPTER_IF_STA, &dhcp_status);
+  esp_netif_dhcp_status_t dhcp_status;
+  esp_err_t err = esp_netif_dhcpc_get_status(s_sta_netif, &dhcp_status);
   if (err != ESP_OK) {
-    ESP_LOGV(TAG, "tcpip_adapter_dhcpc_get_status failed: %s", esp_err_to_name(err));
+    ESP_LOGV(TAG, "esp_netif_dhcpc_get_status failed: %s", esp_err_to_name(err));
     return false;
   }
 
   if (!manual_ip.has_value()) {
-    // Use DHCP client
-    if (dhcp_status != TCPIP_ADAPTER_DHCP_STARTED) {
-      err = tcpip_adapter_dhcpc_start(TCPIP_ADAPTER_IF_STA);
+    // No manual IP is set; use DHCP client
+    if (dhcp_status != ESP_NETIF_DHCP_STARTED) {
+      err = esp_netif_dhcpc_start(s_sta_netif);
       if (err != ESP_OK) {
         ESP_LOGV(TAG, "Starting DHCP client failed! %d", err);
       }
@@ -433,43 +434,29 @@ bool WiFiComponent::wifi_sta_ip_config_(optional<ManualIP> manual_ip) {
     return true;
   }
 
-  tcpip_adapter_ip_info_t info;
-  memset(&info, 0, sizeof(info));
+  esp_netif_ip_info_t info;  // struct of ip4_addr_t with ip, netmask, gw
   info.ip.addr = static_cast<uint32_t>(manual_ip->static_ip);
   info.gw.addr = static_cast<uint32_t>(manual_ip->gateway);
   info.netmask.addr = static_cast<uint32_t>(manual_ip->subnet);
-
-  err = tcpip_adapter_dhcpc_stop(TCPIP_ADAPTER_IF_STA);
+  err = esp_netif_dhcpc_stop(s_sta_netif);
   if (err != ESP_OK && err != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STOPPED) {
-    ESP_LOGV(TAG, "tcpip_adapter_dhcpc_stop failed: %s", esp_err_to_name(err));
+    ESP_LOGV(TAG, "esp_netif_dhcpc_stop failed: %s", esp_err_to_name(err));
     return false;
   }
-
-  err = tcpip_adapter_set_ip_info(TCPIP_ADAPTER_IF_STA, &info);
+  err = esp_netif_set_ip_info(s_sta_netif, &info);
   if (err != ESP_OK) {
-    ESP_LOGV(TAG, "tcpip_adapter_set_ip_info failed: %s", esp_err_to_name(err));
+    ESP_LOGV(TAG, "esp_netif_set_ip_info failed: %s", esp_err_to_name(err));
     return false;
   }
 
-  ip_addr_t dns;
-#if LWIP_IPV6
-  dns.type = IPADDR_TYPE_V4;
-#endif
+  esp_netif_dns_info_t dns;
   if (uint32_t(manual_ip->dns1) != 0) {
-#if LWIP_IPV6
-    dns.u_addr.ip4.addr = static_cast<uint32_t>(manual_ip->dns1);
-#else
-    dns.addr = static_cast<uint32_t>(manual_ip->dns1);
-#endif
-    dns_setserver(0, &dns);
+    dns.ip.u_addr.ip4.addr = static_cast<uint32_t>(manual_ip->dns1);
+    esp_netif_set_dns_info(s_sta_netif, ESP_NETIF_DNS_MAIN, &dns);
   }
   if (uint32_t(manual_ip->dns2) != 0) {
-#if LWIP_IPV6
-    dns.u_addr.ip4.addr = static_cast<uint32_t>(manual_ip->dns2);
-#else
-    dns.addr = static_cast<uint32_t>(manual_ip->dns2);
-#endif
-    dns_setserver(1, &dns);
+    dns.ip.u_addr.ip4.addr = static_cast<uint32_t>(manual_ip->dns2);
+    esp_netif_set_dns_info(s_sta_netif, ESP_NETIF_DNS_BACKUP, &dns);
   }
 
   return true;
@@ -478,10 +465,10 @@ bool WiFiComponent::wifi_sta_ip_config_(optional<ManualIP> manual_ip) {
 network::IPAddress WiFiComponent::wifi_sta_ip() {
   if (!this->has_sta())
     return {};
-  tcpip_adapter_ip_info_t ip;
-  esp_err_t err = tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &ip);
+  esp_netif_ip_info_t ip;
+  esp_err_t err = esp_netif_get_ip_info(s_sta_netif, &ip);
   if (err != ESP_OK) {
-    ESP_LOGV(TAG, "tcpip_adapter_get_ip_info failed: %s", esp_err_to_name(err));
+    ESP_LOGV(TAG, "esp_netif_get_ip_info failed: %s", esp_err_to_name(err));
     return false;
   }
   return {ip.ip.addr};
@@ -601,9 +588,9 @@ void WiFiComponent::wifi_process_event_(IDFWiFiEvent *data) {
   if (data->event_base == WIFI_EVENT && data->event_id == WIFI_EVENT_STA_START) {
     ESP_LOGV(TAG, "Event: WiFi STA start");
     // apply hostname
-    err = tcpip_adapter_set_hostname(TCPIP_ADAPTER_IF_STA, App.get_name().c_str());
+    err = esp_netif_set_hostname(s_sta_netif, App.get_name().c_str());
     if (err != ERR_OK) {
-      ESP_LOGW(TAG, "tcpip_adapter_set_hostname failed: %s", esp_err_to_name(err));
+      ESP_LOGW(TAG, "esp_netif_set_hostname failed: %s", esp_err_to_name(err));
     }
 
     s_sta_started = true;
@@ -651,7 +638,7 @@ void WiFiComponent::wifi_process_event_(IDFWiFiEvent *data) {
   } else if (data->event_base == IP_EVENT && data->event_id == IP_EVENT_STA_GOT_IP) {
     const auto &it = data->data.ip_got_ip;
 #if LWIP_IPV6_AUTOCONFIG
-    tcpip_adapter_create_ip6_linklocal(TCPIP_ADAPTER_IF_STA);
+    esp_netif_create_ip6_linklocal(s_sta_netif);
 #endif
     ESP_LOGV(TAG, "Event: Got IP static_ip=%s gateway=%s", format_ip4_addr(it.ip_info.ip).c_str(),
              format_ip4_addr(it.ip_info.gw).c_str());
@@ -770,8 +757,7 @@ bool WiFiComponent::wifi_ap_ip_config_(optional<ManualIP> manual_ip) {
   if (!this->wifi_mode_({}, true))
     return false;
 
-  tcpip_adapter_ip_info_t info;
-  memset(&info, 0, sizeof(info));
+  esp_netif_ip_info_t info;
   if (manual_ip.has_value()) {
     info.ip.addr = static_cast<uint32_t>(manual_ip->static_ip);
     info.gw.addr = static_cast<uint32_t>(manual_ip->gateway);
@@ -781,17 +767,17 @@ bool WiFiComponent::wifi_ap_ip_config_(optional<ManualIP> manual_ip) {
     info.gw.addr = static_cast<uint32_t>(network::IPAddress(192, 168, 4, 1));
     info.netmask.addr = static_cast<uint32_t>(network::IPAddress(255, 255, 255, 0));
   }
-  tcpip_adapter_dhcp_status_t dhcp_status;
-  tcpip_adapter_dhcps_get_status(TCPIP_ADAPTER_IF_AP, &dhcp_status);
-  err = tcpip_adapter_dhcps_stop(TCPIP_ADAPTER_IF_AP);
+  esp_netif_dhcp_status_t dhcp_status;
+  esp_netif_dhcps_get_status(s_sta_netif, &dhcp_status);
+  err = esp_netif_dhcps_stop(s_sta_netif);
   if (err != ESP_OK) {
-    ESP_LOGV(TAG, "tcpip_adapter_dhcps_stop failed! %d", err);
+    ESP_LOGV(TAG, "esp_netif_dhcps_stop failed! %d", err);
     return false;
   }
 
-  err = tcpip_adapter_set_ip_info(TCPIP_ADAPTER_IF_AP, &info);
+  err = esp_netif_set_ip_info(s_sta_netif, &info);
   if (err != ESP_OK) {
-    ESP_LOGV(TAG, "tcpip_adapter_set_ip_info failed! %d", err);
+    ESP_LOGV(TAG, "esp_netif_set_ip_info failed! %d", err);
     return false;
   }
 
@@ -804,17 +790,17 @@ bool WiFiComponent::wifi_ap_ip_config_(optional<ManualIP> manual_ip) {
   start_address[3] += 100;
   lease.end_ip.addr = static_cast<uint32_t>(start_address);
   ESP_LOGV(TAG, "DHCP server IP lease end: %s", start_address.str().c_str());
-  err = tcpip_adapter_dhcps_option(TCPIP_ADAPTER_OP_SET, TCPIP_ADAPTER_REQUESTED_IP_ADDRESS, &lease, sizeof(lease));
+  err = esp_netif_dhcps_option(s_sta_netif, ESP_NETIF_OP_SET, ESP_NETIF_REQUESTED_IP_ADDRESS, &lease, sizeof(lease));
 
   if (err != ESP_OK) {
-    ESP_LOGV(TAG, "tcpip_adapter_dhcps_option failed! %d", err);
+    ESP_LOGV(TAG, "esp_netif_dhcps_option failed! %d", err);
     return false;
   }
 
-  err = tcpip_adapter_dhcps_start(TCPIP_ADAPTER_IF_AP);
+  err = esp_netif_dhcps_start(s_sta_netif);
 
   if (err != ESP_OK) {
-    ESP_LOGV(TAG, "tcpip_adapter_dhcps_start failed! %d", err);
+    ESP_LOGV(TAG, "esp_netif_dhcps_start failed! %d", err);
     return false;
   }
 
@@ -860,8 +846,8 @@ bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
   return true;
 }
 network::IPAddress WiFiComponent::wifi_soft_ap_ip() {
-  tcpip_adapter_ip_info_t ip;
-  tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &ip);
+  esp_netif_ip_info_t ip;
+  esp_netif_get_ip_info(s_sta_netif, &ip);
   return {ip.ip.addr};
 }
 bool WiFiComponent::wifi_disconnect_() { return esp_wifi_disconnect(); }
diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index 7f5c3ad333..7e8ba41987 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -18,6 +18,8 @@
 #elif defined(USE_ESP32_FRAMEWORK_ARDUINO)
 #include <Esp.h>
 #elif defined(USE_ESP_IDF)
+#include "esp_mac.h"
+#include "esp_random.h"
 #include "esp_system.h"
 #include <freertos/FreeRTOS.h>
 #include <freertos/portmacro.h>
diff --git a/requirements.txt b/requirements.txt
index 5f73cf3a06..bb2c736709 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,3 +16,6 @@ zeroconf==0.56.0
 # esp-idf requires this, but doesn't bundle it by default
 # https://github.com/espressif/esp-idf/blob/220590d599e134d7a5e7f1e683cc4550349ffbf8/requirements.txt#L24
 kconfiglib==13.7.1
+
+# esp-idf >= 5.0 requires this
+pyparsing >= 3.0

From bb05ba3d00dce21e5ce22dd3dba7701143ebd9d7 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Sat, 22 Apr 2023 00:41:12 -0700
Subject: [PATCH 807/838] fix flip_x (#4727)

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

diff --git a/esphome/components/max7219digit/display.py b/esphome/components/max7219digit/display.py
index faa8a08f4a..8db9123a39 100644
--- a/esphome/components/max7219digit/display.py
+++ b/esphome/components/max7219digit/display.py
@@ -93,7 +93,7 @@ async def to_code(config):
     cg.add(var.set_scroll(config[CONF_SCROLL_ENABLE]))
     cg.add(var.set_scroll_mode(config[CONF_SCROLL_MODE]))
     cg.add(var.set_reverse(config[CONF_REVERSE_ENABLE]))
-    cg.add(var.set_flip_x([CONF_FLIP_X]))
+    cg.add(var.set_flip_x(config[CONF_FLIP_X]))
 
     if CONF_LAMBDA in config:
         lambda_ = await cg.process_lambda(

From 327cd662b4dd95a92ddf88c595bc4014923aa084 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 24 Apr 2023 08:42:46 +1200
Subject: [PATCH 808/838] Use proper schema for delta filter (#4723)

---
 esphome/components/sensor/__init__.py | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index ac25884697..f0a58d908c 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -25,10 +25,12 @@ from esphome.const import (
     CONF_STATE_CLASS,
     CONF_TO,
     CONF_TRIGGER_ID,
+    CONF_TYPE,
     CONF_UNIT_OF_MEASUREMENT,
     CONF_WINDOW_SIZE,
     CONF_MQTT_ID,
     CONF_FORCE_UPDATE,
+    CONF_VALUE,
     DEVICE_CLASS_APPARENT_POWER,
     DEVICE_CLASS_AQI,
     DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
@@ -476,21 +478,38 @@ async def lambda_filter_to_code(config, filter_id):
     return cg.new_Pvariable(filter_id, lambda_)
 
 
+DELTA_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_VALUE): cv.positive_float,
+        cv.Optional(CONF_TYPE, default="absolute"): cv.one_of(
+            "absolute", "percentage", lower=True
+        ),
+    }
+)
+
+
 def validate_delta(config):
     try:
-        return (cv.positive_float(config), False)
+        value = cv.positive_float(config)
+        return DELTA_SCHEMA({CONF_VALUE: value, CONF_TYPE: "absolute"})
     except cv.Invalid:
         pass
     try:
-        return (cv.percentage(config), True)
+        value = cv.percentage(config)
+        return DELTA_SCHEMA({CONF_VALUE: value, CONF_TYPE: "percentage"})
     except cv.Invalid:
         pass
     raise cv.Invalid("Delta filter requires a positive number or percentage value.")
 
 
-@FILTER_REGISTRY.register("delta", DeltaFilter, validate_delta)
+@FILTER_REGISTRY.register("delta", DeltaFilter, cv.Any(DELTA_SCHEMA, validate_delta))
 async def delta_filter_to_code(config, filter_id):
-    return cg.new_Pvariable(filter_id, *config)
+    percentage = config[CONF_TYPE] == "percentage"
+    return cg.new_Pvariable(
+        filter_id,
+        config[CONF_VALUE],
+        percentage,
+    )
 
 
 @FILTER_REGISTRY.register("or", OrFilter, validate_filters)

From 0a95f116fcf9c8cbaa98c3d85796c746004ee60d Mon Sep 17 00:00:00 2001
From: Rebbe Pod <66928914+RebbePod@users.noreply.github.com>
Date: Sun, 23 Apr 2023 16:44:35 -0400
Subject: [PATCH 809/838] Get Sunrise & Sunset for a Specific Date (#4712)

* Update real_time_clock.cpp

* Update real_time_clock.h

* Update sun.h

* Update sun.h

* Update sun.h

* Enable the sunAtLocation to be used externally

* Enable the sunAtLocation to be used externally

* Update sun.h

* Update sun.h

* update

* update

* update to only use one function

* Update sun.h

* Update sun.cpp
---
 esphome/components/sun/sun.cpp | 19 ++++++++++++++-----
 esphome/components/sun/sun.h   |  3 +++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/esphome/components/sun/sun.cpp b/esphome/components/sun/sun.cpp
index 54aaf0942b..5f9179682a 100644
--- a/esphome/components/sun/sun.cpp
+++ b/esphome/components/sun/sun.cpp
@@ -287,18 +287,17 @@ HorizontalCoordinate Sun::calc_coords_() {
   */
   return sun.true_coordinate(m);
 }
-optional<time::ESPTime> Sun::calc_event_(bool rising, double zenith) {
+optional<time::ESPTime> Sun::calc_event_(time::ESPTime date, bool rising, double zenith) {
   SunAtLocation sun{location_};
-  auto now = this->time_->utcnow();
-  if (!now.is_valid())
+  if (!date.is_valid())
     return {};
   // Calculate UT1 timestamp at 0h
-  auto today = now;
+  auto today = date;
   today.hour = today.minute = today.second = 0;
   today.recalc_timestamp_utc();
 
   auto it = sun.event(rising, today, zenith);
-  if (it.has_value() && it->timestamp < now.timestamp) {
+  if (it.has_value() && it->timestamp < date.timestamp) {
     // We're calculating *next* sunrise/sunset, but calculated event
     // is today, so try again tomorrow
     time_t new_timestamp = today.timestamp + 24 * 60 * 60;
@@ -307,9 +306,19 @@ optional<time::ESPTime> Sun::calc_event_(bool rising, double zenith) {
   }
   return it;
 }
+optional<time::ESPTime> Sun::calc_event_(bool rising, double zenith) {
+  auto it = Sun::calc_event_(this->time_->utcnow(), rising, zenith);
+  return it;
+}
 
 optional<time::ESPTime> Sun::sunrise(double elevation) { return this->calc_event_(true, 90 - elevation); }
 optional<time::ESPTime> Sun::sunset(double elevation) { return this->calc_event_(false, 90 - elevation); }
+optional<time::ESPTime> Sun::sunrise(time::ESPTime date, double elevation) {
+  return this->calc_event_(date, true, 90 - elevation);
+}
+optional<time::ESPTime> Sun::sunset(time::ESPTime date, double elevation) {
+  return this->calc_event_(date, false, 90 - elevation);
+}
 double Sun::elevation() { return this->calc_coords_().elevation; }
 double Sun::azimuth() { return this->calc_coords_().azimuth; }
 
diff --git a/esphome/components/sun/sun.h b/esphome/components/sun/sun.h
index efc6a1ab0a..9547b2f280 100644
--- a/esphome/components/sun/sun.h
+++ b/esphome/components/sun/sun.h
@@ -59,6 +59,8 @@ class Sun {
 
   optional<time::ESPTime> sunrise(double elevation);
   optional<time::ESPTime> sunset(double elevation);
+  optional<time::ESPTime> sunrise(time::ESPTime date, double elevation);
+  optional<time::ESPTime> sunset(time::ESPTime date, double elevation);
 
   double elevation();
   double azimuth();
@@ -66,6 +68,7 @@ class Sun {
  protected:
   internal::HorizontalCoordinate calc_coords_();
   optional<time::ESPTime> calc_event_(bool rising, double zenith);
+  optional<time::ESPTime> calc_event_(time::ESPTime date, bool rising, double zenith);
 
   time::RealTimeClock *time_;
   internal::GeoLocation location_;

From bef5b38d497af8319605ee9f9900d74a353eeb51 Mon Sep 17 00:00:00 2001
From: Alexander Momchilov <amomchilov@users.noreply.github.com>
Date: Sun, 23 Apr 2023 16:51:32 -0400
Subject: [PATCH 810/838] Add `supports_stop` trait to Cover (#3897)

* Add "stop" trait to Cover

* Add `supports_stop` to Cover protobuf msg

* Run `script/api_protobuf/api_protobuf.py`

... followed by `script/clang-format -i`

* Add `has_stop` field to template Cover

* Set `has_stop` during Cover codegen

* Set `supports_stop` trait on all other Cover types

* Bump APIVersion to 1.8

---------

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/am43/cover/am43_cover.cpp             | 1 +
 esphome/components/api/api.proto                         | 1 +
 esphome/components/api/api_connection.cpp                | 2 +-
 esphome/components/api/api_pb2.cpp                       | 9 +++++++++
 esphome/components/api/api_pb2.h                         | 1 +
 esphome/components/copy/cover/copy_cover.cpp             | 1 +
 esphome/components/cover/cover_traits.h                  | 3 +++
 esphome/components/current_based/current_based_cover.cpp | 1 +
 esphome/components/demo/demo_cover.h                     | 1 +
 esphome/components/endstop/endstop_cover.cpp             | 1 +
 esphome/components/feedback/feedback_cover.cpp           | 1 +
 esphome/components/template/cover/__init__.py            | 1 +
 esphome/components/template/cover/template_cover.cpp     | 2 ++
 esphome/components/template/cover/template_cover.h       | 2 ++
 esphome/components/time_based/time_based_cover.cpp       | 1 +
 esphome/components/tuya/cover/tuya_cover.cpp             | 1 +
 16 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/esphome/components/am43/cover/am43_cover.cpp b/esphome/components/am43/cover/am43_cover.cpp
index d0ef4a2fbb..93c77ea364 100644
--- a/esphome/components/am43/cover/am43_cover.cpp
+++ b/esphome/components/am43/cover/am43_cover.cpp
@@ -40,6 +40,7 @@ void Am43Component::loop() {
 
 CoverTraits Am43Component::get_traits() {
   auto traits = CoverTraits();
+  traits.set_supports_stop(true);
   traits.set_supports_position(true);
   traits.set_supports_tilt(false);
   traits.set_is_assumed_state(false);
diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index f31ef3ffc0..1fafc56e59 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -288,6 +288,7 @@ message ListEntitiesCoverResponse {
   bool disabled_by_default = 9;
   string icon = 10;
   EntityCategory entity_category = 11;
+  bool supports_stop = 12;
 }
 
 enum LegacyCoverState {
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 96fb3ea9fa..ff8f97b34b 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -944,7 +944,7 @@ HelloResponse APIConnection::hello(const HelloRequest &msg) {
 
   HelloResponse resp;
   resp.api_version_major = 1;
-  resp.api_version_minor = 7;
+  resp.api_version_minor = 8;
   resp.server_info = App.get_name() + " (esphome v" ESPHOME_VERSION ")";
   resp.name = App.get_name();
 
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 334cde16b3..82301456f7 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -941,6 +941,10 @@ bool ListEntitiesCoverResponse::decode_varint(uint32_t field_id, ProtoVarInt val
       this->entity_category = value.as_enum<enums::EntityCategory>();
       return true;
     }
+    case 12: {
+      this->supports_stop = value.as_bool();
+      return true;
+    }
     default:
       return false;
   }
@@ -993,6 +997,7 @@ void ListEntitiesCoverResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(9, this->disabled_by_default);
   buffer.encode_string(10, this->icon);
   buffer.encode_enum<enums::EntityCategory>(11, this->entity_category);
+  buffer.encode_bool(12, this->supports_stop);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesCoverResponse::dump_to(std::string &out) const {
@@ -1042,6 +1047,10 @@ void ListEntitiesCoverResponse::dump_to(std::string &out) const {
   out.append("  entity_category: ");
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
+
+  out.append("  supports_stop: ");
+  out.append(YESNO(this->supports_stop));
+  out.append("\n");
   out.append("}");
 }
 #endif
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 9f71c07913..b386cfb4fd 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -375,6 +375,7 @@ class ListEntitiesCoverResponse : public ProtoMessage {
   bool disabled_by_default{false};
   std::string icon{};
   enums::EntityCategory entity_category{};
+  bool supports_stop{false};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
diff --git a/esphome/components/copy/cover/copy_cover.cpp b/esphome/components/copy/cover/copy_cover.cpp
index cf50473018..28f8c9877c 100644
--- a/esphome/components/copy/cover/copy_cover.cpp
+++ b/esphome/components/copy/cover/copy_cover.cpp
@@ -28,6 +28,7 @@ cover::CoverTraits CopyCover::get_traits() {
   // copy traits manually so it doesn't break when new options are added
   // but the control() method hasn't implemented them yet.
   traits.set_is_assumed_state(base.get_is_assumed_state());
+  traits.set_supports_stop(base.get_supports_stop());
   traits.set_supports_position(base.get_supports_position());
   traits.set_supports_tilt(base.get_supports_tilt());
   traits.set_supports_toggle(base.get_supports_toggle());
diff --git a/esphome/components/cover/cover_traits.h b/esphome/components/cover/cover_traits.h
index fb30883f77..79001c3b03 100644
--- a/esphome/components/cover/cover_traits.h
+++ b/esphome/components/cover/cover_traits.h
@@ -15,12 +15,15 @@ class CoverTraits {
   void set_supports_tilt(bool supports_tilt) { this->supports_tilt_ = supports_tilt; }
   bool get_supports_toggle() const { return this->supports_toggle_; }
   void set_supports_toggle(bool supports_toggle) { this->supports_toggle_ = supports_toggle; }
+  bool get_supports_stop() const { return this->supports_stop_; }
+  void set_supports_stop(bool supports_stop) { this->supports_stop_ = supports_stop; }
 
  protected:
   bool is_assumed_state_{false};
   bool supports_position_{false};
   bool supports_tilt_{false};
   bool supports_toggle_{false};
+  bool supports_stop_{false};
 };
 
 }  // namespace cover
diff --git a/esphome/components/current_based/current_based_cover.cpp b/esphome/components/current_based/current_based_cover.cpp
index 7edbdf5a72..ff5ad43997 100644
--- a/esphome/components/current_based/current_based_cover.cpp
+++ b/esphome/components/current_based/current_based_cover.cpp
@@ -12,6 +12,7 @@ using namespace esphome::cover;
 
 CoverTraits CurrentBasedCover::get_traits() {
   auto traits = CoverTraits();
+  traits.set_supports_stop(true);
   traits.set_supports_position(true);
   traits.set_supports_toggle(true);
   traits.set_is_assumed_state(false);
diff --git a/esphome/components/demo/demo_cover.h b/esphome/components/demo/demo_cover.h
index ab039736fb..ec266d46ab 100644
--- a/esphome/components/demo/demo_cover.h
+++ b/esphome/components/demo/demo_cover.h
@@ -72,6 +72,7 @@ class DemoCover : public cover::Cover, public Component {
         traits.set_supports_tilt(true);
         break;
       case DemoCoverType::TYPE_4:
+        traits.set_supports_stop(true);
         traits.set_is_assumed_state(true);
         traits.set_supports_tilt(true);
         break;
diff --git a/esphome/components/endstop/endstop_cover.cpp b/esphome/components/endstop/endstop_cover.cpp
index f468d13492..1190acc46b 100644
--- a/esphome/components/endstop/endstop_cover.cpp
+++ b/esphome/components/endstop/endstop_cover.cpp
@@ -11,6 +11,7 @@ using namespace esphome::cover;
 
 CoverTraits EndstopCover::get_traits() {
   auto traits = CoverTraits();
+  traits.set_supports_stop(true);
   traits.set_supports_position(true);
   traits.set_supports_toggle(true);
   traits.set_is_assumed_state(false);
diff --git a/esphome/components/feedback/feedback_cover.cpp b/esphome/components/feedback/feedback_cover.cpp
index 213ce7ff8f..117c626f58 100644
--- a/esphome/components/feedback/feedback_cover.cpp
+++ b/esphome/components/feedback/feedback_cover.cpp
@@ -41,6 +41,7 @@ void FeedbackCover::setup() {
 
 CoverTraits FeedbackCover::get_traits() {
   auto traits = CoverTraits();
+  traits.set_supports_stop(true);
   traits.set_supports_position(true);
   traits.set_supports_toggle(true);
   traits.set_is_assumed_state(this->assumed_state_);
diff --git a/esphome/components/template/cover/__init__.py b/esphome/components/template/cover/__init__.py
index a628da70d2..8844ddd6ab 100644
--- a/esphome/components/template/cover/__init__.py
+++ b/esphome/components/template/cover/__init__.py
@@ -73,6 +73,7 @@ async def to_code(config):
         await automation.build_automation(
             var.get_stop_trigger(), [], config[CONF_STOP_ACTION]
         )
+        cg.add(var.set_has_stop(True))
     if CONF_TILT_ACTION in config:
         await automation.build_automation(
             var.get_tilt_trigger(), [(float, "tilt")], config[CONF_TILT_ACTION]
diff --git a/esphome/components/template/cover/template_cover.cpp b/esphome/components/template/cover/template_cover.cpp
index 47c651e643..b16e439943 100644
--- a/esphome/components/template/cover/template_cover.cpp
+++ b/esphome/components/template/cover/template_cover.cpp
@@ -109,6 +109,7 @@ void TemplateCover::control(const CoverCall &call) {
 CoverTraits TemplateCover::get_traits() {
   auto traits = CoverTraits();
   traits.set_is_assumed_state(this->assumed_state_);
+  traits.set_supports_stop(this->has_stop_);
   traits.set_supports_position(this->has_position_);
   traits.set_supports_tilt(this->has_tilt_);
   return traits;
@@ -116,6 +117,7 @@ CoverTraits TemplateCover::get_traits() {
 Trigger<float> *TemplateCover::get_position_trigger() const { return this->position_trigger_; }
 Trigger<float> *TemplateCover::get_tilt_trigger() const { return this->tilt_trigger_; }
 void TemplateCover::set_tilt_lambda(std::function<optional<float>()> &&tilt_f) { this->tilt_f_ = tilt_f; }
+void TemplateCover::set_has_stop(bool has_stop) { this->has_stop_ = has_stop; }
 void TemplateCover::set_has_position(bool has_position) { this->has_position_ = has_position; }
 void TemplateCover::set_has_tilt(bool has_tilt) { this->has_tilt_ = has_tilt; }
 void TemplateCover::stop_prev_trigger_() {
diff --git a/esphome/components/template/cover/template_cover.h b/esphome/components/template/cover/template_cover.h
index 3b9dcea50b..4ff5caf1db 100644
--- a/esphome/components/template/cover/template_cover.h
+++ b/esphome/components/template/cover/template_cover.h
@@ -26,6 +26,7 @@ class TemplateCover : public cover::Cover, public Component {
   void set_optimistic(bool optimistic);
   void set_assumed_state(bool assumed_state);
   void set_tilt_lambda(std::function<optional<float>()> &&tilt_f);
+  void set_has_stop(bool has_stop);
   void set_has_position(bool has_position);
   void set_has_tilt(bool has_tilt);
   void set_restore_mode(TemplateCoverRestoreMode restore_mode) { restore_mode_ = restore_mode; }
@@ -48,6 +49,7 @@ class TemplateCover : public cover::Cover, public Component {
   bool optimistic_{false};
   Trigger<> *open_trigger_;
   Trigger<> *close_trigger_;
+  bool has_stop_{false};
   Trigger<> *stop_trigger_;
   Trigger<> *prev_command_trigger_{nullptr};
   Trigger<float> *position_trigger_;
diff --git a/esphome/components/time_based/time_based_cover.cpp b/esphome/components/time_based/time_based_cover.cpp
index a7ba6d0595..50376224a9 100644
--- a/esphome/components/time_based/time_based_cover.cpp
+++ b/esphome/components/time_based/time_based_cover.cpp
@@ -51,6 +51,7 @@ void TimeBasedCover::loop() {
 float TimeBasedCover::get_setup_priority() const { return setup_priority::DATA; }
 CoverTraits TimeBasedCover::get_traits() {
   auto traits = CoverTraits();
+  traits.set_supports_stop(true);
   traits.set_supports_position(true);
   traits.set_supports_toggle(true);
   traits.set_is_assumed_state(this->assumed_state_);
diff --git a/esphome/components/tuya/cover/tuya_cover.cpp b/esphome/components/tuya/cover/tuya_cover.cpp
index 11a458449f..fcb961f45e 100644
--- a/esphome/components/tuya/cover/tuya_cover.cpp
+++ b/esphome/components/tuya/cover/tuya_cover.cpp
@@ -128,6 +128,7 @@ void TuyaCover::dump_config() {
 
 cover::CoverTraits TuyaCover::get_traits() {
   auto traits = cover::CoverTraits();
+  traits.set_supports_stop(true);
   traits.set_supports_position(true);
   return traits;
 }

From 4a177e39316b43523939d49b7be7092c3410a466 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 08:53:50 +1200
Subject: [PATCH 811/838] Bump aioesphomeapi from 13.7.0 to 13.7.1 (#4725)

Bumps [aioesphomeapi](https://github.com/esphome/aioesphomeapi) from 13.7.0 to 13.7.1.
- [Release notes](https://github.com/esphome/aioesphomeapi/releases)
- [Commits](https://github.com/esphome/aioesphomeapi/compare/v13.7.0...v13.7.1)

---
updated-dependencies:
- dependency-name: aioesphomeapi
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
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 bb2c736709..4ab30e414e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.6  # When updating platformio, also update Dockerfile
 esptool==4.5.1
 click==8.1.3
 esphome-dashboard==20230214.0
-aioesphomeapi==13.7.0
+aioesphomeapi==13.7.1
 zeroconf==0.56.0
 
 # esp-idf requires this, but doesn't bundle it by default

From a12ba7bd3889ddfff1890728a1f032ee254f8c42 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Sat, 22 Apr 2023 00:41:12 -0700
Subject: [PATCH 812/838] fix flip_x (#4727)

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

diff --git a/esphome/components/max7219digit/display.py b/esphome/components/max7219digit/display.py
index faa8a08f4a..8db9123a39 100644
--- a/esphome/components/max7219digit/display.py
+++ b/esphome/components/max7219digit/display.py
@@ -93,7 +93,7 @@ async def to_code(config):
     cg.add(var.set_scroll(config[CONF_SCROLL_ENABLE]))
     cg.add(var.set_scroll_mode(config[CONF_SCROLL_MODE]))
     cg.add(var.set_reverse(config[CONF_REVERSE_ENABLE]))
-    cg.add(var.set_flip_x([CONF_FLIP_X]))
+    cg.add(var.set_flip_x(config[CONF_FLIP_X]))
 
     if CONF_LAMBDA in config:
         lambda_ = await cg.process_lambda(

From 38ed38864eaf818ae988f6dc7136f07c9002fd63 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 24 Apr 2023 08:42:46 +1200
Subject: [PATCH 813/838] Use proper schema for delta filter (#4723)

---
 esphome/components/sensor/__init__.py | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index ac25884697..f0a58d908c 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -25,10 +25,12 @@ from esphome.const import (
     CONF_STATE_CLASS,
     CONF_TO,
     CONF_TRIGGER_ID,
+    CONF_TYPE,
     CONF_UNIT_OF_MEASUREMENT,
     CONF_WINDOW_SIZE,
     CONF_MQTT_ID,
     CONF_FORCE_UPDATE,
+    CONF_VALUE,
     DEVICE_CLASS_APPARENT_POWER,
     DEVICE_CLASS_AQI,
     DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
@@ -476,21 +478,38 @@ async def lambda_filter_to_code(config, filter_id):
     return cg.new_Pvariable(filter_id, lambda_)
 
 
+DELTA_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_VALUE): cv.positive_float,
+        cv.Optional(CONF_TYPE, default="absolute"): cv.one_of(
+            "absolute", "percentage", lower=True
+        ),
+    }
+)
+
+
 def validate_delta(config):
     try:
-        return (cv.positive_float(config), False)
+        value = cv.positive_float(config)
+        return DELTA_SCHEMA({CONF_VALUE: value, CONF_TYPE: "absolute"})
     except cv.Invalid:
         pass
     try:
-        return (cv.percentage(config), True)
+        value = cv.percentage(config)
+        return DELTA_SCHEMA({CONF_VALUE: value, CONF_TYPE: "percentage"})
     except cv.Invalid:
         pass
     raise cv.Invalid("Delta filter requires a positive number or percentage value.")
 
 
-@FILTER_REGISTRY.register("delta", DeltaFilter, validate_delta)
+@FILTER_REGISTRY.register("delta", DeltaFilter, cv.Any(DELTA_SCHEMA, validate_delta))
 async def delta_filter_to_code(config, filter_id):
-    return cg.new_Pvariable(filter_id, *config)
+    percentage = config[CONF_TYPE] == "percentage"
+    return cg.new_Pvariable(
+        filter_id,
+        config[CONF_VALUE],
+        percentage,
+    )
 
 
 @FILTER_REGISTRY.register("or", OrFilter, validate_filters)

From 96d208e0d806074f07278a42d77025a85f758de2 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 24 Apr 2023 09:11:07 +1200
Subject: [PATCH 814/838] Bump version to 2023.4.1

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

diff --git a/esphome/const.py b/esphome/const.py
index 1e72c6d609..6796f8d606 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.4.0"
+__version__ = "2023.4.1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 7abdb5d04689b344b7c69dc51ea1156e5be0427f Mon Sep 17 00:00:00 2001
From: gcopeland <greg@copelandconsulting.net>
Date: Wed, 26 Apr 2023 15:00:37 -0500
Subject: [PATCH 815/838] I2c scan recovery reset fix (#4724)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/i2c/i2c_bus_arduino.cpp | 11 ++++++++---
 esphome/components/i2c/i2c_bus_esp_idf.cpp | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/esphome/components/i2c/i2c_bus_arduino.cpp b/esphome/components/i2c/i2c_bus_arduino.cpp
index e08622a3ae..d80ab1fd1d 100644
--- a/esphome/components/i2c/i2c_bus_arduino.cpp
+++ b/esphome/components/i2c/i2c_bus_arduino.cpp
@@ -3,6 +3,7 @@
 #include "i2c_bus_arduino.h"
 #include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
+#include "esphome/core/application.h"
 #include <Arduino.h>
 #include <cstring>
 
@@ -227,10 +228,14 @@ void ArduinoI2CBus::recover_() {
     // When SCL is kept LOW at this point, we might be looking at a device
     // that applies clock stretching. Wait for the release of the SCL line,
     // but not forever. There is no specification for the maximum allowed
-    // time. We'll stick to 500ms here.
-    auto wait = 20;
+    // time. We yield and reset the WDT, so as to avoid triggering reset.
+    // No point in trying to recover the bus by forcing a uC reset. Bus
+    // should recover in a few ms or less else not likely to recovery at
+    // all.
+    auto wait = 250;
     while (wait-- && digitalRead(scl_pin_) == LOW) {  // NOLINT
-      delay(25);
+      App.feed_wdt();
+      delayMicroseconds(half_period_usec * 2);
     }
     if (digitalRead(scl_pin_) == LOW) {  // NOLINT
       ESP_LOGE(TAG, "Recovery failed: SCL is held LOW during clock pulse cycle");
diff --git a/esphome/components/i2c/i2c_bus_esp_idf.cpp b/esphome/components/i2c/i2c_bus_esp_idf.cpp
index 5178f6d4f2..51688322f6 100644
--- a/esphome/components/i2c/i2c_bus_esp_idf.cpp
+++ b/esphome/components/i2c/i2c_bus_esp_idf.cpp
@@ -4,6 +4,7 @@
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
+#include "esphome/core/application.h"
 #include <cstring>
 #include <cinttypes>
 
@@ -273,10 +274,14 @@ void IDFI2CBus::recover_() {
     // When SCL is kept LOW at this point, we might be looking at a device
     // that applies clock stretching. Wait for the release of the SCL line,
     // but not forever. There is no specification for the maximum allowed
-    // time. We'll stick to 500ms here.
-    auto wait = 20;
+    // time. We yield and reset the WDT, so as to avoid triggering reset.
+    // No point in trying to recover the bus by forcing a uC reset. Bus
+    // should recover in a few ms or less else not likely to recovery at
+    // all.
+    auto wait = 250;
     while (wait-- && gpio_get_level(scl_pin) == 0) {
-      delay(25);
+      App.feed_wdt();
+      delayMicroseconds(half_period_usec * 2);
     }
     if (gpio_get_level(scl_pin) == 0) {
       ESP_LOGE(TAG, "Recovery failed: SCL is held LOW during clock pulse cycle");

From 986dd2ddd2e00c817fae671cfd9169c3c44bc39b Mon Sep 17 00:00:00 2001
From: Jimmy Hedman <jimmy.hedman@gmail.com>
Date: Wed, 26 Apr 2023 22:03:30 +0200
Subject: [PATCH 816/838] Debug component doesn't work on RP2040 (#4728)

---
 esphome/components/debug/__init__.py | 43 +++++++++++++++-------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/esphome/components/debug/__init__.py b/esphome/components/debug/__init__.py
index c18baa1cca..9742b3b19e 100644
--- a/esphome/components/debug/__init__.py
+++ b/esphome/components/debug/__init__.py
@@ -17,26 +17,29 @@ debug_ns = cg.esphome_ns.namespace("debug")
 DebugComponent = debug_ns.class_("DebugComponent", cg.PollingComponent)
 
 
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(DebugComponent),
-        cv.Optional(CONF_DEVICE): cv.invalid(
-            "The 'device' option has been moved to the 'debug' text_sensor component"
-        ),
-        cv.Optional(CONF_FREE): cv.invalid(
-            "The 'free' option has been moved to the 'debug' sensor component"
-        ),
-        cv.Optional(CONF_BLOCK): cv.invalid(
-            "The 'block' option has been moved to the 'debug' sensor component"
-        ),
-        cv.Optional(CONF_FRAGMENTATION): cv.invalid(
-            "The 'fragmentation' option has been moved to the 'debug' sensor component"
-        ),
-        cv.Optional(CONF_LOOP_TIME): cv.invalid(
-            "The 'loop_time' option has been moved to the 'debug' sensor component"
-        ),
-    }
-).extend(cv.polling_component_schema("60s"))
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(DebugComponent),
+            cv.Optional(CONF_DEVICE): cv.invalid(
+                "The 'device' option has been moved to the 'debug' text_sensor component"
+            ),
+            cv.Optional(CONF_FREE): cv.invalid(
+                "The 'free' option has been moved to the 'debug' sensor component"
+            ),
+            cv.Optional(CONF_BLOCK): cv.invalid(
+                "The 'block' option has been moved to the 'debug' sensor component"
+            ),
+            cv.Optional(CONF_FRAGMENTATION): cv.invalid(
+                "The 'fragmentation' option has been moved to the 'debug' sensor component"
+            ),
+            cv.Optional(CONF_LOOP_TIME): cv.invalid(
+                "The 'loop_time' option has been moved to the 'debug' sensor component"
+            ),
+        }
+    ).extend(cv.polling_component_schema("60s")),
+    cv.only_on(["esp32", "esp8266"]),
+)
 
 
 async def to_code(config):

From f639f7c280c7c489e6c6ac197690d8c67532bdeb Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Wed, 26 Apr 2023 17:47:45 -0500
Subject: [PATCH 817/838] Add on_tag_removed trigger for RC522 (#4742)

---
 esphome/components/rc522/__init__.py | 19 +++++++++++++++++--
 esphome/components/rc522/rc522.cpp   |  7 ++++++-
 esphome/components/rc522/rc522.h     |  6 ++++--
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/esphome/components/rc522/__init__.py b/esphome/components/rc522/__init__.py
index d64cf3c085..1a1e641623 100644
--- a/esphome/components/rc522/__init__.py
+++ b/esphome/components/rc522/__init__.py
@@ -2,7 +2,12 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation, pins
 from esphome.components import i2c
-from esphome.const import CONF_ON_TAG, CONF_TRIGGER_ID, CONF_RESET_PIN
+from esphome.const import (
+    CONF_ON_TAG,
+    CONF_ON_TAG_REMOVED,
+    CONF_TRIGGER_ID,
+    CONF_RESET_PIN,
+)
 
 CODEOWNERS = ["@glmnet"]
 AUTO_LOAD = ["binary_sensor"]
@@ -24,6 +29,11 @@ RC522_SCHEMA = cv.Schema(
                 cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(RC522Trigger),
             }
         ),
+        cv.Optional(CONF_ON_TAG_REMOVED): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(RC522Trigger),
+            }
+        ),
     }
 ).extend(cv.polling_component_schema("1s"))
 
@@ -37,5 +47,10 @@ async def setup_rc522(var, config):
 
     for conf in config.get(CONF_ON_TAG, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID])
-        cg.add(var.register_trigger(trigger))
+        cg.add(var.register_ontag_trigger(trigger))
+        await automation.build_automation(trigger, [(cg.std_string, "x")], conf)
+
+    for conf in config.get(CONF_ON_TAG_REMOVED, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID])
+        cg.add(var.register_ontagremoved_trigger(trigger))
         await automation.build_automation(trigger, [(cg.std_string, "x")], conf)
diff --git a/esphome/components/rc522/rc522.cpp b/esphome/components/rc522/rc522.cpp
index 5bfeb40156..4e74020e4c 100644
--- a/esphome/components/rc522/rc522.cpp
+++ b/esphome/components/rc522/rc522.cpp
@@ -256,7 +256,7 @@ void RC522::loop() {
 
       this->current_uid_ = rfid_uid;
 
-      for (auto *trigger : this->triggers_)
+      for (auto *trigger : this->triggers_ontag_)
         trigger->process(rfid_uid);
 
       if (report) {
@@ -265,6 +265,11 @@ void RC522::loop() {
       break;
     }
     case STATE_DONE: {
+      if (!this->current_uid_.empty()) {
+        ESP_LOGV(TAG, "Tag '%s' removed", format_uid(this->current_uid_).c_str());
+        for (auto *trigger : this->triggers_ontagremoved_)
+          trigger->process(this->current_uid_);
+      }
       this->current_uid_ = {};
       state_ = STATE_INIT;
       break;
diff --git a/esphome/components/rc522/rc522.h b/esphome/components/rc522/rc522.h
index 5eea3c665e..c6c5e119f0 100644
--- a/esphome/components/rc522/rc522.h
+++ b/esphome/components/rc522/rc522.h
@@ -24,7 +24,8 @@ class RC522 : public PollingComponent {
   void loop() override;
 
   void register_tag(RC522BinarySensor *tag) { this->binary_sensors_.push_back(tag); }
-  void register_trigger(RC522Trigger *trig) { this->triggers_.push_back(trig); }
+  void register_ontag_trigger(RC522Trigger *trig) { this->triggers_ontag_.push_back(trig); }
+  void register_ontagremoved_trigger(RC522Trigger *trig) { this->triggers_ontagremoved_.push_back(trig); }
 
   void set_reset_pin(GPIOPin *reset) { this->reset_pin_ = reset; }
 
@@ -242,7 +243,8 @@ class RC522 : public PollingComponent {
   uint8_t reset_count_{0};
   uint32_t reset_timeout_{0};
   std::vector<RC522BinarySensor *> binary_sensors_;
-  std::vector<RC522Trigger *> triggers_;
+  std::vector<RC522Trigger *> triggers_ontag_;
+  std::vector<RC522Trigger *> triggers_ontagremoved_;
   std::vector<uint8_t> current_uid_;
 
   enum RC522Error {

From 64afb07e91a81bd1fe21e7c4130483cb5eed50c8 Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Thu, 27 Apr 2023 00:48:53 +0200
Subject: [PATCH 818/838] Fix 'blutooth' typo in esp32_ble component (#4738)

---
 esphome/components/esp32_ble/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/esp32_ble/__init__.py b/esphome/components/esp32_ble/__init__.py
index 3dc4af1058..7db6fff6b9 100644
--- a/esphome/components/esp32_ble/__init__.py
+++ b/esphome/components/esp32_ble/__init__.py
@@ -10,7 +10,7 @@ CONFLICTS_WITH = ["esp32_ble_beacon"]
 
 CONF_BLE_ID = "ble_id"
 
-NO_BLUTOOTH_VARIANTS = [const.VARIANT_ESP32S2]
+NO_BLUETOOTH_VARIANTS = [const.VARIANT_ESP32S2]
 
 esp32_ble_ns = cg.esphome_ns.namespace("esp32_ble")
 ESP32BLE = esp32_ble_ns.class_("ESP32BLE", cg.Component)
@@ -29,7 +29,7 @@ CONFIG_SCHEMA = cv.Schema(
 
 def validate_variant(_):
     variant = get_esp32_variant()
-    if variant in NO_BLUTOOTH_VARIANTS:
+    if variant in NO_BLUETOOTH_VARIANTS:
         raise cv.Invalid(f"{variant} does not support Bluetooth")
 
 

From e3d89cc6b61f4413dd12d215979dad5a5e37c497 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Apr 2023 10:49:40 +1200
Subject: [PATCH 819/838] Bump pylint from 2.17.2 to 2.17.3 (#4740)

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 b063dd2797..0bf5619f9b 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,4 +1,4 @@
-pylint==2.17.2
+pylint==2.17.3
 flake8==6.0.0  # also change in .pre-commit-config.yaml when updating
 black==23.3.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.3.1  # also change in .pre-commit-config.yaml when updating

From 4a08a5413dd9b99ec0990074bd2e923b94317e60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Apr 2023 11:00:34 +1200
Subject: [PATCH 820/838] Bump tornado from 6.2 to 6.3.1 (#4741)

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

diff --git a/requirements.txt b/requirements.txt
index 4ab30e414e..41fedc88cf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ voluptuous==0.13.1
 PyYAML==6.0
 paho-mqtt==1.6.1
 colorama==0.4.6
-tornado==6.2
+tornado==6.3.1
 tzlocal==4.2    # from time
 tzdata>=2021.1  # from time
 pyserial==3.5

From 77f71acbc8ae9f0eab6817c5e1d41e22a8972b8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Apr 2023 11:45:23 +1200
Subject: [PATCH 821/838] Bump pytest from 7.3.0 to 7.3.1 (#4686)

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 0bf5619f9b..b18aabe7b4 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -5,7 +5,7 @@ pyupgrade==3.3.1  # also change in .pre-commit-config.yaml when updating
 pre-commit
 
 # Unit tests
-pytest==7.3.0
+pytest==7.3.1
 pytest-cov==4.0.0
 pytest-mock==3.10.0
 pytest-asyncio==0.21.0

From 6476357596c9c71de02f22d86a896e337d0122d9 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 27 Apr 2023 12:26:06 +1200
Subject: [PATCH 822/838] Expand the platformio dep installer to also install
 platforms and tools (#4716)

---
 .github/workflows/ci-docker.yml        |  2 ++
 docker/Dockerfile                      |  2 +-
 docker/platformio_install_deps.py      | 30 ----------------
 esphome/components/esp32/__init__.py   |  8 ++---
 esphome/components/esp8266/__init__.py |  4 +--
 esphome/components/rp2040/__init__.py  |  4 +--
 platformio.ini                         | 16 ++++-----
 script/platformio_install_deps.py      | 48 ++++++++++++++++++++++++++
 script/setup                           |  2 ++
 9 files changed, 69 insertions(+), 47 deletions(-)
 delete mode 100755 docker/platformio_install_deps.py
 create mode 100755 script/platformio_install_deps.py

diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index 1d2a1b5323..eb3a5a945c 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -11,6 +11,7 @@ on:
       - ".github/workflows/**"
       - "requirements*.txt"
       - "platformio.ini"
+      - "script/platformio_install_deps.py"
 
   pull_request:
     paths:
@@ -18,6 +19,7 @@ on:
       - ".github/workflows/**"
       - "requirements*.txt"
       - "platformio.ini"
+      - "script/platformio_install_deps.py"
 
 permissions:
   contents: read
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 13fba50288..a59a470394 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -60,7 +60,7 @@ RUN \
 
 
 # First install requirements to leverage caching when requirements don't change
-COPY requirements.txt requirements_optional.txt docker/platformio_install_deps.py platformio.ini /
+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 \
     && /platformio_install_deps.py /platformio.ini
diff --git a/docker/platformio_install_deps.py b/docker/platformio_install_deps.py
deleted file mode 100755
index c7b11cf321..0000000000
--- a/docker/platformio_install_deps.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env python3
-# This script is used in the docker containers to preinstall
-# all platformio libraries in the global storage
-
-import configparser
-import subprocess
-import sys
-
-config = configparser.ConfigParser(inline_comment_prefixes=(';', ))
-config.read(sys.argv[1])
-
-libs = []
-# Extract from every lib_deps key in all sections
-for section in config.sections():
-    conf = config[section]
-    if "lib_deps" not in conf:
-        continue
-    for lib_dep in conf["lib_deps"].splitlines():
-        if not lib_dep:
-            # Empty line or comment
-            continue
-        if lib_dep.startswith("${"):
-            # Extending from another section
-            continue
-        if "@" not in lib_dep:
-            # No version pinned, this is an internal lib
-            continue
-        libs.append(lib_dep)
-
-subprocess.check_call(['platformio', 'lib', '-g', 'install', *libs])
diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index d0f74b7226..3ca140f0d4 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -252,7 +252,7 @@ def _parse_platform_version(value):
     try:
         # if platform version is a valid version constraint, prefix the default package
         cv.platformio_version_constraint(value)
-        return f"platformio/espressif32 @ {value}"
+        return f"platformio/espressif32@{value}"
     except cv.Invalid:
         return value
 
@@ -367,12 +367,12 @@ async def to_code(config):
         cg.add_build_flag("-Wno-nonnull-compare")
         cg.add_platformio_option(
             "platform_packages",
-            [f"platformio/framework-espidf @ {conf[CONF_SOURCE]}"],
+            [f"platformio/framework-espidf@{conf[CONF_SOURCE]}"],
         )
         # platformio/toolchain-esp32ulp does not support linux_aarch64 yet and has not been updated for over 2 years
         # This is espressif's own published version which is more up to date.
         cg.add_platformio_option(
-            "platform_packages", ["espressif/toolchain-esp32ulp @ 2.35.0-20220830"]
+            "platform_packages", ["espressif/toolchain-esp32ulp@2.35.0-20220830"]
         )
         add_idf_sdkconfig_option("CONFIG_PARTITION_TABLE_SINGLE_APP", False)
         add_idf_sdkconfig_option("CONFIG_PARTITION_TABLE_CUSTOM", True)
@@ -433,7 +433,7 @@ async def to_code(config):
         cg.add_build_flag("-DUSE_ESP32_FRAMEWORK_ARDUINO")
         cg.add_platformio_option(
             "platform_packages",
-            [f"platformio/framework-arduinoespressif32 @ {conf[CONF_SOURCE]}"],
+            [f"platformio/framework-arduinoespressif32@{conf[CONF_SOURCE]}"],
         )
 
         cg.add_platformio_option("board_build.partitions", "partitions.csv")
diff --git a/esphome/components/esp8266/__init__.py b/esphome/components/esp8266/__init__.py
index 59a1f2cd85..674f433d52 100644
--- a/esphome/components/esp8266/__init__.py
+++ b/esphome/components/esp8266/__init__.py
@@ -125,7 +125,7 @@ def _parse_platform_version(value):
     try:
         # if platform version is a valid version constraint, prefix the default package
         cv.platformio_version_constraint(value)
-        return f"platformio/espressif8266 @ {value}"
+        return f"platformio/espressif8266@{value}"
     except cv.Invalid:
         return value
 
@@ -181,7 +181,7 @@ async def to_code(config):
     cg.add_platformio_option("platform", conf[CONF_PLATFORM_VERSION])
     cg.add_platformio_option(
         "platform_packages",
-        [f"platformio/framework-arduinoespressif8266 @ {conf[CONF_SOURCE]}"],
+        [f"platformio/framework-arduinoespressif8266@{conf[CONF_SOURCE]}"],
     )
 
     # Default for platformio is LWIP2_LOW_MEMORY with:
diff --git a/esphome/components/rp2040/__init__.py b/esphome/components/rp2040/__init__.py
index c6fbcf8deb..3d0d6ec060 100644
--- a/esphome/components/rp2040/__init__.py
+++ b/esphome/components/rp2040/__init__.py
@@ -102,7 +102,7 @@ def _parse_platform_version(value):
     try:
         # if platform version is a valid version constraint, prefix the default package
         cv.platformio_version_constraint(value)
-        return f"platformio/raspberrypi @ {value}"
+        return f"platformio/raspberrypi@{value}"
     except cv.Invalid:
         return value
 
@@ -148,7 +148,7 @@ async def to_code(config):
     cg.add_platformio_option("platform", conf[CONF_PLATFORM_VERSION])
     cg.add_platformio_option(
         "platform_packages",
-        [f"earlephilhower/framework-arduinopico @ {conf[CONF_SOURCE]}"],
+        [f"earlephilhower/framework-arduinopico@{conf[CONF_SOURCE]}"],
     )
 
     cg.add_platformio_option("board_build.core", "earlephilhower")
diff --git a/platformio.ini b/platformio.ini
index c8db90bacb..7f301e560c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -79,9 +79,9 @@ build_flags =
 ; This are common settings for the ESP8266 using Arduino.
 [common:esp8266-arduino]
 extends = common:arduino
-platform = platformio/espressif8266 @ 3.2.0
+platform = platformio/espressif8266@3.2.0
 platform_packages =
-    platformio/framework-arduinoespressif8266 @ ~3.30002.0
+    platformio/framework-arduinoespressif8266@~3.30002.0
 
 framework = arduino
 lib_deps =
@@ -103,9 +103,9 @@ extra_scripts = post:esphome/components/esp8266/post_build.py.script
 ; This are common settings for the ESP32 (all variants) using Arduino.
 [common:esp32-arduino]
 extends = common:arduino
-platform = platformio/espressif32 @ 5.3.0
+platform = platformio/espressif32@5.3.0
 platform_packages =
-    platformio/framework-arduinoespressif32 @ ~3.20005.0
+    platformio/framework-arduinoespressif32@~3.20005.0
 
 framework = arduino
 board = nodemcu-32s
@@ -133,9 +133,9 @@ extra_scripts = post:esphome/components/esp32/post_build.py.script
 ; This are common settings for the ESP32 (all variants) using IDF.
 [common:esp32-idf]
 extends = common:idf
-platform = platformio/espressif32 @ 5.3.0
+platform = platformio/espressif32@5.3.0
 platform_packages =
-    platformio/framework-espidf @ ~3.40404.0
+    platformio/framework-espidf@~3.40404.0
 
 framework = espidf
 lib_deps =
@@ -156,8 +156,8 @@ board_build.filesystem_size = 0.5m
 
 platform = https://github.com/maxgerhardt/platform-raspberrypi.git
 platform_packages =
-    ; earlephilhower/framework-arduinopico @ ~1.20602.0 ; Cannot use the platformio package until old releases stop getting deleted
-    earlephilhower/framework-arduinopico @ https://github.com/earlephilhower/arduino-pico/releases/download/2.6.2/rp2040-2.6.2.zip
+    ; earlephilhower/framework-arduinopico@~1.20602.0 ; Cannot use the platformio package until old releases stop getting deleted
+    earlephilhower/framework-arduinopico@https://github.com/earlephilhower/arduino-pico/releases/download/2.6.2/rp2040-2.6.2.zip
 
 framework = arduino
 lib_deps =
diff --git a/script/platformio_install_deps.py b/script/platformio_install_deps.py
new file mode 100755
index 0000000000..2340410161
--- /dev/null
+++ b/script/platformio_install_deps.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+# This script is used to preinstall
+# all platformio libraries in the global storage
+
+import configparser
+import subprocess
+import sys
+
+config = configparser.ConfigParser(inline_comment_prefixes=(";",))
+config.read(sys.argv[1])
+
+libs = []
+tools = []
+platforms = []
+# Extract from every lib_deps key in all sections
+for section in config.sections():
+    conf = config[section]
+    if "lib_deps" in conf:
+        for lib_dep in conf["lib_deps"].splitlines():
+            if not lib_dep:
+                # Empty line or comment
+                continue
+            if lib_dep.startswith("${"):
+                # Extending from another section
+                continue
+            if "@" not in lib_dep:
+                # No version pinned, this is an internal lib
+                continue
+            libs.append("-l")
+            libs.append(lib_dep)
+    if "platform" in conf:
+        platforms.append("-p")
+        platforms.append(conf["platform"])
+    if "platform_packages" in conf:
+        for tool in conf["platform_packages"].splitlines():
+            if not tool:
+                # Empty line or comment
+                continue
+            if tool.startswith("${"):
+                # Extending from another section
+                continue
+            if tool.find("https://github.com") != -1:
+                split = tool.find("@")
+                tool = tool[split + 1 :]
+            tools.append("-t")
+            tools.append(tool)
+
+subprocess.check_call(["platformio", "pkg", "install", "-g", *libs, *platforms, *tools])
diff --git a/script/setup b/script/setup
index c650960f05..5acd1a9f13 100755
--- a/script/setup
+++ b/script/setup
@@ -14,3 +14,5 @@ pip3 install -r requirements.txt -r requirements_optional.txt -r requirements_te
 pip3 install --no-use-pep517 -e .
 
 pre-commit install
+
+script/platformio_install_deps.py platformio.ini

From c5efaa1c000284829a6d9d84e03a4e3db3c4e3cc Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 27 Apr 2023 13:11:32 +1200
Subject: [PATCH 823/838] Remove climate legacy away flags (#4744)

---
 esphome/components/api/api.proto            |  8 ++---
 esphome/components/api/api_connection.cpp   |  3 --
 esphome/components/api/api_pb2.cpp          | 24 +++++++-------
 esphome/components/api/api_pb2.h            |  6 ++--
 esphome/components/climate/__init__.py      |  5 +--
 esphome/components/climate/climate.cpp      | 14 ---------
 esphome/components/climate/climate.h        | 14 ---------
 esphome/components/climate/climate_traits.h |  9 ------
 esphome/components/mqtt/mqtt_climate.cpp    | 35 +--------------------
 9 files changed, 20 insertions(+), 98 deletions(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 1fafc56e59..4cc98c91d9 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -862,8 +862,7 @@ message ClimateStateResponse {
   float target_temperature = 4;
   float target_temperature_low = 5;
   float target_temperature_high = 6;
-  // For older peers, equal to preset == CLIMATE_PRESET_AWAY
-  bool legacy_away = 7;
+  bool unused_legacy_away = 7;
   ClimateAction action = 8;
   ClimateFanMode fan_mode = 9;
   ClimateSwingMode swing_mode = 10;
@@ -886,9 +885,8 @@ message ClimateCommandRequest {
   float target_temperature_low = 7;
   bool has_target_temperature_high = 8;
   float target_temperature_high = 9;
-  // legacy, for older peers, newer ones should use CLIMATE_PRESET_AWAY in preset
-  bool has_legacy_away = 10;
-  bool legacy_away = 11;
+  bool unused_has_legacy_away = 10;
+  bool unused_legacy_away = 11;
   bool has_fan_mode = 12;
   ClimateFanMode fan_mode = 13;
   bool has_swing_mode = 14;
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index ff8f97b34b..a79444a7e9 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -530,7 +530,6 @@ bool APIConnection::send_climate_state(climate::Climate *climate) {
     resp.custom_fan_mode = climate->custom_fan_mode.value();
   if (traits.get_supports_presets() && climate->preset.has_value()) {
     resp.preset = static_cast<enums::ClimatePreset>(climate->preset.value());
-    resp.legacy_away = resp.preset == enums::CLIMATE_PRESET_AWAY;
   }
   if (!traits.get_supported_custom_presets().empty() && climate->custom_preset.has_value())
     resp.custom_preset = climate->custom_preset.value();
@@ -591,8 +590,6 @@ void APIConnection::climate_command(const ClimateCommandRequest &msg) {
     call.set_target_temperature_low(msg.target_temperature_low);
   if (msg.has_target_temperature_high)
     call.set_target_temperature_high(msg.target_temperature_high);
-  if (msg.has_legacy_away)
-    call.set_preset(msg.legacy_away ? climate::CLIMATE_PRESET_AWAY : climate::CLIMATE_PRESET_HOME);
   if (msg.has_fan_mode)
     call.set_fan_mode(static_cast<climate::ClimateFanMode>(msg.fan_mode));
   if (msg.has_custom_fan_mode)
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 82301456f7..1dd8c82e00 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -3658,7 +3658,7 @@ bool ClimateStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
       return true;
     }
     case 7: {
-      this->legacy_away = value.as_bool();
+      this->unused_legacy_away = value.as_bool();
       return true;
     }
     case 8: {
@@ -3728,7 +3728,7 @@ void ClimateStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_float(4, this->target_temperature);
   buffer.encode_float(5, this->target_temperature_low);
   buffer.encode_float(6, this->target_temperature_high);
-  buffer.encode_bool(7, this->legacy_away);
+  buffer.encode_bool(7, this->unused_legacy_away);
   buffer.encode_enum<enums::ClimateAction>(8, this->action);
   buffer.encode_enum<enums::ClimateFanMode>(9, this->fan_mode);
   buffer.encode_enum<enums::ClimateSwingMode>(10, this->swing_mode);
@@ -3769,8 +3769,8 @@ void ClimateStateResponse::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
-  out.append("  legacy_away: ");
-  out.append(YESNO(this->legacy_away));
+  out.append("  unused_legacy_away: ");
+  out.append(YESNO(this->unused_legacy_away));
   out.append("\n");
 
   out.append("  action: ");
@@ -3822,11 +3822,11 @@ bool ClimateCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value)
       return true;
     }
     case 10: {
-      this->has_legacy_away = value.as_bool();
+      this->unused_has_legacy_away = value.as_bool();
       return true;
     }
     case 11: {
-      this->legacy_away = value.as_bool();
+      this->unused_legacy_away = value.as_bool();
       return true;
     }
     case 12: {
@@ -3911,8 +3911,8 @@ void ClimateCommandRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_float(7, this->target_temperature_low);
   buffer.encode_bool(8, this->has_target_temperature_high);
   buffer.encode_float(9, this->target_temperature_high);
-  buffer.encode_bool(10, this->has_legacy_away);
-  buffer.encode_bool(11, this->legacy_away);
+  buffer.encode_bool(10, this->unused_has_legacy_away);
+  buffer.encode_bool(11, this->unused_legacy_away);
   buffer.encode_bool(12, this->has_fan_mode);
   buffer.encode_enum<enums::ClimateFanMode>(13, this->fan_mode);
   buffer.encode_bool(14, this->has_swing_mode);
@@ -3968,12 +3968,12 @@ void ClimateCommandRequest::dump_to(std::string &out) const {
   out.append(buffer);
   out.append("\n");
 
-  out.append("  has_legacy_away: ");
-  out.append(YESNO(this->has_legacy_away));
+  out.append("  unused_has_legacy_away: ");
+  out.append(YESNO(this->unused_has_legacy_away));
   out.append("\n");
 
-  out.append("  legacy_away: ");
-  out.append(YESNO(this->legacy_away));
+  out.append("  unused_legacy_away: ");
+  out.append(YESNO(this->unused_legacy_away));
   out.append("\n");
 
   out.append("  has_fan_mode: ");
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index b386cfb4fd..0f4b79de19 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -959,7 +959,7 @@ class ClimateStateResponse : public ProtoMessage {
   float target_temperature{0.0f};
   float target_temperature_low{0.0f};
   float target_temperature_high{0.0f};
-  bool legacy_away{false};
+  bool unused_legacy_away{false};
   enums::ClimateAction action{};
   enums::ClimateFanMode fan_mode{};
   enums::ClimateSwingMode swing_mode{};
@@ -987,8 +987,8 @@ class ClimateCommandRequest : public ProtoMessage {
   float target_temperature_low{0.0f};
   bool has_target_temperature_high{false};
   float target_temperature_high{0.0f};
-  bool has_legacy_away{false};
-  bool legacy_away{false};
+  bool unused_has_legacy_away{false};
+  bool unused_legacy_away{false};
   bool has_fan_mode{false};
   enums::ClimateFanMode fan_mode{};
   bool has_swing_mode{false};
diff --git a/esphome/components/climate/__init__.py b/esphome/components/climate/__init__.py
index 6734917bf3..bf167fe837 100644
--- a/esphome/components/climate/__init__.py
+++ b/esphome/components/climate/__init__.py
@@ -343,7 +343,7 @@ CLIMATE_CONTROL_ACTION_SCHEMA = cv.Schema(
         cv.Optional(CONF_TARGET_TEMPERATURE): cv.templatable(cv.temperature),
         cv.Optional(CONF_TARGET_TEMPERATURE_LOW): cv.templatable(cv.temperature),
         cv.Optional(CONF_TARGET_TEMPERATURE_HIGH): cv.templatable(cv.temperature),
-        cv.Optional(CONF_AWAY): cv.templatable(cv.boolean),
+        cv.Optional(CONF_AWAY): cv.invalid("Use preset instead"),
         cv.Exclusive(CONF_FAN_MODE, "fan_mode"): cv.templatable(
             validate_climate_fan_mode
         ),
@@ -379,9 +379,6 @@ async def climate_control_to_code(config, action_id, template_arg, args):
             config[CONF_TARGET_TEMPERATURE_HIGH], args, float
         )
         cg.add(var.set_target_temperature_high(template_))
-    if CONF_AWAY in config:
-        template_ = await cg.templatable(config[CONF_AWAY], args, bool)
-        cg.add(var.set_away(template_))
     if CONF_FAN_MODE in config:
         template_ = await cg.templatable(config[CONF_FAN_MODE], args, ClimateFanMode)
         cg.add(var.set_fan_mode(template_))
diff --git a/esphome/components/climate/climate.cpp b/esphome/components/climate/climate.cpp
index b4d5ee9685..a032596eb3 100644
--- a/esphome/components/climate/climate.cpp
+++ b/esphome/components/climate/climate.cpp
@@ -264,25 +264,11 @@ const optional<ClimateMode> &ClimateCall::get_mode() const { return this->mode_;
 const optional<float> &ClimateCall::get_target_temperature() const { return this->target_temperature_; }
 const optional<float> &ClimateCall::get_target_temperature_low() const { return this->target_temperature_low_; }
 const optional<float> &ClimateCall::get_target_temperature_high() const { return this->target_temperature_high_; }
-optional<bool> ClimateCall::get_away() const {
-  if (!this->preset_.has_value())
-    return {};
-  return *this->preset_ == ClimatePreset::CLIMATE_PRESET_AWAY;
-}
 const optional<ClimateFanMode> &ClimateCall::get_fan_mode() const { return this->fan_mode_; }
 const optional<std::string> &ClimateCall::get_custom_fan_mode() const { return this->custom_fan_mode_; }
 const optional<ClimatePreset> &ClimateCall::get_preset() const { return this->preset_; }
 const optional<std::string> &ClimateCall::get_custom_preset() const { return this->custom_preset_; }
 const optional<ClimateSwingMode> &ClimateCall::get_swing_mode() const { return this->swing_mode_; }
-ClimateCall &ClimateCall::set_away(bool away) {
-  this->preset_ = away ? CLIMATE_PRESET_AWAY : CLIMATE_PRESET_HOME;
-  return *this;
-}
-ClimateCall &ClimateCall::set_away(optional<bool> away) {
-  if (away.has_value())
-    this->preset_ = *away ? CLIMATE_PRESET_AWAY : CLIMATE_PRESET_HOME;
-  return *this;
-}
 ClimateCall &ClimateCall::set_target_temperature_high(optional<float> target_temperature_high) {
   this->target_temperature_high_ = target_temperature_high;
   return *this;
diff --git a/esphome/components/climate/climate.h b/esphome/components/climate/climate.h
index 43bd71657d..656e1c4852 100644
--- a/esphome/components/climate/climate.h
+++ b/esphome/components/climate/climate.h
@@ -64,10 +64,6 @@ class ClimateCall {
    * For climate devices with two point target temperature control
    */
   ClimateCall &set_target_temperature_high(optional<float> target_temperature_high);
-  ESPDEPRECATED("set_away() is deprecated, please use .set_preset(CLIMATE_PRESET_AWAY) instead", "v1.20")
-  ClimateCall &set_away(bool away);
-  ESPDEPRECATED("set_away() is deprecated, please use .set_preset(CLIMATE_PRESET_AWAY) instead", "v1.20")
-  ClimateCall &set_away(optional<bool> away);
   /// Set the fan mode of the climate device.
   ClimateCall &set_fan_mode(ClimateFanMode fan_mode);
   /// Set the fan mode of the climate device.
@@ -97,8 +93,6 @@ class ClimateCall {
   const optional<float> &get_target_temperature() const;
   const optional<float> &get_target_temperature_low() const;
   const optional<float> &get_target_temperature_high() const;
-  ESPDEPRECATED("get_away() is deprecated, please use .get_preset() instead", "v1.20")
-  optional<bool> get_away() const;
   const optional<ClimateFanMode> &get_fan_mode() const;
   const optional<ClimateSwingMode> &get_swing_mode() const;
   const optional<std::string> &get_custom_fan_mode() const;
@@ -184,14 +178,6 @@ class Climate : public EntityBase {
     };
   };
 
-  /** Whether the climate device is in away mode.
-   *
-   * Away allows climate devices to have two different target temperature configs:
-   * one for normal mode and one for away mode.
-   */
-  ESPDEPRECATED("away is deprecated, use preset instead", "v1.20")
-  bool away{false};
-
   /// The active fan mode of the climate device.
   optional<ClimateFanMode> fan_mode;
 
diff --git a/esphome/components/climate/climate_traits.h b/esphome/components/climate/climate_traits.h
index ffbd8c5ae0..e8c2db6c06 100644
--- a/esphome/components/climate/climate_traits.h
+++ b/esphome/components/climate/climate_traits.h
@@ -117,15 +117,6 @@ class ClimateTraits {
   bool supports_custom_preset(const std::string &custom_preset) const {
     return supported_custom_presets_.count(custom_preset);
   }
-  ESPDEPRECATED("This method is deprecated, use set_supported_presets() instead", "v1.20")
-  void set_supports_away(bool supports) {
-    if (supports) {
-      supported_presets_.insert(CLIMATE_PRESET_AWAY);
-      supported_presets_.insert(CLIMATE_PRESET_HOME);
-    }
-  }
-  ESPDEPRECATED("This method is deprecated, use supports_preset() instead", "v1.20")
-  bool get_supports_away() const { return supports_preset(CLIMATE_PRESET_AWAY); }
 
   void set_supported_swing_modes(std::set<ClimateSwingMode> modes) { supported_swing_modes_ = std::move(modes); }
   void add_supported_swing_mode(ClimateSwingMode mode) { supported_swing_modes_.insert(mode); }
diff --git a/esphome/components/mqtt/mqtt_climate.cpp b/esphome/components/mqtt/mqtt_climate.cpp
index e88ffcc37c..d63885fa04 100644
--- a/esphome/components/mqtt/mqtt_climate.cpp
+++ b/esphome/components/mqtt/mqtt_climate.cpp
@@ -75,13 +75,8 @@ void MQTTClimateComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryCo
     JsonArray presets = root.createNestedArray("preset_modes");
     if (traits.supports_preset(CLIMATE_PRESET_HOME))
       presets.add("home");
-    if (traits.supports_preset(CLIMATE_PRESET_AWAY)) {
-      // away_mode_command_topic
-      root[MQTT_AWAY_MODE_COMMAND_TOPIC] = this->get_away_command_topic();
-      // away_mode_state_topic
-      root[MQTT_AWAY_MODE_STATE_TOPIC] = this->get_away_state_topic();
+    if (traits.supports_preset(CLIMATE_PRESET_AWAY))
       presets.add("away");
-    }
     if (traits.supports_preset(CLIMATE_PRESET_BOOST))
       presets.add("boost");
     if (traits.supports_preset(CLIMATE_PRESET_COMFORT))
@@ -197,29 +192,6 @@ void MQTTClimateComponent::setup() {
                     });
   }
 
-  if (traits.supports_preset(CLIMATE_PRESET_AWAY)) {
-    this->subscribe(this->get_away_command_topic(), [this](const std::string &topic, const std::string &payload) {
-      auto onoff = parse_on_off(payload.c_str());
-      auto call = this->device_->make_call();
-      switch (onoff) {
-        case PARSE_ON:
-          call.set_preset(CLIMATE_PRESET_AWAY);
-          break;
-        case PARSE_OFF:
-          call.set_preset(CLIMATE_PRESET_HOME);
-          break;
-        case PARSE_TOGGLE:
-          call.set_preset(this->device_->preset == CLIMATE_PRESET_AWAY ? CLIMATE_PRESET_HOME : CLIMATE_PRESET_AWAY);
-          break;
-        case PARSE_NONE:
-        default:
-          ESP_LOGW(TAG, "Unknown payload '%s'", payload.c_str());
-          return;
-      }
-      call.perform();
-    });
-  }
-
   if (traits.get_supports_presets() || !traits.get_supported_custom_presets().empty()) {
     this->subscribe(this->get_preset_command_topic(), [this](const std::string &topic, const std::string &payload) {
       auto call = this->device_->make_call();
@@ -301,11 +273,6 @@ bool MQTTClimateComponent::publish_state_() {
       success = false;
   }
 
-  if (traits.supports_preset(CLIMATE_PRESET_AWAY)) {
-    std::string payload = ONOFF(this->device_->preset == CLIMATE_PRESET_AWAY);
-    if (!this->publish(this->get_away_state_topic(), payload))
-      success = false;
-  }
   if (traits.get_supports_presets() || !traits.get_supported_custom_presets().empty()) {
     std::string payload;
     if (this->device_->preset.has_value()) {

From ee21a9131355c99cd7b3b7002e3714e48adf4ea6 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 27 Apr 2023 13:17:09 +1200
Subject: [PATCH 824/838] Add mlx90614 sensors (#3749)

Co-authored-by: Greg Arnold <greg@arnoldassociates.com>
Co-authored-by: notsonominal <130870838+notsonominal@users.noreply.github.com>
---
 CODEOWNERS                               |   1 +
 esphome/components/mlx90614/__init__.py  |   0
 esphome/components/mlx90614/mlx90614.cpp | 122 +++++++++++++++++++++++
 esphome/components/mlx90614/mlx90614.h   |  34 +++++++
 esphome/components/mlx90614/sensor.py    |  63 ++++++++++++
 tests/test1.yaml                         |   7 ++
 6 files changed, 227 insertions(+)
 create mode 100644 esphome/components/mlx90614/__init__.py
 create mode 100644 esphome/components/mlx90614/mlx90614.cpp
 create mode 100644 esphome/components/mlx90614/mlx90614.h
 create mode 100644 esphome/components/mlx90614/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index 8e606d253a..32bf2c2d2c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -162,6 +162,7 @@ esphome/components/midea/* @dudanov
 esphome/components/midea_ir/* @dudanov
 esphome/components/mitsubishi/* @RubyBailey
 esphome/components/mlx90393/* @functionpointer
+esphome/components/mlx90614/* @jesserockz
 esphome/components/mmc5603/* @benhoff
 esphome/components/modbus_controller/* @martgras
 esphome/components/modbus_controller/binary_sensor/* @martgras
diff --git a/esphome/components/mlx90614/__init__.py b/esphome/components/mlx90614/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/mlx90614/mlx90614.cpp b/esphome/components/mlx90614/mlx90614.cpp
new file mode 100644
index 0000000000..f681f3cc7e
--- /dev/null
+++ b/esphome/components/mlx90614/mlx90614.cpp
@@ -0,0 +1,122 @@
+#include "mlx90614.h"
+
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace mlx90614 {
+
+static const uint8_t MLX90614_RAW_IR_1 = 0x04;
+static const uint8_t MLX90614_RAW_IR_2 = 0x05;
+static const uint8_t MLX90614_TEMPERATURE_AMBIENT = 0x06;
+static const uint8_t MLX90614_TEMPERATURE_OBJECT_1 = 0x07;
+static const uint8_t MLX90614_TEMPERATURE_OBJECT_2 = 0x08;
+
+static const uint8_t MLX90614_TOMAX = 0x20;
+static const uint8_t MLX90614_TOMIN = 0x21;
+static const uint8_t MLX90614_PWMCTRL = 0x22;
+static const uint8_t MLX90614_TARANGE = 0x23;
+static const uint8_t MLX90614_EMISSIVITY = 0x24;
+static const uint8_t MLX90614_CONFIG = 0x25;
+static const uint8_t MLX90614_ADDR = 0x2E;
+static const uint8_t MLX90614_ID1 = 0x3C;
+static const uint8_t MLX90614_ID2 = 0x3D;
+static const uint8_t MLX90614_ID3 = 0x3E;
+static const uint8_t MLX90614_ID4 = 0x3F;
+
+static const char *const TAG = "mlx90614";
+
+void MLX90614Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up MLX90614...");
+  if (!this->write_emissivity_()) {
+    ESP_LOGE(TAG, "Communication with MLX90614 failed!");
+    this->mark_failed();
+    return;
+  }
+}
+
+bool MLX90614Component::write_emissivity_() {
+  if (std::isnan(this->emissivity_))
+    return true;
+  uint16_t value = (uint16_t) (this->emissivity_ * 65535);
+  if (!this->write_bytes_(MLX90614_EMISSIVITY, 0)) {
+    return false;
+  }
+  delay(10);
+  if (!this->write_bytes_(MLX90614_EMISSIVITY, value)) {
+    return false;
+  }
+  delay(10);
+  return true;
+}
+
+uint8_t MLX90614Component::crc8_pec_(const uint8_t *data, uint8_t len) {
+  uint8_t crc = 0;
+  for (uint8_t i = 0; i < len; i++) {
+    uint8_t in = data[i];
+    for (uint8_t j = 0; j < 8; j++) {
+      bool carry = (crc ^ in) & 0x80;
+      crc <<= 1;
+      if (carry)
+        crc ^= 0x07;
+      in <<= 1;
+    }
+  }
+  return crc;
+}
+
+bool MLX90614Component::write_bytes_(uint8_t reg, uint16_t data) {
+  uint8_t buf[5];
+  buf[0] = this->address_ << 1;
+  buf[1] = reg;
+  buf[2] = data & 0xFF;
+  buf[3] = data >> 8;
+  buf[4] = this->crc8_pec_(buf, 4);
+  return this->write_bytes(reg, buf + 2, 3);
+}
+
+void MLX90614Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "MLX90614:");
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication with MLX90614 failed!");
+  }
+  LOG_UPDATE_INTERVAL(this);
+  LOG_SENSOR("  ", "Ambient", this->ambient_sensor_);
+  LOG_SENSOR("  ", "Object", this->object_sensor_);
+}
+
+float MLX90614Component::get_setup_priority() const { return setup_priority::DATA; }
+
+void MLX90614Component::update() {
+  uint8_t emissivity[3];
+  if (this->read_register(MLX90614_EMISSIVITY, emissivity, 3, false) != i2c::ERROR_OK) {
+    this->status_set_warning();
+    return;
+  }
+  uint8_t raw_object[3];
+  if (this->read_register(MLX90614_TEMPERATURE_OBJECT_1, raw_object, 3, false) != i2c::ERROR_OK) {
+    this->status_set_warning();
+    return;
+  }
+
+  uint8_t raw_ambient[3];
+  if (this->read_register(MLX90614_TEMPERATURE_AMBIENT, raw_ambient, 3, false) != i2c::ERROR_OK) {
+    this->status_set_warning();
+    return;
+  }
+
+  float ambient = raw_ambient[1] & 0x80 ? NAN : encode_uint16(raw_ambient[1], raw_ambient[0]) * 0.02f - 273.15f;
+  float object = raw_object[1] & 0x80 ? NAN : encode_uint16(raw_object[1], raw_object[0]) * 0.02f - 273.15f;
+
+  ESP_LOGD(TAG, "Got Temperature=%.1f°C Ambient=%.1f°C", object, ambient);
+
+  if (this->ambient_sensor_ != nullptr && !std::isnan(ambient))
+    this->ambient_sensor_->publish_state(ambient);
+  if (this->object_sensor_ != nullptr && !std::isnan(object))
+    this->object_sensor_->publish_state(object);
+  this->status_clear_warning();
+}
+
+}  // namespace mlx90614
+}  // namespace esphome
diff --git a/esphome/components/mlx90614/mlx90614.h b/esphome/components/mlx90614/mlx90614.h
new file mode 100644
index 0000000000..b6bd44172d
--- /dev/null
+++ b/esphome/components/mlx90614/mlx90614.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "esphome/components/i2c/i2c.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/core/component.h"
+
+namespace esphome {
+namespace mlx90614 {
+
+class MLX90614Component : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void setup() override;
+  void dump_config() override;
+  void update() override;
+  float get_setup_priority() const override;
+
+  void set_ambient_sensor(sensor::Sensor *ambient_sensor) { ambient_sensor_ = ambient_sensor; }
+  void set_object_sensor(sensor::Sensor *object_sensor) { object_sensor_ = object_sensor; }
+
+  void set_emissivity(float emissivity) { emissivity_ = emissivity; }
+
+ protected:
+  bool write_emissivity_();
+
+  uint8_t crc8_pec_(const uint8_t *data, uint8_t len);
+  bool write_bytes_(uint8_t reg, uint16_t data);
+
+  sensor::Sensor *ambient_sensor_{nullptr};
+  sensor::Sensor *object_sensor_{nullptr};
+
+  float emissivity_{NAN};
+};
+}  // namespace mlx90614
+}  // namespace esphome
diff --git a/esphome/components/mlx90614/sensor.py b/esphome/components/mlx90614/sensor.py
new file mode 100644
index 0000000000..3e90d19e45
--- /dev/null
+++ b/esphome/components/mlx90614/sensor.py
@@ -0,0 +1,63 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import (
+    CONF_ID,
+    DEVICE_CLASS_TEMPERATURE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_CELSIUS,
+)
+
+CODEOWNERS = ["@jesserockz"]
+DEPENDENCIES = ["i2c"]
+
+CONF_AMBIENT = "ambient"
+CONF_EMISSIVITY = "emissivity"
+CONF_OBJECT = "object"
+
+mlx90614_ns = cg.esphome_ns.namespace("mlx90614")
+MLX90614Component = mlx90614_ns.class_(
+    "MLX90614Component", cg.PollingComponent, i2c.I2CDevice
+)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(MLX90614Component),
+            cv.Optional(CONF_AMBIENT): sensor.sensor_schema(
+                unit_of_measurement=UNIT_CELSIUS,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_TEMPERATURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_OBJECT): sensor.sensor_schema(
+                unit_of_measurement=UNIT_CELSIUS,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_TEMPERATURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ).extend(
+                {
+                    cv.Optional(CONF_EMISSIVITY, default=1.0): cv.percentage,
+                }
+            ),
+        }
+    )
+    .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)
+    await i2c.register_i2c_device(var, config)
+
+    if CONF_AMBIENT in config:
+        sens = await sensor.new_sensor(config[CONF_AMBIENT])
+        cg.add(var.set_ambient_sensor(sens))
+
+    if CONF_OBJECT in config:
+        sens = await sensor.new_sensor(config[CONF_OBJECT])
+        cg.add(var.set_object_sensor(sens))
+
+        cg.add(var.set_emissivity(config[CONF_OBJECT][CONF_EMISSIVITY]))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index c2a2ed5c95..a235ff1502 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1239,6 +1239,13 @@ sensor:
     temperature:
       name: Max9611 Temp
     update_interval: 1s
+  - platform: mlx90614
+    i2c_id: i2c_bus
+    ambient:
+      name: Ambient
+    object:
+      name: Object
+      emissivity: 1.0
   - platform: mpl3115a2
     i2c_id: i2c_bus
     temperature:

From 6f27126c8d9056bdcb53fda7186633fbb4dae2c4 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 27 Apr 2023 13:24:42 +1200
Subject: [PATCH 825/838] Move am43 sensor code and remove auto load on cover
 (#4631)

---
 CODEOWNERS                                            |  1 +
 esphome/components/am43/__init__.py                   |  1 +
 esphome/components/am43/cover/__init__.py             | 10 +++++-----
 .../components/am43/{sensor.py => sensor/__init__.py} | 11 ++++++-----
 .../am43/{am43.cpp => sensor/am43_sensor.cpp}         |  4 ++--
 .../components/am43/{am43.h => sensor/am43_sensor.h}  |  0
 6 files changed, 15 insertions(+), 12 deletions(-)
 rename esphome/components/am43/{sensor.py => sensor/__init__.py} (83%)
 rename esphome/components/am43/{am43.cpp => sensor/am43_sensor.cpp} (99%)
 rename esphome/components/am43/{am43.h => sensor/am43_sensor.h} (100%)

diff --git a/CODEOWNERS b/CODEOWNERS
index 32bf2c2d2c..82aa071dc4 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -21,6 +21,7 @@ esphome/components/airthings_wave_mini/* @ncareau
 esphome/components/airthings_wave_plus/* @jeromelaban
 esphome/components/am43/* @buxtronix
 esphome/components/am43/cover/* @buxtronix
+esphome/components/am43/sensor/* @buxtronix
 esphome/components/analog_threshold/* @ianchi
 esphome/components/animation/* @syndlex
 esphome/components/anova/* @buxtronix
diff --git a/esphome/components/am43/__init__.py b/esphome/components/am43/__init__.py
index e69de29bb2..f21a15ce0a 100644
--- a/esphome/components/am43/__init__.py
+++ b/esphome/components/am43/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@buxtronix"]
diff --git a/esphome/components/am43/cover/__init__.py b/esphome/components/am43/cover/__init__.py
index 79eeb2eef3..103ac809e6 100644
--- a/esphome/components/am43/cover/__init__.py
+++ b/esphome/components/am43/cover/__init__.py
@@ -5,7 +5,7 @@ from esphome.const import CONF_ID, CONF_PIN
 
 CODEOWNERS = ["@buxtronix"]
 DEPENDENCIES = ["ble_client"]
-AUTO_LOAD = ["am43", "sensor"]
+AUTO_LOAD = ["am43"]
 
 CONF_INVERT_POSITION = "invert_position"
 
@@ -27,10 +27,10 @@ CONFIG_SCHEMA = (
 )
 
 
-def to_code(config):
+async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_pin(config[CONF_PIN]))
     cg.add(var.set_invert_position(config[CONF_INVERT_POSITION]))
-    yield cg.register_component(var, config)
-    yield cover.register_cover(var, config)
-    yield ble_client.register_ble_node(var, config)
+    await cg.register_component(var, config)
+    await cover.register_cover(var, config)
+    await ble_client.register_ble_node(var, config)
diff --git a/esphome/components/am43/sensor.py b/esphome/components/am43/sensor/__init__.py
similarity index 83%
rename from esphome/components/am43/sensor.py
rename to esphome/components/am43/sensor/__init__.py
index 68c85d0e9c..01588f2299 100644
--- a/esphome/components/am43/sensor.py
+++ b/esphome/components/am43/sensor/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_PERCENT,
 )
 
+AUTO_LOAD = ["am43"]
 CODEOWNERS = ["@buxtronix"]
 
 am43_ns = cg.esphome_ns.namespace("am43")
@@ -38,15 +39,15 @@ CONFIG_SCHEMA = (
 )
 
 
-def to_code(config):
+async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
-    yield cg.register_component(var, config)
-    yield ble_client.register_ble_node(var, config)
+    await cg.register_component(var, config)
+    await ble_client.register_ble_node(var, config)
 
     if CONF_BATTERY_LEVEL in config:
-        sens = yield sensor.new_sensor(config[CONF_BATTERY_LEVEL])
+        sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
         cg.add(var.set_battery(sens))
 
     if CONF_ILLUMINANCE in config:
-        sens = yield sensor.new_sensor(config[CONF_ILLUMINANCE])
+        sens = await sensor.new_sensor(config[CONF_ILLUMINANCE])
         cg.add(var.set_illuminance(sens))
diff --git a/esphome/components/am43/am43.cpp b/esphome/components/am43/sensor/am43_sensor.cpp
similarity index 99%
rename from esphome/components/am43/am43.cpp
rename to esphome/components/am43/sensor/am43_sensor.cpp
index 09723496d9..008c7768ed 100644
--- a/esphome/components/am43/am43.cpp
+++ b/esphome/components/am43/sensor/am43_sensor.cpp
@@ -1,6 +1,6 @@
-#include "am43.h"
-#include "esphome/core/log.h"
+#include "am43_sensor.h"
 #include "esphome/core/hal.h"
+#include "esphome/core/log.h"
 
 #ifdef USE_ESP32
 
diff --git a/esphome/components/am43/am43.h b/esphome/components/am43/sensor/am43_sensor.h
similarity index 100%
rename from esphome/components/am43/am43.h
rename to esphome/components/am43/sensor/am43_sensor.h

From 55ec082628c04abcadfef63f0f12ab70fd6f829f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 27 Apr 2023 16:22:12 +1200
Subject: [PATCH 826/838] Only request VA port from first client that is
 subscribed (#4747)

---
 esphome/components/api/api_server.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index 97a7d6fbf6..068f74315c 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -429,15 +429,16 @@ void APIServer::on_shutdown() {
 
 #ifdef USE_VOICE_ASSISTANT
 bool APIServer::start_voice_assistant() {
-  bool result = false;
   for (auto &c : this->clients_) {
-    result |= c->request_voice_assistant(true);
+    if (c->request_voice_assistant(true))
+      return true;
   }
-  return result;
+  return false;
 }
 void APIServer::stop_voice_assistant() {
   for (auto &c : this->clients_) {
-    c->request_voice_assistant(false);
+    if (c->request_voice_assistant(false))
+      return;
   }
 }
 #endif

From 70aa38f5bd9494357978479d2ac03e364df3ce32 Mon Sep 17 00:00:00 2001
From: itpeters <59966384+itpeters@users.noreply.github.com>
Date: Wed, 26 Apr 2023 22:34:20 -0600
Subject: [PATCH 827/838] Don't allow fingerprint_grow enroll cancellation when
 no enrollment started (#4745)

---
 esphome/components/fingerprint_grow/fingerprint_grow.cpp | 6 ++++--
 esphome/components/fingerprint_grow/fingerprint_grow.h   | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/esphome/components/fingerprint_grow/fingerprint_grow.cpp b/esphome/components/fingerprint_grow/fingerprint_grow.cpp
index d27b0ca4cd..4043f32dcb 100644
--- a/esphome/components/fingerprint_grow/fingerprint_grow.cpp
+++ b/esphome/components/fingerprint_grow/fingerprint_grow.cpp
@@ -77,10 +77,12 @@ void FingerprintGrowComponent::finish_enrollment(uint8_t result) {
     this->enrollment_done_callback_.call(this->enrollment_slot_);
     this->get_fingerprint_count_();
   } else {
-    this->enrollment_failed_callback_.call(this->enrollment_slot_);
+    if (this->enrollment_slot_ != ENROLLMENT_SLOT_UNUSED) {
+      this->enrollment_failed_callback_.call(this->enrollment_slot_);
+    }
   }
   this->enrollment_image_ = 0;
-  this->enrollment_slot_ = 0;
+  this->enrollment_slot_ = ENROLLMENT_SLOT_UNUSED;
   if (this->enrolling_binary_sensor_ != nullptr) {
     this->enrolling_binary_sensor_->publish_state(false);
   }
diff --git a/esphome/components/fingerprint_grow/fingerprint_grow.h b/esphome/components/fingerprint_grow/fingerprint_grow.h
index fd316237f7..f414146e64 100644
--- a/esphome/components/fingerprint_grow/fingerprint_grow.h
+++ b/esphome/components/fingerprint_grow/fingerprint_grow.h
@@ -13,6 +13,8 @@ namespace fingerprint_grow {
 
 static const uint16_t START_CODE = 0xEF01;
 
+static const uint16_t ENROLLMENT_SLOT_UNUSED = 0xFFFF;
+
 enum GrowPacketType {
   COMMAND = 0x01,
   DATA = 0x02,
@@ -158,7 +160,7 @@ class FingerprintGrowComponent : public PollingComponent, public uart::UARTDevic
   uint32_t new_password_ = -1;
   GPIOPin *sensing_pin_{nullptr};
   uint8_t enrollment_image_ = 0;
-  uint16_t enrollment_slot_ = 0;
+  uint16_t enrollment_slot_ = ENROLLMENT_SLOT_UNUSED;
   uint8_t enrollment_buffers_ = 5;
   bool waiting_removal_ = false;
   uint32_t last_aura_led_control_ = 0;

From e14ce3d95013731c4f013d46c15e2e6311c21d25 Mon Sep 17 00:00:00 2001
From: gcopeland <greg@copelandconsulting.net>
Date: Wed, 26 Apr 2023 15:00:37 -0500
Subject: [PATCH 828/838] I2c scan recovery reset fix (#4724)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/i2c/i2c_bus_arduino.cpp | 11 ++++++++---
 esphome/components/i2c/i2c_bus_esp_idf.cpp | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/esphome/components/i2c/i2c_bus_arduino.cpp b/esphome/components/i2c/i2c_bus_arduino.cpp
index e08622a3ae..d80ab1fd1d 100644
--- a/esphome/components/i2c/i2c_bus_arduino.cpp
+++ b/esphome/components/i2c/i2c_bus_arduino.cpp
@@ -3,6 +3,7 @@
 #include "i2c_bus_arduino.h"
 #include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
+#include "esphome/core/application.h"
 #include <Arduino.h>
 #include <cstring>
 
@@ -227,10 +228,14 @@ void ArduinoI2CBus::recover_() {
     // When SCL is kept LOW at this point, we might be looking at a device
     // that applies clock stretching. Wait for the release of the SCL line,
     // but not forever. There is no specification for the maximum allowed
-    // time. We'll stick to 500ms here.
-    auto wait = 20;
+    // time. We yield and reset the WDT, so as to avoid triggering reset.
+    // No point in trying to recover the bus by forcing a uC reset. Bus
+    // should recover in a few ms or less else not likely to recovery at
+    // all.
+    auto wait = 250;
     while (wait-- && digitalRead(scl_pin_) == LOW) {  // NOLINT
-      delay(25);
+      App.feed_wdt();
+      delayMicroseconds(half_period_usec * 2);
     }
     if (digitalRead(scl_pin_) == LOW) {  // NOLINT
       ESP_LOGE(TAG, "Recovery failed: SCL is held LOW during clock pulse cycle");
diff --git a/esphome/components/i2c/i2c_bus_esp_idf.cpp b/esphome/components/i2c/i2c_bus_esp_idf.cpp
index 5178f6d4f2..51688322f6 100644
--- a/esphome/components/i2c/i2c_bus_esp_idf.cpp
+++ b/esphome/components/i2c/i2c_bus_esp_idf.cpp
@@ -4,6 +4,7 @@
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
+#include "esphome/core/application.h"
 #include <cstring>
 #include <cinttypes>
 
@@ -273,10 +274,14 @@ void IDFI2CBus::recover_() {
     // When SCL is kept LOW at this point, we might be looking at a device
     // that applies clock stretching. Wait for the release of the SCL line,
     // but not forever. There is no specification for the maximum allowed
-    // time. We'll stick to 500ms here.
-    auto wait = 20;
+    // time. We yield and reset the WDT, so as to avoid triggering reset.
+    // No point in trying to recover the bus by forcing a uC reset. Bus
+    // should recover in a few ms or less else not likely to recovery at
+    // all.
+    auto wait = 250;
     while (wait-- && gpio_get_level(scl_pin) == 0) {
-      delay(25);
+      App.feed_wdt();
+      delayMicroseconds(half_period_usec * 2);
     }
     if (gpio_get_level(scl_pin) == 0) {
       ESP_LOGE(TAG, "Recovery failed: SCL is held LOW during clock pulse cycle");

From f3e6a4314feee7fe1e848c9144be1b62ae84054e Mon Sep 17 00:00:00 2001
From: Jimmy Hedman <jimmy.hedman@gmail.com>
Date: Wed, 26 Apr 2023 22:03:30 +0200
Subject: [PATCH 829/838] Debug component doesn't work on RP2040 (#4728)

---
 esphome/components/debug/__init__.py | 43 +++++++++++++++-------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/esphome/components/debug/__init__.py b/esphome/components/debug/__init__.py
index c18baa1cca..9742b3b19e 100644
--- a/esphome/components/debug/__init__.py
+++ b/esphome/components/debug/__init__.py
@@ -17,26 +17,29 @@ debug_ns = cg.esphome_ns.namespace("debug")
 DebugComponent = debug_ns.class_("DebugComponent", cg.PollingComponent)
 
 
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(DebugComponent),
-        cv.Optional(CONF_DEVICE): cv.invalid(
-            "The 'device' option has been moved to the 'debug' text_sensor component"
-        ),
-        cv.Optional(CONF_FREE): cv.invalid(
-            "The 'free' option has been moved to the 'debug' sensor component"
-        ),
-        cv.Optional(CONF_BLOCK): cv.invalid(
-            "The 'block' option has been moved to the 'debug' sensor component"
-        ),
-        cv.Optional(CONF_FRAGMENTATION): cv.invalid(
-            "The 'fragmentation' option has been moved to the 'debug' sensor component"
-        ),
-        cv.Optional(CONF_LOOP_TIME): cv.invalid(
-            "The 'loop_time' option has been moved to the 'debug' sensor component"
-        ),
-    }
-).extend(cv.polling_component_schema("60s"))
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(DebugComponent),
+            cv.Optional(CONF_DEVICE): cv.invalid(
+                "The 'device' option has been moved to the 'debug' text_sensor component"
+            ),
+            cv.Optional(CONF_FREE): cv.invalid(
+                "The 'free' option has been moved to the 'debug' sensor component"
+            ),
+            cv.Optional(CONF_BLOCK): cv.invalid(
+                "The 'block' option has been moved to the 'debug' sensor component"
+            ),
+            cv.Optional(CONF_FRAGMENTATION): cv.invalid(
+                "The 'fragmentation' option has been moved to the 'debug' sensor component"
+            ),
+            cv.Optional(CONF_LOOP_TIME): cv.invalid(
+                "The 'loop_time' option has been moved to the 'debug' sensor component"
+            ),
+        }
+    ).extend(cv.polling_component_schema("60s")),
+    cv.only_on(["esp32", "esp8266"]),
+)
 
 
 async def to_code(config):

From ba4ef72d56119c6ac73976e8d890e18043b9a975 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 27 Apr 2023 16:22:12 +1200
Subject: [PATCH 830/838] Only request VA port from first client that is
 subscribed (#4747)

---
 esphome/components/api/api_server.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index 97a7d6fbf6..068f74315c 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -429,15 +429,16 @@ void APIServer::on_shutdown() {
 
 #ifdef USE_VOICE_ASSISTANT
 bool APIServer::start_voice_assistant() {
-  bool result = false;
   for (auto &c : this->clients_) {
-    result |= c->request_voice_assistant(true);
+    if (c->request_voice_assistant(true))
+      return true;
   }
-  return result;
+  return false;
 }
 void APIServer::stop_voice_assistant() {
   for (auto &c : this->clients_) {
-    c->request_voice_assistant(false);
+    if (c->request_voice_assistant(false))
+      return;
   }
 }
 #endif

From 4e21cf0bdd1c2bc079191930511aeb628162818f Mon Sep 17 00:00:00 2001
From: itpeters <59966384+itpeters@users.noreply.github.com>
Date: Wed, 26 Apr 2023 22:34:20 -0600
Subject: [PATCH 831/838] Don't allow fingerprint_grow enroll cancellation when
 no enrollment started (#4745)

---
 esphome/components/fingerprint_grow/fingerprint_grow.cpp | 6 ++++--
 esphome/components/fingerprint_grow/fingerprint_grow.h   | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/esphome/components/fingerprint_grow/fingerprint_grow.cpp b/esphome/components/fingerprint_grow/fingerprint_grow.cpp
index d27b0ca4cd..4043f32dcb 100644
--- a/esphome/components/fingerprint_grow/fingerprint_grow.cpp
+++ b/esphome/components/fingerprint_grow/fingerprint_grow.cpp
@@ -77,10 +77,12 @@ void FingerprintGrowComponent::finish_enrollment(uint8_t result) {
     this->enrollment_done_callback_.call(this->enrollment_slot_);
     this->get_fingerprint_count_();
   } else {
-    this->enrollment_failed_callback_.call(this->enrollment_slot_);
+    if (this->enrollment_slot_ != ENROLLMENT_SLOT_UNUSED) {
+      this->enrollment_failed_callback_.call(this->enrollment_slot_);
+    }
   }
   this->enrollment_image_ = 0;
-  this->enrollment_slot_ = 0;
+  this->enrollment_slot_ = ENROLLMENT_SLOT_UNUSED;
   if (this->enrolling_binary_sensor_ != nullptr) {
     this->enrolling_binary_sensor_->publish_state(false);
   }
diff --git a/esphome/components/fingerprint_grow/fingerprint_grow.h b/esphome/components/fingerprint_grow/fingerprint_grow.h
index fd316237f7..f414146e64 100644
--- a/esphome/components/fingerprint_grow/fingerprint_grow.h
+++ b/esphome/components/fingerprint_grow/fingerprint_grow.h
@@ -13,6 +13,8 @@ namespace fingerprint_grow {
 
 static const uint16_t START_CODE = 0xEF01;
 
+static const uint16_t ENROLLMENT_SLOT_UNUSED = 0xFFFF;
+
 enum GrowPacketType {
   COMMAND = 0x01,
   DATA = 0x02,
@@ -158,7 +160,7 @@ class FingerprintGrowComponent : public PollingComponent, public uart::UARTDevic
   uint32_t new_password_ = -1;
   GPIOPin *sensing_pin_{nullptr};
   uint8_t enrollment_image_ = 0;
-  uint16_t enrollment_slot_ = 0;
+  uint16_t enrollment_slot_ = ENROLLMENT_SLOT_UNUSED;
   uint8_t enrollment_buffers_ = 5;
   bool waiting_removal_ = false;
   uint32_t last_aura_led_control_ = 0;

From 12090657bb0f9f155d676428ac7f7dd101742e98 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 27 Apr 2023 19:36:21 +1200
Subject: [PATCH 832/838] Bump version to 2023.4.2

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

diff --git a/esphome/const.py b/esphome/const.py
index 6796f8d606..e6f5c8e5f0 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.4.1"
+__version__ = "2023.4.2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 

From 568e65a6ab2b74c4c1e2741d59c8dbf2986e32d2 Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Sun, 30 Apr 2023 21:28:21 +0200
Subject: [PATCH 833/838] Fix assumed_state switch webserver (#4259)

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

diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index 80a53a7515..00b2e20015 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -428,6 +428,9 @@ void WebServer::on_switch_update(switch_::Switch *obj, bool state) {
 std::string WebServer::switch_json(switch_::Switch *obj, bool value, JsonDetail start_config) {
   return json::build_json([obj, value, start_config](JsonObject root) {
     set_json_icon_state_value(root, obj, "switch-" + obj->get_object_id(), value ? "ON" : "OFF", value, start_config);
+    if (start_config == DETAIL_ALL) {
+      root["assumed_state"] = obj->assumed_state();
+    }
   });
 }
 void WebServer::handle_switch_request(AsyncWebServerRequest *request, const UrlMatch &match) {

From c2a43c733ac908dca93d34370f5b8bb56ece8b78 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Sun, 30 Apr 2023 14:52:05 -0500
Subject: [PATCH 834/838] Fix sprinkler switch restore_mode (#4756)

---
 esphome/components/sprinkler/__init__.py   | 20 +++++++++++++++-----
 esphome/components/sprinkler/sprinkler.cpp | 15 +++++++++++++++
 esphome/components/sprinkler/sprinkler.h   |  7 ++++++-
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/esphome/components/sprinkler/__init__.py b/esphome/components/sprinkler/__init__.py
index d49b1ba381..6aa76dcd2f 100644
--- a/esphome/components/sprinkler/__init__.py
+++ b/esphome/components/sprinkler/__init__.py
@@ -286,7 +286,9 @@ SPRINKLER_VALVE_SCHEMA = cv.Schema(
     {
         cv.Optional(CONF_ENABLE_SWITCH): cv.maybe_simple_value(
             switch.switch_schema(
-                SprinklerControllerSwitch, entity_category=ENTITY_CATEGORY_CONFIG
+                SprinklerControllerSwitch,
+                entity_category=ENTITY_CATEGORY_CONFIG,
+                default_restore_mode="RESTORE_DEFAULT_OFF",
             ),
             key=CONF_NAME,
         ),
@@ -333,7 +335,9 @@ SPRINKLER_CONTROLLER_SCHEMA = cv.Schema(
         cv.Optional(CONF_NAME): cv.string,
         cv.Optional(CONF_AUTO_ADVANCE_SWITCH): cv.maybe_simple_value(
             switch.switch_schema(
-                SprinklerControllerSwitch, entity_category=ENTITY_CATEGORY_CONFIG
+                SprinklerControllerSwitch,
+                entity_category=ENTITY_CATEGORY_CONFIG,
+                default_restore_mode="RESTORE_DEFAULT_OFF",
             ),
             key=CONF_NAME,
         ),
@@ -343,19 +347,25 @@ SPRINKLER_CONTROLLER_SCHEMA = cv.Schema(
         ),
         cv.Optional(CONF_QUEUE_ENABLE_SWITCH): cv.maybe_simple_value(
             switch.switch_schema(
-                SprinklerControllerSwitch, entity_category=ENTITY_CATEGORY_CONFIG
+                SprinklerControllerSwitch,
+                entity_category=ENTITY_CATEGORY_CONFIG,
+                default_restore_mode="RESTORE_DEFAULT_OFF",
             ),
             key=CONF_NAME,
         ),
         cv.Optional(CONF_REVERSE_SWITCH): cv.maybe_simple_value(
             switch.switch_schema(
-                SprinklerControllerSwitch, entity_category=ENTITY_CATEGORY_CONFIG
+                SprinklerControllerSwitch,
+                entity_category=ENTITY_CATEGORY_CONFIG,
+                default_restore_mode="RESTORE_DEFAULT_OFF",
             ),
             key=CONF_NAME,
         ),
         cv.Optional(CONF_STANDBY_SWITCH): cv.maybe_simple_value(
             switch.switch_schema(
-                SprinklerControllerSwitch, entity_category=ENTITY_CATEGORY_CONFIG
+                SprinklerControllerSwitch,
+                entity_category=ENTITY_CATEGORY_CONFIG,
+                default_restore_mode="RESTORE_DEFAULT_OFF",
             ),
             key=CONF_NAME,
         ),
diff --git a/esphome/components/sprinkler/sprinkler.cpp b/esphome/components/sprinkler/sprinkler.cpp
index 6169185d60..52a6cd2af4 100644
--- a/esphome/components/sprinkler/sprinkler.cpp
+++ b/esphome/components/sprinkler/sprinkler.cpp
@@ -1176,6 +1176,21 @@ optional<uint32_t> Sprinkler::time_remaining_current_operation() {
   return nullopt;
 }
 
+bool Sprinkler::any_controller_is_active() {
+  if (this->state_ != IDLE) {
+    return true;
+  }
+
+  for (auto &controller : this->other_controllers_) {
+    if (controller != this) {  // dummy check
+      if (controller->controller_state() != IDLE) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
 SprinklerControllerSwitch *Sprinkler::control_switch(size_t valve_number) {
   if (this->is_a_valid_valve(valve_number)) {
     return this->valve_[valve_number].controller_switch;
diff --git a/esphome/components/sprinkler/sprinkler.h b/esphome/components/sprinkler/sprinkler.h
index 7952c4533f..7a8285ae73 100644
--- a/esphome/components/sprinkler/sprinkler.h
+++ b/esphome/components/sprinkler/sprinkler.h
@@ -406,6 +406,12 @@ class Sprinkler : public Component {
   /// returns the amount of time remaining in seconds for all valves remaining, including the active valve, if any
   optional<uint32_t> time_remaining_current_operation();
 
+  /// returns true if this or any sprinkler controller this controller knows about is active
+  bool any_controller_is_active();
+
+  /// returns the current state of the sprinkler controller
+  SprinklerState controller_state() { return this->state_; };
+
   /// returns a pointer to a valve's control switch object
   SprinklerControllerSwitch *control_switch(size_t valve_number);
 
@@ -503,7 +509,6 @@ class Sprinkler : public Component {
   /// callback functions for timers
   void valve_selection_callback_();
   void sm_timer_callback_();
-  void pump_stop_delay_callback_();
 
   /// Maximum allowed queue size
   const uint8_t max_queue_size_{100};

From 980cfaf295acb06299a5d3b6401b4a8712a3a8cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 May 2023 07:57:02 +1200
Subject: [PATCH 835/838] Bump aioesphomeapi from 13.7.1 to 13.7.2 (#4753)

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 41fedc88cf..be5133f5f9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.6  # When updating platformio, also update Dockerfile
 esptool==4.5.1
 click==8.1.3
 esphome-dashboard==20230214.0
-aioesphomeapi==13.7.1
+aioesphomeapi==13.7.2
 zeroconf==0.56.0
 
 # esp-idf requires this, but doesn't bundle it by default

From 2d56b70a361524a1dc9b881e1a50bd972f86bb97 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 1 May 2023 08:51:46 +1200
Subject: [PATCH 836/838] Bump git version in Dockerfile (#4763)

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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a59a470394..21c8f2a0ae 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -26,7 +26,7 @@ RUN \
         python3-cryptography=3.3.2-1 \
         python3-venv=3.9.2-3 \
         iputils-ping=3:20210202-1 \
-        git=1:2.30.2-1 \
+        git=1:2.30.2-1+deb11u2 \
         curl=7.74.0-1.3+deb11u7 \
         openssh-client=1:8.4p1-5+deb11u1 \
     && rm -rf \

From f4b98f5e320800d1477602bf2a655e15ed661230 Mon Sep 17 00:00:00 2001
From: tracestep <16390082+tracestep@users.noreply.github.com>
Date: Sun, 30 Apr 2023 18:24:15 -0300
Subject: [PATCH 837/838] Power down PN532 before deep sleep (#4707)

---
 esphome/components/pn532/pn532.cpp | 25 +++++++++++++++++++++++++
 esphome/components/pn532/pn532.h   |  4 ++++
 2 files changed, 29 insertions(+)

diff --git a/esphome/components/pn532/pn532.cpp b/esphome/components/pn532/pn532.cpp
index dc831ef6e0..cc28d7078b 100644
--- a/esphome/components/pn532/pn532.cpp
+++ b/esphome/components/pn532/pn532.cpp
@@ -81,7 +81,32 @@ void PN532::setup() {
   this->turn_off_rf_();
 }
 
+bool PN532::powerdown() {
+  updates_enabled_ = false;
+  requested_read_ = false;
+  ESP_LOGI(TAG, "Powering down PN532");
+  if (!this->write_command_({PN532_COMMAND_POWERDOWN, 0b10100000})) {  // enable i2c,spi wakeup
+    ESP_LOGE(TAG, "Error writing powerdown command to PN532");
+    return false;
+  }
+  std::vector<uint8_t> response;
+  if (!this->read_response(PN532_COMMAND_POWERDOWN, response)) {
+    ESP_LOGE(TAG, "Error reading PN532 powerdown response");
+    return false;
+  }
+  if (response[0] != 0x00) {
+    ESP_LOGE(TAG, "Error on PN532 powerdown: %02x", response[0]);
+    return false;
+  }
+  ESP_LOGV(TAG, "Powerdown successful");
+  delay(1);
+  return true;
+}
+
 void PN532::update() {
+  if (!updates_enabled_)
+    return;
+
   for (auto *obj : this->binary_sensors_)
     obj->on_scan_end();
 
diff --git a/esphome/components/pn532/pn532.h b/esphome/components/pn532/pn532.h
index fee94a29b8..73b349e328 100644
--- a/esphome/components/pn532/pn532.h
+++ b/esphome/components/pn532/pn532.h
@@ -17,6 +17,7 @@ static const uint8_t PN532_COMMAND_SAMCONFIGURATION = 0x14;
 static const uint8_t PN532_COMMAND_RFCONFIGURATION = 0x32;
 static const uint8_t PN532_COMMAND_INDATAEXCHANGE = 0x40;
 static const uint8_t PN532_COMMAND_INLISTPASSIVETARGET = 0x4A;
+static const uint8_t PN532_COMMAND_POWERDOWN = 0x16;
 
 class PN532BinarySensor;
 
@@ -30,6 +31,7 @@ class PN532 : public PollingComponent {
   float get_setup_priority() const override;
 
   void loop() override;
+  void on_shutdown() override { powerdown(); }
 
   void register_tag(PN532BinarySensor *tag) { this->binary_sensors_.push_back(tag); }
   void register_ontag_trigger(nfc::NfcOnTagTrigger *trig) { this->triggers_ontag_.push_back(trig); }
@@ -45,6 +47,7 @@ class PN532 : public PollingComponent {
   void clean_mode();
   void format_mode();
   void write_mode(nfc::NdefMessage *message);
+  bool powerdown();
 
  protected:
   void turn_off_rf_();
@@ -79,6 +82,7 @@ class PN532 : public PollingComponent {
   bool write_mifare_ultralight_tag_(std::vector<uint8_t> &uid, nfc::NdefMessage *message);
   bool clean_mifare_ultralight_();
 
+  bool updates_enabled_{true};
   bool requested_read_{false};
   std::vector<PN532BinarySensor *> binary_sensors_;
   std::vector<nfc::NfcOnTagTrigger *> triggers_ontag_;

From 56e0923c2295e264553f0b7c579c71c9f8c18dda Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 1 May 2023 11:09:01 +1200
Subject: [PATCH 838/838] Switch ESPAsyncTCP-esphome to esphome fork (#4764)

---
 esphome/components/async_tcp/__init__.py | 4 ++--
 platformio.ini                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/async_tcp/__init__.py b/esphome/components/async_tcp/__init__.py
index c693544a2e..1d127623f1 100644
--- a/esphome/components/async_tcp/__init__.py
+++ b/esphome/components/async_tcp/__init__.py
@@ -18,5 +18,5 @@ async def to_code(config):
         # https://github.com/esphome/AsyncTCP/blob/master/library.json
         cg.add_library("esphome/AsyncTCP-esphome", "1.2.2")
     elif CORE.is_esp8266:
-        # https://github.com/OttoWinter/ESPAsyncTCP
-        cg.add_library("ottowinter/ESPAsyncTCP-esphome", "1.2.3")
+        # https://github.com/esphome/ESPAsyncTCP
+        cg.add_library("esphome/ESPAsyncTCP-esphome", "1.2.3")
diff --git a/platformio.ini b/platformio.ini
index 7f301e560c..da3bb9d29f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -88,7 +88,7 @@ lib_deps =
     ${common:arduino.lib_deps}
     ESP8266WiFi                           ; wifi (Arduino built-in)
     Update                                ; ota (Arduino built-in)
-    ottowinter/ESPAsyncTCP-esphome@1.2.3  ; async_tcp
+    esphome/ESPAsyncTCP-esphome@1.2.3  ; async_tcp
     ESP8266HTTPClient                     ; http_request (Arduino built-in)
     ESP8266mDNS                           ; mdns (Arduino built-in)
     DNSServer                             ; captive_portal (Arduino built-in)