MSA-1551: metadata {

// Automatically generated. Make future change here.
	definition (name: "Zigbee Dimmer", namespace: "Enerwave", author: "Home Automation") {
		capability "Actuator"
		capability "Switch"
		capability "Sensor"
                capability "Switch Level"
                capability "Refresh"

		fingerprint profileId: "0104", inClusters: "0000,0003,0006,0008", outClusters: "0019"
	}

	// simulator metadata
	simulator {
		// status messages
		status "on": "on/off: 1"
		status "off": "on/off: 0"

		// reply messages
		reply "zcl on-off on": "on/off: 1"
		reply "zcl on-off off": "on/off: 0"
	}

	// UI tile definitions
	tiles {
		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
                    state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
	            state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
		}
                standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
                    state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
                }
                controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 3, inactiveLabel: false) {
	            state "level", action:"switch level.setLevel"
		}
                valueTile("level", "device.level", inactiveLabel: false, decoration: "flat") {
		    state "level", label:'${currentValue} %', unit:"%", backgroundColor:"#ffffff"
		}

		main "switch"
		details (["switch","refresh","level","levelSliderControl"])
	}
}

// Parse incoming device messages to generate events
def parse(String description) {
	/*if (description?.startsWith("catchall: 0104 000A")) {
		log.debug "Dropping catchall for SmartPower Outlet"
		return []
	}*/
    log.trace description
    if (description?.startsWith("catchall:")) {
		def msg = zigbee.parse(description)
		log.trace msg
		log.trace "data: $msg.data"
        if(msg.command == 0x01){
        	if(msg.clusterId == 0x0006 && msg.data[0] == 0x00 && msg.data[1] == 0x00){
                def name = "switch" 
                def value = (msg.data[4] != 0 ? "on" : "off") 
                log.debug"name:$name,value:$value"
                def result = createEvent(name: name, value: value)
                return result
            }
        }else if(msg.command == 0x0b && msg.clusterId == 0x0006){
        	def name = "switch" 
            def value = (msg.data[0] != 0 ? "on" : "off") 
            log.debug"name:$name,value:$value"
            def result = createEvent(name: name, value: value)
            return result
        }
	}else if(description?.startsWith("read attr")){
    	def descMap = parseDescriptionAsMap(description)
		log.debug "Read attr: $description"
    	if(descMap.cluster == "0008" && descMap.attrId == "0000"){
        	def name = "level" 
            def value = Integer.parseInt(descMap.value, 16) 
            value = Math.round(value * 100/255)
            log.debug"name:$name,value:$value"
            def result = createEvent(name: name, value: value)
            return result
        }
    }/*else {
    	log.debug "parse description: $description"
		def name = description?.startsWith("on/off: ") ? "switch" : null
		def value = name == "switch" ? (description?.endsWith(" 1") ? "on" : "off") : null
		def result = createEvent(name: name, value: value)
		log.debug "Parse returned ${result?.descriptionText}"
		return result
	}*/
}

def parseDescriptionAsMap(description) {
	(description - "read attr - ").split(",").inject([:]) { map, param ->
		def nameAndValue = param.split(":")
		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
	}
}

def refresh() {
	log.debug "refresh()"
    def cmds = []
    cmds << "st rattr 0x${device.deviceNetworkId} 1 0x0006 0x0000"
    cmds << "delay 200"
    cmds << "st rattr 0x${device.deviceNetworkId} 1 0x0008 0x0000"
}

// Commands to device
def on() {
	log.debug "on()"
    def cmds = []
	cmds << "st cmd 0x${device.deviceNetworkId} 1 6 1 {}"
    cmds << "delay 5000"
    cmds << "st rattr 0x${device.deviceNetworkId} 1 0x0008 0x0000"
}

def off() {
	log.debug "off()"
    def cmds = []
	cmds << "st cmd 0x${device.deviceNetworkId} 1 6 0 {}"
    cmds << "delay 5000"
    cmds << "st rattr 0x${device.deviceNetworkId} 1 0x0008 0x0000"
}

def setLevel(value) {
	log.trace "setLevel($value)"
	def cmds = []

	if (value == 0) {
		sendEvent(name: "switch", value: "off")
		//cmds << "st cmd 0x${device.deviceNetworkId} 1 6 0 {}"
	}
	else if (device.latestValue("switch") == "off") {
        sendEvent(name: "switch", value: "on")
        //cmds << "st cmd 0x${device.deviceNetworkId} 1 6 1 {}"
        
	}
    //def transitionTime = Math.round(Math.abs(((device.currentValue("level")?:0) as int) - (value as int))*0.3)
    //def transitionTime2 = hexString(transitionTime>>8)
    //def transitionTime1 = hexString(transitionTime%256)
	sendEvent(name: "level", value: value)
    def level = hexString(Math.round(value * 255/100))
	cmds << "st cmd 0x${device.deviceNetworkId} 1 8 4 {${level} FFFF}"
    cmds << "delay 5000"
    cmds << "st rattr 0x${device.deviceNetworkId} 1 0x0008 0x0000"

	log.debug cmds
	cmds
}

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

