Merge pull request #291 from kwarodom/LiFXProd

LiFX - LiFX: update oauth/callback url using getApiServerUrl() for shard proxying and change shardUrl param to apiServerUrl

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

@@ -15,7 +15,6 @@
  *	Author: SmartThings
  *	Date: 2013-12-04
  */
-//DEPRECATED - Using the generic DTH for this device. Users need to be moved before deleting this DTH
 metadata {
 	definition (name: "CentraLite Dimmer", namespace: "smartthings", author: "SmartThings") {
 		capability "Switch Level"
@@ -26,6 +25,7 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 
+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0B04,0B05", outClusters: "0019"
 	}
 
 	// simulator metadata

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

@@ -1,71 +0,0 @@
-/**
- *  Ecobee Sensor
- *
- *  Copyright 2015 Juan Risso
- *
- *  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.
- *
- */
-metadata {
-	definition (name: "Ecobee Sensor", namespace: "smartthings", author: "SmartThings") {
-		capability "Sensor"
-		capability "Temperature Measurement"
-		capability "Motion Sensor"
-		capability "Refresh"
-		capability "Polling"
-	}
-
-	simulator {
-		// TODO: define status and reply messages here
-	}
-
-	tiles {
-		valueTile("temperature", "device.temperature", width: 2, height: 2) {
-			state("temperature", label:'${currentValue}°', unit:"F",
-					backgroundColors:[
-							[value: 31, color: "#153591"],
-							[value: 44, color: "#1e9cbb"],
-							[value: 59, color: "#90d2a7"],
-							[value: 74, color: "#44b621"],
-							[value: 84, color: "#f1d801"],
-							[value: 95, color: "#d04e00"],
-							[value: 96, color: "#bc2323"]
-					]
-			)
-		}
-
-		standardTile("motion", "device.motion") {
-			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
-			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff")
-		}
-
-		standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat") {
-			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
-		}
-
-		main (["temperature","motion"])
-		details(["temperature","motion","refresh"])
-	}
-}
-
-def refresh() {
-	log.debug "refresh..."
-	poll()
-}
-
-void poll() {
-	log.debug "Executing 'poll' using parent SmartApp"
-	parent.pollChildren(this)
-}
-
-//generate custom mobile activity feeds event
-def generateActivityFeedsEvent(notificationMessage) {
-	sendEvent(name: "notificationMessage", value: "$device.displayName $notificationMessage", descriptionText: "$device.displayName $notificationMessage", displayed: true)
-}

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

