JTAG header

README.md

@@ -62,7 +62,7 @@ section (thicker power lines, separately routed feedback)
 2.54 mm external JTAG header
 
     [ ] Resistors for LEDs
-    [ ] Move USB LEDs from bottom to top side
+    [x] Move USB LEDs from bottom to top side
     [ ] Improve SDRAM routing - use VIAs for closest pins
     [x] Increase thickness of power lines (5V, 3.3V, 2.5V)
     [x] Compile a f32c bitstream using the schematics

analog.bak

@@ -64,10 +64,10 @@ F 3 "" H 2650 2400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR097
+L GND #PWR99
 U 1 1 58D9043A
 P 3250 2550
-F 0 "#PWR097" H 3250 2300 50  0001 C CNN
+F 0 "#PWR99" H 3250 2300 50  0001 C CNN
 F 1 "GND" H 3250 2400 50  0000 C CNN
 F 2 "" H 3250 2550 50  0000 C CNN
 F 3 "" H 3250 2550 50  0000 C CNN

analog.sch

@@ -64,10 +64,10 @@ F 3 "" H 2650 2400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR097
+L GND #PWR099
 U 1 1 58D9043A
 P 3250 2550
-F 0 "#PWR097" H 3250 2300 50  0001 C CNN
+F 0 "#PWR099" H 3250 2300 50  0001 C CNN
 F 1 "GND" H 3250 2400 50  0000 C CNN
 F 2 "" H 3250 2550 50  0000 C CNN
 F 3 "" H 3250 2550 50  0000 C CNN

blinkey.bak

@@ -67,10 +67,10 @@ Wire Wire Line
 Wire Wire Line
 	4750 1850 4850 1850
 $Comp
-L GND #PWR059
+L GND #PWR63
 U 1 1 58D66047
 P 4850 1250
-F 0 "#PWR059" H 4850 1000 50  0001 C CNN
+F 0 "#PWR63" H 4850 1000 50  0001 C CNN
 F 1 "GND" H 4850 1100 50  0000 C CNN
 F 2 "" H 4850 1250 60  0000 C CNN
 F 3 "" H 4850 1250 60  0000 C CNN
@@ -78,10 +78,10 @@ F 3 "" H 4850 1250 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR060
+L +3V3 #PWR64
 U 1 1 58D66055
 P 5350 1350
-F 0 "#PWR060" H 5350 1200 50  0001 C CNN
+F 0 "#PWR64" H 5350 1200 50  0001 C CNN
 F 1 "+3V3" H 5350 1490 50  0000 C CNN
 F 2 "" H 5350 1350 50  0000 C CNN
 F 3 "" H 5350 1350 50  0000 C CNN
@@ -179,10 +179,10 @@ Wire Wire Line
 Wire Wire Line
 	2750 3150 2850 3150
 $Comp
-L +3V3 #PWR061
+L +3V3 #PWR59
 U 1 1 58D6605C
 P 1750 2750
-F 0 "#PWR061" H 1750 2600 50  0001 C CNN
+F 0 "#PWR59" H 1750 2600 50  0001 C CNN
 F 1 "+3V3" H 1750 2890 50  0000 C CNN
 F 2 "" H 1750 2750 50  0000 C CNN
 F 3 "" H 1750 2750 50  0000 C CNN
@@ -339,10 +339,10 @@ Wire Wire Line
 	4400 2750 4250 2750
 Connection ~ 4250 2750
 $Comp
-L GND #PWR062
+L GND #PWR61
 U 1 1 58D681C3
 P 4250 4100
-F 0 "#PWR062" H 4250 3850 50  0001 C CNN
+F 0 "#PWR61" H 4250 3850 50  0001 C CNN
 F 1 "GND" H 4250 3950 50  0000 C CNN
 F 2 "" H 4250 4100 50  0000 C CNN
 F 3 "" H 4250 4100 50  0000 C CNN
@@ -432,10 +432,10 @@ Wire Wire Line
 Wire Wire Line
 	4250 4600 4250 4950
 $Comp
-L GND #PWR063
+L GND #PWR62
 U 1 1 590B5B6D
 P 4250 4950
-F 0 "#PWR063" H 4250 4700 50  0001 C CNN
+F 0 "#PWR62" H 4250 4700 50  0001 C CNN
 F 1 "GND" H 4250 4800 50  0000 C CNN
 F 2 "" H 4250 4950 50  0000 C CNN
 F 3 "" H 4250 4950 50  0000 C CNN
@@ -479,10 +479,10 @@ Wire Wire Line
 Wire Wire Line
 	2750 2750 2750 3150
 $Comp
-L +3V3 #PWR064
+L +3V3 #PWR60
 U 1 1 591B548D
 P 1750 4150
-F 0 "#PWR064" H 1750 4000 50  0001 C CNN
+F 0 "#PWR60" H 1750 4000 50  0001 C CNN
 F 1 "+3V3" H 1750 4290 50  0000 C CNN
 F 2 "" H 1750 4150 50  0000 C CNN
 F 3 "" H 1750 4150 50  0000 C CNN

flash.bak

@@ -64,10 +64,10 @@ F 3 "" H 2450 2650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0102
+L +3V3 #PWR106
 U 1 1 58D9149E
 P 2800 2400
-F 0 "#PWR0102" H 2800 2250 50  0001 C CNN
+F 0 "#PWR106" H 2800 2250 50  0001 C CNN
 F 1 "+3V3" H 2800 2540 50  0000 C CNN
 F 2 "" H 2800 2400 50  0000 C CNN
 F 3 "" H 2800 2400 50  0000 C CNN
@@ -75,10 +75,10 @@ F 3 "" H 2800 2400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0103
+L GND #PWR107
 U 1 1 58D914B4
 P 2800 3000
-F 0 "#PWR0103" H 2800 2750 50  0001 C CNN
+F 0 "#PWR107" H 2800 2750 50  0001 C CNN
 F 1 "GND" H 2800 2850 50  0000 C CNN
 F 2 "" H 2800 3000 50  0000 C CNN
 F 3 "" H 2800 3000 50  0000 C CNN
@@ -137,10 +137,10 @@ Wire Wire Line
 Text Label 3950 2200 1    60   ~ 0
 FLASH_MOSI
 $Comp
-L +3V3 #PWR0104
+L +3V3 #PWR108
 U 1 1 58EC0F61
 P 3950 1250
-F 0 "#PWR0104" H 3950 1100 50  0001 C CNN
+F 0 "#PWR108" H 3950 1100 50  0001 C CNN
 F 1 "+3V3" H 3950 1390 50  0000 C CNN
 F 2 "" H 3950 1250 50  0000 C CNN
 F 3 "" H 3950 1250 50  0000 C CNN
@@ -163,10 +163,10 @@ Wire Wire Line
 Text Label 4150 2200 1    60   ~ 0
 FLASH_MISO
 $Comp
-L +3V3 #PWR0105
+L +3V3 #PWR109
 U 1 1 58EC0F96
 P 4150 1250
-F 0 "#PWR0105" H 4150 1100 50  0001 C CNN
+F 0 "#PWR109" H 4150 1100 50  0001 C CNN
 F 1 "+3V3" H 4150 1390 50  0000 C CNN
 F 2 "" H 4150 1250 50  0000 C CNN
 F 3 "" H 4150 1250 50  0000 C CNN
@@ -189,10 +189,10 @@ Wire Wire Line
 Text Label 4350 2200 1    60   ~ 0
 FLASH_SCK
 $Comp
-L +3V3 #PWR0106
+L +3V3 #PWR110
 U 1 1 58EC15E9
 P 4350 1250
-F 0 "#PWR0106" H 4350 1100 50  0001 C CNN
+F 0 "#PWR110" H 4350 1100 50  0001 C CNN
 F 1 "+3V3" H 4350 1390 50  0000 C CNN
 F 2 "" H 4350 1250 50  0000 C CNN
 F 3 "" H 4350 1250 50  0000 C CNN
@@ -219,10 +219,10 @@ Wire Wire Line
 Text Label 4550 2200 1    60   ~ 0
 FLASH_nCS
 $Comp
-L +3V3 #PWR0107
+L +3V3 #PWR111
 U 1 1 58EC1C8C
 P 4550 1250
-F 0 "#PWR0107" H 4550 1100 50  0001 C CNN
+F 0 "#PWR111" H 4550 1100 50  0001 C CNN
 F 1 "+3V3" H 4550 1390 50  0000 C CNN
 F 2 "" H 4550 1250 50  0000 C CNN
 F 3 "" H 4550 1250 50  0000 C CNN
@@ -247,10 +247,10 @@ Wire Wire Line
 Text Label 1150 2150 1    60   ~ 0
 FLASH_nWP
 $Comp
-L +3V3 #PWR0108
+L +3V3 #PWR104
 U 1 1 58EC4E7F
 P 1150 1200
-F 0 "#PWR0108" H 1150 1050 50  0001 C CNN
+F 0 "#PWR104" H 1150 1050 50  0001 C CNN
 F 1 "+3V3" H 1150 1340 50  0000 C CNN
 F 2 "" H 1150 1200 50  0000 C CNN
 F 3 "" H 1150 1200 50  0000 C CNN
@@ -273,10 +273,10 @@ Wire Wire Line
 Text Label 1350 2150 1    60   ~ 0
 FLASH_nHOLD
 $Comp
-L +3V3 #PWR0109
+L +3V3 #PWR105
 U 1 1 58EC4E8D
 P 1350 1200
-F 0 "#PWR0109" H 1350 1050 50  0001 C CNN
+F 0 "#PWR105" H 1350 1050 50  0001 C CNN
 F 1 "+3V3" H 1350 1340 50  0000 C CNN
 F 2 "" H 1350 1200 50  0000 C CNN
 F 3 "" H 1350 1200 50  0000 C CNN
@@ -284,10 +284,10 @@ F 3 "" H 1350 1200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0110
+L +3V3 #PWR112
 U 1 1 58EC58A7
 P 5450 3350
-F 0 "#PWR0110" H 5450 3200 50  0001 C CNN
+F 0 "#PWR112" H 5450 3200 50  0001 C CNN
 F 1 "+3V3" H 5450 3490 50  0000 C CNN
 F 2 "" H 5450 3350 50  0000 C CNN
 F 3 "" H 5450 3350 50  0000 C CNN
@@ -295,10 +295,10 @@ F 3 "" H 5450 3350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR0111
+L GND #PWR116
 U 1 1 58EC58CB
 P 5650 3450
-F 0 "#PWR0111" H 5650 3200 50  0001 C CNN
+F 0 "#PWR116" H 5650 3200 50  0001 C CNN
 F 1 "GND" H 5650 3300 50  0000 C CNN
 F 2 "" H 5650 3450 50  0000 C CNN
 F 3 "" H 5650 3450 50  0000 C CNN
@@ -306,10 +306,10 @@ F 3 "" H 5650 3450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR0112
+L GND #PWR115
 U 1 1 58EC58EF
 P 5650 3250
-F 0 "#PWR0112" H 5650 3000 50  0001 C CNN
+F 0 "#PWR115" H 5650 3000 50  0001 C CNN
 F 1 "GND" H 5650 3100 50  0000 C CNN
 F 2 "" H 5650 3250 50  0000 C CNN
 F 3 "" H 5650 3250 50  0000 C CNN
@@ -344,10 +344,10 @@ Wire Wire Line
 Text Label 8850 3650 1    60   ~ 0
 FPGA_PROGRAMN
 $Comp
-L +3V3 #PWR0113
+L +3V3 #PWR118
 U 1 1 58EC68E4
 P 8850 2550
-F 0 "#PWR0113" H 8850 2400 50  0001 C CNN
+F 0 "#PWR118" H 8850 2400 50  0001 C CNN
 F 1 "+3V3" H 8850 2690 50  0000 C CNN
 F 2 "" H 8850 2550 50  0000 C CNN
 F 3 "" H 8850 2550 50  0000 C CNN
@@ -370,10 +370,10 @@ Wire Wire Line
 Text Label 9050 3650 1    60   ~ 0
 FPGA_DONE
 $Comp
-L +3V3 #PWR0114
+L +3V3 #PWR119
 U 1 1 58EC68F2
 P 9050 2550
-F 0 "#PWR0114" H 9050 2400 50  0001 C CNN
+F 0 "#PWR119" H 9050 2400 50  0001 C CNN
 F 1 "+3V3" H 9050 2690 50  0000 C CNN
 F 2 "" H 9050 2550 50  0000 C CNN
 F 3 "" H 9050 2550 50  0000 C CNN
@@ -400,10 +400,10 @@ Wire Wire Line
 Text Label 9250 3650 1    60   ~ 0
 FPGA_INITN
 $Comp
-L +3V3 #PWR0115
+L +3V3 #PWR120
 U 1 1 58EC7305
 P 9250 2550
-F 0 "#PWR0115" H 9250 2400 50  0001 C CNN
+F 0 "#PWR120" H 9250 2400 50  0001 C CNN
 F 1 "+3V3" H 9250 2690 50  0000 C CNN
 F 2 "" H 9250 2550 50  0000 C CNN
 F 3 "" H 9250 2550 50  0000 C CNN
@@ -411,10 +411,10 @@ F 3 "" H 9250 2550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0116
+L +3V3 #PWR114
 U 1 1 58EC879F
 P 5650 2950
