schematics: additional diode R23 to make shutdown more reliable

reduce hold resistor, use schottky for nSLEEP
6 years ago · 6228263ac6
parent 52d3cced84
commit 6228263ac6
10 changed files with 177 additions and 173 deletions
--- a/blinkey.bak
+++ b/blinkey.bak
@ -491,7 +491,7 @@ Wire Wire Line
 Text Label 4750 5350 0    60   ~ 0
 LED_TXLED
 Text GLabel 4300 5350 0    60   Input ~ 0
-FT3V3
+FT2V5
 Wire Wire Line
 	4300 5350 4400 5350
 Wire Wire Line
--- a/blinkey.sch
+++ b/blinkey.sch
@ -491,7 +491,7 @@ Wire Wire Line
 Text Label 4750 5350 0    60   ~ 0
 LED_TXLED
 Text GLabel 4300 5350 0    60   Input ~ 0
-FT3V3
+FT2V5
 Wire Wire Line
 	4300 5350 4400 5350
 Wire Wire Line
--- a/flash.bak
+++ b/flash.bak
@ -71,10 +71,10 @@ F 7 "870-IS25LP032DJNLETR" H 2800 2700 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0123
+L +3V3 #PWR0124
 U 1 1 58D9149E
 P 2800 2400
-F 0 "#PWR0123" H 2800 2250 50  0001 C CNN
+F 0 "#PWR0124" 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
@ -82,10 +82,10 @@ F 3 "" H 2800 2400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0124
+L GND #PWR0125
 U 1 1 58D914B4
 P 2800 3000
-F 0 "#PWR0124" H 2800 2750 50  0001 C CNN
+F 0 "#PWR0125" 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
@ -144,10 +144,10 @@ Wire Wire Line
 Text Label 3950 2200 1    60   ~ 0
 FLASH_MOSI
 $Comp
-L +3V3 #PWR0125
+L +3V3 #PWR0126
 U 1 1 58EC0F61
 P 3950 1250
-F 0 "#PWR0125" H 3950 1100 50  0001 C CNN
+F 0 "#PWR0126" H 3950 1100 50  0001 C CNN
 F 1 "+3V3" H 3950 1390 50  0000 C CNN
 F 2 "" H 3950 1250 50  0000 C CNN
 F 3 "" H 3950 1250 50  0000 C CNN
@ -170,10 +170,10 @@ Wire Wire Line
 Text Label 4150 2200 1    60   ~ 0
 FLASH_MISO
 $Comp
-L +3V3 #PWR0126
+L +3V3 #PWR0127
 U 1 1 58EC0F96
 P 4150 1250
-F 0 "#PWR0126" H 4150 1100 50  0001 C CNN
+F 0 "#PWR0127" H 4150 1100 50  0001 C CNN
 F 1 "+3V3" H 4150 1390 50  0000 C CNN
 F 2 "" H 4150 1250 50  0000 C CNN
 F 3 "" H 4150 1250 50  0000 C CNN
@ -196,10 +196,10 @@ Wire Wire Line
 Text Label 4350 2200 1    60   ~ 0
 FLASH_SCK
 $Comp
-L +3V3 #PWR0127
+L +3V3 #PWR0128
 U 1 1 58EC15E9
 P 4350 1250
-F 0 "#PWR0127" H 4350 1100 50  0001 C CNN
+F 0 "#PWR0128" H 4350 1100 50  0001 C CNN
 F 1 "+3V3" H 4350 1390 50  0000 C CNN
 F 2 "" H 4350 1250 50  0000 C CNN
 F 3 "" H 4350 1250 50  0000 C CNN
@ -226,10 +226,10 @@ Wire Wire Line
 Text Label 4550 2200 1    60   ~ 0
 FLASH_nCS
 $Comp
-L +3V3 #PWR0128
+L +3V3 #PWR0129
 U 1 1 58EC1C8C
 P 4550 1250
-F 0 "#PWR0128" H 4550 1100 50  0001 C CNN
+F 0 "#PWR0129" H 4550 1100 50  0001 C CNN
 F 1 "+3V3" H 4550 1390 50  0000 C CNN
 F 2 "" H 4550 1250 50  0000 C CNN
 F 3 "" H 4550 1250 50  0000 C CNN
@ -254,10 +254,10 @@ Wire Wire Line
 Text Label 1150 2150 1    60   ~ 0
 FLASH_nWP
 $Comp
-L +3V3 #PWR0129
+L +3V3 #PWR0130
 U 1 1 58EC4E7F
 P 1150 1200
-F 0 "#PWR0129" H 1150 1050 50  0001 C CNN
+F 0 "#PWR0130" H 1150 1050 50  0001 C CNN
 F 1 "+3V3" H 1150 1340 50  0000 C CNN
 F 2 "" H 1150 1200 50  0000 C CNN
 F 3 "" H 1150 1200 50  0000 C CNN
@ -280,10 +280,10 @@ Wire Wire Line
 Text Label 1350 2150 1    60   ~ 0
 FLASH_nHOLD
 $Comp
-L +3V3 #PWR0130
+L +3V3 #PWR0131
 U 1 1 58EC4E8D
 P 1350 1200
-F 0 "#PWR0130" H 1350 1050 50  0001 C CNN
+F 0 "#PWR0131" H 1350 1050 50  0001 C CNN
 F 1 "+3V3" H 1350 1340 50  0000 C CNN
 F 2 "" H 1350 1200 50  0000 C CNN
 F 3 "" H 1350 1200 50  0000 C CNN
