Refactor schematic

2017-10-01 22:56:03 +02:00 · 2017-10-01 22:56:03 +02:00 · 6bcb9c32ce
commit 6bcb9c32ce
parent bae4960154
3 changed files with 422 additions and 364 deletions
--- a/fpga.sch
+++ b/fpga.sch
@ -279,35 +279,35 @@ Text Notes 9800 1050 0    60   ~ 0
 Decoupling\nBank 2/3
 Text Label 10350 1000 0    60   ~ 0
 VCCIO23
-Text Label 1550 4350 0    60   ~ 0
+Text Label 1550 4600 0    60   ~ 0
 VCCIO23
 $Comp
 L R R3
 U 1 1 59CEC5BE
-P 1300 4350
-F 0 "R3" V 1200 4350 50  0000 C CNN
-F 1 "DNP" V 1300 4350 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 1230 4350 50  0001 C CNN
-F 3 "" H 1300 4350 50  0001 C CNN
-	1    1300 4350
+P 1300 4600
+F 0 "R3" V 1200 4600 50  0000 C CNN
+F 1 "DNP" V 1300 4600 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 1230 4600 50  0001 C CNN
+F 3 "" H 1300 4600 50  0001 C CNN
+	1    1300 4600
 	0    1    1    0   
 $EndComp
 $Comp
 L +3V3 #PWR017
 U 1 1 59CECD95
-P 1050 4250
-F 0 "#PWR017" H 1050 4100 50  0001 C CNN
-F 1 "+3V3" H 1065 4423 50  0000 C CNN
-F 2 "" H 1050 4250 50  0001 C CNN
-F 3 "" H 1050 4250 50  0001 C CNN
-	1    1050 4250
+P 1050 4500
+F 0 "#PWR017" H 1050 4350 50  0001 C CNN
+F 1 "+3V3" H 1065 4673 50  0000 C CNN
+F 2 "" H 1050 4500 50  0001 C CNN
+F 3 "" H 1050 4500 50  0001 C CNN
+	1    1050 4500
 	1    0    0    -1  
 $EndComp
-Text HLabel 1150 3600 0    60   Input ~ 0
+Text HLabel 1150 3850 0    60   Input ~ 0
 TXD
-Text HLabel 1150 3700 0    60   Output ~ 0
+Text HLabel 1150 3950 0    60   Output ~ 0
 RXD
-Text HLabel 1150 3800 0    60   Input ~ 0
+Text HLabel 1150 4050 0    60   Input ~ 0
 RTS
 Text Label 8650 2900 2    60   ~ 0
 JTAG_TMS
@ -320,23 +320,23 @@ JTAG_TDO
 $Comp
 L Conn_01x15 J3
 U 1 1 59CE3A58
-P 4400 3900
-F 0 "J3" H 4320 2975 50  0000 C CNN
-F 1 "Conn_Right" H 4400 3050 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x15_Pitch2.54mm" H 4400 3900 50  0001 C CNN
-F 3 "" H 4400 3900 50  0001 C CNN
-	1    4400 3900
+P 5900 3550
+F 0 "J3" H 5900 2750 50  0000 C CNN
+F 1 "Conn_Right" H 5800 4350 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x15_Pitch2.54mm" H 5900 3550 50  0001 C CNN
+F 3 "" H 5900 3550 50  0001 C CNN
+	1    5900 3550
 	-1   0    0    -1  
 $EndComp
 $Comp
 L VBUS #PWR021
 U 1 1 59CE4228
-P 2800 4500
-F 0 "#PWR021" H 2800 4350 50  0001 C CNN
-F 1 "VBUS" H 2815 4673 50  0000 C CNN
-F 2 "" H 2800 4500 50  0001 C CNN
-F 3 "" H 2800 4500 50  0001 C CNN
-	1    2800 4500
+P 4600 4150
+F 0 "#PWR021" H 4600 4000 50  0001 C CNN
+F 1 "VBUS" H 4615 4323 50  0000 C CNN
+F 2 "" H 4600 4150 50  0001 C CNN
+F 3 "" H 4600 4150 50  0001 C CNN
+	1    4600 4150
 	1    0    0    -1  
 $EndComp
 Text Label 8650 2600 2    60   ~ 0
@ -344,128 +344,128 @@ JTAG_EN
 $Comp
 L +3V3 #PWR023
 U 1 1 59CE4C57
-P 5100 4500
-F 0 "#PWR023" H 5100 4350 50  0001 C CNN
-F 1 "+3V3" H 5115 4673 50  0000 C CNN
-F 2 "" H 5100 4500 50  0001 C CNN
-F 3 "" H 5100 4500 50  0001 C CNN
-	1    5100 4500
+P 6600 4150
+F 0 "#PWR023" H 6600 4000 50  0001 C CNN
+F 1 "+3V3" H 6615 4323 50  0000 C CNN
+F 2 "" H 6600 4150 50  0001 C CNN
+F 3 "" H 6600 4150 50  0001 C CNN
+	1    6600 4150
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR019
 U 1 1 59CE5028
-P 3500 4700
-F 0 "#PWR019" H 3500 4450 50  0001 C CNN
-F 1 "GND" H 3505 4527 50  0000 C CNN
-F 2 "" H 3500 4700 50  0001 C CNN
-F 3 "" H 3500 4700 50  0001 C CNN
-	1    3500 4700
+P 5000 4350
+F 0 "#PWR019" H 5000 4100 50  0001 C CNN
+F 1 "GND" H 5005 4177 50  0000 C CNN
+F 2 "" H 5000 4350 50  0001 C CNN
+F 3 "" H 5000 4350 50  0001 C CNN
+	1    5000 4350
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R4
 U 1 1 59CE5A45
