Merge branch 'master' of github.com:ladyada/Adafruit_Learning_System_Guides

Author: ladyada

CLUE_Dice_Roller/clue_dice_roller.py

@@ -32,32 +32,30 @@
 button_a = Debouncer(lambda: clue.button_a)
 button_b = Debouncer(lambda: clue.button_b)
 
-
 # Set up display
 
-display = board.DISPLAY
-selection_font = bitmap_font.load_font('/Helvetica-Bold-36.bdf')
-selection_font.load_glyphs(b'0123456789XDd')
-selection_color = 0x0000FF
+select_font = bitmap_font.load_font('/Helvetica-Bold-36.bdf')
+select_font.load_glyphs(b'0123456789XDd')
+select_color = 0x0000FF
 
 roll_font = bitmap_font.load_font('/Anton-Regular-104.bdf')
-roll_font.load_glyphs(b'0123456789XDd')
+roll_font.load_glyphs(b'0123456789X')
 roll_color = 0xFFFFFF
 
-selection_label = label.Label(selection_font, x=0, y=25, text='XdXXX', color=selection_color)
+select_label = label.Label(select_font, x=0, y=25, text='XdXXX', color=select_color)
 roll_label = label.Label(roll_font, x=0, y=150, text='XXX', color=roll_color)
 
 group = displayio.Group()
-group.append(selection_label)
+group.append(select_label)
 group.append(roll_label)
 
-display.show(group)
+board.DISPLAY.show(group)
 
 # Helper functions
 
 def roll(count, sides):
     for i in range(15):
-        roll_value = sum([randint(1, sides) for d in range(count + 1)])
+        roll_value = sum([randint(1, sides) for _ in range(count + 1)])
         roll_label.text = str(roll_value)
         roll_label.x = 120 - (roll_label.bounding_box[2] // 2)
         duration = (i * 0.05) / 2
@@ -66,8 +64,8 @@ def roll(count, sides):
 
 
 def update_display(count, sides):
-    selection_label.text = '{0}d{1}'.format(count + 1, SIDES[sides])
-    selection_label.x = 120 - (selection_label.bounding_box[2] // 2)
+    select_label.text = '{0}d{1}'.format(count + 1, SIDES[sides])
+    select_label.x = 120 - (select_label.bounding_box[2] // 2)
     roll_label.text = ''
 
 

OozeMaster3000/OozeMaster3000.ino

@@ -1,8 +1,9 @@
 // OOZE MASTER 3000: NeoPixel simulated liquid physics. Up to 7 NeoPixel
 // strands dribble light, while an 8th strand "catches the drips."
-// Designed for the Adafruit Feather M0 (NOT M4) with NeoPXL8 FeatherWing.
-// This can be adapted for other M0 or M4 boards but you will need to do your
-// own "pin sudoku" and level shifting (e.g. NeoPXL8 Friend breakout or similar).
+// Designed for the Adafruit Feather M0 or M4 with matching version of
+// NeoPXL8 FeatherWing. This can be adapted for other M0 or M4 boards but
+// you will need to do your own "pin sudoku" and level shifting
+// (e.g. NeoPXL8 Friend breakout or similar).
 // See here: https://learn.adafruit.com/adafruit-neopxl8-featherwing-and-library
 // Requires Adafruit_NeoPixel, Adafruit_NeoPXL8 and Adafruit_ZeroDMA libraries.
 
@@ -18,9 +19,13 @@ uint8_t dripColor[] = { 0, 255, 0 }; // Bright green ectoplasm
 // for a more theatric effect / to slow down the drips like they've still got a
 // syrupy "drool string" attached (try much lower values like 2.0 to 3.0).
 
-// NeoPXL8 pin numbers (these are default connections on NeoPXL8 FeatherWing)
+// NeoPXL8 pin numbers (these are default connections on NeoPXL8 M0 FeatherWing)
 int8_t pins[8] = { PIN_SERIAL1_RX, PIN_SERIAL1_TX, MISO, 13, 5, SDA, A4, A3 };
 
+// If using an M4 Feather & NeoPXL8 FeatherWing, use these values instead:
+//int8_t pins[8] = { 13, 12, 11, 10, SCK, 5, 9, 6 };
+
+
 typedef enum {
   MODE_IDLE,
   MODE_OOZING,