@ -291,10 +291,10 @@ F 3 "" H 1350 1200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0131
+L +3V3 #PWR0132
 U 1 1 58EC58A7
 P 5450 3350
-F 0 "#PWR0131" H 5450 3200 50  0001 C CNN
+F 0 "#PWR0132" H 5450 3200 50  0001 C CNN
 F 1 "+3V3" H 5450 3490 50  0000 C CNN
 F 2 "" H 5450 3350 50  0000 C CNN
 F 3 "" H 5450 3350 50  0000 C CNN
@ -302,10 +302,10 @@ F 3 "" H 5450 3350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR0132
+L GND #PWR0133
 U 1 1 58EC58CB
 P 5650 3450
-F 0 "#PWR0132" H 5650 3200 50  0001 C CNN
+F 0 "#PWR0133" H 5650 3200 50  0001 C CNN
 F 1 "GND" H 5650 3300 50  0000 C CNN
 F 2 "" H 5650 3450 50  0000 C CNN
 F 3 "" H 5650 3450 50  0000 C CNN
@ -313,10 +313,10 @@ F 3 "" H 5650 3450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR0133
+L GND #PWR0134
 U 1 1 58EC58EF
 P 5650 3250
-F 0 "#PWR0133" H 5650 3000 50  0001 C CNN
+F 0 "#PWR0134" H 5650 3000 50  0001 C CNN
 F 1 "GND" H 5650 3100 50  0000 C CNN
 F 2 "" H 5650 3250 50  0000 C CNN
 F 3 "" H 5650 3250 50  0000 C CNN
@ -351,10 +351,10 @@ Wire Wire Line
 Text Label 8850 3650 1    60   ~ 0
 FPGA_PROGRAMN
 $Comp
-L +3V3 #PWR0134
+L +3V3 #PWR0135
 U 1 1 58EC68E4
 P 8850 2550
-F 0 "#PWR0134" H 8850 2400 50  0001 C CNN
+F 0 "#PWR0135" H 8850 2400 50  0001 C CNN
 F 1 "+3V3" H 8850 2690 50  0000 C CNN
 F 2 "" H 8850 2550 50  0000 C CNN
 F 3 "" H 8850 2550 50  0000 C CNN
@ -377,10 +377,10 @@ Wire Wire Line
 Text Label 9050 3650 1    60   ~ 0
 FPGA_DONE
 $Comp
-L +3V3 #PWR0135
+L +3V3 #PWR0136
 U 1 1 58EC68F2
 P 9050 2550
-F 0 "#PWR0135" H 9050 2400 50  0001 C CNN
+F 0 "#PWR0136" H 9050 2400 50  0001 C CNN
 F 1 "+3V3" H 9050 2690 50  0000 C CNN
 F 2 "" H 9050 2550 50  0000 C CNN
 F 3 "" H 9050 2550 50  0000 C CNN
@ -407,10 +407,10 @@ Wire Wire Line
 Text Label 9250 3650 1    60   ~ 0
 FPGA_INITN
 $Comp
-L +3V3 #PWR0136
+L +3V3 #PWR0137
 U 1 1 58EC7305
 P 9250 2550
-F 0 "#PWR0136" H 9250 2400 50  0001 C CNN
+F 0 "#PWR0137" H 9250 2400 50  0001 C CNN
 F 1 "+3V3" H 9250 2690 50  0000 C CNN
 F 2 "" H 9250 2550 50  0000 C CNN
 F 3 "" H 9250 2550 50  0000 C CNN
@ -418,10 +418,10 @@ F 3 "" H 9250 2550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0137
+L +3V3 #PWR0138
 U 1 1 58EC879F
 P 5650 2950
-F 0 "#PWR0137" H 5650 2800 50  0001 C CNN
+F 0 "#PWR0138" H 5650 2800 50  0001 C CNN
 F 1 "+3V3" H 5650 3090 50  0000 C CNN
 F 2 "" H 5650 2950 50  0000 C CNN
 F 3 "" H 5650 2950 50  0000 C CNN
@ -429,10 +429,10 @@ F 3 "" H 5650 2950 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR0138
+L +3V3 #PWR0139
 U 1 1 58EC8800
 P 5650 2550
-F 0 "#PWR0138" H 5650 2400 50  0001 C CNN
+F 0 "#PWR0139" H 5650 2400 50  0001 C CNN
 F 1 "+3V3" H 5650 2690 50  0000 C CNN
 F 2 "" H 5650 2550 50  0000 C CNN
 F 3 "" H 5650 2550 50  0000 C CNN
@ -440,10 +440,10 @@ F 3 "" H 5650 2550 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR0139
+L +3V3 #PWR0140
 U 1 1 58EC882A
 P 7150 2550
-F 0 "#PWR0139" H 7150 2400 50  0001 C CNN
+F 0 "#PWR0140" H 7150 2400 50  0001 C CNN
 F 1 "+3V3" H 7150 2690 50  0000 C CNN
 F 2 "" H 7150 2550 50  0000 C CNN
 F 3 "" H 7150 2550 50  0000 C CNN
--- a/flash.sch
+++ b/flash.sch
@ -71,10 +71,10 @@ F 7 "870-IS25LP032DJNLETR" H 2800 2700 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0123
+L +3V3 #PWR0124
 U 1 1 58D9149E
 P 2800 2400
-F 0 "#PWR0123" H 2800 2250 50  0001 C CNN
+F 0 "#PWR0124" 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
@ -82,10 +82,10 @@ F 3 "" H 2800 2400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0124
+L GND #PWR0125
 U 1 1 58D914B4
 P 2800 3000
