Adding new events.

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index d54f1963b0b7086c924ff5f84eac3f698edb5961..f986e1680be4e40d00f4bd90644aab0750dd2f6e 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -315,6 +315,49 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write("\t\t" + line)
                        event.close()
                        extractedEvents.write("\t\t\t}\n")
+               elif eventMap[i] == "acceleration":
+                       #Write two events subsequently
+                       extractedEvents.write("\t\t\tdef event = Verify.getInt(0,1)\n")
+                       extractedEvents.write("\t\t\tif (event == 0) {\n")
+                       event = open("eventSimulator/accelerationActiveEvent.groovy", "r")                      
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
+                       extractedEvents.write("\t\t\t} else {\n")
+                       event = open("eventSimulator/accelerationInactiveEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
+                       extractedEvents.write("\t\t\t}\n")
+               elif eventMap[i] == "beacon":
+                       #Write two events subsequently
+                       extractedEvents.write("\t\t\tdef event = Verify.getInt(0,1)\n")
+                       extractedEvents.write("\t\t\tif (event == 0) {\n")
+                       event = open("eventSimulator/beaconPresenceEvent.groovy", "r")                  
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
+                       extractedEvents.write("\t\t\t} else {\n")
+                       event = open("eventSimulator/beaconLeftEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
+                       extractedEvents.write("\t\t\t}\n")
+               elif eventMap[i] == "color":
+                       event = open("eventSimulator/colorChangeEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventMap[i] == "hue":
+                       event = open("eventSimulator/hueChangeEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventMap[i] == "saturation":
+                       event = open("eventSimulator/saturationChangeEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
 
                ###TODO: Add more events later
                extractedEvents.write("\t\t\tbreak\n")

diff --git a/eventSimulator/accelerationActiveEvent.groovy b/eventSimulator/accelerationActiveEvent.groovy
new file mode 100644 (file)
index 0000000..b7fa4d9
--- /dev/null
+++ b/eventSimulator/accelerationActiveEvent.groovy
@@ -0,0 +1,2 @@
+                       accelerationSensorObject.setValue([name: "acceleration", value: "active", deviceId: "accelerationSensorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])

diff --git a/eventSimulator/accelerationInactiveEvent.groovy b/eventSimulator/accelerationInactiveEvent.groovy
new file mode 100644 (file)
index 0000000..60c9021
--- /dev/null
+++ b/eventSimulator/accelerationInactiveEvent.groovy
@@ -0,0 +1,2 @@
+                       accelerationSensorObject.setValue([name: "acceleration", value: "inactive", deviceId: "accelerationSensorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])

diff --git a/eventSimulator/beaconLeftEvent.groovy b/eventSimulator/beaconLeftEvent.groovy
new file mode 100644 (file)
index 0000000..699c4e7
--- /dev/null
+++ b/eventSimulator/beaconLeftEvent.groovy
@@ -0,0 +1,2 @@
+                       beaconSensorObject.setValue([name: "beacon", value: "not present", deviceId: "beaconSensorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])

diff --git a/eventSimulator/beaconPresentEvent.groovy b/eventSimulator/beaconPresentEvent.groovy
new file mode 100644 (file)
index 0000000..0c20e73
--- /dev/null
+++ b/eventSimulator/beaconPresentEvent.groovy
@@ -0,0 +1,2 @@
+                       beaconSensorObject.setValue([name: "beacon", value: "present", deviceId: "beaconeSensorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])

diff --git a/eventSimulator/carbonMonoxideClearEvent.groovy b/eventSimulator/carbonMonoxideClearEvent.groovy
index 721fb9740475d7ed47388e5a4dbaf331a849dc0b..eca4d6cb2856230cddb5cc67af94629746572776 100644 (file)
--- a/eventSimulator/carbonMonoxideClearEvent.groovy
+++ b/eventSimulator/carbonMonoxideClearEvent.groovy
@@ -1,2 +1,2 @@
-                       smokeDetectorObject.setValue([name: "carbonMonoxide", value: "clear", deviceId: "smokeDetectorID0", descriptionText: "",
-                                               displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])
+                       carbonMonoxideDetectorObject.setValue([name: "carbonMonoxide", value: "clear", deviceId: "carbonMonoxideDetectorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])

diff --git a/eventSimulator/carbonMonoxideDetectedEvent.groovy b/eventSimulator/carbonMonoxideDetectedEvent.groovy
index 5aa27d1978a6b1fdc76ea26211575cfd0f607ece..98f57a6d1cd3cb93f69a3f47572dcb703470e4fb 100644 (file)
--- a/eventSimulator/carbonMonoxideDetectedEvent.groovy
+++ b/eventSimulator/carbonMonoxideDetectedEvent.groovy
@@ -1,2 +1,2 @@
-                       smokeDetectorObject.setValue([name: "carbonMonoxide", value: "detected", deviceId: "smokeDetectorID0", descriptionText: "",
+                       carbonMonoxideDetectorObject.setValue([name: "carbonMonoxide", value: "tested", deviceId: "carbonMonoxideDetectorID0", descriptionText: "",
                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])

diff --git a/eventSimulator/carbonMonoxideTestedEvent.groovy b/eventSimulator/carbonMonoxideTestedEvent.groovy
index 0c6e18e5dd3371283eea9c2c06660b34e7111130..98f57a6d1cd3cb93f69a3f47572dcb703470e4fb 100644 (file)
--- a/eventSimulator/carbonMonoxideTestedEvent.groovy
+++ b/eventSimulator/carbonMonoxideTestedEvent.groovy
@@ -1,2 +1,2 @@
-                       smokeDetectorObject.setValue([name: "carbonMonoxide", value: "tested", deviceId: "smokeDetectorID0", descriptionText: "",
+                       carbonMonoxideDetectorObject.setValue([name: "carbonMonoxide", value: "tested", deviceId: "carbonMonoxideDetectorID0", descriptionText: "",
                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])

diff --git a/eventSimulator/colorChangedEvent.groovy b/eventSimulator/colorChangedEvent.groovy
new file mode 100644 (file)
index 0000000..a90b2bc
--- /dev/null
+++ b/eventSimulator/colorChangedEvent.groovy
@@ -0,0 +1,2 @@
+                       colorControlObject.setValue([name: "color", value: "red", deviceId: "colorControlID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])

diff --git a/eventSimulator/hueChangedEvent.groovy b/eventSimulator/hueChangedEvent.groovy
new file mode 100644 (file)
index 0000000..1f9307b
--- /dev/null
+++ b/eventSimulator/hueChangedEvent.groovy
@@ -0,0 +1,2 @@
+                       colorControlObject.setValue([name: "hue", value: "50", deviceId: "colorControlID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])

diff --git a/eventSimulator/saturationChangedEvent.groovy b/eventSimulator/saturationChangedEvent.groovy
new file mode 100644 (file)
index 0000000..09d013b
--- /dev/null
+++ b/eventSimulator/saturationChangedEvent.groovy
@@ -0,0 +1,2 @@
+                       colorControlObject.setValue([name: "saturation", value: "50", deviceId: "colorControlID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])