SD card to sperate "sdcard" sheet

small rearranging and comments

analog.bak

@@ -39,12 +39,12 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 9 9
+Sheet 9 10
 Title ""
 Date ""
 Rev ""
-Comp ""
-Comment1 ""
+Comp "FER+RIZ+RADIONA"
+Comment1 "Analog audio and video"
 Comment2 ""
 Comment3 ""
 Comment4 ""
@@ -60,4 +60,147 @@ F 3 "" H 2800 2400 50  0000 C CNN
 	1    2700 2550
 	1    0    0    -1  
 $EndComp
+$Comp
+L GND #PWR79
+U 1 1 58D9043A
+P 3250 2550
+F 0 "#PWR79" 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
+	1    3250 2550
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	3100 2550 3250 2550
+$Comp
+L R R17
+U 1 1 58D90455
+P 3750 2350
+F 0 "R17" V 3830 2350 50  0000 C CNN
+F 1 "100" V 3750 2350 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3680 2350 50  0001 C CNN
+F 3 "" H 3750 2350 50  0000 C CNN
+	1    3750 2350
+	0    1    1    0   
+$EndComp
+$Comp
+L R R16
+U 1 1 58D904AE
+P 3750 2200
+F 0 "R16" V 3830 2200 50  0000 C CNN
+F 1 "200" V 3750 2200 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3680 2200 50  0001 C CNN
+F 3 "" H 3750 2200 50  0000 C CNN
+	1    3750 2200
+	0    1    1    0   
+$EndComp
+$Comp
+L R R15
+U 1 1 58D904D5
+P 3750 2050
+F 0 "R15" V 3830 2050 50  0000 C CNN
+F 1 "400" V 3750 2050 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3680 2050 50  0001 C CNN
+F 3 "" H 3750 2050 50  0000 C CNN
+	1    3750 2050
+	0    1    1    0   
+$EndComp
+$Comp
+L R R14
+U 1 1 58D90500
+P 3750 1900
+F 0 "R14" V 3830 1900 50  0000 C CNN
+F 1 "800" V 3750 1900 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3680 1900 50  0001 C CNN
+F 3 "" H 3750 1900 50  0000 C CNN
+	1    3750 1900
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	3100 2350 3600 2350
+Wire Wire Line
+	3600 2200 3500 2200
+Wire Wire Line
+	3500 1900 3500 2350
+Connection ~ 3500 2350
+Wire Wire Line
+	3500 2050 3600 2050
+Connection ~ 3500 2200
+Wire Wire Line
+	3500 1900 3600 1900
+Connection ~ 3500 2050
+Text GLabel 3900 2350 2    60   Input ~ 0
+AUDIO_L0
+Text GLabel 3900 2200 2    60   Input ~ 0
+AUDIO_L1
+Text GLabel 3900 2050 2    60   Input ~ 0
+AUDIO_L2
+Text GLabel 3900 1900 2    60   Input ~ 0
+AUDIO_L3
+$Comp
+L R R21
+U 1 1 58D907CA
+P 3750 3200
+F 0 "R21" V 3830 3200 50  0000 C CNN
+F 1 "100" V 3750 3200 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3680 3200 50  0001 C CNN
+F 3 "" H 3750 3200 50  0000 C CNN
+	1    3750 3200
+	0    1    1    0   
+$EndComp
+$Comp
+L R R20
+U 1 1 58D907D0
+P 3750 3050
+F 0 "R20" V 3830 3050 50  0000 C CNN
+F 1 "200" V 3750 3050 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3680 3050 50  0001 C CNN
+F 3 "" H 3750 3050 50  0000 C CNN
+	1    3750 3050
+	0    1    1    0   
+$EndComp
+$Comp
+L R R19
+U 1 1 58D907D6
+P 3750 2900
+F 0 "R19" V 3830 2900 50  0000 C CNN
+F 1 "400" V 3750 2900 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3680 2900 50  0001 C CNN
+F 3 "" H 3750 2900 50  0000 C CNN
+	1    3750 2900
+	0    1    1    0   
+$EndComp
+$Comp
+L R R18
+U 1 1 58D907DC
+P 3750 2750
+F 0 "R18" V 3830 2750 50  0000 C CNN
+F 1 "800" V 3750 2750 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3680 2750 50  0001 C CNN
+F 3 "" H 3750 2750 50  0000 C CNN
+	1    3750 2750
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	3600 3050 3500 3050
+Wire Wire Line
+	3500 2750 3500 3200
+Wire Wire Line
+	3500 2900 3600 2900
+Connection ~ 3500 3050
+Wire Wire Line
+	3100 2750 3600 2750
+Connection ~ 3500 2900
+Text GLabel 3900 3200 2    60   Input ~ 0
+AUDIO_R0
+Text GLabel 3900 3050 2    60   Input ~ 0
+AUDIO_R1
+Text GLabel 3900 2900 2    60   Input ~ 0
+AUDIO_R2
+Text GLabel 3900 2750 2    60   Input ~ 0
+AUDIO_R3
+Wire Wire Line
+	3500 3200 3600 3200
+Connection ~ 3500 2750
 $EndSCHEMATC

analog.sch

@@ -39,12 +39,12 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 9 9
+Sheet 9 10
 Title ""
 Date ""
 Rev ""
-Comp ""
-Comment1 ""
+Comp "FER+RIZ+RADIONA"
+Comment1 "Analog audio and video"
 Comment2 ""
 Comment3 ""
 Comment4 ""
@@ -60,4 +60,150 @@ F 3 "" H 2800 2400 50  0000 C CNN
 	1    2700 2550
 	1    0    0    -1  
 $EndComp
+$Comp
+L GND #PWR079
+U 1 1 58D9043A
+P 3250 2550
+F 0 "#PWR079" 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
+	1    3250 2550
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	3100 2550 3250 2550
+$Comp
+L R R17
+U 1 1 58D90455
+P 3750 2350
+F 0 "R17" V 3830 2350 50  0000 C CNN
+F 1 "100" V 3750 2350 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3680 2350 50  0001 C CNN
+F 3 "" H 3750 2350 50  0000 C CNN
+	1    3750 2350
+	0    1    1    0   
+$EndComp
+$Comp
+L R R16
+U 1 1 58D904AE
+P 3750 2200
+F 0 "R16" V 3830 2200 50  0000 C CNN
+F 1 "200" V 3750 2200 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3680 2200 50  0001 C CNN
+F 3 "" H 3750 2200 50  0000 C CNN
+	1    3750 2200
+	0    1    1    0   
+$EndComp
+$Comp
+L R R15
+U 1 1 58D904D5
+P 3750 2050
+F 0 "R15" V 3830 2050 50  0000 C CNN
+F 1 "400" V 3750 2050 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3680 2050 50  0001 C CNN
+F 3 "" H 3750 2050 50  0000 C CNN
+	1    3750 2050
+	0    1    1    0   
+$EndComp
+$Comp
+L R R14
+U 1 1 58D90500
+P 3750 1900
+F 0 "R14" V 3830 1900 50  0000 C CNN
+F 1 "800" V 3750 1900 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3680 1900 50  0001 C CNN
+F 3 "" H 3750 1900 50  0000 C CNN
+	1    3750 1900
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	3100 2350 3600 2350
+Wire Wire Line
+	3600 2200 3500 2200
+Wire Wire Line
+	3500 1900 3500 2350
+Connection ~ 3500 2350
+Wire Wire Line
+	3500 2050 3600 2050
+Connection ~ 3500 2200
+Wire Wire Line
+	3500 1900 3600 1900
+Connection ~ 3500 2050
+Text GLabel 3900 2350 2    60   Input ~ 0
+AUDIO_L0
+Text GLabel 3900 2200 2    60   Input ~ 0
+AUDIO_L1
+Text GLabel 3900 2050 2    60   Input ~ 0
+AUDIO_L2
+Text GLabel 3900 1900 2    60   Input ~ 0
+AUDIO_L3
+$Comp
+L R R21
+U 1 1 58D907CA
+P 3750 3200
+F 0 "R21" V 3830 3200 50  0000 C CNN
+F 1 "100" V 3750 3200 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3680 3200 50  0001 C CNN
+F 3 "" H 3750 3200 50  0000 C CNN
+	1    3750 3200
+	0    1    1    0   
+$EndComp
+$Comp
+L R R20
+U 1 1 58D907D0
+P 3750 3050
+F 0 "R20" V 3830 3050 50  0000 C CNN
+F 1 "200" V 3750 3050 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3680 3050 50  0001 C CNN
+F 3 "" H 3750 3050 50  0000 C CNN
+	1    3750 3050
+	0    1    1    0   
+$EndComp
+$Comp
+L R R19
+U 1 1 58D907D6
+P 3750 2900
+F 0 "R19" V 3830 2900 50  0000 C CNN
+F 1 "400" V 3750 2900 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3680 2900 50  0001 C CNN
+F 3 "" H 3750 2900 50  0000 C CNN
+	1    3750 2900
+	0    1    1    0   
+$EndComp
+$Comp
+L R R18
+U 1 1 58D907DC
+P 3750 2750
+F 0 "R18" V 3830 2750 50  0000 C CNN
+F 1 "800" V 3750 2750 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3680 2750 50  0001 C CNN
+F 3 "" H 3750 2750 50  0000 C CNN
+	1    3750 2750
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	3600 3050 3500 3050
+Wire Wire Line
+	3500 2750 3500 3200
+Wire Wire Line
+	3500 2900 3600 2900
+Connection ~ 3500 3050
+Wire Wire Line
+	3100 2750 3600 2750
+Connection ~ 3500 2900
+Text GLabel 3900 3200 2    60   Input ~ 0
+AUDIO_R0
+Text GLabel 3900 3050 2    60   Input ~ 0
+AUDIO_R1
+Text GLabel 3900 2900 2    60   Input ~ 0
+AUDIO_R2
+Text GLabel 3900 2750 2    60   Input ~ 0
+AUDIO_R3
+Wire Wire Line
+	3500 3200 3600 3200
+Connection ~ 3500 2750
+NoConn ~ 3100 2250
+NoConn ~ 3100 2450
+NoConn ~ 3100 2650
 $EndSCHEMATC

blinkey.bak

@@ -39,7 +39,7 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 4 9
+Sheet 4 10
 Title "ULX3S"
 Date ""
 Rev "0.0.1"
@@ -75,10 +75,10 @@ Wire Wire Line
 Wire Wire Line
 	4750 1850 4850 1850
 $Comp
-L GND #PWR52
+L GND #PWR48
 U 1 1 58D66047
 P 4850 1250
-F 0 "#PWR52" H 4850 1000 50  0001 C CNN
+F 0 "#PWR48" 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
@@ -86,10 +86,10 @@ F 3 "" H 4850 1250 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR53
+L +3V3 #PWR49
 U 1 1 58D66055
 P 5350 1350
-F 0 "#PWR53" H 5350 1200 50  0001 C CNN
+F 0 "#PWR49" 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
@@ -189,10 +189,10 @@ Wire Wire Line
 	2850 3150 2750 3150
 Connection ~ 2750 3150
 $Comp
-L +3V3 #PWR50
+L +3V3 #PWR46
 U 1 1 58D6605C
 P 2750 2500
-F 0 "#PWR50" H 2750 2350 50  0001 C CNN
+F 0 "#PWR46" H 2750 2350 50  0001 C CNN
 F 1 "+3V3" H 2750 2640 50  0000 C CNN
 F 2 "" H 2750 2500 50  0000 C CNN
 F 3 "" H 2750 2500 50  0000 C CNN
@@ -230,7 +230,7 @@ U 1 1 58D6605D
 P 2750 2700
 F 0 "R7" V 2830 2700 50  0000 C CNN
 F 1 "220" V 2750 2700 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 2680 2700 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 2680 2700 50  0001 C CNN
 F 3 "" H 2750 2700 50  0000 C CNN
 	1    2750 2700
 	1    0    0    -1  
@@ -354,10 +354,10 @@ Wire Wire Line
 	4400 2750 4250 2750
 Connection ~ 4250 2750
 $Comp
-L GND #PWR51
+L GND #PWR47
 U 1 1 58D681C3
 P 4250 4100
-F 0 "#PWR51" H 4250 3850 50  0001 C CNN
+F 0 "#PWR47" 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

@@ -39,7 +39,7 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 4 9
+Sheet 4 10
 Title "ULX3S"
 Date ""
 Rev "0.0.1"
@@ -75,10 +75,10 @@ Wire Wire Line
 Wire Wire Line
 	4750 1850 4850 1850
 $Comp
-L GND #PWR050
+L GND #PWR046
 U 1 1 58D66047
 P 4850 1250
-F 0 "#PWR050" H 4850 1000 50  0001 C CNN
+F 0 "#PWR046" 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
@@ -86,10 +86,10 @@ F 3 "" H 4850 1250 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR051
+L +3V3 #PWR047
 U 1 1 58D66055
 P 5350 1350
-F 0 "#PWR051" H 5350 1200 50  0001 C CNN
+F 0 "#PWR047" 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
@@ -189,10 +189,10 @@ Wire Wire Line
 	2850 3150 2750 3150
 Connection ~ 2750 3150
 $Comp
-L +3V3 #PWR052
+L +3V3 #PWR048
 U 1 1 58D6605C
 P 2750 2500
-F 0 "#PWR052" H 2750 2350 50  0001 C CNN
+F 0 "#PWR048" H 2750 2350 50  0001 C CNN
 F 1 "+3V3" H 2750 2640 50  0000 C CNN
 F 2 "" H 2750 2500 50  0000 C CNN
 F 3 "" H 2750 2500 50  0000 C CNN
@@ -230,7 +230,7 @@ U 1 1 58D6605D
 P 2750 2700
 F 0 "R7" V 2830 2700 50  0000 C CNN
 F 1 "220" V 2750 2700 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 2680 2700 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 2680 2700 50  0001 C CNN
 F 3 "" H 2750 2700 50  0000 C CNN
 	1    2750 2700
 	1    0    0    -1  
@@ -354,10 +354,10 @@ Wire Wire Line
 	4400 2750 4250 2750
 Connection ~ 4250 2750
 $Comp
-L GND #PWR053
+L GND #PWR049
 U 1 1 58D681C3
 P 4250 4100
-F 0 "#PWR053" H 4250 3850 50  0001 C CNN
+F 0 "#PWR049" 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

gpdi.bak

@@ -39,7 +39,7 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 5 9
+Sheet 5 10
 Title "ULX3S"
 Date ""
 Rev "0.0.1"
@@ -101,10 +101,10 @@ Wire Wire Line
 Wire Wire Line
 	5400 5550 5450 5550
 $Comp
-L GND #PWR59
+L GND #PWR55
 U 1 1 58D69073
 P 5450 5550
-F 0 "#PWR59" H 5450 5300 50  0001 C CNN
+F 0 "#PWR55" H 5450 5300 50  0001 C CNN
 F 1 "GND" H 5450 5400 50  0000 C CNN
 F 2 "" H 5450 5550 60  0000 C CNN
 F 3 "" H 5450 5550 60  0000 C CNN
@@ -112,10 +112,10 @@ F 3 "" H 5450 5550 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR58
+L GND #PWR54
 U 1 1 58D69074
 P 5450 5150
-F 0 "#PWR58" H 5450 4900 50  0001 C CNN
+F 0 "#PWR54" H 5450 4900 50  0001 C CNN
 F 1 "GND" H 5450 5000 50  0000 C CNN
 F 2 "" H 5450 5150 60  0000 C CNN
 F 3 "" H 5450 5150 60  0000 C CNN
@@ -123,10 +123,10 @@ F 3 "" H 5450 5150 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR57
+L GND #PWR53
 U 1 1 58D69075
 P 5450 4850
-F 0 "#PWR57" H 5450 4600 50  0001 C CNN
+F 0 "#PWR53" H 5450 4600 50  0001 C CNN
 F 1 "GND" H 5450 4700 50  0000 C CNN
 F 2 "" H 5450 4850 60  0000 C CNN
 F 3 "" H 5450 4850 60  0000 C CNN
@@ -134,10 +134,10 @@ F 3 "" H 5450 4850 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR56
+L GND #PWR52
 U 1 1 58D69076
 P 5450 4550
-F 0 "#PWR56" H 5450 4300 50  0001 C CNN
+F 0 "#PWR52" H 5450 4300 50  0001 C CNN
 F 1 "GND" H 5450 4400 50  0000 C CNN
 F 2 "" H 5450 4550 60  0000 C CNN
 F 3 "" H 5450 4550 60  0000 C CNN
@@ -145,10 +145,10 @@ F 3 "" H 5450 4550 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR55
+L GND #PWR51
 U 1 1 58D69077
 P 5450 4250
-F 0 "#PWR55" H 5450 4000 50  0001 C CNN
+F 0 "#PWR51" H 5450 4000 50  0001 C CNN
 F 1 "GND" H 5450 4100 50  0000 C CNN
 F 2 "" H 5450 4250 60  0000 C CNN
 F 3 "" H 5450 4250 60  0000 C CNN
@@ -156,10 +156,10 @@ F 3 "" H 5450 4250 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR54
+L GND #PWR50
 U 1 1 58D69078
 P 5450 3950
-F 0 "#PWR54" H 5450 3700 50  0001 C CNN
+F 0 "#PWR50" H 5450 3700 50  0001 C CNN
 F 1 "GND" H 5450 3800 50  0000 C CNN
 F 2 "" H 5450 3950 60  0000 C CNN
 F 3 "" H 5450 3950 60  0000 C CNN
@@ -167,10 +167,10 @@ F 3 "" H 5450 3950 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +5V #PWR60
+L +5V #PWR56
 U 1 1 58D6907F
 P 6200 5450
-F 0 "#PWR60" H 6200 5300 50  0001 C CNN
+F 0 "#PWR56" H 6200 5300 50  0001 C CNN
 F 1 "+5V" H 6200 5590 50  0000 C CNN
 F 2 "" H 6200 5450 50  0000 C CNN
 F 3 "" H 6200 5450 50  0000 C CNN
@@ -203,4 +203,6 @@ Text GLabel 5650 5250 2    60   Input ~ 0
 GPDI_SCL
 Text GLabel 5650 5350 2    60   Input ~ 0
 GPDI_SDA
+Text Notes 6750 4300 0    60   ~ 0
+todo:\n5V I2C bidirectional level shifter\nconnect to proper FPGA differential pins
 $EndSCHEMATC

gpdi.sch

@@ -39,7 +39,7 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 5 9
+Sheet 5 10
 Title "ULX3S"
 Date ""
 Rev "0.0.1"
@@ -101,10 +101,10 @@ Wire Wire Line
 Wire Wire Line
 	5400 5550 5450 5550
 $Comp
-L GND #PWR054
+L GND #PWR050
 U 1 1 58D69073
 P 5450 5550
-F 0 "#PWR054" H 5450 5300 50  0001 C CNN
+F 0 "#PWR050" H 5450 5300 50  0001 C CNN
 F 1 "GND" H 5450 5400 50  0000 C CNN
 F 2 "" H 5450 5550 60  0000 C CNN
 F 3 "" H 5450 5550 60  0000 C CNN
@@ -112,10 +112,10 @@ F 3 "" H 5450 5550 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR055
+L GND #PWR051
 U 1 1 58D69074
 P 5450 5150
-F 0 "#PWR055" H 5450 4900 50  0001 C CNN
+F 0 "#PWR051" H 5450 4900 50  0001 C CNN
 F 1 "GND" H 5450 5000 50  0000 C CNN
 F 2 "" H 5450 5150 60  0000 C CNN
 F 3 "" H 5450 5150 60  0000 C CNN
@@ -123,10 +123,10 @@ F 3 "" H 5450 5150 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR056
+L GND #PWR052
 U 1 1 58D69075
 P 5450 4850
-F 0 "#PWR056" H 5450 4600 50  0001 C CNN
+F 0 "#PWR052" H 5450 4600 50  0001 C CNN
 F 1 "GND" H 5450 4700 50  0000 C CNN
 F 2 "" H 5450 4850 60  0000 C CNN
 F 3 "" H 5450 4850 60  0000 C CNN
@@ -134,10 +134,10 @@ F 3 "" H 5450 4850 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR057
+L GND #PWR053
 U 1 1 58D69076
 P 5450 4550
-F 0 "#PWR057" H 5450 4300 50  0001 C CNN
+F 0 "#PWR053" H 5450 4300 50  0001 C CNN
 F 1 "GND" H 5450 4400 50  0000 C CNN
 F 2 "" H 5450 4550 60  0000 C CNN
 F 3 "" H 5450 4550 60  0000 C CNN
@@ -145,10 +145,10 @@ F 3 "" H 5450 4550 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR058
+L GND #PWR054
 U 1 1 58D69077
 P 5450 4250
-F 0 "#PWR058" H 5450 4000 50  0001 C CNN
+F 0 "#PWR054" H 5450 4000 50  0001 C CNN
 F 1 "GND" H 5450 4100 50  0000 C CNN
 F 2 "" H 5450 4250 60  0000 C CNN
 F 3 "" H 5450 4250 60  0000 C CNN
@@ -156,10 +156,10 @@ F 3 "" H 5450 4250 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR059
+L GND #PWR055
 U 1 1 58D69078
 P 5450 3950
-F 0 "#PWR059" H 5450 3700 50  0001 C CNN
+F 0 "#PWR055" H 5450 3700 50  0001 C CNN
 F 1 "GND" H 5450 3800 50  0000 C CNN
 F 2 "" H 5450 3950 60  0000 C CNN
 F 3 "" H 5450 3950 60  0000 C CNN
@@ -167,10 +167,10 @@ F 3 "" H 5450 3950 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +5V #PWR060
+L +5V #PWR056
 U 1 1 58D6907F
 P 6200 5450
-F 0 "#PWR060" H 6200 5300 50  0001 C CNN
+F 0 "#PWR056" H 6200 5300 50  0001 C CNN
 F 1 "+5V" H 6200 5590 50  0000 C CNN
 F 2 "" H 6200 5450 50  0000 C CNN
 F 3 "" H 6200 5450 50  0000 C CNN
@@ -203,4 +203,6 @@ Text GLabel 5650 5250 2    60   Input ~ 0
 GPDI_SCL
 Text GLabel 5650 5350 2    60   Input ~ 0
 GPDI_SDA
+Text Notes 6750 4300 0    60   ~ 0
+todo:\n5V I2C bidirectional level shifter\nconnect to proper FPGA differential pins
 $EndSCHEMATC

gpio.bak

@@ -39,7 +39,7 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 2 9
+Sheet 2 10
 Title "ULX3S"
 Date ""
 Rev ""
@@ -111,10 +111,10 @@ P27
 Text Label 5200 1950 0    60   ~ 0
 P28
 $Comp
-L GND #PWR13
+L GND #PWR9
 U 1 1 56AC4825
 P 1450 950
-F 0 "#PWR13" H 1450 700 50  0001 C CNN
+F 0 "#PWR9" H 1450 700 50  0001 C CNN
 F 1 "GND" H 1450 800 50  0000 C CNN
 F 2 "" H 1450 950 60  0000 C CNN
 F 3 "" H 1450 950 60  0000 C CNN
@@ -122,10 +122,10 @@ F 3 "" H 1450 950 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR16
+L GND #PWR12
 U 1 1 56AC482D
 P 2250 950
-F 0 "#PWR16" H 2250 700 50  0001 C CNN
+F 0 "#PWR12" H 2250 700 50  0001 C CNN
 F 1 "GND" H 2250 800 50  0000 C CNN
 F 2 "" H 2250 950 60  0000 C CNN
 F 3 "" H 2250 950 60  0000 C CNN
@@ -161,10 +161,10 @@ OUT5V
 Text Label 850  850  0    60   ~ 0
 +5V
 $Comp
-L +5V #PWR5
+L +5V #PWR1
 U 1 1 56AC484F
 P 850 850
-F 0 "#PWR5" H 850 700 50  0001 C CNN
+F 0 "#PWR1" H 850 700 50  0001 C CNN
 F 1 "+5V" H 850 990 50  0000 C CNN
 F 2 "" H 850 850 60  0000 C CNN
 F 3 "" H 850 850 60  0000 C CNN
@@ -513,10 +513,10 @@ MP3
 Text Label 1400 6200 0    60   ~ 0
 MP5
 $Comp
-L GND #PWR8
+L GND #PWR4
 U 1 1 58D3C3A8
 P 1150 6400
-F 0 "#PWR8" H 1150 6150 50  0001 C CNN
+F 0 "#PWR4" H 1150 6150 50  0001 C CNN
 F 1 "GND" H 1150 6250 50  0000 C CNN
 F 2 "" H 1150 6400 50  0000 C CNN
 F 3 "" H 1150 6400 50  0000 C CNN
@@ -524,10 +524,10 @@ F 3 "" H 1150 6400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR23
+L GND #PWR19
 U 1 1 58D3C3C8
 P 2550 6400
-F 0 "#PWR23" H 2550 6150 50  0001 C CNN
+F 0 "#PWR19" H 2550 6150 50  0001 C CNN
 F 1 "GND" H 2550 6250 50  0000 C CNN
 F 2 "" H 2550 6400 50  0000 C CNN
 F 3 "" H 2550 6400 50  0000 C CNN
@@ -535,10 +535,10 @@ F 3 "" H 2550 6400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR22
+L GND #PWR18
 U 1 1 58D3C400
 P 2550 5500
-F 0 "#PWR22" H 2550 5250 50  0001 C CNN
+F 0 "#PWR18" H 2550 5250 50  0001 C CNN
 F 1 "GND" H 2550 5350 50  0000 C CNN
 F 2 "" H 2550 5500 50  0000 C CNN
 F 3 "" H 2550 5500 50  0000 C CNN
@@ -546,10 +546,10 @@ F 3 "" H 2550 5500 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR7
+L GND #PWR3
 U 1 1 58D3C426
 P 1150 5500
-F 0 "#PWR7" H 1150 5250 50  0001 C CNN
+F 0 "#PWR3" H 1150 5250 50  0001 C CNN
 F 1 "GND" H 1150 5350 50  0000 C CNN
 F 2 "" H 1150 5500 50  0000 C CNN
 F 3 "" H 1150 5500 50  0000 C CNN
@@ -557,10 +557,10 @@ F 3 "" H 1150 5500 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR12
+L GND #PWR8
 U 1 1 58D565FC
 P 1400 3850
-F 0 "#PWR12" H 1400 3600 50  0001 C CNN
+F 0 "#PWR8" H 1400 3600 50  0001 C CNN
 F 1 "GND" H 1400 3700 50  0000 C CNN
 F 2 "" H 1400 3850 60  0000 C CNN
 F 3 "" H 1400 3850 60  0000 C CNN
@@ -570,10 +570,10 @@ $EndComp
 Wire Wire Line
 	1400 3850 1600 3850
 $Comp
-L GND #PWR17
+L GND #PWR13
 U 1 1 58D56721
 P 2300 3850
-F 0 "#PWR17" H 2300 3600 50  0001 C CNN
+F 0 "#PWR13" H 2300 3600 50  0001 C CNN
 F 1 "GND" H 2300 3700 50  0000 C CNN
 F 2 "" H 2300 3850 60  0000 C CNN
 F 3 "" H 2300 3850 60  0000 C CNN
@@ -830,10 +830,10 @@ PMODA5
 Text Label 1200 4950 0    60   ~ 0
 PMODA7
 $Comp
-L GND #PWR6
+L GND #PWR2
 U 1 1 58D51066
 P 1150 4550
-F 0 "#PWR6" H 1150 4300 50  0001 C CNN
+F 0 "#PWR2" H 1150 4300 50  0001 C CNN
 F 1 "GND" H 1150 4400 50  0000 C CNN
 F 2 "" H 1150 4550 50  0000 C CNN
 F 3 "" H 1150 4550 50  0000 C CNN
@@ -861,10 +861,10 @@ PMODA6
 Text Label 2150 4950 0    60   ~ 0
 PMODA8
 $Comp
-L GND #PWR21
+L GND #PWR17
 U 1 1 58D510F5
 P 2550 4550
-F 0 "#PWR21" H 2550 4300 50  0001 C CNN
+F 0 "#PWR17" H 2550 4300 50  0001 C CNN
 F 1 "GND" H 2550 4400 50  0000 C CNN
 F 2 "" H 2550 4550 50  0000 C CNN
 F 3 "" H 2550 4550 50  0000 C CNN
@@ -872,10 +872,10 @@ F 3 "" H 2550 4550 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR15
+L +3V3 #PWR11
 U 1 1 58D5FBBC
 P 2150 3950
-F 0 "#PWR15" H 2150 3800 50  0001 C CNN
+F 0 "#PWR11" H 2150 3800 50  0001 C CNN
 F 1 "+3V3" H 2150 4090 50  0000 C CNN
 F 2 "" H 2150 3950 50  0000 C CNN
 F 3 "" H 2150 3950 50  0000 C CNN
@@ -883,10 +883,10 @@ F 3 "" H 2150 3950 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR14
+L +3V3 #PWR10
 U 1 1 58D5FBF3
 P 1550 3950
-F 0 "#PWR14" H 1550 3800 50  0001 C CNN
+F 0 "#PWR10" H 1550 3800 50  0001 C CNN
 F 1 "+3V3" H 1550 4090 50  0000 C CNN
 F 2 "" H 1550 3950 50  0000 C CNN
 F 3 "" H 1550 3950 50  0000 C CNN
@@ -894,10 +894,10 @@ F 3 "" H 1550 3950 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR18
+L +3V3 #PWR14
 U 1 1 58D5FC6D
 P 2400 4450
-F 0 "#PWR18" H 2400 4300 50  0001 C CNN
+F 0 "#PWR14" H 2400 4300 50  0001 C CNN
 F 1 "+3V3" H 2400 4590 50  0000 C CNN
 F 2 "" H 2400 4450 50  0000 C CNN
 F 3 "" H 2400 4450 50  0000 C CNN
@@ -905,10 +905,10 @@ F 3 "" H 2400 4450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR9
+L +3V3 #PWR5
 U 1 1 58D5FC94
 P 1300 4450
-F 0 "#PWR9" H 1300 4300 50  0001 C CNN
+F 0 "#PWR5" H 1300 4300 50  0001 C CNN
 F 1 "+3V3" H 1300 4590 50  0000 C CNN
 F 2 "" H 1300 4450 50  0000 C CNN
 F 3 "" H 1300 4450 50  0000 C CNN
@@ -916,10 +916,10 @@ F 3 "" H 1300 4450 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR19
+L +3V3 #PWR15
 U 1 1 58D60015
 P 2400 5400
-F 0 "#PWR19" H 2400 5250 50  0001 C CNN
+F 0 "#PWR15" H 2400 5250 50  0001 C CNN
 F 1 "+3V3" H 2400 5540 50  0000 C CNN
 F 2 "" H 2400 5400 50  0000 C CNN
 F 3 "" H 2400 5400 50  0000 C CNN
@@ -927,10 +927,10 @@ F 3 "" H 2400 5400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR20
+L +3V3 #PWR16
 U 1 1 58D60037
 P 2400 6300
-F 0 "#PWR20" H 2400 6150 50  0001 C CNN
+F 0 "#PWR16" H 2400 6150 50  0001 C CNN
 F 1 "+3V3" H 2400 6440 50  0000 C CNN
 F 2 "" H 2400 6300 50  0000 C CNN
 F 3 "" H 2400 6300 50  0000 C CNN
@@ -938,10 +938,10 @@ F 3 "" H 2400 6300 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR10
+L +3V3 #PWR6
 U 1 1 58D60059
 P 1300 5400
-F 0 "#PWR10" H 1300 5250 50  0001 C CNN
+F 0 "#PWR6" H 1300 5250 50  0001 C CNN
 F 1 "+3V3" H 1300 5540 50  0000 C CNN
 F 2 "" H 1300 5400 50  0000 C CNN
 F 3 "" H 1300 5400 50  0000 C CNN
