From 78bf3a366c4b1ac15ef63dc0489c30f80598fbbb Mon Sep 17 00:00:00 2001 From: James Carr Date: Tue, 13 Jul 2021 11:08:15 +0100 Subject: [PATCH 1/2] Update the pixel_shader usage of OnDiskBitmap --- README.rst | 10 ++++++---- examples/il0373_1.54_color.py | 7 ++++++- examples/il0373_2.13_color.py | 7 ++++++- examples/il0373_2.9_color.py | 7 ++++++- examples/il0373_2.9_grayscale.py | 7 ++++++- examples/il0373_flexible_2.13_monochrome.py | 7 ++++++- examples/il0373_flexible_2.9_monochrome.py | 7 ++++++- examples/il0373_simpletest.py | 7 ++++++- 8 files changed, 48 insertions(+), 11 deletions(-) diff --git a/README.rst b/README.rst index 0285d9b..340c829 100644 --- a/README.rst +++ b/README.rst @@ -28,9 +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,7 +83,12 @@ Usage Example f = open("/display-ruler.bmp", "rb") 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/il0373_1.54_color.py b/examples/il0373_1.54_color.py index 263904d..ff0a4e7 100644 --- a/examples/il0373_1.54_color.py +++ b/examples/il0373_1.54_color.py @@ -40,7 +40,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/il0373_2.13_color.py b/examples/il0373_2.13_color.py index 3c13ef0..40f153d 100755 --- a/examples/il0373_2.13_color.py +++ b/examples/il0373_2.13_color.py @@ -47,7 +47,12 @@ with open("/display-ruler.bmp", "rb") as f: pic = displayio.OnDiskBitmap(f) # Create a Tilegrid with the bitmap and put in the displayio group - 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) # Place the display group on the screen diff --git a/examples/il0373_2.9_color.py b/examples/il0373_2.9_color.py index f36a7c8..99b541f 100644 --- a/examples/il0373_2.9_color.py +++ b/examples/il0373_2.9_color.py @@ -46,7 +46,12 @@ with open("/display-ruler.bmp", "rb") as f: pic = displayio.OnDiskBitmap(f) # Create a Tilegrid with the bitmap and put in the displayio group - 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) # Place the display group on the screen diff --git a/examples/il0373_2.9_grayscale.py b/examples/il0373_2.9_grayscale.py index d5f2aef..bc342ec 100644 --- a/examples/il0373_2.9_grayscale.py +++ b/examples/il0373_2.9_grayscale.py @@ -41,7 +41,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/il0373_flexible_2.13_monochrome.py b/examples/il0373_flexible_2.13_monochrome.py index 560ecd9..787bd2d 100644 --- a/examples/il0373_flexible_2.13_monochrome.py +++ b/examples/il0373_flexible_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/il0373_flexible_2.9_monochrome.py b/examples/il0373_flexible_2.9_monochrome.py index 5940ed5..de08470 100644 --- a/examples/il0373_flexible_2.9_monochrome.py +++ b/examples/il0373_flexible_2.9_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/il0373_simpletest.py b/examples/il0373_simpletest.py index 61d7ef9..c7d58cc 100644 --- a/examples/il0373_simpletest.py +++ b/examples/il0373_simpletest.py @@ -31,7 +31,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 f81cd61f5c7da393e24749d0da969604854c7758 Mon Sep 17 00:00:00 2001 From: James Carr Date: Tue, 13 Jul 2021 11:30:51 +0100 Subject: [PATCH 2/2] Add the device specific examples to examples.rst --- docs/examples.rst | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/docs/examples.rst b/docs/examples.rst index 9a498b1..8e19ae3 100644 --- a/docs/examples.rst +++ b/docs/examples.rst @@ -6,3 +6,30 @@ Ensure your device works with this simple test. .. literalinclude:: ../examples/il0373_simpletest.py :caption: examples/il0373_simpletest.py :linenos: + +Device Specific Examples +------------------------ + +.. literalinclude:: ../examples/il0373_1.54_color.py + :caption: examples/il0373_1.54_color.py + :linenos: + +.. literalinclude:: ../examples/il0373_2.9_color.py + :caption: examples/il0373_2.9_color.py + :linenos: + +.. literalinclude:: ../examples/il0373_2.9_grayscale.py + :caption: examples/il0373_2.9_grayscale.py + :linenos: + +.. literalinclude:: ../examples/il0373_2.13_color.py + :caption: examples/il0373_2.13_color.py + :linenos: + +.. literalinclude:: ../examples/il0373_flexible_2.9_monochrome.py + :caption: examples/il0373_flexible_2.9_monochrome.py + :linenos: + +.. literalinclude:: ../examples/il0373_flexible_2.13_monochrome.py + :caption: examples/il0373_2.13_monochrome.py + :linenos: