From 675b5d45017affa23df34b006ddecfac0200cd1d Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sun, 30 Nov 2025 17:51:23 -0600 Subject: [PATCH] merge --- esphome/components/web_server/web_server.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp index 62da2e5e97..f96546c61b 100644 --- a/esphome/components/web_server/web_server.cpp +++ b/esphome/components/web_server/web_server.cpp @@ -908,12 +908,7 @@ std::string WebServer::cover_json(cover::Cover *obj, JsonDetail start_config) { set_json_icon_state_value(root, obj, "cover", obj->is_fully_closed() ? "CLOSED" : "OPEN", obj->position, start_config); -<<<<<<< Updated upstream - root["current_operation"] = cover::cover_operation_to_str(obj->current_operation); -======= - char buf[PSTR_LOCAL_SIZE]; - root[ESPHOME_F("current_operation")] = PSTR_LOCAL(cover::cover_operation_to_str(obj->current_operation)); ->>>>>>> Stashed changes + root[ESPHOME_F("current_operation")] = cover::cover_operation_to_str(obj->current_operation); if (obj->get_traits().get_supports_position()) root[ESPHOME_F("position")] = obj->position; @@ -1569,12 +1564,7 @@ std::string WebServer::valve_json(valve::Valve *obj, JsonDetail start_config) { set_json_icon_state_value(root, obj, "valve", obj->is_fully_closed() ? "CLOSED" : "OPEN", obj->position, start_config); -<<<<<<< Updated upstream - root["current_operation"] = valve::valve_operation_to_str(obj->current_operation); -======= - char buf[PSTR_LOCAL_SIZE]; - root[ESPHOME_F("current_operation")] = PSTR_LOCAL(valve::valve_operation_to_str(obj->current_operation)); ->>>>>>> Stashed changes + root[ESPHOME_F("current_operation")] = valve::valve_operation_to_str(obj->current_operation); if (obj->get_traits().get_supports_position()) root[ESPHOME_F("position")] = obj->position;