From fc50ce99ce7257fea17a466320da4f9677062377 Mon Sep 17 00:00:00 2001 From: rtrimana Date: Mon, 5 Aug 2019 10:48:40 -0700 Subject: [PATCH] Adding missing methods; setting default value to on. --- ColorControl/ColorControls.groovy | 14 ++++++++++---- ColorTemperature/ColorTemperature.groovy | 10 ++++++++++ ColorTemperature/ColorTemperatures.groovy | 14 +++++++++++--- Extractor/Extractor.groovy | 2 +- Switch/Switches.groovy | 4 ++-- SwitchLevel/SwitchLevel.groovy | 10 ++++++++++ SwitchLevel/SwitchLevels.groovy | 14 +++++++++++--- 7 files changed, 55 insertions(+), 13 deletions(-) diff --git a/ColorControl/ColorControls.groovy b/ColorControl/ColorControls.groovy index 7a54980..43c71e9 100644 --- a/ColorControl/ColorControls.groovy +++ b/ColorControl/ColorControls.groovy @@ -16,7 +16,7 @@ public class ColorControls { private String displayName = "colorControl0" private String color = "red" private String currentColor = "red" - private String currentSwitch = "off" + private String currentSwitch = "on" private int level = 50 private int currentLevel = 50 private int hue = 50 @@ -31,16 +31,22 @@ public class ColorControls { this.deviceNumbers = deviceNumbers this.colorControls = [] - def initHue = Verify.getIntFromList(30, 50) + /*def initHue = Verify.getIntFromList(30, 50) this.hue = initHue def initSat = Verify.getIntFromList(40, 50) this.saturation = initSat - def init = Verify.getInt(0,2) - if (init == 0) { + def initColor = Verify.getBoolean() + if (initColor) { this.color = "red" } else { this.color = "blue" } + def init = Verify.getBoolean() + if (init) { + this.currentSwitch = "off" + } else { + this.currentSwitch = "on" + }*/ colorControls.add(new ColorControl(sendEvent, id, label, displayName, this.color, this.hue, this.saturation, this.level, this.currentSwitch, this.colorTemperature)) } diff --git a/ColorTemperature/ColorTemperature.groovy b/ColorTemperature/ColorTemperature.groovy index d73ed9b..4956e04 100644 --- a/ColorTemperature/ColorTemperature.groovy +++ b/ColorTemperature/ColorTemperature.groovy @@ -49,6 +49,16 @@ public class ColorTemperature { displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) } } + + def setLevel(long 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: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) + } + } def setColorTemperature(int colorTemperature) { if (colorTemperature != this.colorTemperature) { diff --git a/ColorTemperature/ColorTemperatures.groovy b/ColorTemperature/ColorTemperatures.groovy index a1e19dc..99fe7e6 100644 --- a/ColorTemperature/ColorTemperatures.groovy +++ b/ColorTemperature/ColorTemperatures.groovy @@ -14,7 +14,7 @@ public class ColorTemperatures { private String id = "colorTemperatureID0" private String label = "colorTemperature0" private String displayName = "colorTemperature0" - private String currentSwitch = "off" + private String currentSwitch = "on" private int level = 50 private int currentLevel = 50 private int colorTemperature = 15000 @@ -25,7 +25,7 @@ public class ColorTemperatures { this.deviceNumbers = deviceNumbers this.colorTemperatues = [] - def initLevel = Verify.getIntFromList(50, 70) + /*def initLevel = Verify.getIntFromList(50, 70) this.level = initLevel def initTemp = Verify.getIntFromList(10000, 15000) this.colorTemperature = initTemp @@ -34,7 +34,7 @@ public class ColorTemperatures { this.currentSwitch = "off" } else { this.currentSwitch = "on" - } + }*/ colorTemperatues.add(new ColorTemperature(sendEvent, id, label, displayName, this.level, this.currentSwitch, this.colorTemperature)) } @@ -85,6 +85,14 @@ public class ColorTemperatures { //methods + def setLevel(long level) { + if (level != this.level) { + this.currentLevel = level + this.level = level + colorTemperatues[0].setLevel(level) + } + } + def setLevel(int level) { if (level != this.level) { this.currentLevel = level diff --git a/Extractor/Extractor.groovy b/Extractor/Extractor.groovy index e954203..19e5016 100644 --- a/Extractor/Extractor.groovy +++ b/Extractor/Extractor.groovy @@ -1555,7 +1555,7 @@ def input(LinkedHashMap metaData) { case "mode": //def randomVariable = Math.abs(new Random().nextInt() % 3) def modes = ["away", "home", "night"] - def userInput = modes[0] + def userInput = modes[1] if (modeVariables == 0) { mode0 = metaData['name'] diff --git a/Switch/Switches.groovy b/Switch/Switches.groovy index 5a27540..a13030a 100644 --- a/Switch/Switches.groovy +++ b/Switch/Switches.groovy @@ -26,10 +26,10 @@ public class Switches { this.deviceNumbers = deviceNumbers this.switches = [] - /*def initLevel = Verify.getIntFromList(30, 50, 70) + def initLevel = Verify.getIntFromList(30, 50, 70) this.currentLevel = initLevel def init = Verify.getBoolean() - if (init) { + /*if (init) { this.switchState = "off" this.currentSwitch = "off" this.switchLatestValue = "off" diff --git a/SwitchLevel/SwitchLevel.groovy b/SwitchLevel/SwitchLevel.groovy index 24bd7bf..ccd8e96 100644 --- a/SwitchLevel/SwitchLevel.groovy +++ b/SwitchLevel/SwitchLevel.groovy @@ -38,6 +38,16 @@ public class SwitchLevel { displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) } } + + def setLevel(long level) { + if (this.level != level) { + println("the switch with id:$id is setted to level $level!") + this.level = level + this.rate = level + sendEvent([name: "level", value: "$level", deviceId: this.id, descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}']) + } + } def on() { if (this.switchState != "on") { diff --git a/SwitchLevel/SwitchLevels.groovy b/SwitchLevel/SwitchLevels.groovy index 1bae6a1..6ceaf8f 100644 --- a/SwitchLevel/SwitchLevels.groovy +++ b/SwitchLevel/SwitchLevels.groovy @@ -17,9 +17,9 @@ public class SwitchLevels { private String displayName = "switchLevel0" private int level = 50 private int rate = 50 - private String switchState = "off" - private String currentSwitch = "off" - private String switchLatestValue = "off" + private String switchState = "on" + private String currentSwitch = "on" + private String switchLatestValue = "on" SwitchLevels(Closure sendEvent, int deviceNumbers) { this.sendEvent = sendEvent @@ -70,6 +70,14 @@ public class SwitchLevels { this.rate = level } } + + def setLevel(long level) { + if (this.level != level) { + switchLevels[0].setLevel(level) + this.level = level + this.rate = level + } + } def on() { switchLatestValue = "on" -- 2.34.1