From: bdemsky <bdemsky@uci.edu>
Date: Wed, 7 Aug 2019 02:25:12 +0000 (-0700)
Subject: Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6efe7033d936fc2dfe452bca10769e96c220a5c0;hp=-c;p=smartthings-infrastructure.git

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

6efe7033d936fc2dfe452bca10769e96c220a5c0
diff --combined Extractor/ExtractorScript.py
index 63f0111,cf4b9de..9437601
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@@ -15,6 -15,7 +15,6 @@@ app2Subscribe = Fals
  # Mapping for event type and number of events
  # e.g., switch has 2 events: on and off
  eventTypeCounterMap =  {'lock': 2,
 -						'unlock' : 1,
  						'nfcTouch' : 1,
  						'app' : 1,
  						'button' : 2,
@@@ -75,6 -76,7 +75,6 @@@ eventTypesMap =  	   {'alarm.both': 'al
  						'mode.away' : 'location',
  						'mode.home' : 'location',
  						'mode.night' : 'location',
 -						'unlock' : 'lock',
  						'lock.locked' : 'lock',
  						'lock.unlocked' : 'lock',
  						'motion.active' : 'motion',
@@@ -212,10 -214,7 +212,10 @@@ def ExtractFunctions(F, appName)
  			#print "DEBUG: %s - %s" % (variable, Temp)
  			#print capabilityMap
  			#print "DEBUG: location variable: %s" % Temp	
 -			
 +
 +                        #This is a bogus event, just skip it...
 +                        if Temp == "unlock":
 +                                continue                        
  			#Translate and reduce through mapping
  			if Temp in eventTypesMap.keys():		
  				Temp = eventTypesMap[Temp]
@@@ -796,7 -795,15 +796,15 @@@ def ExtractEvents(extractedEvents)
  				extractedEvents.write(line)
  			event.close()
  		elif eventList[i] == "power":
- 			event = open("eventSimulator/powerMeterEvent.groovy", "r")
+ 			#Write two events subsequently
+ 			event = open("eventSimulator/powerMeterHighPowerEvent.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/powerMeterLowPowerEvent.groovy", "r")
  			for line in event:
  				extractedEvents.write(line)
  			event.close()