jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-26 06:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert siri requests for target heating cooling state auto to a valid mode (#60220)

Browse Source
This commit is contained in:
J. Nick Koston 2022-01-12 13:06:09 -10:00 committed by GitHub
parent b23be22c67
commit d3f980d402
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
"name": "HomeKit", "name": "HomeKit",
"documentation": "https://www.home-assistant.io/integrations/homekit", "documentation": "https://www.home-assistant.io/integrations/homekit",
"requirements": [ "requirements": [
"HAP-python==4.3.0", "HAP-python==4.4.0",
"fnvhash==0.1.0", "fnvhash==0.1.0",
"PyQRCode==1.2.1", "PyQRCode==1.2.1",
"base36==0.1.1" "base36==0.1.1"

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

@ -174,6 +174,7 @@ class Thermostat(HomeAccessory):
self.char_target_heat_cool.override_properties( self.char_target_heat_cool.override_properties(
valid_values=self.hc_hass_to_homekit valid_values=self.hc_hass_to_homekit
) )
self.char_target_heat_cool.allow_invalid_client_values = True
# Current and target temperature characteristics # Current and target temperature characteristics
self.char_current_temp = serv_thermostat.configure_char( self.char_current_temp = serv_thermostat.configure_char(
@ -252,7 +253,6 @@ class Thermostat(HomeAccessory):
hvac_mode = state.state hvac_mode = state.state
homekit_hvac_mode = HC_HASS_TO_HOMEKIT[hvac_mode] homekit_hvac_mode = HC_HASS_TO_HOMEKIT[hvac_mode]
# 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 ( if (
@ -282,7 +282,7 @@ class Thermostat(HomeAccessory):
target_hc, target_hc,
hc_fallback, hc_fallback,
) )
target_hc = hc_fallback self.char_target_heat_cool.value = target_hc = hc_fallback
break break
params[ATTR_HVAC_MODE] = self.hc_homekit_to_hass[target_hc] params[ATTR_HVAC_MODE] = self.hc_homekit_to_hass[target_hc]

2
requirements_all.txt
View File

@ -17,7 +17,7 @@ Adafruit-SHT31==1.0.2
Adax-local==0.1.3 Adax-local==0.1.3
# homeassistant.components.homekit # homeassistant.components.homekit
HAP-python==4.3.0 HAP-python==4.4.0
# homeassistant.components.mastodon # homeassistant.components.mastodon
Mastodon.py==1.5.1 Mastodon.py==1.5.1

2
requirements_test_all.txt
View File

@ -10,7 +10,7 @@ AEMET-OpenData==0.2.1
Adax-local==0.1.3 Adax-local==0.1.3
# homeassistant.components.homekit # homeassistant.components.homekit
HAP-python==4.3.0 HAP-python==4.4.0
# homeassistant.components.flick_electric # homeassistant.components.flick_electric
PyFlick==0.0.2 PyFlick==0.0.2

24
tests/components/homekit/test_type_thermostats.py
View File

@ -1266,6 +1266,7 @@ async def test_thermostat_hvac_modes_with_heat_only(hass, hk_driver):
await hass.async_block_till_done() await hass.async_block_till_done()
hap = acc.char_target_heat_cool.to_HAP() hap = acc.char_target_heat_cool.to_HAP()
assert hap["valid-values"] == [HC_HEAT_COOL_OFF, HC_HEAT_COOL_HEAT] assert hap["valid-values"] == [HC_HEAT_COOL_OFF, HC_HEAT_COOL_HEAT]
assert acc.char_target_heat_cool.allow_invalid_client_values is True
assert acc.char_target_heat_cool.value == HC_HEAT_COOL_HEAT assert acc.char_target_heat_cool.value == HC_HEAT_COOL_HEAT
acc.char_target_heat_cool.set_value(HC_HEAT_COOL_HEAT) acc.char_target_heat_cool.set_value(HC_HEAT_COOL_HEAT)
@ -1303,6 +1304,29 @@ async def test_thermostat_hvac_modes_with_heat_only(hass, hk_driver):
assert call_set_hvac_mode[0].data[ATTR_ENTITY_ID] == entity_id assert call_set_hvac_mode[0].data[ATTR_ENTITY_ID] == entity_id
assert call_set_hvac_mode[0].data[ATTR_HVAC_MODE] == HVAC_MODE_HEAT assert call_set_hvac_mode[0].data[ATTR_HVAC_MODE] == HVAC_MODE_HEAT
acc.char_target_heat_cool.client_update_value(HC_HEAT_COOL_OFF)
await hass.async_block_till_done()
assert acc.char_target_heat_cool.value == HC_HEAT_COOL_OFF
hass.states.async_set(
entity_id, HVAC_MODE_OFF, {ATTR_HVAC_MODES: [HVAC_MODE_HEAT, HVAC_MODE_OFF]}
)
await hass.async_block_till_done()
hk_driver.set_characteristics(
{
HAP_REPR_CHARS: [
{
HAP_REPR_AID: acc.aid,
HAP_REPR_IID: char_target_heat_cool_iid,
HAP_REPR_VALUE: HC_HEAT_COOL_AUTO,
},
]
},
"mock_addr",
)
await hass.async_block_till_done()
assert acc.char_target_heat_cool.value == HC_HEAT_COOL_HEAT
async def test_thermostat_hvac_modes_with_cool_only(hass, hk_driver): async def test_thermostat_hvac_modes_with_cool_only(hass, hk_driver):
"""Test if unsupported HVAC modes are deactivated in HomeKit and siri calls get converted to cool.""" """Test if unsupported HVAC modes are deactivated in HomeKit and siri calls get converted to cool."""