crystal footprint rename Ceramic->plastic, label nets

7 years ago · 728e442b49
parent 64741b460a
commit 728e442b49
6 changed files with 800 additions and 399 deletions
--- a/footprints/crystal/abs25.pretty/Crystal_SMD_ABS25.kicad_mod
+++ b/footprints/crystal/abs25.pretty/Crystal_SMD_ABS25.kicad_mod
@ -1,5 +1,5 @@
 (module abs25:Crystal_SMD_ABS25 (layer F.Cu) (tedit 58D83518)
-  (descr "Abracon ABS25 Ceramic SMD Crystal http://www.abracon.com/Resonators/abs25.pdf")
+  (descr "Abracon ABS25 Plastic SMD Crystal http://www.abracon.com/Resonators/abs25.pdf")
  (tags "plastic smd crystal")
  (attr smd)
  (fp_text reference Y1 (at 0 -3.2) (layer F.SilkS)
--- a/power.bak
+++ b/power.bak
@ -217,7 +217,201 @@ $EndComp
 Wire Wire Line
 	900  2450 900  2550
 Wire Wire Line
-	900  2550 10850 2550
+	900  2550 1000 2550
+Wire Wire Line
+	1000 2550 1100 2550
+Wire Wire Line
+	1100 2550 1200 2550
+Wire Wire Line
+	1200 2550 1300 2550
+Wire Wire Line
+	1300 2550 1400 2550
+Wire Wire Line
+	1400 2550 1500 2550
+Wire Wire Line
+	1500 2550 1600 2550
+Wire Wire Line
+	1600 2550 1700 2550
+Wire Wire Line
+	1700 2550 1800 2550
+Wire Wire Line
+	1800 2550 2050 2550
+Wire Wire Line
+	2050 2550 2150 2550
+Wire Wire Line
+	2150 2550 2250 2550
+Wire Wire Line
+	2250 2550 2350 2550
+Wire Wire Line
+	2350 2550 2450 2550
+Wire Wire Line
+	2450 2550 2550 2550
+Wire Wire Line
+	2550 2550 2650 2550
+Wire Wire Line
+	2650 2550 2750 2550
+Wire Wire Line
+	2750 2550 2850 2550
+Wire Wire Line
+	2850 2550 2950 2550
+Wire Wire Line
+	2950 2550 3050 2550
+Wire Wire Line
+	3050 2550 3150 2550
+Wire Wire Line
+	3150 2550 3250 2550
+Wire Wire Line
+	3250 2550 3350 2550
+Wire Wire Line
+	3350 2550 3450 2550
+Wire Wire Line
+	3450 2550 3550 2550
+Wire Wire Line
+	3550 2550 3650 2550
+Wire Wire Line
+	3650 2550 3750 2550
+Wire Wire Line
+	3750 2550 3850 2550
+Wire Wire Line
+	3850 2550 3950 2550
+Wire Wire Line
+	3950 2550 4050 2550
+Wire Wire Line
+	4050 2550 4150 2550
+Wire Wire Line
+	4150 2550 4250 2550
+Wire Wire Line
+	4250 2550 4350 2550
+Wire Wire Line
+	4350 2550 4450 2550
+Wire Wire Line
+	4450 2550 4550 2550
+Wire Wire Line
+	4550 2550 4650 2550
+Wire Wire Line
+	4650 2550 4750 2550
+Wire Wire Line
+	4750 2550 4850 2550
+Wire Wire Line
+	4850 2550 4950 2550
+Wire Wire Line
+	4950 2550 5050 2550
+Wire Wire Line
+	5050 2550 5150 2550
+Wire Wire Line
+	5150 2550 5250 2550
+Wire Wire Line
+	5250 2550 5350 2550
+Wire Wire Line
+	5350 2550 5450 2550
+Wire Wire Line
+	5450 2550 5550 2550
+Wire Wire Line
+	5550 2550 5650 2550
+Wire Wire Line
+	5650 2550 5750 2550
+Wire Wire Line
+	5750 2550 5850 2550
+Wire Wire Line
+	5850 2550 5950 2550
+Wire Wire Line
+	5950 2550 6050 2550
+Wire Wire Line
+	6050 2550 6150 2550
+Wire Wire Line
+	6150 2550 6250 2550
+Wire Wire Line
+	6250 2550 6350 2550
+Wire Wire Line
+	6350 2550 6450 2550
+Wire Wire Line
+	6450 2550 6550 2550
+Wire Wire Line
+	6550 2550 6650 2550
+Wire Wire Line
+	6650 2550 6750 2550
+Wire Wire Line
+	6750 2550 6850 2550
+Wire Wire Line
+	6850 2550 6950 2550
+Wire Wire Line
+	6950 2550 7050 2550
+Wire Wire Line
+	7050 2550 7150 2550
+Wire Wire Line
+	7150 2550 7250 2550
+Wire Wire Line
+	7250 2550 7350 2550
+Wire Wire Line
+	7350 2550 7450 2550
+Wire Wire Line
+	7450 2550 7550 2550
+Wire Wire Line
+	7550 2550 7650 2550
+Wire Wire Line
+	7650 2550 7750 2550
+Wire Wire Line
+	7750 2550 7850 2550
+Wire Wire Line
+	7850 2550 7950 2550
+Wire Wire Line
+	7950 2550 8050 2550
+Wire Wire Line
+	8050 2550 8150 2550
+Wire Wire Line
+	8150 2550 8250 2550
+Wire Wire Line
+	8250 2550 8350 2550
+Wire Wire Line
+	8350 2550 8450 2550
+Wire Wire Line
+	8450 2550 8550 2550
+Wire Wire Line
+	8550 2550 8650 2550
+Wire Wire Line
+	8650 2550 8750 2550
+Wire Wire Line
+	8750 2550 8850 2550
+Wire Wire Line
+	8850 2550 8950 2550
+Wire Wire Line
+	8950 2550 9050 2550
+Wire Wire Line
+	9050 2550 9150 2550
+Wire Wire Line
+	9150 2550 9250 2550
+Wire Wire Line
+	9250 2550 9350 2550
+Wire Wire Line
+	9350 2550 9450 2550
+Wire Wire Line
+	9450 2550 9550 2550
+Wire Wire Line
+	9550 2550 9650 2550
+Wire Wire Line
+	9650 2550 9750 2550
+Wire Wire Line
+	9750 2550 9850 2550
+Wire Wire Line
+	9850 2550 9950 2550
+Wire Wire Line
+	9950 2550 10050 2550
+Wire Wire Line
+	10050 2550 10150 2550
+Wire Wire Line
+	10150 2550 10250 2550
+Wire Wire Line
+	10250 2550 10350 2550
+Wire Wire Line
+	10350 2550 10450 2550
+Wire Wire Line
+	10450 2550 10550 2550
+Wire Wire Line
+	10550 2550 10650 2550
+Wire Wire Line
+	10650 2550 10750 2550
+Wire Wire Line
+	10750 2550 10850 2550
 Wire Wire Line
 	1400 2550 1400 2450
 Wire Wire Line
@ -227,7 +421,9 @@ Wire Wire Line
 	1200 2450 1200 2550
 Connection ~ 1200 2550
 Wire Wire Line
-	1100 2450 1100 2650
+	1100 2450 1100 2550
+Wire Wire Line
+	1100 2550 1100 2650
 Connection ~ 1100 2550
 Wire Wire Line
 	1000 2450 1000 2550
@ -237,7 +433,9 @@ Wire Wire Line
 Wire Wire Line
 	2550 1000 2550 1100
 Wire Wire Line
-	2150 900  2150 1100
+	2150 900  2150 1000
+Wire Wire Line
+	2150 1000 2150 1100
 Connection ~ 2150 1000
 Wire Wire Line
 	2250 1000 2250 1100
@ -546,7 +744,9 @@ Wire Wire Line
 	6550 1000 6550 1100
 Connection ~ 6550 1000
 Wire Wire Line
-	6350 900  6350 1100
+	6350 900  6350 1000
+Wire Wire Line
+	6350 1000 6350 1100
 Connection ~ 6350 1000
 Wire Wire Line
 	6250 1000 6250 1100
@ -574,7 +774,9 @@ Wire Wire Line
 	4950 1000 4950 1100
 Connection ~ 4950 1000
 Wire Wire Line
-	4750 900  4750 1100
+	4750 900  4750 1000
+Wire Wire Line
+	4750 1000 4750 1100
 Connection ~ 4750 1000
 Wire Wire Line
 	4450 1000 4450 1100
@ -582,7 +784,9 @@ Wire Wire Line
 	4350 1000 4350 1100
 Connection ~ 4350 1000
 Wire Wire Line
-	4250 900  4250 1100
+	4250 900  4250 1000
+Wire Wire Line
+	4250 1000 4250 1100
 Connection ~ 4250 1000
 Wire Wire Line
 	4150 1100 4150 1000
@ -630,7 +834,9 @@ Connection ~ 2650 1000
 Wire Wire Line
 	8500 3750 8500 3850
 Wire Wire Line
-	7850 3200 7850 3500
+	7850 3200 7850 3250
+Wire Wire Line
+	7850 3250 7850 3500
 Wire Wire Line
 	7850 3800 7850 3850
 Wire Wire Line
@ -638,7 +844,13 @@ Wire Wire Line
 Wire Wire Line
 	9150 3050 9150 3250
 Wire Wire Line
-	9500 3050 10600 3050
+	9500 3050 9550 3050
+Wire Wire Line
+	9550 3050 9850 3050
+Wire Wire Line
+	9850 3050 10250 3050
+Wire Wire Line
+	10250 3050 10600 3050
 Wire Wire Line
 	9850 3050 9850 3100
 Wire Wire Line
@ -648,18 +860,28 @@ Wire Wire Line
 Wire Wire Line
 	9850 3450 9850 3400
 Wire Wire Line
-	9100 3450 9900 3450
+	9100 3450 9550 3450
+Wire Wire Line
+	9550 3450 9850 3450
+Wire Wire Line
+	9850 3450 9900 3450
 Wire Wire Line
-	10250 3400 10250 3550
+	10250 3400 10250 3450
+Wire Wire Line
+	10250 3450 10250 3550
 Wire Wire Line
 	10600 3450 10600 3400
 Wire Wire Line
-	10200 3450 10600 3450
+	10200 3450 10250 3450
+Wire Wire Line
+	10250 3450 10600 3450
 Connection ~ 10250 3450
 Wire Wire Line
 	10250 3050 10250 3100
 Wire Wire Line
-	10600 3000 10600 3100
+	10600 3000 10600 3050
+Wire Wire Line
+	10600 3050 10600 3100
 Connection ~ 9850 3450
 Connection ~ 9550 3450
 Connection ~ 9550 3050
@ -667,7 +889,43 @@ Wire Wire Line
 	9150 3050 9200 3050
 Connection ~ 10600 3050
 Wire Wire Line
-	2050 1000 3950 1000
+	2050 1000 2150 1000
+Wire Wire Line
+	2150 1000 2250 1000
+Wire Wire Line
+	2250 1000 2350 1000
+Wire Wire Line
+	2350 1000 2450 1000
+Wire Wire Line
+	2450 1000 2550 1000
+Wire Wire Line
+	2550 1000 2650 1000
+Wire Wire Line
+	2650 1000 2750 1000
+Wire Wire Line
+	2750 1000 2850 1000
+Wire Wire Line
+	2850 1000 2950 1000
+Wire Wire Line
+	2950 1000 3050 1000
+Wire Wire Line
+	3050 1000 3150 1000
+Wire Wire Line
+	3150 1000 3250 1000
+Wire Wire Line
+	3250 1000 3350 1000
+Wire Wire Line
+	3350 1000 3450 1000
+Wire Wire Line
+	3450 1000 3550 1000
+Wire Wire Line
+	3550 1000 3650 1000
+Wire Wire Line
+	3650 1000 3750 1000
+Wire Wire Line
+	3750 1000 3850 1000
+Wire Wire Line
+	3850 1000 3950 1000
 Connection ~ 7850 3250
 Wire Wire Line
 	7850 3250 7900 3250
@ -808,7 +1066,9 @@ $EndComp
 Wire Wire Line
 	8500 6150 8500 6250
 Wire Wire Line
-	7850 5600 7850 5900
+	7850 5600 7850 5650
+Wire Wire Line
+	7850 5650 7850 5900
 Wire Wire Line
 	7850 6200 7850 6250
 Wire Wire Line
@ -816,7 +1076,13 @@ Wire Wire Line
 Wire Wire Line
 	9150 5450 9150 5650
 Wire Wire Line
-	9500 5450 10600 5450
+	9500 5450 9550 5450
+Wire Wire Line
+	9550 5450 9850 5450
+Wire Wire Line
+	9850 5450 10250 5450
+Wire Wire Line
+	10250 5450 10600 5450
 Wire Wire Line
 	9850 5450 9850 5500
 Wire Wire Line
@ -826,18 +1092,28 @@ Wire Wire Line
 Wire Wire Line
 	9850 5850 9850 5800
 Wire Wire Line
-	9100 5850 9900 5850
+	9100 5850 9550 5850
+Wire Wire Line
+	9550 5850 9850 5850
+Wire Wire Line
+	9850 5850 9900 5850
 Wire Wire Line
-	10250 5800 10250 5950
+	10250 5800 10250 5850
+Wire Wire Line
+	10250 5850 10250 5950
 Wire Wire Line
 	10600 5850 10600 5800
 Wire Wire Line
-	10200 5850 10600 5850
+	10200 5850 10250 5850
+Wire Wire Line
+	10250 5850 10600 5850
 Connection ~ 10250 5850
 Wire Wire Line
 	10250 5450 10250 5500
 Wire Wire Line
-	10600 5400 10600 5500
+	10600 5400 10600 5450
+Wire Wire Line
+	10600 5450 10600 5500
 Connection ~ 10250 5450
 Connection ~ 9850 5850
 Connection ~ 9550 5850
@ -1023,7 +1299,9 @@ $EndComp
 Wire Wire Line
 	8500 4950 8500 5050
 Wire Wire Line
-	7850 4400 7850 4700
+	7850 4400 7850 4450
+Wire Wire Line
+	7850 4450 7850 4700
 Wire Wire Line
 	7850 5000 7850 5050
 Wire Wire Line
@ -1031,7 +1309,13 @@ Wire Wire Line
 Wire Wire Line
 	9150 4250 9150 4450
 Wire Wire Line
-	9500 4250 10600 4250
+	9500 4250 9550 4250
+Wire Wire Line
+	9550 4250 9850 4250
+Wire Wire Line
+	9850 4250 10250 4250
+Wire Wire Line
+	10250 4250 10600 4250
 Wire Wire Line
 	9850 4250 9850 4300
 Wire Wire Line
@ -1041,18 +1325,28 @@ Wire Wire Line
 Wire Wire Line
 	9850 4650 9850 4600
 Wire Wire Line
-	9100 4650 9900 4650
+	9100 4650 9550 4650
+Wire Wire Line
+	9550 4650 9850 4650
 Wire Wire Line
-	10250 4600 10250 4750
+	9850 4650 9900 4650
+Wire Wire Line
+	10250 4600 10250 4650
+Wire Wire Line
+	10250 4650 10250 4750
 Wire Wire Line
 	10600 4650 10600 4600
 Wire Wire Line
-	10200 4650 10600 4650
+	10200 4650 10250 4650
+Wire Wire Line
+	10250 4650 10600 4650
 Connection ~ 10250 4650
 Wire Wire Line
 	10250 4250 10250 4300
 Wire Wire Line
-	10600 4200 10600 4300
+	10600 4200 10600 4250
+Wire Wire Line
+	10600 4250 10600 4300
 Connection ~ 10250 4250
 Connection ~ 9850 4650
 Connection ~ 9550 4650
@ -1116,9 +1410,15 @@ PWREN
 Text Label 7450 5850 0    60   ~ 0
 PWREN
 Wire Wire Line
-	4150 4750 4150 5350
+	4150 4750 4150 4850
+Wire Wire Line
+	4150 4850 4150 5350
+Wire Wire Line
+	3950 4850 4150 4850
 Wire Wire Line
-	3950 4850 5100 4850
+	4150 4850 4700 4850
+Wire Wire Line
+	4700 4850 5100 4850
 Text Label 4300 4850 0    60   ~ 0
 PWREN
 Text Label 9250 5850 0    60   ~ 0
@ -1126,9 +1426,29 @@ FB3
 Text Label 9250 4650 0    60   ~ 0
 FB2
 Wire Wire Line
-	4150 1000 4450 1000
+	4150 1000 4250 1000
+Wire Wire Line
+	4250 1000 4350 1000
+Wire Wire Line
+	4350 1000 4450 1000
+Wire Wire Line
+	4650 1000 4750 1000
+Wire Wire Line
+	4750 1000 4950 1000
 Wire Wire Line
-	4650 1000 5850 1000
+	4950 1000 5050 1000
+Wire Wire Line
+	5050 1000 5250 1000
+Wire Wire Line
+	5250 1000 5350 1000
+Wire Wire Line
+	5350 1000 5450 1000
+Wire Wire Line
+	5450 1000 5650 1000
+Wire Wire Line
+	5650 1000 5750 1000
+Wire Wire Line
+	5750 1000 5850 1000
 Wire Wire Line
 	4650 1000 4650 1100
 $Comp
@ -1143,7 +1463,19 @@ F 3 "" H 4250 900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	6250 1000 7150 1000
+	6250 1000 6350 1000
+Wire Wire Line
+	6350 1000 6550 1000
+Wire Wire Line
+	6550 1000 6650 1000
+Wire Wire Line
+	6650 1000 6750 1000
+Wire Wire Line
+	6750 1000 6950 1000
+Wire Wire Line
+	6950 1000 7050 1000
+Wire Wire Line
+	7050 1000 7150 1000
 $Comp
 L +3V3 #PWR044
 U 1 1 58D69259
@ -1188,9 +1520,9 @@ I2C_SCL
 Text GLabel 2600 3450 2    60   Input ~ 0
 I2C_SDA
 Wire Wire Line
-	1450 3700 1450 3750
+	1050 3700 1050 3750
 Wire Wire Line
-	1450 3400 1450 3350
+	1050 3400 1050 3350
 $Comp
 L Battery_Cell BAT1
 U 1 1 58D72202
@ -1220,9 +1552,9 @@ $EndComp
 Wire Wire Line
 	2800 4100 2800 4150
 Wire Wire Line
-	1450 3350 1700 3350
+	1050 3350 1700 3350
 Wire Wire Line
-	1450 3750 1700 3750
+	1050 3750 1700 3750
 Wire Wire Line
 	2100 3150 2100 3050
 $Comp
@ -1263,9 +1595,13 @@ F 3 "" H 4150 3650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4150 3800 4150 4000
+	4150 3800 4150 3850
+Wire Wire Line
+	4150 3850 4150 4000
+Wire Wire Line
+	4150 3350 4150 3450
 Wire Wire Line
-	4150 3350 4150 3500
+	4150 3450 4150 3500
 $Comp
 L R R3
 U 1 1 58D7B61A
@ -1280,12 +1616,16 @@ $EndComp
 Wire Wire Line
 	4450 3850 4450 3800
 Wire Wire Line
-	3900 3850 4450 3850
+	3900 3850 4150 3850
+Wire Wire Line
+	4150 3850 4450 3850
 Connection ~ 4150 3850
 Wire Wire Line
 	4450 3450 4450 3500
 Wire Wire Line
-	3900 3450 4450 3450
+	3900 3450 4150 3450
+Wire Wire Line
+	4150 3450 4450 3450
 Connection ~ 4150 3450
 $Comp
 L R R2
@ -1300,7 +1640,9 @@ F 3 "" H 4150 5500 50  0000 C CNN
 $EndComp
 Connection ~ 4150 4850
 Wire Wire Line
-	4150 5650 4150 6100
+	4150 5650 4150 6000
+Wire Wire Line
+	4150 6000 4150 6100
 $Comp
 L GND #PWR048
 U 1 1 58D7C223
@ -1401,7 +1743,11 @@ $EndComp
 Wire Wire Line
 	3550 5500 3550 5600
 Wire Wire Line
-	3050 5500 3650 5500
+	3050 5500 3250 5500
+Wire Wire Line
+	3250 5500 3550 5500
+Wire Wire Line
+	3550 5500 3650 5500
 $Comp
 L D_Schottky D12
 U 1 1 58D84D8A
@ -1433,7 +1779,11 @@ Connection ~ 3250 5500
 Wire Wire Line
 	3250 5900 3250 6000
 Wire Wire Line
-	3250 6000 4150 6000
+	3250 6000 3550 6000
+Wire Wire Line
+	3550 6000 3950 6000
+Wire Wire Line
+	3950 6000 4150 6000
 Connection ~ 3550 6000
 Text Notes 2800 6150 0    60   ~ 0
 RC to hold 0.5s shutdown
@ -1496,14 +1846,18 @@ Wire Wire Line
 $Comp
 L Crystal_GND23 Y1
 U 1 1 58D85AAB
-P 1450 3550
-F 0 "Y1" V 1300 3350 50  0000 L CNN
-F 1 "32768Hz" H 1300 3250 50  0000 L CNN
-F 2 "" H 1450 3550 50  0000 C CNN
-F 3 "" H 1450 3550 50  0000 C CNN
-	1    1450 3550
+P 1050 3550
+F 0 "Y1" V 900 3350 50  0000 L CNN
+F 1 "32768Hz" V 1200 3150 50  0000 L CNN
+F 2 "abs25:Crystal_SMD_ABS25" H 1050 3550 50  0001 C CNN
+F 3 "" H 1050 3550 50  0000 C CNN
+	1    1050 3550
 	0    1    1    0   
 $EndComp
+NoConn ~ 850  3550
 NoConn ~ 1250 3550
-NoConn ~ 1650 3550
+Text Label 1200 3350 0    60   ~ 0
+OSCI_32k
+Text Label 1200 3750 0    60   ~ 0
+OSCO_32k
 $EndSCHEMATC
--- a/power.sch
+++ b/power.sch
@ -1188,9 +1188,9 @@ I2C_SCL
 Text GLabel 2600 3450 2    60   Input ~ 0
 I2C_SDA
 Wire Wire Line
-	1450 3700 1450 3750
+	1050 3700 1050 3750
 Wire Wire Line
-	1450 3400 1450 3350
+	1050 3400 1050 3350
 $Comp
 L Battery_Cell BAT1
 U 1 1 58D72202
@ -1220,9 +1220,9 @@ $EndComp
 Wire Wire Line
 	2800 4100 2800 4150
 Wire Wire Line
-	1450 3350 1700 3350
+	1050 3350 1700 3350
 Wire Wire Line
-	1450 3750 1700 3750
+	1050 3750 1700 3750
 Wire Wire Line
 	2100 3150 2100 3050
 $Comp
@ -1496,14 +1496,18 @@ Wire Wire Line
 $Comp
 L Crystal_GND23 Y1
 U 1 1 58D85AAB
-P 1450 3550
-F 0 "Y1" V 1300 3350 50  0000 L CNN
-F 1 "32768Hz" H 1300 3250 50  0000 L CNN
-F 2 "abs25:Crystal_SMD_ABS25" H 1450 3550 50  0001 C CNN
-F 3 "" H 1450 3550 50  0000 C CNN
-	1    1450 3550
+P 1050 3550
+F 0 "Y1" V 900 3350 50  0000 L CNN
+F 1 "32768Hz" V 1200 3150 50  0000 L CNN
+F 2 "abs25:Crystal_SMD_ABS25" H 1050 3550 50  0001 C CNN
+F 3 "" H 1050 3550 50  0000 C CNN
+	1    1050 3550
 	0    1    1    0   
 $EndComp
+NoConn ~ 850  3550
 NoConn ~ 1250 3550
-NoConn ~ 1650 3550
+Text Label 1200 3350 0    60   ~ 0
+OSCI_32k
+Text Label 1200 3750 0    60   ~ 0
+OSCO_32k
 $EndSCHEMATC
--- a/ulx3s.kicad_pcb
+++ b/ulx3s.kicad_pcb
@ -191,8 +191,8 @@
  (net 95 /power/HOLD)
  (net 96 /power/WKn)
  (net 97 "Net-(Q2-Pad1)")
-  (net 98 "Net-(U7-Pad1)")
-  (net 99 "Net-(U7-Pad2)")
+  (net 98 /power/OSCI_32k)
+  (net 99 /power/OSCO_32k)

  (net_class Default "This is the default net class."
    (clearance 0.2)
@ -267,6 +267,8 @@
    (add_net /power/FB2)
    (add_net /power/FB3)
    (add_net /power/HOLD)
+    (add_net /power/OSCI_32k)
+    (add_net /power/OSCO_32k)
    (add_net /power/PWREN)
    (add_net /power/SHUT)
    (add_net /power/VBAT)
@ -288,8 +290,6 @@
    (add_net "Net-(L3-Pad1)")
    (add_net "Net-(Q2-Pad1)")
    (add_net "Net-(U6-Pad57)")
-    (add_net "Net-(U7-Pad1)")
-    (add_net "Net-(U7-Pad2)")
    (add_net SD_3)
    (add_net SD_MTCK)
    (add_net SD_MTDI)
@ -3354,9 +3354,9 @@
    (fp_line (start -2.54 -1.905) (end -2.54 1.905) (layer B.SilkS) (width 0.15))
    (fp_line (start 2.54 -1.905) (end 2.54 1.905) (layer B.SilkS) (width 0.15))
    (pad 1 smd oval (at -1.905 -2.794 180) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
-      (net 98 "Net-(U7-Pad1)"))
+      (net 98 /power/OSCI_32k))
    (pad 2 smd oval (at -0.635 -2.794 180) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
-      (net 99 "Net-(U7-Pad2)"))
+      (net 99 /power/OSCO_32k))
    (pad 3 smd oval (at 0.635 -2.794 180) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
      (net 81 /power/VBAT))
    (pad 4 smd oval (at 1.905 -2.794 180) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
@ -4060,11 +4060,11 @@
    (fp_line (start 0.9 1.8) (end -0.9 1.8) (layer B.SilkS) (width 0.15))
    (fp_line (start -2.7 0.4) (end -2.7 -0.4) (layer B.SilkS) (width 0.15))
    (pad 4 smd rect (at -2 1.2 180) (size 1.8 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 99 "Net-(U7-Pad2)"))
+      (net 99 /power/OSCO_32k))
    (pad 3 smd rect (at 2 1.2 180) (size 1.8 1.2) (layers B.Cu B.Paste B.Mask))
    (pad 2 smd rect (at 2 -1.2 180) (size 1.8 1.2) (layers B.Cu B.Paste B.Mask))
    (pad 1 smd rect (at -2 -1.2 180) (size 1.8 1.2) (layers B.Cu B.Paste B.Mask)
-      (net 98 "Net-(U7-Pad1)"))
+      (net 98 /power/OSCI_32k))
  )

  (gr_line (start 137.28 99.52) (end 137.28 63.96) (layer Eco2.User) (width 0.2))