-P 1400 3600
-F 0 "R4" V 1350 3750 50  0000 C CNN
-F 1 "1k" V 1400 3600 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 1330 3600 50  0001 C CNN
-F 3 "" H 1400 3600 50  0001 C CNN
-	1    1400 3600
+P 1400 3850
+F 0 "R4" V 1350 4000 50  0000 C CNN
+F 1 "1k" V 1400 3850 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 1330 3850 50  0001 C CNN
+F 3 "" H 1400 3850 50  0001 C CNN
+	1    1400 3850
 	0    1    1    0   
 $EndComp
 $Comp
 L R R5
 U 1 1 59CE5D31
-P 1400 3700
-F 0 "R5" V 1350 3850 50  0000 C CNN
-F 1 "1k" V 1400 3700 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 1330 3700 50  0001 C CNN
-F 3 "" H 1400 3700 50  0001 C CNN
-	1    1400 3700
+P 1400 3950
+F 0 "R5" V 1350 4100 50  0000 C CNN
+F 1 "1k" V 1400 3950 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 1330 3950 50  0001 C CNN
+F 3 "" H 1400 3950 50  0001 C CNN
+	1    1400 3950
 	0    1    1    0   
 $EndComp
 $Comp
 L R R6
 U 1 1 59CE5D67
-P 1400 3800
-F 0 "R6" V 1350 3950 50  0000 C CNN
-F 1 "1k" V 1400 3800 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603" V 1330 3800 50  0001 C CNN
-F 3 "" H 1400 3800 50  0001 C CNN
-	1    1400 3800
+P 1400 4050
+F 0 "R6" V 1350 4200 50  0000 C CNN
+F 1 "1k" V 1400 4050 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603" V 1330 4050 50  0001 C CNN
+F 3 "" H 1400 4050 50  0001 C CNN
+	1    1400 4050
 	0    1    1    0   
 $EndComp
-Text Notes 4000 4750 0    60   ~ 0
+Text Notes 5500 4400 0    60   ~ 0
 USB
-Text Label 1950 3600 0    60   ~ 0
+Text Label 1950 3850 0    60   ~ 0
 TX
-Text Label 1950 3700 0    60   ~ 0
+Text Label 1950 3950 0    60   ~ 0
 RX
-Text Label 1950 3800 0    60   ~ 0
+Text Label 1950 4050 0    60   ~ 0
 RS
-Text Label 4800 4300 0    60   ~ 0
+Text Label 6300 3950 0    60   ~ 0
 TX
-Text Label 4800 4200 0    60   ~ 0
+Text Label 6300 3850 0    60   ~ 0
 RX
-Text Label 4800 4400 0    60   ~ 0
+Text Label 6300 4050 0    60   ~ 0
 RS
 $Comp
 L LED_ALT D4
 U 1 1 59CEAE2F
-P 1850 2850
-F 0 "D4" V 1888 2732 50  0000 R CNN
-F 1 "Or" V 1797 2732 50  0000 R CNN
-F 2 "LEDs:LED_0603" H 1850 2850 50  0001 C CNN
-F 3 "" H 1850 2850 50  0001 C CNN
-	1    1850 2850
+P 1850 3100
+F 0 "D4" V 1888 2982 50  0000 R CNN
+F 1 "Or" V 1797 2982 50  0000 R CNN
+F 2 "LEDs:LED_0603" H 1850 3100 50  0001 C CNN
+F 3 "" H 1850 3100 50  0001 C CNN
+	1    1850 3100
 	0    -1   -1   0   
 $EndComp
 $Comp
 L LED_ALT D3
 U 1 1 59CEB277
-P 1650 2850
-F 0 "D3" V 1700 3050 50  0000 R CNN
-F 1 "Rd" V 1600 3050 50  0000 R CNN
-F 2 "LEDs:LED_0603" H 1650 2850 50  0001 C CNN
-F 3 "" H 1650 2850 50  0001 C CNN
-	1    1650 2850
+P 1650 3100
+F 0 "D3" V 1700 3300 50  0000 R CNN
+F 1 "Rd" V 1600 3300 50  0000 R CNN
+F 2 "LEDs:LED_0603" H 1650 3100 50  0001 C CNN
+F 3 "" H 1650 3100 50  0001 C CNN
+	1    1650 3100
 	0    -1   -1   0   
 $EndComp
 $Comp
 L R R8
 U 1 1 59CEBBCC
-P 1850 3250
-F 0 "R8" H 1850 3100 50  0000 L CNN
-F 1 "1k" V 1850 3200 50  0000 L CNN
-F 2 "Resistors_SMD:R_0603" V 1780 3250 50  0001 C CNN
-F 3 "" H 1850 3250 50  0001 C CNN
-	1    1850 3250
+P 1850 3500
+F 0 "R8" H 1850 3350 50  0000 L CNN
+F 1 "1k" V 1850 3450 50  0000 L CNN
+F 2 "Resistors_SMD:R_0603" V 1780 3500 50  0001 C CNN
+F 3 "" H 1850 3500 50  0001 C CNN
+	1    1850 3500
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R7
 U 1 1 59CEBC90
-P 1650 3250
-F 0 "R7" H 1650 3100 50  0000 L CNN
-F 1 "1k" V 1650 3200 50  0000 L CNN
-F 2 "Resistors_SMD:R_0603" V 1580 3250 50  0001 C CNN
-F 3 "" H 1650 3250 50  0001 C CNN
-	1    1650 3250
+P 1650 3500
+F 0 "R7" H 1650 3350 50  0000 L CNN
+F 1 "1k" V 1650 3450 50  0000 L CNN
+F 2 "Resistors_SMD:R_0603" V 1580 3500 50  0001 C CNN
+F 3 "" H 1650 3500 50  0001 C CNN
+	1    1650 3500
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3V3 #PWR018
 U 1 1 59CEC837