@@ -949,10 +949,10 @@ F 3 "" H 1300 5400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR11
+L +3V3 #PWR7
 U 1 1 58D60089
 P 1300 6300
-F 0 "#PWR11" H 1300 6150 50  0001 C CNN
+F 0 "#PWR7" H 1300 6150 50  0001 C CNN
 F 1 "+3V3" H 1300 6440 50  0000 C CNN
 F 2 "" H 1300 6300 50  0000 C CNN
 F 3 "" H 1300 6300 50  0000 C CNN

gpio.sch

@@ -39,7 +39,7 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 2 9
+Sheet 2 10
 Title "ULX3S"
 Date ""
 Rev ""
@@ -111,10 +111,10 @@ P27
 Text Label 5200 1950 0    60   ~ 0
 P28
 $Comp
-L GND #PWR05
+L GND #PWR01
 U 1 1 56AC4825
 P 1450 950
-F 0 "#PWR05" H 1450 700 50  0001 C CNN
+F 0 "#PWR01" H 1450 700 50  0001 C CNN
 F 1 "GND" H 1450 800 50  0000 C CNN
 F 2 "" H 1450 950 60  0000 C CNN
 F 3 "" H 1450 950 60  0000 C CNN
@@ -122,10 +122,10 @@ F 3 "" H 1450 950 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR06
+L GND #PWR02
 U 1 1 56AC482D
 P 2250 950
-F 0 "#PWR06" H 2250 700 50  0001 C CNN
+F 0 "#PWR02" H 2250 700 50  0001 C CNN
 F 1 "GND" H 2250 800 50  0000 C CNN
 F 2 "" H 2250 950 60  0000 C CNN
 F 3 "" H 2250 950 60  0000 C CNN
@@ -161,10 +161,10 @@ OUT5V
 Text Label 850  850  0    60   ~ 0
 +5V
 $Comp
-L +5V #PWR07
+L +5V #PWR03
 U 1 1 56AC484F
 P 850 850
-F 0 "#PWR07" H 850 700 50  0001 C CNN
+F 0 "#PWR03" H 850 700 50  0001 C CNN
 F 1 "+5V" H 850 990 50  0000 C CNN
 F 2 "" H 850 850 60  0000 C CNN
 F 3 "" H 850 850 60  0000 C CNN
@@ -513,10 +513,10 @@ MP3
 Text Label 1400 6200 0    60   ~ 0
 MP5
 $Comp
-L GND #PWR08
+L GND #PWR04
 U 1 1 58D3C3A8
 P 1150 6400
-F 0 "#PWR08" H 1150 6150 50  0001 C CNN
+F 0 "#PWR04" H 1150 6150 50  0001 C CNN
 F 1 "GND" H 1150 6250 50  0000 C CNN
 F 2 "" H 1150 6400 50  0000 C CNN
 F 3 "" H 1150 6400 50  0000 C CNN
@@ -524,10 +524,10 @@ F 3 "" H 1150 6400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR09
+L GND #PWR05
 U 1 1 58D3C3C8
 P 2550 6400
-F 0 "#PWR09" H 2550 6150 50  0001 C CNN
+F 0 "#PWR05" H 2550 6150 50  0001 C CNN
 F 1 "GND" H 2550 6250 50  0000 C CNN
 F 2 "" H 2550 6400 50  0000 C CNN
 F 3 "" H 2550 6400 50  0000 C CNN
@@ -535,10 +535,10 @@ F 3 "" H 2550 6400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR010
+L GND #PWR06
 U 1 1 58D3C400
 P 2550 5500
-F 0 "#PWR010" H 2550 5250 50  0001 C CNN
+F 0 "#PWR06" H 2550 5250 50  0001 C CNN
 F 1 "GND" H 2550 5350 50  0000 C CNN
 F 2 "" H 2550 5500 50  0000 C CNN
 F 3 "" H 2550 5500 50  0000 C CNN
@@ -546,10 +546,10 @@ F 3 "" H 2550 5500 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR011
+L GND #PWR07
 U 1 1 58D3C426
 P 1150 5500
-F 0 "#PWR011" H 1150 5250 50  0001 C CNN
+F 0 "#PWR07" H 1150 5250 50  0001 C CNN
 F 1 "GND" H 1150 5350 50  0000 C CNN
 F 2 "" H 1150 5500 50  0000 C CNN
 F 3 "" H 1150 5500 50  0000 C CNN
@@ -557,10 +557,10 @@ F 3 "" H 1150 5500 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR012
+L GND #PWR08
 U 1 1 58D565FC
 P 1400 3850
-F 0 "#PWR012" H 1400 3600 50  0001 C CNN
+F 0 "#PWR08" H 1400 3600 50  0001 C CNN
 F 1 "GND" H 1400 3700 50  0000 C CNN
 F 2 "" H 1400 3850 60  0000 C CNN
 F 3 "" H 1400 3850 60  0000 C CNN
@@ -570,10 +570,10 @@ $EndComp
 Wire Wire Line
 	1400 3850 1600 3850
 $Comp
-L GND #PWR013
+L GND #PWR09
 U 1 1 58D56721
 P 2300 3850
-F 0 "#PWR013" H 2300 3600 50  0001 C CNN
+F 0 "#PWR09" H 2300 3600 50  0001 C CNN
 F 1 "GND" H 2300 3700 50  0000 C CNN
 F 2 "" H 2300 3850 60  0000 C CNN
 F 3 "" H 2300 3850 60  0000 C CNN
@@ -830,10 +830,10 @@ PMODA5
 Text Label 1200 4950 0    60   ~ 0
 PMODA7
 $Comp
-L GND #PWR014
+L GND #PWR010
 U 1 1 58D51066
 P 1150 4550
-F 0 "#PWR014" H 1150 4300 50  0001 C CNN
+F 0 "#PWR010" H 1150 4300 50  0001 C CNN
 F 1 "GND" H 1150 4400 50  0000 C CNN
 F 2 "" H 1150 4550 50  0000 C CNN
 F 3 "" H 1150 4550 50  0000 C CNN
@@ -861,10 +861,10 @@ PMODA6
 Text Label 2150 4950 0    60   ~ 0
 PMODA8
 $Comp
-L GND #PWR015
+L GND #PWR011
 U 1 1 58D510F5
 P 2550 4550
-F 0 "#PWR015" H 2550 4300 50  0001 C CNN
+F 0 "#PWR011" H 2550 4300 50  0001 C CNN
 F 1 "GND" H 2550 4400 50  0000 C CNN
 F 2 "" H 2550 4550 50  0000 C CNN
 F 3 "" H 2550 4550 50  0000 C CNN
@@ -872,10 +872,10 @@ F 3 "" H 2550 4550 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR016
+L +3V3 #PWR012
 U 1 1 58D5FBBC
 P 2150 3950
-F 0 "#PWR016" H 2150 3800 50  0001 C CNN
+F 0 "#PWR012" H 2150 3800 50  0001 C CNN
 F 1 "+3V3" H 2150 4090 50  0000 C CNN
 F 2 "" H 2150 3950 50  0000 C CNN
 F 3 "" H 2150 3950 50  0000 C CNN
@@ -883,10 +883,10 @@ F 3 "" H 2150 3950 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR017
+L +3V3 #PWR013
 U 1 1 58D5FBF3
 P 1550 3950
-F 0 "#PWR017" H 1550 3800 50  0001 C CNN
+F 0 "#PWR013" H 1550 3800 50  0001 C CNN
 F 1 "+3V3" H 1550 4090 50  0000 C CNN
 F 2 "" H 1550 3950 50  0000 C CNN
 F 3 "" H 1550 3950 50  0000 C CNN
@@ -894,10 +894,10 @@ F 3 "" H 1550 3950 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR018
+L +3V3 #PWR014
 U 1 1 58D5FC6D
 P 2400 4450
-F 0 "#PWR018" H 2400 4300 50  0001 C CNN
+F 0 "#PWR014" H 2400 4300 50  0001 C CNN
 F 1 "+3V3" H 2400 4590 50  0000 C CNN
 F 2 "" H 2400 4450 50  0000 C CNN
 F 3 "" H 2400 4450 50  0000 C CNN
@@ -905,10 +905,10 @@ F 3 "" H 2400 4450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR019
+L +3V3 #PWR015
 U 1 1 58D5FC94
 P 1300 4450
-F 0 "#PWR019" H 1300 4300 50  0001 C CNN
+F 0 "#PWR015" H 1300 4300 50  0001 C CNN
 F 1 "+3V3" H 1300 4590 50  0000 C CNN
 F 2 "" H 1300 4450 50  0000 C CNN
 F 3 "" H 1300 4450 50  0000 C CNN
@@ -916,10 +916,10 @@ F 3 "" H 1300 4450 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR020
+L +3V3 #PWR016
 U 1 1 58D60015
 P 2400 5400
-F 0 "#PWR020" H 2400 5250 50  0001 C CNN
+F 0 "#PWR016" H 2400 5250 50  0001 C CNN
 F 1 "+3V3" H 2400 5540 50  0000 C CNN
 F 2 "" H 2400 5400 50  0000 C CNN
 F 3 "" H 2400 5400 50  0000 C CNN
@@ -927,10 +927,10 @@ F 3 "" H 2400 5400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR021
+L +3V3 #PWR017
 U 1 1 58D60037
 P 2400 6300
-F 0 "#PWR021" H 2400 6150 50  0001 C CNN
+F 0 "#PWR017" H 2400 6150 50  0001 C CNN
 F 1 "+3V3" H 2400 6440 50  0000 C CNN
 F 2 "" H 2400 6300 50  0000 C CNN
 F 3 "" H 2400 6300 50  0000 C CNN
@@ -938,10 +938,10 @@ F 3 "" H 2400 6300 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR022
+L +3V3 #PWR018
 U 1 1 58D60059
 P 1300 5400
-F 0 "#PWR022" H 1300 5250 50  0001 C CNN
+F 0 "#PWR018" H 1300 5250 50  0001 C CNN
 F 1 "+3V3" H 1300 5540 50  0000 C CNN
 F 2 "" H 1300 5400 50  0000 C CNN
 F 3 "" H 1300 5400 50  0000 C CNN
@@ -949,10 +949,10 @@ F 3 "" H 1300 5400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR023
+L +3V3 #PWR019
 U 1 1 58D60089
 P 1300 6300
-F 0 "#PWR023" H 1300 6150 50  0001 C CNN
+F 0 "#PWR019" H 1300 6150 50  0001 C CNN
 F 1 "+3V3" H 1300 6440 50  0000 C CNN
 F 2 "" H 1300 6300 50  0000 C CNN
 F 3 "" H 1300 6300 50  0000 C CNN

power.bak

@@ -39,7 +39,7 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 3 9
+Sheet 3 10
 Title "ULX3S"
 Date ""
 Rev "0.0.1"
@@ -50,10 +50,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR24
+L GND #PWR20
 U 1 1 58D54769
 P 1100 2650
-F 0 "#PWR24" H 1100 2400 50  0001 C CNN
+F 0 "#PWR20" 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
@@ -83,10 +83,10 @@ F 3 "" H 8500 3350 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR41
+L GND #PWR37
 U 1 1 58D58A0B
 P 8500 3850
-F 0 "#PWR41" H 8500 3600 50  0001 C CNN
+F 0 "#PWR37" 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
@@ -94,10 +94,10 @@ F 3 "" H 8500 3850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR35
+L +5V #PWR31
 U 1 1 58D58F93
 P 7850 3200
-F 0 "#PWR35" H 7850 3050 50  0001 C CNN
+F 0 "#PWR31" 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
@@ -105,10 +105,10 @@ F 3 "" H 7850 3200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR36
+L GND #PWR32
 U 1 1 58D5989A
 P 7850 3850
-F 0 "#PWR36" H 7850 3600 50  0001 C CNN
+F 0 "#PWR32" 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
@@ -143,7 +143,7 @@ U 1 1 58D5A146
 P 9550 3250
 F 0 "C2" H 9575 3350 50  0000 L CNN
 F 1 "470pF" H 9575 3150 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9588 3100 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 9588 3100 50  0001 C CNN
 F 3 "" H 9550 3250 50  0000 C CNN
 	1    9550 3250
 	1    0    0    -1  
@@ -154,7 +154,7 @@ U 1 1 58D5A193
 P 9850 3250
 F 0 "RA1" V 9930 3250 50  0000 C CNN
 F 1 "15k" V 9850 3250 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 9780 3250 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 9780 3250 50  0001 C CNN
 F 3 "" H 9850 3250 50  0000 C CNN
 	1    9850 3250
 	1    0    0    -1  
@@ -165,16 +165,16 @@ U 1 1 58D5A1E5
 P 10050 3450
 F 0 "RB1" V 10130 3450 50  0000 C CNN
 F 1 "15k" V 10050 3450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 9980 3450 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 9980 3450 50  0001 C CNN
 F 3 "" H 10050 3450 50  0000 C CNN
 	1    10050 3450
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR44
+L GND #PWR40
 U 1 1 58D5AE5E
 P 10250 3550
-F 0 "#PWR44" H 10250 3300 50  0001 C CNN
+F 0 "#PWR40" 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
@@ -204,10 +204,10 @@ F 3 "" H 10600 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR33
+L +3V3 #PWR29
 U 1 1 58D5CFDD
 P 4750 900
-F 0 "#PWR33" H 4750 750 50  0001 C CNN
+F 0 "#PWR29" 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
@@ -685,10 +685,10 @@ F 3 "" H 8500 5750 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR43
+L GND #PWR39
 U 1 1 58D6294C
 P 8500 6250
-F 0 "#PWR43" H 8500 6000 50  0001 C CNN
+F 0 "#PWR39" 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
@@ -696,10 +696,10 @@ F 3 "" H 8500 6250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR39
+L +5V #PWR35
 U 1 1 58D62952
 P 7850 5600
-F 0 "#PWR39" H 7850 5450 50  0001 C CNN
+F 0 "#PWR35" 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
@@ -707,10 +707,10 @@ F 3 "" H 7850 5600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR40
+L GND #PWR36
 U 1 1 58D62958
 P 7850 6250
-F 0 "#PWR40" H 7850 6000 50  0001 C CNN
+F 0 "#PWR36" 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
@@ -745,7 +745,7 @@ U 1 1 58D6296A
 P 9550 5650
 F 0 "C6" H 9575 5750 50  0000 L CNN
 F 1 "470pF" H 9575 5550 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9588 5500 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 9588 5500 50  0001 C CNN
 F 3 "" H 9550 5650 50  0000 C CNN
 	1    9550 5650
 	1    0    0    -1  
@@ -756,7 +756,7 @@ U 1 1 58D62970
 P 9850 5650
 F 0 "RA3" V 9930 5650 50  0000 C CNN
 F 1 "15k" V 9850 5650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 9780 5650 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 9780 5650 50  0001 C CNN
 F 3 "" H 9850 5650 50  0000 C CNN
 	1    9850 5650
 	1    0    0    -1  
@@ -767,16 +767,16 @@ U 1 1 58D62976
 P 10050 5850
 F 0 "RB3" V 10130 5850 50  0000 C CNN
 F 1 "3.3k" V 10050 5850 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 9980 5850 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 9980 5850 50  0001 C CNN
 F 3 "" H 10050 5850 50  0000 C CNN
 	1    10050 5850
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR46
+L GND #PWR42
 U 1 1 58D62982
 P 10250 5950
-F 0 "#PWR46" H 10250 5700 50  0001 C CNN
+F 0 "#PWR42" 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
@@ -852,10 +852,10 @@ Wire Wire Line
 Wire Wire Line
 	7900 5850 7400 5850
 $Comp
-L +3V3 #PWR49
+L +3V3 #PWR45
 U 1 1 58D62CE2
 P 10600 5400
-F 0 "#PWR49" H 10600 5250 50  0001 C CNN
+F 0 "#PWR45" 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
@@ -863,10 +863,10 @@ F 3 "" H 10600 5400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V2 #PWR47
+L +1V2 #PWR43
 U 1 1 58D63C77
 P 10600 3000
-F 0 "#PWR47" H 10600 2850 50  0001 C CNN
+F 0 "#PWR43" 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
@@ -874,10 +874,10 @@ F 3 "" H 10600 3000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V2 #PWR27
+L +1V2 #PWR23
 U 1 1 58D63D96
 P 2150 900
-F 0 "#PWR27" H 2150 750 50  0001 C CNN
+F 0 "#PWR23" 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
@@ -900,10 +900,10 @@ F 3 "" H 8500 4550 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR42
+L GND #PWR38
 U 1 1 58D67BC0
 P 8500 5050
-F 0 "#PWR42" H 8500 4800 50  0001 C CNN
+F 0 "#PWR38" 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
@@ -911,10 +911,10 @@ F 3 "" H 8500 5050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR37
+L +5V #PWR33
 U 1 1 58D67BC6
 P 7850 4400
-F 0 "#PWR37" H 7850 4250 50  0001 C CNN
+F 0 "#PWR33" 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
@@ -922,10 +922,10 @@ F 3 "" H 7850 4400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR38
+L GND #PWR34
 U 1 1 58D67BCC
 P 7850 5050
-F 0 "#PWR38" H 7850 4800 50  0001 C CNN
+F 0 "#PWR34" 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
@@ -960,7 +960,7 @@ U 1 1 58D67BDE
 P 9550 4450
 F 0 "C10" H 9575 4550 50  0000 L CNN
 F 1 "470pF" H 9575 4350 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9588 4300 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 9588 4300 50  0001 C CNN
 F 3 "" H 9550 4450 50  0000 C CNN
 	1    9550 4450
 	1    0    0    -1  
@@ -971,7 +971,7 @@ U 1 1 58D67BE4
 P 9850 4450
 F 0 "RA2" V 9930 4450 50  0000 C CNN
 F 1 "15k" V 9850 4450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 9780 4450 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 9780 4450 50  0001 C CNN
 F 3 "" H 9850 4450 50  0000 C CNN
 	1    9850 4450
 	1    0    0    -1  
@@ -982,16 +982,16 @@ U 1 1 58D67BEA
 P 10050 4650
 F 0 "RB2" V 10130 4650 50  0000 C CNN
 F 1 "4.7k" V 10050 4650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 9980 4650 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 9980 4650 50  0001 C CNN
 F 3 "" H 10050 4650 50  0000 C CNN
 	1    10050 4650
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR45
+L GND #PWR41
 U 1 1 58D67BF0
 P 10250 4750
-F 0 "#PWR45" H 10250 4500 50  0001 C CNN
+F 0 "#PWR41" 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
@@ -1072,7 +1072,7 @@ U 1 1 58D67C1D
 P 4150 4600
 F 0 "R1" V 4230 4600 50  0000 C CNN
 F 1 "15k" V 4150 4600 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 4080 4600 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 4080 4600 50  0001 C CNN
 F 3 "" H 4150 4600 50  0000 C CNN
 	1    4150 4600
 	1    0    0    -1  
@@ -1080,10 +1080,10 @@ $EndComp
 Wire Wire Line
 	4150 4450 4150 4300
 $Comp
-L +5V #PWR29
+L +5V #PWR25
 U 1 1 58D67C25
 P 4150 3350
-F 0 "#PWR29" H 4150 3200 50  0001 C CNN
+F 0 "#PWR25" H 4150 3200 50  0001 C CNN
 F 1 "+5V" H 4150 3490 50  0000 C CNN
 F 2 "" H 4150 3350 50  0000 C CNN
 F 3 "" H 4150 3350 50  0000 C CNN
@@ -1091,10 +1091,10 @@ F 3 "" H 4150 3350 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +2V5 #PWR48
+L +2V5 #PWR44
 U 1 1 58D681D4
 P 10600 4200
-F 0 "#PWR48" H 10600 4050 50  0001 C CNN
+F 0 "#PWR44" 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
@@ -1118,7 +1118,7 @@ PWREN
 Wire Wire Line
 	4150 4750 4150 5350
 Wire Wire Line
-	3950 4850 5100 4850
+	3800 4850 4700 4850
 Text Label 4300 4850 0    60   ~ 0
 PWREN
 Text Label 9250 5850 0    60   ~ 0
@@ -1132,10 +1132,10 @@ Wire Wire Line
 Wire Wire Line
 	4650 1000 4650 1100
 $Comp
-L +2V5 #PWR31
+L +2V5 #PWR27
 U 1 1 58D68750
 P 4250 900
-F 0 "#PWR31" H 4250 750 50  0001 C CNN
+F 0 "#PWR27" 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
@@ -1145,10 +1145,10 @@ $EndComp
 Wire Wire Line
 	6250 1000 7150 1000
 $Comp
-L +3V3 #PWR34
+L +3V3 #PWR30
 U 1 1 58D69259
 P 6350 900
-F 0 "#PWR34" H 6350 750 50  0001 C CNN
+F 0 "#PWR30" 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
@@ -1167,10 +1167,10 @@ F 3 "" H 2100 3550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR26
+L GND #PWR22
 U 1 1 58D7085C
 P 2100 4050
-F 0 "#PWR26" H 2100 3800 50  0001 C CNN
+F 0 "#PWR22" 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
@@ -1207,10 +1207,10 @@ Wire Wire Line
 Wire Wire Line
 	2800 3750 2800 3800
 $Comp
-L GND #PWR28
+L GND #PWR24
 U 1 1 58D72406
 P 2800 4150
-F 0 "#PWR28" H 2800 3900 50  0001 C CNN
+F 0 "#PWR24" 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
@@ -1226,10 +1226,10 @@ Wire Wire Line
 Wire Wire Line
 	2100 3150 2100 3050
 $Comp
-L +2V5 #PWR25
+L +2V5 #PWR21
 U 1 1 58D73C82
 P 2100 3050
-F 0 "#PWR25" H 2100 2900 50  0001 C CNN
+F 0 "#PWR21" 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
@@ -1238,7 +1238,7 @@ F 3 "" H 2100 3050 50  0000 C CNN
 $EndComp
 Text Label 2550 3750 0    60   ~ 0
 VBAT
-Text Notes 6700 3300 0    60   ~ 0
+Text Notes 6750 4250 0    60   ~ 0
 PWREN\nabove +1.5V turns ON\nbelow +0.4V turns OFF
 $Comp
 L D D10
@@ -1272,7 +1272,7 @@ U 1 1 58D7B61A
 P 4450 3650
 F 0 "R3" V 4530 3650 50  0000 C CNN
 F 1 "330k" V 4450 3650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 4380 3650 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 4380 3650 50  0001 C CNN
 F 3 "" H 4450 3650 50  0000 C CNN
 	1    4450 3650
 	1    0    0    -1  
@@ -1293,7 +1293,7 @@ U 1 1 58D7BDD9
 P 4150 5500
 F 0 "R2" V 4230 5500 50  0000 C CNN
 F 1 "47k" V 4150 5500 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 4080 5500 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 4080 5500 50  0001 C CNN
 F 3 "" H 4150 5500 50  0000 C CNN
 	1    4150 5500
 	1    0    0    -1  
@@ -1302,10 +1302,10 @@ Connection ~ 4150 4850
 Wire Wire Line
 	4150 5650 4150 6100
 $Comp
-L GND #PWR30
+L GND #PWR26
 U 1 1 58D7C223
 P 4150 6100
-F 0 "#PWR30" H 4150 5850 50  0001 C CNN
+F 0 "#PWR26" 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
@@ -1318,7 +1318,7 @@ U 1 1 58D7CBD5
 P 4700 4600
 F 0 "R4" V 4780 4600 50  0000 C CNN
 F 1 "15k" V 4700 4600 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 4630 4600 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 4630 4600 50  0001 C CNN
 F 3 "" H 4700 4600 50  0000 C CNN
 	1    4700 4600
 	1    0    0    -1  
@@ -1337,28 +1337,28 @@ F 3 "" H 4700 4150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR32
+L +3V3 #PWR28
 U 1 1 58D7CCF7
-P 4700 3800
-F 0 "#PWR32" H 4700 3650 50  0001 C CNN
-F 1 "+3V3" H 4700 3940 50  0000 C CNN
-F 2 "" H 4700 3800 50  0000 C CNN
-F 3 "" H 4700 3800 50  0000 C CNN
-	1    4700 3800
+P 4700 3900
+F 0 "#PWR28" 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
+	1    4700 3900
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4700 3800 4700 4000
+	4700 3900 4700 4000
 Text Notes 3150 4450 0    60   ~ 0
 WAKEUPn\nopen drain \nactive low
 Wire Wire Line
 	2500 3650 3050 3650
 Text Label 2550 3650 0    60   ~ 0
 WAKEUPn
-Text GLabel 2600 5500 0    60   Input ~ 0
+Text GLabel 2550 5500 0    60   Input ~ 0
 SHUTDOWN
 Wire Wire Line
-	3550 5900 3550 6000
+	3550 6000 3550 5900
 Wire Wire Line
 	4700 4850 4700 4750
 Wire Wire Line
@@ -1371,7 +1371,7 @@ U 1 1 58D84952
 P 3550 5750
 F 0 "C14" H 3575 5850 50  0000 L CNN
 F 1 "100nF" H 3575 5650 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 3588 5600 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3588 5600 50  0001 C CNN
 F 3 "" H 3550 5750 50  0000 C CNN
 	1    3550 5750
 	1    0    0    -1  
@@ -1379,20 +1379,20 @@ $EndComp
 Wire Wire Line
 	3550 5500 3550 5600
 Wire Wire Line
-	3050 5500 3650 5500
+	3100 5500 3650 5500
 $Comp
 L D_Schottky D12
 U 1 1 58D84D8A
-P 2900 5500
-F 0 "D12" H 2900 5600 50  0000 C CNN
-F 1 "BAT42" H 2900 5400 50  0000 C CNN
-F 2 "Diodes_SMD:D_0805" H 2900 5500 50  0001 C CNN
-F 3 "" H 2900 5500 50  0000 C CNN
-	1    2900 5500
+P 2950 5500
+F 0 "D12" H 2950 5600 50  0000 C CNN
+F 1 "BAT42" H 2950 5400 50  0000 C CNN
+F 2 "Diodes_SMD:D_0805" H 2950 5500 50  0001 C CNN
+F 3 "" H 2950 5500 50  0000 C CNN
+	1    2950 5500
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	2600 5500 2750 5500
+	2550 5500 2800 5500
 Connection ~ 3550 5500
 $Comp
 L R R5
@@ -1400,7 +1400,7 @@ U 1 1 58D85B68
 P 3250 5750
 F 0 "R5" V 3330 5750 50  0000 C CNN
 F 1 "4.7M" V 3250 5750 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 3180 5750 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3180 5750 50  0001 C CNN
 F 3 "" H 3250 5750 50  0000 C CNN
 	1    3250 5750
 	1    0    0    -1  
@@ -1411,7 +1411,7 @@ Connection ~ 3250 5500
 Wire Wire Line
 	3250 5900 3250 6000
 Wire Wire Line
-	3250 6000 4150 6000
+	2700 6000 4150 6000
 Connection ~ 3550 6000
 Text Notes 2800 6150 0    60   ~ 0
 RC to hold 0.5s shutdown
@@ -1431,7 +1431,7 @@ U 1 1 58D7B291
 P 3200 3650
 F 0 "R6" V 3280 3650 50  0000 C CNN
 F 1 "1k" V 3200 3650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 3130 3650 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3130 3650 50  0001 C CNN
 F 3 "" H 3200 3650 50  0000 C CNN
 	1    3200 3650
 	0    1    1    0   
@@ -1440,23 +1440,18 @@ Wire Wire Line
 	3350 3650 3600 3650
 Text Label 3400 3650 0    60   ~ 0
 WKn
-Wire Wire Line
-	5100 4850 5100 4300
 $Comp
 L D D13
 U 1 1 58D7BC4A
-P 5100 4150
-F 0 "D13" H 5100 4250 50  0000 C CNN
-F 1 "1N4148" H 5100 4050 50  0000 C CNN
-F 2 "Diodes_SMD:D_0805" H 5100 4150 50  0001 C CNN
-F 3 "" H 5100 4150 50  0000 C CNN
-	1    5100 4150
-	0    -1   -1   0   
+P 3650 4850
+F 0 "D13" H 3650 4950 50  0000 C CNN
+F 1 "1N4148" H 3650 4750 50  0000 C CNN
+F 2 "Diodes_SMD:D_0805" H 3650 4850 50  0001 C CNN
+F 3 "" H 3650 4850 50  0000 C CNN
+	1    3650 4850
+	-1   0    0    1   
 $EndComp
-Wire Wire Line
-	5100 3800 5100 4000
-Connection ~ 4700 4850
-Text GLabel 5100 3800 1    60   Input ~ 0
+Text GLabel 3350 4850 0    60   Input ~ 0
 FTDI_nSUSPEND
 $Comp
 L R R8
@@ -1464,7 +1459,7 @@ U 1 1 58D8111E
 P 3950 5100
 F 0 "R8" V 4030 5100 50  0000 C CNN
 F 1 "1k" V 3950 5100 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 3880 5100 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3880 5100 50  0001 C CNN
 F 3 "" H 3950 5100 50  0000 C CNN
 	1    3950 5100
 	1    0    0    -1  
@@ -1510,4 +1505,28 @@ F 3 "" H 3800 3650 50  0000 C CNN
 	1    3800 3650
 	1    0    0    1   
 $EndComp
+$Comp
+L R R13
+U 1 1 58DA1F4D
+P 2700 5750
+F 0 "R13" V 2780 5750 50  0000 C CNN
+F 1 "15k" V 2700 5750 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 2630 5750 50  0001 C CNN
+F 3 "" H 2700 5750 50  0000 C CNN
+	1    2700 5750
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2700 5600 2700 5500
+Connection ~ 2700 5500
+Wire Wire Line
+	2700 5900 2700 6000
+Connection ~ 3250 6000
+Text Notes 4500 3500 0    60   ~ 0
+maybe \nwithout \nR3
+Text Notes 1150 5200 0    60   ~ 0
+chick&egg problem:\nFTDI is powered from 3.3V\ngenerated by this DCDC conv.\nTo resurrect from constantly\nshutting down, separate\n3.3V regulator for FTDI\nmay be needed
+Connection ~ 3950 4850
+Wire Wire Line
+	3350 4850 3500 4850
 $EndSCHEMATC

power.sch

@@ -39,7 +39,7 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 3 9
+Sheet 3 10
 Title "ULX3S"
 Date ""
 Rev "0.0.1"
@@ -50,10 +50,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR024
+L GND #PWR020
 U 1 1 58D54769
 P 1100 2650
-F 0 "#PWR024" H 1100 2400 50  0001 C CNN
+F 0 "#PWR020" 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
@@ -83,10 +83,10 @@ F 3 "" H 8500 3350 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR021
 U 1 1 58D58A0B
 P 8500 3850
-F 0 "#PWR025" H 8500 3600 50  0001 C CNN
+F 0 "#PWR021" 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
@@ -94,10 +94,10 @@ F 3 "" H 8500 3850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR026
+L +5V #PWR022
 U 1 1 58D58F93
 P 7850 3200
-F 0 "#PWR026" H 7850 3050 50  0001 C CNN
+F 0 "#PWR022" 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
@@ -105,10 +105,10 @@ F 3 "" H 7850 3200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR027
+L GND #PWR023
 U 1 1 58D5989A
 P 7850 3850
-F 0 "#PWR027" H 7850 3600 50  0001 C CNN
+F 0 "#PWR023" 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
@@ -143,7 +143,7 @@ U 1 1 58D5A146
 P 9550 3250
 F 0 "C2" H 9575 3350 50  0000 L CNN
 F 1 "470pF" H 9575 3150 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9588 3100 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 9588 3100 50  0001 C CNN
 F 3 "" H 9550 3250 50  0000 C CNN
 	1    9550 3250
 	1    0    0    -1  
