jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 13:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Daikin preset modes (#25395)

Browse Source 
* fix preset documentation

* Use pydaikin set holiday method
This commit is contained in:
Fredrik Erlandsson 2019-07-24 02:10:28 +02:00 committed by Paulus Schoutsen
parent f5d0f36caf
commit 828f76ca57
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
homeassistant/components/daikin/climate.py
View File

@ -12,7 +12,7 @@ from homeassistant.components.climate.const import (
SUPPORT_SWING_MODE, SUPPORT_SWING_MODE,
HVAC_MODE_OFF, HVAC_MODE_HEAT, HVAC_MODE_COOL, HVAC_MODE_HEAT_COOL, HVAC_MODE_OFF, HVAC_MODE_HEAT, HVAC_MODE_COOL, HVAC_MODE_HEAT_COOL,
HVAC_MODE_DRY, HVAC_MODE_FAN_ONLY, HVAC_MODE_DRY, HVAC_MODE_FAN_ONLY,
PRESET_AWAY, PRESET_HOME, PRESET_AWAY, PRESET_NONE,
ATTR_CURRENT_TEMPERATURE, ATTR_FAN_MODE, ATTR_CURRENT_TEMPERATURE, ATTR_FAN_MODE,
ATTR_HVAC_MODE, ATTR_SWING_MODE, ATTR_HVAC_MODE, ATTR_SWING_MODE,
ATTR_PRESET_MODE) ATTR_PRESET_MODE)
@ -20,7 +20,8 @@ import homeassistant.helpers.config_validation as cv
from . import DOMAIN as DAIKIN_DOMAIN from . import DOMAIN as DAIKIN_DOMAIN
from .const import ( from .const import (
ATTR_INSIDE_TEMPERATURE, ATTR_OUTSIDE_TEMPERATURE, ATTR_TARGET_TEMPERATURE) ATTR_INSIDE_TEMPERATURE, ATTR_OUTSIDE_TEMPERATURE, ATTR_STATE_OFF,
ATTR_STATE_ON, ATTR_TARGET_TEMPERATURE)
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -49,7 +50,7 @@ DAIKIN_TO_HA_STATE = {
HA_PRESET_TO_DAIKIN = { HA_PRESET_TO_DAIKIN = {
PRESET_AWAY: 'on', PRESET_AWAY: 'on',
PRESET_HOME: 'off' PRESET_NONE: 'off'
} }
HA_ATTR_TO_DAIKIN = { HA_ATTR_TO_DAIKIN = {
@ -142,9 +143,10 @@ class DaikinClimate(ClimateDevice):
ha_mode = DAIKIN_TO_HA_STATE.get(daikin_mode) ha_mode = DAIKIN_TO_HA_STATE.get(daikin_mode)
value = ha_mode value = ha_mode
elif key == ATTR_PRESET_MODE: elif key == ATTR_PRESET_MODE:
away = (self._api.device.represent(daikin_attr)[1] if self._api.device.represent(
!= HA_STATE_TO_DAIKIN[HVAC_MODE_OFF]) daikin_attr)[1] == HA_PRESET_TO_DAIKIN[PRESET_AWAY]:
value = PRESET_AWAY if away else PRESET_HOME return PRESET_AWAY
return PRESET_NONE
if value is None: if value is None:
_LOGGER.error("Invalid value requested for key %s", key) _LOGGER.error("Invalid value requested for key %s", key)
@ -164,7 +166,7 @@ class DaikinClimate(ClimateDevice):
values = {} values = {}
for attr in [ATTR_TEMPERATURE, ATTR_FAN_MODE, ATTR_SWING_MODE, for attr in [ATTR_TEMPERATURE, ATTR_FAN_MODE, ATTR_SWING_MODE,
ATTR_HVAC_MODE, ATTR_PRESET_MODE]: ATTR_HVAC_MODE]:
value = settings.get(attr) value = settings.get(attr)
if value is None: if value is None:
continue continue
@ -173,8 +175,6 @@ class DaikinClimate(ClimateDevice):
if daikin_attr is not None: if daikin_attr is not None:
if attr == ATTR_HVAC_MODE: if attr == ATTR_HVAC_MODE:
values[daikin_attr] = HA_STATE_TO_DAIKIN[value] values[daikin_attr] = HA_STATE_TO_DAIKIN[value]
elif attr == ATTR_PRESET_MODE:
values[daikin_attr] = HA_PRESET_TO_DAIKIN[value]
elif value in self._list[attr]: elif value in self._list[attr]:
values[daikin_attr] = value.lower() values[daikin_attr] = value.lower()
else: else:
@ -273,16 +273,19 @@ class DaikinClimate(ClimateDevice):
@property @property
def preset_mode(self): def preset_mode(self):
"""Return the fan setting.""" """Return the preset_mode."""
return self.get(ATTR_PRESET_MODE) return self.get(ATTR_PRESET_MODE)
async def async_set_preset_mode(self, preset_mode): async def async_set_preset_mode(self, preset_mode):
"""Set new target temperature.""" """Set preset mode."""
await self._set({ATTR_PRESET_MODE: preset_mode}) if preset_mode == PRESET_AWAY:
await self._api.device.set_holiday(ATTR_STATE_ON)
else:
await self._api.device.set_holiday(ATTR_STATE_OFF)
@property @property
def preset_modes(self): def preset_modes(self):
"""List of available swing modes.""" """List of available preset modes."""
return list(HA_PRESET_TO_DAIKIN) return list(HA_PRESET_TO_DAIKIN)
async def async_update(self): async def async_update(self):

3
homeassistant/components/daikin/const.py
View File

@ -5,6 +5,9 @@ ATTR_TARGET_TEMPERATURE = 'target_temperature'
ATTR_INSIDE_TEMPERATURE = 'inside_temperature' ATTR_INSIDE_TEMPERATURE = 'inside_temperature'
ATTR_OUTSIDE_TEMPERATURE = 'outside_temperature' ATTR_OUTSIDE_TEMPERATURE = 'outside_temperature'
ATTR_STATE_ON = 'on'
ATTR_STATE_OFF = 'off'
SENSOR_TYPE_TEMPERATURE = 'temperature' SENSOR_TYPE_TEMPERATURE = 'temperature'
SENSOR_TYPES = { SENSOR_TYPES = {

2
homeassistant/components/daikin/manifest.json
View File

@ -4,7 +4,7 @@
"config_flow": true, "config_flow": true,
"documentation": "https://www.home-assistant.io/components/daikin", "documentation": "https://www.home-assistant.io/components/daikin",
"requirements": [ "requirements": [
"pydaikin==1.4.6" "pydaikin==1.5.1"
], ],
"dependencies": [], "dependencies": [],
"codeowners": [ "codeowners": [

2
requirements_all.txt
View File

@ -1090,7 +1090,7 @@ pycsspeechtts==1.0.2
# pycups==1.9.73 # pycups==1.9.73
# homeassistant.components.daikin # homeassistant.components.daikin
pydaikin==1.4.6 pydaikin==1.5.1
# homeassistant.components.danfoss_air # homeassistant.components.danfoss_air
pydanfossair==0.1.0 pydanfossair==0.1.0