Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 37c294decf2823615df580ceda7af4dfe7c76cb8..2281ade3cdd86ac53cc313fcd05ebe8844c8f2f9 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -276,7 +276,7 @@ def ExtractEvents(extractedEvents):
                        indexApp2 = indexApp2 + 1
                        if indexApp1 < indexApp2Start:
                                isApp1 = True
-               print "DEBUG: i: %d" % i
+               #print "DEBUG: i: %d" % i
                extractedEvents.write("\t\tcase %d:\n" % counter)
                if eventList[i] == "lock":
                        #Write two events subsequently
@@ -328,15 +328,30 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "button":
+                       #Check which capability
+                       variable = eventVarMap[eventList[i]]
+                       if eventList[i] not in eventVarCounterMap.keys():
+                               eventVarCounterMap[eventList[i]] = 1
+                               eventVarCount = 0
+                       else:
+                               eventVarCount = eventVarCounterMap[eventList[i]]
+                               eventVarCounterMap[eventList[i]] = eventVarCount + 1
+                       capability = capabilityMap[variable[eventVarCount]]
                        #Write two events subsequently
-                       event = open("eventSimulator/buttonPushedEvent.groovy", "r")                    
+                       if capability == "capability.button":
+                               event = open("eventSimulator/buttonHeldEvent.groovy", "r")
+                       elif capability == "device.aeonKeyFob":
+                               event = open("eventSimulator/aeonKeyFobHeldEvent.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/buttonHeldEvent.groovy", "r")
+                       if capability == "capability.button":
+                               event = open("eventSimulator/buttonPushedEvent.groovy", "r")
+                       elif capability == "device.aeonKeyFob":
+                               event = open("eventSimulator/aeonKeyFobPushedEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()

diff --git a/eventSimulator/aeonKeyFobHeldEvent.groovy b/eventSimulator/aeonKeyFobHeldEvent.groovy
new file mode 100644 (file)
index 0000000..3937ff6
--- /dev/null
+++ b/eventSimulator/aeonKeyFobHeldEvent.groovy
@@ -0,0 +1,2 @@
+                       aeonKeyFobObject.setValue([name: "button", value: "held", deviceId: "aeonKeyFobID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])

diff --git a/eventSimulator/aeonKeyFobPushedEvent.groovy b/eventSimulator/aeonKeyFobPushedEvent.groovy
new file mode 100644 (file)
index 0000000..889af89
--- /dev/null
+++ b/eventSimulator/aeonKeyFobPushedEvent.groovy
@@ -0,0 +1,2 @@
+                       aeonKeyFobObject.setValue([name: "button", value: "pushed", deviceId: "aeonKeyFobID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])

diff --git a/eventSimulator/buttonHeldEvent.groovy b/eventSimulator/buttonHeldEvent.groovy
index 3937ff6d32dfa7952481b41080509a17d4e8f207..29d13a0a690ee5eb6a481dd16e5bc6b7ddfeff8f 100644 (file)
--- a/eventSimulator/buttonHeldEvent.groovy
+++ b/eventSimulator/buttonHeldEvent.groovy
@@ -1,2 +1,2 @@
-                       aeonKeyFobObject.setValue([name: "button", value: "held", deviceId: "aeonKeyFobID0", descriptionText: "",
-                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+                       buttonObject.setValue([name: "button", value: "held", deviceId: "switchID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"buttonNumber": 1}'])

diff --git a/eventSimulator/buttonPushedEvent.groovy b/eventSimulator/buttonPushedEvent.groovy
index 889af89eb75457159522996809b75f592f894762..6f1a8c6830016ed48a55086b67adfeceb9155df2 100644 (file)
--- a/eventSimulator/buttonPushedEvent.groovy
+++ b/eventSimulator/buttonPushedEvent.groovy
@@ -1,2 +1,2 @@
-                       aeonKeyFobObject.setValue([name: "button", value: "pushed", deviceId: "aeonKeyFobID0", descriptionText: "",
-                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+                       buttonObject.setValue([name: "button", value: "push", deviceId: "switchID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"buttonNumber": 1}'])