From 5af48643269d0db652d5b616aa0e1fd43406c83e Mon Sep 17 00:00:00 2001 From: ntouran <partofthething@users.noreply.github.com> Date: Mon, 11 Jan 2016 23:27:53 -0800 Subject: [PATCH] ZWave alarm sensor cleanup (pylint fixes) --- homeassistant/components/sensor/zwave.py | 26 +++++++++++++----------- homeassistant/components/zwave.py | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/homeassistant/components/sensor/zwave.py b/homeassistant/components/sensor/zwave.py index fdbec56404c..869f4dbe810 100644 --- a/homeassistant/components/sensor/zwave.py +++ b/homeassistant/components/sensor/zwave.py @@ -73,7 +73,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): elif (value.command_class == zwave.COMMAND_CLASS_METER and value.type == zwave.TYPE_DECIMAL): add_devices([ZWaveMultilevelSensor(value)]) - + elif value.command_class == zwave.COMMAND_CLASS_ALARM: add_devices([ZWaveAlarmSensor(value)]) @@ -220,16 +220,18 @@ class ZWaveMultilevelSensor(ZWaveSensor): else: return unit + class ZWaveAlarmSensor(ZWaveSensor): - """ A Z-wave sensor that sends Alarm alerts - - Examples include certain Multisensors that have motion and vibration capabilities. - Z-Wave defines various alarm types such as Smoke, Flood, Burglar, CarbonMonoxide, etc. - This wraps these events. - - COMMAND_CLASS_ALARM is what we get here. + """ A Z-wave sensor that sends Alarm alerts + + Examples include certain Multisensors that have motion and + vibration capabilities. Z-Wave defines various alarm types + such as Smoke, Flood, Burglar, CarbonMonoxide, etc. + + This wraps these alarms and allows you to use them to + trigger things, etc. + + COMMAND_CLASS_ALARM is what we get here. """ - @property - def state(self): - """ Returns the state of the sensor. """ - return str(self._value.data) \ No newline at end of file + # Empty subclass for now. Allows for later customizations + pass diff --git a/homeassistant/components/zwave.py b/homeassistant/components/zwave.py index d3cf70a2cd4..9f6d7ca37aa 100644 --- a/homeassistant/components/zwave.py +++ b/homeassistant/components/zwave.py @@ -37,7 +37,7 @@ COMMAND_CLASS_SENSOR_BINARY = 48 COMMAND_CLASS_SENSOR_MULTILEVEL = 49 COMMAND_CLASS_METER = 50 COMMAND_CLASS_BATTERY = 128 -COMMAND_CLASS_ALARM = 113 # 0x71 +COMMAND_CLASS_ALARM = 113 # 0x71 GENRE_WHATEVER = None GENRE_USER = "User"