Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-02-16 01:41:42 +01:00
Code Issues Projects Releases Wiki Activity

Improve code readability

Browse Source
This commit is contained in:
Georgi Filipov 2025-01-25 02:05:59 +02:00
parent 509b03af6d
commit 59c67f2172
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
esphome/components/samsung/samsung.cpp
View File

@ -7,18 +7,18 @@ namespace samsung {
static const char *const TAG = "samsung.climate"; static const char *const TAG = "samsung.climate";
void SamsungClimate::transmit_state() { void SamsungClimate::transmit_state() {
if (current_climate_mode_ != climate::ClimateMode::CLIMATE_MODE_OFF && if (this->current_climate_mode_ != climate::ClimateMode::CLIMATE_MODE_OFF &&
this->mode == climate::ClimateMode::CLIMATE_MODE_OFF) { this->mode == climate::ClimateMode::CLIMATE_MODE_OFF) {
this->send_power_state_(false); this->send_power_state_(false);
return; return;
} }
if (current_climate_mode_ == climate::ClimateMode::CLIMATE_MODE_OFF && if (this->current_climate_mode_ == climate::ClimateMode::CLIMATE_MODE_OFF &&
this->mode != climate::ClimateMode::CLIMATE_MODE_OFF) { this->mode != climate::ClimateMode::CLIMATE_MODE_OFF) {
this->send_power_state_(true); this->send_power_state_(true);
} }
current_climate_mode_ = this->mode; this->current_climate_mode_ = this->mode;
this->set_climate_mode_(this->mode); this->set_climate_mode_(this->mode);
this->set_temp_(this->target_temperature); this->set_temp_(this->target_temperature);
@ -277,15 +277,15 @@ uint8_t SamsungClimate::calc_section_checksum(const uint8_t *section) {
} }
void SamsungClimate::checksum_() { void SamsungClimate::checksum_() {
uint8_t sectionsum = calc_section_checksum(protocol_.raw); uint8_t sectionsum = calc_section_checksum(this->protocol_.raw);
protocol_.sum_1_upper = GETBITS8(sectionsum, K_HIGH_NIBBLE, K_NIBBLE_SIZE); this->protocol_.sum_1_upper = GETBITS8(sectionsum, K_HIGH_NIBBLE, K_NIBBLE_SIZE);
protocol_.sum_1_lower = GETBITS8(sectionsum, K_LOW_NIBBLE, K_NIBBLE_SIZE); this->protocol_.sum_1_lower = GETBITS8(sectionsum, K_LOW_NIBBLE, K_NIBBLE_SIZE);
sectionsum = calc_section_checksum(protocol_.raw + K_SAMSUNG_AC_SECTION_LENGTH); sectionsum = calc_section_checksum(this->protocol_.raw + K_SAMSUNG_AC_SECTION_LENGTH);
protocol_.sum_2_upper = GETBITS8(sectionsum, K_HIGH_NIBBLE, K_NIBBLE_SIZE); this->protocol_.sum_2_upper = GETBITS8(sectionsum, K_HIGH_NIBBLE, K_NIBBLE_SIZE);
protocol_.sum_2_lower = GETBITS8(sectionsum, K_LOW_NIBBLE, K_NIBBLE_SIZE); this->protocol_.sum_2_lower = GETBITS8(sectionsum, K_LOW_NIBBLE, K_NIBBLE_SIZE);
sectionsum = calc_section_checksum(protocol_.raw + K_SAMSUNG_AC_SECTION_LENGTH * 2); sectionsum = calc_section_checksum(this->protocol_.raw + K_SAMSUNG_AC_SECTION_LENGTH * 2);
protocol_.sum_3_upper = GETBITS8(sectionsum, K_HIGH_NIBBLE, K_NIBBLE_SIZE); this->protocol_.sum_3_upper = GETBITS8(sectionsum, K_HIGH_NIBBLE, K_NIBBLE_SIZE);
protocol_.sum_3_lower = GETBITS8(sectionsum, K_LOW_NIBBLE, K_NIBBLE_SIZE); this->protocol_.sum_3_lower = GETBITS8(sectionsum, K_LOW_NIBBLE, K_NIBBLE_SIZE);
} }
uint16_t SamsungClimate::count_bits(const uint8_t *const start, const uint16_t length, const bool ones, uint16_t SamsungClimate::count_bits(const uint8_t *const start, const uint16_t length, const bool ones,

6
esphome/components/samsung/samsung.h
View File

@ -172,8 +172,6 @@ union SamsungProtocol {
}; };
class SamsungClimate : public climate_ir::ClimateIR { class SamsungClimate : public climate_ir::ClimateIR {
SamsungProtocol protocol_;
climate::ClimateMode current_climate_mode_;
public: public:
SamsungClimate() SamsungClimate()
@ -184,9 +182,11 @@ class SamsungClimate : public climate_ir::ClimateIR {
climate::CLIMATE_SWING_HORIZONTAL, climate::CLIMATE_SWING_BOTH}) {} climate::CLIMATE_SWING_HORIZONTAL, climate::CLIMATE_SWING_BOTH}) {}
protected: protected:
SamsungProtocol protocol_;
climate::ClimateMode current_climate_mode_;
/// Transmit via IR the state of this climate controller /// Transmit via IR the state of this climate controller
void transmit_state() override; void transmit_state() override;
/// Handle received IR Buffer /// Handle received IR Buffer
bool on_receive(remote_base::RemoteReceiveData data) override; bool on_receive(remote_base::RemoteReceiveData data) override;