@@ -154,7 +154,7 @@ U 1 1 58D5A193
 P 9850 3250
 F 0 "RA1" V 9930 3250 50  0000 C CNN
 F 1 "15k" V 9850 3250 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 9780 3250 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 9780 3250 50  0001 C CNN
 F 3 "" H 9850 3250 50  0000 C CNN
 	1    9850 3250
 	1    0    0    -1  
@@ -165,16 +165,16 @@ U 1 1 58D5A1E5
 P 10050 3450
 F 0 "RB1" V 10130 3450 50  0000 C CNN
 F 1 "15k" V 10050 3450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 9980 3450 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 9980 3450 50  0001 C CNN
 F 3 "" H 10050 3450 50  0000 C CNN
 	1    10050 3450
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR028
+L GND #PWR024
 U 1 1 58D5AE5E
 P 10250 3550
-F 0 "#PWR028" H 10250 3300 50  0001 C CNN
+F 0 "#PWR024" 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
@@ -204,10 +204,10 @@ F 3 "" H 10600 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR029
+L +3V3 #PWR025
 U 1 1 58D5CFDD
 P 4750 900
-F 0 "#PWR029" H 4750 750 50  0001 C CNN
+F 0 "#PWR025" 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
@@ -685,10 +685,10 @@ F 3 "" H 8500 5750 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR030
+L GND #PWR026
 U 1 1 58D6294C
 P 8500 6250
-F 0 "#PWR030" H 8500 6000 50  0001 C CNN
+F 0 "#PWR026" 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
@@ -696,10 +696,10 @@ F 3 "" H 8500 6250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR031
+L +5V #PWR027
 U 1 1 58D62952
 P 7850 5600
-F 0 "#PWR031" H 7850 5450 50  0001 C CNN
+F 0 "#PWR027" 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
@@ -707,10 +707,10 @@ F 3 "" H 7850 5600 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR032
+L GND #PWR028
 U 1 1 58D62958
 P 7850 6250
-F 0 "#PWR032" H 7850 6000 50  0001 C CNN
+F 0 "#PWR028" 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
@@ -745,7 +745,7 @@ U 1 1 58D6296A
 P 9550 5650
 F 0 "C6" H 9575 5750 50  0000 L CNN
 F 1 "470pF" H 9575 5550 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9588 5500 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 9588 5500 50  0001 C CNN
 F 3 "" H 9550 5650 50  0000 C CNN
 	1    9550 5650
 	1    0    0    -1  
@@ -756,7 +756,7 @@ U 1 1 58D62970
 P 9850 5650
 F 0 "RA3" V 9930 5650 50  0000 C CNN
 F 1 "15k" V 9850 5650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 9780 5650 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 9780 5650 50  0001 C CNN
 F 3 "" H 9850 5650 50  0000 C CNN
 	1    9850 5650
 	1    0    0    -1  
@@ -767,16 +767,16 @@ U 1 1 58D62976
 P 10050 5850
 F 0 "RB3" V 10130 5850 50  0000 C CNN
 F 1 "3.3k" V 10050 5850 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 9980 5850 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 9980 5850 50  0001 C CNN
 F 3 "" H 10050 5850 50  0000 C CNN
 	1    10050 5850
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR033
+L GND #PWR029
 U 1 1 58D62982
 P 10250 5950
-F 0 "#PWR033" H 10250 5700 50  0001 C CNN
+F 0 "#PWR029" 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
@@ -852,10 +852,10 @@ Wire Wire Line
 Wire Wire Line
 	7900 5850 7400 5850
 $Comp
-L +3V3 #PWR034
+L +3V3 #PWR030
 U 1 1 58D62CE2
 P 10600 5400
-F 0 "#PWR034" H 10600 5250 50  0001 C CNN
+F 0 "#PWR030" 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
@@ -863,10 +863,10 @@ F 3 "" H 10600 5400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V2 #PWR035
+L +1V2 #PWR031
 U 1 1 58D63C77
 P 10600 3000
-F 0 "#PWR035" H 10600 2850 50  0001 C CNN
+F 0 "#PWR031" 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
@@ -874,10 +874,10 @@ F 3 "" H 10600 3000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V2 #PWR036
+L +1V2 #PWR032
 U 1 1 58D63D96
 P 2150 900
-F 0 "#PWR036" H 2150 750 50  0001 C CNN
+F 0 "#PWR032" 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
@@ -900,10 +900,10 @@ F 3 "" H 8500 4550 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR037
+L GND #PWR033
 U 1 1 58D67BC0
 P 8500 5050
-F 0 "#PWR037" H 8500 4800 50  0001 C CNN
+F 0 "#PWR033" 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
@@ -911,10 +911,10 @@ F 3 "" H 8500 5050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR038
+L +5V #PWR034
 U 1 1 58D67BC6
 P 7850 4400
-F 0 "#PWR038" H 7850 4250 50  0001 C CNN
+F 0 "#PWR034" 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
@@ -922,10 +922,10 @@ F 3 "" H 7850 4400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR039
+L GND #PWR035
 U 1 1 58D67BCC
 P 7850 5050
-F 0 "#PWR039" H 7850 4800 50  0001 C CNN
+F 0 "#PWR035" 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
@@ -960,7 +960,7 @@ U 1 1 58D67BDE
 P 9550 4450
 F 0 "C10" H 9575 4550 50  0000 L CNN
 F 1 "470pF" H 9575 4350 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9588 4300 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 9588 4300 50  0001 C CNN
 F 3 "" H 9550 4450 50  0000 C CNN
 	1    9550 4450
 	1    0    0    -1  
@@ -971,7 +971,7 @@ U 1 1 58D67BE4
 P 9850 4450
 F 0 "RA2" V 9930 4450 50  0000 C CNN
 F 1 "15k" V 9850 4450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 9780 4450 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 9780 4450 50  0001 C CNN
 F 3 "" H 9850 4450 50  0000 C CNN
 	1    9850 4450
 	1    0    0    -1  
@@ -982,16 +982,16 @@ U 1 1 58D67BEA
 P 10050 4650
 F 0 "RB2" V 10130 4650 50  0000 C CNN
 F 1 "4.7k" V 10050 4650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 9980 4650 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 9980 4650 50  0001 C CNN
 F 3 "" H 10050 4650 50  0000 C CNN
 	1    10050 4650
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR040
+L GND #PWR036
 U 1 1 58D67BF0
 P 10250 4750
-F 0 "#PWR040" H 10250 4500 50  0001 C CNN
+F 0 "#PWR036" 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
@@ -1072,7 +1072,7 @@ U 1 1 58D67C1D
 P 4150 4600
 F 0 "R1" V 4230 4600 50  0000 C CNN
 F 1 "15k" V 4150 4600 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 4080 4600 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 4080 4600 50  0001 C CNN
 F 3 "" H 4150 4600 50  0000 C CNN
 	1    4150 4600
 	1    0    0    -1  
@@ -1080,10 +1080,10 @@ $EndComp
 Wire Wire Line
 	4150 4450 4150 4300
 $Comp
-L +5V #PWR041
+L +5V #PWR037
 U 1 1 58D67C25
 P 4150 3350
-F 0 "#PWR041" H 4150 3200 50  0001 C CNN
+F 0 "#PWR037" H 4150 3200 50  0001 C CNN
 F 1 "+5V" H 4150 3490 50  0000 C CNN
 F 2 "" H 4150 3350 50  0000 C CNN
 F 3 "" H 4150 3350 50  0000 C CNN
@@ -1091,10 +1091,10 @@ F 3 "" H 4150 3350 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +2V5 #PWR042
+L +2V5 #PWR038
 U 1 1 58D681D4
 P 10600 4200
-F 0 "#PWR042" H 10600 4050 50  0001 C CNN
+F 0 "#PWR038" 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
@@ -1118,7 +1118,7 @@ PWREN
 Wire Wire Line
 	4150 4750 4150 5350
 Wire Wire Line
-	3950 4850 5100 4850
+	3800 4850 4700 4850
 Text Label 4300 4850 0    60   ~ 0
 PWREN
 Text Label 9250 5850 0    60   ~ 0
@@ -1132,10 +1132,10 @@ Wire Wire Line
 Wire Wire Line
 	4650 1000 4650 1100
 $Comp
-L +2V5 #PWR043
+L +2V5 #PWR039
 U 1 1 58D68750
 P 4250 900
-F 0 "#PWR043" H 4250 750 50  0001 C CNN
+F 0 "#PWR039" 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
@@ -1145,10 +1145,10 @@ $EndComp
 Wire Wire Line
 	6250 1000 7150 1000
 $Comp
-L +3V3 #PWR044
+L +3V3 #PWR040
 U 1 1 58D69259
 P 6350 900
-F 0 "#PWR044" H 6350 750 50  0001 C CNN
+F 0 "#PWR040" 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
@@ -1167,10 +1167,10 @@ F 3 "" H 2100 3550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR045
+L GND #PWR041
 U 1 1 58D7085C
 P 2100 4050
-F 0 "#PWR045" H 2100 3800 50  0001 C CNN
+F 0 "#PWR041" 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
@@ -1207,10 +1207,10 @@ Wire Wire Line
 Wire Wire Line
 	2800 3750 2800 3800
 $Comp
-L GND #PWR046
+L GND #PWR042
 U 1 1 58D72406
 P 2800 4150
-F 0 "#PWR046" H 2800 3900 50  0001 C CNN
+F 0 "#PWR042" 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
@@ -1226,10 +1226,10 @@ Wire Wire Line
 Wire Wire Line
 	2100 3150 2100 3050
 $Comp
-L +2V5 #PWR047
+L +2V5 #PWR043
 U 1 1 58D73C82
 P 2100 3050
-F 0 "#PWR047" H 2100 2900 50  0001 C CNN
+F 0 "#PWR043" 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
@@ -1238,7 +1238,7 @@ F 3 "" H 2100 3050 50  0000 C CNN
 $EndComp
 Text Label 2550 3750 0    60   ~ 0
 VBAT
-Text Notes 6700 3300 0    60   ~ 0
+Text Notes 6750 4250 0    60   ~ 0
 PWREN\nabove +1.5V turns ON\nbelow +0.4V turns OFF
 $Comp
 L D D10
@@ -1272,7 +1272,7 @@ U 1 1 58D7B61A
 P 4450 3650
 F 0 "R3" V 4530 3650 50  0000 C CNN
 F 1 "330k" V 4450 3650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 4380 3650 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 4380 3650 50  0001 C CNN
 F 3 "" H 4450 3650 50  0000 C CNN
 	1    4450 3650
 	1    0    0    -1  
@@ -1293,7 +1293,7 @@ U 1 1 58D7BDD9
 P 4150 5500
 F 0 "R2" V 4230 5500 50  0000 C CNN
 F 1 "47k" V 4150 5500 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 4080 5500 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 4080 5500 50  0001 C CNN
 F 3 "" H 4150 5500 50  0000 C CNN
 	1    4150 5500
 	1    0    0    -1  
@@ -1302,10 +1302,10 @@ Connection ~ 4150 4850
 Wire Wire Line
 	4150 5650 4150 6100
 $Comp
-L GND #PWR048
+L GND #PWR044
 U 1 1 58D7C223
 P 4150 6100
-F 0 "#PWR048" H 4150 5850 50  0001 C CNN
+F 0 "#PWR044" 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
@@ -1318,7 +1318,7 @@ U 1 1 58D7CBD5
 P 4700 4600
 F 0 "R4" V 4780 4600 50  0000 C CNN
 F 1 "15k" V 4700 4600 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 4630 4600 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 4630 4600 50  0001 C CNN
 F 3 "" H 4700 4600 50  0000 C CNN
 	1    4700 4600
 	1    0    0    -1  
@@ -1337,28 +1337,28 @@ F 3 "" H 4700 4150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR049
+L +3V3 #PWR045
 U 1 1 58D7CCF7
-P 4700 3800
-F 0 "#PWR049" H 4700 3650 50  0001 C CNN
-F 1 "+3V3" H 4700 3940 50  0000 C CNN
-F 2 "" H 4700 3800 50  0000 C CNN
-F 3 "" H 4700 3800 50  0000 C CNN
-	1    4700 3800
+P 4700 3900
+F 0 "#PWR045" 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
+	1    4700 3900
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4700 3800 4700 4000
+	4700 3900 4700 4000
 Text Notes 3150 4450 0    60   ~ 0
 WAKEUPn\nopen drain \nactive low
 Wire Wire Line
 	2500 3650 3050 3650
 Text Label 2550 3650 0    60   ~ 0
 WAKEUPn
-Text GLabel 2600 5500 0    60   Input ~ 0
+Text GLabel 2550 5500 0    60   Input ~ 0
 SHUTDOWN
 Wire Wire Line
-	3550 5900 3550 6000
+	3550 6000 3550 5900
 Wire Wire Line
 	4700 4850 4700 4750
 Wire Wire Line
@@ -1371,7 +1371,7 @@ U 1 1 58D84952
 P 3550 5750
 F 0 "C14" H 3575 5850 50  0000 L CNN
 F 1 "100nF" H 3575 5650 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 3588 5600 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3588 5600 50  0001 C CNN
 F 3 "" H 3550 5750 50  0000 C CNN
 	1    3550 5750
 	1    0    0    -1  
@@ -1379,20 +1379,20 @@ $EndComp
 Wire Wire Line
 	3550 5500 3550 5600
 Wire Wire Line
-	3050 5500 3650 5500
+	3100 5500 3650 5500
 $Comp
 L D_Schottky D12
 U 1 1 58D84D8A
-P 2900 5500
-F 0 "D12" H 2900 5600 50  0000 C CNN
-F 1 "BAT42" H 2900 5400 50  0000 C CNN
-F 2 "Diodes_SMD:D_0805" H 2900 5500 50  0001 C CNN
-F 3 "" H 2900 5500 50  0000 C CNN
-	1    2900 5500
+P 2950 5500
+F 0 "D12" H 2950 5600 50  0000 C CNN
+F 1 "BAT42" H 2950 5400 50  0000 C CNN
+F 2 "Diodes_SMD:D_0805" H 2950 5500 50  0001 C CNN
+F 3 "" H 2950 5500 50  0000 C CNN
+	1    2950 5500
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	2600 5500 2750 5500
+	2550 5500 2800 5500
 Connection ~ 3550 5500
 $Comp
 L R R5
@@ -1400,7 +1400,7 @@ U 1 1 58D85B68
 P 3250 5750
 F 0 "R5" V 3330 5750 50  0000 C CNN
 F 1 "4.7M" V 3250 5750 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 3180 5750 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3180 5750 50  0001 C CNN
 F 3 "" H 3250 5750 50  0000 C CNN
 	1    3250 5750
 	1    0    0    -1  
@@ -1411,7 +1411,7 @@ Connection ~ 3250 5500
 Wire Wire Line
 	3250 5900 3250 6000
 Wire Wire Line
-	3250 6000 4150 6000
+	2700 6000 4150 6000
 Connection ~ 3550 6000
 Text Notes 2800 6150 0    60   ~ 0
 RC to hold 0.5s shutdown
@@ -1431,7 +1431,7 @@ U 1 1 58D7B291
 P 3200 3650
 F 0 "R6" V 3280 3650 50  0000 C CNN
 F 1 "1k" V 3200 3650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 3130 3650 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3130 3650 50  0001 C CNN
 F 3 "" H 3200 3650 50  0000 C CNN
 	1    3200 3650
 	0    1    1    0   
@@ -1440,23 +1440,18 @@ Wire Wire Line
 	3350 3650 3600 3650
 Text Label 3400 3650 0    60   ~ 0
 WKn
-Wire Wire Line
-	5100 4850 5100 4300
 $Comp
 L D D13
 U 1 1 58D7BC4A
-P 5100 4150
-F 0 "D13" H 5100 4250 50  0000 C CNN
-F 1 "1N4148" H 5100 4050 50  0000 C CNN
-F 2 "Diodes_SMD:D_0805" H 5100 4150 50  0001 C CNN
-F 3 "" H 5100 4150 50  0000 C CNN
-	1    5100 4150
-	0    -1   -1   0   
+P 3650 4850
+F 0 "D13" H 3650 4950 50  0000 C CNN
+F 1 "1N4148" H 3650 4750 50  0000 C CNN
+F 2 "Diodes_SMD:D_0805" H 3650 4850 50  0001 C CNN
+F 3 "" H 3650 4850 50  0000 C CNN
+	1    3650 4850
+	-1   0    0    1   
 $EndComp
-Wire Wire Line
-	5100 3800 5100 4000
-Connection ~ 4700 4850
-Text GLabel 5100 3800 1    60   Input ~ 0
+Text GLabel 3350 4850 0    60   Input ~ 0
 FTDI_nSUSPEND
 $Comp
 L R R8
@@ -1464,7 +1459,7 @@ U 1 1 58D8111E
 P 3950 5100
 F 0 "R8" V 4030 5100 50  0000 C CNN
 F 1 "1k" V 3950 5100 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 3880 5100 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3880 5100 50  0001 C CNN
 F 3 "" H 3950 5100 50  0000 C CNN
 	1    3950 5100
 	1    0    0    -1  
@@ -1510,4 +1505,28 @@ F 3 "" H 3800 3650 50  0000 C CNN
 	1    3800 3650
 	1    0    0    1   
 $EndComp
+$Comp
+L R R13
+U 1 1 58DA1F4D
+P 2700 5750
+F 0 "R13" V 2780 5750 50  0000 C CNN
+F 1 "15k" V 2700 5750 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 2630 5750 50  0001 C CNN
+F 3 "" H 2700 5750 50  0000 C CNN
+	1    2700 5750
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2700 5600 2700 5500
+Connection ~ 2700 5500
+Wire Wire Line
+	2700 5900 2700 6000
+Connection ~ 3250 6000
+Text Notes 4500 3500 0    60   ~ 0
+maybe \nwithout \nR3
+Text Notes 1150 5200 0    60   ~ 0
+chick&egg problem:\nFTDI is powered from 3.3V\ngenerated by this DCDC conv.\nTo resurrect from constantly\nshutting down, separate\n3.3V regulator for FTDI\nmay be needed
+Connection ~ 3950 4850
+Wire Wire Line
+	3350 4850 3500 4850
 $EndSCHEMATC

ram.bak

@@ -39,7 +39,7 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 8 9
+Sheet 8 10
 Title "ULX3S"
 Date ""
 Rev "0.0.1"
@@ -50,10 +50,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L MT48LC4M16A2TG RAM1
+L MT48LC4M16A2TG U9
 U 1 1 58D8506F
 P 5450 3500
-F 0 "RAM1" H 4850 4700 50  0000 C CNN
+F 0 "U9" H 4850 4700 50  0000 C CNN
 F 1 "MT48LC16M16A2TG" H 5450 3600 50  0000 C CNN
 F 2 "TSOP54:TSOP54" H 5450 3500 50  0000 C CIN
 F 3 "" H 5450 3250 50  0000 C CNN

ram.sch

@@ -39,7 +39,7 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 8 9
+Sheet 8 10
 Title "ULX3S"
 Date ""
 Rev "0.0.1"
@@ -50,10 +50,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L MT48LC4M16A2TG RAM1
+L MT48LC4M16A2TG U9
 U 1 1 58D8506F
 P 5450 3500
-F 0 "RAM1" H 4850 4700 50  0000 C CNN
+F 0 "U9" H 4850 4700 50  0000 C CNN
 F 1 "MT48LC16M16A2TG" H 5450 3600 50  0000 C CNN
 F 2 "TSOP54:TSOP54" H 5450 3500 50  0000 C CIN
 F 3 "" H 5450 3250 50  0000 C CNN

sdcard.bak

@@ -0,0 +1,156 @@
+EESchema Schematic File Version 2
+LIBS:ulx3s-rescue
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
+LIBS:ESP8266
+LIBS:lfe5bg381
+LIBS:micro-hdmi-d
+LIBS:ap3429a
+LIBS:ft2232
+LIBS:ulx3s-cache
+EELAYER 25 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 10 10
+Title "ULX3S"
+Date ""
+Rev "0.0.1"
+Comp "FER+RIZ+RADIONA"
+Comment1 "SD card"
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L SD_Card SD1
+U 1 1 58DA7C6C
+P 3300 6250
+F 0 "SD1" H 2650 6800 50  0000 C CNN
+F 1 "SD_Card" H 3900 5700 50  0000 C CNN
+F 2 "micro-sd:MicroSD_TF02D" H 3500 6600 50  0000 C CNN
+F 3 "" H 3300 6250 60  0000 C CNN
+	1    3300 6250
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2400 5850 2300 5850
+Wire Wire Line
+	2300 5950 2400 5950
+Wire Wire Line
+	2300 6050 2400 6050
+Wire Wire Line
+	2400 6350 2300 6350
+Wire Wire Line
+	2300 6550 2400 6550
+Wire Wire Line
+	2300 6650 2400 6650
+Wire Wire Line
+	1850 6150 2400 6150
+Wire Wire Line
+	1700 6250 2400 6250
+Wire Wire Line
+	1850 6450 2400 6450
+$Comp
+L GND #PWR81
+U 1 1 58DA7C6F
+P 1850 6150
+F 0 "#PWR81" 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
+	1    1850 6150
+	0    1    1    0   
+$EndComp
+$Comp
+L GND #PWR82
+U 1 1 58DA7C70
+P 1850 6450
+F 0 "#PWR82" 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
+	1    1850 6450
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	4200 6050 4600 6050
+Text Label 4250 6050 0    60   ~ 0
+SD_CD
+Wire Wire Line
+	4200 6150 4600 6150
+Text Label 4250 6150 0    60   ~ 0
+SD_WP
+$Comp
+L GND #PWR83
+U 1 1 58DA7C71
+P 4300 6550
+F 0 "#PWR83" 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
+	1    4300 6550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4200 6350 4300 6350
+Wire Wire Line
+	4300 6350 4300 6550
+Wire Wire Line
+	4200 6450 4300 6450
+Connection ~ 4300 6450
+$Comp
+L +3V3 #PWR80
+U 1 1 58DA7C72
+P 1700 6250
+F 0 "#PWR80" 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
+	1    1700 6250
+	0    -1   -1   0   
+$EndComp
+Text GLabel 2300 5850 0    60   Input ~ 0
+SD_2
+Text GLabel 2300 5950 0    60   Input ~ 0
+SD_3
+Text GLabel 2300 6050 0    60   Input ~ 0
+SD_MTMS
+Text GLabel 2300 6350 0    60   Input ~ 0
+SD_MTCK
+Text GLabel 2300 6550 0    60   Input ~ 0
+SD_MTDO
+Text GLabel 2300 6650 0    60   Input ~ 0
+SD_MTDI
+Text GLabel 4600 6050 2    60   Input ~ 0
+SD_CD
+Text GLabel 4600 6150 2    60   Input ~ 0
+SD_WP
+$EndSCHEMATC

sdcard.sch

@@ -0,0 +1,156 @@
+EESchema Schematic File Version 2
+LIBS:ulx3s-rescue
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
+LIBS:ESP8266
+LIBS:lfe5bg381
+LIBS:micro-hdmi-d
+LIBS:ap3429a
+LIBS:ft2232
+LIBS:ulx3s-cache
+EELAYER 25 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 10 10
+Title "ULX3S"
+Date ""
+Rev "0.0.1"
+Comp "FER+RIZ+RADIONA"
+Comment1 "SD card"
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L SD_Card SD1
+U 1 1 58DA7C6C
+P 3300 6250
+F 0 "SD1" H 2650 6800 50  0000 C CNN
+F 1 "SD_Card" H 3900 5700 50  0000 C CNN
+F 2 "micro-sd:MicroSD_TF02D" H 3500 6600 50  0000 C CNN
+F 3 "" H 3300 6250 60  0000 C CNN
+	1    3300 6250
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2400 5850 2300 5850
+Wire Wire Line
+	2300 5950 2400 5950
+Wire Wire Line
+	2300 6050 2400 6050
+Wire Wire Line
+	2400 6350 2300 6350
+Wire Wire Line
+	2300 6550 2400 6550
+Wire Wire Line
+	2300 6650 2400 6650
+Wire Wire Line
+	1850 6150 2400 6150
+Wire Wire Line
+	1700 6250 2400 6250
+Wire Wire Line
+	1850 6450 2400 6450
+$Comp
+L GND #PWR080
+U 1 1 58DA7C6F
+P 1850 6150
+F 0 "#PWR080" 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
+	1    1850 6150
+	0    1    1    0   
+$EndComp
+$Comp
+L GND #PWR081
+U 1 1 58DA7C70
+P 1850 6450
+F 0 "#PWR081" 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
+	1    1850 6450
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	4200 6050 4600 6050
+Text Label 4250 6050 0    60   ~ 0
+SD_CD
+Wire Wire Line
+	4200 6150 4600 6150
+Text Label 4250 6150 0    60   ~ 0
+SD_WP
+$Comp
+L GND #PWR082
+U 1 1 58DA7C71
+P 4300 6550
+F 0 "#PWR082" 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
+	1    4300 6550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4200 6350 4300 6350
+Wire Wire Line
+	4300 6350 4300 6550
+Wire Wire Line
+	4200 6450 4300 6450
+Connection ~ 4300 6450
+$Comp
+L +3V3 #PWR083
+U 1 1 58DA7C72
+P 1700 6250
+F 0 "#PWR083" 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
+	1    1700 6250
+	0    -1   -1   0   
+$EndComp
+Text GLabel 2300 5850 0    60   Input ~ 0
+SD_2
+Text GLabel 2300 5950 0    60   Input ~ 0
+SD_3
+Text GLabel 2300 6050 0    60   Input ~ 0
+SD_MTMS
+Text GLabel 2300 6350 0    60   Input ~ 0
+SD_MTCK
+Text GLabel 2300 6550 0    60   Input ~ 0
+SD_MTDO
+Text GLabel 2300 6650 0    60   Input ~ 0
+SD_MTDI
+Text GLabel 4600 6050 2    60   Input ~ 0
+SD_CD
+Text GLabel 4600 6150 2    60   Input ~ 0
+SD_WP
+$EndSCHEMATC

ulx3s.bak

@@ -39,7 +39,7 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 1 9
+Sheet 1 10
 Title "ULX3S"
 Date ""
 Rev "0.0.1"
@@ -49,29 +49,6 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-$Comp
-L SD_Card SD1
-U 1 1 56ACBF19
-P 3300 6250
-F 0 "SD1" H 2650 6800 50  0000 C CNN
-F 1 "SD_Card" H 3900 5700 50  0000 C CNN
-F 2 "micro-sd:MicroSD_TF02D" H 3500 6600 50  0000 C CNN
-F 3 "" H 3300 6250 60  0000 C CNN
-	1    3300 6250
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	2400 5850 2300 5850
-Wire Wire Line
-	2300 5950 2400 5950
-Wire Wire Line
-	2300 6050 2400 6050
-Wire Wire Line
-	2400 6350 2300 6350
-Wire Wire Line
-	2300 6550 2400 6550
-Wire Wire Line
-	2300 6650 2400 6650
 $Sheet
 S 7000 5900 750  450 
 U 56AC389C
@@ -84,71 +61,6 @@ U 58D51CAD
 F0 "power" 60
 F1 "power.sch" 60
 $EndSheet
-Wire Wire Line
-	1850 6150 2400 6150
-Wire Wire Line
-	1700 6250 2400 6250
-Wire Wire Line
-	1850 6450 2400 6450
-$Comp
-L GND #PWR2
-U 1 1 58D58197
-P 1850 6150
-F 0 "#PWR2" 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
-	1    1850 6150
-	0    1    1    0   
-$EndComp
-$Comp
-L GND #PWR3
-U 1 1 58D581BF
-P 1850 6450
-F 0 "#PWR3" 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
-	1    1850 6450
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	4200 6050 4600 6050
-Text Label 4250 6050 0    60   ~ 0
-SD_CD
-Wire Wire Line
-	4200 6150 4600 6150
-Text Label 4250 6150 0    60   ~ 0
-SD_WP
-$Comp
-L GND #PWR4
-U 1 1 58D58733
-P 4300 6550
-F 0 "#PWR4" 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
-	1    4300 6550
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	4200 6350 4300 6350
-Wire Wire Line
-	4300 6350 4300 6550
-Wire Wire Line
-	4200 6450 4300 6450
-Connection ~ 4300 6450
-$Comp
-L +3V3 #PWR1
-U 1 1 58D5F123
-P 1700 6250
-F 0 "#PWR1" 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
-	1    1700 6250
-	0    -1   -1   0   
-$EndComp
 $Sheet
 S 8700 5250 750  450 
 U 58D6547C
@@ -181,26 +93,16 @@ U 58D6D507
 F0 "ram" 60
 F1 "ram.sch" 60
 $EndSheet
-Text GLabel 2300 5850 0    60   Input ~ 0
-SD_2
-Text GLabel 2300 5950 0    60   Input ~ 0
-SD_3
-Text GLabel 2300 6050 0    60   Input ~ 0
-SD_MTMS
-Text GLabel 2300 6350 0    60   Input ~ 0
-SD_MTCK
-Text GLabel 2300 6550 0    60   Input ~ 0
-SD_MTDO
-Text GLabel 2300 6650 0    60   Input ~ 0
-SD_MTDI
-Text GLabel 4600 6050 2    60   Input ~ 0
-SD_CD
-Text GLabel 4600 6150 2    60   Input ~ 0
-SD_WP
 $Sheet
 S 8700 5900 750  450 
 U 58D82BD0
 F0 "analog" 60
 F1 "analog.sch" 60
 $EndSheet
+$Sheet
+S 10400 5250 750  450 
+U 58DA7327
+F0 "sdcard" 60
+F1 "sdcard.sch" 60
+$EndSheet
 $EndSCHEMATC

ulx3s.kicad_pcb-bak

