Resolve #35 add a board to board connector to prepare daughterboards.

hardware/billofmat/dscomm-bill.csv

@@ -33,7 +33,7 @@
 32;"J2";"USB_C_Receptacle_HRO_TYPE-C-31-M-12";1;"USB_C_Receptacle_USB2.0";;;;
 33;"J4";"Tag-Connect_TC2050-IDC-NL_2x05_P1.27mm_Vertical";1;"Conn_ARM_JTAG_SWD_10";;;;
 34;"J5";"PinHeader_1x06_P2.54mm_Horizontal";1;"Conn_01x06_Male";;;;
-35;"J6";"PinHeader_1x02_P2.54mm_Vertical";1;"Conn_01x02_Male";;;;
+35;"J7";"PinHeader_1x02_P2.54mm_Vertical";1;"Conn_01x02_Male";;;;
 36;"J1";"PinHeader_1x03_P2.54mm_Vertical";1;"Conn_01x03_Male";;;;
 37;"JP2,JP3";"PinHeader_1x02_P2.54mm_Vertical";2;"Jumper_NO_Small";;;;
 38;"JP1";"PinHeader_1x02_P2.54mm_Vertical";1;"Jumper_2_Bridged";;;;
@@ -65,5 +65,6 @@
 64;"MH3,MH6,MH9,MH12";"MountingHole_2.7mm_M2.5";4;"MountingHole";;;;
 65;"AE5";"Johanson_0868AT43A0020E_Down";1;"Antenna_Chip";;;;
 66;"TP3,TP4,TP1,TP2";"TestPoint_Keystone_5005-5009_Compact";4;"TestPoint";;;;
-67;"JP4-AE1";"SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm";1;"SolderBridge";;;;
-68;"JP6-AE2,JP7-AE5,JP8-AE4,JP9-AE6,JP10-AE7";"SolderJumper-2_P1.3mm_Open_TrianglePad1.0x1.5mm";5;"SolderJump";;;;
+67;"JP4";"SolderJumper-2_P1.3mm_Open_RoundedPad1.0x1.5mm";1;"SolderBridge";;;;
+68;"JP6,JP7,JP8,JP9,JP10";"SolderJumper-2_P1.3mm_Open_TrianglePad1.0x1.5mm";5;"SolderJump";;;;
+69;"J6";"Millmax_Pogopin_2x4_P2.54mm";1;"Conn_02x04_Top_Bottom";;;;

hardware/conn-mchip.sch

@@ -16,52 +16,52 @@ $EndDescr
 $Comp
 L Connector:Conn_01x06_Male J?
 U 1 1 6006812D
-P 3950 6200
+P 4650 6200
 AR Path="/5F53D5B5/6006812D" Ref="J?"  Part="1" 
 AR Path="/60040981/6006812D" Ref="J5"  Part="1" 
-F 0 "J5" H 4058 6581 50  0000 C CNN
-F 1 "Conn_01x06_Male" H 4058 6490 50  0000 C CNN
-F 2 "Connector_PinHeader_2.54mm:PinHeader_1x06_P2.54mm_Horizontal" H 3950 6200 50  0001 C CNN
-F 3 "~" H 3950 6200 50  0001 C CNN
-	1    3950 6200
+F 0 "J5" H 4758 6581 50  0000 C CNN
+F 1 "Conn_01x06_Male" H 4758 6490 50  0000 C CNN
+F 2 "Connector_PinHeader_2.54mm:PinHeader_1x06_P2.54mm_Horizontal" H 4650 6200 50  0001 C CNN
+F 3 "~" H 4650 6200 50  0001 C CNN
+	1    4650 6200
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR?
 U 1 1 60068133
-P 4850 6000
+P 5550 6000
 AR Path="/5F53D5B5/60068133" Ref="#PWR?"  Part="1" 
 AR Path="/60040981/60068133" Ref="#PWR031"  Part="1" 
-F 0 "#PWR031" H 4850 5750 50  0001 C CNN
-F 1 "GND" H 4855 5827 50  0000 C CNN
-F 2 "" H 4850 6000 50  0001 C CNN
-F 3 "" H 4850 6000 50  0001 C CNN
-	1    4850 6000
+F 0 "#PWR031" H 5550 5750 50  0001 C CNN
+F 1 "GND" H 5555 5827 50  0000 C CNN
+F 2 "" H 5550 6000 50  0001 C CNN
+F 3 "" H 5550 6000 50  0001 C CNN
+	1    5550 6000
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4150 6000 4850 6000
-NoConn ~ 4150 6100
-NoConn ~ 4150 6500
+	4850 6000 5550 6000
+NoConn ~ 4850 6100
+NoConn ~ 4850 6500
 Wire Wire Line
-	4150 6300 4250 6300
+	4850 6300 4950 6300
 Wire Wire Line
-	4150 6400 4250 6400
+	4850 6400 4950 6400
 $Comp
 L Connector:TestPoint TP?
 U 1 1 60068140
-P 4250 6200
+P 4950 6200
 AR Path="/5F53D5B5/60068140" Ref="TP?"  Part="1" 
 AR Path="/60040981/60068140" Ref="TP7"  Part="1" 
-F 0 "TP7" H 4308 6318 50  0000 L CNN
-F 1 "TestPoint" H 4308 6227 50  0000 L CNN
-F 2 "TestPoint:TestPoint_THTPad_D2.5mm_Drill1.2mm" H 4450 6200 50  0001 C CNN
-F 3 "~" H 4450 6200 50  0001 C CNN
-	1    4250 6200
+F 0 "TP7" H 5008 6318 50  0000 L CNN
+F 1 "TestPoint" H 5008 6227 50  0000 L CNN
+F 2 "TestPoint:TestPoint_THTPad_D2.5mm_Drill1.2mm" H 5150 6200 50  0001 C CNN
+F 3 "~" H 5150 6200 50  0001 C CNN
+	1    4950 6200
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4150 6200 4250 6200
+	4850 6200 4950 6200
 NoConn ~ 6850 4150
 NoConn ~ 6850 4250
 $Comp
@@ -150,13 +150,13 @@ Text HLabel 6950 3950 2    50   Output ~ 0
 SWDCLK
 Text HLabel 6950 3750 2    50   UnSpc ~ 0
 CMDRST
-Text HLabel 4250 6300 2    50   Input ~ 0
+Text HLabel 4950 6300 2    50   Input ~ 0
 UART_RX
-Text HLabel 4250 6400 2    50   Output ~ 0
+Text HLabel 4950 6400 2    50   Output ~ 0
 UART_TX
 Text Notes 6200 1900 0    100  ~ 0
 SWD
-Text Notes 4100 5350 0    100  ~ 0
+Text Notes 4800 5350 0    100  ~ 0
 UART
 $Comp
 L Connector:Raspberry_Pi_2_3 J3
