DEVC-489: Adding a fingerprint line to the DTH

devicetypes/erocm123/remotec-zrc-90-scene-master.src/remotec-zrc-90-scene-master.groovy

@@ -1,174 +0,0 @@
-/**
- *  Remotec ZRC-90 Scene Master
- *  Copyright 2015 Eric Maycock
- *
- *  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: "Remotec ZRC-90 Scene Master", namespace: "erocm123", author: "Eric Maycock") {
-		capability "Actuator"
-		capability "Button"
-		capability "Configuration"
-		capability "Sensor"
-        capability "Battery"
-        
-        attribute "sequenceNumber", "number"
-        attribute "numberOfButtons", "number"
-
-		fingerprint deviceId: "0x0106", inClusters: "0x5E,0x85,0x72,0x21,0x84,0x86,0x80,0x73,0x59,0x5A,0x5B,0xEF,0x5B,0x84"
-	}
-
-	simulator {
-		status "button 1 pushed":  "command: 5B03, payload: 23 00 01"
-		status "button 1 held":  "command: 5B03, payload: 2B 02 01"
-        status "button 1 released":  "command: 5B03, payload: 2C 01 01"
-        status "button 1 double":  "command: 5B03, payload: 2F 03 01"
-		status "button 2 pushed":  "command: 5B03, payload: 23 00 02"
-		status "button 2 held":  "command: 5B03, payload: 2B 02 02"
-        status "button 2 released":  "command: 5B03, payload: 2C 01 02"
-        status "button 2 double":  "command: 5B03, payload: 2F 03 02"
-		status "button 3 pushed":  "command: 5B03, payload: 23 00 03"
-		status "button 3 held":  "command: 5B03, payload: 2B 02 03"
-        status "button 3 released":  "command: 5B03, payload: 2C 01 03"
-        status "button 3 double":  "command: 5B03, payload: 2F 03 03"
-		status "button 4 pushed":  "command: 5B03, payload: 23 00 04"
-		status "button 4 held":  "command: 5B03, payload: 2B 02 04"
-        status "button 4 released":  "command: 5B03, payload: 2C 01 04"
-        status "button 4 double":  "command: 5B03, payload: 2F 03 04"
-        status "button 5 pushed":  "command: 5B03, payload: 23 00 05"
-		status "button 5 held":  "command: 5B03, payload: 2B 02 05"
-        status "button 5 released":  "command: 5B03, payload: 2C 01 05"
-        status "button 5 double":  "command: 5B03, payload: 2F 03 05"
-		status "button 6 pushed":  "command: 5B03, payload: 23 00 06"
-		status "button 6 held":  "command: 5B03, payload: 2B 02 06"
-        status "button 6 released":  "command: 5B03, payload: 2C 01 06"
-        status "button 6 double":  "command: 5B03, payload: 2F 03 06"
-		status "button 7 pushed":  "command: 5B03, payload: 23 00 07"
-		status "button 7 held":  "command: 5B03, payload: 2B 02 07"
-        status "button 7 released":  "command: 5B03, payload: 2C 01 07"
-        status "button 7 double":  "command: 5B03, payload: 2F 03 07"
-		status "button 8 pushed":  "command: 5B03, payload: 23 00 08"
-		status "button 8 held":  "command: 5B03, payload: 2B 02 08"
-        status "button 8 released":  "command: 5B03, payload: 2C 01 08"
-        status "button 8 double":  "command: 5B03, payload: 2F 03 08"
-        status "battery 100%": "command: 8003, payload: 64"
-		status "wakeup":  "command: 8407, payload:"
-        
-	}
-	tiles (scale: 2) {
-		standardTile("button", "device.button", width: 2, height: 2) {
-			state "default", label: "", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffffff"
-		}
-        valueTile(
-			"battery", "device.battery", decoration: "flat", width: 2, height: 2) {
-			state "battery", label:'${currentValue}% battery', unit:""
-		}
-        valueTile(
-			"sequenceNumber", "device.sequenceNumber", decoration: "flat", width: 2, height: 2) {
-			state "battery", label:'${currentValue}', unit:""
-		}
-        standardTile("configure", "device.configure", inactiveLabel: false, width: 2, height: 2, decoration: "flat") {
-			state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
-		}
-		main "button"
-		details(["button", "battery", "sequenceNumber", "configure"])
-	}
-    
-    preferences {
-       input name: "holdMode", type: "enum", title: "Multiple \"held\" events on botton hold? With this option, the controller will send a \"held\" event about every second while holding down a button. This allows you to set things up such as \"dimming\" in apps like Rule Machine.", defaultValue: "2", displayDuringSetup: true, required: false, options: [
-                   "1":"Yes",
-                   "2":"No"]
-       input name: "debug", type: "boolean", title: "Enable Debug?", defaultValue: false, displayDuringSetup: false, required: false
-    }
-}
-
-def parse(String description) {
-	def results = []
-    if (settings.debug == true) log.debug "${description}"
-	if (description.startsWith("Err")) {
-	    results = createEvent(descriptionText:description, displayed:true)
-	} else {
-		def cmd = zwave.parse(description, [0x2B: 1, 0x80: 1, 0x84: 1])
-		if(cmd) results += zwaveEvent(cmd)
-		if(!results) results = [ descriptionText: cmd, displayed: false ]
-	}
-    
-    if(state.isConfigured != "true") configure()
-    
-	return results
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.centralscenev1.CentralSceneNotification cmd) {
-        if (settings.debug == true) log.debug "keyAttributes: $cmd.keyAttributes"
-        if (settings.debug == true) log.debug "sceneNumber: $cmd.sceneNumber"
-        if (settings.debug == true) log.debug "sequenceNumber: $cmd.sequenceNumber"
-
-        sendEvent(name: "sequenceNumber", value: cmd.sequenceNumber, displayed:false)
-        switch (cmd.keyAttributes) {
-           case 0:
-              buttonEvent(cmd.sceneNumber, "pushed")
-           break
-           case 1:
-              if (settings.holdMode == "2") buttonEvent(cmd.sceneNumber, "held")
-           break
-           case 2:
-              if (settings.holdMode == "1") buttonEvent(cmd.sceneNumber, "held")
-           break
-           case 3:
-              buttonEvent(cmd.sceneNumber + 8, "pushed")
-           break
-           default:
-              if (settings.debug == true) log.debug "Unhandled CentralSceneNotification: ${cmd}"
-           break
-        }
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd) {
-	def results = [createEvent(descriptionText: "$device.displayName woke up", isStateChange: false)]
-	results << response(zwave.wakeUpV1.wakeUpNoMoreInformation().format())
-	return results
-}
-
-def buttonEvent(button, value) {
-	createEvent(name: "button", value: value, data: [buttonNumber: button], descriptionText: "$device.displayName button $button was $value", isStateChange: true)
-}
-
-def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
-	def map = [ name: "battery", unit: "%" ]
-	if (cmd.batteryLevel == 0xFF) {
-		map.value = 1
-		map.descriptionText = "${device.displayName} battery is low"
-		map.isStateChange = true
-	} else {
-		map.value = cmd.batteryLevel
-	}
-	createEvent(map)
-}
-
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	log.debug "Unhandled zwaveEvent: ${cmd}"
-}
-
-def installed() {
-    log.debug "installed()"
-    configure()
-}
-
-def updated() {
-    log.debug "updated()"
-    configure()
-}
-
-def configure() {
-	log.debug "configure()"
-    sendEvent(name: "numberOfButtons", value: 16, displayed: true)
-    state.isConfigured = "true"
-}

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

@@ -106,7 +106,7 @@ def configure() {
     schedule("0 0/5 * * * ? *", "healthPoll")
     log.debug "Configuring Reporting and Bindings."
     // Device-Watch allows 2 check-in misses from device
-    sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+    sendEvent(name: "checkInterval", value: 60 * 12, 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 * 12, data: [protocol: "lan", hubHardwareId: device.hub.hardwareID], displayed: false)
+	sendEvent(name: "checkInterval", value: 60 * 12, 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 * 12, data: [protocol: "lan", hubHardwareId: device.hub.hardwareID], displayed: false)
+	sendEvent(name: "checkInterval", value: 60 * 12, 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 * 12, data: [protocol: "lan", hubHardwareId: device.hub.hardwareID], displayed: false)
+	sendEvent(name: "checkInterval", value: 60 * 12, 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 * 12, data: [protocol: "lan", hubHardwareId: device.hub.hardwareID], displayed: false)
+	sendEvent(name: "checkInterval", value: 60 * 12, data: [protocol: "lan"], displayed: false)
 }
 
 // parse events into attributes

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

@@ -129,7 +129,7 @@ def refresh() {
 
 def configure() {
 	// Device-Watch allows 2 check-in misses from device
-	sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee"])
 	// OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
 	zigbee.onOffConfig(0, 300) + powerConfig() + refresh()
 }

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

@@ -180,9 +180,9 @@ private Map parseIasMessage(String description) {
 def getTemperature(value) {
 	def celsius = Integer.parseInt(value, 16).shortValue() / 100
 	if(getTemperatureScale() == "C"){
-		return Math.round(celsius)
+		return celsius
 	} else {
-		return Math.round(celsiusToFahrenheit(celsius))
+		return celsiusToFahrenheit(celsius) as Integer
 	}
 }
 
@@ -293,7 +293,7 @@ def refresh() {
 
 def configure() {
 	// Device-Watch allows 2 check-in misses from device
-	sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee"])
 
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."

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

@@ -194,9 +194,9 @@ private Map parseIasMessage(String description) {
 def getTemperature(value) {
 	def celsius = Integer.parseInt(value, 16).shortValue() / 100
 	if(getTemperatureScale() == "C"){
-		return Math.round(celsius)
+		return celsius
 	} else {
-		return Math.round(celsiusToFahrenheit(celsius))
+		return celsiusToFahrenheit(celsius) as Integer
 	}
 }
 
@@ -304,7 +304,7 @@ def refresh() {
 
 def configure() {
 	// Device-Watch allows 2 check-in misses from device
-	sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee"])
 
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."

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

@@ -261,9 +261,9 @@ def updated() {
 def getTemperature(value) {
 	def celsius = Integer.parseInt(value, 16).shortValue() / 100
 	if(getTemperatureScale() == "C"){
-		return Math.round(celsius)
+		return celsius
 		} else {
-			return Math.round(celsiusToFahrenheit(celsius))
+			return celsiusToFahrenheit(celsius) as Integer
 		}
 	}
 
@@ -402,7 +402,7 @@ def refresh() {
 
 def configure() {
 	// Device-Watch allows 2 check-in misses from device
-	sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee"])
 
 	log.debug "Configuring Reporting"
 

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

@@ -256,7 +256,7 @@ def refresh() {
 
 def configure() {
 	// Device-Watch allows 2 check-in misses from device
-	sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee"])
 
 	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

@@ -265,7 +265,7 @@ def refresh()
 
 def configure() {
 	// Device-Watch allows 2 check-in misses from device
-	sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee"])
 
 	log.debug "Configuring Reporting and Bindings."
 	def humidityConfigCmds = [

devicetypes/smartthings/tyco-door-window-sensor.src/.st-ignore

@@ -1,2 +0,0 @@
-.st-ignore
-README.md

devicetypes/smartthings/tyco-door-window-sensor.src/README.md

@@ -1,42 +0,0 @@
-# Tyco Door Window Sensor
-
-
-
-Works with: 
-
-* [Tyco Door Window Sensor](https://support.smartthings.com/hc/en-us/articles/204834100-Tyco-Door-Window-Sensor)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Battery](#battery-specification)
-
-## Capabilities
-
-* **Battery** - defines device uses a battery
-* **Configuration** - _configure()_ command called when device is installed or device preferences updated
-* **Contact Sensor** - can detect contact (open/close)
-* **Refresh** - _refresh()_ command for status updates
-* **Temperature Measurement** - can measure the device temperature
-* **Health Check** - indicates ability to get device health notifications
-
-## Device Health
-
-Contact sensor with maxReportTime of 5 mins.
-Check-in interval is double the value of maxReportTime for Zigbee device. 
-This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 12 min
-
-## Battery Specification
-
-3V CR2032 battery is required.
-
-## Troubleshooting
-
-If the device doesn't pair when trying from the SmartThings mobile app, it is possible that either the sensor needs to be reseted or the sensor is out of range.
-Reset needs to be done by inserting the battery in the sensor and then quickly pressing the adjacent black button 10 times. Pairing should be tried again now.
-It may happen that sensor is out of range, then pairing needs to be tried again by placing the sensor closer to the hub.
-Instructions related to pairing, resetting and removing the different motion sensors from SmartThings can be found in the following links
-for the different models:
-* [Tyco Door Window Sensor (MCT-340)](https://support.smartthings.com/hc/en-us/articles/204834100-Tyco-Door-Window-Sensor)

devicetypes/smartthings/tyco-door-window-sensor.src/tyco-door-window-sensor.groovy

@@ -16,13 +16,12 @@
 import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 metadata {
-	definition (name: "Tyco Door/Window Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
+	definition (name: "Tyco Door/Window Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Battery"
 		capability "Configuration"
 		capability "Contact Sensor"
 		capability "Refresh"
 		capability "Temperature Measurement"
-		capability "Health Check"
 
 		command "enrollResponse"
 
@@ -230,42 +229,44 @@ private Map getContactResult(value) {
 	]
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	return zigbee.readAttribute(0x0402, 0x0000) // Read the Temperature Cluster
-}
-
 def refresh()
 {
 	log.debug "Refreshing Temperature and Battery"
-	def refreshCmds = [
+	[
 
         "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
 		"st rattr 0x${device.deviceNetworkId} 1 1 0x20"
 
 	]
-
-	return refreshCmds + enrollResponse()
 }
 
 def configure() {
-	// Device-Watch allows 2 check-in misses from device
-	sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 		log.debug "Configuring Reporting, IAS CIE, and Bindings."
-	def enrollCmds = [
+	def configCmds = [
     	"delay 1000",
 
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 1", "delay 1500",
 
+        "zcl global send-me-a-report 1 0x20 0x20 600 3600 {01}", "delay 200",
+        "send 0x${device.deviceNetworkId} 1 1", "delay 1500",
+
+        "zcl global send-me-a-report 0x402 0 0x29 300 3600 {6400}", "delay 200",
+        "send 0x${device.deviceNetworkId} 1 1", "delay 1500",
+
+
         //"raw 0x500 {01 23 00 00 00}", "delay 200",
         //"send 0x${device.deviceNetworkId} 1 1", "delay 1500",
+
+
+		"zdo bind 0x${device.deviceNetworkId} 1 1 0x402 {${device.zigbeeId}} {}", "delay 500",
+		"zdo bind 0x${device.deviceNetworkId} 1 1 1 {${device.zigbeeId}} {}",
+
+        "delay 500"
 	]
-    return enrollCmds + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) + refresh() // send refresh cmds as part of config
+    return configCmds + enrollResponse() + refresh() // send refresh cmds as part of config
 }
 
 def enrollResponse() {

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

@@ -90,7 +90,7 @@ def refresh() {
 def configure() {
     log.debug "Configuring Reporting and Bindings."
     // Device-Watch allows 2 check-in misses from device
-    sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+    sendEvent(name: "checkInterval", value: 60 * 12, 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

@@ -134,7 +134,7 @@ def refresh() {
 def configure() {
     log.debug "Configuring Reporting and Bindings."
     // Device-Watch allows 2 check-in misses from device
-    sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+    sendEvent(name: "checkInterval", value: 60 * 12, 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)
 }

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

@@ -21,6 +21,7 @@ metadata {
 
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0006", outClusters: "0003, 0006, 0019, 0406", manufacturer: "Leviton", model: "ZSS-10", deviceJoinName: "Leviton Switch"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0006", outClusters: "000A", manufacturer: "HAI", model: "65A21-1", deviceJoinName: "Leviton Wireless Load Control Module-30amp"
     }
 
     // simulator metadata
@@ -79,4 +80,4 @@ def refresh() {
 def configure() {
     log.debug "Configuring Reporting and Bindings."
     zigbee.onOffConfig() + zigbee.onOffRefresh()
-}
+}

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

@@ -114,7 +114,7 @@ def refresh() {
 def configure() {
     log.debug "Configuring Reporting and Bindings."
     // Device-Watch allows 2 check-in misses from device
-    sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+    sendEvent(name: "checkInterval", value: 60 * 12, 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()
 }

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

@@ -83,7 +83,7 @@ def bridgeDiscovery(params=[:])
 
 	return dynamicPage(name:"bridgeDiscovery", title:"Discovery Started!", nextPage:"bridgeBtnPush", refreshInterval:refreshInterval, uninstall: true) {
 		section("Please wait while we discover your Hue Bridge. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
-			input "selectedHue", "enum", required:false, title:"Select Hue Bridge (${numFound} found)", multiple:false, options:options, submitOnChange: true
+			input "selectedHue", "enum", required:false, title:"Select Hue Bridge (${numFound} found)", multiple:false, options:options
 		}
 	}
 }
@@ -333,9 +333,9 @@ def bulbListHandler(hub, data = "") {
     def bridge = null
 	if (selectedHue) {
 		bridge = getChildDevice(selectedHue)
-		bridge?.sendEvent(name: "bulbList", value: hub, data: bulbs, isStateChange: true, displayed: false)
 	}
-	msg = "${bulbs.size()} bulbs found. ${bulbs}"
+    bridge.sendEvent(name: "bulbList", value: hub, data: bulbs, isStateChange: true, displayed: false)
+    msg = "${bulbs.size()} bulbs found. ${bulbs}"
 	return msg
 }
 
@@ -490,25 +490,24 @@ def ssdpBridgeHandler(evt) {
 		def host = ip + ":" + port
 		log.debug "Device ($parsedEvent.mac) was already found in state with ip = $host."
 		def dstate = bridges."${parsedEvent.ssdpUSN.toString()}"
-		def dniReceived = "${parsedEvent.mac}"
-		def currentDni = dstate.mac
-		def d = getChildDevice(dniReceived)
+		def dni = "${parsedEvent.mac}"
+		def d = getChildDevice(dni)
 		def networkAddress = null
 		if (!d) {
-			// There might be a mismatch between bridge DNI and the actual bridge mac address, correct that
-			log.debug "Bridge with $dniReceived not found"
-			def bridge = childDevices.find { it.deviceNetworkId == currentDni }
-			if (bridge != null) {
-				log.warn "Bridge is set to ${bridge.deviceNetworkId}, updating to $dniReceived"
-				bridge.setDeviceNetworkId("${dniReceived}")
-				dstate.mac = dniReceived
-				// Check to see if selectedHue is a valid bridge, otherwise update it
-				def isSelectedValid = bridges?.find {it.value?.mac == selectedHue}
-				if (isSelectedValid == null) {
-					log.warn "Correcting selectedHue in state"
-					app.updateSetting("selectedHue", dniReceived)
+			childDevices.each {
+				if (it.getDeviceDataByName("mac")) {
+					def newDNI = "${it.getDeviceDataByName("mac")}"
+					d = it
+					if (newDNI != it.deviceNetworkId) {
+						def oldDNI = it.deviceNetworkId
+						log.debug "updating dni for device ${it} with $newDNI - previous DNI = ${it.deviceNetworkId}"
+						it.setDeviceNetworkId("${newDNI}")
+						if (oldDNI == selectedHue) {
+							app.updateSetting("selectedHue", newDNI)
+						}
+						doDeviceSync()
+					}
 				}
-				doDeviceSync()
 			}
 		} else {
 			updateBridgeStatus(d)
@@ -526,18 +525,6 @@ def ssdpBridgeHandler(evt) {
 				d.sendEvent(name:"networkAddress", value: host)
 				d.updateDataValue("networkAddress", host)
 			}
-			if (dstate.mac != dniReceived) {
-				log.warn "Correcting bridge mac address in state"
-				dstate.mac = dniReceived
-			}
-			if (selectedHue != dniReceived) {
-				// Check to see if selectedHue is a valid bridge, otherwise update it
-				def isSelectedValid = bridges?.find {it.value?.mac == selectedHue}
-				if (isSelectedValid == null) {
-					log.warn "Correcting selectedHue in state"
-					app.updateSetting("selectedHue", dniReceived)
-				}
-			}
 		}
 	}
 }
@@ -963,14 +950,6 @@ private handleCommandResponse(body) {
  * @return empty array
  */
 private handlePoll(body) {
-	// Used to track "unreachable" time
-	// Device is considered "offline" if it has been in the "unreachable" state for
-	// 11 minutes (e.g. two poll intervals)
-	// Note, Hue Bridge marks devices as "unreachable" often even when they accept commands
-	Calendar time11 = Calendar.getInstance()
-	time11.add(Calendar.MINUTE, -11)
-	Calendar currentTime = Calendar.getInstance()
-
 	def bulbs = getChildDevices()
 	for (bulb in body) {
 		def device = bulbs.find{it.deviceNetworkId == "${app.id}/${bulb.key}"}
@@ -980,10 +959,7 @@ private handlePoll(body) {
 					// light just came back online, notify device watch
 					def lastActivity = now()
 					device.sendEvent(name: "deviceWatch-status", value: "ONLINE", description: "Last Activity is on ${new Date((long) lastActivity)}", displayed: false, isStateChange: true)
-					log.debug "$device is Online"
 				}
-				// Mark light as "online"
-				state.bulbs[bulb.key]?.unreachableSince = null
 				state.bulbs[bulb.key]?.online = true
 
 				// If user just executed commands, then do not send events to avoid confusing the turning on/off state
@@ -993,18 +969,9 @@ private handlePoll(body) {
 					sendColorEvents(device, bulb.value?.state?.xy, bulb.value?.state?.hue, bulb.value?.state?.sat, bulb.value?.state?.ct, bulb.value?.state?.colormode)
 				}
 			} else {
-				if (state.bulbs[bulb.key]?.unreachableSince == null) {
-					// Store the first time where device was reported as "unreachable"
-					state.bulbs[bulb.key]?.unreachableSince = currentTime.getTimeInMillis()
-				} else if (state.bulbs[bulb.key]?.online) {
-					// Check if device was "unreachable" for more than 11 minutes and mark "offline" if necessary
-					if (state.bulbs[bulb.key]?.unreachableSince < time11.getTimeInMillis()) {
-						log.warn "$device went Offline"
-						state.bulbs[bulb.key]?.online = false
-						device.sendEvent(name: "DeviceWatch-DeviceOffline", value: "offline", displayed: false, isStateChange: true)
-					}
-				}
-				log.warn "$device may not reachable by Hue bridge"
+				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)
 			}
 		}
 	}
