github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-17 01:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

safety

Browse Source
This commit is contained in:
J. Nick Koston
2026-01-13 17:12:03 -10:00
parent 02b2d4f1a2
commit 44f9e8507a
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/api/api_connection.cpp
+2 -2
View File
@@ -2076,8 +2076,8 @@ uint16_t APIConnection::dispatch_message_(const DeferredBatch::BatchItem &item,
// Events need aux_data_index to look up event type from entity
if (item.message_type == EventResponse::MESSAGE_TYPE) {
auto *event = static_cast<event::Event *>(item.entity);
return try_send_event_response(event, StringRef(event->get_event_type(item.aux_data_index)), this, remaining_size,
is_single);
return try_send_event_response(event, StringRef::from_maybe_nullptr(event->get_event_type(item.aux_data_index)),
this, remaining_size, is_single);
}
#endif
esphome/components/event/event.h
+4 -2
View File
@@ -49,8 +49,10 @@ class Event : public EntityBase, public EntityBase_DeviceClass {
/// Return the last triggered event type, or empty StringRef if no event triggered yet.
StringRef get_last_event_type() const { return StringRef::from_maybe_nullptr(this->last_event_type_); }
/// Return event type by index.
const char *get_event_type(uint8_t index) const { return this->types_[index]; }
/// Return event type by index, or nullptr if index is out of bounds.
const char *get_event_type(uint8_t index) const {
return index < this->types_.size() ? this->types_[index] : nullptr;
}
/// Return index of last triggered event type, or max uint8_t if no event triggered yet.
uint8_t get_last_event_type_index() const {