another diode to duscharge C14 at shutdown

analog.bak

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

analog.sch

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

blinkey.bak

@@ -75,10 +75,10 @@ Wire Wire Line
 Wire Wire Line
 	4750 1850 4850 1850
 $Comp
-L GND #PWR047
+L GND #PWR50
 U 1 1 58D66047
 P 4850 1250
-F 0 "#PWR047" H 4850 1000 50  0001 C CNN
+F 0 "#PWR50" 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 #PWR048
+L +3V3 #PWR51
 U 1 1 58D66055
 P 5350 1350
-F 0 "#PWR048" H 5350 1200 50  0001 C CNN
+F 0 "#PWR51" 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
 	2750 3150 2850 3150
 Connection ~ 2750 3150
 $Comp
-L +3V3 #PWR049
+L +3V3 #PWR48
 U 1 1 58D6605C
 P 2750 2350
-F 0 "#PWR049" H 2750 2200 50  0001 C CNN
+F 0 "#PWR48" H 2750 2200 50  0001 C CNN
 F 1 "+3V3" H 2750 2490 50  0000 C CNN
 F 2 "" H 2750 2350 50  0000 C CNN
 F 3 "" H 2750 2350 50  0000 C CNN
@@ -354,10 +354,10 @@ Wire Wire Line
 	4400 2750 4250 2750
 Connection ~ 4250 2750
 $Comp
-L GND #PWR050
+L GND #PWR49
 U 1 1 58D681C3
 P 4250 4100
-F 0 "#PWR050" H 4250 3850 50  0001 C CNN
+F 0 "#PWR49" 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

@@ -75,10 +75,10 @@ Wire Wire Line
 Wire Wire Line
 	4750 1850 4850 1850
 $Comp
-L GND #PWR047
+L GND #PWR50
 U 1 1 58D66047
 P 4850 1250
-F 0 "#PWR047" H 4850 1000 50  0001 C CNN
+F 0 "#PWR50" 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 #PWR048
+L +3V3 #PWR51
 U 1 1 58D66055
 P 5350 1350
-F 0 "#PWR048" H 5350 1200 50  0001 C CNN
+F 0 "#PWR51" 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
 	2750 3150 2850 3150
 Connection ~ 2750 3150
 $Comp
-L +3V3 #PWR049
+L +3V3 #PWR48
 U 1 1 58D6605C
 P 2750 2350
-F 0 "#PWR049" H 2750 2200 50  0001 C CNN
+F 0 "#PWR48" H 2750 2200 50  0001 C CNN
 F 1 "+3V3" H 2750 2490 50  0000 C CNN
 F 2 "" H 2750 2350 50  0000 C CNN
 F 3 "" H 2750 2350 50  0000 C CNN
@@ -354,10 +354,10 @@ Wire Wire Line
 	4400 2750 4250 2750
 Connection ~ 4250 2750
 $Comp
-L GND #PWR050
+L GND #PWR49
 U 1 1 58D681C3
 P 4250 4100
-F 0 "#PWR050" H 4250 3850 50  0001 C CNN
+F 0 "#PWR49" H 4250 3850 50  0001 C CNN
 F 1 "GND" H 4250 3950 50  0000 C CNN
 F 2 "" H 4250 4100 50  0000 C CNN
 F 3 "" H 4250 4100 50  0000 C CNN

flash.bak

@@ -61,10 +61,10 @@ F 3 "" H 2450 2650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR093
+L +3V3 #PWR94
 U 1 1 58D9149E
 P 2800 2400
-F 0 "#PWR093" H 2800 2250 50  0001 C CNN
+F 0 "#PWR94" H 2800 2250 50  0001 C CNN
 F 1 "+3V3" H 2800 2540 50  0000 C CNN
 F 2 "" H 2800 2400 50  0000 C CNN
 F 3 "" H 2800 2400 50  0000 C CNN
@@ -72,10 +72,10 @@ F 3 "" H 2800 2400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR094
+L GND #PWR95
 U 1 1 58D914B4
 P 2800 3000
-F 0 "#PWR094" H 2800 2750 50  0001 C CNN
+F 0 "#PWR95" H 2800 2750 50  0001 C CNN
 F 1 "GND" H 2800 2850 50  0000 C CNN
 F 2 "" H 2800 3000 50  0000 C CNN
 F 3 "" H 2800 3000 50  0000 C CNN

flash.sch

@@ -61,10 +61,10 @@ F 3 "" H 2450 2650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR093
+L +3V3 #PWR94
 U 1 1 58D9149E
 P 2800 2400
-F 0 "#PWR093" H 2800 2250 50  0001 C CNN
+F 0 "#PWR94" H 2800 2250 50  0001 C CNN
 F 1 "+3V3" H 2800 2540 50  0000 C CNN
 F 2 "" H 2800 2400 50  0000 C CNN
 F 3 "" H 2800 2400 50  0000 C CNN
@@ -72,10 +72,10 @@ F 3 "" H 2800 2400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR094
+L GND #PWR95
 U 1 1 58D914B4
 P 2800 3000
-F 0 "#PWR094" H 2800 2750 50  0001 C CNN
+F 0 "#PWR95" H 2800 2750 50  0001 C CNN
 F 1 "GND" H 2800 2850 50  0000 C CNN
 F 2 "" H 2800 3000 50  0000 C CNN
 F 3 "" H 2800 3000 50  0000 C CNN

gpdi.bak

@@ -52,12 +52,12 @@ $EndDescr
 $Comp
 L MICRO-HDMI-D GPDI1
 U 1 1 58D69067
-P 5200 4600
+P 5200 4500
-F 0 "GPDI1" H 5200 5650 50  0000 C CNN
+F 0 "GPDI1" H 5200 5550 50  0000 C CNN
-F 1 "MICRO-GPDI-D" V 5300 4600 50  0000 C CNN
+F 1 "MICRO-GPDI-D" V 5300 4500 50  0000 C CNN
-F 2 "hdmi-swm-19:hdmi-swm-19" H 5200 4600 60  0001 C CNN
+F 2 "hdmi-swm-19:hdmi-swm-19" H 5200 4500 60  0001 C CNN
-F 3 "" H 5200 4600 60  0000 C CNN
+F 3 "" H 5200 4500 60  0000 C CNN
-	1    5200 4600
+	1    5200 4500
 	-1   0    0    -1  
 $EndComp
 Wire Wire Line
@@ -99,23 +99,23 @@ Wire Wire Line
 Wire Wire Line
 	5400 5350 5650 5350
 Wire Wire Line
-	5400 5550 5450 5550
+	5400 3550 5450 3550
 $Comp
-L GND #PWR051
+L GND #PWR56
 U 1 1 58D69073
-P 5450 5550
+P 5450 3550
-F 0 "#PWR051" H 5450 5300 50  0001 C CNN
+F 0 "#PWR56" H 5450 3300 50  0001 C CNN
-F 1 "GND" H 5450 5400 50  0000 C CNN
+F 1 "GND" H 5450 3400 50  0000 C CNN
-F 2 "" H 5450 5550 60  0000 C CNN
+F 2 "" H 5450 3550 60  0000 C CNN
-F 3 "" H 5450 5550 60  0000 C CNN
+F 3 "" H 5450 3550 60  0000 C CNN
-	1    5450 5550
+	1    5450 3550
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR052
+L GND #PWR61
 U 1 1 58D69074
 P 5450 5150
-F 0 "#PWR052" H 5450 4900 50  0001 C CNN
+F 0 "#PWR61" 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 #PWR053
+L GND #PWR60
 U 1 1 58D69075
 P 5450 4850
-F 0 "#PWR053" H 5450 4600 50  0001 C CNN
+F 0 "#PWR60" 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 #PWR054
+L GND #PWR59
 U 1 1 58D69076
 P 5450 4550
-F 0 "#PWR054" H 5450 4300 50  0001 C CNN
+F 0 "#PWR59" 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 #PWR055
+L GND #PWR58
 U 1 1 58D69077
 P 5450 4250
-F 0 "#PWR055" H 5450 4000 50  0001 C CNN
+F 0 "#PWR58" 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 #PWR056
+L GND #PWR57
 U 1 1 58D69078
 P 5450 3950
-F 0 "#PWR056" H 5450 3700 50  0001 C CNN
+F 0 "#PWR57" 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 #PWR057
+L +5V #PWR62
 U 1 1 58D6907F
 P 6200 5450
-F 0 "#PWR057" H 6200 5300 50  0001 C CNN
+F 0 "#PWR62" 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
@@ -290,10 +290,10 @@ Wire Wire Line
 Wire Wire Line
 	3800 5350 3800 4950
 $Comp
-L +5V #PWR058
+L +5V #PWR54
 U 1 1 58D92625
 P 3600 4400
-F 0 "#PWR058" H 3600 4250 50  0001 C CNN
+F 0 "#PWR54" H 3600 4250 50  0001 C CNN
 F 1 "+5V" H 3600 4540 50  0000 C CNN
 F 2 "" H 3600 4400 50  0000 C CNN
 F 3 "" H 3600 4400 50  0000 C CNN
@@ -315,10 +315,10 @@ Wire Wire Line
 	4050 4550 4050 4600
 Connection ~ 3800 4550
 $Comp
-L GND #PWR059
+L GND #PWR55
 U 1 1 58D92889
 P 4050 4950
-F 0 "#PWR059" H 4050 4700 50  0001 C CNN
+F 0 "#PWR55" H 4050 4700 50  0001 C CNN
 F 1 "GND" H 4050 4800 50  0000 C CNN
 F 2 "" H 4050 4950 50  0000 C CNN
 F 3 "" H 4050 4950 50  0000 C CNN
@@ -328,10 +328,10 @@ $EndComp
 Wire Wire Line
 	4050 4900 4050 4950
 $Comp
-L +3V3 #PWR060
+L +3V3 #PWR52
 U 1 1 58D92A40
 P 2000 4700
-F 0 "#PWR060" H 2000 4550 50  0001 C CNN
+F 0 "#PWR52" H 2000 4550 50  0001 C CNN
 F 1 "+3V3" H 2000 4840 50  0000 C CNN
 F 2 "" H 2000 4700 50  0000 C CNN
 F 3 "" H 2000 4700 50  0000 C CNN
@@ -339,10 +339,10 @@ F 3 "" H 2000 4700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR061
+L GND #PWR53
 U 1 1 58D92B02
 P 2250 5050
-F 0 "#PWR061" H 2250 4800 50  0001 C CNN
+F 0 "#PWR53" H 2250 4800 50  0001 C CNN
 F 1 "GND" H 2250 4900 50  0000 C CNN
 F 2 "" H 2250 5050 50  0000 C CNN
 F 3 "" H 2250 5050 50  0000 C CNN

gpdi.sch

@@ -101,10 +101,10 @@ Wire Wire Line
 Wire Wire Line
 	5400 3550 5450 3550
 $Comp
-L GND #PWR051
+L GND #PWR56
 U 1 1 58D69073
 P 5450 3550
-F 0 "#PWR051" H 5450 3300 50  0001 C CNN
+F 0 "#PWR56" H 5450 3300 50  0001 C CNN
 F 1 "GND" H 5450 3400 50  0000 C CNN
 F 2 "" H 5450 3550 60  0000 C CNN
 F 3 "" H 5450 3550 60  0000 C CNN
@@ -112,10 +112,10 @@ F 3 "" H 5450 3550 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR052
+L GND #PWR61
 U 1 1 58D69074
 P 5450 5150
-F 0 "#PWR052" H 5450 4900 50  0001 C CNN
+F 0 "#PWR61" 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 #PWR053
+L GND #PWR60
 U 1 1 58D69075
 P 5450 4850
-F 0 "#PWR053" H 5450 4600 50  0001 C CNN
+F 0 "#PWR60" 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 #PWR054
+L GND #PWR59
 U 1 1 58D69076
 P 5450 4550
-F 0 "#PWR054" H 5450 4300 50  0001 C CNN
+F 0 "#PWR59" 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 #PWR055
+L GND #PWR58
 U 1 1 58D69077
 P 5450 4250
-F 0 "#PWR055" H 5450 4000 50  0001 C CNN
+F 0 "#PWR58" 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 #PWR056
+L GND #PWR57
 U 1 1 58D69078
 P 5450 3950
-F 0 "#PWR056" H 5450 3700 50  0001 C CNN
+F 0 "#PWR57" 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 #PWR057
+L +5V #PWR62
 U 1 1 58D6907F
 P 6200 5450
-F 0 "#PWR057" H 6200 5300 50  0001 C CNN
+F 0 "#PWR62" 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
@@ -290,10 +290,10 @@ Wire Wire Line
 Wire Wire Line
 	3800 5350 3800 4950
 $Comp
-L +5V #PWR058
+L +5V #PWR54
 U 1 1 58D92625
 P 3600 4400
-F 0 "#PWR058" H 3600 4250 50  0001 C CNN
+F 0 "#PWR54" H 3600 4250 50  0001 C CNN
 F 1 "+5V" H 3600 4540 50  0000 C CNN
 F 2 "" H 3600 4400 50  0000 C CNN
 F 3 "" H 3600 4400 50  0000 C CNN
@@ -315,10 +315,10 @@ Wire Wire Line
 	4050 4550 4050 4600
 Connection ~ 3800 4550
 $Comp
-L GND #PWR059
+L GND #PWR55
 U 1 1 58D92889
 P 4050 4950
-F 0 "#PWR059" H 4050 4700 50  0001 C CNN
+F 0 "#PWR55" H 4050 4700 50  0001 C CNN
 F 1 "GND" H 4050 4800 50  0000 C CNN
 F 2 "" H 4050 4950 50  0000 C CNN
 F 3 "" H 4050 4950 50  0000 C CNN
@@ -328,10 +328,10 @@ $EndComp
 Wire Wire Line
 	4050 4900 4050 4950
 $Comp
-L +3V3 #PWR060
+L +3V3 #PWR52
 U 1 1 58D92A40
 P 2000 4700
-F 0 "#PWR060" H 2000 4550 50  0001 C CNN
+F 0 "#PWR52" H 2000 4550 50  0001 C CNN
 F 1 "+3V3" H 2000 4840 50  0000 C CNN
 F 2 "" H 2000 4700 50  0000 C CNN
 F 3 "" H 2000 4700 50  0000 C CNN
