diff --git a/esphome/components/remote_base/abbwelcome_protocol.h b/esphome/components/remote_base/abbwelcome_protocol.h index 2ed90c502e..4b922eb2f1 100644 --- a/esphome/components/remote_base/abbwelcome_protocol.h +++ b/esphome/components/remote_base/abbwelcome_protocol.h @@ -216,12 +216,11 @@ template class ABBWelcomeAction : public RemoteTransmitterAction TEMPLATABLE_VALUE(bool, auto_message_id) void set_data_template(std::vector (*func)(Ts...)) { this->data_.func = func; - this->static_ = false; + this->len_ = -1; // Sentinel value indicates template mode } void set_data_static(const uint8_t *data, size_t len) { - this->data_.static_data.ptr = data; - this->data_.static_data.len = len; - this->static_ = true; + this->data_.data = data; + this->len_ = len; // Length >= 0 indicates static mode } void encode(RemoteTransmitData *dst, Ts... x) override { ABBWelcomeData data; @@ -233,9 +232,11 @@ template class ABBWelcomeAction : public RemoteTransmitterAction data.set_message_id(this->message_id_.value(x...)); data.auto_message_id = this->auto_message_id_.value(x...); std::vector data_vec; - if (this->static_) { - data_vec.assign(this->data_.static_data.ptr, this->data_.static_data.ptr + this->data_.static_data.len); + if (this->len_ >= 0) { + // Static mode: copy from flash to vector + data_vec.assign(this->data_.data, this->data_.data + this->len_); } else { + // Template mode: call function data_vec = this->data_.func(x...); } data.set_data(data_vec); @@ -244,13 +245,10 @@ template class ABBWelcomeAction : public RemoteTransmitterAction } protected: - bool static_{true}; + ssize_t len_{-1}; // -1 = template mode, >=0 = static mode with length union Data { - std::vector (*func)(Ts...); - struct { - const uint8_t *ptr; - size_t len; - } static_data; + std::vector (*func)(Ts...); // Function pointer (stateless lambdas) + const uint8_t *data; // Pointer to static data in flash } data_; }; diff --git a/esphome/components/speaker/automation.h b/esphome/components/speaker/automation.h index cae429cf8a..391c9e4c62 100644 --- a/esphome/components/speaker/automation.h +++ b/esphome/components/speaker/automation.h @@ -12,32 +12,30 @@ template class PlayAction : public Action, public Parente public: void set_data_template(std::vector (*func)(Ts...)) { this->data_.func = func; - this->static_ = false; + this->len_ = -1; // Sentinel value indicates template mode } void set_data_static(const uint8_t *data, size_t len) { - this->data_.static_data.ptr = data; - this->data_.static_data.len = len; - this->static_ = true; + this->data_.data = data; + this->len_ = len; // Length >= 0 indicates static mode } void play(const Ts &...x) override { - if (this->static_) { - this->parent_->play(this->data_.static_data.ptr, this->data_.static_data.len); + if (this->len_ >= 0) { + // Static mode: pass pointer directly to play(const uint8_t *, size_t) + this->parent_->play(this->data_.data, static_cast(this->len_)); } else { + // Template mode: call function and pass vector to play(const std::vector &) auto val = this->data_.func(x...); this->parent_->play(val); } } protected: - bool static_{true}; + ssize_t len_{-1}; // -1 = template mode, >=0 = static mode with length union Data { - std::vector (*func)(Ts...); - struct { - const uint8_t *ptr; - size_t len; - } static_data; + std::vector (*func)(Ts...); // Function pointer (stateless lambdas) + const uint8_t *data; // Pointer to static data in flash } data_; };