evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Translate siri requests to turn on thermostats to valid targets (#44236)

Browse source 
Siri always requests auto mode even when the device does not
support auto which results in the thermostat failing to turn
on as success is assumed.  We now determine the heat cool
target mode based on the current temp, target temp, and
supported modes to ensure the thermostat will reach the
requested target temp.
This commit is contained in:
J. Nick Koston 2020-12-23 17:23:26 -10:00 • committed by GitHub
parent 2d131823ce
commit 677fc6e2bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 356 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

92
homeassistant/components/homekit/type_thermostats.py
View file

@ -89,6 +89,20 @@ HC_HEAT_COOL_HEAT = 1
HC_HEAT_COOL_COOL = 2
HC_HEAT_COOL_AUTO = 3
HC_HEAT_COOL_PREFER_HEAT = [
HC_HEAT_COOL_AUTO,
HC_HEAT_COOL_HEAT,
HC_HEAT_COOL_COOL,
HC_HEAT_COOL_OFF,
]
HC_HEAT_COOL_PREFER_COOL = [
HC_HEAT_COOL_AUTO,
HC_HEAT_COOL_COOL,
HC_HEAT_COOL_HEAT,
HC_HEAT_COOL_OFF,
]
HC_MIN_TEMP = 10
HC_MAX_TEMP = 38
@ -236,7 +250,7 @@ class Thermostat(HomeAccessory):
state = self.hass.states.get(self.entity_id)
features = state.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
hvac_mode = self.hass.states.get(self.entity_id).state
hvac_mode = state.state
homekit_hvac_mode = HC_HASS_TO_HOMEKIT[hvac_mode]
if CHAR_TARGET_HEATING_COOLING in char_values:
@ -244,19 +258,37 @@ class Thermostat(HomeAccessory):
# Ignore it if its the same mode
if char_values[CHAR_TARGET_HEATING_COOLING] != homekit_hvac_mode:
target_hc = char_values[CHAR_TARGET_HEATING_COOLING]
if target_hc in self.hc_homekit_to_hass:
service = SERVICE_SET_HVAC_MODE_THERMOSTAT
hass_value = self.hc_homekit_to_hass[target_hc]
params = {ATTR_HVAC_MODE: hass_value}
events.append(
f"{CHAR_TARGET_HEATING_COOLING} to {char_values[CHAR_TARGET_HEATING_COOLING]}"
)
else:
_LOGGER.warning(
"The entity: %s does not have a %s mode",
self.entity_id,
target_hc,
)
if target_hc not in self.hc_homekit_to_hass:
# If the target heating cooling state we want does not
# exist on the device, we have to sort it out
# based on the the current and target temperature since
# siri will always send HC_HEAT_COOL_AUTO in this case
# and hope for the best.
hc_target_temp = char_values.get(CHAR_TARGET_TEMPERATURE)
hc_current_temp = _get_current_temperature(state, self._unit)
hc_fallback_order = HC_HEAT_COOL_PREFER_HEAT
if (
hc_target_temp is not None
and hc_current_temp is not None
and hc_target_temp < hc_current_temp
):
hc_fallback_order = HC_HEAT_COOL_PREFER_COOL
for hc_fallback in hc_fallback_order:
if hc_fallback in self.hc_homekit_to_hass:
_LOGGER.debug(
"Siri requested target mode: %s and the device does not support, falling back to %s",
target_hc,
hc_fallback,
)
target_hc = hc_fallback
break
service = SERVICE_SET_HVAC_MODE_THERMOSTAT
hass_value = self.hc_homekit_to_hass[target_hc]
params = {ATTR_HVAC_MODE: hass_value}
events.append(
f"{CHAR_TARGET_HEATING_COOLING} to {char_values[CHAR_TARGET_HEATING_COOLING]}"
)
if CHAR_TARGET_TEMPERATURE in char_values:
hc_target_temp = char_values[CHAR_TARGET_TEMPERATURE]
@ -429,9 +461,8 @@ class Thermostat(HomeAccessory):
self.char_current_heat_cool.set_value(homekit_hvac_action)
# Update current temperature
current_temp = new_state.attributes.get(ATTR_CURRENT_TEMPERATURE)
if isinstance(current_temp, (int, float)):
current_temp = self._temperature_to_homekit(current_temp)
current_temp = _get_current_temperature(new_state, self._unit)
if current_temp is not None:
if self.char_current_temp.value != current_temp:
self.char_current_temp.set_value(current_temp)
@ -466,10 +497,8 @@ class Thermostat(HomeAccessory):
self.char_heating_thresh_temp.set_value(heating_thresh)
# Update target temperature
target_temp = new_state.attributes.get(ATTR_TEMPERATURE)
if isinstance(target_temp, (int, float)):
target_temp = self._temperature_to_homekit(target_temp)
elif features & SUPPORT_TARGET_TEMPERATURE_RANGE:
target_temp = _get_target_temperature(new_state, self._unit)
if target_temp is None and features & SUPPORT_TARGET_TEMPERATURE_RANGE:
# Homekit expects a target temperature
# even if the device does not support it
hc_hvac_mode = self.char_target_heat_cool.value
@ -566,9 +595,8 @@ class WaterHeater(HomeAccessory):
def async_update_state(self, new_state):
"""Update water_heater state after state change."""
# Update current and target temperature
temperature = new_state.attributes.get(ATTR_TEMPERATURE)
if isinstance(temperature, (int, float)):
temperature = temperature_to_homekit(temperature, self._unit)
temperature = _get_target_temperature(new_state, self._unit)
if temperature is not None:
if temperature != self.char_current_temp.value:
self.char_target_temp.set_value(temperature)
@ -606,3 +634,19 @@ def _get_temperature_range_from_state(state, unit, default_min, default_max):
max_temp = min_temp
return min_temp, max_temp
def _get_target_temperature(state, unit):
"""Calculate the target temperature from a state."""
target_temp = state.attributes.get(ATTR_TEMPERATURE)
if isinstance(target_temp, (int, float)):
return temperature_to_homekit(target_temp, unit)
return None
def _get_current_temperature(state, unit):
"""Calculate the current temperature from a state."""
target_temp = state.attributes.get(ATTR_CURRENT_TEMPERATURE)
if isinstance(target_temp, (int, float)):
return temperature_to_homekit(target_temp, unit)
return None