Skip to content

Commit 31240bf

Browse files
FoamyGuyFoamyGuy
authored
Merge pull request #3069 from FoamyGuy/odb_api_update
Use new OnDiskBitmap API
2 parents 60d17f1 + 0b0c4eb commit 31240bf

File tree

49 files changed

+159
-572
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+159
-572
lines changed

‎Buckaroo_Plant_Care_Bot/code.py‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,17 @@
2222
clue_display = displayio.Group()
2323

2424
# draw the dry plant
25-
dry_plant_file = open("dry.bmp", "rb")
26-
dry_plant_bmp = displayio.OnDiskBitmap(dry_plant_file)
27-
# CircuitPython 6 & 7 compatible
25+
dry_plant_bmp = displayio.OnDiskBitmap("dry.bmp")
2826
dry_plant_sprite = displayio.TileGrid(
29-
dry_plant_bmp,
30-
pixel_shader=getattr(dry_plant_bmp, "pixel_shader", displayio.ColorConverter()),
27+
dry_plant_bmp, pixel_shader=dry_plant_bmp.pixel_shader
3128
)
32-
# CircuitPython 7 compatible
33-
# dry_plant_sprite = displayio.TileGrid(
34-
# dry_plant_bmp, pixel_shader=dry_plant_bmp.pixel_shader
35-
# )
3629
clue_display.append(dry_plant_sprite)
3730

3831
# draw the happy plant on top (so it can be moved out of the way when needed)
39-
happy_plant_file = open("happy.bmp", "rb")
40-
happy_plant_bmp = displayio.OnDiskBitmap(happy_plant_file)
41-
# CircuitPython 6 & 7 compatible
32+
happy_plant_bmp = displayio.OnDiskBitmap("happy.bmp")
4233
happy_plant_sprite = displayio.TileGrid(
43-
happy_plant_bmp,
44-
pixel_shader=getattr(happy_plant_bmp, "pixel_shader", displayio.ColorConverter()),
34+
happy_plant_bmp, pixel_shader=happy_plant_bmp.pixel_shader
4535
)
46-
# CircuitPython 7 compatible
47-
# happy_plant_sprite = displayio.TileGrid(
48-
# happy_plant_bmp, pixel_shader=happy_plant_bmp.pixel_shader
49-
# )
5036
clue_display.append(happy_plant_sprite)
5137

5238
# Create text

‎CLUE/CLUE_Egg_Drop/code.py‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,14 @@
2222
# bad egg
2323
BAD_EGG_FILENAME = "broken_egg.bmp"
2424

25-
# CircuitPython 6 & 7 compatible
26-
begg_file = open(BAD_EGG_FILENAME, "rb")
27-
begg_bmp = displayio.OnDiskBitmap(begg_file)
28-
begg_sprite = displayio.TileGrid(
29-
begg_bmp,
30-
pixel_shader=getattr(begg_bmp, 'pixel_shader', displayio.ColorConverter())
31-
)
32-
33-
# # CircuitPython 7+ compatible
34-
# begg_bmp = displayio.OnDiskBitmap(BAD_EGG_FILENAME)
35-
# begg_sprite = displayio.TileGrid(begg_bmp, pixel_shader=begg_bmp.pixel_shader)
25+
begg_bmp = displayio.OnDiskBitmap(BAD_EGG_FILENAME)
26+
begg_sprite = displayio.TileGrid(begg_bmp, pixel_shader=begg_bmp.pixel_shader)
3627

3728
# good egg
3829
GOOD_EGG_FILENAME = "good_egg.bmp"
3930

40-
# CircuitPython 6 & 7 compatible
41-
gegg_file = open(GOOD_EGG_FILENAME, "rb")
42-
gegg_bmp = displayio.OnDiskBitmap(gegg_file)
43-
gegg_sprite = displayio.TileGrid(
44-
gegg_bmp,
45-
pixel_shader=getattr(gegg_bmp, 'pixel_shader', displayio.ColorConverter())
46-
)
47-
48-
# # CircuitPython 7+ compatible
49-
# gegg_bmp = displayio.OnDiskBitmap(GOOD_EGG_FILENAME)
50-
# gegg_sprite = displayio.TileGrid(gegg_bmp, pixel_shader=gegg_bmp.pixel_shader)
31+
gegg_bmp = displayio.OnDiskBitmap(GOOD_EGG_FILENAME)
32+
gegg_sprite = displayio.TileGrid(gegg_bmp, pixel_shader=gegg_bmp.pixel_shader)
5133

5234
# draw the bad egg!
5335
splash.append(begg_sprite)

‎CLUE/CLUE_Hand_Wash_Timer/code.py‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,19 @@
2121

