Merge pull request #1461 from varzac/fix-smartpower-dimming-outlet

[DVCSMP-2227] Handle all messages in smartpower dimming outlet
This commit is contained in:
Vinay Rao
2016-11-14 11:27:06 -08:00
committed by GitHub

View File

@@ -71,7 +71,7 @@ def parse(String description) {
def event = [:] def event = [:]
def finalResult = isKnownDescription(description) def finalResult = isKnownDescription(description)
if (finalResult != "false") { if (finalResult) {
log.info finalResult log.info finalResult
if (finalResult.type == "update") { if (finalResult.type == "update") {
log.info "$device updates: ${finalResult.value}" log.info "$device updates: ${finalResult.value}"
@@ -212,13 +212,16 @@ def isKnownDescription(description) {
else if (descMap.cluster == "0B04" || descMap.clusterId == "0B04"){ else if (descMap.cluster == "0B04" || descMap.clusterId == "0B04"){
isDescriptionPower(descMap) isDescriptionPower(descMap)
} }
else {
return [:]
}
} }
else if(description?.startsWith("on/off:")) { else if(description?.startsWith("on/off:")) {
def switchValue = description?.endsWith("1") ? "on" : "off" def switchValue = description?.endsWith("1") ? "on" : "off"
return [type: "switch", value : switchValue] return [type: "switch", value : switchValue]
} }
else { else {
return "false" return [:]
} }
} }
@@ -252,7 +255,7 @@ def isDescriptionOnOff(descMap) {
return [type: "switch", value : switchValue] return [type: "switch", value : switchValue]
} }
else { else {
return "false" return [:]
} }
} }
@@ -279,10 +282,9 @@ def isDescriptionLevel(descMap) {
if (dimmerValue != -1){ if (dimmerValue != -1){
return [type: "level", value : dimmerValue] return [type: "level", value : dimmerValue]
} }
else { else {
return "false" return [:]
} }
} }
@@ -304,7 +306,7 @@ def isDescriptionPower(descMap) {
return [type: "power", value : powerValue] return [type: "power", value : powerValue]
} }
else { else {
return "false" return [:]
} }
} }