Adding another value for illuminance measurement event.

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 1643c43b02ee8e6d758333bc5fd76fe319d785a5..660295dc5aea9944eb261ad96b832232a3b91812 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -47,7 +47,7 @@ eventTypeCounterMap =  {'lock': 2,
                                                'saturation' : 1,
                                                'energy' : 1,
                                                'power' : 2,
-                                               'illuminance' : 1,
+                                               'illuminance' : 2,
                                                'humidity' : 2,
                                                'alarm' : 4,
                                                'contact' : 2,
@@ -60,7 +60,7 @@ eventTypeCounterMap =  {'lock': 2,
                                                'heatingSetpoint' : 1,
                                                'coolingSetpoint' : 1,
                                                'thermostatSetpoint' : 1,
-                                                'threeAxis' : 1}
+                                               'threeAxis' : 1}
 
 # Mapping for specific event types
 eventTypesMap =           {'alarm.both': 'alarm',
@@ -824,7 +824,14 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "illuminance":
-                       event = open("eventSimulator/illuminanceMeasurementEvent.groovy", "r")
+                       event = open("eventSimulator/illuminanceMeasurementLowEvent.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/illuminanceMeasurementHighEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()

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

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

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