-F 0 "#PWR0116" H 5650 2800 50  0001 C CNN
+F 0 "#PWR114" H 5650 2800 50  0001 C CNN
 F 1 "+3V3" H 5650 3090 50  0000 C CNN
 F 2 "" H 5650 2950 50  0000 C CNN
 F 3 "" H 5650 2950 50  0000 C CNN
@@ -422,10 +422,10 @@ F 3 "" H 5650 2950 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR0117
+L +3V3 #PWR113
 U 1 1 58EC8800
 P 5650 2550
-F 0 "#PWR0117" H 5650 2400 50  0001 C CNN
+F 0 "#PWR113" H 5650 2400 50  0001 C CNN
 F 1 "+3V3" H 5650 2690 50  0000 C CNN
 F 2 "" H 5650 2550 50  0000 C CNN
 F 3 "" H 5650 2550 50  0000 C CNN
@@ -433,10 +433,10 @@ F 3 "" H 5650 2550 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR0118
+L +3V3 #PWR117
 U 1 1 58EC882A
 P 7150 2550
-F 0 "#PWR0118" H 7150 2400 50  0001 C CNN
+F 0 "#PWR117" H 7150 2400 50  0001 C CNN
 F 1 "+3V3" H 7150 2690 50  0000 C CNN
 F 2 "" H 7150 2550 50  0000 C CNN
 F 3 "" H 7150 2550 50  0000 C CNN

flash.sch

@@ -64,10 +64,10 @@ F 3 "" H 2450 2650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0102
+L +3V3 #PWR0104
 U 1 1 58D9149E
 P 2800 2400
-F 0 "#PWR0102" H 2800 2250 50  0001 C CNN
+F 0 "#PWR0104" H 2800 2250 50  0001 C CNN
 F 1 "+3V3" H 2800 2540 50  0000 C CNN
 F 2 "" H 2800 2400 50  0000 C CNN
 F 3 "" H 2800 2400 50  0000 C CNN
@@ -75,10 +75,10 @@ F 3 "" H 2800 2400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0103
+L GND #PWR0105
 U 1 1 58D914B4
 P 2800 3000
-F 0 "#PWR0103" H 2800 2750 50  0001 C CNN
+F 0 "#PWR0105" H 2800 2750 50  0001 C CNN
 F 1 "GND" H 2800 2850 50  0000 C CNN
 F 2 "" H 2800 3000 50  0000 C CNN
 F 3 "" H 2800 3000 50  0000 C CNN
@@ -137,10 +137,10 @@ Wire Wire Line
 Text Label 3950 2200 1    60   ~ 0
 FLASH_MOSI
 $Comp
-L +3V3 #PWR0104
+L +3V3 #PWR0106
 U 1 1 58EC0F61
 P 3950 1250
-F 0 "#PWR0104" H 3950 1100 50  0001 C CNN
+F 0 "#PWR0106" H 3950 1100 50  0001 C CNN
 F 1 "+3V3" H 3950 1390 50  0000 C CNN
 F 2 "" H 3950 1250 50  0000 C CNN
 F 3 "" H 3950 1250 50  0000 C CNN
@@ -163,10 +163,10 @@ Wire Wire Line
 Text Label 4150 2200 1    60   ~ 0
 FLASH_MISO
 $Comp
-L +3V3 #PWR0105
+L +3V3 #PWR0107
 U 1 1 58EC0F96
 P 4150 1250
-F 0 "#PWR0105" H 4150 1100 50  0001 C CNN
+F 0 "#PWR0107" H 4150 1100 50  0001 C CNN
 F 1 "+3V3" H 4150 1390 50  0000 C CNN
 F 2 "" H 4150 1250 50  0000 C CNN
 F 3 "" H 4150 1250 50  0000 C CNN
@@ -189,10 +189,10 @@ Wire Wire Line
 Text Label 4350 2200 1    60   ~ 0
 FLASH_SCK
 $Comp
-L +3V3 #PWR0106
+L +3V3 #PWR0108
 U 1 1 58EC15E9
 P 4350 1250
-F 0 "#PWR0106" H 4350 1100 50  0001 C CNN
+F 0 "#PWR0108" H 4350 1100 50  0001 C CNN
 F 1 "+3V3" H 4350 1390 50  0000 C CNN
 F 2 "" H 4350 1250 50  0000 C CNN
 F 3 "" H 4350 1250 50  0000 C CNN
@@ -219,10 +219,10 @@ Wire Wire Line
 Text Label 4550 2200 1    60   ~ 0
 FLASH_nCS
 $Comp
-L +3V3 #PWR0107
+L +3V3 #PWR0109
 U 1 1 58EC1C8C
 P 4550 1250
-F 0 "#PWR0107" H 4550 1100 50  0001 C CNN
+F 0 "#PWR0109" H 4550 1100 50  0001 C CNN
 F 1 "+3V3" H 4550 1390 50  0000 C CNN
 F 2 "" H 4550 1250 50  0000 C CNN
 F 3 "" H 4550 1250 50  0000 C CNN
@@ -247,10 +247,10 @@ Wire Wire Line
 Text Label 1150 2150 1    60   ~ 0
 FLASH_nWP
 $Comp
-L +3V3 #PWR0108
+L +3V3 #PWR0110
 U 1 1 58EC4E7F
 P 1150 1200
-F 0 "#PWR0108" H 1150 1050 50  0001 C CNN
+F 0 "#PWR0110" H 1150 1050 50  0001 C CNN
 F 1 "+3V3" H 1150 1340 50  0000 C CNN
 F 2 "" H 1150 1200 50  0000 C CNN
 F 3 "" H 1150 1200 50  0000 C CNN
@@ -273,10 +273,10 @@ Wire Wire Line
 Text Label 1350 2150 1    60   ~ 0
 FLASH_nHOLD
 $Comp
-L +3V3 #PWR0109
+L +3V3 #PWR0111
 U 1 1 58EC4E8D
 P 1350 1200
-F 0 "#PWR0109" H 1350 1050 50  0001 C CNN
+F 0 "#PWR0111" H 1350 1050 50  0001 C CNN
 F 1 "+3V3" H 1350 1340 50  0000 C CNN
 F 2 "" H 1350 1200 50  0000 C CNN
 F 3 "" H 1350 1200 50  0000 C CNN
@@ -284,10 +284,10 @@ F 3 "" H 1350 1200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0110
+L +3V3 #PWR0112
 U 1 1 58EC58A7
 P 5450 3350
-F 0 "#PWR0110" H 5450 3200 50  0001 C CNN
+F 0 "#PWR0112" H 5450 3200 50  0001 C CNN
 F 1 "+3V3" H 5450 3490 50  0000 C CNN
 F 2 "" H 5450 3350 50  0000 C CNN
 F 3 "" H 5450 3350 50  0000 C CNN
@@ -295,10 +295,10 @@ F 3 "" H 5450 3350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR0111
+L GND #PWR0113
 U 1 1 58EC58CB
 P 5650 3450
-F 0 "#PWR0111" H 5650 3200 50  0001 C CNN
+F 0 "#PWR0113" H 5650 3200 50  0001 C CNN
 F 1 "GND" H 5650 3300 50  0000 C CNN
 F 2 "" H 5650 3450 50  0000 C CNN
 F 3 "" H 5650 3450 50  0000 C CNN
@@ -306,10 +306,10 @@ F 3 "" H 5650 3450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR0112
+L GND #PWR0114
 U 1 1 58EC58EF
 P 5650 3250
-F 0 "#PWR0112" H 5650 3000 50  0001 C CNN
+F 0 "#PWR0114" H 5650 3000 50  0001 C CNN
 F 1 "GND" H 5650 3100 50  0000 C CNN
 F 2 "" H 5650 3250 50  0000 C CNN
 F 3 "" H 5650 3250 50  0000 C CNN
@@ -344,10 +344,10 @@ Wire Wire Line
 Text Label 8850 3650 1    60   ~ 0
 FPGA_PROGRAMN
 $Comp
-L +3V3 #PWR0113
+L +3V3 #PWR0115
 U 1 1 58EC68E4
 P 8850 2550
-F 0 "#PWR0113" H 8850 2400 50  0001 C CNN
+F 0 "#PWR0115" H 8850 2400 50  0001 C CNN
 F 1 "+3V3" H 8850 2690 50  0000 C CNN
 F 2 "" H 8850 2550 50  0000 C CNN
 F 3 "" H 8850 2550 50  0000 C CNN
@@ -370,10 +370,10 @@ Wire Wire Line
 Text Label 9050 3650 1    60   ~ 0
 FPGA_DONE
 $Comp
-L +3V3 #PWR0114
+L +3V3 #PWR0116
 U 1 1 58EC68F2
 P 9050 2550
-F 0 "#PWR0114" H 9050 2400 50  0001 C CNN
+F 0 "#PWR0116" H 9050 2400 50  0001 C CNN
 F 1 "+3V3" H 9050 2690 50  0000 C CNN
 F 2 "" H 9050 2550 50  0000 C CNN
 F 3 "" H 9050 2550 50  0000 C CNN
@@ -400,10 +400,10 @@ Wire Wire Line
 Text Label 9250 3650 1    60   ~ 0
 FPGA_INITN
 $Comp
-L +3V3 #PWR0115
+L +3V3 #PWR0117
 U 1 1 58EC7305
 P 9250 2550
-F 0 "#PWR0115" H 9250 2400 50  0001 C CNN
+F 0 "#PWR0117" H 9250 2400 50  0001 C CNN
 F 1 "+3V3" H 9250 2690 50  0000 C CNN
 F 2 "" H 9250 2550 50  0000 C CNN
 F 3 "" H 9250 2550 50  0000 C CNN
@@ -411,10 +411,10 @@ F 3 "" H 9250 2550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0116
+L +3V3 #PWR0118
 U 1 1 58EC879F
 P 5650 2950
-F 0 "#PWR0116" H 5650 2800 50  0001 C CNN
+F 0 "#PWR0118" H 5650 2800 50  0001 C CNN
 F 1 "+3V3" H 5650 3090 50  0000 C CNN
 F 2 "" H 5650 2950 50  0000 C CNN
 F 3 "" H 5650 2950 50  0000 C CNN
@@ -422,10 +422,10 @@ F 3 "" H 5650 2950 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR0117
+L +3V3 #PWR0119
 U 1 1 58EC8800
 P 5650 2550
-F 0 "#PWR0117" H 5650 2400 50  0001 C CNN
+F 0 "#PWR0119" H 5650 2400 50  0001 C CNN
 F 1 "+3V3" H 5650 2690 50  0000 C CNN
 F 2 "" H 5650 2550 50  0000 C CNN
 F 3 "" H 5650 2550 50  0000 C CNN
@@ -433,10 +433,10 @@ F 3 "" H 5650 2550 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR0118
+L +3V3 #PWR0120
 U 1 1 58EC882A
 P 7150 2550
-F 0 "#PWR0118" H 7150 2400 50  0001 C CNN
+F 0 "#PWR0120" H 7150 2400 50  0001 C CNN
 F 1 "+3V3" H 7150 2690 50  0000 C CNN
 F 2 "" H 7150 2550 50  0000 C CNN
 F 3 "" H 7150 2550 50  0000 C CNN

gpdi.bak

@@ -104,10 +104,10 @@ Wire Wire Line
 Wire Wire Line
 	1450 1900 1500 1900
 $Comp
-L GND #PWR065
+L GND #PWR65
 U 1 1 58D69073
 P 1500 1900
-F 0 "#PWR065" H 1500 1650 50  0001 C CNN
+F 0 "#PWR65" H 1500 1650 50  0001 C CNN
 F 1 "GND" H 1500 1750 50  0000 C CNN
 F 2 "" H 1500 1900 60  0000 C CNN
 F 3 "" H 1500 1900 60  0000 C CNN
@@ -115,10 +115,10 @@ F 3 "" H 1500 1900 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR066
+L GND #PWR70
 U 1 1 58D69074
 P 1500 3500
-F 0 "#PWR066" H 1500 3250 50  0001 C CNN
+F 0 "#PWR70" H 1500 3250 50  0001 C CNN
 F 1 "GND" H 1500 3350 50  0000 C CNN
 F 2 "" H 1500 3500 60  0000 C CNN
 F 3 "" H 1500 3500 60  0000 C CNN
@@ -126,10 +126,10 @@ F 3 "" H 1500 3500 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR067
+L GND #PWR69
 U 1 1 58D69075
 P 1500 3200
-F 0 "#PWR067" H 1500 2950 50  0001 C CNN
+F 0 "#PWR69" H 1500 2950 50  0001 C CNN
 F 1 "GND" H 1500 3050 50  0000 C CNN
 F 2 "" H 1500 3200 60  0000 C CNN
 F 3 "" H 1500 3200 60  0000 C CNN
@@ -137,10 +137,10 @@ F 3 "" H 1500 3200 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR068
+L GND #PWR68
 U 1 1 58D69076
 P 1500 2900
-F 0 "#PWR068" H 1500 2650 50  0001 C CNN
+F 0 "#PWR68" H 1500 2650 50  0001 C CNN
 F 1 "GND" H 1500 2750 50  0000 C CNN
 F 2 "" H 1500 2900 60  0000 C CNN
 F 3 "" H 1500 2900 60  0000 C CNN
