From a70f565a22a701a98e71fa1eddcea895bcf2ba87 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Mon, 12 Oct 2026 17:31:19 -1000 Subject: [PATCH] Default the autotuner id to empty, wrap the sonoff_d1 fallback and align the deprecation wording --- esphome/components/pid/pid_autotuner.h | 2 +- esphome/components/sonoff_d1/sonoff_d1.cpp | 2 +- esphome/components/sprinkler/sprinkler.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/esphome/components/pid/pid_autotuner.h b/esphome/components/pid/pid_autotuner.h index ebfa6be419..d0c2d10063 100644 --- a/esphome/components/pid/pid_autotuner.h +++ b/esphome/components/pid/pid_autotuner.h @@ -107,7 +107,7 @@ class PIDAutotuner { } state_ = AUTOTUNE_RUNNING; float ku_; float pu_; - const LogString *id_{nullptr}; + const LogString *id_{reinterpret_cast("")}; // empty until set, like the old std::string }; } // namespace esphome::pid diff --git a/esphome/components/sonoff_d1/sonoff_d1.cpp b/esphome/components/sonoff_d1/sonoff_d1.cpp index c8eb385bd9..a4eed03d94 100644 --- a/esphome/components/sonoff_d1/sonoff_d1.cpp +++ b/esphome/components/sonoff_d1/sonoff_d1.cpp @@ -297,7 +297,7 @@ void SonoffD1Output::dump_config() { " Use RM433 Remote: %s\n" " Minimal brightness: %d\n" " Maximal brightness: %d", - this->light_state_ ? LOG_STR_ARG(this->light_state_->get_log_name()) : "", + this->light_state_ ? LOG_STR_ARG(this->light_state_->get_log_name()) : LOG_STR_LITERAL(""), ONOFF(this->use_rm433_remote_), this->min_value_, this->max_value_); } diff --git a/esphome/components/sprinkler/sprinkler.h b/esphome/components/sprinkler/sprinkler.h index e5922b56c9..354ce09347 100644 --- a/esphome/components/sprinkler/sprinkler.h +++ b/esphome/components/sprinkler/sprinkler.h @@ -336,7 +336,8 @@ class Sprinkler final : public Component { void reset_resume(); /// returns a pointer to a valve's name string object; returns nullptr if valve_number is invalid - ESPDEPRECATED("Use valve_log_name() or control_switch()->get_name_to() instead. Removed in 2027.5.0", "2026.11.0") + ESPDEPRECATED("Use valve_log_name() or control_switch()->get_name_to() instead. Will be removed in ESPHome 2027.5.0", + "2026.11.0") const char *valve_name(size_t valve_number); /// returns a valve's name for a "%s" log argument; returns nullptr if valve_number is invalid const LogString *valve_log_name(size_t valve_number);