Merge pull request #67 from adafruit/p1_pins

pi 1 pin definitions

diff --git a/src/adafruit_blinka/board/beaglebone_black.py b/src/adafruit_blinka/board/beaglebone_black.py
index f8699640bc83a8b49fb0c26fc6129b994de205c1..5658ffb8295a15aef9ae603db063139df9949eb9 100644 (file)
--- a/src/adafruit_blinka/board/beaglebone_black.py
+++ b/src/adafruit_blinka/board/beaglebone_black.py
@@ -1,3 +1,4 @@
+"""Pin definitions for the Beaglebone Black."""
 from adafruit_blinka.microcontroller.am335x import pin
 
 # initial pins, to mimic bonescript demo

diff --git a/src/adafruit_blinka/board/feather_huzzah.py b/src/adafruit_blinka/board/feather_huzzah.py
index f02f64717344207d608530bb27be97379f0c47ba..70cc1862354bef4456afeb9921cecec117567f18 100755 (executable)
--- a/src/adafruit_blinka/board/feather_huzzah.py
+++ b/src/adafruit_blinka/board/feather_huzzah.py
@@ -1,4 +1,4 @@
-"""Feather Huzzah pin names"""
+"""Pin definitions for the Feather Huzzah."""
 
 from adafruit_blinka.microcontroller.esp8266 import pin
 

diff --git a/src/adafruit_blinka/board/orangepipc.py b/src/adafruit_blinka/board/orangepipc.py
index e5ab3ef6e8db68dc76beeeccf8c577606a9ef5c8..8c6e88e18e78e521bbb725a1c5c54036949dfa1c 100644 (file)
--- a/src/adafruit_blinka/board/orangepipc.py
+++ b/src/adafruit_blinka/board/orangepipc.py
@@ -1,3 +1,5 @@
+"""Pin definitions for the Orange Pi PC."""
+
 from adafruit_blinka.microcontroller.allwinner_h3 import pin
 
 PA12 = pin.PA12
@@ -11,7 +13,7 @@ PA3 = pin.PA3
 PC0 = pin.PC0
 MOSI = pin.PC0
 PC1 = pin.PC1
-MISO = pin.PC1 
+MISO = pin.PC1
 PC2 = pin.PC2
 SCK = pin.PC2
 SCLK = pin.PC2

diff --git a/src/adafruit_blinka/board/raspi_1b_rev1.py b/src/adafruit_blinka/board/raspi_1b_rev1.py
new file mode 100644 (file)
index 0000000..817e911
--- /dev/null
+++ b/src/adafruit_blinka/board/raspi_1b_rev1.py
@@ -0,0 +1,34 @@
+"""Pin definitions for the Raspberry Pi Model B Revision 1."""
+
+from adafruit_blinka.microcontroller.bcm283x import pin
+
+D0 = pin.D0
+D1 = pin.D1
+SDA = pin.D0
+SCL = pin.D1
+D4 = pin.D4
+
+D7 = pin.D7
+CE1 = pin.D7
+D8 = pin.D8
+CE0 = pin.D8
+D9 = pin.D9
+MISO = pin.D9
+D10 = pin.D10
+MOSI = pin.D10
+D11 = pin.D11
+SCLK = pin.D11
+SCK = pin.D11
+
+D14 = pin.D14
+TXD = pin.D14
+D15 = pin.D15
+RXD = pin.D15
+
+D17 = pin.D17
+D18 = pin.D18
+D21 = pin.D21
+D22 = pin.D22
+D23 = pin.D23
+D24 = pin.D24
+D25 = pin.D25

