SSVD-2737 - Temperature Unit (#1247)

Rolling down staging hotfix to master

build.gradle

@@ -19,7 +19,7 @@ buildscript {
                 username smartThingsArtifactoryUserName
                 password smartThingsArtifactoryPassword
             }
-            url "http://artifactory.smartthings.com/libs-release-local"
+            url "https://artifactory.smartthings.com/libs-release-local"
         }
     }
 }
@@ -27,9 +27,37 @@ buildscript {
 repositories {
     mavenLocal()
     jcenter()
+    maven {
+        credentials {
+            username smartThingsArtifactoryUserName
+            password smartThingsArtifactoryPassword
+        }
+        url "https://artifactory.smartthings.com/libs-release-local"
+    }
+}
+
+sourceSets {
+    devicetypes {
+        groovy {
+            srcDirs = ['devicetypes']
+        }
+    }
+    smartapps {
+        groovy {
+            srcDirs = ['smartapps']
+        }
+    }
 }
 
 dependencies {
+    devicetypesCompile 'org.codehaus.groovy:groovy-all:2.4.7'
+    devicetypesCompile 'smartthings:appengine-z-wave:0.1.2'
+    devicetypesCompile 'smartthings:appengine-zigbee:0.1.11'
+    smartappsCompile 'org.codehaus.groovy:groovy-all:2.4.7'
+    smartappsCompile 'smartthings:appengine-common:0.1.8'
+    smartappsCompile 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1'
+    smartappsCompile 'org.grails:grails-web:2.3.11'
+    smartappsCompile 'org.json:json:20140107'
 }
 
 slackSendMessage {

circle.yml

@@ -5,7 +5,9 @@ machine:
 
 dependencies:
   override:
-    - echo "Nothing to do."
+    - ./gradlew dependencies -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD"
+  post:
+    - ./gradlew compileSmartappsGroovy compileDevicetypesGroovy -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD"
 
 test:
   override:

devicetypes/fibargroup/fibaro-motion-sensor-zw5.src/fibaro-motion-sensor-zw5.groovy

@@ -33,8 +33,8 @@ metadata {
     tiles(scale: 2) {
     	multiAttributeTile(name:"FGMS", type:"lighting", width:6, height:4) {//with generic type secondary control text is not displayed in Android app
         	tileAttribute("device.motion", key:"PRIMARY_CONTROL") {
-            	attributeState("inactive", icon:"st.motion.motion.inactive", backgroundColor:"#79b821")
-            	attributeState("active", icon:"st.motion.motion.active", backgroundColor:"#ffa81e")   
+            	attributeState("inactive", label:"no motion", icon:"st.motion.motion.inactive", backgroundColor:"#79b821")
+            	attributeState("active", label:"motion", icon:"st.motion.motion.active", backgroundColor:"#ffa81e")   
             }
             
             tileAttribute("device.tamper", key:"SECONDARY_CONTROL") {
@@ -278,4 +278,4 @@ private encap(physicalgraph.zwave.Command cmd) {
     } else {
     	crc16(cmd)
     }
-}
+}

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

@@ -67,12 +67,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"
@@ -96,15 +90,7 @@ def 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.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)
-    }
+    return zigbee.levelRefresh()
 }
 
 def refresh() {
@@ -117,6 +103,8 @@ 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()
+    // Device-Watch allows 3 check-in misses from device. 300 seconds x 3 = 15min
+    sendEvent(name: "checkInterval", value: 900, displayed: false, data: [protocol: "zigbee"])
+    // minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
+    zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
 }

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

@@ -57,7 +57,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "checkInterval", value: 60 * 30, data: [protocol: "lan"], displayed: false)
+	sendEvent(name: "checkInterval", value: 60 * 15, data: [protocol: "lan"], displayed: false)
 }
 
 // parse events into attributes

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

@@ -66,7 +66,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "checkInterval", value: 60 * 30, data: [protocol: "lan"], displayed: false)
+	sendEvent(name: "checkInterval", value: 60 * 15, data: [protocol: "lan"], displayed: false)
 }
 
 // parse events into attributes

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

