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

Use new HumidifierDeviceClass enum in generic_hygrostat (#61607)

Browse source 
Co-authored-by: epenet <epenet@users.noreply.github.com>
This commit is contained in:
epenet 2021-12-13 23:16:54 +01:00 • committed by GitHub
parent 85607970cf
commit 6157dfe68b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
homeassistant/components/generic_hygrostat/__init__.py
View file

@ -2,10 +2,7 @@
import voluptuous as vol import voluptuous as vol
from homeassistant.components.humidifier.const import ( from homeassistant.components.humidifier import HumidifierDeviceClass
DEVICE_CLASS_DEHUMIDIFIER,
DEVICE_CLASS_HUMIDIFIER,
)
from homeassistant.const import CONF_NAME from homeassistant.const import CONF_NAME
from homeassistant.helpers import config_validation as cv, discovery from homeassistant.helpers import config_validation as cv, discovery
@ -34,7 +31,7 @@ HYGROSTAT_SCHEMA = vol.Schema(
vol.Required(CONF_HUMIDIFIER): cv.entity_id, vol.Required(CONF_HUMIDIFIER): cv.entity_id,
vol.Required(CONF_SENSOR): cv.entity_id, vol.Required(CONF_SENSOR): cv.entity_id,
vol.Optional(CONF_DEVICE_CLASS): vol.In( vol.Optional(CONF_DEVICE_CLASS): vol.In(
[DEVICE_CLASS_HUMIDIFIER, DEVICE_CLASS_DEHUMIDIFIER] [HumidifierDeviceClass.HUMIDIFIER, HumidifierDeviceClass.DEHUMIDIFIER]
), ),
vol.Optional(CONF_MAX_HUMIDITY): vol.Coerce(int), vol.Optional(CONF_MAX_HUMIDITY): vol.Coerce(int),
vol.Optional(CONF_MIN_DUR): vol.All(cv.time_period, cv.positive_timedelta), vol.Optional(CONF_MIN_DUR): vol.All(cv.time_period, cv.positive_timedelta),

24
homeassistant/components/generic_hygrostat/humidifier.py
View file

@ -2,11 +2,13 @@
import asyncio import asyncio
import logging import logging
from homeassistant.components.humidifier import PLATFORM_SCHEMA, HumidifierEntity from homeassistant.components.humidifier import (
PLATFORM_SCHEMA,
HumidifierDeviceClass,
HumidifierEntity,
)
from homeassistant.components.humidifier.const import ( from homeassistant.components.humidifier.const import (
ATTR_HUMIDITY, ATTR_HUMIDITY,
DEVICE_CLASS_DEHUMIDIFIER,
DEVICE_CLASS_HUMIDIFIER,
MODE_AWAY, MODE_AWAY,
MODE_NORMAL, MODE_NORMAL,
SUPPORT_MODES, SUPPORT_MODES,
@ -146,7 +148,7 @@ class GenericHygrostat(HumidifierEntity, RestoreEntity):
self._remove_stale_tracking = None self._remove_stale_tracking = None
self._is_away = False self._is_away = False
if not self._device_class: if not self._device_class:
self._device_class = DEVICE_CLASS_HUMIDIFIER self._device_class = HumidifierDeviceClass.HUMIDIFIER
async def async_added_to_hass(self): async def async_added_to_hass(self):
"""Run when entity about to be added.""" """Run when entity about to be added."""
@ -185,7 +187,7 @@ class GenericHygrostat(HumidifierEntity, RestoreEntity):
if old_state.state: if old_state.state:
self._state = old_state.state == STATE_ON self._state = old_state.state == STATE_ON
if self._target_humidity is None: if self._target_humidity is None:
if self._device_class == DEVICE_CLASS_HUMIDIFIER: if self._device_class == HumidifierDeviceClass.HUMIDIFIER:
self._target_humidity = self.min_humidity self._target_humidity = self.min_humidity
else: else:
self._target_humidity = self.max_humidity self._target_humidity = self.max_humidity
@ -396,8 +398,10 @@ class GenericHygrostat(HumidifierEntity, RestoreEntity):
too_dry = self._target_humidity - self._cur_humidity >= dry_tolerance too_dry = self._target_humidity - self._cur_humidity >= dry_tolerance
too_wet = self._cur_humidity - self._target_humidity >= wet_tolerance too_wet = self._cur_humidity - self._target_humidity >= wet_tolerance
if self._is_device_active: if self._is_device_active:
if (self._device_class == DEVICE_CLASS_HUMIDIFIER and too_wet) or ( if (
self._device_class == DEVICE_CLASS_DEHUMIDIFIER and too_dry self._device_class == HumidifierDeviceClass.HUMIDIFIER and too_wet
) or (
self._device_class == HumidifierDeviceClass.DEHUMIDIFIER and too_dry
): ):
_LOGGER.info("Turning off humidifier %s", self._switch_entity_id) _LOGGER.info("Turning off humidifier %s", self._switch_entity_id)
await self._async_device_turn_off() await self._async_device_turn_off()
@ -405,8 +409,10 @@ class GenericHygrostat(HumidifierEntity, RestoreEntity):
# The time argument is passed only in keep-alive case # The time argument is passed only in keep-alive case
await self._async_device_turn_on() await self._async_device_turn_on()
else: else:
if (self._device_class == DEVICE_CLASS_HUMIDIFIER and too_dry) or ( if (
self._device_class == DEVICE_CLASS_DEHUMIDIFIER and too_wet self._device_class == HumidifierDeviceClass.HUMIDIFIER and too_dry
) or (
self._device_class == HumidifierDeviceClass.DEHUMIDIFIER and too_wet
): ):
_LOGGER.info("Turning on humidifier %s", self._switch_entity_id) _LOGGER.info("Turning on humidifier %s", self._switch_entity_id)
await self._async_device_turn_on() await self._async_device_turn_on()