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

build.gradle

@@ -19,7 +19,7 @@ buildscript {
                 username smartThingsArtifactoryUserName
                 password smartThingsArtifactoryPassword
             }
-            url "https://artifactory.smartthings.com/libs-release-local"
+            url "http://artifactory.smartthings.com/libs-release-local"
         }
     }
 }
@@ -27,37 +27,9 @@ 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,9 +5,7 @@ machine:
 
 dependencies:
   override:
-    - ./gradlew dependencies -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD"
-  post:
-    - ./gradlew compileSmartappsGroovy compileDevicetypesGroovy -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD"
+    - echo "Nothing to do."
 
 test:
   override:

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

@@ -0,0 +1,37 @@
+/**
+ *  Copyright 2015 SmartThings
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ */
+metadata {
+	definition (name: "Beacon Capability", namespace: "capabilities", author: "SmartThings") {
+		capability "Beacon"
+	}
+
+	simulator {
+		status "present": "beacon: present"
+		status "not present": "beacon: not present"
+	}
+
+	tiles {
+		standardTile("beacon", "device.beacon", width: 2, height: 2) {
+			state("not present", label:'not present', icon:"st.presence.tile.not-present", backgroundColor:"#ffffff")
+			state("present", label:'present', icon:"st.presence.tile.present", backgroundColor:"#53a7c0")
+		}
+		main "beacon"
+		details "beacon"
+	}
+}
+
+def parse(String description) {
+	def pair = description.split(":")
+	createEvent(name: pair[0].trim(), value: pair[1].trim())
+}

devicetypes/dianoga/netatmo-additional-module.src/netatmo-additional-module.groovy

