Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index fb03c70fc42a302a0beebe9e139d7f395445c23e..1ad102977466a6eb9c3ba7dc72c4ab22348eb2be 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -59,7 +59,8 @@ eventTypeCounterMap =  {'lock': 2,
                                                'temperature' : 2,
                                                'heatingSetpoint' : 1,
                                                'coolingSetpoint' : 1,
-                                               'thermostatSetpoint' : 1}
+                                               'thermostatSetpoint' : 1,
+                                                'threeAxis' : 1}
 
 # Mapping for specific event types
 eventTypesMap =           {'alarm.both': 'alarm',
@@ -645,6 +646,7 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "switch":
+                        
                        #Check which capability
                        variable = eventVarMap[eventList[i]]
                        if eventList[i] not in eventVarCounterMap.keys():
@@ -655,6 +657,8 @@ def ExtractEvents(extractedEvents):
                                eventVarCounterMap[eventList[i]] = eventVarCount + 1
                        capability = capabilityMap[variable[eventVarCount]]
                        #Write two events subsequently
+                        print("//////////////////////")
+                        print(capability)
                        if capability == "capability.switch":
                                event = open("eventSimulator/switchOnEvent.groovy", "r")
                        elif capability == "capability.switchLevel":
@@ -922,6 +926,8 @@ def ExtractEvents(extractedEvents):
                                event = open("eventSimulator/switchLevelEvent.groovy", "r")
                        elif capability == "capability.colorControl":
                                event = open("eventSimulator/colorLevelChangeEvent.groovy", "r")
+                        elif capability == "capability.switch":
+                                event = open("eventSimulator/switchLevelChangeEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
@@ -991,6 +997,11 @@ def ExtractEvents(extractedEvents):
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
+                elif eventList[i] == "threeAxis":
+                        event = open("eventSimulator/threeAxisChangeEvent.groovy", "r")
+                        for line in event:
+                                extractedEvents.write(line)
+                        event.close()
                        
                ###TODO: Add more events later
                extractedEvents.write("\n\t\t\tbreak\n")

diff --git a/SwitchLevel/SwitchLevel.groovy b/SwitchLevel/SwitchLevel.groovy
index 32ae59116dc5cc18cbb2d2d8d133b5700e8fe77e..7db6a168d8cecdbe1ab33404aa6ab33b1e54ec08 100644 (file)
--- a/SwitchLevel/SwitchLevel.groovy
+++ b/SwitchLevel/SwitchLevel.groovy
@@ -47,6 +47,11 @@ public class SwitchLevel {
                        sendEvent([name: "saturation", value: "$saturation", deviceId: this.id, descriptionText: "",
                                   displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
                }
+       }
+
+       def setLevel(String level) {
+               def newLevel = level.toInteger()
+               setLevel(newLevel)
        }       
 
        def setLevel(int level) {

diff --git a/SwitchLevel/SwitchLevels.groovy b/SwitchLevel/SwitchLevels.groovy
index 5d02053b334ebdea6aaaf85cc78608b8866e0dc8..d9d2e267617a05943ffcc70f5eea37e0501cc240 100644 (file)
--- a/SwitchLevel/SwitchLevels.groovy
+++ b/SwitchLevel/SwitchLevels.groovy
@@ -76,6 +76,11 @@ public class SwitchLevels {
                        switchLevels[0].setColor(metaData)
                }
        }
+       
+       def setLevel(String level) {
+               def newLevel = level.toInteger()
+               setLevel(newLevel)
+       }
 
        def setLevel(int level) {
                if (this.level != level) {

diff --git a/eventSimulator/switchLevelChangeEvent.groovy b/eventSimulator/switchLevelChangeEvent.groovy
new file mode 100644 (file)
index 0000000..502de0a
--- /dev/null
+++ b/eventSimulator/switchLevelChangeEvent.groovy
@@ -0,0 +1,2 @@
+                       switchObject.setValue([name: "level", value: "45", deviceId: "switchID0", descriptionText: "",
+                                       displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])

diff --git a/eventSimulator/threeAxisChangeEvent.groovy b/eventSimulator/threeAxisChangeEvent.groovy
new file mode 100644 (file)
index 0000000..2ce9b60
--- /dev/null
+++ b/eventSimulator/threeAxisChangeEvent.groovy
@@ -0,0 +1,2 @@
+                       threeAxisObject.setValue([name: "threeAxis", value: '{"x": 1, "y": 2, "z": 3}', deviceId: "threeAxisID0", descriptionText: "",
+                               displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])