@@ -339,10 +339,10 @@ F 3 "" H 2000 4700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR061
+L GND #PWR53
 U 1 1 58D92B02
 P 2250 5050
-F 0 "#PWR061" H 2250 4800 50  0001 C CNN
+F 0 "#PWR53" H 2250 4800 50  0001 C CNN
 F 1 "GND" H 2250 4900 50  0000 C CNN
 F 2 "" H 2250 5050 50  0000 C CNN
 F 3 "" H 2250 5050 50  0000 C CNN

gpio.bak

@@ -111,10 +111,10 @@ P27
 Text Label 5200 1950 0    60   ~ 0
 P28
 $Comp
-L GND #PWR01
+L GND #PWR9
 U 1 1 56AC4825
 P 1450 950
-F 0 "#PWR01" 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 #PWR02
+L GND #PWR12
 U 1 1 56AC482D
 P 2250 950
-F 0 "#PWR02" 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 #PWR03
+L +5V #PWR1
 U 1 1 56AC484F
 P 850 850
-F 0 "#PWR03" 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
@@ -321,10 +321,10 @@ MP3
 Text Label 1400 6200 0    60   ~ 0
 MP5
 $Comp
-L GND #PWR04
+L GND #PWR4
 U 1 1 58D3C3A8
 P 1150 6400
-F 0 "#PWR04" 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
@@ -332,10 +332,10 @@ F 3 "" H 1150 6400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR05
+L GND #PWR19
 U 1 1 58D3C3C8
 P 2550 6400
-F 0 "#PWR05" 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
@@ -343,10 +343,10 @@ F 3 "" H 2550 6400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR06
+L GND #PWR18
 U 1 1 58D3C400
 P 2550 5500
-F 0 "#PWR06" 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
@@ -354,10 +354,10 @@ F 3 "" H 2550 5500 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR07
+L GND #PWR3
 U 1 1 58D3C426
 P 1150 5500
-F 0 "#PWR07" 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
@@ -365,10 +365,10 @@ F 3 "" H 1150 5500 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR08
+L GND #PWR8
 U 1 1 58D565FC
 P 1400 3850
-F 0 "#PWR08" 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
@@ -376,10 +376,10 @@ F 3 "" H 1400 3850 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR09
+L GND #PWR13
 U 1 1 58D56721
 P 2300 3850
-F 0 "#PWR09" 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
@@ -514,10 +514,10 @@ PMODA5
 Text Label 1200 4950 0    60   ~ 0
 PMODA7
 $Comp
-L GND #PWR010
+L GND #PWR2
 U 1 1 58D51066
 P 1150 4550
-F 0 "#PWR010" 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
@@ -533,10 +533,10 @@ PMODA6
 Text Label 2150 4950 0    60   ~ 0
 PMODA8
 $Comp
-L GND #PWR011
+L GND #PWR17
 U 1 1 58D510F5
 P 2550 4550
-F 0 "#PWR011" 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
@@ -544,10 +544,10 @@ F 3 "" H 2550 4550 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR012
+L +3V3 #PWR11
 U 1 1 58D5FBBC
 P 2200 3950
-F 0 "#PWR012" H 2200 3800 50  0001 C CNN
+F 0 "#PWR11" H 2200 3800 50  0001 C CNN
 F 1 "+3V3" H 2200 4090 50  0000 C CNN
 F 2 "" H 2200 3950 50  0000 C CNN
 F 3 "" H 2200 3950 50  0000 C CNN
@@ -555,10 +555,10 @@ F 3 "" H 2200 3950 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR013
+L +3V3 #PWR10
 U 1 1 58D5FBF3
 P 1550 3950
-F 0 "#PWR013" 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
@@ -566,10 +566,10 @@ F 3 "" H 1550 3950 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR014
+L +3V3 #PWR14
 U 1 1 58D5FC6D
 P 2400 4450
-F 0 "#PWR014" 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
@@ -577,10 +577,10 @@ F 3 "" H 2400 4450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR015
+L +3V3 #PWR5
 U 1 1 58D5FC94
 P 1300 4450
-F 0 "#PWR015" 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
@@ -588,10 +588,10 @@ F 3 "" H 1300 4450 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR016
+L +3V3 #PWR15
 U 1 1 58D60015
 P 2400 5400
-F 0 "#PWR016" 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
@@ -599,10 +599,10 @@ F 3 "" H 2400 5400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR017
+L +3V3 #PWR16
 U 1 1 58D60037
 P 2400 6300
-F 0 "#PWR017" 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
@@ -610,10 +610,10 @@ F 3 "" H 2400 6300 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR018
+L +3V3 #PWR6
 U 1 1 58D60059
 P 1300 5400
-F 0 "#PWR018" 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
@@ -621,10 +621,10 @@ F 3 "" H 1300 5400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR019
+L +3V3 #PWR7
 U 1 1 58D60089
 P 1300 6300
-F 0 "#PWR019" 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

@@ -111,10 +111,10 @@ P27
 Text Label 5200 1950 0    60   ~ 0
 P28
 $Comp
-L GND #PWR01
+L GND #PWR9
 U 1 1 56AC4825
 P 1450 950
-F 0 "#PWR01" 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 #PWR02
+L GND #PWR12
 U 1 1 56AC482D
 P 2250 950
-F 0 "#PWR02" 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 #PWR03
+L +5V #PWR1
 U 1 1 56AC484F
 P 850 850
-F 0 "#PWR03" 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
@@ -321,10 +321,10 @@ MP3
 Text Label 1400 6200 0    60   ~ 0
 MP5
 $Comp
-L GND #PWR04
+L GND #PWR4
 U 1 1 58D3C3A8
 P 1150 6400
-F 0 "#PWR04" 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
@@ -332,10 +332,10 @@ F 3 "" H 1150 6400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR05
+L GND #PWR19
 U 1 1 58D3C3C8
 P 2550 6400
-F 0 "#PWR05" 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
@@ -343,10 +343,10 @@ F 3 "" H 2550 6400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR06
+L GND #PWR18
 U 1 1 58D3C400
 P 2550 5500
-F 0 "#PWR06" 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
@@ -354,10 +354,10 @@ F 3 "" H 2550 5500 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR07
+L GND #PWR3
 U 1 1 58D3C426
 P 1150 5500
-F 0 "#PWR07" 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
@@ -365,10 +365,10 @@ F 3 "" H 1150 5500 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR08
+L GND #PWR8
 U 1 1 58D565FC
 P 1400 3850
-F 0 "#PWR08" 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
@@ -376,10 +376,10 @@ F 3 "" H 1400 3850 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR09
+L GND #PWR13
 U 1 1 58D56721
 P 2300 3850
-F 0 "#PWR09" 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
@@ -514,10 +514,10 @@ PMODA5
 Text Label 1200 4950 0    60   ~ 0
 PMODA7
 $Comp
-L GND #PWR010
+L GND #PWR2
 U 1 1 58D51066
 P 1150 4550
-F 0 "#PWR010" 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
@@ -533,10 +533,10 @@ PMODA6
 Text Label 2150 4950 0    60   ~ 0
 PMODA8
 $Comp
-L GND #PWR011
+L GND #PWR17
 U 1 1 58D510F5
 P 2550 4550
-F 0 "#PWR011" 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
@@ -544,10 +544,10 @@ F 3 "" H 2550 4550 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR012
+L +3V3 #PWR11
 U 1 1 58D5FBBC
 P 2200 3950
-F 0 "#PWR012" H 2200 3800 50  0001 C CNN
+F 0 "#PWR11" H 2200 3800 50  0001 C CNN
 F 1 "+3V3" H 2200 4090 50  0000 C CNN
 F 2 "" H 2200 3950 50  0000 C CNN
 F 3 "" H 2200 3950 50  0000 C CNN
@@ -555,10 +555,10 @@ F 3 "" H 2200 3950 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR013
+L +3V3 #PWR10
 U 1 1 58D5FBF3
 P 1550 3950
-F 0 "#PWR013" 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
@@ -566,10 +566,10 @@ F 3 "" H 1550 3950 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR014
+L +3V3 #PWR14
 U 1 1 58D5FC6D
 P 2400 4450
-F 0 "#PWR014" 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
@@ -577,10 +577,10 @@ F 3 "" H 2400 4450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR015
+L +3V3 #PWR5
 U 1 1 58D5FC94
 P 1300 4450
-F 0 "#PWR015" 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
@@ -588,10 +588,10 @@ F 3 "" H 1300 4450 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR016
+L +3V3 #PWR15
 U 1 1 58D60015
 P 2400 5400
-F 0 "#PWR016" 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
@@ -599,10 +599,10 @@ F 3 "" H 2400 5400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR017
+L +3V3 #PWR16
 U 1 1 58D60037
 P 2400 6300
-F 0 "#PWR017" 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
@@ -610,10 +610,10 @@ F 3 "" H 2400 6300 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR018
+L +3V3 #PWR6
 U 1 1 58D60059
 P 1300 5400
-F 0 "#PWR018" 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
@@ -621,10 +621,10 @@ F 3 "" H 1300 5400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR019
+L +3V3 #PWR7
 U 1 1 58D60089
 P 1300 6300
-F 0 "#PWR019" 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

power.bak

@@ -50,10 +50,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR020
+L GND #PWR20
 U 1 1 58D54769
 P 1100 2650
-F 0 "#PWR020" 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 #PWR021
+L GND #PWR39
 U 1 1 58D58A0B
 P 8500 3850
-F 0 "#PWR021" H 8500 3600 50  0001 C CNN
+F 0 "#PWR39" 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 #PWR022
+L +5V #PWR33
 U 1 1 58D58F93
 P 7850 3200
-F 0 "#PWR022" H 7850 3050 50  0001 C CNN
+F 0 "#PWR33" 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 #PWR023
+L GND #PWR34
 U 1 1 58D5989A
 P 7850 3850
-F 0 "#PWR023" H 7850 3600 50  0001 C CNN
+F 0 "#PWR34" 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
@@ -171,10 +171,10 @@ F 3 "" H 10050 3450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR024
+L GND #PWR42
 U 1 1 58D5AE5E
 P 10250 3550
-F 0 "#PWR024" H 10250 3300 50  0001 C CNN
+F 0 "#PWR42" 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 #PWR025
+L +3V3 #PWR31
 U 1 1 58D5CFDD
 P 4750 900
-F 0 "#PWR025" H 4750 750 50  0001 C CNN
+F 0 "#PWR31" 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 #PWR026
+L GND #PWR41
 U 1 1 58D6294C
 P 8500 6250
-F 0 "#PWR026" H 8500 6000 50  0001 C CNN
+F 0 "#PWR41" 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 #PWR027
+L +5V #PWR37
 U 1 1 58D62952
 P 7850 5600
-F 0 "#PWR027" H 7850 5450 50  0001 C CNN
+F 0 "#PWR37" 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 #PWR028
+L GND #PWR38
 U 1 1 58D62958
 P 7850 6250
-F 0 "#PWR028" H 7850 6000 50  0001 C CNN
+F 0 "#PWR38" 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
@@ -773,10 +773,10 @@ F 3 "" H 10050 5850 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR029
+L GND #PWR44
 U 1 1 58D62982
 P 10250 5950
-F 0 "#PWR029" H 10250 5700 50  0001 C CNN
+F 0 "#PWR44" 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 #PWR030
+L +3V3 #PWR47
 U 1 1 58D62CE2
 P 10600 5400
-F 0 "#PWR030" H 10600 5250 50  0001 C CNN
+F 0 "#PWR47" 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 #PWR031
+L +1V2 #PWR45
 U 1 1 58D63C77
 P 10600 3000
-F 0 "#PWR031" H 10600 2850 50  0001 C CNN
+F 0 "#PWR45" 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 #PWR032
+L +1V2 #PWR23
 U 1 1 58D63D96
 P 2150 900
-F 0 "#PWR032" 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 #PWR033
+L GND #PWR40
 U 1 1 58D67BC0
 P 8500 5050
-F 0 "#PWR033" H 8500 4800 50  0001 C CNN
+F 0 "#PWR40" 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 #PWR034
+L +5V #PWR35
 U 1 1 58D67BC6
 P 7850 4400
-F 0 "#PWR034" H 7850 4250 50  0001 C CNN
+F 0 "#PWR35" 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 #PWR035
+L GND #PWR36
 U 1 1 58D67BCC
 P 7850 5050
-F 0 "#PWR035" H 7850 4800 50  0001 C CNN
+F 0 "#PWR36" 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
@@ -988,10 +988,10 @@ F 3 "" H 10050 4650 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR036
+L GND #PWR43
 U 1 1 58D67BF0
 P 10250 4750
-F 0 "#PWR036" H 10250 4500 50  0001 C CNN
+F 0 "#PWR43" 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
@@ -1080,10 +1080,10 @@ $EndComp
 Wire Wire Line
 	4150 4450 4150 4300
 $Comp
-L +2V5 #PWR037
+L +2V5 #PWR46
 U 1 1 58D681D4
 P 10600 4200
-F 0 "#PWR037" H 10600 4050 50  0001 C CNN
+F 0 "#PWR46" 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
@@ -1121,10 +1121,10 @@ Wire Wire Line
 Wire Wire Line
 	4650 1000 4650 1100
 $Comp
-L +2V5 #PWR038
+L +2V5 #PWR29
 U 1 1 58D68750
 P 4250 900
-F 0 "#PWR038" H 4250 750 50  0001 C CNN
+F 0 "#PWR29" 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
@@ -1134,10 +1134,10 @@ $EndComp
 Wire Wire Line
 	6250 1000 7150 1000
 $Comp
-L +3V3 #PWR039
+L +3V3 #PWR32
 U 1 1 58D69259
 P 6350 900
-F 0 "#PWR039" H 6350 750 50  0001 C CNN
+F 0 "#PWR32" 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
@@ -1156,10 +1156,10 @@ F 3 "" H 2100 3550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR040
+L GND #PWR22
 U 1 1 58D7085C
 P 2100 4050
-F 0 "#PWR040" 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
@@ -1196,10 +1196,10 @@ Wire Wire Line
 Wire Wire Line
 	2800 3750 2800 3800
 $Comp
-L GND #PWR041
+L GND #PWR25
 U 1 1 58D72406
 P 2800 4150
-F 0 "#PWR041" H 2800 3900 50  0001 C CNN
+F 0 "#PWR25" 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
@@ -1215,10 +1215,10 @@ Wire Wire Line
 Wire Wire Line
 	2100 3150 2100 3050
 $Comp
