public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[smartthings]Fix discovery service bug and enhancement to SmartApp for OH3 (#9889)

Browse Source 
Signed-off-by: Bob Raker <rjraker@gmail.com>
This commit is contained in:
Bob Raker
2021-02-04 00:48:15 -08:00
committed by GitHub
parent 96f15c59ba
commit d452469450
4 changed files with 86 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bundles/org.openhab.binding.smartthings/contrib/smartthings/SmartApps/OpenHabAppV2.groovy
View File

@@ -855,6 +855,8 @@ def actionAlarm(device, attribute, value) {
}
// This is the original color control
// 1-19-2021 The color values of on and off were added in response to issue https://github.com/BobRak/OpenHAB-Smartthings/issues/102
// These changes were made because OH 3.0 uses color values of on/off. OH 2 and 3.1 don't seem to need this.
def actionColorControl(device, attribute, value) {
log.debug "actionColor: attribute \"${attribute}\", value \"${value}\""
switch (attribute) {
@@ -865,15 +867,23 @@ def actionColorControl(device, attribute, value) {
device.setSaturation(value as int)
break
case "color":
def colormap = ["hue": value[0] as int, "saturation": value[1] as int]
// log.debug "actionColor: Setting device \"${device}\" with attribute \"${attribute}\" to colormap \"${colormap}\""
device.setColor(colormap)
device.setLevel(value[2] as int)
if (value == "off") {
device.off()
} else if (value == "on") {
device.on()
} else {
def colormap = ["hue": value[0] as int, "saturation": value[1] as int]
log.debug "actionColorControl: Setting device \"${device}\" with attribute \"${attribute}\" to colormap \"${colormap}\""
device.setColor(colormap)
device.setLevel(value[2] as int)
}
break
}
}
// This is the new "proposed" color. Here hue is 0-360
// 1-19-2021 The attributes of on and off were added in response to issue https://github.com/BobRak/OpenHAB-Smartthings/issues/102
// These changes were made because OH 3.0 uses color values of on/off. OH 2 and 3.1 don't seem to need this.
def actionColor(device, attribute, value) {
log.debug "actionColor: attribute \"${attribute}\", value \"${value}\""
switch (attribute) {
@@ -889,6 +899,14 @@ def actionColor(device, attribute, value) {
device.setColor(colormap)
device.setLevel(value[2] as int)
break
case "off":
// log.debug "actionColor: Setting device \"${device}\" with attribute \"${attribute}\" to off"
device.off()
break
case "on":
// log.debug "actionColor: Setting device \"${device}\" with attribute \"${attribute}\" to on"
device.on()
break
}
}