From e869a3aec32bc6764328b024aff9f6488b1b9038 Mon Sep 17 00:00:00 2001 From: Thomas Rupprecht Date: Sun, 4 May 2025 05:41:52 +0200 Subject: [PATCH] [climate] Fix typo and use ``this->`` (#8678) --- esphome/components/climate/climate_mode.h | 2 +- esphome/components/climate/climate_traits.h | 120 ++++++++++---------- 2 files changed, 64 insertions(+), 58 deletions(-) diff --git a/esphome/components/climate/climate_mode.h b/esphome/components/climate/climate_mode.h index c5245812c7..80efb4c048 100644 --- a/esphome/components/climate/climate_mode.h +++ b/esphome/components/climate/climate_mode.h @@ -20,7 +20,7 @@ enum ClimateMode : uint8_t { CLIMATE_MODE_FAN_ONLY = 4, /// The climate device is set to dry/humidity mode CLIMATE_MODE_DRY = 5, - /** The climate device is adjusting the temperatre dynamically. + /** The climate device is adjusting the temperature dynamically. * For example, the target temperature can be adjusted based on a schedule, or learned behavior. * The target temperature can't be adjusted when in this mode. */ diff --git a/esphome/components/climate/climate_traits.h b/esphome/components/climate/climate_traits.h index 58d7b586d7..c3a0dfca8f 100644 --- a/esphome/components/climate/climate_traits.h +++ b/esphome/components/climate/climate_traits.h @@ -40,24 +40,24 @@ namespace climate { */ class ClimateTraits { public: - bool get_supports_current_temperature() const { return supports_current_temperature_; } + bool get_supports_current_temperature() const { return this->supports_current_temperature_; } void set_supports_current_temperature(bool supports_current_temperature) { - supports_current_temperature_ = supports_current_temperature; + this->supports_current_temperature_ = supports_current_temperature; } - bool get_supports_current_humidity() const { return supports_current_humidity_; } + bool get_supports_current_humidity() const { return this->supports_current_humidity_; } void set_supports_current_humidity(bool supports_current_humidity) { - supports_current_humidity_ = supports_current_humidity; + this->supports_current_humidity_ = supports_current_humidity; } - bool get_supports_two_point_target_temperature() const { return supports_two_point_target_temperature_; } + bool get_supports_two_point_target_temperature() const { return this->supports_two_point_target_temperature_; } void set_supports_two_point_target_temperature(bool supports_two_point_target_temperature) { - supports_two_point_target_temperature_ = supports_two_point_target_temperature; + this->supports_two_point_target_temperature_ = supports_two_point_target_temperature; } - bool get_supports_target_humidity() const { return supports_target_humidity_; } + bool get_supports_target_humidity() const { return this->supports_target_humidity_; } void set_supports_target_humidity(bool supports_target_humidity) { - supports_target_humidity_ = supports_target_humidity; + this->supports_target_humidity_ = supports_target_humidity; } - void set_supported_modes(std::set modes) { supported_modes_ = std::move(modes); } - void add_supported_mode(ClimateMode mode) { supported_modes_.insert(mode); } + void set_supported_modes(std::set modes) { this->supported_modes_ = std::move(modes); } + void add_supported_mode(ClimateMode mode) { this->supported_modes_.insert(mode); } ESPDEPRECATED("This method is deprecated, use set_supported_modes() instead", "v1.20") void set_supports_auto_mode(bool supports_auto_mode) { set_mode_support_(CLIMATE_MODE_AUTO, supports_auto_mode); } ESPDEPRECATED("This method is deprecated, use set_supported_modes() instead", "v1.20") @@ -72,15 +72,15 @@ class ClimateTraits { } ESPDEPRECATED("This method is deprecated, use set_supported_modes() instead", "v1.20") void set_supports_dry_mode(bool supports_dry_mode) { set_mode_support_(CLIMATE_MODE_DRY, supports_dry_mode); } - bool supports_mode(ClimateMode mode) const { return supported_modes_.count(mode); } - const std::set &get_supported_modes() const { return supported_modes_; } + bool supports_mode(ClimateMode mode) const { return this->supported_modes_.count(mode); } + const std::set &get_supported_modes() const { return this->supported_modes_; } - void set_supports_action(bool supports_action) { supports_action_ = supports_action; } - bool get_supports_action() const { return supports_action_; } + void set_supports_action(bool supports_action) { this->supports_action_ = supports_action; } + bool get_supports_action() const { return this->supports_action_; } - void set_supported_fan_modes(std::set modes) { supported_fan_modes_ = std::move(modes); } - void add_supported_fan_mode(ClimateFanMode mode) { supported_fan_modes_.insert(mode); } - void add_supported_custom_fan_mode(const std::string &mode) { supported_custom_fan_modes_.insert(mode); } + void set_supported_fan_modes(std::set modes) { this->supported_fan_modes_ = std::move(modes); } + void add_supported_fan_mode(ClimateFanMode mode) { this->supported_fan_modes_.insert(mode); } + void add_supported_custom_fan_mode(const std::string &mode) { this->supported_custom_fan_modes_.insert(mode); } ESPDEPRECATED("This method is deprecated, use set_supported_fan_modes() instead", "v1.20") void set_supports_fan_mode_on(bool supported) { set_fan_mode_support_(CLIMATE_FAN_ON, supported); } ESPDEPRECATED("This method is deprecated, use set_supported_fan_modes() instead", "v1.20") @@ -99,35 +99,37 @@ class ClimateTraits { void set_supports_fan_mode_focus(bool supported) { set_fan_mode_support_(CLIMATE_FAN_FOCUS, supported); } ESPDEPRECATED("This method is deprecated, use set_supported_fan_modes() instead", "v1.20") void set_supports_fan_mode_diffuse(bool supported) { set_fan_mode_support_(CLIMATE_FAN_DIFFUSE, supported); } - bool supports_fan_mode(ClimateFanMode fan_mode) const { return supported_fan_modes_.count(fan_mode); } - bool get_supports_fan_modes() const { return !supported_fan_modes_.empty() || !supported_custom_fan_modes_.empty(); } - const std::set &get_supported_fan_modes() const { return supported_fan_modes_; } + bool supports_fan_mode(ClimateFanMode fan_mode) const { return this->supported_fan_modes_.count(fan_mode); } + bool get_supports_fan_modes() const { + return !this->supported_fan_modes_.empty() || !this->supported_custom_fan_modes_.empty(); + } + const std::set &get_supported_fan_modes() const { return this->supported_fan_modes_; } void set_supported_custom_fan_modes(std::set supported_custom_fan_modes) { - supported_custom_fan_modes_ = std::move(supported_custom_fan_modes); + this->supported_custom_fan_modes_ = std::move(supported_custom_fan_modes); } - const std::set &get_supported_custom_fan_modes() const { return supported_custom_fan_modes_; } + const std::set &get_supported_custom_fan_modes() const { return this->supported_custom_fan_modes_; } bool supports_custom_fan_mode(const std::string &custom_fan_mode) const { - return supported_custom_fan_modes_.count(custom_fan_mode); + return this->supported_custom_fan_modes_.count(custom_fan_mode); } - void set_supported_presets(std::set presets) { supported_presets_ = std::move(presets); } - void add_supported_preset(ClimatePreset preset) { supported_presets_.insert(preset); } - void add_supported_custom_preset(const std::string &preset) { supported_custom_presets_.insert(preset); } - bool supports_preset(ClimatePreset preset) const { return supported_presets_.count(preset); } - bool get_supports_presets() const { return !supported_presets_.empty(); } - const std::set &get_supported_presets() const { return supported_presets_; } + void set_supported_presets(std::set presets) { this->supported_presets_ = std::move(presets); } + void add_supported_preset(ClimatePreset preset) { this->supported_presets_.insert(preset); } + void add_supported_custom_preset(const std::string &preset) { this->supported_custom_presets_.insert(preset); } + bool supports_preset(ClimatePreset preset) const { return this->supported_presets_.count(preset); } + bool get_supports_presets() const { return !this->supported_presets_.empty(); } + const std::set &get_supported_presets() const { return this->supported_presets_; } void set_supported_custom_presets(std::set supported_custom_presets) { - supported_custom_presets_ = std::move(supported_custom_presets); + this->supported_custom_presets_ = std::move(supported_custom_presets); } - const std::set &get_supported_custom_presets() const { return supported_custom_presets_; } + const std::set &get_supported_custom_presets() const { return this->supported_custom_presets_; } bool supports_custom_preset(const std::string &custom_preset) const { - return supported_custom_presets_.count(custom_preset); + return this->supported_custom_presets_.count(custom_preset); } - void set_supported_swing_modes(std::set modes) { supported_swing_modes_ = std::move(modes); } - void add_supported_swing_mode(ClimateSwingMode mode) { supported_swing_modes_.insert(mode); } + void set_supported_swing_modes(std::set modes) { this->supported_swing_modes_ = std::move(modes); } + void add_supported_swing_mode(ClimateSwingMode mode) { this->supported_swing_modes_.insert(mode); } ESPDEPRECATED("This method is deprecated, use set_supported_swing_modes() instead", "v1.20") void set_supports_swing_mode_off(bool supported) { set_swing_mode_support_(CLIMATE_SWING_OFF, supported); } ESPDEPRECATED("This method is deprecated, use set_supported_swing_modes() instead", "v1.20") @@ -138,54 +140,58 @@ class ClimateTraits { void set_supports_swing_mode_horizontal(bool supported) { set_swing_mode_support_(CLIMATE_SWING_HORIZONTAL, supported); } - bool supports_swing_mode(ClimateSwingMode swing_mode) const { return supported_swing_modes_.count(swing_mode); } - bool get_supports_swing_modes() const { return !supported_swing_modes_.empty(); } - const std::set &get_supported_swing_modes() const { return supported_swing_modes_; } + bool supports_swing_mode(ClimateSwingMode swing_mode) const { return this->supported_swing_modes_.count(swing_mode); } + bool get_supports_swing_modes() const { return !this->supported_swing_modes_.empty(); } + const std::set &get_supported_swing_modes() const { return this->supported_swing_modes_; } - float get_visual_min_temperature() const { return visual_min_temperature_; } - void set_visual_min_temperature(float visual_min_temperature) { visual_min_temperature_ = visual_min_temperature; } - float get_visual_max_temperature() const { return visual_max_temperature_; } - void set_visual_max_temperature(float visual_max_temperature) { visual_max_temperature_ = visual_max_temperature; } - float get_visual_target_temperature_step() const { return visual_target_temperature_step_; } - float get_visual_current_temperature_step() const { return visual_current_temperature_step_; } + float get_visual_min_temperature() const { return this->visual_min_temperature_; } + void set_visual_min_temperature(float visual_min_temperature) { + this->visual_min_temperature_ = visual_min_temperature; + } + float get_visual_max_temperature() const { return this->visual_max_temperature_; } + void set_visual_max_temperature(float visual_max_temperature) { + this->visual_max_temperature_ = visual_max_temperature; + } + float get_visual_target_temperature_step() const { return this->visual_target_temperature_step_; } + float get_visual_current_temperature_step() const { return this->visual_current_temperature_step_; } void set_visual_target_temperature_step(float temperature_step) { - visual_target_temperature_step_ = temperature_step; + this->visual_target_temperature_step_ = temperature_step; } void set_visual_current_temperature_step(float temperature_step) { - visual_current_temperature_step_ = temperature_step; + this->visual_current_temperature_step_ = temperature_step; } void set_visual_temperature_step(float temperature_step) { - visual_target_temperature_step_ = temperature_step; - visual_current_temperature_step_ = temperature_step; + this->visual_target_temperature_step_ = temperature_step; + this->visual_current_temperature_step_ = temperature_step; } int8_t get_target_temperature_accuracy_decimals() const; int8_t get_current_temperature_accuracy_decimals() const; - float get_visual_min_humidity() const { return visual_min_humidity_; } - void set_visual_min_humidity(float visual_min_humidity) { visual_min_humidity_ = visual_min_humidity; } - float get_visual_max_humidity() const { return visual_max_humidity_; } - void set_visual_max_humidity(float visual_max_humidity) { visual_max_humidity_ = visual_max_humidity; } + float get_visual_min_humidity() const { return this->visual_min_humidity_; } + void set_visual_min_humidity(float visual_min_humidity) { this->visual_min_humidity_ = visual_min_humidity; } + float get_visual_max_humidity() const { return this->visual_max_humidity_; } + void set_visual_max_humidity(float visual_max_humidity) { this->visual_max_humidity_ = visual_max_humidity; } protected: void set_mode_support_(climate::ClimateMode mode, bool supported) { if (supported) { - supported_modes_.insert(mode); + this->supported_modes_.insert(mode); } else { - supported_modes_.erase(mode); + this->supported_modes_.erase(mode); } } void set_fan_mode_support_(climate::ClimateFanMode mode, bool supported) { if (supported) { - supported_fan_modes_.insert(mode); + this->supported_fan_modes_.insert(mode); } else { - supported_fan_modes_.erase(mode); + this->supported_fan_modes_.erase(mode); } } void set_swing_mode_support_(climate::ClimateSwingMode mode, bool supported) { if (supported) { - supported_swing_modes_.insert(mode); + this->supported_swing_modes_.insert(mode); } else { - supported_swing_modes_.erase(mode); + this->supported_swing_modes_.erase(mode); } }