From e7a943ad4f0c3f17139b02d9eee42f160bbfa5bc Mon Sep 17 00:00:00 2001 From: James Carr Date: Sun, 4 Jul 2021 12:31:09 +0100 Subject: [PATCH 1/2] Include all examples in docs --- docs/examples.rst | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/docs/examples.rst b/docs/examples.rst index f9a2c15..70b2e6a 100644 --- a/docs/examples.rst +++ b/docs/examples.rst @@ -6,3 +6,62 @@ Ensure your device works with this simple test. .. literalinclude:: ../examples/st7789_simpletest.py :caption: examples/st7789_simpletest.py :linenos: + +240x135 +======= + +.. literalinclude:: ../examples/st7789_240x135_simpletest.py + :caption: examples/st7789_240x135_simpletest.py + :linenos: + +320x240 +======= + +.. literalinclude:: ../examples/st7789_320x240_simpletest.py + :caption: examples/st7789_320x240_simpletest.py + :linenos: + +Product specific examples +------------------------- + +1.14" Mini PiTFT +================ + +.. literalinclude:: ../examples/st7789_240x135_pitft_simpletest.py + :caption: examples/st7789_240x135_pitft_simpletest.py + :linenos: + +1.3" TFT Bonnet +=============== + +.. literalinclude:: ../examples/st7789_240x240_bonnet_simpletest.py + :caption: examples/st7789_240x240_bonnet_simpletest.py + :linenos: + +1.3" PiTFT +========== + +.. literalinclude:: ../examples/st7789_240x240_pitft_simpletest.py + :caption: examples/st7789_240x240_pitft_simpletest.py + :linenos: + +Gizmo +===== + +.. literalinclude:: ../examples/st7789_tft_gizmo_simpletest.py + :caption: examples/st7789_tft_gizmo_simpletest.py + :linenos: + +Pimoroni Pico Display Pack +========================== + +.. literalinclude:: ../examples/st7789_240x135_simpletest_Pimoroni_Pico_Display_Pack.py + :caption: examples/st7789_240x135_simpletest_Pimoroni_Pico_Display_Pack.py + :linenos: + +Pimoroni Pico Explorer +====================== + +.. literalinclude:: ../examples/st7789_240x240_simpletest_Pimoroni_Pico_Explorer.py + :caption: examples/st7789_240x240_simpletest_Pimoroni_Pico_Explorer.py + :linenos: From 92e20ac0c366618cdee5677aa8e9955624191045 Mon Sep 17 00:00:00 2001 From: James Carr Date: Sun, 4 Jul 2021 12:31:48 +0100 Subject: [PATCH 2/2] Remove max_size parameter --- README.rst | 2 +- examples/st7789_240x135_pitft_simpletest.py | 3 +-- examples/st7789_240x135_simpletest.py | 3 +-- .../st7789_240x135_simpletest_Pimoroni_Pico_Display_Pack.py | 3 +-- examples/st7789_240x240_bonnet_simpletest.py | 4 ++-- examples/st7789_240x240_pitft_simpletest.py | 4 ++-- examples/st7789_240x240_simpletest_Pimoroni_Pico_Explorer.py | 4 ++-- examples/st7789_320x240_simpletest.py | 4 ++-- examples/st7789_simpletest.py | 4 ++-- examples/st7789_tft_gizmo_simpletest.py | 4 ++-- 10 files changed, 16 insertions(+), 19 deletions(-) diff --git a/README.rst b/README.rst index 259554e..b16c3fd 100644 --- a/README.rst +++ b/README.rst @@ -48,7 +48,7 @@ Usage Example display = ST7789(display_bus, width=240, height=240, rowstart=80) # Make the display context - splash = displayio.Group(max_size=10) + splash = displayio.Group() display.show(splash) color_bitmap = displayio.Bitmap(240, 240, 1) diff --git a/examples/st7789_240x135_pitft_simpletest.py b/examples/st7789_240x135_pitft_simpletest.py index 3258799..5f2db09 100644 --- a/examples/st7789_240x135_pitft_simpletest.py +++ b/examples/st7789_240x135_pitft_simpletest.py @@ -33,7 +33,7 @@ ) # Make the display context -splash = displayio.Group(max_size=10) +splash = displayio.Group() display.show(splash) color_bitmap = displayio.Bitmap(display.width, display.height, 1) @@ -59,7 +59,6 @@ text_area = label.Label(terminalio.FONT, text=text, color=TEXT_COLOR) text_width = text_area.bounding_box[2] * FONTSCALE text_group = displayio.Group( - max_size=10, scale=FONTSCALE, x=display.width // 2 - text_width // 2, y=display.height // 2, diff --git a/examples/st7789_240x135_simpletest.py b/examples/st7789_240x135_simpletest.py index d6b52df..7d878ab 100644 --- a/examples/st7789_240x135_simpletest.py +++ b/examples/st7789_240x135_simpletest.py @@ -31,7 +31,7 @@ ) # Make the display context -splash = displayio.Group(max_size=10) +splash = displayio.Group() display.show(splash) color_bitmap = displayio.Bitmap(display.width, display.height, 1) @@ -57,7 +57,6 @@ text_area = label.Label(terminalio.FONT, text=text, color=TEXT_COLOR) text_width = text_area.bounding_box[2] * FONTSCALE text_group = displayio.Group( - max_size=10, scale=FONTSCALE, x=display.width // 2 - text_width // 2, y=display.height // 2, diff --git a/examples/st7789_240x135_simpletest_Pimoroni_Pico_Display_Pack.py b/examples/st7789_240x135_simpletest_Pimoroni_Pico_Display_Pack.py index a57babd..09f7505 100644 --- a/examples/st7789_240x135_simpletest_Pimoroni_Pico_Display_Pack.py +++ b/examples/st7789_240x135_simpletest_Pimoroni_Pico_Display_Pack.py @@ -30,7 +30,7 @@ ) # Make the display context -splash = displayio.Group(max_size=10) +splash = displayio.Group() display.show(splash) color_bitmap = displayio.Bitmap(display.width, display.height, 1) @@ -56,7 +56,6 @@ text_area = label.Label(terminalio.FONT, text=text, color=TEXT_COLOR) text_width = text_area.bounding_box[2] * FONTSCALE text_group = displayio.Group( - max_size=10, scale=FONTSCALE, x=display.width // 2 - text_width // 2, y=display.height // 2, diff --git a/examples/st7789_240x240_bonnet_simpletest.py b/examples/st7789_240x240_bonnet_simpletest.py index 5101272..d208ca8 100644 --- a/examples/st7789_240x240_bonnet_simpletest.py +++ b/examples/st7789_240x240_bonnet_simpletest.py @@ -33,7 +33,7 @@ ) # Make the display context -splash = displayio.Group(max_size=10) +splash = displayio.Group() display.show(splash) color_bitmap = displayio.Bitmap(240, 240, 1) @@ -51,7 +51,7 @@ splash.append(inner_sprite) # Draw a label -text_group = displayio.Group(max_size=10, scale=2, x=50, y=120) +text_group = displayio.Group(scale=2, x=50, y=120) text = "Hello World!" text_area = label.Label(terminalio.FONT, text=text, color=0xFFFF00) text_group.append(text_area) # Subgroup for text scaling diff --git a/examples/st7789_240x240_pitft_simpletest.py b/examples/st7789_240x240_pitft_simpletest.py index e666c41..7df1753 100644 --- a/examples/st7789_240x240_pitft_simpletest.py +++ b/examples/st7789_240x240_pitft_simpletest.py @@ -25,7 +25,7 @@ display = ST7789(display_bus, width=240, height=240, rowstart=80, rotation=180) # Make the display context -splash = displayio.Group(max_size=10) +splash = displayio.Group() display.show(splash) color_bitmap = displayio.Bitmap(240, 240, 1) @@ -43,7 +43,7 @@ splash.append(inner_sprite) # Draw a label -text_group = displayio.Group(max_size=10, scale=2, x=50, y=120) +text_group = displayio.Group(scale=2, x=50, y=120) text = "Hello World!" text_area = label.Label(terminalio.FONT, text=text, color=0xFFFF00) text_group.append(text_area) # Subgroup for text scaling diff --git a/examples/st7789_240x240_simpletest_Pimoroni_Pico_Explorer.py b/examples/st7789_240x240_simpletest_Pimoroni_Pico_Explorer.py index bca0a53..67b0adf 100644 --- a/examples/st7789_240x240_simpletest_Pimoroni_Pico_Explorer.py +++ b/examples/st7789_240x240_simpletest_Pimoroni_Pico_Explorer.py @@ -26,7 +26,7 @@ display = ST7789(display_bus, width=240, height=240, rowstart=80, rotation=180) # Make the display context -splash = displayio.Group(max_size=10) +splash = displayio.Group() display.show(splash) color_bitmap = displayio.Bitmap(240, 240, 1) @@ -44,7 +44,7 @@ splash.append(inner_sprite) # Draw a label -text_group = displayio.Group(max_size=10, scale=2, x=50, y=120) +text_group = displayio.Group(scale=2, x=50, y=120) text = "Hello World!" text_area = label.Label(terminalio.FONT, text=text, color=0xFFFF00) text_group.append(text_area) # Subgroup for text scaling diff --git a/examples/st7789_320x240_simpletest.py b/examples/st7789_320x240_simpletest.py index bf1e81d..3fac5aa 100644 --- a/examples/st7789_320x240_simpletest.py +++ b/examples/st7789_320x240_simpletest.py @@ -25,7 +25,7 @@ display = ST7789(display_bus, width=320, height=240, rotation=90) # Make the display context -splash = displayio.Group(max_size=10) +splash = displayio.Group() display.show(splash) color_bitmap = displayio.Bitmap(320, 240, 1) @@ -43,7 +43,7 @@ splash.append(inner_sprite) # Draw a label -text_group = displayio.Group(max_size=10, scale=3, x=57, y=120) +text_group = displayio.Group(scale=3, x=57, y=120) text = "Hello World!" text_area = label.Label(terminalio.FONT, text=text, color=0xFFFF00) text_group.append(text_area) # Subgroup for text scaling diff --git a/examples/st7789_simpletest.py b/examples/st7789_simpletest.py index b1a4672..990630e 100644 --- a/examples/st7789_simpletest.py +++ b/examples/st7789_simpletest.py @@ -25,7 +25,7 @@ display = ST7789(display_bus, width=240, height=240, rowstart=80) # Make the display context -splash = displayio.Group(max_size=10) +splash = displayio.Group() display.show(splash) color_bitmap = displayio.Bitmap(240, 240, 1) @@ -43,7 +43,7 @@ splash.append(inner_sprite) # Draw a label -text_group = displayio.Group(max_size=10, scale=2, x=50, y=120) +text_group = displayio.Group(scale=2, x=50, y=120) text = "Hello World!" text_area = label.Label(terminalio.FONT, text=text, color=0xFFFF00) text_group.append(text_area) # Subgroup for text scaling diff --git a/examples/st7789_tft_gizmo_simpletest.py b/examples/st7789_tft_gizmo_simpletest.py index 3892684..0869521 100644 --- a/examples/st7789_tft_gizmo_simpletest.py +++ b/examples/st7789_tft_gizmo_simpletest.py @@ -32,7 +32,7 @@ ) # Make the display context -splash = displayio.Group(max_size=10) +splash = displayio.Group() display.show(splash) color_bitmap = displayio.Bitmap(240, 240, 1) @@ -50,7 +50,7 @@ splash.append(inner_sprite) # Draw a label -text_group = displayio.Group(max_size=10, scale=2, x=50, y=120) +text_group = displayio.Group(scale=2, x=50, y=120) text = "Hello World!" text_area = label.Label(terminalio.FONT, text=text, color=0xFFFF00) text_group.append(text_area) # Subgroup for text scaling