#14: using turnOn and turnOff methods for switches. This decouples di…

…fferent value types for Characteristic.On and fixes predicate handling
michbeck100 · Jan 3, 2016 · dc3d7c8 · dc3d7c8
1 parent 0bfc894
commit dc3d7c8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/accessories/dimmer.coffee b/accessories/dimmer.coffee
@@ -17,14 +17,7 @@ module.exports = (env) ->
       @addService(Service.Lightbulb, device.name)
         .getCharacteristic(Characteristic.On)
         .on 'set', (value, callback) =>
-          if device._state == value
-            callback()
-            return
-          promise = null
-          if value
-            promise = device.turnOn()
-          else
-            promise = device.turnOff()
+          promise = if value then device.turnOn() else device.turnOff()
           @handleVoidPromise(promise, callback)
 
       @getService(Service.Lightbulb)

diff --git a/accessories/powerswitch.coffee b/accessories/powerswitch.coffee
@@ -17,10 +17,8 @@ module.exports = (env) ->
       @addService(Service.Switch, device.name)
         .getCharacteristic(Characteristic.On)
         .on 'set', (value, callback) =>
-          if device._state == value
-            callback()
-            return
-          @handleVoidPromise(device.changeStateTo(value), callback)
+          promise = if value then device.turnOn() else device.turnOff()
+          @handleVoidPromise(promise, callback)
 
       @getService(Service.Switch)
         .getCharacteristic(Characteristic.On)