Upstream
/
esphome
mirror of https://github.com/esphome/esphome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix lint errors

This commit is contained in:
Iver Egge 2024-06-02 11:13:01 +02:00
parent 85d13923c2
commit 67b9948ab3
2 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
esphome/components/ykh531e/ykh531e.cpp
View File

@ -4,7 +4,7 @@
namespace esphome {
namespace ykh531e {
static const char *TAG = "ykh531e.climate";
static const char *const TAG = "ykh531e.climate";
uint8_t encode_temperature_celsius(float temperature) {
if (temperature > TEMP_MAX) {
@ -28,20 +28,20 @@ void YKH531EClimate::transmit_state() {
// byte2: 5 unknown bits and horizontal swing
switch (this->swing_mode) {
case climate::CLIMATE_SWING_BOTH:
ir_message[1] |= SwingOn;
ir_message[2] |= SwingOn << 5;
ir_message[1] |= SWING_ON;
ir_message[2] |= SWING_ON << 5;
break;
case climate::CLIMATE_SWING_VERTICAL:
ir_message[1] |= SwingOn;
ir_message[2] |= SwingOff << 5;
ir_message[1] |= SWING_ON;
ir_message[2] |= SWING_OFF << 5;
break;
case climate::CLIMATE_SWING_HORIZONTAL:
ir_message[1] |= SwingOff;
ir_message[2] |= SwingOn << 5;
ir_message[1] |= SWING_OFF;
ir_message[2] |= SWING_ON << 5;
break;
case climate::CLIMATE_SWING_OFF:
ir_message[1] |= SwingOff;
ir_message[2] |= SwingOff << 5;
ir_message[1] |= SWING_OFF;
ir_message[2] |= SWING_OFF << 5;
break;
}
@ -50,16 +50,18 @@ void YKH531EClimate::transmit_state() {
// byte4: 5 unknown bits and fan speed
switch (this->fan_mode.value()) {
case climate::CLIMATE_FAN_LOW:
ir_message[4] |= FanSpeedLow << 5;
ir_message[4] |= FAN_SPEED_LOW << 5;
break;
case climate::CLIMATE_FAN_MEDIUM:
ir_message[4] |= FanSpeedMid << 5;
ir_message[4] |= FAN_SPEED_MID << 5;
break;
case climate::CLIMATE_FAN_HIGH:
ir_message[4] |= FanSpeedHigh << 5;
ir_message[4] |= FAN_SPEED_HIGH << 5;
break;
case climate::CLIMATE_FAN_AUTO:
ir_message[4] |= FanSpeedAuto << 5;
ir_message[4] |= FAN_SPEED_AUTO << 5;
break;
default:
break;
}
@ -69,16 +71,18 @@ void YKH531EClimate::transmit_state() {
switch (this->mode) {
case climate::CLIMATE_MODE_AUTO:
case climate::CLIMATE_MODE_HEAT_COOL:
ir_message[6] |= ModeAuto << 5;
ir_message[6] |= MODE_AUTO << 5;
break;
case climate::CLIMATE_MODE_COOL:
ir_message[6] |= ModeCool << 5;
ir_message[6] |= MODE_COOL << 5;
break;
case climate::CLIMATE_MODE_DRY:
ir_message[6] |= ModeDry << 5;
ir_message[6] |= MODE_DRY << 5;
break;
case climate::CLIMATE_MODE_FAN_ONLY:
ir_message[6] |= ModeFan << 5;
ir_message[6] |= MODE_FAN << 5;
break;
default:
break;
}
@ -158,11 +162,11 @@ bool YKH531EClimate::on_receive(remote_base::RemoteReceiveData data) {
uint8_t vertical_swing = ir_message[1] & 0b00000111;
uint8_t horizontal_swing = (ir_message[2] & 0b11100000) >> 5;
if (vertical_swing == SwingOn && horizontal_swing == SwingOn) {
if (vertical_swing == SWING_ON && horizontal_swing == SWING_ON) {
this->swing_mode = climate::CLIMATE_SWING_BOTH;
} else if (vertical_swing == SwingOn) {
} else if (vertical_swing == SWING_ON) {
this->swing_mode = climate::CLIMATE_SWING_VERTICAL;
} else if (horizontal_swing == SwingOn) {
} else if (horizontal_swing == SWING_ON) {
this->swing_mode = climate::CLIMATE_SWING_HORIZONTAL;
} else {
this->swing_mode = climate::CLIMATE_SWING_OFF;
@ -173,16 +177,16 @@ bool YKH531EClimate::on_receive(remote_base::RemoteReceiveData data) {
uint8_t fan_speed = (ir_message[4] & 0b11100000) >> 5;
switch (fan_speed) {
case FanSpeedLow:
case FAN_SPEED_LOW:
this->fan_mode = climate::CLIMATE_FAN_LOW;
break;
case FanSpeedMid:
case FAN_SPEED_MID:
this->fan_mode = climate::CLIMATE_FAN_MEDIUM;
break;
case FanSpeedHigh:
case FAN_SPEED_HIGH:
this->fan_mode = climate::CLIMATE_FAN_HIGH;
break;
case FanSpeedAuto:
case FAN_SPEED_AUTO:
this->fan_mode = climate::CLIMATE_FAN_AUTO;
break;
}
@ -191,16 +195,16 @@ bool YKH531EClimate::on_receive(remote_base::RemoteReceiveData data) {
uint8_t mode = (ir_message[6] & 0b11100000) >> 5;
switch (mode) {
case ModeAuto:
case MODE_AUTO:
this->mode = climate::CLIMATE_MODE_AUTO;
break;
case ModeCool:
case MODE_COOL:
this->mode = climate::CLIMATE_MODE_COOL;
break;
case ModeDry:
case MODE_DRY:
this->mode = climate::CLIMATE_MODE_DRY;
break;
case ModeFan:
case MODE_FAN:
this->mode = climate::CLIMATE_MODE_FAN_ONLY;
break;
}

26
esphome/components/ykh531e/ykh531e.h
View File

@ -39,24 +39,18 @@ static const uint32_t ONE_SPACE = 1700;
* YK-H/531E codes
*
*******************************************************************************/
enum FanSpeed {
FanSpeedHigh = 0b001,
FanSpeedMid = 0b010,
FanSpeedLow = 0b011,
FanSpeedAuto = 0b101,
};
static const uint8_t FAN_SPEED_LOW = 0b011;
static const uint8_t FAN_SPEED_MID = 0b010;
static const uint8_t FAN_SPEED_HIGH = 0b001;
static const uint8_t FAN_SPEED_AUTO = 0b101;
enum Swing {
SwingOff = 0b111,
SwingOn = 0b000,
};
static const uint8_t SWING_ON = 0b000;
static const uint8_t SWING_OFF = 0b111;
enum Mode {
ModeAuto = 0b000,
ModeCool = 0b001,
ModeDry = 0b010,
ModeFan = 0b110,
};
static const uint8_t MODE_AUTO = 0b000;
static const uint8_t MODE_COOL = 0b001;
static const uint8_t MODE_DRY = 0b010;
static const uint8_t MODE_FAN = 0b110;
// Temperature range
static const float TEMP_MIN = 16.0f;