jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-11-08 18:39:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up state_attributes vs device_state_attributes

Browse Source
This commit is contained in:
Paulus Schoutsen
2016-02-06 22:28:29 -08:00
parent 681b84e1bd
commit f08b77dc4c
23 changed files with 66 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
homeassistant/components/sensor/mysensors.py
View File

@@ -161,34 +161,24 @@ class MySensorsSensor(Entity):
@property
def device_state_attributes(self):
"""Return device specific state attributes."""
set_req = self.gateway.const.SetReq
device_attr = {}
for value_type, value in self._values.items():
if value_type != self.value_type:
try:
device_attr[set_req(value_type).name] = value
except ValueError:
_LOGGER.error('value_type %s is not valid for mysensors '
'version %s', value_type,
self.gateway.version)
return device_attr
@property
def state_attributes(self):
"""Return the state attributes."""
data = {
attr = {
mysensors.ATTR_PORT: self.gateway.port,
mysensors.ATTR_NODE_ID: self.node_id,
mysensors.ATTR_CHILD_ID: self.child_id,
ATTR_BATTERY_LEVEL: self.battery_level,
}
device_attr = self.device_state_attributes
set_req = self.gateway.const.SetReq
if device_attr is not None:
data.update(device_attr)
return data
for value_type, value in self._values.items():
if value_type != self.value_type:
try:
attr[set_req(value_type).name] = value
except ValueError:
_LOGGER.error('value_type %s is not valid for mysensors '
'version %s', value_type,
self.gateway.version)
return attr
def update(self):
"""Update the controller with the latest values from a sensor."""