--- a/ulx3s.kicad_pcb-bak
+++ b/ulx3s.kicad_pcb-bak
@ -1,15 +1,15 @@
 (kicad_pcb (version 4) (host pcbnew 4.0.5+dfsg1-4)

  (general
-    (links 368)
-    (no_connects 367)
+    (links 370)
+    (no_connects 369)
    (area 93.949999 61.269999 178.070001 109.830001)
    (thickness 1.6)
    (drawings 10)
    (tracks 7)
    (zones 0)
-    (modules 73)
-    (nets 98)
+    (modules 74)
+    (nets 100)
  )

  (page A4)
@ -191,6 +191,8 @@
  (net 95 /power/HOLD)
  (net 96 /power/WKn)
  (net 97 "Net-(Q2-Pad1)")
+  (net 98 /power/OSCI)
+  (net 99 /power/OSCO)

  (net_class Default "This is the default net class."
    (clearance 0.2)
@ -265,6 +267,8 @@
    (add_net /power/FB2)
    (add_net /power/FB3)
    (add_net /power/HOLD)
+    (add_net /power/OSCI)
+    (add_net /power/OSCO)
    (add_net /power/PWREN)
    (add_net /power/SHUT)
    (add_net /power/VBAT)
@ -3333,7 +3337,7 @@
  )

  (module Power_Integrations:SO-8 (layer B.Cu) (tedit 0) (tstamp 58D70A05)
-    (at 164.585 93.424 180)
+    (at 164.585 93.17 180)
    (descr "SO-8 Surface Mount Small Outline 150mil 8pin Package")
    (tags "Power Integrations D Package")
    (path /58D51CAD/58D70684)
@ -3349,8 +3353,10 @@
    (fp_line (start -2.54 -1.905) (end 2.54 -1.905) (layer B.SilkS) (width 0.15))
    (fp_line (start -2.54 -1.905) (end -2.54 1.905) (layer B.SilkS) (width 0.15))
    (fp_line (start 2.54 -1.905) (end 2.54 1.905) (layer B.SilkS) (width 0.15))
-    (pad 1 smd oval (at -1.905 -2.794 180) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask))
-    (pad 2 smd oval (at -0.635 -2.794 180) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask))
+    (pad 1 smd oval (at -1.905 -2.794 180) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
+      (net 98 /power/OSCI))
+    (pad 2 smd oval (at -0.635 -2.794 180) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
+      (net 99 /power/OSCO))
    (pad 3 smd oval (at 0.635 -2.794 180) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
      (net 81 /power/VBAT))
    (pad 4 smd oval (at 1.905 -2.794 180) (size 0.6096 1.4732) (layers B.Cu B.Paste B.Mask)
@ -4024,6 +4030,43 @@
      (clearance 0.4))
  )