-P 1750 2500
-F 0 "#PWR018" H 1750 2350 50  0001 C CNN
-F 1 "+3V3" H 1765 2673 50  0000 C CNN
-F 2 "" H 1750 2500 50  0001 C CNN
-F 3 "" H 1750 2500 50  0001 C CNN
-	1    1750 2500
+P 1750 2750
+F 0 "#PWR018" H 1750 2600 50  0001 C CNN
+F 1 "+3V3" H 1765 2923 50  0000 C CNN
+F 2 "" H 1750 2750 50  0001 C CNN
+F 3 "" H 1750 2750 50  0001 C CNN
+	1    1750 2750
 	1    0    0    -1  
 $EndComp
-Text Label 3500 3300 2    60   ~ 0
+Text Label 5000 2950 2    60   ~ 0
 VCCIO23
 Text Label 8650 2400 2    60   ~ 0
 P25
@ -498,114 +498,114 @@ P4
 $Comp
 L Conn_02x04_Odd_Even J4
 U 1 1 59CE71D1
-P 5950 1550
-F 0 "J4" H 6000 1867 50  0000 C CNN
-F 1 "JTAG" H 6000 1776 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_2x04_Pitch2.54mm" H 5950 1550 50  0001 C CNN
-F 3 "" H 5950 1550 50  0001 C CNN
-	1    5950 1550
+P 5550 1550
+F 0 "J4" H 5600 1867 50  0000 C CNN
+F 1 "JTAG" H 5600 1776 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_2x04_Pitch2.54mm" H 5550 1550 50  0001 C CNN
+F 3 "" H 5550 1550 50  0001 C CNN
+	1    5550 1550
 	1    0    0    -1  
 $EndComp
-Text Label 5650 1650 2    60   ~ 0
+Text Label 5250 1650 2    60   ~ 0
 JTAG_TCK
-Text Label 5650 1750 2    60   ~ 0
+Text Label 5250 1750 2    60   ~ 0
 JTAG_TMS
-Text Label 5650 1550 2    60   ~ 0
+Text Label 5250 1550 2    60   ~ 0
 JTAG_TDI
-Text Label 5650 1450 2    60   ~ 0
+Text Label 5250 1450 2    60   ~ 0
 JTAG_TDO
-Text Label 6350 1750 0    60   ~ 0
+Text Label 5950 1750 0    60   ~ 0
 JTAG_EN
-NoConn ~ 6250 1650
+NoConn ~ 5850 1650
 $Comp
 L Conn_01x15 J2
 U 1 1 59CE37F9
-P 3800 3900
-F 0 "J2" H 3879 3942 50  0000 L CNN
-F 1 "Conn_Left" H 3879 3851 50  0000 L CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x15_Pitch2.54mm" H 3800 3900 50  0001 C CNN
-F 3 "" H 3800 3900 50  0001 C CNN
-	1    3800 3900
+P 5300 3550
+F 0 "J2" H 5250 2750 50  0000 L CNN
+F 1 "Conn_Left" H 5050 4350 50  0000 L CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x15_Pitch2.54mm" H 5300 3550 50  0001 C CNN
+F 3 "" H 5300 3550 50  0001 C CNN
+	1    5300 3550
 	1    0    0    -1  
 $EndComp
-Text Label 3500 4300 2    60   ~ 0
+Text Label 5000 3950 2    60   ~ 0
 P16
-Text Label 3500 4400 2    60   ~ 0
+Text Label 5000 4050 2    60   ~ 0
 P17
-Text Label 3500 4200 2    60   ~ 0
+Text Label 5000 3850 2    60   ~ 0
 P14
-Text Label 3500 3700 2    60   ~ 0
+Text Label 5000 3350 2    60   ~ 0
 P9
-Text Label 3500 3800 2    60   ~ 0
+Text Label 5000 3450 2    60   ~ 0
 P10
-Text Label 3500 3900 2    60   ~ 0
+Text Label 5000 3550 2    60   ~ 0
 P11
-Text Label 3500 4000 2    60   ~ 0
+Text Label 5000 3650 2    60   ~ 0
 P12
-Text Label 3500 4100 2    60   ~ 0
+Text Label 5000 3750 2    60   ~ 0
 P13
-Text Label 3500 3600 2    60   ~ 0
+Text Label 5000 3250 2    60   ~ 0
 P8
-Text Label 3500 3500 2    60   ~ 0
+Text Label 5000 3150 2    60   ~ 0
 P5
-Text Label 3500 3400 2    60   ~ 0
+Text Label 5000 3050 2    60   ~ 0
 P4
-Text Label 4800 3900 0    60   ~ 0
+Text Label 6300 3550 0    60   ~ 0
 P27
-Text Label 4800 3800 0    60   ~ 0
+Text Label 6300 3450 0    60   ~ 0
 CLK_FPGA
-Text Label 4800 4000 0    60   ~ 0
+Text Label 6300 3650 0    60   ~ 0
 P25
 $Comp
 L GND #PWR025
 U 1 1 59CF1BA4
-P 6900 1600
-F 0 "#PWR025" H 6900 1350 50  0001 C CNN
-F 1 "GND" H 6905 1427 50  0000 C CNN
-F 2 "" H 6900 1600 50  0001 C CNN
-F 3 "" H 6900 1600 50  0001 C CNN
-	1    6900 1600
+P 6500 1600
+F 0 "#PWR025" H 6500 1350 50  0001 C CNN
+F 1 "GND" H 6505 1427 50  0000 C CNN
+F 2 "" H 6500 1600 50  0001 C CNN
+F 3 "" H 6500 1600 50  0001 C CNN
+	1    6500 1600
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3V3 #PWR024
 U 1 1 59CF1EB2