-F 0 "#PWR0124" H 2800 2750 50  0001 C CNN
+F 0 "#PWR0125" 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
@ -144,10 +144,10 @@ Wire Wire Line
 Text Label 3950 2200 1    60   ~ 0
 FLASH_MOSI
 $Comp
-L +3V3 #PWR0125
+L +3V3 #PWR0126
 U 1 1 58EC0F61
 P 3950 1250
-F 0 "#PWR0125" H 3950 1100 50  0001 C CNN
+F 0 "#PWR0126" H 3950 1100 50  0001 C CNN
 F 1 "+3V3" H 3950 1390 50  0000 C CNN
 F 2 "" H 3950 1250 50  0000 C CNN
 F 3 "" H 3950 1250 50  0000 C CNN
@ -170,10 +170,10 @@ Wire Wire Line
 Text Label 4150 2200 1    60   ~ 0
 FLASH_MISO
 $Comp
-L +3V3 #PWR0126
+L +3V3 #PWR0127
 U 1 1 58EC0F96
 P 4150 1250
-F 0 "#PWR0126" H 4150 1100 50  0001 C CNN
+F 0 "#PWR0127" H 4150 1100 50  0001 C CNN
 F 1 "+3V3" H 4150 1390 50  0000 C CNN
 F 2 "" H 4150 1250 50  0000 C CNN
 F 3 "" H 4150 1250 50  0000 C CNN
@ -196,10 +196,10 @@ Wire Wire Line
 Text Label 4350 2200 1    60   ~ 0
 FLASH_SCK
 $Comp
-L +3V3 #PWR0127
+L +3V3 #PWR0128
 U 1 1 58EC15E9
 P 4350 1250
-F 0 "#PWR0127" H 4350 1100 50  0001 C CNN
+F 0 "#PWR0128" H 4350 1100 50  0001 C CNN
 F 1 "+3V3" H 4350 1390 50  0000 C CNN
 F 2 "" H 4350 1250 50  0000 C CNN
 F 3 "" H 4350 1250 50  0000 C CNN
@ -226,10 +226,10 @@ Wire Wire Line
 Text Label 4550 2200 1    60   ~ 0
 FLASH_nCS
 $Comp
-L +3V3 #PWR0128
+L +3V3 #PWR0129
 U 1 1 58EC1C8C
 P 4550 1250
-F 0 "#PWR0128" H 4550 1100 50  0001 C CNN
+F 0 "#PWR0129" H 4550 1100 50  0001 C CNN
 F 1 "+3V3" H 4550 1390 50  0000 C CNN
 F 2 "" H 4550 1250 50  0000 C CNN
 F 3 "" H 4550 1250 50  0000 C CNN
@ -254,10 +254,10 @@ Wire Wire Line
 Text Label 1150 2150 1    60   ~ 0
 FLASH_nWP
 $Comp
-L +3V3 #PWR0129
+L +3V3 #PWR0130
 U 1 1 58EC4E7F
 P 1150 1200
-F 0 "#PWR0129" H 1150 1050 50  0001 C CNN
+F 0 "#PWR0130" H 1150 1050 50  0001 C CNN
 F 1 "+3V3" H 1150 1340 50  0000 C CNN
 F 2 "" H 1150 1200 50  0000 C CNN
 F 3 "" H 1150 1200 50  0000 C CNN
@ -280,10 +280,10 @@ Wire Wire Line
 Text Label 1350 2150 1    60   ~ 0
 FLASH_nHOLD
 $Comp
-L +3V3 #PWR0130
+L +3V3 #PWR0131
 U 1 1 58EC4E8D
 P 1350 1200
-F 0 "#PWR0130" H 1350 1050 50  0001 C CNN
+F 0 "#PWR0131" H 1350 1050 50  0001 C CNN
 F 1 "+3V3" H 1350 1340 50  0000 C CNN
 F 2 "" H 1350 1200 50  0000 C CNN
 F 3 "" H 1350 1200 50  0000 C CNN
@ -291,10 +291,10 @@ F 3 "" H 1350 1200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0131
+L +3V3 #PWR0132
 U 1 1 58EC58A7
 P 5450 3350
-F 0 "#PWR0131" H 5450 3200 50  0001 C CNN
+F 0 "#PWR0132" H 5450 3200 50  0001 C CNN
 F 1 "+3V3" H 5450 3490 50  0000 C CNN
 F 2 "" H 5450 3350 50  0000 C CNN
 F 3 "" H 5450 3350 50  0000 C CNN
@ -302,10 +302,10 @@ F 3 "" H 5450 3350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR0132
+L GND #PWR0133
 U 1 1 58EC58CB
 P 5650 3450
-F 0 "#PWR0132" H 5650 3200 50  0001 C CNN
+F 0 "#PWR0133" H 5650 3200 50  0001 C CNN
 F 1 "GND" H 5650 3300 50  0000 C CNN
 F 2 "" H 5650 3450 50  0000 C CNN
 F 3 "" H 5650 3450 50  0000 C CNN
@ -313,10 +313,10 @@ F 3 "" H 5650 3450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR0133
+L GND #PWR0134
 U 1 1 58EC58EF
 P 5650 3250
-F 0 "#PWR0133" H 5650 3000 50  0001 C CNN
+F 0 "#PWR0134" H 5650 3000 50  0001 C CNN
 F 1 "GND" H 5650 3100 50  0000 C CNN
 F 2 "" H 5650 3250 50  0000 C CNN
 F 3 "" H 5650 3250 50  0000 C CNN
@ -351,10 +351,10 @@ Wire Wire Line
 Text Label 8850 3650 1    60   ~ 0
 FPGA_PROGRAMN
 $Comp
-L +3V3 #PWR0134
+L +3V3 #PWR0135
 U 1 1 58EC68E4
 P 8850 2550
-F 0 "#PWR0134" H 8850 2400 50  0001 C CNN
+F 0 "#PWR0135" H 8850 2400 50  0001 C CNN
 F 1 "+3V3" H 8850 2690 50  0000 C CNN
 F 2 "" H 8850 2550 50  0000 C CNN
 F 3 "" H 8850 2550 50  0000 C CNN
@ -377,10 +377,10 @@ Wire Wire Line
 Text Label 9050 3650 1    60   ~ 0
 FPGA_DONE
 $Comp
-L +3V3 #PWR0135
+L +3V3 #PWR0136
 U 1 1 58EC68F2
 P 9050 2550
-F 0 "#PWR0135" H 9050 2400 50  0001 C CNN
+F 0 "#PWR0136" H 9050 2400 50  0001 C CNN
 F 1 "+3V3" H 9050 2690 50  0000 C CNN
 F 2 "" H 9050 2550 50  0000 C CNN
 F 3 "" H 9050 2550 50  0000 C CNN
@ -407,10 +407,10 @@ Wire Wire Line
 Text Label 9250 3650 1    60   ~ 0
 FPGA_INITN
 $Comp
-L +3V3 #PWR0136
+L +3V3 #PWR0137
 U 1 1 58EC7305
 P 9250 2550
-F 0 "#PWR0136" H 9250 2400 50  0001 C CNN
+F 0 "#PWR0137" H 9250 2400 50  0001 C CNN
 F 1 "+3V3" H 9250 2690 50  0000 C CNN
 F 2 "" H 9250 2550 50  0000 C CNN
 F 3 "" H 9250 2550 50  0000 C CNN
@ -418,10 +418,10 @@ F 3 "" H 9250 2550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0137
+L +3V3 #PWR0138
 U 1 1 58EC879F
 P 5650 2950
-F 0 "#PWR0137" H 5650 2800 50  0001 C CNN
+F 0 "#PWR0138" H 5650 2800 50  0001 C CNN
 F 1 "+3V3" H 5650 3090 50  0000 C CNN
 F 2 "" H 5650 2950 50  0000 C CNN
 F 3 "" H 5650 2950 50  0000 C CNN
@ -429,10 +429,10 @@ F 3 "" H 5650 2950 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR0138
+L +3V3 #PWR0139
 U 1 1 58EC8800
 P 5650 2550
-F 0 "#PWR0138" H 5650 2400 50  0001 C CNN
+F 0 "#PWR0139" H 5650 2400 50  0001 C CNN
 F 1 "+3V3" H 5650 2690 50  0000 C CNN
 F 2 "" H 5650 2550 50  0000 C CNN
 F 3 "" H 5650 2550 50  0000 C CNN
@ -440,10 +440,10 @@ F 3 "" H 5650 2550 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR0139
+L +3V3 #PWR0140
 U 1 1 58EC882A
 P 7150 2550
-F 0 "#PWR0139" H 7150 2400 50  0001 C CNN
+F 0 "#PWR0140" H 7150 2400 50  0001 C CNN
 F 1 "+3V3" H 7150 2690 50  0000 C CNN
 F 2 "" H 7150 2550 50  0000 C CNN
 F 3 "" H 7150 2550 50  0000 C CNN
--- a/power.bak
+++ b/power.bak
@ -682,7 +682,7 @@ L R R4
 U 1 1 58D7CBD5
 P 4900 4400
 F 0 "R4" V 4980 4400 50  0000 C CNN
-F 1 "15k" V 4900 4400 50  0000 C CNN
+F 1 "4.7k" V 4900 4400 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 4830 4400 50  0001 C CNN
 F 3 "" H 4900 4400 50  0000 C CNN
 	1    4900 4400
@ -699,17 +699,6 @@ F 3 "" H 4900 3950 50  0000 C CNN
 	1    4900 3950
 	0    -1   -1   0   
 $EndComp
-$Comp
-L +3V3 #PWR050
-U 1 1 58D7CCF7
-P 4900 3700
-F 0 "#PWR050" H 4900 3550 50  0001 C CNN
-F 1 "+3V3" H 4900 3840 50  0000 C CNN
-F 2 "" H 4900 3700 50  0000 C CNN
-F 3 "" H 4900 3700 50  0000 C CNN
-	1    4900 3700
-	1    0    0    -1  
-$EndComp
 Text Notes 3050 3400 0    60   ~ 0
 WAKEUPn\nopen drain \nactive low
 Text Label 2450 3450 0    60   ~ 0
@ -748,7 +737,7 @@ F 3 "" H 3450 5550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 Text Notes 2800 5950 0    60   ~ 0
-R6,C14 to hold 0.5s shutdown
+R5,C14 to hold 0.5s shutdown
 Text Label 4350 3800 0    60   ~ 0
 WKUP
 Text Label 4350 4200 0    60   ~ 0
@ -859,10 +848,10 @@ F 3 "" H 4100 3950 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR051
+L GND #PWR050
 U 1 1 58DA2E46
 P 4100 4100
-F 0 "#PWR051" H 4100 3850 50  0001 C CNN
+F 0 "#PWR050" H 4100 3850 50  0001 C CNN
 F 1 "GND" H 4100 3950 50  0000 C CNN
 F 2 "" H 4100 4100 50  0000 C CNN
 F 3 "" H 4100 4100 50  0000 C CNN
