PR Changes, organized mc, removed duplicates

diff --git a/src/adafruit_blinka/board/odroidn2.py b/src/adafruit_blinka/board/odroidn2.py
index 24dad518d37c53e59cd94886424400dc9c53ae34..7d23d70d4890f41d975e92451f5fb6f8a09eb857 100644 (file)
--- a/src/adafruit_blinka/board/odroidn2.py
+++ b/src/adafruit_blinka/board/odroidn2.py
@@ -2,62 +2,31 @@
 
 from adafruit_blinka.microcontroller.amlogic.s922x import pin
 
 
 from adafruit_blinka.microcontroller.amlogic.s922x import pin
 

-#GPIOX_0 = pin.GPIO228

 GPIOX_0 = pin.GPIO476
 GPIOX_0 = pin.GPIO476

-#GPIOX_1 = pin.GPIO229

 GPIOX_1 = pin.GPIO477
 GPIOX_1 = pin.GPIO477

-#GPIOX_2 = pin.GPIO230

 GPIOX_2 = pin.GPIO478
 GPIOX_2 = pin.GPIO478

-#GPIOX_3 = pin.GPIO231

 GPIOX_3 = pin.GPIO479
 GPIOX_3 = pin.GPIO479

-#GPIOX_4 = pin.GPIO232

 GPIOX_4 = pin.GPIO480
 GPIOX_4 = pin.GPIO480

-#GPIOX_5 = pin.GPIO233

 GPIOX_5 = pin.GPIO481
 GPIOX_5 = pin.GPIO481

-#GPIOX_6 = pin.GPIO234

 GPIOX_6 = pin.GPIO482
 GPIOX_6 = pin.GPIO482

-#GPIOX_7 = pin.GPIO235

 GPIOX_7 = pin.GPIO483
 GPIOX_7 = pin.GPIO483

-#GPIOX_8 = pin.GPIO236

 GPIOX_8 = pin.GPIO484
 GPIOX_8 = pin.GPIO484

-#GPIOX_9 = pin.GPIO237

 GPIOX_9 = pin.GPIO485
 GPIOX_9 = pin.GPIO485

-#GPIOX_10 = pin.GPIO238

 GPIOX_10 = pin.GPIO486
 GPIOX_10 = pin.GPIO486

-#GPIOX_11 = pin.GPIO239

 GPIOX_11 = pin.GPIO487
 GPIOX_11 = pin.GPIO487

-#GPIOX_12 = pin.GPIO240

 GPIOX_12 = pin.GPIO488
 GPIOX_12 = pin.GPIO488

-#GPIOX_13 = pin.GPIO241

 GPIOX_13 = pin.GPIO489
 GPIOX_14 = pin.GPIO490
 GPIOX_15 = pin.GPIO491
 GPIOX_16 = pin.GPIO492
 GPIOX_17 = pin.GPIO493
 GPIOX_18 = pin.GPIO494
 GPIOX_13 = pin.GPIO489
 GPIOX_14 = pin.GPIO490
 GPIOX_15 = pin.GPIO491
 GPIOX_16 = pin.GPIO492
 GPIOX_17 = pin.GPIO493
 GPIOX_18 = pin.GPIO494

-#GPIOX_19 = pin.GPIO247

 GPIOX_19 = pin.GPIO495
 GPIOX_19 = pin.GPIO495

-#GPIOX_21 = pin.GPIO249

 
 

-#GPIODV_24 = pin.GPIO205

 GPIODV_24 = pin.GPIO493
 GPIODV_24 = pin.GPIO493

-#GPIODV_25 = pin.GPIO206

 GPIODV_25 = pin.GPIO494
 GPIODV_25 = pin.GPIO494

-#GPIODV_26 = pin.GPIO207

 GPIODV_26 = pin.GPIO474
 GPIODV_26 = pin.GPIO474

-#GPIODV_27 = pin.GPIO208

 GPIODV_27 = pin.GPIO475
 GPIODV_27 = pin.GPIO475

