MSA-1733: This application allows a user to set up from 1 to 5 lighting scenes, controlled by momentary switches. The switches could be physical momentary wall switches, or virtual switches created in the IDE.

The lighting scene options include setting color hue and saturation for color-changing bulbs, & lighting level and color temperature for color temperature bulbs (which includes color-changing bulbs as well). A 'scene' can change any or all of the parameters. As an example, 'Movie Scene' could set the lighting level on all lights to 25%, the color temperature for color temp bulbs to 2700k, and leave the colors alone; while 'Full Bright' could set the color temperature to 5500k and brightness to 100% for all bulbs. 'Green' mode could set the hue/saturation of color bulbs to full green, while leaving brightness levels as is, or could set the brightness to a different level at the same time.

devicetypes/smartthings/centralite-thermostat.src/centralite-thermostat.groovy

@@ -81,51 +81,47 @@ metadata {
 // parse events into attributes
 def parse(String description) {
 	log.debug "Parse description $description"
-	def map = [:]
-	if (description?.startsWith("read attr -")) {
-		def descMap = parseDescriptionAsMap(description)
-		log.debug "Desc Map: $descMap"
-		if (descMap.cluster == "0201" && descMap.attrId == "0000") {
+	List result = []
+	def descMap = zigbee.parseDescriptionAsMap(description)
+	log.debug "Desc Map: $descMap"
+	List attrData = [[cluster: descMap.cluster ,attrId: descMap.attrId, value: descMap.value]]
+	descMap.additionalAttrs.each {
+	    attrData << [cluster: descMap.cluster, attrId: it.attrId, value: it.value]
+	}
+	attrData.each {
+		def map = [:]
+		if (it.cluster == "0201" && it.attrId == "0000") {
 			log.debug "TEMP"
 			map.name = "temperature"
-			map.value = getTemperature(descMap.value)
+			map.value = getTemperature(it.value)
 			map.unit = temperatureScale
-		} else if (descMap.cluster == "0201" && descMap.attrId == "0011") {
+		} else if (it.cluster == "0201" && it.attrId == "0011") {
 			log.debug "COOLING SETPOINT"
 			map.name = "coolingSetpoint"
-			map.value = getTemperature(descMap.value)
+			map.value = getTemperature(it.value)
 			map.unit = temperatureScale
-		} else if (descMap.cluster == "0201" && descMap.attrId == "0012") {
+		} else if (it.cluster == "0201" && it.attrId == "0012") {
 			log.debug "HEATING SETPOINT"
 			map.name = "heatingSetpoint"
-			map.value = getTemperature(descMap.value)
+			map.value = getTemperature(it.value)
 			map.unit = temperatureScale
-		} else if (descMap.cluster == "0201" && descMap.attrId == "001c") {
+		} else if (it.cluster == "0201" && it.attrId == "001c") {
 			log.debug "MODE"
 			map.name = "thermostatMode"
-			map.value = getModeMap()[descMap.value]
-		} else if (descMap.cluster == "0202" && descMap.attrId == "0000") {
+			map.value = getModeMap()[it.value]
+		} else if (it.cluster == "0202" && it.attrId == "0000") {
 			log.debug "FAN MODE"
 			map.name = "thermostatFanMode"
-			map.value = getFanModeMap()[descMap.value]
+			map.value = getFanModeMap()[it.value]
 		}
+		if (map) {
+			result << createEvent(map)
+		}
+		log.debug "Parse returned $map"
 	}
-
-	def result = null
-	if (map) {
-		result = createEvent(map)
-	}
-	log.debug "Parse returned $map"
 	return result
 }
 
-def parseDescriptionAsMap(description) {
-	(description - "read attr - ").split(",").inject([:]) { map, param ->
-		def nameAndValue = param.split(":")
-		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
-	}
-}
-
 def getModeMap() { [
 	"00":"off",
 	"03":"cool",

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

@@ -22,9 +22,10 @@ metadata {
 		capability "Sensor"
 		capability "Health Check"
 
-		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "Z-Wave Wall Dimmer"
-		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "Z-Wave Wall Dimmer"
-		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "Z-Wave Plug-In Dimmer"
+		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "GE In-Wall Smart Dimmer "
+		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "GE In-Wall Smart Dimmer "
+		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "GE Plug-In Smart Dimmer "
+		fingerprint mfr:"0063", prod:"4944", model:"3034", deviceJoinName: "GE In-Wall Smart Fan Control"
 	}
 
 	simulator {

devicetypes/smartthings/ge-link-bulb.src/ge-link-bulb.groovy

@@ -99,7 +99,7 @@ def parse(String description) {
 
 def poll() {
     def refreshCmds = [
-        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 500"
+        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 2000"
     ]
 
     return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh()
@@ -197,7 +197,7 @@ def off() {
 
 def refresh() {
     def refreshCmds = [
-        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 500"
+        "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 2000"
     ]
 
     return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig()

devicetypes/smartthings/life360-user.src/life360-user.groovy

@@ -39,7 +39,7 @@ metadata {
 }
 
 def generatePresenceEvent(boolean present) {
-	log.debug "Here in generatePresenceEvent!"
+	log.info "Life360 generatePresenceEvent($present)"
 	def value = formatValue(present)
 	def linkText = getLinkText(device)
 	def descriptionText = formatDescriptionText(linkText, present)

devicetypes/smartthings/smartpower-dimming-outlet.src/smartpower-dimming-outlet.groovy

@@ -128,9 +128,9 @@ def setLevel(value) {
 
 def refresh() {
 	[
-			"st rattr 0x${device.deviceNetworkId} ${endpointId} 6 0", "delay 500",
-			"st rattr 0x${device.deviceNetworkId} ${endpointId} 8 0", "delay 500",
-			"st rattr 0x${device.deviceNetworkId} ${endpointId} 0x0B04 0x050B", "delay 500"
+			"st rattr 0x${device.deviceNetworkId} ${endpointId} 6 0", "delay 2000",
+			"st rattr 0x${device.deviceNetworkId} ${endpointId} 8 0", "delay 2000",
+			"st rattr 0x${device.deviceNetworkId} ${endpointId} 0x0B04 0x050B", "delay 2000"
 	]
 
 }
@@ -313,9 +313,9 @@ def isDescriptionPower(descMap) {
 
 def onOffConfig() {
 	[
-			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 6 {${device.zigbeeId}} {}", "delay 200",
-			"zcl global send-me-a-report 6 0 0x10 0 600 {01}",
-			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500"
+			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 6 {${device.zigbeeId}} {}", "delay 2000",
+			"zcl global send-me-a-report 6 0 0x10 0 600 {01}", "delay 200",
+			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000"
 	]
 }
 
@@ -323,9 +323,9 @@ def onOffConfig() {
 //min level change is 01
 def levelConfig() {
 	[
-			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 8 {${device.zigbeeId}} {}", "delay 200",
-			"zcl global send-me-a-report 8 0 0x20 5 3600 {01}",
-			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500"
+			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 8 {${device.zigbeeId}} {}", "delay 2000",
+			"zcl global send-me-a-report 8 0 0x20 5 3600 {01}", "delay 200",
+			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000"
 	]
 }
 
@@ -333,9 +333,10 @@ def levelConfig() {
 //min change in value is 05
 def powerConfig() {
 	[
-		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 200",
+		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 2000",
 		"zcl global send-me-a-report 0x0B04 0x050B 0x29 1 600 {05 00}",				//The send-me-a-report is custom to the attribute type for CentraLite
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
+		"delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000"
 	]
 }
 
@@ -344,7 +345,10 @@ def setLevelWithRate(level, rate) {
 		rate = "0000"
 	}
 	level = convertToHexString(level * 255 / 100) 				//Converting the 0-100 range to 0-FF range in hex
-	"st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {$level $rate}"
+	[
+			"st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {$level $rate}",
+			"delay 2000"
+	]
 }
 
 String convertToHexString(value, width=2) {

devicetypes/smartthings/smartpower-outlet-v1.src/smartpower-outlet-v1.groovy

@@ -51,7 +51,7 @@ def on() {
 			'zcl on-off on',
 			'delay 200',
 			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 500'
+			'delay 2000'
 
 	]
 
@@ -62,6 +62,6 @@ def off() {
 			'zcl on-off off',
 			'delay 200',
 			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 500'
+			'delay 2000'
 	]
 }

devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy

@@ -157,9 +157,10 @@ def configure() {
 //min change in value is 01
 def powerConfig() {
 	[
-		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 200",
+		"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 2000",
 		"zcl global send-me-a-report 0x0B04 0x050B 0x29 1 600 {05 00}",				//The send-me-a-report is custom to the attribute type for CentraLite
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
+		"delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000"
 	]
 }
 

devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy

@@ -29,9 +29,10 @@ metadata {
 		command "enrollResponse"
 
 
-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315-S", deviceJoinName: "Water Leak Sensor"
-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315"
-		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315-Seu", deviceJoinName: "Water Leak Sensor"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-S", deviceJoinName: "Water Leak Sensor"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-Seu", deviceJoinName: "Water Leak Sensor"
+		fingerprint inClusters: "0000,0001,0003,0020,0402,0500,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-L", deviceJoinName: "Iris Smart Water Sensor"
 		fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "moisturev4", deviceJoinName: "Water Leak Sensor"
 	}
 
@@ -128,7 +129,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00){
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
@@ -285,8 +286,8 @@ def ping() {
 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
 	def refreshCmds = [
-		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
-		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
+		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 2000",
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 2000"
 	]
 
 	return refreshCmds + enrollResponse()
@@ -308,10 +309,10 @@ def enrollResponse() {
 	[
 		//Resending the CIE in case the enroll request is sent before CIE is written
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000",
 		//Enroll Response
-		"raw 0x500 {01 23 00 00 00}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
+		"raw 0x500 {01 23 00 00 00}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
 	]
 }
 

devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy

@@ -132,7 +132,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
@@ -298,8 +298,8 @@ def ping() {
 def refresh() {
 	log.debug "refresh called"
 	def refreshCmds = [
-		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
-		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
+		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 2000",
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 2000"
 	]
 
 	return refreshCmds + enrollResponse()
@@ -321,10 +321,10 @@ def enrollResponse() {
 	[
 		//Resending the CIE in case the enroll request is sent before CIE is written
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000",
 		//Enroll Response
-		"raw 0x500 {01 23 00 00 00}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
+		"raw 0x500 {01 23 00 00 00}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
 	]
 }
 

devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy

@@ -161,7 +161,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if(cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
@@ -339,7 +339,7 @@ private Map getContactResult(value) {
 	log.debug "Contact: ${device.displayName} value = ${value}"
 	def descriptionText = value == 'open' ? '{{ device.displayName }} was opened' : '{{ device.displayName }} was closed'
 	sendEvent(name: 'contact', value: value, descriptionText: descriptionText, displayed: false, translatable: true)
-	sendEvent(name: 'status', value: value, descriptionText: descriptionText, translatable: true)
+	return [name: 'status', value: value, descriptionText: descriptionText, translatable: true]
 }
 
 private getAccelerationResult(numValue) {
@@ -428,10 +428,10 @@ def enrollResponse() {
 	[
 		//Resending the CIE in case the enroll request is sent before CIE is written
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000",
 		//Enroll Response
 		"raw 0x500 {01 23 00 00 00}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
+		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
 	]
 }
 

devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy

@@ -119,7 +119,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07){
 					if (cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
@@ -252,8 +252,8 @@ def ping() {
 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
 	def refreshCmds = [
-        "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
-		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
+        "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 2000",
+		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 2000"
 	]
 
 	return refreshCmds + enrollResponse()
@@ -277,10 +277,10 @@ def enrollResponse() {
 	[
 		//Resending the CIE in case the enroll request is sent before CIE is written
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000",
 		//Enroll Response
-		"raw 0x500 {01 23 00 00 00}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
+		"raw 0x500 {01 23 00 00 00}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
 	]
 }
 

devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy

@@ -103,7 +103,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00){
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
@@ -270,9 +270,9 @@ def configure() {
 
 	log.debug "Configuring Reporting and Bindings."
 	def humidityConfigCmds = [
-		"zdo bind 0x${device.deviceNetworkId} 1 1 0xFC45 {${device.zigbeeId}} {}", "delay 500",
-		"zcl global send-me-a-report 0xFC45 0 0x29 30 3600 {6400}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 500"
+		"zdo bind 0x${device.deviceNetworkId} 1 1 0xFC45 {${device.zigbeeId}} {}", "delay 2000",
+		"zcl global send-me-a-report 0xFC45 0 0x29 30 3600 {6400}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 2000"
 	]
 
 	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity

devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy

@@ -86,7 +86,7 @@ def parse(String description) {
 	def bodyString = msg.body
 	if (bodyString) {
 		unschedule("setOffline")
-		def body = new XmlSlurper().parseText(bodyString)
+        def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", ""))
 
 		if (body?.property?.TimeSyncRequest?.text()) {
 			log.trace "Got TimeSyncRequest"

devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy

@@ -78,7 +78,7 @@ def parse(String description) {
 	def bodyString = msg.body
 	if (bodyString) {
     	unschedule("setOffline")
-		def body = new XmlSlurper().parseText(bodyString)
+        def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", ""))
 		if (body?.property?.TimeSyncRequest?.text()) {
 			log.trace "Got TimeSyncRequest"
 			result << timeSyncResponse()

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

@@ -84,7 +84,7 @@ def parse(String description) {
     def bodyString = msg.body
     if (bodyString) {
     	unschedule("setOffline")
-        def body = new XmlSlurper().parseText(bodyString)
+        def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", ""))
  		if (body?.property?.TimeSyncRequest?.text()) {
         	log.trace "Got TimeSyncRequest"
         	result << timeSyncResponse()
@@ -208,7 +208,7 @@ def subscribe(ip, port) {
     def existingIp = getDataValue("ip")
     def existingPort = getDataValue("port")
     if (ip && ip != existingIp) {
-         log.debug "Updating ip from $existingIp to $ip"    
+         log.debug "Updating ip from $existingIp to $ip"
     	 updateDataValue("ip", ip)
     	 def ipvalue = convertHexToIP(getDataValue("ip"))
          sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP changed to ${ipvalue}")
@@ -291,4 +291,4 @@ User-Agent: CyberGarage-HTTP/1.0
 </u:GetBinaryState>
 </s:Body>
 </s:Envelope>""", physicalgraph.device.Protocol.LAN)
-}
+}

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

@@ -28,8 +28,8 @@ metadata {
 
         fingerprint inClusters: "0000, 0001, 0003, 0020, 0402, 0B05", outClusters: "0003, 0006, 0008, 0019", manufacturer: "OSRAM", model: "LIGHTIFY Dimming Switch", deviceJoinName: "OSRAM LIGHTIFY Dimming Switch"
         //fingerprint inClusters: "0000, 0001, 0003, 0020, 0500", outClusters: "0003,0019", manufacturer: "CentraLite", model: "3455-L", deviceJoinName: "Iris Care Pendant"
-        //fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0402, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model: "3460-L", deviceJoinName: "Iris Smart Button"
-        //fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model:"3450-L", deviceJoinName: "Iris KeyFob"
+        fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0402, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model: "3460-L", deviceJoinName: "Iris Smart Button"
+        fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model:"3450-L", deviceJoinName: "Iris KeyFob"
     }
 
     simulator {}

devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy

@@ -24,6 +24,10 @@ metadata {
 		fingerprint inClusters: "0x26", deviceJoinName: "Z-Wave Dimmer"
 		fingerprint mfr:"001D", prod:"1902", deviceJoinName: "Z-Wave Dimmer"
 		fingerprint mfr:"001D", prod:"1B03", model:"0334", deviceJoinName: "Leviton Universal Dimmer"
+		fingerprint mfr:"011A", prod:"0102", model:"0201", deviceJoinName: "Enerwave In-Wall Dimmer"
+		fingerprint mfr:"001D", prod:"1001", model:"0334", deviceJoinName: "Leviton 3-Speed Fan Controller"
+		fingerprint mfr:"001D", prod:"0602", model:"0334", deviceJoinName: "Leviton Magnetic Low Voltage Dimmer"
+		fingerprint mfr:"001D", prod:"0401", model:"0334", deviceJoinName: "Leviton 600W Incandescent Dimmer"
 	}
 
 	simulator {

devicetypes/smartthings/zwave-motion-sensor.src/zwave-motion-sensor.groovy

@@ -28,6 +28,7 @@ metadata {
 		fingerprint mfr: "0060", prod: "0001", model: "0002", deviceJoinName: "Everspring Motion Sensor"  // Everspring SP814
 		fingerprint mfr: "0060", prod: "0001", model: "0003", deviceJoinName: "Everspring Motion Sensor"  // Everspring HSP02
 		fingerprint mfr: "011A", prod: "0601", model: "0901", deviceJoinName: "Enerwave Motion Sensor"  // Enerwave ZWN-BPC
+		fingerprint mfr: "0063", prod: "4953", model: "3133", deviceJoinName: "GE Smart Motion Sensor"
 	}
 
 	simulator {

devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy

@@ -25,6 +25,9 @@ metadata {
 		fingerprint mfr:"0063", prod:"4F50", model:"3031", deviceJoinName: "GE Plug-in Outdoor Switch"
 		fingerprint mfr:"001D", prod:"1D04", model:"0334", deviceJoinName: "Leviton Outlet"
 		fingerprint mfr:"001D", prod:"1C02", model:"0334", deviceJoinName: "Leviton Switch"
+		fingerprint mfr:"001D", prod:"0301", model:"0334", deviceJoinName: "Leviton 15A Switch"
+		fingerprint mfr:"011A", prod:"0101", model:"0102", deviceJoinName: "Enerwave On/Off Switch"
+		fingerprint mfr:"011A", prod:"0101", model:"0603", deviceJoinName: "Enerwave Duplex Receptacle"
 	}
 
 	// simulator metadata

smartapps/cubicrobotics/cubic-butler-for-smart-home.src/cubic-butler-for-smart-home.groovy

@@ -1,327 +0,0 @@
-/**
- *  Cubic Home
- * sdfssdfsfsdfsdfdsf
- *  Copyright 2016 Nikolay Zenovkin
- *
- *  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.
- *
- */
-definition(
-        name: "Cubic Butler for Smart Home",
-        namespace: "cubicrobotics",
-        author: "Cubic Robotics",
-        description: "Hey, I’m Cubic, AI butler for smart home! \n" +
-                "I am the one and only app you need to control an entire home. \n" +
-                "Right now I can help you to control your SmartThings devices via natural speech and dashboard.\n" +
-                "Speak naturally, don’t learn robot! My A.I. is designed for a smart home control.\n" +
-                "- You don’t have to remember exact commands and phrases.\n" +
-                "- I have memory, and every new request will be processed in the context of previous ones.\n" +
-                "- I can ask clarifying questions, if I’m not sure what you mean.",
-        category: "Convenience",
-        iconUrl: "https://lh3.googleusercontent.com/GX5BRhaFq22HpAEU6tD4JXvizlxWFuB9zjyZE39-pLpZvQvvUmVpWXa0v4-oaxz4tg=w300-rw",
-        iconX2Url: "https://lh3.googleusercontent.com/GX5BRhaFq22HpAEU6tD4JXvizlxWFuB9zjyZE39-pLpZvQvvUmVpWXa0v4-oaxz4tg=w300-rw",
-        iconX3Url: "https://lh3.googleusercontent.com/GX5BRhaFq22HpAEU6tD4JXvizlxWFuB9zjyZE39-pLpZvQvvUmVpWXa0v4-oaxz4tg=w300-rw",
-        oauth: [displayName: "Cubic Home", displayLink: "http://cubic.ai/"])
-
-
-preferences {
-    section("Welcome to Cubic") {
-        // TODO: put inputs here
-    }
-    section("Allow Cubic to control these switches") {
-        input "switches", "capability.switch", multiple: true, required: false
-    }
-
-    section("Allow Cubic to control these motion sensors") {
-        input "motionSensors", "capability.motionSensor", multiple: true, required: false
-    }
-
-    section("Allow Cubic to control these bulbs") {
-        input "lamps", "capability.colorControl", multiple: true, required: false
-    }
-
-    section("Allow Cubic to control these thermostats") {
-        input "thermostats", "capability.thermostat", multiple: true, required: false
-    }
-
-    section("Allow Cubic to control these water sensors") {
-        input "waterSensors", "capability.waterSensor", multiple: true, required: false
-    }
-
-    section("Allow Cubic to control these CO sensors") {
-        input "smokeSensors", "capability.carbonMonoxideDetector", multiple: true, required: false
-    }
-
-    section("Allow Cubic to control these door controls") {
-        input "doorControls", "capability.doorControl", multiple: true, required: false
-    }
-
-}
-
-
-mappings {
-    path("/devices") {
-        action:
-        [
-                GET: "getDevices"
-        ]
-    }
-    path("/devices/:id") {
-        action:
-        [
-                PUT: "updateDevice",
-                GET: "getDevice"
-        ]
-    }
-}
-
-def installed() {
-    log.debug "Installed with settings: ${settings}"
-
-    initialize()
-}
-
-def updated() {
-    log.debug "Updated with settings: ${settings}"
-
-    unsubscribe()
-    initialize()
-}
-
-def initialize() {
-    subscribe(motionSensors, "motion", motionHandler)
-    subscribe(switches, "switch", switchHandler)
-    subscribe(thermostats, "thermostat.temperature", thermostatHandler)
-    subscribe(waterSensors, "waterSensor", waterHandler)
-    subscribe(smokeSensors, "carbonMonoxideDetector", smokeHandler)
-    subscribe(doorControls, "doorControl", doorControlHandler)
-}
-
-def doorControlHandler(evt) {
-    if (evt.isStateChanged()) {
-        sendPushEvent(evt.deviceId,
-                "DOOR_CONTROL_SMART_THINGS",
-                evt.value
-        )
-    }
-}
-
-def smokeHandler(evt) {
-    if (evt.isStateChanged()) {
-        sendPushEvent(evt.deviceId,
-                "SMOKE_CO_SENSOR_SMART_THINGS",
-                evt.value
-        )
-    }
-}
-
-def thermostatHandler(evt) {
-    if (evt.isStateChanged()) {
-        sendPushEvent(evt.deviceId,
-                "THERMOSTAT_SMART_THINGS",
-                evt.value
-        )
-    }
-}
-
-def waterHandler(evt) {
-    if (evt.isStateChanged()) {
-        sendPushEvent(evt.deviceId,
-                "WATER_SENSOR_SMART_THINGS",
-                evt.value
-        )
-    }
-}
-
-def motionHandler(evt) {
-    if ("active" == evt.value) {
-        sendPushEvent(evt.deviceId,
-                "MOTION_SENSOR_SMART_THINGS",
-                evt.value)
-    }
-}
-
-def switchHandler(evt) {
-    log.debug "$evt.deviceId switch changed state to $evt.value"
-}
-
-def getDevices() {
-    def resp = []
-    switches.each {
-        resp << extractSwitch(it)
-    }
-    motionSensors.each {
-        resp << extractMotionSensor(it)
-    }
-
-    lamps.each {
-        resp << extractLamp(it)
-    }
-
-    thermostats.each {
-        resp << extractThermostat(it)
-    }
-
-    return resp
-}
-
-def getDevice() {
-    def id = params.id
-    log.info "Getting device by id " + id
-    def device = findDeviceById(id);
-    if (device == null) {
-        httpError(400, "$id is not a valid id for switch specified")
-    } else if (device.type == "SWITCH_SMART_THINGS") {
-        return extractSwitch(device.device);
-    } else if (device.type == "THERMOSTAT_SMART_THINGS") {
-        return extractThermostat(device.device);
-    } else if (device.type == "LAMP_SMART_THINGS") {
-        return extractLamp(device.device);
-    } else if (device.type == "MOTION_SENSOR_SMART_THINGS") {
-        return extractMotionSensor(device.device);
-    }
-    return nil
-}
-
-void updateDevice() {
-    def id = params.id
-    def device = findDeviceById(id)
-
-    if (device == null) {
-        httpError(400, "$id is not a valid switch id")
-    } else if (device.type == "SWITCH_SMART_THINGS") {
-        changeSwitchState(device, request.JSON?.powered)
-    } else if (device.type == "THERMOSTAT_SMART_THINGS") {
-        def heating_setpoint = request.JSON?.heating_setpoint
-        def cooling_setpoint = request.JSON?.cooling_setpoint
-        def thermostat_setpoint = request.JSON?.thermostat_setpoint
-        if (heating_setpoint != null) {
-            device.device.setHeatingSetpoint(heating_setpoint)
-        }
-        if (cooling_setpoint != null) {
-            device.device.setCoolingSetpoint(cooling_setpoint)
-        }
-        //if (thermostat_setpoint != null) {
-        //	device.device.setThermostatSetpoint(thermostat_setpoint)
-        //}
-    } else if (device.type == "LAMP_SMART_THINGS") {
-        def powered = request.JSON?.powered
-        def color_h = request.JSON?.color_h
-        def color_s = request.JSON?.color_s
-        def color_b = request.JSON?.color_b
-        def color_temperature = request.JSON?.color_temperature
-        if (powered != null) {
-            changeSwitchState(device, request.JSON?.powered)
-        }
-        if (color_h != null) {
-            device.device.setHue(color_h)
-        }
-        if (color_b != null) {
-            device.device.setLevel(color_b)
-        }
-        if (color_s != null) {
-            device.device.setSaturation(color_s)
-        }
-        if (color_temperature != null) {
-            device.device.setColorTemperature(color_temperature)
-        }
-    } else if (device.type == "MOTION_SENSOR_SMART_THINGS") {
-        httpError(400, "Unable to control motion sensor")
-    }
-}
-
-def findDeviceById(id) {
-    def device = switches.find { it.id == id }
-    def type = "SWITCH_SMART_THINGS"
-    if (device == null) {
-        device = thermostats.find { it.id == id }
-        type = "THERMOSTAT_SMART_THINGS"
-    }
-    if (device == null) {
-        device = lamps.find { it.id == id }
-        type = "LAMP_SMART_THINGS"
-    }
-    if (device == null) {
-        device = motionSensors.find { it.id == id }
-        type = "MOTION_SENSOR_SMART_THINGS"
-    }
-    if (device == null) {
-        return null;
-    }
-    return [device: device, type: type];
-}
-
-
-def extractSwitch(it) {
-    return [id: it.id, type: "SWITCH_SMART_THINGS", state: [name: it.displayName, powered: it.currentValue("switch") == "on" ? true : false]]
-}
-
-def extractMotionSensor(it) {
-    return [id: it.id, type: "MOTION_SENSOR_SMART_THINGS", state: [name: it.displayName, state: it.currentValue("motion")]]
-}
-
-def extractLamp(it) {
-    return [id: it.id, type: "LAMP_SMART_THINGS", state: [name             : it.displayName,
-                                                          color_h          : it.currentValue("hue"), color_s: it.currentValue("saturation"), color_b: it.currentValue("level"),
-                                                          color_temperature: it.currentValue("colorTemperature"), powered: it.currentValue("switch") == "on" ? true : false]]
-}
-
-def extractThermostat(it) {
-    return [id: it.id, type: "THERMOSTAT_SMART_THINGS", state: [name                      : it.displayName,
-                                                                temperature               : it.currentValue("temperature"),
-                                                                heating_setpoint          : it.currentValue("heatingSetpoint"),
-                                                                cooling_setpoint          : it.currentValue("coolingSetpoint"),
-                                                                thermostat_setpoint       : it.currentValue("thermostatSetpoint"),
-                                                                thermostat_mode           : it.currentValue("thermostatMode"),
-                                                                thermostat_fan_mode       : it.currentValue("thermostatFanMode"),
-                                                                thermostat_operating_state: it.currentValue("thermostatOperatingState")]]
-}
-
-def changeSwitchState(device, powered) {
-    log.info "Updating device " + device.device.displayName + " to state $powered"
-    switch (powered) {
-        case "true":
-            device.device.on()
-            break
-        case "false":
-            device.device.off()
-            break
-        default:
-            httpError(400, "$powered is not a valid power state for switch specified")
-    }
-}
-
-def sendPushEvent(pushEvent) {
-    def params = [
-            uri               : "https://intent-processor-stage.cubic.ai/api/v1/pushEvent",
-            headers           : [
-                    Authorization: "Bearer -gm-IOuQR3W2Gim8Tjwsuw",
-                    Accept       : "/"
-            ],
-            body              : pushEvent,
-            requestContentType: "application/json"
-    ]
-    try {
-        httpPost(params) { resp ->
-            log.debug "response data: ${resp.data}"
-            log.debug "response contentType: ${resp.contentType}"
-        }
-    } catch (e) {
-        log.debug "something went wrong: $e"
-    }
-}
-
-def sendPushEvent(id, type, state) {
-    sendPushEvent(
-            [device_id  : id,
-             device_type: type,
-             state      : state]
-    )
-}

smartapps/michaelstruck/color-coordinator.src/color-coordinator.groovy

@@ -1,10 +1,11 @@
 /**
  * 	Color Coordinator 
- *  Version 1.1.0 - 11/9/16
+ *  Version 1.1.1 - 11/9/16
  *  By Michael Struck
  *
  *  1.0.0 - Initial release
  *  1.1.0 - Fixed issue where master can be part of slaves. This causes a loop that impacts SmartThings. 
+ *  1.1.1 - Fix NPE being thrown for slave/master inputs being empty.
  *
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -33,17 +34,17 @@ preferences {
 
 def mainPage() {
 	dynamicPage(name: "mainPage", title: "", install: true, uninstall: false) {
-		def masterInList = slaves.id.find{it==master.id}
+		def masterInList = slaves?.id?.find{it==master?.id}
         if (masterInList) {
         	section ("**WARNING**"){
             	paragraph "You have included the Master Light in the Slave Group. This will cause a loop in execution. Please remove this device from the Slave Group.", image: "https://raw.githubusercontent.com/MichaelStruck/SmartThingsPublic/master/img/caution.png"
             }
         }
         section("Master Light") {
-			input "master", "capability.colorControl", title: "Colored Light"
+			input "master", "capability.colorControl", title: "Colored Light", required: true
 		}
 		section("Lights that follow the master settings") {
-			input "slaves", "capability.colorControl", title: "Colored Lights",  multiple: true, required: false, submitOnChange: true
+			input "slaves", "capability.colorControl", title: "Colored Lights",  multiple: true, required: true, submitOnChange: true
 		}
     	section([mobileOnly:true], "Options") {
 			input "randomYes", "bool",title: "When Master Turned On, Randomize Color", defaultValue: false
@@ -81,40 +82,44 @@ def init() {
 }
 //-----------------------------------
 def onOffHandler(evt){
-	if (!slaves.id.find{it==master.id}){
-        if (master.currentValue("switch") == "on"){
-            if (randomYes) getRandomColorMaster()
-			else slaves?.on()
-        }
-        else {
-            slaves?.off()  
-        }
+	if (slaves && master) {
+		if (!slaves?.id.find{it==master?.id}){
+		if (master?.currentValue("switch") == "on"){
+		    if (randomYes) getRandomColorMaster()
+				else slaves?.on()
+		}
+		else {
+		    slaves?.off()  
+		}
+		}
 	}
 }
 
 def colorHandler(evt) {
-   	if (!slaves.id.find{it==master.id} && master.currentValue("switch") == "on"){
-		log.debug "Changing Slave units H,S,L"
-    	def dimLevel = master.currentValue("level")
-    	def hueLevel = master.currentValue("hue")
-    	def saturationLevel = master.currentValue("saturation")
-		def newValue = [hue: hueLevel, saturation: saturationLevel, level: dimLevel as Integer]
-    	slaves?.setColor(newValue)
-    	try {
-    		log.debug "Changing Slave color temp"
-        	def tempLevel = master.currentValue("colorTemperature")
-    		slaves?.setColorTemperature(tempLevel)
-    	}
-   		catch (e){
-    		log.debug "Color temp for master --"
-    	}
+	if (slaves && master) {
+		if (!slaves?.id?.find{it==master?.id} && master?.currentValue("switch") == "on"){
+			log.debug "Changing Slave units H,S,L"
+		def dimLevel = master?.currentValue("level")
+		def hueLevel = master?.currentValue("hue")
+		def saturationLevel = master.currentValue("saturation")
+			def newValue = [hue: hueLevel, saturation: saturationLevel, level: dimLevel as Integer]
+		slaves?.setColor(newValue)
+		try {
+			log.debug "Changing Slave color temp"
+			def tempLevel = master?.currentValue("colorTemperature")
+			slaves?.setColorTemperature(tempLevel)
+		}
+			catch (e){
+			log.debug "Color temp for master --"
+		}
+		}
 	}
 }
 
 def getRandomColorMaster(){
     def hueLevel = Math.floor(Math.random() *1000)
     def saturationLevel = Math.floor(Math.random() * 100)
-    def dimLevel = master.currentValue("level")
+    def dimLevel = master?.currentValue("level")
 	def newValue = [hue: hueLevel, saturation: saturationLevel, level: dimLevel as Integer]
     log.debug hueLevel
     log.debug saturationLevel
@@ -123,12 +128,14 @@ def getRandomColorMaster(){
 }
 
 def tempHandler(evt){
-    if (!slaves.id.find{it==master.id} && master.currentValue("switch") == "on"){
-        if (evt.value != "--") {
-            log.debug "Changing Slave color temp based on Master change"
-            def tempLevel = master.currentValue("colorTemperature")
-            slaves?.setColorTemperature(tempLevel)
-        }
+	if (slaves && master) {
+	    if (!slaves?.id?.find{it==master?.id} && master?.currentValue("switch") == "on"){
+		if (evt.value != "--") {
+		    log.debug "Changing Slave color temp based on Master change"
+		    def tempLevel = master.currentValue("colorTemperature")
+		    slaves?.setColorTemperature(tempLevel)
+		}
+		}
 	}
 }
 
@@ -139,7 +146,7 @@ private def textAppName() {
 }	
 
 private def textVersion() {
-    def text = "Version 1.1.0 (11/09/2016)"
+    def text = "Version 1.1.1 (12/13/2016)"
 }
 
 private def textCopyright() {
@@ -166,4 +173,4 @@ private def textHelp() {
     	"This application will allow you to control the settings of multiple colored lights with one control. " +
         "Simply choose a master control light, and then choose the lights that will follow the settings of the master, "+
         "including on/off conditions, hue, saturation, level and color temperature. Also includes a random color feature."
-}
+}

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

@@ -0,0 +1,461 @@
+/**
+ *  OpenT2T SmartApp Test
+ *
+ *  Copyright 2016 OpenT2T
+ *
+ *  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.
+ *
+ */
+definition(
+		name: "OpenT2T SmartApp Test",
+		namespace: "opent2t",
+		author: "OpenT2T",
+		description: "Test app to test end to end SmartThings scenarios via OpenT2T",
+		category: "SmartThings Labs",
+		iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
+		iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
+		iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
+
+/** --------------------+---------------+-----------------------+------------------------------------
+ *  Device Type         | Attribute Name| Commands              | Attribute Values
+ *  --------------------+---------------+-----------------------+------------------------------------
+ *  switches            | switch        | on, off               | on, off
+ *  motionSensors       | motion        |                       | active, inactive
+ *  contactSensors      | contact       |                       | open, closed
+ *  presenceSensors     | presence      |                       | present, 'not present'
+ *  temperatureSensors  | temperature   |                       | <numeric, F or C according to unit>
+ *  accelerationSensors | acceleration  |                       | active, inactive
+ *  waterSensors        | water         |                       | wet, dry
+ *  lightSensors        | illuminance   |                       | <numeric, lux>
+ *  humiditySensors     | humidity      |                       | <numeric, percent>
+ *  locks               | lock          | lock, unlock          | locked, unlocked
+ *  garageDoors         | door          | open, close           | unknown, closed, open, closing, opening
+ *  cameras             | image         | take                  | <String>
+ *  thermostats         | thermostat    | setHeatingSetpoint,   | temperature, heatingSetpoint, coolingSetpoint,
+ * 	                    |				| setCoolingSetpoint,   | thermostatSetpoint, thermostatMode,
+ *                      |				| off, heat, cool, auto,| thermostatFanMode, thermostatOperatingState
+ *                      |				| emergencyHeat,        |
+ *                      |				| setThermostatMode,    |
+ *                      |				| fanOn, fanAuto,       |
+ *                      |				| fanCirculate,         |
+ *                      |				| setThermostatFanMode  |
+ *  --------------------+---------------+-----------------------+------------------------------------
+ */
+
+//Device Inputs
+preferences {
+	section("Allow <PLACEHOLDER: Your App Name> to control these things...") {
+		input "contactSensors", "capability.contactSensor", title: "Which Contact Sensors", multiple: true, required: false
+		input "garageDoors", "capability.garageDoorControl", title: "Which Garage Doors?", multiple: true, required: false
+		input "locks", "capability.lock", title: "Which Locks?", multiple: true, required: false
+		input "cameras", "capability.videoCapture", title: "Which Cameras?", multiple: true, required: false
+		input "motionSensors", "capability.motionSensor", title: "Which Motion Sensors?", multiple: true, required: false
+		input "presenceSensors", "capability.presenceSensor", title: "Which Presence Sensors", multiple: true, required: false
+		input "switches", "capability.switch", title: "Which Switches and Lights?", multiple: true, required: false
+		input "thermostats", "capability.thermostat", title: "Which Thermostat?", multiple: true, required: false
+		input "waterSensors", "capability.waterSensor", title: "Which Water Leak Sensors?", multiple: true, required: false
+	}
+}
+
+def getInputs() {
+	def inputList = []
+	inputList += contactSensors ?: []
+	inputList += garageDoors ?: []
+	inputList += locks ?: []
+	inputList += cameras ?: []
+	inputList += motionSensors ?: []
+	inputList += presenceSensors ?: []
+	inputList += switches ?: []
+	inputList += thermostats ?: []
+	inputList += waterSensors ?: []
+	return inputList
+}
+
+//API external Endpoints
+mappings {
+	path("/subscriptionURL/:url") {
+		action:
+		[
+				PUT: "updateEndpointURL"
+		]
+	}
+	path("/connectionId/:connId") {
+		action:
+		[
+				PUT: "updateConnectionId"
+		]
+	}
+	path("/devices") {
+		action:
+		[
+				GET: "getDevices"
+		]
+	}
+	path("/devices/:id") {
+		action:
+		[
+				GET: "getDevice"
+		]
+	}
+	path("/update/:id") {
+		action:
+		[
+				PUT: "updateDevice"
+		]
+	}
+	path("/subscription/:id") {
+		action:
+		[
+				POST  : "registerDeviceChange",
+				DELETE: "unregisterDeviceChange"
+		]
+	}
+}
+
+def installed() {
+	log.debug "Installed with settings: ${settings}"
+	initialize()
+}
+
+def updated() {
+	log.debug "Updated with settings: ${settings}"
+	unsubscribe()
+	registerSubscriptions()
+}
+
+def initialize() {
+	state.connectionId = ""
+	state.endpointURL = "https://ifs.windows-int.com/v1/cb/81C7E77B-EABC-488A-B2BF-FEC42F0DABD2/notify"
+	registerSubscriptions()
+}
+
+//Subscribe events for all devices
+def registerSubscriptions() {
+	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, eventHandler)
+			log.info "Registering ${myDevice.displayName}.${att.name}"
+		}
+	}
+}
+
+//Endpoints function: Subscribe to events from a specific device
+def registerDeviceChange() {
+	def myDevice = findDevice(params.id)
+	def theAtts = myDevice.supportedAttributes
+	try {
+		theAtts.each { att ->
+			subscribe(myDevice, att.name, eventHandler)
+			log.info "Registering ${myDevice.displayName}.${att.name}"
+		}
+		return ["succeed"]
+	} catch (e) {
+		httpError(500, "something went wrong: $e")
+	}
+}
+
+//Endpoints function: Unsubscribe to events from a specific device
+def unregisterDeviceChange() {
+	def myDevice = findDevice(params.id)
+	try {
+		unsubscribe(myDevice)
+		log.info "Unregistering ${myDevice.displayName}"
+		return ["succeed"]
+	} catch (e) {
+		httpError(500, "something went wrong: $e")
+	}
+}
+
+//When events are triggered, send HTTP post to web socket servers
+def eventHandler(evt) {
+	def evt_device_id = evt.deviceId
+	def evt_device_value = evt.value
+	def evt_name = evt.name
+	def evt_device = evt.device
+	def evt_deviceType = getDeviceType(evt_device);
+	def params = [
+			uri : "${state.endpointURL}/${state.connectionId}",
+			body: [
+					name        : evt_device.displayName,
+					id          : evt_device.id,
+					deviceType  : evt_deviceType,
+					manufacturer: evt_device.getManufacturerName(),
+					model       : evt_device.getModelName(),
+					attributes  : deviceAttributeList(evt_device)
+			]
+	]
+	try {
+		log.trace "POST URI: ${params.uri}"
+		log.trace "Payload: ${params.body}"
+		httpPostJson(params) { resp ->
+			resp.headers.each {
+				log.debug "${it.name} : ${it.value}"
+			}
+			log.trace "response status code: ${resp.status}"
+			log.trace "response data: ${resp.data}"
+		}
+	} catch (e) {
+		log.debug "something went wrong: $e"
+	}
+}
+
+//Endpoints function: update subcription endpoint url [state.endpoint]
+void updateEndpointURL() {
+	state.endpointURL = params.url
+	log.info "Updated EndpointURL to ${state.endpointURL}"
+}
+
+//Endpoints function: update global variable [state.connectionId]
+void updateConnectionId() {
+	def connId = params.connId
+	state.connectionId = connId
+	log.info "Updated ConnectionID to ${state.connectionId}"
+}
+
+//Endpoints function: return all device data in json format
+def getDevices() {
+	def deviceData = []
+	inputs?.each {
+		def deviceType = getDeviceType(it)
+		if (deviceType == "thermostat") {
+			deviceData << [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it), locationMode: getLocationModeInfo()]
+		} else {
+			deviceData << [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it)]
+		}
+	}
+
+	log.debug "getDevices, return: ${deviceData}"
+	return deviceData
+}
+
+//Endpoints function: get device data
+def getDevice() {
+	def it = findDevice(params.id)
+	def deviceType = getDeviceType(it)
+	def device
+	if (deviceType == "thermostat") {
+		device = [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it), locationMode: getLocationModeInfo()]
+	} else {
+		device = [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it)]
+	}
+	log.debug "getDevice, return: ${device}"
+	return device
+}
+
+//Endpoints function: update device data
+void updateDevice() {
+	def device = findDevice(params.id)
+	request.JSON.each {
+		def command = it.key
+		def value = it.value
+		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 }) {
+					location.setMode(value)
+				}
+			} else if (command == "thermostatSetpoint") {
+				switch (device.currentThermostatMode) {
+					case "cool":
+						log.info "Update: ${device.displayName}, [${command}, ${value}]"
+						device.setCoolingSetpoint(value)
+						break
+					case "heat":
+					case "emergency heat":
+						log.info "Update: ${device.displayName}, [${command}, ${value}]"
+						device.setHeatingSetpoint(value)
+						break
+					default:
+						httpError(501, "this mode: ${device.currentThermostatMode} does not allow changing thermostat setpoint.")
+						break
+				}
+			} else if (!device) {
+				log.error "updateDevice, Device not found"
+				httpError(404, "Device not found")
+			} else if (!device.hasCommand(command)) {
+				log.error "updateDevice, Device does not have the command"
+				httpError(404, "Device does not have such command")
+			} else {
+				if (command == "setColor") {
+					log.info "Update: ${device.displayName}, [${command}, ${value}]"
+					device."$command"(hex: value)
+				} else if (value.isNumber()) {
+					def intValue = value as Integer
+					log.info "Update: ${device.displayName}, [${command}, ${intValue}(int)]"
+					device."$command"(intValue)
+				} else if (value) {
+					log.info "Update: ${device.displayName}, [${command}, ${value}]"
+					device."$command"(value)
+				} else {
+					log.info "Update: ${device.displayName}, [${command}]"
+					device."$command"()
+				}
+			}
+		}
+	}
+}
+
+/*** Private Functions ***/
+
+//Return current location mode info
+private getLocationModeInfo() {
+	return [mode: location.mode, supported: location.modes.name]
+}
+
+//Map each device to a type given it's capabilities
+private getDeviceType(device) {
+	def deviceType
+	def caps = device.capabilities
+	log.debug "capabilities: [${device}, ${caps}]"
+	log.debug "supported commands: [${device}, ${device.supportedCommands}]"
+	caps.each {
+		switch (it.name.toLowerCase()) {
+			case "switch":
+				deviceType = "switch"
+				break
+			case "switch level":
+				deviceType = "light"
+				break
+			case "contact sensor":
+				deviceType = "contactSensor"
+				break
+			case "garageDoorControl":
+				deviceType = "garageDoor"
+				break
+			case "lock":
+				deviceType = "lock"
+				break
+			case "video camera":
+				deviceType = "camera"
+				break
+			case "motion sensor":
+				deviceType = "motionSensor"
+				break
+			case "presence sensor":
+				deviceType = "presenceSensor"
+				break
+			case "thermostat":
+				deviceType = "thermostat"
+				break
+			case "water sensor":
+				deviceType = "waterSensor"
+				break
+			default:
+				break
+		}
+	}
+	return deviceType
+}
+
+//Return a specific device give the device ID.
+private findDevice(deviceId) {
+	return inputs?.find { it.id == deviceId }
+}
+
+//Return a list of device attributes
+private deviceAttributeList(device) {
+	device.supportedAttributes.collectEntries { attribute ->
+		try {
+			[(attribute.name): device.currentValue(attribute.name)]
+		} catch (e) {
+			[(attribute.name): null]
+		}
+	}
+}
+
+//Map device command and value.
+//input command and value are from UWP,
+//returns resultCommand and resultValue that corresponds with function and value in SmartApps
+private mapDeviceCommands(command, value) {
+	log.debug "mapDeviceCommands: [${command}, ${value}]"
+	def resultCommand = command
+	def resultValue = value
+	switch (command) {
+		case "switch":
+			if (value == 1 || value == "1" || value == "on") {
+				resultCommand = "on"
+				resultValue = ""
+			} else if (value == 0 || value == "0" || value == "off") {
+				resultCommand = "off"
+				resultValue = ""
+			}
+			break
+	// light attributes
+		case "level":
+			resultCommand = "setLevel"
+			resultValue = value
+			break
+		case "hue":
+			resultCommand = "setHue"
+			resultValue = value
+			break
+		case "saturation":
+			resultCommand = "setSaturation"
+			resultValue = value
+			break
+		case "ct":
+			resultCommand = "setColorTemperature"
+			resultValue = value
+			break
+		case "color":
+			resultCommand = "setColor"
+			resultValue = value
+	// thermostat attributes
+		case "hvacMode":
+			resultCommand = "setThermostatMode"
+			resultValue = value
+			break
+		case "fanMode":
+			resultCommand = "setThermostatFanMode"
+			resultValue = value
+			break
+		case "awayMode":
+			resultCommand = "setAwayMode"
+			resultValue = value
+			break
+		case "coolingSetpoint":
+			resultCommand = "setCoolingSetpoint"
+			resultValue = value
+			break
+		case "heatingSetpoint":
+			resultCommand = "setHeatingSetpoint"
+			resultValue = value
+			break
+		case "thermostatSetpoint":
+			resultCommand = "thermostatSetpoint"
+			resultValue = value
+			break
+	// lock attributes
+		case "locked":
+			if (value == 1 || value == "1" || value == "lock") {
+				resultCommand = "lock"
+				resultValue = ""
+			} else if (value == 0 || value == "0" || value == "unlock") {
+				resultCommand = "unlock"
+				resultValue = ""
+			}
+			break
+		default:
+			break
+	}
+
+	return [resultCommand, resultValue]
+}
+

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

@@ -172,18 +172,34 @@ def bulbDiscovery() {
 			if (existingLightsDescription.isEmpty()) {
 				existingLightsDescription += it.value
 			} else {
-				 existingLightsDescription += ", ${it.value}"
+				existingLightsDescription += ", ${it.value}"
 			}
 		}
 	}
 
-	return dynamicPage(name:"bulbDiscovery", title:"Light Discovery Started!", nextPage:"", refreshInterval:refreshInterval, install:true, uninstall: true) {
-		section("Please wait while we discover your Hue Lights. 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 Lights to add (${numFound} found)", multiple:true, submitOnChange: true, options:newLights
-			paragraph title: "Previously added Hue Lights (${existingLights.size()} added)", existingLightsDescription
+	if (bulbRefreshCount > 200 && numFound == 0) {
+		// Time out to avoid endless discovery
+		state.inBulbDiscovery = false
+		bulbRefreshCount = 0
+		return dynamicPage(name:"bulbDiscovery", title:"Light Discovery Failed!", nextPage:"", refreshInterval:0, install:true, uninstall: true) {
+			section("Failed to discover any lights, please try again later. Click Done to exit.") {
+				//input "selectedBulbs", "enum", required:false, title:"Select Hue Lights to add (${numFound} found)", multiple:true, submitOnChange: true, options:newLights
+				paragraph title: "Previously added Hue Lights (${existingLights.size()} added)", existingLightsDescription
+			}
+			section {
+				href "bridgeDiscovery", title: title, description: "", state: selectedHue ? "complete" : "incomplete", params: [override: true]
+			}
 		}
-		section {
-			href "bridgeDiscovery", title: title, description: "", state: selectedHue ? "complete" : "incomplete", params: [override: true]
+
+	} else {
+		return dynamicPage(name:"bulbDiscovery", title:"Light Discovery Started!", nextPage:"", refreshInterval:refreshInterval, install:true, uninstall: true) {
+			section("Please wait while we discover your Hue Lights. 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 Lights to add (${numFound} found)", multiple:true, submitOnChange: true, options:newLights
+				paragraph title: "Previously added Hue Lights (${existingLights.size()} added)", existingLightsDescription
+			}
+			section {
+				href "bridgeDiscovery", title: title, description: "", state: selectedHue ? "complete" : "incomplete", params: [override: true]
+			}
 		}
 	}
 }
@@ -407,7 +423,7 @@ def addBridge() {
 	if(vbridge) {
 		def d = getChildDevice(selectedHue)
 		if(!d) {
-	 		// compatibility with old devices
+			// compatibility with old devices
 			def newbridge = true
 			childDevices.each {
 				if (it.getDeviceDataByName("mac")) {
@@ -593,7 +609,7 @@ def locationHandler(evt) {
 	log.trace "Location: $description"
 
 	def hub = evt?.hubId
- 	def parsedEvent = parseLanMessage(description)
+	def parsedEvent = parseLanMessage(description)
 	parsedEvent << ["hub":hub]
 
 	if (parsedEvent?.ssdpTerm?.contains("urn:schemas-upnp-org:device:basic:1")) {
@@ -819,8 +835,7 @@ def parse(childDevice, description) {
 			try {
 				body = new groovy.json.JsonSlurper().parseText(bodyString)
 			} catch (all) {
-				log.warn "Parsing Body failed - trying again..."
-				poll()
+				log.warn "Parsing Body failed"
 			}
 			if (body instanceof java.util.Map) {
 				// get (poll) reponse
@@ -844,7 +859,7 @@ private sendColorEvents(device, xy, hue, sat, ct, colormode = null) {
 
 	def events = [:]
 	// For now, only care about changing color temperature if requested by user
-	if (ct != null && (colormode == "ct" || (xy == null && hue == null && sat == null))) {
+	if (ct != null && ct != 0 && (colormode == "ct" || (xy == null && hue == null && sat == null))) {
 		// for some reason setting Hue to their specified minimum off 153 yields 154, dealt with below
 		// 153 (6500K) to 500 (2000K)
 		def temp = (ct == 154) ? 6500 : Math.round(1000000 / ct)
@@ -1252,7 +1267,7 @@ private getBridgeIP() {
 		if (d) {
 			if (d.getDeviceDataByName("networkAddress"))
 				host =  d.getDeviceDataByName("networkAddress")
-		else
+			else
 				host = d.latestState('networkAddress').stringValue
 		}
 		if (host == null || host == "") {

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

@@ -289,12 +289,12 @@ def initializeLife360Connection() {
        		state.life360AccessToken = result.data.access_token
             return true;
    		}
-		log.debug "Response=${result.data}"
+		log.info "Life360 initializeLife360Connection, response=${result.data}"
         return false;
         
     }
     catch (e) {
-       log.debug e
+       log.error "Life360 initializeLife360Connection, error: $e"
        return false;
     }
 
@@ -656,7 +656,7 @@ def generateInitialEvent (member, childDevice) {
     
     try { // we are going to just ignore any errors
     
-    	log.debug "Generate Initial Event for New Device for Member = ${member.id}"
+    	log.info "Life360 generateInitialEvent($member, $childDevice)"
         
         def place = state.places.find{it.id==settings.place}
         
@@ -677,6 +677,8 @@ def generateInitialEvent (member, childDevice) {
         	// log.debug "Distance Away = ${distanceAway}"
   
   			boolean isPresent = (distanceAway <= placeRadius)
+
+			log.info "Life360 generateInitialEvent, member: ($memberLatitude, $memberLongitude), place: ($placeLatitude, $placeLongitude), radius: $placeRadius, dist: $distanceAway, present: $isPresent"
                 
         	// log.debug "External Id=${app.id}:${member.id}"
         
@@ -718,7 +720,7 @@ def haversine(lat1, lon1, lat2, lon2) {
 
 def placeEventHandler() {
 
-	log.debug "In placeEventHandler method."
+	log.info "Life360 placeEventHandler: params=$params, settings.place=$settings.place"
 
 	// the POST to this end-point will look like:
     // POST http://test.com/webhook?circleId=XXXX&placeId=XXXX&userId=XXXX&direction=arrive
@@ -729,8 +731,6 @@ def placeEventHandler() {
     def direction = params?.direction
     def timestamp = params?.timestamp
     
-    log.debug "Life360 Event: Circle: ${circleId}, Place: ${placeId}, User: ${userId}, Direction: ${direction}"
-
     if (placeId == settings.place) {
 
 		def presenceState = (direction=="in")
@@ -745,10 +745,10 @@ def placeEventHandler() {
 
 		if (deviceWrapper) {
 			deviceWrapper.generatePresenceEvent(presenceState)
-    		log.debug "Event raised on child device: ${externalId}"
+    		log.debug "Life360 event raised on child device: ${externalId}"
 		}
    		else {
-    		log.debug "Couldn't find child device associated with inbound Life360 event."
+    		log.warn "Life360 couldn't find child device associated with inbound Life360 event."
     	}
     }
 

smartapps/triosniolin/control-light-scenes.src/control-light-scenes.groovy

@@ -0,0 +1,547 @@
+/**
+ *  Switches Control Light Scenes
+ *
+ *  Copyright 2017 Will Cole
+ *
+ *  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.
+ *
+ */
+definition(
+    name: "Control Light Scenes",
+    namespace: "triosniolin",
+    author: "Will Cole",
+    description: "Using switches, control scenes for light(s).",
+    category: "Convenience",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
+    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
+
+
+preferences {
+    page(name: "page1")
+	page(name: "page2")
+	page(name: "page3")
+	page(name: "page4")
+    page(name: "page5")
+    page(name: "page6")
+}
+def page1() {
+	dynamicPage(name: "page1", title: "Select devices:", nextPage: "page2", uninstall:true) {
+        section("Number of Scenes (such as on, off, movie, party)") {
+            input "scenes", "number", 
+                title: "Number of Scenes (1-5)", 
+                range: "1..5",
+                defaultValue: "3",
+                required: true,
+                submitOnChange: true
+        }
+        section("Device(s) to control") {
+		input "colors", "capability.colorControl", 
+                    multiple: true, 
+                    title: "Slave Color bulb(s)...",
+		    		required: false,
+		    		hideWhenEmpty: true
+                input "slaves", "capability.colorTemperature", 
+                    multiple: true, 
+                    title: "Slave Temp bulb(s)...", 
+                    required: true
+        }
+
+    }
+}
+
+def page2() {
+    def i = 1
+	if (scenes > i) {
+	dynamicPage(name: "page2", title: "Select Scene $i", nextPage: "page3") {
+            section("Scene $i") {
+                input "switch$i", "capability.switch", 
+                    multiple: false, 
+                    title: "Switch To Enable Scene $i", 
+                    required: true
+            }
+            section("Scene $i Color Temp") {
+                input "Temp$i", "number", 
+                    title: "Scene $i Color Temp (Kelvin) (2700-6500)", 
+                    range: "2700..6500",
+                    defaultValue: "",
+					required: false
+            }
+            section("Scene $i Level") {
+                input "Dim$i", "number", 
+                    title: "Scene $i Dim Level (0-100%)", 
+                    range: "0..100",
+                    defaultValue: "",
+					required: false
+            }
+		if (colors) {
+			section("Scene $i Hue") {
+			input "Hue$i", "number", 
+			    title: "Scene $i Hue (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+			section("Scene $i Saturation") {
+			input "Sat$i", "number", 
+			    title: "Scene $i Saturation (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+		}
+        }
+   } else {
+    dynamicPage(name: "page2", title: "Select Scene $i", install:true) {
+            section("Scene $i") {
+                input "switch$i", "capability.switch", 
+                    multiple: false, 
+                    title: "Switch To Enable Scene $i", 
+                    required: true
+            }
+            section("Scene $i Color Temp") {
+                input "Temp$i", "number", 
+                    title: "Scene $i Color Temp (Kelvin) (2700-6500)", 
+                    range: "2700..6500",
+                    defaultValue: "",
+					required: false
+            }
+            section("Scene $i Level") {
+                input "Dim$i", "number", 
+                    title: "Scene $i Dim Level (0-100%)", 
+                    range: "0..100",
+                    defaultValue: "",
+					required: false
+            }
+	    if (colors) {
+			section("Scene $i Hue") {
+			input "Hue$i", "number", 
+			    title: "Scene $i Hue (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+			section("Scene $i Saturation") {
+			input "Sat$i", "number", 
+			    title: "Scene $i Saturation (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+		}
+        }
+    }
+}
+def page3() {
+	def i = 2
+if (scenes > i) {
+	dynamicPage(name: "page3", title: "Select Scene $i", nextPage: "page4") {
+            section("Scene $i") {
+                input "switch$i", "capability.switch", 
+                    multiple: false, 
+                    title: "Switch To Enable Scene $i", 
+                    required: true
+            }
+            section("Scene $i Color Temp") {
+                input "Temp$i", "number", 
+                    title: "Scene $i Color Temp (Kelvin) (2700-6500)", 
+                    range: "2700..6500",
+                    defaultValue: "",
+					required: false
+            }
+            section("Scene $i Level") {
+                input "Dim$i", "number", 
+                    title: "Scene $i Dim Level (0-100%)", 
+                    range: "0..100",
+                    defaultValue: "",
+					required: false
+            }
+		if (colors) {
+			section("Scene $i Hue") {
+			input "Hue$i", "number", 
+			    title: "Scene $i Hue (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+			section("Scene $i Saturation") {
+			input "Sat$i", "number", 
+			    title: "Scene $i Saturation (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+		}
+        }
+   } else {
+    dynamicPage(name: "page3", title: "Select Scene $i", install:true) {
+            section("Scene $i") {
+                input "switch$i", "capability.switch", 
+                    multiple: false, 
+                    title: "Switch To Enable Scene $i", 
+                    required: true
+            }
+            section("Scene $i Color Temp") {
+                input "Temp$i", "number", 
+                    title: "Scene $i Color Temp (Kelvin) (2700-6500)", 
+                    range: "2700..6500",
+                    defaultValue: "",
+					required: false
+            }
+            section("Scene $i Level") {
+                input "Dim$i", "number", 
+                    title: "Scene $i Dim Level (0-100%)", 
+                    range: "0..100",
+                    defaultValue: "",
+					required: false
+            }
+	    if (colors) {
+			section("Scene $i Hue") {
+			input "Hue$i", "number", 
+			    title: "Scene $i Hue (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+			section("Scene $i Saturation") {
+			input "Sat$i", "number", 
+			    title: "Scene $i Saturation (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+		}
+        }
+    }
+}
+def page4() {
+	def i = 3
+if (scenes > i) {
+	dynamicPage(name: "page4", title: "Select Scene $i", nextPage: "page5") {
+            section("Scene $i") {
+                input "switch$i", "capability.switch", 
+                    multiple: false, 
+                    title: "Switch To Enable Scene $i", 
+                    required: true
+            }
+            section("Scene $i Color Temp") {
+                input "Temp$i", "number", 
+                    title: "Scene $i Color Temp (Kelvin) (2700-6500)", 
+                    range: "2700..6500",
+                    defaultValue: "",
+					required: false
+            }
+            section("Scene $i Level") {
+                input "Dim$i", "number", 
+                    title: "Scene $i Dim Level (0-100%)", 
+                    range: "0..100",
+                    defaultValue: "",
+					required: false
+            }
+		if (colors) {
+			section("Scene $i Hue") {
+			input "Hue$i", "number", 
+			    title: "Scene $i Hue (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+			section("Scene $i Saturation") {
+			input "Sat$i", "number", 
+			    title: "Scene $i Saturation (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+		}
+        }
+   } else {
+        dynamicPage(name: "page4", title: "Select Scene $i", install:true) {
+            section("Scene $i") {
+                input "switch$i", "capability.switch", 
+                    multiple: false, 
+                    title: "Switch To Enable Scene $i", 
+                    required: true
+            }
+            section("Scene $i Color Temp") {
+                input "Temp$i", "number", 
+                    title: "Scene $i Color Temp (Kelvin) (2700-6500)", 
+                    range: "2700..6500",
+                    defaultValue: "",
+					required: false
+            }
+            section("Scene $i Level") {
+                input "Dim$i", "number", 
+                    title: "Scene $i Dim Level (0-100%)", 
+                    range: "0..100",
+                    defaultValue: "",
+					required: false
+            }
+		if (colors) {
+			section("Scene $i Hue") {
+			input "Hue$i", "number", 
+			    title: "Scene $i Hue (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+			section("Scene $i Saturation") {
+			input "Sat$i", "number", 
+			    title: "Scene $i Saturation (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+		}
+        }
+    }
+}
+def page5() {
+	def i = 4
+	if (scenes > i) {
+        dynamicPage(name: "page5", title: "Select Scene $i", nextPage: "page6") {
+            section("Scene $i") {
+                input "switch$i", "capability.switch", 
+                    multiple: false, 
+                    title: "Switch To Enable Scene $i", 
+                    required: true
+            }
+            section("Scene $i Color Temp") {
+                input "Temp$i", "number", 
+                    title: "Scene $i Color Temp (Kelvin) (2700-6500)", 
+                    range: "2700..6500",
+                    defaultValue: "",
+					required: false
+            }
+            section("Scene $i Level") {
+                input "Dim$i", "number", 
+                    title: "Scene $i Dim Level (0-100%)", 
+                    range: "0..100",
+                    defaultValue: "",
+					required: false
+            }
+		if (colors) {
+			section("Scene $i Hue") {
+			input "Hue$i", "number", 
+			    title: "Scene $i Hue (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+			section("Scene $i Saturation") {
+			input "Sat$i", "number", 
+			    title: "Scene $i Saturation (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+		}
+        }
+       } else {
+        dynamicPage(name: "page5", title: "Select Scene $i", install:true) {
+                section("Scene $i") {
+                    input "switch$i", "capability.switch", 
+                        multiple: false, 
+                        title: "Switch To Enable Scene $i", 
+                        required: true
+                }
+                section("Scene $i Color Temp") {
+                    input "Temp$i", "number", 
+                        title: "Scene $i Color Temp (Kelvin) (2700-6500)", 
+                        range: "2700..6500",
+                        defaultValue: "",
+					required: false
+                }
+                section("Scene $i Level") {
+                    input "Dim$i", "number", 
+                        title: "Scene $i Dim Level (0-100%)", 
+                        range: "0..100",
+                        defaultValue: "",
+					required: false
+                }
+		if (colors) {
+			section("Scene $i Hue") {
+			input "Hue$i", "number", 
+			    title: "Scene $i Hue (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+			section("Scene $i Saturation") {
+			input "Sat$i", "number", 
+			    title: "Scene $i Saturation (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+		}
+            }
+    }
+}
+def page6() {
+	def i = 5
+        dynamicPage(name: "page6", title: "Select Scene $i", install:true) {
+            section("Scene $i") {
+                input "switch$i", "capability.switch", 
+                    multiple: false, 
+                    title: "Switch To Enable Scene $i", 
+                    required: true
+            }
+            section("Scene $i Color Temp") {
+                input "Temp$i", "number", 
+                    title: "Scene $i Color Temp (Kelvin) (2700-6500)", 
+                    range: "2700..6500",
+                    defaultValue: "",
+					required: false
+            }
+            section("Scene $i Level") {
+                input "Dim$i", "number", 
+                    title: "Scene $i Dim Level (0-100%)", 
+                    range: "0..100",
+                    defaultValue: "",
+					required: false
+            }
+		if (colors) {
+			section("Scene $i Hue") {
+			input "Hue$i", "number", 
+			    title: "Scene $i Hue (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+			section("Scene $i Saturation") {
+			input "Sat$i", "number", 
+			    title: "Scene $i Saturation (0-100)", 
+			    range: "0..100",
+			    defaultValue: "",
+					required: false
+			}
+		}
+        
+    }
+}
+def installed()
+{
+if (switch1) {
+subscribe (switch1, "switch.on", switch1Handler)
+}
+if (switch2) {
+subscribe (switch2, "switch.on", switch2Handler)
+}
+if (switch3) {
+subscribe (switch3, "switch.on", switch3Handler)
+}
+if (switch4) {
+subscribe (switch4, "switch.on", switch4Handler)
+}
+if (switch5) {
+subscribe (switch5, "switch.on", switch5Handler)
+}
+}
+
+def updated()
+{
+	unsubscribe()
+if (switch1) {
+subscribe (switch1, "switch.on", switch1Handler)
+}
+if (switch2) {
+subscribe (switch2, "switch.on", switch2Handler)
+}
+if (switch3) {
+subscribe (switch3, "switch.on", switch3Handler)
+}
+if (switch4) {
+subscribe (switch4, "switch.on", switch4Handler)
+}
+if (switch5) {
+subscribe (switch5, "switch.on", switch5Handler)
+}
+	log.info "subscribed to all of switches events"
+}
+
+
+
+def switch1Handler(evt){	
+
+	log.info "switch1Handler Event: ${evt.value}"
+	if (colors) {
+		
+		if (Temp1) { slaves?.setColorTemperature(Temp1)
+			     colors?.setColorTemperature(Temp1) }
+		if (Dim1) { slaves?.setLevel(Dim1) 
+			    colors?.setLevel(Dim1) }
+		if (Hue1) { colors?.setHue(Hue1) }
+		if (Sat1) { colors?.setSaturation(Sat1) }
+	} else {
+		if (Temp1) { slaves?.setColorTemperature(Temp1) }
+		if (Dim1) { slaves?.setLevel(Dim1) }
+	}
+}
+def switch2Handler(evt){	
+	log.info "switch2Handler Event: ${evt.value}"
+	if (colors) {
+		
+		if (Temp2) { slaves?.setColorTemperature(Temp2)
+			     colors?.setColorTemperature(Temp2) }
+		if (Dim2) { slaves?.setLevel(Dim2) 
+			    colors?.setLevel(Dim2) }
+		if (Hue2) { colors?.setHue(Hue2) }
+		if (Sat2) { colors?.setSaturation(Sat2) }
+	} else {
+		if (Temp2) { slaves?.setColorTemperature(Temp2) }
+		if (Dim2) { slaves?.setLevel(Dim2) }
+	}
+}
+def switch3Handler(evt){	
+	log.info "switch3Handler Event: ${evt.value}"
+	if (colors) {
+		
+		if (Temp3) { slaves?.setColorTemperature(Temp3)
+			     colors?.setColorTemperature(Temp3) }
+		if (Dim3) { slaves?.setLevel(Dim3) 
+			    colors?.setLevel(Dim3) }
+		if (Hue3) { colors?.setHue(Hue3) }
+		if (Sat3) { colors?.setSaturation(Sat3) }
+	} else {
+		if (Temp3) { slaves?.setColorTemperature(Temp3) }
+		if (Dim3) { slaves?.setLevel(Dim3) }
+	}
+}
+def switch4Handler(evt){	
+	log.info "switch4Handler Event: ${evt.value}"
+	if (colors) {
+		
+		if (Temp4) { slaves?.setColorTemperature(Temp4)
+			     colors?.setColorTemperature(Temp4) }
+		if (Dim4) { slaves?.setLevel(Dim4) 
+			    colors?.setLevel(Dim4) }
+		if (Hue4) { colors?.setHue(Hue4) }
+		if (Sat4) { colors?.setSaturation(Sat4) }
+	} else {
+		if (Temp4) { slaves?.setColorTemperature(Temp4) }
+		if (Dim4) { slaves?.setLevel(Dim4) }
+	}
+}
+def switch5Handler(evt){	
+	log.info "switch5Handler Event: ${evt.value}"
+	if (colors) {
+		
+		if (Temp5) { slaves?.setColorTemperature(Temp5)
+			     colors?.setColorTemperature(Temp5) }
+		if (Dim5) { slaves?.setLevel(Dim5) 
+			    colors?.setLevel(Dim5) }
+		if (Hue5) { colors?.setHue(Hue5) }
+		if (Sat5) { colors?.setSaturation(Sat5) }
+	} else {
+		if (Temp5) { slaves?.setColorTemperature(Temp5) }
+		if (Dim5) { slaves?.setLevel(Dim5) }
+	}
+}