mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-19 16:05:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

preen

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-31 11:18:14 -05:00
parent 91ae8c82b0
commit 76952026b7
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
esphome/components/copy/fan/copy_fan.cpp
View File

@@ -12,11 +12,7 @@ void CopyFan::setup() {
this->oscillating = source_->oscillating;
this->speed = source_->speed;
this->direction = source_->direction;
const char *preset = source_->get_preset_mode();
if (preset != nullptr)
this->set_preset_mode_(preset);
else
this->clear_preset_mode_();
this->set_preset_mode_(source_->get_preset_mode());
this->publish_state();
});
@@ -24,11 +20,7 @@ void CopyFan::setup() {
this->oscillating = source_->oscillating;
this->speed = source_->speed;
this->direction = source_->direction;
const char *preset = source_->get_preset_mode();
if (preset != nullptr)
this->set_preset_mode_(preset);
else
this->clear_preset_mode_();
this->set_preset_mode_(source_->get_preset_mode());
this->publish_state();
}

8
esphome/components/fan/fan.cpp
View File

@@ -138,6 +138,14 @@ FanCall Fan::make_call() { return FanCall(*this); }
const char *Fan::find_preset_mode_(const char *preset_mode) { return this->get_traits().find_preset_mode(preset_mode); }
bool Fan::set_preset_mode_(const char *preset_mode) {
if (preset_mode == nullptr) {
// Treat nullptr as clearing the preset mode
if (this->preset_mode_ == nullptr) {
return false; // No change
}
this->clear_preset_mode_();
return true;
}
const char *validated = this->find_preset_mode_(preset_mode);
if (validated == nullptr || this->preset_mode_ == validated) {
return false; // Preset mode not supported or no change