-#GPIODV_28 = pin.GPIO209
-#GPIODV_29 = pin.GPIO210
-
-#GPIOY_0 = pin.GPIO211
-#GPIOY_1 = pin.GPIO212
-#GPIOY_3 = pin.GPIO214
-#GPIOY_7 = pin.GPIO218
-#GPIOY_8 = pin.GPIO219
-#GPIOY_12 = pin.GPIO223
-#GPIOY_13 = pin.GPIO224
-#GPIOY_14 = pin.GPIO225

 
 GPIOA_4 = pin.GPIO464
 GPIOA_12 = pin.GPIO472
 
 GPIOA_4 = pin.GPIO464
 GPIOA_12 = pin.GPIO472


@@ -65,90 +34,53 @@ GPIOA_13 = pin.GPIO473
 GPIOA_14 = pin.GPIO474
 GPIOA_15 = pin.GPIO475
 
 GPIOA_14 = pin.GPIO474
 GPIOA_15 = pin.GPIO475
 

-#GPIOA0_0 = pin.GPIO122

 GPIOA0_0 = pin.GPIO496
 GPIOA0_0 = pin.GPIO496

-#GPIOA0_1 = pin.GPIO123

 GPIOA0_1 = pin.GPIO497
 GPIOA0_1 = pin.GPIO497

-#GPIOA0_2 = pin.GPIO124

 GPIOA0_2 = pin.GPIO498
 GPIOA0_2 = pin.GPIO498

-#GPIOA0_3 = pin.GPIO125

 GPIOA0_3 = pin.GPIO499
 GPIOA0_3 = pin.GPIO499

-#GPIOA0_4 = pin.GPIO126

 GPIOA0_4 = pin.GPIO500
 GPIOA0_4 = pin.GPIO500

-#GPIOA0_5 = pin.GPIO127

 GPIOA0_5 = pin.GPIO501
 GPIOA0_5 = pin.GPIO501

-#GPIOA0_6 = pin.GPIO128

 GPIOA0_6 = pin.GPIO502
 GPIOA0_6 = pin.GPIO502

-#GPIOA0_7 = pin.GPIO129

 GPIOA0_7 = pin.GPIO503
 GPIOA0_7 = pin.GPIO503

-#GPIOA0_8 = pin.GPIO130

 GPIOA0_8 = pin.GPIO504
 GPIOA0_8 = pin.GPIO504

-#GPIOA0_9 = pin.GPIO131

 GPIOA0_9 = pin.GPIO505
 GPIOA0_9 = pin.GPIO505

-#GPIOA0_10 = pin.GPIO132

 GPIOA0_10 = pin.GPIO506
 GPIOA0_10 = pin.GPIO506

-#GPIOA0_11 = pin.GPIO133

 GPIOA0_11 = pin.GPIO507
 GPIOA0_11 = pin.GPIO507

-#GPIOA0_12 = pin.GPIO134

 GPIOA0_12 = pin.GPIO508
 GPIOA0_12 = pin.GPIO508

-#GPIOA0_13 = pin.GPIO135

 GPIOA0_13 = pin.GPIO509
 GPIOA0_14 = pin.GPIO510
 GPIOA0_15 = pin.GPIO511
 
 GPIOA0_13 = pin.GPIO509
 GPIOA0_14 = pin.GPIO510
 GPIOA0_15 = pin.GPIO511
 

-#SDA = pin.I2C0_SDA

 SDA = pin.I2C3_SDA
 SDA = pin.I2C3_SDA

-#SCL = pin.I2C0_SCL

 SCL = pin.I2C3_SCL
 
 SCLK = pin.SPI0_SCLK
 MOSI = pin.SPI0_MOSI
 MISO = pin.SPI0_MISO
 SCL = pin.I2C3_SCL
 
 SCLK = pin.SPI0_SCLK
 MOSI = pin.SPI0_MOSI
 MISO = pin.SPI0_MISO

-#SPI_CS0 = pin.GPIO229

 SPI_CS0 = pin.GPIO486
 SPI_CS0 = pin.GPIO486

-#SPI_CS1 = pin.GPIO225

 
 

-#D0 = GPIOX_19

 D0 = GPIOX_3
 D0 = GPIOX_3

-#D1 = GPIOX_10

 D1 = GPIOX_16
 D1 = GPIOX_16

-#D2 = GPIOX_11

 D2 = GPIOX_4
 D2 = GPIOX_4

