Moonlight: Provide property rgb as tuple

miio/philips_moonlight.py

@@ -1,11 +1,12 @@
 import logging
 from collections import defaultdict
-from typing import Any, Dict
+from typing import Any, Dict, Tuple
 
 import click
 
 from .click_common import command, format_output
 from .device import Device, DeviceException
+from .utils import int_to_rgb, rgb_to_int
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -43,8 +44,9 @@ def color_temperature(self) -> int:
         return self.data["cct"]
 
     @property
-    def rgb(self) -> int:
-        return self.data["rgb"]
+    def rgb(self) -> Tuple[int, int, int]:
+        """Return color in RGB."""
+        return int_to_rgb(int(self.data["rgb"]))
 
     @property
     def scene(self) -> int:
@@ -175,15 +177,16 @@ def off(self):
         return self.send("set_power", ["off"])
 
     @command(
-        click.argument("rgb", type=int),
+        click.argument("rgb", default=[255] * 3, type=click.Tuple([int, int, int])),
         default_output=format_output("Setting color to {rgb}")
     )
-    def set_rgb(self, rgb):
-        """Set color in encoded RGB."""
-        if rgb < 0 or rgb > 16777215:
-            raise PhilipsMoonlightException("Invalid color: %s" % rgb)
+    def set_rgb(self, rgb: Tuple[int, int, int]):
+        """Set color in RGB."""
+        for color in rgb:
+            if color < 0 or color > 255:
+                raise PhilipsMoonlightException("Invalid color: %s" % color)
 
