Merge pull request #919 from SmartThingsCommunity/staging

Rolling up staging to production for release May 24

devicetypes/smartthings/aeon-home-energy-meter-c3.src/aeon-home-energy-meter-c3.groovy

@@ -94,11 +94,11 @@ def parse(String description) {
 	def cmd = zwave.parse(description, [0x31: 1, 0x32: 1, 0x60: 3])
 	if (cmd) {
 		result = createEvent(zwaveEvent(cmd))
-		log.debug "Parse returned ${result?.descriptionText}"
-		storeGraphData(result.name, result.value)
-	} else {
-		log.debug "zwave.parse returned null command. Cannot create event"
 	}
+	log.debug "Parse returned ${result?.descriptionText}"
+
+	storeGraphData(result.name, result.value)
+
 	return result
 }
 

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

@@ -37,6 +37,9 @@ metadata {
 			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
 				attributeState "level", action:"switch level.setLevel", range:"(0..100)"
             }
+            tileAttribute ("device.level", key: "SECONDARY_CONTROL") {
+	            attributeState "level", label: 'Level ${currentValue}%'
+			}
 			tileAttribute ("device.color", key: "COLOR_CONTROL") {
 				attributeState "color", action:"setAdjustedColor"
 			}

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

@@ -38,6 +38,9 @@ metadata {
 			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
 				attributeState "level", action:"switch level.setLevel", range:"(0..100)"
             }
+            tileAttribute ("device.level", key: "SECONDARY_CONTROL") {
+	            attributeState "level", label: 'Level ${currentValue}%'
+			}
 			tileAttribute ("device.color", key: "COLOR_CONTROL") {
 				attributeState "color", action:"setAdjustedColor"
 			}

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

