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

[Zwave] Add type and genre to value filter

Browse Source
This commit is contained in:
Arthur Andersen 2015-11-07 15:53:29 +01:00
parent 5b4fc4f346
commit 5565e418f8
1 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
homeassistant/components/zwave.py
View File

@ -27,10 +27,21 @@ COMMAND_CLASS_SENSOR_BINARY = 48
COMMAND_CLASS_SENSOR_MULTILEVEL = 49 COMMAND_CLASS_SENSOR_MULTILEVEL = 49
COMMAND_CLASS_BATTERY = 128 COMMAND_CLASS_BATTERY = 128
# list of tuple (DOMAIN, discovered service, supported command classes) GENRE_WHATEVER = None
GENRE_USER = "User"
TYPE_WHATEVER = None
TYPE_BYTE = "Byte"
TYPE_BOOL = "Bool"
# list of tuple (DOMAIN, discovered service, supported command
# classes, value type)
DISCOVERY_COMPONENTS = [ DISCOVERY_COMPONENTS = [
('sensor', DISCOVER_SENSORS, ('sensor',
[COMMAND_CLASS_SENSOR_BINARY, COMMAND_CLASS_SENSOR_MULTILEVEL]), DISCOVER_SENSORS,
[COMMAND_CLASS_SENSOR_BINARY, COMMAND_CLASS_SENSOR_MULTILEVEL],
TYPE_WHATEVER,
GENRE_WHATEVER),
] ]
ATTR_NODE_ID = "node_id" ATTR_NODE_ID = "node_id"
@ -110,19 +121,31 @@ def setup(hass, config):
def value_added(node, value): def value_added(node, value):
""" Called when a value is added to a node on the network. """ """ Called when a value is added to a node on the network. """
for component, discovery_service, command_ids in DISCOVERY_COMPONENTS:
if value.command_class in command_ids:
# Ensure component is loaded
bootstrap.setup_component(hass, component, config)
# Fire discovery event for (component,
hass.bus.fire(EVENT_PLATFORM_DISCOVERED, { discovery_service,
ATTR_SERVICE: discovery_service, command_ids,
ATTR_DISCOVERED: { value_type,
ATTR_NODE_ID: node.node_id, value_genre) in DISCOVERY_COMPONENTS:
ATTR_VALUE_ID: value.value_id,
} if value.command_class not in command_ids:
}) continue
if value_type is not None and value_type != value.type:
continue
if value_genre is not None and value_genre != value.genre:
continue
# Ensure component is loaded
bootstrap.setup_component(hass, component, config)
# Fire discovery event
hass.bus.fire(EVENT_PLATFORM_DISCOVERED, {
ATTR_SERVICE: discovery_service,
ATTR_DISCOVERED: {
ATTR_NODE_ID: node.node_id,
ATTR_VALUE_ID: value.value_id,
}
})
dispatcher.connect( dispatcher.connect(
value_added, ZWaveNetwork.SIGNAL_VALUE_ADDED, weak=False) value_added, ZWaveNetwork.SIGNAL_VALUE_ADDED, weak=False)