@@ -15,7 +15,6 @@
  */
 metadata {
 	definition (name: "Netatmo Additional Module", namespace: "dianoga", author: "Brian Steere") {
-		capability "Sensor"
 		capability "Relative Humidity Measurement"
 		capability "Temperature Measurement"
 

devicetypes/dianoga/netatmo-basestation.src/netatmo-basestation.groovy

@@ -15,7 +15,6 @@
  */
 metadata {
 	definition (name: "Netatmo Basestation", namespace: "dianoga", author: "Brian Steere") {
-		capability "Sensor"
 		capability "Relative Humidity Measurement"
 		capability "Temperature Measurement"
 

devicetypes/dianoga/netatmo-outdoor-module.src/netatmo-outdoor-module.groovy

@@ -15,7 +15,6 @@
  */
 metadata {
 	definition (name: "Netatmo Outdoor Module", namespace: "dianoga", author: "Brian Steere") {
-		capability "Sensor"
 		capability "Relative Humidity Measurement"
 		capability "Temperature Measurement"
 	}

devicetypes/dianoga/netatmo-rain.src/netatmo-rain.groovy

@@ -15,8 +15,6 @@
  */
 metadata {
 	definition (name: "Netatmo Rain", namespace: "dianoga", author: "Brian Steere") {
-		capability "Sensor"
-	
 		attribute "rain", "number"
         attribute "rainSumHour", "number"
         attribute "rainSumDay", "number"

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", label:"no motion", icon:"st.motion.motion.inactive", backgroundColor:"#79b821")
-            	attributeState("active", label:"motion", icon:"st.motion.motion.active", backgroundColor:"#ffa81e")   
+            	attributeState("inactive", icon:"st.motion.motion.inactive", backgroundColor:"#79b821")
+            	attributeState("active", icon:"st.motion.motion.active", backgroundColor:"#ffa81e")   
             }
             
             tileAttribute("device.tamper", key:"SECONDARY_CONTROL") {
@@ -127,10 +127,9 @@ def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelR
 	def map = [ displayed: true ]
     switch (cmd.sensorType) {
     	case 1:
-			def cmdScale = cmd.scale == 1 ? "F" : "C"
-			map.name = "temperature"
-            map.unit = getTemperatureScale()
-            map.value = convertTemperatureIfNeeded(cmd.scaledSensorValue, cmdScale, cmd.precision)
+        	map.name = "temperature"
+            map.unit = cmd.scale == 1 ? "F" : "C"
+            map.value = convertTemperatureIfNeeded(cmd.scaledSensorValue, map.unit, cmd.precision)
             break
     	case 3:
         	map.name = "illuminance"
@@ -279,4 +278,4 @@ private encap(physicalgraph.zwave.Command cmd) {
     } else {
     	crc16(cmd)
     }
-}
+}

devicetypes/keen-home/keen-home-smart-vent.src/keen-home-smart-vent.groovy

@@ -274,7 +274,6 @@ private Map makeTemperatureResult(value) {
         name: 'temperature',
         value: "" + value,
         descriptionText: "${linkText} is ${value}°${temperatureScale}",
-        unit: temperatureScale
     ]
 }
 

devicetypes/plaidsystems/spruce-sensor.src/spruce-sensor.groovy

@@ -254,8 +254,7 @@ private Map getTemperatureResult(value) {
 	return [
 		name: 'temperature',
 		value: value,
-		descriptionText: descriptionText,
-		unit: temperatureScale
+		descriptionText: descriptionText
 	]
 }
 

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

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

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

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

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

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

devicetypes/smartthings/arrival-sensor.src/arrival-sensor.groovy

@@ -87,27 +87,16 @@ def beep() {
 	up to this long from the time you send the message to the time you hear a sound.
 	*/
 
-	// Used source endpoint of 0x02 because we are using smartthings manufacturer specific cluster.
 	[
 		"raw 0xFC05 {15 0A 11 00 00 15 01}",
-		"delay 200",
-		"send 0x$zigbee.deviceNetworkId 0x02 0x$zigbee.endpointId",
 		"delay 7000",
 		"raw 0xFC05 {15 0A 11 00 00 15 01}",
-		"delay 200",
-		"send 0x$zigbee.deviceNetworkId 0x02 0x$zigbee.endpointId",
 		"delay 7000",
 		"raw 0xFC05 {15 0A 11 00 00 15 01}",
-		"delay 200",
-		"send 0x$zigbee.deviceNetworkId 0x02 0x$zigbee.endpointId",
 		"delay 7000",
 		"raw 0xFC05 {15 0A 11 00 00 15 01}",
-		"delay 200",
-		"send 0x$zigbee.deviceNetworkId 0x02 0x$zigbee.endpointId",
 		"delay 7000",
-		"raw 0xFC05 {15 0A 11 00 00 15 01}",
-		"delay 200",
-		"send 0x$zigbee.deviceNetworkId 0x02 0x$zigbee.endpointId",
+		"raw 0xFC05 {15 0A 11 00 00 15 01}"
 	]
 }
 

devicetypes/smartthings/bose-soundtouch.src/bose-soundtouch.groovy

@@ -47,9 +47,6 @@ metadata {
 
         command "everywhereJoin"
         command "everywhereLeave"
-
-        command "forceOff"
-        command "forceOn"
     }
 
     /**
@@ -67,9 +64,9 @@ metadata {
     }
 
     standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) {
-        state "on", label: '${name}', action: "forceOff", icon: "st.Electronics.electronics16", backgroundColor: "#79b821", nextState:"turningOff"
+        state "on", label: '${name}', action: "switch.off", icon: "st.Electronics.electronics16", backgroundColor: "#79b821", nextState:"turningOff"
         state "turningOff", label:'TURNING OFF', icon:"st.Electronics.electronics16", backgroundColor:"#ffffff"
-        state "off", label: '${name}', action: "forceOn", icon: "st.Electronics.electronics16", backgroundColor: "#ffffff", nextState:"turningOn"
+        state "off", label: '${name}', action: "switch.on", icon: "st.Electronics.electronics16", backgroundColor: "#ffffff", nextState:"turningOn"
         state "turningOn", label:'TURNING ON', icon:"st.Electronics.electronics16", backgroundColor:"#79b821"
     }
     valueTile("1", "device.station1", decoration: "flat", canChangeIcon: false) {
@@ -143,22 +140,8 @@ metadata {
  * one place.
  *
  */
-def off() {
-    if (device.currentState("switch")?.value == "on") {
-        onAction("off")
-    }
-}
-def forceOff() {
-    onAction("off")
-}
-def on() {
-    if (device.currentState("switch")?.value == "off") {
-        onAction("on")
-    }
-}
-def forceOn() {
-    onAction("on")
-}
+def off() { onAction("off") }
+def on() { onAction("on") }
 def volup() { onAction("volup") }
 def voldown() { onAction("voldown") }
 def preset1() { onAction("1") }
@@ -257,11 +240,11 @@ def onAction(String user, data=null) {
     def actions = null
     switch (user) {
         case "on":
-            boseSetPowerState(true)
+            actions = boseSetPowerState(true)
             break
         case "off":
             boseSetNowPlaying(null, "STANDBY")
-            boseSetPowerState(false)
+            actions = boseSetPowerState(false)
             break
         case "volume":
             actions = boseSetVolume(data)

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

@@ -105,21 +105,11 @@ def parseDescriptionAsMap(description) {
 
 // Commands to device
 def on() {
-	[
-			'zcl on-off on',
-			'delay 200',
-			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 500'
-	]
+	'zcl on-off on'
 }
 
 def off() {
-	[
-			'zcl on-off off',
-			'delay 200',
-			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 500'
-	]
+	'zcl on-off off'
 }
 
 def setLevel(value) {

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

@@ -89,17 +89,14 @@ def parse(String description) {
 			log.debug "TEMP"
 			map.name = "temperature"
 			map.value = getTemperature(descMap.value)
-			map.unit = temperatureScale
 		} else if (descMap.cluster == "0201" && descMap.attrId == "0011") {
 			log.debug "COOLING SETPOINT"
 			map.name = "coolingSetpoint"
 			map.value = getTemperature(descMap.value)
-			map.unit = temperatureScale
 		} else if (descMap.cluster == "0201" && descMap.attrId == "0012") {
 			log.debug "HEATING SETPOINT"
 			map.name = "heatingSetpoint"
 			map.value = getTemperature(descMap.value)
-			map.unit = temperatureScale
 		} else if (descMap.cluster == "0201" && descMap.attrId == "001c") {
 			log.debug "MODE"
 			map.name = "thermostatMode"
@@ -172,7 +169,7 @@ def setHeatingSetpoint(degrees) {
 
 		def degreesInteger = Math.round(degrees)
 		log.debug "setHeatingSetpoint({$degreesInteger} ${temperatureScale})"
-		sendEvent("name": "heatingSetpoint", "value": degreesInteger, "unit": temperatureScale)
+		sendEvent("name": "heatingSetpoint", "value": degreesInteger)
 
 		def celsius = (getTemperatureScale() == "C") ? degreesInteger : (fahrenheitToCelsius(degreesInteger) as Double).round(2)
 		"st wattr 0x${device.deviceNetworkId} 1 0x201 0x12 0x29 {" + hex(celsius * 100) + "}"
@@ -183,7 +180,7 @@ def setCoolingSetpoint(degrees) {
 	if (degrees != null) {
 		def degreesInteger = Math.round(degrees)
 		log.debug "setCoolingSetpoint({$degreesInteger} ${temperatureScale})"
-		sendEvent("name": "coolingSetpoint", "value": degreesInteger, "unit": temperatureScale)
+		sendEvent("name": "coolingSetpoint", "value": degreesInteger)
 		def celsius = (getTemperatureScale() == "C") ? degreesInteger : (fahrenheitToCelsius(degreesInteger) as Double).round(2)
 		"st wattr 0x${device.deviceNetworkId} 1 0x201 0x11 0x29 {" + hex(celsius * 100) + "}"
 	}

devicetypes/smartthings/cree-bulb.src/.st-ignore

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

devicetypes/smartthings/cree-bulb.src/README.md

@@ -1,34 +0,0 @@
-# Connected Cree LED Bulb
-
-
-
-Works with: 
-
-* [Connected Cree LED Bulb](https://support.smartthings.com/hc/en-us/articles/204258280-Cree-Connected-LED-Bulb)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-
-## Capabilities
-
-* **Actuator** - represents that a Device has commands
-* **Configuration** - _configure()_ command called when device is installed or device preferences updated
-* **Polling** - represents that poll() can be implemented for the device
-* **Refresh** - _refresh()_ command for status updates
-* **Switch** - can detect state (possible values: on/off)
-* **Switch Level** - represents current light level, usually 0-100 in percent
-* **Health Check** - indicates ability to get device health notifications
-
-## Device Health
-
-A Category C6 Connected Cree LED Bulb with maxReportTime of 5 mins.
-Check-in interval = 12 mins
-
-## Troubleshooting
-
-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:
-* [Cree Connected LED Bulb Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/204258280-Cree-Connected-LED-Bulb)

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

@@ -19,10 +19,10 @@ metadata {
 
         capability "Actuator"
         capability "Configuration"
+        capability "Polling"
         capability "Refresh"
         capability "Switch"
         capability "Switch Level"
-        capability "Health Check"
 
         fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0000,0019"
     }
@@ -85,27 +85,15 @@ def setLevel(value) {
     zigbee.setLevel(value) + ["delay 500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-    return zigbee.levelRefresh()
-}
-
 def refresh() {
-    zigbee.onOffRefresh() + zigbee.levelRefresh()
+    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig() + zigbee.levelConfig()
 }
 
-def healthPoll() {
-    log.debug "healthPoll()"
-    def cmds = zigbee.onOffRefresh() + zigbee.levelRefresh()
-    cmds.each{ sendHubCommand(new physicalgraph.device.HubAction(it))}
+def poll() {
+    zigbee.onOffRefresh() + zigbee.levelRefresh()
 }
 
 def configure() {
-    unschedule()
-    runEvery5Minutes("healthPoll")
-    // Device-Watch allows 2 check-in misses from device
-    sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-    zigbee.onOffRefresh() + zigbee.levelRefresh()
+    log.debug "Configuring Reporting and Bindings."
+    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
 }

devicetypes/smartthings/dimmer-switch.src/.st-ignore

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

devicetypes/smartthings/dimmer-switch.src/README.md

@@ -1,45 +0,0 @@
-# Z-wave Dimmer Switch
-
-
-
-Works with:
-
-* [GE Z-Wave In-Wall Smart Dimmer (GE 12724)](http://products.z-wavealliance.org/products/1197)
-* [GE Z-Wave In-Wall Smart Dimmer (Toggle) (GE 12729)](http://products.z-wavealliance.org/products/1201)
-* [GE Z-Wave Plug-in Smart Dimmer (GE 12718)](http://products.z-wavealliance.org/products/1191)
-
-## 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
-* **Indicator** - gives you the ability to set the indicator LED light on a Z-Wave switch
-* **Switch** - can detect state (possible values: on/off)
-* **Polling** - represents that poll() can be implemented for the device
-* **Refresh** - _refresh()_ command for status updates
-* **Sensor** - detects sensor events
-* **Health Check** - indicates ability to get device health notifications
-
-## Device Health
-
-Z-Wave Smart Dimmers (In-Wall, In-Wall(Toggle), Plug-In) are 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.
-Check-in interval = 32 mins.
-Not to mention after going OFFLINE when the device is plugged back in, it might take a considerable amount of time for
-the device to appear as ONLINE again. This is because if this listening device does not respond to two poll requests in a row,
-it is not polled for 5 minutes by the hub. This can delay up the process of being marked ONLINE by quite some time.
-
-## Troubleshooting
-
-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:
-* [General Z-Wave Dimmer/Switch Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200955890-Troubleshooting-GE-in-wall-switch-or-dimmer-won-t-respond-to-commands-or-automations-Z-Wave-)
-* [GE Z-Wave In-Wall Smart Dimmer (GE 12724) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200902600-GE-In-Wall-Paddle-Dimmer-Switch-GE-12724-Z-Wave-)
-* [GE Z-Wave In-Wall Smart Dimmer (Toggle) (GE 12729) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/207568463-GE-In-Wall-Smart-Toggle-Dimmer-GE-12729-Z-Wave-)
-* [GE Z-Wave Plug-in Smart Dimmer (GE 12718) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202088474-GE-Plug-In-Smart-Dimmer-GE-12718-Z-Wave-)

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

@@ -20,7 +20,6 @@ metadata {
 		capability "Polling"
 		capability "Refresh"
 		capability "Sensor"
-		capability "Health Check"
 
 		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "Z-Wave Wall Dimmer"
 		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "Z-Wave Wall Dimmer"
@@ -83,8 +82,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])
   switch (ledIndicator) {
         case "on":
             indicatorWhenOn()
@@ -218,13 +215,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/ecobee-thermostat.src/ecobee-thermostat.groovy

@@ -31,13 +31,13 @@ metadata {
 		command "switchMode"
 		command "switchFanMode"
 
-		attribute "thermostatSetpoint", "number"
-		attribute "thermostatStatus", "string"
+		attribute "thermostatSetpoint","number"
+		attribute "thermostatStatus","string"
 		attribute "maxHeatingSetpoint", "number"
 		attribute "minHeatingSetpoint", "number"
 		attribute "maxCoolingSetpoint", "number"
 		attribute "minCoolingSetpoint", "number"
-		attribute "deviceTemperatureUnit", "string"
+		attribute "deviceTemperatureUnit", "number"
 	}
 
 	tiles {
@@ -152,11 +152,11 @@ def generateEvent(Map results) {
 				sendValue =  location.temperatureScale == "C"? roundC(sendValue) : sendValue
 				isChange = isTemperatureStateChange(device, name, value.toString())
 				isDisplayed = isChange
-				event << [value: sendValue, unit: temperatureScale, isStateChange: isChange, displayed: isDisplayed]
+				event << [value: sendValue, isStateChange: isChange, displayed: isDisplayed]
 			}  else if (name=="maxCoolingSetpoint" || name=="minCoolingSetpoint" || name=="maxHeatingSetpoint" || name=="minHeatingSetpoint") {
 				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]
+				event << [value: sendValue, displayed: false]
 			}  else if (name=="heatMode" || name=="coolMode" || name=="autoMode" || name=="auxHeatMode"){
 				isChange = isStateChange(device, name, value.toString())
 				event << [value: value.toString(), isStateChange: isChange, displayed: false]
@@ -234,9 +234,9 @@ void setHeatingSetpoint(setpoint) {
 	def heatingValue = location.temperatureScale == "C"? convertCtoF(heatingSetpoint) : heatingSetpoint
 
 	def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
-	if (parent.setHold(heatingValue, coolingValue, deviceId, sendHoldType)) {
-		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
-		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint, "unit":location.temperatureScale)
+	if (parent.setHold(this, heatingValue, coolingValue, deviceId, sendHoldType)) {
+		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint)
+		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint)
 		log.debug "Done setHeatingSetpoint> coolingSetpoint: ${coolingSetpoint}, heatingSetpoint: ${heatingSetpoint}"
 		generateSetpointEvent()
 		generateStatusEvent()
@@ -271,9 +271,9 @@ void setCoolingSetpoint(setpoint) {
 	def heatingValue = location.temperatureScale == "C"? convertCtoF(heatingSetpoint) : heatingSetpoint
 
 	def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
-	if (parent.setHold(heatingValue, coolingValue, deviceId, sendHoldType)) {
-		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
-		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint, "unit":location.temperatureScale)
+	if (parent.setHold(this, heatingValue, coolingValue, deviceId, sendHoldType)) {
+		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint)
+		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint)
 		log.debug "Done setCoolingSetpoint>> coolingSetpoint = ${coolingSetpoint}, heatingSetpoint = ${heatingSetpoint}"
 		generateSetpointEvent()
 		generateStatusEvent()
@@ -287,14 +287,14 @@ void resumeProgram() {
 	log.debug "resumeProgram() is called"
 	sendEvent("name":"thermostatStatus", "value":"resuming schedule", "description":statusText, displayed: false)
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	if (parent.resumeProgram(deviceId)) {
+	if (parent.resumeProgram(this, deviceId)) {
 		sendEvent("name":"thermostatStatus", "value":"setpoint is updating", "description":statusText, displayed: false)
 		runIn(5, "poll")
 		log.debug "resumeProgram() is done"
 		sendEvent("name":"resumeProgram", "value":"resume", descriptionText: "resumeProgram is done", displayed: false, isStateChange: true)
 	} else {
 		sendEvent("name":"thermostatStatus", "value":"failed resume click refresh", "description":statusText, displayed: false)
-		log.error "Error resumeProgram() check parent.resumeProgram(deviceId)"
+		log.error "Error resumeProgram() check parent.resumeProgram(this, deviceId)"
 	}
 
 }
@@ -406,7 +406,7 @@ def generateOperatingStateEvent(operatingState) {
 def off() {
 	log.debug "off"
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	if (parent.setMode ("off", deviceId))
+	if (parent.setMode (this,"off", deviceId))
 		generateModeEvent("off")
 	else {
 		log.debug "Error setting new mode."
@@ -420,7 +420,7 @@ def off() {
 def heat() {
 	log.debug "heat"
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	if (parent.setMode ("heat", deviceId))
+	if (parent.setMode (this,"heat", deviceId))
 		generateModeEvent("heat")
 	else {
 		log.debug "Error setting new mode."
@@ -438,7 +438,7 @@ def emergencyHeat() {
 def auxHeatOnly() {
 	log.debug "auxHeatOnly"
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	if (parent.setMode ("auxHeatOnly", deviceId))
+	if (parent.setMode (this,"auxHeatOnly", deviceId))
 		generateModeEvent("auxHeatOnly")
 	else {
 		log.debug "Error setting new mode."
@@ -452,7 +452,7 @@ def auxHeatOnly() {
 def cool() {
 	log.debug "cool"
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	if (parent.setMode ("cool", deviceId))
+	if (parent.setMode (this,"cool", deviceId))
 		generateModeEvent("cool")
 	else {
 		log.debug "Error setting new mode."
@@ -466,7 +466,7 @@ def cool() {
 def auto() {
 	log.debug "auto"
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	if (parent.setMode ("auto", deviceId))
+	if (parent.setMode (this,"auto", deviceId))
 		generateModeEvent("auto")
 	else {
 		log.debug "Error setting new mode."
@@ -489,7 +489,7 @@ def fanOn() {
 	def coolingValue = location.temperatureScale == "C"? convertCtoF(coolingSetpoint) : coolingSetpoint
 	def heatingValue = location.temperatureScale == "C"? convertCtoF(heatingSetpoint) : heatingSetpoint
 
-	if (parent.setFanMode(heatingValue, coolingValue, deviceId, sendHoldType, fanMode)) {
+	if (parent.setFanMode(this, heatingValue, coolingValue, deviceId, sendHoldType, fanMode)) {
 		generateFanModeEvent(fanMode)
 	} else {
 		log.debug "Error setting new mode."
@@ -510,7 +510,7 @@ def fanAuto() {
 	def coolingValue = location.temperatureScale == "C"? convertCtoF(coolingSetpoint) : coolingSetpoint
 	def heatingValue = location.temperatureScale == "C"? convertCtoF(heatingSetpoint) : heatingSetpoint
 
-	if (parent.setFanMode(heatingValue, coolingValue, deviceId, sendHoldType, fanMode)) {
+	if (parent.setFanMode(this, heatingValue, coolingValue, deviceId, sendHoldType, fanMode)) {
 		generateFanModeEvent(fanMode)
 	} else {
 		log.debug "Error setting new mode."
@@ -556,12 +556,12 @@ def generateSetpointEvent() {
 
 	if (mode == "heat") {
 
-		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
+		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint )
 
 	}
 	else if (mode == "cool") {
 
-		sendEvent("name":"thermostatSetpoint", "value":coolingSetpoint, "unit":location.temperatureScale)
+		sendEvent("name":"thermostatSetpoint", "value":coolingSetpoint)
 
 	} else if (mode == "auto") {
 
@@ -573,7 +573,7 @@ def generateSetpointEvent() {
 
 	} else if (mode == "auxHeatOnly") {
 
-		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
+		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint)
 
 	}
 
@@ -608,7 +608,7 @@ void raiseSetpoint() {
 			targetvalue = maxCoolingSetpoint
 		}
 
-		sendEvent("name":"thermostatSetpoint", "value":targetvalue, "unit":location.temperatureScale, displayed: false)
+		sendEvent("name":"thermostatSetpoint", "value":targetvalue, displayed: false)
 		log.info "In mode $mode raiseSetpoint() to $targetvalue"
 
 		runIn(3, "alterSetpoint", [data: [value:targetvalue], overwrite: true]) //when user click button this runIn will be overwrite
@@ -644,7 +644,7 @@ void lowerSetpoint() {
 			targetvalue = minCoolingSetpoint
 		}
 
-		sendEvent("name":"thermostatSetpoint", "value":targetvalue, "unit":location.temperatureScale, displayed: false)
+		sendEvent("name":"thermostatSetpoint", "value":targetvalue, displayed: false)
 		log.info "In mode $mode lowerSetpoint() to $targetvalue"
 
 		runIn(3, "alterSetpoint", [data: [value:targetvalue], overwrite: true]) //when user click button this runIn will be overwrite
@@ -655,60 +655,55 @@ void lowerSetpoint() {
 void alterSetpoint(temp) {
 
 	def mode = device.currentValue("thermostatMode")
+	def heatingSetpoint = device.currentValue("heatingSetpoint")
+	def coolingSetpoint = device.currentValue("coolingSetpoint")
+	def deviceId = device.deviceNetworkId.split(/\./).last()
 
-	if (mode == "off" || mode == "auto") {
-		log.warn "this mode: $mode does not allow alterSetpoint"
-	} else {
-		def heatingSetpoint = device.currentValue("heatingSetpoint")
-		def coolingSetpoint = device.currentValue("coolingSetpoint")
-		def deviceId = device.deviceNetworkId.split(/\./).last()
+	def targetHeatingSetpoint
+	def targetCoolingSetpoint
 
-		def targetHeatingSetpoint
-		def targetCoolingSetpoint
-
-		//step1: check thermostatMode, enforce limits before sending request to cloud
-		if (mode == "heat" || mode == "auxHeatOnly"){
-			if (temp.value > coolingSetpoint){
-				targetHeatingSetpoint = temp.value
-				targetCoolingSetpoint = temp.value
-			} else {
-				targetHeatingSetpoint = temp.value
-				targetCoolingSetpoint = coolingSetpoint
-			}
-		} else if (mode == "cool") {
-			//enforce limits before sending request to cloud
-			if (temp.value < heatingSetpoint){
-				targetHeatingSetpoint = temp.value
-				targetCoolingSetpoint = temp.value
-			} else {
-				targetHeatingSetpoint = heatingSetpoint
-				targetCoolingSetpoint = temp.value
-			}
-		}
-
-		log.debug "alterSetpoint >> in mode ${mode} trying to change heatingSetpoint to $targetHeatingSetpoint " +
-				"coolingSetpoint to $targetCoolingSetpoint with holdType : ${holdType}"
-
-		def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
-
-		def coolingValue = location.temperatureScale == "C"? convertCtoF(targetCoolingSetpoint) : targetCoolingSetpoint
-		def heatingValue = location.temperatureScale == "C"? convertCtoF(targetHeatingSetpoint) : targetHeatingSetpoint
-
-		if (parent.setHold(heatingValue, coolingValue, deviceId, sendHoldType)) {
-			sendEvent("name": "thermostatSetpoint", "value": temp.value, displayed: false)
-			sendEvent("name": "heatingSetpoint", "value": targetHeatingSetpoint, "unit": location.temperatureScale)
-			sendEvent("name": "coolingSetpoint", "value": targetCoolingSetpoint, "unit": location.temperatureScale)
-			log.debug "alterSetpoint in mode $mode succeed change setpoint to= ${temp.value}"
+	//step1: check thermostatMode, enforce limits before sending request to cloud
+	if (mode == "heat" || mode == "auxHeatOnly"){
+		if (temp.value > coolingSetpoint){
+			targetHeatingSetpoint = temp.value
+			targetCoolingSetpoint = temp.value
 		} else {
-			log.error "Error alterSetpoint()"
-			if (mode == "heat" || mode == "auxHeatOnly"){
-				sendEvent("name": "thermostatSetpoint", "value": heatingSetpoint.toString(), displayed: false)
-			} else if (mode == "cool") {
-				sendEvent("name": "thermostatSetpoint", "value": coolingSetpoint.toString(), displayed: false)
-			}
+			targetHeatingSetpoint = temp.value
+			targetCoolingSetpoint = coolingSetpoint
+		}
+	} else if (mode == "cool") {
+		//enforce limits before sending request to cloud
+		if (temp.value < heatingSetpoint){
+			targetHeatingSetpoint = temp.value
+			targetCoolingSetpoint = temp.value
+		} else {
+			targetHeatingSetpoint = heatingSetpoint
+			targetCoolingSetpoint = temp.value
 		}
-		generateStatusEvent()
 	}
+
+	log.debug "alterSetpoint >> in mode ${mode} trying to change heatingSetpoint to $targetHeatingSetpoint " +
+			"coolingSetpoint to $targetCoolingSetpoint with holdType : ${holdType}"
+
+	def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
+
+	def coolingValue = location.temperatureScale == "C"? convertCtoF(targetCoolingSetpoint) : targetCoolingSetpoint
+	def heatingValue = location.temperatureScale == "C"? convertCtoF(targetHeatingSetpoint) : targetHeatingSetpoint
+
+	if (parent.setHold(this, heatingValue, coolingValue, deviceId, sendHoldType)) {
+		sendEvent("name": "thermostatSetpoint", "value": temp.value, displayed: false)
+		sendEvent("name": "heatingSetpoint", "value": targetHeatingSetpoint)
+		sendEvent("name": "coolingSetpoint", "value": targetCoolingSetpoint)
+		log.debug "alterSetpoint in mode $mode succeed change setpoint to= ${temp.value}"
+	} else {
+		log.error "Error alterSetpoint()"
+		if (mode == "heat" || mode == "auxHeatOnly"){
+			sendEvent("name": "thermostatSetpoint", "value": heatingSetpoint.toString(), displayed: false)
+		} else if (mode == "cool") {
+			sendEvent("name": "thermostatSetpoint", "value": coolingSetpoint.toString(), displayed: false)
+		}
+	}
+	generateStatusEvent()
 }
 
 def generateStatusEvent() {

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

@@ -682,7 +682,7 @@ def setHeatingSetpoint(degrees) {
 	def temperatureScale = getTemperatureScale()
 
 	def degreesInteger = degrees as Integer
-	sendEvent("name":"heatingSetpoint", "value":degreesInteger, "unit":temperatureScale)
+	sendEvent("name":"heatingSetpoint", "value":degreesInteger)
 
 	def celsius = (getTemperatureScale() == "C") ? degreesInteger : (fahrenheitToCelsius(degreesInteger) as Double).round(2)
 	"st wattr 0x${device.deviceNetworkId} 1 0x201 0x12 0x29 {" + hex(celsius*100) + "}"
@@ -691,7 +691,7 @@ def setHeatingSetpoint(degrees) {
 
 def setCoolingSetpoint(degrees) {
 	def degreesInteger = degrees as Integer
-	sendEvent("name":"coolingSetpoint", "value":degreesInteger, "unit":temperatureScale)
+	sendEvent("name":"coolingSetpoint", "value":degreesInteger)
 	def celsius = (getTemperatureScale() == "C") ? degreesInteger : (fahrenheitToCelsius(degreesInteger) as Double).round(2)
 	"st wattr 0x${device.deviceNetworkId} 1 0x201 0x11 0x29 {" + hex(celsius*100) + "}"
 

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

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

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

@@ -7,15 +7,8 @@
 metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Hue Bridge", namespace: "smartthings", author: "SmartThings") {
-		capability "Health Check"
-
+		attribute "serialNumber", "string"
 		attribute "networkAddress", "string"
-		// Used to indicate if bridge is reachable or not, i.e. is the bridge connected to the network
-		// Possible values "Online" or "Offline"
-		attribute "status", "string"
-		// Id is the number on the back of the hub, Hue uses last six digits of Mac address
-		// This is also used in the Hue application as ID
-		attribute "idNumber", "string"
 	}
 
 	simulator {
@@ -24,30 +17,25 @@ metadata {
 
 	tiles(scale: 2) {
      	multiAttributeTile(name:"rich-control"){
-			tileAttribute ("device.status", key: "PRIMARY_CONTROL") {
-				attributeState "Offline", label: '${currentValue}', action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#ffffff"
-	            attributeState "Online", label: '${currentValue}', action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#79b821"
+			tileAttribute ("", key: "PRIMARY_CONTROL") {
+	            attributeState "default", label: "Hue Bridge", action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#F3C200"
 			}
+	        tileAttribute ("serialNumber", key: "SECONDARY_CONTROL") {
+	            attributeState "default", label:'SN: ${currentValue}'
 			}
-		valueTile("doNotRemove", "v", decoration: "flat", height: 2, width: 6, inactiveLabel: false) {
-			state "default", label:'If removed, Hue lights will not work properly'
+        }
+		valueTile("serialNumber", "device.serialNumber", decoration: "flat", height: 1, width: 2, inactiveLabel: false) {
+			state "default", label:'SN: ${currentValue}'
 		}
-		valueTile("idNumber", "device.idNumber", decoration: "flat", height: 2, width: 6, inactiveLabel: false) {
-			state "default", label:'ID: ${currentValue}'
-		}
-		valueTile("networkAddress", "device.networkAddress", decoration: "flat", height: 2, width: 6, inactiveLabel: false) {
-			state "default", label:'IP: ${currentValue}'
+		valueTile("networkAddress", "device.networkAddress", decoration: "flat", height: 2, width: 4, inactiveLabel: false) {
+			state "default", label:'${currentValue}', height: 1, width: 2, inactiveLabel: false
 		}
 
 		main (["rich-control"])
-		details(["rich-control", "doNotRemove", "idNumber", "networkAddress"])
+		details(["rich-control", "networkAddress"])
 	}
 }
 
-void installed() {
-	sendEvent(name: "checkInterval", value: 60 * 12, data: [protocol: "lan"], displayed: false)
-}
-
 // parse events into attributes
 def parse(description) {
 	log.debug "Parsing '${description}'"
@@ -68,7 +56,7 @@ def parse(description) {
 			log.trace "HUE BRIDGE, GENERATING EVENT: $map.name: $map.value"
 			results << createEvent(name: "${map.name}", value: "${map.value}")
 		} else {
-			log.trace "Parsing description"
+        	log.trace "Parsing description"
 			def msg = parseLanMessage(description)
 			if (msg.body) {
 				def contentType = msg.headers["Content-Type"]
@@ -76,17 +64,18 @@ def parse(description) {
 					def bulbs = new groovy.json.JsonSlurper().parseText(msg.body)
 					if (bulbs.state) {
 						log.info "Bridge response: $msg.body"
+					} else {
+						// Sending Bulbs List to parent"
+                        if (parent.state.inBulbDiscovery)
+                        	log.info parent.bulbListHandler(device.hub.id, msg.body)
 					}
-				} else if (contentType?.contains("xml")) {
+				}
+				else if (contentType?.contains("xml")) {
 					log.debug "HUE BRIDGE ALREADY PRESENT"
-					parent.hubVerification(device.hub.id, msg.body)
+                    parent.hubVerification(device.hub.id, msg.body)
 				}
 			}
 		}
 	}
 	results
 }
-
-def ping() {
-	log.debug "${parent.ping(this)}"
-}

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

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

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

@@ -14,7 +14,6 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
-        capability "Health Check"
 
         command "refresh"
 	}
@@ -49,10 +48,6 @@ metadata {
     }
 }
 
-void installed() {
-	sendEvent(name: "checkInterval", value: 60 * 12, data: [protocol: "lan", hubHardwareId: device.hub.hardwareID], displayed: false)
-}
-
 // parse events into attributes
 def parse(description) {
 	log.debug "parse() - $description"
@@ -73,16 +68,20 @@ def parse(description) {
 // handle commands
 void on() {
 	log.trace parent.on(this)
+	sendEvent(name: "switch", value: "on")
 }
 
 void off() {
 	log.trace parent.off(this)
+	sendEvent(name: "switch", value: "off")
 }
 
 void setLevel(percent) {
 	log.debug "Executing 'setLevel'"
     if (percent != null && percent >= 0 && percent <= 100) {
 		parent.setLevel(this, percent)
+		sendEvent(name: "level", value: percent)
+		sendEvent(name: "switch", value: "on")
 	} else {
     	log.warn "$percent is not 0-100"
     }
@@ -92,7 +91,3 @@ void refresh() {
 	log.debug "Executing 'refresh'"
 	parent.manualRefresh()
 }
-
-def ping() {
-    log.debug "${parent.ping(this)}"
-}

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

@@ -15,7 +15,6 @@ metadata {
         capability "Color Temperature"
         capability "Switch"
         capability "Refresh"
-        capability "Health Check"
 
         command "refresh"
     }
@@ -37,12 +36,12 @@ metadata {
             }
         }
 
-        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2200..6500)") {
+        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
             state "colorTemperature", action:"color temperature.setColorTemperature"
         }
 
         valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorTemperature", label: 'WHITES'
+            state "colorTemperature", label: '${currentValue} K'
         }
 
         standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
@@ -54,10 +53,6 @@ metadata {
     }
 }
 
-void installed() {
-	sendEvent(name: "checkInterval", value: 60 * 12, data: [protocol: "lan", hubHardwareId: device.hub.hardwareID], displayed: false)
-}
-
 // parse events into attributes
 def parse(description) {
     log.debug "parse() - $description"
@@ -78,16 +73,20 @@ def parse(description) {
 // handle commands
 void on() {
     log.trace parent.on(this)
+    sendEvent(name: "switch", value: "on")
 }
 
 void off() {
     log.trace parent.off(this)
+    sendEvent(name: "switch", value: "off")
 }
 
 void setLevel(percent) {
     log.debug "Executing 'setLevel'"
     if (percent != null && percent >= 0 && percent <= 100) {
-        log.trace parent.setLevel(this, percent)
+        parent.setLevel(this, percent)
+        sendEvent(name: "level", value: percent)
+        sendEvent(name: "switch", value: "on")
     } else {
         log.warn "$percent is not 0-100"
     }
@@ -96,7 +95,9 @@ void setLevel(percent) {
 void setColorTemperature(value) {
     if (value) {
         log.trace "setColorTemperature: ${value}k"
-        log.trace parent.setColorTemperature(this, value)
+        parent.setColorTemperature(this, value)
+        sendEvent(name: "colorTemperature", value: value)
+        sendEvent(name: "switch", value: "on")
     } else {
         log.warn "Invalid color temperature"
     }
@@ -107,6 +108,3 @@ void refresh() {
     parent.manualRefresh()
 }
 
-def ping() {
-    log.debug "${parent.ping(this)}"
-}

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

@@ -147,8 +147,8 @@ private Map parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)
 	Map resultMap = [:]
 
-	resultMap.name = 'motion'
-	resultMap.value = zs.isAlarm2Set() ? 'active' : 'inactive'
+	result.name = 'motion'
+	result.value = zs.isAlarm2Set() ? 'active' : 'inactive'
 	log.debug(zs.isAlarm2Set() ? 'motion' : 'no motion')
 
 	return resultMap

devicetypes/smartthings/nyce-open-closed-sensor.src/.st-ignore

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

devicetypes/smartthings/nyce-open-closed-sensor.src/README.md

@@ -1,37 +0,0 @@
-# Nyce Door/Window Sensor (Open/Close Sensor)
-
-
-
-Works with:
-
-* [NYCE Door/Window Sensor NCZ-3011](https://support.smartthings.com/hc/en-us/articles/204576764-NYCE-Door-Window-Sensor)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Battery](#battery-specification)
-* [Troubleshooting](#troubleshooting)
-
-## Capabilities
-
-* **Configuration** - _configure()_ command called when device is installed or device preferences updated
-* **Contact Sensor** - can detect contact (with possible values - open/closed)
-* **Battery** - defines device uses a battery
-* **Refresh** - _refresh()_ command for status updates
-* **Health Check** - indicates ability to get device health notifications
-
-## Device Health
-
-A Category C2 Nyce Door/Window sensor that has 12min check-in interval
-
-## Battery Specification
-
-One 3V CR2032 battery required.
-
-## Troubleshooting
-
-If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
-Pairing needs to be tried again by placing the sensor closer to the hub.
-Instructions related to pairing, resetting and removing the sensor from SmartThings can be found in the following link:
-* [Nyce Door/Window Sensor](https://support.smartthings.com/hc/en-us/articles/204576764-NYCE-Door-Window-Sensor)

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

@@ -19,26 +19,25 @@ import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 metadata {
 	definition (name: "NYCE Open/Closed Sensor", namespace: "smartthings", author: "NYCE") {
-		capability "Battery"
+    	capability "Battery"
 		capability "Configuration"
-		capability "Contact Sensor"
+        capability "Contact Sensor"
 		capability "Refresh"
-		capability "Health Check"
-
-		command "enrollResponse"
-
-
-		fingerprint inClusters: "0000,0001,0003,0500,0020", manufacturer: "NYCE", model: "3010", deviceJoinName: "NYCE Door Hinge Sensor"
+        
+        command "enrollResponse"
+ 
+ 
+ 		fingerprint inClusters: "0000,0001,0003,0500,0020", manufacturer: "NYCE", model: "3010", deviceJoinName: "NYCE Door Hinge Sensor"
 		fingerprint inClusters: "0000,0001,0003,0406,0500,0020", manufacturer: "NYCE", model: "3011", deviceJoinName: "NYCE Door/Window Sensor"
-		fingerprint inClusters: "0000,0001,0003,0500,0020", manufacturer: "NYCE", model: "3011", deviceJoinName: "NYCE Door/Window Sensor"
-		fingerprint inClusters: "0000,0001,0003,0406,0500,0020", manufacturer: "NYCE", model: "3014", deviceJoinName: "NYCE Tilt Sensor"
-		fingerprint inClusters: "0000,0001,0003,0500,0020", manufacturer: "NYCE", model: "3014", deviceJoinName: "NYCE Tilt Sensor"
+        fingerprint inClusters: "0000,0001,0003,0500,0020", manufacturer: "NYCE", model: "3011", deviceJoinName: "NYCE Door/Window Sensor"
+        fingerprint inClusters: "0000,0001,0003,0406,0500,0020", manufacturer: "NYCE", model: "3014", deviceJoinName: "NYCE Tilt Sensor"
+        fingerprint inClusters: "0000,0001,0003,0500,0020", manufacturer: "NYCE", model: "3014", deviceJoinName: "NYCE Tilt Sensor"
 	}
-
+ 
 	simulator {
-
+ 
 	}
-
+ 
 	tiles {
 		standardTile("contact", "device.contact", width: 2, height: 2) {
 			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
@@ -274,28 +273,23 @@ private List parseIasMessage(String description) {
 	return resultListMap
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
-}
-
 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)
 
-	def enrollCmds = [
+	def configCmds = [
+			//battery reporting and heartbeat
+			"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 1 {${device.zigbeeId}} {}", "delay 200",
+			"zcl global send-me-a-report 1 0x20 0x20 600 3600 {01}", "delay 200",
+			"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500",
+
+
 			// Writes CIE attribute on end device to direct reports to the hub's EUID
 			"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
 			"send 0x${device.deviceNetworkId} 1 1", "delay 500",
 	]
 
 	log.debug "configure: Write IAS CIE"
-	// battery minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
-	return enrollCmds + zigbee.batteryConfig(30, 300) + refresh() // send refresh cmds as part of config
+	return configCmds
 }
 
 def enrollResponse() {
@@ -340,8 +334,7 @@ Integer convertHexToInt(hex) {
 
 def refresh() {
 	log.debug "Refreshing Battery"
-	def refreshCmds = [
+	[
 			"st rattr 0x${device.deviceNetworkId} ${endpointId} 1 0x20", "delay 200"
 	]
-	return refreshCmds + enrollResponse()
 }

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

@@ -21,6 +21,9 @@ metadata {
         attribute "colorName", "string"
 
         command "setAdjustedColor"
+
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Gardenspot RGB"
+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Gardenspot RGB"
     }
 
     // simulator metadata
@@ -88,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 * 100)
+                def hueValue = Math.round(convertHexToInt(descMap.value) / 255 * 360)
                 log.debug "Hue value returned is $hueValue"
                 sendEvent(name: "hue", value: hueValue, displayed:false)
             }
@@ -200,7 +203,7 @@ def setLevel(value) {
 
 //input Hue Integer values; returns color name for saturation 100%
 private getColorName(hueValue){
-    if(hueValue>100 || hueValue<0)
+    if(hueValue>360 || 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 * 100)
+                def hueValue = Math.round(convertHexToInt(descMap.value) / 255 * 360)
                 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>100 || hueValue<0)
+    if(hueValue>360 || 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-dimming-outlet.src/smartpower-dimming-outlet.groovy

@@ -133,7 +133,7 @@ def refresh() {
 }
 
 def configure() {
-	refresh() + onOffConfig() + levelConfig() + powerConfig()
+	onOffConfig() + levelConfig() + powerConfig() + refresh()
 }
 
 

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

@@ -47,21 +47,9 @@ def parse(String description) {
 
 // Commands to device
 def on() {
-	[
-			'zcl on-off on',
-			'delay 200',
-			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 500'
-
-	]
-
+	'zcl on-off on'
 }
 
 def off() {
-	[
-			'zcl on-off off',
-			'delay 200',
-			"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
-			'delay 500'
-	]
+	'zcl on-off off'
 }

devicetypes/smartthings/smartpower-outlet.src/.st-ignore

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

devicetypes/smartthings/smartpower-outlet.src/README.md

@@ -1,38 +0,0 @@
-# SmartPower Outlet
-
-
-
-Works with: 
-
-* [Samsung SmartPower Outlet](https://shop.smartthings.com/#!/products/smartpower-outlet)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-
-## Capabilities
-
-* **Configuration** - _configure()_ command called when device is installed or device preferences updated
-* **Actuator** - represents that a Device has commands
-* **Switch** - can detect state (possible values: on/off)
-* **Refresh** - _refresh()_ command for status updates
-* **Power Meter** - detects power meter for device in either w or kw.
-* **Health Check** - indicates ability to get device health notifications
-* **Sensor** - detects sensor events
-
-## Device Health
-
-A Category C1 smart power outlet with maxReportTime of 5 mins.
-Check-in interval is double the value of maxReportTime. 
-This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 12 mins
-
-## Troubleshooting
-
-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 links
-for the different models:
-* [SmartPower Outlet Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/201084854-SmartPower-Outlet)
-* [Samsung SmartThings Outlet Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/205957620)

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

@@ -16,7 +16,7 @@
 
 metadata {
 	// Automatically generated. Make future change here.
-	definition (name: "SmartPower Outlet", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "SmartPower Outlet", namespace: "smartthings", author: "SmartThings", category: "C1") {
 		capability "Actuator"
 		capability "Switch"
 		capability "Power Meter"
@@ -101,24 +101,17 @@ 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.lastOnOff == null){
+				state.lastOnOff = now()
+				sendEvent(name: "deviceWatch-lastActivity", value: state.lastOnOff, description: "Last Activity is on ${new Date(state.lastOnOff)}", displayed: false, isStateChange: true)
+			}
+			state.lastOnOff = now()
 		}
 	}
 	else {
-		def cluster = zigbee.parse(description)
-
-		if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07){
-			if (cluster.data[0] == 0x00) {
-				log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
-				sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-			}
-			else {
-				log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
-			}
-		}
-		else {
-			log.warn "DID NOT PARSE MESSAGE for description : $description"
-			log.debug "${cluster}"
-		}
+		log.warn "DID NOT PARSE MESSAGE for description : $description"
+		log.debug zigbee.parseDescriptionAsMap(description)
 	}
 }
 
@@ -130,10 +123,19 @@ def on() {
 	zigbee.on()
 }
 /**
- * PING is used by Device-Watch in attempt to reach the Device
+ * PING is used by Device-Watch in attempt to reach the Outlet
  * */
 def ping() {
-	return zigbee.onOffRefresh()
+
+	// send read attribute onOFF if the last time we heard from the outlet is outside of the checkInterval
+	if (state.lastOnOff < (now() - (1000 * device.currentValue("checkInterval"))) ){
+		log.info "ping, alive=no, lastOnOff=${new Date(state.lastOnOff)}"
+		state.lastOnOff = null
+		return zigbee.onOffRefresh()
+	} else { // if the last onOff activity is within the checkInterval we artificially create a Device-Watch event
+		log.info "ping, alive=yes, lastOnOff=${new Date(state.lastOnOff)}"
+		sendEvent(name: "deviceWatch-lastActivity", value: state.lastOnOff, description: "Last Activity is on ${new Date(state.lastOnOff)}", displayed: false, isStateChange: true)
+	}
 }
 
 def refresh() {
@@ -141,12 +143,8 @@ def refresh() {
 }
 
 def configure() {
-	// Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
-	// enrolls with default periodic reporting until newer 5 min interval is confirmed
-	sendEvent(name: "checkInterval", value: 3 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-
-	// OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
-	refresh() + zigbee.onOffConfig(0, 300) + powerConfig()
+	sendEvent(name: "checkInterval", value: 1200, displayed: false)
+	zigbee.onOffConfig() + 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/.st-ignore

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

devicetypes/smartthings/smartsense-moisture-sensor.src/README.md

@@ -1,44 +0,0 @@
-# Smartsense Moisture Sensor
-
-
-
-Works with: 
-
-* [Samsung SmartThings Moisture Sensor](https://shop.smartthings.com/#!/products/samsung-smartthings-water-leak-sensor)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Battery](#battery-specification)
-
-## Capabilities
-
-* **Configuration** - _configure()_ command called when device is installed or device preferences updated
-* **Battery** - defines device uses a battery
-* **Refresh** - _refresh()_ command for status updates
-* **Temperature Measurement** - defines device measures current temperature
-* **Water Sensor** - can detect presence of water (dry or wet)
-* **Health Check** - indicates ability to get device health notifications
-
-## Device Health
-
-A Category C2 moisture sensor with maxReportTime of 5 mins.
-Check-in interval is double the value of maxReportTime. 
-This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 12 mins
-
-## Battery Specification
-
-One CR2 3V battery required.
-
-## Troubleshooting
-
-If the sensor doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
-Pairing needs to be tried again by placing the sensor closer to the hub.
-Instructions related to pairing, resetting and removing the different sensors from SmartThings can be found in the following links
-for the different models:
-* [SmartSense Moisture Sensor Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202847044-SmartSense-Moisture-Sensor)
-* [Samsung SmartThings Water Leak Sensor Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/205957630)
-Other troubleshooting tips are listed as follows:
-* [Troubleshooting: Samsung SmartThings Water Leak Sensor won’t pair after removing pull-tab](https://support.smartthings.com/hc/en-us/articles/204966616-Troubleshooting-Samsung-SmartThings-device-won-t-pair-after-removing-pull-tab)

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

@@ -17,14 +17,14 @@ import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 
 metadata {
-	definition (name: "SmartSense Moisture Sensor",namespace: "smartthings", author: "SmartThings") {
+	definition (name: "SmartSense Moisture Sensor",namespace: "smartthings", author: "SmartThings", category: "C2") {
 		capability "Configuration"
 		capability "Battery"
 		capability "Refresh"
 		capability "Temperature Measurement"
 		capability "Water Sensor"
 		capability "Health Check"
-		capability "Sensor"
+		capability "Sensor"		
 
 		command "enrollResponse"
 
@@ -118,28 +118,14 @@ private Map parseCatchAllMessage(String description) {
 	if (shouldProcessMessage(cluster)) {
 		switch(cluster.clusterId) {
 			case 0x0001:
-				// 0x07 - configure reporting
-				if (cluster.command != 0x07) {
-					resultMap = getBatteryResult(cluster.data.last())
-				}
+				resultMap = getBatteryResult(cluster.data.last())
 				break
 
             case 0x0402:
-				if (cluster.command == 0x07) {
-					if (cluster.data[0] == 0x00){
-						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-					}
-					else {
-						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
-					}
-				}
-				else {
-					// temp is last 2 data values. reverse to swap endian
-					String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
-					def value = getTemperature(temp)
-					resultMap = getTemperatureResult(value)
-				}
+                // temp is last 2 data values. reverse to swap endian
+                String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
+                def value = getTemperature(temp)
+                resultMap = getTemperatureResult(value)
                 break
         }
     }
@@ -149,8 +135,10 @@ private Map parseCatchAllMessage(String description) {
 
 private boolean shouldProcessMessage(cluster) {
 	// 0x0B is default response indicating message got through
+	// 0x07 is bind message
 	boolean ignoredMessage = cluster.profileId != 0x0104 ||
 		cluster.command == 0x0B ||
+		cluster.command == 0x07 ||
 		(cluster.data.size() > 0 && cluster.data.first() == 0x3e)
 	return !ignoredMessage
 }
@@ -192,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
 	}
 }
 
@@ -238,8 +226,6 @@ private Map getBatteryResult(rawValue) {
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
 				def roundedPct = Math.round(pct * 100)
-				if (roundedPct <= 0)
-					roundedPct = 1
 				result.value = Math.min(100, roundedPct)
 				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}
@@ -266,8 +252,7 @@ private Map getTemperatureResult(value) {
 		name: 'temperature',
 		value: value,
 		descriptionText: descriptionText,
-		translatable: true,
-		unit: temperatureScale
+        translatable: true
 	]
 }
 
@@ -286,13 +271,6 @@ private Map getMoistureResult(value) {
 	]
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
-}
-
 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
 	def refreshCmds = [
@@ -304,13 +282,23 @@ def refresh() {
 }
 
 def configure() {
-	// Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
-	// enrolls with default periodic reporting until newer 5 min interval is confirmed
-	sendEvent(name: "checkInterval", value: 3 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 7200, displayed: false)
 
-	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
-	// battery minReport 30 seconds, maxReportTime 6 hrs by default
-	return refresh() + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) // send refresh cmds as part of config
+	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
+	log.debug "Configuring Reporting, IAS CIE, and Bindings."
+	def configCmds = [
+		"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
 }
 
 def enrollResponse() {

devicetypes/smartthings/smartsense-motion-sensor.src/README.md

@@ -9,8 +9,7 @@ Works with:
 ## Table of contents
 
 * [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Battery](#battery-specification)
+* [Health]($health)
 
 ## Capabilities
 
@@ -22,24 +21,10 @@ Works with:
 
 ## Device Health
 
-A Category C2 motion sensor with maxReportTime of 5 mins.
-Check-in interval is double the value of maxReportTime.
-This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 12 mins
+A Category C2 motion sensor that has 120min check-in interval
+
+
 
-## Battery Specification
 
-One CR2477 (for Samsung SmartThings Motion Sensor) / CR123A (SmartSense Motion Sensor) 3V battery is required.
 
-## Troubleshooting
 
-If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
-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:
-* [SmartSense Motion Sensor (original model) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200903280-SmartSense-Motion-Sensor-original-model-)
-* [SmartSense Motion Sensor (2014 model) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/203077520-SmartSense-Motion-Sensor-2014-model-)
-* [Samsung SmartThings Motion Sensor (2015 model) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/205957580-Samsung-SmartThings-Motion-Sensor-2015-model-)
-Other troubleshooting tips are listed as follows:
-* [Troubleshooting: Samsung SmartThings Motion Sensor is stuck showing "Motion Detected" or "No Motion"](https://support.smartthings.com/hc/en-us/articles/200961130-Troubleshooting-Samsung-SmartThings-Motion-Sensor-is-stuck-showing-Motion-Detected-or-No-Motion-)
-* [Troubleshooting: Samsung SmartThings Motion Sensor won’t pair after removing pull-tab](https://support.smartthings.com/hc/en-us/articles/204966616-Troubleshooting-Samsung-SmartThings-device-won-t-pair-after-removing-pull-tab)

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

@@ -17,14 +17,14 @@ import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 
 metadata {
-	definition (name: "SmartSense Motion Sensor", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "SmartSense Motion Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
 		capability "Motion Sensor"
 		capability "Configuration"
 		capability "Battery"
 		capability "Temperature Measurement"
 		capability "Refresh"
 		capability "Health Check"
-		capability "Sensor"
+		capability "Sensor"		
 
 		command "enrollResponse"
 
@@ -122,37 +122,19 @@ private Map parseCatchAllMessage(String description) {
 	if (shouldProcessMessage(cluster)) {
 		switch(cluster.clusterId) {
 			case 0x0001:
-				// 0x07 - configure reporting
-				if (cluster.command != 0x07) {
-					resultMap = getBatteryResult(cluster.data.last())
-				}
+				resultMap = getBatteryResult(cluster.data.last())
 				break
 
 			case 0x0402:
-				if (cluster.command == 0x07) {
-					if (cluster.data[0] == 0x00) {
-						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-					}
-					else {
-						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
-					}
-
-				}
-				else {
-					// temp is last 2 data values. reverse to swap endian
-					String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
-					def value = getTemperature(temp)
-					resultMap = getTemperatureResult(value)
-				}
+				// temp is last 2 data values. reverse to swap endian
+				String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
+				def value = getTemperature(temp)
+				resultMap = getTemperatureResult(value)
 				break
 
 			case 0x0406:
-				// 0x07 - configure reporting
-				if (cluster.command != 0x07) {
-					log.debug 'motion'
-					resultMap.name = 'motion'
-				}
+				log.debug 'motion'
+				resultMap.name = 'motion'
 				break
 		}
 	}
@@ -162,8 +144,10 @@ private Map parseCatchAllMessage(String description) {
 
 private boolean shouldProcessMessage(cluster) {
 	// 0x0B is default response indicating message got through
+	// 0x07 is bind message
 	boolean ignoredMessage = cluster.profileId != 0x0104 ||
 		cluster.command == 0x0B ||
+		cluster.command == 0x07 ||
 		(cluster.data.size() > 0 && cluster.data.first() == 0x3e)
 	return !ignoredMessage
 }
@@ -210,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
 	}
 }
 
@@ -257,8 +241,6 @@ private Map getBatteryResult(rawValue) {
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
 				def roundedPct = Math.round(pct * 100)
-				if (roundedPct <= 0)
-					roundedPct = 1
 				result.value = Math.min(100, roundedPct)
 				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}
@@ -285,8 +267,7 @@ private Map getTemperatureResult(value) {
 		name: 'temperature',
 		value: value,
 		descriptionText: descriptionText,
-		translatable: true,
-		unit: temperatureScale
+        translatable: true
 	]
 }
 
@@ -301,13 +282,6 @@ private Map getMotionResult(value) {
 	]
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
-}
-
 def refresh() {
 	log.debug "refresh called"
 	def refreshCmds = [
@@ -319,13 +293,24 @@ def refresh() {
 }
 
 def configure() {
-	// Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
-	// enrolls with default periodic reporting until newer 5 min interval is confirmed
-	sendEvent(name: "checkInterval", value: 3 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 7200, displayed: false)
 
-	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
-	// battery minReport 30 seconds, maxReportTime 6 hrs by default
-	return refresh() + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) // send refresh cmds as part of config
+	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
+	log.debug "Configuring Reporting, IAS CIE, and Bindings."
+
+	def configCmds = [
+		"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
 }
 
 def enrollResponse() {

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

@@ -170,7 +170,7 @@ private Map parseCustomMessage(String description) {
 
 private Map parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)
-	return (zs.isAlarm1Set() || zs.isAlarm2Set()) ? getMotionResult('active') : getMotionResult('inactive')
+	return zs.isAlarm1Set() ? getMotionResult('active') : getMotionResult('inactive')
 }
 
 def getTemperature(value) {
@@ -206,8 +206,6 @@ private Map getBatteryResult(rawValue) {
 			def maxVolts = 3.0
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
 			def roundedPct = Math.round(pct * 100)
-			if (roundedPct <= 0)
-				roundedPct = 1
 			result.value = Math.min(100, roundedPct)
 			result.descriptionText = "${linkText} battery was ${result.value}%"
 		}
@@ -228,8 +226,7 @@ private Map getTemperatureResult(value) {
 	return [
 		name: 'temperature',
 		value: value,
-		descriptionText: descriptionText,
-		unit: temperatureScale
+		descriptionText: descriptionText
 	]
 }
 
@@ -255,9 +252,13 @@ def refresh() {
 }
 
 def configure() {
+	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."
 
 	def configCmds = [
+		"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",
@@ -266,7 +267,7 @@ def configure() {
 		"zcl global send-me-a-report 0x402 0 0x29 30 3600 {6400}",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
 	]
-    return refresh() + configCmds  // send refresh cmds as part of config
+    return configCmds + refresh() // send refresh cmds as part of config
 }
 
 def enrollResponse() {

devicetypes/smartthings/smartsense-multi-sensor.src/.st-ignore

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

devicetypes/smartthings/smartsense-multi-sensor.src/README.md

@@ -1,45 +0,0 @@
-# Smartsense Multi Sensor
-
-
-
-Works with: 
-
-* [Samsung SmartThings Multi Sensor](https://shop.smartthings.com/#!/products/smartsense-multi)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Battery](#battery-specification)
-
-## Capabilities
-
-* **Three Axis** - monitors the state of a single axis
-* **Configuration** - _configure()_ command called when device is installed or device preferences updated
-* **Battery** - defines device uses a battery
-* **Sensor** - detects sensor events
-* **Contact Sensor** - can detect contact (possible values: open,closed)
-* **Acceleration Sensor** - allows for acceleration detection.
-* **Refresh** - _refresh()_ command for status updates
-* **Temperature Measurement** - defines device measures current temperature
-* **Health Check** - indicates ability to get device health notifications
-
-## Device Health
-
-A Category C2 multi sensor with maxReportTime of 5 mins.
-Check-in interval is double the value of maxReportTime. 
-This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 12 mins
-
-## Battery Specification
-
-One CR2450 (for Samsung SmartThings Multipurpose Sensor) battery / Two AAAA (for SmartSense Multi Sensor) batteries required.
-
-## Troubleshooting
-
-If the sensor doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
-Pairing needs to be tried again by placing the sensor closer to the hub.
-Other troubleshooting tips are listed as follows:
-* [Troubleshooting: Samsung SmartThings Multipurpose Sensor is stuck on "open" or "closed"](https://support.smartthings.com/hc/en-us/articles/200955940-Troubleshooting-Samsung-SmartThings-Multipurpose-Sensor-is-stuck-on-open-or-closed-)
-* [Troubleshooting: Temperature reading for the Samsung SmartThings Multipurpose Sensor is off](https://support.smartthings.com/hc/en-us/articles/200756845-Troubleshooting-Temperature-reading-for-the-Samsung-SmartThings-Multipurpose-Sensor-is-off)
-* [Troubleshooting: Samsung SmartThings Multipurpose Sensor won’t pair after removing pull-tab](https://support.smartthings.com/hc/en-us/articles/204966616-Troubleshooting-Samsung-SmartThings-device-won-t-pair-after-removing-pull-tab)

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

@@ -16,7 +16,7 @@
 import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 metadata {
-	definition (name: "SmartSense Multi Sensor", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "SmartSense Multi Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
 
 		capability "Three Axis"
 		capability "Battery"
@@ -147,33 +147,20 @@ private Map parseCatchAllMessage(String description) {
 	if (shouldProcessMessage(cluster)) {
 		switch(cluster.clusterId) {
 			case 0x0001:
-				// 0x07 - configure reporting
-				if (cluster.command != 0x07) {
-					resultMap = getBatteryResult(cluster.data.last())
-				}
+			resultMap = getBatteryResult(cluster.data.last())
 			break
 
 			case 0xFC02:
-				log.debug 'ACCELERATION'
+			log.debug 'ACCELERATION'
 			break
 
 			case 0x0402:
-				if (cluster.command == 0x07) {
-					if(cluster.data[0] == 0x00) {
-						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-					}
-					else {
-						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
-					}
-				}
-				else {
-					// temp is last 2 data values. reverse to swap endian
-					String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
-					def value = getTemperature(temp)
-					resultMap = getTemperatureResult(value)
-				}
-			break
+			log.debug 'TEMP'
+				// temp is last 2 data values. reverse to swap endian
+				String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
+				def value = getTemperature(temp)
+				resultMap = getTemperatureResult(value)
+				break
 		}
 	}
 
@@ -182,8 +169,10 @@ private Map parseCatchAllMessage(String description) {
 
 private boolean shouldProcessMessage(cluster) {
 	// 0x0B is default response indicating message got through
+	// 0x07 is bind message
 	boolean ignoredMessage = cluster.profileId != 0x0104 ||
 	cluster.command == 0x0B ||
+	cluster.command == 0x07 ||
 	(cluster.data.size() > 0 && cluster.data.first() == 0x3e)
 	return !ignoredMessage
 }
@@ -239,9 +228,9 @@ private Map parseIasMessage(String description) {
 	ZoneStatus zs = zigbee.parseZoneStatus(description)
 	Map resultMap = [:]
 
-			if (garageSensor != "Yes"){
+	if(garageSensor !=  "Yes") {
 		resultMap = zs.isAlarm1Set() ? getContactResult('open') : getContactResult('closed')
-			}
+	}
 
 	return resultMap
 }
@@ -272,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
 		}
 	}
 
@@ -317,8 +306,6 @@ private Map getBatteryResult(rawValue) {
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
 				def roundedPct = Math.round(pct * 100)
-				if (roundedPct <= 0)
-					roundedPct = 1
 				result.value = Math.min(100, roundedPct)
 				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}
@@ -339,11 +326,10 @@ private Map getTemperatureResult(value) {
 			'{{ device.displayName }} was {{ value }}°F'
 
 	return [
-		name: 'temperature',
-		value: value,
-		descriptionText: descriptionText,
-		translatable: true,
-		unit: temperatureScale
+	name: 'temperature',
+	value: value,
+	descriptionText: descriptionText,
+    translatable: true
 	]
 }
 
@@ -378,13 +364,6 @@ private getAccelerationResult(numValue) {
 	]
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
-}
-
 def refresh() {
 	log.debug "Refreshing Values "
 
@@ -412,22 +391,19 @@ def refresh() {
 }
 
 def configure() {
-	// Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
-	// enrolls with default periodic reporting until newer 5 min interval is confirmed
-	sendEvent(name: "checkInterval", value: 3 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 7200, displayed: false)
 
 	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 = zigbee.batteryConfig() +
-			zigbee.temperatureConfig(30, 300) +
+	def configCmds = enrollResponse() +
+			zigbee.batteryConfig() +
+			zigbee.temperatureConfig() +
 			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]) +
 			zigbee.configureReporting(0xFC02, 0x0014, 0x29, 1, 3600, 0x0001, [mfgCode: manufacturerCode])
 
-	return refresh() + configCmds
+	return configCmds + refresh()
 }
 
 private getEndpointId() {

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

@@ -206,8 +206,6 @@ def getTemperature(value) {
 			def maxVolts = 3.0
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
 			def roundedPct = Math.round(pct * 100)
-	        if (roundedPct <= 0)
-		        roundedPct = 1
 			result.value = Math.min(100, roundedPct)
 			result.descriptionText = "${linkText} battery was ${result.value}%"
 		}
@@ -225,10 +223,9 @@ def getTemperature(value) {
 		}
 		def descriptionText = "${linkText} was ${value}°${temperatureScale}"
 		return [
-			name: 'temperature',
-			value: value,
-			descriptionText: descriptionText,
-			unit: temperatureScale
+		name: 'temperature',
+		value: value,
+		descriptionText: descriptionText
 		]
 	}
 
@@ -277,8 +274,12 @@ def getTemperature(value) {
 def configure() {
 	sendEvent(name: "checkInterval", value: 7200, displayed: false)
 
+	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."
 	def configCmds = [
+		"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",
@@ -291,7 +292,7 @@ def configure() {
 		"zcl global send-me-a-report 0xFC02 2 0x18 30 3600 {01}",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
 	]
-	return refresh() + configCmds // send refresh cmds as part of config
+	return configCmds + refresh() // send refresh cmds as part of config
 }
 
 def enrollResponse() {

devicetypes/smartthings/smartsense-open-closed-sensor.src/.st-ignore

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

devicetypes/smartthings/smartsense-open-closed-sensor.src/README.md

@@ -1,41 +0,0 @@
-# Smartsense Open/Closed Sensor
-
-
-
-Works with: 
-
-* [Samsung SmartThings Open/Closed Sensor](https://shop.smartthings.com/#!/packs/smartsense-open-closed-sensor/)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Battery](#battery-specification)
-
-## Capabilities
-
-* **Configuration** - _configure()_ command called when device is installed or device preferences updated
-* **Battery** - defines device uses a battery
-* **Contact Sensor** - can detect contact (possible values: open,closed)
-* **Refresh** - _refresh()_ command for status updates
-* **Temperature Measurement** - defines device measures current temperature
-* **Health Check** - indicates ability to get device health notifications
-* **Sensor** - detects sensor events
-
-## Device Health
-
-A Category C2 open/closed sensor with maxReportTime of 5 mins.
-Check-in interval is double the value of maxReportTime. 
-This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 12 mins
-
-## Battery Specification
-
-One CR2 3V battery required.
-
-## Troubleshooting
-
-If the sensor doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
-Pairing needs to be tried again by placing the sensor closer to the hub.
-Instructions related to pairing, resetting and removing the sensor from SmartThings can be found in the following link:
-* [SmartSense Open/Closed Sensor Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202836844-SmartSense-Open-Closed-Sensor)

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

@@ -16,7 +16,7 @@
 import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
 
 metadata {
-	definition (name: "SmartSense Open/Closed Sensor", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "SmartSense Open/Closed Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
 		capability "Battery"
 		capability "Configuration"
 		capability "Contact Sensor"
@@ -109,28 +109,15 @@ private Map parseCatchAllMessage(String description) {
     if (shouldProcessMessage(cluster)) {
         switch(cluster.clusterId) {
             case 0x0001:
-				// 0x07 - configure reporting
-				if (cluster.command != 0x07) {
-					resultMap = getBatteryResult(cluster.data.last())
-				}
+            	resultMap = getBatteryResult(cluster.data.last())
                 break
 
             case 0x0402:
-				if (cluster.command == 0x07){
-					if (cluster.data[0] == 0x00) {
-						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-					}
-					else {
-						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
-					}
-				}
-				else {
-					// temp is last 2 data values. reverse to swap endian
-					String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
-					def value = getTemperature(temp)
-					resultMap = getTemperatureResult(value)
-				}
+                log.debug 'TEMP'
+                // temp is last 2 data values. reverse to swap endian
+                String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
+                def value = getTemperature(temp)
+                resultMap = getTemperatureResult(value)
                 break
         }
     }
@@ -140,8 +127,10 @@ private Map parseCatchAllMessage(String description) {
 
 private boolean shouldProcessMessage(cluster) {
     // 0x0B is default response indicating message got through
+    // 0x07 is bind message
     boolean ignoredMessage = cluster.profileId != 0x0104 ||
         cluster.command == 0x0B ||
+        cluster.command == 0x07 ||
         (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
     return !ignoredMessage
 }
@@ -211,8 +200,6 @@ private Map getBatteryResult(rawValue) {
     	def maxVolts = 3.0
 		def pct = (volts - minVolts) / (maxVolts - minVolts)
 		def roundedPct = Math.round(pct * 100)
-	    if (roundedPct <= 0)
-		    roundedPct = 1
 		result.value = Math.min(100, roundedPct)
 		result.descriptionText = "${linkText} battery was ${result.value}%"
 	}
@@ -232,8 +219,7 @@ private Map getTemperatureResult(value) {
 	return [
 		name: 'temperature',
 		value: value,
-		descriptionText: descriptionText,
-		unit: temperatureScale
+		descriptionText: descriptionText
 	]
 }
 
@@ -248,13 +234,6 @@ private Map getContactResult(value) {
 	]
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
-}
-
 def refresh() {
 	log.debug "Refreshing Temperature and Battery"
 	def refreshCmds = [
@@ -266,15 +245,23 @@ def refresh() {
 }
 
 def configure() {
-	// Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
-	// enrolls with default periodic reporting until newer 5 min interval is confirmed
-	sendEvent(name: "checkInterval", value: 3 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 7200, displayed: false)
 
+	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."
+	def configCmds = [
+		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 500",
 
-	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
-	// battery minReport 30 seconds, maxReportTime 6 hrs by default
-    return refresh() + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300) // send refresh cmds as part of config
+		"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
 }
 
 def enrollResponse() {

devicetypes/smartthings/smartsense-temp-humidity-sensor.src/.st-ignore

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

devicetypes/smartthings/smartsense-temp-humidity-sensor.src/README.md

@@ -1,41 +0,0 @@
-# SmartSense Temp/Humidity Sensor
-
-
-
-Works with: 
-
-* [Samsung SmartSense Temp/Humidity Sensor](https://shop.smartthings.com/#!/products/smartsense-temp-humidity-sensor)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Battery](#battery-specification)
-
-## Capabilities
-
-* **Configuration** - _configure()_ command called when device is installed or device preferences updated
-* **Battery** - defines device uses a battery
-* **Relative Humidity Measurement** - defines device measures relative humidity
-* **Refresh** - _refresh()_ command for status updates
-* **Temperature Measurement** - defines device measures current temperature
-* **Health Check** - indicates ability to get device health notifications
-* **Sensor** - detects sensor events
-
-## Device Health
-
-A Category C2 SmartSense Temp/Humidity Sensor with maxReportTime of 5 mins.
-Check-in interval is double the value of maxReportTime. 
-This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 12 mins
-
-## Battery Specification
-
-One CR2 battery is required.
-
-## Troubleshooting
-
-If the sensor doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
-Pairing needs to be tried by placing the sensor closer to the hub.
-Instructions related to pairing, resetting and removing the sensor from SmartThings can be found in the following link:
-* [Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/203040294)

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

@@ -14,7 +14,7 @@
  *
  */
 metadata {
-	definition (name: "SmartSense Temp/Humidity Sensor",namespace: "smartthings", author: "SmartThings") {
+	definition (name: "SmartSense Temp/Humidity Sensor",namespace: "smartthings", author: "SmartThings", category: "C2") {
 		capability "Configuration"
 		capability "Battery"
 		capability "Refresh"
@@ -93,37 +93,20 @@ private Map parseCatchAllMessage(String description) {
     if (shouldProcessMessage(cluster)) {
         switch(cluster.clusterId) {
             case 0x0001:
-				// 0x07 - configure reporting
-				if (cluster.command != 0x07) {
-					resultMap = getBatteryResult(cluster.data.last())
-				}
+            	resultMap = getBatteryResult(cluster.data.last())
                 break
 
             case 0x0402:
-				if (cluster.command == 0x07) {
-					if (cluster.data[0] == 0x00){
-						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-					}
-					else {
-						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
-					}
-				}
-				else {
-					// temp is last 2 data values. reverse to swap endian
-					String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
-					def value = getTemperature(temp)
-					resultMap = getTemperatureResult(value)
-				}
-				break
+                // temp is last 2 data values. reverse to swap endian
+                String temp = cluster.data[-2..-1].reverse().collect { cluster.hex1(it) }.join()
+                def value = getTemperature(temp)
+                resultMap = getTemperatureResult(value)
+                break
 
 			case 0xFC45:
-				// 0x07 - configure reporting
-				if (cluster.command != 0x07) {
-					String pctStr = cluster.data[-1, -2].collect { Integer.toHexString(it) }.join('')
-					String display = Math.round(Integer.valueOf(pctStr, 16) / 100)
-					resultMap = getHumidityResult(display)
-				}
+                String pctStr = cluster.data[-1, -2].collect { Integer.toHexString(it) }.join('')
+                String display = Math.round(Integer.valueOf(pctStr, 16) / 100)
+                resultMap = getHumidityResult(display)
                 break
         }
     }
@@ -133,8 +116,10 @@ private Map parseCatchAllMessage(String description) {
 
 private boolean shouldProcessMessage(cluster) {
     // 0x0B is default response indicating message got through
+    // 0x07 is bind message
     boolean ignoredMessage = cluster.profileId != 0x0104 ||
         cluster.command == 0x0B ||
+        cluster.command == 0x07 ||
         (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
     return !ignoredMessage
 }
@@ -222,8 +207,6 @@ private Map getBatteryResult(rawValue) {
     	def maxVolts = 3.0
 		def pct = (volts - minVolts) / (maxVolts - minVolts)
 		def roundedPct = Math.round(pct * 100)
-	    if (roundedPct <= 0)
-		    roundedPct = 1
 		result.value = Math.min(100, roundedPct)
 		result.descriptionText = "${linkText} battery was ${result.value}%"
 	}
@@ -243,47 +226,51 @@ private Map getTemperatureResult(value) {
 	return [
 		name: 'temperature',
 		value: value,
-		descriptionText: descriptionText,
-		unit: temperatureScale
+		descriptionText: descriptionText
 	]
 }
 
 private Map getHumidityResult(value) {
 	log.debug 'Humidity'
-	return value ? [name: 'humidity', value: value, unit: '%'] : [:]
-}
-
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	return zigbee.readAttribute(0x001, 0x0020) // Read the Battery Level
+	return [
+		name: 'humidity',
+		value: value,
+		unit: '%'
+	]
 }
 
 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)
+	[
+
+		"zcl mfg-code 0xC2DF", "delay 1000",
+		"zcl global read 0xFC45 0", "delay 1000",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 1000",
+        "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
+        "st rattr 0x${device.deviceNetworkId} 1 1 0x20"
+
+	]
 }
 
 def configure() {
-	// Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
-	// enrolls with default periodic reporting until newer 5 min interval is confirmed
-	sendEvent(name: "checkInterval", value: 3 * 60 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "checkInterval", value: 7200, displayed: false)
 
 	log.debug "Configuring Reporting and Bindings."
-	def humidityConfigCmds = [
+	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",
+
 		"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"
 	]
-
-	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
-	// battery minReport 30 seconds, maxReportTime 6 hrs by default
-	return refresh() + humidityConfigCmds + zigbee.batteryConfig() + zigbee.temperatureConfig(30, 300)  // send refresh cmds as part of config
+	return configCmds + refresh() // send refresh cmds as part of config
 }
 
 private hex(value) {

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

@@ -22,7 +22,6 @@ metadata {
 		capability "Contact Sensor"
 		capability "Refresh"
 		capability "Temperature Measurement"
-		capability "Health Check"
 
 		command "enrollResponse"
 
@@ -214,8 +213,7 @@ private Map getTemperatureResult(value) {
 	return [
 		name: 'temperature',
 		value: value,
-		descriptionText: descriptionText,
-		unit: temperatureScale
+		descriptionText: descriptionText
 	]
 }
 
@@ -230,42 +228,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-button.src/zigbee-button.groovy

@@ -89,8 +89,14 @@ def parse(String description) {
 }
 
 private Map parseIasButtonMessage(String description) {
-    def zs = zigbee.parseZoneStatus(description)
-    return zs.isAlarm2Set() ? getButtonResult("press") : getButtonResult("release")
+    int zoneInt = Integer.parseInt((description - "zone status 0x"), 16)
+    if (zoneInt & 0x02) {
+        resultMap = getButtonResult('press')
+    } else {
+        resultMap = getButtonResult('release')
+    }
+
+    return resultMap
 }
 
 private Map getBatteryResult(rawValue) {

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

@@ -93,5 +93,5 @@ def refresh() {
 
 def configure() {
     log.debug "Configuring Reporting and Bindings."
-    refresh()
+    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.simpleMeteringPowerConfig() + zigbee.electricMeasurementPowerConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.simpleMeteringPowerRefresh() + zigbee.electricMeasurementPowerRefresh()
 }

devicetypes/smartthings/zigbee-dimmer.src/.st-ignore

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

devicetypes/smartthings/zigbee-dimmer.src/README.md

@@ -1,36 +0,0 @@
-# OSRAM Lightify LED On/Off/Dim
-
-
-
-Works with: 
-
-* [OSRAM Lightify LED On/Off/Dim](https://shop.smartthings.com/#!/products/osram-led-smart-bulb-on-off-dim)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Battery](#battery-specification)
-
-## Capabilities
-
-* **Actuator** - represents that a Device has commands
-* **Configuration** - _configure()_ command called when device is installed or device preferences updated
-* **Refresh** - _refresh()_ command for status updates
-* **Switch** - can detect state (possible values: on/off)
-* **Switch Level** - represents current light level, usually 0-100 in percent
-* **Health Check** - indicates ability to get device health notifications
-
-## Device Health
-
-A Category C1 Zigbee dimmer with maxReportTime of 5 mins.
-Check-in interval is double the value of maxReportTime. 
-This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 12 mins
-
-## Troubleshooting
-
-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.
-Other troubleshooting tips are listed as follows:
-* [Troubleshooting:](https://support.smartthings.com/hc/en-us/articles/207191763-OSRAM-LIGHTIFY-LED-Smart-Connected-Light-A19-On-Off-Dim)

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

@@ -19,7 +19,6 @@ metadata {
         capability "Refresh"
         capability "Switch"
         capability "Switch Level"
-        capability "Health Check"
 
 
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008"
@@ -54,27 +53,11 @@ def parse(String description) {
 
     def event = zigbee.getEvent(description)
     if (event) {
-        if (event.name=="level" && event.value==0) {}
-        else {
-            sendEvent(event)
-        }
+        sendEvent(event)
     }
     else {
-        def cluster = zigbee.parse(description)
-
-        if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
-            if (cluster.data[0] == 0x00) {
-                log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
-                sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-            }
-            else {
-                log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
-            }
-        }
-        else {
-            log.warn "DID NOT PARSE MESSAGE for description : $description"
-            log.debug "${cluster}"
-        }
+        log.warn "DID NOT PARSE MESSAGE for description : $description"
+        log.debug zigbee.parseDescriptionAsMap(description)
     }
 }
 
@@ -89,23 +72,12 @@ def on() {
 def setLevel(value) {
     zigbee.setLevel(value)
 }
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-    return zigbee.onOffRefresh()
-}
 
 def refresh() {
-    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig(0, 300) + zigbee.levelConfig()
+    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig() + zigbee.levelConfig()
 }
 
 def configure() {
     log.debug "Configuring Reporting and Bindings."
-    // Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
-    // enrolls with default periodic reporting until newer 5 min interval is confirmed
-    sendEvent(name: "checkInterval", value: 3 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-
-    // OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
-    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig(0, 300) + zigbee.levelConfig()
+    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
 }

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

@@ -31,8 +31,7 @@
         fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019", manufacturer: "Yale", model: "YRD210 PB DB", deviceJoinName: "Yale Push Button Deadbolt Lock"
         fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019", manufacturer: "Yale", model: "YRD220/240 TSDB", deviceJoinName: "Yale Touch Screen Deadbolt Lock"
         fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019", manufacturer: "Yale", model: "YRL210 PB LL", deviceJoinName: "Yale Push Button Lever Lock"
-	fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019", manufacturer: "Yale", model: "YRD226/246 TSDB", deviceJoinName: "Yale Touch Screen Deadbolt Lock"
-	}
+    }
 
     tiles(scale: 2) {
 		multiAttributeTile(name:"toggle", type:"generic", width:6, height:4){
@@ -90,7 +89,7 @@ def configure() {
         zigbee.configureReporting(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING,
                                   TYPE_U8, 600, 21600, 0x01)
     log.info "configure() --- cmds: $cmds"
-    return refresh() + cmds // send refresh cmds as part of config
+    return cmds + refresh() // send refresh cmds as part of config
 }
 
 def refresh() {

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

@@ -1,154 +0,0 @@
-/**
- *  Copyright 2016 SmartThings
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- *  Author: SmartThings
- *  Date: 2016-01-19
- *
- *  This DTH should serve as the generic DTH to handle RGB ZigBee HA devices (For color bulbs with no color temperature)
- */
-
-metadata {
-	definition (name: "ZigBee RGB Bulb", namespace: "smartthings", author: "SmartThings") {
-
-		capability "Actuator"
-		capability "Color Control"
-		capability "Configuration"
-		capability "Polling"
-		capability "Refresh"
-		capability "Switch"
-		capability "Switch Level"
-		capability "Health Check"
-
-		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Gardenspot RGB", deviceJoinName: "OSRAM LIGHTIFY Gardenspot mini RGB"
-		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Gardenspot RGB", deviceJoinName: "OSRAM LIGHTIFY Gardenspot mini RGB"
-	}
-
-	// UI tile definitions
-	tiles(scale: 2) {
-		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
-			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-			}
-			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
-				attributeState "level", action:"switch level.setLevel"
-			}
-			tileAttribute ("device.color", key: "COLOR_CONTROL") {
-				attributeState "color", action:"color control.setColor"
-			}
-		}
-		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-		}
-
-		main(["switch"])
-		details(["switch", "refresh"])
-	}
-}
-
-//Globals
-private getATTRIBUTE_HUE() { 0x0000 }
-private getATTRIBUTE_SATURATION() { 0x0001 }
-private getHUE_COMMAND() { 0x00 }
-private getSATURATION_COMMAND() { 0x03 }
-private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
-
-// Parse incoming device messages to generate events
-def parse(String description) {
-	log.debug "description is $description"
-
-	def event = zigbee.getEvent(description)
-	if (event) {
-		log.debug event
-		if (event.name=="level" && event.value==0) {}
-		else {
-			sendEvent(event)
-		}
-	}
-	else {
-		def zigbeeMap = zigbee.parseDescriptionAsMap(description)
-		def cluster = zigbee.parse(description)
-
-		if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
-			if(zigbeeMap.attrInt == ATTRIBUTE_HUE){  //Hue Attribute
-				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
-				def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
-				sendEvent(name: "saturation", value: saturationValue, descriptionText: "Color has changed", displayed: false)
-			}
-		}
-		else if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
-			if (cluster.data[0] == 0x00){
-				log.debug "ON/OFF REPORTING CONFIG RESPONSE: $cluster"
-				sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-			}
-			else {
-				log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
-			}
-		}
-		else {
-			log.info "DID NOT PARSE MESSAGE for description : $description"
-			log.debug zigbeeMap
-		}
-	}
-}
-
-def on() {
-	zigbee.on()
-}
-
-def off() {
-	zigbee.off()
-}
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	return zigbee.onOffRefresh()
-}
-
-def refresh() {
-	zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION) + zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, 0x20, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, 0x20, 1, 3600, 0x01)
-}
-
-def configure() {
-	log.debug "Configuring Reporting and Bindings."
-	// Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
-	// enrolls with default periodic reporting until newer 5 min interval is confirmed
-	sendEvent(name: "checkInterval", value: 3 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-
-	// OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
-	zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, 0x20, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, 0x20, 1, 3600, 0x01) + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
-}
-
-def setLevel(value) {
-	zigbee.setLevel(value)
-}
-
-def setColor(value){
-	log.trace "setColor($value)"
-	zigbee.on() + setHue(value.hue) + "delay 500" + setSaturation(value.saturation)
-}
-
-def setHue(value) {
-	def scaledHueValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-	zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, scaledHueValue, "00", "0500")       //payload-> hue value, direction (00-> shortest distance), transition time (1/10th second) (0500 in U16 reads 5)
-}
-
-def setSaturation(value) {
-	def scaledSatValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-	zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, scaledSatValue, "0500") + "delay 1000" + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
-}

devicetypes/smartthings/zigbee-rgbw-bulb.src/.st-ignore

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

devicetypes/smartthings/zigbee-rgbw-bulb.src/README.md

@@ -1,42 +0,0 @@
-# OSRAM LIGHTIFY LED RGBW Bulb
-
-
-
-Works with: 
-
-* [OSRAM LIGHTIFY LED RGBW Bulb](https://support.smartthings.com/hc/en-us/articles/207728173-OSRAM-LIGHTIFY-LED-Smart-Connected-Light-A19-RGBW)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Battery](#battery-specification)
-
-## Capabilities
-
-* **Actuator** - It represents that a device has commands.
-* **Color Control** - It represents that the color attributes of a device can be controlled (hue, saturation, color value).
-* **Color Temperature** - It represents color temperature capability measured in degree Kelvin.
-* **Polling** - It represents that a device can be polled.
-* **Switch** - can detect state (possible values: on/off)
-* **Switch Level** - can detect current light level (0-100 in percent)
-* **Configuration** - _configure()_ command called when device is installed or device preferences updated
-* **Refresh** - _refresh()_ command for status updates
-* **Health Check** - indicates ability to get device health notifications
-
-
-## Device Health
-
-A Category C6 OSRAM LIGHTIFY LED RGBW Bulb with maxReportTime of 5 mins.
-Check-in interval is double the value of maxReportTime. 
-This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 12 mins
-
-
-## Troubleshooting
-
-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.
-It may also happen that you need to reset the device.
-Instructions related to pairing, resetting and removing the device from SmartThings can be found in the following link:
-* [Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/207728173-OSRAM-LIGHTIFY-LED-Smart-Connected-Light-A19-RGBW)

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

@@ -27,10 +27,6 @@ metadata {
         capability "Refresh"
         capability "Switch"
         capability "Switch Level"
-        capability "Health Check"
-
-        attribute "colorName", "string"
-        command "setGenericName"
 
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY LED FLEXIBLE STRIP RGBW"
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY LED FLEXIBLE STRIP RGBW"
@@ -58,15 +54,15 @@ metadata {
         controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2700..6500)") {
             state "colorTemperature", action:"color temperature.setColorTemperature"
         }
-        valueTile("colorName", "device.colorName", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorName", label: '${currentValue}'
+        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+            state "colorTemperature", label: '${currentValue} K'
         }
         standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
 
         main(["switch"])
-        details(["switch", "colorTempSliderControl", "colorName", "refresh"])
+        details(["switch", "colorTempSliderControl", "colorTemp", "refresh"])
     }
 }
 
@@ -82,43 +78,27 @@ private getATTRIBUTE_COLOR_TEMPERATURE() { 0x0007 }
 def parse(String description) {
     log.debug "description is $description"
 
-    def event = zigbee.getEvent(description)
-    if (event) {
-        log.debug event
-        if (event.name=="level" && event.value==0) {}
-        else {
-            if (event.name=="colorTemperature") {
-                setGenericName(event.value)
-            }
-            sendEvent(event)
-        }
+    def finalResult = zigbee.getEvent(description)
+    if (finalResult) {
+        log.debug finalResult
+        sendEvent(finalResult)
     }
     else {
         def zigbeeMap = zigbee.parseDescriptionAsMap(description)
-        def cluster = zigbee.parse(description)
+        log.trace "zigbeeMap : $zigbeeMap"
 
         if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
             if(zigbeeMap.attrInt == ATTRIBUTE_HUE){  //Hue Attribute
-                def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
-                sendEvent(name: "hue", value: hueValue, descriptionText: "Color has changed")
+                def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 360)
+                sendEvent(name: "hue", value: hueValue, displayed:false)
             }
             else if(zigbeeMap.attrInt == ATTRIBUTE_SATURATION){ //Saturation Attribute
                 def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
-                sendEvent(name: "saturation", value: saturationValue, descriptionText: "Color has changed", displayed: false)
-            }
-        }
-        else if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
-            if (cluster.data[0] == 0x00){
-                log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
-                sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-            }
-            else {
-                log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
+                sendEvent(name: "saturation", value: saturationValue, displayed:false)
             }
         }
         else {
             log.info "DID NOT PARSE MESSAGE for description : $description"
-            log.debug zigbeeMap
         }
     }
 }
@@ -130,49 +110,20 @@ def on() {
 def off() {
     zigbee.off()
 }
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-    return zigbee.onOffRefresh()
-}
 
 def refresh() {
-    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION) + 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(0x0300, 0x00) + zigbee.readAttribute(0x0300, ATTRIBUTE_COLOR_TEMPERATURE) + zigbee.readAttribute(0x0300, ATTRIBUTE_HUE) + zigbee.readAttribute(0x0300, ATTRIBUTE_SATURATION) + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, 0x20, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, 0x20, 1, 3600, 0x01)
 }
 
 def configure() {
     log.debug "Configuring Reporting and Bindings."
-    // Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
-    // enrolls with default periodic reporting until newer 5 min interval is confirmed
-    sendEvent(name: "checkInterval", value: 3 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-
-    // OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
-    refresh()
+    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, 0x20, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, 0x20, 1, 3600, 0x01) + zigbee.readAttribute(0x0006, 0x00) + zigbee.readAttribute(0x0008, 0x00) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, 0x00) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
 }
 
 def setColorTemperature(value) {
-    setGenericName(value)
     zigbee.setColorTemperature(value)
 }
 
-//Naming based on the wiki article here: http://en.wikipedia.org/wiki/Color_temperature
-def setGenericName(value){
-    if (value != null) {
-        def genericName = "White"
-        if (value < 3300) {
-            genericName = "Soft White"
-        } else if (value < 4150) {
-            genericName = "Moonlight"
-        } else if (value <= 5000) {
-            genericName = "Cool White"
-        } else if (value >= 5000) {
-            genericName = "Daylight"
-        }
-        sendEvent(name: "colorName", value: genericName)
-    }
-}
-
 def setLevel(value) {
     zigbee.setLevel(value)
 }
@@ -189,5 +140,5 @@ def setHue(value) {
 
 def setSaturation(value) {
     def scaledSatValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-    zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, scaledSatValue, "0500") + "delay 1000" + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+    zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, scaledSatValue, "0500")      //payload-> sat value, transition time
 }

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

@@ -82,5 +82,5 @@ def refresh() {
 
 def configure() {
     log.debug "Configuring Reporting and Bindings."
-    refresh()
+    zigbee.onOffConfig() + zigbee.simpleMeteringPowerConfig() + zigbee.electricMeasurementPowerConfig() + zigbee.onOffRefresh() + zigbee.simpleMeteringPowerRefresh() + zigbee.electricMeasurementPowerRefresh()
 }

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

@@ -78,5 +78,5 @@ def refresh() {
 
 def configure() {
     log.debug "Configuring Reporting and Bindings."
-    zigbee.onOffRefresh() + zigbee.onOffConfig()
+    zigbee.onOffConfig() + zigbee.onOffRefresh()
 }

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

@@ -134,5 +134,10 @@ def refresh() {
 
 def configure() {
     log.debug "Configuring Reporting and Bindings."
-    refresh()
+    zigbee.onOffConfig() +
+    zigbee.configureReporting(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING, TYPE_U8, 600, 21600, 1) +
+    zigbee.configureReporting(CLUSTER_BASIC, BASIC_ATTR_POWER_SOURCE, TYPE_ENUM8, 5, 21600, 1) +
+    zigbee.onOffRefresh() +
+    zigbee.readAttribute(CLUSTER_BASIC, BASIC_ATTR_POWER_SOURCE) +
+    zigbee.readAttribute(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING)
 }

devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/.st-ignore

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

devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/README.md

@@ -1,37 +0,0 @@
-# OSRAM Lightify Tunable 60 White
-
-
-
-Works with: 
-
-* [OSRAM Lightify Tunable 60 White](http://www.osram.com/osram_com/tools-and-services/tools/lightify---smart-connected-light/lightify-for-home---what-is-light-to-you/lightify-products/lightify-classic-a60-tunable-white/index.jsp)
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Battery](#battery-specification)
-
-## Capabilities
-
-* **Actuator** - represents that a Device has commands
-* **Color Temperature** - represents color temperature, measured in degrees Kelvin.
-* **Configuration** - _configure()_ command called when device is installed or device preferences updated.
-* **Refresh** - _refresh()_ command for status updates
-* **Switch** - can detect state (possible values: on/off)
-* **Switch Level** - represents current light level, usually 0-100 in percent
-* **Health Check** - indicates ability to get device health notifications
-
-## Device Health
-
-A Category C1 OSRAM Lightify Tunable 60 White with maxReportTime of 5 mins.
-Check-in interval is double the value of maxReportTime. 
-This gives the device twice the amount of time to respond before it is marked as offline.
-Check-in interval = 12 mins
-
-## Troubleshooting
-
-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.
-Other troubleshooting tips are listed as follows:
-* [Troubleshooting:](https://support.smartthings.com/hc/en-us/articles/204576454-OSRAM-LIGHTIFY-Tunable-White-60-Bulb)

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

@@ -22,7 +22,6 @@ metadata {
         capability "Actuator"
         capability "Color Temperature"
         capability "Configuration"
-        capability "Health Check"
         capability "Refresh"
         capability "Switch"
         capability "Switch Level"
@@ -36,7 +35,6 @@ metadata {
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Recessed Kit RT 5/6 Tunable White"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 TW", deviceJoinName: "OSRAM LIGHTIFY LED Tunable White 60W"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Tunable White 60W"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic B40 TW - LIGHTIFY", deviceJoinName: "OSRAM LIGHTIFY Classic B40 Tunable White"
     }
 
     // UI tile definitions
@@ -51,6 +49,9 @@ metadata {
             tileAttribute ("device.level", key: "SLIDER_CONTROL") {
                 attributeState "level", action:"switch level.setLevel"
             }
+            tileAttribute ("colorName", key: "SECONDARY_CONTROL") {
+                attributeState "colorName", label:'${currentValue}'
+            }
         }
 
         standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
@@ -60,12 +61,12 @@ metadata {
         controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2700..6500)") {
             state "colorTemperature", action:"color temperature.setColorTemperature"
         }
-        valueTile("colorName", "device.colorName", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorName", label: '${currentValue}'
+        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+            state "colorTemperature", label: '${currentValue} K'
         }
 
         main(["switch"])
-        details(["switch", "colorTempSliderControl", "colorName", "refresh"])
+        details(["switch", "colorTempSliderControl", "colorTemp", "refresh"])
     }
 }
 
@@ -74,30 +75,11 @@ def parse(String description) {
     log.debug "description is $description"
     def event = zigbee.getEvent(description)
     if (event) {
-        if (event.name=="level" && event.value==0) {}
-        else {
-            if (event.name=="colorTemperature") {
-                setGenericName(event.value)
-            }
-            sendEvent(event)
-        }
+        sendEvent(event)
     }
     else {
-        def cluster = zigbee.parse(description)
-
-        if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
-            if (cluster.data[0] == 0x00) {
-                log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
-                sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-            }
-            else {
-                log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
-            }
-        }
-        else {
-            log.warn "DID NOT PARSE MESSAGE for description : $description"
-            log.debug "${cluster}"
-        }
+        log.warn "DID NOT PARSE MESSAGE for description : $description"
+        log.debug zigbee.parseDescriptionAsMap(description)
     }
 }
 
@@ -113,25 +95,13 @@ def setLevel(value) {
     zigbee.setLevel(value)
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-    return zigbee.onOffRefresh()
-}
-
 def refresh() {
-    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh() + zigbee.onOffConfig(0, 300) + zigbee.levelConfig() + zigbee.colorTemperatureConfig()
+    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh() + zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig()
 }
 
 def configure() {
     log.debug "Configuring Reporting and Bindings."
-    // Device-Watch allows 3 check-in misses from device (plus 1 min lag time)
-    // enrolls with default periodic reporting until newer 5 min interval is confirmed
-    sendEvent(name: "checkInterval", value: 3 * 10 * 60 + 1 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-
-    // OnOff minReportTime 0 seconds, maxReportTime 5 min. Reporting interval if no activity
-    refresh()
+    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
 }
 
 def setColorTemperature(value) {

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

@@ -11,9 +11,6 @@
  *  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") {
@@ -24,7 +21,6 @@ metadata {
         capability "Refresh"
         capability "Switch"
         capability "Switch Level"
-        capability "Health Check"
 
         //fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0000,0019"
         fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0019"
@@ -100,38 +96,7 @@ def poll() {
     refresh()
 }
 
-/**
- * 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()"
+    log.debug "Configuring Reporting and Bindings."
     zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
-    configureHealthCheck()
-}
-
-def updated() {
-    log.debug "updated()"
-    configureHealthCheck()
 }

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

@@ -1,134 +0,0 @@
-/**
- *  Copyright 2016 SmartThings
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-
-metadata {
-	definition (name: "ZLL RGB Bulb", namespace: "smartthings", author: "SmartThings") {
-
-		capability "Actuator"
-		capability "Color Control"
-		capability "Configuration"
-		capability "Polling"
-		capability "Refresh"
-		capability "Switch"
-		capability "Switch Level"
-	}
-
-	// UI tile definitions
-	tiles(scale: 2) {
-		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
-			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-			}
-			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
-				attributeState "level", action:"switch level.setLevel"
-			}
-			tileAttribute ("device.color", key: "COLOR_CONTROL") {
-				attributeState "color", action:"color control.setColor"
-			}
-		}
-		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-		}
-
-		main(["switch"])
-		details(["switch", "refresh"])
-	}
-}
-
-//Globals
-private getATTRIBUTE_HUE() { 0x0000 }
-private getATTRIBUTE_SATURATION() { 0x0001 }
-private getHUE_COMMAND() { 0x00 }
-private getSATURATION_COMMAND() { 0x03 }
-private getCOLOR_CONTROL_CLUSTER() { 0x0300 }
-
-// Parse incoming device messages to generate events
-def parse(String description) {
-	log.debug "description is $description"
-
-	def finalResult = zigbee.getEvent(description)
-	if (finalResult) {
-		log.debug finalResult
-		sendEvent(finalResult)
-	}
-	else {
-		def zigbeeMap = zigbee.parseDescriptionAsMap(description)
-		log.trace "zigbeeMap : $zigbeeMap"
-
-		if (zigbeeMap?.clusterInt == COLOR_CONTROL_CLUSTER) {
-			if(zigbeeMap.attrInt == ATTRIBUTE_HUE){  //Hue Attribute
-				def hueValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 360)
-				sendEvent(name: "hue", value: hueValue, displayed:false)
-			}
-			else if(zigbeeMap.attrInt == ATTRIBUTE_SATURATION){ //Saturation Attribute
-				def saturationValue = Math.round(zigbee.convertHexToInt(zigbeeMap.value) / 255 * 100)
-				sendEvent(name: "saturation", value: saturationValue, displayed:false)
-			}
-		}
-		else {
-			log.info "DID NOT PARSE MESSAGE for description : $description"
-		}
-	}
-}
-
-def on() {
-	zigbee.on() + ["delay 1500"] + zigbee.onOffRefresh()
-}
-
-def off() {
-	zigbee.off() + ["delay 1500"] + zigbee.onOffRefresh()
-}
-
-def refresh() {
-	refreshAttributes() + configureAttributes()
-}
-
-def poll() {
-	refreshAttributes()
-}
-
-def configure() {
-	log.debug "Configuring Reporting and Bindings."
-	configureAttributes() + refreshAttributes()
-}
-
-def configureAttributes() {
-	zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE, 0x20, 1, 3600, 0x01) + zigbee.configureReporting(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION, 0x20, 1, 3600, 0x01)
-}
-
-def refreshAttributes() {
-	zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
-}
-
-def setLevel(value) {
-	zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
-}
-
-def setColor(value){
-	log.trace "setColor($value)"
-	zigbee.on() + setHue(value.hue) + ["delay 300"] + setSaturation(value.saturation) + ["delay 2000"] + refreshAttributes()
-}
-
-def setHue(value) {
-	def scaledHueValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-	zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, scaledHueValue, "00", "0500") + ["delay 1500"] + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE)      //payload-> hue value, direction (00-> shortest distance), transition time (1/10th second) (0500 in U16 reads 5)
-}
-
-def setSaturation(value) {
-	def scaledSatValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-	zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, scaledSatValue, "0500") + ["delay 1500"] + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)      //payload-> sat value, transition time
-}

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

@@ -123,7 +123,7 @@ def configureAttributes() {
 }
 
 def refreshAttributes() {
-    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh() + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE) + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)
+    zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh() + zigbee.readAttribute(0x0300, 0x00) + zigbee.readAttribute(0x0300, ATTRIBUTE_HUE) + zigbee.readAttribute(0x0300, ATTRIBUTE_SATURATION)
 }
 
 def setColorTemperature(value) {
@@ -141,10 +141,10 @@ def setColor(value){
 
 def setHue(value) {
     def scaledHueValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-    zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, scaledHueValue, "00", "0500") + ["delay 1500"] + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_HUE)       //payload-> hue value, direction (00-> shortest distance), transition time (1/10th second) (0500 in U16 reads 5)
+    zigbee.command(COLOR_CONTROL_CLUSTER, HUE_COMMAND, scaledHueValue, "00", "0500")       //payload-> hue value, direction (00-> shortest distance), transition time (1/10th second) (0500 in U16 reads 5)
 }
 
 def setSaturation(value) {
     def scaledSatValue = zigbee.convertToHexString(Math.round(value * 0xfe / 100.0), 2)
-    zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, scaledSatValue, "0500") + ["delay 1500"] + zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_SATURATION)      //payload-> sat value, transition time
+    zigbee.command(COLOR_CONTROL_CLUSTER, SATURATION_COMMAND, scaledSatValue, "0500")      //payload-> sat value, transition time
 }

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

@@ -11,9 +11,6 @@
  *  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") {
@@ -25,7 +22,6 @@ metadata {
         capability "Refresh"
         capability "Switch"
         capability "Switch Level"
-        capability "Health Check"
 
         attribute "colorName", "string"
         command "setGenericName"
@@ -100,41 +96,9 @@ 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 "configure()"
-    configureHealthCheck()
+    log.debug "Configuring Reporting and Bindings."
     zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.colorTemperatureConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.colorTemperatureRefresh()
-
-}
-
-def updated() {
-    log.debug "updated()"
-    configureHealthCheck()
 }
 
 def setColorTemperature(value) {

devicetypes/smartthings/zwave-switch-generic.src/.st-ignore

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

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

@@ -1,39 +0,0 @@
-# Z-wave Switch
-
-
-
-Works with: 
-
-* [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)
-
-## Capabilities
-
-* **Actuator** - represents that a Device has commands
-* **Health Check** - indicates ability to get device health notifications
-* **Switch** - can detect state (possible values: on/off)
-* **Polling** - represents that poll() can be implemented for the device
-* **Refresh** - _refresh()_ command for status updates
-* **Sensor** - detects sensor events
-
-## Device Health
-
-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
-the device to appear as ONLINE again. This is because if this listening device does not respond to two poll requests in a row,
-it is not polled for 5 minutes by the hub. This can delay up the process of being marked ONLINE by quite some time.
-
-## Troubleshooting
-
-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 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,15 +14,12 @@
 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
@@ -53,11 +50,6 @@ 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])
@@ -134,13 +126,6 @@ def poll() {
 	])
 }
 
-/**
- * PING is used by Device-Watch in attempt to reach the Device
- * */
-def ping() {
-	refresh()
-}
-
 def refresh() {
 	delayBetween([
 		zwave.switchBinaryV1.switchBinaryGet().format(),

devicetypes/smartthings/zwave-switch.src/.st-ignore

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

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

@@ -1,49 +0,0 @@
-# Z-Wave Switch
-
-
-Works with: 
-
-* [GE Z-Wave Plug-In Smart Switch (12719)](http://products.z-wavealliance.org/products/1193)
-* [GE Z-Wave In-Wall Smart Outlet (12721)](http://products.z-wavealliance.org/products/1195)
-* [GE Z-Wave In-Wall Smart Switch (12722)](http://products.z-wavealliance.org/products/1196)
-* [GE Z-Wave In-Wall Smart Toggle Switch (12727)](http://products.z-wavealliance.org/products/1200)
-
-
-## Table of contents
-
-* [Capabilities](#capabilities)
-* [Health](#device-health)
-* [Troubleshooting](#Troubleshooting)
-
-## Capabilities
-
-* **Actuator** - represents that a Device has commands
-* **Indicator** - gives you the ability to set the indicator LED light on a Z-Wave switch
-* **Switch** - can detect state (possible values: on/off)
-* **Polling** - represents that poll() can be implemented for the device
-* **Refresh** - _refresh()_ command for status updates
-* **Sensor** - detects sensor events
-* **Health Check** - indicates ability to get device health notifications
-
-## Device Health
-
-Z-Wave Switches (Plug-In, In-Wall(Toggle Switch, Switch, Outlet)) are 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
-the device to appear as ONLINE again. This is because if this listening device does not respond to two poll requests in a row,
-it is not polled for 5 minutes by the hub. This can delay up the process of being marked ONLINE by quite some time.
-
-
-## Troubleshooting
-
-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:
-* [General Z-Wave Dimmer/Switch Troubleshooting](https://support.smartthings.com/hc/en-us/articles/200955890-Troubleshooting-GE-in-wall-switch-or-dimmer-won-t-respond-to-commands-or-automations-Z-Wave-)
-* [GE Z-Wave Plug-In Smart Switch (12719) Troubleshooting](https://support.smartthings.com/hc/en-us/articles/200903070-GE-Plug-In-Smart-Switch-GE-12719-Z-Wave)
-* [GE Z-Wave In-Wall Smart Outlet (12721) Troubleshooting](https://support.smartthings.com/hc/en-us/articles/200903020-GE-In-Wall-Smart-Outlet-GE-12721-Z-Wave)
-* [GE Z-Wave In-Wall Smart Switch (12722) Troubleshooting](https://support.smartthings.com/hc/en-us/articles/200902540-GE-In-Wall-Smart-Switch-GE-12722-Z-Wave)
-* [GE Z-Wave In-Wall Smart Toggle Switch (12727) Troubleshooting](https://support.smartthings.com/hc/en-us/articles/207568933-GE-In-Wall-Smart-Toggle-Switch-GE-12727-Z-Wave)
-
-

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

@@ -19,7 +19,6 @@ metadata {
 		capability "Polling"
 		capability "Refresh"
 		capability "Sensor"
-		capability "Health Check"
 
 		fingerprint mfr:"0063", prod:"4952", deviceJoinName: "Z-Wave Wall Switch"
 		fingerprint mfr:"0063", prod:"5257", deviceJoinName: "Z-Wave Wall Switch"
@@ -65,8 +64,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])
   switch (ledIndicator) {
         case "on":
             indicatorWhenOn()
@@ -159,13 +156,6 @@ 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/curb/curb-control.src/curb-control.groovy

@@ -65,16 +65,7 @@ void updateSwitch() {
 private void updateAll(devices) {
 	def command = request.JSON?.command
 	if (command) {
-		switch(command) {
-			case "on":
-				devices.on()
-				break
-			case "off":
-				devices.off()
-				break
-			default:
-				httpError(403, "Access denied. This command is not supported by current capability.")
-		}
+		devices."$command"()
 	}
 }
 
@@ -86,16 +77,7 @@ private void update(devices) {
 		if (!device) {
 			httpError(404, "Device not found")
 		} else {
-			switch(command) {
-				case "on":
-					device.on()
-					break
-				case "off":
-					device.off()
-					break
-				default:
-					httpError(403, "Access denied. This command is not supported by current capability.")
-			}
+			device."$command"()
 		}
 	}
 }

smartapps/dianoga/netatmo-connect.src/netatmo-connect.groovy

@@ -58,7 +58,7 @@ def authPage() {
 	if (canInstallLabs()) {
 
 		def redirectUrl = getBuildRedirectUrl()
-		// log.debug "Redirect url = ${redirectUrl}"
+		log.debug "Redirect url = ${redirectUrl}"
 
 		if (state.authToken) {
 			description = "Tap 'Next' to proceed"
@@ -113,13 +113,13 @@ def oauthInitUrl() {
 		scope: "read_station"
 	]
 
-	// log.debug "REDIRECT URL: ${getVendorAuthPath() + toQueryString(oauthParams)}"
+	log.debug "REDIRECT URL: ${getVendorAuthPath() + toQueryString(oauthParams)}"
 
 	redirect (location: getVendorAuthPath() + toQueryString(oauthParams))
 }
 
 def callback() {
-	// log.debug "callback()>> params: $params, params.code ${params.code}"
+	log.debug "callback()>> params: $params, params.code ${params.code}"
 
 	def code = params.code
 	def oauthState = params.state
@@ -135,7 +135,7 @@ def callback() {
 			scope: "read_station"
 		]
 
-		// log.debug "TOKEN URL: ${getVendorTokenPath() + toQueryString(tokenParams)}"
+		log.debug "TOKEN URL: ${getVendorTokenPath() + toQueryString(tokenParams)}"
 
 		def tokenUrl = getVendorTokenPath()
 		def params = [
@@ -144,7 +144,7 @@ def callback() {
 			body: tokenParams
 		]
 
-		// log.debug "PARAMS: ${params}"
+		log.debug "PARAMS: ${params}"
 
 		httpPost(params) { resp ->
 
@@ -156,7 +156,7 @@ def callback() {
 				state.refreshToken = data.refresh_token
 				state.authToken = data.access_token
 				state.tokenExpires = now() + (data.expires_in * 1000)
-				// log.debug "swapped token: $resp.data"
+				log.debug "swapped token: $resp.data"
 			}
 		}
 
@@ -292,7 +292,7 @@ def refreshToken() {
 
 			response.data.each {key, value ->
 				def data = slurper.parseText(key);
-				// log.debug "Data: $data"
+				log.debug "Data: $data"
 
 				state.refreshToken = data.refresh_token
 				state.accessToken = data.access_token

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

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

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

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

smartapps/egid/smart-windows.src/smart-windows.groovy

@@ -1,7 +1,7 @@
 /**
  *  Smart Windows
  *	Compares two temperatures – indoor vs outdoor, for example – then sends an alert if windows are open (or closed!).
- *
+ * 
  *  Copyright 2014 Eric Gideon
  *
  * 	Based in part on the "When it's going to rain" SmartApp by the SmartThings team,
@@ -21,18 +21,13 @@ definition(
 	name: "Smart Windows",
 	namespace: "egid",
 	author: "Eric Gideon",
-	description: "Compares two temperatures – indoor vs outdoor, for example – then sends an alert if windows are open (or closed!). If you don't use an external temperature device, your location will be used instead.",
+	description: "Compares two temperatures – indoor vs outdoor, for example – then sends an alert if windows are open (or closed!). If you don't use an external temperature device, your zipcode will be used instead.",
 	iconUrl: "https://s3.amazonaws.com/smartthings-device-icons/Home/home9-icn.png",
 	iconX2Url: "https://s3.amazonaws.com/smartthings-device-icons/Home/home9-icn@2x.png"
 )
 
 
 preferences {
-
-  if (!(location.zipCode || ( location.latitude && location.longitude )) && location.channelName == 'samsungtv') {
-		section { paragraph title: "Note:", "Location is required for this SmartApp. Go to 'Location Name' settings to setup your correct location." }
-	}
-
 	section( "Set the temperature range for your comfort zone..." ) {
 		input "minTemp", "number", title: "Minimum temperature"
 		input "maxTemp", "number", title: "Maximum temperature"
@@ -44,11 +39,9 @@ preferences {
 		input "inTemp", "capability.temperatureMeasurement", title: "Indoor"
 		input "outTemp", "capability.temperatureMeasurement", title: "Outdoor (optional)", required: false
 	}
-
-	if (location.channelName != 'samsungtv') {
-		section( "Set your location" ) { input "zipCode", "text", title: "Zip code" }
-  }
-
+	section( "Set your location" ) {
+		input "zipCode", "text", title: "Zip code"
+	}
 	section( "Notifications" ) {
 		input "sendPushMessage", "enum", title: "Send a push notification?", metadata:[values:["Yes","No"]], required:false
 		input "retryPeriod", "number", title: "Minutes between notifications:"
@@ -79,7 +72,7 @@ def temperatureHandler(evt) {
 
 	def currentInTemp = evt.doubleValue
 	def openWindows = sensors.findAll { it?.latestValue("contact") == 'open' }
-
+	
 	log.trace "Temp event: $evt"
 	log.info "In: $currentInTemp; Out: $currentOutTemp"
 
@@ -105,7 +98,7 @@ def temperatureHandler(evt) {
 			if ( currentOutTemp < maxTemp && !openWindows ) {
 				send( "Open some windows to cool down the house! Currently ${currentInTemp}°F inside and ${currentOutTemp}°F outside." )
 			} else if ( currentOutTemp > maxTemp && openWindows ) {
-				send( "It's gotten warmer outside! You should close these windows: ${openWindows.join(', ')}. Currently ${currentInTemp}°F inside and ${currentOutTemp}°F outside." )
+				send( "It's gotten warmer outside! You should close these windows: ${openWindows.join(', ')}. Currently ${currentInTemp}°F inside and ${currentOutTemp}°F outside." )				
 			} else {
 				log.debug "No notifications sent. Everything is in the right place."
 			}
@@ -132,11 +125,7 @@ def temperatureHandler(evt) {
 }
 
 def weatherCheck() {
-	def json 
-	if (location.channelName != 'samsungtv')
-		json = getWeatherFeature("conditions", zipCode)
-	else
-		json = getWeatherFeature("conditions")
+	def json = getWeatherFeature("conditions", zipCode)
 	def currentTemp = json?.current_observation?.temp_f
 
 	if ( currentTemp ) {
@@ -161,4 +150,4 @@ private send(msg) {
 	}
 
 	log.info msg
-}
+}

smartapps/gideon-api/gideon.src/gideon.groovy

@@ -1,253 +0,0 @@
-/**
- *  Gideon
- *
- *  Copyright 2016 Nicola Russo
- *
- *  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: "Gideon",
-    namespace: "gideon.api",
-    author: "Braindrain Solutions",
-    description: "Gideon AI Smart app allows you to connect and control all of your SmartThings devices through the Gideon AI app, making your SmartThings devices even smarter.",
-    category: "Family",
-    iconUrl: "http://s33.postimg.org/t77u7y7v3/logo.png",
-    iconX2Url: "http://s33.postimg.org/t77u7y7v3/logo.png",
-    iconX3Url: "http://s33.postimg.org/t77u7y7v3/logo.png",
-    oauth: [displayName: "Gideon AI API", displayLink: "gideon.ai"])
-
-
-preferences {
-	section("Control these switches...") {
-        input "switches", "capability.switch", multiple:true
-    }
-    section("Control these motion sensors...") {
-        input "motions", "capability.motionSensor", multiple:true
-    }
-    section("Control these presence sensors...") {
-    	input "presence_sensors", "capability.presenceSensor", multiple:true
-    }
-    section("Control these outlets...") {
-    	input "outlets", "capability.switch", multiple:true
-    }
-    section("Control these locks...") {
-    	input "locks", "capability.lock", multiple:true
-    }
-    section("Control these locks...") {
-	    input "temperature_sensors", "capability.temperatureMeasurement"
-    }
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-	initialize()
-}
-
-def initialize() {
-	// TODO: subscribe to attributes, devices, locations, etc.
-    subscribe(outlet, "energy", outletHandler)
-  	subscribe(outlet, "switch", outletHandler)
-}
-
-// TODO: implement event handlers
-def outletHandler(evt) {
-	log.debug "$outlet.currentEnergy"
-	//TODO call G API  
-}
-
-
-private device(it, type) {
-	it ? [id: it.id, label: it.label, type: type] : null
-}
-
-//API Mapping
-mappings {
-	path("/getalldevices") {
-    action: [
-      			GET: "getAllDevices"
-    		]
-  	}
-	path("/doorlocks/:id/:command") {
-    action: [
-      GET: "updateDoorLock"
-    ]
-  }
-  	path("/doorlocks/:id") {
-    action: [
-      			GET: "getDoorLockStatus"
-    		]
-  	}
-  	path("/tempsensors/:id") {
-    action: [
-      GET: "getTempSensorsStatus"
-    ]
-  }
-  	path("/presences/:id") {
-    action: [
-      GET: "getPresenceStatus"
-    ]
-  }
-  	path("/motions/:id") {
-    action: [
-      GET: "getMotionStatus"
-    ]
-  }
-  	path("/outlets/:id") {
-    action: [
-      GET: "getOutletStatus"
-    ]
-  }
-  	path("/outlets/:id/:command") {
-    action: [
-      GET: "updateOutlet"
-    ]
-  }
-  	path("/switches/:command") {
-    action: [
-      PUT: "updateSwitch"
-    ]
-  }
-}
-
-//API Methods
-def getAllDevices() {
-	def locks_list = locks.collect{device(it,"Lock")}
-    def presences_list = presence_sensors.collect{device(it,"Presence")}
-    def motions_list = motions.collect{device(it,"Motion")}
-    def outlets_list = outlets.collect{device(it,"Outlet")}
-    def switches_list = switches.collect{device(it,"Switch")}
-    def temp_list = temperature_sensors.collect{device(it,"Temperature")}
-    return [Locks: locks_list, Presences: presences_list, Motions: motions_list, Outlets: outlets_list, Switches: switches_list, Temperatures: temp_list]
-}
-
-//LOCKS
-def getDoorLockStatus() {
-	def device = locks.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.currentValue('lock')]
-        }
-}
-
-def updateDoorLock() {
-	def command = params.command
-    def device = locks.find { it.id == params.id }
-    if (command){
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            if(command == "toggle")
-            {
-                if(device.currentValue('lock') == "locked")
-                  device.unlock();
-                else
-                  device.lock();
-                  
-                return [Device_id: params.id, result_action: "200"]
-            }
-        }
-    }
-}
-
-//PRESENCE
-def getPresenceStatus() {
-
-	def device = presence_sensors.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.currentValue('presence')]
-   }
-}
-
-//MOTION
-def getMotionStatus() {
-
-	def device = motions.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.currentValue('motion')]
-   }
-}
-
-//OUTLET
-def getOutletStatus() {
-	
-    def device = outlets.find { it.id == params.id }
-   	if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.currentSwitch, Current_watt: device.currentValue("energy")]
-  }
-}
-
-def updateOutlet() {
-	
-    def command = params.command
-    def device = outlets.find { it.id == params.id }
-    if (command){
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            if(command == "toggle")
-            {
-                if(device.currentSwitch == "on")
-                  device.off();
-                else
-                  device.on();
-                  
-                return [Device_id: params.id, result_action: "200"]
-            }
-        }
-    }
-}                
-
-//SWITCH
-def updateSwitch() {
-    def command = params.command
-    def device = switches.find { it.id == params.id }
-    if (command){
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            if(command == "toggle")
-            {
-                if(device.currentSwitch == "on")
-                  device.off();
-                else
-                  device.on();
-                  
-                return [Device_id: params.id, result_action: "200"]
-            }
-        }
-    }
-}
-
-//TEMPERATURE
-def getTempSensorsStatus() {
-	
-    def device = temperature_sensors.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.currentValue('temperature')]
-   }
-}

smartapps/imbrianj/ready-for-rain.src/ready-for-rain.groovy

@@ -18,13 +18,8 @@ definition(
 )
 
 preferences {
-
-  if (!(location.zipCode || ( location.latitude && location.longitude )) && location.channelName == 'samsungtv') {
-		section { paragraph title: "Note:", "Location is required for this SmartApp. Go to 'Location Name' settings to setup your correct location." }
-	}
-
-  if (location.channelName != 'samsungtv') {
-		section( "Set your location" ) { input "zipCode", "text", title: "Zip code" }
+  section("Zip code?") {
+    input "zipcode", "text", title: "Zipcode?"
   }
 
   section("Things to check?") {
@@ -65,11 +60,7 @@ def scheduleCheck(evt) {
   // Only need to poll if we haven't checked in a while - and if something is left open.
   if((now() - (30 * 60 * 1000) > state.lastCheck["time"]) && open) {
     log.info("Something's open - let's check the weather.")
-    def response
-    if (location.channelName != 'samsungtv')
-      response = getWeatherFeature("forecast", zipCode)
-    else
-      response = getWeatherFeature("forecast")
+    def response = getWeatherFeature("forecast", zipcode)
     def weather  = isStormy(response)
 
     if(weather) {

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

@@ -26,9 +26,9 @@ preferences {
   }
 
   section("Temperature monitor?") {
-    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
+    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
   }
 
   section("When which people are away?") {

smartapps/juano2310/jawbone-button-notifier.src/jawbone-button-notifier.groovy

@@ -62,7 +62,7 @@ def initialize() {
 }
 
 def sendit(evt) {
-	log.debug "$evt.value: $evt"
+	log.debug "$evt.value: $evt, $settings"
 	sendMessage()
 }
 
@@ -80,6 +80,6 @@ def sendMessage() {
         sendSms phone3, msg
     }
     if (!phone1 && !phone2 && !phone3) {
-    	sendPush msg
+    	sendPush msg    
     }
 }

smartapps/juano2310/jawbone-up-connect.src/jawbone-up-connect.groovy

@@ -4,9 +4,6 @@
  *  Author: Juan Risso
  *  Date: 2013-12-19
  */
-
-include 'asynchttp_v1'
-
 definition(
 	name: "Jawbone UP (Connect)",
 	namespace: "juano2310",
@@ -31,7 +28,7 @@ mappings {
 	path("/receivedToken") { action: [ POST: "receivedToken", GET: "receivedToken"] }
 	path("/receiveToken") { action: [ POST: "receiveToken", GET: "receiveToken"] }
 	path("/hookCallback") { action: [ POST: "hookEventHandler", GET: "hookEventHandler"] }
-  path("/oauth/initialize") {action: [GET: "oauthInitUrl"]}
+    path("/oauth/initialize") {action: [GET: "oauthInitUrl"]}    
 	path("/oauth/callback") { action: [ GET: "callback" ] }
 }
 
@@ -47,7 +44,7 @@ def callback() {
 	} else {
 		log.warn "No authQueryString"
 	}
-
+	
 	if (state.JawboneAccessToken) {
 		log.debug "Access token already exists"
 		setup()
@@ -76,7 +73,7 @@ def callback() {
 
 def authPage() {
     log.debug "authPage"
-    def description = null
+    def description = null          
     if (state.JawboneAccessToken == null) {
 		if (!state.accessToken) {
 			log.debug "About to create access token"
@@ -85,13 +82,12 @@ def authPage() {
         description = "Click to enter Jawbone Credentials"
         def redirectUrl = buildRedirectUrl
         log.debug "RedirectURL = ${redirectUrl}"
-        def donebutton= state.JawboneAccessToken != null
+        def donebutton= state.JawboneAccessToken != null 
         return dynamicPage(name: "Credentials", title: "Jawbone UP", nextPage: null, uninstall: true, install: donebutton) {
-							 section { paragraph title: "Note:", "This device has not been officially tested and certified to “Work with SmartThings”. You can connect it to your SmartThings home but performance may vary and we will not be able to provide support or assistance." }
                section { href url:redirectUrl, style:"embedded", required:true, title:"Jawbone UP", state: hast ,description:description }
         }
     } else {
-        description = "Jawbone Credentials Already Entered."
+        description = "Jawbone Credentials Already Entered." 
         return dynamicPage(name: "Credentials", title: "Jawbone UP", uninstall: true, install:true) {
                section { href url: buildRedirectUrl("receivedToken"), style:"embedded", state: "complete", title:"Jawbone UP", description:description }
         }
@@ -111,7 +107,7 @@ def receiveToken(redirectUrl = null) {
     def params = [
       uri: "https://jawbone.com/auth/oauth2/token?${toQueryString(oauthParams)}",
     ]
-    httpGet(params) { response ->
+    httpGet(params) { response -> 
     	log.debug "${response.data}"
 		log.debug "Setting access token to ${response.data.access_token}, refresh token to ${response.data.refresh_token}"
     	state.JawboneAccessToken = response.data.access_token
@@ -153,7 +149,7 @@ def connectionStatus(message, redirectUrl = null) {
 			<meta http-equiv="refresh" content="3; url=${redirectUrl}" />
 		"""
 	}
-
+	
     def html = """
         <!DOCTYPE html>
         <html>
@@ -233,12 +229,12 @@ def validateCurrentToken() {
 	log.debug "validateCurrentToken"
     def url = "https://jawbone.com/nudge/api/v.1.1/users/@me/refreshToken"
     def requestBody = "secret=${appSettings.clientSecret}"
-
+	
 	try {
 		httpPost(uri: url, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ],  body: requestBody) {response ->
 	    	if (response.status == 200) {
 				log.debug "${response.data}"
-				log.debug "Setting refresh token"
+				log.debug "Setting refresh token to ${response.data.data.refresh_token}"
 	     		state.refreshToken = response.data.data.refresh_token
 	        }
 	    }
@@ -262,7 +258,7 @@ def validateCurrentToken() {
 							state.remove("refreshToken")
 						}
 					} else {
-						log.debug "Setting access token"
+						log.debug "Setting access token to ${data.access_token}, refresh token to ${data.refresh_token}"
 						state.JawboneAccessToken = data.access_token
 						state.refreshToken = data.refresh_token
 					}
@@ -275,10 +271,10 @@ def validateCurrentToken() {
 }
 
 def initialize() {
-    log.debug "Callback URL - Webhook"
-	def localServerUrl = getApiServerUrl()
+    log.debug "Callback URL - Webhook"  
+	def localServerUrl = getApiServerUrl() 
 	def hookUrl = "${localServerUrl}/api/token/${state.accessToken}/smartapps/installations/${app.id}/hookCallback"
-    def webhook = "https://jawbone.com/nudge/api/v.1.1/users/@me/pubsub?webhook=$hookUrl"
+    def webhook = "https://jawbone.com/nudge/api/v.1.1/users/@me/pubsub?webhook=$hookUrl"      
 	httpPost(uri: webhook, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ])
 }
 
@@ -288,16 +284,16 @@ def setup() {
 
 	if (state.JawboneAccessToken) {
 		def urlmember = "https://jawbone.com/nudge/api/users/@me/"
-		def member = null
-		httpGet(uri: urlmember, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ]) {response ->
+		def member = null    
+		httpGet(uri: urlmember, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ]) {response -> 
 		    member = response.data.data
 		}
-
+	
 		if (member) {
 			state.member = member
 			def externalId = "${app.id}.${member.xid}"
 
-			// find the appropriate child device based on my app id and the device network id
+			// find the appropriate child device based on my app id and the device network id 
 			def deviceWrapper = getChildDevice("${externalId}")
 
 			// invoke the generatePresenceEvent method on the child device
@@ -306,8 +302,7 @@ def setup() {
 			  	def childDevice = addChildDevice('juano2310', "Jawbone User", "${app.id}.${member.xid}",null,[name:"Jawbone UP - " + member.first, completedSetup: true])
 			    if (childDevice) {
 			       	log.debug "Child Device Successfully Created"
-			        childDevice?.generateSleepingEvent(false)
-                    pollChild(childDevice)
+			        generateInitialEvent (member, childDevice)
 			    }
 			}
 		}
@@ -317,7 +312,7 @@ def setup() {
 }
 
 def installed() {
-
+	
 	if (!state.accessToken) {
 		log.debug "About to create access token"
 		createAccessToken()
@@ -329,7 +324,7 @@ def installed() {
 }
 
 def updated() {
-
+	
 	if (!state.accessToken) {
 		log.debug "About to create access token"
 		createAccessToken()
@@ -353,128 +348,128 @@ def uninstalled() {
 }
 
 def pollChild(childDevice) {
-		def childMap = [ value: "$childDevice.device.deviceNetworkId}"]
-
-		def params = [
-				uri: 'https://jawbone.com',
-				path: '/nudge/api/users/@me/goals',
-				headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ],
-				contentType: 'application/json'
-		]
-
-		asynchttp_v1.get('responseGoals', params, childMap)
-
-		def params2 = [
-				uri: 'https://jawbone.com',
-				path: '/nudge/api/users/@me/moves',
-				headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ],
-				contentType: 'application/json'
-		]
-
-		asynchttp_v1.get('responseMoves', params2, childMap)
+    def member = state.member 
+    generatePollingEvents (member, childDevice)   
 }
 
-def responseGoals(response, dni) {
-	if (response.hasError()) {
-			log.error "response has error: $response.errorMessage"
-	} else {
-			def goals
-			try {
-					// json response already parsed into JSONElement object
-					goals = response.json.data
-			} catch (e) {
-					log.error "error parsing json from response: $e"
-			}
-			if (goals) {
-				def childDevice = getChildDevice(dni.value)
-				log.debug "Goal = ${goals.move_steps} Steps"
-				childDevice?.sendEvent(name:"goal", value: goals.move_steps)
-			} else {
-					log.debug "did not get json results from response body: $response.data"
-			}
-	}
+def generatePollingEvents (member, childDevice) {
+    // lets figure out if the member is currently "home" (At the place)
+    def urlgoals = "https://jawbone.com/nudge/api/users/@me/goals" 
+    def urlmoves = "https://jawbone.com/nudge/api/users/@me/moves"  
+    def urlsleeps = "https://jawbone.com/nudge/api/users/@me/sleeps"     
+    def goals = null
+    def moves = null
+ 	def sleeps = null   
+    httpGet(uri: urlgoals, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ]) {response -> 
+        goals = response.data.data
+    }   
+    httpGet(uri: urlmoves, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ]) {response -> 
+        moves = response.data.data.items[0]
+    }    
+   
+    try { // we are going to just ignore any errors
+        log.debug "Member = ${member.first}"
+        log.debug "Moves Goal = ${goals.move_steps} Steps"
+        log.debug "Moves = ${moves.details.steps} Steps" 
+
+        childDevice?.sendEvent(name:"steps", value: moves.details.steps)
+        childDevice?.sendEvent(name:"goal", value: goals.move_steps)
+    	//setColor(moves.details.steps,goals.move_steps,childDevice)
+    }
+    catch (e) {
+            // eat it
+    }       
 }
 
-def responseMoves(response, dni) {
-	if (response.hasError()) {
-			log.error "response has error: $response.errorMessage"
-	} else {
-			def moves
-			try {
-					// json response already parsed into JSONElement object
-					moves = response.json.data.items[0]
-			} catch (e) {
-					log.error "error parsing json from response: $e"
-			}
-			if (moves) {
-				def childDevice = getChildDevice(dni.value)
-				log.debug "Moves = ${moves.details.steps} Steps"
-				childDevice?.sendEvent(name:"steps", value: moves.details.steps)
-			} else {
-					log.debug "did not get json results from response body: $response.data"
-			}
-	}
+def generateInitialEvent (member, childDevice) {
+    // lets figure out if the member is currently "home" (At the place)
+    def urlgoals = "https://jawbone.com/nudge/api/users/@me/goals" 
+    def urlmoves = "https://jawbone.com/nudge/api/users/@me/moves"  
+    def urlsleeps = "https://jawbone.com/nudge/api/users/@me/sleeps"     
+    def goals = null
+    def moves = null
+ 	def sleeps = null   
+    httpGet(uri: urlgoals, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ]) {response -> 
+        goals = response.data.data
+    }   
+    httpGet(uri: urlmoves, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ]) {response -> 
+        moves = response.data.data.items[0]
+    }    
+    
+    try { // we are going to just ignore any errors
+        log.debug "Member = ${member.first}"
+        log.debug "Moves Goal = ${goals.move_steps} Steps"
+        log.debug "Moves = ${moves.details.steps} Steps"
+        log.debug "Sleeping state = false"   
+        childDevice?.generateSleepingEvent(false)
+        childDevice?.sendEvent(name:"steps", value: moves.details.steps)
+        childDevice?.sendEvent(name:"goal", value: goals.move_steps)
+    	//setColor(moves.details.steps,goals.move_steps,childDevice)
+    }
+    catch (e) {
+            // eat it
+    }       
 }
 
 def setColor (steps,goal,childDevice) {
     def result = steps * 100 / goal
-    if (result < 25)
+    if (result < 25) 
     	childDevice?.sendEvent(name:"steps", value: "steps", label: steps)
-    else if ((result >= 25) && (result < 50))
+    else if ((result >= 25) && (result < 50)) 
         childDevice?.sendEvent(name:"steps", value: "steps1", label: steps)
-    else if ((result >= 50) && (result < 75))
+    else if ((result >= 50) && (result < 75)) 
         childDevice?.sendEvent(name:"steps", value: "steps1", label: steps)
-    else if (result >= 75)
-        childDevice?.sendEvent(name:"steps", value: "stepsgoal", label: steps)
+    else if (result >= 75)     
+        childDevice?.sendEvent(name:"steps", value: "stepsgoal", label: steps)   
 }
 
 def hookEventHandler() {
     // log.debug "In hookEventHandler method."
     log.debug "request = ${request}"
-
-    def json = request.JSON
-
+    
+    def json = request.JSON 
+    
     // get some stuff we need
     def userId = json.events.user_xid[0]
     def	json_type = json.events.type[0]
-	  def json_action = json.events.action[0]
+	def json_action = json.events.action[0]
 
     //log.debug json
     log.debug "Userid = ${userId}"
     log.debug "Notification Type: " + json_type
-    log.debug "Notification Action: " + json_action
-
+    log.debug "Notification Action: " + json_action 
+    
     // find the appropriate child device based on my app id and the device network id
     def externalId = "${app.id}.${userId}"
     def childDevice = getChildDevice("${externalId}")
-
+            
     if (childDevice) {
-    	switch (json_action) {
-	        case "enter_sleep_mode":
-            	childDevice?.generateSleepingEvent(true)
-                break
-            case "exit_sleep_mode":
-            	childDevice?.generateSleepingEvent(false)
-                break
-            case "creation":
+    	switch (json_action) {   
+	        case "enter_sleep_mode":      
+            	childDevice?.generateSleepingEvent(true)           
+                break           
+            case "exit_sleep_mode":       
+            	childDevice?.generateSleepingEvent(false) 
+                break 
+            case "creation": 
                 childDevice?.sendEvent(name:"steps", value: 0)
           		break
             case "updation":
-                def urlgoals = "https://jawbone.com/nudge/api/users/@me/goals"
-                def urlmoves = "https://jawbone.com/nudge/api/users/@me/moves"
+                def urlgoals = "https://jawbone.com/nudge/api/users/@me/goals"     
+                def urlmoves = "https://jawbone.com/nudge/api/users/@me/moves"       
                 def goals = null
-                def moves = null
-                httpGet(uri: urlgoals, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ]) {response ->
+                def moves = null    
+                httpGet(uri: urlgoals, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ]) {response -> 
  	               goals = response.data.data
-                }
-                httpGet(uri: urlmoves, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ]) {response ->
+                }       
+                httpGet(uri: urlmoves, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ]) {response -> 
                    moves = response.data.data.items[0]
-                }
+                }        
                 log.debug "Goal = ${goals.move_steps} Steps"
-        				log.debug "Steps = ${moves.details.steps} Steps"
+        		log.debug "Steps = ${moves.details.steps} Steps"
                 childDevice?.sendEvent(name:"steps", value: moves.details.steps)
-                childDevice?.sendEvent(name:"goal", value: goals.move_steps)
-                //setColor(moves.details.steps,goals.move_steps,childDevice)
+                childDevice?.sendEvent(name:"goal", value: goals.move_steps)       
+                //setColor(moves.details.steps,goals.move_steps,childDevice)   
                 break
 			case "deletion":
 				app.delete()

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

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

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

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

smartapps/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/resteele/monitor-on-sense.src/monitor-on-sense.groovy

@@ -17,7 +17,7 @@ definition(
     name: "Monitor on Sense",
     namespace: "resteele",
     author: "Rachel Steele",
-    description: "Turn on switch when vibration is sensed",
+    description: "Turn on Monitor when vibration is sensed",
     category: "My Apps",
     iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
     iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
@@ -25,10 +25,10 @@ definition(
 
 
 preferences {
-	section("When vibration is sensed...") {
+	section("When the keyboard is used...") {
 		input "accelerationSensor", "capability.accelerationSensor", title: "Which Sensor?"
 	}
-section("Turn on switch...") {
+section("Turn on/off a light...") {
 		input "switch1", "capability.switch"
 	}
 }
@@ -47,3 +47,5 @@ def updated() {
 def accelerationActiveHandler(evt) {
 		switch1.on()
 	}
+
+