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
9 changed files with 10 additions and 6 deletions
--- 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