@@ -148,10 +148,10 @@ F 3 "" H 1500 2900 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR069
+L GND #PWR67
 U 1 1 58D69077
 P 1500 2600
-F 0 "#PWR069" H 1500 2350 50  0001 C CNN
+F 0 "#PWR67" H 1500 2350 50  0001 C CNN
 F 1 "GND" H 1500 2450 50  0000 C CNN
 F 2 "" H 1500 2600 60  0000 C CNN
 F 3 "" H 1500 2600 60  0000 C CNN
@@ -159,10 +159,10 @@ F 3 "" H 1500 2600 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR070
+L GND #PWR66
 U 1 1 58D69078
 P 1500 2300
-F 0 "#PWR070" H 1500 2050 50  0001 C CNN
+F 0 "#PWR66" H 1500 2050 50  0001 C CNN
 F 1 "GND" H 1500 2150 50  0000 C CNN
 F 2 "" H 1500 2300 60  0000 C CNN
 F 3 "" H 1500 2300 60  0000 C CNN
@@ -170,10 +170,10 @@ F 3 "" H 1500 2300 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +5V #PWR071
+L +5V #PWR72
 U 1 1 58D6907F
 P 2250 3800
-F 0 "#PWR071" H 2250 3650 50  0001 C CNN
+F 0 "#PWR72" H 2250 3650 50  0001 C CNN
 F 1 "+5V" H 2250 3940 50  0000 C CNN
 F 2 "" H 2250 3800 50  0000 C CNN
 F 3 "" H 2250 3800 50  0000 C CNN
@@ -291,10 +291,10 @@ Wire Wire Line
 Wire Wire Line
 	3800 5350 3800 4950
 $Comp
-L +5V #PWR072
+L +5V #PWR76
 U 1 1 58D92625
 P 3600 4400
-F 0 "#PWR072" H 3600 4250 50  0001 C CNN
+F 0 "#PWR76" H 3600 4250 50  0001 C CNN
 F 1 "+5V" H 3600 4540 50  0000 C CNN
 F 2 "" H 3600 4400 50  0000 C CNN
 F 3 "" H 3600 4400 50  0000 C CNN
@@ -316,10 +316,10 @@ Wire Wire Line
 	4050 4550 4050 4600
 Connection ~ 3800 4550
 $Comp
-L GND #PWR073
+L GND #PWR77
 U 1 1 58D92889
 P 4050 4950
-F 0 "#PWR073" H 4050 4700 50  0001 C CNN
+F 0 "#PWR77" H 4050 4700 50  0001 C CNN
 F 1 "GND" H 4050 4800 50  0000 C CNN
 F 2 "" H 4050 4950 50  0000 C CNN
 F 3 "" H 4050 4950 50  0000 C CNN
@@ -329,10 +329,10 @@ $EndComp
 Wire Wire Line
 	4050 4900 4050 4950
 $Comp
-L +3V3 #PWR074
+L +3V3 #PWR71
 U 1 1 58D92A40
 P 2000 4700
-F 0 "#PWR074" H 2000 4550 50  0001 C CNN
+F 0 "#PWR71" H 2000 4550 50  0001 C CNN
 F 1 "+3V3" H 2000 4840 50  0000 C CNN
 F 2 "" H 2000 4700 50  0000 C CNN
 F 3 "" H 2000 4700 50  0000 C CNN
@@ -340,10 +340,10 @@ F 3 "" H 2000 4700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR075
+L GND #PWR73
 U 1 1 58D92B02
 P 2250 5050
-F 0 "#PWR075" H 2250 4800 50  0001 C CNN
+F 0 "#PWR73" H 2250 4800 50  0001 C CNN
 F 1 "GND" H 2250 4900 50  0000 C CNN
 F 2 "" H 2250 5050 50  0000 C CNN
 F 3 "" H 2250 5050 50  0000 C CNN
@@ -438,10 +438,10 @@ F 3 "" H 3300 1950 50  0000 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR076
+L +3V3 #PWR74
 U 1 1 58EE0104
 P 3300 1650
-F 0 "#PWR076" H 3300 1500 50  0001 C CNN
+F 0 "#PWR74" H 3300 1500 50  0001 C CNN
 F 1 "+3V3" H 3300 1790 50  0000 C CNN
 F 2 "" H 3300 1650 50  0000 C CNN
 F 3 "" H 3300 1650 50  0000 C CNN
@@ -458,10 +458,10 @@ Wire Wire Line
 	3050 1950 3150 1950
 Connection ~ 3300 1700
 $Comp
-L GND #PWR077
+L GND #PWR75
 U 1 1 58EE01EB
 P 3300 2150
-F 0 "#PWR077" H 3300 1900 50  0001 C CNN
+F 0 "#PWR75" H 3300 1900 50  0001 C CNN
 F 1 "GND" H 3300 2000 50  0000 C CNN
 F 2 "" H 3300 2150 50  0000 C CNN
 F 3 "" H 3300 2150 50  0000 C CNN

gpio.bak

@@ -53,10 +53,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR05
+L GND #PWR22
 U 1 1 56AC4825
 P 7800 3550
-F 0 "#PWR05" H 7800 3300 50  0001 C CNN
+F 0 "#PWR22" H 7800 3300 50  0001 C CNN
 F 1 "GND" H 7800 3400 50  0000 C CNN
 F 2 "" H 7800 3550 60  0000 C CNN
 F 3 "" H 7800 3550 60  0000 C CNN
@@ -64,10 +64,10 @@ F 3 "" H 7800 3550 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR06
+L GND #PWR23
 U 1 1 56AC482D
 P 9000 3550
-F 0 "#PWR06" H 9000 3300 50  0001 C CNN
+F 0 "#PWR23" H 9000 3300 50  0001 C CNN
 F 1 "GND" H 9000 3400 50  0000 C CNN
 F 2 "" H 9000 3550 60  0000 C CNN
 F 3 "" H 9000 3550 60  0000 C CNN
@@ -101,10 +101,10 @@ $EndComp
 Text Label 8700 5350 0    60   ~ 0
 OUT5V
 $Comp
-L +5V #PWR07
+L +5V #PWR17
 U 1 1 56AC484F
 P 7350 5350
-F 0 "#PWR07" H 7350 5200 50  0001 C CNN
+F 0 "#PWR17" H 7350 5200 50  0001 C CNN
 F 1 "+5V" H 7350 5490 50  0000 C CNN
 F 2 "" H 7350 5350 60  0000 C CNN
 F 3 "" H 7350 5350 60  0000 C CNN
@@ -112,10 +112,10 @@ F 3 "" H 7350 5350 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR08
+L +3V3 #PWR26
 U 1 1 58D5FBBC
 P 9150 3450
-F 0 "#PWR08" H 9150 3300 50  0001 C CNN
+F 0 "#PWR26" H 9150 3300 50  0001 C CNN
 F 1 "+3V3" H 9150 3590 50  0000 C CNN
 F 2 "" H 9150 3450 50  0000 C CNN
 F 3 "" H 9150 3450 50  0000 C CNN
@@ -123,10 +123,10 @@ F 3 "" H 9150 3450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR09
+L +3V3 #PWR19
 U 1 1 58D5FBF3
 P 7650 3450
-F 0 "#PWR09" H 7650 3300 50  0001 C CNN
+F 0 "#PWR19" H 7650 3300 50  0001 C CNN
 F 1 "+3V3" H 7650 3590 50  0000 C CNN
 F 2 "" H 7650 3450 50  0000 C CNN
 F 3 "" H 7650 3450 50  0000 C CNN
@@ -156,10 +156,10 @@ F 3 "" H 1850 3500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR010
+L GND #PWR20
 U 1 1 58E6D572
 P 7750 4450
-F 0 "#PWR010" H 7750 4200 50  0001 C CNN
+F 0 "#PWR20" H 7750 4200 50  0001 C CNN
 F 1 "GND" H 7750 4300 50  0000 C CNN
 F 2 "" H 7750 4450 60  0000 C CNN
 F 3 "" H 7750 4450 60  0000 C CNN
@@ -167,10 +167,10 @@ F 3 "" H 7750 4450 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR011
+L +3V3 #PWR18
 U 1 1 58E6D578
 P 7600 4350
-F 0 "#PWR011" H 7600 4200 50  0001 C CNN
+F 0 "#PWR18" H 7600 4200 50  0001 C CNN
 F 1 "+3V3" H 7600 4490 50  0000 C CNN
 F 2 "" H 7600 4350 50  0000 C CNN
 F 3 "" H 7600 4350 50  0000 C CNN
@@ -178,10 +178,10 @@ F 3 "" H 7600 4350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR012
+L GND #PWR24
 U 1 1 58E6D59D
 P 9050 4450
-F 0 "#PWR012" H 9050 4200 50  0001 C CNN
+F 0 "#PWR24" H 9050 4200 50  0001 C CNN
 F 1 "GND" H 9050 4300 50  0000 C CNN
 F 2 "" H 9050 4450 60  0000 C CNN
 F 3 "" H 9050 4450 60  0000 C CNN
@@ -189,10 +189,10 @@ F 3 "" H 9050 4450 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR013
+L +3V3 #PWR27
 U 1 1 58E6D5A3
 P 9200 4350
-F 0 "#PWR013" H 9200 4200 50  0001 C CNN
+F 0 "#PWR27" H 9200 4200 50  0001 C CNN
 F 1 "+3V3" H 9200 4490 50  0000 C CNN
 F 2 "" H 9200 4350 50  0000 C CNN
 F 3 "" H 9200 4350 50  0000 C CNN
@@ -200,10 +200,10 @@ F 3 "" H 9200 4350 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR014
+L GND #PWR21
 U 1 1 58E6E4EC
 P 7750 5250
-F 0 "#PWR014" H 7750 5000 50  0001 C CNN
+F 0 "#PWR21" H 7750 5000 50  0001 C CNN
 F 1 "GND" H 7750 5100 50  0000 C CNN
 F 2 "" H 7750 5250 60  0000 C CNN
 F 3 "" H 7750 5250 60  0000 C CNN
@@ -211,10 +211,10 @@ F 3 "" H 7750 5250 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR015
+L +3V3 #PWR7
 U 1 1 58E6E4F2
 P 1050 5400
-F 0 "#PWR015" H 1050 5250 50  0001 C CNN
+F 0 "#PWR7" H 1050 5250 50  0001 C CNN
 F 1 "+3V3" H 1050 5540 50  0000 C CNN
 F 2 "" H 1050 5400 50  0000 C CNN
 F 3 "" H 1050 5400 50  0000 C CNN
@@ -222,10 +222,10 @@ F 3 "" H 1050 5400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR016
+L GND #PWR25
 U 1 1 58E6E536
 P 9050 5250
-F 0 "#PWR016" H 9050 5000 50  0001 C CNN
+F 0 "#PWR25" H 9050 5000 50  0001 C CNN
 F 1 "GND" H 9050 5100 50  0000 C CNN
 F 2 "" H 9050 5250 60  0000 C CNN
 F 3 "" H 9050 5250 60  0000 C CNN
@@ -233,10 +233,10 @@ F 3 "" H 9050 5250 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR017
+L +3V3 #PWR14
 U 1 1 58E6E53C
 P 2600 5400
-F 0 "#PWR017" H 2600 5250 50  0001 C CNN
+F 0 "#PWR14" H 2600 5250 50  0001 C CNN
 F 1 "+3V3" H 2600 5540 50  0000 C CNN
 F 2 "" H 2600 5400 50  0000 C CNN
 F 3 "" H 2600 5400 50  0000 C CNN
@@ -272,10 +272,10 @@ Wire Wire Line
 Wire Wire Line
 	7750 5250 8150 5250
 $Comp
-L GND #PWR018
+L GND #PWR8
 U 1 1 58E710CC
 P 1200 3600
-F 0 "#PWR018" H 1200 3350 50  0001 C CNN
+F 0 "#PWR8" H 1200 3350 50  0001 C CNN
 F 1 "GND" H 1200 3450 50  0000 C CNN
 F 2 "" H 1200 3600 60  0000 C CNN
 F 3 "" H 1200 3600 60  0000 C CNN
@@ -283,10 +283,10 @@ F 3 "" H 1200 3600 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR019
+L +3V3 #PWR5
 U 1 1 58E710E0
 P 1050 3500
-F 0 "#PWR019" H 1050 3350 50  0001 C CNN
+F 0 "#PWR5" H 1050 3350 50  0001 C CNN
 F 1 "+3V3" H 1050 3640 50  0000 C CNN
 F 2 "" H 1050 3500 50  0000 C CNN
 F 3 "" H 1050 3500 50  0000 C CNN
@@ -294,10 +294,10 @@ F 3 "" H 1050 3500 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR020
+L GND #PWR9
 U 1 1 58E710E6
 P 1200 4500
-F 0 "#PWR020" H 1200 4250 50  0001 C CNN
+F 0 "#PWR9" H 1200 4250 50  0001 C CNN
 F 1 "GND" H 1200 4350 50  0000 C CNN
 F 2 "" H 1200 4500 60  0000 C CNN
 F 3 "" H 1200 4500 60  0000 C CNN
@@ -305,10 +305,10 @@ F 3 "" H 1200 4500 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR021
+L +3V3 #PWR6
 U 1 1 58E710EC
 P 1050 4400
-F 0 "#PWR021" H 1050 4250 50  0001 C CNN
+F 0 "#PWR6" H 1050 4250 50  0001 C CNN
 F 1 "+3V3" H 1050 4540 50  0000 C CNN
 F 2 "" H 1050 4400 50  0000 C CNN
 F 3 "" H 1050 4400 50  0000 C CNN
@@ -316,10 +316,10 @@ F 3 "" H 1050 4400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR10
 U 1 1 58E710F2
 P 1200 5300
-F 0 "#PWR022" H 1200 5050 50  0001 C CNN
+F 0 "#PWR10" H 1200 5050 50  0001 C CNN
 F 1 "GND" H 1200 5150 50  0000 C CNN
 F 2 "" H 1200 5300 60  0000 C CNN
 F 3 "" H 1200 5300 60  0000 C CNN
@@ -337,10 +337,10 @@ Wire Wire Line
 Wire Wire Line
 	1200 5300 1600 5300
 $Comp
-L GND #PWR023
+L GND #PWR13
 U 1 1 58E7117D
 P 2550 3600
-F 0 "#PWR023" H 2550 3350 50  0001 C CNN
+F 0 "#PWR13" H 2550 3350 50  0001 C CNN
 F 1 "GND" H 2550 3450 50  0000 C CNN
 F 2 "" H 2550 3600 60  0000 C CNN
 F 3 "" H 2550 3600 60  0000 C CNN
@@ -348,10 +348,10 @@ F 3 "" H 2550 3600 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR024
+L +3V3 #PWR16
 U 1 1 58E71191
 P 2700 3500
-F 0 "#PWR024" H 2700 3350 50  0001 C CNN
+F 0 "#PWR16" H 2700 3350 50  0001 C CNN
 F 1 "+3V3" H 2700 3640 50  0000 C CNN
 F 2 "" H 2700 3500 50  0000 C CNN
 F 3 "" H 2700 3500 50  0000 C CNN
@@ -359,10 +359,10 @@ F 3 "" H 2700 3500 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR11
 U 1 1 58E71197
 P 2500 4500
-F 0 "#PWR025" H 2500 4250 50  0001 C CNN
+F 0 "#PWR11" H 2500 4250 50  0001 C CNN
 F 1 "GND" H 2500 4350 50  0000 C CNN
 F 2 "" H 2500 4500 60  0000 C CNN
 F 3 "" H 2500 4500 60  0000 C CNN
@@ -370,10 +370,10 @@ F 3 "" H 2500 4500 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR026
+L +3V3 #PWR15
 U 1 1 58E7119D
 P 2650 4400
-F 0 "#PWR026" H 2650 4250 50  0001 C CNN
+F 0 "#PWR15" H 2650 4250 50  0001 C CNN
 F 1 "+3V3" H 2650 4540 50  0000 C CNN
 F 2 "" H 2650 4400 50  0000 C CNN
 F 3 "" H 2650 4400 50  0000 C CNN
@@ -381,10 +381,10 @@ F 3 "" H 2650 4400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR027
+L GND #PWR12
 U 1 1 58E711A3
 P 2500 5300
-F 0 "#PWR027" H 2500 5050 50  0001 C CNN
+F 0 "#PWR12" H 2500 5050 50  0001 C CNN
 F 1 "GND" H 2500 5150 50  0000 C CNN
 F 2 "" H 2500 5300 60  0000 C CNN
 F 3 "" H 2500 5300 60  0000 C CNN
@@ -402,10 +402,10 @@ Wire Wire Line
 Wire Wire Line
 	2100 5300 2500 5300
 $Comp
-L +5V #PWR028
+L +5V #PWR28
 U 1 1 58E75077
 P 9500 5350
-F 0 "#PWR028" H 9500 5200 50  0001 C CNN
+F 0 "#PWR28" H 9500 5200 50  0001 C CNN
 F 1 "+5V" H 9500 5490 50  0000 C CNN
 F 2 "" H 9500 5350 50  0000 C CNN
 F 3 "" H 9500 5350 50  0000 C CNN

power.bak

@@ -53,10 +53,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR029
+L GND #PWR29
 U 1 1 58D54769
 P 1100 2650
-F 0 "#PWR029" H 1100 2400 50  0001 C CNN
+F 0 "#PWR29" H 1100 2400 50  0001 C CNN
 F 1 "GND" H 1100 2500 50  0000 C CNN
 F 2 "" H 1100 2650 60  0000 C CNN
 F 3 "" H 1100 2650 60  0000 C CNN
@@ -75,10 +75,10 @@ F 3 "" H 8500 3350 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR030
+L GND #PWR50
 U 1 1 58D58A0B
 P 8500 3850
-F 0 "#PWR030" H 8500 3600 50  0001 C CNN
+F 0 "#PWR50" H 8500 3600 50  0001 C CNN
 F 1 "GND" H 8500 3700 50  0000 C CNN
 F 2 "" H 8500 3850 50  0000 C CNN
 F 3 "" H 8500 3850 50  0000 C CNN
@@ -86,10 +86,10 @@ F 3 "" H 8500 3850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR031
+L +5V #PWR44
 U 1 1 58D58F93
 P 7850 3200
-F 0 "#PWR031" H 7850 3050 50  0001 C CNN
+F 0 "#PWR44" H 7850 3050 50  0001 C CNN
 F 1 "+5V" H 7850 3340 50  0000 C CNN
 F 2 "" H 7850 3200 50  0000 C CNN
 F 3 "" H 7850 3200 50  0000 C CNN
@@ -97,10 +97,10 @@ F 3 "" H 7850 3200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR032
+L GND #PWR45
 U 1 1 58D5989A
 P 7850 3850
-F 0 "#PWR032" H 7850 3600 50  0001 C CNN
+F 0 "#PWR45" H 7850 3600 50  0001 C CNN
 F 1 "GND" H 7850 3700 50  0000 C CNN
 F 2 "" H 7850 3850 50  0000 C CNN
 F 3 "" H 7850 3850 50  0000 C CNN
@@ -163,10 +163,10 @@ F 3 "" H 10050 3450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR033
+L GND #PWR53
 U 1 1 58D5AE5E
 P 10250 3550
-F 0 "#PWR033" H 10250 3300 50  0001 C CNN
+F 0 "#PWR53" H 10250 3300 50  0001 C CNN
 F 1 "GND" H 10250 3400 50  0000 C CNN
 F 2 "" H 10250 3550 50  0000 C CNN
 F 3 "" H 10250 3550 50  0000 C CNN
@@ -196,10 +196,10 @@ F 3 "" H 10600 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR034
+L +3V3 #PWR41
 U 1 1 58D5CFDD
 P 4400 900
-F 0 "#PWR034" H 4400 750 50  0001 C CNN
+F 0 "#PWR41" H 4400 750 50  0001 C CNN
 F 1 "+3V3" H 4400 1040 50  0000 C CNN
 F 2 "" H 4400 900 50  0000 C CNN
 F 3 "" H 4400 900 50  0000 C CNN
@@ -218,10 +218,10 @@ F 3 "" H 8500 5750 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR035
+L GND #PWR52
 U 1 1 58D6294C
 P 8500 6250
-F 0 "#PWR035" H 8500 6000 50  0001 C CNN
+F 0 "#PWR52" H 8500 6000 50  0001 C CNN
 F 1 "GND" H 8500 6100 50  0000 C CNN
 F 2 "" H 8500 6250 50  0000 C CNN
 F 3 "" H 8500 6250 50  0000 C CNN
@@ -229,10 +229,10 @@ F 3 "" H 8500 6250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR036
+L +5V #PWR48
 U 1 1 58D62952
 P 7850 5600
-F 0 "#PWR036" H 7850 5450 50  0001 C CNN
+F 0 "#PWR48" H 7850 5450 50  0001 C CNN
 F 1 "+5V" H 7850 5740 50  0000 C CNN
 F 2 "" H 7850 5600 50  0000 C CNN
 F 3 "" H 7850 5600 50  0000 C CNN
@@ -240,10 +240,10 @@ F 3 "" H 7850 5600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR037
+L GND #PWR49
 U 1 1 58D62958
 P 7850 6250
-F 0 "#PWR037" H 7850 6000 50  0001 C CNN
+F 0 "#PWR49" H 7850 6000 50  0001 C CNN
 F 1 "GND" H 7850 6100 50  0000 C CNN
 F 2 "" H 7850 6250 50  0000 C CNN
 F 3 "" H 7850 6250 50  0000 C CNN
@@ -306,10 +306,10 @@ F 3 "" H 10050 5850 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR038
+L GND #PWR55
 U 1 1 58D62982
 P 10250 5950
-F 0 "#PWR038" H 10250 5700 50  0001 C CNN
+F 0 "#PWR55" H 10250 5700 50  0001 C CNN
 F 1 "GND" H 10250 5800 50  0000 C CNN
 F 2 "" H 10250 5950 50  0000 C CNN
 F 3 "" H 10250 5950 50  0000 C CNN
@@ -339,10 +339,10 @@ F 3 "" H 10600 5650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR039
+L +3V3 #PWR58
 U 1 1 58D62CE2
 P 10600 5400
-F 0 "#PWR039" H 10600 5250 50  0001 C CNN
+F 0 "#PWR58" H 10600 5250 50  0001 C CNN
 F 1 "+3V3" H 10600 5540 50  0000 C CNN
 F 2 "" H 10600 5400 50  0000 C CNN
 F 3 "" H 10600 5400 50  0000 C CNN
@@ -350,10 +350,10 @@ F 3 "" H 10600 5400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V2 #PWR040
+L +1V2 #PWR56
 U 1 1 58D63C77
 P 10600 3000
-F 0 "#PWR040" H 10600 2850 50  0001 C CNN
+F 0 "#PWR56" H 10600 2850 50  0001 C CNN
 F 1 "+1V2" H 10600 3140 50  0000 C CNN
 F 2 "" H 10600 3000 50  0000 C CNN
 F 3 "" H 10600 3000 50  0000 C CNN
@@ -361,10 +361,10 @@ F 3 "" H 10600 3000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V2 #PWR041
+L +1V2 #PWR32
 U 1 1 58D63D96
 P 1800 900
-F 0 "#PWR041" H 1800 750 50  0001 C CNN
+F 0 "#PWR32" H 1800 750 50  0001 C CNN
 F 1 "+1V2" H 1800 1040 50  0000 C CNN
 F 2 "" H 1800 900 50  0000 C CNN
 F 3 "" H 1800 900 50  0000 C CNN
@@ -385,10 +385,10 @@ F 3 "" H 8500 4550 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR042
+L GND #PWR51
 U 1 1 58D67BC0
 P 8500 5050
-F 0 "#PWR042" H 8500 4800 50  0001 C CNN
+F 0 "#PWR51" H 8500 4800 50  0001 C CNN
 F 1 "GND" H 8500 4900 50  0000 C CNN
 F 2 "" H 8500 5050 50  0000 C CNN
 F 3 "" H 8500 5050 50  0000 C CNN
@@ -396,10 +396,10 @@ F 3 "" H 8500 5050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR043
+L +5V #PWR46
 U 1 1 58D67BC6
 P 7850 4400
-F 0 "#PWR043" H 7850 4250 50  0001 C CNN
+F 0 "#PWR46" H 7850 4250 50  0001 C CNN
 F 1 "+5V" H 7850 4540 50  0000 C CNN
 F 2 "" H 7850 4400 50  0000 C CNN
 F 3 "" H 7850 4400 50  0000 C CNN
@@ -407,10 +407,10 @@ F 3 "" H 7850 4400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR044
+L GND #PWR47
 U 1 1 58D67BCC
 P 7850 5050
-F 0 "#PWR044" H 7850 4800 50  0001 C CNN
+F 0 "#PWR47" H 7850 4800 50  0001 C CNN
 F 1 "GND" H 7850 4900 50  0000 C CNN
 F 2 "" H 7850 5050 50  0000 C CNN
 F 3 "" H 7850 5050 50  0000 C CNN
@@ -473,10 +473,10 @@ F 3 "" H 10050 4650 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR045
+L GND #PWR54
 U 1 1 58D67BF0
 P 10250 4750
-F 0 "#PWR045" H 10250 4500 50  0001 C CNN
+F 0 "#PWR54" H 10250 4500 50  0001 C CNN
 F 1 "GND" H 10250 4600 50  0000 C CNN
 F 2 "" H 10250 4750 50  0000 C CNN
 F 3 "" H 10250 4750 50  0000 C CNN
@@ -517,10 +517,10 @@ F 3 "" H 4150 4600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +2V5 #PWR046
+L +2V5 #PWR57
 U 1 1 58D681D4
 P 10600 4200
-F 0 "#PWR046" H 10600 4050 50  0001 C CNN
+F 0 "#PWR57" H 10600 4050 50  0001 C CNN
 F 1 "+2V5" H 10600 4340 50  0000 C CNN
 F 2 "" H 10600 4200 50  0000 C CNN
 F 3 "" H 10600 4200 50  0000 C CNN
@@ -548,10 +548,10 @@ FB3
 Text Label 9250 4650 0    60   ~ 0
 FB2
 $Comp
