Add support for additional devices

Author: stas-demydiuk

CHANGELOG.md

@@ -6,10 +6,15 @@
 - Suppress device update if no state change for boolean sensors
 
 New devices:
+- Calex LED A60 Zigbee GLS-lamp
+- Climax Power plug
 - Dresden Elektronik ZigBee Light Link wireless electronic ballast 
 - Gledopto Zigbee LED controller RGB + CCT / RGBW / WWCW / Dimmer
+- HEIMAN Door sensor
 - Innr E27 Bulb RGBW
 - Innr B22 Bulb RGBW
+- Innr E14 Candle with white spectrum
+- Iris Contact sensor
 - JIAWEN Wireless Bulb E27 9W RGBW
 - OSRAM Flex RGBW
 - OSRAM Outdoor Flex RGBW
@@ -21,13 +26,17 @@ New devices:
 - OSRAM Classic A60 RGBW
 - OSRAM LIGHTIFY LED CLA60 E27 RGBW
 - OSRAM LIGHTIFY Surface Light TW
+- Paulmann SmartHome Zigbee LED-stripe
+- Paulmann SmartHome Yourled RGB Controller
 - Philips Hue Go
+- Philips Hue white ambiance Aurelle Rectangle Panel Light
 - Philips Hue white and color ambiance E26/E27/E14
 - Philips Hue white and color ambiance GU10
 - Philips Hue white and color ambiance LightStrip plus
 - Philips Hue White and color ambiance Play Lightbar
 - Philips Hue white and color ambiance BR30
 - Philips Hue Motion Sensor
+- Sengled Element Plus (A19)
 - Sengled Element Plus Color (A19)
 - SmartThings SmartSense multi sensor
 - SmartThings SmartThings arrival sensor

README.md

@@ -33,6 +33,12 @@ git pull
 ### Belkin
 - Belkin WeMo smart LED bulb
 
+### Calex
+- Calex LED A60 Zigbee GLS-lamp
+
+### Climax
+- Climax Power plug
+
 ### Commercial Electric
 - Commercial Electric Matte White Recessed Retrofit Smart Led Downlight - 4 Inch
 
@@ -47,6 +53,9 @@ git pull
 ### Gledopto
 - Gledopto Zigbee LED controller RGB + CCT / RGBW / WWCW / Dimmer 
 
+### HEIMAN
+- HEIMAN Door sensor
+
 ### Hive
 - Hive Active light dimmable
 
@@ -75,6 +84,7 @@ git pull
 - Innr GU10 Spot
 - Innr GU10 Spot 350 lm, dimmable, white spectrum
 - Innr E14 Candle
+- Innr E14 Candle with white spectrum
 - Innr B22 Bulb dimmable
 - Innr B22 Bulb RGBW
 - Innr Puck Light
@@ -88,6 +98,7 @@ git pull
 
 ### Iris
 - Iris Smart plug
+- Iris Contact sensor
 
 ### JIAWEN
 - JIAWEN Wireless Bulb E27 9W RGBW
@@ -121,6 +132,10 @@ git pull
 - OSRAM Outdoor Flex RGBW
 - OSRAM Classic A60 RGBW
 
+### Paulmann
+- Paulmann SmartHome Zigbee LED-stripe
+- Paulmann SmartHome Yourled RGB Controller
+
 ### Philips
 - Philips Hue dimmer switch
 - Philips Hue Go
@@ -130,6 +145,7 @@ git pull
 - Philips Hue white ambiance E14
 - Philips Hue white ambiance GU10
 - Philips Hue white ambiance E26/E27
+- Philips Hue white ambiance Aurelle Rectangle Panel Light
 - Philips Hue white and color ambiance BR30
 - Philips Hue white and color ambiance GU10
 - Philips Hue white and color ambiance E26/E27/E14
@@ -141,6 +157,7 @@ git pull
 ### Sengled
 - Sengled Element Classic (A19)
 - Sengled Element Classic (A60)
+- Sengled Element Plus (A19)
 - Sengled Element Plus Color (A19)
 - Sengled Element Touch (A19)
 
@@ -184,6 +201,5 @@ git pull
 
 ### Other
 - Custom devices (DiY) DNCKAT single key wired wall light switch
-- Paulmann SmartHome Zigbee LED-stripe
 
 If your device is not listed here but [zigbee2mqtt supports](https://github.com/Koenkk/zigbee2mqtt/wiki/Supported-devices) it, support can be added (fairly) easy by creating device adapter.

adapters/__init__.py

@@ -1,12 +1,12 @@
 from adapters.base_adapter import Adapter
+from adapters.contact_adapter import ContactAdapter
 from adapters.dimmable_bulb_adapter import DimmableBulbAdapter
 from adapters.dimmable_ct_bulb_adapter import DimmableCtBulbAdapter
 from adapters.on_off_switch_adapter import OnOffSwitchAdapter
 from adapters.rgb_adapter import RGBAdapter
 from adapters.rgbw_adapter import RGBWAdapter
 from adapters.ikea.tradfri_wireless_dimmer import TradfriWirelessDimmer
 from adapters.lumi.sensor_cube import SensorCube
-from adapters.lumi.sensor_magnet import SensorMagnet
 from adapters.lumi.sensor_motion import SensorMotion
 from adapters.lumi.sensor_motion_aq2 import SensorMotionAq2
 from adapters.lumi.sensor_smoke import SensorSmoke
@@ -22,23 +22,22 @@
 from adapters.lumi.WXKG11LM import WXKG11LM
 from adapters.lumi.WXKG12LM import WXKG12LM
 from adapters.osram.sensor_motion import SensorMotionOsram
-from adapters.samsung.sensor_contact import SensorContact
 from adapters.samsung.sensor_arrival import SensorArrival
 from adapters.philips.hue_dimmer_switch import HueDimmerSwitch
 from adapters.philips.hue_motion_sensor import HueMotionSensor
 
 adapter_by_model = {
-    'CC2530.ROUTER': Adapter,           # Zigbee router based on CC2530 chip
+    # Belkin
     'F7C033': DimmableBulbAdapter,      # Belkin WeMo smart LED bulb
+    # Calex
+    '421786': DimmableBulbAdapter,      # Calex LED A60 Zigbee GLS-lamp
+    # Climax
+    'PSS-23ZBS': OnOffSwitchAdapter,    # Climax Power plug
+    # Commercial Electric
     '53170161': DimmableCtBulbAdapter,  # Commercial Electric Matte White Recessed Retrofit Smart Led Downlight - 4 Inch
+    # Custom devices (DiY)
+    'CC2530.ROUTER': Adapter,           # Zigbee router based on CC2530 chip
     'DNCKATSW001': OnOffSwitchAdapter,  # Custom devices (DiY) DNCKAT single key wired wall light switch
-    'HALIGHTDIMWWE27': DimmableBulbAdapter,     # Hive Active light dimmable
-    '3210-L': OnOffSwitchAdapter,       # Iris Smart plug
-    'KS-SM001': OnOffSwitchAdapter,     # Ksentry Electronics Zigbee OnOff Controller
-    'NL08-0800': DimmableBulbAdapter,   # Nanoleaf Ivy smart bulb
-    'FB56+ZSW05HG1.2': OnOffSwitchAdapter,      # Nue ZigBee one gang smart switch
-    '50045': DimmableBulbAdapter,       # Paulmann SmartHome Zigbee LED-stripe
-    'ZLED-2709': DimmableBulbAdapter,   # Trust Smart Dimmable LED Bulb
     # Dresden Elektronik
     'Mega23M12': RGBWAdapter,           # Dresden Elektronik ZigBee Light Link wireless electronic ballast
     # GE
@@ -47,6 +46,10 @@
     '45857GE': DimmableBulbAdapter,     # GE ZigBee in-wall smart dimmer
     # Gledopto
     'GL-C-008': RGBWAdapter,            # Gledopto Zigbee LED controller RGB + CCT / RGBW / WWCW / Dimmer
+    # HEIMAN
+    'HS1DS': ContactAdapter,            # HEIMAN Door sensor
+    # Hive
+    'HALIGHTDIMWWE27': DimmableBulbAdapter,     # Hive Active light dimmable
     # Ikea
     'LED1536G5': DimmableCtBulbAdapter, # IKEA TRADFRI LED bulb E12/E14 400 lumen, dimmable, white spectrum, opal white
     'LED1537R6': DimmableCtBulbAdapter, # IKEA TRADFRI LED bulb GU10 400 lumen, dimmable, white spectrum
@@ -71,6 +74,7 @@
     'DL 110 W': DimmableBulbAdapter,    # Innr Spot wide
     'PL 110': DimmableBulbAdapter,      # Innr Puck Light
     'RB 145': DimmableBulbAdapter,      # Innr E14 Candle
+    'RB 248 T': DimmableCtBulbAdapter,  # Innr E14 Candle with white spectrum
     'RB 165': DimmableBulbAdapter,      # Innr E27 Bulb
     'RB 175 W': DimmableBulbAdapter,    # Innr E27 Bulb warm dimming
     'RB 185 C': RGBWAdapter,            # Innr E27 Bulb RGBW
@@ -82,8 +86,17 @@
     'SL 110 W': DimmableBulbAdapter,    # Innr Spot Flex wide
     'ST 110': DimmableBulbAdapter,      # Innr Strip Light
     'UC 110': DimmableBulbAdapter,      # Innr Under Cabinet Light
+    # Iris
+    '3210-L': OnOffSwitchAdapter,       # Iris Smart plug
+    '3320-L': ContactAdapter,           # Iris Contact sensor
     # JIAWEN
     'K2RGBW01': RGBWAdapter,            # JIAWEN Wireless Bulb E27 9W RGBW
+    # Ksentry
+    'KS-SM001': OnOffSwitchAdapter,     # Ksentry Electronics Zigbee OnOff Controller
+    # Nanoleaf
+    'NL08-0800': DimmableBulbAdapter,   # Nanoleaf Ivy smart bulb
+    # Nue
+    'FB56+ZSW05HG1.2': OnOffSwitchAdapter,      # Nue ZigBee one gang smart switch
     # OSRAM
     'AA68199': DimmableCtBulbAdapter,   # OSRAM LIGHTIFY LED PAR16 50 GU10 tunable white
     'AA69697': RGBWAdapter,             # OSRAM Classic A60 RGBW
@@ -103,21 +116,25 @@
     '4058075036147': RGBWAdapter,       # OSRAM Smart+ Gardenpole RGBW
     '4058075816718': RGBWAdapter,       # OSRAM SMART+ outdoor wall lantern RGBW
     '4058075816794': DimmableCtBulbAdapter, # OSRAM Smart+ Ceiling TW
+    # Paulmann
+    '50045': DimmableBulbAdapter,       # Paulmann SmartHome Zigbee LED-stripe
+    '50049': RGBAdapter,                # Paulmann SmartHome Yourled RGB Controller
     # Philips
+    '3216331P5': DimmableCtBulbAdapter, # Philips Hue white ambiance Aurelle Rectangle Panel Light
     '324131092621': HueDimmerSwitch,    # Philips Hue dimmer switch
     '3261030P7': DimmableCtBulbAdapter, # Philips Hue Being
     '433714': DimmableBulbAdapter,      # Philips Hue Lux A19 bulb E27
     '7146060PH': RGBWAdapter,           # Philips Hue Go
     '7199960PH': RGBAdapter,            # Philips Hue Iris
     '7299355PH': RGBAdapter,            # Philips Hue white and color ambiance LightStrip
     '7299760PH': RGBAdapter,            # Philips Hue Bloom
-    '8718696449691': DimmableBulbAdapter,   # Philips Hue White Single bulb B22
+    '8718696449691': DimmableBulbAdapter,   # Philips Hue white Single bulb B22
     '8718696485880': RGBWAdapter,           # Philips Hue white and color ambiance GU10
     '8718696548738': DimmableCtBulbAdapter, # Philips Hue white ambiance E26/E27
     '8718696598283': DimmableCtBulbAdapter, # Philips Hue white ambiance GU10
     '8718696695203': DimmableCtBulbAdapter, # Philips Hue white ambiance E14
     '915005106701': RGBWAdapter,        # Philips Hue white and color ambiance LightStrip plus
-    '915005733701': RGBWAdapter,        # Philips Hue White and color ambiance Play Lightbar
+    '915005733701': RGBWAdapter,        # Philips Hue white and color ambiance Play Lightbar
     '9290002579A': RGBWAdapter,         # Philips Hue white and color ambiance BR30
     '9290011370': DimmableBulbAdapter,  # Philips Hue white A60 bulb E27
     '9290012573A': RGBWAdapter,         # Philips Hue white and color ambiance E26/E27 (with Color Temperature)
@@ -126,26 +143,29 @@
     'E11-G13': DimmableBulbAdapter,     # Sengled Element Classic (A19)
     'E11-G23': DimmableBulbAdapter,     # Sengled Element Classic (A60)
     'E11-N1EA': RGBWAdapter,            # Sengled Element Plus Color (A19)
+    'Z01-A19NAE26': DimmableCtBulbAdapter,  # Sengled Element Plus (A19)
     'Z01-CIA19NAE26': DimmableBulbAdapter,  # Sengled Element Touch (A19)
     # SmartThings
-    'STSS-MULT-001': SensorContact,     # SmartThings SmartSense multi sensor
+    'STSS-MULT-001': ContactAdapter,    # SmartThings SmartSense multi sensor
     'STS-PRS-251': SensorArrival,       # SmartThings SmartThings arrival sensor 
     # Sylvania
+    '72922-A': OnOffSwitchAdapter,      # Sylvania SMART+ Smart Plug
     '73693': RGBWAdapter,               # Sylvania LIGHTIFY LED RGBW A19
-    '73742': DimmableCtBulbAdapter,     # Sylvania LIGHTIFY LED adjustable white RT 5/6
     '73740': DimmableCtBulbAdapter,     # Sylvania LIGHTIFY LED adjustable white BR30
+    '73742': DimmableCtBulbAdapter,     # Sylvania LIGHTIFY LED adjustable white RT 5/6
     '74282': DimmableCtBulbAdapter,     # Sylvania Smart Home adjustable white MR16 LED bulb
     '74283': DimmableBulbAdapter,       # Sylvania LIGHTIFY LED soft white dimmable A19
     '74696': DimmableBulbAdapter,       # Sylvania LIGHTIFY LED soft white dimmable A19
-    '72922-A': OnOffSwitchAdapter,      # Sylvania SMART+ Smart Plug
+    # Trust
+    'ZLED-2709': DimmableBulbAdapter,   # Trust Smart Dimmable LED Bulb
     # Xiaomi
     'ZNCZ02LM': Plug,                   # Xiaomi Mi power plug ZigBee
     'QBCZ11LM': Plug,                   # Xiaomi Aqara socket Zigbee (on/off, power measurement)
     'MFKZQ01LM': SensorCube,            # Xiaomi Mi smart home cube
     'WXKG02LM': WXKG02LM,               # Xiaomi Aqara double key wireless wall switch
     'WXKG03LM': WXKG03LM,               # Xiaomi Aqara single key wireless wall switch
-    'MCCGQ01LM': SensorMagnet,          # Xiaomi MiJia door & window contact sensor
-    'MCCGQ11LM': SensorMagnet,          # Xiaomi Aqara door & window contact sensor
+    'MCCGQ01LM': ContactAdapter,        # Xiaomi MiJia door & window contact sensor
+    'MCCGQ11LM': ContactAdapter,        # Xiaomi Aqara door & window contact sensor
     'RTCGQ01LM': SensorMotion,          # Xiaomi MiJia human body movement sensor
     'RTCGQ11LM': SensorMotionAq2,       # Xiaomi Aqara human body movement and illuminance sensor 
     'WXKG01LM': WXKG01LM,               # Xiaomi MiJia wireless switch

adapters/samsung/sensor_contact.py renamed to adapters/contact_adapter.py

@@ -2,7 +2,7 @@
 from devices.sensor.contact import ContactSensor
 
 
-class SensorContact(AdapterWithBattery):
+class ContactAdapter(AdapterWithBattery):
     def __init__(self, devices):
         super().__init__(devices)
         self.devices.append(ContactSensor(devices, 'sensor', 'contact'))