-L +2V5 #PWR042
+L +2V5 #PWR21
 U 1 1 58D73C82
 P 2100 3050
-F 0 "#PWR042" 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
@@ -1272,10 +1272,10 @@ Connection ~ 4150 4850
 Wire Wire Line
 	4150 5650 4150 6100
 $Comp
-L GND #PWR043
+L GND #PWR28
 U 1 1 58D7C223
 P 4150 6100
-F 0 "#PWR043" H 4150 5850 50  0001 C CNN
+F 0 "#PWR28" 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
@@ -1307,10 +1307,10 @@ F 3 "" H 4700 4150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR044
+L +3V3 #PWR30
 U 1 1 58D7CCF7
 P 4700 3900
-F 0 "#PWR044" H 4700 3750 50  0001 C CNN
+F 0 "#PWR30" 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
@@ -1325,8 +1325,6 @@ Wire Wire Line
 	2500 3650 3050 3650
 Text Label 2550 3650 0    60   ~ 0
 WAKEUPn
-Text GLabel 2550 5500 0    60   Input ~ 0
-SHUTDOWN
 Wire Wire Line
 	3550 6000 3550 5900
 Wire Wire Line
@@ -1346,15 +1344,13 @@ F 3 "" H 3550 5750 50  0000 C CNN
 	1    3550 5750
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3550 5500 3550 5600
 Wire Wire Line
 	3100 5500 3650 5500
 $Comp
-L D_Schottky D12
+L D_Schottky D15
 U 1 1 58D84D8A
 P 2950 5500
-F 0 "D12" H 2950 5600 50  0000 C CNN
+F 0 "D15" 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
@@ -1375,8 +1371,6 @@ F 3 "" H 3250 5750 50  0000 C CNN
 	1    3250 5750
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3250 5500 3250 5600
 Connection ~ 3250 5500
 Wire Wire Line
 	3250 5900 3250 6000
@@ -1411,10 +1405,10 @@ Wire Wire Line
 Text Label 3400 3650 0    60   ~ 0
 WKn
 $Comp
-L D D14
+L D D12
 U 1 1 58D7BC4A
 P 3650 4850
-F 0 "D14" H 3650 4950 50  0000 C CNN
+F 0 "D12" 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
@@ -1486,8 +1480,6 @@ 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
@@ -1509,10 +1501,10 @@ F 3 "" H 3900 4150 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR045
+L GND #PWR26
 U 1 1 58DA2E46
 P 3900 4300
-F 0 "#PWR045" H 3900 4050 50  0001 C CNN
+F 0 "#PWR26" H 3900 4050 50  0001 C CNN
 F 1 "GND" H 3900 4150 50  0000 C CNN
 F 2 "" H 3900 4300 50  0000 C CNN
 F 3 "" H 3900 4300 50  0000 C CNN
@@ -1520,10 +1512,10 @@ F 3 "" H 3900 4300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR046
+L +5V #PWR27
 U 1 1 58D67C25
 P 4150 3300
-F 0 "#PWR046" H 4150 3150 50  0001 C CNN
+F 0 "#PWR27" H 4150 3150 50  0001 C CNN
 F 1 "+5V" H 4150 3440 50  0000 C CNN
 F 2 "" H 4150 3300 50  0000 C CNN
 F 3 "" H 4150 3300 50  0000 C CNN
@@ -1541,4 +1533,36 @@ Wire Wire Line
 Connection ~ 3900 3900
 Text Notes 3100 4550 0    60   ~ 0
 D13 discharges\nC13 at shutdown
+$Comp
+L D D14
+U 1 1 58DA55D7
+P 3250 5300
+F 0 "D14" H 3250 5400 50  0000 C CNN
+F 1 "1N4148" H 3250 5200 50  0000 C CNN
+F 2 "Diodes_SMD:D_0805" H 3250 5300 50  0001 C CNN
+F 3 "" H 3250 5300 50  0000 C CNN
+	1    3250 5300
+	0    1    1    0   
+$EndComp
+$Comp
+L +3V3 #PWR24
+U 1 1 58DA569C
+P 3250 5150
+F 0 "#PWR24" H 3250 5000 50  0001 C CNN
+F 1 "+3V3" H 3250 5290 50  0000 C CNN
+F 2 "" H 3250 5150 50  0000 C CNN
+F 3 "" H 3250 5150 50  0000 C CNN
+	1    3250 5150
+	1    0    0    -1  
+$EndComp
+Text Notes 2300 5300 0    60   ~ 0
+D14 discharges\nC14 at shutdown
+Text GLabel 2550 5500 0    60   Input ~ 0
+SHUTDOWN
+Wire Wire Line
+	2700 5500 2700 5600
+Wire Wire Line
+	3250 5450 3250 5600
+Wire Wire Line
+	3550 5500 3550 5600
 $EndSCHEMATC

power.sch

@@ -50,10 +50,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR020
+L GND #PWR20
 U 1 1 58D54769
 P 1100 2650
-F 0 "#PWR020" 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 #PWR021
+L GND #PWR39
 U 1 1 58D58A0B
 P 8500 3850
-F 0 "#PWR021" H 8500 3600 50  0001 C CNN
+F 0 "#PWR39" 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 #PWR022
+L +5V #PWR33
 U 1 1 58D58F93
 P 7850 3200
-F 0 "#PWR022" H 7850 3050 50  0001 C CNN
+F 0 "#PWR33" 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 #PWR023
+L GND #PWR34
 U 1 1 58D5989A
 P 7850 3850
-F 0 "#PWR023" H 7850 3600 50  0001 C CNN
+F 0 "#PWR34" 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
@@ -171,10 +171,10 @@ F 3 "" H 10050 3450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR024
+L GND #PWR42
 U 1 1 58D5AE5E
 P 10250 3550
-F 0 "#PWR024" H 10250 3300 50  0001 C CNN
+F 0 "#PWR42" 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 #PWR025
+L +3V3 #PWR31
 U 1 1 58D5CFDD
 P 4750 900
-F 0 "#PWR025" H 4750 750 50  0001 C CNN
+F 0 "#PWR31" 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 #PWR026
+L GND #PWR41
 U 1 1 58D6294C
 P 8500 6250
-F 0 "#PWR026" H 8500 6000 50  0001 C CNN
+F 0 "#PWR41" 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 #PWR027
+L +5V #PWR37
 U 1 1 58D62952
 P 7850 5600
-F 0 "#PWR027" H 7850 5450 50  0001 C CNN
+F 0 "#PWR37" 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 #PWR028
+L GND #PWR38
 U 1 1 58D62958
 P 7850 6250
-F 0 "#PWR028" H 7850 6000 50  0001 C CNN
+F 0 "#PWR38" 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
@@ -773,10 +773,10 @@ F 3 "" H 10050 5850 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR029
+L GND #PWR44
 U 1 1 58D62982
 P 10250 5950
-F 0 "#PWR029" H 10250 5700 50  0001 C CNN
+F 0 "#PWR44" 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 #PWR030
+L +3V3 #PWR47
 U 1 1 58D62CE2
 P 10600 5400
-F 0 "#PWR030" H 10600 5250 50  0001 C CNN
+F 0 "#PWR47" 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 #PWR031
+L +1V2 #PWR45
 U 1 1 58D63C77
 P 10600 3000
-F 0 "#PWR031" H 10600 2850 50  0001 C CNN
+F 0 "#PWR45" 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 #PWR032
+L +1V2 #PWR23
 U 1 1 58D63D96
 P 2150 900
-F 0 "#PWR032" 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 #PWR033
+L GND #PWR40
 U 1 1 58D67BC0
 P 8500 5050
-F 0 "#PWR033" H 8500 4800 50  0001 C CNN
+F 0 "#PWR40" 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 #PWR034
+L +5V #PWR35
 U 1 1 58D67BC6
 P 7850 4400
-F 0 "#PWR034" H 7850 4250 50  0001 C CNN
+F 0 "#PWR35" 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 #PWR035
+L GND #PWR36
 U 1 1 58D67BCC
 P 7850 5050
-F 0 "#PWR035" H 7850 4800 50  0001 C CNN
+F 0 "#PWR36" 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
@@ -988,10 +988,10 @@ F 3 "" H 10050 4650 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR036
+L GND #PWR43
 U 1 1 58D67BF0
 P 10250 4750
-F 0 "#PWR036" H 10250 4500 50  0001 C CNN
+F 0 "#PWR43" 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
@@ -1080,10 +1080,10 @@ $EndComp
 Wire Wire Line
 	4150 4450 4150 4300
 $Comp
-L +2V5 #PWR037
+L +2V5 #PWR46
 U 1 1 58D681D4
 P 10600 4200
-F 0 "#PWR037" H 10600 4050 50  0001 C CNN
+F 0 "#PWR46" 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
@@ -1121,10 +1121,10 @@ Wire Wire Line
 Wire Wire Line
 	4650 1000 4650 1100
 $Comp
-L +2V5 #PWR038
+L +2V5 #PWR29
 U 1 1 58D68750
 P 4250 900
-F 0 "#PWR038" H 4250 750 50  0001 C CNN
+F 0 "#PWR29" 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
@@ -1134,10 +1134,10 @@ $EndComp
 Wire Wire Line
 	6250 1000 7150 1000
 $Comp
-L +3V3 #PWR039
+L +3V3 #PWR32
 U 1 1 58D69259
 P 6350 900
-F 0 "#PWR039" H 6350 750 50  0001 C CNN
+F 0 "#PWR32" 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
@@ -1156,10 +1156,10 @@ F 3 "" H 2100 3550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR040
+L GND #PWR22
 U 1 1 58D7085C
 P 2100 4050
-F 0 "#PWR040" 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
@@ -1196,10 +1196,10 @@ Wire Wire Line
 Wire Wire Line
 	2800 3750 2800 3800
 $Comp
-L GND #PWR041
+L GND #PWR24
 U 1 1 58D72406
 P 2800 4150
-F 0 "#PWR041" 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
@@ -1215,10 +1215,10 @@ Wire Wire Line
 Wire Wire Line
 	2100 3150 2100 3050
 $Comp
-L +2V5 #PWR042
+L +2V5 #PWR21
 U 1 1 58D73C82
 P 2100 3050
-F 0 "#PWR042" 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
@@ -1272,10 +1272,10 @@ Connection ~ 4150 4850
 Wire Wire Line
 	4150 5650 4150 6100
 $Comp
-L GND #PWR043
+L GND #PWR28
 U 1 1 58D7C223
 P 4150 6100
-F 0 "#PWR043" H 4150 5850 50  0001 C CNN
+F 0 "#PWR28" 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
@@ -1307,10 +1307,10 @@ F 3 "" H 4700 4150 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR044
+L +3V3 #PWR30
 U 1 1 58D7CCF7
 P 4700 3900
-F 0 "#PWR044" H 4700 3750 50  0001 C CNN
+F 0 "#PWR30" 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
@@ -1325,8 +1325,6 @@ Wire Wire Line
 	2500 3650 3050 3650
 Text Label 2550 3650 0    60   ~ 0
 WAKEUPn
-Text GLabel 2550 5500 0    60   Input ~ 0
-SHUTDOWN
 Wire Wire Line
 	3550 6000 3550 5900
 Wire Wire Line
@@ -1346,15 +1344,13 @@ F 3 "" H 3550 5750 50  0000 C CNN
 	1    3550 5750
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3550 5500 3550 5600
 Wire Wire Line
 	3100 5500 3650 5500
 $Comp
-L D_Schottky D12
+L D_Schottky D15
 U 1 1 58D84D8A
 P 2950 5500
-F 0 "D12" H 2950 5600 50  0000 C CNN
+F 0 "D15" 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
@@ -1375,8 +1371,6 @@ F 3 "" H 3250 5750 50  0000 C CNN
 	1    3250 5750
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	3250 5500 3250 5600
 Connection ~ 3250 5500
 Wire Wire Line
 	3250 5900 3250 6000
@@ -1411,10 +1405,10 @@ Wire Wire Line
 Text Label 3400 3650 0    60   ~ 0
 WKn
 $Comp
-L D D14
+L D D12
 U 1 1 58D7BC4A
 P 3650 4850
-F 0 "D14" H 3650 4950 50  0000 C CNN
+F 0 "D12" 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
@@ -1486,8 +1480,6 @@ 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
@@ -1509,10 +1501,10 @@ F 3 "" H 3900 4150 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR045
+L GND #PWR26
 U 1 1 58DA2E46
 P 3900 4300
-F 0 "#PWR045" H 3900 4050 50  0001 C CNN
+F 0 "#PWR26" H 3900 4050 50  0001 C CNN
 F 1 "GND" H 3900 4150 50  0000 C CNN
 F 2 "" H 3900 4300 50  0000 C CNN
 F 3 "" H 3900 4300 50  0000 C CNN
@@ -1520,10 +1512,10 @@ F 3 "" H 3900 4300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR046
+L +5V #PWR27
 U 1 1 58D67C25
 P 4150 3300
-F 0 "#PWR046" H 4150 3150 50  0001 C CNN
+F 0 "#PWR27" H 4150 3150 50  0001 C CNN
 F 1 "+5V" H 4150 3440 50  0000 C CNN
 F 2 "" H 4150 3300 50  0000 C CNN
 F 3 "" H 4150 3300 50  0000 C CNN
@@ -1539,6 +1531,38 @@ Wire Wire Line
 Wire Wire Line
 	4150 3900 3900 3900
 Connection ~ 3900 3900
-Text Notes 3100 4550 0    60   ~ 0
+Text Notes 3050 4550 0    60   ~ 0
 D13 discharges\nC13 at shutdown
+$Comp
+L D D14
+U 1 1 58DA55D7
+P 3250 5300
+F 0 "D14" H 3250 5400 50  0000 C CNN
+F 1 "1N4148" H 3250 5200 50  0000 C CNN
+F 2 "Diodes_SMD:D_0805" H 3250 5300 50  0001 C CNN
+F 3 "" H 3250 5300 50  0000 C CNN
+	1    3250 5300
+	0    1    1    0   
+$EndComp
+$Comp
+L +3V3 #PWR25
+U 1 1 58DA569C
+P 3250 5150
+F 0 "#PWR25" H 3250 5000 50  0001 C CNN
+F 1 "+3V3" H 3250 5290 50  0000 C CNN
+F 2 "" H 3250 5150 50  0000 C CNN
+F 3 "" H 3250 5150 50  0000 C CNN
+	1    3250 5150
+	1    0    0    -1  
+$EndComp
+Text Notes 2300 5300 0    60   ~ 0
+D14 discharges\nC14 at shutdown
+Text GLabel 2550 5500 0    60   Input ~ 0
+SHUTDOWN
+Wire Wire Line
+	2700 5500 2700 5600
+Wire Wire Line
+	3250 5450 3250 5600
+Wire Wire Line
+	3550 5500 3550 5600
 $EndSCHEMATC