-#D3 = GPIOX_9

 D3 = GPIOX_7
 D3 = GPIOX_7

-#D4 = GPIOX_8

 D4 = GPIOX_0
 D4 = GPIOX_0

-#D5 = GPIOX_5

 D5 = GPIOX_1
 D5 = GPIOX_1

-#D6 = GPIOX_3

 D6 = GPIOX_2
 D6 = GPIOX_2

-#D7 = GPIOX_21

 D7 = GPIOA_13
 D8 = GPIOX_17
 D9 = GPIOX_18
 D7 = GPIOA_13
 D8 = GPIOX_17
 D9 = GPIOX_18

-#D10 = GPIOX_1

 D10 = GPIOX_10
 D10 = GPIOX_10

-#D11 = GPIOY_14

 D11 = GPIOA_4
 D11 = GPIOA_4

-#D12 = GPIOX_7

 D12 = GPIOX_8
 D12 = GPIOX_8

-#D13 = GPIOX_4

 D13 = GPIOX_9
 D13 = GPIOX_9

-#D14 = GPIOX_2

 D14 = GPIOX_11
 D15 = GPIOX_12
 D16 = GPIOX_13
 D14 = GPIOX_11
 D15 = GPIOX_12
 D16 = GPIOX_13

-#D21 = GPIOX_0

 D21 = GPIOX_14
 D21 = GPIOX_14

-#D22 = GPIOY_8

 D22 = GPIOX_15
 D22 = GPIOX_15

-#D23 = GPIOX_6

 D23 = GPIOX_5
 D23 = GPIOX_5

-#D24 = GPIOY_3

 D24 = GPIOX_6
 D24 = GPIOX_6

-#D26 = GPIOY_13

 D26 = GPIOA_12
 D26 = GPIOA_12

-#D27 = GPIOY_7

 D27 = GPIOX_19
 D30 = GPIOA_14
 D31 = GPIOA_15
 D27 = GPIOX_19
 D30 = GPIOA_14
 D31 = GPIOA_15

diff --git a/src/adafruit_blinka/microcontroller/amlogic/s922x/pin.py b/src/adafruit_blinka/microcontroller/amlogic/s922x/pin.py
index a21571a799b5a7c4604744df8f08988ea121a3ad..fcde5cc32f1b128f4ce181dcc9691a824f8ec999 100644 (file)
--- a/src/adafruit_blinka/microcontroller/amlogic/s922x/pin.py
+++ b/src/adafruit_blinka/microcontroller/amlogic/s922x/pin.py
@@ -1,211 +1,74 @@
 from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
 
 from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
 

-#GPIO122 = Pin((0, 0))

 GPIO496 = Pin((0, 0))
 GPIO496 = Pin((0, 0))

-#GPIO123 = Pin((0, 1))

 GPIO497 = Pin((0, 1))
 GPIO497 = Pin((0, 1))

-#GPIO124 = Pin((0, 2))

 GPIO498 = Pin((0, 2))
 GPIO498 = Pin((0, 2))

-#GPIO125 = Pin((0, 3))

 GPIO499 = Pin((0, 3))
 GPIO499 = Pin((0, 3))

-#GPIO126 = Pin((0, 4))

 GPIO500 = Pin((0, 4))
 GPIO500 = Pin((0, 4))

-#GPIO127 = Pin((0, 5))

 GPIO501 = Pin((0, 5))
 GPIO501 = Pin((0, 5))

-#GPIO128 = Pin((0, 6))

 GPIO502 = Pin((0, 6))
 GPIO502 = Pin((0, 6))

-#GPIO129 = Pin((0, 7))

 GPIO503 = Pin((0, 7))
 GPIO503 = Pin((0, 7))

-#GPIO130 = Pin((0, 8))

 GPIO504 = Pin((0, 8))
 GPIO504 = Pin((0, 8))

-#GPIO131 = Pin((0, 9))

 GPIO505 = Pin((0, 9))
 GPIO505 = Pin((0, 9))

-#GPIO132 = Pin((0, 10))

 GPIO506 = Pin((0, 10))
 GPIO506 = Pin((0, 10))

-#GPIO133 = Pin((0, 11))

 GPIO507 = Pin((0, 11))
 GPIO507 = Pin((0, 11))

