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

fix (#37889)

Browse Source
This commit is contained in:
J. Nick Koston 2020-07-18 01:25:07 -10:00 committed by GitHub
parent ad22619efb
commit b030ed1adf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
homeassistant/components/homekit/type_thermostats.py
View File

@ -74,6 +74,13 @@ from .util import temperature_to_homekit, temperature_to_states
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
DEFAULT_HVAC_MODES = [
HVAC_MODE_HEAT,
HVAC_MODE_COOL,
HVAC_MODE_HEAT_COOL,
HVAC_MODE_OFF,
]
HC_HOMEKIT_VALID_MODES_WATER_HEATER = {"Heat": 1} HC_HOMEKIT_VALID_MODES_WATER_HEATER = {"Heat": 1}
UNIT_HASS_TO_HOMEKIT = {TEMP_CELSIUS: 0, TEMP_FAHRENHEIT: 1} UNIT_HASS_TO_HOMEKIT = {TEMP_CELSIUS: 0, TEMP_FAHRENHEIT: 1}
@ -117,7 +124,6 @@ class Thermostat(HomeAccessory):
"""Initialize a Thermostat accessory object.""" """Initialize a Thermostat accessory object."""
super().__init__(*args, category=CATEGORY_THERMOSTAT) super().__init__(*args, category=CATEGORY_THERMOSTAT)
self._unit = self.hass.config.units.temperature_unit self._unit = self.hass.config.units.temperature_unit
self._state_updates = 0
self.hc_homekit_to_hass = None self.hc_homekit_to_hass = None
self.hc_hass_to_homekit = None self.hc_hass_to_homekit = None
hc_min_temp, hc_max_temp = self.get_temperature_range() hc_min_temp, hc_max_temp = self.get_temperature_range()
@ -237,14 +243,20 @@ class Thermostat(HomeAccessory):
# Homekit will reset the mode when VIEWING the temp # Homekit will reset the mode when VIEWING the temp
# Ignore it if its the same mode # Ignore it if its the same mode
if char_values[CHAR_TARGET_HEATING_COOLING] != homekit_hvac_mode: if char_values[CHAR_TARGET_HEATING_COOLING] != homekit_hvac_mode:
service = SERVICE_SET_HVAC_MODE_THERMOSTAT target_hc = char_values[CHAR_TARGET_HEATING_COOLING]
hass_value = self.hc_homekit_to_hass[ if target_hc in self.hc_homekit_to_hass:
char_values[CHAR_TARGET_HEATING_COOLING] service = SERVICE_SET_HVAC_MODE_THERMOSTAT
] hass_value = self.hc_homekit_to_hass[target_hc]
params = {ATTR_HVAC_MODE: hass_value} params = {ATTR_HVAC_MODE: hass_value}
events.append( events.append(
f"{CHAR_TARGET_HEATING_COOLING} to {char_values[CHAR_TARGET_HEATING_COOLING]}" 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 CHAR_TARGET_TEMPERATURE in char_values: if CHAR_TARGET_TEMPERATURE in char_values:
hc_target_temp = char_values[CHAR_TARGET_TEMPERATURE] hc_target_temp = char_values[CHAR_TARGET_TEMPERATURE]
@ -321,20 +333,8 @@ class Thermostat(HomeAccessory):
def _configure_hvac_modes(self, state): def _configure_hvac_modes(self, state):
"""Configure target mode characteristics.""" """Configure target mode characteristics."""
hc_modes = state.attributes.get(ATTR_HVAC_MODES) # This cannot be none OR an empty list
if not hc_modes: hc_modes = state.attributes.get(ATTR_HVAC_MODES) or DEFAULT_HVAC_MODES
# This cannot be none OR an empty list
_LOGGER.error(
"%s: HVAC modes not yet available. Please disable auto start for homekit",
self.entity_id,
)
hc_modes = (
HVAC_MODE_HEAT,
HVAC_MODE_COOL,
HVAC_MODE_HEAT_COOL,
HVAC_MODE_OFF,
)
# Determine available modes for this entity, # Determine available modes for this entity,
# Prefer HEAT_COOL over AUTO and COOL over FAN_ONLY, DRY # Prefer HEAT_COOL over AUTO and COOL over FAN_ONLY, DRY
# #
@ -379,26 +379,23 @@ class Thermostat(HomeAccessory):
@callback @callback
def async_update_state(self, new_state): def async_update_state(self, new_state):
"""Update thermostat state after state changed.""" """Update thermostat state after state changed."""
if self._state_updates < 3: # We always recheck valid hvac modes as the entity
# When we get the first state updates # may not have been fully setup when we saw it last
# we recheck valid hvac modes as the entity original_hc_hass_to_homekit = self.hc_hass_to_homekit
# may not have been fully setup when we saw it the self._configure_hvac_modes(new_state)
# first time
original_hc_hass_to_homekit = self.hc_hass_to_homekit if self.hc_hass_to_homekit != original_hc_hass_to_homekit:
self._configure_hvac_modes(new_state) if self.char_target_heat_cool.value not in self.hc_homekit_to_hass:
if self.hc_hass_to_homekit != original_hc_hass_to_homekit: # We must make sure the char value is
if self.char_target_heat_cool.value not in self.hc_homekit_to_hass: # in the new valid values before
# We must make sure the char value is # setting the new valid values or
# in the new valid values before # changing them with throw
# setting the new valid values or self.char_target_heat_cool.set_value(
# changing them with throw list(self.hc_homekit_to_hass)[0], should_notify=False
self.char_target_heat_cool.set_value(
list(self.hc_homekit_to_hass)[0], should_notify=False
)
self.char_target_heat_cool.override_properties(
valid_values=self.hc_hass_to_homekit
) )
self._state_updates += 1 self.char_target_heat_cool.override_properties(
valid_values=self.hc_hass_to_homekit
)
self._async_update_state(new_state) self._async_update_state(new_state)