sme minor changes
[smartthings-infrastructure.git] / Extractor / extractorFile.groovy
index 5d14fb1f2b563e85793684d67049312f1bd8b0a8..3696113729e829467960355dc261713faa51bd31 100644 (file)
@@ -39,6 +39,40 @@ import Alarm.Alarm
 import Alarm.Alarms
 import SpeechSynthesis.SpeechSynthesis
 import SpeechSynthesis.SpeechSynthesises
+import AccelerationSensor.AccelerationSensor
+import AccelerationSensor.AccelerationSensors
+import Battery.Battery
+import Battery.Batteries
+import BeaconSensor.BeaconSensor
+import BeaconSensor.BeaconSensors
+import CarbonMonoxideDetector.CarbonMonoxideDetector
+import CarbonMonoxideDetector.CarbonMonoxideDetectors
+import ColorControl.ColorControl
+import ColorControl.ColorControls
+import EnergyMeter.EnergyMeter
+import EnergyMeter.EnergyMeters
+import IlluminanceMeasurement.IlluminanceMeasurement
+import IlluminanceMeasurement.IlluminanceMeasurements
+import PowerMeter.PowerMeter
+import PowerMeter.PowerMeters
+import RelativeHumidityMeasurement.RelativeHumidityMeasurement
+import RelativeHumidityMeasurement.RelativeHumidityMeasurements
+import RelaySwitch.RelaySwitch
+import RelaySwitch.RelaySwitches
+import SleepSensor.SleepSensor
+import SleepSensor.SleepSensors
+import StepSensor.StepSensor
+import StepSensor.StepSensors
+import SwitchLevel.SwitchLevel
+import SwitchLevel.SwitchLevels
+import TemperatureMeasurement.TemperatureMeasurement
+import TemperatureMeasurement.TemperatureMeasurements
+import WaterSensor.WaterSensor
+import WaterSensor.WaterSensors
+import Valve.Valve
+import Valve.Valves
+import MobilePresence.MobilePresence
+import MobilePresence.MobilePresences
 import Timer.SimulatedTimer
 
 //GlobalVariables
