Multiple tag managers for Wireless Sensor Tags. (#16353)

* Added support for multiple tag managers. Fixed typo for signal strength.

* Corrected broken merge.

* Fixed flake8/pylint error.

* Improved docstring.
This commit is contained in:
Sergiy Maysak authored and Paulus Schoutsen committed 2018-09-13 09:48:17 +02:00
1 parent f43d9ba680
commit f63dba5521
5 files changed
+117 -239

No files matched your search

+16 -67
View File
@@ -15,13 +15,9 @@ from homeassistant.const import (
CONF_MONITORED_CONDITIONS)
from homeassistant.components.wirelesstag import (
DOMAIN as WIRELESSTAG_DOMAIN,
WIRELESSTAG_TYPE_13BIT, WIRELESSTAG_TYPE_WATER,
WIRELESSTAG_TYPE_ALSPRO,
WIRELESSTAG_TYPE_WEMO_DEVICE,
SIGNAL_TAG_UPDATE,
WirelessTagBaseSensor)
import homeassistant.helpers.config_validation as cv
from homeassistant.const import TEMP_CELSIUS
DEPENDENCIES = ['wirelesstag']
@@ -32,24 +28,12 @@ SENSOR_HUMIDITY = 'humidity'
SENSOR_MOISTURE = 'moisture'
SENSOR_LIGHT = 'light'
SENSOR_TYPES = {
SENSOR_TEMPERATURE: {
'unit': TEMP_CELSIUS,
'attr': 'temperature'
},
SENSOR_HUMIDITY: {
'unit': '%',
'attr': 'humidity'
},
SENSOR_MOISTURE: {
'unit': '%',
'attr': 'moisture'
},
SENSOR_LIGHT: {
'unit': 'lux',
'attr': 'light'
}
}
SENSOR_TYPES = [
SENSOR_TEMPERATURE,
SENSOR_HUMIDITY,
SENSOR_MOISTURE,
SENSOR_LIGHT
]
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Required(CONF_MONITORED_CONDITIONS, default=[]):
@@ -64,7 +48,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
tags = platform.tags
for tag in tags.values():
for sensor_type in config.get(CONF_MONITORED_CONDITIONS):
if sensor_type in WirelessTagSensor.allowed_sensors(tag):
if sensor_type in tag.allowed_sensor_types:
sensors.append(WirelessTagSensor(
platform, tag, sensor_type, hass.config))
@@ -74,36 +58,11 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
class WirelessTagSensor(WirelessTagBaseSensor):
"""Representation of a Sensor."""
@classmethod
def allowed_sensors(cls, tag):
"""Return array of allowed sensor types for tag."""
all_sensors = SENSOR_TYPES.keys()
sensors_per_tag_type = {
WIRELESSTAG_TYPE_13BIT: [
SENSOR_TEMPERATURE,
SENSOR_HUMIDITY],
WIRELESSTAG_TYPE_WATER: [
SENSOR_TEMPERATURE,
SENSOR_MOISTURE],
WIRELESSTAG_TYPE_ALSPRO: [
SENSOR_TEMPERATURE,
SENSOR_HUMIDITY,
SENSOR_LIGHT],
WIRELESSTAG_TYPE_WEMO_DEVICE: []
}
tag_type = tag.tag_type
return (
sensors_per_tag_type[tag_type] if tag_type in sensors_per_tag_type
else all_sensors)
def __init__(self, api, tag, sensor_type, config):
"""Initialize a WirelessTag sensor."""
super().__init__(api, tag)
self._sensor_type = sensor_type
self._tag_attr = SENSOR_TYPES[self._sensor_type]['attr']
self._unit_of_measurement = SENSOR_TYPES[self._sensor_type]['unit']
self._name = self._tag.name
# I want to see entity_id as:
@@ -118,7 +77,7 @@ class WirelessTagSensor(WirelessTagBaseSensor):
"""Register callbacks."""
async_dispatcher_connect(
self.hass,
SIGNAL_TAG_UPDATE.format(self.tag_id),
SIGNAL_TAG_UPDATE.format(self.tag_id, self.tag_manager_mac),
self._update_tag_info_callback)
@property
@@ -144,33 +103,23 @@ class WirelessTagSensor(WirelessTagBaseSensor):
@property
def unit_of_measurement(self):
"""Return the unit of measurement."""
return self._unit_of_measurement
return self._sensor.unit
@property
def principal_value(self):
"""Return sensor current value."""
return getattr(self._tag, self._tag_attr, False)
return self._sensor.value
@property
def _sensor(self):
"""Return tag sensor entity."""
return self._tag.sensor[self._sensor_type]
@callback
def _update_tag_info_callback(self, event):
"""Handle push notification sent by tag manager."""
if event.data.get('id') != self.tag_id:
return
_LOGGER.info("Entity to update state: %s event data: %s",
self, event.data)
new_value = self.principal_value
try:
if self._sensor_type == SENSOR_TEMPERATURE:
new_value = event.data.get('temp')
elif (self._sensor_type == SENSOR_HUMIDITY or
self._sensor_type == SENSOR_MOISTURE):
new_value = event.data.get('cap')
elif self._sensor_type == SENSOR_LIGHT:
new_value = event.data.get('lux')
except Exception as error: # pylint: disable=broad-except
_LOGGER.info("Unable to update value of entity: \
%s error: %s event: %s", self, error, event)
new_value = self._sensor.value_from_update_event(event.data)
self._state = self.decorate_value(new_value)
self.async_schedule_update_ha_state()