Modifying 'Blue Iris Integration intranet'

This App+Handler bundle allows to integrate it with Samsung SmartThings, allowing to to manage Blue Iris signal and profile state via SmartThings app - either manually or automatically, by subscribing to location events (like Home, Away, etc).
The main difference with existing integration (by @pursual) is that this one works locally, thus eliminating need to create a potential security breach by exposing ports to internet (it works without any port forwarding). Of course it means BlueIris server should reside on the same network segment as SmartThings Hub.

devicetypes/df/blueiris2.src/blueiris2.groovy

@@ -0,0 +1,559 @@
+/**
+ *  Copyright 2015 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:
+ *
+ *      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.
+ *
+ *  BlueIris (LocalConnect2)
+ *
+ *  Author: Nicolas Neverov
+ *  Date: 2017-04-30
+ */
+
+ metadata {
+   definition (name: "blueiris2", namespace: "df", author: "df") {
+      capability "Sensor"
+      capability "Actuator"
+        capability "Configuration"
+        capability "Refresh"
+        attribute "state", "enum", ["disarmed", "arming", "armed", "disarming", "unknown"]
+        attribute "status", "string"
+        command "arm"
+        command "disarm"
+        command "location" "STRING"
+        command "retry"
+        command "timeout"
+   }
+
+   // simulator metadata
+   simulator {
+   }
+
+   preferences {
+      input name:"username", type:"text", title: "Username", description: "BlueIris Username", required: true
+      input name:"password", type:"password", title: "Password", description: "BlueIris Password", required: true
+   }
+
+   // UI tile definitions
+   tiles(scale: 2) {
+       multiAttributeTile(name:"bi_detail_tile", type:"generic", width:6, height:4) {
+         tileAttribute("device.state", key: "PRIMARY_CONTROL") {
+               attributeState "disarmed", label:"Disarmed", action:"arm", icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff"
+               attributeState "arming", label:"Arming...", action:"arm", icon:"st.locks.lock.locked", backgroundColor:"#79b821"
+               attributeState "armed", label:"Armed", action:"disarm", icon:"st.locks.lock.locked", backgroundColor:"#79b821"
+               attributeState "disarming", label:"Disarming...", action:"disarm", icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff"
+               attributeState "unknown", label:"Unknown", action:"retry", icon:"st.locks.lock.unknown", backgroundColor:"#ff0000"
+               attributeState "refreshing", action:"Refresh.refresh", icon:"st.secondary.refresh", backgroundColor:"#ffffff"
+            }
+            tileAttribute("device.status", key: "SECONDARY_CONTROL") {
+            attributeState("default", label:'${currentValue}', defaultState:true)
+            }
+      }
+
+      standardTile("bi_refresh_tile", "device.refresh", decoration: "flat", width: 2, height: 2) {
+         state "default", action:"Refresh.refresh", icon:"st.secondary.refresh"
+      }
+
+      main "bi_detail_tile"
+      details(["bi_detail_tile", "bi_refresh_tile"])
+   }
+}
+
+def fsmExecInternal(fsmDefinition, stateId, Map params)
+{
+   def actionResult = null;
+
+   def fsmState = fsmDefinition[stateId?.toString()]
+   if(fsmState == null || fsmState.isFinal) {
+      return [error:"fsmExecInternal: state [$stateId] ${fsmState == null ? 'does not exist' : 'is final'} and cannot be actioned upon"]
+   }
+
+	while(!fsmState.isFinal && !actionResult?.isAsync) {
+		actionResult = fsmState.action(params)
+		fsmState = fsmDefinition[actionResult.nextStateId?.toString()]
+		if(fsmState == null) {
+			return [error:"fsmExecInternal: state [${actionResult.nextStateId}] does not exist and cannot be actioned upon"]
+		}
+		log.debug("fsmExecInternal: transitioned state [$stateId] to [$actionResult.nextStateId] (isFinal:${fsmState.isFinal?:false}); result isAsync:${actionResult.isAsync?:false}")
+      	stateId = actionResult.nextStateId
+	}
+   	return [actionResult:actionResult]
+}
+
+def fsmGetStateId(Map persistentStg)
+{
+	persistentStg.fsmState
+}
+
+def fsmExec(Map persistentStg, fsmDefinition, Map params = null)
+{
+   def stateId = fsmGetStateId(persistentStg) ?: params.fsmInitialState
+   if(!stateId) {
+      return [error: "fsmExec: cannot determine initial state, must be specified via params.fsmInitialState"]
+   }
+
+	log.debug("fsmExec: ${persistentStg.fsmState ? 'proceeding' : 'starting'} with fsm state [$stateId]")
+	params = (params != null ? params : [:])
+	params.persistentStg = (params.persistentStg != null ? params.persistentStg : persistentStg)
+
+   def rc = fsmExecInternal(fsmDefinition, stateId, params)
+   if(rc.actionResult) {
+      persistentStg.fsmState = rc.actionResult.nextStateId
+   }
+   return rc
+}
+
+
+def getBlueIrisHubAction(Map body)
+{
+	final host = getHostAddress();
+	final path = "/json"
+
+	def hubAction = new physicalgraph.device.HubAction(
+		method: "POST",
+		path: path,
+		headers: [HOST:host],
+		body: body
+	)
+	log.info "getBlueIrisHubAction: prepared hubaction $hubAction, requestId: $hubAction.requestId"
+
+	hubAction
+}
+
+def sendError(statusMsg)
+{
+	sendEvent(name:"status", value: statusMsg)
+	sendEvent(name:"state", value: "unknown")
+	parent.onNotification("$device.displayName: $statusMsg");
+}
+
+def sendEventInit(cmd)
+{
+	def state;
+	switch(cmd.id) {
+    	case 'status': 
+        	state = 'unknown'
+            break
+        case 'set': 
+        	state = (cmd.workflow == 'arm' ? 'arming' : 'disarming')
+            break
+        default: 
+        	state = 'unknown' //TODO: error
+  	}
+	sendEvent(name:"state", value: state)
+	sendEvent(name:"status", value: "Logging in...")
+}
+
+def sendEventLogin(cmd)
+{
+	sendEvent(name:"status", value: "Opening session...")
+}
+
+def sendEventStatus(cmd)
+{
+	sendEvent(name:"status", value: "Getting status...")
+}
+
+def sendEventSet(cmd)
+{
+	log.debug("sendEventSet: executing ${cmd.workflow} workflow, ${cmd.context ? ('context: ' + cmd.context + ',') : ''} signal:${cmd.signal}, profile:${cmd.profile}")
+	sendEvent(name:"status", value: "Executing '${cmd.workflow.toString() == 'arm' ? 'arm' : 'disarm'}${cmd.context ? ' ' + cmd.context : ''}' command")
+}
+
+def sendEventFinalize(cmd, signal, profile, workflow)
+{
+	def isArmed = (workflow.toString() == 'arm')
+	def statusMsg = null
+    def statusDetails = null
+	if(cmd.id == 'set') {
+        statusMsg = "Successfully ${isArmed ? 'armed' : 'disarmed'}${cmd.context ? ' \'' + cmd.context + '\'' : ''} ..."
+        statusDetails = "Successfully ${isArmed ? 'armed' : 'disarmed'} ${cmd.context ? '\'' + cmd.context + '\'' : ''}"
+  	} else if(cmd.id == 'status') {
+		statusMsg = "Status is '${isArmed ? 'Armed' : 'Disarmed'}'"
+    	statusDetails = "Current status is '${isArmed ? 'Armed' : 'Disarmed'}' [signal:${signal ? 'green' : 'red'}, profile:${profile}]"
+	}
+    
+	sendEvent(name:"state", value: isArmed ? "armed" : "disarmed")
+	sendEvent(name:"status", value: statusMsg)
+	parent.onNotification("${device.displayName}: ${statusDetails}");
+}
+
+
+def getBIfFsmDef()
+{
+	[
+		init: [
+			action: {Map params ->
+            	def cmd = params.cmd
+   				params.persistentStg.cmd = params.cmd
+				sendEventInit(cmd)
+				parent.onBeginAsyncOp(getOperationTimeoutMs())
+				def haction = getBlueIrisHubAction([cmd: 'login']);
+				cmd.requestId = haction.requestId
+
+				[nextStateId:'login', isAsync:true, hubAction:haction]
+			}
+		],
+		login: [
+			action: {Map params ->
+            	def cmd = params.persistentStg.cmd            
+                def respData = params.respMsg.data
+
+				if(respData?.result == 'fail' && respData.session) {
+                	sendEventLogin(cmd)
+					
+					final u = settings.username
+    				final p = settings.password
+					final token = "$u:${respData.session}:$p"
+                    log.debug("getBIfFsmDef[login]: logging in user \"$u\"")
+					def haction = getBlueIrisHubAction([cmd: 'login', session: "${respData.session}", response: "${token.encodeAsMD5()}"]);
+					cmd.requestId = haction.requestId
+                    cmd.session = respData.session
+					[nextStateId: (cmd.id == 'set' ? 'set' : 'status'), isAsync:true, hubAction: haction]
+				} else {
+					log.error("getBIfFsmDef[login]: error: unexpected result from login call: $params.respMsg.data")
+					parent.onEndAsyncOp()
+					sendError("Error logging in: unexpected result $params.respMsg.data?.result")
+					[nextStateId: 'error']
+				}
+			}
+		],
+		status: [
+			action: {Map params ->
+            	def cmd = params.persistentStg.cmd
+                def respData = params.respMsg.data
+				if(respData?.result == 'success') {
+					sendEventStatus(cmd)
+					def haction = getBlueIrisHubAction([cmd: 'status', session: "${cmd.session}"]);
+					cmd.requestId = haction.requestId
+					[nextStateId: 'finalize', isAsync:true, hubAction: haction]
+				} else {
+					parent.onEndAsyncOp()
+					log.error("getBIfFsmDef[status]: error creating session: unsuccessful result from session login call: ${respData}");
+					sendError("Error establishing session: ${respData?.data?.reason}")
+					[nextStateId:'error']
+				}
+			}
+		],
+		set: [
+			action: {Map params ->
+            	def cmd = params.persistentStg.cmd
+                def respData = params.respMsg.data
+				if(respData?.result == 'success') {
+					sendEventSet(cmd)
+                    def hubActionParams = [cmd: 'status', session: "${cmd.session}"]
+                    if(cmd.signal != null) {
+                    	hubActionParams.signal = cmd.signal ? 1 : 0
+                    }
+                    if(cmd.profile != null) {
+                    	hubActionParams.profile = cmd.profile
+                    }
+					def haction = getBlueIrisHubAction(hubActionParams);
+					cmd.requestId = haction.requestId
+					[nextStateId:'finalize', isAsync:true, hubAction: haction]
+				} else {
+					parent.onEndAsyncOp()
+					log.error("getBIfFsmDef[action]: error creating session: unsuccessful result from session login call: ${respData}");
+					sendError("Error establishing session: ${respData.data?.reason}")
+					[nextStateId:'error']
+				}
+			}
+		],
+		finalize: [
+			action: {Map params ->
+              	boolean success = false
+                final cmd = params.persistentStg.cmd
+                final respData = params.respMsg.data
+                
+				if(respData?.result == 'success') {
+                
+                	def respSignal = (respData.data?.signal != null ? respData.data.signal == '1' :  null);
+                    def respProfile = respData.data?.profile
+
+					log.debug("getBIfFsmDef[finalize]: received 'success' response status, finalizing command ${cmd}, "
+                    			+ "response: [signal:${respSignal}, profile:${respProfile}]")
+
+					if( cmd.id == 'set'
+                       	&& (cmd.signal == null || cmd.signal == respSignal)
+                       	&& (cmd.profile == null || respProfile == cmd.profile.toString())) {
+
+							sendEventFinalize(cmd, respSignal, respProfile, cmd.workflow)
+                            success = true
+                            
+                 	} else if(cmd.id == 'status' && respSignal != null && respProfile != null) {
+
+						def config = parent.onGetConfig()
+						def workflow = deduceWorkflow(respSignal, respProfile, config)
+                     	sendEventFinalize(cmd, respSignal, respProfile, workflow)
+ 						success = true
+                   	} 
+              	}
+
+				parent.onEndAsyncOp()
+                if(success) {
+                	[nextStateId:'success']
+              	} else {
+					log.error("getBIfFsmDef[finalize]: error setting status: unsuccessful result from setting status/signal: $params.respMsg.data");
+					sendError("Error setting status/signal: ${respData.data?.reason ?: 'signal mismatch...' }")
+					[nextStateId:'error']
+				}
+			}
+		],
+		timeout: [
+			action: {Map params ->
+				log.error("getBIfFsmDef[timeout]: operation timed out")
+				sendError("Operation timed out...")
+				[nextStateId:'error']
+			}
+		],
+		success: [
+			isFinal:true
+		],
+		error: [
+			isFinal:true
+		]
+	]
+}
+
+
+def configure()
+{
+	log.debug("configure: reseting states")
+	sendEvent(name:"status", value: ".")
+	sendEvent(name:"state", value: "disarmed") //TODO: initial state calc
+ }
+
+
+private getBIStg(boolean reset = false)
+{
+	if (state.biStg == null || reset) {
+		state.biStg = [:]
+	}
+	state.biStg
+}
+
+private Map getBICommands()
+{
+	return [
+    	set: {Map p ->
+			def rc = [
+            	id: 'set',
+        		signal: p.signal,
+        		profile: p.profile,
+                workflow: p.workflow	//one of ['arm', 'disarm']
+ 			]
+            if (p.context != null) {
+            	rc.context = p.context	//optional (location mode name)
+            }
+            
+            rc
+        },
+    	status: {->
+			return [
+            	id: 'status',
+                status: true
+ 			]
+        }
+
+        
+    ]
+}
+
+//signal: null (N/A), true(green), false(red)
+//profile: null (N/A), number
+private deduceWorkflow(Boolean signal, String profile, final config)
+{
+	if ((signal != null && !signal) || 
+    	(config.arming?.disarm?.signal == signal && config.arming?.disarm?.profile.toString() == profile)) {
+
+		"disarm"
+  	} else {
+    	"arm"
+    }
+}
+
+def arm()
+{
+	log.debug('arm: running fsm')
+
+	def config = parent.onGetConfig()
+    log.debug("arm: retrieved config: $config")
+
+	def armConfig = config.arming?.arm
+    if(armConfig) {
+
+		def rc = fsmExec(getBIStg(true), getBIfFsmDef(), [fsmInitialState:'init', cmd:getBICommands().set(
+        					signal:armConfig.signal, profile:armConfig.profile, workflow:'arm')])
+    
+		if(rc.error || !rc.actionResult.isAsync) {
+			log.error("arm: error executing fsm: ${rc.error ?: 'expected asynchronious action result'}")
+		} else {
+			return rc.actionResult.hubAction
+		}
+    } else {
+    	log.error("arm: missing configuration (arming/arm) in $config")
+	    // TODO: check return
+    }
+    
+}
+
+def disarm()
+{
+	log.debug('disarm: running fsm')
+    
+	def config = parent.onGetConfig();
+    log.debug("disarm: retrieved config: $config")
+
+	def disarmConfig = config.arming?.disarm
+    if(disarmConfig) {
+		def rc = fsmExec(getBIStg(true), getBIfFsmDef(), [fsmInitialState:'init', cmd:getBICommands().set(
+    		     			signal:disarmConfig.signal, profile:disarmConfig.profile, workflow:'disarm')])
+
+		if(rc.error || !rc.actionResult.isAsync) {
+			log.error("disarm: error executing fsm: ${rc.error ?: 'expected asynchronious action result'}")
+		} else {
+			return rc.actionResult.hubAction
+		}
+   	} else {
+    	log.error("disarm: missing configuration (arming/arm) in $config")
+	    // TODO: check return
+    }
+}
+
+def location(locationId)
+{
+	def config = parent.onGetConfig()
+    log.debug("location: retrieved config: $config, processing location $locationId")
+    
+    def locationConfig = config.location ? config.location[locationId] : null
+    if(locationConfig) {
+
+		def rc = fsmExec(getBIStg(true), getBIfFsmDef(), [fsmInitialState:'init', cmd:getBICommands().set(
+        			signal: locationConfig.signal, profile: locationConfig.profile, 
+                    workflow: deduceWorkflow(locationConfig.signal, locationConfig.profile, config), context: locationConfig.name)])
+
+		if(rc.error || !rc.actionResult.isAsync) {
+			log.error("location: error executing fsm: ${rc.error ?: 'expected asynchronious action result'}")
+		} else {
+			return rc.actionResult.hubAction
+		}
+	
+    } else {
+    	log.debug("location: no active configuration found for locationId:${locationId}' in configuration [$config]")
+	    // TODO: check return
+	}
+	
+}
+
+def retry()
+{
+	def stg = getBIStg()
+
+	if(stg.cmd != null) {
+		log.debug("retry: running fsm with cmd:$stg.cmd")
+		def rc = fsmExec(getBIStg(true), getBIfFsmDef(), [fsmInitialState:'init', cmd:stg.cmd])
+
+		if(rc.error || !rc.actionResult.isAsync) {
+			log.error("retry: error executing fsm: ${rc.error ?: 'expected asynchronious action result'}")
+		} else {
+			return rc.actionResult.hubAction
+		}
+	} else {
+      log.debug("retry: no state to retry")
+    }
+}
+
+def timeout()
+{
+	def stg = getBIStg()
+	log.debug("timeout: running fsm with cmd:${stg.cmd}")
+
+	def rc = fsmExec(getBIStg(true), getBIfFsmDef(), [fsmInitialState:'timeout', cmd:stg.cmd])
+
+	if(rc.error || rc.actionResult.isAsync) {
+		log.error("timeout: error executing fsm: ${rc.error ?: 'expected synchronious action result'}")
+	}
+}
+
+def refresh()
+{
+	log.debug('refresh: running fsm: status command')
+
+	def rc = fsmExec(getBIStg(true), getBIfFsmDef(), [fsmInitialState:'init', cmd:getBICommands().status()])
+
+	if(rc.error || !rc.actionResult.isAsync) {
+		log.error("refresh: error executing fsm: ${rc.error ?: 'expected asynchronious action result'}")
+	} else {
+		return rc.actionResult.hubAction
+	}
+}
+
+def parse(msg)
+{
+	def lanMsg = parseLanMessage(msg)
+	log.info "parse: parsed lan message: $lanMsg"
+
+
+	if (lanMsg && lanMsg.headers && lanMsg.body) {
+    	log.info "parse: parsed lan message requestId:$lanMsg.requestId, body:$lanMsg.body"
+
+		def stg = getBIStg()
+
+		if(fsmGetStateId(stg) && stg.cmd.requestId == lanMsg.requestId) {
+			log.debug("parse: received expected response mesage; requestId:$lanMsg.requestId, state:${fsmGetStateId(stg)}")
+
+			def rc = fsmExec(stg, getBIfFsmDef(), [respMsg:lanMsg])
+
+			if(rc.error) {
+				log.error("parse: error executing fsm: ${rc.error ?: 'expected asynchronious action result'}")
+			} else if(rc.actionResult.isAsync) {
+				return [rc.actionResult.hubAction]
+			}
+
+		} else {
+			log.error("parse: skipping message: request id does not match: stg.request_id:$stg.cmd.requestId, lanMsg.requestId:$lanMsg.requestId")
+		}
+
+	} else {
+		log.error("parse: skipping message: unrecognized lan message")
+	}
+}
+
+
+private getOperationTimeoutMs()
+{
+   10 * 1000;
+}
+
+private Integer convertHexToInt(hex) {
+   Integer.parseInt(hex,16)
+}
+
+private String convertHexToIP(hex) {
+   [convertHexToInt(hex[0..1]),convertHexToInt(hex[2..3]),convertHexToInt(hex[4..5]),convertHexToInt(hex[6..7])].join(".")
+}
+
+private getHostAddress() {
+   def parts = device.deviceNetworkId.split(":")
+   def ip = convertHexToIP(parts[0])
+   def port = convertHexToInt(parts[1])
+   return ip + ":" + port
+}
+
+private hashMD5(String somethingToHash) {
+   java.security.MessageDigest.getInstance("MD5").digest(somethingToHash.getBytes("UTF-8")).encodeHex().toString()
+}
+
+private calcDigestAuth(String method, String uri) {
+   def HA1 =  hashMD5("${getUsername}::${getPassword}")
+   def HA2 = hashMD5("${method}:${uri}")
+   def response = hashMD5("${HA1}::::auth:${HA2}")
+
+   'Digest username="'+ getUsername() + '", realm="", nonce="", uri="'+ uri +'", qop=auth, nc=, cnonce="", response="' + response + '", opaque=""'
+}

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

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017 SmartThings
+ *  Copyright 2016 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:
@@ -64,7 +64,6 @@ private getATTRIBUTE_HUE() { 0x0000 }
 private getATTRIBUTE_SATURATION() { 0x0001 }
 private getHUE_COMMAND() { 0x00 }
 private getSATURATION_COMMAND() { 0x03 }
