Merge branch 'main' into pixel_shader_fix

# Conflicts:
#	Buckaroo_Plant_Care_Bot/buckaroo_plant_care_bot.py

Author: FoamyGuy

Baudot_TTY/baudot_tty_GUI.py

@@ -26,7 +26,7 @@
 
 
 clue.display.brightness = 1.0
-screen = displayio.Group(max_size=5)
+screen = displayio.Group()
 
 VFD_GREEN = 0x00FFD2
 VFD_BG = 0x000505
@@ -65,11 +65,13 @@
 
 messages_labels = {}  # dictionary of configured messages_labels
 
-message_group = displayio.Group(max_size=5, scale=1)
+message_group = displayio.Group(scale=1)
 
 for message_config in messages_config:
     (name, textline, color, x, y) = message_config  # unpack tuple into five var names
-    message_label = label.Label(terminalio.FONT, text=textline, color=color, max_glyphs=50)
+    message_label = label.Label(
+        terminalio.FONT, text=textline, color=color, max_glyphs=50
+    )
     message_label.x = x
     message_label.y = y
     messages_labels[name] = message_label

Baudot_TTY/baudot_tty_ble.py

@@ -19,7 +19,7 @@
 ble = BLERadio()
 uart_server = UARTService()
 advertisement = ProvideServicesAdvertisement(uart_server)
-ble._adapter.name = "TTY_MACHINE" # pylint: disable=protected-access
+ble._adapter.name = "TTY_MACHINE"  # pylint: disable=protected-access
 
 # constants for sine wave generation
 SIN_LENGTH = 100  # more is less choppy
@@ -148,7 +148,8 @@ def baudot_bit(pitch=bit_1, duration=0.022):  # spec says 20ms, but adjusted as
     # dac.stop()
 
 
-def baudot_carrier(duration=0.15):  # Carrier is transmitted 150 ms before first character is sent
+def baudot_carrier(duration=0.15):
+    # Carrier is transmitted 150 ms before first character is sent
     baudot_bit(carrier, duration)
     dac.stop()
 

Buckaroo_Plant_Care_Bot/buckaroo_plant_care_bot.py

@@ -15,23 +15,39 @@
 board.DISPLAY.brightness = 0.8
 clue.pixel.fill(0)  # turn off NeoPixel
 
-clue_display = displayio.Group(max_size=4)
+clue_display = displayio.Group()
 
 # draw the dry plant
 dry_plant_file = open("dry.bmp", "rb")
 dry_plant_bmp = displayio.OnDiskBitmap(dry_plant_file)
-dry_plant_sprite = displayio.TileGrid(dry_plant_bmp, pixel_shader=getattr(dry_plant_bmp, 'pixel_shader', displayio.ColorConverter()))
+# CircuitPython 6 & 7 compatible
+dry_plant_sprite = displayio.TileGrid(
+    dry_plant_bmp,
+    pixel_shader=getattr(dry_plant_bmp, "pixel_shader", displayio.ColorConverter()),
+)
+# CircuitPython 7 compatible
+# dry_plant_sprite = displayio.TileGrid(
+#     dry_plant_bmp, pixel_shader=dry_plant_bmp.pixel_shader
+# )
 clue_display.append(dry_plant_sprite)
 
 # draw the happy plant on top (so it can be moved out of the way when needed)
 happy_plant_file = open("happy.bmp", "rb")
 happy_plant_bmp = displayio.OnDiskBitmap(happy_plant_file)
-happy_plant_sprite = displayio.TileGrid(happy_plant_bmp, pixel_shader=getattr(happy_plant_bmp, 'pixel_shader', displayio.ColorConverter()))
+# CircuitPython 6 & 7 compatible
+happy_plant_sprite = displayio.TileGrid(
+    happy_plant_bmp,
+    pixel_shader=getattr(happy_plant_bmp, "pixel_shader", displayio.ColorConverter()),
+)
+# CircuitPython 7 compatible
+# happy_plant_sprite = displayio.TileGrid(
+#     happy_plant_bmp, pixel_shader=happy_plant_bmp.pixel_shader
+# )
 clue_display.append(happy_plant_sprite)
 
 # Create text
 # first create the group
-text_group = displayio.Group(max_size=3, scale=3)
+text_group = displayio.Group(scale=3)
 # Make a label
 title_label = label.Label(terminalio.FONT, text="CLUE Plant", color=0x00FF22)
 # Position the label
@@ -45,7 +61,9 @@
 soil_label.y = 64
 text_group.append(soil_label)
 