ram.bak

@@ -82,10 +82,10 @@ Wire Wire Line
 	5250 2000 5250 2200
 Connection ~ 5250 2100
 $Comp
-L +3V3 #PWR084
+L +3V3 #PWR85
 U 1 1 58D928FF
 P 5250 2000
-F 0 "#PWR084" H 5250 1850 50  0001 C CNN
+F 0 "#PWR85" H 5250 1850 50  0001 C CNN
 F 1 "+3V3" H 5250 2140 50  0000 C CNN
 F 2 "" H 5250 2000 50  0000 C CNN
 F 3 "" H 5250 2000 50  0000 C CNN
@@ -93,10 +93,10 @@ F 3 "" H 5250 2000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR085
+L +3V3 #PWR87
 U 1 1 58D92915
 P 5550 2000
-F 0 "#PWR085" H 5550 1850 50  0001 C CNN
+F 0 "#PWR87" H 5550 1850 50  0001 C CNN
 F 1 "+3V3" H 5550 2140 50  0000 C CNN
 F 2 "" H 5550 2000 50  0000 C CNN
 F 3 "" H 5550 2000 50  0000 C CNN
@@ -125,10 +125,10 @@ Wire Wire Line
 	5650 4800 5650 4900
 Connection ~ 5650 4900
 $Comp
-L GND #PWR086
+L GND #PWR86
 U 1 1 58D929C8
 P 5250 5000
-F 0 "#PWR086" H 5250 4750 50  0001 C CNN
+F 0 "#PWR86" H 5250 4750 50  0001 C CNN
 F 1 "GND" H 5250 4850 50  0000 C CNN
 F 2 "" H 5250 5000 50  0000 C CNN
 F 3 "" H 5250 5000 50  0000 C CNN
@@ -136,10 +136,10 @@ F 3 "" H 5250 5000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR087
+L GND #PWR88
 U 1 1 58D929DE
 P 5550 5000
-F 0 "#PWR087" H 5550 4750 50  0001 C CNN
+F 0 "#PWR88" H 5550 4750 50  0001 C CNN
 F 1 "GND" H 5550 4850 50  0000 C CNN
 F 2 "" H 5550 5000 50  0000 C CNN
 F 3 "" H 5550 5000 50  0000 C CNN

ram.sch

@@ -82,10 +82,10 @@ Wire Wire Line
 	5250 2000 5250 2200
 Connection ~ 5250 2100
 $Comp
-L +3V3 #PWR084
+L +3V3 #PWR85
 U 1 1 58D928FF
 P 5250 2000
-F 0 "#PWR084" H 5250 1850 50  0001 C CNN
+F 0 "#PWR85" H 5250 1850 50  0001 C CNN
 F 1 "+3V3" H 5250 2140 50  0000 C CNN
 F 2 "" H 5250 2000 50  0000 C CNN
 F 3 "" H 5250 2000 50  0000 C CNN
@@ -93,10 +93,10 @@ F 3 "" H 5250 2000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR085
+L +3V3 #PWR87
 U 1 1 58D92915
 P 5550 2000
-F 0 "#PWR085" H 5550 1850 50  0001 C CNN
+F 0 "#PWR87" H 5550 1850 50  0001 C CNN
 F 1 "+3V3" H 5550 2140 50  0000 C CNN
 F 2 "" H 5550 2000 50  0000 C CNN
 F 3 "" H 5550 2000 50  0000 C CNN
@@ -125,10 +125,10 @@ Wire Wire Line
 	5650 4800 5650 4900
 Connection ~ 5650 4900
 $Comp
-L GND #PWR086
+L GND #PWR86
 U 1 1 58D929C8
 P 5250 5000
-F 0 "#PWR086" H 5250 4750 50  0001 C CNN
+F 0 "#PWR86" H 5250 4750 50  0001 C CNN
 F 1 "GND" H 5250 4850 50  0000 C CNN
 F 2 "" H 5250 5000 50  0000 C CNN
 F 3 "" H 5250 5000 50  0000 C CNN
@@ -136,10 +136,10 @@ F 3 "" H 5250 5000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR087
+L GND #PWR88
 U 1 1 58D929DE
 P 5550 5000
-F 0 "#PWR087" H 5550 4750 50  0001 C CNN
+F 0 "#PWR88" H 5550 4750 50  0001 C CNN
 F 1 "GND" H 5550 4850 50  0000 C CNN
 F 2 "" H 5550 5000 50  0000 C CNN
 F 3 "" H 5550 5000 50  0000 C CNN

sdcard.bak

@@ -79,10 +79,10 @@ Wire Wire Line
 Wire Wire Line
 	1850 6450 2400 6450
 $Comp
-L GND #PWR089
+L GND #PWR91
 U 1 1 58DA7C6F
 P 1850 6150
-F 0 "#PWR089" H 1850 5900 50  0001 C CNN
+F 0 "#PWR91" 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
@@ -90,10 +90,10 @@ F 3 "" H 1850 6150 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR090
+L GND #PWR92
 U 1 1 58DA7C70
 P 1850 6450
-F 0 "#PWR090" H 1850 6200 50  0001 C CNN
+F 0 "#PWR92" 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
@@ -109,10 +109,10 @@ Wire Wire Line
 Text Label 4250 6150 0    60   ~ 0
 SD_WP
 $Comp
-L GND #PWR091
+L GND #PWR93
 U 1 1 58DA7C71
 P 4300 6550
-F 0 "#PWR091" H 4300 6300 50  0001 C CNN
+F 0 "#PWR93" 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
@@ -127,10 +127,10 @@ Wire Wire Line
 	4200 6450 4300 6450
 Connection ~ 4300 6450
 $Comp
-L +3V3 #PWR092
+L +3V3 #PWR90
 U 1 1 58DA7C72
 P 1700 6250
-F 0 "#PWR092" H 1700 6100 50  0001 C CNN
+F 0 "#PWR90" H 1700 6100 50  0001 C CNN
 F 1 "+3V3" H 1700 6390 50  0000 C CNN
 F 2 "" H 1700 6250 50  0000 C CNN
 F 3 "" H 1700 6250 50  0000 C CNN

sdcard.sch

@@ -79,10 +79,10 @@ Wire Wire Line
 Wire Wire Line
 	1850 6450 2400 6450
 $Comp
-L GND #PWR089
+L GND #PWR91
 U 1 1 58DA7C6F
 P 1850 6150
-F 0 "#PWR089" H 1850 5900 50  0001 C CNN
+F 0 "#PWR91" 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
@@ -90,10 +90,10 @@ F 3 "" H 1850 6150 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR090
+L GND #PWR92
 U 1 1 58DA7C70
 P 1850 6450
-F 0 "#PWR090" H 1850 6200 50  0001 C CNN
+F 0 "#PWR92" 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
@@ -109,10 +109,10 @@ Wire Wire Line
 Text Label 4250 6150 0    60   ~ 0
 SD_WP
 $Comp
-L GND #PWR091
+L GND #PWR93
 U 1 1 58DA7C71
 P 4300 6550
-F 0 "#PWR091" H 4300 6300 50  0001 C CNN
+F 0 "#PWR93" 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
@@ -127,10 +127,10 @@ Wire Wire Line
 	4200 6450 4300 6450
 Connection ~ 4300 6450
 $Comp
-L +3V3 #PWR092
+L +3V3 #PWR90
 U 1 1 58DA7C72
 P 1700 6250
-F 0 "#PWR092" H 1700 6100 50  0001 C CNN
+F 0 "#PWR90" H 1700 6100 50  0001 C CNN
 F 1 "+3V3" H 1700 6390 50  0000 C CNN
 F 2 "" H 1700 6250 50  0000 C CNN
 F 3 "" H 1700 6250 50  0000 C CNN

ulx3s.kicad_pcb

