Merge pull request #1005 from makermelissa/libgpiod-fix

[Adafruit_Blinka-hackapet.git] / src / adafruit_blinka / microcontroller / nxp_lpc4330 / pin.py

diff --git a/src/adafruit_blinka/microcontroller/nxp_lpc4330/pin.py b/src/adafruit_blinka/microcontroller/nxp_lpc4330/pin.py
index b3767af505cd9461704e39764b8fa9f1c8202cf5..187a4d35aaa1d90ac7bc0a5d454409ba3fcd5c15 100644 (file)
--- a/src/adafruit_blinka/microcontroller/nxp_lpc4330/pin.py
+++ b/src/adafruit_blinka/microcontroller/nxp_lpc4330/pin.py
@@ -1,17 +1,23 @@
+# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT

 """NXP LPC4330 pin names"""
 try:
     from greatfet import GreatFET
     from greatfet.interfaces.adc import ADC
 
     gf = GreatFET()
 """NXP LPC4330 pin names"""
 try:
     from greatfet import GreatFET
     from greatfet.interfaces.adc import ADC
 
     gf = GreatFET()

-except:
+except ModuleNotFoundError:

     raise RuntimeError(
     raise RuntimeError(

-        "Unable to create GreatFET object. Make sure library is installed and the device is connected."
-    )
+        "Unable to create GreatFET object. Make sure library is "
+        "installed and the device is connected."
+    ) from ModuleNotFoundError

 
 
 class Pin:
 
 
 class Pin:

-    """A basic Pin class for the NXP LPC4330 that acts as a wrapper for the GreatFET api."""
+    """A basic Pin class for the NXP LPC4330 that
+    acts as a wrapper for the GreatFET api.
+    """

 
     # pin modes
     OUT = gf.gpio.DIRECTION_OUT
 
     # pin modes
     OUT = gf.gpio.DIRECTION_OUT


@@ -32,6 +38,8 @@ class Pin:
         """Initialize the Pin"""
         if self.id is None:
             raise RuntimeError("Can not init a None type pin.")
         """Initialize the Pin"""
         if self.id is None:
             raise RuntimeError("Can not init a None type pin.")

+        if pull is not None:
+            raise NotImplementedError("Internal pullups and pulldowns not supported")

         if mode in (Pin.IN, Pin.OUT):
             if self.id not in gf.GPIO_MAPPINGS:
                 raise ValueError("Pin does not have GPIO capabilities")
         if mode in (Pin.IN, Pin.OUT):
             if self.id not in gf.GPIO_MAPPINGS:
                 raise ValueError("Pin does not have GPIO capabilities")


@@ -41,12 +49,10 @@ class Pin:
             # ADC only available on these pins
             if self.id not in gf.ADC_MAPPINGS:
                 raise ValueError("Pin does not have ADC capabilities")
             # ADC only available on these pins
             if self.id not in gf.ADC_MAPPINGS:
                 raise ValueError("Pin does not have ADC capabilities")

-            gf.ADC_MAPPINGS[self.id]
-            # TODO: figure out a way to pass the ADC number without breaking the interface

             self._pin = ADC(gf, self.id)
         elif mode == Pin.DAC:
             # DAC only available on these pins
             self._pin = ADC(gf, self.id)
         elif mode == Pin.DAC:
             # DAC only available on these pins

-            if self.id not in ("J2_P5"):
+            if self.id != "J2_P5":

                 raise ValueError("Pin does not have DAC capabilities")
             self._pin = gf.apis.dac
             self._pin.initialize()
                 raise ValueError("Pin does not have DAC capabilities")
             self._pin = gf.apis.dac
             self._pin.initialize()