@@ -1,15 +1,15 @@
 (kicad_pcb (version 4) (host pcbnew 4.0.5+dfsg1-4)
 
   (general
-    (links 411)
-    (no_connects 407)
+    (links 413)
+    (no_connects 412)
     (area 93.949999 61.269999 178.070001 109.830001)
     (thickness 1.6)
     (drawings 10)
     (tracks 7)
     (zones 0)
-    (modules 83)
-    (nets 109)
+    (modules 84)
+    (nets 110)
   )
 
   (page A4)
@@ -202,6 +202,7 @@
   (net 106 /usb/EECS)
   (net 107 "Net-(R11-Pad2)")
   (net 108 /usb/EEDATA)
+  (net 109 SHUTDOWN)
 
   (net_class Default "This is the default net class."
     (clearance 0.2)
@@ -311,6 +312,7 @@
     (add_net SD_MTDI)
     (add_net SD_MTDO)
     (add_net SD_MTMS)
+    (add_net SHUTDOWN)
     (add_net USB_FTDI_DM)
     (add_net USB_FTDI_DP)
   )
@@ -465,7 +467,7 @@
 
   (module micro-sd:MicroSD_TF02D (layer F.Cu) (tedit 52721666) (tstamp 56A966AB)
     (at 95.8 90.03 90)
-    (path /56ACBF19)
+    (path /58DA7327/58DA7C6C)
     (fp_text reference SD1 (at 0 5.7 90) (layer F.SilkS)
       (effects (font (size 0.59944 0.59944) (thickness 0.12446)))
     )
@@ -502,7 +504,7 @@
   )
 
   (module micro-hdmi-d:MICRO-HDMI-D (layer B.Cu) (tedit 53F70906) (tstamp 56A965BA)
-    (at 127.12 62.69)
+    (at 144.9 62.69)
     (path /58D686D9/58D69067)
     (attr smd)
     (fp_text reference GPDI1 (at -0.025 3.125) (layer B.SilkS)
@@ -1020,39 +1022,6 @@
     )
   )
 
-  (module Capacitors_SMD:C_0805_HandSoldering (layer B.Cu) (tedit 541A9B8D) (tstamp 58D58A25)
-    (at 137.915 73.485 90)
-    (descr "Capacitor SMD 0805, hand soldering")
-    (tags "capacitor 0805")
-    (path /58D51CAD/58D5A146)
-    (attr smd)
-    (fp_text reference C2 (at 0 2.1 90) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 470pF (at 0 -2.1 90) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.15))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.15))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.15))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.15))
-    (fp_line (start -2.3 1) (end 2.3 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.3 -1) (end 2.3 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.3 1) (end -2.3 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.3 1) (end 2.3 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.5 0.85) (end -0.5 0.85) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.5 -0.85) (end 0.5 -0.85) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.25 0 90) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 64 +1V2))
-    (pad 2 smd rect (at 1.25 0 90) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 72 /power/FB1))
-    (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Resistors_SMD:R_1210_HandSoldering (layer B.Cu) (tedit 58307C8D) (tstamp 58D58A37)
     (at 131.565 72.215 270)
     (descr "Resistor SMD 1210, hand soldering")
@@ -1086,72 +1055,6 @@
     )
   )
 
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D58A43)
-    (at 139.82 73.485 90)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
-    (path /58D51CAD/58D5A193)
-    (attr smd)
-    (fp_text reference RA1 (at 0 2.1 90) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 15k (at 0 -2.1 90) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0 90) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 64 +1V2))
-    (pad 2 smd rect (at 1.35 0 90) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 72 /power/FB1))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D58A49)
-    (at 136.645 70.31)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
-    (path /58D51CAD/58D5A1E5)
-    (attr smd)
-    (fp_text reference RB1 (at 0 2.1) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 15k (at 0 -2.1) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad 2 smd rect (at 1.35 0) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 72 /power/FB1))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module TSOT-25:TSOT-25 (layer B.Cu) (tedit 55EFFDDA) (tstamp 58D5976E)
     (at 136.675 67.77 90)
     (path /58D51CAD/58D58840)
@@ -1178,39 +1081,6 @@
       (net 72 /power/FB1))
   )
 
-  (module Capacitors_SMD:C_0805_HandSoldering (layer B.Cu) (tedit 541A9B8D) (tstamp 58D599A0)
-    (at 146.805 86.82)
-    (descr "Capacitor SMD 0805, hand soldering")
-    (tags "capacitor 0805")
-    (path /58D51CAD/58D6296A)
-    (attr smd)
-    (fp_text reference C6 (at 0 2.1) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 470pF (at 0 -2.1) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.15))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.15))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.15))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.15))
-    (fp_line (start -2.3 1) (end 2.3 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.3 -1) (end 2.3 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.3 1) (end -2.3 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.3 1) (end 2.3 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.5 0.85) (end -0.5 0.85) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.5 -0.85) (end 0.5 -0.85) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.25 0) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 61 +3V3))
-    (pad 2 smd rect (at 1.25 0) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 76 /power/FB3))
-    (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Resistors_SMD:R_1210_HandSoldering (layer B.Cu) (tedit 58307C8D) (tstamp 58D599B2)
     (at 148.075 80.47 180)
     (descr "Resistor SMD 1210, hand soldering")
@@ -1244,72 +1114,6 @@
     )
   )
 
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D599BE)
-    (at 146.805 88.725)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
-    (path /58D51CAD/58D62970)
-    (attr smd)
-    (fp_text reference RA3 (at 0 2.1) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 15k (at 0 -2.1) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 61 +3V3))
-    (pad 2 smd rect (at 1.35 0) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 76 /power/FB3))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D599C4)
-    (at 149.98 85.55 270)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
-    (path /58D51CAD/58D62976)
-    (attr smd)
-    (fp_text reference RB3 (at 0 2.1 270) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 3.3k (at 0 -2.1 270) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0 270) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad 2 smd rect (at 1.35 0 270) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 76 /power/FB3))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module TSOT-25:TSOT-25 (layer B.Cu) (tedit 55EFFDDA) (tstamp 58D599CD)
     (at 152.52 85.52)
     (path /58D51CAD/58D62946)
@@ -1976,72 +1780,6 @@
     )
   )
 
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D659F7)
-    (at 119.5 92.535 180)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
-    (path /58D6547C/58D6605D)
-    (attr smd)
-    (fp_text reference R7 (at 0 2.1 180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 220 (at 0 -2.1 180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0 180) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 61 +3V3))
-    (pad 2 smd rect (at 1.35 0 180) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 71 "Net-(BTN1-Pad1)"))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitors_SMD:C_0805_HandSoldering (layer B.Cu) (tedit 541A9B8D) (tstamp 58D66E6C)
-    (at 123.945 83.01 180)
-    (descr "Capacitor SMD 0805, hand soldering")
-    (tags "capacitor 0805")
-    (path /58D51CAD/58D67BDE)
-    (attr smd)
-    (fp_text reference C10 (at 0 2.1 180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 470pF (at 0 -2.1 180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.15))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.15))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.15))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.15))
-    (fp_line (start -2.3 1) (end 2.3 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.3 -1) (end 2.3 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.3 1) (end -2.3 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.3 1) (end 2.3 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.5 0.85) (end -0.5 0.85) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.5 -0.85) (end 0.5 -0.85) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.25 0 180) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 73 +2V5))
-    (pad 2 smd rect (at 1.25 0 180) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 77 /power/FB2))
-    (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Resistors_SMD:R_1210_HandSoldering (layer B.Cu) (tedit 58307C8D) (tstamp 58D66E7E)
     (at 122.675 89.36)
     (descr "Resistor SMD 1210, hand soldering")
@@ -2075,105 +1813,6 @@
     )
   )
 
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D66E84)
-    (at 143.63 73.485 270)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
-    (path /58D51CAD/58D67C1D)
-    (attr smd)
-    (fp_text reference R1 (at 0 2.1 270) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 15k (at 0 -2.1 270) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0 270) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 93 /power/WAKE))
-    (pad 2 smd rect (at 1.35 0 270) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 75 /power/PWREN))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D66E8A)
-    (at 123.945 81.105 180)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
-    (path /58D51CAD/58D67BE4)
-    (attr smd)
-    (fp_text reference RA2 (at 0 2.1 180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 15k (at 0 -2.1 180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0 180) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 73 +2V5))
-    (pad 2 smd rect (at 1.35 0 180) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 77 /power/FB2))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D66E90)
-    (at 120.77 84.28 90)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
-    (path /58D51CAD/58D67BEA)
-    (attr smd)
-    (fp_text reference RB2 (at 0 2.1 90) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 4.7k (at 0 -2.1 90) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0 90) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad 2 smd rect (at 1.35 0 90) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 77 /power/FB2))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module TSOT-25:TSOT-25 (layer B.Cu) (tedit 55EFFDDA) (tstamp 58D66E99)
     (at 118.23 84.28 180)
     (path /58D51CAD/58D67BBA)
@@ -2498,13 +2137,13 @@
   )
 
   (module SMD_Packages:SMD-1206_Pol (layer B.Cu) (tedit 0) (tstamp 58D6C684)
-    (at 157.6 65.23 270)
+    (at 156.711 62.69)
     (path /58D6BF46/58D6C83A)
     (attr smd)
-    (fp_text reference D8 (at 0 0 270) (layer B.SilkS)
+    (fp_text reference D8 (at 0 0) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 2A (at 0 0 270) (layer B.Fab)
+    (fp_text value 2A (at 0 0) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -2.54 1.143) (end -2.794 1.143) (layer B.SilkS) (width 0.15))
@@ -2516,9 +2155,9 @@
     (fp_line (start 2.54 1.143) (end 2.54 -1.143) (layer B.SilkS) (width 0.15))
     (fp_line (start 2.54 -1.143) (end 0.889 -1.143) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.889 1.143) (end -2.54 1.143) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.651 0 270) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -1.651 0) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
       (net 2 +5V))
-    (pad 2 smd rect (at 1.651 0 270) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
+    (pad 2 smd rect (at 1.651 0) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
       (net 78 /usb/USB5V))
     (model SMD_Packages.3dshapes/SMD-1206_Pol.wrl
       (at (xyz 0 0 0))
@@ -2528,13 +2167,13 @@
   )
 
   (module SMD_Packages:SMD-1206_Pol (layer B.Cu) (tedit 0) (tstamp 58D6C68A)
-    (at 152.52 65.23 270)
+    (at 153.409 65.23)
     (path /58D6BF46/58D6C83C)
     (attr smd)
-    (fp_text reference D9 (at 0 0 270) (layer B.SilkS)
+    (fp_text reference D9 (at 0 0) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 2A (at 0 0 270) (layer B.Fab)
+    (fp_text value 2A (at 0 0) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -2.54 1.143) (end -2.794 1.143) (layer B.SilkS) (width 0.15))
@@ -2546,9 +2185,9 @@
     (fp_line (start 2.54 1.143) (end 2.54 -1.143) (layer B.SilkS) (width 0.15))
     (fp_line (start 2.54 -1.143) (end 0.889 -1.143) (layer B.SilkS) (width 0.15))
     (fp_line (start -0.889 1.143) (end -2.54 1.143) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.651 0 270) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
+    (pad 1 smd rect (at -1.651 0) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
       (net 79 "Net-(D9-Pad1)"))
-    (pad 2 smd rect (at 1.651 0 270) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
+    (pad 2 smd rect (at 1.651 0) (size 1.524 2.032) (layers B.Cu B.Paste B.Mask)
       (net 2 +5V))
     (model SMD_Packages.3dshapes/SMD-1206_Pol.wrl
       (at (xyz 0 0 0))
@@ -2687,41 +2326,8 @@
     )
   )
 
-  (module Capacitors_SMD:C_0805_HandSoldering (layer B.Cu) (tedit 541A9B8D) (tstamp 58D79A75)
-    (at 162.68 81.74 270)
-    (descr "Capacitor SMD 0805, hand soldering")
-    (tags "capacitor 0805")
-    (path /58D51CAD/58D84952)
-    (attr smd)
-    (fp_text reference C14 (at 0 2.1 270) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 100nF (at 0 -2.1 270) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.15))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.15))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.15))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.15))
-    (fp_line (start -2.3 1) (end 2.3 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.3 -1) (end 2.3 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.3 1) (end -2.3 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.3 1) (end 2.3 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.5 0.85) (end -0.5 0.85) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.5 -0.85) (end 0.5 -0.85) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.25 0 270) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 92 /power/SHUT))
-    (pad 2 smd rect (at 1.25 0 270) (size 1.5 1.25) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Diodes_SMD:D_0805 (layer B.Cu) (tedit 574BBB4C) (tstamp 58D79A7B)
-    (at 157.6 85.33 270)
+    (at 157.6 85.55 270)
     (descr "Diode SMD in 0805 package")
     (tags "smd diode")
     (path /58D51CAD/58D79CB5)
@@ -2789,7 +2395,7 @@
   )
 
   (module Diodes_SMD:D_0805 (layer B.Cu) (tedit 574BBB4C) (tstamp 58D79A87)
-    (at 154.425 81.105 270)
+    (at 155.06 81.105 270)
     (descr "Diode SMD in 0805 package")
     (tags "smd diode")
     (path /58D51CAD/58D84D8A)
@@ -2818,151 +2424,20 @@
     (fp_line (start -1.1 0.7) (end 0.7 0.7) (layer B.SilkS) (width 0.15))
     (pad 1 smd rect (at -1.05 0 270) (size 0.8 0.9) (layers B.Cu B.Paste B.Mask)
       (net 92 /power/SHUT))
-    (pad 2 smd rect (at 1.05 0 270) (size 0.8 0.9) (layers B.Cu B.Paste B.Mask))
+    (pad 2 smd rect (at 1.05 0 270) (size 0.8 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 109 SHUTDOWN))
   )
 
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D79A9B)
-    (at 165.22 86.82 90)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
-    (path /58D51CAD/58D7BDD9)
+  (module Diodes_SMD:D_0805 (layer B.Cu) (tedit 574BBB4C) (tstamp 58D7A84D)
+    (at 167.76 88.09 90)
+    (descr "Diode SMD in 0805 package")
+    (tags "smd diode")
+    (path /58D51CAD/58D7BC4A)
     (attr smd)
-    (fp_text reference R2 (at 0 2.1 90) (layer B.SilkS)
+    (fp_text reference D13 (at 0 -1.6 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 47k (at 0 -2.1 90) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0 90) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 75 /power/PWREN))
-    (pad 2 smd rect (at 1.35 0 90) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D79AA1)
-    (at 156.33 93.805 180)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
-    (path /58D51CAD/58D7B61A)
-    (attr smd)
-    (fp_text reference R3 (at 0 2.1 180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 330k (at 0 -2.1 180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0 180) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 2 +5V))
-    (pad 2 smd rect (at 1.35 0 180) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 91 /power/WKUP))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D79AA7)
-    (at 161.41 85.55 180)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
-    (path /58D51CAD/58D7CBD5)
-    (attr smd)
-    (fp_text reference R4 (at 0 2.1 180) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 15k (at 0 -2.1 180) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0 180) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 94 /power/HOLD))
-    (pad 2 smd rect (at 1.35 0 180) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 75 /power/PWREN))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D79AAD)
-    (at 165.22 81.82 270)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
-    (path /58D51CAD/58D85B68)
-    (attr smd)
-    (fp_text reference R5 (at 0 2.1 270) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 4.7M (at 0 -2.1 270) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0 270) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 92 /power/SHUT))
-    (pad 2 smd rect (at 1.35 0 270) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Diodes_SMD:D_0805 (layer B.Cu) (tedit 574BBB4C) (tstamp 58D7A84D)
-    (at 167.76 88.09 90)
-    (descr "Diode SMD in 0805 package")
-    (tags "smd diode")
-    (path /58D51CAD/58D7BC4A)
-    (attr smd)
-    (fp_text reference D13 (at 0 -1.6 90) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 1N4148 (at 0 1.6 90) (layer B.Fab)
+    (fp_text value 1N4148 (at 0 1.6 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_line (start -1.8 -0.9) (end -1.8 0.9) (layer B.CrtYd) (width 0.05))
@@ -2987,72 +2462,6 @@
       (net 100 FTDI_nSUSPEND))
   )
 
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D7A853)
-    (at 161.33 88.09)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
-    (path /58D51CAD/58D7B291)
-    (attr smd)
-    (fp_text reference R6 (at 0 2.1) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 1k (at 0 -2.1) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 95 /power/WKn))
-    (pad 2 smd rect (at 1.35 0) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 90 /power/WAKEUPn))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D7A859)
-    (at 160.14 81.74 90)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
-    (path /58D51CAD/58D8111E)
-    (attr smd)
-    (fp_text reference R8 (at 0 2.1 90) (layer B.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_text value 1k (at 0 -2.1 90) (layer B.Fab)
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
-    )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0 90) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 75 /power/PWREN))
-    (pad 2 smd rect (at 1.35 0 90) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
-      (net 104 "Net-(Q2-Pad3)"))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module usb_otg:USB-MICRO-B-FCI-10118192-0001LF (layer B.Cu) (tedit 55D9BD68) (tstamp 58D81F93)
     (at 165.22 63.825)
     (path /58D6BF46/58D6C840)
@@ -3103,7 +2512,7 @@
   )
 
   (module usb_otg:USB-MICRO-B-FCI-10118192-0001LF (layer B.Cu) (tedit 55D9BD68) (tstamp 58D81FA1)
-    (at 144.9 63.96)
+    (at 108.07 63.96)
     (path /58D6BF46/58D6C841)
     (fp_text reference US2 (at 0 4.2) (layer B.SilkS)
       (effects (font (size 0.7 0.7) (thickness 0.15)) (justify mirror))
@@ -3150,7 +2559,7 @@
   )
 
   (module audio-jack:CUI_SJ-43516-SMT (layer B.Cu) (tedit 53B3001C) (tstamp 58D82B6C)
-    (at 114.42 70.1 270)
+    (at 124.58 69.04 270)
     (path /58D82BD0/58D82C05)
     (attr smd)
     (fp_text reference AUDIO1 (at -0.5 -3.8 270) (layer B.SilkS)
@@ -3222,7 +2631,7 @@
     (descr "TSOPII-54: Plastic Thin Small Outline Package; 54 leads; body width 10.16mm; (see 128m-as4c4m32s-tsopii.pdf and http://www.infineon.com/cms/packages/SMD_-_Surface_Mounted_Devices/P-PG-TSOPII/P-TSOPII-54-1.html)")
     (tags "TSOPII 0.8")
     (path /58D6D507/58D8506F)
-    (fp_text reference RAM1 (at 0 -12) (layer F.SilkS)
+    (fp_text reference U9 (at 0 -12) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value MT48LC16M16A2TG (at 0 12) (layer F.Fab)
@@ -3297,72 +2706,6 @@
     )
   )
 
-  (module Capacitors_SMD:C_0805_HandSoldering (layer F.Cu) (tedit 541A9B8D) (tstamp 58D85C1D)
-    (at 146.17 70.31 180)
-    (descr "Capacitor SMD 0805, hand soldering")
-    (tags "capacitor 0805")
-    (path /58D6BF46/58D8C14C)
-    (attr smd)
-    (fp_text reference C15 (at 0 -2.1 180) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 27pF (at 0 2.1 180) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.15))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.15))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.15))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.15))
-    (fp_line (start -2.3 -1) (end 2.3 -1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.3 1) (end 2.3 1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.3 -1) (end -2.3 1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.3 -1) (end 2.3 1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.5 -0.85) (end -0.5 -0.85) (layer F.SilkS) (width 0.15))
-    (fp_line (start -0.5 0.85) (end 0.5 0.85) (layer F.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.25 0 180) (size 1.5 1.25) (layers F.Cu F.Paste F.Mask)
-      (net 98 /usb/OSCI_12M))
-    (pad 2 smd rect (at 1.25 0 180) (size 1.5 1.25) (layers F.Cu F.Paste F.Mask)
-      (net 1 GND))
-    (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitors_SMD:C_0805_HandSoldering (layer F.Cu) (tedit 541A9B8D) (tstamp 58D85C23)
-    (at 166.51 70.31)
-    (descr "Capacitor SMD 0805, hand soldering")
-    (tags "capacitor 0805")
-    (path /58D6BF46/58D8C189)
-    (attr smd)
-    (fp_text reference C16 (at 0 -2.1) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 27pF (at 0 2.1) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -1 0.625) (end -1 -0.625) (layer F.Fab) (width 0.15))
-    (fp_line (start 1 0.625) (end -1 0.625) (layer F.Fab) (width 0.15))
-    (fp_line (start 1 -0.625) (end 1 0.625) (layer F.Fab) (width 0.15))
-    (fp_line (start -1 -0.625) (end 1 -0.625) (layer F.Fab) (width 0.15))
-    (fp_line (start -2.3 -1) (end 2.3 -1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.3 1) (end 2.3 1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.3 -1) (end -2.3 1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 2.3 -1) (end 2.3 1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 0.5 -0.85) (end -0.5 -0.85) (layer F.SilkS) (width 0.15))
-    (fp_line (start -0.5 0.85) (end 0.5 0.85) (layer F.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.25 0) (size 1.5 1.25) (layers F.Cu F.Paste F.Mask)
-      (net 103 /usb/OSCO_12M))
-    (pad 2 smd rect (at 1.25 0) (size 1.5 1.25) (layers F.Cu F.Paste F.Mask)
-      (net 1 GND))
-    (model Capacitors_SMD.3dshapes/C_0805_HandSoldering.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
   (module Capacitors_SMD:C_0805_HandSoldering (layer B.Cu) (tedit 541A9B8D) (tstamp 58D85C29)
     (at 149.98 75.39 270)
     (descr "Capacitor SMD 0805, hand soldering")
@@ -3602,7 +2945,7 @@
   )
 
   (module TO_SOT_Packages_SMD:SOT-23_Handsoldering (layer B.Cu) (tedit 583F3954) (tstamp 58D8654F)
-    (at 156.965 80.7 270)
+    (at 157.92 80.7 270)
     (descr "SOT-23, Handsoldering")
     (tags SOT-23)
     (path /58D51CAD/58D883BD)
@@ -4237,183 +3580,876 @@
     (pad Y19 smd circle (at 6.8 7.6) (size 0.4 0.4) (layers F.Cu F.Paste F.Mask))
   )
 
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D8D444)
-    (at 130.85 123.65)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
+  (module Housings_SOIC:SOIC-8_3.9x4.9mm_Pitch1.27mm (layer B.Cu) (tedit 54130A77) (tstamp 58D8D462)
+    (at 165.22 74.12)
+    (descr "8-Lead Plastic Small Outline (SN) - Narrow, 3.90 mm Body [SOIC] (see Microchip Packaging Specification 00000049BS.pdf)")
+    (tags "SOIC 1.27")
+    (path /58D6BF46/58D8D21C)
+    (attr smd)
+    (fp_text reference U8 (at 0 3.5) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 93CxxC (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))
+    (fp_line (start 1.95 2.45) (end 1.95 -2.45) (layer B.Fab) (width 0.15))
+    (fp_line (start 1.95 -2.45) (end -1.95 -2.45) (layer B.Fab) (width 0.15))
+    (fp_line (start -1.95 -2.45) (end -1.95 1.45) (layer B.Fab) (width 0.15))
+    (fp_line (start -1.95 1.45) (end -0.95 2.45) (layer B.Fab) (width 0.15))
+    (fp_line (start -3.75 2.75) (end -3.75 -2.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 3.75 2.75) (end 3.75 -2.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -3.75 2.75) (end 3.75 2.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -3.75 -2.75) (end 3.75 -2.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2.075 2.575) (end -2.075 2.525) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.075 2.575) (end 2.075 2.43) (layer B.SilkS) (width 0.15))
+    (fp_line (start 2.075 -2.575) (end 2.075 -2.43) (layer B.SilkS) (width 0.15))
+    (fp_line (start -2.075 -2.575) (end -2.075 -2.43) (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.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) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 106 /usb/EECS))
+    (pad 2 smd rect (at -2.7 0.635) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 105 /usb/EECLK))
+    (pad 3 smd rect (at -2.7 -0.635) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 108 /usb/EEDATA))
+    (pad 4 smd rect (at -2.7 -1.905) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 107 "Net-(R11-Pad2)"))
+    (pad 5 smd rect (at 2.7 -1.905) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 6 smd rect (at 2.7 -0.635) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 61 +3V3))
+    (pad 7 smd rect (at 2.7 0.635) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 8 smd rect (at 2.7 1.905) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+      (net 61 +3V3))
+    (model Housings_SOIC.3dshapes/SOIC-8_3.9x4.9mm_Pitch1.27mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitors_SMD:C_0603_HandSoldering (layer B.Cu) (tedit 541A9B4D) (tstamp 58D8EBBE)
+    (at 137.915 73.485 90)
+    (descr "Capacitor SMD 0603, hand soldering")
+    (tags "capacitor 0603")
+    (path /58D51CAD/58D5A146)
+    (attr smd)
+    (fp_text reference C2 (at 0 1.9 90) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 470pF (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.15))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.15))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.15))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.15))
+    (fp_line (start -1.85 0.75) (end 1.85 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.75) (end 1.85 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.75) (end -1.85 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.75) (end 1.85 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.35 0.6) (end 0.35 0.6) (layer B.SilkS) (width 0.15))
+    (fp_line (start 0.35 -0.6) (end -0.35 -0.6) (layer B.SilkS) (width 0.15))
+    (pad 1 smd rect (at -0.95 0 90) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
+      (net 64 +1V2))
+    (pad 2 smd rect (at 0.95 0 90) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
+      (net 72 /power/FB1))
+    (model Capacitors_SMD.3dshapes/C_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitors_SMD:C_0603_HandSoldering (layer B.Cu) (tedit 541A9B4D) (tstamp 58D8EBC3)
+    (at 146.805 86.82)
+    (descr "Capacitor SMD 0603, hand soldering")
+    (tags "capacitor 0603")
+    (path /58D51CAD/58D6296A)
+    (attr smd)
+    (fp_text reference C6 (at 0 1.9) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 470pF (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.15))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.15))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.15))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.15))
+    (fp_line (start -1.85 0.75) (end 1.85 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.75) (end 1.85 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.75) (end -1.85 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.75) (end 1.85 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.35 0.6) (end 0.35 0.6) (layer B.SilkS) (width 0.15))
+    (fp_line (start 0.35 -0.6) (end -0.35 -0.6) (layer B.SilkS) (width 0.15))
+    (pad 1 smd rect (at -0.95 0) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
+      (net 61 +3V3))
+    (pad 2 smd rect (at 0.95 0) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
+      (net 76 /power/FB3))
+    (model Capacitors_SMD.3dshapes/C_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitors_SMD:C_0603_HandSoldering (layer B.Cu) (tedit 541A9B4D) (tstamp 58D8EBC8)
+    (at 123.945 83.01 180)
+    (descr "Capacitor SMD 0603, hand soldering")
+    (tags "capacitor 0603")
+    (path /58D51CAD/58D67BDE)
+    (attr smd)
+    (fp_text reference C10 (at 0 1.9 180) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 470pF (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.15))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.15))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.15))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.15))
+    (fp_line (start -1.85 0.75) (end 1.85 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.75) (end 1.85 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.75) (end -1.85 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.75) (end 1.85 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.35 0.6) (end 0.35 0.6) (layer B.SilkS) (width 0.15))
+    (fp_line (start 0.35 -0.6) (end -0.35 -0.6) (layer B.SilkS) (width 0.15))
+    (pad 1 smd rect (at -0.95 0 180) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
+      (net 73 +2V5))
+    (pad 2 smd rect (at 0.95 0 180) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
+      (net 77 /power/FB2))
+    (model Capacitors_SMD.3dshapes/C_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitors_SMD:C_0603_HandSoldering (layer B.Cu) (tedit 541A9B4D) (tstamp 58D8EBCD)
+    (at 162.68 83.33 270)
+    (descr "Capacitor SMD 0603, hand soldering")
+    (tags "capacitor 0603")
+    (path /58D51CAD/58D84952)
+    (attr smd)
+    (fp_text reference C14 (at 0 1.9 270) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 100nF (at 0 -1.9 270) (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.15))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.15))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.15))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.15))
+    (fp_line (start -1.85 0.75) (end 1.85 0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.75) (end 1.85 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.75) (end -1.85 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.85 0.75) (end 1.85 -0.75) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -0.35 0.6) (end 0.35 0.6) (layer B.SilkS) (width 0.15))
+    (fp_line (start 0.35 -0.6) (end -0.35 -0.6) (layer B.SilkS) (width 0.15))
+    (pad 1 smd rect (at -0.95 0 270) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
+      (net 92 /power/SHUT))
+    (pad 2 smd rect (at 0.95 0 270) (size 1.2 0.75) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (model Capacitors_SMD.3dshapes/C_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitors_SMD:C_0603_HandSoldering (layer F.Cu) (tedit 541A9B4D) (tstamp 58D8EBD2)
+    (at 146.17 70.31 180)
+    (descr "Capacitor SMD 0603, hand soldering")
+    (tags "capacitor 0603")
+    (path /58D6BF46/58D8C14C)
+    (attr smd)
+    (fp_text reference C15 (at 0 -1.9 180) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 27pF (at 0 1.9 180) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.15))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.15))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.15))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.15))
+    (fp_line (start -1.85 -0.75) (end 1.85 -0.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.75) (end 1.85 0.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.75) (end -1.85 0.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.75) (end 1.85 0.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.35 -0.6) (end 0.35 -0.6) (layer F.SilkS) (width 0.15))
+    (fp_line (start 0.35 0.6) (end -0.35 0.6) (layer F.SilkS) (width 0.15))
+    (pad 1 smd rect (at -0.95 0 180) (size 1.2 0.75) (layers F.Cu F.Paste F.Mask)
+      (net 98 /usb/OSCI_12M))
+    (pad 2 smd rect (at 0.95 0 180) (size 1.2 0.75) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (model Capacitors_SMD.3dshapes/C_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitors_SMD:C_0603_HandSoldering (layer F.Cu) (tedit 541A9B4D) (tstamp 58D8EBD7)
+    (at 166.51 70.31)
+    (descr "Capacitor SMD 0603, hand soldering")
+    (tags "capacitor 0603")
+    (path /58D6BF46/58D8C189)
+    (attr smd)
+    (fp_text reference C16 (at 0 -1.9) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 27pF (at 0 1.9) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.15))
+    (fp_line (start 0.8 0.4) (end -0.8 0.4) (layer F.Fab) (width 0.15))
+    (fp_line (start 0.8 -0.4) (end 0.8 0.4) (layer F.Fab) (width 0.15))
+    (fp_line (start -0.8 -0.4) (end 0.8 -0.4) (layer F.Fab) (width 0.15))
+    (fp_line (start -1.85 -0.75) (end 1.85 -0.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 0.75) (end 1.85 0.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.85 -0.75) (end -1.85 0.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.85 -0.75) (end 1.85 0.75) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -0.35 -0.6) (end 0.35 -0.6) (layer F.SilkS) (width 0.15))
+    (fp_line (start 0.35 0.6) (end -0.35 0.6) (layer F.SilkS) (width 0.15))
+    (pad 1 smd rect (at -0.95 0) (size 1.2 0.75) (layers F.Cu F.Paste F.Mask)
+      (net 103 /usb/OSCO_12M))
+    (pad 2 smd rect (at 0.95 0) (size 1.2 0.75) (layers F.Cu F.Paste F.Mask)
+      (net 1 GND))
+    (model Capacitors_SMD.3dshapes/C_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8ED64)
+    (at 143.63 73.485 270)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
+    (path /58D51CAD/58D67C1D)
+    (attr smd)
+    (fp_text reference R1 (at 0 1.9 270) (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)
+      (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))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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)
+      (net 93 /power/WAKE))
+    (pad 2 smd rect (at 1.1 0 270) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 75 /power/PWREN))
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8ED69)
+    (at 165.22 86.82 90)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
+    (path /58D51CAD/58D7BDD9)
+    (attr smd)
+    (fp_text reference R2 (at 0 1.9 90) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 47k (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))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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)
+      (net 75 /power/PWREN))
+    (pad 2 smd rect (at 1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8ED6E)
+    (at 156.33 93.805 180)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
+    (path /58D51CAD/58D7B61A)
+    (attr smd)
+    (fp_text reference R3 (at 0 1.9 180) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 330k (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))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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)
+      (net 2 +5V))
+    (pad 2 smd rect (at 1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 91 /power/WKUP))
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8ED73)
+    (at 162.045 86.185 180)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
+    (path /58D51CAD/58D7CBD5)
+    (attr smd)
+    (fp_text reference R4 (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 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))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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)
+      (net 94 /power/HOLD))
+    (pad 2 smd rect (at 1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 75 /power/PWREN))
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8ED78)
+    (at 165.22 82.545 270)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
+    (path /58D51CAD/58D85B68)
+    (attr smd)
+    (fp_text reference R5 (at 0 1.9 270) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 4.7M (at 0 -1.9 270) (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))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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)
+      (net 92 /power/SHUT))
+    (pad 2 smd rect (at 1.1 0 270) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8ED7D)
+    (at 161.33 88.09)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
+    (path /58D51CAD/58D7B291)
+    (attr smd)
+    (fp_text reference R6 (at 0 1.9) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 1k (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))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 95 /power/WKn))
+    (pad 2 smd rect (at 1.1 0) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 90 /power/WAKEUPn))
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8ED82)
+    (at 119.5 92.535 180)
+    (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)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 220 (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))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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)
+      (net 61 +3V3))
+    (pad 2 smd rect (at 1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 71 "Net-(BTN1-Pad1)"))
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8ED87)
+    (at 160.14 83.18 90)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
+    (path /58D51CAD/58D8111E)
+    (attr smd)
+    (fp_text reference R8 (at 0 1.9 90) (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)
+      (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))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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)
+      (net 75 /power/PWREN))
+    (pad 2 smd rect (at 1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 104 "Net-(Q2-Pad3)"))
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8ED8C)
+    (at 170.3 70.31 90)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
     (path /58D6BF46/58D8DD25)
     (attr smd)
