Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
authoramiraj <amiraj.95@uci.edu>
Mon, 29 Jul 2019 21:11:59 +0000 (14:11 -0700)
committeramiraj <amiraj.95@uci.edu>
Mon, 29 Jul 2019 21:11:59 +0000 (14:11 -0700)
commitd00fd74ad7e497d6849c284c6ba69db2d3ec8e65
treeed08e4f41ee261b865a45edc1905f651916eeba1
parent31da25f02c14814f402e84b35a174f3c0958cd38
parente378d6a65b25030f8914dc97f04b81ddff351d9c
Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure
27 files changed:
Battery/Batteries.groovy
CarbonMonoxideDetector/CarbonMonoxideDetectors.groovy
ColorControl/ColorControls.groovy
DoorControl/DoorControls.groovy
EnergyMeter/EnergyMeters.groovy
Extractor/Extractor.groovy
Extractor/ExtractorScript.py
GlobalVariables/GlobalVariablesBothApps.groovy
Methods/eventHandler.groovy
ModelCheck.py
MusicPlayer/MusicPlayers.groovy
Runner.py
Switch/Switches.groovy
Thermostat/Thermostats.groovy
eventSimulator/accelerationActiveEvent.groovy
eventSimulator/accelerationInactiveEvent.groovy
eventSimulator/beaconLeftEvent.groovy
eventSimulator/beaconPresentEvent.groovy
eventSimulator/carbonMonoxideClearEvent.groovy
eventSimulator/carbonMonoxideDetectedEvent.groovy
eventSimulator/carbonMonoxideTestedEvent.groovy
eventSimulator/colorChangedEvent.groovy
eventSimulator/hueChangedEvent.groovy
eventSimulator/saturationChangedEvent.groovy
eventSimulator/smokeCarbonMonoxideClearEvent.groovy
eventSimulator/smokeCarbonMonoxideDetectedEvent.groovy
eventSimulator/smokeCarbonMonoxideTestedEvent.groovy