Merge pull request #2125 from SmartThingsCommunity/staging

Rolling up staging to production

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.12"
     }
     repositories {
         mavenLocal()
@@ -19,7 +19,7 @@ buildscript {
                 username smartThingsArtifactoryUserName
                 password smartThingsArtifactoryPassword
             }
-            url "https://artifactory.smartthings.com/libs-release-local"
+            url "https://smartthings.jfrog.io/smartthings/libs-release-local"
         }
     }
 }
@@ -32,7 +32,7 @@ repositories {
             username smartThingsArtifactoryUserName
             password smartThingsArtifactoryPassword
         }
-        url "https://artifactory.smartthings.com/libs-release-local"
+        url "https://smartthings.jfrog.io/smartthings/libs-release-local"
     }
 }
 
@@ -51,10 +51,10 @@ sourceSets {
 
 dependencies {
     devicetypesCompile 'org.codehaus.groovy:groovy-all:2.4.7'
-    devicetypesCompile 'smartthings:appengine-z-wave:0.1.2'
-    devicetypesCompile 'smartthings:appengine-zigbee:0.1.11'
+    devicetypesCompile 'smartthings:appengine-z-wave:0.1.3'
+    devicetypesCompile 'smartthings:appengine-zigbee:0.1.12'
     smartappsCompile 'org.codehaus.groovy:groovy-all:2.4.7'
-    smartappsCompile 'smartthings:appengine-common:0.1.8'
+    smartappsCompile 'smartthings:appengine-common:0.1.9'
     smartappsCompile 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1'
     smartappsCompile 'org.grails:grails-web:2.3.11'
     smartappsCompile 'org.json:json:20140107'
@@ -74,19 +74,19 @@ slackSendMessage {
     String username
     switch (branch) {
         case 'master':
-            username = 'Hickory'
+            username = 'DEV'
             iconUrl = wolverine
             color = '#35D0F2'
             messageText = 'Began deployment of _SmartThingsPublic[master]_ branch to the _Dev_ environments.'
             break
         case 'staging':
-            username = 'Dickory'
+            username = 'STG'
             iconUrl = beach
             color = '#FFDE20'
             messageText = 'Began deployment of _SmartThingsPublic[staging]_ branch to the _Staging_ environments.'
             break
         case 'production':
-            username = 'Dock'
+            username = 'PRD'
             iconUrl = drinks
             color = '#FF1D23'
             messageText = 'Began deployment of _SmartThingsPublic[production]_ branch to the _Prod_ environments.'

devicetypes/smartthings/aeon-key-fob.src/.st-ignore

@@ -0,0 +1,2 @@
+.st-ignore
+README.md

devicetypes/smartthings/aeon-key-fob.src/README.md

@@ -0,0 +1,34 @@
+# Aeon Labs Key Fob
+
+Cloud Execution
+
+Works with:
+
+* [Aeon Labs Key Fob](http://aeotec.com/z-wave-key-fob-remote-control)
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+* [Troubleshooting](#troubleshooting)
+
+## Capabilities
+
+* **Actuator** - represents device has commands
+* **Button** - represents a device with one or more buttons
+* **Holdable Button** - represents a device with one or more holdable buttons
+* **Configuration** - allows for configuration of devices
+* **Sensor** - detects sensor events
+* **Battery** - defines device uses a battery
+* **Health Check** - indicates ability to get device health notifications
+
+## Device Health
+
+Aeon Key Fob is a ZWave totally sleepy device and is marked offline only in the case when Hub is offline.
+
+## Troubleshooting
+
+If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
+Pairing needs to be tried again by placing the sensor closer to the hub.
+Instructions related to pairing, resetting and removing the Aeon Labs Key Fob from SmartThings can be found in the following link:
+* [Aeotec Key Fob Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202294120-Aeon-Labs-Key-Fob)

devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy

@@ -1,3 +1,4 @@
+import groovy.json.JsonOutput
 /**
  *  Copyright 2015 SmartThings
  *
@@ -19,6 +20,7 @@ metadata {
 		capability "Configuration"
 		capability "Sensor"
 		capability "Battery"
+		capability "Health Check"
 
 		fingerprint deviceId: "0x0101", inClusters: "0x86,0x72,0x70,0x80,0x84,0x85"
 		fingerprint mfr: "0086", prod: "0001", model: "0026", deviceJoinName: "Aeon Panic Button"
@@ -131,6 +133,9 @@ def updated() {
 }
 
 def initialize() {
+	// Arrival sensors only goes OFFLINE when Hub is off
+	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zigbee", scheme:"untracked"]), displayed: false)
+
 	def zwMap = getZwaveInfo()
 	def buttons = 4 // Default for Key Fob
 

devicetypes/smartthings/aeon-minimote.src/.st-ignore

@@ -0,0 +1,2 @@
+.st-ignore
+README.md

devicetypes/smartthings/aeon-minimote.src/README.md

@@ -0,0 +1,33 @@
+# Aeon Minimote
+
+Cloud Execution
+
+Works with: 
+
+* [Aeotec Minimote](http://aeotec.com/small-z-wave-remote-control)
+
+## Table of contents
+
+* [Capabilities](#capabilities)
+* [Health](#device-health)
+* [Troubleshooting](#troubleshooting)
+
+## Capabilities
+
+* **Actuator** - represents device has commands
+* **Button** - represents a device with one or more buttons
+* **Holdable Button** - represents a device with one or more holdable buttons
+* **Configuration** - allows for configuration of devices
+* **Sensor** - detects sensor events
+* **Health Check** - indicates ability to get device health notifications
+
+## Device Health
+
+Aeon Minimote is a ZWave totally sleepy device and is marked offline only in the case when Hub is offline.
+
+## Troubleshooting
+
+If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the sensor is out of range.
+Pairing needs to be tried again by placing the sensor closer to the hub.
+Instructions related to pairing, resetting and removing the Aeotec Minimote from SmartThings can be found in the following link:
+* [Aeotec Minimote Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202087904-Aeotec-Minimote)

devicetypes/smartthings/aeon-minimote.src/aeon-minimote.groovy

@@ -1,3 +1,4 @@
+import groovy.json.JsonOutput
 /**
  *  Copyright 2015 SmartThings
  *
@@ -18,6 +19,7 @@ metadata {
 		capability "Holdable Button"
 		capability "Configuration"
 		capability "Sensor"
+		capability "Health Check"
 
 		fingerprint deviceId: "0x0101", inClusters: "0x86,0x72,0x70,0x9B", outClusters: "0x26,0x2B"
 		fingerprint deviceId: "0x0101", inClusters: "0x86,0x72,0x70,0x9B,0x85,0x84", outClusters: "0x26" // old style with numbered buttons
@@ -119,5 +121,7 @@ def updated() {
 }
 
 def initialize() {
+	// Arrival sensors only goes OFFLINE when Hub is off
+	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zigbee", scheme:"untracked"]), displayed: false)
 	sendEvent(name: "numberOfButtons", value: 4)
 }

devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy

@@ -70,7 +70,7 @@ metadata {
 			state "heat", action:"switchMode",  nextState: "updating", icon: "st.thermostat.heat"
 			state "cool", action:"switchMode",  nextState: "updating", icon: "st.thermostat.cool"
 			state "auto", action:"switchMode",  nextState: "updating", icon: "st.thermostat.auto"
-			state "emergency heat", action:"switchMode", icon: "st.thermostat.emergency-heat" // emergency heat = auxHeatOnly
+			state "auxheatonly", action:"switchMode", icon: "st.thermostat.emergency-heat"
 			state "updating", label:"Working", icon: "st.secondary.secondary"
 		}
 		standardTile("fanMode", "device.thermostatFanMode", inactiveLabel: false, decoration: "flat") {
@@ -156,47 +156,49 @@ void poll() {
 def generateEvent(Map results) {
 	log.debug "parsing data $results"
 	if(results) {
-		results.each { name, value ->
 
 			def linkText = getLinkText(device)
-			def isChange = false
-			def isDisplayed = true
+		def supportedThermostatModes = []
+		def thermostatMode = null
+
+		results.each { name, value ->
 			def event = [name: name, linkText: linkText, descriptionText: getThermostatDescriptionText(name, value, linkText),
 						 handlerName: name]
 
 			if (name=="temperature" || name=="heatingSetpoint" || name=="coolingSetpoint" ) {
 				def sendValue =  location.temperatureScale == "C"? roundC(convertFtoC(value.toDouble())) : value.toInteger()
-				isChange = isTemperatureStateChange(device, name, value.toString())
-				isDisplayed = isChange
-				event << [value: sendValue, unit: temperatureScale, isStateChange: isChange, displayed: isDisplayed]
+				event << [value: sendValue, unit: temperatureScale]
 			}  else if (name=="maxCoolingSetpoint" || name=="minCoolingSetpoint" || name=="maxHeatingSetpoint" || name=="minHeatingSetpoint") {
 				def sendValue =  location.temperatureScale == "C"? roundC(convertFtoC(value.toDouble())) : value.toInteger()
 				event << [value: sendValue, unit: temperatureScale, displayed: false]
 			}  else if (name=="heatMode" || name=="coolMode" || name=="autoMode" || name=="auxHeatMode"){
-				isChange = isStateChange(device, name, value.toString())
-				event << [value: value.toString(), isStateChange: isChange, displayed: false]
+				if (value == true) {
+					supportedThermostatModes << ((name == "auxHeatMode") ? "auxheatonly" : name - "Mode")
+				}
+				return // as we don't want to send this event here, proceed to next name/value pair
 			}  else if (name=="thermostatFanMode"){
-				isChange = isStateChange(device, name, value.toString())
-				event << [value: value.toString(), isStateChange: isChange, displayed: false]
+				sendEvent(name: "supportedThermostatFanModes", value: fanModes(), displayed: false)
+				event << [value: value.toString(), data:[supportedThermostatFanModes: fanModes()]]
 			}  else if (name=="humidity") {
-				isChange = isStateChange(device, name, value.toString())
-				event << [value: value.toString(), isStateChange: isChange, displayed: false, unit: "%"]
+				event << [value: value.toString(), displayed: false, unit: "%"]
 			} else if (name == "deviceAlive") {
-				isChange = isStateChange(device, name, value.toString())
-				event['isStateChange'] = isChange
 				event['displayed'] = false
 			} else if (name == "thermostatMode") {
-				def mode = value.toString()
-				mode = (mode == "auxHeatOnly") ? "emergency heat" : mode
-				isChange = isStateChange(device, name, mode)
-				event << [value: mode, isStateChange: isChange, displayed: isDisplayed]
+				thermostatMode = value.toLowerCase()
+				return // as we don't want to send this event here, proceed to next name/value pair
 			} else {
-				isChange = isStateChange(device, name, value.toString())
-				isDisplayed = isChange
-				event << [value: value.toString(), isStateChange: isChange, displayed: isDisplayed]
+				event << [value: value.toString()]
 			}
 			sendEvent(event)
 		}
+		if (state.supportedThermostatModes != supportedThermostatModes) {
+			state.supportedThermostatModes = supportedThermostatModes
+			sendEvent(name: "supportedThermostatModes", value: supportedThermostatModes, displayed: false)
+		}
+		if (thermostatMode) {
+			sendEvent(name: "thermostatMode", value: thermostatMode, data:[supportedThermostatModes:state.supportedThermostatModes], linkText: linkText,
+					descriptionText: getThermostatDescriptionText("thermostatMode", thermostatMode, linkText), handlerName: "thermostatMode")
+		}
 		generateSetpointEvent ()
 		generateStatusEvent ()
 	}
@@ -322,15 +324,7 @@ void resumeProgram() {
 }
 
 def modes() {
-	if (state.modes) {
-		log.debug "Modes = ${state.modes}"
-		return state.modes
-	}
-	else {
-		state.modes = parent.availableModes(this)
-		log.debug "Modes = ${state.modes}"
-		return state.modes
-	}
+	return state.supportedThermostatModes
 }
 
 def fanModes() {
@@ -413,11 +407,13 @@ def setThermostatFanMode(String mode) {
 }
 
 def generateModeEvent(mode) {
-	sendEvent(name: "thermostatMode", value: mode, descriptionText: "$device.displayName is in ${mode} mode", displayed: true)
+	sendEvent(name: "thermostatMode", value: mode, data:[supportedThermostatModes: state.supportedThermostatModes],
+			descriptionText: "$device.displayName is in ${mode} mode")
 }
 
 def generateFanModeEvent(fanMode) {
-	sendEvent(name: "thermostatFanMode", value: fanMode, descriptionText: "$device.displayName fan is in ${fanMode} mode", displayed: true)
+	sendEvent(name: "thermostatFanMode", value: fanMode, data:[supportedThermostatFanModes: fanModes()],
+			descriptionText: "$device.displayName fan is in ${fanMode} mode")
 }
 
 def generateOperatingStateEvent(operatingState) {
@@ -453,14 +449,14 @@ def heat() {
 }
 
 def emergencyHeat() {
-	auxHeatOnly()
+	auxheatonly()
 }
 
-def auxHeatOnly() {
-	log.debug "auxHeatOnly = emergency heat"
+def auxheatonly() {
+	log.debug "auxheatonly()"
 	def deviceId = device.deviceNetworkId.split(/\./).last()
 	if (parent.setMode ("auxHeatOnly", deviceId))
-		generateModeEvent("emergency heat") // emergency heat = auxHeatOnly
+		generateModeEvent("auxheatonly")
 	else {
 		log.debug "Error setting new mode."
 		def currentMode = device.currentState("thermostatMode")?.value
@@ -593,7 +589,7 @@ def generateSetpointEvent() {
 	} else if (mode == "off") {
 		sendEvent("name":"thermostatSetpoint", "value":averageSetpoint, "unit":location.temperatureScale)
 		sendEvent("name":"displayThermostatSetpoint", "value":"Off", displayed: false)
-	} else if (mode == "emergency heat") { // emergency heat = auxHeatOnly
+	} else if (mode == "auxheatonly") {
 		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale)
 		sendEvent("name":"displayThermostatSetpoint", "value":heatingSetpoint, "unit":location.temperatureScale, displayed: false)
 	}
@@ -632,7 +628,7 @@ void raiseSetpoint() {
 		targetvalue = thermostatSetpoint ? thermostatSetpoint : 0
 		targetvalue = location.temperatureScale == "F"? targetvalue + 1 : targetvalue + 0.5
 
-		if ((mode == "heat" || mode == "emergency heat") && targetvalue > maxHeatingSetpoint) { // emergency heat = auxHeatOnly
+		if ((mode == "heat" || mode == "auxheatonly") && targetvalue > maxHeatingSetpoint) {
 			targetvalue = maxHeatingSetpoint
 		} else if (mode == "cool" && targetvalue > maxCoolingSetpoint) {
 			targetvalue = maxCoolingSetpoint
@@ -678,7 +674,7 @@ void lowerSetpoint() {
 		targetvalue = thermostatSetpoint ? thermostatSetpoint : 0
 		targetvalue = location.temperatureScale == "F"? targetvalue - 1 : targetvalue - 0.5
 
-		if ((mode == "heat" || mode == "emergency heat") && targetvalue < minHeatingSetpoint) { // emergency heat = auxHeatOnly
+		if ((mode == "heat" || mode == "auxheatonly") && targetvalue < minHeatingSetpoint) {
 			targetvalue = minHeatingSetpoint
 		} else if (mode == "cool" && targetvalue < minCoolingSetpoint) {
 			targetvalue = minCoolingSetpoint
@@ -719,7 +715,7 @@ void alterSetpoint(temp) {
 		}
 
 		//step1: check thermostatMode, enforce limits before sending request to cloud
-		if (mode == "heat" || mode == "emergency heat"){ // emergency heat = auxHeatOnly
+		if (mode == "heat" || mode == "auxheatonly"){
 			if (temp.value > coolingSetpoint){
 				targetHeatingSetpoint = temp.value
 				targetCoolingSetpoint = temp.value
@@ -754,7 +750,7 @@ void alterSetpoint(temp) {
 			log.debug "alterSetpoint in mode $mode succeed change setpoint to= ${temp.value}"
 		} else {
 			log.error "Error alterSetpoint()"
-			if (mode == "heat" || mode == "emergency heat"){ // emergency heat = auxHeatOnly
+			if (mode == "heat" || mode == "auxheatonly"){
 				sendEvent("name": "thermostatSetpoint", "value": heatingSetpoint.toString(), displayed: false)
 				sendEvent("name": "displayThermostatSetpoint", "value": heatingSetpoint.toString(), displayed: false)
 			} else if (mode == "cool") {
@@ -783,7 +779,7 @@ def generateStatusEvent() {
 	log.debug "Cooling set point = ${coolingSetpoint}"
 	log.debug "HVAC Mode = ${mode}"
 
-	if (mode == "heat") {
+	if (mode == "heat" || mode == "auxheatonly") {
 		if (temperature >= heatingSetpoint) {
 			statusText = "Right Now: Idle"
 		} else {
@@ -806,8 +802,6 @@ def generateStatusEvent() {
 		}
 	} else if (mode == "off") {
 		statusText = "Right Now: Off"
-	} else if (mode == "emergency heat") { // emergency heat = auxHeatOnly
-		statusText = "Emergency Heat"
 	} else {
 		statusText = "?"
 	}

devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy

@@ -300,15 +300,21 @@ def setColor(value) {
         value.hex = "#${hex(value.red)}${hex(value.green)}${hex(value.blue)}"
     }
 
-	sendEvent(name: "hue", value: value.hue, displayed: false)
-	sendEvent(name: "saturation", value: value.saturation, displayed: false)
-	sendEvent(name: "color", value: value.hex, displayed: false)
-	if (value.level) {
-		sendEvent(name: "level", value: value.level)
-	}
-	if (value.switch) {
-		sendEvent(name: "switch", value: value.switch)
-	}
+    if(value.hue) {
+        sendEvent(name: "hue", value: value.hue, displayed: false)
+    }
+    if(value.saturation) {
+        sendEvent(name: "saturation", value: value.saturation, displayed: false)
+    }
+    if(value.hex?.trim()) {
+        sendEvent(name: "color", value: value.hex, displayed: false)
+    }
+    if (value.level) {
+        sendEvent(name: "level", value: value.level)
+    }
+    if (value.switch?.trim()) {
+        sendEvent(name: "switch", value: value.switch)
+    }
 
     sendRGB(value.rh, value.gh, value.bh)
 }

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

@@ -35,8 +35,8 @@ metadata {
 
 	// tile definitions
 	tiles(scale: 2) {
-		multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){
-			tileAttribute ("device.valve", key: "PRIMARY_CONTROL") {
+		multiAttributeTile(name:"contact", type: "generic", width: 6, height: 4, canChangeIcon: true){
+			tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
 				attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing"
 				attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening"
 				attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC"
@@ -48,14 +48,16 @@ metadata {
 			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 
-		main "valve"
-		details(["valve","refresh"])
+		main "contact"
+		details(["contact","refresh"])
 	}
 }
 
 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(){
@@ -85,11 +87,17 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 def open() {
-	zwave.switchBinaryV1.switchBinarySet(switchValue: 0x00).format()
+	delayBetween([
+		zwave.switchBinaryV1.switchBinarySet(switchValue: 0x00).format(),
+		zwave.switchBinaryV1.switchBinaryGet().format()
+	], 500)
 }
 
 def close() {
-	zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF).format()
+	delayBetween([
+		zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF).format(),
+		zwave.switchBinaryV1.switchBinaryGet().format()
+	], 500)
 }
 
 /**
@@ -105,6 +113,6 @@ def refresh() {
 
 def createEventWithDebug(eventMap) {
 	def event = createEvent(eventMap)
-	log.debug "Event created with ${event?.descriptionText}"
+	log.debug "Event created with ${event?.name}:${event?.value} - ${event?.descriptionText}"
 	return event
 }

devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy

@@ -23,7 +23,6 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
-		capability "Light"
 		capability "Outlet"
 
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3200", deviceJoinName: "Outlet"

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

@@ -38,8 +38,8 @@ metadata {
     }
 
     tiles(scale: 2) {
-        multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){
-            tileAttribute ("device.valve", key: "PRIMARY_CONTROL") {
+        multiAttributeTile(name:"contact", type: "generic", width: 6, height: 4, canChangeIcon: true){
+            tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
                 attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing"
                 attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening"
                 attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing"
@@ -58,8 +58,8 @@ metadata {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
 
-        main(["valve"])
-        details(["valve", "battery", "refresh"])
+        main(["contact"])
+        details(["contact", "battery", "refresh"])
     }
 }
 

smartapps/mujica/tcp-bulbs-connect.src/tcp-bulbs-connect.groovy

@@ -1,412 +0,0 @@
-/**
- *  Copyright 2015 SmartThings
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-
-definition(
-	name: "Tcp Bulbs (Connect)",
-	namespace: "mujica",
-	author: "SmartThings-Ule",
-	description: "Connect your TCP bulbs to SmartThings using local integration. You must have a geteway with firmware ver 2",
-	category: "SmartThings Labs",
-	iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/tcp.png",
-	iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/tcp@2x.png",
-	singleInstance: true
-)
-
-
-preferences {
-	page(name: "iniSettings", title: "Connect Your TCP Lights to SmartThings", content: "iniSettings")
-	page(name: "chooseBulbs", title: "Choose Bulbs to Control With SmartThings", content: "bulbDiscovery")
-}
-
-def iniSettings(){
-	state.loadStatus = "Inactive"
-    log.trace "state.loadStatus ${state.loadStatus}"
-    return dynamicPage(name:"iniSettings", title:"Connect Your TCP Lights to SmartThings", nextPage:"chooseBulbs", install:false, uninstall: true) {
-       section("TCP Connected Remote Credentials") {
-			input "ipGateway", "text", title: "Enter TCP Gateway IP", required: true
-			paragraph "Tap 'Next' after you have entered the ip of your TCP Connected Gateway.\r\n\r\nOnce your ip are accepted, SmartThings will scan your TCP installation for Bulbs."
-		}
-    }
-}
-
-def bulbDiscovery() {
-	debugOut "bulbDiscovery()"
-	//getToken()
-	state.token = "1234567890"
-    
-    if (state.loadStatus == "Inactive"){
-    	state.count = 0
-    	state.loadStatus = "Loading"
-        log.trace "state.loadStatus ${state.loadStatus}"
-    	deviceDiscovery()
-    }
-    log.trace "state.count ${state.count}"
-    state.count = state.count + 1 
-    log.trace "state.count ${state.count}"
-    if(state.loadStatus == "Loaded" ){
-        def options = devicesDiscovered() ?: []
-		log.trace "state.loadStatus ${state.loadStatus}"
-        return dynamicPage(name:"chooseBulbs", title:"", nextPage:"", install:true, uninstall: true) {
-            section("Tap Below to View Device List") {
-                input "selectedBulbs", "enum", required:false, title:"Select Bulb", multiple:true, options:options
-                paragraph """Tap 'Done' after you have selected the desired devices."""
-            }
-        }
-    }else{
-    	if (state.count)
-    
-    	log.trace "state.loadStatus ${state.loadStatus}"
-        def msg = state.count >= 3 ? "The TCP Gateway is not responding, please verify the ip address" : "Please wait while we discover your devices. Discovery can take some minutes or more, so sit back and relax! Select your device below once discovered."
-        return dynamicPage(name:"chooseBulbs", title:"", nextPage:"", refreshInterval:5) {
-            section(msg) {}
-        }
-    }
-}
-
-
-def installed() {
-	debugOut "Installed with settings: ${settings}"
-
-	unschedule()
-	unsubscribe()
-
-	setupBulbs()
-
-	def cron = "0 0/1 * * * ?"
-	log.debug "schedule('$cron', syncronizeDevices)"
-	schedule(cron, syncronizeDevices)
-}
-
-def updated() {
-	debugOut "Updated with settings: ${settings}"
-	unschedule()
-	setupBulbs()
-	def cron = "0 0/1 * * * ?"
-	log.debug "schedule('$cron', syncronizeDevices)"
-	schedule(cron, syncronizeDevices)
-}
-
-def uninstalled()
-{
-	unschedule() //in case we have hanging runIn()'s
-}
-
-private removeChildDevices(delete)
-{
-	debugOut "deleting ${delete.size()} bulbs"
-	debugOut "deleting ${delete}"
-	delete.each {
-		deleteChildDevice(it.device.deviceNetworkId)
-	}
-}
-
-def uninstallFromChildDevice(childDevice)
-{
-	def errorMsg = "uninstallFromChildDevice was called and "
-	if (!settings.selectedBulbs) {
-		debugOut errorMsg += "had empty list passed in"
-		return
-	}
-
-	def dni = childDevice.device.deviceNetworkId
-
-	if ( !dni ) {
-		debugOut errorMsg += "could not find dni of device"
-		return
-	}
-
-	def newDeviceList = settings.selectedBulbs - dni
-	app.updateSetting("selectedBulbs", newDeviceList)
-	debugOut errorMsg += "completed succesfully"
-}
-
-
-def setupBulbs() {
-	debugOut "setupBulbs()"
-	def bulbs = state.devices
-	def deviceFile = "TCP Bulb"
-
-	selectedBulbs.each { did ->
-		//see if this is a selected bulb and install it if not already
-		def d = getChildDevice(did)
-
-		if(!d) {
-			def newBulb = bulbs.find { (it.did) == did }
-			d = addChildDevice("mujica", deviceFile, did, null, [name: "${newBulb?.name}", label: "${newBulb?.name}", completedSetup: true,"data":["model":newBulb?.model,"nodetype":newBulb?.nodetype,"node":newBulb?.node,"dni":did]])
-		} else {
-			infoOut "Avoid add existent device ${did}"
-		}
-	}
-	def delete = getChildDevices().findAll { !selectedBulbs?.contains(it.deviceNetworkId) }
-	removeChildDevices(delete)
-}
-
-
-def deviceDiscovery() {
-	log.trace "deviceDiscovery()"
-	def data = "<gip><version>1</version><token>${state.token}</token></gip>"
-
-	def Params = [
-		cmd: "RoomGetCarousel",
-		data: "${data}",
-		fmt: "json"
-	]
-
-	def cmd = toQueryString(Params)
-
-	debugOut "deviceDiscovery()"
-
-	apiGet(cmd,"RoomGetCarouselHandler")
-}
-
-def apiGet(String data, String calledBackHandler) {
-	debugOut "apiGet($data, $calledBackHandler) $ipGateway"
-    sendHubCommand(new physicalgraph.device.HubAction([
-		method: "GET",
-		path: "/gwr/gop.php?$data",
-		headers: [
-			HOST: "$ipGateway:80"
-		]], getNetworkId("$ipGateway","80"), [callback: calledBackHandler]))
-}
-
-
-void SendCommandHandler(physicalgraph.device.HubResponse hubResponse){
-	debugOut "SendCommandHandler($hubResponse)"
-    debugOut "hubResponse.body ${hubResponse.body}"
-}
-void RoomGetCarouselHandler(physicalgraph.device.HubResponse hubResponse){
-	debugOut "RoomGetCarouselHandler($hubResponse)"
-    def bodyXml
-
-    if (hubResponse?.body?.contains("<gip>"))
-    { // description.xml response (application/xml)
-        debugOut "body contains xml"
-        bodyXml = new XmlSlurper().parseText(hubResponse.body)
-        debugOut "bodyXml $bodyXml"
-    }
-        
-
-	def rooms = ""
-	def devices = []
-	def deviceList = []
-
-
-	rooms = bodyXml.room
-    
-    
-    debugOut "rooms ${rooms[1]}"
-
-    rooms.each({
-        devices  = it.device
-        debugOut "it.device ${it.device}"
-        def roomName = it.name
-        debugOut "roomName = ${it.name}"
-        debugOut "devices[1] ${devices[1]}"
-        debugOut "devices[1] != null"
-        def roomId = it?.rid
-        debugOut "Room Device Data: did:${roomId} roomName:${roomName}"
-        devices.each({
-            debugOut "Bulb Device Data: did:${it?.did} room:${roomName} BulbName:${it?.name}"
-            deviceList += ["name" : "${roomName} ${it?.name}", "did" : "${it?.did}", "type" : "${devices?.type}", "node" : "${devices?.node}", "nodetype" : "${devices?.nodetype}", "model" : "${devices?.prodmodel}"]
-        })
-    })
-
-	devices = ["devices" : deviceList]
-    debugOut "devices $devices"
-	state.devices = devices.devices
-    state.loadStatus = "Loaded"
-}
-
-def getDevices()
-{
-	state.devices = state.devices ?: [:]
-}
-
-void RoomGetCarouselUpdateHandler(physicalgraph.device.HubResponse hubResponse){
-	debugOut "RoomGetCarouselUpdateHandler($hubResponse)"
-    
-   
-    debugOut "msg ${parseLanMessage(hubResponse.body)}"
-    
-    def bodyXml
-
-    if (hubResponse?.body?.contains("<gip>"))
-    { 
-        debugOut "body contains xml"
-        bodyXml = new XmlSlurper().parseText(hubResponse.body)
-    }
-        
-
-	def rooms = ""
-	def devices = []
-	def deviceList = []
-
-	rooms = bodyXml.room
-
-    rooms.each({
-        devices  = it.device
-        devices.each({
-        	def dni = it.did.text()
-        	def bulb = getChildDevice(dni)
-            if ( bulb ){
-                def power = it.power ? it.power.text() as float :0
-                sendEvent( dni, [name: "power", value: power*1000] )
-                if (( it.state.text() == "1" ) && ( bulb?.currentValue("switch") != "on" ))
-                    sendEvent( dni, [name: "switch",value:"on"] )
-
-                if (( it.state.text() == "0" ) && ( bulb?.currentValue("switch") != "off" ))
-                    sendEvent( dni, [name: "switch",value:"off"] )
-
-                if ( it.level.text() != bulb?.currentValue("level")) {
-                	sendEvent( dni, [name: "level",value: "${it.level.text()}"] )
-                    sendEvent( dni, [name: "setLevel",value: "${it.level.text()}"] )
-                }
-        	}
-        })
-    })
-}
-
-Map devicesDiscovered() {
-	def devices =  state.devices
-	def map = [:]
-	if (devices instanceof java.util.Map) {
-		devices.each {
-			def value = "${it?.name}"
-			def key = it?.did
-			map["${key}"] = value
-		}
-	} else { //backwards compatable
-		devices.each {
-			def value = "${it?.name}"
-			def key = it?.did
-			map["${key}"] = value
-		}
-	}
-	map
-}
-
-def getToken() {
-
-	state.token = "1234567890"
-}
-
-String toQueryString(Map m) {
-	return m.collect { k, v -> "${k}=${URLEncoder.encode(v.toString())}" }.sort().join("&")
-}
-
-def syncronizeDevices() {
-    poll(null)
-}
-
-def getNetworkId(ipaddr, port) {
-    "${ipaddr.tokenize('.').collect {String.format('%02X', it.toInteger())}.join()}:${String.format('%04X', port.toInteger())}"
-}
-
-/**************************************************************************
- Child Device Call In Methods
- **************************************************************************/
-def on(childDevice) {
-
-	def dni = childDevice.device.deviceNetworkId
-	def data = ""
-	def cmd = ""
-
-    data = "<gip><version>1</version><token>$state.token</token><did>${dni}</did><type>power</type><value>1</value></gip>"
-    cmd = "DeviceSendCommand"
-
-	def qParams = [
-		cmd: cmd,
-		data: "${data}",
-		fmt: "json"
-	]
-
-	cmd = toQueryString(qParams)
-	apiGet(cmd,"SendCommandHandler" )
-}
-
-def off(childDevice) {
-
-	def dni = childDevice.device.deviceNetworkId
-	def data = ""
-	def cmd = ""
-
-    data = "<gip><version>1</version><token>$state.token</token><did>${dni}</did><type>power</type><value>0</value></gip>"
-    cmd = "DeviceSendCommand"
-
-	def qParams = [
-		cmd: cmd,
-		data: "${data}",
-		fmt: "json"
-	]
-
-	cmd = toQueryString(qParams)
-	apiGet(cmd,"SendCommandHandler") 
-
-}
-
-def setLevel(childDevice, value) {
-	debugOut "setLevel request from child device"
-
-	def dni = childDevice.device.deviceNetworkId
-	def data = ""
-	def cmd = ""
-
-    data = "<gip><version>1</version><token>${state.token}</token><did>${dni}</did><type>level</type><value>${value}</value></gip>"
-    cmd = "DeviceSendCommand"
-
-
-	def qParams = [
-		cmd: cmd,
-		data: "${data}",
-		fmt: "json"
-	]
-
-	cmd = toQueryString(qParams)
-
-	apiGet(cmd,"SendCommandHandler") 
-}
-
-def poll(childDevice) {
-	infoOut "poll()"
-	def eventTime = new Date().time
-    if ((state.lastPollTime ?:0) + 10000  <=  eventTime ){
-    	state.lastPollTime = new Date().time
-        def Params = [
-            cmd: "RoomGetCarousel",
-            data: "<gip><version>1</version><token>${state.token}</token></gip>",
-            fmt: "json"
-        ]
-        def cmd = toQueryString(Params)
-        apiGet(cmd,"RoomGetCarouselUpdateHandler")
-    }else{
-    	infoOut "Multiple poll requests avoided"
-    }
-}
-
-
-/**************************************************************************
- Msg Methods
- **************************************************************************/
-
-def debugOut(msg) {
-	//log.debug msg
-}
-
-def traceOut(msg) {
-	log.trace msg
-}
-
-def infoOut(msg) {
-	log.info msg
-}

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

@@ -195,7 +195,10 @@ def registerDeviceChange() {
 				state.deviceSubscriptionMap.put(deviceId, [subscriptionEndpt])
 				log.info "Added subscription URL: ${subscriptionEndpt} for ${myDevice.displayName}"
 			} else if (!state.deviceSubscriptionMap[deviceId].contains(subscriptionEndpt)) {
-				state.deviceSubscriptionMap[deviceId] << subscriptionEndpt
+				// state.deviceSubscriptionMap[deviceId] << subscriptionEndpt
+				// For now, we will only have one subscription endpoint per device
+				state.deviceSubscriptionMap.remove(deviceId)
+				state.deviceSubscriptionMap.put(deviceId, [subscriptionEndpt])
 				log.info "Added subscription URL: ${subscriptionEndpt} for ${myDevice.displayName}"
 			}