-P 6900 1400
-F 0 "#PWR024" H 6900 1250 50  0001 C CNN
-F 1 "+3V3" H 6915 1573 50  0000 C CNN
-F 2 "" H 6900 1400 50  0001 C CNN
-F 3 "" H 6900 1400 50  0001 C CNN
-	1    6900 1400
+P 6500 1400
+F 0 "#PWR024" H 6500 1250 50  0001 C CNN
+F 1 "+3V3" H 6515 1573 50  0000 C CNN
+F 2 "" H 6500 1400 50  0001 C CNN
+F 3 "" H 6500 1400 50  0001 C CNN
+	1    6500 1400
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR020
 U 1 1 59CFD9A4
-P 4700 4700
-F 0 "#PWR020" H 4700 4450 50  0001 C CNN
-F 1 "GND" H 4705 4527 50  0000 C CNN
-F 2 "" H 4700 4700 50  0001 C CNN
-F 3 "" H 4700 4700 50  0001 C CNN
-	1    4700 4700
+P 6200 4350
+F 0 "#PWR020" H 6200 4100 50  0001 C CNN
+F 1 "GND" H 6205 4177 50  0000 C CNN
+F 2 "" H 6200 4350 50  0001 C CNN
+F 3 "" H 6200 4350 50  0001 C CNN
+	1    6200 4350
 	1    0    0    -1  
 $EndComp
-Text Label 4800 3200 0    60   ~ 0
+Text Label 6300 2850 0    60   ~ 0
 JTAG_TDO
-Text Label 4800 3300 0    60   ~ 0
+Text Label 6300 2950 0    60   ~ 0
 JTAG_TDI
-Text Label 4800 3400 0    60   ~ 0
+Text Label 6300 3050 0    60   ~ 0
 JTAG_TCK
-Text Label 4800 3500 0    60   ~ 0
+Text Label 6300 3150 0    60   ~ 0
 JTAG_TMS
 $Comp
 L +3V3 #PWR022
 U 1 1 59D0394F
-P 3500 3100
-F 0 "#PWR022" H 3500 2950 50  0001 C CNN
-F 1 "+3V3" H 3515 3273 50  0000 C CNN
-F 2 "" H 3500 3100 50  0001 C CNN
-F 3 "" H 3500 3100 50  0001 C CNN
-	1    3500 3100
+P 4600 2750
+F 0 "#PWR022" H 4600 2600 50  0001 C CNN
+F 1 "+3V3" H 4615 2923 50  0000 C CNN
+F 2 "" H 4600 2750 50  0001 C CNN
+F 3 "" H 4600 2750 50  0001 C CNN
+	1    4600 2750
 	1    0    0    -1  
 $EndComp
 Text Label 8650 2500 2    60   ~ 0
@ -617,38 +617,48 @@ RX
 $Comp
 L GND #PWR031
 U 1 1 59D138A1
-P 5450 4250
-F 0 "#PWR031" H 5450 4000 50  0001 C CNN
-F 1 "GND" H 5455 4077 50  0000 C CNN
-F 2 "" H 5450 4250 50  0001 C CNN
-F 3 "" H 5450 4250 50  0001 C CNN
-	1    5450 4250
+P 6950 3900
+F 0 "#PWR031" H 6950 3650 50  0001 C CNN
+F 1 "GND" H 6955 3727 50  0000 C CNN
+F 2 "" H 6950 3900 50  0001 C CNN
+F 3 "" H 6950 3900 50  0001 C CNN
+	1    6950 3900
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4600 3600 4800 3600
-Connection ~ 5450 4100
+	6100 3250 6300 3250
+Connection ~ 6950 3750
 Wire Wire Line
-	5450 3700 5450 4250
+	6950 3350 6950 3750
+Wire Wire Line
+	6950 3750 6950 3900
 Wire Wire Line
 	1050 1150 950  1150
 Wire Wire Line
-	950  1050 950  1250
+	950  1050 950  1150
+Wire Wire Line
+	950  1150 950  1250
 Wire Wire Line
 	1050 1550 950  1550
 Wire Wire Line
-	950  1450 950  1650
+	950  1450 950  1550
+Wire Wire Line
+	950  1550 950  1650
 Connection ~ 950  1550
 Connection ~ 950  1150
 Wire Wire Line
-	8650 3350 8650 3750
+	8650 3350 8650 3450
+Wire Wire Line
+	8650 3450 8650 3750
 Wire Wire Line
 	8650 3350 8750 3350
 Connection ~ 8650 3450
 Wire Wire Line
 	2450 1350 2550 1350
 Wire Wire Line
-	2550 1250 2550 1450
+	2550 1250 2550 1350
+Wire Wire Line
+	2550 1350 2550 1450
 Wire Wire Line
 	2550 1250 2650 1250
 Wire Wire Line
@ -661,14 +671,20 @@ Wire Wire Line
 Wire Wire Line
 	8650 5850 8750 5850
 Wire Wire Line
-	8650 5450 8650 5850
+	8650 5450 8650 5550
 Wire Wire Line
-	8500 5550 8750 5550
+	8650 5550 8650 5850
+Wire Wire Line
+	8500 5550 8650 5550
+Wire Wire Line
+	8650 5550 8750 5550
 Wire Wire Line
 	8650 5450 8750 5450
 Connection ~ 8650 5550
 Wire Wire Line
