MSA-1319: ccc

DVCSMP-1795 Philips Hue: Add support for Hue Ambience bulb

devicetypes/-/-.src/-.groovy

@@ -1,112 +0,0 @@
-/**
- *  물흘러요
- *
- *  Copyright 2016 김형섭
- *
- *  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: "물흘러요", namespace: "물", author: "김형섭") {
-		capability "Battery"
-		capability "Thermostat"
-		capability "Water Sensor"
-	}
-
-	simulator {
-		// TODO: define status and reply messages here
-	}
-
-	tiles {
-		// TODO: define your main and details tiles here
-	}
-}
-
-// parse events into attributes
-def parse(String description) {
-	log.debug "Parsing '${description}'"
-	// TODO: handle 'battery' attribute
-	// TODO: handle 'temperature' attribute
-	// TODO: handle 'heatingSetpoint' attribute
-	// TODO: handle 'coolingSetpoint' attribute
-	// TODO: handle 'thermostatSetpoint' attribute
-	// TODO: handle 'thermostatMode' attribute
-	// TODO: handle 'thermostatFanMode' attribute
-	// TODO: handle 'thermostatOperatingState' attribute
-	// TODO: handle 'schedule' attribute
-	// TODO: handle 'water' attribute
-
-}
-
-// handle commands
-def setHeatingSetpoint() {
-	log.debug "Executing 'setHeatingSetpoint'"
-	// TODO: handle 'setHeatingSetpoint' command
-}
-
-def setCoolingSetpoint() {
-	log.debug "Executing 'setCoolingSetpoint'"
-	// TODO: handle 'setCoolingSetpoint' command
-}
-
-def off() {
-	log.debug "Executing 'off'"
-	// TODO: handle 'off' command
-}
-
-def heat() {
-	log.debug "Executing 'heat'"
-	// TODO: handle 'heat' command
-}
-
-def emergencyHeat() {
-	log.debug "Executing 'emergencyHeat'"
-	// TODO: handle 'emergencyHeat' command
-}
-
-def cool() {
-	log.debug "Executing 'cool'"
-	// TODO: handle 'cool' command
-}
-
-def setThermostatMode() {
-	log.debug "Executing 'setThermostatMode'"
-	// TODO: handle 'setThermostatMode' command
-}
-
-def fanOn() {
-	log.debug "Executing 'fanOn'"
-	// TODO: handle 'fanOn' command
-}
-
-def fanAuto() {
-	log.debug "Executing 'fanAuto'"
-	// TODO: handle 'fanAuto' command
-}
-
-def fanCirculate() {
-	log.debug "Executing 'fanCirculate'"
-	// TODO: handle 'fanCirculate' command
-}
-
-def setThermostatFanMode() {
-	log.debug "Executing 'setThermostatFanMode'"
-	// TODO: handle 'setThermostatFanMode' command
-}
-
-def auto() {
-	log.debug "Executing 'auto'"
-	// TODO: handle 'auto' command
-}
-
-def setSchedule() {
-	log.debug "Executing 'setSchedule'"
-	// TODO: handle 'setSchedule' command
-}

devicetypes/smartthings/hue-white-ambiance-bulb/hue-white-ambiance-bulb.groovy

@@ -0,0 +1,110 @@
+/**
+ *  Hue White Ambiance Bulb
+ *
+ *  Philips Hue Type "Color Temperature Light"
+ *
+ *  Author: SmartThings
+ */
+
+// for the UI
+metadata {
+    // Automatically generated. Make future change here.
+    definition (name: "Hue White Ambiance Bulb", namespace: "smartthings", author: "SmartThings") {
+        capability "Switch Level"
+        capability "Actuator"
+        capability "Color Temperature"
+        capability "Switch"
+        capability "Refresh"
+
+        command "refresh"
+    }
+
+    simulator {
+        // TODO: define status and reply messages here
+    }
+
+    tiles (scale: 2){
+        multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){
+            tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
+                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 "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"
+            }
+            tileAttribute ("device.level", key: "SLIDER_CONTROL") {
+                attributeState "level", action:"switch level.setLevel", range:"(0..100)"
+            }
+        }
+
+        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
+            state "colorTemperature", action:"color temperature.setColorTemperature"
+        }
+
+        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+            state "colorTemperature", label: '${currentValue} K'
+        }
+
+        standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
+            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
+        }
+
+        main(["rich-control"])
+        details(["rich-control", "colorTempSliderControl", "colorTemp", "refresh"])
+    }
+}
+
+// parse events into attributes
+def parse(description) {
+    log.debug "parse() - $description"
+    def results = []
+
+    def map = description
+    if (description instanceof String)  {
+        log.debug "Hue Ambience Bulb stringToMap - ${map}"
+        map = stringToMap(description)
+    }
+
+    if (map?.name && map?.value) {
+        results << createEvent(name: "${map?.name}", value: "${map?.value}")
+    }
+    results
+}
+
+// handle commands
+void on() {
+    log.trace parent.on(this)
+    sendEvent(name: "switch", value: "on")
+}
+
+void off() {
+    log.trace parent.off(this)
+    sendEvent(name: "switch", value: "off")
+}
+
+void setLevel(percent) {
+    log.debug "Executing 'setLevel'"
+    if (percent != null && percent >= 0 && percent <= 100) {
+        parent.setLevel(this, percent)
+        sendEvent(name: "level", value: percent)
+        sendEvent(name: "switch", value: "on")
+    } else {
+        log.warn "$percent is not 0-100"
+    }
+}
+
+void setColorTemperature(value) {
+    if (value) {
+        log.trace "setColorTemperature: ${value}k"
+        parent.setColorTemperature(this, value)
+        sendEvent(name: "colorTemperature", value: value)
+        sendEvent(name: "switch", value: "on")
+    } else {
+        log.warn "Invalid color temperature"
+    }
+}
+
+void refresh() {
+    log.debug "Executing 'refresh'"
+    parent.manualRefresh()
+}
+