@@ -35,18 +35,18 @@ metadata {
 
 	simulator { }
  
-    	tiles {
+		tiles {
 		valueTile("temperature", "device.temperature", width: 2, height: 2) {
 			state("temperature", label:'${currentValue}°', unit:"F",
-                backgroundColors:[
+				backgroundColors:[
-                    [value: 31, color: "#153591"],
+					[value: 31, color: "#153591"],
-                    [value: 44, color: "#1e9cbb"],
+					[value: 44, color: "#1e9cbb"],
-                    [value: 59, color: "#90d2a7"],
+					[value: 59, color: "#90d2a7"],
-                    [value: 74, color: "#44b621"],
+					[value: 74, color: "#44b621"],
-                    [value: 84, color: "#f1d801"],
+					[value: 84, color: "#f1d801"],
-                    [value: 95, color: "#d04e00"],
+					[value: 95, color: "#d04e00"],
-                    [value: 96, color: "#bc2323"]
+					[value: 96, color: "#bc2323"]
-                ]
+				]
 			)
 		}
 		standardTile("mode", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
@@ -55,7 +55,7 @@ metadata {
 			state "cool", action:"switchMode",  nextState: "updating", icon: "st.thermostat.cool"
 			state "auto", action:"switchMode",  nextState: "updating", icon: "st.thermostat.auto"
 			state "auxHeatOnly", action:"switchMode", icon: "st.thermostat.emergency-heat"  
-			state "updating", label:"Working", icon: "st.secondary.secondary"
+            state "updating", label:"Working", icon: "st.secondary.secondary"  
 		}
 		standardTile("fanMode", "device.thermostatFanMode", inactiveLabel: false, decoration: "flat") {
 			state "auto", label:'Fan: ${currentValue}', action:"switchFanMode", nextState: "on"
@@ -63,17 +63,17 @@ metadata {
 			state "off", label:'Fan: ${currentValue}', action:"switchFanMode", nextState: "circulate"           
 			state "circulate", label:'Fan: ${currentValue}', action:"switchFanMode", nextState: "auto"
 		}
-		standardTile("upButtonControl", "device.thermostatSetpoint", inactiveLabel: false, decoration: "flat") {
+        standardTile("upButtonControl", "device.thermostatSetpoint", inactiveLabel: false, decoration: "flat") {
-			state "setpoint", action:"raiseSetpoint", icon:"st.thermostat.thermostat-up"
+			state "setpoint", action:"raiseSetpoint", backgroundColor:"#d04e00", icon:"st.thermostat.thermostat-up"
 		}
-		valueTile("thermostatSetpoint", "device.thermostatSetpoint", width: 1, height: 1, decoration: "flat") {
+        valueTile("thermostatSetpoint", "device.thermostatSetpoint", width: 1, height: 1, decoration: "flat") {
-			state "thermostatSetpoint", label:'${currentValue}°'
+			state "thermostatSetpoint", label:'${currentValue}'
 		}
 		valueTile("currentStatus", "device.thermostatStatus", height: 1, width: 2, decoration: "flat") {
 			state "thermostatStatus", label:'${currentValue}', backgroundColor:"#ffffff"
 		}    
 		standardTile("downButtonControl", "device.thermostatSetpoint", inactiveLabel: false, decoration: "flat") {
-			state "setpoint", action:"lowerSetpoint", icon:"st.thermostat.thermostat-down"
+			state "setpoint", action:"lowerSetpoint", backgroundColor:"#d04e00", icon:"st.thermostat.thermostat-down"
 		}        
 		controlTile("heatSliderControl", "device.heatingSetpoint", "slider", height: 1, width: 2, inactiveLabel: false) {
 			state "setHeatingSetpoint", action:"thermostat.setHeatingSetpoint", backgroundColor:"#d04e00"
@@ -91,19 +91,25 @@ metadata {
 			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 		standardTile("resumeProgram", "device.resumeProgram", inactiveLabel: false, decoration: "flat") {
-			state "resume", action:"resumeProgram", nextState: "updating", label:'Resume Schedule', icon:"st.samsung.da.oven_ic_send"
+			state "resume", label:'Resume Program', action:"device.resumeProgram", icon:"st.sonos.play-icon"
-			state "updating", label:"Working", icon: "st.secondary.secondary"
 		}
 		main "temperature"
-		details(["temperature", "upButtonControl", "thermostatSetpoint", "currentStatus", "downButtonControl", "mode", "resumeProgram", "refresh"])
+        details(["temperature", "upButtonControl", "thermostatSetpoint", "currentStatus", "downButtonControl", "mode", "resumeProgram", "refresh"])
-	}
-
-	preferences {
-		input "holdType", "enum", title: "Hold Type", description: "When changing temperature, use Temporary or Permanent hold (default)", required: false, options:["Temporary", "Permanent"]
 	}
 
 }
 
+/*
+    
+    preferences {
+		input "highTemperature", "number", title: "Auto Mode High Temperature:", defaultValue: 80
+		input "lowTemperature", "number", title: "Auto Mode Low Temperature:", defaultValue: 70
+        input name: "holdType", type: "enum", title: "Hold Type", description: "When changing temperature, use Temporary or Permanent hold", required: true, options:["Temporary", "Permanent"]
+  	}
+    
+*/
+
+
 // parse events into attributes
 def parse(String description) {
 	log.debug "Parsing '${description}'"
@@ -111,176 +117,192 @@ def parse(String description) {
  
 }
 
-def refresh() {
+def refresh()
-	log.debug "refresh called"
+{
-	poll()
+  log.debug "refresh called"
-	log.debug "refresh ended"
+  poll()
+  log.debug "refresh ended"
+}
+ 
+def go()
+{
+  log.debug "before:go tile tapped"
+  poll()
+  log.debug "after"
 }
  
 void poll() {
 	log.debug "Executing 'poll' using parent SmartApp"
 	
 	def results = parent.pollChild(this)
-	generateEvent(results) //parse received message from parent
+	parseEventData(results)
+	generateStatusEvent()
 }
  
-def generateEvent(Map results) {
+def parseEventData(Map results)
+{
 	log.debug "parsing data $results"
-	if(results) {
+	if(results)
+	{
 		results.each { name, value -> 
  
 			def linkText = getLinkText(device)
-			def isChange = false
+            def isChange = false
-			def isDisplayed = true
+            def isDisplayed = true
-			def event = [name: name, linkText: linkText, descriptionText: getThermostatDescriptionText(name, value, linkText),
-			handlerName: name]
             
-			if (name=="temperature" || name=="heatingSetpoint" || name=="coolingSetpoint") {
+            if (name=="temperature" || name=="heatingSetpoint" || name=="coolingSetpoint") {
-				def sendValue = value? convertTemperatureIfNeeded(value.toDouble(), "F", 1): value //API return temperature value in F
 				isChange = isTemperatureStateChange(device, name, value.toString())
-				isDisplayed = isChange
+                isDisplayed = isChange
-				event << [value: sendValue, isStateChange: isChange, displayed: isDisplayed]
+                   
-			} else if (name=="heatMode" || name=="coolMode" || name=="autoMode" || name=="auxHeatMode"){
+				sendEvent(
-				isChange = isStateChange(device, name, value.toString())
+					name: name,
-				event << [value: value.toString(), isStateChange: isChange, displayed: false]
+					value: value,
-			}  else {
+					unit: "F",
-				isChange = isStateChange(device, name, value.toString())
+					linkText: linkText,
-				isDisplayed = isChange
+					descriptionText: getThermostatDescriptionText(name, value, linkText),
-				event << [value: value.toString(), isStateChange: isChange, displayed: isDisplayed]
+					handlerName: name,
-			}
+					isStateChange: isChange,
-			sendEvent(event)
+					displayed: isDisplayed)
+                    
+            }
+            else {
+            	isChange = isStateChange(device, name, value.toString())
+                isDisplayed = isChange
+                
+                sendEvent(
+					name: name,
+					value: value.toString(),
+					linkText: linkText,
+					descriptionText: getThermostatDescriptionText(name, value, linkText),
+					handlerName: name,
+					isStateChange: isChange,
+					displayed: isDisplayed)
+                    
+            }
 		}                                   									
 		generateSetpointEvent ()  
-		generateStatusEvent ()
+        generateStatusEvent ()
 	}
 }
 
-//return descriptionText to be shown on mobile activity feed
+void generateEvent(Map results)
-private getThermostatDescriptionText(name, value, linkText) {
+{
-	if(name == "temperature") {
+	log.debug "parsing data $results"
-		return "$linkText temperature is $value°F"
+	if(results)
+	{
+		results.each { name, value -> 
         
-	} else if(name == "heatingSetpoint") {
+ 			def linkText = getLinkText(device)
-		return "heating setpoint is $value°F"
+            def isChange = false
+            def isDisplayed = true
             
-	} else if(name == "coolingSetpoint"){
+            if (name=="temperature" || name=="heatingSetpoint" || name=="coolingSetpoint") {
-		return "cooling setpoint is $value°F"
+				isChange = isTemperatureStateChange(device, name, value.toString())
+                isDisplayed = isChange
                    
-	} else if (name == "thermostatMode") {
+				sendEvent(
-		return "thermostat mode is ${value}"
+					name: name,
+					value: value,
+					unit: "F",
+					linkText: linkText,
+					descriptionText: getThermostatDescriptionText(name, value, linkText),
+					handlerName: name,
+					isStateChange: isChange,
+					displayed: isDisplayed)                                    									 
+            }
+            else {
+            	isChange = isStateChange(device, name, value.toString())
+                isDisplayed = isChange
                 
-	} else if (name == "thermostatFanMode") {
+                sendEvent(
-		return "thermostat fan mode is ${value}"
+					name: name,
+					value: value.toString(),
+					linkText: linkText,
+					descriptionText: getThermostatDescriptionText(name, value, linkText),
+					handlerName: name,
+					isStateChange: isChange,
+					displayed: isDisplayed)
                     
-	} else {
+            }
-		return "${name} = ${value}"
+		}
+		generateSetpointEvent () 
+        generateStatusEvent()
 	}
 }
  
-void setHeatingSetpoint(setpoint) {
+private getThermostatDescriptionText(name, value, linkText)
-	setHeatingSetpoint(setpoint.toDouble())
+{
+	if(name == "temperature")
+	{
+		return "$linkText was $value°F"
+	}
+	else if(name == "heatingSetpoint")
+	{
+		return "latest heating setpoint was $value°F"
+	}
+	else if(name == "coolingSetpoint")
+	{
+		return "latest cooling setpoint was $value°F"
+	}
+    else if (name == "thermostatMode")
+    {
+        return "thermostat mode is ${value}"
+    }
+    else
+    {
+        return "${name} = ${value}"
+    }
 }
 
-void setHeatingSetpoint(Double setpoint) {
-//    def mode = device.currentValue("thermostatMode")
-	def heatingSetpoint = setpoint
-	def coolingSetpoint = device.currentValue("coolingSetpoint").toDouble()
-	def deviceId = device.deviceNetworkId.split(/\./).last()
 
-	//enforce limits of heatingSetpoint
+void setHeatingSetpoint(degreesF) {
-	if (heatingSetpoint > 79) {
+	setHeatingSetpoint(degreesF.toDouble())
-		heatingSetpoint = 79
-	} else if (heatingSetpoint < 45) {
-		heatingSetpoint = 45
-	}
-
-	//enforce limits of heatingSetpoint vs coolingSetpoint
-	if (heatingSetpoint >= coolingSetpoint) {
-		coolingSetpoint = heatingSetpoint
-	}
-
-	log.debug "Sending setHeatingSetpoint> coolingSetpoint: ${coolingSetpoint}, heatingSetpoint: ${heatingSetpoint}"
-
-	def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
-	if (parent.setHold (this, heatingSetpoint,  coolingSetpoint, deviceId, sendHoldType)) {
-		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint)
-		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint)
-		log.debug "Done setHeatingSetpoint> coolingSetpoint: ${coolingSetpoint}, heatingSetpoint: ${heatingSetpoint}"
-		generateSetpointEvent()
-		generateStatusEvent()
-	} else {
-		log.error "Error setHeatingSetpoint(setpoint)" //This error is handled by the connect app
-	}
 }
 
-void setCoolingSetpoint(setpoint) {
+void setHeatingSetpoint(Double degreesF) {
-	setCoolingSetpoint(setpoint.toDouble())
+	log.debug "setHeatingSetpoint({$degreesF})"
+	sendEvent("name":"heatingSetpoint", "value":degreesF)
+	Double coolingSetpoint = device.currentValue("coolingSetpoint")
+	log.debug "coolingSetpoint: $coolingSetpoint"
+	parent.setHold(this, degreesF, coolingSetpoint)
 }
 
-void setCoolingSetpoint(Double setpoint) {
+void setCoolingSetpoint(degreesF) {
-//    def mode = device.currentValue("thermostatMode")
+	setCoolingSetpoint(degreesF.toDouble())
-	def heatingSetpoint = device.currentValue("heatingSetpoint").toDouble()
-	def coolingSetpoint = setpoint
-	def deviceId = device.deviceNetworkId.split(/\./).last()
-
-	if (coolingSetpoint > 92) {
-		coolingSetpoint = 92
-	} else if (coolingSetpoint < 65) {
-		coolingSetpoint = 65
-	}
-
-	//enforce limits of heatingSetpoint vs coolingSetpoint
-	if (heatingSetpoint >= coolingSetpoint) {
-		heatingSetpoint = coolingSetpoint
-	}
-
-	log.debug "Sending setCoolingSetpoint> coolingSetpoint: ${coolingSetpoint}, heatingSetpoint: ${heatingSetpoint}"
-
-	def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
-	if (parent.setHold (this, heatingSetpoint,  coolingSetpoint, deviceId, sendHoldType)) {
-		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint)
-		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint)
-		log.debug "Done setCoolingSetpoint>> coolingSetpoint = ${coolingSetpoint}, heatingSetpoint = ${heatingSetpoint}"
-		generateSetpointEvent()
-		generateStatusEvent()
-	} else {
-		log.error "Error setCoolingSetpoint(setpoint)" //This error is handled by the connect app
-	}
 }
 
-void resumeProgram() {
+void setCoolingSetpoint(Double degreesF) {
+	log.debug "setCoolingSetpoint({$degreesF})"
+	sendEvent("name":"coolingSetpoint", "value":degreesF)
+	Double heatingSetpoint = device.currentValue("heatingSetpoint")
+	parent.setHold(this, heatingSetpoint, degreesF)
+}
 
-	log.debug "resumeProgram() is called"
+def configure() {
-	sendEvent("name":"thermostatStatus", "value":"resuming schedule", "description":statusText, displayed: false)
-	def deviceId = device.deviceNetworkId.split(/\./).last()
-	if (parent.resumeProgram(this, deviceId)) {
-		sendEvent("name":"thermostatStatus", "value":"setpoint is updating", "description":statusText, displayed: false)
-		runIn(5, "poll")
-		log.debug "resumeProgram() is done"
-		sendEvent("name":"resumeProgram", "value":"resume", descriptionText: "resumeProgram is done", displayed: false, isStateChange: true)
-	} else {
-		sendEvent("name":"thermostatStatus", "value":"failed resume click refresh", "description":statusText, displayed: false)
-		log.error "Error resumeProgram() check parent.resumeProgram(this, deviceId)"
-	}
 	
 }
 
+def resumeProgram() {
+	parent.resumeProgram(this)
+}
+
 def modes() {
 	if (state.modes) {
-		log.debug "Modes = ${state.modes}"
+        log.debug "Modes = ${state.modes}"
-		return state.modes
+    	return state.modes
-	}
+    }
-	else {
+    else {
-		state.modes = parent.availableModes(this)
+    	state.modes = parent.availableModes(this)
-		log.debug "Modes = ${state.modes}"
+        log.debug "Modes = ${state.modes}"        
-		return state.modes
+        return state.modes
-	}
+    }
 }
 
 def fanModes() {
 	["off", "on", "auto", "circulate"]
 }
 
+
 def switchMode() {
 	log.debug "in switchMode"
 	def currentMode = device.currentState("thermostatMode")?.value
@@ -292,7 +314,7 @@ def switchMode() {
 }
 
 def switchToMode(nextMode) {
-	log.debug "In switchToMode = ${nextMode}"
+    log.debug "In switchToMode = ${nextMode}"
 	if (nextMode in modes()) {
 		state.lastTriedMode = nextMode
 		"$nextMode"()
@@ -364,316 +386,290 @@ def setThermostatFanMode(String value) {
 }
 
 def generateModeEvent(mode) {
-	sendEvent(name: "thermostatMode", value: mode, descriptionText: "$device.displayName is in ${mode} mode", displayed: true)
+
+   sendEvent(name: "thermostatMode", value: mode, descriptionText: "$device.displayName is in ${mode} mode", displayed: true, isStateChange: true)
+
 }
 
 def generateFanModeEvent(fanMode) {
-	sendEvent(name: "thermostatFanMode", value: fanMode, descriptionText: "$device.displayName fan is in ${mode} mode", displayed: true)
+
+   sendEvent(name: "thermostatFanMode", value: fanMode, descriptionText: "$device.displayName fan is in ${mode} mode", displayed: true, isStateChange: true)
+
 }
 
 def generateOperatingStateEvent(operatingState) {
-	sendEvent(name: "thermostatOperatingState", value: operatingState, descriptionText: "$device.displayName is ${operatingState}", displayed: true)
+
+   sendEvent(name: "thermostatOperatingState", value: operatingState, descriptionText: "$device.displayName is ${operatingState}", displayed: true, isStateChange: true)
+
 }
 
 def off() {
 	log.debug "off"
-	def deviceId = device.deviceNetworkId.split(/\./).last()
+	generateModeEvent("off")     
-	if (parent.setMode (this,"off", deviceId))
+    if (parent.setMode (this,"off"))
-		generateModeEvent("off")
+        generateModeEvent("off")
-	else {
+    else {
-		log.debug "Error setting new mode."
+       	log.debug "Error setting new mode." 
-		def currentMode = device.currentState("thermostatMode")?.value
+    	def currentMode = device.currentState("thermostatMode")?.value
-		generateModeEvent(currentMode) // reset the tile back
+        generateModeEvent(currentMode) // reset the tile back
-	}
+    }
-	generateSetpointEvent()
+    generateSetpointEvent()
-	generateStatusEvent()
+    generateStatusEvent()   
+	
 }
 
 def heat() {
 	log.debug "heat"
-	def deviceId = device.deviceNetworkId.split(/\./).last()
+	generateModeEvent("heat")    
-	if (parent.setMode (this,"heat", deviceId))
+    if (parent.setMode (this,"heat"))
-		generateModeEvent("heat")
+        generateModeEvent("heat")
-	else {
+    else {
-		log.debug "Error setting new mode."
+       	log.debug "Error setting new mode." 
-		def currentMode = device.currentState("thermostatMode")?.value
+    	def currentMode = device.currentState("thermostatMode")?.value
-		generateModeEvent(currentMode) // reset the tile back
+        generateModeEvent(currentMode) // reset the tile back
-	}
+    }
-	generateSetpointEvent()
+    generateSetpointEvent()    
-	generateStatusEvent()
+    generateStatusEvent()   
 }
 
 def auxHeatOnly() {
 	log.debug "auxHeatOnly"
-	def deviceId = device.deviceNetworkId.split(/\./).last()
+    generateModeEvent("auxHeatOnly")    
-	if (parent.setMode (this,"auxHeatOnly", deviceId))
+    if (parent.setMode (this,"auxHeatOnly"))
-		generateModeEvent("auxHeatOnly")
+        generateModeEvent("auxHeatOnly")
-	else {
+    else {
-		log.debug "Error setting new mode."
+       	log.debug "Error setting new mode." 
-		def currentMode = device.currentState("thermostatMode")?.value
+    	def currentMode = device.currentState("thermostatMode")?.value
-		generateModeEvent(currentMode) // reset the tile back
+        generateModeEvent(currentMode) // reset the tile back
-	}
+    }
-	generateSetpointEvent()
+    generateSetpointEvent()    
-	generateStatusEvent()
+    generateStatusEvent()  
 }
 
 def cool() {
 	log.debug "cool"
-	def deviceId = device.deviceNetworkId.split(/\./).last()
+    generateModeEvent("cool")
-	if (parent.setMode (this,"cool", deviceId))
+    if (parent.setMode (this,"cool"))
-		generateModeEvent("cool")
+        generateModeEvent("cool")
-	else {
+    else {
-		log.debug "Error setting new mode."
+       	log.debug "Error setting new mode." 
-		def currentMode = device.currentState("thermostatMode")?.value
+    	def currentMode = device.currentState("thermostatMode")?.value
-		generateModeEvent(currentMode) // reset the tile back
+        generateModeEvent(currentMode) // reset the tile back
-	}
+    }
-	generateSetpointEvent()
+    generateSetpointEvent()    
-	generateStatusEvent()
+    generateStatusEvent()   
 }
 
 def auto() {
 	log.debug "auto"
-	def deviceId = device.deviceNetworkId.split(/\./).last()
+    generateModeEvent("auto")
-	if (parent.setMode (this,"auto", deviceId))
+    if (parent.setMode (this,"auto"))
-		generateModeEvent("auto")
+        generateModeEvent("auto")
-	else {
+    else {
-		log.debug "Error setting new mode."
+       	log.debug "Error setting new mode." 
-		def currentMode = device.currentState("thermostatMode")?.value
+    	def currentMode = device.currentState("thermostatMode")?.value
-		generateModeEvent(currentMode) // reset the tile back
+        generateModeEvent(currentMode) // reset the tile back
-	}
+    }
-	generateSetpointEvent()
+    generateSetpointEvent()    
-	generateStatusEvent()
+    generateStatusEvent()  
 }
 
 def fanOn() {
 	log.debug "fanOn"
-//    parent.setFanMode (this,"on")
+    parent.setFanMode (this,"on")
 	
 }
 
 def fanAuto() {
 	log.debug "fanAuto"
-//    parent.setFanMode (this,"auto")
+   	parent.setFanMode (this,"auto")    
 	
 }
 
 def fanCirculate() {
 	log.debug "fanCirculate"
-//    parent.setFanMode (this,"circulate")
+    parent.setFanMode (this,"circulate")
 	
 }
 
 def fanOff() {
 	log.debug "fanOff"
-//    parent.setFanMode (this,"off")
+    parent.setFanMode (this,"off")
 	
 }
 
 def generateSetpointEvent() {
 
-	log.debug "Generate SetPoint Event"
+   	log.debug "Generate SetPoint Event"
 
 	def mode = device.currentValue("thermostatMode")
-	log.debug "Current Mode = ${mode}"
+    log.debug "Current Mode = ${mode}" 
 
-	def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
+    def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
-	log.debug "Heating Setpoint = ${heatingSetpoint}"
+    log.debug "Heating Setpoint = ${heatingSetpoint}"
 
 	def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
-	log.debug "Cooling Setpoint = ${coolingSetpoint}"
+    log.debug "Cooling Setpoint = ${coolingSetpoint}"
     
-	if (mode == "heat") {
+    if (mode == "heat") {
         
-		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint.toString())
+        sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint.toString()+"°")                       
         
-	}
+    }
-	else if (mode == "cool") {
+    else if (mode == "cool") {
         
-		sendEvent("name":"thermostatSetpoint", "value":coolingSetpoint.toString())
+        sendEvent("name":"thermostatSetpoint", "value":coolingSetpoint.toString()+"°")     
 
-	} else if (mode == "auto") {
+    } else if (mode == "auto") {
         
-		sendEvent("name":"thermostatSetpoint", "value":"Auto")
+        sendEvent("name":"thermostatSetpoint", "value":"Auto")
 
-	} else if (mode == "off") {
+    } else if (mode == "off") {
             
-		sendEvent("name":"thermostatSetpoint", "value":"Off")
+        sendEvent("name":"thermostatSetpoint", "value":"Off")    
 
-	} else if (mode == "emergencyHeat") {
+    } else if (mode == "emergencyHeat") {
         
-		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint.toString())
+        sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint.toString()+"°")           
 
-	}
+    }
 
 }
 
 void raiseSetpoint() {
+
+   	log.debug "Raise SetPoint"
+    
 	def mode = device.currentValue("thermostatMode")
-	def targetvalue
+    def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
+    def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
     
-	if (mode == "off" || mode == "auto") {
+    log.debug "Current Mode = ${mode}"
-		log.warn "this mode: $mode does not allow raiseSetpoint"
-	} else {
-		def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
-		def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
-		def thermostatSetpoint = device.currentValue("thermostatSetpoint").toInteger()
-		log.debug "raiseSetpoint() mode = ${mode}, heatingSetpoint: ${heatingSetpoint}, coolingSetpoint:${coolingSetpoint}, thermostatSetpoint:${thermostatSetpoint}"
     
-		if (device.latestState('thermostatSetpoint')) {
+    if (mode == "heat") {
-			targetvalue = device.latestState('thermostatSetpoint').value as Integer
-		} else {
-			targetvalue = 0
-		}
-		targetvalue = targetvalue + 1
         
-		if (mode == "heat" && targetvalue > 79) {
+        heatingSetpoint++
-			targetvalue = 79
-		} else if (mode == "cool" && targetvalue > 92) {
-			targetvalue = 92
-		}
         
-		sendEvent("name":"thermostatSetpoint", "value":targetvalue, displayed: false)
+        if (heatingSetpoint > 99)
-		log.info "In mode $mode raiseSetpoint() to $targetvalue"
+           heatingSetpoint = 99
+        
+        sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint.toString()+"°")        
+        sendEvent("name":"heatingSetpoint", "value":heatingSetpoint)               
+        
+        parent.setHold (this, heatingSetpoint, coolingSetpoint)
+        
+        log.debug "New Heating Setpoint = ${heatingSetpoint}"
+        
+    }
+    else if (mode == "cool") {
+                
+        coolingSetpoint++
+        
+        if (coolingSetpoint > 99)
+            coolingSetpoint = 99
+        
+        sendEvent("name":"thermostatSetpoint", "value":coolingSetpoint.toString()+"°")
+        sendEvent("name":"coolingSetpoint", "value":coolingSetpoint)       
+        
+        parent.setHold (this, heatingSetpoint, coolingSetpoint)
+        
+        log.debug "New Cooling Setpoint = ${coolingSetpoint}"        
+        
+    }
+    generateStatusEvent()
 
-		runIn(3, "alterSetpoint", [data: [value:targetvalue], overwrite: true]) //when user click button this runIn will be overwrite
-	}
 }
 
-//called by tile when user hit raise temperature button on UI
+
 void lowerSetpoint() {
-	def mode = device.currentValue("thermostatMode")
+   	log.debug "Lower SetPoint"
-	def targetvalue
-
-	if (mode == "off" || mode == "auto") {
-		log.warn "this mode: $mode does not allow lowerSetpoint"
-	} else {
-		def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
-		def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
-		def thermostatSetpoint = device.currentValue("thermostatSetpoint").toInteger()
-		log.debug "lowerSetpoint() mode = ${mode}, heatingSetpoint: ${heatingSetpoint}, coolingSetpoint:${coolingSetpoint}, thermostatSetpoint:${thermostatSetpoint}"
-		if (device.latestState('thermostatSetpoint')) {
-			targetvalue = device.latestState('thermostatSetpoint').value as Integer
-		} else {
-			targetvalue = 0
-		}
-		targetvalue = targetvalue - 1
-
-		if (mode == "heat" && targetvalue.toInteger() < 45) {
-			targetvalue = 45
-		} else if (mode == "cool" && targetvalue.toInteger() < 65) {
-			targetvalue = 65
-		}
-
-		sendEvent("name":"thermostatSetpoint", "value":targetvalue, displayed: false)
-		log.info "In mode $mode lowerSetpoint() to $targetvalue"
-
-		runIn(3, "alterSetpoint", [data: [value:targetvalue], overwrite: true]) //when user click button this runIn will be overwrite
-	}
-}
-
-//called by raiseSetpoint() and lowerSetpoint()
-void alterSetpoint(temp) {
     
 	def mode = device.currentValue("thermostatMode")
-	def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
+    def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
-	def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
+    def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
-	def deviceId = device.deviceNetworkId.split(/\./).last()
     
-	def targetHeatingSetpoint
+    log.debug "Current Mode = ${mode}, Current Heating Setpoint = ${heatingSetpoint}, Current Cooling Setpoint = ${coolingSetpoint}"
-	def targetCoolingSetpoint
     
-	//step1: check thermostatMode, enforce limits before sending request to cloud
+    if (mode == "heat" || mode == "emergencyHeat") {
-	if (mode == "heat"){
-		if (temp.value > coolingSetpoint){
-			targetHeatingSetpoint = temp.value
-			targetCoolingSetpoint = temp.value
-		} else {
-			targetHeatingSetpoint = temp.value
-			targetCoolingSetpoint = coolingSetpoint
-		}
-	} else if (mode == "cool") {
-		//enforce limits before sending request to cloud
-		if (temp.value < heatingSetpoint){
-			targetHeatingSetpoint = temp.value
-			targetCoolingSetpoint = temp.value
-		} else {
-			targetHeatingSetpoint = heatingSetpoint
-			targetCoolingSetpoint = temp.value
-		}
-	}
         
-	log.debug "alterSetpoint >> in mode ${mode} trying to change heatingSetpoint to ${targetHeatingSetpoint} " +
+        heatingSetpoint--  
-			"coolingSetpoint to ${targetCoolingSetpoint} with holdType : ${holdType}"
         
-	def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
+        if (heatingSetpoint < 32)
-	//step2: call parent.setHold to send http request to 3rd party cloud
+           heatingSetpoint = 32
-	if (parent.setHold(this, targetHeatingSetpoint, targetCoolingSetpoint, deviceId, sendHoldType)) {
+
-		sendEvent("name": "thermostatSetpoint", "value": temp.value.toString(), displayed: false)
+        sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint.toString()+"°")        
-		sendEvent("name": "heatingSetpoint", "value": targetHeatingSetpoint)
+        sendEvent("name":"heatingSetpoint", "value":heatingSetpoint)
-		sendEvent("name": "coolingSetpoint", "value": targetCoolingSetpoint)
+        
-		log.debug "alterSetpoint in mode $mode succeed change setpoint to= ${temp.value}"
+        parent.setHold (this, heatingSetpoint, coolingSetpoint)
-	} else {
+        
-		log.error "Error alterSetpoint()"
+        log.debug "New Heating Setpoint = ${heatingSetpoint}"
-		if (mode == "heat"){
+        
-			sendEvent("name": "thermostatSetpoint", "value": heatingSetpoint.toString(), displayed: false)
+    }
-		} else if (mode == "cool") {
+    else if (mode == "cool") {
-			sendEvent("name": "thermostatSetpoint", "value": coolingSetpoint.toString(), displayed: false)
+                
-		}
+        coolingSetpoint--
-	}
+        
-	generateStatusEvent()
+        if (coolingSetpoint < 32)
+           coolingSetpoint = 32
+        
+        sendEvent("name":"thermostatSetpoint", "value":coolingSetpoint.toString()+"°")
+        sendEvent("name":"coolingSetpoint", "value":coolingSetpoint) 
+        
+        parent.setHold (this, heatingSetpoint, coolingSetpoint)
+        
+        log.debug "New Cooling Setpoint = ${coolingSetpoint}"
+        
+    }
+    generateStatusEvent()
 }
 
 def generateStatusEvent() {
 
 	def mode = device.currentValue("thermostatMode")
-	def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
+    def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
-	def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
+    def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()   
-	def temperature = device.currentValue("temperature").toInteger()
+    def temperature = device.currentValue("temperature").toInteger()  
     
-	def statusText
+    def statusText
     
-	log.debug "Generate Status Event for Mode = ${mode}"
+    log.debug "Generate Status Event for Mode = ${mode}"
-	log.debug "Temperature = ${temperature}"
+    log.debug "Temperature = ${temperature}"
-	log.debug "Heating set point = ${heatingSetpoint}"
+    log.debug "Heating set point = ${heatingSetpoint}"
-	log.debug "Cooling set point = ${coolingSetpoint}"
+    log.debug "Cooling set point = ${coolingSetpoint}"
-	log.debug "HVAC Mode = ${mode}"
+    log.debug "HVAC Mode = ${mode}"
     
-	if (mode == "heat") {
+    if (mode == "heat") {
     
-		if (temperature >= heatingSetpoint)
+    	if (temperature >= heatingSetpoint)
-			statusText = "Right Now: Idle"
+        	statusText = "Right Now: Idle"
-		else
+        else
-			statusText = "Heating to ${heatingSetpoint}° F"
+    		statusText = "Heating to ${heatingSetpoint}° F"
         
-	} else if (mode == "cool") {
+    } else if (mode == "cool") {
     
-		if (temperature <= coolingSetpoint)
+        if (temperature <= coolingSetpoint)
-			statusText = "Right Now: Idle"
+        	statusText = "Right Now: Idle"
-		else
+        else
-			statusText = "Cooling to ${coolingSetpoint}° F"
+    		statusText = "Cooling to ${coolingSetpoint}° F"
         
-	} else if (mode == "auto") {
+    } else if (mode == "auto") {
         
-		statusText = "Right Now: Auto"
+    	statusText = "Right Now: Auto"
         
-	} else if (mode == "off") {
+    } else if (mode == "off") {
     
-		statusText = "Right Now: Off"
+    	statusText = "Right Now: Off"
         
-	} else if (mode == "emergencyHeat") {
+    } else if (mode == "emergencyHeat") {
     
-		statusText = "Emergency Heat"
+    	statusText = "Emergency Heat"
         
-	} else {
+    } else {
     
-		statusText = "?"
+        statusText = "?"
         
-	}
+    }
-	log.debug "Generate Status Event = ${statusText}"
+    log.debug "Generate Status Event = ${statusText}"
-	sendEvent("name":"thermostatStatus", "value":statusText, "description":statusText, displayed: true)
+    sendEvent("name":"thermostatStatus", "value":statusText, "description":statusText, displayed: true, isStateChange: true)
 }
 
-//generate custom mobile activity feeds event
-def generateActivityFeedsEvent(notificationMessage) {
-	sendEvent(name: "notificationMessage", value: "$device.displayName $notificationMessage", descriptionText: "$device.displayName $notificationMessage", displayed: true)
-}

devicetypes/smartthings/harmony-activity.src/harmony-activity.groovy

@@ -14,7 +14,7 @@
  *
  */
 metadata {
-        definition (name: "Harmony Activity", namespace: "smartthings", author: "Juan Risso") {
+        definition (name: "Logitech Harmony Activity", namespace: "smartthings", author: "Juan Risso") {
         capability "Switch"
         capability "Actuator"
 		capability "Refresh"

devicetypes/smartthings/smartsense-garage-door-multi.src/smartsense-garage-door-multi.groovy

@@ -79,8 +79,8 @@ metadata {
 	}
     
 	preferences {
-		input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+		input description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}    
 }
 

devicetypes/smartthings/smartsense-garage-door-sensor-button.src/smartsense-garage-door-sensor-button.groovy

@@ -88,8 +88,8 @@ metadata {
 	}
 
 	preferences {
-		input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+		input description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}
 }
 

devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy

@@ -43,8 +43,8 @@ metadata {
 				])
 		}
 		section {
-			input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+			input description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
-			input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+			input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 		}
 	}
  

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

@@ -45,8 +45,8 @@ metadata {
 				])
 		}
 		section {
-			input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+			input description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
-			input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+			input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 		}
 	}
 

devicetypes/smartthings/smartsense-motion-temp-sensor.src/smartsense-motion-temp-sensor.groovy

@@ -37,8 +37,8 @@ metadata {
 	}
 
 	preferences {
-		input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+		input description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}
 
 	tiles(scale: 2) {

devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy

@@ -61,8 +61,8 @@
 				])
 		}
 		section {
- 			input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+ 			input description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
- 			input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+ 			input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
  		}
 		section {
  			input("garageSensor", "enum", title: "Do you want to use this sensor on a garage door?", options: ["Yes", "No"], defaultValue: "No", required: false, displayDuringSetup: false)
@@ -115,30 +115,31 @@
 	}
  }
 
-def parse(String description) {
+ def parse(String description) {
-	Map map = [:]
+ 	
-	if (description?.startsWith('catchall:')) {
+ 	Map map = [:]
-		map = parseCatchAllMessage(description)
+ 	if (description?.startsWith('catchall:')) {
-	}
+ 		map = parseCatchAllMessage(description)
+ 	}
+ 	else if (description?.startsWith('read attr -')) {
+ 		map = parseReportAttributeMessage(description)
+ 	}
     else if (description?.startsWith('temperature: ')) {
-		map = parseCustomMessage(description)
+ 		map = parseCustomMessage(description)
-	}
+ 	}
-	else if (description?.startsWith('zone status')) {
+ 	else if (description?.startsWith('zone status')) {
-		map = parseIasMessage(description)
+ 		map = parseIasMessage(description)
-	}
+ 	}
 
  	def result = map ? createEvent(map) : null
 
-	if (description?.startsWith('enroll request')) {
+ 	if (description?.startsWith('enroll request')) {
-		List cmds = enrollResponse()
+ 		List cmds = enrollResponse()
-		log.debug "enroll response: ${cmds}"
+ 		log.debug "enroll response: ${cmds}"
-		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
+ 		result = cmds?.collect { new physicalgraph.device.HubAction(it) }
-	}
+ 	}
-    else if (description?.startsWith('read attr -')) {
+ 	return result
-        result = parseReportAttributeMessage(description).each { createEvent(it) }
+ }
-    }
-	return result
-}
 
  private Map parseCatchAllMessage(String description) {
  	Map resultMap = [:]
@@ -177,40 +178,28 @@ private boolean shouldProcessMessage(cluster) {
     return !ignoredMessage
 }
 
-private List parseReportAttributeMessage(String description) {
+private Map parseReportAttributeMessage(String description) {
 	Map descMap = (description - "read attr - ").split(",").inject([:]) { map, param ->
 		def nameAndValue = param.split(":")
 		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
 	}
     
-	List result = []
+    Map resultMap = [:]
 	if (descMap.cluster == "0402" && descMap.attrId == "0000") {
 		def value = getTemperature(descMap.value)
-		result << getTemperatureResult(value)
+		resultMap = getTemperatureResult(value)
 	}
 	else if (descMap.cluster == "FC02" && descMap.attrId == "0010") {
-		if (descMap.value.size() == 32) {
+  		resultMap = getAccelerationResult(descMap.value)
-			// value will look like 00ae29001403e2290013001629001201
-			// breaking this apart and swapping byte order where appropriate, this breaks down to:
-			//   X (0x0012) = 0x0016
-			//   Y (0x0013) = 0x03E2
-			//   Z (0x0014) = 0x00AE
-			// note that there is a known bug in that the x,y,z attributes are interpreted in the wrong order
-			// this will be fixed in a future update
-			def threeAxisAttributes = descMap.value[0..-9]
-			result << parseAxis(threeAxisAttributes)
-			descMap.value = descMap.value[-2..-1]
-		}
-        result << getAccelerationResult(descMap.value)
 	}
-	else if (descMap.cluster == "FC02" && descMap.attrId == "0012") {
+    else if (descMap.cluster == "FC02" && descMap.attrId == "0012") {
-        result << parseAxis(descMap.value)
+  		resultMap = parseAxis(descMap.value)
 	}
 	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
-		result << getBatteryResult(Integer.parseInt(descMap.value, 16))
+		resultMap = getBatteryResult(Integer.parseInt(descMap.value, 16))
 	}
 
-	return result
+	return resultMap
 }
 
 private Map parseCustomMessage(String description) {

devicetypes/smartthings/smartsense-multi.src/smartsense-multi.groovy

@@ -43,8 +43,8 @@ metadata {
 	}
 
 	preferences {
-		input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+		input description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}
 
 	tiles(scale: 2) {

devicetypes/smartthings/smartsense-open-closed-accelerometer-sensor.src/smartsense-open-closed-accelerometer-sensor.groovy

@@ -32,8 +32,8 @@
  	}
 
  	preferences {
- 		input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+ 		input description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
- 		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+ 		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
  	}
 
 	tiles(scale: 2) {

devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy

@@ -34,8 +34,8 @@ metadata {
 	}
 
 	preferences {
-		input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+		input description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}
  
 	tiles(scale: 2) {

devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy

@@ -33,8 +33,8 @@ metadata {
 	}
 
 	preferences {
-		input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+		input description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}
 
 	tiles(scale: 2) {

devicetypes/smartthings/smartsense-virtual-open-closed.src/smartsense-virtual-open-closed.groovy

@@ -45,8 +45,8 @@ metadata {
 	}
     
 	preferences {
-		input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+		input description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}    
 
 	tiles {

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

@@ -33,8 +33,8 @@ metadata {
 	}
 
 	preferences {
-		input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+		input description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
-		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}
  
 	tiles {

devicetypes/smartthings/wattvision.src/wattvision.groovy

@@ -33,14 +33,14 @@ metadata {
 			state "power", label: '${currentValue} W'
 		}
 
-		htmlTile(name: "powerContent", attribute: "powerContent", type: "HTML", whitelist: "www.wattvision.com" , url: '${currentValue}', width: 3, height: 2)
+		tile(name: "powerChart", attribute: "powerContent", type: "HTML", url: '${currentValue}', width: 3, height: 2) { }
 
 		standardTile("refresh", "device.power", inactiveLabel: false, decoration: "flat") {
 			state "default", label: '', action: "refresh.refresh", icon: "st.secondary.refresh"
 		}
 
 		main "power"
-		details(["powerContent", "power", "refresh"])
+		details(["powerChart", "power", "refresh"])
 
 	}
 }
@@ -74,10 +74,10 @@ public addWattvisionData(json) {
 
 	log.trace "Adding data from Wattvision"
 
-	def data = parseJson(json.data.toString())
+	def data = json.data
 	def units = json.units ?: "watts"
 
-	if (data.size() > 0) {
+	if (data) {
 		def latestData = data[-1]
 		data.each {
 			sendPowerEvent(it.t, it.v, units, (latestData == it))
@@ -103,7 +103,3 @@ private sendPowerEvent(time, value, units, isLatest = false) {
 	sendEvent(eventData)
 
 }
-
-def parseJson(String s) {
-	new groovy.json.JsonSlurper().parseText(s)
-}

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

@@ -25,8 +25,8 @@ metadata {
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0702"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0702, 0B05", outClusters: "0019", manufacturer: "sengled", model: "Z01-CIA19NAE26", deviceJoinName: "Sengled Element touch"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0702, 0B05", outClusters: "000A, 0019", manufacturer: "Jasco Products", model: "45852", deviceJoinName: "GE Zigbee Plug-In Dimmer"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0B05,0702", outClusters: "000A,0019", manufacturer: "Jasco Products", model: "45852", deviceJoinName: "GE Zigbee Plug-In Dimmer"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0702, 0B05", outClusters: "000A, 0019", manufacturer: "Jasco Products", model: "45857", deviceJoinName: "GE Zigbee In-Wall Dimmer"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0B05,0702", outClusters: "000A,0019", manufacturer: "Jasco Products", model: "45857", deviceJoinName: "GE Zigbee In-Wall Dimmer"
     }
 
     tiles(scale: 2) {

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

@@ -17,15 +17,15 @@ metadata {
         capability "Actuator"
         capability "Configuration"
         capability "Refresh"
+        capability "Sensor"
         capability "Switch"
         capability "Switch Level"
 
 
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 ON/OFF/DIM", deviceJoinName: "OSRAM LIGHTIFY LED Smart Connected Light"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FF00", outClusters: "0019", manufacturer: "MRVL", model: "MZ100", deviceJoinName: "Wemo Bulb"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,FF00", outClusters: "0019", manufacturer: "MRVL", model: "MZ100", deviceJoinName: "Wemo Bulb"
-        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,0B05", outClusters: "0019", manufacturer: "OSRAM SYLVANIA", model: "iQBR30", deviceJoinName: "Sylvania Ultra iQ"
-        fingerprint profileId: "0104", inClusters: "0001, 0006, 0008, 000E", outClusters: "0019", manufacturer: "Nanoleaf", model: "IvyBulbs", deviceJoinName: "Nanoleaf Smart Bulbs"
     }
 
     tiles(scale: 2) {

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

@@ -23,8 +23,8 @@ metadata {
 
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0B04"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702, 0B05", outClusters: "0003, 000A, 0019", manufacturer: "Jasco Products", model: "45853", deviceJoinName: "GE ZigBee Plug-In Switch"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B05,0702", outClusters: "0003, 000A,0019", manufacturer: "Jasco Products", model: "45853", deviceJoinName: "GE ZigBee Plug-In Switch"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0702, 0B05", outClusters: "000A, 0019", manufacturer: "Jasco Products", model: "45856", deviceJoinName: "GE ZigBee In-Wall Switch"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B05,0702", outClusters: "000A,0019", manufacturer: "Jasco Products", model: "45856", deviceJoinName: "GE ZigBee In-Wall Switch"
     }
 
     tiles(scale: 2) {

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

@@ -17,6 +17,7 @@ metadata {
         capability "Actuator"
         capability "Configuration"
         capability "Refresh"
+        capability "Sensor"
         capability "Switch"
 
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006"

devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy

@@ -23,18 +23,18 @@ metadata {
         capability "Color Temperature"
         capability "Configuration"
         capability "Refresh"
+        capability "Sensor"
         capability "Switch"
         capability "Switch Level"
 
         attribute "colorName", "string"
         command "setGenericName"
 
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300", outClusters: "0019"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04", outClusters: "0019"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04", outClusters: "0019"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Flood BR30 Tunable White"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Flood BR30 Tunable White"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Recessed Kit RT 5/6 Tunable White"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Recessed Kit RT 5/6 Tunable White"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 TW", deviceJoinName: "OSRAM LIGHTIFY LED Tunable White 60W"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 TW", deviceJoinName: "OSRAM LIGHTIFY LED Tunable White 60W"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Tunable White 60W"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Tunable White 60W"
     }
 
     // UI tile definitions

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

@@ -66,20 +66,9 @@ metadata {
 import physicalgraph.zwave.commands.doorlockv1.*
 import physicalgraph.zwave.commands.usercodev1.*
 
-def updated() {
-	try {
-		if (!state.init) {
-			state.init = true
-			response(secureSequence([zwave.doorLockV1.doorLockOperationGet(), zwave.batteryV1.batteryGet()]))
-		}
-	} catch (e) {
-		log.warn "updated() threw $e"
-	}
-}
-
 def parse(String description) {
 	def result = null
-	if (description.startsWith("Err 106")) {
+	if (description.startsWith("Err")) {
 		if (state.sec) {
 			result = createEvent(descriptionText:description, displayed:false)
 		} else {
@@ -91,8 +80,6 @@ def parse(String description) {
 				displayed: true,
 			)
 		}
-	} else if (description == "updated") {
-		return null
 	} else {
 		def cmd = zwave.parse(description, [ 0x98: 1, 0x72: 2, 0x85: 2, 0x86: 1 ])
 		if (cmd) {
@@ -299,7 +286,7 @@ def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd) {
 			}
 			break
 		case 167:
-			if (!state.lastbatt || now() - state.lastbatt > 12*60*60*1000) {
+			if (!state.lastbatt || (new Date().time) - state.lastbatt > 12*60*60*1000) {
 				map = [ descriptionText: "$device.displayName: battery low", isStateChange: true ]
 				result << response(secure(zwave.batteryV1.batteryGet()))
 			} else {
@@ -444,7 +431,7 @@ def zwaveEvent(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
 	} else {
 		map.value = cmd.batteryLevel
 	}
-	state.lastbatt = now()
+	state.lastbatt = new Date().time
 	createEvent(map)
 }
 
@@ -512,14 +499,15 @@ def refresh() {
 		cmds << "delay 4200"
 		cmds << zwave.associationV1.associationGet(groupingIdentifier:2).format()  // old Schlage locks use group 2 and don't secure the Association CC
 		cmds << secure(zwave.associationV1.associationGet(groupingIdentifier:1))
-		state.associationQuery = now()
+		state.associationQuery = new Date().time
-	} else if (secondsPast(state.associationQuery, 9)) {
+	} else if (new Date().time - state.associationQuery.toLong() > 9000) {
+		log.debug "setting association"
 		cmds << "delay 6000"
 		cmds << zwave.associationV1.associationSet(groupingIdentifier:2, nodeId:zwaveHubNodeId).format()
 		cmds << secure(zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:zwaveHubNodeId))
 		cmds << zwave.associationV1.associationGet(groupingIdentifier:2).format()
 		cmds << secure(zwave.associationV1.associationGet(groupingIdentifier:1))
-		state.associationQuery = now()
+		state.associationQuery = new Date().time
 	}
 	log.debug "refresh sending ${cmds.inspect()}"
 	cmds
@@ -527,22 +515,55 @@ def refresh() {
 
 def poll() {
 	def cmds = []
-	// Only check lock state if it changed recently or we haven't had an update in an hour
+	if (state.assoc != zwaveHubNodeId && secondsPast(state.associationQuery, 19 * 60)) {
-	def latest = device.currentState("lock")?.date?.time
+		log.debug "setting association"
-	if (!latest || !secondsPast(latest, 6 * 60) || secondsPast(state.lastPoll, 55 * 60)) {
+		cmds << zwave.associationV1.associationSet(groupingIdentifier:2, nodeId:zwaveHubNodeId).format()
-		cmds << secure(zwave.doorLockV1.doorLockOperationGet())
+		cmds << secure(zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:zwaveHubNodeId))
-		state.lastPoll = now()
+		cmds << zwave.associationV1.associationGet(groupingIdentifier:2).format()
-	} else if (!state.lastbatt || now() - state.lastbatt > 53*60*60*1000) {
+		cmds << "delay 6000"
-		cmds << secure(zwave.batteryV1.batteryGet())
+		cmds << secure(zwave.associationV1.associationGet(groupingIdentifier:1))
-		state.lastbatt = now()  //inside-214
+		cmds << "delay 6000"
-	}
+		state.associationQuery = new Date().time
-	if (cmds) {
-		log.debug "poll is sending ${cmds.inspect()}"
-		cmds
 	} else {
-		// workaround to keep polling from stopping due to lack of activity
+		// Only check lock state if it changed recently or we haven't had an update in an hour
-		sendEvent(descriptionText: "skipping poll", isStateChange: true, displayed: false)
+		def latest = device.currentState("lock")?.date?.time
-		null
+		if (!latest || !secondsPast(latest, 6 * 60) || secondsPast(state.lastPoll, 55 * 60)) {
+			cmds << secure(zwave.doorLockV1.doorLockOperationGet())
+			state.lastPoll = (new Date()).time
+		} else if (!state.MSR) {
+			cmds << zwave.manufacturerSpecificV1.manufacturerSpecificGet().format()
+		} else if (!state.fw) {
+			cmds << zwave.versionV1.versionGet().format()
+		} else if (!state.codes) {
+			state.pollCode = 1
+			cmds << secure(zwave.userCodeV1.usersNumberGet())
+		} else if (state.pollCode && state.pollCode <= state.codes) {
+			cmds << requestCode(state.pollCode)
+		} else if (!state.lastbatt || (new Date().time) - state.lastbatt > 53*60*60*1000) {
+			cmds << secure(zwave.batteryV1.batteryGet())
+		} else if (!state.enc) {
+			encryptCodes()
+			state.enc = 1
+		}
+	}
+	log.debug "poll is sending ${cmds.inspect()}"
+	device.activity()
+	cmds ?: null
+}
+
+private def encryptCodes() {
+	def keys = new ArrayList(state.keySet().findAll { it.startsWith("code") })
+	keys.each { key ->
+		def match = (key =~ /^code(\d+)$/)
+		if (match) try {
+			def keynum = match[0][1].toInteger()
+			if (keynum > 30 && !state[key]) {
+				state.remove(key)
+			} else if (state[key] && !state[key].startsWith("~")) {
+				log.debug "encrypting $key: ${state[key].inspect()}"
+				state[key] = encrypt(state[key])
+			}
+		} catch (java.lang.NumberFormatException e) { }
 	}
 }
 
@@ -651,7 +672,7 @@ private Boolean secondsPast(timestamp, seconds) {
 			return true
 		}
 	}
-	return (now() - timestamp) > (seconds * 1000)
+	return (new Date().time - timestamp) > (seconds * 1000)
 }
 
 private allCodesDeleted() {

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

@@ -115,10 +115,6 @@ def strobe() {
 	]
 }
 
-def both() {
-	on()
-}
-
 def refresh() {
 	log.debug "sending battery refresh command"
 	zwave.batteryV1.batteryGet().format()

smartapps/smartthings/button-controller.src/button-controller.groovy

@@ -246,9 +246,6 @@ def toggle(devices) {
 	else if (devices*.currentValue('lock').contains('locked')) {
 		devices.unlock()
 	}
-	else if (devices*.currentValue('lock').contains('unlocked')) {
-		devices.lock()
-	}
 	else if (devices*.currentValue('alarm').contains('off')) {
         devices.siren()
     }

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

@@ -592,7 +592,7 @@ def updated() {
         	// log.debug "External Id=${app.id}:${member.id}"
        
        		// create the device
-       		def childDevice = addChildDevice("smartthings", "Life360 User", "${app.id}.${member.id}",null,[name:member.firstName, completedSetup: true])
+       		def childDevice = addChildDevice("smartthings", "life360-user", "${app.id}.${member.id}",null,[name:member.firstName, completedSetup: true])
             // childDevice.setMemberId(member.id)
         
         	if (childDevice)

smartapps/smartthings/notify-me-when.src/notify-me-when.groovy

@@ -49,7 +49,6 @@ preferences {
 	section("Via a push notification and/or an SMS message"){
         input("recipients", "contact", title: "Send notifications to") {
             input "phone", "phone", title: "Phone Number (for SMS, optional)", required: false
-            paragraph "If outside the US please make sure to enter the proper country code"
             input "pushAndPhone", "enum", title: "Both Push and SMS?", required: false, options: ["Yes", "No"]
         }
 	}

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

@@ -78,7 +78,7 @@ def firstPage()
 		def motionsDiscovered = motionsDiscovered()
 		def lightSwitchesDiscovered = lightSwitchesDiscovered()
 
-		return dynamicPage(name:"firstPage", title:"Discovery Started!", nextPage:"", refreshInterval: refreshInterval, install:true, uninstall: true) {
+		return dynamicPage(name:"firstPage", title:"Discovery Started!", nextPage:"", refreshInterval: refreshInterval, install:true, uninstall: selectedSwitches != null || selectedMotions != null || selectedLightSwitches != null) {
 			section("Select a device...") {
 				input "selectedSwitches", "enum", required:false, title:"Select Wemo Switches \n(${switchesDiscovered.size() ?: 0} found)", multiple:true, options:switchesDiscovered
 				input "selectedMotions", "enum", required:false, title:"Select Wemo Motions \n(${motionsDiscovered.size() ?: 0} found)", multiple:true, options:motionsDiscovered