-L +2V5 #PWR047
+L +2V5 #PWR37
 U 1 1 58D68750
 P 3900 900
-F 0 "#PWR047" H 3900 750 50  0001 C CNN
+F 0 "#PWR37" H 3900 750 50  0001 C CNN
 F 1 "+2V5" H 3900 1040 50  0000 C CNN
 F 2 "" H 3900 900 50  0000 C CNN
 F 3 "" H 3900 900 50  0000 C CNN
@@ -559,10 +559,10 @@ F 3 "" H 3900 900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR048
+L +3V3 #PWR43
 U 1 1 58D69259
 P 6650 900
-F 0 "#PWR048" H 6650 750 50  0001 C CNN
+F 0 "#PWR43" H 6650 750 50  0001 C CNN
 F 1 "+3V3" H 6650 1040 50  0000 C CNN
 F 2 "" H 6650 900 50  0000 C CNN
 F 3 "" H 6650 900 50  0000 C CNN
@@ -581,10 +581,10 @@ F 3 "" H 2100 3550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR049
+L GND #PWR34
 U 1 1 58D7085C
 P 2100 4050
-F 0 "#PWR049" H 2100 3800 50  0001 C CNN
+F 0 "#PWR34" H 2100 3800 50  0001 C CNN
 F 1 "GND" H 2100 3900 50  0000 C CNN
 F 2 "" H 2100 4050 50  0000 C CNN
 F 3 "" H 2100 4050 50  0000 C CNN
@@ -607,10 +607,10 @@ F 3 "" V 2800 4060 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR050
+L GND #PWR35
 U 1 1 58D72406
 P 2800 4150
-F 0 "#PWR050" H 2800 3900 50  0001 C CNN
+F 0 "#PWR35" H 2800 3900 50  0001 C CNN
 F 1 "GND" H 2800 4000 50  0000 C CNN
 F 2 "" H 2800 4150 50  0000 C CNN
 F 3 "" H 2800 4150 50  0000 C CNN
@@ -655,10 +655,10 @@ F 3 "" H 4150 5500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR051
+L GND #PWR40
 U 1 1 58D7C223
 P 4150 6100
-F 0 "#PWR051" H 4150 5850 50  0001 C CNN
+F 0 "#PWR40" H 4150 5850 50  0001 C CNN
 F 1 "GND" H 4150 5950 50  0000 C CNN
 F 2 "" H 4150 6100 50  0000 C CNN
 F 3 "" H 4150 6100 50  0000 C CNN
@@ -688,10 +688,10 @@ F 3 "" H 4700 4150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR052
+L +3V3 #PWR42
 U 1 1 58D7CCF7
 P 4700 3900
-F 0 "#PWR052" H 4700 3750 50  0001 C CNN
+F 0 "#PWR42" H 4700 3750 50  0001 C CNN
 F 1 "+3V3" H 4700 4040 50  0000 C CNN
 F 2 "" H 4700 3900 50  0000 C CNN
 F 3 "" H 4700 3900 50  0000 C CNN
@@ -844,10 +844,10 @@ F 3 "" H 3900 4150 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR053
+L GND #PWR38
 U 1 1 58DA2E46
 P 3900 4300
-F 0 "#PWR053" H 3900 4050 50  0001 C CNN
+F 0 "#PWR38" H 3900 4050 50  0001 C CNN
 F 1 "GND" H 3900 4150 50  0000 C CNN
 F 2 "" H 3900 4300 50  0000 C CNN
 F 3 "" H 3900 4300 50  0000 C CNN
@@ -855,10 +855,10 @@ F 3 "" H 3900 4300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR054
+L +5V #PWR39
 U 1 1 58D67C25
 P 4150 3300
-F 0 "#PWR054" H 4150 3150 50  0001 C CNN
+F 0 "#PWR39" H 4150 3150 50  0001 C CNN
 F 1 "+5V" H 4150 3440 50  0000 C CNN
 F 2 "" H 4150 3300 50  0000 C CNN
 F 3 "" H 4150 3300 50  0000 C CNN
@@ -879,10 +879,10 @@ F 3 "" H 3250 5300 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR055
+L +3V3 #PWR36
 U 1 1 58DA569C
 P 3250 5150
-F 0 "#PWR055" H 3250 5000 50  0001 C CNN
+F 0 "#PWR36" H 3250 5000 50  0001 C CNN
 F 1 "+3V3" H 3250 5290 50  0000 C CNN
 F 2 "" H 3250 5150 50  0000 C CNN
 F 3 "" H 3250 5150 50  0000 C CNN
@@ -918,10 +918,10 @@ $EndComp
 Text Label 750  6850 0    60   ~ 0
 WAKEUPn
 $Comp
-L +5V #PWR056
+L +5V #PWR30
 U 1 1 58E82A7E
 P 1500 6500
-F 0 "#PWR056" H 1500 6350 50  0001 C CNN
+F 0 "#PWR30" H 1500 6350 50  0001 C CNN
 F 1 "+5V" H 1500 6640 50  0000 C CNN
 F 2 "" H 1500 6500 50  0000 C CNN
 F 3 "" H 1500 6500 50  0000 C CNN
@@ -953,10 +953,10 @@ F 3 "" H 1500 5950 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR057
+L GND #PWR31
 U 1 1 58E840F5
 P 1500 7400
-F 0 "#PWR057" H 1500 7150 50  0001 C CNN
+F 0 "#PWR31" H 1500 7150 50  0001 C CNN
 F 1 "GND" H 1500 7250 50  0000 C CNN
 F 2 "" H 1500 7400 50  0000 C CNN
 F 3 "" H 1500 7400 50  0000 C CNN
@@ -966,201 +966,7 @@ $EndComp
 Wire Wire Line
 	900  2450 900  2550
 Wire Wire Line
-	900  2550 1000 2550
-Wire Wire Line
-	1000 2550 1100 2550
-Wire Wire Line
-	1100 2550 1200 2550
-Wire Wire Line
-	1200 2550 1300 2550
-Wire Wire Line
-	1300 2550 1400 2550
-Wire Wire Line
-	1400 2550 1500 2550
-Wire Wire Line
-	1500 2550 1600 2550
-Wire Wire Line
-	1600 2550 1700 2550
-Wire Wire Line
-	1700 2550 1800 2550
-Wire Wire Line
-	1800 2550 2050 2550
-Wire Wire Line
-	2050 2550 2150 2550
-Wire Wire Line
-	2150 2550 2250 2550
-Wire Wire Line
-	2250 2550 2350 2550
-Wire Wire Line
-	2350 2550 2450 2550
-Wire Wire Line
-	2450 2550 2550 2550
-Wire Wire Line
-	2550 2550 2650 2550
-Wire Wire Line
-	2650 2550 2750 2550
-Wire Wire Line
-	2750 2550 2850 2550
-Wire Wire Line
-	2850 2550 2950 2550
-Wire Wire Line
-	2950 2550 3050 2550
-Wire Wire Line
-	3050 2550 3150 2550
-Wire Wire Line
-	3150 2550 3250 2550
-Wire Wire Line
-	3250 2550 3350 2550
-Wire Wire Line
-	3350 2550 3450 2550
-Wire Wire Line
-	3450 2550 3550 2550
-Wire Wire Line
-	3550 2550 3650 2550
-Wire Wire Line
-	3650 2550 3750 2550
-Wire Wire Line
-	3750 2550 3850 2550
-Wire Wire Line
-	3850 2550 3950 2550
-Wire Wire Line
-	3950 2550 4050 2550
-Wire Wire Line
-	4050 2550 4150 2550
-Wire Wire Line
-	4150 2550 4250 2550
-Wire Wire Line
-	4250 2550 4350 2550
-Wire Wire Line
-	4350 2550 4450 2550
-Wire Wire Line
-	4450 2550 4550 2550
-Wire Wire Line
-	4550 2550 4650 2550
-Wire Wire Line
-	4650 2550 4750 2550
-Wire Wire Line
-	4750 2550 4850 2550
-Wire Wire Line
-	4850 2550 4950 2550
-Wire Wire Line
-	4950 2550 5050 2550
-Wire Wire Line
-	5050 2550 5150 2550
-Wire Wire Line
-	5150 2550 5250 2550
-Wire Wire Line
-	5250 2550 5350 2550
-Wire Wire Line
-	5350 2550 5450 2550
-Wire Wire Line
-	5450 2550 5550 2550
-Wire Wire Line
-	5550 2550 5650 2550
-Wire Wire Line
-	5650 2550 5750 2550
-Wire Wire Line
-	5750 2550 5850 2550
-Wire Wire Line
-	5850 2550 5950 2550
-Wire Wire Line
-	5950 2550 6050 2550
-Wire Wire Line
-	6050 2550 6150 2550
-Wire Wire Line
-	6150 2550 6250 2550
-Wire Wire Line
-	6250 2550 6350 2550
-Wire Wire Line
-	6350 2550 6450 2550
-Wire Wire Line
-	6450 2550 6550 2550
-Wire Wire Line
-	6550 2550 6650 2550
-Wire Wire Line
-	6650 2550 6750 2550
-Wire Wire Line
-	6750 2550 6850 2550
-Wire Wire Line
-	6850 2550 6950 2550
-Wire Wire Line
-	6950 2550 7050 2550
-Wire Wire Line
-	7050 2550 7150 2550
-Wire Wire Line
-	7150 2550 7250 2550
-Wire Wire Line
-	7250 2550 7350 2550
-Wire Wire Line
-	7350 2550 7450 2550
-Wire Wire Line
-	7450 2550 7550 2550
-Wire Wire Line
-	7550 2550 7650 2550
-Wire Wire Line
-	7650 2550 7750 2550
-Wire Wire Line
-	7750 2550 7850 2550
-Wire Wire Line
-	7850 2550 7950 2550
-Wire Wire Line
-	7950 2550 8050 2550
-Wire Wire Line
-	8050 2550 8150 2550
-Wire Wire Line
-	8150 2550 8250 2550
-Wire Wire Line
-	8250 2550 8350 2550
-Wire Wire Line
-	8350 2550 8450 2550
-Wire Wire Line
-	8450 2550 8550 2550
-Wire Wire Line
-	8550 2550 8650 2550
-Wire Wire Line
-	8650 2550 8750 2550
-Wire Wire Line
-	8750 2550 8850 2550
-Wire Wire Line
-	8850 2550 8950 2550
-Wire Wire Line
-	8950 2550 9050 2550
-Wire Wire Line
-	9050 2550 9150 2550
-Wire Wire Line
-	9150 2550 9250 2550
-Wire Wire Line
-	9250 2550 9350 2550
-Wire Wire Line
-	9350 2550 9450 2550
-Wire Wire Line
-	9450 2550 9550 2550
-Wire Wire Line
-	9550 2550 9650 2550
-Wire Wire Line
-	9650 2550 9750 2550
-Wire Wire Line
-	9750 2550 9850 2550
-Wire Wire Line
-	9850 2550 9950 2550
-Wire Wire Line
-	9950 2550 10050 2550
-Wire Wire Line
-	10050 2550 10150 2550
-Wire Wire Line
-	10150 2550 10250 2550
-Wire Wire Line
-	10250 2550 10350 2550
-Wire Wire Line
-	10350 2550 10450 2550
-Wire Wire Line
-	10450 2550 10550 2550
-Wire Wire Line
-	10550 2550 10650 2550
-Wire Wire Line
-	10650 2550 10750 2550
-Wire Wire Line
-	10750 2550 10850 2550
+	900  2550 10850 2550
 Wire Wire Line
 	1400 2550 1400 2450
 Wire Wire Line
@@ -1170,9 +976,7 @@ Wire Wire Line
 	1200 2450 1200 2550
 Connection ~ 1200 2550
 Wire Wire Line
-	1100 2450 1100 2550
-Wire Wire Line
-	1100 2550 1100 2650
+	1100 2450 1100 2650
 Connection ~ 1100 2550
 Wire Wire Line
 	1000 2450 1000 2550
@@ -1182,9 +986,7 @@ Wire Wire Line
 Wire Wire Line
 	2200 1000 2200 1100
 Wire Wire Line
-	1800 900  1800 1000
-Wire Wire Line
-	1800 1000 1800 1100
+	1800 900  1800 1100
 Connection ~ 1800 1000
 Wire Wire Line
 	1900 1000 1900 1100
@@ -1487,9 +1289,7 @@ Wire Wire Line
 	6750 1000 6750 1100
 Connection ~ 6750 1000
 Wire Wire Line
-	6650 900  6650 1000
-Wire Wire Line
-	6650 1000 6650 1100
+	6650 900  6650 1100
 Connection ~ 6650 1000
 Wire Wire Line
 	6550 1000 6550 1100
@@ -1517,9 +1317,7 @@ Wire Wire Line
 	4600 1000 4600 1100
 Connection ~ 4600 1000
 Wire Wire Line
-	4400 900  4400 1000
-Wire Wire Line
-	4400 1000 4400 1100
+	4400 900  4400 1100
 Connection ~ 4400 1000
 Wire Wire Line
 	4100 1000 4100 1100
@@ -1527,9 +1325,7 @@ Wire Wire Line
 	4000 1000 4000 1100
 Connection ~ 4000 1000
 Wire Wire Line
