From: rtrimana Date: Tue, 23 Jul 2019 23:24:48 +0000 (-0700) Subject: More events to generate based on the subscriber's list. X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=commitdiff_plain;h=ce72482405131b19995c4e32bb09b4add1c77b5b More events to generate based on the subscriber's list. --- diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py index 4551ca0..b53afda 100644 --- a/Extractor/ExtractorScript.py +++ b/Extractor/ExtractorScript.py @@ -143,16 +143,6 @@ def ExtractEvents(extractedEvents): for line in event: extractedEvents.write(line) event.close() - elif eventMap[i] == "switch.on": - event = open("eventSimulator/switchOnEvent.groovy", "r") - for line in event: - extractedEvents.write(line) - event.close() - elif eventMap[i] == "switch.off": - event = open("eventSimulator/switchOffEvent.groovy", "r") - for line in event: - extractedEvents.write(line) - event.close() elif eventMap[i] == "nfcTouch": event = open("eventSimulator/nfcTouchEvent.groovy", "r") for line in event: @@ -202,6 +192,131 @@ def ExtractEvents(extractedEvents): for line in event: extractedEvents.write(line) event.close() + elif eventMap[i] == "motion": + #Write two events subsequently + event = open("eventSimulator/motionActiveEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + extractedEvents.write("\t\t\tbreak\n") + eventCounter = eventCounter + 1 + extractedEvents.write("\t\tcase %d:\n" % eventCounter) + event = open("eventSimulator/motionInactiveEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + elif eventMap[i] == "smoke": + #Write three events subsequently + event = open("eventSimulator/smokeClearEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + extractedEvents.write("\t\t\tbreak\n") + eventCounter = eventCounter + 1 + extractedEvents.write("\t\tcase %d:\n" % eventCounter) + event = open("eventSimulator/smokeDetectedEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + extractedEvents.write("\t\t\tbreak\n") + eventCounter = eventCounter + 1 + extractedEvents.write("\t\tcase %d:\n" % eventCounter) + event = open("eventSimulator/smokeTestedEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + elif eventMap[i] == "carbonMonoxide": + #Write three events subsequently + event = open("eventSimulator/carbonMonoxideClearEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + extractedEvents.write("\t\t\tbreak\n") + eventCounter = eventCounter + 1 + extractedEvents.write("\t\tcase %d:\n" % eventCounter) + event = open("eventSimulator/carbonMonoxideDetectedEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + extractedEvents.write("\t\t\tbreak\n") + eventCounter = eventCounter + 1 + extractedEvents.write("\t\tcase %d:\n" % eventCounter) + event = open("eventSimulator/carbonMonoxideTestedEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + elif eventMap[i] == "battery": + event = open("eventSimulator/batteryChargeEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + elif eventMap[i] == "thermostatMode": + #Write five events subsequently + event = open("eventSimulator/thermostatAutoModeEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + extractedEvents.write("\t\t\tbreak\n") + eventCounter = eventCounter + 1 + extractedEvents.write("\t\tcase %d:\n" % eventCounter) + event = open("eventSimulator/thermostatCoolModeEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + extractedEvents.write("\t\t\tbreak\n") + eventCounter = eventCounter + 1 + extractedEvents.write("\t\tcase %d:\n" % eventCounter) + event = open("eventSimulator/thermostatEmergencyHeatModeEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + extractedEvents.write("\t\t\tbreak\n") + eventCounter = eventCounter + 1 + extractedEvents.write("\t\tcase %d:\n" % eventCounter) + event = open("eventSimulator/thermostatHeatModeEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + extractedEvents.write("\t\t\tbreak\n") + eventCounter = eventCounter + 1 + extractedEvents.write("\t\tcase %d:\n" % eventCounter) + event = open("eventSimulator/thermostatOffModeEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + elif eventMap[i] == "switch": + #Write two events subsequently + event = open("eventSimulator/switchOnEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + extractedEvents.write("\t\t\tbreak\n") + eventCounter = eventCounter + 1 + extractedEvents.write("\t\tcase %d:\n" % eventCounter) + event = open("eventSimulator/switchOffEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + elif eventMap[i] == "Location": + #Write three events subsequently + event = open("eventSimulator/locationHomeEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + extractedEvents.write("\t\t\tbreak\n") + eventCounter = eventCounter + 1 + extractedEvents.write("\t\tcase %d:\n" % eventCounter) + event = open("eventSimulator/locationAwayEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() + extractedEvents.write("\t\t\tbreak\n") + eventCounter = eventCounter + 1 + extractedEvents.write("\t\tcase %d:\n" % eventCounter) + event = open("eventSimulator/locationNightEvent.groovy", "r") + for line in event: + extractedEvents.write(line) + event.close() eventCounter = eventCounter + 1 ###TODO: Add more events later diff --git a/eventSimulator/appTouchEvent.groovy b/eventSimulator/appTouchEvent.groovy index 025f036..0b2177e 100644 --- a/eventSimulator/appTouchEvent.groovy +++ b/eventSimulator/appTouchEvent.groovy @@ -1,2 +1,2 @@ - appObject.setValue([name: "Touched", value: "Touched", deviceId: 0, descriptionText: "", - displayed: true, linkText: "", isStateChange: false, unit: "", data: []]) + appObject.setValue([name: "Touched", value: "touched", deviceId: "touchedSensorID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) diff --git a/eventSimulator/batteryChargeEvent.groovy b/eventSimulator/batteryChargeEvent.groovy new file mode 100644 index 0000000..adf0018 --- /dev/null +++ b/eventSimulator/batteryChargeEvent.groovy @@ -0,0 +1,2 @@ + smokeDetectorObject.setValue([name: "battery", value: "5"/*A number between 0 to 100 as a charge*/, deviceId: "smokeDetectorID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/buttonHeldEvent.groovy b/eventSimulator/buttonHeldEvent.groovy index b808a29..d350c29 100644 --- a/eventSimulator/buttonHeldEvent.groovy +++ b/eventSimulator/buttonHeldEvent.groovy @@ -1,2 +1,2 @@ - aeonKeyFobObject.setValue([name: "button", value: "held", deviceId: 0, descriptionText: "", - displayed: true, linkText: "", isStateChange: false, unit: "", data: [value: "held"]]) + aeonKeyFobObject.setValue([name: "button", value: "held", deviceId: "aeonKeyFobID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/buttonPushedEvent.groovy b/eventSimulator/buttonPushedEvent.groovy index 52e74cc..2f8c0f1 100644 --- a/eventSimulator/buttonPushedEvent.groovy +++ b/eventSimulator/buttonPushedEvent.groovy @@ -1,2 +1,2 @@ - aeonKeyFobObject.setValue([name: "button", value: "pushed", deviceId: 0, descriptionText: "", - displayed: true, linkText: "", isStateChange: false, unit: "", data: [value: "pushed"]]) + aeonKeyFobObject.setValue([name: "button", value: "pushed", deviceId: "aeonKeyFobID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/carbonMonoxideClearEvent.groovy b/eventSimulator/carbonMonoxideClearEvent.groovy new file mode 100644 index 0000000..71486e0 --- /dev/null +++ b/eventSimulator/carbonMonoxideClearEvent.groovy @@ -0,0 +1,2 @@ + smokeDetectorObject.setValue([name: "carbonMonoxide", value: "clear", deviceId: "smokeDetectorID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/carbonMonoxideDetectedEvent.groovy b/eventSimulator/carbonMonoxideDetectedEvent.groovy new file mode 100644 index 0000000..d7aa316 --- /dev/null +++ b/eventSimulator/carbonMonoxideDetectedEvent.groovy @@ -0,0 +1,2 @@ + smokeDetectorObject.setValue([name: "carbonMonoxide", value: "detected", deviceId: "smokeDetectorID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/carbonMonoxideTestedEvent.groovy b/eventSimulator/carbonMonoxideTestedEvent.groovy new file mode 100644 index 0000000..455c65f --- /dev/null +++ b/eventSimulator/carbonMonoxideTestedEvent.groovy @@ -0,0 +1,2 @@ + smokeDetectorObject.setValue([name: "carbonMonoxide", value: "tested", deviceId: "smokeDetectorID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/contactClosedEvent.groovy b/eventSimulator/contactClosedEvent.groovy index 505a2e8..e8aa87c 100644 --- a/eventSimulator/contactClosedEvent.groovy +++ b/eventSimulator/contactClosedEvent.groovy @@ -1,2 +1,2 @@ - contactObject.setValue([name: "contact.closed", value: "closed", deviceId: 0, descriptionText: "", - displayed: true, linkText: "", isStateChange: false, unit: "", data: [value: "closed"]]) + contactObject.setValue([name: "contact.closed", value: "closed", deviceId: "contactSensorID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) diff --git a/eventSimulator/contactOpenEvent.groovy b/eventSimulator/contactOpenEvent.groovy index 15bface..5890676 100644 --- a/eventSimulator/contactOpenEvent.groovy +++ b/eventSimulator/contactOpenEvent.groovy @@ -1,2 +1,2 @@ - contactObject.setValue([name: "contact.open", value: "closed", deviceId: 0, descriptionText: "", - displayed: true, linkText: "", isStateChange: false, unit: "", data: [value: "open"]]) + contactObject.setValue([name: "contact.open", value: "open", deviceId: "contactSensorID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) diff --git a/eventSimulator/doorClosedEvent.groovy b/eventSimulator/doorClosedEvent.groovy index 91e3e5a..6bf5004 100644 --- a/eventSimulator/doorClosedEvent.groovy +++ b/eventSimulator/doorClosedEvent.groovy @@ -1,2 +1,2 @@ - doorControlObject.setValue([name: "doorState", value: "closed", deviceId: 0, descriptionText: "", - displayed: true, linkText: "", isStateChange: false, unit: "", data: [value: "closed"]]) + doorControlObject.setValue([name: "doorState", value: "closed", deviceId: "doorControlID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) diff --git a/eventSimulator/doorOpenEvent.groovy b/eventSimulator/doorOpenEvent.groovy index aa841c6..5f95d3a 100644 --- a/eventSimulator/doorOpenEvent.groovy +++ b/eventSimulator/doorOpenEvent.groovy @@ -1,2 +1,2 @@ - doorControlObject.setValue([name: "doorState", value: "open", deviceId: 0, descriptionText: "", - displayed: true, linkText: "", isStateChange: false, unit: "", data: [value: "open"]]) + doorControlObject.setValue([name: "doorState", value: "open", deviceId: "doorControlID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) diff --git a/eventSimulator/locationAwayEvent.groovy b/eventSimulator/locationAwayEvent.groovy new file mode 100644 index 0000000..7f10f78 --- /dev/null +++ b/eventSimulator/locationAwayEvent.groovy @@ -0,0 +1,2 @@ + locationObject.setValue([name: "Location", value: "away", deviceId: "locationID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/locationHomeEvent.groovy b/eventSimulator/locationHomeEvent.groovy new file mode 100644 index 0000000..c4d4763 --- /dev/null +++ b/eventSimulator/locationHomeEvent.groovy @@ -0,0 +1,2 @@ + locationObject.setValue([name: "Location", value: "home", deviceId: "locationID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/locationNightEvent.groovy b/eventSimulator/locationNightEvent.groovy new file mode 100644 index 0000000..eb8284b --- /dev/null +++ b/eventSimulator/locationNightEvent.groovy @@ -0,0 +1,2 @@ + locationObject.setValue([name: "Location", value: "night", deviceId: "locationID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/lockEvent.groovy b/eventSimulator/lockEvent.groovy index ec825e4..72b0109 100644 --- a/eventSimulator/lockEvent.groovy +++ b/eventSimulator/lockEvent.groovy @@ -1,2 +1,2 @@ - lockObject.setValue([name: "lock", value: "locked", deviceId: 0, descriptionText: "", - displayed: true, linkText: "", isStateChange: false, unit: "", data: [value: "locked"]]) + lockObject.setValue([name: "lock", value: "locked", deviceId: "lockID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) diff --git a/eventSimulator/motionActiveEvent.groovy b/eventSimulator/motionActiveEvent.groovy new file mode 100644 index 0000000..bcec327 --- /dev/null +++ b/eventSimulator/motionActiveEvent.groovy @@ -0,0 +1,2 @@ + motionSensorObject.setValue([name: "motion", value: "active", deviceId: "motionSensorID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/motionInactiveEvent.groovy b/eventSimulator/motionInactiveEvent.groovy new file mode 100644 index 0000000..2346a0b --- /dev/null +++ b/eventSimulator/motionInactiveEvent.groovy @@ -0,0 +1,2 @@ + motionSensorObject.setValue([name: "motion", value: "inactive", deviceId: "motionSensorID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/nfcTouchEvent.groovy b/eventSimulator/nfcTouchEvent.groovy index 00dbe6d..97bbcfe 100644 --- a/eventSimulator/nfcTouchEvent.groovy +++ b/eventSimulator/nfcTouchEvent.groovy @@ -1,2 +1,2 @@ - appObject.setValue([name: "nfcTouch", value: "Touched", deviceId: 0, descriptionText: "", - displayed: true, linkText: "", isStateChange: false, unit: "", data: [value: "Touched"]]) + appObject.setValue([name: "nfcTouch", value: "touched", deviceId: "nfcSensorID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) diff --git a/eventSimulator/presenceLeftEvent.groovy b/eventSimulator/presenceLeftEvent.groovy index dc5cc86..8de48ed 100644 --- a/eventSimulator/presenceLeftEvent.groovy +++ b/eventSimulator/presenceLeftEvent.groovy @@ -1,2 +1,2 @@ - presenceSensorObject.setValue([name: "presence", value: "not present", deviceId: 0, descriptionText: "", - displayed: true, linkText: "", isStateChange: false, unit: "", data: [value: "not present"]]) + presenceSensorObject.setValue([name: "presence", value: "not present", deviceId: "presenceSensorID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/presencePresentEvent.groovy b/eventSimulator/presencePresentEvent.groovy index fc814e7..addb3c1 100644 --- a/eventSimulator/presencePresentEvent.groovy +++ b/eventSimulator/presencePresentEvent.groovy @@ -1,2 +1,2 @@ - presenceSensorObject.setValue([name: "presence", value: "present", deviceId: 0, descriptionText: "", - displayed: true, linkText: "", isStateChange: false, unit: "", data: [value: "present"]]) + presenceSensorObject.setValue([name: "presence", value: "present", deviceId: "presenceSensorID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/smokeClearEvent.groovy b/eventSimulator/smokeClearEvent.groovy new file mode 100644 index 0000000..c47d3c0 --- /dev/null +++ b/eventSimulator/smokeClearEvent.groovy @@ -0,0 +1,2 @@ + smokeDetectorObject.setValue([name: "smoke", value: "clear", deviceId: "smokeDetectorID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/smokeDetectedEvent.groovy b/eventSimulator/smokeDetectedEvent.groovy new file mode 100644 index 0000000..34ff73b --- /dev/null +++ b/eventSimulator/smokeDetectedEvent.groovy @@ -0,0 +1,2 @@ + smokeDetectorObject.setValue([name: "smoke", value: "detected", deviceId: "smokeDetectorID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/smokeTestedEvent.groovy b/eventSimulator/smokeTestedEvent.groovy new file mode 100644 index 0000000..1c0dc65 --- /dev/null +++ b/eventSimulator/smokeTestedEvent.groovy @@ -0,0 +1,2 @@ + smokeDetectorObject.setValue([name: "smoke", value: "tested", deviceId: "smokeDetectorID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/switchOffEvent.groovy b/eventSimulator/switchOffEvent.groovy new file mode 100644 index 0000000..84e90a4 --- /dev/null +++ b/eventSimulator/switchOffEvent.groovy @@ -0,0 +1,2 @@ + switchObject.setValue([name: "switch", value: "off", deviceId: "switchID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/switchOnEvent.groovy b/eventSimulator/switchOnEvent.groovy new file mode 100644 index 0000000..324f6e8 --- /dev/null +++ b/eventSimulator/switchOnEvent.groovy @@ -0,0 +1,2 @@ + switchObject.setValue([name: "switch", value: "on", deviceId: "switchID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/thermostatAutoModeEvent.groovy b/eventSimulator/thermostatAutoModeEvent.groovy new file mode 100644 index 0000000..311731c --- /dev/null +++ b/eventSimulator/thermostatAutoModeEvent.groovy @@ -0,0 +1,2 @@ + thermostatObject.setValue([name: "thermostatMode", value: "auto", deviceId: "thermostatID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/thermostatCoolModeEvent.groovy b/eventSimulator/thermostatCoolModeEvent.groovy new file mode 100644 index 0000000..e65ad9a --- /dev/null +++ b/eventSimulator/thermostatCoolModeEvent.groovy @@ -0,0 +1,2 @@ + thermostatObject.setValue([name: "thermostatMode", value: "cool", deviceId: "thermostatID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/thermostatEmergencyHeatModeEvent.groovy b/eventSimulator/thermostatEmergencyHeatModeEvent.groovy new file mode 100644 index 0000000..a594e65 --- /dev/null +++ b/eventSimulator/thermostatEmergencyHeatModeEvent.groovy @@ -0,0 +1,2 @@ + thermostatObject.setValue([name: "thermostatMode", value: "emergencyHeat", deviceId: "thermostatID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/thermostatHeatModeEvent.groovy b/eventSimulator/thermostatHeatModeEvent.groovy new file mode 100644 index 0000000..51e59c9 --- /dev/null +++ b/eventSimulator/thermostatHeatModeEvent.groovy @@ -0,0 +1,2 @@ + thermostatObject.setValue([name: "thermostatMode", value: "heat", deviceId: "thermostatID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/thermostatOffModeEvent.groovy b/eventSimulator/thermostatOffModeEvent.groovy new file mode 100644 index 0000000..19f05c9 --- /dev/null +++ b/eventSimulator/thermostatOffModeEvent.groovy @@ -0,0 +1,2 @@ + thermostatObject.setValue([name: "thermostatMode", value: "off", deviceId: "thermostatID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]]) \ No newline at end of file diff --git a/eventSimulator/unlockEvent.groovy b/eventSimulator/unlockEvent.groovy index 189e4d2..49bcdef 100644 --- a/eventSimulator/unlockEvent.groovy +++ b/eventSimulator/unlockEvent.groovy @@ -1,2 +1,2 @@ - lockObject.setValue([name: "unlock", value: "unlocked ", deviceId: 0, descriptionText: "", - displayed: true, linkText: "", isStateChange: false, unit: "", data: [value: "locked"]]) + lockObject.setValue([name: "unlock", value: "unlocked ", deviceId: "lockID0", descriptionText: "", + displayed: true, linkText: "", isStateChange: false, unit: "", data: [info: "info"]])