Motion and Temperature sensors (Iris, Osram, SmartThings)

Author: stas-demydiuk

CHANGELOG.md

@@ -23,6 +23,7 @@ New devices:
 - HEIMAN Smoke detector
 - Hive Active smart bulb white LED (B22)
 - IKEA SURTE door light panel, dimmable, white spectrum (38x64 cm)
+- Iris Motion and temperature sensor
 - Müller Licht Tint LED bulb GU10/E14/E27 350/470/806 lumen, dimmable, color, opal white
 - Müller Licht Tint LED bulb GU10/E14/E27 350/470/806 lumen, dimmable, opal white
 - Nue ZigBee smart light controller
@@ -35,6 +36,7 @@ New devices:
 - Sengled Element downlight smart LED bulb
 - Smart Home Pty RGBW Downlight
 - Smart Home Pty Power plug
+- SmartThings Motion sensor (2015 model)
 - Sylvania Smart Home adjustable white A19 LED bulb
 - Sylvania LIGHTIFY LED gardenspot mini RGB
 - Trust Motion Sensor

README.md

@@ -122,8 +122,9 @@ git pull
 - Innr Spot Flex wide
 
 ### Iris
-- Iris Smart plug
 - Iris Contact sensor
+- Iris Motion and temperature sensor
+- Iris Smart plug
 
 ### JIAWEN
 - JIAWEN Wireless Bulb E27 9W RGBW
@@ -207,6 +208,7 @@ git pull
 ### SmartThings
 - SmartThings SmartSense multi sensor
 - SmartThings Arrival sensor
+- SmartThings Motion sensor (2015 model)
 
 ### Sylvania
 - Sylvania LIGHTIFY LED RGBW A19

adapters/__init__.py

@@ -6,6 +6,7 @@
 from adapters.rgb_adapter import RGBAdapter
 from adapters.rgbw_adapter import RGBWAdapter
 from adapters.generic.motion_sensor import MotionSensorAdapter
+from adapters.generic.motion_temp_sensor import MotionAndTemperatureSensorAdapter
 from adapters.generic.smoke_sensor import SmokeSensorAdapter
 from adapters.ikea.tradfri_wireless_dimmer import TradfriWirelessDimmer
 from adapters.lumi.sensor_cube import SensorCube
@@ -22,7 +23,6 @@
 from adapters.lumi.WXKG03LM import WXKG03LM
 from adapters.lumi.WXKG11LM import WXKG11LM
 from adapters.lumi.WXKG12LM import WXKG12LM
-from adapters.osram.sensor_motion import SensorMotionOsram
 from adapters.samsung.sensor_arrival import SensorArrival
 from adapters.philips.hue_dimmer_switch import HueDimmerSwitch
 from adapters.philips.hue_motion_sensor import HueMotionSensor
@@ -114,6 +114,7 @@
     # Iris
     '3210-L': OnOffSwitchAdapter,       # Iris Smart plug
     '3320-L': ContactAdapter,           # Iris Contact sensor
+    '3326-L': MotionAndTemperatureSensorAdapter,    # Iris Motion and temperature sensor
     # JIAWEN
     'K2RGBW01': RGBWAdapter,            # JIAWEN Wireless Bulb E27 9W RGBW
     # Ksentry
@@ -138,7 +139,7 @@
     'AC03642': DimmableCtBulbAdapter,   # OSRAM SMART+ CLASSIC A 60 TW
     'AC03645': RGBWAdapter,             # OSRAM LIGHTIFY LED CLA60 E27 RGBW
     'AC08562': DimmableBulbAdapter,     # OSRAM SMART+ Candle E14 Dimmable White
-    'AC01353010G': SensorMotionOsram,   # OSRAM SMART+ Motion Sensor
+    'AC01353010G': MotionAndTemperatureSensorAdapter,   # OSRAM SMART+ Motion Sensor
     'AC0251100NJ': DimmableBulbAdapter, # OSRAM SMART+ Switch Mini
     '4052899926110': RGBWAdapter,       # OSRAM Flex RGBW
     '4052899926158': DimmableBulbAdapter,   # OSRAM LIGHTIFY Surface Light TW
@@ -188,6 +189,7 @@
     # SmartThings
     'STSS-MULT-001': ContactAdapter,    # SmartThings SmartSense multi sensor
     'STS-PRS-251': SensorArrival,       # SmartThings SmartThings arrival sensor 
+    '3325-S': MotionAndTemperatureSensorAdapter, # SmartThings Motion sensor (2015 model)
     # Sylvania
     '71831': DimmableCtBulbAdapter,     # Sylvania Smart Home adjustable white A19 LED bulb
     '72922-A': OnOffSwitchAdapter,      # Sylvania SMART+ Smart Plug

adapters/osram/sensor_motion.py renamed to adapters/generic/motion_temp_sensor.py

@@ -3,7 +3,7 @@
 from devices.sensor.temperature import TemperatureSensor
 
 
-class SensorMotionOsram(AdapterWithBattery):
+class MotionAndTemperatureSensorAdapter(AdapterWithBattery):
     def __init__(self, devices):
         super().__init__(devices)
         self.devices.append(MotionSensor(devices, 'motion', 'occupancy'))