@ -870,10 +859,10 @@ F 3 "" H 4100 4100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR052
+L +5V #PWR051
 U 1 1 58D67C25
 P 4350 3100
-F 0 "#PWR052" H 4350 2950 50  0001 C CNN
+F 0 "#PWR051" H 4350 2950 50  0001 C CNN
 F 1 "+5V" H 4350 3240 50  0000 C CNN
 F 2 "" H 4350 3100 50  0000 C CNN
 F 3 "" H 4350 3100 50  0000 C CNN
@ -894,10 +883,10 @@ F 3 "" H 3450 5100 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR053
+L +3V3 #PWR052
 U 1 1 58DA569C
 P 3450 4950
-F 0 "#PWR053" H 3450 4800 50  0001 C CNN
+F 0 "#PWR052" H 3450 4800 50  0001 C CNN
 F 1 "+3V3" H 3450 5090 50  0000 C CNN
 F 2 "" H 3450 4950 50  0000 C CNN
 F 3 "" H 3450 4950 50  0000 C CNN
@ -931,10 +920,10 @@ F 3 "" H 2950 3650 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +5V #PWR054
+L +5V #PWR053
 U 1 1 58E82A7E
 P 3350 4100
-F 0 "#PWR054" H 3350 3950 50  0001 C CNN
+F 0 "#PWR053" H 3350 3950 50  0001 C CNN
 F 1 "+5V" H 3350 4240 50  0000 C CNN
 F 2 "" H 3350 4100 50  0000 C CNN
 F 3 "" H 3350 4100 50  0000 C CNN
@ -1504,8 +1493,6 @@ Wire Wire Line
 	4350 5450 4350 5900
 Wire Wire Line
 	4900 4250 4900 4100
-Wire Wire Line
-	4900 3700 4900 3800
 Wire Wire Line
 	2400 3450 3300 3450
 Wire Wire Line
@ -1564,10 +1551,10 @@ Wire Wire Line
 	7700 850  7700 750 
 Connection ~ 7700 750 
 $Comp
-L +3V3 #PWR055
+L +3V3 #PWR054
 U 1 1 591C4E6A
 P 2000 2850
-F 0 "#PWR055" H 2000 2700 50  0001 C CNN
+F 0 "#PWR054" H 2000 2700 50  0001 C CNN
 F 1 "+3V3" H 2000 2990 50  0000 C CNN
 F 2 "" H 2000 2850 50  0000 C CNN
 F 3 "" H 2000 2850 50  0000 C CNN
@ -1645,10 +1632,10 @@ Wire Wire Line
 	2950 3450 2950 3500
 Connection ~ 2950 3450
 $Comp
-L GND #PWR056
+L GND #PWR055
 U 1 1 59D5B51B
 P 2700 3950
-F 0 "#PWR056" H 2700 3700 50  0001 C CNN
+F 0 "#PWR055" H 2700 3700 50  0001 C CNN
 F 1 "GND" H 2700 3800 50  0000 C CNN
 F 2 "" H 2700 3950 50  0000 C CNN
 F 3 "" H 2700 3950 50  0000 C CNN
@ -1869,10 +1856,10 @@ Wire Wire Line
 	6600 7350 6700 7350
 Connection ~ 6700 7350
 $Comp
-L GND #PWR057
+L GND #PWR056
 U 1 1 59EF897E
 P 4800 7450
-F 0 "#PWR057" H 4800 7200 50  0001 C CNN
+F 0 "#PWR056" H 4800 7200 50  0001 C CNN
 F 1 "GND" H 4800 7300 50  0000 C CNN
 F 2 "" H 4800 7450 50  0001 C CNN
 F 3 "" H 4800 7450 50  0001 C CNN
@ -1880,10 +1867,10 @@ F 3 "" H 4800 7450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR058
+L GND #PWR057
 U 1 1 59EF8A0A
 P 6700 7450
-F 0 "#PWR058" H 6700 7200 50  0001 C CNN
+F 0 "#PWR057" H 6700 7200 50  0001 C CNN
 F 1 "GND" H 6700 7300 50  0000 C CNN
 F 2 "" H 6700 7450 50  0001 C CNN
 F 3 "" H 6700 7450 50  0001 C CNN
@ -1928,10 +1915,10 @@ F 7 "842-LFE5U45F6BG381C" H 6250 1500 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V1 #PWR059
+L +1V1 #PWR058
 U 1 1 5A0B33B0
 P 2150 650
-F 0 "#PWR059" H 2150 500 50  0001 C CNN
+F 0 "#PWR058" H 2150 500 50  0001 C CNN
 F 1 "+1V1" H 2150 790 50  0000 C CNN
 F 2 "" H 2150 650 50  0001 C CNN
 F 3 "" H 2150 650 50  0001 C CNN
@ -1939,10 +1926,10 @@ F 3 "" H 2150 650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V1 #PWR060
+L +1V1 #PWR059
 U 1 1 5A0B387F
 P 10900 2750
-F 0 "#PWR060" H 10900 2600 50  0001 C CNN
+F 0 "#PWR059" H 10900 2600 50  0001 C CNN
 F 1 "+1V1" H 10900 2890 50  0000 C CNN
 F 2 "" H 10900 2750 50  0001 C CNN
 F 3 "" H 10900 2750 50  0001 C CNN
