Merge pull request #1088 from SmartThingsCommunity/staging

Rolling up staging to production

devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy

@@ -29,6 +29,7 @@ metadata {
 		attribute "powerSupply", "enum", ["USB Cable", "Battery"]
 
 		fingerprint deviceId: "0x2101", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x7A", outClusters: "0x5A"
+		fingerprint deviceId: "0x2101", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x7A,0x5A"
 	}
 
 	simulator {
@@ -328,7 +329,7 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 
 def configure() {
 	// allow device user configured or default 16 min to check in; double the periodic reporting interval
-	sendEvent(name: "checkInterval", value: 2* timeOptionValueMap[reportInterval] ?: 2*8*60, displayed: false)
+	sendEvent(name: "checkInterval", value: 2* (timeOptionValueMap[reportInterval] ?: (2*8*60)), displayed: false)
 
 	// This sensor joins as a secure device if you double-click the button to include it
 	log.debug "${device.displayName} is configuring its settings"
@@ -356,7 +357,7 @@ def configure() {
 									motionSensitivity == "minimum" ? 0 : 64)
 
 	//5. report every x minutes (threshold reports don't work on battery power, default 8 mins)
-	request << zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: timeOptionValueMap[reportInterval] ?: 8*60) //association group 1
+	request << zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: timeOptionValueMap[reportInterval] ?: (8*60)) //association group 1
 
 	request << zwave.configurationV1.configurationSet(parameterNumber: 112, size: 4, scaledConfigurationValue: 6*60*60)  //association group 2
 

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

@@ -22,6 +22,7 @@ metadata {
 		capability "Refresh"
 		capability "Temperature Measurement"
 		capability "Health Check"
+		capability "Sensor"
 
 		command "enrollResponse"
 

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

@@ -35,6 +35,7 @@ metadata {
 		// status messages
 		status "open":  "command: 2001, payload: FF"
 		status "closed": "command: 2001, payload: 00"
+		status "wake up": "command: 8407, payload: "
 	}
 
 	// UI tile definitions
@@ -174,7 +175,7 @@ def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd)
 	if (!state.lastbat || now() - state.lastbat > 53*60*60*1000) {
 		cmds << command(zwave.batteryV1.batteryGet())
 	} else {
-		cmds << zwave.wakeUpV1.wakeUpNoMoreInformation()
+		cmds << zwave.wakeUpV1.wakeUpNoMoreInformation().format()
 	}
 	[event, response(cmds)]
 }

smartapps/climbingcoder/lifx-scene-manager.src/lifx-scene-manager.groovy

@@ -1,131 +0,0 @@
-/**
- *  LifX Scene Manager
- *
- *  Copyright 2016 Patrick Killian
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-definition(
-    name: "LifX Scene Manager",
-    namespace: "climbingcoder",
-    author: "Patrick Killian",
-    description: "When your mode changes, automatically activate a Lifx lighting scene with the same name",
-    category: "Convenience",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
-
-
-preferences {
-	section("Configuration") {
-		input(name:"apikey", type:"text", title:"LifX API Token", required:true)
-        input(name:"fadeTime", type:"number", title:"Fade Time", description:"Seconds of fade between scenes", required:true)
-	}
-    section("Getting a LifX API Token") {
-        paragraph "1. Go to https://cloud.lifx.com/sign_in and sign in with your LifX account"
-        paragraph "2. Click on your email address and then choose settings from the drop down menu"
-        paragraph "3. Click 'Generate Token' and give your token any name"
-        paragraph "4. Copy your token to the required field above and save it somewhere else for reference"
-    }
-}
-
-def installed() {   
-	log.debug "Installed with settings: ${settings}"
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-	unsubscribe()
-	initialize()
-}
-
-def initialize() {
-	subscribe(location, "mode", modeChangeHandler)
-}
-
-
-def modeChangeHandler(evt) {
-    log.debug "mode changed to ${evt.value}"
-    def sceneUUID = ""
-    sceneUUID = findMatchingLifxScene("${evt.value}")
-    if (sceneUUID == "") {
-    	log.debug "No matching scene found"
-    } else {
-    	activateLifxScene("${sceneUUID}")
-    }
-}
-
-
-/**
-* Returns the UUID of a LifX scene that matches
-*   the passed in sceneName by obtaining a list
-*   of all available scenes and comparing them
-*   to the passed in name
-*
-* @param sceneName - the name of the desired scene
-*
-* @return UUID - the UUID of any matching scenes found
-*/
-def findMatchingLifxScene(sceneName) {
-	log.debug ("Getting list of LifX scenes")
-	def params = [
-    	headers: ["Authorization": "Bearer ${settings.apikey}"],
-    	uri: "https://api.lifx.com/v1/scenes",
-        body: []
-	]
-    def uuid = ""
-
-	try {
-   		httpGet(params) { resp ->
-        	log.debug "response status code: ${resp.status}"
-            resp.data.each {
-            	log.debug("Found scene '${it.name}'")
-            	if ("${it.name}" == sceneName) {
-                	uuid = "${it.uuid}"
-                }
-            }
-    	}
-	} catch (e) {
-    	log.error "something went wrong: $e"
-	} finally {
-    	return uuid
-    }
-}
-
-
-
-/**
-* Calls the Lifx http endpoint to activate a scene with
-*  the given UUID
-*
-* @param UUID - the UUID of the scene to activate
-*/
-def activateLifxScene(UUID) {
-	log.debug "Activating scene with UUID '${UUID}'"
-	def params = [
-    	headers: ["Authorization": "Bearer ${settings.apikey}"],
-    	uri: "https://api.lifx.com/v1/scenes/scene_id:${UUID}/activate",
-        body: [
-        	duration: "${settings.fadeTime}"
-        ]
-	]
-
-	try {
-   		httpPut(params) { resp ->
-        	log.debug "response status code: ${resp.status}"
-    	}
-	} catch (e) {
-    	log.error "something went wrong: $e"
-	}
-}
-
-

smartapps/smartthings/gentle-wake-up.src/gentle-wake-up.groovy

@@ -237,7 +237,7 @@ def completionPage() {
 		}
 
 		section("Notifications") {
-			input("recipients", "contact", title: "Send notifications to") {
+			input("recipients", "contact", title: "Send notifications to", required: false) {
 				input(name: "completionPhoneNumber", type: "phone", title: "Text This Number", description: "Phone number", required: false)
 				input(name: "completionPush", type: "bool", title: "Send A Push Notification", description: "Phone number", required: false)
 			}