@@ -1,14 +1,14 @@
 (kicad_pcb (version 4) (host pcbnew 4.0.5+dfsg1-4)
 
   (general
-    (links 487)
+    (links 489)
-    (no_connects 485)
+    (no_connects 487)
     (area 93.949999 61.269999 178.070001 109.830001)
     (thickness 1.6)
     (drawings 10)
     (tracks 14)
     (zones 0)
-    (modules 100)
+    (modules 101)
     (nets 147)
   )
 
@@ -2454,7 +2454,7 @@
     (tags "smd diode")
     (path /58D51CAD/58D84D8A)
     (attr smd)
-    (fp_text reference D12 (at 0 -1.6 270) (layer B.SilkS)
+    (fp_text reference D15 (at 0 -1.6 270) (layer B.SilkS)
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_text value BAT42 (at 0 1.6 270) (layer B.Fab)
@@ -2488,7 +2488,7 @@
     (tags "smd diode")
     (path /58D51CAD/58D7BC4A)
     (attr smd)
-    (fp_text reference D14 (at 0 -1.6 90) (layer B.SilkS)
+    (fp_text reference D12 (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)
@@ -5343,6 +5343,40 @@
       (net 1 GND))
   )
 
+  (module Diodes_SMD:D_0805 (layer B.Cu) (tedit 574BBB4C) (tstamp 58DA41B7)
+    (at 162.68 80.47)
+    (descr "Diode SMD in 0805 package")
+    (tags "smd diode")
+    (path /58D51CAD/58DA55D7)
+    (attr smd)
+    (fp_text reference D14 (at 0 -1.6) (layer B.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
+    )
+    (fp_text value 1N4148 (at 0 1.6) (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))
+    (fp_line (start 1.8 -0.9) (end -1.8 -0.9) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 1.8 0.9) (end 1.8 -0.9) (layer B.CrtYd) (width 0.05))
+    (fp_line (start -1.8 0.9) (end 1.8 0.9) (layer B.CrtYd) (width 0.05))
+    (fp_line (start 0.2 0) (end 0.4 0) (layer B.Fab) (width 0.15))
+    (fp_line (start -0.1 0) (end -0.3 0) (layer B.Fab) (width 0.15))
+    (fp_line (start -0.1 0.2) (end -0.1 -0.2) (layer B.Fab) (width 0.15))
+    (fp_line (start 0.2 -0.2) (end 0.2 0.2) (layer B.Fab) (width 0.15))
+    (fp_line (start -0.1 0) (end 0.2 -0.2) (layer B.Fab) (width 0.15))
+    (fp_line (start 0.2 0.2) (end -0.1 0) (layer B.Fab) (width 0.15))
+    (fp_line (start -1 -0.6) (end -1 0.6) (layer B.Fab) (width 0.15))
+    (fp_line (start 1 -0.6) (end -1 -0.6) (layer B.Fab) (width 0.15))
+    (fp_line (start 1 0.6) (end 1 -0.6) (layer B.Fab) (width 0.15))
+    (fp_line (start -1 0.6) (end 1 0.6) (layer B.Fab) (width 0.15))
+    (fp_line (start -1.1 -0.7) (end 0.7 -0.7) (layer B.SilkS) (width 0.15))
+    (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) (size 0.8 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 61 +3V3))
+    (pad 2 smd rect (at 1.05 0) (size 0.8 0.9) (layers B.Cu B.Paste B.Mask)
+      (net 91 /power/SHUT))
+  )
+
   (gr_line (start 137.28 99.52) (end 137.28 63.96) (layer Eco2.User) (width 0.2))
   (gr_line (start 172.84 99.52) (end 137.28 99.52) (layer Eco2.User) (width 0.2))
   (gr_line (start 172.84 63.96) (end 172.84 99.52) (layer Eco2.User) (width 0.2))

ulx3s.kicad_pcb-bak

@@ -1,8 +1,8 @@
 (kicad_pcb (version 4) (host pcbnew 4.0.5+dfsg1-4)
 
   (general
-    (links 483)
+    (links 487)
-    (no_connects 481)
+    (no_connects 485)
     (area 93.949999 61.269999 178.070001 109.830001)
     (thickness 1.6)
     (drawings 10)
@@ -4967,9 +4967,12 @@
     (fp_line (start 3.99796 0.3175) (end 4.99872 4.318) (layer B.SilkS) (width 0.254))
     (fp_line (start -7.493 6.096) (end 7.493 -6.096) (layer B.Fab) (width 0.127))
     (fp_line (start 7.493 6.096) (end -7.493 -6.096) (layer B.Fab) (width 0.127))
-    (pad 0 thru_hole oval (at 7.3 -4.6 180) (size 1.3 2.7) (drill oval 0.8 2.2) (layers *.Cu *.Mask B.SilkS))
+    (pad 0 thru_hole oval (at 7.3 -4.6 180) (size 1.3 2.7) (drill oval 0.8 2.2) (layers *.Cu *.Mask B.SilkS)
-    (pad 0 thru_hole oval (at -7.3 -4.6 180) (size 1.3 2.7) (drill oval 0.8 2.2) (layers *.Cu *.Mask B.SilkS))
+      (net 1 GND))
-    (pad 0 thru_hole oval (at -7.3 1.45 180) (size 1.3 2.3) (drill oval 0.8 1.8) (layers *.Cu *.Mask B.SilkS))
+    (pad 0 thru_hole oval (at -7.3 -4.6 180) (size 1.3 2.7) (drill oval 0.8 2.2) (layers *.Cu *.Mask B.SilkS)
+      (net 1 GND))
+    (pad 0 thru_hole oval (at -7.3 1.45 180) (size 1.3 2.3) (drill oval 0.8 1.8) (layers *.Cu *.Mask B.SilkS)
+      (net 1 GND))
     (pad 1 smd rect (at -4.5 -5.55 90) (size 1.6 0.25) (layers B.Cu B.Paste B.Mask)
       (solder_mask_margin 0.05) (solder_paste_margin -0.01))
     (pad 2 smd rect (at -4 -5.55 90) (size 1.6 0.25) (layers B.Cu B.Paste B.Mask)
@@ -5008,7 +5011,8 @@
       (net 112 GPDI_5V_SDA) (solder_mask_margin 0.05) (solder_paste_margin -0.01))
     (pad 19 smd rect (at 4.5 -5.55 90) (size 1.6 0.25) (layers B.Cu B.Paste B.Mask)
       (net 2 +5V) (solder_mask_margin 0.05) (solder_paste_margin -0.01))
-    (pad 0 thru_hole oval (at 7.3 1.45 180) (size 1.3 2.3) (drill oval 0.8 1.8) (layers *.Cu *.Mask B.SilkS))
+    (pad 0 thru_hole oval (at 7.3 1.45 180) (size 1.3 2.3) (drill oval 0.8 1.8) (layers *.Cu *.Mask B.SilkS)
+      (net 1 GND))
   )
 
   (module Housings_SOIC:SOIC-8_3.9x4.9mm_Pitch1.27mm (layer B.Cu) (tedit 54130A77) (tstamp 58D911E2)

ulx3s.net

@@ -1,7 +1,7 @@
 (export (version D)
   (design
-    (source /home/davor/tmp/ulx3s/ulx3s.sch)
+    (source /home/davor/src/circuits/fpga/ulx3s/ulx3s.sch)
-    (date "Uto 28 Ožu 2017 11:06:07")
+    (date "Uto 28 Ožu 2017 12:54:11")
     (tool "Eeschema 4.0.5+dfsg1-4")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -359,7 +359,7 @@
       (libsource (lib device) (part C))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D84952))
-    (comp (ref D12)
+    (comp (ref D15)
       (value BAT42)
       (footprint Diodes_SMD:D_0805)
       (libsource (lib device) (part D_Schottky))
@@ -377,7 +377,7 @@
       (libsource (lib device) (part R))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58D7B291))
-    (comp (ref D14)
+    (comp (ref D12)
       (value 1N4148)
       (footprint Diodes_SMD:D_0805)
       (libsource (lib device) (part D))
@@ -419,6 +419,12 @@
       (libsource (lib device) (part D))
       (sheetpath (names /power/) (tstamps /58D51CAD/))
       (tstamp 58DA2DA9))
+    (comp (ref D14)
+      (value 1N4148)
+      (footprint Diodes_SMD:D_0805)
+      (libsource (lib device) (part D))
+      (sheetpath (names /power/) (tstamps /58D51CAD/))
+      (tstamp 58DA55D7))
     (comp (ref OLED1)
       (value CONN_01X07)
       (footprint Socket_Strips:Socket_Strip_Straight_1x07)
@@ -1607,126 +1613,124 @@
         (pin (num 5) (name GND) (type power_in))
         (pin (num 6) (name shield) (type passive)))))
   (libraries
-    (library (logical ft2232)
-      (uri footprints/usbserial/ft2232.lib))
-    (library (logical conn)
-      (uri /usr/share/kicad/library/conn.lib))
     (library (logical memory)
       (uri /usr/share/kicad/library/memory.lib))
-    (library (logical device)
+    (library (logical philips)
-      (uri /usr/share/kicad/library/device.lib))
+      (uri /usr/share/kicad/library/philips.lib))
-    (library (logical lfe5bg381)
-      (uri footprints/lattice/lfe5bg381.lib))
     (library (logical micro-hdmi-d)
       (uri footprints/micro-hdmi-d/micro-hdmi-d.lib))
-    (library (logical ap3429a)
-      (uri footprints/dcdc_converter/ap3429a.lib))
     (library (logical ESP8266)
       (uri footprints/esp8266/ESP8266.lib))
-    (library (logical philips)
+    (library (logical lfe5bg381)
-      (uri /usr/share/kicad/library/philips.lib)))
+      (uri footprints/lattice/lfe5bg381.lib))
+    (library (logical ft2232)
+      (uri footprints/usbserial/ft2232.lib))
+    (library (logical ap3429a)
+      (uri footprints/dcdc_converter/ap3429a.lib))
+    (library (logical conn)
+      (uri /usr/share/kicad/library/conn.lib))
+    (library (logical device)
+      (uri /usr/share/kicad/library/device.lib)))
   (nets
     (net (code 1) (name +5V)
-      (node (ref GPDI1) (pin 19))
-      (node (ref C9) (pin 1))
-      (node (ref C18) (pin 1))
-      (node (ref D51) (pin 1))
       (node (ref D9) (pin 2))
       (node (ref D8) (pin 1))
+      (node (ref D51) (pin 1))
       (node (ref C5) (pin 1))
+      (node (ref C13) (pin 1))
       (node (ref U3) (pin 4))
+      (node (ref Q1) (pin 2))
+      (node (ref U5) (pin 4))
       (node (ref R24) (pin 1))
       (node (ref R25) (pin 1))
-      (node (ref C13) (pin 1))
       (node (ref R26) (pin 1))
-      (node (ref U5) (pin 4))
+      (node (ref C9) (pin 1))
-      (node (ref Q1) (pin 2))
+      (node (ref C18) (pin 1))
-      (node (ref U4) (pin 4))
+      (node (ref GPDI1) (pin 19))
-      (node (ref C1) (pin 1)))
+      (node (ref C1) (pin 1))
+      (node (ref U4) (pin 4)))
     (net (code 2) (name +3V3)
-      (node (ref U8) (pin 8))
+      (node (ref U10) (pin 8))
+      (node (ref C8) (pin 1))
+      (node (ref U1) (pin F9))
+      (node (ref J3) (pin 20))
+      (node (ref U8) (pin 6))
       (node (ref R11) (pin 1))
       (node (ref R10) (pin 1))
       (node (ref R9) (pin 1))
-      (node (ref J1) (pin 63))
+      (node (ref U1) (pin J6))
-      (node (ref U6) (pin 50))
+      (node (ref SD1) (pin 4))
-      (node (ref U6) (pin 9))
+      (node (ref U11) (pin 2))
-      (node (ref U6) (pin 5))
+      (node (ref D11) (pin 2))
-      (node (ref U8) (pin 6))
+      (node (ref J3) (pin 19))
-      (node (ref U1) (pin L6))
+      (node (ref U1) (pin H7))
-      (node (ref J1) (pin 64))
+      (node (ref U1) (pin P10))
       (node (ref OLED1) (pin 2))
+      (node (ref U1) (pin M6))
+      (node (ref J3) (pin 2))
+      (node (ref U1) (pin F11))
+      (node (ref J1) (pin 63))
+      (node (ref J3) (pin 1))
+      (node (ref U1) (pin L7))
+      (node (ref U1) (pin J15))
       (node (ref U1) (pin L15))
       (node (ref U1) (pin M15))
-      (node (ref C8) (pin 1))
+      (node (ref R7) (pin 1))
+      (node (ref U1) (pin L6))
+      (node (ref J1) (pin 64))
       (node (ref R23) (pin 1))
-      (node (ref U1) (pin J15))
+      (node (ref U1) (pin H6))
-      (node (ref U11) (pin 2))
       (node (ref U1) (pin F12))
-      (node (ref U1) (pin M6))
       (node (ref R22) (pin 1))
-      (node (ref U1) (pin L14))
+      (node (ref J2) (pin 1))
-      (node (ref U1) (pin J6))
-      (node (ref U1) (pin F9))
-      (node (ref C7) (pin 1))
-      (node (ref U9) (pin 1))
-      (node (ref U9) (pin 3))
-      (node (ref U9) (pin 9))
-      (node (ref U9) (pin 43))
-      (node (ref U9) (pin 14))
-      (node (ref RA3) (pin 1))
-      (node (ref C6) (pin 1))
-      (node (ref U1) (pin F10))
-      (node (ref L2) (pin 2))
       (node (ref U2) (pin 8))
-      (node (ref D11) (pin 2))
+      (node (ref U8) (pin 8))
-      (node (ref U1) (pin P10))
+      (node (ref U9) (pin 3))
-      (node (ref U1) (pin L7))
+      (node (ref U1) (pin P9))
-      (node (ref J3) (pin 19))
+      (node (ref J2) (pin 2))
-      (node (ref J3) (pin 1))
-      (node (ref J3) (pin 2))
-      (node (ref U1) (pin H7))
-      (node (ref SD1) (pin 4))
-      (node (ref U1) (pin F11))
-      (node (ref U1) (pin H6))
-      (node (ref U10) (pin 8))
-      (node (ref J3) (pin 20))
-      (node (ref U9) (pin 27))
       (node (ref U9) (pin 49))
       (node (ref U6) (pin 16))
       (node (ref U6) (pin 36))
-      (node (ref U1) (pin P9))
-      (node (ref R7) (pin 1))
       (node (ref U6) (pin 44))
+      (node (ref C7) (pin 1))
+      (node (ref U9) (pin 1))
+      (node (ref RA3) (pin 1))
+      (node (ref U1) (pin F10))
+      (node (ref C6) (pin 1))
+      (node (ref L2) (pin 2))
+      (node (ref U9) (pin 14))
+      (node (ref U9) (pin 43))
+      (node (ref U1) (pin L14))
       (node (ref U1) (pin H15))
       (node (ref U1) (pin H14))
-      (node (ref J2) (pin 2))
+      (node (ref U6) (pin 5))
-      (node (ref J2) (pin 1)))
+      (node (ref U6) (pin 9))
+      (node (ref U9) (pin 27))
+      (node (ref U9) (pin 9))
+      (node (ref U6) (pin 50))
+      (node (ref D14) (pin 1)))
     (net (code 3) (name /gpio/P50)
-      (node (ref U1) (pin E13))
+      (node (ref J1) (pin 50))
-      (node (ref J1) (pin 50)))
+      (node (ref U1) (pin E13)))
     (net (code 4) (name /gpio/P52)
       (node (ref J1) (pin 52))
       (node (ref U1) (pin C13)))
     (net (code 5) (name /gpio/P54)
-      (node (ref J1) (pin 54))
+      (node (ref U1) (pin A13))
-      (node (ref U1) (pin A13)))
+      (node (ref J1) (pin 54)))
     (net (code 6) (name /gpio/P56)
       (node (ref J1) (pin 56))
       (node (ref U1) (pin E12)))
     (net (code 7) (name /gpio/P58)
-      (node (ref U1) (pin C12))
+      (node (ref J1) (pin 58))
-      (node (ref J1) (pin 58)))
+      (node (ref U1) (pin C12)))
     (net (code 8) (name /gpio/P60)
-      (node (ref J1) (pin 60))
+      (node (ref U1) (pin E11))
-      (node (ref U1) (pin E11)))
+      (node (ref J1) (pin 60)))
     (net (code 9) (name GND)
-      (node (ref U1) (pin Y6))
-      (node (ref U1) (pin T10))
-      (node (ref U1) (pin M10))
       (node (ref U1) (pin K11))
+      (node (ref U1) (pin Y6))
       (node (ref U1) (pin M2))
-      (node (ref U1) (pin M16))
       (node (ref U1) (pin V7))
       (node (ref U1) (pin W7))
       (node (ref U1) (pin Y7))
@@ -1744,10 +1748,14 @@
       (node (ref U1) (pin T6))
       (node (ref U1) (pin U6))
       (node (ref U1) (pin V6))
+      (node (ref U1) (pin V9))
+      (node (ref U1) (pin G10))
       (node (ref U1) (pin J10))
       (node (ref U1) (pin K10))
-      (node (ref U1) (pin G10))
+      (node (ref U1) (pin U9))
-      (node (ref U1) (pin P8))
+      (node (ref U1) (pin G12))
+      (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))
@@ -1759,9 +1767,9 @@
       (node (ref U1) (pin U11))
       (node (ref U1) (pin V11))
       (node (ref U1) (pin Y11))
-      (node (ref U1) (pin G12))
+      (node (ref U1) (pin M10))
       (node (ref U1) (pin M9))
-      (node (ref U1) (pin U10))
+      (node (ref U1) (pin P8))
       (node (ref U1) (pin T8))
       (node (ref U1) (pin U8))
       (node (ref U1) (pin V8))
@@ -1771,15 +1779,12 @@
       (node (ref U1) (pin K9))
       (node (ref U1) (pin L9))
       (node (ref U1) (pin T9))
-      (node (ref U1) (pin U9))
+      (node (ref U1) (pin M14))
-      (node (ref U1) (pin V9))
-      (node (ref U1) (pin K14))
-      (node (ref C12) (pin 2))
       (node (ref BAT1) (pin 2))
+      (node (ref RB2) (pin 1))
       (node (ref U7) (pin 4))
       (node (ref U1) (pin J14))
-      (node (ref C11) (pin 2))
+      (node (ref U1) (pin K14))
-      (node (ref U1) (pin M14))
       (node (ref U1) (pin N14))
       (node (ref U1) (pin P14))
       (node (ref U1) (pin U14))
@@ -1790,22 +1795,23 @@
       (node (ref U1) (pin N15))
       (node (ref U1) (pin V15))
       (node (ref U1) (pin W15))
-      (node (ref R13) (pin 2))
+      (node (ref U1) (pin M16))
-      (node (ref C14) (pin 2))
-      (node (ref R5) (pin 2))
-      (node (ref R2) (pin 2))
       (node (ref U1) (pin V16))
       (node (ref D13) (pin 2))
+      (node (ref R5) (pin 2))
+      (node (ref R2) (pin 2))
+      (node (ref U1) (pin W16))
       (node (ref Q2) (pin 2))
-      (node (ref RB2) (pin 1))
+      (node (ref R13) (pin 2))
-      (node (ref U1) (pin J12))
+      (node (ref C11) (pin 2))
-      (node (ref U1) (pin G17))
+      (node (ref C12) (pin 2))
       (node (ref U1) (pin C19))
       (node (ref U1) (pin H19))
       (node (ref U1) (pin R19))
       (node (ref U1) (pin V19))
       (node (ref U1) (pin W19))
       (node (ref U3) (pin 2))
+      (node (ref U1) (pin J12))
       (node (ref C1) (pin 2))
       (node (ref U1) (pin U7))
       (node (ref U1) (pin B7))
@@ -1813,7 +1819,7 @@
       (node (ref U1) (pin G7))
       (node (ref U1) (pin J7))
       (node (ref U1) (pin K7))
-      (node (ref U1) (pin M7))
+      (node (ref U1) (pin N7))
       (node (ref U1) (pin P7))
       (node (ref U1) (pin U13))
       (node (ref U1) (pin K12))
