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

diff --git a/appLists/device-interaction/alarmsAppList b/appLists/device-interaction/alarmsAppList
index 51487f79fb7a57b023f7c5f3f2ce8407359b7255..dfef01c9325008df2c78c3b9bba49c1fab70a296 100644 (file)
--- a/appLists/device-interaction/alarmsAppList
+++ b/appLists/device-interaction/alarmsAppList
@@ -1,4 +1,10 @@
-lock-it-at-a-specific-time.groovy
-#lock-it-when-i-leave.groovy
-#make-it-so.groovy
-nfc-tag-toggle.groovy
+forgiving-security.groovy
+initial-state-event-streamer.groovy
+smart-alarm.groovy
+smart-security.groovy
+buffered-event-sender.groovy
+DeviceTamperAlarm.groovy
+FireCO2Alarm.groovy
+initial-state-event-sender.groovy
+initialstate-smart-app-v1.2.0.groovy
+unbuffered-event-sender.groovy

diff --git a/eventSimulator/colorLevelChangeEvent.groovy b/eventSimulator/colorLevelChangeEvent.groovy
new file mode 100644 (file)
index 0000000..9989cbf
--- /dev/null
+++ b/eventSimulator/colorLevelChangeEvent.groovy
@@ -0,0 +1,2 @@
+                       colorControlObject.setValue([name: "level", value: "50", deviceId: "colorControlID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file