micropython · robert-hh · Jul 15, 2023 · Jul 18, 2023 · Aug 13, 2023
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
@@ -56,7 +56,7 @@ INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/include
 INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/include/pio
 INC += -I$(TOP)/lib/tinyusb/src
 
-MAKE_PIN_AF = boards/make-pin-table.py
+MAKE_PIN_AF = boards/make-pins.py
 PIN_AF_TABLE_CSV = mcu/$(MCU_SERIES_LOWER)/pin-af-table.csv
 BOARD_PINS = $(BOARD_DIR)/pins.csv
 GEN_PIN_AF = pin_af_table.c
@@ -210,6 +210,6 @@ pin_af.c: $(BUILD)/$(GEN_PIN_AF) | $(HEADER_BUILD)
 
 $(BUILD)/$(GEN_PIN_AF): $(PIN_AF_TABLE_CSV) $(BOARD_PINS) | $(HEADER_BUILD)
 	$(ECHO) "Create $@"
-	$(Q)$(PYTHON) $(MAKE_PIN_AF) --csv $(PIN_AF_TABLE_CSV) --board $(BOARD_PINS) --table $(BUILD)/$(GEN_PIN_AF) --mcu $(MCU_SERIES)
+	$(Q)$(PYTHON) $(MAKE_PIN_AF) --af-csv $(PIN_AF_TABLE_CSV) --board-csv $(BOARD_PINS) --output-source $(BUILD)/$(GEN_PIN_AF) --mcu $(MCU_SERIES)
 
 include $(TOP)/py/mkrules.mk
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
@@ -1,43 +1,43 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines starting with # are ignored
+# The lines contain pairs of Pin name and Pin number.
+# Pin names must be valid Python identifiers.
+# Pin numbers have the form PIN_Pxnn, with x being A, B, C or D.
+# Lines starting with # or empty lines are ignored.
 
-PIN_PA27,LED_TX
-PIN_PB03,LED_RX
+LED_TX,PIN_PA27
+LED_RX,PIN_PB03
 
-PIN_PA11,D0
-PIN_PA10,D1
-PIN_PA08,FLASH_MOSI
-PIN_PA14,FLASH_MISO
-PIN_PA09,FLASH_SCK
-PIN_PA15,D5
-PIN_PA20,D6
-PIN_PA21,D7
-PIN_PA06,D8
-PIN_PA07,D9
-PIN_PA18,D10
-PIN_PA16,D11
-PIN_PA19,D12
-PIN_PA17,D13
-PIN_PA02,A0
-PIN_PB08,A1
-PIN_PB09,A2
-PIN_PA04,A3
-PIN_PA05,A4
-PIN_PB02,A5
-PIN_PB22,TX
-PIN_PB23,RX
-PIN_PA23,SCL
-PIN_PA22,SDA
-PIN_PB10,MOSI
-PIN_PA12,MISO
-PIN_PB11,SCK
-PIN_PA06,NEOPIXEL
-PIN_PA13,FLASH_CS
+D0,PIN_PA11
+D1,PIN_PA10
+FLASH_MOSI,PIN_PA08
+FLASH_MISO,PIN_PA14
+FLASH_SCK,PIN_PA09
+D5,PIN_PA15
+D6,PIN_PA20
+D7,PIN_PA21
+D8,PIN_PA06
+D9,PIN_PA07
+D10,PIN_PA18
+D11,PIN_PA16
+D12,PIN_PA19
+D13,PIN_PA17
+A0,PIN_PA02
+A1,PIN_PB08
+A2,PIN_PB09
+A3,PIN_PA04
+A4,PIN_PA05
+A5,PIN_PB02
+TX,PIN_PB22
+RX,PIN_PB23
+SCL,PIN_PA23
+SDA,PIN_PA22
+MOSI,PIN_PB10
+MISO,PIN_PA12
+SCK,PIN_PB11
+NEOPIXEL,PIN_PA06
+FLASH_CS,PIN_PA13
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
+USB_DM,PIN_PA24
+USB_DP,PIN_PA25
 
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PIN_PA30
+SWDIO,PIN_PA31
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
@@ -1,44 +1,44 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines not starting with PIN_ are ignored
+# The lines contain pairs of Pin name and Pin number.
+# Pin names must be valid Python identifiers.
+# Pin numbers have the form PIN_Pxnn, with x being A, B, C or D.
+# Lines starting with # or empty lines are ignored.
 
