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

Merge branch 'webserver_flash' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-08-09 20:52:37 -05:00
parent 73b11896d4 4e07c50490
commit da9a29a1dd
2 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -635,7 +635,7 @@ void WebServer::handle_fan_request(AsyncWebServerRequest *request, const UrlMatc
} 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();
parse_int_param(request, "speed_level", call, &decltype(call)::set_speed); parse_int_param_(request, "speed_level", call, &decltype(call)::set_speed);
if (request->hasParam("oscillation")) { if (request->hasParam("oscillation")) {
auto speed = request->getParam("oscillation")->value(); auto speed = request->getParam("oscillation")->value();
@@ -710,24 +710,24 @@ void WebServer::handle_light_request(AsyncWebServerRequest *request, const UrlMa
auto call = obj->turn_on(); auto call = obj->turn_on();
// Parse color parameters // Parse color parameters
parse_light_param(request, "brightness", call, &decltype(call)::set_brightness, 255.0f); parse_light_param_(request, "brightness", call, &decltype(call)::set_brightness, 255.0f);
parse_light_param(request, "r", call, &decltype(call)::set_red, 255.0f); parse_light_param_(request, "r", call, &decltype(call)::set_red, 255.0f);
parse_light_param(request, "g", call, &decltype(call)::set_green, 255.0f); parse_light_param_(request, "g", call, &decltype(call)::set_green, 255.0f);
parse_light_param(request, "b", call, &decltype(call)::set_blue, 255.0f); parse_light_param_(request, "b", call, &decltype(call)::set_blue, 255.0f);
parse_light_param(request, "white_value", call, &decltype(call)::set_white, 255.0f); parse_light_param_(request, "white_value", call, &decltype(call)::set_white, 255.0f);
parse_light_param(request, "color_temp", call, &decltype(call)::set_color_temperature); parse_light_param_(request, "color_temp", call, &decltype(call)::set_color_temperature);
// Parse timing parameters // Parse timing parameters
parse_light_param_uint(request, "flash", call, &decltype(call)::set_flash_length, 1000); parse_light_param_uint_(request, "flash", call, &decltype(call)::set_flash_length, 1000);
parse_light_param_uint(request, "transition", call, &decltype(call)::set_transition_length, 1000); parse_light_param_uint_(request, "transition", call, &decltype(call)::set_transition_length, 1000);
parse_string_param(request, "effect", call, &decltype(call)::set_effect); parse_string_param_(request, "effect", call, &decltype(call)::set_effect);
this->defer([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();
parse_light_param_uint(request, "transition", call, &decltype(call)::set_transition_length, 1000); parse_light_param_uint_(request, "transition", call, &decltype(call)::set_transition_length, 1000);
this->defer([call]() mutable { call.perform(); }); this->defer([call]() mutable { call.perform(); });
request->send(200); request->send(200);
} else { } else {
@@ -800,8 +800,8 @@ void WebServer::handle_cover_request(AsyncWebServerRequest *request, const UrlMa
return; return;
} }
parse_float_param(request, "position", call, &decltype(call)::set_position); parse_float_param_(request, "position", call, &decltype(call)::set_position);
parse_float_param(request, "tilt", call, &decltype(call)::set_tilt); parse_float_param_(request, "tilt", call, &decltype(call)::set_tilt);
this->defer([call]() mutable { call.perform(); }); this->defer([call]() mutable { call.perform(); });
request->send(200); request->send(200);
@@ -855,7 +855,7 @@ void WebServer::handle_number_request(AsyncWebServerRequest *request, const UrlM
} }
auto call = obj->make_call(); auto call = obj->make_call();
parse_float_param(request, "value", call, &decltype(call)::set_value); parse_float_param_(request, "value", call, &decltype(call)::set_value);
this->defer([call]() mutable { call.perform(); }); this->defer([call]() mutable { call.perform(); });
request->send(200); request->send(200);
@@ -927,7 +927,7 @@ void WebServer::handle_date_request(AsyncWebServerRequest *request, const UrlMat
return; return;
} }
parse_string_param(request, "value", call, &decltype(call)::set_date); parse_string_param_(request, "value", call, &decltype(call)::set_date);
this->defer([call]() mutable { call.perform(); }); this->defer([call]() mutable { call.perform(); });
request->send(200); request->send(200);
@@ -983,7 +983,7 @@ void WebServer::handle_time_request(AsyncWebServerRequest *request, const UrlMat
return; return;
} }
parse_string_param(request, "value", call, &decltype(call)::set_time); parse_string_param_(request, "value", call, &decltype(call)::set_time);
this->defer([call]() mutable { call.perform(); }); this->defer([call]() mutable { call.perform(); });
request->send(200); request->send(200);
@@ -1038,7 +1038,7 @@ void WebServer::handle_datetime_request(AsyncWebServerRequest *request, const Ur
return; return;
} }
parse_string_param(request, "value", call, &decltype(call)::set_datetime); parse_string_param_(request, "value", call, &decltype(call)::set_datetime);
this->defer([call]() mutable { call.perform(); }); this->defer([call]() mutable { call.perform(); });
request->send(200); request->send(200);
@@ -1089,7 +1089,7 @@ void WebServer::handle_text_request(AsyncWebServerRequest *request, const UrlMat
} }
auto call = obj->make_call(); auto call = obj->make_call();
parse_string_param(request, "value", call, &decltype(call)::set_value); parse_string_param_(request, "value", call, &decltype(call)::set_value);
this->defer([call]() mutable { call.perform(); }); this->defer([call]() mutable { call.perform(); });
request->send(200); request->send(200);
@@ -1148,7 +1148,7 @@ void WebServer::handle_select_request(AsyncWebServerRequest *request, const UrlM
} }
auto call = obj->make_call(); auto call = obj->make_call();
parse_string_param(request, "option", call, &decltype(call)::set_option); parse_string_param_(request, "option", call, &decltype(call)::set_option);
this->defer([call]() mutable { call.perform(); }); this->defer([call]() mutable { call.perform(); });
request->send(200); request->send(200);
@@ -1205,14 +1205,14 @@ void WebServer::handle_climate_request(AsyncWebServerRequest *request, const Url
auto call = obj->make_call(); auto call = obj->make_call();
// Parse string mode parameters // Parse string mode parameters
parse_string_param(request, "mode", call, &decltype(call)::set_mode); parse_string_param_(request, "mode", call, &decltype(call)::set_mode);
parse_string_param(request, "fan_mode", call, &decltype(call)::set_fan_mode); parse_string_param_(request, "fan_mode", call, &decltype(call)::set_fan_mode);
parse_string_param(request, "swing_mode", call, &decltype(call)::set_swing_mode); parse_string_param_(request, "swing_mode", call, &decltype(call)::set_swing_mode);
// Parse temperature parameters // Parse temperature parameters
parse_float_param(request, "target_temperature_high", call, &decltype(call)::set_target_temperature_high); parse_float_param_(request, "target_temperature_high", call, &decltype(call)::set_target_temperature_high);
parse_float_param(request, "target_temperature_low", call, &decltype(call)::set_target_temperature_low); parse_float_param_(request, "target_temperature_low", call, &decltype(call)::set_target_temperature_low);
parse_float_param(request, "target_temperature", call, &decltype(call)::set_target_temperature); parse_float_param_(request, "target_temperature", call, &decltype(call)::set_target_temperature);
this->defer([call]() mutable { call.perform(); }); this->defer([call]() mutable { call.perform(); });
request->send(200); request->send(200);
@@ -1403,7 +1403,7 @@ void WebServer::handle_valve_request(AsyncWebServerRequest *request, const UrlMa
return; return;
} }
parse_float_param(request, "position", call, &decltype(call)::set_position); parse_float_param_(request, "position", call, &decltype(call)::set_position);
this->defer([call]() mutable { call.perform(); }); this->defer([call]() mutable { call.perform(); });
request->send(200); request->send(200);
@@ -1451,7 +1451,7 @@ void WebServer::handle_alarm_control_panel_request(AsyncWebServerRequest *reques
} }
auto call = obj->make_call(); auto call = obj->make_call();
parse_string_param(request, "code", call, &decltype(call)::set_code); parse_string_param_(request, "code", call, &decltype(call)::set_code);
if (match.method_equals("disarm")) { if (match.method_equals("disarm")) {
call.disarm(); call.disarm();

16
esphome/components/web_server/web_server.h
View File

@@ -502,8 +502,8 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
#ifdef USE_LIGHT #ifdef USE_LIGHT
// Helper to parse and apply a float parameter with optional scaling // Helper to parse and apply a float parameter with optional scaling
template<typename T, typename Ret> template<typename T, typename Ret>
void parse_light_param(AsyncWebServerRequest *request, const char *param_name, T &call, Ret (T::*setter)(float), void parse_light_param_(AsyncWebServerRequest *request, const char *param_name, T &call, Ret (T::*setter)(float),
float scale = 1.0f) { float scale = 1.0f) {
if (request->hasParam(param_name)) { if (request->hasParam(param_name)) {
auto value = parse_number<float>(request->getParam(param_name)->value().c_str()); auto value = parse_number<float>(request->getParam(param_name)->value().c_str());
if (value.has_value()) { if (value.has_value()) {
@@ -514,8 +514,8 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
// Helper to parse and apply a uint32_t parameter with optional scaling // Helper to parse and apply a uint32_t parameter with optional scaling
template<typename T, typename Ret> template<typename T, typename Ret>
void parse_light_param_uint(AsyncWebServerRequest *request, const char *param_name, T &call, void parse_light_param_uint_(AsyncWebServerRequest *request, const char *param_name, T &call,
Ret (T::*setter)(uint32_t), uint32_t scale = 1) { Ret (T::*setter)(uint32_t), uint32_t scale = 1) {
if (request->hasParam(param_name)) { if (request->hasParam(param_name)) {
auto value = parse_number<uint32_t>(request->getParam(param_name)->value().c_str()); auto value = parse_number<uint32_t>(request->getParam(param_name)->value().c_str());
if (value.has_value()) { if (value.has_value()) {
@@ -527,7 +527,7 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
// Generic helper to parse and apply a float parameter // Generic helper to parse and apply a float parameter
template<typename T, typename Ret> template<typename T, typename Ret>
void parse_float_param(AsyncWebServerRequest *request, const char *param_name, T &call, Ret (T::*setter)(float)) { void parse_float_param_(AsyncWebServerRequest *request, const char *param_name, T &call, Ret (T::*setter)(float)) {
if (request->hasParam(param_name)) { if (request->hasParam(param_name)) {
auto value = parse_number<float>(request->getParam(param_name)->value().c_str()); auto value = parse_number<float>(request->getParam(param_name)->value().c_str());
if (value.has_value()) { if (value.has_value()) {
@@ -538,7 +538,7 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
// Generic helper to parse and apply an int parameter // Generic helper to parse and apply an int parameter
template<typename T, typename Ret> template<typename T, typename Ret>
void parse_int_param(AsyncWebServerRequest *request, const char *param_name, T &call, Ret (T::*setter)(int)) { void parse_int_param_(AsyncWebServerRequest *request, const char *param_name, T &call, Ret (T::*setter)(int)) {
if (request->hasParam(param_name)) { if (request->hasParam(param_name)) {
auto value = parse_number<int>(request->getParam(param_name)->value().c_str()); auto value = parse_number<int>(request->getParam(param_name)->value().c_str());
if (value.has_value()) { if (value.has_value()) {
@@ -549,8 +549,8 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
// Generic helper to parse and apply a string parameter // Generic helper to parse and apply a string parameter
template<typename T, typename Ret> template<typename T, typename Ret>
void parse_string_param(AsyncWebServerRequest *request, const char *param_name, T &call, void parse_string_param_(AsyncWebServerRequest *request, const char *param_name, T &call,
Ret (T::*setter)(const std::string &)) { Ret (T::*setter)(const std::string &)) {
if (request->hasParam(param_name)) { if (request->hasParam(param_name)) {
std::string value = request->getParam(param_name)->value().c_str(); std::string value = request->getParam(param_name)->value().c_str();
(call.*setter)(value); (call.*setter)(value);