@@ -71,6 +105,16 @@ if (App == "App1") {
 
 
 
+//Some of methods-May be needed even in install
+/////////////////////////////////////////////////////////////////////
+def timeToday(String time, Object timeZone) {
+       def timeOfDay = new Date()
+       def _inputTime = time.split(':')
+       def inputTime = Integer.parseInt(_inputTime[0])*3600+Integer.parseInt(_inputTime[1])*60+1564191100415
+       timeOfDay.time = inputTime
+       return timeOfDay
+}
+
 
 
 //Global objects
@@ -114,7 +158,7 @@ if (App == "App1") {
 @Field def musicPlayerObject0
 @Field def musicPlayerObject1
 @Field def musicPlayerObject2
-//Global Object for class music player!
+//Global Object for class aeon key fob!
 @Field aeonKeyFobObjects = 0
 @Field def aeonKeyFobObject0
 @Field def aeonKeyFobObject1
@@ -139,11 +183,97 @@ if (App == "App1") {
 @Field def alarmObject0
 @Field def alarmObject1
 @Field def alarmObject2
-//Global Object for class alarm!
+//Global Object for class speech synthesis!
 @Field speechSynthesisObjects = 0
 @Field def speechSynthesisObject0
 @Field def speechSynthesisObject1
 @Field def speechSynthesisObject2
+//Global Object for class acceleration sensor!
+@Field accelerationSensorObjects = 0
+@Field def accelerationSensorObject0
+@Field def accelerationSensorObject1
+@Field def accelerationSensorObject2
+//Global Object for class battery!
+@Field batteryObjects = 0
+@Field def batteryObject0
+@Field def batteryObject1
+@Field def batteryObject2
+//Global Object for class beacon sensor!
+@Field beaconSensorObjects = 0
+@Field def beaconSensorObject0
+@Field def beaconSensorObject1
+@Field def beaconSensorObject2
+//Global Object for class carbon monoxide detector!
+@Field carbonMonoxideDetectorObjects = 0
+@Field def carbonMonoxideDetectorObject0
+@Field def carbonMonoxideDetectorObject1
+@Field def carbonMonoxideDetectorObject2
+//Global Object for class color control!
+@Field colorControlObjects = 0
+@Field def colorControlObject0
+@Field def colorControlObject1
+@Field def colorControlObject2
+//Global Object for class energy meter!
+@Field energyMeterObjects = 0
+@Field def energyMeterObject0
+@Field def energyMeterObject1
+@Field def energyMeterObject2
+//Global Object for class energy meter!
+@Field illuminanceMeasurementObjects = 0
+@Field def illuminanceMeasurementObject0
+@Field def illuminanceMeasurementObject1
+@Field def illuminanceMeasurementObject2
+//Global Object for class power meter!
+@Field powerMeterObjects = 0
+@Field def powerMeterObject0
+@Field def powerMeterObject1
+@Field def powerMeterObject2
+//Global Object for class power meter!
+@Field humidityMeasurementObjects = 0
+@Field def humidityMeasurementObject0
+@Field def humidityMeasurementObject1
+@Field def humidityMeasurementObject2
+//Global Object for class relay switch!
+@Field relaySwitchObjects = 0
+@Field def relaySwitchObject0
+@Field def relaySwitchObject1
+@Field def relaySwitchObject2
+//Global Object for class sleep sensor!
+@Field sleepSensorObjects = 0
+@Field def sleepSensorObject0
+@Field def sleepSensorObject1
+@Field def sleepSensorObject2
+//Global Object for class sleep sensor!
+@Field stepSensorObjects = 0
+@Field def stepSensorObject0
+@Field def stepSensorObject1
+@Field def stepSensorObject2
+//Global Object for class switch level!
+@Field switchLevelObjects = 0
+@Field def switchLevelObject0
+@Field def switchLevelObject1
+@Field def switchLevelObject2
+//Global Object for class temperature measurement!
+@Field temperatureMeasurementObjects = 0
+@Field def temperatureMeasurementObject0
+@Field def temperatureMeasurementObject1
+@Field def temperatureMeasurementObject2
+//Global Object for class temperature measurement!
+@Field waterSensorObjects = 0
+@Field def waterSensorObject0
+@Field def waterSensorObject1
+@Field def waterSensorObject2
+//Global Object for class valve!
+@Field valveObjects = 0
+@Field def valveObject0
+@Field def valveObject1
+@Field def valveObject2
+//Global Object for class valve!
+@Field mobilePresenceObjects = 0
+@Field def mobilePresenceObject0
+@Field def mobilePresenceObject1
+@Field def mobilePresenceObject2
+
 
 
 //Global variables
@@ -307,12 +437,108 @@ def input(LinkedHashMap metaData) {
                        }
                        break
                case "capability.battery":
+                       if (batteryObjects == 0) {
+                               batteryObject0 = metaData['name']
+                               this[batteryObject0] = new Batteries({}, 1)
+                       } else if (batteryObjects == 1) {
+                               batteryObject1 = metaData['name']
+                               this[batteryObject1] = new Batteries({}, 1)
+                       } else if (batteryObjects == 2) {
+                               batteryObject2 = metaData['name']
+                               this[batteryObject2] = new Batteries({}, 1)
+                       }
+
+                       batteryObjects=batteryObjects+1
+
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class Battery!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.batteryObject\n")               
+                       } else {
+                               extractedObjectsApp2.append("//Object for class Battery!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.batteryObject\n")
+                       }
                        break
                case "capability.beacon":
+                       if (beaconSensorObjects == 0) {
+                               beaconSensorObject0 = metaData['name']
+                               this[beaconSensorObject0] = new BeaconSensors({}, 1)
+                       } else if (beaconSensorObjects == 1) {
+                               beaconSensorObject1 = metaData['name']
+                               this[beaconSensorObject1] = new BeaconSensors({}, 1)
+                       } else if (beaconSensorObjects == 2) {
+                               beaconSensorObject2 = metaData['name']
+                               this[beaconSensorObject2] = new BeaconSensors({}, 1)
+                       }
+
+                       beaconSensorObjects=beaconSensorObjects+1
+
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class beacon sensor!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.beaconSensorObject\n")          
+                       } else {
+                               extractedObjectsApp2.append("//Object for class beacon sensor!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.beaconSensorObject\n")
+                       }
                        break
                case "capability.carbonMonoxideDetector":
+                       if (carbonMonoxideDetectorObjects == 0) {
+                               carbonMonoxideDetectorObject0 = metaData['name']
+                               this[carbonMonoxideDetectorObject0] = new CarbonMonoxideDetectors({}, 1)
+                       } else if (carbonMonoxideDetectorObjects == 1) {
+                               carbonMonoxideDetectorObject1 = metaData['name']
+                               this[carbonMonoxideDetectorObject1] = new CarbonMonoxideDetectors({}, 1)
+                       } else if (carbonMonoxideDetectorObjects == 2) {
+                               carbonMonoxideDetectorObject2 = metaData['name']
+                               this[carbonMonoxideDetectorObject2] = new CarbonMonoxideDetectors({}, 1)
+                       }
+
+                       carbonMonoxideDetectorObjects=carbonMonoxideDetectorObjects+1
+                       
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class carbon monoxide detector!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.carbonMonoxideDetectorObject\n")                
+                       } else {
+                               extractedObjectsApp2.append("//Object for class carbon monoxide detector!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.carbonMonoxideDetectorObject\n")
+                       }
                        break
                case "capability.colorControl":
