MSA-916: This Device Type and SmartApp integrated the Garadget Device Type enable integration of Smartthings With the Garadget Devices

devicetypes/-/test.src/test.groovy

@@ -1,93 +0,0 @@
-/**
- *  TEST
- *
- *  Copyright 2016 박춘영
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-metadata {
-	definition (name: "TEST", namespace: "스마트보안", author: "박춘영") {
-		capability "Button"
-		capability "Samsung TV"
-	}
-
-	simulator {
-		// TODO: define status and reply messages here
-	}
-
-	tiles {
-		// TODO: define your main and details tiles here
-	}
-}
-
-// parse events into attributes
-def parse(String description) {
-	log.debug "Parsing '${description}'"
-	// TODO: handle 'button' attribute
-	// TODO: handle 'volume' attribute
-	// TODO: handle 'mute' attribute
-	// TODO: handle 'pictureMode' attribute
-	// TODO: handle 'soundMode' attribute
-	// TODO: handle 'switch' attribute
-	// TODO: handle 'messageButton' attribute
-
-}
-
-// handle commands
-def volumeUp() {
-	log.debug "Executing 'volumeUp'"
-	// TODO: handle 'volumeUp' command
-}
-
-def volumeDown() {
-	log.debug "Executing 'volumeDown'"
-	// TODO: handle 'volumeDown' command
-}
-
-def setVolume() {
-	log.debug "Executing 'setVolume'"
-	// TODO: handle 'setVolume' command
-}
-
-def mute() {
-	log.debug "Executing 'mute'"
-	// TODO: handle 'mute' command
-}
-
-def unmute() {
-	log.debug "Executing 'unmute'"
-	// TODO: handle 'unmute' command
-}
-
-def setPictureMode() {
-	log.debug "Executing 'setPictureMode'"
-	// TODO: handle 'setPictureMode' command
-}
-
-def setSoundMode() {
-	log.debug "Executing 'setSoundMode'"
-	// TODO: handle 'setSoundMode' command
-}
-
-def on() {
-	log.debug "Executing 'on'"
-	// TODO: handle 'on' command
-}
-
-def off() {
-	log.debug "Executing 'off'"
-	// TODO: handle 'off' command
-}
-
-def showMessage() {
-	log.debug "Executing 'showMessage'"
-	// TODO: handle 'showMessage' command
-}

devicetypes/fuzzysb/garadget.src/garadget.groovy

@@ -0,0 +1,406 @@
+/**
+ *  Garadget Device Handler
+ *
+ *  Copyright 2016 Stuart Buchanan based loosely based on original code by Krishnaraj Varma with thanks
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ * 12/02/2016 V1.3 updated with to remove token and DeviceId parameters from inputs to retrieving from dni
+ */
+ 
+ 
+import groovy.json.JsonOutput
+
+preferences {
+	input("prdt", "text", title: "sensor scan interval in mS (default: 1000)")
+	input("pmtt", "text", title: "door moving time in mS(default: 10000)")
+	input("prlt", "text", title: "button press time mS (default: 300)")
+	input("prlp", "text", title: "delay between consecutive button presses in mS (default: 1000)")
+	input("psrr", "text", title: "number of sensor reads used in averaging (default: 3)")
+	input("psrt", "text", title: "reflection threshold below which the door is considered open (default: 25)")
+	input("paot", "text", title: "alert for open timeout in seconds (default: 320)")
+	input("pans", "text", title: " alert for night time start in minutes from midnight (default: 1320)")
+	input("pane", "text", title: " alert for night time end in minutes from midnight (default: 360)")	
+}
+
+metadata {
+	definition (name: "Garadget", namespace: "fuzzysb", author: "Stuart Buchanan") {
+			
+        capability "Switch"
+		capability "Contact Sensor"
+        capability "Signal Strength"
+		capability "Actuator"
+		capability "Sensor"
+        capability "Refresh"
+        capability "Polling"
+		capability "Configuration"
+		
+        attribute "reflection", "string"
+        attribute "status", "string"
+        attribute "time", "string"
+        attribute "lastAction", "string"
+        attribute "reflection", "string"
+        attribute "ver", "string"
+		
+        command "stop"
+		command "statusCommand"
+		command "setConfigCommand"
+		command "doorConfigCommand"
+		command "netConfigCommand"
+	}
+
+	simulator {
+		
+	}
+
+tiles(scale: 2) {
+    multiAttributeTile(name:"status", type: "generic", width: 6, height: 4){
+        tileAttribute ("device.status", key: "PRIMARY_CONTROL") {
+            attributeState "open", label:'${name}', action:"switch.off", icon:"st.doors.garage.garage-open", backgroundColor:"#ffa81e"
+            attributeState "opening", label:'${name}', icon:"st.doors.garage.garage-opening", backgroundColor:"#ffa81e"
+            attributeState "closing", label:'${name}', icon:"st.doors.garage.garage-closing", backgroundColor:"#6699ff"
+            attributeState "closed", label:'${name}', action:"switch.on", icon:"st.doors.garage.garage-closed", backgroundColor:"#79b821"
+        }
+		tileAttribute ("device.lastAction", key: "SECONDARY_CONTROL") {
+				attributeState "default", label: 'Time In State: ${currentValue}'
+		}
+    }
+	standardTile("contact", "device.contact", width: 1, height: 1) {
+			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
+			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
+		}
+    valueTile("reflection", "reflection", decoration: "flat", width: 2, height: 1) {
+    		state "reflection", label:'Reflection\r\n${currentValue}%'
+		}
+    valueTile("rssi", "device.rssi", decoration: "flat", width: 1, height: 1) {
+    		state "rssi", label:'Wifi\r\n${currentValue} dBm', unit: "",backgroundColors:[
+            		[value: 16, color: "#5600A3"],
+					[value: -31, color: "#153591"],
+					[value: -44, color: "#1e9cbb"],
+					[value: -59, color: "#90d2a7"],
+					[value: -74, color: "#44b621"],
+					[value: -84, color: "#f1d801"],
+					[value: -95, color: "#d04e00"],
+					[value: -96, color: "#bc2323"]
+				]
+		}
+    standardTile("refresh", "refresh", inactiveLabel: false, decoration: "flat") {
+            state "default", action:"polling.poll", icon:"st.secondary.refresh"
+        }
+    standardTile("stop", "stop") {
+        	state "default", label:"", action: "stop", icon:"http://cdn.device-icons.smartthings.com/sonos/stop-btn@2x.png"
+        }   
+    valueTile("ip", "ip", decoration: "flat", width: 2, height: 1) {
+    		state "ip", label:'IP Address\r\n${currentValue}'
+		}
+    valueTile("ssid", "ssid", decoration: "flat", width: 2, height: 1) {
+    		state "ssid", label:'Wifi SSID\r\n${currentValue}'
+		}
+	valueTile("ver", "ver", decoration: "flat", width: 1, height: 1) {
+    		state "ver", label:'Version\r\n${currentValue}'
+		}
+	standardTile("configure", "device.button", width: 1, height: 1, decoration: "flat") {
+        	state "default", label: "", backgroundColor: "#ffffff", action: "configure", icon:"st.secondary.configure"
+		}
+        
+        main "status"
+		details(["status", "contact", "reflection", "ver", "configure", "lastAction", "rssi", "stop", "ip", "ssid", "refresh"])
+	}
+}
+
+// handle commands
+def poll() {
+	log.debug "Executing 'poll'"
+    refresh()
+}
+
+def refresh() {
+	log.debug "Executing 'refresh'"
+    statusCommand()
+    netConfigCommand()
+    doorConfigCommand()
+    
+}
+
+def configure() {
+	log.debug "Resetting Sensor Parameters to SmartThings Compatible Defaults"
+	SetConfigCommand()	
+}
+
+// Parse incoming device messages to generate events
+private parseDoorStatusResponse(resp) {
+    log.debug("Executing parseDoorStatusResponse: "+resp.data)
+    log.debug("Output status: "+resp.status)
+    if(resp.status == 200) {
+        log.debug("returnedresult: "+resp.data.result)
+        def results = (resp.data.result).tokenize('|')
+        def statusvalues = (results[0]).tokenize('=')
+        def timevalues = (results[1]).tokenize('=')
+        def sensorvalues = (results[2]).tokenize('=')
+        def signalvalues = (results[3]).tokenize('=')
+        def status = statusvalues[1]
+        sendEvent(name: 'status', value: status)
+        if(status == "open" || status == "closed"){
+        	sendEvent(name: 'contact', value: status)
+            }
+        def time = timevalues[1]
+        sendEvent(name: 'lastAction', value: time)
+        def sensor = sensorvalues[1]
+        sendEvent(name: 'reflection', value: sensor)
+        def signal = signalvalues[1]
+        sendEvent(name: 'rssi', value: signal)
+        
+    }else if(resp.status == 201){
+        log.debug("Something was created/updated")
+    }
+}
+
+private parseDoorConfigResponse(resp) {
+    log.debug("Executing parseResponse: "+resp.data)
+    log.debug("Output status: "+resp.status)
+    if(resp.status == 200) {
+        log.debug("returnedresult: "+resp.data.result)
+        def results = (resp.data.result).tokenize('|')
+        def vervalues = (results[0]).tokenize('=')
+        def rdtvalues = (results[1]).tokenize('=')
+        def mttvalues = (results[2]).tokenize('=')
+        def rltvalues = (results[3]).tokenize('=')
+        def rlpvalues = (results[4]).tokenize('=')
+        def srrvalues = (results[5]).tokenize('=')
+        def srtvalues = (results[6]).tokenize('=')
+        def aotvalues = (results[7]).tokenize('=')
+        def ansvalues = (results[8]).tokenize('=')
+        def anevalues = (results[9]).tokenize('=')
+        def ver = vervalues[1]
+        sendEvent(name: 'ver', value: ver)
+        log.debug("Firmware Version: "+ver)
+        def rdt = rdtvalues[1]
+        log.debug("Sensor Scan Interval (ms): "+rdt )
+        def mtt = mttvalues[1]
+		state.mtt = mtt
+		sendEvent(name: 'mtt', value: mtt)
+        log.debug("Door Moving Time (ms): "+mtt )
+        def rlt = rltvalues[1]
+        log.debug("Button Press Time (ms): "+rlt )
+        def rlp = rlpvalues[1]
+        log.debug("Delay Between Consecutive Button Presses (ms): "+rlp )
+        def srr = srrvalues[1]
+        log.debug("number of sensor reads used in averaging: "+srr )
+        def srt = srtvalues[1]
+        log.debug("reflection threshold below which the door is considered open: "+srt )
+        def aot = aotvalues[1]
+        log.debug("alert for open timeout in seconds: "+aot )
+        def ans = ansvalues[1]
+        log.debug("alert for night time start in minutes from midnight: "+ans )
+        def ane = anevalues[1]
+        log.debug("alert for night time end in minutes from midnight: "+ane )
+        
+    }else if(resp.status == 201){
+        log.debug("Something was created/updated")
+    }
+}
+
+private parseNetConfigResponse(resp) {
+    log.debug("Executing parseResponse: "+resp.data)
+    log.debug("Output status: "+resp.status)
+    if(resp.status == 200) {
+        log.debug("returnedresult: "+resp.data.result)
+        def results = (resp.data.result).tokenize('|')
+        def ipvalues = (results[0]).tokenize('=')
+        def snetvalues = (results[1]).tokenize('=')
+        def dgwvalues = (results[2]).tokenize('=')
+        def macvalues = (results[3]).tokenize('=')
+        def ssidvalues = (results[4]).tokenize('=')
+        def ip = ipvalues[1]
+        sendEvent(name: 'ip', value: ip)
+        log.debug("IP Address: "+ip)
+        def snet = snetvalues[1]
+        log.debug("Subnet Mask: "+snet)
+        def dgw = dgwvalues[1]
+        log.debug("Default Gateway: "+dgw)
+        def mac = macvalues[1]
+        log.debug("Mac Address: "+mac)
+        def ssid = ssidvalues[1]
+        sendEvent(name: 'ssid', value: ssid)
+        log.debug("Wifi SSID : "+ssid)
+    }else if(resp.status == 201){
+        log.debug("Something was created/updated")
+    }
+}
+
+private parseResponse(resp) {
+    log.debug("Executing parseResponse: "+resp.data)
+    log.debug("Output status: "+resp.status)
+    if(resp.status == 200) {
+        log.debug("Executing parseResponse.successTrue")
+        def id = resp.data.id
+        def name = resp.data.name
+        def connected = resp.data.connected
+		def returnValue = resp.data.return_value	
+    }else if(resp.status == 201){
+        log.debug("Something was created/updated")
+    }
+}
+
+private getDeviceDetails() {
+def fullDni = device.deviceNetworkId
+return fullDni
+}
+
+private sendCommand(method, args = []) {
+	def DefaultUri = "https://api.particle.io"
+    def cdni = getDeviceDetails().tokenize(':')
+	def deviceId = cdni[0] 
+	def token = cdni[1]
+    def methods = [
+		'doorStatus': [
+					uri: "${DefaultUri}",
+					path: "/v1/devices/${deviceId}/doorStatus",
+					requestContentType: "application/json",
+					query: [access_token: token]  
+                    ],
+        'doorConfig': [
+					uri: "${DefaultUri}",
+					path: "/v1/devices/${deviceId}/doorConfig",
+					requestContentType: "application/json",
+					query: [access_token: token] 
+                    ],
+		'netConfig': [	
+					uri: "${DefaultUri}",
+					path: "/v1/devices/${deviceId}/netConfig",
+					requestContentType: "application/json",
+					query: [access_token: token]
+                   	],
+		'setState': [	
+					uri: "${DefaultUri}",
+					path: "/v1/devices/${deviceId}/setState",
+					requestContentType: "application/json",
+                    query: [access_token: token],
+					body: args[0]
+                   	],
+		'setConfig': [	
+					uri: "${DefaultUri}",
+					path: "/v1/devices/${deviceId}/setConfig",
+					requestContentType: "application/json",
+                    query: [access_token: token],
+					body: args[0]
+                   	]
+	]
+
+	def request = methods.getAt(method)
+    
+    log.debug "Http Params ("+request+")"
+    
+    try{
+        log.debug "Executing 'sendCommand'"
+        
+        if (method == "doorStatus"){
+            httpGet(request) { resp ->            
+                parseDoorStatusResponse(resp)
+            }
+        }else if (method == "doorConfig"){
+			log.debug "calling doorConfig Method"
+            httpGet(request) { resp ->            
+                parseDoorConfigResponse(resp)
+            }
+		}else if (method == "netConfig"){
+			log.debug "calling netConfig Method"
+            httpGet(request) { resp ->            
+                parseNetConfigResponse(resp)
+            }
+        }else if (method == "setState"){
+            log.debug "calling setState Method"
+            httpPost(request) { resp ->            
+                parseResponse(resp)
+			}
+        }else if (method == "setConfig"){
+            log.debug "calling setState Method"
+            httpPost(request) { resp ->            
+                 parseResponse(resp)
+            }
+        }else{
+            httpGet(request)
+        }
+    } catch(Exception e){
+        log.debug("___exception: " + e)
+    }
+}
+
+
+def on() {
+	log.debug "Executing 'on'"
+	openCommand()
+    statusCommand()
+    log.info("waiting for ${state.mtt} ms")
+	"delay ${state.mtt}"
+    log.info("Initiating Refresh after Transition time")
+	statusCommand()
+}
+
+def off() {
+	log.debug "Executing 'off'"
+	closeCommand()
+    statusCommand()
+    log.info("waiting for ${state.mtt} ms")
+	"delay ${state.mtt}"
+    log.info("Initiating Refresh after Transition time")
+	statusCommand()
+}
+
+def stop(){
+	log.debug "Executing 'sendCommand.setState'"
+    def jsonbody = new groovy.json.JsonOutput().toJson(arg:"stop")
+	sendCommand("setState",[jsonbody])
+    statusCommand()
+}
+
+def statusCommand(){
+	log.debug "Executing 'sendCommand.statusCommand'"
+	sendCommand("doorStatus",[])
+}
+
+def openCommand(){
+	log.debug "Executing 'sendCommand.setState'"
+    def jsonbody = new groovy.json.JsonOutput().toJson(arg:"open")
+	sendCommand("setState",[jsonbody])
+}
+
+def closeCommand(){
+	log.debug "Executing 'sendCommand.setState'"
+	def jsonbody = new groovy.json.JsonOutput().toJson(arg:"close")
+	sendCommand("setState",[jsonbody])
+}
+
+def doorConfigCommand(){
+	log.debug "Executing 'sendCommand.doorConfig'"
+	sendCommand("doorConfig",[])
+}
+
+def SetConfigCommand(){
+	def crdt = prdt ?: 1000
+	def cmtt = pmtt ?: 10000
+	def crlt = prlt ?: 300
+	def crlp = prlp ?: 1000
+	def csrr = psrr ?: 3
+	def csrt = psrt ?: 25
+	def caot = paot ?: 320
+	def cans = pans ?: 1320
+	def cane = pane ?: 360
+	log.debug "Executing 'sendCommand.setConfig'"
+	def jsonbody = new groovy.json.JsonOutput().toJson(arg:"rdt=" + crdt +"|mtt=" + cmtt + "|rlt=" + crlt + "|rlp=" + crlp +"|srr=" + csrr + "|srt=" + csrt)
+	sendCommand("setConfig",[jsonbody])
+    jsonbody = new groovy.json.JsonOutput().toJson(arg:"aot=" + caot + "|ans=" + cans + "|ane=" + cane)
+    sendCommand("setConfig",[jsonbody])
+}
+
+def netConfigCommand(){
+	log.debug "Executing 'sendCommand.netConfig'"
+	sendCommand("netConfig",[])
+}

devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy

@@ -1,7 +1,7 @@
 /**
  *  Cree Bulb
  *
- *  Copyright 2016 SmartThings
+ *  Copyright 2014 SmartThings
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  *  in compliance with the License. You may obtain a copy of the License at:
@@ -15,29 +15,29 @@
  */
  
 metadata {
-    definition (name: "Cree Bulb", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "Cree Bulb", namespace: "smartthings", author: "SmartThings") {
 
-        capability "Actuator"
+		capability "Actuator"
         capability "Configuration"
-        capability "Refresh"
+		capability "Refresh"
-        capability "Switch"
+		capability "Switch"
-        capability "Switch Level"
+		capability "Switch Level"
 
-        fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0000,0019"
+		fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0000,0019"
-    }
+	}
 
-    // simulator metadata
+	// simulator metadata
-    simulator {
+	simulator {
-        // status messages
+		// status messages
-        status "on": "on/off: 1"
+		status "on": "on/off: 1"
-        status "off": "on/off: 0"
+		status "off": "on/off: 0"
 
-        // reply messages
+		// reply messages
-        reply "zcl on-off on": "on/off: 1"
+		reply "zcl on-off on": "on/off: 1"
-        reply "zcl on-off off": "on/off: 0"
+		reply "zcl on-off off": "on/off: 0"
-    }
+	}
 
