Adding events to emulate values above and below thresholds.

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index b274e4ddc3a9dd56a7dd6d241c5b26ff19a9b797..fb03c70fc42a302a0beebe9e139d7f395445c23e 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -48,7 +48,7 @@ eventTypeCounterMap =  {'lock': 2,
                                                'energy' : 1,
                                                'power' : 2,
                                                'illuminance' : 1,
-                                               'humidity' : 1,
+                                               'humidity' : 2,
                                                'alarm' : 4,
                                                'contact' : 2,
                                                'status' : 3,
@@ -820,7 +820,14 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "humidity":
-                       event = open("eventSimulator/humidityMeasurementEvent.groovy", "r")
+                       event = open("eventSimulator/humidityHighMeasurementEvent.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/humidityLowMeasurementEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()

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

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