Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-26 17:17:46 +01:00
Code Issues Projects Releases Wiki Activity

Make sprinkler reset_resume() method public (#3824)

Browse Source
This commit is contained in:
Keith Burzinski 2022-09-19 20:02:55 -05:00 committed by Jesse Hills
parent 47a7a239ae
commit 91f1c25fcc
No known key found for this signature in database
GPG Key ID: BEAAE804EFD8E83A
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
esphome/components/sprinkler/sprinkler.cpp
View File

@ -769,7 +769,7 @@ void Sprinkler::resume() {
ESP_LOGD(TAG, "Resuming valve %u with %u seconds remaining", this->paused_valve_.value_or(0), ESP_LOGD(TAG, "Resuming valve %u with %u seconds remaining", this->paused_valve_.value_or(0),
this->resume_duration_.value_or(0)); this->resume_duration_.value_or(0));
this->fsm_request_(this->paused_valve_.value(), this->resume_duration_.value()); this->fsm_request_(this->paused_valve_.value(), this->resume_duration_.value());
this->reset_resume_(); this->reset_resume();
} else { } else {
ESP_LOGD(TAG, "No valve to resume!"); ESP_LOGD(TAG, "No valve to resume!");
} }
@ -783,6 +783,11 @@ void Sprinkler::resume_or_start_full_cycle() {
} }
} }
void Sprinkler::reset_resume() {
this->paused_valve_.reset();
this->resume_duration_.reset();
}
const char *Sprinkler::valve_name(const size_t valve_number) { const char *Sprinkler::valve_name(const size_t valve_number) {
if (this->is_a_valid_valve(valve_number)) { if (this->is_a_valid_valve(valve_number)) {
return this->valve_[valve_number].controller_switch->get_name().c_str(); return this->valve_[valve_number].controller_switch->get_name().c_str();
@ -1101,11 +1106,6 @@ void Sprinkler::reset_cycle_states_() {
} }
} }
void Sprinkler::reset_resume_() {
this->paused_valve_.reset();
this->resume_duration_.reset();
}
void Sprinkler::fsm_request_(size_t requested_valve, uint32_t requested_run_duration) { void Sprinkler::fsm_request_(size_t requested_valve, uint32_t requested_run_duration) {
this->next_req_.set_valve(requested_valve); this->next_req_.set_valve(requested_valve);
this->next_req_.set_run_duration(requested_run_duration); this->next_req_.set_run_duration(requested_run_duration);

6
esphome/components/sprinkler/sprinkler.h
View File

@ -308,6 +308,9 @@ class Sprinkler : public Component, public EntityBase {
/// if a cycle was suspended using pause(), resumes it. otherwise calls start_full_cycle() /// if a cycle was suspended using pause(), resumes it. otherwise calls start_full_cycle()
void resume_or_start_full_cycle(); void resume_or_start_full_cycle();
/// resets resume state
void reset_resume();
/// returns a pointer to a valve's name string object; returns nullptr if valve_number is invalid /// returns a pointer to a valve's name string object; returns nullptr if valve_number is invalid
const char *valve_name(size_t valve_number); const char *valve_name(size_t valve_number);
@ -401,9 +404,6 @@ class Sprinkler : public Component, public EntityBase {
/// resets the cycle state for all valves /// resets the cycle state for all valves
void reset_cycle_states_(); void reset_cycle_states_();
/// resets resume state
void reset_resume_();
/// make a request of the state machine /// make a request of the state machine
void fsm_request_(size_t requested_valve, uint32_t requested_run_duration = 0); void fsm_request_(size_t requested_valve, uint32_t requested_run_duration = 0);