Tinkering and tidying up.

diff --git a/pi-pico-version/README.md b/pi-pico-version/README.md
index fc31da89f8e96bd659b1fbf1df88e337e373c68a..3b3cc524e4695782af4b18182c1a0d9516e3dc4d 100644 (file)
--- a/pi-pico-version/README.md
+++ b/pi-pico-version/README.md
@@ -72,7 +72,9 @@ Again, save and flash the program. Even cooler animation!
 # Program 6: speeding up the animation
 When real fireworks explode, the outer edge of the explosion is bright and the centre gets dimmer. Let's change the animation to do that. 
 
 # Program 6: speeding up the animation
 When real fireworks explode, the outer edge of the explosion is bright and the centre gets dimmer. Let's change the animation to do that. 
 

-The animation's a bit slow. We can speed things up by only updating the pixels that change, rather than all of them.
+The animation's a bit slow. We can speed things up by only updating the pixels that change, rather than all of them. But when we do, the animation's too fast! 
+
+We need to add an explicit delay in the "fading" loop so we can see the animation. Experiment with adjusting the value of `time.sleep`, and the number of fading steps, to have an animation that looks good. (But don't spend so long that you can't do the next steps.)

 
 > [Program 6](https://github.com/NeilNjae/one-dimensional-fireworks/blob/master/pi-pico-version/main6.py)
 
 
 > [Program 6](https://github.com/NeilNjae/one-dimensional-fireworks/blob/master/pi-pico-version/main6.py)
 

diff --git a/pi-pico-version/main1.py b/pi-pico-version/main1.py
index f7e30adba490911e5866f3558b40ab49190300f1..7f74da349b6c89e35acad560f79d4c23ea7cd509 100644 (file)
--- a/pi-pico-version/main1.py
+++ b/pi-pico-version/main1.py
@@ -6,13 +6,11 @@ from pimoroni import Button
 NEOPIXEL_DATA_PIN = 0
 NEOPIXEL_LENGTH = 60
 
 NEOPIXEL_DATA_PIN = 0
 NEOPIXEL_LENGTH = 60
 

-BURST_SIZE = 10
-DISPLAY_ANIMATION_SPEED = 500 # Add this line
-

 np = Neopixel(NEOPIXEL_LENGTH, 0, NEOPIXEL_DATA_PIN, "GRBW")
 np = Neopixel(NEOPIXEL_LENGTH, 0, NEOPIXEL_DATA_PIN, "GRBW")

-

 button_y = Button(15)
 
 button_y = Button(15)
 

+BURST_SIZE = 10
+

 BLUE = (0, 0, 64, 0)
 RED = (64, 0, 0, 0)
 OFF = (0, 0, 0, 0)
 BLUE = (0, 0, 64, 0)
 RED = (64, 0, 0, 0)
 OFF = (0, 0, 0, 0)

diff --git a/pi-pico-version/main2.py b/pi-pico-version/main2.py
index 0de96a7ba5055f4b0d2189493b6102351766d6b8..024feff1b9dcfe27105523eb70d73d6e4ad11598 100644 (file)
--- a/pi-pico-version/main2.py
+++ b/pi-pico-version/main2.py
@@ -7,12 +7,12 @@ from pimoroni import Button
 NEOPIXEL_DATA_PIN = 0
 NEOPIXEL_LENGTH = 60
 
 NEOPIXEL_DATA_PIN = 0
 NEOPIXEL_LENGTH = 60
 

-BURST_SIZE = 10

 
 np = Neopixel(NEOPIXEL_LENGTH, 0, NEOPIXEL_DATA_PIN, "GRBW")
 
 np = Neopixel(NEOPIXEL_LENGTH, 0, NEOPIXEL_DATA_PIN, "GRBW")

-

 button_y = Button(15)
 
 button_y = Button(15)
 

+BURST_SIZE = 10
+

 BLUE = (0, 0, 64, 0)
 RED = (64, 0, 0, 0)
 OFF = (0, 0, 0, 0)
 BLUE = (0, 0, 64, 0)
 RED = (64, 0, 0, 0)
 OFF = (0, 0, 0, 0)

diff --git a/pi-pico-version/main3.py b/pi-pico-version/main3.py
index bd3dc4bbacd73c5ceaab137e8b56efa941a16662..388eae4eba0f58e569edf0f5544121383575a62d 100644 (file)
--- a/pi-pico-version/main3.py
+++ b/pi-pico-version/main3.py
@@ -7,12 +7,11 @@ from pimoroni import Button
 NEOPIXEL_DATA_PIN = 0
 NEOPIXEL_LENGTH = 60
 
 NEOPIXEL_DATA_PIN = 0
 NEOPIXEL_LENGTH = 60
 

-BURST_SIZE = 10
-

 np = Neopixel(NEOPIXEL_LENGTH, 0, NEOPIXEL_DATA_PIN, "GRBW")
 np = Neopixel(NEOPIXEL_LENGTH, 0, NEOPIXEL_DATA_PIN, "GRBW")

-

 button_y = Button(15)
 
 button_y = Button(15)
 

+BURST_SIZE = 10
+

 BLUE = (0, 0, 64, 0)
 RED = (64, 0, 0, 0)
 OFF = (0, 0, 0, 0)
 BLUE = (0, 0, 64, 0)
 RED = (64, 0, 0, 0)
 OFF = (0, 0, 0, 0)


@@ -47,7 +46,7 @@ def explode():
 
 reset()
 
 
 reset()
 

-delay_timer = 100 # Add this line
+delay_timer = 100

 
 while True:
     if button_y.raw() or delay_timer <= 0:
 
 while True:
     if button_y.raw() or delay_timer <= 0:

diff --git a/pi-pico-version/main4.py b/pi-pico-version/main4.py
index a04daf1a5cb2120eeaa8ae460d33e40764f7e6ed..0455f34e7d023bd18bc7c827f42d401c07293371 100644 (file)
--- a/pi-pico-version/main4.py
+++ b/pi-pico-version/main4.py
@@ -7,12 +7,11 @@ from pimoroni import Button
 NEOPIXEL_DATA_PIN = 0
 NEOPIXEL_LENGTH = 60
 
 NEOPIXEL_DATA_PIN = 0
 NEOPIXEL_LENGTH = 60
 

-BURST_SIZE = 10
-

 np = Neopixel(NEOPIXEL_LENGTH, 0, NEOPIXEL_DATA_PIN, "GRBW")
 np = Neopixel(NEOPIXEL_LENGTH, 0, NEOPIXEL_DATA_PIN, "GRBW")

-

 button_y = Button(15)
 
 button_y = Button(15)
 

+BURST_SIZE = 10
+

 BLUE = (0, 0, 64, 0)
 RED = (64, 0, 0, 0)
 OFF = (0, 0, 0, 0)
 BLUE = (0, 0, 64, 0)
 RED = (64, 0, 0, 0)
 OFF = (0, 0, 0, 0)


@@ -59,7 +58,7 @@ def explode():
 
 reset()
 
 
 reset()
 

-delay_timer = 100 # Add this line
+delay_timer = 100

 
 while True:
     if button_y.raw() or delay_timer <= 0:
 
 while True:
     if button_y.raw() or delay_timer <= 0:

diff --git a/pi-pico-version/main5.py b/pi-pico-version/main5.py
index 9c9a3d63ec580366d4567701565368691abcf611..8dbb8908e6127a0518e48dd52863a3ff57753ff2 100644 (file)
--- a/pi-pico-version/main5.py
+++ b/pi-pico-version/main5.py
@@ -7,12 +7,11 @@ from pimoroni import Button
 NEOPIXEL_DATA_PIN = 0
 NEOPIXEL_LENGTH = 60
 
 NEOPIXEL_DATA_PIN = 0
 NEOPIXEL_LENGTH = 60
 

-BURST_SIZE = 10
-

 np = Neopixel(NEOPIXEL_LENGTH, 0, NEOPIXEL_DATA_PIN, "GRBW")
 np = Neopixel(NEOPIXEL_LENGTH, 0, NEOPIXEL_DATA_PIN, "GRBW")

-

 button_y = Button(15)
 
 button_y = Button(15)
 

+BURST_SIZE = 10
+

 BLUE = (0, 0, 64, 0)
 RED = (64, 0, 0, 0)
 OFF = (0, 0, 0, 0)
 BLUE = (0, 0, 64, 0)
 RED = (64, 0, 0, 0)
 OFF = (0, 0, 0, 0)


@@ -59,7 +58,7 @@ def explode():
 
 reset()
 
 
 reset()
 

-delay_timer = 100 # Add this line
+delay_timer = 100

 
 while True:
     if button_y.raw() or delay_timer <= 0:
 
 while True:
     if button_y.raw() or delay_timer <= 0:

diff --git a/pi-pico-version/main6.py b/pi-pico-version/main6.py
index 710f6b5f0ff44a6ec3fd3587e9c7262871771b60..71503c1b23d1d8ea2d3eaf5ab0351f1dc4fb54fc 100644 (file)
--- a/pi-pico-version/main6.py
+++ b/pi-pico-version/main6.py
@@ -7,12 +7,11 @@ from pimoroni import Button
 NEOPIXEL_DATA_PIN = 0
 NEOPIXEL_LENGTH = 60
 
 NEOPIXEL_DATA_PIN = 0
 NEOPIXEL_LENGTH = 60
 

-BURST_SIZE = 10
-

 np = Neopixel(NEOPIXEL_LENGTH, 0, NEOPIXEL_DATA_PIN, "GRBW")
 np = Neopixel(NEOPIXEL_LENGTH, 0, NEOPIXEL_DATA_PIN, "GRBW")

-

 button_y = Button(15)
 
 button_y = Button(15)
 

+BURST_SIZE = 10
+

 BLUE = (0, 0, 64, 0)
 RED = (64, 0, 0, 0)
 OFF = (0, 0, 0, 0)
 BLUE = (0, 0, 64, 0)
 RED = (64, 0, 0, 0)
 OFF = (0, 0, 0, 0)


@@ -22,7 +21,7 @@ FIREWORK_COLOURS = [ (255, 128, 128, 0), (128, 255, 128, 0), (128, 128, 255, 0)
                    ]
 
 def fade_all(first=0, last=NEOPIXEL_LENGTH, fade_by=0.9): # Change this line
                    ]
 
 def fade_all(first=0, last=NEOPIXEL_LENGTH, fade_by=0.9): # Change this line

-    for i in range(NEOPIXEL_LENGTH):
+    for i in range(first, last):  # Change this line

         fade(i, fade_by=fade_by)
     np.show()
         
         fade(i, fade_by=fade_by)
     np.show()
         


@@ -47,7 +46,7 @@ def shoot_firework():
         np.show()
 
 def explode():    
         np.show()
 
 def explode():    

-    initial_colour = random.choice(FIREWORK_COLOURS) # Change this line
+    initial_colour = random.choice(FIREWORK_COLOURS)

         
     for i in range(BURST_SIZE):
         np.set_pixel(NEOPIXEL_LENGTH - BURST_SIZE + i, initial_colour)
         
     for i in range(BURST_SIZE):
         np.set_pixel(NEOPIXEL_LENGTH - BURST_SIZE + i, initial_colour)


@@ -60,10 +59,11 @@ def explode():
     for _ in range(30):
         fade_all(first=(NEOPIXEL_LENGTH - 2 * BURST_SIZE), # Change this line
                  fade_by=0.8 )                             # Change this line
     for _ in range(30):
         fade_all(first=(NEOPIXEL_LENGTH - 2 * BURST_SIZE), # Change this line
                  fade_by=0.8 )                             # Change this line

+        time.sleep(0.1)                                    # Add this line

 
 reset()
 
 
 reset()
 

-delay_timer = 100 # Add this line
+delay_timer = 100

 
 while True:
     if button_y.raw() or delay_timer <= 0:
 
 while True:
     if button_y.raw() or delay_timer <= 0:

diff --git a/pi-pico-version/main7.py b/pi-pico-version/main7.py
index 46771a72128153e24508bee8e14af8fff3efc822..7ff83cf76f5e5e7ee2624a82841b50cd4f59b48e 100644 (file)
--- a/pi-pico-version/main7.py
+++ b/pi-pico-version/main7.py
@@ -8,18 +8,17 @@ from picographics import PicoGraphics, DISPLAY_PICO_EXPLORER # Add this line
 NEOPIXEL_DATA_PIN = 0
 NEOPIXEL_LENGTH = 60
 
 NEOPIXEL_DATA_PIN = 0
 NEOPIXEL_LENGTH = 60
 

-BURST_SIZE = 10
-

 np = Neopixel(NEOPIXEL_LENGTH, 0, NEOPIXEL_DATA_PIN, "GRBW")
 np = Neopixel(NEOPIXEL_LENGTH, 0, NEOPIXEL_DATA_PIN, "GRBW")

-

 button_y = Button(15)
 button_y = Button(15)

-display = PicoGraphics(display=DISPLAY_PICO_EXPLORER) # Add this line
+display = PicoGraphics(display=DISPLAY_PICO_EXPLORER) # Add these display lines

 WHITE_PEN = display.create_pen(255, 255, 255)
 BLACK_PEN = display.create_pen(0, 0, 0)
 RED_PEN = display.create_pen(255, 63, 63)
 display.set_font("sans")
 display.set_thickness(5)
 
 WHITE_PEN = display.create_pen(255, 255, 255)
 BLACK_PEN = display.create_pen(0, 0, 0)
 RED_PEN = display.create_pen(255, 63, 63)
 display.set_font("sans")
 display.set_thickness(5)
 

+BURST_SIZE = 10
+

 BLUE = (0, 0, 64, 0)
 RED = (64, 0, 0, 0)
 OFF = (0, 0, 0, 0)
 BLUE = (0, 0, 64, 0)
 RED = (64, 0, 0, 0)
 OFF = (0, 0, 0, 0)


@@ -30,7 +29,7 @@ FIREWORK_COLOURS = [ (255, 128, 128, 0), (128, 255, 128, 0), (128, 128, 255, 0)
 
 
 def fade_all(first=0, last=NEOPIXEL_LENGTH, fade_by=0.9): # Change this line
 
 
 def fade_all(first=0, last=NEOPIXEL_LENGTH, fade_by=0.9): # Change this line

-    for i in range(NEOPIXEL_LENGTH):
+    for i in range(first, last):

         fade(i, fade_by=fade_by)
     np.show()
         
         fade(i, fade_by=fade_by)
     np.show()
         


@@ -41,6 +40,10 @@ def fade(n, fade_by=0.9):
                   int(b * fade_by), int(w * fade_by)))
 
 def reset():
                   int(b * fade_by), int(w * fade_by)))
 
 def reset():

+    display.set_pen(BLACK_PEN)          # Add these display lines
+    display.clear()
+    display.update()
+

     for n in range(NEOPIXEL_LENGTH):
         np.set_pixel(n, OFF)
     np.set_pixel(0, BLUE)
     for n in range(NEOPIXEL_LENGTH):
         np.set_pixel(n, OFF)
     np.set_pixel(0, BLUE)


@@ -50,7 +53,7 @@ def shoot_firework():
     display.set_pen(BLACK_PEN) # Add these display lines
     display.clear()
     display.set_pen(RED_PEN)
     display.set_pen(BLACK_PEN) # Add these display lines
     display.clear()
     display.set_pen(RED_PEN)

-    display.text("Fire!", 0, 100, scale=4)
+    display.text("Fire", 0, 100, scale=4)

     display.update()
     for pixel in range(NEOPIXEL_LENGTH - BURST_SIZE):
         np.set_pixel(pixel, RED)
     display.update()
     for pixel in range(NEOPIXEL_LENGTH - BURST_SIZE):
         np.set_pixel(pixel, RED)


@@ -60,7 +63,7 @@ def shoot_firework():
         np.show()
 
 def explode():    
         np.show()
 
 def explode():    

-    initial_colour = random.choice(FIREWORK_COLOURS) # Change this line
+    initial_colour = random.choice(FIREWORK_COLOURS)

         
     for i in range(BURST_SIZE):
         np.set_pixel(NEOPIXEL_LENGTH - BURST_SIZE + i, initial_colour)
         
     for i in range(BURST_SIZE):
         np.set_pixel(NEOPIXEL_LENGTH - BURST_SIZE + i, initial_colour)