-PIN_PB17,D0
-PIN_PB16,D1
-PIN_PA14,D4
-PIN_PA16,D5
-PIN_PA18,D6
-PIN_PB03,D8
-PIN_PA19,D9
-PIN_PA20,D10
-PIN_PA21,D11
-PIN_PA22,D12
-PIN_PA23,D13
-PIN_PA02,A0
-PIN_PA05,A1
-PIN_PB08,A2
-PIN_PB09,A3
-PIN_PA04,A4
-PIN_PB06,A5
-PIN_PA13,SCL
-PIN_PA12,SDA
-PIN_PB23,MOSI
-PIN_PB22,MISO
-PIN_PA17,SCK
-PIN_PB01,VDIV
-PIN_PA03,AREF
-PIN_PB03,NEOPIXEL
+D0,PIN_PB17
+D1,PIN_PB16
+D4,PIN_PA14
+D5,PIN_PA16
+D6,PIN_PA18
+D8,PIN_PB03
+D9,PIN_PA19
+D10,PIN_PA20
+D11,PIN_PA21
+D12,PIN_PA22
+D13,PIN_PA23
+A0,PIN_PA02
+A1,PIN_PA05
+A2,PIN_PB08
+A3,PIN_PB09
+A4,PIN_PA04
+A5,PIN_PB06
+SCL,PIN_PA13
+SDA,PIN_PA12
+MOSI,PIN_PB23
+MISO,PIN_PB22
+SCK,PIN_PA17
+VDIV,PIN_PB01
+AREF,PIN_PA03
+NEOPIXEL,PIN_PB03
 
-PIN_PB11,QSPI_CS
-PIN_PB10,QSPI_SCK
-PIN_PA08,QSPI_D0
-PIN_PA09,QSPI_D1
-PIN_PA10,QSPI_D2
-PIN_PA11,QSPI_D3
+QSPI_CS,PIN_PB11
+QSPI_SCK,PIN_PB10
+QSPI_D0,PIN_PA08
+QSPI_D1,PIN_PA09
+QSPI_D2,PIN_PA10
+QSPI_D3,PIN_PA11
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
-PIN_PA26,USB_SOF
+USB_DM,PIN_PA24
+USB_DP,PIN_PA25
+USB_SOF,PIN_PA26
 
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PIN_PA30
+SWDIO,PIN_PA31
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
@@ -1,40 +1,40 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines not starting with PIN_ are ignored
+# The lines contain pairs of Pin name and Pin number.
+# Pin names must be valid Python identifiers.
+# Pin numbers have the form PIN_Pxnn, with x being A, B, C or D.
+# Lines starting with # or empty lines are ignored.
 
