adding 25 MHz oscillator and moving some parts around

analog.bak

@@ -64,10 +64,10 @@ F 3 "" H 2650 2400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR089
+L GND #PWR91
 U 1 1 58D9043A
 P 3250 2550
-F 0 "#PWR089" H 3250 2300 50  0001 C CNN
+F 0 "#PWR91" 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 #PWR89
+L GND #PWR091
 U 1 1 58D9043A
 P 3250 2550
-F 0 "#PWR89" H 3250 2300 50  0001 C CNN
+F 0 "#PWR091" 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 #PWR61
 U 1 1 58D66047
 P 4850 1250
-F 0 "#PWR059" H 4850 1000 50  0001 C CNN
+F 0 "#PWR61" 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 #PWR62
 U 1 1 58D66055
 P 5350 1350
-F 0 "#PWR060" H 5350 1200 50  0001 C CNN
+F 0 "#PWR62" 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
@@ -181,10 +181,10 @@ Wire Wire Line
 	2750 3150 2850 3150
 Connection ~ 2750 3150
 $Comp
-L +3V3 #PWR061
+L +3V3 #PWR59
 U 1 1 58D6605C
 P 2750 2350
-F 0 "#PWR061" H 2750 2200 50  0001 C CNN
+F 0 "#PWR59" H 2750 2200 50  0001 C CNN
 F 1 "+3V3" H 2750 2490 50  0000 C CNN
 F 2 "" H 2750 2350 50  0000 C CNN
 F 3 "" H 2750 2350 50  0000 C CNN
@@ -346,10 +346,10 @@ Wire Wire Line
 	4400 2750 4250 2750
 Connection ~ 4250 2750
 $Comp
-L GND #PWR062
+L GND #PWR60
 U 1 1 58D681C3
 P 4250 4100
-F 0 "#PWR062" H 4250 3850 50  0001 C CNN
+F 0 "#PWR60" 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

blinkey.sch

@@ -67,10 +67,10 @@ Wire Wire Line
 Wire Wire Line
 	4750 1850 4850 1850
 $Comp
-L GND #PWR61
+L GND #PWR059
 U 1 1 58D66047
 P 4850 1250
-F 0 "#PWR61" H 4850 1000 50  0001 C CNN
+F 0 "#PWR059" 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 #PWR62
+L +3V3 #PWR060
 U 1 1 58D66055
 P 5350 1350
-F 0 "#PWR62" H 5350 1200 50  0001 C CNN
+F 0 "#PWR060" 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
@@ -181,10 +181,10 @@ Wire Wire Line
 	2750 3150 2850 3150
 Connection ~ 2750 3150
 $Comp
-L +3V3 #PWR59
+L +3V3 #PWR061
 U 1 1 58D6605C
 P 2750 2350
-F 0 "#PWR59" H 2750 2200 50  0001 C CNN
+F 0 "#PWR061" H 2750 2200 50  0001 C CNN
 F 1 "+3V3" H 2750 2490 50  0000 C CNN
 F 2 "" H 2750 2350 50  0000 C CNN
 F 3 "" H 2750 2350 50  0000 C CNN
@@ -346,10 +346,10 @@ Wire Wire Line
 	4400 2750 4250 2750
 Connection ~ 4250 2750
 $Comp
-L GND #PWR60
+L GND #PWR062
 U 1 1 58D681C3
 P 4250 4100
-F 0 "#PWR60" H 4250 3850 50  0001 C CNN
+F 0 "#PWR062" 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

flash.bak

@@ -64,10 +64,10 @@ F 3 "" H 2450 2650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR094
+L +3V3 #PWR98
 U 1 1 58D9149E
 P 2800 2400
-F 0 "#PWR094" H 2800 2250 50  0001 C CNN
+F 0 "#PWR98" 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 #PWR095
+L GND #PWR99
 U 1 1 58D914B4
 P 2800 3000
-F 0 "#PWR095" H 2800 2750 50  0001 C CNN
+F 0 "#PWR99" 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
@@ -148,10 +148,10 @@ Wire Wire Line
 Text Label 3950 2200 1    60   ~ 0
 FLASH_MOSI
 $Comp
-L +3V3 #PWR096
+L +3V3 #PWR100
 U 1 1 58EC0F61
 P 3950 1250
-F 0 "#PWR096" H 3950 1100 50  0001 C CNN
+F 0 "#PWR100" 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
@@ -174,10 +174,10 @@ Wire Wire Line
 Text Label 4150 2200 1    60   ~ 0
 FLASH_MISO
 $Comp
-L +3V3 #PWR097
+L +3V3 #PWR101
 U 1 1 58EC0F96
 P 4150 1250
-F 0 "#PWR097" H 4150 1100 50  0001 C CNN
+F 0 "#PWR101" 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
@@ -200,10 +200,10 @@ Wire Wire Line
 Text Label 4350 2200 1    60   ~ 0
 FLASH_SCK
 $Comp
-L +3V3 #PWR098
+L +3V3 #PWR102
 U 1 1 58EC15E9
 P 4350 1250
-F 0 "#PWR098" H 4350 1100 50  0001 C CNN
+F 0 "#PWR102" 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
@@ -230,10 +230,10 @@ Wire Wire Line
 Text Label 4550 2200 1    60   ~ 0
 FLASH_nCS
 $Comp
-L +3V3 #PWR099
+L +3V3 #PWR103
 U 1 1 58EC1C8C
 P 4550 1250
-F 0 "#PWR099" H 4550 1100 50  0001 C CNN
+F 0 "#PWR103" 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
@@ -258,10 +258,10 @@ Wire Wire Line
 Text Label 1150 2150 1    60   ~ 0
 FLASH_nWP
 $Comp
-L +3V3 #PWR0100
+L +3V3 #PWR96
 U 1 1 58EC4E7F
 P 1150 1200
-F 0 "#PWR0100" H 1150 1050 50  0001 C CNN
+F 0 "#PWR96" 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
@@ -284,10 +284,10 @@ Wire Wire Line
 Text Label 1350 2150 1    60   ~ 0
 FLASH_nHOLD
 $Comp
-L +3V3 #PWR0101
+L +3V3 #PWR97
 U 1 1 58EC4E8D
 P 1350 1200
-F 0 "#PWR0101" H 1350 1050 50  0001 C CNN
+F 0 "#PWR97" 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
@@ -295,10 +295,10 @@ F 3 "" H 1350 1200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0102
+L +3V3 #PWR104
 U 1 1 58EC58A7
 P 5450 3350
-F 0 "#PWR0102" H 5450 3200 50  0001 C CNN
+F 0 "#PWR104" 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
@@ -306,10 +306,10 @@ F 3 "" H 5450 3350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR0103
+L GND #PWR108
 U 1 1 58EC58CB
 P 5650 3450
-F 0 "#PWR0103" H 5650 3200 50  0001 C CNN
+F 0 "#PWR108" 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
@@ -317,10 +317,10 @@ F 3 "" H 5650 3450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR0104
+L GND #PWR107
 U 1 1 58EC58EF
 P 5650 3250
-F 0 "#PWR0104" H 5650 3000 50  0001 C CNN
+F 0 "#PWR107" 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
@@ -355,10 +355,10 @@ Wire Wire Line
 Text Label 8850 3650 1    60   ~ 0
 FPGA_PROGRAMN
 $Comp
-L +3V3 #PWR0105
+L +3V3 #PWR110
 U 1 1 58EC68E4
 P 8850 2550
-F 0 "#PWR0105" H 8850 2400 50  0001 C CNN
+F 0 "#PWR110" 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
@@ -381,10 +381,10 @@ Wire Wire Line
 Text Label 9050 3650 1    60   ~ 0
 FPGA_DONE
 $Comp
-L +3V3 #PWR0106
+L +3V3 #PWR111
 U 1 1 58EC68F2
 P 9050 2550
-F 0 "#PWR0106" H 9050 2400 50  0001 C CNN
+F 0 "#PWR111" 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
@@ -411,10 +411,10 @@ Wire Wire Line
 Text Label 9250 3650 1    60   ~ 0
 FPGA_INITN
 $Comp
-L +3V3 #PWR0107
+L +3V3 #PWR112
 U 1 1 58EC7305
 P 9250 2550
-F 0 "#PWR0107" H 9250 2400 50  0001 C CNN
+F 0 "#PWR112" 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
@@ -422,10 +422,10 @@ F 3 "" H 9250 2550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0108
+L +3V3 #PWR106
 U 1 1 58EC879F
 P 5650 2950
-F 0 "#PWR0108" H 5650 2800 50  0001 C CNN
+F 0 "#PWR106" 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
@@ -433,10 +433,10 @@ F 3 "" H 5650 2950 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR0109
+L +3V3 #PWR105
 U 1 1 58EC8800
 P 5650 2550
-F 0 "#PWR0109" H 5650 2400 50  0001 C CNN
+F 0 "#PWR105" 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
@@ -444,10 +444,10 @@ F 3 "" H 5650 2550 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR0110
+L +3V3 #PWR109
 U 1 1 58EC882A
 P 7150 2550
-F 0 "#PWR0110" H 7150 2400 50  0001 C CNN
+F 0 "#PWR109" 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 #PWR96
+L +3V3 #PWR096
 U 1 1 58D9149E
 P 2800 2400
-F 0 "#PWR96" H 2800 2250 50  0001 C CNN
+F 0 "#PWR096" 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 #PWR97
+L GND #PWR097
 U 1 1 58D914B4
 P 2800 3000
-F 0 "#PWR97" H 2800 2750 50  0001 C CNN
+F 0 "#PWR097" 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
@@ -148,10 +148,10 @@ Wire Wire Line
 Text Label 3950 2200 1    60   ~ 0
 FLASH_MOSI
 $Comp
-L +3V3 #PWR98
+L +3V3 #PWR098
 U 1 1 58EC0F61
 P 3950 1250
-F 0 "#PWR98" H 3950 1100 50  0001 C CNN
+F 0 "#PWR098" 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
@@ -174,10 +174,10 @@ Wire Wire Line
 Text Label 4150 2200 1    60   ~ 0
 FLASH_MISO
 $Comp
-L +3V3 #PWR99
+L +3V3 #PWR099
 U 1 1 58EC0F96
 P 4150 1250
-F 0 "#PWR99" H 4150 1100 50  0001 C CNN
+F 0 "#PWR099" 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
@@ -200,10 +200,10 @@ Wire Wire Line
 Text Label 4350 2200 1    60   ~ 0
 FLASH_SCK
 $Comp
-L +3V3 #PWR100
+L +3V3 #PWR0100
 U 1 1 58EC15E9
 P 4350 1250
-F 0 "#PWR100" H 4350 1100 50  0001 C CNN
+F 0 "#PWR0100" 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
@@ -230,10 +230,10 @@ Wire Wire Line
 Text Label 4550 2200 1    60   ~ 0
 FLASH_nCS
 $Comp
-L +3V3 #PWR101
+L +3V3 #PWR0101
 U 1 1 58EC1C8C
 P 4550 1250
-F 0 "#PWR101" H 4550 1100 50  0001 C CNN
+F 0 "#PWR0101" 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
@@ -258,10 +258,10 @@ Wire Wire Line
 Text Label 1150 2150 1    60   ~ 0
 FLASH_nWP
 $Comp
-L +3V3 #PWR94
+L +3V3 #PWR0102
 U 1 1 58EC4E7F
 P 1150 1200
-F 0 "#PWR94" H 1150 1050 50  0001 C CNN
+F 0 "#PWR0102" 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
@@ -284,10 +284,10 @@ Wire Wire Line
 Text Label 1350 2150 1    60   ~ 0
 FLASH_nHOLD
 $Comp
-L +3V3 #PWR95
+L +3V3 #PWR0103
 U 1 1 58EC4E8D
 P 1350 1200
-F 0 "#PWR95" H 1350 1050 50  0001 C CNN
+F 0 "#PWR0103" 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
@@ -295,10 +295,10 @@ F 3 "" H 1350 1200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR102
+L +3V3 #PWR0104
 U 1 1 58EC58A7
 P 5450 3350
-F 0 "#PWR102" H 5450 3200 50  0001 C CNN
+F 0 "#PWR0104" 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
@@ -306,10 +306,10 @@ F 3 "" H 5450 3350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR106
+L GND #PWR0105
 U 1 1 58EC58CB
 P 5650 3450
-F 0 "#PWR106" H 5650 3200 50  0001 C CNN
+F 0 "#PWR0105" 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
@@ -317,10 +317,10 @@ F 3 "" H 5650 3450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR105
+L GND #PWR0106
 U 1 1 58EC58EF
 P 5650 3250
-F 0 "#PWR105" H 5650 3000 50  0001 C CNN
+F 0 "#PWR0106" 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
@@ -355,10 +355,10 @@ Wire Wire Line
 Text Label 8850 3650 1    60   ~ 0
 FPGA_PROGRAMN
 $Comp
-L +3V3 #PWR108
+L +3V3 #PWR0107
 U 1 1 58EC68E4
 P 8850 2550
-F 0 "#PWR108" H 8850 2400 50  0001 C CNN
+F 0 "#PWR0107" 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
@@ -381,10 +381,10 @@ Wire Wire Line
 Text Label 9050 3650 1    60   ~ 0
 FPGA_DONE
 $Comp
-L +3V3 #PWR109
+L +3V3 #PWR0108
 U 1 1 58EC68F2
 P 9050 2550
-F 0 "#PWR109" H 9050 2400 50  0001 C CNN
+F 0 "#PWR0108" 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
@@ -411,10 +411,10 @@ Wire Wire Line
 Text Label 9250 3650 1    60   ~ 0
 FPGA_INITN
 $Comp
-L +3V3 #PWR110
+L +3V3 #PWR0109
 U 1 1 58EC7305
 P 9250 2550
-F 0 "#PWR110" H 9250 2400 50  0001 C CNN
+F 0 "#PWR0109" 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
@@ -422,10 +422,10 @@ F 3 "" H 9250 2550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR104
+L +3V3 #PWR0110
 U 1 1 58EC879F
 P 5650 2950
-F 0 "#PWR104" H 5650 2800 50  0001 C CNN
+F 0 "#PWR0110" 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
@@ -433,10 +433,10 @@ F 3 "" H 5650 2950 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR103
+L +3V3 #PWR0111
 U 1 1 58EC8800
 P 5650 2550
-F 0 "#PWR103" H 5650 2400 50  0001 C CNN
+F 0 "#PWR0111" 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
@@ -444,10 +444,10 @@ F 3 "" H 5650 2550 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR107
+L +3V3 #PWR0112
 U 1 1 58EC882A
 P 7150 2550
-F 0 "#PWR107" H 7150 2400 50  0001 C CNN
+F 0 "#PWR0112" 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 #PWR063
+L GND #PWR63
 U 1 1 58D69073
 P 1500 1900
-F 0 "#PWR063" H 1500 1650 50  0001 C CNN
+F 0 "#PWR63" 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 #PWR064
+L GND #PWR68
 U 1 1 58D69074
 P 1500 3500
-F 0 "#PWR064" H 1500 3250 50  0001 C CNN
+F 0 "#PWR68" 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 #PWR065
+L GND #PWR67
 U 1 1 58D69075
 P 1500 3200
-F 0 "#PWR065" H 1500 2950 50  0001 C CNN
+F 0 "#PWR67" 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 #PWR066
+L GND #PWR66
 U 1 1 58D69076
 P 1500 2900
-F 0 "#PWR066" H 1500 2650 50  0001 C CNN
+F 0 "#PWR66" 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 #PWR067
+L GND #PWR65
 U 1 1 58D69077
 P 1500 2600
-F 0 "#PWR067" H 1500 2350 50  0001 C CNN
+F 0 "#PWR65" 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 #PWR068
+L GND #PWR64
 U 1 1 58D69078
 P 1500 2300
-F 0 "#PWR068" H 1500 2050 50  0001 C CNN
+F 0 "#PWR64" 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 #PWR069
+L +5V #PWR70
 U 1 1 58D6907F
 P 2250 3800
-F 0 "#PWR069" H 2250 3650 50  0001 C CNN
+F 0 "#PWR70" 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 #PWR070
+L +5V #PWR72
 U 1 1 58D92625
 P 3600 4400
-F 0 "#PWR070" H 3600 4250 50  0001 C CNN
+F 0 "#PWR72" 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 #PWR071
+L GND #PWR73
 U 1 1 58D92889
 P 4050 4950
-F 0 "#PWR071" H 4050 4700 50  0001 C CNN
+F 0 "#PWR73" 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 #PWR072
+L +3V3 #PWR69
 U 1 1 58D92A40
 P 2000 4700
-F 0 "#PWR072" H 2000 4550 50  0001 C CNN
+F 0 "#PWR69" 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 #PWR073
+L GND #PWR71
 U 1 1 58D92B02
 P 2250 5050
-F 0 "#PWR073" H 2250 4800 50  0001 C CNN
+F 0 "#PWR71" 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
@@ -467,4 +467,50 @@ Text GLabel 5500 3400 0    60   Input ~ 0
 BTN_F2
 Text GLabel 5500 3500 0    60   Input ~ 0
 BTN_PWRn
+$Comp
+L Crystal_GND24 Y2
+U 1 1 58EDFF94
+P 4250 3600
+F 0 "Y2" H 4375 3800 50  0000 L CNN
+F 1 "Crystal_GND24" H 4375 3725 50  0000 L CNN
+F 2 "Crystals:Crystal_SMD_2016_4Pads" H 4250 3600 50  0001 C CNN
+F 3 "" H 4250 3600 50  0000 C CNN
+	1    4250 3600
+	1    0    0    1   
+$EndComp
+$Comp
+L +3V3 #PWR74
+U 1 1 58EE0104
+P 4250 3300
+F 0 "#PWR74" H 4250 3150 50  0001 C CNN
+F 1 "+3V3" H 4250 3440 50  0000 C CNN
+F 2 "" H 4250 3300 50  0000 C CNN
+F 3 "" H 4250 3300 50  0000 C CNN
+	1    4250 3300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4250 3300 4250 3400
+Wire Wire Line
+	4250 3350 4000 3350
+Wire Wire Line
+	4000 3350 4000 3600
+Wire Wire Line
+	4000 3600 4100 3600
+Connection ~ 4250 3350
+$Comp
+L GND #PWR75
+U 1 1 58EE01EB
+P 4250 3800
+F 0 "#PWR75" H 4250 3550 50  0001 C CNN
+F 1 "GND" H 4250 3650 50  0000 C CNN
+F 2 "" H 4250 3800 50  0000 C CNN
+F 3 "" H 4250 3800 50  0000 C CNN
+	1    4250 3800
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4400 3600 5500 3600
+Text Label 4450 3600 0    60   ~ 0
+CLK_25MHz
 $EndSCHEMATC

gpdi.sch

@@ -104,10 +104,10 @@ Wire Wire Line
 Wire Wire Line
 	1450 1900 1500 1900
 $Comp
-L GND #PWR63
+L GND #PWR063
 U 1 1 58D69073
 P 1500 1900
-F 0 "#PWR63" H 1500 1650 50  0001 C CNN
+F 0 "#PWR063" 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 #PWR68
+L GND #PWR064
 U 1 1 58D69074
 P 1500 3500
-F 0 "#PWR68" H 1500 3250 50  0001 C CNN
+F 0 "#PWR064" 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 #PWR67
+L GND #PWR065
 U 1 1 58D69075
 P 1500 3200
-F 0 "#PWR67" H 1500 2950 50  0001 C CNN
+F 0 "#PWR065" 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 #PWR66
+L GND #PWR066
 U 1 1 58D69076
 P 1500 2900
-F 0 "#PWR66" H 1500 2650 50  0001 C CNN
+F 0 "#PWR066" 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 #PWR65
+L GND #PWR067
 U 1 1 58D69077
 P 1500 2600
-F 0 "#PWR65" H 1500 2350 50  0001 C CNN
+F 0 "#PWR067" 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 #PWR64
+L GND #PWR068
 U 1 1 58D69078
 P 1500 2300
-F 0 "#PWR64" H 1500 2050 50  0001 C CNN
+F 0 "#PWR068" 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 #PWR70
+L +5V #PWR069
 U 1 1 58D6907F
 P 2250 3800
-F 0 "#PWR70" H 2250 3650 50  0001 C CNN
+F 0 "#PWR069" 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 #PWR72
+L +5V #PWR070
 U 1 1 58D92625
 P 3600 4400
-F 0 "#PWR72" H 3600 4250 50  0001 C CNN
+F 0 "#PWR070" 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 #PWR73
+L GND #PWR071
 U 1 1 58D92889
 P 4050 4950
-F 0 "#PWR73" H 4050 4700 50  0001 C CNN
+F 0 "#PWR071" 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 #PWR69
+L +3V3 #PWR072
 U 1 1 58D92A40
 P 2000 4700
-F 0 "#PWR69" H 2000 4550 50  0001 C CNN
+F 0 "#PWR072" 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 #PWR71
+L GND #PWR073
 U 1 1 58D92B02
 P 2250 5050
