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

Use pydeconz interface controls for climate platform (#73670)

Browse Source 
* Use pydeconz interface controls for climate

* Bump pydeconz to make use of enums in more places
This commit is contained in:
Robert Svensson 2022-06-20 12:04:12 +02:00 committed by GitHub
parent edeb5b9286
commit 474e0fd6d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
homeassistant/components/deconz/climate.py
View File

@ -5,25 +5,10 @@ from typing import Any
from pydeconz.models.event import EventType
from pydeconz.models.sensor.thermostat import (
THERMOSTAT_FAN_MODE_AUTO,
THERMOSTAT_FAN_MODE_HIGH,
THERMOSTAT_FAN_MODE_LOW,
THERMOSTAT_FAN_MODE_MEDIUM,
THERMOSTAT_FAN_MODE_OFF,
THERMOSTAT_FAN_MODE_ON,
THERMOSTAT_FAN_MODE_SMART,
THERMOSTAT_MODE_AUTO,
THERMOSTAT_MODE_COOL,
THERMOSTAT_MODE_HEAT,
THERMOSTAT_MODE_OFF,
THERMOSTAT_PRESET_AUTO,
THERMOSTAT_PRESET_BOOST,
THERMOSTAT_PRESET_COMFORT,
THERMOSTAT_PRESET_COMPLEX,
THERMOSTAT_PRESET_ECO,
THERMOSTAT_PRESET_HOLIDAY,
THERMOSTAT_PRESET_MANUAL,
Thermostat,
ThermostatFanMode,
ThermostatMode,
ThermostatPreset,
)
from homeassistant.components.climate import DOMAIN, ClimateEntity
@ -53,21 +38,21 @@ from .gateway import DeconzGateway, get_gateway_from_config_entry
DECONZ_FAN_SMART = "smart"
FAN_MODE_TO_DECONZ = {
DECONZ_FAN_SMART: THERMOSTAT_FAN_MODE_SMART,
FAN_AUTO: THERMOSTAT_FAN_MODE_AUTO,
FAN_HIGH: THERMOSTAT_FAN_MODE_HIGH,
FAN_MEDIUM: THERMOSTAT_FAN_MODE_MEDIUM,
FAN_LOW: THERMOSTAT_FAN_MODE_LOW,
FAN_ON: THERMOSTAT_FAN_MODE_ON,
FAN_OFF: THERMOSTAT_FAN_MODE_OFF,
DECONZ_FAN_SMART: ThermostatFanMode.SMART,
FAN_AUTO: ThermostatFanMode.AUTO,
FAN_HIGH: ThermostatFanMode.HIGH,
FAN_MEDIUM: ThermostatFanMode.MEDIUM,
FAN_LOW: ThermostatFanMode.LOW,
FAN_ON: ThermostatFanMode.ON,
FAN_OFF: ThermostatFanMode.OFF,
}
DECONZ_TO_FAN_MODE = {value: key for key, value in FAN_MODE_TO_DECONZ.items()}
HVAC_MODE_TO_DECONZ: dict[HVACMode, str] = {
HVACMode.AUTO: THERMOSTAT_MODE_AUTO,
HVACMode.COOL: THERMOSTAT_MODE_COOL,
HVACMode.HEAT: THERMOSTAT_MODE_HEAT,
HVACMode.OFF: THERMOSTAT_MODE_OFF,
HVAC_MODE_TO_DECONZ = {
HVACMode.AUTO: ThermostatMode.AUTO,
HVACMode.COOL: ThermostatMode.COOL,
HVACMode.HEAT: ThermostatMode.HEAT,
HVACMode.OFF: ThermostatMode.OFF,
}
DECONZ_PRESET_AUTO = "auto"
@ -76,13 +61,13 @@ DECONZ_PRESET_HOLIDAY = "holiday"
DECONZ_PRESET_MANUAL = "manual"
PRESET_MODE_TO_DECONZ = {
DECONZ_PRESET_AUTO: THERMOSTAT_PRESET_AUTO,
PRESET_BOOST: THERMOSTAT_PRESET_BOOST,
PRESET_COMFORT: THERMOSTAT_PRESET_COMFORT,
DECONZ_PRESET_COMPLEX: THERMOSTAT_PRESET_COMPLEX,
PRESET_ECO: THERMOSTAT_PRESET_ECO,
DECONZ_PRESET_HOLIDAY: THERMOSTAT_PRESET_HOLIDAY,
DECONZ_PRESET_MANUAL: THERMOSTAT_PRESET_MANUAL,
DECONZ_PRESET_AUTO: ThermostatPreset.AUTO,
PRESET_BOOST: ThermostatPreset.BOOST,
PRESET_COMFORT: ThermostatPreset.COMFORT,
DECONZ_PRESET_COMPLEX: ThermostatPreset.COMPLEX,
PRESET_ECO: ThermostatPreset.ECO,
DECONZ_PRESET_HOLIDAY: ThermostatPreset.HOLIDAY,
DECONZ_PRESET_MANUAL: ThermostatPreset.MANUAL,
}
DECONZ_TO_PRESET_MODE = {value: key for key, value in PRESET_MODE_TO_DECONZ.items()}
@ -168,23 +153,23 @@ class DeconzThermostat(DeconzDevice, ClimateEntity):
"""Return fan operation."""
if self._device.fan_mode in DECONZ_TO_FAN_MODE:
return DECONZ_TO_FAN_MODE[self._device.fan_mode]
return DECONZ_TO_FAN_MODE[FAN_ON if self._device.state_on else FAN_OFF]
return FAN_ON if self._device.state_on else FAN_OFF
async def async_set_fan_mode(self, fan_mode: str) -> None:
"""Set new target fan mode."""
if fan_mode not in FAN_MODE_TO_DECONZ:
raise ValueError(f"Unsupported fan mode {fan_mode}")
await self._device.set_config(fan_mode=FAN_MODE_TO_DECONZ[fan_mode])
await self.gateway.api.sensors.thermostat.set_config(
id=self._device.resource_id,
fan_mode=FAN_MODE_TO_DECONZ[fan_mode],
)
# HVAC control
@property
def hvac_mode(self) -> HVACMode:
"""Return hvac operation ie. heat, cool mode.
Need to be one of HVAC_MODE_*.
"""
"""Return hvac operation ie. heat, cool mode."""
if self._device.mode in self._deconz_to_hvac_mode:
return self._deconz_to_hvac_mode[self._device.mode]
return HVACMode.HEAT if self._device.state_on else HVACMode.OFF
@ -195,9 +180,15 @@ class DeconzThermostat(DeconzDevice, ClimateEntity):
raise ValueError(f"Unsupported HVAC mode {hvac_mode}")
if len(self._attr_hvac_modes) == 2: # Only allow turn on and off thermostat
await self._device.set_config(on=hvac_mode != HVACMode.OFF)
await self.gateway.api.sensors.thermostat.set_config(
id=self._device.resource_id,
on=hvac_mode != HVACMode.OFF,
)
else:
await self._device.set_config(mode=HVAC_MODE_TO_DECONZ[hvac_mode])
await self.gateway.api.sensors.thermostat.set_config(
id=self._device.resource_id,
mode=HVAC_MODE_TO_DECONZ[hvac_mode],
)
# Preset control
@ -213,7 +204,10 @@ class DeconzThermostat(DeconzDevice, ClimateEntity):
if preset_mode not in PRESET_MODE_TO_DECONZ:
raise ValueError(f"Unsupported preset mode {preset_mode}")
await self._device.set_config(preset=PRESET_MODE_TO_DECONZ[preset_mode])
await self.gateway.api.sensors.thermostat.set_config(
id=self._device.resource_id,
preset=PRESET_MODE_TO_DECONZ[preset_mode],
)
# Temperature control
@ -225,11 +219,11 @@ class DeconzThermostat(DeconzDevice, ClimateEntity):
@property
def target_temperature(self) -> float | None:
"""Return the target temperature."""
if self._device.mode == THERMOSTAT_MODE_COOL and self._device.cooling_setpoint:
return self._device.cooling_setpoint
if self._device.mode == ThermostatMode.COOL and self._device.cooling_setpoint:
return self._device.scaled_cooling_setpoint
if self._device.heating_setpoint:
return self._device.heating_setpoint
return self._device.scaled_heating_setpoint
return None
@ -238,11 +232,16 @@ class DeconzThermostat(DeconzDevice, ClimateEntity):
if ATTR_TEMPERATURE not in kwargs:
raise ValueError(f"Expected attribute {ATTR_TEMPERATURE}")
data = {"heating_setpoint": kwargs[ATTR_TEMPERATURE] * 100}
if self._device.mode == "cool":
data = {"cooling_setpoint": kwargs[ATTR_TEMPERATURE] * 100}
await self._device.set_config(**data)
if self._device.mode == ThermostatMode.COOL:
await self.gateway.api.sensors.thermostat.set_config(
id=self._device.resource_id,
cooling_setpoint=kwargs[ATTR_TEMPERATURE] * 100,
)
else:
await self.gateway.api.sensors.thermostat.set_config(
id=self._device.resource_id,
heating_setpoint=kwargs[ATTR_TEMPERATURE] * 100,
)
@property
def extra_state_attributes(self) -> dict[str, bool | int]:

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

@ -3,7 +3,7 @@
"name": "deCONZ",
"config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/deconz",
"requirements": ["pydeconz==92"],
"requirements": ["pydeconz==93"],
"ssdp": [
{
"manufacturer": "Royal Philips Electronics",

2
requirements_all.txt
View File

@ -1441,7 +1441,7 @@ pydaikin==2.7.0
pydanfossair==0.1.0
# homeassistant.components.deconz
pydeconz==92
pydeconz==93
# homeassistant.components.delijn
pydelijn==1.0.0

2
requirements_test_all.txt
View File

@ -968,7 +968,7 @@ pycoolmasternet-async==0.1.2
pydaikin==2.7.0
# homeassistant.components.deconz
pydeconz==92
pydeconz==93
# homeassistant.components.dexcom
pydexcom==0.2.3