Adjusting setLocationMode for global-variable conflict detection.

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

diff --git a/Extractor/Extractor.groovy b/Extractor/Extractor.groovy
index 4c90690d7266816e62564a6e679c21e3e9b30280..4607b7c89cd7916f2848fcbd776cd788fa792cec 100644 (file)
--- a/Extractor/Extractor.groovy
+++ b/Extractor/Extractor.groovy
@@ -76,10 +76,12 @@ import Button.Button
 import Button.Buttons
 import ThreeAxis.ThreeAxis
 import ThreeAxis.ThreeAxises
+import Momentary.Momentary
+import Momentary.Momentaries
 import Timer.SimulatedTimer
 
 //GlobalVariables
-@Field def location = new LocationVar()
+@Field def location = new LocationVar({}, true)
 //Settings variable defined to settings on purpose
 @Field def settings = [app: "app"]
 //Global variable for state[mode]
@@ -295,6 +297,11 @@ def timeToday(String time, Object timeZone) {
 @Field def threeAxisObject0
 @Field def threeAxisObject1
 @Field def threeAxisObject2
+//Global Object for class momentary switch device!
+@Field momentaryObjects = 0
+@Field def momentaryObject0
+@Field def momentaryObject1
+@Field def momentaryObject2
 
 
 //Global variables
@@ -395,6 +402,8 @@ def input(LinkedHashMap metaData, String name, String type, Closure Input) {
        find(Input)
 }
 
+@Field chooseMode = 0
+
 //input linkedHashMap
 def input(LinkedHashMap metaData) {
        if (metaData.containsKey('title')) {
@@ -895,6 +904,41 @@ def input(LinkedHashMap metaData) {
                                extractedObjectsConstructorApp2.append(metaData['name']+" = obj.accelerationSensorObject\n")
                        }
                        break
+               case "capability.momentary":
+                       globalObjects.eachLine { line ->
+                               if(line.contains("momentoryObject")){
+                                       contains = 1
+                               }
+                       }
+
+                       if (contains == 0)
+                               globalObjects.append("@Field def momentaryObject = new Momentaries(sendEvent, 1)\n")
+
+                       if (momentaryObjects == 0) {
+                               momentaryObject0 = metaData['name']
+                               this[momentaryObject0] = new Momentaries({}, 1)
+                       } else if (momentaryObjects == 1) {
+                               momentaryObject1 = metaData['name']
+                               this[momentaryObject1] = new Momentaries({}, 1)
+                       } else if (momentaryObjects == 2) {
+                               momentaryObject2 = metaData['name']
+                               this[momentaryObject2] = new Momentaries({}, 1)
+                       }
+
+                       momentaryObjects=momentaryObjects+1
+
+                       settings.put(metaData['name'], new Momentaries({}, 1))
+
+                       if (App == "App1") {
+                               extractedObjectsApp1.append("//Object for class momentory switch class!\n")
+                               extractedObjectsApp1.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp1.append(metaData['name']+" = obj.momentaryObject\n")             
+                       } else {
+                               extractedObjectsApp2.append("//Object for class momentory Sensor!\n")
+                               extractedObjectsApp2.append("def "+metaData['name']+"\n")
+                               extractedObjectsConstructorApp2.append(metaData['name']+" = obj.momentaryObject\n")
+                       }                       
+                       break
                case "capability.motionSensor":
                        globalObjects.eachLine { line ->
                                if(line.contains("motionSensorObject")){
@@ -1597,7 +1641,13 @@ def input(LinkedHashMap metaData) {
                case "mode":
                        //def randomVariable = Math.abs(new Random().nextInt() % 3)
                        def modes = ["away", "home", "night"]
-                       def userInput = modes[1]
+                       // Always assign a different mode to each app
+                       //def userInput = modes[1]
+                       def userInput = modes[chooseMode]
+                       if (chooseMode < 3)
+                               chooseMode++;
+                       else
+                               chooseMode = chooseMode%3
 
                        if (modeVariables == 0) {
                                mode0 = metaData['name']
@@ -2063,7 +2113,7 @@ def preferences(Closure inputData) {
                GlobalVariablesBothApps.write("")
                GlobalVariablesBothApps.append("//Creating Global variables for both apps\n")
                GlobalVariablesBothApps.append("@Field def sendEvent = {eventDataMap -> eventHandler(eventDataMap)}\n")
-               GlobalVariablesBothApps.append("@Field def locationObject = new LocationVar(sendEvent)\n")
+               GlobalVariablesBothApps.append("@Field def locationObject = new LocationVar(sendEvent, init)\n")
                GlobalVariablesBothApps.append("@Field def appObject = new Touched(sendEvent, 0)\n")
                
                globalObjects.withReader { reader ->