MSA-2097: Simple Hue Bulb Template.

Rolling down staging to master

devicetypes/plaidsystems/spruce-sensor.src/spruce-sensor.groovy

@@ -1,5 +1,5 @@
 /**
- *  Spruce Sensor -Pre-release V2 10/8/2015
+ *  Spruce Sensor -updated with SLP model number 5/2017
  *
  *  Copyright 2014 Plaid Systems
  *
@@ -14,25 +14,33 @@
  *
  -------10/20/2015 Updates--------
  -Fix/add battery reporting interval to update
- -remove polling and/or refresh(?)
+ -remove polling and/or refresh
+ 
+ -------5/2017 Updates--------
+ -Add fingerprints for SLP
+ -add device health, check every 60mins + 2mins
  */
+ 
 metadata {
-	definition (name: "Spruce Sensor", namespace: "plaidsystems", author: "NCauffman") {
+	definition (name: "Spruce Sensor", namespace: "plaidsystems", author: "Plaid Systems") {
 		
 		capability "Configuration"
 		capability "Battery"
         capability "Relative Humidity Measurement"
         capability "Temperature Measurement"
         capability "Sensor"
+        capability "Health Check"
         //capability "Polling"
 		
         attribute "maxHum", "string"
         attribute "minHum", "string"        
         
+        
         command "resetHumidity"
         command "refresh"
         
-        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0402,0405", outClusters: "0003, 0019", manufacturer: "PLAID SYSTEMS", model: "PS-SPRZMS-01"
+        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0402,0405", outClusters: "0003, 0019", manufacturer: "PLAID SYSTEMS", model: "PS-SPRZMS-01", deviceJoinName: "Spruce Sensor"
+        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0402,0405", outClusters: "0003, 0019", manufacturer: "PLAID SYSTEMS", model: "PS-SPRZMS-SLP1", deviceJoinName: "Spruce Sensor"
 	}
 
 	preferences {
@@ -293,6 +301,11 @@ def setConfig(){
     sendEvent(name: 'configuration',value: configInterval, descriptionText: "Configuration initialized")
 }
 
+def installed(){
+	//check every 1 hour + 2mins
+    sendEvent(name: "checkInterval", value: 1 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+}
+
 //when device preferences are changed
 def updated(){	
     log.debug "device updated"
@@ -303,6 +316,8 @@ def updated(){
             sendEvent(name: 'configuration',value: 0, descriptionText: "Settings changed and will update at next report. Measure interval set to ${interval} mins")
     	}
     }
+    //check every 1 hour + 2mins
+    sendEvent(name: "checkInterval", value: 1 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
 }
 
 //poll
@@ -395,4 +410,4 @@ private byte[] reverseArray(byte[] array) {
         i++;
     }
     return array
-}
+}

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

@@ -1,203 +1,202 @@
-//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
+//DEPRECATED. INTEGRATION MOVED TO SUPER LAN CONNECT
-
+
-/**
+/**
- *  Hue Bulb
+ *  Hue Bulb
- *
+ *
- *  Philips Hue Type "Extended Color Light"
+ *  Philips Hue Type "Extended Color Light"
- *
+ *
- *  Author: SmartThings
+ *  Author: SmartThings
- */
+ */
-
+
-// for the UI
+// for the UI
-metadata {
+metadata {
-	// Automatically generated. Make future change here.
+	// Automatically generated. Make future change here.
-	definition (name: "Hue Bulb", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "Hue Bulb", namespace: "smartthings", author: "SmartThings") {
-		capability "Switch Level"
+		capability "Switch Level"
-		capability "Actuator"
+		capability "Actuator"
-		capability "Color Control"
+		capability "Color Control"
-		capability "Color Temperature"
+		capability "Color Temperature"
-		capability "Switch"
+		capability "Switch"
-		capability "Refresh"
+		capability "Refresh"
-		capability "Sensor"
+		capability "Sensor"
-		capability "Health Check"
+		capability "Health Check"
-		capability "Light"
+		capability "Light"
-
+
-		command "setAdjustedColor"
+		command "setAdjustedColor"
-        command "reset"
+        command "reset"
-        command "refresh"
+        command "refresh"
-	}
+	}
-
+
-	simulator {
+	simulator {
-		// TODO: define status and reply messages here
+		// TODO: define status and reply messages here
-	}
+	}
-
+
-	tiles (scale: 2){
+	tiles (scale: 2){
-		multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){
+		multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){
-			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
+			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
-				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+				attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
+				attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff"
-				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+				attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-			}
+			}
-			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
+			tileAttribute ("device.level", key: "SLIDER_CONTROL") {
-				attributeState "level", action:"switch level.setLevel", range:"(0..100)"
+				attributeState "level", action:"switch level.setLevel", range:"(0..100)"
-            }
+            }
-			tileAttribute ("device.color", key: "COLOR_CONTROL") {
+			tileAttribute ("device.color", key: "COLOR_CONTROL") {
-				attributeState "color", action:"setAdjustedColor"
+				attributeState "color", action:"setAdjustedColor"
-			}
+			}
-		}
+		}
-
+
-    controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
+    controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
-        state "colorTemperature", action:"color temperature.setColorTemperature"
+        state "colorTemperature", action:"color temperature.setColorTemperature"
-    }
+    }
-
+
-    valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+    valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-        state "colorTemperature", label: 'WHITES'
+        state "colorTemperature", label: 'WHITES'
-    }
+    }
-
+
-		standardTile("reset", "device.reset", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
+		standardTile("reset", "device.reset", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
-			state "default", label:"Reset To White", action:"reset", icon:"st.lights.philips.hue-single"
+			state "default", label:"Reset To White", action:"reset", icon:"st.lights.philips.hue-single"
-		}
+		}
-
+
-		standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
+		standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
-			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+			state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-		}
+		}
-
+
-		main(["rich-control"])
+		main(["rich-control"])
-		details(["rich-control", "colorTempSliderControl", "colorTemp", "reset", "refresh"])
+		details(["rich-control", "colorTempSliderControl", "colorTemp", "reset", "refresh"])
-	}
+	}
-}
+}
-
+
-def initialize() {
+def initialize() {
-	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
+	sendEvent(name: "DeviceWatch-Enroll", value: "{\"protocol\": \"LAN\", \"scheme\":\"untracked\", \"hubHardwareId\": \"${device.hub.hardwareID}\"}", displayed: false)
-}
+}
-
+
-void installed() {
+void installed() {
-	log.debug "installed()"
+	log.debug "installed()"
-	initialize()
+	initialize()
-}
+}
-
+
-def updated() {
+def updated() {
-	log.debug "updated()"
+	log.debug "updated()"
-	initialize()
+	initialize()
-}
+}
-
+
-// parse events into attributes
+// parse events into attributes
-def parse(description) {
+def parse(description) {
-	log.debug "parse() - $description"
+	log.debug "parse() - $description"
-	def results = []
+	def results = []
-
+
-	def map = description
+	def map = description
-	if (description instanceof String)  {
+	if (description instanceof String)  {
-		log.debug "Hue Bulb stringToMap - ${map}"
+		log.debug "Hue Bulb stringToMap - ${map}"
-		map = stringToMap(description)
+		map = stringToMap(description)
-	}
+	}
-
+
-	if (map?.name && map?.value) {
+	if (map?.name && map?.value) {
-		results << createEvent(name: "${map?.name}", value: "${map?.value}")
+		results << createEvent(name: "${map?.name}", value: "${map?.value}")
-	}
+	}
-	results
+	results
-}
+}
-
+
-// handle commands
+// handle commands
-void on() {
+void on() {
-	log.trace parent.on(this)
+	log.trace parent.on(this)
-}
+}
-
+
-void off() {
+void off() {
-	log.trace parent.off(this)
+	log.trace parent.off(this)
-}
+}
-
+
-void setLevel(percent) {
+void setLevel(percent) {
-    log.debug "Executing 'setLevel'"
+    log.debug "Executing 'setLevel'"
-    if (verifyPercent(percent)) {
+    if (verifyPercent(percent)) {
-	    log.trace parent.setLevel(this, percent)
+	    log.trace parent.setLevel(this, percent)
-    }
+    }
-}
+}
-
+
-void setSaturation(percent) {
+void setSaturation(percent) {
-    log.debug "Executing 'setSaturation'"
+    log.debug "Executing 'setSaturation'"
-    if (verifyPercent(percent)) {
+    if (verifyPercent(percent)) {
-	    log.trace parent.setSaturation(this, percent)
+	    log.trace parent.setSaturation(this, percent)
-    }
+    }
-}
+}
-
+
-void setHue(percent) {
+void setHue(percent) {
-    log.debug "Executing 'setHue'"
+    log.debug "Executing 'setHue'"
-    if (verifyPercent(percent)) {
+    if (verifyPercent(percent)) {
-	    log.trace parent.setHue(this, percent)
+	    log.trace parent.setHue(this, percent)
-    }
+    }
-}
+}
-
+
-void setColor(value) {
+void setColor(value) {
-    def events = []
+    def events = []
-    def validValues = [:]
+    def validValues = [:]
-
+
-    if (verifyPercent(value.hue)) {
+    if (verifyPercent(value.hue)) {
-        validValues.hue = value.hue
+        validValues.hue = value.hue
-    }
+    }
-    if (verifyPercent(value.saturation)) {
+    if (verifyPercent(value.saturation)) {
-        validValues.saturation = value.saturation
+        validValues.saturation = value.saturation
-    }
+    }
-    if (value.hex != null) {
+    if (value.hex != null) {
-        if (value.hex ==~ /^\#([A-Fa-f0-9]){6}$/) {
+        if (value.hex ==~ /^\#([A-Fa-f0-9]){6}$/) {
-            validValues.hex = value.hex
+            validValues.hex = value.hex
-        } else {
+        } else {
-            log.warn "$value.hex is not a valid color"
+            log.warn "$value.hex is not a valid color"
-        }
+        }
-    }
+    }
-    if (verifyPercent(value.level)) {
+    if (verifyPercent(value.level)) {
-        validValues.level = value.level
+        validValues.level = value.level
-    }
+    }
-    if (value.switch == "off" || (value.level != null && value.level <= 0)) {
+    if (value.switch == "off" || (value.level != null && value.level <= 0)) {
-        validValues.switch = "off"
+        validValues.switch = "off"
-    } else {
+    } else {
-        validValues.switch = "on"
+        validValues.switch = "on"
-    }
+    }
-    if (!validValues.isEmpty()) {
+    if (!validValues.isEmpty()) {
-	    log.trace parent.setColor(this, validValues)
+	    log.trace parent.setColor(this, validValues)
-    }
+    }
-}
+}
-
+
-void reset() {
+void reset() {
-    log.debug "Executing 'reset'"
+    log.debug "Executing 'reset'"
-	setColorTemperature(4000)
+	setColorTemperature(4000)
-}
+}
-
+
-void setAdjustedColor(value) {
+void setAdjustedColor(value) {
-    if (value) {
+    if (value) {
-        log.trace "setAdjustedColor: ${value}"
+        log.trace "setAdjustedColor: ${value}"
-        def adjusted = value + [:]
+        def adjusted = value + [:]
-        // Needed because color picker always sends 100
+        // Needed because color picker always sends 100
-        adjusted.level = null
+        adjusted.level = null
-	    setColor(adjusted)
+	    setColor(adjusted)
-    } else {
+    } else {
-        log.warn "Invalid color input $value"
+        log.warn "Invalid color input $value"
-    }
+    }
-}
+}
-
+
-void setColorTemperature(value) {
+void setColorTemperature(value) {
-    if (value) {
+    if (value) {
-        log.trace "setColorTemperature: ${value}k"
+        log.trace "setColorTemperature: ${value}k"
-	    log.trace parent.setColorTemperature(this, value)
+	    log.trace parent.setColorTemperature(this, value)
-    } else {
+    } else {
-        log.warn "Invalid color temperature $value"
+        log.warn "Invalid color temperature $value"
-    }
+    }
-}
+}
-
+
-void refresh() {
+void refresh() {
-    log.debug "Executing 'refresh'"
+    log.debug "Executing 'refresh'"
-    parent?.manualRefresh()
+    parent?.manualRefresh()
-}
+}
-
+
-def verifyPercent(percent) {
+def verifyPercent(percent) {
-    if (percent == null)
+    if (percent == null)
-        return false
+        return false
-    else if (percent >= 0 && percent <= 100) {
+    else if (percent >= 0 && percent <= 100) {
-        return true
+        return true
-    } else {
+    } else {
-        log.warn "$percent is not 0-100"
+        log.warn "$percent is not 0-100"
-        return false
+        return false
-    }
+    }
-}
+}
-