@@ -1826,7 +1832,7 @@
       (node (ref U1) (pin Y12))
       (node (ref U1) (pin F13))
       (node (ref U1) (pin G13))
-      (node (ref U1) (pin W16))
+      (node (ref U1) (pin G17))
       (node (ref U1) (pin P13))
       (node (ref U1) (pin T7))
       (node (ref U1) (pin V13))
@@ -1839,18 +1845,18 @@
       (node (ref GPDI1) (pin 10))
       (node (ref GPDI1) (pin 4))
       (node (ref GPDI1) (pin 0))
+      (node (ref U11) (pin 1))
       (node (ref U8) (pin 7))
       (node (ref U8) (pin 5))
-      (node (ref U11) (pin 1))
+      (node (ref GPDI1) (pin 7))
       (node (ref C16) (pin 2))
       (node (ref C15) (pin 2))
-      (node (ref D0) (pin 1))
-      (node (ref OLED1) (pin 1))
       (node (ref D1) (pin 1))
+      (node (ref OLED1) (pin 1))
+      (node (ref D0) (pin 1))
       (node (ref D2) (pin 1))
       (node (ref D3) (pin 1))
       (node (ref D4) (pin 1))
-      (node (ref GPDI1) (pin 7))
       (node (ref GPDI1) (pin 16))
       (node (ref C18) (pin 2))
       (node (ref U9) (pin 12))
@@ -1879,27 +1885,28 @@
       (node (ref D7) (pin 1))
       (node (ref D6) (pin 1))
       (node (ref D5) (pin 1))
-      (node (ref U1) (pin N7))
+      (node (ref U1) (pin M7))
       (node (ref C9) (pin 2))
-      (node (ref C5) (pin 2))
+      (node (ref J1) (pin 62))
-      (node (ref C8) (pin 2))
-      (node (ref C7) (pin 2))
-      (node (ref J2) (pin 4))
       (node (ref RB3) (pin 1))
       (node (ref J3) (pin 21))
+      (node (ref C14) (pin 2))
       (node (ref J3) (pin 4))
-      (node (ref J3) (pin 3))
+      (node (ref U4) (pin 2))
+      (node (ref C5) (pin 2))
       (node (ref J3) (pin 22))
+      (node (ref J3) (pin 3))
+      (node (ref J1) (pin 4))
+      (node (ref J1) (pin 3))
       (node (ref J1) (pin 61))
-      (node (ref J2) (pin 3))
+      (node (ref C7) (pin 2))
-      (node (ref J1) (pin 62))
+      (node (ref J2) (pin 4))
-      (node (ref U4) (pin 2))
       (node (ref U5) (pin 2))
-      (node (ref J1) (pin 4))
+      (node (ref C8) (pin 2))
-      (node (ref J1) (pin 3)))
+      (node (ref J2) (pin 3)))
     (net (code 10) (name /gpio/PMODA1)
-      (node (ref U1) (pin J20))
+      (node (ref J2) (pin 5))
-      (node (ref J2) (pin 5)))
+      (node (ref U1) (pin J20)))
     (net (code 11) (name /gpio/PMODA2)
       (node (ref U1) (pin K20))
       (node (ref J2) (pin 6)))
@@ -1916,26 +1923,26 @@
       (node (ref U1) (pin K18))
       (node (ref J2) (pin 10)))
     (net (code 16) (name /gpio/PMODA7)
-      (node (ref J2) (pin 11))
+      (node (ref U1) (pin G19))
-      (node (ref U1) (pin G19)))
+      (node (ref J2) (pin 11)))
     (net (code 17) (name /gpio/PMODA8)
-      (node (ref J2) (pin 12))
+      (node (ref U1) (pin H20))
-      (node (ref U1) (pin H20)))
+      (node (ref J2) (pin 12)))
     (net (code 18) (name /gpio/PMODB1)
       (node (ref J3) (pin 5))
       (node (ref U1) (pin F20)))
     (net (code 19) (name /gpio/PMODB3)
-      (node (ref U1) (pin E20))
+      (node (ref J3) (pin 7))
-      (node (ref J3) (pin 7)))
+      (node (ref U1) (pin E20)))
     (net (code 20) (name /gpio/PMODB5)
-      (node (ref U1) (pin D20))
+      (node (ref J3) (pin 9))
-      (node (ref J3) (pin 9)))
+      (node (ref U1) (pin D20)))
     (net (code 21) (name /gpio/PMODB7)
-      (node (ref U1) (pin C20))
+      (node (ref J3) (pin 11))
-      (node (ref J3) (pin 11)))
+      (node (ref U1) (pin C20)))
     (net (code 22) (name /gpio/MP1)
-      (node (ref U1) (pin J17))
+      (node (ref J3) (pin 13))
-      (node (ref J3) (pin 13)))
+      (node (ref U1) (pin J17)))
     (net (code 23) (name /gpio/MP5)
       (node (ref J3) (pin 17))
       (node (ref U1) (pin G16)))
@@ -1945,23 +1952,23 @@
       (node (ref U1) (pin H18))
       (node (ref J3) (pin 15)))
     (net (code 26) (name /gpio/PMODC2)
-      (node (ref J3) (pin 24))
+      (node (ref U1) (pin G18))
-      (node (ref U1) (pin G18)))
+      (node (ref J3) (pin 24)))
     (net (code 27) (name /gpio/PMODC1)
       (node (ref U1) (pin F17))
       (node (ref J3) (pin 23)))
     (net (code 28) (name /gpio/PMODC3)
-      (node (ref U1) (pin E18))
+      (node (ref J3) (pin 25))
-      (node (ref J3) (pin 25)))
+      (node (ref U1) (pin E18)))
     (net (code 29) (name /gpio/PMODC5)
-      (node (ref J3) (pin 27))
+      (node (ref U1) (pin D18))
-      (node (ref U1) (pin D18)))
+      (node (ref J3) (pin 27)))
     (net (code 30) (name /gpio/PMODC7)
       (node (ref U1) (pin E16))
       (node (ref J3) (pin 29)))
     (net (code 31) (name /gpio/PMODC4)
-      (node (ref J3) (pin 26))
+      (node (ref U1) (pin F18))
-      (node (ref U1) (pin F18)))
+      (node (ref J3) (pin 26)))
     (net (code 32) (name /gpio/PMODC6)
       (node (ref U1) (pin E17))
       (node (ref J3) (pin 28)))
@@ -1972,8 +1979,8 @@
       (node (ref U1) (pin G20))
       (node (ref J3) (pin 6)))
     (net (code 35) (name /gpio/MP2)
-      (node (ref U1) (pin J16))
+      (node (ref J3) (pin 14))
-      (node (ref J3) (pin 14)))
+      (node (ref U1) (pin J16)))
     (net (code 36) (name /gpio/MP4)
       (node (ref J3) (pin 16))
       (node (ref U1) (pin H17)))
@@ -1984,16 +1991,16 @@
       (node (ref J3) (pin 8))
       (node (ref U1) (pin F19)))
     (net (code 39) (name /gpio/PMODB6)
-      (node (ref U1) (pin E19))
+      (node (ref J3) (pin 10))
-      (node (ref J3) (pin 10)))
+      (node (ref U1) (pin E19)))
     (net (code 40) (name /gpio/PMODB8)
-      (node (ref U1) (pin D19))
+      (node (ref J3) (pin 12))
-      (node (ref J3) (pin 12)))
+      (node (ref U1) (pin D19)))
     (net (code 41) (name "Net-(U1-PadD17)")
       (node (ref U1) (pin D17)))
     (net (code 42) (name /gpio/P38)
-      (node (ref J1) (pin 38))
+      (node (ref U1) (pin D16))
-      (node (ref U1) (pin D16)))
+      (node (ref J1) (pin 38)))
     (net (code 43) (name /gpio/P29)
       (node (ref U1) (pin A19))
       (node (ref J1) (pin 29)))
@@ -2004,41 +2011,41 @@
       (node (ref U1) (pin C7))
       (node (ref J1) (pin 21)))
     (net (code 46) (name /gpio/P22)
-      (node (ref J1) (pin 22))
+      (node (ref U1) (pin C6))
-      (node (ref U1) (pin C6)))
+      (node (ref J1) (pin 22)))
     (net (code 47) (name /gpio/P23)
       (node (ref J1) (pin 23))
       (node (ref U1) (pin D7)))
     (net (code 48) (name /gpio/P24)
-      (node (ref U1) (pin E7))
+      (node (ref J1) (pin 24))
-      (node (ref J1) (pin 24)))
+      (node (ref U1) (pin E7)))
     (net (code 49) (name /gpio/P25)
-      (node (ref U1) (pin D6))
+      (node (ref J1) (pin 25))
-      (node (ref J1) (pin 25)))
+      (node (ref U1) (pin D6)))
     (net (code 50) (name /gpio/P26)
-      (node (ref J1) (pin 26))
+      (node (ref U1) (pin E6))
-      (node (ref U1) (pin E6)))
+      (node (ref J1) (pin 26)))
     (net (code 51) (name /gpio/P27)
-      (node (ref J1) (pin 27))
+      (node (ref U1) (pin B6))
-      (node (ref U1) (pin B6)))
+      (node (ref J1) (pin 27)))
     (net (code 52) (name /gpio/P28)
       (node (ref U1) (pin A6))
       (node (ref J1) (pin 28)))
     (net (code 53) (name /gpio/P30)
-      (node (ref U1) (pin B20))
+      (node (ref J1) (pin 30))
-      (node (ref J1) (pin 30)))
+      (node (ref U1) (pin B20)))
     (net (code 54) (name /gpio/P31)
-      (node (ref J1) (pin 31))
+      (node (ref U1) (pin A18))
-      (node (ref U1) (pin A18)))
+      (node (ref J1) (pin 31)))
     (net (code 55) (name /gpio/P32)
-      (node (ref U1) (pin B19))
+      (node (ref J1) (pin 32))
-      (node (ref J1) (pin 32)))
+      (node (ref U1) (pin B19)))
     (net (code 56) (name /gpio/P33)
-      (node (ref J1) (pin 33))
+      (node (ref U1) (pin A17))
-      (node (ref U1) (pin A17)))
+      (node (ref J1) (pin 33)))
     (net (code 57) (name /gpio/P34)
-      (node (ref J1) (pin 34))
+      (node (ref U1) (pin B18))
-      (node (ref U1) (pin B18)))
+      (node (ref J1) (pin 34)))
     (net (code 58) (name /gpio/P35)
       (node (ref J1) (pin 35))
       (node (ref U1) (pin B17)))
@@ -2058,8 +2065,8 @@
       (node (ref U1) (pin B11))
       (node (ref J1) (pin 5)))
     (net (code 64) (name /gpio/P6)
-      (node (ref J1) (pin 6))
+      (node (ref U1) (pin C11))
-      (node (ref U1) (pin C11)))
+      (node (ref J1) (pin 6)))
     (net (code 65) (name /gpio/P7)
       (node (ref U1) (pin A10))
       (node (ref J1) (pin 7)))
@@ -2067,20 +2074,20 @@
       (node (ref U1) (pin A11))
       (node (ref J1) (pin 8)))
     (net (code 67) (name /gpio/P9)
-      (node (ref U1) (pin B10))
+      (node (ref J1) (pin 9))
-      (node (ref J1) (pin 9)))
+      (node (ref U1) (pin B10)))
     (net (code 68) (name /gpio/P11)
-      (node (ref U1) (pin C10))
+      (node (ref J1) (pin 11))
-      (node (ref J1) (pin 11)))
+      (node (ref U1) (pin C10)))
     (net (code 69) (name /gpio/P12)
       (node (ref U1) (pin B9))
       (node (ref J1) (pin 12)))
     (net (code 70) (name /gpio/P13)
-      (node (ref U1) (pin E9))
+      (node (ref J1) (pin 13))
-      (node (ref J1) (pin 13)))
+      (node (ref U1) (pin E9)))
     (net (code 71) (name /gpio/P14)
-      (node (ref J1) (pin 14))
+      (node (ref U1) (pin D9))
-      (node (ref U1) (pin D9)))
+      (node (ref J1) (pin 14)))
     (net (code 72) (name /gpio/P15)
       (node (ref U1) (pin A8))
       (node (ref J1) (pin 15)))
@@ -2088,19 +2095,19 @@
       (node (ref U1) (pin A7))
       (node (ref J1) (pin 16)))
     (net (code 74) (name /gpio/P17)
-      (node (ref J1) (pin 17))
+      (node (ref U1) (pin B8))
-      (node (ref U1) (pin B8)))
+      (node (ref J1) (pin 17)))
     (net (code 75) (name /gpio/P18)
-      (node (ref J1) (pin 18))
+      (node (ref U1) (pin C8))
-      (node (ref U1) (pin C8)))
+      (node (ref J1) (pin 18)))
     (net (code 76) (name /gpio/P48)
       (node (ref U1) (pin C14))
       (node (ref J1) (pin 48)))
     (net (code 77) (name /gpio/USB5V)
       (node (ref D52) (pin 2)))
     (net (code 78) (name /gpio/OUT5V)
-      (node (ref J1) (pin 2))
+      (node (ref D52) (pin 1))
-      (node (ref D52) (pin 1)))
+      (node (ref J1) (pin 2)))
     (net (code 79) (name /gpio/P46)
       (node (ref J1) (pin 46))
       (node (ref U1) (pin E14)))
@@ -2108,32 +2115,32 @@
       (node (ref J1) (pin 1))
       (node (ref D51) (pin 2)))
     (net (code 81) (name /gpio/P39)
-      (node (ref J1) (pin 39))
+      (node (ref U1) (pin A16))
-      (node (ref U1) (pin A16)))
+      (node (ref J1) (pin 39)))
     (net (code 82) (name /gpio/P41)
       (node (ref J1) (pin 41))
       (node (ref U1) (pin D15)))
     (net (code 83) (name /gpio/P43)
-      (node (ref J1) (pin 43))
+      (node (ref U1) (pin B15))
-      (node (ref U1) (pin B15)))
+      (node (ref J1) (pin 43)))
     (net (code 84) (name /gpio/P45)
       (node (ref J1) (pin 45))
       (node (ref U1) (pin D14)))
     (net (code 85) (name /gpio/P47)
-      (node (ref J1) (pin 47))
+      (node (ref U1) (pin A14))
-      (node (ref U1) (pin A14)))
+      (node (ref J1) (pin 47)))
     (net (code 86) (name /gpio/P49)
       (node (ref U1) (pin D13))
       (node (ref J1) (pin 49)))
     (net (code 87) (name /gpio/P51)
-      (node (ref U1) (pin B13))
+      (node (ref J1) (pin 51))
-      (node (ref J1) (pin 51)))
+      (node (ref U1) (pin B13)))
     (net (code 88) (name /gpio/P53)
       (node (ref U1) (pin A12))
       (node (ref J1) (pin 53)))
     (net (code 89) (name /gpio/P55)
-      (node (ref J1) (pin 55))
+      (node (ref U1) (pin D12))
-      (node (ref U1) (pin D12)))
+      (node (ref J1) (pin 55)))
     (net (code 90) (name /gpio/P57)
       (node (ref U1) (pin B12))
       (node (ref J1) (pin 57)))
