X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=blobdiff_plain;f=Extractor%2FExtractorScript.py;h=81948167ff4e386e19bf8cb09e2657b1fc40cd4e;hp=3a87c2389d32699e6d6eba606e052981bf8211bd;hb=53efd63c9a96748df2ee2806e57bfc4a2e47df4a;hpb=752df0b3baa7349d6a0f5bdefb7d644a552bea2e

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 3a87c23..8194816 100644
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -48,7 +48,7 @@ eventTypeCounterMap =  {'lock': 2,
 						'energy' : 1,
 						'power' : 2,
 						'illuminance' : 1,
-						'humidity' : 1,
+						'humidity' : 2,
 						'alarm' : 4,
 						'contact' : 2,
 						'status' : 3,
@@ -56,7 +56,7 @@ eventTypeCounterMap =  {'lock': 2,
 						'trackDescription' : 1,
 						'trackData' : 1,
 						'mute' : 2,
-						'temperature' : 1,
+						'temperature' : 2,
 						'heatingSetpoint' : 1,
 						'coolingSetpoint' : 1,
 						'thermostatSetpoint' : 1}
@@ -645,6 +645,7 @@ def ExtractEvents(extractedEvents):
 				extractedEvents.write(line)
 			event.close()
 		elif eventList[i] == "switch":
+                        
 			#Check which capability
 			variable = eventVarMap[eventList[i]]
 			if eventList[i] not in eventVarCounterMap.keys():
@@ -655,6 +656,8 @@ def ExtractEvents(extractedEvents):
 				eventVarCounterMap[eventList[i]] = eventVarCount + 1
 			capability = capabilityMap[variable[eventVarCount]]
 			#Write two events subsequently
+                        print("//////////////////////")
+                        print(capability)
 			if capability == "capability.switch":
 				event = open("eventSimulator/switchOnEvent.groovy", "r")
 			elif capability == "capability.switchLevel":
@@ -737,16 +740,6 @@ def ExtractEvents(extractedEvents):
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
-		elif eventList[i] == "acceleration.active":
-			event = open("eventSimulator/accelerationDefaultActiveEvent.groovy", "r")
-			for line in event:
-				extractedEvents.write(line)
-			event.close()
-		elif eventList[i] == "acceleration.inactive":
-			event = open("eventSimulator/accelerationDefaultInactiveEvent.groovy", "r")
-			for line in event:
-				extractedEvents.write(line)
-			event.close()
 		elif eventList[i] == "sleeping":
 			#Write two events subsequently
 			event = open("eventSimulator/sleepSleepingEvent.groovy", "r")			
@@ -830,7 +823,14 @@ def ExtractEvents(extractedEvents):
 				extractedEvents.write(line)
 			event.close()
 		elif eventList[i] == "humidity":
-			event = open("eventSimulator/humidityMeasurementEvent.groovy", "r")
+			event = open("eventSimulator/humidityHighMeasurementEvent.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/humidityLowMeasurementEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
@@ -925,6 +925,8 @@ def ExtractEvents(extractedEvents):
 				event = open("eventSimulator/switchLevelEvent.groovy", "r")
 			elif capability == "capability.colorControl":
 				event = open("eventSimulator/colorLevelChangeEvent.groovy", "r")
+                        elif capability == "capability.switch":
+                                event = open("eventSimulator/switchLevelChangeEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
@@ -961,10 +963,21 @@ def ExtractEvents(extractedEvents):
 				eventVarCount = eventVarCounterMap[eventList[i]]
 				eventVarCounterMap[eventList[i]] = eventVarCount + 1
 			capability = capabilityMap[variable[eventVarCount]]
+			#Write two events subsequently
+			if capability == "capability.thermostat":
+				event = open("eventSimulator/temperatureHighEvent.groovy", "r")
+			elif capability == "capability.temperatureMeasurement":
+				event = open("eventSimulator/temperatureHighMeasurementEvent.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)
 			if capability == "capability.thermostat":
-				event = open("eventSimulator/temperatureEvent.groovy", "r")
+				event = open("eventSimulator/temperatureLowEvent.groovy", "r")
 			elif capability == "capability.temperatureMeasurement":
-				event = open("eventSimulator/temperatureMeasurementEvent.groovy", "r")
+				event = open("eventSimulator/temperatureLowMeasurementEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()