+                       if (colorControlObjects == 0) {
+                               colorControlObject0 = metaData['name']
+                               this[colorControlObject0] = new ColorControls({}, 1)
+                       } else if (colorControlObjects == 1) {
+                               colorControlObject1 = metaData['name']
+                               this[colorControlObject1] = new ColorControls({}, 1)
+                       } else if (colorControlObjects == 2) {
+                               colorControlObject2 = metaData['name']
+                               this[colorControlObject2] = new ColorControls({}, 1)
+                       }
+
+                       colorControlObjects=colorControlObjects+1
+
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class color control!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.colorControlObject\n")          
+                       } else {
+                               extractedObjectsApp2.append("//Object for class color control!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.colorControlObject\n")
+                       }
                        break
                case "capability.contactSensor":
                        if (contactObjects == 0) {
@@ -367,10 +593,82 @@ def input(LinkedHashMap metaData) {
                        }
                        break
                case "capability.energyMeter":
+                       if (energyMeterObjects == 0) {
+                               energyMeterObject0 = metaData['name']
+                               this[energyMeterObject0] = new EnergyMeters({}, 1)
+                       } else if (energyMeterObjects == 1) {
+                               energyMeterObject1 = metaData['name']
+                               this[energyMeterObject1] = new EnergyMeters({}, 1)
+                       } else if (energyMeterObjects == 2) {
+                               energyMeterObject2 = metaData['name']
+                               this[energyMeterObject2] = new EnergyMeters({}, 1)
+                       }
+
+                       energyMeterObjects=energyMeterObjects+1
+
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class energy meter!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.energyMeterObject\n")           
+                       } else {
+                               extractedObjectsApp2.append("//Object for class energy meter!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.energyMeterObject\n")
+                       }
                        break
                case "capability.illuminanceMeasurement":
+                       if (illuminanceMeasurementObjects == 0) {
+                               illuminanceMeasurementObject0 = metaData['name']
+                               this[illuminanceMeasurementObject0] = new IlluminanceMeasurements({}, 1)
+                       } else if (illuminanceMeasurementObjects == 1) {
+                               illuminanceMeasurementObject1 = metaData['name']
+                               this[illuminanceMeasurementObject1] = new IlluminanceMeasurements({}, 1)
+                       } else if (illuminanceMeasurementObjects == 2) {
+                               illuminanceMeasurementObject2 = metaData['name']
+                               this[illuminanceMeasurementObject2] = new IlluminanceMeasurements({}, 1)
+                       }
+
+                       illuminanceMeasurementObjects=illuminanceMeasurementObjects+1
+
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class illuminance measurement!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.illuminanceMeasurementObject\n")                
+                       } else {
+                               extractedObjectsApp2.append("//Object for class illuminance measurement!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.illuminanceMeasurementObject\n")
+                       }
                        break
                case "capability.accelerationSensor":
+                       if (accelerationSensorObjects == 0) {
+                               accelerationSensorObject0 = metaData['name']
+                               this[accelerationSensorObject0] = new AccelerationSensors({}, 1)
+                       } else if (accelerationSensorObjects == 1) {
+                               accelerationSensorObject1 = metaData['name']
+                               this[accelerationSensorObject1] = new AccelerationSensors({}, 1)
+                       } else if (accelerationSensorObjects == 2) {
+                               accelerationSensorObject2 = metaData['name']
+                               this[accelerationSensorObject2] = new AccelerationSensors({}, 1)
+                       }
+
+                       accelerationSensorObjects=accelerationSensorObjects+1
+
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class Acceleration Sensor!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.accelerationSensorObject\n")            
+                       } else {
+                               extractedObjectsApp2.append("//Object for class Acceleration Sensor!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.accelerationSensorObject\n")
+                       }
                        break
                case "capability.motionSensor":
                        if (motionSensorObjects == 0) {
@@ -425,6 +723,30 @@ def input(LinkedHashMap metaData) {
                        }
                        break
                case "capability.powerMeter":
+                       if (powerMeterObjects == 0) {
+                               powerMeterObject0 = metaData['name']
+                               this[powerMeterObject0] = new PowerMeters({}, 1)
+                       } else if (powerMeterObjects == 1) {
+                               powerMeterObject1 = metaData['name']
+                               this[powerMeterObject1] = new PowerMeters({}, 1)
+                       } else if (powerMeterObjects == 2) {
+                               powerMeterObject2 = metaData['name']
+                               this[powerMeterObject2] = new PowerMeters({}, 1)
+                       }
+
+                       powerMeterObjects=powerMeterObjects+1
+
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class power meter!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.powerMeterObject\n")            
+                       } else {
+                               extractedObjectsApp2.append("//Object for class power meter!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.powerMeterObject\n")
+                       }
                        break
                case "capability.presenceSensor":
                        if (presenceSensorObjects == 0) {
@@ -453,10 +775,82 @@ def input(LinkedHashMap metaData) {
                        }
                        break
                case "capability.relativeHumidityMeasurement":
+                       if (humidityMeasurementObjects == 0) {
+                               humidityMeasurementObject0 = metaData['name']
+                               this[humidityMeasurementObject0] = new RelativeHumidityMeasurements({}, 1)
+                       } else if (humidityMeasurementObjects == 1) {
+                               humidityMeasurementObject1 = metaData['name']
+                               this[humidityMeasurementObject1] = new RelativeHumidityMeasurements({}, 1)
+                       } else if (humidityMeasurementObjects == 2) {
+                               humidityMeasurementObject2 = metaData['name']
+                               this[humidityMeasurementObject2] = new RelativeHumidityMeasurements({}, 1)
+                       }
+
+                       humidityMeasurementObjects=humidityMeasurementObjects+1
+
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class humidity measurement!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.humidityMeasurementObject\n")           
+                       } else {
+                               extractedObjectsApp2.append("//Object for class humidity measurement!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.humidityMeasurementObject\n")
+                       }
                        break
                case "capability.relaySwitch":