@@ -148,12 +148,14 @@ def generateEvent(Map results) {
 						 handlerName: name]
 
 			if (name=="temperature" || name=="heatingSetpoint" || name=="coolingSetpoint" ) {
-				def sendValue =  location.temperatureScale == "C"? roundC(convertFtoC(value.toDouble())) : value.toInteger()
+				def sendValue = convertTemperatureIfNeeded(value.toDouble(), "F", 1) //API return temperature value in F
+				sendValue =  location.temperatureScale == "C"? roundC(sendValue) : sendValue
 				isChange = isTemperatureStateChange(device, name, value.toString())
 				isDisplayed = isChange
 				event << [value: sendValue, unit: temperatureScale, isStateChange: isChange, displayed: isDisplayed]
 			}  else if (name=="maxCoolingSetpoint" || name=="minCoolingSetpoint" || name=="maxHeatingSetpoint" || name=="minHeatingSetpoint") {
-				def sendValue =  location.temperatureScale == "C"? roundC(convertFtoC(value.toDouble())) : value.toInteger()
+				def sendValue = convertTemperatureIfNeeded(value.toDouble(), "F", 1) //API return temperature value in F
+				sendValue =  location.temperatureScale == "C"? roundC(sendValue) : sendValue
 				event << [value: sendValue, unit: temperatureScale, displayed: false]
 			}  else if (name=="heatMode" || name=="coolMode" || name=="autoMode" || name=="auxHeatMode"){
 				isChange = isStateChange(device, name, value.toString())
@@ -251,6 +253,7 @@ void setCoolingSetpoint(setpoint) {
 	def maxCoolingSetpoint = device.currentValue("maxCoolingSetpoint")
 	def minCoolingSetpoint = device.currentValue("minCoolingSetpoint")
 
+
 	if (coolingSetpoint > maxCoolingSetpoint) {
 		coolingSetpoint = maxCoolingSetpoint
 	} else if (coolingSetpoint < minCoolingSetpoint) {
@@ -280,6 +283,7 @@ void setCoolingSetpoint(setpoint) {
 }
 
 void resumeProgram() {
+
 	log.debug "resumeProgram() is called"
 	sendEvent("name":"thermostatStatus", "value":"resuming schedule", "description":statusText, displayed: false)
 	def deviceId = device.deviceNetworkId.split(/\./).last()
@@ -350,6 +354,7 @@ def switchFanMode() {
 }
 
 def switchToFanMode(nextMode) {
+
 	log.debug "switching to fan mode: $nextMode"
 	def returnCommand
 
@@ -515,56 +520,63 @@ def fanAuto() {
 }
 
 def generateSetpointEvent() {
+
 	log.debug "Generate SetPoint Event"
 
 	def mode = device.currentValue("thermostatMode")
+	log.debug "Current Mode = ${mode}"
 
 	def heatingSetpoint = device.currentValue("heatingSetpoint")
+	log.debug "Heating Setpoint = ${heatingSetpoint}"
+
 	def coolingSetpoint = device.currentValue("coolingSetpoint")
+	log.debug "Cooling Setpoint = ${coolingSetpoint}"
+
 	def maxHeatingSetpoint = device.currentValue("maxHeatingSetpoint")
 	def maxCoolingSetpoint = device.currentValue("maxCoolingSetpoint")
 	def minHeatingSetpoint = device.currentValue("minHeatingSetpoint")
 	def minCoolingSetpoint = device.currentValue("minCoolingSetpoint")
 
-	if(location.temperatureScale == "C") {
-		maxHeatingSetpoint = maxHeatingSetpoint > 40 ? roundC(convertFtoC(maxHeatingSetpoint)) : roundC(maxHeatingSetpoint)
-		maxCoolingSetpoint = maxCoolingSetpoint > 40 ? roundC(convertFtoC(maxCoolingSetpoint)) : roundC(maxCoolingSetpoint)
-		minHeatingSetpoint = minHeatingSetpoint > 40 ? roundC(convertFtoC(minHeatingSetpoint)) : roundC(minHeatingSetpoint)
-		minCoolingSetpoint = minCoolingSetpoint > 40 ? roundC(convertFtoC(minCoolingSetpoint)) : roundC(minCoolingSetpoint)
-		heatingSetpoint = heatingSetpoint > 40 ? roundC(convertFtoC(heatingSetpoint)) : roundC(heatingSetpoint)
-		coolingSetpoint = coolingSetpoint > 40 ? roundC(convertFtoC(coolingSetpoint)) : roundC(coolingSetpoint)
-	} else {
-		maxHeatingSetpoint = maxHeatingSetpoint < 40 ? roundC(convertCtoF(maxHeatingSetpoint)) : maxHeatingSetpoint
-		maxCoolingSetpoint = maxCoolingSetpoint < 40 ? roundC(convertCtoF(maxCoolingSetpoint)) : maxCoolingSetpoint
-		minHeatingSetpoint = minHeatingSetpoint < 40 ? roundC(convertCtoF(minHeatingSetpoint)) : minHeatingSetpoint
-		minCoolingSetpoint = minCoolingSetpoint < 40 ? roundC(convertCtoF(minCoolingSetpoint)) : minCoolingSetpoint
-		heatingSetpoint = heatingSetpoint < 40 ? roundC(convertCtoF(heatingSetpoint)) : heatingSetpoint
-		coolingSetpoint = coolingSetpoint < 40 ? roundC(convertCtoF(coolingSetpoint)) : coolingSetpoint
+	if(location.temperatureScale == "C")
+	{
+		maxHeatingSetpoint = roundC(maxHeatingSetpoint)
+		maxCoolingSetpoint = roundC(maxCoolingSetpoint)
+		minHeatingSetpoint = roundC(minHeatingSetpoint)
+		minCoolingSetpoint = roundC(minCoolingSetpoint)
+		heatingSetpoint = roundC(heatingSetpoint)
+		coolingSetpoint = roundC(coolingSetpoint)
 	}
 
-	log.debug "Current Mode = ${mode}"
-	log.debug "Heating Setpoint = ${heatingSetpoint}"
-	log.debug "Cooling Setpoint = ${coolingSetpoint}"
 
 	sendEvent("name":"maxHeatingSetpoint", "value":maxHeatingSetpoint, "unit":location.temperatureScale)
 	sendEvent("name":"maxCoolingSetpoint", "value":maxCoolingSetpoint, "unit":location.temperatureScale)
 	sendEvent("name":"minHeatingSetpoint", "value":minHeatingSetpoint, "unit":location.temperatureScale)
 	sendEvent("name":"minCoolingSetpoint", "value":minCoolingSetpoint, "unit":location.temperatureScale)
-	sendEvent("name":"heatingSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
-	sendEvent("name":"coolingSetpoint", "value":coolingSetpoint, "unit":location.temperatureScale)
+
 
 	if (mode == "heat") {
+
 		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
+
 	}
 	else if (mode == "cool") {
+
 		sendEvent("name":"thermostatSetpoint", "value":coolingSetpoint, "unit":location.temperatureScale)
+
 	} else if (mode == "auto") {
+
 		sendEvent("name":"thermostatSetpoint", "value":"Auto")
+
 	} else if (mode == "off") {
+
 		sendEvent("name":"thermostatSetpoint", "value":"Off")
+
 	} else if (mode == "auxHeatOnly") {
+
 		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
+
 	}
+
 }
 
 void raiseSetpoint() {
@@ -573,31 +585,21 @@ void raiseSetpoint() {
 	def maxHeatingSetpoint = device.currentValue("maxHeatingSetpoint")
 	def maxCoolingSetpoint = device.currentValue("maxCoolingSetpoint")
 
+
 	if (mode == "off" || mode == "auto") {
 		log.warn "this mode: $mode does not allow raiseSetpoint"
 	} else {
-
 		def heatingSetpoint = device.currentValue("heatingSetpoint")
 		def coolingSetpoint = device.currentValue("coolingSetpoint")
 		def thermostatSetpoint = device.currentValue("thermostatSetpoint")
-
-		if (location.temperatureScale == "C") {
-			maxHeatingSetpoint = maxHeatingSetpoint > 40 ? convertFtoC(maxHeatingSetpoint) : maxHeatingSetpoint
-			maxCoolingSetpoint = maxCoolingSetpoint > 40 ? convertFtoC(maxCoolingSetpoint) : maxCoolingSetpoint
-			heatingSetpoint = heatingSetpoint > 40 ? convertFtoC(heatingSetpoint) : heatingSetpoint
-			coolingSetpoint = coolingSetpoint > 40 ? convertFtoC(coolingSetpoint) : coolingSetpoint
-			thermostatSetpoint = thermostatSetpoint > 40 ? convertFtoC(thermostatSetpoint) : thermostatSetpoint
-		} else {
-			maxHeatingSetpoint = maxHeatingSetpoint < 40 ? convertCtoF(maxHeatingSetpoint) : maxHeatingSetpoint
-			maxCoolingSetpoint = maxCoolingSetpoint < 40 ? convertCtoF(maxCoolingSetpoint) : maxCoolingSetpoint
-			heatingSetpoint = heatingSetpoint < 40 ? convertCtoF(heatingSetpoint) : heatingSetpoint
-			coolingSetpoint = coolingSetpoint < 40 ? convertCtoF(coolingSetpoint) : coolingSetpoint
-			thermostatSetpoint = thermostatSetpoint < 40 ? convertCtoF(thermostatSetpoint) : thermostatSetpoint
-		}
-
 		log.debug "raiseSetpoint() mode = ${mode}, heatingSetpoint: ${heatingSetpoint}, coolingSetpoint:${coolingSetpoint}, thermostatSetpoint:${thermostatSetpoint}"
 
-		targetvalue = thermostatSetpoint ? thermostatSetpoint : 0
+		if (device.latestState('thermostatSetpoint')) {
+			targetvalue = device.latestState('thermostatSetpoint').value
+			targetvalue = location.temperatureScale == "F"? targetvalue.toInteger() : targetvalue.toDouble()
+		} else {
+			targetvalue = 0
+		}
 		targetvalue = location.temperatureScale == "F"? targetvalue + 1 : targetvalue + 0.5
 
 		if ((mode == "heat" || mode == "auxHeatOnly") && targetvalue > maxHeatingSetpoint) {
@@ -620,29 +622,20 @@ void lowerSetpoint() {
 	def minHeatingSetpoint = device.currentValue("minHeatingSetpoint")
 	def minCoolingSetpoint = device.currentValue("minCoolingSetpoint")
 
+
 	if (mode == "off" || mode == "auto") {
 		log.warn "this mode: $mode does not allow lowerSetpoint"
 	} else {
 		def heatingSetpoint = device.currentValue("heatingSetpoint")
 		def coolingSetpoint = device.currentValue("coolingSetpoint")
 		def thermostatSetpoint = device.currentValue("thermostatSetpoint")
-
-		if (location.temperatureScale == "C") {
-			minHeatingSetpoint = minHeatingSetpoint > 40 ? convertFtoC(minHeatingSetpoint) : minHeatingSetpoint
-			minCoolingSetpoint = minCoolingSetpoint > 40 ? convertFtoC(minCoolingSetpoint) : minCoolingSetpoint
-			heatingSetpoint = heatingSetpoint > 40 ? convertFtoC(heatingSetpoint) : heatingSetpoint
-			coolingSetpoint = coolingSetpoint > 40 ? convertFtoC(coolingSetpoint) : coolingSetpoint
-			thermostatSetpoint = thermostatSetpoint > 40 ? convertFtoC(thermostatSetpoint) : thermostatSetpoint
-		} else {
-			minHeatingSetpoint = minHeatingSetpoint < 40 ? convertCtoF(minHeatingSetpoint) : minHeatingSetpoint
-			minCoolingSetpoint = minCoolingSetpoint < 40 ? convertCtoF(minCoolingSetpoint) : minCoolingSetpoint
-			heatingSetpoint = heatingSetpoint < 40 ? convertCtoF(heatingSetpoint) : heatingSetpoint
-			coolingSetpoint = coolingSetpoint < 40 ? convertCtoF(coolingSetpoint) : coolingSetpoint
-			thermostatSetpoint = thermostatSetpoint < 40 ? convertCtoF(thermostatSetpoint) : thermostatSetpoint
-		}
 		log.debug "lowerSetpoint() mode = ${mode}, heatingSetpoint: ${heatingSetpoint}, coolingSetpoint:${coolingSetpoint}, thermostatSetpoint:${thermostatSetpoint}"
-
-		targetvalue = thermostatSetpoint ? thermostatSetpoint : 0
+		if (device.latestState('thermostatSetpoint')) {
+			targetvalue = device.latestState('thermostatSetpoint').value
+			targetvalue = location.temperatureScale == "F"? targetvalue.toInteger() : targetvalue.toDouble()
+		} else {
+			targetvalue = 0
+		}
 		targetvalue = location.temperatureScale == "F"? targetvalue - 1 : targetvalue - 0.5
 
 		if ((mode == "heat" || mode == "auxHeatOnly") && targetvalue < minHeatingSetpoint) {
@@ -660,6 +653,7 @@ void lowerSetpoint() {
 
 //called by raiseSetpoint() and lowerSetpoint()
 void alterSetpoint(temp) {
+
 	def mode = device.currentValue("thermostatMode")
 
 	if (mode == "off" || mode == "auto") {
@@ -672,18 +666,6 @@ void alterSetpoint(temp) {
 		def targetHeatingSetpoint
 		def targetCoolingSetpoint
 
-		def temperatureScaleHasChanged = false
-
-		if (location.temperatureScale == "C") {
-			if ( heatingSetpoint > 40.0 || coolingSetpoint > 40.0 ) {
-				temperatureScaleHasChanged = true
-			}
-		} else {
-			if ( heatingSetpoint < 40.0 || coolingSetpoint < 40.0 ) {
-				temperatureScaleHasChanged = true
-			}
-		}
-
 		//step1: check thermostatMode, enforce limits before sending request to cloud
 		if (mode == "heat" || mode == "auxHeatOnly"){
 			if (temp.value > coolingSetpoint){
@@ -725,18 +707,17 @@ void alterSetpoint(temp) {
 				sendEvent("name": "thermostatSetpoint", "value": coolingSetpoint.toString(), displayed: false)
 			}
 		}
-
-		if ( temperatureScaleHasChanged )
-			generateSetpointEvent()
 		generateStatusEvent()
 	}
 }
 
 def generateStatusEvent() {
+
 	def mode = device.currentValue("thermostatMode")
 	def heatingSetpoint = device.currentValue("heatingSetpoint")
 	def coolingSetpoint = device.currentValue("coolingSetpoint")
 	def temperature = device.currentValue("temperature")
+
 	def statusText
 
 	log.debug "Generate Status Event for Mode = ${mode}"
@@ -746,25 +727,36 @@ def generateStatusEvent() {
 	log.debug "HVAC Mode = ${mode}"
 
 	if (mode == "heat") {
+
 		if (temperature >= heatingSetpoint)
 			statusText = "Right Now: Idle"
 		else
 			statusText = "Heating to ${heatingSetpoint} ${location.temperatureScale}"
+
 	} else if (mode == "cool") {
+
 		if (temperature <= coolingSetpoint)
 			statusText = "Right Now: Idle"
 		else
 			statusText = "Cooling to ${coolingSetpoint} ${location.temperatureScale}"
-	} else if (mode == "auto") {
-		statusText = "Right Now: Auto"
-	} else if (mode == "off") {
-		statusText = "Right Now: Off"
-	} else if (mode == "auxHeatOnly") {
-		statusText = "Emergency Heat"
-	} else {
-		statusText = "?"
-	}
 
+	} else if (mode == "auto") {
+
+		statusText = "Right Now: Auto"
+
+	} else if (mode == "off") {
+
+		statusText = "Right Now: Off"
+
+	} else if (mode == "auxHeatOnly") {
+
+		statusText = "Emergency Heat"
+
+	} else {
+
+		statusText = "?"
+
+	}
 	log.debug "Generate Status Event = ${statusText}"
 	sendEvent("name":"thermostatStatus", "value":statusText, "description":statusText, displayed: true)
 }
@@ -778,7 +770,7 @@ def roundC (tempC) {
 }
 
 def convertFtoC (tempF) {
-	return ((Math.round(((tempF - 32)*(5/9)) * 2))/2).toDouble()
+	return String.format("%.1f", (Math.round(((tempF - 32)*(5/9)) * 2))/2)
 }
 
 def convertCtoF (tempC) {

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

@@ -57,7 +57,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
+	sendEvent(name: "checkInterval", value: 60 * 12, data: [protocol: "lan", hubHardwareId: device.hub.hardwareID], displayed: false)
 }
 
 // parse events into attributes
@@ -172,3 +172,6 @@ def verifyPercent(percent) {
     }
 }
 
+def ping() {
+    log.debug "${parent.ping(this)}"
+}

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

@@ -45,7 +45,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
+	sendEvent(name: "checkInterval", value: 60 * 12, data: [protocol: "lan"], displayed: false)
 }
 
 // parse events into attributes
@@ -87,3 +87,6 @@ def parse(description) {
 	results
 }
 
+def ping() {
+	log.debug "${parent.ping(this)}"
+}

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

@@ -66,7 +66,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
+	sendEvent(name: "checkInterval", value: 60 * 12, data: [protocol: "lan", hubHardwareId: device.hub.hardwareID], displayed: false)
 }
 
 // parse events into attributes
@@ -188,3 +188,6 @@ def verifyPercent(percent) {
     }
 }
 
+def ping() {
+    log.trace "${parent.ping(this)}"
+}

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

@@ -50,7 +50,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
+	sendEvent(name: "checkInterval", value: 60 * 12, data: [protocol: "lan", hubHardwareId: device.hub.hardwareID], displayed: false)
 }
 
 // parse events into attributes
@@ -93,3 +93,6 @@ void refresh() {
 	parent.manualRefresh()
 }
 
+def ping() {
+    log.debug "${parent.ping(this)}"
+}

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

@@ -55,7 +55,7 @@ metadata {
 }
 
 void installed() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}")
+	sendEvent(name: "checkInterval", value: 60 * 12, data: [protocol: "lan", hubHardwareId: device.hub.hardwareID], displayed: false)
 }
 
 // parse events into attributes
@@ -107,3 +107,6 @@ void refresh() {
     parent.manualRefresh()
 }
 
+def ping() {
+    log.debug "${parent.ping(this)}"
+}

devicetypes/smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy

@@ -141,6 +141,7 @@ def setLevel(percentage) {
 		percentage = 1 // clamp to 1%
 	}
 	if (percentage == 0) {
+		sendEvent(name: "level", value: 0) // Otherwise the level value tile does not update
 		return off() // if the brightness is set to 0, just turn it off
 	}
 	parent.logErrors(logObject:log) {

devicetypes/smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy

@@ -71,6 +71,7 @@ def setLevel(percentage) {
 		percentage = 1 // clamp to 1%
 	}
 	if (percentage == 0) {
+		sendEvent(name: "level", value: 0) // Otherwise the level value tile does not update
 		return off() // if the brightness is set to 0, just turn it off
 	}
 	parent.logErrors(logObject:log) {
@@ -142,7 +143,7 @@ def poll() {
 	sendEvent(name: "model", value: data.product.name)
 
 	return []
-	}
+}
 
 def refresh() {
 	log.debug "Executing 'refresh'"

devicetypes/smartthings/my-zigbee-dimmer255.src/my-zigbee-dimmer255.groovy

@@ -0,0 +1,148 @@
+metadata {
+	// Automatically generated. Make future change here.
+	definition (name: "MY Zigbee Dimmer255", namespace: "smartthings", author: "SmartThings") {
+		capability "Actuator"
+		capability "Switch"
+		capability "Sensor"
+                capability "Switch Level"
+                capability "Refresh"
+
+		fingerprint profileId: "0104", inClusters: "0000,0003,0006,0008", outClusters: "0019"
+	}
+
+	// simulator metadata
+	simulator {
+		// status messages
+		status "on": "on/off: 1"
+		status "off": "on/off: 0"
+
+		// reply messages
+		reply "zcl on-off on": "on/off: 1"
+		reply "zcl on-off off": "on/off: 0"
+	}
+
+	// UI tile definitions
+	tiles {
+		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
+                    state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
+	            state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
+		}
+                standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
+                    state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
+                }
+                controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 3, inactiveLabel: false) {
+	            state "level", action:"switch level.setLevel"
+		}
+                valueTile("level", "device.level", inactiveLabel: false, decoration: "flat") {
+		    state "level", label:'${currentValue} %', unit:"%", backgroundColor:"#ffffff"
+		}
+
+		main "switch"
+		details (["switch","refresh","level","levelSliderControl"])
+	}
+}
+
+// Parse incoming device messages to generate events
+def parse(String description) {
+	/*if (description?.startsWith("catchall: 0104 000A")) {
+		log.debug "Dropping catchall for SmartPower Outlet"
+		return []
+	}*/
+    log.trace description
+    if (description?.startsWith("catchall:")) {
+		def msg = zigbee.parse(description)
+		log.trace msg
+		log.trace "data: $msg.data"
+        if(msg.command == 0x01){
+        	if(msg.clusterId == 0x0006 && msg.data[0] == 0x00 && msg.data[1] == 0x00){
+                def name = "switch" 
+                def value = (msg.data[4] != 0 ? "on" : "off") 
+                log.debug"name:$name,value:$value"
+                def result = createEvent(name: name, value: value)
+                return result
+            }
+        }else if(msg.command == 0x0b && msg.clusterId == 0x0006){
+        	def name = "switch" 
+            def value = (msg.data[0] != 0 ? "on" : "off") 
+            log.debug"name:$name,value:$value"
+            def result = createEvent(name: name, value: value)
+            return result
+        }
+	}else if(description?.startsWith("read attr")){
+    	def descMap = parseDescriptionAsMap(description)
+		log.debug "Read attr: $description"
+    	if(descMap.cluster == "0008" && descMap.attrId == "0000"){
+        	def name = "level" 
+            def value = Integer.parseInt(descMap.value, 16) 
+            value = Math.round(value * 100/255)
+            log.debug"name:$name,value:$value"
+            def result = createEvent(name: name, value: value)
+            return result
+        }
+    }/*else {
+    	log.debug "parse description: $description"
+		def name = description?.startsWith("on/off: ") ? "switch" : null
+		def value = name == "switch" ? (description?.endsWith(" 1") ? "on" : "off") : null
+		def result = createEvent(name: name, value: value)
+		log.debug "Parse returned ${result?.descriptionText}"
+		return result
+	}*/
+}
+
+def parseDescriptionAsMap(description) {
+	(description - "read attr - ").split(",").inject([:]) { map, param ->
+		def nameAndValue = param.split(":")
+		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
+	}
+}
+
+def refresh() {
+	log.debug "refresh()"
+    def cmds = []
+    cmds << "st rattr 0x${device.deviceNetworkId} 1 0x0006 0x0000"
+    cmds << "delay 200"
+    cmds << "st rattr 0x${device.deviceNetworkId} 1 0x0008 0x0000"
+}
+
+// Commands to device
+def on() {
+	log.debug "on()"
+    def cmds = []
+	cmds << "st cmd 0x${device.deviceNetworkId} 1 6 1 {}"
+    cmds << "delay 5000"
+    cmds << "st rattr 0x${device.deviceNetworkId} 1 0x0008 0x0000"
+}
+
+def off() {
+	log.debug "off()"
+    def cmds = []
+	cmds << "st cmd 0x${device.deviceNetworkId} 1 6 0 {}"
+    cmds << "delay 5000"
+    cmds << "st rattr 0x${device.deviceNetworkId} 1 0x0008 0x0000"
+}
+
+def setLevel(value) {
+	log.trace "setLevel($value)"
+	def cmds = []
+
+	if (value == 0) {
+		sendEvent(name: "switch", value: "off")
+		//cmds << "st cmd 0x${device.deviceNetworkId} 1 6 0 {}"
+	}
+	else if (device.latestValue("switch") == "off") {
+        sendEvent(name: "switch", value: "on")
+        //cmds << "st cmd 0x${device.deviceNetworkId} 1 6 1 {}"
+        
+	}
+    //def transitionTime = Math.round(Math.abs(((device.currentValue("level")?:0) as int) - (value as int))*0.3)
+    //def transitionTime2 = hexString(transitionTime>>8)
+    //def transitionTime1 = hexString(transitionTime%256)
+	sendEvent(name: "level", value: value)
+    def level = hexString(Math.round(value * 255/100))
+	cmds << "st cmd 0x${device.deviceNetworkId} 1 8 4 {${level} FFFF}"
+    cmds << "delay 5000"
+    cmds << "st rattr 0x${device.deviceNetworkId} 1 0x0008 0x0000"
+
+	log.debug cmds
+	cmds
+}

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

@@ -264,6 +264,7 @@ def refresh()
 {
 	log.debug "refresh temperature, humidity, and battery"
 	return zigbee.readAttribute(0xFC45, 0x0000, ["mfgCode": 0xC2DF]) +   // Original firmware
+			zigbee.readAttribute(0xFC45, 0x0000, ["mfgCode": 0x104E]) +  // New firmware
 			zigbee.readAttribute(0x0402, 0x0000) +
 			zigbee.readAttribute(0x0001, 0x0020)
 }

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

@@ -15,14 +15,12 @@ metadata {
 	definition (name: "Z-Wave Dimmer Switch Generic", namespace: "smartthings", author: "SmartThings") {
 		capability "Switch Level"
 		capability "Actuator"
-		capability "Health Check"
 		capability "Switch"
 		capability "Polling"
 		capability "Refresh"
 		capability "Sensor"
 
 		fingerprint inClusters: "0x26", deviceJoinName: "Z-Wave Dimmer"
-		fingerprint mfr:"001D", prod:"1902", deviceJoinName: "Z-Wave Dimmer"
 	}
 
 	simulator {
@@ -70,11 +68,6 @@ metadata {
 	}
 }
 
-def updated(){
-// Device-Watch simply pings if no device events received for 32min(checkInterval)
-	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-}
-
 def parse(String description) {
 	def result = null
 	if (description != "updated") {
@@ -192,13 +185,6 @@ def poll() {
 	zwave.switchMultilevelV1.switchMultilevelGet().format()
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	refresh()
-}
-
 def refresh() {
 	log.debug "refresh() is called"
 	def commands = []

devicetypes/smartthings/zwave-switch-generic.src/README.md

@@ -1,20 +1,19 @@
-# Z-wave Dimmer
+# Z-wave Switch
 
 
 
 Works with: 
 
-* [Leviton Plug-in Lamp Dimmer Module (DZPD3-1LW)](http://www.leviton.com/OA_HTML/ProductDetail.jsp?partnumber=DZPD3-1LW)
+* [Leviton Appliance Module (DZPA1-1LW)](https://support.smartthings.com/hc/en-us/articles/205881176-Leviton-Appliance-Module-DZPA1-1LW-)
+* [GE Plug-In Outdoor Smart Switch (GE 12720) (Z-Wave)](https://support.smartthings.com/hc/en-us/articles/200903080-GE-Plug-In-Outdoor-Smart-Switch-GE-12720-Z-Wave-)
 
 ## Table of contents
 
 * [Capabilities](#capabilities)
 * [Health](#device-health)
-* [Troubleshooting](#troubleshooting)
 
 ## Capabilities
 
-* **Switch Level** - it's defined to accept two parameters, the level and the rate of dimming
 * **Actuator** - represents that a Device has commands
 * **Health Check** - indicates ability to get device health notifications
 * **Switch** - can detect state (possible values: on/off)
@@ -24,7 +23,7 @@ Works with:
 
 ## Device Health
 
-A Category C5 Leviton Plug-in Lamp Dimmer Module (DZPA1-1LW) (Z-Wave) polled by the hub.
+A Category C5 Leviton Appliance Module (DZPA1-1LW) and GE Plug-In Outdoor Smart Switch (GE 12720) (Z-Wave) polled by the hub.
 As of hubCore version 0.14.38 the hub sends up reports every 15 minutes regardless of whether the state changed.
 Device-Watch allows 2 check-in misses from device plus some lag time. So Check-in interval = (2*15 + 2)mins = 32 mins.
 Not to mention after going OFFLINE when the device is plugged back in, it might take a considerable amount of time for
@@ -36,4 +35,5 @@ it is not polled for 5 minutes by the hub. This can delay up the process of bein
 If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the device is out of range.
 Pairing needs to be tried again by placing the device closer to the hub.
 Instructions related to pairing, resetting and removing the device from SmartThings can be found in the following link:
-* [Leviton Plug-in Lamp Dimmer Module (DZPD3-1LW) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices)
+* [Leviton Appliance Module (DZPA1-1LW) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/205881176-Leviton-Appliance-Module-DZPA1-1LW-)
+* [GE Plug-In Outdoor Smart Switch (GE 12720) (Z-Wave) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200903080-GE-Plug-In-Outdoor-Smart-Switch-GE-12720-Z-Wave-)

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

@@ -14,12 +14,15 @@
 metadata {
 	definition (name: "Z-Wave Switch Generic", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
+		capability "Health Check"
  		capability "Switch"
 		capability "Polling"
 		capability "Refresh"
 		capability "Sensor"
 
 		fingerprint inClusters: "0x25", deviceJoinName: "Z-Wave Switch"
+		fingerprint mfr:"001D", prod:"1A02", deviceJoinName: "Z-Wave Switch"
+		fingerprint mfr:"0063", prod:"4F50", deviceJoinName: "Z-Wave Switch"
 	}
 
 	// simulator metadata
@@ -50,6 +53,11 @@ metadata {
 	}
 }
 
+def updated(){
+// Device-Watch simply pings if no device events received for checkInterval duration of 32min = 2 * 15min + 2min lag time
+	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+}
+
 def parse(String description) {
 	def result = null
 	def cmd = zwave.parse(description, [0x20: 1, 0x70: 1])
@@ -126,6 +134,13 @@ def poll() {
 	])
 }
 
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+	refresh()
+}
+
 def refresh() {
 	delayBetween([
 		zwave.switchBinaryV1.switchBinaryGet().format(),

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

@@ -299,7 +299,6 @@ def initialize() {
     state.bridgeRefreshCount = 0
     state.bulbRefreshCount = 0
 	state.updating = false
-	setupDeviceWatch()
 	if (selectedHue) {
    		addBridge()
         addBulbs()
@@ -322,14 +321,6 @@ def uninstalled(){
 	state.username = null
 }
 
-private setupDeviceWatch() {
-	def hub = location.hubs[0]
-	// Make sure that all child devices are enrolled in device watch
-	getChildDevices().each {
-		it.sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${hub?.hub?.hardwareID}\"}")
-	}
-}
-
 private upgradeDeviceType(device, newHueType) {
 	def deviceType = getDeviceType(newHueType)
 
@@ -378,6 +369,7 @@ def addBulbs() {
 					if (d) {
 						log.debug "created ${d.displayName} with id $dni"
 						d.completedSetup = true
+						d.refresh()
 					}
 				} else {
 					log.debug "$dni in not longer paired to the Hue Bridge or ID changed"
@@ -434,11 +426,9 @@ def addBridge() {
 					d.completedSetup = true
 					log.debug "created ${d.displayName} with id ${d.deviceNetworkId}"
 					def childDevice = getChildDevice(d.deviceNetworkId)
-					childDevice?.sendEvent(name: "status", value: "Online")
-					childDevice?.sendEvent(name: "DeviceWatch-DeviceStatus", value: "online", displayed: false, isStateChange: true)
 					updateBridgeStatus(childDevice)
+					childDevice.sendEvent(name: "idNumber", value: idNumber)
 
-					childDevice?.sendEvent(name: "idNumber", value: idNumber)
 					if (vbridge.value.ip && vbridge.value.port) {
 						if (vbridge.value.ip.contains(".")) {
 							childDevice.sendEvent(name: "networkAddress", value: vbridge.value.ip + ":" +  vbridge.value.port)
@@ -715,14 +705,10 @@ def doDeviceSync(){
 private void updateBridgeStatus(childDevice) {
 	// Update activity timestamp if child device is a valid bridge
 	def vbridges = getVerifiedHueBridges()
-	def vbridge = vbridges.find {
-		"${it.value.mac}".toUpperCase() == childDevice?.device?.deviceNetworkId?.toUpperCase()
-	}
+	def vbridge = vbridges.find {"${it.value.mac}".toUpperCase() == childDevice?.device?.deviceNetworkId?.toUpperCase()}
 	vbridge?.value?.lastActivity = now()
-	if (vbridge && childDevice?.device?.currentValue("status") == "Offline") {
-		log.debug "$childDevice is back Online"
+	if(vbridge) {
 		childDevice?.sendEvent(name: "status", value: "Online")
-		childDevice?.sendEvent(name: "DeviceWatch-DeviceStatus", value: "online", displayed: false, isStateChange: true)
 	}
 }
 
@@ -736,7 +722,7 @@ private void checkBridgeStatus() {
     def time = now() - (1000 * 60 * 11)
     bridges.each {
         def d = getChildDevice(it.value.mac)
-		if (d) {
+	    if(d) {
 		    // Set id number on bridge if not done
 		    if (it.value.idNumber == null) {
 			    it.value.idNumber = getBridgeIdNumber(it.value.serialNumber)
@@ -744,24 +730,16 @@ private void checkBridgeStatus() {
 		    }
 
 			if (it.value.lastActivity < time) { // it.value.lastActivity != null &&
-				if (d.currentStatus == "Online") {
-					log.warn "$d is Offline"
+				log.warn "Bridge $it.value.idNumber is Offline"
 				d.sendEvent(name: "status", value: "Offline")
-					d.sendEvent(name: "DeviceWatch-DeviceStatus", value: "offline", displayed: false, isStateChange: true)
 
-					Calendar currentTime = Calendar.getInstance()
+				state.bulbs?.each {
+					it.value.online = false
+				}
 				getChildDevices().each {
-						def id = getId(it)
-						if (state.bulbs[id]?.online == true) {
-							state.bulbs[id]?.online = false
-							state.bulbs[id]?.unreachableSince = currentTime.getTimeInMillis()
-							it.sendEvent(name: "DeviceWatch-DeviceStatus", value: "offline", displayed: false, isStateChange: true)
+					it.sendEvent(name: "DeviceWatch-DeviceOffline", value: "offline", isStateChange: true, displayed: false)
 				}
-					}
-				}
-			} else if (d.currentStatus == "Offline") {
-				log.debug "$d is back Online"
-				d.sendEvent(name: "DeviceWatch-DeviceStatus", value: "online", displayed: false, isStateChange: true)
+			} else {
 				d.sendEvent(name: "status", value: "Online")//setOnline(false)
 			}
 		}
@@ -965,10 +943,13 @@ private handleCommandResponse(body) {
 	updates.each { childDeviceNetworkId, params ->
 		def device = getChildDevice(childDeviceNetworkId)
 		def id = getId(device)
+		// If device is offline, then don't send events which will update device watch
+		if (isOnline(id)) {
 			sendBasicEvents(device, "on", params.on)
 			sendBasicEvents(device, "bri", params.bri)
 			sendColorEvents(device, params.xy, params.hue, params.sat, params.ct)
 		}
+	}
 	return []
 }
 
@@ -1000,38 +981,39 @@ private handlePoll(body) {
 
 	def bulbs = getChildDevices()
 	for (bulb in body) {
-		def device = bulbs.find { it.deviceNetworkId == "${app.id}/${bulb.key}" }
+		def device = bulbs.find{it.deviceNetworkId == "${app.id}/${bulb.key}"}
 		if (device) {
 			if (bulb.value.state?.reachable) {
-				if (state.bulbs[bulb.key]?.online == false || state.bulbs[bulb.key]?.online == null) {
+				if (state.bulbs[bulb.key]?.online == false) {
 					// light just came back online, notify device watch
-					device.sendEvent(name: "DeviceWatch-DeviceStatus", value: "online", displayed: false, isStateChange: true)
+					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
-			} 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()
-				}
-				if (state.bulbs[bulb.key]?.online || state.bulbs[bulb.key]?.online == null) {
-					// Check if device was "unreachable" for more than 11 minutes and mark "offline" if necessary
-					if (state.bulbs[bulb.key]?.unreachableSince < time11.getTimeInMillis() || state.bulbs[bulb.key]?.online == null) {
-						log.warn "$device went Offline"
-						state.bulbs[bulb.key]?.online = false
-						device.sendEvent(name: "DeviceWatch-DeviceStatus", value: "offline", displayed: false, isStateChange: true)
-					}
-				}
-				log.warn "$device may not reachable by Hue bridge"
-			}
+
 				// If user just executed commands, then do not send events to avoid confusing the turning on/off state
 				if (!state.updating) {
 					sendBasicEvents(device, "on", bulb.value?.state?.on)
 					sendBasicEvents(device, "bri", bulb.value?.state?.bri)
 					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"
+			}
 		}
 	}
 	return []
@@ -1198,6 +1180,22 @@ def setColor(childDevice, huesettings) {
 	return "Setting color to $value"
 }
 
+def ping(childDevice) {
+	if (childDevice.device?.deviceNetworkId?.equalsIgnoreCase(selectedHue)) {
+		if (childDevice.device?.currentValue("status")?.equalsIgnoreCase("Online")) {
+			childDevice.sendEvent(name: "deviceWatch-ping", value: "ONLINE", description: "Hue Bridge is reachable", displayed: false, isStateChange: true)
+			return "Bridge is Online"
+		} else {
+			return "Bridge is Offline"
+		}
+	} else if (isOnline(getId(childDevice))) {
+		childDevice.sendEvent(name: "deviceWatch-ping", value: "ONLINE", description: "Hue Light is reachable", displayed: false, isStateChange: true)
+		return "Device is Online"
+	} else {
+		return "Device is Offline"
+	}
+}
+
 private getId(childDevice) {
 	if (childDevice.device?.deviceNetworkId?.startsWith("HUE")) {
 		return childDevice.device?.deviceNetworkId[3..-1]
@@ -1787,4 +1785,3 @@ def hsvToHex(hue, sat, value = 100){
 
 	return "#$r1$g1$b1"
 }
-