diff --git a/esphome/components/event_emitter/event_emitter.h b/esphome/components/event_emitter/event_emitter.h index 4ad1ac2edc..74afde03c0 100644 --- a/esphome/components/event_emitter/event_emitter.h +++ b/esphome/components/event_emitter/event_emitter.h @@ -69,6 +69,16 @@ template class EventEmitter { std::vector listeners; }; + EventEmitterListenerID get_next_id_() { + // Simple incrementing ID, wrapping around at max + EventEmitterListenerID next_id = (this->current_id_ + 1); + if (next_id == INVALID_LISTENER_ID) { + next_id = 1; + } + this->current_id_ = next_id; + return this->current_id_; + } + EventEntry *find_event_(EvtType event) { for (auto &entry : this->events_) { if (entry.event == event) { @@ -99,16 +109,6 @@ template class EventEmitter { } } - EventEmitterListenerID get_next_id_() { - // Simple incrementing ID, wrapping around at max - EventEmitterListenerID next_id = (this->current_id_ + 1); - if (next_id == 0) { // Skip 0 as it's often used as "invalid" - next_id = 1; - } - this->current_id_ = next_id; - return this->current_id_; - } - std::vector events_; EventEmitterListenerID current_id_ = 0; };