Merge branch 'master' into master

Author: ladyada

CLUE_Egg_Drop/clue_egg_drop.py

@@ -3,7 +3,8 @@
 import board
 from digitalio import DigitalInOut, Direction, Pull
 import pulseio
-from adafruit_lsm6ds import LSM6DS33, AccelRange, AccelHPF, Rate
+from adafruit_lsm6ds.lsm6ds33 import LSM6DS33
+from adafruit_lsm6ds import AccelRange, AccelHPF, Rate
 from adafruit_display_text import label
 import displayio
 import terminalio

Matrix_Portal_Moon_Clock/code.py

@@ -175,6 +175,8 @@ def __init__(self, datetime, hours_ahead, utc_offset):
 DISPLAY = MATRIX.display
 ACCEL = adafruit_lis3dh.LIS3DH_I2C(busio.I2C(board.SCL, board.SDA),
                                    address=0x19)
+_ = ACCEL.acceleration # Dummy reading to blow out any startup residue
+time.sleep(0.1)
 DISPLAY.rotation = (int(((math.atan2(-ACCEL.acceleration.y,
                                      -ACCEL.acceleration.x) + math.pi) /
                          (math.pi * 2) + 0.875) * 4) % 4) * 90
@@ -368,7 +370,7 @@ def __init__(self, datetime, hours_ahead, utc_offset):
     GROUP[0] = TILE_GRID
 
     # Update percent value (5 labels: GROUP[1-4] for outline, [5] for text)
-    if PERCENT >= 100:
+    if PERCENT >= 99.95:
         STRING = '100%'
     else:
         STRING = '{:.1f}'.format(PERCENT + 0.05) + '%'
@@ -421,4 +423,5 @@ def __init__(self, datetime, hours_ahead, utc_offset):
     GROUP[7].x = CENTER_X - GROUP[7].bounding_box[2] // 2
     GROUP[7].y = TIME_Y + 10
 
+    DISPLAY.refresh() # Force full repaint (splash screen sometimes sticks)
     time.sleep(5)

Pixel_Art_Slideshow/bmps/adabot.bmp

@@ -0,0 +1,66 @@
+"""
+Slideshow Example using the Matrix Portal and 64 x 32 LED matrix display
+Written by Melissa LeBlanc-Williams for Adafruit Industries
+Images smaller than 64 pixel width will be aligned alternating left or right
+Press Up button to pause/resume Slideshow
+Press Down button to advance
+"""
+import time
+import board
+from digitalio import DigitalInOut, Pull
+from adafruit_matrixportal.matrix import Matrix
+from adafruit_slideshow import SlideShow, PlayBackDirection, HorizontalAlignment
+from adafruit_debouncer import Debouncer
+
+IMAGE_DURATION = 3
+IMAGE_FOLDER = "/bmps"
+
+# --- Display setup ---
+matrix = Matrix(bit_depth=6)
+display = matrix.display
+
+pin_down = DigitalInOut(board.BUTTON_DOWN)
+pin_down.switch_to_input(pull=Pull.UP)
+button_down = Debouncer(pin_down)
+pin_up = DigitalInOut(board.BUTTON_UP)
+pin_up.switch_to_input(pull=Pull.UP)
+button_up = Debouncer(pin_up)
+
+align_right = True
+auto_advance = True
+
+slideshow = SlideShow(
+    display,
+    None,
+    folder=IMAGE_FOLDER,
+    order=0,
+    auto_advance=False,
+    fade_effect=False,
+    dwell=IMAGE_DURATION,
+    h_align=HorizontalAlignment.RIGHT,
+)
+last_advance = time.monotonic()
+
+
+def advance():
+    # pylint: disable=global-statement
+    global align_right, last_advance
+    align_right = not align_right
+    if align_right:
+        slideshow.h_align = HorizontalAlignment.RIGHT
+    else:
+        slideshow.h_align = HorizontalAlignment.LEFT
+    last_advance = time.monotonic()
+    slideshow.advance()
+
+
+while True:
+    if auto_advance and time.monotonic() > last_advance + IMAGE_DURATION:
+        advance()
+    button_down.update()
+    button_up.update()
+    if button_up.fell:
+        auto_advance = not auto_advance
+    if button_down.fell:
+        slideshow.direction = PlayBackDirection.FORWARD
+        advance()

Pixel_Art_Slideshow/bmps/frong.bmp

@@ -10,14 +10,14 @@
 from adafruit_bitmap_font import bitmap_font
 from adafruit_display_shapes.rect import Rect
 import adafruit_amg88xx
-from adafruit_pybadger import PyBadger
+from adafruit_pybadger import pybadger as panel
 from thermal_cam_converters import celsius_to_fahrenheit, fahrenheit_to_celsius
 # Load default alarm and min/max range values list from config file
 from thermal_cam_config import ALARM_F, MIN_RANGE_F, MAX_RANGE_F
 
 # Establish panel instance and check for joystick
-panel = PyBadger(pixels_brightness=0.1)  # Set NeoPixel brightness
-panel.pixels.fill(0)                     # Clear all NeoPixels
+panel.pixels.brightness = 0.1              # Set NeoPixel brightness
+panel.pixels.fill(0)                       # Clear all NeoPixels
 if hasattr(board, "JOYSTICK_X"):
     panel.has_joystick = True     # PyGamer
 else: panel.has_joystick = False  # Must be PyBadge

Pixel_Art_Slideshow/bmps/pipe.bmp

@@ -1,14 +1,11 @@
 import board
 from digitalio import DigitalInOut, Direction, Pull
-import adafruit_dotstar as dotstar
+import usb_hid
 from adafruit_hid.keyboard import Keyboard
 from adafruit_hid.keycode import Keycode
 from adafruit_hid.keyboard_layout_us import KeyboardLayoutUS
 
-dot = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
-dot[0] = (0, 0, 0)
-
-kbd = Keyboard()
+kbd = Keyboard(usb_hid.devices)
 kbdLayout = KeyboardLayoutUS(kbd)
 state = []
 pins = {}
@@ -58,8 +55,7 @@
     for oldID in oldState:
         if not oldID in newState:
             kbd.release(buttonIDtoKeycode[oldID])
-            dot[0] = (0, 0, 0)
     if newBtn:
         kbd.press(buttonIDtoKeycode[newBtn])
-        dot[0] = (255, 0, 0)
     state = newState
+