@@ -545,4 +545,25 @@ F 3 "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" H 2450 31
 	1    2300 3100
 	1    0    0    -1  
 $EndComp
+$Comp
+L Connector_Generic:Conn_02x04_Top_Bottom J6
+U 1 1 5F9DDFF1
+P 3100 6150
+F 0 "J6" H 3150 6467 50  0000 C CNN
+F 1 "Conn_02x04_Top_Bottom" H 3150 6376 50  0000 C CNN
+F 2 "Elabdev:Millmax_Pogopin_2x4_P2.54mm" H 3100 6150 50  0001 C CNN
+F 3 "~" H 3100 6150 50  0001 C CNN
+	1    3100 6150
+	1    0    0    -1  
+$EndComp
+Text Notes 2950 5350 0    100  ~ 0
+POGO
+NoConn ~ 2900 6050
+NoConn ~ 2900 6150
+NoConn ~ 2900 6250
+NoConn ~ 2900 6350
+NoConn ~ 3400 6050
+NoConn ~ 3400 6150
+NoConn ~ 3400 6250
+NoConn ~ 3400 6350
 $EndSCHEMATC

hardware/dscomm-cache.lib

@@ -109,6 +109,37 @@ X GNDDetect 9 -100 -600 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Connector_Generic_Conn_02x04_Top_Bottom
+#
+DEF Connector_Generic_Conn_02x04_Top_Bottom J 0 40 Y N 1 F N
+F0 "J" 50 200 50 H V C CNN
+F1 "Connector_Generic_Conn_02x04_Top_Bottom" 50 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_2x??_*
+$ENDFPLIST
+DRAW
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 150 150 -250 1 1 10 f
+S 150 -195 100 -205 1 1 6 N
+S 150 -95 100 -105 1 1 6 N
+S 150 5 100 -5 1 1 6 N
+S 150 105 100 95 1 1 6 N
+X Pin_1 1 -200 100 150 R 50 50 1 1 P
+X Pin_2 2 -200 0 150 R 50 50 1 1 P
+X Pin_3 3 -200 -100 150 R 50 50 1 1 P
+X Pin_4 4 -200 -200 150 R 50 50 1 1 P
+X Pin_5 5 300 100 150 L 50 50 1 1 P
+X Pin_6 6 300 0 150 L 50 50 1 1 P
+X Pin_7 7 300 -100 150 L 50 50 1 1 P
+X Pin_8 8 300 -200 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Connector_Raspberry_Pi_2_3
 #
 DEF Connector_Raspberry_Pi_2_3 J 0 40 Y Y 1 F N

hardware/dscomm.net