smartapps/smartthings/examples/every-element.src/every-element.groovy

@@ -202,7 +202,8 @@ def inputSelectionPage() {
 
         section("options variations") {
             paragraph "tap these elements and look at the differences when selecting an option"
-            input(type: "enum", name: "selectionSimple", title: "Simple options", description: "no separators in the selectable options", groupedOptions: addGroup(englishOptions + spanishOptions))
+            input(type: "enum", name: "selectionSimple", title: "Simple options", description: "no separators in the selectable options", options: ["Thing 1", "Thing 2", "(Complicated) Thing 3"])
+            input(type: "enum", name: "selectionSimpleGrouped", title: "Simple (Grouped) options", description: "no separators in the selectable options", groupedOptions: addGroup(englishOptions + spanishOptions))
             input(type: "enum", name: "selectionGrouped", title: "Grouped options", description: "separate groups of options with headers", groupedOptions: groupedOptions)
         }
 
@@ -214,15 +215,15 @@ def inputSelectionPage() {
 
         section("segmented") {
             paragraph "segmented should only work if there are either 2 or 3 options to choose from"
-            input(type: "enum", name: "selectionSegmented1", style: "segmented", title: "1 option", groupedOptions: addGroup(["One"]))
+            input(type: "enum", name: "selectionSegmented1", style: "segmented", title: "1 option", options: ["One"])
-            input(type: "enum", name: "selectionSegmented4", style: "segmented", title: "4 options", groupedOptions: addGroup(["One", "Two", "Three", "Four"]))
+            input(type: "enum", name: "selectionSegmented4", style: "segmented", title: "4 options", options: ["One", "Two", "Three", "Four"])
 
             paragraph "multiple and required will have no effect on segmented selection elements. There will always be exactly 1 option selected"
             input(type: "enum", name: "selectionSegmented2", style: "segmented", title: "2 options", options: ["One", "Two"])
             input(type: "enum", name: "selectionSegmented3", style: "segmented", title: "3 options", options: ["One", "Two", "Three"])
 
             paragraph "specifying defaultValue still works with segmented selection elements"
-            input(type: "enum", name: "selectionSegmentedWithDefault", title: "defaulted to 'two'", groupedOptions: addGroup(["One", "Two", "Three"]), defaultValue: "Two")
+            input(type: "enum", name: "selectionSegmentedWithDefault", style: "segmented", title: "defaulted to 'two'", options: ["One", "Two", "Three"], defaultValue: "Two")
         }
 
         section("required: true") {
@@ -231,6 +232,8 @@ def inputSelectionPage() {
 
         section("multiple: true") {
             input(type: "enum", name: "selectionMultiple", title: "This allows multiple selections", description: "It should look different when nothing is selected", groupedOptions: addGroup(["an option", "another option", "no way, one more?"]), multiple: true)
+            input(type: "enum", name: "selectionMultipleDefault1", title: "This allows multiple selections with a single default", description: "It should look different when nothing is selected", groupedOptions: addGroup(["an option", "another option", "no way, one more?"]), multiple: true, defaultValue: "an option")
+            input(type: "enum", name: "selectionMultipleDefault2", title: "This allows multiple selections with multiple defaults", description: "It should look different when nothing is selected", groupedOptions: addGroup(["an option", "another option", "no way, one more?"]), multiple: true, defaultValue: ["an option", "another option"])
         }
 
         section("with image") {

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

@@ -72,7 +72,7 @@ def authPage() {
 		log.debug "have LIFX access token"
 
 		def options = locationOptions() ?: []
-		def count = options.size()
+		def count = options.size().toString()
 
 		return dynamicPage(name:"Credentials", title:"", nextPage:"", install:true, uninstall: true) {
 			section("Select your location") {