LED animation fix duration None (#703)

dwalton76 · web-flow · commit 64b7beddc534 · 2019-12-30T09:11:34.000-05:00
diff --git a/debian/changelog b/debian/changelog
@@ -1,6 +1,7 @@
 python-ev3dev2 (2.1.0) UNRELEASED; urgency=medium
 
   [Matěj Volf]
+  * LED animation fix duration None
   * Add rest notes to sound.Sound.play_song()
 
   [Kaelin Laundry]
diff --git a/ev3dev2/led.py b/ev3dev2/led.py
@@ -354,6 +354,8 @@ def all_off(self):
         if not self.leds:
             return
 
+        self.animate_stop()
+
         for led in self.leds.values():
             led.brightness = 0
 
@@ -401,7 +403,7 @@ def animate_police_lights(self, color1, color2, group1='LEFT', group2='RIGHT', s
         def _animate_police_lights():
             self.all_off()
             even = True
-            duration_ms = duration * 1000
+            duration_ms = duration * 1000 if duration is not None else None
             stopwatch = StopWatch()
             stopwatch.start()
 
@@ -413,7 +415,7 @@ def _animate_police_lights():
                     self.set_color(group1, color2)
                     self.set_color(group2, color1)
 
-                if self.animate_thread_stop or stopwatch.value_ms >= duration_ms:
+                if self.animate_thread_stop or stopwatch.is_elapsed_ms(duration_ms):
                     break
 
                 even = not even
@@ -446,7 +448,7 @@ def animate_flash(self, color, groups=('LEFT', 'RIGHT'), sleeptime=0.5, duration
 
         def _animate_flash():
             even = True
-            duration_ms = duration * 1000
+            duration_ms = duration * 1000 if duration is not None else None
             stopwatch = StopWatch()
             stopwatch.start()
 
@@ -457,7 +459,7 @@ def _animate_flash():
                 else:
                     self.all_off()
 
-                if self.animate_thread_stop or stopwatch.value_ms >= duration_ms:
+                if self.animate_thread_stop or stopwatch.is_elapsed_ms(duration_ms):
                     break
 
                 even = not even
@@ -491,7 +493,7 @@ def animate_cycle(self, colors, groups=('LEFT', 'RIGHT'), sleeptime=0.5, duratio
         def _animate_cycle():
             index = 0
             max_index = len(colors)
-            duration_ms = duration * 1000
+            duration_ms = duration * 1000 if duration is not None else None
             stopwatch = StopWatch()
             stopwatch.start()
 
@@ -504,7 +506,7 @@ def _animate_cycle():
                 if index == max_index:
                     index = 0
 
-                if self.animate_thread_stop or stopwatch.value_ms >= duration_ms:
+                if self.animate_thread_stop or stopwatch.is_elapsed_ms(duration_ms):
                     break
 
                 sleep(sleeptime)
@@ -545,7 +547,7 @@ def _animate_rainbow():
             MIN_VALUE = 0
             MAX_VALUE = 1
             self.all_off()
-            duration_ms = duration * 1000
+            duration_ms = duration * 1000 if duration is not None else None
             stopwatch = StopWatch()
             stopwatch.start()
 
@@ -580,7 +582,7 @@ def _animate_rainbow():
                 elif state == 3 and right_value == MIN_VALUE:
                     state = 0
 
-                if self.animate_thread_stop or stopwatch.value_ms >= duration_ms:
+                if self.animate_thread_stop or stopwatch.is_elapsed_ms(duration_ms):
                     break
 
                 sleep(sleeptime)