-motor_label = label.Label(terminalio.FONT, text="Motor off", color=0xFF0000, max_glyphs=9)
+motor_label = label.Label(
+    terminalio.FONT, text="Motor off", color=0xFF0000, max_glyphs=9
+)
 motor_label.x = 4
 motor_label.y = 74
 text_group.append(motor_label)
@@ -62,13 +80,15 @@
 sense_pin = board.P1
 analog = AnalogIn(board.P1)
 
+
 def read_and_average(ain, times, wait):
     asum = 0
     for _ in range(times):
         asum += ain.value
         time.sleep(wait)
     return asum / times
 
+
 time.sleep(5)
 
 while True:
@@ -86,7 +106,7 @@ def read_and_average(ain, times, wait):
         motor.value = True
         motor_label.text = "Motor ON"
         motor_label.color = 0x00FF00
-        buzzer.duty_cycle = 2**15
+        buzzer.duty_cycle = 2 ** 15
         time.sleep(0.5)
 
     # always turn off quickly

CircuitPython_Display_Text/background_color_example.py

@@ -13,7 +13,7 @@
 display = board.DISPLAY
 
 # Make the display context
-main_group = displayio.Group(max_size=10)
+main_group = displayio.Group()
 display.show(main_group)
 
 reg_label = label.Label(

CircuitPython_Display_Text/background_tight_example.py

@@ -14,7 +14,7 @@
 display = board.DISPLAY
 
 # Make the display context
-main_group = displayio.Group(max_size=10)
+main_group = displayio.Group()
 display.show(main_group)
 
 font = bitmap_font.load_font("fonts/Fayette-HandwrittenScript-48.bdf")

CircuitPython_Display_Text/base_alignment_test.py

@@ -14,7 +14,7 @@
 display = board.DISPLAY
 
 # Make the display context
-main_group = displayio.Group(max_size=10)
+main_group = displayio.Group()
 display.show(main_group)
 
 

CircuitPython_Display_Text/color_example.py

@@ -13,7 +13,7 @@
 display = board.DISPLAY
 
 # Make the display context
-main_group = displayio.Group(max_size=10)
+main_group = displayio.Group()
 display.show(main_group)
 
 reg_label = label.Label(

CircuitPython_Display_Text/colormask_example.py

@@ -34,7 +34,7 @@ def wheel(pos):
 bg_palette[0] = 0xDDDD00
 
 # Make the display context
-main_group = displayio.Group(max_size=10)
+main_group = displayio.Group()
 display.show(main_group)
 
 font = bitmap_font.load_font("fonts/LeagueSpartan-Bold-16.bdf")

CircuitPython_Display_Text/display_text_anchored_position.py

@@ -14,7 +14,7 @@
 display = board.DISPLAY
 
 # Make the display context
-main_group = displayio.Group(max_size=10)
+main_group = displayio.Group()
 display.show(main_group)
 DISPLAY_WIDTH = 320
 DISPLAY_HEIGHT = 240
@@ -64,7 +64,7 @@
 text_area_bottom_right.anchor_point = (1.0, 1.0)
 text_area_bottom_right.anchored_position = (DISPLAY_WIDTH - 8, DISPLAY_HEIGHT - 8)
 
-text_group = displayio.Group(max_size=9)
+text_group = displayio.Group()
 text_group.append(text_area_top_middle)
 text_group.append(text_area_top_left)
 text_group.append(text_area_top_right)

CircuitPython_Display_Text/font_example.py

@@ -15,7 +15,7 @@
 display = board.DISPLAY
 
 # Make the display context
-main_group = displayio.Group(max_size=10)
+main_group = displayio.Group()
 display.show(main_group)
 
 font = bitmap_font.load_font("fonts/LeagueSpartan-Bold-16.bdf")

CircuitPython_Display_Text/line_spacing_example.py

@@ -13,7 +13,7 @@
 display = board.DISPLAY
 
 # Make the display context
-main_group = displayio.Group(max_size=10)
+main_group = displayio.Group()
 display.show(main_group)
 
 # font = bitmap_font.load_font("Fayette-HandwrittenScript-48.bdf")

CircuitPython_Display_Text/padding_example.py

@@ -13,7 +13,7 @@
 display = board.DISPLAY
 
 # Make the display context
-main_group = displayio.Group(max_size=10)
+main_group = displayio.Group()
 display.show(main_group)
 
 # font = bitmap_font.load_font("Fayette-HandwrittenScript-48.bdf")

CircuitPython_Display_Text/scale_example.py

@@ -14,7 +14,7 @@
 display = board.DISPLAY
 
 # Make the display context
-main_group = displayio.Group(max_size=10)
+main_group = displayio.Group()
 display.show(main_group)
 
 font = terminalio.FONT

CircuitPython_Flying_Toasters/code.py

@@ -11,8 +11,6 @@
 Licensed under the MIT license.
 
 All text above must be included in any redistribution.
-
-Requires CircuitPython 5.0 or later.
 """
 
 import time
@@ -37,42 +35,38 @@
 
 FIRST_CELL = CELL_1
 LAST_CELL = CELL_4
-
 NUMBER_OF_CELLS = (LAST_CELL - FIRST_CELL) + 1
 
 # A boolean array corresponding to the sprites, True if it's part of the animation sequence.
-ANIMATED = [_sprite >= FIRST_CELL and _sprite <= LAST_CELL for _sprite in range(NUMBER_OF_SPRITES)]
-
+ANIMATED = [FIRST_CELL <= _sprite <= LAST_CELL for _sprite in range(NUMBER_OF_SPRITES)]
 
 # The chance (out of 10) that toast will enter
 CHANCE_OF_NEW_TOAST = 2
 
-# How many sprites to styart with
+# How many sprites to start with
 INITIAL_NUMBER_OF_SPRITES = 4
 
-# Global variables
-display = None
-tilegrid = None
-
 seed(int(time.monotonic()))
 
+
 def make_display():
     """Set up the display support.
     Return the Display object.
     """
     spi = board.SPI()
     while not spi.try_lock():
         pass
-    spi.configure(baudrate=24000000) # Configure SPI for 24MHz
+    spi.configure(baudrate=24000000)  # Configure SPI for 24MHz
     spi.unlock()
     displayio.release_displays()
     display_bus = displayio.FourWire(spi, command=board.D7, chip_select=board.D10, reset=board.D9)
 
     return ST7789(display_bus, width=240, height=240, rowstart=80, auto_refresh=True)
 
+
 def make_tilegrid():
     """Construct and return the tilegrid."""
-    group = displayio.Group(max_size=10)
+    group = displayio.Group()
 
     sprite_sheet, palette = adafruit_imageload.load("/spritesheet-2x.bmp",
                                                     bitmap=displayio.Bitmap,
@@ -86,16 +80,19 @@ def make_tilegrid():
     display.show(group)
     return grid
 
+
 def random_cell():
     return randint(FIRST_CELL, LAST_CELL)
 
+
 def evaluate_position(row, col):
-    """Return whether how long of aa toaster is placable at the given location.
+    """Return whether how long of a toaster is placeable at the given location.
     :param row: the tile row (0-9)
     :param col: the tile column (0-9)
     """
     return tilegrid[col, row] == EMPTY
 
+
 def seed_toasters(number_of_toasters):
     """Create the initial toasters so it doesn't start empty"""
     for _ in range(number_of_toasters):
@@ -106,21 +103,25 @@ def seed_toasters(number_of_toasters):
                 break
         tilegrid[col, row] = random_cell()
 
+
 def next_sprite(sprite):
     if ANIMATED[sprite]:
         return (((sprite - FIRST_CELL) + 1) % NUMBER_OF_CELLS) + FIRST_CELL
     return sprite
 
+
 def advance_animation():
     """Cycle through animation cells each time."""
     for tile_number in range(25):
         tilegrid[tile_number] = next_sprite(tilegrid[tile_number])
 
+
 def slide_tiles():
     """Move the tilegrid one pixel to the bottom-left."""
     tilegrid.x -= 1
     tilegrid.y += 1
 
+
 def shift_tiles():
     """Move tiles one spot to the left, and reset the tilegrid's position"""
     for row in range(4, 0, -1):
@@ -132,20 +133,23 @@ def shift_tiles():
     tilegrid.x = 0
     tilegrid.y = -64
 
+
 def get_entry_row():
     while True:
         row = randint(0, 4)
         if tilegrid[4, row] == EMPTY and tilegrid[3, row] == EMPTY:
             return row
 
+
 def get_entry_column():
     while True:
         col = randint(0, 3)
         if tilegrid[col, 0] == EMPTY and tilegrid[col, 1] == EMPTY:
             return col
 
+
 def add_toaster_or_toast():
-    """Maybe add a new toaster or toast on the right and/or top at a randon open location"""
+    """Maybe add a new toaster or toast on the right and/or top at a random open location"""
     if randint(1, 10) <= CHANCE_OF_NEW_TOAST:
         tile = TOAST
     else:
@@ -158,6 +162,7 @@ def add_toaster_or_toast():
         tile = random_cell()
     tilegrid[get_entry_column(), 0] = tile
 
+
 display = make_display()
 tilegrid = make_tilegrid()
 seed_toasters(INITIAL_NUMBER_OF_SPRITES)