@ -1953,4 +1940,26 @@ Text Notes 4800 5300 0    60   ~ 0
 Switching regulators 2A SOT23-5\nTexas instruments TLV62569DBV (2A) (best)\nDioo microcircuits DIO6015B (1.5A) (osc. acceptable)\nMicrosemi LX7172 (1.2A) (osc. unacceptable)\nDiodes AP3429/A (2A) - (will damage board)\n
 Text Notes 1000 5400 0    60   ~ 0
 SHUTDOWN connected to\nBANK2 on "ram" sheet
+$Comp
+L +3V3 #PWR060
+U 1 1 5A3EC5B1
+P 4900 3500
+F 0 "#PWR060" H 4900 3350 50  0001 C CNN
+F 1 "+3V3" H 4900 3640 50  0000 C CNN
+F 2 "" H 4900 3500 50  0000 C CNN
+F 3 "" H 4900 3500 50  0000 C CNN
+	1    4900 3500
+	1    0    0    -1  
+$EndComp
+$Comp
+L D D23
+U 1 1 5A3ED04A
+P 4900 3650
+F 0 "D23" H 4900 3750 50  0000 C CNN
+F 1 "1N4148" H 4900 3550 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323_HandSoldering" H 4900 3650 50  0001 C CNN
+F 3 "" H 4900 3650 50  0000 C CNN
+	1    4900 3650
+	0    -1   -1   0   
+$EndComp
 $EndSCHEMATC
--- a/power.sch
+++ b/power.sch
@ -682,7 +682,7 @@ L R R4
 U 1 1 58D7CBD5
 P 4900 4400
 F 0 "R4" V 4980 4400 50  0000 C CNN
-F 1 "15k" V 4900 4400 50  0000 C CNN
+F 1 "4.7k" V 4900 4400 50  0000 C CNN
 F 2 "Resistors_SMD:R_0603_HandSoldering" V 4830 4400 50  0001 C CNN
 F 3 "" H 4900 4400 50  0000 C CNN
 	1    4900 4400
@ -699,17 +699,6 @@ F 3 "" H 4900 3950 50  0000 C CNN
 	1    4900 3950
 	0    -1   -1   0   
 $EndComp
-$Comp
-L +3V3 #PWR050
-U 1 1 58D7CCF7
-P 4900 3700
-F 0 "#PWR050" H 4900 3550 50  0001 C CNN
-F 1 "+3V3" H 4900 3840 50  0000 C CNN
-F 2 "" H 4900 3700 50  0000 C CNN
-F 3 "" H 4900 3700 50  0000 C CNN
-	1    4900 3700
-	1    0    0    -1  
-$EndComp
 Text Notes 3050 3400 0    60   ~ 0
 WAKEUPn\nopen drain \nactive low
 Text Label 2450 3450 0    60   ~ 0
@ -771,11 +760,11 @@ $EndComp
 Text Label 3600 3450 0    60   ~ 0
 WKn
 $Comp
-L D D12
+L D_Schottky D12
 U 1 1 58D7BC4A
 P 3850 4650
 F 0 "D12" H 3850 4750 50  0000 C CNN
-F 1 "1N4148" H 3850 4550 50  0000 C CNN
+F 1 "BAT54W" H 3850 4550 50  0000 C CNN
 F 2 "Diodes_SMD:D_SOD-323_HandSoldering" H 3850 4650 50  0001 C CNN
 F 3 "" H 3850 4650 50  0000 C CNN
 	1    3850 4650
@ -859,10 +848,10 @@ F 3 "" H 4100 3950 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR051
+L GND #PWR050
 U 1 1 58DA2E46
 P 4100 4100
-F 0 "#PWR051" H 4100 3850 50  0001 C CNN
+F 0 "#PWR050" H 4100 3850 50  0001 C CNN
 F 1 "GND" H 4100 3950 50  0000 C CNN
 F 2 "" H 4100 4100 50  0000 C CNN
 F 3 "" H 4100 4100 50  0000 C CNN
@ -870,10 +859,10 @@ F 3 "" H 4100 4100 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR052
+L +5V #PWR051
 U 1 1 58D67C25
 P 4350 3100
-F 0 "#PWR052" H 4350 2950 50  0001 C CNN
+F 0 "#PWR051" H 4350 2950 50  0001 C CNN
 F 1 "+5V" H 4350 3240 50  0000 C CNN
 F 2 "" H 4350 3100 50  0000 C CNN
 F 3 "" H 4350 3100 50  0000 C CNN
@ -894,10 +883,10 @@ F 3 "" H 3450 5100 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR053
+L +3V3 #PWR052
 U 1 1 58DA569C
 P 3450 4950
-F 0 "#PWR053" H 3450 4800 50  0001 C CNN
+F 0 "#PWR052" H 3450 4800 50  0001 C CNN
 F 1 "+3V3" H 3450 5090 50  0000 C CNN
 F 2 "" H 3450 4950 50  0000 C CNN
 F 3 "" H 3450 4950 50  0000 C CNN
@ -931,10 +920,10 @@ F 3 "" H 2950 3650 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +5V #PWR054
+L +5V #PWR053
 U 1 1 58E82A7E
 P 3350 4100
-F 0 "#PWR054" H 3350 3950 50  0001 C CNN
+F 0 "#PWR053" H 3350 3950 50  0001 C CNN
 F 1 "+5V" H 3350 4240 50  0000 C CNN
 F 2 "" H 3350 4100 50  0000 C CNN
 F 3 "" H 3350 4100 50  0000 C CNN
