[mdns] Modernize to C++17 nested namespace syntax

CODEOWNERS

@@ -460,7 +460,6 @@ esphome/components/st7735/* @SenexCrenshaw
 esphome/components/st7789v/* @kbx81
 esphome/components/st7920/* @marsjan155
 esphome/components/statsd/* @Links2004
-esphome/components/stts22h/* @B48D81EFCC
 esphome/components/substitutions/* @esphome/core
 esphome/components/sun/* @OttoWinter
 esphome/components/sun_gtil2/* @Mat931

esphome/components/api/api_connection.cpp

@@ -1535,13 +1535,8 @@ bool APIConnection::send_device_info_response(const DeviceInfoRequest &msg) {
 #ifdef USE_API_HOMEASSISTANT_STATES
 void APIConnection::on_home_assistant_state_response(const HomeAssistantStateResponse &msg) {
   for (auto &it : this->parent_->get_state_subs()) {
-    // Compare entity_id and attribute with message fields
-    bool entity_match = (strcmp(it.entity_id_, msg.entity_id.c_str()) == 0);
-    bool attribute_match = (it.attribute_ != nullptr && strcmp(it.attribute_, msg.attribute.c_str()) == 0) ||
-                           (it.attribute_ == nullptr && msg.attribute.empty());
-
-    if (entity_match && attribute_match) {
-      it.callback_(msg.state);
+    if (it.entity_id == msg.entity_id && it.attribute.value() == msg.attribute) {
+      it.callback(msg.state);
     }
   }
 }
@@ -1878,12 +1873,12 @@ void APIConnection::process_state_subscriptions_() {
 
   const auto &it = subs[this->state_subs_at_];
   SubscribeHomeAssistantStateResponse resp;
-  resp.set_entity_id(StringRef(it.entity_id_));
+  resp.set_entity_id(StringRef(it.entity_id));
 
-  // Avoid string copy by using the const char* pointer if it exists
-  resp.set_attribute(it.attribute_ != nullptr ? StringRef(it.attribute_) : StringRef(""));
+  // Avoid string copy by directly using the optional's value if it exists
+  resp.set_attribute(it.attribute.has_value() ? StringRef(it.attribute.value()) : StringRef(""));
 
-  resp.once = it.once_;
+  resp.once = it.once;
   if (this->send_message(resp, SubscribeHomeAssistantStateResponse::MESSAGE_TYPE)) {
     this->state_subs_at_++;
   }

esphome/components/api/api_pb2_dump.cpp

@@ -66,7 +66,7 @@ static void dump_field(std::string &out, const char *field_name, float value, in
 static void dump_field(std::string &out, const char *field_name, uint64_t value, int indent = 2) {
   char buffer[64];
   append_field_prefix(out, field_name, indent);
-  snprintf(buffer, 64, "%" PRIu64, value);
+  snprintf(buffer, 64, "%llu", value);
   append_with_newline(out, buffer);
 }
 

esphome/components/api/api_server.cpp

@@ -431,56 +431,25 @@ void APIServer::handle_action_response(uint32_t call_id, bool success, const std
 #endif  // USE_API_HOMEASSISTANT_SERVICES
 
 #ifdef USE_API_HOMEASSISTANT_STATES
-// Helper to add subscription (reduces duplication)
-void APIServer::add_state_subscription_(const char *entity_id, const char *attribute,
-                                        std::function<void(std::string)> f, bool once) {
-  this->state_subs_.push_back(HomeAssistantStateSubscription{
-      .entity_id_ = entity_id, .attribute_ = attribute, .callback_ = std::move(f), .once_ = once,
-      // entity_id_copy_ and attribute_copy_ remain nullptr (no heap allocation)
-  });
-}
-
-// Helper to add subscription with heap-allocated strings (reduces duplication)
-void APIServer::add_state_subscription_(std::string entity_id, optional<std::string> attribute,
-                                        std::function<void(std::string)> f, bool once) {
-  HomeAssistantStateSubscription sub;
-  // Allocate heap storage for the strings
-  sub.entity_id_copy_ = std::make_unique<std::string>(std::move(entity_id));
-  sub.entity_id_ = sub.entity_id_copy_->c_str();
-
-  if (attribute.has_value()) {
-    sub.attribute_copy_ = std::make_unique<std::string>(std::move(attribute.value()));
-    sub.attribute_ = sub.attribute_copy_->c_str();
-  } else {
-    sub.attribute_ = nullptr;
-  }
-
-  sub.callback_ = std::move(f);
-  sub.once_ = once;
-  this->state_subs_.push_back(std::move(sub));
-}
-
-// New const char* overload (for internal components - zero allocation)
-void APIServer::subscribe_home_assistant_state(const char *entity_id, const char *attribute,
-                                               std::function<void(std::string)> f) {
-  this->add_state_subscription_(entity_id, attribute, std::move(f), false);
-}
-
-void APIServer::get_home_assistant_state(const char *entity_id, const char *attribute,
-                                         std::function<void(std::string)> f) {
-  this->add_state_subscription_(entity_id, attribute, std::move(f), true);
-}
-
-// Existing std::string overload (for custom_api_device.h - heap allocation)
 void APIServer::subscribe_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                                std::function<void(std::string)> f) {
-  this->add_state_subscription_(std::move(entity_id), std::move(attribute), std::move(f), false);
+  this->state_subs_.push_back(HomeAssistantStateSubscription{
+      .entity_id = std::move(entity_id),
+      .attribute = std::move(attribute),
+      .callback = std::move(f),
+      .once = false,
+  });
 }
 
 void APIServer::get_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                          std::function<void(std::string)> f) {
-  this->add_state_subscription_(std::move(entity_id), std::move(attribute), std::move(f), true);
-}
+  this->state_subs_.push_back(HomeAssistantStateSubscription{
+      .entity_id = std::move(entity_id),
+      .attribute = std::move(attribute),
+      .callback = std::move(f),
+      .once = true,
+  });
+};
 
 const std::vector<APIServer::HomeAssistantStateSubscription> &APIServer::get_state_subs() const {
   return this->state_subs_;

esphome/components/api/api_server.h

@@ -154,27 +154,16 @@ class APIServer : public Component, public Controller {
 
 #ifdef USE_API_HOMEASSISTANT_STATES
   struct HomeAssistantStateSubscription {
-    const char *entity_id_;  // Pointer to flash (internal) or heap (external)
-    const char *attribute_;  // Pointer to flash or nullptr (nullptr means no attribute)
-    std::function<void(std::string)> callback_;
-    bool once_;
-
-    // Storage for external components using std::string API (custom_api_device.h)
-    // These are only allocated when using the std::string overload
-    std::unique_ptr<std::string> entity_id_copy_;
-    std::unique_ptr<std::string> attribute_copy_;
+    std::string entity_id;
+    optional<std::string> attribute;
+    std::function<void(std::string)> callback;
+    bool once;
   };
 
-  // New const char* overload (for internal components - zero allocation)
-  void subscribe_home_assistant_state(const char *entity_id, const char *attribute, std::function<void(std::string)> f);
-  void get_home_assistant_state(const char *entity_id, const char *attribute, std::function<void(std::string)> f);
-
-  // Existing std::string overload (for custom_api_device.h - heap allocation)
   void subscribe_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                       std::function<void(std::string)> f);
   void get_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                 std::function<void(std::string)> f);
-
   const std::vector<HomeAssistantStateSubscription> &get_state_subs() const;
 #endif
 #ifdef USE_API_SERVICES
@@ -196,13 +185,6 @@ class APIServer : public Component, public Controller {
   bool update_noise_psk_(const SavedNoisePsk &new_psk, const LogString *save_log_msg, const LogString *fail_log_msg,
                          const psk_t &active_psk, bool make_active);
 #endif  // USE_API_NOISE
-#ifdef USE_API_HOMEASSISTANT_STATES
-  // Helper methods to reduce code duplication
-  void add_state_subscription_(const char *entity_id, const char *attribute, std::function<void(std::string)> f,
-                               bool once);
-  void add_state_subscription_(std::string entity_id, optional<std::string> attribute,
-                               std::function<void(std::string)> f, bool once);
-#endif  // USE_API_HOMEASSISTANT_STATES
   // Pointers and pointer-like types first (4 bytes each)
   std::unique_ptr<socket::Socket> socket_ = nullptr;
 #ifdef USE_API_CLIENT_CONNECTED_TRIGGER

esphome/components/captive_portal/captive_portal.cpp

@@ -13,16 +13,14 @@ static const char *const TAG = "captive_portal";
 void CaptivePortal::handle_config(AsyncWebServerRequest *request) {
   AsyncResponseStream *stream = request->beginResponseStream(ESPHOME_F("application/json"));
   stream->addHeader(ESPHOME_F("cache-control"), ESPHOME_F("public, max-age=0, must-revalidate"));
-  char mac_s[18];
-  const char *mac_str = get_mac_address_pretty_into_buffer(mac_s);
 #ifdef USE_ESP8266
   stream->print(ESPHOME_F("{\"mac\":\""));
-  stream->print(mac_str);
+  stream->print(get_mac_address_pretty().c_str());
   stream->print(ESPHOME_F("\",\"name\":\""));
   stream->print(App.get_name().c_str());
   stream->print(ESPHOME_F("\",\"aps\":[{}"));
 #else
-  stream->printf(R"({"mac":"%s","name":"%s","aps":[{})", mac_str, App.get_name().c_str());
+  stream->printf(R"({"mac":"%s","name":"%s","aps":[{})", get_mac_address_pretty().c_str(), App.get_name().c_str());
 #endif
 
   for (auto &scan : wifi::global_wifi_component->get_scan_result()) {

esphome/components/epaper_spi/display.py

@@ -102,7 +102,7 @@ def customise_schema(config):
     """
     config = cv.Schema(
         {
-            cv.Required(CONF_MODEL): cv.one_of(*MODELS, upper=True, space="-"),
+            cv.Required(CONF_MODEL): cv.one_of(*MODELS, upper=True),
         },
         extra=cv.ALLOW_EXTRA,
     )(config)

esphome/components/epaper_spi/models/spectra_e6.py

@@ -32,15 +32,11 @@ class SpectraE6(EpaperModel):
 
 spectra_e6 = SpectraE6("spectra-e6")
 
-spectra_e6_7p3 = spectra_e6.extend(
-    "7.3in-Spectra-E6",
+spectra_e6.extend(
+    "Seeed-reTerminal-E1002",
     width=800,
     height=480,
     data_rate="20MHz",
-)
-
-spectra_e6_7p3.extend(
-    "Seeed-reTerminal-E1002",
     cs_pin=10,
     dc_pin=11,
     reset_pin=12,

esphome/components/graph/graph.cpp

@@ -337,7 +337,7 @@ void Graph::draw_legend(display::Display *buff, uint16_t x_offset, uint16_t y_of
     return;
 
   /// Plot border
-  if (legend_->border_) {
+  if (this->border_) {
     int w = legend_->width_;
     int h = legend_->height_;
     buff->horizontal_line(x_offset, y_offset, w, color);

esphome/components/homeassistant/binary_sensor/homeassistant_binary_sensor.cpp

@@ -19,10 +19,11 @@ void HomeassistantBinarySensor::setup() {
           case PARSE_ON:
           case PARSE_OFF:
             bool new_state = val == PARSE_ON;
-            if (this->attribute_ != nullptr) {
-              ESP_LOGD(TAG, "'%s::%s': Got attribute state %s", this->entity_id_, this->attribute_, ONOFF(new_state));
+            if (this->attribute_.has_value()) {
+              ESP_LOGD(TAG, "'%s::%s': Got attribute state %s", this->entity_id_.c_str(),
+                       this->attribute_.value().c_str(), ONOFF(new_state));
             } else {
-              ESP_LOGD(TAG, "'%s': Got state %s", this->entity_id_, ONOFF(new_state));
+              ESP_LOGD(TAG, "'%s': Got state %s", this->entity_id_.c_str(), ONOFF(new_state));
             }
             if (this->initial_) {
               this->publish_initial_state(new_state);
@@ -36,9 +37,9 @@ void HomeassistantBinarySensor::setup() {
 }
 void HomeassistantBinarySensor::dump_config() {
   LOG_BINARY_SENSOR("", "Homeassistant Binary Sensor", this);
-  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_);
-  if (this->attribute_ != nullptr) {
-    ESP_LOGCONFIG(TAG, "  Attribute: '%s'", this->attribute_);
+  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_.c_str());
+  if (this->attribute_.has_value()) {
+    ESP_LOGCONFIG(TAG, "  Attribute: '%s'", this->attribute_.value().c_str());
   }
 }
 float HomeassistantBinarySensor::get_setup_priority() const { return setup_priority::AFTER_WIFI; }

esphome/components/homeassistant/binary_sensor/homeassistant_binary_sensor.h

@@ -8,15 +8,15 @@ namespace homeassistant {
 
 class HomeassistantBinarySensor : public binary_sensor::BinarySensor, public Component {
  public:
-  void set_entity_id(const char *entity_id) { this->entity_id_ = entity_id; }
-  void set_attribute(const char *attribute) { this->attribute_ = attribute; }
+  void set_entity_id(const std::string &entity_id) { entity_id_ = entity_id; }
+  void set_attribute(const std::string &attribute) { attribute_ = attribute; }
   void setup() override;
   void dump_config() override;
   float get_setup_priority() const override;
 
  protected:
-  const char *entity_id_{nullptr};
-  const char *attribute_{nullptr};
+  std::string entity_id_;
+  optional<std::string> attribute_;
   bool initial_{true};
 };
 

esphome/components/homeassistant/number/homeassistant_number.cpp

@@ -12,21 +12,21 @@ static const char *const TAG = "homeassistant.number";
 void HomeassistantNumber::state_changed_(const std::string &state) {
   auto number_value = parse_number<float>(state);
   if (!number_value.has_value()) {
-    ESP_LOGW(TAG, "'%s': Can't convert '%s' to number!", this->entity_id_, state.c_str());
+    ESP_LOGW(TAG, "'%s': Can't convert '%s' to number!", this->entity_id_.c_str(), state.c_str());
     this->publish_state(NAN);
     return;
   }
   if (this->state == number_value.value()) {
     return;
   }
-  ESP_LOGD(TAG, "'%s': Got state %s", this->entity_id_, state.c_str());
+  ESP_LOGD(TAG, "'%s': Got state %s", this->entity_id_.c_str(), state.c_str());
   this->publish_state(number_value.value());
 }
 
 void HomeassistantNumber::min_retrieved_(const std::string &min) {
   auto min_value = parse_number<float>(min);
   if (!min_value.has_value()) {
-    ESP_LOGE(TAG, "'%s': Can't convert 'min' value '%s' to number!", this->entity_id_, min.c_str());
+    ESP_LOGE(TAG, "'%s': Can't convert 'min' value '%s' to number!", this->entity_id_.c_str(), min.c_str());
     return;
   }
   ESP_LOGD(TAG, "'%s': Min retrieved: %s", get_name().c_str(), min.c_str());
@@ -36,7 +36,7 @@ void HomeassistantNumber::min_retrieved_(const std::string &min) {
 void HomeassistantNumber::max_retrieved_(const std::string &max) {
   auto max_value = parse_number<float>(max);
   if (!max_value.has_value()) {
-    ESP_LOGE(TAG, "'%s': Can't convert 'max' value '%s' to number!", this->entity_id_, max.c_str());
+    ESP_LOGE(TAG, "'%s': Can't convert 'max' value '%s' to number!", this->entity_id_.c_str(), max.c_str());
     return;
   }
   ESP_LOGD(TAG, "'%s': Max retrieved: %s", get_name().c_str(), max.c_str());
@@ -46,7 +46,7 @@ void HomeassistantNumber::max_retrieved_(const std::string &max) {
 void HomeassistantNumber::step_retrieved_(const std::string &step) {
   auto step_value = parse_number<float>(step);
   if (!step_value.has_value()) {
-    ESP_LOGE(TAG, "'%s': Can't convert 'step' value '%s' to number!", this->entity_id_, step.c_str());
+    ESP_LOGE(TAG, "'%s': Can't convert 'step' value '%s' to number!", this->entity_id_.c_str(), step.c_str());
     return;
   }
   ESP_LOGD(TAG, "'%s': Step Retrieved %s", get_name().c_str(), step.c_str());
@@ -55,19 +55,22 @@ void HomeassistantNumber::step_retrieved_(const std::string &step) {
 
 void HomeassistantNumber::setup() {
   api::global_api_server->subscribe_home_assistant_state(
-      this->entity_id_, nullptr, std::bind(&HomeassistantNumber::state_changed_, this, std::placeholders::_1));
+      this->entity_id_, nullopt, std::bind(&HomeassistantNumber::state_changed_, this, std::placeholders::_1));
 
   api::global_api_server->get_home_assistant_state(
-      this->entity_id_, "min", std::bind(&HomeassistantNumber::min_retrieved_, this, std::placeholders::_1));
+      this->entity_id_, optional<std::string>("min"),
+      std::bind(&HomeassistantNumber::min_retrieved_, this, std::placeholders::_1));
   api::global_api_server->get_home_assistant_state(
-      this->entity_id_, "max", std::bind(&HomeassistantNumber::max_retrieved_, this, std::placeholders::_1));
+      this->entity_id_, optional<std::string>("max"),
+      std::bind(&HomeassistantNumber::max_retrieved_, this, std::placeholders::_1));
   api::global_api_server->get_home_assistant_state(
-      this->entity_id_, "step", std::bind(&HomeassistantNumber::step_retrieved_, this, std::placeholders::_1));
+      this->entity_id_, optional<std::string>("step"),
+      std::bind(&HomeassistantNumber::step_retrieved_, this, std::placeholders::_1));
 }
 
 void HomeassistantNumber::dump_config() {
   LOG_NUMBER("", "Homeassistant Number", this);
-  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_);
+  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_.c_str());
 }
 
 float HomeassistantNumber::get_setup_priority() const { return setup_priority::AFTER_CONNECTION; }

esphome/components/homeassistant/number/homeassistant_number.h

@@ -11,7 +11,7 @@ namespace homeassistant {
 
 class HomeassistantNumber : public number::Number, public Component {
  public:
-  void set_entity_id(const char *entity_id) { this->entity_id_ = entity_id; }
+  void set_entity_id(const std::string &entity_id) { this->entity_id_ = entity_id; }
 
   void setup() override;
   void dump_config() override;
@@ -25,7 +25,7 @@ class HomeassistantNumber : public number::Number, public Component {
 
   void control(float value) override;
 
-  const char *entity_id_{nullptr};
+  std::string entity_id_;
 };
 }  // namespace homeassistant
 }  // namespace esphome

esphome/components/homeassistant/sensor/homeassistant_sensor.cpp

@@ -12,24 +12,25 @@ void HomeassistantSensor::setup() {
       this->entity_id_, this->attribute_, [this](const std::string &state) {
         auto val = parse_number<float>(state);
         if (!val.has_value()) {
-          ESP_LOGW(TAG, "'%s': Can't convert '%s' to number!", this->entity_id_, state.c_str());
+          ESP_LOGW(TAG, "'%s': Can't convert '%s' to number!", this->entity_id_.c_str(), state.c_str());
           this->publish_state(NAN);
           return;
         }
 
-        if (this->attribute_ != nullptr) {
-          ESP_LOGD(TAG, "'%s::%s': Got attribute state %.2f", this->entity_id_, this->attribute_, *val);
+        if (this->attribute_.has_value()) {
+          ESP_LOGD(TAG, "'%s::%s': Got attribute state %.2f", this->entity_id_.c_str(),
+                   this->attribute_.value().c_str(), *val);
         } else {
-          ESP_LOGD(TAG, "'%s': Got state %.2f", this->entity_id_, *val);
+          ESP_LOGD(TAG, "'%s': Got state %.2f", this->entity_id_.c_str(), *val);
         }
         this->publish_state(*val);
       });
 }
 void HomeassistantSensor::dump_config() {
   LOG_SENSOR("", "Homeassistant Sensor", this);
-  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_);
-  if (this->attribute_ != nullptr) {
-    ESP_LOGCONFIG(TAG, "  Attribute: '%s'", this->attribute_);
+  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_.c_str());
+  if (this->attribute_.has_value()) {
+    ESP_LOGCONFIG(TAG, "  Attribute: '%s'", this->attribute_.value().c_str());
   }
 }
 float HomeassistantSensor::get_setup_priority() const { return setup_priority::AFTER_CONNECTION; }

esphome/components/homeassistant/sensor/homeassistant_sensor.h

@@ -8,15 +8,15 @@ namespace homeassistant {
 
 class HomeassistantSensor : public sensor::Sensor, public Component {
  public:
-  void set_entity_id(const char *entity_id) { this->entity_id_ = entity_id; }
-  void set_attribute(const char *attribute) { this->attribute_ = attribute; }
+  void set_entity_id(const std::string &entity_id) { entity_id_ = entity_id; }
+  void set_attribute(const std::string &attribute) { attribute_ = attribute; }
   void setup() override;
   void dump_config() override;
   float get_setup_priority() const override;
 
  protected:
-  const char *entity_id_{nullptr};
-  const char *attribute_{nullptr};
+  std::string entity_id_;
+  optional<std::string> attribute_;
 };
 
 }  // namespace homeassistant

esphome/components/homeassistant/switch/homeassistant_switch.cpp

@@ -10,7 +10,7 @@ static const char *const TAG = "homeassistant.switch";
 using namespace esphome::switch_;
 
 void HomeassistantSwitch::setup() {
-  api::global_api_server->subscribe_home_assistant_state(this->entity_id_, nullptr, [this](const std::string &state) {
+  api::global_api_server->subscribe_home_assistant_state(this->entity_id_, nullopt, [this](const std::string &state) {
     auto val = parse_on_off(state.c_str());
     switch (val) {
       case PARSE_NONE:
@@ -20,7 +20,7 @@ void HomeassistantSwitch::setup() {
       case PARSE_ON:
       case PARSE_OFF:
         bool new_state = val == PARSE_ON;
-        ESP_LOGD(TAG, "'%s': Got state %s", this->entity_id_, ONOFF(new_state));
+        ESP_LOGD(TAG, "'%s': Got state %s", this->entity_id_.c_str(), ONOFF(new_state));
         this->publish_state(new_state);
         break;
     }
@@ -29,7 +29,7 @@ void HomeassistantSwitch::setup() {
 
 void HomeassistantSwitch::dump_config() {
   LOG_SWITCH("", "Homeassistant Switch", this);
-  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_);
+  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_.c_str());
 }
 
 float HomeassistantSwitch::get_setup_priority() const { return setup_priority::AFTER_CONNECTION; }

esphome/components/homeassistant/switch/homeassistant_switch.h

@@ -8,14 +8,14 @@ namespace homeassistant {
 
 class HomeassistantSwitch : public switch_::Switch, public Component {
  public:
-  void set_entity_id(const char *entity_id) { this->entity_id_ = entity_id; }
+  void set_entity_id(const std::string &entity_id) { this->entity_id_ = entity_id; }
   void setup() override;
   void dump_config() override;
   float get_setup_priority() const override;
 
  protected:
   void write_state(bool state) override;
-  const char *entity_id_{nullptr};
+  std::string entity_id_;
 };
 
 }  // namespace homeassistant

esphome/components/homeassistant/text_sensor/homeassistant_text_sensor.cpp

@@ -10,19 +10,20 @@ static const char *const TAG = "homeassistant.text_sensor";
 void HomeassistantTextSensor::setup() {
   api::global_api_server->subscribe_home_assistant_state(
       this->entity_id_, this->attribute_, [this](const std::string &state) {
-        if (this->attribute_ != nullptr) {
-          ESP_LOGD(TAG, "'%s::%s': Got attribute state '%s'", this->entity_id_, this->attribute_, state.c_str());
+        if (this->attribute_.has_value()) {
+          ESP_LOGD(TAG, "'%s::%s': Got attribute state '%s'", this->entity_id_.c_str(),
+                   this->attribute_.value().c_str(), state.c_str());
         } else {
-          ESP_LOGD(TAG, "'%s': Got state '%s'", this->entity_id_, state.c_str());
+          ESP_LOGD(TAG, "'%s': Got state '%s'", this->entity_id_.c_str(), state.c_str());
         }
         this->publish_state(state);
       });
 }
 void HomeassistantTextSensor::dump_config() {
   LOG_TEXT_SENSOR("", "Homeassistant Text Sensor", this);
-  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_);
-  if (this->attribute_ != nullptr) {
-    ESP_LOGCONFIG(TAG, "  Attribute: '%s'", this->attribute_);
+  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_.c_str());
+  if (this->attribute_.has_value()) {
+    ESP_LOGCONFIG(TAG, "  Attribute: '%s'", this->attribute_.value().c_str());
   }
 }
 float HomeassistantTextSensor::get_setup_priority() const { return setup_priority::AFTER_CONNECTION; }

esphome/components/homeassistant/text_sensor/homeassistant_text_sensor.h

@@ -8,15 +8,15 @@ namespace homeassistant {
 
 class HomeassistantTextSensor : public text_sensor::TextSensor, public Component {
  public:
-  void set_entity_id(const char *entity_id) { this->entity_id_ = entity_id; }
-  void set_attribute(const char *attribute) { this->attribute_ = attribute; }
+  void set_entity_id(const std::string &entity_id) { entity_id_ = entity_id; }
+  void set_attribute(const std::string &attribute) { attribute_ = attribute; }
   void setup() override;
   void dump_config() override;
   float get_setup_priority() const override;
 
  protected:
-  const char *entity_id_{nullptr};
-  const char *attribute_{nullptr};
+  std::string entity_id_;
+  optional<std::string> attribute_;
 };
 
 }  // namespace homeassistant

esphome/components/ld2410/automation.h

@@ -4,7 +4,8 @@
 #include "esphome/core/component.h"
 #include "ld2410.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 template<typename... Ts> class BluetoothPasswordSetAction : public Action<Ts...> {
  public:
@@ -17,4 +18,5 @@ template<typename... Ts> class BluetoothPasswordSetAction : public Action<Ts...>
   LD2410Component *ld2410_comp_;
 };
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/button/factory_reset_button.cpp

@@ -1,7 +1,9 @@
 #include "factory_reset_button.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 void FactoryResetButton::press_action() { this->parent_->factory_reset(); }
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/button/factory_reset_button.h

@@ -3,7 +3,8 @@
 #include "esphome/components/button/button.h"
 #include "../ld2410.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 class FactoryResetButton : public button::Button, public Parented<LD2410Component> {
  public:
@@ -13,4 +14,5 @@ class FactoryResetButton : public button::Button, public Parented<LD2410Componen
   void press_action() override;
 };
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/button/query_button.cpp

@@ -1,7 +1,9 @@
 #include "query_button.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 void QueryButton::press_action() { this->parent_->read_all_info(); }
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/button/query_button.h

@@ -3,7 +3,8 @@
 #include "esphome/components/button/button.h"
 #include "../ld2410.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 class QueryButton : public button::Button, public Parented<LD2410Component> {
  public:
@@ -13,4 +14,5 @@ class QueryButton : public button::Button, public Parented<LD2410Component> {
   void press_action() override;
 };
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/button/restart_button.cpp

@@ -1,7 +1,9 @@
 #include "restart_button.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 void RestartButton::press_action() { this->parent_->restart_and_read_all_info(); }
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/button/restart_button.h

@@ -3,7 +3,8 @@
 #include "esphome/components/button/button.h"
 #include "../ld2410.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 class RestartButton : public button::Button, public Parented<LD2410Component> {
  public:
@@ -13,4 +14,5 @@ class RestartButton : public button::Button, public Parented<LD2410Component> {
   void press_action() override;
 };
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/ld2410.cpp

@@ -9,7 +9,8 @@
 
 #include "esphome/core/application.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 static const char *const TAG = "ld2410";
 
@@ -781,4 +782,5 @@ void LD2410Component::set_gate_still_sensor(uint8_t gate, sensor::Sensor *s) {
 }
 #endif
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/ld2410.h

@@ -29,7 +29,8 @@
 
 #include <array>
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 using namespace ld24xx;
 
@@ -132,4 +133,5 @@ class LD2410Component : public Component, public uart::UARTDevice {
 #endif
 };
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/number/gate_threshold_number.cpp

@@ -1,6 +1,7 @@
 #include "gate_threshold_number.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 GateThresholdNumber::GateThresholdNumber(uint8_t gate) : gate_(gate) {}
 
@@ -9,4 +10,5 @@ void GateThresholdNumber::control(float value) {
   this->parent_->set_gate_threshold(this->gate_);
 }
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/number/gate_threshold_number.h

@@ -3,7 +3,8 @@
 #include "esphome/components/number/number.h"
 #include "../ld2410.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 class GateThresholdNumber : public number::Number, public Parented<LD2410Component> {
  public:
@@ -14,4 +15,5 @@ class GateThresholdNumber : public number::Number, public Parented<LD2410Compone
   void control(float value) override;
 };
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/number/light_threshold_number.cpp

@@ -1,10 +1,12 @@
 #include "light_threshold_number.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 void LightThresholdNumber::control(float value) {
   this->publish_state(value);
   this->parent_->set_light_out_control();
 }
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/number/light_threshold_number.h

@@ -3,7 +3,8 @@
 #include "esphome/components/number/number.h"
 #include "../ld2410.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 class LightThresholdNumber : public number::Number, public Parented<LD2410Component> {
  public:
@@ -13,4 +14,5 @@ class LightThresholdNumber : public number::Number, public Parented<LD2410Compon
   void control(float value) override;
 };
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/number/max_distance_timeout_number.cpp

@@ -1,10 +1,12 @@
 #include "max_distance_timeout_number.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 void MaxDistanceTimeoutNumber::control(float value) {
   this->publish_state(value);
   this->parent_->set_max_distances_timeout();
 }
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/number/max_distance_timeout_number.h

@@ -3,7 +3,8 @@
 #include "esphome/components/number/number.h"
 #include "../ld2410.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 class MaxDistanceTimeoutNumber : public number::Number, public Parented<LD2410Component> {
  public:
@@ -13,4 +14,5 @@ class MaxDistanceTimeoutNumber : public number::Number, public Parented<LD2410Co
   void control(float value) override;
 };
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/select/baud_rate_select.cpp

@@ -1,10 +1,12 @@
 #include "baud_rate_select.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 void BaudRateSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_baud_rate(this->option_at(index));
 }
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/select/baud_rate_select.h

@@ -3,7 +3,8 @@
 #include "esphome/components/select/select.h"
 #include "../ld2410.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 class BaudRateSelect : public select::Select, public Parented<LD2410Component> {
  public:
@@ -13,4 +14,5 @@ class BaudRateSelect : public select::Select, public Parented<LD2410Component> {
   void control(size_t index) override;
 };
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/select/distance_resolution_select.cpp

@@ -1,10 +1,12 @@
 #include "distance_resolution_select.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 void DistanceResolutionSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_distance_resolution(this->option_at(index));
 }
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/select/distance_resolution_select.h

@@ -3,7 +3,8 @@
 #include "esphome/components/select/select.h"
 #include "../ld2410.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 class DistanceResolutionSelect : public select::Select, public Parented<LD2410Component> {
  public:
@@ -13,4 +14,5 @@ class DistanceResolutionSelect : public select::Select, public Parented<LD2410Co
   void control(size_t index) override;
 };
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/select/light_out_control_select.cpp

@@ -1,10 +1,12 @@
 #include "light_out_control_select.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 void LightOutControlSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_light_out_control();
 }
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/select/light_out_control_select.h

@@ -3,7 +3,8 @@
 #include "esphome/components/select/select.h"
 #include "../ld2410.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 class LightOutControlSelect : public select::Select, public Parented<LD2410Component> {
  public:
@@ -13,4 +14,5 @@ class LightOutControlSelect : public select::Select, public Parented<LD2410Compo
   void control(size_t index) override;
 };
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/switch/bluetooth_switch.cpp

@@ -1,10 +1,12 @@
 #include "bluetooth_switch.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 void BluetoothSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_bluetooth(state);
 }
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/switch/bluetooth_switch.h

@@ -3,7 +3,8 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2410.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 class BluetoothSwitch : public switch_::Switch, public Parented<LD2410Component> {
  public:
@@ -13,4 +14,5 @@ class BluetoothSwitch : public switch_::Switch, public Parented<LD2410Component>
   void write_state(bool state) override;
 };
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/switch/engineering_mode_switch.cpp

@@ -1,10 +1,12 @@
 #include "engineering_mode_switch.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 void EngineeringModeSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_engineering_mode(state);
 }
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2410/switch/engineering_mode_switch.h

@@ -3,7 +3,8 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2410.h"
 
-namespace esphome::ld2410 {
+namespace esphome {
+namespace ld2410 {
 
 class EngineeringModeSwitch : public switch_::Switch, public Parented<LD2410Component> {
  public:
@@ -13,4 +14,5 @@ class EngineeringModeSwitch : public switch_::Switch, public Parented<LD2410Comp
   void write_state(bool state) override;
 };
 
-}  // namespace esphome::ld2410
+}  // namespace ld2410
+}  // namespace esphome

esphome/components/ld2412/button/factory_reset_button.cpp

@@ -1,7 +1,9 @@
 #include "factory_reset_button.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 void FactoryResetButton::press_action() { this->parent_->factory_reset(); }
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/button/factory_reset_button.h

@@ -3,7 +3,8 @@
 #include "esphome/components/button/button.h"
 #include "../ld2412.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 class FactoryResetButton : public button::Button, public Parented<LD2412Component> {
  public:
@@ -13,4 +14,5 @@ class FactoryResetButton : public button::Button, public Parented<LD2412Componen
   void press_action() override;
 };
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/button/query_button.cpp

@@ -1,7 +1,9 @@
 #include "query_button.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 void QueryButton::press_action() { this->parent_->read_all_info(); }
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/button/query_button.h

@@ -3,7 +3,8 @@
 #include "esphome/components/button/button.h"
 #include "../ld2412.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 class QueryButton : public button::Button, public Parented<LD2412Component> {
  public:
@@ -13,4 +14,5 @@ class QueryButton : public button::Button, public Parented<LD2412Component> {
   void press_action() override;
 };
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/button/restart_button.cpp

@@ -1,7 +1,9 @@
 #include "restart_button.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 void RestartButton::press_action() { this->parent_->restart_and_read_all_info(); }
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/button/restart_button.h

@@ -3,7 +3,8 @@
 #include "esphome/components/button/button.h"
 #include "../ld2412.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 class RestartButton : public button::Button, public Parented<LD2412Component> {
  public:
@@ -13,4 +14,5 @@ class RestartButton : public button::Button, public Parented<LD2412Component> {
   void press_action() override;
 };
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/button/start_dynamic_background_correction_button.cpp

@@ -2,8 +2,10 @@
 
 #include "restart_button.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 void StartDynamicBackgroundCorrectionButton::press_action() { this->parent_->start_dynamic_background_correction(); }
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/button/start_dynamic_background_correction_button.h

@@ -3,7 +3,8 @@
 #include "esphome/components/button/button.h"
 #include "../ld2412.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 class StartDynamicBackgroundCorrectionButton : public button::Button, public Parented<LD2412Component> {
  public:
@@ -13,4 +14,5 @@ class StartDynamicBackgroundCorrectionButton : public button::Button, public Par
   void press_action() override;
 };
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/ld2412.cpp

@@ -10,7 +10,8 @@
 #include "esphome/core/application.h"
 #include "esphome/core/helpers.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 static const char *const TAG = "ld2412";
 
@@ -854,4 +855,5 @@ void LD2412Component::set_gate_still_sensor(uint8_t gate, sensor::Sensor *s) {
 }
 #endif
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/ld2412.h

@@ -29,7 +29,8 @@
 
 #include <array>
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 using namespace ld24xx;
 
@@ -136,4 +137,5 @@ class LD2412Component : public Component, public uart::UARTDevice {
 #endif
 };
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/number/gate_threshold_number.cpp

@@ -1,6 +1,7 @@
 #include "gate_threshold_number.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 GateThresholdNumber::GateThresholdNumber(uint8_t gate) : gate_(gate) {}
 
@@ -9,4 +10,5 @@ void GateThresholdNumber::control(float value) {
   this->parent_->set_gate_threshold();
 }
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/number/gate_threshold_number.h

@@ -3,7 +3,8 @@
 #include "esphome/components/number/number.h"
 #include "../ld2412.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 class GateThresholdNumber : public number::Number, public Parented<LD2412Component> {
  public:
@@ -14,4 +15,5 @@ class GateThresholdNumber : public number::Number, public Parented<LD2412Compone
   void control(float value) override;
 };
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/number/light_threshold_number.cpp

@@ -1,10 +1,12 @@
 #include "light_threshold_number.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 void LightThresholdNumber::control(float value) {
   this->publish_state(value);
   this->parent_->set_light_out_control();
 }
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/number/light_threshold_number.h

@@ -3,7 +3,8 @@
 #include "esphome/components/number/number.h"
 #include "../ld2412.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 class LightThresholdNumber : public number::Number, public Parented<LD2412Component> {
  public:
@@ -13,4 +14,5 @@ class LightThresholdNumber : public number::Number, public Parented<LD2412Compon
   void control(float value) override;
 };
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/number/max_distance_timeout_number.cpp

@@ -1,10 +1,12 @@
 #include "max_distance_timeout_number.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 void MaxDistanceTimeoutNumber::control(float value) {
   this->publish_state(value);
   this->parent_->set_basic_config();
 }
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/number/max_distance_timeout_number.h

@@ -3,7 +3,8 @@
 #include "esphome/components/number/number.h"
 #include "../ld2412.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 class MaxDistanceTimeoutNumber : public number::Number, public Parented<LD2412Component> {
  public:
@@ -13,4 +14,5 @@ class MaxDistanceTimeoutNumber : public number::Number, public Parented<LD2412Co
   void control(float value) override;
 };
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/select/baud_rate_select.cpp

@@ -1,10 +1,12 @@
 #include "baud_rate_select.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 void BaudRateSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_baud_rate(this->option_at(index));
 }
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/select/baud_rate_select.h

@@ -3,7 +3,8 @@
 #include "esphome/components/select/select.h"
 #include "../ld2412.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 class BaudRateSelect : public select::Select, public Parented<LD2412Component> {
  public:
@@ -13,4 +14,5 @@ class BaudRateSelect : public select::Select, public Parented<LD2412Component> {
   void control(size_t index) override;
 };
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/select/distance_resolution_select.cpp

@@ -1,10 +1,12 @@
 #include "distance_resolution_select.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 void DistanceResolutionSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_distance_resolution(this->option_at(index));
 }
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/select/distance_resolution_select.h

@@ -3,7 +3,8 @@
 #include "esphome/components/select/select.h"
 #include "../ld2412.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 class DistanceResolutionSelect : public select::Select, public Parented<LD2412Component> {
  public:
@@ -13,4 +14,5 @@ class DistanceResolutionSelect : public select::Select, public Parented<LD2412Co
   void control(size_t index) override;
 };
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/select/light_out_control_select.cpp

@@ -1,10 +1,12 @@
 #include "light_out_control_select.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 void LightOutControlSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_light_out_control();
 }
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/select/light_out_control_select.h

@@ -3,7 +3,8 @@
 #include "esphome/components/select/select.h"
 #include "../ld2412.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 class LightOutControlSelect : public select::Select, public Parented<LD2412Component> {
  public:
@@ -13,4 +14,5 @@ class LightOutControlSelect : public select::Select, public Parented<LD2412Compo
   void control(size_t index) override;
 };
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/switch/bluetooth_switch.cpp

@@ -1,10 +1,12 @@
 #include "bluetooth_switch.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 void BluetoothSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_bluetooth(state);
 }
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/switch/bluetooth_switch.h

@@ -3,7 +3,8 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2412.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 class BluetoothSwitch : public switch_::Switch, public Parented<LD2412Component> {
  public:
@@ -13,4 +14,5 @@ class BluetoothSwitch : public switch_::Switch, public Parented<LD2412Component>
   void write_state(bool state) override;
 };
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/switch/engineering_mode_switch.cpp

@@ -1,10 +1,12 @@
 #include "engineering_mode_switch.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 void EngineeringModeSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_engineering_mode(state);
 }
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2412/switch/engineering_mode_switch.h

@@ -3,7 +3,8 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2412.h"
 
-namespace esphome::ld2412 {
+namespace esphome {
+namespace ld2412 {
 
 class EngineeringModeSwitch : public switch_::Switch, public Parented<LD2412Component> {
  public:
@@ -13,4 +14,5 @@ class EngineeringModeSwitch : public switch_::Switch, public Parented<LD2412Comp
   void write_state(bool state) override;
 };
 
-}  // namespace esphome::ld2412
+}  // namespace ld2412
+}  // namespace esphome

esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.cpp

@@ -2,7 +2,8 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-namespace esphome::ld2420 {
+namespace esphome {
+namespace ld2420 {
 
 static const char *const TAG = "ld2420.binary_sensor";
 
@@ -11,4 +12,5 @@ void LD2420BinarySensor::dump_config() {
   LOG_BINARY_SENSOR("  ", "Presence", this->presence_bsensor_);
 }
 
-}  // namespace esphome::ld2420
+}  // namespace ld2420
+}  // namespace esphome

esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.h

@@ -3,7 +3,8 @@
 #include "../ld2420.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"
 
-namespace esphome::ld2420 {
+namespace esphome {
+namespace ld2420 {
 
 class LD2420BinarySensor : public LD2420Listener, public Component, binary_sensor::BinarySensor {
  public:
@@ -20,4 +21,5 @@ class LD2420BinarySensor : public LD2420Listener, public Component, binary_senso
   binary_sensor::BinarySensor *presence_bsensor_{nullptr};
 };
 
-}  // namespace esphome::ld2420
+}  // namespace ld2420
+}  // namespace esphome

esphome/components/ld2420/button/reconfig_buttons.cpp

@@ -4,11 +4,13 @@
 
 static const char *const TAG = "ld2420.button";
 
-namespace esphome::ld2420 {
+namespace esphome {
+namespace ld2420 {
 
 void LD2420ApplyConfigButton::press_action() { this->parent_->apply_config_action(); }
 void LD2420RevertConfigButton::press_action() { this->parent_->revert_config_action(); }
 void LD2420RestartModuleButton::press_action() { this->parent_->restart_module_action(); }
 void LD2420FactoryResetButton::press_action() { this->parent_->factory_reset_action(); }
 
-}  // namespace esphome::ld2420
+}  // namespace ld2420
+}  // namespace esphome

esphome/components/ld2420/button/reconfig_buttons.h

@@ -3,7 +3,8 @@
 #include "esphome/components/button/button.h"
 #include "../ld2420.h"
 
-namespace esphome::ld2420 {
+namespace esphome {
+namespace ld2420 {
 
 class LD2420ApplyConfigButton : public button::Button, public Parented<LD2420Component> {
  public:
@@ -37,4 +38,5 @@ class LD2420FactoryResetButton : public button::Button, public Parented<LD2420Co
   void press_action() override;
 };
 
-}  // namespace esphome::ld2420
+}  // namespace ld2420
+}  // namespace esphome

esphome/components/ld2420/ld2420.cpp

@@ -58,7 +58,8 @@ Gate 0 high thresh = 10 00 uint16_t 0x0010, Threshold value = 60 EA 00 00 uint32
 Gate 0 low thresh = 20 00 uint16_t 0x0020, Threshold value = 60 EA 00 00 uint32_t 0x0000EA60
 */
 