@@ -1039,6 +1006,9 @@ def hubVerification(bodytext) {
 def on(childDevice) {
 	log.debug "Executing 'on'"
 	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
 	updateInProgress()
 	createSwitchEvent(childDevice, "on")
 	put("lights/$id/state", [on: true])
@@ -1048,6 +1018,9 @@ def on(childDevice) {
 def off(childDevice) {
 	log.debug "Executing 'off'"
 	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
 	updateInProgress()
 	createSwitchEvent(childDevice, "off")
 	put("lights/$id/state", [on: false])
@@ -1057,6 +1030,9 @@ def off(childDevice) {
 def setLevel(childDevice, percent) {
 	log.debug "Executing 'setLevel'"
 	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
     updateInProgress()
 	// 1 - 254
     def level
@@ -1081,6 +1057,10 @@ def setLevel(childDevice, percent) {
 def setSaturation(childDevice, percent) {
 	log.debug "Executing 'setSaturation($percent)'"
 	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
+
 	updateInProgress()
 	// 0 - 254
 	def level = Math.min(Math.round(percent * 254 / 100), 254)
@@ -1093,6 +1073,9 @@ def setSaturation(childDevice, percent) {
 def setHue(childDevice, percent) {
 	log.debug "Executing 'setHue($percent)'"
 	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
     updateInProgress()
 	// 0 - 65535
 	def level =	Math.min(Math.round(percent * 65535 / 100), 65535)
@@ -1105,6 +1088,9 @@ def setHue(childDevice, percent) {
 def setColorTemperature(childDevice, huesettings) {
 	log.debug "Executing 'setColorTemperature($huesettings)'"
 	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
     updateInProgress()
 	// 153 (6500K) to 500 (2000K)
 	def ct = hueSettings == 6500 ? 153 : Math.round(1000000/huesettings)
@@ -1116,6 +1102,9 @@ def setColorTemperature(childDevice, huesettings) {
 def setColor(childDevice, huesettings) {
     log.debug "Executing 'setColor($huesettings)'"
 	def id = getId(childDevice)
+	if (!isOnline(id)) {
+		return "Bulb is unreachable"
+	}
     updateInProgress()
 
     def value = [:]
@@ -1131,7 +1120,7 @@ def setColor(childDevice, huesettings) {
 			value.hue = Math.min(Math.round(huesettings.hue * 65535 / 100), 65535)
 		if (huesettings.saturation != null)
 			value.sat = Math.min(Math.round(huesettings.saturation * 254 / 100), 254)
-	} else if (huesettings.hex != null) {
+	} else if (huesettings.hex != null && false) {
 		// For now ignore model to get a consistent color if same color is set across multiple devices
 		// def model = state.bulbs[getId(childDevice)]?.modelid
 		// value.xy = calculateXY(huesettings.hex, model)
@@ -1235,7 +1224,7 @@ private getBridgeIP() {
     	if (d) {
         	if (d.getDeviceDataByName("networkAddress"))
             	host =  d.getDeviceDataByName("networkAddress")
-        else
+            else
         		host = d.latestState('networkAddress').stringValue
         }
         if (host == null || host == "") {
@@ -1674,7 +1663,7 @@ private boolean checkPointInLampsReach(p, colorPoints) {
 }
 
 /**
- * Converts an RGB color in hex to HSV/HSB.
+ * Converts an RGB color in hex to HSV.
  * Algorithm based on http://en.wikipedia.org/wiki/HSV_color_space.
  *
  * @param colorStr color value in hex (#ff03d3)
@@ -1684,32 +1673,32 @@ private boolean checkPointInLampsReach(p, colorPoints) {
 def hexToHsv(colorStr){
 	def r = Integer.valueOf( colorStr.substring( 1, 3 ), 16 ) / 255
 	def g = Integer.valueOf( colorStr.substring( 3, 5 ), 16 ) / 255
-	def b = Integer.valueOf( colorStr.substring( 5, 7 ), 16 ) / 255
+	def b = Integer.valueOf( colorStr.substring( 5, 7 ), 16 ) / 255;
 
 	def max = Math.max(Math.max(r, g), b)
 	def min = Math.min(Math.min(r, g), b)
 
-	def h, s, v = max
+	def h, s, v = max;
 
-	def d = max - min
-	s = max == 0 ? 0 : d / max
+	def d = max - min;
+	s = max == 0 ? 0 : d / max;
 
 	if(max == min){
-		h = 0
+		h = 0;
 	}else{
 		switch(max){
-			case r: h = (g - b) / d + (g < b ? 6 : 0); break
-			case g: h = (b - r) / d + 2; break
-			case b: h = (r - g) / d + 4; break
+			case r: h = (g - b) / d + (g < b ? 6 : 0); break;
+			case g: h = (b - r) / d + 2; break;
+			case b: h = (r - g) / d + 4; break;
 		}
 		h /= 6;
 	}
 
-	return [Math.round(h * 100), Math.round(s * 100), Math.round(v * 100)]
+	return [(h * 100).round(), (s * 100).round(), (v * 100).round()];
 }
 
 /**
- * Converts HSV/HSB color to RGB in hex.
+ * Converts HSV color to RGB in hex.
  * Algorithm based on http://en.wikipedia.org/wiki/HSV_color_space.
  *
  * @param  hue hue 0-100
@@ -1724,11 +1713,11 @@ def hsvToHex(hue, sat, value = 100){
 	def s = sat / 100
 	def v = value / 100
 
-	def i = Math.floor(h * 6)
-	def f = h * 6 - i
-	def p = v * (1 - s)
-	def q = v * (1 - f * s)
-	def t = v * (1 - (1 - f) * s)
+	def i = Math.floor(h * 6);
+	def f = h * 6 - i;
+	def p = v * (1 - s);
+	def q = v * (1 - f * s);
+	def t = v * (1 - (1 - f) * s);
 
 	switch (i % 6) {
 		case 0:
@@ -1764,9 +1753,9 @@ def hsvToHex(hue, sat, value = 100){
 	}
 
 	// Converting float components to int components.
-	def r1 = String.format("%02X", (int) (r * 255.0f))
-	def g1 = String.format("%02X", (int) (g * 255.0f))
-	def b1 = String.format("%02X", (int) (b * 255.0f))
+	def r1 = String.format("%02X", (int) (r * 255.0f));
+	def g1 = String.format("%02X", (int) (g * 255.0f));
+	def b1 = String.format("%02X", (int) (b * 255.0f));
 
 	return "#$r1$g1$b1"
 }