Add HomeKit Controller heater-cooler devices (#38979)
Some new HomeKit climate devices, like XiaoMi Air Conditioning Controller P3 are heater-cooler devices rather than thermostat devices. This commit adds support for the heater-cooler class via homekit_controller.
This commit is contained in:
Yuxiang Zhu
GitHub
parent
ab6fb5cb77
commit
19cc168433
6 changed files with 553 additions and 9 deletions
|
|
@ -1,5 +1,11 @@
|
|||
"""Basic checks for HomeKitclimate."""
|
||||
from aiohomekit.model.characteristics import CharacteristicsTypes
|
||||
from aiohomekit.model.characteristics import (
|
||||
ActivationStateValues,
|
||||
CharacteristicsTypes,
|
||||
CurrentHeaterCoolerStateValues,
|
||||
SwingModeValues,
|
||||
TargetHeaterCoolerStateValues,
|
||||
)
|
||||
from aiohomekit.model.services import ServicesTypes
|
||||
|
||||
from homeassistant.components.climate.const import (
|
||||
|
|
@ -10,6 +16,7 @@ from homeassistant.components.climate.const import (
|
|||
HVAC_MODE_OFF,
|
||||
SERVICE_SET_HUMIDITY,
|
||||
SERVICE_SET_HVAC_MODE,
|
||||
SERVICE_SET_SWING_MODE,
|
||||
SERVICE_SET_TEMPERATURE,
|
||||
)
|
||||
|
||||
|
|
@ -22,6 +29,8 @@ TEMPERATURE_CURRENT = ("thermostat", "temperature.current")
|
|||
HUMIDITY_TARGET = ("thermostat", "relative-humidity.target")
|
||||
HUMIDITY_CURRENT = ("thermostat", "relative-humidity.current")
|
||||
|
||||
# Test thermostat devices
|
||||
|
||||
|
||||
def create_thermostat_service(accessory):
|
||||
"""Define thermostat characteristics."""
|
||||
|
|
@ -226,3 +235,277 @@ async def test_hvac_mode_vs_hvac_action(hass, utcnow):
|
|||
state = await helper.poll_and_get_state()
|
||||
assert state.state == "heat"
|
||||
assert state.attributes["hvac_action"] == "heating"
|
||||
|
||||
|
||||
TARGET_HEATER_COOLER_STATE = ("heater-cooler", "heater-cooler.state.target")
|
||||
CURRENT_HEATER_COOLER_STATE = ("heater-cooler", "heater-cooler.state.current")
|
||||
HEATER_COOLER_ACTIVE = ("heater-cooler", "active")
|
||||
HEATER_COOLER_TEMPERATURE_CURRENT = ("heater-cooler", "temperature.current")
|
||||
TEMPERATURE_COOLING_THRESHOLD = ("heater-cooler", "temperature.cooling-threshold")
|
||||
TEMPERATURE_HEATING_THRESHOLD = ("heater-cooler", "temperature.heating-threshold")
|
||||
SWING_MODE = ("heater-cooler", "swing-mode")
|
||||
|
||||
|
||||
def create_heater_cooler_service(accessory):
|
||||
"""Define thermostat characteristics."""
|
||||
service = accessory.add_service(ServicesTypes.HEATER_COOLER)
|
||||
|
||||
char = service.add_char(CharacteristicsTypes.TARGET_HEATER_COOLER_STATE)
|
||||
char.value = 0
|
||||
|
||||
char = service.add_char(CharacteristicsTypes.CURRENT_HEATER_COOLER_STATE)
|
||||
char.value = 0
|
||||
|
||||
char = service.add_char(CharacteristicsTypes.ACTIVE)
|
||||
char.value = 1
|
||||
|
||||
char = service.add_char(CharacteristicsTypes.TEMPERATURE_COOLING_THRESHOLD)
|
||||
char.minValue = 7
|
||||
char.maxValue = 35
|
||||
char.value = 0
|
||||
|
||||
char = service.add_char(CharacteristicsTypes.TEMPERATURE_HEATING_THRESHOLD)
|
||||
char.minValue = 7
|
||||
char.maxValue = 35
|
||||
char.value = 0
|
||||
|
||||
char = service.add_char(CharacteristicsTypes.TEMPERATURE_CURRENT)
|
||||
char.value = 0
|
||||
|
||||
char = service.add_char(CharacteristicsTypes.SWING_MODE)
|
||||
char.value = 0
|
||||
|
||||
|
||||
# Test heater-cooler devices
|
||||
def create_heater_cooler_service_min_max(accessory):
|
||||
"""Define thermostat characteristics."""
|
||||
service = accessory.add_service(ServicesTypes.HEATER_COOLER)
|
||||
char = service.add_char(CharacteristicsTypes.TARGET_HEATER_COOLER_STATE)
|
||||
char.value = 1
|
||||
char.minValue = 1
|
||||
char.maxValue = 2
|
||||
|
||||
|
||||
async def test_heater_cooler_respect_supported_op_modes_1(hass, utcnow):
|
||||
"""Test that climate respects minValue/maxValue hints."""
|
||||
helper = await setup_test_component(hass, create_heater_cooler_service_min_max)
|
||||
state = await helper.poll_and_get_state()
|
||||
assert state.attributes["hvac_modes"] == ["heat", "cool", "off"]
|
||||
|
||||
|
||||
def create_theater_cooler_service_valid_vals(accessory):
|
||||
"""Define heater-cooler characteristics."""
|
||||
service = accessory.add_service(ServicesTypes.HEATER_COOLER)
|
||||
char = service.add_char(CharacteristicsTypes.TARGET_HEATER_COOLER_STATE)
|
||||
char.value = 1
|
||||
char.valid_values = [1, 2]
|
||||
|
||||
|
||||
async def test_heater_cooler_respect_supported_op_modes_2(hass, utcnow):
|
||||
"""Test that climate respects validValue hints."""
|
||||
helper = await setup_test_component(hass, create_theater_cooler_service_valid_vals)
|
||||
state = await helper.poll_and_get_state()
|
||||
assert state.attributes["hvac_modes"] == ["heat", "cool", "off"]
|
||||
|
||||
|
||||
async def test_heater_cooler_change_thermostat_state(hass, utcnow):
|
||||
"""Test that we can change the operational mode."""
|
||||
helper = await setup_test_component(hass, create_heater_cooler_service)
|
||||
|
||||
await hass.services.async_call(
|
||||
DOMAIN,
|
||||
SERVICE_SET_HVAC_MODE,
|
||||
{"entity_id": "climate.testdevice", "hvac_mode": HVAC_MODE_HEAT},
|
||||
blocking=True,
|
||||
)
|
||||
|
||||
assert (
|
||||
helper.characteristics[TARGET_HEATER_COOLER_STATE].value
|
||||
== TargetHeaterCoolerStateValues.HEAT
|
||||
)
|
||||
|
||||
await hass.services.async_call(
|
||||
DOMAIN,
|
||||
SERVICE_SET_HVAC_MODE,
|
||||
{"entity_id": "climate.testdevice", "hvac_mode": HVAC_MODE_COOL},
|
||||
blocking=True,
|
||||
)
|
||||
assert (
|
||||
helper.characteristics[TARGET_HEATER_COOLER_STATE].value
|
||||
== TargetHeaterCoolerStateValues.COOL
|
||||
)
|
||||
|
||||
await hass.services.async_call(
|
||||
DOMAIN,
|
||||
SERVICE_SET_HVAC_MODE,
|
||||
{"entity_id": "climate.testdevice", "hvac_mode": HVAC_MODE_HEAT_COOL},
|
||||
blocking=True,
|
||||
)
|
||||
assert (
|
||||
helper.characteristics[TARGET_HEATER_COOLER_STATE].value
|
||||
== TargetHeaterCoolerStateValues.AUTOMATIC
|
||||
)
|
||||
|
||||
await hass.services.async_call(
|
||||
DOMAIN,
|
||||
SERVICE_SET_HVAC_MODE,
|
||||
{"entity_id": "climate.testdevice", "hvac_mode": HVAC_MODE_OFF},
|
||||
blocking=True,
|
||||
)
|
||||
assert (
|
||||
helper.characteristics[HEATER_COOLER_ACTIVE].value
|
||||
== ActivationStateValues.INACTIVE
|
||||
)
|
||||
|
||||
|
||||
async def test_heater_cooler_change_thermostat_temperature(hass, utcnow):
|
||||
"""Test that we can change the target temperature."""
|
||||
helper = await setup_test_component(hass, create_heater_cooler_service)
|
||||
|
||||
await hass.services.async_call(
|
||||
DOMAIN,
|
||||
SERVICE_SET_HVAC_MODE,
|
||||
{"entity_id": "climate.testdevice", "hvac_mode": HVAC_MODE_HEAT},
|
||||
blocking=True,
|
||||
)
|
||||
await hass.services.async_call(
|
||||
DOMAIN,
|
||||
SERVICE_SET_TEMPERATURE,
|
||||
{"entity_id": "climate.testdevice", "temperature": 20},
|
||||
blocking=True,
|
||||
)
|
||||
assert helper.characteristics[TEMPERATURE_HEATING_THRESHOLD].value == 20
|
||||
|
||||
await hass.services.async_call(
|
||||
DOMAIN,
|
||||
SERVICE_SET_HVAC_MODE,
|
||||
{"entity_id": "climate.testdevice", "hvac_mode": HVAC_MODE_COOL},
|
||||
blocking=True,
|
||||
)
|
||||
await hass.services.async_call(
|
||||
DOMAIN,
|
||||
SERVICE_SET_TEMPERATURE,
|
||||
{"entity_id": "climate.testdevice", "temperature": 26},
|
||||
blocking=True,
|
||||
)
|
||||
assert helper.characteristics[TEMPERATURE_COOLING_THRESHOLD].value == 26
|
||||
|
||||
|
||||
async def test_heater_cooler_read_thermostat_state(hass, utcnow):
|
||||
"""Test that we can read the state of a HomeKit thermostat accessory."""
|
||||
helper = await setup_test_component(hass, create_heater_cooler_service)
|
||||
|
||||
# Simulate that heating is on
|
||||
helper.characteristics[HEATER_COOLER_TEMPERATURE_CURRENT].value = 19
|
||||
helper.characteristics[TEMPERATURE_HEATING_THRESHOLD].value = 20
|
||||
helper.characteristics[
|
||||
CURRENT_HEATER_COOLER_STATE
|
||||
].value = CurrentHeaterCoolerStateValues.HEATING
|
||||
helper.characteristics[
|
||||
TARGET_HEATER_COOLER_STATE
|
||||
].value = TargetHeaterCoolerStateValues.HEAT
|
||||
helper.characteristics[SWING_MODE].value = SwingModeValues.DISABLED
|
||||
|
||||
state = await helper.poll_and_get_state()
|
||||
assert state.state == HVAC_MODE_HEAT
|
||||
assert state.attributes["current_temperature"] == 19
|
||||
assert state.attributes["min_temp"] == 7
|
||||
assert state.attributes["max_temp"] == 35
|
||||
|
||||
# Simulate that cooling is on
|
||||
helper.characteristics[HEATER_COOLER_TEMPERATURE_CURRENT].value = 21
|
||||
helper.characteristics[TEMPERATURE_COOLING_THRESHOLD].value = 19
|
||||
helper.characteristics[
|
||||
CURRENT_HEATER_COOLER_STATE
|
||||
].value = CurrentHeaterCoolerStateValues.COOLING
|
||||
helper.characteristics[
|
||||
TARGET_HEATER_COOLER_STATE
|
||||
].value = TargetHeaterCoolerStateValues.COOL
|
||||
helper.characteristics[SWING_MODE].value = SwingModeValues.DISABLED
|
||||
|
||||
state = await helper.poll_and_get_state()
|
||||
assert state.state == HVAC_MODE_COOL
|
||||
assert state.attributes["current_temperature"] == 21
|
||||
|
||||
# Simulate that we are in auto mode
|
||||
helper.characteristics[HEATER_COOLER_TEMPERATURE_CURRENT].value = 21
|
||||
helper.characteristics[TEMPERATURE_COOLING_THRESHOLD].value = 21
|
||||
helper.characteristics[
|
||||
CURRENT_HEATER_COOLER_STATE
|
||||
].value = CurrentHeaterCoolerStateValues.COOLING
|
||||
helper.characteristics[
|
||||
TARGET_HEATER_COOLER_STATE
|
||||
].value = TargetHeaterCoolerStateValues.AUTOMATIC
|
||||
helper.characteristics[SWING_MODE].value = SwingModeValues.DISABLED
|
||||
|
||||
state = await helper.poll_and_get_state()
|
||||
assert state.state == HVAC_MODE_HEAT_COOL
|
||||
|
||||
|
||||
async def test_heater_cooler_hvac_mode_vs_hvac_action(hass, utcnow):
|
||||
"""Check that we haven't conflated hvac_mode and hvac_action."""
|
||||
helper = await setup_test_component(hass, create_heater_cooler_service)
|
||||
|
||||
# Simulate that current temperature is above target temp
|
||||
# Heating might be on, but hvac_action currently 'off'
|
||||
helper.characteristics[HEATER_COOLER_TEMPERATURE_CURRENT].value = 22
|
||||
helper.characteristics[TEMPERATURE_HEATING_THRESHOLD].value = 21
|
||||
helper.characteristics[
|
||||
CURRENT_HEATER_COOLER_STATE
|
||||
].value = CurrentHeaterCoolerStateValues.IDLE
|
||||
helper.characteristics[
|
||||
TARGET_HEATER_COOLER_STATE
|
||||
].value = TargetHeaterCoolerStateValues.HEAT
|
||||
helper.characteristics[SWING_MODE].value = SwingModeValues.DISABLED
|
||||
|
||||
state = await helper.poll_and_get_state()
|
||||
assert state.state == "heat"
|
||||
assert state.attributes["hvac_action"] == "idle"
|
||||
|
||||
# Simulate that current temperature is below target temp
|
||||
# Heating might be on and hvac_action currently 'heat'
|
||||
helper.characteristics[HEATER_COOLER_TEMPERATURE_CURRENT].value = 19
|
||||
helper.characteristics[
|
||||
CURRENT_HEATER_COOLER_STATE
|
||||
].value = CurrentHeaterCoolerStateValues.HEATING
|
||||
|
||||
state = await helper.poll_and_get_state()
|
||||
assert state.state == "heat"
|
||||
assert state.attributes["hvac_action"] == "heating"
|
||||
|
||||
|
||||
async def test_heater_cooler_change_swing_mode(hass, utcnow):
|
||||
"""Test that we can change the swing mode."""
|
||||
helper = await setup_test_component(hass, create_heater_cooler_service)
|
||||
|
||||
await hass.services.async_call(
|
||||
DOMAIN,
|
||||
SERVICE_SET_SWING_MODE,
|
||||
{"entity_id": "climate.testdevice", "swing_mode": "vertical"},
|
||||
blocking=True,
|
||||
)
|
||||
assert helper.characteristics[SWING_MODE].value == SwingModeValues.ENABLED
|
||||
|
||||
await hass.services.async_call(
|
||||
DOMAIN,
|
||||
SERVICE_SET_SWING_MODE,
|
||||
{"entity_id": "climate.testdevice", "swing_mode": "off"},
|
||||
blocking=True,
|
||||
)
|
||||
assert helper.characteristics[SWING_MODE].value == SwingModeValues.DISABLED
|
||||
|
||||
|
||||
async def test_heater_cooler_turn_off(hass, utcnow):
|
||||
"""Test that both hvac_action and hvac_mode return "off" when turned off."""
|
||||
helper = await setup_test_component(hass, create_heater_cooler_service)
|
||||
# Simulate that the device is turned off but CURRENT_HEATER_COOLER_STATE still returns HEATING/COOLING
|
||||
helper.characteristics[HEATER_COOLER_ACTIVE].value = ActivationStateValues.INACTIVE
|
||||
helper.characteristics[
|
||||
CURRENT_HEATER_COOLER_STATE
|
||||
].value = CurrentHeaterCoolerStateValues.HEATING
|
||||
helper.characteristics[
|
||||
TARGET_HEATER_COOLER_STATE
|
||||
].value = TargetHeaterCoolerStateValues.HEAT
|
||||
state = await helper.poll_and_get_state()
|
||||
assert state.state == "off"
|
||||
assert state.attributes["hvac_action"] == "off"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue