Skip to content

Commit

Permalink
Corrected variable scoping
Browse files Browse the repository at this point in the history
  • Loading branch information
tylerwinfield committed Dec 20, 2023
1 parent fc1aefa commit f16e519
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions adafruit_led_animation/animation/pulse.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ class Pulse(Animation):
def __init__(self, pixel_object, speed, color, period=5, breath=0, min_intensity=0, max_intensity=1, name=None):
super().__init__(pixel_object, speed, color, name=name)
self._period = period
self._breath = breath
self._min_intensity = min_intensity
self._max_intensity = max_intensity
self.breath = breath
self.min_intensity = min_intensity
self.max_intensity = max_intensity
self._generator = None
self.reset()

Expand Down
6 changes: 3 additions & 3 deletions adafruit_led_animation/animation/sparklepulse.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ def __init__(
min_intensity=0,
name=None,
):
self._max_intensity = max_intensity
self._min_intensity = min_intensity
self._period = period
self._breath = breath
self.breath = breath
self.min_intensity = min_intensity
self.max_intensity = max_intensity
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
Expand Down
10 changes: 5 additions & 5 deletions adafruit_led_animation/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,8 @@ def pulse_generator(period: float, animation_object, dotstar_pwm=False):
:param animation_object: An animation object to interact with.
:param dotstar_pwm: Whether to use the dostar per pixel PWM value for brightness control.
"""
period = int((period + (animation_object._breath * 2)) * MS_PER_SECOND)
breath = int(animation_object._breath * MS_PER_SECOND)
period = int((period + (animation_object.breath * 2)) * MS_PER_SECOND)
breath = int(animation_object.breath * MS_PER_SECOND)
half_period = period // 2

last_update = monotonic_ms()
Expand All @@ -339,11 +339,11 @@ def pulse_generator(period: float, animation_object, dotstar_pwm=False):
last_pos = pos
if pos > half_period:
pos = period - pos
intensity = animation_object._min_intensity + ((pos / (half_period - breath)) * (animation_object._max_intensity - animation_object._min_intensity))
intensity = animation_object.min_intensity + ((pos / (half_period - breath)) * (animation_object.max_intensity - animation_object.min_intensity))
if pos < half_period and pos > (half_period - breath):
intensity = animation_object._max_intensity
intensity = animation_object.max_intensity
if pos > (period - breath):
intensity = animation_object._min_intensity
intensity = animation_object.min_intensity

Check failure on line 346 in adafruit_led_animation/helper.py

View workflow job for this annotation

GitHub Actions / test

Simplify chained comparison between the operands
if dotstar_pwm:
fill_color = (
animation_object.color[0],
Expand Down

0 comments on commit f16e519

Please sign in to comment.