-F 0 "#PWR71" H 2250 4800 50  0001 C CNN
+F 0 "#PWR073" 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
@@ -467,4 +467,50 @@ Text GLabel 5500 3400 0    60   Input ~ 0
 BTN_F2
 Text GLabel 5500 3500 0    60   Input ~ 0
 BTN_PWRn
+$Comp
+L Crystal_GND24 Y2
+U 1 1 58EDFF94
+P 4250 3600
+F 0 "Y2" H 4375 3800 50  0000 L CNN
+F 1 "Crystal_GND24" H 4375 3725 50  0000 L CNN
+F 2 "Crystals:Crystal_SMD_7050_4Pads" H 4250 3600 50  0001 C CNN
+F 3 "" H 4250 3600 50  0000 C CNN
+	1    4250 3600
+	1    0    0    1   
+$EndComp
+$Comp
+L +3V3 #PWR074
+U 1 1 58EE0104
+P 4250 3300
+F 0 "#PWR074" H 4250 3150 50  0001 C CNN
+F 1 "+3V3" H 4250 3440 50  0000 C CNN
+F 2 "" H 4250 3300 50  0000 C CNN
+F 3 "" H 4250 3300 50  0000 C CNN
+	1    4250 3300
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4250 3300 4250 3400
+Wire Wire Line
+	4250 3350 4000 3350
+Wire Wire Line
+	4000 3350 4000 3600
+Wire Wire Line
+	4000 3600 4100 3600
+Connection ~ 4250 3350
+$Comp
+L GND #PWR075
+U 1 1 58EE01EB
+P 4250 3800
+F 0 "#PWR075" H 4250 3550 50  0001 C CNN
+F 1 "GND" H 4250 3650 50  0000 C CNN
+F 2 "" H 4250 3800 50  0000 C CNN
+F 3 "" H 4250 3800 50  0000 C CNN
+	1    4250 3800
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4400 3600 5500 3600
+Text Label 4450 3600 0    60   ~ 0
+CLK_25MHz
 $EndSCHEMATC

gpio.bak

@@ -92,10 +92,10 @@ D7
 Text Label 5700 1950 0    60   ~ 0
 E7
 $Comp
-L GND #PWR05
+L GND #PWR11
 U 1 1 56AC4825
 P 1400 950
-F 0 "#PWR05" H 1400 700 50  0001 C CNN
+F 0 "#PWR11" H 1400 700 50  0001 C CNN
 F 1 "GND" H 1400 800 50  0000 C CNN
 F 2 "" H 1400 950 60  0000 C CNN
 F 3 "" H 1400 950 60  0000 C CNN
@@ -103,10 +103,10 @@ F 3 "" H 1400 950 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR06
+L GND #PWR17
 U 1 1 56AC482D
 P 2350 950
-F 0 "#PWR06" H 2350 700 50  0001 C CNN
+F 0 "#PWR17" H 2350 700 50  0001 C CNN
 F 1 "GND" H 2350 800 50  0000 C CNN
 F 2 "" H 2350 950 60  0000 C CNN
 F 3 "" H 2350 950 60  0000 C CNN
@@ -140,10 +140,10 @@ $EndComp
 Text Label 2150 5200 0    60   ~ 0
 OUT5V
 $Comp
-L +5V #PWR07
+L +5V #PWR5
 U 1 1 56AC484F
 P 950 5200
-F 0 "#PWR07" H 950 5050 50  0001 C CNN
+F 0 "#PWR5" H 950 5050 50  0001 C CNN
 F 1 "+5V" H 950 5340 50  0000 C CNN
 F 2 "" H 950 5200 60  0000 C CNN
 F 3 "" H 950 5200 60  0000 C CNN
@@ -180,10 +180,10 @@ B20
 Text Label 5700 2800 0    60   ~ 0
 B19
 $Comp
-L +3V3 #PWR08
+L +3V3 #PWR23
 U 1 1 58D5FBBC
 P 2500 850
-F 0 "#PWR08" H 2500 700 50  0001 C CNN
+F 0 "#PWR23" H 2500 700 50  0001 C CNN
 F 1 "+3V3" H 2500 990 50  0000 C CNN
 F 2 "" H 2500 850 50  0000 C CNN
 F 3 "" H 2500 850 50  0000 C CNN
@@ -191,10 +191,10 @@ F 3 "" H 2500 850 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR09
+L +3V3 #PWR6
 U 1 1 58D5FBF3
 P 1250 850
-F 0 "#PWR09" H 1250 700 50  0001 C CNN
+F 0 "#PWR6" H 1250 700 50  0001 C CNN
 F 1 "+3V3" H 1250 990 50  0000 C CNN
 F 2 "" H 1250 850 50  0000 C CNN
 F 3 "" H 1250 850 50  0000 C CNN
@@ -224,10 +224,10 @@ F 3 "" H 1850 3300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR010
+L GND #PWR12
 U 1 1 58E6D572
 P 1400 1850
-F 0 "#PWR010" H 1400 1600 50  0001 C CNN
+F 0 "#PWR12" H 1400 1600 50  0001 C CNN
 F 1 "GND" H 1400 1700 50  0000 C CNN
 F 2 "" H 1400 1850 60  0000 C CNN
 F 3 "" H 1400 1850 60  0000 C CNN
@@ -235,10 +235,10 @@ F 3 "" H 1400 1850 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR011
+L +3V3 #PWR7
 U 1 1 58E6D578
 P 1250 1750
-F 0 "#PWR011" H 1250 1600 50  0001 C CNN
+F 0 "#PWR7" H 1250 1600 50  0001 C CNN
 F 1 "+3V3" H 1250 1890 50  0000 C CNN
 F 2 "" H 1250 1750 50  0000 C CNN
 F 3 "" H 1250 1750 50  0000 C CNN
@@ -246,10 +246,10 @@ F 3 "" H 1250 1750 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR012
+L GND #PWR18
 U 1 1 58E6D59D
 P 2350 1850
-F 0 "#PWR012" H 2350 1600 50  0001 C CNN
+F 0 "#PWR18" H 2350 1600 50  0001 C CNN
 F 1 "GND" H 2350 1700 50  0000 C CNN
 F 2 "" H 2350 1850 60  0000 C CNN
 F 3 "" H 2350 1850 60  0000 C CNN
@@ -257,10 +257,10 @@ F 3 "" H 2350 1850 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR013
+L +3V3 #PWR24
 U 1 1 58E6D5A3
 P 2500 1750
-F 0 "#PWR013" H 2500 1600 50  0001 C CNN
+F 0 "#PWR24" H 2500 1600 50  0001 C CNN
 F 1 "+3V3" H 2500 1890 50  0000 C CNN
 F 2 "" H 2500 1750 50  0000 C CNN
 F 3 "" H 2500 1750 50  0000 C CNN
@@ -268,10 +268,10 @@ F 3 "" H 2500 1750 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR014
+L GND #PWR13
 U 1 1 58E6E4EC
 P 1400 2650
-F 0 "#PWR014" H 1400 2400 50  0001 C CNN
+F 0 "#PWR13" H 1400 2400 50  0001 C CNN
 F 1 "GND" H 1400 2500 50  0000 C CNN
 F 2 "" H 1400 2650 60  0000 C CNN
 F 3 "" H 1400 2650 60  0000 C CNN
@@ -279,10 +279,10 @@ F 3 "" H 1400 2650 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR015
+L +3V3 #PWR8
 U 1 1 58E6E4F2
 P 1250 2750
-F 0 "#PWR015" H 1250 2600 50  0001 C CNN
+F 0 "#PWR8" H 1250 2600 50  0001 C CNN
 F 1 "+3V3" H 1250 2890 50  0000 C CNN
 F 2 "" H 1250 2750 50  0000 C CNN
 F 3 "" H 1250 2750 50  0000 C CNN
@@ -290,10 +290,10 @@ F 3 "" H 1250 2750 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR016
+L GND #PWR19
 U 1 1 58E6E536
 P 2350 2650
-F 0 "#PWR016" H 2350 2400 50  0001 C CNN
+F 0 "#PWR19" H 2350 2400 50  0001 C CNN
 F 1 "GND" H 2350 2500 50  0000 C CNN
 F 2 "" H 2350 2650 60  0000 C CNN
 F 3 "" H 2350 2650 60  0000 C CNN
@@ -301,10 +301,10 @@ F 3 "" H 2350 2650 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR017
+L +3V3 #PWR25
 U 1 1 58E6E53C
 P 2500 2750
-F 0 "#PWR017" H 2500 2600 50  0001 C CNN
+F 0 "#PWR25" H 2500 2600 50  0001 C CNN
 F 1 "+3V3" H 2500 2890 50  0000 C CNN
 F 2 "" H 2500 2750 50  0000 C CNN
 F 3 "" H 2500 2750 50  0000 C CNN
@@ -382,10 +382,10 @@ Wire Wire Line
 Wire Wire Line
 	1400 2650 1600 2650
 $Comp
-L GND #PWR018
+L GND #PWR14
 U 1 1 58E710CC
 P 1400 3400
-F 0 "#PWR018" H 1400 3150 50  0001 C CNN
+F 0 "#PWR14" H 1400 3150 50  0001 C CNN
 F 1 "GND" H 1400 3250 50  0000 C CNN
 F 2 "" H 1400 3400 60  0000 C CNN
 F 3 "" H 1400 3400 60  0000 C CNN
@@ -393,10 +393,10 @@ F 3 "" H 1400 3400 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR019
+L +3V3 #PWR9
 U 1 1 58E710E0
 P 1250 3300
-F 0 "#PWR019" H 1250 3150 50  0001 C CNN
+F 0 "#PWR9" H 1250 3150 50  0001 C CNN
 F 1 "+3V3" H 1250 3440 50  0000 C CNN
 F 2 "" H 1250 3300 50  0000 C CNN
 F 3 "" H 1250 3300 50  0000 C CNN
@@ -404,10 +404,10 @@ F 3 "" H 1250 3300 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR020
+L GND #PWR15
 U 1 1 58E710E6
 P 1400 4300
-F 0 "#PWR020" H 1400 4050 50  0001 C CNN
+F 0 "#PWR15" H 1400 4050 50  0001 C CNN
 F 1 "GND" H 1400 4150 50  0000 C CNN
 F 2 "" H 1400 4300 60  0000 C CNN
 F 3 "" H 1400 4300 60  0000 C CNN
@@ -415,10 +415,10 @@ F 3 "" H 1400 4300 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR021
+L +3V3 #PWR10
 U 1 1 58E710EC
 P 1250 4200
-F 0 "#PWR021" H 1250 4050 50  0001 C CNN
+F 0 "#PWR10" H 1250 4050 50  0001 C CNN
 F 1 "+3V3" H 1250 4340 50  0000 C CNN
 F 2 "" H 1250 4200 50  0000 C CNN
 F 3 "" H 1250 4200 50  0000 C CNN
@@ -426,10 +426,10 @@ F 3 "" H 1250 4200 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR16
 U 1 1 58E710F2
 P 1400 5100
-F 0 "#PWR022" H 1400 4850 50  0001 C CNN
+F 0 "#PWR16" H 1400 4850 50  0001 C CNN
 F 1 "GND" H 1400 4950 50  0000 C CNN
 F 2 "" H 1400 5100 60  0000 C CNN
 F 3 "" H 1400 5100 60  0000 C CNN
@@ -447,10 +447,10 @@ Wire Wire Line
 Wire Wire Line
 	1400 5100 1600 5100
 $Comp
-L GND #PWR023
+L GND #PWR20
 U 1 1 58E7117D
 P 2350 3400
-F 0 "#PWR023" H 2350 3150 50  0001 C CNN
+F 0 "#PWR20" H 2350 3150 50  0001 C CNN
 F 1 "GND" H 2350 3250 50  0000 C CNN
 F 2 "" H 2350 3400 60  0000 C CNN
 F 3 "" H 2350 3400 60  0000 C CNN
@@ -458,10 +458,10 @@ F 3 "" H 2350 3400 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR024
+L +3V3 #PWR26
 U 1 1 58E71191
 P 2500 3300
-F 0 "#PWR024" H 2500 3150 50  0001 C CNN
+F 0 "#PWR26" H 2500 3150 50  0001 C CNN
 F 1 "+3V3" H 2500 3440 50  0000 C CNN
 F 2 "" H 2500 3300 50  0000 C CNN
 F 3 "" H 2500 3300 50  0000 C CNN
@@ -469,10 +469,10 @@ F 3 "" H 2500 3300 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR21
 U 1 1 58E71197
 P 2350 4300
-F 0 "#PWR025" H 2350 4050 50  0001 C CNN
+F 0 "#PWR21" H 2350 4050 50  0001 C CNN
 F 1 "GND" H 2350 4150 50  0000 C CNN
 F 2 "" H 2350 4300 60  0000 C CNN
 F 3 "" H 2350 4300 60  0000 C CNN
@@ -480,10 +480,10 @@ F 3 "" H 2350 4300 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR026
+L +3V3 #PWR27
 U 1 1 58E7119D
 P 2500 4200
-F 0 "#PWR026" H 2500 4050 50  0001 C CNN
+F 0 "#PWR27" H 2500 4050 50  0001 C CNN
 F 1 "+3V3" H 2500 4340 50  0000 C CNN
 F 2 "" H 2500 4200 50  0000 C CNN
 F 3 "" H 2500 4200 50  0000 C CNN
@@ -491,10 +491,10 @@ F 3 "" H 2500 4200 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR027
+L GND #PWR22
 U 1 1 58E711A3
 P 2350 5100
-F 0 "#PWR027" H 2350 4850 50  0001 C CNN
+F 0 "#PWR22" H 2350 4850 50  0001 C CNN
 F 1 "GND" H 2350 4950 50  0000 C CNN
 F 2 "" H 2350 5100 60  0000 C CNN
 F 3 "" H 2350 5100 60  0000 C CNN
@@ -512,10 +512,10 @@ Wire Wire Line
 Wire Wire Line
 	2100 5100 2350 5100
 $Comp
-L +5V #PWR028
+L +5V #PWR28
 U 1 1 58E75077
 P 2750 5200
-F 0 "#PWR028" H 2750 5050 50  0001 C CNN
+F 0 "#PWR28" H 2750 5050 50  0001 C CNN
 F 1 "+5V" H 2750 5340 50  0000 C CNN
 F 2 "" H 2750 5200 50  0000 C CNN
 F 3 "" H 2750 5200 50  0000 C CNN

gpio.sch

@@ -92,10 +92,10 @@ D7
 Text Label 5700 1950 0    60   ~ 0
 E7
 $Comp
-L GND #PWR11
+L GND #PWR05
 U 1 1 56AC4825
 P 1400 950
-F 0 "#PWR11" H 1400 700 50  0001 C CNN
+F 0 "#PWR05" H 1400 700 50  0001 C CNN
 F 1 "GND" H 1400 800 50  0000 C CNN
 F 2 "" H 1400 950 60  0000 C CNN
 F 3 "" H 1400 950 60  0000 C CNN
@@ -103,10 +103,10 @@ F 3 "" H 1400 950 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR17
+L GND #PWR06
 U 1 1 56AC482D
 P 2350 950
-F 0 "#PWR17" H 2350 700 50  0001 C CNN
+F 0 "#PWR06" H 2350 700 50  0001 C CNN
 F 1 "GND" H 2350 800 50  0000 C CNN
 F 2 "" H 2350 950 60  0000 C CNN
 F 3 "" H 2350 950 60  0000 C CNN
@@ -140,10 +140,10 @@ $EndComp
 Text Label 2150 5200 0    60   ~ 0
 OUT5V
 $Comp
-L +5V #PWR5
+L +5V #PWR07
 U 1 1 56AC484F
 P 950 5200
-F 0 "#PWR5" H 950 5050 50  0001 C CNN
+F 0 "#PWR07" H 950 5050 50  0001 C CNN
 F 1 "+5V" H 950 5340 50  0000 C CNN
 F 2 "" H 950 5200 60  0000 C CNN
 F 3 "" H 950 5200 60  0000 C CNN
@@ -180,10 +180,10 @@ B20
 Text Label 5700 2800 0    60   ~ 0
 B19
 $Comp
-L +3V3 #PWR23
+L +3V3 #PWR08
 U 1 1 58D5FBBC
 P 2500 850
-F 0 "#PWR23" H 2500 700 50  0001 C CNN
+F 0 "#PWR08" H 2500 700 50  0001 C CNN
 F 1 "+3V3" H 2500 990 50  0000 C CNN
 F 2 "" H 2500 850 50  0000 C CNN
 F 3 "" H 2500 850 50  0000 C CNN
@@ -191,10 +191,10 @@ F 3 "" H 2500 850 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR6
+L +3V3 #PWR09
 U 1 1 58D5FBF3
 P 1250 850
-F 0 "#PWR6" H 1250 700 50  0001 C CNN
+F 0 "#PWR09" H 1250 700 50  0001 C CNN
 F 1 "+3V3" H 1250 990 50  0000 C CNN
 F 2 "" H 1250 850 50  0000 C CNN
 F 3 "" H 1250 850 50  0000 C CNN
@@ -224,10 +224,10 @@ F 3 "" H 1850 3300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR12
+L GND #PWR010
 U 1 1 58E6D572
 P 1400 1850
-F 0 "#PWR12" H 1400 1600 50  0001 C CNN
+F 0 "#PWR010" H 1400 1600 50  0001 C CNN
 F 1 "GND" H 1400 1700 50  0000 C CNN
 F 2 "" H 1400 1850 60  0000 C CNN
 F 3 "" H 1400 1850 60  0000 C CNN
@@ -235,10 +235,10 @@ F 3 "" H 1400 1850 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR7
+L +3V3 #PWR011
 U 1 1 58E6D578
 P 1250 1750
-F 0 "#PWR7" H 1250 1600 50  0001 C CNN
+F 0 "#PWR011" H 1250 1600 50  0001 C CNN
 F 1 "+3V3" H 1250 1890 50  0000 C CNN
 F 2 "" H 1250 1750 50  0000 C CNN
 F 3 "" H 1250 1750 50  0000 C CNN
@@ -246,10 +246,10 @@ F 3 "" H 1250 1750 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR18
+L GND #PWR012
 U 1 1 58E6D59D
 P 2350 1850
-F 0 "#PWR18" H 2350 1600 50  0001 C CNN
+F 0 "#PWR012" H 2350 1600 50  0001 C CNN
 F 1 "GND" H 2350 1700 50  0000 C CNN
 F 2 "" H 2350 1850 60  0000 C CNN
 F 3 "" H 2350 1850 60  0000 C CNN
@@ -257,10 +257,10 @@ F 3 "" H 2350 1850 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR24
+L +3V3 #PWR013
 U 1 1 58E6D5A3
 P 2500 1750
-F 0 "#PWR24" H 2500 1600 50  0001 C CNN
+F 0 "#PWR013" H 2500 1600 50  0001 C CNN
 F 1 "+3V3" H 2500 1890 50  0000 C CNN
 F 2 "" H 2500 1750 50  0000 C CNN
 F 3 "" H 2500 1750 50  0000 C CNN
@@ -268,10 +268,10 @@ F 3 "" H 2500 1750 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR13
+L GND #PWR014
 U 1 1 58E6E4EC
 P 1400 2650
-F 0 "#PWR13" H 1400 2400 50  0001 C CNN
+F 0 "#PWR014" H 1400 2400 50  0001 C CNN
 F 1 "GND" H 1400 2500 50  0000 C CNN
 F 2 "" H 1400 2650 60  0000 C CNN
 F 3 "" H 1400 2650 60  0000 C CNN
@@ -279,10 +279,10 @@ F 3 "" H 1400 2650 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR8
+L +3V3 #PWR015
 U 1 1 58E6E4F2
 P 1250 2750
-F 0 "#PWR8" H 1250 2600 50  0001 C CNN
+F 0 "#PWR015" H 1250 2600 50  0001 C CNN
 F 1 "+3V3" H 1250 2890 50  0000 C CNN
 F 2 "" H 1250 2750 50  0000 C CNN
 F 3 "" H 1250 2750 50  0000 C CNN
@@ -290,10 +290,10 @@ F 3 "" H 1250 2750 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR19
+L GND #PWR016
 U 1 1 58E6E536
 P 2350 2650
-F 0 "#PWR19" H 2350 2400 50  0001 C CNN
+F 0 "#PWR016" H 2350 2400 50  0001 C CNN
 F 1 "GND" H 2350 2500 50  0000 C CNN
 F 2 "" H 2350 2650 60  0000 C CNN
 F 3 "" H 2350 2650 60  0000 C CNN
@@ -301,10 +301,10 @@ F 3 "" H 2350 2650 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR25
+L +3V3 #PWR017
 U 1 1 58E6E53C
 P 2500 2750
-F 0 "#PWR25" H 2500 2600 50  0001 C CNN
+F 0 "#PWR017" H 2500 2600 50  0001 C CNN
 F 1 "+3V3" H 2500 2890 50  0000 C CNN
 F 2 "" H 2500 2750 50  0000 C CNN
 F 3 "" H 2500 2750 50  0000 C CNN
@@ -382,10 +382,10 @@ Wire Wire Line
 Wire Wire Line
 	1400 2650 1600 2650
 $Comp
