samd/boards: Rework the pins.csv files.

Changes are: - Remove the LED_Pxxx definitions from pins.csv, now that the LED class is gone. - Remove the '-' lines. - Add default lines for USB and SWCLK, SWDIO.
micropython · Oct 25, 2022 · ac1e312 · ac1e312
1 parent a6760bd
commit ac1e312
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 34 deletions.
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
@@ -5,6 +5,9 @@
 # Rows for empty entries have to start with '-'
 # Empty lines and lines starting with # are ignored
 
+PIN_PA27,LED_TX
+PIN_PB03,LED_RX
+
 PIN_PA11,D0
 PIN_PA10,D1
 PIN_PA14,D2
@@ -35,6 +38,8 @@ PIN_PB11,SCK
 PIN_PA06,NEOPIXEL
 PIN_PA13,FLASH_CS
 
-LED_PA17,LED
-LED_PA27,LED_TX
-LED_PB03,LED_RX
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
@@ -7,12 +7,9 @@
 
 PIN_PB17,D0
 PIN_PB16,D1
--
--
 PIN_PA14,D4
 PIN_PA16,D5
 PIN_PA18,D6
--
 PIN_PB03,D8
 PIN_PA19,D9
 PIN_PA20,D10
@@ -40,4 +37,9 @@ PIN_PA09,FLASH_MISO
 PIN_PA10,FLASH_WP
 PIN_PA11,FLASH_HOLD
 
-LED_PA17,LED
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+PIN_PA26,USB_SOF
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
@@ -11,9 +11,7 @@ PIN_PA14,D2
 PIN_PA09,D3
 PIN_PA08,D4
 PIN_PA15,D5
--
 PIN_PA21,D7
--
 PIN_PA07,D9
 PIN_PA18,D10
 PIN_PA16,D11
@@ -37,4 +35,8 @@ PIN_PB03,FLASH_MISO
 PIN_PB23,FLASH_SCK
 PIN_PA27,FLASH_CS
 
-LED_PA17,LED
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
@@ -11,9 +11,7 @@ PIN_PA07,D2
 PIN_PB22,D3
 PIN_PA14,D4
 PIN_PA15,D5
--
 PIN_PA18,D7
--
 PIN_PA19,D9
 PIN_PA20,D10
 PIN_PA21,D11
@@ -39,4 +37,9 @@ PIN_PA09,FLASH_MISO
 PIN_PA10,FLASH_WP
 PIN_PA11,FLASH_HOLD
 
-LED_PA22,LED
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+PIN_PA26,USB_SOF
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv
@@ -13,4 +13,10 @@ PIN_PA06,D4
 PIN_PA00,DOTSTAR_DATA
 PIN_PA01,DOTSTAR_CLK
 
-LED_PA10,LED
+PIN_PA10,LED
+
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
diff --git a/ports/samd/boards/MINISAM_M4/pins.csv b/ports/samd/boards/MINISAM_M4/pins.csv
@@ -27,4 +27,11 @@ PIN_PA01,SCK
 PIN_PB03,DOTSTAR_DATA
 PIN_PB02,DOTSTAR_CLK
 
-LED_PA15,LED
+PIN_PA15,LED
+
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+PIN_PA26,USB_SOF
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv
@@ -32,8 +32,6 @@ PIN_PB12,EXT2_PIN7
 PIN_PB13,EXT2_PIN8
 PIN_PB14,EXT2_PIN9
 PIN_PB15,EXT2_PIN10
--
--
 PIN_PB11,EXT2_PIN13
 PIN_PB10,EXT2_PIN14
 PIN_PA17,EXT2_PIN15
@@ -44,20 +42,21 @@ PIN_PA19,EXT2_PIN18
 # EXT3
 PIN_PA02,EXT3_PIN3
 PIN_PA03,EXT3_PIN4
--
 PIN_PA15,EXT3_PIN6
 PIN_PA12,EXT3_PIN7
 PIN_PA13,EXT3_PIN8
 PIN_PA28,EXT3_PIN9
 PIN_PA27,EXT3_PIN10
--
--
--
--
 PIN_PB17,EXT3_PIN15
 PIN_PB22,EXT3_PIN16
 PIN_PB16,EXT3_PIN17
 PIN_PB23,EXT3_PIN18
 
-LED_PB30,LED
+PIN_PB30,LED
+
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
 
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
@@ -60,5 +60,12 @@ PIN_PC13,LCD_YD
 PIN_PC30,MIC
 PIN_PD11,BUZZER
 
-LED_PA15,LED_BLUE
-LED_PC05,LED_LCD
+PIN_PA15,LED_BLUE
+PIN_PC05,LED_LCD
+
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+PIN_PA26,USB_SOF
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
diff --git a/ports/samd/boards/SEEED_XIAO/pins.csv b/ports/samd/boards/SEEED_XIAO/pins.csv
@@ -17,6 +17,12 @@ PIN_PA07,A8_D8
 PIN_PA05,A9_D9
 PIN_PA06,A10_D10
 
-LED_PA17,USER_LED
-LED_PA18,RX_LED
-LED_PA19,TX_LED
+PIN_PA17,USER_LED
+PIN_PA18,RX_LED
+PIN_PA19,TX_LED
+
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv
@@ -13,7 +13,6 @@ PIN_PA06,D4
 PIN_PA15,D5
 PIN_PA20,D6
 PIN_PA21,D7
--
 PIN_PA07,D9
 PIN_PA18,D10
 PIN_PA16,D11
@@ -34,9 +33,13 @@ PIN_PA08,FLASH_MOSI
 PIN_PA09,FLASH_SCK
 PIN_PA10,FLASH_CS
 PIN_PA11,FLASH_MISO
-PIN_PA30,SWDCLK
-PIN_PA31,SWDIO
 
-LED_PA17,LED
-LED_PB03,RXLED
-LED_PA27,TXLED
+PIN_PB03,RXLED
+PIN_PA27,TXLED
+
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+PIN_PA26,USB_SOF
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO