Merge pull request #751 from how2flow/odroid

[Adafruit_Blinka-hackapet.git] / src / adafruit_blinka / microcontroller / generic_linux / libgpiod_pin.py

diff --git a/src/adafruit_blinka/microcontroller/generic_linux/libgpiod_pin.py b/src/adafruit_blinka/microcontroller/generic_linux/libgpiod_pin.py
index 09f527e8511c4878da27708e8f27aee7f4ed46e3..b7953e14cb3706ca38414e43ce7456032de403b5 100644 (file)
--- a/src/adafruit_blinka/microcontroller/generic_linux/libgpiod_pin.py
+++ b/src/adafruit_blinka/microcontroller/generic_linux/libgpiod_pin.py
@@ -10,6 +10,8 @@ except ImportError:
         "https://github.com/adafruit/Raspberry-Pi-Installer-Scripts/blob/master/libgpiod.sh"
     ) from ImportError
 
         "https://github.com/adafruit/Raspberry-Pi-Installer-Scripts/blob/master/libgpiod.sh"
     ) from ImportError
 

+
+# pylint: disable=too-many-branches,too-many-statements

 class Pin:
     """Pins dont exist in CPython so...lets make our own!"""
 
 class Pin:
     """Pins dont exist in CPython so...lets make our own!"""
 


@@ -30,13 +32,13 @@ class Pin:
         self.id = pin_id
         if isinstance(pin_id, tuple):
             self._num = int(pin_id[1])
         self.id = pin_id
         if isinstance(pin_id, tuple):
             self._num = int(pin_id[1])

-            if hasattr(gpiod, 'Chip'):
+            if hasattr(gpiod, "Chip"):

                 self._chip = gpiod.Chip(str(pin_id[0]), gpiod.Chip.OPEN_BY_NUMBER)
             else:
                 self._chip = gpiod.chip(str(pin_id[0]), gpiod.chip.OPEN_BY_NUMBER)
         else:
             self._num = int(pin_id)
                 self._chip = gpiod.Chip(str(pin_id[0]), gpiod.Chip.OPEN_BY_NUMBER)
             else:
                 self._chip = gpiod.chip(str(pin_id[0]), gpiod.chip.OPEN_BY_NUMBER)
         else:
             self._num = int(pin_id)

-            if hasattr(gpiod, 'Chip'):
+            if hasattr(gpiod, "Chip"):

                 self._chip = gpiod.Chip("gpiochip0", gpiod.Chip.OPEN_BY_NAME)
             else:
                 self._chip = gpiod.chip("gpiochip0", gpiod.chip.OPEN_BY_NAME)
                 self._chip = gpiod.Chip("gpiochip0", gpiod.Chip.OPEN_BY_NAME)
             else:
                 self._chip = gpiod.chip("gpiochip0", gpiod.chip.OPEN_BY_NAME)


@@ -60,42 +62,39 @@ class Pin:
                 self._line.release()
                 if pull is not None:
                     if pull == self.PULL_UP:
                 self._line.release()
                 if pull is not None:
                     if pull == self.PULL_UP:

-                        if hasattr(gpiod, 'line') and hasattr(gpiod.line, 'BIAS_PULL_UP') :
-                            config = gpiod.line_request()
-                            config.consumer = self._CONSUMER
-                            config.request_type = gpiod.line.BIAS_PULL_UP
-                            self._line.request(config)
+                        if hasattr(gpiod, "LINE_REQ_FLAG_BIAS_PULL_UP"):
+                            flags |= gpiod.LINE_REQ_FLAG_BIAS_PULL_UP

                         else:
                         else:

-                            self._line.request(
-                                consumer=self._CONSUMER, type=gpiod.LINE_REQ_DIR_IN, flags=flags
-                            )

                             raise NotImplementedError(
                                 "Internal pullups not supported in this version of libgpiod, "
                                 "use physical resistor instead!"
                             )
                     elif pull == self.PULL_DOWN:
                             raise NotImplementedError(
                                 "Internal pullups not supported in this version of libgpiod, "
                                 "use physical resistor instead!"
                             )
                     elif pull == self.PULL_DOWN:

-                        if hasattr(gpiod, 'line') and hasattr(gpiod.line, 'BIAS_PULL_DOWN') :
-                            config = gpiod.line_request()
-                            config.consumer = self._CONSUMER
-                            config.request_type = gpiod.line.BIAS_PULL_DOWN
-                            self._line.request(config)                     
+                        if hasattr(gpiod, "line") and hasattr(
+                            gpiod, "LINE_REQ_FLAG_BIAS_PULL_DOWN"
+                        ):
+                            flags |= gpiod.LINE_REQ_FLAG_BIAS_PULL_DOWN

                         else:
                             raise NotImplementedError(
                                 "Internal pulldowns not supported in this version of libgpiod, "
                                 "use physical resistor instead!"
                             )
                     elif pull == self.PULL_NONE:
                         else:
                             raise NotImplementedError(
                                 "Internal pulldowns not supported in this version of libgpiod, "
                                 "use physical resistor instead!"
                             )
                     elif pull == self.PULL_NONE:

-                        if hasattr(gpiod, 'line') and hasattr(gpiod.line, 'BIAS_DISABLE') :
-                            config = gpiod.line_request()
-                            config.consumer = self._CONSUMER
-                            config.request_type = gpiod.line.BIAS_DISABLE
-                            self._line.request(config)
+                        if hasattr(gpiod, "line") and hasattr(
+                            gpiod, "LINE_REQ_FLAG_BIAS_DISABLE"
+                        ):
+                            flags |= gpiod.LINE_REQ_FLAG_BIAS_DISABLE
+                        else:
+                            raise NotImplementedError(
+                                "Internal pulldowns not supported in this version of libgpiod, "
+                                "use physical resistor instead!"
+                            )

                     else:
                         raise RuntimeError(f"Invalid pull for pin: {self.id}")
 
                 self._mode = self.IN
                 self._line.release()
                     else:
                         raise RuntimeError(f"Invalid pull for pin: {self.id}")
 
                 self._mode = self.IN
                 self._line.release()

-                if hasattr(gpiod, 'LINE_REQ_DIR_IN'):
+                if hasattr(gpiod, "LINE_REQ_DIR_IN"):

                     self._line.request(
                         consumer=self._CONSUMER, type=gpiod.LINE_REQ_DIR_IN, flags=flags
                     )
                     self._line.request(
                         consumer=self._CONSUMER, type=gpiod.LINE_REQ_DIR_IN, flags=flags
                     )


@@ -110,8 +109,10 @@ class Pin:
                     raise RuntimeError("Cannot set pull resistor on output")
                 self._mode = self.OUT
                 self._line.release()
                     raise RuntimeError("Cannot set pull resistor on output")
                 self._mode = self.OUT
                 self._line.release()

-                if hasattr(gpiod, 'LINE_REQ_DIR_OUT'):
-                    self._line.request(consumer=self._CONSUMER, type=gpiod.LINE_REQ_DIR_OUT)
+                if hasattr(gpiod, "LINE_REQ_DIR_OUT"):
+                    self._line.request(
+                        consumer=self._CONSUMER, type=gpiod.LINE_REQ_DIR_OUT
+                    )

                 else:
                     config = gpiod.line_request()
                     config.consumer = self._CONSUMER
                 else:
                     config = gpiod.line_request()
                     config.consumer = self._CONSUMER