MSA-944: test

Update simulated thermostat with new functionality and brand colors

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

@@ -1,112 +1,97 @@
-/**
+/**
- *  Hue Lux Bulb
+ *  Hue Lux Bulb
- *
+ *
- *  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 Lux Bulb", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "Hue Lux Bulb", namespace: "smartthings", author: "SmartThings") {
-		capability "Switch Level"
+		capability "Switch Level"
-		capability "Actuator"
+		capability "Actuator"
-		capability "Color Temperature"
+		capability "Color Temperature"
-		capability "Switch"
+		capability "Switch"
-		capability "Refresh"
+		capability "Refresh"
-		capability "Sensor"
+		capability "Sensor"
-
+
-        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", canChangeIcon: true){
+        multiAttributeTile(name:"rich-control", type: "lighting", 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:"#79b821", nextState:"turningOff"
+              attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", 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:"#79b821", nextState:"turningOff"
+              attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", 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.level", key: "SECONDARY_CONTROL") {
+            tileAttribute ("device.level", key: "SECONDARY_CONTROL") {
-	            attributeState "level", label: 'Level ${currentValue}%'
+	            attributeState "level", label: 'Level ${currentValue}%'
-			}
+			}
-        }
+        }
-
+
-		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
+		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+			state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-			state "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+			state "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-			state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
+			state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff"
-			state "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
+			state "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn"
-        }
+        }
-
+				
-        controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false, range:"(0..100)") {
+        controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false, range:"(0..100)") {
-            state "level", action:"switch level.setLevel"
+            state "level", action:"switch level.setLevel"
-        }
+        }
-
+
-        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
+        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorTemperature", action:"color temperature.setColorTemperature"
+            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-        }
+        }
-        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+
-            state "colorTemperature", label: '${currentValue} K'
+        main(["switch"])
-        }
+        details(["rich-control", "colorTempSliderControl","refresh"])
-
+    }
-        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
+}
-            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+
-        }
+// parse events into attributes
-
+def parse(description) {
-        main(["switch"])
+	log.debug "parse() - $description"
-        details(["rich-control", "colorTempSliderControl", "colorTemp", "refresh"])
+	def results = []
-    }
+
-}
+	def map = description
-
+	if (description instanceof String)  {
-// parse events into attributes
+		log.debug "Hue Bulb stringToMap - ${map}"
-def parse(description) {
+		map = stringToMap(description)
-	log.debug "parse() - $description"
+	}
-	def results = []
+
-
+	if (map?.name && map?.value) {
-	def map = description
+		results << createEvent(name: "${map?.name}", value: "${map?.value}")
-	if (description instanceof String)  {
+	}
-		log.debug "Hue Bulb stringToMap - ${map}"
+	results
-		map = stringToMap(description)
+}
-	}
+
-
+// handle commands
-	if (map?.name && map?.value) {
+void on() {
-		results << createEvent(name: "${map?.name}", value: "${map?.value}")
+	parent.on(this)
-	}
+	sendEvent(name: "switch", value: "on")
-	results
+}
-}
+
-
+void off() {
-// handle commands
+	parent.off(this)
-void on() {
+	sendEvent(name: "switch", value: "off")
-	parent.on(this)
+}
-	sendEvent(name: "switch", value: "on")
+
-}
+void setLevel(percent) {
-
+	log.debug "Executing 'setLevel'"
-void off() {
+	parent.setLevel(this, percent)
-	parent.off(this)
+	sendEvent(name: "level", value: percent)
-	sendEvent(name: "switch", value: "off")
+}
-}
+
-
+void refresh() {
-void setLevel(percent) {
+	log.debug "Executing 'refresh'"
-	log.debug "Executing 'setLevel'"
+	parent.manualRefresh()
-	parent.setLevel(this, percent)
+}
-	sendEvent(name: "level", value: percent)
-}
-
-void setColorTemperature(value) {
-	if (value) {
-        log.trace "setColorTemperature: ${value}k"
-        parent.setColorTemperature(this, value)
-        sendEvent(name: "colorTemperature", value: value)
-	}
-}
-
-void refresh() {
-	log.debug "Executing 'refresh'"
-	parent.manualRefresh()
-}

devicetypes/smartthings/testing/simulated-thermostat.src/simulated-thermostat.groovy

@@ -32,14 +32,15 @@ metadata {
 				attributeState("default", label:'${currentValue}', unit:"dF")
 			}
 			tileAttribute("device.temperature", key: "VALUE_CONTROL") {
-				attributeState("default", action: "setTemperature")
+				attributeState("VALUE_UP", action: "tempUp")
+				attributeState("VALUE_DOWN", action: "tempDown")
 			}
 			tileAttribute("device.humidity", key: "SECONDARY_CONTROL") {
 				attributeState("default", label:'${currentValue}%', unit:"%")
 			}
 			tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") {
 				attributeState("idle", backgroundColor:"#44b621")
-				attributeState("heating", backgroundColor:"#ffa81e")
+				attributeState("heating", backgroundColor:"#ea5462")
 				attributeState("cooling", backgroundColor:"#269bd2")
 			}
 			tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") {

smartapps/-/-.src/-.groovy

@@ -0,0 +1,129 @@
+/**
+ *  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.
+ *
+ *  Alfred Workflow
+ *
+ *  Author: SmartThings
+ */
+
+definition(
+    name: "윤정은",
+    namespace: "윤정은",
+    author: "SmartThings",
+    description: "This SmartApp allows you to interact with the things in your physical graph through Alfred.",
+    category: "Convenience",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/alfred-app.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/alfred-app@2x.png",
+    oauth: [displayName: "SmartThings Alfred Workflow", displayLink: ""]
+)
+
+preferences {
+	section("Allow Alfred to Control These Things...") {
+		input "switches", "capability.switch", title: "Which Switches?", multiple: true, required: false
+        input "locks", "capability.lock", title: "Which Locks?", multiple: true, required: false
+	}
+}
+
+mappings {
+	path("/switches") {
+		action: [
+			GET: "listSwitches",
+			PUT: "updateSwitches"
+		]
+	}
+	path("/switches/:id") {
+		action: [
+			GET: "showSwitch",
+			PUT: "updateSwitch"
+		]
+	}
+    path("/locks") {
+		action: [
+			GET: "listLocks",
+			PUT: "updateLocks"
+		]
+	}
+	path("/locks/:id") {
+		action: [
+			GET: "showLock",
+			PUT: "updateLock"
+		]
+	}
+}
+
+def installed() {}
+
+def updated() {}
+
+def listSwitches() {
+	switches.collect { device(it,"switch") }
+}
+void updateSwitches() {
+	updateAll(switches)
+}
+def showSwitch() {
+	show(switches, "switch")
+}
+void updateSwitch() {
+	update(switches)
+}
+
+def listLocks() {
+	locks.collect { device(it, "lock") }
+}
+void updateLocks() {
+	updateAll(locks)
+}
+def showLock() {
+	show(locks, "lock")
+}
+void updateLock() {
+	update(locks)
+}
+
+private void updateAll(devices) {
+	def command = request.JSON?.command
+	if (command) {
+		devices."$command"()
+	}
+}
+
+private void update(devices) {
+	log.debug "update, request: ${request.JSON}, params: ${params}, devices: $devices.id"
+	def command = request.JSON?.command
+	if (command) {
+		def device = devices.find { it.id == params.id }
+		if (!device) {
+			httpError(404, "Device not found")
+		} else {
+			device."$command"()
+		}
+	}
+}
+
+private show(devices, name) {
+	def device = devices.find { it.id == params.id }
+	if (!device) {
+		httpError(404, "Device not found")
+	}
+	else {
+		def s = device.currentState(name)
+		[id: device.id, label: device.displayName, name: device.displayName, state: s]
+	}
+}
+
+private device(it, name) {
+	if (it) {
+		def s = it.currentState(name)
+		[id: it.id, label: it.displayName, name: it.displayName, state: s]
+    }
+}