MSA-977: Aeon lab Home energy meter and Smart Switch DTH

devicetypes/smartthings/aeon-home-energy-meter-with-pcode.src/aeon-home-energy-meter-with-pcode.groovy

@@ -0,0 +1,143 @@
+/**
+ *  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.
+ *
+ *  Aeon Home Energy Meter
+ *
+ *  Author: SmartThings
+ *
+ *  Date: 2013-05-30
+ */
+metadata {
+	definition (name: "Aeon Home Energy Meter With PCode", namespace: "smartthings", author: "SmartThings") {
+		capability "Energy Meter"
+		capability "Power Meter"
+		capability "Configuration"
+		capability "Sensor"
+        
+        attribute "ManufacturerCode", "string"
+		attribute "ProductCode", "string"
+		attribute "ProduceTypeCode", "string"
+		attribute "WirelessConfig", "string"
+
+		command "reset"
+
+		fingerprint deviceId: "0x2101", inClusters: " 0x70,0x31,0x72,0x86,0x32,0x80,0x85,0x60"
+	}
+
+	// simulator metadata
+	simulator {
+		for (int i = 0; i <= 10000; i += 1000) {
+			status "power  ${i} W": new physicalgraph.zwave.Zwave().meterV1.meterReport(
+				scaledMeterValue: i, precision: 3, meterType: 4, scale: 2, size: 4).incomingMessage()
+		}
+		for (int i = 0; i <= 100; i += 10) {
+			status "energy  ${i} kWh": new physicalgraph.zwave.Zwave().meterV1.meterReport(
+				scaledMeterValue: i, precision: 3, meterType: 0, scale: 0, size: 4).incomingMessage()
+		}
+	}
+
+	// tile definitions
+	tiles {
+		valueTile("power", "device.power", decoration: "flat") {
+			state "default", label:'${currentValue} W'
+		}
+		valueTile("energy", "device.energy", decoration: "flat") {
+			state "default", label:'${currentValue} kWh'
+		}
+		standardTile("reset", "device.energy", inactiveLabel: false, decoration: "flat") {
+			state "default", label:'reset kWh', action:"reset"
+		}
+		standardTile("refresh", "device.power", inactiveLabel: false, decoration: "flat") {
+			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+		standardTile("configure", "device.power", inactiveLabel: false, decoration: "flat") {
+			state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
+		}
+
+		main (["power","energy"])
+		details(["power","energy", "reset","refresh", "configure"])
+	}
+}
+
+def parse(String description) {
+	def result = null
+	def cmd = zwave.parse(description, [0x31: 1, 0x32: 1, 0x60: 3])
+	if (cmd) {
+		result = createEvent(zwaveEvent(cmd))
+	}
+	log.debug "Parse returned ${result?.descriptionText}"
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.meterv1.MeterReport cmd) {
+	if (cmd.scale == 0) {
+		[name: "energy", value: cmd.scaledMeterValue, unit: "kWh"]
+	} else if (cmd.scale == 1) {
+		[name: "energy", value: cmd.scaledMeterValue, unit: "kVAh"]
+	}
+	else {
+		[name: "power", value: Math.round(cmd.scaledMeterValue), unit: "W"]
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.Command cmd) {
+	// Handles all Z-Wave commands we aren't interested in
+	[:]
+}
+
+def refresh() {
+	delayBetween([
+		zwave.meterV2.meterGet(scale: 0).format(),
+		zwave.meterV2.meterGet(scale: 2).format()
+	])
+}
+
+def reset() {
+	// No V1 available
+	return [
+		zwave.meterV2.meterReset().format(),
+		zwave.meterV2.meterGet(scale: 0).format()
+	]
+}
+
+def configure() {
+	def cmd = delayBetween([
+    	zwave.manufacturerSpecificV2.manufacturerSpecificGet().format(),
+		zwave.configurationV1.configurationSet(parameterNumber: 101, size: 4, scaledConfigurationValue: 4).format(),   // combined power in watts
+		zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: 900).format(), // every 5 min
+		zwave.configurationV1.configurationSet(parameterNumber: 102, size: 4, scaledConfigurationValue: 8).format(),   // combined energy in kWh
+		zwave.configurationV1.configurationSet(parameterNumber: 112, size: 4, scaledConfigurationValue: 3600).format(), // every 5 min
+		zwave.configurationV1.configurationSet(parameterNumber: 103, size: 4, scaledConfigurationValue: 0).format(),    // no third report
+		zwave.configurationV1.configurationSet(parameterNumber: 113, size: 4, scaledConfigurationValue: 900).format() // every 5 min
+	])
+	log.debug cmd
+	cmd
+}
+
+
+def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
+	def result = []
+
+	def manufacturerCode = String.format("%04X", cmd.manufacturerId)
+	def productCode = String.format("%04X", cmd.productId)
+	def produceTypeCode = String.format("%04X", cmd.productTypeId)
+	def wirelessConfig = "ZWA"
+	
+	sendEvent(name: "ManufacturerCode", value: manufacturerCode)
+	sendEvent(name: "ProductCode", value: productCode)
+	sendEvent(name: "ProduceTypeCode", value: produceTypeCode)
+	sendEvent(name: "WirelessConfig", value: wirelessConfig)
+	
+	result << createEvent(descriptionText: "$device.displayName", isStateChange: false)
+
+	return result
+}

devicetypes/smartthings/aeon-smart-switch-gen5.src/aeon-smart-switch-gen5.groovy

