Merge pull request #300 from makermelissa/master

[hackapet/Adafruit_Blinka.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 a67032e65d7181ce96f13ea216549cba91eb18ea..cfa96fe2ccababefb07f1e701a95a584d1842573 100644 (file)
--- a/src/adafruit_blinka/microcontroller/nxp_lpc4330/pin.py
+++ b/src/adafruit_blinka/microcontroller/nxp_lpc4330/pin.py
@@ -5,10 +5,16 @@ try:
 
     gf = GreatFET()
 except:
 
     gf = GreatFET()
 except:

-    raise RuntimeError("Unable to create GreatFET object. Make sure library is installed and the device is connected.")
+    raise RuntimeError(
+        "Unable to create GreatFET object. Make sure library is "
+        "installed and the device is connected."
+    )
+

 
 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


@@ -29,6 +35,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")


@@ -38,12 +46,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()


@@ -83,6 +89,7 @@ class Pin:
             "No action for mode {} with value {}".format(self._mode, val)
         )
 
             "No action for mode {} with value {}".format(self._mode, val)
         )
 

+

 # create pin instances for each pin
 # J1 Header Pins
 J1_P3 = Pin("J1_P3")
 # create pin instances for each pin
 # J1 Header Pins
 J1_P3 = Pin("J1_P3")


@@ -122,15 +129,14 @@ J1_P39 = Pin("J1_P39")  # MOSI
 J1_P40 = Pin("J1_P40")  # MISO
 
 
 J1_P40 = Pin("J1_P40")  # MISO
 
 

-

 # J2 Header Pins
 J2_P3 = Pin("J2_P3")
 J2_P4 = Pin("J2_P4")
 # J2 Header Pins
 J2_P3 = Pin("J2_P3")
 J2_P4 = Pin("J2_P4")

-J2_P5 = Pin("J2_P5")    # ADC, ADC, DAC
+J2_P5 = Pin("J2_P5")  # ADC, ADC, DAC

 J2_P6 = Pin("J2_P6")
 J2_P7 = Pin("J2_P7")
 J2_P8 = Pin("J2_P8")
 J2_P6 = Pin("J2_P6")
 J2_P7 = Pin("J2_P7")
 J2_P8 = Pin("J2_P8")

-J2_P9 = Pin("J2_P9")    # ADC, GPIO
+J2_P9 = Pin("J2_P9")  # ADC, GPIO

 J2_P10 = Pin("J2_P10")
 J2_P13 = Pin("J2_P13")
 J2_P14 = Pin("J2_P14")
 J2_P10 = Pin("J2_P10")
 J2_P13 = Pin("J2_P13")
 J2_P14 = Pin("J2_P14")


@@ -158,8 +164,8 @@ J2_P38 = Pin("J2_P38")
 # Bonus Row Pins
 J7_P2 = Pin("J7_P2")
 J7_P3 = Pin("J7_P3")
 # Bonus Row Pins
 J7_P2 = Pin("J7_P2")
 J7_P3 = Pin("J7_P3")

-J7_P4 = Pin("J7_P4")    # ADC, ADC
-J7_P5 = Pin("J7_P5")    # ADC, ADC
+J7_P4 = Pin("J7_P4")  # ADC, ADC
+J7_P5 = Pin("J7_P5")  # ADC, ADC

 J7_P6 = Pin("J7_P6")
 J7_P7 = Pin("J7_P7")
 J7_P8 = Pin("J7_P8")
 J7_P6 = Pin("J7_P6")
 J7_P7 = Pin("J7_P7")
 J7_P8 = Pin("J7_P8")