-	8550 3750 8750 3750
+	8550 3750 8650 3750
+Wire Wire Line
+	8650 3750 8750 3750
 Wire Wire Line
 	8750 3450 8650 3450
 Wire Wire Line
@ -677,20 +693,28 @@ Connection ~ 8650 3750
 Wire Wire Line
 	9350 1650 9350 1550
 Wire Wire Line
-	8550 1650 9350 1650
+	8550 1650 8950 1650
+Wire Wire Line
+	8950 1650 9350 1650
 Wire Wire Line
 	8550 1650 8550 1550
 Wire Wire Line
-	8950 1550 8950 1750
+	8950 1550 8950 1650
+Wire Wire Line
+	8950 1650 8950 1750
 Connection ~ 8950 1650
 Wire Wire Line
 	9350 1100 9350 1250
 Wire Wire Line
-	8550 1100 9350 1100
+	8550 1100 8950 1100
+Wire Wire Line
+	8950 1100 9350 1100
 Wire Wire Line
 	8550 1100 8550 1250
 Wire Wire Line
-	8950 1000 8950 1250
+	8950 1000 8950 1100
+Wire Wire Line
+	8950 1100 8950 1250
 Connection ~ 8950 1100
 Wire Notes Line
 	8350 700  9650 700 
@ -703,20 +727,28 @@ Wire Notes Line
 Wire Wire Line
 	10750 1650 10750 1550
 Wire Wire Line
-	9950 1650 10750 1650
+	9950 1650 10350 1650
+Wire Wire Line
+	10350 1650 10750 1650
 Wire Wire Line
 	9950 1650 9950 1550
 Wire Wire Line
-	10350 1550 10350 1750
+	10350 1550 10350 1650
+Wire Wire Line
+	10350 1650 10350 1750
 Connection ~ 10350 1650
 Wire Wire Line
 	10750 1100 10750 1250
 Wire Wire Line
-	9950 1100 10750 1100
+	9950 1100 10350 1100
+Wire Wire Line
+	10350 1100 10750 1100
 Wire Wire Line
 	9950 1100 9950 1250
 Wire Wire Line
-	10350 1000 10350 1250
+	10350 1000 10350 1100
+Wire Wire Line
+	10350 1100 10350 1250
 Connection ~ 10350 1100
 Wire Notes Line
 	9750 700  11050 700 
@ -727,11 +759,11 @@ Wire Notes Line
 Wire Notes Line
 	9750 2000 9750 700 
 Wire Wire Line
-	1550 4350 1450 4350
+	1550 4600 1450 4600
 Wire Wire Line
-	1050 4250 1050 4350
+	1050 4500 1050 4600
 Wire Wire Line
-	1050 4350 1150 4350
+	1050 4600 1150 4600
 Wire Wire Line
 	8750 3200 8650 3200
 Wire Wire Line
@ -741,68 +773,74 @@ Wire Wire Line
 Wire Wire Line
 	8750 2900 8650 2900
 Wire Wire Line
-	4600 3400 4800 3400
+	6100 3050 6300 3050
 Wire Wire Line
 	8750 2600 8650 2600
 Wire Wire Line
-	4600 3500 4800 3500
+	6100 3150 6300 3150
 Wire Wire Line
-	3600 3500 3500 3500
+	5100 3150 5000 3150
 Wire Wire Line
-	1250 3600 1150 3600
+	1250 3850 1150 3850
 Wire Wire Line
-	1150 3700 1250 3700
+	1150 3950 1250 3950
 Wire Wire Line
-	1150 3800 1250 3800
+	1150 4050 1250 4050
 Wire Wire Line
-	1550 3600 1950 3600
+	1550 3850 1650 3850
 Wire Wire Line
-	1550 3700 1950 3700
+	1650 3850 1950 3850
 Wire Wire Line
-	1550 3800 1950 3800
-Wire Notes Line
-	3950 4450 4250 4450
-Wire Notes Line
-	4250 4450 4250 4500
-Wire Notes Line
-	4250 4500 4200 4500
-Wire Notes Line
-	4200 4500 4200 4650
-Wire Notes Line
-	4200 4650 4250 4650
-Wire Notes Line
-	4250 4650 4250 4700
-Wire Notes Line
-	4250 4700 4200 4700
-Wire Notes Line
-	4200 4700 4200 4750
-Wire Notes Line
-	4200 4750 4000 4750
-Wire Notes Line
-	4000 4750 4000 4700
-Wire Notes Line
-	4000 4700 3950 4700
-Wire Notes Line
-	3950 4700 3950 4650
-Wire Notes Line
-	3950 4650 4000 4650
-Wire Notes Line
-	4000 4650 4000 4500
-Wire Notes Line
-	4000 4500 3950 4500
-Wire Notes Line
-	3950 4500 3950 4450
+	1550 3950 1850 3950
 Wire Wire Line
-	3600 3400 3500 3400
-Connection ~ 1850 3700
-Connection ~ 1650 3600
+	1850 3950 1950 3950
 Wire Wire Line
-	1650 2600 1850 2600
+	1550 4050 1950 4050
+Wire Notes Line
+	5450 4100 5750 4100
+Wire Notes Line
+	5750 4100 5750 4150
+Wire Notes Line
+	5750 4150 5700 4150
+Wire Notes Line
+	5700 4150 5700 4300
+Wire Notes Line
+	5700 4300 5750 4300
+Wire Notes Line
+	5750 4300 5750 4350
+Wire Notes Line
+	5750 4350 5700 4350
+Wire Notes Line
+	5700 4350 5700 4400
+Wire Notes Line
+	5700 4400 5500 4400
+Wire Notes Line
+	5500 4400 5500 4350
+Wire Notes Line
+	5500 4350 5450 4350
+Wire Notes Line
+	5450 4350 5450 4300
+Wire Notes Line
+	5450 4300 5500 4300
+Wire Notes Line
+	5500 4300 5500 4150
+Wire Notes Line
+	5500 4150 5450 4150
+Wire Notes Line
+	5450 4150 5450 4100
 Wire Wire Line
