checkpoint

scripts/carriers-update/generator-config.js

@@ -5552,7 +5552,7 @@ const schemaDocs = require('./schema-docs');
                 return updater.generatePinInfo({
                     style: 'pinFunction',
                     platformNew: 'm-hat-m2',
-                    noPinNumbers: false,
+                    noPinNumbers: true, // num is M.2 pin number, which doesn't make sense
                     sortByNum: true,
                     includeDesc: false,
                     noPWM: true,
@@ -5574,8 +5574,12 @@ const schemaDocs = require('./schema-docs');
                             title: 'Description'
                         },
                         {
-                            key: 'rpi',
-                            title: 'Pi HAT Pin',
+                            key: 'rpiGPIO',
+                            title: 'Pi Pin',
+                        },
+                        {
+                            key: 'rpiFunction',
+                            title: 'Pi Function',
                         }
                     ],
                     functionCols: [],

src/assets/files/pinInfo.json

@@ -850,7 +850,8 @@
           "direction": "O",
           "isIO": true,
           "net": "M2_TXD",
-          "rpi": "GPIO15/UART0_RX",
+          "rpiFunction": "UART0_RX",
+          "rpiGPIO": "GPIO15",
           "serial": "Serial1 TX|TX. Use Serial1 object.",
           "somPin": "TX"
         },
@@ -872,7 +873,8 @@
           "direction": "I",
           "isIO": true,
           "net": "M2_RXD",
-          "rpi": "GPIO14/UART0_TX",
+          "rpiFunction": "UART0_TX",
+          "rpiGPIO": "GPIO14",
           "serial": "Serial1 RX|RX. Use Serial1 object.",
           "somPin": "RX"
         },
@@ -884,7 +886,8 @@
           "direction": "I",
           "isIO": true,
           "net": "M2_D3/CTS",
-          "rpi": "GPIO17/UART0_RTS",
+          "rpiFunction": "UART0_RTS",
+          "rpiGPIO": "GPIO17",
           "serial": "Serial1 CTS|CTS. Use Serial1 object.",
           "somPin": "RESERVED"
         },
@@ -906,7 +909,8 @@
           "direction": "O",
           "isIO": true,
           "net": "M2_D2/RTS",
-          "rpi": "GPIO16/UART0_CTS",
+          "rpiFunction": "UART0_CTS",
+          "rpiGPIO": "GPIO16",
           "serial": "Serial1 RTS|RTS. Use Serial1 object.",
           "somPin": "RESERVED"
         },
@@ -930,7 +934,8 @@
           "direction": "O",
           "isIO": true,
           "net": "WAKE_RPI_CTR",
-          "pi": "GPIO4"
+          "rpiFunction": "",
+          "rpiGPIO": "GPIO4"
         },
         {
           "num": 51,

src/content/reference/datasheets/m-series/m-hat-datasheet.md

@@ -194,13 +194,13 @@ The 40-pin Raspberry Pi HAT connector is primarily left for use by the Pi and ad
 
 {{!-- BEGIN do not edit content below, it is automatically generated 04c52083-eb85-46a7-b2a7-c366be119571 --}}
 
-| Module Pin | Pin Name | Schematic net | MCU direction | Description | Pi HAT Pin |
-| :---: | :--- | :--- | :--- | :--- | :--- |
-| 36 | TXD | M2_TXD | O | UART serial TXD, connects to Pi UART0 RXD | GPIO15/UART0_RX |
-| 38 | RXD | M2_RXD | I | UART serial RXD, connects to Pi UART0 TXD | GPIO14/UART0_TX |
-| 40 | CTS | M2_D3/CTS | I | UART serial CTS, connects to Pi UART0 RTS | GPIO17/UART0_RTS |
-| 42 | RTS | M2_D2/RTS | O | UART serial RTS, connects to Pi UART0 CTS | GPIO16/UART0_CTS |
-| 48 | CS | WAKE_RPI_CTR | O | Pi power control by GPIO4 |   |
+| Pin Name | Schematic net | MCU direction | Description | Pi Pin | Pi Function |
+| :--- | :--- | :--- | :--- | :--- | :--- |
+| TXD | M2_TXD | O | UART serial TXD, connects to Pi UART0 RXD | GPIO15 | UART0_RX |
+| RXD | M2_RXD | I | UART serial RXD, connects to Pi UART0 TXD | GPIO14 | UART0_TX |
+| CTS | M2_D3/CTS | I | UART serial CTS, connects to Pi UART0 RTS | GPIO17 | UART0_RTS |
+| RTS | M2_D2/RTS | O | UART serial RTS, connects to Pi UART0 CTS | GPIO16 | UART0_CTS |
+| CS | WAKE_RPI_CTR | O | Pi power control by GPIO4 | GPIO4 |   |
 
 
 {{!-- END do not edit content above, it is automatically generated--}}

src/pinInfo/platforms/m-hat-m2.json

@@ -113,7 +113,8 @@
             "direction": "O",
             "isIO": true,
             "net": "M2_TXD",
-            "rpi": "GPIO15/UART0_RX",
+            "rpiFunction": "UART0_RX",
+            "rpiGPIO": "GPIO15",
             "serial": "Serial1 TX|TX. Use Serial1 object.",
             "somPin": "TX"
         },
@@ -135,7 +136,8 @@
             "direction": "I",
             "isIO": true,
             "net": "M2_RXD",
-            "rpi": "GPIO14/UART0_TX",
+            "rpiFunction": "UART0_TX",
+            "rpiGPIO": "GPIO14",
             "serial": "Serial1 RX|RX. Use Serial1 object.",
             "somPin": "RX"
         },
@@ -147,7 +149,8 @@
             "direction": "I",
             "isIO": true,
             "net": "M2_D3/CTS",
-            "rpi": "GPIO17/UART0_RTS",
+            "rpiFunction": "UART0_RTS",
+            "rpiGPIO": "GPIO17",
             "serial": "Serial1 CTS|CTS. Use Serial1 object.",
             "somPin": "RESERVED"
         },
@@ -169,7 +172,8 @@
             "direction": "O",
             "isIO": true,
             "net": "M2_D2/RTS",
-            "rpi": "GPIO16/UART0_CTS",
+            "rpiFunction": "UART0_CTS",
+            "rpiGPIO": "GPIO16",
             "serial": "Serial1 RTS|RTS. Use Serial1 object.",
             "somPin": "RESERVED"
         },
@@ -193,7 +197,8 @@
             "direction": "O",
             "isIO": true,
             "net": "WAKE_RPI_CTR",
-            "pi": "GPIO4"
+            "rpiFunction": "",
+            "rpiGPIO": "GPIO4"
         },
         {
             "num": 51,