github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-07-10 08:55:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
J. Nick Koston
2025-11-30 17:51:23 -06:00
parent 2ac9f44377
commit 675b5d4501
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/web_server/web_server.cpp
+2 -12
View File
@@ -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;