@@ -2147,126 +2154,127 @@
       (node (ref U1) (pin E15))
       (node (ref J1) (pin 42)))
     (net (code 94) (name /gpio/P44)
-      (node (ref U1) (pin C15))
+      (node (ref J1) (pin 44))
-      (node (ref J1) (pin 44)))
+      (node (ref U1) (pin C15)))
     (net (code 95) (name "Net-(L2-Pad1)")
       (node (ref U4) (pin 3))
       (node (ref L2) (pin 1)))
-    (net (code 96) (name +1V2)
+    (net (code 96) (name "Net-(L1-Pad1)")
-      (node (ref U1) (pin N12))
-      (node (ref U1) (pin H13))
-      (node (ref U1) (pin N10))
-      (node (ref U1) (pin H10))
-      (node (ref C3) (pin 1))
-      (node (ref C4) (pin 1))
-      (node (ref U1) (pin N9))
-      (node (ref U1) (pin H9))
-      (node (ref U1) (pin H12))
-      (node (ref U1) (pin N11))
-      (node (ref U1) (pin H11))
-      (node (ref U1) (pin N8))
-      (node (ref U1) (pin M8))
-      (node (ref U1) (pin L8))
-      (node (ref U1) (pin K8))
-      (node (ref U1) (pin J8))
-      (node (ref U1) (pin H8))
-      (node (ref C2) (pin 1))
-      (node (ref L1) (pin 2))
-      (node (ref U1) (pin J13))
-      (node (ref U1) (pin K13))
-      (node (ref U1) (pin L13))
-      (node (ref U1) (pin M13))
-      (node (ref U1) (pin N13))
-      (node (ref RA1) (pin 1)))
-    (net (code 97) (name "Net-(L3-Pad1)")
-      (node (ref U5) (pin 3))
-      (node (ref L3) (pin 1)))
-    (net (code 98) (name "Net-(L1-Pad1)")
       (node (ref L1) (pin 1))
       (node (ref U3) (pin 3)))
-    (net (code 99) (name /power/WKUP)
+    (net (code 97) (name "Net-(L3-Pad1)")
-      (node (ref Q1) (pin 3))
+      (node (ref L3) (pin 1))
-      (node (ref D13) (pin 1))
+      (node (ref U5) (pin 3)))
-      (node (ref C13) (pin 2))
+    (net (code 98) (name /power/WKn)
-      (node (ref D10) (pin 2)))
+      (node (ref Q1) (pin 1))
-    (net (code 100) (name /power/WAKEUPn)
+      (node (ref R6) (pin 1)))
-      (node (ref U7) (pin 7))
+    (net (code 99) (name /power/HOLD)
-      (node (ref R6) (pin 2)))
-    (net (code 101) (name SHUTDOWN)
-      (node (ref D12) (pin 2))
-      (node (ref R13) (pin 1)))
-    (net (code 102) (name FTDI_nSUSPEND)
-      (node (ref U6) (pin 30))
-      (node (ref D14) (pin 2)))
-    (net (code 103) (name "Net-(Q2-Pad3)")
-      (node (ref R8) (pin 2))
-      (node (ref Q2) (pin 3)))
-    (net (code 104) (name /power/HOLD)
       (node (ref R4) (pin 1))
       (node (ref D11) (pin 1)))
-    (net (code 105) (name /power/SHUT)
+    (net (code 100) (name /power/WAKEUPn)
-      (node (ref Q2) (pin 1))
+      (node (ref R6) (pin 2))
-      (node (ref D12) (pin 1))
+      (node (ref U7) (pin 7)))
+    (net (code 101) (name FTDI_nSUSPEND)
+      (node (ref D12) (pin 2))
+      (node (ref U6) (pin 30)))
+    (net (code 102) (name /power/SHUT)
       (node (ref R5) (pin 1))
-      (node (ref C14) (pin 1)))
+      (node (ref D15) (pin 1))
-    (net (code 106) (name /power/WKn)
+      (node (ref C14) (pin 1))
-      (node (ref R6) (pin 1))
+      (node (ref D14) (pin 2))
-      (node (ref Q1) (pin 1)))
+      (node (ref Q2) (pin 1)))
-    (net (code 107) (name /power/OSCI_32k)
+    (net (code 103) (name SHUTDOWN)
+      (node (ref R13) (pin 1))
+      (node (ref D15) (pin 2)))
+    (net (code 104) (name /power/OSCI_32k)
       (node (ref Y1) (pin 1))
       (node (ref U7) (pin 1)))
-    (net (code 108) (name "Net-(Y1-Pad2)")
+    (net (code 105) (name "Net-(Q2-Pad3)")
+      (node (ref R8) (pin 2))
+      (node (ref Q2) (pin 3)))
+    (net (code 106) (name "Net-(Y1-Pad2)")
       (node (ref Y1) (pin 2)))
-    (net (code 109) (name "Net-(Y1-Pad3)")
+    (net (code 107) (name "Net-(Y1-Pad3)")
       (node (ref Y1) (pin 3)))
-    (net (code 110) (name /power/OSCO_32k)
+    (net (code 108) (name /power/OSCO_32k)
       (node (ref U7) (pin 2))
       (node (ref Y1) (pin 4)))
-    (net (code 111) (name /power/WAKE)
+    (net (code 109) (name /power/WAKE)
       (node (ref D10) (pin 1))
       (node (ref R1) (pin 1)))
-    (net (code 112) (name /power/FB1)
+    (net (code 110) (name +2V5)
-      (node (ref RA1) (pin 2))
+      (node (ref C12) (pin 1))
+      (node (ref C11) (pin 1))
+      (node (ref L3) (pin 2))
+      (node (ref C10) (pin 1))
+      (node (ref U1) (pin P6))
+      (node (ref U7) (pin 8))
+      (node (ref U1) (pin F15))
+      (node (ref U1) (pin P15))
+      (node (ref U1) (pin F6))
+      (node (ref RA2) (pin 1)))
+    (net (code 111) (name /power/FB1)
       (node (ref U3) (pin 5))
-      (node (ref C2) (pin 2))
+      (node (ref RB1) (pin 2))
-      (node (ref RB1) (pin 2)))
+      (node (ref RA1) (pin 2))
-    (net (code 113) (name /power/PWREN)
+      (node (ref C2) (pin 2)))
+    (net (code 112) (name /power/PWREN)
+      (node (ref U5) (pin 1))
       (node (ref R1) (pin 2))
-      (node (ref R8) (pin 1))
+      (node (ref R2) (pin 1))
-      (node (ref D14) (pin 1))
       (node (ref R4) (pin 2))
-      (node (ref U3) (pin 1))
+      (node (ref D12) (pin 1))
       (node (ref U4) (pin 1))
-      (node (ref U5) (pin 1))
+      (node (ref U3) (pin 1))
-      (node (ref R2) (pin 1)))
+      (node (ref R8) (pin 1)))
-    (net (code 114) (name +2V5)
+    (net (code 113) (name I2C_SDA)
-      (node (ref U1) (pin P6))
-      (node (ref RA2) (pin 1))
-      (node (ref C11) (pin 1))
-      (node (ref C12) (pin 1))
-      (node (ref U1) (pin F6))
-      (node (ref C10) (pin 1))
-      (node (ref U1) (pin P15))
-      (node (ref U7) (pin 8))
-      (node (ref L3) (pin 2))
-      (node (ref U1) (pin F15)))
-    (net (code 115) (name I2C_SCL)
-      (node (ref U7) (pin 6)))
-    (net (code 116) (name I2C_SDA)
       (node (ref U7) (pin 5)))
-    (net (code 117) (name /power/VBAT)
+    (net (code 114) (name /power/VBAT)
       (node (ref U7) (pin 3))
       (node (ref BAT1) (pin 1)))
-    (net (code 118) (name /power/FB3)
+    (net (code 115) (name /power/WKUP)
-      (node (ref RB3) (pin 2))
+      (node (ref Q1) (pin 3))
+      (node (ref D13) (pin 1))
+      (node (ref D10) (pin 2))
+      (node (ref C13) (pin 2)))
+    (net (code 116) (name /power/FB3)
       (node (ref RA3) (pin 2))
+      (node (ref RB3) (pin 2))
       (node (ref C6) (pin 2))
       (node (ref U4) (pin 5)))
-    (net (code 119) (name /power/FB2)
+    (net (code 117) (name /power/FB2)
-      (node (ref U5) (pin 5))
+      (node (ref RB2) (pin 2))
       (node (ref RA2) (pin 2))
       (node (ref C10) (pin 2))
-      (node (ref RB2) (pin 2)))
+      (node (ref U5) (pin 5)))
+    (net (code 118) (name I2C_SCL)
+      (node (ref U7) (pin 6)))
+    (net (code 119) (name +1V2)
+      (node (ref U1) (pin L13))
+      (node (ref U1) (pin K13))
+      (node (ref U1) (pin J13))
+      (node (ref RA1) (pin 1))
+      (node (ref U1) (pin H13))
+      (node (ref U1) (pin N12))
+      (node (ref C3) (pin 1))
+      (node (ref C4) (pin 1))
+      (node (ref U1) (pin M13))
+      (node (ref U1) (pin N13))
+      (node (ref U1) (pin H8))
+      (node (ref U1) (pin J8))
+      (node (ref C2) (pin 1))
+      (node (ref L1) (pin 2))
+      (node (ref U1) (pin K8))
+      (node (ref U1) (pin L8))
+      (node (ref U1) (pin M8))
+      (node (ref U1) (pin N8))
+      (node (ref U1) (pin H10))
+      (node (ref U1) (pin N10))
+      (node (ref U1) (pin H11))
+      (node (ref U1) (pin N11))
+      (node (ref U1) (pin H12))
+      (node (ref U1) (pin N9))
+      (node (ref U1) (pin H9)))
     (net (code 120) (name LED3)
       (node (ref D3) (pin 2)))
     (net (code 121) (name BTN_R)
@@ -2291,12 +2299,12 @@
       (node (ref OLED1) (pin 7)))
     (net (code 131) (name /blinkey/BTNPU)
       (node (ref BTN2) (pin 1))
-      (node (ref BTN5) (pin 1))
       (node (ref BTN6) (pin 1))
-      (node (ref BTN1) (pin 1))
       (node (ref BTN3) (pin 1))
+      (node (ref BTN4) (pin 1))
+      (node (ref BTN5) (pin 1))
       (node (ref R7) (pin 2))
-      (node (ref BTN4) (pin 1)))
+      (node (ref BTN1) (pin 1)))
     (net (code 132) (name OLED_DC)
       (node (ref OLED1) (pin 6)))
     (net (code 133) (name OLED_RES)
@@ -2314,20 +2322,20 @@
     (net (code 139) (name BTN_F1)
       (node (ref BTN1) (pin 2)))
     (net (code 140) (name GPDI_5V_SCL)
+      (node (ref R25) (pin 2))
       (node (ref U11) (pin 6))
-      (node (ref GPDI1) (pin 17))
+      (node (ref GPDI1) (pin 17)))
-      (node (ref R25) (pin 2)))
     (net (code 141) (name GPDI_5V_SDA)
       (node (ref U11) (pin 5))
-      (node (ref GPDI1) (pin 18))
+      (node (ref R26) (pin 2))
-      (node (ref R26) (pin 2)))
+      (node (ref GPDI1) (pin 18)))
     (net (code 142) (name GPDI_SDA)
       (node (ref R22) (pin 2))
       (node (ref U11) (pin 4)))
     (net (code 143) (name /gpdi/VREF2)
       (node (ref U11) (pin 7))
-      (node (ref U11) (pin 8))
+      (node (ref R24) (pin 2))
-      (node (ref R24) (pin 2)))
+      (node (ref U11) (pin 8)))
     (net (code 144) (name GPDI_SCL)
       (node (ref R23) (pin 2))
       (node (ref U11) (pin 3)))
@@ -2358,21 +2366,21 @@
     (net (code 157) (name FTDI_TXD)
       (node (ref U6) (pin 32)))
     (net (code 158) (name JTAG_TMS)
-      (node (ref U6) (pin 15))
       (node (ref U2) (pin 7))
+      (node (ref U6) (pin 15))
       (node (ref U1) (pin U5)))
     (net (code 159) (name JTAG_TDO)
+      (node (ref U2) (pin 5))
       (node (ref U1) (pin V4))
-      (node (ref U6) (pin 14))
+      (node (ref U6) (pin 14)))
-      (node (ref U2) (pin 5)))
     (net (code 160) (name JTAG_TDI)
       (node (ref U2) (pin 4))
-      (node (ref U1) (pin R5))
+      (node (ref U6) (pin 13))
-      (node (ref U6) (pin 13)))
+      (node (ref U1) (pin R5)))
     (net (code 161) (name JTAG_TCK)
+      (node (ref U1) (pin T5))
       (node (ref U2) (pin 6))
-      (node (ref U6) (pin 12))
+      (node (ref U6) (pin 12)))
-      (node (ref U1) (pin T5)))
     (net (code 162) (name FTDI_nRTS)
       (node (ref U6) (pin 34)))
     (net (code 163) (name FTDI_nCTS)
@@ -2390,22 +2398,22 @@
     (net (code 169) (name /usb/FTDI_nTXLED)
       (node (ref U6) (pin 49)))
     (net (code 170) (name /usb/OSCO_12M)
-      (node (ref U6) (pin 4))
+      (node (ref C16) (pin 1))
       (node (ref Y2) (pin 2))
-      (node (ref C16) (pin 1)))
+      (node (ref U6) (pin 4)))
     (net (code 171) (name /usb/OSCI_12M)
       (node (ref U6) (pin 3))
       (node (ref C15) (pin 1))
       (node (ref Y2) (pin 1)))
     (net (code 172) (name USB_FTDI_DM)
-      (node (ref US1) (pin 2))
+      (node (ref U6) (pin 7))
-      (node (ref U6) (pin 7)))
+      (node (ref US1) (pin 2)))
     (net (code 173) (name USB_FTDI_DP)
-      (node (ref U6) (pin 8))
+      (node (ref US1) (pin 3))
-      (node (ref US1) (pin 3)))
+      (node (ref U6) (pin 8)))
     (net (code 174) (name /usb/EECLK)
-      (node (ref U6) (pin 56))
       (node (ref R9) (pin 2))
+      (node (ref U6) (pin 56))
       (node (ref U8) (pin 2)))
     (net (code 175) (name /usb/EECS)
       (node (ref U8) (pin 1))
@@ -2414,13 +2422,13 @@
     (net (code 176) (name "Net-(U6-Pad10)")
       (node (ref U6) (pin 10)))
     (net (code 177) (name /usb/EEDATA)
-      (node (ref R12) (pin 1))
       (node (ref U6) (pin 55))
+      (node (ref R12) (pin 1))
       (node (ref U8) (pin 3)))
     (net (code 178) (name "Net-(R11-Pad2)")
-      (node (ref R11) (pin 2))
       (node (ref R12) (pin 2))
-      (node (ref U8) (pin 4)))
+      (node (ref U8) (pin 4))
+      (node (ref R11) (pin 2)))
     (net (code 179) (name "Net-(US2-Pad4)")
       (node (ref US2) (pin 4)))
     (net (code 180) (name "Net-(US1-Pad4)")
@@ -2450,9 +2458,9 @@
     (net (code 191) (name "Net-(U6-Pad51)")
       (node (ref U6) (pin 51)))
     (net (code 192) (name +1V8)
+      (node (ref C17) (pin 1))
       (node (ref U6) (pin 31))
-      (node (ref U6) (pin 2))
+      (node (ref U6) (pin 2)))
-      (node (ref C17) (pin 1)))
     (net (code 193) (name "Net-(U6-Pad18)")
       (node (ref U6) (pin 18)))
     (net (code 194) (name "Net-(U6-Pad22)")
@@ -2494,8 +2502,8 @@
       (node (ref SD1) (pin 1))
       (node (ref U2) (pin 11)))
     (net (code 211) (name SD_MTDI)
-      (node (ref SD1) (pin 8))
+      (node (ref U2) (pin 10))
-      (node (ref U2) (pin 10)))
+      (node (ref SD1) (pin 8)))
     (net (code 212) (name SD_MTDO)
       (node (ref U2) (pin 9))
       (node (ref SD1) (pin 7)))
@@ -2610,8 +2618,8 @@
     (net (code 267) (name "Net-(AUDIO1-Pad6)")
       (node (ref AUDIO1) (pin 6)))
     (net (code 268) (name /analog/AUDIO_R)
-      (node (ref AUDIO1) (pin 3))
       (node (ref R21) (pin 2))
+      (node (ref AUDIO1) (pin 3))
       (node (ref R20) (pin 2))
       (node (ref R19) (pin 2))
       (node (ref R18) (pin 2)))
@@ -2624,11 +2632,11 @@
     (net (code 272) (name AUDIO_L3)
       (node (ref R14) (pin 1)))
     (net (code 273) (name /analog/AUDIO_L)
-      (node (ref AUDIO1) (pin 1))
+      (node (ref R14) (pin 2))
       (node (ref R15) (pin 2))
       (node (ref R16) (pin 2))
-      (node (ref R14) (pin 2))
+      (node (ref R17) (pin 2))
-      (node (ref R17) (pin 2)))
+      (node (ref AUDIO1) (pin 1)))
     (net (code 274) (name "Net-(U10-Pad1)")
       (node (ref U10) (pin 1)))
     (net (code 275) (name "Net-(U10-Pad2)")

usb.bak

@@ -65,10 +65,10 @@ Wire Wire Line
 Wire Wire Line
 	2750 1700 2800 1700
 $Comp
-L +5V #PWR062
+L +5V #PWR73
 U 1 1 58D6C83B
 P 2800 1700
-F 0 "#PWR062" H 2800 1550 50  0001 C CNN
+F 0 "#PWR73" 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 #PWR063
+L +5V #PWR74
 U 1 1 58D6C83D
 P 2850 2650
-F 0 "#PWR063" H 2850 2500 50  0001 C CNN
+F 0 "#PWR74" 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 #PWR064
+L GND #PWR68
 U 1 1 58D6C842
 P 1900 2100
-F 0 "#PWR064" H 1900 1850 50  0001 C CNN
+F 0 "#PWR68" 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 #PWR065
+L GND #PWR69
 U 1 1 58D6C843
 P 1900 3050
-F 0 "#PWR065" H 1900 2800 50  0001 C CNN
+F 0 "#PWR69" 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 #PWR066
+L GND #PWR66
 U 1 1 58D82518
 P 1400 2300
-F 0 "#PWR066" H 1400 2050 50  0001 C CNN
+F 0 "#PWR66" 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 #PWR067
+L GND #PWR67
 U 1 1 58D8254A
 P 1400 3250
-F 0 "#PWR067" H 1400 3000 50  0001 C CNN
+F 0 "#PWR67" 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 #PWR068
+L GND #PWR81
 U 1 1 58D8877C
 P 5550 5750
-F 0 "#PWR068" H 5550 5500 50  0001 C CNN
+F 0 "#PWR81" 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 #PWR069
+L +1V8 #PWR77
 U 1 1 58D88D43
 P 4150 1800
-F 0 "#PWR069" H 4150 1650 50  0001 C CNN
+F 0 "#PWR77" 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 #PWR070
+L GND #PWR78
 U 1 1 58D88E02
 P 4200 2200
-F 0 "#PWR070" H 4200 1950 50  0001 C CNN
+F 0 "#PWR78" 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 #PWR071
+L +1V8 #PWR80
 U 1 1 58D88EF8
 P 5400 1050
-F 0 "#PWR071" H 5400 900 50  0001 C CNN
+F 0 "#PWR80" 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 #PWR072
+L +3V3 #PWR82
 U 1 1 58D88F34
 P 5750 1050
-F 0 "#PWR072" H 5750 900 50  0001 C CNN
+F 0 "#PWR82" 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 #PWR073
+L +3V3 #PWR76
 U 1 1 58D893C4
 P 4050 1650
-F 0 "#PWR073" H 4050 1500 50  0001 C CNN
+F 0 "#PWR76" 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 #PWR074
+L +3V3 #PWR79
 U 1 1 58D89CFD
 P 5050 1050
-F 0 "#PWR074" H 5050 900 50  0001 C CNN
+F 0 "#PWR79" 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
@@ -396,10 +396,10 @@ Wire Wire Line
 	3150 5000 3050 5000
 Connection ~ 3050 5000
 $Comp
-L GND #PWR075
+L GND #PWR75
 U 1 1 58D8C2A8
 P 3050 5200
-F 0 "#PWR075" H 3050 4950 50  0001 C CNN
+F 0 "#PWR75" 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 #PWR076
+L +3V3 #PWR64
 U 1 1 58D8D327
 P 1350 4450
-F 0 "#PWR076" H 1350 4300 50  0001 C CNN
+F 0 "#PWR64" 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 #PWR077
+L +3V3 #PWR72
 U 1 1 58D8D351
 P 2150 4750
-F 0 "#PWR077" H 2150 4600 50  0001 C CNN
+F 0 "#PWR72" 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 #PWR078
+L GND #PWR65
 U 1 1 58D8D37B
 P 1350 4750
-F 0 "#PWR078" H 1350 4500 50  0001 C CNN
+F 0 "#PWR65" 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
@@ -610,10 +610,10 @@ Wire Wire Line
 Wire Wire Line
 	850  4550 850  4400
 $Comp
-L +3V3 #PWR079
+L +3V3 #PWR63
 U 1 1 58D8E00C
 P 700 4000
-F 0 "#PWR079" H 700 3850 50  0001 C CNN
+F 0 "#PWR63" 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 #PWR080
+L +3V3 #PWR71
 U 1 1 58D8E1C0
 P 2100 3950
-F 0 "#PWR080" H 2100 3800 50  0001 C CNN
+F 0 "#PWR71" 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 #PWR081
+L GND #PWR70
 U 1 1 58D8EDE4
 P 2000 4650
-F 0 "#PWR081" H 2000 4400 50  0001 C CNN
+F 0 "#PWR70" 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

usb.sch

@@ -65,10 +65,10 @@ Wire Wire Line
 Wire Wire Line
 	2750 1700 2800 1700
 $Comp
-L +5V #PWR062
+L +5V #PWR73
 U 1 1 58D6C83B
 P 2800 1700
-F 0 "#PWR062" H 2800 1550 50  0001 C CNN
+F 0 "#PWR73" 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 #PWR063
+L +5V #PWR74
 U 1 1 58D6C83D
 P 2850 2650
-F 0 "#PWR063" H 2850 2500 50  0001 C CNN
+F 0 "#PWR74" 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 #PWR064
+L GND #PWR68
 U 1 1 58D6C842
 P 1900 2100
-F 0 "#PWR064" H 1900 1850 50  0001 C CNN
+F 0 "#PWR68" 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 #PWR065
+L GND #PWR69
 U 1 1 58D6C843
 P 1900 3050
-F 0 "#PWR065" H 1900 2800 50  0001 C CNN
+F 0 "#PWR69" 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 #PWR066
+L GND #PWR66
 U 1 1 58D82518
 P 1400 2300
-F 0 "#PWR066" H 1400 2050 50  0001 C CNN
+F 0 "#PWR66" 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 #PWR067
+L GND #PWR67
 U 1 1 58D8254A
 P 1400 3250
-F 0 "#PWR067" H 1400 3000 50  0001 C CNN
+F 0 "#PWR67" 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 #PWR068
+L GND #PWR81
 U 1 1 58D8877C
 P 5550 5750
-F 0 "#PWR068" H 5550 5500 50  0001 C CNN
+F 0 "#PWR81" 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 #PWR069
+L +1V8 #PWR77
 U 1 1 58D88D43
 P 4150 1800
-F 0 "#PWR069" H 4150 1650 50  0001 C CNN
+F 0 "#PWR77" 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 #PWR070
+L GND #PWR78
 U 1 1 58D88E02
 P 4200 2200
-F 0 "#PWR070" H 4200 1950 50  0001 C CNN
+F 0 "#PWR78" 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 #PWR071
+L +1V8 #PWR80
 U 1 1 58D88EF8
 P 5400 1050
-F 0 "#PWR071" H 5400 900 50  0001 C CNN
+F 0 "#PWR80" 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 #PWR072
+L +3V3 #PWR82
 U 1 1 58D88F34
 P 5750 1050
-F 0 "#PWR072" H 5750 900 50  0001 C CNN
+F 0 "#PWR82" 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 #PWR073
+L +3V3 #PWR76
 U 1 1 58D893C4
 P 4050 1650
-F 0 "#PWR073" H 4050 1500 50  0001 C CNN
+F 0 "#PWR76" 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 #PWR074
+L +3V3 #PWR79
 U 1 1 58D89CFD
 P 5050 1050
-F 0 "#PWR074" H 5050 900 50  0001 C CNN
+F 0 "#PWR79" 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
@@ -396,10 +396,10 @@ Wire Wire Line
 	3150 5000 3050 5000
 Connection ~ 3050 5000
 $Comp
-L GND #PWR075
+L GND #PWR75
 U 1 1 58D8C2A8
 P 3050 5200
-F 0 "#PWR075" H 3050 4950 50  0001 C CNN
+F 0 "#PWR75" 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 #PWR076
+L +3V3 #PWR64
 U 1 1 58D8D327
 P 1350 4450
-F 0 "#PWR076" H 1350 4300 50  0001 C CNN
+F 0 "#PWR64" 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 #PWR077
+L +3V3 #PWR72
 U 1 1 58D8D351
 P 2150 4750
-F 0 "#PWR077" H 2150 4600 50  0001 C CNN
+F 0 "#PWR72" 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 #PWR078
+L GND #PWR65
 U 1 1 58D8D37B
 P 1350 4750
-F 0 "#PWR078" H 1350 4500 50  0001 C CNN
+F 0 "#PWR65" 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
@@ -610,10 +610,10 @@ Wire Wire Line
 Wire Wire Line
 	850  4550 850  4400
 $Comp
-L +3V3 #PWR079
+L +3V3 #PWR63
 U 1 1 58D8E00C
 P 700 4000
-F 0 "#PWR079" H 700 3850 50  0001 C CNN
+F 0 "#PWR63" 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 #PWR080
+L +3V3 #PWR71
 U 1 1 58D8E1C0
 P 2100 3950
-F 0 "#PWR080" H 2100 3800 50  0001 C CNN
+F 0 "#PWR71" 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 #PWR081
+L GND #PWR70
 U 1 1 58D8EDE4
 P 2000 4650
-F 0 "#PWR081" H 2000 4400 50  0001 C CNN
+F 0 "#PWR70" 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

wifi.bak

@@ -71,10 +71,10 @@ Wire Wire Line
 Wire Wire Line
 	4100 4950 4200 4950
 $Comp
-L GND #PWR082
+L GND #PWR84
 U 1 1 58D75E1F
 P 4200 4950
-F 0 "#PWR082" H 4200 4700 50  0001 C CNN
+F 0 "#PWR84" 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 #PWR083
+L +3V3 #PWR83
 U 1 1 58D75E28
 P 2250 4950
-F 0 "#PWR083" H 2250 4800 50  0001 C CNN
+F 0 "#PWR83" 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

@@ -71,10 +71,10 @@ Wire Wire Line
 Wire Wire Line
 	4100 4950 4200 4950
 $Comp
-L GND #PWR082
+L GND #PWR84
 U 1 1 58D75E1F
 P 4200 4950
-F 0 "#PWR082" H 4200 4700 50  0001 C CNN
+F 0 "#PWR84" 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 #PWR083
+L +3V3 #PWR83
 U 1 1 58D75E28
 P 2250 4950
-F 0 "#PWR083" H 2250 4800 50  0001 C CNN
+F 0 "#PWR83" 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