+  (module abs25:Crystal_SMD_ABS25 (layer B.Cu) (tedit 58D83518) (tstamp 58D83A47)
+    (at 163.95 99.52 180)
+    (descr "Abracon ABS25 Ceramic SMD Crystal http://www.abracon.com/Resonators/abs25.pdf")
+    (tags "plastic smd crystal")
+    (path /58D51CAD/58D85AAB)
+    (attr smd)
+    (fp_text reference Y1 (at 0 3.2 180) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 32768Hz (at 0 -3.2 180) (layer B.Fab)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_line (start -2.159 0.381) (end -2.159 -0.381) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.55 -1.35) (end 2.25 -1.65) (layer B.Fab) (width 0.15))
+    (fp_line (start 2.25 1.65) (end 2.55 1.35) (layer B.Fab) (width 0.15))
+    (fp_line (start -2.55 1.35) (end -2.25 1.65) (layer B.Fab) (width 0.15))
+    (fp_line (start -2.25 -1.65) (end -2.55 -1.35) (layer B.Fab) (width 0.15))
+    (fp_line (start -3.4 -2.3) (end 3.4 -2.3) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 3.4 -2.3) (end 3.4 2.3) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 3.4 2.3) (end -3.4 2.3) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -3.4 2.3) (end -3.4 -2.3) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.55 1.35) (end -2.55 -1.35) (layer B.Fab) (width 0.15))
+    (fp_line (start -2.25 -1.65) (end 2.25 -1.65) (layer B.Fab) (width 0.15))
+    (fp_line (start 2.55 -1.35) (end 2.55 1.35) (layer B.Fab) (width 0.15))
+    (fp_line (start 2.25 1.65) (end -2.25 1.65) (layer B.Fab) (width 0.15))
+    (fp_line (start -0.9 -1.8) (end 0.9 -1.8) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.7 -0.4) (end 2.7 0.4) (layer B.SilkS) (width 0.15))
+    (fp_line (start 0.9 1.8) (end -0.9 1.8) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.7 0.4) (end -2.7 -0.4) (layer B.SilkS) (width 0.15))
+    (pad 4 smd rect (at -2 1.2 180) (size 1.8 1.2) (layers B.Cu B.Paste B.Mask)
+      (net 99 /power/OSCO))
+    (pad 3 smd rect (at 2 1.2 180) (size 1.8 1.2) (layers B.Cu B.Paste B.Mask))
+    (pad 2 smd rect (at 2 -1.2 180) (size 1.8 1.2) (layers B.Cu B.Paste B.Mask))
+    (pad 1 smd rect (at -2 -1.2 180) (size 1.8 1.2) (layers B.Cu B.Paste B.Mask)
+      (net 98 /power/OSCI))
+  )
+
  (gr_line (start 137.28 99.52) (end 137.28 63.96) (layer Eco2.User) (width 0.2))
  (gr_line (start 172.84 99.52) (end 137.28 99.52) (layer Eco2.User) (width 0.2))
  (gr_line (start 172.84 63.96) (end 172.84 99.52) (layer Eco2.User) (width 0.2))
--- a/ulx3s.net
+++ b/ulx3s.net
@ -1,7 +1,7 @@
 (export (version D)
  (design
    (source /home/davor/tmp/ulx3s/ulx3s.sch)
-    (date "Ned 26 Ožu 2017 23:53:33")
+    (date "Pon 27 Ožu 2017 00:12:08")
    (tool "Eeschema 4.0.5+dfsg1-4")
    (sheet (number 1) (name /) (tstamps /)
      (title_block
@ -1334,22 +1334,22 @@
  (libraries
    (library (logical device)
      (uri /usr/share/kicad/library/device.lib))
+    (library (logical conn)
+      (uri /usr/share/kicad/library/conn.lib))
+    (library (logical memory)
+      (uri /usr/share/kicad/library/memory.lib))
+    (library (logical philips)
+      (uri /usr/share/kicad/library/philips.lib))
    (library (logical ESP8266)
      (uri footprints/esp8266/ESP8266.lib))
-    (library (logical lfe5bg381)
-      (uri footprints/lattice/lfe5bg381.lib))
    (library (logical micro-hdmi-d)
      (uri footprints/micro-hdmi-d/micro-hdmi-d.lib))
-    (library (logical ft2232)
-      (uri footprints/usbserial/ft2232.lib))
+    (library (logical lfe5bg381)
+      (uri footprints/lattice/lfe5bg381.lib))
    (library (logical ap3429a)
      (uri footprints/dcdc_converter/ap3429a.lib))
-    (library (logical philips)
-      (uri /usr/share/kicad/library/philips.lib))
-    (library (logical conn)
-      (uri /usr/share/kicad/library/conn.lib))
-    (library (logical memory)
-      (uri /usr/share/kicad/library/memory.lib)))
+    (library (logical ft2232)
+      (uri footprints/usbserial/ft2232.lib)))
  (nets
    (net (code 1) (name SD_CD)
      (node (ref SD1) (pin 10)))
@ -1365,135 +1365,83 @@
      (node (ref U1) (pin T5))
      (node (ref U2) (pin 6)))
    (net (code 6) (name JTAG_TMS)
-      (node (ref U1) (pin U5))
-      (node (ref U2) (pin 7)))
+      (node (ref U2) (pin 7))
+      (node (ref U1) (pin U5)))
    (net (code 7) (name SD_3)
-      (node (ref U2) (pin 11))
-      (node (ref SD1) (pin 1)))
+      (node (ref SD1) (pin 1))
+      (node (ref U2) (pin 11)))
    (net (code 8) (name SD_MTMS)
-      (node (ref SD1) (pin 2))
-      (node (ref U2) (pin 12)))
+      (node (ref U2) (pin 12))
+      (node (ref SD1) (pin 2)))
    (net (code 9) (name GND)
-      (node (ref U7) (pin 4))
-      (node (ref D5) (pin 1))
-      (node (ref D3) (pin 1))
-      (node (ref D2) (pin 1))
-      (node (ref D1) (pin 1))
-      (node (ref D0) (pin 1))
-      (node (ref U1) (pin F14))
-      (node (ref D4) (pin 1))
-      (node (ref BAT1) (pin 2))
-      (node (ref D6) (pin 1))
-      (node (ref D7) (pin 1))
-      (node (ref OLED1) (pin 1))
-      (node (ref C9) (pin 2))
-      (node (ref RB2) (pin 1))
-      (node (ref C11) (pin 2))
-      (node (ref C12) (pin 2))
-      (node (ref U1) (pin Y12))
-      (node (ref U1) (pin N15))
-      (node (ref U1) (pin V15))
-      (node (ref U1) (pin W15))
-      (node (ref U1) (pin F13))
-      (node (ref U1) (pin J12))
-      (node (ref U1) (pin K12))
-      (node (ref U1) (pin L12))
-      (node (ref U1) (pin M12))
-      (node (ref U1) (pin P12))
-      (node (ref U1) (pin U12))
-      (node (ref U1) (pin V12))
-      (node (ref U1) (pin W12))
-      (node (ref U1) (pin K15))
-      (node (ref U1) (pin M16))
-      (node (ref U1) (pin G13))
-      (node (ref U1) (pin P13))
-      (node (ref U1) (pin U13))
-      (node (ref U1) (pin V13))
-      (node (ref RB1) (pin 1))
-      (node (ref C3) (pin 2))
-      (node (ref C4) (pin 2))
-      (node (ref U1) (pin G14))
-      (node (ref U1) (pin J14))
-      (node (ref U1) (pin K14))
-      (node (ref U1) (pin M14))
-      (node (ref U1) (pin N14))
-      (node (ref U1) (pin P14))
-      (node (ref U1) (pin U14))
-      (node (ref U1) (pin V14))
-      (node (ref U1) (pin B14))
-      (node (ref U1) (pin G15))
-      (node (ref C8) (pin 2))
-      (node (ref R2) (pin 2))
-      (node (ref C7) (pin 2))
-      (node (ref J1) (pin 62))
-      (node (ref J1) (pin 61))
-      (node (ref J1) (pin 4))
-      (node (ref J1) (pin 3))
-      (node (ref C5) (pin 2))
-      (node (ref U2) (pin 15))
-      (node (ref RB3) (pin 1))
-      (node (ref U4) (pin 2))
-      (node (ref U5) (pin 2))
-      (node (ref GPDI1) (pin 10))
-      (node (ref GPDI1) (pin 13))
-      (node (ref GPDI1) (pin 16))
-      (node (ref U1) (pin V19))
-      (node (ref Q2) (pin 3))
-      (node (ref C14) (pin 2))
-      (node (ref GPDI1) (pin 7))
-      (node (ref R5) (pin 2))
-      (node (ref US2) (pin 5))
-      (node (ref US1) (pin 5))
-      (node (ref US1) (pin 6))
-      (node (ref US2) (pin 6))
-      (node (ref GPDI1) (pin SHD))
-      (node (ref GPDI1) (pin 4))
      (node (ref U1) (pin K7))
+      (node (ref U1) (pin B7))
+      (node (ref U1) (pin F7))
+      (node (ref U1) (pin G7))
+      (node (ref U1) (pin J7))
+      (node (ref U1) (pin G6))
+      (node (ref U1) (pin G8))
+      (node (ref U1) (pin F8))
+      (node (ref U1) (pin U7))
      (node (ref U1) (pin M7))
+      (node (ref U1) (pin W19))
      (node (ref U1) (pin N7))
      (node (ref U1) (pin P7))
      (node (ref U1) (pin W6))
-      (node (ref U1) (pin U7))
-      (node (ref U1) (pin V7))
-      (node (ref U1) (pin W7))
      (node (ref U1) (pin Y7))
-      (node (ref U1) (pin F8))
-      (node (ref U1) (pin G8))
-      (node (ref U1) (pin G6))
-      (node (ref U1) (pin J7))
+      (node (ref U1) (pin W7))
+      (node (ref U1) (pin V7))
+      (node (ref C4) (pin 2))
+      (node (ref C3) (pin 2))
+      (node (ref RB1) (pin 1))
+      (node (ref U1) (pin V13))
+      (node (ref U1) (pin U13))
+      (node (ref U1) (pin P13))
+      (node (ref U1) (pin G13))
+      (node (ref U1) (pin M16))
+      (node (ref U1) (pin Y12))
+      (node (ref U1) (pin K6))
+      (node (ref U1) (pin T7))
+      (node (ref C1) (pin 2))
+      (node (ref U1) (pin G12))
+      (node (ref U3) (pin 2))
+      (node (ref U1) (pin Y6))
+      (node (ref U1) (pin V19))
+      (node (ref U1) (pin R19))
+      (node (ref U1) (pin H19))
+      (node (ref U1) (pin C19))
+      (node (ref U1) (pin G17))
+      (node (ref U1) (pin W16))
+      (node (ref U1) (pin V16))
+      (node (ref U1) (pin G10))
+      (node (ref U1) (pin K9))
+      (node (ref U1) (pin P8))
+      (node (ref U1) (pin T8))
+      (node (ref U1) (pin U8))
+      (node (ref U1) (pin V8))
+      (node (ref U1) (pin Y8))
+      (node (ref U1) (pin G9))
+      (node (ref U1) (pin J9))
+      (node (ref U1) (pin L9))
+      (node (ref U1) (pin M9))
+      (node (ref U1) (pin T9))
+      (node (ref U1) (pin U9))
+      (node (ref U1) (pin V9))
+      (node (ref U1) (pin Y11))
+      (node (ref U1) (pin M10))
      (node (ref U1) (pin J2))
      (node (ref U1) (pin M2))
      (node (ref U1) (pin D4))
      (node (ref U1) (pin G4))
      (node (ref U1) (pin V5))
      (node (ref U1) (pin Y5))
-      (node (ref U1) (pin K6))
+      (node (ref U1) (pin G14))
      (node (ref U1) (pin N6))
      (node (ref U1) (pin T6))
      (node (ref U1) (pin U6))
      (node (ref U1) (pin V6))
-      (node (ref U1) (pin V16))
-      (node (ref U1) (pin W16))
-      (node (ref U1) (pin G17))
-      (node (ref U1) (pin C19))
-      (node (ref U1) (pin H19))
-      (node (ref U1) (pin R19))
-      (node (ref U1) (pin W19))
      (node (ref U1) (pin K10))
-      (node (ref U3) (pin 2))
-      (node (ref U1) (pin G12))
-      (node (ref C1) (pin 2))
-      (node (ref U1) (pin T7))
-      (node (ref U1) (pin Y6))
-      (node (ref U1) (pin B7))
-      (node (ref U1) (pin F7))
-      (node (ref U1) (pin G7))
-      (node (ref U1) (pin V9))
-      (node (ref U1) (pin G10))
-      (node (ref U1) (pin U9))
-      (node (ref U1) (pin V11))
      (node (ref U1) (pin L10))
-      (node (ref U1) (pin M10))
      (node (ref U1) (pin T10))
      (node (ref U1) (pin U10))
      (node (ref U1) (pin V10))
@ -1506,77 +1454,129 @@
      (node (ref U1) (pin M11))
      (node (ref U1) (pin P11))
      (node (ref U1) (pin U11))
-      (node (ref U1) (pin Y11))
-      (node (ref U1) (pin K9))
-      (node (ref U1) (pin P8))
-      (node (ref U1) (pin T8))
-      (node (ref U1) (pin U8))
-      (node (ref U1) (pin V8))
-      (node (ref U1) (pin Y8))
-      (node (ref U1) (pin G9))
-      (node (ref U1) (pin J9))
-      (node (ref U1) (pin L9))
-      (node (ref U1) (pin M9))
-      (node (ref U1) (pin T9))
+      (node (ref U1) (pin V11))
+      (node (ref Q2) (pin 3))
+      (node (ref R2) (pin 2))
+      (node (ref C8) (pin 2))
+      (node (ref J1) (pin 62))
+      (node (ref J1) (pin 61))
+      (node (ref J1) (pin 4))
+      (node (ref J1) (pin 3))
+      (node (ref C5) (pin 2))
+      (node (ref RB3) (pin 1))
+      (node (ref C7) (pin 2))
+      (node (ref R5) (pin 2))
+      (node (ref U4) (pin 2))
+      (node (ref U5) (pin 2))
+      (node (ref U1) (pin B14))
+      (node (ref BAT1) (pin 2))
+      (node (ref U1) (pin F14))
+      (node (ref U1) (pin J14))
+      (node (ref U1) (pin K14))
+      (node (ref U1) (pin M14))
+      (node (ref U1) (pin N14))
+      (node (ref U1) (pin P14))
+      (node (ref U1) (pin U14))
+      (node (ref U1) (pin V14))
+      (node (ref U1) (pin G15))
+      (node (ref U1) (pin K15))
+      (node (ref U1) (pin N15))
+      (node (ref U1) (pin V15))
+      (node (ref U1) (pin W15))
+      (node (ref U1) (pin F13))
+      (node (ref U1) (pin J12))
+      (node (ref U1) (pin K12))
+      (node (ref U1) (pin L12))
+      (node (ref U1) (pin M12))
+      (node (ref U1) (pin P12))
+      (node (ref U1) (pin U12))
+      (node (ref U1) (pin V12))
+      (node (ref C14) (pin 2))
+      (node (ref U2) (pin 15))
+      (node (ref U1) (pin W12))
+      (node (ref C9) (pin 2))
+      (node (ref RB2) (pin 1))
+      (node (ref C11) (pin 2))
+      (node (ref C12) (pin 2))
+      (node (ref U7) (pin 4))
+      (node (ref D5) (pin 1))
+      (node (ref D6) (pin 1))
+      (node (ref D7) (pin 1))
+      (node (ref D4) (pin 1))
+      (node (ref D3) (pin 1))
+      (node (ref D2) (pin 1))
+      (node (ref D1) (pin 1))
+      (node (ref D0) (pin 1))
+      (node (ref OLED1) (pin 1))
+      (node (ref GPDI1) (pin SHD))
+      (node (ref GPDI1) (pin 4))
+      (node (ref GPDI1) (pin 7))
+      (node (ref GPDI1) (pin 10))
+      (node (ref GPDI1) (pin 13))
+      (node (ref GPDI1) (pin 16))
+      (node (ref US1) (pin 5))
+      (node (ref US1) (pin 6))
+      (node (ref US2) (pin 5))
+      (node (ref US2) (pin 6))
      (node (ref J3) (pin 4))
+      (node (ref SD1) (pin 12))
+      (node (ref J3) (pin 21))
+      (node (ref SD1) (pin 6))
+      (node (ref SD1) (pin 3))
+      (node (ref J3) (pin 3))
      (node (ref J3) (pin 22))
      (node (ref J2) (pin 4))
      (node (ref J2) (pin 3))
-      (node (ref J3) (pin 3))
-      (node (ref SD1) (pin 13))
-      (node (ref SD1) (pin 3))
-      (node (ref SD1) (pin 12))
-      (node (ref SD1) (pin 6))
-      (node (ref J3) (pin 21)))
+      (node (ref SD1) (pin 13)))
    (net (code 10) (name +3V3)
-      (node (ref U2) (pin 8))
+      (node (ref J3) (pin 20))
+      (node (ref U1) (pin L6))
+      (node (ref U1) (pin J6))
+      (node (ref U1) (pin H6))
+      (node (ref U1) (pin L7))
+      (node (ref U1) (pin H7))
+      (node (ref J2) (pin 1))
+      (node (ref J2) (pin 2))
+      (node (ref U1) (pin P10))
      (node (ref J3) (pin 19))
+      (node (ref R7) (pin 1))
+      (node (ref U2) (pin 8))
      (node (ref D11) (pin 2))
-      (node (ref U1) (pin M15))
-      (node (ref U1) (pin L15))
-      (node (ref U1) (pin J15))
-      (node (ref U1) (pin H15))
      (node (ref U1) (pin L14))
      (node (ref U1) (pin H14))
-      (node (ref R7) (pin 1))
-      (node (ref OLED1) (pin 2))
-      (node (ref J1) (pin 64))
-      (node (ref U1) (pin F10))
+      (node (ref U1) (pin M6))
      (node (ref J3) (pin 2))
-      (node (ref C8) (pin 1))
+      (node (ref U1) (pin F10))
+      (node (ref J1) (pin 63))
+      (node (ref U1) (pin F11))
+      (node (ref RA3) (pin 1))
+      (node (ref SD1) (pin 4))
      (node (ref J3) (pin 1))
+      (node (ref U1) (pin J15))
      (node (ref C7) (pin 1))
+      (node (ref J1) (pin 64))
+      (node (ref C8) (pin 1))
      (node (ref U1) (pin P9))
-      (node (ref U1) (pin H7))
-      (node (ref RA3) (pin 1))
+      (node (ref U1) (pin H15))
+      (node (ref U1) (pin F9))
+      (node (ref U1) (pin M15))
+      (node (ref U1) (pin F12))
+      (node (ref U1) (pin L15))
      (node (ref C6) (pin 1))
-      (node (ref U1) (pin L7))
      (node (ref L2) (pin 2))
-      (node (ref U1) (pin F9))
-      (node (ref J2) (pin 1))
-      (node (ref U1) (pin J6))
-      (node (ref SD1) (pin 4))
-      (node (ref J3) (pin 20))
-      (node (ref U1) (pin H6))
-      (node (ref J1) (pin 63))
-      (node (ref U1) (pin L6))
-      (node (ref U1) (pin M6))
-      (node (ref J2) (pin 2))
-      (node (ref U1) (pin P10))
-      (node (ref U1) (pin F11))
-      (node (ref U1) (pin F12)))
+      (node (ref OLED1) (pin 2)))
    (net (code 11) (name SD_MTCK)
      (node (ref U2) (pin 13))
      (node (ref SD1) (pin 5)))
    (net (code 12) (name SD_MTDO)
-      (node (ref SD1) (pin 7))
-      (node (ref U2) (pin 9)))
+      (node (ref U2) (pin 9))
+      (node (ref SD1) (pin 7)))
    (net (code 13) (name SD_MTDI)
-      (node (ref SD1) (pin 8))
-      (node (ref U2) (pin 10)))
+      (node (ref U2) (pin 10))
+      (node (ref SD1) (pin 8)))
    (net (code 14) (name SD_2)
-      (node (ref SD1) (pin 9))
-      (node (ref U2) (pin 14)))
+      (node (ref U2) (pin 14))
+      (node (ref SD1) (pin 9)))
    (net (code 15) (name /gpio/MP3)
      (node (ref J3) (pin 15)))
    (net (code 16) (name /gpio/MP5)
@ -1584,8 +1584,8 @@
    (net (code 17) (name /gpio/MP4)
      (node (ref J3) (pin 16)))
    (net (code 18) (name /gpio/P56)
-      (node (ref J1) (pin 56))
-      (node (ref U1) (pin D12)))
+      (node (ref U1) (pin D12))
+      (node (ref J1) (pin 56)))
    (net (code 19) (name /gpio/MP6)
      (node (ref J3) (pin 18)))
    (net (code 20) (name /gpio/PMODB2)
@ -1610,11 +1610,11 @@
      (node (ref U1) (pin A12))
      (node (ref J1) (pin 54)))
    (net (code 30) (name /gpio/P52)
-      (node (ref J1) (pin 52))
-      (node (ref U1) (pin B13)))
+      (node (ref U1) (pin B13))
+      (node (ref J1) (pin 52)))
    (net (code 31) (name /gpio/P50)
-      (node (ref J1) (pin 50))
-      (node (ref U1) (pin D13)))
+      (node (ref U1) (pin D13))
+      (node (ref J1) (pin 50)))
    (net (code 32) (name /gpio/P48)
      (node (ref U1) (pin A14))
      (node (ref J1) (pin 48)))