-    (fp_text reference R9 (at 0 2.1) (layer B.SilkS)
+    (fp_text reference R9 (at 0 1.9 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -2.1) (layer B.Fab)
+    (fp_text value 10k (at 0 -1.9 90) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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)
       (net 61 +3V3))
-    (pad 2 smd rect (at 1.35 0) (size 1.5 1.3) (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 105 /usb/EECLK))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D8D44A)
-    (at 137.28 123.65)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8ED91)
+    (at 165.22 77.93 180)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
     (path /58D6BF46/58D8DCBE)
     (attr smd)
-    (fp_text reference R10 (at 0 2.1) (layer B.SilkS)
+    (fp_text reference R10 (at 0 1.9 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -2.1) (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 -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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)
       (net 61 +3V3))
-    (pad 2 smd rect (at 1.35 0) (size 1.5 1.3) (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 106 /usb/EECS))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D8D450)
-    (at 128.39 119.830001)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8ED96)
+    (at 157.6 67.77)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
     (path /58D6BF46/58D8DC49)
     (attr smd)
-    (fp_text reference R11 (at 0 2.1) (layer B.SilkS)
+    (fp_text reference R11 (at 0 1.9) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 10k (at 0 -2.1) (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 -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 61 +3V3))
-    (pad 2 smd rect (at 1.35 0) (size 1.5 1.3) (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 107 "Net-(R11-Pad2)"))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58307B90) (tstamp 58D8D456)
-    (at 136.01 119.830001)
-    (descr "Resistor SMD 0805, hand soldering")
-    (tags "resistor 0805")
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8ED9B)
+    (at 163.95 69.04 180)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
     (path /58D6BF46/58D8D814)
     (attr smd)
-    (fp_text reference R12 (at 0 2.1) (layer B.SilkS)
+    (fp_text reference R12 (at 0 1.9 180) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 2.2k (at 0 -2.1) (layer B.Fab)
+    (fp_text value 2.2k (at 0 -1.9 180) (layer B.Fab)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_line (start -1 -0.625) (end -1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 -0.625) (end -1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start 1 0.625) (end 1 -0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -1 0.625) (end 1 0.625) (layer B.Fab) (width 0.1))
-    (fp_line (start -2.4 1) (end 2.4 1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 -1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.4 1) (end -2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 2.4 1) (end 2.4 -1) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 0.6 -0.875) (end -0.6 -0.875) (layer B.SilkS) (width 0.15))
-    (fp_line (start -0.6 0.875) (end 0.6 0.875) (layer B.SilkS) (width 0.15))
-    (pad 1 smd rect (at -1.35 0) (size 1.5 1.3) (layers B.Cu B.Paste B.Mask)
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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)
       (net 108 /usb/EEDATA))
-    (pad 2 smd rect (at 1.35 0) (size 1.5 1.3) (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 107 "Net-(R11-Pad2)"))
-    (model Resistors_SMD.3dshapes/R_0805_HandSoldering.wrl
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (module Housings_SOIC:SOIC-8_3.9x4.9mm_Pitch1.27mm (layer B.Cu) (tedit 54130A77) (tstamp 58D8D462)
-    (at 165.22 74.12)
-    (descr "8-Lead Plastic Small Outline (SN) - Narrow, 3.90 mm Body [SOIC] (see Microchip Packaging Specification 00000049BS.pdf)")
-    (tags "SOIC 1.27")
-    (path /58D6BF46/58D8D21C)
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8EDA0)
+    (at 153.155 80.935 90)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
+    (path /58D51CAD/58DA1F4D)
     (attr smd)
-    (fp_text reference U8 (at 0 3.5) (layer B.SilkS)
+    (fp_text reference R13 (at 0 1.9 90) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value 93CxxC (at 0 -3.5) (layer B.Fab)
+    (fp_text value 15k (at 0 -1.9 90) (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))
-    (fp_line (start 1.95 2.45) (end 1.95 -2.45) (layer B.Fab) (width 0.15))
-    (fp_line (start 1.95 -2.45) (end -1.95 -2.45) (layer B.Fab) (width 0.15))
-    (fp_line (start -1.95 -2.45) (end -1.95 1.45) (layer B.Fab) (width 0.15))
-    (fp_line (start -1.95 1.45) (end -0.95 2.45) (layer B.Fab) (width 0.15))
-    (fp_line (start -3.75 2.75) (end -3.75 -2.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start 3.75 2.75) (end 3.75 -2.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -3.75 2.75) (end 3.75 2.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -3.75 -2.75) (end 3.75 -2.75) (layer B.CrtYd) (width 0.05))
-    (fp_line (start -2.075 2.575) (end -2.075 2.525) (layer B.SilkS) (width 0.15))
-    (fp_line (start 2.075 2.575) (end 2.075 2.43) (layer B.SilkS) (width 0.15))
-    (fp_line (start 2.075 -2.575) (end 2.075 -2.43) (layer B.SilkS) (width 0.15))
-    (fp_line (start -2.075 -2.575) (end -2.075 -2.43) (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.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) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 106 /usb/EECS))
-    (pad 2 smd rect (at -2.7 0.635) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 105 /usb/EECLK))
-    (pad 3 smd rect (at -2.7 -0.635) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 108 /usb/EEDATA))
-    (pad 4 smd rect (at -2.7 -1.905) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 107 "Net-(R11-Pad2)"))
-    (pad 5 smd rect (at 2.7 -1.905) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad 6 smd rect (at 2.7 -0.635) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 61 +3V3))
-    (pad 7 smd rect (at 2.7 0.635) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
-      (net 1 GND))
-    (pad 8 smd rect (at 2.7 1.905) (size 1.55 0.6) (layers B.Cu B.Paste B.Mask)
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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)
+      (net 109 SHUTDOWN))
+    (pad 2 smd rect (at 1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8EDA5)
+    (at 139.82 73.485 90)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
+    (path /58D51CAD/58D5A193)
+    (attr smd)
+    (fp_text reference RA1 (at 0 1.9 90) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 15k (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))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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)
+      (net 64 +1V2))
+    (pad 2 smd rect (at 1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 72 /power/FB1))
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8EDAA)
+    (at 123.945 81.105 180)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
+    (path /58D51CAD/58D67BE4)
+    (attr smd)
+    (fp_text reference RA2 (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 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))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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)
+      (net 73 +2V5))
+    (pad 2 smd rect (at 1.1 0 180) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 77 /power/FB2))
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8EDAF)
+    (at 146.805 88.725)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
+    (path /58D51CAD/58D62970)
+    (attr smd)
+    (fp_text reference RA3 (at 0 1.9) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 15k (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))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
       (net 61 +3V3))
-    (model Housings_SOIC.3dshapes/SOIC-8_3.9x4.9mm_Pitch1.27mm.wrl
+    (pad 2 smd rect (at 1.1 0) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 76 /power/FB3))
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8EDB4)
+    (at 136.645 70.31)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
+    (path /58D51CAD/58D5A1E5)
+    (attr smd)
+    (fp_text reference RB1 (at 0 1.9) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 15k (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))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 1 GND))
+    (pad 2 smd rect (at 1.1 0) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 72 /power/FB1))
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8EDB9)
+    (at 120.77 84.28 90)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
+    (path /58D51CAD/58D67BEA)
+    (attr smd)
+    (fp_text reference RB2 (at 0 1.9 90) (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)
+      (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))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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)
+      (net 1 GND))
+    (pad 2 smd rect (at 1.1 0 90) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 77 /power/FB2))
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistors_SMD:R_0603_HandSoldering (layer B.Cu) (tedit 58307AEF) (tstamp 58D8EDBE)
+    (at 149.98 85.55 270)
+    (descr "Resistor SMD 0603, hand soldering")
+    (tags "resistor 0603")
+    (path /58D51CAD/58D62976)
+    (attr smd)
+    (fp_text reference RB3 (at 0 1.9 270) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 3.3k (at 0 -1.9 270) (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))
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
+    (fp_line (start -2 0.8) (end 2 0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 -0.8) (end 2 -0.8) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -2 0.8) (end -2 -0.8) (layer B.CrtYd) (width 0.05))
+    (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)
+      (net 1 GND))
+    (pad 2 smd rect (at 1.1 0 270) (size 1.2 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 76 /power/FB3))
+    (model Resistors_SMD.3dshapes/R_0603_HandSoldering.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))

ulx3s.net

@@ -1,7 +1,7 @@
 (export (version D)
   (design
     (source /home/davor/src/circuits/fpga/ulx3s/ulx3s.sch)
-    (date "Pon 27 Ožu 2017 10:50:49")
+    (date "Pon 27 Ožu 2017 13:36:03")
     (tool "Eeschema 4.0.5+dfsg1-4")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -94,21 +94,26 @@
     (sheet (number 9) (name /analog/) (tstamps /58D82BD0/)
       (title_block
         (title)
-        (company)
+        (company FER+RIZ+RADIONA)
         (rev)
         (date)
         (source analog.sch)
-        (comment (number 1) (value ""))
+        (comment (number 1) (value "Analog audio and video"))
+        (comment (number 2) (value ""))
+        (comment (number 3) (value ""))
+        (comment (number 4) (value ""))))
+    (sheet (number 10) (name /sdcard/) (tstamps /58DA7327/)
+      (title_block
+        (title ULX3S)
+        (company FER+RIZ+RADIONA)
+        (rev 0.0.1)
+        (date)
+        (source sdcard.sch)
+        (comment (number 1) (value "SD card"))
         (comment (number 2) (value ""))
         (comment (number 3) (value ""))
         (comment (number 4) (value "")))))
   (components
-    (comp (ref SD1)
-      (value SD_Card)
-      (footprint micro-sd:MicroSD_TF02D)
-      (libsource (lib conn) (part SD_Card))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 56ACBF19))
     (comp (ref U1)
       (value LFE5U-25F-6BG381C)
       (footprint lfe5bg381:BGA-381_pitch0.8mm_dia0.4mm)
@@ -165,19 +170,19 @@
       (tstamp 58D59D36))
     (comp (ref C2)
       (value 470pF)
-      (footprint Capacitors_SMD:C_0805_HandSoldering)
+      (footprint Capacitors_SMD:C_0603_HandSoldering)
       (libsource (lib device) (part C))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D5A146))
     (comp (ref RA1)
       (value 15k)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D5A193))
     (comp (ref RB1)
       (value 15k)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D5A1E5))
@@ -213,19 +218,19 @@
       (tstamp 58D62964))
     (comp (ref C6)
       (value 470pF)
-      (footprint Capacitors_SMD:C_0805_HandSoldering)
+      (footprint Capacitors_SMD:C_0603_HandSoldering)
       (libsource (lib device) (part C))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D6296A))
     (comp (ref RA3)
       (value 15k)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D62970))
     (comp (ref RB3)
       (value 3.3k)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D62976))
@@ -261,19 +266,19 @@
       (tstamp 58D67BD8))
     (comp (ref C10)
       (value 470pF)
-      (footprint Capacitors_SMD:C_0805_HandSoldering)
+      (footprint Capacitors_SMD:C_0603_HandSoldering)
       (libsource (lib device) (part C))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D67BDE))
     (comp (ref RA2)
       (value 15k)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D67BE4))
     (comp (ref RB2)
       (value 4.7k)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D67BEA))
@@ -291,7 +296,7 @@
       (tstamp 58D67BFC))
     (comp (ref R1)
       (value 15k)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D67C1D))
@@ -321,19 +326,19 @@
       (tstamp 58D7A3F0))
     (comp (ref R3)
       (value 330k)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D7B61A))
     (comp (ref R2)
       (value 47k)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D7BDD9))
     (comp (ref R4)
       (value 15k)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D7CBD5))
@@ -345,7 +350,7 @@
       (tstamp 58D7CBDC))
     (comp (ref C14)
       (value 100nF)
-      (footprint Capacitors_SMD:C_0805_HandSoldering)
+      (footprint Capacitors_SMD:C_0603_HandSoldering)
       (libsource (lib device) (part C))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D84952))
@@ -357,13 +362,13 @@
       (tstamp 58D84D8A))
     (comp (ref R5)
       (value 4.7M)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D85B68))
     (comp (ref R6)
       (value 1k)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D7B291))
@@ -375,7 +380,7 @@
       (tstamp 58D7BC4A))
     (comp (ref R8)
       (value 1k)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D8111E))
@@ -397,6 +402,12 @@
       (libsource (lib device) (part Q_PNP_BEC))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D89315))
+    (comp (ref R13)
+      (value 15k)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
+      (libsource (lib device) (part R))
+      (sheetpath (names /power/) (tstamps /58D51CAD/))
+      (tstamp 58DA1F4D))
     (comp (ref OLED1)
       (value CONN_01X07)
       (footprint Socket_Strips:Socket_Strip_Straight_1x07)
@@ -441,7 +452,7 @@
       (tstamp 58D6605B))
     (comp (ref R7)
       (value 220)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /blinkey/) (tstamps /58D6547C/))
       (tstamp 58D6605D))
@@ -543,13 +554,13 @@
       (tstamp 58D8A211))
     (comp (ref C15)
       (value 27pF)
-      (footprint Capacitors_SMD:C_0805_HandSoldering)
+      (footprint Capacitors_SMD:C_0603_HandSoldering)
       (libsource (lib device) (part C))
       (sheetpath (names /usb/) (tstamps /58D6BF46/))
       (tstamp 58D8C14C))
     (comp (ref C16)
       (value 27pF)
-      (footprint Capacitors_SMD:C_0805_HandSoldering)
+      (footprint Capacitors_SMD:C_0603_HandSoldering)
       (libsource (lib device) (part C))
       (sheetpath (names /usb/) (tstamps /58D6BF46/))
       (tstamp 58D8C189))
@@ -561,25 +572,25 @@
       (tstamp 58D8D21C))
     (comp (ref R12)
       (value 2.2k)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /usb/) (tstamps /58D6BF46/))
       (tstamp 58D8D814))
     (comp (ref R11)
       (value 10k)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /usb/) (tstamps /58D6BF46/))
       (tstamp 58D8DC49))
     (comp (ref R10)
       (value 10k)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /usb/) (tstamps /58D6BF46/))
       (tstamp 58D8DCBE))
     (comp (ref R9)
       (value 10k)
-      (footprint Resistors_SMD:R_0805_HandSoldering)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
       (libsource (lib device) (part R))
       (sheetpath (names /usb/) (tstamps /58D6BF46/))
       (tstamp 58D8DD25))
@@ -589,7 +600,7 @@
       (libsource (lib ESP8266) (part ESP-12E))
       (sheetpath (names /wifi/) (tstamps /58D6D447/))
       (tstamp 58D75E1E))
-    (comp (ref RAM1)
+    (comp (ref U9)
       (value MT48LC16M16A2TG)
       (footprint TSOP54:TSOP54)
       (libsource (lib memory) (part MT48LC4M16A2TG))
@@ -600,7 +611,61 @@
       (footprint audio-jack:CUI_SJ-43516-SMT)
       (libsource (lib conn) (part JACK_TRS_6PINS))
       (sheetpath (names /analog/) (tstamps /58D82BD0/))
-      (tstamp 58D82C05)))
+      (tstamp 58D82C05))
+    (comp (ref R17)
+      (value 100)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
+      (libsource (lib device) (part R))
+      (sheetpath (names /analog/) (tstamps /58D82BD0/))
+      (tstamp 58D90455))
+    (comp (ref R16)
+      (value 200)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
+      (libsource (lib device) (part R))
+      (sheetpath (names /analog/) (tstamps /58D82BD0/))
+      (tstamp 58D904AE))
+    (comp (ref R15)
+      (value 400)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
+      (libsource (lib device) (part R))
+      (sheetpath (names /analog/) (tstamps /58D82BD0/))
+      (tstamp 58D904D5))
+    (comp (ref R14)
+      (value 800)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
+      (libsource (lib device) (part R))
+      (sheetpath (names /analog/) (tstamps /58D82BD0/))
+      (tstamp 58D90500))
+    (comp (ref R21)
+      (value 100)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
+      (libsource (lib device) (part R))
+      (sheetpath (names /analog/) (tstamps /58D82BD0/))
+      (tstamp 58D907CA))
+    (comp (ref R20)
+      (value 200)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
+      (libsource (lib device) (part R))
+      (sheetpath (names /analog/) (tstamps /58D82BD0/))
+      (tstamp 58D907D0))
+    (comp (ref R19)
+      (value 400)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
+      (libsource (lib device) (part R))
+      (sheetpath (names /analog/) (tstamps /58D82BD0/))
+      (tstamp 58D907D6))
+    (comp (ref R18)
+      (value 800)
+      (footprint Resistors_SMD:R_0603_HandSoldering)
+      (libsource (lib device) (part R))
+      (sheetpath (names /analog/) (tstamps /58D82BD0/))
+      (tstamp 58D907DC))
+    (comp (ref SD1)
+      (value SD_Card)
+      (footprint micro-sd:MicroSD_TF02D)
+      (libsource (lib conn) (part SD_Card))
+      (sheetpath (names /sdcard/) (tstamps /58DA7327/))
+      (tstamp 58DA7C6C)))
   (libparts
     (libpart (lib memory) (part 93CxxC)
       (description "Serial EEPROM, 93 series in 8-pin package with ORG pin, 5.0V")
@@ -1416,6 +1481,16 @@
         (pin (num 5) (name GND) (type power_in))
         (pin (num 6) (name shield) (type passive)))))
   (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 micro-hdmi-d)
       (uri footprints/micro-hdmi-d/micro-hdmi-d.lib))
     (library (logical lfe5bg381)
@@ -1423,98 +1498,52 @@
     (library (logical ap3429a)
       (uri footprints/dcdc_converter/ap3429a.lib))
     (library (logical ft2232)
-      (uri footprints/usbserial/ft2232.lib))
-    (library (logical ESP8266)
-      (uri footprints/esp8266/ESP8266.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 device)
-      (uri /usr/share/kicad/library/device.lib)))
+      (uri footprints/usbserial/ft2232.lib)))
   (nets
-    (net (code 1) (name SD_CD)
-      (node (ref SD1) (pin 10)))
-    (net (code 2) (name SD_WP)
-      (node (ref SD1) (pin 11)))
-    (net (code 3) (name SD_MTMS)
-      (node (ref SD1) (pin 2))
-      (node (ref U2) (pin 12)))
-    (net (code 4) (name SD_3)
-      (node (ref SD1) (pin 1))
-      (node (ref U2) (pin 11)))
-    (net (code 5) (name +3V3)
-      (node (ref OLED1) (pin 2))
-      (node (ref D11) (pin 2))
-      (node (ref RA3) (pin 1))
-      (node (ref U1) (pin F12))
-      (node (ref L2) (pin 2))
-      (node (ref C6) (pin 1))
-      (node (ref U1) (pin F11))
-      (node (ref J1) (pin 64))
-      (node (ref R7) (pin 1))
-      (node (ref U1) (pin P10))
-      (node (ref U1) (pin P9))
-      (node (ref U1) (pin F9))
-      (node (ref J1) (pin 63))
-      (node (ref C8) (pin 1))
-      (node (ref C7) (pin 1))
-      (node (ref U1) (pin H6))
-      (node (ref U1) (pin L14))
-      (node (ref U1) (pin H15))
-      (node (ref U1) (pin J15))
-      (node (ref U1) (pin L15))
-      (node (ref U1) (pin M15))
-      (node (ref J3) (pin 19))
-      (node (ref U1) (pin L7))
-      (node (ref J3) (pin 20))
-      (node (ref U1) (pin H7))
-      (node (ref J3) (pin 2))
-      (node (ref J3) (pin 1))
-      (node (ref U1) (pin H14))
-      (node (ref U1) (pin M6))
-      (node (ref J2) (pin 2))
-      (node (ref J2) (pin 1))
-      (node (ref U1) (pin L6))
-      (node (ref U1) (pin J6))
-      (node (ref U1) (pin F10))
-      (node (ref U6) (pin 50))
-      (node (ref U6) (pin 9))
-      (node (ref U6) (pin 5))
-      (node (ref U6) (pin 16))
-      (node (ref U2) (pin 8))
-      (node (ref SD1) (pin 4))
-      (node (ref U6) (pin 36))
-      (node (ref U6) (pin 44))
-      (node (ref R11) (pin 1))
-      (node (ref U8) (pin 6))
-      (node (ref U8) (pin 8))
-      (node (ref R10) (pin 1))
-      (node (ref R9) (pin 1)))
-    (net (code 6) (name SD_MTCK)
-      (node (ref SD1) (pin 5))
-      (node (ref U2) (pin 13)))
-    (net (code 7) (name GND)
-      (node (ref U1) (pin W7))
-      (node (ref U1) (pin J2))
-      (node (ref U1) (pin Y7))
-      (node (ref U1) (pin F8))
-      (node (ref U1) (pin G8))
+    (net (code 1) (name /gpio/MP3)
+      (node (ref J3) (pin 15)))
+    (net (code 2) (name /gpio/MP5)
+      (node (ref J3) (pin 17)))
+    (net (code 3) (name GND)
+      (node (ref U1) (pin Y5))
+      (node (ref U1) (pin U6))
+      (node (ref U1) (pin T6))
+      (node (ref U1) (pin N6))
+      (node (ref U1) (pin V11))
+      (node (ref U1) (pin K6))
+      (node (ref U1) (pin G6))
+      (node (ref U1) (pin W6))
+      (node (ref U1) (pin V5))
+      (node (ref U1) (pin G4))
+      (node (ref U1) (pin D4))
       (node (ref U1) (pin M2))
-      (node (ref U1) (pin V9))
+      (node (ref U1) (pin J2))
+      (node (ref U1) (pin V6))
+      (node (ref U1) (pin J11))
+      (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))
+      (node (ref U1) (pin V20))
+      (node (ref U1) (pin G11))
+      (node (ref U1) (pin K10))
+      (node (ref U1) (pin K11))
+      (node (ref U1) (pin L11))
+      (node (ref U1) (pin M11))
+      (node (ref U1) (pin P11))
+      (node (ref U1) (pin U11))
+      (node (ref U1) (pin B7))
+      (node (ref U1) (pin W16))
+      (node (ref U1) (pin G17))
+      (node (ref U1) (pin C19))
       (node (ref U1) (pin H19))
-      (node (ref U1) (pin G10))
       (node (ref U1) (pin R19))
       (node (ref U1) (pin V19))
       (node (ref U1) (pin W19))
       (node (ref U3) (pin 2))
-      (node (ref U1) (pin J10))
-      (node (ref U1) (pin V7))
       (node (ref C1) (pin 2))
       (node (ref U1) (pin U7))
-      (node (ref U1) (pin B7))
       (node (ref U1) (pin F7))
       (node (ref U1) (pin G7))
       (node (ref U1) (pin J7))
@@ -1524,72 +1553,67 @@
       (node (ref U1) (pin P7))
       (node (ref U1) (pin T7))
       (node (ref U1) (pin Y6))
-      (node (ref U1) (pin V20))
-      (node (ref U1) (pin U6))
-      (node (ref U1) (pin V6))
-      (node (ref U1) (pin W6))
-      (node (ref U1) (pin J11))
-      (node (ref U1) (pin L10))
-      (node (ref U1) (pin M10))
-      (node (ref U1) (pin T8))
-      (node (ref U1) (pin P8))
-      (node (ref U1) (pin T10))
-      (node (ref U1) (pin U10))
-      (node (ref U1) (pin V10))
-      (node (ref U1) (pin T6))
-      (node (ref U1) (pin L9))
-      (node (ref U1) (pin G11))
-      (node (ref U1) (pin K10))
-      (node (ref U1) (pin K11))
+      (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 C5) (pin 2))
+      (node (ref U1) (pin G10))
       (node (ref U1) (pin G12))
-      (node (ref U1) (pin L11))
-      (node (ref U1) (pin M11))
-      (node (ref U1) (pin P11))
-      (node (ref U1) (pin Y11))
-      (node (ref U1) (pin U11))
-      (node (ref U1) (pin V11))
-      (node (ref U1) (pin G4))
-      (node (ref U1) (pin U9))
-      (node (ref U1) (pin V5))
-      (node (ref U1) (pin T9))
-      (node (ref U1) (pin M9))
-      (node (ref U1) (pin K9))
-      (node (ref U1) (pin J9))
-      (node (ref U1) (pin G9))
-      (node (ref U1) (pin D4))
-      (node (ref U1) (pin Y5))
-      (node (ref U1) (pin G6))
-      (node (ref U1) (pin Y8))
-      (node (ref U1) (pin V8))
-      (node (ref U1) (pin K6))
+      (node (ref U1) (pin L9))
+      (node (ref U1) (pin P8))
+      (node (ref U1) (pin T8))
       (node (ref U1) (pin U8))
-      (node (ref U1) (pin N6))
+      (node (ref U1) (pin V8))
+      (node (ref U1) (pin Y8))
+      (node (ref U1) (pin G9))
+      (node (ref U1) (pin J9))
+      (node (ref U1) (pin K9))
+      (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 J10))
       (node (ref C14) (pin 2))
+      (node (ref R2) (pin 2))
       (node (ref Q2) (pin 2))
+      (node (ref R13) (pin 2))
       (node (ref R5) (pin 2))
+      (node (ref RB3) (pin 1))
+      (node (ref C7) (pin 2))
+      (node (ref C8) (pin 2))
+      (node (ref U4) (pin 2))
+      (node (ref U5) (pin 2))
       (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 R2) (pin 2))
+      (node (ref U1) (pin U13))
+      (node (ref U1) (pin W15))
+      (node (ref U1) (pin M16))
+      (node (ref U1) (pin G13))
+      (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 Y12))
       (node (ref U1) (pin F13))
       (node (ref U1) (pin V16))
       (node (ref U1) (pin P13))
-      (node (ref U1) (pin U13))
+      (node (ref U1) (pin V15))
       (node (ref U1) (pin V13))
       (node (ref U1) (pin B14))
-      (node (ref C4) (pin 2))
       (node (ref RB1) (pin 1))
-      (node (ref U1) (pin U12))
       (node (ref C3) (pin 2))
-      (node (ref U1) (pin W16))
-      (node (ref U1) (pin G17))
-      (node (ref U1) (pin F14))
+      (node (ref C4) (pin 2))
+      (node (ref C12) (pin 2))
+      (node (ref RB2) (pin 1))
+      (node (ref C11) (pin 2))
       (node (ref BAT1) (pin 2))
+      (node (ref U7) (pin 4))
       (node (ref U1) (pin G15))
       (node (ref U1) (pin G14))
       (node (ref U1) (pin J14))
@@ -1599,776 +1623,842 @@
       (node (ref U1) (pin P14))
       (node (ref U1) (pin U14))
       (node (ref U1) (pin V14))
-      (node (ref U1) (pin C19))
+      (node (ref U1) (pin F14))
       (node (ref U1) (pin K15))
       (node (ref U1) (pin N15))
-      (node (ref U1) (pin V15))
-      (node (ref U1) (pin W15))
-      (node (ref U1) (pin M16))
-      (node (ref U1) (pin G13))
-      (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 D1) (pin 1))
-      (node (ref D0) (pin 1))
-      (node (ref D2) (pin 1))
-      (node (ref D3) (pin 1))
-      (node (ref OLED1) (pin 1))
-      (node (ref D7) (pin 1))
-      (node (ref D4) (pin 1))
-      (node (ref D5) (pin 1))
-      (node (ref D6) (pin 1))
-      (node (ref US1) (pin 5))
-      (node (ref US2) (pin 6))
-      (node (ref US2) (pin 5))
-      (node (ref US1) (pin 6))
-      (node (ref U6) (pin 21))
-      (node (ref U2) (pin 15))
-      (node (ref U6) (pin 45))
-      (node (ref U6) (pin 57))
-      (node (ref U6) (pin 41))
-      (node (ref U8) (pin 7))
-      (node (ref C17) (pin 2))
       (node (ref GPDI1) (pin 10))
-      (node (ref GPDI1) (pin SHD))
-      (node (ref GPDI1) (pin 4))
       (node (ref GPDI1) (pin 7))
       (node (ref GPDI1) (pin 13))
+      (node (ref GPDI1) (pin 4))
       (node (ref GPDI1) (pin 16))
+      (node (ref GPDI1) (pin SHD))
       (node (ref C15) (pin 2))
       (node (ref C16) (pin 2))
+      (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 C17) (pin 2))
+      (node (ref U6) (pin 57))
+      (node (ref U6) (pin 41))
+      (node (ref U6) (pin 45))
+      (node (ref U2) (pin 15))
+      (node (ref AUDIO1) (pin 2))
+      (node (ref SD1) (pin 12))
+      (node (ref SD1) (pin 3))
+      (node (ref SD1) (pin 6))
+      (node (ref SD1) (pin 13))
+      (node (ref US1) (pin 5))
       (node (ref U8) (pin 5))
-      (node (ref C8) (pin 2))
-      (node (ref RB3) (pin 1))
-      (node (ref C7) (pin 2))
-      (node (ref J1) (pin 4))
-      (node (ref J3) (pin 3))
-      (node (ref J3) (pin 4))
+      (node (ref U8) (pin 7))
+      (node (ref U6) (pin 21))
+      (node (ref US1) (pin 6))
+      (node (ref US2) (pin 5))
+      (node (ref US2) (pin 6))
+      (node (ref J1) (pin 62))
       (node (ref J3) (pin 21))
       (node (ref J3) (pin 22))
-      (node (ref J1) (pin 62))
-      (node (ref J1) (pin 61))
-      (node (ref J1) (pin 3))
-      (node (ref C5) (pin 2))
       (node (ref J2) (pin 3))
       (node (ref J2) (pin 4))
-      (node (ref SD1) (pin 12))
-      (node (ref U4) (pin 2))
-      (node (ref U5) (pin 2))
-      (node (ref SD1) (pin 3))
-      (node (ref SD1) (pin 6))
-      (node (ref SD1) (pin 13)))
-    (net (code 8) (name SD_MTDO)
-      (node (ref SD1) (pin 7))
-      (node (ref U2) (pin 9)))
-    (net (code 9) (name SD_MTDI)
-      (node (ref SD1) (pin 8))
-      (node (ref U2) (pin 10)))
-    (net (code 10) (name SD_2)
-      (node (ref U2) (pin 14))
-      (node (ref SD1) (pin 9)))
-    (net (code 11) (name /gpio/MP3)
-      (node (ref J3) (pin 15)))
-    (net (code 12) (name /gpio/MP5)
-      (node (ref J3) (pin 17)))
-    (net (code 13) (name /gpio/MP6)
-      (node (ref J3) (pin 18)))
-    (net (code 14) (name /gpio/MP1)
+      (node (ref J1) (pin 61))
+      (node (ref J1) (pin 3))
+      (node (ref J1) (pin 4))
+      (node (ref J3) (pin 3))
+      (node (ref J3) (pin 4)))
+    (net (code 4) (name /gpio/P39)
+      (node (ref U1) (pin B16))
+      (node (ref J1) (pin 39)))
+    (net (code 5) (name /gpio/MP1)
       (node (ref J3) (pin 13)))
