Change PINs to OrangePI R1 spec

diff --git a/src/adafruit_blinka/board/orangepipc.py b/src/adafruit_blinka/board/orangepipc.py
index 19b2588bd6ce4bdb7638533da13d2b8371ab468d..8c6e88e18e78e521bbb725a1c5c54036949dfa1c 100644 (file)
--- a/src/adafruit_blinka/board/orangepipc.py
+++ b/src/adafruit_blinka/board/orangepipc.py
@@ -1,4 +1,4 @@
-"""Pin definitions for the Orange Pi R1."""
+"""Pin definitions for the Orange Pi PC."""
 
 from adafruit_blinka.microcontroller.allwinner_h3 import pin
 
@@ -7,27 +7,35 @@ SDA = pin.PA12
 PA11 = pin.PA11
 SCL = pin.PA11
 PA6 = pin.PA6
-PWM1 = pin.PA6
 PA1 = pin.PA1
-UART2_RX = pin.PA1
 PA0 = pin.PA0
-UART2_TX = pin.PA0
 PA3 = pin.PA3
-UART2_CTS = pin.PA3
+PC0 = pin.PC0
+MOSI = pin.PC0
+PC1 = pin.PC1
+MISO = pin.PC1
+PC2 = pin.PC2
+SCK = pin.PC2
+SCLK = pin.PC2
 PA19 = pin.PA19
-TWI1_SDA = pin.PA19
 PA7 = pin.PA7
+PA8 = pin.PA8
+PA9 = pin.PA9
 PA10 = pin.PA10
+PA20 = pin.PA20
 
 PA13 = pin.PA13
-SPI1_CS = pin.PA13
+TX = pin.PA13
 PA14 = pin.PA14
-SPI1_CLK = pin.PA14
+RX = pin.PA14
+PD14 = pin.PD14
+PC4 = pin.PC4
+PC7 = pin.PC7
 PA2 = pin.PA2
-UART2_RTS = pin.PA2
+PC3 = pin.PC3
+PA21 = pin.PA21
 PA18 = pin.PA18
-TWI1-SCK = pin.PA18
+PG8 = pin.PG8
+PG9 = pin.PG9
 PG6 = pin.PG6
-UART1_TX = pin.PG6
 PG7 = pin.PG7
-UART1_RX = pin.PG7

diff --git a/src/adafruit_blinka/board/orangepir1.py b/src/adafruit_blinka/board/orangepir1.py
new file mode 100644 (file)
index 0000000..19b2588
--- /dev/null
+++ b/src/adafruit_blinka/board/orangepir1.py
@@ -0,0 +1,33 @@
+"""Pin definitions for the Orange Pi R1."""
+
+from adafruit_blinka.microcontroller.allwinner_h3 import pin
+
+PA12 = pin.PA12
+SDA = pin.PA12
+PA11 = pin.PA11
+SCL = pin.PA11
+PA6 = pin.PA6
+PWM1 = pin.PA6
+PA1 = pin.PA1
+UART2_RX = pin.PA1
+PA0 = pin.PA0
+UART2_TX = pin.PA0
+PA3 = pin.PA3
+UART2_CTS = pin.PA3
+PA19 = pin.PA19
+TWI1_SDA = pin.PA19
+PA7 = pin.PA7
+PA10 = pin.PA10
+
+PA13 = pin.PA13
+SPI1_CS = pin.PA13
+PA14 = pin.PA14
+SPI1_CLK = pin.PA14
+PA2 = pin.PA2
+UART2_RTS = pin.PA2
+PA18 = pin.PA18
+TWI1-SCK = pin.PA18
+PG6 = pin.PG6
+UART1_TX = pin.PG6
+PG7 = pin.PG7
+UART1_RX = pin.PG7