diff --git a/src/adafruit_blinka/board/raspi_1b_rev2.py b/src/adafruit_blinka/board/raspi_1b_rev2.py
new file mode 100644 (file)
index 0000000..05dd69d
--- /dev/null
+++ b/src/adafruit_blinka/board/raspi_1b_rev2.py
@@ -0,0 +1,34 @@
+"""Pin definitions for the Raspberry Pi Model B Revision 2."""
+
+from adafruit_blinka.microcontroller.bcm283x import pin
+
+D2 = pin.D2
+D3 = pin.D3
+SDA = pin.D2
+SCL = pin.D3
+D4 = pin.D4
+
+D7 = pin.D7
+CE1 = pin.D7
+D8 = pin.D8
+CE0 = pin.D8
+D9 = pin.D9
+MISO = pin.D9
+D10 = pin.D10
+MOSI = pin.D10
+D11 = pin.D11
+SCLK = pin.D11
+SCK = pin.D11
+
+D14 = pin.D14
+TXD = pin.D14
+D15 = pin.D15
+RXD = pin.D15
+
+D17 = pin.D17
+D18 = pin.D18
+D22 = pin.D22
+D23 = pin.D23
+D24 = pin.D24
+D25 = pin.D25
+D27 = pin.D27

diff --git a/src/adafruit_blinka/board/raspi_40pin.py b/src/adafruit_blinka/board/raspi_40pin.py
index f944eee9fc48512fbeb624648de700e46e0cf507..47582918d8134e01e26420e05a235c642b5e8891 100644 (file)
--- a/src/adafruit_blinka/board/raspi_40pin.py
+++ b/src/adafruit_blinka/board/raspi_40pin.py
@@ -1,3 +1,5 @@
+"""Pin definitions for 40-pin Raspberry Pi models."""
+
 from adafruit_blinka.microcontroller.bcm283x import pin
 
 D2 = pin.D2

diff --git a/src/adafruit_blinka/board/tritium-h3.py b/src/adafruit_blinka/board/tritium-h3.py
index 7565c61d6dbacce1e03d5255feee0adf7946b784..620957cd4b8346cf50514f58bcce1cfbe68ad438 100644 (file)
--- a/src/adafruit_blinka/board/tritium-h3.py
+++ b/src/adafruit_blinka/board/tritium-h3.py
@@ -1,3 +1,5 @@
+"""Pin definitions for the Tritium H3."""
+
 from adafruit_blinka.microcontroller.allwinner_h3 import pin
 
 PA12 = pin.PA12
@@ -11,7 +13,7 @@ PA3 = pin.PA3
 PC0 = pin.PC0
 MOSI = pin.PC0
 PC1 = pin.PC1
-MISO = pin.PC1 
+MISO = pin.PC1
 PC2 = pin.PC2
 SCK = pin.PC2
 SCLK = pin.PC2

diff --git a/src/adafruit_blinka/microcontroller/bcm283x/pin.py b/src/adafruit_blinka/microcontroller/bcm283x/pin.py
index 5b6ea24a925416abd181b0601348e3202dd3e28b..41a89ffd103132c7b6d669f3ec7ca19285c5aaab 100644 (file)
--- a/src/adafruit_blinka/microcontroller/bcm283x/pin.py
+++ b/src/adafruit_blinka/microcontroller/bcm283x/pin.py
@@ -58,6 +58,10 @@ class Pin:
         else:
             return GPIO.input(self.id)
 
+# Pi 1B rev1 only?
+D0 = Pin(0)
+D1 = Pin(1)
+
 D2 = Pin(2)
 SDA = Pin(2)
 D3 = Pin(3)

diff --git a/src/board.py b/src/board.py
index d862e349e65d83b3d5e5d8c5cec919f8abca7b7e..e354ce60d82a2c05c453cc785e0705221b1763c5 100755 (executable)
--- a/src/board.py
+++ b/src/board.py
@@ -46,6 +46,12 @@ elif board_id == ap_board.PYBOARD:
 elif detector.board.any_raspberry_pi_40_pin:
     from adafruit_blinka.board.raspi_40pin import *
 
+elif detector.board.RASPBERRY_PI_B_REV1:
+    from adafruit_blinka.board.raspi_1b_rev1 import *
+
+elif detector.board.RASPBERRY_PI_B_REV2:
+    from adafruit_blinka.board.raspi_1b_rev2 import *
+
 elif board_id == ap_board.BEAGLEBONE_BLACK:
     from adafruit_blinka.board.beaglebone_black import *