Skip to content

Pyloton: Update for CP7 #1631

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
Jul 25, 2021
Merged

Pyloton: Update for CP7 #1631

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec69daf
Remove max_size usage with displayio.Group
lesamouraipourpre Jul 23, 2021
9fce127
Update OnDiskBitmap usage to take a filename string in CP7
lesamouraipourpre Jul 23, 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
24 changes: 19 additions & 5 deletions CircuitPython_Pyloton/pyloton.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def __init__(self, ble, display, circ, heart=True, speed=True, cad=True, ams=Tru

self.start = time.time()

self.splash = displayio.Group(max_size=25)
self.splash = displayio.Group()
self.loading_group = displayio.Group()

self._load_fonts()
Expand All @@ -140,9 +140,9 @@ def __init__(self, ble, display, circ, heart=True, speed=True, cad=True, ams=Tru

self.text_group = displayio.Group()
self.status = label.Label(font=self.arial12, x=10, y=200,
text='', color=self.YELLOW, max_glyphs=30)
text='', color=self.YELLOW)
self.status1 = label.Label(font=self.arial12, x=10, y=220,
text='', color=self.YELLOW, max_glyphs=30)
text='', color=self.YELLOW)

self.text_group.append(self.status)
self.text_group.append(self.status1)
Expand All @@ -154,7 +154,11 @@ def show_splash(self):
"""
if self.debug:
return
with open('blinka-pyloton.bmp', 'rb') as bitmap_file:

blinka_bitmap = "blinka-pyloton.bmp"

# Compatible with CircuitPython 6 & 7
with open(blinka_bitmap, 'rb') as bitmap_file:
bitmap1 = displayio.OnDiskBitmap(bitmap_file)
tile_grid = displayio.TileGrid(bitmap1, pixel_shader=getattr(bitmap1, 'pixel_shader', displayio.ColorConverter()))
self.loading_group.append(tile_grid)
Expand All @@ -165,6 +169,16 @@ def show_splash(self):
self.loading_group.append(rect)
self.loading_group.append(status_heading)

# # Compatible with CircuitPython 7+
# bitmap1 = displayio.OnDiskBitmap(blinka_bitmap)
# tile_grid = displayio.TileGrid(bitmap1, pixel_shader=bitmap1.pixel_shader)
# self.loading_group.append(tile_grid)
# self.display.show(self.loading_group)
# status_heading = label.Label(font=self.arial16, x=80, y=175,
# text="Status", color=self.YELLOW)
# rect = Rect(0, 165, 240, 75, fill=self.PURPLE)
# self.loading_group.append(rect)
# self.loading_group.append(status_heading)

def _load_fonts(self):
"""
Expand Down Expand Up @@ -413,7 +427,7 @@ def _label_maker(self, text, x, y, font=None):
"""
if not font:
font = self.arial24
return label.Label(font=font, x=x, y=y, text=text, color=self.WHITE, max_glyphs=30)
return label.Label(font=font, x=x, y=y, text=text, color=self.WHITE)


def _get_y(self):
Expand Down