Merge pull request #2072 from SmartThingsCommunity/staging

Rolling up staging to production

devicetypes/smartthings/bose-soundtouch.src/bose-soundtouch.groovy

@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
  *  Bose SoundTouch
  *

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

@@ -108,20 +108,11 @@ def updated(){
     }
 }
 
-def getCommandClassVersions() {
-	[
-		0x20: 1,  // Basic
-		0x26: 1,  // SwitchMultilevel
-		0x56: 1,  // Crc16Encap
-		0x70: 1,  // Configuration
-	]
-}
-
 def parse(String description) {
 	def result = null
 	if (description != "updated") {
 		log.debug "parse() >> zwave.parse($description)"
-		def cmd = zwave.parse(description, commandClassVersions)
+		def cmd = zwave.parse(description, [0x20: 1, 0x26: 1, 0x70: 1])
 		if (cmd) {
 			result = zwaveEvent(cmd)
 		}
@@ -188,16 +179,6 @@ def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv1.SwitchMultilevelS
 	[createEvent(name:"switch", value:"on"), response(zwave.switchMultilevelV1.switchMultilevelGet().format())]
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
-	def versions = commandClassVersions
-	def version = versions[cmd.commandClass as Integer]
-	def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
-	def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
-	if (encapsulatedCommand) {
-		zwaveEvent(encapsulatedCommand)
-	}
-}
-
 def zwaveEvent(physicalgraph.zwave.Command cmd) {
 	// Handles all Z-Wave commands we aren't interested in
 	[:]

devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy

@@ -56,8 +56,6 @@ metadata {
 def installed(){
 // Device-Watch simply pings if no device events received for 32min(checkInterval)
 	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-
-	response(refresh())
 }
 
 def updated(){
@@ -87,17 +85,11 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 def open() {
-	delayBetween([
+	zwave.switchBinaryV1.switchBinarySet(switchValue: 0x00).format()
-		zwave.switchBinaryV1.switchBinarySet(switchValue: 0x00).format(),
-		zwave.switchBinaryV1.switchBinaryGet().format()
-	], 500)
 }
 
 def close() {
-	delayBetween([
+	zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF).format()
-		zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF).format(),
-		zwave.switchBinaryV1.switchBinaryGet().format()
-	], 500)
 }
 
 /**
@@ -113,6 +105,6 @@ def refresh() {
 
 def createEventWithDebug(eventMap) {
 	def event = createEvent(eventMap)
-	log.debug "Event created with ${event?.name}:${event?.value} - ${event?.descriptionText}"
+	log.debug "Event created with ${event?.descriptionText}"
 	return event
 }

devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy

@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
  *  Hue Bloom
  *

devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy

@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
  *  Hue Bridge
  *

devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy

@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
  *  Hue Bulb
  *

devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy

@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
  *  Hue Lux Bulb
  *

devicetypes/smartthings/hue-white-ambiance-bulb.src/hue-white-ambiance-bulb.groovy

@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
  *  Hue White Ambiance Bulb
  *

devicetypes/smartthings/testing/simulated-presence-sensor.src/simulated-presence-sensor.groovy

@@ -49,6 +49,6 @@ def arrived() {
 
 
 def departed() {
-	log.trace "Executing 'departed'"
+	log.trace "Executing 'arrived'"
 	sendEvent(name: "presence", value: "not present")
 }

devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy

@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
  *  Copyright 2015 SmartThings
  *

devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy

@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
  *  Copyright 2015 SmartThings
  *

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

@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
  *  Copyright 2015 SmartThings
  *

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

@@ -66,29 +66,22 @@ def parse(String description) {
         else {
             sendEvent(event)
         }
-    } else {
+    }
-        def descMap = zigbee.parseDescriptionAsMap(description)
+    else {
-        if (descMap && descMap.clusterInt == 0x0006 && descMap.commandInt == 0x07) {
+        def cluster = zigbee.parse(description)
-            if (descMap.data[0] == "00") {
+
+        if (cluster && cluster.clusterId == 0x0006 && cluster.command == 0x07) {
+            if (cluster.data[0] == 0x00) {
                 log.debug "ON/OFF REPORTING CONFIG RESPONSE: " + cluster
                 sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
-            } else {
+            }
+            else {
                 log.warn "ON/OFF REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
             }
-        } else if (device.getDataValue("manufacturer") == "sengled" && descMap && descMap.clusterInt == 0x0008 && descMap.attrInt == 0x0000) {
+        }
-            // This is being done because the sengled element touch/classic incorrectly uses the value 0xFF for the max level.
+        else {
-            // Per the ZCL spec for the UINT8 data type 0xFF is an invalid value, and 0xFE should be the max.  Here we
-            // manually handle the invalid attribute value since it will be ignored by getEvent as an invalid value.
-            // We also set the level of the bulb to 0xFE so future level reports will be 0xFE until it is changed by
-            // something else.
-            if (descMap.value.toUpperCase() == "FF") {
-                descMap.value = "FE"
-            }
-            sendHubCommand(zigbee.command(zigbee.LEVEL_CONTROL_CLUSTER, 0x00, "FE0000").collect { new physicalgraph.device.HubAction(it) }, 0)
-            sendEvent(zigbee.getEventFromAttrData(descMap.clusterInt, descMap.attrInt, descMap.encoding, descMap.value))
-        } else {
             log.warn "DID NOT PARSE MESSAGE for description : $description"
-            log.debug "${descMap}"
+            log.debug "${cluster}"
         }
     }
 }

devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy

@@ -88,20 +88,11 @@ def updated(){
 	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 }
 
-def getCommandClassVersions() {
-	[
-		0x20: 1,  // Basic
-		0x26: 1,  // SwitchMultilevel
-		0x56: 1,  // Crc16Encap
-		0x70: 1,  // Configuration
-	]
-}
-
 def parse(String description) {
 	def result = null
 	if (description != "updated") {
 		log.debug "parse() >> zwave.parse($description)"
-		def cmd = zwave.parse(description, commandClassVersions)
+		def cmd = zwave.parse(description, [0x20: 1, 0x26: 1, 0x70: 1])
 		if (cmd) {
 			result = zwaveEvent(cmd)
 		}
@@ -168,16 +159,6 @@ def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv1.SwitchMultilevelS
 	[createEvent(name:"switch", value:"on"), response(zwave.switchMultilevelV1.switchMultilevelGet().format())]
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
-	def versions = commandClassVersions
-	def version = versions[cmd.commandClass as Integer]
-	def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
-	def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
-	if (encapsulatedCommand) {
-		zwaveEvent(encapsulatedCommand)
-	}
-}
-
 def zwaveEvent(physicalgraph.zwave.Command cmd) {
 	// Handles all Z-Wave commands we aren't interested in
 	[:]

devicetypes/smartthings/zwave-metering-dimmer.src/zwave-metering-dimmer.groovy

@@ -85,21 +85,11 @@ metadata {
 	details(["switch", "power", "energy", "levelSliderControl", "refresh", "reset"])
 }
 
-def getCommandClassVersions() {
-	[
-		0x20: 1,  // Basic
-		0x26: 3,  // SwitchMultilevel
-		0x56: 1,  // Crc16Encap
-		0x70: 1,  // Configuration
-		0x32: 3,  // Meter
-	]
-}
-
 // parse events into attributes
 def parse(String description) {
 	def result = null
 	if (description != "updated") {
-		def cmd = zwave.parse(description, commandClassVersions)
+		def cmd = zwave.parse(description, [0x20: 1, 0x26: 3, 0x70: 1, 0x32:3])
 		if (cmd) {
 			result = zwaveEvent(cmd)
 	        log.debug("'$description' parsed to $result")
@@ -134,21 +124,6 @@ def zwaveEvent(physicalgraph.zwave.commands.switchmultilevelv3.SwitchMultilevelR
 	dimmerEvents(cmd)
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
-	def versions = commandClassVersions
-	def version = versions[cmd.commandClass as Integer]
-	def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
-	def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
-	if (encapsulatedCommand) {
-		zwaveEvent(encapsulatedCommand)
-	}
-}
-
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	// Handles all Z-Wave commands we aren't interested in
-	[:]
-}
-
 def dimmerEvents(physicalgraph.zwave.Command cmd) {
 	def result = []
 	def value = (cmd.value ? "on" : "off")

devicetypes/smartthings/zwave-metering-switch.src/zwave-metering-switch.groovy

@@ -89,19 +89,10 @@ def updated() {
 	} catch (e) { log.debug e }
 }
 
-def getCommandClassVersions() {
-	[
-		0x20: 1,  // Basic
-		0x32: 1,  // SwitchMultilevel
-		0x56: 1,  // Crc16Encap
-		0x72: 2,  // ManufacturerSpecific
-	]
-}
-
 def parse(String description) {
 	def result = null
 	if(description == "updated") return
-	def cmd = zwave.parse(description, commandClassVersions)
+	def cmd = zwave.parse(description, [0x20: 1, 0x32: 1, 0x72: 2])
 	if (cmd) {
 		result = zwaveEvent(cmd)
 	}
@@ -166,16 +157,6 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
 	result
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
-	def versions = commandClassVersions
-	def version = versions[cmd.commandClass as Integer]
-	def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
-	def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
-	if (encapsulatedCommand) {
-		zwaveEvent(encapsulatedCommand)
-	}
-}
-
 def zwaveEvent(physicalgraph.zwave.Command cmd) {
 	log.debug "$device.displayName: Unhandled: $cmd"
 	[:]

devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy

@@ -71,17 +71,9 @@ def updated(){
 	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
 }
 
-def getCommandClassVersions() {
-	[
-		0x20: 1,  // Basic
-		0x56: 1,  // Crc16Encap
-		0x70: 1,  // Configuration
-	]
-}
-
 def parse(String description) {
 	def result = null
-	def cmd = zwave.parse(description, commandClassVersions)
+	def cmd = zwave.parse(description, [0x20: 1, 0x70: 1])
 	if (cmd) {
 		result = createEvent(zwaveEvent(cmd))
 	}
@@ -128,15 +120,6 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
 	createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false])
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
-	def versions = commandClassVersions
-	def version = versions[cmd.commandClass as Integer]
-	def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
-	def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
-	if (encapsulatedCommand) {
-		zwaveEvent(encapsulatedCommand)
-	}
-}
 
 def zwaveEvent(physicalgraph.zwave.Command cmd) {
 	// Handles all Z-Wave commands we aren't interested in

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

@@ -89,17 +89,9 @@ def updated(){
     }
 }
 
-def getCommandClassVersions() {
-	[
-		0x20: 1,  // Basic
-		0x56: 1,  // Crc16Encap
-		0x70: 1,  // Configuration
-	]
-}
-
 def parse(String description) {
 	def result = null
-	def cmd = zwave.parse(description, commandClassVersions)
+	def cmd = zwave.parse(description, [0x20: 1, 0x70: 1])
 	if (cmd) {
 		result = createEvent(zwaveEvent(cmd))
 	}
@@ -146,16 +138,6 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
 	createEvent([descriptionText: "$device.displayName MSR: $msr", isStateChange: false])
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.crc16encapv1.Crc16Encap cmd) {
-	def versions = commandClassVersions
-	def version = versions[cmd.commandClass as Integer]
-	def ccObj = version ? zwave.commandClass(cmd.commandClass, version) : zwave.commandClass(cmd.commandClass)
-	def encapsulatedCommand = ccObj?.command(cmd.command)?.parse(cmd.data)
-	if (encapsulatedCommand) {
-		zwaveEvent(encapsulatedCommand)
-	}
-}
-
 
 def zwaveEvent(physicalgraph.zwave.Command cmd) {
 	// Handles all Z-Wave commands we aren't interested in

smartapps/smartthings/bose-soundtouch-connect.src/bose-soundtouch-connect.groovy

@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
  *  Bose SoundTouch (Connect)
  *

smartapps/smartthings/hue-connect.src/hue-connect.groovy

@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
  *  Hue Service Manager
  *
@@ -1085,6 +1083,7 @@ def on(childDevice) {
 	log.debug "Executing 'on'"
 	def id = getId(childDevice)
 	updateInProgress()
+	createSwitchEvent(childDevice, "on")
 	put("lights/$id/state", [on: true])
 	return "Bulb is turning On"
 }
@@ -1093,6 +1092,7 @@ def off(childDevice) {
 	log.debug "Executing 'off'"
 	def id = getId(childDevice)
 	updateInProgress()
+	createSwitchEvent(childDevice, "off")
 	put("lights/$id/state", [on: false])
 	return "Bulb is turning Off"
 }
@@ -1108,6 +1108,8 @@ def setLevel(childDevice, percent) {
 	else
 		level = Math.min(Math.round(percent * 254 / 100), 254)
 
+	createSwitchEvent(childDevice, level > 0, percent)
+
 	// For Zigbee lights, if level is set to 0 ST just turns them off without changing level
 	// that means that the light will still be on when on is called next time
 	// Lets emulate that here
@@ -1126,6 +1128,7 @@ def setSaturation(childDevice, percent) {
 	// 0 - 254
 	def level = Math.min(Math.round(percent * 254 / 100), 254)
 	// TODO should this be done by app only or should we default to on?
+	createSwitchEvent(childDevice, "on")
 	put("lights/$id/state", [sat: level, on: true])
 	return "Setting saturation to $percent"
 }
@@ -1137,6 +1140,7 @@ def setHue(childDevice, percent) {
 	// 0 - 65535
 	def level = Math.min(Math.round(percent * 65535 / 100), 65535)
 	// TODO should this be done by app only or should we default to on?
+	createSwitchEvent(childDevice, "on")
 	put("lights/$id/state", [hue: level, on: true])
 	return "Setting hue to $percent"
 }
@@ -1147,6 +1151,7 @@ def setColorTemperature(childDevice, huesettings) {
 	updateInProgress()
 	// 153 (6500K) to 500 (2000K)
 	def ct = hueSettings == 6500 ? 153 : Math.round(1000000 / huesettings)
+	createSwitchEvent(childDevice, "on")
 	put("lights/$id/state", [ct: ct, on: true])
 	return "Setting color temperature to $ct"
 }
@@ -1205,6 +1210,7 @@ def setColor(childDevice, huesettings) {
 	if (huesettings.switch == "off")
 		value.on = false
 
+	createSwitchEvent(childDevice, value.on ? "on" : "off")
 	put("lights/$id/state", value)
 	return "Setting color to $value"
 }
@@ -1316,6 +1322,32 @@ private List getRealHubFirmwareVersions() {
 	return location.hubs*.firmwareVersionString.findAll { it }
 }
 
+/**
+ * Sends appropriate turningOn/turningOff state events depending on switch or level changes.
+ *
+ * @param childDevice device to send event for
+ * @param setSwitch The new switch state, "on" or "off"
+ * @param setLevel Optional, switchLevel between 0-100, used if you set level to 0 for example since
+ * 				  that should generate "off" instead of level change
+ */
+private void createSwitchEvent(childDevice, setSwitch, setLevel = null) {
+
+	if (setLevel == null) {
+		setLevel = childDevice.device?.currentValue("level")
+	}
+	// Create on, off, turningOn or turningOff event as necessary
+	def currentState = childDevice.device?.currentValue("switch")
+	if ((currentState == "off" || currentState == "turningOff")) {
+		if (setSwitch == "on" || setLevel > 0) {
+			childDevice.sendEvent(name: "switch", value: "turningOn", displayed: false)
+		}
+	} else if ((currentState == "on" || currentState == "turningOn")) {
+		if (setSwitch == "off" || setLevel == 0) {
+			childDevice.sendEvent(name: "switch", value: "turningOff", displayed: false)
+		}
+	}
+}
+
 /**
  * Return the supported color range for different Hue lights. If model is not specified
  * it defaults to the smallest Gamut (B) to ensure that colors set on a mix of devices

smartapps/smartthings/json-complete-api.src/json-complete-api.groovy

@@ -1,447 +0,0 @@
-/**
- *  JSON Complete API
- *
- *  Copyright 2017 Paul Lovelace
- *
- */
-definition(
-    name: "JSON Complete API",
-    namespace: "smartthings",
-    author: "Ashok Malhotra",
-    description: "API for JSON with complete set of devices",
-    category: "SmartThings Labs",
-    iconUrl:   "https://raw.githubusercontent.com/pdlove/homebridge-smartthings/master/smartapps/JSON%401.png",
-    iconX2Url: "https://raw.githubusercontent.com/pdlove/homebridge-smartthings/master/smartapps/JSON%402.png",
-    iconX3Url: "https://raw.githubusercontent.com/pdlove/homebridge-smartthings/master/smartapps/JSON%403.png",
-    oauth: true)
-
-
-preferences {
-    page(name: "copyConfig")
-}
-
-//When adding device groups, need to add here
-def copyConfig() {
-    if (!state.accessToken) {
-        createAccessToken()
-    }
-    dynamicPage(name: "copyConfig", title: "Configure Devices", install:true, uninstall:true) {
-        section("Select devices to include in the /devices API call") {
-            paragraph "Version 0.5.5"
-            input "deviceList", "capability.refresh", title: "Most Devices", multiple: true, required: false
-            input "sensorList", "capability.sensor", title: "Sensor Devices", multiple: true, required: false
-            input "switchList", "capability.switch", title: "All Switches", multiple: true, required: false
-            //paragraph "Devices Selected: ${deviceList ? deviceList?.size() : 0}\nSensors Selected: ${sensorList ? sensorList?.size() : 0}\nSwitches Selected: ${switchList ? switchList?.size() : 0}"
-        }
-        section("Configure Pubnub") {
-            input "pubnubSubscribeKey", "text", title: "PubNub Subscription Key", multiple: false, required: false
-            input "pubnubPublishKey", "text", title: "PubNub Publish Key", multiple: false, required: false
-            input "subChannel", "text", title: "Channel (Can be anything)", multiple: false, required: false
-        }
-        section() {
-            paragraph "View this SmartApp's configuration to use it in other places."
-            href url:"${apiServerUrl("/api/smartapps/installations/${app.id}/config?access_token=${state.accessToken}")}", style:"embedded", required:false, title:"Config", description:"Tap, select, copy, then click \"Done\""
-        }
- 
-        section() {
-        	paragraph "View the JSON generated from the installed devices."
-            href url:"${apiServerUrl("/api/smartapps/installations/${app.id}/devices?access_token=${state.accessToken}")}", style:"embedded", required:false, title:"Device Results", description:"View accessories JSON"
-        }
-        section() {
-        	paragraph "Enter the name you would like shown in the smart app list"
-        	label title:"SmartApp Label (optional)", required: false 
-        }
-    }
-}
-
-def renderDevices() {
-    def deviceData = []
-        deviceList.each { 
-        	try {
-            deviceData << [name: it.displayName,
-    				basename: it.name,
-    				deviceid: it.id, 
-                    status: it.status,
-                    manufacturerName: it.getManufacturerName(),
-                    modelName: it.getModelName(),
-                    lastTime: it.getLastActivity(),
-                    capabilities: deviceCapabilityList(it), 
-                    commands: deviceCommandList(it), 
-                    attributes: deviceAttributeList(it)
-                    ]
-      		} catch (e) {
-      			log.error("Error Occurred Parsing Device "+it.displayName+", Error " + e)
-      		}
-        }    
-        sensorList.each { 
-        	try {
-            deviceData << [name: it.displayName,
-    				basename: it.name,
-    				deviceid: it.id, 
-                    status: it.status,
-                    manufacturerName: it.getManufacturerName(),
-                    modelName: it.getModelName(),
-                    lastTime: it.getLastActivity(),
-                    capabilities: deviceCapabilityList(it), 
-                    commands: deviceCommandList(it), 
-                    attributes: deviceAttributeList(it)
-                    ]
-      		} catch (e) {
-      			log.error("Error Occurred Parsing Device "+it.displayName+", Error " + e)
-      		}
-        }    
-        switchList.each { 
-        	try {
-            deviceData << [name: it.displayName,
-    				basename: it.name,
-    				deviceid: it.id, 
-                    status: it.status,
-                    manufacturerName: it.getManufacturerName(),
-                    modelName: it.getModelName(),
-                    lastTime: it.getLastActivity(),
-                    capabilities: deviceCapabilityList(it), 
-                    commands: deviceCommandList(it), 
-                    attributes: deviceAttributeList(it)
-                    ]
-      		} catch (e) {
-      			log.error("Error Occurred Parsing Device "+it.displayName+", Error " + e)
-      		}
-        }    
-    return deviceData
-}
-
-def findDevice(paramid) {
-	def device = deviceList.find { it.id == paramid }
-  	if (device) return device
-	device = sensorList.find { it.id == paramid }
-	if (device) return device
-  	device = switchList.find { it.id == paramid }
-
-	return device
- }
-//No more individual device group definitions after here.
-
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-	unsubscribe()
-	initialize()
-}
-
-def initialize() {
-	if(!state.accessToken) {
-         createAccessToken()
-    }
-    registerAll()
-	state.subscriptionRenewed = 0
-    subscribe(location, null, HubResponseEvent, [filterEvents:false])
-    log.debug "0.5.5"
-}
-
-def authError() {
-    [error: "Permission denied"]
-}
-def renderConfig() {
-    def configJson = new groovy.json.JsonOutput().toJson([
-        description: "JSON API",
-        platforms: [
-            [
-                platform: "SmartThings",
-                name: "SmartThings",
-                app_url: apiServerUrl("/api/smartapps/installations/"),
-                app_id: app.id,
-                access_token:  state.accessToken
-            ]
-        ],
-    ])
-
-    def configString = new groovy.json.JsonOutput().prettyPrint(configJson)
-    render contentType: "text/plain", data: configString
-}
-def renderLocation() {
-  	[
-    	latitude: location.latitude,
-    	longitude: location.longitude,
-    	mode: location.mode,
-    	name: location.name,
-    	temperature_scale: location.temperatureScale,
-    	zip_code: location.zipCode,
-        hubIP: location.hubs[0].localIP,
-        smartapp_version: '0.5.5'
-  	]
-}
-def CommandReply(statusOut, messageOut) {
-	def replyData =
-    	[
-        	status: statusOut,
-            message: messageOut
-        ]
-
-    def replyJson    = new groovy.json.JsonOutput().toJson(replyData)
-    render contentType: "application/json", data: replyJson
-}
-def deviceCommand() {
-	log.info("Command Request")
-	def device = findDevice(params.id)    
-    def command = params.command
-    
-  	if (!device) {
-		log.error("Device Not Found")
-      	CommandReply("Failure", "Device Not Found")
-  	} else if (!device.hasCommand(command)) {
-      	log.error("Device "+device.displayName+" does not have the command "+command)
-      	CommandReply("Failure", "Device "+device.displayName+" does not have the command "+command)
-  	} else {
-      	def value1 = request.JSON?.value1
-      	def value2 = request.JSON?.value2
-      	try {
-      		if (value2) {
-	       		device."$command"(value1,value2)
-	    	} else if (value1) {
-	    		device."$command"(value1)
-	    	} else {
-	    		device."$command"()
-	    	}
-        	log.info("Command Successful for Device "+device.displayName+", Command "+command)
-        	CommandReply("Success", "Device "+device.displayName+", Command "+command)
-      	} catch (e) {
-      		log.error("Error Occurred For Device "+device.displayName+", Command "+command)
- 	    	CommandReply("Failure", "Error Occurred For Device "+device.displayName+", Command "+command)
-      	}
-  	}
-}
-def deviceAttribute() {
-	def device = findDevice(params.id)    
-    def attribute = params.attribute
-  	if (!device) {
-    	httpError(404, "Device not found")
-  	} else {
-      	def currentValue = device.currentValue(attribute)
-      	[currentValue: currentValue]
-  	}
-}
-def deviceQuery() {
-	def device = findDevice(params.id)    
-    if (!device) { 
-    	device = null
-        httpError(404, "Device not found")
-    } 
-    
-    if (result) {
-    	def jsonData =
-        	[
-         		name: device.displayName,
-            	deviceid: device.id,
-            	capabilities: deviceCapabilityList(device),
-            	commands: deviceCommandList(device),
-            	attributes: deviceAttributeList(device)
-         	]
-    	def resultJson = new groovy.json.JsonOutput().toJson(jsonData)
-    	render contentType: "application/json", data: resultJson
-    }
-}
-def deviceCapabilityList(device) {
-  	def i=0
-  	device.capabilities.collectEntries { capability->
-    	[
-      		(capability.name):1
-    	]
-  	}
-}
-def deviceCommandList(device) {
-  	def i=0
-  	device.supportedCommands.collectEntries { command->
-    	[
-      		(command.name): (command.arguments)
-    	]
-  	}
-}
-def deviceAttributeList(device) {
-  	device.supportedAttributes.collectEntries { attribute->
-    	try {
-      		[
-        		(attribute.name): device.currentValue(attribute.name)
-      		]
-    	} catch(e) {
-      		[
-        		(attribute.name): null
-      		]
-    	}
-  	}
-}
-def getAllData() {
-	//Since we're about to send all of the data, we'll count this as a subscription renewal and clear out pending changes.
-	state.subscriptionRenewed = now()
-    state.devchanges = []
-
-
-	def deviceData =
-    [	location: renderLocation(),
-        deviceList: renderDevices() ]
-    def deviceJson = new groovy.json.JsonOutput().toJson(deviceData)
-    render contentType: "application/json", data: deviceJson
-}
-def startSubscription() {
-//This simply registers the subscription.
-    state.subscriptionRenewed = now()
-	def deviceJson = new groovy.json.JsonOutput().toJson([status: "Success"])
-    render contentType: "application/json", data: deviceJson    
-}
-def endSubscription() {
-//Because it takes too long to register for an api command, we don't actually unregister.
-//We simply blank the devchanges and change the subscription renewal to two hours ago.
-	state.devchanges = []
-    state.subscriptionRenewed = 0
- 	def deviceJson = new groovy.json.JsonOutput().toJson([status: "Success"])
-    render contentType: "application/json", data: deviceJson     
-}
-def registerAll() {
-//This has to be done at startup because it takes too long for a normal command.
-	log.debug "Registering All Events"
-    state.devchanges = []
-	registerChangeHandler(deviceList)
-	registerChangeHandler(sensorList)
-	registerChangeHandler(switchList)
-}
-def registerChangeHandler(myList) {
-	myList.each { myDevice ->
-		def theAtts = myDevice.supportedAttributes
-		theAtts.each {att ->
-		    subscribe(myDevice, att.name, changeHandler)
-    	log.debug "Registering ${myDevice.displayName}.${att.name}"
-		}
-	}
-}
-def changeHandler(evt) {
-	//Send to Pubnub if we need to.
-    if (pubnubPublishKey!=null) {
-	    def deviceData = [device: evt.deviceId, attribute: evt.name, value: evt.value, date: evt.date]
-		def changeJson = new groovy.json.JsonOutput().toJson(deviceData)
-		def changeData = URLEncoder.encode(changeJson)
-        def uri = "http://pubsub.pubnub.com/publish/${pubnubPublishKey}/${pubnubSubscribeKey}/0/${subChannel}/0/${changeData}"
-		log.debug "${uri}"
-    	httpGet(uri)
-    }
-  
-  	if (state.directIP!="") {
-    	//Send Using the Direct Mechanism
-        def deviceData = [device: evt.deviceId, attribute: evt.name, value: evt.value, date: evt.date]
-        //How do I control the port?!?
-        log.debug "Sending Update to ${state.directIP}:${state.directPort}"
-        def result = new physicalgraph.device.HubAction(
-    		method: "GET",
-    		path: "/update",
-    		headers: [
-        		HOST: "${state.directIP}:${state.directPort}",
-                change_device: evt.deviceId,
-                change_attribute: evt.name,
-                change_value: evt.value,
-                change_date: evt.date
-    		]
-		)
-        sendHubCommand(result)
-    }
-    
-	//Only add to the state's devchanges if the endpoint has renewed in the last 10 minutes.
-    if (state.subscriptionRenewed>(now()-(1000*60*10))) {
-  		if (evt.isStateChange()) {
-			state.devchanges << [device: evt.deviceId, attribute: evt.name, value: evt.value, date: evt.date]
-      }
-    } else if (state.subscriptionRenewed>0) { //Otherwise, clear it
-    	log.debug "Endpoint Subscription Expired. No longer storing changes for devices."
-        state.devchanges=[]
-        state.subscriptionRenewed=0
-    }
-}
-def getChangeEvents() {
-    //Store the changes so we can swap it out very quickly and eliminate the possibility of losing any.
-    //This is mainly to make this thread safe because I'm willing to bet that a change event can fire
-    //while generating/sending the JSON.
-    def oldchanges = state.devchanges
-    state.devchanges=[]
-    state.subscriptionRenewed = now()
-	if (oldchanges.size()==0) {
-        def deviceJson = new groovy.json.JsonOutput().toJson([status: "None"])
-	    render contentType: "application/json", data: deviceJson    
-    } else {
-    	def changeJson = new groovy.json.JsonOutput().toJson([status: "Success", attributes:oldchanges])
-    	render contentType: "application/json", data: changeJson
-	}
-}
-def enableDirectUpdates() {
-	log.debug("Command Request")
-	state.directIP = params.ip
-    state.directPort = params.port
-	log.debug("Trying ${state.directIP}:${state.directPort}")
-	def result = new physicalgraph.device.HubAction(
-    		method: "GET",
-    		path: "/initial",
-    		headers: [
-        		HOST: "${state.directIP}:${state.directPort}"
-    		],
-    		query: deviceData
-		)
-     sendHubCommand(result)
-}
-
-def HubResponseEvent(evt) {
-	log.debug(evt.description)
-}
-
-def locationHandler(evt) {
-    def description = evt.description
-    def hub = evt?.hubId
-
-    log.debug "cp desc: " + description
-    if (description.count(",") > 4)
-    {
-def bodyString = new String(description.split(',')[5].split(":")[1].decodeBase64())
-log.debug(bodyString)
-}
-}
-
-def getSubscriptionService() {
-	def replyData =
-    	[
-        	pubnub_publishkey: pubnubPublishKey,
-            pubnub_subscribekey: pubnubSubscribeKey,
-            pubnub_channel: subChannel
-        ]
-
-    def replyJson    = new groovy.json.JsonOutput().toJson(replyData)
-    render contentType: "application/json", data: replyJson
-}
-
-mappings {
-    if (!params.access_token || (params.access_token && params.access_token != state.accessToken)) {
-        path("/devices")                        { action: [GET: "authError"] }
-        path("/config")                         { action: [GET: "authError"] }
-        path("/location")                       { action: [GET: "authError"] }
-        path("/:id/command/:command")     		{ action: [POST: "authError"] }
-        path("/:id/query")						{ action: [GET: "authError"] }
-        path("/:id/attribute/:attribute") 		{ action: [GET: "authError"] }
-        path("/subscribe")                      { action: [GET: "authError"] }
-        path("/getUpdates")                     { action: [GET: "authError"] }
-        path("/unsubscribe")                    { action: [GET: "authError"] }
-        path("/startDirect/:ip/:port")          { action: [GET: "authError"] }
-        path("/getSubcriptionService")          { action: [GET: "authError"] }
-
-    } else {
-        path("/devices")                        { action: [GET: "getAllData"] }
-        path("/config")                         { action: [GET: "renderConfig"]  }
-        path("/location")                       { action: [GET: "renderLocation"] }
-        path("/:id/command/:command")     		{ action: [POST: "deviceCommand"] }
-        path("/:id/query")						{ action: [GET: "deviceQuery"] }
-        path("/:id/attribute/:attribute") 		{ action: [GET: "deviceAttribute"] }
-        path("/subscribe")                      { action: [GET: "startSubscription"] }
-        path("/getUpdates")                     { action: [GET: "getChangeEvents"] }
-        path("/unsubscribe")                    { action: [GET: "endSubscription"] }
-        path("/startDirect/:ip/:port")          { action: [GET: "enableDirectUpdates"] }
-        path("/getSubcriptionService")          { action: [GET: "getSubscriptionService"] }
-    }
-}

smartapps/smartthings/wemo-connect.src/wemo-connect.groovy

@@ -1,5 +1,3 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
 /**
  *  Copyright 2015 SmartThings
  *