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

simplify

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-30 20:25:26 -05:00
parent a073ec4e11
commit 6dd29f1917
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -595,7 +595,7 @@ void ClimateDeviceRestoreState::apply(Climate *climate) {
// Template helper for setting primary modes with mutual exclusion // Template helper for setting primary modes with mutual exclusion
// Clears custom pointer and sets primary optional value // Clears custom pointer and sets primary optional value
template<typename T> bool set_primary_mode_(optional<T> &primary, const char *&custom_ptr, T value) { template<typename T> bool set_primary_mode(optional<T> &primary, const char *&custom_ptr, T value) {
// Clear the custom mode (mutual exclusion) // Clear the custom mode (mutual exclusion)
bool changed = custom_ptr != nullptr; bool changed = custom_ptr != nullptr;
custom_ptr = nullptr; custom_ptr = nullptr;
@@ -610,7 +610,7 @@ template<typename T> bool set_primary_mode_(optional<T> &primary, const char *&c
// Template helper for setting custom modes with mutual exclusion // Template helper for setting custom modes with mutual exclusion
// Takes pre-computed values: the found pointer from traits and whether custom mode is currently set // Takes pre-computed values: the found pointer from traits and whether custom mode is currently set
template<typename T> template<typename T>
bool set_custom_mode_(const char *&custom_ptr, optional<T> &primary, const char *found_ptr, bool has_custom) { bool set_custom_mode(const char *&custom_ptr, optional<T> &primary, const char *found_ptr, bool has_custom) {
if (found_ptr != nullptr) { if (found_ptr != nullptr) {
// Clear the primary mode (mutual exclusion) // Clear the primary mode (mutual exclusion)
bool changed = primary.has_value(); bool changed = primary.has_value();
@@ -631,12 +631,12 @@ bool set_custom_mode_(const char *&custom_ptr, optional<T> &primary, const char
} }
bool Climate::set_fan_mode_(ClimateFanMode mode) { bool Climate::set_fan_mode_(ClimateFanMode mode) {
return set_primary_mode_(this->fan_mode, this->custom_fan_mode_, mode); return set_primary_mode(this->fan_mode, this->custom_fan_mode_, mode);
} }
bool Climate::set_custom_fan_mode_(const char *mode) { bool Climate::set_custom_fan_mode_(const char *mode) {
auto traits = this->get_traits(); auto traits = this->get_traits();
return set_custom_mode_<ClimateFanMode>(this->custom_fan_mode_, this->fan_mode, traits.find_custom_fan_mode_(mode), return set_custom_mode<ClimateFanMode>(this->custom_fan_mode_, this->fan_mode, traits.find_custom_fan_mode_(mode),
this->has_custom_fan_mode()); this->has_custom_fan_mode());
} }
@@ -644,13 +644,11 @@ bool Climate::set_custom_fan_mode_(const std::string &mode) { return this->set_c
void Climate::clear_custom_fan_mode_() { this->custom_fan_mode_ = nullptr; } void Climate::clear_custom_fan_mode_() { this->custom_fan_mode_ = nullptr; }
bool Climate::set_preset_(ClimatePreset preset) { bool Climate::set_preset_(ClimatePreset preset) { return set_primary_mode(this->preset, this->custom_preset_, preset); }
return set_primary_mode_(this->preset, this->custom_preset_, preset);
}
bool Climate::set_custom_preset_(const char *preset) { bool Climate::set_custom_preset_(const char *preset) {
auto traits = this->get_traits(); auto traits = this->get_traits();
return set_custom_mode_<ClimatePreset>(this->custom_preset_, this->preset, traits.find_custom_preset_(preset), return set_custom_mode<ClimatePreset>(this->custom_preset_, this->preset, traits.find_custom_preset_(preset),
this->has_custom_preset()); this->has_custom_preset());
} }