-        return self.send("set_rgb", [rgb])
+        return self.send("set_rgb", [rgb_to_int(rgb)])
 
     @command(
         click.argument("level", type=int),

miio/tests/test_philips_moonlight.py

@@ -4,6 +4,7 @@
 
 from miio import PhilipsMoonlight
 from miio.philips_moonlight import PhilipsMoonlightStatus, PhilipsMoonlightException
+from miio.utils import int_to_rgb
 from .dummies import DummyDevice
 
 
@@ -79,7 +80,7 @@ def test_status(self):
         assert self.is_on() is True
         assert self.state().brightness == self.device.start_state["bri"]
         assert self.state().color_temperature == self.device.start_state["cct"]
-        assert self.state().rgb == self.device.start_state["rgb"]
+        assert self.state().rgb == int_to_rgb(int(self.device.start_state["rgb"]))
         assert self.state().scene == self.device.start_state["snm"]
 
     def test_set_brightness(self):
@@ -105,18 +106,30 @@ def test_set_rgb(self):
         def rgb():
             return self.device.status().rgb
 
-        self.device.set_rgb(1)
-        assert rgb() == 1
-        self.device.set_rgb(16711680)
-        assert rgb() == 16711680
-        self.device.set_rgb(16777215)
-        assert rgb() == 16777215
+        self.device.set_rgb((0, 0, 1))
+        assert rgb() == (0, 0, 1)
+        self.device.set_rgb((255, 255, 0))
+        assert rgb() == (255, 255, 0)
+        self.device.set_rgb((255, 255, 255))
+        assert rgb() == (255, 255, 255)
 
         with pytest.raises(PhilipsMoonlightException):
-            self.device.set_rgb(-1)
+            self.device.set_rgb((-1, 0, 0))
 
         with pytest.raises(PhilipsMoonlightException):
-            self.device.set_rgb(16777216)
+            self.device.set_rgb((256, 0, 0))
+
+        with pytest.raises(PhilipsMoonlightException):
+            self.device.set_rgb((0, -1, 0))
+
+        with pytest.raises(PhilipsMoonlightException):
+            self.device.set_rgb((0, 256, 0))
+
+        with pytest.raises(PhilipsMoonlightException):
+            self.device.set_rgb((0, 0, -1))
+
+        with pytest.raises(PhilipsMoonlightException):
+            self.device.set_rgb((0, 0, 256))
 
     def test_set_color_temperature(self):
         def color_temperature():
@@ -181,13 +194,13 @@ def rgb():
 
         self.device.set_brightness_and_rgb(20, 0)
         assert brightness() == 20
-        assert rgb() == 0
+        assert rgb() == (0, 0, 0)
         self.device.set_brightness_and_rgb(31, 16711680)
         assert brightness() == 31
-        assert rgb() == 16711680
+        assert rgb() == (255, 0, 0)
         self.device.set_brightness_and_rgb(100, 16777215)
         assert brightness() == 100
-        assert rgb() == 16777215
+        assert rgb() == (255, 255, 255)
 
         with pytest.raises(PhilipsMoonlightException):
             self.device.set_brightness_and_rgb(-1, 10)

miio/tests/test_yeelight.py

@@ -72,6 +72,7 @@ def test_status(self):
         assert status.brightness == 100
         assert status.color_temp == 3584
         assert status.color_mode == YeelightMode.ColorTemperature
+        assert status.rgb is None
         assert status.developer_mode is True
         assert status.save_state_on_change is True
 
@@ -124,14 +125,39 @@ def color_temp():
         with pytest.raises(YeelightException):
             self.device.set_color_temp(7000)
 
-    @pytest.mark.skip("rgb is not properly implemented")
     def test_set_rgb(self):
+        def rgb():
+            return self.device.status().rgb
+
         self.device._reset_state()
-        assert self.device.status().rgb == 16711680
+        self.device._set_state('color_mode', [1])
+
+        assert rgb() == (255, 0, 0)
+
+        self.device.set_rgb((0, 0, 1))
+        assert rgb() == (0, 0, 1)
+        self.device.set_rgb((255, 255, 0))
+        assert rgb() == (255, 255, 0)
+        self.device.set_rgb((255, 255, 255))
+        assert rgb() == (255, 255, 255)
+
+        with pytest.raises(YeelightException):
+            self.device.set_rgb((-1, 0, 0))
+
+        with pytest.raises(YeelightException):
+            self.device.set_rgb((256, 0, 0))
 
-        NEW_RGB = 16712222
-        self.set_rgb(NEW_RGB)
-        assert self.device.status().rgb == NEW_RGB
+        with pytest.raises(YeelightException):
+            self.device.set_rgb((0, -1, 0))
+
+        with pytest.raises(YeelightException):
+            self.device.set_rgb((0, 256, 0))
+
+        with pytest.raises(YeelightException):
+            self.device.set_rgb((0, 0, -1))
+
+        with pytest.raises(YeelightException):
+            self.device.set_rgb((0, 0, 256))
 
     @pytest.mark.skip("hsv is not properly implemented")
     def test_set_hsv(self):

miio/utils.py

@@ -2,6 +2,7 @@
 import inspect
 import warnings
 from datetime import timedelta, datetime
+from typing import Tuple
 
 
 def deprecated(reason):
@@ -88,3 +89,16 @@ def pretty_seconds(x: float) -> timedelta:
 def pretty_time(x: float) -> datetime:
     """Return a datetime object from unix timestamp."""
     return datetime.fromtimestamp(x)
+
+
+def int_to_rgb(x: int) -> Tuple[int, int, int]:
+    """Return a RGB tuple from integer."""
+    red = (x >> 16) & 0xff
+    green = (x >> 8) & 0xff
+    blue = x & 0xff
+    return red, green, blue
+
+
+def rgb_to_int(x: Tuple[int, int, int]) -> int:
+    """Return an integer from RGB tuple."""
+    return int(x[0] << 16 | x[1] << 8 | x[2])

miio/yeelight.py

@@ -5,6 +5,7 @@
 
 from .click_common import command, format_output
 from .device import Device, DeviceException
+from .utils import int_to_rgb, rgb_to_int
 
 
 class YeelightException(DeviceException):
@@ -37,11 +38,7 @@ def brightness(self) -> int:
     def rgb(self) -> Optional[Tuple[int, int, int]]:
         """Return color in RGB if RGB mode is active."""
         if self.color_mode == YeelightMode.RGB:
-            rgb = int(self.data["rgb"])
-            blue = rgb & 0xff
-            green = (rgb >> 8) & 0xff
-            red = (rgb >> 16) & 0xff
-            return red, green, blue
+            return int_to_rgb(int(self.data["rgb"]))
         return None
 
     @property
@@ -204,9 +201,17 @@ def set_color_temp(self, level, transition=500):
         else:
             return self.send("set_ct_abx", [level])
 
-    def set_rgb(self, rgb):
-        """Set color in encoded RGB."""
-        return self.send("set_rgb", [rgb])
+    @command(
+        click.argument("rgb", default=[255] * 3, type=click.Tuple([int, int, int])),
+        default_output=format_output("Setting color to {rgb}")
+    )
+    def set_rgb(self, rgb: Tuple[int, int, int]):
+        """Set color in RGB."""
+        for color in rgb:
+            if color < 0 or color > 255:
+                raise YeelightException("Invalid color: %s" % color)
+
+        return self.send("set_rgb", [rgb_to_int(rgb)])
 
     def set_hsv(self, hsv):
         """Set color in HSV."""