allwinner h618: fix get wrong chip number in venv

[hackapet/Adafruit_Blinka.git] / src / adafruit_blinka / microcontroller / allwinner / h618 / pin.py

diff --git a/src/adafruit_blinka/microcontroller/allwinner/h618/pin.py b/src/adafruit_blinka/microcontroller/allwinner/h618/pin.py
index cf7b4798dc40a74e3d62d481579196040cf237c5..fdbdcc631a1374a4db0b2548464331f11e15dc2a 100644 (file)
--- a/src/adafruit_blinka/microcontroller/allwinner/h618/pin.py
+++ b/src/adafruit_blinka/microcontroller/allwinner/h618/pin.py
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: MIT
 """Allwinner H618 Pin Names"""
 from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
+import re
 
 def find_gpiochip_number(target_label):
     try:
@@ -15,17 +16,17 @@ def find_gpiochip_number(target_label):
     gpiochip_number = None
     for line in lines:
         if target_label in line:
-            parts = line.split()
-            for part in parts:
-                if part.startswith('gpiochip'):
-                    gpiochip_number = part[len('gpiochip'):]
-                    break
-            break
+            match = re.search(r'gpiochip(\d+)', line)
+            if match:
+                gpiochip_number = match.group(1)
+                break
 
     return gpiochip_number
 
-__chip_num = 1
-__chip_num = gpiochip_number = find_gpiochip_number("300b000.pinctrl")
+if find_gpiochip_number("300b000.pinctrl"):
+    __chip_num = 1
+else:
+    __chip_num = 0
 
 PC0 = Pin((__chip_num, 64))
 SPI0_SCLK = PC0