Add multiple gateways
* Add support for multiple serial gateways.
* Fix serialization of python objects by adding dict representation of
classes.
* Add support for showing more than one child value type per entity.
The entity state is always only one value type. This is defined by
the platform value types. Value types that are not defined as the
platform value type are shown as state_attributes.
* Add more unit of measurement types.
* Clean up code.
This commit is contained in:
1 parent
1d141566bd
commit
59524c7933
4 files changed
+240
-139
No files matched your search
@@ -17,9 +17,6 @@ from homeassistant.const import (
|
||||
|
||||
import homeassistant.components.mysensors as mysensors
|
||||
|
||||
ATTR_NODE_ID = "node_id"
|
||||
ATTR_CHILD_ID = "child_id"
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
DEPENDENCIES = ['mysensors']
|
||||
|
||||
@@ -27,28 +24,29 @@ DEPENDENCIES = ['mysensors']
|
||||
def setup_platform(hass, config, add_devices, discovery_info=None):
|
||||
""" Setup the mysensors platform for sensors. """
|
||||
|
||||
# Define the V_TYPES that the platform should handle as states.
|
||||
v_types = []
|
||||
for _, member in mysensors.CONST.SetReq.__members__.items():
|
||||
if (member.value != mysensors.CONST.SetReq.V_STATUS and
|
||||
if (member.value != mysensors.CONST.SetReq.V_ARMED and
|
||||
member.value != mysensors.CONST.SetReq.V_STATUS and
|
||||
member.value != mysensors.CONST.SetReq.V_LIGHT and
|
||||
member.value != mysensors.CONST.SetReq.V_LOCK_STATUS):
|
||||
v_types.append(member)
|
||||
|
||||
@mysensors.mysensors_update
|
||||
def _sensor_update(gateway, devices, nid):
|
||||
def _sensor_update(gateway, port, devices, nid):
|
||||
"""Internal callback for sensor updates."""
|
||||
_LOGGER.info("sensor update = %s", devices)
|
||||
return {'types_to_handle': v_types,
|
||||
'platform_class': MySensorsSensor,
|
||||
'add_devices': add_devices}
|
||||
return (v_types, MySensorsSensor, add_devices)
|
||||
|
||||
def sensor_update(event):
|
||||
""" Callback for sensor updates from the MySensors component. """
|
||||
_LOGGER.info(
|
||||
'update %s: node %s', event.data[mysensors.UPDATE_TYPE],
|
||||
event.data[mysensors.NODE_ID])
|
||||
_sensor_update(mysensors.GATEWAY, mysensors.DEVICES,
|
||||
event.data[mysensors.NODE_ID])
|
||||
'update %s: node %s', event.data[mysensors.ATTR_UPDATE_TYPE],
|
||||
event.data[mysensors.ATTR_NODE_ID])
|
||||
_sensor_update(mysensors.GATEWAYS[event.data[mysensors.ATTR_PORT]],
|
||||
event.data[mysensors.ATTR_PORT],
|
||||
event.data[mysensors.ATTR_DEVICES],
|
||||
event.data[mysensors.ATTR_NODE_ID])
|
||||
|
||||
hass.bus.listen(mysensors.EVENT_MYSENSORS_NODE_UPDATE, sensor_update)
|
||||
|
||||
@@ -58,16 +56,26 @@ class MySensorsSensor(Entity):
|
||||
""" Represents the value of a MySensors child node. """
|
||||
# pylint: disable=too-many-arguments, too-many-instance-attributes
|
||||
|
||||
def __init__(self, gateway, node_id, child_id, name, value_type):
|
||||
self.gateway = gateway
|
||||
def __init__(self, port, node_id, child_id, name, value_type):
|
||||
self.port = port
|
||||
self._name = name
|
||||
self.node_id = node_id
|
||||
self.child_id = child_id
|
||||
self.battery_level = 0
|
||||
self.value_type = value_type
|
||||
self.metric = mysensors.IS_METRIC
|
||||
self._value = ''
|
||||
self.const = mysensors.CONST
|
||||
self._values = {}
|
||||
|
||||
def as_dict(self):
|
||||
""" Returns a dict representation of this Entity. """
|
||||
return {
|
||||
'port': self.port,
|
||||
'name': self._name,
|
||||
'node_id': self.node_id,
|
||||
'child_id': self.child_id,
|
||||
'battery_level': self.battery_level,
|
||||
'value_type': self.value_type,
|
||||
'values': self._values,
|
||||
}
|
||||
|
||||
@property
|
||||
def should_poll(self):
|
||||
@@ -82,35 +90,69 @@ class MySensorsSensor(Entity):
|
||||
@property
|
||||
def state(self):
|
||||
""" Returns the state of the device. """
|
||||
return self._value
|
||||
if not self._values:
|
||||
return ''
|
||||
return self._values[self.value_type]
|
||||
|
||||
@property
|
||||
def unit_of_measurement(self):
|
||||
""" Unit of measurement of this entity. """
|
||||
if self.value_type == self.const.SetReq.V_TEMP:
|
||||
return TEMP_CELCIUS if self.metric else TEMP_FAHRENHEIT
|
||||
elif self.value_type == self.const.SetReq.V_HUM or \
|
||||
self.value_type == self.const.SetReq.V_DIMMER or \
|
||||
self.value_type == self.const.SetReq.V_LIGHT_LEVEL:
|
||||
# pylint:disable=too-many-return-statements
|
||||
if self.value_type == mysensors.CONST.SetReq.V_TEMP:
|
||||
return TEMP_CELCIUS if mysensors.IS_METRIC else TEMP_FAHRENHEIT
|
||||
elif self.value_type == mysensors.CONST.SetReq.V_HUM or \
|
||||
self.value_type == mysensors.CONST.SetReq.V_DIMMER or \
|
||||
self.value_type == mysensors.CONST.SetReq.V_PERCENTAGE or \
|
||||
self.value_type == mysensors.CONST.SetReq.V_LIGHT_LEVEL:
|
||||
return '%'
|
||||
elif self.value_type == mysensors.CONST.SetReq.V_WATT:
|
||||
return 'W'
|
||||
elif self.value_type == mysensors.CONST.SetReq.V_KWH:
|
||||
return 'kWh'
|
||||
elif self.value_type == mysensors.CONST.SetReq.V_VOLTAGE:
|
||||
return 'V'
|
||||
elif self.value_type == mysensors.CONST.SetReq.V_CURRENT:
|
||||
return 'A'
|
||||
elif self.value_type == mysensors.CONST.SetReq.V_IMPEDANCE:
|
||||
return 'ohm'
|
||||
elif mysensors.CONST.SetReq.V_UNIT_PREFIX in self._values:
|
||||
return self._values[mysensors.CONST.SetReq.V_UNIT_PREFIX]
|
||||
return None
|
||||
|
||||
@property
|
||||
def device_state_attributes(self):
|
||||
""" Returns device specific state attributes. """
|
||||
device_attr = dict(self._values)
|
||||
device_attr.pop(self.value_type, None)
|
||||
return device_attr
|
||||
|
||||
@property
|
||||
def state_attributes(self):
|
||||
""" Returns the state attributes. """
|
||||
return {
|
||||
ATTR_NODE_ID: self.node_id,
|
||||
ATTR_CHILD_ID: self.child_id,
|
||||
|
||||
data = {
|
||||
mysensors.ATTR_NODE_ID: self.node_id,
|
||||
mysensors.ATTR_CHILD_ID: self.child_id,
|
||||
ATTR_BATTERY_LEVEL: self.battery_level,
|
||||
}
|
||||
|
||||
def update_sensor(self, value, battery_level):
|
||||
""" Update the controller with the latest value from a sensor. """
|
||||
_LOGGER.info("%s value = %s", self._name, value)
|
||||
if self.value_type == self.const.SetReq.V_TRIPPED or \
|
||||
self.value_type == self.const.SetReq.V_ARMED:
|
||||
self._value = STATE_ON if int(value) == 1 else STATE_OFF
|
||||
else:
|
||||
self._value = value
|
||||
device_attr = self.device_state_attributes
|
||||
|
||||
if device_attr is not None:
|
||||
data.update(device_attr)
|
||||
|
||||
return data
|
||||
|
||||
def update_sensor(self, values, battery_level):
|
||||
""" Update the controller with the latest values from a sensor. """
|
||||
for value_type, value in values.items():
|
||||
_LOGGER.info(
|
||||
"%s: value_type %s, value = %s", self._name, value_type, value)
|
||||
if value_type == mysensors.CONST.SetReq.V_TRIPPED:
|
||||
self._values[value_type] = STATE_ON if int(
|
||||
value) == 1 else STATE_OFF
|
||||
else:
|
||||
self._values[value_type] = value
|
||||
|
||||
self.battery_level = battery_level
|
||||
self.update_ha_state()
|
||||
Reference in new issue
Block a user