Merge branch 'master' into bugfixes

Author: rhooper

adafruit_led_animation/animation/grid_rain.py

@@ -0,0 +1,147 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2019-2020 Roy Hooper
+# Copyright (c) 2020 Kattni Rembor for Adafruit Industries
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+"""
+`adafruit_led_animation.animation.grid_rain`
+================================================================================
+
+Rain animations for CircuitPython helper library for LED animations.
+
+* Author(s): Roy Hooper, Kattni Rembor
+
+Implementation Notes
+--------------------
+
+**Hardware:**
+
+* `Adafruit NeoPixels <https://www.adafruit.com/category/168>`_
+* `Adafruit DotStars <https://www.adafruit.com/category/885>`_
+
+**Software and Dependencies:**
+
+* Adafruit CircuitPython firmware for the supported boards:
+  https://circuitpython.org/downloads
+
+"""
+
+import random
+from adafruit_led_animation.animation import Animation
+
+__version__ = "0.0.0-auto.0"
+__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_LED_Animation.git"
+
+from adafruit_led_animation.color import BLACK, colorwheel, calculate_intensity, GREEN
+
+
+class Rain(Animation):
+    """
+    Droplets of rain.
+
+    :param grid_object: The initialised PixelGrid object.
+    :param float speed: Animation speed in seconds, e.g. ``0.1``.
+    :param color: Animation color in ``(r, g, b)`` tuple, or ``0x000000`` hex format.
+    :param count: Number of sparkles to generate per animation cycle.
+    :param length: Number of pixels per raindrop (Default 3)
+    :param background: Background color (Default BLACK).
+    """
+
+    # pylint: disable=too-many-arguments
+    def __init__(
+        self, grid_object, speed, color, count=1, length=3, background=BLACK, name=None
+    ):
+        self._count = count
+        self._length = length
+        self._background = background
+        self._raindrops = []
+        super().__init__(grid_object, speed, color, name=name)
+
+    def draw(self):
+
+        # Move raindrops down
+        keep = []
+        for raindrop in self._raindrops:
+            pixels = []
+            if raindrop[1][0][0] >= 0:
+                self.pixel_object[raindrop[0], raindrop[1][0][0]] = self._background
+            for pixel in raindrop[1]:
+                pixel[0] += 1
+                if pixel[0] < self.pixel_object.height:
+                    pixels.append(pixel)
+            if pixels:
+                keep.append([raindrop[0], pixels])
+        self._raindrops = keep
+
+        # Add a raindrop
+        if len(self._raindrops) < self._count:
+            x = random.randint(0, self.pixel_object.width - 1)
+            self._raindrops.append([x, self._generate_droplet(x, self._length)])
+
+        # Draw raindrops
+        for x, pixels in self._raindrops:
+            for y, color in pixels:
+                if y >= 0:
+                    self.pixel_object[x, y] = color
+
+    def _generate_droplet(self, x, length):  # pylint: disable=unused-argument
+        return [[n, self.color] for n in range(-length, 0)]
+
+
+class RainbowRain(Rain):
+    """
+    Rainbow Rain animation.
+    """
+
+    def __init__(  # pylint: disable=too-many-arguments
+        self, grid_object, speed, count=1, length=3, background=BLACK, name=None
+    ):
+        super().__init__(grid_object, speed, BLACK, count, length, background, name)
+
+    def _generate_droplet(self, x, length):
+        color = colorwheel(random.randint(0, 255))
+        return [
+            [n, calculate_intensity(color, 1.0 - -((n + 1) / (length + 1)))]
+            for n in range(-length, 0)
+        ]
+
+
+class MatrixRain(Rain):
+    """
+    The Matrix style animation.
+    """
+
+    def __init__(  # pylint: disable=too-many-arguments
+        self,
+        grid_object,
+        speed,
+        color=GREEN,
+        count=1,
+        length=6,
+        background=(0, 32, 0),
+        name=None,
+    ):
+        super().__init__(grid_object, speed, color, count, length, background, name)
+
+    def _generate_droplet(self, x, length):
+        return [
+            [n, calculate_intensity(self.color, random.randint(10, 100) * 1.0)]
+            for n in range(-length, 0)
+        ]

adafruit_led_animation/animation/pulse.py

@@ -74,16 +74,11 @@ def reset(self):
         """
         Resets the animation.
         """
-        white = len(self.pixel_object[0]) > 3 and isinstance(
-            self.pixel_object[0][-1], int
-        )
         dotstar = len(self.pixel_object[0]) == 4 and isinstance(
             self.pixel_object[0][-1], float
         )
         from adafruit_led_animation.helper import (  # pylint: disable=import-outside-toplevel
             pulse_generator,
         )
 
-        self._generator = pulse_generator(
-            self._period, self, white, dotstar_pwm=dotstar
-        )
+        self._generator = pulse_generator(self._period, self, dotstar_pwm=dotstar)

adafruit_led_animation/animation/sparklepulse.py

@@ -74,14 +74,11 @@ def __init__(
         self._max_intensity = max_intensity
         self._min_intensity = min_intensity
         self._period = period
-        white = len(pixel_object) == 4 and isinstance(pixel_object[0][-1], int)
         dotstar = len(pixel_object) == 4 and isinstance(pixel_object[0][-1], float)
         super().__init__(
             pixel_object, speed=speed, color=color, num_sparkles=1, name=name
         )
-        self._generator = pulse_generator(
-            self._period, self, white, dotstar_pwm=dotstar
-        )
+        self._generator = pulse_generator(self._period, self, dotstar_pwm=dotstar)
 
     def draw(self):
         self._sparkle_color = next(self._generator)