@@ -70,9 +73,13 @@ def explode():
                 , last= (NEOPIXEL_LENGTH - BURST_SIZE + i)
                 )
 
                 , last= (NEOPIXEL_LENGTH - BURST_SIZE + i)
                 )
 

+    animation_delay = random.uniform(0.02, 0.1)
+    animation_delay += random.uniform(0, 0.1)

     for _ in range(30):
     for _ in range(30):

+

         fade_all(first=(NEOPIXEL_LENGTH - 2 * BURST_SIZE),
                  fade_by=0.8)
         fade_all(first=(NEOPIXEL_LENGTH - 2 * BURST_SIZE),
                  fade_by=0.8)

+        time.sleep(animation_delay)

 
 reset()
 
 
 reset()
 


@@ -90,7 +97,7 @@ while True:
         display.set_pen(BLACK_PEN)  # Add these display lines
         display.clear()
         display.set_pen(WHITE_PEN)
         display.set_pen(BLACK_PEN)  # Add these display lines
         display.clear()
         display.set_pen(WHITE_PEN)

-        display.text(str(int(delay_timer / 10.0 + 0.5)), 40, 100, scale=5)
+        display.text(str(int(delay_timer / 10.0) + 1), 40, 100, scale=5)

         display.update()
         time.sleep(0.1)
 
         display.update()
         time.sleep(0.1)
 