@@ -0,0 +1,200 @@
+/**
+ *  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: "Aeon Smart Switch GEN5", namespace: "smartthings", author: "SmartThings") {
+		capability "Power Meter"
+		capability "Energy Meter"
+		capability "Actuator"
+		capability "Switch"
+		capability "Configuration"
+		capability "Polling"
+		capability "Refresh"
+		capability "Sensor"
+        
+        attribute "ManufacturerCode", "string"
+		attribute "ProductCode", "string"
+		attribute "ProduceTypeCode", "string"
+		attribute "WirelessConfig", "string"
+
+
+		command "reset"
+        
+
+		fingerprint deviceId: "0x1001", inClusters: "0x25,0x32,0x27,0x2C,0x2B,0x70,0x85,0x56,0x72,0x86,0x5E,0x59,0x7A,0x73,0x98,0xEF,0x5A,0x82", outClusters: "0x82"
+	}
+
+	// simulator metadata
+	simulator {
+		status "on":  "command: 2003, payload: FF"
+		status "off": "command: 2003, payload: 00"
+
+		for (int i = 0; i <= 100; i += 10) {
+			status "energy  ${i} kWh": new physicalgraph.zwave.Zwave().meterV2.meterReport(
+				scaledMeterValue: i, precision: 3, meterType: 0, scale: 0, size: 4).incomingMessage()
+		}
+
+		// reply messages
+		reply "2001FF,delay 100,2502": "command: 2503, payload: FF"
+		reply "200100,delay 100,2502": "command: 2503, payload: 00"
+
+	}
+
+	// tile definitions
+	tiles {
+		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
+			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
+			state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
+		}
+		valueTile("power", "device.power", decoration: "flat") {
+			state "default", label:'${currentValue} W'
+		} 
+		valueTile("energy", "device.energy", decoration: "flat") {
+			state "default", label:'${currentValue} kWh'
+		}        
+		standardTile("configure", "device.power", inactiveLabel: false, decoration: "flat") {
+			state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
+		}
+		standardTile("refresh", "device.power", inactiveLabel: false, decoration: "flat") {
+			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
+		}
+
+		main "switch"
+		details(["switch","power","energy","refresh","configure"])
+	}
+}
+
+def parse(String description) {
+
+	def result = null
+	def cmd = zwave.parse(description, [0x20: 1, 0x32: 2])
+	if (cmd) {
+		log.debug cmd
+		result = createEvent(zwaveEvent(cmd))
+	}
+	return result
+}
+
+
+def zwaveEvent(physicalgraph.zwave.commands.meterv3.MeterReport cmd) {
+		log.debug "MeterReport ${cmd}"
+
+	if (cmd.scale == 0) {
+		[name: "energy", value: cmd.scaledMeterValue, unit: "kWh"]
+	} else if (cmd.scale == 1) {
+		[name: "energy", value: cmd.scaledMeterValue, unit: "kVAh"]
+	}
+	else {
+		[name: "power", value: Math.round(cmd.scaledMeterValue), unit: "W"]
+	}
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd)
+{
+	[
+		name: "switch", value: cmd.value ? "on" : "off", type: "physical"
+	]
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.switchbinaryv1.SwitchBinaryReport cmd)
+{
+	[
+		name: "switch", value: cmd.value ? "on" : "off", type: "digital"
+	]
+}
+
+def zwaveEvent(physicalgraph.zwave.Command cmd) {
+	// Handles all Z-Wave commands we aren't interested in
+   	return createEvent(descriptionText: "$device.displayName: $cmd", displayed: false)
+	[:]
+}
+
+def on() {
+	delayBetween([
+		secure(zwave.basicV1.basicSet(value: 0xFF)),
+		secure(zwave.switchBinaryV1.switchBinaryGet())
+	])
+}
+
+def off() {
+	delayBetween([
+		secure(zwave.basicV1.basicSet(value: 0x00)),
+		secure(zwave.switchBinaryV1.switchBinaryGet())
+	])
+}
+
+def poll() {
+	delayBetween([
+		secure(zwave.switchBinaryV1.switchBinaryGet()),
+		secure(zwave.meterV2.meterGet())
+	])
+}
+
+def refresh() {
+	secure(zwave.switchBinaryV1.switchBinaryGet())  
+}
+
+def reset() {
+	return [
+		secure(zwave.meterV2.meterReset()),
+		secure(zwave.meterV2.meterGet())
+	]
+}
+
+def configure() {
+	delayBetween([
+    	zwave.manufacturerSpecificV2.manufacturerSpecificGet().format(),    
+		secure(zwave.configurationV1.configurationSet(parameterNumber: 101, size: 4, scaledConfigurationValue: 8)),   // energy in kWh
+		secure(zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: 300)), // every 1 min
+		secure(zwave.configurationV1.configurationSet(parameterNumber: 102, size: 4, scaledConfigurationValue: 4)),
+		secure(zwave.configurationV1.configurationSet(parameterNumber: 112, size: 4, scaledConfigurationValue: 900)),
+		secure(zwave.configurationV1.configurationSet(parameterNumber: 103, size: 4, scaledConfigurationValue: 0))
+	])
+}
+
+
+def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerSpecificReport cmd) {
+	def result = []
+
+	def manufacturerCode = String.format("%04X", cmd.manufacturerId)
+	def productCode = String.format("%04X", cmd.productId)
+	def produceTypeCode = String.format("%04X", cmd.productTypeId)
+	def wirelessConfig = "ZWP"
+	
+	sendEvent(name: "ManufacturerCode", value: manufacturerCode)
+	sendEvent(name: "ProductCode", value: productCode)
+	sendEvent(name: "ProduceTypeCode", value: produceTypeCode)
+	sendEvent(name: "WirelessConfig", value: wirelessConfig)
+	
+	result << createEvent(descriptionText: "$device.displayName", isStateChange: false)
+
+	return result
+}
+
+def zwaveEvent(physicalgraph.zwave.commands.securityv1.SecurityMessageEncapsulation cmd) {
+	def encapsulatedCommand = cmd.encapsulatedCommand([0x20: 1, 0x85: 2, 0x70: 1])
+	log.debug "encapsulated: $encapsulatedCommand"
+	if (encapsulatedCommand) {
+		state.sec = 1
+		zwaveEvent(encapsulatedCommand)
+	}
+}
+
+
+private secure(physicalgraph.zwave.Command cmd) {
+	zwave.securityV1.securityMessageEncapsulation().encapsulate(cmd).format()
+}
+
+private secureSequence(commands, delay=200) {
+	delayBetween(commands.collect{ secure(it) }, delay)
+}

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

@@ -103,104 +103,62 @@ void nextLevel() {
 }
 
 void setLevel(percent) {
-    log.debug "Executing 'setLevel'"
+	log.debug "Executing 'setLevel'"
-    if (verifyPercent(percent)) {
+	parent.setLevel(this, percent)
-        parent.setLevel(this, percent)
+	sendEvent(name: "level", value: percent, descriptionText: "Level has changed to ${percent}%")
-        sendEvent(name: "level", value: percent, descriptionText: "Level has changed to ${percent}%")
-        sendEvent(name: "switch", value: "on")
-    }
 }
 
 void setSaturation(percent) {
-    log.debug "Executing 'setSaturation'"
+	log.debug "Executing 'setSaturation'"
-    if (verifyPercent(percent)) {
+	parent.setSaturation(this, percent)
-        parent.setSaturation(this, percent)
+	sendEvent(name: "saturation", value: percent, displayed: false)
-        sendEvent(name: "saturation", value: percent, displayed: false)
-    }
 }
 
 void setHue(percent) {
-    log.debug "Executing 'setHue'"
+	log.debug "Executing 'setHue'"
-    if (verifyPercent(percent)) {
+	parent.setHue(this, percent)
-        parent.setHue(this, percent)
+	sendEvent(name: "hue", value: percent, displayed: false)
-        sendEvent(name: "hue", value: percent, displayed: false)
-    }
 }
 
 void setColor(value) {
-    log.debug "setColor: ${value}, $this"
+	log.debug "setColor: ${value}, $this"
-    def events = []
+	parent.setColor(this, value)
-    def validValues = [:]
+	if (value.hue) { sendEvent(name: "hue", value: value.hue, displayed: false)}
-
+	if (value.saturation) { sendEvent(name: "saturation", value: value.saturation, displayed: false)}
-    if (verifyPercent(value.hue)) {
+	if (value.hex) { sendEvent(name: "color", value: value.hex)}
-        events << createEvent(name: "hue", value: value.hue, displayed: false)
+	if (value.level) { sendEvent(name: "level", value: value.level, descriptionText: "Level has changed to ${value.level}%")}
-        validValues.hue = value.hue
+	sendEvent(name: "switch", value: "on")
-    }
-    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 (!events.isEmpty()) {
-        parent.setColor(this, validValues)
-    }
-    events.each {
-        sendEvent(it)
-    }
 }
 
 void reset() {
-    log.debug "Executing 'reset'"
+	log.debug "Executing 'reset'"
     def value = [level:100, saturation:56, hue:23]
     setAdjustedColor(value)
-    parent.poll()
+	parent.poll()
 }
 
 void setAdjustedColor(value) {
-    if (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)
-    } else {
-        log.warn "Invalid color input"
     }
 }
 
 void setColorTemperature(value) {
-    if (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"
-    }
 }
 
 void refresh() {
-    log.debug "Executing 'refresh'"
+	log.debug "Executing 'refresh'"
-    parent.manualRefresh()
+	parent.manualRefresh()
 }
 
 def adjustOutgoingHue(percent) {
@@ -219,14 +177,3 @@ def adjustOutgoingHue(percent) {
 	log.info "percent: $percent, adjusted: $adjusted"
 	adjusted
 }
-
-def verifyPercent(percent) {
-    if (percent == null)
-        return false
-    else if (percent >= 0 && percent <= 100) {
-        return true
-    } else {
-        log.warn "$percent is not 0-100"
-        return false
-    }
-}

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

@@ -79,12 +79,8 @@ void off() {
 
 void setLevel(percent) {
 	log.debug "Executing 'setLevel'"
-    if (percent != null && percent >= 0 && percent <= 100) {
+	parent.setLevel(this, percent)
-		parent.setLevel(this, percent)
+	sendEvent(name: "level", value: percent)
-		sendEvent(name: "level", value: percent)
-	} else {
-    	log.warn "$percent is not 0-100"
-    }
 }
 
 void refresh() {

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

@@ -203,7 +203,7 @@ private List parseContactMessage(String description) {
 	parts.each { part ->
 		part = part.trim()
 		if (part.startsWith('contactState:')) {
-			results.addAll(getContactResult(part, description))
+			results << getContactResult(part, description)
 		}
 		else if (part.startsWith('accelerationState:')) {
 			results << getAccelerationResult(part, description)
@@ -316,7 +316,7 @@ private List getContactResult(part, description) {
 	results
 }
 
-private Map getAccelerationResult(part, description) {
+private getAccelerationResult(part, description) {
 	def name = "acceleration"
 	def value = part.endsWith("1") ? "active" : "inactive"
 	def linkText = getLinkText(device)
@@ -335,7 +335,7 @@ private Map getAccelerationResult(part, description) {
 	]
 }
 
-private Map getTempResult(part, description) {
+private getTempResult(part, description) {
 	def name = "temperature"
 	def temperatureScale = getTemperatureScale()
 	def value = zigbee.parseSmartThingsTemperatureValue(part, "temp: ", temperatureScale)
@@ -360,7 +360,7 @@ private Map getTempResult(part, description) {
 	]
 }
 
-private Map getXyzResult(results, description) {
+private getXyzResult(results, description) {
 	def name = "threeAxis"
 	def value = "${results.x},${results.y},${results.z}"
 	def linkText = getLinkText(device)
@@ -379,7 +379,7 @@ private Map getXyzResult(results, description) {
 	]
 }
 
-private Map getBatteryResult(part, description) {
+private getBatteryResult(part, description) {
 	def batteryDivisor = description.split(",").find {it.split(":")[0].trim() == "batteryDivisor"} ? description.split(",").find {it.split(":")[0].trim() == "batteryDivisor"}.split(":")[1].trim() : null
 	def name = "battery"
 	def value = zigbee.parseSmartThingsBatteryValue(part, batteryDivisor)
@@ -400,7 +400,7 @@ private Map getBatteryResult(part, description) {
 	]
 }
 
-private Map getRssiResult(part, description, lastHop=false) {
+private getRssiResult(part, description, lastHop=false) {
 	def name = lastHop ? "lastHopRssi" : "rssi"
 	def valueString = part.split(":")[1].trim()
 	def value = (Integer.parseInt(valueString) - 128).toString()
@@ -431,7 +431,7 @@ private Map getRssiResult(part, description, lastHop=false) {
  * Note: To make the signal strength indicator more accurate, we could combine
  * LQI with RSSI.
  */
