Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-23 22:14:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Add number setting to web_server/rest_api (#3055)

Browse source
This commit is contained in:
Jesse Hills 2022-01-17 12:31:44 +13:00
parent c5eba04517
commit 01b62a16c3
No known key found for this signature in database
GPG key ID: BEAAE804EFD8E83A
1 changed files with 38 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
esphome/components/web_server/web_server.cpp
View file

@ -236,7 +236,18 @@ void WebServer::handle_index_request(AsyncWebServerRequest *request) {
#ifdef USE_NUMBER #ifdef USE_NUMBER
for (auto *obj : App.get_numbers()) for (auto *obj : App.get_numbers())
if (this->include_internal_ || !obj->is_internal()) if (this->include_internal_ || !obj->is_internal())
write_row(stream, obj, "number", ""); write_row(stream, obj, "number", "", [](AsyncResponseStream &stream, EntityBase *obj) {
number::Number *number = (number::Number *) obj;
stream.print(R"(<input type="number" min=")");
stream.print(number->traits.get_min_value());
stream.print(R"(" max=")");
stream.print(number->traits.get_max_value());
stream.print(R"(" step=")");
stream.print(number->traits.get_step());
stream.print(R"(" value=")");
stream.print(number->state);
stream.print(R"("/>)");
});
#endif #endif
#ifdef USE_SELECT #ifdef USE_SELECT
@ -652,8 +663,29 @@ void WebServer::handle_number_request(AsyncWebServerRequest *request, const UrlM
for (auto *obj : App.get_numbers()) { for (auto *obj : App.get_numbers()) {
if (obj->get_object_id() != match.id) if (obj->get_object_id() != match.id)
continue; continue;
std::string data = this->number_json(obj, obj->state);
request->send(200, "text/json", data.c_str()); if (request->method() == HTTP_GET) {
std::string data = this->number_json(obj, obj->state);
request->send(200, "text/json", data.c_str());
return;
}
if (match.method != "set") {
request->send(404);
return;
}
auto call = obj->make_call();
if (request->hasParam("value")) {
String value = request->getParam("value")->value();
optional<float> value_f = parse_number<float>(value.c_str());
if (value_f.has_value())
call.set_value(*value_f);
}
this->defer([call]() mutable { call.perform(); });
request->send(200);
return; return;
} }
request->send(404); request->send(404);
@ -661,9 +693,8 @@ void WebServer::handle_number_request(AsyncWebServerRequest *request, const UrlM
std::string WebServer::number_json(number::Number *obj, float value) { std::string WebServer::number_json(number::Number *obj, float value) {
return json::build_json([obj, value](JsonObject root) { return json::build_json([obj, value](JsonObject root) {
root["id"] = "number-" + obj->get_object_id(); root["id"] = "number-" + obj->get_object_id();
char buffer[64]; std::string state = str_sprintf("%f", value);
snprintf(buffer, sizeof(buffer), "%f", value); root["state"] = state;
root["state"] = buffer;
root["value"] = value; root["value"] = value;
}); });
} }
@ -769,7 +800,7 @@ bool WebServer::canHandle(AsyncWebServerRequest *request) {
#endif #endif
#ifdef USE_NUMBER #ifdef USE_NUMBER
if (request->method() == HTTP_GET && match.domain == "number") if ((request->method() == HTTP_POST || request->method() == HTTP_GET) && match.domain == "number")
return true; return true;
#endif #endif