-#GPIO134 = Pin((0, 12))

 GPIO508 = Pin((0, 12))
 GPIO508 = Pin((0, 12))

-#GPIO135 = Pin((0, 13))

 GPIO509 = Pin((0, 13))
 GPIO510 = Pin((0, 14))
 GPIO511 = Pin((0, 15))
 
 GPIO509 = Pin((0, 13))
 GPIO510 = Pin((0, 14))
 GPIO511 = Pin((0, 15))
 

-#GPIO460 = Pin((1, 50))
-#GPIO461 = Pin((1, 51))
-#GPIO462 = Pin((1, 52))
-#GPIO463 = Pin((1, 53))
-#GPIO464 = Pin((1, 54))
-#GPIO465 = Pin((1, 55))
-#GPIO466 = Pin((1, 56))
-#GPIO467 = Pin((1, 57))
-#GPIO468 = Pin((1, 58))
-#GPIO469 = Pin((1, 59))
-#GPIO470 = Pin((1, 60))
-#GPIO471 = Pin((1, 61))
-#GPIO472 = Pin((1, 62))
-#GPIO473 = Pin((1, 63))
-#GPIO474 = Pin((1, 64))
-#GPIO475 = Pin((1, 65))
-#GPIO476 = Pin((1, 66))
-#GPIO477 = Pin((1, 67))
-#GPIO478 = Pin((1, 68))
-#GPIO479 = Pin((1, 69))
-#GPIO480 = Pin((1, 70))
-#GPIO481 = Pin((1, 71))
-#GPIO482 = Pin((1, 72))
-#GPIO483 = Pin((1, 73))
-#GPIO484 = Pin((1, 74))
-#GPIO485 = Pin((1, 75))
-#GPIO486 = Pin((1, 76))
-#GPIO487 = Pin((1, 77))
-#GPIO488 = Pin((1, 78))
-#GPIO489 = Pin((1, 79))
-#GPIO490 = Pin((1, 80))
-#GPIO491 = Pin((1, 81))
-#GPIO492 = Pin((1, 82))
-#GPIO493 = Pin((1, 83))
-#GPIO494 = Pin((1, 84))
-#GPIO495 = Pin((1, 85))
-#GPIO205 = Pin((1, 69))
-#GPIO493 = Pin((1, 69))
-GPIO493 = Pin((1, 83))
-#GPIO206 = Pin((1, 70))
-#GPIO494 = Pin((1, 70))
-GPIO494 = Pin((1, 84))
-#GPIO207 = Pin((1, 71))
-#GPIO474 = Pin((1, 71))
-GPIO474 = Pin((1, 64))
-#GPIO208 = Pin((1, 72))
-#GPIO475 = Pin((1, 72))
-GPIO475 = Pin((1, 65))
-#GPIO209 = Pin((1, 73))
-#GPIO210 = Pin((1, 74))
-
-#GPIO211 = Pin((1, 75))

 GPIO460 = Pin((1, 50))
 GPIO460 = Pin((1, 50))

-#GPIO212 = Pin((1, 76))

 GPIO461 = Pin((1, 51))
 GPIO461 = Pin((1, 51))

-#GPIO213 = Pin((1, 77))

 GPIO462 = Pin((1, 52))
 GPIO462 = Pin((1, 52))

-#GPIO214 = Pin((1, 78))
-#GPIO482 = Pin((1, 78))
-GPIO482 = Pin((1, 72))
-#GPIO215 = Pin((1, 79))

 GPIO463 = Pin((1, 53))
 GPIO463 = Pin((1, 53))

-#GPIO216 = Pin((1, 80))
+GPIO464 = Pin((1, 54))

 GPIO465 = Pin((1, 55))
 GPIO465 = Pin((1, 55))

-#GPIO217 = Pin((1, 81))

 GPIO466 = Pin((1, 56))
 GPIO466 = Pin((1, 56))

-#GPIO218 = Pin((1, 82))
-#GPIO495 = Pin((1, 82))
-GPIO495 = Pin((1, 85))
-#GPIO219 = Pin((1, 83))
-#GPIO491 = Pin((1, 83))
-GPIO491 = Pin((1, 81))
-#GPIO220 = Pin((1, 84))

 GPIO467 = Pin((1, 57))
 GPIO467 = Pin((1, 57))