-	1750 2600 1750 2500
-Connection ~ 1750 2600
+	5100 3050 5000 3050
+Connection ~ 1850 3950
+Connection ~ 1650 3850
 Wire Wire Line
-	4600 4400 4800 4400
+	1650 2850 1750 2850
+Wire Wire Line
+	1750 2850 1850 2850
+Wire Wire Line
+	1750 2850 1750 2750
+Connection ~ 1750 2850
+Wire Wire Line
+	6100 4050 6300 4050
 Wire Wire Line
 	8750 2400 8650 2400
 Wire Wire Line
@ -838,93 +876,113 @@ Wire Wire Line
 Wire Wire Line
 	8750 6100 8650 6100
 Wire Wire Line
-	5750 1450 5650 1450
+	5350 1450 5250 1450
 Wire Wire Line
-	5750 1550 5650 1550
+	5350 1550 5250 1550
 Wire Wire Line
-	5750 1650 5650 1650
+	5350 1650 5250 1650
 Wire Wire Line
-	6250 1450 6900 1450
+	5850 1450 6500 1450
 Wire Wire Line
-	6250 1550 6900 1550
+	5850 1550 6500 1550
 Wire Wire Line
-	5650 1750 5750 1750
+	5250 1750 5350 1750
 Wire Wire Line
-	6350 1750 6250 1750
+	5950 1750 5850 1750
 Wire Wire Line
-	3600 3700 3500 3700
+	5100 3350 5000 3350
 Wire Wire Line
-	3600 3800 3500 3800
+	5100 3450 5000 3450
 Wire Wire Line
-	3600 3900 3500 3900
+	5100 3550 5000 3550
 Wire Wire Line
-	3600 4000 3500 4000
+	5100 3650 5000 3650
 Wire Wire Line
-	3600 4100 3500 4100
+	5100 3750 5000 3750
 Wire Wire Line
-	3600 4200 3500 4200
+	5100 3850 5000 3850
 Wire Wire Line
-	3600 4500 3500 4500
+	5100 4150 5000 4150
 Wire Wire Line
-	4600 3700 5450 3700
+	6100 3350 6950 3350
 Wire Wire Line
-	4600 3800 4800 3800
+	6100 3450 6300 3450
 Wire Wire Line
-	4600 3900 4800 3900
+	6100 3550 6300 3550
 Wire Wire Line
-	4600 4000 4800 4000
+	6100 3650 6300 3650
 Wire Wire Line
-	4600 4100 5450 4100
+	6100 3750 6950 3750
 Wire Wire Line
-	4600 4200 4800 4200
+	6100 3850 6300 3850
 Wire Wire Line
-	4600 4300 4800 4300
+	6100 3950 6300 3950
 Wire Wire Line
-	4600 4600 5100 4600
+	6100 4250 6600 4250
 Wire Wire Line
-	6900 1550 6900 1600
+	6500 1550 6500 1600
 Wire Wire Line
-	6900 1450 6900 1400
+	6500 1450 6500 1400
 Wire Wire Line
-	3500 3600 3600 3600
+	5000 3250 5100 3250
 Wire Wire Line
-	2800 4500 2800 4600
+	4600 4150 4600 4250
 Wire Wire Line
-	2800 4600 3600 4600
+	4600 4250 5100 4250
 Wire Wire Line
-	3500 4500 3500 4700
+	5000 4150 5000 4350
 Wire Wire Line
-	4600 4500 4700 4500
+	6100 4150 6200 4150
 Wire Wire Line
-	5100 4600 5100 4500
+	6600 4250 6600 4150
 Wire Wire Line
-	4700 4500 4700 4700
+	6200 4150 6200 4350
 Wire Wire Line
-	3500 3200 3600 3200
+	4600 2850 5100 2850
 Wire Wire Line
-	4600 3300 4800 3300
+	6100 2950 6300 2950
 Wire Wire Line
-	4600 3200 4800 3200
+	6100 2850 6300 2850
 Wire Wire Line
-	3500 3200 3500 3100
+	4600 2850 4600 2750
 Wire Wire Line
-	3600 3300 3500 3300
+	5100 2950 5000 2950
 Wire Wire Line
-	1850 3700 1850 3400
+	1850 3950 1850 3650
 Wire Wire Line
-	1650 3600 1650 3400
+	1650 3850 1650 3650
 Wire Wire Line
-	1650 2700 1650 2600
+	1650 2950 1650 2850
 Wire Wire Line
-	1850 2600 1850 2700
+	1850 2850 1850 2950
 Wire Wire Line
-	1850 3000 1850 3100
+	1850 3250 1850 3350
 Wire Wire Line
-	1650 3000 1650 3100
+	1650 3250 1650 3350
 Wire Wire Line
-	3600 4400 3500 4400
+	5100 4050 5000 4050
 Wire Wire Line
-	3500 4300 3600 4300
-Text Label 4800 3600 0    60   ~ 0
+	5000 3950 5100 3950
+Text Label 6300 3250 0    60   ~ 0
 JTAG_EN