-	3900 900  3900 1000
-Wire Wire Line
-	3900 1000 3900 1100
+	3900 900  3900 1100
 Connection ~ 3900 1000
 Wire Wire Line
 	3800 1100 3800 1000
@@ -1577,9 +1373,7 @@ Connection ~ 2300 1000
 Wire Wire Line
 	8500 3750 8500 3850
 Wire Wire Line
-	7850 3200 7850 3250
-Wire Wire Line
-	7850 3250 7850 3500
+	7850 3200 7850 3500
 Wire Wire Line
 	7850 3800 7850 3850
 Wire Wire Line
@@ -1587,13 +1381,7 @@ Wire Wire Line
 Wire Wire Line
 	9150 3050 9150 3250
 Wire Wire Line
-	9500 3050 9550 3050
-Wire Wire Line
-	9550 3050 9850 3050
-Wire Wire Line
-	9850 3050 10250 3050
-Wire Wire Line
-	10250 3050 10600 3050
+	9500 3050 10600 3050
 Wire Wire Line
 	9850 3050 9850 3100
 Wire Wire Line
@@ -1603,28 +1391,18 @@ Wire Wire Line
 Wire Wire Line
 	9850 3450 9850 3400
 Wire Wire Line
-	9100 3450 9550 3450
-Wire Wire Line
-	9550 3450 9850 3450
-Wire Wire Line
-	9850 3450 9900 3450
+	9100 3450 9900 3450
 Wire Wire Line
-	10250 3400 10250 3450
-Wire Wire Line
-	10250 3450 10250 3550
+	10250 3400 10250 3550
 Wire Wire Line
 	10600 3450 10600 3400
 Wire Wire Line
-	10200 3450 10250 3450
-Wire Wire Line
-	10250 3450 10600 3450
+	10200 3450 10600 3450
 Connection ~ 10250 3450
 Wire Wire Line
 	10250 3050 10250 3100
 Wire Wire Line
-	10600 3000 10600 3050
-Wire Wire Line
-	10600 3050 10600 3100
+	10600 3000 10600 3100
 Connection ~ 9850 3450
 Connection ~ 9550 3450
 Connection ~ 9550 3050
@@ -1632,43 +1410,7 @@ Wire Wire Line
 	9150 3050 9200 3050
 Connection ~ 10600 3050
 Wire Wire Line
-	1700 1000 1800 1000
-Wire Wire Line
-	1800 1000 1900 1000
-Wire Wire Line
-	1900 1000 2000 1000
-Wire Wire Line
-	2000 1000 2100 1000
-Wire Wire Line
-	2100 1000 2200 1000
-Wire Wire Line
-	2200 1000 2300 1000
-Wire Wire Line
-	2300 1000 2400 1000
-Wire Wire Line
-	2400 1000 2500 1000
-Wire Wire Line
-	2500 1000 2600 1000
-Wire Wire Line
-	2600 1000 2700 1000
-Wire Wire Line
-	2700 1000 2800 1000
-Wire Wire Line
-	2800 1000 2900 1000
-Wire Wire Line
-	2900 1000 3000 1000
-Wire Wire Line
-	3000 1000 3100 1000
-Wire Wire Line
-	3100 1000 3200 1000
-Wire Wire Line
-	3200 1000 3300 1000
-Wire Wire Line
-	3300 1000 3400 1000
-Wire Wire Line
-	3400 1000 3500 1000
-Wire Wire Line
-	3500 1000 3600 1000
+	1700 1000 3600 1000
 Connection ~ 7850 3250
 Wire Wire Line
 	7850 3250 7900 3250
@@ -1677,9 +1419,7 @@ Wire Wire Line
 Wire Wire Line
 	8500 6150 8500 6250
 Wire Wire Line
-	7850 5600 7850 5650
-Wire Wire Line
-	7850 5650 7850 5900
+	7850 5600 7850 5900
 Wire Wire Line
 	7850 6200 7850 6250
 Wire Wire Line
@@ -1687,13 +1427,7 @@ Wire Wire Line
 Wire Wire Line
 	9150 5450 9150 5650
 Wire Wire Line
-	9500 5450 9550 5450
-Wire Wire Line
-	9550 5450 9850 5450
-Wire Wire Line
-	9850 5450 10250 5450
-Wire Wire Line
-	10250 5450 10600 5450
+	9500 5450 10600 5450
 Wire Wire Line
 	9850 5450 9850 5500
 Wire Wire Line
@@ -1703,28 +1437,18 @@ Wire Wire Line
 Wire Wire Line
 	9850 5850 9850 5800
 Wire Wire Line
-	9100 5850 9550 5850
-Wire Wire Line
-	9550 5850 9850 5850
-Wire Wire Line
-	9850 5850 9900 5850
+	9100 5850 9900 5850
 Wire Wire Line
-	10250 5800 10250 5850
-Wire Wire Line
-	10250 5850 10250 5950
+	10250 5800 10250 5950
 Wire Wire Line
 	10600 5850 10600 5800
 Wire Wire Line
-	10200 5850 10250 5850
-Wire Wire Line
-	10250 5850 10600 5850
+	10200 5850 10600 5850
 Connection ~ 10250 5850
 Wire Wire Line
 	10250 5450 10250 5500
 Wire Wire Line
-	10600 5400 10600 5450
-Wire Wire Line
-	10600 5450 10600 5500
+	10600 5400 10600 5500
 Connection ~ 10250 5450
 Connection ~ 9850 5850
 Connection ~ 9550 5850
@@ -1743,9 +1467,7 @@ Connection ~ 9850 3050
 Wire Wire Line
 	8500 4950 8500 5050
 Wire Wire Line
-	7850 4400 7850 4450
-Wire Wire Line
-	7850 4450 7850 4700
+	7850 4400 7850 4700
 Wire Wire Line
 	7850 5000 7850 5050
 Wire Wire Line
@@ -1753,13 +1475,7 @@ Wire Wire Line
 Wire Wire Line
 	9150 4250 9150 4450
 Wire Wire Line
-	9500 4250 9550 4250
-Wire Wire Line
-	9550 4250 9850 4250
-Wire Wire Line
-	9850 4250 10250 4250
-Wire Wire Line
-	10250 4250 10600 4250
+	9500 4250 10600 4250
 Wire Wire Line
 	9850 4250 9850 4300
 Wire Wire Line
@@ -1769,28 +1485,18 @@ Wire Wire Line
 Wire Wire Line
 	9850 4650 9850 4600
 Wire Wire Line
-	9100 4650 9550 4650
-Wire Wire Line
-	9550 4650 9850 4650
-Wire Wire Line
-	9850 4650 9900 4650
+	9100 4650 9900 4650
 Wire Wire Line
-	10250 4600 10250 4650
-Wire Wire Line
-	10250 4650 10250 4750
+	10250 4600 10250 4750
 Wire Wire Line
 	10600 4650 10600 4600
 Wire Wire Line
-	10200 4650 10250 4650
-Wire Wire Line
-	10250 4650 10600 4650
+	10200 4650 10600 4650
 Connection ~ 10250 4650
 Wire Wire Line
 	10250 4250 10250 4300
 Wire Wire Line
-	10600 4200 10600 4250
-Wire Wire Line
-	10600 4250 10600 4300
+	10600 4200 10600 4300
 Connection ~ 10250 4250
 Connection ~ 9850 4650
 Connection ~ 9550 4650
@@ -1807,39 +1513,13 @@ Wire Wire Line
 Wire Wire Line
 	4150 4450 4150 4300
 Wire Wire Line
-	4150 4750 4150 4850
-Wire Wire Line
-	4150 4850 4150 5350
-Wire Wire Line
-	3800 4850 3950 4850
-Wire Wire Line
-	3950 4850 4150 4850
-Wire Wire Line
-	4150 4850 4700 4850
-Wire Wire Line
-	3800 1000 3900 1000
-Wire Wire Line
-	3900 1000 4000 1000
-Wire Wire Line
-	4000 1000 4100 1000
-Wire Wire Line
-	4300 1000 4400 1000
-Wire Wire Line
-	4400 1000 4600 1000
-Wire Wire Line
-	4600 1000 4700 1000
+	4150 4750 4150 5350
 Wire Wire Line
-	4700 1000 4900 1000
+	3800 4850 4700 4850
 Wire Wire Line
-	4900 1000 5000 1000
+	3800 1000 4100 1000
 Wire Wire Line
-	5000 1000 5100 1000
-Wire Wire Line
-	5100 1000 5300 1000
-Wire Wire Line
-	5300 1000 5400 1000
-Wire Wire Line
-	5400 1000 5500 1000
+	4300 1000 5500 1000
 Wire Wire Line
 	4300 1000 4300 1100
 Wire Wire Line
@@ -1865,20 +1545,14 @@ Wire Wire Line
 Wire Wire Line
 	2100 3150 2100 3050
 Wire Wire Line
-	4150 3800 4150 3900
+	4150 3800 4150 4000
 Wire Wire Line
-	4150 3900 4150 4000
-Wire Wire Line
-	4150 3300 4150 3400
-Wire Wire Line
-	4150 3400 4150 3500
+	4150 3300 4150 3500
 Connection ~ 4150 3900
 Connection ~ 4150 3400
 Connection ~ 4150 4850
 Wire Wire Line
-	4150 5650 4150 6000
-Wire Wire Line
-	4150 6000 4150 6100
+	4150 5650 4150 6100
 Wire Wire Line
 	4700 4450 4700 4300
 Wire Wire Line
@@ -1894,27 +1568,15 @@ Wire Wire Line
 Wire Wire Line
 	3950 6000 3950 5700
 Wire Wire Line
-	3100 5500 3250 5500
+	3100 5500 3650 5500
 Wire Wire Line
-	3250 5500 3550 5500
-Wire Wire Line
-	3550 5500 3650 5500
-Wire Wire Line
-	2550 5500 2700 5500
-Wire Wire Line
-	2700 5500 2800 5500
+	2550 5500 2800 5500
 Connection ~ 3550 5500
 Connection ~ 3250 5500
 Wire Wire Line
 	3250 5900 3250 6000
 Wire Wire Line
-	2700 6000 3250 6000
-Wire Wire Line
-	3250 6000 3550 6000
-Wire Wire Line
-	3550 6000 3950 6000
-Wire Wire Line
-	3950 6000 4150 6000
+	2700 6000 4150 6000
 Connection ~ 3550 6000
 Connection ~ 4150 6000
 Connection ~ 3950 6000
@@ -1934,45 +1596,25 @@ Wire Wire Line
 Wire Wire Line
 	3900 3400 4150 3400
 Wire Wire Line
-	3900 3850 3900 3900
-Wire Wire Line
-	3900 3900 3900 4000
+	3900 3850 3900 4000
 Wire Wire Line
 	4150 3900 3900 3900
 Connection ~ 3900 3900
 Wire Wire Line
 	2700 5500 2700 5600
 Wire Wire Line
-	3250 5450 3250 5500
-Wire Wire Line
-	3250 5500 3250 5600
+	3250 5450 3250 5600
 Wire Wire Line
 	3550 5500 3550 5600
 Wire Wire Line
 	1150 6850 700  6850
 Wire Wire Line
-	1500 6800 1500 6850
+	1500 6800 1500 6900
 Wire Wire Line
-	1500 6850 1500 6900
-Wire Wire Line
-	1450 6850 1500 6850
-Wire Wire Line
-	1500 6850 1550 6850
+	1450 6850 1550 6850
 Connection ~ 1500 6850
 Wire Wire Line
-	6550 1000 6650 1000
-Wire Wire Line
-	6650 1000 6750 1000
-Wire Wire Line
-	6750 1000 6950 1000
-Wire Wire Line
-	6950 1000 7050 1000
-Wire Wire Line
-	7050 1000 7150 1000
-Wire Wire Line
-	7150 1000 7350 1000
-Wire Wire Line
-	7350 1000 7450 1000
+	6550 1000 7450 1000
 Wire Wire Line
 	7450 1000 7450 1100
 Connection ~ 7150 1000
@@ -1991,10 +1633,10 @@ F 3 "" H 4850 2700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR058
+L +3V3 #PWR33
 U 1 1 591C4E6A
 P 2100 3050
-F 0 "#PWR058" H 2100 2900 50  0001 C CNN
+F 0 "#PWR33" H 2100 2900 50  0001 C CNN
 F 1 "+3V3" H 2100 3190 50  0000 C CNN
 F 2 "" H 2100 3050 50  0000 C CNN
 F 3 "" H 2100 3050 50  0000 C CNN

ram.bak

@@ -85,10 +85,10 @@ Wire Wire Line
 	5250 2000 5250 2200
 Connection ~ 5250 2100
 $Comp
-L +3V3 #PWR091
+L +3V3 #PWR93
 U 1 1 58D928FF
 P 5250 2000
-F 0 "#PWR091" H 5250 1850 50  0001 C CNN
+F 0 "#PWR93" H 5250 1850 50  0001 C CNN
 F 1 "+3V3" H 5250 2140 50  0000 C CNN
 F 2 "" H 5250 2000 50  0000 C CNN
 F 3 "" H 5250 2000 50  0000 C CNN
@@ -96,10 +96,10 @@ F 3 "" H 5250 2000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR092
+L +3V3 #PWR97
 U 1 1 58D92915
 P 5550 2000