@ -1622,17 +1622,17 @@
      (node (ref U1) (pin D14))
      (node (ref J1) (pin 46)))
    (net (code 34) (name /gpio/P44)
-      (node (ref U1) (pin B15))
-      (node (ref J1) (pin 44)))
+      (node (ref J1) (pin 44))
+      (node (ref U1) (pin B15)))
    (net (code 35) (name /gpio/P42)
-      (node (ref U1) (pin D15))
-      (node (ref J1) (pin 42)))
+      (node (ref J1) (pin 42))
+      (node (ref U1) (pin D15)))
    (net (code 36) (name /gpio/P40)
      (node (ref U1) (pin A16))
      (node (ref J1) (pin 40)))
    (net (code 37) (name /gpio/P59)
-      (node (ref U1) (pin E11))
-      (node (ref J1) (pin 59)))
+      (node (ref J1) (pin 59))
+      (node (ref U1) (pin E11)))
    (net (code 38) (name /gpio/P57)
      (node (ref U1) (pin C12))
      (node (ref J1) (pin 57)))
@ -1646,23 +1646,23 @@
      (node (ref U1) (pin C13))
      (node (ref J1) (pin 51)))
    (net (code 42) (name /gpio/P49)
-      (node (ref J1) (pin 49))
-      (node (ref U1) (pin E13)))
+      (node (ref U1) (pin E13))
+      (node (ref J1) (pin 49)))
    (net (code 43) (name /gpio/P47)
-      (node (ref J1) (pin 47))
-      (node (ref U1) (pin C14)))
+      (node (ref U1) (pin C14))
+      (node (ref J1) (pin 47)))
    (net (code 44) (name /gpio/P45)
-      (node (ref U1) (pin E14))
-      (node (ref J1) (pin 45)))
+      (node (ref J1) (pin 45))
+      (node (ref U1) (pin E14)))
    (net (code 45) (name /gpio/P43)
-      (node (ref U1) (pin C15))
-      (node (ref J1) (pin 43)))
+      (node (ref J1) (pin 43))
+      (node (ref U1) (pin C15)))
    (net (code 46) (name /gpio/P41)
-      (node (ref U1) (pin E15))
-      (node (ref J1) (pin 41)))
+      (node (ref J1) (pin 41))
+      (node (ref U1) (pin E15)))
    (net (code 47) (name /gpio/P39)
-      (node (ref U1) (pin B16))
-      (node (ref J1) (pin 39)))
+      (node (ref J1) (pin 39))
+      (node (ref U1) (pin B16)))
    (net (code 48) (name /gpio/PMODC7)
      (node (ref J3) (pin 29)))
    (net (code 49) (name /gpio/PMODC5)
@ -1688,8 +1688,8 @@
    (net (code 59) (name /gpio/PMODA5)
      (node (ref J2) (pin 9)))
    (net (code 60) (name /gpio/P60)
-      (node (ref J1) (pin 60))
-      (node (ref U1) (pin D11)))
+      (node (ref U1) (pin D11))
+      (node (ref J1) (pin 60)))
    (net (code 61) (name /gpio/PMODA8)
      (node (ref J2) (pin 12)))
    (net (code 62) (name /gpio/PMODA6)
@ -1716,17 +1716,17 @@
      (node (ref U1) (pin B20))
      (node (ref J1) (pin 29)))
    (net (code 71) (name /gpio/P38)
-      (node (ref J1) (pin 38))
-      (node (ref U1) (pin C16)))
+      (node (ref U1) (pin C16))
+      (node (ref J1) (pin 38)))
    (net (code 72) (name /gpio/P58)
      (node (ref U1) (pin B12))
      (node (ref J1) (pin 58)))
    (net (code 73) (name /gpio/P36)
-      (node (ref U1) (pin B17))
-      (node (ref J1) (pin 36)))
+      (node (ref J1) (pin 36))
+      (node (ref U1) (pin B17)))
    (net (code 74) (name /gpio/P34)
-      (node (ref J1) (pin 34))
-      (node (ref U1) (pin A17)))
+      (node (ref U1) (pin A17))
+      (node (ref J1) (pin 34)))
    (net (code 75) (name /gpio/P32)
      (node (ref J1) (pin 32))
      (node (ref U1) (pin A18)))
@ -1734,8 +1734,8 @@
      (node (ref J1) (pin 30))
      (node (ref U1) (pin A19)))
    (net (code 77) (name /gpio/P23)
-      (node (ref J1) (pin 23))
-      (node (ref U1) (pin D7)))
+      (node (ref U1) (pin D7))
+      (node (ref J1) (pin 23)))
    (net (code 78) (name /gpio/P24)
      (node (ref J1) (pin 24))
      (node (ref U1) (pin E7)))
@ -1746,20 +1746,20 @@
      (node (ref U1) (pin E6))
      (node (ref J1) (pin 26)))
    (net (code 81) (name /gpio/P27)
-      (node (ref U1) (pin B6))
-      (node (ref J1) (pin 27)))
+      (node (ref J1) (pin 27))
+      (node (ref U1) (pin B6)))
    (net (code 82) (name /gpio/P28)
-      (node (ref U1) (pin A6))
-      (node (ref J1) (pin 28)))
+      (node (ref J1) (pin 28))
+      (node (ref U1) (pin A6)))
    (net (code 83) (name /gpio/P22)
-      (node (ref J1) (pin 22))
-      (node (ref U1) (pin C6)))
+      (node (ref U1) (pin C6))
+      (node (ref J1) (pin 22)))
    (net (code 84) (name /gpio/P21)
-      (node (ref J1) (pin 21))
-      (node (ref U1) (pin C7)))
+      (node (ref U1) (pin C7))
+      (node (ref J1) (pin 21)))
    (net (code 85) (name /gpio/P20)
-      (node (ref J1) (pin 20))
-      (node (ref U1) (pin E8)))
+      (node (ref U1) (pin E8))
+      (node (ref J1) (pin 20)))
    (net (code 86) (name /gpio/P19)
      (node (ref U1) (pin D8))
      (node (ref J1) (pin 19)))