-L GND #PWR14
+L GND #PWR018
 U 1 1 58E710CC
 P 1400 3400
-F 0 "#PWR14" H 1400 3150 50  0001 C CNN
+F 0 "#PWR018" H 1400 3150 50  0001 C CNN
 F 1 "GND" H 1400 3250 50  0000 C CNN
 F 2 "" H 1400 3400 60  0000 C CNN
 F 3 "" H 1400 3400 60  0000 C CNN
@@ -393,10 +393,10 @@ F 3 "" H 1400 3400 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR9
+L +3V3 #PWR019
 U 1 1 58E710E0
 P 1250 3300
-F 0 "#PWR9" H 1250 3150 50  0001 C CNN
+F 0 "#PWR019" H 1250 3150 50  0001 C CNN
 F 1 "+3V3" H 1250 3440 50  0000 C CNN
 F 2 "" H 1250 3300 50  0000 C CNN
 F 3 "" H 1250 3300 50  0000 C CNN
@@ -404,10 +404,10 @@ F 3 "" H 1250 3300 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR15
+L GND #PWR020
 U 1 1 58E710E6
 P 1400 4300
-F 0 "#PWR15" H 1400 4050 50  0001 C CNN
+F 0 "#PWR020" H 1400 4050 50  0001 C CNN
 F 1 "GND" H 1400 4150 50  0000 C CNN
 F 2 "" H 1400 4300 60  0000 C CNN
 F 3 "" H 1400 4300 60  0000 C CNN
@@ -415,10 +415,10 @@ F 3 "" H 1400 4300 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR10
+L +3V3 #PWR021
 U 1 1 58E710EC
 P 1250 4200
-F 0 "#PWR10" H 1250 4050 50  0001 C CNN
+F 0 "#PWR021" H 1250 4050 50  0001 C CNN
 F 1 "+3V3" H 1250 4340 50  0000 C CNN
 F 2 "" H 1250 4200 50  0000 C CNN
 F 3 "" H 1250 4200 50  0000 C CNN
@@ -426,10 +426,10 @@ F 3 "" H 1250 4200 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR16
+L GND #PWR022
 U 1 1 58E710F2
 P 1400 5100
-F 0 "#PWR16" H 1400 4850 50  0001 C CNN
+F 0 "#PWR022" H 1400 4850 50  0001 C CNN
 F 1 "GND" H 1400 4950 50  0000 C CNN
 F 2 "" H 1400 5100 60  0000 C CNN
 F 3 "" H 1400 5100 60  0000 C CNN
@@ -447,10 +447,10 @@ Wire Wire Line
 Wire Wire Line
 	1400 5100 1600 5100
 $Comp
-L GND #PWR20
+L GND #PWR023
 U 1 1 58E7117D
 P 2350 3400
-F 0 "#PWR20" H 2350 3150 50  0001 C CNN
+F 0 "#PWR023" H 2350 3150 50  0001 C CNN
 F 1 "GND" H 2350 3250 50  0000 C CNN
 F 2 "" H 2350 3400 60  0000 C CNN
 F 3 "" H 2350 3400 60  0000 C CNN
@@ -458,10 +458,10 @@ F 3 "" H 2350 3400 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR26
+L +3V3 #PWR024
 U 1 1 58E71191
 P 2500 3300
-F 0 "#PWR26" H 2500 3150 50  0001 C CNN
+F 0 "#PWR024" H 2500 3150 50  0001 C CNN
 F 1 "+3V3" H 2500 3440 50  0000 C CNN
 F 2 "" H 2500 3300 50  0000 C CNN
 F 3 "" H 2500 3300 50  0000 C CNN
@@ -469,10 +469,10 @@ F 3 "" H 2500 3300 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR21
+L GND #PWR025
 U 1 1 58E71197
 P 2350 4300
-F 0 "#PWR21" H 2350 4050 50  0001 C CNN
+F 0 "#PWR025" H 2350 4050 50  0001 C CNN
 F 1 "GND" H 2350 4150 50  0000 C CNN
 F 2 "" H 2350 4300 60  0000 C CNN
 F 3 "" H 2350 4300 60  0000 C CNN
@@ -480,10 +480,10 @@ F 3 "" H 2350 4300 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR27
+L +3V3 #PWR026
 U 1 1 58E7119D
 P 2500 4200
-F 0 "#PWR27" H 2500 4050 50  0001 C CNN
+F 0 "#PWR026" H 2500 4050 50  0001 C CNN
 F 1 "+3V3" H 2500 4340 50  0000 C CNN
 F 2 "" H 2500 4200 50  0000 C CNN
 F 3 "" H 2500 4200 50  0000 C CNN
@@ -491,10 +491,10 @@ F 3 "" H 2500 4200 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR22
+L GND #PWR027
 U 1 1 58E711A3
 P 2350 5100
-F 0 "#PWR22" H 2350 4850 50  0001 C CNN
+F 0 "#PWR027" H 2350 4850 50  0001 C CNN
 F 1 "GND" H 2350 4950 50  0000 C CNN
 F 2 "" H 2350 5100 60  0000 C CNN
 F 3 "" H 2350 5100 60  0000 C CNN
@@ -512,10 +512,10 @@ Wire Wire Line
 Wire Wire Line
 	2100 5100 2350 5100
 $Comp
-L +5V #PWR28
+L +5V #PWR028
 U 1 1 58E75077
 P 2750 5200
-F 0 "#PWR28" H 2750 5050 50  0001 C CNN
+F 0 "#PWR028" H 2750 5050 50  0001 C CNN
 F 1 "+5V" H 2750 5340 50  0000 C CNN
 F 2 "" H 2750 5200 50  0000 C CNN
 F 3 "" H 2750 5200 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
@@ -86,10 +86,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
@@ -97,10 +97,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
@@ -108,10 +108,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
@@ -174,10 +174,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
@@ -207,10 +207,10 @@ F 3 "" H 10600 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR034
+L +3V3 #PWR42
 U 1 1 58D5CFDD
 P 4750 900
-F 0 "#PWR034" H 4750 750 50  0001 C CNN
+F 0 "#PWR42" H 4750 750 50  0001 C CNN
 F 1 "+3V3" H 4750 1040 50  0000 C CNN
 F 2 "" H 4750 900 50  0000 C CNN
 F 3 "" H 4750 900 50  0000 C CNN
@@ -688,10 +688,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
@@ -699,10 +699,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
@@ -710,10 +710,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
@@ -776,10 +776,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
@@ -855,10 +855,10 @@ Wire Wire Line
 Wire Wire Line
 	7900 5850 7400 5850
 $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
@@ -866,10 +866,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
@@ -877,10 +877,10 @@ F 3 "" H 10600 3000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V2 #PWR041
+L +1V2 #PWR34
 U 1 1 58D63D96
 P 2150 900
-F 0 "#PWR041" H 2150 750 50  0001 C CNN
+F 0 "#PWR34" H 2150 750 50  0001 C CNN
 F 1 "+1V2" H 2150 1040 50  0000 C CNN
 F 2 "" H 2150 900 50  0000 C CNN
 F 3 "" H 2150 900 50  0000 C CNN
@@ -903,10 +903,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
@@ -914,10 +914,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
@@ -925,10 +925,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
@@ -991,10 +991,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
@@ -1083,10 +1083,10 @@ $EndComp
 Wire Wire Line
 	4150 4450 4150 4300
 $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
@@ -1124,10 +1124,10 @@ Wire Wire Line
 Wire Wire Line
 	4650 1000 4650 1100
 $Comp
-L +2V5 #PWR047
+L +2V5 #PWR40
 U 1 1 58D68750
 P 4250 900
-F 0 "#PWR047" H 4250 750 50  0001 C CNN
+F 0 "#PWR40" H 4250 750 50  0001 C CNN
 F 1 "+2V5" H 4250 1040 50  0000 C CNN
 F 2 "" H 4250 900 50  0000 C CNN
 F 3 "" H 4250 900 50  0000 C CNN
@@ -1137,10 +1137,10 @@ $EndComp
 Wire Wire Line
 	6250 1000 7150 1000
 $Comp
-L +3V3 #PWR048
+L +3V3 #PWR43
 U 1 1 58D69259
 P 6350 900
-F 0 "#PWR048" H 6350 750 50  0001 C CNN
+F 0 "#PWR43" H 6350 750 50  0001 C CNN
 F 1 "+3V3" H 6350 1040 50  0000 C CNN
 F 2 "" H 6350 900 50  0000 C CNN
 F 3 "" H 6350 900 50  0000 C CNN
@@ -1159,10 +1159,10 @@ F 3 "" H 2100 3550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR049
+L GND #PWR33
 U 1 1 58D7085C
 P 2100 4050
-F 0 "#PWR049" H 2100 3800 50  0001 C CNN
+F 0 "#PWR33" 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
@@ -1199,10 +1199,10 @@ Wire Wire Line
 Wire Wire Line
 	2800 3750 2800 3800
 $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
@@ -1218,10 +1218,10 @@ Wire Wire Line
 Wire Wire Line
 	2100 3150 2100 3050
 $Comp
-L +2V5 #PWR051
+L +2V5 #PWR32
 U 1 1 58D73C82
 P 2100 3050
-F 0 "#PWR051" H 2100 2900 50  0001 C CNN
+F 0 "#PWR32" H 2100 2900 50  0001 C CNN
 F 1 "+2V5" 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
@@ -1275,10 +1275,10 @@ Connection ~ 4150 4850
 Wire Wire Line
 	4150 5650 4150 6100
 $Comp
-L GND #PWR052
+L GND #PWR39
 U 1 1 58D7C223
 P 4150 6100
-F 0 "#PWR052" H 4150 5850 50  0001 C CNN
+F 0 "#PWR39" 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
@@ -1310,10 +1310,10 @@ F 3 "" H 4700 4150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR053
+L +3V3 #PWR41
 U 1 1 58D7CCF7
 P 4700 3900
-F 0 "#PWR053" H 4700 3750 50  0001 C CNN
+F 0 "#PWR41" 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
@@ -1504,10 +1504,10 @@ F 3 "" H 3900 4150 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR054
+L GND #PWR37
 U 1 1 58DA2E46
 P 3900 4300
-F 0 "#PWR054" H 3900 4050 50  0001 C CNN
+F 0 "#PWR37" 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
@@ -1515,10 +1515,10 @@ F 3 "" H 3900 4300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR055
+L +5V #PWR38
 U 1 1 58D67C25
 P 4150 3300
-F 0 "#PWR055" H 4150 3150 50  0001 C CNN
+F 0 "#PWR38" 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
@@ -1548,10 +1548,10 @@ F 3 "" H 3250 5300 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR056
+L +3V3 #PWR36
 U 1 1 58DA569C
 P 3250 5150
-F 0 "#PWR056" 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
@@ -1595,10 +1595,10 @@ Wire Wire Line
 Text Label 750  6850 0    60   ~ 0
 WAKEUPn
 $Comp
-L +5V #PWR057
+L +5V #PWR30
 U 1 1 58E82A7E
 P 1500 6500
-F 0 "#PWR057" 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
@@ -1630,10 +1630,10 @@ F 3 "" H 1500 5950 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR058
+L GND #PWR31
 U 1 1 58E840F5
 P 1500 7400
-F 0 "#PWR058" 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

power.sch

@@ -53,10 +53,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR29
+L GND #PWR029
 U 1 1 58D54769
 P 1100 2650
-F 0 "#PWR29" H 1100 2400 50  0001 C CNN
+F 0 "#PWR029" 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
@@ -86,10 +86,10 @@ F 3 "" H 8500 3350 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR50
+L GND #PWR030
 U 1 1 58D58A0B
 P 8500 3850
-F 0 "#PWR50" H 8500 3600 50  0001 C CNN
+F 0 "#PWR030" 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
@@ -97,10 +97,10 @@ F 3 "" H 8500 3850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR44
+L +5V #PWR031
 U 1 1 58D58F93
 P 7850 3200
-F 0 "#PWR44" H 7850 3050 50  0001 C CNN
+F 0 "#PWR031" 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
@@ -108,10 +108,10 @@ F 3 "" H 7850 3200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR45
+L GND #PWR032
 U 1 1 58D5989A
 P 7850 3850
-F 0 "#PWR45" H 7850 3600 50  0001 C CNN
+F 0 "#PWR032" 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
@@ -174,10 +174,10 @@ F 3 "" H 10050 3450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR53
+L GND #PWR033
 U 1 1 58D5AE5E
 P 10250 3550
-F 0 "#PWR53" H 10250 3300 50  0001 C CNN
+F 0 "#PWR033" 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
@@ -207,10 +207,10 @@ F 3 "" H 10600 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR42
+L +3V3 #PWR034
 U 1 1 58D5CFDD
 P 4750 900
-F 0 "#PWR42" H 4750 750 50  0001 C CNN
+F 0 "#PWR034" H 4750 750 50  0001 C CNN
 F 1 "+3V3" H 4750 1040 50  0000 C CNN
 F 2 "" H 4750 900 50  0000 C CNN
 F 3 "" H 4750 900 50  0000 C CNN
@@ -688,10 +688,10 @@ F 3 "" H 8500 5750 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR52
+L GND #PWR035
 U 1 1 58D6294C
 P 8500 6250
-F 0 "#PWR52" H 8500 6000 50  0001 C CNN
+F 0 "#PWR035" 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
@@ -699,10 +699,10 @@ F 3 "" H 8500 6250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR48
+L +5V #PWR036
 U 1 1 58D62952
 P 7850 5600
-F 0 "#PWR48" H 7850 5450 50  0001 C CNN
+F 0 "#PWR036" 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
@@ -710,10 +710,10 @@ F 3 "" H 7850 5600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR49
+L GND #PWR037
 U 1 1 58D62958
 P 7850 6250
-F 0 "#PWR49" H 7850 6000 50  0001 C CNN
+F 0 "#PWR037" 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
@@ -776,10 +776,10 @@ F 3 "" H 10050 5850 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR55
+L GND #PWR038
 U 1 1 58D62982
 P 10250 5950
-F 0 "#PWR55" H 10250 5700 50  0001 C CNN
+F 0 "#PWR038" 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
@@ -855,10 +855,10 @@ Wire Wire Line
 Wire Wire Line
 	7900 5850 7400 5850
 $Comp
-L +3V3 #PWR58
+L +3V3 #PWR039
 U 1 1 58D62CE2
 P 10600 5400
-F 0 "#PWR58" H 10600 5250 50  0001 C CNN
+F 0 "#PWR039" 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
@@ -866,10 +866,10 @@ F 3 "" H 10600 5400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V2 #PWR56
+L +1V2 #PWR040
 U 1 1 58D63C77
 P 10600 3000
-F 0 "#PWR56" H 10600 2850 50  0001 C CNN
+F 0 "#PWR040" 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
@@ -877,10 +877,10 @@ F 3 "" H 10600 3000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V2 #PWR34
+L +1V2 #PWR041
 U 1 1 58D63D96
 P 2150 900
-F 0 "#PWR34" H 2150 750 50  0001 C CNN
+F 0 "#PWR041" H 2150 750 50  0001 C CNN
 F 1 "+1V2" H 2150 1040 50  0000 C CNN
 F 2 "" H 2150 900 50  0000 C CNN
 F 3 "" H 2150 900 50  0000 C CNN
@@ -903,10 +903,10 @@ F 3 "" H 8500 4550 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR51
+L GND #PWR042
 U 1 1 58D67BC0
 P 8500 5050
-F 0 "#PWR51" H 8500 4800 50  0001 C CNN
+F 0 "#PWR042" 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
@@ -914,10 +914,10 @@ F 3 "" H 8500 5050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR46
+L +5V #PWR043
 U 1 1 58D67BC6
 P 7850 4400
-F 0 "#PWR46" H 7850 4250 50  0001 C CNN
+F 0 "#PWR043" 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
@@ -925,10 +925,10 @@ F 3 "" H 7850 4400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR47
+L GND #PWR044
 U 1 1 58D67BCC
 P 7850 5050
-F 0 "#PWR47" H 7850 4800 50  0001 C CNN
+F 0 "#PWR044" 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
@@ -991,10 +991,10 @@ F 3 "" H 10050 4650 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR54
+L GND #PWR045
 U 1 1 58D67BF0
 P 10250 4750
-F 0 "#PWR54" H 10250 4500 50  0001 C CNN
+F 0 "#PWR045" 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
@@ -1083,10 +1083,10 @@ $EndComp
 Wire Wire Line
 	4150 4450 4150 4300
 $Comp
-L +2V5 #PWR57
+L +2V5 #PWR046
 U 1 1 58D681D4
 P 10600 4200
-F 0 "#PWR57" H 10600 4050 50  0001 C CNN
+F 0 "#PWR046" 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
@@ -1124,10 +1124,10 @@ Wire Wire Line
 Wire Wire Line
 	4650 1000 4650 1100
 $Comp
-L +2V5 #PWR40
+L +2V5 #PWR047
 U 1 1 58D68750
 P 4250 900
-F 0 "#PWR40" H 4250 750 50  0001 C CNN
+F 0 "#PWR047" H 4250 750 50  0001 C CNN
 F 1 "+2V5" H 4250 1040 50  0000 C CNN
 F 2 "" H 4250 900 50  0000 C CNN
 F 3 "" H 4250 900 50  0000 C CNN
@@ -1137,10 +1137,10 @@ $EndComp
 Wire Wire Line
 	6250 1000 7150 1000
 $Comp
-L +3V3 #PWR43
+L +3V3 #PWR048
 U 1 1 58D69259
 P 6350 900
-F 0 "#PWR43" H 6350 750 50  0001 C CNN
+F 0 "#PWR048" H 6350 750 50  0001 C CNN
 F 1 "+3V3" H 6350 1040 50  0000 C CNN
 F 2 "" H 6350 900 50  0000 C CNN
 F 3 "" H 6350 900 50  0000 C CNN
@@ -1159,10 +1159,10 @@ F 3 "" H 2100 3550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR33
+L GND #PWR049
 U 1 1 58D7085C
 P 2100 4050
-F 0 "#PWR33" H 2100 3800 50  0001 C CNN
+F 0 "#PWR049" 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
@@ -1199,10 +1199,10 @@ Wire Wire Line
 Wire Wire Line
 	2800 3750 2800 3800
 $Comp
-L GND #PWR35
+L GND #PWR050
 U 1 1 58D72406
 P 2800 4150
-F 0 "#PWR35" H 2800 3900 50  0001 C CNN
+F 0 "#PWR050" 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
@@ -1218,10 +1218,10 @@ Wire Wire Line
 Wire Wire Line
 	2100 3150 2100 3050
 $Comp
-L +2V5 #PWR32
+L +2V5 #PWR051
 U 1 1 58D73C82
 P 2100 3050
-F 0 "#PWR32" H 2100 2900 50  0001 C CNN
+F 0 "#PWR051" H 2100 2900 50  0001 C CNN
 F 1 "+2V5" 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
@@ -1275,10 +1275,10 @@ Connection ~ 4150 4850
 Wire Wire Line
 	4150 5650 4150 6100
 $Comp
-L GND #PWR39
+L GND #PWR052
 U 1 1 58D7C223
 P 4150 6100
-F 0 "#PWR39" H 4150 5850 50  0001 C CNN
+F 0 "#PWR052" 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
@@ -1310,10 +1310,10 @@ F 3 "" H 4700 4150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR41
+L +3V3 #PWR053
 U 1 1 58D7CCF7
 P 4700 3900
-F 0 "#PWR41" H 4700 3750 50  0001 C CNN
+F 0 "#PWR053" 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
@@ -1504,10 +1504,10 @@ F 3 "" H 3900 4150 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR37
+L GND #PWR054
 U 1 1 58DA2E46
 P 3900 4300
-F 0 "#PWR37" H 3900 4050 50  0001 C CNN
+F 0 "#PWR054" 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
@@ -1515,10 +1515,10 @@ F 3 "" H 3900 4300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR38
+L +5V #PWR055
 U 1 1 58D67C25
 P 4150 3300
-F 0 "#PWR38" H 4150 3150 50  0001 C CNN
+F 0 "#PWR055" 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
@@ -1548,10 +1548,10 @@ F 3 "" H 3250 5300 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR36
+L +3V3 #PWR056
 U 1 1 58DA569C
 P 3250 5150
-F 0 "#PWR36" H 3250 5000 50  0001 C CNN
+F 0 "#PWR056" 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
@@ -1595,10 +1595,10 @@ Wire Wire Line
 Text Label 750  6850 0    60   ~ 0
 WAKEUPn
 $Comp
-L +5V #PWR30
+L +5V #PWR057
 U 1 1 58E82A7E
 P 1500 6500
-F 0 "#PWR30" H 1500 6350 50  0001 C CNN
+F 0 "#PWR057" 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
@@ -1630,10 +1630,10 @@ F 3 "" H 1500 5950 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR31
+L GND #PWR058
 U 1 1 58E840F5
 P 1500 7400
-F 0 "#PWR31" H 1500 7150 50  0001 C CNN
+F 0 "#PWR058" 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

