From 1e7032f35d1d6717c227f6e0774df1705b611f2e Mon Sep 17 00:00:00 2001
From: ladyada <limor@ladyada.net>
Date: Sun, 17 Jun 2018 19:35:04 -0400
Subject: [PATCH] matches other boards nicer

---
 examples/piblinka.py                          |  3 +-
 src/adafruit_blinka/board/raspi_23.py         | 21 ++++-----
 .../microcontroller/raspi_23/__init__.py      |  0
 .../microcontroller/raspi_23/pin.py           | 46 +++++++++++++++++++
 4 files changed, 56 insertions(+), 14 deletions(-)
 create mode 100644 src/adafruit_blinka/microcontroller/raspi_23/__init__.py
 create mode 100644 src/adafruit_blinka/microcontroller/raspi_23/pin.py

diff --git a/examples/piblinka.py b/examples/piblinka.py
index 182df33..e385a63 100644
--- a/examples/piblinka.py
+++ b/examples/piblinka.py
@@ -10,7 +10,6 @@ print("hello blinka!")
 print("Found system type: %s (sys.plaform %s implementation %s) " % (agnostic_board, sys.platform, sys.implementation.name))
 
 import board
-
-print(dir(board))
+print("board contents: ", dir(board))
 
 #print(adafruit_blinka.adafruit_blinka.agnostic.microcontroller)
diff --git a/src/adafruit_blinka/board/raspi_23.py b/src/adafruit_blinka/board/raspi_23.py
index 789521a..053c94b 100644
--- a/src/adafruit_blinka/board/raspi_23.py
+++ b/src/adafruit_blinka/board/raspi_23.py
@@ -1,13 +1,10 @@
-# Pins dont exist in CPython so...lets make our own!
-class Pin:
-    def __init__(self, name, bcm_number):
-        self._name = name
-        self._number = bcm_number
+from adafruit_blinka.microcontroller.raspi_23 import pin
 
-SDA = Pin("SDA", 2)
-SCL = Pin("SCL", 3)
-D4 = Pin("BCM 4", 4)
-D17 = Pin("BCM 17", 17)
-D18 = Pin("BCM 18", 18)
-
-# TODO: more here...
+SDA = pin.SDA
+SCL = pin.SCL
+D4 = pin.D4
+D14 = pin.D14
+D15 = pin.D15
+D17 = pin.D17
+D18 = pin.D18
+D19 = pin.D19
diff --git a/src/adafruit_blinka/microcontroller/raspi_23/__init__.py b/src/adafruit_blinka/microcontroller/raspi_23/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/adafruit_blinka/microcontroller/raspi_23/pin.py b/src/adafruit_blinka/microcontroller/raspi_23/pin.py
new file mode 100644
index 0000000..873e7cf
--- /dev/null
+++ b/src/adafruit_blinka/microcontroller/raspi_23/pin.py
@@ -0,0 +1,46 @@
+# Pins dont exist in CPython so...lets make our own!
+class Pin:
+    def __init__(self, name, bcm_number):
+        self._name = name
+        self._number = bcm_number
+
+SDA = Pin("SDA/D2", 2)
+SCL = Pin("SCL/D3", 3)
+D2 = Pin("SDA/D2", 2)
+D3 = Pin("SCL/D3", 3)
+D4 = Pin("BCM 4", 4)
+D9 = Pin("MISO/D9", 9)
+D10 = Pin("MOSI/D10", 10)
+D11 = Pin("SCLK/D11", 11)
+MISO = Pin("MISO/D9", 9)
+MOSI = Pin("MOSI/D10", 10)
+SCLK = Pin("SCLK/D11", 11)
+D14 = Pin("TXD/D14", 14)
+D15 = Pin("RXD/D15", 15)
+TXD = Pin("TXD/D14", 14)
+RXD = Pin("RXD/D15", 15)
+D17 = Pin("BCM 17", 17)
+D18 = Pin("BCM 18", 18)
+D19 = Pin("BCM 19", 19)
+D20 = Pin("BCM 20", 20)
+MISO_2 = Pin("MISO_2/19", 19)
+MOSI_2 = Pin("MOSI_2/20", 20)
+SCLK_2 = Pin("SCLK_2/21", 21)
+D21 = Pin("BCM 21", 21)
+D22 = Pin("BCM 22", 22)
+D23 = Pin("BCM 23", 23)
+D24 = Pin("BCM 24", 24)
+D27 = Pin("BCM 27", 27)
+
+# ordered as spiId, sckId, mosiId, misoId
+spiPorts = ((1, SCLK, MOSI, MISO), (2, SCLK_2, MOSI_2, MISO_2))
+
+# ordered as uartId, txId, rxId
+uartPorts = (
+    (1, TXD, RXD),
+)
+
+i2cPorts = (
+    (1, SDA, SCL),
+)
+
-- 
2.49.0