+Wire Notes Line
+	5450 2700 5450 2900
+Wire Notes Line
+	5450 2900 5750 2900
+Wire Notes Line
+	5750 2900 5750 2700
+Wire Notes Line
+	5750 2700 5450 2700
+Text Notes 5500 2850 0    60   ~ 0
+JTAG
+Wire Notes Line
+	4350 700  4350 4650
+Wire Notes Line
+	4350 4650 7200 4650
+Wire Notes Line
+	7200 4650 7200 700 
+Wire Notes Line
+	7200 700  4350 700 
+Text Notes 5300 950  0    60   ~ 0
+Main I/O Connectors
 $EndSCHEMATC
--- a/power.sch
+++ b/power.sch
@ -126,12 +126,12 @@ $EndComp
 $Comp
 L LCMXO2-1200HC-4SG32C U2
 U 1 1 59CE1D8D
-P 3700 2200
-F 0 "U2" H 4100 2387 60  0000 C CNN
-F 1 "LCMXO2-1200HC-4SG32C" H 4100 2281 60  0000 C CNN
-F 2 "Housings_DFN_QFN:QFN-32-1EP_5x5mm_Pitch0.5mm" H 3950 1500 60  0001 C CNN
-F 3 "" H 3950 1500 60  0001 C CNN
-	1    3700 2200
+P 3700 2450
+F 0 "U2" H 4100 2637 60  0000 C CNN
+F 1 "LCMXO2-1200HC-4SG32C" H 4100 2531 60  0000 C CNN
+F 2 "Housings_DFN_QFN:QFN-32-1EP_5x5mm_Pitch0.5mm" H 3950 1750 60  0001 C CNN
+F 3 "" H 3950 1750 60  0001 C CNN
+	1    3700 2450
 	1    0    0    -1  
 $EndComp
 $Comp
@ -148,23 +148,23 @@ $EndComp
 $Comp
 L GND #PWR010
 U 1 1 59CE28E2
-P 4800 2750
-F 0 "#PWR010" H 4800 2500 50  0001 C CNN
-F 1 "GND" H 4805 2577 50  0000 C CNN
-F 2 "" H 4800 2750 50  0001 C CNN
-F 3 "" H 4800 2750 50  0001 C CNN
-	1    4800 2750
+P 4800 3000
+F 0 "#PWR010" H 4800 2750 50  0001 C CNN
+F 1 "GND" H 4805 2827 50  0000 C CNN
+F 2 "" H 4800 3000 50  0001 C CNN
+F 3 "" H 4800 3000 50  0001 C CNN
+	1    4800 3000
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3V3 #PWR06
 U 1 1 59CE2901
-P 3400 2300
-F 0 "#PWR06" H 3400 2150 50  0001 C CNN
-F 1 "+3V3" H 3400 2450 50  0000 C CNN
-F 2 "" H 3400 2300 50  0001 C CNN
-F 3 "" H 3400 2300 50  0001 C CNN
-	1    3400 2300
+P 3400 2550
+F 0 "#PWR06" H 3400 2400 50  0001 C CNN
+F 1 "+3V3" H 3400 2700 50  0000 C CNN
+F 2 "" H 3400 2550 50  0001 C CNN
+F 3 "" H 3400 2550 50  0001 C CNN
+	1    3400 2550
 	1    0    0    -1  
 $EndComp
 $Comp
@ -226,19 +226,19 @@ Wire Wire Line
 	1200 1200 1450 1200
 Connection ~ 1200 1200
 Wire Wire Line
-	3400 2500 3500 2500
+	3400 2750 3500 2750
 Wire Wire Line
-	3400 2300 3400 2500
+	3400 2550 3400 2750
 Wire Wire Line
-	3400 2400 3500 2400
-Connection ~ 3400 2400
+	3400 2650 3500 2650
+Connection ~ 3400 2650
 Wire Wire Line
-	4700 2400 4800 2400
+	4700 2650 4800 2650
 Wire Wire Line
-	4800 2400 4800 2750
+	4800 2650 4800 3000
 Wire Wire Line
-	4800 2500 4700 2500
-Connection ~ 4800 2500
+	4800 2750 4700 2750
+Connection ~ 4800 2750
 Wire Wire Line
 	4500 1550 4500 1450
 Wire Wire Line
@ -292,18 +292,18 @@ F 3 "" H 4050 1650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3500 2650 3400 2650
+	3500 2900 3400 2900
 Wire Wire Line
-	3400 2650 3400 2750
+	3400 2900 3400 3000
 $Comp
 L GND #PWR07
 U 1 1 59CEF312
-P 3400 2750
-F 0 "#PWR07" H 3400 2500 50  0001 C CNN
-F 1 "GND" H 3405 2577 50  0000 C CNN
-F 2 "" H 3400 2750 50  0001 C CNN
-F 3 "" H 3400 2750 50  0001 C CNN
-	1    3400 2750
+P 3400 3000
+F 0 "#PWR07" H 3400 2750 50  0001 C CNN
+F 1 "GND" H 3405 2827 50  0000 C CNN
+F 2 "" H 3400 3000 50  0001 C CNN
+F 3 "" H 3400 3000 50  0001 C CNN
+	1    3400 3000
 	1    0    0    -1  
 $EndComp
 $Comp
--- a/usbserial.sch
+++ b/usbserial.sch
@ -49,12 +49,12 @@ $EndDescr
 $Comp
 L ch340g U3
 U 1 1 59CE5435
-P 4600 1600
-F 0 "U3" H 4600 2337 60  0000 C CNN
-F 1 "ch340g" H 4600 2231 60  0000 C CNN
-F 2 "Housings_SOIC:SOIC-16_3.9x9.9mm_Pitch1.27mm" H 4300 2050 60  0001 C CNN
-F 3 "" H 4300 2050 60  0001 C CNN
-	1    4600 1600
+P 4600 1550
+F 0 "U3" H 4600 2287 60  0000 C CNN
+F 1 "ch340g" H 4600 2181 60  0000 C CNN
+F 2 "Housings_SOIC:SOIC-16_3.9x9.9mm_Pitch1.27mm" H 4300 2000 60  0001 C CNN
+F 3 "" H 4300 2000 60  0001 C CNN
+	1    4600 1550
 	1    0    0    -1  
 $EndComp
 $Comp
