MSA-1814: null

Rolling down staging to master

build.gradle

@@ -9,7 +9,7 @@ apply plugin: 'smartthings-slack'
 
 buildscript {
     dependencies {
-        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.11"
+        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.8"
     }
     repositories {
         mavenLocal()

devicetypes/fibargroup/fibaro-flood-sensor-zw5.src/fibaro-flood-sensor-zw5.groovy

@@ -21,7 +21,6 @@ metadata {
 		capability "Tamper Alert"
 		capability "Temperature Measurement"
 		capability "Water Sensor"
-		capability "Health Check"
         
         fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x22, 0x85, 0x59, 0x20, 0x80, 0x70, 0x56, 0x5A, 0x7A, 0x72, 0x8E, 0x71, 0x73, 0x98, 0x9C, 0x31, 0x86", outClusters: ""
 	}
@@ -229,8 +228,6 @@ def zwaveEvent(physicalgraph.zwave.commands.deviceresetlocallyv1.DeviceResetLoca
 
 def configure() {
 	log.debug "Executing 'configure'"
-	// Device-Watch simply pings if no device events received for 8 hrs & 2 minutes
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 	
     def cmds = []
     

devicetypes/fibargroup/fibaro-motion-sensor-zw5.src/fibaro-motion-sensor-zw5.groovy

@@ -22,7 +22,6 @@ metadata {
 		capability "Sensor"
 		capability "Tamper Alert"
 		capability "Temperature Measurement"
-		capability "Health Check"
         
         fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x20, 0x86, 0x72, 0x5A, 0x59, 0x85, 0x73, 0x84, 0x80, 0x71, 0x56, 0x70, 0x31, 0x8E, 0x22, 0x30, 0x9C, 0x98, 0x7A", outClusters: ""
 	}
@@ -241,8 +240,6 @@ def zwaveEvent(physicalgraph.zwave.commands.deviceresetlocallyv1.DeviceResetLoca
 
 def configure() {
 	log.debug "Executing 'configure'"
-	// Device-Watch simply pings if no device events received for 8 hrs & 2 minutes
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
     
     def cmds = []
     

devicetypes/smartthings/fibaro-flood-sensor.src/fibaro-flood-sensor.groovy

@@ -39,7 +39,6 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Configuration"
 		capability "Battery"
-		capability "Health Check"
        
         command		"resetParams2StDefaults"
         command		"listCurrentParams"
@@ -305,9 +304,6 @@ def lateConfigure(setConf = False) {
  */
 def configure() {
 	log.debug "Configuring Device..."
-	// Device-Watch simply pings if no device events received for 8 hrs & 2 minutes
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-
     def cmds = []
     
     // send associate to group 2 to get alarm data

devicetypes/smartthings/fibaro-motion-sensor.src/fibaro-motion-sensor.groovy

@@ -46,7 +46,6 @@
 		capability 	"Illuminance Measurement"
 		capability 	"Sensor"
 		capability 	"Battery"
-		capability  "Health Check"
         
         command		"resetParams2StDefaults"
         command		"listCurrentParams"
@@ -126,9 +125,6 @@
  */
 def configure() {
 	log.debug "Configuring Device For SmartThings Use"
-	// Device-Watch simply pings if no device events received for 8 hrs & 2 minutes
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-
     def cmds = []
     
     // send associate to group 3 to get sensor data reported only to hub

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

@@ -81,32 +81,38 @@ def getInputs() {
 //API external Endpoints
 mappings {
 	path("/subscriptionURL/:url") {
-		action: [
+		action:
+		[
 				PUT: "updateEndpointURL"
 		]
 	}
 	path("/connectionId/:connId") {
-		action: [
+		action:
+		[
 				PUT: "updateConnectionId"
 		]
 	}
 	path("/devices") {
-		action: [
+		action:
+		[
 				GET: "getDevices"
 		]
 	}
 	path("/devices/:id") {
-		action: [
+		action:
+		[
 				GET: "getDevice"
 		]
 	}
 	path("/update/:id") {
-		action: [
+		action:
+		[
 				PUT: "updateDevice"
 		]
 	}
 	path("/subscription/:id") {
-		action: [
+		action:
+		[
 				POST  : "registerDeviceChange",
 				DELETE: "unregisterDeviceChange"
 		]
@@ -180,20 +186,16 @@ def eventHandler(evt) {
 	def evt_name = evt.name
 	def evt_device = evt.device
 	def evt_deviceType = getDeviceType(evt_device);
-	def deviceInfo
-
-	if(evt_deviceType == "thermostat")
-	{
-		deviceInfo = [name: evt_device.displayName, id: evt_device.id, status:evt_device.getStatus(), deviceType:evt_deviceType, manufacturer:evt_device.getManufacturerName(), model:evt_device.getModelName(), attributes: deviceAttributeList(evt_device), locationMode: getLocationModeInfo()]
-	}
-	else
-	{
-		deviceInfo = [name: evt_device.displayName, id: evt_device.id, status:evt_device.getStatus(), deviceType:evt_deviceType, manufacturer:evt_device.getManufacturerName(), model:evt_device.getModelName(), attributes: deviceAttributeList(evt_device)]
-	}
-
 	def params = [
 			uri : "${state.endpointURL}/${state.connectionId}",
-			body: [ deviceInfo ]
+			body: [
+					name        : evt_device.displayName,
+					id          : evt_device.id,
+					deviceType  : evt_deviceType,
+					manufacturer: evt_device.getManufacturerName(),
+					model       : evt_device.getModelName(),
+					attributes  : deviceAttributeList(evt_device)
+			]
 	]
 	try {
 		log.trace "POST URI: ${params.uri}"
@@ -228,13 +230,10 @@ def getDevices() {
 	def deviceData = []
 	inputs?.each {
 		def deviceType = getDeviceType(it)
-		if(deviceType == "thermostat")
-		{
-			deviceData << [name: it.displayName, id: it.id, status:it.getStatus(), deviceType:deviceType, manufacturer:it.getManufacturerName(), model:it.getModelName(), attributes: deviceAttributeList(it), locationMode: getLocationModeInfo()]
-		}
-		else
-		{
-			deviceData << [name: it.displayName, id: it.id, status:it.getStatus(), deviceType:deviceType, manufacturer:it.getManufacturerName(), model:it.getModelName(), attributes: deviceAttributeList(it)]
+		if (deviceType == "thermostat") {
+			deviceData << [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it), locationMode: getLocationModeInfo()]
+		} else {
+			deviceData << [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it)]
 		}
 	}
 
@@ -247,13 +246,10 @@ def getDevice() {
 	def it = findDevice(params.id)
 	def deviceType = getDeviceType(it)
 	def device
-	if(deviceType == "thermostat")
-	{
-		device = [name: it.displayName, id: it.id, status:it.getStatus(), deviceType:deviceType, manufacturer:it.getManufacturerName(), model:it.getModelName(), attributes: deviceAttributeList(it), locationMode: getLocationModeInfo()]
-	}
-	else
-	{
-		device = [name: it.displayName, id: it.id, status:it.getStatus(), deviceType:deviceType, manufacturer:it.getManufacturerName(), model:it.getModelName(), attributes: deviceAttributeList(it)]
+	if (deviceType == "thermostat") {
+		device = [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it), locationMode: getLocationModeInfo()]
+	} else {
+		device = [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it)]
 	}
 	log.debug "getDevice, return: ${device}"
 	return device
@@ -326,28 +322,19 @@ private getLocationModeInfo() {
 //Map each device to a type given it's capabilities
 private getDeviceType(device) {
 	def deviceType
-	def capabilities = device.capabilities
-	log.debug "capabilities: [${device}, ${capabilities}]"
+	def caps = device.capabilities
+	log.debug "capabilities: [${device}, ${caps}]"
 	log.debug "supported commands: [${device}, ${device.supportedCommands}]"
-
-	//Loop through the device capability list to determine the device type.
-	capabilities.each {capability ->
-		switch(capability.name.toLowerCase())
-		{
+	caps.each {
+		switch (it.name.toLowerCase()) {
 			case "switch":
 				deviceType = "switch"
-
-				//If the device also contains "Switch Level" capability, identify it as a "light" device.
-				if (capabilities.any{it.name.toLowerCase() == "switch level"}){
-
-					//If the device also contains "Power Meter" capability, identify it as a "dimmerSwitch" device.
-					if (capabilities.any{it.name.toLowerCase() == "power meter"}){
-						deviceType = "dimmerSwitch"
-						return deviceType
-					} else {
-						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":
@@ -427,7 +414,7 @@ private mapDeviceCommands(command, value) {
 			resultCommand = "setSaturation"
 			resultValue = value
 			break
-		case "colorTemperature":
+		case "ct":
 			resultCommand = "setColorTemperature"
 			resultValue = value
 			break
@@ -464,8 +451,7 @@ private mapDeviceCommands(command, value) {
 			if (value == 1 || value == "1" || value == "lock") {
 				resultCommand = "lock"
 				resultValue = ""
-			}
-			else if (value == 0 || value == "0" || value == "unlock") {
+			} else if (value == 0 || value == "0" || value == "unlock") {
 				resultCommand = "unlock"
 				resultValue = ""
 			}
@@ -476,3 +462,4 @@ private mapDeviceCommands(command, value) {
 
 	return [resultCommand, resultValue]
 }
+