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

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 803b63511511371f704219104bd38f04ce67f0b1..4bc7306906652c200f9858ff55487390389883b0 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -88,6 +88,9 @@ def ExtractFunctions(F, appName):
                                Temp = GetToken(F)
                        if Temp == "\"":
                                Temp = GetToken(F)              
+
+                       print "DEBUG: %s - %s" % (variable, Temp)
+                       print capabilityMap
                        if Temp == "app" or Temp == "location":
                                if Temp not in eventList:
                                        eventList.append(Temp)
@@ -202,6 +205,20 @@ def ExtractEvents(extractedEvents):
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
+               elif eventList[i] == "tamper.tampered":
+                       #Write two events subsequently
+                       extractedEvents.write("\t\t\tdef event = Verify.getInt(0,1)\n")
+                       extractedEvents.write("\t\t\tif (event == 0) {\n")
+                       event = open("eventSimulator/tamperTamperedOpenEvent.groovy", "r")                      
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
+                       extractedEvents.write("\t\t\t} else {\n")
+                       event = open("eventSimulator/tamperTamperedClosedEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
+                       extractedEvents.write("\t\t\t}\n")
                elif eventList[i] == "nfcTouch":
                        event = open("eventSimulator/nfcTouchEvent.groovy", "r")
                        for line in event:
@@ -240,6 +257,16 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write("\t\t" + line)
                        event.close()
                        extractedEvents.write("\t\t\t}\n")
+               elif eventList[i] == "water.dry":
+                       event = open("eventSimulator/waterDefaultDryEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "water.wet":
+                       event = open("eventSimulator/waterDefaultWetEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
                elif eventList[i] == "presence":
                        #Check which capability
                        variable = eventVarMap[eventList[i]]
@@ -304,6 +331,16 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write("\t\t" + line)
                        event.close()
                        extractedEvents.write("\t\t\t}\n")
+               elif eventList[i] == "motion.active":
+                       event = open("eventSimulator/motionDefaultActiveEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
+               elif eventList[i] == "motion.inactive":
+                       event = open("eventSimulator/motionDefaultInactiveEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
                elif eventList[i] == "smoke":
                        #Write three events subsequently
                        extractedEvents.write("\t\t\tdef event = Verify.getInt(0,2)\n")
@@ -323,6 +360,21 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write("\t\t" + line)
                        event.close()
                        extractedEvents.write("\t\t\t}\n")
+               elif eventList[i] == "smoke.clear":
+                       event = open("eventSimulator/smokeDefaultClearEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
+               elif eventList[i] == "smoke.detected":
+                       event = open("eventSimulator/smokeDefaultDetectedEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
+               elif eventList[i] == "smoke.tested":
+                       event = open("eventSimulator/smokeDefaultTestedEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
                elif eventList[i] == "carbonMonoxide":
                        #Check which capability
                        variable = eventVarMap[eventList[i]]
@@ -360,6 +412,30 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write("\t\t" + line)
                        event.close()
                        extractedEvents.write("\t\t\t}\n")
+               elif eventList[i] == "carbonMonoxide.clear":
+                       if capability == "capability.smokeDetector":
+                               event = open("eventSimulator/smokeCarbonMonoxideDefaultClearEvent.groovy", "r")
+                       elif capability == "capability.carbonMonoxideDetector":
+                               event = open("eventSimulator/carbonMonoxideDefaultClearEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
+               elif eventList[i] == "carbonMonoxide.detected":
+                       if capability == "capability.smokeDetector":
+                               event = open("eventSimulator/smokeCarbonMonoxideDefaultDetectedEvent.groovy", "r")
+                       elif capability == "capability.carbonMonoxideDetector":
+                               event = open("eventSimulator/carbonMonoxideDefaultDetectedEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
+               elif eventList[i] == "carbonMonoxide.tested":
+                       if capability == "capability.smokeDetector":
+                               event = open("eventSimulator/smokeCarbonMonoxideDefaultTestedEvent.groovy", "r")
+                       elif capability == "capability.carbonMonoxideDetector":
+                               event = open("eventSimulator/carbonMonoxideDefaultTestedEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
                elif eventList[i] == "battery":
                        #Check which capability
                        variable = eventVarMap[eventList[i]]
@@ -483,6 +559,8 @@ def ExtractEvents(extractedEvents):
                                event = open("eventSimulator/switchLevelOnEvent.groovy", "r")
                        elif capability == "capability.relaySwitch":
                                event = open("eventSimulator/relaySwitchOnEvent.groovy", "r")
+                       elif capability == "capability.colorControl":
+                               event = open("eventSimulator/colorControlSwitchOnEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write("\t\t" + line)
                        event.close()
@@ -493,6 +571,8 @@ def ExtractEvents(extractedEvents):
                                event = open("eventSimulator/switchLevelOffEvent.groovy", "r")
                        elif capability == "capability.relaySwitch":
                                event = open("eventSimulator/relaySwitchOffEvent.groovy", "r")
+                       elif capability == "capability.colorControl":
+                               event = open("eventSimulator/colorControlSwitchOffEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write("\t\t" + line)
                        event.close()
@@ -516,6 +596,25 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write("\t\t" + line)
                        event.close()
                        extractedEvents.write("\t\t\t}\n")
+               elif eventList[i] == "mode":
+                       #Write three events subsequently
+                       extractedEvents.write("\t\t\tdef event = Verify.getInt(0,2)\n")
+                       extractedEvents.write("\t\t\tif (event == 0) {\n")
+                       event = open("eventSimulator/modeHomeEvent.groovy", "r")                        
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
+                       extractedEvents.write("\t\t\t} else if (event == 1) {\n")
+                       event = open("eventSimulator/modeAwayEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
+                       extractedEvents.write("\t\t\t} else {\n")
+                       event = open("eventSimulator/modeNightEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
+                       extractedEvents.write("\t\t\t}\n")
                elif eventList[i] == "acceleration":
                        #Write two events subsequently
                        extractedEvents.write("\t\t\tdef event = Verify.getInt(0,1)\n")
@@ -530,6 +629,16 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write("\t\t" + line)
                        event.close()
                        extractedEvents.write("\t\t\t}\n")
+               elif eventList[i] == "acceleration.active":
+                       event = open("eventSimulator/accelerationDefaultActiveEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
+               elif eventList[i] == "acceleration.inactive":
+                       event = open("eventSimulator/accelerationDefaultInactiveEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write("\t\t" + line)
+                       event.close()
                elif eventList[i] == "sleeping":
                        #Write two events subsequently
                        extractedEvents.write("\t\t\tdef event = Verify.getInt(0,1)\n")
@@ -559,6 +668,11 @@ def ExtractEvents(extractedEvents):
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
+               elif eventList[i] == "colorTemperature":
+                       event = open("eventSimulator/colorTemperatureEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
                elif eventList[i] == "hue":
                        event = open("eventSimulator/hueChangeEvent.groovy", "r")
                        for line in event:

diff --git a/eventSimulator/accelerationDefaultActiveEvent.groovy b/eventSimulator/accelerationDefaultActiveEvent.groovy
new file mode 100644 (file)
index 0000000..d62800b
--- /dev/null
+++ b/eventSimulator/accelerationDefaultActiveEvent.groovy
@@ -0,0 +1,2 @@
+                       accelerationSensorObject.setValue([name: "acceleration.active", value: "active", deviceId: "accelerationSensorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

diff --git a/eventSimulator/accelerationDefaultInactiveEvent.groovy b/eventSimulator/accelerationDefaultInactiveEvent.groovy
new file mode 100644 (file)
index 0000000..563630c
--- /dev/null
+++ b/eventSimulator/accelerationDefaultInactiveEvent.groovy
@@ -0,0 +1,2 @@
+                       accelerationSensorObject.setValue([name: "acceleration.inactive", value: "inactive", deviceId: "accelerationSensorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

diff --git a/eventSimulator/carbonMonoxideDefaultClearEvent.groovy b/eventSimulator/carbonMonoxideDefaultClearEvent.groovy
new file mode 100644 (file)
index 0000000..1a48705
--- /dev/null
+++ b/eventSimulator/carbonMonoxideDefaultClearEvent.groovy
@@ -0,0 +1,2 @@
+                       carbonMonoxideDetectorObject.setValue([name: "carbonMonoxide.clear", value: "clear", deviceId: "carbonMonoxideDetectorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

diff --git a/eventSimulator/carbonMonoxideDefaultDetectedEvent.groovy b/eventSimulator/carbonMonoxideDefaultDetectedEvent.groovy
new file mode 100644 (file)
index 0000000..813441a
--- /dev/null
+++ b/eventSimulator/carbonMonoxideDefaultDetectedEvent.groovy
@@ -0,0 +1,2 @@
+                       carbonMonoxideDetectorObject.setValue([name: "carbonMonoxide.detected", value: "detected", deviceId: "carbonMonoxideDetectorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

diff --git a/eventSimulator/carbonMonoxideDefaultTestedEvent.groovy b/eventSimulator/carbonMonoxideDefaultTestedEvent.groovy
new file mode 100644 (file)
index 0000000..dd01e4c
--- /dev/null
+++ b/eventSimulator/carbonMonoxideDefaultTestedEvent.groovy
@@ -0,0 +1,2 @@
+                       carbonMonoxideDetectorObject.setValue([name: "carbonMonoxide.tested", value: "tested", deviceId: "carbonMonoxideDetectorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

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

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

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

diff --git a/eventSimulator/eventSimulator.groovy b/eventSimulator/eventSimulator.groovy
index b0f57f5e81d828d3982062fdeaf8eb3b781215e7..ed622393e673656686ca2d9aa219f9fa232882dc 100644 (file)
--- a/eventSimulator/eventSimulator.groovy
+++ b/eventSimulator/eventSimulator.groovy
@@ -1,13 +1,46 @@
 while(true) {
-       def eventNumber = Verify.getInt(0,1)
+       def eventNumber = Verify.getInt(0,9)
        switch(eventNumber) {
                case 0:
-                       touchSensorObject.setValue([name: "nfcTouch", value: "touched", deviceId: "nfcSensorID0", descriptionText: "",
-                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+                       def event = Verify.getInt(0,2)
+                       if (event == 0) {
+                                       locationObject.setValue([name: "Location", value: "home", deviceId: "locationID0", descriptionText: "",
+                                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+                       } else if (event == 1) {
+                                       locationObject.setValue([name: "Location", value: "away", deviceId: "locationID0", descriptionText: "",
+                                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+                       } else {
+                                       locationObject.setValue([name: "Location", value: "night", deviceId: "locationID0", descriptionText: "",
+                                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+                       }
                        break
                case 1:
-                       appObject.setValue([name: "Touched", value: "touched", deviceId: "touchedSensorID0", descriptionText: "",
+                       contactObject.setValue([name: "contact.open", value: "open", deviceId: "contactSensorID0", descriptionText: "",
                                        displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                        break
+               case 2:
+                       break
+               case 3:
+                       break
+               case 4:
+                       break
+               case 5:
+                       break
+               case 6:
+                       break
+               case 7:
+                       break
+               case 8:
+                       break
+               case 9:
+                       def event = Verify.getInt(0,1)
+                       if (event == 0) {
+                                       aeonKeyFobObject.setValue([name: "button", value: "pushed", deviceId: "aeonKeyFobID0", descriptionText: "",
+                                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+                       } else {
+                                       aeonKeyFobObject.setValue([name: "button", value: "held", deviceId: "aeonKeyFobID0", descriptionText: "",
+                                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
+                       }
+                       break
        }
 }

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

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

diff --git a/eventSimulator/modeNightEvent.groovy b/eventSimulator/modeNightEvent.groovy
new file mode 100644 (file)
index 0000000..241b1fb
--- /dev/null
+++ b/eventSimulator/modeNightEvent.groovy
@@ -0,0 +1,2 @@
+                       locationObject.setValue([name: "mode", value: "night", deviceId: "locationID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

diff --git a/eventSimulator/motionDefaultActiveEvent.groovy b/eventSimulator/motionDefaultActiveEvent.groovy
new file mode 100644 (file)
index 0000000..4feb46d
--- /dev/null
+++ b/eventSimulator/motionDefaultActiveEvent.groovy
@@ -0,0 +1,2 @@
+                       motionSensorObject.setValue([name: "motion.active", value: "active", deviceId: "motionSensorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

diff --git a/eventSimulator/motionDefaultInactiveEvent.groovy b/eventSimulator/motionDefaultInactiveEvent.groovy
new file mode 100644 (file)
index 0000000..fc5142b
--- /dev/null
+++ b/eventSimulator/motionDefaultInactiveEvent.groovy
@@ -0,0 +1,2 @@
+                       motionSensorObject.setValue([name: "motion.inactive", value: "inactive", deviceId: "motionSensorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

diff --git a/eventSimulator/smokeCarbonMonoxideDefaultClearEvent.groovy b/eventSimulator/smokeCarbonMonoxideDefaultClearEvent.groovy
new file mode 100644 (file)
index 0000000..5ab06b4
--- /dev/null
+++ b/eventSimulator/smokeCarbonMonoxideDefaultClearEvent.groovy
@@ -0,0 +1,2 @@
+                       smokeDetectorObject.setValue([name: "carbonMonoxide.clear", value: "clear", deviceId: "smokeDetectorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

diff --git a/eventSimulator/smokeCarbonMonoxideDefaultDetectedEvent.groovy b/eventSimulator/smokeCarbonMonoxideDefaultDetectedEvent.groovy
new file mode 100644 (file)
index 0000000..a2efc20
--- /dev/null
+++ b/eventSimulator/smokeCarbonMonoxideDefaultDetectedEvent.groovy
@@ -0,0 +1,2 @@
+                       smokeDetectorObject.setValue([name: "carbonMonoxide.detected", value: "detected", deviceId: "smokeDetectorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

diff --git a/eventSimulator/smokeCarbonMonoxideDefaultTestedEvent.groovy b/eventSimulator/smokeCarbonMonoxideDefaultTestedEvent.groovy
new file mode 100644 (file)
index 0000000..878b67a
--- /dev/null
+++ b/eventSimulator/smokeCarbonMonoxideDefaultTestedEvent.groovy
@@ -0,0 +1,2 @@
+                       smokeDetectorObject.setValue([name: "carbonMonoxide.tested", value: "tested", deviceId: "smokeDetectorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

diff --git a/eventSimulator/smokeDefaultClearEvent.groovy b/eventSimulator/smokeDefaultClearEvent.groovy
new file mode 100644 (file)
index 0000000..57083a8
--- /dev/null
+++ b/eventSimulator/smokeDefaultClearEvent.groovy
@@ -0,0 +1,2 @@
+                       smokeDetectorObject.setValue([name: "smoke.clear", value: "clear", deviceId: "smokeDetectorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

diff --git a/eventSimulator/smokeDefaultDetectedEvent.groovy b/eventSimulator/smokeDefaultDetectedEvent.groovy
new file mode 100644 (file)
index 0000000..8683e25
--- /dev/null
+++ b/eventSimulator/smokeDefaultDetectedEvent.groovy
@@ -0,0 +1,2 @@
+                       smokeDetectorObject.setValue([name: "smoke.detected", value: "detected", deviceId: "smokeDetectorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

diff --git a/eventSimulator/smokeDefaultTestedEvent.groovy b/eventSimulator/smokeDefaultTestedEvent.groovy
new file mode 100644 (file)
index 0000000..314a506
--- /dev/null
+++ b/eventSimulator/smokeDefaultTestedEvent.groovy
@@ -0,0 +1,2 @@
+                       smokeDetectorObject.setValue([name: "smoke.tested", value: "tested", deviceId: "smokeDetectorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

diff --git a/eventSimulator/tamperTamperedClosedEvent.groovy b/eventSimulator/tamperTamperedClosedEvent.groovy
new file mode 100644 (file)
index 0000000..b78c3ea
--- /dev/null
+++ b/eventSimulator/tamperTamperedClosedEvent.groovy
@@ -0,0 +1,2 @@
+                       contactObject.setValue([name: "tamper.tampered", value: "closed", deviceId: "contactSensorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

diff --git a/eventSimulator/tamperTamperedOpenEvent.groovy b/eventSimulator/tamperTamperedOpenEvent.groovy
new file mode 100644 (file)
index 0000000..1da44bf
--- /dev/null
+++ b/eventSimulator/tamperTamperedOpenEvent.groovy
@@ -0,0 +1,2 @@
+                       contactObject.setValue([name: "tamper.tampered", value: "open", deviceId: "contactSensorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

diff --git a/eventSimulator/waterDefaultDryEvent.groovy b/eventSimulator/waterDefaultDryEvent.groovy
new file mode 100644 (file)
index 0000000..ee70792
--- /dev/null
+++ b/eventSimulator/waterDefaultDryEvent.groovy
@@ -0,0 +1,2 @@
+                       waterSensorObject.setValue([name: "water.dry", value: "dry", deviceId: "waterSensorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file

diff --git a/eventSimulator/waterDefaultWetEvent.groovy b/eventSimulator/waterDefaultWetEvent.groovy
new file mode 100644 (file)
index 0000000..56c992a
--- /dev/null
+++ b/eventSimulator/waterDefaultWetEvent.groovy
@@ -0,0 +1,2 @@
+                       waterSensorObject.setValue([name: "water.wet", value: "wet", deviceId: "waterSensorID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
\ No newline at end of file