-F 0 "#PWR092" H 5550 1850 50  0001 C CNN
+F 0 "#PWR97" H 5550 1850 50  0001 C CNN
 F 1 "+3V3" H 5550 2140 50  0000 C CNN
 F 2 "" H 5550 2000 50  0000 C CNN
 F 3 "" H 5550 2000 50  0000 C CNN
@@ -128,10 +128,10 @@ Wire Wire Line
 	5650 4800 5650 4900
 Connection ~ 5650 4900
 $Comp
-L GND #PWR093
+L GND #PWR94
 U 1 1 58D929C8
 P 5250 5000
-F 0 "#PWR093" H 5250 4750 50  0001 C CNN
+F 0 "#PWR94" H 5250 4750 50  0001 C CNN
 F 1 "GND" H 5250 4850 50  0000 C CNN
 F 2 "" H 5250 5000 50  0000 C CNN
 F 3 "" H 5250 5000 50  0000 C CNN
@@ -139,10 +139,10 @@ F 3 "" H 5250 5000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR094
+L GND #PWR98
 U 1 1 58D929DE
 P 5550 5000
-F 0 "#PWR094" H 5550 4750 50  0001 C CNN
+F 0 "#PWR98" H 5550 4750 50  0001 C CNN
 F 1 "GND" H 5550 4850 50  0000 C CNN
 F 2 "" H 5550 5000 50  0000 C CNN
 F 3 "" H 5550 5000 50  0000 C CNN
@@ -367,10 +367,10 @@ F 3 "" H 5350 5900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR095
+L GND #PWR96
 U 1 1 59131FCA
 P 5350 6050
-F 0 "#PWR095" H 5350 5800 50  0001 C CNN
+F 0 "#PWR96" H 5350 5800 50  0001 C CNN
 F 1 "GND" H 5350 5900 50  0000 C CNN
 F 2 "" H 5350 6050 50  0000 C CNN
 F 3 "" H 5350 6050 50  0000 C CNN
@@ -378,10 +378,10 @@ F 3 "" H 5350 6050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR096
+L +3V3 #PWR95
 U 1 1 59132092
 P 5350 5750
-F 0 "#PWR096" H 5350 5600 50  0001 C CNN
+F 0 "#PWR95" H 5350 5600 50  0001 C CNN
 F 1 "+3V3" H 5350 5890 50  0000 C CNN
 F 2 "" H 5350 5750 50  0000 C CNN
 F 3 "" H 5350 5750 50  0000 C CNN

ram.sch

@@ -85,10 +85,10 @@ Wire Wire Line
 	5250 2000 5250 2200
 Connection ~ 5250 2100
 $Comp
-L +3V3 #PWR091
+L +3V3 #PWR093
 U 1 1 58D928FF
 P 5250 2000
-F 0 "#PWR091" H 5250 1850 50  0001 C CNN
+F 0 "#PWR093" H 5250 1850 50  0001 C CNN
 F 1 "+3V3" H 5250 2140 50  0000 C CNN
 F 2 "" H 5250 2000 50  0000 C CNN
 F 3 "" H 5250 2000 50  0000 C CNN
@@ -96,10 +96,10 @@ F 3 "" H 5250 2000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR092
+L +3V3 #PWR094
 U 1 1 58D92915
 P 5550 2000
-F 0 "#PWR092" H 5550 1850 50  0001 C CNN
+F 0 "#PWR094" H 5550 1850 50  0001 C CNN
 F 1 "+3V3" H 5550 2140 50  0000 C CNN
 F 2 "" H 5550 2000 50  0000 C CNN
 F 3 "" H 5550 2000 50  0000 C CNN
@@ -128,10 +128,10 @@ Wire Wire Line
 	5650 4800 5650 4900
 Connection ~ 5650 4900
 $Comp
-L GND #PWR093
+L GND #PWR095
 U 1 1 58D929C8
 P 5250 5000
-F 0 "#PWR093" H 5250 4750 50  0001 C CNN
+F 0 "#PWR095" H 5250 4750 50  0001 C CNN
 F 1 "GND" H 5250 4850 50  0000 C CNN
 F 2 "" H 5250 5000 50  0000 C CNN
 F 3 "" H 5250 5000 50  0000 C CNN
@@ -139,10 +139,10 @@ F 3 "" H 5250 5000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR094
+L GND #PWR096
 U 1 1 58D929DE
 P 5550 5000
-F 0 "#PWR094" H 5550 4750 50  0001 C CNN
+F 0 "#PWR096" H 5550 4750 50  0001 C CNN
 F 1 "GND" H 5550 4850 50  0000 C CNN
 F 2 "" H 5550 5000 50  0000 C CNN
 F 3 "" H 5550 5000 50  0000 C CNN
@@ -367,10 +367,10 @@ F 3 "" H 5350 5900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR095
+L GND #PWR097
 U 1 1 59131FCA
 P 5350 6050
-F 0 "#PWR095" H 5350 5800 50  0001 C CNN
+F 0 "#PWR097" H 5350 5800 50  0001 C CNN
 F 1 "GND" H 5350 5900 50  0000 C CNN
 F 2 "" H 5350 6050 50  0000 C CNN
 F 3 "" H 5350 6050 50  0000 C CNN
@@ -378,10 +378,10 @@ F 3 "" H 5350 6050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR096
+L +3V3 #PWR098
 U 1 1 59132092
 P 5350 5750
-F 0 "#PWR096" H 5350 5600 50  0001 C CNN
+F 0 "#PWR098" H 5350 5600 50  0001 C CNN
 F 1 "+3V3" H 5350 5890 50  0000 C CNN
 F 2 "" H 5350 5750 50  0000 C CNN
 F 3 "" H 5350 5750 50  0000 C CNN

sdcard.bak

@@ -53,10 +53,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR098
+L GND #PWR102
 U 1 1 58DA7C6F
 P 3550 3650
-F 0 "#PWR098" H 3550 3400 50  0001 C CNN
+F 0 "#PWR102" H 3550 3400 50  0001 C CNN
 F 1 "GND" H 3550 3500 50  0000 C CNN
 F 2 "" H 3550 3650 50  0000 C CNN
 F 3 "" H 3550 3650 50  0000 C CNN
@@ -64,10 +64,10 @@ F 3 "" H 3550 3650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR099
+L GND #PWR103
 U 1 1 58DA7C71
 P 5800 3950
-F 0 "#PWR099" H 5800 3700 50  0001 C CNN
+F 0 "#PWR103" H 5800 3700 50  0001 C CNN
 F 1 "GND" H 5800 3800 50  0000 C CNN
 F 2 "" H 5800 3950 50  0000 C CNN
 F 3 "" H 5800 3950 50  0000 C CNN
@@ -75,10 +75,10 @@ F 3 "" H 5800 3950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0100
+L +3V3 #PWR100
 U 1 1 58DA7C72
 P 3150 2950
-F 0 "#PWR0100" H 3150 2800 50  0001 C CNN
+F 0 "#PWR100" H 3150 2800 50  0001 C CNN
 F 1 "+3V3" H 3150 3090 50  0000 C CNN
 F 2 "" H 3150 2950 50  0000 C CNN
 F 3 "" H 3150 2950 50  0000 C CNN
@@ -111,10 +111,10 @@ F 3 "" H 3150 3100 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR0101
+L GND #PWR101
 U 1 1 590C5E90
 P 3150 3650
-F 0 "#PWR0101" H 3150 3400 50  0001 C CNN
+F 0 "#PWR101" H 3150 3400 50  0001 C CNN
 F 1 "GND" H 3150 3500 50  0000 C CNN
 F 2 "" H 3150 3650 50  0000 C CNN
 F 3 "" H 3150 3650 50  0000 C CNN

sdcard.sch

@@ -53,10 +53,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR098
+L GND #PWR0100
 U 1 1 58DA7C6F
 P 3550 3650
-F 0 "#PWR098" H 3550 3400 50  0001 C CNN
+F 0 "#PWR0100" H 3550 3400 50  0001 C CNN
 F 1 "GND" H 3550 3500 50  0000 C CNN
 F 2 "" H 3550 3650 50  0000 C CNN
 F 3 "" H 3550 3650 50  0000 C CNN
@@ -64,10 +64,10 @@ F 3 "" H 3550 3650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR099
+L GND #PWR0101
 U 1 1 58DA7C71
 P 5800 3950
-F 0 "#PWR099" H 5800 3700 50  0001 C CNN
+F 0 "#PWR0101" H 5800 3700 50  0001 C CNN
 F 1 "GND" H 5800 3800 50  0000 C CNN
 F 2 "" H 5800 3950 50  0000 C CNN
 F 3 "" H 5800 3950 50  0000 C CNN
@@ -75,10 +75,10 @@ F 3 "" H 5800 3950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0100
+L +3V3 #PWR0102
 U 1 1 58DA7C72
 P 3150 2950
-F 0 "#PWR0100" H 3150 2800 50  0001 C CNN
+F 0 "#PWR0102" H 3150 2800 50  0001 C CNN
 F 1 "+3V3" H 3150 3090 50  0000 C CNN
 F 2 "" H 3150 2950 50  0000 C CNN
 F 3 "" H 3150 2950 50  0000 C CNN
@@ -111,10 +111,10 @@ F 3 "" H 3150 3100 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR0101
+L GND #PWR0103
 U 1 1 590C5E90
 P 3150 3650
-F 0 "#PWR0101" H 3150 3400 50  0001 C CNN
+F 0 "#PWR0103" H 3150 3400 50  0001 C CNN
 F 1 "GND" H 3150 3500 50  0000 C CNN
 F 2 "" H 3150 3650 50  0000 C CNN
 F 3 "" H 3150 3650 50  0000 C CNN

ulx3s-cache.lib

@@ -165,6 +165,36 @@ X P2 2 250 0 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# CONN_02X03
+#
+DEF CONN_02X03 P 0 1 Y N 1 F N
+F0 "P" 0 200 50 H V C CNN
+F1 "CONN_02X03" 0 -200 50 H V C CNN
+F2 "" 0 -1200 50 H V C CNN
+F3 "" 0 -1200 50 H V C CNN
+$FPLIST
+ Pin_Header_Straight_2X03
+ Pin_Header_Angled_2X03
+ Socket_Strip_Straight_2X03
+ Socket_Strip_Angled_2X03
+$ENDFPLIST
+DRAW
+S -100 -95 -50 -105 0 1 0 N
+S -100 5 -50 -5 0 1 0 N
+S -100 105 -50 95 0 1 0 N
+S -100 150 100 -150 0 1 0 N
+S 50 -95 100 -105 0 1 0 N
+S 50 5 100 -5 0 1 0 N
+S 50 105 100 95 0 1 0 N
+X P1 1 -250 100 150 R 50 50 1 1 P
+X P2 2 250 100 150 L 50 50 1 1 P
+X P3 3 -250 0 150 R 50 50 1 1 P
+X P4 4 250 0 150 L 50 50 1 1 P
+X P5 5 -250 -100 150 R 50 50 1 1 P
+X P6 6 250 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # CONN_02X20
 #
 DEF CONN_02X20 P 0 1 Y N 1 F N

ulx3s.bak

@@ -159,10 +159,10 @@ F 3 "" H 3150 5600 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR01
+L GND #PWR2
 U 1 1 58E6BC0E
 P 3150 6550
-F 0 "#PWR01" H 3150 6300 50  0001 C CNN
+F 0 "#PWR2" H 3150 6300 50  0001 C CNN
 F 1 "GND" H 3150 6400 50  0000 C CNN
 F 2 "" H 3150 6550 50  0000 C CNN
 F 3 "" H 3150 6550 50  0000 C CNN
@@ -170,10 +170,10 @@ F 3 "" H 3150 6550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR02
+L GND #PWR4
 U 1 1 58E6BC2E
 P 4250 6550
-F 0 "#PWR02" H 4250 6300 50  0001 C CNN
+F 0 "#PWR4" H 4250 6300 50  0001 C CNN
 F 1 "GND" H 4250 6400 50  0000 C CNN
 F 2 "" H 4250 6550 50  0000 C CNN
 F 3 "" H 4250 6550 50  0000 C CNN
@@ -181,10 +181,10 @@ F 3 "" H 4250 6550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR03
+L GND #PWR3
 U 1 1 58E6BC56
 P 4250 5850
-F 0 "#PWR03" H 4250 5600 50  0001 C CNN
+F 0 "#PWR3" H 4250 5600 50  0001 C CNN
 F 1 "GND" H 4250 5700 50  0000 C CNN
 F 2 "" H 4250 5850 50  0000 C CNN
 F 3 "" H 4250 5850 50  0000 C CNN
@@ -192,10 +192,10 @@ F 3 "" H 4250 5850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR04
+L GND #PWR1
 U 1 1 58E6BC72
 P 3150 5800
-F 0 "#PWR04" H 3150 5550 50  0001 C CNN
+F 0 "#PWR1" H 3150 5550 50  0001 C CNN
 F 1 "GND" H 3150 5650 50  0000 C CNN
 F 2 "" H 3150 5800 50  0000 C CNN
 F 3 "" H 3150 5800 50  0000 C CNN

usb.bak

