2828a .solicited_services .append (AppleMediaService )
2929radio .start_advertising (a )
3030
31- def wrap_in_tilegrid (open_file ):
32- odb = displayio .OnDiskBitmap (open_file )
33- return displayio .TileGrid (odb , pixel_shader = getattr (odb , 'pixel_shader' , displayio .ColorConverter ()))
31+ def wrap_in_tilegrid (filename :str ):
32+ # CircuitPython 6 & 7 compatible
33+ odb = displayio .OnDiskBitmap (open (filename , "rb" ))
34+ return displayio .TileGrid (
35+ odb , pixel_shader = getattr (odb , 'pixel_shader' , displayio .ColorConverter ())
36+ )
37+
38+ # # CircuitPython 7+ compatible
39+ # odb = displayio.OnDiskBitmap(filename)
40+ # return displayio.TileGrid(odb, pixel_shader=odb.pixel_shader)
3441
3542def make_background (width , height , color ):
3643 color_bitmap = displayio .Bitmap (width , height , 1 )
@@ -46,10 +53,10 @@ def load_font(fontname, text):
4653 font .load_glyphs (text .encode ('utf-8' ))
4754 return font
4855
49- def make_label (text , x , y , color , max_glyphs = 30 , font = terminalio .FONT ):
56+ def make_label (text , x , y , color , font = terminalio .FONT ):
5057 if isinstance (font , str ):
5158 font = load_font (font , "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.,?()" )
52- text_area = Label (font , text = text , color = color , max_glyphs = max_glyphs )
59+ text_area = Label (font , text = text , color = color )
5360 text_area .x = x
5461 text_area .y = y
5562 return text_area
@@ -66,12 +73,12 @@ def set_status(label, action_text, player):
6673 label .x = display .width - 10 - label_width
6774
6875display = tft_gizmo .TFT_Gizmo ()
69- group = displayio .Group (max_size = 20 )
76+ group = displayio .Group ()
7077display .show (group )
7178
7279while True :
7380 if not radio .connected :
74- group .append (wrap_in_tilegrid (open ( "/graphic_tfts_ams_connect.bmp" , "rb" ) ))
81+ group .append (wrap_in_tilegrid ("/graphic_tfts_ams_connect.bmp" ))
7582
7683 while not radio .connected :
7784 pass
@@ -83,7 +90,7 @@ def set_status(label, action_text, player):
8390
8491 # Draw the text fields
8592 print ("Loading Font Glyphs..." )
86- group .append (wrap_in_tilegrid (open ( "/graphic_tfts_ams_loading.bmp" , "rb" ) ))
93+ group .append (wrap_in_tilegrid ("/graphic_tfts_ams_loading.bmp" ))
8794 title_label = make_label ("None" , 12 , 30 , TEXT_COLOR , font = "/fonts/Arial-Bold-18.bdf" )
8895 artist_label = make_label ("None" , 12 , 70 , TEXT_COLOR , font = "/fonts/Arial-16.bdf" )
8996 album_label = make_label ("None" , 12 , 184 , TEXT_COLOR , font = "/fonts/Arial-16.bdf" )
0 commit comments