Add support for LED toggle on smart plugs. (#19)

WebThingsIO · Feb 7, 2019 · 3659f00 · 3659f00
1 parent a0fd61b
commit 3659f00
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tplink-adapter",
   "display_name": "TP-Link",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "TP-Link smart plug/bulb adapter plugin for Mozilla IoT Gateway",
   "author": "Mozilla IoT",
   "main": "main.py",

diff --git a/pkg/tplink_device.py b/pkg/tplink_device.py
@@ -154,7 +154,7 @@ def __init__(self, adapter, _id, hs100_dev):
                 {
                     '@type': 'LevelProperty',
                     'label': 'Level',
-                    'type': 'number',
+                    'type': 'integer',
                     'unit': 'percent',
                     'minimum': 0,
                     'maximum': 100,
@@ -171,6 +171,15 @@ def __init__(self, adapter, _id, hs100_dev):
             },
             self.is_on(sysinfo))
 
+        self.properties['led-on'] = TPLinkPlugProperty(
+            self,
+            'led-on',
+            {
+                'label': 'LED On/Off',
+                'type': 'boolean',
+            },
+            self.is_led_on(sysinfo))
+
         if has_emeter:
             self.type = 'smartPlug'
         elif self.is_dimmable(sysinfo):
@@ -210,12 +219,21 @@ def has_emeter(sysinfo):
     @staticmethod
     def is_on(sysinfo):
         """
-        Determine whether or not the light is on.
+        Determine whether or not the switch is on.
 
         sysinfo -- current sysinfo dict for the device
         """
         return bool(sysinfo['relay_state'])
 
+    @staticmethod
+    def is_led_on(sysinfo):
+        """
+        Determine whether or not the LED is on.
+
+        sysinfo -- current sysinfo dict for the device
+        """
+        return bool(1 - sysinfo['led_off'])
+
     @staticmethod
     def is_dimmable(sysinfo):
         """
@@ -277,7 +295,7 @@ def __init__(self, adapter, _id, hs100_dev):
                 {
                     '@type': 'ColorTemperatureProperty',
                     'label': 'Color Temperature',
-                    'type': 'number',
+                    'type': 'integer',
                     'unit': 'kelvin',
                     'minimum': temp_range[0],
                     'maximum': temp_range[1],
@@ -291,7 +309,7 @@ def __init__(self, adapter, _id, hs100_dev):
                 {
                     '@type': 'BrightnessProperty',
                     'label': 'Brightness',
-                    'type': 'number',
+                    'type': 'integer',
                     'unit': 'percent',
                     'minimum': 0,
                     'maximum': 100,

diff --git a/pkg/tplink_property.py b/pkg/tplink_property.py
@@ -34,6 +34,8 @@ def set_value(self, value):
         try:
             if self.name == 'on':
                 self.device.hs100_dev.state = 'ON' if value else 'OFF'
+            elif self.name == 'led-on':
+                self.device.hs100_dev.led = value
             elif self.name == 'level':
                 self.device.hs100_dev.brightness = value
             else:
@@ -53,6 +55,8 @@ def update(self, sysinfo, emeter):
         """
         if self.name == 'on':
             value = self.device.is_on(sysinfo)
+        elif self.name == 'led-on':
+            value = self.device.is_led_on(sysinfo)
         elif self.name == 'level':
             value = self.device.brightness(sysinfo)
         elif self.name == 'instantaneousPower':

diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-pyHS100
+pyHS100==0.3.4