@@ -1,7 +1,7 @@
 (export (version D)
   (design
     (source dscomm.sch)
-    (date "Fr 25 Sep 2020 15:33:51 CEST")
+    (date "Fr 25 Sep 2020 18:12:34 CEST")
     (tool "Eeschema 5.1.5+dfsg1-2build2")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -925,6 +925,13 @@
       (libsource (lib Connector) (part USB_C_Receptacle_USB2.0) (description "USB 2.0-only Type-C Receptacle connector"))
       (sheetpath (names /Sheet60040980/) (tstamps /60040981/))
       (tstamp 6005D73A))
+    (comp (ref J6)
+      (value Conn_02x04_Top_Bottom)
+      (footprint Elabdev:Millmax_Pogopin_2x4_P2.54mm)
+      (datasheet ~)
+      (libsource (lib Connector_Generic) (part Conn_02x04_Top_Bottom) (description "Generic connector, double row, 02x04, top/bottom pin numbering scheme (row 1: 1...pins_per_row, row2: pins_per_row+1 ... num_pins), script generated (kicad-library-utils/schlib/autogen/connector/)"))
+      (sheetpath (names /Sheet60040980/) (tstamps /60040981/))
+      (tstamp 5F9DDFF1))
     (comp (ref U8)
       (value ATECC608A)
       (footprint Package_DFN_QFN:DFN-8-1EP_3x2mm_P0.5mm_EP1.3x1.5mm)
@@ -981,7 +988,7 @@
       (libsource (lib Device) (part R) (description Resistor))
       (sheetpath (names /Sheet601C3EDD/) (tstamps /601C3EDE/))
       (tstamp 5F6990E6))
-    (comp (ref J6)
+    (comp (ref J7)
       (value Conn_01x02_Male)
       (footprint Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical)
       (datasheet ~)
@@ -1165,6 +1172,23 @@
         (pin (num B9) (name VBUS) (type passive))
         (pin (num B12) (name GND) (type passive))
         (pin (num S1) (name SHIELD) (type passive))))
+    (libpart (lib Connector_Generic) (part Conn_02x04_Top_Bottom)
+      (description "Generic connector, double row, 02x04, top/bottom pin numbering scheme (row 1: 1...pins_per_row, row2: pins_per_row+1 ... num_pins), script generated (kicad-library-utils/schlib/autogen/connector/)")
+      (docs ~)
+      (footprints
+        (fp Connector*:*_2x??_*))
+      (fields
+        (field (name Reference) J)
+        (field (name Value) Conn_02x04_Top_Bottom))
+      (pins
+        (pin (num 1) (name Pin_1) (type passive))
+        (pin (num 2) (name Pin_2) (type passive))
+        (pin (num 3) (name Pin_3) (type passive))
+        (pin (num 4) (name Pin_4) (type passive))
+        (pin (num 5) (name Pin_5) (type passive))
+        (pin (num 6) (name Pin_6) (type passive))
+        (pin (num 7) (name Pin_7) (type passive))
+        (pin (num 8) (name Pin_8) (type passive))))
     (libpart (lib Device) (part Antenna)
       (description Antenna)
       (docs ~)
@@ -1639,6 +1663,8 @@
   (libraries
     (library (logical Connector)
       (uri /usr/share/kicad/library/Connector.lib))
+    (library (logical Connector_Generic)
+      (uri /usr/share/kicad/library/Connector_Generic.lib))
     (library (logical Device)
       (uri /usr/share/kicad/library/Device.lib))
     (library (logical Elabdev)
@@ -1661,206 +1687,206 @@
       (node (ref TP3) (pin 1))
       (node (ref TP5) (pin 1)))
     (net (code 3) (name +3V3)
-      (node (ref J1) (pin 3))
+      (node (ref JP1) (pin 2))
+      (node (ref R13) (pin 1))
+      (node (ref U6) (pin 8))
+      (node (ref R9) (pin 1))
       (node (ref J4) (pin 1))
-      (node (ref U3) (pin G4))
-      (node (ref R15) (pin 1))
-      (node (ref C16) (pin 1))
-      (node (ref R11) (pin 1))
-      (node (ref U7) (pin 8))
-      (node (ref R12) (pin 1))
-      (node (ref C41) (pin 1))
-      (node (ref J3) (pin 17))
-      (node (ref R2) (pin 1))
       (node (ref J3) (pin 1))
-      (node (ref R9) (pin 1))
-      (node (ref U3) (pin H8))
-      (node (ref R14) (pin 1))
-      (node (ref JP1) (pin 2))
-      (node (ref C12) (pin 1))
-      (node (ref U8) (pin 8))
-      (node (ref R1) (pin 1))
-      (node (ref FB1) (pin 1))
+      (node (ref J3) (pin 17))
+      (node (ref U3) (pin G4))
+      (node (ref J1) (pin 3))
       (node (ref C11) (pin 1))
-      (node (ref U9) (pin 8))
       (node (ref C10) (pin 1))
+      (node (ref C16) (pin 1))
+      (node (ref R1) (pin 1))
+      (node (ref U3) (pin H8))
       (node (ref U3) (pin A8))
       (node (ref U3) (pin A7))
-      (node (ref TP2) (pin 1))
+      (node (ref R2) (pin 1))
+      (node (ref C12) (pin 1))
+      (node (ref FB1) (pin 1))
       (node (ref C42) (pin 1))
-      (node (ref R13) (pin 1))
-      (node (ref U6) (pin 8)))
+      (node (ref U8) (pin 8))
+      (node (ref U7) (pin 8))
+      (node (ref R14) (pin 1))
+      (node (ref R15) (pin 1))
+      (node (ref R12) (pin 1))
+      (node (ref R11) (pin 1))
+      (node (ref C41) (pin 1))
+      (node (ref TP2) (pin 1))
+      (node (ref U9) (pin 8)))
     (net (code 4) (name GND)
-      (node (ref U2) (pin 7))
-      (node (ref J3) (pin 9))
-      (node (ref J3) (pin 6))
-      (node (ref J3) (pin 39))
-      (node (ref U2) (pin 3))
-      (node (ref C8) (pin 2))
-      (node (ref C7) (pin 2))
-      (node (ref C11) (pin 2))
-      (node (ref C10) (pin 2))
-      (node (ref C9) (pin 2))
-      (node (ref J3) (pin 20))
+      (node (ref C32) (pin 2))
+      (node (ref C31) (pin 2))
+      (node (ref C16) (pin 2))
+      (node (ref AE3) (pin 1))
+      (node (ref C1) (pin 2))
+      (node (ref C2) (pin 2))
+      (node (ref AE6) (pin 2))
+      (node (ref AE7) (pin 2))
+      (node (ref AE4) (pin 2))
+      (node (ref C41) (pin 2))
+      (node (ref C28) (pin 2))
+      (node (ref C27) (pin 2))
+      (node (ref C26) (pin 2))
+      (node (ref C25) (pin 2))
       (node (ref C21) (pin 2))
-      (node (ref J3) (pin 30))
       (node (ref XC1) (pin 2))
-      (node (ref J3) (pin 34))
-      (node (ref R3) (pin 2))
-      (node (ref C20) (pin 2))
-      (node (ref J3) (pin 25))
-      (node (ref J4) (pin 3))
       (node (ref C18) (pin 1))
-      (node (ref BT1) (pin 2))
-      (node (ref C38) (pin 2))
-      (node (ref C36) (pin 2))
-      (node (ref C37) (pin 2))
-      (node (ref AE4) (pin 2))
-      (node (ref C39) (pin 2))
-      (node (ref AE6) (pin 2))
-      (node (ref AE7) (pin 2))
-      (node (ref R7) (pin 2))
-      (node (ref R6) (pin 2))
-      (node (ref R8) (pin 2))
-      (node (ref AE2) (pin 2))
-      (node (ref C30) (pin 2))
-      (node (ref C22) (pin 1))
-      (node (ref AE3) (pin 1))
-      (node (ref U4) (pin 8))
-      (node (ref U4) (pin 7))
-      (node (ref U4) (pin 2))
-      (node (ref U4) (pin 12))
-      (node (ref U4) (pin 10))
-      (node (ref C2) (pin 2))
-      (node (ref C1) (pin 2))
-      (node (ref C16) (pin 2))
-      (node (ref U5) (pin 2))
+      (node (ref C7) (pin 2))
+      (node (ref C8) (pin 2))
+      (node (ref U2) (pin 3))
       (node (ref SW2) (pin 2))
-      (node (ref J5) (pin 1))
       (node (ref C13) (pin 2))
+      (node (ref U4) (pin 12))
       (node (ref C4) (pin 2))
       (node (ref C14) (pin 2))
-      (node (ref J4) (pin 5))
-      (node (ref J3) (pin 14))
       (node (ref C15) (pin 2))
-      (node (ref J4) (pin 9))
+      (node (ref U7) (pin 3))
+      (node (ref C9) (pin 2))
+      (node (ref BT1) (pin 2))
+      (node (ref U7) (pin 4))
+      (node (ref C20) (pin 2))
       (node (ref C12) (pin 2))
-      (node (ref C25) (pin 2))
-      (node (ref C32) (pin 2))
-      (node (ref C26) (pin 2))
-      (node (ref C27) (pin 2))
-      (node (ref C28) (pin 2))
+      (node (ref U7) (pin 2))
+      (node (ref U7) (pin 1))
+      (node (ref R3) (pin 2))
+      (node (ref U2) (pin 7))
+      (node (ref J4) (pin 9))
+      (node (ref J3) (pin 20))
+      (node (ref J3) (pin 14))
+      (node (ref J5) (pin 1))
+      (node (ref J4) (pin 5))
+      (node (ref J4) (pin 3))
+      (node (ref C40) (pin 2))
+      (node (ref U6) (pin 3))
+      (node (ref J3) (pin 39))
+      (node (ref J3) (pin 34))
+      (node (ref J3) (pin 30))
+      (node (ref J3) (pin 9))
+      (node (ref J3) (pin 6))
+      (node (ref U6) (pin 1))
+      (node (ref U6) (pin 2))
+      (node (ref U6) (pin 4))
+      (node (ref J7) (pin 2))
+      (node (ref C42) (pin 2))
+      (node (ref U9) (pin 4))
+      (node (ref U5) (pin 2))
+      (node (ref J3) (pin 25))
+      (node (ref U8) (pin 4))
+      (node (ref C39) (pin 2))
+      (node (ref U4) (pin 10))
+      (node (ref C22) (pin 1))
+      (node (ref AE2) (pin 2))
+      (node (ref C38) (pin 2))
+      (node (ref U4) (pin 2))
+      (node (ref U4) (pin 7))
+      (node (ref U4) (pin 8))
+      (node (ref J2) (pin A1))
       (node (ref J2) (pin B12))
       (node (ref J2) (pin B1))
       (node (ref J2) (pin A12))
-      (node (ref C40) (pin 2))
       (node (ref R10) (pin 2))
-      (node (ref J2) (pin A1))
-      (node (ref C31) (pin 2))
-      (node (ref U8) (pin 4))
-      (node (ref U7) (pin 4))
-      (node (ref U7) (pin 3))
-      (node (ref C6) (pin 2))
-      (node (ref C5) (pin 2))
-      (node (ref U3) (pin G3))
+      (node (ref C37) (pin 2))
+      (node (ref C36) (pin 2))
+      (node (ref R7) (pin 2))
+      (node (ref R8) (pin 2))
+      (node (ref R6) (pin 2))
+      (node (ref C30) (pin 2))
+      (node (ref C19) (pin 1))
       (node (ref U3) (pin F2))
+      (node (ref U3) (pin D4))
+      (node (ref U3) (pin D6))
+      (node (ref U3) (pin E1))
+      (node (ref U3) (pin E2))
       (node (ref U3) (pin G2))
+      (node (ref U3) (pin A2))
+      (node (ref C5) (pin 2))
+      (node (ref C6) (pin 2))
+      (node (ref U3) (pin G3))
+      (node (ref U3) (pin G5))
       (node (ref U3) (pin G6))
       (node (ref U3) (pin G7))
       (node (ref U3) (pin H5))
-      (node (ref C41) (pin 2))
       (node (ref C3) (pin 2))
-      (node (ref U7) (pin 2))
-      (node (ref U7) (pin 1))
-      (node (ref U3) (pin G5))
-      (node (ref U3) (pin E1))
-      (node (ref TP1) (pin 1))
-      (node (ref U6) (pin 3))
-      (node (ref U6) (pin 4))
-      (node (ref U3) (pin D4))
-      (node (ref U3) (pin D6))
-      (node (ref U6) (pin 2))
-      (node (ref U3) (pin E2))
-      (node (ref J6) (pin 2))
-      (node (ref C17) (pin 2))
-      (node (ref U3) (pin B2))
       (node (ref U3) (pin B3))
       (node (ref U3) (pin B5))
+      (node (ref C11) (pin 2))
       (node (ref U3) (pin B7))
-      (node (ref U6) (pin 1))
-      (node (ref C42) (pin 2))
-      (node (ref C19) (pin 1))
-      (node (ref U3) (pin A2))
-      (node (ref U9) (pin 4)))
+      (node (ref U3) (pin B2))
+      (node (ref C10) (pin 2))
+      (node (ref C17) (pin 2))
+      (node (ref TP1) (pin 1)))
     (net (code 5) (name /Sheet60040980/ID_SC)
       (node (ref U6) (pin 6))
-      (node (ref J3) (pin 28))
       (node (ref U7) (pin 6))
-      (node (ref R12) (pin 2)))
+      (node (ref R12) (pin 2))
+      (node (ref J3) (pin 28)))
     (net (code 6) (name /Sheet60040980/ID_SD)
-      (node (ref R11) (pin 2))
       (node (ref U6) (pin 5))
-      (node (ref U7) (pin 5))
-      (node (ref J3) (pin 27)))
+      (node (ref J3) (pin 27))
+      (node (ref R11) (pin 2))
+      (node (ref U7) (pin 5)))
     (net (code 7) (name /Sheet5F53D5B4/USB_BUS)
-      (node (ref U2) (pin 6))
       (node (ref U3) (pin F3))
-      (node (ref U2) (pin 4))
-      (node (ref R5) (pin 1))
-      (node (ref C6) (pin 1))
+      (node (ref U2) (pin 6))
       (node (ref C5) (pin 1))
-      (node (ref R6) (pin 1)))
+      (node (ref R6) (pin 1))
+      (node (ref R5) (pin 1))
+      (node (ref U2) (pin 4))
+      (node (ref C6) (pin 1)))
     (net (code 8) (name /Sheet5F53D5B4/USB_P)
-      (node (ref J2) (pin A6))
-      (node (ref J2) (pin B6))
       (node (ref U3) (pin C8))
+      (node (ref J2) (pin B6))
+      (node (ref J2) (pin A6))
       (node (ref U5) (pin 1)))
     (net (code 9) (name /Sheet5F53D5B4/USB_N)
-      (node (ref U5) (pin 6))
       (node (ref U3) (pin B8))
+      (node (ref J2) (pin B7))
       (node (ref J2) (pin A7))
-      (node (ref J2) (pin B7)))
+      (node (ref U5) (pin 6)))
     (net (code 10) (name /Sheet5F53D5B4/SWDCLK)
-      (node (ref J4) (pin 4))
-      (node (ref U3) (pin C5)))
+      (node (ref U3) (pin C5))
+      (node (ref J4) (pin 4)))
     (net (code 11) (name /Sheet5F53D5B4/I2C_SCL)
-      (node (ref U3) (pin E6))
       (node (ref U9) (pin 6))
       (node (ref U8) (pin 6))
+      (node (ref U3) (pin E6))
       (node (ref R14) (pin 2)))
     (net (code 12) (name /Sheet5F53D5B4/UART_RX)
-      (node (ref U3) (pin C4))
       (node (ref J5) (pin 4))
-      (node (ref JP3) (pin 1)))
+      (node (ref JP3) (pin 1))
+      (node (ref U3) (pin C4)))
     (net (code 13) (name /Sheet5F53D5B4/CMDRST)
+      (node (ref U3) (pin B6))
+      (node (ref J4) (pin 10))
       (node (ref R9) (pin 2))
       (node (ref C20) (pin 1))
-      (node (ref J4) (pin 10))
-      (node (ref U3) (pin B6))
       (node (ref SW1) (pin 1)))
     (net (code 14) (name /Sheet5F53D5B4/SWDIO)
       (node (ref U3) (pin D5))
       (node (ref J4) (pin 2)))
     (net (code 15) (name /Sheet5F53D5B4/RFSWPWR)
       (node (ref U3) (pin F5))
-      (node (ref U4) (pin 6))
-      (node (ref C22) (pin 2))
       (node (ref XC1) (pin 4))
-      (node (ref C21) (pin 1)))
+      (node (ref U4) (pin 6))
+      (node (ref C21) (pin 1))
+      (node (ref C22) (pin 2)))
     (net (code 16) (name /Sheet5F53D5B4/POWAMP)
-      (node (ref C32) (pin 1))
-      (node (ref C31) (pin 1))
       (node (ref U3) (pin D1))
-      (node (ref L7) (pin 1))
-      (node (ref L5) (pin 2)))
+      (node (ref C31) (pin 1))
+      (node (ref L5) (pin 2))
+      (node (ref C32) (pin 1))
+      (node (ref L7) (pin 1)))
     (net (code 17) (name /Sheet5F53D5B4/HPOUT)
       (node (ref L4) (pin 2))
       (node (ref U3) (pin F1)))
     (net (code 18) (name /Sheet5F53D5B4/HFOUT)
-      (node (ref C35) (pin 1))
-      (node (ref U3) (pin B1))
       (node (ref L7) (pin 2))
-      (node (ref C39) (pin 1)))
+      (node (ref C35) (pin 1))
+      (node (ref C39) (pin 1))
+      (node (ref U3) (pin B1)))
     (net (code 19) (name /Sheet5F53D5B4/HFIN)
       (node (ref U3) (pin A1))
       (node (ref L6) (pin 2)))