@ -108,48 +108,48 @@ USB+
 $Comp
 L C_Small C8
 U 1 1 59CE59BF
-P 3700 2150
-F 0 "C8" H 3792 2196 50  0000 L CNN
-F 1 "100n" H 3792 2105 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603" H 3700 2150 50  0001 C CNN
-F 3 "" H 3700 2150 50  0001 C CNN
-	1    3700 2150
+P 3700 2100
+F 0 "C8" H 3792 2146 50  0000 L CNN
+F 1 "100n" H 3792 2055 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603" H 3700 2100 50  0001 C CNN
+F 3 "" H 3700 2100 50  0001 C CNN
+	1    3700 2100
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR014
 U 1 1 59CE5B99
-P 3850 2450
-F 0 "#PWR014" H 3850 2200 50  0001 C CNN
-F 1 "GND" H 3855 2277 50  0000 C CNN
-F 2 "" H 3850 2450 50  0001 C CNN
-F 3 "" H 3850 2450 50  0001 C CNN
-	1    3850 2450
+P 3850 2400
+F 0 "#PWR014" H 3850 2150 50  0001 C CNN
+F 1 "GND" H 3855 2227 50  0000 C CNN
+F 2 "" H 3850 2400 50  0001 C CNN
+F 3 "" H 3850 2400 50  0001 C CNN
+	1    3850 2400
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3V3 #PWR013
 U 1 1 59CE5E77
-P 3700 1750
-F 0 "#PWR013" H 3700 1600 50  0001 C CNN
-F 1 "+3V3" H 3715 1923 50  0000 C CNN
-F 2 "" H 3700 1750 50  0001 C CNN
-F 3 "" H 3700 1750 50  0001 C CNN
-	1    3700 1750
+P 3700 1700
+F 0 "#PWR013" H 3700 1550 50  0001 C CNN
+F 1 "+3V3" H 3715 1873 50  0000 C CNN
+F 2 "" H 3700 1700 50  0001 C CNN
+F 3 "" H 3700 1700 50  0001 C CNN
+	1    3700 1700
 	1    0    0    -1  
 $EndComp
-Text Label 4000 1150 2    60   ~ 0
+Text Label 4000 1100 2    60   ~ 0
 USB+
-Text Label 4000 1250 2    60   ~ 0
+Text Label 4000 1200 2    60   ~ 0
 USB-
-NoConn ~ 4100 1600
-Text HLabel 4000 1500 0    60   Input ~ 0
+NoConn ~ 4100 1550
+Text HLabel 4000 1450 0    60   Input ~ 0
 CLK_USBSER
-Text HLabel 5300 1150 2    60   Output ~ 0
+Text HLabel 5300 1100 2    60   Output ~ 0
 TXD
-Text HLabel 5300 1250 2    60   Input ~ 0
+Text HLabel 5300 1200 2    60   Input ~ 0
 RXD
-Text HLabel 5300 1800 2    60   Output ~ 0
+Text HLabel 5300 1750 2    60   Output ~ 0
 DTR
 Wire Wire Line
 	1050 1700 1050 1750
@ -162,44 +162,44 @@ Wire Wire Line
 Wire Wire Line
 	1450 1400 1600 1400
 Wire Wire Line
-	3700 1750 3700 2050
+	3700 1700 3700 2000
 Wire Wire Line
-	3700 1950 4100 1950
+	3700 1900 4100 1900
 Wire Wire Line
-	4100 2050 4000 2050
+	4100 2000 4000 2000
 Wire Wire Line
-	4000 2050 4000 2350
+	4000 2000 4000 2300
 Wire Wire Line
-	4000 2350 3700 2350
+	4000 2300 3700 2300
 Wire Wire Line
-	3700 2350 3700 2250
+	3700 2300 3700 2200
 Wire Wire Line
-	3850 2350 3850 2450
-Connection ~ 3850 2350
+	3850 2300 3850 2400
+Connection ~ 3850 2300
 Wire Wire Line
-	4100 1850 3700 1850
-Connection ~ 3700 1950
-Connection ~ 3700 1850
+	4100 1800 3700 1800
+Connection ~ 3700 1900
+Connection ~ 3700 1800
 Wire Wire Line
-	4000 1150 4100 1150
+	4000 1100 4100 1100
 Wire Wire Line
-	4100 1250 4000 1250
+	4100 1200 4000 1200
 Wire Wire Line
-	4100 1500 4000 1500
+	4100 1450 4000 1450
 Wire Wire Line
 	1450 1100 1550 1100
 Wire Wire Line
-	5100 1150 5300 1150
+	5100 1100 5300 1100
 Wire Wire Line
-	5100 1250 5300 1250
+	5100 1200 5300 1200
 Wire Wire Line
-	5300 1800 5100 1800
-NoConn ~ 5100 1400
-NoConn ~ 5100 1500
-NoConn ~ 5100 1600
-NoConn ~ 5100 1700
-NoConn ~ 5100 1900
-NoConn ~ 5100 2050
+	5300 1750 5100 1750
+NoConn ~ 5100 1350
+NoConn ~ 5100 1450
+NoConn ~ 5100 1550
+NoConn ~ 5100 1650
+NoConn ~ 5100 1850
+NoConn ~ 5100 2000
 Wire Wire Line
 	1150 1700 1150 1750
 Text Label 1450 1100 0    60   ~ 0