Some minor changes!

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index a5d46c899934a97e650c73d5a28ecd2f692dfdd3..2c965908705c6ce01e97c1a12739009886ffa5c4 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -461,6 +461,7 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "motion":
+                        print("HERE????")
                        #Write two events subsequently
                        event = open("eventSimulator/motionActiveEvent.groovy", "r")                    
                        for line in event:

diff --git a/Switch/Switches.groovy b/Switch/Switches.groovy
index c27440d0db938f74d5f062dc95615fa1f7e7a3f6..152096db303471cfc66dfece1098095c9ea6e478 100644 (file)
--- a/Switch/Switches.groovy
+++ b/Switch/Switches.groovy
@@ -51,6 +51,9 @@ public class Switches {
        def each(Closure Input) {
                switches.each(Input)
        }
+       def eachWithIndex(Closure Input) {
+               switches.eachWithIndex(Input)
+       }
        def find(Closure Input) {
                switches.find(Input)
        }

diff --git a/eventSimulator/buttonHeldEvent.groovy b/eventSimulator/buttonHeldEvent.groovy
index 76209df0fb9e2302688194ad126daf94c52efca5..8a8f90de71778954507b0c91b21053c5f840d091 100644 (file)
--- a/eventSimulator/buttonHeldEvent.groovy
+++ b/eventSimulator/buttonHeldEvent.groovy
@@ -1,2 +1,11 @@
                        buttonObject.setValue([name: "button", value: "held", deviceId: "switchID0", descriptionText: "",
-                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"buttonNumber": 3}'])
+                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"buttonNumber": 1}'])
+
+                       buttonObject.setValue([name: "button", value: "held", deviceId: "switchID0", descriptionText: "",
+                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"buttonNumber": 2}'])
+
+                       buttonObject.setValue([name: "button", value: "held", deviceId: "switchID0", descriptionText: "",
+                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"buttonNumber": 3}'])                   
+
+                       buttonObject.setValue([name: "button", value: "held", deviceId: "switchID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"buttonNumber": 4}'])

diff --git a/eventSimulator/buttonPushedEvent.groovy b/eventSimulator/buttonPushedEvent.groovy
index 0792d4f888f2db6253d17d9faafc2bb216c5d53c..d6013e1a3742d3812b67a7b89648e1688322b840 100644 (file)
--- a/eventSimulator/buttonPushedEvent.groovy
+++ b/eventSimulator/buttonPushedEvent.groovy
@@ -1,2 +1,11 @@
+                        buttonObject.setValue([name: "button", value: "pushed", deviceId: "switchID0", descriptionText: "",
+                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"buttonNumber": 1}'])
+
+                        buttonObject.setValue([name: "button", value: "pushed", deviceId: "switchID0", descriptionText: "",
+                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"buttonNumber": 2}'])
+
+                        buttonObject.setValue([name: "button", value: "pushed", deviceId: "switchID0", descriptionText: "",
+                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"buttonNumber": 3}'])
+
                        buttonObject.setValue([name: "button", value: "pushed", deviceId: "switchID0", descriptionText: "",
-                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"buttonNumber": 3}'])
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"buttonNumber": 4}'])