Skip to content

Merge Tasmota sensor device class and icon maps #41706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartinHjelmare merged 2 commits into from
Oct 12, 2020
Merged

Merge Tasmota sensor device class and icon maps #41706

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f017ee
Merge sensor device class and icon maps
emontnemery Oct 12, 2020
e3fcfa4
Use dict instead of tuple
emontnemery Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 47 additions & 45 deletions homeassistant/components/tasmota/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,49 +62,49 @@

_LOGGER = logging.getLogger(__name__)

SENSOR_DEVICE_CLASS_MAP = {
SENSOR_AMBIENT: DEVICE_CLASS_ILLUMINANCE,
SENSOR_APPARENT_POWERUSAGE: DEVICE_CLASS_POWER,
SENSOR_BATTERY: DEVICE_CLASS_BATTERY,
SENSOR_HUMIDITY: DEVICE_CLASS_HUMIDITY,
SENSOR_ILLUMINANCE: DEVICE_CLASS_ILLUMINANCE,
SENSOR_POWERUSAGE: DEVICE_CLASS_POWER,
SENSOR_PRESSURE: DEVICE_CLASS_PRESSURE,
SENSOR_PRESSUREATSEALEVEL: DEVICE_CLASS_PRESSURE,
SENSOR_REACTIVE_POWERUSAGE: DEVICE_CLASS_POWER,
SENSOR_TEMPERATURE: DEVICE_CLASS_TEMPERATURE,
SENSOR_TODAY: DEVICE_CLASS_POWER,
SENSOR_TOTAL: DEVICE_CLASS_POWER,
SENSOR_YESTERDAY: DEVICE_CLASS_POWER,
}