ram.bak

@@ -85,10 +85,10 @@ Wire Wire Line
 	5250 2000 5250 2200
 Connection ~ 5250 2100
 $Comp
-L +3V3 #PWR085
+L +3V3 #PWR87
 U 1 1 58D928FF
 P 5250 2000
-F 0 "#PWR085" H 5250 1850 50  0001 C CNN
+F 0 "#PWR87" 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 #PWR086
+L +3V3 #PWR89
 U 1 1 58D92915
 P 5550 2000
-F 0 "#PWR086" H 5550 1850 50  0001 C CNN
+F 0 "#PWR89" 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 #PWR087
+L GND #PWR88
 U 1 1 58D929C8
 P 5250 5000
-F 0 "#PWR087" H 5250 4750 50  0001 C CNN
+F 0 "#PWR88" 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 #PWR088
+L GND #PWR90
 U 1 1 58D929DE
 P 5550 5000
-F 0 "#PWR088" H 5550 4750 50  0001 C CNN
+F 0 "#PWR90" 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

ram.sch

@@ -85,10 +85,10 @@ Wire Wire Line
 	5250 2000 5250 2200
 Connection ~ 5250 2100
 $Comp
-L +3V3 #PWR85
+L +3V3 #PWR087
 U 1 1 58D928FF
 P 5250 2000
-F 0 "#PWR85" H 5250 1850 50  0001 C CNN
+F 0 "#PWR087" 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 #PWR87
+L +3V3 #PWR088
 U 1 1 58D92915
 P 5550 2000
-F 0 "#PWR87" H 5550 1850 50  0001 C CNN
+F 0 "#PWR088" 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 #PWR86
+L GND #PWR089
 U 1 1 58D929C8
 P 5250 5000
-F 0 "#PWR86" H 5250 4750 50  0001 C CNN
+F 0 "#PWR089" 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 #PWR88
+L GND #PWR090
 U 1 1 58D929DE
 P 5550 5000
-F 0 "#PWR88" H 5550 4750 50  0001 C CNN
+F 0 "#PWR090" 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

sdcard.bak

@@ -82,10 +82,10 @@ Wire Wire Line
 Wire Wire Line
 	1850 6450 2400 6450
 $Comp
-L GND #PWR090
+L GND #PWR93
 U 1 1 58DA7C6F
 P 1850 6150
-F 0 "#PWR090" H 1850 5900 50  0001 C CNN
+F 0 "#PWR93" H 1850 5900 50  0001 C CNN
 F 1 "GND" H 1850 6000 50  0000 C CNN
 F 2 "" H 1850 6150 50  0000 C CNN
 F 3 "" H 1850 6150 50  0000 C CNN
@@ -93,10 +93,10 @@ F 3 "" H 1850 6150 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR091
+L GND #PWR94
 U 1 1 58DA7C70
 P 1850 6450
-F 0 "#PWR091" H 1850 6200 50  0001 C CNN
+F 0 "#PWR94" H 1850 6200 50  0001 C CNN
 F 1 "GND" H 1850 6300 50  0000 C CNN
 F 2 "" H 1850 6450 50  0000 C CNN
 F 3 "" H 1850 6450 50  0000 C CNN
@@ -112,10 +112,10 @@ Wire Wire Line
 Text Label 4250 6150 0    60   ~ 0
 SD_WP
 $Comp
-L GND #PWR092
+L GND #PWR95
 U 1 1 58DA7C71
 P 4300 6550
-F 0 "#PWR092" H 4300 6300 50  0001 C CNN
+F 0 "#PWR95" H 4300 6300 50  0001 C CNN
 F 1 "GND" H 4300 6400 50  0000 C CNN
 F 2 "" H 4300 6550 50  0000 C CNN
 F 3 "" H 4300 6550 50  0000 C CNN
@@ -130,10 +130,10 @@ Wire Wire Line
 	4200 6450 4300 6450
 Connection ~ 4300 6450
 $Comp
-L +3V3 #PWR093
+L +3V3 #PWR92
 U 1 1 58DA7C72
 P 1700 6250
-F 0 "#PWR093" H 1700 6100 50  0001 C CNN
+F 0 "#PWR92" H 1700 6100 50  0001 C CNN
 F 1 "+3V3" H 1700 6390 50  0000 C CNN
 F 2 "" H 1700 6250 50  0000 C CNN
 F 3 "" H 1700 6250 50  0000 C CNN

sdcard.sch

@@ -82,10 +82,10 @@ Wire Wire Line
 Wire Wire Line
 	1850 6450 2400 6450
 $Comp
-L GND #PWR91
+L GND #PWR092
 U 1 1 58DA7C6F
 P 1850 6150
-F 0 "#PWR91" H 1850 5900 50  0001 C CNN
+F 0 "#PWR092" H 1850 5900 50  0001 C CNN
 F 1 "GND" H 1850 6000 50  0000 C CNN
 F 2 "" H 1850 6150 50  0000 C CNN
 F 3 "" H 1850 6150 50  0000 C CNN
@@ -93,10 +93,10 @@ F 3 "" H 1850 6150 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR92
+L GND #PWR093
 U 1 1 58DA7C70
 P 1850 6450
-F 0 "#PWR92" H 1850 6200 50  0001 C CNN
+F 0 "#PWR093" H 1850 6200 50  0001 C CNN
 F 1 "GND" H 1850 6300 50  0000 C CNN
 F 2 "" H 1850 6450 50  0000 C CNN
 F 3 "" H 1850 6450 50  0000 C CNN
@@ -112,10 +112,10 @@ Wire Wire Line
 Text Label 4250 6150 0    60   ~ 0
 SD_WP
 $Comp
-L GND #PWR93
+L GND #PWR094
 U 1 1 58DA7C71
 P 4300 6550
-F 0 "#PWR93" H 4300 6300 50  0001 C CNN
+F 0 "#PWR094" H 4300 6300 50  0001 C CNN
 F 1 "GND" H 4300 6400 50  0000 C CNN
 F 2 "" H 4300 6550 50  0000 C CNN
 F 3 "" H 4300 6550 50  0000 C CNN
@@ -130,10 +130,10 @@ Wire Wire Line
 	4200 6450 4300 6450
 Connection ~ 4300 6450
 $Comp
-L +3V3 #PWR90
+L +3V3 #PWR095
 U 1 1 58DA7C72
 P 1700 6250
-F 0 "#PWR90" H 1700 6100 50  0001 C CNN
+F 0 "#PWR095" H 1700 6100 50  0001 C CNN
 F 1 "+3V3" H 1700 6390 50  0000 C CNN
 F 2 "" H 1700 6250 50  0000 C CNN
 F 3 "" H 1700 6250 50  0000 C CNN

ulx3s-cache.lib

@@ -319,6 +319,33 @@ X 4 4 150 0 50 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Crystal_GND24
+#
+DEF Crystal_GND24 Y 0 40 Y N 1 F N
+F0 "Y" 125 200 50 H V L CNN
+F1 "Crystal_GND24" 125 125 50 H V L CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Crystal*
+$ENDFPLIST
+DRAW
+S -45 100 45 -100 0 1 12 N
+P 2 0 1 0 -100 0 -80 0 N
+P 2 0 1 20 -80 -50 -80 50 N
+P 2 0 1 0 0 -150 0 -140 N
+P 2 0 1 0 0 140 0 150 N
+P 2 0 1 20 80 -50 80 50 N
+P 2 0 1 0 80 0 100 0 N
+P 4 0 1 0 -100 -90 -100 -140 100 -140 100 -90 N
+P 4 0 1 0 -100 90 -100 140 100 140 100 90 N
+X 1 1 -150 0 50 R 50 50 1 1 P
+X 2 2 0 200 50 D 50 50 1 1 P
+X 3 3 150 0 50 L 50 50 1 1 P
+X 4 4 0 -200 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # D
 #
 DEF D D 0 40 N N 1 F N

ulx3s.bak

@@ -159,10 +159,10 @@ F 3 "" H 4800 6350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR01
+L GND #PWR1
 U 1 1 58E6BC0E
 P 3150 6550
-F 0 "#PWR01" H 3150 6300 50  0001 C CNN
+F 0 "#PWR1" 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 #PWR2
 U 1 1 58E6BC2E
 P 3700 6550
-F 0 "#PWR02" H 3700 6300 50  0001 C CNN
+F 0 "#PWR2" H 3700 6300 50  0001 C CNN
 F 1 "GND" H 3700 6400 50  0000 C CNN
 F 2 "" H 3700 6550 50  0000 C CNN
 F 3 "" H 3700 6550 50  0000 C CNN
@@ -181,10 +181,10 @@ F 3 "" H 3700 6550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR03
+L GND #PWR3
 U 1 1 58E6BC56
 P 4250 6550
-F 0 "#PWR03" H 4250 6300 50  0001 C CNN
+F 0 "#PWR3" 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
@@ -192,10 +192,10 @@ F 3 "" H 4250 6550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR04
+L GND #PWR4
 U 1 1 58E6BC72
 P 4800 6550
-F 0 "#PWR04" H 4800 6300 50  0001 C CNN
+F 0 "#PWR4" H 4800 6300 50  0001 C CNN
 F 1 "GND" H 4800 6400 50  0000 C CNN
 F 2 "" H 4800 6550 50  0000 C CNN
 F 3 "" H 4800 6550 50  0000 C CNN

ulx3s.kicad_pcb

