Some minor changes in events' format

[smartthings-infrastructure.git] / Extractor / App2 / extractedObjectsConstructorApp2.groovy

diff --git a/Extractor/App2/extractedObjectsConstructorApp2.groovy b/Extractor/App2/extractedObjectsConstructorApp2.groovy
index 6d5a754466486d3b2bd53d0a8c24a7041f99f36d..e10e01497cadd2b4c44fa6ac4946e2534d0e2a32 100644 (file)
--- a/Extractor/App2/extractedObjectsConstructorApp2.groovy
+++ b/Extractor/App2/extractedObjectsConstructorApp2.groovy
@@ -1,6 +1,10 @@
-tag = obj.touchSensorObject
-switch1 = obj.switchObject
-lock = obj.lockObject
-garageDoor = obj.doorControlObject
+beacons = obj.beaconSensorObject
+phones = obj.mobilePresenceObject
+arrivalOnSwitches = obj.switchObject
+arrivalOffSwitches = obj.switchObject
+arrivalLocks = obj.lockObject
+departOnSwitches = obj.switchObject
+departOffSwitches = obj.switchObject
+departLocks = obj.lockObject
 //Global variable for settings!
-settings = [app:app, tag:tag, switch1:switch1, lock:lock, garageDoor:garageDoor, masterSwitch:masterSwitch, masterLock:masterLock, masterDoor:masterDoor]
+settings = [app:app, starting:starting, ending:ending, beacons:beacons, phones:phones, arrivalPhrase:arrivalPhrase, arrivalOnSwitches:arrivalOnSwitches, arrivalOffSwitches:arrivalOffSwitches, arrivalLocks:arrivalLocks, departPhrase:departPhrase, departOnSwitches:departOnSwitches, departOffSwitches:departOffSwitches, departLocks:departLocks, pushNotification:pushNotification, phone:phone, days:days, modes:modes]