hardware/mainboard: Switch debug/power connector from micro-B to C

Signed-off-by: David Shah <dave@ds0.me>

hardware/ecp5_mainboard/debug.sch

@@ -1104,66 +1104,81 @@ Wire Wire Line
 Connection ~ 10500 5700
 Wire Wire Line
 	10500 5700 10500 5800
-$Comp
+Text Label 3900 4050 0    50   ~ 0
-L Connector:USB_B_Micro J2
-U 1 1 61582E96
-P 3300 3850
-F 0 "J2" H 3355 4317 50  0000 C CNN
-F 1 "USB_B_Micro" H 3355 4226 50  0000 C CNN
-F 2 "Connector_USB:USB_Micro-B_Molex-105017-0001" H 3450 3800 50  0001 C CNN
-F 3 "~" H 3450 3800 50  0001 C CNN
-	1    3300 3850
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	3600 3850 4350 3850
-Wire Wire Line
-	4350 3850 4550 4050
-Wire Wire Line
-	4900 4050 4550 4050
-Wire Wire Line
-	4900 3850 4450 3850
-Wire Wire Line
-	4450 3850 4350 3950
-Wire Wire Line
-	4350 3950 3600 3950
-Text Label 3700 3850 0    50   ~ 0
 PORT_D+
-Text Label 3700 3950 0    50   ~ 0
+Text Label 3800 3850 0    50   ~ 0
 PORT_D-
-NoConn ~ 3600 4050
 $Comp
 L power:GND #PWR068
 U 1 1 615FD047
-P 3300 4450
+P 2450 6050
-F 0 "#PWR068" H 3300 4200 50  0001 C CNN
+F 0 "#PWR068" H 2450 5800 50  0001 C CNN
-F 1 "GND" H 3305 4277 50  0000 C CNN
+F 1 "GND" H 2455 5877 50  0000 C CNN
-F 2 "" H 3300 4450 50  0001 C CNN
+F 2 "" H 2450 6050 50  0001 C CNN
-F 3 "" H 3300 4450 50  0001 C CNN
+F 3 "" H 2450 6050 50  0001 C CNN
-	1    3300 4450
+	1    2450 6050
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3300 4450 3300 4350
+	2450 6050 2450 5950
 Wire Wire Line
-	3300 4350 3200 4350
+	2450 5950 2300 5950
 Wire Wire Line
-	3200 4350 3200 4250
+	2300 5950 2300 5850
-Connection ~ 3300 4350
-Wire Wire Line
-	3300 4350 3300 4250
 NoConn ~ 9400 5250
 NoConn ~ 9400 5350
 NoConn ~ 9400 5450
 NoConn ~ 9400 2550
 NoConn ~ 9400 2650
 NoConn ~ 9400 2750
+Text GLabel 3400 3250 2    50   Output ~ 0
+USB_5V
+$Comp
+L Connector:USB_C_Receptacle J?
+U 1 1 5D1382FA
+P 2600 4250
+F 0 "J?" H 2707 5517 50  0000 C CNN
+F 1 "USB_C_Receptacle" H 2707 5426 50  0000 C CNN
+F 2 "Connector_USB:USB_C_Receptacle_Amphenol_12401610E4-2A" H 2750 4250 50  0001 C CNN
+F 3 "https://www.usb.org/sites/default/files/documents/usb_type-c.zip" H 2750 4250 50  0001 C CNN
+	1    2600 4250
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
-	4150 3500 3900 3500
+	3200 3850 3300 3850
 Wire Wire Line
-	3900 3500 3900 3650
+	3200 3750 3300 3750
 Wire Wire Line
