Merge pull request #1654 from SmartThingsCommunity/staging

Rolling down staging to master

devicetypes/smartthings/zigbee-dimmer-power.src/zigbee-dimmer-power.groovy

@@ -97,7 +97,7 @@ def on() {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value)
+    zigbee.setLevel(value) + (value?.toInteger() > 0 ? zigbee.on() : [])
 }
 
 /**

devicetypes/smartthings/zigbee-switch.src/zigbee-switch.groovy

@@ -23,6 +23,7 @@ metadata {
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0006", outClusters: "0003, 0006, 0019, 0406", manufacturer: "Leviton", model: "ZSS-10", deviceJoinName: "Leviton Switch"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0006", outClusters: "000A", manufacturer: "HAI", model: "65A21-1", deviceJoinName: "Leviton Wireless Load Control Module-30amp"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL15A", deviceJoinName: "Leviton Lumina RF Plug-In Appliance Module"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL15S", deviceJoinName: "Leviton Lumina RF Switch"
     }
 
     // simulator metadata

smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy

@@ -51,7 +51,7 @@ definition(
 
 //Device Inputs
 preferences {
-	section("Allow <PLACEHOLDER: Your App Name> to control these things...") {
+	section("Allow OpenT2T to control these things...") {
 		input "contactSensors", "capability.contactSensor", title: "Which Contact Sensors", multiple: true, required: false
 		input "garageDoors", "capability.garageDoorControl", title: "Which Garage Doors?", multiple: true, required: false
 		input "locks", "capability.lock", title: "Which Locks?", multiple: true, required: false
@@ -329,34 +329,38 @@ private getDeviceType(device) {
 		switch (it.name.toLowerCase()) {
 			case "switch":
 				deviceType = "switch"
-				break
-			case "switch level":
-				deviceType = "light"
+				if (caps.any { it.name.toLowerCase() == "power meter" }) {
+					return deviceType
+				}
+				if (caps.any { it.name.toLowerCase() == "switch level" }) {
+					deviceType = "light"
+					return deviceType
+				}
 				break
 			case "contact sensor":
 				deviceType = "contactSensor"
-				break
+				return deviceType
 			case "garageDoorControl":
 				deviceType = "garageDoor"
-				break
+				return deviceType
 			case "lock":
 				deviceType = "lock"
-				break
+				return deviceType
 			case "video camera":
 				deviceType = "camera"
-				break
+				return deviceType
 			case "motion sensor":
 				deviceType = "motionSensor"
-				break
+				return deviceType
 			case "presence sensor":
 				deviceType = "presenceSensor"
-				break
+				return deviceType
 			case "thermostat":
 				deviceType = "thermostat"
-				break
+				return deviceType
 			case "water sensor":
 				deviceType = "waterSensor"
-				break
+				return deviceType
 			default:
 				break
 		}