esphome 2025.5.1__py3-none-any.whl → 2025.6.0__py3-none-any.whl

esphome/components/socket/bsd_sockets_impl.cpp

@@ -5,6 +5,7 @@
 #ifdef USE_SOCKET_IMPL_BSD_SOCKETS
 
 #include <cstring>
+#include "esphome/core/application.h"
 
 #ifdef USE_ESP32
 #include <esp_idf_version.h>
@@ -40,7 +41,20 @@ std::string format_sockaddr(const struct sockaddr_storage &storage) {
 
 class BSDSocketImpl : public Socket {
  public:
-  BSDSocketImpl(int fd) : fd_(fd) {}
+  BSDSocketImpl(int fd, bool monitor_loop = false) : fd_(fd) {
+#ifdef USE_SOCKET_SELECT_SUPPORT
+    // Register new socket with the application for select() if monitoring requested
+    if (monitor_loop && fd_ >= 0) {
+      // Only set loop_monitored_ to true if registration succeeds
+      loop_monitored_ = App.register_socket_fd(fd_);
+    } else {
+      loop_monitored_ = false;
+    }
+#else
+    // Without select support, ignore monitor_loop parameter
+    (void) monitor_loop;
+#endif
+  }
   ~BSDSocketImpl() override {
     if (!closed_) {
       close();  // NOLINT(clang-analyzer-optin.cplusplus.VirtualCall)
@@ -48,16 +62,35 @@ class BSDSocketImpl : public Socket {
   }
   int connect(const struct sockaddr *addr, socklen_t addrlen) override { return ::connect(fd_, addr, addrlen); }
   std::unique_ptr<Socket> accept(struct sockaddr *addr, socklen_t *addrlen) override {
+    return accept_impl_(addr, addrlen, false);
+  }
+  std::unique_ptr<Socket> accept_loop_monitored(struct sockaddr *addr, socklen_t *addrlen) override {
+    return accept_impl_(addr, addrlen, true);
+  }
+
+ private:
+  std::unique_ptr<Socket> accept_impl_(struct sockaddr *addr, socklen_t *addrlen, bool loop_monitored) {
     int fd = ::accept(fd_, addr, addrlen);
     if (fd == -1)
       return {};
-    return make_unique<BSDSocketImpl>(fd);
+    return make_unique<BSDSocketImpl>(fd, loop_monitored);
   }
+
+ public:
   int bind(const struct sockaddr *addr, socklen_t addrlen) override { return ::bind(fd_, addr, addrlen); }
   int close() override {
-    int ret = ::close(fd_);
-    closed_ = true;
-    return ret;
+    if (!closed_) {
+#ifdef USE_SOCKET_SELECT_SUPPORT
+      // Unregister from select() before closing if monitored
+      if (loop_monitored_) {
+        App.unregister_socket_fd(fd_);
+      }
+#endif
+      int ret = ::close(fd_);
+      closed_ = true;
+      return ret;
+    }
+    return 0;
   }
   int shutdown(int how) override { return ::shutdown(fd_, how); }
 
@@ -126,16 +159,27 @@ class BSDSocketImpl : public Socket {
     return 0;
   }
 
+  int get_fd() const override { return fd_; }
+
  protected:
   int fd_;
   bool closed_ = false;
 };
 
-std::unique_ptr<Socket> socket(int domain, int type, int protocol) {
+// Helper to create a socket with optional monitoring
+static std::unique_ptr<Socket> create_socket(int domain, int type, int protocol, bool loop_monitored = false) {
   int ret = ::socket(domain, type, protocol);
   if (ret == -1)
     return nullptr;
-  return std::unique_ptr<Socket>{new BSDSocketImpl(ret)};
+  return std::unique_ptr<Socket>{new BSDSocketImpl(ret, loop_monitored)};
+}
+
+std::unique_ptr<Socket> socket(int domain, int type, int protocol) {
+  return create_socket(domain, type, protocol, false);
+}
+
+std::unique_ptr<Socket> socket_loop_monitored(int domain, int type, int protocol) {
+  return create_socket(domain, type, protocol, true);
 }
 
 }  // namespace socket

esphome/components/socket/lwip_raw_tcp_impl.cpp

@@ -606,6 +606,11 @@ std::unique_ptr<Socket> socket(int domain, int type, int protocol) {
   return std::unique_ptr<Socket>{sock};
 }
 
+std::unique_ptr<Socket> socket_loop_monitored(int domain, int type, int protocol) {
+  // LWIPRawImpl doesn't use file descriptors, so monitoring is not applicable
+  return socket(domain, type, protocol);
+}
+
 }  // namespace socket
 }  // namespace esphome
 

esphome/components/socket/lwip_sockets_impl.cpp

@@ -5,6 +5,7 @@
 #ifdef USE_SOCKET_IMPL_LWIP_SOCKETS
 
 #include <cstring>
+#include "esphome/core/application.h"
 
 namespace esphome {
 namespace socket {
@@ -33,7 +34,20 @@ std::string format_sockaddr(const struct sockaddr_storage &storage) {
 
 class LwIPSocketImpl : public Socket {
  public:
-  LwIPSocketImpl(int fd) : fd_(fd) {}
+  LwIPSocketImpl(int fd, bool monitor_loop = false) : fd_(fd) {
+#ifdef USE_SOCKET_SELECT_SUPPORT
+    // Register new socket with the application for select() if monitoring requested
+    if (monitor_loop && fd_ >= 0) {
+      // Only set loop_monitored_ to true if registration succeeds
+      loop_monitored_ = App.register_socket_fd(fd_);
+    } else {
+      loop_monitored_ = false;
+    }
+#else
+    // Without select support, ignore monitor_loop parameter
+    (void) monitor_loop;
+#endif
+  }
   ~LwIPSocketImpl() override {
     if (!closed_) {
       close();  // NOLINT(clang-analyzer-optin.cplusplus.VirtualCall)
@@ -41,16 +55,35 @@ class LwIPSocketImpl : public Socket {
   }
   int connect(const struct sockaddr *addr, socklen_t addrlen) override { return lwip_connect(fd_, addr, addrlen); }
   std::unique_ptr<Socket> accept(struct sockaddr *addr, socklen_t *addrlen) override {
+    return accept_impl_(addr, addrlen, false);
+  }
+  std::unique_ptr<Socket> accept_loop_monitored(struct sockaddr *addr, socklen_t *addrlen) override {
+    return accept_impl_(addr, addrlen, true);
+  }
+
+ private:
+  std::unique_ptr<Socket> accept_impl_(struct sockaddr *addr, socklen_t *addrlen, bool loop_monitored) {
     int fd = lwip_accept(fd_, addr, addrlen);
     if (fd == -1)
       return {};
-    return make_unique<LwIPSocketImpl>(fd);
+    return make_unique<LwIPSocketImpl>(fd, loop_monitored);
   }
+
+ public:
   int bind(const struct sockaddr *addr, socklen_t addrlen) override { return lwip_bind(fd_, addr, addrlen); }
   int close() override {
-    int ret = lwip_close(fd_);
-    closed_ = true;
-    return ret;
+    if (!closed_) {
+#ifdef USE_SOCKET_SELECT_SUPPORT
+      // Unregister from select() before closing if monitored
+      if (loop_monitored_) {
+        App.unregister_socket_fd(fd_);
+      }
+#endif
+      int ret = lwip_close(fd_);
+      closed_ = true;
+      return ret;
+    }
+    return 0;
   }
   int shutdown(int how) override { return lwip_shutdown(fd_, how); }
 
@@ -98,16 +131,27 @@ class LwIPSocketImpl : public Socket {
     return 0;
   }
 
+  int get_fd() const override { return fd_; }
+
  protected:
   int fd_;
   bool closed_ = false;
 };
 
-std::unique_ptr<Socket> socket(int domain, int type, int protocol) {
+// Helper to create a socket with optional monitoring
+static std::unique_ptr<Socket> create_socket(int domain, int type, int protocol, bool loop_monitored = false) {
   int ret = lwip_socket(domain, type, protocol);
   if (ret == -1)
     return nullptr;
-  return std::unique_ptr<Socket>{new LwIPSocketImpl(ret)};
+  return std::unique_ptr<Socket>{new LwIPSocketImpl(ret, loop_monitored)};
+}
+
+std::unique_ptr<Socket> socket(int domain, int type, int protocol) {
+  return create_socket(domain, type, protocol, false);
+}
+
+std::unique_ptr<Socket> socket_loop_monitored(int domain, int type, int protocol) {
+  return create_socket(domain, type, protocol, true);
 }
 
 }  // namespace socket

esphome/components/socket/socket.cpp

@@ -4,12 +4,35 @@
 #include <cstring>
 #include <string>
 #include "esphome/core/log.h"
+#include "esphome/core/application.h"
 
 namespace esphome {
 namespace socket {
 
 Socket::~Socket() {}
 
+bool Socket::ready() const {
+#ifdef USE_SOCKET_SELECT_SUPPORT
+  if (!loop_monitored_) {
+    // Non-monitored sockets always return true (assume data may be available)
+    return true;
+  }
+
+  // For loop-monitored sockets, check with the Application's select() results
+  int fd = this->get_fd();
+  if (fd < 0) {
+    // No valid file descriptor, assume ready (fallback behavior)
+    return true;
+  }
+
+  return App.is_socket_ready(fd);
+#else
+  // Without select() support, we can't monitor sockets in the loop
+  // Always return true (assume data may be available)
+  return true;
+#endif
+}
+
 std::unique_ptr<Socket> socket_ip(int type, int protocol) {
 #if USE_NETWORK_IPV6
   return socket(AF_INET6, type, protocol);
@@ -18,6 +41,14 @@ std::unique_ptr<Socket> socket_ip(int type, int protocol) {
 #endif /* USE_NETWORK_IPV6 */
 }
 
+std::unique_ptr<Socket> socket_ip_loop_monitored(int type, int protocol) {
+#if USE_NETWORK_IPV6
+  return socket_loop_monitored(AF_INET6, type, protocol);
+#else
+  return socket_loop_monitored(AF_INET, type, protocol);
+#endif /* USE_NETWORK_IPV6 */
+}
+
 socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const std::string &ip_address, uint16_t port) {
 #if USE_NETWORK_IPV6
   if (ip_address.find(':') != std::string::npos) {

esphome/components/socket/socket.h

@@ -17,6 +17,11 @@ class Socket {
   Socket &operator=(const Socket &) = delete;
 
   virtual std::unique_ptr<Socket> accept(struct sockaddr *addr, socklen_t *addrlen) = 0;
+  /// Accept a connection and monitor it in the main loop
+  /// NOTE: This function is NOT thread-safe and must only be called from the main loop
+  virtual std::unique_ptr<Socket> accept_loop_monitored(struct sockaddr *addr, socklen_t *addrlen) {
+    return accept(addr, addrlen);  // Default implementation for backward compatibility
+  }
   virtual int bind(const struct sockaddr *addr, socklen_t addrlen) = 0;
   virtual int close() = 0;
   // not supported yet:
@@ -44,14 +49,35 @@ class Socket {
 
   virtual int setblocking(bool blocking) = 0;
   virtual int loop() { return 0; };
+
+  /// Get the underlying file descriptor (returns -1 if not supported)
+  virtual int get_fd() const { return -1; }
+
+  /// Check if socket has data ready to read
+  /// For loop-monitored sockets, checks with the Application's select() results
+  /// For non-monitored sockets, always returns true (assumes data may be available)
+  bool ready() const;
+
+ protected:
+#ifdef USE_SOCKET_SELECT_SUPPORT
+  bool loop_monitored_{false};  ///< Whether this socket is monitored by the event loop
+#endif
 };
 
 /// Create a socket of the given domain, type and protocol.
 std::unique_ptr<Socket> socket(int domain, int type, int protocol);
-
 /// Create a socket in the newest available IP domain (IPv6 or IPv4) of the given type and protocol.
 std::unique_ptr<Socket> socket_ip(int type, int protocol);
 
+/// Create a socket and monitor it for data in the main loop.
+/// Like socket() but also registers the socket with the Application's select() loop.
+/// WARNING: These functions are NOT thread-safe. They must only be called from the main loop
+/// as they register the socket file descriptor with the global Application instance.
+/// NOTE: On ESP platforms, FD_SETSIZE is typically 10, limiting the number of monitored sockets.
+/// File descriptors >= FD_SETSIZE will not be monitored and will log an error.
+std::unique_ptr<Socket> socket_loop_monitored(int domain, int type, int protocol);
+std::unique_ptr<Socket> socket_ip_loop_monitored(int type, int protocol);
+
 /// Set a sockaddr to the specified address and port for the IP version used by socket_ip().
 socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const std::string &ip_address, uint16_t port);
 

esphome/components/sonoff_d1/sonoff_d1.cpp

@@ -286,10 +286,13 @@ void SonoffD1Output::write_state(light::LightState *state) {
 }
 
 void SonoffD1Output::dump_config() {
-  ESP_LOGCONFIG(TAG, "Sonoff D1 Dimmer: '%s'", this->light_state_ ? this->light_state_->get_name().c_str() : "");
-  ESP_LOGCONFIG(TAG, "  Use RM433 Remote: %s", ONOFF(this->use_rm433_remote_));
-  ESP_LOGCONFIG(TAG, "  Minimal brightness: %d", this->min_value_);
-  ESP_LOGCONFIG(TAG, "  Maximal brightness: %d", this->max_value_);
+  ESP_LOGCONFIG(TAG,
+                "Sonoff D1 Dimmer: '%s'\n"
+                "  Use RM433 Remote: %s\n"
+                "  Minimal brightness: %d\n"
+                "  Maximal brightness: %d",
+                this->light_state_ ? this->light_state_->get_name().c_str() : "", ONOFF(this->use_rm433_remote_),
+                this->min_value_, this->max_value_);
 }
 
 void SonoffD1Output::loop() {

esphome/components/sonoff_d1/sonoff_d1.h

@@ -31,9 +31,9 @@
   -----
 */
 
-#include "esphome/core/log.h"
-#include "esphome/core/helpers.h"
 #include "esphome/core/component.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
 #include "esphome/components/uart/uart.h"
 #include "esphome/components/light/light_output.h"
 #include "esphome/components/light/light_state.h"

esphome/components/sound_level/sound_level.cpp

@@ -19,8 +19,10 @@ static const uint32_t RING_BUFFER_DURATION_MS = 120;
 static const double MAX_SAMPLE_SQUARED_DENOMINATOR = INT16_MIN * INT16_MIN;
 
 void SoundLevelComponent::dump_config() {
-  ESP_LOGCONFIG(TAG, "Sound Level Component:");
-  ESP_LOGCONFIG(TAG, "  Measurement Duration: %" PRIu32 " ms", measurement_duration_ms_);
+  ESP_LOGCONFIG(TAG,
+                "Sound Level Component:\n"
+                "  Measurement Duration: %" PRIu32 " ms",
+                measurement_duration_ms_);
   LOG_SENSOR("  ", "Peak:", this->peak_sensor_);
 
   LOG_SENSOR("  ", "RMS:", this->rms_sensor_);

esphome/components/speaker/media_player/__init__.py

@@ -48,6 +48,7 @@ CONF_ON_UNMUTE = "on_unmute"
 CONF_ON_VOLUME = "on_volume"
 CONF_STREAM = "stream"
 CONF_VOLUME_INCREMENT = "volume_increment"
+CONF_VOLUME_INITIAL = "volume_initial"
 CONF_VOLUME_MIN = "volume_min"
 CONF_VOLUME_MAX = "volume_max"
 
@@ -282,6 +283,7 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_FILES): cv.ensure_list(MEDIA_FILE_TYPE_SCHEMA),
             cv.Optional(CONF_TASK_STACK_IN_PSRAM, default=False): cv.boolean,
             cv.Optional(CONF_VOLUME_INCREMENT, default=0.05): cv.percentage,
+            cv.Optional(CONF_VOLUME_INITIAL, default=0.5): cv.percentage,
             cv.Optional(CONF_VOLUME_MAX, default=1.0): cv.percentage,
             cv.Optional(CONF_VOLUME_MIN, default=0.0): cv.percentage,
             cv.Optional(CONF_ON_MUTE): automation.validate_automation(single=True),
@@ -356,6 +358,7 @@ async def to_code(config):
         )
 
     cg.add(var.set_volume_increment(config[CONF_VOLUME_INCREMENT]))
+    cg.add(var.set_volume_initial(config[CONF_VOLUME_INITIAL]))
     cg.add(var.set_volume_max(config[CONF_VOLUME_MAX]))
     cg.add(var.set_volume_min(config[CONF_VOLUME_MIN]))
 

esphome/components/speaker/media_player/speaker_media_player.cpp

@@ -48,8 +48,6 @@ static const uint32_t MEDIA_CONTROLS_QUEUE_LENGTH = 20;
 static const UBaseType_t MEDIA_PIPELINE_TASK_PRIORITY = 1;
 static const UBaseType_t ANNOUNCEMENT_PIPELINE_TASK_PRIORITY = 1;
 
-static const float FIRST_BOOT_DEFAULT_VOLUME = 0.5f;
-
 static const char *const TAG = "speaker_media_player";
 
 void SpeakerMediaPlayer::setup() {
@@ -64,7 +62,7 @@ void SpeakerMediaPlayer::setup() {
     this->set_volume_(volume_restore_state.volume);
     this->set_mute_state_(volume_restore_state.is_muted);
   } else {
-    this->set_volume_(FIRST_BOOT_DEFAULT_VOLUME);
+    this->set_volume_(this->volume_initial_);
     this->set_mute_state_(false);
   }
 

esphome/components/speaker/media_player/speaker_media_player.h

@@ -55,6 +55,9 @@ class SpeakerMediaPlayer : public Component, public media_player::MediaPlayer {
   // Percentage to increase or decrease the volume for volume up or volume down commands
   void set_volume_increment(float volume_increment) { this->volume_increment_ = volume_increment; }
 
+  // Volume used initially on first boot when no volume had been previously saved
+  void set_volume_initial(float volume_initial) { this->volume_initial_ = volume_initial; }
+
   void set_volume_max(float volume_max) { this->volume_max_ = volume_max; }
   void set_volume_min(float volume_min) { this->volume_min_ = volume_min; }
 
@@ -128,6 +131,9 @@ class SpeakerMediaPlayer : public Component, public media_player::MediaPlayer {
   // The amount to change the volume on volume up/down commands
   float volume_increment_;
 
+  // The initial volume used by Setup when no previous volume was saved
+  float volume_initial_;
+
   float volume_max_;
   float volume_min_;
 

esphome/components/spi/__init__.py

@@ -2,12 +2,14 @@ import re
 
 from esphome import pins
 import esphome.codegen as cg
+from esphome.components.esp32 import only_on_variant
 from esphome.components.esp32.const import (
     KEY_ESP32,
     VARIANT_ESP32C2,
     VARIANT_ESP32C3,
     VARIANT_ESP32C6,
     VARIANT_ESP32H2,
+    VARIANT_ESP32P4,
     VARIANT_ESP32S2,
     VARIANT_ESP32S3,
 )
@@ -287,7 +289,15 @@ def spi_mode_schema(mode):
     if mode == TYPE_SINGLE:
         return SPI_SINGLE_SCHEMA
     pin_count = 4 if mode == TYPE_QUAD else 8
+    onlys = [cv.only_on([PLATFORM_ESP32]), cv.only_with_esp_idf]
+    if pin_count == 8:
+        onlys.append(
+            only_on_variant(
+                supported=[VARIANT_ESP32S3, VARIANT_ESP32S2, VARIANT_ESP32P4]
+            )
+        )
     return cv.All(
+        *onlys,
         cv.Schema(
             {
                 cv.GenerateID(): cv.declare_id(TYPE_CLASS[mode]),
@@ -308,8 +318,6 @@ def spi_mode_schema(mode):
                 ),
             }
         ),
-        cv.only_on([PLATFORM_ESP32]),
-        cv.only_with_esp_idf,
     )
 
 

esphome/components/spi/spi.cpp

@@ -18,7 +18,7 @@ GPIOPin *const NullPin::NULL_PIN = new NullPin();  // NOLINT(cppcoreguidelines-a
 SPIDelegate *SPIComponent::register_device(SPIClient *device, SPIMode mode, SPIBitOrder bit_order, uint32_t data_rate,
                                            GPIOPin *cs_pin) {
   if (this->devices_.count(device) != 0) {
-    ESP_LOGE(TAG, "SPI device already registered");
+    ESP_LOGE(TAG, "Device already registered");
     return this->devices_[device];
   }
   SPIDelegate *delegate = this->spi_bus_->get_delegate(data_rate, bit_order, mode, cs_pin);  // NOLINT
@@ -28,7 +28,7 @@ SPIDelegate *SPIComponent::register_device(SPIClient *device, SPIMode mode, SPIB
 
 void SPIComponent::unregister_device(SPIClient *device) {
   if (this->devices_.count(device) == 0) {
-    esph_log_e(TAG, "SPI device not registered");
+    esph_log_e(TAG, "Device not registered");
     return;
   }
   delete this->devices_[device];  // NOLINT
@@ -36,14 +36,14 @@ void SPIComponent::unregister_device(SPIClient *device) {
 }
 
 void SPIComponent::setup() {
-  ESP_LOGD(TAG, "Setting up SPI bus...");
+  ESP_LOGCONFIG(TAG, "Running setup");
 
   if (this->sdo_pin_ == nullptr)
     this->sdo_pin_ = NullPin::NULL_PIN;
   if (this->sdi_pin_ == nullptr)
     this->sdi_pin_ = NullPin::NULL_PIN;
   if (this->clk_pin_ == nullptr) {
-    ESP_LOGE(TAG, "No clock pin for SPI");
+    ESP_LOGE(TAG, "No clock pin");
     this->mark_failed();
     return;
   }

esphome/components/spi/spi_arduino.cpp

@@ -3,7 +3,6 @@
 
 namespace esphome {
 namespace spi {
-
 #ifdef USE_ARDUINO
 
 static const char *const TAG = "spi-esp-arduino";
@@ -38,17 +37,31 @@ class SPIDelegateHw : public SPIDelegate {
 
   void write16(uint16_t data) override { this->channel_->transfer16(data); }
 
-#ifdef USE_RP2040
   void write_array(const uint8_t *ptr, size_t length) override {
-    // avoid overwriting the supplied buffer
-    uint8_t *rxbuf = new uint8_t[length];  // NOLINT(cppcoreguidelines-owning-memory)
-    memcpy(rxbuf, ptr, length);
-    this->channel_->transfer((void *) rxbuf, length);
-    delete[] rxbuf;  // NOLINT(cppcoreguidelines-owning-memory)
-  }
+    if (length == 1) {
+      this->channel_->transfer(*ptr);
+      return;
+    }
+#ifdef USE_RP2040
+    // avoid overwriting the supplied buffer. Use vector for automatic deallocation
+    auto rxbuf = std::vector<uint8_t>(length);
+    memcpy(rxbuf.data(), ptr, length);
+    this->channel_->transfer((void *) rxbuf.data(), length);
+#elif defined(USE_ESP8266)
+    // ESP8266 SPI library requires the pointer to be word aligned, but the data may not be
+    // so we need to copy the data to a temporary buffer
+    if (reinterpret_cast<uintptr_t>(ptr) & 0x3) {
+      ESP_LOGVV(TAG, "SPI write buffer not word aligned, copying to temporary buffer");
+      auto txbuf = std::vector<uint8_t>(length);
+      memcpy(txbuf.data(), ptr, length);
+      this->channel_->writeBytes(txbuf.data(), length);
+    } else {
+      this->channel_->writeBytes(ptr, length);
+    }
 #else
-  void write_array(const uint8_t *ptr, size_t length) override { this->channel_->writeBytes(ptr, length); }
+    this->channel_->writeBytes(ptr, length);
 #endif
+  }
 
   void read_array(uint8_t *ptr, size_t length) override { this->channel_->transfer(ptr, length); }
 

esphome/components/spi_device/spi_device.cpp

@@ -9,9 +9,8 @@ namespace spi_device {
 static const char *const TAG = "spi_device";
 
 void SPIDeviceComponent::setup() {
-  ESP_LOGD(TAG, "Setting up SPIDevice...");
+  ESP_LOGCONFIG(TAG, "Running setup");
   this->spi_setup();
-  ESP_LOGCONFIG(TAG, "SPIDevice started!");
 }
 
 void SPIDeviceComponent::dump_config() {

esphome/components/sprinkler/sprinkler.cpp

@@ -1712,15 +1712,18 @@ void Sprinkler::dump_config() {
     if (this->valve_overlap_) {
       ESP_LOGCONFIG(TAG, "  Valve Overlap: %" PRIu32 " seconds", this->switching_delay_.value_or(0));
     } else {
-      ESP_LOGCONFIG(TAG, "  Valve Open Delay: %" PRIu32 " seconds", this->switching_delay_.value_or(0));
-      ESP_LOGCONFIG(TAG, "  Pump Switch Off During Valve Open Delay: %s",
-                    YESNO(this->pump_switch_off_during_valve_open_delay_));
+      ESP_LOGCONFIG(TAG,
+                    "  Valve Open Delay: %" PRIu32 " seconds\n"
+                    "  Pump Switch Off During Valve Open Delay: %s",
+                    this->switching_delay_.value_or(0), YESNO(this->pump_switch_off_during_valve_open_delay_));
     }
   }
   for (size_t valve_number = 0; valve_number < this->number_of_valves(); valve_number++) {
-    ESP_LOGCONFIG(TAG, "  Valve %zu:", valve_number);
-    ESP_LOGCONFIG(TAG, "    Name: %s", this->valve_name(valve_number));
-    ESP_LOGCONFIG(TAG, "    Run Duration: %" PRIu32 " seconds", this->valve_run_duration(valve_number));
+    ESP_LOGCONFIG(TAG,
+                  "  Valve %zu:\n"
+                  "    Name: %s\n"
+                  "    Run Duration: %" PRIu32 " seconds",
+                  valve_number, this->valve_name(valve_number), this->valve_run_duration(valve_number));
     if (this->valve_[valve_number].valve_switch.pulse_duration()) {
       ESP_LOGCONFIG(TAG, "    Pulse Duration: %" PRIu32 " milliseconds",
                     this->valve_[valve_number].valve_switch.pulse_duration());