SENSOR_ICON_MAP = {
SENSOR_CCT: "mdi:temperature-kelvin",
SENSOR_CO2: "mdi:molecule-co2",
SENSOR_COLOR_BLUE: "mdi:palette",
SENSOR_COLOR_GREEN: "mdi:palette",
SENSOR_COLOR_RED: "mdi:palette",
SENSOR_CURRENT: "mdi:alpha-a-circle-outline",
SENSOR_DEWPOINT: "mdi:weather-rainy",
SENSOR_DISTANCE: "mdi:leak",
SENSOR_ECO2: "mdi:molecule-co2",
SENSOR_FREQUENCY: "mdi:current-ac",
SENSOR_MOISTURE: "mdi:cup-water",
SENSOR_PB0_3: "mdi:flask",
SENSOR_PB0_5: "mdi:flask",
SENSOR_PB10: "mdi:flask",
SENSOR_PB1: "mdi:flask",
SENSOR_PB2_5: "mdi:flask",
SENSOR_PB5: "mdi:flask",
SENSOR_PM10: "mdi:air-filter",
SENSOR_PM1: "mdi:air-filter",
SENSOR_PM2_5: "mdi:air-filter",
SENSOR_POWERFACTOR: "mdi:alpha-f-circle-outline",
SENSOR_PROXIMITY: "mdi:ruler",
SENSOR_TOTAL_START_TIME: "mdi:progress-clock",
SENSOR_TVOC: "mdi:air-filter",
SENSOR_VOLTAGE: "mdi:alpha-v-circle-outline",
SENSOR_WEIGHT: "mdi:scale",
DEVICE_CLASS = "device_class"
ICON = "icon"

SENSOR_DEVICE_CLASS_ICON_MAP = {
SENSOR_AMBIENT: (DEVICE_CLASS, DEVICE_CLASS_ILLUMINANCE),
Comment thread
MartinHjelmare marked this conversation as resolved.
Outdated
SENSOR_APPARENT_POWERUSAGE: (DEVICE_CLASS, DEVICE_CLASS_POWER),
SENSOR_BATTERY: (DEVICE_CLASS, DEVICE_CLASS_BATTERY),
SENSOR_CCT: (ICON, "mdi:temperature-kelvin"),
SENSOR_CO2: (ICON, "mdi:molecule-co2"),
SENSOR_COLOR_BLUE: (ICON, "mdi:palette"),
SENSOR_COLOR_GREEN: (ICON, "mdi:palette"),
SENSOR_COLOR_RED: (ICON, "mdi:palette"),
SENSOR_CURRENT: (ICON, "mdi:alpha-a-circle-outline"),
SENSOR_DEWPOINT: (ICON, "mdi:weather-rainy"),
SENSOR_DISTANCE: (ICON, "mdi:leak"),
SENSOR_ECO2: (ICON, "mdi:molecule-co2"),
SENSOR_FREQUENCY: (ICON, "mdi:current-ac"),
SENSOR_HUMIDITY: (DEVICE_CLASS, DEVICE_CLASS_HUMIDITY),
SENSOR_ILLUMINANCE: (DEVICE_CLASS, DEVICE_CLASS_ILLUMINANCE),
SENSOR_MOISTURE: (ICON, "mdi:cup-water"),
SENSOR_PB0_3: (ICON, "mdi:flask"),
SENSOR_PB0_5: (ICON, "mdi:flask"),
SENSOR_PB10: (ICON, "mdi:flask"),
SENSOR_PB1: (ICON, "mdi:flask"),
SENSOR_PB2_5: (ICON, "mdi:flask"),
SENSOR_PB5: (ICON, "mdi:flask"),
SENSOR_PM10: (ICON, "mdi:air-filter"),
SENSOR_PM1: (ICON, "mdi:air-filter"),
SENSOR_PM2_5: (ICON, "mdi:air-filter"),
SENSOR_POWERFACTOR: (ICON, "mdi:alpha-f-circle-outline"),
SENSOR_POWERUSAGE: (DEVICE_CLASS, DEVICE_CLASS_POWER),
SENSOR_PRESSURE: (DEVICE_CLASS, DEVICE_CLASS_PRESSURE),
SENSOR_PRESSUREATSEALEVEL: (DEVICE_CLASS, DEVICE_CLASS_PRESSURE),
SENSOR_PROXIMITY: (ICON, "mdi:ruler"),
SENSOR_REACTIVE_POWERUSAGE: (DEVICE_CLASS, DEVICE_CLASS_POWER),
SENSOR_TEMPERATURE: (DEVICE_CLASS, DEVICE_CLASS_TEMPERATURE),
SENSOR_TODAY: (DEVICE_CLASS, DEVICE_CLASS_POWER),
SENSOR_TOTAL: (DEVICE_CLASS, DEVICE_CLASS_POWER),
SENSOR_TOTAL_START_TIME: (ICON, "mdi:progress-clock"),
SENSOR_TVOC: (ICON, "mdi:air-filter"),
SENSOR_VOLTAGE: (ICON, "mdi:alpha-v-circle-outline"),
SENSOR_WEIGHT: (ICON, "mdi:scale"),
SENSOR_YESTERDAY: (DEVICE_CLASS, DEVICE_CLASS_POWER),
}


Expand Down Expand Up @@ -143,12 +143,14 @@ def __init__(self, **kwds):
@property
def device_class(self) -> Optional[str]:
"""Return the device class of the sensor."""
return SENSOR_DEVICE_CLASS_MAP.get(self._tasmota_entity.quantity)
class_or_icon = SENSOR_DEVICE_CLASS_ICON_MAP.get(self._tasmota_entity.quantity)
return class_or_icon[1] if class_or_icon[0] == DEVICE_CLASS else None

@property
def icon(self):
"""Return the icon."""
return SENSOR_ICON_MAP.get(self._tasmota_entity.quantity)
class_or_icon = SENSOR_DEVICE_CLASS_ICON_MAP.get(self._tasmota_entity.quantity)
return class_or_icon[1] if class_or_icon[0] == ICON else None

@property
def state(self):
Expand Down