@ -1770,17 +1770,17 @@
      (node (ref J1) (pin 17))
      (node (ref U1) (pin B8)))
    (net (code 89) (name /gpio/P16)
-      (node (ref U1) (pin A7))
-      (node (ref J1) (pin 16)))
+      (node (ref J1) (pin 16))
+      (node (ref U1) (pin A7)))
    (net (code 90) (name /gpio/P15)
      (node (ref U1) (pin A8))
      (node (ref J1) (pin 15)))
    (net (code 91) (name /gpio/P13)
-      (node (ref U1) (pin E9))
-      (node (ref J1) (pin 13)))
+      (node (ref J1) (pin 13))
+      (node (ref U1) (pin E9)))
    (net (code 92) (name /gpio/P14)
-      (node (ref J1) (pin 14))
-      (node (ref U1) (pin D9)))
+      (node (ref U1) (pin D9))
+      (node (ref J1) (pin 14)))
    (net (code 93) (name /gpio/P12)
      (node (ref J1) (pin 12))
      (node (ref U1) (pin B9)))
@ -1788,8 +1788,8 @@
      (node (ref U1) (pin C10))
      (node (ref J1) (pin 11)))
    (net (code 95) (name /gpio/P9)
-      (node (ref U1) (pin B10))
-      (node (ref J1) (pin 9)))
+      (node (ref J1) (pin 9))
+      (node (ref U1) (pin B10)))
    (net (code 96) (name /gpio/P10)
      (node (ref U1) (pin A9))
      (node (ref J1) (pin 10)))
@ -1797,8 +1797,8 @@
      (node (ref U1) (pin A11))
      (node (ref J1) (pin 8)))
    (net (code 98) (name /gpio/P7)
-      (node (ref U1) (pin A10))
-      (node (ref J1) (pin 7)))
+      (node (ref J1) (pin 7))
+      (node (ref U1) (pin A10)))
    (net (code 99) (name /gpio/P5)
      (node (ref J1) (pin 5))
      (node (ref U1) (pin B11)))
@ -1814,135 +1814,135 @@
      (node (ref J1) (pin 1))
      (node (ref D51) (pin 2)))
    (net (code 104) (name +5V)
-      (node (ref D8) (pin 1))
-      (node (ref C9) (pin 1))
+      (node (ref U4) (pin 4))
      (node (ref GPDI1) (pin 19))
-      (node (ref C13) (pin 1))
+      (node (ref D8) (pin 1))
+      (node (ref U5) (pin 4))
      (node (ref D9) (pin 2))
-      (node (ref R3) (pin 1))
-      (node (ref C5) (pin 1))
-      (node (ref U4) (pin 4))
+      (node (ref C9) (pin 1))
+      (node (ref D51) (pin 1))
      (node (ref C1) (pin 1))
      (node (ref U3) (pin 4))
-      (node (ref U5) (pin 4))
-      (node (ref D51) (pin 1))
+      (node (ref C5) (pin 1))
+      (node (ref C13) (pin 1))
+      (node (ref R3) (pin 1))
      (node (ref Q1) (pin 3)))
