sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-11-18 15:55:46 +00:00
Code Issues Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-30 18:44:28 -05:00
parent 210320b8cc
commit c3c1ae8e7f
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -619,18 +619,40 @@ template<typename T1, typename T2> bool set_alternative(optional<T1> &dst, optio
return is_changed; return is_changed;
} }
// Overload for optional + const char* pointer
template<typename T> bool set_alternative(optional<T> &dst, const char *&alt, const T &src) {
bool is_changed = (alt != nullptr);
alt = nullptr;
if (is_changed || dst != src) {
dst = src;
is_changed = true;
}
return is_changed;
}
// Overload for const char* pointer + optional
template<typename T> bool set_alternative(const char *&dst, optional<T> &alt, const char *src) {
bool is_changed = alt.has_value();
alt.reset();
if (is_changed || dst != src) {
dst = src;
is_changed = true;
}
return is_changed;
}
bool Climate::set_fan_mode_(ClimateFanMode mode) { bool Climate::set_fan_mode_(ClimateFanMode mode) {
return set_alternative(this->fan_mode, this->custom_fan_mode, mode); return set_alternative(this->fan_mode, this->custom_fan_mode, mode);
} }
bool Climate::set_custom_fan_mode_(const std::string &mode) { bool Climate::set_custom_fan_mode_(const std::string &mode) {
return set_alternative(this->custom_fan_mode, this->fan_mode, mode); return set_alternative(this->custom_fan_mode, this->fan_mode, mode.c_str());
} }
bool Climate::set_preset_(ClimatePreset preset) { return set_alternative(this->preset, this->custom_preset, preset); } bool Climate::set_preset_(ClimatePreset preset) { return set_alternative(this->preset, this->custom_preset, preset); }
bool Climate::set_custom_preset_(const std::string &preset) { bool Climate::set_custom_preset_(const std::string &preset) {
return set_alternative(this->custom_preset, this->preset, preset); return set_alternative(this->custom_preset, this->preset, preset.c_str());
} }
void Climate::dump_traits_(const char *tag) { void Climate::dump_traits_(const char *tag) {