+                       if (relaySwitchObjects == 0) {
+                               relaySwitchObject0 = metaData['name']
+                               this[relaySwitchObject0] = new RelaySwitches({}, 1)
+                       } else if (relaySwitchObjects == 1) {
+                               relaySwitchObject1 = metaData['name']
+                               this[relaySwitchObject1] = new RelaySwitches({}, 1)
+                       } else if (relaySwitchObjects == 2) {
+                               relaySwitchObject2 = metaData['name']
+                               this[relaySwitchObject2] = new RelaySwitches({}, 1)
+                       }
+
+                       relaySwitchObjects=relaySwitchObjects+1
+                       
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class relay switch!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.relaySwitchObject\n")           
+                       } else {
+                               extractedObjectsApp2.append("//Object for class relay switch!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.relaySwitchObject\n")
+                       }
                        break
                case "capability.sleepSensor":
+                       if (sleepSensorObjects == 0) {
+                               sleepSensorObject0 = metaData['name']
+                               this[sleepSensorObject0] = new SleepSensors({}, 1)
+                       } else if (sleepSensorObjects == 1) {
+                               sleepSensorObject1 = metaData['name']
+                               this[sleepSensorObject1] = new SleepSensors({}, 1)
+                       } else if (sleepSensorObjects == 2) {
+                               sleepSensorObject2 = metaData['name']
+                               this[sleepSensorObject2] = new SleepSensors({}, 1)
+                       }
+
+                       sleepSensorObjects=sleepSensorObjects+1
+                       
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class sleep sensor!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.sleepSensorObject\n")           
+                       } else {
+                               extractedObjectsApp2.append("//Object for class sleep sensor!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.sleepSensorObject\n")
+                       }
                        break
                case "capability.smokeDetector":
                        if (smokeDetectorObjects == 0) {
@@ -485,6 +879,30 @@ def input(LinkedHashMap metaData) {
                        }
                        break
                case "capability.stepSensor":
+                       if (stepSensorObjects == 0) {
+                               stepSensorObject0 = metaData['name']
+                               this[stepSensorObject0] = new StepSensors({}, 1)
+                       } else if (stepSensorObjects == 1) {
+                               stepSensorObject1 = metaData['name']
+                               this[stepSensorObject1] = new StepSensors({}, 1)
+                       } else if (stepSensorObjects == 2) {
+                               stepSensorObject2 = metaData['name']
+                               this[stepSensorObject2] = new StepSensors({}, 1)
+                       }
+
+                       stepSensorObjects=stepSensorObjects+1
+                       
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class step sensor!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.stepSensorObject\n")            
+                       } else {
+                               extractedObjectsApp2.append("//Object for class step sensor!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.stepSensorObject\n")
+                       }
                        break
                case "capability.switch":
                        if (switchObjects == 0) {
@@ -513,8 +931,56 @@ def input(LinkedHashMap metaData) {
                        }
                        break
                case "capability.switchLevel":
+                       if (switchLevelObjects == 0) {
+                               switchLevelObject0 = metaData['name']
+                               this[switchLevelObject0] = new SwitchLevels({}, 1)
+                       } else if (switchLevelObjects == 1) {
+                               switchLevelObject1 = metaData['name']
+                               this[switchLevelObject1] = new SwitchLevels({}, 1)
+                       } else if (switchLevelObjects == 2) {
+                               switchLevelObject2 = metaData['name']
+                               this[switchLevelObject2] = new SwitchLevels({}, 1)
+                       }
+
+                       switchLevelObjects=switchLevelObjects+1
+
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class switch level!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.switchLevelObject\n")           
+                       } else {
+                               extractedObjectsApp2.append("//Object for class switch level!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.switchLevelObject\n")
+                       }
                        break
                case "capability.temperatureMeasurement":
