Merge pull request #1367 from surfous/DVCSMP-2134-2135-ZLL-bulb-hchk2

Add health check for:
* DVCSMP-2134 ZLL white color temperature bulb
* DVCSMP-2135 ZLL dimmer bulb

devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy

@@ -11,6 +11,9 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+import groovy.transform.Field
+
+@Field Boolean hasConfiguredHealthCheck = false
 
 metadata {
     definition (name: "ZLL Dimmer Bulb", namespace: "smartthings", author: "SmartThings") {
@@ -21,6 +24,7 @@ metadata {
         capability "Refresh"
         capability "Switch"
         capability "Switch Level"
+        capability "Health Check"
 
         //fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0000,0019"
         fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0019"
@@ -96,7 +100,38 @@ def poll() {
     refresh()
 }
 
-def configure() {
-    log.debug "Configuring Reporting and Bindings."
-    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+    return zigbee.levelRefresh()
+}
+
+def healthPoll() {
+    log.debug "healthPoll()"
+    def cmds = refresh()
+    cmds.each{ sendHubCommand(new physicalgraph.device.HubAction(it))}
+}
+
+def configureHealthCheck() {
+    Integer hcIntervalMinutes = 12
+    if (!hasConfiguredHealthCheck) {
+        log.debug "Configuring Health Check, Reporting"
+        unschedule("healthPoll")
+        runEvery5Minutes("healthPoll")
+        // Device-Watch allows 2 check-in misses from device
+        sendEvent(name: "checkInterval", value: hcIntervalMinutes * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+        hasConfiguredHealthCheck = true
+    }
+}
+
+def configure() {
+    log.debug "configure()"
+    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
+    configureHealthCheck()
+}
+
+def updated() {
+    log.debug "updated()"
+    configureHealthCheck()
 }

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

@@ -11,6 +11,9 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+import groovy.transform.Field
+
+@Field Boolean hasConfiguredHealthCheck = false
 
 metadata {
     definition (name: "ZLL White Color Temperature Bulb", namespace: "smartthings", author: "SmartThings") {
@@ -22,6 +25,7 @@ metadata {
         capability "Refresh"
         capability "Switch"
         capability "Switch Level"
+        capability "Health Check"
 
         attribute "colorName", "string"
         command "setGenericName"
@@ -96,9 +100,41 @@ def poll() {
     zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
 }
 
+/**
+ * PING is used by Device-Watch in attempt to reach the Device
+ * */
+def ping() {
+    return zigbee.levelRefresh()
+}
+
+def healthPoll() {
+    log.debug "healthPoll()"
+    def cmds = zigbee.onOffRefresh() + zigbee.levelRefresh()
+    cmds.each{ sendHubCommand(new physicalgraph.device.HubAction(it))}
+}
+
+def configureHealthCheck() {
+    Integer hcIntervalMinutes = 12
+    if (!hasConfiguredHealthCheck) {
+        log.debug "Configuring Health Check, Reporting"
+        unschedule("healthPoll")
+        runEvery5Minutes("healthPoll")
+        // Device-Watch allows 2 check-in misses from device
+        sendEvent(name: "checkInterval", value: hcIntervalMinutes * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+        hasConfiguredHealthCheck = true
+    }
+}
+
 def configure() {
-    log.debug "Configuring Reporting and Bindings."
+    log.debug "configure()"
+    configureHealthCheck()
     zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
+
+}
+
+def updated() {
+    log.debug "updated()"
+    configureHealthCheck()
 }
 
 def setColorTemperature(value) {

smartapps/smartthing-em/em-smartthings-api-app.src/em-smartthings-api-app.groovy

@@ -1,132 +0,0 @@
-/**
- *  My SmartThings API App
- *
- *  Copyright 2016 EM
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-definition(
-    name: "EM SmartThings API App",
-    namespace: "smartthing-em",
-    author: "Keval Parekh",
-    description: "This app will show the status of door sensors. ",
-    category: "Convenience",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    oauth: true)
-
-
-preferences(oauthPage: "deviceAuthorization") {
-page(name: "deviceAuthorization"){
-	section("Allow Endpoint to Control These Things...") {    
-        input "doorsensors", "capability.contactSensor", title: "Which Door?", multiple: true, required: false 
-		}
-	}
-}
-
-mappings {
-//Doors
- path("/doorsensors") {
-		action: [
-			GET: "listDoorSensors"
-		]
-	}
-    path("/doorsensors/:id") {
-		action: [
-			GET: "showDoorSensor"
-		]
-	}
-     path("/doorsensors/:id/:events") {
-		action: [
-			GET: "showDoorSensorEvents"
-		]
-	}
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"    
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-    unsubscribe()
-	initialize()
-}
-
-def initialize() {	    
-    subscribe(doorsensors, "contact.closed", DoorSensorDeviceHandler)    
-    subscribe(doorsensors, "contact.open", DoorSensorDeviceHandler)    
-}
-
-//Handler for door sensor 
-def DoorSensorDeviceHandler(evt){
-	log.debug "Door status changed to ${evt.value}"
-    //This URL will notify user for door sensor change event
-    httpPost(uri: "http://vps49294.vps.ovh.ca/fcall/webservice/smart_home/smart_home_user_notifications.php?deviceId=${evt.deviceId}&deviceValue=${evt.value}&isoDate=${evt.isoDate}") 
-    {
-    	resp -> log.debug "response data: ${resp.data}"
-	    log.debug evt.name+" Event data successfully posted"
-    }
-}
-
-//Door Sensor Methods
-
-//This method will get all door sensors
-def listDoorSensors() {
-     doorsensors?.collect{[type: "door", id: it.id, name: it.displayName, status: it.currentValue('contact')]}?.sort{it.name}
-}
-
-//This method will get detail for specified door sensor
-def showDoorSensor() {
-	show(doorsensors, "contact")    
-}
-
-//This method will fetch the event for specified door sensor
-def showDoorSensorEvents() {
-	log.debug "called....."
-    getEvents(doorsensors, "status")
-}
-
-private show(devices, type) {
-	def device = devices.find { it.id == params.id }
-	if (!device) {
-		httpError(404, "Device not found")
-	}
-	else {
-		def attributeName = type == "motionSensor" ? "motion" : type
-		def s = device.currentState(attributeName)
-		[id: device.id, label: device.displayName, value: s?.value, unitTime: s?.date?.time, type: type]
-	}
-}
-
-private getEvents(devices, type) {
-	log.debug " events data requested.."
-	def device = devices.find { it.id == params.id }
-	if (!device) {
-		httpError(404, "Device not found")
-	}
-	else {
-        def events = device.eventsSince(new Date() - 364)
-        events = events.findAll{it.name == type}
-        def result = events.collect{item(device, it)}
-	    result
-    }	
-}
-
-private item(device, s) {
-	device && s ? [uid: s.id, device_id: device.id, label: device.displayName, name: s.name, value: s.value, date: s.date] : null
-}
-
-private device(it, type) {
-	it ? [id: it.id, label: it.label, type: type] : null
-}