Use new USB Type-C schematic symbol

The footprints haven't been merged yet, but the symbol has.  Therefore,
I updated the footprint in the pd-buddy library to match the new symbol
(changed shield pin number to S1) and changed the schematic to have the
new connector symbol.  The board looks the same except that a couple
references changed.

microcontroller.sch

@@ -444,10 +444,10 @@ NoConn ~ 9700 3600
 NoConn ~ 9700 3700
 NoConn ~ 9700 3800
 $Comp
-L CONN_02X05 P2
+L CONN_02X05 P1
 U 1 1 5892D0FE
 P 4850 6200
-F 0 "P2" H 4850 6500 50  0000 C CNN
+F 0 "P1" H 4850 6500 50  0000 C CNN
 F 1 "SWD" H 4850 5900 50  0000 C CNN
 F 2 "pd-buddy:Pin_Header_Straight_2x05_Pitch1.27mm_SMD_NOPASTE" H 4850 5000 50  0001 C CNN
 F 3 "" H 4850 5000 50  0000 C CNN

pd-buddy-sink-cache.lib

@@ -17,43 +17,6 @@ X +3V3 1 0 0 0 U 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# 12401610E4#2A
-#
-DEF 12401610E4#2A P 0 40 Y Y 1 F N
-F0 "P" 300 -750 60 H V C CNN
-F1 "12401610E4#2A" 0 650 60 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "https://www.amphenolcanada.com/StockAvailabilityPrice.aspx?From=&PartNum=12401610E4%7e2A" 300 -750 60 H I C CNN
-DRAW
-S 400 600 -400 -700 0 1 0 f
-X GND A1 600 500 200 L 50 50 1 1 W
-X GND B1 -600 -600 200 R 50 50 1 1 W
-X SSTXp1 A2 600 400 200 L 50 50 1 1 O
-X SSTXp2 B2 -600 -500 200 R 50 50 1 1 O
-X SSTXn1 A3 600 300 200 L 50 50 1 1 O
-X SSTXn2 B3 -600 -400 200 R 50 50 1 1 O
-X Vbus A4 600 200 200 L 50 50 1 1 W
-X Vbus B4 -600 -300 200 R 50 50 1 1 W
-X CC1 A5 600 100 200 L 50 50 1 1 B
-X CC2 B5 -600 -200 200 R 50 50 1 1 B
-X Dp1 A6 600 0 200 L 50 50 1 1 B
-X Dp2 B6 -600 -100 200 R 50 50 1 1 B
-X Dn1 A7 600 -100 200 L 50 50 1 1 B
-X Dn2 B7 -600 0 200 R 50 50 1 1 B
-X SBU1 A8 600 -200 200 L 50 50 1 1 B
-X SBU2 B8 -600 100 200 R 50 50 1 1 B
-X Vbus A9 600 -300 200 L 50 50 1 1 W
-X Vbus B9 -600 200 200 R 50 50 1 1 W
-X SHELL SH 0 -900 200 U 50 50 1 1 P
-X SSRXn2 A10 600 -400 200 L 50 50 1 1 I
-X SSRXn1 B10 -600 300 200 R 50 50 1 1 I
-X SSRXp2 A11 600 -500 200 L 50 50 1 1 I
-X SSRXp1 B11 -600 400 200 R 50 50 1 1 I
-X GND A12 600 -600 200 L 50 50 1 1 W
-X GND B12 -600 500 200 R 50 50 1 1 W
-ENDDRAW
-ENDDEF
-#
 # AP2204R-3.3TRG1
 #
 DEF AP2204R-3.3TRG1 U 0 40 Y Y 1 F N