@@ -33,6 +33,9 @@ metadata {
             tileAttribute ("device.level", key: "SLIDER_CONTROL") {
               attributeState "level", action:"switch level.setLevel", range:"(0..100)"
             }
+            tileAttribute ("device.level", key: "SECONDARY_CONTROL") {
+	            attributeState "level", label: 'Level ${currentValue}%'
+			}
         }
 
         controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false, range:"(0..100)") {

devicetypes/smartthings/osram-lightify-led-tunable-white-60w.src/osram-lightify-led-tunable-white-60w.groovy

@@ -19,6 +19,11 @@ metadata {
         capability "Sensor"
 
         attribute "colorName", "string"
+
+        // indicates that device keeps track of heartbeat (in state.heartbeat)
+        attribute "heartbeat", "string"
+        
+
     }
 
     // simulator metadata
@@ -70,6 +75,9 @@ metadata {
 def parse(String description) {
     //log.trace description
 
+    // save heartbeat (i.e. last time we got a message from device)
+    state.heartbeat = Calendar.getInstance().getTimeInMillis()
+
     if (description?.startsWith("catchall:")) {
         if(description?.endsWith("0100") ||description?.endsWith("1001") || description?.matches("on/off\\s*:\\s*1"))
         {
@@ -124,6 +132,7 @@ def off() {
 }
 
 def refresh() {
+    sendEvent(name: "heartbeat", value: "alive", displayed:false)
     [
             "st rattr 0x${device.deviceNetworkId} ${endpointId} 6 0", "delay 500",
             "st rattr 0x${device.deviceNetworkId} ${endpointId} 8 0", "delay 500",

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

@@ -16,7 +16,7 @@
 
 metadata {
 	// Automatically generated. Make future change here.
-	definition (name: "SmartPower Outlet", namespace: "smartthings", author: "SmartThings", category: "C1") {
+	definition (name: "SmartPower Outlet", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
 		capability "Switch"
 		capability "Power Meter"
@@ -25,6 +25,9 @@ metadata {
 		capability "Sensor"
 		capability "Health Check"
 
+		// indicates that device keeps track of heartbeat (in state.heartbeat)
+		attribute "heartbeat", "string"
+
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3200", deviceJoinName: "Outlet"
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3200-Sgb", deviceJoinName: "Outlet"
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0B04,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "4257050-RZHAC", deviceJoinName: "Outlet"
@@ -78,6 +81,9 @@ metadata {
 def parse(String description) {
 	log.debug "description is $description"
 
+	// save heartbeat (i.e. last time we got a message from device)
+	state.heartbeat = Calendar.getInstance().getTimeInMillis()
+
 	def finalResult = zigbee.getKnownDescription(description)
 
 	//TODO: Remove this after getKnownDescription can parse it automatically
@@ -118,6 +124,7 @@ def on() {
 }
 
 def refresh() {
+	sendEvent(name: "heartbeat", value: "alive", displayed:false)
 	zigbee.onOffRefresh() + zigbee.refreshData("0x0B04", "0x050B")
 }
 

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

@@ -15,7 +15,7 @@
  */
 
 metadata {
-	definition (name: "SmartSense Moisture Sensor",namespace: "smartthings", author: "SmartThings", category: "C2") {
+	definition (name: "SmartSense Moisture Sensor",namespace: "smartthings", author: "SmartThings") {
 		capability "Configuration"
 		capability "Battery"
 		capability "Refresh"

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

@@ -15,7 +15,7 @@
  */
 
 metadata {
-	definition (name: "SmartSense Motion Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
+	definition (name: "SmartSense Motion Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Motion Sensor"
 		capability "Configuration"
 		capability "Battery"

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

@@ -15,7 +15,7 @@
  */
 
 metadata {
-	definition (name: "SmartSense Multi Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
+	definition (name: "SmartSense Multi Sensor", namespace: "smartthings", author: "SmartThings") {
 
 		capability "Three Axis"
 		capability "Battery"

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

@@ -16,7 +16,7 @@
 //DEPRECATED - Using the smartsense-multi-sensor.groovy DTH for this device. Users need to be moved before deleting this DTH
 
  metadata {
- 	definition (name: "SmartSense Open/Closed Accelerometer Sensor", namespace: "smartthings", author: "SmartThings", category: "C2") {
+ 	definition (name: "SmartSense Open/Closed Accelerometer Sensor", namespace: "smartthings", author: "SmartThings") {
  		capability "Battery"
  		capability "Configuration"
  		capability "Contact Sensor"

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

@@ -14,7 +14,7 @@
  *
  */
 metadata {
-	definition (name: "SmartSense Temp/Humidity Sensor",namespace: "smartthings", author: "SmartThings", category: "C2") {
+	definition (name: "SmartSense Temp/Humidity Sensor",namespace: "smartthings", author: "SmartThings") {
 		capability "Configuration"
 		capability "Battery"
 		capability "Refresh"

devicetypes/smartthings/tile-ux/tile-basic-colorwheel.src/tile-basic-colorwheel.groovy

@@ -22,7 +22,7 @@ metadata {
 
 	tiles(scale: 2) {
 		valueTile("currentColor", "device.color") {
-			state "color", label: '${currentValue}', defaultState: true
+			state "default", label: '${currentValue}'
 		}
 
 		controlTile("rgbSelector", "device.color", "color", height: 6, width: 6, inactiveLabel: false) {
@@ -41,13 +41,6 @@ def parse(String description) {
 	log.debug "Parsing '${description}'"
 }
 
-def setColor(value) {
-	log.debug "setting color: $value"
-    if (value.hex) { sendEvent(name: "color", value: value.hex) }
-    if (value.hue) { sendEvent(name: "hue", value: value.hue) }
-    if (value.saturation) { sendEvent(name: "saturation", value: value.saturation) }
-}
-
 def setSaturation(percent) {
 	log.debug "Executing 'setSaturation'"
 	sendEvent(name: "saturation", value: percent)

devicetypes/smartthings/tile-ux/tile-basic-slider.src/tile-basic-slider.groovy

@@ -39,7 +39,7 @@ metadata {
 		}
 
 		valueTile("rangeValue", "device.rangedLevel", height: 2, width: 2) {
-			state "range", label:'${currentValue}', defaultState: true
+			state "default", label:'${currentValue}'
 		}
 
 		controlTile("rangeSliderConstrained", "device.rangedLevel", "slider", height: 2, width: 4, range: "(40..60)") {

devicetypes/smartthings/tile-ux/tile-basic-standard.src/tile-basic-standard.groovy

@@ -41,17 +41,17 @@ metadata {
 
 		// standard flat tile with only a label
 		standardTile("flatLabel", "device.switch", width: 2, height: 2, decoration: "flat") {
-			state "label", label: 'On Action', action: "switch.on", backgroundColor: "#ffffff", defaultState: true
+			state "default", label: 'On Action', action: "switch.on", backgroundColor: "#ffffff"
 		}
 
 		// standard flat tile with icon and label
 		standardTile("flatIconLabel", "device.switch", width: 2, height: 2, decoration: "flat") {
-			state "iconLabel", label: 'Off Action', action: "switch.off", icon:"st.switches.switch.off", backgroundColor: "#ffffff", defaultState: true
+			state "default", label: 'Off Action', action: "switch.off", icon:"st.switches.switch.off", backgroundColor: "#ffffff"
 		}
 
 		// standard flat tile with only icon (Refreh text is IN the icon file)
 		standardTile("flatIcon", "device.switch", width: 2, height: 2, decoration: "flat") {
-			state "icon", action:"refresh.refresh", icon:"st.secondary.refresh", defaultState: true
+			state "default", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 
 		// standard with defaultState = true
@@ -74,19 +74,19 @@ metadata {
 
 		// utility tiles to fill the spaces
 		standardTile("empty2x2", "null", width: 2, height: 2, decoration: "flat") {
-			state "emptySmall", label:'', defaultState: true
+			state "default", label:''
 		}
 		standardTile("empty4x2", "null", width: 4, height: 2, decoration: "flat") {
-			state "emptyBigger", label:'', defaultState: true
+			state "default", label:''
 		}
 
 		// multi-line text (explicit newlines)
 		standardTile("multiLine", "device.multiLine", width: 2, height: 2) {
-			state "multiLine", label: '${currentValue}', defaultState: true
+			state "default", label: '${currentValue}'
 		}
 
 		standardTile("multiLineWithIcon", "device.multiLine", width: 2, height: 2) {
-			state "multiLineIcon", label: '${currentValue}', icon: "st.switches.switch.off", defaultState: true
+			state "default", label: '${currentValue}', icon: "st.switches.switch.off"
 		}
 
 		main("actionRings")

devicetypes/smartthings/tile-ux/tile-basic-value.src/tile-basic-value.groovy

@@ -22,68 +22,68 @@ metadata {
 
 	tiles(scale: 2) {
 		valueTile("text", "device.text", width: 2, height: 2) {
-			state "val", label:'${currentValue}', defaultState: true
+			state "default", label:'${currentValue}'
 		}
 
 		valueTile("longText", "device.longText", width: 2, height: 2) {
-			state "val", label:'${currentValue}', defaultState: true
+			state "default", label:'${currentValue}'
 		}
 
 		valueTile("integer", "device.integer", width: 2, height: 2) {
-			state "val", label:'${currentValue}', defaultState: true
+			state "default", label:'${currentValue}'
 		}
 
 		valueTile("integerFloat", "device.integerFloat", width: 2, height: 2) {
-			state "val", label:'${currentValue}', defaultState: true
+			state "default", label:'${currentValue}'
 		}
 
 		valueTile("pi", "device.pi", width: 2, height: 2) {
-			state "val", label:'${currentValue}', defaultState: true
+			state "default", label:'${currentValue}'
 		}
 
 		valueTile("floatAsText", "device.floatAsText", width: 2, height: 2) {
-			state "val", label:'${currentValue}', defaultState: true
+			state "default", label:'${currentValue}'
 		}
 
 		valueTile("bgColor", "device.integer", width: 2, height: 2) {
-			state "val", label:'${currentValue}', backgroundColor: "#e86d13", defaultState: true
+			state "default", label:'${currentValue}', backgroundColor: "#e86d13"
 		}
 
 		valueTile("bgColorRange", "device.integer", width: 2, height: 2) {
-			state "val", label:'${currentValue}', defaultState: true, backgroundColors: [
+			state "default", label:'${currentValue}', backgroundColors: [
 				[value: 10, color: "#ff0000"],
 				[value: 90, color: "#0000ff"]
 			]
 		}
 
 		valueTile("bgColorRangeSingleItem", "device.integer", width: 2, height: 2) {
-			state "val", label:'${currentValue}', defaultState: true, backgroundColors: [
+			state "default", label:'${currentValue}', backgroundColors: [
 				[value: 10, color: "#333333"]
 			]
 		}
 
 		valueTile("bgColorRangeConflict", "device.integer", width: 2, height: 2) {
-			state "valWithConflict", label:'${currentValue}', defaultState: true, backgroundColors: [
+			state "default", label:'${currentValue}', backgroundColors: [
 				[value: 10, color: "#990000"],
 				[value: 10, color: "#000099"]
 			]
 		}
 
 		valueTile("noValue", "device.nada", width: 4, height: 2) {
-			state "noval", label:'${currentValue}', defaultState: true
+			state "default", label:'${currentValue}'
 		}
 
 		valueTile("multiLine", "device.multiLine", width: 3, height: 2) {
-			state "val", label: '${currentValue}', defaultState: true
+			state "default", label: '${currentValue}'
 		}
 
 		valueTile("multiLineWithIcon", "device.multiLine", width: 3, height: 2) {
-			state "val", label: '${currentValue}', icon: "st.switches.switch.off", defaultState: true
+			state "default", label: '${currentValue}', icon: "st.switches.switch.off"
 		}
 
 		main("text")
 		details([
-			"text", "longText", "integer",
+			"text", "longText", "integer", 
             "integerFloat", "pi", "floatAsText",
             "bgColor", "bgColorRange", "bgColorRangeSingleItem",
             "bgColorRangeConflict", "noValue",

devicetypes/smartthings/tile-ux/tile-multiattribute-generic.src/tile-multiattribute-generic.groovy

@@ -39,15 +39,15 @@ metadata {
 				attributeState "turningOff", label:'${name}', backgroundColor:"#ffffff", nextState:"turningOn"
 			}
 			tileAttribute("device.level", key: "SECONDARY_CONTROL") {
-				attributeState "level", icon: 'st.Weather.weather1', action:"randomizeLevel", defaultState: true
+				attributeState "default", icon: 'st.Weather.weather1', action:"randomizeLevel"
 			}
 			tileAttribute("device.level", key: "SLIDER_CONTROL") {
-				attributeState "level", action:"switch level.setLevel", defaultState: true
+				attributeState "default", action:"switch level.setLevel"
 			}
 		}
 		multiAttributeTile(name:"valueTile", type:"generic", width:6, height:4) {
 			tileAttribute("device.level", key: "PRIMARY_CONTROL") {
-				attributeState "level", label:'${currentValue}', defaultState: true, backgroundColors:[
+				attributeState "default", label:'${currentValue}', backgroundColors:[
 					[value: 0, color: "#ff0000"],
 					[value: 20, color: "#ffff00"],
 					[value: 40, color: "#00ff00"],
@@ -69,34 +69,34 @@ metadata {
 		}
 		multiAttributeTile(name:"lengthyTile", type:"generic", width:6, height:4) {
 			tileAttribute("device.lengthyText", key: "PRIMARY_CONTROL") {
-				attributeState "lengthyText", label:'The value of this tile is long and should wrap to two lines', backgroundColor:"#79b821", defaultState: true
+				attributeState "default", label:'The value of this tile is long and should wrap to two lines', backgroundColor:"#79b821"
 			}
 			tileAttribute("device.lengthyText", key: "SECONDARY_CONTROL") {
-				attributeState "lengthyText", label:'The value of this tile is long and should wrap to two lines', backgroundColor:"#79b821", defaultState: true
+				attributeState "default", label:'The value of this tile is long and should wrap to two lines', backgroundColor:"#79b821"
 			}
 		}
 		multiAttributeTile(name:"multilineTile", type:"generic", width:6, height:4) {
 			tileAttribute("device.multilineText", key: "PRIMARY_CONTROL") {
-				attributeState "multiLineText", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821", defaultState: true
+				attributeState "default", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821"
 			}
 			tileAttribute("device.multilineText", key: "SECONDARY_CONTROL") {
-				attributeState "multiLineText", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821", defaultState: true
+				attributeState "default", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821"
 			}
 		}
 		multiAttributeTile(name:"lengthyTileWithIcon", type:"generic", width:6, height:4) {
 			tileAttribute("device.lengthyText", key: "PRIMARY_CONTROL") {
-				attributeState "lengthyText", label:'The value of this tile is long and should wrap to two lines', backgroundColor:"#79b821", icon: "st.switches.switch.on", defaultState: true
+				attributeState "default", label:'The value of this tile is long and should wrap to two lines', backgroundColor:"#79b821", icon: "st.switches.switch.on"
 			}
 			tileAttribute("device.lengthyText", key: "SECONDARY_CONTROL") {
-				attributeState "lengthyText", label:'The value of this tile is long and should wrap to two lines', backgroundColor:"#79b821", icon: "st.switches.switch.on", defaultState: true
+				attributeState "default", label:'The value of this tile is long and should wrap to two lines', backgroundColor:"#79b821", icon: "st.switches.switch.on"
 			}
 		}
 		multiAttributeTile(name:"multilineTileWithIcon", type:"generic", width:6, height:4) {
 			tileAttribute("device.multilineText", key: "PRIMARY_CONTROL") {
-				attributeState "multilineText", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821", icon: "st.switches.switch.on", defaultState: true
+				attributeState "default", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821", icon: "st.switches.switch.on"
 			}
 			tileAttribute("device.multilineText", key: "SECONDARY_CONTROL") {
-				attributeState "multilineText", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821", icon: "st.switches.switch.on", defaultState: true
+				attributeState "default", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821", icon: "st.switches.switch.on"
 			}
 		}
 

devicetypes/smartthings/tile-ux/tile-multiattribute-lighting.src/tile-multiattribute-lighting.groovy

@@ -96,10 +96,10 @@ metadata {
 		}
 
 		standardTile("reset", "device.reset", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "reset", label:"Reset Color", action:"reset", icon:"st.lights.philips.hue-single", defaultState: true
+			state "default", label:"Reset Color", action:"reset", icon:"st.lights.philips.hue-single"
 		}
 		standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-			state "refresh", label:"", action:"refresh.refresh", icon:"st.secondary.refresh", defaultState: true
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
 		}
 
 		main(["switch"])
@@ -173,6 +173,7 @@ def setColor(value) {
 def reset() {
 	log.debug "Executing 'reset'"
 	setAdjustedColor([level:100, hex:"#90C638", saturation:56, hue:23])
+	//parent.poll()
 }
 
 def setAdjustedColor(value) {
@@ -188,6 +189,7 @@ def setAdjustedColor(value) {
 
 def refresh() {
 	log.debug "Executing 'refresh'"
+	//parent.manualRefresh()
 }
 
 def adjustOutgoingHue(percent) {
@@ -206,3 +208,4 @@ def adjustOutgoingHue(percent) {
 	log.info "percent: $percent, adjusted: $adjusted"
 	adjusted
 }
+

devicetypes/smartthings/tile-ux/tile-multiattribute-mediaplayer.src/tile-multiattribute-mediaplayer.groovy

@@ -37,10 +37,10 @@ metadata {
 				attributeState("stopped", label:"Stopped", action:"music Player.play", nextState: "playing")
 			}
 			tileAttribute("device.status", key: "PREVIOUS_TRACK") {
-				attributeState("status", action:"music Player.previousTrack", defaultState: true)
+				attributeState("default", action:"music Player.previousTrack")
 			}
 			tileAttribute("device.status", key: "NEXT_TRACK") {
-				attributeState("status", action:"music Player.nextTrack", defaultState: true)
+				attributeState("default", action:"music Player.nextTrack")
 			}
 			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
 				attributeState("level", action:"music Player.setLevel")
@@ -50,7 +50,7 @@ metadata {
 				attributeState("muted", action:"music Player.unmute", nextState: "unmuted")
 			}
 			tileAttribute("device.trackDescription", key: "MARQUEE") {
-				attributeState("trackDescription", label:"${currentValue}", defaultState: true)
+				attributeState("default", label:"${currentValue}")
 			}
 		}
 

devicetypes/smartthings/tile-ux/tile-multiattribute-thermostat.src/tile-multiattribute-thermostat.groovy

@@ -32,14 +32,14 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"thermostatFull", type:"thermostat", width:6, height:4) {
 			tileAttribute("device.temperature", key: "PRIMARY_CONTROL") {
-				attributeState("temp", label:'${currentValue}', unit:"dF", defaultState: true)
+				attributeState("default", label:'${currentValue}', unit:"dF")
 			}
 			tileAttribute("device.temperature", key: "VALUE_CONTROL") {
 				attributeState("VALUE_UP", action: "tempUp")
 				attributeState("VALUE_DOWN", action: "tempDown")
 			}
 			tileAttribute("device.humidity", key: "SECONDARY_CONTROL") {
-				attributeState("humidity", label:'${currentValue}%', unit:"%", defaultState: true)
+				attributeState("default", label:'${currentValue}%', unit:"%")
 			}
 			tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") {
 				attributeState("idle", backgroundColor:"#44b621")
@@ -53,16 +53,15 @@ metadata {
 				attributeState("auto", label:'${name}')
 			}
 			tileAttribute("device.heatingSetpoint", key: "HEATING_SETPOINT") {
-				attributeState("heatingSetpoint", label:'${currentValue}', unit:"dF", defaultState: true)
+				attributeState("default", label:'${currentValue}', unit:"dF")
 			}
 			tileAttribute("device.coolingSetpoint", key: "COOLING_SETPOINT") {
-				attributeState("coolingSetpoint", label:'${currentValue}', unit:"dF", defaultState: true)
+				attributeState("default", label:'${currentValue}', unit:"dF")
 			}
 		}
 		multiAttributeTile(name:"thermostatNoHumidity", type:"thermostat", width:6, height:4) {
 			tileAttribute("device.temperature", key: "PRIMARY_CONTROL") {
-                attributeState("coolingSetpoint", label:'${currentValue}', unit:"dF", defaultState: true)
+				attributeState("default", label:'${currentValue}', unit:"dF")
-				attributeState("temp", label:'${currentValue}', unit:"dF")
 			}
 			tileAttribute("device.temperature", key: "VALUE_CONTROL") {
 				attributeState("VALUE_UP", action: "tempUp")
@@ -80,16 +79,15 @@ metadata {
 				attributeState("auto", label:'${name}')
 			}
 			tileAttribute("device.heatingSetpoint", key: "HEATING_SETPOINT") {
-                attributeState("coolingSetpoint", label:'${currentValue}', unit:"dF", defaultState: true)
+				attributeState("default", label:'${currentValue}', unit:"dF")
-				attributeState("heatingSetpoint", label:'${currentValue}', unit:"dF")
 			}
 			tileAttribute("device.coolingSetpoint", key: "COOLING_SETPOINT") {
-				attributeState("coolingSetpoint", label:'${currentValue}', unit:"dF", defaultState: true)
+				attributeState("default", label:'${currentValue}', unit:"dF")
 			}
 		}
 		multiAttributeTile(name:"thermostatBasic", type:"thermostat", width:6, height:4) {
 			tileAttribute("device.temperature", key: "PRIMARY_CONTROL") {
-				attributeState("temp", label:'${currentValue}', unit:"dF", defaultState: true,
+				attributeState("default", label:'${currentValue}', unit:"dF",
 				backgroundColors:[
 					[value: 31, color: "#153591"],
 					[value: 44, color: "#1e9cbb"],
@@ -120,30 +118,30 @@ metadata {
 			)
 		}
 		standardTile("tempDown", "device.temperature", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
-			state "tempDown", label:'down', action:"tempDown", defaultState: true
+			state "default", label:'down', action:"tempDown"
 		}
 		standardTile("tempUp", "device.temperature", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
-			state "tempUp", label:'up', action:"tempUp", defaultState: true
+			state "default", label:'up', action:"tempUp"
 		}
 
 		valueTile("heatingSetpoint", "device.heatingSetpoint", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
 			state "heat", label:'${currentValue} heat', unit: "F", backgroundColor:"#ffffff"
 		}
 		standardTile("heatDown", "device.temperature", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
-			state "heatDown", label:'down', action:"heatDown", defaultState: true
+			state "default", label:'down', action:"heatDown"
 		}
 		standardTile("heatUp", "device.temperature", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
-			state "heatUp", label:'up', action:"heatUp", defaultState: true
+			state "default", label:'up', action:"heatUp"
 		}
 
 		valueTile("coolingSetpoint", "device.coolingSetpoint", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
 			state "cool", label:'${currentValue} cool', unit:"F", backgroundColor:"#ffffff"
 		}
 		standardTile("coolDown", "device.temperature", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
-			state "coolDown", label:'down', action:"coolDown", defaultState: true
+			state "default", label:'down', action:"coolDown"
 		}
 		standardTile("coolUp", "device.temperature", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {
-			state "coolUp", label:'up', action:"coolUp", defaultState: true
+			state "default", label:'up', action:"coolUp"
 		}
 
 		standardTile("mode", "device.thermostatMode", width: 2, height: 2, inactiveLabel: false, decoration: "flat") {

smartapps/dianoga/netatmo-connect.src/netatmo-connect.groovy

@@ -4,33 +4,29 @@
 import java.text.DecimalFormat
 import groovy.json.JsonSlurper
 
-private getApiUrl()			{ "https://api.netatmo.com" }
+private apiUrl() 			{ "https://api.netatmo.com" }
-private getVendorName()		{ "netatmo" }
+private getVendorName() 	{ "netatmo" }
-private getVendorAuthPath()	{ "${apiUrl}/oauth2/authorize?" }
+private getVendorAuthPath()	{ "https://api.netatmo.com/oauth2/authorize?" }
-private getVendorTokenPath(){ "${apiUrl}/oauth2/token" }
+private getVendorTokenPath(){ "https://api.netatmo.com/oauth2/token" }
 private getVendorIcon()		{ "https://s3.amazonaws.com/smartapp-icons/Partner/netamo-icon-1%402x.png" }
-private getClientId()		{ appSettings.clientId }
+private getClientId() 		{ appSettings.clientId }
-private getClientSecret()	{ appSettings.clientSecret }
+private getClientSecret() 	{ appSettings.clientSecret }
-private getServerUrl() 		{ appSettings.serverUrl }
+private getServerUrl() 		{ "https://graph.api.smartthings.com" }
-private getShardUrl()		{ return getApiServerUrl() }
-private getCallbackUrl()	{ "${serverUrl}/oauth/callback" }
-private getBuildRedirectUrl() { "${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${state.accessToken}&apiServerUrl=${shardUrl}" }
 
 // Automatically generated. Make future change here.
 definition(
-	name: "Netatmo (Connect)",
+    name: "Netatmo (Connect)",
-	namespace: "dianoga",
+    namespace: "dianoga",
-	author: "Brian Steere",
+    author: "Brian Steere",
-	description: "Netatmo Integration",
+    description: "Netatmo Integration",
-	category: "SmartThings Labs",
+    category: "SmartThings Labs",
-	iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/netamo-icon-1.png",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/netamo-icon-1.png",
-	iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/netamo-icon-1%402x.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/netamo-icon-1%402x.png",
-	oauth: true,
+    oauth: true,
-	singleInstance: true
+    singleInstance: true
 ){
 	appSetting "clientId"
 	appSetting "clientSecret"
-	appSetting "serverUrl"
 }
 
 preferences {
@@ -39,52 +35,35 @@ preferences {
 }
 
 mappings {
-	path("/oauth/initialize") {action: [GET: "oauthInitUrl"]}
+	path("/receivedToken"){action: [POST: "receivedToken", GET: "receivedToken"]}
-	path("/oauth/callback") {action: [GET: "callback"]}
+	path("/receiveToken"){action: [POST: "receiveToken", GET: "receiveToken"]}
+    path("/auth"){action: [GET: "auth"]}
 }
 
 def authPage() {
 	log.debug "In authPage"
+	if(canInstallLabs()) {
+		def description = null
 
-	def description
+		if (state.vendorAccessToken == null) {
-	def uninstallAllowed = false
+			log.debug "About to create access token."
-	def oauthTokenProvided = false
 
-	if (!state.accessToken) {
+			createAccessToken()
-		log.debug "About to create access token."
+			description = "Tap to enter Credentials."
-		state.accessToken = createAccessToken()
-	}
 
-	if (canInstallLabs()) {
+			return dynamicPage(name: "Credentials", title: "Authorize Connection", nextPage:"listDevices", uninstall: true, install:false) {
-
+				section { href url:buildRedirectUrl("auth"), style:"embedded", required:false, title:"Connect to ${getVendorName()}:", description:description }
-		def redirectUrl = getBuildRedirectUrl()
+			}
-		log.debug "Redirect url = ${redirectUrl}"
+		} else {
-
-		if (state.authToken) {
 			description = "Tap 'Next' to proceed"
-			uninstallAllowed = true
-			oauthTokenProvided = true
-		} else {
-			description = "Click to enter Credentials."
-		}
 
-		if (!oauthTokenProvided) {
+			return dynamicPage(name: "Credentials", title: "Credentials Accepted!", nextPage:"listDevices", uninstall: true, install:false) {
-			log.debug "Show the login page"
+				section { href url: buildRedirectUrl("receivedToken"), style:"embedded", required:false, title:"${getVendorName()} is now connected to SmartThings!", description:description }
-			return dynamicPage(name: "Credentials", title: "Authorize Connection", nextPage:"listDevices", uninstall: uninstallAllowed, install:false) {
-				section() {
-					paragraph "Tap below to log in to the netatmo and authorize SmartThings access."
-					href url:redirectUrl, style:"embedded", required:false, title:"Connect to ${getVendorName()}:", description:description
-				}
-			}
-		} else {
-			log.debug "Show the devices page"
-			return dynamicPage(name: "Credentials", title: "Credentials Accepted!", nextPage:"listDevices", uninstall: uninstallAllowed, install:false) {
-				section() {
-					input(name:"Devices", style:"embedded", required:false, title:"${getVendorName()} is now connected to SmartThings!", description:description) 
-				}
 			}
 		}
-	} else {
+	}
+	else
+	{
 		def upgradeNeeded = """To use SmartThings Labs, your Hub should be completely up to date.
 
 To update your Hub, access Location Settings in the Main Menu (tap the gear next to your location name), select your Hub, and choose "Update Hub"."""
@@ -99,184 +78,44 @@ To update your Hub, access Location Settings in the Main Menu (tap the gear next
 	}
 }
 
+def auth() {
+	redirect location: oauthInitUrl()
+}
+
 def oauthInitUrl() {
 	log.debug "In oauthInitUrl"
 
+	/* OAuth Step 1: Request access code with our client ID */
+
 	state.oauthInitState = UUID.randomUUID().toString()
 
-	def oauthParams = [
+	def oauthParams = [ response_type: "code",
-		response_type: "code",
 		client_id: getClientId(),
-		client_secret: getClientSecret(),
 		state: state.oauthInitState,
-		redirect_uri: getCallbackUrl(),
+		redirect_uri: buildRedirectUrl("receiveToken") ,
 		scope: "read_station"
-	]
-
-	log.debug "REDIRECT URL: ${getVendorAuthPath() + toQueryString(oauthParams)}"
-
-	redirect (location: getVendorAuthPath() + toQueryString(oauthParams))
-}
-
-def callback() {
-	log.debug "callback()>> params: $params, params.code ${params.code}"
-
-	def code = params.code
-	def oauthState = params.state
-
-	if (oauthState == state.oauthInitState) {
-
-		def tokenParams = [
-			client_secret: getClientSecret(),
-			client_id : getClientId(),
-			grant_type: "authorization_code",
-			redirect_uri: getCallbackUrl(),
-			code: code,
-			scope: "read_station"
 		]
 
-		log.debug "TOKEN URL: ${getVendorTokenPath() + toQueryString(tokenParams)}"
+	return getVendorAuthPath() + toQueryString(oauthParams)
-
-		def tokenUrl = getVendorTokenPath()
-		def params = [
-			uri: tokenUrl,
-			contentType: 'application/x-www-form-urlencoded',
-			body: tokenParams
-		]
-
-		log.debug "PARAMS: ${params}"
-
-		httpPost(params) { resp ->
-
-			def slurper = new JsonSlurper()
-
-			resp.data.each { key, value ->
-				def data = slurper.parseText(key)
-
-				state.refreshToken = data.refresh_token
-				state.authToken = data.access_token
-				state.tokenExpires = now() + (data.expires_in * 1000)
-				log.debug "swapped token: $resp.data"
-			}
-		}
-
-		// Handle success and failure here, and render stuff accordingly
-		if (state.authToken) {
-			success()
-		} else {
-			fail()
-		}
-
-	} else {
-		log.error "callback() failed oauthState != state.oauthInitState"
-	}
 }
 
-def success() {
+def buildRedirectUrl(endPoint) {
-	log.debug "in success"
+	log.debug "In buildRedirectUrl"
-	def message = """
+
-	<p>We have located your """ + getVendorName() + """ account.</p>
+	return getServerUrl() + "/api/token/${state.accessToken}/smartapps/installations/${app.id}/${endPoint}"
-	<p>Tap 'Done' to continue to Devices.</p>
-	"""
-	connectionStatus(message)
 }
 
-def fail() {
+def receiveToken() {
-	log.debug "in fail"
+	log.debug "In receiveToken"
-	def message = """
-	<p>The connection could not be established!</p>
-	<p>Click 'Done' to return to the menu.</p>
-	"""
-	connectionStatus(message)
-}
-
-def connectionStatus(message, redirectUrl = null) {
-	def redirectHtml = ""
-	if (redirectUrl) {
-		redirectHtml = """
-			<meta http-equiv="refresh" content="3; url=${redirectUrl}" />
-		"""
-	}
-
-	def html = """
-		<!DOCTYPE html>
-		<html>
-		<head>
-		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<title>${getVendorName()} Connection</title>
-		<style type="text/css">
-			* { box-sizing: border-box; }
-			@font-face {
-				font-family: 'Swiss 721 W01 Thin';
-				src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.eot');
-				src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.eot?#iefix') format('embedded-opentype'),
-				url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.woff') format('woff'),
-				url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.ttf') format('truetype'),
-				url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.svg#swis721_th_btthin') format('svg');
-				font-weight: normal;
-				font-style: normal;
-			}
-			@font-face {
-				font-family: 'Swiss 721 W01 Light';
-				src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.eot');
-				src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.eot?#iefix') format('embedded-opentype'),
-				url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.woff') format('woff'),
-				url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.ttf') format('truetype'),
-				url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.svg#swis721_lt_btlight') format('svg');
-				font-weight: normal;
-				font-style: normal;
-			}
-			.container {
-				width: 100%;
-				padding: 40px;
-				/*background: #eee;*/
-				text-align: center;
-			}
-			img {
-				vertical-align: middle;
-			}
-			img:nth-child(2) {
-				margin: 0 30px;
-			}
-			p {
-				font-size: 2.2em;
-				font-family: 'Swiss 721 W01 Thin';
-				text-align: center;
-				color: #666666;
-				margin-bottom: 0;
-			}
-			/*
-			p:last-child {
-				margin-top: 0px;
-			}
-			*/
-			span {
-				font-family: 'Swiss 721 W01 Light';
-				}
-		</style>
-		</head>
-		<body>
-			<div class="container">
-				<img src=""" + getVendorIcon() + """ alt="Vendor icon" />
-				<img src="https://s3.amazonaws.com/smartapp-icons/Partner/support/connected-device-icn%402x.png" alt="connected device icon" />
-				<img src="https://s3.amazonaws.com/smartapp-icons/Partner/support/st-logo%402x.png" alt="SmartThings logo" />
-				${message}
-			</div>
-        </body>
-        </html>
-	"""
-	render contentType: 'text/html', data: html
-}
-
-def refreshToken() {
-	log.debug "In refreshToken"
 
 	def oauthParams = [
 		client_secret: getClientSecret(),
 		client_id: getClientId(),
-		grant_type: "refresh_token",
+		grant_type: "authorization_code",
-		refresh_token: state.refreshToken
+		redirect_uri: buildRedirectUrl('receiveToken'),
-	]
+		code: params.code,
+		scope: "read_station"
+		]
 
 	def tokenUrl = getVendorTokenPath()
 	def params = [
@@ -285,7 +124,201 @@ def refreshToken() {
 		body: oauthParams,
 	]
 
-	// OAuth Step 2: Request access token with our client Secret and OAuth "Code"
+    log.debug params
+
+	/* OAuth Step 2: Request access token with our client Secret and OAuth "Code" */
+	try {
+		httpPost(params) { response ->
+        	log.debug response.data
+			def slurper = new JsonSlurper();
+
+			response.data.each {key, value ->
+				def data = slurper.parseText(key);
+				log.debug "Data: $data"
+
+				state.vendorRefreshToken = data.refresh_token
+				state.vendorAccessToken = data.access_token
+				state.vendorTokenExpires = now() + (data.expires_in * 1000)
+				return
+			}
+
+		}
+	} catch (Exception e) {
+		log.debug "Error: $e"
+	}
+
+	log.debug "State: $state"
+
+	if ( !state.vendorAccessToken ) {  //We didn't get an access token, bail on install
+		return
+	}
+
+	/* OAuth Step 3: Use the access token to call into the vendor API throughout your code using state.vendorAccessToken. */
+
+	def html = """
+        <!DOCTYPE html>
+        <html>
+        <head>
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>${getVendorName()} Connection</title>
+        <style type="text/css">
+            * { box-sizing: border-box; }
+            @font-face {
+                font-family: 'Swiss 721 W01 Thin';
+                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.eot');
+                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.eot?#iefix') format('embedded-opentype'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.woff') format('woff'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.ttf') format('truetype'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.svg#swis721_th_btthin') format('svg');
+                font-weight: normal;
+                font-style: normal;
+            }
+            @font-face {
+                font-family: 'Swiss 721 W01 Light';
+                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.eot');
+                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.eot?#iefix') format('embedded-opentype'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.woff') format('woff'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.ttf') format('truetype'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.svg#swis721_lt_btlight') format('svg');
+                font-weight: normal;
+                font-style: normal;
+            }
+            .container {
+                width: 100%;
+                padding: 40px;
+                /*background: #eee;*/
+                text-align: center;
+            }
+            img {
+                vertical-align: middle;
+            }
+            img:nth-child(2) {
+                margin: 0 30px;
+            }
+            p {
+                font-size: 2.2em;
+                font-family: 'Swiss 721 W01 Thin';
+                text-align: center;
+                color: #666666;
+                margin-bottom: 0;
+            }
+        /*
+            p:last-child {
+                margin-top: 0px;
+            }
+        */
+            span {
+                font-family: 'Swiss 721 W01 Light';
+            }
+        </style>
+        </head>
+        <body>
+            <div class="container">
+                <img src=""" + getVendorIcon() + """ alt="Vendor icon" />
+                <img src="https://s3.amazonaws.com/smartapp-icons/Partner/support/connected-device-icn%402x.png" alt="connected device icon" />
+                <img src="https://s3.amazonaws.com/smartapp-icons/Partner/support/st-logo%402x.png" alt="SmartThings logo" />
+                <p>We have located your """ + getVendorName() + """ account.</p>
+                <p>Tap 'Done' to process your credentials.</p>
+			</div>
+        </body>
+        </html>
+        """
+	render contentType: 'text/html', data: html
+}
+
+def receivedToken() {
+	log.debug "In receivedToken"
+
+	def html = """
+        <!DOCTYPE html>
+        <html>
+        <head>
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>Withings Connection</title>
+        <style type="text/css">
+            * { box-sizing: border-box; }
+            @font-face {
+                font-family: 'Swiss 721 W01 Thin';
+                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.eot');
+                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.eot?#iefix') format('embedded-opentype'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.woff') format('woff'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.ttf') format('truetype'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-thin-webfont.svg#swis721_th_btthin') format('svg');
+                font-weight: normal;
+                font-style: normal;
+            }
+            @font-face {
+                font-family: 'Swiss 721 W01 Light';
+                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.eot');
+                src: url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.eot?#iefix') format('embedded-opentype'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.woff') format('woff'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.ttf') format('truetype'),
+                     url('https://s3.amazonaws.com/smartapp-icons/Partner/fonts/swiss-721-light-webfont.svg#swis721_lt_btlight') format('svg');
+                font-weight: normal;
+                font-style: normal;
+            }
+            .container {
+                width: 560px;
+                padding: 40px;
+                /*background: #eee;*/
+                text-align: center;
+            }
+            img {
+                vertical-align: middle;
+            }
+            img:nth-child(2) {
+                margin: 0 30px;
+            }
+            p {
+                font-size: 2.2em;
+                font-family: 'Swiss 721 W01 Thin';
+                text-align: center;
+                color: #666666;
+                margin-bottom: 0;
+            }
+        /*
+            p:last-child {
+                margin-top: 0px;
+            }
+        */
+            span {
+                font-family: 'Swiss 721 W01 Light';
+            }
+        </style>
+        </head>
+        <body>
+            <div class="container">
+                <img src=""" + getVendorIcon() + """ alt="Vendor icon" />
+                <img src="https://s3.amazonaws.com/smartapp-icons/Partner/support/connected-device-icn%402x.png" alt="connected device icon" />
+                <img src="https://s3.amazonaws.com/smartapp-icons/Partner/support/st-logo%402x.png" alt="SmartThings logo" />
+                <p>Tap 'Done' to continue to Devices.</p>
+			</div>
+        </body>
+        </html>
+        """
+	render contentType: 'text/html', data: html
+}
+
+// "
+
+def refreshToken() {
+	log.debug "In refreshToken"
+
+	def oauthParams = [
+		client_secret: getClientSecret(),
+		client_id: getClientId(),
+		grant_type: "refresh_token",
+		refresh_token: state.vendorRefreshToken
+		]
+
+	def tokenUrl = getVendorTokenPath()
+	def params = [
+		uri: tokenUrl,
+		contentType: 'application/x-www-form-urlencoded',
+		body: oauthParams,
+	]
+
+	/* OAuth Step 2: Request access token with our client Secret and OAuth "Code" */
 	try {
 		httpPost(params) { response ->
 			def slurper = new JsonSlurper();
@@ -294,9 +327,9 @@ def refreshToken() {
 				def data = slurper.parseText(key);
 				log.debug "Data: $data"
 
-				state.refreshToken = data.refresh_token
+				state.vendorRefreshToken = data.refresh_token
-				state.accessToken = data.access_token
+				state.vendorAccessToken = data.access_token
-				state.tokenExpires = now() + (data.expires_in * 1000)
+				state.vendorTokenExpires = now() + (data.expires_in * 1000)
 				return true
 			}
 
@@ -305,8 +338,9 @@ def refreshToken() {
 		log.debug "Error: $e"
 	}
 
-	// We didn't get an access token
+	log.debug "State: $state"
-	if ( !state.accessToken ) {
+
+	if ( !state.vendorAccessToken ) {  //We didn't get an access token
 		return false
 	}
 }
@@ -448,13 +482,13 @@ def listDevices() {
 }
 
 def apiGet(String path, Map query, Closure callback) {
-	if(now() >= state.tokenExpires) {
+	if(now() >= state.vendorTokenExpires) {
 		refreshToken();
 	}
 
-	query['access_token'] = state.accessToken
+	query['access_token'] = state.vendorAccessToken
 	def params = [
-		uri: getApiUrl(),
+		uri: apiUrl(),
 		path: path,
 		'query': query
 	]

smartapps/osotech/plantlink-connector.src/plantlink-connector.groovy

@@ -370,7 +370,9 @@ def parse_api_response(resp, message) {
     }
 }
 
-def getServerUrl() { return getApiServerUrl() }
+def getServerUrl() { 
+	return "https://graph.api.smartthings.com" 
+}
 
 def debugEvent(message, displayEvent) {
     def results = [

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

@@ -297,8 +297,8 @@ private getTimeOk() {
 	def result = true
 	if (starting && ending) {
 		def currTime = now()
-		def start = timeToday(starting, location.timeZone).time
+		def start = timeToday(starting).time
-		def stop = timeToday(ending, location.timeZone).time
+		def stop = timeToday(ending).time
 		result = start < stop ? currTime >= start && currTime <= stop : currTime <= stop || currTime >= start
 	}
 	log.trace "timeOk = $result"

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

@@ -27,6 +27,7 @@ definition(
 ) {
 	appSetting "clientId"
 	appSetting "clientSecret"
+    appSetting "serverUrl"
 }
 
 preferences {
@@ -191,7 +192,7 @@ def getSmartThingsClientId() {
    return "pREqugabRetre4EstetherufrePumamExucrEHuc"
 }
 
-def getServerUrl() { getApiServerUrl() }
+def getServerUrl() { appSettings.serverUrl }
 
 def buildRedirectUrl()
 {