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

Use new enums in mqtt (#61936)

Browse source 
* Use new enums in mqtt

* Fix typo
This commit is contained in:
epenet 2021-12-16 15:09:31 +01:00 • committed by GitHub
parent ff654a9753
commit 079b7f217f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
homeassistant/components/mqtt/humidifier.py
View file

@ -10,9 +10,8 @@ from homeassistant.components.humidifier import (
ATTR_MODE, ATTR_MODE,
DEFAULT_MAX_HUMIDITY, DEFAULT_MAX_HUMIDITY,
DEFAULT_MIN_HUMIDITY, DEFAULT_MIN_HUMIDITY,
DEVICE_CLASS_DEHUMIDIFIER,
DEVICE_CLASS_HUMIDIFIER,
SUPPORT_MODES, SUPPORT_MODES,
HumidifierDeviceClass,
HumidifierEntity, HumidifierEntity,
) )
from homeassistant.const import ( from homeassistant.const import (
@ -96,8 +95,10 @@ _PLATFORM_SCHEMA_BASE = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend(
CONF_MODE_COMMAND_TOPIC, "available_modes" CONF_MODE_COMMAND_TOPIC, "available_modes"
): mqtt.valid_publish_topic, ): mqtt.valid_publish_topic,
vol.Optional(CONF_COMMAND_TEMPLATE): cv.template, vol.Optional(CONF_COMMAND_TEMPLATE): cv.template,
vol.Optional(CONF_DEVICE_CLASS, default=DEVICE_CLASS_HUMIDIFIER): vol.In( vol.Optional(
[DEVICE_CLASS_HUMIDIFIER, DEVICE_CLASS_DEHUMIDIFIER] CONF_DEVICE_CLASS, default=HumidifierDeviceClass.HUMIDIFIER
): vol.In(
[HumidifierDeviceClass.HUMIDIFIER, HumidifierDeviceClass.DEHUMIDIFIER]
), ),
vol.Optional(CONF_MODE_COMMAND_TEMPLATE): cv.template, vol.Optional(CONF_MODE_COMMAND_TEMPLATE): cv.template,
vol.Optional(CONF_MODE_STATE_TOPIC): mqtt.valid_subscribe_topic, vol.Optional(CONF_MODE_STATE_TOPIC): mqtt.valid_subscribe_topic,

9
homeassistant/components/mqtt/sensor.py
View file

@ -13,6 +13,7 @@ from homeassistant.components.sensor import (
DEVICE_CLASSES_SCHEMA, DEVICE_CLASSES_SCHEMA,
ENTITY_ID_FORMAT, ENTITY_ID_FORMAT,
STATE_CLASSES_SCHEMA, STATE_CLASSES_SCHEMA,
SensorDeviceClass,
SensorEntity, SensorEntity,
) )
from homeassistant.const import ( from homeassistant.const import (
@ -21,8 +22,6 @@ from homeassistant.const import (
CONF_NAME, CONF_NAME,
CONF_UNIT_OF_MEASUREMENT, CONF_UNIT_OF_MEASUREMENT,
CONF_VALUE_TEMPLATE, CONF_VALUE_TEMPLATE,
DEVICE_CLASS_DATE,
DEVICE_CLASS_TIMESTAMP,
) )
from homeassistant.core import HomeAssistant, callback from homeassistant.core import HomeAssistant, callback
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
@ -200,14 +199,14 @@ class MqttSensor(MqttEntity, SensorEntity):
) )
if payload is not None and self.device_class in ( if payload is not None and self.device_class in (
DEVICE_CLASS_DATE, SensorDeviceClass.DATE,
DEVICE_CLASS_TIMESTAMP, SensorDeviceClass.TIMESTAMP,
): ):
if (payload := dt_util.parse_datetime(payload)) is None: if (payload := dt_util.parse_datetime(payload)) is None:
_LOGGER.warning( _LOGGER.warning(
"Invalid state message '%s' from '%s'", msg.payload, msg.topic "Invalid state message '%s' from '%s'", msg.payload, msg.topic
) )
elif self.device_class == DEVICE_CLASS_DATE: elif self.device_class == SensorDeviceClass.DATE:
payload = payload.date() payload = payload.date()
self._state = payload self._state = payload