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

[climate] Remove redundant initializer_list overloads from haier and midea

Browse Source 
EnumBitmask and std::vector already handle initializer_list via
implicit conversion, so explicit overloads are unnecessary.
This commit is contained in:
J. Nick Koston
2025-10-21 22:37:48 -10:00
parent 0ad42ec79b
commit 0d256e12a6
2 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
esphome/components/haier/haier_base.cpp
View File

@@ -177,10 +177,6 @@ void HaierClimateBase::set_supported_swing_modes(climate::ClimateSwingModeMask m
this->traits_.add_supported_swing_mode(climate::CLIMATE_SWING_OFF); this->traits_.add_supported_swing_mode(climate::CLIMATE_SWING_OFF);
} }
void HaierClimateBase::set_supported_swing_modes(std::initializer_list<climate::ClimateSwingMode> modes) {
this->set_supported_swing_modes(climate::ClimateSwingModeMask(modes));
}
void HaierClimateBase::set_answer_timeout(uint32_t timeout) { this->haier_protocol_.set_answer_timeout(timeout); } void HaierClimateBase::set_answer_timeout(uint32_t timeout) { this->haier_protocol_.set_answer_timeout(timeout); }
void HaierClimateBase::set_supported_modes(climate::ClimateModeMask modes) { void HaierClimateBase::set_supported_modes(climate::ClimateModeMask modes) {
@@ -189,20 +185,12 @@ void HaierClimateBase::set_supported_modes(climate::ClimateModeMask modes) {
this->traits_.add_supported_mode(climate::CLIMATE_MODE_HEAT_COOL); // Always available this->traits_.add_supported_mode(climate::CLIMATE_MODE_HEAT_COOL); // Always available
} }
void HaierClimateBase::set_supported_modes(std::initializer_list<climate::ClimateMode> modes) {
this->set_supported_modes(climate::ClimateModeMask(modes));
}
void HaierClimateBase::set_supported_presets(climate::ClimatePresetMask presets) { void HaierClimateBase::set_supported_presets(climate::ClimatePresetMask presets) {
this->traits_.set_supported_presets(presets); this->traits_.set_supported_presets(presets);
if (!presets.empty()) if (!presets.empty())
this->traits_.add_supported_preset(climate::CLIMATE_PRESET_NONE); this->traits_.add_supported_preset(climate::CLIMATE_PRESET_NONE);
} }
void HaierClimateBase::set_supported_presets(std::initializer_list<climate::ClimatePreset> presets) {
this->set_supported_presets(climate::ClimatePresetMask(presets));
}
void HaierClimateBase::set_send_wifi(bool send_wifi) { this->send_wifi_signal_ = send_wifi; } void HaierClimateBase::set_send_wifi(bool send_wifi) { this->send_wifi_signal_ = send_wifi; }
void HaierClimateBase::send_custom_command(const haier_protocol::HaierMessage &message) { void HaierClimateBase::send_custom_command(const haier_protocol::HaierMessage &message) {

11
esphome/components/midea/air_conditioner.h
View File

@@ -44,21 +44,10 @@ class AirConditioner : public ApplianceBase<dudanov::midea::ac::AirConditioner>,
void do_power_off() { this->base_.setPowerState(false); } void do_power_off() { this->base_.setPowerState(false); }
void do_power_toggle() { this->base_.setPowerState(this->mode == ClimateMode::CLIMATE_MODE_OFF); } void do_power_toggle() { this->base_.setPowerState(this->mode == ClimateMode::CLIMATE_MODE_OFF); }
void set_supported_modes(ClimateModeMask modes) { this->supported_modes_ = modes; } void set_supported_modes(ClimateModeMask modes) { this->supported_modes_ = modes; }
void set_supported_modes(std::initializer_list<ClimateMode> modes) {
this->supported_modes_ = ClimateModeMask(modes);
}
void set_supported_swing_modes(ClimateSwingModeMask modes) { this->supported_swing_modes_ = modes; } void set_supported_swing_modes(ClimateSwingModeMask modes) { this->supported_swing_modes_ = modes; }
void set_supported_swing_modes(std::initializer_list<ClimateSwingMode> modes) {
this->supported_swing_modes_ = ClimateSwingModeMask(modes);
}
void set_supported_presets(ClimatePresetMask presets) { this->supported_presets_ = presets; } void set_supported_presets(ClimatePresetMask presets) { this->supported_presets_ = presets; }
void set_supported_presets(std::initializer_list<ClimatePreset> presets) {
this->supported_presets_ = ClimatePresetMask(presets);
}
void set_custom_presets(const std::vector<std::string> &presets) { this->supported_custom_presets_ = presets; } void set_custom_presets(const std::vector<std::string> &presets) { this->supported_custom_presets_ = presets; }
void set_custom_presets(std::initializer_list<std::string> presets) { this->supported_custom_presets_ = presets; }
void set_custom_fan_modes(const std::vector<std::string> &modes) { this->supported_custom_fan_modes_ = modes; } void set_custom_fan_modes(const std::vector<std::string> &modes) { this->supported_custom_fan_modes_ = modes; }
void set_custom_fan_modes(std::initializer_list<std::string> modes) { this->supported_custom_fan_modes_ = modes; }
protected: protected:
void control(const ClimateCall &call) override; void control(const ClimateCall &call) override;