sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 23:21:54 +00:00
Code Issues Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-30 19:08:40 -05:00
parent 8c90ea860c
commit 1864cf6ad8
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,14 +192,12 @@ ClimateCall &ClimateCall::set_fan_mode(const char *custom_fan_mode) {
// Check if it's a standard enum mode first // Check if it's a standard enum mode first
for (const auto &mode_entry : CLIMATE_FAN_MODES_BY_STR) { for (const auto &mode_entry : CLIMATE_FAN_MODES_BY_STR) {
if (str_equals_case_insensitive(custom_fan_mode, mode_entry.str)) { if (str_equals_case_insensitive(custom_fan_mode, mode_entry.str)) {
this->set_fan_mode(static_cast<ClimateFanMode>(mode_entry.value)); return this->set_fan_mode(static_cast<ClimateFanMode>(mode_entry.value));
return *this;
} }
} }
// Find the matching pointer from traits // Find the matching pointer from traits
auto traits = this->parent_->get_traits(); auto traits = this->parent_->get_traits();
const char *mode_ptr = traits.find_custom_fan_mode(custom_fan_mode); if (const char *mode_ptr = traits.find_custom_fan_mode(custom_fan_mode)) {
if (mode_ptr != nullptr) {
this->custom_fan_mode_ = mode_ptr; this->custom_fan_mode_ = mode_ptr;
this->fan_mode_.reset(); this->fan_mode_.reset();
return *this; return *this;
@@ -227,14 +225,12 @@ ClimateCall &ClimateCall::set_preset(const char *custom_preset) {
// Check if it's a standard enum preset first // Check if it's a standard enum preset first
for (const auto &preset_entry : CLIMATE_PRESETS_BY_STR) { for (const auto &preset_entry : CLIMATE_PRESETS_BY_STR) {
if (str_equals_case_insensitive(custom_preset, preset_entry.str)) { if (str_equals_case_insensitive(custom_preset, preset_entry.str)) {
this->set_preset(static_cast<ClimatePreset>(preset_entry.value)); return this->set_preset(static_cast<ClimatePreset>(preset_entry.value));
return *this;
} }
} }
// Find the matching pointer from traits // Find the matching pointer from traits
auto traits = this->parent_->get_traits(); auto traits = this->parent_->get_traits();
const char *preset_ptr = traits.find_custom_preset(custom_preset); if (const char *preset_ptr = traits.find_custom_preset(custom_preset)) {
if (preset_ptr != nullptr) {
this->custom_preset_ = preset_ptr; this->custom_preset_ = preset_ptr;
this->preset_.reset(); this->preset_.reset();
return *this; return *this;