@@ -480,6 +443,86 @@ X ~ 1 0 0 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# USB_C_Receptacle
+#
+DEF USB_C_Receptacle J 0 40 Y Y 1 F N
+F0 "J" -400 1450 50 H V L CNN
+F1 "USB_C_Receptacle" 400 1450 50 H V R CNN
+F2 "" 150 0 50 H I C CNN
+F3 "" 150 0 50 H I C CNN
+$FPLIST
+ USB*C*Receptacle*
+$ENDFPLIST
+DRAW
+T 900 -30 -175 200 0 0 0 SS Italic 1 C C
+S -210 -1400 -190 -1360 0 0 0 N
+S -110 -1400 -90 -1360 0 0 0 N
+S -10 -1400 10 -1360 0 0 0 N
+S 90 -1400 110 -1360 0 0 0 N
+S 400 -1290 360 -1310 0 0 0 N
+S 400 -1190 360 -1210 0 0 0 N
+S 400 -990 360 -1010 0 0 0 N
+S 400 -890 360 -910 0 0 0 N
+S 400 -690 360 -710 0 0 0 N
+S 400 -590 360 -610 0 0 0 N
+S 400 -390 360 -410 0 0 0 N
+S 400 -290 360 -310 0 0 0 N
+S 400 -90 360 -110 0 0 0 N
+S 400 10 360 -10 0 0 0 N
+S 400 210 360 190 0 0 0 N
+S 400 310 360 290 0 0 0 N
+S 400 410 360 390 0 0 0 N
+S 400 510 360 490 0 0 0 N
+S 400 710 360 690 0 0 0 N
+S 400 810 360 790 0 0 0 N
+S 400 1010 360 990 0 0 0 N
+S 400 1110 360 1090 0 0 0 N
+S 400 1210 360 1190 0 0 0 N
+S 400 1310 360 1290 0 0 0 N
+A -275 -150 25 -1799 -1 0 1 10 F -300 -150 -250 -150
+A -275 -150 75 -1799 -1 0 1 20 N -350 -150 -200 -150
+A -275 -150 25 -1799 -1 0 1 10 N -300 -150 -250 -150
+A -275 150 25 1 1799 0 1 10 F -250 150 -300 150
+A -275 150 25 1 1799 0 1 10 N -250 150 -300 150
+A -275 150 75 1 1799 0 1 20 N -200 150 -350 150
+C -130 175 25 0 1 10 F
+S -400 1400 400 -1400 0 1 10 f
+S -300 -150 -250 150 0 1 10 F
+S 45 200 95 250 0 1 10 F
+P 2 0 1 20 -350 -150 -350 150 N
+P 2 0 1 20 -200 150 -200 -150 N
+P 2 0 1 20 -30 -50 -30 300 N
+P 3 0 1 20 -30 0 -130 100 -130 150 N
+P 3 0 1 20 -30 50 70 150 70 200 N
+P 4 0 1 10 -80 300 -30 400 20 300 -80 300 F
+X GND A1 -200 -1600 200 U 50 50 1 1 W
+X GND B1 0 -1600 200 U 50 50 1 1 W
+X SHIELD S1 -300 -1600 200 U 50 50 1 1 P
+X TX1+ A2 600 -400 200 L 50 50 1 1 B
+X TX2+ B2 600 -1000 200 L 50 50 1 1 B
+X TX1- A3 600 -300 200 L 50 50 1 1 B
+X TX2- B3 600 -900 200 L 50 50 1 1 B
+X VBUS A4 600 1300 200 L 50 50 1 1 W
+X VBUS B4 600 1100 200 L 50 50 1 1 W
+X CC1 A5 600 800 200 L 50 50 1 1 B
+X CC2 B5 600 700 200 L 50 50 1 1 B
+X D+ A6 600 300 200 L 50 50 1 1 B
+X D+ B6 600 200 200 L 50 50 1 1 B
+X D- A7 600 500 200 L 50 50 1 1 B
+X D- B7 600 400 200 L 50 50 1 1 B
+X SBU1 A8 600 -1200 200 L 50 50 1 1 B
+X SBU2 B8 600 -1300 200 L 50 50 1 1 B
+X VBUS A9 600 1200 200 L 50 50 1 1 W
+X VBUS B9 600 1000 200 L 50 50 1 1 W
+X RX2- A10 600 -600 200 L 50 50 1 1 B
+X RX1- B10 600 0 200 L 50 50 1 1 B
+X RX2+ A11 600 -700 200 L 50 50 1 1 B
+X RX1+ B11 600 -100 200 L 50 50 1 1 B
+X GND A12 -100 -1600 200 U 50 50 1 1 W
+X GND B12 100 -1600 200 U 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
 # VBUS
 #
 DEF VBUS #PWR 0 0 Y Y 1 F P

