Skip to content

Commit 4e7c2df

Browse files
authored
gateway: fix zigbee lights (#1016)
1 parent d7507bb commit 4e7c2df

File tree

2 files changed

+72
-34
lines changed

2 files changed

+72
-34
lines changed

miio/gateway/devices/light.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,6 @@
99
class LightBulb(SubDevice):
1010
"""Base class for subdevice light bulbs."""
1111

12-
@command()
13-
def update(self):
14-
"""Update all device properties."""
15-
self._props["brightness"] = self.send("get_bright").pop()
16-
self._props["color_temp"] = self.send("get_ct").pop()
17-
if self._props["brightness"] > 0 and self._props["brightness"] <= 100:
18-
self._props["status"] = "on"
19-
else:
20-
self._props["status"] = "off"
21-
2212
@command()
2313
def on(self):
2414
"""Turn bulb on."""

miio/gateway/devices/subdevices.yaml

Lines changed: 72 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,17 @@
128128
type: LightBulb
129129
class: LightBulb
130130
properties:
131-
- property: status # 'on' / 'off'
132-
- property: brightness
131+
- property: power_status # 'on' / 'off'
132+
name: status
133+
get: get_property_exp
134+
- property: light_level
135+
name: brightness
133136
unit: percent
134-
- property: color_temp
137+
get: get_property_exp
138+
- property: colour_temperature
139+
name: color_temp
135140
unit: cct
141+
get: get_property_exp
136142
- property: cct_min
137143
unit: cct
138144
default: 153
@@ -147,11 +153,17 @@
147153
type: LightBulb
148154
class: LightBulb
149155
properties:
150-
- property: status # 'on' / 'off'
151-
- property: brightness
156+
- property: power_status # 'on' / 'off'
157+
name: status
158+
get: get_property_exp
159+
- property: light_level
160+
name: brightness
152161
unit: percent
153-
- property: color_temp
162+
get: get_property_exp
163+
- property: colour_temperature
164+
name: color_temp
154165
unit: cct
166+
get: get_property_exp
155167
- property: cct_min
156168
unit: cct
157169
default: 153
@@ -166,11 +178,17 @@
166178
type: LightBulb
167179
class: LightBulb
168180
properties:
169-
- property: status # 'on' / 'off'
170-
- property: brightness
181+
- property: power_status # 'on' / 'off'
182+
name: status
183+
get: get_property_exp
184+
- property: light_level
185+
name: brightness
171186
unit: percent
172-
- property: color_temp
187+
get: get_property_exp
188+
- property: colour_temperature
189+
name: color_temp
173190
unit: cct
191+
get: get_property_exp
174192
- property: cct_min
175193
unit: cct
176194
default: 153
@@ -185,11 +203,17 @@
185203
type: LightBulb
186204
class: LightBulb
187205
properties:
188-
- property: status # 'on' / 'off'
189-
- property: brightness
206+
- property: power_status # 'on' / 'off'
207+
name: status
208+
get: get_property_exp
209+
- property: light_level
210+
name: brightness
190211
unit: percent
191-
- property: color_temp
212+
get: get_property_exp
213+
- property: colour_temperature
214+
name: color_temp
192215
unit: cct
216+
get: get_property_exp
193217
- property: cct_min
194218
unit: cct
195219
default: 153
@@ -204,11 +228,17 @@
204228
type: LightBulb
205229
class: LightBulb
206230
properties:
207-
- property: status # 'on' / 'off'
208-
- property: brightness
231+
- property: power_status # 'on' / 'off'
232+
name: status
233+
get: get_property_exp
234+
- property: light_level
235+
name: brightness
209236
unit: percent
210-
- property: color_temp
237+
get: get_property_exp
238+
- property: colour_temperature
239+
name: color_temp
211240
unit: cct
241+
get: get_property_exp
212242
- property: cct_min
213243
unit: cct
214244
default: 153
@@ -223,11 +253,17 @@
223253
type: LightBulb
224254
class: LightBulb
225255
properties:
226-
- property: status # 'on' / 'off'
227-
- property: brightness
256+
- property: power_status # 'on' / 'off'
257+
name: status
258+
get: get_property_exp
259+
- property: light_level
260+
name: brightness
228261
unit: percent
229-
- property: color_temp
262+
get: get_property_exp
263+
- property: colour_temperature
264+
name: color_temp
230265
unit: cct
266+
get: get_property_exp
231267
- property: cct_min
232268
unit: cct
233269
default: 153
@@ -242,11 +278,17 @@
242278
type: LightBulb
243279
class: LightBulb
244280
properties:
245-
- property: status # 'on' / 'off'
246-
- property: brightness
281+
- property: power_status # 'on' / 'off'
282+
name: status
283+
get: get_property_exp
284+
- property: light_level
285+
name: brightness
247286
unit: percent
248-
- property: color_temp
287+
get: get_property_exp
288+
- property: colour_temperature
289+
name: color_temp
249290
unit: cct
291+
get: get_property_exp
250292
- property: cct_min
251293
unit: cct
252294
default: 153
@@ -261,11 +303,17 @@
261303
type: LightBulb
262304
class: LightBulb
263305
properties:
264-
- property: status # 'on' / 'off'
265-
- property: brightness
306+
- property: power_status # 'on' / 'off'
307+
name: status
308+
get: get_property_exp
309+
- property: light_level
310+
name: brightness
266311
unit: percent
267-
- property: color_temp
312+
get: get_property_exp
313+
- property: colour_temperature
314+
name: color_temp
268315
unit: cct
316+
get: get_property_exp
269317
- property: cct_min
270318
unit: cct
271319
default: 153

0 commit comments

Comments
 (0)