-    (net (code 15) (name /gpio/PMODB7)
+    (net (code 6) (name /gpio/PMODB7)
       (node (ref J3) (pin 11)))
-    (net (code 16) (name /gpio/PMODB5)
+    (net (code 7) (name /gpio/PMODB5)
       (node (ref J3) (pin 9)))
-    (net (code 17) (name /gpio/PMODB3)
+    (net (code 8) (name /gpio/PMODB3)
       (node (ref J3) (pin 7)))
-    (net (code 18) (name /gpio/PMODB1)
+    (net (code 9) (name /gpio/PMODB1)
       (node (ref J3) (pin 5)))
-    (net (code 19) (name /gpio/PMODB8)
+    (net (code 10) (name /gpio/PMODB8)
       (node (ref J3) (pin 12)))
-    (net (code 20) (name /gpio/PMODB6)
+    (net (code 11) (name /gpio/PMODB6)
       (node (ref J3) (pin 10)))
-    (net (code 21) (name /gpio/PMODB4)
+    (net (code 12) (name /gpio/PMODB4)
       (node (ref J3) (pin 8)))
-    (net (code 22) (name /gpio/PMODB2)
+    (net (code 13) (name /gpio/PMODB2)
       (node (ref J3) (pin 6)))
-    (net (code 23) (name /gpio/P56)
-      (node (ref J1) (pin 56))
-      (node (ref U1) (pin D12)))
-    (net (code 24) (name /gpio/P54)
-      (node (ref U1) (pin A12))
-      (node (ref J1) (pin 54)))
-    (net (code 25) (name /gpio/P52)
-      (node (ref J1) (pin 52))
-      (node (ref U1) (pin B13)))
-    (net (code 26) (name /gpio/P50)
+    (net (code 14) (name /gpio/MP6)
+      (node (ref J3) (pin 18)))
+    (net (code 15) (name /gpio/P58)
+      (node (ref U1) (pin B12))
+      (node (ref J1) (pin 58)))
+    (net (code 16) (name /gpio/P56)
+      (node (ref U1) (pin D12))
+      (node (ref J1) (pin 56)))
+    (net (code 17) (name /gpio/P54)
+      (node (ref J1) (pin 54))
+      (node (ref U1) (pin A12)))
+    (net (code 18) (name /gpio/P52)
+      (node (ref U1) (pin B13))
+      (node (ref J1) (pin 52)))
+    (net (code 19) (name /gpio/P50)
       (node (ref J1) (pin 50))
       (node (ref U1) (pin D13)))
-    (net (code 27) (name /gpio/P48)
-      (node (ref U1) (pin A14))
-      (node (ref J1) (pin 48)))
-    (net (code 28) (name /gpio/P46)
-      (node (ref U1) (pin D14))
-      (node (ref J1) (pin 46)))
-    (net (code 29) (name /gpio/P44)
+    (net (code 20) (name /gpio/P48)
+      (node (ref J1) (pin 48))
+      (node (ref U1) (pin A14)))
+    (net (code 21) (name /gpio/P46)
+      (node (ref J1) (pin 46))
+      (node (ref U1) (pin D14)))
+    (net (code 22) (name /gpio/P44)
       (node (ref U1) (pin B15))
       (node (ref J1) (pin 44)))
-    (net (code 30) (name /gpio/P42)
-      (node (ref J1) (pin 42))
-      (node (ref U1) (pin D15)))
-    (net (code 31) (name /gpio/P40)
+    (net (code 23) (name /gpio/P42)
+      (node (ref U1) (pin D15))
+      (node (ref J1) (pin 42)))
+    (net (code 24) (name /gpio/P40)
       (node (ref U1) (pin A16))
       (node (ref J1) (pin 40)))
-    (net (code 32) (name /gpio/P59)
-      (node (ref J1) (pin 59))
-      (node (ref U1) (pin E11)))
-    (net (code 33) (name /gpio/P57)
+    (net (code 25) (name /gpio/MP4)
+      (node (ref J3) (pin 16)))
+    (net (code 26) (name /gpio/P59)
+      (node (ref U1) (pin E11))
+      (node (ref J1) (pin 59)))
+    (net (code 27) (name /gpio/P57)
       (node (ref J1) (pin 57))
       (node (ref U1) (pin C12)))
-    (net (code 34) (name /gpio/P55)
-      (node (ref J1) (pin 55))
-      (node (ref U1) (pin E12)))
-    (net (code 35) (name /gpio/P53)
+    (net (code 28) (name /gpio/P55)
+      (node (ref U1) (pin E12))
+      (node (ref J1) (pin 55)))
+    (net (code 29) (name /gpio/P53)
       (node (ref U1) (pin A13))
       (node (ref J1) (pin 53)))
-    (net (code 36) (name /gpio/P51)
-      (node (ref J1) (pin 51))
-      (node (ref U1) (pin C13)))
-    (net (code 37) (name /gpio/P49)
+    (net (code 30) (name /gpio/P51)
+      (node (ref U1) (pin C13))
+      (node (ref J1) (pin 51)))
+    (net (code 31) (name /gpio/P49)
       (node (ref U1) (pin E13))
       (node (ref J1) (pin 49)))
-    (net (code 38) (name /gpio/P47)
+    (net (code 32) (name /gpio/P47)
       (node (ref J1) (pin 47))
       (node (ref U1) (pin C14)))
-    (net (code 39) (name /gpio/P45)
+    (net (code 33) (name /gpio/P45)
       (node (ref U1) (pin E14))
       (node (ref J1) (pin 45)))
-    (net (code 40) (name /gpio/P43)
-      (node (ref U1) (pin C15))
-      (node (ref J1) (pin 43)))
-    (net (code 41) (name /gpio/P41)
-      (node (ref J1) (pin 41))
-      (node (ref U1) (pin E15)))
-    (net (code 42) (name /gpio/P39)
-      (node (ref J1) (pin 39))
-      (node (ref U1) (pin B16)))
-    (net (code 43) (name /gpio/MP2)
+    (net (code 34) (name /gpio/P43)
+      (node (ref J1) (pin 43))
+      (node (ref U1) (pin C15)))
+    (net (code 35) (name /gpio/P41)
+      (node (ref U1) (pin E15))
+      (node (ref J1) (pin 41)))
+    (net (code 36) (name /gpio/MP2)
       (node (ref J3) (pin 14)))
-    (net (code 44) (name /gpio/PMODC7)
+    (net (code 37) (name /gpio/PMODC7)
       (node (ref J3) (pin 29)))
-    (net (code 45) (name /gpio/PMODC5)
+    (net (code 38) (name /gpio/PMODC5)
       (node (ref J3) (pin 27)))
-    (net (code 46) (name /gpio/PMODC3)
+    (net (code 39) (name /gpio/PMODC3)
       (node (ref J3) (pin 25)))
-    (net (code 47) (name /gpio/PMODC8)
+    (net (code 40) (name /gpio/PMODC8)
       (node (ref J3) (pin 30)))
-    (net (code 48) (name /gpio/PMODC6)
+    (net (code 41) (name /gpio/PMODC6)
       (node (ref J3) (pin 28)))
-    (net (code 49) (name /gpio/PMODC4)
+    (net (code 42) (name /gpio/PMODC4)
       (node (ref J3) (pin 26)))
-    (net (code 50) (name /gpio/PMODC2)
+    (net (code 43) (name /gpio/PMODC2)
       (node (ref J3) (pin 24)))
-    (net (code 51) (name /gpio/PMODC1)
+    (net (code 44) (name /gpio/PMODC1)
       (node (ref J3) (pin 23)))
-    (net (code 52) (name /gpio/MP4)
-      (node (ref J3) (pin 16)))
-    (net (code 53) (name /gpio/PMODA3)
-      (node (ref J2) (pin 7)))
-    (net (code 54) (name /gpio/PMODA1)
-      (node (ref J2) (pin 5)))
-    (net (code 55) (name /gpio/PMODA5)
-      (node (ref J2) (pin 9)))
-    (net (code 56) (name /gpio/P60)
+    (net (code 45) (name /gpio/P60)
       (node (ref J1) (pin 60))
       (node (ref U1) (pin D11)))
-    (net (code 57) (name /gpio/PMODA8)
+    (net (code 46) (name /gpio/PMODA1)
+      (node (ref J2) (pin 5)))
+    (net (code 47) (name /gpio/PMODA3)
+      (node (ref J2) (pin 7)))
+    (net (code 48) (name /gpio/PMODA5)
+      (node (ref J2) (pin 9)))
+    (net (code 49) (name /gpio/PMODA7)
+      (node (ref J2) (pin 11)))
+    (net (code 50) (name +3V3)
+      (node (ref U8) (pin 6))
+      (node (ref U6) (pin 50))
+      (node (ref U6) (pin 9))
+      (node (ref U6) (pin 5))
+      (node (ref U8) (pin 8))
+      (node (ref J3) (pin 19))
+      (node (ref U1) (pin H7))
+      (node (ref U1) (pin L7))
+      (node (ref U1) (pin H6))
+      (node (ref U1) (pin J6))
+      (node (ref U1) (pin L6))
+      (node (ref U1) (pin M6))
+      (node (ref U1) (pin P10))
+      (node (ref U1) (pin J15))
+      (node (ref U1) (pin H14))
+      (node (ref U1) (pin L14))
+      (node (ref SD1) (pin 4))
+      (node (ref U2) (pin 8))
+      (node (ref U1) (pin H15))
+      (node (ref U1) (pin L15))
+      (node (ref U1) (pin M15))
+      (node (ref U6) (pin 36))
+      (node (ref U6) (pin 16))
+      (node (ref J3) (pin 20))
+      (node (ref U6) (pin 44))
+      (node (ref R7) (pin 1))
+      (node (ref J2) (pin 2))
+      (node (ref J2) (pin 1))
+      (node (ref OLED1) (pin 2))
+      (node (ref R11) (pin 1))
+      (node (ref U1) (pin F12))
+      (node (ref R10) (pin 1))
+      (node (ref R9) (pin 1))
+      (node (ref U1) (pin F11))
+      (node (ref U1) (pin F9))
+      (node (ref U1) (pin P9))
+      (node (ref U1) (pin F10))
+      (node (ref J1) (pin 64))
+      (node (ref J3) (pin 1))
+      (node (ref J3) (pin 2))
+      (node (ref C8) (pin 1))
+      (node (ref RA3) (pin 1))
+      (node (ref C6) (pin 1))
+      (node (ref L2) (pin 2))
+      (node (ref D11) (pin 2))
+      (node (ref C7) (pin 1))
+      (node (ref J1) (pin 63)))
+    (net (code 51) (name /gpio/PMODA8)
       (node (ref J2) (pin 12)))
-    (net (code 58) (name /gpio/PMODA6)
+    (net (code 52) (name /gpio/PMODA6)
       (node (ref J2) (pin 10)))
-    (net (code 59) (name /gpio/PMODA4)
+    (net (code 53) (name /gpio/PMODA4)
       (node (ref J2) (pin 8)))
-    (net (code 60) (name /gpio/PMODA2)
+    (net (code 54) (name /gpio/PMODA2)
       (node (ref J2) (pin 6)))
-    (net (code 61) (name /gpio/PMODA7)
-      (node (ref J2) (pin 11)))
-    (net (code 62) (name /gpio/P35)
-      (node (ref U1) (pin C17))
-      (node (ref J1) (pin 35)))
-    (net (code 63) (name /gpio/P37)
+    (net (code 55) (name /gpio/P37)
       (node (ref J1) (pin 37))
       (node (ref U1) (pin D16)))
-    (net (code 64) (name /gpio/P33)
-      (node (ref U1) (pin B18))
-      (node (ref J1) (pin 33)))
-    (net (code 65) (name /gpio/P31)
+    (net (code 56) (name /gpio/P35)
+      (node (ref U1) (pin C17))
+      (node (ref J1) (pin 35)))
+    (net (code 57) (name /gpio/P33)
+      (node (ref J1) (pin 33))
+      (node (ref U1) (pin B18)))
+    (net (code 58) (name /gpio/P31)
       (node (ref U1) (pin B19))
       (node (ref J1) (pin 31)))
-    (net (code 66) (name /gpio/P29)
-      (node (ref U1) (pin B20))
-      (node (ref J1) (pin 29)))
-    (net (code 67) (name /gpio/P38)
-      (node (ref U1) (pin C16))
-      (node (ref J1) (pin 38)))
-    (net (code 68) (name /gpio/P58)
-      (node (ref U1) (pin B12))
-      (node (ref J1) (pin 58)))
-    (net (code 69) (name /gpio/P36)
-      (node (ref J1) (pin 36))
-      (node (ref U1) (pin B17)))
-    (net (code 70) (name /gpio/P34)
+    (net (code 59) (name /gpio/P29)
+      (node (ref J1) (pin 29))
+      (node (ref U1) (pin B20)))
+    (net (code 60) (name /gpio/P38)
+      (node (ref J1) (pin 38))
+      (node (ref U1) (pin C16)))
+    (net (code 61) (name /gpio/P36)
+      (node (ref U1) (pin B17))
+      (node (ref J1) (pin 36)))
+    (net (code 62) (name /gpio/P34)
       (node (ref J1) (pin 34))
       (node (ref U1) (pin A17)))
-    (net (code 71) (name /gpio/P32)
+    (net (code 63) (name /gpio/P32)
       (node (ref U1) (pin A18))
       (node (ref J1) (pin 32)))
-    (net (code 72) (name /gpio/P30)
+    (net (code 64) (name /gpio/P30)
       (node (ref U1) (pin A19))
       (node (ref J1) (pin 30)))
-    (net (code 73) (name /gpio/P22)
-      (node (ref U1) (pin C6))
-      (node (ref J1) (pin 22)))
-    (net (code 74) (name /gpio/P23)
-      (node (ref U1) (pin D7))
-      (node (ref J1) (pin 23)))
-    (net (code 75) (name /gpio/P24)
-      (node (ref J1) (pin 24))
-      (node (ref U1) (pin E7)))
-    (net (code 76) (name /gpio/P25)
-      (node (ref U1) (pin D6))
-      (node (ref J1) (pin 25)))
-    (net (code 77) (name /gpio/P26)
+    (net (code 65) (name /gpio/P24)
+      (node (ref U1) (pin E7))
+      (node (ref J1) (pin 24)))
+    (net (code 66) (name /gpio/P25)
+      (node (ref J1) (pin 25))
+      (node (ref U1) (pin D6)))
+    (net (code 67) (name /gpio/P26)
       (node (ref U1) (pin E6))
       (node (ref J1) (pin 26)))
-    (net (code 78) (name /gpio/P27)
-      (node (ref J1) (pin 27))
-      (node (ref U1) (pin B6)))
-    (net (code 79) (name /gpio/P28)
+    (net (code 68) (name /gpio/P27)
+      (node (ref U1) (pin B6))
+      (node (ref J1) (pin 27)))
+    (net (code 69) (name /gpio/P28)
       (node (ref J1) (pin 28))
       (node (ref U1) (pin A6)))
-    (net (code 80) (name /gpio/P21)
-      (node (ref U1) (pin C7))
-      (node (ref J1) (pin 21)))
-    (net (code 81) (name /gpio/P20)
-      (node (ref U1) (pin E8))
-      (node (ref J1) (pin 20)))
-    (net (code 82) (name /gpio/P19)
-      (node (ref U1) (pin D8))
-      (node (ref J1) (pin 19)))
-    (net (code 83) (name /gpio/P18)
+    (net (code 70) (name /gpio/P23)
+      (node (ref J1) (pin 23))
+      (node (ref U1) (pin D7)))
+    (net (code 71) (name /gpio/P22)
+      (node (ref U1) (pin C6))
+      (node (ref J1) (pin 22)))
+    (net (code 72) (name /gpio/P21)
+      (node (ref J1) (pin 21))
+      (node (ref U1) (pin C7)))
+    (net (code 73) (name /gpio/P20)
+      (node (ref J1) (pin 20))
+      (node (ref U1) (pin E8)))
+    (net (code 74) (name /gpio/P19)
+      (node (ref J1) (pin 19))
+      (node (ref U1) (pin D8)))
+    (net (code 75) (name /gpio/P18)
       (node (ref J1) (pin 18))
       (node (ref U1) (pin C8)))
-    (net (code 84) (name /gpio/P17)
-      (node (ref U1) (pin B8))
-      (node (ref J1) (pin 17)))
-    (net (code 85) (name /gpio/P16)
-      (node (ref J1) (pin 16))
-      (node (ref U1) (pin A7)))
-    (net (code 86) (name /gpio/P15)
-      (node (ref U1) (pin A8))
-      (node (ref J1) (pin 15)))
-    (net (code 87) (name /gpio/P13)
-      (node (ref J1) (pin 13))
-      (node (ref U1) (pin E9)))
-    (net (code 88) (name /gpio/P14)
-      (node (ref J1) (pin 14))
-      (node (ref U1) (pin D9)))
-    (net (code 89) (name /gpio/P12)
-      (node (ref J1) (pin 12))
-      (node (ref U1) (pin B9)))
-    (net (code 90) (name /gpio/P11)
-      (node (ref U1) (pin C10))
-      (node (ref J1) (pin 11)))
-    (net (code 91) (name /gpio/P9)
-      (node (ref J1) (pin 9))
-      (node (ref U1) (pin B10)))
-    (net (code 92) (name /gpio/P10)
-      (node (ref U1) (pin A9))
-      (node (ref J1) (pin 10)))
-    (net (code 93) (name /gpio/P8)
+    (net (code 76) (name /gpio/P17)
+      (node (ref J1) (pin 17))
+      (node (ref U1) (pin B8)))
+    (net (code 77) (name /gpio/P16)
+      (node (ref U1) (pin A7))
+      (node (ref J1) (pin 16)))
+    (net (code 78) (name /gpio/P15)
+      (node (ref J1) (pin 15))
+      (node (ref U1) (pin A8)))
+    (net (code 79) (name /gpio/P13)
+      (node (ref U1) (pin E9))
+      (node (ref J1) (pin 13)))
+    (net (code 80) (name /gpio/P14)
+      (node (ref U1) (pin D9))
+      (node (ref J1) (pin 14)))
+    (net (code 81) (name /gpio/P12)
+      (node (ref U1) (pin B9))
+      (node (ref J1) (pin 12)))
+    (net (code 82) (name /gpio/P11)
+      (node (ref J1) (pin 11))
+      (node (ref U1) (pin C10)))
+    (net (code 83) (name /gpio/P9)
+      (node (ref U1) (pin B10))
+      (node (ref J1) (pin 9)))
+    (net (code 84) (name /gpio/P10)
+      (node (ref J1) (pin 10))
+      (node (ref U1) (pin A9)))
+    (net (code 85) (name /gpio/P8)
       (node (ref J1) (pin 8))
       (node (ref U1) (pin A11)))
-    (net (code 94) (name /gpio/P7)
-      (node (ref J1) (pin 7))
-      (node (ref U1) (pin A10)))
-    (net (code 95) (name /gpio/P5)
-      (node (ref J1) (pin 5))
-      (node (ref U1) (pin B11)))
-    (net (code 96) (name /gpio/P6)
-      (node (ref U1) (pin C11))
-      (node (ref J1) (pin 6)))
-    (net (code 97) (name /gpio/USB5V)
+    (net (code 86) (name /gpio/P7)
+      (node (ref U1) (pin A10))
+      (node (ref J1) (pin 7)))
+    (net (code 87) (name /gpio/P6)
+      (node (ref J1) (pin 6))
+      (node (ref U1) (pin C11)))
+    (net (code 88) (name /gpio/P5)
+      (node (ref U1) (pin B11))
+      (node (ref J1) (pin 5)))
+    (net (code 89) (name /gpio/USB5V)
       (node (ref D52) (pin 2)))
-    (net (code 98) (name /gpio/OUT5V)
-      (node (ref D52) (pin 1))
-      (node (ref J1) (pin 2)))
-    (net (code 99) (name /gpio/IN5V)
+    (net (code 90) (name /gpio/IN5V)
       (node (ref D51) (pin 2))
       (node (ref J1) (pin 1)))
-    (net (code 100) (name +5V)
-      (node (ref R3) (pin 1))
-      (node (ref U4) (pin 4))
-      (node (ref C5) (pin 1))
+    (net (code 91) (name +5V)
+      (node (ref C13) (pin 1))
       (node (ref U5) (pin 4))
+      (node (ref R3) (pin 1))
       (node (ref C9) (pin 1))
-      (node (ref Q1) (pin 2))
-      (node (ref D8) (pin 1))
+      (node (ref C5) (pin 1))
       (node (ref GPDI1) (pin 19))
       (node (ref D9) (pin 2))
+      (node (ref D8) (pin 1))
       (node (ref C1) (pin 1))
-      (node (ref U3) (pin 4))
+      (node (ref U4) (pin 4))
       (node (ref D51) (pin 1))
-      (node (ref C13) (pin 1)))
-    (net (code 101) (name +1V2)
-      (node (ref U1) (pin N13))
-      (node (ref L1) (pin 2))
-      (node (ref C2) (pin 1))
-      (node (ref C3) (pin 1))
-      (node (ref U1) (pin L13))
-      (node (ref U1) (pin K13))
-      (node (ref C4) (pin 1))
-      (node (ref U1) (pin M13))
+      (node (ref Q1) (pin 2))
+      (node (ref U3) (pin 4)))
+    (net (code 92) (name /gpio/OUT5V)
+      (node (ref J1) (pin 2))
+      (node (ref D52) (pin 1)))
+    (net (code 93) (name +1V2)
+      (node (ref U1) (pin N12))
       (node (ref U1) (pin H12))
+      (node (ref U1) (pin N8))
+      (node (ref U1) (pin M8))
+      (node (ref U1) (pin N9))
+      (node (ref L1) (pin 2))
+      (node (ref U1) (pin L8))
+      (node (ref U1) (pin K8))
       (node (ref RA1) (pin 1))
       (node (ref U1) (pin N11))
       (node (ref U1) (pin H11))
-      (node (ref U1) (pin K8))
+      (node (ref C3) (pin 1))
+      (node (ref C4) (pin 1))
+      (node (ref C2) (pin 1))
       (node (ref U1) (pin N10))
+      (node (ref U1) (pin H9))
+      (node (ref U1) (pin M13))
+      (node (ref U1) (pin N13))
+      (node (ref U1) (pin H10))
       (node (ref U1) (pin J8))
-      (node (ref U1) (pin N8))
-      (node (ref U1) (pin J13))
-      (node (ref U1) (pin H13))
       (node (ref U1) (pin H8))
-      (node (ref U1) (pin L8))
-      (node (ref U1) (pin M8))
-      (node (ref U1) (pin N12))
-      (node (ref U1) (pin H10))
-      (node (ref U1) (pin N9))
-      (node (ref U1) (pin H9)))
-    (net (code 102) (name "Net-(L2-Pad1)")
+      (node (ref U1) (pin H13))
+      (node (ref U1) (pin J13))
+      (node (ref U1) (pin K13))
+      (node (ref U1) (pin L13)))
+    (net (code 94) (name "Net-(L3-Pad1)")
+      (node (ref U5) (pin 3))
+      (node (ref L3) (pin 1)))
+    (net (code 95) (name "Net-(L2-Pad1)")
       (node (ref U4) (pin 3))
       (node (ref L2) (pin 1)))
-    (net (code 103) (name "Net-(L3-Pad1)")
-      (node (ref L3) (pin 1))
-      (node (ref U5) (pin 3)))
-    (net (code 104) (name "Net-(L1-Pad1)")
+    (net (code 96) (name "Net-(L1-Pad1)")
       (node (ref U3) (pin 3))
       (node (ref L1) (pin 1)))
-    (net (code 105) (name /power/WAKEUPn)
+    (net (code 97) (name /power/WAKEUPn)
       (node (ref R6) (pin 2))
       (node (ref U7) (pin 7)))
-    (net (code 106) (name +2V5)
-      (node (ref C11) (pin 1))
-      (node (ref C12) (pin 1))
-      (node (ref U7) (pin 8))
-      (node (ref U1) (pin F15))
-      (node (ref U1) (pin P6))
-      (node (ref U1) (pin F6))
-      (node (ref U1) (pin P15))
-      (node (ref L3) (pin 2))
-      (node (ref C10) (pin 1))
-      (node (ref RA2) (pin 1)))
-    (net (code 107) (name FTDI_nSUSPEND)
-      (node (ref D13) (pin 2))
-      (node (ref U6) (pin 30)))
-    (net (code 108) (name "Net-(Q2-Pad3)")
-      (node (ref R8) (pin 2))
-      (node (ref Q2) (pin 3)))
-    (net (code 109) (name "Net-(Y1-Pad2)")
-      (node (ref Y1) (pin 2)))
-    (net (code 110) (name "Net-(Y1-Pad3)")
-      (node (ref Y1) (pin 3)))
-    (net (code 111) (name /power/OSCI_32k)
+    (net (code 98) (name /power/VBAT)
+      (node (ref BAT1) (pin 1))
+      (node (ref U7) (pin 3)))
+    (net (code 99) (name /power/OSCI_32k)
       (node (ref U7) (pin 1))
       (node (ref Y1) (pin 1)))
-    (net (code 112) (name /power/OSCO_32k)
-      (node (ref U7) (pin 2))
-      (node (ref Y1) (pin 4)))
-    (net (code 113) (name SHUTDOWN)
-      (node (ref D12) (pin 2)))
-    (net (code 114) (name /power/WKUP)
-      (node (ref C13) (pin 2))
-      (node (ref R3) (pin 2))
+    (net (code 100) (name "Net-(Y1-Pad2)")
+      (node (ref Y1) (pin 2)))
+    (net (code 101) (name "Net-(Y1-Pad3)")
+      (node (ref Y1) (pin 3)))
+    (net (code 102) (name /power/OSCO_32k)
+      (node (ref Y1) (pin 4))
+      (node (ref U7) (pin 2)))
+    (net (code 103) (name "Net-(Q2-Pad3)")
+      (node (ref R8) (pin 2))
+      (node (ref Q2) (pin 3)))
+    (net (code 104) (name SHUTDOWN)
+      (node (ref D12) (pin 2))
+      (node (ref R13) (pin 1)))
+    (net (code 105) (name FTDI_nSUSPEND)
+      (node (ref U6) (pin 30))
+      (node (ref D13) (pin 2)))
+    (net (code 106) (name /power/HOLD)
+      (node (ref R4) (pin 1))
+      (node (ref D11) (pin 1)))
+    (net (code 107) (name /power/WKUP)
       (node (ref Q1) (pin 3))
-      (node (ref D10) (pin 2)))
-    (net (code 115) (name /power/HOLD)
-      (node (ref D11) (pin 1))
-      (node (ref R4) (pin 1)))
-    (net (code 116) (name /power/SHUT)
-      (node (ref D12) (pin 1))
-      (node (ref C14) (pin 1))
+      (node (ref D10) (pin 2))
+      (node (ref C13) (pin 2))
+      (node (ref R3) (pin 2)))
+    (net (code 108) (name /power/SHUT)
+      (node (ref Q2) (pin 1))
       (node (ref R5) (pin 1))
-      (node (ref Q2) (pin 1)))
-    (net (code 117) (name /power/WKn)
+      (node (ref D12) (pin 1))
+      (node (ref C14) (pin 1)))
+    (net (code 109) (name /power/WKn)
       (node (ref R6) (pin 1))
       (node (ref Q1) (pin 1)))
-    (net (code 118) (name /power/WAKE)
-      (node (ref R1) (pin 1))
-      (node (ref D10) (pin 1)))
-    (net (code 119) (name I2C_SCL)
+    (net (code 110) (name /power/WAKE)
+      (node (ref D10) (pin 1))
+      (node (ref R1) (pin 1)))
+    (net (code 111) (name I2C_SCL)
       (node (ref U7) (pin 6)))
-    (net (code 120) (name /power/VBAT)
-      (node (ref U7) (pin 3))
-      (node (ref BAT1) (pin 1)))
-    (net (code 121) (name I2C_SDA)
+    (net (code 112) (name +2V5)
+      (node (ref U1) (pin F6))
+      (node (ref U1) (pin P6))
+      (node (ref L3) (pin 2))
+      (node (ref RA2) (pin 1))
+      (node (ref U1) (pin P15))
+      (node (ref U1) (pin F15))
+      (node (ref C12) (pin 1))
+      (node (ref C11) (pin 1))
+      (node (ref C10) (pin 1))
+      (node (ref U7) (pin 8)))
+    (net (code 113) (name I2C_SDA)
       (node (ref U7) (pin 5)))
-    (net (code 122) (name /power/FB1)
+    (net (code 114) (name /power/FB1)
       (node (ref U3) (pin 5))
+      (node (ref RB1) (pin 2))
       (node (ref RA1) (pin 2))
-      (node (ref C2) (pin 2))
-      (node (ref RB1) (pin 2)))
-    (net (code 123) (name /power/PWREN)
-      (node (ref U4) (pin 1))
+      (node (ref C2) (pin 2)))
+    (net (code 115) (name /power/PWREN)
       (node (ref R2) (pin 1))
-      (node (ref U5) (pin 1))
+      (node (ref R1) (pin 2))
+      (node (ref R8) (pin 1))
       (node (ref D13) (pin 1))
       (node (ref R4) (pin 2))
-      (node (ref U3) (pin 1))
-      (node (ref R8) (pin 1))
-      (node (ref R1) (pin 2)))
-    (net (code 124) (name /power/FB3)
+      (node (ref U4) (pin 1))
+      (node (ref U5) (pin 1))
+      (node (ref U3) (pin 1)))
+    (net (code 116) (name /power/FB3)
       (node (ref C6) (pin 2))
       (node (ref U4) (pin 5))
       (node (ref RA3) (pin 2))
       (node (ref RB3) (pin 2)))
-    (net (code 125) (name /power/FB2)
+    (net (code 117) (name /power/FB2)
+      (node (ref RA2) (pin 2))
       (node (ref U5) (pin 5))
       (node (ref RB2) (pin 2))
-      (node (ref RA2) (pin 2))
       (node (ref C10) (pin 2)))
-    (net (code 126) (name LED1)
+    (net (code 118) (name LED1)
       (node (ref D1) (pin 2)))
-    (net (code 127) (name BTN_R)
+    (net (code 119) (name BTN_R)
       (node (ref BTN6) (pin 2)))
-    (net (code 128) (name BTN_L)
+    (net (code 120) (name BTN_L)
       (node (ref BTN5) (pin 2)))
-    (net (code 129) (name LED7)
+    (net (code 121) (name LED7)
       (node (ref D7) (pin 2)))
-    (net (code 130) (name LED6)
+    (net (code 122) (name LED6)
       (node (ref D6) (pin 2)))
-    (net (code 131) (name LED5)
+    (net (code 123) (name LED5)
       (node (ref D5) (pin 2)))
-    (net (code 132) (name LED4)
+    (net (code 124) (name LED4)
       (node (ref D4) (pin 2)))
-    (net (code 133) (name LED3)
+    (net (code 125) (name LED3)
       (node (ref D3) (pin 2)))
-    (net (code 134) (name LED2)
+    (net (code 126) (name LED2)
       (node (ref D2) (pin 2)))
-    (net (code 135) (name LED0)
+    (net (code 127) (name LED0)
       (node (ref D0) (pin 2)))
-    (net (code 136) (name OLED_DC)
-      (node (ref OLED1) (pin 6)))
-    (net (code 137) (name OLED_CS)
+    (net (code 128) (name OLED_CS)
       (node (ref OLED1) (pin 7)))
-    (net (code 138) (name OLED_RES)
+    (net (code 129) (name "Net-(BTN1-Pad1)")
+      (node (ref BTN6) (pin 1))
+      (node (ref BTN1) (pin 1))
+      (node (ref BTN3) (pin 1))
+      (node (ref R7) (pin 2))
+      (node (ref BTN2) (pin 1))
+      (node (ref BTN4) (pin 1))
+      (node (ref BTN5) (pin 1)))
+    (net (code 130) (name OLED_DC)
+      (node (ref OLED1) (pin 6)))
+    (net (code 131) (name OLED_RES)
       (node (ref OLED1) (pin 5)))
-    (net (code 139) (name OLED_MOSI)
+    (net (code 132) (name OLED_MOSI)
       (node (ref OLED1) (pin 4)))
-    (net (code 140) (name OLED_CLK)
+    (net (code 133) (name OLED_CLK)
       (node (ref OLED1) (pin 3)))
-    (net (code 141) (name BTN_F2)
-      (node (ref BTN2) (pin 2)))
-    (net (code 142) (name BTN_U)
+    (net (code 134) (name BTN_U)
       (node (ref BTN3) (pin 2)))
-    (net (code 143) (name BTN_D)
+    (net (code 135) (name BTN_D)
       (node (ref BTN4) (pin 2)))
-    (net (code 144) (name BTN_F1)
+    (net (code 136) (name BTN_F2)
+      (node (ref BTN2) (pin 2)))
+    (net (code 137) (name BTN_F1)
       (node (ref BTN1) (pin 2)))
-    (net (code 145) (name "Net-(BTN1-Pad1)")
-      (node (ref BTN4) (pin 1))
-      (node (ref BTN1) (pin 1))
-      (node (ref BTN2) (pin 1))
-      (node (ref R7) (pin 2))
-      (node (ref BTN6) (pin 1))
-      (node (ref BTN5) (pin 1))
-      (node (ref BTN3) (pin 1)))
-    (net (code 146) (name GPDI_SDA)
+    (net (code 138) (name GPDI_SDA)
       (node (ref GPDI1) (pin 18)))
-    (net (code 147) (name GPDI_SCL)
+    (net (code 139) (name GPDI_SCL)
       (node (ref GPDI1) (pin 17)))
-    (net (code 148) (name GPDI_CEC)
+    (net (code 140) (name GPDI_CEC)
       (node (ref GPDI1) (pin 15)))
-    (net (code 149) (name GPDI_CLK_N)
+    (net (code 141) (name GPDI_CLK_N)
       (node (ref GPDI1) (pin 14)))
-    (net (code 150) (name GPDI_D0_P)
-      (node (ref GPDI1) (pin 9)))
-    (net (code 151) (name GPDI_CLK_P)
+    (net (code 142) (name GPDI_CLK_P)
       (node (ref GPDI1) (pin 12)))
-    (net (code 152) (name GPDI_D0_N)
+    (net (code 143) (name GPDI_D0_N)
       (node (ref GPDI1) (pin 11)))
-    (net (code 153) (name GPDI_D1_N)
+    (net (code 144) (name GPDI_D0_P)
+      (node (ref GPDI1) (pin 9)))
+    (net (code 145) (name GPDI_D1_N)
       (node (ref GPDI1) (pin 8)))
-    (net (code 154) (name GPDI_D1_P)
+    (net (code 146) (name GPDI_D1_P)
       (node (ref GPDI1) (pin 6)))
-    (net (code 155) (name GPDI_D2_N)
+    (net (code 147) (name GPDI_D2_N)
       (node (ref GPDI1) (pin 5)))
-    (net (code 156) (name GPDI_D2_P)
+    (net (code 148) (name GPDI_D2_P)
       (node (ref GPDI1) (pin 3)))
-    (net (code 157) (name GPDI_ETH_P)
+    (net (code 149) (name GPDI_ETH_P)
       (node (ref GPDI1) (pin 2)))
-    (net (code 158) (name GPDI_ETH_N)
+    (net (code 150) (name GPDI_ETH_N)
       (node (ref GPDI1) (pin 1)))
-    (net (code 159) (name FTDI_nRTS)
-      (node (ref U6) (pin 34)))
-    (net (code 160) (name FTDI_RXD)
+    (net (code 151) (name FTDI_RXD)
       (node (ref U6) (pin 33)))
-    (net (code 161) (name FTDI_TXD)
+    (net (code 152) (name FTDI_TXD)
       (node (ref U6) (pin 32)))
-    (net (code 162) (name JTAG_TMS)
-      (node (ref U2) (pin 7))
+    (net (code 153) (name JTAG_TMS)
       (node (ref U6) (pin 15))
+      (node (ref U2) (pin 7))
       (node (ref U1) (pin U5)))
-    (net (code 163) (name JTAG_TDO)
+    (net (code 154) (name JTAG_TDO)
       (node (ref U2) (pin 5))
-      (node (ref U6) (pin 14))
-      (node (ref U1) (pin V4)))
-    (net (code 164) (name JTAG_TDI)
+      (node (ref U1) (pin V4))
+      (node (ref U6) (pin 14)))
+    (net (code 155) (name JTAG_TDI)
       (node (ref U6) (pin 13))
-      (node (ref U2) (pin 4))
-      (node (ref U1) (pin R5)))
-    (net (code 165) (name JTAG_TCK)
+      (node (ref U1) (pin R5))
+      (node (ref U2) (pin 4)))
+    (net (code 156) (name JTAG_TCK)
       (node (ref U2) (pin 6))
       (node (ref U6) (pin 12))
       (node (ref U1) (pin T5)))
-    (net (code 166) (name FTDI_nCTS)
+    (net (code 157) (name /usb/FTDI_nTXLED)
+      (node (ref U6) (pin 49)))
+    (net (code 158) (name FTDI_nRTS)
+      (node (ref U6) (pin 34)))
+    (net (code 159) (name FTDI_nCTS)
       (node (ref U6) (pin 35)))
-    (net (code 167) (name FTDI_nDTR)
+    (net (code 160) (name FTDI_nDTR)
       (node (ref U6) (pin 37)))
-    (net (code 168) (name FTDI_nDCD)
+    (net (code 161) (name FTDI_nDCD)
       (node (ref U6) (pin 39)))
-    (net (code 169) (name FTDI_nDSR)
+    (net (code 162) (name FTDI_nDSR)
       (node (ref U6) (pin 38)))
-    (net (code 170) (name FTDI_nRI)
+    (net (code 163) (name FTDI_nRI)
       (node (ref U6) (pin 40)))
-    (net (code 171) (name /usb/FTDI_nRXLED)
+    (net (code 164) (name /usb/FTDI_nRXLED)
       (node (ref U6) (pin 48)))
-    (net (code 172) (name /usb/FTDI_nTXLED)
-      (node (ref U6) (pin 49)))
-    (net (code 173) (name /usb/OSCO_12M)
-      (node (ref Y2) (pin 2))
+    (net (code 165) (name /usb/OSCO_12M)
+      (node (ref U6) (pin 4))
       (node (ref C16) (pin 1))
-      (node (ref U6) (pin 4)))
-    (net (code 174) (name /usb/OSCI_12M)
-      (node (ref Y2) (pin 1))
+      (node (ref Y2) (pin 2)))
+    (net (code 166) (name /usb/OSCI_12M)
       (node (ref C15) (pin 1))
-      (node (ref U6) (pin 3)))
-    (net (code 175) (name USB_FTDI_DM)
+      (node (ref U6) (pin 3))
+      (node (ref Y2) (pin 1)))
+    (net (code 167) (name USB_FTDI_DM)
       (node (ref U6) (pin 7))
       (node (ref US1) (pin 2)))
-    (net (code 176) (name USB_FTDI_DP)
+    (net (code 168) (name USB_FTDI_DP)
       (node (ref U6) (pin 8))
       (node (ref US1) (pin 3)))
-    (net (code 177) (name /usb/EECLK)
+    (net (code 169) (name /usb/EECLK)
       (node (ref U6) (pin 56))
       (node (ref U8) (pin 2))
       (node (ref R9) (pin 2)))
-    (net (code 178) (name /usb/EECS)
+    (net (code 170) (name /usb/EECS)
       (node (ref R10) (pin 2))
       (node (ref U6) (pin 1))
       (node (ref U8) (pin 1)))
-    (net (code 179) (name "Net-(U6-Pad10)")
+    (net (code 171) (name "Net-(U6-Pad10)")
       (node (ref U6) (pin 10)))
-    (net (code 180) (name /usb/EEDATA)
+    (net (code 172) (name /usb/EEDATA)
       (node (ref U6) (pin 55))
       (node (ref U8) (pin 3))
       (node (ref R12) (pin 1)))
-    (net (code 181) (name "Net-(R11-Pad2)")
-      (node (ref R12) (pin 2))
+    (net (code 173) (name "Net-(R11-Pad2)")
       (node (ref R11) (pin 2))
+      (node (ref R12) (pin 2))
       (node (ref U8) (pin 4)))
-    (net (code 182) (name "Net-(US2-Pad4)")
+    (net (code 174) (name "Net-(US2-Pad4)")
       (node (ref US2) (pin 4)))
-    (net (code 183) (name "Net-(US1-Pad4)")
+    (net (code 175) (name "Net-(US1-Pad4)")
       (node (ref US1) (pin 4)))
-    (net (code 184) (name USB_FPGA_DP)
+    (net (code 176) (name USB_FPGA_DP)
       (node (ref US2) (pin 3)))
-    (net (code 185) (name USB_FPGA_DM)
+    (net (code 177) (name USB_FPGA_DM)
       (node (ref US2) (pin 2)))
-    (net (code 186) (name "Net-(U6-Pad6)")
+    (net (code 178) (name "Net-(U6-Pad6)")
       (node (ref U6) (pin 6)))
-    (net (code 187) (name "Net-(U6-Pad20)")
+    (net (code 179) (name "Net-(U6-Pad20)")
       (node (ref U6) (pin 20)))
-    (net (code 188) (name "Net-(U6-Pad11)")
+    (net (code 180) (name "Net-(U6-Pad11)")
       (node (ref U6) (pin 11)))
-    (net (code 189) (name /usb/USB5V)
+    (net (code 181) (name /usb/USB5V)
       (node (ref US1) (pin 1))
       (node (ref D8) (pin 2)))
-    (net (code 190) (name "Net-(D9-Pad1)")
+    (net (code 182) (name "Net-(D9-Pad1)")
       (node (ref US2) (pin 1))
       (node (ref D9) (pin 1)))
-    (net (code 191) (name "Net-(U6-Pad29)")
-      (node (ref U6) (pin 29)))
-    (net (code 192) (name "Net-(U6-Pad19)")
+    (net (code 183) (name "Net-(U6-Pad28)")
+      (node (ref U6) (pin 28)))
+    (net (code 184) (name "Net-(U6-Pad19)")
       (node (ref U6) (pin 19)))
-    (net (code 193) (name "Net-(U6-Pad51)")
+    (net (code 185) (name "Net-(U6-Pad29)")
+      (node (ref U6) (pin 29)))
+    (net (code 186) (name "Net-(U6-Pad51)")
       (node (ref U6) (pin 51)))
-    (net (code 194) (name +1V8)
+    (net (code 187) (name +1V8)
       (node (ref U6) (pin 2))
       (node (ref C17) (pin 1))
       (node (ref U6) (pin 31)))
-    (net (code 195) (name "Net-(U6-Pad18)")
-      (node (ref U6) (pin 18)))
-    (net (code 196) (name "Net-(U6-Pad22)")
+    (net (code 188) (name "Net-(U6-Pad22)")
       (node (ref U6) (pin 22)))
-    (net (code 197) (name "Net-(U6-Pad42)")
+    (net (code 189) (name "Net-(U6-Pad42)")
       (node (ref U6) (pin 42)))
-    (net (code 198) (name "Net-(U6-Pad52)")
+    (net (code 190) (name "Net-(U6-Pad52)")
       (node (ref U6) (pin 52)))
-    (net (code 199) (name "Net-(U6-Pad23)")
+    (net (code 191) (name "Net-(U6-Pad23)")
       (node (ref U6) (pin 23)))
-    (net (code 200) (name "Net-(U6-Pad53)")
+    (net (code 192) (name "Net-(U6-Pad53)")
       (node (ref U6) (pin 53)))
-    (net (code 201) (name "Net-(U6-Pad24)")
+    (net (code 193) (name "Net-(U6-Pad24)")
       (node (ref U6) (pin 24)))
-    (net (code 202) (name "Net-(U6-Pad54)")
+    (net (code 194) (name "Net-(U6-Pad54)")
       (node (ref U6) (pin 54)))
-    (net (code 203) (name "Net-(U6-Pad25)")
-      (node (ref U6) (pin 25)))
-    (net (code 204) (name "Net-(U6-Pad28)")
-      (node (ref U6) (pin 28)))
-    (net (code 205) (name "Net-(U6-Pad47)")
+    (net (code 195) (name "Net-(U6-Pad18)")
+      (node (ref U6) (pin 18)))
+    (net (code 196) (name "Net-(U6-Pad47)")
       (node (ref U6) (pin 47)))
-    (net (code 206) (name "Net-(U6-Pad27)")
+    (net (code 197) (name "Net-(U6-Pad27)")
       (node (ref U6) (pin 27)))
-    (net (code 207) (name "Net-(U6-Pad17)")
+    (net (code 198) (name "Net-(U6-Pad17)")
       (node (ref U6) (pin 17)))
-    (net (code 208) (name "Net-(U6-Pad26)")
-      (node (ref U6) (pin 26)))
-    (net (code 209) (name "Net-(U6-Pad46)")
+    (net (code 199) (name "Net-(U6-Pad46)")
       (node (ref U6) (pin 46)))
-    (net (code 210) (name WIFI_RXD)
+    (net (code 200) (name "Net-(U6-Pad26)")
+      (node (ref U6) (pin 26)))
+    (net (code 201) (name "Net-(U6-Pad25)")
+      (node (ref U6) (pin 25)))
+    (net (code 202) (name SD_2)
+      (node (ref U2) (pin 14))
+      (node (ref SD1) (pin 9)))
+    (net (code 203) (name SD_MTCK)
+      (node (ref U2) (pin 13))
+      (node (ref SD1) (pin 5)))
+    (net (code 204) (name SD_MTMS)
+      (node (ref SD1) (pin 2))
+      (node (ref U2) (pin 12)))
+    (net (code 205) (name SD_3)
+      (node (ref SD1) (pin 1))
+      (node (ref U2) (pin 11)))
+    (net (code 206) (name SD_MTDI)
+      (node (ref U2) (pin 10))
+      (node (ref SD1) (pin 8)))
+    (net (code 207) (name SD_MTDO)
+      (node (ref SD1) (pin 7))
+      (node (ref U2) (pin 9)))
+    (net (code 208) (name WIFI_RXD)
       (node (ref U2) (pin 21)))
-    (net (code 211) (name WIFI_TXD)
+    (net (code 209) (name WIFI_TXD)
       (node (ref U2) (pin 22)))
-    (net (code 212) (name WIFI_GPIO0)
+    (net (code 210) (name WIFI_GPIO0)
       (node (ref U2) (pin 18)))
-    (net (code 213) (name WIFI_GPIO2)
+    (net (code 211) (name WIFI_GPIO2)
       (node (ref U2) (pin 17)))
-    (net (code 214) (name WIFI_GPIO15)
+    (net (code 212) (name WIFI_GPIO15)
       (node (ref U2) (pin 16)))
-    (net (code 215) (name WIFI_PD)
+    (net (code 213) (name WIFI_PD)
       (node (ref U2) (pin 3)))
-    (net (code 216) (name WIFI_RESET)
+    (net (code 214) (name WIFI_RESET)
       (node (ref U2) (pin 1)))
-    (net (code 217) (name "Net-(U2-Pad2)")
+    (net (code 215) (name "Net-(U2-Pad2)")
       (node (ref U2) (pin 2)))
-    (net (code 218) (name "Net-(U2-Pad20)")
+    (net (code 216) (name "Net-(U2-Pad20)")
       (node (ref U2) (pin 20)))
-    (net (code 219) (name "Net-(U2-Pad19)")
+    (net (code 217) (name "Net-(U2-Pad19)")
       (node (ref U2) (pin 19)))
-    (net (code 220) (name "Net-(RAM1-Pad11)")
-      (node (ref RAM1) (pin 11)))
-    (net (code 221) (name "Net-(RAM1-Pad26)")
-      (node (ref RAM1) (pin 26)))
-    (net (code 222) (name "Net-(RAM1-Pad16)")
-      (node (ref RAM1) (pin 16)))
-    (net (code 223) (name "Net-(RAM1-Pad45)")
-      (node (ref RAM1) (pin 45)))
-    (net (code 224) (name "Net-(RAM1-Pad35)")
-      (node (ref RAM1) (pin 35)))
-    (net (code 225) (name "Net-(RAM1-Pad25)")
-      (node (ref RAM1) (pin 25)))
-    (net (code 226) (name "Net-(RAM1-Pad15)")
-      (node (ref RAM1) (pin 15)))
-    (net (code 227) (name "Net-(RAM1-Pad54)")
-      (node (ref RAM1) (pin 54)))
-    (net (code 228) (name "Net-(RAM1-Pad44)")
-      (node (ref RAM1) (pin 44)))
-    (net (code 229) (name "Net-(RAM1-Pad34)")
-      (node (ref RAM1) (pin 34)))
-    (net (code 230) (name "Net-(RAM1-Pad24)")
-      (node (ref RAM1) (pin 24)))
-    (net (code 231) (name "Net-(RAM1-Pad14)")
-      (node (ref RAM1) (pin 14)))
-    (net (code 232) (name "Net-(RAM1-Pad53)")
-      (node (ref RAM1) (pin 53)))
-    (net (code 233) (name "Net-(RAM1-Pad46)")
-      (node (ref RAM1) (pin 46)))
-    (net (code 234) (name "Net-(RAM1-Pad17)")
-      (node (ref RAM1) (pin 17)))
-    (net (code 235) (name "Net-(RAM1-Pad27)")
-      (node (ref RAM1) (pin 27)))
-    (net (code 236) (name "Net-(RAM1-Pad37)")
-      (node (ref RAM1) (pin 37)))
-    (net (code 237) (name "Net-(RAM1-Pad47)")
-      (node (ref RAM1) (pin 47)))
-    (net (code 238) (name "Net-(RAM1-Pad18)")
-      (node (ref RAM1) (pin 18)))
-    (net (code 239) (name "Net-(RAM1-Pad28)")
-      (node (ref RAM1) (pin 28)))
-    (net (code 240) (name "Net-(RAM1-Pad38)")
-      (node (ref RAM1) (pin 38)))
-    (net (code 241) (name "Net-(RAM1-Pad48)")
-      (node (ref RAM1) (pin 48)))
-    (net (code 242) (name "Net-(RAM1-Pad19)")
-      (node (ref RAM1) (pin 19)))
-    (net (code 243) (name "Net-(RAM1-Pad29)")
-      (node (ref RAM1) (pin 29)))
-    (net (code 244) (name "Net-(RAM1-Pad39)")
-      (node (ref RAM1) (pin 39)))
-    (net (code 245) (name "Net-(RAM1-Pad49)")
-      (node (ref RAM1) (pin 49)))
-    (net (code 246) (name "Net-(RAM1-Pad33)")
-      (node (ref RAM1) (pin 33)))
-    (net (code 247) (name "Net-(RAM1-Pad1)")
-      (node (ref RAM1) (pin 1)))
-    (net (code 248) (name "Net-(RAM1-Pad2)")
-      (node (ref RAM1) (pin 2)))
-    (net (code 249) (name "Net-(RAM1-Pad3)")
-      (node (ref RAM1) (pin 3)))
-    (net (code 250) (name "Net-(RAM1-Pad4)")
-      (node (ref RAM1) (pin 4)))
-    (net (code 251) (name "Net-(RAM1-Pad5)")
-      (node (ref RAM1) (pin 5)))
-    (net (code 252) (name "Net-(RAM1-Pad6)")
-      (node (ref RAM1) (pin 6)))
-    (net (code 253) (name "Net-(RAM1-Pad7)")
-      (node (ref RAM1) (pin 7)))
-    (net (code 254) (name "Net-(RAM1-Pad8)")
-      (node (ref RAM1) (pin 8)))
-    (net (code 255) (name "Net-(RAM1-Pad9)")
-      (node (ref RAM1) (pin 9)))
-    (net (code 256) (name "Net-(RAM1-Pad10)")
-      (node (ref RAM1) (pin 10)))
-    (net (code 257) (name "Net-(RAM1-Pad20)")
-      (node (ref RAM1) (pin 20)))
-    (net (code 258) (name "Net-(RAM1-Pad30)")
-      (node (ref RAM1) (pin 30)))
-    (net (code 259) (name "Net-(RAM1-Pad21)")
-      (node (ref RAM1) (pin 21)))
-    (net (code 260) (name "Net-(RAM1-Pad43)")
-      (node (ref RAM1) (pin 43)))
-    (net (code 261) (name "Net-(RAM1-Pad23)")
-      (node (ref RAM1) (pin 23)))
-    (net (code 262) (name "Net-(RAM1-Pad13)")
-      (node (ref RAM1) (pin 13)))
-    (net (code 263) (name "Net-(RAM1-Pad52)")
-      (node (ref RAM1) (pin 52)))
-    (net (code 264) (name "Net-(RAM1-Pad42)")
-      (node (ref RAM1) (pin 42)))
-    (net (code 265) (name "Net-(RAM1-Pad32)")
-      (node (ref RAM1) (pin 32)))
-    (net (code 266) (name "Net-(RAM1-Pad22)")
-      (node (ref RAM1) (pin 22)))
-    (net (code 267) (name "Net-(RAM1-Pad12)")
-      (node (ref RAM1) (pin 12)))
-    (net (code 268) (name "Net-(RAM1-Pad51)")
-      (node (ref RAM1) (pin 51)))
-    (net (code 269) (name "Net-(RAM1-Pad41)")
-      (node (ref RAM1) (pin 41)))
-    (net (code 270) (name "Net-(RAM1-Pad31)")
-      (node (ref RAM1) (pin 31)))
-    (net (code 271) (name "Net-(RAM1-Pad50)")
-      (node (ref RAM1) (pin 50)))
-    (net (code 272) (name "Net-(AUDIO1-Pad1)")
-      (node (ref AUDIO1) (pin 1)))
-    (net (code 273) (name "Net-(AUDIO1-Pad2)")
-      (node (ref AUDIO1) (pin 2)))
-    (net (code 274) (name "Net-(AUDIO1-Pad3)")
-      (node (ref AUDIO1) (pin 3)))
+    (net (code 218) (name "Net-(U9-Pad46)")
+      (node (ref U9) (pin 46)))
+    (net (code 219) (name "Net-(U9-Pad26)")
+      (node (ref U9) (pin 26)))
+    (net (code 220) (name "Net-(U9-Pad16)")
+      (node (ref U9) (pin 16)))
+    (net (code 221) (name "Net-(U9-Pad45)")
+      (node (ref U9) (pin 45)))
+    (net (code 222) (name "Net-(U9-Pad35)")
+      (node (ref U9) (pin 35)))
+    (net (code 223) (name "Net-(U9-Pad25)")
+      (node (ref U9) (pin 25)))
+    (net (code 224) (name "Net-(U9-Pad15)")
+      (node (ref U9) (pin 15)))
+    (net (code 225) (name "Net-(U9-Pad54)")
+      (node (ref U9) (pin 54)))
+    (net (code 226) (name "Net-(U9-Pad44)")
+      (node (ref U9) (pin 44)))
+    (net (code 227) (name "Net-(U9-Pad34)")
+      (node (ref U9) (pin 34)))
+    (net (code 228) (name "Net-(U9-Pad24)")
+      (node (ref U9) (pin 24)))
+    (net (code 229) (name "Net-(U9-Pad14)")
+      (node (ref U9) (pin 14)))
+    (net (code 230) (name "Net-(U9-Pad53)")
+      (node (ref U9) (pin 53)))
+    (net (code 231) (name "Net-(U9-Pad17)")
+      (node (ref U9) (pin 17)))
+    (net (code 232) (name "Net-(U9-Pad27)")
+      (node (ref U9) (pin 27)))
+    (net (code 233) (name "Net-(U9-Pad37)")
+      (node (ref U9) (pin 37)))
+    (net (code 234) (name "Net-(U9-Pad47)")
+      (node (ref U9) (pin 47)))
+    (net (code 235) (name "Net-(U9-Pad18)")
+      (node (ref U9) (pin 18)))
+    (net (code 236) (name "Net-(U9-Pad28)")
+      (node (ref U9) (pin 28)))
+    (net (code 237) (name "Net-(U9-Pad38)")
+      (node (ref U9) (pin 38)))
+    (net (code 238) (name "Net-(U9-Pad48)")
+      (node (ref U9) (pin 48)))
+    (net (code 239) (name "Net-(U9-Pad19)")
+      (node (ref U9) (pin 19)))
+    (net (code 240) (name "Net-(U9-Pad29)")
+      (node (ref U9) (pin 29)))
+    (net (code 241) (name "Net-(U9-Pad39)")
+      (node (ref U9) (pin 39)))
+    (net (code 242) (name "Net-(U9-Pad49)")
+      (node (ref U9) (pin 49)))
+    (net (code 243) (name "Net-(U9-Pad13)")
+      (node (ref U9) (pin 13)))
+    (net (code 244) (name "Net-(U9-Pad33)")
+      (node (ref U9) (pin 33)))
+    (net (code 245) (name "Net-(U9-Pad1)")
+      (node (ref U9) (pin 1)))
+    (net (code 246) (name "Net-(U9-Pad2)")
+      (node (ref U9) (pin 2)))
+    (net (code 247) (name "Net-(U9-Pad3)")
+      (node (ref U9) (pin 3)))
+    (net (code 248) (name "Net-(U9-Pad4)")
+      (node (ref U9) (pin 4)))
+    (net (code 249) (name "Net-(U9-Pad5)")
+      (node (ref U9) (pin 5)))
+    (net (code 250) (name "Net-(U9-Pad6)")
+      (node (ref U9) (pin 6)))
+    (net (code 251) (name "Net-(U9-Pad7)")
+      (node (ref U9) (pin 7)))
+    (net (code 252) (name "Net-(U9-Pad8)")
+      (node (ref U9) (pin 8)))
+    (net (code 253) (name "Net-(U9-Pad9)")
+      (node (ref U9) (pin 9)))
+    (net (code 254) (name "Net-(U9-Pad10)")
+      (node (ref U9) (pin 10)))
+    (net (code 255) (name "Net-(U9-Pad20)")
+      (node (ref U9) (pin 20)))
+    (net (code 256) (name "Net-(U9-Pad30)")
+      (node (ref U9) (pin 30)))
+    (net (code 257) (name "Net-(U9-Pad50)")
+      (node (ref U9) (pin 50)))
+    (net (code 258) (name "Net-(U9-Pad21)")
+      (node (ref U9) (pin 21)))
+    (net (code 259) (name "Net-(U9-Pad11)")
+      (node (ref U9) (pin 11)))
+    (net (code 260) (name "Net-(U9-Pad23)")
+      (node (ref U9) (pin 23)))
+    (net (code 261) (name "Net-(U9-Pad43)")
+      (node (ref U9) (pin 43)))
+    (net (code 262) (name "Net-(U9-Pad52)")
+      (node (ref U9) (pin 52)))
+    (net (code 263) (name "Net-(U9-Pad42)")
+      (node (ref U9) (pin 42)))
+    (net (code 264) (name "Net-(U9-Pad32)")
+      (node (ref U9) (pin 32)))
+    (net (code 265) (name "Net-(U9-Pad22)")
+      (node (ref U9) (pin 22)))
+    (net (code 266) (name "Net-(U9-Pad12)")
+      (node (ref U9) (pin 12)))
+    (net (code 267) (name "Net-(U9-Pad51)")
+      (node (ref U9) (pin 51)))
+    (net (code 268) (name "Net-(U9-Pad41)")
+      (node (ref U9) (pin 41)))
+    (net (code 269) (name "Net-(U9-Pad31)")
+      (node (ref U9) (pin 31)))
+    (net (code 270) (name "Net-(AUDIO1-Pad3)")
+      (node (ref AUDIO1) (pin 3))
+      (node (ref R21) (pin 2))
+      (node (ref R20) (pin 2))
+      (node (ref R19) (pin 2))
+      (node (ref R18) (pin 2)))
+    (net (code 271) (name AUDIO_R3)
+      (node (ref R18) (pin 1)))
+    (net (code 272) (name AUDIO_R2)
+      (node (ref R19) (pin 1)))
+    (net (code 273) (name AUDIO_R1)
+      (node (ref R20) (pin 1)))
+    (net (code 274) (name AUDIO_R0)
+      (node (ref R21) (pin 1)))
     (net (code 275) (name "Net-(AUDIO1-Pad4)")
       (node (ref AUDIO1) (pin 4)))
     (net (code 276) (name "Net-(AUDIO1-Pad5)")
       (node (ref AUDIO1) (pin 5)))
     (net (code 277) (name "Net-(AUDIO1-Pad6)")
-      (node (ref AUDIO1) (pin 6)))))
+      (node (ref AUDIO1) (pin 6)))
+    (net (code 278) (name AUDIO_L0)
+      (node (ref R17) (pin 1)))
+    (net (code 279) (name AUDIO_L1)
+      (node (ref R16) (pin 1)))
+    (net (code 280) (name AUDIO_L2)
+      (node (ref R15) (pin 1)))
+    (net (code 281) (name "Net-(AUDIO1-Pad1)")
+      (node (ref R14) (pin 2))
+      (node (ref R17) (pin 2))
+      (node (ref R16) (pin 2))
+      (node (ref R15) (pin 2))
+      (node (ref AUDIO1) (pin 1)))
+    (net (code 282) (name AUDIO_L3)
+      (node (ref R14) (pin 1)))
+    (net (code 283) (name SD_CD)
+      (node (ref SD1) (pin 10)))
+    (net (code 284) (name SD_WP)
+      (node (ref SD1) (pin 11)))))

ulx3s.sch

@@ -39,7 +39,7 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 1 9
+Sheet 1 10
 Title "ULX3S"
 Date ""
 Rev "0.0.1"
@@ -49,29 +49,6 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-$Comp
-L SD_Card SD1
-U 1 1 56ACBF19
-P 3300 6250
-F 0 "SD1" H 2650 6800 50  0000 C CNN
-F 1 "SD_Card" H 3900 5700 50  0000 C CNN
-F 2 "micro-sd:MicroSD_TF02D" H 3500 6600 50  0000 C CNN
-F 3 "" H 3300 6250 60  0000 C CNN
-	1    3300 6250
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	2400 5850 2300 5850
-Wire Wire Line
-	2300 5950 2400 5950
-Wire Wire Line
-	2300 6050 2400 6050
-Wire Wire Line
-	2400 6350 2300 6350
-Wire Wire Line
-	2300 6550 2400 6550
-Wire Wire Line
-	2300 6650 2400 6650
 $Sheet
 S 7000 5900 750  450 
 U 56AC389C
@@ -84,71 +61,6 @@ U 58D51CAD
 F0 "power" 60
 F1 "power.sch" 60
 $EndSheet
-Wire Wire Line
-	1850 6150 2400 6150
-Wire Wire Line
-	1700 6250 2400 6250
-Wire Wire Line
-	1850 6450 2400 6450
-$Comp
-L GND #PWR01
-U 1 1 58D58197
-P 1850 6150
-F 0 "#PWR01" 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
-	1    1850 6150
-	0    1    1    0   
-$EndComp
-$Comp
-L GND #PWR02
-U 1 1 58D581BF
-P 1850 6450
-F 0 "#PWR02" 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
-	1    1850 6450
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	4200 6050 4600 6050
-Text Label 4250 6050 0    60   ~ 0
-SD_CD
-Wire Wire Line
-	4200 6150 4600 6150
-Text Label 4250 6150 0    60   ~ 0
-SD_WP
-$Comp
-L GND #PWR03
-U 1 1 58D58733
-P 4300 6550
-F 0 "#PWR03" 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
-	1    4300 6550
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	4200 6350 4300 6350
-Wire Wire Line
-	4300 6350 4300 6550
-Wire Wire Line
-	4200 6450 4300 6450
-Connection ~ 4300 6450
-$Comp
-L +3V3 #PWR04
-U 1 1 58D5F123
-P 1700 6250
-F 0 "#PWR04" 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
-	1    1700 6250
-	0    -1   -1   0   
-$EndComp
 $Sheet
 S 8700 5250 750  450 
 U 58D6547C
@@ -181,26 +93,16 @@ U 58D6D507
 F0 "ram" 60
 F1 "ram.sch" 60
 $EndSheet
-Text GLabel 2300 5850 0    60   Input ~ 0
-SD_2
-Text GLabel 2300 5950 0    60   Input ~ 0
-SD_3
-Text GLabel 2300 6050 0    60   Input ~ 0
-SD_MTMS
-Text GLabel 2300 6350 0    60   Input ~ 0
-SD_MTCK
-Text GLabel 2300 6550 0    60   Input ~ 0
-SD_MTDO
-Text GLabel 2300 6650 0    60   Input ~ 0
-SD_MTDI
-Text GLabel 4600 6050 2    60   Input ~ 0
-SD_CD
-Text GLabel 4600 6150 2    60   Input ~ 0
-SD_WP
 $Sheet
 S 8700 5900 750  450 
 U 58D82BD0
 F0 "analog" 60
 F1 "analog.sch" 60
 $EndSheet
+$Sheet
+S 10400 5250 750  450 
+U 58DA7327
+F0 "sdcard" 60
+F1 "sdcard.sch" 60
+$EndSheet
 $EndSCHEMATC

usb.bak

@@ -39,7 +39,7 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 6 9
+Sheet 6 10
 Title "ULX3S"
 Date ""
 Rev "0.0.1"
@@ -65,10 +65,10 @@ Wire Wire Line
 Wire Wire Line
 	2750 1700 2800 1700
 $Comp
-L +5V #PWR71
+L +5V #PWR67
 U 1 1 58D6C83B
 P 2800 1700
-F 0 "#PWR71" H 2800 1550 50  0001 C CNN
+F 0 "#PWR67" 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
@@ -93,10 +93,10 @@ $EndComp
 Wire Wire Line
 	1800 2650 2550 2650
 $Comp
-L +5V #PWR72
+L +5V #PWR68
 U 1 1 58D6C83D
 P 2850 2650
-F 0 "#PWR72" H 2850 2500 50  0001 C CNN
+F 0 "#PWR68" 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
@@ -126,10 +126,10 @@ F 3 "" V 1450 2750 50  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L GND #PWR66
+L GND #PWR62
 U 1 1 58D6C842
 P 1900 2100
-F 0 "#PWR66" H 1900 1850 50  0001 C CNN
+F 0 "#PWR62" 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
@@ -141,10 +141,10 @@ Wire Wire Line
 Wire Wire Line
 	1800 3050 1900 3050
 $Comp
-L GND #PWR67
+L GND #PWR63
 U 1 1 58D6C843
 P 1900 3050
-F 0 "#PWR67" H 1900 2800 50  0001 C CNN
+F 0 "#PWR63" 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
@@ -174,10 +174,10 @@ Wire Wire Line
 	1800 2000 1850 2000
 NoConn ~ 1850 2000
 $Comp
-L GND #PWR64
+L GND #PWR60
 U 1 1 58D82518
 P 1400 2300
-F 0 "#PWR64" H 1400 2050 50  0001 C CNN
+F 0 "#PWR60" 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
@@ -185,10 +185,10 @@ F 3 "" H 1400 2300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR65
+L GND #PWR61
 U 1 1 58D8254A
 P 1400 3250
-F 0 "#PWR65" H 1400 3000 50  0001 C CNN
+F 0 "#PWR61" 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
@@ -207,10 +207,10 @@ F 3 "" H 5550 3400 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR79
+L GND #PWR75
 U 1 1 58D8877C
 P 5550 5750
-F 0 "#PWR79" H 5550 5500 50  0001 C CNN
+F 0 "#PWR75" H 5550 5500 50  0001 C CNN
 F 1 "GND" H 5550 5600 50  0000 C CNN
 F 2 "" H 5550 5750 50  0000 C CNN
 F 3 "" H 5550 5750 50  0000 C CNN
@@ -222,37 +222,29 @@ Wire Wire Line
 Wire Wire Line
 	5650 5650 5650 5550
 Wire Wire Line
-	5550 5550 5550 5650
-Wire Wire Line
-	5550 5650 5550 5750
+	5550 5550 5550 5750
 Connection ~ 5550 5650
 Wire Wire Line
 	5650 1250 5650 1150
 Wire Wire Line
-	5650 1150 5750 1150
-Wire Wire Line
-	5750 1150 5850 1150
+	5650 1150 5850 1150
 Wire Wire Line
 	5850 1150 5850 1250
 Wire Wire Line
-	5750 1050 5750 1150
-Wire Wire Line
-	5750 1150 5750 1250
+	5750 1050 5750 1250
 Connection ~ 5750 1150
 Wire Wire Line
-	5400 1050 5400 1150
-Wire Wire Line
-	5400 1150 5400 1250
+	5400 1050 5400 1250
 Wire Wire Line
 	5400 1150 5500 1150
 Wire Wire Line
 	5500 1150 5500 1250
 Connection ~ 5400 1150
 $Comp
-L +1V8 #PWR75
+L +1V8 #PWR71
 U 1 1 58D88D43
 P 4150 1800
-F 0 "#PWR75" H 4150 1650 50  0001 C CNN
+F 0 "#PWR71" H 4150 1650 50  0001 C CNN
 F 1 "+1V8" H 4150 1940 50  0000 C CNN
 F 2 "" H 4150 1800 50  0000 C CNN
 F 3 "" H 4150 1800 50  0000 C CNN
@@ -260,9 +252,7 @@ F 3 "" H 4150 1800 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	4150 1800 4200 1800
-Wire Wire Line
-	4200 1800 4250 1800
+	4150 1800 4250 1800
 Wire Wire Line
 	4200 1800 4200 1850
 Connection ~ 4200 1800
@@ -278,10 +268,10 @@ F 3 "" H 4200 2000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR76
+L GND #PWR72
 U 1 1 58D88E02
 P 4200 2200
-F 0 "#PWR76" H 4200 1950 50  0001 C CNN
+F 0 "#PWR72" H 4200 1950 50  0001 C CNN
 F 1 "GND" H 4200 2050 50  0000 C CNN
 F 2 "" H 4200 2200 50  0000 C CNN
 F 3 "" H 4200 2200 50  0000 C CNN
@@ -291,19 +281,17 @@ $EndComp
 Wire Wire Line
 	4200 2150 4200 2200
 Wire Wire Line
-	5050 1050 5050 1150
-Wire Wire Line
-	5050 1150 5050 1250
+	5050 1050 5050 1250
 Wire Wire Line
 	5050 1150 5150 1150
 Wire Wire Line
 	5150 1150 5150 1250
 Connection ~ 5050 1150
 $Comp
-L +1V8 #PWR78
+L +1V8 #PWR74
 U 1 1 58D88EF8
 P 5400 1050
-F 0 "#PWR78" H 5400 900 50  0001 C CNN
+F 0 "#PWR74" H 5400 900 50  0001 C CNN
 F 1 "+1V8" H 5400 1190 50  0000 C CNN
 F 2 "" H 5400 1050 50  0000 C CNN
 F 3 "" H 5400 1050 50  0000 C CNN
@@ -311,10 +299,10 @@ F 3 "" H 5400 1050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR80
+L +3V3 #PWR76
 U 1 1 58D88F34
 P 5750 1050
-F 0 "#PWR80" H 5750 900 50  0001 C CNN
+F 0 "#PWR76" H 5750 900 50  0001 C CNN
 F 1 "+3V3" H 5750 1190 50  0000 C CNN
 F 2 "" H 5750 1050 50  0000 C CNN
 F 3 "" H 5750 1050 50  0000 C CNN
@@ -322,10 +310,10 @@ F 3 "" H 5750 1050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR74
+L +3V3 #PWR70
 U 1 1 58D893C4
 P 4050 1650
-F 0 "#PWR74" H 4050 1500 50  0001 C CNN
+F 0 "#PWR70" H 4050 1500 50  0001 C CNN
 F 1 "+3V3" H 4050 1790 50  0000 C CNN
 F 2 "" H 4050 1650 50  0000 C CNN
 F 3 "" H 4050 1650 50  0000 C CNN
@@ -335,10 +323,10 @@ $EndComp
 Wire Wire Line
 	4050 1650 4250 1650
 $Comp
-L +3V3 #PWR77
+L +3V3 #PWR73
 U 1 1 58D89CFD
 P 5050 1050
-F 0 "#PWR77" H 5050 900 50  0001 C CNN
+F 0 "#PWR73" H 5050 900 50  0001 C CNN
 F 1 "+3V3" H 5050 1190 50  0000 C CNN
 F 2 "" H 5050 1050 50  0000 C CNN
 F 3 "" H 5050 1050 50  0000 C CNN
@@ -357,13 +345,9 @@ F 3 "" H 3650 4850 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	3450 4700 3650 4700
-Wire Wire Line
-	3650 4700 4250 4700
+	3450 4700 4250 4700
 Wire Wire Line
-	3450 5000 3650 5000
-Wire Wire Line
-	3650 5000 4250 5000
+	3450 5000 4250 5000
 Text Label 3750 4700 0    60   ~ 0
 OSCI_12M
 Text Label 3750 5000 0    60   ~ 0
@@ -386,7 +370,7 @@ U 1 1 58D8C14C
 P 3300 4700
 F 0 "C15" H 3325 4800 50  0000 L CNN
 F 1 "27pF" H 3325 4600 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 3338 4550 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3338 4550 50  0001 C CNN
 F 3 "" H 3300 4700 50  0000 C CNN
 	1    3300 4700
 	0    1    1    0   
@@ -397,7 +381,7 @@ U 1 1 58D8C189
 P 3300 5000
 F 0 "C16" H 3325 5100 50  0000 L CNN
 F 1 "27pF" H 3325 4900 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 3338 4850 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3338 4850 50  0001 C CNN
 F 3 "" H 3300 5000 50  0000 C CNN
 	1    3300 5000
 	0    1    1    0   
@@ -407,17 +391,15 @@ Connection ~ 3650 5000
 Wire Wire Line
 	3150 4700 3050 4700
 Wire Wire Line
-	3050 4700 3050 5000
-Wire Wire Line
-	3050 5000 3050 5200
+	3050 4700 3050 5200
 Wire Wire Line
 	3150 5000 3050 5000
 Connection ~ 3050 5000
 $Comp
-L GND #PWR73
+L GND #PWR69
 U 1 1 58D8C2A8
 P 3050 5200
-F 0 "#PWR73" H 3050 4950 50  0001 C CNN
+F 0 "#PWR69" H 3050 4950 50  0001 C CNN
 F 1 "GND" H 3050 5050 50  0000 C CNN
 F 2 "" H 3050 5200 50  0000 C CNN
 F 3 "" H 3050 5200 50  0000 C CNN
@@ -481,11 +463,7 @@ FTDI_nRXLED
 Text Label 6950 4600 0    60   ~ 0
 FTDI_nTXLED
 Wire Wire Line
-	5450 5650 5550 5650
-Wire Wire Line
-	5550 5650 5650 5650
-Wire Wire Line
-	5650 5650 5850 5650
+	5450 5650 5850 5650
 Wire Wire Line
 	5850 5650 5850 5550
 Connection ~ 5650 5650
@@ -521,10 +499,10 @@ F 3 "" H 1650 4750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR62
+L +3V3 #PWR58
 U 1 1 58D8D327
 P 1350 4450
-F 0 "#PWR62" H 1350 4300 50  0001 C CNN
+F 0 "#PWR58" H 1350 4300 50  0001 C CNN
 F 1 "+3V3" H 1350 4590 50  0000 C CNN
 F 2 "" H 1350 4450 50  0000 C CNN
 F 3 "" H 1350 4450 50  0000 C CNN
@@ -532,10 +510,10 @@ F 3 "" H 1350 4450 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR70
+L +3V3 #PWR66
 U 1 1 58D8D351
 P 2150 4750
-F 0 "#PWR70" H 2150 4600 50  0001 C CNN
+F 0 "#PWR66" H 2150 4600 50  0001 C CNN
 F 1 "+3V3" H 2150 4890 50  0000 C CNN
 F 2 "" H 2150 4750 50  0000 C CNN
 F 3 "" H 2150 4750 50  0000 C CNN
@@ -543,10 +521,10 @@ F 3 "" H 2150 4750 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR63
+L GND #PWR59
 U 1 1 58D8D37B
 P 1350 4750
-F 0 "#PWR63" H 1350 4500 50  0001 C CNN
+F 0 "#PWR59" H 1350 4500 50  0001 C CNN
 F 1 "GND" H 1350 4600 50  0000 C CNN
 F 2 "" H 1350 4750 50  0000 C CNN
 F 3 "" H 1350 4750 50  0000 C CNN
@@ -559,15 +537,13 @@ U 1 1 58D8D814
 P 2400 4550
 F 0 "R12" V 2480 4550 50  0000 C CNN
 F 1 "2.2k" V 2400 4550 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 2330 4550 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 2330 4550 50  0001 C CNN
 F 3 "" H 2400 4550 50  0000 C CNN
 	1    2400 4550
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	1950 4550 2100 4550
-Wire Wire Line
-	2100 4550 2250 4550
+	1950 4550 2250 4550
 Wire Wire Line
 	1950 4450 2650 4450
 Wire Wire Line
@@ -602,7 +578,7 @@ U 1 1 58D8DC49
 P 2100 4200
 F 0 "R11" V 2180 4200 50  0000 C CNN
 F 1 "10k" V 2100 4200 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 2030 4200 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 2030 4200 50  0001 C CNN
 F 3 "" H 2100 4200 50  0000 C CNN
 	1    2100 4200
 	1    0    0    -1  
@@ -613,7 +589,7 @@ U 1 1 58D8DCBE
 P 850 4250
 F 0 "R10" V 930 4250 50  0000 C CNN
 F 1 "10k" V 850 4250 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 780 4250 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 780 4250 50  0001 C CNN
 F 3 "" H 850 4250 50  0000 C CNN
 	1    850  4250
 	1    0    0    -1  
@@ -624,7 +600,7 @@ U 1 1 58D8DD25
 P 700 4250
 F 0 "R9" V 780 4250 50  0000 C CNN
 F 1 "10k" V 700 4250 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 630 4250 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 630 4250 50  0001 C CNN
 F 3 "" H 700 4250 50  0000 C CNN
 	1    700  4250
 	1    0    0    -1  
@@ -634,10 +610,10 @@ Wire Wire Line
 Wire Wire Line
 	850  4550 850  4400
 $Comp
-L +3V3 #PWR61
+L +3V3 #PWR57
 U 1 1 58D8E00C
 P 700 4000
-F 0 "#PWR61" H 700 3850 50  0001 C CNN
+F 0 "#PWR57" H 700 3850 50  0001 C CNN
 F 1 "+3V3" H 700 4140 50  0000 C CNN
 F 2 "" H 700 4000 50  0000 C CNN
 F 3 "" H 700 4000 50  0000 C CNN
@@ -645,19 +621,17 @@ F 3 "" H 700 4000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	700  4000 700  4050
-Wire Wire Line
-	700  4050 700  4100
+	700  4000 700  4100
 Wire Wire Line
 	700  4050 850  4050
 Wire Wire Line
 	850  4050 850  4100
 Connection ~ 700  4050
 $Comp
-L +3V3 #PWR69
+L +3V3 #PWR65
 U 1 1 58D8E1C0
 P 2100 3950
-F 0 "#PWR69" H 2100 3800 50  0001 C CNN
+F 0 "#PWR65" H 2100 3800 50  0001 C CNN
 F 1 "+3V3" H 2100 4090 50  0000 C CNN
 F 2 "" H 2100 3950 50  0000 C CNN
 F 3 "" H 2100 3950 50  0000 C CNN
@@ -670,10 +644,10 @@ Connection ~ 2100 4550
 Wire Wire Line
 	2100 4350 2100 4550
 $Comp
-L GND #PWR68
+L GND #PWR64
 U 1 1 58D8EDE4
 P 2000 4650
-F 0 "#PWR68" H 2000 4400 50  0001 C CNN
+F 0 "#PWR64" H 2000 4400 50  0001 C CNN
 F 1 "GND" H 2000 4500 50  0000 C CNN
 F 2 "" H 2000 4650 50  0000 C CNN
 F 3 "" H 2000 4650 50  0000 C CNN
@@ -684,4 +658,6 @@ Wire Wire Line
 	1950 4650 2000 4650
 Wire Wire Line
 	1950 4750 2150 4750
+Text Notes 4100 1400 0    60   ~ 0
+todo:\nVPHY and VPLL\nneed LC network
 $EndSCHEMATC

usb.sch

@@ -39,7 +39,7 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 6 9
+Sheet 6 10
 Title "ULX3S"
 Date ""
 Rev "0.0.1"
@@ -65,10 +65,10 @@ Wire Wire Line
 Wire Wire Line
 	2750 1700 2800 1700
 $Comp
-L +5V #PWR061
+L +5V #PWR057
 U 1 1 58D6C83B
 P 2800 1700
-F 0 "#PWR061" H 2800 1550 50  0001 C CNN
+F 0 "#PWR057" 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
@@ -93,10 +93,10 @@ $EndComp
 Wire Wire Line
 	1800 2650 2550 2650
 $Comp
-L +5V #PWR062
+L +5V #PWR058
 U 1 1 58D6C83D
 P 2850 2650
-F 0 "#PWR062" H 2850 2500 50  0001 C CNN
+F 0 "#PWR058" 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
@@ -126,10 +126,10 @@ F 3 "" V 1450 2750 50  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L GND #PWR063
+L GND #PWR059
 U 1 1 58D6C842
 P 1900 2100
-F 0 "#PWR063" H 1900 1850 50  0001 C CNN
+F 0 "#PWR059" 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
@@ -141,10 +141,10 @@ Wire Wire Line
 Wire Wire Line
 	1800 3050 1900 3050
 $Comp
-L GND #PWR064
+L GND #PWR060
 U 1 1 58D6C843
 P 1900 3050
-F 0 "#PWR064" H 1900 2800 50  0001 C CNN
+F 0 "#PWR060" 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
@@ -174,10 +174,10 @@ Wire Wire Line
 	1800 2000 1850 2000
 NoConn ~ 1850 2000
 $Comp
-L GND #PWR065
+L GND #PWR061
 U 1 1 58D82518
 P 1400 2300
-F 0 "#PWR065" H 1400 2050 50  0001 C CNN
+F 0 "#PWR061" 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
@@ -185,10 +185,10 @@ F 3 "" H 1400 2300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR066
+L GND #PWR062
 U 1 1 58D8254A
 P 1400 3250
-F 0 "#PWR066" H 1400 3000 50  0001 C CNN
+F 0 "#PWR062" 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
@@ -207,10 +207,10 @@ F 3 "" H 5550 3400 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR067
+L GND #PWR063
 U 1 1 58D8877C
 P 5550 5750
-F 0 "#PWR067" H 5550 5500 50  0001 C CNN
+F 0 "#PWR063" H 5550 5500 50  0001 C CNN
 F 1 "GND" H 5550 5600 50  0000 C CNN
 F 2 "" H 5550 5750 50  0000 C CNN
 F 3 "" H 5550 5750 50  0000 C CNN
@@ -241,10 +241,10 @@ Wire Wire Line
 	5500 1150 5500 1250
 Connection ~ 5400 1150
 $Comp
-L +1V8 #PWR068
+L +1V8 #PWR064
 U 1 1 58D88D43
 P 4150 1800
-F 0 "#PWR068" H 4150 1650 50  0001 C CNN
+F 0 "#PWR064" H 4150 1650 50  0001 C CNN
 F 1 "+1V8" H 4150 1940 50  0000 C CNN
 F 2 "" H 4150 1800 50  0000 C CNN
 F 3 "" H 4150 1800 50  0000 C CNN
@@ -268,10 +268,10 @@ F 3 "" H 4200 2000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR069
+L GND #PWR065
 U 1 1 58D88E02
 P 4200 2200
-F 0 "#PWR069" H 4200 1950 50  0001 C CNN
+F 0 "#PWR065" H 4200 1950 50  0001 C CNN
 F 1 "GND" H 4200 2050 50  0000 C CNN
 F 2 "" H 4200 2200 50  0000 C CNN
 F 3 "" H 4200 2200 50  0000 C CNN
@@ -288,10 +288,10 @@ Wire Wire Line
 	5150 1150 5150 1250
 Connection ~ 5050 1150
 $Comp
-L +1V8 #PWR070
+L +1V8 #PWR066
 U 1 1 58D88EF8
 P 5400 1050
-F 0 "#PWR070" H 5400 900 50  0001 C CNN
+F 0 "#PWR066" H 5400 900 50  0001 C CNN
 F 1 "+1V8" H 5400 1190 50  0000 C CNN
 F 2 "" H 5400 1050 50  0000 C CNN
 F 3 "" H 5400 1050 50  0000 C CNN
@@ -299,10 +299,10 @@ F 3 "" H 5400 1050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR071
+L +3V3 #PWR067
 U 1 1 58D88F34
 P 5750 1050
-F 0 "#PWR071" H 5750 900 50  0001 C CNN
+F 0 "#PWR067" H 5750 900 50  0001 C CNN
 F 1 "+3V3" H 5750 1190 50  0000 C CNN
 F 2 "" H 5750 1050 50  0000 C CNN
 F 3 "" H 5750 1050 50  0000 C CNN
@@ -310,10 +310,10 @@ F 3 "" H 5750 1050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR072
+L +3V3 #PWR068
 U 1 1 58D893C4
 P 4050 1650
-F 0 "#PWR072" H 4050 1500 50  0001 C CNN
+F 0 "#PWR068" H 4050 1500 50  0001 C CNN
 F 1 "+3V3" H 4050 1790 50  0000 C CNN
 F 2 "" H 4050 1650 50  0000 C CNN
 F 3 "" H 4050 1650 50  0000 C CNN
@@ -323,10 +323,10 @@ $EndComp
 Wire Wire Line
 	4050 1650 4250 1650
 $Comp
-L +3V3 #PWR073
+L +3V3 #PWR069
 U 1 1 58D89CFD
 P 5050 1050
-F 0 "#PWR073" H 5050 900 50  0001 C CNN
+F 0 "#PWR069" H 5050 900 50  0001 C CNN
 F 1 "+3V3" H 5050 1190 50  0000 C CNN
 F 2 "" H 5050 1050 50  0000 C CNN
 F 3 "" H 5050 1050 50  0000 C CNN
@@ -370,7 +370,7 @@ U 1 1 58D8C14C
 P 3300 4700
 F 0 "C15" H 3325 4800 50  0000 L CNN
 F 1 "27pF" H 3325 4600 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 3338 4550 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3338 4550 50  0001 C CNN
 F 3 "" H 3300 4700 50  0000 C CNN
 	1    3300 4700
 	0    1    1    0   
@@ -381,7 +381,7 @@ U 1 1 58D8C189
 P 3300 5000
 F 0 "C16" H 3325 5100 50  0000 L CNN
 F 1 "27pF" H 3325 4900 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 3338 4850 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3338 4850 50  0001 C CNN
 F 3 "" H 3300 5000 50  0000 C CNN
 	1    3300 5000
 	0    1    1    0   
@@ -396,10 +396,10 @@ Wire Wire Line
 	3150 5000 3050 5000
 Connection ~ 3050 5000
 $Comp
-L GND #PWR074
+L GND #PWR070
 U 1 1 58D8C2A8
 P 3050 5200
-F 0 "#PWR074" H 3050 4950 50  0001 C CNN
+F 0 "#PWR070" H 3050 4950 50  0001 C CNN
 F 1 "GND" H 3050 5050 50  0000 C CNN
 F 2 "" H 3050 5200 50  0000 C CNN
 F 3 "" H 3050 5200 50  0000 C CNN
@@ -499,10 +499,10 @@ F 3 "" H 1650 4750 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR075
+L +3V3 #PWR071
 U 1 1 58D8D327
 P 1350 4450
-F 0 "#PWR075" H 1350 4300 50  0001 C CNN
+F 0 "#PWR071" H 1350 4300 50  0001 C CNN
 F 1 "+3V3" H 1350 4590 50  0000 C CNN
 F 2 "" H 1350 4450 50  0000 C CNN
 F 3 "" H 1350 4450 50  0000 C CNN
@@ -510,10 +510,10 @@ F 3 "" H 1350 4450 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR076
+L +3V3 #PWR072
 U 1 1 58D8D351
 P 2150 4750
-F 0 "#PWR076" H 2150 4600 50  0001 C CNN
+F 0 "#PWR072" H 2150 4600 50  0001 C CNN
 F 1 "+3V3" H 2150 4890 50  0000 C CNN
 F 2 "" H 2150 4750 50  0000 C CNN
 F 3 "" H 2150 4750 50  0000 C CNN
@@ -521,10 +521,10 @@ F 3 "" H 2150 4750 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR077
+L GND #PWR073
 U 1 1 58D8D37B
 P 1350 4750
-F 0 "#PWR077" H 1350 4500 50  0001 C CNN
+F 0 "#PWR073" H 1350 4500 50  0001 C CNN
 F 1 "GND" H 1350 4600 50  0000 C CNN
 F 2 "" H 1350 4750 50  0000 C CNN
 F 3 "" H 1350 4750 50  0000 C CNN
@@ -537,7 +537,7 @@ U 1 1 58D8D814
 P 2400 4550
 F 0 "R12" V 2480 4550 50  0000 C CNN
 F 1 "2.2k" V 2400 4550 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 2330 4550 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 2330 4550 50  0001 C CNN
 F 3 "" H 2400 4550 50  0000 C CNN
 	1    2400 4550
 	0    1    1    0   
@@ -578,7 +578,7 @@ U 1 1 58D8DC49
 P 2100 4200
 F 0 "R11" V 2180 4200 50  0000 C CNN
 F 1 "10k" V 2100 4200 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 2030 4200 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 2030 4200 50  0001 C CNN
 F 3 "" H 2100 4200 50  0000 C CNN
 	1    2100 4200
 	1    0    0    -1  
@@ -589,7 +589,7 @@ U 1 1 58D8DCBE
 P 850 4250
 F 0 "R10" V 930 4250 50  0000 C CNN
 F 1 "10k" V 850 4250 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 780 4250 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 780 4250 50  0001 C CNN
 F 3 "" H 850 4250 50  0000 C CNN
 	1    850  4250
 	1    0    0    -1  
@@ -600,7 +600,7 @@ U 1 1 58D8DD25
 P 700 4250
 F 0 "R9" V 780 4250 50  0000 C CNN
 F 1 "10k" V 700 4250 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 630 4250 50  0001 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 630 4250 50  0001 C CNN
 F 3 "" H 700 4250 50  0000 C CNN
 	1    700  4250
 	1    0    0    -1  
@@ -610,10 +610,10 @@ Wire Wire Line
 Wire Wire Line
 	850  4550 850  4400
 $Comp
-L +3V3 #PWR078
+L +3V3 #PWR074
 U 1 1 58D8E00C
 P 700 4000
-F 0 "#PWR078" H 700 3850 50  0001 C CNN
+F 0 "#PWR074" H 700 3850 50  0001 C CNN
 F 1 "+3V3" H 700 4140 50  0000 C CNN
 F 2 "" H 700 4000 50  0000 C CNN
 F 3 "" H 700 4000 50  0000 C CNN
@@ -628,10 +628,10 @@ Wire Wire Line
 	850  4050 850  4100
 Connection ~ 700  4050
 $Comp
-L +3V3 #PWR079
+L +3V3 #PWR075
 U 1 1 58D8E1C0
 P 2100 3950
-F 0 "#PWR079" H 2100 3800 50  0001 C CNN
+F 0 "#PWR075" H 2100 3800 50  0001 C CNN
 F 1 "+3V3" H 2100 4090 50  0000 C CNN
 F 2 "" H 2100 3950 50  0000 C CNN
 F 3 "" H 2100 3950 50  0000 C CNN
@@ -644,10 +644,10 @@ Connection ~ 2100 4550
 Wire Wire Line
 	2100 4350 2100 4550
 $Comp
-L GND #PWR080
+L GND #PWR076
 U 1 1 58D8EDE4
 P 2000 4650
-F 0 "#PWR080" H 2000 4400 50  0001 C CNN
+F 0 "#PWR076" H 2000 4400 50  0001 C CNN
 F 1 "GND" H 2000 4500 50  0000 C CNN
 F 2 "" H 2000 4650 50  0000 C CNN
 F 3 "" H 2000 4650 50  0000 C CNN
@@ -658,4 +658,6 @@ Wire Wire Line
 	1950 4650 2000 4650
 Wire Wire Line
 	1950 4750 2150 4750
+Text Notes 4100 1400 0    60   ~ 0
+todo:\nVPHY and VPLL\nneed LC network
 $EndSCHEMATC

wifi.bak

@@ -39,7 +39,7 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 7 9
+Sheet 7 10
 Title "ULX3S"
 Date ""
 Rev "0.0.1"
@@ -71,10 +71,10 @@ Wire Wire Line
 Wire Wire Line
 	4100 4950 4200 4950
 $Comp
-L GND #PWR82
+L GND #PWR78
 U 1 1 58D75E1F
 P 4200 4950
-F 0 "#PWR82" H 4200 4700 50  0001 C CNN
+F 0 "#PWR78" H 4200 4700 50  0001 C CNN
 F 1 "GND" H 4200 4800 50  0000 C CNN
 F 2 "" H 4200 4950 60  0000 C CNN
 F 3 "" H 4200 4950 60  0000 C CNN
@@ -100,10 +100,10 @@ Wire Wire Line
 Wire Wire Line
 	4100 4350 4400 4350
 $Comp
-L +3V3 #PWR81
+L +3V3 #PWR77
 U 1 1 58D75E28
 P 2250 4950
-F 0 "#PWR81" H 2250 4800 50  0001 C CNN
+F 0 "#PWR77" H 2250 4800 50  0001 C CNN
 F 1 "+3V3" H 2250 5090 50  0000 C CNN
 F 2 "" H 2250 4950 50  0000 C CNN
 F 3 "" H 2250 4950 50  0000 C CNN

wifi.sch

@@ -39,7 +39,7 @@ EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 7 9
+Sheet 7 10
 Title "ULX3S"
 Date ""
 Rev "0.0.1"
@@ -71,10 +71,10 @@ Wire Wire Line
 Wire Wire Line
 	4100 4950 4200 4950
 $Comp
-L GND #PWR081
+L GND #PWR077
 U 1 1 58D75E1F
 P 4200 4950
-F 0 "#PWR081" H 4200 4700 50  0001 C CNN
+F 0 "#PWR077" H 4200 4700 50  0001 C CNN
 F 1 "GND" H 4200 4800 50  0000 C CNN
 F 2 "" H 4200 4950 60  0000 C CNN
 F 3 "" H 4200 4950 60  0000 C CNN
@@ -100,10 +100,10 @@ Wire Wire Line
 Wire Wire Line
 	4100 4350 4400 4350
 $Comp
-L +3V3 #PWR082
+L +3V3 #PWR078
 U 1 1 58D75E28
 P 2250 4950
-F 0 "#PWR082" H 2250 4800 50  0001 C CNN
+F 0 "#PWR078" H 2250 4800 50  0001 C CNN
 F 1 "+3V3" H 2250 5090 50  0000 C CNN
 F 2 "" H 2250 4950 50  0000 C CNN
 F 3 "" H 2250 4950 50  0000 C CNN