Merge remote-tracking branch 'upstream/master'

Author: jerryneedell

Matrix_Portal_Moon_Clock/code.py

@@ -172,9 +172,9 @@ def next_moon_data(datetime, utc_offset):
 DISPLAY = MATRIX.display
 ACCEL = adafruit_lis3dh.LIS3DH_I2C(busio.I2C(board.SCL, board.SDA),
                                    address=0x19)
-ROTATE = (int(((math.atan2(-ACCEL.acceleration.y, -ACCEL.acceleration.x) +
-                math.pi) / (math.pi * 2) - 0.125) * 4) % 4) * 90
-DISPLAY.rotation = ROTATE
+DISPLAY.rotation = (int(((math.atan2(-ACCEL.acceleration.y,
+                                     -ACCEL.acceleration.x) + math.pi) /
+                         (math.pi * 2) + 0.875) * 4) % 4) * 90
 
 LARGE_FONT = bitmap_font.load_font('/fonts/helvB12.bdf')
 SMALL_FONT = bitmap_font.load_font('/fonts/helvR10.bdf')
@@ -189,7 +189,7 @@ def next_moon_data(datetime, utc_offset):
 # Element 0 is a stand-in item, later replaced with the moon phase bitmap
 # pylint: disable=bare-except
 try:
-    FILENAME = 'moon/splash-' + str(ROTATE) + '.bmp'
+    FILENAME = 'moon/splash-' + str(DISPLAY.rotation) + '.bmp'
     BITMAP = displayio.OnDiskBitmap(open(FILENAME, 'rb'))
     TILE_GRID = displayio.TileGrid(BITMAP,
                                    pixel_shader=displayio.ColorConverter(),)
@@ -339,7 +339,7 @@ def next_moon_data(datetime, utc_offset):
             else:
                 NEXT_EVENT = NEXT_PERIOD.set
 
-    if ROTATE in (0, 180): # Horizontal 'landscape' orientation
+    if DISPLAY.rotation in (0, 180): # Horizontal 'landscape' orientation
         CENTER_X = 48      # Text along right
         MOON_Y = 0         # Moon at left
         TIME_Y = 6         # Time at top right

RBG_Matrix/code.py

@@ -0,0 +1,72 @@
+# This example shows how to use text and graphics to create custom signage
+
+import time
+import adafruit_display_text.label
+import board
+import displayio
+import framebufferio
+import rgbmatrix
+import terminalio
+
+# If there was a display before (protomatter, LCD, or E-paper), release it so
+# we can create ours
+displayio.release_displays()
+
+matrix = rgbmatrix.RGBMatrix(
+    width=64, bit_depth=4,
+    rgb_pins=[board.MTX_R1, board.MTX_G1, board.MTX_B1, board.MTX_R2, board.MTX_G2, board.MTX_B2],
+    addr_pins=[board.MTX_ADDRA, board.MTX_ADDRB, board.MTX_ADDRC, board.MTX_ADDRD],
+    clock_pin=board.MTX_CLK, latch_pin=board.MTX_LAT, output_enable_pin=board.MTX_OE)
+
+# Associate the RGB matrix with a Display so that we can use displayio features
+display = framebufferio.FramebufferDisplay(matrix, auto_refresh=False)
+display.rotation = 180
+
+R = adafruit_display_text.label.Label(
+    terminalio.FONT,
+    color=0xff0000,
+    scale=3, x=2, y=13,
+    text="R")
+B = adafruit_display_text.label.Label(
+    terminalio.FONT,
+    color=0x0000ff,
+    scale=3, x=24, y=13,
+    text="B")
+G = adafruit_display_text.label.Label(
+    terminalio.FONT,
+    color=0x00ff00,
+    scale=3, x=46, y=13,
+    text="G")
+
+# Put each line of text into a Group, then show that group.
+g = displayio.Group()
+g.append(R)
+g.append(B)
+g.append(G)
+display.show(g)
+display.auto_refresh = True
+
+bitmap_file = open("/rbg.bmp", "rb")
+# Setup the file as the bitmap data source
+bitmap = displayio.OnDiskBitmap(bitmap_file)
+# Create a TileGrid to hold the bitmap
+tile_grid = displayio.TileGrid(bitmap, pixel_shader=displayio.ColorConverter())
+print(dir(tile_grid))
+
+while True:
+    while g:
+        g.pop()
+
+    g.append(tile_grid)
+    for y in range(bitmap.height+32):
+        tile_grid.y = 32-y
+        time.sleep(0.05)
+
+    g.pop()
+
+    g.append(R)
+    time.sleep(1)
+    g.append(B)
+    time.sleep(1)
+    g.append(G)
+    time.sleep(1)