jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-11-14 05:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify Alexa/Google for new climate turn_on/off (#25115)

Browse Source
This commit is contained in:
Paulus Schoutsen
2019-07-13 01:27:50 -07:00
committed by Pascal Vizeli
parent 8ec75cf883
commit d37d1ce4ad
4 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
homeassistant/components/google_assistant/trait.py
View File

@@ -580,16 +580,6 @@ class TemperatureSettingTrait(_Trait):
return modes
@property
def climate_on_mode(self):
"""Return the mode that should be considered on."""
modes = [m for m in self.climate_google_modes if m != 'off']
if len(modes) == 1:
return modes[0]
return None
def sync_attributes(self):
"""Return temperature point and modes attributes for a sync request."""
response = {}
@@ -605,8 +595,8 @@ class TemperatureSettingTrait(_Trait):
elif domain == climate.DOMAIN:
modes = self.climate_google_modes
on_mode = self.climate_on_mode
if on_mode is not None:
if 'off' in modes and any(mode in modes for mode
in ('heatcool', 'heat', 'cool')):
modes.append('on')
response['availableThermostatModes'] = ','.join(modes)
@@ -761,6 +751,26 @@ class TemperatureSettingTrait(_Trait):
target_mode = params['thermostatMode']
supported = self.state.attributes.get(ATTR_SUPPORTED_FEATURES)
if target_mode == 'on':
await self.hass.services.async_call(
climate.DOMAIN, SERVICE_TURN_ON,
{
ATTR_ENTITY_ID: self.state.entity_id
},
blocking=True, context=data.context
)
return
if target_mode == 'off':
await self.hass.services.async_call(
climate.DOMAIN, SERVICE_TURN_OFF,
{
ATTR_ENTITY_ID: self.state.entity_id
},
blocking=True, context=data.context
)
return
if target_mode in self.google_to_preset:
await self.hass.services.async_call(
climate.DOMAIN, climate.SERVICE_SET_PRESET_MODE,
@@ -773,22 +783,6 @@ class TemperatureSettingTrait(_Trait):
)
return
if target_mode == 'on':
# When targetting 'on', we're going to try best effort.
modes = [m for m in self.climate_google_modes
if m != climate.HVAC_MODE_OFF]
if len(modes) == 1:
target_mode = modes[0]
elif 'auto' in modes:
target_mode = 'auto'
elif 'heatcool' in modes:
target_mode = 'heatcool'
else:
raise SmartHomeError(
ERR_FUNCTION_NOT_SUPPORTED,
"Unable to translate 'on' to a HVAC mode.")
await self.hass.services.async_call(
climate.DOMAIN, climate.SERVICE_SET_HVAC_MODE, {
ATTR_ENTITY_ID: self.state.entity_id,