diff --git a/pi-pico-version/main8.py b/pi-pico-version/main8.py
index 7854eca7d7c87d94ff6099fda92245adf70f9143..e2f9a74f0afd4687a7b8497f06da92d7dbd1ef4b 100644 (file)
--- a/pi-pico-version/main8.py
+++ b/pi-pico-version/main8.py
@@ -8,8 +8,6 @@ from picographics import PicoGraphics, DISPLAY_PICO_EXPLORER
 NEOPIXEL_DATA_PIN = 0
 NEOPIXEL_LENGTH = 60
 
 NEOPIXEL_DATA_PIN = 0
 NEOPIXEL_LENGTH = 60
 

-BURST_SIZE = 10
-

 np = Neopixel(NEOPIXEL_LENGTH, 0, NEOPIXEL_DATA_PIN, "GRBW")
 
 button_y = Button(15)
 np = Neopixel(NEOPIXEL_LENGTH, 0, NEOPIXEL_DATA_PIN, "GRBW")
 
 button_y = Button(15)


@@ -21,6 +19,8 @@ RED_PEN = display.create_pen(255, 63, 63)
 display.set_font("sans")
 display.set_thickness(5)
 
 display.set_font("sans")
 display.set_thickness(5)
 

+BURST_SIZE = 10
+

 BLUE = (0, 0, 64, 0)
 RED = (64, 0, 0, 0)
 OFF = (0, 0, 0, 0)
 BLUE = (0, 0, 64, 0)
 RED = (64, 0, 0, 0)
 OFF = (0, 0, 0, 0)