@ -1504,8 +1493,6 @@ Wire Wire Line
 	4350 5450 4350 5900
 Wire Wire Line
 	4900 4250 4900 4100
-Wire Wire Line
-	4900 3700 4900 3800
 Wire Wire Line
 	2400 3450 3300 3450
 Wire Wire Line
@ -1564,10 +1551,10 @@ Wire Wire Line
 	7700 850  7700 750 
 Connection ~ 7700 750 
 $Comp
-L +3V3 #PWR055
+L +3V3 #PWR054
 U 1 1 591C4E6A
 P 2000 2850
-F 0 "#PWR055" H 2000 2700 50  0001 C CNN
+F 0 "#PWR054" H 2000 2700 50  0001 C CNN
 F 1 "+3V3" H 2000 2990 50  0000 C CNN
 F 2 "" H 2000 2850 50  0000 C CNN
 F 3 "" H 2000 2850 50  0000 C CNN
@ -1645,10 +1632,10 @@ Wire Wire Line
 	2950 3450 2950 3500
 Connection ~ 2950 3450
 $Comp
-L GND #PWR056
+L GND #PWR055
 U 1 1 59D5B51B
 P 2700 3950
-F 0 "#PWR056" H 2700 3700 50  0001 C CNN
+F 0 "#PWR055" H 2700 3700 50  0001 C CNN
 F 1 "GND" H 2700 3800 50  0000 C CNN
 F 2 "" H 2700 3950 50  0000 C CNN
 F 3 "" H 2700 3950 50  0000 C CNN
@ -1869,10 +1856,10 @@ Wire Wire Line
 	6600 7350 6700 7350
 Connection ~ 6700 7350
 $Comp
-L GND #PWR057
+L GND #PWR056
 U 1 1 59EF897E
 P 4800 7450
-F 0 "#PWR057" H 4800 7200 50  0001 C CNN
+F 0 "#PWR056" H 4800 7200 50  0001 C CNN
 F 1 "GND" H 4800 7300 50  0000 C CNN
 F 2 "" H 4800 7450 50  0001 C CNN
 F 3 "" H 4800 7450 50  0001 C CNN
@ -1880,10 +1867,10 @@ F 3 "" H 4800 7450 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR058
+L GND #PWR057
 U 1 1 59EF8A0A
 P 6700 7450
-F 0 "#PWR058" H 6700 7200 50  0001 C CNN
+F 0 "#PWR057" H 6700 7200 50  0001 C CNN
 F 1 "GND" H 6700 7300 50  0000 C CNN
 F 2 "" H 6700 7450 50  0001 C CNN
 F 3 "" H 6700 7450 50  0001 C CNN
@ -1928,10 +1915,10 @@ F 7 "842-LFE5U45F6BG381C" H 6250 1500 60  0001 C CNN "Distributor1_PN"
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V1 #PWR059
+L +1V1 #PWR058
 U 1 1 5A0B33B0
 P 2150 650
-F 0 "#PWR059" H 2150 500 50  0001 C CNN
+F 0 "#PWR058" H 2150 500 50  0001 C CNN
 F 1 "+1V1" H 2150 790 50  0000 C CNN
 F 2 "" H 2150 650 50  0001 C CNN
 F 3 "" H 2150 650 50  0001 C CNN
@ -1939,10 +1926,10 @@ F 3 "" H 2150 650 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V1 #PWR060
+L +1V1 #PWR059
 U 1 1 5A0B387F
 P 10900 2750
-F 0 "#PWR060" H 10900 2600 50  0001 C CNN
+F 0 "#PWR059" H 10900 2600 50  0001 C CNN
 F 1 "+1V1" H 10900 2890 50  0000 C CNN
 F 2 "" H 10900 2750 50  0001 C CNN
 F 3 "" H 10900 2750 50  0001 C CNN
@ -1953,4 +1940,26 @@ Text Notes 4800 5300 0    60   ~ 0
 Switching regulators 2A SOT23-5\nTexas instruments TLV62569DBV (2A) (best)\nDioo microcircuits DIO6015B (1.5A) (osc. acceptable)\nMicrosemi LX7172 (1.2A) (osc. unacceptable)\nDiodes AP3429/A (2A) - (will damage board)\n
 Text Notes 1000 5400 0    60   ~ 0
 SHUTDOWN connected to\nBANK2 on "ram" sheet
+$Comp
+L +3V3 #PWR060
+U 1 1 5A3EC5B1
+P 4900 3500
+F 0 "#PWR060" H 4900 3350 50  0001 C CNN
+F 1 "+3V3" H 4900 3640 50  0000 C CNN
+F 2 "" H 4900 3500 50  0000 C CNN
+F 3 "" H 4900 3500 50  0000 C CNN
+	1    4900 3500
+	1    0    0    -1  
+$EndComp
+$Comp
+L D D23
+U 1 1 5A3ED04A
+P 4900 3650
+F 0 "D23" H 4900 3750 50  0000 C CNN
+F 1 "1N4148" H 4900 3550 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323_HandSoldering" H 4900 3650 50  0001 C CNN
+F 3 "" H 4900 3650 50  0000 C CNN
+	1    4900 3650
+	0    -1   -1   0   
+$EndComp
 $EndSCHEMATC
--- a/sdcard.bak
+++ b/sdcard.bak
@ -170,10 +170,10 @@ Wire Wire Line
 Text Notes 3050 4100 0    60   ~ 0
 SDcard connected to\nBANK6 on "usb" sheet
 $Comp
-L GND #PWR?
+L GND #PWR0123
 U 1 1 5A2A690D
 P 4900 4250