-#GPIO221 = Pin((1, 85))

 GPIO468 = Pin((1, 58))
 GPIO468 = Pin((1, 58))

-#GPIO222 = Pin((1, 86))

 GPIO469 = Pin((1, 59))
 GPIO469 = Pin((1, 59))

-#GPIO223 = Pin((1, 87))

 GPIO470 = Pin((1, 60))
 GPIO470 = Pin((1, 60))

-#GPIO224 = Pin((1, 88))
-#GPIO472 = Pin((1, 88))

 GPIO472 = Pin((1, 62))
 GPIO472 = Pin((1, 62))

-#GPIO225 = Pin((1, 89))
-#GPIO464 = Pin((1, 89))
-GPIO464 = Pin((1, 54))
-#GPIO226 = Pin((1, 90))

 GPIO471 = Pin((1, 61))
 GPIO471 = Pin((1, 61))

-#GPIO227 = Pin((1, 91))

 GPIO472 = Pin((1, 62))
 GPIO472 = Pin((1, 62))

-
-#GPIO228 = Pin((1, 92))
-#GPIO490 = Pin((1, 92))
-GPIO490 = Pin((1, 80))
-#GPIO229 = Pin((1, 93))
-#GPIO486 = Pin((1, 93))
-GPIO486 = Pin((1, 76))
-#GPIO230 = Pin((1, 94))
-#GPIO487 = Pin((1, 94))
-GPIO487 = Pin((1, 77))
-#GPIO231 = Pin((1, 95))
-#GPIO478 = Pin((1, 95))
-GPIO478 = Pin((1, 68))
-#GPIO232 = Pin((1, 96))
-#GPIO485 = Pin((1, 96))
-GPIO485 = Pin((1, 75))
-#GPIO233 = Pin((1, 97))
-#GPIO477 = Pin((1, 97))
+GPIO473 = Pin((1, 63))
+GPIO474 = Pin((1, 64))
+GPIO475 = Pin((1, 65))
+GPIO476 = Pin((1, 66))

 GPIO477 = Pin((1, 67))
 GPIO477 = Pin((1, 67))

-#GPIO234 = Pin((1, 98))
-#GPIO481 = Pin((1, 98))
+GPIO478 = Pin((1, 68))
+GPIO479 = Pin((1, 69))
+GPIO480 = Pin((1, 70))

 GPIO481 = Pin((1, 71))
 GPIO481 = Pin((1, 71))

-#GPIO235 = Pin((1, 99))
-#GPIO484 = Pin((1, 99))
-GPIO484 = Pin((1, 74))
-#GPIO236 = Pin((1, 100))
-#GPIO476 = Pin((1, 100))
-GPIO476 = Pin((1, 66))
-#GPIO237 = Pin((1, 101))
-#GPIO483 = Pin((1, 101))
+GPIO482 = Pin((1, 72))

 GPIO483 = Pin((1, 73))
 GPIO483 = Pin((1, 73))

-#GPIO238 = Pin((1, 102))
-#GPIO492 = Pin((1, 102))
-GPIO492 = Pin((1, 82))
-#GPIO239 = Pin((1, 103))
-#GPIO480 = Pin((1, 103))
-GPIO480 = Pin((1, 70))
-#GPIO240 = Pin((1, 104))
-#GPIO488 = Pin((1, 104))
+GPIO484 = Pin((1, 74))
+GPIO485 = Pin((1, 75))
+GPIO486 = Pin((1, 76))
+GPIO487 = Pin((1, 77))

 GPIO488 = Pin((1, 78))
 GPIO488 = Pin((1, 78))

-#GPIO241 = Pin((1, 105))
-#GPIO489 = Pin((1, 105))

 GPIO489 = Pin((1, 79))
 GPIO489 = Pin((1, 79))

