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

Merge branch 'fan_no_double_storage' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-11-02 20:21:57 -06:00
parent 171ff48bab 42c3e7b542
commit d0d00c2a79
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
esphome/components/fan/automation.h
View File

@@ -215,8 +215,9 @@ class FanPresetSetTrigger : public Trigger<std::string> {
const auto *preset_mode = state->get_preset_mode(); const auto *preset_mode = state->get_preset_mode();
auto should_trigger = preset_mode != this->last_preset_mode_; auto should_trigger = preset_mode != this->last_preset_mode_;
this->last_preset_mode_ = preset_mode; this->last_preset_mode_ = preset_mode;
if (should_trigger && preset_mode != nullptr) { if (should_trigger) {
this->trigger(preset_mode); // Trigger with empty string when nullptr to maintain backward compatibility
this->trigger(preset_mode != nullptr ? preset_mode : "");
} }
}); });
this->last_preset_mode_ = state->get_preset_mode(); this->last_preset_mode_ = state->get_preset_mode();

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

@@ -177,7 +177,7 @@ void Fan::publish_state() {
ESP_LOGD(TAG, " Direction: %s", LOG_STR_ARG(fan_direction_to_string(this->direction))); ESP_LOGD(TAG, " Direction: %s", LOG_STR_ARG(fan_direction_to_string(this->direction)));
} }
const char *preset = this->get_preset_mode(); const char *preset = this->get_preset_mode();
if (traits.supports_preset_modes() && preset != nullptr) { if (preset != nullptr) {
ESP_LOGD(TAG, " Preset Mode: %s", preset); ESP_LOGD(TAG, " Preset Mode: %s", preset);
} }
this->state_callback_.call(); this->state_callback_.call();

2
esphome/components/fan/fan.h
View File

@@ -156,6 +156,8 @@ class Fan : public EntityBase {
CallbackManager<void()> state_callback_{}; CallbackManager<void()> state_callback_{};
ESPPreferenceObject rtc_; ESPPreferenceObject rtc_;
FanRestoreMode restore_mode_; FanRestoreMode restore_mode_;
private:
const char *preset_mode_{nullptr}; const char *preset_mode_{nullptr};
}; };