Merge branch 'neopixel2'

Author: Melissa LeBlanc-Williams

adafruit_featherwing/dotstar_featherwing.py

@@ -33,9 +33,9 @@
 
 import board
 import adafruit_dotstar as dotstar
-from adafruit_featherwing.pixelmatrix_featherwing import PixelMatrixFeatherWing
+from adafruit_featherwing.pixelmatrix import PixelMatrix
 
-class DotStarFeatherWing(PixelMatrixFeatherWing):
+class DotStarFeatherWing(PixelMatrix):
     """Class representing a `DotStar FeatherWing
        <https://www.adafruit.com/product/3449>`_.
 
@@ -51,243 +51,3 @@ def __init__(self, clock=board.D13, data=board.D11, brightness=0.2):
         self.columns = 12
         self._matrix = dotstar.DotStar(clock, data, self.rows * self.columns,
                                        brightness=brightness, auto_write=False)
-
-    def fill(self, color=0):
-        """
-        Fills all of the DotStars with a color or unlit if empty.
-
-        :param color: (Optional) The text or number to display (default=0)
-        :type color: list/tuple or int
-
-        This example shows various ways of using the fill() function
-
-        .. code-block:: python
-
-            import time
-            from adafruit_featherwing import dotstar_featherwing
-
-            dotstar = dotstar_featherwing.DotStarFeatherWing()
-            dotstar.fill((255, 255, 255)) # Fill White
-            time.sleep(1)
-            dotstar.fill((255, 255, 255, 0.5)) # Fill White Half Brightness
-            time.sleep(1)
-            dotstar.fill(0xFF0000) # Fill Red
-            time.sleep(1)
-            dotstar.fill() # Clear all lit DotStars
-
-        """
-        super()._fill(color)
-
-    def show(self):
-        """
-        Update the DotStars. This is only needed if auto_write is set to False
-        This can be very useful for more advanced graphics effects.
-
-        This example changes the blink rate and prints out the current setting
-
-        .. code-block:: python
-
-            import time
-            from adafruit_featherwing import dotstar_featherwing
-
-            dotstar = dotstar_featherwing.DotStarFeatherWing()
-            dotstar.fill() # Clear any lit Dotstars
-            dotstar.auto_write = False
-            dotstar[0, 0] = (255, 255, 255) # Set White
-            time.sleep(1)
-            dotstar.show() # Update the DotStars
-
-        """
-        super()._show()
-
-    def shift_right(self, rotate=False):
-        """
-        Shift all pixels right
-
-        :param rotate: (Optional) Rotate the shifted pixels to the left side (default=False)
-
-        This example shifts 2 pixels to the right
-
-        .. code-block:: python
-
-            import time
-            from adafruit_featherwing import dotstar_featherwing
-
-            dotstar = dotstar_featherwing.DotStarFeatherWing()
-
-            # Draw Red and Green Pixels
-            dotstar[5, 3] = (255, 0, 0)
-            dotstar[6, 3] = (0, 255, 0)
-
-            # Rotate it off the screen
-            for i in range(0, dotstar.columns - 1):
-                dotstar.shift_right(True)
-                time.sleep(.1)
-
-            time.sleep(1)
-            # Shift it off the screen
-            for i in range(0, dotstar.columns - 1):
-                dotstar.shift_right()
-                time.sleep(.1)
-
-        """
-        super()._shift_right(rotate)
-
-    def shift_left(self, rotate=False):
-        """
-        Shift all pixels left
-
-        :param rotate: (Optional) Rotate the shifted pixels to the right side (default=False)
-
-        This example shifts 2 pixels to the left
-
-        .. code-block:: python
-
-            import time
-            from adafruit_featherwing import dotstar_featherwing
-
-            dotstar = dotstar_featherwing.DotStarFeatherWing()
-
-            # Draw Red and Green Pixels
-            dotstar[5, 3] = (255, 0, 0)
-            dotstar[6, 3] = (0, 255, 0)
-
-            # Rotate it off the screen
-            for i in range(0, dotstar.columns - 1):
-                dotstar.shift_left(True)
-                time.sleep(.1)
-
-            time.sleep(1)
-            # Shift it off the screen
-            for i in range(0, dotstar.columns - 1):
-                dotstar.shift_left()
-                time.sleep(.1)
-
-        """
-        super()._shift_left(rotate)
-
-    def shift_up(self, rotate=False):
-        """
-        Shift all pixels up
-
-        :param rotate: (Optional) Rotate the shifted pixels to bottom (default=False)
-
-        This example shifts 2 pixels up
-
-        .. code-block:: python
-
-            import time
-            from adafruit_featherwing import dotstar_featherwing
-
-            dotstar = dotstar_featherwing.DotStarFeatherWing()
-
-            # Draw Red and Green Pixels
-            dotstar[5, 3] = (255, 0, 0)
-            dotstar[6, 3] = (0, 255, 0)
-
-            # Rotate it off the screen
-            for i in range(0, dotstar.rows - 1):
-                dotstar.shift_up(True)
-                time.sleep(.1)
-
-            time.sleep(1)
-            # Shift it off the screen
-            for i in range(0, dotstar.rows - 1):
-                dotstar.shift_up()
-                time.sleep(.1)
-
-        """
-        super()._shift_up(rotate)
-
-    def shift_down(self, rotate=False):
-        """
-        Shift all pixels down
-
-        :param rotate: (Optional) Rotate the shifted pixels to top (default=False)
-
-        This example shifts 2 pixels down
-
-        .. code-block:: python
-
-            import time
-            from adafruit_featherwing import dotstar_featherwing
-
-            dotstar = dotstar_featherwing.DotStarFeatherWing()
-
-            # Draw Red and Green Pixels
-            dotstar[5, 3] = (255, 0, 0)
-            dotstar[6, 3] = (0, 255, 0)
-
-            # Rotate it off the screen
-            for i in range(0, dotstar.rows - 1):
-                dotstar.shift_down(True)
-                time.sleep(.1)
-
-            time.sleep(1)
-            # Shift it off the screen
-            for i in range(0, dotstar.rows - 1):
-                dotstar.shift_down()
-                time.sleep(.1)
-
-        """
-        super()._shift_down(rotate)
-
-    @property
-    def auto_write(self):
-        """
-        Whether or not we are automatically updating
-        If set to false, be sure to call show() to update
-
-        This lights DotStars with and without auto_write
-
-        .. code-block:: python
-
-            import time
-            from adafruit_featherwing import dotstar_featherwing
-
-            dotstar = dotstar_featherwing.DotStarFeatherWing()
-            dotstar.fill() # Clear any lit Dotstars
-            dotstar[0, 0] = (255, 255, 255) # Set White
-            time.sleep(1)
-
-            dotstar.auto_write = False
-            dotstar[1, 0] = (255, 255, 255) # Set White
-            time.sleep(1)
-            dotstar.show() # Update the DotStars
-
-        """
-        return self._auto_write
-
-    @auto_write.setter
-    def auto_write(self, write):
-        if isinstance(write, bool):
-            self._auto_write = write
-
-    @property
-    def brightness(self):
-        """
-        Overall brightness of the display
-
-        This example changes the brightness
-
-        .. code-block:: python
-
-            import time
-            from adafruit_featherwing import dotstar_featherwing
-
-            dotstar = dotstar_featherwing.DotStarFeatherWing()
-            dotstar.brightness = 0
-            dotstar.fill(0xFFFFFF)
-            for i in range(0, 6):
-                dotstar.brightness = (i / 10)
-                time.sleep(.2)
-
-            dotstar.brightness = 0.3
-
-        """
-        return self._matrix.brightness
-
-    @brightness.setter
-    def brightness(self, brightness):
-        self._matrix.brightness = min(max(brightness, 0.0), 1.0)
-        self._update()