Infrastructure now works for: locks, alarms, thermostats, and non-hue lights.

[smartthings-infrastructure.git] / ColorControl / ColorControl.groovy

diff --git a/ColorControl/ColorControl.groovy b/ColorControl/ColorControl.groovy
index 4d6eaf7ceb53b54aa58ef2627c49ba14b091300a..cd33e8e6ebc7756d27447d5af1a16809c09ce07d 100644 (file)
--- a/ColorControl/ColorControl.groovy
+++ b/ColorControl/ColorControl.groovy
@@ -9,10 +9,14 @@ public class ColorControl {
        private String label
        private String displayName
        private String color
+       private String currentColor
        private String currentSwitch
        private int level
+       private int currentLevel
        private int hue
+       private int currentHue
        private int saturation
+       private int currentSaturation
        private int colorTemperature
        
        ColorControl(Closure sendEvent, String id, String label, String displayName, String color, int hue, int saturation, int level, String currentSwitch, int colorTemperature) {
@@ -20,9 +24,13 @@ public class ColorControl {
                this.label = label
                this.displayName = displayName
                this.color = color
+               this.currentColor = color
                this.hue = hue
+               this.currentHue = hue
                this.saturation = saturation
+               this.currentSaturation = saturation
                this.level = level
+               this.currentLevel = level
                this.currentSwitch = currentSwitch
                this.colorTemperature = colorTemperature
                this.sendEvent = sendEvent
@@ -32,14 +40,18 @@ public class ColorControl {
        def setValue(String value, String name) {
                if ((name == "color") && (value != this.color)) {
                        this.color = value
+                       this.currentColor = value
                        println("the color of the light is changed to $value!")
                } else if ((name == "hue") && (value != this.hue)) {
                        this.hue = value.toInteger()
+                       this.currentHue = value.toInteger()
                        println("The hue level of the light is changed to $value!")
                } else if ((name == "saturation") && (value != this.saturation)) {
                        this.saturation = value.toInteger()
+                       this.currentSaturation = value.toInteger()
                        println("The saturation level of the light is changed to $value!")
                } else if ((name == "level") && (value != this.level)) {
+                       this.currentLevel = value.toInteger()
                        this.level = value.toInteger()
                        println("The level of the light is changed to $value!")
                } else if ((name == "currentSwitch") && (value != this.currentSwitch)) {
@@ -54,6 +66,7 @@ public class ColorControl {
        //methods
        def setColor(String color) {
                if (color != this.color) {
+                       this.currentColor = color
                        this.color = color
                        println("The color of the light is changed to $color!")
                        sendEvent([name: "color", value: "$color", deviceId: this.id, descriptionText: "",
@@ -64,6 +77,7 @@ public class ColorControl {
        def setHue(int hue) {
                if (hue != this.hue) {
                        this.hue = hue
+                       this.currentHue = hue
                        println("The hue level of the light is changed to $hue!")
                        sendEvent([name: "hue", value: "$hue", deviceId: this.id, descriptionText: "",
                                   displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
@@ -72,6 +86,7 @@ public class ColorControl {
 
        def setSaturation(int saturation) {
                if (saturation != this.saturation) {
+                       this.currentSaturation = saturation
                        this.saturation = saturation
                        println("The saturation level of the light is changed to $saturation!")
                        sendEvent([name: "saturation", value: "$saturation", deviceId: this.id, descriptionText: "",
@@ -81,6 +96,7 @@ public class ColorControl {
 
        def setLevel(int level) {
                if (level != this.level) {
+                       this.currentLevel = level
                        this.level = level
                        println("The level of the light is changed to $level!")
                        sendEvent([name: "level", value: "$level", deviceId: this.id, descriptionText: "",