-namespace esphome::ld2420 {
+namespace esphome {
+namespace ld2420 {
 
 static const char *const TAG = "ld2420";
 
@@ -879,4 +880,5 @@ void LD2420Component::refresh_gate_config_numbers() {
 
 #endif
 
-}  // namespace esphome::ld2420
+}  // namespace ld2420
+}  // namespace esphome

esphome/components/ld2420/ld2420.h

@@ -17,7 +17,8 @@
 #include "esphome/components/button/button.h"
 #endif
 
-namespace esphome::ld2420 {
+namespace esphome {
+namespace ld2420 {
 
 static const uint8_t CALIBRATE_SAMPLES = 64;
 static const uint8_t MAX_LINE_LENGTH = 46;  // Max characters for serial buffer
@@ -192,4 +193,5 @@ class LD2420Component : public Component, public uart::UARTDevice {
   std::vector<LD2420Listener *> listeners_{};
 };
 
-}  // namespace esphome::ld2420
+}  // namespace ld2420
+}  // namespace esphome

esphome/components/ld2420/number/gate_config_number.cpp

@@ -4,7 +4,8 @@
 
 static const char *const TAG = "ld2420.number";
 
-namespace esphome::ld2420 {
+namespace esphome {
+namespace ld2420 {
 
 void LD2420TimeoutNumber::control(float timeout) {
   this->publish_state(timeout);
@@ -68,4 +69,5 @@ void LD2420StillThresholdNumbers::control(float still_threshold) {
   }
 }
 
-}  // namespace esphome::ld2420
+}  // namespace ld2420
+}  // namespace esphome

esphome/components/ld2420/number/gate_config_number.h

@@ -3,7 +3,8 @@
 #include "esphome/components/number/number.h"
 #include "../ld2420.h"
 
-namespace esphome::ld2420 {
+namespace esphome {
+namespace ld2420 {
 
 class LD2420TimeoutNumber : public number::Number, public Parented<LD2420Component> {
  public:
@@ -73,4 +74,5 @@ class LD2420MoveThresholdNumbers : public number::Number, public Parented<LD2420
   void control(float move_threshold) override;
 };
 
-}  // namespace esphome::ld2420
+}  // namespace ld2420
+}  // namespace esphome

esphome/components/ld2420/select/operating_mode_select.cpp

@@ -2,7 +2,8 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-namespace esphome::ld2420 {
+namespace esphome {
+namespace ld2420 {
 
 static const char *const TAG = "ld2420.select";
 
@@ -11,4 +12,5 @@ void LD2420Select::control(size_t index) {
   this->parent_->set_operating_mode(this->option_at(index));
 }
 
-}  // namespace esphome::ld2420
+}  // namespace ld2420
+}  // namespace esphome

esphome/components/ld2420/select/operating_mode_select.h

@@ -3,7 +3,8 @@
 #include "../ld2420.h"
 #include "esphome/components/select/select.h"
 
-namespace esphome::ld2420 {
+namespace esphome {
+namespace ld2420 {
 
 class LD2420Select : public Component, public select::Select, public Parented<LD2420Component> {
  public:
@@ -13,4 +14,5 @@ class LD2420Select : public Component, public select::Select, public Parented<LD
   void control(size_t index) override;
 };
 
-}  // namespace esphome::ld2420
+}  // namespace ld2420
+}  // namespace esphome

esphome/components/ld2420/sensor/ld2420_sensor.cpp

@@ -2,7 +2,8 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-namespace esphome::ld2420 {
+namespace esphome {
+namespace ld2420 {
 
 static const char *const TAG = "ld2420.sensor";
 
@@ -11,4 +12,5 @@ void LD2420Sensor::dump_config() {
   LOG_SENSOR("  ", "Distance", this->distance_sensor_);
 }
 
-}  // namespace esphome::ld2420
+}  // namespace ld2420
+}  // namespace esphome

esphome/components/ld2420/sensor/ld2420_sensor.h

@@ -3,7 +3,8 @@
 #include "../ld2420.h"
 #include "esphome/components/sensor/sensor.h"
 
-namespace esphome::ld2420 {
+namespace esphome {
+namespace ld2420 {
 
 class LD2420Sensor : public LD2420Listener, public Component, sensor::Sensor {
  public:
@@ -29,4 +30,5 @@ class LD2420Sensor : public LD2420Listener, public Component, sensor::Sensor {
   std::vector<sensor::Sensor *> energy_sensors_ = std::vector<sensor::Sensor *>(TOTAL_GATES);
 };
 
-}  // namespace esphome::ld2420
+}  // namespace ld2420
+}  // namespace esphome

esphome/components/ld2420/text_sensor/ld2420_text_sensor.cpp

@@ -2,7 +2,8 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-namespace esphome::ld2420 {
+namespace esphome {
+namespace ld2420 {
 
 static const char *const TAG = "ld2420.text_sensor";
 
@@ -11,4 +12,5 @@ void LD2420TextSensor::dump_config() {
   LOG_TEXT_SENSOR("  ", "Firmware", this->fw_version_text_sensor_);
 }
 
-}  // namespace esphome::ld2420
+}  // namespace ld2420
+}  // namespace esphome

esphome/components/ld2420/text_sensor/ld2420_text_sensor.h

@@ -3,7 +3,8 @@
 #include "../ld2420.h"
 #include "esphome/components/text_sensor/text_sensor.h"
 
-namespace esphome::ld2420 {
+namespace esphome {
+namespace ld2420 {
 
 class LD2420TextSensor : public LD2420Listener, public Component, text_sensor::TextSensor {
  public:
@@ -19,4 +20,5 @@ class LD2420TextSensor : public LD2420Listener, public Component, text_sensor::T
   text_sensor::TextSensor *fw_version_text_sensor_{nullptr};
 };
 
-}  // namespace esphome::ld2420
+}  // namespace ld2420
+}  // namespace esphome

esphome/components/ld2450/button/factory_reset_button.cpp

@@ -1,7 +1,9 @@
 #include "factory_reset_button.h"
 
-namespace esphome::ld2450 {
+namespace esphome {
+namespace ld2450 {
 
 void FactoryResetButton::press_action() { this->parent_->factory_reset(); }
 
-}  // namespace esphome::ld2450
+}  // namespace ld2450
+}  // namespace esphome

esphome/components/ld2450/button/factory_reset_button.h

@@ -3,7 +3,8 @@
 #include "esphome/components/button/button.h"
 #include "../ld2450.h"
 
-namespace esphome::ld2450 {
+namespace esphome {
+namespace ld2450 {
 
 class FactoryResetButton : public button::Button, public Parented<LD2450Component> {
  public:
@@ -13,4 +14,5 @@ class FactoryResetButton : public button::Button, public Parented<LD2450Componen
   void press_action() override;
 };
 
-}  // namespace esphome::ld2450
+}  // namespace ld2450
+}  // namespace esphome

esphome/components/ld2450/button/restart_button.cpp

@@ -1,7 +1,9 @@
 #include "restart_button.h"
 
-namespace esphome::ld2450 {
+namespace esphome {
+namespace ld2450 {
 
 void RestartButton::press_action() { this->parent_->restart_and_read_all_info(); }
 
-}  // namespace esphome::ld2450
+}  // namespace ld2450
+}  // namespace esphome

esphome/components/ld2450/button/restart_button.h

@@ -3,7 +3,8 @@
 #include "esphome/components/button/button.h"
 #include "../ld2450.h"
 
-namespace esphome::ld2450 {
+namespace esphome {
+namespace ld2450 {
 
 class RestartButton : public button::Button, public Parented<LD2450Component> {
  public:
@@ -13,4 +14,5 @@ class RestartButton : public button::Button, public Parented<LD2450Component> {
   void press_action() override;
 };
 
-}  // namespace esphome::ld2450
+}  // namespace ld2450
+}  // namespace esphome

esphome/components/ld2450/ld2450.cpp

@@ -13,7 +13,8 @@
 #include <cmath>
 #include <numbers>
 
-namespace esphome::ld2450 {
+namespace esphome {
+namespace ld2450 {
 
 static const char *const TAG = "ld2450";
 
@@ -938,4 +939,5 @@ float LD2450Component::restore_from_flash_() {
 }
 #endif
 
-}  // namespace esphome::ld2450
+}  // namespace ld2450
+}  // namespace esphome

esphome/components/ld2450/ld2450.h

@@ -31,7 +31,8 @@
 
 #include <array>
 
-namespace esphome::ld2450 {
+namespace esphome {
+namespace ld2450 {
 
 using namespace ld24xx;
 
@@ -192,4 +193,5 @@ class LD2450Component : public Component, public uart::UARTDevice {
 #endif
 };
 
-}  // namespace esphome::ld2450
+}  // namespace ld2450
+}  // namespace esphome

esphome/components/ld2450/number/presence_timeout_number.cpp

@@ -1,10 +1,12 @@
 #include "presence_timeout_number.h"
 
-namespace esphome::ld2450 {
+namespace esphome {
+namespace ld2450 {
 
 void PresenceTimeoutNumber::control(float value) {
   this->publish_state(value);
   this->parent_->set_presence_timeout();
 }
 
-}  // namespace esphome::ld2450
+}  // namespace ld2450
+}  // namespace esphome

esphome/components/ld2450/number/presence_timeout_number.h

@@ -3,7 +3,8 @@
 #include "esphome/components/number/number.h"
 #include "../ld2450.h"
 
-namespace esphome::ld2450 {
+namespace esphome {
+namespace ld2450 {
 
 class PresenceTimeoutNumber : public number::Number, public Parented<LD2450Component> {
  public:
@@ -13,4 +14,5 @@ class PresenceTimeoutNumber : public number::Number, public Parented<LD2450Compo
   void control(float value) override;
 };
 
-}  // namespace esphome::ld2450
+}  // namespace ld2450
+}  // namespace esphome

esphome/components/ld2450/number/zone_coordinate_number.cpp

@@ -1,6 +1,7 @@
 #include "zone_coordinate_number.h"
 
-namespace esphome::ld2450 {
+namespace esphome {
+namespace ld2450 {
 
 ZoneCoordinateNumber::ZoneCoordinateNumber(uint8_t zone) : zone_(zone) {}
 
@@ -9,4 +10,5 @@ void ZoneCoordinateNumber::control(float value) {
   this->parent_->set_zone_coordinate(this->zone_);
 }
 
-}  // namespace esphome::ld2450
+}  // namespace ld2450
+}  // namespace esphome

esphome/components/ld2450/number/zone_coordinate_number.h

@@ -3,7 +3,8 @@
 #include "esphome/components/number/number.h"
 #include "../ld2450.h"
 
-namespace esphome::ld2450 {
+namespace esphome {
+namespace ld2450 {
 
 class ZoneCoordinateNumber : public number::Number, public Parented<LD2450Component> {
  public:
@@ -14,4 +15,5 @@ class ZoneCoordinateNumber : public number::Number, public Parented<LD2450Compon
   void control(float value) override;
 };
 
-}  // namespace esphome::ld2450
+}  // namespace ld2450
+}  // namespace esphome

esphome/components/ld2450/select/baud_rate_select.cpp

@@ -1,10 +1,12 @@
 #include "baud_rate_select.h"
 
-namespace esphome::ld2450 {
+namespace esphome {
+namespace ld2450 {
 
 void BaudRateSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_baud_rate(this->option_at(index));
 }
 
-}  // namespace esphome::ld2450
+}  // namespace ld2450
+}  // namespace esphome

esphome/components/ld2450/select/baud_rate_select.h

@@ -3,7 +3,8 @@
 #include "esphome/components/select/select.h"
 #include "../ld2450.h"
 
-namespace esphome::ld2450 {
+namespace esphome {
+namespace ld2450 {
 
 class BaudRateSelect : public select::Select, public Parented<LD2450Component> {
  public:
@@ -13,4 +14,5 @@ class BaudRateSelect : public select::Select, public Parented<LD2450Component> {
   void control(size_t index) override;
 };
 
-}  // namespace esphome::ld2450
+}  // namespace ld2450
+}  // namespace esphome

esphome/components/ld2450/select/zone_type_select.cpp

@@ -1,10 +1,12 @@
 #include "zone_type_select.h"
 
-namespace esphome::ld2450 {
+namespace esphome {
+namespace ld2450 {
 
 void ZoneTypeSelect::control(size_t index) {
   this->publish_state(index);
   this->parent_->set_zone_type(this->option_at(index));
 }
 
-}  // namespace esphome::ld2450
+}  // namespace ld2450
+}  // namespace esphome

esphome/components/ld2450/select/zone_type_select.h

@@ -3,7 +3,8 @@
 #include "esphome/components/select/select.h"
 #include "../ld2450.h"
 
-namespace esphome::ld2450 {
+namespace esphome {
+namespace ld2450 {
 
 class ZoneTypeSelect : public select::Select, public Parented<LD2450Component> {
  public:
@@ -13,4 +14,5 @@ class ZoneTypeSelect : public select::Select, public Parented<LD2450Component> {
   void control(size_t index) override;
 };
 
-}  // namespace esphome::ld2450
+}  // namespace ld2450
+}  // namespace esphome

esphome/components/ld2450/switch/bluetooth_switch.cpp

@@ -1,10 +1,12 @@
 #include "bluetooth_switch.h"
 
-namespace esphome::ld2450 {
+namespace esphome {
+namespace ld2450 {
 
 void BluetoothSwitch::write_state(bool state) {
   this->publish_state(state);
   this->parent_->set_bluetooth(state);
 }
 
-}  // namespace esphome::ld2450
+}  // namespace ld2450
+}  // namespace esphome

esphome/components/ld2450/switch/bluetooth_switch.h

@@ -3,7 +3,8 @@
 #include "esphome/components/switch/switch.h"
 #include "../ld2450.h"
 
-namespace esphome::ld2450 {
+namespace esphome {
+namespace ld2450 {
 
 class BluetoothSwitch : public switch_::Switch, public Parented<LD2450Component> {
  public:
@@ -13,4 +14,5 @@ class BluetoothSwitch : public switch_::Switch, public Parented<LD2450Component>
   void write_state(bool state) override;
 };
 
-}  // namespace esphome::ld2450
+}  // namespace ld2450
+}  // namespace esphome