pd-buddy.pretty/Amphenol-12401610E4#2A.kicad_mod

@@ -1,4 +1,4 @@
-(module Amphenol-12401610E4#2A (layer F.Cu) (tedit 58FD093C)
+(module Amphenol-12401610E4#2A (layer F.Cu) (tedit 59147304)
   (attr smd)
   (fp_text reference REF** (at 0 -2) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
@@ -23,7 +23,7 @@
   (fp_line (start -4.75 2) (end -4.75 6.25) (layer F.SilkS) (width 0.12))
   (fp_line (start -4.59 -0.91) (end 4.59 -0.91) (layer F.Fab) (width 0.12))
   (fp_line (start -4.59 9.59) (end -4.59 -0.91) (layer F.Fab) (width 0.12))
-  (pad SH thru_hole circle (at -4.13 1.25) (size 1.4 1.4) (drill 1.1) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at -4.13 1.25) (size 1.4 1.4) (drill 1.1) (layers *.Cu *.Mask))
   (pad A1 smd rect (at -2.75 -0.66) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask))
   (pad A2 smd rect (at -2.25 -0.66) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask))
   (pad A3 smd rect (at -1.75 -0.66) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask))
@@ -37,9 +37,9 @@
   (pad A8 smd rect (at 0.75 -0.66) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask))
   (pad A11 smd rect (at 2.25 -0.66) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask))
   (pad B1 smd rect (at 2.5 1.04) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask))
-  (pad SH thru_hole circle (at 4.13 1.25) (size 1.4 1.4) (drill 1.1) (layers *.Cu *.Mask))
-  (pad SH thru_hole circle (at 4.49 7.2) (size 1.4 1.4) (drill 1.1) (layers *.Cu *.Mask))
-  (pad SH thru_hole circle (at -4.49 7.2) (size 1.4 1.4) (drill 1.1) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at 4.13 1.25) (size 1.4 1.4) (drill 1.1) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at 4.49 7.2) (size 1.4 1.4) (drill 1.1) (layers *.Cu *.Mask))
+  (pad S1 thru_hole circle (at -4.49 7.2) (size 1.4 1.4) (drill 1.1) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at 3.6 0) (size 0.95 0.95) (drill 0.95) (layers *.Cu *.Mask))
   (pad "" np_thru_hole circle (at -3.6 0) (size 0.65 0.65) (drill 0.65) (layers *.Cu *.Mask))
   (pad B2 smd rect (at 2 1.04) (size 0.3 0.7) (layers F.Cu F.Paste F.Mask))

usb_type-c.sch

@@ -100,139 +100,124 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-NoConn ~ 4700 1950
-NoConn ~ 4700 2050
-NoConn ~ 3500 1950
-NoConn ~ 3500 2050
-NoConn ~ 3500 2250
-NoConn ~ 4700 2550
-NoConn ~ 4700 2750
-NoConn ~ 4700 2850
-NoConn ~ 3500 2850
-NoConn ~ 3500 2750
-Wire Wire Line
-	4700 1850 4800 1850
-Wire Wire Line
-	4800 1850 4800 3250
-Wire Wire Line
-	4800 3250 3400 3250
-Wire Wire Line
-	4700 2950 4800 2950
-Connection ~ 4800 2950
-Wire Wire Line
-	3400 3250 3400 1850
-Wire Wire Line
-	3400 2950 3500 2950
-Connection ~ 4100 3250
-Wire Wire Line
-	3400 1850 3500 1850
-Connection ~ 3400 2950
+Text HLabel 6800 2350 2    60   BiDi ~ 0
+CC1
+Text HLabel 6800 2450 2    60   BiDi ~ 0
+CC2
+Text HLabel 6800 2850 2    60   BiDi ~ 0
+D+
+Text HLabel 6800 2750 2    60   BiDi ~ 0
+D-
 $Comp
