MSA-1248: Adding simulator tags to allow windowShade capability be simulated.

SHARD-174: Hue (Connect) updated() calls can fail in certain situations

build.gradle

@@ -9,7 +9,7 @@ apply plugin: 'smartthings-slack'
 
 buildscript {
     dependencies {
-        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.7"
+        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.8"
     }
     repositories {
         mavenLocal()

devicetypes/capabilities/window-shade-capability.src/window-shade-capability.groovy

@@ -0,0 +1,68 @@
+/**
+ *  Copyright 2015 SmartThings
+ *
+ *  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: "Window Shade Capability", namespace: "capabilities", author: "SmartThings") {
+		capability "Window Shade"
+	}
+
+	// simulator metadata
+	simulator {
+		// status messages
+		status "closing": "windowShade:closing"
+        status "close": "windowShade:close"
+		status "open": "windowShade:open"
+        status "opening": "windowShade:opening"
+        status "partially open": "windowShade:partially open"
+        status "unknown": "windowShade:unknown"
+
+		// reply messages
+		reply "closing": "windowShade:closing"
+        reply "close": "windowShade:close"
+		reply "open": "windowShade:open"
+        reply "opening": "windowShade:opening"
+        reply "partially open": "windowShade:partially open"
+        reply "unknown": "windowShade:unknown"
+	}
+
+	// UI tile definitions
+	tiles {
+		standardTile("windowShade", "device.windowShade", width: 2, height: 2, canChangeIcon: true) {
+            state "close", label: '${name}', action: "windowShade.close", backgroundColor: "#000000", nextState: "opening"
+			state "closing", label: '${name}', action: "windowShade.close", backgroundColor: "#00039a", nextState: "closed"
+			state "open", label: '${name}', action: "windowShade.open", backgroundColor: "#ffffff", nextState: "closing"
+            state "opening", label: '${name}', action: "windowShade.open", backgroundColor: "#ffedc2", nextState: "open"
+            state "partially open", label: '${name}', action: "windowShade.partially open", backgroundColor: "#0a5eff"
+            state "unknown", label: '${name}', action: "windowShade.unknown", backgroundColor: "#ffa500"
+		}
+		main "windowShade"
+		details "windowShade"
+	}
+}
+
+def parse(String description) {
+	def pair = description.split(":")
+	createEvent(name: pair[0].trim(), value: pair[1].trim())
+}
+
+def open() {
+	'open'
+}
+
+def close() {
+	'close'
+}
+
+def presetPosition() {
+    'partially open'
+}

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

@@ -80,19 +80,31 @@ metadata {
 			state "default", label:''
 		}
 
-		main("standard1")
+		// multi-line text (explicit newlines)
+		standardTile("multiLine", "device.multiLine", width: 2, height: 2) {
+			state "default", label: '${currentValue}'
+		}
+
+		standardTile("multiLineWithIcon", "device.multiLine", width: 2, height: 2) {
+			state "default", label: '${currentValue}', icon: "st.switches.switch.off"
+		}
+
+		main("actionRings")
 		details([
 			"actionRings", "actionFlat", "noActionFlat",
 
 			"flatLabel", "flatIconLabel", "flatIcon",
 
 			"flatDefaultState", "flatImplicitDefaultState1", "flatImplicitDefaultState2",
+
+			"multiLine", "multiLineWithIcon"
 		])
 	}
 }
 
 def installed() {
 	sendEvent(name: "switch", value: "off")
+	sendEvent(name: "multiLine", value: "Line 1\nLine 2\nLine 3")
 }
 
 def parse(String description) {

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

@@ -69,16 +69,25 @@ metadata {
 			]
 		}
 
-		valueTile("noValue", "device.nada", width: 2, height: 2) {
+		valueTile("noValue", "device.nada", width: 4, height: 2) {
 			state "default", label:'${currentValue}'
 		}
 
+		valueTile("multiLine", "device.multiLine", width: 3, height: 2) {
+			state "default", label: '${currentValue}'
+		}
+
+		valueTile("multiLineWithIcon", "device.multiLine", width: 3, height: 2) {
+			state "default", label: '${currentValue}', icon: "st.switches.switch.off"
+		}
+
 		main("text")
 		details([
 			"text", "longText", "integer", 
             "integerFloat", "pi", "floatAsText",
             "bgColor", "bgColorRange", "bgColorRangeSingleItem",
-            "bgColorRangeConflict", "noValue"
+            "bgColorRangeConflict", "noValue",
+            "multiLine", "multiLineWithIcon"
 		])
 	}
 }
@@ -90,6 +99,7 @@ def installed() {
 	sendEvent(name: "integerFloat", value: 47.0)
 	sendEvent(name: "pi", value: 3.14159)
 	sendEvent(name: "floatAsText", value: "3.14159")
+	sendEvent(name: "multiLine", value: "Line 1\nLine 2\nLine 3")
 }
 
 def parse(String description) {

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

@@ -67,14 +67,47 @@ metadata {
 				attributeState "VALUE_DOWN", action: "levelDown"
 			}
 		}
+		multiAttributeTile(name:"lengthyTile", type:"generic", width:6, height:4) {
+			tileAttribute("device.lengthyText", key: "PRIMARY_CONTROL") {
+				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 "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 "default", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821"
+			}
+			tileAttribute("device.multilineText", key: "SECONDARY_CONTROL") {
+				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 "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 "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 "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 "default", label:'Line 1 YES\nLine 2 YES\nLine 3 NO', backgroundColor:"#79b821", icon: "st.switches.switch.on"
+			}
+		}
 
 		main(["basicTile"])
-		details(["basicTile", "sliderTile", "valueTile"])
+		details(["basicTile", "sliderTile", "valueTile", "lengthyTile", "multilineTile", "lengthyTileWithIcon", "multilineTileWithIcon"])
 	}
 }
 
 def installed() {
-
+	sendEvent(name: "lengthyText", value: "The value of this tile is long and should wrap to two lines")
+	sendEvent(name: "multilineText", value: "Line 1 YES\nLine 2 YES\nLine 3 NO")
 }
 
 def parse() {

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

@@ -25,7 +25,10 @@ metadata {
 
 		fingerprint deviceId: "0x2001", inClusters: "0x30,0x80,0x84,0x85,0x86,0x72"
 		fingerprint deviceId: "0x07", inClusters: "0x30"
+		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x98"
 		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x86,0x72,0x98", outClusters: "0x5A,0x82"
+		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x80,0x71,0x85,0x70,0x72,0x86,0x30,0x31,0x84,0x59,0x73,0x5A,0x8F,0x98,0x7A", outClusters:"0x20" // Philio multi+
+		fingerprint deviceId: "0x0701", inClusters: "0x5E,0x72,0x5A,0x80,0x73,0x86,0x84,0x85,0x59,0x71,0x70,0x7A,0x98" // Vision door/window
 	}
 
 	// simulator metadata
@@ -240,7 +243,7 @@ def batteryGetCommand() {
 def retypeBasedOnMSR() {
 	switch (state.MSR) {
 		case "0086-0002-002D":
-			log.debug("Changing device type to Z-Wave Water Sensor")
+			log.debug "Changing device type to Z-Wave Water Sensor"
 			setDeviceType("Z-Wave Water Sensor")
 			break
 		case "011F-0001-0001":  // Schlage motion
@@ -249,9 +252,16 @@ def retypeBasedOnMSR() {
 		case "0060-0001-0002":  // Everspring SP814
 		case "0060-0001-0003":  // Everspring HSP02
 		case "011A-0601-0901":  // Enerwave ZWN-BPC
-			log.debug("Changing device type to Z-Wave Motion Sensor")
+			log.debug "Changing device type to Z-Wave Motion Sensor"
 			setDeviceType("Z-Wave Motion Sensor")
 			break
-		
+		case "013C-0002-000D":  // Philio multi +
+			log.debug "Changing device type to 3-in-1 Multisensor Plus (SG)"
+			setDeviceType("3-in-1 Multisensor Plus (SG)")
+			break
+		case "0109-2001-0106":  // Vision door/window
+			log.debug "Changing device type to Door / Window Sensor Plus (SG)"
+			setDeviceType("Door / Window Sensor Plus (SG)")
+			break
 	}
 }

smartapps/eyxar/eyxar-notifications.src/eyxar-notifications.groovy

@@ -1,136 +0,0 @@
-/**
- *  Copyright 2016 EyXAR
- *
- *  All rights reserved. No part of this code may be reproduced, distributed, or modified in any form or by any means,
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. 
- * 
- *  For ST app: https://play.google.com/store/apps/details?id=eyxar.com.forst
- *  http://www.eyxar.com
- *
- *  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.
- *
- *  EyXAr Notifications
- *
- *  Author: EyXAr
- *  Published: 2016-02-14
- */
-
-
-definition(
-    name: "EyXAr Notifications",
-    namespace: "eyxar",
-    author: "EyXAr",
-    description: "Enable SmartThings the capability to add voice notifications to your Phones or Tablet anywhere in conjuction with For ST app. https://play.google.com/store/apps/details?id=eyxar.com.forst",
-    category: "SmartThings Labs",
-    iconUrl: "https://s3.amazonaws.com/for-st/For_ST_60px.png",
-    iconX2Url: "https://s3.amazonaws.com/for-st/For_ST_120px.png",
-    iconX3Url: "https://s3.amazonaws.com/for-st/For_ST_256px.png"
-    )
-
-/* For ST will only work if EyXAr Notification is installed and set-up first. */
-
-preferences {
-     section("EyXAr Auto Notifications - For Voice Notification, Install the app 'FOR ST' in Google Play")
-      {
-        input "door", "capability.contactSensor", title: "Monitor Contact Sensor When Nobody's Home", required: false, multiple: true
-    }   
-
-    section("Send Notifications by Text or use below option?") {
-        input("recipients", "contact", title: "Send notifications to"){
-        input "phone", "phone", title: "Phone Number (optional, text charges may apply)",
-                description: "Phone Number", required: false
-        }
-    }
-
- section("If combine with 'For ST' android app, this will add features of voice notifications.") {
-        input "sendPush", "bool", required: false,
-              title: "Phone/Tablet Auto Notification (Must be set to On =>>)"
-        }   
-    }
-
-/* Presense */    
-
- section("Arriving and Leaving Auto Notifications - For Voice notifications install 'FOR ST' in Google Play") {
-    input "presence", "capability.presenceSensor", title: "Select Phone/Tablet to Detect (Set Specific Mode Below to Minimize Notifications)", required: false, multiple: true
-      }
-
-def installed() {
-    initialize()
-/* Presense */     
-    subscribe(door, "contact.open", doorOpenHandler)
-    subscribe(door, "contact.closed", doorClosedHandler)
-    subscribe(presence, "presence", myHandler)
-    subscribe(presence, "presence", presenceHandler)
-}
-
-def updated() {
-    initialize()
-}
-
-def initialize() {
-    subscribe(door, "contact.open", doorOpenHandler)
-    subscribe(door, "contact.closed", doorClosedHandler)
-    subscribe(presence, "presence", myHandler)
-    subscribe(presence, "presence", presenceHandler)
-    
-}
-
-def doorOpenHandler(evt) {
-    def message = "EyXAr Detected the ${evt.displayName} is ${evt.value}!"
-    if (sendPush) {
-        sendPush(message)
-    }
-    if (phone) {
-        sendSms(phone, message)
-    }
-}
-
-def doorClosedHandler(evt) {
-    def message = "EyXAr Detected the ${evt.displayName} is ${evt.value}!"
-    if (sendPush) {
-        sendPush(message)
-    }
-    if (phone) {
-        sendSms(phone, message)
-    }
-}
-
-def contactHandler(evt) {
-  if("open" == evt.value)
-
-    // contact was opened, turn on a light maybe?
-    log.debug "Contact is in ${evt.value} state"
-
-  if("closed" == evt.value)
-    // contact was closed, turn off the light?
-    log.debug "Contact is in ${evt.value} state"
-}
-
-/* Presense */  
-def myHandler(evt) {
-  if("present" == evt.value)
-    def message = "EyXAr Detected ${evt.displayName} is ${evt.value}!"
-    if (sendPush) {
-        sendPush(message)
-    }
-    if (phone) {
-        sendSms(phone, message)
-    }
-}
-
-def presenceHandler(evt) {
-
-    if (evt.value == "present") {
-        log.debug "EyXAr ${evt.displayName} has arrived at the ${location}!"
-        sendPush("EyXAr ${evt.displayName} has arrived at the ${location}!")
-    } else if (evt.value == "not present") {
-
-        log.debug "EyXAr ${evt.displayName} has left the ${location}!"
-
-        sendPush("EyXAr ${evt.displayName} has left the ${location}!")
-
-    }
-}

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

@@ -332,8 +332,7 @@ private addChildBulb(dni, hueType, name, hub, update=false, device = null) {
 
 	if (deviceType) {
 		return addChildDevice("smartthings", deviceType, dni, hub, ["label": name])
-	}
-	else {
+	} else {
 		log.warn "Device type $hueType not supported"
 		return null
 	}
@@ -349,8 +348,10 @@ def addBulbs() {
 				newHueBulb = bulbs.find { (app.id + "/" + it.value.id) == dni }
                 if (newHueBulb != null) {
                     d = addChildBulb(dni, newHueBulb?.value?.type, newHueBulb?.value?.name, newHueBulb?.value?.hub)
-                    log.debug "created ${d.displayName} with id $dni"
-                    d.refresh()
+					if (d) {
+						log.debug "created ${d.displayName} with id $dni"
+						d.refresh()
+					}
                 } else {
                 	log.debug "$dni in not longer paired to the Hue Bridge or ID changed"
                 }
@@ -358,7 +359,7 @@ def addBulbs() {
             	//backwards compatable
 				newHueBulb = bulbs.find { (app.id + "/" + it.id) == dni }
 				d = addChildBulb(dni, "Extended Color Light", newHueBulb?.value?.name, newHueBulb?.value?.hub)
-                d.refresh()
+				d?.refresh()
 			}
 		} else {
 			log.debug "found ${d.displayName} with id $dni already exists, type: '$d.typeName'"