-#GPIO242 = Pin((1, 106))
-GPIO474 = Pin((1, 64))
-#GPIO243 = Pin((1, 107))
-GPIO475 = Pin((1, 65))
-#GPIO247 = Pin((1, 111))
-#GPIO479 = Pin((1, 111))
-GPIO479 = Pin((1, 69))
-#GPIO248 = Pin((1, 112))
-#???GPIO248 = Pin((1, 112))
-#GPIO249 = Pin((1, 113))
-#GPIO473 = Pin((1, 113))
-GPIO473 = Pin((1, 63))
+GPIO490 = Pin((1, 80))
+GPIO491 = Pin((1, 81))
+GPIO492 = Pin((1, 82))
+GPIO493 = Pin((1, 83))
+GPIO494 = Pin((1, 84))
+GPIO495 = Pin((1, 85))

 
 

-#I2C0_SDA = GPIO205

 I2C2_SDA = GPIO493
 I2C2_SDA = GPIO493

-#I2C0_SCL = GPIO206

 I2C2_SCL = GPIO494
 I2C2_SCL = GPIO494

-#I2C1_SDA = GPIO207

 I2C3_SDA = GPIO474
 I2C3_SDA = GPIO474

-#I2C1_SCL = GPIO208

 I2C3_SCL = GPIO475
 I2C3_SCL = GPIO475

-#I2C2_SDA = GPIO209
-#I2C2_SCL = GPIO210

 
 

-#UART1_TX = GPIO240

 UART1_TX = GPIO488
 UART1_TX = GPIO488

-#UART1_RX = GPIO241

 UART1_RX = GPIO489
 UART1_RX = GPIO489

-#UART2_TX = GPIO205
-#UART2_RX = GPIO206

 
 

-#SPI0_SCLK = GPIO230

 SPI0_SCLK = GPIO487
 SPI0_SCLK = GPIO487

-#SPI0_MISO = GPIO232

 SPI0_MISO = GPIO485
 SPI0_MISO = GPIO485

-#SPI0_MOSI = GPIO235

 SPI0_MOSI = GPIO484
 
 SPI0_MOSI = GPIO484
 

-#i2cPorts = ( (0, I2C0_SCL, I2C0_SDA), (1, I2C1_SCL, I2C1_SDA), )

 i2cPorts = ( (2, I2C2_SCL, I2C2_SDA), (3, I2C3_SCL, I2C3_SDA), )
 # ordered as spiId, sckId, mosiId, misoId
 spiPorts = ( (0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO), )
 # ordered as uartId, txId, rxId
 i2cPorts = ( (2, I2C2_SCL, I2C2_SDA), (3, I2C3_SCL, I2C3_SDA), )
 # ordered as spiId, sckId, mosiId, misoId
 spiPorts = ( (0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO), )
 # ordered as uartId, txId, rxId

-#uartPorts = ( (1, UART1_TX, UART1_RX), (2, UART2_TX, UART2_RX), )

 uartPorts = ( (1, UART1_TX, UART1_RX), )
 uartPorts = ( (1, UART1_TX, UART1_RX), )

diff --git a/src/board.py b/src/board.py
index a92f94008655d9b8405791faa9385fd56d49dc48..5065b2f1f0bb4923eb39f701e3ff22334c18cb63 100755 (executable)
--- a/src/board.py
+++ b/src/board.py
@@ -85,12 +85,12 @@ elif board_id == ap_board.JETSON_NANO:
 elif board_id == ap_board.CORAL_EDGE_TPU_DEV:
     from adafruit_blinka.board.coral_edge_tpu import *
 
 elif board_id == ap_board.CORAL_EDGE_TPU_DEV:
     from adafruit_blinka.board.coral_edge_tpu import *
 

-#elif board_id == ap_board.ODROID_C2:
-    #from adafruit_blinka.board.odroidc2 import *
+elif board_id == ap_board.ODROID_C2:
+    from adafruit_blinka.board.odroidc2 import *

 
 elif board_id == ap_board.ODROID_N2:
    from adafruit_blinka.board.odroidn2 import *
 
 elif board_id == ap_board.ODROID_N2:
    from adafruit_blinka.board.odroidn2 import *

-# error above
+

 elif board_id == ap_board.DRAGONBOARD_410C:
     from adafruit_blinka.board.dragonboard_410c import *
 
 elif board_id == ap_board.DRAGONBOARD_410C:
     from adafruit_blinka.board.dragonboard_410c import *