Skip to content

Commit f616dcb

Browse files
committed
Merge pull request SmartThingsCommunity#542 from larsfinander/lifxExceptionFix
DVCSMP-1505 LIFX setColor() throws exception
2 parents 3130e6a + 42b790e commit f616dcb

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

devicetypes/smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy

+9-1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ def setHue(percentage) {
8484
log.error("Bad setHue result: [${resp.status}] ${resp.data}")
8585
}
8686
}
87+
return []
8788
}
8889

8990
def setSaturation(percentage) {
@@ -97,6 +98,7 @@ def setSaturation(percentage) {
9798
log.error("Bad setSaturation result: [${resp.status}] ${resp.data}")
9899
}
99100
}
101+
return []
100102
}
101103

102104
def setColor(Map color) {
@@ -122,13 +124,15 @@ def setColor(Map color) {
122124
parent.logErrors(logObject:log) {
123125
def resp = parent.apiPUT("/lights/${selector()}/state", [color: attrs.join(" "), power: "on"])
124126
if (resp.status < 300) {
125-
sendEvent(name: "color", value: color.hex)
127+
if (color.hex)
128+
sendEvent(name: "color", value: color.hex)
126129
sendEvent(name: "switch", value: "on")
127130
events.each { sendEvent(it) }
128131
} else {
129132
log.error("Bad setColor result: [${resp.status}] ${resp.data}")
130133
}
131134
}
135+
return []
132136
}
133137

134138
def setLevel(percentage) {
@@ -150,6 +154,7 @@ def setLevel(percentage) {
150154
log.error("Bad setLevel result: [${resp.status}] ${resp.data}")
151155
}
152156
}
157+
return []
153158
}
154159

155160
def setColorTemperature(kelvin) {
@@ -165,6 +170,7 @@ def setColorTemperature(kelvin) {
165170
}
166171

167172
}
173+
return []
168174
}
169175

170176
def on() {
@@ -174,6 +180,7 @@ def on() {
174180
sendEvent(name: "switch", value: "on")
175181
}
176182
}
183+
return []
177184
}
178185

179186
def off() {
@@ -183,6 +190,7 @@ def off() {
183190
sendEvent(name: "switch", value: "off")
184191
}
185192
}
193+
return []
186194
}
187195

188196
def poll() {

devicetypes/smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy

+4
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ def setLevel(percentage) {
8484
log.error("Bad setLevel result: [${resp.status}] ${resp.data}")
8585
}
8686
}
87+
return []
8788
}
8889

8990
def setColorTemperature(kelvin) {
@@ -99,6 +100,7 @@ def setColorTemperature(kelvin) {
99100
log.error("Bad setColorTemperature result: [${resp.status}] ${resp.data}")
100101
}
101102
}
103+
return []
102104
}
103105

104106
def on() {
@@ -108,6 +110,7 @@ def on() {
108110
sendEvent(name: "switch", value: "on")
109111
}
110112
}
113+
return []
111114
}
112115

113116
def off() {
@@ -117,6 +120,7 @@ def off() {
117120
sendEvent(name: "switch", value: "off")
118121
}
119122
}
123+
return []
120124
}
121125

122126
def poll() {

0 commit comments

Comments
 (0)