-private getMOVE_TO_HUE_AND_SATURATION_COMMAND() { 0x06 }
 private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
 
 // Parse incoming device messages to generate events
@@ -85,11 +84,11 @@ def parse(String description) {
 
 		if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
 			if(zigbeeMap.attrInt == ATTRIBUTE_HUE){  //Hue Attribute
-				def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
+				def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
 				sendEvent(name: "hue", value: hueValue, descriptionText: "Color has changed")
 			}
 			else if(zigbeeMap.attrInt == ATTRIBUTE_SATURATION){ //Saturation Attribute
-				def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
+				def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
 				sendEvent(name: "saturation", value: saturationValue, descriptionText: "Color has changed", displayed: false)
 			}
 		}
@@ -124,12 +123,7 @@ def ping() {
 }
 
 def refresh() {
-	zigbee.onOffRefresh() +
+	zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION) + zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, DataType.UINT8, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, DataType.UINT8, 1, 3600, 0x01)
-	zigbee.levelRefresh() +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION) +
-	zigbee.onOffConfig(0, 300) +
-	zigbee.levelConfig()
 }
 
 def configure() {
@@ -139,38 +133,26 @@ def configure() {
 	sendEvent(name: "checkInterval", value: 3 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 
 	// OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
-	refresh()
+	zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, DataType.UINT8, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, DataType.UINT8, 1, 3600, 0x01) + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }
 
 def setLevel(value) {
 	zigbee.setLevel(value)
 }
 
-private getScaledHue(value) {
-	zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-}
-
-private getScaledSaturation(value) {
-	zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-}
-
 def setColor(value){
 	log.trace "setColor($value)"
-	zigbee.on() +
+	zigbee.on() + setHue(value.hue) + "delay 500" + setSaturation(value.saturation)
-	zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_HUE_AND_SATURATION_COMMAND,
-		getScaledHue(value.hue), getScaledSaturation(value.saturation), "0000") +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }
 
 def setHue(value) {
-	zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, getScaledHue(value), "00", "0000") +
+	def scaledHueValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE)
+	zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, scaledHueValue, "00", "0500")       //payload-> hue value, direction (00-> shortest distance), transition time (1/10th second) (0500 in U16 reads 5)
 }
 
 def setSaturation(value) {
-	zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, getScaledSaturation(value), "0000") +
+	def scaledSatValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+	zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, scaledSatValue, "0500") + "delay 1000" + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }
 
 def installed() {
@@ -179,4 +161,4 @@ def installed() {
 			sendEvent(name: "level", value: 100)
 		}
 	}