@@ -50,7 +50,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "checkInterval", value: 60 * 30, data: [protocol: "lan"], displayed: false)
+	sendEvent(name: "checkInterval", value: 60 * 15, data: [protocol: "lan"], displayed: false)
 }
 
 // parse events into attributes

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

@@ -55,7 +55,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "checkInterval", value: 60 * 30, data: [protocol: "lan"], displayed: false)
+	sendEvent(name: "checkInterval", value: 60 * 15, data: [protocol: "lan"], displayed: false)
 }
 
 // parse events into attributes

devicetypes/smartthings/osram-lightify-gardenspot-mini-rgb.src/osram-lightify-gardenspot-mini-rgb.groovy

@@ -91,7 +91,7 @@ def parse(String description) {
 
         if (descMap.cluster == "0300") {
             if(descMap.attrId == "0000"){  //Hue Attribute
-                def hueValue = Math.round(convertHexToInt(descMap.value) / 255 * 360)
+                def hueValue = Math.round(convertHexToInt(descMap.value) / 255 * 100)
                 log.debug "Hue value returned is $hueValue"
                 sendEvent(name: "hue", value: hueValue, displayed:false)
             }
@@ -203,7 +203,7 @@ def setLevel(value) {
 
 //input Hue Integer values; returns color name for saturation 100%
 private getColorName(hueValue){
-    if(hueValue>360 || hueValue<0)
+    if(hueValue>100 || hueValue<0)
         return
 
     hueValue = Math.round(hueValue / 100 * 360)

devicetypes/smartthings/osram-lightify-led-flexible-strip-rgbw.src/osram-lightify-led-flexible-strip-rgbw.groovy

@@ -1,4 +1,4 @@
-/* 
+/*
     Osram Flex RGBW Light Strip
 
     Osram bulbs have a firmware issue causing it to forget its dimming level when turned off (via commands). Handling
@@ -8,7 +8,7 @@
 
 metadata {
 	definition (name: "OSRAM LIGHTIFY LED Flexible Strip RGBW", namespace: "smartthings", author: "SmartThings") {
-        
+
         capability "Color Temperature"
         capability "Actuator"
         capability "Switch"
@@ -18,7 +18,7 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Color Control"
-                        
+
         attribute "colorName", "string"
 
         command "setAdjustedColor"
@@ -49,7 +49,7 @@ metadata {
 		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
 			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
-		
+
         controlTile("colorTempSliderControl", "device.colorTemperature", "slider", height: 1, width: 2, inactiveLabel: false, range:"(2700..6500)") {
 			state "colorTemperature", action:"color temperature.setColorTemperature"
 		}
@@ -118,7 +118,7 @@ def parse(String description) {
                 }
             }
             else if(descMap.attrId == "0000"){  //Hue Attribute
-                def hueValue = Math.round(convertHexToInt(descMap.value) / 255 * 360)
+                def hueValue = Math.round(convertHexToInt(descMap.value) / 255 * 100)
                 log.debug "Hue value returned is $hueValue"
                 sendEvent(name: "hue", value: hueValue, displayed:false)
             }
@@ -274,7 +274,7 @@ private getGenericName(value){
 
 //input Hue Integer values; returns color name for saturation 100%
 private getColorName(hueValue){
-    if(hueValue>360 || hueValue<0)
+    if(hueValue>100 || hueValue<0)
         return
 
     hueValue = Math.round(hueValue / 100 * 360)
@@ -449,7 +449,7 @@ def setColor(value){
         def level = hex(value.level * 255 / 100)
         cmd << zigbeeSetLevel(level)
     }
-    
+
 	if (value.switch == "off") {
 		cmd << "delay 150"
 		cmd << off()

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

@@ -101,12 +101,6 @@ def parse(String description) {
 		else {
 			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)
-			}
-			state.lastActivity = now()
 		}
 	}
 	else {
@@ -126,15 +120,7 @@ def on() {
  * 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)
-	}
+	return zigbee.onOffRefresh()
 }
 
 def refresh() {
@@ -142,8 +128,10 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 1200, displayed: false, data: [protocol: "zigbee"])
-	zigbee.onOffConfig() + powerConfig() + refresh()
+	// Device-Watch allows 3 check-in misses from device. 300 seconds x 3 = 15min
+	sendEvent(name: "checkInterval", value: 900, displayed: false, data: [protocol: "zigbee"])
+	// OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
+	zigbee.onOffConfig(0, 300) + powerConfig() + refresh()
 }
 
 //power config for devices with min reporting interval as 1 seconds and reporting interval if no activity as 10min (600s)

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
 
@@ -285,15 +278,7 @@ 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)
-	}
+	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
 }
 
 def refresh() {
@@ -307,23 +292,19 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 14400, displayed: false, data: [protocol: "zigbee"])
+	// Device-Watch allows 3 check-in misses from device. 300 seconds x 3 = 15min
+	sendEvent(name: "checkInterval", value: 900, displayed: false, data: [protocol: "zigbee"])
 
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."
-	def configCmds = [
+	def enrollCmds = [
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 1", "delay 500",
-
-		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 1 {${device.zigbeeId}} {}", "delay 500",
-		"zcl global send-me-a-report 1 0x20 0x20 30 21600 {01}",		//checkin time 6 hrs
-		"send 0x${device.deviceNetworkId} 1 1", "delay 500",
-
-		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0x402 {${device.zigbeeId}} {}", "delay 500",
-		"zcl global send-me-a-report 0x402 0 0x29 30 3600 {6400}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 500"
 	]
-	return configCmds + refresh() // send refresh cmds as part of config
+
+	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
+	// battery minReport 30 seconds, maxReportTime 6 hrs by default
+	return enrollCmds + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) + refresh() // send refresh cmds as part of config
 }
 
 def enrollResponse() {

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
 
@@ -296,15 +289,7 @@ 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)
-	}
+	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
 }
 
 def refresh() {
@@ -318,24 +303,19 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 14400, displayed: false, data: [protocol: "zigbee"])
+	// Device-Watch allows 3 check-in misses from device. 300 seconds x 3 = 15min
+	sendEvent(name: "checkInterval", value: 900, displayed: false, data: [protocol: "zigbee"])
 
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."
 
-	def configCmds = [
+	def enrollCmds = [
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
-
-		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 1 {${device.zigbeeId}} {}", "delay 200",
-		"zcl global send-me-a-report 1 0x20 0x20 30 21600 {01}",		//checkin time 6 hrs
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
-
-		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0x402 {${device.zigbeeId}} {}", "delay 200",
-		"zcl global send-me-a-report 0x402 0 0x29 300 3600 {6400}",
-		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
 	]
-	return configCmds + refresh() // send refresh cmds as part of config
+	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
+	// battery minReport 30 seconds, maxReportTime 6 hrs by default
+	return enrollCmds + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) + refresh() // send refresh cmds as part of config
 }
 
 def enrollResponse() {

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')) {
@@ -378,15 +371,7 @@ 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)
-	}
+	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
 }
 
 def refresh() {
@@ -416,13 +401,16 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 14400, displayed: false, data: [protocol: "zigbee"])
+	// Device-Watch allows 3 check-in misses from device. 300 seconds x 3 = 15min
+	sendEvent(name: "checkInterval", value: 900, displayed: false, data: [protocol: "zigbee"])
 
 	log.debug "Configuring Reporting"
 
+	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
+	// battery minReport 30 seconds, maxReportTime 6 hrs by default
 	def configCmds = enrollResponse() +
 			zigbee.batteryConfig() +
-			zigbee.temperatureConfig() +
+			zigbee.temperatureConfig(30, 300) +
 			zigbee.configureReporting(0xFC02, 0x0010, 0x18, 10, 3600, 0x01, [mfgCode: manufacturerCode]) +
 			zigbee.configureReporting(0xFC02, 0x0012, 0x29, 1, 3600, 0x0001, [mfgCode: manufacturerCode]) +
 			zigbee.configureReporting(0xFC02, 0x0013, 0x29, 1, 3600, 0x0001, [mfgCode: manufacturerCode]) +

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
 
@@ -248,15 +241,7 @@ 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)
-	}
+	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
 }
 
 def refresh() {
@@ -270,23 +255,19 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 14400, displayed: false, data: [protocol: "zigbee"])
+	// Device-Watch allows 3 check-in misses from device. 300 seconds x 3 = 15min
+	sendEvent(name: "checkInterval", value: 900, displayed: false, data: [protocol: "zigbee"])
 
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."
-	def configCmds = [
+	def enrollCmds = [
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 1", "delay 500",
-
-		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 1 {${device.zigbeeId}} {}", "delay 500",
-		"zcl global send-me-a-report 1 0x20 0x20 30 21600 {01}",		//checkin time 6 hrs
-		"send 0x${device.deviceNetworkId} 1 1", "delay 500",
-
-		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0x402 {${device.zigbeeId}} {}", "delay 500",
-		"zcl global send-me-a-report 0x402 0 0x29 30 3600 {6400}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 500"
 	]
-    return configCmds + refresh() // send refresh cmds as part of config
+
+	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
+	// battery minReport 30 seconds, maxReportTime 6 hrs by default
+    return enrollCmds + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) + refresh() // send refresh cmds as part of config
 }
 
 def enrollResponse() {

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
 }
@@ -253,14 +246,7 @@ 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)
-	}
+	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
 }
 
 def refresh()
@@ -278,23 +264,19 @@ def refresh()
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 14400, displayed: false, data: [protocol: "zigbee"])
+	// Device-Watch allows 3 check-in misses from device. 300 seconds x 3 = 15min
+	sendEvent(name: "checkInterval", value: 900, displayed: false, data: [protocol: "zigbee"])
 
 	log.debug "Configuring Reporting and Bindings."
-	def configCmds = [
-		"zdo bind 0x${device.deviceNetworkId} 1 1 1 {${device.zigbeeId}} {}", "delay 500",
-		"zcl global send-me-a-report 1 0x20 0x20 30 21600 {01}",		//checkin time 6 hrs
-		"send 0x${device.deviceNetworkId} 1 1", "delay 500",
-
-		"zdo bind 0x${device.deviceNetworkId} 1 1 0x402 {${device.zigbeeId}} {}", "delay 500",
-		"zcl global send-me-a-report 0x402 0 0x29 30 3600 {6400}",
-		"send 0x${device.deviceNetworkId} 1 1", "delay 500",
-
+	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"
 	]
-	return configCmds + refresh() // send refresh cmds as part of config
+
+	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
+	// battery minReport 30 seconds, maxReportTime 6 hrs by default
+	return humidityConfigCmds + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) +  refresh() // send refresh cmds as part of config
 }
 
 private hex(value) {

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

@@ -54,12 +54,6 @@ 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)
@@ -86,15 +80,7 @@ def 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)
-    }
+    return zigbee.onOffRefresh()
 }
 
 def refresh() {
@@ -103,7 +89,8 @@ 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()
+    // Device-Watch allows 3 check-in misses from device. 300 seconds x 3 = 15min
+    sendEvent(name: "checkInterval", value: 900, displayed: false, data: [protocol: "zigbee"])
+    // OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
+    zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
 }

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

@@ -85,12 +85,6 @@ def parse(String 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") {
@@ -105,7 +99,7 @@ def parse(String description) {
 
         if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
             if(zigbeeMap.attrInt == ATTRIBUTE_HUE){  //Hue Attribute
-                def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 360)
+                def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
                 sendEvent(name: "hue", value: hueValue, descriptionText: "Color has changed")
             }
             else if(zigbeeMap.attrInt == ATTRIBUTE_SATURATION){ //Saturation Attribute
@@ -130,15 +124,7 @@ def 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)
-    }
+    return zigbee.onOffRefresh()
 }
 
 def refresh() {
@@ -147,9 +133,10 @@ 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.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)
+    // Device-Watch allows 3 check-in misses from device. 300 seconds x 3 = 15min
+    sendEvent(name: "checkInterval", value: 900, displayed: false, data: [protocol: "zigbee"])
+    // OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
+    zigbee.onOffConfig(0, 300) + 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) {

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

@@ -74,12 +74,6 @@ def parse(String description) {
     log.debug "description is $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 {
             if (event.name=="colorTemperature") {
@@ -110,15 +104,7 @@ def 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)
-    }
+    return zigbee.onOffRefresh()
 }
 
 def refresh() {
@@ -127,9 +113,10 @@ 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.colorTemperatureConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
+    // Device-Watch allows 3 check-in misses from device. 300 seconds x 3 = 15min
+    sendEvent(name: "checkInterval", value: 900, displayed: false, data: [protocol: "zigbee"])
+    // OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
+    zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
 }
 
 def setColorTemperature(value) {

smartapps/imbrianj/safe-watch.src/safe-watch.groovy

@@ -26,9 +26,9 @@ preferences {
   }
 
   section("Temperature monitor?") {
-    input "temp",    "capability.temperatureMeasurement", title: "Temp Sensor", required: false
-    input "maxTemp", "number",                            title: "Max Temp?",   required: false
-    input "minTemp", "number",                            title: "Min Temp?",   required: false
+    input "temp",    "capability.temperatureMeasurement", title: "Temperature Sensor", required: false
+    input "maxTemp", "number",                            title: "Max Temperature (°${location.temperatureScale})",   required: false
+    input "minTemp", "number",                            title: "Min Temperature (°${location.temperatureScale})",   required: false
   }
 
   section("When which people are away?") {

smartapps/michaelstruck/smart-home-ventilation.src/smart-home-ventilation.groovy

@@ -14,7 +14,7 @@
  *	for the specific language governing permissions and limitations under the License.
  *
  */
- 
+
 definition(
 	name: "Smart Home Ventilation",
     namespace: "MichaelStruck",
@@ -164,7 +164,7 @@ def installed() {
 def updated() {
     unschedule()
     turnOffSwitch() //Turn off all switches if the schedules are changed while in mid-schedule
-    unsubscribe
+    unsubscribe()
     log.debug "Updated with settings: ${settings}"
     init()
 }
@@ -174,12 +174,12 @@ def init() {
     schedule (midnightTime, midNight)
 	subscribe(location, "mode", locationHandler)
     startProcess()
-}    
+}
 
 // Common methods
 
 def startProcess () {
-    createDayArray() 
+    createDayArray()
 	state.dayCount=state.data.size()
     if (state.dayCount){
 		state.counter = 0
@@ -190,7 +190,7 @@ def startProcess () {
 def startDay() {
 	def start = convertEpoch(state.data[state.counter].start)
 	def stop = convertEpoch(state.data[state.counter].stop)
-      
+
     runOnce(start, turnOnSwitch, [overwrite: true])
     runOnce(stop, incDay, [overwrite: true])
 }
@@ -218,7 +218,7 @@ def locationHandler(evt) {
     }
 	if (!result) {
     	startProcess()
-    }	
+    }
 }
 
 def midNight(){
@@ -238,7 +238,7 @@ def turnOffSwitch() {
     }
     log.debug "Home ventilation switches are off."
 }
-    
+
 def schedDesc(on1, off1, on2, off2, on3, off3, on4, off4, modeList, dayList) {
 	def title = ""
 	def dayListClean = "On "
@@ -252,7 +252,7 @@ def schedDesc(on1, off1, on2, off2, on3, off3, on4, off4, modeList, dayList) {
             	dayListClean = "${dayListClean}, "
             }
         }
-	} 
+	}
     else {
     	dayListClean = "Every day"
     }
@@ -272,7 +272,7 @@ def schedDesc(on1, off1, on2, off2, on3, off3, on4, off4, modeList, dayList) {
             	modeListClean = "${modeListClean} ${modePrefix}"
         	}
         }
-	} 
+	}
     else {
     	modeListClean = "${modeListClean}all modes"
     }
@@ -283,16 +283,16 @@ def schedDesc(on1, off1, on2, off2, on3, off3, on4, off4, modeList, dayList) {
     	title += "\nSchedule 2: ${humanReadableTime(on2)} to ${humanReadableTime(off2)}"
     }
     if (on3 && off3) {
-    	title += "\nSchedule 3: ${humanReadableTime(on3)} to ${humanReadableTime(off3)}" 
+    	title += "\nSchedule 3: ${humanReadableTime(on3)} to ${humanReadableTime(off3)}"
     }
     if (on4 && off4) {
-    	title += "\nSchedule 4: ${humanReadableTime(on4)} to ${humanReadableTime(off4)}" 
+    	title += "\nSchedule 4: ${humanReadableTime(on4)} to ${humanReadableTime(off4)}"
     }
     if (on1 || on2 || on3 || on4) {
     	title += "\n$modeListClean"
-    	title += "\n$dayListClean" 
+    	title += "\n$dayListClean"
     }
-    
+
     if (!on1 && !on2 && !on3 && !on4) {
     	title="Click to configure scenario"
     }
@@ -374,7 +374,7 @@ def createDayArray() {
            timeOk(timeOnD1, timeOffD1)
            timeOk(timeOnD2, timeOffD2)
            timeOk(timeOnD3, timeOffD3)
-           timeOk(timeOnD4, timeOffD4)        
+           timeOk(timeOnD4, timeOffD4)
         }
     }
     state.data.sort{it.start}