@@ -64,10 +64,10 @@ F 3 "" V 2650 1700 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L +5V #PWR078
+L +5V #PWR83
 U 1 1 58D6C83B
 P 2800 1700
-F 0 "#PWR078" H 2800 1550 50  0001 C CNN
+F 0 "#PWR83" H 2800 1550 50  0001 C CNN
 F 1 "+5V" H 2800 1840 50  0000 C CNN
 F 2 "" H 2800 1700 60  0000 C CNN
 F 3 "" H 2800 1700 60  0000 C CNN
@@ -86,10 +86,10 @@ F 3 "" V 2650 2650 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR079
+L +5V #PWR84
 U 1 1 58D6C83D
 P 2850 2650
-F 0 "#PWR079" H 2850 2500 50  0001 C CNN
+F 0 "#PWR84" H 2850 2500 50  0001 C CNN
 F 1 "+5V" H 2850 2790 50  0000 C CNN
 F 2 "" H 2850 2650 60  0000 C CNN
 F 3 "" H 2850 2650 60  0000 C CNN
@@ -119,10 +119,10 @@ F 3 "" V 1450 2750 50  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L GND #PWR080
+L GND #PWR81
 U 1 1 58D6C842
 P 1900 2100
-F 0 "#PWR080" H 1900 1850 50  0001 C CNN
+F 0 "#PWR81" H 1900 1850 50  0001 C CNN
 F 1 "GND" H 1900 1950 50  0000 C CNN
 F 2 "" H 1900 2100 50  0000 C CNN
 F 3 "" H 1900 2100 50  0000 C CNN
@@ -130,10 +130,10 @@ F 3 "" H 1900 2100 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR081
+L GND #PWR82
 U 1 1 58D6C843
 P 1900 3050
-F 0 "#PWR081" H 1900 2800 50  0001 C CNN
+F 0 "#PWR82" H 1900 2800 50  0001 C CNN
 F 1 "GND" H 1900 2900 50  0000 C CNN
 F 2 "" H 1900 3050 50  0000 C CNN
 F 3 "" H 1900 3050 50  0000 C CNN
@@ -151,10 +151,10 @@ USB_FPGA_D+
 NoConn ~ 1850 2950
 NoConn ~ 1850 2000
 $Comp
-L GND #PWR082
+L GND #PWR78
 U 1 1 58D82518
 P 1400 2300
-F 0 "#PWR082" H 1400 2050 50  0001 C CNN
+F 0 "#PWR78" H 1400 2050 50  0001 C CNN
 F 1 "GND" H 1400 2150 50  0000 C CNN
 F 2 "" H 1400 2300 50  0000 C CNN
 F 3 "" H 1400 2300 50  0000 C CNN
@@ -162,10 +162,10 @@ F 3 "" H 1400 2300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR083
+L GND #PWR79
 U 1 1 58D8254A
 P 1400 3250
-F 0 "#PWR083" H 1400 3000 50  0001 C CNN
+F 0 "#PWR79" H 1400 3000 50  0001 C CNN
 F 1 "GND" H 1400 3100 50  0000 C CNN
 F 2 "" H 1400 3250 50  0000 C CNN
 F 3 "" H 1400 3250 50  0000 C CNN
@@ -173,10 +173,10 @@ F 3 "" H 1400 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR084
+L GND #PWR86
 U 1 1 58D8877C
 P 5600 4500
-F 0 "#PWR084" H 5600 4250 50  0001 C CNN
+F 0 "#PWR86" H 5600 4250 50  0001 C CNN
 F 1 "GND" H 5600 4350 50  0000 C CNN
 F 2 "" H 5600 4500 50  0000 C CNN
 F 3 "" H 5600 4500 50  0000 C CNN
@@ -238,10 +238,10 @@ F 3 "" H 5700 3400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR085
+L +5V #PWR85
 U 1 1 58EB8213
 P 5600 2500
-F 0 "#PWR085" H 5600 2350 50  0001 C CNN
+F 0 "#PWR85" H 5600 2350 50  0001 C CNN
 F 1 "+5V" H 5600 2640 50  0000 C CNN
 F 2 "" H 5600 2500 50  0000 C CNN
 F 3 "" H 5600 2500 50  0000 C CNN
@@ -444,10 +444,10 @@ Wire Wire Line
 Wire Wire Line
 	1850 3850 1950 3850
 $Comp
-L +3V3 #PWR086
+L +3V3 #PWR80
 U 1 1 591C6DA4
 P 1850 3500
-F 0 "#PWR086" H 1850 3350 50  0001 C CNN
+F 0 "#PWR80" H 1850 3350 50  0001 C CNN
 F 1 "+3V3" H 1850 3640 50  0000 C CNN
 F 2 "" H 1850 3500 50  0000 C CNN
 F 3 "" H 1850 3500 50  0000 C CNN
@@ -458,4 +458,49 @@ Text Notes 1400 4050 0    60   ~ 0
 D+ pullp for full speed mode USB1.1
 Text GLabel 8650 1450 0    60   Input ~ 0
 CLK_25MHz
+$Comp
+L CONN_02X03 J4
+U 1 1 591E0E6A
+P 9400 5000
+F 0 "J4" H 9400 5200 50  0000 C CNN
+F 1 "CONN_02X03" H 9400 4800 50  0000 C CNN
+F 2 "Socket_Strips:Socket_Strip_Straight_2x03" H 9400 3800 50  0001 C CNN
+F 3 "" H 9400 3800 50  0000 C CNN
+	1    9400 5000
+	1    0    0    -1  
+$EndComp
+Text GLabel 9150 5000 0    60   Input ~ 0
+JTAG_TDI
+Text GLabel 9650 5000 2    60   Input ~ 0
+JTAG_TDO
+Text GLabel 9650 5100 2    60   Input ~ 0
+JTAG_TCK
+Text GLabel 9150 5100 0    60   Input ~ 0
+JTAG_TMS
+$Comp
+L GND #PWR87
+U 1 1 591E1000
+P 8700 4900
+F 0 "#PWR87" H 8700 4650 50  0001 C CNN
+F 1 "GND" H 8700 4750 50  0000 C CNN
+F 2 "" H 8700 4900 50  0000 C CNN
+F 3 "" H 8700 4900 50  0000 C CNN
+	1    8700 4900
+	0    1    1    0   
+$EndComp
+$Comp
+L +3V3 #PWR88
+U 1 1 591E1028
+P 10100 4900
+F 0 "#PWR88" H 10100 4750 50  0001 C CNN
+F 1 "+3V3" H 10100 5040 50  0000 C CNN
+F 2 "" H 10100 4900 50  0000 C CNN
+F 3 "" H 10100 4900 50  0000 C CNN
+	1    10100 4900
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	9650 4900 10100 4900
+Wire Wire Line
+	8700 4900 9150 4900
 $EndSCHEMATC

usb.sch

@@ -458,4 +458,49 @@ Text Notes 1400 4050 0    60   ~ 0
 D+ pullp for full speed mode USB1.1
 Text GLabel 8650 1450 0    60   Input ~ 0
 CLK_25MHz
+$Comp
+L CONN_02X03 J4
+U 1 1 591E0E6A
+P 9400 5000
+F 0 "J4" H 9400 5200 50  0000 C CNN
+F 1 "CONN_02X03" H 9400 4800 50  0000 C CNN
+F 2 "Socket_Strips:Socket_Strip_Straight_2x03" H 9400 3800 50  0001 C CNN
+F 3 "" H 9400 3800 50  0000 C CNN
+	1    9400 5000
+	1    0    0    -1  
+$EndComp
+Text GLabel 9150 5000 0    60   Input ~ 0
+JTAG_TDI
+Text GLabel 9650 5100 2    60   Input ~ 0
+JTAG_TDO
+Text GLabel 9650 5000 2    60   Input ~ 0
+JTAG_TCK
+Text GLabel 9150 5100 0    60   Input ~ 0
+JTAG_TMS
+$Comp
+L GND #PWR087
+U 1 1 591E1000
+P 8700 4900
+F 0 "#PWR087" H 8700 4650 50  0001 C CNN
+F 1 "GND" H 8700 4750 50  0000 C CNN
+F 2 "" H 8700 4900 50  0000 C CNN
+F 3 "" H 8700 4900 50  0000 C CNN
+	1    8700 4900
+	0    1    1    0   
+$EndComp
+$Comp
+L +3V3 #PWR088
+U 1 1 591E1028
+P 10100 4900
+F 0 "#PWR088" H 10100 4750 50  0001 C CNN
+F 1 "+3V3" H 10100 5040 50  0000 C CNN
+F 2 "" H 10100 4900 50  0000 C CNN
+F 3 "" H 10100 4900 50  0000 C CNN
+	1    10100 4900
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	9650 4900 10100 4900
+Wire Wire Line
+	8700 4900 9150 4900
 $EndSCHEMATC

wifi.bak

@@ -90,10 +90,10 @@ F 3 "" H 6400 5250 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR087
+L GND #PWR92
 U 1 1 58E56E8D
 P 5500 4100
-F 0 "#PWR087" H 5500 3850 50  0001 C CNN
+F 0 "#PWR92" H 5500 3850 50  0001 C CNN
 F 1 "GND" H 5500 3950 50  0000 C CNN
 F 2 "" H 5500 4100 50  0000 C CNN
 F 3 "" H 5500 4100 50  0000 C CNN
@@ -101,10 +101,10 @@ F 3 "" H 5500 4100 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR088
+L +3V3 #PWR91
 U 1 1 58E56EA3
 P 5350 4200
-F 0 "#PWR088" H 5350 4050 50  0001 C CNN
+F 0 "#PWR91" H 5350 4050 50  0001 C CNN
 F 1 "+3V3" H 5350 4340 50  0000 C CNN
 F 2 "" H 5350 4200 50  0000 C CNN
 F 3 "" H 5350 4200 50  0000 C CNN
@@ -118,10 +118,10 @@ Wire Wire Line
 Text GLabel 5900 4300 0    60   Input ~ 0
 WIFI_EN
 $Comp
-L +3V3 #PWR089
+L +3V3 #PWR89
 U 1 1 58ED6C57
 P 4600 4300
-F 0 "#PWR089" H 4600 4150 50  0001 C CNN
+F 0 "#PWR89" H 4600 4150 50  0001 C CNN
 F 1 "+3V3" H 4600 4440 50  0000 C CNN
 F 2 "" H 4600 4300 50  0000 C CNN
 F 3 "" H 4600 4300 50  0000 C CNN
@@ -147,10 +147,10 @@ Wire Wire Line
 	4600 4650 4750 4650
 Connection ~ 4600 4650
 $Comp
-L GND #PWR090
+L GND #PWR90
 U 1 1 58EE2982
 P 4600 5500
-F 0 "#PWR090" H 4600 5250 50  0001 C CNN
+F 0 "#PWR90" H 4600 5250 50  0001 C CNN
 F 1 "GND" H 4600 5350 50  0000 C CNN
 F 2 "" H 4600 5500 50  0000 C CNN
 F 3 "" H 4600 5500 50  0000 C CNN

wifi.sch

@@ -90,10 +90,10 @@ F 3 "" H 6400 5250 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR087
+L GND #PWR089
 U 1 1 58E56E8D
 P 5500 4100
-F 0 "#PWR087" H 5500 3850 50  0001 C CNN
+F 0 "#PWR089" H 5500 3850 50  0001 C CNN
 F 1 "GND" H 5500 3950 50  0000 C CNN
 F 2 "" H 5500 4100 50  0000 C CNN
 F 3 "" H 5500 4100 50  0000 C CNN
@@ -101,10 +101,10 @@ F 3 "" H 5500 4100 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR088
+L +3V3 #PWR090
 U 1 1 58E56EA3
 P 5350 4200
-F 0 "#PWR088" H 5350 4050 50  0001 C CNN
+F 0 "#PWR090" H 5350 4050 50  0001 C CNN
 F 1 "+3V3" H 5350 4340 50  0000 C CNN
 F 2 "" H 5350 4200 50  0000 C CNN
 F 3 "" H 5350 4200 50  0000 C CNN
@@ -118,10 +118,10 @@ Wire Wire Line
 Text GLabel 5900 4300 0    60   Input ~ 0
 WIFI_EN
 $Comp
-L +3V3 #PWR089
+L +3V3 #PWR091
 U 1 1 58ED6C57
 P 4600 4300
-F 0 "#PWR089" H 4600 4150 50  0001 C CNN
+F 0 "#PWR091" H 4600 4150 50  0001 C CNN
 F 1 "+3V3" H 4600 4440 50  0000 C CNN
 F 2 "" H 4600 4300 50  0000 C CNN
 F 3 "" H 4600 4300 50  0000 C CNN
@@ -147,10 +147,10 @@ Wire Wire Line
 	4600 4650 4750 4650
 Connection ~ 4600 4650
 $Comp
-L GND #PWR090
+L GND #PWR092
 U 1 1 58EE2982
 P 4600 5500
-F 0 "#PWR090" H 4600 5250 50  0001 C CNN
+F 0 "#PWR092" H 4600 5250 50  0001 C CNN
 F 1 "GND" H 4600 5350 50  0000 C CNN
 F 2 "" H 4600 5500 50  0000 C CNN
 F 3 "" H 4600 5500 50  0000 C CNN