Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 63f0111c98a89a4afe35dd15929cf10013f7754a..9437601d412579ff8abcf726dcf52128248f5233 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -796,7 +796,15 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "power":
-                       event = open("eventSimulator/powerMeterEvent.groovy", "r")
+                       #Write two events subsequently
+                       event = open("eventSimulator/powerMeterHighPowerEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
+                       event = open("eventSimulator/powerMeterLowPowerEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()

diff --git a/Location/LocationVar.groovy b/Location/LocationVar.groovy
index d006c4e70cdce141529b8038f1c1e838134f2346..3f28a0bfbe2100dc105cb8968a0fb2238211af80 100644 (file)
--- a/Location/LocationVar.groovy
+++ b/Location/LocationVar.groovy
@@ -36,4 +36,9 @@ class LocationVar {
                this.mode = sentMode
                sendEvent(eventDataMap)
        }
+
+       def currentValue(String deviceFeature) {
+               if (deviceFeature == "sunsetTime" || deviceFeature == "sunset")
+                       return System.currentTimeMillis()
+       }
 }

diff --git a/SpeechSynthesis/SpeechSynthesis.groovy b/SpeechSynthesis/SpeechSynthesis.groovy
index fb91378307726a2a98bc8fb5e433aa5d2796ba4e..1f25d79b5c873edf53c060076b4281ea383c8c5c 100644 (file)
--- a/SpeechSynthesis/SpeechSynthesis.groovy
+++ b/SpeechSynthesis/SpeechSynthesis.groovy
@@ -29,9 +29,9 @@ public class SpeechSynthesis {
                println("Speech synthesis with id:$id, SPEAKING:\"$message\"!")
                // As a conflict variable
                if (oneUser) {
-                       oneUser = false
+                       this.oneUser = false
                } else {
-                       oneUser = true
+                       this.oneUser = true
                }
        }
 }

diff --git a/SpeechSynthesis/SpeechSynthesises.groovy b/SpeechSynthesis/SpeechSynthesises.groovy
index 69601c48d37019a82048cd8f82c8f7e6cca3de17..876e48d5019f3f84958adbb4eb5664a8be02c671 100644 (file)
--- a/SpeechSynthesis/SpeechSynthesises.groovy
+++ b/SpeechSynthesis/SpeechSynthesises.groovy
@@ -61,9 +61,9 @@ public class SpeechSynthesises {
                speechSynthesises[0].speak(message)
                // As a conflict variable
                if (oneUser) {
-                       oneUser = false
+                       this.oneUser = false
                } else {
-                       oneUser = true
+                       this.oneUser = true
                }
        }
 

diff --git a/Variables and events for each device b/Variables and events for each device
index cd0d297502e32dbfdf9f1c84dbe0b683d76c0713..19d45030eb5cc219f4162443378feb5e59127bf2 100644 (file)
--- a/Variables and events for each device
+++ b/Variables and events for each device
@@ -55,6 +55,10 @@ locationObject.setValue([name: "sunset", value: "sunset", deviceId: "locationID0
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 locationObject.setValue([name: "sunrise", value: "sunrise", deviceId: "locationID0", descriptionText: "",
 displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+locationObject.setValue([name: "sunsetTime", value: "sunset", deviceId: "locationID0", descriptionText: "",
+displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+locationObject.setValue([name: "sunriseTime", value: "sunrise", deviceId: "locationID0", descriptionText: "",
+displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
 /*events*/
 //
 -------------------------------------------------------------------------------

diff --git a/eventSimulator/powerMeterHighPowerEvent.groovy b/eventSimulator/powerMeterHighPowerEvent.groovy
new file mode 100644 (file)
index 0000000..2fdf6dd
--- /dev/null
+++ b/eventSimulator/powerMeterHighPowerEvent.groovy
@@ -0,0 +1,2 @@
+                       powerMeterObject.setValue([name: "power", value: "70"/*A number between 0 to 100 as a charge*/, deviceId: "powerMeterID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])

diff --git a/eventSimulator/powerMeterLowPowerEvent.groovy b/eventSimulator/powerMeterLowPowerEvent.groovy
new file mode 100644 (file)
index 0000000..58f7c58
--- /dev/null
+++ b/eventSimulator/powerMeterLowPowerEvent.groovy
@@ -0,0 +1,2 @@
+                       powerMeterObject.setValue([name: "power", value: "30"/*A number between 0 to 100 as a charge*/, deviceId: "powerMeterID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])