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

[smartthings-infrastructure.git] / eventSimulator / eventSimulator.groovy

diff --git a/eventSimulator/eventSimulator.groovy b/eventSimulator/eventSimulator.groovy
index 0a047739aa821ee8434030d7fbcf8dc68fe31728..393f9bd1fbbbc769d776ad69c819b1b2aff36409 100644 (file)
--- a/eventSimulator/eventSimulator.groovy
+++ b/eventSimulator/eventSimulator.groovy
@@ -4,10 +4,16 @@ while(true) {
                case 0:
                        def event = Verify.getInt(0,1)
                        if (event == 0) {
+<<<<<<< HEAD
                                        switchObject.setValue([name: "switch", value: "on", deviceId: "switchID0", descriptionText: "",
                                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                        } else {
                                        switchObject.setValue([name: "switch", value: "off", deviceId: "switchID0", descriptionText: "",
+=======
+                                       lockObject.setValue([name: "lock", value: "locked", deviceId: "lockID0", descriptionText: "",
+                                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])                       } else {
+                                       lockObject.setValue([name: "lock", value: "unlocked", deviceId: "lockID0", descriptionText: "",
+>>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
                                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                        }
                        break
@@ -22,8 +28,13 @@ while(true) {
                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                        break
                case 4:
+<<<<<<< HEAD
                        break
                case 5:
+=======
+                       appObject.setValue([name: "Touched", value: "touched", deviceId: "touchedSensorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+>>>>>>> a02c9807815a35c0f57241ee6510a3d312499049
                        break
        }
 }