@@ -1,15 +1,15 @@
 (kicad_pcb (version 4) (host pcbnew 4.0.5+dfsg1-4)
 
   (general
-    (links 557)
+    (links 561)
-    (no_connects 557)
+    (no_connects 561)
-    (area 76.090001 43.48 193.160001 118.805339)
+    (area 99.029999 61.269999 178.070001 112.370001)
     (thickness 1.6)
     (drawings 7)
     (tracks 0)
     (zones 0)
-    (modules 111)
+    (modules 112)
-    (nets 205)
+    (nets 206)
   )
 
   (page A4)
@@ -298,6 +298,7 @@
   (net 202 FTDI_nRI)
   (net 203 FTDI_nDCD)
   (net 204 WIFI_GPIO15)
+  (net 205 /gpdi/CLK_25MHz)
 
   (net_class Default "This is the default net class."
     (clearance 0.2)
@@ -313,6 +314,7 @@
     (add_net /analog/AUDIO_L)
     (add_net /analog/AUDIO_R)
     (add_net /blinkey/BTNPU)
+    (add_net /gpdi/CLK_25MHz)
     (add_net /gpdi/VREF2)
     (add_net /gpio/IN5V)
     (add_net /gpio/OUT5V)
@@ -522,7 +524,7 @@
   )
 
   (module Keystone_3000_1x12mm-CoinCell:Keystone_3000_1x12mm-CoinCell (layer B.Cu) (tedit 58D7D5B5) (tstamp 58D7ADD9)
-    (at 135.73 98.25)
+    (at 136.645 99.52)
     (descr http://www.keyelco.com/product-pdf.cfm?p=777)
     (tags "Keystone type 3000 coin cell retainer")
     (path /58D51CAD/58D72202)
@@ -2711,15 +2713,15 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8ED82)
-    (at 124.58 91.9 180)
+    (at 118.23 88.725 90)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D6547C/58D6605D)
     (attr smd)
-    (fp_text reference R7 (at 0 1.9 180) (layer B.SilkS)
+    (fp_text reference R7 (at 0 1.9 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 220 (at 0 -1.9 180) (layer B.Fab)
+    (fp_text value 220 (at 0 -1.9 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -2732,9 +2734,9 @@
     (fp_line (start 2 0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
     (fp_line (start 0.5 -0.675) (end -0.5 -0.675) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 0.675) (end 0.5 0.675) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
-    (pad 2 smd rect (at 1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 2 smd rect (at 1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 48 /blinkey/BTNPU))
     (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
       (at (xyz 0 0 0))
@@ -3551,7 +3553,7 @@
     (pad F1 smd circle (at -7.6 -3.6) (size 0.35 0.35) (layers F.Cu F.Paste F.Mask)
       (solder_mask_margin 0.04))
     (pad F2 smd circle (at -6.8 -3.6) (size 0.35 0.35) (layers F.Cu F.Paste F.Mask)
-      (solder_mask_margin 0.04))
+      (net 205 /gpdi/CLK_25MHz) (solder_mask_margin 0.04))
     (pad F3 smd circle (at -6 -3.6) (size 0.35 0.35) (layers F.Cu F.Paste F.Mask)
       (solder_mask_margin 0.04))
     (pad F4 smd circle (at -5.2 -3.6) (size 0.35 0.35) (layers F.Cu F.Paste F.Mask)
@@ -4202,15 +4204,15 @@
   )
 
   (module Housings_SOIC:SOIC-8_3.9x4.9mm_Pitch1.27mm (layer B.Cu) (tedit 54130A77) (tstamp 58D911E2)
-    (at 118.23 77.93 270)
+    (at 113.15 77.295)
     (descr "8-Lead Plastic Small Outline (SN) - Narrow, 3.90 mm Body [SOIC] (see Microchip Packaging Specification 00000049BS.pdf)")
     (tags "SOIC 1.27")
     (path /58D913EC/58D913F5)
     (attr smd)
-    (fp_text reference U10 (at 0 3.5 270) (layer B.SilkS)
+    (fp_text reference U10 (at 0 3.5) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value S25FL164K0XMFI011 (at 0 -3.5 270) (layer B.Fab)
+    (fp_text value S25FL164K0XMFI011 (at 0 -3.5) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.95 2.45) (end 1.95 2.45) (layer B.Fab) (width 0.15))
@@ -4229,21 +4231,21 @@
     (fp_line (start -2.075 2.575) (end 2.075 2.575) (layer B.SilkS) (width 0.15))
     (fp_line (start -2.075 -2.575) (end 2.075 -2.575) (layer B.SilkS) (width 0.15))
     (fp_line (start -2.075 2.525) (end -3.475 2.525) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -2.7 1.905 270) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -2.7 1.905) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
       (net 177 /flash/FLASH_nCS))
-    (pad 2 smd rect (at -2.7 0.635 270) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (pad 2 smd rect (at -2.7 0.635) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
       (net 175 /flash/FLASH_MISO))
-    (pad 3 smd rect (at -2.7 -0.635 270) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (pad 3 smd rect (at -2.7 -0.635) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
       (net 172 /flash/FLASH_nWP))
-    (pad 4 smd rect (at -2.7 -1.905 270) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (pad 4 smd rect (at -2.7 -1.905) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
-    (pad 5 smd rect (at 2.7 -1.905 270) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (pad 5 smd rect (at 2.7 -1.905) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
       (net 174 /flash/FLASH_MOSI))
-    (pad 6 smd rect (at 2.7 -0.635 270) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (pad 6 smd rect (at 2.7 -0.635) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
       (net 176 /flash/FLASH_SCK))
-    (pad 7 smd rect (at 2.7 0.635 270) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (pad 7 smd rect (at 2.7 0.635) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
       (net 173 /flash/FLASH_nHOLD))
-    (pad 8 smd rect (at 2.7 1.905 270) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (pad 8 smd rect (at 2.7 1.905) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
     (model Housings_SOIC.3dshapes/SOIC-8_3.9x4.9mm_Pitch1.27mm.wrl
       (at (xyz 0 0 0))
@@ -5046,7 +5048,7 @@
   )
 
   (module Diodes_SMD:D_0805 (layer B.Cu) (tedit 574BBB4C) (tstamp 58E794D3)
-    (at 109.34 71.58 270)
+    (at 165.855 69.675 270)
     (descr "Diode SMD in 0805 package")
     (tags "smd diode")
     (path /58D51CAD/58E813AE)
@@ -5080,7 +5082,7 @@
   )
 
   (module Diodes_SMD:D_0805 (layer B.Cu) (tedit 574BBB4C) (tstamp 58E794D9)
-    (at 111.88 71.58 270)
+    (at 163.95 69.675 270)
     (descr "Diode SMD in 0805 package")
     (tags "smd diode")
     (path /58D51CAD/58E82B1D)
@@ -5114,7 +5116,7 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58E794DF)
-    (at 106.8 71.58 90)
+    (at 162.045 69.675 90)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D51CAD/58E810CC)
@@ -5147,7 +5149,7 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58E7970D)
-    (at 146.805 96.345 90)
+    (at 146.805 95.075 90)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D686D9/58D92D93)
@@ -5384,7 +5386,7 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC0519)
-    (at 105.53 76.66 90)
+    (at 108.07 77.93 90)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC4E77)
@@ -5417,7 +5419,7 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC051F)
-    (at 109.34 76.66 90)
+    (at 120.135 77.93 90)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC4E85)
@@ -5450,7 +5452,7 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC0525)
-    (at 111.245 76.66 90)
+    (at 118.23 77.93 90)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC0EFE)
@@ -5483,15 +5485,15 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC052B)
-    (at 113.15 81.105 90)
+    (at 112.515 83.01 180)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC0F8E)
     (attr smd)
-    (fp_text reference R28 (at 0 1.9 90) (layer B.SilkS)
+    (fp_text reference R28 (at 0 1.9 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.9 90) (layer B.Fab)
+    (fp_text value 10k (at 0 -1.9 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -5504,9 +5506,9 @@
     (fp_line (start 2 0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
     (fp_line (start 0.5 -0.675) (end -0.5 -0.675) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 0.675) (end 0.5 0.675) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
-    (pad 2 smd rect (at 1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 2 smd rect (at 1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 175 /flash/FLASH_MISO))
     (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
       (at (xyz 0 0 0))
@@ -5516,15 +5518,15 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC0531)
-    (at 111.245 81.105 90)
+    (at 117.595 81.105 180)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC15E1)
     (attr smd)
-    (fp_text reference R29 (at 0 1.9 90) (layer B.SilkS)
+    (fp_text reference R29 (at 0 1.9 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 1k (at 0 -1.9 90) (layer B.Fab)
+    (fp_text value 1k (at 0 -1.9 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -5537,9 +5539,9 @@
     (fp_line (start 2 0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
     (fp_line (start 0.5 -0.675) (end -0.5 -0.675) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 0.675) (end 0.5 0.675) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
-    (pad 2 smd rect (at 1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 2 smd rect (at 1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 176 /flash/FLASH_SCK))
     (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
       (at (xyz 0 0 0))
@@ -5549,15 +5551,15 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC0537)
-    (at 113.15 76.66 90)
+    (at 112.515 81.105 180)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC1C84)
     (attr smd)
-    (fp_text reference R30 (at 0 1.9 90) (layer B.SilkS)
+    (fp_text reference R30 (at 0 1.9 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 4.7k (at 0 -1.9 90) (layer B.Fab)
+    (fp_text value 4.7k (at 0 -1.9 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -5570,9 +5572,9 @@
     (fp_line (start 2 0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
     (fp_line (start 0.5 -0.675) (end -0.5 -0.675) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 0.675) (end 0.5 0.675) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
-    (pad 2 smd rect (at 1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 2 smd rect (at 1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 177 /flash/FLASH_nCS))
     (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
       (at (xyz 0 0 0))
@@ -5582,7 +5584,7 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC053D)
-    (at 107.435 81.105 90)
+    (at 128.39 95.075 90)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC68DC)
@@ -5615,7 +5617,7 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC0543)
-    (at 109.34 81.105 90)
+    (at 126.485 95.075 90)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC68EA)
@@ -5648,15 +5650,15 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC0549)
-    (at 107.435 76.66 90)
+    (at 124.58 91.9)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC72FD)
     (attr smd)
-    (fp_text reference R33 (at 0 1.9 90) (layer B.SilkS)
+    (fp_text reference R33 (at 0 1.9) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.9 90) (layer B.Fab)
+    (fp_text value 10k (at 0 -1.9) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -5669,9 +5671,9 @@
     (fp_line (start 2 0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
     (fp_line (start 0.5 -0.675) (end -0.5 -0.675) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 0.675) (end 0.5 0.675) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -1.1 0) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
-    (pad 2 smd rect (at 1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 2 smd rect (at 1.1 0) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 180 /flash/FPGA_INITN))
     (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
       (at (xyz 0 0 0))
@@ -5681,15 +5683,15 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58ED5970)
-    (at 106.8 89.36 270)
+    (at 106.8 90.63 180)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D6D447/58ED6C6D)
     (attr smd)
-    (fp_text reference R34 (at 0 1.9 270) (layer B.SilkS)
+    (fp_text reference R34 (at 0 1.9 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 15k (at 0 -1.9 270) (layer B.Fab)
+    (fp_text value 15k (at 0 -1.9 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -5702,9 +5704,9 @@
     (fp_line (start 2 0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
     (fp_line (start 0.5 -0.675) (end -0.5 -0.675) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 0.675) (end 0.5 0.675) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.1 0 270) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
-    (pad 2 smd rect (at 1.1 0 270) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 2 smd rect (at 1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 193 WIFI_EN))
     (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
       (at (xyz 0 0 0))
@@ -5713,6 +5715,46 @@
     )
   )
 
+  (module Crystals:Crystal_SMD_7050_4Pads (layer B.Cu) (tedit 57404CCC) (tstamp 58EDEA6D)
+    (at 107.435 84.915 270)
+    (descr "Ceramic SMD crystal, 7.0x5.0mm, 4 Pads")
+    (tags "crystal oscillator quartz SMD SMT 7050")
+    (path /58D686D9/58EDFF94)
+    (attr smd)
+    (fp_text reference Y2 (at 0 4 270) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value Crystal_GND24 (at 0 -4 270) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_line (start -3.5 -2.5) (end -3.5 2.5) (layer B.Fab) (width 0.15))
+    (fp_line (start 3.5 -2.5) (end -3.5 -2.5) (layer B.Fab) (width 0.15))
+    (fp_line (start 3.5 2.5) (end 3.5 -2.5) (layer B.Fab) (width 0.15))
+    (fp_line (start -3.5 2.5) (end 3.5 2.5) (layer B.Fab) (width 0.15))
+    (fp_line (start -3.6 -2.3) (end -4.15 -2.3) (layer B.SilkS) (width 0.15))
+    (fp_line (start 3.6 -2.6) (end 3.6 -2.3) (layer B.SilkS) (width 0.15))
+    (fp_line (start 3.6 2.6) (end 3.6 2.3) (layer B.SilkS) (width 0.15))
+    (fp_line (start -3.6 2.6) (end -3.6 2.3) (layer B.SilkS) (width 0.15))
+    (fp_line (start -3.6 -2.6) (end -3.6 -2.3) (layer B.SilkS) (width 0.15))
+    (fp_line (start -3.6 -2.6) (end 3.6 -2.6) (layer B.SilkS) (width 0.15))
+    (fp_line (start -3.6 -0.2) (end -4.15 -0.2) (layer B.SilkS) (width 0.15))
+    (fp_line (start -4.75 3.1) (end -4.75 -3.1) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 4.75 3.1) (end -4.75 3.1) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -3.6 2.6) (end 3.6 2.6) (layer B.SilkS) (width 0.15))
+    (fp_line (start 3.6 -0.2) (end 3.6 0.2) (layer B.SilkS) (width 0.15))
+    (fp_line (start -3.6 -0.2) (end -3.6 0.2) (layer B.SilkS) (width 0.15))
+    (fp_line (start 4.75 -3.1) (end -4.75 -3.1) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 4.75 3.1) (end 4.75 -3.1) (layer B.CrtYd) (width 0.05))
+    (pad 1 smd rect (at -3.15 -1.25 270) (size 2.2 1.4) (layers B.Cu B.Paste B.Mask)
+      (net 5 +3V3))
+    (pad 3 smd rect (at 3.15 -1.25 270) (size 2.2 1.4) (layers B.Cu B.Paste B.Mask)
+      (net 205 /gpdi/CLK_25MHz))
+    (pad 2 smd rect (at 3.15 1.25 270) (size 2.2 1.4) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 3 smd rect (at -3.15 1.25 270) (size 2.2 1.4) (layers B.Cu B.Paste B.Mask)
+      (net 205 /gpdi/CLK_25MHz))
+  )
+
   (dimension 17.78 (width 0.3) (layer Eco2.User)
     (gr_text "17,780 mm" (at 184.27 52.45) (layer Eco2.User)
       (effects (font (size 1.5 1.5) (thickness 0.3)))

ulx3s.kicad_pcb-bak

@@ -1,15 +1,15 @@
 (kicad_pcb (version 4) (host pcbnew 4.0.5+dfsg1-4)
 
   (general
-    (links 557)
+    (links 561)
-    (no_connects 557)
+    (no_connects 561)
-    (area 76.090001 43.48 193.160001 118.805339)
+    (area 99.029999 61.269999 178.070001 112.370001)
     (thickness 1.6)
     (drawings 7)
     (tracks 0)
     (zones 0)
-    (modules 111)
+    (modules 112)
-    (nets 205)
+    (nets 206)
   )
 
   (page A4)
@@ -298,6 +298,7 @@
   (net 202 FTDI_nRI)
   (net 203 FTDI_nDCD)
   (net 204 WIFI_GPIO15)
+  (net 205 /gpdi/CLK_25MHz)
 
   (net_class Default "This is the default net class."
     (clearance 0.2)
@@ -313,15 +314,7 @@
     (add_net /analog/AUDIO_L)
     (add_net /analog/AUDIO_R)
     (add_net /blinkey/BTNPU)
-    (add_net /flash/FLASH_MISO)
+    (add_net /gpdi/CLK_25MHz)
-    (add_net /flash/FLASH_MOSI)
-    (add_net /flash/FLASH_SCK)
-    (add_net /flash/FLASH_nCS)
-    (add_net /flash/FLASH_nHOLD)
-    (add_net /flash/FLASH_nWP)
-    (add_net /flash/FPGA_DONE)
-    (add_net /flash/FPGA_INITN)
-    (add_net /flash/FPGA_PROGRAMN)
     (add_net /gpdi/VREF2)
     (add_net /gpio/IN5V)
     (add_net /gpio/OUT5V)
@@ -339,21 +332,6 @@
     (add_net /power/WKUP)
     (add_net /power/WKn)
     (add_net /usb/FT3V3)
-    (add_net AUDIO_L0)
-    (add_net AUDIO_L1)
-    (add_net AUDIO_L2)
-    (add_net AUDIO_L3)
-    (add_net AUDIO_R0)
-    (add_net AUDIO_R1)
-    (add_net AUDIO_R2)
-    (add_net AUDIO_R3)
-    (add_net FTDI_RXD)
-    (add_net FTDI_TXD)
-    (add_net FTDI_nCTS)
-    (add_net FTDI_nDCD)
-    (add_net FTDI_nDTR)
-    (add_net FTDI_nRI)
-    (add_net FTDI_nRTS)
     (add_net FTDI_nSUSPEND)
     (add_net "Net-(BTN0-Pad1)")
     (add_net "Net-(D9-Pad1)")
@@ -361,20 +339,10 @@
     (add_net "Net-(L2-Pad1)")
     (add_net "Net-(L3-Pad1)")
     (add_net "Net-(Q2-Pad3)")
-    (add_net OLED_CS)
-    (add_net OLED_DC)
-    (add_net OLED_MOSI)
-    (add_net OLED_RES)
     (add_net SHUTDOWN)
     (add_net USB5V)
     (add_net USB_FTDI_DM)
     (add_net USB_FTDI_DP)
-    (add_net WIFI_EN)
-    (add_net WIFI_GPIO0)
-    (add_net WIFI_GPIO15)
-    (add_net WIFI_GPIO2)
-    (add_net WIFI_RXD)
-    (add_net WIFI_TXD)
     (add_net nRESET)
   )
 
@@ -385,6 +353,15 @@
     (via_drill 0.15)
     (uvia_dia 0.3)
     (uvia_drill 0.1)
+    (add_net /flash/FLASH_MISO)
+    (add_net /flash/FLASH_MOSI)
+    (add_net /flash/FLASH_SCK)
+    (add_net /flash/FLASH_nCS)
+    (add_net /flash/FLASH_nHOLD)
+    (add_net /flash/FLASH_nWP)
+    (add_net /flash/FPGA_DONE)
+    (add_net /flash/FPGA_INITN)
+    (add_net /flash/FPGA_PROGRAMN)
     (add_net /gpio/A10)
     (add_net /gpio/A11)
     (add_net /gpio/A12)
@@ -441,6 +418,14 @@
     (add_net /gpio/E7)
     (add_net /gpio/E8)
     (add_net /gpio/E9)
+    (add_net AUDIO_L0)
+    (add_net AUDIO_L1)
+    (add_net AUDIO_L2)
+    (add_net AUDIO_L3)
+    (add_net AUDIO_R0)
+    (add_net AUDIO_R1)
+    (add_net AUDIO_R2)
+    (add_net AUDIO_R3)
     (add_net BTN_D)
     (add_net BTN_F1)
     (add_net BTN_F2)
@@ -448,6 +433,13 @@
     (add_net BTN_PWRn)
     (add_net BTN_R)
     (add_net BTN_U)
+    (add_net FTDI_RXD)
+    (add_net FTDI_TXD)
+    (add_net FTDI_nCTS)
+    (add_net FTDI_nDCD)
+    (add_net FTDI_nDTR)
+    (add_net FTDI_nRI)
+    (add_net FTDI_nRTS)
     (add_net GND)
     (add_net GPDI_5V_SCL)
     (add_net GPDI_5V_SDA)
@@ -476,6 +468,10 @@
     (add_net LED5)
     (add_net LED6)
     (add_net LED7)
+    (add_net OLED_CS)
+    (add_net OLED_DC)
+    (add_net OLED_MOSI)
+    (add_net OLED_RES)
     (add_net SDRAM_A0)
     (add_net SDRAM_A1)
     (add_net SDRAM_A10)
@@ -519,10 +515,16 @@
     (add_net SD_CMD)
     (add_net SD_D0)
     (add_net SD_D1)
+    (add_net WIFI_EN)
+    (add_net WIFI_GPIO0)
+    (add_net WIFI_GPIO15)
+    (add_net WIFI_GPIO2)
+    (add_net WIFI_RXD)
+    (add_net WIFI_TXD)
   )
 
   (module Keystone_3000_1x12mm-CoinCell:Keystone_3000_1x12mm-CoinCell (layer B.Cu) (tedit 58D7D5B5) (tstamp 58D7ADD9)
-    (at 135.73 98.25)
+    (at 136.645 99.52)
     (descr http://www.keyelco.com/product-pdf.cfm?p=777)
     (tags "Keystone type 3000 coin cell retainer")
     (path /58D51CAD/58D72202)
@@ -2711,15 +2713,15 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8ED82)
-    (at 124.58 91.9 180)
+    (at 118.23 88.725 90)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D6547C/58D6605D)
     (attr smd)
-    (fp_text reference R7 (at 0 1.9 180) (layer B.SilkS)
+    (fp_text reference R7 (at 0 1.9 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 220 (at 0 -1.9 180) (layer B.Fab)
+    (fp_text value 220 (at 0 -1.9 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -2732,9 +2734,9 @@
     (fp_line (start 2 0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
     (fp_line (start 0.5 -0.675) (end -0.5 -0.675) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 0.675) (end 0.5 0.675) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
-    (pad 2 smd rect (at 1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 2 smd rect (at 1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 48 /blinkey/BTNPU))
     (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
       (at (xyz 0 0 0))
@@ -3551,7 +3553,7 @@
     (pad F1 smd circle (at -7.6 -3.6) (size 0.35 0.35) (layers F.Cu F.Paste F.Mask)
       (solder_mask_margin 0.04))
     (pad F2 smd circle (at -6.8 -3.6) (size 0.35 0.35) (layers F.Cu F.Paste F.Mask)
-      (solder_mask_margin 0.04))
+      (net 205 /gpdi/CLK_25MHz) (solder_mask_margin 0.04))
     (pad F3 smd circle (at -6 -3.6) (size 0.35 0.35) (layers F.Cu F.Paste F.Mask)
       (solder_mask_margin 0.04))
     (pad F4 smd circle (at -5.2 -3.6) (size 0.35 0.35) (layers F.Cu F.Paste F.Mask)
@@ -4202,15 +4204,15 @@
   )
 
   (module Housings_SOIC:SOIC-8_3.9x4.9mm_Pitch1.27mm (layer B.Cu) (tedit 54130A77) (tstamp 58D911E2)
-    (at 118.23 77.93 270)
+    (at 113.15 77.295)
     (descr "8-Lead Plastic Small Outline (SN) - Narrow, 3.90 mm Body [SOIC] (see Microchip Packaging Specification 00000049BS.pdf)")
     (tags "SOIC 1.27")
     (path /58D913EC/58D913F5)
     (attr smd)
-    (fp_text reference U10 (at 0 3.5 270) (layer B.SilkS)
+    (fp_text reference U10 (at 0 3.5) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value S25FL164K0XMFI011 (at 0 -3.5 270) (layer B.Fab)
+    (fp_text value S25FL164K0XMFI011 (at 0 -3.5) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.95 2.45) (end 1.95 2.45) (layer B.Fab) (width 0.15))
@@ -4229,21 +4231,21 @@
     (fp_line (start -2.075 2.575) (end 2.075 2.575) (layer B.SilkS) (width 0.15))
     (fp_line (start -2.075 -2.575) (end 2.075 -2.575) (layer B.SilkS) (width 0.15))
     (fp_line (start -2.075 2.525) (end -3.475 2.525) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -2.7 1.905 270) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -2.7 1.905) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
       (net 177 /flash/FLASH_nCS))
-    (pad 2 smd rect (at -2.7 0.635 270) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (pad 2 smd rect (at -2.7 0.635) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
       (net 175 /flash/FLASH_MISO))
-    (pad 3 smd rect (at -2.7 -0.635 270) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (pad 3 smd rect (at -2.7 -0.635) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
       (net 172 /flash/FLASH_nWP))
-    (pad 4 smd rect (at -2.7 -1.905 270) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (pad 4 smd rect (at -2.7 -1.905) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
       (net 1 GND))
-    (pad 5 smd rect (at 2.7 -1.905 270) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (pad 5 smd rect (at 2.7 -1.905) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
       (net 174 /flash/FLASH_MOSI))
-    (pad 6 smd rect (at 2.7 -0.635 270) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (pad 6 smd rect (at 2.7 -0.635) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
       (net 176 /flash/FLASH_SCK))
-    (pad 7 smd rect (at 2.7 0.635 270) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (pad 7 smd rect (at 2.7 0.635) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
       (net 173 /flash/FLASH_nHOLD))
-    (pad 8 smd rect (at 2.7 1.905 270) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (pad 8 smd rect (at 2.7 1.905) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
     (model Housings_SOIC.3dshapes/SOIC-8_3.9x4.9mm_Pitch1.27mm.wrl
       (at (xyz 0 0 0))
@@ -5046,7 +5048,7 @@
   )
 
   (module Diodes_SMD:D_0805 (layer B.Cu) (tedit 574BBB4C) (tstamp 58E794D3)
-    (at 109.34 71.58 270)
+    (at 165.855 69.675 270)
     (descr "Diode SMD in 0805 package")
     (tags "smd diode")
     (path /58D51CAD/58E813AE)
@@ -5080,7 +5082,7 @@
   )
 
   (module Diodes_SMD:D_0805 (layer B.Cu) (tedit 574BBB4C) (tstamp 58E794D9)
-    (at 111.88 71.58 270)
+    (at 163.95 69.675 270)
     (descr "Diode SMD in 0805 package")
     (tags "smd diode")
     (path /58D51CAD/58E82B1D)
@@ -5114,7 +5116,7 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58E794DF)
-    (at 106.8 71.58 90)
+    (at 162.045 69.675 90)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D51CAD/58E810CC)
@@ -5147,7 +5149,7 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58E7970D)
-    (at 146.805 96.345 90)
+    (at 146.805 95.075 90)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D686D9/58D92D93)
@@ -5384,7 +5386,7 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC0519)
-    (at 105.53 76.66 90)
+    (at 108.07 77.93 90)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC4E77)
@@ -5417,7 +5419,7 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC051F)
-    (at 109.34 76.66 90)
+    (at 120.135 77.93 90)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC4E85)
@@ -5450,7 +5452,7 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC0525)
-    (at 111.245 76.66 90)
+    (at 118.23 77.93 90)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC0EFE)
@@ -5483,15 +5485,15 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC052B)
-    (at 113.15 81.105 90)
+    (at 112.515 83.01 180)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC0F8E)
     (attr smd)
-    (fp_text reference R28 (at 0 1.9 90) (layer B.SilkS)
+    (fp_text reference R28 (at 0 1.9 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.9 90) (layer B.Fab)
+    (fp_text value 10k (at 0 -1.9 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -5504,9 +5506,9 @@
     (fp_line (start 2 0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
     (fp_line (start 0.5 -0.675) (end -0.5 -0.675) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 0.675) (end 0.5 0.675) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
-    (pad 2 smd rect (at 1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 2 smd rect (at 1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 175 /flash/FLASH_MISO))
     (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
       (at (xyz 0 0 0))
@@ -5516,15 +5518,15 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC0531)
-    (at 111.245 81.105 90)
+    (at 117.595 81.105 180)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC15E1)
     (attr smd)
-    (fp_text reference R29 (at 0 1.9 90) (layer B.SilkS)
+    (fp_text reference R29 (at 0 1.9 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 1k (at 0 -1.9 90) (layer B.Fab)
+    (fp_text value 1k (at 0 -1.9 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -5537,9 +5539,9 @@
     (fp_line (start 2 0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
     (fp_line (start 0.5 -0.675) (end -0.5 -0.675) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 0.675) (end 0.5 0.675) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
-    (pad 2 smd rect (at 1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 2 smd rect (at 1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 176 /flash/FLASH_SCK))
     (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
       (at (xyz 0 0 0))
@@ -5549,15 +5551,15 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC0537)
-    (at 113.15 76.66 90)
+    (at 112.515 81.105 180)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC1C84)
     (attr smd)
-    (fp_text reference R30 (at 0 1.9 90) (layer B.SilkS)
+    (fp_text reference R30 (at 0 1.9 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 4.7k (at 0 -1.9 90) (layer B.Fab)
+    (fp_text value 4.7k (at 0 -1.9 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -5570,9 +5572,9 @@
     (fp_line (start 2 0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
     (fp_line (start 0.5 -0.675) (end -0.5 -0.675) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 0.675) (end 0.5 0.675) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
-    (pad 2 smd rect (at 1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 2 smd rect (at 1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 177 /flash/FLASH_nCS))
     (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
       (at (xyz 0 0 0))
@@ -5582,7 +5584,7 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC053D)
-    (at 107.435 81.105 90)
+    (at 128.39 95.075 90)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC68DC)
@@ -5615,7 +5617,7 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC0543)
-    (at 109.34 81.105 90)
+    (at 126.485 95.075 90)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC68EA)
@@ -5648,15 +5650,15 @@
   )
 
   (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58EC0549)
-    (at 107.435 76.66 90)
+    (at 124.58 91.9)
     (descr "Resistor SMD 0603, hand soldering")
     (tags "resistor 0603")
     (path /58D913EC/58EC72FD)
     (attr smd)
-    (fp_text reference R33 (at 0 1.9 90) (layer B.SilkS)
+    (fp_text reference R33 (at 0 1.9) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -1.9 90) (layer B.Fab)
+    (fp_text value 10k (at 0 -1.9) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
@@ -5669,9 +5671,9 @@
     (fp_line (start 2 0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
     (fp_line (start 0.5 -0.675) (end -0.5 -0.675) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.5 0.675) (end 0.5 0.675) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -1.1 0) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 5 +3V3))
-    (pad 2 smd rect (at 1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+    (pad 2 smd rect (at 1.1 0) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 180 /flash/FPGA_INITN))
     (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
       (at (xyz 0 0 0))
@@ -5713,6 +5715,46 @@
     )
   )
 
+  (module Crystals:Crystal_SMD_7050_4Pads (layer B.Cu) (tedit 57404CCC) (tstamp 58EDEA6D)
+    (at 109.34 87.455 180)
+    (descr "Ceramic SMD crystal, 7.0x5.0mm, 4 Pads")
+    (tags "crystal oscillator quartz SMD SMT 7050")
+    (path /58D686D9/58EDFF94)
+    (attr smd)
+    (fp_text reference Y2 (at 0 4 180) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value Crystal_GND24 (at 0 -4 180) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_line (start -3.5 -2.5) (end -3.5 2.5) (layer B.Fab) (width 0.15))
+    (fp_line (start 3.5 -2.5) (end -3.5 -2.5) (layer B.Fab) (width 0.15))
+    (fp_line (start 3.5 2.5) (end 3.5 -2.5) (layer B.Fab) (width 0.15))
+    (fp_line (start -3.5 2.5) (end 3.5 2.5) (layer B.Fab) (width 0.15))
+    (fp_line (start -3.6 -2.3) (end -4.15 -2.3) (layer B.SilkS) (width 0.15))
+    (fp_line (start 3.6 -2.6) (end 3.6 -2.3) (layer B.SilkS) (width 0.15))
+    (fp_line (start 3.6 2.6) (end 3.6 2.3) (layer B.SilkS) (width 0.15))
+    (fp_line (start -3.6 2.6) (end -3.6 2.3) (layer B.SilkS) (width 0.15))
+    (fp_line (start -3.6 -2.6) (end -3.6 -2.3) (layer B.SilkS) (width 0.15))
+    (fp_line (start -3.6 -2.6) (end 3.6 -2.6) (layer B.SilkS) (width 0.15))
+    (fp_line (start -3.6 -0.2) (end -4.15 -0.2) (layer B.SilkS) (width 0.15))
+    (fp_line (start -4.75 3.1) (end -4.75 -3.1) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 4.75 3.1) (end -4.75 3.1) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -3.6 2.6) (end 3.6 2.6) (layer B.SilkS) (width 0.15))
+    (fp_line (start 3.6 -0.2) (end 3.6 0.2) (layer B.SilkS) (width 0.15))
+    (fp_line (start -3.6 -0.2) (end -3.6 0.2) (layer B.SilkS) (width 0.15))
+    (fp_line (start 4.75 -3.1) (end -4.75 -3.1) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 4.75 3.1) (end 4.75 -3.1) (layer B.CrtYd) (width 0.05))
+    (pad 1 smd rect (at -3.15 -1.25 180) (size 2.2 1.4) (layers B.Cu B.Paste B.Mask)
+      (net 5 +3V3))
+    (pad 3 smd rect (at 3.15 -1.25 180) (size 2.2 1.4) (layers B.Cu B.Paste B.Mask)
+      (net 205 /gpdi/CLK_25MHz))
+    (pad 2 smd rect (at 3.15 1.25 180) (size 2.2 1.4) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 3 smd rect (at -3.15 1.25 180) (size 2.2 1.4) (layers B.Cu B.Paste B.Mask)
+      (net 205 /gpdi/CLK_25MHz))
+  )
+
   (dimension 17.78 (width 0.3) (layer Eco2.User)
     (gr_text "17,780 mm" (at 184.27 52.45) (layer Eco2.User)
       (effects (font (size 1.5 1.5) (thickness 0.3)))

ulx3s.net

@@ -1,7 +1,7 @@
 (export (version D)
   (design
-    (source /home/davor/tmp/ulx3s/ulx3s.sch)
+    (source /home/davor/src/circuits/fpga/ulx3s/ulx3s.sch)
-    (date "Sri 12 Tra 2017 00:23:56")
+    (date "Sri 12 Tra 2017 10:42:20")
     (tool "Eeschema 4.0.5+dfsg1-4")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -611,6 +611,12 @@
       (libsource (lib device) (part R))
       (sheetpath (names /gpdi/) (tstamps /58D686D9/))
       (tstamp 58D92D93))
+    (comp (ref Y2)
+      (value Crystal_GND24)
+      (footprint Crystals:Crystal_SMD_7050_4Pads)
+      (libsource (lib device) (part Crystal_GND24))
+      (sheetpath (names /gpdi/) (tstamps /58D686D9/))
+      (tstamp 58EDFF94))
     (comp (ref D8)
       (value 2A)
       (footprint SMD_Packages:SMD-1206_Pol)
@@ -931,6 +937,18 @@
         (pin (num 2) (name 2) (type passive))
         (pin (num 3) (name 3) (type passive))
         (pin (num 4) (name 4) (type passive))))
+    (libpart (lib device) (part Crystal_GND24)
+      (description "Four pin crystal (GND on pins 2 and 4), e.g. in SMD package")
+      (footprints
+        (fp Crystal*))
+      (fields
+        (field (name Reference) Y)
+        (field (name Value) Crystal_GND24))
+      (pins
+        (pin (num 1) (name 1) (type passive))
+        (pin (num 2) (name 2) (type passive))
+        (pin (num 3) (name 3) (type passive))
+        (pin (num 4) (name 4) (type passive))))
     (libpart (lib device) (part D)
       (description Diode)
       (footprints
@@ -1665,6 +1683,8 @@
         (pin (num 5) (name GND) (type power_in))
         (pin (num 6) (name shield) (type passive)))))
   (libraries
+    (library (logical conn)
+      (uri /usr/share/kicad/library/conn.lib))
     (library (logical micro-hdmi-d)
       (uri footprints/micro-hdmi-d/micro-hdmi-d.lib))
     (library (logical lfe5bg381)
@@ -1673,22 +1693,19 @@
       (uri footprints/esp32/ESP32.lib))
     (library (logical ssd_13xx)
       (uri footprints/oled/ssd_13xx.lib))
+    (library (logical ap3429a)
+      (uri footprints/dcdc_converter/ap3429a.lib))
     (library (logical ftdi)
       (uri footprints/usbserial/ftdi.lib))
-    (library (logical philips)
-      (uri /usr/share/kicad/library/philips.lib))
     (library (logical device)
       (uri /usr/share/kicad/library/device.lib))
-    (library (logical conn)
+    (library (logical philips)
-      (uri /usr/share/kicad/library/conn.lib))
+      (uri /usr/share/kicad/library/philips.lib))
-    (library (logical ap3429a)
-      (uri footprints/dcdc_converter/ap3429a.lib))
     (library (logical memory)
       (uri /usr/share/kicad/library/memory.lib)))
   (nets
     (net (code 1) (name GND)
-      (node (ref U1) (pin T9))
+      (node (ref U1) (pin U9))
-      (node (ref U1) (pin V11))
       (node (ref U1) (pin Y11))
       (node (ref U1) (pin G12))
       (node (ref U1) (pin J12))
@@ -1702,15 +1719,14 @@
       (node (ref U1) (pin K9))
       (node (ref U1) (pin L9))
       (node (ref U1) (pin M9))
-      (node (ref U1) (pin U11))
+      (node (ref U1) (pin T9))
-      (node (ref U1) (pin U9))
+      (node (ref U1) (pin V11))
       (node (ref U1) (pin V9))
       (node (ref U1) (pin G10))
       (node (ref U1) (pin J10))
       (node (ref U1) (pin K10))
       (node (ref U1) (pin L10))
-      (node (ref U1) (pin T6))
+      (node (ref U1) (pin U6))
-      (node (ref U1) (pin F8))
       (node (ref U1) (pin G8))
       (node (ref U1) (pin J2))
       (node (ref U1) (pin M2))
@@ -1722,7 +1738,7 @@
       (node (ref U1) (pin P8))
       (node (ref U1) (pin K6))
       (node (ref U1) (pin N6))
-      (node (ref U1) (pin U6))
+      (node (ref U1) (pin T6))
       (node (ref U1) (pin V6))
       (node (ref U1) (pin W6))
       (node (ref U1) (pin L11))
@@ -1736,7 +1752,8 @@
       (node (ref U1) (pin M10))
       (node (ref U1) (pin M11))
       (node (ref U1) (pin P11))
-      (node (ref U1) (pin Y7))
+      (node (ref U1) (pin U11))
+      (node (ref U1) (pin F8))
       (node (ref R13) (pin 2))
       (node (ref D13) (pin 2))
       (node (ref U7) (pin 4))
@@ -1779,6 +1796,7 @@
       (node (ref U1) (pin Y6))
       (node (ref U1) (pin V7))
       (node (ref U1) (pin W7))
+      (node (ref U1) (pin Y7))
       (node (ref U1) (pin R19))
       (node (ref U1) (pin W15))
       (node (ref U1) (pin M16))
@@ -1810,28 +1828,27 @@
       (node (ref GPDI1) (pin 10))
       (node (ref GPDI1) (pin 13))
       (node (ref GPDI1) (pin 16))
+      (node (ref C18) (pin 2))
       (node (ref U11) (pin 1))
       (node (ref US1) (pin 5))
       (node (ref US1) (pin 6))
       (node (ref US2) (pin 5))
       (node (ref US2) (pin 6))
-      (node (ref C18) (pin 2))
-      (node (ref D5) (pin 1))
-      (node (ref D4) (pin 1))
       (node (ref D3) (pin 1))
       (node (ref D2) (pin 1))
       (node (ref D1) (pin 1))
       (node (ref OLED1) (pin 1))
       (node (ref D0) (pin 1))
+      (node (ref Y2) (pin 2))
+      (node (ref SD1) (pin 13))
       (node (ref AUDIO1) (pin 2))
       (node (ref U10) (pin 4))
       (node (ref U1) (pin U4))
       (node (ref U1) (pin R4))
-      (node (ref SD1) (pin 13))
       (node (ref SD1) (pin 12))
       (node (ref SD1) (pin 6))
       (node (ref SD1) (pin 3))
-      (node (ref U9) (pin 52))
+      (node (ref U9) (pin 12))
       (node (ref U6) (pin 16))
       (node (ref U6) (pin 6))
       (node (ref U2) (pin 1))
@@ -1840,43 +1857,45 @@
       (node (ref U9) (pin 28))
       (node (ref U9) (pin 6))
       (node (ref U9) (pin 41))
-      (node (ref U9) (pin 12))
+      (node (ref D4) (pin 1))
-      (node (ref D6) (pin 1))
+      (node (ref U9) (pin 52))
       (node (ref H2) (pin 1))
       (node (ref D7) (pin 1))
-      (node (ref C7) (pin 2))
+      (node (ref D6) (pin 1))
-      (node (ref J2) (pin 4))
+      (node (ref D5) (pin 1))
-      (node (ref J1) (pin 22))
+      (node (ref U4) (pin 2))
-      (node (ref J1) (pin 37))
-      (node (ref J1) (pin 38))
-      (node (ref J2) (pin 3))
       (node (ref J2) (pin 37))
       (node (ref J2) (pin 38))
-      (node (ref J2) (pin 22))
+      (node (ref C7) (pin 2))
+      (node (ref C5) (pin 2))
       (node (ref J1) (pin 3))
       (node (ref J1) (pin 4))
-      (node (ref U4) (pin 2))
+      (node (ref J1) (pin 21))
-      (node (ref C5) (pin 2))
+      (node (ref RB3) (pin 1))
       (node (ref C8) (pin 2))
       (node (ref J2) (pin 21))
+      (node (ref J2) (pin 22))
+      (node (ref J2) (pin 4))
       (node (ref H1) (pin 1))
-      (node (ref RB3) (pin 1))
+      (node (ref J1) (pin 22))
-      (node (ref H3) (pin 1))
+      (node (ref J1) (pin 37))
+      (node (ref J1) (pin 38))
+      (node (ref J2) (pin 3))
       (node (ref H4) (pin 1))
-      (node (ref C9) (pin 2))
+      (node (ref H3) (pin 1))
-      (node (ref J1) (pin 21)))
+      (node (ref C9) (pin 2)))
     (net (code 2) (name /gpio/D12)
-      (node (ref J2) (pin 31))
+      (node (ref U1) (pin D12))
-      (node (ref U1) (pin D12)))
+      (node (ref J2) (pin 31)))
     (net (code 3) (name /gpio/C13)
       (node (ref U1) (pin C13))
       (node (ref J2) (pin 28)))
     (net (code 4) (name /gpio/B12)
-      (node (ref J2) (pin 33))
+      (node (ref U1) (pin B12))
-      (node (ref U1) (pin B12)))
+      (node (ref J2) (pin 33)))
     (net (code 5) (name /gpio/D11)
-      (node (ref U1) (pin D11))
+      (node (ref J2) (pin 35))
-      (node (ref J2) (pin 35)))
+      (node (ref U1) (pin D11)))
     (net (code 6) (name /gpio/C14)
       (node (ref J2) (pin 24))
       (node (ref U1) (pin C14)))
@@ -1884,8 +1903,8 @@
       (node (ref J2) (pin 26))
       (node (ref U1) (pin E13)))
     (net (code 8) (name /gpio/E15)
-      (node (ref U1) (pin E15))
+      (node (ref J2) (pin 14))
-      (node (ref J2) (pin 14)))
+      (node (ref U1) (pin E15)))
     (net (code 9) (name /gpio/A12)
       (node (ref J2) (pin 29))
       (node (ref U1) (pin A12)))
@@ -1893,23 +1912,23 @@
       (node (ref U1) (pin B13))
       (node (ref J2) (pin 27)))
     (net (code 11) (name /gpio/D13)
-      (node (ref J2) (pin 25))
+      (node (ref U1) (pin D13))
-      (node (ref U1) (pin D13)))
+      (node (ref J2) (pin 25)))
     (net (code 12) (name /gpio/A14)
-      (node (ref J2) (pin 23))
+      (node (ref U1) (pin A14))
-      (node (ref U1) (pin A14)))
+      (node (ref J2) (pin 23)))
     (net (code 13) (name /gpio/E14)
       (node (ref U1) (pin E14))
       (node (ref J2) (pin 18)))
     (net (code 14) (name /gpio/C15)
-      (node (ref J2) (pin 16))
+      (node (ref U1) (pin C15))
-      (node (ref U1) (pin C15)))
+      (node (ref J2) (pin 16)))
     (net (code 15) (name /gpio/B11)
       (node (ref J1) (pin 5))
       (node (ref U1) (pin B11)))
     (net (code 16) (name /gpio/A10)
-      (node (ref J1) (pin 7))
+      (node (ref U1) (pin A10))
-      (node (ref U1) (pin A10)))
+      (node (ref J1) (pin 7)))
     (net (code 17) (name /gpio/B10)
       (node (ref J1) (pin 9))
       (node (ref U1) (pin B10)))
@@ -1923,14 +1942,14 @@
       (node (ref J1) (pin 15))
       (node (ref U1) (pin A7)))
     (net (code 21) (name /gpio/B8)
-      (node (ref J1) (pin 17))
+      (node (ref U1) (pin C8))
-      (node (ref U1) (pin C8)))
+      (node (ref J1) (pin 17)))
     (net (code 22) (name /gpio/A13)
       (node (ref U1) (pin A13))
       (node (ref J2) (pin 30)))
     (net (code 23) (name /gpio/E11)
-      (node (ref J2) (pin 36))
+      (node (ref U1) (pin E11))
-      (node (ref U1) (pin E11)))
+      (node (ref J2) (pin 36)))
     (net (code 24) (name /gpio/C12)
       (node (ref J2) (pin 34))
       (node (ref U1) (pin C12)))
@@ -1938,73 +1957,75 @@
       (node (ref J2) (pin 32))
       (node (ref U1) (pin E12)))
     (net (code 26) (name +3V3)
-      (node (ref J2) (pin 2))
+      (node (ref Y2) (pin 4))
-      (node (ref J2) (pin 1))
-      (node (ref L2) (pin 2))
-      (node (ref R31) (pin 1))
-      (node (ref R33) (pin 1))
-      (node (ref R32) (pin 1))
-      (node (ref U1) (pin M15))
-      (node (ref U1) (pin T2))
-      (node (ref U1) (pin U2))
       (node (ref U1) (pin H14))
-      (node (ref U10) (pin 8))
+      (node (ref U1) (pin L15))
-      (node (ref J1) (pin 2))
+      (node (ref U1) (pin L14))
+      (node (ref C8) (pin 1))
+      (node (ref J2) (pin 20))
+      (node (ref U1) (pin H15))
+      (node (ref U1) (pin J15))
+      (node (ref U1) (pin M15))
+      (node (ref U1) (pin P10))
+      (node (ref U1) (pin F11))
+      (node (ref U1) (pin F12))
+      (node (ref U1) (pin F9))
+      (node (ref U1) (pin P9))
+      (node (ref U1) (pin F10))
+      (node (ref J1) (pin 1))
+      (node (ref J1) (pin 20))
       (node (ref J1) (pin 40))
+      (node (ref J1) (pin 2))
+      (node (ref OLED1) (pin 2))
       (node (ref U1) (pin H7))
-      (node (ref J1) (pin 20))
+      (node (ref Y2) (pin 1))
       (node (ref J1) (pin 19))
       (node (ref J1) (pin 39))
-      (node (ref J2) (pin 19))
+      (node (ref J2) (pin 1))
-      (node (ref U1) (pin F12))
+      (node (ref R22) (pin 1))
-      (node (ref U1) (pin M6))
+      (node (ref R23) (pin 1))
-      (node (ref U1) (pin L6))
+      (node (ref J2) (pin 2))
+      (node (ref U1) (pin L7))
+      (node (ref U1) (pin H6))
+      (node (ref R7) (pin 1))
       (node (ref U1) (pin J6))
-      (node (ref U1) (pin F11))
+      (node (ref U1) (pin L6))
-      (node (ref U1) (pin P10))
+      (node (ref U1) (pin M6))
-      (node (ref OLED1) (pin 2))
+      (node (ref J2) (pin 19))
+      (node (ref R34) (pin 1))
       (node (ref RA3) (pin 1))
-      (node (ref U1) (pin L7))
       (node (ref C6) (pin 1))
-      (node (ref C8) (pin 1))
+      (node (ref R33) (pin 1))
-      (node (ref R12) (pin 1))
-      (node (ref U1) (pin F10))
-      (node (ref R7) (pin 1))
-      (node (ref J1) (pin 1))
-      (node (ref U1) (pin H6))
-      (node (ref U1) (pin F9))
-      (node (ref U1) (pin P9))
-      (node (ref SD1) (pin 4))
       (node (ref D14) (pin 1))
-      (node (ref R34) (pin 1))
+      (node (ref R32) (pin 1))
-      (node (ref R29) (pin 1))
-      (node (ref U11) (pin 2))
-      (node (ref R30) (pin 1))
-      (node (ref U9) (pin 1))
-      (node (ref U9) (pin 3))
       (node (ref U9) (pin 9))
       (node (ref U9) (pin 43))
+      (node (ref R30) (pin 1))
+      (node (ref R11) (pin 1))
+      (node (ref R29) (pin 1))
+      (node (ref L2) (pin 2))
       (node (ref U9) (pin 49))
-      (node (ref U9) (pin 27))
+      (node (ref R28) (pin 1))
+      (node (ref U2) (pin 2))
       (node (ref U9) (pin 14))
+      (node (ref U9) (pin 27))
+      (node (ref U9) (pin 1))
+      (node (ref R27) (pin 1))
+      (node (ref U9) (pin 3))
       (node (ref C7) (pin 1))
-      (node (ref U2) (pin 2))
-      (node (ref U1) (pin H15))
-      (node (ref D11) (pin 2))
-      (node (ref J2) (pin 20))
-      (node (ref U1) (pin L14))
-      (node (ref U1) (pin L15))
-      (node (ref R23) (pin 1))
-      (node (ref R28) (pin 1))
-      (node (ref R22) (pin 1))
       (node (ref U1) (pin T3))
-      (node (ref U1) (pin T4))
+      (node (ref U11) (pin 2))
-      (node (ref U1) (pin J15))
+      (node (ref D11) (pin 2))
-      (node (ref R11) (pin 1))
+      (node (ref SD1) (pin 4))
-      (node (ref R27) (pin 1)))
+      (node (ref R12) (pin 1))
+      (node (ref R31) (pin 1))
+      (node (ref U1) (pin T2))
+      (node (ref U10) (pin 8))
+      (node (ref U1) (pin U2))
+      (node (ref U1) (pin T4)))
     (net (code 27) (name /gpio/A16)
-      (node (ref U1) (pin A16))
+      (node (ref J2) (pin 11))
-      (node (ref J2) (pin 11)))
+      (node (ref U1) (pin A16)))
     (net (code 28) (name /gpio/D16)
       (node (ref U1) (pin D16))
       (node (ref J2) (pin 10)))
@@ -2015,46 +2036,46 @@
       (node (ref U1) (pin B18))
       (node (ref J2) (pin 6)))
     (net (code 31) (name /gpio/D14)
-      (node (ref J2) (pin 17))
+      (node (ref U1) (pin D14))
-      (node (ref U1) (pin D14)))
+      (node (ref J2) (pin 17)))
     (net (code 32) (name /gpio/B15)
       (node (ref J2) (pin 15))
       (node (ref U1) (pin B15)))
     (net (code 33) (name /gpio/D15)
-      (node (ref J2) (pin 13))
+      (node (ref U1) (pin D15))
-      (node (ref U1) (pin D15)))
+      (node (ref J2) (pin 13)))
     (net (code 34) (name /gpio/B16)
       (node (ref U1) (pin B16))
       (node (ref J2) (pin 12)))
     (net (code 35) (name /gpio/C16)
-      (node (ref U1) (pin C16))
+      (node (ref J2) (pin 9))
-      (node (ref J2) (pin 9)))
+      (node (ref U1) (pin C16)))
     (net (code 36) (name /gpio/B17)
-      (node (ref J2) (pin 7))
+      (node (ref U1) (pin B17))
-      (node (ref U1) (pin B17)))
+      (node (ref J2) (pin 7)))
     (net (code 37) (name /gpio/A17)
       (node (ref U1) (pin A17))
       (node (ref J2) (pin 5)))
     (net (code 38) (name +5V)
-      (node (ref C13) (pin 1))
+      (node (ref D51) (pin 1))
       (node (ref GPDI1) (pin 19))
-      (node (ref R24) (pin 1))
-      (node (ref R25) (pin 1))
-      (node (ref C18) (pin 1))
-      (node (ref U3) (pin 4))
       (node (ref U6) (pin 15))
-      (node (ref R3) (pin 1))
+      (node (ref D9) (pin 2))
-      (node (ref U4) (pin 4))
+      (node (ref D8) (pin 1))
       (node (ref C9) (pin 1))
+      (node (ref U3) (pin 4))
+      (node (ref C1) (pin 1))
+      (node (ref C5) (pin 1))
+      (node (ref D52) (pin 2))
+      (node (ref C13) (pin 1))
       (node (ref Q1) (pin 2))
-      (node (ref R26) (pin 1))
       (node (ref U5) (pin 4))
-      (node (ref C5) (pin 1))
+      (node (ref C18) (pin 1))
-      (node (ref D8) (pin 1))
+      (node (ref R26) (pin 1))
-      (node (ref D9) (pin 2))
+      (node (ref R25) (pin 1))
-      (node (ref C1) (pin 1))
+      (node (ref U4) (pin 4))
-      (node (ref D51) (pin 1))
+      (node (ref R24) (pin 1))
-      (node (ref D52) (pin 2)))
+      (node (ref R3) (pin 1)))
     (net (code 39) (name /gpio/A11)
       (node (ref U1) (pin A11))
       (node (ref J1) (pin 8)))
@@ -2071,14 +2092,14 @@
       (node (ref U1) (pin E9))
       (node (ref J1) (pin 14)))
     (net (code 44) (name /gpio/B9)
-      (node (ref U1) (pin C10))
+      (node (ref J1) (pin 12))
-      (node (ref J1) (pin 12)))
+      (node (ref U1) (pin C10)))
     (net (code 45) (name /gpio/A9)
       (node (ref J1) (pin 10))
       (node (ref U1) (pin A9)))
     (net (code 46) (name /gpio/C7)
-      (node (ref U1) (pin C6))
+      (node (ref J1) (pin 25))
-      (node (ref J1) (pin 25)))
+      (node (ref U1) (pin C6)))
     (net (code 47) (name /gpio/C11)
       (node (ref U1) (pin C11))
       (node (ref J1) (pin 6)))
@@ -2092,32 +2113,32 @@
       (node (ref J1) (pin 34))
       (node (ref U1) (pin B20)))
     (net (code 51) (name /gpio/A18)
-      (node (ref J1) (pin 35))
+      (node (ref U1) (pin A18))
-      (node (ref U1) (pin A18)))
+      (node (ref J1) (pin 35)))
     (net (code 52) (name /gpio/A19)
       (node (ref J1) (pin 33))
       (node (ref U1) (pin A19)))
     (net (code 53) (name /gpio/E6)
-      (node (ref J1) (pin 30))
+      (node (ref U1) (pin D6))
-      (node (ref U1) (pin D6)))
+      (node (ref J1) (pin 30)))
     (net (code 54) (name /gpio/E7)
       (node (ref J1) (pin 28))
       (node (ref U1) (pin D7)))
     (net (code 55) (name /gpio/C6)
-      (node (ref J1) (pin 26))
+      (node (ref U1) (pin C7))
-      (node (ref U1) (pin C7)))
+      (node (ref J1) (pin 26)))
     (net (code 56) (name /gpio/E8)
-      (node (ref U1) (pin D8))
+      (node (ref J1) (pin 24))
-      (node (ref J1) (pin 24)))
+      (node (ref U1) (pin D8)))
     (net (code 57) (name /gpio/B6)
       (node (ref U1) (pin A6))
       (node (ref J1) (pin 31)))
     (net (code 58) (name /gpio/D6)
-      (node (ref J1) (pin 29))
+      (node (ref U1) (pin E6))
-      (node (ref U1) (pin E6)))
+      (node (ref J1) (pin 29)))
     (net (code 59) (name /gpio/D7)
-      (node (ref U1) (pin E7))
+      (node (ref J1) (pin 27))
-      (node (ref J1) (pin 27)))
+      (node (ref U1) (pin E7)))
     (net (code 60) (name /gpio/OUT5V)
       (node (ref J2) (pin 40))
       (node (ref D52) (pin 1)))
@@ -2125,65 +2146,65 @@
       (node (ref J2) (pin 39))
       (node (ref D51) (pin 2)))
     (net (code 62) (name "Net-(L2-Pad1)")
-      (node (ref L2) (pin 1))
+      (node (ref U4) (pin 3))
-      (node (ref U4) (pin 3)))
+      (node (ref L2) (pin 1)))
     (net (code 63) (name +2V5)
-      (node (ref L3) (pin 2))
+      (node (ref RA2) (pin 1))
-      (node (ref U1) (pin P6))
-      (node (ref U1) (pin F6))
-      (node (ref U1) (pin P15))
       (node (ref U1) (pin F15))
       (node (ref U7) (pin 8))
-      (node (ref C10) (pin 1))
+      (node (ref U1) (pin P15))
-      (node (ref RA2) (pin 1))
+      (node (ref U1) (pin F6))
+      (node (ref U1) (pin P6))
+      (node (ref C12) (pin 1))
       (node (ref C11) (pin 1))
-      (node (ref C12) (pin 1)))
+      (node (ref L3) (pin 2))
+      (node (ref C10) (pin 1)))
     (net (code 64) (name /power/FB2)
-      (node (ref RB2) (pin 2))
+      (node (ref U5) (pin 5))
-      (node (ref RA2) (pin 2))
       (node (ref C10) (pin 2))
-      (node (ref U5) (pin 5)))
+      (node (ref RA2) (pin 2))
+      (node (ref RB2) (pin 2)))
     (net (code 65) (name "Net-(L3-Pad1)")
-      (node (ref L3) (pin 1))
+      (node (ref U5) (pin 3))
-      (node (ref U5) (pin 3)))
+      (node (ref L3) (pin 1)))
     (net (code 66) (name "Net-(L1-Pad1)")
       (node (ref L1) (pin 1))
       (node (ref U3) (pin 3)))
     (net (code 67) (name +1V2)
-      (node (ref C4) (pin 1))
-      (node (ref C3) (pin 1))
       (node (ref U1) (pin N13))
       (node (ref U1) (pin M13))
       (node (ref U1) (pin L13))
       (node (ref U1) (pin J13))
-      (node (ref U1) (pin H13))
-      (node (ref U1) (pin N12))
-      (node (ref U1) (pin K13))
-      (node (ref U1) (pin H11))
-      (node (ref C2) (pin 1))
-      (node (ref U1) (pin J8))
-      (node (ref U1) (pin K8))
       (node (ref U1) (pin L8))
-      (node (ref U1) (pin M8))
-      (node (ref U1) (pin N8))
-      (node (ref U1) (pin N10))
       (node (ref L1) (pin 2))
-      (node (ref U1) (pin N11))
+      (node (ref C2) (pin 1))
       (node (ref RA1) (pin 1))
+      (node (ref C4) (pin 1))
       (node (ref U1) (pin H8))
+      (node (ref U1) (pin J8))
+      (node (ref U1) (pin K8))
+      (node (ref C3) (pin 1))
+      (node (ref U1) (pin N11))
+      (node (ref U1) (pin N10))
+      (node (ref U1) (pin H11))
+      (node (ref U1) (pin M8))
       (node (ref U1) (pin H12))
-      (node (ref U1) (pin H10))
       (node (ref U1) (pin N9))
-      (node (ref U1) (pin H9)))
+      (node (ref U1) (pin H9))
+      (node (ref U1) (pin H10))
+      (node (ref U1) (pin N12))
+      (node (ref U1) (pin K13))
+      (node (ref U1) (pin H13))
+      (node (ref U1) (pin N8)))
     (net (code 68) (name /power/OSCI_32k)
-      (node (ref U7) (pin 1))
+      (node (ref Y1) (pin 1))
-      (node (ref Y1) (pin 1)))
+      (node (ref U7) (pin 1)))
     (net (code 69) (name /power/WKn)
-      (node (ref Q1) (pin 1))
+      (node (ref R6) (pin 1))
-      (node (ref R6) (pin 1)))
+      (node (ref Q1) (pin 1)))
     (net (code 70) (name FTDI_nSUSPEND)
-      (node (ref D12) (pin 2))
+      (node (ref R10) (pin 1))
-      (node (ref R10) (pin 1)))
+      (node (ref D12) (pin 2)))
     (net (code 71) (name "Net-(Q2-Pad3)")
       (node (ref Q2) (pin 3))
       (node (ref R8) (pin 2)))
@@ -2195,53 +2216,53 @@
       (node (ref Y1) (pin 4))
       (node (ref U7) (pin 2)))
     (net (code 75) (name /power/WAKEUPn)
-      (node (ref U7) (pin 7))
       (node (ref R6) (pin 2))
-      (node (ref D16) (pin 2)))
+      (node (ref D16) (pin 2))
+      (node (ref U7) (pin 7)))
     (net (code 76) (name /power/SHUT)
       (node (ref D15) (pin 1))
       (node (ref R5) (pin 1))
-      (node (ref D14) (pin 2))
+      (node (ref Q2) (pin 1))
       (node (ref C14) (pin 1))
-      (node (ref Q2) (pin 1)))
+      (node (ref D14) (pin 2)))
     (net (code 77) (name /power/WAKE)
-      (node (ref D10) (pin 1))
+      (node (ref R1) (pin 1))
-      (node (ref R1) (pin 1)))
+      (node (ref D10) (pin 1)))
     (net (code 78) (name SHUTDOWN)
-      (node (ref R13) (pin 1))
+      (node (ref D15) (pin 2))
-      (node (ref D15) (pin 2)))
+      (node (ref R13) (pin 1)))
     (net (code 79) (name BTN_PWRn)
-      (node (ref U1) (pin H4))
+      (node (ref D17) (pin 2))
-      (node (ref D17) (pin 2)))
+      (node (ref U1) (pin H4)))
     (net (code 80) (name "Net-(BTN0-Pad1)")
       (node (ref D17) (pin 1))
-      (node (ref BTN0) (pin 1))
       (node (ref D16) (pin 1))
-      (node (ref R3) (pin 2)))
+      (node (ref R3) (pin 2))
+      (node (ref BTN0) (pin 1)))
     (net (code 81) (name /power/WKUP)
+      (node (ref C13) (pin 2))
       (node (ref Q1) (pin 3))
-      (node (ref D13) (pin 1))
       (node (ref D10) (pin 2))
-      (node (ref C13) (pin 2)))
+      (node (ref D13) (pin 1)))
     (net (code 82) (name /power/FB1)
-      (node (ref U3) (pin 5))
+      (node (ref C2) (pin 2))
-      (node (ref RA1) (pin 2))
       (node (ref RB1) (pin 2))
-      (node (ref C2) (pin 2)))
+      (node (ref U3) (pin 5))
+      (node (ref RA1) (pin 2)))
     (net (code 83) (name /power/PWREN)
       (node (ref R1) (pin 2))
-      (node (ref U5) (pin 1))
       (node (ref R2) (pin 1))
-      (node (ref R8) (pin 1))
+      (node (ref U5) (pin 1))
+      (node (ref R4) (pin 2))
       (node (ref D12) (pin 1))
-      (node (ref U4) (pin 1))
       (node (ref U3) (pin 1))
-      (node (ref R4) (pin 2)))
+      (node (ref R8) (pin 1))
+      (node (ref U4) (pin 1)))
     (net (code 84) (name /power/FB3)
-      (node (ref U4) (pin 5))
       (node (ref RB3) (pin 2))
       (node (ref C6) (pin 2))
-      (node (ref RA3) (pin 2)))
+      (node (ref RA3) (pin 2))
+      (node (ref U4) (pin 5)))
     (net (code 85) (name I2C_SDA)
       (node (ref U7) (pin 5)))
     (net (code 86) (name /power/VBAT)
@@ -2253,11 +2274,16 @@
     (net (code 88) (name I2C_SCL)
       (node (ref U7) (pin 6)))
     (net (code 89) (name LED2)
-      (node (ref D2) (pin 2))
+      (node (ref U1) (pin C2))
-      (node (ref U1) (pin C2)))
+      (node (ref D2) (pin 2)))
-    (net (code 90) (name OLED_CS)
+    (net (code 90) (name /blinkey/BTNPU)
-      (node (ref U1) (pin L2))
+      (node (ref BTN3) (pin 1))
-      (node (ref OLED1) (pin 7)))
+      (node (ref BTN5) (pin 1))
+      (node (ref BTN2) (pin 1))
+      (node (ref BTN1) (pin 1))
+      (node (ref R7) (pin 2))
+      (node (ref BTN4) (pin 1))
+      (node (ref BTN6) (pin 1)))
     (net (code 91) (name LED7)
       (node (ref D7) (pin 2))
       (node (ref U1) (pin G5)))