+                       if (temperatureMeasurementObjects == 0) {
+                               temperatureMeasurementObject0 = metaData['name']
+                               this[temperatureMeasurementObject0] = new TemperatureMeasurements({}, 1)
+                       } else if (temperatureMeasurementObjects == 1) {
+                               temperatureMeasurementObject1 = metaData['name']
+                               this[temperatureMeasurementObject1] = new TemperatureMeasurements({}, 1)
+                       } else if (temperatureMeasurementObjects == 2) {
+                               temperatureMeasurementObject2 = metaData['name']
+                               this[temperatureMeasurementObject2] = new TemperatureMeasurements({}, 1)
+                       }
+
+                       temperatureMeasurementObjects=temperatureMeasurementObjects+1
+
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class temperature measurement!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.temperatureMeasurementObject\n")                
+                       } else {
+                               extractedObjectsApp2.append("//Object for class temperature measurement!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.temperatureMeasurementObject\n")
+                       }
                        break
                case "capability.thermostat":
                        if (thermostatObjects == 0) {
@@ -543,6 +1009,30 @@ def input(LinkedHashMap metaData) {
                        }
                        break
                case "capability.valve":
+                       if (valveObjects == 0) {
+                               valveObject0 = metaData['name']
+                               this[valveObject0] = new Valves({}, 1)
+                       } else if (valveObjects == 1) {
+                               valveObject1 = metaData['name']
+                               this[valveObject1] = new Valves({}, 1)
+                       } else if (valveObjects == 2) {
+                               valveObject2 = metaData['name']
+                               this[valveObject2] = new Valves({}, 1)
+                       }
+
+                       valveObjects=valveObjects+1
+
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class valve!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.valveObject\n")         
+                       } else {
+                               extractedObjectsApp2.append("//Object for class valve!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.valveObject\n")
+                       }
                        break
                case "capability.speechSynthesis":
                        if (speechSynthesisObjects == 0) {
@@ -571,6 +1061,30 @@ def input(LinkedHashMap metaData) {
                        }
                        break
                case "capability.waterSensor":
+                       if (waterSensorObjects == 0) {
+                               waterSensorObject0 = metaData['name']
+                               this[waterSensorObject0] = new WaterSensors({}, 1)
+                       } else if (waterSensorObjects == 1) {
+                               waterSensorObject1 = metaData['name']
+                               this[waterSensorObject1] = new WaterSensors({}, 1)
+                       } else if (waterSensorObjects == 2) {
+                               waterSensorObject2 = metaData['name']
+                               this[waterSensorObject2] = new WaterSensors({}, 1)
+                       }
+
+                       waterSensorObjects=waterSensorObjects+1
+
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class water sensor!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.waterSensorObject\n")           
+                       } else {
+                               extractedObjectsApp2.append("//Object for class water sensor!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.waterSensorObject\n")
+                       }
                        break
                case "capability.touchSensor":
                        if (touchSensorObjects == 0) {
@@ -625,6 +1139,30 @@ def input(LinkedHashMap metaData) {
                        }
                        break
                case "device.mobilePresence":
+                       if (mobilePresenceObjects == 0) {
+                               mobilePresenceObject0 = metaData['name']
+                               this[mobilePresenceObject0] = new MobilePresences({}, 1)
+                       } else if (mobilePresenceObjects == 1) {
+                               mobilePresenceObject1 = metaData['name']
+                               this[mobilePresenceObject1] = new MobilePresences({}, 1)
+                       } else if (mobilePresenceObjects == 2) {
+                               mobilePresenceObject2 = metaData['name']
+                               this[mobilePresenceObject2] = new MobilePresences({}, 1)
+                       }
+
+                       mobilePresenceObjects=mobilePresenceObjects+1
+
+                       settings.put(metaData['name'], metaData['name'])
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class mobile presence!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.mobilePresenceObject\n")                
+                       } else {
+                               extractedObjectsApp2.append("//Object for class mobile presence!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.mobilePresenceObject\n")
+                       }
                        break
                case "device.aeonKeyFob":
                        if (aeonKeyFobObjects == 0) {
@@ -830,11 +1368,10 @@ def input(LinkedHashMap metaData) {
                        }
                        break
                case "enum":
-                       def randomVariable = Math.abs(new Random().nextInt() % 2)
-                       def modes = ["Yes", "No"]
-                       //def userInput = modes[randomVariable]
-                       // TODO: We 
-                       //def modes = metaData['options']
+                       if (metaData['options'] != null)
+                               modes = metaData['options']
+                       else // If it is not named 'options' then it is captured as 'metadata'
+                               modes = metaData['metadata']
                        def userInput = modes[0]
        
                        if (enumVariables == 0) {
@@ -1004,6 +1541,10 @@ def mode(LinkedHashMap metaData) {
 def href(LinkedHashMap metaData) {
        println("//IGNORE--some data//")
 }
+
+def href(LinkedHashMap metaData, String name) {
+       println("//IGNORE--some data//")
+}
 /////Input Methods/////
 
 
@@ -1062,12 +1603,18 @@ def section(Closure inputData) {
 def section(LinkedHashMap metaData, Closure inputData) {
        find(inputData) //Run the closure to extract inputMethods
 }
+
+def mappings(Closure inputData) {
+       println("//IGNORE--some data//")
+}
 /////MethodsForExtraction/////
 
 
 
 /**
- *  Copyright 2015 SmartThings
+ *  Beacon Control
+ *
+ *  Copyright 2014 Physical Graph Corporation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  *  in compliance with the License. You may obtain a copy of the License at:
@@ -1078,128 +1625,297 @@ def section(LinkedHashMap metaData, Closure inputData) {
  *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
  *  for the specific language governing permissions and limitations under the License.
  *
- *  Make it So
- *
- *  Author: SmartThings
- *  Date: 2013-03-06
  */
 definition(
-    name: "Make It So",
-    namespace: "smartthings",
-    author: "SmartThings",
-    description: "Saves the states of a specified set switches and thermostat setpoints and restores them at each mode change. To use 1) Set the mode, 2) Change switches and setpoint to where you want them for that mode, and 3) Install or update the app. Changing to that mode or touching the app will set the devices to the saved state.",
-    category: "Convenience",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Meta/light_thermo-switch.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Meta/light_thermo-switch@2x.png"
+       name: "Beacon Control",
+       category: "SmartThings Internal",
+       namespace: "smartthings",
+       author: "SmartThings",
+       description: "Execute a Hello, Home phrase, turn on or off some lights, and/or lock or unlock your door when you enter or leave a monitored region",
+       iconUrl: "https://s3.amazonaws.com/smartapp-icons/MiscHacking/mindcontrol.png",
+       iconX2Url: "https://s3.amazonaws.com/smartapp-icons/MiscHacking/mindcontrol@2x.png"
 )
 
 preferences {
-       section("Switches") {
-               input "switches", "capability.switch", multiple: true, required: false
-       }
-       section("Thermostats") {
-               input "thermostats", "capability.thermostat", multiple: true, required: false
+       page(name: "timeIntervalInput", title: "Only during a certain time") {
+               section {
+                       input "starting", "time", title: "Starting", required: false
+                       input "ending", "time", title: "Ending", required: false
+               }
        }
-       section("Locks") {
-               input "locks", "capability.lock", multiple: true, required: false
+       
+       page(name: "mainPage")
+}
+
+def mainPage() {
+       dynamicPage(name: "mainPage", install: true, uninstall: true) {
+
+               section("Where do you want to watch?") {
+                       input name: "beacons", type: "capability.beacon", title: "Select your beacon(s)", 
+                               multiple: true, required: true
+               }
+
+               section("Who do you want to watch for?") {
+                       input name: "phones", type: "device.mobilePresence", title: "Select your phone(s)", 
+                               multiple: true, required: true
+               }
+
+               section("What do you want to do on arrival?") {
+                       input name: "arrivalPhrase", type: "enum", title: "Execute a phrase", 
+                               options: listPhrases(), required: false
+                       input "arrivalOnSwitches", "capability.switch", title: "Turn on some switches", 
+                               multiple: true, required: false
+                       input "arrivalOffSwitches", "capability.switch", title: "Turn off some switches", 
+                               multiple: true, required: false
+                       input "arrivalLocks", "capability.lock", title: "Unlock the door",
+                               multiple: true, required: false
+               }
+
+               section("What do you want to do on departure?") {
+                       input name: "departPhrase", type: "enum", title: "Execute a phrase", 
+                               options: listPhrases(), required: false
+                       input "departOnSwitches", "capability.switch", title: "Turn on some switches", 
+                               multiple: true, required: false
+                       input "departOffSwitches", "capability.switch", title: "Turn off some switches", 
+                               multiple: true, required: false
+                       input "departLocks", "capability.lock", title: "Lock the door",
+                               multiple: true, required: false
+               }
+
+               section("Do you want to be notified?") {
+                       input "pushNotification", "bool", title: "Send a push notification"
+                       input "phone", "phone", title: "Send a text message", description: "Tap to enter phone number", 
+                               required: false
+               }
+
+               section {
+                       label title: "Give your automation a name", description: "e.g. Goodnight Home, Wake Up"
+               }
+
+               def timeLabel = timeIntervalLabel()
+               section(title: "More options", hidden: hideOptionsSection(), hideable: true) {
+                       href "timeIntervalInput", title: "Only during a certain time", 
+                               description: timeLabel ?: "Tap to set", state: timeLabel ? "complete" : "incomplete"
+
+                       input "days", "enum", title: "Only on certain days of the week", multiple: true, required: false,
+                               options: ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
+
+                       input "modes", "mode", title: "Only when mode is", multiple: true, required: false
+               }
        }
 }
 
+// Lifecycle management
 def installed() {
-       subscribe(location, changedLocationMode)
-       subscribe(app, appTouch)
-       saveState()
+       log.debug "<beacon-control> Installed with settings: ${settings}"
+       initialize()
 }
 
 def updated() {
+       log.debug "<beacon-control> Updated with settings: ${settings}"
        unsubscribe()
-       subscribe(location, changedLocationMode)
-       subscribe(app, appTouch)
-       saveState()
+       initialize()
 }
 
-def appTouch(evt)
-{
-       restoreState(currentMode)
+def initialize() {
+       subscribe(beacons, "presence", beaconHandler)
 }
 
-def changedLocationMode(evt)
-{
-       restoreState(evt.value)
+// Event handlers
+def beaconHandler(evt) {
+       log.debug "<beacon-control> beaconHandler: $evt"
+
+       if (allOk) {
+               def data = new groovy.json.JsonSlurper().parseText(evt.data)
+                // removed logging of device names. can be added back for debugging
+               //log.debug "<beacon-control> data: $data - phones: " + phones*.deviceNetworkId
+
+               def beaconName = getBeaconName(evt)
+                // removed logging of device names. can be added back for debugging
+               //log.debug "<beacon-control> beaconName: $beaconName"
+
+               def phoneName = getPhoneName(data)
+                // removed logging of device names. can be added back for debugging
+               //log.debug "<beacon-control> phoneName: $phoneName"
+               if (phoneName != null) {
+            def action = data.presence == "1" ? "arrived" : "left"
+            def msg = "$phoneName has $action ${action == 'arrived' ? 'at ' : ''}the $beaconName"
+
+            if (action == "arrived") {
+                msg = arriveActions(msg)
+            }
+            else if (action == "left") {
+                msg = departActions(msg)
+            }
+            log.debug "<beacon-control> msg: $msg"
+
+            if (pushNotification || phone) {
+                def options = [
+                    method: (pushNotification && phone) ? "both" : (pushNotification ? "push" : "sms"),
+                    phone: phone
+                ]
+                sendNotification(msg, options)
+            }
+        }
+       }
 }
 
-private restoreState(mode)
-{
-       log.info "restoring state for mode '$mode'"
-       def map = state[mode] ?: [:]
-       switches?.each {
-               def value = map[it.id]
-               if (value?.switch == "on") {
-                       def level = value.level
-                       if (level) {
-                               log.debug "setting $it.label level to $level"
-                               it.setLevel(level)
-                       }
-                       else {
-                               log.debug "turning $it.label on"
-                               it.on()
-                       }
-               }
-               else if (value?.switch == "off") {
-                       log.debug "turning $it.label off"
-                       it.off()
-               }
+// Helpers
+private arriveActions(msg) {
+       if (arrivalPhrase || arrivalOnSwitches || arrivalOffSwitches || arrivalLocks) msg += ", so"
+       
+       if (arrivalPhrase) {
+               log.debug "<beacon-control> executing: $arrivalPhrase"
+               executePhrase(arrivalPhrase)
+               msg += " ${prefix('executed')} $arrivalPhrase."
+       }
+       if (arrivalOnSwitches) {
+               log.debug "<beacon-control> turning on: $arrivalOnSwitches"
+               arrivalOnSwitches.on()
+               msg += " ${prefix('turned')} ${list(arrivalOnSwitches)} on."
        }
+       if (arrivalOffSwitches) {
+               log.debug "<beacon-control> turning off: $arrivalOffSwitches"
+               arrivalOffSwitches.off()
+               msg += " ${prefix('turned')} ${list(arrivalOffSwitches)} off."
+       }
+       if (arrivalLocks) {
+               log.debug "<beacon-control> unlocking: $arrivalLocks"
+               arrivalLocks.unlock()
+               msg += " ${prefix('unlocked')} ${list(arrivalLocks)}."
+       }
+       msg
+}
 
-       thermostats?.each {
-               def value = map[it.id]
-               if (value?.coolingSetpoint) {
-                       log.debug "coolingSetpoint = $value.coolingSetpoint"
-                       it.setCoolingSetpoint(value.coolingSetpoint)
-               }
-               if (value?.heatingSetpoint) {
-                       log.debug "heatingSetpoint = $value.heatingSetpoint"
-                       it.setHeatingSetpoint(value.heatingSetpoint)
-               }
+private departActions(msg) {
+       if (departPhrase || departOnSwitches || departOffSwitches || departLocks) msg += ", so"
+       
+       if (departPhrase) {
+               log.debug "<beacon-control> executing: $departPhrase"
+               executePhrase(departPhrase)
+               msg += " ${prefix('executed')} $departPhrase."
+       }
+       if (departOnSwitches) {
+               log.debug "<beacon-control> turning on: $departOnSwitches"
+               departOnSwitches.on()
+               msg += " ${prefix('turned')} ${list(departOnSwitches)} on."
        }
+       if (departOffSwitches) {
+               log.debug "<beacon-control> turning off: $departOffSwitches"
+               departOffSwitches.off()
+               msg += " ${prefix('turned')} ${list(departOffSwitches)} off."
+       }
+       if (departLocks) {
+               log.debug "<beacon-control> unlocking: $departLocks"
+               departLocks.lock()
+               msg += " ${prefix('locked')} ${list(departLocks)}."
+       }
+       msg
+}
 
-       locks?.each {
-               def value = map[it.id]
-               if (value) {
-                       if (value?.locked) {
-                               it.lock()
-                       }
-                       else {
-                               it.unlock()
-                       }
-               }
+private prefix(word) {
+       def result
+       def index = settings.prefixIndex == null ? 0 : settings.prefixIndex + 1
+       switch (index) {
+               case 0:
+                       result = "I $word"
+                       break
+               case 1:
+                       result = "I also $word"
+                       break
+               case 2:
+                       result = "And I $word"
+                       break
+               default:
+                       result = "And $word"
+                       break
        }
+
+       settings.prefixIndex = index
+       log.trace "prefix($word'): $result"
+       result
 }
 
+private listPhrases() {
+       location.helloHome.getPhrases().label
+}
 
-private saveState()
-{
-       def mode = currentMode
-       def map = state[mode] ?: [:]
+private executePhrase(phraseName) {
+       if (phraseName) {
+               location.helloHome.execute(phraseName)
+               log.debug "<beacon-control> executed phrase: $phraseName"
+       }
+}
 
-       switches?.each {
-               map[it.id] = [switch: it.currentSwitch, level: it.currentLevel]
+private getBeaconName(evt) {
+       def beaconName = beacons.find { b -> b.id == evt.deviceId }
+       return beaconName
+}
+
+private getPhoneName(data) {    
+       def phoneName = phones.find { phone ->
+               // Work around DNI bug in data
+               def pParts = phone.deviceNetworkId.split('\\|')
+               def dParts = data.dni.split('\\|')
+        pParts[0] == dParts[0]
        }
+       return phoneName
+}
+
+private hideOptionsSection() {
+       (starting || ending || days || modes) ? false : true
+}
+
+private getAllOk() {
+       modeOk && daysOk && timeOk
+}
+
+private getModeOk() {
+       def result = !modes || modes.contains(location.mode)
+       log.trace "<beacon-control> modeOk = $result"
+       result
+}
 
-       thermostats?.each {
-               map[it.id] = [coolingSetpoint: it.currentCoolingSetpoint, heatingSetpoint: it.currentHeatingSetpoint]
+private getDaysOk() {
+       def result = true
+       if (days) {
+               def df = new java.text.SimpleDateFormat("EEEE")
+               if (location.timeZone) {
+                       df.setTimeZone(location.timeZone)
+               }
+               else {
+                       df.setTimeZone(TimeZone.getTimeZone("America/New_York"))
+               }
+               def day = df.format(new Date())
+               result = days.contains(day)
        }
+       log.trace "<beacon-control> daysOk = $result"
+       result
+}
 
-       locks?.each {
-               map[it.id] = [locked: it.currentLock == "locked"]
+private getTimeOk() {
+       def result = true
+       if (starting && ending) {
+               def currTime = now()
+               def start = timeToday(starting, location?.timeZone).time
+               def stop = timeToday(ending, location?.timeZone).time
+               result = start < stop ? currTime >= start && currTime <= stop : currTime <= stop || currTime >= start
        }
+       log.trace "<beacon-control> timeOk = $result"
+       result
+}
 
-       state[mode] = map
-       log.debug "saved state for mode ${mode}: ${state[mode]}"
-       log.debug "state: $state"
+private hhmm(time, fmt = "h:mm a") {
+       def t = timeToday(time, location.timeZone)
+       def f = new java.text.SimpleDateFormat(fmt)
+       f.setTimeZone(location.timeZone ?: timeZone(time))
+       f.format(t)
 }
 
-private getCurrentMode()
-{
-       location.mode ?: "_none_"
-}
\ No newline at end of file
+private timeIntervalLabel() {
+       (starting && ending) ? hhmm(starting) + "-" + hhmm(ending, "h:mm a z") : ""
+}
+
+private list(Object names) {
+       return names[0]
+}