Merge pull request #1629 from SmartThingsCommunity/staging

Rolling up staging to production
Merge pull request #1621 from varzac/zll-bulb-reporting
2026-03-09 21:03:00 +00:00 · 2017-01-31 13:25:26 -08:00 · 2017-01-27 16:37:34 -08:00 · 2017-01-26 11:27:51 -06:00 · 2017-01-25 04:13:47 -08:00 · 2017-01-25 04:12:42 -08:00
10 changed files with 33 additions and 33 deletions
--- a/devicetypes/smartthings/centralite-thermostat.src/centralite-thermostat.groovy
+++ b/devicetypes/smartthings/centralite-thermostat.src/centralite-thermostat.groovy
@@ -81,51 +81,47 @@ metadata {
 // parse events into attributes
 def parse(String description) {
 	log.debug "Parse description $description"
-	def map = [:]
-	if (description?.startsWith("read attr -")) {
-		def descMap = parseDescriptionAsMap(description)
-		log.debug "Desc Map: $descMap"
-		if (descMap.cluster == "0201" && descMap.attrId == "0000") {
+	List result = []
+	def descMap = zigbee.parseDescriptionAsMap(description)
+	log.debug "Desc Map: $descMap"
+	List attrData = [[cluster: descMap.cluster ,attrId: descMap.attrId, value: descMap.value]]
+	descMap.additionalAttrs.each {
+	    attrData << [cluster: descMap.cluster, attrId: it.attrId, value: it.value]
+	}
+	attrData.each {
+		def map = [:]
+		if (it.cluster == "0201" && it.attrId == "0000") {
 			log.debug "TEMP"
 			map.name = "temperature"
-			map.value = getTemperature(descMap.value)
+			map.value = getTemperature(it.value)
 			map.unit = temperatureScale
-		} else if (descMap.cluster == "0201" && descMap.attrId == "0011") {
+		} else if (it.cluster == "0201" && it.attrId == "0011") {
 			log.debug "COOLING SETPOINT"
 			map.name = "coolingSetpoint"
-			map.value = getTemperature(descMap.value)
+			map.value = getTemperature(it.value)
 			map.unit = temperatureScale
-		} else if (descMap.cluster == "0201" && descMap.attrId == "0012") {
+		} else if (it.cluster == "0201" && it.attrId == "0012") {
 			log.debug "HEATING SETPOINT"
 			map.name = "heatingSetpoint"
-			map.value = getTemperature(descMap.value)
+			map.value = getTemperature(it.value)
 			map.unit = temperatureScale
-		} else if (descMap.cluster == "0201" && descMap.attrId == "001c") {
+		} else if (it.cluster == "0201" && it.attrId == "001c") {
 			log.debug "MODE"
 			map.name = "thermostatMode"
-			map.value = getModeMap()[descMap.value]
-		} else if (descMap.cluster == "0202" && descMap.attrId == "0000") {
+			map.value = getModeMap()[it.value]
+		} else if (it.cluster == "0202" && it.attrId == "0000") {
 			log.debug "FAN MODE"
 			map.name = "thermostatFanMode"
-			map.value = getFanModeMap()[descMap.value]
+			map.value = getFanModeMap()[it.value]
 		}
+		if (map) {
+			result << createEvent(map)
+		}
+		log.debug "Parse returned $map"
 	}
-
-	def result = null
-	if (map) {
-		result = createEvent(map)
-	}
-	log.debug "Parse returned $map"
 	return result
 }

-def parseDescriptionAsMap(description) {
-	(description - "read attr - ").split(",").inject([:]) { map, param ->
-		def nameAndValue = param.split(":")
-		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
-	}
-}
-
 def getModeMap() { [
 	"00":"off",
 	"03":"cool",
--- a/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy
+++ b/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy
@@ -82,7 +82,7 @@ def on() {
 }

 def setLevel(value) {
-    zigbee.setLevel(value) + ["delay 500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
+    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()       //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }

 /**
--- a/devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy
+++ b/devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy
@@ -17,6 +17,7 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
+		capability "Light"

 		command "setAdjustedColor"
        command "reset"
--- a/devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy
+++ b/devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy
@@ -18,6 +18,7 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
+		capability "Light"

 		command "setAdjustedColor"
        command "reset"
--- a/devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy
+++ b/devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy
@@ -14,7 +14,8 @@ metadata {
 		capability "Switch"
 		capability "Refresh"
 		capability "Sensor"
-        capability "Health Check"
+		capability "Health Check"
+		capability "Light"

        command "refresh"
 	}
--- a/devicetypes/smartthings/hue-white-ambiance-bulb.src/hue-white-ambiance-bulb.groovy
+++ b/devicetypes/smartthings/hue-white-ambiance-bulb.src/hue-white-ambiance-bulb.groovy
@@ -16,6 +16,7 @@ metadata {
        capability "Switch"
        capability "Refresh"
        capability "Health Check"
+        capability "Light"

        command "refresh"
    }
--- a/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy
+++ b/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy
@@ -89,7 +89,7 @@ def on() {
 }

 def setLevel(value) {
-    zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
+    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }

 def refresh() {
--- a/devicetypes/smartthings/zll-rgb-bulb.src/zll-rgb-bulb.groovy
+++ b/devicetypes/smartthings/zll-rgb-bulb.src/zll-rgb-bulb.groovy
@@ -115,7 +115,7 @@ def refreshAttributes() {
 }

 def setLevel(value) {
-	zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
+	zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }

 def setColor(value){
--- a/devicetypes/smartthings/zll-rgbw-bulb.src/zll-rgbw-bulb.groovy
+++ b/devicetypes/smartthings/zll-rgbw-bulb.src/zll-rgbw-bulb.groovy
@@ -135,7 +135,7 @@ def setColorTemperature(value) {
 }

 def setLevel(value) {
-    zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
+    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()        //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }

 def setColor(value){
--- a/devicetypes/smartthings/zll-white-color-temperature-bulb.src/zll-white-color-temperature-bulb.groovy
+++ b/devicetypes/smartthings/zll-white-color-temperature-bulb.src/zll-white-color-temperature-bulb.groovy
@@ -90,7 +90,7 @@ def on() {
 }

 def setLevel(value) {
-    zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()
+    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()
 }

 def refresh() {
Author	SHA1	Message	Date
Vinay Rao	0846b6f34c	Merge pull request #1629 from SmartThingsCommunity/staging Rolling up staging to production	2017-01-31 13:25:26 -08:00
Vinay Rao	d4f21b95d7	Merge pull request #1621 from varzac/zll-bulb-reporting [DPROT-227] Manually refresh on/off status after setLevel	2017-01-27 16:37:34 -08:00
Zach Varberg	be2e19e406	Manually refresh on/off status after setLevel This is because ZLL bulbs do not report or allow for configuration of reporting of attributes. As a result if we change a value, we have to manually call a read of that attribute to update our status. This is a part of: https://smartthings.atlassian.net/browse/DPROT-227	2017-01-26 11:27:51 -06:00
Vinay Rao	8611d2e2d2	Merge pull request #1618 from workingmonk/feature/light_capability ICP-203 Adding Light Capability to hue lights	2017-01-25 04:13:47 -08:00
Vinay Rao	c650047f31	ICP-203 Adding Light Capability to hue lights	2017-01-25 04:12:42 -08:00
Vinay Rao	ded7501b84	Merge pull request #1614 from SmartThingsCommunity/master Rolling up master to staging	2017-01-24 13:21:44 -08:00
Vinay Rao	eb4d5dcfb8	Merge pull request #1613 from SmartThingsCommunity/staging Rolling down staging hotfix to master	2017-01-24 13:19:33 -08:00
Vinay Rao	6385443f20	Merge pull request #1612 from SmartThingsCommunity/production Rolling down production hotfix to staging	2017-01-24 12:48:34 -08:00
Juan Pablo Risso	445c115c14	DVCSMP-2324 - Centralite Thermostat handle multiple attributes (#1606 ) - Curly braces - remove parseDescriptionAsMap - descMap to it - Appended to the result list - Convert to list and appended	2017-01-20 17:49:15 -05:00
Vinay Rao	bd3367fe0e	Merge pull request #1598 from SmartThingsCommunity/staging Rolling down staging to master	2017-01-18 15:18:08 -08:00