Merge pull request #14 from ladyada/master

Add remaining GPIO to Pi board and quiet GPIO

diff --git a/src/adafruit_blinka/board/raspi_23.py b/src/adafruit_blinka/board/raspi_23.py
index fd0f370b174ae2cc62851b78160f3a41d922462d..131e17dd48576078a8e8887d15d215203526d64d 100644 (file)
--- a/src/adafruit_blinka/board/raspi_23.py
+++ b/src/adafruit_blinka/board/raspi_23.py
@@ -1,18 +1,43 @@
 from adafruit_blinka.microcontroller.raspi_23 import pin
 
-SDA = pin.SDA
-SCL = pin.SCL
 D2 = pin.D2
+SDA = pin.SDA
 D3 = pin.D3
+SCL = pin.SCL
+
 D4 = pin.D4
+D5 = pin.D5
+D6 = pin.D6
+
+D7 = pin.D7
+CE1 = pin.D7
+D8 = pin.D8
+CE0 = pin.D8
 D9 = pin.D9
-D10 = pin.D10
-D11 = pin.D11
 MISO = pin.D9
+D10 = pin.D10
 MOSI = pin.D10
+D11 = pin.D11
 SCLK = pin.D11
+SCK = pin.D11
+
+D12 = pin.D12
+D13 = pin.D13
+
 D14 = pin.D14
+TXD = pin.D14
 D15 = pin.D15
+RXD = pin.D15
+
+D16 = pin.D16
 D17 = pin.D17
 D18 = pin.D18
 D19 = pin.D19
+D20 = pin.D20
+D21 = pin.D21
+D22 = pin.D22
+D23 = pin.D23
+D24 = pin.D24
+D25 = pin.D25
+D26 = pin.D26
+D27 = pin.D27

diff --git a/src/adafruit_blinka/microcontroller/raspi_23/pin.py b/src/adafruit_blinka/microcontroller/raspi_23/pin.py
index 4cca6ee0536ce621ca921650230a83208ad6a6cb..af842e5d7c309b23b8382525c0064f03381f8ce3 100644 (file)
--- 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:
@@ -57,32 +58,50 @@ 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)
-D20 = Pin(20)
 MISO_2 = Pin(19)
+D20 = Pin(20)
 MOSI_2 = Pin(20)
-SCLK_2 = Pin(21)
 D21 = Pin(21)
+SCLK_2 = Pin(21)
+SCK_2 = 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