-PIN_PA11,D0
-PIN_PA10,D1
-PIN_PA14,D2
-PIN_PA09,D3
-PIN_PA08,D4
-PIN_PA15,D5
-PIN_PA21,D7
-PIN_PA07,D9
-PIN_PA18,D10
-PIN_PA16,D11
-PIN_PA19,D12
-PIN_PA17,D13
-PIN_PA02,A0
-PIN_PB08,A1
-PIN_PB09,A2
-PIN_PA04,A3
-PIN_PA05,A4
-PIN_PB02,A5
-PIN_PA22,SDA
-PIN_PA23,SCL
-PIN_PB10,MOSI
-PIN_PA12,MISO
-PIN_PB11,SCK
-PIN_PA00,DOTSTAR_CLK
-PIN_PA01,DOTSTAR_DATA
-PIN_PB22,FLASH_MOSI
-PIN_PB03,FLASH_MISO
-PIN_PB23,FLASH_SCK
-PIN_PA27,FLASH_CS
+D0,PIN_PA11
+D1,PIN_PA10
+D2,PIN_PA14
+D3,PIN_PA09
+D4,PIN_PA08
+D5,PIN_PA15
+D7,PIN_PA21
+D9,PIN_PA07
+D10,PIN_PA18
+D11,PIN_PA16
+D12,PIN_PA19
+D13,PIN_PA17
+A0,PIN_PA02
+A1,PIN_PB08
+A2,PIN_PB09
+A3,PIN_PA04
+A4,PIN_PA05
+A5,PIN_PB02
+SDA,PIN_PA22
+SCL,PIN_PA23
+MOSI,PIN_PB10
+MISO,PIN_PA12
+SCK,PIN_PB11
+DOTSTAR_CLK,PIN_PA00
+DOTSTAR_DATA,PIN_PA01
+FLASH_MOSI,PIN_PB22
+FLASH_MISO,PIN_PB03
+FLASH_SCK,PIN_PB23
+FLASH_CS,PIN_PA27
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
+USB_DM,PIN_PA24
+USB_DP,PIN_PA25
 
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PIN_PA30
+SWDIO,PIN_PA31
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
@@ -1,44 +1,44 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines not starting with PIN_ are ignored
+# The lines contain pairs of Pin name and Pin number.
+# Pin names must be valid Python identifiers.
+# Pin numbers have the form PIN_Pxnn, with x being A, B, C or D.
+# Lines starting with # or empty lines are ignored.
 
-PIN_PA16,D0
-PIN_PA17,D1
-PIN_PA07,D2
-PIN_PB22,D3
-PIN_PA14,D4
-PIN_PA15,D5
-PIN_PA18,D7
-PIN_PA19,D9
-PIN_PA20,D10
-PIN_PA21,D11
-PIN_PA23,D12
-PIN_PA22,D13
-PIN_PA02,A0
-PIN_PA05,A1
-PIN_PB08,A2
-PIN_PB09,A3
-PIN_PA04,A4
-PIN_PA06,A5
-PIN_PA12,SDA
-PIN_PA13,SCL
-PIN_PA00,MOSI
-PIN_PB23,MISO
-PIN_PA01,SCK
-PIN_PB02,DOTSTAR_CLK
-PIN_PB03,DOTSTAR_DATA
+D0,PIN_PA16
+D1,PIN_PA17
+D2,PIN_PA07
+D3,PIN_PB22
+D4,PIN_PA14
+D5,PIN_PA15
+D7,PIN_PA18
+D9,PIN_PA19
+D10,PIN_PA20
+D11,PIN_PA21
+D12,PIN_PA23
+D13,PIN_PA22
+A0,PIN_PA02
+A1,PIN_PA05
+A2,PIN_PB08
+A3,PIN_PB09
+A4,PIN_PA04
+A5,PIN_PA06
+SDA,PIN_PA12
+SCL,PIN_PA13
+MOSI,PIN_PA00
+MISO,PIN_PB23
+SCK,PIN_PA01
+DOTSTAR_CLK,PIN_PB02
+DOTSTAR_DATA,PIN_PB03
 
-PIN_PB11,QSPI_CS
-PIN_PB10,QSPI_SCK
-PIN_PA08,QSPI_D0
-PIN_PA09,QSPI_D1
-PIN_PA10,QSPI_D2
-PIN_PA11,QSPI_D3
+QSPI_CS,PIN_PB11
+QSPI_SCK,PIN_PB10
+QSPI_D0,PIN_PA08
+QSPI_D1,PIN_PA09
+QSPI_D2,PIN_PA10
+QSPI_D3,PIN_PA11
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
-PIN_PA26,USB_SOF
+USB_DM,PIN_PA24
+USB_DP,PIN_PA25
+USB_SOF,PIN_PA26
 
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PIN_PA30
+SWDIO,PIN_PA31