Make a change in switchLevel class to make its variable specific with variables in...

diff --git a/SwitchLevel/SwitchLevel.groovy b/SwitchLevel/SwitchLevel.groovy
index 7db6a168d8cecdbe1ab33404aa6ab33b1e54ec08..2b5020eab7b4334234e02e550919768618d25b60 100644 (file)
--- a/SwitchLevel/SwitchLevel.groovy
+++ b/SwitchLevel/SwitchLevel.groovy
@@ -9,8 +9,11 @@ public class SwitchLevel {
        private String switchState
        private String currentSwitch
        private int level
        private String switchState
        private String currentSwitch
        private int level

+       private int currentLevel

        private int rate
        private int rate

+       private int currentRate

        private int hue
        private int hue

+       private int currentHue

        private int saturation
        private String switchLatestValue
        def sendEvent   
        private int saturation
        private String switchLatestValue
        def sendEvent   


@@ -24,8 +27,11 @@ public class SwitchLevel {
                this.label = label
                this.displayName = displayName
                this.level = level
                this.label = label
                this.displayName = displayName
                this.level = level

+               this.currentLevel = level

                this.rate = level
                this.rate = level

+               this.currentRate = level

                this.hue = hue
                this.hue = hue

+               this.currentHue = hue

                this.saturation = saturation
                this.switchState = switchState
                this.currentSwitch = switchState
                this.saturation = saturation
                this.switchState = switchState
                this.currentSwitch = switchState


@@ -36,8 +42,11 @@ public class SwitchLevel {
        def setColor(LinkedHashMap metaData) {
                if ((this.level != metaData["level"]) || (this.hue != metaData["hue"]) || (this.saturation != metaData["saturation"])) {
                        this.level = metaData["level"]
        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.rate = metaData["level"]

+                       this.currentRate = metaData["level"]

                        this.hue = metaData["hue"]
                        this.hue = metaData["hue"]

+                       this.currentHue = metaData["hue"]

                        this.saturation = 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: "",
                        this.saturation = 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: "",


@@ -58,7 +67,9 @@ public class SwitchLevel {
                if (this.level != level) {
                        println("the switch with id:$id is setted to level $level!")
                        this.level = level
                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.rate = level

+                       this.currentRate = level

                        sendEvent([name: "level", value: "$level", deviceId: this.id, descriptionText: "",
                                   displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                }
                        sendEvent([name: "level", value: "$level", deviceId: this.id, descriptionText: "",
                                   displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                }


@@ -68,7 +79,9 @@ public class SwitchLevel {
                if (this.level != level) {
                        println("the switch with id:$id is setted to level $level!")
                        this.level = level
                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.rate = level

+                       this.currentRate = level

                        sendEvent([name: "level", value: "$level", deviceId: this.id, descriptionText: "",
                                   displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                }
                        sendEvent([name: "level", value: "$level", deviceId: this.id, descriptionText: "",
                                   displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                }


@@ -132,7 +145,9 @@ public class SwitchLevel {
                } else if (name == "level") {
                        println("the switch with id:$id is setted to level $value!")
                        this.level = value.toInteger()
                } 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.rate = value.toInteger()

+                       this.currentRate = value.toInteger()

                }
        }
 
                }
        }
 

diff --git a/SwitchLevel/SwitchLevels.groovy b/SwitchLevel/SwitchLevels.groovy
index d9d2e267617a05943ffcc70f5eea37e0501cc240..bc9140cc4344c844f06a23bdf562ee654790c41f 100644 (file)
--- a/SwitchLevel/SwitchLevels.groovy
+++ b/SwitchLevel/SwitchLevels.groovy
@@ -13,8 +13,11 @@ public class SwitchLevels {
        private String label = "switchLevel0"
        private String displayName = "switchLevel0"
        private int level = 50
        private String label = "switchLevel0"
        private String displayName = "switchLevel0"
        private int level = 50

+       private int currentLevel = 50

        private int rate = 50
        private int rate = 50

+       private int currentRate = 50

        private int hue = 30
        private int hue = 30

+       private int currentHue = 30

        private int saturation = 70
        private String switchState = "on"
        private String currentSwitch = "on"
        private int saturation = 70
        private String switchState = "on"
        private String currentSwitch = "on"


@@ -28,16 +31,22 @@ public class SwitchLevels {
 
                if (init) {
                        this.level = 50
 
                if (init) {
                        this.level = 50

+                       this.currentLevel = 50

                        this.rate = 50
                        this.rate = 50

+                       this.currentRate = 50

                        this.hue = 30
                        this.hue = 30

+                       this.currentHue = 30

                        this.saturation = 70
                        this.switchState = "off"
                        this.currentSwitch = "off"
                        this.switchLatestValue = "off"
                } else {
                        this.level = 60
                        this.saturation = 70
                        this.switchState = "off"
                        this.currentSwitch = "off"
                        this.switchLatestValue = "off"
                } else {
                        this.level = 60

+                       this.currentLevel = 60

                        this.rate = 60
                        this.rate = 60

+                       this.currentRate = 60

                        this.hue = 50
                        this.hue = 50

+                       this.currentHue = 50

                        this.saturation = 90
                        this.switchState = "on"
                        this.currentSwitch = "on"
                        this.saturation = 90
                        this.switchState = "on"
                        this.currentSwitch = "on"


@@ -70,8 +79,11 @@ public class SwitchLevels {
        def setColor(LinkedHashMap metaData) {
                if ((this.level != metaData["level"]) || (this.hue != metaData["hue"]) || (this.saturation != metaData["saturation"])) {
                        this.level = metaData["level"]
        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.rate = metaData["level"]

+                       this.currentRate = metaData["level"]

                        this.hue = metaData["hue"]
                        this.hue = metaData["hue"]

+                       this.currentHue = metaData["hue"]

                        this.saturation = metaData["saturation"]
                        switchLevels[0].setColor(metaData)
                }
                        this.saturation = metaData["saturation"]
                        switchLevels[0].setColor(metaData)
                }


@@ -86,7 +98,9 @@ public class SwitchLevels {
                if (this.level != level) {
                        switchLevels[0].setLevel(level)
                        this.level = level
                if (this.level != level) {
                        switchLevels[0].setLevel(level)
                        this.level = level

+                       this.currentLevel = level

                        this.rate = level
                        this.rate = level

+                       this.currentRate = level

                }
        }
        
                }
        }
        


@@ -95,6 +109,8 @@ public class SwitchLevels {
                        switchLevels[0].setLevel(level)
                        this.level = level
                        this.rate = level
                        switchLevels[0].setLevel(level)
                        this.level = level
                        this.rate = level

+                       this.currentLevel = level
+                       this.currentRate = level

                }
        }
 
                }
        }
 


@@ -143,6 +159,8 @@ public class SwitchLevels {
                } else if (eventDataMap["name"] == "level") {
                        if (eventDataMap["value"].toInteger() != switchLevels[0].level) {
                                this.level = eventDataMap["value"].toInteger()
                } else if (eventDataMap["name"] == "level") {
                        if (eventDataMap["value"].toInteger() != switchLevels[0].level) {
                                this.level = eventDataMap["value"].toInteger()

+                               this.currentLevel = eventDataMap["value"].toInteger()
+                               this.currentRate = eventDataMap["value"].toInteger()

                                this.rate = eventDataMap["value"].toInteger()
                                switchLevels[0].setValue(eventDataMap["value"], "level")
                                sendEvent(eventDataMap)
                                this.rate = eventDataMap["value"].toInteger()
                                switchLevels[0].setValue(eventDataMap["value"], "level")
                                sendEvent(eventDataMap)