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

simplify

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-30 19:55:46 -05:00
parent 34d2056413
commit 5013b7be87
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
esphome/components/climate/climate.h
View File

@@ -217,10 +217,10 @@ class Climate : public EntityBase {
void set_visual_max_humidity_override(float visual_max_humidity_override); void set_visual_max_humidity_override(float visual_max_humidity_override);
/// Check if a custom fan mode is currently active. /// Check if a custom fan mode is currently active.
bool has_custom_fan_mode() const { return this->custom_fan_mode != nullptr; } bool has_custom_fan_mode() const { return this->custom_fan_mode_ != nullptr; }
/// Check if a custom preset is currently active. /// Check if a custom preset is currently active.
bool has_custom_preset() const { return this->custom_preset != nullptr; } bool has_custom_preset() const { return this->custom_preset_ != nullptr; }
/// The current temperature of the climate device, as reported from the integration. /// The current temperature of the climate device, as reported from the integration.
float current_temperature{NAN}; float current_temperature{NAN};
@@ -248,12 +248,6 @@ class Climate : public EntityBase {
/// The active preset of the climate device. /// The active preset of the climate device.
optional<ClimatePreset> preset; optional<ClimatePreset> preset;
/// The active custom fan mode of the climate device.
const char *custom_fan_mode{nullptr};
/// The active custom preset mode of the climate device.
const char *custom_preset{nullptr};
/// The active mode of the climate device. /// The active mode of the climate device.
ClimateMode mode{CLIMATE_MODE_OFF}; ClimateMode mode{CLIMATE_MODE_OFF};
@@ -263,6 +257,12 @@ class Climate : public EntityBase {
/// The active swing mode of the climate device. /// The active swing mode of the climate device.
ClimateSwingMode swing_mode{CLIMATE_SWING_OFF}; ClimateSwingMode swing_mode{CLIMATE_SWING_OFF};
/// Get the active custom fan mode (read-only access).
const char *get_custom_fan_mode() const { return this->custom_fan_mode_; }
/// Get the active custom preset (read-only access).
const char *get_custom_preset() const { return this->custom_preset_; }
protected: protected:
friend ClimateCall; friend ClimateCall;
@@ -323,6 +323,12 @@ class Climate : public EntityBase {
optional<float> visual_current_temperature_step_override_{}; optional<float> visual_current_temperature_step_override_{};
optional<float> visual_min_humidity_override_{}; optional<float> visual_min_humidity_override_{};
optional<float> visual_max_humidity_override_{}; optional<float> visual_max_humidity_override_{};
/// The active custom fan mode of the climate device (protected - use get_custom_fan_mode() or setters).
const char *custom_fan_mode_{nullptr};
/// The active custom preset mode of the climate device (protected - use get_custom_preset() or setters).
const char *custom_preset_{nullptr};
}; };
} // namespace climate } // namespace climate

2
esphome/components/thermostat/thermostat_climate.cpp
View File

@@ -1198,8 +1198,6 @@ void ThermostatClimate::change_custom_preset_(const std::string &custom_preset)
ESP_LOGI(TAG, "Custom preset %s applied", custom_preset.c_str()); ESP_LOGI(TAG, "Custom preset %s applied", custom_preset.c_str());
} else { } else {
ESP_LOGI(TAG, "No changes required to apply custom preset %s", custom_preset.c_str()); ESP_LOGI(TAG, "No changes required to apply custom preset %s", custom_preset.c_str());
// Still need to ensure preset is reset and custom_preset is set
this->set_custom_preset_(custom_preset);
} }
} else { } else {
ESP_LOGW(TAG, "Custom preset %s not configured; ignoring", custom_preset.c_str()); ESP_LOGW(TAG, "Custom preset %s not configured; ignoring", custom_preset.c_str());