Set device_class on additional temperature sensors (#52960)

* Set device_class on additional temperature sensors

* Apply suggestions from code review

Co-authored-by: Tobias Sauerwein <cgtobi@users.noreply.github.com>

* Set device class for greeneye_monitor sensor

* Set device class for bme280 and bme680 sensor

Co-authored-by: Tobias Sauerwein <cgtobi@users.noreply.github.com>
This commit is contained in:
Erik Montnemery 2021-07-13 14:20:47 +02:00 committed by GitHub
parent 96f6e0e4a4
commit e563dc0d7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 74 additions and 25 deletions

View File

@ -12,6 +12,9 @@ from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity
from homeassistant.const import ( from homeassistant.const import (
CONF_MONITORED_CONDITIONS, CONF_MONITORED_CONDITIONS,
CONF_NAME, CONF_NAME,
DEVICE_CLASS_HUMIDITY,
DEVICE_CLASS_PRESSURE,
DEVICE_CLASS_TEMPERATURE,
PERCENTAGE, PERCENTAGE,
TEMP_FAHRENHEIT, TEMP_FAHRENHEIT,
) )
@ -48,9 +51,9 @@ SENSOR_TEMP = "temperature"
SENSOR_HUMID = "humidity" SENSOR_HUMID = "humidity"
SENSOR_PRESS = "pressure" SENSOR_PRESS = "pressure"
SENSOR_TYPES = { SENSOR_TYPES = {
SENSOR_TEMP: ["Temperature", None], SENSOR_TEMP: ["Temperature", None, DEVICE_CLASS_TEMPERATURE],
SENSOR_HUMID: ["Humidity", PERCENTAGE], SENSOR_HUMID: ["Humidity", PERCENTAGE, DEVICE_CLASS_HUMIDITY],
SENSOR_PRESS: ["Pressure", "mb"], SENSOR_PRESS: ["Pressure", "mb", DEVICE_CLASS_PRESSURE],
} }
DEFAULT_MONITORED = [SENSOR_TEMP, SENSOR_HUMID, SENSOR_PRESS] DEFAULT_MONITORED = [SENSOR_TEMP, SENSOR_HUMID, SENSOR_PRESS]
@ -146,6 +149,7 @@ class BME280Sensor(SensorEntity):
self.type = sensor_type self.type = sensor_type
self._state = None self._state = None
self._unit_of_measurement = SENSOR_TYPES[sensor_type][1] self._unit_of_measurement = SENSOR_TYPES[sensor_type][1]
self._attr_device_class = SENSOR_TYPES[sensor_type][2]
@property @property
def name(self): def name(self):

View File

@ -11,6 +11,9 @@ from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity
from homeassistant.const import ( from homeassistant.const import (
CONF_MONITORED_CONDITIONS, CONF_MONITORED_CONDITIONS,
CONF_NAME, CONF_NAME,
DEVICE_CLASS_HUMIDITY,
DEVICE_CLASS_PRESSURE,
DEVICE_CLASS_TEMPERATURE,
PERCENTAGE, PERCENTAGE,
TEMP_FAHRENHEIT, TEMP_FAHRENHEIT,
) )
@ -53,11 +56,11 @@ SENSOR_PRESS = "pressure"
SENSOR_GAS = "gas" SENSOR_GAS = "gas"
SENSOR_AQ = "airquality" SENSOR_AQ = "airquality"
SENSOR_TYPES = { SENSOR_TYPES = {
SENSOR_TEMP: ["Temperature", None], SENSOR_TEMP: ["Temperature", None, DEVICE_CLASS_TEMPERATURE],
SENSOR_HUMID: ["Humidity", PERCENTAGE], SENSOR_HUMID: ["Humidity", PERCENTAGE, DEVICE_CLASS_HUMIDITY],
SENSOR_PRESS: ["Pressure", "mb"], SENSOR_PRESS: ["Pressure", "mb", DEVICE_CLASS_PRESSURE],
SENSOR_GAS: ["Gas Resistance", "Ohms"], SENSOR_GAS: ["Gas Resistance", "Ohms", None],
SENSOR_AQ: ["Air Quality", PERCENTAGE], SENSOR_AQ: ["Air Quality", PERCENTAGE, None],
} }
DEFAULT_MONITORED = [SENSOR_TEMP, SENSOR_HUMID, SENSOR_PRESS, SENSOR_AQ] DEFAULT_MONITORED = [SENSOR_TEMP, SENSOR_HUMID, SENSOR_PRESS, SENSOR_AQ]
OVERSAMPLING_VALUES = {0, 1, 2, 4, 8, 16} OVERSAMPLING_VALUES = {0, 1, 2, 4, 8, 16}
@ -327,6 +330,7 @@ class BME680Sensor(SensorEntity):
self.type = sensor_type self.type = sensor_type
self._state = None self._state = None
self._unit_of_measurement = SENSOR_TYPES[sensor_type][1] self._unit_of_measurement = SENSOR_TYPES[sensor_type][1]
self._attr_device_class = SENSOR_TYPES[sensor_type][2]
@property @property
def name(self): def name(self):

View File

@ -12,6 +12,8 @@ from homeassistant.const import (
CONF_MONITORED_CONDITIONS, CONF_MONITORED_CONDITIONS,
CONF_NAME, CONF_NAME,
CONF_PIN, CONF_PIN,
DEVICE_CLASS_HUMIDITY,
DEVICE_CLASS_TEMPERATURE,
PERCENTAGE, PERCENTAGE,
TEMP_FAHRENHEIT, TEMP_FAHRENHEIT,
) )
@ -33,8 +35,8 @@ MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=30)
SENSOR_TEMPERATURE = "temperature" SENSOR_TEMPERATURE = "temperature"
SENSOR_HUMIDITY = "humidity" SENSOR_HUMIDITY = "humidity"
SENSOR_TYPES = { SENSOR_TYPES = {
SENSOR_TEMPERATURE: ["Temperature", None], SENSOR_TEMPERATURE: ["Temperature", None, DEVICE_CLASS_TEMPERATURE],
SENSOR_HUMIDITY: ["Humidity", PERCENTAGE], SENSOR_HUMIDITY: ["Humidity", PERCENTAGE, DEVICE_CLASS_HUMIDITY],
} }
@ -124,6 +126,7 @@ class DHTSensor(SensorEntity):
self.humidity_offset = humidity_offset self.humidity_offset = humidity_offset
self._state = None self._state = None
self._unit_of_measurement = SENSOR_TYPES[sensor_type][1] self._unit_of_measurement = SENSOR_TYPES[sensor_type][1]
self._attr_device_class = SENSOR_TYPES[sensor_type][2]
@property @property
def name(self): def name(self):