@@ -1871,43 +1897,43 @@
       (node (ref U3) (pin F6))
       (node (ref U4) (pin 4)))
     (net (code 22) (name /Sheet5F53D5B4/UART_TX)
-      (node (ref J5) (pin 5))
       (node (ref JP2) (pin 1))
-      (node (ref U3) (pin D3)))
+      (node (ref U3) (pin D3))
+      (node (ref J5) (pin 5)))
     (net (code 23) (name /Sheet5F53D5B4/I2C_SDA)
-      (node (ref U8) (pin 5))
+      (node (ref U9) (pin 5))
       (node (ref R15) (pin 2))
       (node (ref U3) (pin F7))
-      (node (ref U9) (pin 5)))
+      (node (ref U8) (pin 5)))
     (net (code 24) (name "Net-(U3-PadH6)")
-      (node (ref U3) (pin H6))
-      (node (ref XC1) (pin 3)))
+      (node (ref XC1) (pin 3))
+      (node (ref U3) (pin H6)))
     (net (code 25) (name "Net-(U3-PadH7)")
       (node (ref U3) (pin H7)))
     (net (code 26) (name "Net-(R4-Pad1)")
-      (node (ref U3) (pin C6))
-      (node (ref R4) (pin 1)))
+      (node (ref R4) (pin 1))
+      (node (ref U3) (pin C6)))
     (net (code 27) (name "Net-(D1-Pad1)")
       (node (ref U3) (pin E7))
       (node (ref D1) (pin 1)))
     (net (code 28) (name "Net-(C7-Pad1)")
-      (node (ref JP1) (pin 1))
       (node (ref U2) (pin 1))
-      (node (ref C7) (pin 1)))
+      (node (ref C7) (pin 1))
+      (node (ref JP1) (pin 1)))
     (net (code 29) (name "Net-(D1-Pad2)")
-      (node (ref R1) (pin 2))
-      (node (ref D1) (pin 2)))
+      (node (ref D1) (pin 2))
+      (node (ref R1) (pin 2)))
     (net (code 30) (name "Net-(D2-Pad2)")
-      (node (ref R2) (pin 2))
-      (node (ref D2) (pin 2)))
+      (node (ref D2) (pin 2))
+      (node (ref R2) (pin 2)))
     (net (code 31) (name "Net-(D2-Pad1)")
-      (node (ref U3) (pin E8))
-      (node (ref D2) (pin 1)))
+      (node (ref D2) (pin 1))
+      (node (ref U3) (pin E8)))
     (net (code 32) (name "Net-(U3-PadH1)")
       (node (ref U3) (pin H1)))
     (net (code 33) (name "Net-(C13-Pad1)")
-      (node (ref C13) (pin 1))
-      (node (ref U3) (pin H4)))
+      (node (ref U3) (pin H4))
+      (node (ref C13) (pin 1)))
     (net (code 34) (name /Sheet5F53D5B4/CRYSTAL_XOUT-RESERVED)
       (node (ref U3) (pin G8)))
     (net (code 35) (name "Net-(U3-PadG1)")
@@ -1917,16 +1943,16 @@
     (net (code 37) (name "Net-(U3-PadF4)")
       (node (ref U3) (pin F4)))
     (net (code 38) (name "Net-(C19-Pad2)")
-      (node (ref U3) (pin A4))
       (node (ref Y1) (pin 2))
+      (node (ref U3) (pin A4))
       (node (ref C19) (pin 2)))
     (net (code 39) (name "Net-(C18-Pad2)")
+      (node (ref C18) (pin 2))
       (node (ref Y1) (pin 1))
-      (node (ref U3) (pin A3))
-      (node (ref C18) (pin 2)))
+      (node (ref U3) (pin A3)))
     (net (code 40) (name "Net-(L1-Pad2)")
-      (node (ref L1) (pin 2))
-      (node (ref U3) (pin A6)))
+      (node (ref U3) (pin A6))
+      (node (ref L1) (pin 2)))
     (net (code 41) (name "Net-(C17-Pad1)")
       (node (ref U3) (pin A5))
       (node (ref L1) (pin 1))
@@ -1944,15 +1970,15 @@
     (net (code 47) (name "Net-(U3-PadC7)")
       (node (ref U3) (pin C7)))
     (net (code 48) (name "Net-(C1-Pad1)")
-      (node (ref C1) (pin 1))
-      (node (ref C4) (pin 1))
       (node (ref C3) (pin 1))
+      (node (ref FB1) (pin 2))
+      (node (ref C4) (pin 1))
+      (node (ref C1) (pin 1))
       (node (ref C2) (pin 1))
       (node (ref U3) (pin H3))
       (node (ref C9) (pin 1))
-      (node (ref U3) (pin C2))
       (node (ref U3) (pin C1))
-      (node (ref FB1) (pin 2)))
+      (node (ref U3) (pin C2)))
     (net (code 49) (name "Net-(U3-PadB4)")
       (node (ref U3) (pin B4)))
     (net (code 50) (name "Net-(XC1-Pad1)")
@@ -1961,11 +1987,11 @@
       (node (ref J1) (pin 2))
       (node (ref U3) (pin C3)))
     (net (code 52) (name "Net-(BT1-Pad1)")
-      (node (ref J1) (pin 1))
-      (node (ref BT1) (pin 1)))
+      (node (ref BT1) (pin 1))
+      (node (ref J1) (pin 1)))
     (net (code 53) (name "Net-(R3-Pad1)")
-      (node (ref R3) (pin 1))
-      (node (ref SW1) (pin 2)))
+      (node (ref SW1) (pin 2))
+      (node (ref R3) (pin 1)))
     (net (code 54) (name "Net-(C8-Pad1)")
       (node (ref U2) (pin 2))
       (node (ref C8) (pin 1)))
