Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-25 17:07:50 +01:00
Code Issues Projects Releases Wiki Activity

Improve Web view for Climate components (#3706)

Browse Source
This commit is contained in:
anatoly-savchenkov 2022-08-11 04:32:55 +03:00 committed by Jesse Hills
parent 917e8e155c
commit e2c8e69d12
No known key found for this signature in database
GPG Key ID: BEAAE804EFD8E83A
2 changed files with 594 additions and 569 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1136
esphome/components/web_server/server_index.h
View File

File diff suppressed because it is too large Load Diff

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

@ -839,6 +839,7 @@ std::string WebServer::climate_json(climate::Climate *obj, JsonDetail start_conf
return json::build_json([obj, start_config](JsonObject root) { return json::build_json([obj, start_config](JsonObject root) {
set_json_id(root, obj, "climate-" + obj->get_object_id(), start_config); set_json_id(root, obj, "climate-" + obj->get_object_id(), start_config);
const auto traits = obj->get_traits(); const auto traits = obj->get_traits();
int8_t accuracy = traits.get_temperature_accuracy_decimals();
char __buf[16]; char __buf[16];
if (start_config == DETAIL_ALL) { if (start_config == DETAIL_ALL) {
@ -873,12 +874,15 @@ std::string WebServer::climate_json(climate::Climate *obj, JsonDetail start_conf
} }
} }
bool has_state = false;
root["mode"] = PSTR_LOCAL(climate_mode_to_string(obj->mode)); root["mode"] = PSTR_LOCAL(climate_mode_to_string(obj->mode));
root["max_temp"] = traits.get_visual_max_temperature(); root["max_temp"] = value_accuracy_to_string(traits.get_visual_max_temperature(), accuracy);
root["min_temp"] = traits.get_visual_min_temperature(); root["min_temp"] = value_accuracy_to_string(traits.get_visual_min_temperature(), accuracy);
root["step"] = traits.get_visual_temperature_step(); root["step"] = traits.get_visual_temperature_step();
if (traits.get_supports_action()) { if (traits.get_supports_action()) {
root["action"] = PSTR_LOCAL(climate_action_to_string(obj->action)); root["action"] = PSTR_LOCAL(climate_action_to_string(obj->action));
root["state"] = root["action"];
has_state = true;
} }
if (traits.get_supports_fan_modes() && obj->fan_mode.has_value()) { if (traits.get_supports_fan_modes() && obj->fan_mode.has_value()) {
root["fan_mode"] = PSTR_LOCAL(climate_fan_mode_to_string(obj->fan_mode.value())); root["fan_mode"] = PSTR_LOCAL(climate_fan_mode_to_string(obj->fan_mode.value()));
@ -896,14 +900,23 @@ std::string WebServer::climate_json(climate::Climate *obj, JsonDetail start_conf
root["swing_mode"] = PSTR_LOCAL(climate_swing_mode_to_string(obj->swing_mode)); root["swing_mode"] = PSTR_LOCAL(climate_swing_mode_to_string(obj->swing_mode));
} }
if (traits.get_supports_current_temperature()) { if (traits.get_supports_current_temperature()) {
root["current_temperature"] = obj->current_temperature; if (!std::isnan(obj->current_temperature)) {
root["current_temperature"] = value_accuracy_to_string(obj->current_temperature, accuracy);
} else {
root["current_temperature"] = "NA";
}
} }
if (traits.get_supports_two_point_target_temperature()) { if (traits.get_supports_two_point_target_temperature()) {
root["current_temperature_low"] = obj->target_temperature_low; root["target_temperature_low"] = value_accuracy_to_string(obj->target_temperature_low, accuracy);
root["current_temperature_high"] = obj->target_temperature_low; root["target_temperature_high"] = value_accuracy_to_string(obj->target_temperature_high, accuracy);
if (!has_state) {
root["state"] =
value_accuracy_to_string((obj->target_temperature_high + obj->target_temperature_low) / 2.0f, accuracy);
}
} else { } else {
root["target_temperature"] = obj->target_temperature; root["target_temperature"] = value_accuracy_to_string(obj->target_temperature, accuracy);
root["state"] = obj->target_temperature; if (!has_state)
root["state"] = root["target_temperature"];
} }
}); });
} }