Skip to content

Add tail_length exception, update example imports. #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 18, 2020
Merged

Add tail_length exception, update example imports. #22

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a90235b
Add tail_length exception, update example imports.
kattni May 18, 2020
5d4e161
Make simpletest simpler.
kattni May 18, 2020
fa7bb0f
Add AnimationSequence example.
kattni May 18, 2020
4240a4b
Default to auto_clear
kattni May 18, 2020
3aa735a
Update to have min/max tail length automatically.
kattni May 18, 2020
87c1f17
Use integer division
kattni May 18, 2020
2248b4f
Update tail length documentation.
kattni May 18, 2020
5b4b9c8
Workaround Pylint bug.
kattni May 18, 2020
c7d1950
is to --.
kattni May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion adafruit_led_animation/animation/comet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@ class Comet(Animation):
:param color: Animation color in ``(r, g, b)`` tuple, or ``0x000000`` hex format.
:param int tail_length: The length of the comet. Defaults to 10. Cannot exceed the number of
pixels present in the pixel object, e.g. if the strip is 30 pixels
long, the ``tail_length`` cannot exceed 30 pixels.
long, the ``tail_length`` cannot exceed 30 pixels, or, in the case of a
pixel mapped grid, if the width of the grid is 13 pixels, a horizontal
comet tail cannot exceed 13 pixels. To find the lenth of the
``pixel_object``, include a ``print(len(PIXEL_OBJECT_NAME))`` in your
code anywhere after the object creation, where ``PIXEL_OBJECT_NAME`` is
the name assigned to the object, such as ``pixels``.
:param bool reverse: Animates the comet in the reverse order. Defaults to ``False``.
:param bool bounce: Comet will bounce back and forth. Defaults to ``True``.
"""
Expand All @@ -73,6 +78,10 @@ def __init__(
bounce=False,
name=None,
):
if tail_length > len(pixel_object):
raise ValueError(
"Tail length must be less than the length of the pixel_object."
)
self._tail_length = tail_length + 1
self._color_step = 0.9 / tail_length
self._color_offset = 0.1
Expand Down
60 changes: 24 additions & 36 deletions examples/led_animation_all_animations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
import board
import neopixel

import adafruit_led_animation.animation.blink as blink_animation
import adafruit_led_animation.animation.sparklepulse as sparklepulse_animation
import adafruit_led_animation.animation.comet as comet_animation
import adafruit_led_animation.animation.chase as chase_animation
import adafruit_led_animation.animation.pulse as pulse_animation
import adafruit_led_animation.animation.sparkle as sparkle_animation
import adafruit_led_animation.animation.rainbowchase as rainbowchase_animation
import adafruit_led_animation.animation.rainbowsparkle as rainbowsparkle_animation
import adafruit_led_animation.animation.rainbowcomet as rainbowcomet_animation
import adafruit_led_animation.animation.solid as solid_animation
import adafruit_led_animation.animation.colorcycle as colorcycle_animation
import adafruit_led_animation.animation.rainbow as rainbow_animation
from adafruit_led_animation.animation.blink import Blink
from adafruit_led_animation.animation.sparklepulse import SparklePulse
from adafruit_led_animation.animation.comet import Comet
from adafruit_led_animation.animation.chase import Chase
from adafruit_led_animation.animation.pulse import Pulse
from adafruit_led_animation.animation.sparkle import Sparkle
from adafruit_led_animation.animation.rainbowchase import RainbowChase
from adafruit_led_animation.animation.rainbowsparkle import RainbowSparkle
from adafruit_led_animation.animation.rainbowcomet import RainbowComet
from adafruit_led_animation.animation.solid import Solid
from adafruit_led_animation.animation.colorcycle import ColorCycle
from adafruit_led_animation.animation.rainbow import Rainbow
from adafruit_led_animation.sequence import AnimationSequence
from adafruit_led_animation.color import PURPLE, WHITE, AMBER, JADE, MAGENTA, ORANGE

Expand All @@ -31,30 +31,18 @@

pixels = neopixel.NeoPixel(pixel_pin, pixel_num, brightness=0.2, auto_write=False)

blink = blink_animation.Blink(pixels, speed=0.5, color=JADE)
colorcycle = colorcycle_animation.ColorCycle(
pixels, speed=0.4, colors=[MAGENTA, ORANGE]
)
comet = comet_animation.Comet(
pixels, speed=0.01, color=PURPLE, tail_length=10, bounce=True
)
chase = chase_animation.Chase(pixels, speed=0.1, size=3, spacing=6, color=WHITE)
pulse = pulse_animation.Pulse(pixels, speed=0.1, period=3, color=AMBER)
sparkle = sparkle_animation.Sparkle(pixels, speed=0.1, color=PURPLE, num_sparkles=10)
solid = solid_animation.Solid(pixels, color=JADE)
rainbow = rainbow_animation.Rainbow(pixels, speed=0.1, period=2)
sparkle_pulse = sparklepulse_animation.SparklePulse(
pixels, speed=0.1, period=3, color=JADE
)
rainbow_comet = rainbowcomet_animation.RainbowComet(
pixels, speed=0.1, tail_length=7, bounce=True
)
rainbow_chase = rainbowchase_animation.RainbowChase(
pixels, speed=0.1, size=3, spacing=2, wheel_step=8
)
rainbow_sparkle = rainbowsparkle_animation.RainbowSparkle(
pixels, speed=0.1, num_sparkles=15
)
blink = Blink(pixels, speed=0.5, color=JADE)
colorcycle = ColorCycle(pixels, speed=0.4, colors=[MAGENTA, ORANGE])
comet = Comet(pixels, speed=0.01, color=PURPLE, tail_length=10, bounce=True)
chase = Chase(pixels, speed=0.1, size=3, spacing=6, color=WHITE)
pulse = Pulse(pixels, speed=0.1, period=3, color=AMBER)
sparkle = Sparkle(pixels, speed=0.1, color=PURPLE, num_sparkles=10)
solid = Solid(pixels, color=JADE)
rainbow = Rainbow(pixels, speed=0.1, period=2)
sparkle_pulse = SparklePulse(pixels, speed=0.1, period=3, color=JADE)
rainbow_comet = RainbowComet(pixels, speed=0.1, tail_length=7, bounce=True)
rainbow_chase = RainbowChase(pixels, speed=0.1, size=3, spacing=2, wheel_step=8)
rainbow_sparkle = RainbowSparkle(pixels, speed=0.1, num_sparkles=15)


animations = AnimationSequence(
Expand Down
30 changes: 12 additions & 18 deletions examples/led_animation_gridmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
import board
import neopixel

import adafruit_led_animation.animation.comet as comet_animation
import adafruit_led_animation.animation.rainbowcomet as rainbowcomet_animation
import adafruit_led_animation.animation.rainbowchase as rainbowchase_animation
import adafruit_led_animation.animation.chase as chase_animation
import adafruit_led_animation.animation.rainbow as rainbow_animation
from adafruit_led_animation.animation.comet import Comet
from adafruit_led_animation.animation.rainbowcomet import RainbowComet
from adafruit_led_animation.animation.rainbowchase import RainbowChase
from adafruit_led_animation.animation.chase import Chase
from adafruit_led_animation.animation.rainbow import Rainbow
from adafruit_led_animation.sequence import AnimationSequence
from adafruit_led_animation import helper
from adafruit_led_animation.color import PURPLE, JADE, AMBER
Expand All @@ -29,25 +29,19 @@
pixels, 8, 4, helper.horizontal_strip_gridmap(8, alternating=False)
)

comet_h = comet_animation.Comet(
comet_h = Comet(
pixel_wing_horizontal, speed=0.1, color=PURPLE, tail_length=3, bounce=True
)
comet_v = comet_animation.Comet(
pixel_wing_vertical, speed=0.1, color=AMBER, tail_length=6, bounce=True
)
chase_h = chase_animation.Chase(
pixel_wing_horizontal, speed=0.1, size=3, spacing=6, color=JADE
)
rainbow_chase_v = rainbowchase_animation.RainbowChase(
comet_v = Comet(pixel_wing_vertical, speed=0.1, color=AMBER, tail_length=6, bounce=True)
chase_h = Chase(pixel_wing_horizontal, speed=0.1, size=3, spacing=6, color=JADE)
rainbow_chase_v = RainbowChase(
pixel_wing_vertical, speed=0.1, size=3, spacing=2, wheel_step=8
)
rainbow_comet_v = rainbowcomet_animation.RainbowComet(
rainbow_comet_v = RainbowComet(
pixel_wing_vertical, speed=0.1, tail_length=7, bounce=True
)
rainbow_v = rainbow_animation.Rainbow(pixel_wing_vertical, speed=0.1, period=2)
rainbow_chase_h = rainbowchase_animation.RainbowChase(
pixel_wing_horizontal, speed=0.1, size=3, spacing=3
)
rainbow_v = Rainbow(pixel_wing_vertical, speed=0.1, period=2)
rainbow_chase_h = RainbowChase(pixel_wing_horizontal, speed=0.1, size=3, spacing=3)

animations = AnimationSequence(
rainbow_v,
Expand Down
10 changes: 4 additions & 6 deletions examples/led_animation_simpletest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"""
import board
import neopixel
import adafruit_led_animation.animation.comet as comet_animation
import adafruit_led_animation.animation.chase as chase_animation
from adafruit_led_animation.animation.comet import Comet
from adafruit_led_animation.animation.chase import Chase
from adafruit_led_animation.sequence import AnimationSequence
from adafruit_led_animation.color import PURPLE, WHITE

Expand All @@ -21,10 +21,8 @@

pixels = neopixel.NeoPixel(pixel_pin, pixel_num, brightness=0.2, auto_write=False)

comet = comet_animation.Comet(
pixels, speed=0.01, color=PURPLE, tail_length=10, bounce=True
)
chase = chase_animation.Chase(pixels, speed=0.1, size=3, spacing=6, color=WHITE)
comet = Comet(pixels, speed=0.01, color=PURPLE, tail_length=10, bounce=True)
chase = Chase(pixels, speed=0.1, size=3, spacing=6, color=WHITE)

animations = AnimationSequence(comet, chase, advance_interval=5)

Expand Down