Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Sprinkler] Initialize timers early to avoid crash #5499

Merged
merged 6 commits into from Oct 9, 2023
Merged

[Sprinkler] Initialize timers early to avoid crash #5499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cab21e0
[Sprinkler] Initialize timers early to avoid crash
hostcc Oct 8, 2023
8f4d8d2
* `esphome/components/sprinkler/`: Linting fixes
hostcc Oct 8, 2023
5b5ccd8
* `esphome/components/sprinkler/sprinkler.cpp`: Linting fixes
hostcc Oct 8, 2023
b4b2361
* `esphome/components/sprinkler/sprinkler.cpp`: Linting fixes
hostcc Oct 8, 2023
7067ab7
Merge branch 'dev' into bugfix/sprinkler-timer-init-early
hostcc Oct 8, 2023
5704509
Merge branch 'dev' into bugfix/sprinkler-timer-init-early
hostcc Oct 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 5 additions & 11 deletions esphome/components/sprinkler/__init__.py
View file
Open in desktop
Expand Up @@ -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)

Expand Down
9 changes: 7 additions & 2 deletions esphome/components/sprinkler/sprinkler.cpp
View file
Open in desktop
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions esphome/components/sprinkler/sprinkler.h
View file
Open in desktop
Expand Up @@ -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);

Expand Down