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")