From: amiraj <amiraj.95@uci.edu>
Date: Sat, 10 Aug 2019 22:00:58 +0000 (-0700)
Subject: Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=commitdiff_plain;h=740114c29560d182bbc0d0bf33cf1b8d226701cb;hp=-c;ds=sidebyside

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

740114c29560d182bbc0d0bf33cf1b8d226701cb
diff --combined Extractor/ExtractorScript.py
index 2c96590,1643c43..f972b70
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@@ -261,6 -261,7 +261,7 @@@ def AnalyzeCapabilities(Temp, appName, 
  			Temp == "capability.switchLevel" or
  			Temp == "capability.illuminanceMeasurement" or
  			Temp == "capability.colorControl" or
+ 			Temp == "capability.colorTemperature" or
  			#Motion related
  			Temp == "capability.motionSensor" or
  			Temp == "capability.accelerationSensor" or
@@@ -289,7 -290,7 +290,7 @@@
  def AnalyzePhysicalInteraction(app1Capab, app2Capab):
  	#Light
  	if ("capability.illuminanceMeasurement" in app1Capab) and ("capability.switch" in app2Capab or 
- 			"capability.switchLevel" in app2Capab or "capability.colorControl" in app2Capab):
+ 			"capability.switchLevel" in app2Capab or "capability.colorControl" or "capability.colorTemperature" in app2Capab):
  		print ("\nWARNING: Potential PHYSICAL CONFLICT (light) detected between App1 and App2!\n")
  	#Motion
  	# TODO: Technically this is not entirely precise since we need to be able to detect that the other app creates motion
@@@ -461,7 -462,6 +462,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: