Add _pin to arguments that don't break compatibility

Author: makermelissa

adafruit_featherwing/tft_featherwing.py

@@ -52,31 +52,31 @@ def __init__(
         self,
         spi: Optional[SPI] = None,
         i2c: Optional[I2C] = None,
-        cs: Optional[Pin] = None,  # pylint: disable=invalid-name
-        dc: Optional[Pin] = None,  # pylint: disable=invalid-name
-        ts_cs: Optional[Pin] = None,
-        sd_cs: Optional[Pin] = None,
-        irq: Optional[Pin] = None,
+        cs_pin: Optional[Pin] = None,
+        dc_pin: Optional[Pin] = None,
+        ts_cs_pin: Optional[Pin] = None,
+        sd_cs_pin: Optional[Pin] = None,
+        irq_pin: Optional[Pin] = None,
         resistive: Optional[bool] = True,
     ):
         # Initialize Display Bus
         displayio.release_displays()
         if spi is None:
             spi = board.SPI()
-        if cs is None:
-            cs = board.D9
-        if dc is None:
-            dc = board.D10
+        if cs_pin is None:
+            cs_pin = board.D9
+        if dc_pin is None:
+            dc_pin = board.D10
 
-        self._display_bus = displayio.FourWire(spi, command=dc, chip_select=cs)
+        self._display_bus = displayio.FourWire(spi, command=dc_pin, chip_select=cs_pin)
 
         # Initialize SD Card
-        if sd_cs is None:
-            sd_cs = board.D5
+        if sd_cs_pin is None:
+            sd_cs_pin = board.D5
 
         self._sdcard = None
         try:
-            self._sdcard = sdcardio.SDCard(spi, sd_cs)
+            self._sdcard = sdcardio.SDCard(spi, sd_cs_pin)
             vfs = storage.VfsFat(self._sdcard)
             storage.mount(vfs, "/sd")
         except OSError as error:
@@ -86,9 +86,9 @@ def __init__(
         self.touchscreen = None
         if resistive:
             if i2c is None:  # STMPE610
-                if ts_cs is None:
-                    ts_cs = board.D6
-                ts_cs = digitalio.DigitalInOut(ts_cs)
+                if ts_cs_pin is None:
+                    ts_cs_pin = board.D6
+                ts_cs = digitalio.DigitalInOut(ts_cs_pin)
                 try:
                     # the screen might not be ready from cold boot
                     time.sleep(0.8)
@@ -98,11 +98,11 @@ def __init__(
                     time.sleep(1.0)
                     self.touchscreen = Adafruit_STMPE610_SPI(spi, ts_cs)
             else:  # TSC2007
-                if irq is None:
-                    irq = board.D6
-                irq = digitalio.DigitalInOut(irq)
+                if irq_pin is None:
+                    irq_pin = board.D6
+                irq = digitalio.DigitalInOut(irq_pin)
                 self.touchscreen = TSC2007(i2c, irq=irq)
         else:  # FocalTouch
-            if irq is None:
-                irq = board.D6
-            self.touchscreen = Adafruit_FocalTouch(i2c, irq_pin=irq)
+            if irq_pin is None:
+                irq_pin = board.D6
+            self.touchscreen = Adafruit_FocalTouch(i2c, irq_pin=irq_pin)

adafruit_featherwing/tft_featherwing_24.py

@@ -46,7 +46,9 @@ def __init__(
         ts_cs: Optional[Pin] = None,
         sd_cs: Optional[Pin] = None,
     ):
-        super().__init__(spi, cs=cs, dc=dc, ts_cs=ts_cs, sd_cs=sd_cs, resistive=True)
+        super().__init__(
+            spi, cs_pin=cs, dc_pin=dc, ts_cs_pin=ts_cs, sd_cs_pin=sd_cs, resistive=True
+        )
         self.display = adafruit_ili9341.ILI9341(
             self._display_bus, width=320, height=240
         )
@@ -63,14 +65,21 @@ class TFTFeatherWing24V2(TFTFeatherWing):
     def __init__(
         self,
         spi: Optional[SPI] = None,
-        cs: Optional[Pin] = None,
-        dc: Optional[Pin] = None,
-        sd_cs: Optional[Pin] = None,
+        cs_pin: Optional[Pin] = None,
+        dc_pin: Optional[Pin] = None,
+        sd_cs_pin: Optional[Pin] = None,
         i2c: Optional[I2C] = None,
     ):
         if i2c is None:
             i2c = board.I2C()
-        super().__init__(spi, cs=cs, dc=dc, sd_cs=sd_cs, i2c=i2c, resistive=True)
+        super().__init__(
+            spi,
+            cs_pin=cs_pin,
+            dc_pin=dc_pin,
+            sd_cs_pin=sd_cs_pin,
+            i2c=i2c,
+            resistive=True,
+        )
         self.display = adafruit_ili9341.ILI9341(
             self._display_bus, width=320, height=240
         )

adafruit_featherwing/tft_featherwing_35.py

@@ -46,7 +46,9 @@ def __init__(
         ts_cs: Optional[Pin] = None,
         sd_cs: Optional[Pin] = None,
     ):
-        super().__init__(spi, cs=cs, dc=dc, ts_cs=ts_cs, sd_cs=sd_cs, resistive=True)
+        super().__init__(
+            spi, cs_pin=cs, dc_pin=dc, ts_cs_pin=ts_cs, sd_cs_pin=sd_cs, resistive=True
+        )
         self.display = HX8357(self._display_bus, width=480, height=320)
         """Display object for the FeatherWing's screen."""
 
@@ -61,13 +63,20 @@ class TFTFeatherWing35V2(TFTFeatherWing):
     def __init__(
         self,
         spi: Optional[SPI] = None,
-        cs: Optional[Pin] = None,
-        dc: Optional[Pin] = None,
-        sd_cs: Optional[Pin] = None,
+        cs_pin: Optional[Pin] = None,
+        dc_pin: Optional[Pin] = None,
+        sd_cs_pin: Optional[Pin] = None,
         i2c: Optional[I2C] = None,
     ):
         if i2c is None:
             i2c = board.I2C()
-        super().__init__(spi, cs=cs, dc=dc, sd_cs=sd_cs, i2c=i2c, resistive=True)
+        super().__init__(
+            spi,
+            cs_pin=cs_pin,
+            dc_pin=dc_pin,
+            sd_cs_pin=sd_cs_pin,
+            i2c=i2c,
+            resistive=True,
+        )
         self.display = HX8357(self._display_bus, width=480, height=320)
         """Display object for the FeatherWing's screen."""