X-Git-Url: https://git.ayoreis.com/hackapet/Adafruit_Blinka.git/blobdiff_plain/e7fee263ecca5ed166b9d3cef21c366d7c665b9f..3f017a27633d001cdb30d6e36bfce3baea3ab52d:/src/adafruit_blinka/microcontroller/raspi_23/pin.py

diff --git a/src/adafruit_blinka/microcontroller/raspi_23/pin.py b/src/adafruit_blinka/microcontroller/raspi_23/pin.py
index 236d635..5b6ea24 100644
--- a/src/adafruit_blinka/microcontroller/raspi_23/pin.py
+++ b/src/adafruit_blinka/microcontroller/raspi_23/pin.py
@@ -1,5 +1,6 @@
 import RPi.GPIO as GPIO
-GPIO.setmode(GPIO.BCM)
+GPIO.setmode(GPIO.BCM)    # Use BCM pins D4 = GPIO #4
+GPIO.setwarnings(False)   # shh!
 
 # Pins dont exist in CPython so...lets make our own!
 class Pin:
@@ -19,11 +20,13 @@ class Pin:
         self.id = bcm_number
 
     def __repr__(self):
-        return "BCM #%d" % self.id
+        return str(self.id)
+
+    def __eq__(self, other):
+        return self.id == other
 
     def init(self, mode=IN, pull=None):
         if mode != None:
-            print("set %d to mode %d" % (self.id, mode))
             if mode == self.IN:
                 self._mode = self.IN
                 GPIO.setup(self.id, GPIO.IN)
@@ -33,7 +36,6 @@ class Pin:
             else:
                 raise RuntimeError("Invalid mode for pin: %s" % self.id)
         if pull != None:
-            print("set %d to pull %d" % (self.id, pull))
             if self._mode != self.IN:
                 raise RuntimeError("Cannot set pull resistor on output")
             if pull == self.PULL_UP:
@@ -45,7 +47,6 @@ class Pin:
 
     def value(self, val=None):
         if val != None:
-            print("set %d to value %d" %(self.id, val))
             if val == self.LOW:
                 self._value = val
                 GPIO.output(self.id, val)
@@ -57,36 +58,54 @@ class Pin:
         else:
             return GPIO.input(self.id)
 
-SDA = Pin(2)
-SCL = Pin(3)
 D2 = Pin(2)
+SDA = Pin(2)
 D3 = Pin(3)
+SCL = Pin(3)
+
 D4 = Pin(4)
+D5 = Pin(5)
+D6 = Pin(6)
+
+D7 = Pin(7)
+CE1 = Pin(7)
+D8 = Pin(8)
+CE0 = Pin(8)
 D9 = Pin(9)
-D10 = Pin(10)
-D11 = Pin(11)
 MISO = Pin(9)
+D10 = Pin(10)
 MOSI = Pin(10)
-SCLK = Pin(11)
+D11 = Pin(11)
+SCLK = Pin(11) # Raspberry Pi naming
+SCK = Pin(11)  # CircuitPython naming
+
+D12 = Pin(12)
+D13 = Pin(13)
+
 D14 = Pin(14)
-D15 = Pin(15)
 TXD = Pin(14)
+D15 = Pin(15)
 RXD = Pin(15)
+
+D16 = Pin(16)
 D17 = Pin(17)
 D18 = Pin(18)
 D19 = Pin(19)
+MISO_1 = Pin(19)
 D20 = Pin(20)
-MISO_2 = Pin(19)
-MOSI_2 = Pin(20)
-SCLK_2 = Pin(21)
+MOSI_1 = Pin(20)
 D21 = Pin(21)
+SCLK_1 = Pin(21)
+SCK_1 = Pin(21)
 D22 = Pin(22)
 D23 = Pin(23)
 D24 = Pin(24)
+D25 = Pin(25)
+D26 = Pin(26)
 D27 = Pin(27)
 
 # ordered as spiId, sckId, mosiId, misoId
-spiPorts = ((1, SCLK, MOSI, MISO), (2, SCLK_2, MOSI_2, MISO_2))
+spiPorts = ((0, SCLK, MOSI, MISO), (1, SCLK_1, MOSI_1, MISO_1))
 
 # ordered as uartId, txId, rxId
 uartPorts = (