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

wip

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-31 11:37:22 -05:00
parent 76952026b7
commit 9dcfbed8af
3 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
esphome/components/api/api_connection.cpp
View File

@@ -410,8 +410,8 @@ uint16_t APIConnection::try_send_fan_state(EntityBase *entity, APIConnection *co
} }
if (traits.supports_direction()) if (traits.supports_direction())
msg.direction = static_cast<enums::FanDirection>(fan->direction); msg.direction = static_cast<enums::FanDirection>(fan->direction);
if (traits.supports_preset_modes()) if (traits.supports_preset_modes() && fan->has_preset_mode())
msg.set_preset_mode(StringRef(fan->preset_mode)); msg.set_preset_mode(StringRef(fan->get_preset_mode()));
return fill_and_encode_entity_state(fan, msg, FanStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single); return fill_and_encode_entity_state(fan, msg, FanStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
} }
uint16_t APIConnection::try_send_fan_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, uint16_t APIConnection::try_send_fan_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,

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

@@ -151,24 +151,12 @@ bool Fan::set_preset_mode_(const char *preset_mode) {
return false; // Preset mode not supported or no change return false; // Preset mode not supported or no change
} }
this->preset_mode_ = validated; this->preset_mode_ = validated;
// Keep deprecated member in sync during deprecation period
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
this->preset_mode = validated;
#pragma GCC diagnostic pop
return true; return true;
} }
bool Fan::set_preset_mode_(const std::string &preset_mode) { return this->set_preset_mode_(preset_mode.c_str()); } bool Fan::set_preset_mode_(const std::string &preset_mode) { return this->set_preset_mode_(preset_mode.c_str()); }
void Fan::clear_preset_mode_() { void Fan::clear_preset_mode_() { this->preset_mode_ = nullptr; }
this->preset_mode_ = nullptr;
// Keep deprecated member in sync during deprecation period
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
this->preset_mode.clear();
#pragma GCC diagnostic pop
}
void Fan::add_on_state_callback(std::function<void()> &&callback) { this->state_callback_.add(std::move(callback)); } void Fan::add_on_state_callback(std::function<void()> &&callback) { this->state_callback_.add(std::move(callback)); }
void Fan::publish_state() { void Fan::publish_state() {

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

@@ -111,11 +111,6 @@ class Fan : public EntityBase {
int speed{0}; int speed{0};
/// The current direction of the fan /// The current direction of the fan
FanDirection direction{FanDirection::FORWARD}; FanDirection direction{FanDirection::FORWARD};
// The current preset mode of the fan
// Deprecated: Use get_preset_mode() for reading and set_preset_mode_() for writing. Will be removed in 2026.5.0
__attribute__((deprecated("Use get_preset_mode() for reading and set_preset_mode_() for writing instead of "
".preset_mode. Will be removed in 2026.5.0")));
std::string preset_mode{};
FanCall turn_on(); FanCall turn_on();
FanCall turn_off(); FanCall turn_off();
@@ -135,6 +130,9 @@ class Fan : public EntityBase {
/// Get the current preset mode (returns pointer to string stored in traits, or nullptr if not set) /// Get the current preset mode (returns pointer to string stored in traits, or nullptr if not set)
const char *get_preset_mode() const { return this->preset_mode_; } const char *get_preset_mode() const { return this->preset_mode_; }
/// Check if a preset mode is currently active
bool has_preset_mode() const { return this->preset_mode_ != nullptr; }
protected: protected:
friend FanCall; friend FanCall;
friend struct FanRestoreState; friend struct FanRestoreState;