View File

@ -12,8 +12,8 @@ from homeassistant.const import (
from .const import DOMAIN, ECOBEE_MODEL_TO_NAME, MANUFACTURER from .const import DOMAIN, ECOBEE_MODEL_TO_NAME, MANUFACTURER
SENSOR_TYPES = { SENSOR_TYPES = {
"temperature": ["Temperature", TEMP_FAHRENHEIT], "temperature": ["Temperature", TEMP_FAHRENHEIT, DEVICE_CLASS_TEMPERATURE],
"humidity": ["Humidity", PERCENTAGE], "humidity": ["Humidity", PERCENTAGE, DEVICE_CLASS_HUMIDITY],
} }
@ -44,6 +44,7 @@ class EcobeeSensor(SensorEntity):
self.index = sensor_index self.index = sensor_index
self._state = None self._state = None
self._unit_of_measurement = SENSOR_TYPES[sensor_type][1] self._unit_of_measurement = SENSOR_TYPES[sensor_type][1]
self._attr_device_class = SENSOR_TYPES[sensor_type][2]
@property @property
def name(self): def name(self):

View File

@ -4,6 +4,7 @@ from homeassistant.const import (
CONF_NAME, CONF_NAME,
CONF_SENSOR_TYPE, CONF_SENSOR_TYPE,
CONF_TEMPERATURE_UNIT, CONF_TEMPERATURE_UNIT,
DEVICE_CLASS_TEMPERATURE,
POWER_WATT, POWER_WATT,
TIME_HOURS, TIME_HOURS,
TIME_MINUTES, TIME_MINUTES,
@ -240,6 +241,7 @@ class PulseCounter(GEMSensor):
class TemperatureSensor(GEMSensor): class TemperatureSensor(GEMSensor):
"""Entity showing temperature from one temperature sensor.""" """Entity showing temperature from one temperature sensor."""
_attr_device_class = DEVICE_CLASS_TEMPERATURE
_attr_icon = TEMPERATURE_ICON _attr_icon = TEMPERATURE_ICON
def __init__(self, monitor_serial_number, number, name, unit): def __init__(self, monitor_serial_number, number, name, unit):

View File

@ -8,7 +8,13 @@ import smbus
import voluptuous as vol import voluptuous as vol
from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity
from homeassistant.const import CONF_NAME, PERCENTAGE, TEMP_FAHRENHEIT from homeassistant.const import (
CONF_NAME,
DEVICE_CLASS_HUMIDITY,
DEVICE_CLASS_TEMPERATURE,
PERCENTAGE,
TEMP_FAHRENHEIT,
)
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.util import Throttle from homeassistant.util import Throttle
from homeassistant.util.temperature import celsius_to_fahrenheit from homeassistant.util.temperature import celsius_to_fahrenheit
@ -32,6 +38,11 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
} }
) )
DEVICE_CLASS_MAP = {
SENSOR_TEMPERATURE: DEVICE_CLASS_TEMPERATURE,
SENSOR_HUMIDITY: DEVICE_CLASS_HUMIDITY,
}
async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
"""Set up the HTU21D sensor.""" """Set up the HTU21D sensor."""
@ -79,6 +90,7 @@ class HTU21DSensor(SensorEntity):
self._unit_of_measurement = unit self._unit_of_measurement = unit
self._client = htu21d_client self._client = htu21d_client
self._state = None self._state = None
self._attr_device_class = DEVICE_CLASS_MAP[variable]
@property @property
def name(self) -> str: def name(self) -> str:

View File

@ -11,6 +11,8 @@ from homeassistant.const import (
CONCENTRATION_PARTS_PER_MILLION, CONCENTRATION_PARTS_PER_MILLION,
CONF_MONITORED_CONDITIONS, CONF_MONITORED_CONDITIONS,
CONF_NAME, CONF_NAME,
DEVICE_CLASS_CO2,
DEVICE_CLASS_TEMPERATURE,
TEMP_FAHRENHEIT, TEMP_FAHRENHEIT,
) )
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
@ -29,8 +31,8 @@ ATTR_CO2_CONCENTRATION = "co2_concentration"
SENSOR_TEMPERATURE = "temperature" SENSOR_TEMPERATURE = "temperature"
SENSOR_CO2 = "co2" SENSOR_CO2 = "co2"
SENSOR_TYPES = { SENSOR_TYPES = {
SENSOR_TEMPERATURE: ["Temperature", None], SENSOR_TEMPERATURE: ["Temperature", None, DEVICE_CLASS_TEMPERATURE],
SENSOR_CO2: ["CO2", CONCENTRATION_PARTS_PER_MILLION], SENSOR_CO2: ["CO2", CONCENTRATION_PARTS_PER_MILLION, DEVICE_CLASS_CO2],
} }
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
{ {
@ -80,6 +82,7 @@ class MHZ19Sensor(SensorEntity):
self._unit_of_measurement = SENSOR_TYPES[sensor_type][1] self._unit_of_measurement = SENSOR_TYPES[sensor_type][1]
self._ppm = None self._ppm = None
self._temperature = None self._temperature = None
self._attr_device_class = SENSOR_TYPES[sensor_type][2]
@property @property
def name(self): def name(self):

View File

@ -115,14 +115,12 @@ class MySensorsSensor(mysensors.device.MySensorsEntity, SensorEntity):
@property @property
def device_class(self) -> str | None: def device_class(self) -> str | None:
"""Return the device class of this entity.""" """Return the device class of this entity."""
icon = self._get_sensor_type()[2] return self._get_sensor_type()[2]
return icon
@property @property
def icon(self) -> str | None: def icon(self) -> str | None:
"""Return the icon to use in the frontend, if any.""" """Return the icon to use in the frontend, if any."""
icon = self._get_sensor_type()[1] return self._get_sensor_type()[1]
return icon
@property @property
def unit_of_measurement(self) -> str | None: def unit_of_measurement(self) -> str | None:

View File

@ -8,6 +8,7 @@ from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity
from homeassistant.const import ( from homeassistant.const import (
CONF_NAME, CONF_NAME,
CONF_OFFSET, CONF_OFFSET,
DEVICE_CLASS_TEMPERATURE,
DEVICE_DEFAULT_NAME, DEVICE_DEFAULT_NAME,
TEMP_FAHRENHEIT, TEMP_FAHRENHEIT,
) )
@ -68,6 +69,7 @@ class TemperSensor(SensorEntity):
self.current_value = None self.current_value = None
self._name = name self._name = name
self.set_temper_device(temper_device) self.set_temper_device(temper_device)
self._attr_device_class = DEVICE_CLASS_TEMPERATURE
@property @property
def name(self): def name(self):

View File

@ -18,6 +18,7 @@ from homeassistant.const import (
CONF_EXCLUDE, CONF_EXCLUDE,
CONF_MONITORED_CONDITIONS, CONF_MONITORED_CONDITIONS,
CONF_PASSWORD, CONF_PASSWORD,
DEVICE_CLASS_TEMPERATURE,
TEMP_FAHRENHEIT, TEMP_FAHRENHEIT,
) )
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
@ -105,6 +106,7 @@ class ThermoworksSmokeSensor(SensorEntity):
self._unique_id = f"{serial}-{sensor_type}" self._unique_id = f"{serial}-{sensor_type}"
self.serial = serial self.serial = serial
self.mgr = mgr self.mgr = mgr
self._attr_device_class = DEVICE_CLASS_TEMPERATURE
self.update_unit() self.update_unit()
@property @property

View File

@ -1,7 +1,12 @@
"""Support for Waterfurnace.""" """Support for Waterfurnace."""
from homeassistant.components.sensor import ENTITY_ID_FORMAT, SensorEntity from homeassistant.components.sensor import ENTITY_ID_FORMAT, SensorEntity
from homeassistant.const import PERCENTAGE, POWER_WATT, TEMP_FAHRENHEIT from homeassistant.const import (
DEVICE_CLASS_TEMPERATURE,
PERCENTAGE,
POWER_WATT,
TEMP_FAHRENHEIT,
)
from homeassistant.core import callback from homeassistant.core import callback
from homeassistant.util import slugify from homeassistant.util import slugify
@ -12,9 +17,15 @@ class WFSensorConfig:
"""Water Furnace Sensor configuration.""" """Water Furnace Sensor configuration."""
def __init__( def __init__(
self, friendly_name, field, icon="mdi:gauge", unit_of_measurement=None self,
friendly_name,
field,
icon="mdi:gauge",
unit_of_measurement=None,
device_class=None,
): ):
"""Initialize configuration.""" """Initialize configuration."""
self.device_class = device_class
self.friendly_name = friendly_name self.friendly_name = friendly_name
self.field = field self.field = field
self.icon = icon self.icon = icon
@ -25,13 +36,19 @@ SENSORS = [
WFSensorConfig("Furnace Mode", "mode"), WFSensorConfig("Furnace Mode", "mode"),
WFSensorConfig("Total Power", "totalunitpower", "mdi:flash", POWER_WATT), WFSensorConfig("Total Power", "totalunitpower", "mdi:flash", POWER_WATT),
WFSensorConfig( WFSensorConfig(
"Active Setpoint", "tstatactivesetpoint", "mdi:thermometer", TEMP_FAHRENHEIT "Active Setpoint",
"tstatactivesetpoint",
None,
TEMP_FAHRENHEIT,
DEVICE_CLASS_TEMPERATURE,
), ),
WFSensorConfig("Leaving Air", "leavingairtemp", "mdi:thermometer", TEMP_FAHRENHEIT),
WFSensorConfig("Room Temp", "tstatroomtemp", "mdi:thermometer", TEMP_FAHRENHEIT),
WFSensorConfig( WFSensorConfig(
"Loop Temp", "enteringwatertemp", "mdi:thermometer", TEMP_FAHRENHEIT "Leaving Air", "leavingairtemp", None, TEMP_FAHRENHEIT, DEVICE_CLASS_TEMPERATURE
), ),
WFSensorConfig(
"Room Temp", "tstatroomtemp", None, TEMP_FAHRENHEIT, DEVICE_CLASS_TEMPERATURE
),
WFSensorConfig("Loop Temp", "enteringwatertemp", None, TEMP_FAHRENHEIT),
WFSensorConfig( WFSensorConfig(
"Humidity Set Point", "tstathumidsetpoint", "mdi:water-percent", PERCENTAGE "Humidity Set Point", "tstathumidsetpoint", "mdi:water-percent", PERCENTAGE
), ),
@ -71,6 +88,7 @@ class WaterFurnaceSensor(SensorEntity):
self._state = None self._state = None
self._icon = config.icon self._icon = config.icon
self._unit_of_measurement = config.unit_of_measurement self._unit_of_measurement = config.unit_of_measurement
self._attr_device_class = config.device_class
# This ensures that the sensors are isolated per waterfurnace unit # This ensures that the sensors are isolated per waterfurnace unit
self.entity_id = ENTITY_ID_FORMAT.format( self.entity_id = ENTITY_ID_FORMAT.format(