From 2e467851e924f98b882a6a22186663c46121e5d4 Mon Sep 17 00:00:00 2001 From: James Carr Date: Sun, 11 Jul 2021 18:25:14 +0100 Subject: [PATCH 1/2] Remove execute bit from .py files --- adafruit_pybadger/__init__.py | 0 adafruit_pybadger/clue.py | 0 adafruit_pybadger/mag_tag.py | 0 adafruit_pybadger/pybadge.py | 0 adafruit_pybadger/pybadger_base.py | 0 adafruit_pybadger/pygamer.py | 0 6 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 adafruit_pybadger/__init__.py mode change 100755 => 100644 adafruit_pybadger/clue.py mode change 100755 => 100644 adafruit_pybadger/mag_tag.py mode change 100755 => 100644 adafruit_pybadger/pybadge.py mode change 100755 => 100644 adafruit_pybadger/pybadger_base.py mode change 100755 => 100644 adafruit_pybadger/pygamer.py diff --git a/adafruit_pybadger/__init__.py b/adafruit_pybadger/__init__.py old mode 100755 new mode 100644 diff --git a/adafruit_pybadger/clue.py b/adafruit_pybadger/clue.py old mode 100755 new mode 100644 diff --git a/adafruit_pybadger/mag_tag.py b/adafruit_pybadger/mag_tag.py old mode 100755 new mode 100644 diff --git a/adafruit_pybadger/pybadge.py b/adafruit_pybadger/pybadge.py old mode 100755 new mode 100644 diff --git a/adafruit_pybadger/pybadger_base.py b/adafruit_pybadger/pybadger_base.py old mode 100755 new mode 100644 diff --git a/adafruit_pybadger/pygamer.py b/adafruit_pybadger/pygamer.py old mode 100755 new mode 100644 From d28f539ba2ecfe926a17e90d772f900e7aca2c0c Mon Sep 17 00:00:00 2001 From: James Carr Date: Wed, 14 Jul 2021 17:36:39 +0100 Subject: [PATCH 2/2] Update the pixel_shader usage of OnDiskBitmap Refactor code referencing CircuitPython 4 & 5 Filled out requirements.txt Include most of the packages in api.rst. I can't get docs to build for cpb_gizmo so have left it out of the docs for now. --- adafruit_pybadger/pewpewm4.py | 2 +- adafruit_pybadger/pybadger_base.py | 47 +++++++++++++++--------------- docs/api.rst | 9 ++++++ docs/conf.py | 4 --- requirements.txt | 8 +++++ 5 files changed, 42 insertions(+), 28 deletions(-) diff --git a/adafruit_pybadger/pewpewm4.py b/adafruit_pybadger/pewpewm4.py index 045365f..cb6462a 100644 --- a/adafruit_pybadger/pewpewm4.py +++ b/adafruit_pybadger/pewpewm4.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT """ -`adafruit_pybadger.clue` +`adafruit_pybadger.pewpewm4` ================================================================================ Badge-focused CircuitPython helper library for Pew Pew M4. diff --git a/adafruit_pybadger/pybadger_base.py b/adafruit_pybadger/pybadger_base.py index 3155ae7..9f08999 100644 --- a/adafruit_pybadger/pybadger_base.py +++ b/adafruit_pybadger/pybadger_base.py @@ -153,26 +153,26 @@ def _create_badge_background(self): with open(self._background_image_filename, "rb") as file_handle: on_disk_bitmap = displayio.OnDiskBitmap(file_handle) background_image = displayio.TileGrid( - on_disk_bitmap, pixel_shader=displayio.ColorConverter() + on_disk_bitmap, + pixel_shader=getattr( + on_disk_bitmap, "pixel_shader", displayio.ColorConverter() + ), + # TODO: Once CP6 is no longer supported, replace the above line with below + # pixel_shader=on_disk_background.pixel_shader, ) self._background_group.append(background_image) for image_label in self._lines: self._background_group.append(image_label) - try: - # Refresh display in CircuitPython 5 - self.display.refresh() - except AttributeError: - # Refresh display in CircuitPython 4 - self.display.wait_for_frame() + self.display.refresh() else: for background_label in self._lines: self._background_group.append(background_label) def badge_background( self, - background_color=(255, 0, 0), - rectangle_color=(255, 255, 255), + background_color=RED, + rectangle_color=WHITE, rectangle_drop=0.4, rectangle_height=0.5, ): @@ -206,8 +206,8 @@ def badge_background( def _badge_background( self, - background_color=(255, 0, 0), - rectangle_color=(255, 255, 255), + background_color=RED, + rectangle_color=WHITE, rectangle_drop=0.4, rectangle_height=0.5, ): @@ -254,7 +254,7 @@ def image_background(self, image_name=None): def badge_line( self, text=" ", - color=(0, 0, 0), + color=BLACK, scale=1, font=terminalio.FONT, left_justify=False, @@ -517,26 +517,27 @@ def show_business_card( with open(image_name, "rb") as file_name: on_disk_bitmap = displayio.OnDiskBitmap(file_name) face_image = displayio.TileGrid( - on_disk_bitmap, pixel_shader=displayio.ColorConverter() + on_disk_bitmap, + pixel_shader=getattr( + on_disk_bitmap, "pixel_shader", displayio.ColorConverter() + ), + # TODO: Once CP6 is no longer supported, replace the above line with below + # pixel_shader=on_disk_bitmap.pixel_shader, ) business_card_splash.append(face_image) for group in business_card_label_groups: business_card_splash.append(group) - try: - # Refresh display in CircuitPython 5 - self.display.refresh() - except AttributeError: - # Refresh display in CircuitPython 4 - self.display.wait_for_frame() + + self.display.refresh() # pylint: disable=too-many-locals def show_badge( self, *, - background_color=(255, 0, 0), - foreground_color=(255, 255, 255), - background_text_color=(255, 255, 255), - foreground_text_color=(0, 0, 0), + background_color=RED, + foreground_color=WHITE, + background_text_color=WHITE, + foreground_text_color=BLACK, hello_font=terminalio.FONT, hello_scale=1, hello_string="HELLO", diff --git a/docs/api.rst b/docs/api.rst index c264f39..1154da2 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -10,8 +10,17 @@ .. automodule:: adafruit_pybadger.clue :members: +.. automodule:: adafruit_pybadger.mag_tag + :members: + +.. automodule:: adafruit_pybadger.pewpewm4 + :members: + .. automodule:: adafruit_pybadger.pybadge :members: .. automodule:: adafruit_pybadger.pygamer :members: + +.. automodule:: adafruit_pybadger.pyportal + :members: diff --git a/docs/conf.py b/docs/conf.py index e22c24c..d2c5565 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -31,12 +31,8 @@ "gamepadshift", "neopixel", "analogio", - "adafruit_display_shapes", - "adafruit_display_text", "terminalio", - "adafruit_miniqr", "adafruit_lis3dh", - "adafruit_bitmap_font", "adafruit_lsm6ds", "gamepad", "audiocore", diff --git a/requirements.txt b/requirements.txt index 17a850d..6e1974a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,11 @@ # SPDX-License-Identifier: Unlicense Adafruit-Blinka +adafruit-circuitpython-bitmap-font +adafruit-circuitpython-display-shapes +adafruit-circuitpython-display-text +adafruit-circuitpython-gizmo +adafruit-circuitpython-lis3dh +adafruit-circuitpython-lsm6ds +adafruit-circuitpython-miniqr +adafruit-circuitpython-neopixel