MSA-1713: This will toggle lights on/off with a door sensor. When the contact sensor detects the door is opened, the selected lights will toggle based on the master switch status. For example, if master is ON, the lights will turn OFF. When the master is OFF, these will turn ON.

devicetypes/smartthings/testing/simulated-switch.src/simulated-switch.groovy

@@ -39,7 +39,9 @@ metadata {
 	}
 }
 
-def parse(description) {
+def parse(String description) {
+	def pair = description.split(":")
+	createEvent(name: pair[0].trim(), value: pair[1].trim())
 }
 
 def on() {

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

@@ -28,10 +28,6 @@ metadata {
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B05", outClusters: "0019", manufacturer: "OSRAM SYLVANIA", model: "iQBR30", deviceJoinName: "Sylvania Ultra iQ"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY PAR38 ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart PAR38 Soft White"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart BR30 Soft White"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0702, 0B05", outClusters: "0019", manufacturer: "sengled", model: "E11-G13", deviceJoinName: "Sengled Element Classic"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL6HD", deviceJoinName: "Leviton Dimmer Switch"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL3HL", deviceJoinName: "Leviton Lumina RF Plug-In Dimmer"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008", outClusters: "0003, 0006, 0008, 0019, 0406", manufacturer: "Leviton", model: "DL1KD", deviceJoinName: "Leviton Lumina RF Dimmer Switch"
     }
 
     tiles(scale: 2) {

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

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

smartapps/garrettgeier/toggle-lights-on-off-using-door-sensor.src/toggle-lights-on-off-using-door-sensor.groovy

@@ -0,0 +1,87 @@
+/**
+ *  Door Sensor Light Toggle
+ *
+ *  Copyright 2017 Garrett Geier
+ *
+ *  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: "Toggle lights on/off using Door Sensor",
+    namespace: "GarrettGeier",
+    author: "Garrett Geier",
+    description: "Toggle lights on/off with a door sensor. When the door is opened, the lights will toggle based on the master switch.",
+    category: "Convenience",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
+    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
+
+//main screen options
+preferences
+{
+     //choose the door/contact sensor here.
+	section("When this door is opened")
+    {
+		input "doorToggler", "capability.contactSensor", title: "Select Door Sensor", required: true, multiple: false
+    }
+    
+    // this is the master switch. If this switch is ON, then the lights will turn OFF when the door is opened.
+    // If this switch is OFF, then the lights will turn ON when the door is opened.
+    // Don't care about if the door is closed, this is designed for a normal door which will eventually be shut. :)
+    section("Select the Master switch")
+    {
+    	input "masterToggle", "capability.switch", title: "Master switch", required: true, multiple: false
+    }
+    
+    //based on the master switch, these will turn on or off.
+    section("Stuff you want to turn on/off")
+    {
+	    input "switchesToToggle", "capability.switch", title: "If master is ON, these will turn OFF. When the master is OFF, these will turn ON.", required: true, multiple: true
+	}
+}
+
+//required
+def installed()
+{
+	initialize()
+}
+
+//required
+def updated()
+{
+	unsubscribe()
+	initialize()
+}
+
+// the event we care about, when the door is opened.
+// see http://docs.smartthings.com/en/latest/capabilities-reference.html#contactsensor for device capabilities
+def initialize()
+{
+    subscribe(doorToggler, "contact.open", toggleSwitches)
+}
+
+def toggleSwitches(evt)
+{
+	//log.debug "$evt.value"
+  
+	if (evt.value == "open" && masterToggle.currentSwitch == "off")
+    {
+        //log.debug "Light! Yay!"
+		switchesToToggle.on()
+        masterToggle.on()
+    }
+    
+    else if (evt.value == "open" && masterToggle.currentSwitch == "on")
+    {
+        //log.debug "Kill the lights"
+		switchesToToggle.off()
+        masterToggle.off()
+    }
+}

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

@@ -1,461 +0,0 @@
-/**
- *  OpenT2T SmartApp Test
- *
- *  Copyright 2016 OpenT2T
- *
- *  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: "OpenT2T SmartApp Test",
-		namespace: "opent2t",
-		author: "OpenT2T",
-		description: "Test app to test end to end SmartThings scenarios via OpenT2T",
-		category: "SmartThings Labs",
-		iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-		iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-		iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
-
-/** --------------------+---------------+-----------------------+------------------------------------
- *  Device Type         | Attribute Name| Commands              | Attribute Values
- *  --------------------+---------------+-----------------------+------------------------------------
- *  switches            | switch        | on, off               | on, off
- *  motionSensors       | motion        |                       | active, inactive
- *  contactSensors      | contact       |                       | open, closed
- *  presenceSensors     | presence      |                       | present, 'not present'
- *  temperatureSensors  | temperature   |                       | <numeric, F or C according to unit>
- *  accelerationSensors | acceleration  |                       | active, inactive
- *  waterSensors        | water         |                       | wet, dry
- *  lightSensors        | illuminance   |                       | <numeric, lux>
- *  humiditySensors     | humidity      |                       | <numeric, percent>
- *  locks               | lock          | lock, unlock          | locked, unlocked
- *  garageDoors         | door          | open, close           | unknown, closed, open, closing, opening
- *  cameras             | image         | take                  | <String>
- *  thermostats         | thermostat    | setHeatingSetpoint,   | temperature, heatingSetpoint, coolingSetpoint,
- * 	                    |				| setCoolingSetpoint,   | thermostatSetpoint, thermostatMode,
- *                      |				| off, heat, cool, auto,| thermostatFanMode, thermostatOperatingState
- *                      |				| emergencyHeat,        |
- *                      |				| setThermostatMode,    |
- *                      |				| fanOn, fanAuto,       |
- *                      |				| fanCirculate,         |
- *                      |				| setThermostatFanMode  |
- *  --------------------+---------------+-----------------------+------------------------------------
- */
-
-//Device Inputs
-preferences {
-	section("Allow <PLACEHOLDER: Your App Name> to control these things...") {
-		input "contactSensors", "capability.contactSensor", title: "Which Contact Sensors", multiple: true, required: false
-		input "garageDoors", "capability.garageDoorControl", title: "Which Garage Doors?", multiple: true, required: false
-		input "locks", "capability.lock", title: "Which Locks?", multiple: true, required: false
-		input "cameras", "capability.videoCapture", title: "Which Cameras?", multiple: true, required: false
-		input "motionSensors", "capability.motionSensor", title: "Which Motion Sensors?", multiple: true, required: false
-		input "presenceSensors", "capability.presenceSensor", title: "Which Presence Sensors", multiple: true, required: false
-		input "switches", "capability.switch", title: "Which Switches and Lights?", multiple: true, required: false
-		input "thermostats", "capability.thermostat", title: "Which Thermostat?", multiple: true, required: false
-		input "waterSensors", "capability.waterSensor", title: "Which Water Leak Sensors?", multiple: true, required: false
-	}
-}
-
-def getInputs() {
-	def inputList = []
-	inputList += contactSensors ?: []
-	inputList += garageDoors ?: []
-	inputList += locks ?: []
-	inputList += cameras ?: []
-	inputList += motionSensors ?: []
-	inputList += presenceSensors ?: []
-	inputList += switches ?: []
-	inputList += thermostats ?: []
-	inputList += waterSensors ?: []
-	return inputList
-}
-
-//API external Endpoints
-mappings {
-	path("/subscriptionURL/:url") {
-		action:
-		[
-				PUT: "updateEndpointURL"
-		]
-	}
-	path("/connectionId/:connId") {
-		action:
-		[
-				PUT: "updateConnectionId"
-		]
-	}
-	path("/devices") {
-		action:
-		[
-				GET: "getDevices"
-		]
-	}
-	path("/devices/:id") {
-		action:
-		[
-				GET: "getDevice"
-		]
-	}
-	path("/update/:id") {
-		action:
-		[
-				PUT: "updateDevice"
-		]
-	}
-	path("/subscription/:id") {
-		action:
-		[
-				POST  : "registerDeviceChange",
-				DELETE: "unregisterDeviceChange"
-		]
-	}
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-	unsubscribe()
-	registerSubscriptions()
-}
-
-def initialize() {
-	state.connectionId = ""
-	state.endpointURL = "https://ifs.windows-int.com/v1/cb/81C7E77B-EABC-488A-B2BF-FEC42F0DABD2/notify"
-	registerSubscriptions()
-}
-
-//Subscribe events for all devices
-def registerSubscriptions() {
-	registerChangeHandler(inputs)
-}
-
-//Subscribe to events from a list of devices
-def registerChangeHandler(myList) {
-	myList.each { myDevice ->
-		def theAtts = myDevice.supportedAttributes
-		theAtts.each { att ->
-			subscribe(myDevice, att.name, eventHandler)
-			log.info "Registering ${myDevice.displayName}.${att.name}"
-		}
-	}
-}
-
-//Endpoints function: Subscribe to events from a specific device
-def registerDeviceChange() {
-	def myDevice = findDevice(params.id)
-	def theAtts = myDevice.supportedAttributes
-	try {
-		theAtts.each { att ->
-			subscribe(myDevice, att.name, eventHandler)
-			log.info "Registering ${myDevice.displayName}.${att.name}"
-		}
-		return ["succeed"]
-	} catch (e) {
-		httpError(500, "something went wrong: $e")
-	}
-}
-
-//Endpoints function: Unsubscribe to events from a specific device
-def unregisterDeviceChange() {
-	def myDevice = findDevice(params.id)
-	try {
-		unsubscribe(myDevice)
-		log.info "Unregistering ${myDevice.displayName}"
-		return ["succeed"]
-	} catch (e) {
-		httpError(500, "something went wrong: $e")
-	}
-}
-
-//When events are triggered, send HTTP post to web socket servers
-def eventHandler(evt) {
-	def evt_device_id = evt.deviceId
-	def evt_device_value = evt.value
-	def evt_name = evt.name
-	def evt_device = evt.device
-	def evt_deviceType = getDeviceType(evt_device);
-	def params = [
-			uri : "${state.endpointURL}/${state.connectionId}",
-			body: [
-					name        : evt_device.displayName,
-					id          : evt_device.id,
-					deviceType  : evt_deviceType,
-					manufacturer: evt_device.getManufacturerName(),
-					model       : evt_device.getModelName(),
-					attributes  : deviceAttributeList(evt_device)
-			]
-	]
-	try {
-		log.trace "POST URI: ${params.uri}"
-		log.trace "Payload: ${params.body}"
-		httpPostJson(params) { resp ->
-			resp.headers.each {
-				log.debug "${it.name} : ${it.value}"
-			}
-			log.trace "response status code: ${resp.status}"
-			log.trace "response data: ${resp.data}"
-		}
-	} catch (e) {
-		log.debug "something went wrong: $e"
-	}
-}
-
-//Endpoints function: update subcription endpoint url [state.endpoint]
-void updateEndpointURL() {
-	state.endpointURL = params.url
-	log.info "Updated EndpointURL to ${state.endpointURL}"
-}
-
-//Endpoints function: update global variable [state.connectionId]
-void updateConnectionId() {
-	def connId = params.connId
-	state.connectionId = connId
-	log.info "Updated ConnectionID to ${state.connectionId}"
-}
-
-//Endpoints function: return all device data in json format
-def getDevices() {
-	def deviceData = []
-	inputs?.each {
-		def deviceType = getDeviceType(it)
-		if (deviceType == "thermostat") {
-			deviceData << [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it), locationMode: getLocationModeInfo()]
-		} else {
-			deviceData << [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it)]
-		}
-	}
-
-	log.debug "getDevices, return: ${deviceData}"
-	return deviceData
-}
-
-//Endpoints function: get device data
-def getDevice() {
-	def it = findDevice(params.id)
-	def deviceType = getDeviceType(it)
-	def device
-	if (deviceType == "thermostat") {
-		device = [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it), locationMode: getLocationModeInfo()]
-	} else {
-		device = [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it)]
-	}
-	log.debug "getDevice, return: ${device}"
-	return device
-}
-
-//Endpoints function: update device data
-void updateDevice() {
-	def device = findDevice(params.id)
-	request.JSON.each {
-		def command = it.key
-		def value = it.value
-		if (command) {
-			def commandList = mapDeviceCommands(command, value)
-			command = commandList[0]
-			value = commandList[1]
-
-			if (command == "setAwayMode") {
-				log.info "Setting away mode to ${value}"
-				if (location.modes?.find { it.name == value }) {
-					location.setMode(value)
-				}
-			} else if (command == "thermostatSetpoint") {
-				switch (device.currentThermostatMode) {
-					case "cool":
-						log.info "Update: ${device.displayName}, [${command}, ${value}]"
-						device.setCoolingSetpoint(value)
-						break
-					case "heat":
-					case "emergency heat":
-						log.info "Update: ${device.displayName}, [${command}, ${value}]"
-						device.setHeatingSetpoint(value)
-						break
-					default:
-						httpError(501, "this mode: ${device.currentThermostatMode} does not allow changing thermostat setpoint.")
-						break
-				}
-			} else if (!device) {
-				log.error "updateDevice, Device not found"
-				httpError(404, "Device not found")
-			} else if (!device.hasCommand(command)) {
-				log.error "updateDevice, Device does not have the command"
-				httpError(404, "Device does not have such command")
-			} else {
-				if (command == "setColor") {
-					log.info "Update: ${device.displayName}, [${command}, ${value}]"
-					device."$command"(hex: value)
-				} else if (value.isNumber()) {
-					def intValue = value as Integer
-					log.info "Update: ${device.displayName}, [${command}, ${intValue}(int)]"
-					device."$command"(intValue)
-				} else if (value) {
-					log.info "Update: ${device.displayName}, [${command}, ${value}]"
-					device."$command"(value)
-				} else {
-					log.info "Update: ${device.displayName}, [${command}]"
-					device."$command"()
-				}
-			}
-		}
-	}
-}
-
-/*** Private Functions ***/
-
-//Return current location mode info
-private getLocationModeInfo() {
-	return [mode: location.mode, supported: location.modes.name]
-}
-
-//Map each device to a type given it's capabilities
-private getDeviceType(device) {
-	def deviceType
-	def caps = device.capabilities
-	log.debug "capabilities: [${device}, ${caps}]"
-	log.debug "supported commands: [${device}, ${device.supportedCommands}]"
-	caps.each {
-		switch (it.name.toLowerCase()) {
-			case "switch":
-				deviceType = "switch"
-				break
-			case "switch level":
-				deviceType = "light"
-				break
-			case "contact sensor":
-				deviceType = "contactSensor"
-				break
-			case "garageDoorControl":
-				deviceType = "garageDoor"
-				break
-			case "lock":
-				deviceType = "lock"
-				break
-			case "video camera":
-				deviceType = "camera"
-				break
-			case "motion sensor":
-				deviceType = "motionSensor"
-				break
-			case "presence sensor":
-				deviceType = "presenceSensor"
-				break
-			case "thermostat":
-				deviceType = "thermostat"
-				break
-			case "water sensor":
-				deviceType = "waterSensor"
-				break
-			default:
-				break
-		}
-	}
-	return deviceType
-}
-
-//Return a specific device give the device ID.
-private findDevice(deviceId) {
-	return inputs?.find { it.id == deviceId }
-}
-
-//Return a list of device attributes
-private deviceAttributeList(device) {
-	device.supportedAttributes.collectEntries { attribute ->
-		try {
-			[(attribute.name): device.currentValue(attribute.name)]
-		} catch (e) {
-			[(attribute.name): null]
-		}
-	}
-}
-
-//Map device command and value.
-//input command and value are from UWP,
-//returns resultCommand and resultValue that corresponds with function and value in SmartApps
-private mapDeviceCommands(command, value) {
-	log.debug "mapDeviceCommands: [${command}, ${value}]"
-	def resultCommand = command
-	def resultValue = value
-	switch (command) {
-		case "switch":
-			if (value == 1 || value == "1" || value == "on") {
-				resultCommand = "on"
-				resultValue = ""
-			} else if (value == 0 || value == "0" || value == "off") {
-				resultCommand = "off"
-				resultValue = ""
-			}
-			break
-	// light attributes
-		case "level":
-			resultCommand = "setLevel"
-			resultValue = value
-			break
-		case "hue":
-			resultCommand = "setHue"
-			resultValue = value
-			break
-		case "saturation":
-			resultCommand = "setSaturation"
-			resultValue = value
-			break
-		case "ct":
-			resultCommand = "setColorTemperature"
-			resultValue = value
-			break
-		case "color":
-			resultCommand = "setColor"
-			resultValue = value
-	// thermostat attributes
-		case "hvacMode":
-			resultCommand = "setThermostatMode"
-			resultValue = value
-			break
-		case "fanMode":
-			resultCommand = "setThermostatFanMode"
-			resultValue = value
-			break
-		case "awayMode":
-			resultCommand = "setAwayMode"
-			resultValue = value
-			break
-		case "coolingSetpoint":
-			resultCommand = "setCoolingSetpoint"
-			resultValue = value
-			break
-		case "heatingSetpoint":
-			resultCommand = "setHeatingSetpoint"
-			resultValue = value
-			break
-		case "thermostatSetpoint":
-			resultCommand = "thermostatSetpoint"
-			resultValue = value
-			break
-	// lock attributes
-		case "locked":
-			if (value == 1 || value == "1" || value == "lock") {
-				resultCommand = "lock"
-				resultValue = ""
-			} else if (value == 0 || value == "0" || value == "unlock") {
-				resultCommand = "unlock"
-				resultValue = ""
-			}
-			break
-		default:
-			break
-	}
-
-	return [resultCommand, resultValue]
-}
-

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