-private Map getLqiResult(part, description, lastHop=false) {
+private getLqiResult(part, description, lastHop=false) {
 	def name = lastHop ? "lastHopLqi" : "lqi"
 	def valueString = part.split(":")[1].trim()
 	def percentageOf = 255

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

@@ -56,17 +56,21 @@ metadata {
 def parse(String description) {
     log.debug "description is $description"
 
-    def event = zigbee.getEvent(description)
+    def resultMap = zigbee.getKnownDescription(description)
-    if (event) {
+    if (resultMap) {
-        log.info event
+        log.info resultMap
-        if (event.name == "power") {
+        if (resultMap.type == "update") {
+            log.info "$device updates: ${resultMap.value}"
+        }
+        else if (resultMap.type == "power") {
+            def powerValue
             if (device.getDataValue("manufacturer") != "OSRAM") {       //OSRAM devices do not reliably update power
-                event.value = (event.value as Integer) / 10             //TODO: The divisor value needs to be set as part of configuration
+                powerValue = (resultMap.value as Integer)/10            //TODO: The divisor value needs to be set as part of configuration
-                sendEvent(event)
+                sendEvent(name: "power", value: powerValue)
             }
         }
         else {
-            sendEvent(event)
+            sendEvent(name: resultMap.type, value: resultMap.value)
         }
     }
     else {

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

@@ -51,9 +51,15 @@ metadata {
 def parse(String description) {
     log.debug "description is $description"
 
-    def event = zigbee.getEvent(description)
+    def resultMap = zigbee.getKnownDescription(description)
-    if (event) {
+    if (resultMap) {
-        sendEvent(event)
+        log.info resultMap
+        if (resultMap.type == "update") {
+            log.info "$device updates: ${resultMap.value}"
+        }
+        else {
+            sendEvent(name: resultMap.type, value: resultMap.value)
+        }
     }
     else {
         log.warn "DID NOT PARSE MESSAGE for description : $description"

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

@@ -83,19 +83,32 @@ def uninstalled() {
 }
 
 def configure() {
+    /*
     def cmds =
-        zigbee.configureReporting(CLUSTER_DOORLOCK, DOORLOCK_ATTR_LOCKSTATE,
+        zigbee.configSetup("${CLUSTER_DOORLOCK}", "${DOORLOCK_ATTR_LOCKSTATE}",
-                                  TYPE_ENUM8, 0, 3600, null) +
+                           "${TYPE_ENUM8}", 0, 3600, "{01}") +
-        zigbee.configureReporting(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING,
+        zigbee.configSetup("${CLUSTER_POWER}", "${POWER_ATTR_BATTERY_PERCENTAGE_REMAINING}",
-                                  TYPE_U8, 600, 21600, 0x01)
+                           "${TYPE_U8}", 600, 21600, "{01}")
+    */
+    def zigbeeId = device.zigbeeId
+    def cmds =
+        [
+            "zdo bind 0x${device.deviceNetworkId} 0x${device.endpointId} 1 ${CLUSTER_DOORLOCK} {$zigbeeId} {}", "delay 200",
+            "zcl global send-me-a-report ${CLUSTER_DOORLOCK} ${DOORLOCK_ATTR_LOCKSTATE} ${TYPE_ENUM8} 0 3600 {01}", "delay 200",
+            "send 0x${device.deviceNetworkId} 1 0x${device.endpointId}", "delay 200",
+
+            "zdo bind 0x${device.deviceNetworkId} 0x${device.endpointId} 1 ${CLUSTER_POWER} {$zigbeeId} {}", "delay 200",
+            "zcl global send-me-a-report ${CLUSTER_POWER} ${POWER_ATTR_BATTERY_PERCENTAGE_REMAINING} ${TYPE_U8} 600 21600 {01}", "delay 200",
+            "send 0x${device.deviceNetworkId} 1 0x${device.endpointId}", "delay 200",
+        ]
     log.info "configure() --- cmds: $cmds"
     return cmds + refresh() // send refresh cmds as part of config
 }
 
 def refresh() {
     def cmds =
-        zigbee.readAttribute(CLUSTER_DOORLOCK, DOORLOCK_ATTR_LOCKSTATE) +
+        zigbee.refreshData("${CLUSTER_DOORLOCK}", "${DOORLOCK_ATTR_LOCKSTATE}") +
-        zigbee.readAttribute(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING)
+        zigbee.refreshData("${CLUSTER_POWER}", "${POWER_ATTR_BATTERY_PERCENTAGE_REMAINING}")
     log.info "refresh() --- cmds: $cmds"
     return cmds
 }
@@ -108,27 +121,34 @@ def parse(String description) {
         map = parseReportAttributeMessage(description)
     }
 
+    log.debug "parse() --- Parse returned $map"
     def result = map ? createEvent(map) : null
-    log.debug "parse() --- returned: $result"
     return result
 }
 
 // Lock capability commands
 def lock() {
-    def cmds = zigbee.command(CLUSTER_DOORLOCK, DOORLOCK_CMD_LOCK_DOOR)
+    //def cmds = zigbee.zigbeeCommand("${CLUSTER_DOORLOCK}", "${DOORLOCK_CMD_LOCK_DOOR}", "{}")
-    log.info "lock() -- cmds: $cmds"
+    //log.info "lock() -- cmds: $cmds"
-    return cmds
+    //return cmds
+    "st cmd 0x${device.deviceNetworkId} 0x${device.endpointId} ${CLUSTER_DOORLOCK} ${DOORLOCK_CMD_LOCK_DOOR} {}"
 }
 
 def unlock() {
-    def cmds = zigbee.command(CLUSTER_DOORLOCK, DOORLOCK_CMD_UNLOCK_DOOR)
+    //def cmds = zigbee.zigbeeCommand("${CLUSTER_DOORLOCK}", "${DOORLOCK_CMD_UNLOCK_DOOR}", "{}")
-    log.info "unlock() -- cmds: $cmds"
+    //log.info "unlock() -- cmds: $cmds"
-    return cmds
+    //return cmds
+    "st cmd 0x${device.deviceNetworkId} 0x${device.endpointId} ${CLUSTER_DOORLOCK} ${DOORLOCK_CMD_UNLOCK_DOOR} {}"
 }
 
 // Private methods
 private Map parseReportAttributeMessage(String description) {
+    log.trace "parseReportAttributeMessage() --- description: $description"
+
     Map descMap = zigbee.parseDescriptionAsMap(description)
+
+    log.debug "parseReportAttributeMessage() --- descMap: $descMap"
+
     Map resultMap = [:]
     if (descMap.clusterInt == CLUSTER_POWER && descMap.attrInt == POWER_ATTR_BATTERY_PERCENTAGE_REMAINING) {
         resultMap.name = "battery"
@@ -136,24 +156,18 @@ private Map parseReportAttributeMessage(String description) {
         if (device.getDataValue("manufacturer") == "Yale") {            //Handling issue with Yale locks incorrect battery reporting
             resultMap.value = Integer.parseInt(descMap.value, 16)
         }
+        log.info "parseReportAttributeMessage() --- battery: ${resultMap.value}"
     }
     else if (descMap.clusterInt == CLUSTER_DOORLOCK && descMap.attrInt == DOORLOCK_ATTR_LOCKSTATE) {
         def value = Integer.parseInt(descMap.value, 16)
-        def linkText = getLinkText(device)
         resultMap.name = "lock"
-        if (value == 0) {
+        resultMap.putAll([0:["value":"unknown",
-            resultMap.value = "unknown"
+                             "descriptionText":"Not fully locked"],
-            resultMap.descriptionText = "${linkText} is not fully locked"
+                          1:["value":"locked"],
-        } else if (value == 1) {
+                          2:["value":"unlocked"]].get(value,
-            resultMap.value = "locked"
+                                                      ["value":"unknown",
-            resultMap.descriptionText = "${linkText} is locked"
+                                                       "descriptionText":"Unknown lock state"]))
-        } else if (value == 2) {
+        log.info "parseReportAttributeMessage() --- lock: ${resultMap.value}"
-            resultMap.value = "unlocked"
-            resultMap.descriptionText = "${linkText} is unlocked"
-        } else {
-            resultMap.value = "unknown"
-            resultMap.descriptionText = "${linkText} is in unknown lock state"
-        }
     }
     else {
         log.debug "parseReportAttributeMessage() --- ignoring attribute"

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

@@ -51,15 +51,22 @@ metadata {
 // Parse incoming device messages to generate events
 def parse(String description) {
     log.debug "description is $description"
-    def event = zigbee.getEvent(description)
+
-    if (event) {
+    def resultMap = zigbee.getKnownDescription(description)
-        if (event.name == "power") {
+    if (resultMap) {
+        log.info resultMap
+        if (resultMap.type == "update") {
+            log.info "$device updates: ${resultMap.value}"
+        }
+        else if (resultMap.type == "power") {
             def powerValue
-            powerValue = (event.value as Integer)/10            //TODO: The divisor value needs to be set as part of configuration
+            if (device.getDataValue("manufacturer") != "OSRAM") {       //OSRAM devices do not reliably update power
-            sendEvent(name: "power", value: powerValue)
+                powerValue = (resultMap.value as Integer)/10            //TODO: The divisor value needs to be set as part of configuration
+                sendEvent(name: "power", value: powerValue)
+            }
         }
         else {
-            sendEvent(event)
+            sendEvent(name: resultMap.type, value: resultMap.value)
         }
     }
     else {

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

@@ -53,9 +53,16 @@ metadata {
 // Parse incoming device messages to generate events
 def parse(String description) {
     log.debug "description is $description"
-    def event = zigbee.getEvent(description)
+
-    if (event) {
+    def resultMap = zigbee.getKnownDescription(description)
-        sendEvent(event)
+    if (resultMap) {
+        log.info resultMap
+        if (resultMap.type == "update") {
+            log.info "$device updates: ${resultMap.value}"
+        }
+        else {
+            sendEvent(name: resultMap.type, value: resultMap.value)
+        }
     }
     else {
         log.warn "DID NOT PARSE MESSAGE for description : $description"

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

@@ -73,9 +73,16 @@ metadata {
 // Parse incoming device messages to generate events
 def parse(String description) {
     log.debug "description is $description"
-    def event = zigbee.getEvent(description)
+
-    if (event) {
+    def finalResult = zigbee.getKnownDescription(description)
-        sendEvent(event)
+    if (finalResult) {
+        log.info finalResult
+        if (finalResult.type == "update") {
+            log.info "$device updates: ${finalResult.value}"
+        }
+        else {
+            sendEvent(name: finalResult.type, value: finalResult.value)
+        }
     }
     else {
         log.warn "DID NOT PARSE MESSAGE for description : $description"

smartapps/osotech/plantlink-connector.src/plantlink-connector.groovy

@@ -87,10 +87,13 @@ def authPage(){
 }
 
 def installed() {
+    log.debug "Installed with settings: ${settings}"
     initialize()
 }
 
 def updated() {
+    log.debug "Updated with settings: ${settings}"
+    unsubscribe()
     initialize()
 }
 
@@ -103,24 +106,72 @@ def uninstalled() {
 }
 
 def initialize() {
-    unsubscribe()
+    atomicState.attached_sensors = [:]
     if (plantlinksensors){
+        subscribe(plantlinksensors, "moisture_status", moistureHandler)
+        subscribe(plantlinksensors, "battery_status", batteryHandler)
         plantlinksensors.each{ sensor_device ->
-        	subscribe(sensor_device, "moisture_status", moistureHandler)
+            sensor_device.setStatusIcon("Waiting on First Measurement")
-        	subscribe(sensor_device, "battery_status", batteryHandler)
             sensor_device.setInstallSmartApp("connectedToSmartApp")
         }
     }
 }
 
-def updatePlantNameIfNeeded(plant, expected_plant_name){
+def dock_sensor(device_serial, expected_plant_name) {
+    def docking_body_json_builder = new JsonBuilder([version: '1c', smartthings_device_id: device_serial])
+    def docking_params = [
+            uri        : appSettings.https_plantLinkServer,
+            path       : "/api/v1/smartthings/links",
+            headers    : ["Content-Type": "application/json", "Authorization": "Bearer ${atomicState.authToken}"],
+            contentType: "application/json",
+            body: docking_body_json_builder.toString()
+    ]
+    def plant_post_body_map = [
+            plant_type_key: 999999,
+            soil_type_key : 1000004
+    ]
+    def plant_post_params = [
+            uri        : appSettings.https_plantLinkServer,
+            path       : "/api/v1/plants",
+            headers    : ["Content-Type": "application/json", "Authorization": "Bearer ${atomicState.authToken}"],
+            contentType: "application/json",
+    ]
+    log.debug "Creating new plant on myplantlink.com - ${expected_plant_name}"
+    httpPost(docking_params) { docking_response ->
+        if (parse_api_response(docking_response, "Docking a link")) {
+            if (docking_response.data.plants.size() == 0) {
+                log.debug "creating plant for - ${expected_plant_name}"
+                plant_post_body_map["name"] = expected_plant_name
+                plant_post_body_map['links_key'] = [docking_response.data.key]
+                def plant_post_body_json_builder = new JsonBuilder(plant_post_body_map)
+                plant_post_params["body"] = plant_post_body_json_builder.toString()
+                httpPost(plant_post_params) { plant_post_response ->
+                    if(parse_api_response(plant_post_response, 'creating plant')){
+                        def attached_map = atomicState.attached_sensors
+                        attached_map[device_serial] = plant_post_response.data
+                        atomicState.attached_sensors = attached_map
+                    }
+                }
+            } else {
+                def plant = docking_response.data.plants[0]
+                def attached_map = atomicState.attached_sensors
+                attached_map[device_serial] = plant
+                atomicState.attached_sensors = attached_map
+                checkAndUpdatePlantIfNeeded(plant, expected_plant_name)
+            }
+        }
+    }
+    return true
+}
+
+def checkAndUpdatePlantIfNeeded(plant, expected_plant_name){
     def plant_put_params = [
 		uri : appSettings.https_plantLinkServer,
         headers : ["Content-Type": "application/json", "Authorization": "Bearer ${atomicState.authToken}"],
         contentType : "application/json"
     ]
     if (plant.name != expected_plant_name) {
-        log.debug "renaming plant ${plant.key} - ${expected_plant_name}"
+        log.debug "updating plant for - ${expected_plant_name}"
         plant_put_params["path"] = "/api/v1/plants/${plant.key}"
         def plant_put_body_map = [
 			name: expected_plant_name
@@ -134,39 +185,32 @@ def updatePlantNameIfNeeded(plant, expected_plant_name){
 }
 
 def moistureHandler(event){
-	log.debug "moistureHandler - ${event.value}"
+    def expected_plant_name = "SmartThings - ${event.displayName}"
-    
-    def expected_plant_name = "${event.displayName} (ST)"
     def device_serial = getDeviceSerialFromEvent(event)
-    def device_battery = atomicState["battery${device_serial}"]
+    
-    if ( device_battery == null){
+    if (!atomicState.attached_sensors.containsKey(device_serial)){
-    	log.error "Missing Battery Voltage - next cycle should have it"
+        dock_sensor(device_serial, expected_plant_name)
     }else{
-    	// {"type":"link","signal":"0x00","zigbeedeviceid":"0022A3000003D75A","created":1458843686,"moisture":"0x1987"}
-    	def appendedEventWithBatteryInfo = event.value.replace('}',",\"battery\":\"${device_battery}\"}")
-        log.debug "payload - ${appendedEventWithBatteryInfo}"
         def measurement_post_params = [
-            uri: appSettings.https_plantLinkServer,
+                uri: appSettings.https_plantLinkServer,
-            path: "/api/v1/smartthings/links/${device_serial}/measurements",
+                path: "/api/v1/smartthings/links/${device_serial}/measurements",
-            headers: ["Content-Type": "application/json", "Authorization": "Bearer ${atomicState.authToken}"],
+                headers: ["Content-Type": "application/json", "Authorization": "Bearer ${atomicState.authToken}"],
-            contentType: "application/json",
+                contentType: "application/json",
-            body: appendedEventWithBatteryInfo
+                body: event.value
         ]
-
         httpPost(measurement_post_params) { measurement_post_response ->
-            if (parse_api_response(measurement_post_response, 'creating moisture measurement') && measurement_post_response.data.size() >0){
+            if (parse_api_response(measurement_post_response, 'creating moisture measurement') &&
+                    measurement_post_response.data.size() >0){
                 def measurement = measurement_post_response.data[0]
                 def plant =  measurement.plant
-
+                log.debug plant
-                updatePlantNameIfNeeded(plant, expected_plant_name)
+                checkAndUpdatePlantIfNeeded(plant, expected_plant_name)
-
                 plantlinksensors.each{ sensor_device ->
                     if (sensor_device.id == event.deviceId){
                         sensor_device.setStatusIcon(plant.status)
                         if (plant.last_measurements && plant.last_measurements[0].moisture){
                             sensor_device.setPlantFuelLevel(plant.last_measurements[0].moisture * 100 as int)
                         }
-
                         if (plant.last_measurements && plant.last_measurements[0].battery){
                             sensor_device.setBatteryLevel(plant.last_measurements[0].battery * 100 as int)
                         }
@@ -180,7 +224,21 @@ def moistureHandler(event){
 def batteryHandler(event){
     def expected_plant_name = "SmartThings - ${event.displayName}"
     def device_serial = getDeviceSerialFromEvent(event)
-    atomicState["battery${device_serial}"] = getDeviceBatteryFromEvent(event)
+    
+    if (!atomicState.attached_sensors.containsKey(device_serial)){
+        dock_sensor(device_serial, expected_plant_name)
+    }else{
+        def measurement_post_params = [
+                uri: appSettings.https_plantLinkServer,
+                path: "/api/v1/smartthings/links/${device_serial}/measurements",
+                headers: ["Content-Type": "application/json", "Authorization": "Bearer ${atomicState.authToken}"],
+                contentType: "application/json",
+                body: event.value
+        ]
+        httpPost(measurement_post_params) { measurement_post_response ->
+            parse_api_response(measurement_post_response, 'creating battery measurement')
+        }
+    }
 }
 
 def getDeviceSerialFromEvent(event){
@@ -189,12 +247,6 @@ def getDeviceSerialFromEvent(event){
     return match_result[0][1]
 }
 
-def getDeviceBatteryFromEvent(event){
-    def pattern = /.*"battery"\s*:\s*"(\w+)".*/
-    def match_result = (event.value =~ pattern)
-    return match_result[0][1]
-}
-
 def oauthInitUrl(){
 	atomicState.oauthInitState = UUID.randomUUID().toString()
     def oauthParams = [
@@ -211,13 +263,12 @@ def buildRedirectUrl(){
 }
 
 def swapToken(){
-	log.debug "PlantLink Connector - OAuth Token"
     def code = params.code
     def oauthState = params.state
     def stcid = appSettings.client_id
     def postParams = [
             method: 'POST',
-            uri: appSettings.https_plantLinkServer,
+            uri: "https://oso-tech.appspot.com",
             path: "/api/v1/oauth-token",
             query: [grant_type:'authorization_code', code:params.code, client_id:stcid,
                     client_secret:appSettings.client_secret, redirect_uri: buildRedirectUrl()],
@@ -270,11 +321,10 @@ def swapToken(){
 }
 
 private refreshAuthToken() {
-	log.debug "PlantLink Connector - Refresh OAuth"
     def stcid = appSettings.client_id
     def refreshParams = [
             method: 'POST',
-            uri: appSettings.https_plantLinkServer,
+            uri: "https://hardware-dot-oso-tech.appspot.com",
             path: "/api/v1/oauth-token",
             query: [grant_type:'refresh_token', code:"${atomicState.refreshToken}", client_id:stcid,
                     client_secret:appSettings.client_secret],
@@ -283,6 +333,7 @@ private refreshAuthToken() {
         def jsonMap
         httpPost(refreshParams) { resp ->
             if(resp.status == 200){
+                log.debug "OAuth Token refreshed"
                 jsonMap = resp.data
                 if (resp.data) {
                     atomicState.refreshToken = resp?.data?.refresh_token
@@ -295,12 +346,12 @@ private refreshAuthToken() {
                 }
                 data.action = ""
             }else{
-                log.debug "PlantLink Server - ${resp.status} : ${resp.status.code}"
+                log.debug "refresh failed ${resp.status} : ${resp.status.code}"
             }
         }
     }
     catch(Exception e){
-        log.debug "PlantLink Connector - OAuth Refresh Failed: " + e
+        log.debug "caught exception refreshing auth token: " + e
     }
 }
 
@@ -313,7 +364,7 @@ def parse_api_response(resp, message) {
             refreshAuthToken()
             return false
         } else {
-            debugEvent("Plantlink Error: ${resp.status} - ${resp.status.code}", true)
+            debugEvent("Authentication error, invalid authentication method, lack of credentials, etc.", true)
             return false
         }
     }

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

@@ -161,7 +161,7 @@ private sendDeveloperReq() {
 		headers: [
 			HOST: host
 		],
-		body: [devicetype: "$token-0"]], "${selectedHue}"))
+		body: [devicetype: "$token-0", username: "$token-0"]], "${selectedHue}"))
 }
 
 private discoverHueBulbs() {
@@ -657,53 +657,39 @@ def setColorTemperature(childDevice, huesettings) {
 }
 
 def setColor(childDevice, huesettings) {
-    log.debug "Executing 'setColor($huesettings)'"
+	log.debug "Executing 'setColor($huesettings)'"
-    
-    def value = [:]
     def hue = null
     def sat = null
     def xy = null
-    
+    if (huesettings.hex) {
-    if (huesettings.hex != null) {
+    	xy = getHextoXY(huesettings.hex)
-        value.xy = getHextoXY(huesettings.hex)
+    } else if (huesettings.hue && huesettings.saturation) {
-    } else {
+		hue = Math.min(Math.round(huesettings.hue * 65535 / 100), 65535)
-        if (huesettings.hue != null)
+		sat = Math.min(Math.round(huesettings.saturation * 255 / 100), 255)
-            value.hue = Math.min(Math.round(huesettings.hue * 65535 / 100), 65535)
-        if (huesettings.saturation != null)   
-            value.sat = Math.min(Math.round(huesettings.saturation * 255 / 100), 255)
     }
-    
+    def alert = huesettings.alert ? huesettings.alert : "none"
-    // Default behavior is to turn light on 
+    def transition = huesettings.transition ? huesettings.transition : 4
-    value.on = true
 
-    if (huesettings.level != null) {
+	def value = [xy: xy, sat: sat, hue: hue, alert: alert, transitiontime: transition, on: true]
-        if (huesettings.level <= 0)
-            value.on = false
-        else if (huesettings.level == 1)
-            value.bri = 1
-        else 
-            value.bri = Math.min(Math.round(huesettings.level * 255 / 100), 255)
-    }
-    value.alert = huesettings.alert ? huesettings.alert : "none"
-    value.transition = huesettings.transition ? huesettings.transition : 4
 
-    // Make sure to turn off light if requested
+	if (huesettings.level != null) {
-    if (huesettings.switch == "off")
+        if (huesettings.level == 1) value.bri = 1 else value.bri = Math.min(Math.round(huesettings.level * 255 / 100), 255)
-        value.on = false
+		value.on = value.bri > 0
+	}
 
-    log.debug "sending command $value"
+	log.debug "sending command $value"
-    put("lights/${getId(childDevice)}/state", value)
+	put("lights/${getId(childDevice)}/state", value)
-    return "Color set to $value"
 }
 
 def nextLevel(childDevice) {
-    def level = device.latestValue("level") as Integer ?: 0
+	def level = device.latestValue("level") as Integer ?: 0
-    if (level < 100) {
+	if (level < 100) {
-        level = Math.min(25 * (Math.round(level / 25) + 1), 100) as Integer
+		level = Math.min(25 * (Math.round(level / 25) + 1), 100) as Integer
-    } else {
+	}
-        level = 25
+	else {
-    }
+		level = 25
-    setLevel(childDevice,level)
+	}
+	setLevel(childDevice,level)
 }
 
 private getId(childDevice) {
@@ -802,14 +788,16 @@ private getHextoXY(String colorStr) {
 
     // Make green more vivid
     if (normalizedToOne[1] > 0.04045) {
-        green = (float) Math.pow((normalizedToOne[1] + 0.055) / (1.0 + 0.055), 2.4);
+        green = (float) Math.pow((normalizedToOne[1] + 0.055)
+                / (1.0 + 0.055), 2.4);
     } else {
         green = (float) (normalizedToOne[1] / 12.92);
     }
 
     // Make blue more vivid
     if (normalizedToOne[2] > 0.04045) {
-        blue = (float) Math.pow((normalizedToOne[2] + 0.055) / (1.0 + 0.055), 2.4);
+        blue = (float) Math.pow((normalizedToOne[2] + 0.055)
+                / (1.0 + 0.055), 2.4);
     } else {
         blue = (float) (normalizedToOne[2] / 12.92);
     }
@@ -818,8 +806,8 @@ private getHextoXY(String colorStr) {
     float Y = (float) (red * 0.234327 + green * 0.743075 + blue * 0.022598);
     float Z = (float) (red * 0.0000000 + green * 0.053077 + blue * 1.035763);
 
-    float x = (X != 0 ? X / (X + Y + Z) : 0);
+    float x = X / (X + Y + Z);
-    float y = (Y != 0 ? Y / (X + Y + Z) : 0);
+    float y = Y / (X + Y + Z);
 
     double[] xy = new double[2];
     xy[0] = x;