mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-28 18:04:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'water-heater-web-server-traits' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-02-18 17:06:53 -06:00
parent 1dc6801a19 3a53c5a689
commit 47ccb52184
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1945,6 +1945,9 @@ json::SerializationBuffer<> WebServer::water_heater_json_(water_heater::WaterHea
JsonArray modes = root[ESPHOME_F("modes")].to<JsonArray>();
for (auto m : traits.get_supported_modes())
modes.add(PSTR_LOCAL(water_heater::water_heater_mode_to_string(m)));
root[ESPHOME_F("min_temp")] = traits.get_min_temperature();
root[ESPHOME_F("max_temp")] = traits.get_max_temperature();
root[ESPHOME_F("step")] = traits.get_target_temperature_step();
this->add_sorting_info_(root, obj);
}
@@ -1967,10 +1970,6 @@ json::SerializationBuffer<> WebServer::water_heater_json_(water_heater::WaterHea
root[ESPHOME_F("target_temperature")] = target;
}
root[ESPHOME_F("min_temperature")] = traits.get_min_temperature();
root[ESPHOME_F("max_temperature")] = traits.get_max_temperature();
root[ESPHOME_F("step")] = traits.get_target_temperature_step();
if (traits.get_supports_away_mode()) {
root[ESPHOME_F("away")] = obj->is_away();
}