Fix typo. Make jammed state events ALERT. Always display jammed events.

build.gradle

@@ -7,10 +7,9 @@ apply plugin: 'smartthings-hipchat'
 
 buildscript {
     dependencies {
-        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.6"
+        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.3"
     }
     repositories {
-        mavenLocal()
         jcenter()
         maven {
             credentials {

circle.yml

@@ -15,13 +15,13 @@ deployment:
   develop:
     branch: master
     commands:
-      - ./gradlew deployArchives -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Ps3Buckets="$S3_BUCKETS_DEV"
+      - ./gradlew deployArchives -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Ps3BucketName=$S3_BUCKET_NAME_PREPROD_DEV
       - ./gradlew hipchatSendNotification -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Pbranch=$CIRCLE_BRANCH
       - ./gradlew hipchatShareFile -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD
 
   stage:
     branch: staging
     commands:
-      - ./gradlew deployArchives -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Ps3Buckets="$S3_BUCKETS_STAGE"
+      - ./gradlew deployArchives -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Ps3BucketName=$S3_BUCKET_NAME_PREPROD_STAGING
       - ./gradlew hipchatSendNotification -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Pbranch=$CIRCLE_BRANCH
       - ./gradlew hipchatShareFile -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD

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

@@ -1,227 +0,0 @@
-/**
- *  Hue Bloom
- *
- *  Philips Hue Type "Color Light"
- *
- *  Author: SmartThings
- */
-
-// for the UI
-metadata {
-	// Automatically generated. Make future change here.
-	definition (name: "Hue Bloom", namespace: "smartthings", author: "SmartThings") {
-		capability "Switch Level"
-		capability "Actuator"
-		capability "Color Control"
-		capability "Switch"
-		capability "Refresh"
-		capability "Sensor"
-
-		command "setAdjustedColor"
-        command "reset"
-        command "refresh"
-	}
-
-	simulator {
-		// TODO: define status and reply messages here
-	}
-
-	tiles (scale: 2){
-		multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){
-			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
-				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#C6C7CC", nextState:"turningOn"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
-				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#C6C7CC", nextState:"turningOn"
-			}
-			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
-				attributeState "level", action:"switch level.setLevel", range:"(0..100)"
-            }
-            tileAttribute ("device.level", key: "SECONDARY_CONTROL") {
-	            attributeState "level", label: 'Level ${currentValue}%'
-			}
-			tileAttribute ("device.color", key: "COLOR_CONTROL") {
-				attributeState "color", action:"setAdjustedColor"
-			}
-		}
-
-		standardTile("reset", "device.reset", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
-			state "default", label:"Reset Color", action:"reset", icon:"st.lights.philips.hue-single"
-		}
-
-		standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
-			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-		}
-
-		main(["rich-control"])
-		details(["rich-control", "colorTempSliderControl", "colorTemp", "reset", "refresh"])
-	}
-}
-
-// parse events into attributes
-def parse(description) {
-	log.debug "parse() - $description"
-	def results = []
-
-	def map = description
-	if (description instanceof String)  {
-		log.debug "Hue Bulb stringToMap - ${map}"
-		map = stringToMap(description)
-	}
-
-	if (map?.name && map?.value) {
-		results << createEvent(name: "${map?.name}", value: "${map?.value}")
-	}
-	results
-}
-
-// handle commands
-void on() {
-	log.trace parent.on(this)
-	sendEvent(name: "switch", value: "on")
-}
-
-void off() {
-	log.trace parent.off(this)
-	sendEvent(name: "switch", value: "off")
-}
-
-void nextLevel() {
-	def level = device.latestValue("level") as Integer ?: 0
-	if (level <= 100) {
-		level = Math.min(25 * (Math.round(level / 25) + 1), 100) as Integer
-	}
-	else {
-		level = 25
-	}
-	setLevel(level)
-}
-
-void setLevel(percent) {
-    log.debug "Executing 'setLevel'"
-    if (verifyPercent(percent)) {
-        parent.setLevel(this, percent)
-        sendEvent(name: "level", value: percent, descriptionText: "Level has changed to ${percent}%")
-        sendEvent(name: "switch", value: "on")
-    }
-}
-
-void setSaturation(percent) {
-    log.debug "Executing 'setSaturation'"
-    if (verifyPercent(percent)) {
-        parent.setSaturation(this, percent)
-        sendEvent(name: "saturation", value: percent, displayed: false)
-    }
-}
-
-void setHue(percent) {
-    log.debug "Executing 'setHue'"
-    if (verifyPercent(percent)) {
-        parent.setHue(this, percent)
-        sendEvent(name: "hue", value: percent, displayed: false)
-    }
-}
-
-void setColor(value) {
-    log.debug "setColor: ${value}, $this"
-    def events = []
-    def validValues = [:]
-
-    if (verifyPercent(value.hue)) {
-        events << createEvent(name: "hue", value: value.hue, displayed: false)
-        validValues.hue = value.hue
-    }
-    if (verifyPercent(value.saturation)) {
-        events << createEvent(name: "saturation", value: value.saturation, displayed: false)
-        validValues.saturation = value.saturation
-    }
-    if (value.hex != null) {
-        if (value.hex ==~ /^\#([A-Fa-f0-9]){6}$/) {
-            events << createEvent(name: "color", value: value.hex)
-            validValues.hex = value.hex
-        } else {
-            log.warn "$value.hex is not a valid color"
-        }
-    }
-    if (verifyPercent(value.level)) {
-        events << createEvent(name: "level", value: value.level, descriptionText: "Level has changed to ${value.level}%")
-        validValues.level = value.level
-    }
-    if (value.switch == "off" || (value.level != null && value.level <= 0)) {
-        events << createEvent(name: "switch", value: "off")
-        validValues.switch = "off"
-    } else {
-        events << createEvent(name: "switch", value: "on")
-        validValues.switch = "on"
-    }
-    if (!events.isEmpty()) {
-        parent.setColor(this, validValues)
-    }
-    events.each {
-        sendEvent(it)
-    }
-}
-
-void reset() {
-    log.debug "Executing 'reset'"
-    def value = [level:100, saturation:56, hue:23]
-    setAdjustedColor(value)
-    parent.poll()
-}
-
-void setAdjustedColor(value) {
-    if (value) {
-        log.trace "setAdjustedColor: ${value}"
-        def adjusted = value + [:]
-        adjusted.hue = adjustOutgoingHue(value.hue)
-        // Needed because color picker always sends 100
-        adjusted.level = null
-        setColor(adjusted)
-    } else {
-        log.warn "Invalid color input"
-    }
-}
-
-void setColorTemperature(value) {
-    if (value) {
-        log.trace "setColorTemperature: ${value}k"
-        parent.setColorTemperature(this, value)
-        sendEvent(name: "colorTemperature", value: value)
-        sendEvent(name: "switch", value: "on")
-    } else {
-        log.warn "Invalid color temperature"
-    }
-}
-
-void refresh() {
-    log.debug "Executing 'refresh'"
-    parent.manualRefresh()
-}
-
-def adjustOutgoingHue(percent) {
-	def adjusted = percent
-	if (percent > 31) {
-		if (percent < 63.0) {
-			adjusted = percent + (7 * (percent -30 ) / 32)
-		}
-		else if (percent < 73.0) {
-			adjusted = 69 + (5 * (percent - 62) / 10)
-		}
-		else {
-			adjusted = percent + (2 * (100 - percent) / 28)
-		}
-	}
-	log.info "percent: $percent, adjusted: $adjusted"
-	adjusted
-}
-
-def verifyPercent(percent) {
-    if (percent == null)
-        return false
-    else if (percent >= 0 && percent <= 100) {
-        return true
-    } else {
-        log.warn "$percent is not 0-100"
-        return false
-    }
-}

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