-}
+}

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

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017 SmartThings
+ *  Copyright 2016 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:
@@ -78,7 +78,6 @@ private getATTRIBUTE_HUE() { 0x0000 }
 private getATTRIBUTE_SATURATION() { 0x0001 }
 private getHUE_COMMAND() { 0x00 }
 private getSATURATION_COMMAND() { 0x03 }
-private getMOVE_TO_HUE_AND_SATURATION_COMMAND() { 0x06 }
 private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
 private getATTRIBUTE_COLOR_TEMPERATURE() { 0x0007 }
 
@@ -103,11 +102,11 @@ def parse(String description) {
 
         if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
             if(zigbeeMap.attrInt == ATTRIBUTE_HUE){  //Hue Attribute
-                def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
+                def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
                 sendEvent(name: "hue", value: hueValue, descriptionText: "Color has changed")
             }
             else if(zigbeeMap.attrInt == ATTRIBUTE_SATURATION){ //Saturation Attribute
-                def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
+                def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
                 sendEvent(name: "saturation", value: saturationValue, descriptionText: "Color has changed", displayed: false)
             }
         }
@@ -142,13 +141,7 @@ def ping() {
 }
 
 def refresh() {
-    zigbee.onOffRefresh() +
+    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION) + zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, DataType.UINT8, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, DataType.UINT8, 1, 3600, 0x01)
-    zigbee.levelRefresh() +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE) +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION) +
-    zigbee.onOffConfig(0, 300) +
-    zigbee.levelConfig()
 }
 
 def configure() {
@@ -163,12 +156,7 @@ def configure() {
 
 def setColorTemperature(value) {
     setGenericName(value)
-    value = value as Integer
+    zigbee.setColorTemperature(value)
-    def tempInMired = (1000000 / value) as Integer
-    def finalHex = zigbee.swapEndianHex(zigbee.convertToHexString(tempInMired, 4))
-
-    zigbee.command(COLOR_CONTROL_CLUSTER, 0x0A, "$finalHex 0000") +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE)
 }
 
 //Naming based on the wiki article here: http://en.wikipedia.org/wiki/Color_temperature
@@ -192,31 +180,19 @@ def setLevel(value) {
     zigbee.setLevel(value)
 }
 
-private getScaledHue(value) {
-    zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-}
-
-private getScaledSaturation(value) {
-    zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-}
-
 def setColor(value){
     log.trace "setColor($value)"
-    zigbee.on() +
+    zigbee.on() + setHue(value.hue) + "delay 300" + setSaturation(value.saturation)
-    zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_HUE_AND_SATURATION_COMMAND,
-        getScaledHue(value.hue), getScaledSaturation(value.saturation), "0000") +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }
 
 def setHue(value) {
-    zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, getScaledHue(value), "00", "0000") +
+    def scaledHueValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE)
+    zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, scaledHueValue, "00", "0500")       //payload-> hue value, direction (00-> shortest distance), transition time (1/10th second) (0500 in U16 reads 5)
 }
 
 def setSaturation(value) {
-    zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, getScaledSaturation(value), "0000") +
+    def scaledSatValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+    zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, scaledSatValue, "0500") + "delay 1000" + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }
 
 def installed() {
@@ -225,4 +201,4 @@ def installed() {
             sendEvent(name: "level", value: 100)
         }
     }
-}
+}

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

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017 SmartThings
+ *  Copyright 2015 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:
@@ -71,11 +71,6 @@ metadata {
     }
 }
 
