X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=blobdiff_plain;f=Extractor%2FApp1%2FextractedObjectsConstructorApp1.groovy;h=53906e552fb545d40ebe59b83c5cc7e56f3d7869;hp=7c95ca5188d2b6b80d0f2a5f6a02374654fb681e;hb=31da25f02c14814f402e84b35a174f3c0958cd38;hpb=7bc2c68bdfb07a54d6e8399e7514d715c78a2398

diff --git a/Extractor/App1/extractedObjectsConstructorApp1.groovy b/Extractor/App1/extractedObjectsConstructorApp1.groovy
index 7c95ca5..53906e5 100644
--- a/Extractor/App1/extractedObjectsConstructorApp1.groovy
+++ b/Extractor/App1/extractedObjectsConstructorApp1.groovy
@@ -1,4 +1,19 @@
-lock = obj.lockObject
-contact = obj.contactObject
+temperatures = obj.temperatureMeasurementObject
+thermostats = obj.thermostatObject
+automatic = obj.presenceSensorObject
+detectors = obj.smokeDetectorObject
+humidities = obj.humidityMeasurementObject
+waters = obj.waterSensorObject
+illuminances = obj.illuminanceMeasurementObject
+locks = obj.lockObject
+contacts = obj.contactObject
+accelerations = obj.accelerationSensorObject
+motions = obj.motionSensorObject
+presence = obj.presenceSensorObject
+switches = obj.switchObject
+dimmerSwitches = obj.switchLevelObject
+batteries = obj.batteryObject
+powers = obj.powerMeterObject
+energys = obj.energyMeterObject
 //Global variable for settings!
-settings = [app:app, time:time, lock:lock, contact:contact, sendPushMessage:sendPushMessage, phone:phone]
+settings = [app:app, temperatures:temperatures, thermostats:thermostats, automatic:automatic, detectors:detectors, humidities:humidities, waters:waters, illuminances:illuminances, locks:locks, contacts:contacts, accelerations:accelerations, motions:motions, presence:presence, switches:switches, dimmerSwitches:dimmerSwitches, batteries:batteries, powers:powers, energys:energys, channelKey:channelKey, givenInterval:givenInterval]