Standardise on GPIOn pin labels.

As of raspberrypi/linux@bd9542b all downstream GPIO line names use the form GPIOn, and PIN_n is deprecated. Simplify code and examples to reflect this.
pimoroni · Apr 17, 2024 · efb9168 · efb9168
1 parent 97c824a
commit efb9168
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 28 deletions.
diff --git a/enviroplus/gas.py b/enviroplus/gas.py
@@ -11,11 +11,7 @@
 MICS6814_GAIN = 6.144
 
 OUTH = gpiod.LineSettings(direction=Direction.OUTPUT, output_value=Value.ACTIVE)
-PLATFORMS = {
-    "Radxa ROCK 5B": {"heater": ("PIN_18", OUTH)},
-    "Raspberry Pi 5": {"heater": ("PIN18", OUTH)},
-    "Raspberry Pi 4": {"heater": ("GPIO24", OUTH)}
-}
+
 
 ads1015.I2C_ADDRESS_DEFAULT = ads1015.I2C_ADDRESS_ALTERNATE
 _is_setup = False
@@ -68,7 +64,7 @@ def setup():
     else:
         adc.set_sample_rate(1600)
 
-    _heater = gpiodevice.get_pins_for_platform(PLATFORMS)[0]
+    _heater = gpiodevice.get_pin("GPIO24")
 
     atexit.register(cleanup)
 

diff --git a/examples/all-in-one-enviro-mini.py b/examples/all-in-one-enviro-mini.py
@@ -37,8 +37,8 @@
 st7735 = st7735.ST7735(
     port=0,
     cs=1,
-    dc="PIN21",         # "GPIO9" on a Raspberry Pi 4
-    backlight="PIN32",  # "GPIO12" on a Raspberry Pi 4
+    dc="GPIO9",
+    backlight="GPIO12",
     rotation=270,
     spi_speed_hz=10000000
 )

diff --git a/examples/all-in-one-no-pm.py b/examples/all-in-one-no-pm.py
@@ -38,8 +38,8 @@
 st7735 = st7735.ST7735(
     port=0,
     cs=1,
-    dc="PIN21",         # "GPIO9" on a Raspberry Pi 4
-    backlight="PIN32",  # "GPIO12" on a Raspberry Pi 4
+    dc="GPIO9",
+    backlight="GPIO12",
     rotation=270,
     spi_speed_hz=10000000
 )

diff --git a/examples/all-in-one.py b/examples/all-in-one.py
@@ -44,8 +44,8 @@
 st7735 = st7735.ST7735(
     port=0,
     cs=1,
-    dc="PIN21",         # "GPIO9" on a Raspberry Pi 4
-    backlight="PIN32",  # "GPIO12" on a Raspberry Pi 4
+    dc="GPIO9",
+    backlight="GPIO12",
     rotation=270,
     spi_speed_hz=10000000
 )

diff --git a/examples/combined.py b/examples/combined.py
@@ -47,8 +47,8 @@
 st7735 = st7735.ST7735(
     port=0,
     cs=1,
-    dc="PIN21",         # "GPIO9" on a Raspberry Pi 4
-    backlight="PIN32",  # "GPIO12" on a Raspberry Pi 4
+    dc="GPIO9",
+    backlight="GPIO12",
     rotation=270,
     spi_speed_hz=10000000
 )

diff --git a/examples/lcd.py b/examples/lcd.py
@@ -21,8 +21,8 @@
 disp = st7735.ST7735(
     port=0,
     cs=1,
-    dc="PIN21",         # "GPIO9" on a Raspberry Pi 4
-    backlight="PIN32",  # "GPIO12" on a Raspberry Pi 4
+    dc="GPIO9",
+    backlight="GPIO12",
     rotation=270,
     spi_speed_hz=10000000
 )

diff --git a/examples/mqtt-all.py b/examples/mqtt-all.py
@@ -234,8 +234,8 @@ def main():
     disp = st7735.ST7735(
         port=0,
         cs=1,
-        dc="PIN21",         # "GPIO9" on a Raspberry Pi 4
-        backlight="PIN32",  # "GPIO12" on a Raspberry Pi 4
+        dc="GPIO9",
+        backlight="GPIO12",
         rotation=270,
         spi_speed_hz=10000000
     )

diff --git a/examples/noise-amps-at-freqs.py b/examples/noise-amps-at-freqs.py
@@ -18,8 +18,8 @@
 disp = st7735.ST7735(
     port=0,
     cs=1,
-    dc="PIN21",         # "GPIO9" on a Raspberry Pi 4
-    backlight="PIN32",  # "GPIO12" on a Raspberry Pi 4
+    dc="GPIO9",
+    backlight="GPIO12",
     rotation=270,
     spi_speed_hz=10000000
 )

diff --git a/examples/noise-profile.py b/examples/noise-profile.py
@@ -16,8 +16,8 @@
 disp = st7735.ST7735(
     port=0,
     cs=1,
-    dc="PIN21",         # "GPIO9" on a Raspberry Pi 4
-    backlight="PIN32",  # "GPIO12" on a Raspberry Pi 4
+    dc="GPIO9",
+    backlight="GPIO12",
     rotation=270,
     spi_speed_hz=10000000
 )

diff --git a/examples/sensorcommunity.py b/examples/sensorcommunity.py
@@ -40,8 +40,8 @@
 disp = st7735.ST7735(
     port=0,
     cs=1,
-    dc="PIN21",         # "GPIO9" on a Raspberry Pi 4
-    backlight="PIN32",  # "GPIO12" on a Raspberry Pi 4
+    dc="GPIO9",
+    backlight="GPIO12",
     rotation=270,
     spi_speed_hz=10000000
 )

diff --git a/examples/sensorcommunity_combined.py b/examples/sensorcommunity_combined.py
@@ -153,8 +153,8 @@ def check_wifi():
 st7735 = st7735.ST7735(
     port=0,
     cs=1,
-    dc="PIN21",         # "GPIO9" on a Raspberry Pi 4
-    backlight="PIN32",  # "GPIO12" on a Raspberry Pi 4
+    dc="GPIO9",
+    backlight="GPIO12",
     rotation=270,
     spi_speed_hz=10000000
 )

diff --git a/examples/weather-and-light.py b/examples/weather-and-light.py
@@ -291,8 +291,8 @@ def describe_light(light):
 disp = st7735.ST7735(
     port=0,
     cs=1,
-    dc="PIN21",         # "GPIO9" on a Raspberry Pi 4
-    backlight="PIN32",  # "GPIO12" on a Raspberry Pi 4
+    dc="GPIO9",
+    backlight="GPIO12",
     rotation=270,
     spi_speed_hz=10000000
 )

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -45,6 +45,7 @@ def gpiod():
 def gpiodevice():
     gpiodevice = mock.Mock()
     gpiodevice.get_pins_for_platform.return_value = [(mock.Mock(), 0)]
+    gpiodevice.get_pin.return_value = [(mock.Mock(), 0)]
 
     sys.modules["gpiodevice"] = gpiodevice
     yield gpiodevice