@@ -1,8 +1,6 @@
 /**
  *  Hue Bulb
  *
- *  Philips Hue Type "Extended Color Light"
- *
  *  Author: SmartThings
  */
 
@@ -71,13 +69,11 @@ metadata {
 def parse(description) {
 	log.debug "parse() - $description"
 	def results = []
-
 	def map = description
 	if (description instanceof String)  {
 		log.debug "Hue Bulb stringToMap - ${map}"
 		map = stringToMap(description)
 	}
-
 	if (map?.name && map?.value) {
 		results << createEvent(name: "${map?.name}", value: "${map?.value}")
 	}

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

@@ -1,8 +1,6 @@
 /**
  *  Hue Lux Bulb
  *
- *  Philips Hue Type "Dimmable Light"
- *
  *  Author: SmartThings
  */
 // for the UI
@@ -25,10 +23,10 @@ metadata {
     tiles(scale: 2) {
         multiAttributeTile(name:"rich-control", type: "lighting", canChangeIcon: true){
             tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-              attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+              attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-              attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#C6C7CC", nextState:"turningOn"
+              attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-              attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+              attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-              attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#C6C7CC", nextState:"turningOn"
+              attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
             }
             tileAttribute ("device.level", key: "SLIDER_CONTROL") {
               attributeState "level", action:"switch level.setLevel", range:"(0..100)"
@@ -70,12 +68,12 @@ def parse(description) {
 
 // handle commands
 void on() {
-	log.trace parent.on(this)
+	parent.on(this)
 	sendEvent(name: "switch", value: "on")
 }
 
 void off() {
-	log.trace parent.off(this)
+	parent.off(this)
 	sendEvent(name: "switch", value: "off")
 }
 
@@ -84,7 +82,6 @@ void setLevel(percent) {
     if (percent != null && percent >= 0 && percent <= 100) {
 		parent.setLevel(this, percent)
 		sendEvent(name: "level", value: percent)
-		sendEvent(name: "switch", value: "on")
 	} else {
     	log.warn "$percent is not 0-100"
     }

devicetypes/smartthings/zwave-door-window-sensor.src/zwave-door-window-sensor.groovy

@@ -245,7 +245,6 @@ def retypeBasedOnMSR() {
 			break
 		case "011F-0001-0001":  // Schlage motion
 		case "014A-0001-0001":  // Ecolink motion
-		case "014A-0004-0001":  // Ecolink motion +
 		case "0060-0001-0002":  // Everspring SP814
 		case "0060-0001-0003":  // Everspring HSP02
 		case "011A-0601-0901":  // Enerwave ZWN-BPC

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

@@ -41,6 +41,7 @@ metadata {
 				attributeState "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#79b821", nextState:"unlocking"
 				attributeState "unlocked", label:'unlocked', action:"lock.lock", icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff", nextState:"locking"
 				attributeState "unknown", label:"unknown", action:"lock.lock", icon:"st.locks.lock.unknown", backgroundColor:"#ffffff", nextState:"locking"
+				attributeState "jammed", label:"jammed", action:"lock.lock", icon:"st.locks.lock.unknown", backgroundColor:"#ffffff", nextState:"locking"
 				attributeState "locking", label:'locking', icon:"st.locks.lock.locked", backgroundColor:"#79b821"
 				attributeState "unlocking", label:'unlocking', icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff"
 			}
@@ -130,7 +131,7 @@ def zwaveEvent(DoorLockOperationReport cmd) {
 	if (cmd.doorLockMode == 0xFF) {
 		map.value = "locked"
 	} else if (cmd.doorLockMode >= 0x40) {
-		map.value = "unknown"
+		map.value = "unknown" // XXX: Jammed?
 	} else if (cmd.doorLockMode & 1) {
 		map.value = "unlocked with timeout"
 	} else {
@@ -180,7 +181,7 @@ def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd) {
 				map = [ name: "lock", value: "unknown", descriptionText: "$device.displayName was not locked fully" ]
 				break
 			case 0xB:
-				map = [ name: "lock", value: "unknown", descriptionText: "$device.displayName is jammed" ]
+				map = [ name: "lock", value: "jammed", descriptionText: "$device.displayName is jammed", displayed: true, eventType: "ALERT" ]
 				break
 			case 0xC:
 				map = [ name: "codeChanged", value: "all", descriptionText: "$device.displayName: all user codes deleted", isStateChange: true ]
@@ -266,7 +267,7 @@ def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd) {
 		case 17:
 		case 23:
 		case 26:
-			map = [ name: "lock", value: "unknown", descriptionText: "$device.displayName bolt is jammed" ]
+			map = [ name: "lock", value: "jammed", descriptionText: "$device.displayName bolt is jammed", displayed: true, eventType: "ALERT" ]
 			break
 		case 13:
 			map = [ name: "codeChanged", value: cmd.alarmLevel, descriptionText: "$device.displayName code $cmd.alarmLevel was added", isStateChange: true ]

smartapps/copy-ninja/myq-connect.src/myq-connect.groovy

@@ -1,370 +0,0 @@
-/**
- *  MyQ (Connect)
- *
- *  Copyright 2015 Jason Mok
- *
- *  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.
- *
- *  Last Updated : 03/08/2016
- *
- */
-definition(
-	name: "MyQ (Connect)",
-	namespace: "copy-ninja",
-	author: "Jason Mok",
-	description: "Connect MyQ to control your devices",
-	category: "SmartThings Labs",
-	iconUrl:   "http://smartthings.copyninja.net/icons/MyQ@1x.png",
-	iconX2Url: "http://smartthings.copyninja.net/icons/MyQ@2x.png",
-	iconX3Url: "http://smartthings.copyninja.net/icons/MyQ@3x.png"
-)
-
-preferences {
-	page(name: "prefLogIn", title: "MyQ")    
-	page(name: "prefListDevices", title: "MyQ")
-}
-
-/* Preferences */
-def prefLogIn() {
-	def showUninstall = username != null && password != null 
-	return dynamicPage(name: "prefLogIn", title: "Connect to MyQ", nextPage:"prefListDevices", uninstall:showUninstall, install: false) {
-		section("Login Credentials"){
-			input("username", "email", title: "Username", description: "MyQ Username (email address)")
-			input("password", "password", title: "Password", description: "MyQ password")
-		}
-		section("Gateway Brand"){
-			input(name: "brand", title: "Gateway Brand", type: "enum",  metadata:[values:["Liftmaster","Chamberlain","Craftsman"]] )
-		}
-		section("Advanced Options"){
-			//input(name: "polling", title: "Server Polling (in Minutes)", type: "int", description: "in minutes", defaultValue: "5" )
-			input(name: "contactSensorTrigger", title: "Contact Sensor to trigger refresh ", type: "capability.contactSensor", required: "false", multiple: "true")
-			input(name: "accelerationSensorTrigger", title: "Acceleration Sensor to trigger refresh ", type: "capability.accelerationSensor", required: "false", multiple: "true")
-		}
-	}
-}
-
-def prefListDevices() {
-	if (forceLogin()) {
-		def doorList = getDoorList()
-		def lightList = getLightList()
-		if ((doorList) || (lightList)) {
-			return dynamicPage(name: "prefListDevices",  title: "Devices", install:true, uninstall:true) {
-				if (doorList) {
-					section("Select which garage door/gate to use"){
-						input(name: "doors", type: "enum", required:false, multiple:true, metadata:[values:doorList])
-					}
-				} 
-				if (lightList) {
-					section("Select which light controller to use"){
-						input(name: "lights", type: "enum", required:false, multiple:true, metadata:[values:lightList])
-					}
-				} 
-			}
-		} else {
-			def devList = getDeviceList()
-			return dynamicPage(name: "prefListDevices",  title: "Error!", install:true, uninstall:true) {
-				section(""){
-					paragraph "Could not find any supported device(s). Please report to author about these devices: " +  devList
-				}
-			}
-		}  
-	} else {
-		return dynamicPage(name: "prefListDevices",  title: "Error!", install:false, uninstall:true) {
-			section(""){
-				paragraph "The username or password you entered is incorrect. Try again. " 
-			}
-		}  
-	}
-}
-
-/* Initialization */
-def installed() { initialize() }
-
-def updated() { 
-	unsubscribe()
-	initialize() 
-}
-
-def uninstalled() {
-	unsubscribe()
-	unschedule()
-	getAllChildDevices().each { deleteChildDevice(it.deviceNetworkId) }
-}	
-
-def initialize() {    
-	login()
-    
-	// Get initial device status in state.data
-	state.polling = [ last: 0, rescheduler: now() ]
-	state.data = [:]
-    
-	// Create selected devices
-	def doorsList = getDoorList()
-	def lightsList = getLightList()
-	def selectedDevices = [] + getSelectedDevices("doors") + getSelectedDevices("lights")
-  
-	selectedDevices.each { 
-		if (!getChildDevice(it)) {
-			if (it.contains("GarageDoorOpener")) { addChildDevice("copy-ninja", "MyQ Garage Door Opener", it, null, ["name": "MyQ: " + doorsList[it]]) }
-			if (it.contains("LightController"))  { addChildDevice("copy-ninja", "MyQ Light Controller", it, null, ["name": "MyQ: " + lightsList[it]]) }
-		} 
-	}
-
-	// Remove unselected devices
-	def deleteDevices = (selectedDevices) ? (getChildDevices().findAll { !selectedDevices.contains(it.deviceNetworkId) }) : getAllChildDevices()
-	deleteDevices.each { deleteChildDevice(it.deviceNetworkId) }
-
-	
-	//Subscribes to sunrise and sunset event to trigger refreshes
-	subscribe(location, "sunrise", runRefresh)
-	subscribe(location, "sunset", runRefresh)
-	subscribe(location, "mode", runRefresh)
-	subscribe(location, "sunriseTime", runRefresh)
-	subscribe(location, "sunsetTime", runRefresh)
-    
-	//Subscribe to events from contact sensor
-	if (settings.contactSensorTrigger) {
-		subscribe(settings.contactSensorTrigger, "contact", runRefresh)
-	}
-	
-	//Subscribe to events from contact sensor
-	if (settings.accelerationSensorTrigger) {
-		subscribe(settings.accelerationSensorTrigger, "acceleration", runRefresh)
-	}
-    
-	// Run refresh after installation
-	runRefresh()
-}
-
-def getSelectedDevices( settingsName ) { 
-	def selectedDevices = [] 
-	(!settings.get(settingsName))?:((settings.get(settingsName)?.getAt(0)?.size() > 1)  ? settings.get(settingsName)?.each { selectedDevices.add(it) } : selectedDevices.add(settings.get(settingsName))) 
-	return selectedDevices 
-} 
-
-/* Access Management */
-private forceLogin() {
-	//Reset token and expiry
-	state.session = [ brandID: 0, brandName: settings.brand, securityToken: null, expiration: 0 ]
-	state.polling = [ last: 0, rescheduler: now() ]
-	state.data = [:]
-	return doLogin()
-}
-
-private login() { return (!(state.session.expiration > now())) ? doLogin() : true }
-
-private doLogin() { 
-	apiGet("/api/user/validate", [username: settings.username, password: settings.password] ) { response ->
-		if (response.status == 200) {
-			if (response.data.SecurityToken != null) {
-				state.session.brandID = response.data.BrandId
-				state.session.brandName = response.data.BrandName
-				state.session.securityToken = response.data.SecurityToken
-				state.session.expiration = now() + 150000
-				return true
-			} else {
-				return false
-			}
-		} else {
-			return false
-		}
-	} 	
-}
-
-// Listing all the garage doors you have in MyQ
-private getDoorList() { 	    
-	def deviceList = [:]
-	apiGet("/api/v4/userdevicedetails/get", []) { response ->
-		if (response.status == 200) {
-			response.data.Devices.each { device ->
-				// 2 = garage door, 5 = gate, 7 = MyQGarage(no gateway), 17 = Garage Door Opener WGDO
-				if (device.MyQDeviceTypeId == 2||device.MyQDeviceTypeId == 5||device.MyQDeviceTypeId == 7||device.MyQDeviceTypeId == 17) {
-					def dni = [ app.id, "GarageDoorOpener", device.MyQDeviceId ].join('|')
-					device.Attributes.each { 
-						if (it.AttributeDisplayName=="desc")	deviceList[dni] = it.Value
-						if (it.AttributeDisplayName=="doorstate") { 
-							state.data[dni] = [ status: it.Value, lastAction: it.UpdatedTime ]
-						}
-					}                    
-				}
-			}
-		}
-	}    
-	return deviceList
-}
-
-// Listing all the light controller you have in MyQ
-private getLightList() { 	    
-	def deviceList = [:]
-	apiGet("/api/v4/userdevicedetails/get", []) { response ->
-		if (response.status == 200) {
-			response.data.Devices.each { device ->
-				if (device.MyQDeviceTypeId == 3) {
-					def dni = [ app.id, "LightController", device.MyQDeviceId ].join('|')
-					device.Attributes.each { 
-						if (it.AttributeDisplayName=="desc") { deviceList[dni] = it.Value }
-						if (it.AttributeDisplayName=="lightstate") {  state.data[dni] = [ status: it.Value ] }
-					}                    
-				}
-			}
-		}
-	}    
-	return deviceList
-}
-
-private getDeviceList() { 	    
-	def deviceList = []
-	apiGet("/api/v4/userdevicedetails/get", []) { response ->
-		if (response.status == 200) {
-			response.data.Devices.each { device ->
-				log.debug "MyQDeviceTypeId : " + device.MyQDeviceTypeId.toString()
-				if (!(device.MyQDeviceTypeId == 1||device.MyQDeviceTypeId == 2||device.MyQDeviceTypeId == 3||device.MyQDeviceTypeId == 5||device.MyQDeviceTypeId == 7)) {
-					deviceList.add( device.MyQDeviceTypeId.toString() + "|" + device.TypeID )
-				}
-			}
-		}
-	}    
-	return deviceList
-}
-
-/* api connection */
-// get URL 
-private getApiURL() {
-	if (settings.brand == "Craftsman") {
-		return "https://craftexternal.myqdevice.com"
-	} else {
-		return "https://myqexternal.myqdevice.com"
-	}
-}
-
-private getApiAppID() {
-	if (settings.brand == "Craftsman") {
-		return "QH5AzY8MurrilYsbcG1f6eMTffMCm3cIEyZaSdK/TD/8SvlKAWUAmodIqa5VqVAs"
-	} else {
-		return "JVM/G9Nwih5BwKgNCjLxiFUQxQijAebyyg8QUHr7JOrP+tuPb8iHfRHKwTmDzHOu"
-	}
-}
-	
-// HTTP GET call
-private apiGet(apiPath, apiQuery = [], callback = {}) {	
-	// set up query
-	apiQuery = [ appId: getApiAppID() ] + apiQuery
-	if (state.session.securityToken) { apiQuery = apiQuery + [SecurityToken: state.session.securityToken ] }
-       
-	try {
-		httpGet([ uri: getApiURL(), path: apiPath, query: apiQuery ]) { response -> callback(response) }
-	}	catch (SocketException e)	{
-		log.debug "API Error: $e"
-	}
-}
-
-// HTTP PUT call
-private apiPut(apiPath, apiBody = [], callback = {}) {    
-	// set up body
-	apiBody = [ ApplicationId: getApiAppID() ] + apiBody
-	if (state.session.securityToken) { apiBody = apiBody + [SecurityToken: state.session.securityToken ] }
-    
-	// set up query
-	def apiQuery = [ appId: getApiAppID() ]
-	if (state.session.securityToken) { apiQuery = apiQuery + [SecurityToken: state.session.securityToken ] }
-    
-	try {
-		httpPut([ uri: getApiURL(), path: apiPath, contentType: "application/json; charset=utf-8", body: apiBody, query: apiQuery ]) { response -> callback(response) }
-	} catch (SocketException e)	{
-		log.debug "API Error: $e"
-	}
-}
-
-// Updates data for devices
-private updateDeviceData() {    
-	// automatically checks if the token has expired, if so login again
-	if (login()) {       
-		// set polling states
-		state.polling["last"] = now()
-	
-		// Get all the door information, updated to state.data
-		return (getDoorList()||getLightList())? true : false
-	} else {
-		return false
-	}
-}
-
-/* for SmartDevice to call */
-// Refresh data
-def refresh() {   
-	//force devices to poll to get the latest status
-	if (updateDeviceData()) { 
-		log.info "Refreshing data..."
-		// get all the children and send updates
-		getAllChildDevices().each { 
-			//log.debug "Polling " + it.deviceNetworkId
-			it.updateDeviceStatus(state.data[it.deviceNetworkId].status)
-			if (it.deviceNetworkId.contains("GarageDoorOpener")) {
-				it.updateDeviceLastActivity(state.data[it.deviceNetworkId].lastAction.toLong())
-			}
-		}
-	}    
-	
-	//schedule the rescheduler to schedule refresh ;)
-	if ((state.polling["rescheduler"]?:0) + 2400000 < now()) {
-		log.info "Scheduling Auto Rescheduler.."
-		runEvery30Minutes(runRefresh)
-		state.polling["rescheduler"] = now()
-	}
-}
-
-// Get Device ID
-def getChildDeviceID(child) {
-	return child.device.deviceNetworkId.split("\\|")[2]
-}
-
-// Get single device status
-def getDeviceStatus(child) {
-	return state.data[child.device.deviceNetworkId].status
-}
-
-// Get single device last activity
-def getDeviceLastActivity(child) {
-	return state.data[child.device.deviceNetworkId].lastAction.toLong()
-}
-
-// Send command to start or stop
-def sendCommand(child, attributeName, attributeValue) {
-	if (login()) {	    	
-		//Send command
-		apiPut("/api/v4/deviceattribute/putdeviceattribute", [ MyQDeviceId: getChildDeviceID(child), AttributeName: attributeName, AttributeValue: attributeValue ]) 	
-		return true
-	} 
-}
-
-def runRefresh(evt) {
-	if (evt) { 
-		log.info "Event " + evt.displayName + " triggered refresh" 
-		runIn(30, delayedRefresh) //schedule a refresh 
-	}
-	log.info "Last refresh was "  + ((now() - state.polling["last"])/60000) + " minutes ago"
-	// Reschedule if  didn't update for more than 5 minutes plus specified polling
-	//if ((((state.polling["last"]?:0) + ((((!settings.polling)?:(settings.polling.toInteger() > 0 )? settings.polling.toInteger() : 5)) * 60000) + 300000) < now()) && canSchedule()) {
-	if ((((state.polling["last"]?:0) + 600000) < now()) && canSchedule()) {
-		log.info "Scheduling Auto Refresh.."
-		//schedule("* */" + ((settings.polling.toInteger() > 0 )? settings.polling.toInteger() : 5) + " * * * ?", refresh)
-		schedule("* */5 * * * ?", refresh)
-	}
-	
-	// Force Refresh NOWWW!!!!
-	refresh()
-	
-	if (!evt)  state.polling["rescheduler"] = now() //Update rescheduler's last run
-}
-
-def delayedRefresh() { 
-	log.info "Delayed refresh triggered"
-	refresh() 
-}

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

@@ -161,7 +161,7 @@ private sendDeveloperReq() {
 		headers: [
 			HOST: host
 		],
-		body: [devicetype: "$token-0"]], "${selectedHue}"))
+		body: [devicetype: "$token-0", username: "$token-0"]], "${selectedHue}"))
 }
 
 private discoverHueBulbs() {
@@ -289,7 +289,7 @@ def bulbListHandler(hub, data = "") {
         def object = new groovy.json.JsonSlurper().parseText(data)
         object.each { k,v ->
             if (v instanceof Map)
-                bulbs[k] = [id: k, name: v.name, type: v.type, modelid: v.modelid, hub:hub]
+                bulbs[k] = [id: k, name: v.name, type: v.type, hub:hub]
         }
     }
     def bridge = null
@@ -300,40 +300,6 @@ def bulbListHandler(hub, data = "") {
 	return msg
 }
 
-private upgradeDeviceType(device, newHueType) {
-	def deviceType = getDeviceType(newHueType)
-
-	// Automatically change users Hue bulbs to correct device types
-	if (deviceType && !(device?.typeName?.equalsIgnoreCase(deviceType))) {
-		log.debug "Update device type: \"$device.label\" ${device?.typeName}->$deviceType"
-		device.setDeviceType(deviceType)
-	}
-}
-
-private getDeviceType(hueType) {
-	// Determine ST device type based on Hue classification of light
-	if (hueType?.equalsIgnoreCase("Dimmable light"))
-		return "Hue Lux Bulb"
-	else if (hueType?.equalsIgnoreCase("Extended Color Light"))
-		return "Hue Bulb"
-	else if (hueType?.equalsIgnoreCase("Color Light"))
-		return "Hue Bloom"
-	else
-		return null
-}
-
-private addChildBulb(dni, hueType, name, hub, update=false, device = null) {
-	def deviceType = getDeviceType(hueType)
-
-	if (deviceType) {
-		return addChildDevice("smartthings", deviceType, dni, hub, ["label": name])
-	}
-	else {
-		log.warn "Device type $hueType not supported"
-		return null
-	}
-}
-
 def addBulbs() {
 	def bulbs = getHueBulbs()
 	selectedBulbs?.each { dni ->
@@ -343,7 +309,11 @@ def addBulbs() {
 			if (bulbs instanceof java.util.Map) {
 				newHueBulb = bulbs.find { (app.id + "/" + it.value.id) == dni }
                 if (newHueBulb != null) {
-                    d = addChildBulb(dni, newHueBulb?.value?.type, newHueBulb?.value?.name, newHueBulb?.value?.hub)
+                    if (newHueBulb?.value?.type?.equalsIgnoreCase("Dimmable light") ) {
+                        d = addChildDevice("smartthings", "Hue Lux Bulb", dni, newHueBulb?.value.hub, ["label":newHueBulb?.value.name])
+                    } else {
+                        d = addChildDevice("smartthings", "Hue Bulb", dni, newHueBulb?.value.hub, ["label":newHueBulb?.value.name])
+                    }
                     log.debug "created ${d.displayName} with id $dni"
                     d.refresh()
                 } else {
@@ -352,15 +322,16 @@ def addBulbs() {
 			} else {
             	//backwards compatable
 				newHueBulb = bulbs.find { (app.id + "/" + it.id) == dni }
-				d = addChildBulb(dni, "Extended Color Light", newHueBulb?.value?.name, newHueBulb?.value?.hub)
+				d = addChildDevice("smartthings", "Hue Bulb", dni, newHueBulb?.hub, ["label":newHueBulb?.name])
                 d.refresh()
 			}
 		} else {
 			log.debug "found ${d.displayName} with id $dni already exists, type: '$d.typeName'"
 			if (bulbs instanceof java.util.Map) {
-				// Update device type if incorrect
             	def newHueBulb = bulbs.find { (app.id + "/" + it.value.id) == dni }
-				upgradeDeviceType(d, newHueBulb?.value?.type)
+				if (newHueBulb?.value?.type?.equalsIgnoreCase("Dimmable light") && d.typeName == "Hue Bulb") {
+					d.setDeviceType("Hue Lux Bulb")
+				}
 			}
 		}
 	}
@@ -502,7 +473,7 @@ def locationHandler(evt) {
 					def bulbs = getHueBulbs()
 					log.debug "Adding bulbs to state!"
 					body.each { k,v ->
-						bulbs[k] = [id: k, name: v.name, type: v.type, modelid: v.modelid, hub:parsedEvent.hub]
+						bulbs[k] = [id: k, name: v.name, type: v.type, hub:parsedEvent.hub]
 					}
 				}
 			}
@@ -865,7 +836,7 @@ def convertBulbListToMap() {
 		if (state.bulbs instanceof java.util.List) {
 			def map = [:]
 			state.bulbs.unique {it.id}.each { bulb ->
-				map << ["${bulb.id}":["id":bulb.id, "name":bulb.name, "type": bulb.type, "modelid": bulb.modelid, "hub":bulb.hub]]
+				map << ["${bulb.id}":["id":bulb.id, "name":bulb.name, "hub":bulb.hub]]
 			}
 			state.bulbs = map
 		}