Merge branch 'master' into qt-py-essentials

ladyada · web-flow · commit 1e9f0e1657e7 · 2020-12-16T16:04:33.000-05:00
diff --git a/MagTag_Cheerlights_LED_Animations/MagTag_Cheerlights_LED_Animations.py b/MagTag_Cheerlights_LED_Animations/MagTag_Cheerlights_LED_Animations.py
@@ -105,8 +105,8 @@
                     sparkle_color = MAGENTA
                 animations = AnimationSequence(
                     AnimationGroup(
-                        Sparkle(magtag_pixels, speed=0.1, color=sparkle_color, num_sparkles=15),
-                        Sparkle(strip_pixels, speed=0.01, color=sparkle_color, num_sparkles=1),
+                        Sparkle(magtag_pixels, speed=0.1, color=sparkle_color, num_sparkles=1),
+                        Sparkle(strip_pixels, speed=0.01, color=sparkle_color, num_sparkles=15),
                     )
                 )
 

Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,8 @@`
`105`	`105`	`sparkle_color = MAGENTA`
`106`	`106`	`animations = AnimationSequence(`
`107`	`107`	`AnimationGroup(`
`108`		`- Sparkle(magtag_pixels, speed=0.1, color=sparkle_color, num_sparkles=15),`
`109`		`- Sparkle(strip_pixels, speed=0.01, color=sparkle_color, num_sparkles=1),`
	`108`	`+ Sparkle(magtag_pixels, speed=0.1, color=sparkle_color, num_sparkles=1),`
	`109`	`+ Sparkle(strip_pixels, speed=0.01, color=sparkle_color, num_sparkles=15),`
`110`	`110`	`)`
`111`	`111`	`)`
`112`	`112`