-F 0 "#PWR?" H 4900 4000 50  0001 C CNN
+F 0 "#PWR0123" H 4900 4000 50  0001 C CNN
 F 1 "GND" H 4900 4100 50  0000 C CNN
 F 2 "" H 4900 4250 50  0000 C CNN
 F 3 "" H 4900 4250 50  0000 C CNN
--- a/sdcard.sch
+++ b/sdcard.sch
@ -170,10 +170,10 @@ Wire Wire Line
 Text Notes 3050 4100 0    60   ~ 0
 SDcard connected to\nBANK6 on "usb" sheet
 $Comp
-L GND #PWR?
+L GND #PWR0123
 U 1 1 5A2A690D
 P 4900 4250
-F 0 "#PWR?" H 4900 4000 50  0001 C CNN
+F 0 "#PWR0123" H 4900 4000 50  0001 C CNN
 F 1 "GND" H 4900 4100 50  0000 C CNN
 F 2 "" H 4900 4250 50  0000 C CNN
 F 3 "" H 4900 4250 50  0000 C CNN
--- a/usb.bak
+++ b/usb.bak
@ -311,14 +311,6 @@ Wire Wire Line
 	5600 4400 5800 4400
 Wire Wire Line
 	5800 4400 5800 4300
-Wire Wire Line
-	4800 2800 5000 2800
-Wire Wire Line
-	4900 2800 4900 2250
-Wire Wire Line
-	4900 2250 5800 2250
-Wire Wire Line
-	5800 2250 5800 2500
 Text GLabel 4850 3400 0    60   Input ~ 0
 nRESET
 Wire Wire Line
@ -340,9 +332,7 @@ Wire Wire Line
 	4950 3600 4950 3400
 Connection ~ 4950 3400
 Wire Wire Line
-	4550 3600 4200 3600
-Text Label 4250 3600 0    60   ~ 0
-FT3V3
+	4550 3600 4450 3600
 Text GLabel 10150 2650 2    60   Input ~ 0
 FTDI_TXD
 Text GLabel 8650 1950 0    60   Input ~ 0
@ -407,9 +397,6 @@ Text GLabel 6550 3900 2    60   Input ~ 0
 FTDI_nTXLED
 Text Notes 6550 2600 0    60   ~ 0
 VNC2 programming pins:\nTXD RXD TXDEN
-Text GLabel 4800 2800 0    60   Input ~ 0
-FT3V3
-Connection ~ 4900 2800
 Text Notes 4350 5900 0    60   ~ 0
 warning:\nULX3S has different pinout\nfor simpler PCB routing and\nbecause FT230X has weak CTS\ndrive capability. (Undocumented,\nFLEAfpga mail from 13-Nov-2015)\nULX2S pinout was:\nTCK = DSR\nTMS = RI\nTDI = CTS\nTDO = DCD\n
 $Comp
@ -738,4 +725,10 @@ F 3 "" H 5450 1150 50  0001 C CNN
 	1    5450 1150
 	1    0    0    -1  
 $EndComp
+Text GLabel 4450 3600 0    60   Input ~ 0
+FT2V5
+Text GLabel 5800 2500 1    60   Input ~ 0
+FT2V5
+Text GLabel 5000 2800 0    60   Input ~ 0
+FT2V5
 $EndSCHEMATC
--- a/usb.sch
+++ b/usb.sch
@ -311,14 +311,6 @@ Wire Wire Line
 	5600 4400 5800 4400
 Wire Wire Line
 	5800 4400 5800 4300
-Wire Wire Line
-	4800 2800 5000 2800
-Wire Wire Line
-	4900 2800 4900 2250
-Wire Wire Line
-	4900 2250 5800 2250
-Wire Wire Line
-	5800 2250 5800 2500
 Text GLabel 4850 3400 0    60   Input ~ 0
 nRESET
 Wire Wire Line
@ -340,9 +332,7 @@ Wire Wire Line
 	4950 3600 4950 3400
 Connection ~ 4950 3400
 Wire Wire Line
-	4550 3600 4200 3600
-Text Label 4250 3600 0    60   ~ 0
-FT3V3
+	4550 3600 4450 3600
 Text GLabel 10150 2650 2    60   Input ~ 0
 FTDI_TXD
 Text GLabel 8650 1950 0    60   Input ~ 0
@ -407,9 +397,6 @@ Text GLabel 6550 3900 2    60   Input ~ 0
 FTDI_nTXLED
 Text Notes 6550 2600 0    60   ~ 0
 VNC2 programming pins:\nTXD RXD TXDEN
-Text GLabel 4800 2800 0    60   Input ~ 0
-FT3V3
-Connection ~ 4900 2800
 Text Notes 4350 5900 0    60   ~ 0
 warning:\nULX3S has different pinout\nfor simpler PCB routing and\nbecause FT230X has weak CTS\ndrive capability. (Undocumented,\nFLEAfpga mail from 13-Nov-2015)\nULX2S pinout was:\nTCK = DSR\nTMS = RI\nTDI = CTS\nTDO = DCD\n
 $Comp
@ -738,4 +725,10 @@ F 3 "" H 5450 1150 50  0001 C CNN
 	1    5450 1150
 	1    0    0    -1  
 $EndComp
+Text GLabel 4450 3600 0    60   Input ~ 0
+FT2V5
+Text GLabel 5800 2500 1    60   Input ~ 0
+FT2V5
+Text GLabel 5000 2800 0    60   Input ~ 0
+FT2V5
 $EndSCHEMATC