Compare commits

..

1 Commits

Author SHA1 Message Date
Brian Steere
559bc31194 Update weather station tile
Now with actual lux calculation when solar radiation data is available. Also includes refresh/polling capabilities
2016-12-19 11:32:25 -06:00
20 changed files with 387 additions and 696 deletions

View File

@@ -22,10 +22,9 @@ metadata {
capability "Sensor" capability "Sensor"
capability "Health Check" capability "Health Check"
fingerprint mfr:"0063", prod:"4457", deviceJoinName: "GE In-Wall Smart Dimmer " fingerprint mfr:"0063", prod:"4457", deviceJoinName: "Z-Wave Wall Dimmer"
fingerprint mfr:"0063", prod:"4944", deviceJoinName: "GE In-Wall Smart Dimmer " fingerprint mfr:"0063", prod:"4944", deviceJoinName: "Z-Wave Wall Dimmer"
fingerprint mfr:"0063", prod:"5044", deviceJoinName: "GE Plug-In Smart Dimmer " fingerprint mfr:"0063", prod:"5044", deviceJoinName: "Z-Wave Plug-In Dimmer"
fingerprint mfr:"0063", prod:"4944", model:"3034", deviceJoinName: "GE In-Wall Smart Fan Control"
} }
simulator { simulator {

View File

@@ -99,7 +99,7 @@ def parse(String description) {
def poll() { def poll() {
def refreshCmds = [ def refreshCmds = [
"st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 2000" "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 500"
] ]
return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh() return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh()
@@ -197,7 +197,7 @@ def off() {
def refresh() { def refresh() {
def refreshCmds = [ def refreshCmds = [
"st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 2000" "st wattr 0x${device.deviceNetworkId} 1 8 0x10 0x21 {${state?.dOnOff ?: '0000'}}", "delay 500"
] ]
return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig() return refreshCmds + zigbee.onOffRefresh() + zigbee.levelRefresh() + zigbee.onOffConfig()

View File

@@ -128,9 +128,9 @@ def setLevel(value) {
def refresh() { def refresh() {
[ [
"st rattr 0x${device.deviceNetworkId} ${endpointId} 6 0", "delay 2000", "st rattr 0x${device.deviceNetworkId} ${endpointId} 6 0", "delay 500",
"st rattr 0x${device.deviceNetworkId} ${endpointId} 8 0", "delay 2000", "st rattr 0x${device.deviceNetworkId} ${endpointId} 8 0", "delay 500",
"st rattr 0x${device.deviceNetworkId} ${endpointId} 0x0B04 0x050B", "delay 2000" "st rattr 0x${device.deviceNetworkId} ${endpointId} 0x0B04 0x050B", "delay 500"
] ]
} }
@@ -313,9 +313,9 @@ def isDescriptionPower(descMap) {
def onOffConfig() { def onOffConfig() {
[ [
"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 6 {${device.zigbeeId}} {}", "delay 2000", "zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 6 {${device.zigbeeId}} {}", "delay 200",
"zcl global send-me-a-report 6 0 0x10 0 600 {01}", "delay 200", "zcl global send-me-a-report 6 0 0x10 0 600 {01}",
"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000" "send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500"
] ]
} }
@@ -323,9 +323,9 @@ def onOffConfig() {
//min level change is 01 //min level change is 01
def levelConfig() { def levelConfig() {
[ [
"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 8 {${device.zigbeeId}} {}", "delay 2000", "zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 8 {${device.zigbeeId}} {}", "delay 200",
"zcl global send-me-a-report 8 0 0x20 5 3600 {01}", "delay 200", "zcl global send-me-a-report 8 0 0x20 5 3600 {01}",
"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000" "send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 1500"
] ]
} }
@@ -333,10 +333,9 @@ def levelConfig() {
//min change in value is 05 //min change in value is 05
def powerConfig() { def powerConfig() {
[ [
"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 2000", "zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 200",
"zcl global send-me-a-report 0x0B04 0x050B 0x29 1 600 {05 00}", //The send-me-a-report is custom to the attribute type for CentraLite "zcl global send-me-a-report 0x0B04 0x050B 0x29 1 600 {05 00}", //The send-me-a-report is custom to the attribute type for CentraLite
"delay 200", "send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000"
] ]
} }
@@ -345,10 +344,7 @@ def setLevelWithRate(level, rate) {
rate = "0000" rate = "0000"
} }
level = convertToHexString(level * 255 / 100) //Converting the 0-100 range to 0-FF range in hex level = convertToHexString(level * 255 / 100) //Converting the 0-100 range to 0-FF range in hex
[ "st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {$level $rate}"
"st cmd 0x${device.deviceNetworkId} ${endpointId} 8 4 {$level $rate}",
"delay 2000"
]
} }
String convertToHexString(value, width=2) { String convertToHexString(value, width=2) {

View File

@@ -51,7 +51,7 @@ def on() {
'zcl on-off on', 'zcl on-off on',
'delay 200', 'delay 200',
"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}", "send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
'delay 2000' 'delay 500'
] ]
@@ -62,6 +62,6 @@ def off() {
'zcl on-off off', 'zcl on-off off',
'delay 200', 'delay 200',
"send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}", "send 0x${zigbee.deviceNetworkId} 0x01 0x${zigbee.endpointId}",
'delay 2000' 'delay 500'
] ]
} }

View File

@@ -157,10 +157,9 @@ def configure() {
//min change in value is 01 //min change in value is 01
def powerConfig() { def powerConfig() {
[ [
"zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 2000", "zdo bind 0x${device.deviceNetworkId} 1 ${endpointId} 0x0B04 {${device.zigbeeId}} {}", "delay 200",
"zcl global send-me-a-report 0x0B04 0x050B 0x29 1 600 {05 00}", //The send-me-a-report is custom to the attribute type for CentraLite "zcl global send-me-a-report 0x0B04 0x050B 0x29 1 600 {05 00}", //The send-me-a-report is custom to the attribute type for CentraLite
"delay 200", "send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000"
] ]
} }

View File

@@ -29,10 +29,9 @@ metadata {
command "enrollResponse" command "enrollResponse"
fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-S", deviceJoinName: "Water Leak Sensor" fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-S", deviceJoinName: "Water Leak Sensor"
fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315" fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315"
fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-Seu", deviceJoinName: "Water Leak Sensor" fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-Seu", deviceJoinName: "Water Leak Sensor"
fingerprint inClusters: "0000,0001,0003,0020,0402,0500,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3315-L", deviceJoinName: "Iris Smart Water Sensor"
fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "moisturev4", deviceJoinName: "Water Leak Sensor" fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "moisturev4", deviceJoinName: "Water Leak Sensor"
} }
@@ -286,8 +285,8 @@ def ping() {
def refresh() { def refresh() {
log.debug "Refreshing Temperature and Battery" log.debug "Refreshing Temperature and Battery"
def refreshCmds = [ def refreshCmds = [
"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 2000", "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 2000" "st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
] ]
return refreshCmds + enrollResponse() return refreshCmds + enrollResponse()
@@ -309,10 +308,10 @@ def enrollResponse() {
[ [
//Resending the CIE in case the enroll request is sent before CIE is written //Resending the CIE in case the enroll request is sent before CIE is written
"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200", "zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000", "send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
//Enroll Response //Enroll Response
"raw 0x500 {01 23 00 00 00}", "delay 200", "raw 0x500 {01 23 00 00 00}",
"send 0x${device.deviceNetworkId} 1 1", "delay 2000" "send 0x${device.deviceNetworkId} 1 1", "delay 200"
] ]
} }

View File

@@ -298,8 +298,8 @@ def ping() {
def refresh() { def refresh() {
log.debug "refresh called" log.debug "refresh called"
def refreshCmds = [ def refreshCmds = [
"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 2000", "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 2000" "st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
] ]
return refreshCmds + enrollResponse() return refreshCmds + enrollResponse()
@@ -321,10 +321,10 @@ def enrollResponse() {
[ [
//Resending the CIE in case the enroll request is sent before CIE is written //Resending the CIE in case the enroll request is sent before CIE is written
"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200", "zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000", "send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
//Enroll Response //Enroll Response
"raw 0x500 {01 23 00 00 00}", "delay 200", "raw 0x500 {01 23 00 00 00}",
"send 0x${device.deviceNetworkId} 1 1", "delay 2000" "send 0x${device.deviceNetworkId} 1 1", "delay 200"
] ]
} }

View File

@@ -428,10 +428,10 @@ def enrollResponse() {
[ [
//Resending the CIE in case the enroll request is sent before CIE is written //Resending the CIE in case the enroll request is sent before CIE is written
"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200", "zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000", "send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
//Enroll Response //Enroll Response
"raw 0x500 {01 23 00 00 00}", "delay 200", "raw 0x500 {01 23 00 00 00}", "delay 200",
"send 0x${device.deviceNetworkId} 1 1", "delay 2000" "send 0x${device.deviceNetworkId} 1 1", "delay 200"
] ]
} }

View File

@@ -252,8 +252,8 @@ def ping() {
def refresh() { def refresh() {
log.debug "Refreshing Temperature and Battery" log.debug "Refreshing Temperature and Battery"
def refreshCmds = [ def refreshCmds = [
"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 2000", "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 2000" "st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"
] ]
return refreshCmds + enrollResponse() return refreshCmds + enrollResponse()
@@ -277,10 +277,10 @@ def enrollResponse() {
[ [
//Resending the CIE in case the enroll request is sent before CIE is written //Resending the CIE in case the enroll request is sent before CIE is written
"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200", "zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 2000", "send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
//Enroll Response //Enroll Response
"raw 0x500 {01 23 00 00 00}", "delay 200", "raw 0x500 {01 23 00 00 00}",
"send 0x${device.deviceNetworkId} 1 1", "delay 2000" "send 0x${device.deviceNetworkId} 1 1", "delay 200"
] ]
} }

View File

@@ -270,9 +270,9 @@ def configure() {
log.debug "Configuring Reporting and Bindings." log.debug "Configuring Reporting and Bindings."
def humidityConfigCmds = [ def humidityConfigCmds = [
"zdo bind 0x${device.deviceNetworkId} 1 1 0xFC45 {${device.zigbeeId}} {}", "delay 2000", "zdo bind 0x${device.deviceNetworkId} 1 1 0xFC45 {${device.zigbeeId}} {}", "delay 500",
"zcl global send-me-a-report 0xFC45 0 0x29 30 3600 {6400}", "delay 200", "zcl global send-me-a-report 0xFC45 0 0x29 30 3600 {6400}",
"send 0x${device.deviceNetworkId} 1 1", "delay 2000" "send 0x${device.deviceNetworkId} 1 1", "delay 500"
] ]
// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity // temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity

View File

@@ -16,12 +16,15 @@
* *
* Date: 2013-04-30 * Date: 2013-04-30
*/ */
// for the UI
metadata { metadata {
// Automatically generated. Make future change here.
definition (name: "SmartWeather Station Tile", namespace: "smartthings", author: "SmartThings") { definition (name: "SmartWeather Station Tile", namespace: "smartthings", author: "SmartThings") {
capability "Illuminance Measurement" capability "Illuminance Measurement"
capability "Temperature Measurement" capability "Temperature Measurement"
capability "Relative Humidity Measurement" capability "Relative Humidity Measurement"
capability "Sensor" capability "Sensor"
capability "Polling"
attribute "localSunrise", "string" attribute "localSunrise", "string"
attribute "localSunset", "string" attribute "localSunset", "string"
@@ -214,7 +217,7 @@ def poll() {
send(name: "localSunrise", value: localSunrise, descriptionText: "Sunrise today is at $localSunrise") send(name: "localSunrise", value: localSunrise, descriptionText: "Sunrise today is at $localSunrise")
send(name: "localSunset", value: localSunset, descriptionText: "Sunset today at is $localSunset") send(name: "localSunset", value: localSunset, descriptionText: "Sunset today at is $localSunset")
send(name: "illuminance", value: estimateLux(sunriseDate, sunsetDate, weatherIcon)) send(name: "illuminance", value: estimateLux(obs.solarradiation, sunriseDate, sunsetDate, weatherIcon) as Integer)
// Forecast // Forecast
def f = get("forecast") def f = get("forecast")
@@ -305,48 +308,53 @@ private send(map) {
sendEvent(map) sendEvent(map)
} }
private estimateLux(sunriseDate, sunsetDate, weatherIcon) { private estimateLux(solarradiation, sunriseDate, sunsetDate, weatherIcon) {
def lux = 0 def lux = 0
def now = new Date().time
if (now > sunriseDate.time && now < sunsetDate.time) {
//day
switch(weatherIcon) {
case 'tstorms':
lux = 200
break
case ['cloudy', 'fog', 'rain', 'sleet', 'snow', 'flurries',
'chanceflurries', 'chancerain', 'chancesleet',
'chancesnow', 'chancetstorms']:
lux = 1000
break
case 'mostlycloudy':
lux = 2500
break
case ['partlysunny', 'partlycloudy', 'hazy']:
lux = 7500
break
default:
//sunny, clear
lux = 10000
}
//adjust for dusk/dawn if (solarradiation != '--') {
def afterSunrise = now - sunriseDate.time lux = solarradiation.toDouble() / 0.0079
def beforeSunset = sunsetDate.time - now } else {
def oneHour = 1000 * 60 * 60 def now = new Date().time
if (now > sunriseDate.time && now < sunsetDate.time) {
//day
switch(weatherIcon) {
case 'tstorms':
lux = 200
break
case ['cloudy', 'fog', 'rain', 'sleet', 'snow', 'flurries',
'chanceflurries', 'chancerain', 'chancesleet',
'chancesnow', 'chancetstorms']:
lux = 1000
break
case 'mostlycloudy':
lux = 2500
break
case ['partlysunny', 'partlycloudy', 'hazy']:
lux = 7500
break
default:
//sunny, clear
lux = 10000
}
if(afterSunrise < oneHour) { //adjust for dusk/dawn
//dawn def afterSunrise = now - sunriseDate.time
lux = (long)(lux * (afterSunrise/oneHour)) def beforeSunset = sunsetDate.time - now
} else if (beforeSunset < oneHour) { def oneHour = 1000 * 60 * 60
//dusk
lux = (long)(lux * (beforeSunset/oneHour)) if(afterSunrise < oneHour) {
//dawn
lux = (long)(lux * (afterSunrise/oneHour))
} else if (beforeSunset < oneHour) {
//dusk
lux = (long)(lux * (beforeSunset/oneHour))
}
}
else {
//night - always set to 10 for now
//could do calculations for dusk/dawn too
lux = 10
} }
}
else {
//night - always set to 10 for now
//could do calculations for dusk/dawn too
lux = 10
} }
lux lux

View File

@@ -86,7 +86,7 @@ def parse(String description) {
def bodyString = msg.body def bodyString = msg.body
if (bodyString) { if (bodyString) {
unschedule("setOffline") unschedule("setOffline")
def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", "")) def body = new XmlSlurper().parseText(bodyString)
if (body?.property?.TimeSyncRequest?.text()) { if (body?.property?.TimeSyncRequest?.text()) {
log.trace "Got TimeSyncRequest" log.trace "Got TimeSyncRequest"

View File

@@ -78,7 +78,7 @@ def parse(String description) {
def bodyString = msg.body def bodyString = msg.body
if (bodyString) { if (bodyString) {
unschedule("setOffline") unschedule("setOffline")
def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", "")) def body = new XmlSlurper().parseText(bodyString)
if (body?.property?.TimeSyncRequest?.text()) { if (body?.property?.TimeSyncRequest?.text()) {
log.trace "Got TimeSyncRequest" log.trace "Got TimeSyncRequest"
result << timeSyncResponse() result << timeSyncResponse()

View File

@@ -84,7 +84,7 @@ def parse(String description) {
def bodyString = msg.body def bodyString = msg.body
if (bodyString) { if (bodyString) {
unschedule("setOffline") unschedule("setOffline")
def body = new XmlSlurper().parseText(bodyString.replaceAll("[^\\x20-\\x7e]", "")) def body = new XmlSlurper().parseText(bodyString)
if (body?.property?.TimeSyncRequest?.text()) { if (body?.property?.TimeSyncRequest?.text()) {
log.trace "Got TimeSyncRequest" log.trace "Got TimeSyncRequest"
result << timeSyncResponse() result << timeSyncResponse()
@@ -208,7 +208,7 @@ def subscribe(ip, port) {
def existingIp = getDataValue("ip") def existingIp = getDataValue("ip")
def existingPort = getDataValue("port") def existingPort = getDataValue("port")
if (ip && ip != existingIp) { if (ip && ip != existingIp) {
log.debug "Updating ip from $existingIp to $ip" log.debug "Updating ip from $existingIp to $ip"
updateDataValue("ip", ip) updateDataValue("ip", ip)
def ipvalue = convertHexToIP(getDataValue("ip")) def ipvalue = convertHexToIP(getDataValue("ip"))
sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP changed to ${ipvalue}") sendEvent(name: "currentIP", value: ipvalue, descriptionText: "IP changed to ${ipvalue}")
@@ -291,4 +291,4 @@ User-Agent: CyberGarage-HTTP/1.0
</u:GetBinaryState> </u:GetBinaryState>
</s:Body> </s:Body>
</s:Envelope>""", physicalgraph.device.Protocol.LAN) </s:Envelope>""", physicalgraph.device.Protocol.LAN)
} }

View File

@@ -28,8 +28,8 @@ metadata {
fingerprint inClusters: "0000, 0001, 0003, 0020, 0402, 0B05", outClusters: "0003, 0006, 0008, 0019", manufacturer: "OSRAM", model: "LIGHTIFY Dimming Switch", deviceJoinName: "OSRAM LIGHTIFY Dimming Switch" fingerprint inClusters: "0000, 0001, 0003, 0020, 0402, 0B05", outClusters: "0003, 0006, 0008, 0019", manufacturer: "OSRAM", model: "LIGHTIFY Dimming Switch", deviceJoinName: "OSRAM LIGHTIFY Dimming Switch"
//fingerprint inClusters: "0000, 0001, 0003, 0020, 0500", outClusters: "0003,0019", manufacturer: "CentraLite", model: "3455-L", deviceJoinName: "Iris Care Pendant" //fingerprint inClusters: "0000, 0001, 0003, 0020, 0500", outClusters: "0003,0019", manufacturer: "CentraLite", model: "3455-L", deviceJoinName: "Iris Care Pendant"
fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0402, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model: "3460-L", deviceJoinName: "Iris Smart Button" //fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0402, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model: "3460-L", deviceJoinName: "Iris Smart Button"
fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model:"3450-L", deviceJoinName: "Iris KeyFob" //fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model:"3450-L", deviceJoinName: "Iris KeyFob"
} }
simulator {} simulator {}

View File

@@ -24,10 +24,6 @@ metadata {
fingerprint inClusters: "0x26", deviceJoinName: "Z-Wave Dimmer" fingerprint inClusters: "0x26", deviceJoinName: "Z-Wave Dimmer"
fingerprint mfr:"001D", prod:"1902", deviceJoinName: "Z-Wave Dimmer" fingerprint mfr:"001D", prod:"1902", deviceJoinName: "Z-Wave Dimmer"
fingerprint mfr:"001D", prod:"1B03", model:"0334", deviceJoinName: "Leviton Universal Dimmer" fingerprint mfr:"001D", prod:"1B03", model:"0334", deviceJoinName: "Leviton Universal Dimmer"
fingerprint mfr:"011A", prod:"0102", model:"0201", deviceJoinName: "Enerwave In-Wall Dimmer"
fingerprint mfr:"001D", prod:"1001", model:"0334", deviceJoinName: "Leviton 3-Speed Fan Controller"
fingerprint mfr:"001D", prod:"0602", model:"0334", deviceJoinName: "Leviton Magnetic Low Voltage Dimmer"
fingerprint mfr:"001D", prod:"0401", model:"0334", deviceJoinName: "Leviton 600W Incandescent Dimmer"
} }
simulator { simulator {

View File

@@ -28,7 +28,6 @@ metadata {
fingerprint mfr: "0060", prod: "0001", model: "0002", deviceJoinName: "Everspring Motion Sensor" // Everspring SP814 fingerprint mfr: "0060", prod: "0001", model: "0002", deviceJoinName: "Everspring Motion Sensor" // Everspring SP814
fingerprint mfr: "0060", prod: "0001", model: "0003", deviceJoinName: "Everspring Motion Sensor" // Everspring HSP02 fingerprint mfr: "0060", prod: "0001", model: "0003", deviceJoinName: "Everspring Motion Sensor" // Everspring HSP02
fingerprint mfr: "011A", prod: "0601", model: "0901", deviceJoinName: "Enerwave Motion Sensor" // Enerwave ZWN-BPC fingerprint mfr: "011A", prod: "0601", model: "0901", deviceJoinName: "Enerwave Motion Sensor" // Enerwave ZWN-BPC
fingerprint mfr: "0063", prod: "4953", model: "3133", deviceJoinName: "GE Smart Motion Sensor"
} }
simulator { simulator {

View File

@@ -25,9 +25,6 @@ metadata {
fingerprint mfr:"0063", prod:"4F50", model:"3031", deviceJoinName: "GE Plug-in Outdoor Switch" fingerprint mfr:"0063", prod:"4F50", model:"3031", deviceJoinName: "GE Plug-in Outdoor Switch"
fingerprint mfr:"001D", prod:"1D04", model:"0334", deviceJoinName: "Leviton Outlet" fingerprint mfr:"001D", prod:"1D04", model:"0334", deviceJoinName: "Leviton Outlet"
fingerprint mfr:"001D", prod:"1C02", model:"0334", deviceJoinName: "Leviton Switch" fingerprint mfr:"001D", prod:"1C02", model:"0334", deviceJoinName: "Leviton Switch"
fingerprint mfr:"001D", prod:"0301", model:"0334", deviceJoinName: "Leviton 15A Switch"
fingerprint mfr:"011A", prod:"0101", model:"0102", deviceJoinName: "Enerwave On/Off Switch"
fingerprint mfr:"011A", prod:"0101", model:"0603", deviceJoinName: "Enerwave Duplex Receptacle"
} }
// simulator metadata // simulator metadata

View File

@@ -1,548 +1,253 @@
/** /**
* Gideon * Gideon
* *
* Copyright 2016 Nicola Russo * Copyright 2016 Nicola Russo
* *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * 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: * in compliance with the License. You may obtain a copy of the License at:
* *
* http://www.apache.org/licenses/LICENSE-2.0 * 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 * 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 * 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. * for the specific language governing permissions and limitations under the License.
* *
*/ */
definition( definition(
name: "Gideon", name: "Gideon",
namespace: "gideon.api", namespace: "gideon.api",
author: "Braindrain Solutions ltd", author: "Braindrain Solutions",
description: "Gideon Smart Home SmartApp allows you to connect and control all of your SmartThings devices through the Gideon app, making your SmartThings devices even smarter.", description: "Gideon AI Smart app allows you to connect and control all of your SmartThings devices through the Gideon AI app, making your SmartThings devices even smarter.",
category: "Family", category: "Family",
iconUrl: "http://s33.postimg.org/t77u7y7v3/logo.png", iconUrl: "http://s33.postimg.org/t77u7y7v3/logo.png",
iconX2Url: "http://s33.postimg.org/t77u7y7v3/logo.png", iconX2Url: "http://s33.postimg.org/t77u7y7v3/logo.png",
iconX3Url: "http://s33.postimg.org/t77u7y7v3/logo.png", iconX3Url: "http://s33.postimg.org/t77u7y7v3/logo.png",
oauth: [displayName: "Gideon Smart Home API app", displayLink: "gideon.ai"]) oauth: [displayName: "Gideon AI API", displayLink: "gideon.ai"])
preferences { preferences {
section("Control these contact sensors...") { section("Control these switches...") {
input "contact", "capability.contactSensor", multiple:true, required:false input "switches", "capability.switch", multiple:true
} }
section("Control these switches...") { section("Control these motion sensors...") {
input "switches", "capability.switch", multiple:true, required:false input "motions", "capability.motionSensor", multiple:true
} }
section("Control these smoke alarms...") { section("Control these presence sensors...") {
input "smoke_alarms", "capability.smokeDetector", multiple:true, required:false input "presence_sensors", "capability.presenceSensor", multiple:true
} }
section("Control these window shades...") { section("Control these outlets...") {
input "shades", "capability.windowShade", multiple:true, required:false input "outlets", "capability.switch", multiple:true
} }
section("Control these garage doors...") { section("Control these locks...") {
input "garage", "capability.garageDoorControl", multiple:true, required:false input "locks", "capability.lock", multiple:true
} }
section("Control these water sensors...") { section("Control these locks...") {
input "water_sensors", "capability.waterSensor", multiple:true, required:false input "temperature_sensors", "capability.temperatureMeasurement"
} }
section("Control these motion sensors...") { }
input "motions", "capability.motionSensor", multiple:true, required:false
} def installed() {
section("Control these presence sensors...") { log.debug "Installed with settings: ${settings}"
input "presence_sensors", "capability.presenceSensor", multiple:true, required:false
} initialize()
/** section("Control these outlets...") { }
input "outlets", "capability.switch", multiple:true, required:false
} def updated() {
*/ log.debug "Updated with settings: ${settings}"
section("Control these power meters...") {
input "meters", "capability.powerMeter", multiple:true, required:false unsubscribe()
} initialize()
section("Control these locks...") { }
input "locks", "capability.lock", multiple:true, required:false
} def initialize() {
section("Control these temperature sensors...") { // TODO: subscribe to attributes, devices, locations, etc.
input "temperature_sensors", "capability.temperatureMeasurement", multiple:true, required:false subscribe(outlet, "energy", outletHandler)
} subscribe(outlet, "switch", outletHandler)
section("Control these batteries...") { }
input "batteries", "capability.battery", multiple:true, required:false
} // TODO: implement event handlers
} def outletHandler(evt) {
log.debug "$outlet.currentEnergy"
def installed() { //TODO call G API
log.debug "Installed with settings: ${settings}" }
initialize()
} private device(it, type) {
it ? [id: it.id, label: it.label, type: type] : null
def updated() { }
log.debug "Updated with settings: ${settings}"
//API Mapping
unsubscribe() mappings {
initialize() path("/getalldevices") {
} action: [
GET: "getAllDevices"
def initialize() { ]
} }
path("/doorlocks/:id/:command") {
private device(it, type) { action: [
it ? [id: it.id, label: it.label, type: type] : null GET: "updateDoorLock"
} ]
}
//API Mapping path("/doorlocks/:id") {
mappings { action: [
path("/getalldevices") { GET: "getDoorLockStatus"
action: [ ]
GET: "getAllDevices" }
] path("/tempsensors/:id") {
} action: [
path("/doorlocks/lock/:id") { GET: "getTempSensorsStatus"
action: [ ]
GET: "lockDoorLock" }
] path("/presences/:id") {
} action: [
path("/doorlocks/unlock/:id") { GET: "getPresenceStatus"
action: [ ]
GET: "unlockDoorLock" }
] path("/motions/:id") {
} action: [
path("/doorlocks/:id") { GET: "getMotionStatus"
action: [ ]
GET: "getDoorLockStatus" }
] path("/outlets/:id") {
} action: [
path("/contacts/:id") { GET: "getOutletStatus"
action: [ ]
GET: "getContactStatus" }
] path("/outlets/:id/:command") {
} action: [
path("/smoke/:id") { GET: "updateOutlet"
action: [ ]
GET: "getSmokeStatus" }
] path("/switches/:command") {
} action: [
path("/shades/open/:id") { PUT: "updateSwitch"
action: [ ]
GET: "openShade" }
] }
}
path("/shades/preset/:id") { //API Methods
action: [ def getAllDevices() {
GET: "presetShade" def locks_list = locks.collect{device(it,"Lock")}
] def presences_list = presence_sensors.collect{device(it,"Presence")}
} def motions_list = motions.collect{device(it,"Motion")}
path("/shades/close/:id") { def outlets_list = outlets.collect{device(it,"Outlet")}
action: [ def switches_list = switches.collect{device(it,"Switch")}
GET: "closeShade" def temp_list = temperature_sensors.collect{device(it,"Temperature")}
] return [Locks: locks_list, Presences: presences_list, Motions: motions_list, Outlets: outlets_list, Switches: switches_list, Temperatures: temp_list]
} }
path("/shades/:id") {
action: [ //LOCKS
GET: "getShadeStatus" def getDoorLockStatus() {
] def device = locks.find { it.id == params.id }
} if (!device) {
path("/garage/open/:id") { httpError(404, "Device not found")
action: [ } else {
GET: "openGarage" return [Device_state: device.currentValue('lock')]
] }
} }
path("/garage/close/:id") {
action: [ def updateDoorLock() {
GET: "closeGarage" def command = params.command
] def device = locks.find { it.id == params.id }
} if (command){
path("/garage/:id") { if (!device) {
action: [ httpError(404, "Device not found")
GET: "getGarageStatus" } else {
] if(command == "toggle")
} {
path("/watersensors/:id") { if(device.currentValue('lock') == "locked")
action: [ device.unlock();
GET: "getWaterSensorStatus" else
] device.lock();
}
path("/tempsensors/:id") { return [Device_id: params.id, result_action: "200"]
action: [ }
GET: "getTempSensorsStatus" }
] }
} }
path("/meters/:id") {
action: [ //PRESENCE
GET: "getMeterStatus" def getPresenceStatus() {
]
} def device = presence_sensors.find { it.id == params.id }
path("/batteries/:id") { if (!device) {
action: [ httpError(404, "Device not found")
GET: "getBatteryStatus" } else {
] return [Device_state: device.currentValue('presence')]
} }
path("/presences/:id") { }
action: [
GET: "getPresenceStatus" //MOTION
] def getMotionStatus() {
}
path("/motions/:id") { def device = motions.find { it.id == params.id }
action: [ if (!device) {
GET: "getMotionStatus" httpError(404, "Device not found")
] } else {
} return [Device_state: device.currentValue('motion')]
/** path("/outlets/:id") { }
action: [ }
GET: "getOutletStatus"
] //OUTLET
} def getOutletStatus() {
path("/outlets/turnon/:id") {
action: [ def device = outlets.find { it.id == params.id }
GET: "turnOnOutlet" if (!device) {
] httpError(404, "Device not found")
} } else {
path("/outlets/turnoff/:id") { return [Device_state: device.currentSwitch, Current_watt: device.currentValue("energy")]
action: [ }
GET: "turnOffOutlet" }
]
} def updateOutlet() {
*/
path("/switches/turnon/:id") { def command = params.command
action: [ def device = outlets.find { it.id == params.id }
GET: "turnOnSwitch" if (command){
] if (!device) {
} httpError(404, "Device not found")
path("/switches/turnoff/:id") { } else {
action: [ if(command == "toggle")
GET: "turnOffSwitch" {
] if(device.currentSwitch == "on")
} device.off();
path("/switches/:id") { else
action: [ device.on();
GET: "getSwitchStatus"
] return [Device_id: params.id, result_action: "200"]
} }
} }
}
//API Methods }
def getAllDevices() {
def locks_list = locks.collect{device(it,"Lock")} //SWITCH
def contact_list = contact.collect{device(it,"Contact Sensor")} def updateSwitch() {
def smokes_list = smoke_alarms.collect{device(it,"Smoke Alarm")} def command = params.command
def shades_list = shades.collect{device(it,"Window Shade")} def device = switches.find { it.id == params.id }
def garage_list = garage.collect{device(it,"Garage Door")} if (command){
def water_sensors_list = water_sensors.collect{device(it,"Water Sensor")} if (!device) {
def presences_list = presence_sensors.collect{device(it,"Presence")} httpError(404, "Device not found")
def motions_list = motions.collect{device(it,"Motion")} } else {
/** def outlets_list = outlets.collect{device(it,"Outlet")} */ if(command == "toggle")
def switches_list = switches.collect{device(it,"Switch")} {
def temp_list = temperature_sensors.collect{device(it,"Temperature")} if(device.currentSwitch == "on")
def meters_list = meters.collect{device(it,"Power Meters")} device.off();
def battery_list = batteries.collect{device(it,"Batteries")} else
return smokes_list + contact_list + water_sensors_list + shades_list + garage_list + locks_list + presences_list + motions_list + switches_list + temp_list + meters_list + battery_list device.on();
}
return [Device_id: params.id, result_action: "200"]
//contact sensors }
def getContactStatus() { }
def device = contact.find { it.id == params.id } }
if (!device) { }
httpError(404, "Device not found")
} else { //TEMPERATURE
def args = getTempSensorsStatus(device.id) def getTempSensorsStatus() {
return [Device_state: device.currentValue('contact')] + args
} def device = temperature_sensors.find { it.id == params.id }
} if (!device) {
httpError(404, "Device not found")
//smoke detectors } else {
def getSmokeStatus() { return [Device_state: device.currentValue('temperature')]
def device = smoke_alarms.find { it.id == params.id } }
if (!device) { }
httpError(404, "Device not found")
} else {
def bat = getBatteryStatus(device.id)
return [Device_state: device.currentValue('smoke')] + bat
}
}
//garage
def getGarageStatus() {
def device = garage.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
return [Device_state: device.currentValue('door')]
}
}
def openGarage() {
def device = garage.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
device.open();
return [Device_id: params.id, result_action: "200"]
}
}
def closeGarage() {
def device = garage.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
device.close();
return [Device_id: params.id, result_action: "200"]
}
}
//shades
def getShadeStatus() {
def device = shades.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
return [Device_state: device.currentValue('windowShade')]
}
}
def openShade() {
def device = shades.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
device.open();
return [Device_id: params.id, result_action: "200"]
}
}
def presetShade() {
def device = shades.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
device.presetPosition();
return [Device_id: params.id, result_action: "200"]
}
}
def closeShade() {
def device = shades.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
device.close();
return [Device_id: params.id, result_action: "200"]
}
}
//water sensor
def getWaterSensorStatus() {
def device = water_sensors.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
def bat = getBatteryStatus(device.id)
return [Device_state: device.currentValue('water')] + bat
}
}
//batteries
def getBatteryStatus() {
def device = batteries.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
return [Device_state: device.latestValue("battery")]
}
}
def getBatteryStatus(id) {
def device = batteries.find { it.id == id }
if (!device) {
return []
} else {
return [battery_state: device.latestValue("battery")]
}
}
//LOCKS
def getDoorLockStatus() {
def device = locks.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
def bat = getBatteryStatus(device.id)
return [Device_state: device.currentValue('lock')] + bat
}
}
def lockDoorLock() {
def device = locks.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
device.lock();
return [Device_id: params.id, result_action: "200"]
}
}
def unlockDoorLock() {
def device = locks.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
device.unlock();
return [Device_id: params.id, result_action: "200"]
}
}
//PRESENCE
def getPresenceStatus() {
def device = presence_sensors.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
def bat = getBatteryStatus(device.id)
return [Device_state: device.currentValue('presence')] + bat
}
}
//MOTION
def getMotionStatus() {
def device = motions.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
def args = getTempSensorsStatus(device.id)
return [Device_state: device.currentValue('motion')] + args
}
}
//OUTLET
/**
def getOutletStatus() {
def device = outlets.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
def watt = getMeterStatus(device.id)
return [Device_state: device.currentSwitch] + watt
}
}
*/
def getMeterStatus() {
def device = meters.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
return [Device_id: device.id, Device_type: device.type, Current_watt: device.currentValue("power")]
}
}
def getMeterStatus(id) {
def device = meters.find { it.id == id }
if (!device) {
return []
} else {
return [Current_watt: device.currentValue("power")]
}
}
/**
def turnOnOutlet() {
def device = outlets.find { it.id == params.id }
if (command){
if (!device) {
httpError(404, "Device not found")
} else {
device.on();
return [Device_id: params.id, result_action: "200"]
}
}
}
def turnOffOutlet() {
def device = outlets.find { it.id == params.id }
if (command){
if (!device) {
httpError(404, "Device not found")
} else {
device.off();
return [Device_id: params.id, result_action: "200"]
}
}
}
*/
//SWITCH
def getSwitchStatus() {
def device = switches.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
return [Device_state: device.currentValue('switch')]
}
}
def turnOnSwitch() {
def device = switches.find { it.id == params.id }
if (command){
if (!device) {
httpError(404, "Device not found")
} else {
device.on();
return [Device_id: params.id, result_action: "200"]
}
}
}
def turnOffSwitch() {
def device = switches.find { it.id == params.id }
if (command){
if (!device) {
httpError(404, "Device not found")
} else {
device.on();
return [Device_id: params.id, result_action: "200"]
}
}
}
//TEMPERATURE
def getTempSensorsStatus() {
def device = temperature_sensors.find { it.id == params.id }
if (!device) {
httpError(404, "Device not found")
} else {
def bat = getBatteryStatus(device.id)
return [Device_state: device.currentValue('temperature')] + bat
}
}
def getTempSensorsStatus(id) {
def device = temperature_sensors.find { it.id == id }
if (!device) {
return []
} else {
def bat = getBatteryStatus(device.id)
return [temperature: device.currentValue('temperature')] + bat
}
}

View File

@@ -1,11 +1,10 @@
/** /**
* Color Coordinator * Color Coordinator
* Version 1.1.1 - 11/9/16 * Version 1.1.0 - 11/9/16
* By Michael Struck * By Michael Struck
* *
* 1.0.0 - Initial release * 1.0.0 - Initial release
* 1.1.0 - Fixed issue where master can be part of slaves. This causes a loop that impacts SmartThings. * 1.1.0 - Fixed issue where master can be part of slaves. This causes a loop that impacts SmartThings.
* 1.1.1 - Fix NPE being thrown for slave/master inputs being empty.
* *
* *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -34,17 +33,17 @@ preferences {
def mainPage() { def mainPage() {
dynamicPage(name: "mainPage", title: "", install: true, uninstall: false) { dynamicPage(name: "mainPage", title: "", install: true, uninstall: false) {
def masterInList = slaves?.id?.find{it==master?.id} def masterInList = slaves.id.find{it==master.id}
if (masterInList) { if (masterInList) {
section ("**WARNING**"){ section ("**WARNING**"){
paragraph "You have included the Master Light in the Slave Group. This will cause a loop in execution. Please remove this device from the Slave Group.", image: "https://raw.githubusercontent.com/MichaelStruck/SmartThingsPublic/master/img/caution.png" paragraph "You have included the Master Light in the Slave Group. This will cause a loop in execution. Please remove this device from the Slave Group.", image: "https://raw.githubusercontent.com/MichaelStruck/SmartThingsPublic/master/img/caution.png"
} }
} }
section("Master Light") { section("Master Light") {
input "master", "capability.colorControl", title: "Colored Light", required: true input "master", "capability.colorControl", title: "Colored Light"
} }
section("Lights that follow the master settings") { section("Lights that follow the master settings") {
input "slaves", "capability.colorControl", title: "Colored Lights", multiple: true, required: true, submitOnChange: true input "slaves", "capability.colorControl", title: "Colored Lights", multiple: true, required: false, submitOnChange: true
} }
section([mobileOnly:true], "Options") { section([mobileOnly:true], "Options") {
input "randomYes", "bool",title: "When Master Turned On, Randomize Color", defaultValue: false input "randomYes", "bool",title: "When Master Turned On, Randomize Color", defaultValue: false
@@ -82,44 +81,40 @@ def init() {
} }
//----------------------------------- //-----------------------------------
def onOffHandler(evt){ def onOffHandler(evt){
if (slaves && master) { if (!slaves.id.find{it==master.id}){
if (!slaves?.id.find{it==master?.id}){ if (master.currentValue("switch") == "on"){
if (master?.currentValue("switch") == "on"){ if (randomYes) getRandomColorMaster()
if (randomYes) getRandomColorMaster() else slaves?.on()
else slaves?.on() }
} else {
else { slaves?.off()
slaves?.off() }
}
}
} }
} }
def colorHandler(evt) { def colorHandler(evt) {
if (slaves && master) { if (!slaves.id.find{it==master.id} && master.currentValue("switch") == "on"){
if (!slaves?.id?.find{it==master?.id} && master?.currentValue("switch") == "on"){ log.debug "Changing Slave units H,S,L"
log.debug "Changing Slave units H,S,L" def dimLevel = master.currentValue("level")
def dimLevel = master?.currentValue("level") def hueLevel = master.currentValue("hue")
def hueLevel = master?.currentValue("hue") def saturationLevel = master.currentValue("saturation")
def saturationLevel = master.currentValue("saturation") def newValue = [hue: hueLevel, saturation: saturationLevel, level: dimLevel as Integer]
def newValue = [hue: hueLevel, saturation: saturationLevel, level: dimLevel as Integer] slaves?.setColor(newValue)
slaves?.setColor(newValue) try {
try { log.debug "Changing Slave color temp"
log.debug "Changing Slave color temp" def tempLevel = master.currentValue("colorTemperature")
def tempLevel = master?.currentValue("colorTemperature") slaves?.setColorTemperature(tempLevel)
slaves?.setColorTemperature(tempLevel) }
} catch (e){
catch (e){ log.debug "Color temp for master --"
log.debug "Color temp for master --" }
}
}
} }
} }
def getRandomColorMaster(){ def getRandomColorMaster(){
def hueLevel = Math.floor(Math.random() *1000) def hueLevel = Math.floor(Math.random() *1000)
def saturationLevel = Math.floor(Math.random() * 100) def saturationLevel = Math.floor(Math.random() * 100)
def dimLevel = master?.currentValue("level") def dimLevel = master.currentValue("level")
def newValue = [hue: hueLevel, saturation: saturationLevel, level: dimLevel as Integer] def newValue = [hue: hueLevel, saturation: saturationLevel, level: dimLevel as Integer]
log.debug hueLevel log.debug hueLevel
log.debug saturationLevel log.debug saturationLevel
@@ -128,14 +123,12 @@ def getRandomColorMaster(){
} }
def tempHandler(evt){ def tempHandler(evt){
if (slaves && master) { if (!slaves.id.find{it==master.id} && master.currentValue("switch") == "on"){
if (!slaves?.id?.find{it==master?.id} && master?.currentValue("switch") == "on"){ if (evt.value != "--") {
if (evt.value != "--") { log.debug "Changing Slave color temp based on Master change"
log.debug "Changing Slave color temp based on Master change" def tempLevel = master.currentValue("colorTemperature")
def tempLevel = master.currentValue("colorTemperature") slaves?.setColorTemperature(tempLevel)
slaves?.setColorTemperature(tempLevel) }
}
}
} }
} }
@@ -146,7 +139,7 @@ private def textAppName() {
} }
private def textVersion() { private def textVersion() {
def text = "Version 1.1.1 (12/13/2016)" def text = "Version 1.1.0 (11/09/2016)"
} }
private def textCopyright() { private def textCopyright() {
@@ -173,4 +166,4 @@ private def textHelp() {
"This application will allow you to control the settings of multiple colored lights with one control. " + "This application will allow you to control the settings of multiple colored lights with one control. " +
"Simply choose a master control light, and then choose the lights that will follow the settings of the master, "+ "Simply choose a master control light, and then choose the lights that will follow the settings of the master, "+
"including on/off conditions, hue, saturation, level and color temperature. Also includes a random color feature." "including on/off conditions, hue, saturation, level and color temperature. Also includes a random color feature."
} }