@@ -28,10 +28,12 @@ OFF = (0, 0, 0, 0)
 FIREWORK_COLOURS = [ (255, 128, 128, 0), (128, 255, 128, 0), (128, 128, 255, 0)
                    , (255, 255, 128, 0), (255, 128, 255, 0), (128, 255, 255, 0)
                    ]
 FIREWORK_COLOURS = [ (255, 128, 128, 0), (128, 255, 128, 0), (128, 128, 255, 0)
                    , (255, 255, 128, 0), (255, 128, 255, 0), (128, 255, 255, 0)
                    ]

-
+BASE_BUZZER_TONE = 40
+BUZZER_INCREASE = 5
+BUZZER_DECREASE = 2

 
 def fade_all(first=0, last=NEOPIXEL_LENGTH, fade_by=0.9): # Change this line
 
 def fade_all(first=0, last=NEOPIXEL_LENGTH, fade_by=0.9): # Change this line

-    for i in range(NEOPIXEL_LENGTH):
+    for i in range(first, last):

         fade(i, fade_by=fade_by)
     np.show()
         
         fade(i, fade_by=fade_by)
     np.show()
         


@@ -43,6 +45,11 @@ def fade(n, fade_by=0.9):
 
 def reset():
     buzzer.set_tone(0)                      # Add this line
 
 def reset():
     buzzer.set_tone(0)                      # Add this line