smartapps/smartthings-kr/-.src/-.groovy

@@ -1,52 +0,0 @@
-/**
- *  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.
- *
- *  Turn It On When It Opens
- *
- *  Author: SmartThings
- */
-definition(
-    name: "문이 열리면 장치를켜라",
-    namespace: "smartthings-kr",
-    author:"김형섭",
-    description: "문이 열리면 연결된장치가 켜지는겁니다.",
-    category: "Convenience",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Meta/light_contact-outlet.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Meta/light_contact-outlet@2x.png"
-)
-
-preferences {
-	section("When the door opens..."){
-		input "contact1", "capability.contactSensor", title: "Where?"
-	}
-	section("Turn on a light..."){
-		input "switches", "capability.switch", multiple: true
-	}
-}
-
-
-def installed()
-{
-	subscribe(contact1, "contact.open", contactOpenHandler)
-}
-
-def updated()
-{
-	unsubscribe()
-	subscribe(contact1, "contact.open", contactOpenHandler)
-}
-
-def contactOpenHandler(evt) {
-	log.debug "$evt.value: $evt, $settings"
-	log.trace "Turning on switches: $switches"
-	switches.on()
-}

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

@@ -323,6 +323,8 @@ private getDeviceType(hueType) {
 		return "Hue Bulb"
 	else if (hueType?.equalsIgnoreCase("Color Light"))
 		return "Hue Bloom"
+	else if (hueType?.equalsIgnoreCase("Color Temperature Light"))
+		return "Hue White Ambiance Bulb"
 	else
 		return null
 }

smartapps/smartthings/notify-me-when.src/notify-me-when.groovy

@@ -155,4 +155,4 @@ private getIncludeArticle() {
 	def name = location.name.toLowerCase()
 	def segs = name.split(" ")
 	!(["work","home"].contains(name) || (segs.size() > 1 && (["the","my","a","an"].contains(segs[0]) || segs[0].endsWith("'s"))))
-}
+}