esphome 2025.5.2__py3-none-any.whl → 2025.6.0b1__py3-none-any.whl

esphome/components/pm2005/pm2005.cpp

@@ -39,17 +39,14 @@ static const LogString *pm2005_get_measuring_mode_string(int status) {
 static inline uint16_t get_sensor_value(const uint8_t *data, uint8_t i) { return data[i] * 0x100 + data[i + 1]; }
 
 void PM2005Component::setup() {
+  ESP_LOGCONFIG(TAG, "Running setup");
   if (this->sensor_type_ == PM2005) {
-    ESP_LOGCONFIG(TAG, "Setting up PM2005...");
-
     this->situation_value_index_ = 3;
     this->pm_1_0_value_index_ = 4;
     this->pm_2_5_value_index_ = 6;
     this->pm_10_0_value_index_ = 8;
     this->measuring_value_index_ = 10;
   } else {
-    ESP_LOGCONFIG(TAG, "Setting up PM2105...");
-
     this->situation_value_index_ = 2;
     this->pm_1_0_value_index_ = 3;
     this->pm_2_5_value_index_ = 5;
@@ -58,7 +55,7 @@ void PM2005Component::setup() {
   }
 
   if (this->read(this->data_buffer_, 12) != i2c::ERROR_OK) {
-    ESP_LOGE(TAG, "Communication failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
     this->mark_failed();
     return;
   }
@@ -66,7 +63,7 @@ void PM2005Component::setup() {
 
 void PM2005Component::update() {
   if (this->read(this->data_buffer_, 12) != i2c::ERROR_OK) {
-    ESP_LOGW(TAG, "Read result failed.");
+    ESP_LOGW(TAG, "Read result failed");
     this->status_set_warning();
     return;
   }
@@ -85,10 +82,10 @@ void PM2005Component::update() {
     return;
   }
 
-  uint16_t pm1 = get_sensor_value(this->data_buffer_, this->pm_1_0_value_index_);
-  uint16_t pm25 = get_sensor_value(this->data_buffer_, this->pm_2_5_value_index_);
-  uint16_t pm10 = get_sensor_value(this->data_buffer_, this->pm_10_0_value_index_);
-  uint16_t sensor_measuring_mode = get_sensor_value(this->data_buffer_, this->measuring_value_index_);
+  const uint16_t pm1 = get_sensor_value(this->data_buffer_, this->pm_1_0_value_index_);
+  const uint16_t pm25 = get_sensor_value(this->data_buffer_, this->pm_2_5_value_index_);
+  const uint16_t pm10 = get_sensor_value(this->data_buffer_, this->pm_10_0_value_index_);
+  const uint16_t sensor_measuring_mode = get_sensor_value(this->data_buffer_, this->measuring_value_index_);
   ESP_LOGD(TAG, "PM1.0: %d, PM2.5: %d, PM10: %d, Measuring mode: %s.", pm1, pm25, pm10,
            LOG_STR_ARG(pm2005_get_measuring_mode_string(sensor_measuring_mode)));
 
@@ -106,12 +103,14 @@ void PM2005Component::update() {
 }
 
 void PM2005Component::dump_config() {
-  ESP_LOGCONFIG(TAG, "PM2005:");
-  ESP_LOGCONFIG(TAG, "  Type: PM2%u05", this->sensor_type_ == PM2105);
+  ESP_LOGCONFIG(TAG,
+                "PM2005:\n"
+                "  Type: PM2%u05",
+                this->sensor_type_ == PM2105);
 
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with PM2%u05 failed!", this->sensor_type_ == PM2105);
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
 
   LOG_SENSOR("  ", "PM1.0", this->pm_1_0_sensor_);

esphome/components/pm2005/sensor.py

@@ -1,8 +1,8 @@
 """PM2005/2105 Sensor component for ESPHome."""
 
 import esphome.codegen as cg
-import esphome.config_validation as cv
 from esphome.components import i2c, sensor
+import esphome.config_validation as cv
 from esphome.const import (
     CONF_ID,
     CONF_PM_1_0,

esphome/components/pmsa003i/pmsa003i.cpp

@@ -1,6 +1,6 @@
 #include "pmsa003i.h"
-#include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
 #include <cstring>
 
 namespace esphome {
@@ -19,7 +19,7 @@ static const uint8_t START_CHARACTER_2 = 0x4D;
 static const uint8_t READ_DATA_RETRY_COUNT = 3;
 
 void PMSA003IComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up pmsa003i...");
+  ESP_LOGCONFIG(TAG, "Running setup");
 
   PM25AQIData data;
   bool successful_read = this->read_data_(&data);

esphome/components/pmsx003/pmsx003.cpp

@@ -314,9 +314,5 @@ void PMSX003Component::parse_data_() {
   this->status_clear_warning();
 }
 
-uint16_t PMSX003Component::get_16_bit_uint_(uint8_t start_index) {
-  return (uint16_t(this->data_[start_index]) << 8) | uint16_t(this->data_[start_index + 1]);
-}
-
 }  // namespace pmsx003
 }  // namespace esphome

esphome/components/pmsx003/pmsx003.h

@@ -1,8 +1,9 @@
 #pragma once
 
+#include "esphome/core/component.h"
+#include "esphome/core/helpers.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/uart/uart.h"
-#include "esphome/core/component.h"
 
 namespace esphome {
 namespace pmsx003 {
@@ -77,7 +78,9 @@ class PMSX003Component : public uart::UARTDevice, public Component {
   void parse_data_();
   bool check_payload_length_(uint16_t payload_length);
   void send_command_(PMSX0003Command cmd, uint16_t data);
-  uint16_t get_16_bit_uint_(uint8_t start_index);
+  uint16_t get_16_bit_uint_(uint8_t start_index) const {
+    return encode_uint16(this->data_[start_index], this->data_[start_index + 1]);
+  }
 
   uint8_t data_[64];
   uint8_t data_index_{0};

esphome/components/pmwcs3/pmwcs3.cpp

@@ -26,33 +26,31 @@ static const char *const TAG = "pmwcs3";
 void PMWCS3Component::new_i2c_address(uint8_t address) {
   if (!this->write_byte(PMWCS3_SET_I2C_ADDRESS, address)) {
     this->status_set_warning();
-    ESP_LOGW(TAG, "couldn't write the new I2C address %d", address);
+    ESP_LOGW(TAG, "Setting I2C address failed (%d)", address);
     return;
   }
   this->set_i2c_address(address);  // Allows device to continue working until new firmware is written with new address.
-  ESP_LOGVV(TAG, "changed I2C address to %d", address);
+  ESP_LOGVV(TAG, "Set I2C address to %d", address);
   this->status_clear_warning();
 }
 
 void PMWCS3Component::air_calibration() {
   if (!this->write_bytes(PMWCS3_REG_CALIBRATE_AIR, nullptr, 0)) {
     this->status_set_warning();
-    ESP_LOGW(TAG, "couldn't start air calibration");
+    ESP_LOGW(TAG, "Starting air calibration failed");
     return;
   }
-  ESP_LOGW(TAG, "Start air calibration during the next 300s");
+  ESP_LOGW(TAG, "Running air calibration for 300s");
 }
 void PMWCS3Component::water_calibration() {
   if (!this->write_bytes(PMWCS3_REG_CALIBRATE_WATER, nullptr, 0)) {
     this->status_set_warning();
-    ESP_LOGW(TAG, "couldn't start water calibration");
+    ESP_LOGW(TAG, "Starting water calibration failed");
     return;
   }
-  ESP_LOGW(TAG, "Start water calibration during the next 300s");
+  ESP_LOGW(TAG, "Running water calibration for 300s");
 }
 
-void PMWCS3Component::setup() { ESP_LOGCONFIG(TAG, "Setting up PMWCS3..."); }
-
 void PMWCS3Component::update() { this->read_data_(); }
 
 float PMWCS3Component::get_setup_priority() const { return setup_priority::DATA; }
@@ -61,10 +59,8 @@ void PMWCS3Component::dump_config() {
   ESP_LOGCONFIG(TAG, "PMWCS3");
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with PMWCS3 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
-  ESP_LOGI(TAG, "%s", this->is_failed() ? "FAILED" : "OK");
-
   LOG_UPDATE_INTERVAL(this);
   LOG_SENSOR("  ", "e25", this->e25_sensor_);
   LOG_SENSOR("  ", "ec", this->ec_sensor_);
@@ -75,7 +71,7 @@ void PMWCS3Component::read_data_() {
   /////// Super important !!!! first activate reading PMWCS3_REG_READ_START (if not, return always the same values) ////
   if (!this->write_bytes(PMWCS3_REG_READ_START, nullptr, 0)) {
     this->status_set_warning();
-    ESP_LOGVV(TAG, "Failed to write into REG_READ_START register !!!");
+    ESP_LOGVV(TAG, "Writing REG_READ_START failed");
     return;
   }
 
@@ -85,7 +81,7 @@ void PMWCS3Component::read_data_() {
     uint8_t data[8];
     float e25, ec, temperature, vwc;
     if (!this->read_bytes(PMWCS3_REG_GET_DATA, (uint8_t *) &data, 8)) {
-      ESP_LOGVV(TAG, "Error reading PMWCS3_REG_GET_DATA registers");
+      ESP_LOGVV(TAG, "Reading PMWCS3_REG_GET_DATA failed");
       this->mark_failed();
       return;
     }

esphome/components/pmwcs3/pmwcs3.h

@@ -12,7 +12,6 @@ namespace pmwcs3 {
 
 class PMWCS3Component : public PollingComponent, public i2c::I2CDevice {
  public:
-  void setup() override;
   void update() override;
   void dump_config() override;
   float get_setup_priority() const override;

esphome/components/pn532/pn532.cpp

@@ -15,11 +15,11 @@ namespace pn532 {
 static const char *const TAG = "pn532";
 
 void PN532::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up PN532...");
+  ESP_LOGCONFIG(TAG, "Running setup");
 
   // Get version data
   if (!this->write_command_({PN532_COMMAND_VERSION_DATA})) {
-    ESP_LOGW(TAG, "Error sending version command, trying again...");
+    ESP_LOGW(TAG, "Error sending version command, trying again");
     if (!this->write_command_({PN532_COMMAND_VERSION_DATA})) {
       ESP_LOGE(TAG, "Error sending version command");
       this->mark_failed();
@@ -208,21 +208,21 @@ void PN532::loop() {
       }
     }
   } else if (next_task_ == CLEAN) {
-    ESP_LOGD(TAG, "  Tag cleaning...");
+    ESP_LOGD(TAG, "  Tag cleaning");
     if (!this->clean_tag_(nfcid)) {
       ESP_LOGE(TAG, "  Tag was not fully cleaned successfully");
     }
     ESP_LOGD(TAG, "  Tag cleaned!");
   } else if (next_task_ == FORMAT) {
-    ESP_LOGD(TAG, "  Tag formatting...");
+    ESP_LOGD(TAG, "  Tag formatting");
     if (!this->format_tag_(nfcid)) {
       ESP_LOGE(TAG, "Error formatting tag as NDEF");
     }
     ESP_LOGD(TAG, "  Tag formatted!");
   } else if (next_task_ == WRITE) {
     if (this->next_task_message_to_write_ != nullptr) {
-      ESP_LOGD(TAG, "  Tag writing...");
-      ESP_LOGD(TAG, "  Tag formatting...");
+      ESP_LOGD(TAG, "  Tag writing");
+      ESP_LOGD(TAG, "  Tag formatting");
       if (!this->format_tag_(nfcid)) {
         ESP_LOGE(TAG, "  Tag could not be formatted for writing");
       } else {
@@ -281,7 +281,7 @@ bool PN532::write_command_(const std::vector<uint8_t> &data) {
 }
 
 bool PN532::read_ack_() {
-  ESP_LOGV(TAG, "Reading ACK...");
+  ESP_LOGV(TAG, "Reading ACK");
 
   std::vector<uint8_t> data;
   if (!this->read_data(data, 6)) {

esphome/components/pn532/pn532.h

@@ -38,7 +38,7 @@ class PN532 : public PollingComponent {
   float get_setup_priority() const override;
 
   void loop() override;
-  void on_shutdown() override { powerdown(); }
+  void on_powerdown() override { powerdown(); }
 
   void register_tag(PN532BinarySensor *tag) { this->binary_sensors_.push_back(tag); }
   void register_ontag_trigger(nfc::NfcOnTagTrigger *trig) { this->triggers_ontag_.push_back(trig); }

esphome/components/pn532_spi/pn532_spi.cpp

@@ -51,7 +51,7 @@ bool PN532Spi::read_data(std::vector<uint8_t> &data, uint8_t len) {
   delay(2);
   this->write_byte(0x03);
 
-  ESP_LOGV(TAG, "Reading data...");
+  ESP_LOGV(TAG, "Reading data");
 
   data.resize(len);
   this->read_array(data.data(), len);

esphome/components/pn7150/pn7150.cpp

@@ -830,7 +830,7 @@ void PN7150::process_rf_intf_activated_oid_(nfc::NciMessage &rx) {  // an endpoi
 
     switch (this->next_task_) {
       case EP_CLEAN:
-        ESP_LOGD(TAG, "  Tag cleaning...");
+        ESP_LOGD(TAG, "  Tag cleaning");
         if (this->clean_endpoint_(working_endpoint.tag->get_uid()) != nfc::STATUS_OK) {
           ESP_LOGE(TAG, "  Tag cleaning incomplete");
         }
@@ -838,7 +838,7 @@ void PN7150::process_rf_intf_activated_oid_(nfc::NciMessage &rx) {  // an endpoi
         break;
 
       case EP_FORMAT:
-        ESP_LOGD(TAG, "  Tag formatting...");
+        ESP_LOGD(TAG, "  Tag formatting");
         if (this->format_endpoint_(working_endpoint.tag->get_uid()) != nfc::STATUS_OK) {
           ESP_LOGE(TAG, "Error formatting tag as NDEF");
         }
@@ -847,8 +847,8 @@ void PN7150::process_rf_intf_activated_oid_(nfc::NciMessage &rx) {  // an endpoi
 
       case EP_WRITE:
         if (this->next_task_message_to_write_ != nullptr) {
-          ESP_LOGD(TAG, "  Tag writing...");
-          ESP_LOGD(TAG, "  Tag formatting...");
+          ESP_LOGD(TAG, "  Tag writing");
+          ESP_LOGD(TAG, "  Tag formatting");
           if (this->format_endpoint_(working_endpoint.tag->get_uid()) != nfc::STATUS_OK) {
             ESP_LOGE(TAG, "  Tag could not be formatted for writing");
           } else {

esphome/components/pn7160/pn7160.cpp

@@ -854,7 +854,7 @@ void PN7160::process_rf_intf_activated_oid_(nfc::NciMessage &rx) {  // an endpoi
 
     switch (this->next_task_) {
       case EP_CLEAN:
-        ESP_LOGD(TAG, "  Tag cleaning...");
+        ESP_LOGD(TAG, "  Tag cleaning");
         if (this->clean_endpoint_(working_endpoint.tag->get_uid()) != nfc::STATUS_OK) {
           ESP_LOGE(TAG, "  Tag cleaning incomplete");
         }
@@ -862,7 +862,7 @@ void PN7160::process_rf_intf_activated_oid_(nfc::NciMessage &rx) {  // an endpoi
         break;
 
       case EP_FORMAT:
-        ESP_LOGD(TAG, "  Tag formatting...");
+        ESP_LOGD(TAG, "  Tag formatting");
         if (this->format_endpoint_(working_endpoint.tag->get_uid()) != nfc::STATUS_OK) {
           ESP_LOGE(TAG, "Error formatting tag as NDEF");
         }
@@ -871,8 +871,8 @@ void PN7160::process_rf_intf_activated_oid_(nfc::NciMessage &rx) {  // an endpoi
 
       case EP_WRITE:
         if (this->next_task_message_to_write_ != nullptr) {
-          ESP_LOGD(TAG, "  Tag writing...");
-          ESP_LOGD(TAG, "  Tag formatting...");
+          ESP_LOGD(TAG, "  Tag writing");
+          ESP_LOGD(TAG, "  Tag formatting");
           if (this->format_endpoint_(working_endpoint.tag->get_uid()) != nfc::STATUS_OK) {
             ESP_LOGE(TAG, "  Tag could not be formatted for writing");
           } else {

esphome/components/power_supply/power_supply.cpp

@@ -7,7 +7,7 @@ namespace power_supply {
 static const char *const TAG = "power_supply";
 
 void PowerSupply::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up Power Supply...");
+  ESP_LOGCONFIG(TAG, "Running setup");
 
   this->pin_->setup();
   this->pin_->digital_write(false);
@@ -17,8 +17,10 @@ void PowerSupply::setup() {
 void PowerSupply::dump_config() {
   ESP_LOGCONFIG(TAG, "Power Supply:");
   LOG_PIN("  Pin: ", this->pin_);
-  ESP_LOGCONFIG(TAG, "  Time to enable: %" PRIu32 " ms", this->enable_time_);
-  ESP_LOGCONFIG(TAG, "  Keep on time: %.1f s", this->keep_on_time_ / 1000.0f);
+  ESP_LOGCONFIG(TAG,
+                "  Time to enable: %" PRIu32 " ms\n"
+                "  Keep on time: %.1f s",
+                this->enable_time_, this->keep_on_time_ / 1000.0f);
   if (this->enable_on_boot_)
     ESP_LOGCONFIG(TAG, "  Enabled at startup: True");
 }
@@ -50,7 +52,7 @@ void PowerSupply::unrequest_high_power() {
     });
   }
 }
-void PowerSupply::on_shutdown() {
+void PowerSupply::on_powerdown() {
   this->active_requests_ = 0;
   this->pin_->digital_write(false);
 }

esphome/components/power_supply/power_supply.h

@@ -32,7 +32,7 @@ class PowerSupply : public Component {
   /// Hardware setup priority (+1).
   float get_setup_priority() const override;
 
-  void on_shutdown() override;
+  void on_powerdown() override;
 
  protected:
   GPIOPin *pin_;

esphome/components/psram/__init__.py

@@ -2,13 +2,17 @@ import logging
 
 import esphome.codegen as cg
 from esphome.components.esp32 import (
+    CONF_CPU_FREQUENCY,
     CONF_ENABLE_IDF_EXPERIMENTAL_FEATURES,
     VARIANT_ESP32,
     add_idf_sdkconfig_option,
     get_esp32_variant,
-    only_on_variant,
 )
-from esphome.components.esp32.const import VARIANT_ESP32S2, VARIANT_ESP32S3
+from esphome.components.esp32.const import (
+    VARIANT_ESP32P4,
+    VARIANT_ESP32S2,
+    VARIANT_ESP32S3,
+)
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_ADVANCED,
@@ -34,34 +38,46 @@ PsramComponent = psram_ns.class_("PsramComponent", cg.Component)
 
 TYPE_QUAD = "quad"
 TYPE_OCTAL = "octal"
+TYPE_HEX = "hex"
+
+SDK_MODES = {TYPE_QUAD: "QUAD", TYPE_OCTAL: "OCT", TYPE_HEX: "HEX"}
 
 CONF_ENABLE_ECC = "enable_ecc"
 
 SPIRAM_MODES = {
-    TYPE_QUAD: "CONFIG_SPIRAM_MODE_QUAD",
-    TYPE_OCTAL: "CONFIG_SPIRAM_MODE_OCT",
+    VARIANT_ESP32: (TYPE_QUAD,),
+    VARIANT_ESP32S2: (TYPE_QUAD,),
+    VARIANT_ESP32S3: (TYPE_QUAD, TYPE_OCTAL),
+    VARIANT_ESP32P4: (TYPE_HEX,),
 }
 
+
 SPIRAM_SPEEDS = {
-    40e6: "CONFIG_SPIRAM_SPEED_40M",
-    80e6: "CONFIG_SPIRAM_SPEED_80M",
-    120e6: "CONFIG_SPIRAM_SPEED_120M",
+    VARIANT_ESP32: (40, 80, 120),
+    VARIANT_ESP32S2: (40, 80, 120),
+    VARIANT_ESP32S3: (40, 80, 120),
+    VARIANT_ESP32P4: (20, 100, 200),
 }
 
 
 def validate_psram_mode(config):
-    if config[CONF_MODE] == TYPE_OCTAL and config[CONF_SPEED] == 120e6:
-        esp32_config = fv.full_config.get()[PLATFORM_ESP32]
-        if (
-            esp32_config[CONF_FRAMEWORK]
-            .get(CONF_ADVANCED, {})
-            .get(CONF_ENABLE_IDF_EXPERIMENTAL_FEATURES)
-        ):
-            _LOGGER.warning(
-                "120MHz PSRAM in octal mode is an experimental feature - use at your own risk"
+    esp32_config = fv.full_config.get()[PLATFORM_ESP32]
+    if config[CONF_SPEED] == "120MHZ":
+        if esp32_config[CONF_CPU_FREQUENCY] != "240MHZ":
+            raise cv.Invalid(
+                "PSRAM 120MHz requires 240MHz CPU frequency (set in esp32 component)"
             )
-        else:
-            raise cv.Invalid("PSRAM 120MHz is not supported in octal mode")
+        if config[CONF_MODE] == TYPE_OCTAL:
+            if (
+                esp32_config[CONF_FRAMEWORK]
+                .get(CONF_ADVANCED, {})
+                .get(CONF_ENABLE_IDF_EXPERIMENTAL_FEATURES)
+            ):
+                _LOGGER.warning(
+                    "120MHz PSRAM in octal mode is an experimental feature - use at your own risk"
+                )
+            else:
+                raise cv.Invalid("PSRAM 120MHz is not supported in octal mode")
     if config[CONF_MODE] != TYPE_OCTAL and config[CONF_ENABLE_ECC]:
         raise cv.Invalid("ECC is only available in octal mode.")
     if config[CONF_MODE] == TYPE_OCTAL:
@@ -73,23 +89,23 @@ def validate_psram_mode(config):
     return config
 
 
-CONFIG_SCHEMA = cv.All(
-    cv.Schema(
+def get_config_schema(config):
+    variant = get_esp32_variant()
+    speeds = [f"{s}MHZ" for s in SPIRAM_SPEEDS.get(variant, [])]
+    if not speeds:
+        return cv.Invalid("PSRAM is not supported on this chip")
+    modes = SPIRAM_MODES[variant]
+    return cv.Schema(
         {
             cv.GenerateID(): cv.declare_id(PsramComponent),
-            cv.Optional(CONF_MODE, default=TYPE_QUAD): cv.enum(
-                SPIRAM_MODES, lower=True
-            ),
+            cv.Optional(CONF_MODE, default=modes[0]): cv.one_of(*modes, lower=True),
             cv.Optional(CONF_ENABLE_ECC, default=False): cv.boolean,
-            cv.Optional(CONF_SPEED, default=40e6): cv.All(
-                cv.frequency, cv.one_of(*SPIRAM_SPEEDS)
-            ),
+            cv.Optional(CONF_SPEED, default=speeds[0]): cv.one_of(*speeds, upper=True),
         }
-    ),
-    only_on_variant(
-        supported=[VARIANT_ESP32, VARIANT_ESP32S3, VARIANT_ESP32S2],
-    ),
-)
+    )(config)
+
+
+CONFIG_SCHEMA = get_config_schema
 
 FINAL_VALIDATE_SCHEMA = validate_psram_mode
 
@@ -104,15 +120,23 @@ async def to_code(config):
         add_idf_sdkconfig_option(
             f"CONFIG_{get_esp32_variant().upper()}_SPIRAM_SUPPORT", True
         )
+        add_idf_sdkconfig_option("CONFIG_SOC_SPIRAM_SUPPORTED", True)
         add_idf_sdkconfig_option("CONFIG_SPIRAM", True)
         add_idf_sdkconfig_option("CONFIG_SPIRAM_USE", True)
         add_idf_sdkconfig_option("CONFIG_SPIRAM_USE_CAPS_ALLOC", True)
         add_idf_sdkconfig_option("CONFIG_SPIRAM_IGNORE_NOTFOUND", True)
 
-        add_idf_sdkconfig_option(f"{SPIRAM_MODES[config[CONF_MODE]]}", True)
-        add_idf_sdkconfig_option(f"{SPIRAM_SPEEDS[config[CONF_SPEED]]}", True)
-        if config[CONF_MODE] == TYPE_OCTAL and config[CONF_SPEED] == 120e6:
-            add_idf_sdkconfig_option("CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240", True)
+        add_idf_sdkconfig_option(
+            f"CONFIG_SPIRAM_MODE_{SDK_MODES[config[CONF_MODE]]}", True
+        )
+
+        # Remove MHz suffix, convert to int
+        speed = int(config[CONF_SPEED][:-3])
+        add_idf_sdkconfig_option(f"CONFIG_SPIRAM_SPEED_{speed}M", True)
+        add_idf_sdkconfig_option("CONFIG_SPIRAM_SPEED", speed)
+        if config[CONF_MODE] == TYPE_OCTAL and speed == 120:
+            add_idf_sdkconfig_option("CONFIG_ESPTOOLPY_FLASHFREQ_120M", True)
+            add_idf_sdkconfig_option("CONFIG_BOOTLOADER_FLASH_DC_AWARE", True)
             if CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] >= cv.Version(5, 4, 0):
                 add_idf_sdkconfig_option(
                     "CONFIG_SPIRAM_TIMING_TUNING_POINT_VIA_TEMPERATURE_SENSOR", True

esphome/components/pulse_counter/pulse_counter_sensor.cpp

@@ -156,7 +156,7 @@ pulse_counter_t HwPulseCounterStorage::read_raw_value() {
 #endif  // HAS_PCNT
 
 void PulseCounterSensor::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up pulse counter '%s'...", this->name_.c_str());
+  ESP_LOGCONFIG(TAG, "Running setup for '%s'", this->name_.c_str());
   if (!this->storage_.pulse_counter_setup(this->pin_)) {
     this->mark_failed();
     return;
@@ -171,9 +171,12 @@ void PulseCounterSensor::set_total_pulses(uint32_t pulses) {
 void PulseCounterSensor::dump_config() {
   LOG_SENSOR("", "Pulse Counter", this);
   LOG_PIN("  Pin: ", this->pin_);
-  ESP_LOGCONFIG(TAG, "  Rising Edge: %s", EDGE_MODE_TO_STRING[this->storage_.rising_edge_mode]);
-  ESP_LOGCONFIG(TAG, "  Falling Edge: %s", EDGE_MODE_TO_STRING[this->storage_.falling_edge_mode]);
-  ESP_LOGCONFIG(TAG, "  Filtering pulses shorter than %" PRIu32 " µs", this->storage_.filter_us);
+  ESP_LOGCONFIG(TAG,
+                "  Rising Edge: %s\n"
+                "  Falling Edge: %s\n"
+                "  Filtering pulses shorter than %" PRIu32 " µs",
+                EDGE_MODE_TO_STRING[this->storage_.rising_edge_mode],
+                EDGE_MODE_TO_STRING[this->storage_.falling_edge_mode], this->storage_.filter_us);
   LOG_UPDATE_INTERVAL(this);
 }
 

esphome/components/pvvx_mithermometer/display/pvvx_display.cpp

@@ -8,11 +8,14 @@ namespace pvvx_mithermometer {
 static const char *const TAG = "display.pvvx_mithermometer";
 
 void PVVXDisplay::dump_config() {
-  ESP_LOGCONFIG(TAG, "PVVX MiThermometer display:");
-  ESP_LOGCONFIG(TAG, "  MAC address           : %s", this->parent_->address_str().c_str());
-  ESP_LOGCONFIG(TAG, "  Service UUID          : %s", this->service_uuid_.to_string().c_str());
-  ESP_LOGCONFIG(TAG, "  Characteristic UUID   : %s", this->char_uuid_.to_string().c_str());
-  ESP_LOGCONFIG(TAG, "  Auto clear            : %s", YESNO(this->auto_clear_enabled_));
+  ESP_LOGCONFIG(TAG,
+                "PVVX MiThermometer display:\n"
+                "  MAC address           : %s\n"
+                "  Service UUID          : %s\n"
+                "  Characteristic UUID   : %s\n"
+                "  Auto clear            : %s",
+                this->parent_->address_str().c_str(), this->service_uuid_.to_string().c_str(),
+                this->char_uuid_.to_string().c_str(), YESNO(this->auto_clear_enabled_));
 #ifdef USE_TIME
   ESP_LOGCONFIG(TAG, "  Set time on connection: %s", YESNO(this->time_ != nullptr));
 #endif

esphome/components/pylontech/pylontech.cpp

@@ -1,6 +1,6 @@
 #include "pylontech.h"
-#include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
 
 namespace esphome {
 namespace pylontech {
@@ -26,7 +26,7 @@ void PylontechComponent::dump_config() {
 }
 
 void PylontechComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up pylontech...");
+  ESP_LOGCONFIG(TAG, "Running setup");
   while (this->available() != 0) {
     this->read();
   }

esphome/components/pylontech/sensor/pylontech_sensor.cpp

@@ -10,8 +10,10 @@ static const char *const TAG = "pylontech.sensor";
 PylontechSensor::PylontechSensor(int8_t bat_num) { this->bat_num_ = bat_num; }
 
 void PylontechSensor::dump_config() {
-  ESP_LOGCONFIG(TAG, "Pylontech Sensor:");
-  ESP_LOGCONFIG(TAG, " Battery %d", this->bat_num_);
+  ESP_LOGCONFIG(TAG,
+                "Pylontech Sensor:\n"
+                " Battery %d",
+                this->bat_num_);
   LOG_SENSOR("  ", "Voltage", this->voltage_sensor_);
   LOG_SENSOR("  ", "Current", this->current_sensor_);
   LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);

esphome/components/pylontech/text_sensor/pylontech_text_sensor.cpp

@@ -10,8 +10,10 @@ static const char *const TAG = "pylontech.textsensor";
 PylontechTextSensor::PylontechTextSensor(int8_t bat_num) { this->bat_num_ = bat_num; }
 
 void PylontechTextSensor::dump_config() {
-  ESP_LOGCONFIG(TAG, "Pylontech Text Sensor:");
-  ESP_LOGCONFIG(TAG, " Battery %d", this->bat_num_);
+  ESP_LOGCONFIG(TAG,
+                "Pylontech Text Sensor:\n"
+                " Battery %d",
+                this->bat_num_);
   LOG_TEXT_SENSOR("  ", "Base state", this->base_state_text_sensor_);
   LOG_TEXT_SENSOR("  ", "Voltage state", this->voltage_state_text_sensor_);
   LOG_TEXT_SENSOR("  ", "Current state", this->current_state_text_sensor_);

esphome/components/pzemac/pzemac.cpp

@@ -64,8 +64,10 @@ void PZEMAC::on_modbus_data(const std::vector<uint8_t> &data) {
 
 void PZEMAC::update() { this->send(PZEM_CMD_READ_IN_REGISTERS, 0, PZEM_REGISTER_COUNT); }
 void PZEMAC::dump_config() {
-  ESP_LOGCONFIG(TAG, "PZEMAC:");
-  ESP_LOGCONFIG(TAG, "  Address: 0x%02X", this->address_);
+  ESP_LOGCONFIG(TAG,
+                "PZEMAC:\n"
+                "  Address: 0x%02X",
+                this->address_);
   LOG_SENSOR("", "Voltage", this->voltage_sensor_);
   LOG_SENSOR("", "Current", this->current_sensor_);
   LOG_SENSOR("", "Power", this->power_sensor_);

esphome/components/pzemdc/pzemdc.cpp

@@ -54,8 +54,10 @@ void PZEMDC::on_modbus_data(const std::vector<uint8_t> &data) {
 
 void PZEMDC::update() { this->send(PZEM_CMD_READ_IN_REGISTERS, 0, 8); }
 void PZEMDC::dump_config() {
-  ESP_LOGCONFIG(TAG, "PZEMDC:");
-  ESP_LOGCONFIG(TAG, "  Address: 0x%02X", this->address_);
+  ESP_LOGCONFIG(TAG,
+                "PZEMDC:\n"
+                "  Address: 0x%02X",
+                this->address_);
   LOG_SENSOR("", "Voltage", this->voltage_sensor_);
   LOG_SENSOR("", "Current", this->current_sensor_);
   LOG_SENSOR("", "Power", this->power_sensor_);