@@ -2268,28 +2294,23 @@
       (node (ref D5) (pin 2))
       (node (ref U1) (pin D1)))
     (net (code 94) (name LED4)
-      (node (ref U1) (pin E1))
+      (node (ref D4) (pin 2))
-      (node (ref D4) (pin 2)))
+      (node (ref U1) (pin E1)))
     (net (code 95) (name LED3)
-      (node (ref U1) (pin B1))
+      (node (ref D3) (pin 2))
-      (node (ref D3) (pin 2)))
+      (node (ref U1) (pin B1)))
     (net (code 96) (name LED1)
       (node (ref U1) (pin E3))
       (node (ref D1) (pin 2)))
     (net (code 97) (name LED0)
-      (node (ref U1) (pin F5))
+      (node (ref D0) (pin 2))
-      (node (ref D0) (pin 2)))
+      (node (ref U1) (pin F5)))
     (net (code 98) (name OLED_RES)
-      (node (ref OLED1) (pin 5))
+      (node (ref U1) (pin P5))
-      (node (ref U1) (pin P5)))
+      (node (ref OLED1) (pin 5)))
-    (net (code 99) (name /blinkey/BTNPU)
+    (net (code 99) (name OLED_CS)
-      (node (ref BTN6) (pin 1))
+      (node (ref OLED1) (pin 7))
-      (node (ref R7) (pin 2))
+      (node (ref U1) (pin L2)))
-      (node (ref BTN1) (pin 1))
-      (node (ref BTN2) (pin 1))
-      (node (ref BTN4) (pin 1))
-      (node (ref BTN3) (pin 1))
-      (node (ref BTN5) (pin 1)))
     (net (code 100) (name OLED_DC)
       (node (ref U1) (pin N5))
       (node (ref OLED1) (pin 6)))
