From: rtrimana <rtrimana@uci.edu>
Date: Mon, 5 Aug 2019 16:16:20 +0000 (-0700)
Subject: Adding more events for button.
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=commitdiff_plain;h=6b3f41f87c904917f6fd4f4f5f965e84b291ee7d

Adding more events for button.
---

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 37c294d..2281ade 100644
--- 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
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
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 3937ff6..29d13a0 100644
--- 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 889af89..6f1a8c6 100644
--- 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}'])