From ded1e71566e78b5af7846d990bbf71d7f6ac6fd9 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 15 Apr 2019 17:51:22 -0400 Subject: [PATCH 1/3] set_color takes in kwargs instead of predefined arguments --- adafruit_lifx.py | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/adafruit_lifx.py b/adafruit_lifx.py index d4aadcb..08ccb9b 100644 --- a/adafruit_lifx.py +++ b/adafruit_lifx.py @@ -123,9 +123,8 @@ def toggle_light(self, selector, all_lights=False, duration=0): """ if all_lights: selector = 'all' - path = LIFX_URL+selector+'/toggle' data = {'duration':duration} - return self._post(path, data) + return self._post(LIFX_URL+selector+'/toggle', data) def move_effect(self, selector, move_direction, period, power_on): """Performs a linear move effect on a light, or lights. @@ -133,43 +132,32 @@ def move_effect(self, selector, move_direction, period, power_on): :param double period: Time in second per effect cycle. :param bool power_on: Turn on a light before performing the move. """ - path = LIFX_URL+selector+'/effects/move' data = {'direction':move_direction, 'period':period, 'power_on':power_on} - return self._post(path, data) + return self._post(LIFX_URL+selector+'/effects/move', data) def effects_off(self, selector, power_off=False): """Turns off any running effects on the selected device. :param dict selector: Selector to control which lights are requested. :param bool power_off: If true, the devices will also be turned off. """ - path = LIFX_URL+selector+'/effects/off' data = {'power_off', power_off} - return self._post(path, data) + return self._post(LIFX_URL+selector+'/effects/off', data) def set_brightness(self, selector, brightness): """Sets the state of the lights within the selector. :param dict selector: Selector to control which lights are requested. :param double brightness: Brightness level of the light, from 0.0 to 1.0. """ - path = LIFX_URL+selector+'/state' data = {'brightness':brightness} - return self._put(path, data) + return self._put(LIFX_URL+selector+'/state', data) - def set_color(self, selector, power, color, brightness=1.0): + def set_color(self, selector, **kwargs): """Sets the state of the light's color within the selector. - :param dict selector: Selector to control which lights are requested. - :param str power: Sets the power state of the light (on/off). - :param str color: Color to set the light to (https://api.developer.lifx.com/v1/docs/colors). - :param double brightness: Brightness level of the light from 0.0 to 1.0. + Valid arguments: https://api.developer.lifx.com/v1/docs/colors """ - path = LIFX_URL+selector+'/state' - data = {'power':power, - 'color':color, - 'brightness':brightness - } - return self._put(path, data) + return self._put(LIFX_URL+selector+'/state', kwargs) def list_lights(self): """Enumerates all the lights associated with the LIFX Cloud Account From f271a91709619863481443f1b485192567794738 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 15 Apr 2019 17:53:10 -0400 Subject: [PATCH 2/3] fix URL link --- adafruit_lifx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_lifx.py b/adafruit_lifx.py index 08ccb9b..212c0cb 100644 --- a/adafruit_lifx.py +++ b/adafruit_lifx.py @@ -155,7 +155,7 @@ def set_brightness(self, selector, brightness): def set_color(self, selector, **kwargs): """Sets the state of the light's color within the selector. - Valid arguments: https://api.developer.lifx.com/v1/docs/colors + Valid arguments: https://api.developer.lifx.com/docs/set-state """ return self._put(LIFX_URL+selector+'/state', kwargs) From 938041b20a7815be082721dbfa12853e70b4236c Mon Sep 17 00:00:00 2001 From: brentru Date: Thu, 18 Apr 2019 09:38:23 -0400 Subject: [PATCH 3/3] update example to match lib --- examples/lifx_simpletest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/lifx_simpletest.py b/examples/lifx_simpletest.py index 9baf000..6ef30c8 100644 --- a/examples/lifx_simpletest.py +++ b/examples/lifx_simpletest.py @@ -49,7 +49,7 @@ colors = ['yellow', 'blue', 'white'] for color in colors: print('Setting light to: ', color) - lifx.set_color(lifx_light, 'on', color, brightness=light_brightness) + lifx.set_color(lifx_light, power='on', color=color, brightness=light_brightness) # Turn off the light print('Turning off light...')