2222
# draw the background image
2323
WASH_ON_FILENAME = "wash_on.bmp"
24-
25-
# CircuitPython 6 & 7 compatible
26-
wash_on_file = open(WASH_ON_FILENAME, "rb")
27-
wash_on_bmp = displayio.OnDiskBitmap(wash_on_file)
28-
wash_on_sprite = displayio.TileGrid(
29-
wash_on_bmp,
30-
pixel_shader=getattr(wash_on_bmp, 'pixel_shader', displayio.ColorConverter())
31-
)
32-
33-
# # CircuitPython 7+ compatible
34-
# wash_on_bmp = displayio.OnDiskBitmap(WASH_ON_FILENAME)
35-
# wash_on_sprite = displayio.TileGrid(wash_on_bmp, pixel_shader=wash_on_bmp.pixel_shader)
24+
wash_on_bmp = displayio.OnDiskBitmap(WASH_ON_FILENAME)
25+
wash_on_sprite = displayio.TileGrid(wash_on_bmp, pixel_shader=wash_on_bmp.pixel_shader)
3626

3727
clue_display.append(wash_on_sprite)
3828

3929
# draw the foreground image
4030
WASH_OFF_FILENAME = "wash_off.bmp"
4131

42-
# CircuitPython 6 & 7 compatible
43-
wash_off_file = open(WASH_OFF_FILENAME, "rb")
44-
wash_off_bmp = displayio.OnDiskBitmap(wash_off_file)
45-
wash_off_sprite = displayio.TileGrid(
46-
wash_off_bmp,
47-
pixel_shader=getattr(wash_off_bmp, 'pixel_shader', displayio.ColorConverter())
48-
)
49-
50-
# # CircuitPython 7+ compatible
51-
# wash_off_bmp = displayio.OnDiskBitmap(WASH_OFF_FILENAME)
52-
# wash_off_sprite = displayio.TileGrid(wash_off_bmp, pixel_shader=wash_off_bmp.pixel_shader)
32+
wash_off_bmp = displayio.OnDiskBitmap(WASH_OFF_FILENAME)
33+
wash_off_sprite = displayio.TileGrid(wash_off_bmp, pixel_shader=wash_off_bmp.pixel_shader)
5334

5435
clue_display.append(wash_off_sprite)
5536

56-
5737
# Create text
5838
# first create the group
5939
text_group = displayio.Group()

‎CLUE/Clue_Step_Counter/code.py‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,10 @@
6565
clueGroup = displayio.Group()
6666

6767
# loading bitmap background
68-
# CircuitPython 6 & 7 compatible
69-
clue_bg = displayio.OnDiskBitmap(open(clue_bgBMP, "rb"))
70-
clue_tilegrid = displayio.TileGrid(
71-
clue_bg, pixel_shader=getattr(clue_bg, 'pixel_shader', displayio.ColorConverter())
72-
)
68+
clue_bg = displayio.OnDiskBitmap(clue_bgBMP)
69+
clue_tilegrid = displayio.TileGrid(clue_bg, pixel_shader=clue_bg.pixel_shader)
7370
clueGroup.append(clue_tilegrid)
7471

75-
# # CircuitPython 7+ compatible
76-
# clue_bg = displayio.OnDiskBitmap(clue_bgBMP)
77-
# clue_tilegrid = displayio.TileGrid(clue_bg, pixel_shader=clue_bg.pixel_shader)
78-
# clueGroup.append(clue_tilegrid)
79-
8072
# creating the ProgressBar object
8173
bar_group = displayio.Group()
8274
prog_bar = ProgressBar(1, 1, 239, 25, bar_color=0x652f8f)

‎CPB_AMS_Gizmo_BLE/code.py‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,8 @@
3333
radio.start_advertising(a)
3434

3535
def wrap_in_tilegrid(filename:str):
36-
# CircuitPython 6 & 7 compatible
37-
odb = displayio.OnDiskBitmap(open(filename, "rb"))
38-
return displayio.TileGrid(
39-
odb, pixel_shader=getattr(odb, 'pixel_shader', displayio.ColorConverter())
40-
)
41-
42-
# # CircuitPython 7+ compatible
43-
# odb = displayio.OnDiskBitmap(filename)
44-
# return displayio.TileGrid(odb, pixel_shader=odb.pixel_shader)
36+
odb = displayio.OnDiskBitmap(filename)
37+
return displayio.TileGrid(odb, pixel_shader=odb.pixel_shader)
4538

4639
def make_background(width, height, color):
4740
color_bitmap = displayio.Bitmap(width, height, 1)

‎CPB_ANCS/code.py‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,8 @@ def check_timeout(self):
9393
advertisement.solicited_services.append(AppleNotificationCenterService)
9494

9595
def wrap_in_tilegrid(filename:str):
96-
# CircuitPython 6 & 7 compatible
97-
odb = displayio.OnDiskBitmap(open(filename, "rb"))
98-
return displayio.TileGrid(
99-
odb, pixel_shader=getattr(odb, 'pixel_shader', displayio.ColorConverter())
100-
)
101-
102-
# # CircuitPython 7+ compatible
103-
# odb = displayio.OnDiskBitmap(filename)
104-
# return displayio.TileGrid(odb, pixel_shader=odb.pixel_shader)
96+
odb = displayio.OnDiskBitmap(filename)
97+
return displayio.TileGrid(odb, pixel_shader=odb.pixel_shader)
10598