-// Globals
-private getMOVE_TO_COLOR_TEMPERATURE_COMMAND() { 0x0A }
-private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
-private getATTRIBUTE_COLOR_TEMPERATURE() { 0x0007 }
-
 // Parse incoming device messages to generate events
 def parse(String description) {
     log.debug "description is $description"
@@ -128,11 +123,7 @@ def ping() {
 }
 
 def refresh() {
-    zigbee.onOffRefresh() +
+    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh() + zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.colorTemperatureConfig()
-    zigbee.levelRefresh() +
-    zigbee.colorTemperatureRefresh() +
-    zigbee.onOffConfig(0, 300) +
-    zigbee.levelConfig()
 }
 
 def configure() {
@@ -147,12 +138,7 @@ def configure() {
 
 def setColorTemperature(value) {
     setGenericName(value)
-	value = value as Integer
+    zigbee.setColorTemperature(value)
-    def tempInMired = (1000000 / value) as Integer
-    def finalHex = zigbee.swapEndianHex(zigbee.convertToHexString(tempInMired, 4))
-
-    zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_COLOR_TEMPERATURE_COMMAND, "$finalHex 0000") +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE)
 }
 
 //Naming based on the wiki article here: http://en.wikipedia.org/wiki/Color_temperature

devicetypes/smartthings/zll-rgb-bulb.src/zll-rgb-bulb.groovy

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017 SmartThings
+ *  Copyright 2016 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:
@@ -55,7 +55,6 @@ private getATTRIBUTE_HUE() { 0x0000 }
 private getATTRIBUTE_SATURATION() { 0x0001 }
 private getHUE_COMMAND() { 0x00 }
 private getSATURATION_COMMAND() { 0x03 }
-private getMOVE_TO_HUE_AND_SATURATION_COMMAND() { 0x06 }
 private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
 
 // Parse incoming device messages to generate events
@@ -73,11 +72,11 @@ def parse(String description) {
 
 		if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
 			if(zigbeeMap.attrInt == ATTRIBUTE_HUE){  //Hue Attribute
-				def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
+				def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 360)
 				sendEvent(name: "hue", value: hueValue, displayed:false)
 			}
 			else if(zigbeeMap.attrInt == ATTRIBUTE_SATURATION){ //Saturation Attribute
-				def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
+				def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
 				sendEvent(name: "saturation", value: saturationValue, displayed:false)
 			}
 		}
@@ -109,46 +108,28 @@ def configure() {
 }
 
 def configureAttributes() {
-	zigbee.onOffConfig() +
+	zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, DataType.UINT8, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, DataType.UINT8, 1, 3600, 0x01)
-	zigbee.levelConfig()
 }
 
 def refreshAttributes() {
-	zigbee.onOffRefresh() +
+	zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
-	zigbee.levelRefresh() +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }
 
 def setLevel(value) {
 	zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
-private getScaledHue(value) {
-	zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-}
-
-private getScaledSaturation(value) {
-	zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-}
-
 def setColor(value){
 	log.trace "setColor($value)"
-	zigbee.on() +
+	zigbee.on() + setHue(value.hue) + ["delay 300"] + setSaturation(value.saturation) + ["delay 2000"] + refreshAttributes()
-	zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_HUE_AND_SATURATION_COMMAND,
-		getScaledHue(value.hue), getScaledSaturation(value.saturation), "0000") +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }
 
 def setHue(value) {
-	//payload-> hue value, direction (00-> shortest distance), transition time (1/10th second)
+	def scaledHueValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-	zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, getScaledHue(value), "00", "0000") +
+	zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, scaledHueValue, "00", "0500") + ["delay 1500"] + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE)      //payload-> hue value, direction (00-> shortest distance), transition time (1/10th second) (0500 in U16 reads 5)
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE)
 }
 
 def setSaturation(value) {
-	//payload-> sat value, transition time
+	def scaledSatValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-	zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, getScaledSaturation(value), "0000") +
+	zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, scaledSatValue, "0500") + ["delay 1500"] + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)      //payload-> sat value, transition time
-	zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }

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

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017 SmartThings
+ *  Copyright 2016 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:
@@ -70,7 +70,6 @@ private getATTRIBUTE_HUE() { 0x0000 }
 private getATTRIBUTE_SATURATION() { 0x0001 }
 private getHUE_COMMAND() { 0x00 }
 private getSATURATION_COMMAND() { 0x03 }
-private getMOVE_TO_HUE_AND_SATURATION_COMMAND() { 0x06 }
 private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
 private getATTRIBUTE_COLOR_TEMPERATURE() { 0x0007 }
 
@@ -89,11 +88,11 @@ def parse(String description) {
 
         if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
             if(zigbeeMap.attrInt == ATTRIBUTE_HUE){  //Hue Attribute
-                def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
+                def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 360)
                 sendEvent(name: "hue", value: hueValue, displayed:false)
             }
             else if(zigbeeMap.attrInt == ATTRIBUTE_SATURATION){ //Saturation Attribute
-                def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 0xfe * 100)
+                def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
                 sendEvent(name: "saturation", value: saturationValue, displayed:false)
             }
         }
@@ -125,16 +124,11 @@ def configure() {
 }
 
 def configureAttributes() {
-    zigbee.onOffConfig() +
+    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, DataType.UINT8, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, DataType.UINT8, 1, 3600, 0x01)
-    zigbee.levelConfig()
 }
 
 def refreshAttributes() {
-    zigbee.onOffRefresh() +
+    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
-    zigbee.levelRefresh() +
-    zigbee.colorTemperatureRefresh() +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }
 
 def setColorTemperature(value) {
@@ -145,32 +139,17 @@ def setLevel(value) {
     zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()        //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
-private getScaledHue(value) {
-    zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-}
-
-private getScaledSaturation(value) {
-    zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-}
-
 def setColor(value){
     log.trace "setColor($value)"
-    zigbee.on() +
+    zigbee.on() + setHue(value.hue) + ["delay 300"] + setSaturation(value.saturation) + ["delay 2000"] + refreshAttributes()
-    zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_HUE_AND_SATURATION_COMMAND,
-        getScaledHue(value.hue), getScaledSaturation(value.saturation), "0000") +
-    zigbee.onOffRefresh() +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }
 
 def setHue(value) {
-    //payload-> hue value, direction (00-> shortest distance), transition time (1/10th second)
+    def scaledHueValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-    zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, getScaledHue(value), "00", "0000") +
+    zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, scaledHueValue, "00", "0500") + ["delay 1500"] + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE)       //payload-> hue value, direction (00-> shortest distance), transition time (1/10th second) (0500 in U16 reads 5)
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE)
 }
 
 def setSaturation(value) {
-    //payload-> sat value, transition time
+    def scaledSatValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-    zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, getScaledSaturation(value), "0000") +
+    zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, scaledSatValue, "0500") + ["delay 1500"] + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)      //payload-> sat value, transition time
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }

devicetypes/smartthings/zll-white-color-temperature-bulb-5000k.src/zll-white-color-temperature-bulb-5000k.groovy

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017 SmartThings
+ *  Copyright 2016 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:
@@ -66,11 +66,6 @@ metadata {
     }
 }
 
-// Globals
-private getMOVE_TO_COLOR_TEMPERATURE_COMMAND() { 0x0A }
-private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
-private getATTRIBUTE_COLOR_TEMPERATURE() { 0x0007 }
-
 // Parse incoming device messages to generate events
 def parse(String description) {
     log.debug "description is $description"
@@ -100,14 +95,14 @@ def setLevel(value) {
 }
 
 def refresh() {
-    def cmds = zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
+	def cmds = zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
 
-    // Do NOT config if the device is the Eaton Halo_LT01, it responds with "switch:off" to onOffConfig, and maybe other weird things with the others
+	// Do NOT config if the device is the Eaton Halo_LT01, it responds with "switch:off" to onOffConfig, and maybe other weird things with the others
     if (!((device.getDataValue("manufacturer") == "Eaton") && (device.getDataValue("model") == "Halo_LT01"))) {
-        cmds += zigbee.onOffConfig() + zigbee.levelConfig()
+        cmds = cmds + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig()
     }
 
-    cmds
+	cmds
 }
 
 def poll() {
@@ -143,7 +138,7 @@ def configure() {
     log.debug "configure()"
     configureHealthCheck()
     // Implementation note: for the Eaton Halo_LT01, it responds with "switch:off" to onOffConfig, so be sure this is before the call to onOffRefresh
-    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
+    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
 }
 
 def updated() {
@@ -153,12 +148,7 @@ def updated() {
 
 def setColorTemperature(value) {
     setGenericName(value)
-    value = value as Integer
+    zigbee.setColorTemperature(value) + ["delay 1500"] + zigbee.colorTemperatureRefresh()
-    def tempInMired = (1000000 / value) as Integer
-    def finalHex = zigbee.swapEndianHex(zigbee.convertToHexString(tempInMired, 4))
-
-    zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_COLOR_TEMPERATURE_COMMAND, "$finalHex 0000") +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE)
 }
 
 //Naming based on the wiki article here: http://en.wikipedia.org/wiki/Color_temperature

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

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017 SmartThings
+ *  Copyright 2016 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:
@@ -68,11 +68,6 @@ metadata {
     }
 }
 
-// Globals
-private getMOVE_TO_COLOR_TEMPERATURE_COMMAND() { 0x0A }
-private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
-private getATTRIBUTE_COLOR_TEMPERATURE() { 0x0007 }
-
 // Parse incoming device messages to generate events
 def parse(String description) {
     log.debug "description is $description"
@@ -99,11 +94,7 @@ def setLevel(value) {
 }
 
 def refresh() {
-    zigbee.onOffRefresh() +
+    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh() + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig()
-    zigbee.levelRefresh() +
-    zigbee.colorTemperatureRefresh() +
-    zigbee.onOffConfig() +
-    zigbee.levelConfig()
 }
 
 def poll() {
@@ -138,7 +129,8 @@ def configureHealthCheck() {
 def configure() {
     log.debug "configure()"
     configureHealthCheck()
-    refresh()
+    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
+
 }
 
 def updated() {
@@ -148,12 +140,7 @@ def updated() {
 
 def setColorTemperature(value) {
     setGenericName(value)
-    value = value as Integer
+    zigbee.setColorTemperature(value) + ["delay 1500"] + zigbee.colorTemperatureRefresh()
-    def tempInMired = (1000000 / value) as Integer
-    def finalHex = zigbee.swapEndianHex(zigbee.convertToHexString(tempInMired, 4))
-
-    zigbee.command(COLOR_CONTROL_CLUSTER, MOVE_TO_COLOR_TEMPERATURE_COMMAND, "$finalHex 0000") +
-    zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE)
 }
 
 //Naming based on the wiki article here: http://en.wikipedia.org/wiki/Color_temperature

smartapps/df/blueiris-localconnect2.src/blueiris-localconnect2.groovy

@@ -0,0 +1,384 @@
+/**
+ *  Copyright 2015 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:
+ *
+ *      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.
+ *
+ *  BlueIris (LocalConnect2)
+ *
+ *  Author: Nicolas Neverov
+ *  Date: 2017-04-30
+ */
+
+
+definition(
+    name: "BlueIris (LocalConnect2)",
+    namespace: "df",
+    author: "df",
+    description: "BlueIris local integration",
+    category: "Safety & Security",
+    singleInstance: true,
+    iconUrl: "https://graph.api.smartthings.com/api/devices/icons/st.doors.garage.garage-closed",
+    iconX2Url: "https://graph.api.smartthings.com/api/devices/icons/st.doors.garage.garage-closed?displaySize=2x"
+)
+
+preferences {
+	page(name: "setup", title: "Blue Iris Setup", content: "pageSetupCallback")
+	page(name: "mode", title: "Blue Iris Modes Setup", content: "renderModePage")
+	page(name: "validate", title: "Blue Iris Setup", content: "pageValidateCallback")
+
+}
+
+def switchHandler(evt) 
+{
+    log.debug "setupDevice: switch event: $evt.value"
+}
+
+
+private Map getValidators()
+{
+	return [
+		hostAddress: { addr ->
+        	return addr ==~ /\d+\.\d+\.\d+\.\d+(:\d+)?/
+    	},
+        mode: { Map p ->
+        	def rc = []
+
+			if (p.aProfileApply) {
+            	if (p.aProfile == null) {
+                	rc.push("Arming profile is required");
+                } else if (p.aProfile < 1 || p.aProfile > 5) {
+                	rc.push("Arming profile must be within [1-5] range")
+                }
+            }
+
+			if (p.dProfileApply) {
+            	if (p.dProfile == null) {
+                	rc.push("Disarming profile is required");
+                } else if (p.dProfile < 1 || p.dProfile > 5) {
+                	rc.push("Disarming profile must be within [1-5] range")
+                }
+            }
+
+			def armProfile = p.aProfileApply ? p.aProfile : 0;
+			def disarmProfile = p.dProfileApply ? p.dProfile : 0;
+			if (p.aSignal == p.dSignal && armProfile == disarmProfile && armProfile != null) {
+            	rc.push("Arming and disarming signal/profile combinations must differ")
+            }
+
+            return rc
+        }
+	]
+}
+
+def pageSetupCallback()
+{
+	if (canInstallLabs()) {
+		log.debug("pageSetupCallback: refreshing")
+
+		def v = getValidators()
+		return dynamicPage(name:"setup", title:"Setting up Blue Iris integration", nextPage:"", install: false, uninstall: true) {
+        
+			section("New BlueIris Server setup") {
+            		input name:"devicename", type:"text", title: "Device name", required:true, defaultValue: "Blue Iris Server"
+    	        	input name:"hub", type:"hub", title: "Hub gateway", required:true 
+   	        		input name:"ip", type:"text", title: "IP address:port", required:true, submitOnChange:true 
+	                if (!v.hostAddress(ip)) {
+                    	paragraph(required:true, "Please specify valid IP address")
+                    }
+	   	        	input name:"username", type:"text", title: "Username", required:true, autoCorrect:false
+    	        	input name:"password", type:"password", title: "Password", required:true, autoCorrect:false
+			}
+            if(v.hostAddress(ip)) {
+            	section("") {
+					href(title:"Next", description:"", page:"mode", required:true)
+              	}
+            }
+		}
+
+	} else {
+
+		return dynamicPage(name:"setup", title:"Upgrade needed", nextPage:"", install:false, uninstall: true) {
+			section("Upgrade needed") {
+				paragraph "Hub firmware needs to be upgraded"
+			}
+		}
+	}
+
+}
+
+private	makeProfileInput(inputName)
+{
+	input(name:inputName.toString(), type:"number", title:"Select profile [1-5]:", range:"1..5", submitOnChange:true, required:true)
+}
+
+def renderModePage() {
+	def v = getValidators()
+
+	return dynamicPage(name:"mode", title:"Setting up Blue Iris modes", nextPage:"", install: false, uninstall: true) {
+		section(hideable:true, "Arming modes") {
+            input(name:"armSignal", type:"enum", title:"When Armed, set signal to", options:["Green","N/A"], defaultValue:"Green", submitOnChange:true, required:false)
+			input(name:"armProfileApply", type:"bool", title:"Also, change profile?", defaultValue:false, submitOnChange:true) 
+            if (armProfileApply) {
+                makeProfileInput("armProfile")
+           	}
+            
+			input(name:"disarmSignal", type:"enum", title:"When Disarmed, set signal to", options: ["Red", "N/A"], defaultValue:"Red", submitOnChange:true, required:false)
+			input(name:"disarmProfileApply", type:"bool", title:"Also, change profile?", defaultValue:false, submitOnChange:true) 
+            if (disarmProfileApply) {
+                makeProfileInput("disarmProfile")
+           	}
+		}
+        
+        section(hideable:true, "Location modes") {
+        	location.modes.each {mode->
+        		input(name:"locationSignal${mode.id}".toString(), type:"enum", title:"When in \"$mode.name\" mode, set signal to", options: ["Green", "Red", "N/A"], defaultValue:"N/A", required:false, submitOnChange:true)
+				input(name:"locationProfileApply${mode.id}".toString(), type:"bool", title:"Also, change profile?", defaultValue:false, required:false, submitOnChange:true) 
+            	if (settings["locationProfileApply${mode.id}".toString()] == true) {
+                    makeProfileInput("locationProfile${mode.id}")
+	           	}
+        	}
+     	}
+
+		def p = [
+        	aSignal: armSignal,
+        	aProfileApply: armProfileApply,
+            aProfile: armProfile,
+            dSignal: disarmSignal,
+            dProfileApply: disarmProfileApply,
+            dProfile: disarmProfile
+        ]
+       
+		def valRc = v.mode(p)
+        if (valRc) {
+        	section("Please correct errors:") {
+            	valRc.each {err ->
+                	paragraph(required:true, "*** $err")
+                }
+            }
+        } else {
+			section("") {
+				href(title:"Next", description:"", page:"validate", required:true)
+			}
+      	}
+        
+  	}
+}
+
+def pageValidateCallback()
+{
+	if(ip ==~ /\d+\.\d+\.\d+\.\d+(:\d+)?/) {
+    	return dynamicPage(name:"validate", title:"Setting up Blue Iris integration", install:true, uninstall:false) {
+        	section() {
+            	paragraph( 
+                	image: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
+                	title:"Ready to install", 
+                    "Press 'Done' to confirm installation"
+             	)
+          	}
+        }
+	} else {
+    	return dynamicPage(name:"validate", title:"Setting up Blue Iris", nextPage:"", install: false, uninstall:false) {
+        	section("Error validating setup preferences") {
+            	paragraph( 
+                	image: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
+                	title:"IP Address", 
+                    required:true, 
+                    "Should look similar to 111.222.333.555:8001 (port is optional)"
+             	)
+            }
+        }
+    }
+}
+
+
+def installed()
+{
+	log.debug("installed: started") //with $settings
+	init()
+}
+
+def updated()
+{
+	log.debug("updated: started"); //with $settings
+	uninit();
+	init()
+}
+
+def uninstalled()
+{
+
+	uninit(false);
+}
+
+def init()
+{
+	if(!state.subscribed) {
+    	subscribe(location, "mode", modeChangeHandler)
+		state.subscribed = true
+	}
+
+	state.config = assembleConfig()
+
+    final dni = ipEpToHex(ip)
+    def d = getChildDevice(dni)
+    
+    if(d) {
+    	log.debug("init: deleting existing BlueIris Server device, dni:$dni")
+    	deleteChildDevice(dni)
+    }
+    
+    if(true) {
+		log.debug "init: adding new BlueIris Server device, dni:$dni, username:$username, password:*****, gateway hub id:$hub.id"
+		d = addChildDevice("df", "blueiris2", dni, hub.id, 
+        	[name:"blueiris", label: devicename, completedSetup:true,
+             "preferences":["username":username, "password":password]
+            ])
+		d.configure()
+	    subscribe(d, "switch", switchHandler)
+    } else {
+
+		log.debug "init: skipping adding BlueIris Server device, dni:$dni - already exists"
+    }
+    
+}
+
+def uninit(boolean f_unsubscribe = true)
+{
+	if(state.subscribed) {
+
+		if(f_unsubscribe) {
+			unsubscribe()
+        }
+        
+        getAllChildDevices().each {
+        }
+        
+		state.subscribed = false
+    }
+}
+
+
+def modeChangeHandler(evt)
+{
+    def f_arm = (evt.value == 'Away')
+	log.debug("modeChangeHandler: detected mode change: $evt.name:$evt.value: ${f_arm ? 'arming' : 'disarming'}")
+
+	def mode = null
+	location.modes.each {m->
+    	if (m.name == evt.value) {
+        	mode = m
+      	}
+    }
+
+	getAllChildDevices().each {
+    	it.location(mode.id)
+    }
+}
+
+def asyncOpCallback()
+{
+	log.debug("asyncOpCallback: timeout:$atomicState.asyncOpTimeout, ${now() - atomicState.asyncOpTs}(msec) elapsed")
+    if(atomicState.asyncOpTimeout) {
+    	getAllChildDevices().each {
+        	it.timeout()
+        }
+    }
+}
+
+def onBeginAsyncOp(int timeout_ms)
+{
+	log.debug("onBeginAsyncOp: ${now()}")
+    atomicState.asyncOpTimeout = true
+    atomicState.asyncOpTs = now()
+	runOnce(new Date(now() + timeout_ms), asyncOpCallback, [overwrite: true])
+}
+
+def onEndAsyncOp()
+{
+	log.debug("onEndAsyncOp: ${now()}")
+    atomicState.asyncOpTimeout = false
+	runOnce(new Date(now() + 1), asyncOpCallback, [overwrite: true])
+}
+
+def onNotification(msg)
+{
+	log.debug("sendNotification: sending $msg")
+	sendNotificationEvent(msg)
+}
+
+def onGetConfig()
+{
+	return state.config
+}
+
+private assembleConfig()
+{
+	def getElementCfg = {prefix, id, name ->
+    	def signal = settings["${prefix}Signal${id}".toString()]
+        def profileApply = settings["${prefix}ProfileApply${id}".toString()]
+        def profile = settings["${prefix}Profile${id}".toString()]
+        
+    	return signal != 'N/A' || profileApply ? [
+        	name: name,
+        	signal: signal == 'N/A' ? null : (signal == "Green"),
+            profile: profileApply ? profile : null
+        ] : null
+    }
+
+    def rc = [
+    	arming: [
+        	arm: getElementCfg('arm', '', 'Arm'),
+            disarm: getElementCfg('disarm', '', 'Disarm')
+        ],
+        location: [:]
+    ]
+
+	location.modes.each {mode->
+    	rc.location["$mode.id".toString()] = getElementCfg('location', mode.id, mode.name)
+    }
+
+	log.info("onGetConfig: assembled config: [$rc]")
+	rc
+}
+
+private Boolean canInstallLabs()
+{
+	return hasAllHubsOver("000.011.00603")
+}
+
+private Boolean hasAllHubsOver(String desiredFirmware)
+{
+	return realHubFirmwareVersions.every { fw -> fw >= desiredFirmware }
+}
+
+private List getRealHubFirmwareVersions()
+{
+	return location.hubs*.firmwareVersionString.findAll { it }
+}
+
+private String ipEpToHex(ep) {
+	final parts = ep.split(':');
+    final ipHex = parts[0].tokenize('.').collect{ String.format('%02X', it.toInteger() ) }.join()
+    final portHex = String.format('%04X', (parts[1]?:80).toInteger())
+   
+    return "$ipHex:$portHex"
+}
+
+
+private String hexToString(String txtInHex)
+{
+	byte [] txtInByte = new byte [txtInHex.length() / 2];
+	int j = 0;
+	for (int i = 0; i < txtInHex.length(); i += 2)
+	{
+			txtInByte[j++] = Byte.parseByte(txtInHex.substring(i, i + 2), 16);
+	}
+	return new String(txtInByte);
+}

smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy

@@ -1,7 +1,3 @@
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-import java.security.InvalidKeyException;
-
 /**
  *  OpenT2T SmartApp Test
  *
@@ -43,7 +39,7 @@ definition(
  *  garageDoors         | door          | open, close           | unknown, closed, open, closing, opening
  *  cameras             | image         | take                  | <String>
  *  thermostats         | thermostat    | setHeatingSetpoint,   | temperature, heatingSetpoint, coolingSetpoint,
- * 	                    |				| setCoolingSetpoint,   | thermostatSetpoint, thermostatMode,
+ *	                    |				| setCoolingSetpoint,   | thermostatSetpoint, thermostatMode,
  *                      |				| off, heat, cool, auto,| thermostatFanMode, thermostatOperatingState
  *                      |				| emergencyHeat,        |
  *                      |				| setThermostatMode,    |
@@ -59,7 +55,7 @@ preferences {
 		input "contactSensors", "capability.contactSensor", title: "Which Contact Sensors", multiple: true, required: false, hideWhenEmpty: true
 		input "garageDoors", "capability.garageDoorControl", title: "Which Garage Doors?", multiple: true, required: false, hideWhenEmpty: true
 		input "locks", "capability.lock", title: "Which Locks?", multiple: true, required: false, hideWhenEmpty: true
-		input "cameras", "capability.videoCapture", title: "Which Cameras?", multiple: true, required: false, hideWhenEmpty: true
+		input "cameras", "capability.videoCapture", title: "Which Cameras?",  multiple: true, required: false, hideWhenEmpty: true
 		input "motionSensors", "capability.motionSensor", title: "Which Motion Sensors?", multiple: true, required: false, hideWhenEmpty: true
 		input "presenceSensors", "capability.presenceSensor", title: "Which Presence Sensors", multiple: true, required: false, hideWhenEmpty: true
 		input "switches", "capability.switch", title: "Which Switches and Lights?", multiple: true, required: false, hideWhenEmpty: true
@@ -70,49 +66,44 @@ preferences {
 
 def getInputs() {
 	def inputList = []
-	inputList += contactSensors ?: []
+	inputList += contactSensors?: []
-	inputList += garageDoors ?: []
+	inputList += garageDoors?: []
-	inputList += locks ?: []
+	inputList += locks?: []
-	inputList += cameras ?: []
+	inputList += cameras?: []
-	inputList += motionSensors ?: []
+	inputList += motionSensors?: []
-	inputList += presenceSensors ?: []
+	inputList += presenceSensors?: []
-	inputList += switches ?: []
+	inputList += switches?: []
-	inputList += thermostats ?: []
+	inputList += thermostats?: []
-	inputList += waterSensors ?: []
+	inputList += waterSensors?: []
 	return inputList
 }
 
 //API external Endpoints
 mappings {
 	path("/devices") {
-		action:
+		action: [
-		[
 				GET: "getDevices"
 		]
 	}
 	path("/devices/:id") {
-		action:
+		action: [
-		[
 				GET: "getDevice"
 		]
 	}
 	path("/update/:id") {
-		action:
+		action: [
-		[
 				PUT: "updateDevice"
 		]
 	}
 	path("/deviceSubscription") {
-		action:
+		action: [
-		[
+				POST: "registerDeviceChange",
-				POST  : "registerDeviceChange",
 				DELETE: "unregisterDeviceChange"
 		]
 	}
 	path("/locationSubscription") {
-		action:
+		action: [
-		[
+				POST: "registerDeviceGraph",
-				POST  : "registerDeviceGraph",
 				DELETE: "unregisterDeviceGraph"
 		]
 	}
@@ -125,21 +116,14 @@ def installed() {
 
 def updated() {
 	log.debug "Updating with settings: ${settings}"
-
+	if(state.deviceSubscriptionMap == null){
-	//Initialize state variables if didn't exist.
-	if (state.deviceSubscriptionMap == null) {
 		state.deviceSubscriptionMap = [:]
 		log.debug "deviceSubscriptionMap created."
 	}
-	if (state.locationSubscriptionMap == null) {
+	if( state.locationSubscriptionMap == null){
 		state.locationSubscriptionMap = [:]
 		log.debug "locationSubscriptionMap created."
 	}
-	if (state.verificationKeyMap == null) {
-		state.verificationKeyMap = [:]
-		log.debug "verificationKeyMap created."
-	}
-
 	unsubscribe()
 	registerAllDeviceSubscriptions()
 }
@@ -148,11 +132,9 @@ def initialize() {
 	log.debug "Initializing with settings: ${settings}"
 	state.deviceSubscriptionMap = [:]
 	log.debug "deviceSubscriptionMap created."
+	registerAllDeviceSubscriptions()
 	state.locationSubscriptionMap = [:]
 	log.debug "locationSubscriptionMap created."
-	state.verificationKeyMap = [:]
-	log.debug "verificationKeyMap created."
-	registerAllDeviceSubscriptions()
 }
 
 /*** Subscription Functions  ***/
@@ -162,43 +144,47 @@ def registerAllDeviceSubscriptions() {
 	registerChangeHandler(inputs)
 }
 
+//Subscribe to events from a list of devices
+def registerChangeHandler(myList) {
+	myList.each { myDevice ->
+		def theAtts = myDevice.supportedAttributes
+		theAtts.each {att ->
+			subscribe(myDevice, att.name, deviceEventHandler)
+			log.info "Registering for ${myDevice.displayName}.${att.name}"
+		}
+	}
+}
+
 //Endpoints function: Subscribe to events from a specific device
 def registerDeviceChange() {
 	def subscriptionEndpt = params.subscriptionURL
 	def deviceId = params.deviceId
 	def myDevice = findDevice(deviceId)
-
+	if( myDevice == null ){
-	if (myDevice == null) {
 		httpError(404, "Cannot find device with device ID ${deviceId}.")
 	}
 
 	def theAtts = myDevice.supportedAttributes
 	try {
-		theAtts.each { att ->
+		theAtts.each {att ->
 			subscribe(myDevice, att.name, deviceEventHandler)
 		}
 		log.info "Subscribing for ${myDevice.displayName}"
 
-		if (subscriptionEndpt != null) {
+		if(subscriptionEndpt != null){
-			if (state.deviceSubscriptionMap[deviceId] == null) {
+			if(state.deviceSubscriptionMap[deviceId] == null){
 				state.deviceSubscriptionMap.put(deviceId, [subscriptionEndpt])
 				log.info "Added subscription URL: ${subscriptionEndpt} for ${myDevice.displayName}"
-			} else if (!state.deviceSubscriptionMap[deviceId].contains(subscriptionEndpt)) {
+			} else if (!state.deviceSubscriptionMap[deviceId].contains(subscriptionEndpt)){
 				state.deviceSubscriptionMap[deviceId] << subscriptionEndpt
 				log.info "Added subscription URL: ${subscriptionEndpt} for ${myDevice.displayName}"
 			}
-
-			if (params.key != null) {
-				state.verificationKeyMap[subscriptionEndpt] = params.key
-				log.info "Added verification key: ${params.key} for ${subscriptionEndpt}"
-			}
 		}
 	} catch (e) {
 		httpError(500, "something went wrong: $e")
 	}
 
 	log.info "Current subscription map is ${state.deviceSubscriptionMap}"
-	log.info "Current verification key map is ${state.verificationKeyMap}"
 	return ["succeed"]
 }
 
@@ -208,19 +194,18 @@ def unregisterDeviceChange() {
 	def deviceId = params.deviceId
 	def myDevice = findDevice(deviceId)
 
-	if (myDevice == null) {
+	if( myDevice == null ){
 		httpError(404, "Cannot find device with device ID ${deviceId}.")
 	}
 
 	try {
-		if (subscriptionEndpt != null && subscriptionEndpt != "undefined") {
+		if(subscriptionEndpt != null && subscriptionEndpt != "undefined"){
-			if (state.deviceSubscriptionMap[deviceId]?.contains(subscriptionEndpt)) {
+			if (state.deviceSubscriptionMap[deviceId]?.contains(subscriptionEndpt)){
-				if (state.deviceSubscriptionMap[deviceId].size() == 1) {
+				if(state.deviceSubscriptionMap[deviceId].size() == 1){
 					state.deviceSubscriptionMap.remove(deviceId)
 				} else {
 					state.deviceSubscriptionMap[deviceId].remove(subscriptionEndpt)
 				}
-				state.verificationKeyMap.remove(subscriptionEndpt)
 				log.info "Removed subscription URL: ${subscriptionEndpt} for ${myDevice.displayName}"
 			}
 		} else {
@@ -232,33 +217,25 @@ def unregisterDeviceChange() {
 	}
 
 	log.info "Current subscription map is ${state.deviceSubscriptionMap}"
-	log.info "Current verification key map is ${state.verificationKeyMap}"
 }
 
 //Endpoints function: Subscribe to device additiona/removal updated in a location
 def registerDeviceGraph() {
 	def subscriptionEndpt = params.subscriptionURL
 
-	if (subscriptionEndpt != null && subscriptionEndpt != "undefined") {
+	if (subscriptionEndpt != null && subscriptionEndpt != "undefined"){
 		subscribe(location, "DeviceCreated", locationEventHandler, [filterEvents: false])
 		subscribe(location, "DeviceUpdated", locationEventHandler, [filterEvents: false])
 		subscribe(location, "DeviceDeleted", locationEventHandler, [filterEvents: false])
 
-		if (state.locationSubscriptionMap[location.id] == null) {
+		if(state.locationSubscriptionMap[location.id] == null){
 			state.locationSubscriptionMap.put(location.id, [subscriptionEndpt])
 			log.info "Added subscription URL: ${subscriptionEndpt} for Location ${location.name}"
-		} else if (!state.locationSubscriptionMap[location.id].contains(subscriptionEndpt)) {
+		} else if (!state.locationSubscriptionMap[location.id].contains(subscriptionEndpt)){
 			state.locationSubscriptionMap[location.id] << subscriptionEndpt
 			log.info "Added subscription URL: ${subscriptionEndpt} for Location ${location.name}"
 		}
-
-		if (params.key != null) {
-			state.verificationKeyMap[subscriptionEndpt] = params.key
-			log.info "Added verification key: ${params.key} for ${subscriptionEndpt}"
-		}
-
 		log.info "Current location subscription map is ${state.locationSubscriptionMap}"
-		log.info "Current verification key map is ${state.verificationKeyMap}"
 		return ["succeed"]
 	} else {
 		httpError(400, "missing input parameter: subscriptionURL")
@@ -270,17 +247,16 @@ def unregisterDeviceGraph() {
 	def subscriptionEndpt = params.subscriptionURL
 
 	try {
-		if (subscriptionEndpt != null && subscriptionEndpt != "undefined") {
+		if(subscriptionEndpt != null && subscriptionEndpt != "undefined"){
-			if (state.locationSubscriptionMap[location.id]?.contains(subscriptionEndpt)) {
+			if (state.locationSubscriptionMap[location.id]?.contains(subscriptionEndpt)){
-				if (state.locationSubscriptionMap[location.id].size() == 1) {
+				if(state.locationSubscriptionMap[location.id].size() == 1){
 					state.locationSubscriptionMap.remove(location.id)
 				} else {
 					state.locationSubscriptionMap[location.id].remove(subscriptionEndpt)
 				}
-				state.verificationKeyMap.remove(subscriptionEndpt)
 				log.info "Removed subscription URL: ${subscriptionEndpt} for Location ${location.name}"
 			}
-		} else {
+		}else{
 			httpError(400, "missing input parameter: subscriptionURL")
 		}
 	} catch (e) {
@@ -288,40 +264,28 @@ def unregisterDeviceGraph() {
 	}
 
 	log.info "Current location subscription map is ${state.locationSubscriptionMap}"
-	log.info "Current verification key map is ${state.verificationKeyMap}"
 }
 
 //When events are triggered, send HTTP post to web socket servers
 def deviceEventHandler(evt) {
-	def evtDevice = evt.device
+	def evt_device = evt.device
-	def evtDeviceType = getDeviceType(evtDevice)
+	def evt_deviceType = getDeviceType(evt_device)
-	def deviceData = [];
+	def deviceInfo
 
-	if (evt.data != null) {
+	def params = [ body: [deviceName: evt_device.displayName, deviceId: evt_device.id,  locationId: location.id] ]
+
+	if(evt.data != null){
 		def evtData = parseJson(evt.data)
-		log.info "Received event for ${evtDevice.displayName}, data: ${evtData},  description: ${evt.descriptionText}"
+		log.info "Received event for ${evt_device.displayName}, data: ${evtData},  description: ${evt.descriptionText}"
 	}
 
-	if (evtDeviceType == "thermostat") {
-		deviceData = [name: evtDevice.displayName, id: evtDevice.id, status: evtDevice.status, deviceType: evtDeviceType, manufacturer: evtDevice.manufacturerName, model: evtDevice.modelName, attributes: deviceAttributeList(evtDevice, evtDeviceType), locationMode: getLocationModeInfo(), locationId: location.id]
-	} else {
-		deviceData = [name: evtDevice.displayName, id: evtDevice.id, status: evtDevice.status, deviceType: evtDeviceType, manufacturer: evtDevice.manufacturerName, model: evtDevice.modelName, attributes: deviceAttributeList(evtDevice, evtDeviceType), locationId: location.id]
-	}
-
-	def params = [body: deviceData]
-
 	//send event to all subscriptions urls
-	log.debug "Current subscription urls for ${evtDevice.displayName} is ${state.deviceSubscriptionMap[evtDevice.id]}"
+	log.debug "Current subscription urls for ${evt_device.displayName} is ${state.deviceSubscriptionMap[evt_device.id]}"
-	state.deviceSubscriptionMap[evtDevice.id].each {
+	state.deviceSubscriptionMap[evt_device.id].each {
 		params.uri = "${it}"
-		if (state.verificationKeyMap[it] != null) {
-			def key = state.verificationKeyMap[it]
-			params.header = [Signature: ComputHMACValue(key, groovy.json.JsonOutput.toJson(params.body))]
-		}
 		log.trace "POST URI: ${params.uri}"
-		log.trace "Header: ${params.header}"
 		log.trace "Payload: ${params.body}"
-		try {
+		try{
 			httpPostJson(params) { resp ->
 				log.trace "response status code: ${resp.status}"
 				log.trace "response data: ${resp.data}"
@@ -334,27 +298,20 @@ def deviceEventHandler(evt) {
 
 def locationEventHandler(evt) {
 	log.info "Received event for location ${location.name}/${location.id}, Event: ${evt.name}, description: ${evt.descriptionText}, apiServerUrl: ${apiServerUrl("")}"
-	switch (evt.name) {
+	switch(evt.name){
 		case "DeviceCreated":
 		case "DeviceDeleted":
-			def evtDevice = evt.device
+			def evt_device = evt.device
-			def evtDeviceType = getDeviceType(evtDevice)
+			def evt_deviceType = getDeviceType(evt_device)
-			def params = [body: [eventType: evt.name, deviceId: evtDevice.id, locationId: location.id]]
+			log.info "DeviceName: ${evt_device.displayName}, DeviceID: ${evt_device.id}, deviceType: ${evt_deviceType}"
 
-			if (evt.name == "DeviceDeleted" && state.deviceSubscriptionMap[deviceId] != null) {
+			def params = [ body: [ eventType:evt.name, deviceId: evt_device.id, locationId: location.id ] ]
-				state.deviceSubscriptionMap.remove(evtDevice.id)
-			}
 
 			state.locationSubscriptionMap[location.id].each {
 				params.uri = "${it}"
-				if (state.verificationKeyMap[it] != null) {
-					def key = state.verificationKeyMap[it]
-					params.header = [Signature: ComputHMACValue(key, groovy.json.JsonOutput.toJson(params.body))]
-				}
 				log.trace "POST URI: ${params.uri}"
-				log.trace "Header: ${params.header}"
 				log.trace "Payload: ${params.body}"
-				try {
+				try{
 					httpPostJson(params) { resp ->
 						log.trace "response status code: ${resp.status}"
 						log.trace "response data: ${resp.data}"
@@ -369,23 +326,6 @@ def locationEventHandler(evt) {
 	}
 }
 
-private ComputHMACValue(key, data) {
-	try {
-		SecretKeySpec secretKeySpec = new SecretKeySpec(key.getBytes("UTF-8"), "HmacSHA1")
-		Mac mac = Mac.getInstance("HmacSHA1")
-		mac.init(secretKeySpec)
-		byte[] digest = mac.doFinal(data.getBytes("UTF-8"))
-		return byteArrayToString(digest)
-	} catch (InvalidKeyException e) {
-		log.error "Invalid key exception while converting to HMac SHA1"
-	}
-}
-
-private def byteArrayToString(byte[] data) {
-	BigInteger bigInteger = new BigInteger(1, data)
-	String hash = bigInteger.toString(16)
-	return hash
-}
 
 /*** Device Query/Update Functions  ***/
 
@@ -394,10 +334,10 @@ def getDevices() {
 	def deviceData = []
 	inputs?.each {
 		def deviceType = getDeviceType(it)
-		if (deviceType == "thermostat") {
+		if(deviceType == "thermostat") {
-			deviceData << [name: it.displayName, id: it.id, status: it.status, deviceType: deviceType, manufacturer: it.manufacturerName, model: it.modelName, attributes: deviceAttributeList(it, deviceType), locationMode: getLocationModeInfo()]
+			deviceData << [name: it.displayName, id: it.id, status:it.status, deviceType:deviceType, manufacturer:it.manufacturerName, model:it.modelName, attributes: deviceAttributeList(it, deviceType), locationMode: getLocationModeInfo()]
 		} else {
-			deviceData << [name: it.displayName, id: it.id, status: it.status, deviceType: deviceType, manufacturer: it.manufacturerName, model: it.modelName, attributes: deviceAttributeList(it, deviceType)]
+			deviceData << [name: it.displayName, id: it.id, status:it.status, deviceType:deviceType, manufacturer:it.manufacturerName, model:it.modelName, attributes: deviceAttributeList(it, deviceType)]
 		}
 	}
 
@@ -410,10 +350,10 @@ def getDevice() {
 	def it = findDevice(params.id)
 	def deviceType = getDeviceType(it)
 	def device
-	if (deviceType == "thermostat") {
+	if(deviceType == "thermostat") {
-		device = [name: it.displayName, id: it.id, status: it.status, deviceType: deviceType, manufacturer: it.manufacturerName, model: it.modelName, attributes: deviceAttributeList(it, deviceType), locationMode: getLocationModeInfo()]
+		device = [name: it.displayName, id: it.id, status:it.status, deviceType:deviceType, manufacturer:it.manufacturerName, model:it.modelName, attributes: deviceAttributeList(it,deviceType), locationMode: getLocationModeInfo()]
 	} else {
-		device = [name: it.displayName, id: it.id, status: it.status, deviceType: deviceType, manufacturer: it.manufacturerName, model: it.modelName, attributes: deviceAttributeList(it, deviceType)]
+		device = [name: it.displayName, id: it.id, status:it.status, deviceType:deviceType, manufacturer:it.manufacturerName, model:it.modelName, attributes: deviceAttributeList(it, deviceType)]
 	}
 
 	log.debug "getDevice, return: ${device}"
@@ -426,18 +366,18 @@ void updateDevice() {
 	request.JSON.each {
 		def command = it.key
 		def value = it.value
-		if (command) {
+		if (command){
 			def commandList = mapDeviceCommands(command, value)
 			command = commandList[0]
 			value = commandList[1]
 
 			if (command == "setAwayMode") {
 				log.info "Setting away mode to ${value}"
-				if (location.modes?.find { it.name == value }) {
+				if (location.modes?.find {it.name == value}) {
 					location.setMode(value)
 				}
-			} else if (command == "thermostatSetpoint") {
+			}else if (command == "thermostatSetpoint"){
-				switch (device.currentThermostatMode) {
+				switch(device.currentThermostatMode){
 					case "cool":
 						log.info "Update: ${device.displayName}, [${command}, ${value}]"
 						device.setCoolingSetpoint(value)
@@ -451,7 +391,7 @@ void updateDevice() {
 						httpError(501, "this mode: ${device.currentThermostatMode} does not allow changing thermostat setpoint.")
 						break
 				}
-			} else if (!device) {
+			}else if (!device) {
 				log.error "updateDevice, Device not found"
 				httpError(404, "Device not found")
 			} else if (!device.hasCommand(command)) {
@@ -461,11 +401,11 @@ void updateDevice() {
 				if (command == "setColor") {
 					log.info "Update: ${device.displayName}, [${command}, ${value}]"
 					device."$command"(hex: value)
-				} else if (value.isNumber()) {
+				} else if(value.isNumber()) {
 					def intValue = value as Integer
 					log.info "Update: ${device.displayName}, [${command}, ${intValue}(int)]"
 					device."$command"(intValue)
-				} else if (value) {
+				} else if (value){
 					log.info "Update: ${device.displayName}, [${command}, ${value}]"
 					device."$command"(value)
 				} else {
@@ -492,16 +432,17 @@ private getDeviceType(device) {
 	log.debug "supported commands: [${device}, ${device.supportedCommands}]"
 
 	//Loop through the device capability list to determine the device type.
-	capabilities.each { capability ->
+	capabilities.each {capability ->
-		switch (capability.name.toLowerCase()) {
+		switch(capability.name.toLowerCase())
+		{
 			case "switch":
 				deviceType = "switch"
 
 				//If the device also contains "Switch Level" capability, identify it as a "light" device.
-				if (capabilities.any { it.name.toLowerCase() == "switch level" }) {
+				if (capabilities.any{it.name.toLowerCase() == "switch level"}){
 
 					//If the device also contains "Power Meter" capability, identify it as a "dimmerSwitch" device.
-					if (capabilities.any { it.name.toLowerCase() == "power meter" }) {
+					if (capabilities.any{it.name.toLowerCase() == "power meter"}){
 						deviceType = "dimmerSwitch"
 						return deviceType
 					} else {
@@ -548,24 +489,24 @@ private deviceAttributeList(device, deviceType) {
 	allAttributes.each { attribute ->
 		try {
 			def currentState = device.currentState(attribute.name)
-			if (currentState != null) {
+			if(currentState != null ){
-				switch (attribute.name) {
+				switch(attribute.name){
 					case 'temperature':
-						attributeList.putAll([(attribute.name): currentState.value, 'temperatureScale': location.temperatureScale])
+						attributeList.putAll([ (attribute.name): currentState.value, 'temperatureScale':location.temperatureScale ])
 						break;
 					default:
-						attributeList.putAll([(attribute.name): currentState.value])
+						attributeList.putAll([(attribute.name): currentState.value ])
 						break;
 				}
-				if (deviceType == "genericSensor") {
+				if( deviceType == "genericSensor" ){
 					def key = attribute.name + "_lastUpdated"
-					attributeList.putAll([(key): currentState.isoDate])
+					attributeList.putAll([ (key): currentState.isoDate ])
 				}
 			} else {
-				attributeList.putAll([(attribute.name): null]);
+				attributeList.putAll([ (attribute.name): null ]);
 			}
-		} catch (e) {
+		} catch(e) {
-			attributeList.putAll([(attribute.name): null]);
+			attributeList.putAll([ (attribute.name): null ]);
 		}
 	}
 	return attributeList
@@ -638,7 +579,8 @@ private mapDeviceCommands(command, value) {
 			if (value == 1 || value == "1" || value == "lock") {
 				resultCommand = "lock"
 				resultValue = ""
-			} else if (value == 0 || value == "0" || value == "unlock") {
+			}
+			else if (value == 0 || value == "0" || value == "unlock") {
 				resultCommand = "unlock"
 				resultValue = ""
 			}
@@ -647,5 +589,5 @@ private mapDeviceCommands(command, value) {
 			break
 	}
 
-	return [resultCommand, resultValue]
+	return [resultCommand,resultValue]
 }