mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-18 15:35:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

[template] Avoid heap allocation for valve triggers (#13697)

Browse Source
This commit is contained in:
J. Nick Koston
2026-02-02 04:46:41 +01:00
committed by GitHub
parent 8a8c1290db
commit d49d8095df
2 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
esphome/components/template/valve/template_valve.cpp
View File

@@ -7,12 +7,7 @@ using namespace esphome::valve;
static const char *const TAG = "template.valve"; static const char *const TAG = "template.valve";
TemplateValve::TemplateValve() TemplateValve::TemplateValve() = default;
: open_trigger_(new Trigger<>()),
close_trigger_(new Trigger<>),
stop_trigger_(new Trigger<>()),
toggle_trigger_(new Trigger<>()),
position_trigger_(new Trigger<float>()) {}
void TemplateValve::setup() { void TemplateValve::setup() {
switch (this->restore_mode_) { switch (this->restore_mode_) {
@@ -56,10 +51,10 @@ void TemplateValve::set_optimistic(bool optimistic) { this->optimistic_ = optimi
void TemplateValve::set_assumed_state(bool assumed_state) { this->assumed_state_ = assumed_state; } void TemplateValve::set_assumed_state(bool assumed_state) { this->assumed_state_ = assumed_state; }
float TemplateValve::get_setup_priority() const { return setup_priority::HARDWARE; } float TemplateValve::get_setup_priority() const { return setup_priority::HARDWARE; }
Trigger<> *TemplateValve::get_open_trigger() const { return this->open_trigger_; } Trigger<> *TemplateValve::get_open_trigger() { return &this->open_trigger_; }
Trigger<> *TemplateValve::get_close_trigger() const { return this->close_trigger_; } Trigger<> *TemplateValve::get_close_trigger() { return &this->close_trigger_; }
Trigger<> *TemplateValve::get_stop_trigger() const { return this->stop_trigger_; } Trigger<> *TemplateValve::get_stop_trigger() { return &this->stop_trigger_; }
Trigger<> *TemplateValve::get_toggle_trigger() const { return this->toggle_trigger_; } Trigger<> *TemplateValve::get_toggle_trigger() { return &this->toggle_trigger_; }
void TemplateValve::dump_config() { void TemplateValve::dump_config() {
LOG_VALVE("", "Template Valve", this); LOG_VALVE("", "Template Valve", this);
@@ -72,14 +67,14 @@ void TemplateValve::dump_config() {
void TemplateValve::control(const ValveCall &call) { void TemplateValve::control(const ValveCall &call) {
if (call.get_stop()) { if (call.get_stop()) {
this->stop_prev_trigger_(); this->stop_prev_trigger_();
this->stop_trigger_->trigger(); this->stop_trigger_.trigger();
this->prev_command_trigger_ = this->stop_trigger_; this->prev_command_trigger_ = &this->stop_trigger_;
this->publish_state(); this->publish_state();
} }
if (call.get_toggle().has_value()) { if (call.get_toggle().has_value()) {
this->stop_prev_trigger_(); this->stop_prev_trigger_();
this->toggle_trigger_->trigger(); this->toggle_trigger_.trigger();
this->prev_command_trigger_ = this->toggle_trigger_; this->prev_command_trigger_ = &this->toggle_trigger_;
this->publish_state(); this->publish_state();
} }
if (call.get_position().has_value()) { if (call.get_position().has_value()) {
@@ -87,13 +82,13 @@ void TemplateValve::control(const ValveCall &call) {
this->stop_prev_trigger_(); this->stop_prev_trigger_();
if (pos == VALVE_OPEN) { if (pos == VALVE_OPEN) {
this->open_trigger_->trigger(); this->open_trigger_.trigger();
this->prev_command_trigger_ = this->open_trigger_; this->prev_command_trigger_ = &this->open_trigger_;
} else if (pos == VALVE_CLOSED) { } else if (pos == VALVE_CLOSED) {
this->close_trigger_->trigger(); this->close_trigger_.trigger();
this->prev_command_trigger_ = this->close_trigger_; this->prev_command_trigger_ = &this->close_trigger_;
} else { } else {
this->position_trigger_->trigger(pos); this->position_trigger_.trigger(pos);
} }
if (this->optimistic_) { if (this->optimistic_) {
@@ -113,7 +108,7 @@ ValveTraits TemplateValve::get_traits() {
return traits; return traits;
} }
Trigger<float> *TemplateValve::get_position_trigger() const { return this->position_trigger_; } Trigger<float> *TemplateValve::get_position_trigger() { return &this->position_trigger_; }
void TemplateValve::set_has_stop(bool has_stop) { this->has_stop_ = has_stop; } void TemplateValve::set_has_stop(bool has_stop) { this->has_stop_ = has_stop; }
void TemplateValve::set_has_toggle(bool has_toggle) { this->has_toggle_ = has_toggle; } void TemplateValve::set_has_toggle(bool has_toggle) { this->has_toggle_ = has_toggle; }

20
esphome/components/template/valve/template_valve.h
View File

@@ -18,11 +18,11 @@ class TemplateValve final : public valve::Valve, public Component {
TemplateValve(); TemplateValve();
template<typename F> void set_state_lambda(F &&f) { this->state_f_.set(std::forward<F>(f)); } template<typename F> void set_state_lambda(F &&f) { this->state_f_.set(std::forward<F>(f)); }
Trigger<> *get_open_trigger() const; Trigger<> *get_open_trigger();
Trigger<> *get_close_trigger() const; Trigger<> *get_close_trigger();
Trigger<> *get_stop_trigger() const; Trigger<> *get_stop_trigger();
Trigger<> *get_toggle_trigger() const; Trigger<> *get_toggle_trigger();
Trigger<float> *get_position_trigger() const; Trigger<float> *get_position_trigger();
void set_optimistic(bool optimistic); void set_optimistic(bool optimistic);
void set_assumed_state(bool assumed_state); void set_assumed_state(bool assumed_state);
void set_has_stop(bool has_stop); void set_has_stop(bool has_stop);
@@ -45,14 +45,14 @@ class TemplateValve final : public valve::Valve, public Component {
TemplateLambda<float> state_f_; TemplateLambda<float> state_f_;
bool assumed_state_{false}; bool assumed_state_{false};
bool optimistic_{false}; bool optimistic_{false};
Trigger<> *open_trigger_; Trigger<> open_trigger_;
Trigger<> *close_trigger_; Trigger<> close_trigger_;
bool has_stop_{false}; bool has_stop_{false};
bool has_toggle_{false}; bool has_toggle_{false};
Trigger<> *stop_trigger_; Trigger<> stop_trigger_;
Trigger<> *toggle_trigger_; Trigger<> toggle_trigger_;
Trigger<> *prev_command_trigger_{nullptr}; Trigger<> *prev_command_trigger_{nullptr};
Trigger<float> *position_trigger_; Trigger<float> position_trigger_;
bool has_position_{false}; bool has_position_{false};
}; };