From c278e035f6eed29a22bec4892330199e400d1fc6 Mon Sep 17 00:00:00 2001 From: Dave Hastings Date: Thu, 15 Jun 2017 14:44:14 -0500 Subject: [PATCH] IOTEVENT-786 check for null/empty values before sending events --- .../fibaro-rgbw-controller.groovy | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy b/devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy index 4385edc..4cec80f 100644 --- a/devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy +++ b/devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy @@ -300,15 +300,21 @@ def setColor(value) { value.hex = "#${hex(value.red)}${hex(value.green)}${hex(value.blue)}" } - sendEvent(name: "hue", value: value.hue, displayed: false) - sendEvent(name: "saturation", value: value.saturation, displayed: false) - sendEvent(name: "color", value: value.hex, displayed: false) - if (value.level) { - sendEvent(name: "level", value: value.level) - } - if (value.switch) { - sendEvent(name: "switch", value: value.switch) - } + if(value.hue) { + sendEvent(name: "hue", value: value.hue, displayed: false) + } + if(value.saturation) { + sendEvent(name: "saturation", value: value.saturation, displayed: false) + } + if(value.hex?.trim()) { + sendEvent(name: "color", value: value.hex, displayed: false) + } + if (value.level) { + sendEvent(name: "level", value: value.level) + } + if (value.switch?.trim()) { + sendEvent(name: "switch", value: value.switch) + } sendRGB(value.rh, value.gh, value.bh) }