10699
display = tft_gizmo.TFT_Gizmo()
107100
group = displayio.Group()

‎CircuitPython_JEplayer_mp3/code.py‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -127,32 +127,16 @@ def set_bitmap(self, candidates):
127127
if i == self._bitmap_filename:
128128
return # Already loaded
129129

130-
# CircuitPython 6 & 7 compatible
131130
try:
132-
bitmap_file = open(i, 'rb')
131+
bitmap = displayio.OnDiskBitmap(i)
133132
except OSError:
134133
continue
135-
bitmap = displayio.OnDiskBitmap(bitmap_file)
136134
self._bitmap_filename = i
137135
# Create a TileGrid to hold the bitmap
138136
self.tile_grid = displayio.TileGrid(
139-
bitmap,
140-
pixel_shader=getattr(
141-
bitmap, "pixel_shader", displayio.ColorConverter()
142-
),
137+
bitmap, pixel_shader=bitmap.pixel_shader
143138
)
144139

145-
# # CircuitPython 7+ compatible
146-
# try:
147-
# bitmap = displayio.OnDiskBitmap(i)
148-
# except OSError:
149-
# continue
150-
# self._bitmap_filename = i
151-
# # Create a TileGrid to hold the bitmap
152-
# self.tile_grid = displayio.TileGrid(
153-
# bitmap, pixel_shader=bitmap.pixel_shader
154-
# )
155-
156140
# Add the TileGrid to the Group
157141
if len(self.group) == 0:
158142
self.group.append(self.tile_grid)

‎CircuitPython_RGBMatrix/fruit/code.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,8 @@
2525

2626
filename = "emoji.bmp"
2727

28-
# CircuitPython 6 & 7 compatible
29-
bitmap_file = open(filename, 'rb')
30-
bitmap = displayio.OnDiskBitmap(bitmap_file)
31-
pixel_shader = getattr(bitmap, 'pixel_shader', displayio.ColorConverter())
32-
33-
# # CircuitPython 7+ compatible
34-
# bitmap = displayio.OnDiskBitmap(filename)
35-
# pixel_shader = bitmap.pixel_shader
28+
bitmap = displayio.OnDiskBitmap(filename)
29+
pixel_shader = bitmap.pixel_shader
3630

3731
# Each wheel can be in one of three states:
3832
STOPPED, RUNNING, BRAKING = range(3)

‎CircuitPython_RGBMatrix/tiled/code.py‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,14 @@
4646
# Load BMP image, create Group and TileGrid to hold it
4747
FILENAME = "wales.bmp"
4848

49-
# CircuitPython 6 & 7 compatible
50-
BITMAP = displayio.OnDiskBitmap(open(FILENAME, "rb"))
49+
BITMAP = displayio.OnDiskBitmap(FILENAME)
5150
TILEGRID = displayio.TileGrid(
5251
BITMAP,
53-
pixel_shader=getattr(BITMAP, 'pixel_shader', displayio.ColorConverter()),
52+
pixel_shader=BITMAP.pixel_shader,
5453
tile_width=BITMAP.width,
5554
tile_height=BITMAP.height
5655
)
5756

58-
# # CircuitPython 7+ compatible
59-
# BITMAP = displayio.OnDiskBitmap(FILENAME)
60-
# TILEGRID = displayio.TileGrid(
61-
# BITMAP,
62-
# pixel_shader=BITMAP.pixel_shader,
63-
# tile_width=BITMAP.width,
64-
# tile_height=BITMAP.height
65-
# )
66-
6757
GROUP = displayio.Group()
6858
GROUP.append(TILEGRID)
6959
DISPLAY.root_group = GROUP

‎CircuitPython_sdcardio_sdioio/show_bitmaps/code.py‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,8 @@
2121
for filename in bmpfiles:
2222
print("showing", filename)
2323

24-
# CircuitPython 6 & 7 compatible
25-
bitmap_file = open(filename, "rb")
26-
bitmap = displayio.OnDiskBitmap(bitmap_file)
27-
tile_grid = displayio.TileGrid(
28-
bitmap,
29-
pixel_shader=getattr(bitmap, 'pixel_shader', displayio.ColorConverter())
30-
)
31-
32-
# # CircuitPython 7+ compatible
33-
# bitmap = displayio.OnDiskBitmap(filename)
34-
# tile_grid = displayio.TileGrid(bitmap, pixel_shader=bitmap.pixel_shader)
24+
bitmap = displayio.OnDiskBitmap(filename)
25+
tile_grid = displayio.TileGrid(bitmap, pixel_shader=bitmap.pixel_shader)
3526

3627
group = displayio.Group()
3728
group.append(tile_grid)

0 commit comments

Comments
 (0)