diff --git a/src/adafruit_blinka/board/original_orangepipc.py b/src/adafruit_blinka/board/original_orangepipc.py
deleted file mode 100644 (file)
index 8c6e88e..0000000
--- a/src/adafruit_blinka/board/original_orangepipc.py
+++ /dev/null
@@ -1,41 +0,0 @@
-"""Pin definitions for the Orange Pi PC."""
-
-from adafruit_blinka.microcontroller.allwinner_h3 import pin
-
-PA12 = pin.PA12
-SDA = pin.PA12
-PA11 = pin.PA11
-SCL = pin.PA11
-PA6 = pin.PA6
-PA1 = pin.PA1
-PA0 = pin.PA0
-PA3 = pin.PA3
-PC0 = pin.PC0
-MOSI = pin.PC0
-PC1 = pin.PC1
-MISO = pin.PC1
-PC2 = pin.PC2
-SCK = pin.PC2
-SCLK = pin.PC2
-PA19 = pin.PA19
-PA7 = pin.PA7
-PA8 = pin.PA8
-PA9 = pin.PA9
-PA10 = pin.PA10
-PA20 = pin.PA20
-
-PA13 = pin.PA13
-TX = pin.PA13
-PA14 = pin.PA14
-RX = pin.PA14
-PD14 = pin.PD14
-PC4 = pin.PC4
-PC7 = pin.PC7
-PA2 = pin.PA2
-PC3 = pin.PC3
-PA21 = pin.PA21
-PA18 = pin.PA18
-PG8 = pin.PG8
-PG9 = pin.PG9
-PG6 = pin.PG6
-PG7 = pin.PG7

diff --git a/src/adafruit_blinka/microcontroller/allwinner_h3/original_pin.py b/src/adafruit_blinka/microcontroller/allwinner_h3/pin-orangepir1.py
similarity index 84%
rename from src/adafruit_blinka/microcontroller/allwinner_h3/original_pin.py
rename to src/adafruit_blinka/microcontroller/allwinner_h3/pin-orangepir1.py
index ba4337988bff3e70712e4bf577244679af634175..44241a3689effc78ea8d9508173619c7bd08080d 100644 (file)
--- a/src/adafruit_blinka/microcontroller/allwinner_h3/original_pin.py
+++ b/src/adafruit_blinka/microcontroller/allwinner_h3/pin-orangepir1.py
@@ -4,17 +4,13 @@ PA0 = Pin(0)
 UART2_TX = PA0
 PA1 = Pin(1)
 UART2_RX = PA1
-PA2 = Pin(2)
-PA3 = Pin(3)
 PA6 = Pin(6)
 PA7 = Pin(7)
-PA8 = Pin(8)
-PA9 = Pin(9)
 PA10 = Pin(10)
-PA11 = Pin(11)
-TWI0_SCL = PA11
-PA12 = Pin(12)
-TWI0_SDA = PA12
+PA11 = Pin(8)
+SDA = PA11
+PA12 = Pin(9)
+SCL = PA12
 PA13 = Pin(13)
 UART3_TX = PA13
 PA14 = Pin(14)
@@ -52,7 +48,7 @@ PG12 = Pin(204)
 PG13 = Pin(205)
 
 
-i2cPorts = ( (0, TWI0_SCL, TWI0_SDA), )
+i2cPorts = ( (0, SCL, SDA), )
 # ordered as spiId, sckId, mosiId, misoId
 spiPorts = ( (0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO), )
 # ordered as uartId, txId, rxId

diff --git a/src/adafruit_blinka/microcontroller/allwinner_h3/pin.py b/src/adafruit_blinka/microcontroller/allwinner_h3/pin.py
index 44241a3689effc78ea8d9508173619c7bd08080d..ba4337988bff3e70712e4bf577244679af634175 100644 (file)
--- a/src/adafruit_blinka/microcontroller/allwinner_h3/pin.py
+++ b/src/adafruit_blinka/microcontroller/allwinner_h3/pin.py
@@ -4,13 +4,17 @@ PA0 = Pin(0)
 UART2_TX = PA0
 PA1 = Pin(1)
 UART2_RX = PA1
+PA2 = Pin(2)
+PA3 = Pin(3)
 PA6 = Pin(6)
 PA7 = Pin(7)
+PA8 = Pin(8)
+PA9 = Pin(9)
 PA10 = Pin(10)
-PA11 = Pin(8)
-SDA = PA11
-PA12 = Pin(9)
-SCL = PA12
+PA11 = Pin(11)
+TWI0_SCL = PA11
+PA12 = Pin(12)
+TWI0_SDA = PA12
 PA13 = Pin(13)
 UART3_TX = PA13
 PA14 = Pin(14)
@@ -48,7 +52,7 @@ PG12 = Pin(204)
 PG13 = Pin(205)
 
 
-i2cPorts = ( (0, SCL, SDA), )
+i2cPorts = ( (0, TWI0_SCL, TWI0_SDA), )
 # ordered as spiId, sckId, mosiId, misoId
 spiPorts = ( (0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO), )
 # ordered as uartId, txId, rxId