ICP-8341 Update setLevel to follow capability spec (SmartThingsCommun…

…ity#3999) * ICP-8341 Update setLevel to follow capability spec * Add Hue bulbs
JamieP83 · Mar 6, 2019 · 7b9af01 · 7b9af01
1 parent 3177284
commit 7b9af01
Show file tree

Hide file tree

Showing 40 changed files with 42 additions and 42 deletions.
diff --git a/devicetypes/capabilities/switch-level-capability.src/switch-level-capability.groovy b/devicetypes/capabilities/switch-level-capability.src/switch-level-capability.groovy
@@ -71,7 +71,7 @@ def off() {
 	'off'
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	"setLevel: $value"
 }
 

diff --git a/devicetypes/keen-home/keen-home-smart-vent.src/keen-home-smart-vent.groovy b/devicetypes/keen-home/keen-home-smart-vent.src/keen-home-smart-vent.groovy
@@ -370,7 +370,7 @@ def clearObstruction() {
     ] + configure()
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
     log.debug "setting level: ${value}"
     def linkText = getLinkText(device)
 

diff --git a/devicetypes/smartthings/cooper-rf9500.src/cooper-rf9500.groovy b/devicetypes/smartthings/cooper-rf9500.src/cooper-rf9500.groovy
@@ -85,7 +85,7 @@ def leveldown() {
     	setLevel(curlevel - 10)
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	log.trace "setLevel($value)"
 	sendEvent(name: "level", value: value)
 }

diff --git a/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy b/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy
@@ -82,7 +82,7 @@ def on() {
     zigbee.on()
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
     zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()       //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 

diff --git a/devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy b/devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy
@@ -319,7 +319,7 @@ def setColor(value) {
     sendRGB(value.rh, value.gh, value.bh)
 }
 
-def setLevel(level) {
+def setLevel(level, rate = null) {
 	log.debug "setLevel($level)"
 
 	if (level == 0) { off() }

diff --git a/devicetypes/smartthings/ge-link-bulb.src/ge-link-bulb.groovy b/devicetypes/smartthings/ge-link-bulb.src/ge-link-bulb.groovy
@@ -198,7 +198,7 @@ def refresh() {
     return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig()
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
     def cmd
     def delayForRefresh = 500
     if (dimRate && (state?.rate != null)) {

diff --git a/devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy b/devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy
@@ -99,7 +99,7 @@ void off() {
 	log.trace parent.off(this)
 }
 
-void setLevel(percent) {
+void setLevel(percent, rate = null) {
     log.debug "Executing 'setLevel'"
     if (verifyPercent(percent)) {
 	    log.trace parent.setLevel(this, percent)

diff --git a/devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy b/devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy
@@ -108,7 +108,7 @@ void off() {
 	log.trace parent.off(this)
 }
 
-void setLevel(percent) {
+void setLevel(percent, rate = null) {
     log.debug "Executing 'setLevel'"
     if (verifyPercent(percent)) {
 	    log.trace parent.setLevel(this, percent)

diff --git a/devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy b/devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy
@@ -91,7 +91,7 @@ void off() {
 	log.trace parent.off(this)
 }
 
-void setLevel(percent) {
+void setLevel(percent, rate = null) {
 	log.debug "Executing 'setLevel'"
     if (percent != null && percent >= 0 && percent <= 100) {
 		parent.setLevel(this, percent)

diff --git 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
@@ -97,7 +97,7 @@ void off() {
     log.trace parent.off(this)
 }
 
-void setLevel(percent) {
+void setLevel(percent, rate = null) {
     log.debug "Executing 'setLevel'"
     if (percent != null && percent >= 0 && percent <= 100) {
         log.trace parent.setLevel(this, percent)

diff --git a/devicetypes/smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy b/devicetypes/smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy
@@ -141,7 +141,7 @@ def setColor(Map color) {
     return []
 }
 
-def setLevel(percentage) {
+def setLevel(percentage, rate = null) {
     log.debug "setLevel ${percentage}"
     if (percentage < 1 && percentage > 0) {
         percentage = 1 // clamp to 1%

diff --git a/devicetypes/smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy b/devicetypes/smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy
@@ -70,7 +70,7 @@ def updated() {
 }
 
 // handle commands
-def setLevel(percentage) {
+def setLevel(percentage, rate = null) {
     log.debug "setLevel ${percentage}"
     if (percentage < 1 && percentage > 0) {
         percentage = 1 // clamp to 1%

diff --git a/devicetypes/smartthings/smartpower-dimming-outlet.src/smartpower-dimming-outlet.groovy b/devicetypes/smartthings/smartpower-dimming-outlet.src/smartpower-dimming-outlet.groovy
@@ -85,7 +85,7 @@ def parse(String description) {
 	return event ? createEvent(event) : event
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	zigbee.setLevel(value)
 }
 

diff --git a/devicetypes/smartthings/sylvania-ultra-iq.src/sylvania-ultra-iq.groovy b/devicetypes/smartthings/sylvania-ultra-iq.src/sylvania-ultra-iq.groovy
@@ -75,7 +75,7 @@ def off() {
 	sendEvent(name: "switch", value: "off")
 	"st cmd 0x${device.deviceNetworkId} ${endpointId} 6 0 {}"
 }
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	log.trace "setLevel($value)"
 	def cmds = []
 

diff --git a/devicetypes/smartthings/testing/simulated-rgb-bulb.src/simulated-rgb-bulb.groovy b/devicetypes/smartthings/testing/simulated-rgb-bulb.src/simulated-rgb-bulb.groovy
@@ -310,7 +310,7 @@ def off() {
     done()
 }
 
-def setLevel(levelPercent) {
+def setLevel(levelPercent, rate = null) {
     Integer boundedPercent = boundInt(levelPercent, PERCENT_RANGE)
     log.trace "Executing 'setLevel' ${boundedPercent}%"
     def effectiveMode = device.currentValue("bulbMode")

diff --git a/devicetypes/smartthings/testing/simulated-rgbw-bulb.src/simulated-rgbw-bulb.groovy b/devicetypes/smartthings/testing/simulated-rgbw-bulb.src/simulated-rgbw-bulb.groovy
@@ -352,7 +352,7 @@ def off() {
     done()
 }
 
-def setLevel(levelPercent) {
+def setLevel(levelPercent, rate = null) {
     Integer boundedPercent = boundInt(levelPercent, PERCENT_RANGE)
     log.trace "executing 'setLevel' ${boundedPercent}%"
     def effectiveMode = device.currentValue("bulbMode")

diff --git a/.../smartthings/testing/simulated-temperature-sensor.src/simulated-temperature-sensor.groovy b/.../smartthings/testing/simulated-temperature-sensor.src/simulated-temperature-sensor.groovy
@@ -73,7 +73,7 @@ def initialize() {
     }
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
     setTemperature(value)
 }
 

diff --git a/.../simulated-white-color-temperature-bulb.src/simulated-white-color-temperature-bulb.groovy b/.../simulated-white-color-temperature-bulb.src/simulated-white-color-temperature-bulb.groovy
@@ -223,7 +223,7 @@ def off() {
     done()
 }
 
-def setLevel(levelPercent) {
+def setLevel(levelPercent, rate = null) {
     Integer boundedPercent = boundInt(levelPercent, PERCENT_RANGE)
     log.trace "executing 'setLevel' ${boundedPercent}%"
     def effectiveMode = device.currentValue("bulbMode")

diff --git a/devicetypes/smartthings/tile-ux/tile-basic-slider.src/tile-basic-slider.groovy b/devicetypes/smartthings/tile-ux/tile-basic-slider.src/tile-basic-slider.groovy
@@ -64,7 +64,7 @@ def installed() {
 def parse(String description) {
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	log.debug "setting level to $value"
 	sendEvent(name:"level", value:value)
 }

diff --git a/...es/smartthings/tile-ux/tile-multiattribute-generic.src/tile-multiattribute-generic.groovy b/...es/smartthings/tile-ux/tile-multiattribute-generic.src/tile-multiattribute-generic.groovy
@@ -124,7 +124,7 @@ def off() {
 	sendEvent(name: "switch", value: "off")
 }
 
-def setLevel(percent) {
+def setLevel(percent, rate = null) {
 	log.debug "setLevel: ${percent}, this"
 	sendEvent(name: "level", value: percent)
 }

diff --git a/.../smartthings/tile-ux/tile-multiattribute-lighting.src/tile-multiattribute-lighting.groovy b/.../smartthings/tile-ux/tile-multiattribute-lighting.src/tile-multiattribute-lighting.groovy
@@ -144,7 +144,7 @@ def nextLevel() {
 	setLevel(level)
 }
 
-def setLevel(percent) {
+def setLevel(percent, rate = null) {
 	log.debug "setLevel: ${percent}, this"
 	sendEvent(name: "level", value: percent)
 	def power = Math.round(percent / 1.175) * 0.1

diff --git a/devicetypes/smartthings/wemo-bulb.src/wemo-bulb.groovy b/devicetypes/smartthings/wemo-bulb.src/wemo-bulb.groovy
@@ -113,7 +113,7 @@ def refresh() {
     ]
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	log.trace "setLevel($value)"
 	def cmds = []
 

diff --git a/devicetypes/smartthings/zigbee-accessory-dimmer.src/zigbee-accessory-dimmer.groovy b/devicetypes/smartthings/zigbee-accessory-dimmer.src/zigbee-accessory-dimmer.groovy
@@ -110,7 +110,7 @@ def on() {
 	sendEvent(name: "switch", value: "on", isStateChange: true)
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	if (value == 0) {
 		sendEvent(name: "switch", value: "off")
 	} else {

diff --git a/devicetypes/smartthings/zigbee-dimmer-power.src/zigbee-dimmer-power.groovy b/devicetypes/smartthings/zigbee-dimmer-power.src/zigbee-dimmer-power.groovy
@@ -105,7 +105,7 @@ def on() {
     zigbee.on()
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
     zigbee.setLevel(value) + (value?.toInteger() > 0 ? zigbee.on() : [])
 }
 

diff --git a/.../smartthings/zigbee-dimmer-with-motion-sensor.src/zigbee-dimmer-with-motion-sensor.groovy b/.../smartthings/zigbee-dimmer-with-motion-sensor.src/zigbee-dimmer-with-motion-sensor.groovy
@@ -128,7 +128,7 @@ def on() {
 	zigbee.on()
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	zigbee.setLevel(value)
 }
 /**

diff --git a/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy b/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
@@ -127,7 +127,7 @@ def on() {
 	zigbee.on()
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	def additionalCmds = []
 	if (device.getDataValue("model") == "iQBR30" && value.toInteger() > 0) { // Handle iQ bulb not following spec
 		additionalCmds = zigbee.on()

diff --git a/devicetypes/smartthings/zigbee-rgb-bulb.src/zigbee-rgb-bulb.groovy b/devicetypes/smartthings/zigbee-rgb-bulb.src/zigbee-rgb-bulb.groovy
@@ -142,7 +142,7 @@ def configure() {
 	refresh()
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	zigbee.setLevel(value)
 }
 

diff --git a/devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy b/devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy
@@ -209,7 +209,7 @@ def setGenericName(value){
 	}
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	zigbee.setLevel(value)
 }
 

diff --git a/...things/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy b/...things/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy
@@ -151,7 +151,7 @@ def on() {
 	zigbee.on()
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	zigbee.setLevel(value)
 }
 
@@ -223,4 +223,4 @@ def installed() {
 			sendEvent(name: "level", value: 100)
 		}
 	}
-}
+}
diff --git a/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy b/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy
@@ -102,7 +102,7 @@ def on() {
 	zigbee.on() + ["delay 1500"] + zigbee.onOffRefresh()
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()
 	//adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
@@ -149,4 +149,4 @@ def configure() {
 def updated() {
 	log.debug "updated()"
 	configureHealthCheck()
-}
+}
diff --git a/devicetypes/smartthings/zll-rgb-bulb.src/zll-rgb-bulb.groovy b/devicetypes/smartthings/zll-rgb-bulb.src/zll-rgb-bulb.groovy
@@ -203,7 +203,7 @@ def installed() {
 	configureHealthCheck()
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh() // adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 

diff --git a/devicetypes/smartthings/zll-rgbw-bulb.src/zll-rgbw-bulb.groovy b/devicetypes/smartthings/zll-rgbw-bulb.src/zll-rgbw-bulb.groovy
@@ -205,7 +205,7 @@ def setColorTemperature(value) {
     zigbee.readAttribute(COLOR_CONTROL_CLUSTER, ATTRIBUTE_COLOR_TEMPERATURE)
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
     zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()        //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 

diff --git a/.../zll-white-color-temperature-bulb-5000k.src/zll-white-color-temperature-bulb-5000k.groovy b/.../zll-white-color-temperature-bulb-5000k.src/zll-white-color-temperature-bulb-5000k.groovy
@@ -102,7 +102,7 @@ def on() {
     zigbee.on() + ["delay 1500"] + zigbee.onOffRefresh()
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
     zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()
 }
 

diff --git a/.../smartthings/zll-white-color-temperature-bulb.src/zll-white-color-temperature-bulb.groovy b/.../smartthings/zll-white-color-temperature-bulb.src/zll-white-color-temperature-bulb.groovy
@@ -103,7 +103,7 @@ def on() {
 	zigbee.on() + ["delay 1500"] + zigbee.onOffRefresh()
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()
 }
 

diff --git a/devicetypes/smartthings/zwave-device-multichannel.src/zwave-device-multichannel.groovy b/devicetypes/smartthings/zwave-device-multichannel.src/zwave-device-multichannel.groovy
@@ -316,7 +316,7 @@ def refresh() {
 	command(zwave.basicV1.basicGet())
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	commands([zwave.basicV1.basicSet(value: value as Integer), zwave.basicV1.basicGet()], 4000)
 }
 

diff --git a/devicetypes/smartthings/zwave-device.src/zwave-device.groovy b/devicetypes/smartthings/zwave-device.src/zwave-device.groovy
@@ -131,7 +131,7 @@ def refresh() {
 	command(zwave.basicV1.basicGet())
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	commands([zwave.basicV1.basicSet(value: value as Integer), zwave.basicV1.basicGet()], 4000)
 }
 

diff --git a/devicetypes/smartthings/zwave-fan-controller.src/zwave-fan-controller.groovy b/devicetypes/smartthings/zwave-fan-controller.src/zwave-fan-controller.groovy
@@ -122,7 +122,7 @@ def off() {
 	setLevel(0x00)
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	log.debug "setLevel >> value: $value"
 	def level = value as Integer
 	level = level == 255 ? level : Math.max(Math.min(level, 99), 0)

diff --git a/devicetypes/smartthings/zwave-metering-dimmer.src/zwave-metering-dimmer.groovy b/devicetypes/smartthings/zwave-metering-dimmer.src/zwave-metering-dimmer.groovy
@@ -216,7 +216,7 @@ def refresh() {
 	], 1000)
 }
 
-def setLevel(level) {
+def setLevel(level, rate = null) {
 	if(level > 99) level = 99
 	encapSequence([
 		zwave.basicV1.basicSet(value: level),

diff --git a/devicetypes/vlaminck/minecraft/smart-block.src/smart-block.groovy b/devicetypes/vlaminck/minecraft/smart-block.src/smart-block.groovy
@@ -115,7 +115,7 @@ def off() {
 	sendSwitchStateToMC("off")
 }
 
-def setLevel(newLevel) {
+def setLevel(newLevel, rate = null) {
 	def signal = convertLevelToSignal(newLevel as int)
 
 	sendSignalToMC(signal)

diff --git a/devicetypes/wackford/tcp-bulb.src/tcp-bulb.groovy b/devicetypes/wackford/tcp-bulb.src/tcp-bulb.groovy
@@ -165,7 +165,7 @@ def levelDown() {
 	setLevel(level)
 }
 
-def setLevel(value) {
+def setLevel(value, rate = null) {
 	log.debug "in setLevel with value: ${value}"
 	def level = value as Integer
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,7 @@ def off() { @@
     	'off'
     }
-    def setLevel(value) {
+    def setLevel(value, rate = null) {
     	"setLevel: $value"
     }
@@ Expand Down @@