+
+    display.set_pen(BLACK_PEN)
+    display.clear()
+    display.update()
+

     for n in range(NEOPIXEL_LENGTH):
         np.set_pixel(n, OFF)
     np.set_pixel(0, BLUE)
     for n in range(NEOPIXEL_LENGTH):
         np.set_pixel(n, OFF)
     np.set_pixel(0, BLUE)


@@ -52,7 +59,7 @@ def shoot_firework():
     display.set_pen(BLACK_PEN)
     display.clear()
     display.set_pen(RED_PEN)
     display.set_pen(BLACK_PEN)
     display.clear()
     display.set_pen(RED_PEN)

-    display.text("Fire!", 0, 100, scale=4)
+    display.text("Fire", 0, 100, scale=4)

     display.update()
     for pixel in range(NEOPIXEL_LENGTH - BURST_SIZE):
         np.set_pixel(pixel, RED)
     display.update()
     for pixel in range(NEOPIXEL_LENGTH - BURST_SIZE):
         np.set_pixel(pixel, RED)


@@ -64,7 +71,7 @@ def shoot_firework():
 def explode():    
     initial_colour = random.choice(FIREWORK_COLOURS) 
     
 def explode():    
     initial_colour = random.choice(FIREWORK_COLOURS) 
     

-    buzzer_tone = 40                    # Add this line
+    buzzer_tone = BASE_BUZZER_TONE                    # Add this line

     buzzer.set_tone(buzzer_tone)        # Add this line
     
     for i in range(BURST_SIZE):
     buzzer.set_tone(buzzer_tone)        # Add this line
     
     for i in range(BURST_SIZE):


@@ -75,18 +82,21 @@ def explode():
                 , last= (NEOPIXEL_LENGTH - BURST_SIZE + i)
                 )
 
                 , last= (NEOPIXEL_LENGTH - BURST_SIZE + i)
                 )
 

-        buzzer_tone += 500              # Add this line
+        buzzer_tone += BUZZER_INCREASE  # Add this line

         buzzer.set_tone(buzzer_tone)    # Add this line
 
         buzzer.set_tone(buzzer_tone)    # Add this line
 

+    animation_delay = random.uniform(0.02, 0.1)
+    animation_delay += random.uniform(0, 0.1)

     for _ in range(30):
         fade_all(first=(NEOPIXEL_LENGTH - 2 * BURST_SIZE),
                  fade_by=0.8)
     for _ in range(30):
         fade_all(first=(NEOPIXEL_LENGTH - 2 * BURST_SIZE),
                  fade_by=0.8)

-        buzzer_tone -= 2                # Add this line
+        buzzer_tone -= BUZZER_DECREASE  # Add this line

         buzzer.set_tone(buzzer_tone)    # Add this line
         buzzer.set_tone(buzzer_tone)    # Add this line

+        time.sleep(animation_delay)

 
 reset()
 
 
 reset()
 

-delay_timer = 100 # Add this line
+delay_timer = 100

 
 while True:
     if button_y.raw() or delay_timer <= 0:
 
 while True:
     if button_y.raw() or delay_timer <= 0:


@@ -100,7 +110,7 @@ while True:
         display.set_pen(BLACK_PEN) 
         display.clear()
         display.set_pen(WHITE_PEN)
         display.set_pen(BLACK_PEN) 
         display.clear()
         display.set_pen(WHITE_PEN)

-        display.text(str(int(delay_timer / 10.0 + 0.5)), 40, 100, scale=5)
+        display.text(str(int(delay_timer / 10.0) + 1), 40, 100, scale=5)

         display.update()
         time.sleep(0.1)
 
         display.update()
         time.sleep(0.1)