@@ -2077,196 +2103,212 @@
     (net (code 106) (name "Net-(U1-Pad41)")
       (node (ref U1) (pin 41)))
     (net (code 107) (name "Net-(C24-Pad2)")
-      (node (ref C27) (pin 1))
       (node (ref L3) (pin 2))
+      (node (ref C27) (pin 1))
       (node (ref C24) (pin 2)))
     (net (code 108) (name "Net-(C23-Pad2)")
-      (node (ref L2) (pin 1))
-      (node (ref U4) (pin 1))
+      (node (ref C23) (pin 2))
       (node (ref C25) (pin 1))
-      (node (ref C23) (pin 2)))
+      (node (ref U4) (pin 1))
+      (node (ref L2) (pin 1)))
     (net (code 109) (name "Net-(C24-Pad1)")
+      (node (ref C24) (pin 1))
       (node (ref C28) (pin 1))
       (node (ref L4) (pin 1))
-      (node (ref C24) (pin 1))
       (node (ref L5) (pin 1)))
     (net (code 110) (name "Net-(AE3-Pad2)")
-      (node (ref JP5) (pin 1))
-      (node (ref AE3) (pin 2)))
+      (node (ref AE3) (pin 2))
+      (node (ref JP5) (pin 1)))
     (net (code 111) (name "Net-(JP10-Pad1)")
-      (node (ref U4) (pin 11))
-      (node (ref JP9) (pin 1))
+      (node (ref JP8) (pin 1))
+      (node (ref JP5) (pin 2))
+      (node (ref JP6) (pin 1))
       (node (ref JP10) (pin 1))
+      (node (ref JP9) (pin 1))
       (node (ref JP7) (pin 2))
       (node (ref JP4) (pin 2))
-      (node (ref JP6) (pin 1))
-      (node (ref JP5) (pin 2))
-      (node (ref JP8) (pin 1)))
+      (node (ref U4) (pin 11)))
     (net (code 112) (name "Net-(AE4-Pad1)")
-      (node (ref JP8) (pin 2))
-      (node (ref AE4) (pin 1)))
+      (node (ref AE4) (pin 1))
+      (node (ref JP8) (pin 2)))
     (net (code 113) (name "Net-(AE6-Pad1)")
-      (node (ref JP9) (pin 2))
-      (node (ref AE6) (pin 1)))
+      (node (ref AE6) (pin 1))
+      (node (ref JP9) (pin 2)))
     (net (code 114) (name "Net-(AE7-Pad1)")
-      (node (ref JP10) (pin 2))
-      (node (ref AE7) (pin 1)))
+      (node (ref AE7) (pin 1))
+      (node (ref JP10) (pin 2)))
     (net (code 115) (name "Net-(AE1-Pad1)")
-      (node (ref JP4) (pin 1))
-      (node (ref AE1) (pin 1)))
+      (node (ref AE1) (pin 1))
+      (node (ref JP4) (pin 1)))
     (net (code 116) (name "Net-(AE5-Pad2)")
       (node (ref AE5) (pin 2)))
     (net (code 117) (name "Net-(AE5-Pad1)")
-      (node (ref JP7) (pin 1))
-      (node (ref AE5) (pin 1)))
+      (node (ref AE5) (pin 1))
+      (node (ref JP7) (pin 1)))
     (net (code 118) (name "Net-(C29-Pad2)")
       (node (ref U4) (pin 9))
       (node (ref C29) (pin 2)))
     (net (code 119) (name "Net-(C29-Pad1)")
-      (node (ref C29) (pin 1))
+      (node (ref C30) (pin 1))
       (node (ref L6) (pin 1))
-      (node (ref C30) (pin 1)))
+      (node (ref C29) (pin 1)))
     (net (code 120) (name "Net-(AE2-Pad1)")
-      (node (ref AE2) (pin 1))
-      (node (ref JP6) (pin 2)))
+      (node (ref JP6) (pin 2))
+      (node (ref AE2) (pin 1)))
     (net (code 121) (name "Net-(C33-Pad2)")
-      (node (ref L8) (pin 1))
       (node (ref U4) (pin 3))
       (node (ref C33) (pin 2))
+      (node (ref L8) (pin 1))
       (node (ref C36) (pin 1)))
     (net (code 122) (name "Net-(C34-Pad1)")
+      (node (ref C34) (pin 1))
       (node (ref L9) (pin 2))
       (node (ref L10) (pin 1))
-      (node (ref C38) (pin 1))
-      (node (ref C34) (pin 1)))
+      (node (ref C38) (pin 1)))
     (net (code 123) (name "Net-(C35-Pad2)")
       (node (ref L10) (pin 2))
       (node (ref C35) (pin 2)))
     (net (code 124) (name "Net-(C23-Pad1)")
+      (node (ref L2) (pin 2))
       (node (ref C23) (pin 1))
       (node (ref C26) (pin 1))
-      (node (ref L3) (pin 1))
-      (node (ref L2) (pin 2)))
+      (node (ref L3) (pin 1)))
     (net (code 125) (name "Net-(C33-Pad1)")
-      (node (ref C34) (pin 2))
-      (node (ref C37) (pin 1))
-      (node (ref C33) (pin 1))
       (node (ref L9) (pin 1))
-      (node (ref L8) (pin 2)))
+      (node (ref C33) (pin 1))
+      (node (ref C34) (pin 2))
+      (node (ref L8) (pin 2))
+      (node (ref C37) (pin 1)))
     (net (code 126) (name "Net-(J2-PadB5)")
       (node (ref J2) (pin B5))
       (node (ref R7) (pin 1)))
