sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-30 22:53:59 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/last_Event_fix' into idf_webserver_ota

Browse Source
This commit is contained in:
J. Nick Koston
2025-06-29 16:54:00 -05:00
parent 3530437b48 30bafc43bd
commit 2f5db85997
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
esphome/components/web_server/web_server.cpp
View File

@@ -1683,15 +1683,15 @@ void WebServer::handle_event_request(AsyncWebServerRequest *request, const UrlMa
request->send(404);
}
static std::string get_event_type(event::Event *event) { return event->last_event_type ? *event->last_event_type : ""; }
std::string WebServer::event_state_json_generator(WebServer *web_server, void *source) {
event::Event *event = (event::Event *) source;
const std::string event_type = event->last_event_type ? *event->last_event_type : "";
return web_server->event_json(event, event_type, DETAIL_STATE);
auto *event = static_cast<event::Event *>(source);
return web_server->event_json(event, get_event_type(event), DETAIL_STATE);
}
std::string WebServer::event_all_json_generator(WebServer *web_server, void *source) {
event::Event *event = (event::Event *) source;
const std::string event_type = event->last_event_type ? *event->last_event_type : "";
return web_server->event_json(event, event_type, DETAIL_ALL);
auto *event = static_cast<event::Event *>(source);
return web_server->event_json(event, get_event_type(event), DETAIL_ALL);
}
std::string WebServer::event_json(event::Event *obj, const std::string &event_type, JsonDetail start_config) {
return json::build_json([this, obj, event_type, start_config](JsonObject root) {