From 7077103c4fe477fcbcaf0d2ba49d338fff09d413 Mon Sep 17 00:00:00 2001
From: John Arild Berentsen <turbokongen@hotmail.com>
Date: Mon, 8 Aug 2016 20:05:45 +0200
Subject: [PATCH] General logmessage cleanup (#2753)
---
homeassistant/components/services.yaml | 24 +++++++++++++-----------
homeassistant/components/zwave.py | 20 ++++++++++----------
2 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/homeassistant/components/services.yaml b/homeassistant/components/services.yaml
index f9ecc007bd1..b42e661de1f 100644
--- a/homeassistant/components/services.yaml
+++ b/homeassistant/components/services.yaml
@@ -33,27 +33,29 @@ homematic:
example: PRESS_LONG
zwave:
- start_network:
- description: Start the zwave network. This might take a while, depending on how big your zwave network is.
-
- stop_network:
- description: Stop the zwave network, all updates into HASS will stop.
-
- heal_network:
- description: Start a zwave network heal. This might take a while and will slow down the zwave network greatly while it is being processed. Refer to OZW.log for details.
-
add_node:
description: Add a new node to the zwave network. Refer to OZW.log for details.
add_node_secure:
description: Add a new node to the zwave network with secure communications. Node must support this, and network key must be set. Refer to OZW.log for details.
+ cancel_command:
+ description: Cancel a running zwave controller command. Use this to exit add_node, if you wasn't going to use it but activated it.
+
+ heal_network:
+ description: Start a zwave network heal. This might take a while and will slow down the zwave network greatly while it is being processed. Refer to OZW.log for details.
+
remove_node:
description: Remove a node from the zwave network. Refer to OZW.log for details.
- test_network:
- description: This will send test to nodes in the zwave network. This will greatly slow down the zwave network while it is being processed. Refer to OZW.log for details.
+ start_network:
+ description: Start the zwave network. This might take a while, depending on how big your zwave network is.
+
+ stop_network:
+ description: Stop the zwave network, all updates into HASS will stop.
soft_reset:
description: This will reset the controller without removing its data. Use carefully because not all controllers support this. Refer to controllers manual.
+ test_network:
+ description: This will send test to nodes in the zwave network. This will greatly slow down the zwave network while it is being processed. Refer to OZW.log for details.
diff --git a/homeassistant/components/zwave.py b/homeassistant/components/zwave.py
index 138d060bc28..8e978d26383 100644
--- a/homeassistant/components/zwave.py
+++ b/homeassistant/components/zwave.py
@@ -338,20 +338,20 @@ def setup(hass, config):
component, node.node_id)
if node.generic not in generic_device_class and \
None not in generic_device_class:
- _LOGGER.debug("node.generic %s not None and in \
- generic_device_class %s",
+ _LOGGER.debug("node.generic %s not None and in "
+ "generic_device_class %s",
node.generic, generic_device_class)
continue
if node.specific not in specific_device_class and \
None not in specific_device_class:
- _LOGGER.debug("node.specific %s is not None and in \
- specific_device_class %s", node.specific,
+ _LOGGER.debug("node.specific %s is not None and in "
+ "specific_device_class %s", node.specific,
specific_device_class)
continue
if value.command_class not in command_class and \
None not in command_class:
- _LOGGER.debug("value.command_class %s is not None \
- and in command_class %s",
+ _LOGGER.debug("value.command_class %s is not None "
+ "and in command_class %s",
value.command_class, command_class)
continue
if value_type != value.type and value_type is not None:
@@ -364,10 +364,10 @@ def setup(hass, config):
continue
# Configure node
- _LOGGER.debug("Adding Node_id=%s Generic_command_class=%s, \
- Specific_command_class=%s, \
- Command_class=%s, Value type=%s, \
- Genre=%s", node.node_id,
+ _LOGGER.debug("Adding Node_id=%s Generic_command_class=%s, "
+ "Specific_command_class=%s, "
+ "Command_class=%s, Value type=%s, "
+ "Genre=%s", node.node_id,
node.generic, node.specific,
value.command_class, value.type,
value.genre)