From 3979387c808ef5469840b1b2fb41a2090112ebf9 Mon Sep 17 00:00:00 2001
From: Kane610 <Kane610@users.noreply.github.com>
Date: Mon, 15 Jan 2018 10:47:55 +0100
Subject: [PATCH] Add Deconz support for Zigbee green power devices like Hue
 Tap (#11455)

* Add support for Zigbee green power devices such as the Hue Tap

* Clarify that imported SWITCH is a DECONZ_REMOTE
---
 homeassistant/components/deconz/__init__.py | 2 +-
 homeassistant/components/sensor/deconz.py   | 5 ++---
 requirements_all.txt                        | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/deconz/__init__.py b/homeassistant/components/deconz/__init__.py
index 021febdc07c..06b08a9b9a8 100644
--- a/homeassistant/components/deconz/__init__.py
+++ b/homeassistant/components/deconz/__init__.py
@@ -17,7 +17,7 @@ from homeassistant.helpers import discovery
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.util.json import load_json, save_json
 
-REQUIREMENTS = ['pydeconz==23']
+REQUIREMENTS = ['pydeconz==24']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/sensor/deconz.py b/homeassistant/components/sensor/deconz.py
index c01483169cb..2f1ff373581 100644
--- a/homeassistant/components/sensor/deconz.py
+++ b/homeassistant/components/sensor/deconz.py
@@ -17,7 +17,6 @@ from homeassistant.util import slugify
 DEPENDENCIES = ['deconz']
 
 ATTR_EVENT_ID = 'event_id'
-ATTR_ZHASWITCH = 'ZHASwitch'
 
 
 @asyncio.coroutine
@@ -26,13 +25,13 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     if discovery_info is None:
         return
 
-    from pydeconz.sensor import DECONZ_SENSOR
+    from pydeconz.sensor import DECONZ_SENSOR, SWITCH as DECONZ_REMOTE
     sensors = hass.data[DECONZ_DATA].sensors
     entities = []
 
     for sensor in sensors.values():
         if sensor.type in DECONZ_SENSOR:
-            if sensor.type == ATTR_ZHASWITCH:
+            if sensor.type in DECONZ_REMOTE:
                 DeconzEvent(hass, sensor)
                 if sensor.battery:
                     entities.append(DeconzBattery(sensor))
diff --git a/requirements_all.txt b/requirements_all.txt
index baff8528a84..e33ad03c34d 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -678,7 +678,7 @@ pycsspeechtts==1.0.2
 pydaikin==0.4
 
 # homeassistant.components.deconz
-pydeconz==23
+pydeconz==24
 
 # homeassistant.components.zwave
 pydispatcher==2.0.5