@@ -384,7 +384,7 @@ def createDayArray() {
 
 private def textAppName() {
 	def text = "Smart Home Ventilation"
-}	
+}
 
 private def textVersion() {
     def text = "Version 2.1.2 (05/31/2015)"
@@ -416,4 +416,4 @@ private def textHelp() {
         "that each scenario does not overlap and run in separate modes (i.e. Home, Out of town, etc). Also note that you should  " +
         "avoid scheduling the ventilation fan at exactly midnight; the app resets itself at that time. It is suggested to start any new schedule " +
         "at 12:15 am or later."
-}
+}

smartapps/smartthings/energy-alerts.src/energy-alerts.groovy

@@ -64,7 +64,7 @@ def meterHandler(evt) {
     def lastValue = atomicState.lastValue as double
     atomicState.lastValue = meterValue
 
-    def dUnit ? evt.unit : "Watts"
+    def dUnit = evt.unit ?: "Watts"
 
     def aboveThresholdValue = aboveThreshold as int
     if (meterValue > aboveThresholdValue) {

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

@@ -170,7 +170,7 @@ def bulbDiscovery() {
 
 	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, options:newLights
+			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 {
@@ -724,13 +724,13 @@ private void updateBridgeStatus(childDevice) {
 }
 
 /**
- * Check if all Hue bridges have been heard from in the last 16 minutes, if not an Offline event will be sent
- * for the bridge. Also, set ID number on bridge if not done previously.
+ * Check if all Hue bridges have been heard from in the last 11 minutes, if not an Offline event will be sent
+ * for the bridge and all connected lights. Also, set ID number on bridge if not done previously.
  */
 private void checkBridgeStatus() {
     def bridges = getHueBridges()
-    // Check if each bridge has been heard from within the last 16 minutes (3 poll intervals times 5 minutes plus buffer)
-    def time = now() - (1000 * 60 * 30)
+    // Check if each bridge has been heard from within the last 11 minutes (2 poll intervals times 5 minutes plus buffer)
+    def time = now() - (1000 * 60 * 11)
     bridges.each {
         def d = getChildDevice(it.value.mac)
 	    if(d) {
@@ -740,16 +740,21 @@ private void checkBridgeStatus() {
 				d.sendEvent(name: "idNumber", value: it.value.idNumber)
 		    }
 
-	        if (it.value.lastActivity < time) { // it.value.lastActivity != null &&
-	            log.warn "Bridge $it.key is Offline"
-	            d.sendEvent(name: "status", value: "Offline")
-                // set all lights to offline since bridge is not reachable
-                state.bulbs?.each {it.value.online = false}
-	        } else {
+			if (it.value.lastActivity < time) { // it.value.lastActivity != null &&
+				log.warn "Bridge $it.key is Offline"
+				d.sendEvent(name: "status", value: "Offline")
+
+				state.bulbs?.each {
+					it.value.online = false
+				}
+				getChildDevices().each {
+					it.sendEvent(name: "DeviceWatch-DeviceOffline", value: "offline", isStateChange: true, displayed: false)
+				}
+			} else {
 				d.sendEvent(name: "status", value: "Online")//setOnline(false)
-	        }
-	    }
-    }
+			}
+		}
+	}
 }
 
 def isValidSource(macAddress) {
@@ -955,6 +960,7 @@ private handlePoll(body) {
 			} else {
 				state.bulbs[bulb.key]?.online = false
 				log.warn "$device is not reachable by Hue bridge"
+				device.sendEvent(name: "DeviceWatch-DeviceOffline", value: "offline", displayed: false, isStateChange: true)
 			}
 		}
 	}