-    (net (code 105) (name "Net-(L2-Pad1)")
-      (node (ref L2) (pin 1))
-      (node (ref U4) (pin 3)))
-    (net (code 106) (name +1V2)
+    (net (code 105) (name +1V2)
+      (node (ref U1) (pin H10))
      (node (ref U1) (pin N9))
-      (node (ref C3) (pin 1))
-      (node (ref U1) (pin H12))
-      (node (ref U1) (pin N12))
-      (node (ref U1) (pin H13))
-      (node (ref U1) (pin J13))
      (node (ref U1) (pin K13))
-      (node (ref U1) (pin L13))
-      (node (ref U1) (pin M13))
-      (node (ref U1) (pin N13))
-      (node (ref C4) (pin 1))
-      (node (ref L1) (pin 2))
-      (node (ref C2) (pin 1))
-      (node (ref RA1) (pin 1))
-      (node (ref U1) (pin H8))
+      (node (ref U1) (pin J13))
      (node (ref U1) (pin J8))
+      (node (ref U1) (pin H13))
+      (node (ref U1) (pin H8))
      (node (ref U1) (pin K8))
+      (node (ref U1) (pin N12))
+      (node (ref U1) (pin H12))
+      (node (ref L1) (pin 2))
+      (node (ref U1) (pin H9))
+      (node (ref U1) (pin N8))
+      (node (ref U1) (pin N11))
+      (node (ref U1) (pin N10))
+      (node (ref U1) (pin H11))
+      (node (ref C3) (pin 1))
+      (node (ref RA1) (pin 1))
+      (node (ref C2) (pin 1))
      (node (ref U1) (pin L8))
+      (node (ref C4) (pin 1))
+      (node (ref U1) (pin N13))
+      (node (ref U1) (pin M13))
      (node (ref U1) (pin M8))
-      (node (ref U1) (pin H11))
-      (node (ref U1) (pin N10))
-      (node (ref U1) (pin N11))
-      (node (ref U1) (pin N8))
-      (node (ref U1) (pin H9))
-      (node (ref U1) (pin H10)))
-    (net (code 107) (name "Net-(L1-Pad1)")
-      (node (ref L1) (pin 1))
-      (node (ref U3) (pin 3)))
-    (net (code 108) (name /power/WAKEUPn)
-      (node (ref R6) (pin 2))
-      (node (ref U7) (pin 7)))
-    (net (code 109) (name +2V5)
-      (node (ref U7) (pin 8))
+      (node (ref U1) (pin L13)))
+    (net (code 106) (name "Net-(L2-Pad1)")
+      (node (ref L2) (pin 1))
+      (node (ref U4) (pin 3)))
+    (net (code 107) (name "Net-(L3-Pad1)")
+      (node (ref U5) (pin 3))
+      (node (ref L3) (pin 1)))
+    (net (code 108) (name "Net-(L1-Pad1)")
+      (node (ref U3) (pin 3))
+      (node (ref L1) (pin 1)))
+    (net (code 109) (name /power/WAKEUPn)
+      (node (ref U7) (pin 7))
+      (node (ref R6) (pin 2)))
+    (net (code 110) (name +2V5)
      (node (ref U1) (pin P6))
-      (node (ref C12) (pin 1))
-      (node (ref C11) (pin 1))
-      (node (ref RA2) (pin 1))
-      (node (ref C10) (pin 1))
-      (node (ref L3) (pin 2))
      (node (ref U1) (pin F6))
+      (node (ref L3) (pin 2))
+      (node (ref C10) (pin 1))
+      (node (ref RA2) (pin 1))
+      (node (ref C11) (pin 1))
+      (node (ref C12) (pin 1))
+      (node (ref U7) (pin 8))
      (node (ref U1) (pin F15))
      (node (ref U1) (pin P15)))
-    (net (code 110) (name /power/HOLD)
-      (node (ref D11) (pin 1))
-      (node (ref R4) (pin 1)))
-    (net (code 111) (name /power/WKn)
-      (node (ref R6) (pin 1))
-      (node (ref Q1) (pin 1)))
-    (net (code 112) (name FTDI_PWREN)
+    (net (code 111) (name "Net-(Q2-Pad1)")
+      (node (ref R8) (pin 2))
+      (node (ref Q2) (pin 1)))
+    (net (code 112) (name /power/WKn)
+      (node (ref Q1) (pin 1))
+      (node (ref R6) (pin 1)))
+    (net (code 113) (name FTDI_PWREN)
      (node (ref D13) (pin 2)))
-    (net (code 113) (name "Net-(Q2-Pad1)")
-      (node (ref Q2) (pin 1))
-      (node (ref R8) (pin 2)))
-    (net (code 114) (name "Net-(U7-Pad1)")
-      (node (ref Y1) (pin 1))
-      (node (ref U7) (pin 1)))
-    (net (code 115) (name "Net-(Y1-Pad2)")
+    (net (code 114) (name "Net-(Y1-Pad2)")
      (node (ref Y1) (pin 2)))
-    (net (code 116) (name "Net-(Y1-Pad3)")
+    (net (code 115) (name "Net-(Y1-Pad3)")
      (node (ref Y1) (pin 3)))
-    (net (code 117) (name "Net-(U7-Pad2)")
-      (node (ref U7) (pin 2))
-      (node (ref Y1) (pin 4)))
+    (net (code 116) (name /power/OSCI_32k)
+      (node (ref Y1) (pin 1))
+      (node (ref U7) (pin 1)))
+    (net (code 117) (name /power/OSCO_32k)
+      (node (ref Y1) (pin 4))
+      (node (ref U7) (pin 2)))
    (net (code 118) (name SHUTDOWN)
      (node (ref D12) (pin 2)))
    (net (code 119) (name /power/SHUT)
-      (node (ref Q2) (pin 2))
-      (node (ref R5) (pin 1))
      (node (ref D12) (pin 1))
-      (node (ref C14) (pin 1)))
+      (node (ref C14) (pin 1))
+      (node (ref R5) (pin 1))
+      (node (ref Q2) (pin 2)))
    (net (code 120) (name /power/WKUP)
-      (node (ref Q1) (pin 2))
+      (node (ref R3) (pin 2))
      (node (ref C13) (pin 2))
      (node (ref D10) (pin 2))
-      (node (ref R3) (pin 2)))
-    (net (code 121) (name "Net-(L3-Pad1)")
-      (node (ref L3) (pin 1))
-      (node (ref U5) (pin 3)))
+      (node (ref Q1) (pin 2)))
+    (net (code 121) (name /power/HOLD)
+      (node (ref R4) (pin 1))
+      (node (ref D11) (pin 1)))
    (net (code 122) (name /power/WAKE)
-      (node (ref R1) (pin 1))
-      (node (ref D10) (pin 1)))
-    (net (code 123) (name /power/VBAT)
+      (node (ref D10) (pin 1))
+      (node (ref R1) (pin 1)))
+    (net (code 123) (name I2C_SDA)
+      (node (ref U7) (pin 5)))
+    (net (code 124) (name /power/VBAT)
      (node (ref U7) (pin 3))
      (node (ref BAT1) (pin 1)))
-    (net (code 124) (name I2C_SDA)
-      (node (ref U7) (pin 5)))
    (net (code 125) (name I2C_SCL)
      (node (ref U7) (pin 6)))
-    (net (code 126) (name /power/FB1)
-      (node (ref U3) (pin 5))
-      (node (ref C2) (pin 2))
-      (node (ref RA1) (pin 2))
-      (node (ref RB1) (pin 2)))
-    (net (code 127) (name /power/PWREN)
-      (node (ref U3) (pin 1))
-      (node (ref R1) (pin 2))
-      (node (ref U5) (pin 1))
-      (node (ref R2) (pin 1))
-      (node (ref D13) (pin 1))
+    (net (code 126) (name /power/PWREN)
+      (node (ref U4) (pin 1))
      (node (ref R4) (pin 2))
+      (node (ref D13) (pin 1))
+      (node (ref U3) (pin 1))
      (node (ref R8) (pin 1))
-      (node (ref U4) (pin 1)))
+      (node (ref R2) (pin 1))
+      (node (ref U5) (pin 1))
+      (node (ref R1) (pin 2)))
+    (net (code 127) (name /power/FB1)
+      (node (ref C2) (pin 2))
+      (node (ref RA1) (pin 2))
+      (node (ref RB1) (pin 2))
+      (node (ref U3) (pin 5)))
    (net (code 128) (name /power/FB3)
-      (node (ref RA3) (pin 2))
      (node (ref C6) (pin 2))
-      (node (ref U4) (pin 5))
-      (node (ref RB3) (pin 2)))
+      (node (ref RA3) (pin 2))
+      (node (ref RB3) (pin 2))
+      (node (ref U4) (pin 5)))
    (net (code 129) (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 RA2) (pin 2)))
+      (node (ref RB2) (pin 2))
+      (node (ref U5) (pin 5)))
    (net (code 130) (name LED1)
      (node (ref D1) (pin 2)))
    (net (code 131) (name BTN_R)
@ -1968,13 +1968,13 @@
    (net (code 141) (name OLED_DC)
      (node (ref OLED1) (pin 6)))
    (net (code 142) (name "Net-(BTN1-Pad1)")
-      (node (ref BTN1) (pin 1))
-      (node (ref BTN2) (pin 1))
      (node (ref BTN4) (pin 1))
+      (node (ref BTN2) (pin 1))
+      (node (ref BTN1) (pin 1))
      (node (ref BTN3) (pin 1))
+      (node (ref BTN6) (pin 1))
      (node (ref BTN5) (pin 1))
-      (node (ref R7) (pin 2))
-      (node (ref BTN6) (pin 1)))
+      (node (ref R7) (pin 2)))
    (net (code 143) (name OLED_CS)
      (node (ref OLED1) (pin 7)))
    (net (code 144) (name OLED_RES)
@ -2122,13 +2122,13 @@
    (net (code 215) (name "Net-(US2-Pad4)")
      (node (ref US2) (pin 4)))
    (net (code 216) (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 217) (name "Net-(U6-Pad30)")
      (node (ref U6) (pin 30)))
    (net (code 218) (name /usb/USB5V)
-      (node (ref D8) (pin 2))
-      (node (ref US1) (pin 1)))
+      (node (ref US1) (pin 1))
+      (node (ref D8) (pin 2)))
    (net (code 219) (name "Net-(U6-Pad40)")
      (node (ref U6) (pin 40)))
    (net (code 220) (name "Net-(U6-Pad20)")