sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 15:12:06 +00:00
Code Issues Releases Wiki Activity

Make defer FIFO

Browse Source
This commit is contained in:
J. Nick Koston
2025-07-04 07:42:37 -05:00
parent ba4c268956
commit e21334b7fa
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -488,13 +488,13 @@ void WebServer::handle_switch_request(AsyncWebServerRequest *request, const UrlM
std::string data = this->switch_json(obj, obj->state, detail); std::string data = this->switch_json(obj, obj->state, detail);
request->send(200, "application/json", data.c_str()); request->send(200, "application/json", data.c_str());
} else if (match.method_equals("toggle")) { } else if (match.method_equals("toggle")) {
this->schedule_([obj]() { obj->toggle(); }); this->defer([obj]() { obj->toggle(); });
request->send(200); request->send(200);
} else if (match.method_equals("turn_on")) { } else if (match.method_equals("turn_on")) {
this->schedule_([obj]() { obj->turn_on(); }); this->defer([obj]() { obj->turn_on(); });
request->send(200); request->send(200);
} else if (match.method_equals("turn_off")) { } else if (match.method_equals("turn_off")) {
this->schedule_([obj]() { obj->turn_off(); }); this->defer([obj]() { obj->turn_off(); });
request->send(200); request->send(200);
} else { } else {
request->send(404); request->send(404);
@@ -530,7 +530,7 @@ void WebServer::handle_button_request(AsyncWebServerRequest *request, const UrlM
std::string data = this->button_json(obj, detail); std::string data = this->button_json(obj, detail);
request->send(200, "application/json", data.c_str()); request->send(200, "application/json", data.c_str());
} else if (match.method_equals("press")) { } else if (match.method_equals("press")) {
this->schedule_([obj]() { obj->press(); }); this->defer([obj]() { obj->press(); });
request->send(200); request->send(200);
return; return;
} else { } else {
@@ -610,7 +610,7 @@ void WebServer::handle_fan_request(AsyncWebServerRequest *request, const UrlMatc
std::string data = this->fan_json(obj, detail); std::string data = this->fan_json(obj, detail);
request->send(200, "application/json", data.c_str()); request->send(200, "application/json", data.c_str());
} else if (match.method_equals("toggle")) { } else if (match.method_equals("toggle")) {
this->schedule_([obj]() { obj->toggle().perform(); }); this->defer([obj]() { obj->toggle().perform(); });
request->send(200); request->send(200);
} else if (match.method_equals("turn_on") || match.method_equals("turn_off")) { } else if (match.method_equals("turn_on") || match.method_equals("turn_off")) {
auto call = match.method_equals("turn_on") ? obj->turn_on() : obj->turn_off(); auto call = match.method_equals("turn_on") ? obj->turn_on() : obj->turn_off();
@@ -642,7 +642,7 @@ void WebServer::handle_fan_request(AsyncWebServerRequest *request, const UrlMatc
return; return;
} }
} }
this->schedule_([call]() mutable { call.perform(); }); this->defer([call]() mutable { call.perform(); });
request->send(200); request->send(200);
} else { } else {
request->send(404); request->send(404);
@@ -691,7 +691,7 @@ void WebServer::handle_light_request(AsyncWebServerRequest *request, const UrlMa
std::string data = this->light_json(obj, detail); std::string data = this->light_json(obj, detail);
request->send(200, "application/json", data.c_str()); request->send(200, "application/json", data.c_str());
} else if (match.method_equals("toggle")) { } else if (match.method_equals("toggle")) {
this->schedule_([obj]() { obj->toggle().perform(); }); this->defer([obj]() { obj->toggle().perform(); });
request->send(200); request->send(200);
} else if (match.method_equals("turn_on")) { } else if (match.method_equals("turn_on")) {
auto call = obj->turn_on(); auto call = obj->turn_on();
@@ -748,7 +748,7 @@ void WebServer::handle_light_request(AsyncWebServerRequest *request, const UrlMa
call.set_effect(effect); call.set_effect(effect);
} }
this->schedule_([call]() mutable { call.perform(); }); this->defer([call]() mutable { call.perform(); });
request->send(200); request->send(200);
} else if (match.method_equals("turn_off")) { } else if (match.method_equals("turn_off")) {
auto call = obj->turn_off(); auto call = obj->turn_off();
@@ -758,7 +758,7 @@ void WebServer::handle_light_request(AsyncWebServerRequest *request, const UrlMa
call.set_transition_length(*transition * 1000); call.set_transition_length(*transition * 1000);
} }
} }
this->schedule_([call]() mutable { call.perform(); }); this->defer([call]() mutable { call.perform(); });
request->send(200); request->send(200);
} else { } else {
request->send(404); request->send(404);
@@ -1414,13 +1414,13 @@ void WebServer::handle_lock_request(AsyncWebServerRequest *request, const UrlMat
std::string data = this->lock_json(obj, obj->state, detail); std::string data = this->lock_json(obj, obj->state, detail);
request->send(200, "application/json", data.c_str()); request->send(200, "application/json", data.c_str());
} else if (match.method_equals("lock")) { } else if (match.method_equals("lock")) {
this->schedule_([obj]() { obj->lock(); }); this->defer([obj]() { obj->lock(); });
request->send(200); request->send(200);
} else if (match.method_equals("unlock")) { } else if (match.method_equals("unlock")) {
this->schedule_([obj]() { obj->unlock(); }); this->defer([obj]() { obj->unlock(); });
request->send(200); request->send(200);
} else if (match.method_equals("open")) { } else if (match.method_equals("open")) {
this->schedule_([obj]() { obj->open(); }); this->defer([obj]() { obj->open(); });
request->send(200); request->send(200);
} else { } else {
request->send(404); request->send(404);
@@ -1657,7 +1657,7 @@ void WebServer::handle_update_request(AsyncWebServerRequest *request, const UrlM
return; return;
} }
this->schedule_([obj]() mutable { obj->perform(); }); this->defer([obj]() mutable { obj->perform(); });
request->send(200); request->send(200);
return; return;
} }
@@ -2034,8 +2034,6 @@ void WebServer::add_sorting_group(uint64_t group_id, const std::string &group_na
} }
#endif #endif
void WebServer::schedule_(std::function<void()> &&f) { this->defer(std::move(f)); }
} // namespace web_server } // namespace web_server
} // namespace esphome } // namespace esphome
#endif #endif