Merge pull request #35 from pimoroni/feature/floyd-made-me-do-it

Various fixes & improvements

examples/framerate.py

@@ -57,7 +57,8 @@
     port=0,
     cs=st7789.BG_SPI_CS_FRONT,  # BG_SPI_CS_BACK or BG_SPI_CS_FRONT
     dc=9,
-    backlight=backlight,  # 18 for back BG slot, 19 for front BG slot.
+    backlight=19,  # Breakout Garden: 18 for back slot, 19 for front slot.
+                   # NOTE: Change this to 13 for Pirate Audio boards
     spi_speed_hz=SPI_SPEED_MHZ * 1000000,
     offset_left=offset_left,
     offset_top=offset_top,

examples/gif.py

@@ -48,7 +48,8 @@
         port=0,
         cs=st7789.BG_SPI_CS_FRONT,  # BG_SPI_CS_BACK or BG_SPI_CS_FRONT
         dc=9,
-        backlight=19,  # 18 for back BG slot, 19 for front BG slot.
+        backlight=19,  # Breakout Garden: 18 for back slot, 19 for front slot.
+                       # NOTE: Change this to 13 for Pirate Audio boards
         spi_speed_hz=80 * 1000 * 1000,
         offset_left=0 if display_type == "square" else 40,
         offset_top=53 if display_type == "rect" else 0,

examples/image.py

@@ -44,7 +44,8 @@
         port=0,
         cs=st7789.BG_SPI_CS_FRONT,  # BG_SPI_CS_BACK or BG_SPI_CS_FRONT
         dc=9,
-        backlight=19,  # 18 for back BG slot, 19 for front BG slot.
+        backlight=19,  # Breakout Garden: 18 for back slot, 19 for front slot.
+                       # NOTE: Change this to 13 for Pirate Audio boards
         spi_speed_hz=80 * 1000 * 1000,
         offset_left=0 if display_type == "square" else 40,
         offset_top=53 if display_type == "rect" else 0,

examples/round.py

@@ -35,7 +35,8 @@
     port=0,
     cs=st7789.BG_SPI_CS_FRONT,  # BG_SPI_CS_BACK or BG_SPI_CS_FRONT
     dc=9,
-    backlight=19,  # 18 for back BG slot, 19 for front BG slot.
+    backlight=19,  # Breakout Garden: 18 for back slot, 19 for front slot.
+                   # NOTE: Change this to 13 for Pirate Audio boards
     rotation=90,
     spi_speed_hz=80 * 1000 * 1000,
     offset_left=40,

examples/scrolling-text.py

@@ -46,7 +46,8 @@
         port=0,
         cs=st7789.BG_SPI_CS_FRONT,  # BG_SPI_CS_BACK or BG_SPI_CS_FRONT
         dc=9,
-        backlight=19,  # 18 for back BG slot, 19 for front BG slot.
+        backlight=19,  # Breakout Garden: 18 for back slot, 19 for front slot.
+                       # NOTE: Change this to 13 for Pirate Audio boards
         spi_speed_hz=80 * 1000 * 1000,
         offset_left=0 if display_type == "square" else 40,
         offset_top=53 if display_type == "rect" else 0,

examples/shapes.py

@@ -37,7 +37,8 @@
         port=0,
         cs=st7789.BG_SPI_CS_FRONT,  # BG_SPI_CS_BACK or BG_SPI_CS_FRONT
         dc=9,
-        backlight=19,  # 18 for back BG slot, 19 for front BG slot.
+        backlight=19,  # Breakout Garden: 18 for back slot, 19 for front slot.
+                       # NOTE: Change this to 13 for Pirate Audio boards
         spi_speed_hz=80 * 1000 * 1000,
         offset_left=0 if display_type == "square" else 40,
         offset_top=53 if display_type == "rect" else 0,

st7789/__init__.py

@@ -150,19 +150,26 @@ def __init__(
         self._offset_left = offset_left
         self._offset_top = offset_top
 
-        # Set DC as output.
-        self._dc = gpiodevice.get_pin(dc, "st7789-dc", OUTL)
+        # Set up DC pin if a lines/offset tuple is not supplied
+        if isinstance(dc, int):
+            self._dc = ST7789.get_dc_pin(dc)
 
         # Setup backlight as output (if provided).
         if backlight is not None:
-            self._bl = gpiodevice.get_pin(backlight, "st7789-bl", OUTL)
+            if isinstance(backlight, int):
+                self._bl = ST7789.get_bl_pin(backlight)
+            else:
+                self._bl = backlight
             self.set_pin(self._bl, False)
             time.sleep(0.1)
             self.set_pin(self._bl, True)
 
-        # Setup reset as output (if provided).
+        # Set up and call reset (if provided)
         if rst is not None:
-            self._rst = gpiodevice.get_pin(rst, "st7789-rst", OUTL)
+            # Set up RESET pin if a lines/offset tuple is not supplied
+            if isinstance(rst, int):
+                self._rst = ST7789.get_rst_pin(rst)
+            self.reset()
 
         self._init()
 
@@ -384,3 +391,15 @@ def image_to_data(self, image, rotation=0):
 
         # Output the raw bytes
         return result.byteswap().tobytes()
+
+    @staticmethod
+    def get_bl_pin(pin):
+        return gpiodevice.get_pin(pin, "st7789-bl", OUTL)
+
+    @staticmethod
+    def get_rst_pin(pin):
+        return gpiodevice.get_pin(pin, "st7789-rst", OUTL)
+
+    @staticmethod
+    def get_dc_pin(pin):
+        return gpiodevice.get_pin(pin, "st7789-dc", OUTL)