-L GND #PWR035
-U 1 1 588FA6DC
-P 4100 3250
-F 0 "#PWR035" H 4100 3000 50  0001 C CNN
-F 1 "GND" H 4100 3100 50  0000 C CNN
-F 2 "" H 4100 3250 50  0000 C CNN
-F 3 "" H 4100 3250 50  0000 C CNN
-	1    4100 3250
+L USB_C_Receptacle J2
+U 1 1 59147856
+P 6000 3150
+F 0 "J2" H 5600 4600 50  0000 L CNN
+F 1 "USB_C_Receptacle" H 6400 4600 50  0000 R CNN
+F 2 "pd-buddy:Amphenol-12401610E4#2A" H 6150 3150 50  0001 C CNN
+F 3 "" H 6150 3150 50  0001 C CNN
+	1    6000 3150
+	1    0    0    -1  
+$EndComp
+$Comp
+L VBUS #PWR035
+U 1 1 591478E7
+P 6700 1750
+F 0 "#PWR035" H 6700 1600 50  0001 C CNN
+F 1 "VBUS" H 6700 1890 50  0000 C CNN
+F 2 "" H 6700 1750 50  0000 C CNN
+F 3 "" H 6700 1750 50  0000 C CNN
+	1    6700 1750
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4700 2150 4900 2150
-Wire Wire Line
-	4900 1550 4900 2650
-Wire Wire Line
-	4900 2650 4700 2650
+	6700 2150 6600 2150
 Wire Wire Line
-	3300 2650 3500 2650
+	6700 1750 6700 2150
 Wire Wire Line
-	3300 1550 3300 2650
+	6600 2050 6700 2050
+Connection ~ 6700 2050
 Wire Wire Line
-	3300 2150 3500 2150
+	6600 1950 6700 1950
+Connection ~ 6700 1950
 Wire Wire Line
-	3300 1550 4900 1550
-Connection ~ 3300 2150
-Connection ~ 4900 2150
+	6600 1850 6700 1850
+Connection ~ 6700 1850
 $Comp
-L VBUS #PWR036
-U 1 1 588FA72C
-P 4100 1450
-F 0 "#PWR036" H 4100 1300 50  0001 C CNN
-F 1 "VBUS" H 4100 1590 50  0000 C CNN
-F 2 "" H 4100 1450 50  0000 C CNN
-F 3 "" H 4100 1450 50  0000 C CNN
-	1    4100 1450
-	1    0    0    -1  
+L PWR_FLAG #FLG036
+U 1 1 591479A3
+P 6700 1750
+F 0 "#FLG036" H 6700 1845 50  0001 C CNN
+F 1 "PWR_FLAG" H 6700 1930 50  0000 C CNN
+F 2 "" H 6700 1750 50  0000 C CNN
+F 3 "" H 6700 1750 50  0000 C CNN
+	1    6700 1750
+	0    1    1    0   
 $EndComp
 Wire Wire Line
-	4100 1450 4100 1550
-Connection ~ 4100 1550
-Wire Wire Line
-	4700 2250 5200 2250
-Text HLabel 5200 2250 2    60   BiDi ~ 0
-CC1
-Text HLabel 3000 2550 0    60   BiDi ~ 0
-CC2
-Wire Wire Line
-	3000 2550 3500 2550
+	6600 2350 6800 2350
 Wire Wire Line
-	3500 2450 3200 2450
+	6800 2450 6600 2450
 Wire Wire Line
-	3200 2450 3200 3500
+	6600 2750 6800 2750
 Wire Wire Line
-	3200 3500 5000 3500
+	6600 2850 6800 2850
 Wire Wire Line
-	5000 3500 5000 2350
+	6600 2950 6700 2950
 Wire Wire Line
