Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-10-01 04:38:51 +02:00
Code Issues Projects Releases Wiki Activity

Daikin precision and preset enhancements

Browse Source
This commit is contained in:
James Nimmo 2022-06-27 20:50:40 +12:00
parent e25dd3298c
commit 90e4b1f6a0
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
esphome/components/daikin/daikin.cpp
View File

@ -139,7 +139,7 @@ uint8_t DaikinClimate::temperature_() {
case climate::CLIMATE_MODE_DRY: case climate::CLIMATE_MODE_DRY:
return 0xc0; return 0xc0;
default: default:
uint8_t temperature = (clamp<float>(this->target_temperature, DAIKIN_TEMP_MIN, DAIKIN_TEMP_MAX))*2; uint8_t temperature = (clamp<float>(this->target_temperature, DAIKIN_TEMP_MIN, DAIKIN_TEMP_MAX)) * 2;
return temperature; return temperature;
} }
} }
@ -149,8 +149,7 @@ uint8_t DaikinClimate::powerful_quiet_preset_() {
if (this->preset.has_value()) { if (this->preset.has_value()) {
if (this->preset == climate::CLIMATE_PRESET_BOOST) { if (this->preset == climate::CLIMATE_PRESET_BOOST) {
powerful_quiet_preset = DAIKIN_PRESET_POWERFUL_ON; powerful_quiet_preset = DAIKIN_PRESET_POWERFUL_ON;
} } else if (this->preset == climate::CLIMATE_PRESET_SLEEP) {
else if (this->preset == climate::CLIMATE_PRESET_SLEEP) {
powerful_quiet_preset = DAIKIN_PRESET_QUIET_ON; powerful_quiet_preset = DAIKIN_PRESET_QUIET_ON;
} }
} }
@ -202,7 +201,7 @@ bool DaikinClimate::parse_state_frame_(const uint8_t frame[]) {
} }
uint8_t temperature = frame[6]; uint8_t temperature = frame[6];
if (!(temperature & 0xC0)) { if (!(temperature & 0xC0)) {
this->target_temperature = (float)temperature / 2.0f; this->target_temperature = (float) temperature / 2.0f;
} }
uint8_t fan_mode = frame[8]; uint8_t fan_mode = frame[8];
uint8_t swing_mode = frame[9]; uint8_t swing_mode = frame[9];

16
esphome/components/daikin/daikin.h
View File

@ -52,14 +52,14 @@ const uint8_t DAIKIN_STATE_FRAME_SIZE = 19;
class DaikinClimate : public climate_ir::ClimateIR { class DaikinClimate : public climate_ir::ClimateIR {
public: public:
DaikinClimate() DaikinClimate()
: climate_ir::ClimateIR(DAIKIN_TEMP_MIN, DAIKIN_TEMP_MAX, 0.5f, true, true, : climate_ir::ClimateIR(
{climate::CLIMATE_FAN_AUTO, climate::CLIMATE_FAN_LOW, climate::CLIMATE_FAN_MEDIUM, DAIKIN_TEMP_MIN, DAIKIN_TEMP_MAX, 0.5f, true, true,
climate::CLIMATE_FAN_HIGH}, {climate::CLIMATE_FAN_AUTO, climate::CLIMATE_FAN_LOW, climate::CLIMATE_FAN_MEDIUM,
{climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL, climate::CLIMATE_FAN_HIGH},
climate::CLIMATE_SWING_HORIZONTAL, climate::CLIMATE_SWING_BOTH}, {climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL, climate::CLIMATE_SWING_HORIZONTAL,
{climate::CLIMATE_PRESET_ECO, climate::CLIMATE_PRESET_BOOST, climate::CLIMATE_SWING_BOTH},
climate::CLIMATE_PRESET_COMFORT, climate::CLIMATE_PRESET_SLEEP, {climate::CLIMATE_PRESET_ECO, climate::CLIMATE_PRESET_BOOST, climate::CLIMATE_PRESET_COMFORT,
climate::CLIMATE_PRESET_ACTIVITY, climate::CLIMATE_PRESET_NONE}) {} climate::CLIMATE_PRESET_SLEEP, climate::CLIMATE_PRESET_ACTIVITY, climate::CLIMATE_PRESET_NONE}) {}
protected: protected:
// Transmit via IR the state of this climate controller. // Transmit via IR the state of this climate controller.