@@ -2311,18 +2332,19 @@
       (node (ref U1) (pin F4))
       (node (ref BTN3) (pin 2)))
     (net (code 107) (name BTN_F2)
-      (node (ref U1) (pin H5))
+      (node (ref BTN2) (pin 2))
-      (node (ref BTN2) (pin 2)))
+      (node (ref U1) (pin H5)))
     (net (code 108) (name BTN_F1)
       (node (ref BTN1) (pin 2))
       (node (ref U1) (pin C1)))
     (net (code 109) (name "Net-(U1-PadE2)")
       (node (ref U1) (pin E2)))
-    (net (code 110) (name "Net-(U1-PadF2)")
+    (net (code 110) (name GPDI_D2_P)
-      (node (ref U1) (pin F2)))
+      (node (ref U1) (pin A3))
-    (net (code 111) (name GPDI_D2_P)
+      (node (ref GPDI1) (pin 3)))
-      (node (ref GPDI1) (pin 3))
+    (net (code 111) (name GPDI_D2_N)
-      (node (ref U1) (pin A3)))
+      (node (ref GPDI1) (pin 5))
+      (node (ref U1) (pin B3)))
     (net (code 112) (name GPDI_ETH_P)
       (node (ref U1) (pin C3))
       (node (ref GPDI1) (pin 2)))
@@ -2337,71 +2359,71 @@
       (node (ref GPDI1) (pin 6))
       (node (ref U1) (pin A4)))
     (net (code 117) (name GPDI_CLK_N)
-      (node (ref U1) (pin B4))
+      (node (ref GPDI1) (pin 14))
-      (node (ref GPDI1) (pin 14)))
+      (node (ref U1) (pin B4)))
     (net (code 118) (name GPDI_CLK_P)
-      (node (ref U1) (pin C4))
+      (node (ref GPDI1) (pin 12))
-      (node (ref GPDI1) (pin 12)))
+      (node (ref U1) (pin C4)))
-    (net (code 119) (name GPDI_D2_N)
+    (net (code 119) (name /gpdi/CLK_25MHz)
-      (node (ref U1) (pin B3))
+      (node (ref Y2) (pin 3))
-      (node (ref GPDI1) (pin 5)))
+      (node (ref U1) (pin F2)))
     (net (code 120) (name GPDI_D1_N)
       (node (ref U1) (pin A5))
       (node (ref GPDI1) (pin 8)))
     (net (code 121) (name GPDI_D0_P)
-      (node (ref U1) (pin B5))
+      (node (ref GPDI1) (pin 9))
-      (node (ref GPDI1) (pin 9)))
+      (node (ref U1) (pin B5)))
     (net (code 122) (name GPDI_D0_N)
       (node (ref GPDI1) (pin 11))
       (node (ref U1) (pin C5)))
     (net (code 123) (name GPDI_CEC)
       (node (ref GPDI1) (pin 15))
       (node (ref U1) (pin E5)))
-    (net (code 124) (name GPDI_5V_SDA)
+    (net (code 124) (name GPDI_SCL)
-      (node (ref GPDI1) (pin 18))
-      (node (ref R26) (pin 2))
-      (node (ref U11) (pin 5)))
-    (net (code 125) (name /gpdi/VREF2)
-      (node (ref U11) (pin 8))
-      (node (ref R24) (pin 2))
-      (node (ref U11) (pin 7)))
-    (net (code 126) (name GPDI_SCL)
-      (node (ref R23) (pin 2))
       (node (ref U1) (pin E4))
-      (node (ref U11) (pin 3)))
+      (node (ref U11) (pin 3))
-    (net (code 127) (name GPDI_SDA)
+      (node (ref R23) (pin 2)))
-      (node (ref U1) (pin D5))
+    (net (code 125) (name GPDI_SDA)
+      (node (ref U11) (pin 4))
       (node (ref R22) (pin 2))
-      (node (ref U11) (pin 4)))
+      (node (ref U1) (pin D5)))
-    (net (code 128) (name GPDI_5V_SCL)
+    (net (code 126) (name GPDI_5V_SCL)
-      (node (ref GPDI1) (pin 17))
       (node (ref R25) (pin 2))
+      (node (ref GPDI1) (pin 17))
       (node (ref U11) (pin 6)))
+    (net (code 127) (name /gpdi/VREF2)
+      (node (ref U11) (pin 8))
+      (node (ref U11) (pin 7))
+      (node (ref R24) (pin 2)))
+    (net (code 128) (name GPDI_5V_SDA)
+      (node (ref R26) (pin 2))
+      (node (ref GPDI1) (pin 18))
+      (node (ref U11) (pin 5)))
     (net (code 129) (name FTDI_nDTR)
       (node (ref U6) (pin 1))
       (node (ref R10) (pin 2)))
     (net (code 130) (name /usb/FT3V3)
       (node (ref R9) (pin 2))
-      (node (ref U6) (pin 3))
+      (node (ref U6) (pin 13))
-      (node (ref U6) (pin 13)))
+      (node (ref U6) (pin 3)))
     (net (code 131) (name nRESET)
-      (node (ref U6) (pin 14))
+      (node (ref R9) (pin 1))
-      (node (ref R9) (pin 1)))
+      (node (ref U6) (pin 14)))
     (net (code 132) (name FTDI_nRTS)
-      (node (ref U6) (pin 2))
+      (node (ref U1) (pin H1))
-      (node (ref U1) (pin H1)))
+      (node (ref U6) (pin 2)))
     (net (code 133) (name WIFI_EN)
       (node (ref R34) (pin 2))
       (node (ref U2) (pin 3)))
     (net (code 134) (name WIFI_GPIO2)
-      (node (ref U1) (pin J1))
+      (node (ref U2) (pin 24))
-      (node (ref U2) (pin 24)))
+      (node (ref U1) (pin J1)))
     (net (code 135) (name WIFI_GPIO0)
-      (node (ref U1) (pin K1))
+      (node (ref U2) (pin 25))
-      (node (ref U2) (pin 25)))
+      (node (ref U1) (pin K1)))
     (net (code 136) (name AUDIO_R0)
-      (node (ref U1) (pin L1))
+      (node (ref R21) (pin 1))
-      (node (ref R21) (pin 1)))
+      (node (ref U1) (pin L1)))
     (net (code 137) (name AUDIO_L1)
       (node (ref U1) (pin M1))
       (node (ref R16) (pin 1)))