-    // UI tile definitions
+	// UI tile definitions
     tiles(scale: 2) {
         multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
             tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
@@ -62,12 +62,18 @@ metadata {
 def parse(String description) {
     log.debug "description is $description"
 
-    def resultMap = zigbee.getEvent(description)
+    def resultMap = zigbee.getKnownDescription(description)
     if (resultMap) {
-        sendEvent(resultMap)
+        log.info resultMap
+        if (resultMap.type == "update") {
+            log.info "$device updates: ${resultMap.value}"
+        }
+        else {
+            sendEvent(name: resultMap.type, value: resultMap.value)
+        }
     }
     else {
-        log.debug "DID NOT PARSE MESSAGE for description : $description"
+        log.warn "DID NOT PARSE MESSAGE for description : $description"
         log.debug zigbee.parseDescriptionAsMap(description)
     }
 }
@@ -81,7 +87,7 @@ def on() {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value) + ["delay 500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
+    zigbee.setLevel(value)
 }
 
 def refresh() {

devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy

@@ -1,3 +1,4 @@
+
 /**
  *  Hue Bulb
  *
@@ -10,14 +11,13 @@ metadata {
 		capability "Switch Level"
 		capability "Actuator"
 		capability "Color Control"
-		capability "Color Temperature"
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
 
 		command "setAdjustedColor"
-        command "reset"
+		command "reset"
-        command "refresh"
+		command "refresh"
 	}
 
 	simulator {
@@ -25,7 +25,7 @@ metadata {
 	}
 
 	tiles (scale: 2){
-		multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){
+		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
 				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
@@ -33,58 +33,23 @@ metadata {
 				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 			}
 			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
-				attributeState "level", action:"switch level.setLevel", range:"(0..100)"
+				attributeState "level", action:"switch level.setLevel"
-            }
-            tileAttribute ("device.level", key: "SECONDARY_CONTROL") {
-	            attributeState "level", label: 'Level ${currentValue}%'
 			}
 			tileAttribute ("device.color", key: "COLOR_CONTROL") {
 				attributeState "color", action:"setAdjustedColor"
 			}
 		}
 
-		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
+		standardTile("reset", "device.reset", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-			state "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-			state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-			state "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-		}
-
-        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
-            state "colorTemperature", action:"color temperature.setColorTemperature"
-        }
-        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorTemperature", label: '${currentValue} K'
-        }
-
-		standardTile("reset", "device.reset", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
 			state "default", label:"Reset Color", action:"reset", icon:"st.lights.philips.hue-single"
 		}
-		standardTile("refresh", "device.switch", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
+		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
 			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
-		controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false, range:"(0..100)") {
-			state "level", action:"switch level.setLevel"
-		}
-		valueTile("level", "device.level", inactiveLabel: false, decoration: "flat") {
-			state "level", label: 'Level ${currentValue}%'
-		}
-		controlTile("saturationSliderControl", "device.saturation", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "saturation", action:"color control.setSaturation"
-		}
-		valueTile("saturation", "device.saturation", inactiveLabel: false, decoration: "flat") {
-			state "saturation", label: 'Sat ${currentValue}    '
-		}
-		controlTile("hueSliderControl", "device.hue", "slider", height: 1, width: 2, inactiveLabel: false) {
-			state "hue", action:"color control.setHue"
-		}
-		valueTile("hue", "device.hue", inactiveLabel: false, decoration: "flat") {
-			state "hue", label: 'Hue ${currentValue}   '
-		}
-
-		main(["switch"])
-		details(["rich-control", "colorTempSliderControl", "colorTemp", "reset", "refresh"])
 	}
+
+	main(["switch"])
+	details(["switch", "levelSliderControl", "rgbSelector", "refresh", "reset"])
 }
 
 // parse events into attributes
@@ -154,27 +119,19 @@ void setColor(value) {
 
 void reset() {
 	log.debug "Executing 'reset'"
-    def value = [level:100, hex:"#90C638", saturation:56, hue:23]
+	def value = [level:100, hex:"#90C638", saturation:56, hue:23]
-    setAdjustedColor(value)
+	setAdjustedColor(value)
 	parent.poll()
 }
 
 void setAdjustedColor(value) {
 	if (value) {
-        log.trace "setAdjustedColor: ${value}"
+		log.trace "setAdjustedColor: ${value}"
-        def adjusted = value + [:]
+		def adjusted = value + [:]
-        adjusted.hue = adjustOutgoingHue(value.hue)
+		adjusted.hue = adjustOutgoingHue(value.hue)
-        // Needed because color picker always sends 100
+		// Needed because color picker always sends 100
-        adjusted.level = null
+		adjusted.level = null
-        setColor(adjusted)
+		setColor(adjusted)
-    }
-}
-
-void setColorTemperature(value) {
-	if (value) {
-        log.trace "setColorTemperature: ${value}k"
-        parent.setColorTemperature(this, value)
-        sendEvent(name: "colorTemperature", value: value)
 	}
 }
 

devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy

@@ -9,59 +9,51 @@ metadata {
 	definition (name: "Hue Lux Bulb", namespace: "smartthings", author: "SmartThings") {
 		capability "Switch Level"
 		capability "Actuator"
-		capability "Color Temperature"
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
 
-        command "refresh"
+		command "refresh"
 	}
 
 	simulator {
 		// TODO: define status and reply messages here
 	}
 
-    tiles(scale: 2) {
+	tiles(scale: 2) {
-        multiAttributeTile(name:"rich-control", type: "lighting", canChangeIcon: true){
+		multiAttributeTile(name:"rich-control", type: "lighting", canChangeIcon: true){
-            tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
+			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-              attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-              attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-              attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-              attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-            }
-            tileAttribute ("device.level", key: "SLIDER_CONTROL") {
-              attributeState "level", action:"switch level.setLevel", range:"(0..100)"
-            }
-            tileAttribute ("device.level", key: "SECONDARY_CONTROL") {
-	            attributeState "level", label: 'Level ${currentValue}%'
 			}
-        }
+			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
+				attributeState "level", action:"switch level.setLevel", range:"(0..100)"
+			}
+			tileAttribute ("device.level", key: "SECONDARY_CONTROL") {
+				attributeState "level", label: 'Level ${currentValue}%'
+			}
+		}
 
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
 			state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 			state "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
 			state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
 			state "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-        }
+		}
 
-        controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false, range:"(0..100)") {
+		controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false, range:"(0..100)") {
-            state "level", action:"switch level.setLevel"
+			state "level", action:"switch level.setLevel"
-        }
+		}
 
-        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
+		standardTile("refresh", "device.switch", inactiveLabel: false, height: 2, width: 2, decoration: "flat") {
-            state "colorTemperature", action:"color temperature.setColorTemperature"
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-        }
+		}
-        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorTemperature", label: '${currentValue} K'
-        }
 
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
+		main(["switch"])
-            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+		details(["rich-control", "refresh"])
-        }
+	}
-
-        main(["switch"])
-        details(["rich-control", "colorTempSliderControl", "colorTemp", "refresh"])
-    }
 }
 
 // parse events into attributes
@@ -98,14 +90,6 @@ void setLevel(percent) {
 	sendEvent(name: "level", value: percent)
 }
 
-void setColorTemperature(value) {
-	if (value) {
-        log.trace "setColorTemperature: ${value}k"
-        parent.setColorTemperature(this, value)
-        sendEvent(name: "colorTemperature", value: value)
-	}
-}
-
 void refresh() {
 	log.debug "Executing 'refresh'"
 	parent.manualRefresh()

devicetypes/smartthings/zigbee-dimmer-power.src/zigbee-dimmer-power.groovy

@@ -44,7 +44,7 @@ metadata {
                 attributeState "power", label:'${currentValue} W'
             }
         }
-        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
         main "switch"

devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy

@@ -39,7 +39,7 @@ metadata {
                 attributeState "level", action:"switch level.setLevel"
             }
         }
-        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
         main "switch"

devicetypes/smartthings/zigbee-hue-bulb.src/zigbee-hue-bulb.groovy

@@ -63,7 +63,7 @@ metadata {
 			state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
 			state "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
 		}
-		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat") {
+		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
 			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 		controlTile("rgbSelector", "device.color", "color", height: 3, width: 3, inactiveLabel: false) {

devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy

@@ -52,7 +52,7 @@
 		valueTile("battery", "device.battery", inactiveLabel:false, decoration:"flat", width:2, height:2) {
 			state "battery", label:'${currentValue}% battery', unit:""
 		}
-		standardTile("refresh", "device.refresh", inactiveLabel:false, decoration:"flat", width:2, height:2) {
+		standardTile("refresh", "device.lock", inactiveLabel:false, decoration:"flat", width:2, height:2) {
 			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 

devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy

@@ -57,7 +57,7 @@ metadata {
         valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "colorTemperature", label: '${currentValue} K'
         }
-        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
 

devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy

@@ -40,7 +40,7 @@ metadata {
                 attributeState "power", label:'${currentValue} W'
             }
         }
-        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
         main "switch"

devicetypes/smartthings/zigbee-switch.src/zigbee-switch.groovy

@@ -42,7 +42,7 @@ metadata {
                 attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn"
             }
         }
-        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
         main "switch"

devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy

@@ -54,7 +54,7 @@ metadata {
             }
         }
 
-        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
 

smartapps/fuzzysb/garadget-connect.src/garadget-connect.groovy

@@ -0,0 +1,404 @@
+/**
+ *  Garadget Connect
+ *
+ *  Copyright 2016 Stuart Buchanan
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ */
+ 
+ import java.text.DecimalFormat
+ import groovy.json.JsonSlurper
+ import groovy.json.JsonOutput
+ 
+private apiUrl() 			{ "https://api.particle.io" }
+private getVendorName() 	{ "Garadget" }
+private getVendorTokenPath(){ "https://api.particle.io/oauth/token" }
+private getVendorIcon()		{ "https://dl.dropboxusercontent.com/s/lkrub180btbltm8/garadget_128.png" }
+private getClientId() 		{ appSettings.clientId }
+private getClientSecret() 	{ appSettings.clientSecret }
+private getServerUrl() 		{ if(!appSettings.serverUrl){return getApiServerUrl()} }
+
+ 
+ // Automatically generated. Make future change here.
+definition(
+    name: "Garadget (Connect)",
+    namespace: "fuzzysb",
+    author: "Stuart Buchanan",
+    description: "Garadget Integration",
+    category: "SmartThings Labs",
+	iconUrl:   "https://dl.dropboxusercontent.com/s/lkrub180btbltm8/garadget_128.png", 
+	iconX2Url: "https://dl.dropboxusercontent.com/s/w8tvaedewwq56kr/garadget_256.png",
+	iconX3Url: "https://dl.dropboxusercontent.com/s/5hiec37e0y5py06/garadget_512.png",
+    oauth: true,
+    singleInstance: true
+) {
+    appSetting "serverUrl"
+}
+
+preferences {
+	page(name: "startPage", title: "Garadget Integration", content: "startPage", install: false)
+	page(name: "Credentials", title: "Fetch OAuth2 Credentials", content: "authPage", install: false)
+    page(name: "mainPage", title: "Garadget Integration", content: "mainPage")
+    page(name: "completePage", title: "${getVendorName()} is now connected to SmartThings!", content: "completePage")
+	page(name: "listDevices", title: "Garadget Devices", content: "listDevices", install: false)
+    page(name: "badCredentials", title: "Invalid Credentials", content: "badAuthPage", install: false)
+}
+
+mappings {
+	path("/receivedToken"){action: [POST: "receivedToken", GET: "receivedToken"]}
+}
+
+def startPage() {
+    if (state.garadgetAccessToken) { return mainPage() }
+    else { return authPage() }
+}
+
+def mainPage(){
+	
+	def result = [success:false]
+    
+    
+	if (!state.garadgetAccessToken) {
+    	createAccessToken()
+       	log.debug "About to create Smarthings Garadget access token."
+        getToken(garadgetUsername, garadgetPassword)
+    } 
+    if (state.garadgetAccessToken){
+    	result.success = true
+    }
+
+
+    if(result.success == true) {
+           		return completePage()
+	} else {
+    			return badAuthPage()
+	}
+}
+
+
+
+def completePage(){
+	def description = "Tap 'Next' to proceed"
+			return dynamicPage(name: "completePage", title: "Credentials Accepted!", nextPage: listDevices , uninstall: true, install:false) {
+				section { href url: buildRedirectUrl("receivedToken"), style:"embedded", required:false, title:"${getVendorName()} is now connected to SmartThings!", description:description }
+			}
+}
+
+def badAuthPage(){
+	log.debug "In badAuthPage"
+    log.error "login result false"
+       		return dynamicPage(name: "badCredentials", title: "Garadget", install:false, uninstall:true, nextPage: Credentials) {
+				section("") {
+					paragraph "Please check your username and password"
+           		}
+            }
+}
+    
+def authPage() {
+	log.debug "In authPage"
+	if(canInstallLabs()) {
+		def description = null
+
+		
+			log.debug "Prompting for Auth Details."
+
+			description = "Tap to enter Credentials."
+
+			return dynamicPage(name: "Credentials", title: "Authorize Connection", nextPage: mainPage, uninstall: false , install:false) {
+			section("Generate Username and Password") {
+				input "garadgetUsername", "text", title: "Your Garadget Username", required: true
+				input "garadgetPassword", "password", title: "Your Garadget Password", required: true
+				}
+			}
+	}
+	else
+	{
+		def upgradeNeeded = """To use SmartThings Labs, your Hub should be completely up to date.
+
+To update your Hub, access Location Settings in the Main Menu (tap the gear next to your location name), select your Hub, and choose "Update Hub"."""
+
+
+		return dynamicPage(name:"Credentials", title:"Upgrade needed!", nextPage:"", install:false, uninstall: true) {
+			section {
+				paragraph "$upgradeNeeded"
+			}
+		}
+
+	}
+}
+
+def createChildDevice(deviceFile, dni, name, label) {
+	log.debug "In createChildDevice"
+    try{
+		def childDevice = addChildDevice("fuzzysb", deviceFile, dni, null, [name: name, label: label, completedSetup: true])
+	} catch (e) {
+		log.error "Error creating device: ${e}"
+	}
+}
+
+def listDevices() {
+	log.debug "In listDevices"
+
+	def options = getDeviceList()
+
+	dynamicPage(name: "listDevices", title: "Choose devices", install: true) {
+		section("Devices") {
+			input "devices", "enum", title: "Select Device(s)", required: false, multiple: true, options: options, submitOnChange: true
+		}
+	}
+}
+
+def buildRedirectUrl(endPoint) {
+	log.debug "In buildRedirectUrl"
+	log.debug("returning: " + getServerUrl() + "/api/token/${state.accessToken}/smartapps/installations/${app.id}/${endPoint}")
+	return getServerUrl() + "/api/token/${state.accessToken}/smartapps/installations/${app.id}/${endPoint}"
+}
+
+def receivedToken() {
+	log.debug "In receivedToken"
+
+	def html = """
+        <!DOCTYPE html>
+        <html>
+        <head>
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>${getVendorName()} Connection</title>
+        <style type="text/css">
+            * { box-sizing: border-box; }
+            @font-face {
+                font-family: 'Swiss 721 W01 Thin';
+                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.eot');
+                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.eot?#iefix') format('embedded-opentype'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.woff') format('woff'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.ttf') format('truetype'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.svg#swis721_th_btthin') format('svg');
+                font-weight: normal;
+                font-style: normal;
+            }
+            @font-face {
+                font-family: 'Swiss 721 W01 Light';
+                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.eot');
+                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.eot?#iefix') format('embedded-opentype'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.woff') format('woff'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.ttf') format('truetype'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.svg#swis721_lt_btlight') format('svg');
+                font-weight: normal;
+                font-style: normal;
+            }
+            .container {
+                width: 560px;
+                padding: 40px;
+                /*background: #eee;*/
+                text-align: center;
+            }
+            img {
+                vertical-align: middle;
+            }
+            img:nth-child(2) {
+                margin: 0 30px;
+            }
+            p {
+                font-size: 2.2em;
+                font-family: 'Swiss 721 W01 Thin';
+                text-align: center;
+                color: #666666;
+                margin-bottom: 0;
+            }
+        /*
+            p:last-child {
+                margin-top: 0px;
+            }
+        */
+            span {
+                font-family: 'Swiss 721 W01 Light';
+            }
+        </style>
+        </head>
+        <body>
+            <div class="container">
+                <img src=""" + getVendorIcon() + """ alt="Vendor icon" />
+                <img src="https://s3.amazonaws.com/smartapp-icons/Partner/support/connected-device-icn%402x.png" alt="connected device icon" />
+                <img src="https://s3.amazonaws.com/smartapp-icons/Partner/support/st-logo%402x.png" alt="SmartThings logo" />
+                <p>Tap 'Done' to continue to Devices.</p>
+			</div>
+        </body>
+        </html>
+        """
+	render contentType: 'text/html', data: html
+}
+
+def getDeviceList() {
+	def garadgetDevices = []
+    
+    httpGet( apiUrl() + "/v1/devices?access_token=${state.garadgetAccessToken}"){ resp ->
+    	def restDevices = resp.data
+		restDevices.each { garadget ->
+        	if (garadget.connected == true)
+                garadgetDevices << ["${garadget.id}|${garadget.name}":"${garadget.name}"]
+            }			
+        	
+	}
+	return garadgetDevices.sort()
+
+}
+
+def installed() {
+	log.debug "Installed with settings: ${settings}"
+
+	initialize()
+}
+
+def updated() {
+	log.debug "Updated with settings: ${settings}"
+	unsubscribe()
+	unschedule()
+	initialize()
+}
+
+def uninstalled() {
+  log.debug "Uninstalling Garadget (Connect)"
+  deleteToken()
+  removeChildDevices(getChildDevices())
+  log.debug "Garadget (Connect) Uninstalled"
+  
+}
+
+def initialize() {
+	log.debug "Initialized with settings: ${settings}"
+	// Pull the latest device info into state
+	getDeviceList();
+    def children = getChildDevices()
+    if(settings.devices) {
+    	settings.devices.each { device ->
+    	def item = device.tokenize('|')
+        def deviceId = item[0]
+        def deviceName = item[1]
+        def existingDevices = children.find{ d -> d.deviceNetworkId.contains(deviceId) } 
+    		if(!existingDevices) {
+				try {
+					createChildDevice("Garadget", deviceId + ":" + state.garadgetAccessToken, "${deviceName}", deviceName)
+				} catch (Exception e) {
+					log.error "Error creating device: ${e}"
+				}
+    		}
+		}	
+    }
+
+     
+	// Do the initial poll
+	poll()
+	// Schedule it to run every 5 minutes
+	runEvery5Minutes("poll")
+}
+
+def getToken(garadgetUsername, garadgetPassword){
+	log.debug "Executing 'sendCommand.setState'"
+    def body = ("grant_type=password&username=${garadgetUsername}&password=${garadgetPassword}&expires_in=0")
+	sendCommand("createToken","particle","particle", body)
+}
+
+private sendCommand(method, user, pass, command) {
+    def userpassascii = "${user}:${pass}"
+	def userpass = "Basic " + userpassascii.encodeAsBase64().toString()
+    def headers = [:]
+    headers.put("Authorization", userpass)
+	def methods = [
+			'createToken': [
+        				uri: getVendorTokenPath(),
+            			requestContentType: "application/x-www-form-urlencoded", 
+                        headers: headers,
+                	    body: command
+                    	],
+            'deleteToken': [
+        				uri: apiUrl() + "/v1/access_tokens/${state.garadgetAccessToken}",
+            			requestContentType: "application/x-www-form-urlencoded", 
+                        headers: headers,
+                    	]
+                   ]
+	def request = methods.getAt(method)
+	log.debug "Http Params ("+request+")"
+		
+    try{
+        if (method == "createToken"){
+        	log.debug "Executing createToken 'sendCommand'" 
+            httpPost(request) { resp ->            
+                parseResponse(resp)
+            }
+        }else if (method == "deleteToken"){
+        	log.debug "Executing deleteToken 'sendCommand'" 
+            httpDelete(request) { resp ->            
+                parseResponse(resp)
+            }
+        }else{
+        log.debug "Executing default HttpGet 'sendCommand'"       
+            httpGet(request) { resp ->            
+                parseResponse(resp)
+        }
+        }
+    } catch(Exception e){
+        log.debug("___exception: " + e)
+    }
+}
+
+
+private parseResponse(resp) {
+    log.debug("Executing parseResponse: "+resp.data)
+    log.debug("Output status: "+resp.status)
+    if(resp.status == 200) {
+    	log.debug("Executing parseResponse.successTrue")
+        state.garadgetAccessToken = resp.data.access_token 
+        log.debug("Access Token: "+ state.garadgetAccessToken)
+		state.garadgetRefreshToken = resp.data.refresh_token
+        log.debug("Refresh Token: "+ state.garadgetRefreshToken)
+		state.garadgetTokenExpires = resp.data.expires_in
+        log.debug("Token Expires: "+ state.garadgetTokenExpires)
+        log.debug "Created new Garadget token"  
+    }else if(resp.status == 201){
+        log.debug("Something was created/updated")
+    }
+}
+
+def poll() {
+	log.debug "In Poll"
+	getDeviceList();
+	getAllChildDevices().each { 
+        it.statusCommand()
+	}
+}
+
+private Boolean canInstallLabs() {
+	return hasAllHubsOver("000.011.00603")
+}
+
+private List getRealHubFirmwareVersions() {
+	return location.hubs*.firmwareVersionString.findAll { it }
+}
+
+private Boolean hasAllHubsOver(String desiredFirmware) {
+	return realHubFirmwareVersions.every { fw -> fw >= desiredFirmware }
+}
+
+void deleteToken() {
+try{
+    sendCommand("deleteToken","${garadgetUsername}","${garadgetPassword}",[])
+	log.debug "Deleted the existing Garadget Access Token"
+ } catch (e) {log.debug "Couldn't delete Garadget Token, There was an error (${e}), moving on"}
+}
+
+private removeChildDevices(delete) {
+	try {
+    	delete.each {
+        	deleteChildDevice(it.deviceNetworkId)
+            log.info "Successfully Removed Child Device: ${it.displayName} (${it.deviceNetworkId})"
+    		}
+   		}
+    catch (e) { log.error "There was an error (${e}) when trying to delete the child device" }
+}

smartapps/smartthings/hue-connect.src/hue-connect.groovy

@@ -15,7 +15,7 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
-
+ 
 definition(
 	name: "Hue (Connect)",
 	namespace: "smartthings",
@@ -24,7 +24,7 @@ definition(
 	category: "SmartThings Labs",
 	iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/hue.png",
 	iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/hue@2x.png",
-        //singleInstance: true
+    singleInstance: true
 )
 
 preferences {
@@ -58,7 +58,7 @@ def bridgeDiscovery(params=[:])
     	state.bridges = [:]
         state.bridgeRefreshCount = 0
         app.updateSetting("selectedHue", "")
-    }
+    }    
 
 	subscribe(location, null, locationHandler, [filterEvents:false])
 
@@ -130,8 +130,8 @@ def bulbDiscovery() {
 	def bulboptions = bulbsDiscovered() ?: [:]
 	def numFound = bulboptions.size() ?: 0
     if (numFound == 0)
-    	app.updateSetting("selectedBulbs", "")
+    	app.updateSetting("selectedBulbs", "") 
-
+        
 	if((bulbRefreshCount % 5) == 0) {
 		discoverHueBulbs()
 	}
@@ -140,7 +140,7 @@ def bulbDiscovery() {
 		section("Please wait while we discover your Hue Bulbs. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
 			input "selectedBulbs", "enum", required:false, title:"Select Hue Bulbs (${numFound} found)", multiple:true, options:bulboptions
 		}
-		section {
+		section {				
 			def title = getBridgeIP() ? "Hue bridge (${getBridgeIP()})" : "Find bridges"
 			href "bridgeDiscovery", title: title, description: "", state: selectedHue ? "complete" : "incomplete", params: [override: true]
 
@@ -246,13 +246,13 @@ def installed() {
 
 def updated() {
 	log.trace "Updated with settings: ${settings}"
-	unsubscribe()
+	unsubscribe() 
-    unschedule()
+    unschedule()    
 	initialize()
 }
 
 def initialize() {
-	log.debug "Initializing"
+	log.debug "Initializing"  
     unsubscribe(bridge)
     state.inBulbDiscovery = false
     state.bridgeRefreshCount = 0
@@ -281,18 +281,18 @@ def uninstalled(){
 def bulbListHandler(hub, data = "") {
 	def msg = "Bulbs list not processed. Only while in settings menu."
     def bulbs = [:]
-	if (state.inBulbDiscovery) {
+	if (state.inBulbDiscovery) {       
         def logg = ""
         log.trace "Adding bulbs to state..."
         state.bridgeProcessedLightList = true
-        def object = new groovy.json.JsonSlurper().parseText(data)
+        def object = new groovy.json.JsonSlurper().parseText(data)   
         object.each { k,v ->
-            if (v instanceof Map)
+            if (v instanceof Map) 
                 bulbs[k] = [id: k, name: v.name, type: v.type, hub:hub]
         }
-    }
+    }  
     def bridge = null
-	if (selectedHue)
+	if (selectedHue) 
         bridge = getChildDevice(selectedHue)
     bridge.sendEvent(name: "bulbList", value: hub, data: bulbs, isStateChange: true, displayed: false)
     msg = "${bulbs.size()} bulbs found. ${bulbs}"
@@ -318,7 +318,7 @@ def addBulbs() {
                 } else {
                 	log.debug "$dni in not longer paired to the Hue Bridge or ID changed"
                 }
-			} else {
+			} else { 
             	//backwards compatable
 				newHueBulb = bulbs.find { (app.id + "/" + it.id) == dni }
 				d = addChildDevice("smartthings", "Hue Bulb", dni, newHueBulb?.hub, ["label":newHueBulb?.name])
@@ -344,7 +344,7 @@ def addBridge() {
 		def d = getChildDevice(selectedHue)
 		if(!d) {
      		// compatibility with old devices
-            def newbridge = true
+            def newbridge = true 
             childDevices.each {
             	if (it.getDeviceDataByName("mac")) {
                     def newDNI = "${it.getDeviceDataByName("mac")}"
@@ -354,10 +354,10 @@ def addBridge() {
                         it.setDeviceNetworkId("${newDNI}")
                         if (oldDNI == selectedHue)
                         	app.updateSetting("selectedHue", newDNI)
-                        newbridge = false
+                        newbridge = false 
                     }
-                }
+                }    
-            }
+            }  
         	if (newbridge) {
 				d = addChildDevice("smartthings", "Hue Bridge", selectedHue, vbridge.value.hub)
  				log.debug "created ${d.displayName} with id ${d.deviceNetworkId}"
@@ -368,13 +368,13 @@ def addBridge() {
                     	childDevice.sendEvent(name: "networkAddress", value: vbridge.value.ip + ":" +  vbridge.value.port)
                         childDevice.updateDataValue("networkAddress", vbridge.value.ip + ":" +  vbridge.value.port)
                     } else {
-                    	childDevice.sendEvent(name: "networkAddress", value: convertHexToIP(vbridge.value.ip) + ":" +  convertHexToInt(vbridge.value.port))
+                    	childDevice.sendEvent(name: "networkAddress", value: convertHexToIP(vbridge.value.ip) + ":" +  convertHexToInt(vbridge.value.port))	
                         childDevice.updateDataValue("networkAddress", convertHexToIP(vbridge.value.ip) + ":" +  convertHexToInt(vbridge.value.port))
-                    }
+                    }    
 				} else {
 					childDevice.sendEvent(name: "networkAddress", value: convertHexToIP(vbridge.value.networkAddress) + ":" +  convertHexToInt(vbridge.value.deviceAddress))
                     childDevice.updateDataValue("networkAddress", convertHexToIP(vbridge.value.networkAddress) + ":" +  convertHexToInt(vbridge.value.deviceAddress))
-                }
+                }    
 			}
 		} else {
 			log.debug "found ${d.displayName} with id $selectedHue already exists"
@@ -436,7 +436,7 @@ def locationHandler(evt) {
                     dstate.name = "Philips hue ($ip)"
                     d.sendEvent(name:"networkAddress", value: host)
                     d.updateDataValue("networkAddress", host)
-            	}
+            	} 
             }
 		}
 	}
@@ -504,11 +504,11 @@ def isValidSource(macAddress) {
 /////////////////////////////////////
 
 def parse(childDevice, description) {
-	def parsedEvent = parseLanMessage(description)
+	def parsedEvent = parseLanMessage(description) 
 	if (parsedEvent.headers && parsedEvent.body) {
 		def headerString = parsedEvent.headers.toString()
         def bodyString = parsedEvent.body.toString()
-		if (headerString?.contains("json")) {
+		if (headerString?.contains("json")) { 
         	def body
         	try {
             	body = new groovy.json.JsonSlurper().parseText(bodyString)
@@ -516,11 +516,11 @@ def parse(childDevice, description) {
             	log.warn "Parsing Body failed - trying again..."
                 poll()
             }
-            if (body instanceof java.util.HashMap) {
+            if (body instanceof java.util.HashMap) { 
             	//poll response
                 def bulbs = getChildDevices()
                 for (bulb in body) {
-                    def d = bulbs.find{it.deviceNetworkId == "${app.id}/${bulb.key}"}
+                    def d = bulbs.find{it.deviceNetworkId == "${app.id}/${bulb.key}"}    
                     if (d) {
                         if (bulb.value.state?.reachable) {
                             sendEvent(d.deviceNetworkId, [name: "switch", value: bulb.value?.state?.on ? "on" : "off"])
@@ -535,18 +535,18 @@ def parse(childDevice, description) {
                             }
                         } else {
                             sendEvent(d.deviceNetworkId, [name: "switch", value: "off"])
-                            sendEvent(d.deviceNetworkId, [name: "level", value: 100])
+                            sendEvent(d.deviceNetworkId, [name: "level", value: 100])                     
                             if (bulb.value.state.sat) {
                                 def hue = 23
                                 def sat = 56
                                 def hex = colorUtil.hslToHex(23, 56)
                                 sendEvent(d.deviceNetworkId, [name: "color", value: hex])
                                 sendEvent(d.deviceNetworkId, [name: "hue", value: hue])
-                                sendEvent(d.deviceNetworkId, [name: "saturation", value: sat])
+                                sendEvent(d.deviceNetworkId, [name: "saturation", value: sat])                               
-                            }
+                            }    
                         }
                     }
-                }
+                }     
             }
             else
             { //put response
@@ -595,7 +595,7 @@ def parse(childDevice, description) {
                 }
 
             }
-    	}
+    	}        
 	} else {
 		log.debug "parse - got something other than headers,body..."
 		return []
@@ -616,7 +616,7 @@ def off(childDevice) {
 
 def setLevel(childDevice, percent) {
 	log.debug "Executing 'setLevel'"
-    def level
+    def level 
     if (percent == 1) level = 1 else level = Math.min(Math.round(percent * 255 / 100), 255)
 	put("lights/${getId(childDevice)}/state", [bri: level, on: percent > 0])
 }
@@ -633,14 +633,6 @@ def setHue(childDevice, percent) {
 	put("lights/${getId(childDevice)}/state", [hue: level])
 }
 
-def setColorTemperature(childDevice, huesettings) {
-	log.debug "Executing 'setColorTemperature($huesettings)'"
-	def ct = Math.round(Math.abs((huesettings / 12.96829971181556) - 654))
-	def value = [ct: ct, on: true]
-	log.trace "sending command $value"
-	put("lights/${getId(childDevice)}/state", value)
-}
-
 def setColor(childDevice, huesettings) {
 	log.debug "Executing 'setColor($huesettings)'"
 	def hue = Math.min(Math.round(huesettings.hue * 65535 / 100), 65535)
@@ -697,7 +689,7 @@ HOST: ${host}
 }
 
 private put(path, body) {
-	def host = getBridgeIP()
+	def host = getBridgeIP()	
 	def uri = "/api/${state.username}/$path"
 	def bodyJSON = new groovy.json.JsonBuilder(body).toString()
 	def length = bodyJSON.getBytes().size().toString()
@@ -723,11 +715,11 @@ private getBridgeIP() {
             	host =  d.getDeviceDataByName("networkAddress")
             else
         		host = d.latestState('networkAddress').stringValue
-        }
+        }    
         if (host == null || host == "") {
             def serialNumber = selectedHue
             def bridge = getHueBridges().find { it?.value?.serialNumber?.equalsIgnoreCase(serialNumber) }?.value
-            if (!bridge) {
+            if (!bridge) { 
             	bridge = getHueBridges().find { it?.value?.mac?.equalsIgnoreCase(serialNumber) }?.value
             }
             if (bridge?.ip && bridge?.port) {
@@ -737,9 +729,9 @@ private getBridgeIP() {
                 	host = "${convertHexToIP(bridge?.ip)}:${convertHexToInt(bridge?.port)}"
             } else if (bridge?.networkAddress && bridge?.deviceAddress)
             	host = "${convertHexToIP(bridge?.networkAddress)}:${convertHexToInt(bridge?.deviceAddress)}"
-        }
+        }    
         log.trace "Bridge: $selectedHue - Host: $host"
-    }
+    }    
     return host
 }
 

smartapps/smartthings/smart-security.src/smart-security.groovy

@@ -1,317 +1,317 @@
-/**
+/**
- *  Copyright 2015 SmartThings
+ *  Copyright 2015 SmartThings
- *
+ *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
+ *  in compliance with the License. You may obtain a copy of the License at:
- *
+ *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
+ *  for the specific language governing permissions and limitations under the License.
- *
+ *
- *  Smart Security
+ *  Smart Security
- *
+ *
- *  Author: SmartThings
+ *  Author: SmartThings
- *  Date: 2013-03-07
+ *  Date: 2013-03-07
- */
+ */
-definition(
+definition(
-    name: "Smart Security",
+    name: "Smart Security",
-    namespace: "smartthings",
+    namespace: "smartthings",
-    author: "SmartThings",
+    author: "SmartThings",
-    description: "Alerts you when there are intruders but not when you just got up for a glass of water in the middle of the night",
+    description: "Alerts you when there are intruders but not when you just got up for a glass of water in the middle of the night",
-    category: "Safety & Security",
+    category: "Safety & Security",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/SafetyAndSecurity/App-IsItSafe.png",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/SafetyAndSecurity/App-IsItSafe.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/SafetyAndSecurity/App-IsItSafe@2x.png"
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/SafetyAndSecurity/App-IsItSafe@2x.png"
-)
+)
-
+
-preferences {
+preferences {
-	section("Sensors detecting an intruder") {
+	section("Sensors detecting an intruder") {
-		input "intrusionMotions", "capability.motionSensor", title: "Motion Sensors", multiple: true, required: false
+		input "intrusionMotions", "capability.motionSensor", title: "Motion Sensors", multiple: true, required: false
-		input "intrusionContacts", "capability.contactSensor", title: "Contact Sensors", multiple: true, required: false
+		input "intrusionContacts", "capability.contactSensor", title: "Contact Sensors", multiple: true, required: false
-	}
+	}
-	section("Sensors detecting residents") {
+	section("Sensors detecting residents") {
-		input "residentMotions", "capability.motionSensor", title: "Motion Sensors", multiple: true, required: false
+		input "residentMotions", "capability.motionSensor", title: "Motion Sensors", multiple: true, required: false
-	}
+	}
-	section("Alarm settings and actions") {
+	section("Alarm settings and actions") {
-		input "alarms", "capability.alarm", title: "Which Alarm(s)", multiple: true, required: false
+		input "alarms", "capability.alarm", title: "Which Alarm(s)", multiple: true, required: false
-        input "silent", "enum", options: ["Yes","No"], title: "Silent alarm only (Yes/No)"
+        input "silent", "enum", options: ["Yes","No"], title: "Silent alarm only (Yes/No)"
-		input "seconds", "number", title: "Delay in seconds before siren sounds"
+		input "seconds", "number", title: "Delay in seconds before siren sounds"
-		input "lights", "capability.switch", title: "Flash these lights (optional)", multiple: true, required: false
+		input "lights", "capability.switch", title: "Flash these lights (optional)", multiple: true, required: false
-		input "newMode", "mode", title: "Change to this mode (optional)", required: false
+		input "newMode", "mode", title: "Change to this mode (optional)", required: false
-	}
+	}
-	section("Notify others (optional)") {
+	section("Notify others (optional)") {
-		input "textMessage", "text", title: "Send this message", multiple: false, required: false
+		input "textMessage", "text", title: "Send this message", multiple: false, required: false
-        input("recipients", "contact", title: "Send notifications to") {
+        input("recipients", "contact", title: "Send notifications to") {
-            input "phone", "phone", title: "To this phone", multiple: false, required: false
+            input "phone", "phone", title: "To this phone", multiple: false, required: false
-        }
+        }
-	}
+	}
-	section("Arm system when residents quiet for (default 3 minutes)") {
+	section("Arm system when residents quiet for (default 3 minutes)") {
-		input "residentsQuietThreshold", "number", title: "Time in minutes", required: false
+		input "residentsQuietThreshold", "number", title: "Time in minutes", required: false
-	}
+	}
-}
+}
-
+
-def installed() {
+def installed() {
-	log.debug "INSTALLED"
+	log.debug "INSTALLED"
-	subscribeToEvents()
+	subscribeToEvents()
-	state.alarmActive = null
+	state.alarmActive = null
-}
+}
-
+
-def updated() {
+def updated() {
-	log.debug "UPDATED"
+	log.debug "UPDATED"
-	unsubscribe()
+	unsubscribe()
-	subscribeToEvents()
+	subscribeToEvents()
-	unschedule()
+	unschedule()
-	state.alarmActive = null
+	state.alarmActive = null
-	state.residentsAreUp = null
+	state.residentsAreUp = null
-	state.lastIntruderMotion = null
+	state.lastIntruderMotion = null
-	alarms?.off()
+	alarms?.off()
-}
+}
-
+
-private subscribeToEvents()
+private subscribeToEvents()
-{
+{
-	subscribe intrusionMotions, "motion", intruderMotion
+	subscribe intrusionMotions, "motion", intruderMotion
-	subscribe residentMotions, "motion", residentMotion
+	subscribe residentMotions, "motion", residentMotion
-	subscribe intrusionContacts, "contact", contact
+	subscribe intrusionContacts, "contact", contact
-	subscribe alarms, "alarm", alarm
+	subscribe alarms, "alarm", alarm
-	subscribe(app, appTouch)
+	subscribe(app, appTouch)
-}
+}
-
+
-private residentsHaveBeenQuiet()
+private residentsHaveBeenQuiet()
-{
+{
-	def threshold = ((residentsQuietThreshold != null && residentsQuietThreshold != "") ? residentsQuietThreshold : 3) * 60 * 1000
+	def threshold = ((residentsQuietThreshold != null && residentsQuietThreshold != "") ? residentsQuietThreshold : 3) * 60 * 1000
-	def result = true
+	def result = true
-	def t0 = new Date(now() - threshold)
+	def t0 = new Date(now() - threshold)
-	for (sensor in residentMotions) {
+	for (sensor in residentMotions) {
-		def recentStates = sensor.statesSince("motion", t0)
+		def recentStates = sensor.statesSince("motion", t0)
-		if (recentStates.find{it.value == "active"}) {
+		if (recentStates.find{it.value == "active"}) {
-			result = false
+			result = false
-			break
+			break
-		}
+		}
-	}
+	}
-	log.debug "residentsHaveBeenQuiet: $result"
+	log.debug "residentsHaveBeenQuiet: $result"
-	result
+	result
-}
+}
-
+
-private intruderMotionInactive()
+private intruderMotionInactive()
-{
+{
-	def result = true
+	def result = true
-	for (sensor in intrusionMotions) {
+	for (sensor in intrusionMotions) {
-		if (sensor.currentMotion == "active") {
+		if (sensor.currentMotion == "active") {
-			result = false
+			result = false
-			break
+			break
-		}
+		}
-	}
+	}
-	result
+	result
-}
+}
-
+
-private isResidentMotionSensor(evt)
+private isResidentMotionSensor(evt)
-{
+{
-	residentMotions?.find{it.id == evt.deviceId} != null
+	residentMotions?.find{it.id == evt.deviceId} != null
-}
+}
-
+
-def appTouch(evt)
+def appTouch(evt)
-{
+{
-	alarms?.off()
+	alarms?.off()
-	state.alarmActive = false
+	state.alarmActive = false
-}
+}
-
+
-// Here to handle old subscriptions
+// Here to handle old subscriptions
-def motion(evt)
+def motion(evt)
-{
+{
-	if (isResidentMotionSensor(evt)) {
+	if (isResidentMotionSensor(evt)) {
-		log.debug "resident motion, $evt.name: $evt.value"
+		log.debug "resident motion, $evt.name: $evt.value"
-		residentMotion(evt)
+		residentMotion(evt)
-	}
+	}
-	else {
+	else {
-		log.debug "intruder motion, $evt.name: $evt.value"
+		log.debug "intruder motion, $evt.name: $evt.value"
-		intruderMotion(evt)
+		intruderMotion(evt)
-	}
+	}
-}
+}
-
+
-def intruderMotion(evt)
+def intruderMotion(evt)
-{
+{
-	if (evt.value == "active") {
+	if (evt.value == "active") {
-		log.debug "motion by potential intruder, residentsAreUp: $state.residentsAreUp"
+		log.debug "motion by potential intruder, residentsAreUp: $state.residentsAreUp"
-		if (!state.residentsAreUp) {
+		if (!state.residentsAreUp) {
-			log.trace "checking if residents have been quiet"
+			log.trace "checking if residents have been quiet"
-			if (residentsHaveBeenQuiet()) {
+			if (residentsHaveBeenQuiet()) {
-				log.trace "calling startAlarmSequence"
+				log.trace "calling startAlarmSequence"
-				startAlarmSequence()
+				startAlarmSequence()
-			}
+			}
-			else {
+			else {
-				log.trace "calling disarmIntrusionDetection"
+				log.trace "calling disarmIntrusionDetection"
-				disarmIntrusionDetection()
+				disarmIntrusionDetection()
-			}
+			}
-		}
+		}
-	}
+	}
-	state.lastIntruderMotion = now()
+	state.lastIntruderMotion = now()
-}
+}
-
+
-def residentMotion(evt)
+def residentMotion(evt)
-{
+{
-	// Don't think we need this any more
+	// Don't think we need this any more
-	//if (evt.value == "inactive") {
+	//if (evt.value == "inactive") {
-	//	if (state.residentsAreUp) {
+	//	if (state.residentsAreUp) {
-	//    	startReArmSequence()
+	//    	startReArmSequence()
-	//    }
+	//    }
-	//}
+	//}
-}
+}
-
+
-def contact(evt)
+def contact(evt)
-{
+{
-	if (evt.value == "open") {
+	if (evt.value == "open") {
-		// TODO - check for residents being up?
+		// TODO - check for residents being up?
-		if (!state.residentsAreUp) {
+		if (!state.residentsAreUp) {
-			if (residentsHaveBeenQuiet()) {
+			if (residentsHaveBeenQuiet()) {
-				startAlarmSequence()
+				startAlarmSequence()
-			}
+			}
-			else {
+			else {
-				disarmIntrusionDetection()
+				disarmIntrusionDetection()
-			}
+			}
-		}
+		}
-	}
+	}
-}
+}
-
+
-def alarm(evt)
+def alarm(evt)
-{
+{
-	log.debug "$evt.name: $evt.value"
+	log.debug "$evt.name: $evt.value"
-	if (evt.value == "off") {
+	if (evt.value == "off") {
-		alarms?.off()
+		alarms?.off()
-		state.alarmActive = false
+		state.alarmActive = false
-	}
+	}
-}
+}
-
+
-private disarmIntrusionDetection()
+private disarmIntrusionDetection()
-{
+{
-	log.debug "residents are up, disarming intrusion detection"
+	log.debug "residents are up, disarming intrusion detection"
-	state.residentsAreUp = true
+	state.residentsAreUp = true
-	scheduleReArmCheck()
+	scheduleReArmCheck()
-}
+}
-
+
-private scheduleReArmCheck()
+private scheduleReArmCheck()
-{
+{
-	def cron = "0 * * * * ?"
+	def cron = "0 * * * * ?"
-	schedule(cron, "checkForReArm")
+	schedule(cron, "checkForReArm")
-	log.debug "Starting re-arm check, cron: $cron"
+	log.debug "Starting re-arm check, cron: $cron"
-}
+}
-
+
-def checkForReArm()
+def checkForReArm()
-{
+{
-	def threshold = ((residentsQuietThreshold != null && residentsQuietThreshold != "") ? residentsQuietThreshold : 3) * 60 * 1000
+	def threshold = ((residentsQuietThreshold != null && residentsQuietThreshold != "") ? residentsQuietThreshold : 3) * 60 * 1000
-	log.debug "checkForReArm: threshold is $threshold"
+	log.debug "checkForReArm: threshold is $threshold"
-	// check last intruder motion
+	// check last intruder motion
-	def lastIntruderMotion = state.lastIntruderMotion
+	def lastIntruderMotion = state.lastIntruderMotion
-	log.debug "checkForReArm: lastIntruderMotion=$lastIntruderMotion"
+	log.debug "checkForReArm: lastIntruderMotion=$lastIntruderMotion"
-	if (lastIntruderMotion != null)
+	if (lastIntruderMotion != null)
-	{
+	{
-		log.debug "checkForReArm, time since last intruder motion: ${now() - lastIntruderMotion}"
+		log.debug "checkForReArm, time since last intruder motion: ${now() - lastIntruderMotion}"
-		if (now() - lastIntruderMotion > threshold) {
+		if (now() - lastIntruderMotion > threshold) {
-			log.debug "re-arming intrusion detection"
+			log.debug "re-arming intrusion detection"
-			state.residentsAreUp = false
+			state.residentsAreUp = false
-			unschedule()
+			unschedule()
-		}
+		}
-	}
+	}
-	else {
+	else {
-		log.warn "checkForReArm: lastIntruderMotion was null, unable to check for re-arming intrusion detection"
+		log.warn "checkForReArm: lastIntruderMotion was null, unable to check for re-arming intrusion detection"
-	}	
+	}	
-}
+}
-
+
-private startAlarmSequence()
+private startAlarmSequence()
-{
+{
-	if (state.alarmActive) {
+	if (state.alarmActive) {
-		log.debug "alarm already active"
+		log.debug "alarm already active"
-	}
+	}
-	else {
+	else {
-		state.alarmActive = true
+		state.alarmActive = true
-		log.debug "starting alarm sequence"
+		log.debug "starting alarm sequence"
-
+
-		sendPush("Potential intruder detected!")
+		sendPush("Potential intruder detected!")
-
+
-		if (newMode) {
+		if (newMode) {
-			setLocationMode(newMode)
+			setLocationMode(newMode)
-		}
+		}
-
+
-		if (silentAlarm()) {
+		if (silentAlarm()) {
-			log.debug "Silent alarm only"
+			log.debug "Silent alarm only"
-			alarms?.strobe()
+			alarms?.strobe()
-            if (location.contactBookEnabled) {
+            if (location.contactBookEnabled) {
-                sendNotificationToContacts(textMessage ?: "Potential intruder detected", recipients)
+                sendNotificationToContacts(textMessage ?: "Potential intruder detected", recipients)
-            }
+            }
-            else {
+            else {
-                if (phone) {
+                if (phone) {
-                    sendSms(phone, textMessage ?: "Potential intruder detected")
+                    sendSms(phone, textMessage ?: "Potential intruder detected")
-                }
+                }
-            }
+            }
-		}
+		}
-		else {
+		else {
-			def delayTime = seconds
+			def delayTime = seconds
-			if (delayTime) {
+			if (delayTime) {
-				alarms?.strobe()
+				alarms?.strobe()
-				runIn(delayTime, "soundSiren")
+				runIn(delayTime, "soundSiren")
-				log.debug "Sounding siren in $delayTime seconds"
+				log.debug "Sounding siren in $delayTime seconds"
-			}
+			}
-			else {
+			else {
-				soundSiren()
+				soundSiren()
-			}
+			}
-		}
+		}
-
+
-		if (lights) {
+		if (lights) {
-			flashLights(Math.min((seconds/2) as Integer, 10))
+			flashLights(Math.min((seconds/2) as Integer, 10))
-		}
+		}
-	}
+	}
-}
+}
-
+
-def soundSiren()
+def soundSiren()
-{
+{
-	if (state.alarmActive) {
+	if (state.alarmActive) {
-		log.debug "Sounding siren"
+		log.debug "Sounding siren"
-        if (location.contactBookEnabled) {
+        if (location.contactBookEnabled) {
-            sendNotificationToContacts(textMessage ?: "Potential intruder detected", recipients)
+            sendNotificationToContacts(textMessage ?: "Potential intruder detected", recipients)
-        }
+        }
-        else {
+        else {
-            if (phone) {
+            if (phone) {
-                sendSms(phone, textMessage ?: "Potential intruder detected")
+                sendSms(phone, textMessage ?: "Potential intruder detected")
-            }
+            }
-        }
+        }
-		alarms?.both()
+		alarms?.both()
-		if (lights) {
+		if (lights) {
-			log.debug "continue flashing lights"
+			log.debug "continue flashing lights"
-			continueFlashing()
+			continueFlashing()
-		}
+		}
-	}
+	}
-	else {
+	else {
-		log.debug "alarm activation aborted"
+		log.debug "alarm activation aborted"
-	}
+	}
-	unschedule("soundSiren") // Temporary work-around to scheduling bug
+	unschedule("soundSiren") // Temporary work-around to scheduling bug
-}
+}
-
+
-def continueFlashing()
+def continueFlashing()
-{
+{
-	unschedule()
+	unschedule()
-	if (state.alarmActive) {
+	if (state.alarmActive) {
-		flashLights(10)
+		flashLights(10)
-		schedule(util.cronExpression(now() + 10000), "continueFlashing")
+		schedule(util.cronExpression(now() + 10000), "continueFlashing")
-	}
+	}
-}
+}
-
+
-private flashLights(numFlashes) {
+private flashLights(numFlashes) {
-	def onFor = 1000
+	def onFor = 1000
-	def offFor = 1000
+	def offFor = 1000
-
+
-	log.debug "FLASHING $numFlashes times"
+	log.debug "FLASHING $numFlashes times"
-	def delay = 1L
+	def delay = 1L
-	numFlashes.times {
+	numFlashes.times {
-		log.trace "Switch on after  $delay msec"
+		log.trace "Switch on after  $delay msec"
-		lights?.on(delay: delay)
+		lights?.on(delay: delay)
-		delay += onFor
+		delay += onFor
-		log.trace "Switch off after $delay msec"
+		log.trace "Switch off after $delay msec"
-		lights?.off(delay: delay)
+		lights?.off(delay: delay)
-		delay += offFor
+		delay += offFor
-	}
+	}
-}
+}
-
+
-private silentAlarm()
+private silentAlarm()
-{
+{
-	silent?.toLowerCase() in ["yes","true","y"]
+	silent?.toLowerCase() in ["yes","true","y"]
-}
+}