-	3900 3650 3600 3650
+	3300 3750 3300 3850
-Text GLabel 4150 3500 2    50   Output ~ 0
+Connection ~ 3300 3850
-USB_5V
+Wire Wire Line
+	3300 3850 4900 3850
+Wire Wire Line
+	3200 4050 3300 4050
+Wire Wire Line
+	3200 3950 3300 3950
+Wire Wire Line
+	3300 3950 3300 4050
+Connection ~ 3300 4050
+Wire Wire Line
+	3300 4050 4900 4050
+Wire Wire Line
+	3200 3250 3400 3250
+Wire Wire Line
+	2600 5850 2600 5950
+Wire Wire Line
+	2600 5950 2450 5950
+Connection ~ 2450 5950
+NoConn ~ 3200 5450
+NoConn ~ 3200 5550
+NoConn ~ 3200 5250
+NoConn ~ 3200 5150
+NoConn ~ 3200 4950
+NoConn ~ 3200 4850
+NoConn ~ 3200 4650
+NoConn ~ 3200 4550
+NoConn ~ 3200 4350
+NoConn ~ 3200 4250
+NoConn ~ 3200 3450
+NoConn ~ 3200 3550
 $EndSCHEMATC

hardware/ecp5_mainboard/ecp5_mainboard-cache.lib

@@ -381,39 +381,77 @@ X Shield 5 -100 -400 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Connector_USB_B_Micro
+# Connector_USB_C_Receptacle
 #
-DEF Connector_USB_B_Micro J 0 40 Y Y 1 F N
+DEF Connector_USB_C_Receptacle J 0 40 Y Y 1 F N
-F0 "J" -200 450 50 H V L CNN
+F0 "J" -400 1150 50 H V L CNN
-F1 "Connector_USB_B_Micro" -200 350 50 H V L CNN
+F1 "Connector_USB_C_Receptacle" 400 1150 50 H V R CNN
-F2 "" 150 -50 50 H I C CNN
+F2 "" 150 0 50 H I C CNN
-F3 "" 150 -50 50 H I C CNN
+F3 "" 150 0 50 H I C CNN
-ALIAS USB_B_Mini
 $FPLIST
- USB*
+ USB*C*Receptacle*
 $ENDFPLIST
 DRAW
-C -150 85 25 0 1 10 F
+A -275 -150 75 -1799 -1 0 1 20 N -350 -150 -200 -150
-C -25 135 15 0 1 10 F
+A -275 -150 25 -1799 -1 0 1 10 N -300 -150 -250 -150
-S -200 -300 200 300 0 1 10 f
+A -275 -150 25 -1799 -1 0 1 10 F -300 -150 -250 -150
-S -5 -300 5 -270 0 1 0 N
+A -275 150 25 1 1799 0 1 10 F -250 150 -300 150
-S 10 50 -20 20 0 1 10 F
+A -275 150 25 1 1799 0 1 10 N -250 150 -300 150
-S 200 -205 170 -195 0 1 0 N
+A -275 150 75 1 1799 0 1 20 N -200 150 -350 150
-S 200 -105 170 -95 0 1 0 N
+C -130 175 25 0 1 10 F
-S 200 -5 170 5 0 1 0 N
+T 900 -30 -175 200 0 0 0 SS Italic 1 C C
-S 200 195 170 205 0 1 0 N
+S -10 -1400 10 -1360 0 0 0 N
-P 2 0 1 10 -75 85 25 85 N
+S 400 -1290 360 -1310 0 0 0 N
-P 4 0 1 10 -125 85 -100 85 -50 135 -25 135 N
+S 400 -1190 360 -1210 0 0 0 N
-P 4 0 1 10 -100 85 -75 85 -50 35 0 35 N
+S 400 -990 360 -1010 0 0 0 N
-P 4 0 1 10 25 110 25 60 75 85 25 110 F
+S 400 -890 360 -910 0 0 0 N
-P 5 0 1 0 -170 220 -70 220 -80 190 -160 190 -170 220 F
+S 400 -690 360 -710 0 0 0 N
-P 9 0 1 0 -185 230 -185 220 -175 190 -175 180 -65 180 -65 190 -55 220 -55 230 -185 230 N
+S 400 -590 360 -610 0 0 0 N
-X VBUS 1 300 200 100 L 50 50 1 1 w
+S 400 -390 360 -410 0 0 0 N
-X D- 2 300 -100 100 L 50 50 1 1 P
+S 400 -290 360 -310 0 0 0 N
-X D+ 3 300 0 100 L 50 50 1 1 P
+S 400 -90 360 -110 0 0 0 N
-X ID 4 300 -200 100 L 50 50 1 1 P
+S 400 10 360 -10 0 0 0 N
-X GND 5 0 -400 100 U 50 50 1 1 w
+S 400 210 360 190 0 0 0 N
-X Shield 6 -100 -400 100 U 50 50 1 1 P
+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 1100 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 0 -1600 200 U 50 50 1 1 W
+X RX2- A10 600 -600 200 L 50 50 1 1 B
+X RX2+ A11 600 -700 200 L 50 50 1 1 B
+X GND A12 0 -1600 200 U 50 50 1 1 P N
+X TX1+ A2 600 -400 200 L 50 50 1 1 B
+X TX1- A3 600 -300 200 L 50 50 1 1 B
+X VBUS A4 600 1000 200 L 50 50 1 1 W
+X CC1 A5 600 800 200 L 50 50 1 1 B
+X D+ A6 600 300 200 L 50 50 1 1 B
+X D- A7 600 500 200 L 50 50 1 1 B
+X SBU1 A8 600 -1200 200 L 50 50 1 1 B
+X VBUS A9 600 1000 200 L 50 50 1 1 P N
+X GND B1 0 -1600 200 U 50 50 1 1 P N
+X RX1- B10 600 0 200 L 50 50 1 1 B
+X RX1+ B11 600 -100 200 L 50 50 1 1 B
+X GND B12 0 -1600 200 U 50 50 1 1 P N
+X TX2+ B2 600 -1000 200 L 50 50 1 1 B
+X TX2- B3 600 -900 200 L 50 50 1 1 B
+X VBUS B4 600 1000 200 L 50 50 1 1 P N
+X CC2 B5 600 700 200 L 50 50 1 1 B
+X D+ B6 600 200 200 L 50 50 1 1 B
+X D- B7 600 400 200 L 50 50 1 1 B
+X SBU2 B8 600 -1300 200 L 50 50 1 1 B
+X VBUS B9 600 1000 200 L 50 50 1 1 P N
+X SHIELD S1 -300 -1600 200 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #

hardware/ecp5_mainboard/power.sch

@@ -2947,10 +2947,10 @@ $EndComp
 Wire Wire Line
 	8750 2200 8750 2850
 $Comp
-L Connector_Generic:Conn_01x03 J?
+L Connector_Generic:Conn_01x03 J15
 U 1 1 5CE8562B
 P 9000 1800
-F 0 "J?" V 8964 1612 50  0000 R CNN
+F 0 "J15" V 8964 1612 50  0000 R CNN
 F 1 "PWR" V 8873 1612 50  0000 R CNN
 F 2 "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" H 9000 1800 50  0001 C CNN
 F 3 "~" H 9000 1800 50  0001 C CNN
@@ -2978,10 +2978,10 @@ Wire Wire Line
 	9000 2400 9000 2200
 Connection ~ 9000 2200
 $Comp
-L power:PWR_FLAG #FLG?
+L power:PWR_FLAG #FLG0101
 U 1 1 5D0278A5
 P 9150 2550
-F 0 "#FLG?" H 9150 2625 50  0001 C CNN
+F 0 "#FLG0101" H 9150 2625 50  0001 C CNN
 F 1 "PWR_FLAG" V 9150 2678 50  0000 L CNN
 F 2 "" H 9150 2550 50  0001 C CNN
 F 3 "~" H 9150 2550 50  0001 C CNN