preen

This reverts commit 1226e581ec.

.github/workflows/ci.yml

@@ -296,7 +296,7 @@ jobs:
             name: Run script/clang-tidy for ZEPHYR
             options: --environment nrf52-tidy --grep USE_ZEPHYR
             pio_cache_key: tidy-zephyr
-            ignore_errors: true
+            ignore_errors: false
 
     steps:
       - name: Check out code from GitHub

CODEOWNERS

@@ -235,6 +235,7 @@ esphome/components/kamstrup_kmp/* @cfeenstra1024
 esphome/components/key_collector/* @ssieb
 esphome/components/key_provider/* @ssieb
 esphome/components/kuntze/* @ssieb
+esphome/components/lc709203f/* @ilikecake
 esphome/components/lcd_menu/* @numo68
 esphome/components/ld2410/* @regevbr @sebcaps
 esphome/components/ld2420/* @descipher

esphome/__main__.py

@@ -593,15 +593,20 @@ def command_update_all(args):
         middle_text = f" {middle_text} "
         width = len(click.unstyle(middle_text))
         half_line = "=" * ((twidth - width) // 2)
-        click.echo(f"{half_line}{middle_text}{half_line}")
+        safe_print(f"{half_line}{middle_text}{half_line}")
 
     for f in files:
-        print(f"Updating {color(AnsiFore.CYAN, f)}")
-        print("-" * twidth)
-        print()
-        rc = run_external_process(
-            "esphome", "--dashboard", "run", f, "--no-logs", "--device", "OTA"
-        )
+        safe_print(f"Updating {color(AnsiFore.CYAN, f)}")
+        safe_print("-" * twidth)
+        safe_print()
+        if CORE.dashboard:
+            rc = run_external_process(
+                "esphome", "--dashboard", "run", f, "--no-logs", "--device", "OTA"
+            )
+        else:
+            rc = run_external_process(
+                "esphome", "run", f, "--no-logs", "--device", "OTA"
+            )
         if rc == 0:
             print_bar(f"[{color(AnsiFore.BOLD_GREEN, 'SUCCESS')}] {f}")
             success[f] = True
@@ -609,17 +614,17 @@ def command_update_all(args):
             print_bar(f"[{color(AnsiFore.BOLD_RED, 'ERROR')}] {f}")
             success[f] = False
 
-        print()
-        print()
-        print()
+        safe_print()
+        safe_print()
+        safe_print()
 
     print_bar(f"[{color(AnsiFore.BOLD_WHITE, 'SUMMARY')}]")
     failed = 0
     for f in files:
         if success[f]:
-            print(f"  - {f}: {color(AnsiFore.GREEN, 'SUCCESS')}")
+            safe_print(f"  - {f}: {color(AnsiFore.GREEN, 'SUCCESS')}")
         else:
-            print(f"  - {f}: {color(AnsiFore.BOLD_RED, 'FAILED')}")
+            safe_print(f"  - {f}: {color(AnsiFore.BOLD_RED, 'FAILED')}")
             failed += 1
     return failed
 

esphome/components/adc/adc_sensor_esp32.cpp

@@ -22,7 +22,7 @@ static const int ADC_MAX = (1 << SOC_ADC_RTC_MAX_BITWIDTH) - 1;
 static const int ADC_HALF = (1 << SOC_ADC_RTC_MAX_BITWIDTH) >> 1;
 
 void ADCSensor::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup for '%s'...", this->get_name().c_str());
+  ESP_LOGCONFIG(TAG, "Running setup for '%s'", this->get_name().c_str());
 
   if (this->channel1_ != ADC1_CHANNEL_MAX) {
     adc1_config_width(ADC_WIDTH_MAX_SOC_BITS);

esphome/components/adc/adc_sensor_esp8266.cpp

@@ -17,7 +17,7 @@ namespace adc {
 static const char *const TAG = "adc.esp8266";
 
 void ADCSensor::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup for '%s'...", this->get_name().c_str());
+  ESP_LOGCONFIG(TAG, "Running setup for '%s'", this->get_name().c_str());
 #ifndef USE_ADC_SENSOR_VCC
   this->pin_->setup();
 #endif

esphome/components/adc/adc_sensor_libretiny.cpp

@@ -9,7 +9,7 @@ namespace adc {
 static const char *const TAG = "adc.libretiny";
 
 void ADCSensor::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup for '%s'...", this->get_name().c_str());
+  ESP_LOGCONFIG(TAG, "Running setup for '%s'", this->get_name().c_str());
 #ifndef USE_ADC_SENSOR_VCC
   this->pin_->setup();
 #endif  // !USE_ADC_SENSOR_VCC

esphome/components/adc/adc_sensor_rp2040.cpp

@@ -14,7 +14,7 @@ namespace adc {
 static const char *const TAG = "adc.rp2040";
 
 void ADCSensor::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup for '%s'...", this->get_name().c_str());
+  ESP_LOGCONFIG(TAG, "Running setup for '%s'", this->get_name().c_str());
   static bool initialized = false;
   if (!initialized) {
     adc_init();

esphome/components/ads1115/ads1115.cpp

@@ -17,8 +17,6 @@ void ADS1115Component::setup() {
     return;
   }
 
-  ESP_LOGCONFIG(TAG, "Configuring ADS1115...");
-
   uint16_t config = 0;
   // Clear single-shot bit
   //        0b0xxxxxxxxxxxxxxx
@@ -71,7 +69,7 @@ void ADS1115Component::dump_config() {
   ESP_LOGCONFIG(TAG, "ADS1115:");
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with ADS1115 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
 }
 float ADS1115Component::request_measurement(ADS1115Multiplexer multiplexer, ADS1115Gain gain,

esphome/components/ags10/ags10.cpp

@@ -65,7 +65,7 @@ void AGS10Component::dump_config() {
     case NONE:
       break;
     case COMMUNICATION_FAILED:
-      ESP_LOGE(TAG, "Communication with AGS10 failed!");
+      ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
       break;
     case CRC_CHECK_FAILED:
       ESP_LOGE(TAG, "The crc check failed");

esphome/components/aht10/aht10.cpp

@@ -55,7 +55,7 @@ void AHT10Component::setup() {
       break;
   }
   if (error_code != i2c::ERROR_OK) {
-    ESP_LOGE(TAG, "Communication failed");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
     this->mark_failed();
     return;
   }
@@ -64,7 +64,7 @@ void AHT10Component::setup() {
   while (data & AHT10_STATUS_BUSY) {
     delay(AHT10_DEFAULT_DELAY);
     if (this->read(&data, 1) != i2c::ERROR_OK) {
-      ESP_LOGE(TAG, "Communication failed");
+      ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
       this->mark_failed();
       return;
     }
@@ -115,9 +115,9 @@ void AHT10Component::read_data_() {
     if (this->humidity_sensor_ == nullptr) {
       ESP_LOGV(TAG, "Invalid humidity (reading not required)");
     } else {
-      ESP_LOGD(TAG, "Invalid humidity, retrying...");
+      ESP_LOGD(TAG, "Invalid humidity, retrying");
       if (this->write(AHT10_MEASURE_CMD, sizeof(AHT10_MEASURE_CMD)) != i2c::ERROR_OK) {
-        this->status_set_warning("Communication failed");
+        this->status_set_warning(ESP_LOG_MSG_COMM_FAIL);
       }
       this->restart_read_();
       return;
@@ -148,7 +148,7 @@ void AHT10Component::update() {
     return;
   this->start_time_ = millis();
   if (this->write(AHT10_MEASURE_CMD, sizeof(AHT10_MEASURE_CMD)) != i2c::ERROR_OK) {
-    this->status_set_warning("Communication failed");
+    this->status_set_warning(ESP_LOG_MSG_COMM_FAIL);
     return;
   }
   this->restart_read_();
@@ -160,7 +160,7 @@ void AHT10Component::dump_config() {
   ESP_LOGCONFIG(TAG, "AHT10:");
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication failed");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
   LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);

esphome/components/aic3204/aic3204.cpp

@@ -113,7 +113,7 @@ void AIC3204::dump_config() {
   LOG_I2C_DEVICE(this);
 
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with AIC3204 failed");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
 }
 

esphome/components/am2315c/am2315c.cpp

@@ -188,7 +188,7 @@ void AM2315C::dump_config() {
   ESP_LOGCONFIG(TAG, "AM2315C:");
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with AM2315C failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
   LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);

esphome/components/am2320/am2320.cpp

@@ -47,7 +47,7 @@ void AM2320Component::dump_config() {
   ESP_LOGD(TAG, "AM2320:");
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with AM2320 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
   LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);

esphome/components/apds9306/apds9306.cpp

@@ -97,7 +97,7 @@ void APDS9306::dump_config() {
   if (this->is_failed()) {
     switch (this->error_code_) {
       case COMMUNICATION_FAILED:
-        ESP_LOGE(TAG, "Communication with APDS9306 failed!");
+        ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
         break;
       case WRONG_ID:
         ESP_LOGE(TAG, "APDS9306 has invalid id!");

esphome/components/apds9960/apds9960.cpp

@@ -141,7 +141,7 @@ void APDS9960::dump_config() {
   if (this->is_failed()) {
     switch (this->error_code_) {
       case COMMUNICATION_FAILED:
-        ESP_LOGE(TAG, "Communication with APDS9960 failed!");
+        ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
         break;
       case WRONG_ID:
         ESP_LOGE(TAG, "APDS9960 has invalid id!");

esphome/components/api/__init__.py

@@ -49,6 +49,7 @@ SERVICE_ARG_NATIVE_TYPES = {
     "string[]": cg.std_vector.template(cg.std_string),
 }
 CONF_ENCRYPTION = "encryption"
+CONF_BATCH_DELAY = "batch_delay"
 
 
 def validate_encryption_key(value):
@@ -109,6 +110,9 @@ CONFIG_SCHEMA = cv.All(
             ): ACTIONS_SCHEMA,
             cv.Exclusive(CONF_ACTIONS, group_of_exclusion=CONF_ACTIONS): ACTIONS_SCHEMA,
             cv.Optional(CONF_ENCRYPTION): _encryption_schema,
+            cv.Optional(
+                CONF_BATCH_DELAY, default="100ms"
+            ): cv.positive_time_period_milliseconds,
             cv.Optional(CONF_ON_CLIENT_CONNECTED): automation.validate_automation(
                 single=True
             ),
@@ -129,6 +133,7 @@ async def to_code(config):
     cg.add(var.set_port(config[CONF_PORT]))
     cg.add(var.set_password(config[CONF_PASSWORD]))
     cg.add(var.set_reboot_timeout(config[CONF_REBOOT_TIMEOUT]))
+    cg.add(var.set_batch_delay(config[CONF_BATCH_DELAY]))
 
     for conf in config.get(CONF_ACTIONS, []):
         template_args = []

esphome/components/api/api_connection.h

@@ -11,6 +11,7 @@
 #include "esphome/core/entity_base.h"
 
 #include <vector>
+#include <functional>
 
 namespace esphome {
 namespace api {
@@ -18,49 +19,9 @@ namespace api {
 // Keepalive timeout in milliseconds
 static constexpr uint32_t KEEPALIVE_TIMEOUT_MS = 60000;
 
-using send_message_t = bool (APIConnection::*)(void *);
-
-/*
-  This class holds a pointer to the source component that wants to publish a message, and a pointer to a function that
-  will lazily publish that message.  The two pointers allow dedup in the deferred queue if multiple publishes for the
-  same component are backed up, and take up only 8 bytes of memory.  The entry in the deferred queue (a std::vector) is
-  the DeferredMessage instance itself (not a pointer to one elsewhere in heap) so still only 8 bytes per entry.  Even
-  100 backed up messages (you'd have to have at least 100 sensors publishing because of dedup) would take up only 0.8
-  kB.
-*/
-class DeferredMessageQueue {
-  struct DeferredMessage {
-    friend class DeferredMessageQueue;
-
-   protected:
-    void *source_;
-    send_message_t send_message_;
-
-   public:
-    DeferredMessage(void *source, send_message_t send_message) : source_(source), send_message_(send_message) {}
-    bool operator==(const DeferredMessage &test) const {
-      return (source_ == test.source_ && send_message_ == test.send_message_);
-    }
-  } __attribute__((packed));
-
- protected:
-  // vector is used very specifically for its zero memory overhead even though items are popped from the front (memory
-  // footprint is more important than speed here)
-  std::vector<DeferredMessage> deferred_queue_;
-  APIConnection *api_connection_;
-
-  // helper for allowing only unique entries in the queue
-  void dmq_push_back_with_dedup_(void *source, send_message_t send_message);
-
- public:
-  DeferredMessageQueue(APIConnection *api_connection) : api_connection_(api_connection) {}
-  void process_queue();
-  void defer(void *source, send_message_t send_message);
-  bool empty() const { return deferred_queue_.empty(); }
-};
-
 class APIConnection : public APIServerConnection {
  public:
+  friend class APIServer;
   APIConnection(std::unique_ptr<socket::Socket> socket, APIServer *parent);
   virtual ~APIConnection();
 
@@ -68,225 +29,113 @@ class APIConnection : public APIServerConnection {
   void loop();
 
   bool send_list_info_done() {
-    ListEntitiesDoneResponse resp;
-    return this->send_list_entities_done_response(resp);
+    return this->schedule_message_(nullptr, &APIConnection::try_send_list_info_done,
+                                   ListEntitiesDoneResponse::MESSAGE_TYPE);
   }
 #ifdef USE_BINARY_SENSOR
   bool send_binary_sensor_state(binary_sensor::BinarySensor *binary_sensor, bool state);
+  bool send_binary_sensor_state(binary_sensor::BinarySensor *binary_sensor);
   void send_binary_sensor_info(binary_sensor::BinarySensor *binary_sensor);
-
- protected:
-  bool try_send_binary_sensor_state_(binary_sensor::BinarySensor *binary_sensor);
-  bool try_send_binary_sensor_state_(binary_sensor::BinarySensor *binary_sensor, bool state);
-  bool try_send_binary_sensor_info_(binary_sensor::BinarySensor *binary_sensor);
-
- public:
 #endif
 #ifdef USE_COVER
   bool send_cover_state(cover::Cover *cover);
   void send_cover_info(cover::Cover *cover);
   void cover_command(const CoverCommandRequest &msg) override;
-
- protected:
-  bool try_send_cover_state_(cover::Cover *cover);
-  bool try_send_cover_info_(cover::Cover *cover);
-
- public:
 #endif
 #ifdef USE_FAN
   bool send_fan_state(fan::Fan *fan);
   void send_fan_info(fan::Fan *fan);
   void fan_command(const FanCommandRequest &msg) override;
-
- protected:
-  bool try_send_fan_state_(fan::Fan *fan);
-  bool try_send_fan_info_(fan::Fan *fan);
-
- public:
 #endif
 #ifdef USE_LIGHT
   bool send_light_state(light::LightState *light);
   void send_light_info(light::LightState *light);
   void light_command(const LightCommandRequest &msg) override;
-
- protected:
-  bool try_send_light_state_(light::LightState *light);
-  bool try_send_light_info_(light::LightState *light);
-
- public:
 #endif
 #ifdef USE_SENSOR
   bool send_sensor_state(sensor::Sensor *sensor, float state);
+  bool send_sensor_state(sensor::Sensor *sensor);
   void send_sensor_info(sensor::Sensor *sensor);
-
- protected:
-  bool try_send_sensor_state_(sensor::Sensor *sensor);
-  bool try_send_sensor_state_(sensor::Sensor *sensor, float state);
-  bool try_send_sensor_info_(sensor::Sensor *sensor);
-
- public:
 #endif
 #ifdef USE_SWITCH
   bool send_switch_state(switch_::Switch *a_switch, bool state);
+  bool send_switch_state(switch_::Switch *a_switch);
   void send_switch_info(switch_::Switch *a_switch);
   void switch_command(const SwitchCommandRequest &msg) override;
-
- protected:
-  bool try_send_switch_state_(switch_::Switch *a_switch);
-  bool try_send_switch_state_(switch_::Switch *a_switch, bool state);
-  bool try_send_switch_info_(switch_::Switch *a_switch);
-
- public:
 #endif
 #ifdef USE_TEXT_SENSOR
-  bool send_text_sensor_state(text_sensor::TextSensor *text_sensor, std::string state);
+  bool send_text_sensor_state(text_sensor::TextSensor *text_sensor, const std::string &state);
+  bool send_text_sensor_state(text_sensor::TextSensor *text_sensor);
   void send_text_sensor_info(text_sensor::TextSensor *text_sensor);
-
- protected:
-  bool try_send_text_sensor_state_(text_sensor::TextSensor *text_sensor);
-  bool try_send_text_sensor_state_(text_sensor::TextSensor *text_sensor, std::string state);
-  bool try_send_text_sensor_info_(text_sensor::TextSensor *text_sensor);
-
- public:
 #endif
 #ifdef USE_ESP32_CAMERA
   void set_camera_state(std::shared_ptr<esp32_camera::CameraImage> image);
   void send_camera_info(esp32_camera::ESP32Camera *camera);
   void camera_image(const CameraImageRequest &msg) override;
-
- protected:
-  bool try_send_camera_info_(esp32_camera::ESP32Camera *camera);
-
- public:
 #endif
 #ifdef USE_CLIMATE
   bool send_climate_state(climate::Climate *climate);
   void send_climate_info(climate::Climate *climate);
   void climate_command(const ClimateCommandRequest &msg) override;
-
- protected:
-  bool try_send_climate_state_(climate::Climate *climate);
-  bool try_send_climate_info_(climate::Climate *climate);
-
- public:
 #endif
 #ifdef USE_NUMBER
   bool send_number_state(number::Number *number, float state);
+  bool send_number_state(number::Number *number);
   void send_number_info(number::Number *number);
   void number_command(const NumberCommandRequest &msg) override;
-
- protected:
-  bool try_send_number_state_(number::Number *number);
-  bool try_send_number_state_(number::Number *number, float state);
-  bool try_send_number_info_(number::Number *number);
-
- public:
 #endif
 #ifdef USE_DATETIME_DATE
   bool send_date_state(datetime::DateEntity *date);
   void send_date_info(datetime::DateEntity *date);
   void date_command(const DateCommandRequest &msg) override;
-
- protected:
-  bool try_send_date_state_(datetime::DateEntity *date);
-  bool try_send_date_info_(datetime::DateEntity *date);
-
- public:
 #endif
 #ifdef USE_DATETIME_TIME
   bool send_time_state(datetime::TimeEntity *time);
   void send_time_info(datetime::TimeEntity *time);
   void time_command(const TimeCommandRequest &msg) override;
-
- protected:
-  bool try_send_time_state_(datetime::TimeEntity *time);
-  bool try_send_time_info_(datetime::TimeEntity *time);
-
- public:
 #endif
 #ifdef USE_DATETIME_DATETIME
   bool send_datetime_state(datetime::DateTimeEntity *datetime);
   void send_datetime_info(datetime::DateTimeEntity *datetime);
   void datetime_command(const DateTimeCommandRequest &msg) override;
-
- protected:
-  bool try_send_datetime_state_(datetime::DateTimeEntity *datetime);
-  bool try_send_datetime_info_(datetime::DateTimeEntity *datetime);
-
- public:
 #endif
 #ifdef USE_TEXT
-  bool send_text_state(text::Text *text, std::string state);
+  bool send_text_state(text::Text *text, const std::string &state);
+  bool send_text_state(text::Text *text);
   void send_text_info(text::Text *text);
   void text_command(const TextCommandRequest &msg) override;
-
- protected:
-  bool try_send_text_state_(text::Text *text);
-  bool try_send_text_state_(text::Text *text, std::string state);
-  bool try_send_text_info_(text::Text *text);
-
- public:
 #endif
 #ifdef USE_SELECT
-  bool send_select_state(select::Select *select, std::string state);
+  bool send_select_state(select::Select *select, const std::string &state);
+  bool send_select_state(select::Select *select);
   void send_select_info(select::Select *select);
   void select_command(const SelectCommandRequest &msg) override;
-
- protected:
-  bool try_send_select_state_(select::Select *select);
-  bool try_send_select_state_(select::Select *select, std::string state);
-  bool try_send_select_info_(select::Select *select);
-
- public:
 #endif
 #ifdef USE_BUTTON
   void send_button_info(button::Button *button);
   void button_command(const ButtonCommandRequest &msg) override;
-
- protected:
-  bool try_send_button_info_(button::Button *button);
-
- public:
 #endif
 #ifdef USE_LOCK
   bool send_lock_state(lock::Lock *a_lock, lock::LockState state);
+  bool send_lock_state(lock::Lock *a_lock);
   void send_lock_info(lock::Lock *a_lock);
   void lock_command(const LockCommandRequest &msg) override;
-
- protected:
-  bool try_send_lock_state_(lock::Lock *a_lock);
-  bool try_send_lock_state_(lock::Lock *a_lock, lock::LockState state);
-  bool try_send_lock_info_(lock::Lock *a_lock);
-
- public:
 #endif
 #ifdef USE_VALVE
   bool send_valve_state(valve::Valve *valve);
   void send_valve_info(valve::Valve *valve);
   void valve_command(const ValveCommandRequest &msg) override;
-
- protected:
-  bool try_send_valve_state_(valve::Valve *valve);
-  bool try_send_valve_info_(valve::Valve *valve);
-
- public:
 #endif
 #ifdef USE_MEDIA_PLAYER
   bool send_media_player_state(media_player::MediaPlayer *media_player);
   void send_media_player_info(media_player::MediaPlayer *media_player);
   void media_player_command(const MediaPlayerCommandRequest &msg) override;
-
- protected:
-  bool try_send_media_player_state_(media_player::MediaPlayer *media_player);
-  bool try_send_media_player_info_(media_player::MediaPlayer *media_player);
-
- public:
 #endif
   bool try_send_log_message(int level, const char *tag, const char *line);
   void send_homeassistant_service_call(const HomeassistantServiceResponse &call) {
     if (!this->service_call_subscription_)
       return;
-    this->send_homeassistant_service_response(call);
+    this->send_message(call);
   }
 #ifdef USE_BLUETOOTH_PROXY
   void subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) override;
@@ -308,7 +157,7 @@ class APIConnection : public APIServerConnection {
 #ifdef USE_HOMEASSISTANT_TIME
   void send_time_request() {
     GetTimeRequest req;
-    this->send_get_time_request(req);
+    this->send_message(req);
   }
 #endif
 
@@ -328,36 +177,17 @@ class APIConnection : public APIServerConnection {
   bool send_alarm_control_panel_state(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel);
   void send_alarm_control_panel_info(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel);
   void alarm_control_panel_command(const AlarmControlPanelCommandRequest &msg) override;
-
- protected:
-  bool try_send_alarm_control_panel_state_(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel);
-  bool try_send_alarm_control_panel_info_(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel);
-
- public:
 #endif
 
 #ifdef USE_EVENT
-  void send_event(event::Event *event, std::string event_type);
+  void send_event(event::Event *event, const std::string &event_type);
   void send_event_info(event::Event *event);
-
- protected:
-  bool try_send_event_(event::Event *event);
-  bool try_send_event_(event::Event *event, std::string event_type);
-  bool try_send_event_info_(event::Event *event);
-
- public:
 #endif
 
 #ifdef USE_UPDATE
   bool send_update_state(update::UpdateEntity *update);
   void send_update_info(update::UpdateEntity *update);
   void update_command(const UpdateCommandRequest &msg) override;
-
- protected:
-  bool try_send_update_state_(update::UpdateEntity *update);
-  bool try_send_update_info_(update::UpdateEntity *update);
-
- public:
 #endif
 
   void on_disconnect_response(const DisconnectResponse &value) override;
@@ -407,102 +237,67 @@ class APIConnection : public APIServerConnection {
   void on_no_setup_connection() override;
   ProtoWriteBuffer create_buffer(uint32_t reserve_size) override {
     // FIXME: ensure no recursive writes can happen
-    this->proto_write_buffer_.clear();
+
     // Get header padding size - used for both reserve and insert
     uint8_t header_padding = this->helper_->frame_header_padding();
+
+    // Get shared buffer from parent server
+    std::vector<uint8_t> &shared_buf = this->parent_->get_shared_buffer_ref();
+    shared_buf.clear();
     // Reserve space for header padding + message + footer
     // - Header padding: space for protocol headers (7 bytes for Noise, 6 for Plaintext)
     // - Footer: space for MAC (16 bytes for Noise, 0 for Plaintext)
-    this->proto_write_buffer_.reserve(reserve_size + header_padding + this->helper_->frame_footer_size());
+    shared_buf.reserve(reserve_size + header_padding + this->helper_->frame_footer_size());
     // Insert header padding bytes so message encoding starts at the correct position
-    this->proto_write_buffer_.insert(this->proto_write_buffer_.begin(), header_padding, 0);
-    return {&this->proto_write_buffer_};
+    shared_buf.insert(shared_buf.begin(), header_padding, 0);
+    return {&shared_buf};
   }
+
+  // Prepare buffer for next message in batch
+  ProtoWriteBuffer prepare_message_buffer(uint16_t message_size, bool is_first_message) {
+    // Get reference to shared buffer (it maintains state between batch messages)
+    std::vector<uint8_t> &shared_buf = this->parent_->get_shared_buffer_ref();
+    size_t current_size = shared_buf.size();
+
+    if (is_first_message) {
+      // For first message, initialize buffer with header padding
+      uint8_t header_padding = this->helper_->frame_header_padding();
+      shared_buf.clear();
+      shared_buf.reserve(message_size + header_padding);
+      shared_buf.resize(header_padding);
+      // Fill header padding with zeros
+      std::fill(shared_buf.begin(), shared_buf.end(), 0);
+    } else {
+      // For subsequent messages, add footer space for previous message and header for this message
+      uint8_t footer_size = this->helper_->frame_footer_size();
+      uint8_t header_padding = this->helper_->frame_header_padding();
+
+      // Reserve additional space for everything
+      shared_buf.reserve(current_size + footer_size + header_padding + message_size);
+
+      // Single resize to add both footer and header padding
+      size_t new_size = current_size + footer_size + header_padding;
+      shared_buf.resize(new_size);
+
+      // Fill the newly added bytes with zeros (footer + header padding)
+      std::fill(shared_buf.begin() + current_size, shared_buf.end(), 0);
+    }
+
+    return {&shared_buf};
+  }
+
   bool try_to_clear_buffer(bool log_out_of_space);
-  bool send_buffer(ProtoWriteBuffer buffer, uint32_t message_type) override;
+  bool send_buffer(ProtoWriteBuffer buffer, uint16_t message_type) override;
 
   std::string get_client_combined_info() const { return this->client_combined_info_; }
 
+  // Buffer allocator methods for batch processing
+  ProtoWriteBuffer allocate_single_message_buffer(uint16_t size);
+  ProtoWriteBuffer allocate_batch_message_buffer(uint16_t size);
+
  protected:
-  friend APIServer;
-
-  /**
-   * Generic send entity state method to reduce code duplication.
-   * Only attempts to build and send the message if the transmit buffer is available.
-   *
-   * This is the base version for entities that use their current state.
-   *
-   * @param entity The entity to send state for
-   * @param try_send_func The function that tries to send the state
-   * @return True on success or message deferred, false if subscription check failed
-   */
-  bool send_state_(esphome::EntityBase *entity, send_message_t try_send_func) {
-    if (!this->state_subscription_)
-      return false;
-    if (this->try_to_clear_buffer(true) && (this->*try_send_func)(entity)) {
-      return true;
-    }
-    this->deferred_message_queue_.defer(entity, try_send_func);
-    return true;
-  }
-
-  /**
-   * Send entity state method that handles explicit state values.
-   * Only attempts to build and send the message if the transmit buffer is available.
-   *
-   * This method accepts a state parameter to be used instead of the entity's current state.
-   * It attempts to send the state with the provided value first, and if that fails due to buffer constraints,
-   * it defers the entity for later processing using the entity-only function.
-   *
-   * @tparam EntityT The entity type
-   * @tparam StateT Type of the state parameter
-   * @tparam Args Additional argument types (if any)
-   * @param entity The entity to send state for
-   * @param try_send_entity_func The function that tries to send the state with entity pointer only
-   * @param try_send_state_func The function that tries to send the state with entity and state parameters
-   * @param state The state value to send
-   * @param args Additional arguments to pass to the try_send_state_func
-   * @return True on success or message deferred, false if subscription check failed
-   */
-  template<typename EntityT, typename StateT, typename... Args>
-  bool send_state_with_value_(EntityT *entity, bool (APIConnection::*try_send_entity_func)(EntityT *),
-                              bool (APIConnection::*try_send_state_func)(EntityT *, StateT, Args...), StateT state,
-                              Args... args) {
-    if (!this->state_subscription_)
-      return false;
-    if (this->try_to_clear_buffer(true) && (this->*try_send_state_func)(entity, state, args...)) {
-      return true;
-    }
-    this->deferred_message_queue_.defer(entity, reinterpret_cast<send_message_t>(try_send_entity_func));
-    return true;
-  }
-
-  /**
-   * Generic send entity info method to reduce code duplication.
-   * Only attempts to build and send the message if the transmit buffer is available.
-   *
-   * @param entity The entity to send info for
-   * @param try_send_func The function that tries to send the info
-   */
-  void send_info_(esphome::EntityBase *entity, send_message_t try_send_func) {
-    if (this->try_to_clear_buffer(true) && (this->*try_send_func)(entity)) {
-      return;
-    }
-    this->deferred_message_queue_.defer(entity, try_send_func);
-  }
-
-  /**
-   * Generic function for generating entity info response messages.
-   * This is used to reduce duplication in the try_send_*_info functions.
-   *
-   * @param entity The entity to generate info for
-   * @param response The response object
-   * @param send_response_func Function pointer to send the response
-   * @return True if the message was sent successfully
-   */
-  template<typename ResponseT>
-  bool try_send_entity_info_(esphome::EntityBase *entity, ResponseT &response,
-                             bool (APIServerConnectionBase::*send_response_func)(const ResponseT &)) {
+  // Helper function to fill common entity fields
+  template<typename ResponseT> static void fill_entity_info_base(esphome::EntityBase *entity, ResponseT &response) {
     // Set common fields that are shared by all entity types
     response.key = entity->get_object_id_hash();
     response.object_id = entity->get_object_id();
@@ -514,12 +309,149 @@ class APIConnection : public APIServerConnection {
     response.icon = entity->get_icon();
     response.disabled_by_default = entity->is_disabled_by_default();
     response.entity_category = static_cast<enums::EntityCategory>(entity->get_entity_category());
-
-    // Send the response using the provided send method
-    return (this->*send_response_func)(response);
   }
 
-  bool send_(const void *buf, size_t len, bool force);
+  // Non-template helper to encode any ProtoMessage
+  static uint16_t encode_message_to_buffer(ProtoMessage &msg, uint16_t message_type, APIConnection *conn,
+                                           uint32_t remaining_size, bool is_single);
+
+#ifdef USE_BINARY_SENSOR
+  static uint16_t try_send_binary_sensor_state_response(binary_sensor::BinarySensor *binary_sensor, bool state,
+                                                        APIConnection *conn, uint32_t remaining_size, bool is_single);
+  static uint16_t try_send_binary_sensor_state(EntityBase *binary_sensor, APIConnection *conn, uint32_t remaining_size,
+                                               bool is_single);
+  static uint16_t try_send_binary_sensor_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                              bool is_single);
+#endif
+#ifdef USE_COVER
+  static uint16_t try_send_cover_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                       bool is_single);
+  static uint16_t try_send_cover_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single);
+#endif
+#ifdef USE_FAN
+  static uint16_t try_send_fan_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single);
+  static uint16_t try_send_fan_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single);
+#endif
+#ifdef USE_LIGHT
+  static uint16_t try_send_light_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                       bool is_single);
+  static uint16_t try_send_light_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single);
+#endif
+#ifdef USE_SENSOR
+  static uint16_t try_send_sensor_state_response(sensor::Sensor *sensor, float state, APIConnection *conn,
+                                                 uint32_t remaining_size, bool is_single);
+  static uint16_t try_send_sensor_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                        bool is_single);
+  static uint16_t try_send_sensor_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                       bool is_single);
+#endif
+#ifdef USE_SWITCH
+  static uint16_t try_send_switch_state_response(switch_::Switch *a_switch, bool state, APIConnection *conn,
+                                                 uint32_t remaining_size, bool is_single);
+  static uint16_t try_send_switch_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                        bool is_single);
+  static uint16_t try_send_switch_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                       bool is_single);
+#endif
+#ifdef USE_TEXT_SENSOR
+  static uint16_t try_send_text_sensor_state_response(text_sensor::TextSensor *text_sensor, const std::string &state,
+                                                      APIConnection *conn, uint32_t remaining_size, bool is_single);
+  static uint16_t try_send_text_sensor_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                             bool is_single);
+  static uint16_t try_send_text_sensor_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                            bool is_single);
+#endif
+#ifdef USE_CLIMATE
+  static uint16_t try_send_climate_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                         bool is_single);
+  static uint16_t try_send_climate_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                        bool is_single);
+#endif
+#ifdef USE_NUMBER
+  static uint16_t try_send_number_state_response(number::Number *number, float state, APIConnection *conn,
+                                                 uint32_t remaining_size, bool is_single);
+  static uint16_t try_send_number_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                        bool is_single);
+  static uint16_t try_send_number_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                       bool is_single);
+#endif
+#ifdef USE_DATETIME_DATE
+  static uint16_t try_send_date_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single);
+  static uint16_t try_send_date_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single);
+#endif
+#ifdef USE_DATETIME_TIME
+  static uint16_t try_send_time_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single);
+  static uint16_t try_send_time_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single);
+#endif
+#ifdef USE_DATETIME_DATETIME
+  static uint16_t try_send_datetime_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                          bool is_single);
+  static uint16_t try_send_datetime_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                         bool is_single);
+#endif
+#ifdef USE_TEXT
+  static uint16_t try_send_text_state_response(text::Text *text, const std::string &state, APIConnection *conn,
+                                               uint32_t remaining_size, bool is_single);
+  static uint16_t try_send_text_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single);
+  static uint16_t try_send_text_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single);
+#endif
+#ifdef USE_SELECT
+  static uint16_t try_send_select_state_response(select::Select *select, const std::string &state, APIConnection *conn,
+                                                 uint32_t remaining_size, bool is_single);
+  static uint16_t try_send_select_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                        bool is_single);
+  static uint16_t try_send_select_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                       bool is_single);
+#endif
+#ifdef USE_BUTTON
+  static uint16_t try_send_button_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                       bool is_single);
+#endif
+#ifdef USE_LOCK
+  static uint16_t try_send_lock_state_response(lock::Lock *a_lock, lock::LockState state, APIConnection *conn,
+                                               uint32_t remaining_size, bool is_single);
+  static uint16_t try_send_lock_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single);
+  static uint16_t try_send_lock_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single);
+#endif
+#ifdef USE_VALVE
+  static uint16_t try_send_valve_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                       bool is_single);
+  static uint16_t try_send_valve_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single);
+#endif
+#ifdef USE_MEDIA_PLAYER
+  static uint16_t try_send_media_player_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                              bool is_single);
+  static uint16_t try_send_media_player_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                             bool is_single);
+#endif
+#ifdef USE_ALARM_CONTROL_PANEL
+  static uint16_t try_send_alarm_control_panel_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                                     bool is_single);
+  static uint16_t try_send_alarm_control_panel_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                                    bool is_single);
+#endif
+#ifdef USE_EVENT
+  static uint16_t try_send_event_response(event::Event *event, const std::string &event_type, APIConnection *conn,
+                                          uint32_t remaining_size, bool is_single);
+  static uint16_t try_send_event_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single);
+#endif
+#ifdef USE_UPDATE
+  static uint16_t try_send_update_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                        bool is_single);
+  static uint16_t try_send_update_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                       bool is_single);
+#endif
+#ifdef USE_ESP32_CAMERA
+  static uint16_t try_send_camera_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                       bool is_single);
+#endif
+
+  // Method for ListEntitiesDone batching
+  static uint16_t try_send_list_info_done(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                          bool is_single);
+
+  // Helper function to get estimated message size for buffer pre-allocation
+  static uint16_t get_estimated_message_size(uint16_t message_type);
 
   enum class ConnectionState {
     WAITING_FOR_HELLO,
@@ -529,9 +461,6 @@ class APIConnection : public APIServerConnection {
 
   bool remove_{false};
 
-  // Buffer used to encode proto messages
-  // Re-use to prevent allocations
-  std::vector<uint8_t> proto_write_buffer_;
   std::unique_ptr<APIFrameHelper> helper_;
 
   std::string client_info_;
@@ -552,10 +481,180 @@ class APIConnection : public APIServerConnection {
   bool service_call_subscription_{false};
   bool next_close_ = false;
   APIServer *parent_;
-  DeferredMessageQueue deferred_message_queue_;
   InitialStateIterator initial_state_iterator_;
   ListEntitiesIterator list_entities_iterator_;
   int state_subs_at_ = -1;
+
+  // Function pointer type for message encoding
+  using MessageCreatorPtr = uint16_t (*)(EntityBase *, APIConnection *, uint32_t remaining_size, bool is_single);
+
+  // Optimized MessageCreator class using union dispatch
+  class MessageCreator {
+   public:
+    // Constructor for function pointer (message_type = 0)
+    MessageCreator(MessageCreatorPtr ptr) : message_type_(0) { data_.ptr = ptr; }
+
+    // Constructor for bool state capture
+    MessageCreator(bool value, uint16_t msg_type) : message_type_(msg_type) { data_.bool_value = value; }
+
+    // Constructor for float state capture
+    MessageCreator(float value, uint16_t msg_type) : message_type_(msg_type) { data_.float_value = value; }
+
+    // Constructor for string state capture
+    MessageCreator(const std::string &value, uint16_t msg_type) : message_type_(msg_type) {
+      data_.string_ptr = new std::string(value);
+    }
+
+#ifdef USE_LOCK
+    // Constructor for lock state capture
+    MessageCreator(lock::LockState value, uint16_t msg_type) : message_type_(msg_type) { data_.lock_value = value; }
+#endif
+
+    // Destructor
+    ~MessageCreator() {
+      // Clean up string data for string-based message types
+      if (uses_string_data_()) {
+        delete data_.string_ptr;
+      }
+    }
+
+    // Copy constructor
+    MessageCreator(const MessageCreator &other) : message_type_(other.message_type_) {
+      if (message_type_ == 0) {
+        data_.ptr = other.data_.ptr;
+      } else if (uses_string_data_()) {
+        data_.string_ptr = new std::string(*other.data_.string_ptr);
+      } else {
+        data_ = other.data_;  // For POD types
+      }
+    }
+
+    // Move constructor
+    MessageCreator(MessageCreator &&other) noexcept : data_(other.data_), message_type_(other.message_type_) {
+      other.message_type_ = 0;  // Reset other to function pointer type
+      other.data_.ptr = nullptr;
+    }
+
+    // Assignment operators (needed for batch deduplication)
+    MessageCreator &operator=(const MessageCreator &other) {
+      if (this != &other) {
+        // Clean up current string data if needed
+        if (uses_string_data_()) {
+          delete data_.string_ptr;
+        }
+        // Copy new data
+        message_type_ = other.message_type_;
+        if (other.message_type_ == 0) {
+          data_.ptr = other.data_.ptr;
+        } else if (other.uses_string_data_()) {
+          data_.string_ptr = new std::string(*other.data_.string_ptr);
+        } else {
+          data_ = other.data_;
+        }
+      }
+      return *this;
+    }
+
+    MessageCreator &operator=(MessageCreator &&other) noexcept {
+      if (this != &other) {
+        // Clean up current string data if needed
+        if (uses_string_data_()) {
+          delete data_.string_ptr;
+        }
+        // Move data
+        message_type_ = other.message_type_;
+        data_ = other.data_;
+        // Reset other to safe state
+        other.message_type_ = 0;
+        other.data_.ptr = nullptr;
+      }
+      return *this;
+    }
+
+    // Call operator
+    uint16_t operator()(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single) const;
+
+   private:
+    // Helper to check if this message type uses heap-allocated strings
+    bool uses_string_data_() const {
+      return message_type_ == TextSensorStateResponse::MESSAGE_TYPE ||
+             message_type_ == SelectStateResponse::MESSAGE_TYPE || message_type_ == TextStateResponse::MESSAGE_TYPE ||
+             message_type_ == EventResponse::MESSAGE_TYPE;
+    }
+    union CreatorData {
+      MessageCreatorPtr ptr;    // 8 bytes
+      bool bool_value;          // 1 byte
+      float float_value;        // 4 bytes
+      std::string *string_ptr;  // 8 bytes
+#ifdef USE_LOCK
+      lock::LockState lock_value;  // 4 bytes
+#endif
+    } data_;                 // 8 bytes
+    uint16_t message_type_;  // 2 bytes (0 = function ptr, >0 = state capture)
+  };
+
+  // Generic batching mechanism for both state updates and entity info
+  struct DeferredBatch {
+    struct BatchItem {
+      EntityBase *entity;      // Entity pointer
+      MessageCreator creator;  // Function that creates the message when needed
+      uint16_t message_type;   // Message type for overhead calculation
+
+      // Constructor for creating BatchItem
+      BatchItem(EntityBase *entity, MessageCreator creator, uint16_t message_type)
+          : entity(entity), creator(std::move(creator)), message_type(message_type) {}
+    };
+
+    std::vector<BatchItem> items;
+    uint32_t batch_start_time{0};
+    bool batch_scheduled{false};
+
+    DeferredBatch() {
+      // Pre-allocate capacity for typical batch sizes to avoid reallocation
+      items.reserve(8);
+    }
+
+    // Add item to the batch
+    void add_item(EntityBase *entity, MessageCreator creator, uint16_t message_type);
+    void clear() {
+      items.clear();
+      batch_scheduled = false;
+      batch_start_time = 0;
+    }
+    bool empty() const { return items.empty(); }
+  };
+
+  DeferredBatch deferred_batch_;
+  uint32_t get_batch_delay_ms_() const;
+  // Message will use 8 more bytes than the minimum size, and typical
+  // MTU is 1500. Sometimes users will see as low as 1460 MTU.
+  // If its IPv6 the header is 40 bytes, and if its IPv4
+  // the header is 20 bytes. So we have 1460 - 40 = 1420 bytes
+  // available for the payload. But we also need to add the size of
+  // the protobuf overhead, which is 8 bytes.
+  //
+  // To be safe we pick 1390 bytes as the maximum size
+  // to send in one go. This is the maximum size of a single packet
+  // that can be sent over the network.
+  // This is to avoid fragmentation of the packet.
+  static constexpr size_t MAX_PACKET_SIZE = 1390;  // MTU
+
+  bool schedule_batch_();
+  void process_batch_();
+
+  // State for batch buffer allocation
+  bool batch_first_message_{false};
+
+  // Helper function to schedule a deferred message with known message type
+  bool schedule_message_(EntityBase *entity, MessageCreator creator, uint16_t message_type) {
+    this->deferred_batch_.add_item(entity, std::move(creator), message_type);
+    return this->schedule_batch_();
+  }
+
+  // Overload for function pointers (for info messages and current state reads)
+  bool schedule_message_(EntityBase *entity, MessageCreatorPtr function_ptr, uint16_t message_type) {
+    return schedule_message_(entity, MessageCreator(function_ptr), message_type);
+  }
 };
 
 }  // namespace api

esphome/components/api/api_frame_helper.cpp

@@ -605,9 +605,21 @@ APIError APINoiseFrameHelper::read_packet(ReadPacketBuffer *buffer) {
   return APIError::OK;
 }
 APIError APINoiseFrameHelper::write_protobuf_packet(uint16_t type, ProtoWriteBuffer buffer) {
-  int err;
-  APIError aerr;
-  aerr = state_action_();
+  std::vector<uint8_t> *raw_buffer = buffer.get_buffer();
+  uint16_t payload_len = static_cast<uint16_t>(raw_buffer->size() - frame_header_padding_);
+
+  // Resize to include MAC space (required for Noise encryption)
+  raw_buffer->resize(raw_buffer->size() + frame_footer_size_);
+
+  // Use write_protobuf_packets with a single packet
+  std::vector<PacketInfo> packets;
+  packets.emplace_back(type, 0, payload_len);
+
+  return write_protobuf_packets(buffer, packets);
+}
+
+APIError APINoiseFrameHelper::write_protobuf_packets(ProtoWriteBuffer buffer, const std::vector<PacketInfo> &packets) {
+  APIError aerr = state_action_();
   if (aerr != APIError::OK) {
     return aerr;
   }
@@ -616,56 +628,66 @@ APIError APINoiseFrameHelper::write_protobuf_packet(uint16_t type, ProtoWriteBuf
     return APIError::WOULD_BLOCK;
   }
 
-  std::vector<uint8_t> *raw_buffer = buffer.get_buffer();
-  // Message data starts after padding
-  uint16_t payload_len = raw_buffer->size() - frame_header_padding_;
-  uint16_t padding = 0;
-  uint16_t msg_len = 4 + payload_len + padding;
-
-  // We need to resize to include MAC space, but we already reserved it in create_buffer
-  raw_buffer->resize(raw_buffer->size() + frame_footer_size_);
-
-  // Write the noise header in the padded area
-  // Buffer layout:
-  // [0]    - 0x01 indicator byte
-  // [1-2]  - Size of encrypted payload (filled after encryption)
-  // [3-4]  - Message type (encrypted)
-  // [5-6]  - Payload length (encrypted)
-  // [7...] - Actual payload data (encrypted)
-  uint8_t *buf_start = raw_buffer->data();
-  buf_start[0] = 0x01;  // indicator
-  // buf_start[1], buf_start[2] to be set later after encryption
-  const uint8_t msg_offset = 3;
-  buf_start[msg_offset + 0] = (uint8_t) (type >> 8);         // type high byte
-  buf_start[msg_offset + 1] = (uint8_t) type;                // type low byte
-  buf_start[msg_offset + 2] = (uint8_t) (payload_len >> 8);  // data_len high byte
-  buf_start[msg_offset + 3] = (uint8_t) payload_len;         // data_len low byte
-  // payload data is already in the buffer starting at position 7
-
-  NoiseBuffer mbuf;
-  noise_buffer_init(mbuf);
-  // The capacity parameter should be msg_len + frame_footer_size_ (MAC length) to allow space for encryption
-  noise_buffer_set_inout(mbuf, buf_start + msg_offset, msg_len, msg_len + frame_footer_size_);
-  err = noise_cipherstate_encrypt(send_cipher_, &mbuf);
-  if (err != 0) {
-    state_ = State::FAILED;
-    HELPER_LOG("noise_cipherstate_encrypt failed: %s", noise_err_to_str(err).c_str());
-    return APIError::CIPHERSTATE_ENCRYPT_FAILED;
+  if (packets.empty()) {
+    return APIError::OK;
   }
 
-  uint16_t total_len = 3 + mbuf.size;
-  buf_start[1] = (uint8_t) (mbuf.size >> 8);
-  buf_start[2] = (uint8_t) mbuf.size;
+  std::vector<uint8_t> *raw_buffer = buffer.get_buffer();
+  this->reusable_iovs_.clear();
+  this->reusable_iovs_.reserve(packets.size());
 
-  struct iovec iov;
-  // Point iov_base to the beginning of the buffer (no unused padding in Noise)
-  // We send the entire frame: indicator + size + encrypted(type + data_len + payload + MAC)
-  iov.iov_base = buf_start;
-  iov.iov_len = total_len;
+  // We need to encrypt each packet in place
+  for (const auto &packet : packets) {
+    uint16_t type = packet.message_type;
+    uint16_t offset = packet.offset;
+    uint16_t payload_len = packet.payload_size;
+    uint16_t msg_len = 4 + payload_len;  // type(2) + data_len(2) + payload
 
-  // write raw to not have two packets sent if NAGLE disabled
-  return this->write_raw_(&iov, 1);
+    // The buffer already has padding at offset
+    uint8_t *buf_start = raw_buffer->data() + offset;
+
+    // Write noise header
+    buf_start[0] = 0x01;  // indicator
+    // buf_start[1], buf_start[2] to be set after encryption
+
+    // Write message header (to be encrypted)
+    const uint8_t msg_offset = 3;
+    buf_start[msg_offset + 0] = (uint8_t) (type >> 8);         // type high byte
+    buf_start[msg_offset + 1] = (uint8_t) type;                // type low byte
+    buf_start[msg_offset + 2] = (uint8_t) (payload_len >> 8);  // data_len high byte
+    buf_start[msg_offset + 3] = (uint8_t) payload_len;         // data_len low byte
+    // payload data is already in the buffer starting at offset + 7
+
+    // Make sure we have space for MAC
+    // The buffer should already have been sized appropriately
+
+    // Encrypt the message in place
+    NoiseBuffer mbuf;
+    noise_buffer_init(mbuf);
+    noise_buffer_set_inout(mbuf, buf_start + msg_offset, msg_len, msg_len + frame_footer_size_);
+
+    int err = noise_cipherstate_encrypt(send_cipher_, &mbuf);
+    if (err != 0) {
+      state_ = State::FAILED;
+      HELPER_LOG("noise_cipherstate_encrypt failed: %s", noise_err_to_str(err).c_str());
+      return APIError::CIPHERSTATE_ENCRYPT_FAILED;
+    }
+
+    // Fill in the encrypted size
+    buf_start[1] = (uint8_t) (mbuf.size >> 8);
+    buf_start[2] = (uint8_t) mbuf.size;
+
+    // Add iovec for this encrypted packet
+    struct iovec iov;
+    iov.iov_base = buf_start;
+    iov.iov_len = 3 + mbuf.size;  // indicator + size + encrypted data
+    this->reusable_iovs_.push_back(iov);
+  }
+
+  // Send all encrypted packets in one writev call
+  return this->write_raw_(this->reusable_iovs_.data(), this->reusable_iovs_.size());
 }
+
 APIError APINoiseFrameHelper::write_frame_(const uint8_t *data, uint16_t len) {
   uint8_t header[3];
   header[0] = 0x01;  // indicator
@@ -780,7 +802,7 @@ extern "C" {
 // declare how noise generates random bytes (here with a good HWRNG based on the RF system)
 void noise_rand_bytes(void *output, size_t len) {
   if (!esphome::random_bytes(reinterpret_cast<uint8_t *>(output), len)) {
-    ESP_LOGE(TAG, "Failed to acquire random bytes, rebooting!");
+    ESP_LOGE(TAG, "Acquiring random bytes failed; rebooting");
     arch_restart();
   }
 }
@@ -831,12 +853,15 @@ APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) {
 
   // read header
   while (!rx_header_parsed_) {
-    uint8_t data;
-    // Reading one byte at a time is fastest in practice for ESP32 when
-    // there is no data on the wire (which is the common case).
-    // This results in faster failure detection compared to
-    // attempting to read multiple bytes at once.
-    ssize_t received = this->socket_->read(&data, 1);
+    // Now that we know when the socket is ready, we can read up to 3 bytes
+    // into the rx_header_buf_ before we have to switch back to reading
+    // one byte at a time to ensure we don't read past the message and
+    // into the next one.
+
+    // Read directly into rx_header_buf_ at the current position
+    // Try to get to at least 3 bytes total (indicator + 2 varint bytes), then read one byte at a time
+    ssize_t received =
+        this->socket_->read(&rx_header_buf_[rx_header_buf_pos_], rx_header_buf_pos_ < 3 ? 3 - rx_header_buf_pos_ : 1);
     if (received == -1) {
       if (errno == EWOULDBLOCK || errno == EAGAIN) {
         return APIError::WOULD_BLOCK;
@@ -850,51 +875,46 @@ APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) {
       return APIError::CONNECTION_CLOSED;
     }
 
-    // Successfully read a byte
-
-    // Process byte according to current buffer position
-    if (rx_header_buf_pos_ == 0) {  // Case 1: First byte (indicator byte)
-      if (data != 0x00) {
+    // If this was the first read, validate the indicator byte
+    if (rx_header_buf_pos_ == 0 && received > 0) {
+      if (rx_header_buf_[0] != 0x00) {
         state_ = State::FAILED;
-        HELPER_LOG("Bad indicator byte %u", data);
+        HELPER_LOG("Bad indicator byte %u", rx_header_buf_[0]);
         return APIError::BAD_INDICATOR;
       }
-      // We don't store the indicator byte, just increment position
-      rx_header_buf_pos_ = 1;  // Set to 1 directly
-      continue;                // Need more bytes before we can parse
     }
 
-    // Check buffer overflow before storing
-    if (rx_header_buf_pos_ == 5) {  // Case 2: Buffer would overflow (5 bytes is max allowed)
+    rx_header_buf_pos_ += received;
+
+    // Check for buffer overflow
+    if (rx_header_buf_pos_ >= sizeof(rx_header_buf_)) {
       state_ = State::FAILED;
       HELPER_LOG("Header buffer overflow");
       return APIError::BAD_DATA_PACKET;
     }
 
-    // Store byte in buffer (adjust index to account for skipped indicator byte)
-    rx_header_buf_[rx_header_buf_pos_ - 1] = data;
-
-    // Increment position after storing
-    rx_header_buf_pos_++;
-
-    // Case 3: If we only have one varint byte, we need more
-    if (rx_header_buf_pos_ == 2) {  // Have read indicator + 1 byte
-      continue;                     // Need more bytes before we can parse
+    // Need at least 3 bytes total (indicator + 2 varint bytes) before trying to parse
+    if (rx_header_buf_pos_ < 3) {
+      continue;
     }
 
     // At this point, we have at least 3 bytes total:
-    //   - Validated indicator byte (0x00) but not stored
+    //   - Validated indicator byte (0x00) stored at position 0
     //   - At least 2 bytes in the buffer for the varints
     // Buffer layout:
-    //   First 1-3 bytes: Message size varint (variable length)
+    //   [0]: indicator byte (0x00)
+    //   [1-3]: Message size varint (variable length)
     //     - 2 bytes would only allow up to 16383, which is less than noise's UINT16_MAX (65535)
     //     - 3 bytes allows up to 2097151, ensuring we support at least as much as noise
-    //   Remaining 1-2 bytes: Message type varint (variable length)
+    //   [2-5]: Message type varint (variable length)
     // We now attempt to parse both varints. If either is incomplete,
     // we'll continue reading more bytes.
 
+    // Skip indicator byte at position 0
+    uint8_t varint_pos = 1;
     uint32_t consumed = 0;
-    auto msg_size_varint = ProtoVarInt::parse(&rx_header_buf_[0], rx_header_buf_pos_ - 1, &consumed);
+
+    auto msg_size_varint = ProtoVarInt::parse(&rx_header_buf_[varint_pos], rx_header_buf_pos_ - varint_pos, &consumed);
     if (!msg_size_varint.has_value()) {
       // not enough data there yet
       continue;
@@ -908,7 +928,10 @@ APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) {
     }
     rx_header_parsed_len_ = msg_size_varint->as_uint16();
 
-    auto msg_type_varint = ProtoVarInt::parse(&rx_header_buf_[consumed], rx_header_buf_pos_ - 1 - consumed, &consumed);
+    // Move to next varint position
+    varint_pos += consumed;
+
+    auto msg_type_varint = ProtoVarInt::parse(&rx_header_buf_[varint_pos], rx_header_buf_pos_ - varint_pos, &consumed);
     if (!msg_type_varint.has_value()) {
       // not enough data there yet
       continue;
@@ -1003,65 +1026,86 @@ APIError APIPlaintextFrameHelper::read_packet(ReadPacketBuffer *buffer) {
   return APIError::OK;
 }
 APIError APIPlaintextFrameHelper::write_protobuf_packet(uint16_t type, ProtoWriteBuffer buffer) {
+  std::vector<uint8_t> *raw_buffer = buffer.get_buffer();
+  uint16_t payload_len = static_cast<uint16_t>(raw_buffer->size() - frame_header_padding_);
+
+  // Use write_protobuf_packets with a single packet
+  std::vector<PacketInfo> packets;
+  packets.emplace_back(type, 0, payload_len);
+
+  return write_protobuf_packets(buffer, packets);
+}
+
+APIError APIPlaintextFrameHelper::write_protobuf_packets(ProtoWriteBuffer buffer,
+                                                         const std::vector<PacketInfo> &packets) {
   if (state_ != State::DATA) {
     return APIError::BAD_STATE;
   }
 
-  std::vector<uint8_t> *raw_buffer = buffer.get_buffer();
-  // Message data starts after padding (frame_header_padding_ = 6)
-  uint16_t payload_len = static_cast<uint16_t>(raw_buffer->size() - frame_header_padding_);
-
-  // Calculate varint sizes for header components
-  uint8_t size_varint_len = api::ProtoSize::varint(static_cast<uint32_t>(payload_len));
-  uint8_t type_varint_len = api::ProtoSize::varint(static_cast<uint32_t>(type));
-  uint8_t total_header_len = 1 + size_varint_len + type_varint_len;
-
-  if (total_header_len > frame_header_padding_) {
-    // Header is too large to fit in the padding
-    return APIError::BAD_ARG;
+  if (packets.empty()) {
+    return APIError::OK;
   }
 
-  // Calculate where to start writing the header
-  // The header starts at the latest possible position to minimize unused padding
-  //
-  // Example 1 (small values): total_header_len = 3, header_offset = 6 - 3 = 3
-  // [0-2]  - Unused padding
-  // [3]    - 0x00 indicator byte
-  // [4]    - Payload size varint (1 byte, for sizes 0-127)
-  // [5]    - Message type varint (1 byte, for types 0-127)
-  // [6...] - Actual payload data
-  //
-  // Example 2 (medium values): total_header_len = 4, header_offset = 6 - 4 = 2
-  // [0-1]  - Unused padding
-  // [2]    - 0x00 indicator byte
-  // [3-4]  - Payload size varint (2 bytes, for sizes 128-16383)
-  // [5]    - Message type varint (1 byte, for types 0-127)
-  // [6...] - Actual payload data
-  //
-  // Example 3 (large values): total_header_len = 6, header_offset = 6 - 6 = 0
-  // [0]    - 0x00 indicator byte
-  // [1-3]  - Payload size varint (3 bytes, for sizes 16384-2097151)
-  // [4-5]  - Message type varint (2 bytes, for types 128-32767)
-  // [6...] - Actual payload data
-  uint8_t *buf_start = raw_buffer->data();
-  uint8_t header_offset = frame_header_padding_ - total_header_len;
+  std::vector<uint8_t> *raw_buffer = buffer.get_buffer();
+  this->reusable_iovs_.clear();
+  this->reusable_iovs_.reserve(packets.size());
 
-  // Write the plaintext header
-  buf_start[header_offset] = 0x00;  // indicator
+  for (const auto &packet : packets) {
+    uint16_t type = packet.message_type;
+    uint16_t offset = packet.offset;
+    uint16_t payload_len = packet.payload_size;
 
-  // Encode size varint directly into buffer
-  ProtoVarInt(payload_len).encode_to_buffer_unchecked(buf_start + header_offset + 1, size_varint_len);
+    // Calculate varint sizes for header layout
+    uint8_t size_varint_len = api::ProtoSize::varint(static_cast<uint32_t>(payload_len));
+    uint8_t type_varint_len = api::ProtoSize::varint(static_cast<uint32_t>(type));
+    uint8_t total_header_len = 1 + size_varint_len + type_varint_len;
 
-  // Encode type varint directly into buffer
-  ProtoVarInt(type).encode_to_buffer_unchecked(buf_start + header_offset + 1 + size_varint_len, type_varint_len);
+    // Calculate where to start writing the header
+    // The header starts at the latest possible position to minimize unused padding
+    //
+    // Example 1 (small values): total_header_len = 3, header_offset = 6 - 3 = 3
+    // [0-2]  - Unused padding
+    // [3]    - 0x00 indicator byte
+    // [4]    - Payload size varint (1 byte, for sizes 0-127)
+    // [5]    - Message type varint (1 byte, for types 0-127)
+    // [6...] - Actual payload data
+    //
+    // Example 2 (medium values): total_header_len = 4, header_offset = 6 - 4 = 2
+    // [0-1]  - Unused padding
+    // [2]    - 0x00 indicator byte
+    // [3-4]  - Payload size varint (2 bytes, for sizes 128-16383)
+    // [5]    - Message type varint (1 byte, for types 0-127)
+    // [6...] - Actual payload data
+    //
+    // Example 3 (large values): total_header_len = 6, header_offset = 6 - 6 = 0
+    // [0]    - 0x00 indicator byte
+    // [1-3]  - Payload size varint (3 bytes, for sizes 16384-2097151)
+    // [4-5]  - Message type varint (2 bytes, for types 128-32767)
+    // [6...] - Actual payload data
+    //
+    // The message starts at offset + frame_header_padding_
+    // So we write the header starting at offset + frame_header_padding_ - total_header_len
+    uint8_t *buf_start = raw_buffer->data() + offset;
+    uint32_t header_offset = frame_header_padding_ - total_header_len;
 
-  struct iovec iov;
-  // Point iov_base to the beginning of our header (skip unused padding)
-  // This ensures we only send the actual header and payload, not the empty padding bytes
-  iov.iov_base = buf_start + header_offset;
-  iov.iov_len = total_header_len + payload_len;
+    // Write the plaintext header
+    buf_start[header_offset] = 0x00;  // indicator
 
-  return write_raw_(&iov, 1);
+    // Encode size varint directly into buffer
+    ProtoVarInt(payload_len).encode_to_buffer_unchecked(buf_start + header_offset + 1, size_varint_len);
+
+    // Encode type varint directly into buffer
+    ProtoVarInt(type).encode_to_buffer_unchecked(buf_start + header_offset + 1 + size_varint_len, type_varint_len);
+
+    // Add iovec for this packet (header + payload)
+    struct iovec iov;
+    iov.iov_base = buf_start + header_offset;
+    iov.iov_len = total_header_len + payload_len;
+    this->reusable_iovs_.push_back(iov);
+  }
+
+  // Send all packets in one writev call
+  return write_raw_(this->reusable_iovs_.data(), this->reusable_iovs_.size());
 }
 
 #endif  // USE_API_PLAINTEXT

esphome/components/api/api_frame_helper.h

@@ -27,6 +27,17 @@ struct ReadPacketBuffer {
   uint16_t data_len;
 };
 
+// Packed packet info structure to minimize memory usage
+struct PacketInfo {
+  uint16_t message_type;  // 2 bytes
+  uint16_t offset;        // 2 bytes (sufficient for packet size ~1460 bytes)
+  uint16_t payload_size;  // 2 bytes (up to 65535 bytes)
+  uint16_t padding;       // 2 byte (for alignment)
+
+  PacketInfo(uint16_t type, uint16_t off, uint16_t size)
+      : message_type(type), offset(off), payload_size(size), padding(0) {}
+};
+
 enum class APIError : int {
   OK = 0,
   WOULD_BLOCK = 1001,
@@ -87,6 +98,10 @@ class APIFrameHelper {
   // Give this helper a name for logging
   void set_log_info(std::string info) { info_ = std::move(info); }
   virtual APIError write_protobuf_packet(uint16_t type, ProtoWriteBuffer buffer) = 0;
+  // Write multiple protobuf packets in a single operation
+  // packets contains (message_type, offset, length) for each message in the buffer
+  // The buffer contains all messages with appropriate padding before each
+  virtual APIError write_protobuf_packets(ProtoWriteBuffer buffer, const std::vector<PacketInfo> &packets) = 0;
   // Get the frame header padding required by this protocol
   virtual uint8_t frame_header_padding() = 0;
   // Get the frame footer size required by this protocol
@@ -157,6 +172,9 @@ class APIFrameHelper {
   uint8_t frame_header_padding_{0};
   uint8_t frame_footer_size_{0};
 
+  // Reusable IOV array for write_protobuf_packets to avoid repeated allocations
+  std::vector<struct iovec> reusable_iovs_;
+
   // Receive buffer for reading frame data
   std::vector<uint8_t> rx_buf_;
   uint16_t rx_buf_len_ = 0;
@@ -182,6 +200,7 @@ class APINoiseFrameHelper : public APIFrameHelper {
   APIError loop() override;
   APIError read_packet(ReadPacketBuffer *buffer) override;
   APIError write_protobuf_packet(uint16_t type, ProtoWriteBuffer buffer) override;
+  APIError write_protobuf_packets(ProtoWriteBuffer buffer, const std::vector<PacketInfo> &packets) override;
   // Get the frame header padding required by this protocol
   uint8_t frame_header_padding() override { return frame_header_padding_; }
   // Get the frame footer size required by this protocol
@@ -226,6 +245,7 @@ class APIPlaintextFrameHelper : public APIFrameHelper {
   APIError loop() override;
   APIError read_packet(ReadPacketBuffer *buffer) override;
   APIError write_protobuf_packet(uint16_t type, ProtoWriteBuffer buffer) override;
+  APIError write_protobuf_packets(ProtoWriteBuffer buffer, const std::vector<PacketInfo> &packets) override;
   uint8_t frame_header_padding() override { return frame_header_padding_; }
   // Get the frame footer size required by this protocol
   uint8_t frame_footer_size() override { return frame_footer_size_; }
@@ -233,14 +253,14 @@ class APIPlaintextFrameHelper : public APIFrameHelper {
  protected:
   APIError try_read_frame_(ParsedFrame *frame);
   // Fixed-size header buffer for plaintext protocol:
-  // We only need space for the two varints since we validate the indicator byte separately.
+  // We now store the indicator byte + the two varints.
   // To match noise protocol's maximum message size (UINT16_MAX = 65535), we need:
-  // 3 bytes for message size varint (supports up to 2097151) + 2 bytes for message type varint
+  // 1 byte for indicator + 3 bytes for message size varint (supports up to 2097151) + 2 bytes for message type varint
   //
   // While varints could theoretically be up to 10 bytes each for 64-bit values,
   // attempting to process messages with headers that large would likely crash the
   // ESP32 due to memory constraints.
-  uint8_t rx_header_buf_[5];  // 5 bytes for varints (3 for size + 2 for type)
+  uint8_t rx_header_buf_[6];  // 1 byte indicator + 5 bytes for varints (3 for size + 2 for type)
   uint8_t rx_header_buf_pos_ = 0;
   bool rx_header_parsed_ = false;
   uint16_t rx_header_parsed_type_ = 0;

esphome/components/api/api_pb2.cpp

@@ -782,7 +782,7 @@ bool ConnectResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
 }
 void ConnectResponse::encode(ProtoWriteBuffer buffer) const { buffer.encode_bool(1, this->invalid_password); }
 void ConnectResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 2;  // Pre-calculated maximum size
+  ProtoSize::add_bool_field(total_size, 1, this->invalid_password, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ConnectResponse::dump_to(std::string &out) const {
@@ -1200,7 +1200,9 @@ void BinarySensorStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(3, this->missing_state);
 }
 void BinarySensorStateResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 9;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_bool_field(total_size, 1, this->state, false);
+  ProtoSize::add_bool_field(total_size, 1, this->missing_state, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BinarySensorStateResponse::dump_to(std::string &out) const {
@@ -1410,7 +1412,11 @@ void CoverStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_enum<enums::CoverOperation>(5, this->current_operation);
 }
 void CoverStateResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 27;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->legacy_state), false);
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->position != 0.0f, false);
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->tilt != 0.0f, false);
+  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->current_operation), false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void CoverStateResponse::dump_to(std::string &out) const {
@@ -1496,7 +1502,14 @@ void CoverCommandRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(8, this->stop);
 }
 void CoverCommandRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 29;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_bool_field(total_size, 1, this->has_legacy_command, false);
+  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->legacy_command), false);
+  ProtoSize::add_bool_field(total_size, 1, this->has_position, false);
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->position != 0.0f, false);
+  ProtoSize::add_bool_field(total_size, 1, this->has_tilt, false);
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->tilt != 0.0f, false);
+  ProtoSize::add_bool_field(total_size, 1, this->stop, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void CoverCommandRequest::dump_to(std::string &out) const {
@@ -2822,7 +2835,9 @@ void SensorStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(3, this->missing_state);
 }
 void SensorStateResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 12;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->state != 0.0f, false);
+  ProtoSize::add_bool_field(total_size, 1, this->missing_state, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SensorStateResponse::dump_to(std::string &out) const {
@@ -2988,7 +3003,8 @@ void SwitchStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(2, this->state);
 }
 void SwitchStateResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 7;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_bool_field(total_size, 1, this->state, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SwitchStateResponse::dump_to(std::string &out) const {
@@ -3030,7 +3046,8 @@ void SwitchCommandRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(2, this->state);
 }
 void SwitchCommandRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 7;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_bool_field(total_size, 1, this->state, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SwitchCommandRequest::dump_to(std::string &out) const {
@@ -3234,7 +3251,8 @@ void SubscribeLogsRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(2, this->dump_config);
 }
 void SubscribeLogsRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 8;  // Pre-calculated maximum size
+  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->level), false);
+  ProtoSize::add_bool_field(total_size, 1, this->dump_config, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SubscribeLogsRequest::dump_to(std::string &out) const {
@@ -3338,7 +3356,7 @@ bool NoiseEncryptionSetKeyResponse::decode_varint(uint32_t field_id, ProtoVarInt
 }
 void NoiseEncryptionSetKeyResponse::encode(ProtoWriteBuffer buffer) const { buffer.encode_bool(1, this->success); }
 void NoiseEncryptionSetKeyResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 2;  // Pre-calculated maximum size
+  ProtoSize::add_bool_field(total_size, 1, this->success, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void NoiseEncryptionSetKeyResponse::dump_to(std::string &out) const {
@@ -3599,7 +3617,7 @@ bool GetTimeResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
 }
 void GetTimeResponse::encode(ProtoWriteBuffer buffer) const { buffer.encode_fixed32(1, this->epoch_seconds); }
 void GetTimeResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 5;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->epoch_seconds != 0, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void GetTimeResponse::dump_to(std::string &out) const {
@@ -4090,7 +4108,8 @@ void CameraImageRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(2, this->stream);
 }
 void CameraImageRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 4;  // Pre-calculated maximum size
+  ProtoSize::add_bool_field(total_size, 1, this->single, false);
+  ProtoSize::add_bool_field(total_size, 1, this->stream, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void CameraImageRequest::dump_to(std::string &out) const {
@@ -5079,7 +5098,9 @@ void NumberStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(3, this->missing_state);
 }
 void NumberStateResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 12;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->state != 0.0f, false);
+  ProtoSize::add_bool_field(total_size, 1, this->missing_state, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void NumberStateResponse::dump_to(std::string &out) const {
@@ -5120,7 +5141,8 @@ void NumberCommandRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_float(2, this->state);
 }
 void NumberCommandRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 10;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->state != 0.0f, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void NumberCommandRequest::dump_to(std::string &out) const {
@@ -5519,7 +5541,8 @@ void SirenStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(2, this->state);
 }
 void SirenStateResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 7;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_bool_field(total_size, 1, this->state, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SirenStateResponse::dump_to(std::string &out) const {
@@ -5821,7 +5844,8 @@ void LockStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_enum<enums::LockState>(2, this->state);
 }
 void LockStateResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 11;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->state), false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void LockStateResponse::dump_to(std::string &out) const {
@@ -6028,7 +6052,7 @@ bool ButtonCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
 }
 void ButtonCommandRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_fixed32(1, this->key); }
 void ButtonCommandRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 5;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ButtonCommandRequest::dump_to(std::string &out) const {
@@ -6274,7 +6298,10 @@ void MediaPlayerStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(4, this->muted);
 }
 void MediaPlayerStateResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 18;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->state), false);
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->volume != 0.0f, false);
+  ProtoSize::add_bool_field(total_size, 1, this->muted, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void MediaPlayerStateResponse::dump_to(std::string &out) const {
@@ -6434,7 +6461,7 @@ void SubscribeBluetoothLEAdvertisementsRequest::encode(ProtoWriteBuffer buffer)
   buffer.encode_uint32(1, this->flags);
 }
 void SubscribeBluetoothLEAdvertisementsRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 6;  // Pre-calculated maximum size
+  ProtoSize::add_uint32_field(total_size, 1, this->flags, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SubscribeBluetoothLEAdvertisementsRequest::dump_to(std::string &out) const {
@@ -6743,7 +6770,10 @@ void BluetoothDeviceRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(4, this->address_type);
 }
 void BluetoothDeviceRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 25;  // Pre-calculated maximum size
+  ProtoSize::add_uint64_field(total_size, 1, this->address, false);
+  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->request_type), false);
+  ProtoSize::add_bool_field(total_size, 1, this->has_address_type, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->address_type, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothDeviceRequest::dump_to(std::string &out) const {
@@ -6798,7 +6828,10 @@ void BluetoothDeviceConnectionResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_int32(4, this->error);
 }
 void BluetoothDeviceConnectionResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 25;  // Pre-calculated maximum size
+  ProtoSize::add_uint64_field(total_size, 1, this->address, false);
+  ProtoSize::add_bool_field(total_size, 1, this->connected, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->mtu, false);
+  ProtoSize::add_int32_field(total_size, 1, this->error, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothDeviceConnectionResponse::dump_to(std::string &out) const {
@@ -6837,7 +6870,7 @@ bool BluetoothGATTGetServicesRequest::decode_varint(uint32_t field_id, ProtoVarI
 }
 void BluetoothGATTGetServicesRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_uint64(1, this->address); }
 void BluetoothGATTGetServicesRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 11;  // Pre-calculated maximum size
+  ProtoSize::add_uint64_field(total_size, 1, this->address, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothGATTGetServicesRequest::dump_to(std::string &out) const {
@@ -7100,7 +7133,7 @@ void BluetoothGATTGetServicesDoneResponse::encode(ProtoWriteBuffer buffer) const
   buffer.encode_uint64(1, this->address);
 }
 void BluetoothGATTGetServicesDoneResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 11;  // Pre-calculated maximum size
+  ProtoSize::add_uint64_field(total_size, 1, this->address, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothGATTGetServicesDoneResponse::dump_to(std::string &out) const {
@@ -7132,7 +7165,8 @@ void BluetoothGATTReadRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(2, this->handle);
 }
 void BluetoothGATTReadRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 17;  // Pre-calculated maximum size
+  ProtoSize::add_uint64_field(total_size, 1, this->address, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->handle, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothGATTReadRequest::dump_to(std::string &out) const {
@@ -7287,7 +7321,8 @@ void BluetoothGATTReadDescriptorRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(2, this->handle);
 }
 void BluetoothGATTReadDescriptorRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 17;  // Pre-calculated maximum size
+  ProtoSize::add_uint64_field(total_size, 1, this->address, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->handle, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothGATTReadDescriptorRequest::dump_to(std::string &out) const {
@@ -7383,7 +7418,9 @@ void BluetoothGATTNotifyRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(3, this->enable);
 }
 void BluetoothGATTNotifyRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 19;  // Pre-calculated maximum size
+  ProtoSize::add_uint64_field(total_size, 1, this->address, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->handle, false);
+  ProtoSize::add_bool_field(total_size, 1, this->enable, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothGATTNotifyRequest::dump_to(std::string &out) const {
@@ -7547,7 +7584,9 @@ void BluetoothGATTErrorResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_int32(3, this->error);
 }
 void BluetoothGATTErrorResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 23;  // Pre-calculated maximum size
+  ProtoSize::add_uint64_field(total_size, 1, this->address, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->handle, false);
+  ProtoSize::add_int32_field(total_size, 1, this->error, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothGATTErrorResponse::dump_to(std::string &out) const {
@@ -7589,7 +7628,8 @@ void BluetoothGATTWriteResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(2, this->handle);
 }
 void BluetoothGATTWriteResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 17;  // Pre-calculated maximum size
+  ProtoSize::add_uint64_field(total_size, 1, this->address, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->handle, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothGATTWriteResponse::dump_to(std::string &out) const {
@@ -7626,7 +7666,8 @@ void BluetoothGATTNotifyResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(2, this->handle);
 }
 void BluetoothGATTNotifyResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 17;  // Pre-calculated maximum size
+  ProtoSize::add_uint64_field(total_size, 1, this->address, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->handle, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothGATTNotifyResponse::dump_to(std::string &out) const {
@@ -7668,7 +7709,9 @@ void BluetoothDevicePairingResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_int32(3, this->error);
 }
 void BluetoothDevicePairingResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 19;  // Pre-calculated maximum size
+  ProtoSize::add_uint64_field(total_size, 1, this->address, false);
+  ProtoSize::add_bool_field(total_size, 1, this->paired, false);
+  ProtoSize::add_int32_field(total_size, 1, this->error, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothDevicePairingResponse::dump_to(std::string &out) const {
@@ -7714,7 +7757,9 @@ void BluetoothDeviceUnpairingResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_int32(3, this->error);
 }
 void BluetoothDeviceUnpairingResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 19;  // Pre-calculated maximum size
+  ProtoSize::add_uint64_field(total_size, 1, this->address, false);
+  ProtoSize::add_bool_field(total_size, 1, this->success, false);
+  ProtoSize::add_int32_field(total_size, 1, this->error, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothDeviceUnpairingResponse::dump_to(std::string &out) const {
@@ -7767,7 +7812,9 @@ void BluetoothDeviceClearCacheResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_int32(3, this->error);
 }
 void BluetoothDeviceClearCacheResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 19;  // Pre-calculated maximum size
+  ProtoSize::add_uint64_field(total_size, 1, this->address, false);
+  ProtoSize::add_bool_field(total_size, 1, this->success, false);
+  ProtoSize::add_int32_field(total_size, 1, this->error, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothDeviceClearCacheResponse::dump_to(std::string &out) const {
@@ -7808,7 +7855,8 @@ void BluetoothScannerStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_enum<enums::BluetoothScannerMode>(2, this->mode);
 }
 void BluetoothScannerStateResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 12;  // Pre-calculated maximum size
+  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->state), false);
+  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->mode), false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothScannerStateResponse::dump_to(std::string &out) const {
@@ -7838,7 +7886,7 @@ void BluetoothScannerSetModeRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_enum<enums::BluetoothScannerMode>(1, this->mode);
 }
 void BluetoothScannerSetModeRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 6;  // Pre-calculated maximum size
+  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->mode), false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BluetoothScannerSetModeRequest::dump_to(std::string &out) const {
@@ -7869,7 +7917,8 @@ void SubscribeVoiceAssistantRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(2, this->flags);
 }
 void SubscribeVoiceAssistantRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 8;  // Pre-calculated maximum size
+  ProtoSize::add_bool_field(total_size, 1, this->subscribe, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->flags, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SubscribeVoiceAssistantRequest::dump_to(std::string &out) const {
@@ -7916,7 +7965,9 @@ void VoiceAssistantAudioSettings::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_float(3, this->volume_multiplier);
 }
 void VoiceAssistantAudioSettings::calculate_size(uint32_t &total_size) const {
-  total_size += 17;  // Pre-calculated maximum size
+  ProtoSize::add_uint32_field(total_size, 1, this->noise_suppression_level, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->auto_gain, false);
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->volume_multiplier != 0.0f, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void VoiceAssistantAudioSettings::dump_to(std::string &out) const {
@@ -8031,7 +8082,8 @@ void VoiceAssistantResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(2, this->error);
 }
 void VoiceAssistantResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 8;  // Pre-calculated maximum size
+  ProtoSize::add_uint32_field(total_size, 1, this->port, false);
+  ProtoSize::add_bool_field(total_size, 1, this->error, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void VoiceAssistantResponse::dump_to(std::string &out) const {
@@ -8330,7 +8382,7 @@ bool VoiceAssistantAnnounceFinished::decode_varint(uint32_t field_id, ProtoVarIn
 }
 void VoiceAssistantAnnounceFinished::encode(ProtoWriteBuffer buffer) const { buffer.encode_bool(1, this->success); }
 void VoiceAssistantAnnounceFinished::calculate_size(uint32_t &total_size) const {
-  total_size += 2;  // Pre-calculated maximum size
+  ProtoSize::add_bool_field(total_size, 1, this->success, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void VoiceAssistantAnnounceFinished::dump_to(std::string &out) const {
@@ -8657,7 +8709,8 @@ void AlarmControlPanelStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_enum<enums::AlarmControlPanelState>(2, this->state);
 }
 void AlarmControlPanelStateResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 11;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->state), false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void AlarmControlPanelStateResponse::dump_to(std::string &out) const {
@@ -9115,7 +9168,11 @@ void DateStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(5, this->day);
 }
 void DateStateResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 25;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_bool_field(total_size, 1, this->missing_state, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->year, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->month, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->day, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DateStateResponse::dump_to(std::string &out) const {
@@ -9182,7 +9239,10 @@ void DateCommandRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(4, this->day);
 }
 void DateCommandRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 23;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->year, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->month, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->day, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DateCommandRequest::dump_to(std::string &out) const {
@@ -9349,7 +9409,11 @@ void TimeStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(5, this->second);
 }
 void TimeStateResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 25;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_bool_field(total_size, 1, this->missing_state, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->hour, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->minute, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->second, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void TimeStateResponse::dump_to(std::string &out) const {
@@ -9416,7 +9480,10 @@ void TimeCommandRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(4, this->second);
 }
 void TimeCommandRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 23;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->hour, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->minute, false);
+  ProtoSize::add_uint32_field(total_size, 1, this->second, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void TimeCommandRequest::dump_to(std::string &out) const {
@@ -9783,7 +9850,9 @@ void ValveStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_enum<enums::ValveOperation>(3, this->current_operation);
 }
 void ValveStateResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 16;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->position != 0.0f, false);
+  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->current_operation), false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ValveStateResponse::dump_to(std::string &out) const {
@@ -9840,7 +9909,10 @@ void ValveCommandRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(4, this->stop);
 }
 void ValveCommandRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 14;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_bool_field(total_size, 1, this->has_position, false);
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->position != 0.0f, false);
+  ProtoSize::add_bool_field(total_size, 1, this->stop, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ValveCommandRequest::dump_to(std::string &out) const {
@@ -9995,7 +10067,9 @@ void DateTimeStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(3, this->epoch_seconds);
 }
 void DateTimeStateResponse::calculate_size(uint32_t &total_size) const {
-  total_size += 12;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_bool_field(total_size, 1, this->missing_state, false);
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->epoch_seconds != 0, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DateTimeStateResponse::dump_to(std::string &out) const {
@@ -10036,7 +10110,8 @@ void DateTimeCommandRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(2, this->epoch_seconds);
 }
 void DateTimeCommandRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 10;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->epoch_seconds != 0, false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DateTimeCommandRequest::dump_to(std::string &out) const {
@@ -10318,7 +10393,8 @@ void UpdateCommandRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_enum<enums::UpdateCommand>(2, this->command);
 }
 void UpdateCommandRequest::calculate_size(uint32_t &total_size) const {
-  total_size += 11;  // Pre-calculated maximum size
+  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
+  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->command), false);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void UpdateCommandRequest::dump_to(std::string &out) const {

esphome/components/api/api_pb2_service.cpp

@@ -8,688 +8,12 @@ namespace api {
 
 static const char *const TAG = "api.service";
 
-bool APIServerConnectionBase::send_hello_response(const HelloResponse &msg) {
 #ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_hello_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<HelloResponse>(msg, 2);
-}
-bool APIServerConnectionBase::send_connect_response(const ConnectResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_connect_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ConnectResponse>(msg, 4);
-}
-bool APIServerConnectionBase::send_disconnect_request(const DisconnectRequest &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_disconnect_request: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<DisconnectRequest>(msg, 5);
-}
-bool APIServerConnectionBase::send_disconnect_response(const DisconnectResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_disconnect_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<DisconnectResponse>(msg, 6);
-}
-bool APIServerConnectionBase::send_ping_request(const PingRequest &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_ping_request: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<PingRequest>(msg, 7);
-}
-bool APIServerConnectionBase::send_ping_response(const PingResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_ping_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<PingResponse>(msg, 8);
-}
-bool APIServerConnectionBase::send_device_info_response(const DeviceInfoResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_device_info_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<DeviceInfoResponse>(msg, 10);
-}
-bool APIServerConnectionBase::send_list_entities_done_response(const ListEntitiesDoneResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_done_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesDoneResponse>(msg, 19);
-}
-#ifdef USE_BINARY_SENSOR
-bool APIServerConnectionBase::send_list_entities_binary_sensor_response(const ListEntitiesBinarySensorResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_binary_sensor_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesBinarySensorResponse>(msg, 12);
-}
-#endif
-#ifdef USE_BINARY_SENSOR
-bool APIServerConnectionBase::send_binary_sensor_state_response(const BinarySensorStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_binary_sensor_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<BinarySensorStateResponse>(msg, 21);
-}
-#endif
-#ifdef USE_COVER
-bool APIServerConnectionBase::send_list_entities_cover_response(const ListEntitiesCoverResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_cover_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesCoverResponse>(msg, 13);
-}
-#endif
-#ifdef USE_COVER
-bool APIServerConnectionBase::send_cover_state_response(const CoverStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_cover_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<CoverStateResponse>(msg, 22);
-}
-#endif
-#ifdef USE_COVER
-#endif
-#ifdef USE_FAN
-bool APIServerConnectionBase::send_list_entities_fan_response(const ListEntitiesFanResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_fan_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesFanResponse>(msg, 14);
-}
-#endif
-#ifdef USE_FAN
-bool APIServerConnectionBase::send_fan_state_response(const FanStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_fan_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<FanStateResponse>(msg, 23);
-}
-#endif
-#ifdef USE_FAN
-#endif
-#ifdef USE_LIGHT
-bool APIServerConnectionBase::send_list_entities_light_response(const ListEntitiesLightResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_light_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesLightResponse>(msg, 15);
-}
-#endif
-#ifdef USE_LIGHT
-bool APIServerConnectionBase::send_light_state_response(const LightStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_light_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<LightStateResponse>(msg, 24);
-}
-#endif
-#ifdef USE_LIGHT
-#endif
-#ifdef USE_SENSOR
-bool APIServerConnectionBase::send_list_entities_sensor_response(const ListEntitiesSensorResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_sensor_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesSensorResponse>(msg, 16);
-}
-#endif
-#ifdef USE_SENSOR
-bool APIServerConnectionBase::send_sensor_state_response(const SensorStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_sensor_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<SensorStateResponse>(msg, 25);
-}
-#endif
-#ifdef USE_SWITCH
-bool APIServerConnectionBase::send_list_entities_switch_response(const ListEntitiesSwitchResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_switch_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesSwitchResponse>(msg, 17);
-}
-#endif
-#ifdef USE_SWITCH
-bool APIServerConnectionBase::send_switch_state_response(const SwitchStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_switch_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<SwitchStateResponse>(msg, 26);
-}
-#endif
-#ifdef USE_SWITCH
-#endif
-#ifdef USE_TEXT_SENSOR
-bool APIServerConnectionBase::send_list_entities_text_sensor_response(const ListEntitiesTextSensorResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_text_sensor_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesTextSensorResponse>(msg, 18);
-}
-#endif
-#ifdef USE_TEXT_SENSOR
-bool APIServerConnectionBase::send_text_sensor_state_response(const TextSensorStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_text_sensor_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<TextSensorStateResponse>(msg, 27);
-}
-#endif
-bool APIServerConnectionBase::send_subscribe_logs_response(const SubscribeLogsResponse &msg) {
-  return this->send_message_<SubscribeLogsResponse>(msg, 29);
-}
-#ifdef USE_API_NOISE
-#endif
-#ifdef USE_API_NOISE
-bool APIServerConnectionBase::send_noise_encryption_set_key_response(const NoiseEncryptionSetKeyResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_noise_encryption_set_key_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<NoiseEncryptionSetKeyResponse>(msg, 125);
-}
-#endif
-bool APIServerConnectionBase::send_homeassistant_service_response(const HomeassistantServiceResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_homeassistant_service_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<HomeassistantServiceResponse>(msg, 35);
-}
-bool APIServerConnectionBase::send_subscribe_home_assistant_state_response(
-    const SubscribeHomeAssistantStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_subscribe_home_assistant_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<SubscribeHomeAssistantStateResponse>(msg, 39);
-}
-bool APIServerConnectionBase::send_get_time_request(const GetTimeRequest &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_get_time_request: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<GetTimeRequest>(msg, 36);
-}
-bool APIServerConnectionBase::send_get_time_response(const GetTimeResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_get_time_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<GetTimeResponse>(msg, 37);
-}
-bool APIServerConnectionBase::send_list_entities_services_response(const ListEntitiesServicesResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_services_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesServicesResponse>(msg, 41);
-}
-#ifdef USE_ESP32_CAMERA
-bool APIServerConnectionBase::send_list_entities_camera_response(const ListEntitiesCameraResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_camera_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesCameraResponse>(msg, 43);
-}
-#endif
-#ifdef USE_ESP32_CAMERA
-bool APIServerConnectionBase::send_camera_image_response(const CameraImageResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_camera_image_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<CameraImageResponse>(msg, 44);
-}
-#endif
-#ifdef USE_ESP32_CAMERA
-#endif
-#ifdef USE_CLIMATE
-bool APIServerConnectionBase::send_list_entities_climate_response(const ListEntitiesClimateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_climate_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesClimateResponse>(msg, 46);
-}
-#endif
-#ifdef USE_CLIMATE
-bool APIServerConnectionBase::send_climate_state_response(const ClimateStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_climate_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ClimateStateResponse>(msg, 47);
-}
-#endif
-#ifdef USE_CLIMATE
-#endif
-#ifdef USE_NUMBER
-bool APIServerConnectionBase::send_list_entities_number_response(const ListEntitiesNumberResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_number_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesNumberResponse>(msg, 49);
-}
-#endif
-#ifdef USE_NUMBER
-bool APIServerConnectionBase::send_number_state_response(const NumberStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_number_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<NumberStateResponse>(msg, 50);
-}
-#endif
-#ifdef USE_NUMBER
-#endif
-#ifdef USE_SELECT
-bool APIServerConnectionBase::send_list_entities_select_response(const ListEntitiesSelectResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_select_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesSelectResponse>(msg, 52);
-}
-#endif
-#ifdef USE_SELECT
-bool APIServerConnectionBase::send_select_state_response(const SelectStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_select_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<SelectStateResponse>(msg, 53);
-}
-#endif
-#ifdef USE_SELECT
-#endif
-#ifdef USE_SIREN
-bool APIServerConnectionBase::send_list_entities_siren_response(const ListEntitiesSirenResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_siren_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesSirenResponse>(msg, 55);
-}
-#endif
-#ifdef USE_SIREN
-bool APIServerConnectionBase::send_siren_state_response(const SirenStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_siren_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<SirenStateResponse>(msg, 56);
-}
-#endif
-#ifdef USE_SIREN
-#endif
-#ifdef USE_LOCK
-bool APIServerConnectionBase::send_list_entities_lock_response(const ListEntitiesLockResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_lock_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesLockResponse>(msg, 58);
+void APIServerConnectionBase::log_send_message_(const char *name, const std::string &dump) {
+  ESP_LOGVV(TAG, "send_message %s: %s", name, dump.c_str());
 }
 #endif
-#ifdef USE_LOCK
-bool APIServerConnectionBase::send_lock_state_response(const LockStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_lock_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<LockStateResponse>(msg, 59);
-}
-#endif
-#ifdef USE_LOCK
-#endif
-#ifdef USE_BUTTON
-bool APIServerConnectionBase::send_list_entities_button_response(const ListEntitiesButtonResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_button_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesButtonResponse>(msg, 61);
-}
-#endif
-#ifdef USE_BUTTON
-#endif
-#ifdef USE_MEDIA_PLAYER
-bool APIServerConnectionBase::send_list_entities_media_player_response(const ListEntitiesMediaPlayerResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_media_player_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesMediaPlayerResponse>(msg, 63);
-}
-#endif
-#ifdef USE_MEDIA_PLAYER
-bool APIServerConnectionBase::send_media_player_state_response(const MediaPlayerStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_media_player_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<MediaPlayerStateResponse>(msg, 64);
-}
-#endif
-#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());
-#endif
-  return this->send_message_<BluetoothLEAdvertisementResponse>(msg, 67);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-bool APIServerConnectionBase::send_bluetooth_le_raw_advertisements_response(
-    const BluetoothLERawAdvertisementsResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_bluetooth_le_raw_advertisements_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<BluetoothLERawAdvertisementsResponse>(msg, 93);
-}
-#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
-#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
-#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
-#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());
-#endif
-  return this->send_message_<BluetoothDeviceClearCacheResponse>(msg, 88);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-bool APIServerConnectionBase::send_bluetooth_scanner_state_response(const BluetoothScannerStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_bluetooth_scanner_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<BluetoothScannerStateResponse>(msg, 126);
-}
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-#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
-#ifdef USE_VOICE_ASSISTANT
-bool APIServerConnectionBase::send_voice_assistant_audio(const VoiceAssistantAudio &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_voice_assistant_audio: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<VoiceAssistantAudio>(msg, 106);
-}
-#endif
-#ifdef USE_VOICE_ASSISTANT
-#endif
-#ifdef USE_VOICE_ASSISTANT
-#endif
-#ifdef USE_VOICE_ASSISTANT
-bool APIServerConnectionBase::send_voice_assistant_announce_finished(const VoiceAssistantAnnounceFinished &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_voice_assistant_announce_finished: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<VoiceAssistantAnnounceFinished>(msg, 120);
-}
-#endif
-#ifdef USE_VOICE_ASSISTANT
-#endif
-#ifdef USE_VOICE_ASSISTANT
-bool APIServerConnectionBase::send_voice_assistant_configuration_response(
-    const VoiceAssistantConfigurationResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_voice_assistant_configuration_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<VoiceAssistantConfigurationResponse>(msg, 122);
-}
-#endif
-#ifdef USE_VOICE_ASSISTANT
-#endif
-#ifdef USE_ALARM_CONTROL_PANEL
-bool APIServerConnectionBase::send_list_entities_alarm_control_panel_response(
-    const ListEntitiesAlarmControlPanelResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_alarm_control_panel_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesAlarmControlPanelResponse>(msg, 94);
-}
-#endif
-#ifdef USE_ALARM_CONTROL_PANEL
-bool APIServerConnectionBase::send_alarm_control_panel_state_response(const AlarmControlPanelStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_alarm_control_panel_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<AlarmControlPanelStateResponse>(msg, 95);
-}
-#endif
-#ifdef USE_ALARM_CONTROL_PANEL
-#endif
-#ifdef USE_TEXT
-bool APIServerConnectionBase::send_list_entities_text_response(const ListEntitiesTextResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_text_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesTextResponse>(msg, 97);
-}
-#endif
-#ifdef USE_TEXT
-bool APIServerConnectionBase::send_text_state_response(const TextStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_text_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<TextStateResponse>(msg, 98);
-}
-#endif
-#ifdef USE_TEXT
-#endif
-#ifdef USE_DATETIME_DATE
-bool APIServerConnectionBase::send_list_entities_date_response(const ListEntitiesDateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_date_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesDateResponse>(msg, 100);
-}
-#endif
-#ifdef USE_DATETIME_DATE
-bool APIServerConnectionBase::send_date_state_response(const DateStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_date_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<DateStateResponse>(msg, 101);
-}
-#endif
-#ifdef USE_DATETIME_DATE
-#endif
-#ifdef USE_DATETIME_TIME
-bool APIServerConnectionBase::send_list_entities_time_response(const ListEntitiesTimeResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_time_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesTimeResponse>(msg, 103);
-}
-#endif
-#ifdef USE_DATETIME_TIME
-bool APIServerConnectionBase::send_time_state_response(const TimeStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_time_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<TimeStateResponse>(msg, 104);
-}
-#endif
-#ifdef USE_DATETIME_TIME
-#endif
-#ifdef USE_EVENT
-bool APIServerConnectionBase::send_list_entities_event_response(const ListEntitiesEventResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_event_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesEventResponse>(msg, 107);
-}
-#endif
-#ifdef USE_EVENT
-bool APIServerConnectionBase::send_event_response(const EventResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_event_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<EventResponse>(msg, 108);
-}
-#endif
-#ifdef USE_VALVE
-bool APIServerConnectionBase::send_list_entities_valve_response(const ListEntitiesValveResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_valve_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesValveResponse>(msg, 109);
-}
-#endif
-#ifdef USE_VALVE
-bool APIServerConnectionBase::send_valve_state_response(const ValveStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_valve_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ValveStateResponse>(msg, 110);
-}
-#endif
-#ifdef USE_VALVE
-#endif
-#ifdef USE_DATETIME_DATETIME
-bool APIServerConnectionBase::send_list_entities_date_time_response(const ListEntitiesDateTimeResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_date_time_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesDateTimeResponse>(msg, 112);
-}
-#endif
-#ifdef USE_DATETIME_DATETIME
-bool APIServerConnectionBase::send_date_time_state_response(const DateTimeStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_date_time_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<DateTimeStateResponse>(msg, 113);
-}
-#endif
-#ifdef USE_DATETIME_DATETIME
-#endif
-#ifdef USE_UPDATE
-bool APIServerConnectionBase::send_list_entities_update_response(const ListEntitiesUpdateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_update_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesUpdateResponse>(msg, 116);
-}
-#endif
-#ifdef USE_UPDATE
-bool APIServerConnectionBase::send_update_state_response(const UpdateStateResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_update_state_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<UpdateStateResponse>(msg, 117);
-}
-#endif
-#ifdef USE_UPDATE
-#endif
+
 bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
   switch (msg_type) {
     case 1: {
@@ -1273,25 +597,25 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
 
 void APIServerConnection::on_hello_request(const HelloRequest &msg) {
   HelloResponse ret = this->hello(msg);
-  if (!this->send_hello_response(ret)) {
+  if (!this->send_message(ret)) {
     this->on_fatal_error();
   }
 }
 void APIServerConnection::on_connect_request(const ConnectRequest &msg) {
   ConnectResponse ret = this->connect(msg);
-  if (!this->send_connect_response(ret)) {
+  if (!this->send_message(ret)) {
     this->on_fatal_error();
   }
 }
 void APIServerConnection::on_disconnect_request(const DisconnectRequest &msg) {
   DisconnectResponse ret = this->disconnect(msg);
-  if (!this->send_disconnect_response(ret)) {
+  if (!this->send_message(ret)) {
     this->on_fatal_error();
   }
 }
 void APIServerConnection::on_ping_request(const PingRequest &msg) {
   PingResponse ret = this->ping(msg);
-  if (!this->send_ping_response(ret)) {
+  if (!this->send_message(ret)) {
     this->on_fatal_error();
   }
 }
@@ -1301,7 +625,7 @@ void APIServerConnection::on_device_info_request(const DeviceInfoRequest &msg) {
     return;
   }
   DeviceInfoResponse ret = this->device_info(msg);
-  if (!this->send_device_info_response(ret)) {
+  if (!this->send_message(ret)) {
     this->on_fatal_error();
   }
 }
@@ -1367,7 +691,7 @@ void APIServerConnection::on_get_time_request(const GetTimeRequest &msg) {
     return;
   }
   GetTimeResponse ret = this->get_time(msg);
-  if (!this->send_get_time_response(ret)) {
+  if (!this->send_message(ret)) {
     this->on_fatal_error();
   }
 }
@@ -1393,7 +717,7 @@ void APIServerConnection::on_noise_encryption_set_key_request(const NoiseEncrypt
     return;
   }
   NoiseEncryptionSetKeyResponse ret = this->noise_encryption_set_key(msg);
-  if (!this->send_noise_encryption_set_key_response(ret)) {
+  if (!this->send_message(ret)) {
     this->on_fatal_error();
   }
 }
@@ -1749,7 +1073,7 @@ void APIServerConnection::on_subscribe_bluetooth_connections_free_request(
     return;
   }
   BluetoothConnectionsFreeResponse ret = this->subscribe_bluetooth_connections_free(msg);
-  if (!this->send_bluetooth_connections_free_response(ret)) {
+  if (!this->send_message(ret)) {
     this->on_fatal_error();
   }
 }
@@ -1805,7 +1129,7 @@ void APIServerConnection::on_voice_assistant_configuration_request(const VoiceAs
     return;
   }
   VoiceAssistantConfigurationResponse ret = this->voice_assistant_get_configuration(msg);
-  if (!this->send_voice_assistant_configuration_response(ret)) {
+  if (!this->send_message(ret)) {
     this->on_fatal_error();
   }
 }

esphome/components/api/api_pb2_service.h

@@ -10,162 +10,94 @@ namespace api {
 
 class APIServerConnectionBase : public ProtoService {
  public:
+#ifdef HAS_PROTO_MESSAGE_DUMP
+ protected:
+  void log_send_message_(const char *name, const std::string &dump);
+
+ public:
+#endif
+
+  template<typename T> bool send_message(const T &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+    this->log_send_message_(T::message_name(), msg.dump());
+#endif
+    return this->send_message_(msg, T::MESSAGE_TYPE);
+  }
+
   virtual void on_hello_request(const HelloRequest &value){};
-  bool send_hello_response(const HelloResponse &msg);
+
   virtual void on_connect_request(const ConnectRequest &value){};
-  bool send_connect_response(const ConnectResponse &msg);
-  bool send_disconnect_request(const DisconnectRequest &msg);
+
   virtual void on_disconnect_request(const DisconnectRequest &value){};
-  bool send_disconnect_response(const DisconnectResponse &msg);
   virtual void on_disconnect_response(const DisconnectResponse &value){};
-  bool send_ping_request(const PingRequest &msg);
   virtual void on_ping_request(const PingRequest &value){};
-  bool send_ping_response(const PingResponse &msg);
   virtual void on_ping_response(const PingResponse &value){};
   virtual void on_device_info_request(const DeviceInfoRequest &value){};
-  bool send_device_info_response(const DeviceInfoResponse &msg);
+
   virtual void on_list_entities_request(const ListEntitiesRequest &value){};
-  bool send_list_entities_done_response(const ListEntitiesDoneResponse &msg);
+
   virtual void on_subscribe_states_request(const SubscribeStatesRequest &value){};
-#ifdef USE_BINARY_SENSOR
-  bool send_list_entities_binary_sensor_response(const ListEntitiesBinarySensorResponse &msg);
-#endif
-#ifdef USE_BINARY_SENSOR
-  bool send_binary_sensor_state_response(const BinarySensorStateResponse &msg);
-#endif
-#ifdef USE_COVER
-  bool send_list_entities_cover_response(const ListEntitiesCoverResponse &msg);
-#endif
-#ifdef USE_COVER
-  bool send_cover_state_response(const CoverStateResponse &msg);
-#endif
+
 #ifdef USE_COVER
   virtual void on_cover_command_request(const CoverCommandRequest &value){};
 #endif
-#ifdef USE_FAN
-  bool send_list_entities_fan_response(const ListEntitiesFanResponse &msg);
-#endif
-#ifdef USE_FAN
-  bool send_fan_state_response(const FanStateResponse &msg);
-#endif
+
 #ifdef USE_FAN
   virtual void on_fan_command_request(const FanCommandRequest &value){};
 #endif
-#ifdef USE_LIGHT
-  bool send_list_entities_light_response(const ListEntitiesLightResponse &msg);
-#endif
-#ifdef USE_LIGHT
-  bool send_light_state_response(const LightStateResponse &msg);
-#endif
+
 #ifdef USE_LIGHT
   virtual void on_light_command_request(const LightCommandRequest &value){};
 #endif
-#ifdef USE_SENSOR
-  bool send_list_entities_sensor_response(const ListEntitiesSensorResponse &msg);
-#endif
-#ifdef USE_SENSOR
-  bool send_sensor_state_response(const SensorStateResponse &msg);
-#endif
-#ifdef USE_SWITCH
-  bool send_list_entities_switch_response(const ListEntitiesSwitchResponse &msg);
-#endif
-#ifdef USE_SWITCH
-  bool send_switch_state_response(const SwitchStateResponse &msg);
-#endif
+
 #ifdef USE_SWITCH
   virtual void on_switch_command_request(const SwitchCommandRequest &value){};
 #endif
-#ifdef USE_TEXT_SENSOR
-  bool send_list_entities_text_sensor_response(const ListEntitiesTextSensorResponse &msg);
-#endif
-#ifdef USE_TEXT_SENSOR
-  bool send_text_sensor_state_response(const TextSensorStateResponse &msg);
-#endif
+
   virtual void on_subscribe_logs_request(const SubscribeLogsRequest &value){};
-  bool send_subscribe_logs_response(const SubscribeLogsResponse &msg);
+
 #ifdef USE_API_NOISE
   virtual void on_noise_encryption_set_key_request(const NoiseEncryptionSetKeyRequest &value){};
 #endif
-#ifdef USE_API_NOISE
-  bool send_noise_encryption_set_key_response(const NoiseEncryptionSetKeyResponse &msg);
-#endif
+
   virtual void on_subscribe_homeassistant_services_request(const SubscribeHomeassistantServicesRequest &value){};
-  bool send_homeassistant_service_response(const HomeassistantServiceResponse &msg);
+
   virtual void on_subscribe_home_assistant_states_request(const SubscribeHomeAssistantStatesRequest &value){};
-  bool send_subscribe_home_assistant_state_response(const SubscribeHomeAssistantStateResponse &msg);
+
   virtual void on_home_assistant_state_response(const HomeAssistantStateResponse &value){};
-  bool send_get_time_request(const GetTimeRequest &msg);
   virtual void on_get_time_request(const GetTimeRequest &value){};
-  bool send_get_time_response(const GetTimeResponse &msg);
   virtual void on_get_time_response(const GetTimeResponse &value){};
-  bool send_list_entities_services_response(const ListEntitiesServicesResponse &msg);
+
   virtual void on_execute_service_request(const ExecuteServiceRequest &value){};
-#ifdef USE_ESP32_CAMERA
-  bool send_list_entities_camera_response(const ListEntitiesCameraResponse &msg);
-#endif
-#ifdef USE_ESP32_CAMERA
-  bool send_camera_image_response(const CameraImageResponse &msg);
-#endif
+
 #ifdef USE_ESP32_CAMERA
   virtual void on_camera_image_request(const CameraImageRequest &value){};
 #endif
-#ifdef USE_CLIMATE
-  bool send_list_entities_climate_response(const ListEntitiesClimateResponse &msg);
-#endif
-#ifdef USE_CLIMATE
-  bool send_climate_state_response(const ClimateStateResponse &msg);
-#endif
+
 #ifdef USE_CLIMATE
   virtual void on_climate_command_request(const ClimateCommandRequest &value){};
 #endif
-#ifdef USE_NUMBER
-  bool send_list_entities_number_response(const ListEntitiesNumberResponse &msg);
-#endif
-#ifdef USE_NUMBER
-  bool send_number_state_response(const NumberStateResponse &msg);
-#endif
+
 #ifdef USE_NUMBER
   virtual void on_number_command_request(const NumberCommandRequest &value){};
 #endif
-#ifdef USE_SELECT
-  bool send_list_entities_select_response(const ListEntitiesSelectResponse &msg);
-#endif
-#ifdef USE_SELECT
-  bool send_select_state_response(const SelectStateResponse &msg);
-#endif
+
 #ifdef USE_SELECT
   virtual void on_select_command_request(const SelectCommandRequest &value){};
 #endif
-#ifdef USE_SIREN
-  bool send_list_entities_siren_response(const ListEntitiesSirenResponse &msg);
-#endif
-#ifdef USE_SIREN
-  bool send_siren_state_response(const SirenStateResponse &msg);
-#endif
+
 #ifdef USE_SIREN
   virtual void on_siren_command_request(const SirenCommandRequest &value){};
 #endif
-#ifdef USE_LOCK
-  bool send_list_entities_lock_response(const ListEntitiesLockResponse &msg);
-#endif
-#ifdef USE_LOCK
-  bool send_lock_state_response(const LockStateResponse &msg);
-#endif
+
 #ifdef USE_LOCK
   virtual void on_lock_command_request(const LockCommandRequest &value){};
 #endif
-#ifdef USE_BUTTON
-  bool send_list_entities_button_response(const ListEntitiesButtonResponse &msg);
-#endif
+
 #ifdef USE_BUTTON
   virtual void on_button_command_request(const ButtonCommandRequest &value){};
 #endif
-#ifdef USE_MEDIA_PLAYER
-  bool send_list_entities_media_player_response(const ListEntitiesMediaPlayerResponse &msg);
-#endif
-#ifdef USE_MEDIA_PLAYER
-  bool send_media_player_state_response(const MediaPlayerStateResponse &msg);
-#endif
+
 #ifdef USE_MEDIA_PLAYER
   virtual void on_media_player_command_request(const MediaPlayerCommandRequest &value){};
 #endif
@@ -173,33 +105,19 @@ class APIServerConnectionBase : public ProtoService {
   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
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_le_raw_advertisements_response(const BluetoothLERawAdvertisementsResponse &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
@@ -212,49 +130,23 @@ class APIServerConnectionBase : public ProtoService {
 #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
-#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
-#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
+
 #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
-#ifdef USE_BLUETOOTH_PROXY
-  bool send_bluetooth_scanner_state_response(const BluetoothScannerStateResponse &msg);
-#endif
+
 #ifdef USE_BLUETOOTH_PROXY
   virtual void on_bluetooth_scanner_set_mode_request(const BluetoothScannerSetModeRequest &value){};
 #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
@@ -262,7 +154,6 @@ class APIServerConnectionBase : public ProtoService {
   virtual void on_voice_assistant_event_response(const VoiceAssistantEventResponse &value){};
 #endif
 #ifdef USE_VOICE_ASSISTANT
-  bool send_voice_assistant_audio(const VoiceAssistantAudio &msg);
   virtual void on_voice_assistant_audio(const VoiceAssistantAudio &value){};
 #endif
 #ifdef USE_VOICE_ASSISTANT
@@ -271,84 +162,39 @@ class APIServerConnectionBase : public ProtoService {
 #ifdef USE_VOICE_ASSISTANT
   virtual void on_voice_assistant_announce_request(const VoiceAssistantAnnounceRequest &value){};
 #endif
-#ifdef USE_VOICE_ASSISTANT
-  bool send_voice_assistant_announce_finished(const VoiceAssistantAnnounceFinished &msg);
-#endif
+
 #ifdef USE_VOICE_ASSISTANT
   virtual void on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &value){};
 #endif
-#ifdef USE_VOICE_ASSISTANT
-  bool send_voice_assistant_configuration_response(const VoiceAssistantConfigurationResponse &msg);
-#endif
+
 #ifdef USE_VOICE_ASSISTANT
   virtual void on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &value){};
 #endif
-#ifdef USE_ALARM_CONTROL_PANEL
-  bool send_list_entities_alarm_control_panel_response(const ListEntitiesAlarmControlPanelResponse &msg);
-#endif
-#ifdef USE_ALARM_CONTROL_PANEL
-  bool send_alarm_control_panel_state_response(const AlarmControlPanelStateResponse &msg);
-#endif
+
 #ifdef USE_ALARM_CONTROL_PANEL
   virtual void on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &value){};
 #endif
-#ifdef USE_TEXT
-  bool send_list_entities_text_response(const ListEntitiesTextResponse &msg);
-#endif
-#ifdef USE_TEXT
-  bool send_text_state_response(const TextStateResponse &msg);
-#endif
+
 #ifdef USE_TEXT
   virtual void on_text_command_request(const TextCommandRequest &value){};
 #endif
-#ifdef USE_DATETIME_DATE
-  bool send_list_entities_date_response(const ListEntitiesDateResponse &msg);
-#endif
-#ifdef USE_DATETIME_DATE
-  bool send_date_state_response(const DateStateResponse &msg);
-#endif
+
 #ifdef USE_DATETIME_DATE
   virtual void on_date_command_request(const DateCommandRequest &value){};
 #endif
-#ifdef USE_DATETIME_TIME
-  bool send_list_entities_time_response(const ListEntitiesTimeResponse &msg);
-#endif
-#ifdef USE_DATETIME_TIME
-  bool send_time_state_response(const TimeStateResponse &msg);
-#endif
+
 #ifdef USE_DATETIME_TIME
   virtual void on_time_command_request(const TimeCommandRequest &value){};
 #endif
-#ifdef USE_EVENT
-  bool send_list_entities_event_response(const ListEntitiesEventResponse &msg);
-#endif
-#ifdef USE_EVENT
-  bool send_event_response(const EventResponse &msg);
-#endif
-#ifdef USE_VALVE
-  bool send_list_entities_valve_response(const ListEntitiesValveResponse &msg);
-#endif
-#ifdef USE_VALVE
-  bool send_valve_state_response(const ValveStateResponse &msg);
-#endif
+
 #ifdef USE_VALVE
   virtual void on_valve_command_request(const ValveCommandRequest &value){};
 #endif
-#ifdef USE_DATETIME_DATETIME
-  bool send_list_entities_date_time_response(const ListEntitiesDateTimeResponse &msg);
-#endif
-#ifdef USE_DATETIME_DATETIME
-  bool send_date_time_state_response(const DateTimeStateResponse &msg);
-#endif
+
 #ifdef USE_DATETIME_DATETIME
   virtual void on_date_time_command_request(const DateTimeCommandRequest &value){};
 #endif
-#ifdef USE_UPDATE
-  bool send_list_entities_update_response(const ListEntitiesUpdateResponse &msg);
-#endif
-#ifdef USE_UPDATE
-  bool send_update_state_response(const UpdateStateResponse &msg);
-#endif
+
 #ifdef USE_UPDATE
   virtual void on_update_command_request(const UpdateCommandRequest &value){};
 #endif

esphome/components/api/api_server.cpp

@@ -24,7 +24,11 @@ static const char *const TAG = "api";
 // APIServer
 APIServer *global_api_server = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
-APIServer::APIServer() { global_api_server = this; }
+APIServer::APIServer() {
+  global_api_server = this;
+  // Pre-allocate shared write buffer
+  shared_write_buffer_.reserve(64);
+}
 
 void APIServer::setup() {
   ESP_LOGCONFIG(TAG, "Running setup");
@@ -157,7 +161,7 @@ void APIServer::loop() {
     const uint32_t now = millis();
     if (!this->is_connected()) {
       if (now - this->last_connected_ > this->reboot_timeout_) {
-        ESP_LOGE(TAG, "No client connected to API. Rebooting...");
+        ESP_LOGE(TAG, "No client connected; rebooting");
         App.reboot();
       }
       this->status_set_warning();
@@ -218,8 +222,9 @@ void APIServer::handle_disconnect(APIConnection *conn) {}
 void APIServer::on_binary_sensor_update(binary_sensor::BinarySensor *obj, bool state) {
   if (obj->is_internal())
     return;
+  bool use_current = (state == obj->state);
   for (auto &c : this->clients_)
-    c->send_binary_sensor_state(obj, state);
+    use_current ? c->send_binary_sensor_state(obj) : c->send_binary_sensor_state(obj, state);
 }
 #endif
 
@@ -254,8 +259,9 @@ void APIServer::on_light_update(light::LightState *obj) {
 void APIServer::on_sensor_update(sensor::Sensor *obj, float state) {
   if (obj->is_internal())
     return;
+  bool use_current = (state == obj->state);
   for (auto &c : this->clients_)
-    c->send_sensor_state(obj, state);
+    use_current ? c->send_sensor_state(obj) : c->send_sensor_state(obj, state);
 }
 #endif
 
@@ -263,8 +269,9 @@ void APIServer::on_sensor_update(sensor::Sensor *obj, float state) {
 void APIServer::on_switch_update(switch_::Switch *obj, bool state) {
   if (obj->is_internal())
     return;
+  bool use_current = (state == obj->state);
   for (auto &c : this->clients_)
-    c->send_switch_state(obj, state);
+    use_current ? c->send_switch_state(obj) : c->send_switch_state(obj, state);
 }
 #endif
 
@@ -272,8 +279,9 @@ void APIServer::on_switch_update(switch_::Switch *obj, bool state) {
 void APIServer::on_text_sensor_update(text_sensor::TextSensor *obj, const std::string &state) {
   if (obj->is_internal())
     return;
+  bool use_current = (state == obj->state);
   for (auto &c : this->clients_)
-    c->send_text_sensor_state(obj, state);
+    use_current ? c->send_text_sensor_state(obj) : c->send_text_sensor_state(obj, state);
 }
 #endif
 
@@ -290,8 +298,9 @@ void APIServer::on_climate_update(climate::Climate *obj) {
 void APIServer::on_number_update(number::Number *obj, float state) {
   if (obj->is_internal())
     return;
+  bool use_current = (state == obj->state);
   for (auto &c : this->clients_)
-    c->send_number_state(obj, state);
+    use_current ? c->send_number_state(obj) : c->send_number_state(obj, state);
 }
 #endif
 
@@ -326,8 +335,9 @@ void APIServer::on_datetime_update(datetime::DateTimeEntity *obj) {
 void APIServer::on_text_update(text::Text *obj, const std::string &state) {
   if (obj->is_internal())
     return;
+  bool use_current = (state == obj->state);
   for (auto &c : this->clients_)
-    c->send_text_state(obj, state);
+    use_current ? c->send_text_state(obj) : c->send_text_state(obj, state);
 }
 #endif
 
@@ -335,8 +345,9 @@ void APIServer::on_text_update(text::Text *obj, const std::string &state) {
 void APIServer::on_select_update(select::Select *obj, const std::string &state, size_t index) {
   if (obj->is_internal())
     return;
+  bool use_current = (state == obj->state);
   for (auto &c : this->clients_)
-    c->send_select_state(obj, state);
+    use_current ? c->send_select_state(obj) : c->send_select_state(obj, state);
 }
 #endif
 
@@ -345,7 +356,7 @@ void APIServer::on_lock_update(lock::Lock *obj) {
   if (obj->is_internal())
     return;
   for (auto &c : this->clients_)
-    c->send_lock_state(obj, obj->state);
+    c->send_lock_state(obj);
 }
 #endif
 
@@ -396,6 +407,8 @@ void APIServer::set_port(uint16_t port) { this->port_ = port; }
 
 void APIServer::set_password(const std::string &password) { this->password_ = password; }
 
+void APIServer::set_batch_delay(uint32_t batch_delay) { this->batch_delay_ = batch_delay; }
+
 void APIServer::send_homeassistant_service_call(const HomeassistantServiceResponse &call) {
   for (auto &client : this->clients_) {
     client->send_homeassistant_service_call(call);
@@ -454,7 +467,7 @@ bool APIServer::save_noise_psk(psk_t psk, bool make_active) {
       ESP_LOGW(TAG, "Disconnecting all clients to reset connections");
       this->set_noise_psk(psk);
       for (auto &c : this->clients_) {
-        c->send_disconnect_request(DisconnectRequest());
+        c->send_message(DisconnectRequest());
       }
     });
   }
@@ -475,7 +488,7 @@ bool APIServer::is_connected() const { return !this->clients_.empty(); }
 
 void APIServer::on_shutdown() {
   for (auto &c : this->clients_) {
-    c->send_disconnect_request(DisconnectRequest());
+    c->send_message(DisconnectRequest());
   }
   delay(10);
 }

esphome/components/api/api_server.h

@@ -39,6 +39,11 @@ class APIServer : public Component, public Controller {
   void set_port(uint16_t port);
   void set_password(const std::string &password);
   void set_reboot_timeout(uint32_t reboot_timeout);
+  void set_batch_delay(uint32_t batch_delay);
+  uint32_t get_batch_delay() const { return batch_delay_; }
+
+  // Get reference to shared buffer for API connections
+  std::vector<uint8_t> &get_shared_buffer_ref() { return shared_write_buffer_; }
 
 #ifdef USE_API_NOISE
   bool save_noise_psk(psk_t psk, bool make_active = true);
@@ -139,9 +144,11 @@ class APIServer : public Component, public Controller {
   std::unique_ptr<socket::Socket> socket_ = nullptr;
   uint16_t port_{6053};
   uint32_t reboot_timeout_{300000};
+  uint32_t batch_delay_{100};
   uint32_t last_connected_{0};
   std::vector<std::unique_ptr<APIConnection>> clients_;
   std::string password_;
+  std::vector<uint8_t> shared_write_buffer_;  // Shared proto write buffer for all connections
   std::vector<HomeAssistantStateSubscription> state_subs_;
   std::vector<UserServiceDescriptor *> user_services_;
   Trigger<std::string, std::string> *client_connected_trigger_ = new Trigger<std::string, std::string>();

esphome/components/api/list_entities.cpp

@@ -73,7 +73,7 @@ bool ListEntitiesIterator::on_end() { return this->client_->send_list_info_done(
 ListEntitiesIterator::ListEntitiesIterator(APIConnection *client) : client_(client) {}
 bool ListEntitiesIterator::on_service(UserServiceDescriptor *service) {
   auto resp = service->encode_list_service_response();
-  return this->client_->send_list_entities_services_response(resp);
+  return this->client_->send_message(resp);
 }
 
 #ifdef USE_ESP32_CAMERA

esphome/components/api/proto.h

@@ -360,11 +360,11 @@ class ProtoService {
    * @return A ProtoWriteBuffer object with the reserved size.
    */
   virtual ProtoWriteBuffer create_buffer(uint32_t reserve_size) = 0;
-  virtual bool send_buffer(ProtoWriteBuffer buffer, uint32_t message_type) = 0;
+  virtual bool send_buffer(ProtoWriteBuffer buffer, uint16_t message_type) = 0;
   virtual bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) = 0;
 
   // Optimized method that pre-allocates buffer based on message size
-  template<class C> bool send_message_(const C &msg, uint32_t message_type) {
+  bool send_message_(const ProtoMessage &msg, uint16_t message_type) {
     uint32_t msg_size = 0;
     msg.calculate_size(msg_size);
 

esphome/components/api/subscribe_state.cpp

@@ -8,7 +8,7 @@ namespace api {
 
 #ifdef USE_BINARY_SENSOR
 bool InitialStateIterator::on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) {
-  return this->client_->send_binary_sensor_state(binary_sensor, binary_sensor->state);
+  return this->client_->send_binary_sensor_state(binary_sensor);
 }
 #endif
 #ifdef USE_COVER
@@ -21,27 +21,21 @@ bool InitialStateIterator::on_fan(fan::Fan *fan) { return this->client_->send_fa
 bool InitialStateIterator::on_light(light::LightState *light) { return this->client_->send_light_state(light); }
 #endif
 #ifdef USE_SENSOR
-bool InitialStateIterator::on_sensor(sensor::Sensor *sensor) {
-  return this->client_->send_sensor_state(sensor, sensor->state);
-}
+bool InitialStateIterator::on_sensor(sensor::Sensor *sensor) { return this->client_->send_sensor_state(sensor); }
 #endif
 #ifdef USE_SWITCH
-bool InitialStateIterator::on_switch(switch_::Switch *a_switch) {
-  return this->client_->send_switch_state(a_switch, a_switch->state);
-}
+bool InitialStateIterator::on_switch(switch_::Switch *a_switch) { return this->client_->send_switch_state(a_switch); }
 #endif
 #ifdef USE_TEXT_SENSOR
 bool InitialStateIterator::on_text_sensor(text_sensor::TextSensor *text_sensor) {
-  return this->client_->send_text_sensor_state(text_sensor, text_sensor->state);
+  return this->client_->send_text_sensor_state(text_sensor);
 }
 #endif
 #ifdef USE_CLIMATE
 bool InitialStateIterator::on_climate(climate::Climate *climate) { return this->client_->send_climate_state(climate); }
 #endif
 #ifdef USE_NUMBER
-bool InitialStateIterator::on_number(number::Number *number) {
-  return this->client_->send_number_state(number, number->state);
-}
+bool InitialStateIterator::on_number(number::Number *number) { return this->client_->send_number_state(number); }
 #endif
 #ifdef USE_DATETIME_DATE
 bool InitialStateIterator::on_date(datetime::DateEntity *date) { return this->client_->send_date_state(date); }
@@ -55,15 +49,13 @@ bool InitialStateIterator::on_datetime(datetime::DateTimeEntity *datetime) {
 }
 #endif
 #ifdef USE_TEXT
-bool InitialStateIterator::on_text(text::Text *text) { return this->client_->send_text_state(text, text->state); }
+bool InitialStateIterator::on_text(text::Text *text) { return this->client_->send_text_state(text); }
 #endif
 #ifdef USE_SELECT
-bool InitialStateIterator::on_select(select::Select *select) {
-  return this->client_->send_select_state(select, select->state);
-}
+bool InitialStateIterator::on_select(select::Select *select) { return this->client_->send_select_state(select); }
 #endif
 #ifdef USE_LOCK
-bool InitialStateIterator::on_lock(lock::Lock *a_lock) { return this->client_->send_lock_state(a_lock, a_lock->state); }
+bool InitialStateIterator::on_lock(lock::Lock *a_lock) { return this->client_->send_lock_state(a_lock); }
 #endif
 #ifdef USE_VALVE
 bool InitialStateIterator::on_valve(valve::Valve *valve) { return this->client_->send_valve_state(valve); }

esphome/components/as3935/as3935.cpp

@@ -282,7 +282,7 @@ void AS3935Component::display_oscillator(bool state, uint8_t osc) {
 // based on the resonance frequency of the antenna and so it should be trimmed
 // before the calibration is done.
 bool AS3935Component::calibrate_oscillator() {
-  ESP_LOGI(TAG, "Starting oscillators calibration...");
+  ESP_LOGI(TAG, "Starting oscillators calibration");
   this->write_register(CALIB_RCO, WIPE_ALL, DIRECT_COMMAND, 0);  // Send command to calibrate the oscillators
 
   this->display_oscillator(true, 2);
@@ -307,7 +307,7 @@ bool AS3935Component::calibrate_oscillator() {
 }
 
 void AS3935Component::tune_antenna() {
-  ESP_LOGI(TAG, "Starting antenna tuning...");
+  ESP_LOGI(TAG, "Starting antenna tuning");
   uint8_t div_ratio = this->read_div_ratio();
   uint8_t tune_val = this->read_capacitance();
   ESP_LOGI(TAG, "Division Ratio is set to: %d", div_ratio);

esphome/components/as5600/as5600.cpp

@@ -91,7 +91,7 @@ void AS5600Component::dump_config() {
   LOG_I2C_DEVICE(this);
 
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with AS5600 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
     return;
   }
 

esphome/components/as7341/as7341.cpp

@@ -38,7 +38,7 @@ void AS7341Component::dump_config() {
   ESP_LOGCONFIG(TAG, "AS7341:");
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with AS7341 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   LOG_UPDATE_INTERVAL(this);
   ESP_LOGCONFIG(TAG, "  Gain: %u", get_gain());

esphome/components/at581x/at581x.cpp

@@ -75,7 +75,7 @@ void AT581XComponent::setup() { ESP_LOGCONFIG(TAG, "Running setup"); }
 void AT581XComponent::dump_config() { LOG_I2C_DEVICE(this); }
 #define ARRAY_SIZE(X) (sizeof(X) / sizeof((X)[0]))
 bool AT581XComponent::i2c_write_config() {
-  ESP_LOGCONFIG(TAG, "Writing new config for AT581X...");
+  ESP_LOGCONFIG(TAG, "Writing new config for AT581X");
   ESP_LOGCONFIG(TAG, "Frequency: %dMHz", this->freq_);
   ESP_LOGCONFIG(TAG, "Sensing distance: %d", this->delta_);
   ESP_LOGCONFIG(TAG, "Power: %dµA", this->power_);

esphome/components/atm90e26/atm90e26.cpp

@@ -135,7 +135,7 @@ void ATM90E26Component::dump_config() {
   ESP_LOGCONFIG("", "ATM90E26:");
   LOG_PIN("  CS Pin: ", this->cs_);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with ATM90E26 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   LOG_UPDATE_INTERVAL(this);
   LOG_SENSOR("  ", "Voltage A", this->voltage_sensor_);

esphome/components/atm90e32/atm90e32.cpp

@@ -217,7 +217,7 @@ void ATM90E32Component::dump_config() {
   ESP_LOGCONFIG("", "ATM90E32:");
   LOG_PIN("  CS Pin: ", this->cs_);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with ATM90E32 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   LOG_UPDATE_INTERVAL(this);
   LOG_SENSOR("  ", "Voltage A", this->phase_[PHASEA].voltage_sensor_);
@@ -686,7 +686,7 @@ void ATM90E32Component::restore_power_offset_calibrations_() {
 }
 
 void ATM90E32Component::clear_gain_calibrations() {
-  ESP_LOGI(TAG, "[CALIBRATION] Clearing stored gain calibrations and restoring config-defined values...");
+  ESP_LOGI(TAG, "[CALIBRATION] Clearing stored gain calibrations and restoring config-defined values");
 
   for (int phase = 0; phase < 3; phase++) {
     gain_phase_[phase].voltage_gain = this->phase_[phase].voltage_gain_;

esphome/components/bedjet/bedjet_hub.cpp

@@ -527,7 +527,7 @@ void BedJetHub::dispatch_status_() {
     }
 
     if (this->timeout_ > 0 && diff > this->timeout_ && this->parent()->enabled) {
-      ESP_LOGW(TAG, "[%s] Timed out after %" PRId32 " sec. Retrying...", this->get_name().c_str(), this->timeout_);
+      ESP_LOGW(TAG, "[%s] Timed out after %" PRId32 " sec. Retrying", this->get_name().c_str(), this->timeout_);
       // set_enabled(false) will only close the connection if state != IDLE.
       this->parent()->set_state(espbt::ClientState::CONNECTING);
       this->parent()->set_enabled(false);

esphome/components/beken_spi_led_strip/led_strip.cpp

@@ -256,7 +256,7 @@ void BekenSPILEDStripLightOutput::write_state(light::LightState *state) {
   this->last_refresh_ = now;
   this->mark_shown_();
 
-  ESP_LOGVV(TAG, "Writing RGB values to bus...");
+  ESP_LOGVV(TAG, "Writing RGB values to bus");
 
   if (spi_data == nullptr) {
     ESP_LOGE(TAG, "SPI not initialized");

esphome/components/bh1750/bh1750.cpp

@@ -118,7 +118,7 @@ void BH1750Sensor::dump_config() {
   LOG_SENSOR("", "BH1750", this);
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with BH1750 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL_FOR, this->get_name().c_str());
   }
 
   LOG_UPDATE_INTERVAL(this);

esphome/components/binary_sensor/automation.cpp

@@ -68,8 +68,7 @@ void binary_sensor::MultiClickTrigger::on_state_(bool state) {
   *this->at_index_ = *this->at_index_ + 1;
 }
 void binary_sensor::MultiClickTrigger::schedule_cooldown_() {
-  ESP_LOGV(TAG, "Multi Click: Invalid length of press, starting cooldown of %" PRIu32 " ms...",
-           this->invalid_cooldown_);
+  ESP_LOGV(TAG, "Multi Click: Invalid length of press, starting cooldown of %" PRIu32 " ms", this->invalid_cooldown_);
   this->is_in_cooldown_ = true;
   this->set_timeout("cooldown", this->invalid_cooldown_, [this]() {
     ESP_LOGV(TAG, "Multi Click: Cooldown ended, matching is now enabled again.");

esphome/components/bl0906/bl0906.cpp

@@ -100,7 +100,7 @@ void BL0906::handle_actions_() {
   for (int i = 0; i < this->action_queue_.size(); i++) {
     ptr_func = this->action_queue_[i];
     if (ptr_func) {
-      ESP_LOGI(TAG, "HandleActionCallback[%d]...", i);
+      ESP_LOGI(TAG, "HandleActionCallback[%d]", i);
       (this->*ptr_func)();
     }
   }

esphome/components/bluetooth_proxy/bluetooth_connection.cpp

@@ -75,7 +75,7 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
       resp.data.reserve(param->read.value_len);
       // Use bulk insert instead of individual push_backs
       resp.data.insert(resp.data.end(), param->read.value, param->read.value + param->read.value_len);
-      this->proxy_->get_api_connection()->send_bluetooth_gatt_read_response(resp);
+      this->proxy_->get_api_connection()->send_message(resp);
       break;
     }
     case ESP_GATTC_WRITE_CHAR_EVT:
@@ -89,7 +89,7 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
       api::BluetoothGATTWriteResponse resp;
       resp.address = this->address_;
       resp.handle = param->write.handle;
-      this->proxy_->get_api_connection()->send_bluetooth_gatt_write_response(resp);
+      this->proxy_->get_api_connection()->send_message(resp);
       break;
     }
     case ESP_GATTC_UNREG_FOR_NOTIFY_EVT: {
@@ -103,7 +103,7 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
       api::BluetoothGATTNotifyResponse resp;
       resp.address = this->address_;
       resp.handle = param->unreg_for_notify.handle;
-      this->proxy_->get_api_connection()->send_bluetooth_gatt_notify_response(resp);
+      this->proxy_->get_api_connection()->send_message(resp);
       break;
     }
     case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
@@ -116,7 +116,7 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
       api::BluetoothGATTNotifyResponse resp;
       resp.address = this->address_;
       resp.handle = param->reg_for_notify.handle;
-      this->proxy_->get_api_connection()->send_bluetooth_gatt_notify_response(resp);
+      this->proxy_->get_api_connection()->send_message(resp);
       break;
     }
     case ESP_GATTC_NOTIFY_EVT: {
@@ -128,7 +128,7 @@ bool BluetoothConnection::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
       resp.data.reserve(param->notify.value_len);
       // Use bulk insert instead of individual push_backs
       resp.data.insert(resp.data.end(), param->notify.value, param->notify.value + param->notify.value_len);
-      this->proxy_->get_api_connection()->send_bluetooth_gatt_notify_data_response(resp);
+      this->proxy_->get_api_connection()->send_message(resp);
       break;
     }
     default:

esphome/components/bluetooth_proxy/bluetooth_proxy.cpp

@@ -39,7 +39,7 @@ void BluetoothProxy::send_bluetooth_scanner_state_(esp32_ble_tracker::ScannerSta
   resp.state = static_cast<api::enums::BluetoothScannerState>(state);
   resp.mode = this->parent_->get_scan_active() ? api::enums::BluetoothScannerMode::BLUETOOTH_SCANNER_MODE_ACTIVE
                                                : api::enums::BluetoothScannerMode::BLUETOOTH_SCANNER_MODE_PASSIVE;
-  this->api_connection_->send_bluetooth_scanner_state_response(resp);
+  this->api_connection_->send_message(resp);
 }
 
 bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
@@ -103,7 +103,7 @@ void BluetoothProxy::flush_pending_advertisements() {
 
   api::BluetoothLERawAdvertisementsResponse resp;
   resp.advertisements.swap(batch_buffer);
-  this->api_connection_->send_bluetooth_le_raw_advertisements_response(resp);
+  this->api_connection_->send_message(resp);
 }
 
 void BluetoothProxy::send_api_packet_(const esp32_ble_tracker::ESPBTDevice &device) {
@@ -141,7 +141,7 @@ void BluetoothProxy::send_api_packet_(const esp32_ble_tracker::ESPBTDevice &devi
     manufacturer_data.data.assign(data.data.begin(), data.data.end());
   }
 
-  this->api_connection_->send_bluetooth_le_advertisement(resp);
+  this->api_connection_->send_message(resp);
 }
 
 void BluetoothProxy::dump_config() {
@@ -300,7 +300,7 @@ void BluetoothProxy::loop() {
         service_resp.characteristics.push_back(std::move(characteristic_resp));
       }
       resp.services.push_back(std::move(service_resp));
-      this->api_connection_->send_bluetooth_gatt_get_services_response(resp);
+      this->api_connection_->send_message(resp);
     }
   }
 }
@@ -453,7 +453,7 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
       call.success = ret == ESP_OK;
       call.error = ret;
 
-      this->api_connection_->send_bluetooth_device_clear_cache_response(call);
+      this->api_connection_->send_message(call);
 
       break;
     }
@@ -577,7 +577,7 @@ void BluetoothProxy::send_device_connection(uint64_t address, bool connected, ui
   call.connected = connected;
   call.mtu = mtu;
   call.error = error;
-  this->api_connection_->send_bluetooth_device_connection_response(call);
+  this->api_connection_->send_message(call);
 }
 void BluetoothProxy::send_connections_free() {
   if (this->api_connection_ == nullptr)
@@ -590,7 +590,7 @@ void BluetoothProxy::send_connections_free() {
       call.allocated.push_back(connection->address_);
     }
   }
-  this->api_connection_->send_bluetooth_connections_free_response(call);
+  this->api_connection_->send_message(call);
 }
 
 void BluetoothProxy::send_gatt_services_done(uint64_t address) {
@@ -598,7 +598,7 @@ void BluetoothProxy::send_gatt_services_done(uint64_t address) {
     return;
   api::BluetoothGATTGetServicesDoneResponse call;
   call.address = address;
-  this->api_connection_->send_bluetooth_gatt_get_services_done_response(call);
+  this->api_connection_->send_message(call);
 }
 
 void BluetoothProxy::send_gatt_error(uint64_t address, uint16_t handle, esp_err_t error) {
@@ -608,7 +608,7 @@ void BluetoothProxy::send_gatt_error(uint64_t address, uint16_t handle, esp_err_
   call.address = address;
   call.handle = handle;
   call.error = error;
-  this->api_connection_->send_bluetooth_gatt_error_response(call);
+  this->api_connection_->send_message(call);
 }
 
 void BluetoothProxy::send_device_pairing(uint64_t address, bool paired, esp_err_t error) {
@@ -617,7 +617,7 @@ void BluetoothProxy::send_device_pairing(uint64_t address, bool paired, esp_err_
   call.paired = paired;
   call.error = error;
 
-  this->api_connection_->send_bluetooth_device_pairing_response(call);
+  this->api_connection_->send_message(call);
 }
 
 void BluetoothProxy::send_device_unpairing(uint64_t address, bool success, esp_err_t error) {
@@ -626,7 +626,7 @@ void BluetoothProxy::send_device_unpairing(uint64_t address, bool success, esp_e
   call.success = success;
   call.error = error;
 
-  this->api_connection_->send_bluetooth_device_unpairing_response(call);
+  this->api_connection_->send_message(call);
 }
 
 void BluetoothProxy::bluetooth_scanner_set_mode(bool active) {

esphome/components/bme280_base/bme280_base.cpp

@@ -182,7 +182,7 @@ void BME280Component::dump_config() {
   ESP_LOGCONFIG(TAG, "BME280:");
   switch (this->error_code_) {
     case COMMUNICATION_FAILED:
-      ESP_LOGE(TAG, "Communication with BME280 failed!");
+      ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
       break;
     case WRONG_CHIP_ID:
       ESP_LOGE(TAG, "BME280 has wrong chip ID! Is it a BME280?");
@@ -207,7 +207,7 @@ inline uint8_t oversampling_to_time(BME280Oversampling over_sampling) { return (
 
 void BME280Component::update() {
   // Enable sensor
-  ESP_LOGV(TAG, "Sending conversion request...");
+  ESP_LOGV(TAG, "Sending conversion request");
   uint8_t meas_value = 0;
   meas_value |= (this->temperature_oversampling_ & 0b111) << 5;
   meas_value |= (this->pressure_oversampling_ & 0b111) << 2;

esphome/components/bme680/bme680.cpp

@@ -215,7 +215,7 @@ void BME680Component::dump_config() {
   ESP_LOGCONFIG(TAG, "BME680:");
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with BME680 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   ESP_LOGCONFIG(TAG, "  IIR Filter: %s", iir_filter_to_str(this->iir_filter_));
   LOG_UPDATE_INTERVAL(this);
@@ -307,7 +307,7 @@ void BME680Component::read_data_() {
       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!");
+    ESP_LOGW(TAG, ESP_LOG_MSG_COMM_FAIL);
     this->status_set_warning();
     return;
   }

esphome/components/bme680/sensor.py

@@ -13,7 +13,7 @@ from esphome.const import (
     CONF_PRESSURE,
     CONF_TEMPERATURE,
     DEVICE_CLASS_HUMIDITY,
-    DEVICE_CLASS_PRESSURE,
+    DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
     DEVICE_CLASS_TEMPERATURE,
     ICON_GAS_CYLINDER,
     STATE_CLASS_MEASUREMENT,
@@ -71,7 +71,7 @@ CONFIG_SCHEMA = (
             cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
                 unit_of_measurement=UNIT_HECTOPASCAL,
                 accuracy_decimals=1,
-                device_class=DEVICE_CLASS_PRESSURE,
+                device_class=DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
                 state_class=STATE_CLASS_MEASUREMENT,
             ).extend(
                 {

esphome/components/bme680_bsec/sensor.py

@@ -15,6 +15,8 @@ from esphome.const import (
     DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
     ICON_GAS_CYLINDER,
     ICON_GAUGE,
+    ICON_THERMOMETER,
+    ICON_WATER_PERCENT,
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
     UNIT_HECTOPASCAL,
@@ -27,11 +29,11 @@ from . import CONF_BME680_BSEC_ID, SAMPLE_RATE_OPTIONS, BME680BSECComponent
 
 DEPENDENCIES = ["bme680_bsec"]
 
-CONF_IAQ = "iaq"
-CONF_CO2_EQUIVALENT = "co2_equivalent"
 CONF_BREATH_VOC_EQUIVALENT = "breath_voc_equivalent"
-UNIT_IAQ = "IAQ"
+CONF_CO2_EQUIVALENT = "co2_equivalent"
+CONF_IAQ = "iaq"
 ICON_ACCURACY = "mdi:checkbox-marked-circle-outline"
+UNIT_IAQ = "IAQ"
 
 TYPES = [
     CONF_TEMPERATURE,
@@ -49,6 +51,7 @@ CONFIG_SCHEMA = cv.Schema(
         cv.GenerateID(CONF_BME680_BSEC_ID): cv.use_id(BME680BSECComponent),
         cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
             unit_of_measurement=UNIT_CELSIUS,
+            icon=ICON_THERMOMETER,
             accuracy_decimals=1,
             device_class=DEVICE_CLASS_TEMPERATURE,
             state_class=STATE_CLASS_MEASUREMENT,
@@ -65,6 +68,7 @@ CONFIG_SCHEMA = cv.Schema(
         ),
         cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(
             unit_of_measurement=UNIT_PERCENT,
+            icon=ICON_WATER_PERCENT,
             accuracy_decimals=1,
             device_class=DEVICE_CLASS_HUMIDITY,
             state_class=STATE_CLASS_MEASUREMENT,

esphome/components/bme68x_bsec2/sensor.py

@@ -9,8 +9,10 @@ from esphome.const import (
     CONF_SAMPLE_RATE,
     CONF_TEMPERATURE,
     DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
+    DEVICE_CLASS_CARBON_DIOXIDE,
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
     ICON_GAS_CYLINDER,
     ICON_GAUGE,
     ICON_THERMOMETER,
@@ -32,7 +34,6 @@ CONF_CO2_EQUIVALENT = "co2_equivalent"
 CONF_IAQ = "iaq"
 CONF_IAQ_STATIC = "iaq_static"
 ICON_ACCURACY = "mdi:checkbox-marked-circle-outline"
-ICON_TEST_TUBE = "mdi:test-tube"
 UNIT_IAQ = "IAQ"
 
 TYPES = [
@@ -61,7 +62,6 @@ CONFIG_SCHEMA = cv.Schema(
         ),
         cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
             unit_of_measurement=UNIT_HECTOPASCAL,
-            icon=ICON_GAUGE,
             accuracy_decimals=1,
             device_class=DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
             state_class=STATE_CLASS_MEASUREMENT,
@@ -102,14 +102,14 @@ CONFIG_SCHEMA = cv.Schema(
         ),
         cv.Optional(CONF_CO2_EQUIVALENT): sensor.sensor_schema(
             unit_of_measurement=UNIT_PARTS_PER_MILLION,
-            icon=ICON_TEST_TUBE,
             accuracy_decimals=1,
+            device_class=DEVICE_CLASS_CARBON_DIOXIDE,
             state_class=STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional(CONF_BREATH_VOC_EQUIVALENT): sensor.sensor_schema(
             unit_of_measurement=UNIT_PARTS_PER_MILLION,
-            icon=ICON_TEST_TUBE,
             accuracy_decimals=1,
+            device_class=DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
             state_class=STATE_CLASS_MEASUREMENT,
         ),
     }

esphome/components/bmi160/bmi160.cpp

@@ -126,37 +126,37 @@ void BMI160Component::internal_setup_(int stage) {
         return;
       }
 
-      ESP_LOGV(TAG, "  Bringing accelerometer out of sleep...");
+      ESP_LOGV(TAG, "  Bringing accelerometer out of sleep");
       if (!this->write_byte(BMI160_REGISTER_CMD, (uint8_t) Cmd::ACCL_SET_PMU_MODE | (uint8_t) AcclPmuMode::NORMAL)) {
         this->mark_failed();
         return;
       }
-      ESP_LOGV(TAG, "  Waiting for accelerometer to wake up...");
+      ESP_LOGV(TAG, "  Waiting for accelerometer to wake up");
       // need to wait (max delay in datasheet) because we can't send commands while another is in progress
       // min 5ms, 10ms
       this->set_timeout(10, [this]() { this->internal_setup_(1); });
       break;
 
     case 1:
-      ESP_LOGV(TAG, "  Bringing gyroscope out of sleep...");
+      ESP_LOGV(TAG, "  Bringing gyroscope out of sleep");
       if (!this->write_byte(BMI160_REGISTER_CMD, (uint8_t) Cmd::GYRO_SET_PMU_MODE | (uint8_t) GyroPmuMode::NORMAL)) {
         this->mark_failed();
         return;
       }
-      ESP_LOGV(TAG, "  Waiting for gyroscope to wake up...");
+      ESP_LOGV(TAG, "  Waiting for gyroscope to wake up");
       // wait between 51 & 81ms, doing 100 to be safe
       this->set_timeout(10, [this]() { this->internal_setup_(2); });
       break;
 
     case 2:
-      ESP_LOGV(TAG, "  Setting up Gyro Config...");
+      ESP_LOGV(TAG, "  Setting up Gyro Config");
       uint8_t gyro_config = (uint8_t) GyroBandwidth::OSR4 | (uint8_t) GyroOuputDataRate::HZ_25;
       ESP_LOGV(TAG, "  Output gyro_config: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(gyro_config));
       if (!this->write_byte(BMI160_REGISTER_GYRO_CONFIG, gyro_config)) {
         this->mark_failed();
         return;
       }
-      ESP_LOGV(TAG, "  Setting up Gyro Range...");
+      ESP_LOGV(TAG, "  Setting up Gyro Range");
       uint8_t gyro_range = (uint8_t) GyroRange::RANGE_2000_DPS;
       ESP_LOGV(TAG, "  Output gyro_range: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(gyro_range));
       if (!this->write_byte(BMI160_REGISTER_GYRO_RANGE, gyro_range)) {
@@ -164,7 +164,7 @@ void BMI160Component::internal_setup_(int stage) {
         return;
       }
 
-      ESP_LOGV(TAG, "  Setting up Accel Config...");
+      ESP_LOGV(TAG, "  Setting up Accel Config");
       uint8_t accel_config =
           (uint8_t) AcclFilterMode::PERF | (uint8_t) AcclBandwidth::RES_AVG16 | (uint8_t) AccelOutputDataRate::HZ_25;
       ESP_LOGV(TAG, "  Output accel_config: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(accel_config));
@@ -172,7 +172,7 @@ void BMI160Component::internal_setup_(int stage) {
         this->mark_failed();
         return;
       }
-      ESP_LOGV(TAG, "  Setting up Accel Range...");
+      ESP_LOGV(TAG, "  Setting up Accel Range");
       uint8_t accel_range = (uint8_t) AccelRange::RANGE_16G;
       ESP_LOGV(TAG, "  Output accel_range: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(accel_range));
       if (!this->write_byte(BMI160_REGISTER_ACCEL_RANGE, accel_range)) {
@@ -189,7 +189,7 @@ void BMI160Component::dump_config() {
   ESP_LOGCONFIG(TAG, "BMI160:");
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with BMI160 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   LOG_UPDATE_INTERVAL(this);
   LOG_SENSOR("  ", "Acceleration X", this->accel_x_sensor_);
@@ -219,7 +219,7 @@ void BMI160Component::update() {
     return;
   }
 
-  ESP_LOGV(TAG, "    Updating BMI160...");
+  ESP_LOGV(TAG, "    Updating BMI160");
   int16_t data[6];
   if (this->read_le_int16_(BMI160_REGISTER_DATA_GYRO_X_LSB, data, 6) != i2c::ERROR_OK) {
     this->status_set_warning();

esphome/components/bmp085/bmp085.cpp

@@ -129,7 +129,7 @@ void BMP085Component::read_pressure_() {
   this->status_clear_warning();
 }
 bool BMP085Component::set_mode_(uint8_t mode) {
-  ESP_LOGV(TAG, "Setting mode to 0x%02X...", mode);
+  ESP_LOGV(TAG, "Setting mode to 0x%02X", mode);
   return this->write_byte(BMP085_REGISTER_CONTROL, mode);
 }
 float BMP085Component::get_setup_priority() const { return setup_priority::DATA; }

esphome/components/bmp280_base/bmp280_base.cpp

@@ -132,7 +132,7 @@ void BMP280Component::dump_config() {
   ESP_LOGCONFIG(TAG, "BMP280:");
   switch (this->error_code_) {
     case COMMUNICATION_FAILED:
-      ESP_LOGE(TAG, "Communication with BMP280 failed!");
+      ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
       break;
     case WRONG_CHIP_ID:
       ESP_LOGE(TAG, "BMP280 has wrong chip ID! Is it a BME280?");
@@ -155,7 +155,7 @@ inline uint8_t oversampling_to_time(BMP280Oversampling over_sampling) { return (
 
 void BMP280Component::update() {
   // Enable sensor
-  ESP_LOGV(TAG, "Sending conversion request...");
+  ESP_LOGV(TAG, "Sending conversion request");
   uint8_t meas_value = 0;
   meas_value |= (this->temperature_oversampling_ & 0b111) << 5;
   meas_value |= (this->pressure_oversampling_ & 0b111) << 2;

esphome/components/bmp3xx_base/bmp3xx_base.cpp

@@ -73,7 +73,7 @@ void BMP3XXComponent::setup() {
   ESP_LOGCONFIG(TAG, "Running setup");
   // Call the Device base class "initialise" function
   if (!reset()) {
-    ESP_LOGE(TAG, "Failed to reset BMP3XX...");
+    ESP_LOGE(TAG, "Failed to reset");
     this->error_code_ = ERROR_SENSOR_RESET;
     this->mark_failed();
   }
@@ -154,19 +154,17 @@ void BMP3XXComponent::dump_config() {
     case NONE:
       break;
     case ERROR_COMMUNICATION_FAILED:
-      ESP_LOGE(TAG, "Communication with BMP3XX failed!");
+      ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
       break;
     case ERROR_WRONG_CHIP_ID:
-      ESP_LOGE(
-          TAG,
-          "BMP3XX has wrong chip ID (reported id: 0x%X) - please check if you are really using a BMP 388 or BMP 390",
-          this->chip_id_.reg);
+      ESP_LOGE(TAG, "Wrong chip ID (reported id: 0x%X) - please check if you are really using a BMP 388 or BMP 390",
+               this->chip_id_.reg);
       break;
     case ERROR_SENSOR_RESET:
-      ESP_LOGE(TAG, "BMP3XX failed to reset");
+      ESP_LOGE(TAG, "Failed to reset");
       break;
     default:
-      ESP_LOGE(TAG, "BMP3XX error code %d", (int) this->error_code_);
+      ESP_LOGE(TAG, "Error code %d", (int) this->error_code_);
       break;
   }
   ESP_LOGCONFIG(TAG, "  IIR Filter: %s", LOG_STR_ARG(iir_filter_to_str(this->iir_filter_)));
@@ -186,7 +184,7 @@ inline uint8_t oversampling_to_time(Oversampling over_sampling) { return (1 << u
 
 void BMP3XXComponent::update() {
   // Enable sensor
-  ESP_LOGV(TAG, "Sending conversion request...");
+  ESP_LOGV(TAG, "Sending conversion request");
   float meas_time = 1.0f;
   // Ref: https://www.bosch-sensortec.com/media/boschsensortec/downloads/datasheets/bst-bmp390-ds002.pdf 3.9.2
   meas_time += 2.02f * oversampling_to_time(this->temperature_oversampling_) + 0.163f;
@@ -296,7 +294,7 @@ bool BMP3XXComponent::get_pressure(float &pressure) {
 bool BMP3XXComponent::get_measurements(float &temperature, float &pressure) {
   // Check if a measurement is ready
   if (!data_ready()) {
-    ESP_LOGD(TAG, "BMP3XX Get measurement - data not ready skipping update");
+    ESP_LOGD(TAG, "Get measurement - data not ready skipping update");
     return false;
   }
 

esphome/components/bmp581/bmp581.cpp

@@ -72,22 +72,22 @@ void BMP581Component::dump_config() {
     case NONE:
       break;
     case ERROR_COMMUNICATION_FAILED:
-      ESP_LOGE(TAG, "  Communication with BMP581 failed!");
+      ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
       break;
     case ERROR_WRONG_CHIP_ID:
-      ESP_LOGE(TAG, "  BMP581 has wrong chip ID - please verify you are using a BMP 581");
+      ESP_LOGE(TAG, "Unknown chip ID");
       break;
     case ERROR_SENSOR_RESET:
-      ESP_LOGE(TAG, "  BMP581 failed to reset");
+      ESP_LOGE(TAG, "Reset failed");
       break;
     case ERROR_SENSOR_STATUS:
-      ESP_LOGE(TAG, "  BMP581 sensor status failed, there were NVM problems");
+      ESP_LOGE(TAG, "Get status failed");
       break;
     case ERROR_PRIME_IIR_FAILED:
-      ESP_LOGE(TAG, "  BMP581's IIR Filter failed to prime with an initial measurement");
+      ESP_LOGE(TAG, "IIR Filter failed to prime with initial measurement");
       break;
     default:
-      ESP_LOGE(TAG, "  BMP581 error code %d", (int) this->error_code_);
+      ESP_LOGE(TAG, "Error %d", (int) this->error_code_);
       break;
   }
 
@@ -130,7 +130,7 @@ void BMP581Component::setup() {
 
   // Power-On-Reboot bit is asserted if sensor successfully reset
   if (!this->reset_()) {
-    ESP_LOGE(TAG, "BMP581 failed to reset");
+    ESP_LOGE(TAG, "Reset failed");
 
     this->error_code_ = ERROR_SENSOR_RESET;
     this->mark_failed();
@@ -146,7 +146,7 @@ void BMP581Component::setup() {
 
   // read chip id from sensor
   if (!this->read_byte(BMP581_CHIP_ID, &chip_id)) {
-    ESP_LOGE(TAG, "Failed to read chip id");
+    ESP_LOGE(TAG, "Read chip ID failed");
 
     this->error_code_ = ERROR_COMMUNICATION_FAILED;
     this->mark_failed();
@@ -156,7 +156,7 @@ void BMP581Component::setup() {
 
   // verify id
   if (chip_id != BMP581_ASIC_ID) {
-    ESP_LOGE(TAG, "Unknown chip ID, is this a BMP581?");
+    ESP_LOGE(TAG, "Unknown chip ID");
 
     this->error_code_ = ERROR_WRONG_CHIP_ID;
     this->mark_failed();
@@ -179,7 +179,7 @@ void BMP581Component::setup() {
 
   // verify status_nvm_rdy bit (it is asserted if boot was successful)
   if (!(this->status_.bit.status_nvm_rdy)) {
-    ESP_LOGE(TAG, "NVM not ready after boot");
+    ESP_LOGE(TAG, "NVM not ready");
 
     this->error_code_ = ERROR_SENSOR_STATUS;
     this->mark_failed();
@@ -189,7 +189,7 @@ void BMP581Component::setup() {
 
   // verify status_nvm_err bit (it is asserted if an error is detected)
   if (this->status_.bit.status_nvm_err) {
-    ESP_LOGE(TAG, "NVM error detected on boot");
+    ESP_LOGE(TAG, "NVM error detected");
 
     this->error_code_ = ERROR_SENSOR_STATUS;
     this->mark_failed();
@@ -254,7 +254,7 @@ void BMP581Component::setup() {
     }
 
     if (!this->prime_iir_filter_()) {
-      ESP_LOGE(TAG, "Failed to prime the IIR filter with an intiial measurement");
+      ESP_LOGE(TAG, "Failed to prime the IIR filter with an initial measurement");
 
       this->error_code_ = ERROR_PRIME_IIR_FAILED;
       this->mark_failed();
@@ -286,10 +286,10 @@ void BMP581Component::update() {
   // 1) Request a measurement //
   //////////////////////////////
 
-  ESP_LOGVV(TAG, "Requesting a measurement from sensor");
+  ESP_LOGVV(TAG, "Requesting measurement");
 
   if (!this->start_measurement_()) {
-    ESP_LOGW(TAG, "Failed to request forced measurement of sensor");
+    ESP_LOGW(TAG, "Requesting forced measurement failed");
     this->status_set_warning();
 
     return;
@@ -299,7 +299,7 @@ void BMP581Component::update() {
   // 2) Wait for measurement to finish (based on oversampling rates) //
   //////////////////////////////////////////////////////////////////////
 
-  ESP_LOGVV(TAG, "Measurement is expected to take %d ms to complete", this->conversion_time_);
+  ESP_LOGVV(TAG, "Measurement should take %d ms", this->conversion_time_);
 
   this->set_timeout("measurement", this->conversion_time_, [this]() {
     float temperature = 0.0;
@@ -311,14 +311,14 @@ void BMP581Component::update() {
 
     if (this->pressure_sensor_) {
       if (!this->read_temperature_and_pressure_(temperature, pressure)) {
-        ESP_LOGW(TAG, "Failed to read temperature and pressure measurements, skipping update");
+        ESP_LOGW(TAG, "Failed to read temperature and pressure; skipping update");
         this->status_set_warning();
 
         return;
       }
     } else {
       if (!this->read_temperature_(temperature)) {
-        ESP_LOGW(TAG, "Failed to read temperature measurement, skipping update");
+        ESP_LOGW(TAG, "Failed to read temperature; skipping update");
         this->status_set_warning();
 
         return;
@@ -349,7 +349,7 @@ bool BMP581Component::check_data_readiness_() {
   //   - returns data readiness state
 
   if (this->odr_config_.bit.pwr_mode == STANDBY_MODE) {
-    ESP_LOGD(TAG, "Data is not ready, sensor is in standby mode");
+    ESP_LOGD(TAG, "Data not ready, sensor is in standby mode");
     return false;
   }
 
@@ -443,7 +443,7 @@ bool BMP581Component::read_temperature_(float &temperature) {
   //    - the measured temperature (in degrees Celsius)
 
   if (!this->check_data_readiness_()) {
-    ESP_LOGW(TAG, "Data from sensor isn't ready, skipping this update");
+    ESP_LOGW(TAG, "Data not ready, skipping this update");
     this->status_set_warning();
 
     return false;
@@ -451,7 +451,7 @@ bool BMP581Component::read_temperature_(float &temperature) {
 
   uint8_t data[3];
   if (!this->read_bytes(BMP581_MEASUREMENT_DATA, &data[0], 3)) {
-    ESP_LOGW(TAG, "Failed to read sensor's measurement data");
+    ESP_LOGW(TAG, "Failed to read measurement");
     this->status_set_warning();
 
     return false;
@@ -472,7 +472,7 @@ bool BMP581Component::read_temperature_and_pressure_(float &temperature, float &
   //    - the measured pressure (in Pa)
 
   if (!this->check_data_readiness_()) {
-    ESP_LOGW(TAG, "Data from sensor isn't ready, skipping this update");
+    ESP_LOGW(TAG, "Data not ready, skipping this update");
     this->status_set_warning();
 
     return false;
@@ -480,7 +480,7 @@ bool BMP581Component::read_temperature_and_pressure_(float &temperature, float &
 
   uint8_t data[6];
   if (!this->read_bytes(BMP581_MEASUREMENT_DATA, &data[0], 6)) {
-    ESP_LOGW(TAG, "Failed to read sensor's measurement data");
+    ESP_LOGW(TAG, "Failed to read measurement");
     this->status_set_warning();
 
     return false;

esphome/components/captive_portal/captive_portal.cpp

@@ -29,7 +29,7 @@ void CaptivePortal::handle_config(AsyncWebServerRequest *request) {
 void CaptivePortal::handle_wifisave(AsyncWebServerRequest *request) {
   std::string ssid = request->arg("ssid").c_str();
   std::string psk = request->arg("psk").c_str();
-  ESP_LOGI(TAG, "Captive Portal Requested WiFi Settings Change:");
+  ESP_LOGI(TAG, "Requested WiFi Settings Change:");
   ESP_LOGI(TAG, "  SSID='%s'", ssid.c_str());
   ESP_LOGI(TAG, "  Password=" LOG_SECRET("'%s'"), psk.c_str());
   wifi::global_wifi_component->save_wifi_sta(ssid, psk);

esphome/components/ccs811/ccs811.cpp

@@ -163,7 +163,7 @@ void CCS811Component::dump_config() {
   if (this->is_failed()) {
     switch (this->error_code_) {
       case COMMUNICATION_FAILED:
-        ESP_LOGW(TAG, "Communication failed! Is the sensor connected?");
+        ESP_LOGW(TAG, ESP_LOG_MSG_COMM_FAIL);
         break;
       case INVALID_ID:
         ESP_LOGW(TAG, "Sensor reported an invalid ID. Is this a CCS811?");

esphome/components/ch422g/ch422g.cpp

@@ -37,7 +37,7 @@ void CH422GComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "CH422G:");
   LOG_I2C_DEVICE(this)
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with CH422G failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
 }
 

esphome/components/cm1106/cm1106.cpp

@@ -23,7 +23,7 @@ void CM1106Component::setup() {
   ESP_LOGCONFIG(TAG, "Running setup");
   uint8_t response[8] = {0};
   if (!this->cm1106_write_command_(C_M1106_CMD_GET_CO2, sizeof(C_M1106_CMD_GET_CO2), response, sizeof(response))) {
-    ESP_LOGE(TAG, "Communication with CM1106 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
     this->mark_failed();
     return;
   }
@@ -38,7 +38,7 @@ void CM1106Component::update() {
   }
 
   if (response[0] != 0x16 || response[1] != 0x05 || response[2] != 0x01) {
-    ESP_LOGW(TAG, "Got wrong UART response from CM1106: %02X %02X %02X %02X...", response[0], response[1], response[2],
+    ESP_LOGW(TAG, "Got wrong UART response from CM1106: %02X %02X %02X %02X", response[0], response[1], response[2],
              response[3]);
     this->status_set_warning();
     return;
@@ -104,7 +104,7 @@ void CM1106Component::dump_config() {
   LOG_SENSOR("  ", "CO2", this->co2_sensor_);
   this->check_uart_settings(9600);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with CM1106 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
 }
 

esphome/components/const/__init__.py

@@ -3,3 +3,4 @@
 CODEOWNERS = ["@esphome/core"]
 
 CONF_DRAW_ROUNDING = "draw_rounding"
+CONF_REQUEST_HEADERS = "request_headers"

esphome/components/cse7761/cse7761.cpp

@@ -57,7 +57,7 @@ void CSE7761Component::setup() {
 void CSE7761Component::dump_config() {
   ESP_LOGCONFIG(TAG, "CSE7761:");
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with CSE7761 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   LOG_UPDATE_INTERVAL(this);
   this->check_uart_settings(38400, 1, uart::UART_CONFIG_PARITY_EVEN, 8);

esphome/components/dac7678/dac7678_output.cpp

@@ -22,7 +22,7 @@ static const uint8_t DAC7678_REG_INTERNAL_REF_1 = 0x90;
 void DAC7678Output::setup() {
   ESP_LOGCONFIG(TAG, "Running setup");
 
-  ESP_LOGV(TAG, "Resetting device...");
+  ESP_LOGV(TAG, "Resetting device");
 
   // Reset device
   if (!this->write_byte_16(DAC7678_REG_SOFTWARE_RESET, 0x0000)) {

esphome/components/debug/debug_component.cpp

@@ -15,10 +15,6 @@ namespace debug {
 static const char *const TAG = "debug";
 
 void DebugComponent::dump_config() {
-#ifndef ESPHOME_LOG_HAS_DEBUG
-  return;  // Can't log below if debug logging is disabled
-#endif
-
   ESP_LOGCONFIG(TAG, "Debug component:");
 #ifdef USE_TEXT_SENSOR
   LOG_TEXT_SENSOR("  ", "Device info", this->device_info_);

esphome/components/deep_sleep/deep_sleep_component.cpp

@@ -15,10 +15,10 @@ void DeepSleepComponent::setup() {
 
   const optional<uint32_t> run_duration = get_run_duration_();
   if (run_duration.has_value()) {
-    ESP_LOGI(TAG, "Scheduling Deep Sleep to start in %" PRIu32 " ms", *run_duration);
+    ESP_LOGI(TAG, "Scheduling in %" PRIu32 " ms", *run_duration);
     this->set_timeout(*run_duration, [this]() { this->begin_sleep(); });
   } else {
-    ESP_LOGD(TAG, "Not scheduling Deep Sleep, as no run duration is configured.");
+    ESP_LOGD(TAG, "Not scheduling; no run duration configured");
   }
 }
 
@@ -57,7 +57,7 @@ void DeepSleepComponent::begin_sleep(bool manual) {
     return;
   }
 
-  ESP_LOGI(TAG, "Beginning Deep Sleep");
+  ESP_LOGI(TAG, "Beginning sleep");
   if (this->sleep_duration_.has_value()) {
     ESP_LOGI(TAG, "Sleeping for %" PRId64 "us", *this->sleep_duration_);
   }

esphome/components/deep_sleep/deep_sleep_esp32.cpp

@@ -59,7 +59,7 @@ bool DeepSleepComponent::prepare_to_sleep_() {
     // Defer deep sleep until inactive
     if (!this->next_enter_deep_sleep_) {
       this->status_set_warning();
-      ESP_LOGW(TAG, "Waiting wakeup pin state change to enter deep sleep...");
+      ESP_LOGW(TAG, "Waiting for wakeup pin state change");
     }
     this->next_enter_deep_sleep_ = true;
     return false;

esphome/components/demo/__init__.py

@@ -154,10 +154,6 @@ NUMBER_TYPES = {
     2: DemoNumberType.TYPE_2,
     3: DemoNumberType.TYPE_3,
 }
-SELECT_TYPES = {
-    1: DemoSelectType.TYPE_1,
-    2: DemoSelectType.TYPE_2,
-}
 TEXT_TYPES = {
     1: DemoTextType.TYPE_1,
     2: DemoTextType.TYPE_2,
@@ -439,18 +435,15 @@ CONFIG_SCHEMA = cv.Schema(
                 {
                     CONF_NAME: "Demo Select 1",
                     CONF_OPTIONS: ["Option 1", "Option 2", "Option 3"],
-                    CONF_TYPE: 1,
                 },
                 {
                     CONF_NAME: "Demo Select 2",
                     CONF_OPTIONS: ["Option A", "Option B", "Option C"],
-                    CONF_TYPE: 2,
                 },
             ],
         ): [
             select.select_schema(DemoSelect).extend(
                 {
-                    cv.Required(CONF_TYPE): cv.enum(SELECT_TYPES, int=True),
                     cv.Required(CONF_OPTIONS): cv.ensure_list(cv.string_strict),
                 }
             )
@@ -560,6 +553,7 @@ CONFIG_SCHEMA = cv.Schema(
 async def to_code(config):
     for conf in config[CONF_ALARM_CONTROL_PANELS]:
         var = await alarm_control_panel.new_alarm_control_panel(conf)
+        cg.add(var.set_type(conf[CONF_TYPE]))
         await cg.register_component(var, conf)
 
     for conf in config[CONF_BINARY_SENSORS]:

esphome/components/demo/demo_valve.h

@@ -27,19 +27,23 @@ class DemoValve : public valve::Valve {
  protected:
   void control(const valve::ValveCall &call) override {
     if (call.get_position().has_value()) {
-      this->publish_state(*call.get_position());
+      this->position = *call.get_position();
+      this->publish_state();
       return;
     } else if (call.get_toggle().has_value()) {
       if (call.get_toggle().value()) {
         if (this->position == valve::VALVE_OPEN) {
-          this->publish_state(valve::VALVE_CLOSED);
+          this->position = valve::VALVE_CLOSED;
+          this->publish_state();
         } else {
-          this->publish_state(valve::VALVE_OPEN);
+          this->position = valve::VALVE_OPEN;
+          this->publish_state();
         }
       }
       return;
     } else if (call.get_stop()) {
-      this->publish_state(this->position);  // Keep the current position
+      this->current_operation = valve::VALVE_OPERATION_IDLE;
+      this->publish_state();  // Keep the current position
       return;
     }
   }

esphome/components/dfrobot_sen0395/commands.cpp

@@ -21,7 +21,7 @@ uint8_t Command::execute(DfrobotSen0395Component *parent) {
         if (this->retries_left_ > 0) {
           this->retries_left_ -= 1;
           this->cmd_sent_ = false;
-          ESP_LOGD(TAG, "Retrying...");
+          ESP_LOGD(TAG, "Retrying");
           return 0;
         } else {
           this->parent_->find_prompt_();
@@ -33,7 +33,7 @@ uint8_t Command::execute(DfrobotSen0395Component *parent) {
         if (this->retries_left_ > 0) {
           this->retries_left_ -= 1;
           this->cmd_sent_ = false;
-          ESP_LOGD(TAG, "Retrying...");
+          ESP_LOGD(TAG, "Retrying");
           return 0;
         } else {
           this->parent_->find_prompt_();
@@ -51,7 +51,7 @@ uint8_t Command::execute(DfrobotSen0395Component *parent) {
       if (this->retries_left_ > 0) {
         this->retries_left_ -= 1;
         this->cmd_sent_ = false;
-        ESP_LOGD(TAG, "Retrying...");
+        ESP_LOGD(TAG, "Retrying");
       } else {
         return 1;  // Command done
       }

esphome/components/dht/dht.cpp

@@ -13,20 +13,14 @@ void DHT::setup() {
   this->pin_->setup();
   this->pin_->digital_write(true);
 }
+
 void DHT::dump_config() {
   ESP_LOGCONFIG(TAG, "DHT:");
   LOG_PIN("  Pin: ", this->pin_);
-  if (this->is_auto_detect_) {
-    ESP_LOGCONFIG(TAG, "  Auto-detected model: %s", this->model_ == DHT_MODEL_DHT11 ? "DHT11" : "DHT22");
-  } else if (this->model_ == DHT_MODEL_DHT11) {
-    ESP_LOGCONFIG(TAG, "  Model: DHT11");
-  } else {
-    ESP_LOGCONFIG(TAG, "  Model: DHT22 (or equivalent)");
-  }
-  ESP_LOGCONFIG(TAG, "  Internal Pull-up: %s", ONOFF(this->pin_->get_flags() & gpio::FLAG_PULLUP));
-
+  ESP_LOGCONFIG(TAG, "  %sModel: %s", this->is_auto_detect_ ? "Auto-detected " : "",
+                this->model_ == DHT_MODEL_DHT11 ? "DHT11" : "DHT22 or equivalent");
+  ESP_LOGCONFIG(TAG, "  Internal pull-up: %s", ONOFF(this->pin_->get_flags() & gpio::FLAG_PULLUP));
   LOG_UPDATE_INTERVAL(this);
-
   LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
   LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
 }
@@ -46,7 +40,7 @@ void DHT::update() {
   }
 
   if (success) {
-    ESP_LOGD(TAG, "Got Temperature=%.1f°C Humidity=%.1f%%", temperature, humidity);
+    ESP_LOGD(TAG, "Temperature %.1f°C Humidity %.1f%%", temperature, humidity);
 
     if (this->temperature_sensor_ != nullptr)
       this->temperature_sensor_->publish_state(temperature);
@@ -54,11 +48,8 @@ void DHT::update() {
       this->humidity_sensor_->publish_state(humidity);
     this->status_clear_warning();
   } else {
-    const char *str = "";
-    if (this->is_auto_detect_) {
-      str = " and consider manually specifying the DHT model using the model option";
-    }
-    ESP_LOGW(TAG, "Invalid readings! Please check your wiring (pull-up resistor, pin number)%s.", str);
+    ESP_LOGW(TAG, "Invalid readings! Check pin number and pull-up resistor%s.",
+             this->is_auto_detect_ ? " and try manually specifying the model" : "");
     if (this->temperature_sensor_ != nullptr)
       this->temperature_sensor_->publish_state(NAN);
     if (this->humidity_sensor_ != nullptr)
@@ -68,10 +59,12 @@ void DHT::update() {
 }
 
 float DHT::get_setup_priority() const { return setup_priority::DATA; }
+
 void DHT::set_dht_model(DHTModel model) {
   this->model_ = model;
   this->is_auto_detect_ = model == DHT_MODEL_AUTO_DETECT;
 }
+
 bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool report_errors) {
   *humidity = NAN;
   *temperature = NAN;
@@ -121,9 +114,9 @@ bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool r
       while (!this->pin_->digital_read()) {
         if (micros() - start_time > 90) {
           if (i < 0) {
-            error_code = 1;
+            error_code = 1;  // line didn't clear
           } else {
-            error_code = 2;
+            error_code = 2;  // rising edge for bit i timeout
           }
           break;
         }
@@ -139,9 +132,9 @@ bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool r
         end_time = micros();
         if (end_time - start_time > 90) {
           if (i < 0) {
-            error_code = 3;
+            error_code = 3;  // requesting data failed
           } else {
-            error_code = 4;
+            error_code = 4;  // falling edge for bit i timeout
           }
           break;
         }
@@ -166,22 +159,9 @@ bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool r
   if (!report_errors && error_code != 0)
     return false;
 
-  switch (error_code) {
-    case 1:
-      ESP_LOGW(TAG, "Waiting for DHT communication to clear failed!");
-      return false;
-    case 2:
-      ESP_LOGW(TAG, "Rising edge for bit %d failed!", i);
-      return false;
-    case 3:
-      ESP_LOGW(TAG, "Requesting data from DHT failed!");
-      return false;
-    case 4:
-      ESP_LOGW(TAG, "Falling edge for bit %d failed!", i);
-      return false;
-    case 0:
-    default:
-      break;
+  if (error_code) {
+    ESP_LOGW(TAG, ESP_LOG_MSG_COMM_FAIL);
+    return false;
   }
 
   ESP_LOGVV(TAG,
@@ -206,15 +186,15 @@ bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool r
     if (checksum_a == data[4]) {
       // Data format: 8bit integral RH data + 8bit decimal RH data + 8bit integral T data + 8bit decimal T data + 8bit
       // check sum - some models always have 0 in the decimal part
-      const uint16_t raw_temperature = uint16_t(data[2]) * 10 + (data[3] & 0x7F);
-      *temperature = raw_temperature / 10.0f;
+      const uint16_t raw_temperature = static_cast<uint16_t>(data[2]) * 10 + (data[3] & 0x7F);
+      *temperature = static_cast<float>(raw_temperature) / 10.0f;
       if ((data[3] & 0x80) != 0) {
         // negative
         *temperature *= -1;
       }
 
-      const uint16_t raw_humidity = uint16_t(data[0]) * 10 + data[1];
-      *humidity = raw_humidity / 10.0f;
+      const uint16_t raw_humidity = static_cast<uint16_t>(data[0]) * 10 + data[1];
+      *humidity = static_cast<float>(raw_humidity) / 10.0f;
     } else {
       // For compatibility with DHT11 models which might only use 2 bytes checksums, only use the data from these two
       // bytes
@@ -222,8 +202,8 @@ bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool r
       *humidity = data[0];
     }
   } else {
-    uint16_t raw_humidity = (uint16_t(data[0] & 0xFF) << 8) | (data[1] & 0xFF);
-    uint16_t raw_temperature = (uint16_t(data[2] & 0xFF) << 8) | (data[3] & 0xFF);
+    uint16_t raw_humidity = encode_uint16(data[0], data[1]);
+    uint16_t raw_temperature = encode_uint16(data[2], data[3]);
 
     if (raw_temperature & 0x8000) {
       if (!(raw_temperature & 0x4000))
@@ -234,24 +214,23 @@ bool HOT IRAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool r
 
     if (raw_temperature == 1 && raw_humidity == 10) {
       if (report_errors) {
-        ESP_LOGW(TAG, "Invalid temperature+humidity! Sensor reported 1°C and 1%% Hum");
+        ESP_LOGW(TAG, "Invalid data");
       }
       return false;
     }
 
-    *humidity = raw_humidity * 0.1f;
-    if (*humidity > 100)
+    *humidity = static_cast<float>(raw_humidity) * 0.1f;
+    if (*humidity > 100.0f)
       *humidity = NAN;
-    *temperature = int16_t(raw_temperature) * 0.1f;
+    *temperature = static_cast<int16_t>(raw_temperature) * 0.1f;
   }
 
   if (*temperature == 0.0f && (*humidity == 1.0f || *humidity == 2.0f)) {
     if (report_errors) {
-      ESP_LOGW(TAG, "DHT reports invalid data. Is the update interval too high or the sensor damaged?");
+      ESP_LOGW(TAG, "Invalid data");
     }
     return false;
   }
-
   return true;
 }
 

esphome/components/dht12/dht12.cpp

@@ -45,7 +45,7 @@ void DHT12Component::dump_config() {
   ESP_LOGD(TAG, "DHT12:");
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with DHT12 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
   LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);

esphome/components/dps310/dps310.cpp

@@ -91,7 +91,7 @@ void DPS310Component::dump_config() {
   ESP_LOGCONFIG(TAG, "  Revision ID: %u", (this->prod_rev_id_ >> 4) & 0x0F);
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with DPS310 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   LOG_UPDATE_INTERVAL(this);
   LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);

esphome/components/ds1307/ds1307.cpp

@@ -22,7 +22,7 @@ void DS1307Component::dump_config() {
   ESP_LOGCONFIG(TAG, "DS1307:");
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with DS1307 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   ESP_LOGCONFIG(TAG, "  Timezone: '%s'", this->timezone_.c_str());
 }

esphome/components/ee895/ee895.cpp

@@ -35,7 +35,7 @@ void EE895Component::dump_config() {
   LOG_I2C_DEVICE(this);
   switch (this->error_code_) {
     case COMMUNICATION_FAILED:
-      ESP_LOGE(TAG, "Communication with EE895 failed!");
+      ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
       break;
     case CRC_CHECK_FAILED:
       ESP_LOGE(TAG, "The crc check failed");

esphome/components/emc2101/emc2101.cpp

@@ -94,7 +94,7 @@ void Emc2101Component::dump_config() {
   ESP_LOGCONFIG(TAG, "Emc2101 component:");
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with EMC2101 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   ESP_LOGCONFIG(TAG, "  Mode: %s", this->dac_mode_ ? "DAC" : "PWM");
   if (this->dac_mode_) {
@@ -110,7 +110,7 @@ void Emc2101Component::set_duty_cycle(float value) {
   uint8_t duty_cycle = remap(value, 0.0f, 1.0f, (uint8_t) 0, this->max_output_value_);
   ESP_LOGD(TAG, "Setting duty fan setting to %02X", duty_cycle);
   if (!this->write_byte(EMC2101_REGISTER_FAN_SETTING, duty_cycle)) {
-    ESP_LOGE(TAG, "Communication with EMC2101 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
     this->status_set_warning();
     return;
   }
@@ -119,7 +119,7 @@ void Emc2101Component::set_duty_cycle(float value) {
 float Emc2101Component::get_duty_cycle() {
   uint8_t duty_cycle;
   if (!this->read_byte(EMC2101_REGISTER_FAN_SETTING, &duty_cycle)) {
-    ESP_LOGE(TAG, "Communication with EMC2101 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
     this->status_set_warning();
     return NAN;
   }
@@ -129,7 +129,7 @@ float Emc2101Component::get_duty_cycle() {
 float Emc2101Component::get_internal_temperature() {
   uint8_t temperature;
   if (!this->read_byte(EMC2101_REGISTER_INTERNAL_TEMP, &temperature)) {
-    ESP_LOGE(TAG, "Communication with EMC2101 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
     this->status_set_warning();
     return NAN;
   }
@@ -141,7 +141,7 @@ float Emc2101Component::get_external_temperature() {
   uint8_t lsb, msb;
   if (!this->read_byte(EMC2101_REGISTER_EXTERNAL_TEMP_MSB, &msb) ||
       !this->read_byte(EMC2101_REGISTER_EXTERNAL_TEMP_LSB, &lsb)) {
-    ESP_LOGE(TAG, "Communication with EMC2101 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
     this->status_set_warning();
     return NAN;
   }
@@ -155,7 +155,7 @@ float Emc2101Component::get_speed() {
   // Read **LSB** first to match 'Data Read Interlock' behavior from 6.1 of datasheet
   uint8_t lsb, msb;
   if (!this->read_byte(EMC2101_REGISTER_TACH_LSB, &lsb) || !this->read_byte(EMC2101_REGISTER_TACH_MSB, &msb)) {
-    ESP_LOGE(TAG, "Communication with EMC2101 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
     this->status_set_warning();
     return NAN;
   }

esphome/components/ens160_base/ens160_base.cpp

@@ -279,7 +279,7 @@ void ENS160Component::dump_config() {
 
   switch (this->error_code_) {
     case COMMUNICATION_FAILED:
-      ESP_LOGE(TAG, "Communication failed! Is the sensor connected?");
+      ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
       break;
     case READ_FAILED:
       ESP_LOGE(TAG, "Error reading from register");

esphome/components/ens210/ens210.cpp

@@ -163,7 +163,7 @@ void ENS210Component::update() {
 
     // Read T_VAL and H_VAL
     if (!this->read_bytes(ENS210_REGISTER_T_VAL, data, 6)) {
-      ESP_LOGE(TAG, "Communication with ENS210 failed!");
+      ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
       this->status_set_warning();
       return;
     }

esphome/components/esp32/boards.py

@@ -2,7 +2,6 @@ from .const import (
     VARIANT_ESP32,
     VARIANT_ESP32C2,
     VARIANT_ESP32C3,
-    VARIANT_ESP32C5,
     VARIANT_ESP32C6,
     VARIANT_ESP32H2,
     VARIANT_ESP32P4,
@@ -1340,17 +1339,7 @@ ESP32_BOARD_PINS = {
 }
 
 """
-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\": {\"name\": \"$name\", \"variant\": VARIANT_${variant},},"
-done | sort
+BOARDS generated with script/generate-esp32-boards.py
 """
 
 BOARDS = {
@@ -1362,6 +1351,10 @@ BOARDS = {
         "name": "Adafruit pyCamera S3",
         "variant": VARIANT_ESP32S3,
     },
+    "adafruit_feather_esp32_v2": {
+        "name": "Adafruit Feather ESP32 V2",
+        "variant": VARIANT_ESP32,
+    },
     "adafruit_feather_esp32c6": {
         "name": "Adafruit Feather ESP32-C6",
         "variant": VARIANT_ESP32C6,
@@ -1394,10 +1387,6 @@ BOARDS = {
         "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,
@@ -1422,14 +1411,14 @@ BOARDS = {
         "name": "Adafruit Metro ESP32-S3",
         "variant": VARIANT_ESP32S3,
     },
-    "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_esp32c3": {
+        "name": "Adafruit QT Py ESP32-C3",
+        "variant": VARIANT_ESP32C3,
+    },
     "adafruit_qtpy_esp32s2": {
         "name": "Adafruit QT Py ESP32-S2",
         "variant": VARIANT_ESP32S2,
@@ -1478,14 +1467,14 @@ BOARDS = {
         "name": "Smart Bee Data Logger",
         "variant": VARIANT_ESP32S3,
     },
-    "bee_motion_mini": {
-        "name": "Smart Bee Motion Mini",
-        "variant": VARIANT_ESP32C3,
-    },
     "bee_motion": {
         "name": "Smart Bee Motion",
         "variant": VARIANT_ESP32S2,
     },
+    "bee_motion_mini": {
+        "name": "Smart Bee Motion Mini",
+        "variant": VARIANT_ESP32C3,
+    },
     "bee_motion_s3": {
         "name": "Smart Bee Motion S3",
         "variant": VARIANT_ESP32S3,
@@ -1518,6 +1507,10 @@ BOARDS = {
         "name": "D-duino-32",
         "variant": VARIANT_ESP32,
     },
+    "deneyapkart": {
+        "name": "Deneyap Kart",
+        "variant": VARIANT_ESP32,
+    },
     "deneyapkart1A": {
         "name": "Deneyap Kart 1A",
         "variant": VARIANT_ESP32,
@@ -1530,10 +1523,6 @@ BOARDS = {
         "name": "Deneyap Kart G",
         "variant": VARIANT_ESP32C3,
     },
-    "deneyapkart": {
-        "name": "Deneyap Kart",
-        "variant": VARIANT_ESP32,
-    },
     "deneyapmini": {
         "name": "Deneyap Mini",
         "variant": VARIANT_ESP32S2,
@@ -1574,8 +1563,8 @@ BOARDS = {
         "name": "Seeed Studio Edgebox-ESP-100",
         "variant": VARIANT_ESP32S3,
     },
-    "esp320": {
-        "name": "Electronic SweetPeas ESP320",
+    "esp-wrover-kit": {
+        "name": "Espressif ESP-WROVER-KIT",
         "variant": VARIANT_ESP32,
     },
     "esp32-c2-devkitm-1": {
@@ -1594,10 +1583,6 @@ BOARDS = {
         "name": "Ai-Thinker ESP-C3-M1-I-Kit",
         "variant": VARIANT_ESP32C3,
     },
-    "esp32-c5-devkitc-1": {
-        "name": "Espressif ESP32-C5-DevKitC-1",
-        "variant": VARIANT_ESP32C5,
-    },
     "esp32-c6-devkitc-1": {
         "name": "Espressif ESP32-C6-DevKitC-1",
         "variant": VARIANT_ESP32C6,
@@ -1606,26 +1591,10 @@ BOARDS = {
         "name": "Espressif ESP32-C6-DevKitM-1",
         "variant": VARIANT_ESP32C6,
     },
-    "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,
@@ -1650,14 +1619,14 @@ BOARDS = {
         "name": "Espressif ESP32-PICO-DevKitM-2",
         "variant": VARIANT_ESP32,
     },
-    "esp32-poe-iso": {
-        "name": "OLIMEX ESP32-PoE-ISO",
-        "variant": VARIANT_ESP32,
-    },
     "esp32-poe": {
         "name": "OLIMEX ESP32-PoE",
         "variant": VARIANT_ESP32,
     },
+    "esp32-poe-iso": {
+        "name": "OLIMEX ESP32-PoE-ISO",
+        "variant": VARIANT_ESP32,
+    },
     "esp32-pro": {
         "name": "OLIMEX ESP32-PRO",
         "variant": VARIANT_ESP32,
@@ -1674,14 +1643,6 @@ BOARDS = {
         "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,
@@ -1690,18 +1651,50 @@ BOARDS = {
         "name": "Espressif ESP32-S3-DevKitM-1",
         "variant": VARIANT_ESP32S3,
     },
+    "esp32-solo1": {
+        "name": "Espressif Generic ESP32-solo1 4M Flash",
+        "variant": VARIANT_ESP32,
+    },
+    "esp320": {
+        "name": "Electronic SweetPeas ESP320",
+        "variant": VARIANT_ESP32,
+    },
+    "esp32cam": {
+        "name": "AI Thinker ESP32-CAM",
+        "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,
+    },
+    "esp32s3_120_16_8-qio_opi": {
+        "name": "ESP32-S3 16MB QIO, 8MB OPI PSRAM",
+        "variant": VARIANT_ESP32S3,
+    },
     "esp32s3_powerfeather": {
         "name": "ESP32-S3 PowerFeather",
         "variant": VARIANT_ESP32S3,
     },
+    "esp32s3box": {
+        "name": "Espressif ESP32-S3-Box",
+        "variant": VARIANT_ESP32S3,
+    },
+    "esp32s3camlcd": {
+        "name": "ESP32S3 CAM LCD",
+        "variant": VARIANT_ESP32S3,
+    },
     "esp32s3usbotg": {
         "name": "Espressif ESP32-S3-USB-OTG",
         "variant": VARIANT_ESP32S3,
     },
-    "esp32-solo1": {
-        "name": "Espressif Generic ESP32-solo1 4M Flash",
-        "variant": VARIANT_ESP32,
-    },
     "esp32thing": {
         "name": "SparkFun ESP32 Thing",
         "variant": VARIANT_ESP32,
@@ -1726,10 +1719,6 @@ BOARDS = {
         "name": "ESPino32",
         "variant": VARIANT_ESP32,
     },
-    "esp-wrover-kit": {
-        "name": "Espressif ESP-WROVER-KIT",
-        "variant": VARIANT_ESP32,
-    },
     "etboard": {
         "name": "ETBoard",
         "variant": VARIANT_ESP32,
@@ -1758,6 +1747,14 @@ BOARDS = {
         "name": "Franzininho WiFi MSC",
         "variant": VARIANT_ESP32S2,
     },
+    "freenove_esp32_s3_wroom": {
+        "name": "Freenove ESP32-S3 WROOM N8R8 (8MB Flash / 8MB PSRAM)",
+        "variant": VARIANT_ESP32S3,
+    },
+    "freenove_esp32_wrover": {
+        "name": "Freenove ESP32-Wrover",
+        "variant": VARIANT_ESP32,
+    },
     "frogboard": {
         "name": "Frog Board ESP32",
         "variant": VARIANT_ESP32,
@@ -1774,6 +1771,10 @@ BOARDS = {
         "name": "Heltec WiFi Kit 32 (V3)",
         "variant": VARIANT_ESP32S3,
     },
+    "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,
@@ -1786,14 +1787,14 @@ BOARDS = {
         "name": "Heltec WiFi LoRa 32 (V3)",
         "variant": VARIANT_ESP32S3,
     },
-    "heltec_wireless_stick_lite": {
-        "name": "Heltec Wireless Stick Lite",
-        "variant": VARIANT_ESP32,
-    },
     "heltec_wireless_stick": {
         "name": "Heltec Wireless Stick",
         "variant": VARIANT_ESP32,
     },
+    "heltec_wireless_stick_lite": {
+        "name": "Heltec Wireless Stick Lite",
+        "variant": VARIANT_ESP32,
+    },
     "honeylemon": {
         "name": "HONEYLemon",
         "variant": VARIANT_ESP32,
@@ -1806,6 +1807,14 @@ BOARDS = {
         "name": "Hornbill ESP32 Minima",
         "variant": VARIANT_ESP32,
     },
+    "huidu_hd_wf2": {
+        "name": "Huidu HD-WF2",
+        "variant": VARIANT_ESP32S3,
+    },
+    "huidu_hd_wf4": {
+        "name": "Huidu HD-WF4",
+        "variant": VARIANT_ESP32S3,
+    },
     "imbrios-logsens-v1p1": {
         "name": "Imbrios LogSens V1P1",
         "variant": VARIANT_ESP32,
@@ -1838,6 +1847,10 @@ BOARDS = {
         "name": "ArtronShop IOXESP32PS",
         "variant": VARIANT_ESP32,
     },
+    "jczn_2432s028r": {
+        "name": "ESP32-2432S028R CYD",
+        "variant": VARIANT_ESP32,
+    },
     "kb32-ft": {
         "name": "MakerAsia KB32-FT",
         "variant": VARIANT_ESP32,
@@ -1862,6 +1875,10 @@ BOARDS = {
         "name": "LilyGo T-Display-S3",
         "variant": VARIANT_ESP32S3,
     },
+    "lilygo-t3-s3": {
+        "name": "LilyGo T3-S3",
+        "variant": VARIANT_ESP32S3,
+    },
     "lionbit": {
         "name": "Lion:Bit Dev Board",
         "variant": VARIANT_ESP32,
@@ -1870,14 +1887,14 @@ BOARDS = {
         "name": "Lion:Bit S3 STEM Dev Board",
         "variant": VARIANT_ESP32S3,
     },
-    "lolin32_lite": {
-        "name": "WEMOS LOLIN32 Lite",
-        "variant": VARIANT_ESP32,
-    },
     "lolin32": {
         "name": "WEMOS LOLIN32",
         "variant": VARIANT_ESP32,
     },
+    "lolin32_lite": {
+        "name": "WEMOS LOLIN32 Lite",
+        "variant": VARIANT_ESP32,
+    },
     "lolin_c3_mini": {
         "name": "WEMOS LOLIN C3 Mini",
         "variant": VARIANT_ESP32C3,
@@ -1898,26 +1915,30 @@ BOARDS = {
         "name": "WEMOS LOLIN S2 PICO",
         "variant": VARIANT_ESP32S2,
     },
+    "lolin_s3": {
+        "name": "WEMOS LOLIN S3",
+        "variant": VARIANT_ESP32S3,
+    },
     "lolin_s3_mini": {
         "name": "WEMOS LOLIN S3 Mini",
         "variant": VARIANT_ESP32S3,
     },
-    "lolin_s3": {
-        "name": "WEMOS LOLIN S3",
+    "lolin_s3_mini_pro": {
+        "name": "WEMOS LOLIN S3 Mini Pro",
         "variant": VARIANT_ESP32S3,
     },
     "lolin_s3_pro": {
         "name": "WEMOS LOLIN S3 PRO",
         "variant": VARIANT_ESP32S3,
     },
-    "lopy4": {
-        "name": "Pycom LoPy4",
-        "variant": VARIANT_ESP32,
-    },
     "lopy": {
         "name": "Pycom LoPy",
         "variant": VARIANT_ESP32,
     },
+    "lopy4": {
+        "name": "Pycom LoPy4",
+        "variant": VARIANT_ESP32,
+    },
     "m5stack-atom": {
         "name": "M5Stack-ATOM",
         "variant": VARIANT_ESP32,
@@ -1926,16 +1947,16 @@ BOARDS = {
         "name": "M5Stack AtomS3",
         "variant": VARIANT_ESP32S3,
     },
-    "m5stack-core2": {
-        "name": "M5Stack Core2",
+    "m5stack-core-esp32": {
+        "name": "M5Stack Core ESP32",
         "variant": VARIANT_ESP32,
     },
     "m5stack-core-esp32-16M": {
         "name": "M5Stack Core ESP32 16M",
         "variant": VARIANT_ESP32,
     },
-    "m5stack-core-esp32": {
-        "name": "M5Stack Core ESP32",
+    "m5stack-core2": {
+        "name": "M5Stack Core2",
         "variant": VARIANT_ESP32,
     },
     "m5stack-coreink": {
@@ -1954,10 +1975,6 @@ BOARDS = {
         "name": "M5Stack GREY ESP32",
         "variant": VARIANT_ESP32,
     },
-    "m5stack_paper": {
-        "name": "M5Stack Paper",
-        "variant": VARIANT_ESP32,
-    },
     "m5stack-stamps3": {
         "name": "M5Stack StampS3",
         "variant": VARIANT_ESP32S3,
@@ -1970,6 +1987,10 @@ BOARDS = {
         "name": "M5Stack Timer CAM",
         "variant": VARIANT_ESP32,
     },
+    "m5stack_paper": {
+        "name": "M5Stack Paper",
+        "variant": VARIANT_ESP32,
+    },
     "m5stamp-pico": {
         "name": "M5Stamp-Pico",
         "variant": VARIANT_ESP32,
@@ -2038,14 +2059,14 @@ BOARDS = {
         "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,
     },
+    "nodemcu-32s2": {
+        "name": "Ai-Thinker NodeMCU-32S2 (ESP-12K)",
+        "variant": VARIANT_ESP32S2,
+    },
     "nscreen-32": {
         "name": "YeaCreate NSCREEN-32",
         "variant": VARIANT_ESP32,
@@ -2094,10 +2115,22 @@ BOARDS = {
         "name": "RoboHeart Hercules",
         "variant": VARIANT_ESP32,
     },
+    "rymcu-esp32-s3-devkitc-1": {
+        "name": "RYMCU ESP32-S3-DevKitC-1-N8R2 (8 MB QD, 2 MB PSRAM)",
+        "variant": VARIANT_ESP32S3,
+    },
+    "s_odi_ultra": {
+        "name": "S.ODI Ultra v1",
+        "variant": VARIANT_ESP32,
+    },
     "seeed_xiao_esp32c3": {
         "name": "Seeed Studio XIAO ESP32C3",
         "variant": VARIANT_ESP32C3,
     },
+    "seeed_xiao_esp32c6": {
+        "name": "Seeed Studio XIAO ESP32C6",
+        "variant": VARIANT_ESP32C6,
+    },
     "seeed_xiao_esp32s3": {
         "name": "Seeed Studio XIAO ESP32S3",
         "variant": VARIANT_ESP32S3,
@@ -2114,34 +2147,38 @@ BOARDS = {
         "name": "SG-O AirMon",
         "variant": VARIANT_ESP32,
     },
-    "s_odi_ultra": {
-        "name": "S.ODI Ultra v1",
+    "sparkfun_esp32_iot_redboard": {
+        "name": "SparkFun ESP32 IoT RedBoard",
         "variant": VARIANT_ESP32,
     },
     "sparkfun_esp32c6_thing_plus": {
         "name": "Sparkfun ESP32-C6 Thing Plus",
         "variant": VARIANT_ESP32C6,
     },
-    "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_esp32s2_thing_plus_c": {
+        "name": "SparkFun ESP32 Thing Plus C",
+        "variant": VARIANT_ESP32,
+    },
+    "sparkfun_esp32s3_thing_plus": {
+        "name": "SPARKFUN_ESP32S3_THING_PLUS",
+        "variant": VARIANT_ESP32S3,
+    },
     "sparkfun_lora_gateway_1-channel": {
         "name": "SparkFun LoRa Gateway 1-Channel",
         "variant": VARIANT_ESP32,
     },
+    "sparkfun_qwiic_pocket_esp32c6": {
+        "name": "SparkFun ESP32-C6 Qwiic Pocket",
+        "variant": VARIANT_ESP32C6,
+    },
     "tamc_termod_s3": {
         "name": "TAMC Termod S3",
         "variant": VARIANT_ESP32S3,
@@ -2150,6 +2187,10 @@ BOARDS = {
         "name": "Unexpected Maker TinyPICO",
         "variant": VARIANT_ESP32,
     },
+    "trueverit-iot-driver": {
+        "name": "Trueverit ESP32 Universal IoT Driver",
+        "variant": VARIANT_ESP32,
+    },
     "trueverit-iot-driver-mk2": {
         "name": "Trueverit ESP32 Universal IoT Driver MK II",
         "variant": VARIANT_ESP32,
@@ -2158,32 +2199,16 @@ BOARDS = {
         "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",
+    "ttgo-lora32-v21": {
+        "name": "TTGO LoRa32-OLED v2.1.6",
         "variant": VARIANT_ESP32,
     },
     "ttgo-t-beam": {
@@ -2198,6 +2223,18 @@ BOARDS = {
         "name": "TTGO T-Watch",
         "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,
+    },
     "turta_iot_node": {
         "name": "Turta IoT Node",
         "variant": VARIANT_ESP32,
@@ -2270,9 +2307,17 @@ BOARDS = {
         "name": "SQFMI Watchy v2.0",
         "variant": VARIANT_ESP32,
     },
-    "wemosbat": {
-        "name": "WeMos WiFi and Bluetooth Battery",
-        "variant": VARIANT_ESP32,
+    "waveshare_esp32_s3_zero": {
+        "name": "Waveshare ESP32-S3-Zero",
+        "variant": VARIANT_ESP32S3,
+    },
+    "waveshare_esp32s3_touch_lcd_128": {
+        "name": "Waveshare ESP32-S3-Touch-LCD-1.28 (16 MB QD, 2MB PSRAM)",
+        "variant": VARIANT_ESP32S3,
+    },
+    "weactstudio_esp32c3coreboard": {
+        "name": "WeAct Studio ESP32C3CoreBoard",
+        "variant": VARIANT_ESP32C3,
     },
     "wemos_d1_mini32": {
         "name": "WEMOS D1 MINI ESP32",
@@ -2282,6 +2327,10 @@ BOARDS = {
         "name": "WEMOS D1 R32",
         "variant": VARIANT_ESP32,
     },
+    "wemosbat": {
+        "name": "WeMos WiFi and Bluetooth Battery",
+        "variant": VARIANT_ESP32,
+    },
     "wesp32": {
         "name": "Silicognition wESP32",
         "variant": VARIANT_ESP32,
@@ -2290,14 +2339,14 @@ BOARDS = {
         "name": "Widora AIR",
         "variant": VARIANT_ESP32,
     },
-    "wifiduino32c3": {
-        "name": "Blinker WiFiduinoV2 (ESP32-C3)",
-        "variant": VARIANT_ESP32C3,
-    },
     "wifiduino32": {
         "name": "Blinker WiFiduino32",
         "variant": VARIANT_ESP32,
     },
+    "wifiduino32c3": {
+        "name": "Blinker WiFiduinoV2 (ESP32-C3)",
+        "variant": VARIANT_ESP32C3,
+    },
     "wifiduino32s3": {
         "name": "Blinker WiFiduino32S3",
         "variant": VARIANT_ESP32S3,
@@ -2306,12 +2355,32 @@ BOARDS = {
         "name": "Pycom WiPy3",
         "variant": VARIANT_ESP32,
     },
+    "ws_esp32_s3_matrix": {
+        "name": "Waveshare ESP32-S3-Matrix",
+        "variant": VARIANT_ESP32S3,
+    },
     "wt32-eth01": {
         "name": "Wireless-Tag WT32-ETH01 Ethernet Module",
         "variant": VARIANT_ESP32,
     },
+    "wt32-sc01-plus": {
+        "name": "wt32-sc01-plus",
+        "variant": VARIANT_ESP32S3,
+    },
     "xinabox_cw02": {
         "name": "XinaBox CW02",
         "variant": VARIANT_ESP32,
     },
+    "yb_esp32s3_amp_v2": {
+        "name": "YelloByte YB-ESP32-S3-AMP (Rev.2)",
+        "variant": VARIANT_ESP32S3,
+    },
+    "yb_esp32s3_amp_v3": {
+        "name": "YelloByte YB-ESP32-S3-AMP (Rev.3)",
+        "variant": VARIANT_ESP32S3,
+    },
+    "yb_esp32s3_eth": {
+        "name": "YelloByte YB-ESP32-S3-ETH",
+        "variant": VARIANT_ESP32S3,
+    },
 }

esphome/components/esp32/preferences.cpp

@@ -84,7 +84,7 @@ class ESP32Preferences : public ESPPreferences {
     if (err == 0)
       return;
 
-    ESP_LOGW(TAG, "nvs_open failed: %s - erasing NVS...", esp_err_to_name(err));
+    ESP_LOGW(TAG, "nvs_open failed: %s - erasing NVS", esp_err_to_name(err));
     nvs_flash_deinit();
     nvs_flash_erase();
     nvs_flash_init();
@@ -111,7 +111,7 @@ class ESP32Preferences : public ESPPreferences {
     if (s_pending_save.empty())
       return true;
 
-    ESP_LOGD(TAG, "Saving %d preferences to flash...", s_pending_save.size());
+    ESP_LOGV(TAG, "Saving %d items...", s_pending_save.size());
     // goal try write all pending saves even if one fails
     int cached = 0, written = 0, failed = 0;
     esp_err_t last_err = ESP_OK;
@@ -139,10 +139,10 @@ class ESP32Preferences : public ESPPreferences {
       }
       s_pending_save.erase(s_pending_save.begin() + i);
     }
-    ESP_LOGD(TAG, "Saving %d preferences to flash: %d cached, %d written, %d failed", cached + written + failed, cached,
-             written, failed);
+    ESP_LOGD(TAG, "Writing %d items: %d cached, %d written, %d failed", cached + written + failed, cached, written,
+             failed);
     if (failed > 0) {
-      ESP_LOGE(TAG, "Error saving %d preferences to flash. Last error=%s for key=%s", failed, esp_err_to_name(last_err),
+      ESP_LOGE(TAG, "Writing %d items failed. Last error=%s for key=%s", failed, esp_err_to_name(last_err),
                last_key.c_str());
     }
 
@@ -173,7 +173,7 @@ class ESP32Preferences : public ESPPreferences {
   }
 
   bool reset() override {
-    ESP_LOGD(TAG, "Cleaning up preferences in flash...");
+    ESP_LOGD(TAG, "Erasing storage");
     s_pending_save.clear();
 
     nvs_flash_deinit();

esphome/components/esp32_ble/ble.cpp

@@ -270,14 +270,14 @@ void ESP32BLE::loop() {
     case BLE_COMPONENT_STATE_DISABLED:
       return;
     case BLE_COMPONENT_STATE_DISABLE: {
-      ESP_LOGD(TAG, "Disabling BLE...");
+      ESP_LOGD(TAG, "Disabling");
 
       for (auto *ble_event_handler : this->ble_status_event_handlers_) {
         ble_event_handler->ble_before_disabled_event_handler();
       }
 
       if (!ble_dismantle_()) {
-        ESP_LOGE(TAG, "BLE could not be dismantled");
+        ESP_LOGE(TAG, "Could not be dismantled");
         this->mark_failed();
         return;
       }
@@ -285,11 +285,11 @@ void ESP32BLE::loop() {
       return;
     }
     case BLE_COMPONENT_STATE_ENABLE: {
-      ESP_LOGD(TAG, "Enabling BLE...");
+      ESP_LOGD(TAG, "Enabling");
       this->state_ = BLE_COMPONENT_STATE_OFF;
 
       if (!ble_setup_()) {
-        ESP_LOGE(TAG, "BLE could not be set up");
+        ESP_LOGE(TAG, "Could not be set up");
         this->mark_failed();
         return;
       }

esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp

@@ -172,7 +172,7 @@ void ESP32BLETracker::loop() {
       (this->scan_set_param_failed_ && this->scanner_state_ == ScannerState::RUNNING)) {
     this->stop_scan_();
     if (this->scan_start_fail_count_ == std::numeric_limits<uint8_t>::max()) {
-      ESP_LOGE(TAG, "ESP-IDF BLE scan could not restart after %d attempts, rebooting to restore BLE stack...",
+      ESP_LOGE(TAG, "Scan could not restart after %d attempts, rebooting to restore stack (IDF)",
                std::numeric_limits<uint8_t>::max());
       App.reboot();
     }
@@ -219,10 +219,10 @@ void ESP32BLETracker::loop() {
     for (auto *client : this->clients_) {
       if (client->state() == ClientState::DISCOVERED) {
         if (this->scanner_state_ == ScannerState::RUNNING) {
-          ESP_LOGD(TAG, "Stopping scan to make connection...");
+          ESP_LOGD(TAG, "Stopping scan to make connection");
           this->stop_scan_();
         } else if (this->scanner_state_ == ScannerState::IDLE) {
-          ESP_LOGD(TAG, "Promoting client to connect...");
+          ESP_LOGD(TAG, "Promoting client to connect");
           // We only want to promote one client at a time.
           // once the scanner is fully stopped.
 #ifdef USE_ESP32_BLE_SOFTWARE_COEXISTENCE
@@ -306,7 +306,7 @@ void ESP32BLETracker::start_scan_(bool first) {
 
   // Start timeout before scan is started. Otherwise scan never starts if any error.
   this->set_timeout("scan", this->scan_duration_ * 2000, []() {
-    ESP_LOGE(TAG, "ESP-IDF BLE scan never terminated, rebooting to restore BLE stack...");
+    ESP_LOGE(TAG, "Scan never terminated, rebooting to restore stack (IDF)");
     App.reboot();
   });
 

esphome/components/esp32_improv/esp32_improv_component.cpp

@@ -324,10 +324,10 @@ void ESP32ImprovComponent::process_incoming_data_() {
         this->incoming_data_.clear();
     }
   } else if (this->incoming_data_.size() - 2 > length) {
-    ESP_LOGV(TAG, "Too much data received or data malformed; resetting buffer...");
+    ESP_LOGV(TAG, "Too much data received or data malformed; resetting buffer");
     this->incoming_data_.clear();
   } else {
-    ESP_LOGV(TAG, "Waiting for split data packets...");
+    ESP_LOGV(TAG, "Waiting for split data packets");
   }
 }
 

esphome/components/esp32_rmt_led_strip/led_strip.cpp

@@ -143,7 +143,7 @@ void ESP32RMTLEDStripLightOutput::write_state(light::LightState *state) {
   this->last_refresh_ = now;
   this->mark_shown_();
 
-  ESP_LOGVV(TAG, "Writing RGB values to bus...");
+  ESP_LOGVV(TAG, "Writing RGB values to bus");
 
 #if ESP_IDF_VERSION_MAJOR >= 5
   esp_err_t error = rmt_tx_wait_all_done(this->channel_, 1000);

esphome/components/esp8266/gpio.cpp

@@ -40,6 +40,7 @@ struct ISRPinArg {
   volatile uint32_t *mode_set_reg;
   volatile uint32_t *mode_clr_reg;
   volatile uint32_t *func_reg;
+  volatile uint32_t *control_reg;
   uint32_t mask;
 };
 
@@ -54,6 +55,7 @@ ISRInternalGPIOPin ESP8266GPIOPin::to_isr() const {
     arg->mode_set_reg = &GPES;
     arg->mode_clr_reg = &GPEC;
     arg->func_reg = &GPF(this->pin_);
+    arg->control_reg = &GPC(this->pin_);
     arg->mask = 1 << this->pin_;
   } else {
     arg->in_reg = &GP16I;
@@ -62,6 +64,7 @@ ISRInternalGPIOPin ESP8266GPIOPin::to_isr() const {
     arg->mode_set_reg = &GP16E;
     arg->mode_clr_reg = nullptr;
     arg->func_reg = &GPF16;
+    arg->control_reg = nullptr;
     arg->mask = 1;
   }
   return ISRInternalGPIOPin((void *) arg);
@@ -143,11 +146,17 @@ void IRAM_ATTR ISRInternalGPIOPin::pin_mode(gpio::Flags flags) {
   if (arg->pin < 16) {
     if (flags & gpio::FLAG_OUTPUT) {
       *arg->mode_set_reg = arg->mask;
-    } else {
+      if (flags & gpio::FLAG_OPEN_DRAIN) {
+        *arg->control_reg |= 1 << GPCD;
+      } else {
+        *arg->control_reg &= ~(1 << GPCD);
+      }
+    } else if (flags & gpio::FLAG_INPUT) {
       *arg->mode_clr_reg = arg->mask;
     }
     if (flags & gpio::FLAG_PULLUP) {
       *arg->func_reg |= 1 << GPFPU;
+      *arg->control_reg |= 1 << GPCD;
     } else {
       *arg->func_reg &= ~(1 << GPFPU);
     }

esphome/components/esp8266/preferences.cpp

@@ -169,7 +169,7 @@ class ESP8266Preferences : public ESPPreferences {
 
   void setup() {
     s_flash_storage = new uint32_t[ESP8266_FLASH_STORAGE_SIZE];  // NOLINT
-    ESP_LOGVV(TAG, "Loading preferences from flash...");
+    ESP_LOGVV(TAG, "Loading preferences from flash");
 
     {
       InterruptLock lock;
@@ -235,7 +235,7 @@ class ESP8266Preferences : public ESPPreferences {
     if (s_prevent_write)
       return false;
 
-    ESP_LOGD(TAG, "Saving preferences to flash...");
+    ESP_LOGD(TAG, "Saving");
     SpiFlashOpResult erase_res, write_res = SPI_FLASH_RESULT_OK;
     {
       InterruptLock lock;
@@ -245,11 +245,11 @@ class ESP8266Preferences : public ESPPreferences {
       }
     }
     if (erase_res != SPI_FLASH_RESULT_OK) {
-      ESP_LOGE(TAG, "Erase ESP8266 flash failed!");
+      ESP_LOGE(TAG, "Erasing failed");
       return false;
     }
     if (write_res != SPI_FLASH_RESULT_OK) {
-      ESP_LOGE(TAG, "Write ESP8266 flash failed!");
+      ESP_LOGE(TAG, "Writing failed");
       return false;
     }
 
@@ -258,14 +258,14 @@ class ESP8266Preferences : public ESPPreferences {
   }
 
   bool reset() override {
-    ESP_LOGD(TAG, "Cleaning up preferences in flash...");
+    ESP_LOGD(TAG, "Erasing storage");
     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!");
+      ESP_LOGE(TAG, "Erasing failed");
       return false;
     }
 

esphome/components/esphome/ota/ota_esphome.cpp

@@ -119,7 +119,7 @@ void ESPHomeOTAComponent::handle_() {
     return;
   }
 
-  ESP_LOGD(TAG, "Starting update from %s...", this->client_->getpeername().c_str());
+  ESP_LOGD(TAG, "Starting update from %s", this->client_->getpeername().c_str());
   this->status_set_warning();
 #ifdef USE_OTA_STATE_CALLBACK
   this->state_callback_.call(ota::OTA_STARTED, 0.0f, 0);

esphome/components/ethernet/ethernet_component.cpp

@@ -245,33 +245,33 @@ void EthernetComponent::loop() {
   switch (this->state_) {
     case EthernetComponentState::STOPPED:
       if (this->started_) {
-        ESP_LOGI(TAG, "Starting ethernet connection");
+        ESP_LOGI(TAG, "Starting connection");
         this->state_ = EthernetComponentState::CONNECTING;
         this->start_connect_();
       }
       break;
     case EthernetComponentState::CONNECTING:
       if (!this->started_) {
-        ESP_LOGI(TAG, "Stopped ethernet connection");
+        ESP_LOGI(TAG, "Stopped connection");
         this->state_ = EthernetComponentState::STOPPED;
       } else if (this->connected_) {
         // connection established
-        ESP_LOGI(TAG, "Connected via Ethernet!");
+        ESP_LOGI(TAG, "Connected");
         this->state_ = EthernetComponentState::CONNECTED;
 
         this->dump_connect_params_();
         this->status_clear_warning();
       } else if (now - this->connect_begin_ > 15000) {
-        ESP_LOGW(TAG, "Connecting via ethernet failed! Re-connecting...");
+        ESP_LOGW(TAG, "Connecting failed; reconnecting");
         this->start_connect_();
       }
       break;
     case EthernetComponentState::CONNECTED:
       if (!this->started_) {
-        ESP_LOGI(TAG, "Stopped ethernet connection");
+        ESP_LOGI(TAG, "Stopped connection");
         this->state_ = EthernetComponentState::STOPPED;
       } else if (!this->connected_) {
-        ESP_LOGW(TAG, "Connection via Ethernet lost! Re-connecting...");
+        ESP_LOGW(TAG, "Connection lost; reconnecting");
         this->state_ = EthernetComponentState::CONNECTING;
         this->start_connect_();
       }

esphome/components/ezo/ezo.cpp

@@ -15,7 +15,7 @@ void EZOSensor::dump_config() {
   LOG_SENSOR("", "EZO", this);
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with EZO circuit failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   LOG_UPDATE_INTERVAL(this);
 }

esphome/components/ezo_pmp/ezo_pmp.cpp

@@ -41,7 +41,7 @@ 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!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   LOG_UPDATE_INTERVAL(this);
 }

esphome/components/factory_reset/button/factory_reset_button.cpp

@@ -10,7 +10,7 @@ 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...");
+  ESP_LOGI(TAG, "Resetting");
   // Let MQTT settle a bit
   delay(100);  // NOLINT
   global_preferences->reset();

esphome/components/factory_reset/switch/factory_reset_switch.cpp

@@ -14,7 +14,7 @@ void FactoryResetSwitch::write_state(bool state) {
   this->publish_state(false);
 
   if (state) {
-    ESP_LOGI(TAG, "Resetting to factory defaults...");
+    ESP_LOGI(TAG, "Resetting");
     // Let MQTT settle a bit
     delay(100);  // NOLINT
     global_preferences->reset();

esphome/components/fastled_base/fastled_light.cpp

@@ -33,7 +33,7 @@ void FastLEDLightOutput::write_state(light::LightState *state) {
   this->last_refresh_ = now;
   this->mark_shown_();
 
-  ESP_LOGVV(TAG, "Writing RGB values to bus...");
+  ESP_LOGVV(TAG, "Writing RGB values to bus");
   this->controller_->showLeds(this->state_parent_->current_values.get_brightness() * 255);
 }
 

esphome/components/gcja5/gcja5.cpp

@@ -14,8 +14,6 @@ namespace gcja5 {
 
 static const char *const TAG = "gcja5";
 
-void GCJA5Component::setup() { ESP_LOGCONFIG(TAG, "Running setup"); }
-
 void GCJA5Component::loop() {
   const uint32_t now = App.get_loop_component_start_time();
   if (now - this->last_transmission_ >= 500) {

esphome/components/gcja5/gcja5.h

@@ -9,7 +9,6 @@ namespace gcja5 {
 
 class GCJA5Component : public Component, public uart::UARTDevice {
  public:
-  void setup() override;
   void dump_config() override;
   void loop() override;
   float get_setup_priority() const override { return setup_priority::DATA; }

esphome/components/gdk101/gdk101.cpp

@@ -60,7 +60,7 @@ void GDK101Component::dump_config() {
   ESP_LOGCONFIG(TAG, "GDK101:");
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with GDK101 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
 #ifdef USE_SENSOR
   LOG_SENSOR("  ", "Firmware Version", this->fw_version_sensor_);

esphome/components/gpio/output/gpio_binary_output.cpp

@@ -7,7 +7,7 @@ namespace gpio {
 static const char *const TAG = "gpio.output";
 
 void GPIOBinaryOutput::dump_config() {
-  ESP_LOGCONFIG(TAG, "GPIO Binary Output:");
+  ESP_LOGCONFIG(TAG, "Binary Output:");
   LOG_PIN("  Pin: ", this->pin_);
   LOG_BINARY_OUTPUT(this);
 }

esphome/components/grove_gas_mc_v2/grove_gas_mc_v2.cpp

@@ -67,17 +67,17 @@ void GroveGasMultichannelV2Component::dump_config() {
   if (this->is_failed()) {
     switch (this->error_code_) {
       case COMMUNICATION_FAILED:
-        ESP_LOGW(TAG, "Communication failed! Is the sensor connected?");
+        ESP_LOGW(TAG, ESP_LOG_MSG_COMM_FAIL);
         break;
       case APP_INVALID:
-        ESP_LOGW(TAG, "Sensor reported invalid APP installed.");
+        ESP_LOGW(TAG, "Sensor reported invalid APP installed");
         break;
       case APP_START_FAILED:
-        ESP_LOGW(TAG, "Sensor reported APP start failed.");
+        ESP_LOGW(TAG, "Sensor reported APP start failed");
         break;
       case UNKNOWN:
       default:
-        ESP_LOGW(TAG, "Unknown setup error!");
+        ESP_LOGW(TAG, "Unknown setup error");
         break;
     }
   }

esphome/components/haier/haier_base.cpp

@@ -242,7 +242,7 @@ haier_protocol::HandlerError HaierClimateBase::timeout_default_handler_(haier_pr
 }
 
 void HaierClimateBase::setup() {
-  ESP_LOGI(TAG, "Haier initialization...");
+  ESP_LOGCONFIG(TAG, "Running setup");
   // Set timestamp here to give AC time to boot
   this->last_request_timestamp_ = std::chrono::steady_clock::now();
   this->set_phase(ProtocolPhases::SENDING_INIT_1);
@@ -286,7 +286,7 @@ void HaierClimateBase::loop() {
     if (this->action_request_.has_value() && this->prepare_pending_action()) {
       this->set_phase(ProtocolPhases::SENDING_ACTION_COMMAND);
     } else if (this->next_hvac_settings_.valid || this->force_send_control_) {
-      ESP_LOGV(TAG, "Control packet is pending...");
+      ESP_LOGV(TAG, "Control packet is pending");
       this->set_phase(ProtocolPhases::SENDING_CONTROL);
       if (this->next_hvac_settings_.valid) {
         this->current_hvac_settings_ = this->next_hvac_settings_;

esphome/components/hdc1080/hdc1080.cpp

@@ -31,7 +31,7 @@ void HDC1080Component::dump_config() {
   ESP_LOGCONFIG(TAG, "HDC1080:");
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with HDC1080 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   LOG_UPDATE_INTERVAL(this);
   LOG_SENSOR("  ", "Temperature", this->temperature_);

esphome/components/hm3301/hm3301.cpp

@@ -23,7 +23,7 @@ void HM3301Component::dump_config() {
   ESP_LOGCONFIG(TAG, "HM3301:");
   LOG_I2C_DEVICE(this);
   if (error_code_ == ERROR_COMM) {
-    ESP_LOGE(TAG, "Communication with HM3301 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
 
   LOG_SENSOR("  ", "PM1.0", this->pm_1_0_sensor_);

esphome/components/hmc5883l/hmc5883l.cpp

@@ -73,7 +73,7 @@ void HMC5883LComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "HMC5883L:");
   LOG_I2C_DEVICE(this);
   if (this->error_code_ == COMMUNICATION_FAILED) {
-    ESP_LOGE(TAG, "Communication with HMC5883L failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   } else if (this->error_code_ == ID_REGISTERS) {
     ESP_LOGE(TAG, "The ID registers don't match - Is this really an HMC5883L?");
   }

esphome/components/honeywell_hih_i2c/honeywell_hih.cpp

@@ -17,7 +17,7 @@ void HoneywellHIComponent::read_sensor_data_() {
   uint8_t data[4];
 
   if (this->read(data, sizeof(data)) != i2c::ERROR_OK) {
-    ESP_LOGE(TAG, "Communication with Honeywell HIH failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
     this->mark_failed();
     return;
   }
@@ -37,7 +37,7 @@ void HoneywellHIComponent::read_sensor_data_() {
 
 void HoneywellHIComponent::start_measurement_() {
   if (this->write(REQUEST_CMD, sizeof(REQUEST_CMD)) != i2c::ERROR_OK) {
-    ESP_LOGE(TAG, "Communication with Honeywell HIH failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
     this->mark_failed();
     return;
   }
@@ -49,7 +49,7 @@ bool HoneywellHIComponent::is_measurement_ready_() {
   uint8_t data[1];
 
   if (this->read(data, sizeof(data)) != i2c::ERROR_OK) {
-    ESP_LOGE(TAG, "Communication with Honeywell HIH failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
     this->mark_failed();
     return false;
   }
@@ -84,7 +84,7 @@ void HoneywellHIComponent::dump_config() {
   ESP_LOGD(TAG, "Honeywell HIH:");
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with Honeywell HIH failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
   LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);

esphome/components/honeywellabp2_i2c/honeywellabp2.cpp

@@ -14,7 +14,7 @@ static const char *const TAG = "honeywellabp2";
 
 void HONEYWELLABP2Sensor::read_sensor_data() {
   if (this->read(raw_data_, 7) != i2c::ERROR_OK) {
-    ESP_LOGE(TAG, "Communication with ABP2 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
     this->status_set_warning("couldn't read sensor data");
     return;
   }
@@ -30,7 +30,7 @@ void HONEYWELLABP2Sensor::read_sensor_data() {
 
 void HONEYWELLABP2Sensor::start_measurement() {
   if (this->write(i2c_cmd_, 3) != i2c::ERROR_OK) {
-    ESP_LOGE(TAG, "Communication with ABP2 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
     this->status_set_warning("couldn't start measurement");
     return;
   }
@@ -39,7 +39,7 @@ void HONEYWELLABP2Sensor::start_measurement() {
 
 bool HONEYWELLABP2Sensor::is_measurement_ready() {
   if (this->read(raw_data_, 1) != i2c::ERROR_OK) {
-    ESP_LOGE(TAG, "Communication with ABP2 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
     this->status_set_warning("couldn't check measurement");
     return false;
   }

esphome/components/hte501/hte501.cpp

@@ -25,7 +25,7 @@ void HTE501Component::dump_config() {
   LOG_I2C_DEVICE(this);
   switch (this->error_code_) {
     case COMMUNICATION_FAILED:
-      ESP_LOGE(TAG, "Communication with HTE501 failed!");
+      ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
       break;
     case CRC_CHECK_FAILED:
       ESP_LOGE(TAG, "The crc check failed");