@@ -2420,21 +2442,21 @@
       (node (ref R20) (pin 1))
       (node (ref U1) (pin N2)))
     (net (code 143) (name JTAG_TCK)
-      (node (ref U6) (pin 18))
+      (node (ref U1) (pin T5))
       (node (ref U2) (pin 30))
-      (node (ref U1) (pin T5)))
+      (node (ref U6) (pin 18)))
     (net (code 144) (name JTAG_TDI)
-      (node (ref U2) (pin 31))
+      (node (ref U1) (pin R5))
       (node (ref U6) (pin 17))
-      (node (ref U1) (pin R5)))
+      (node (ref U2) (pin 31)))
     (net (code 145) (name JTAG_TDO)
       (node (ref U6) (pin 10))
       (node (ref U1) (pin V4))
       (node (ref U2) (pin 32)))
     (net (code 146) (name JTAG_TMS)
-      (node (ref U6) (pin 19))
+      (node (ref U2) (pin 33))
       (node (ref U1) (pin U5))
-      (node (ref U2) (pin 33)))
+      (node (ref U6) (pin 19)))
     (net (code 147) (name "Net-(U1-PadN4)")
       (node (ref U1) (pin N4)))
     (net (code 148) (name FTDI_TXD)
@@ -2456,39 +2478,39 @@
       (node (ref U1) (pin J4))
       (node (ref U6) (pin 4)))
     (net (code 155) (name FTDI_nRI)
-      (node (ref U6) (pin 5))
+      (node (ref U1) (pin K4))
-      (node (ref U1) (pin K4)))
+      (node (ref U6) (pin 5)))
     (net (code 156) (name FTDI_nDCD)
-      (node (ref U1) (pin L4))
+      (node (ref U6) (pin 8))
-      (node (ref U6) (pin 8)))
+      (node (ref U1) (pin L4)))
     (net (code 157) (name "Net-(U1-PadM4)")
       (node (ref U1) (pin M4)))
     (net (code 158) (name AUDIO_L3)
       (node (ref R14) (pin 1))
       (node (ref U1) (pin P2)))
     (net (code 159) (name AUDIO_L2)
-      (node (ref R15) (pin 1))
+      (node (ref U1) (pin P4))
-      (node (ref U1) (pin P4)))
+      (node (ref R15) (pin 1)))
     (net (code 160) (name WIFI_RXD)
-      (node (ref U2) (pin 34))
+      (node (ref U1) (pin J5))
-      (node (ref U1) (pin J5)))
+      (node (ref U2) (pin 34)))
     (net (code 161) (name WIFI_GPIO15)
-      (node (ref U2) (pin 23))
+      (node (ref U1) (pin L5))
-      (node (ref U1) (pin L5)))
+      (node (ref U2) (pin 23)))
-    (net (code 162) (name USB_FTDI_DP)
+    (net (code 162) (name "Net-(US1-Pad4)")
-      (node (ref U6) (pin 11))
+      (node (ref US1) (pin 4)))
-      (node (ref US1) (pin 3)))
     (net (code 163) (name USB5V)
       (node (ref D8) (pin 2))
       (node (ref US1) (pin 1)))
     (net (code 164) (name USB_FTDI_DM)
-      (node (ref US1) (pin 2))
+      (node (ref U6) (pin 12))
-      (node (ref U6) (pin 12)))
+      (node (ref US1) (pin 2)))
-    (net (code 165) (name "Net-(US1-Pad4)")
+    (net (code 165) (name USB_FTDI_DP)
-      (node (ref US1) (pin 4)))
+      (node (ref US1) (pin 3))
+      (node (ref U6) (pin 11)))
     (net (code 166) (name "Net-(D9-Pad1)")
-      (node (ref D9) (pin 1))
+      (node (ref US2) (pin 1))
-      (node (ref US2) (pin 1)))
+      (node (ref D9) (pin 1)))
     (net (code 167) (name USB_FPGA_DM)
       (node (ref US2) (pin 2)))
     (net (code 168) (name USB_FPGA_DP)
@@ -2505,8 +2527,8 @@
     (net (code 173) (name "Net-(U2-Pad27)")
       (node (ref U2) (pin 27)))
     (net (code 174) (name SD_2)
-      (node (ref SD1) (pin 9))
+      (node (ref U2) (pin 17))
-      (node (ref U2) (pin 17)))
+      (node (ref SD1) (pin 9)))
     (net (code 175) (name "Net-(U2-Pad36)")
       (node (ref U2) (pin 36)))
     (net (code 176) (name "Net-(U2-Pad16)")
@@ -2526,18 +2548,18 @@
     (net (code 183) (name "Net-(U2-Pad29)")
       (node (ref U2) (pin 29)))
     (net (code 184) (name SD_CMD)
+      (node (ref U1) (pin P19))
       (node (ref U2) (pin 19))
-      (node (ref SD1) (pin 2))
+      (node (ref SD1) (pin 2)))
-      (node (ref U1) (pin P19)))
     (net (code 185) (name SD_D1)
+      (node (ref U2) (pin 22))
       (node (ref SD1) (pin 8))
-      (node (ref U1) (pin U20))
+      (node (ref U1) (pin U20)))
-      (node (ref U2) (pin 22)))
     (net (code 186) (name "Net-(U2-Pad12)")
       (node (ref U2) (pin 12)))
     (net (code 187) (name SD_D0)
-      (node (ref U2) (pin 21))
       (node (ref U1) (pin N19))
+      (node (ref U2) (pin 21))
       (node (ref SD1) (pin 7)))
     (net (code 188) (name "Net-(U2-Pad11)")
       (node (ref U2) (pin 11)))
@@ -2563,11 +2585,11 @@
       (node (ref U9) (pin 4))
       (node (ref U1) (pin K19)))
     (net (code 198) (name SDRAM_A1)
-      (node (ref U1) (pin J19))
+      (node (ref U9) (pin 24))
-      (node (ref U9) (pin 24)))
+      (node (ref U1) (pin J19)))
     (net (code 199) (name SDRAM_A3)
-      (node (ref U9) (pin 26))
+      (node (ref U1) (pin G19))
-      (node (ref U1) (pin G19)))
+      (node (ref U9) (pin 26)))
     (net (code 200) (name SDRAM_D5)
       (node (ref U9) (pin 10))
       (node (ref U1) (pin F19)))
@@ -2575,23 +2597,23 @@
       (node (ref U1) (pin E19))
       (node (ref U9) (pin 11)))
     (net (code 202) (name SDRAM_D7)
-      (node (ref U1) (pin D19))
+      (node (ref U9) (pin 13))
-      (node (ref U9) (pin 13)))
+      (node (ref U1) (pin D19)))
     (net (code 203) (name SDRAM_A2)
-      (node (ref U1) (pin J18))
+      (node (ref U9) (pin 25))
-      (node (ref U9) (pin 25)))
+      (node (ref U1) (pin J18)))
     (net (code 204) (name SDRAM_A9)
       (node (ref U1) (pin H18))
       (node (ref U9) (pin 34)))
     (net (code 205) (name SDRAM_A7)
-      (node (ref U9) (pin 32))
+      (node (ref U1) (pin C20))
-      (node (ref U1) (pin C20)))
+      (node (ref U9) (pin 32)))
     (net (code 206) (name SDRAM_A6)
       (node (ref U1) (pin D20))
       (node (ref U9) (pin 31)))
     (net (code 207) (name SDRAM_A5)
-      (node (ref U1) (pin E20))
+      (node (ref U9) (pin 30))
-      (node (ref U9) (pin 30)))
+      (node (ref U1) (pin E20)))
     (net (code 208) (name SDRAM_A4)
       (node (ref U1) (pin F20))
       (node (ref U9) (pin 29)))
@@ -2599,11 +2621,11 @@
       (node (ref U9) (pin 8))
       (node (ref U1) (pin G20)))
     (net (code 210) (name SDRAM_D3)
-      (node (ref U1) (pin H20))
+      (node (ref U9) (pin 7))
-      (node (ref U9) (pin 7)))
+      (node (ref U1) (pin H20)))
     (net (code 211) (name SDRAM_A0)
-      (node (ref U1) (pin J20))
+      (node (ref U9) (pin 23))
-      (node (ref U9) (pin 23)))
+      (node (ref U1) (pin J20)))
     (net (code 212) (name SDRAM_D0)
       (node (ref U1) (pin K20))
       (node (ref U9) (pin 2)))
@@ -2611,14 +2633,14 @@
       (node (ref U9) (pin 47))
       (node (ref U1) (pin G18)))
     (net (code 214) (name SDRAM_D14)
-      (node (ref U1) (pin F16))
+      (node (ref U9) (pin 51))
-      (node (ref U9) (pin 51)))
+      (node (ref U1) (pin F16)))
     (net (code 215) (name SDRAM_A10)
-      (node (ref U9) (pin 22))
+      (node (ref U1) (pin G16))
-      (node (ref U1) (pin G16)))
+      (node (ref U9) (pin 22)))
     (net (code 216) (name SDRAM_D10)
-      (node (ref U9) (pin 45))
+      (node (ref U1) (pin H16))
-      (node (ref U1) (pin H16)))
+      (node (ref U9) (pin 45)))
     (net (code 217) (name SDRAM_D8)
       (node (ref U1) (pin J16))
       (node (ref U9) (pin 42)))
@@ -2626,8 +2648,8 @@
       (node (ref U9) (pin 53))
       (node (ref U1) (pin D17)))
     (net (code 219) (name SDRAM_D13)
-      (node (ref U9) (pin 50))
+      (node (ref U1) (pin E17))
-      (node (ref U1) (pin E17)))
+      (node (ref U9) (pin 50)))
     (net (code 220) (name SDRAM_A11)
       (node (ref U1) (pin F17))
       (node (ref U9) (pin 35)))
@@ -2660,11 +2682,11 @@
     (net (code 232) (name "Net-(U1-PadM19)")
       (node (ref U1) (pin M19)))
     (net (code 233) (name SDRAM_DQM1)
-      (node (ref U9) (pin 39))
+      (node (ref U1) (pin U17))
-      (node (ref U1) (pin U17)))
+      (node (ref U9) (pin 39)))
     (net (code 234) (name SDRAM_D2)
-      (node (ref U9) (pin 5))
+      (node (ref U1) (pin K18))
-      (node (ref U1) (pin K18)))
+      (node (ref U9) (pin 5)))
     (net (code 235) (name SD_WP)
       (node (ref SD1) (pin 11))
       (node (ref U1) (pin N20)))
@@ -2689,11 +2711,11 @@
     (net (code 245) (name "Net-(U1-PadP17)")
       (node (ref U1) (pin P17)))
     (net (code 246) (name SD_CD)
-      (node (ref SD1) (pin 10))
+      (node (ref U1) (pin R17))
-      (node (ref U1) (pin R17)))
+      (node (ref SD1) (pin 10)))
     (net (code 247) (name SDRAM_DQM0)
-      (node (ref U9) (pin 15))
+      (node (ref U1) (pin T17))
-      (node (ref U1) (pin T17)))
+      (node (ref U9) (pin 15)))
     (net (code 248) (name SDRAM_CKE)
       (node (ref U1) (pin C18))
       (node (ref U9) (pin 37)))
@@ -2701,20 +2723,20 @@
       (node (ref U1) (pin U19))
       (node (ref U9) (pin 16)))
     (net (code 250) (name SDRAM_nCAS)
-      (node (ref U1) (pin U18))
+      (node (ref U9) (pin 17))
-      (node (ref U9) (pin 17)))
+      (node (ref U1) (pin U18)))
     (net (code 251) (name SDRAM_nRAS)
-      (node (ref U9) (pin 18))
+      (node (ref U1) (pin U16))
-      (node (ref U1) (pin U16)))
+      (node (ref U9) (pin 18)))
     (net (code 252) (name SDRAM_CLK)
-      (node (ref U1) (pin E16))
+      (node (ref U9) (pin 38))
-      (node (ref U9) (pin 38)))
+      (node (ref U1) (pin E16)))
     (net (code 253) (name SDRAM_nCS)
       (node (ref U1) (pin T19))
       (node (ref U9) (pin 19)))
     (net (code 254) (name SDRAM_BA1)
-      (node (ref U9) (pin 21))
+      (node (ref U1) (pin D18))
-      (node (ref U1) (pin D18)))
+      (node (ref U9) (pin 21)))
     (net (code 255) (name "Net-(AUDIO1-Pad4)")
       (node (ref AUDIO1) (pin 4)))
     (net (code 256) (name "Net-(AUDIO1-Pad5)")
@@ -2723,24 +2745,24 @@
       (node (ref AUDIO1) (pin 6)))
     (net (code 258) (name /analog/AUDIO_R)
       (node (ref R18) (pin 2))
-      (node (ref R20) (pin 2))
-      (node (ref AUDIO1) (pin 3))
       (node (ref R19) (pin 2))
-      (node (ref R21) (pin 2)))
+      (node (ref R20) (pin 2))
+      (node (ref R21) (pin 2))
+      (node (ref AUDIO1) (pin 3)))
     (net (code 259) (name /analog/AUDIO_L)
+      (node (ref R15) (pin 2))
+      (node (ref R17) (pin 2))
       (node (ref R16) (pin 2))
       (node (ref AUDIO1) (pin 1))
-      (node (ref R17) (pin 2))
-      (node (ref R15) (pin 2))
       (node (ref R14) (pin 2)))
     (net (code 260) (name /flash/FLASH_SCK)
       (node (ref U1) (pin U3))
-      (node (ref R29) (pin 2))
+      (node (ref U10) (pin 6))
-      (node (ref U10) (pin 6)))
+      (node (ref R29) (pin 2)))
     (net (code 261) (name /flash/FLASH_nCS)
       (node (ref U10) (pin 1))
-      (node (ref R30) (pin 2))
+      (node (ref U1) (pin R2))
-      (node (ref U1) (pin R2)))
+      (node (ref R30) (pin 2)))
     (net (code 262) (name /flash/FLASH_nWP)
       (node (ref R11) (pin 2))
       (node (ref U10) (pin 3)))
@@ -2767,13 +2789,13 @@
     (net (code 271) (name "Net-(U1-PadR1)")
       (node (ref U1) (pin R1)))
     (net (code 272) (name /flash/FLASH_MOSI)
-      (node (ref U10) (pin 5))
+      (node (ref R27) (pin 2))
       (node (ref U1) (pin W2))
-      (node (ref R27) (pin 2)))
+      (node (ref U10) (pin 5)))
     (net (code 273) (name /flash/FLASH_MISO)
       (node (ref U1) (pin V2))
-      (node (ref R28) (pin 2))
+      (node (ref U10) (pin 2))
-      (node (ref U10) (pin 2)))
+      (node (ref R28) (pin 2)))
     (net (code 274) (name "Net-(U1-PadR3)")
       (node (ref U1) (pin R3)))
     (net (code 275) (name "Net-(U1-PadY2)")

ulx3s.sch

@@ -159,10 +159,10 @@ F 3 "" H 4800 6350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR1
+L GND #PWR01
 U 1 1 58E6BC0E
 P 3150 6550
-F 0 "#PWR1" H 3150 6300 50  0001 C CNN
+F 0 "#PWR01" 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 #PWR2
+L GND #PWR02
 U 1 1 58E6BC2E
 P 3700 6550
-F 0 "#PWR2" H 3700 6300 50  0001 C CNN
+F 0 "#PWR02" H 3700 6300 50  0001 C CNN
 F 1 "GND" H 3700 6400 50  0000 C CNN
 F 2 "" H 3700 6550 50  0000 C CNN
 F 3 "" H 3700 6550 50  0000 C CNN
@@ -181,10 +181,10 @@ F 3 "" H 3700 6550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR3
+L GND #PWR03
 U 1 1 58E6BC56
 P 4250 6550
-F 0 "#PWR3" H 4250 6300 50  0001 C CNN
+F 0 "#PWR03" 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
@@ -192,10 +192,10 @@ F 3 "" H 4250 6550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR4
+L GND #PWR04
 U 1 1 58E6BC72
 P 4800 6550
-F 0 "#PWR4" H 4800 6300 50  0001 C CNN
+F 0 "#PWR04" H 4800 6300 50  0001 C CNN
 F 1 "GND" H 4800 6400 50  0000 C CNN
 F 2 "" H 4800 6550 50  0000 C CNN
 F 3 "" H 4800 6550 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 #PWR074
+L +5V #PWR80
 U 1 1 58D6C83B
 P 2800 1700
-F 0 "#PWR074" H 2800 1550 50  0001 C CNN
+F 0 "#PWR80" 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 #PWR075
+L +5V #PWR81
 U 1 1 58D6C83D
 P 2850 2650
-F 0 "#PWR075" H 2850 2500 50  0001 C CNN
+F 0 "#PWR81" 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 #PWR076
+L GND #PWR78
 U 1 1 58D6C842
 P 1900 2100
-F 0 "#PWR076" H 1900 1850 50  0001 C CNN
+F 0 "#PWR78" 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 #PWR077
+L GND #PWR79
 U 1 1 58D6C843
 P 1900 3050
-F 0 "#PWR077" H 1900 2800 50  0001 C CNN
+F 0 "#PWR79" 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_DP
 NoConn ~ 1850 2950
 NoConn ~ 1850 2000
 $Comp
-L GND #PWR078
+L GND #PWR76
 U 1 1 58D82518
 P 1400 2300
-F 0 "#PWR078" H 1400 2050 50  0001 C CNN
+F 0 "#PWR76" 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 #PWR079
+L GND #PWR77
 U 1 1 58D8254A
 P 1400 3250
-F 0 "#PWR079" H 1400 3000 50  0001 C CNN
+F 0 "#PWR77" 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 #PWR080
+L GND #PWR83
 U 1 1 58D8877C
 P 5600 4500
-F 0 "#PWR080" H 5600 4250 50  0001 C CNN
+F 0 "#PWR83" 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
@@ -246,10 +246,10 @@ F 3 "" H 5700 3400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR081
+L +5V #PWR82
 U 1 1 58EB8213
 P 5600 2500
-F 0 "#PWR081" H 5600 2350 50  0001 C CNN
+F 0 "#PWR82" 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
@@ -368,10 +368,10 @@ Wire Wire Line
 Wire Wire Line
 	6750 5150 6850 5150
 $Comp
-L LFE5-BG381 U?
+L LFE5-BG381 U1
 U 5 1 58EDBDE6
 P 9400 2050
-F 0 "U?" H 9400 3000 60  0000 C CNN
+F 0 "U1" H 9400 3000 60  0000 C CNN
 F 1 "LFE5U-25F-6BG381C" H 9400 2900 60  0000 C CNN
 F 2 "lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm" H 8350 3000 60  0001 C CNN
 F 3 "" H 8350 3000 60  0000 C CNN

usb.sch

@@ -64,10 +64,10 @@ F 3 "" V 2650 1700 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L +5V #PWR78
+L +5V #PWR076
 U 1 1 58D6C83B
 P 2800 1700
-F 0 "#PWR78" H 2800 1550 50  0001 C CNN
+F 0 "#PWR076" 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 #PWR79
+L +5V #PWR077
 U 1 1 58D6C83D
 P 2850 2650
-F 0 "#PWR79" H 2850 2500 50  0001 C CNN
+F 0 "#PWR077" 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 #PWR76
+L GND #PWR078
 U 1 1 58D6C842
 P 1900 2100
-F 0 "#PWR76" H 1900 1850 50  0001 C CNN
+F 0 "#PWR078" 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 #PWR77
+L GND #PWR079
 U 1 1 58D6C843
 P 1900 3050
-F 0 "#PWR77" H 1900 2800 50  0001 C CNN
+F 0 "#PWR079" 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_DP
 NoConn ~ 1850 2950
 NoConn ~ 1850 2000
 $Comp
-L GND #PWR74
+L GND #PWR080
 U 1 1 58D82518
 P 1400 2300
-F 0 "#PWR74" H 1400 2050 50  0001 C CNN
+F 0 "#PWR080" 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 #PWR75
+L GND #PWR081
 U 1 1 58D8254A
 P 1400 3250
-F 0 "#PWR75" H 1400 3000 50  0001 C CNN
+F 0 "#PWR081" 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 #PWR81
+L GND #PWR082
 U 1 1 58D8877C
 P 5600 4500
-F 0 "#PWR81" H 5600 4250 50  0001 C CNN
+F 0 "#PWR082" 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
@@ -246,10 +246,10 @@ F 3 "" H 5700 3400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR80
+L +5V #PWR083
 U 1 1 58EB8213
 P 5600 2500
-F 0 "#PWR80" H 5600 2350 50  0001 C CNN
+F 0 "#PWR083" 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

wifi.bak

@@ -94,10 +94,10 @@ F 3 "" H 6400 5250 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR082
+L GND #PWR86
 U 1 1 58E56E8D
 P 5500 4100
-F 0 "#PWR082" H 5500 3850 50  0001 C CNN
+F 0 "#PWR86" 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
@@ -105,10 +105,10 @@ F 3 "" H 5500 4100 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR083
+L +3V3 #PWR85
 U 1 1 58E56EA3
 P 5350 4200
-F 0 "#PWR083" H 5350 4050 50  0001 C CNN
+F 0 "#PWR85" 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
@@ -122,10 +122,10 @@ Wire Wire Line
 Text GLabel 5900 4300 0    60   Input ~ 0
 WIFI_EN
 $Comp
-L +3V3 #PWR084
+L +3V3 #PWR84
 U 1 1 58ED6C57
 P 4600 4300
-F 0 "#PWR084" H 4600 4150 50  0001 C CNN
+F 0 "#PWR84" 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

wifi.sch

@@ -94,10 +94,10 @@ F 3 "" H 6400 5250 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR84
+L GND #PWR084
 U 1 1 58E56E8D
 P 5500 4100
-F 0 "#PWR84" H 5500 3850 50  0001 C CNN
+F 0 "#PWR084" 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
@@ -105,10 +105,10 @@ F 3 "" H 5500 4100 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR83
+L +3V3 #PWR085
 U 1 1 58E56EA3
 P 5350 4200
-F 0 "#PWR83" H 5350 4050 50  0001 C CNN
+F 0 "#PWR085" 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
@@ -122,10 +122,10 @@ Wire Wire Line
 Text GLabel 5900 4300 0    60   Input ~ 0
 WIFI_EN
 $Comp
-L +3V3 #PWR82
+L +3V3 #PWR086
 U 1 1 58ED6C57
 P 4600 4300
-F 0 "#PWR82" H 4600 4150 50  0001 C CNN
+F 0 "#PWR086" 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