From 85818c7c0acffc951cb64758080f0c63b134541c Mon Sep 17 00:00:00 2001 From: James Carr Date: Tue, 13 Jul 2021 16:33:36 +0100 Subject: [PATCH 1/2] Update the pixel_shader usage of OnDiskBitmap --- README.rst | 10 ++++++---- examples/ssd1675_2.13_monochrome.py | 7 ++++++- examples/ssd1675_simpletest.py | 7 ++++++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index 9941ac7..c27d7e0 100644 --- a/README.rst +++ b/README.rst @@ -28,8 +28,6 @@ This is easily achieved by downloading Installing from PyPI ===================== -.. note:: This library is not available on PyPI yet. Install documentation is included - as a standard element. Stay tuned for PyPI availability! On supported GNU/Linux systems like the Raspberry Pi, you can install the driver locally `from PyPI `_. To install for current user: @@ -86,8 +84,12 @@ Usage Example f = open("/display-ruler.bmp", "rb") pic = displayio.OnDiskBitmap(f) - t = displayio.TileGrid(pic, pixel_shader=displayio.ColorConverter()) - g.append(t) + # CircuitPython 6 & 7 compatible + t = displayio.TileGrid( + pic, pixel_shader=getattr(pic, "pixel_shader", displayio.ColorConverter()) + ) + # CircuitPython 7 compatible only + # t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader) g.append(t) display.show(g) diff --git a/examples/ssd1675_2.13_monochrome.py b/examples/ssd1675_2.13_monochrome.py index 26c996d..6cb2882 100644 --- a/examples/ssd1675_2.13_monochrome.py +++ b/examples/ssd1675_2.13_monochrome.py @@ -35,7 +35,12 @@ with open("/display-ruler.bmp", "rb") as f: pic = displayio.OnDiskBitmap(f) - t = displayio.TileGrid(pic, pixel_shader=displayio.ColorConverter()) + # CircuitPython 6 & 7 compatible + t = displayio.TileGrid( + pic, pixel_shader=getattr(pic, "pixel_shader", displayio.ColorConverter()) + ) + # CircuitPython 7 compatible only + # t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader) g.append(t) display.show(g) diff --git a/examples/ssd1675_simpletest.py b/examples/ssd1675_simpletest.py index 725a048..9fabbe4 100644 --- a/examples/ssd1675_simpletest.py +++ b/examples/ssd1675_simpletest.py @@ -29,7 +29,12 @@ with open("/display-ruler.bmp", "rb") as f: pic = displayio.OnDiskBitmap(f) - t = displayio.TileGrid(pic, pixel_shader=displayio.ColorConverter()) + # CircuitPython 6 & 7 compatible + t = displayio.TileGrid( + pic, pixel_shader=getattr(pic, "pixel_shader", displayio.ColorConverter()) + ) + # CircuitPython 7 compatible only + # t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader) g.append(t) display.show(g) From 11db8c86d5d11f687f67deefae6697a05da5c21b Mon Sep 17 00:00:00 2001 From: James Carr Date: Wed, 14 Jul 2021 17:29:14 +0100 Subject: [PATCH 2/2] Correct the changes to README --- README.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index c27d7e0..cb87b91 100644 --- a/README.rst +++ b/README.rst @@ -89,7 +89,8 @@ Usage Example pic, pixel_shader=getattr(pic, "pixel_shader", displayio.ColorConverter()) ) # CircuitPython 7 compatible only - # t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader) g.append(t) + # t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader) + g.append(t) display.show(g)