From c65d78f568fcb9bdd7bea001e05601df941714ec Mon Sep 17 00:00:00 2001
From: Ilia Sotnikov <hostcc@users.noreply.github.com>
Date: Mon, 9 Oct 2023 06:37:48 +0300
Subject: [PATCH] [Sprinkler] Initialize timers early to avoid crash (#5499)

---
 esphome/components/sprinkler/__init__.py   | 16 +++++-----------
 esphome/components/sprinkler/sprinkler.cpp |  9 +++++++--
 esphome/components/sprinkler/sprinkler.h   |  4 ++--
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/esphome/components/sprinkler/__init__.py b/esphome/components/sprinkler/__init__.py
index e1d855778a9..02c80ad5a04 100644
--- a/esphome/components/sprinkler/__init__.py
+++ b/esphome/components/sprinkler/__init__.py
@@ -571,18 +571,12 @@ async def sprinkler_simple_action_to_code(config, action_id, template_arg, args)
 
 async def to_code(config):
     for sprinkler_controller in config:
-        var = cg.new_Pvariable(sprinkler_controller[CONF_ID])
-
-        if CONF_NAME in sprinkler_controller:
-            cg.add(var.set_name(sprinkler_controller[CONF_NAME]))
+        if len(sprinkler_controller[CONF_VALVES]) > 1:
+            name = sprinkler_controller[CONF_MAIN_SWITCH][CONF_NAME]
         else:
-            if len(sprinkler_controller[CONF_VALVES]) > 1:
-                name = sprinkler_controller[CONF_MAIN_SWITCH][CONF_NAME]
-            else:
-                name = sprinkler_controller[CONF_VALVES][0][CONF_VALVE_SWITCH][
-                    CONF_NAME
-                ]
-            cg.add(var.set_name(name))
+            name = sprinkler_controller[CONF_VALVES][0][CONF_VALVE_SWITCH][CONF_NAME]
+        name = sprinkler_controller.get(CONF_NAME, name)
+        var = cg.new_Pvariable(sprinkler_controller[CONF_ID], name)
 
         await cg.register_component(var, sprinkler_controller)
 
diff --git a/esphome/components/sprinkler/sprinkler.cpp b/esphome/components/sprinkler/sprinkler.cpp
index 8afafcb5ced..6900c9461bb 100644
--- a/esphome/components/sprinkler/sprinkler.cpp
+++ b/esphome/components/sprinkler/sprinkler.cpp
@@ -386,12 +386,17 @@ SprinklerValveOperator *SprinklerValveRunRequest::valve_operator() { return this
 
 SprinklerValveRunRequestOrigin SprinklerValveRunRequest::request_is_from() { return this->origin_; }
 
-void Sprinkler::setup() {
+Sprinkler::Sprinkler() {}
+Sprinkler::Sprinkler(const std::string &name) {
+  // The `name` is needed to set timers up, hence non-default constructor
+  // replaces `set_name()` method previously existed
+  this->name_ = name;
   this->timer_.push_back({this->name_ + "sm", false, 0, 0, std::bind(&Sprinkler::sm_timer_callback_, this)});
   this->timer_.push_back({this->name_ + "vs", false, 0, 0, std::bind(&Sprinkler::valve_selection_callback_, this)});
-  this->all_valves_off_(true);
 }
 
+void Sprinkler::setup() { this->all_valves_off_(true); }
+
 void Sprinkler::loop() {
   for (auto &p : this->pump_) {
     p.loop();
diff --git a/esphome/components/sprinkler/sprinkler.h b/esphome/components/sprinkler/sprinkler.h
index ae7554d3af9..5311ae4c059 100644
--- a/esphome/components/sprinkler/sprinkler.h
+++ b/esphome/components/sprinkler/sprinkler.h
@@ -204,12 +204,12 @@ class SprinklerValveRunRequest {
 
 class Sprinkler : public Component {
  public:
+  Sprinkler();
+  Sprinkler(const std::string &name);
   void setup() override;
   void loop() override;
   void dump_config() override;
 
-  void set_name(const std::string &name) { this->name_ = name; }
-
   /// add a valve to the controller
   void add_valve(SprinklerControllerSwitch *valve_sw, SprinklerControllerSwitch *enable_sw = nullptr);