Merge pull request adafruit#948 from makermelissa/master

Updated many examples for displayio to work in CP 4 and 5

Author: makermelissa

CircuitPython_PyPaint/code.py

@@ -146,9 +146,9 @@ def set_cursor_bitmap(self, bmp):
         self.poke()
 
 ################################################################################
-
 class Paint(object):
 
+    #pylint:disable=too-many-statements
     def __init__(self, display=board.DISPLAY):
         self._logger = logging.getLogger("Paint")
         self._logger.setLevel(logging.DEBUG)
@@ -196,9 +196,13 @@ def __init__(self, display=board.DISPLAY):
         self._splash.append(self._palette)
 
         self._display.show(self._splash)
-        self._display.refresh_soon()
-        gc.collect()
-        self._display.wait_for_frame()
+        try:
+            gc.collect()
+            self._display.refresh(target_frames_per_second=60)
+        except AttributeError:
+            self._display.refresh_soon()
+            gc.collect()
+            self._display.wait_for_frame()
 
         self._brush = 0
         self._cursor_bitmaps = [self._cursor_bitmap_1(), self._cursor_bitmap_3()]
@@ -215,6 +219,7 @@ def __init__(self, display=board.DISPLAY):
         self._last_location = None
 
         self._pencolor = 7
+    #pylint:enable=too-many-statements
 
     def _make_palette(self):
         self._palette_bitmap = displayio.Bitmap(self._w // 10, self._h, 5)

CircuitPython_displayio/displayio_display_driver.py

@@ -37,4 +37,3 @@
 group = displayio.Group()
 group.append(tile_grid)
 display.show(group)
-display.refresh_soon()

CircuitPython_displayio/displayio_display_manual.py

@@ -64,4 +64,3 @@
 group = displayio.Group()
 group.append(tile_grid)
 display.show(group)
-display.refresh_soon()

CircuitPython_displayio/displayio_parallelbus.py

@@ -62,4 +62,3 @@
 group = displayio.Group()
 group.append(tile_grid)
 display.show(group)
-display.refresh_soon()

HalloWing_Cat_Toy/code.py

@@ -75,7 +75,10 @@ def show_image(filename):
     face = displayio.Sprite(odb, pixel_shader=displayio.ColorConverter(), position=(0, 0))
     backlight.value = False
     splash.append(face)
-    board.DISPLAY.wait_for_frame()
+    try:
+        board.DISPLAY.refresh(target_frames_per_second=60)
+    except AttributeError:
+        board.DISPLAY.wait_for_frame()
     backlight.value = True
 
 

HalloWing_Jump_Scare_Trap/hallowing_jump_scare_trap.py

@@ -99,7 +99,10 @@ def show_image(filename):
     backlight.duty_cycle = 0
     splash.append(face)
     # Wait for the image to load.
-    board.DISPLAY.wait_for_frame()
+    try:
+        board.DISPLAY.refresh(target_frames_per_second=60)
+    except AttributeError:
+        board.DISPLAY.wait_for_frame()
     backlight.duty_cycle = max_brightness
 
 beep(1)  # startup beep

HalloWing_Tour_Guide/code.py

@@ -68,7 +68,10 @@ def show_image(filename):
     face = displayio.Sprite(odb, pixel_shader=displayio.ColorConverter(), position=(0, 0))
     backlight.value = False
     splash.append(face)
-    board.DISPLAY.wait_for_frame()
+    try:
+        board.DISPLAY.refresh(target_frames_per_second=60)
+    except AttributeError:
+        board.DISPLAY.wait_for_frame()
     backlight.value = True
 
 

Hallowing_Jump_Sound/jump-sound.py

@@ -6,10 +6,10 @@
 """
 
 import time
-import audioio
 import busio
 import board
 import digitalio
+import audioio
 import touchio
 import neopixel
 

Hallowing_Jump_Sound/stomp-and-roar.py

@@ -10,12 +10,11 @@
 
 import time
 import math
+import digitalio
 import board
 import busio
 import audioio
-import pulseio
 import neopixel
-import adafruit_lis3dh
 
 def load_wav(name):
     """
@@ -30,16 +29,36 @@ def load_wav(name):
 ROAR_WAV = load_wav('roar')   # WAV when jumping
 IMAGEFILE = 'reptar.bmp'      # BMP image to display
 
+IS_HALLOWING_M4 = False
+
+# Perform a couple extra steps for the HalloWing M4
+try:
+    if getattr(board, "CAP_PIN"):
+        IS_HALLOWING_M4 = True
+    if getattr(board, "SPEAKER_ENABLE"):
+        # Enable the Speaker
+        speaker_enable = digitalio.DigitalInOut(board.SPEAKER_ENABLE)
+        speaker_enable.direction = digitalio.Direction.OUTPUT
+        speaker_enable.value = True
+except AttributeError:
+    pass
+
 AUDIO = audioio.AudioOut(board.A0)              # Speaker
-BACKLIGHT = pulseio.PWMOut(board.TFT_BACKLIGHT) # Display backlight
+
+board.DISPLAY.auto_brightness = False
 
 # Set up accelerometer on I2C bus, 4G range:
 I2C = busio.I2C(board.SCL, board.SDA)
-try:
-    ACCEL = adafruit_lis3dh.LIS3DH_I2C(I2C, address=0x18) # Production board
-except ValueError:
-    ACCEL = adafruit_lis3dh.LIS3DH_I2C(I2C, address=0x19) # Beta hardware
-ACCEL.range = adafruit_lis3dh.RANGE_4_G
+if IS_HALLOWING_M4:
+    import adafruit_msa301
+    ACCEL = adafruit_msa301.MSA301(I2C)
+else:
+    import adafruit_lis3dh
+    try:
+        ACCEL = adafruit_lis3dh.LIS3DH_I2C(I2C, address=0x18) # Production board
+    except ValueError:
+        ACCEL = adafruit_lis3dh.LIS3DH_I2C(I2C, address=0x19) # Beta hardware
+    ACCEL.range = adafruit_lis3dh.RANGE_4_G
 
 STEP_INTERVAL_MIN = 0.3 # Shortest interval to walk one step (seconds)
 STEP_INTERVAL_MAX = 2.0 # Longest interval to walk one step (seconds)
@@ -57,15 +76,15 @@ def load_wav(name):
 # older CircuitPython) and the code will continue with the step detection.
 try:
     import displayio
+    board.DISPLAY.brightness = 0
     SCREEN = displayio.Group()
     board.DISPLAY.show(SCREEN)
     BITMAP = displayio.OnDiskBitmap(open(IMAGEFILE, 'rb'))
     SCREEN.append(
-        displayio.Sprite(BITMAP,
-                         pixel_shader=displayio.ColorConverter(),
-                         position=(0, 0)))
-    board.DISPLAY.wait_for_frame() # Wait for the image to load.
-    BACKLIGHT.duty_cycle = 65535   # Turn on display backlight
+        displayio.TileGrid(BITMAP,
+                           pixel_shader=displayio.ColorConverter(),
+                           x=0, y=0))
+    board.DISPLAY.brightness = 1.0   # Turn on display backlight
 except (ImportError, NameError, AttributeError) as err:
     pass # Probably earlier CircuitPython; no displayio support
 

Magic_Nine_Ball/magic_nine_ball.py

@@ -37,7 +37,10 @@
 
         splash.append(face)
         # Wait for the image to load.
-        board.DISPLAY.wait_for_frame()
+        try:
+            board.DISPLAY.refresh(target_frames_per_second=60)
+        except AttributeError:
+            board.DISPLAY.wait_for_frame()
 
         # Fade up the backlight
         for b in range(101):