DEVTOOLS-162: This is a capability / simulator device type for Beacon.

devicetypes/capabilities/beacon-capability.src/beacon-capability.groovy

@@ -0,0 +1,37 @@
+/**
+ *  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.
+ *
+ */
+metadata {
+	definition (name: "Beacon Capability", namespace: "capabilities", author: "SmartThings") {
+		capability "Beacon"
+	}
+
+	simulator {
+		status "present": "beacon: present"
+		status "not present": "beacon: not present"
+	}
+
+	tiles {
+		standardTile("beacon", "device.beacon", width: 2, height: 2) {
+			state("not present", label:'not present', icon:"st.presence.tile.not-present", backgroundColor:"#ffffff")
+			state("present", label:'present', icon:"st.presence.tile.present", backgroundColor:"#53a7c0")
+		}
+		main "beacon"
+		details "beacon"
+	}
+}
+
+def parse(String description) {
+	def pair = description.split(":")
+	createEvent(name: pair[0].trim(), value: pair[1].trim())
+}

devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy

@@ -22,6 +22,7 @@ metadata {
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
+		capability "Health Check"
 
 		attribute "tamper", "enum", ["detected", "clear"]
 		attribute "batteryStatus", "string"
@@ -327,6 +328,9 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 def configure() {
+	// allow device user configured or default 16 min to check in; double the periodic reporting interval
+	sendEvent(name: "checkInterval", value: 2* (timeOptionValueMap[reportInterval] ?: (2*8*60)), displayed: false)
+
 	// This sensor joins as a secure device if you double-click the button to include it
 	log.debug "${device.displayName} is configuring its settings"
 	def request = []

devicetypes/smartthings/aeon-multisensor-gen5.src/aeon-multisensor-gen5.groovy

@@ -20,6 +20,7 @@ metadata {
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
+		capability "Health Check"
 
 		command "configureAfterSecure"
 
@@ -247,6 +248,8 @@ def configureAfterSecure() {
 def configure() {
 	// log.debug "configure()"
     //["delay 30000"] + secure(zwave.securityV1.securityCommandsSupportedGet())
+	// allow device 16 min to check in; double the periodic reporting interval
+	sendEvent(name: "checkInterval", value: 2*8*60, displayed: false)
 }
 
 private setConfigured() {

devicetypes/smartthings/aeon-multisensor.src/aeon-multisensor.groovy

@@ -20,6 +20,7 @@ metadata {
 		capability "Illuminance Measurement"
 		capability "Sensor"
 		capability "Battery"
+		capability "Health Check"
 
 		fingerprint deviceId: "0x2001", inClusters: "0x30,0x31,0x80,0x84,0x70,0x85,0x72,0x86"
 	}
@@ -180,6 +181,9 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 def configure() {
+	// allow device 10 min to check in; double the periodic reporting interval
+	sendEvent(name: "checkInterval", value: 2*5*60, displayed: false)
+
 	delayBetween([
 		// send binary sensor report instead of basic set for motion
 		zwave.configurationV1.configurationSet(parameterNumber: 5, size: 1, scaledConfigurationValue: 2).format(),

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

@@ -23,7 +23,6 @@ metadata {
         capability "Refresh"
         capability "Switch"
         capability "Switch Level"
-        capability "Health Check"
 
         fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0000,0019"
     }
@@ -67,12 +66,6 @@ def parse(String description) {
     def resultMap = zigbee.getEvent(description)
     if (resultMap) {
         sendEvent(resultMap)
-        // Temporary fix for the case when Device is OFFLINE and is connected again
-        if (state.lastActivity == null){
-            state.lastActivity = now()
-            sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
-        }
-        state.lastActivity = now()
     }
     else {
         log.debug "DID NOT PARSE MESSAGE for description : $description"
@@ -92,21 +85,6 @@ def setLevel(value) {
     zigbee.setLevel(value) + ["delay 500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-
-    if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
-        log.info "ping, alive=no, lastActivity=${state.lastActivity}"
-        state.lastActivity = null
-        return zigbee.levelRefresh()
-    } else {
-        log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
-        sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
-    }
-}
-
 def refresh() {
     zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig() + zigbee.levelConfig()
 }
@@ -117,6 +95,5 @@ def poll() {
 
 def configure() {
     log.debug "Configuring Reporting and Bindings."
-    sendEvent(name: "checkInterval", value: 1200, displayed: false, data: [protocol: "zigbee"])
     zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
 }

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

@@ -43,7 +43,7 @@ metadata {
 		}
 
 		standardTile("reset", "device.reset", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
-			state "default", label:"Reset To White", action:"reset", icon:"st.lights.philips.hue-single"
+			state "default", label:"Reset Color", action:"reset", icon:"st.lights.philips.hue-single"
 		}
 
 		standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
@@ -51,7 +51,7 @@ metadata {
 		}
 
 		main(["rich-control"])
-		details(["rich-control", "reset", "refresh"])
+		details(["rich-control", "colorTempSliderControl", "colorTemp", "reset", "refresh"])
 	}
 }
 
@@ -75,78 +75,118 @@ def parse(description) {
 // handle commands
 void on() {
 	log.trace parent.on(this)
+	sendEvent(name: "switch", value: "on")
 }
 
 void off() {
 	log.trace parent.off(this)
+	sendEvent(name: "switch", value: "off")
+}
+
+void nextLevel() {
+	def level = device.latestValue("level") as Integer ?: 0
+	if (level <= 100) {
+		level = Math.min(25 * (Math.round(level / 25) + 1), 100) as Integer
+	}
+	else {
+		level = 25
+	}
+	setLevel(level)
 }
 
 void setLevel(percent) {
     log.debug "Executing 'setLevel'"
     if (verifyPercent(percent)) {
-	    log.trace parent.setLevel(this, percent)
+        parent.setLevel(this, percent)
+        sendEvent(name: "level", value: percent, descriptionText: "Level has changed to ${percent}%")
+        sendEvent(name: "switch", value: "on")
     }
 }
 
 void setSaturation(percent) {
     log.debug "Executing 'setSaturation'"
     if (verifyPercent(percent)) {
-	    log.trace parent.setSaturation(this, percent)
+        parent.setSaturation(this, percent)
+        sendEvent(name: "saturation", value: percent, displayed: false)
     }
 }
 
 void setHue(percent) {
     log.debug "Executing 'setHue'"
     if (verifyPercent(percent)) {
-	    log.trace parent.setHue(this, percent)
+        parent.setHue(this, percent)
+        sendEvent(name: "hue", value: percent, displayed: false)
     }
 }
 
 void setColor(value) {
+    log.debug "setColor: ${value}, $this"
     def events = []
     def validValues = [:]
 
     if (verifyPercent(value.hue)) {
+        events << createEvent(name: "hue", value: value.hue, displayed: false)
         validValues.hue = value.hue
     }
     if (verifyPercent(value.saturation)) {
+        events << createEvent(name: "saturation", value: value.saturation, displayed: false)
         validValues.saturation = value.saturation
     }
     if (value.hex != null) {
         if (value.hex ==~ /^\#([A-Fa-f0-9]){6}$/) {
+            events << createEvent(name: "color", value: value.hex)
             validValues.hex = value.hex
         } else {
             log.warn "$value.hex is not a valid color"
         }
     }
     if (verifyPercent(value.level)) {
+        events << createEvent(name: "level", value: value.level, descriptionText: "Level has changed to ${value.level}%")
         validValues.level = value.level
     }
     if (value.switch == "off" || (value.level != null && value.level <= 0)) {
+        events << createEvent(name: "switch", value: "off")
         validValues.switch = "off"
     } else {
+        events << createEvent(name: "switch", value: "on")
         validValues.switch = "on"
     }
-    if (!validValues.isEmpty()) {
-	    log.trace parent.setColor(this, validValues)
+    if (!events.isEmpty()) {
+        parent.setColor(this, validValues)
+    }
+    events.each {
+        sendEvent(it)
     }
 }
 
 void reset() {
     log.debug "Executing 'reset'"
-	def value = [hue:20, saturation:2]
-	setAdjustedColor(value)
+    def value = [level:100, saturation:56, hue:23]
+    setAdjustedColor(value)
+    parent.poll()
 }
 
 void setAdjustedColor(value) {
     if (value) {
         log.trace "setAdjustedColor: ${value}"
         def adjusted = value + [:]
+        adjusted.hue = adjustOutgoingHue(value.hue)
         // Needed because color picker always sends 100
         adjusted.level = null
-	    setColor(adjusted)
+        setColor(adjusted)
     } else {
-        log.warn "Invalid color input $value"
+        log.warn "Invalid color input"
+    }
+}
+
+void setColorTemperature(value) {
+    if (value) {
+        log.trace "setColorTemperature: ${value}k"
+        parent.setColorTemperature(this, value)
+        sendEvent(name: "colorTemperature", value: value)
+        sendEvent(name: "switch", value: "on")
+    } else {
+        log.warn "Invalid color temperature"
     }
 }
 
@@ -155,6 +195,22 @@ void refresh() {
     parent.manualRefresh()
 }
 
+def adjustOutgoingHue(percent) {
+	def adjusted = percent
+	if (percent > 31) {
+		if (percent < 63.0) {
+			adjusted = percent + (7 * (percent -30 ) / 32)
+		}
+		else if (percent < 73.0) {
+			adjusted = 69 + (5 * (percent - 62) / 10)
+		}
+		else {
+			adjusted = percent + (2 * (100 - percent) / 28)
+		}
+	}
+	log.info "percent: $percent, adjusted: $adjusted"
+	adjusted
+}
 
 def verifyPercent(percent) {
     if (percent == null)

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

@@ -7,13 +7,8 @@
 metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Hue Bridge", namespace: "smartthings", author: "SmartThings") {
+		attribute "serialNumber", "string"
 		attribute "networkAddress", "string"
-        // Used to indicate if bridge is reachable or not, i.e. is the bridge connected to the network
-        // Possible values "Online" or "Offline"
-		attribute "status", "string"
-		// Id is the number on the back of the hub, Hue uses last six digits of Mac address
-		// This is also used in the Hue application as ID
-		attribute "idNumber", "string"
 	}
 
 	simulator {
@@ -22,23 +17,22 @@ metadata {
 
 	tiles(scale: 2) {
      	multiAttributeTile(name:"rich-control"){
-			tileAttribute ("device.status", key: "PRIMARY_CONTROL") {
-				attributeState "Offline", label: '${currentValue}', action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#ffffff"
-	            attributeState "Online", label: '${currentValue}', action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#79b821"
+			tileAttribute ("", key: "PRIMARY_CONTROL") {
+	            attributeState "default", label: "Hue Bridge", action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#F3C200"
 			}
+	        tileAttribute ("serialNumber", key: "SECONDARY_CONTROL") {
+	            attributeState "default", label:'SN: ${currentValue}'
 			}
-		valueTile("doNotRemove", "v", decoration: "flat", height: 2, width: 6, inactiveLabel: false) {
-			state "default", label:'Do not remove'
         }
-		valueTile("idNumber", "device.idNumber", decoration: "flat", height: 2, width: 6, inactiveLabel: false) {
-			state "default", label:'ID: ${currentValue}'
+		valueTile("serialNumber", "device.serialNumber", decoration: "flat", height: 1, width: 2, inactiveLabel: false) {
+			state "default", label:'SN: ${currentValue}'
 		}
-		valueTile("networkAddress", "device.networkAddress", decoration: "flat", height: 2, width: 6, inactiveLabel: false) {
-			state "default", label:'IP: ${currentValue}'
+		valueTile("networkAddress", "device.networkAddress", decoration: "flat", height: 2, width: 4, inactiveLabel: false) {
+			state "default", label:'${currentValue}', height: 1, width: 2, inactiveLabel: false
 		}
 
 		main (["rich-control"])
-		details(["rich-control", "idNumber", "networkAddress", "doNotRemove"])
+		details(["rich-control", "networkAddress"])
 	}
 }
 

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

@@ -43,16 +43,16 @@ metadata {
 			}
 		}
 
-    controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
-        state "colorTemperature", action:"color temperature.setColorTemperature"
-    }
+        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
+            state "colorTemperature", action:"color temperature.setColorTemperature"
+        }
 
-    valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-        state "colorTemperature", label: 'WHITES'
-    }
+        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+            state "colorTemperature", label: '${currentValue} K'
+        }
 
 		standardTile("reset", "device.reset", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
-			state "default", label:"Reset To White", action:"reset", icon:"st.lights.philips.hue-single"
+			state "default", label:"Reset Color", action:"reset", icon:"st.lights.philips.hue-single"
 		}
 
 		standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
@@ -84,86 +84,118 @@ def parse(description) {
 // handle commands
 void on() {
 	log.trace parent.on(this)
+	sendEvent(name: "switch", value: "on")
 }
 
 void off() {
 	log.trace parent.off(this)
+	sendEvent(name: "switch", value: "off")
+}
+
+void nextLevel() {
+	def level = device.latestValue("level") as Integer ?: 0
+	if (level <= 100) {
+		level = Math.min(25 * (Math.round(level / 25) + 1), 100) as Integer
+	}
+	else {
+		level = 25
+	}
+	setLevel(level)
 }
 
 void setLevel(percent) {
     log.debug "Executing 'setLevel'"
     if (verifyPercent(percent)) {
-	    log.trace parent.setLevel(this, percent)
+        parent.setLevel(this, percent)
+        sendEvent(name: "level", value: percent, descriptionText: "Level has changed to ${percent}%")
+        sendEvent(name: "switch", value: "on")
     }
 }
 
 void setSaturation(percent) {
     log.debug "Executing 'setSaturation'"
     if (verifyPercent(percent)) {
-	    log.trace parent.setSaturation(this, percent)
+        parent.setSaturation(this, percent)
+        sendEvent(name: "saturation", value: percent, displayed: false)
     }
 }
 
 void setHue(percent) {
     log.debug "Executing 'setHue'"
     if (verifyPercent(percent)) {
-	    log.trace parent.setHue(this, percent)
+        parent.setHue(this, percent)
+        sendEvent(name: "hue", value: percent, displayed: false)
     }
 }
 
 void setColor(value) {
+    log.debug "setColor: ${value}, $this"
     def events = []
     def validValues = [:]
 
     if (verifyPercent(value.hue)) {
+        events << createEvent(name: "hue", value: value.hue, displayed: false)
         validValues.hue = value.hue
     }
     if (verifyPercent(value.saturation)) {
+        events << createEvent(name: "saturation", value: value.saturation, displayed: false)
         validValues.saturation = value.saturation
     }
     if (value.hex != null) {
         if (value.hex ==~ /^\#([A-Fa-f0-9]){6}$/) {
+            events << createEvent(name: "color", value: value.hex)
             validValues.hex = value.hex
         } else {
             log.warn "$value.hex is not a valid color"
         }
     }
     if (verifyPercent(value.level)) {
+        events << createEvent(name: "level", value: value.level, descriptionText: "Level has changed to ${value.level}%")
         validValues.level = value.level
     }
     if (value.switch == "off" || (value.level != null && value.level <= 0)) {
+        events << createEvent(name: "switch", value: "off")
         validValues.switch = "off"
     } else {
+        events << createEvent(name: "switch", value: "on")
         validValues.switch = "on"
     }
-    if (!validValues.isEmpty()) {
-	    log.trace parent.setColor(this, validValues)
+    if (!events.isEmpty()) {
+        parent.setColor(this, validValues)
+    }
+    events.each {
+        sendEvent(it)
     }
 }
 
 void reset() {
     log.debug "Executing 'reset'"
-	setColorTemperature(4000)
+    def value = [level:100, saturation:56, hue:23]
+    setAdjustedColor(value)
+    parent.poll()
 }
 
 void setAdjustedColor(value) {
     if (value) {
         log.trace "setAdjustedColor: ${value}"
         def adjusted = value + [:]
+        adjusted.hue = adjustOutgoingHue(value.hue)
         // Needed because color picker always sends 100
         adjusted.level = null
-	    setColor(adjusted)
+        setColor(adjusted)
     } else {
-        log.warn "Invalid color input $value"
+        log.warn "Invalid color input"
     }
 }
 
 void setColorTemperature(value) {
     if (value) {
         log.trace "setColorTemperature: ${value}k"
-	    log.trace parent.setColorTemperature(this, value)
+        parent.setColorTemperature(this, value)
+        sendEvent(name: "colorTemperature", value: value)
+        sendEvent(name: "switch", value: "on")
     } else {
-        log.warn "Invalid color temperature $value"
+        log.warn "Invalid color temperature"
     }
 }
 
@@ -172,6 +204,23 @@ void refresh() {
     parent.manualRefresh()
 }
 
+def adjustOutgoingHue(percent) {
+	def adjusted = percent
+	if (percent > 31) {
+		if (percent < 63.0) {
+			adjusted = percent + (7 * (percent -30 ) / 32)
+		}
+		else if (percent < 73.0) {
+			adjusted = 69 + (5 * (percent - 62) / 10)
+		}
+		else {
+			adjusted = percent + (2 * (100 - percent) / 28)
+		}
+	}
+	log.info "percent: $percent, adjusted: $adjusted"
+	adjusted
+}
+
 def verifyPercent(percent) {
     if (percent == null)
         return false

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

@@ -68,16 +68,20 @@ def parse(description) {
 // handle commands
 void on() {
 	log.trace parent.on(this)
+	sendEvent(name: "switch", value: "on")
 }
 
 void off() {
 	log.trace parent.off(this)
+	sendEvent(name: "switch", value: "off")
 }
 
 void setLevel(percent) {
 	log.debug "Executing 'setLevel'"
     if (percent != null && percent >= 0 && percent <= 100) {
 		parent.setLevel(this, percent)
+		sendEvent(name: "level", value: percent)
+		sendEvent(name: "switch", value: "on")
 	} else {
     	log.warn "$percent is not 0-100"
     }

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

@@ -36,12 +36,12 @@ metadata {
             }
         }
 
-        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2200..6500)") {
+        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
             state "colorTemperature", action:"color temperature.setColorTemperature"
         }
 
         valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorTemperature", label: 'WHITES'
+            state "colorTemperature", label: '${currentValue} K'
         }
 
         standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
@@ -73,16 +73,20 @@ def parse(description) {
 // handle commands
 void on() {
     log.trace parent.on(this)
+    sendEvent(name: "switch", value: "on")
 }
 
 void off() {
     log.trace parent.off(this)
+    sendEvent(name: "switch", value: "off")
 }
 
 void setLevel(percent) {
     log.debug "Executing 'setLevel'"
     if (percent != null && percent >= 0 && percent <= 100) {
-        log.trace parent.setLevel(this, percent)
+        parent.setLevel(this, percent)
+        sendEvent(name: "level", value: percent)
+        sendEvent(name: "switch", value: "on")
     } else {
         log.warn "$percent is not 0-100"
     }
@@ -91,7 +95,9 @@ void setLevel(percent) {
 void setColorTemperature(value) {
     if (value) {
         log.trace "setColorTemperature: ${value}k"
-        log.trace parent.setColorTemperature(this, value)
+        parent.setColorTemperature(this, value)
+        sendEvent(name: "colorTemperature", value: value)
+        sendEvent(name: "switch", value: "on")
     } else {
         log.warn "Invalid color temperature"
     }
@@ -101,3 +107,4 @@ void refresh() {
     log.debug "Executing 'refresh'"
     parent.manualRefresh()
 }
+

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

@@ -102,11 +102,11 @@ def parse(String description) {
 			def descriptionText = finalResult.value == "on" ? '{{ device.displayName }} is On' : '{{ device.displayName }} is Off'
 			sendEvent(name: finalResult.type, value: finalResult.value, descriptionText: descriptionText, translatable: true)
 			// Temporary fix for the case when Device is OFFLINE and is connected again
-			if (state.lastActivity == null){
-				state.lastActivity = now()
-				sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+			if (state.lastOnOff == null){
+				state.lastOnOff = now()
+				sendEvent(name: "deviceWatch-lastActivity", value: state.lastOnOff, description: "Last Activity is on ${new Date(state.lastOnOff)}", displayed: false, isStateChange: true)
 			}
-			state.lastActivity = now()
+			state.lastOnOff = now()
 		}
 	}
 	else {
@@ -123,17 +123,18 @@ def on() {
 	zigbee.on()
 }
 /**
- * PING is used by Device-Watch in attempt to reach the Device
+ * PING is used by Device-Watch in attempt to reach the Outlet
  * */
 def ping() {
 
-	if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
-		log.info "ping, alive=no, lastActivity=${state.lastActivity}"
-		state.lastActivity = null
+	// send read attribute onOFF if the last time we heard from the outlet is outside of the checkInterval
+	if (state.lastOnOff < (now() - (1000 * device.currentValue("checkInterval"))) ){
+		log.info "ping, alive=no, lastOnOff=${new Date(state.lastOnOff)}"
+		state.lastOnOff = null
 		return zigbee.onOffRefresh()
-	} else {
-		log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
-		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
+	} else { // if the last onOff activity is within the checkInterval we artificially create a Device-Watch event
+		log.info "ping, alive=yes, lastOnOff=${new Date(state.lastOnOff)}"
+		sendEvent(name: "deviceWatch-lastActivity", value: state.lastOnOff, description: "Last Activity is on ${new Date(state.lastOnOff)}", displayed: false, isStateChange: true)
 	}
 }
 
@@ -142,7 +143,7 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 1200, displayed: false, data: [protocol: "zigbee"])
+	sendEvent(name: "checkInterval", value: 1200, displayed: false)
 	zigbee.onOffConfig() + powerConfig() + refresh()
 }
 

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

@@ -101,13 +101,6 @@ def parse(String description) {
 		map = parseIasMessage(description)
 	}
 
-	// Temporary fix for the case when Device is OFFLINE and is connected again
-	if (state.lastActivity == null){
-		state.lastActivity = now()
-		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
-	}
-	state.lastActivity = now()
-
 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : null
 
@@ -278,21 +271,6 @@ private Map getMoistureResult(value) {
 	]
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-
-	if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
-		log.info "ping, alive=no, lastActivity=${state.lastActivity}"
-		state.lastActivity = null
-		return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
-	} else {
-		log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
-		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
-	}
-}
-
 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
 	def refreshCmds = [
@@ -304,7 +282,7 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 7200, displayed: false, data: [protocol: "zigbee"])
+	sendEvent(name: "checkInterval", value: 7200, displayed: false)
 
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."

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

@@ -105,13 +105,6 @@ def parse(String description) {
 		map = parseIasMessage(description)
 	}
 
-	// Temporary fix for the case when Device is OFFLINE and is connected again
-	if (state.lastActivity == null){
-		state.lastActivity = now()
-		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
-	}
-	state.lastActivity = now()
-
 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : null
 
@@ -289,21 +282,6 @@ private Map getMotionResult(value) {
 	]
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-
-	if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
-		log.info "ping, alive=no, lastActivity=${state.lastActivity}"
-		state.lastActivity = null
-		return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
-	} else { 
-		log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
-		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
-	}
-}
-
 def refresh() {
 	log.debug "refresh called"
 	def refreshCmds = [
@@ -315,7 +293,7 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 7200, displayed: false, data: [protocol: "zigbee"])
+	sendEvent(name: "checkInterval", value: 7200, displayed: false)
 
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."

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

@@ -127,13 +127,6 @@ def parse(String description) {
 		map = parseIasMessage(description)
 	}
 
-	// Temporary fix for the case when Device is OFFLINE and is connected again
-	if (state.lastActivity == null){
-		state.lastActivity = now()
-		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
-	}
-	state.lastActivity = now()
-
 	def result = map ? createEvent(map) : null
 
 	if (description?.startsWith('enroll request')) {
@@ -235,9 +228,9 @@ private Map parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)
 	Map resultMap = [:]
 
-			if (garageSensor != "Yes"){
+	if(garageSensor !=  "Yes") {
 		resultMap = zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
-			}
+	}
 
 	return resultMap
 }
@@ -371,21 +364,6 @@ private getAccelerationResult(numValue) {
 	]
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-
-	if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
-		log.info "ping, alive=no, lastActivity=${state.lastActivity}"
-		state.lastActivity = null
-		return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
-	} else {
-		log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
-		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
-	}
-}
-
 def refresh() {
 	log.debug "Refreshing Values "
 
@@ -413,7 +391,7 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 7200, displayed: false, data: [protocol: "zigbee"])
+	sendEvent(name: "checkInterval", value: 7200, displayed: false)
 
 	log.debug "Configuring Reporting"
 

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

@@ -92,13 +92,6 @@ def parse(String description) {
     	map = parseIasMessage(description)
     }
 
-	// Temporary fix for the case when Device is OFFLINE and is connected again
-	if (state.lastActivity == null){
-		state.lastActivity = now()
-		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
-	}
-	state.lastActivity = now()
-
 	log.debug "Parse returned $map"
 	def result = map ? createEvent(map) : null
 
@@ -241,21 +234,6 @@ private Map getContactResult(value) {
 	]
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-
-	if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
-		log.info "ping, alive=no, lastActivity=${state.lastActivity}"
-		state.lastActivity = null
-		return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
-	} else {
-		log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
-		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
-	}
-}
-
 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
 	def refreshCmds = [
@@ -267,7 +245,7 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 7200, displayed: false, data: [protocol: "zigbee"])
+	sendEvent(name: "checkInterval", value: 7200, displayed: false)
 
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."

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

@@ -83,13 +83,6 @@ def parse(String description) {
 		map = parseCustomMessage(description)
 	}
 
-	// Temporary fix for the case when Device is OFFLINE and is connected again
-	if (state.lastActivity == null){
-		state.lastActivity = now()
-		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
-	}
-	state.lastActivity = now()
-
 	log.debug "Parse returned $map"
 	return map ? createEvent(map) : null
 }
@@ -246,20 +239,6 @@ private Map getHumidityResult(value) {
 	]
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
-		log.info "ping, alive=no, lastActivity=${state.lastActivity}"
-		state.lastActivity = null
-		return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
-	} else {
-		log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
-		sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
-	}
-}
-
 def refresh()
 {
 	log.debug "refresh temperature, humidity, and battery"
@@ -275,7 +254,7 @@ def refresh()
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 7200, displayed: false, data: [protocol: "zigbee"])
+	sendEvent(name: "checkInterval", value: 7200, displayed: false)
 
 	log.debug "Configuring Reporting and Bindings."
 	def configCmds = [

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

@@ -19,7 +19,6 @@ metadata {
         capability "Refresh"
         capability "Switch"
         capability "Switch Level"
-        capability "Health Check"
 
 
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008"
@@ -54,16 +53,7 @@ def parse(String description) {
 
     def event = zigbee.getEvent(description)
     if (event) {
-        // Temporary fix for the case when Device is OFFLINE and is connected again
-        if (state.lastActivity == null){
-            state.lastActivity = now()
-            sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
-        }
-        state.lastActivity = now()
-        if (event.name=="level" && event.value==0) {}
-        else {
-            sendEvent(event)
-        }
+        sendEvent(event)
     }
     else {
         log.warn "DID NOT PARSE MESSAGE for description : $description"
@@ -82,20 +72,6 @@ def on() {
 def setLevel(value) {
     zigbee.setLevel(value)
 }
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-
-    if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
-        log.info "ping, alive=no, lastActivity=${state.lastActivity}"
-        state.lastActivity = null
-        return zigbee.onOffRefresh()
-    } else {
-        log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
-        sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
-    }
-}
 
 def refresh() {
     zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig() + zigbee.levelConfig()
@@ -103,7 +79,5 @@ def refresh() {
 
 def configure() {
     log.debug "Configuring Reporting and Bindings."
-    // Enrolls device to Device-Watch with 3 x Reporting interval 30min
-    sendEvent(name: "checkInterval", value: 1800, displayed: false, data: [protocol: "zigbee"])
     zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
 }

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

@@ -27,10 +27,6 @@ metadata {
         capability "Refresh"
         capability "Switch"
         capability "Switch Level"
-        capability "Health Check"
-
-        attribute "colorName", "string"
-        command "setGenericName"
 
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY LED FLEXIBLE STRIP RGBW"
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY LED FLEXIBLE STRIP RGBW"
@@ -58,15 +54,15 @@ metadata {
         controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2700..6500)") {
             state "colorTemperature", action:"color temperature.setColorTemperature"
         }
-        valueTile("colorName", "device.colorName", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorName", label: '${currentValue}'
+        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+            state "colorTemperature", label: '${currentValue} K'
         }
         standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
 
         main(["switch"])
-        details(["switch", "colorTempSliderControl", "colorName", "refresh"])
+        details(["switch", "colorTempSliderControl", "colorTemp", "refresh"])
     }
 }
 
@@ -82,22 +78,10 @@ private getATTRIBUTE_COLOR_TEMPERATURE() { 0x0007 }
 def parse(String description) {
     log.debug "description is $description"
 
-    def event = zigbee.getEvent(description)
-    if (event) {
-        log.debug event
-        // Temporary fix for the case when Device is OFFLINE and is connected again
-        if (state.lastActivity == null){
-            state.lastActivity = now()
-            sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
-        }
-        state.lastActivity = now()
-        if (event.name=="level" && event.value==0) {}
-        else {
-            if (event.name=="colorTemperature") {
-                setGenericName(event.value)
-            }
-            sendEvent(event)
-        }
+    def finalResult = zigbee.getEvent(description)
+    if (finalResult) {
+        log.debug finalResult
+        sendEvent(finalResult)
     }
     else {
         def zigbeeMap = zigbee.parseDescriptionAsMap(description)
@@ -126,54 +110,20 @@ def on() {
 def off() {
     zigbee.off()
 }
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-
-    if (state.lastActivity < (now() - (1000 * device.currentValue("checkInterval"))) ){
-        log.info "ping, alive=no, lastActivity=${state.lastActivity}"
-        state.lastActivity = null
-        return zigbee.onOffRefresh()
-    } else {
-        log.info "ping, alive=yes, lastActivity=${state.lastActivity}"
-        sendEvent(name: "deviceWatch-lastActivity", value: state.lastActivity, description: "Last Activity is on ${new Date((long)state.lastActivity)}", displayed: false, isStateChange: true)
-    }
-}
 
 def refresh() {
-    zigbee.onOffRefresh() + zigbee.readAttribute(0x0008, 0x00) + zigbee.readAttribute(0x0300, 0x00) + zigbee.readAttribute(0x0300, ATTRIBUTE_COLOR_TEMPERATURE) + zigbee.readAttribute(0x0300, ATTRIBUTE_HUE) + zigbee.readAttribute(0x0300, ATTRIBUTE_SATURATION) + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, 0x20, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, 0x20, 1, 3600, 0x01)
+    zigbee.readAttribute(0x0006, 0x00) + zigbee.readAttribute(0x0008, 0x00) + zigbee.readAttribute(0x0300, 0x00) + zigbee.readAttribute(0x0300, ATTRIBUTE_COLOR_TEMPERATURE) + zigbee.readAttribute(0x0300, ATTRIBUTE_HUE) + zigbee.readAttribute(0x0300, ATTRIBUTE_SATURATION) + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, 0x20, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, 0x20, 1, 3600, 0x01)
 }
 
 def configure() {
     log.debug "Configuring Reporting and Bindings."
-    // Enrolls device to Device-Watch with 3 x Reporting interval 30min
-    sendEvent(name: "checkInterval", value: 1800, displayed: false, data: [protocol: "zigbee"])
     zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, 0x20, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, 0x20, 1, 3600, 0x01) + zigbee.readAttribute(0x0006, 0x00) + zigbee.readAttribute(0x0008, 0x00) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, 0x00) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }
 
 def setColorTemperature(value) {
-    setGenericName(value)
     zigbee.setColorTemperature(value)
 }
 
-//Naming based on the wiki article here: http://en.wikipedia.org/wiki/Color_temperature
-def setGenericName(value){
-    if (value != null) {
-        def genericName = "White"
-        if (value < 3300) {
-            genericName = "Soft White"
-        } else if (value < 4150) {
-            genericName = "Moonlight"
-        } else if (value <= 5000) {
-            genericName = "Cool White"
-        } else if (value >= 5000) {
-            genericName = "Daylight"
-        }
-        sendEvent(name: "colorName", value: genericName)
-    }
-}
-
 def setLevel(value) {
     zigbee.setLevel(value)
 }

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

@@ -49,6 +49,9 @@ metadata {
             tileAttribute ("device.level", key: "SLIDER_CONTROL") {
                 attributeState "level", action:"switch level.setLevel"
             }
+            tileAttribute ("colorName", key: "SECONDARY_CONTROL") {
+                attributeState "colorName", label:'${currentValue}'
+            }
         }
 
         standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
@@ -58,12 +61,12 @@ metadata {
         controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2700..6500)") {
             state "colorTemperature", action:"color temperature.setColorTemperature"
         }
-        valueTile("colorName", "device.colorName", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorName", label: '${currentValue}'
+        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+            state "colorTemperature", label: '${currentValue} K'
         }
 
         main(["switch"])
-        details(["switch", "colorTempSliderControl", "colorName", "refresh"])
+        details(["switch", "colorTempSliderControl", "colorTemp", "refresh"])
     }
 }
 
@@ -72,13 +75,7 @@ def parse(String description) {
     log.debug "description is $description"
     def event = zigbee.getEvent(description)
     if (event) {
-        if (event.name=="level" && event.value==0) {}
-        else {
-            if (event.name=="colorTemperature") {
-                setGenericName(event.value)
-            }
-            sendEvent(event)
-        }
+        sendEvent(event)
     }
     else {
         log.warn "DID NOT PARSE MESSAGE for description : $description"

smartapps/citrix/octoblu.src/octoblu.groovy

@@ -1,927 +0,0 @@
-/**
-The MIT License (MIT)
-Copyright (c) 2016 Octoblu
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-import org.apache.commons.codec.binary.Base64
-import java.text.DecimalFormat
-import groovy.transform.Field
-
-@Field final USE_DEBUG = true
-@Field final selectedCapabilities = [ "actuator", "sensor" ]
-
-private getVendorName()       { "Octoblu" }
-private getVendorIcon()       { "http://i.imgur.com/BjTfDYk.png" }
-private apiUrl()              { appSettings.apiUrl ?: "https://meshblu.octoblu.com/" }
-private getVendorAuthPath()   { appSettings.vendorAuthPath ?: "https://oauth.octoblu.com/authorize" }
-private getVendorTokenPath()  { appSettings.vendorTokenPath ?: "https://oauth.octoblu.com/access_token" }
-
-definition(
-name: "Octoblu",
-namespace: "citrix",
-author: "Octoblu",
-description: "Connect SmartThings devices to Octoblu",
-category: "SmartThings Labs",
-iconUrl: "http://i.imgur.com/BjTfDYk.png",
-iconX2Url: "http://i.imgur.com/BjTfDYk.png"
-) {
-  appSetting "apiUrl"
-  appSetting "vendorAuthPath"
-  appSetting "vendorTokenPath"
-}
-
-preferences {
-  page(name: "welcomePage")
-  page(name: "authPage")
-  page(name: "subscribePage")
-  page(name: "devicesPage")
-}
-
-mappings {
-  path("/oauthCode") {
-    action: [ GET: "getOauthCode" ]
-  }
-  path("/message") {
-    action: [ POST: "postMessage" ]
-  }
-  path("/app") {
-    action: [ POST: "postApp" ]
-  }
-}
-
-// --------------------------------------
-
-def getDevInfo() {
-  return state.vendorDevices.collect { k, v -> "${v.uuid} " }.sort().join(" \n")
-}
-
-// --------------------------------------
-
-def welcomePage() {
-  cleanUpTokens()
-
-  return dynamicPage(name: "welcomePage", nextPage: "authPage", uninstall: showUninstall) {
-    section {
-      paragraph title: "Welcome to the Octoblu SmartThings App!", "press 'Next' to continue"
-    }
-    if (state.vendorDevices && state.vendorDevices.size()>0) {
-      section {
-        paragraph title: "My SmartThings in Octobu (${state.vendorDevices.size()}):", getDevInfo()
-      }
-    }
-    if (state.installed) {
-      section {
-        input name: "showUninstall", type: "bool", title: "Uninstall", submitOnChange: true
-        if (showUninstall) {
-          state.removeDevices = removeDevices
-          input name: "removeDevices", type: "bool", title: "Remove Octoblu devices", submitOnChange: true
-          paragraph title: "Sorry to see you go!", "please email <support@octoblu.com> with any feedback or issues"
-        }
-      }
-    }
-  }
-}
-
-// --------------------------------------
-
-def authPage() {
-
-  if (!state.accessToken) {
-    createAccessToken()
-  }
-
-  debug "using app access token ${state.accessToken}"
-
-  if (!state.vendorOAuthToken) {
-    createOAuthDevice()
-  }
-
-  def oauthParams = [
-    response_type: "code",
-    client_id: state.vendorOAuthUuid,
-    redirect_uri: getApiServerUrl() + "/api/token/${state.accessToken}/smartapps/installations/${app.id}/oauthCode"
-  ]
-
-  def redirectUrl =  getVendorAuthPath() + '?' + toQueryString(oauthParams)
-  debug "tokened redirect_uri = ${oauthParams.redirect_uri}"
-
-  def isRequired = !state.vendorBearerToken
-  return dynamicPage(name: "authPage", title: "Octoblu Authentication", nextPage:(isRequired ? null : "subscribePage"), install: isRequired) {
-    section {
-      debug "url: ${redirectUrl}"
-      if (isRequired) {
-        href url:redirectUrl, style:"embedded", title: "Authorize with Octoblu", required: isRequired, description:"please login with Octoblu to complete setup"
-      } else {
-        paragraph title: "Please press 'Next' to continue", "Octoblu token has been created"
-      }
-    }
-  }
-}
-
-def createOAuthDevice() {
-  def oAuthDevice = [
-    "name": "SmartThings",
-    "owner": "68c39f40-cc13-4560-a68c-e8acd021cff9",
-    "type": "device:oauth",
-    "online": true,
-    "options": [
-      "name": "SmartThings",
-      "imageUrl": "https://i.imgur.com/TsXefbK.png",
-      "callbackUrl": getApiServerUrl() + "/api"
-    ],
-    "configureWhitelist": [ "68c39f40-cc13-4560-a68c-e8acd021cff9" ],
-    "discoverWhitelist": [ "*" ],
-    "receiveWhitelist": [],
-    "sendWhitelist": []
-  ]
-
-  def postParams = [ uri: apiUrl()+"devices",
-  body: groovy.json.JsonOutput.toJson(oAuthDevice)]
-
-  try {
-    httpPostJson(postParams) { response ->
-      debug "got new token for oAuth device ${response.data}"
-      state.vendorOAuthUuid = response.data.uuid
-      state.vendorOAuthToken = response.data.token
-    }
-  } catch (e) {
-    log.error "unable to create oAuth device: ${e}"
-  }
-
-}
-
-// --------------------------------------
-
-def subscribePage() {
-  return dynamicPage(name: "subscribePage", title: "Subscribe to SmartThing devices", nextPage: "devicesPage") {
-    section {
-      // input name: "selectedCapabilities", type: "enum", title: "capability filter",
-      // submitOnChange: true, multiple: true, required: false, options: [ "actuator", "sensor" ]
-      for (capability in selectedCapabilities) {
-         input name: "${capability}Capability".toString(), type: "capability.$capability", title: "${capability.capitalize()} Things", multiple: true, required: false
-      }
-    }
-    section(" ") {
-      input name: "pleaseCreateAppDevice", type: "bool", title: "Create a SmartApp device", defaultValue: true
-      paragraph "A SmartApp device allows access to location and hub information for this installation"
-    }
-    section(" ") {
-      paragraph title: "", "Existing Octoblu devices may be modified!"
-    }
-  }
-}
-
-// --------------------------------------
-
-def devicesPage() {
-  def postParams = [
-    uri: apiUrl() + "devices?owner=${state.vendorUuid}&category=smart-things",
-    headers: ["Authorization": "Bearer ${state.vendorBearerToken}"]
-  ]
-  state.vendorDevices = [:]
-
-  def hasDevice = [:]
-  hasDevice[app.id] = true
-  selectedCapabilities.each { capability ->
-    def smartDevices = settings["${capability}Capability"]
-    smartDevices.each { smartDevice ->
-      hasDevice[smartDevice.id] = true
-    }
-  }
-
-  debug "getting url ${postParams.uri}"
-  try {
-    httpGet(postParams) { response ->
-      debug "devices json ${response.data.devices}"
-      response.data.devices.each { device ->
-        if (device.smartDeviceId && hasDevice[device.smartDeviceId]) {
-          debug "found device ${device.uuid} with smartDeviceId ${device.smartDeviceId}"
-          state.vendorDevices[device.smartDeviceId] = getDeviceInfo(device)
-        }
-        debug "has device: ${device.uuid} ${device.name} ${device.type}"
-      }
-    }
-  } catch (e) {
-    log.error "devices error ${e}"
-  }
-
-  selectedCapabilities.each { capability ->
-    debug "checking devices for capability ${capability}"
-    createDevices(settings["${capability}Capability"])
-  }
-  if (pleaseCreateAppDevice)
-    createAppDevice()
-
-  return dynamicPage(name: "devicesPage", title: "Octoblu Things", install: true) {
-    section {
-      paragraph title: "Please press 'Done' to finish setup", "and subscribe to SmartThing events"
-      paragraph title: "My Octoblu UUID:", "${state.vendorUuid}"
-      paragraph title: "My SmartThings in Octobu (${state.vendorDevices.size()}):", getDevInfo()
-    }
-  }
-}
-
-def createDevices(smartDevices) {
-
-  smartDevices.each { smartDevice ->
-    def commands = [
-      [ "name": "app-get-value" ],
-      [ "name": "app-get-state" ],
-      [ "name": "app-get-device" ],
-      [ "name": "app-get-events" ]
-    ]
-
-    smartDevice.supportedCommands.each { command ->
-      if (command.arguments.size()>0) {
-        commands.push([ "name": command.name, "args": command.arguments ])
-      } else {
-        commands.push([ "name": command.name ])
-      }
-    }
-
-    debug "creating device for ${smartDevice.id}"
-
-    def schemas = [
-      "version": "2.0.0",
-      "message": [:]
-    ]
-
-    commands.each { command ->
-      schemas."message"."$command.name" = [
-        "type": "object",
-        "properties": [
-          "smartDeviceId": [
-            "type": "string",
-            "readOnly": true,
-            "default": "$smartDevice.id",
-            "x-schema-form": [
-            	"condition": "false"
-            ]
-          ],
-          "command": [
-            "type": "string",
-            "readOnly": true,
-            "default": "$command.name",
-            "enum": ["$command.name"],
-            "x-schema-form": [
-            	"condition": "false"
-            ]
-          ]
-        ]
-      ]
-
-      if (command.args) {
-        schemas."message"."$command.name"."properties"."args" = [
-          "type": "object",
-          "title": "Arguments",
-          "properties": [:]
-        ]
-
-        command.args.each { arg ->
-          def argLower = "$arg"
-          argLower = argLower.toLowerCase()
-          if (argLower == "color_map") {
-            schemas."message"."$command.name"."properties"."args"."properties"."$argLower" = [
-              "type": "object",
-              "properties": [
-                "hex": [
-                  "type": "string"
-                ],
-                "level": [
-                  "type": "number"
-                ]
-              ]
-            ]
-          } else {
-            schemas."message"."$command.name"."properties"."args"."properties"."$argLower" = [
-              "type": "$argLower"
-            ]
-          }
-        }
-      }
-    }
-
-    debug "UPDATED message schema: ${schemas}"
-
-    def deviceProperties = [
-      "schemas": schemas,
-      "needsSetup": false,
-      "online": true,
-      "name": "${smartDevice.displayName}",
-      "smartDeviceId": "${smartDevice.id}",
-      "logo": "https://i.imgur.com/TsXefbK.png",
-      "owner": "${state.vendorUuid}",
-      "configureWhitelist": [],
-      "discoverWhitelist": ["${state.vendorUuid}"],
-      "receiveWhitelist": [],
-      "sendWhitelist": [],
-      "type": "device:${smartDevice.name.replaceAll('\\s','-').toLowerCase()}",
-      "category": "smart-things",
-      "meshblu": [
-        "forwarders": [
-          "received": [[
-            "url": getApiServerUrl() + "/api/token/${state.accessToken}/smartapps/installations/${app.id}/message",
-            "method": "POST",
-            "type": "webhook"
-          ]]
-        ]
-      ]
-    ]
-
-    updatePermissions(deviceProperties, smartDevice.id)
-    def params = [
-      uri: apiUrl() + "devices",
-      headers: ["Authorization": "Bearer ${state.vendorBearerToken}"],
-      body: groovy.json.JsonOutput.toJson(deviceProperties)
-    ]
-
-    try {
-
-      if (!state.vendorDevices[smartDevice.id]) {
-        debug "creating new device for ${smartDevice.id}"
-        httpPostJson(params) { response ->
-          state.vendorDevices[smartDevice.id] = getDeviceInfo(response.data)
-        }
-        return
-      }
-
-      params.uri = params.uri + "/${state.vendorDevices[smartDevice.id].uuid}"
-      debug "the device ${smartDevice.id} has already been created, updating ${params.uri}"
-      httpPutJson(params) { response ->
-        resetVendorDeviceToken(smartDevice.id);
-      }
-
-    } catch (e) {
-      log.error "unable to create new device ${e}"
-    }
-  }
-}
-
-def createAppDevice() {
-  def commands = [
-    [ "name": "app-get-location" ],
-    [ "name": "app-get-devices" ],
-    [ "name": "app-set-mode" ],
-  ]
-
-  def schemas = [
-    "version": "2.0.0",
-    "message": [:]
-  ]
-
-  commands.each { command ->
-    schemas."message"."$command.name" = [
-      "type": "object",
-      "properties": [
-        "command": [
-          "type": "string",
-          "readOnly": true,
-          "default": "$command.name",
-          "enum": ["$command.name"],
-          "x-schema-form": [
-            "condition": "false"
-          ]
-        ]
-      ]
-    ]
-  }
-
-  schemas."message"."app-set-mode"."properties"."args" = [
-    "type": "object",
-    "title": "Arguments",
-    "properties": [
-      "mode": [
-        "type": "string"
-      ]
-    ]
-  ]
-
-  def deviceProperties = [
-    "schemas": schemas,
-    "needsSetup": false,
-    "online": true,
-    "name": "${location.name} SmartApp",
-    "smartDeviceId": "${app.id}",
-    "logo": "https://i.imgur.com/TsXefbK.png",
-    "owner": "${state.vendorUuid}",
-    "configureWhitelist": [],
-    "discoverWhitelist": ["${state.vendorUuid}"],
-    "receiveWhitelist": [],
-    "sendWhitelist": [],
-    "type": "device:smart-things-app",
-    "category": "smart-things",
-    "meshblu": [
-      "forwarders": [
-        "received": [[
-          "url": getApiServerUrl() + "/api/token/${state.accessToken}/smartapps/installations/${app.id}/app",
-          "method": "POST",
-          "type": "webhook"
-        ]]
-      ]
-    ]
-  ]
-
-  updatePermissions(deviceProperties, app.id)
-  def params = [
-    uri: apiUrl() + "devices",
-    headers: ["Authorization": "Bearer ${state.vendorBearerToken}"],
-    body: groovy.json.JsonOutput.toJson(deviceProperties)
-  ]
-
-  debug "creating app device!"
-  debug params.body
-  try {
-
-    // debug params
-    if (!state.vendorDevices[app.id]) {
-      debug "creating new app device for ${app.id}"
-      httpPostJson(params) { response ->
-        state.vendorDevices[app.id] = getDeviceInfo(response.data)
-      }
-      return
-    }
-
-    params.uri = params.uri + "/${state.vendorDevices[app.id].uuid}"
-    debug "the app device ${app.id} has already been created, updating ${params.uri}"
-    httpPutJson(params) { response ->
-      resetVendorDeviceToken(app.id);
-    }
-
-  } catch (e) {
-    log.error "unable to create new device ${e}"
-  }
-
-}
-
-def updatePermissions(newDevice, id) {
-  def device = state.vendorDevices[id]
-  if (!device) return
-  newDevice.configureWhitelist = device.configureWhitelist
-  newDevice.discoverWhitelist = device.discoverWhitelist
-  newDevice.receiveWhitelist = device.receiveWhitelist
-  newDevice.sendWhitelist = device.sendWhitelist
-}
-
-def getDeviceInfo(device) {
-  return [
-    "uuid": device.uuid,
-    "token": device.token,
-    "configureWhitelist": device.configureWhitelist,
-    "discoverWhitelist": device.discoverWhitelist,
-    "receiveWhitelist": device.receiveWhitelist,
-    "sendWhitelist": device.sendWhitelist,
-  ]
-}
-
-def resetVendorDeviceToken(smartDeviceId) {
-  def deviceUUID = state.vendorDevices[smartDeviceId].uuid
-  if (!deviceUUID) {
-    debug "no device uuid in resetVendorDeviceToken?"
-    return
-  }
-  debug "getting new token for ${smartDeviceId}/${deviceUUID}"
-  def postParams = [
-  uri: apiUrl() + "devices/${deviceUUID}/token",
-  headers: ["Authorization": "Bearer ${state.vendorBearerToken}"]]
-  try {
-    httpPost(postParams) { response ->
-      state.vendorDevices[smartDeviceId] = getDeviceInfo(response.data)
-      debug "got new token for ${smartDeviceId}/${deviceUUID}"
-    }
-  } catch (e) {
-    log.error "unable to get new token ${e}"
-  }
-}
-
-// --------------------------------------
-
-def updated() {
-  unsubscribe()
-  debug "Updated with settings: ${settings}"
-  def subscribed = [:]
-  selectedCapabilities.each{ capability ->
-    settings."${capability}Capability".each { thing ->
-      if (subscribed[thing.id]) {
-        return
-      }
-      subscribed[thing.id] = true
-      thing.supportedAttributes.each { attribute ->
-        debug "subscribe to attribute ${attribute.name}"
-        subscribe thing, attribute.name, eventForward
-      }
-      thing.supportedCommands.each { command ->
-        debug "subscribe to command ${command.name}"
-        subscribeToCommand thing, command.name, eventForward
-      }
-      debug "subscribed to thing ${thing.id}"
-    }
-  }
-  cleanUpTokens()
-}
-
-// --------------------------------------
-
-def cleanUpTokens() {
-
-  if (state.vendorToken) {
-    def params = [
-      uri: apiUrl() + "devices/${state.vendorUuid}/tokens/${state.vendorToken}",
-      headers: ["Authorization": "Bearer ${state.vendorBearerToken}"]
-    ]
-
-    debug "deleting url ${params.uri}"
-    try {
-      httpDelete(params) { response ->
-        debug "revoked token for ${state.vendorUuid}...?"
-      }
-    } catch (e) {
-      log.error "token delete error ${e}"
-    }
-  }
-
-  state.vendorBearerToken = null
-  state.vendorUuid = null
-  state.vendorToken = null
-
-  if (state.vendorOAuthToken) {
-    def params = [
-      uri: apiUrl() + "devices/${state.vendorOAuthUuid}",
-      headers: [
-        "meshblu_auth_uuid": state.vendorOAuthUuid,
-        "meshblu_auth_token": state.vendorOAuthToken
-      ]
-    ]
-
-    debug "deleting url ${params.uri}"
-    try {
-      httpDelete(params) { response ->
-        debug "deleted oauth device for ${state.vendorOAuthUuid}...?"
-      }
-    } catch (e) {
-      log.error "oauth token delete error ${e}"
-    }
-  }
-
-  state.vendorOAuthUuid = null
-  state.vendorOAuthToken = null
-
-}
-
-// --------------------------------------
-
-def getOauthCode() {
-  // revokeAccessToken()
-  // state.accessToken = createAccessToken()
-  debug "generated app access token ${state.accessToken}"
-
-  def postParams = [
-    uri: getVendorTokenPath(),
-    body: [
-      client_id: state.vendorOAuthUuid,
-      client_secret: state.vendorOAuthToken,
-      grant_type: "authorization_code",
-      code: params.code
-    ]
-  ]
-
-  def style = "<style type='text/css'>body{font-size:2em;padding:1em}</style>"
-  def startBody = "<html>${style}<body>"
-  def endBody = "</body></html>"
-  def goodResponse = "${startBody}<h1>Received Octoblu Token!</h1><h2>Press 'Done' to finish setup.</h2>${endBody}"
-  def badResponse = "${startBody}<h1>Something went wrong...</h1><h2>PANIC!</h2>${endBody}"
-  debug "authorizeToken with postParams ${postParams}"
-
-  try {
-    httpPost(postParams) { response ->
-      debug "response: ${response.data}"
-      state.vendorBearerToken = response.data.access_token
-      def bearer = new String((new Base64()).decode(state.vendorBearerToken)).split(":")
-      state.vendorUuid = bearer[0]
-      state.vendorToken = bearer[1]
-
-      debug "have octoblu tokens ${state.vendorBearerToken}"
-      render contentType: 'text/html', data: (state.vendorBearerToken ? goodResponse : badResponse)
-    }
-  } catch(e) {
-    log.error "second leg oauth error ${e}"
-    render contentType: 'text/html', data: badResponse
-  }
-}
-
-def getEventData(evt) {
-  return [
-    "date" : evt.date,
-    "id" : evt.id,
-    "data" : evt.data,
-    "description" : evt.description,
-    "descriptionText" : evt.descriptionText,
-    "displayName" : evt.displayName,
-    "deviceId" : evt.deviceId,
-    "hubId" : evt.hubId,
-    "installedSmartAppId" : evt.installedSmartAppId,
-    "isoDate" : evt.isoDate,
-    "isDigital" : evt.isDigital(),
-    "isPhysical" : evt.isPhysical(),
-    "isStateChange" : evt.isStateChange(),
-    "locationId" : evt.locationId,
-    "name" : evt.name,
-    "source" : evt.source,
-    "unit" : evt.unit,
-    "value" : evt.value,
-    "category" : "event",
-    "type" : "device:smart-thing"
-  ]
-}
-
-def eventForward(evt) {
-  def eventData = [ "devices" : [ "*" ], "payload" : getEventData(evt) ]
-
-  debug "sending event: ${groovy.json.JsonOutput.toJson(eventData)}"
-
-  def vendorDevice = state.vendorDevices[evt.deviceId]
-  if (!vendorDevice) {
-    log.error "aborting, vendor device for ${evt.deviceId} doesn't exist?"
-    return
-  }
-
-  debug "using device ${vendorDevice}"
-
-  def postParams = [
-    uri: apiUrl() + "messages",
-    headers: [
-      "meshblu_auth_uuid": vendorDevice.uuid,
-      "meshblu_auth_token": vendorDevice.token
-    ],
-    body: groovy.json.JsonOutput.toJson(eventData)
-  ]
-
-  try {
-    httpPostJson(postParams) { response ->
-      debug "sent off device event"
-    }
-  } catch (e) {
-    log.error "unable to send device event ${e}"
-  }
-}
-
-// --------------------------------------
-
-def postMessage() {
-  debug("received message data ${request.JSON}")
-  def foundDevice = false
-  selectedCapabilities.each{ capability ->
-    settings."${capability}Capability".each { thing ->
-      if (!foundDevice && thing.id == request.JSON.smartDeviceId) {
-        def vendorDevice = state.vendorDevices[thing.id]
-        foundDevice = true
-        if (vendorDevice.uuid == request.JSON.fromUuid) {
-          log.error "aborting message from self"
-          return
-        }
-
-        if (!request.JSON.command.startsWith("app-")) {
-          def args = []
-          if (request.JSON.args) {
-            request.JSON.args.each { k, v ->
-              args.push(v)
-            }
-          }
-
-          debug "command being sent: ${request.JSON.command}\targs to be sent: ${args}"
-          thing."${request.JSON.command}"(*args)
-        } else {
-          debug "calling internal command ${request.JSON.command}"
-          def commandData = [:]
-          switch (request.JSON.command) {
-            case "app-get-value":
-              debug "got command value"
-              thing.supportedAttributes.each { attribute ->
-                commandData[attribute.name] = thing.latestValue(attribute.name)
-              }
-              break
-            case "app-get-state":
-              debug "got command state"
-              thing.supportedAttributes.each { attribute ->
-                commandData[attribute.name] = thing.latestState(attribute.name)?.value
-              }
-              break
-            case "app-get-device":
-              debug "got command device"
-              commandData = [
-                "id" : thing.id,
-                "displayName" : thing.displayName,
-                "name" : thing.name,
-                "label" : thing.label,
-                "capabilities" : thing.capabilities.collect{ thingCapability -> return thingCapability.name },
-                "supportedAttributes" : thing.supportedAttributes.collect{ attribute -> return attribute.name },
-                "supportedCommands" : thing.supportedCommands.collect{ command -> return ["name" : command.name, "arguments" : command.arguments ] }
-              ]
-              break
-            case "app-get-events":
-              debug "got command events"
-              commandData.events = []
-              thing.events().each { event ->
-                commandData.events.push(getEventData(event))
-              }
-              break
-            default:
-              commandData.error = "unknown command"
-              debug "unknown command ${request.JSON.command}"
-          }
-          commandData.command = request.JSON.command
-          debug "with vendorDevice ${vendorDevice} for ${groovy.json.JsonOutput.toJson(commandData)}"
-
-          def postParams = [
-            uri: apiUrl() + "messages",
-            headers: ["meshblu_auth_uuid": vendorDevice.uuid, "meshblu_auth_token": vendorDevice.token],
-            body: groovy.json.JsonOutput.toJson([ "devices" : [ "*" ], "payload" : commandData ])
-          ]
-
-          debug "posting params ${postParams}"
-
-          try {
-            debug "calling httpPostJson!"
-            httpPostJson(postParams) { response ->
-              debug "sent off command result"
-            }
-          } catch (e) {
-            log.error "unable to send command result ${e}"
-          }
-
-        }
-      }
-    }
-  }
-}
-
-// --------------------------------------
-
-def postApp() {
-  debug("received app data ${request.JSON}")
-  if (state.vendorDevices[app.id].uuid == request.JSON.fromUuid) {
-    log.error "aborting message from self"
-    return
-  }
-  def args = []
-  if (request.JSON.args) {
-    request.JSON.args.each { k, v ->
-      args.push(v)
-    }
-  }
-
-  def commandData = [:]
-
-  switch (request.JSON.command) {
-    case "app-get-location":
-      debug "got command location"
-
-      def modes = []
-      location.modes.each { mode ->
-        modes.push([
-          "id" : mode.id,
-          "name" : mode.name
-        ])
-      }
-
-      def hubs = []
-      location.hubs.each { hub ->
-        debug "hub : ${hub}"
-        hubs.push([
-          "firmwareVersionString" : hub.firmwareVersionString,
-          "id" : hub.id,
-          "localIP" : hub.localIP,
-          "localSrvPortTCP" : hub.localSrvPortTCP,
-          "name" : hub.name,
-          "type" : hub.type,
-          "zigbeeEui" : hub.zigbeeEui,
-          "zigbeeId" : hub.zigbeeId
-        ])
-      }
-
-      commandData = [
-        "contactBookEnabled" : location.contactBookEnabled,
-        "id" : location.id,
-        "latitude" : location.latitude,
-        "longitude" : location.longitude,
-        "temperatureScale" : location.temperatureScale,
-        "timeZone" : location.timeZone.getID(),
-        "zipCode" : location.zipCode,
-        "mode" : location.mode,
-        "modes" : modes,
-        "hubs" : hubs
-      ]
-
-      debug "copied location!"
-      debug commandData
-      break
-
-    case "app-get-devices":
-      debug "got command devices"
-      commandData.devices = state.vendorDevices.collect { k, v -> [ "smartDeviceId" : k, "uuid" : v.uuid ] }
-      break
-
-    case "app-set-mode":
-      location.setMode(*args)
-      commandData.mode = args[0]
-      break
-
-    default:
-      commandData.error = "unknown command"
-      debug "unknown command ${request.JSON.command}"
-  }
-  commandData.command = request.JSON.command
-  debug "sending ${commandData}"
-
-  def vendorDevice = state.vendorDevices[app.id]
-  debug "with vendorDevice ${vendorDevice} for ${groovy.json.JsonOutput.toJson(commandData)}"
-
-  def postParams = [
-    uri: apiUrl() + "messages",
-    headers: [ "meshblu_auth_uuid" : vendorDevice.uuid, "meshblu_auth_token" : vendorDevice.token ],
-    body: groovy.json.JsonOutput.toJson([ "devices" : [ "*" ], "payload" : commandData ])
-  ]
-
-  debug "posting params ${postParams}"
-
-  try {
-    debug "calling httpPostJson!"
-    httpPostJson(postParams) { response ->
-      debug "sent off command result"
-    }
-  } catch (e) {
-    log.error "unable to send command result ${e}"
-  }
-}
-
-// --------------------------------------
-
-private debug(logStr) {
-  if (USE_DEBUG)
-    log.debug logStr
-}
-
-String toQueryString(Map m) {
-  return m.collect { k, v -> "${k}=${URLEncoder.encode(v.toString())}" }.sort().join("&")
-}
-
-def initialize()
-{
-  debug "Initialized with settings: ${settings}"
-}
-
-def uninstalled()
-{
-  debug "In uninstalled ${state.removeDevices}"
-  if (state.removeDevices) {
-    state.vendorDevices.each  { k, device ->
-      def params = [
-        uri: apiUrl() + "devices/${device.uuid}",
-        headers: [ "meshblu_auth_uuid" : device.uuid, "meshblu_auth_token" : device.token ],
-      ]
-
-      debug "deleting url ${params.uri}"
-      try {
-        httpDelete(params) { response ->
-          debug "delete device ${device.uuid}"
-        }
-      } catch (e) {
-        log.error "token delete error ${e}"
-      }
-    }
-  }
-}
-
-def installed() {
-  debug "Installed with settings: ${settings}"
-  state.installed = true
-}
-
-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 }
-}

smartapps/docwisdom/humidity-alert.src/humidity-alert.groovy

@@ -78,7 +78,7 @@ def humidityHandler(evt) {
 			log.debug "Notification already sent within the last ${deltaMinutes} minutes"
 			
 		} else {
-			log.debug "Humidity Rose Above ${tooHumid}:  sending SMS and activating ${mySwitch}"
+			log.debug "Humidity Rose Above ${tooHumid}:  sending SMS to $phone1 and activating ${mySwitch}"
 			send("${humiditySensor1.label} sensed high humidity level of ${evt.value}")
 			switch1?.on()
 		}
@@ -91,7 +91,7 @@ def humidityHandler(evt) {
 			log.debug "Notification already sent within the last ${deltaMinutes} minutes"
 			
 		} else {
-			log.debug "Humidity Fell Below ${notHumidEnough}:  sending SMS and activating ${mySwitch}"
+			log.debug "Humidity Fell Below ${notHumidEnough}:  sending SMS to $phone1 and activating ${mySwitch}"
 			send("${humiditySensor1.label} sensed high humidity level of ${evt.value}")
 			switch1?.off()
 		}

smartapps/dooglave/let-there-be-dark.src/let-there-be-dark.groovy

@@ -25,11 +25,15 @@ preferences {
 
 def installed() {
 	subscribe(contact1, "contact", contactHandler)
+	subscribe(switch1, "switch.on", switchOnHandler)
+    subscribe(switch1, "switch.off", switchOffHandler)
 }
 
 def updated() {
 	unsubscribe()
 	subscribe(contact1, "contact", contactHandler)
+	subscribe(switch1, "switch.on", switchOnHandler)
+    subscribe(switch1, "switch.off", switchOffHandler)
 }
 
 def contactHandler(evt) {
@@ -42,4 +46,4 @@ def contactHandler(evt) {
 if (evt.value == "closed") {
 	if(state.wasOn)switch1.on()
 }
-}
+}

smartapps/mangioneimagery/medicine-management-contact-sensor.src/medicine-management-contact-sensor.groovy

@@ -1,188 +0,0 @@
-/**
- *  Medicine Management - Contact Sensor
- *
- *  Copyright 2016 Jim Mangione
- *
- *  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.
- *
- * Logic: 
- * --- Send notification at the medicine reminder time IF draw wasn't alread opened in past 60 minutes
- * --- If draw still isn't open 10 minutes AFTER reminder time, LED will turn RED.
- * --- ----- Once draw IS open, LED will return back to it's original color
- *
- */
-import groovy.time.TimeCategory 
-
-definition(
-    name: "Medicine Management - Contact Sensor",
-    namespace: "MangioneImagery",
-    author: "Jim Mangione",
-    description: "This supports devices with capabilities of ContactSensor and ColorControl (LED). It sends an in-app and ambient light notification if you forget to open the drawer or cabinet where meds are stored. A reminder will be set to a single time per day. If the draw or cabinet isn't opened within 60 minutes of that reminder, an in-app message will be sent. If the draw or cabinet still isn't opened after an additional 10 minutes, then an LED light turns red until the draw or cabinet is opened",
-    category: "Health & Wellness",
-    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 {
-
-	section("My Medicine Draw/Cabinet"){
-		input "deviceContactSensor", "capability.contactSensor", title: "Opened Sensor" 
-	} 
-
-    section("Remind me to take my medicine at"){
-        input "reminderTime", "time", title: "Time"
-    }
-    
-    // NOTE: Use REAL device - virtual device causes compilation errors
-    section("My LED Light"){
-    	input "deviceLight", "capability.colorControl", title: "Smart light"
-    }
-
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-	
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-        
-	initialize()
-}
-
-def initialize() {
-
-    // will stop LED notification incase it was set by med reminder
-    subscribe(deviceContactSensor, "contact", contactHandler)
-
-    // how many minutes to look in the past from the reminder time, for an open draw
-    state.minutesToCheckOpenDraw = 60
-    
-    // is true when LED notification is set after exceeding 10 minutes past reminder time
-    state.ledNotificationTriggered = false
-    
-    // Set a timer to run once a day to notify if draw wasn't opened yet
-    schedule(reminderTime, checkOpenDrawInPast)
-   
-}
-
-// Should turn off any LED notification on OPEN state
-def contactHandler(evt){
-	if (evt.value == "open") {
-        // if LED notification triggered, reset it.
-        log.debug "Cabinet opened"
-        if (state.ledNotificationTriggered) {
-            resetLEDNotification()
-        }
-	}
-}
-
-// If the draw was NOT opened within 60 minutes of the timer send notification out.
-def checkOpenDrawInPast(){
-	log.debug "Checking past 60 minutes of activity from $reminderTime"
-    
-    // check activity of sensor for past 60 minutes for any OPENED status
-    def cabinetOpened = isOpened(state.minutesToCheckOpenDraw)
-	log.debug "Cabinet found opened: $cabinetOpened"
-    
-    // if it's opened, then do nothing and assume they took their meds
-    if (!cabinetOpened) {    
-    	sendNotification("Hi, please remember to take your meds in the cabinet")
-       
-       // if no open activity, send out notification and set new reminder    
-        def reminderTimePlus10 = new Date(now() + (10 * 60000))
-
-        // needs to be scheduled if draw wasn't already opened
-        runOnce(reminderTimePlus10, checkOpenDrawAfterReminder)
-    }
-}
-
-// If the draw was NOT opened after 10 minutes past reminder, use LED notification
-def checkOpenDrawAfterReminder(){
-	log.debug "Checking additional 10 minutes of activity from $reminderTime"
-    
-    // check activity of sensor for past 10 minutes for any OPENED status
-    def cabinetOpened = isOpened(10)    
-    
-   	log.debug "Cabinet found opened: $cabinetOpened"
-        
-    // if no open activity, blink lights
-    if (!cabinetOpened) {
-    	log.debug "Set LED to Notification color"
-        setLEDNotification()
-    }
-    
-}
-
-// Helper function for sending out an app notification
-def sendNotification(msg){
-        log.debug "Message Sent: $msg"
-        sendPush(msg)
-}
-
-// Check if the sensor has been opened since the minutes entered
-// Return true if opened found, else false.
-def isOpened(minutes){
-    // query last X minutes of activity log    
-    def previousDateTime = new Date(now() - (minutes * 60000))
-    
-    // capture all events recorded
-    def evts = deviceContactSensor.eventsSince(previousDateTime)   
-    def cabinetOpened = false
-    if (evts.size() > 0) {
-        evts.each{
-            if(it.value == "open") {
-                cabinetOpened = true 
-            }
-        }
-	}
-    
-    return cabinetOpened
-}
-
-// Saves current color and sets the light to RED
-def setLEDNotification(){
-
-	state.ledNotificationTriggered = true
-    
-	// turn light back off when reset is called if it was originally off
- 	state.ledState = deviceLight.currentValue("switch")
-
-	// set light to RED and store original color until stopped    
-    state.origColor = deviceLight.currentValue("hue")
-    deviceLight.on()
-    deviceLight.setHue(100)
-    
-    log.debug "LED set to RED. Original color stored: $state.origColor"
-
-}
-
-// Sets the color back to the original saved color
-def resetLEDNotification(){
-
-	state.ledNotificationTriggered = false
-    
-    // return color to original
-    log.debug "Reset LED color to: $state.origColor"
-    if (state.origColor != null) {
-    	deviceLight.setHue(state.origColor)
-    }
-    
-    // if the light was turned on just for the notification, turn it back off now
-    if (state.ledState == "off") {
-    	deviceLight.off()
-    }
-
-}

smartapps/mangioneimagery/medicine-management-temp-motion.src/medicine-management-temp-motion.groovy

@@ -1,189 +0,0 @@
-/**
- *  Medicine Management - Temp-Motion
- *
- *  Copyright 2016 Jim Mangione
- *
- *  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.
- *
- * Logic: 
- * --- If temp > threshold set, send notification
- * --- Send in-app notification at the medicine reminder time if no motion is detected in past 60 minutes
- * --- If motion still isn't detected 10 minutes AFTER reminder time, LED will turn RED
- * --- ----- Once motion is detected, LED will turn back to it's original color
- */
-import groovy.time.TimeCategory 
-
-definition(
-    name: "Medicine Management - Temp-Motion",
-    namespace: "MangioneImagery",
-    author: "Jim Mangione",
-    description: "This only supports devices with capabilities TemperatureMeasurement, AccelerationSensor and ColorControl (LED). Supports two use cases. First, will notifies via in-app if the fridge where meds are stored exceeds a temperature threshold set in degrees. Secondly, sends an in-app and ambient light notification if you forget to take your meds by sensing movement of the medicine box in the fridge. A reminder will be set to a single time per day. If the box isn't moved within 60 minutes of that reminder, an in-app message will be sent. If the box still isn't moved after an additional 10 minutes, then an LED light turns red until the box is moved",
-    category: "Health & Wellness",
-    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 {
- 
-     section("My Medicine in the Refrigerator"){
-		input "deviceAccelerationSensor", "capability.accelerationSensor", required: true, multiple: false, title: "Movement"
-        input "deviceTemperatureMeasurement", "capability.temperatureMeasurement", required: true, multiple: false, title: "Temperature"
-	} 
-
-	section("Temperature Threshold"){
-    	input "tempThreshold", "number", title: "Temperature Threshold"
-    }
-
-    section("Remind me to take my medicine at"){
-        input "reminderTime", "time", title: "Time"
-    }
-    
-    // NOTE: Use REAL device - virtual device causes compilation errors
-    section("My LED Light"){
-    	input "deviceLight", "capability.colorControl", title: "Smart light"
-    }    
-
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-	
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-        
-	initialize()
-}
-
-def initialize() {
-	// will notify when temp exceeds max
-    subscribe(deviceTemperatureMeasurement, "temperature", tempHandler)
-
-    // will stop LED notification incase it was set by med reminder
-    subscribe(deviceAccelerationSensor, "acceleration.active", motionHandler)
-    
-    // how many minutes to look in the past from the reminder time
-    state.minutesToCheckPriorToReminder = 60
-    
-    // Set a timer to run once a day to notify if draw wasn't opened yet
-    schedule(reminderTime, checkMotionInPast)
-}
-
-
-// If temp > 39 then send an app notification out.
-def tempHandler(evt){
-	if (evt.doubleValue > tempThreshold) {
-    	log.debug "Fridge temp of $evt.value exceeded threshold"
-   		sendNotification("WARNING: Fridge temp is $evt.value with threshold of $tempThreshold")
-	}
-}
-
-// Should turn off any LED notification once motion detected
-def motionHandler(evt){
-    // always call out to stop any possible LED notification
-	log.debug "Medication moved. Send stop LED notification"
-    resetLEDNotification()
-}
-
-// If no motion detected within 60 minutes of the timer send notification out.
-def checkMotionInPast(){
-	log.debug "Checking past 60 minutes of activity from $reminderTime"
-    
-    // check activity of sensor for past 60 minutes for any OPENED status
-    def movement = isMoved(state.minutesToCheckPriorToReminder)
-	log.debug "Motion found: $movement"
-    
-    // if there was movement, then do nothing and assume they took their meds
-    if (!movement) {    
-    	sendNotification("Hi, please remember to take your meds in the fridge")
-    
-        // if no movement, send out notification and set new reminder    
-        def reminderTimePlus10 = new Date(now() + (10 * 60000))
-
-        // needs to be scheduled if draw wasn't already opened
-        runOnce(reminderTimePlus10, checkMotionAfterReminder)
-    }
-}
-
-// If still no movement after 10 minutes past reminder, use LED notification
-def checkMotionAfterReminder(){
-	log.debug "Checking additional 10 minutes of activity from $reminderTime"
-    
-    // check activity of sensor for past 10 minutes for any OPENED status
-    def movement = isMoved(10)    
-    
-   	log.debug "Motion found: $movement"
-        
-    // if no open activity, blink lights
-    if (!movement) {
-    	log.debug "Notify LED API"
-        setLEDNotification()
-    }
-    
-}
-
-// Helper function for sending out an app notification
-def sendNotification(msg){
-        log.debug "Message Sent: $msg"
-        sendPush(msg)
-}
-
-// Check if the accelerometer has been activated since the minutes entered
-// Return true if active, else false.
-def isMoved(minutes){
-    // query last X minutes of activity log    
-    def previousDateTime = new Date(now() - (minutes * 60000))
-    
-    // capture all events recorded
-    def evts = deviceAccelerationSensor.eventsSince(previousDateTime)   
-    def motion = false
-    if (evts.size() > 0) {
-        evts.each{
-            if(it.value == "active") {
-                motion = true 
-            }
-        }
-	}
-    
-    return motion
-}
-
-// Saves current color and sets the light to RED
-def setLEDNotification(){
-
-	// turn light back off when reset is called if it was originally off
- 	state.ledState = deviceLight.currentValue("switch")
-
-	// set light to RED and store original color until stopped    
-    state.origColor = deviceLight.currentValue("hue")
-    deviceLight.on()
-    deviceLight.setHue(100)
-    
-    log.debug "LED set to RED. Original color stored: $state.origColor"
-
-}
-
-// Sets the color back to the original saved color
-def resetLEDNotification(){
-
-    // return color to original
-    log.debug "Reset LED color to: $state.origColor"
-    deviceLight.setHue(state.origColor)
-    
-    // if the light was turned on just for the notification, turn it back off now
-    if (state.ledState == "off") {
-    	deviceLight.off()
-    }
-}

smartapps/sheikhsphere/smart-humidifier.src/smart-humidifier.groovy

@@ -77,7 +77,7 @@ def humidityHandler(evt) {
 
 		} else {
          	if (state.lastStatus != "off") {
-                log.debug "Humidity Rose Above $humidityHigh1:  sending SMS and deactivating $mySwitch"
+                log.debug "Humidity Rose Above $humidityHigh1:  sending SMS to $phone1 and deactivating $mySwitch"
                 send("${humiditySensor1.label} sensed high humidity level of ${evt.value}, turning off ${switch1.label}")
                 switch1?.off()
                 state.lastStatus = "off"
@@ -99,7 +99,7 @@ def humidityHandler(evt) {
 
 		} else {
         	if (state.lastStatus != "on") {
-                log.debug "Humidity Dropped Below $humidityLow1:  sending SMS and activating $mySwitch"
+                log.debug "Humidity Dropped Below $humidityLow1:  sending SMS to $phone1 and activating $mySwitch"
                 send("${humiditySensor1.label} sensed low humidity level of ${evt.value}, turning on ${switch1.label}")
                 switch1?.on()
                 state.lastStatus = "on"
@@ -125,4 +125,4 @@ private send(msg) {
     }
 
     log.debug msg
-}
+}

smartapps/smartthings/has-barkley-been-fed.src/has-barkley-been-fed.groovy

@@ -68,7 +68,7 @@ def scheduleCheck()
             sendNotificationToContacts("No one has fed the dog", recipients)
         }
         else {
-            log.debug "Feeder was not opened since $midnight, texting one phone number"
+            log.debug "Feeder was not opened since $midnight, texting $phone1"
             sendSms(phone1, "No one has fed the dog")
         }
 	}

smartapps/smartthings/its-too-cold.src/its-too-cold.groovy

@@ -69,10 +69,10 @@ def temperatureHandler(evt) {
 		def alreadySentSms = recentEvents.count { it.doubleValue <= tooCold } > 1
 
 		if (alreadySentSms) {
-			log.debug "SMS already sent within the last $deltaMinutes minutes"
+			log.debug "SMS already sent to $phone1 within the last $deltaMinutes minutes"
 			// TODO: Send "Temperature back to normal" SMS, turn switch off
 		} else {
-			log.debug "Temperature dropped below $tooCold:  sending SMS and activating $mySwitch"
+			log.debug "Temperature dropped below $tooCold:  sending SMS to $phone1 and activating $mySwitch"
 			def tempScale = location.temperatureScale ?: "F"
 			send("${temperatureSensor1.displayName} is too cold, reporting a temperature of ${evt.value}${evt.unit?:tempScale}")
 			switch1?.on()