jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-27 15:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

deCONZ - Add power attribute for consumption sensors (#25512)

Browse Source 
* Add power attribute for consumption sensors

* Bump dependency to v62
This commit is contained in:
Robert Svensson 2019-07-28 18:25:38 +02:00 committed by Pascal Vizeli
parent 3672a5f881
commit da53e0a836
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/deconz/manifest.json
View File

@ -4,7 +4,7 @@
"config_flow": true, "config_flow": true,
"documentation": "https://www.home-assistant.io/components/deconz", "documentation": "https://www.home-assistant.io/components/deconz",
"requirements": [ "requirements": [
"pydeconz==60" "pydeconz==62"
], ],
"ssdp": { "ssdp": {
"manufacturer": [ "manufacturer": [

4
homeassistant/components/deconz/sensor.py
View File

@ -12,6 +12,7 @@ from .deconz_device import DeconzDevice
from .gateway import get_gateway_from_config_entry from .gateway import get_gateway_from_config_entry
ATTR_CURRENT = 'current' ATTR_CURRENT = 'current'
ATTR_POWER = 'power'
ATTR_DAYLIGHT = 'daylight' ATTR_DAYLIGHT = 'daylight'
ATTR_EVENT_ID = 'event_id' ATTR_EVENT_ID = 'event_id'
@ -104,6 +105,9 @@ class DeconzSensor(DeconzDevice):
attr[ATTR_CURRENT] = self._device.current attr[ATTR_CURRENT] = self._device.current
attr[ATTR_VOLTAGE] = self._device.voltage attr[ATTR_VOLTAGE] = self._device.voltage
if self.unit_of_measurement == 'kWh':
attr[ATTR_POWER] = self._device.power
if self._device.SENSOR_CLASS == 'daylight': if self._device.SENSOR_CLASS == 'daylight':
attr[ATTR_DAYLIGHT] = self._device.daylight attr[ATTR_DAYLIGHT] = self._device.daylight

2
requirements_all.txt
View File

@ -1096,7 +1096,7 @@ pydaikin==1.6.1
pydanfossair==0.1.0 pydanfossair==0.1.0
# homeassistant.components.deconz # homeassistant.components.deconz
pydeconz==60 pydeconz==62
# homeassistant.components.delijn # homeassistant.components.delijn
pydelijn==0.5.1 pydelijn==0.5.1

2
requirements_test_all.txt
View File

@ -251,7 +251,7 @@ pyMetno==0.4.6
pyblackbird==0.5 pyblackbird==0.5
# homeassistant.components.deconz # homeassistant.components.deconz
pydeconz==60 pydeconz==62
# homeassistant.components.zwave # homeassistant.components.zwave
pydispatcher==2.0.5 pydispatcher==2.0.5

9
tests/components/deconz/test_sensor.py
View File

@ -63,6 +63,13 @@ SENSOR = {
"type": "ZHAPower", "type": "ZHAPower",
"state": {"current": 2, "power": 6, "voltage": 3}, "state": {"current": 2, "power": 6, "voltage": 3},
"config": {"reachable": True} "config": {"reachable": True}
},
"8": {
"id": "Sensor 8 id",
"name": "Sensor 8 name",
"type": "ZHAConsumption",
"state": {"consumption": 2, "power": 6},
"config": {"reachable": True}
} }
} }
@ -130,7 +137,7 @@ async def test_sensors(hass):
assert "sensor.sensor_3_name_battery_level" not in gateway.deconz_ids assert "sensor.sensor_3_name_battery_level" not in gateway.deconz_ids
assert "sensor.sensor_4_name" not in gateway.deconz_ids assert "sensor.sensor_4_name" not in gateway.deconz_ids
assert "sensor.sensor_4_name_battery_level" in gateway.deconz_ids assert "sensor.sensor_4_name_battery_level" in gateway.deconz_ids
assert len(hass.states.async_all()) == 5 assert len(hass.states.async_all()) == 6
gateway.api.sensors['1'].async_update({'state': {'on': False}}) gateway.api.sensors['1'].async_update({'state': {'on': False}})
gateway.api.sensors['4'].async_update({'config': {'battery': 75}}) gateway.api.sensors['4'].async_update({'config': {'battery': 75}})