mirror of
https://github.com/mtan93/SmartThingsPublic.git
synced 2026-04-13 22:05:21 +01:00
Merging changes from staging to master
This commit is contained in:
Vinay Rao
@@ -1,97 +1,96 @@
|
|||||||
/**
|
/**
|
||||||
* 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 "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"
|
}
|
||||||
}
|
|
||||||
|
standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
|
||||||
standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
|
state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
|
||||||
state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
|
}
|
||||||
}
|
|
||||||
|
main(["switch"])
|
||||||
main(["switch"])
|
details(["rich-control", "refresh"])
|
||||||
details(["rich-control", "colorTempSliderControl","refresh"])
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
// 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() {
|
parent.on(this)
|
||||||
parent.on(this)
|
sendEvent(name: "switch", value: "on")
|
||||||
sendEvent(name: "switch", value: "on")
|
}
|
||||||
}
|
|
||||||
|
void off() {
|
||||||
void off() {
|
parent.off(this)
|
||||||
parent.off(this)
|
sendEvent(name: "switch", value: "off")
|
||||||
sendEvent(name: "switch", value: "off")
|
}
|
||||||
}
|
|
||||||
|
void setLevel(percent) {
|
||||||
void setLevel(percent) {
|
log.debug "Executing 'setLevel'"
|
||||||
log.debug "Executing 'setLevel'"
|
parent.setLevel(this, percent)
|
||||||
parent.setLevel(this, percent)
|
sendEvent(name: "level", value: percent)
|
||||||
sendEvent(name: "level", value: percent)
|
}
|
||||||
}
|
|
||||||
|
void refresh() {
|
||||||
void refresh() {
|
log.debug "Executing 'refresh'"
|
||||||
log.debug "Executing 'refresh'"
|
parent.manualRefresh()
|
||||||
parent.manualRefresh()
|
}
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user