-	4700 2350 5200 2350
-Connection ~ 5000 2350
+	6700 2950 6700 2850
+Connection ~ 6700 2850
 Wire Wire Line
-	3500 2350 3100 2350
+	6600 2650 6700 2650
 Wire Wire Line
-	3100 2350 3100 3600
+	6700 2650 6700 2750
+Connection ~ 6700 2750
+NoConn ~ 6600 3150
+NoConn ~ 6600 3250
+NoConn ~ 6600 3450
+NoConn ~ 6600 3550
+NoConn ~ 6600 3750
+NoConn ~ 6600 3850
+NoConn ~ 6600 4050
+NoConn ~ 6600 4150
+NoConn ~ 6600 4350
+NoConn ~ 6600 4450
 Wire Wire Line
-	3100 3600 5100 3600
+	5700 4750 5700 4850
 Wire Wire Line
-	5100 3600 5100 2450
+	5700 4850 6100 4850
 Wire Wire Line
-	4700 2450 5200 2450
-Connection ~ 5100 2450
-Text HLabel 5200 2350 2    60   BiDi ~ 0
-D+
-Text HLabel 5200 2450 2    60   BiDi ~ 0
-D-
+	6100 4750 6100 4950
 $Comp
-L PWR_FLAG #FLG037
-U 1 1 588FBE9F
-P 4800 3250
-F 0 "#FLG037" H 4800 3345 50  0001 C CNN
-F 1 "PWR_FLAG" H 4800 3430 50  0000 C CNN
-F 2 "" H 4800 3250 50  0000 C CNN
-F 3 "" H 4800 3250 50  0000 C CNN
-	1    4800 3250
-	-1   0    0    1   
-$EndComp
-$Comp
-L PWR_FLAG #FLG038
-U 1 1 588FBEB8
-P 4900 1550
-F 0 "#FLG038" H 4900 1645 50  0001 C CNN
-F 1 "PWR_FLAG" H 4900 1730 50  0000 C CNN
-F 2 "" H 4900 1550 50  0000 C CNN
-F 3 "" H 4900 1550 50  0000 C CNN
-	1    4900 1550
+L GND #PWR037
+U 1 1 59147BA2
+P 6100 4950
+F 0 "#PWR037" H 6100 4700 50  0001 C CNN
+F 1 "GND" H 6100 4800 50  0000 C CNN
+F 2 "" H 6100 4950 50  0000 C CNN
+F 3 "" H 6100 4950 50  0000 C CNN
+	1    6100 4950
 	1    0    0    -1  
 $EndComp
 $Comp
-L 12401610E4#2A P1
-U 1 1 58F76BCA
-P 4100 2350
-F 0 "P1" H 4400 1600 60  0000 C CNN
-F 1 "12401610E4#2A" H 4100 3000 60  0000 C CNN
-F 2 "pd-buddy:Amphenol-12401610E4#2A" H 4100 2350 60  0001 C CNN
-F 3 "https://www.amphenolcanada.com/StockAvailabilityPrice.aspx?From=&PartNum=12401610E4%7e2A" H 4400 1600 60  0001 C CNN
-	1    4100 2350
-	1    0    0    -1  
+L PWR_FLAG #FLG038
+U 1 1 59147BB3
+P 6100 4950
+F 0 "#FLG038" H 6100 5045 50  0001 C CNN
+F 1 "PWR_FLAG" H 6100 5130 50  0000 C CNN
+F 2 "" H 6100 4950 50  0000 C CNN
+F 3 "" H 6100 4950 50  0000 C CNN
+	1    6100 4950
+	0    1    1    0   
 $EndComp
+Connection ~ 6100 4850
+Wire Wire Line
+	6000 4850 6000 4750
+Connection ~ 6000 4850
+Wire Wire Line
+	5900 4750 5900 4850
+Connection ~ 5900 4850
+Wire Wire Line
+	5800 4750 5800 4850
+Connection ~ 5800 4850
 $EndSCHEMATC