-    (net (code 127) (name "Net-(J2-PadA8)")
+    (net (code 127) (name "Net-(J2-PadA5)")
+      (node (ref R8) (pin 1))
+      (node (ref J2) (pin A5)))
+    (net (code 128) (name "Net-(J2-PadA8)")
       (node (ref J2) (pin A8)))
-    (net (code 128) (name "Net-(J2-PadB8)")
+    (net (code 129) (name "Net-(J2-PadB8)")
       (node (ref J2) (pin B8)))
-    (net (code 129) (name "Net-(J2-PadA4)")
+    (net (code 130) (name "Net-(J2-PadA4)")
       (node (ref R5) (pin 2))
       (node (ref J2) (pin A4))
-      (node (ref U5) (pin 5))
       (node (ref J2) (pin A9))
-      (node (ref J2) (pin B4))
-      (node (ref J2) (pin B9)))
-    (net (code 130) (name "Net-(J2-PadA5)")
-      (node (ref J2) (pin A5))
-      (node (ref R8) (pin 1)))
+      (node (ref J2) (pin B9))
+      (node (ref U5) (pin 5))
+      (node (ref J2) (pin B4)))
     (net (code 131) (name "Net-(J3-Pad8)")
-      (node (ref J3) (pin 8))
-      (node (ref JP2) (pin 2)))
+      (node (ref JP2) (pin 2))
+      (node (ref J3) (pin 8)))
     (net (code 132) (name "Net-(J3-Pad10)")
       (node (ref J3) (pin 10))
       (node (ref JP3) (pin 2)))
     (net (code 133) (name "Net-(C40-Pad1)")
+      (node (ref C40) (pin 1))
       (node (ref J2) (pin S1))
-      (node (ref R10) (pin 1))
-      (node (ref C40) (pin 1)))
-    (net (code 134) (name "Net-(U5-Pad3)")
-      (node (ref U5) (pin 3)))
-    (net (code 135) (name "Net-(U5-Pad4)")
+      (node (ref R10) (pin 1)))
+    (net (code 134) (name "Net-(J6-Pad8)")
+      (node (ref J6) (pin 8)))
+    (net (code 135) (name "Net-(J6-Pad7)")
+      (node (ref J6) (pin 7)))
+    (net (code 136) (name "Net-(J6-Pad6)")
+      (node (ref J6) (pin 6)))
+    (net (code 137) (name "Net-(J6-Pad5)")
+      (node (ref J6) (pin 5)))
+    (net (code 138) (name "Net-(J6-Pad4)")
+      (node (ref J6) (pin 4)))
+    (net (code 139) (name "Net-(J6-Pad3)")
+      (node (ref J6) (pin 3)))
+    (net (code 140) (name "Net-(J6-Pad2)")
+      (node (ref J6) (pin 2)))
+    (net (code 141) (name "Net-(J6-Pad1)")
+      (node (ref J6) (pin 1)))
+    (net (code 142) (name "Net-(U5-Pad4)")
       (node (ref U5) (pin 4)))
-    (net (code 136) (name "Net-(J4-Pad8)")
+    (net (code 143) (name "Net-(U5-Pad3)")
+      (node (ref U5) (pin 3)))
+    (net (code 144) (name "Net-(J4-Pad8)")
       (node (ref J4) (pin 8)))
-    (net (code 137) (name "Net-(J4-Pad7)")
-      (node (ref J4) (pin 7)))
-    (net (code 138) (name "Net-(J4-Pad6)")
-      (node (ref J4) (pin 6)))
-    (net (code 139) (name "Net-(J3-Pad12)")
-      (node (ref J3) (pin 12)))
-    (net (code 140) (name "Net-(J3-Pad2)")
+    (net (code 145) (name "Net-(J3-Pad16)")
+      (node (ref J3) (pin 16)))
+    (net (code 146) (name "Net-(J3-Pad23)")
+      (node (ref J3) (pin 23)))
+    (net (code 147) (name "Net-(J3-Pad22)")
+      (node (ref J3) (pin 22)))
+    (net (code 148) (name "Net-(J3-Pad21)")
+      (node (ref J3) (pin 21)))
+    (net (code 149) (name "Net-(J3-Pad2)")
       (node (ref J3) (pin 2)))
-    (net (code 141) (name "Net-(J3-Pad19)")
+    (net (code 150) (name "Net-(J3-Pad19)")
       (node (ref J3) (pin 19)))
-    (net (code 142) (name "Net-(J3-Pad18)")
+    (net (code 151) (name "Net-(J3-Pad18)")
       (node (ref J3) (pin 18)))
-    (net (code 143) (name "Net-(J3-Pad16)")
-      (node (ref J3) (pin 16)))
-    (net (code 144) (name "Net-(J3-Pad15)")
+    (net (code 152) (name "Net-(J4-Pad7)")
+      (node (ref J4) (pin 7)))
+    (net (code 153) (name "Net-(J3-Pad15)")
       (node (ref J3) (pin 15)))
-    (net (code 145) (name "Net-(J3-Pad13)")
+    (net (code 154) (name "Net-(J3-Pad13)")
       (node (ref J3) (pin 13)))
-    (net (code 146) (name "Net-(J3-Pad11)")
+    (net (code 155) (name "Net-(J3-Pad12)")
+      (node (ref J3) (pin 12)))
+    (net (code 156) (name "Net-(J3-Pad11)")
       (node (ref J3) (pin 11)))
-    (net (code 147) (name "Net-(J5-Pad3)")
-      (node (ref TP7) (pin 1))
-      (node (ref J5) (pin 3)))
-    (net (code 148) (name "Net-(J5-Pad6)")
+    (net (code 157) (name "Net-(J4-Pad6)")
+      (node (ref J4) (pin 6)))
+    (net (code 158) (name "Net-(J5-Pad3)")
+      (node (ref J5) (pin 3))
+      (node (ref TP7) (pin 1)))
+    (net (code 159) (name "Net-(J5-Pad6)")
       (node (ref J5) (pin 6)))
-    (net (code 149) (name "Net-(J5-Pad2)")
+    (net (code 160) (name "Net-(J5-Pad2)")
       (node (ref J5) (pin 2)))
-    (net (code 150) (name "Net-(J3-Pad33)")
-      (node (ref J3) (pin 33)))
-    (net (code 151) (name "Net-(J3-Pad40)")
-      (node (ref J3) (pin 40)))
-    (net (code 152) (name "Net-(J3-Pad38)")
+    (net (code 161) (name "Net-(J3-Pad38)")
       (node (ref J3) (pin 38)))
-    (net (code 153) (name "Net-(J3-Pad35)")
+    (net (code 162) (name "Net-(J3-Pad37)")
+      (node (ref J3) (pin 37)))
+    (net (code 163) (name "Net-(J3-Pad40)")
+      (node (ref J3) (pin 40)))
+    (net (code 164) (name "Net-(J3-Pad35)")
       (node (ref J3) (pin 35)))
-    (net (code 154) (name "Net-(J3-Pad36)")
+    (net (code 165) (name "Net-(J3-Pad36)")
       (node (ref J3) (pin 36)))
-    (net (code 155) (name "Net-(J3-Pad4)")
+    (net (code 166) (name "Net-(J3-Pad4)")
       (node (ref J3) (pin 4)))
-    (net (code 156) (name "Net-(J3-Pad32)")
+    (net (code 167) (name "Net-(J3-Pad33)")
+      (node (ref J3) (pin 33)))
+    (net (code 168) (name "Net-(J3-Pad32)")
       (node (ref J3) (pin 32)))
-    (net (code 157) (name "Net-(J3-Pad23)")
-      (node (ref J3) (pin 23)))
-    (net (code 158) (name "Net-(J3-Pad21)")
-      (node (ref J3) (pin 21)))
-    (net (code 159) (name "Net-(J3-Pad24)")
+    (net (code 169) (name "Net-(J3-Pad24)")
       (node (ref J3) (pin 24)))
-    (net (code 160) (name "Net-(J3-Pad26)")
-      (node (ref J3) (pin 26)))
-    (net (code 161) (name "Net-(J3-Pad31)")
+    (net (code 170) (name "Net-(J3-Pad31)")
       (node (ref J3) (pin 31)))
-    (net (code 162) (name "Net-(J3-Pad22)")
-      (node (ref J3) (pin 22)))
-    (net (code 163) (name "Net-(J3-Pad37)")
-      (node (ref J3) (pin 37)))
-    (net (code 164) (name "Net-(J3-Pad3)")
+    (net (code 171) (name "Net-(J3-Pad3)")
       (node (ref J3) (pin 3)))
-    (net (code 165) (name "Net-(J3-Pad29)")
+    (net (code 172) (name "Net-(J3-Pad29)")
       (node (ref J3) (pin 29)))
-    (net (code 166) (name "Net-(J3-Pad7)")
-      (node (ref J3) (pin 7)))
-    (net (code 167) (name "Net-(J3-Pad5)")
+    (net (code 173) (name "Net-(J3-Pad26)")
+      (node (ref J3) (pin 26)))
+    (net (code 174) (name "Net-(J3-Pad5)")
       (node (ref J3) (pin 5)))
-    (net (code 168) (name "Net-(U9-Pad7)")
+    (net (code 175) (name "Net-(J3-Pad7)")
+      (node (ref J3) (pin 7)))
+    (net (code 176) (name "Net-(U9-Pad7)")
       (node (ref U9) (pin 7)))
-    (net (code 169) (name "Net-(J6-Pad1)")
-      (node (ref R13) (pin 2))
+    (net (code 177) (name "Net-(J7-Pad1)")
       (node (ref U7) (pin 7))
-      (node (ref J6) (pin 1))
-      (node (ref U6) (pin 7)))
-    (net (code 170) (name "Net-(U9-Pad1)")
+      (node (ref R13) (pin 2))
+      (node (ref U6) (pin 7))
+      (node (ref J7) (pin 1)))
+    (net (code 178) (name "Net-(U9-Pad1)")
       (node (ref U9) (pin 1)))
-    (net (code 171) (name "Net-(U9-Pad2)")
+    (net (code 179) (name "Net-(U9-Pad2)")
       (node (ref U9) (pin 2)))
-    (net (code 172) (name "Net-(U9-Pad3)")
+    (net (code 180) (name "Net-(U9-Pad3)")
       (node (ref U9) (pin 3)))
-    (net (code 173) (name "Net-(U8-Pad1)")
+    (net (code 181) (name "Net-(U8-Pad1)")
       (node (ref U8) (pin 1)))
-    (net (code 174) (name "Net-(U8-Pad2)")
+    (net (code 182) (name "Net-(U8-Pad2)")
       (node (ref U8) (pin 2)))
-    (net (code 175) (name "Net-(U8-Pad3)")
+    (net (code 183) (name "Net-(U8-Pad3)")
       (node (ref U8) (pin 3)))
-    (net (code 176) (name "Net-(U8-Pad7)")
+    (net (code 184) (name "Net-(U8-Pad7)")
       (node (ref U8) (pin 7)))))

hardware/feat-mchip.sch

@@ -248,10 +248,10 @@ Wire Wire Line
 Wire Wire Line
 	5550 3750 5550 3550
 $Comp
-L Connector:Conn_01x02_Male J6
+L Connector:Conn_01x02_Male J7
 U 1 1 5F69B305
 P 4750 3950
-F 0 "J6" H 4722 3924 50  0000 R CNN
+F 0 "J7" H 4722 3924 50  0000 R CNN
 F 1 "Conn_01x02_Male" H 4722 3833 50  0000 R CNN
 F 2 "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" H 4750 3950 50  0001 C CNN
 F 3 "~" H 4750 3950 50  0001 C CNN

hardware/modules/elabdev.pretty/Millmax_Pogopin_1x4_P2.54mm.kicad_mod

@@ -0,0 +1,22 @@
+(module Millmax_Pogopin_1x4_P2.54mm (layer F.Cu) (tedit 5F4D6FA6)
+  (attr smd)
+  (fp_text reference REF** (at 3 -2.5 unlocked) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value Millmax_Pogopin_1x4_P2.54mm (at 0 2.5) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start 5.325 -1.5) (end -5.325 -1.5) (layer F.SilkS) (width 0.15))
+  (fp_line (start 5.325 1.5) (end 5.325 -1.5) (layer F.SilkS) (width 0.15))
+  (fp_line (start -5.325 1.5) (end 5.325 1.5) (layer F.SilkS) (width 0.15))
+  (fp_line (start -5.325 -1.5) (end -5.325 1.5) (layer F.SilkS) (width 0.15))
+  (fp_line (start 5.08 -1.27) (end -5.08 -1.27) (layer F.Fab) (width 0.15))
+  (fp_line (start 5.08 1.27) (end 5.08 -1.27) (layer F.Fab) (width 0.15))
+  (fp_line (start -5.08 1.27) (end 5.08 1.27) (layer F.Fab) (width 0.15))
+  (fp_line (start -5.08 -1.27) (end -5.08 1.27) (layer F.Fab) (width 0.15))
+  (fp_poly (pts (xy -5.325 -0.3) (xy -5.325 -1.5) (xy -4.125 -1.5)) (layer F.SilkS) (width 0.1))
+  (pad 4 smd circle (at 3.81 0) (size 2 2) (layers F.Cu F.Paste F.Mask))
+  (pad 3 smd circle (at 1.27 0) (size 2 2) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd circle (at -1.27 0) (size 2 2) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd circle (at -3.81 0) (size 2 2) (layers F.Cu F.Paste F.Mask))
+)

hardware/modules/elabdev.pretty/Millmax_Pogopin_2x4_P2.54mm.kicad_mod

@@ -0,0 +1,26 @@
+(module Millmax_Pogopin_2x4_P2.54mm (layer F.Cu) (tedit 5F6E1880)
+  (attr smd)
+  (fp_text reference REF** (at 3 -4 unlocked) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value Millmax_Pogopin_2x4_P2.54mm (at 0 4) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -5.08 -2.54) (end -5.08 2.54) (layer F.Fab) (width 0.15))
+  (fp_line (start -5.08 2.54) (end 5.08 2.54) (layer F.Fab) (width 0.15))
+  (fp_line (start 5.08 2.54) (end 5.08 -2.54) (layer F.Fab) (width 0.15))
+  (fp_line (start 5.08 -2.54) (end -5.08 -2.54) (layer F.Fab) (width 0.15))
+  (fp_line (start -5.5 1.5) (end -4 3) (layer F.SilkS) (width 0.15))
+  (fp_line (start -5.5 -3) (end -5.5 1.5) (layer F.SilkS) (width 0.15))
+  (fp_line (start -5.5 -3) (end 5.5 -3) (layer F.SilkS) (width 0.15))
+  (fp_line (start 5.5 3) (end 5.5 -3) (layer F.SilkS) (width 0.15))
+  (fp_line (start 5.5 3) (end -4 3) (layer F.SilkS) (width 0.15))
+  (pad 5 smd circle (at -3.81 -1.27) (size 2 2) (layers F.Cu F.Paste F.Mask))
+  (pad 6 smd circle (at -1.27 -1.27) (size 2 2) (layers F.Cu F.Paste F.Mask))
+  (pad 7 smd circle (at 1.27 -1.27) (size 2 2) (layers F.Cu F.Paste F.Mask))
+  (pad 8 smd circle (at 3.81 -1.27) (size 2 2) (layers F.Cu F.Paste F.Mask))
+  (pad 4 smd circle (at 3.81 1.27) (size 2 2) (layers F.Cu F.Paste F.Mask))
+  (pad 3 smd circle (at 1.27 1.27) (size 2 2) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd circle (at -1.27 1.27) (size 2 2) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd circle (at -3.81 1.27) (size 2 2) (layers F.Cu F.Paste F.Mask))
+)