MSA-2138: See my accessibzj

Rolling down staging to master

devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy

@@ -133,8 +133,8 @@ def updated() {
 }
 
 def initialize() {
-	// Arrival sensors only goes OFFLINE when Hub is off
+	// Device only goes OFFLINE when Hub is off
-	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zigbee", scheme:"untracked"]), displayed: false)
+	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zwave", scheme:"untracked"]), displayed: false)
 
 	def zwMap = getZwaveInfo()
 	def buttons = 4 // Default for Key Fob

devicetypes/smartthings/aeon-minimote.src/aeon-minimote.groovy

@@ -111,7 +111,6 @@ def configure() {
 	return cmds
 }
 
-
 def installed() {
 	initialize()
 }
@@ -121,7 +120,7 @@ def updated() {
 }
 
 def initialize() {
-	// Arrival sensors only goes OFFLINE when Hub is off
+	// Device only goes OFFLINE when Hub is off
-	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zigbee", scheme:"untracked"]), displayed: false)
+	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zwave", scheme:"untracked"]), displayed: false)
 	sendEvent(name: "numberOfButtons", value: 4)
 }

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

@@ -72,7 +72,7 @@ def createEvents(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
 
 def poll() {
 	if (secondsPast(state.lastbatt, 36*60*60)) {
-		return zwave.batteryV1.batteryGet().format
+		return zwave.batteryV1.batteryGet().format()
 	} else {
 		return null
 	}

smartapps/smartthings/text-me-when-theres-motion-and-im-not-here.src/text-me-when-theres-motion-and-im-not-here.groovy

@@ -1,77 +1,77 @@
-/**
+/**
- *  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.
- *
+ *
- *  Text Me When There's Motion and I'm Not Here
+ *  Text Me When There's Motion and I'm Not Here
- *
+ *
- *  Author: SmartThings
+ *  Author: SmartThings
- */
+ */
-
+
-definition(
+definition(
-    name: "Text Me When There's Motion and I'm Not Here",
+    name: "Text Me When There's Motion and I'm Not Here",
-    namespace: "smartthings",
+    namespace: "smartthings",
-    author: "SmartThings",
+    author: "SmartThings",
-    description: "Send a text message when there is motion while you are away.",
+    description: "Send a text message when there is motion while you are away.",
-    category: "Convenience",
+    category: "Convenience",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Meta/intruder_motion-presence.png",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Meta/intruder_motion-presence.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Meta/intruder_motion-presence@2x.png"
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Meta/intruder_motion-presence@2x.png"
-)
+)
-
+
-preferences {
+preferences {
-	section("When there's movement...") {
+	section("When there's movement...") {
-		input "motion1", "capability.motionSensor", title: "Where?"
+		input "motion1", "capability.motionSensor", title: "Where?"
-	}
+	}
-	section("While I'm out...") {
+	section("While I'm out...") {
-		input "presence1", "capability.presenceSensor", title: "Who?"
+		input "presence1", "capability.presenceSensor", title: "Who?"
-	}
+	}
-	section("Text me at...") {
+	section("Text me at...") {
-        input("recipients", "contact", title: "Send notifications to") {
+        input("recipients", "contact", title: "Send notifications to") {
-            input "phone1", "phone", title: "Phone number?"
+            input "phone1", "phone", title: "Phone number?"
-        }
+        }
-	}
+	}
-}
+}
-
+
-def installed() {
+def installed() {
-	subscribe(motion1, "motion.active", motionActiveHandler)
+	subscribe(motion1, "motion.active", motionActiveHandler)
-}
+}
-
+
-def updated() {
+def updated() {
-	unsubscribe()
+	unsubscribe()
-	subscribe(motion1, "motion.active", motionActiveHandler)
+	subscribe(motion1, "motion.active", motionActiveHandler)
-}
+}
-
+
-def motionActiveHandler(evt) {
+def motionActiveHandler(evt) {
-	log.trace "$evt.value: $evt, $settings"
+	log.trace "$evt.value: $evt, $settings"
-
+
-	if (presence1.latestValue("presence") == "not present") {
+	if (presence1.latestValue("presence") == "not present") {
-		// Don't send a continuous stream of text messages
+		// Don't send a continuous stream of text messages
-		def deltaSeconds = 10
+		def deltaSeconds = 10
-		def timeAgo = new Date(now() - (1000 * deltaSeconds))
+		def timeAgo = new Date(now() - (1000 * deltaSeconds))
-		def recentEvents = motion1.eventsSince(timeAgo)
+		def recentEvents = motion1.eventsSince(timeAgo)
-		log.debug "Found ${recentEvents?.size() ?: 0} events in the last $deltaSeconds seconds"
+		log.debug "Found ${recentEvents?.size() ?: 0} events in the last $deltaSeconds seconds"
-		def alreadySentSms = recentEvents.count { it.value && it.value == "active" } > 1
+		def alreadySentSms = recentEvents.count { it.value && it.value == "active" } > 1
-
+
-		if (alreadySentSms) {
+		if (alreadySentSms) {
-			log.debug "SMS already sent within the last $deltaSeconds seconds"
+			log.debug "SMS already sent within the last $deltaSeconds seconds"
-		} else {
+		} else {
-            if (location.contactBookEnabled) {
+            if (location.contactBookEnabled) {
-                log.debug "$motion1 has moved while you were out, sending notifications to: ${recipients?.size()}"
+                log.debug "$motion1 has moved while you were out, sending notifications to: ${recipients?.size()}"
-                sendNotificationToContacts("${motion1.label} ${motion1.name} moved while you were out", recipients)
+                sendNotificationToContacts("${motion1.label} ${motion1.name} moved while you were out", recipients)
-            }
+            }
-            else {
+            else {
-                log.debug "$motion1 has moved while you were out, sending text"
+                log.debug "$motion1 has moved while you were out, sending text"
-                sendSms(phone1, "${motion1.label} ${motion1.name} moved while you were out")
+                sendSms(phone1, "${motion1.label} ${motion1.name} moved while you were out")
-            }
+            }
-		}
+		}
-	} else {
+	} else {
-		log.debug "Motion detected, but presence sensor indicates you are present"
+		log.debug "Motion detected, but presence sensor indicates you are present"
-	}
+	}
-}
+}