MSA-1412: null

Fix: Gentle Wake Up requires contact input for Contact Book users [DVCSMP-1904]

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

@@ -1,118 +1,118 @@
-/**
+/**
- *  Copyright 2015 SmartThings
+ *  Copyright 2015 SmartThings
- *
+ *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  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:
+ *  in compliance with the License. You may obtain a copy of the License at:
- *
+ *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      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
+ *  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
+ *  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.
+ *  for the specific language governing permissions and limitations under the License.
- *
+ *
- *  Aeon Home Energy Meter
+ *  Aeon Home Energy Meter
- *
+ *
- *  Author: SmartThings
+ *  Author: SmartThings
- *
+ *
- *  Date: 2013-05-30
+ *  Date: 2013-05-30
- */
+ */
-metadata {
+metadata {
-	definition (name: "Aeon Home Energy Meter", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "Aeon Home Energy Meter", namespace: "smartthings", author: "SmartThings") {
-		capability "Energy Meter"
+		capability "Energy Meter"
-		capability "Power Meter"
+		capability "Power Meter"
-		capability "Configuration"
+		capability "Configuration"
-		capability "Sensor"
+		capability "Sensor"
-
+
-		command "reset"
+		command "reset"
-
+
-		fingerprint deviceId: "0x2101", inClusters: " 0x70,0x31,0x72,0x86,0x32,0x80,0x85,0x60"
+		fingerprint deviceId: "0x2101", inClusters: " 0x70,0x31,0x72,0x86,0x32,0x80,0x85,0x60"
-	}
+	}
-
+
-	// simulator metadata
+	// simulator metadata
-	simulator {
+	simulator {
-		for (int i = 0; i <= 10000; i += 1000) {
+		for (int i = 0; i <= 10000; i += 1000) {
-			status "power  ${i} W": new physicalgraph.zwave.Zwave().meterV1.meterReport(
+			status "power  ${i} W": new physicalgraph.zwave.Zwave().meterV1.meterReport(
-				scaledMeterValue: i, precision: 3, meterType: 4, scale: 2, size: 4).incomingMessage()
+				scaledMeterValue: i, precision: 3, meterType: 4, scale: 2, size: 4).incomingMessage()
-		}
+		}
-		for (int i = 0; i <= 100; i += 10) {
+		for (int i = 0; i <= 100; i += 10) {
-			status "energy  ${i} kWh": new physicalgraph.zwave.Zwave().meterV1.meterReport(
+			status "energy  ${i} kWh": new physicalgraph.zwave.Zwave().meterV1.meterReport(
-				scaledMeterValue: i, precision: 3, meterType: 0, scale: 0, size: 4).incomingMessage()
+				scaledMeterValue: i, precision: 3, meterType: 0, scale: 0, size: 4).incomingMessage()
-		}
+		}
-	}
+	}
-
+
-	// tile definitions
+	// tile definitions
-	tiles {
+	tiles {
-		valueTile("power", "device.power", decoration: "flat") {
+		valueTile("power", "device.power", decoration: "flat") {
-			state "default", label:'${currentValue} W'
+			state "default", label:'${currentValue} W'
-		}
+		}
-		valueTile("energy", "device.energy", decoration: "flat") {
+		valueTile("energy", "device.energy", decoration: "flat") {
-			state "default", label:'${currentValue} kWh'
+			state "default", label:'${currentValue} kWh'
-		}
+		}
-		standardTile("reset", "device.energy", inactiveLabel: false, decoration: "flat") {
+		standardTile("reset", "device.energy", inactiveLabel: false, decoration: "flat") {
-			state "default", label:'reset kWh', action:"reset"
+			state "default", label:'reset kWh', action:"reset"
-		}
+		}
-		standardTile("refresh", "device.power", inactiveLabel: false, decoration: "flat") {
+		standardTile("refresh", "device.power", inactiveLabel: false, decoration: "flat") {
-			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
+			state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh"
-		}
+		}
-		standardTile("configure", "device.power", inactiveLabel: false, decoration: "flat") {
+		standardTile("configure", "device.power", inactiveLabel: false, decoration: "flat") {
-			state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
+			state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
-		}
+		}
-
+
-		main (["power","energy"])
+		main (["power","energy"])
-		details(["power","energy", "reset","refresh", "configure"])
+		details(["power","energy", "reset","refresh", "configure"])
-	}
+	}
-}
+}
-
+
-def parse(String description) {
+def parse(String description) {
-	def result = null
+	def result = null
-	def cmd = zwave.parse(description, [0x31: 1, 0x32: 1, 0x60: 3])
+	def cmd = zwave.parse(description, [0x31: 1, 0x32: 1, 0x60: 3])
-	if (cmd) {
+	if (cmd) {
-		result = createEvent(zwaveEvent(cmd))
+		result = createEvent(zwaveEvent(cmd))
-	}
+	}
-	log.debug "Parse returned ${result?.descriptionText}"
+	log.debug "Parse returned ${result?.descriptionText}"
-	return result
+	return result
-}
+}
-
+
-def zwaveEvent(physicalgraph.zwave.commands.meterv1.MeterReport cmd) {
+def zwaveEvent(physicalgraph.zwave.commands.meterv1.MeterReport cmd) {
-	if (cmd.scale == 0) {
+	if (cmd.scale == 0) {
-		[name: "energy", value: cmd.scaledMeterValue, unit: "kWh"]
+		[name: "energy", value: cmd.scaledMeterValue, unit: "kWh"]
-	} else if (cmd.scale == 1) {
+	} else if (cmd.scale == 1) {
-		[name: "energy", value: cmd.scaledMeterValue, unit: "kVAh"]
+		[name: "energy", value: cmd.scaledMeterValue, unit: "kVAh"]
-	}
+	}
-	else {
+	else {
-		[name: "power", value: Math.round(cmd.scaledMeterValue), unit: "W"]
+		[name: "power", value: Math.round(cmd.scaledMeterValue), unit: "W"]
-	}
+	}
-}
+}
-
+
-def zwaveEvent(physicalgraph.zwave.Command cmd) {
+def zwaveEvent(physicalgraph.zwave.Command cmd) {
-	// Handles all Z-Wave commands we aren't interested in
+	// Handles all Z-Wave commands we aren't interested in
-	[:]
+	[:]
-}
+}
-
+
-def refresh() {
+def refresh() {
-	delayBetween([
+	delayBetween([
-		zwave.meterV2.meterGet(scale: 0).format(),
+		zwave.meterV2.meterGet(scale: 0).format(),
-		zwave.meterV2.meterGet(scale: 2).format()
+		zwave.meterV2.meterGet(scale: 2).format()
-	])
+	])
-}
+}
-
+
-def reset() {
+def reset() {
-	// No V1 available
+	// No V1 available
-	return [
+	return [
-		zwave.meterV2.meterReset().format(),
+		zwave.meterV2.meterReset().format(),
-		zwave.meterV2.meterGet(scale: 0).format()
+		zwave.meterV2.meterGet(scale: 0).format()
-	]
+	]
-}
+}
-
+
-def configure() {
+def configure() {
-	def cmd = delayBetween([
+	def cmd = delayBetween([
-		zwave.configurationV1.configurationSet(parameterNumber: 101, size: 4, scaledConfigurationValue: 4).format(),   // combined power in watts
+		zwave.configurationV1.configurationSet(parameterNumber: 101, size: 4, scaledConfigurationValue: 4).format(),   // combined power in watts
-		zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: 300).format(), // every 5 min
+		zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: 300).format(), // every 5 min
-		zwave.configurationV1.configurationSet(parameterNumber: 102, size: 4, scaledConfigurationValue: 8).format(),   // combined energy in kWh
+		zwave.configurationV1.configurationSet(parameterNumber: 102, size: 4, scaledConfigurationValue: 8).format(),   // combined energy in kWh
-		zwave.configurationV1.configurationSet(parameterNumber: 112, size: 4, scaledConfigurationValue: 300).format(), // every 5 min
+		zwave.configurationV1.configurationSet(parameterNumber: 112, size: 4, scaledConfigurationValue: 300).format(), // every 5 min
-		zwave.configurationV1.configurationSet(parameterNumber: 103, size: 4, scaledConfigurationValue: 0).format(),    // no third report
+		zwave.configurationV1.configurationSet(parameterNumber: 103, size: 4, scaledConfigurationValue: 0).format(),    // no third report
-		zwave.configurationV1.configurationSet(parameterNumber: 113, size: 4, scaledConfigurationValue: 300).format() // every 5 min
+		zwave.configurationV1.configurationSet(parameterNumber: 113, size: 4, scaledConfigurationValue: 300).format() // every 5 min
-	])
+	])
-	log.debug cmd
+	log.debug cmd
-	cmd
+	cmd
-}
+}

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)
 			}