sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-23 12:13:49 +01:00
Code Issues Releases Wiki Activity

preen

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-18 21:45:02 -10:00
parent f387d9ec50
commit 0e513b41e4
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
esphome/components/script/script.h
View File

@@ -111,8 +111,6 @@ template<typename... Ts> class RestartScript : public Script<Ts...> {
template<typename... Ts> class QueueingScript : public Script<Ts...>, public Component { template<typename... Ts> class QueueingScript : public Script<Ts...>, public Component {
public: public:
void execute(Ts... x) override { void execute(Ts... x) override {
this->lazy_init_queue_();
if (this->is_action_running() || this->num_queued_ > 0) { if (this->is_action_running() || this->num_queued_ > 0) {
// num_queued_ is the number of *queued* instances (waiting, not including currently running) // num_queued_ is the number of *queued* instances (waiting, not including currently running)
// max_runs_ is the maximum *total* instances (running + queued) // max_runs_ is the maximum *total* instances (running + queued)
@@ -123,12 +121,15 @@ template<typename... Ts> class QueueingScript : public Script<Ts...>, public Com
return; return;
} }
// Initialize queue on first queued item (after capacity check)
this->lazy_init_queue_();
this->esp_logd_(__LINE__, ESPHOME_LOG_FORMAT("Script '%s' queueing new instance (mode: queued)"), this->esp_logd_(__LINE__, ESPHOME_LOG_FORMAT("Script '%s' queueing new instance (mode: queued)"),
LOG_STR_ARG(this->name_)); LOG_STR_ARG(this->name_));
// Ring buffer: write to (queue_front_ + num_queued_) % (max_runs_ - 1) // Ring buffer: write to (queue_front_ + num_queued_) % (max_runs_ - 1)
size_t write_pos = (this->queue_front_ + this->num_queued_) % (this->max_runs_ - 1); size_t write_pos = (this->queue_front_ + this->num_queued_) % (this->max_runs_ - 1);
// Use reset() to replace the unique_ptr // Use std::make_unique to replace the unique_ptr
this->var_queue_[write_pos].reset(new std::tuple<Ts...>(std::make_tuple(x...))); this->var_queue_[write_pos] = std::make_unique<std::tuple<Ts...>>(x...);
this->num_queued_++; this->num_queued_++;
return; return;
} }
@@ -144,6 +145,7 @@ template<typename... Ts> class QueueingScript : public Script<Ts...>, public Com
for (int i = 0; i < this->max_runs_ - 1; i++) { for (int i = 0; i < this->max_runs_ - 1; i++) {
this->var_queue_[i].reset(); this->var_queue_[i].reset();
} }
this->var_queue_.reset();
} }
this->num_queued_ = 0; this->num_queued_ = 0;
this->queue_front_ = 0; this->queue_front_ = 0;