mtan93/SmartThingsPublic
1
0
Fork 0
mirror of https://github.com/mtan93/SmartThingsPublic.git synced 2026-03-31 06:13:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactoring code to get it inline with the new zigbee apis

Browse Source
This commit is contained in:
Vinay Rao
2016-03-23 00:27:23 -07:00
parent c1422438ac
commit 281fc939ac
3 changed files with 12 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy
View File

@@ -51,22 +51,15 @@ metadata {
// Parse incoming device messages to generate events // Parse incoming device messages to generate events
def parse(String description) { def parse(String description) {
log.debug "description is $description" log.debug "description is $description"
def event = zigbee.getEvent(description)
def resultMap = zigbee.getKnownDescription(description) if (event) {
if (resultMap) { if (event.name == "power") {
log.info resultMap
if (resultMap.type == "update") {
log.info "$device updates: ${resultMap.value}"
}
else if (resultMap.type == "power") {
def powerValue def powerValue
if (device.getDataValue("manufacturer") != "OSRAM") { //OSRAM devices do not reliably update power powerValue = (event.value as Integer)/10 //TODO: The divisor value needs to be set as part of configuration
powerValue = (resultMap.value as Integer)/10 //TODO: The divisor value needs to be set as part of configuration sendEvent(name: "power", value: powerValue)
sendEvent(name: "power", value: powerValue)
}
} }
else { else {
sendEvent(name: resultMap.type, value: resultMap.value) sendEvent(event)
} }
} }
else { else {

13
devicetypes/smartthings/zigbee-switch.src/zigbee-switch.groovy
View File

@@ -53,16 +53,9 @@ metadata {
// Parse incoming device messages to generate events // Parse incoming device messages to generate events
def parse(String description) { def parse(String description) {
log.debug "description is $description" log.debug "description is $description"
def event = zigbee.getEvent(description)
def resultMap = zigbee.getKnownDescription(description) if (event) {
if (resultMap) { sendEvent(event)
log.info resultMap
if (resultMap.type == "update") {
log.info "$device updates: ${resultMap.value}"
}
else {
sendEvent(name: resultMap.type, value: resultMap.value)
}
} }
else { else {
log.warn "DID NOT PARSE MESSAGE for description : $description" log.warn "DID NOT PARSE MESSAGE for description : $description"

13
devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy
View File

@@ -73,16 +73,9 @@ metadata {
// Parse incoming device messages to generate events // Parse incoming device messages to generate events
def parse(String description) { def parse(String description) {
log.debug "description is $description" log.debug "description is $description"
def event = zigbee.getEvent(description)
def finalResult = zigbee.getKnownDescription(description) if (event) {
if (finalResult) { sendEvent(event)
log.info finalResult
if (finalResult.type == "update") {
log.info "$device updates: ${finalResult.value}"
}
else {
sendEvent(name: finalResult.type, value: finalResult.value)
}
} }
else { else {
log.warn "DID NOT PARSE MESSAGE for description : $description" log.warn "DID NOT PARSE MESSAGE for description : $description"