@@ -172,34 +172,18 @@ def bulbDiscovery() {
 			if (existingLightsDescription.isEmpty()) {
 				existingLightsDescription += it.value
 			} else {
-				existingLightsDescription += ", ${it.value}"
+				 existingLightsDescription += ", ${it.value}"
 			}
 		}
 	}
 
-	if (bulbRefreshCount > 200 && numFound == 0) {
+	return dynamicPage(name:"bulbDiscovery", title:"Light Discovery Started!", nextPage:"", refreshInterval:refreshInterval, install:true, uninstall: true) {
-		// Time out to avoid endless discovery
+		section("Please wait while we discover your Hue Lights. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
-		state.inBulbDiscovery = false
+			input "selectedBulbs", "enum", required:false, title:"Select Hue Lights to add (${numFound} found)", multiple:true, submitOnChange: true, options:newLights
-		bulbRefreshCount = 0
+			paragraph title: "Previously added Hue Lights (${existingLights.size()} added)", existingLightsDescription
-		return dynamicPage(name:"bulbDiscovery", title:"Light Discovery Failed!", nextPage:"", refreshInterval:0, install:true, uninstall: true) {
-			section("Failed to discover any lights, please try again later. Click Done to exit.") {
-				//input "selectedBulbs", "enum", required:false, title:"Select Hue Lights to add (${numFound} found)", multiple:true, submitOnChange: true, options:newLights
-				paragraph title: "Previously added Hue Lights (${existingLights.size()} added)", existingLightsDescription
-			}
-			section {
-				href "bridgeDiscovery", title: title, description: "", state: selectedHue ? "complete" : "incomplete", params: [override: true]
-			}
 		}
-
+		section {
-	} else {
+			href "bridgeDiscovery", title: title, description: "", state: selectedHue ? "complete" : "incomplete", params: [override: true]
-		return dynamicPage(name:"bulbDiscovery", title:"Light Discovery Started!", nextPage:"", refreshInterval:refreshInterval, install:true, uninstall: true) {
-			section("Please wait while we discover your Hue Lights. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
-				input "selectedBulbs", "enum", required:false, title:"Select Hue Lights to add (${numFound} found)", multiple:true, submitOnChange: true, options:newLights
-				paragraph title: "Previously added Hue Lights (${existingLights.size()} added)", existingLightsDescription
-			}
-			section {
-				href "bridgeDiscovery", title: title, description: "", state: selectedHue ? "complete" : "incomplete", params: [override: true]
-			}
 		}
 	}
 }
@@ -423,7 +407,7 @@ def addBridge() {
 	if(vbridge) {
 		def d = getChildDevice(selectedHue)
 		if(!d) {
-			// compatibility with old devices
+	 		// compatibility with old devices
 			def newbridge = true
 			childDevices.each {
 				if (it.getDeviceDataByName("mac")) {
@@ -609,7 +593,7 @@ def locationHandler(evt) {
 	log.trace "Location: $description"
 
 	def hub = evt?.hubId
-	def parsedEvent = parseLanMessage(description)
+ 	def parsedEvent = parseLanMessage(description)
 	parsedEvent << ["hub":hub]
 
 	if (parsedEvent?.ssdpTerm?.contains("urn:schemas-upnp-org:device:basic:1")) {
@@ -835,7 +819,8 @@ def parse(childDevice, description) {
 			try {
 				body = new groovy.json.JsonSlurper().parseText(bodyString)
 			} catch (all) {
-				log.warn "Parsing Body failed"
+				log.warn "Parsing Body failed - trying again..."
+				poll()
 			}
 			if (body instanceof java.util.Map) {
 				// get (poll) reponse
@@ -859,7 +844,7 @@ private sendColorEvents(device, xy, hue, sat, ct, colormode = null) {
 
 	def events = [:]
 	// For now, only care about changing color temperature if requested by user
-	if (ct != null && ct != 0 && (colormode == "ct" || (xy == null && hue == null && sat == null))) {
+	if (ct != null && (colormode == "ct" || (xy == null && hue == null && sat == null))) {
 		// for some reason setting Hue to their specified minimum off 153 yields 154, dealt with below
 		// 153 (6500K) to 500 (2000K)
 		def temp = (ct == 154) ? 6500 : Math.round(1000000 / ct)
@@ -1267,7 +1252,7 @@ private getBridgeIP() {
 		if (d) {
 			if (d.getDeviceDataByName("networkAddress"))
 				host =  d.getDeviceDataByName("networkAddress")
-			else
+		else
 				host = d.latestState('networkAddress').stringValue
 		}
 		if (host == null || host == "") {