sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-26 12:43:48 +00:00
Code Issues Releases Wiki Activity

[climate] Fix restore state for fan mode, preset, and swing mode (#11126)

Browse Source 
Co-authored-by: J. Nick Koston <nick@koston.org>
Co-authored-by: J. Nick Koston <nick@home-assistant.io>
This commit is contained in:
Jeff Brown
2025-10-22 01:08:40 -07:00
committed by GitHub
parent e1c851cab8
commit e2b3617df3
2 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
esphome/components/climate/climate.cpp
View File

@@ -524,13 +524,23 @@ ClimateCall ClimateDeviceRestoreState::to_call(Climate *climate) {
if (traits.has_feature_flags(climate::CLIMATE_SUPPORTS_TARGET_HUMIDITY)) { if (traits.has_feature_flags(climate::CLIMATE_SUPPORTS_TARGET_HUMIDITY)) {
call.set_target_humidity(this->target_humidity); call.set_target_humidity(this->target_humidity);
} }
if (traits.get_supports_fan_modes() || !traits.get_supported_custom_fan_modes().empty()) { if (this->uses_custom_fan_mode) {
if (this->custom_fan_mode < traits.get_supported_custom_fan_modes().size()) {
call.fan_mode_.reset();
call.custom_fan_mode_ = *std::next(traits.get_supported_custom_fan_modes().cbegin(), this->custom_fan_mode);
}
} else if (traits.supports_fan_mode(this->fan_mode)) {
call.set_fan_mode(this->fan_mode); call.set_fan_mode(this->fan_mode);
} }
if (traits.get_supports_presets() || !traits.get_supported_custom_presets().empty()) { if (this->uses_custom_preset) {
if (this->custom_preset < traits.get_supported_custom_presets().size()) {
call.preset_.reset();
call.custom_preset_ = *std::next(traits.get_supported_custom_presets().cbegin(), this->custom_preset);
}
} else if (traits.supports_preset(this->preset)) {
call.set_preset(this->preset); call.set_preset(this->preset);
} }
if (traits.get_supports_swing_modes()) { if (traits.supports_swing_mode(this->swing_mode)) {
call.set_swing_mode(this->swing_mode); call.set_swing_mode(this->swing_mode);
} }
return call; return call;
@@ -549,41 +559,25 @@ void ClimateDeviceRestoreState::apply(Climate *climate) {
if (traits.has_feature_flags(climate::CLIMATE_SUPPORTS_TARGET_HUMIDITY)) { if (traits.has_feature_flags(climate::CLIMATE_SUPPORTS_TARGET_HUMIDITY)) {
climate->target_humidity = this->target_humidity; climate->target_humidity = this->target_humidity;
} }
if (traits.get_supports_fan_modes() && !this->uses_custom_fan_mode) { if (this->uses_custom_fan_mode) {
if (this->custom_fan_mode < traits.get_supported_custom_fan_modes().size()) {
climate->fan_mode.reset();
climate->custom_fan_mode = *std::next(traits.get_supported_custom_fan_modes().cbegin(), this->custom_fan_mode);
}
} else if (traits.supports_fan_mode(this->fan_mode)) {
climate->fan_mode = this->fan_mode; climate->fan_mode = this->fan_mode;
climate->custom_fan_mode.reset();
} }
if (!traits.get_supported_custom_fan_modes().empty() && this->uses_custom_fan_mode) { if (this->uses_custom_preset) {
// std::set has consistent order (lexicographic for strings) if (this->custom_preset < traits.get_supported_custom_presets().size()) {
const auto &modes = traits.get_supported_custom_fan_modes(); climate->preset.reset();
if (custom_fan_mode < modes.size()) { climate->custom_preset = *std::next(traits.get_supported_custom_presets().cbegin(), this->custom_preset);
size_t i = 0;
for (const auto &mode : modes) {
if (i == this->custom_fan_mode) {
climate->custom_fan_mode = mode;
break;
}
i++;
}
} }
} } else if (traits.supports_preset(this->preset)) {
if (traits.get_supports_presets() && !this->uses_custom_preset) {
climate->preset = this->preset; climate->preset = this->preset;
climate->custom_preset.reset();
} }
if (!traits.get_supported_custom_presets().empty() && uses_custom_preset) { if (traits.supports_swing_mode(this->swing_mode)) {
// std::set has consistent order (lexicographic for strings)
const auto &presets = traits.get_supported_custom_presets();
if (custom_preset < presets.size()) {
size_t i = 0;
for (const auto &preset : presets) {
if (i == this->custom_preset) {
climate->custom_preset = preset;
break;
}
i++;
}
}
}
if (traits.get_supports_swing_modes()) {
climate->swing_mode = this->swing_mode; climate->swing_mode = this->swing_mode;
} }
climate->publish_state(); climate->publish_state();

1
esphome/components/climate/climate.h
View File

@@ -33,6 +33,7 @@ class Climate;
class ClimateCall { class ClimateCall {
public: public:
explicit ClimateCall(Climate *parent) : parent_(parent) {} explicit ClimateCall(Climate *parent) : parent_(parent) {}
friend struct ClimateDeviceRestoreState;
/// Set the mode of the climate device. /// Set the mode of the climate device.
ClimateCall &set_mode(ClimateMode mode); ClimateCall &set_mode(ClimateMode mode);