changes in switch level class

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

diff --git a/SwitchLevel/SwitchLevel.groovy b/SwitchLevel/SwitchLevel.groovy
index 7db6a168d8cecdbe1ab33404aa6ab33b1e54ec08..ac7895733f874a70fe2af93a47784c10d2e39c68 100644 (file)
--- a/SwitchLevel/SwitchLevel.groovy
+++ b/SwitchLevel/SwitchLevel.groovy
@@ -9,9 +9,13 @@ public class SwitchLevel {
        private String switchState
        private String currentSwitch
        private int level
+       private int currentLevel
        private int rate
+       private int currentRate
        private int hue
+       private int currentHue
        private int saturation
+       private int currentSaturation
        private String switchLatestValue
        def sendEvent   
        def timers
@@ -24,9 +28,13 @@ public class SwitchLevel {
                this.label = label
                this.displayName = displayName
                this.level = level
+               this.currentLevel = level
                this.rate = level
+               this.currentRate = level
                this.hue = hue
+               this.currentHue = hue
                this.saturation = saturation
+               this.currentSaturation = saturation
                this.switchState = switchState
                this.currentSwitch = switchState
                this.switchLatestValue = switchLatestValue
@@ -36,9 +44,13 @@ public class SwitchLevel {
        def setColor(LinkedHashMap metaData) {
                if ((this.level != metaData["level"]) || (this.hue != metaData["hue"]) || (this.saturation != metaData["saturation"])) {
                        this.level = metaData["level"]
+                       this.currentLevel = metaData["level"]
                        this.rate = metaData["level"]
+                       this.currentRate = metaData["level"]
                        this.hue = metaData["hue"]
+                       this.currentHue = metaData["hue"]
                        this.saturation = metaData["saturation"]
+                       this.currentSaturation = metaData["saturation"]
                        println("the switch with id:$id is setted to level $level and hue to $hue and saturation to $saturation!")
                        sendEvent([name: "level", value: "$level", deviceId: this.id, descriptionText: "",
                                   displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
@@ -58,7 +70,9 @@ public class SwitchLevel {
                if (this.level != level) {
                        println("the switch with id:$id is setted to level $level!")
                        this.level = level
+                       this.currentLevel = level
                        this.rate = level
+                       this.currentRate = level
                        sendEvent([name: "level", value: "$level", deviceId: this.id, descriptionText: "",
                                   displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                }
@@ -68,7 +82,9 @@ public class SwitchLevel {
                if (this.level != level) {
                        println("the switch with id:$id is setted to level $level!")
                        this.level = level
+                       this.currentLevel = level
                        this.rate = level
+                       this.currentRate = level
                        sendEvent([name: "level", value: "$level", deviceId: this.id, descriptionText: "",
                                   displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                }
@@ -132,7 +148,9 @@ public class SwitchLevel {
                } else if (name == "level") {
                        println("the switch with id:$id is setted to level $value!")
                        this.level = value.toInteger()
+                       this.currentLevel = value.toInteger()
                        this.rate = value.toInteger()
+                       this.currentRate = value.toInteger()
                }
        }