Skip to content

Matrix Portal Tip Jar: Update for CP7 #1686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 4, 2021
Merged

Matrix Portal Tip Jar: Update for CP7 #1686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac72af1
Remove max_size usage with displayio.Group
lesamouraipourpre Aug 2, 2021
da7d40e
Repackage bmps.zip with MacOS hidden files removed.
lesamouraipourpre Aug 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Matrix_Portal_Tip_Jar/bmps.zip
100755 → 100644
View file
Open in desktop
Binary file not shown.
25 changes: 16 additions & 9 deletions Matrix_Portal_Tip_Jar/code.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

# --- Display setup ---
matrix = Matrix(bit_depth=4)
sprite_group = displayio.Group(max_size=1)
sprite_group = displayio.Group()
matrix.display.show(sprite_group)

# --- Button setup ---
Expand Down Expand Up @@ -68,23 +68,30 @@ def load_image():
while sprite_group:
sprite_group.pop()

bitmap = displayio.OnDiskBitmap(
open(SPRITESHEET_FOLDER + "/" + file_list[CURRENT_IMAGE], "rb")
)

FRAME_COUNT = int(bitmap.height / matrix.display.height)
FRAME_DURATION = DEFAULT_FRAME_DURATION
filename = SPRITESHEET_FOLDER + "/" + file_list[CURRENT_IMAGE]

# CircuitPython 6 & 7 compatible
bitmap = displayio.OnDiskBitmap(open(filename, "rb"))
sprite = displayio.TileGrid(
bitmap,
pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter()),
width=1,
height=1,
tile_width=bitmap.width,
tile_height=matrix.display.height,
)

# # CircuitPython 7+ compatible
# bitmap = displayio.OnDiskBitmap(filename)
# sprite = displayio.TileGrid(
# bitmap,
# pixel_shader=bitmap.pixel_shader,
# tile_width=bitmap.width,
# tile_height=matrix.display.height,
# )

sprite_group.append(sprite)

FRAME_COUNT = int(bitmap.height / matrix.display.height)
FRAME_DURATION = DEFAULT_FRAME_DURATION
CURRENT_FRAME = 0
CURRENT_LOOP = 0

Expand Down