sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-11-16 14:55:50 +00:00
Code Issues Releases Wiki Activity

[event] Store event types in flash memory

Browse Source
This commit is contained in:
J. Nick Koston
2025-11-07 11:30:34 -06:00
parent dc3c18974e
commit fca80d81c8
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
esphome/components/event/event.cpp
View File

@@ -20,8 +20,8 @@ void Event::trigger(const std::string &event_type) {
ESP_LOGE(TAG, "'%s': invalid event type for trigger(): %s", this->get_name().c_str(), event_type.c_str()); ESP_LOGE(TAG, "'%s': invalid event type for trigger(): %s", this->get_name().c_str(), event_type.c_str());
return; return;
} }
this->last_event_type = found; this->last_event_type_ = found;
ESP_LOGD(TAG, "'%s' Triggered event '%s'", this->get_name().c_str(), this->last_event_type); ESP_LOGD(TAG, "'%s' Triggered event '%s'", this->get_name().c_str(), this->last_event_type_);
this->event_callback_.call(event_type); this->event_callback_.call(event_type);
} }

21
esphome/components/event/event.h
View File

@@ -23,17 +23,22 @@ namespace event {
class Event : public EntityBase, public EntityBase_DeviceClass { class Event : public EntityBase, public EntityBase_DeviceClass {
public: public:
const char *last_event_type{nullptr};
void trigger(const std::string &event_type); void trigger(const std::string &event_type);
/// Set the event types supported by this event (from initializer list). /// Set the event types supported by this event (from initializer list).
void set_event_types(std::initializer_list<const char *> event_types) { this->types_ = event_types; } void set_event_types(std::initializer_list<const char *> event_types) {
this->types_ = event_types;
this->last_event_type_ = nullptr; // Reset when types change
}
/// Set the event types supported by this event (from FixedVector). /// Set the event types supported by this event (from FixedVector).
void set_event_types(const FixedVector<const char *> &event_types) { this->types_ = event_types; } void set_event_types(const FixedVector<const char *> &event_types) {
this->types_ = event_types;
this->last_event_type_ = nullptr; // Reset when types change
}
/// Set the event types supported by this event (from C array). /// Set the event types supported by this event (from C array).
template<size_t N> void set_event_types(const char *const (&event_types)[N]) { template<size_t N> void set_event_types(const char *const (&event_types)[N]) {
this->types_.assign(event_types, event_types + N); this->types_.assign(event_types, event_types + N);
this->last_event_type_ = nullptr; // Reset when types change
} }
// Deleted overloads to catch incorrect std::string usage at compile time with clear error messages // Deleted overloads to catch incorrect std::string usage at compile time with clear error messages
@@ -43,11 +48,19 @@ class Event : public EntityBase, public EntityBase_DeviceClass {
/// Return the event types supported by this event. /// Return the event types supported by this event.
const FixedVector<const char *> &get_event_types() const { return this->types_; } const FixedVector<const char *> &get_event_types() const { return this->types_; }
/// Return the last triggered event type (pointer to string in types_), or nullptr if no event triggered yet.
const char *get_last_event_type() const { return this->last_event_type_; }
void add_on_event_callback(std::function<void(const std::string &event_type)> &&callback); void add_on_event_callback(std::function<void(const std::string &event_type)> &&callback);
protected: protected:
CallbackManager<void(const std::string &event_type)> event_callback_; CallbackManager<void(const std::string &event_type)> event_callback_;
FixedVector<const char *> types_; FixedVector<const char *> types_;
private:
/// Last triggered event type - must point to entry in types_ to ensure valid lifetime.
/// Set by trigger() after validation, reset to nullptr when types_ changes.
const char *last_event_type_{nullptr};
}; };
} // namespace event } // namespace event