Adding threeAxis event to the python script!

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 81948167ff4e386e19bf8cb09e2657b1fc40cd4e..1ad102977466a6eb9c3ba7dc72c4ab22348eb2be 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -59,7 +59,8 @@ eventTypeCounterMap =  {'lock': 2,
                                                'temperature' : 2,
                                                'heatingSetpoint' : 1,
                                                'coolingSetpoint' : 1,
                                                'temperature' : 2,
                                                'heatingSetpoint' : 1,
                                                'coolingSetpoint' : 1,

-                                               'thermostatSetpoint' : 1}
+                                               'thermostatSetpoint' : 1,
+                                                'threeAxis' : 1}

 
 # Mapping for specific event types
 eventTypesMap =           {'alarm.both': 'alarm',
 
 # Mapping for specific event types
 eventTypesMap =           {'alarm.both': 'alarm',


@@ -996,6 +997,11 @@ def ExtractEvents(extractedEvents):
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
                        for line in event:
                                extractedEvents.write(line)
                        event.close()

+                elif eventList[i] == "threeAxis":
+                        event = open("eventSimulator/threeAxisChangeEvent.groovy", "r")
+                        for line in event:
+                                extractedEvents.write(line)
+                        event.close()

                        
                ###TODO: Add more events later
                extractedEvents.write("\n\t\t\tbreak\n")
                        
                ###TODO: Add more events later
                extractedEvents.write("\n\t\t\tbreak\n")

diff --git a/eventSimulator/threeAxisChangeEvent.groovy b/eventSimulator/threeAxisChangeEvent.groovy
new file mode 100644 (file)
index 0000000..2ce9b60
--- /dev/null
+++ b/eventSimulator/threeAxisChangeEvent.groovy
@@ -0,0 +1,2 @@
+                       threeAxisObject.setValue([name: "threeAxis", value: '{"x": 1, "y": 2, "z": 3}', deviceId: "threeAxisID0", descriptionText: "",
+                               displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])