Additional VCC 2.2uF blocking capacitors near the switching

power supply to form PI-filter with another 2.2uF near BGA
7 years ago · 9cc436ce8c
parent a920525e4f
commit 9cc436ce8c
14 changed files with 9447 additions and 9061 deletions
--- a/analog.bak
+++ b/analog.bak
@ -65,10 +65,10 @@ F 3 "" H 2650 2400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0105
+L GND #PWR108
 U 1 1 58D9043A
 P 3250 2550
-F 0 "#PWR0105" H 3250 2300 50  0001 C CNN
+F 0 "#PWR108" 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
@ -215,10 +215,10 @@ AUDIO_L
 Text Label 3050 2750 0    60   ~ 0
 AUDIO_R
 $Comp
-L GND #PWR0106
+L GND #PWR106
 U 1 1 595A57AD
 P 2800 5800
-F 0 "#PWR0106" H 2800 5550 50  0001 C CNN
+F 0 "#PWR106" H 2800 5550 50  0001 C CNN
 F 1 "GND" H 2800 5650 50  0000 C CNN
 F 2 "" H 2800 5800 50  0000 C CNN
 F 3 "" H 2800 5800 50  0000 C CNN
@ -244,10 +244,10 @@ Wire Wire Line
 	3700 4700 3800 4700
 Connection ~ 3800 4700
 $Comp
-L GND #PWR0107
+L GND #PWR112
 U 1 1 595A622F
 P 3950 4800
-F 0 "#PWR0107" H 3950 4550 50  0001 C CNN
+F 0 "#PWR112" H 3950 4550 50  0001 C CNN
 F 1 "GND" H 3950 4650 50  0000 C CNN
 F 2 "" H 3950 4800 50  0000 C CNN
 F 3 "" H 3950 4800 50  0000 C CNN
@ -294,10 +294,10 @@ J2_11-
 Text GLabel 2900 5200 0    60   Input ~ 0
 J2_11+
 $Comp
-L +3V3 #PWR0108
+L +3V3 #PWR105
 U 1 1 595BB15C
 P 2800 4250
-F 0 "#PWR0108" H 2800 4100 50  0001 C CNN
+F 0 "#PWR105" H 2800 4100 50  0001 C CNN
 F 1 "+3V3" H 2800 4390 50  0000 C CNN
 F 2 "" H 2800 4250 50  0000 C CNN
 F 3 "" H 2800 4250 50  0000 C CNN
@ -312,10 +312,10 @@ Wire Wire Line
 	2850 4350 2900 4350
 Connection ~ 2850 4250
 $Comp
-L +3V3 #PWR0109
+L +3V3 #PWR111
 U 1 1 595BB1ED
 P 3850 4250
-F 0 "#PWR0109" H 3850 4100 50  0001 C CNN
+F 0 "#PWR111" H 3850 4100 50  0001 C CNN
 F 1 "+3V3" H 3850 4390 50  0000 C CNN
 F 2 "" H 3850 4250 50  0000 C CNN
 F 3 "" H 3850 4250 50  0000 C CNN
@ -325,10 +325,10 @@ $EndComp
 Wire Wire Line
 	3700 4250 3850 4250
 $Comp
-L GND #PWR0110
+L GND #PWR109
 U 1 1 595BB251
 P 3700 4350
-F 0 "#PWR0110" H 3700 4100 50  0001 C CNN
+F 0 "#PWR109" H 3700 4100 50  0001 C CNN
 F 1 "GND" H 3700 4200 50  0000 C CNN
 F 2 "" H 3700 4350 50  0000 C CNN
 F 3 "" H 3700 4350 50  0000 C CNN
@ -336,10 +336,10 @@ F 3 "" H 3700 4350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR0111
+L +3V3 #PWR107
 U 1 1 595BC3C0
 P 2900 5450
-F 0 "#PWR0111" H 2900 5300 50  0001 C CNN
+F 0 "#PWR107" H 2900 5300 50  0001 C CNN
 F 1 "+3V3" H 2900 5590 50  0000 C CNN
 F 2 "" H 2900 5450 50  0000 C CNN
 F 3 "" H 2900 5450 50  0000 C CNN
@ -347,10 +347,10 @@ F 3 "" H 2900 5450 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR0112
+L GND #PWR110
 U 1 1 595BC42E
 P 3700 5200
-F 0 "#PWR0112" H 3700 4950 50  0001 C CNN
+F 0 "#PWR110" H 3700 4950 50  0001 C CNN
 F 1 "GND" H 3700 5050 50  0000 C CNN
 F 2 "" H 3700 5200 50  0000 C CNN
 F 3 "" H 3700 5200 50  0000 C CNN
--- a/blinkey.bak
+++ b/blinkey.bak
@ -68,10 +68,10 @@ Wire Wire Line
 Wire Wire Line
 	4750 1850 4850 1850
 $Comp
-L GND #PWR059
+L GND #PWR63
 U 1 1 58D66047
 P 4850 1250
-F 0 "#PWR059" H 4850 1000 50  0001 C CNN
+F 0 "#PWR63" 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
@ -79,10 +79,10 @@ F 3 "" H 4850 1250 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR060
+L +3V3 #PWR64
 U 1 1 58D66055
 P 5350 1350
-F 0 "#PWR060" H 5350 1200 50  0001 C CNN
+F 0 "#PWR64" 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
@ -180,10 +180,10 @@ Wire Wire Line
 Wire Wire Line
 	2750 3150 2850 3150
 $Comp
-L +3V3 #PWR061
+L +3V3 #PWR59
 U 1 1 58D6605C
 P 1750 2750
-F 0 "#PWR061" H 1750 2600 50  0001 C CNN
+F 0 "#PWR59" H 1750 2600 50  0001 C CNN
 F 1 "+3V3" H 1750 2890 50  0000 C CNN
 F 2 "" H 1750 2750 50  0000 C CNN
 F 3 "" H 1750 2750 50  0000 C CNN
@ -340,10 +340,10 @@ Wire Wire Line
 	4400 2750 4250 2750
 Connection ~ 4250 2750
 $Comp
-L GND #PWR062
+L GND #PWR61
 U 1 1 58D681C3
 P 4250 4100
-F 0 "#PWR062" H 4250 3850 50  0001 C CNN
+F 0 "#PWR61" 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
@ -433,10 +433,10 @@ Wire Wire Line
 Wire Wire Line
 	4250 4600 4250 4950
 $Comp
-L GND #PWR063
+L GND #PWR62
 U 1 1 590B5B6D
 P 4250 4950
-F 0 "#PWR063" H 4250 4700 50  0001 C CNN
+F 0 "#PWR62" H 4250 4700 50  0001 C CNN
 F 1 "GND" H 4250 4800 50  0000 C CNN
 F 2 "" H 4250 4950 50  0000 C CNN
 F 3 "" H 4250 4950 50  0000 C CNN
@ -480,10 +480,10 @@ Wire Wire Line
 Wire Wire Line
 	2750 2750 2750 3150
 $Comp
-L +3V3 #PWR064
+L +3V3 #PWR60
 U 1 1 591B548D
 P 1750 4150
-F 0 "#PWR064" H 1750 4000 50  0001 C CNN
+F 0 "#PWR60" H 1750 4000 50  0001 C CNN
 F 1 "+3V3" H 1750 4290 50  0000 C CNN
 F 2 "" H 1750 4150 50  0000 C CNN
 F 3 "" H 1750 4150 50  0000 C CNN
@ -640,10 +640,10 @@ F 3 "" H 7550 3400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR065
+L +3V3 #PWR65
 U 1 1 595BA1C1
 P 7400 3400
-F 0 "#PWR065" H 7400 3250 50  0001 C CNN
+F 0 "#PWR65" H 7400 3250 50  0001 C CNN
 F 1 "+3V3" H 7400 3540 50  0000 C CNN
 F 2 "" H 7400 3400 50  0000 C CNN
 F 3 "" H 7400 3400 50  0000 C CNN
--- a/flash.bak
+++ b/flash.bak
@ -65,10 +65,10 @@ F 3 "" H 2450 2650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0117
+L +3V3 #PWR119
 U 1 1 58D9149E
 P 2800 2400
-F 0 "#PWR0117" H 2800 2250 50  0001 C CNN
+F 0 "#PWR119" 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
@ -76,10 +76,10 @@ F 3 "" H 2800 2400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0118
+L GND #PWR120
 U 1 1 58D914B4
 P 2800 3000
-F 0 "#PWR0118" H 2800 2750 50  0001 C CNN
+F 0 "#PWR120" 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
@ -138,10 +138,10 @@ Wire Wire Line
 Text Label 3950 2200 1    60   ~ 0
 FLASH_MOSI
 $Comp
-L +3V3 #PWR0119
+L +3V3 #PWR121
 U 1 1 58EC0F61
 P 3950 1250
-F 0 "#PWR0119" H 3950 1100 50  0001 C CNN
+F 0 "#PWR121" 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
@ -164,10 +164,10 @@ Wire Wire Line
 Text Label 4150 2200 1    60   ~ 0
 FLASH_MISO
 $Comp
-L +3V3 #PWR0120
+L +3V3 #PWR122
 U 1 1 58EC0F96
 P 4150 1250
-F 0 "#PWR0120" H 4150 1100 50  0001 C CNN
+F 0 "#PWR122" 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
@ -190,10 +190,10 @@ Wire Wire Line
 Text Label 4350 2200 1    60   ~ 0
 FLASH_SCK
 $Comp
-L +3V3 #PWR0121
+L +3V3 #PWR123
 U 1 1 58EC15E9
 P 4350 1250
-F 0 "#PWR0121" H 4350 1100 50  0001 C CNN
+F 0 "#PWR123" 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
@ -220,10 +220,10 @@ Wire Wire Line
 Text Label 4550 2200 1    60   ~ 0
 FLASH_nCS
 $Comp
-L +3V3 #PWR0122
+L +3V3 #PWR124
 U 1 1 58EC1C8C
 P 4550 1250
-F 0 "#PWR0122" H 4550 1100 50  0001 C CNN
+F 0 "#PWR124" 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
@ -248,10 +248,10 @@ Wire Wire Line
 Text Label 1150 2150 1    60   ~ 0
 FLASH_nWP
 $Comp
-L +3V3 #PWR0123
+L +3V3 #PWR117
 U 1 1 58EC4E7F
 P 1150 1200
-F 0 "#PWR0123" H 1150 1050 50  0001 C CNN
+F 0 "#PWR117" 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
@ -274,10 +274,10 @@ Wire Wire Line
 Text Label 1350 2150 1    60   ~ 0
 FLASH_nHOLD
 $Comp
-L +3V3 #PWR0124
+L +3V3 #PWR118
 U 1 1 58EC4E8D
 P 1350 1200
-F 0 "#PWR0124" H 1350 1050 50  0001 C CNN
+F 0 "#PWR118" 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
@ -285,10 +285,10 @@ F 3 "" H 1350 1200 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0125
+L +3V3 #PWR125
 U 1 1 58EC58A7
 P 5450 3350
-F 0 "#PWR0125" H 5450 3200 50  0001 C CNN
+F 0 "#PWR125" 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
@ -296,10 +296,10 @@ F 3 "" H 5450 3350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR0126
+L GND #PWR129
 U 1 1 58EC58CB
 P 5650 3450
-F 0 "#PWR0126" H 5650 3200 50  0001 C CNN
+F 0 "#PWR129" 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
@ -307,10 +307,10 @@ F 3 "" H 5650 3450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR0127
+L GND #PWR128
 U 1 1 58EC58EF
 P 5650 3250
-F 0 "#PWR0127" H 5650 3000 50  0001 C CNN
+F 0 "#PWR128" 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
@ -345,10 +345,10 @@ Wire Wire Line
 Text Label 8850 3650 1    60   ~ 0
 FPGA_PROGRAMN
 $Comp
-L +3V3 #PWR0128
+L +3V3 #PWR131
 U 1 1 58EC68E4
 P 8850 2550
-F 0 "#PWR0128" H 8850 2400 50  0001 C CNN
+F 0 "#PWR131" 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
@ -371,10 +371,10 @@ Wire Wire Line
 Text Label 9050 3650 1    60   ~ 0
 FPGA_DONE
 $Comp
-L +3V3 #PWR0129
+L +3V3 #PWR132
 U 1 1 58EC68F2
 P 9050 2550
-F 0 "#PWR0129" H 9050 2400 50  0001 C CNN
+F 0 "#PWR132" 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
@ -401,10 +401,10 @@ Wire Wire Line
 Text Label 9250 3650 1    60   ~ 0
 FPGA_INITN
 $Comp
-L +3V3 #PWR0130
+L +3V3 #PWR133
 U 1 1 58EC7305
 P 9250 2550
-F 0 "#PWR0130" H 9250 2400 50  0001 C CNN
+F 0 "#PWR133" 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
@ -412,10 +412,10 @@ F 3 "" H 9250 2550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0131
+L +3V3 #PWR127
 U 1 1 58EC879F
 P 5650 2950
-F 0 "#PWR0131" H 5650 2800 50  0001 C CNN
+F 0 "#PWR127" 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
@ -423,10 +423,10 @@ F 3 "" H 5650 2950 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR0132
+L +3V3 #PWR126
 U 1 1 58EC8800
 P 5650 2550
-F 0 "#PWR0132" H 5650 2400 50  0001 C CNN
+F 0 "#PWR126" 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
@ -434,10 +434,10 @@ F 3 "" H 5650 2550 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR0133
+L +3V3 #PWR130
 U 1 1 58EC882A
 P 7150 2550
-F 0 "#PWR0133" H 7150 2400 50  0001 C CNN
+F 0 "#PWR130" 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/gpdi.bak
+++ b/gpdi.bak
@ -105,10 +105,10 @@ Wire Wire Line
 Wire Wire Line
 	1450 1900 1500 1900
 $Comp
-L GND #PWR066
+L GND #PWR66
 U 1 1 58D69073
 P 1500 1900
-F 0 "#PWR066" H 1500 1650 50  0001 C CNN
+F 0 "#PWR66" H 1500 1650 50  0001 C CNN
 F 1 "GND" H 1500 1750 50  0000 C CNN
 F 2 "" H 1500 1900 60  0000 C CNN
 F 3 "" H 1500 1900 60  0000 C CNN
@ -116,10 +116,10 @@ F 3 "" H 1500 1900 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR067
+L GND #PWR71
 U 1 1 58D69074
 P 1500 3500
-F 0 "#PWR067" H 1500 3250 50  0001 C CNN
+F 0 "#PWR71" H 1500 3250 50  0001 C CNN
 F 1 "GND" H 1500 3350 50  0000 C CNN
 F 2 "" H 1500 3500 60  0000 C CNN
 F 3 "" H 1500 3500 60  0000 C CNN
@ -127,10 +127,10 @@ F 3 "" H 1500 3500 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR068
+L GND #PWR70
 U 1 1 58D69075
 P 1500 3200
-F 0 "#PWR068" H 1500 2950 50  0001 C CNN
+F 0 "#PWR70" H 1500 2950 50  0001 C CNN
 F 1 "GND" H 1500 3050 50  0000 C CNN
 F 2 "" H 1500 3200 60  0000 C CNN
 F 3 "" H 1500 3200 60  0000 C CNN
@ -138,10 +138,10 @@ F 3 "" H 1500 3200 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR069
+L GND #PWR69
 U 1 1 58D69076
 P 1500 2900
-F 0 "#PWR069" H 1500 2650 50  0001 C CNN
+F 0 "#PWR69" H 1500 2650 50  0001 C CNN
 F 1 "GND" H 1500 2750 50  0000 C CNN
 F 2 "" H 1500 2900 60  0000 C CNN
 F 3 "" H 1500 2900 60  0000 C CNN
@ -149,10 +149,10 @@ F 3 "" H 1500 2900 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR070
+L GND #PWR68
 U 1 1 58D69077
 P 1500 2600
-F 0 "#PWR070" H 1500 2350 50  0001 C CNN
+F 0 "#PWR68" H 1500 2350 50  0001 C CNN
 F 1 "GND" H 1500 2450 50  0000 C CNN
 F 2 "" H 1500 2600 60  0000 C CNN
 F 3 "" H 1500 2600 60  0000 C CNN
@ -160,10 +160,10 @@ F 3 "" H 1500 2600 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR071
+L GND #PWR67
 U 1 1 58D69078
 P 1500 2300
-F 0 "#PWR071" H 1500 2050 50  0001 C CNN
+F 0 "#PWR67" H 1500 2050 50  0001 C CNN
 F 1 "GND" H 1500 2150 50  0000 C CNN
 F 2 "" H 1500 2300 60  0000 C CNN
 F 3 "" H 1500 2300 60  0000 C CNN
@ -171,10 +171,10 @@ F 3 "" H 1500 2300 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +5V #PWR072
+L +5V #PWR73
 U 1 1 58D6907F
 P 2250 3800
-F 0 "#PWR072" H 2250 3650 50  0001 C CNN
+F 0 "#PWR73" H 2250 3650 50  0001 C CNN
 F 1 "+5V" H 2250 3940 50  0000 C CNN
 F 2 "" H 2250 3800 50  0000 C CNN
 F 3 "" H 2250 3800 50  0000 C CNN
@ -292,10 +292,10 @@ Wire Wire Line
 Wire Wire Line
 	3800 5350 3800 4950
 $Comp
-L +5V #PWR073
+L +5V #PWR77
 U 1 1 58D92625
 P 3600 4400
-F 0 "#PWR073" H 3600 4250 50  0001 C CNN
+F 0 "#PWR77" 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
@ -317,10 +317,10 @@ Wire Wire Line
 	4050 4550 4050 4600
 Connection ~ 3800 4550
 $Comp
-L GND #PWR074
+L GND #PWR78
 U 1 1 58D92889
 P 4050 4950
-F 0 "#PWR074" H 4050 4700 50  0001 C CNN
+F 0 "#PWR78" 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
@ -330,10 +330,10 @@ $EndComp
 Wire Wire Line
 	4050 4900 4050 4950
 $Comp
-L +3V3 #PWR075
+L +3V3 #PWR72
 U 1 1 58D92A40
 P 2000 4700
-F 0 "#PWR075" H 2000 4550 50  0001 C CNN
+F 0 "#PWR72" 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
@ -341,10 +341,10 @@ F 3 "" H 2000 4700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR076
+L GND #PWR74
 U 1 1 58D92B02
 P 2250 5050
-F 0 "#PWR076" H 2250 4800 50  0001 C CNN
+F 0 "#PWR74" 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
@ -439,10 +439,10 @@ F 3 "" H 3300 1950 50  0000 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR077
+L +3V3 #PWR75
 U 1 1 58EE0104
 P 3300 1650
-F 0 "#PWR077" H 3300 1500 50  0001 C CNN
+F 0 "#PWR75" H 3300 1500 50  0001 C CNN
 F 1 "+3V3" H 3300 1790 50  0000 C CNN
 F 2 "" H 3300 1650 50  0000 C CNN
 F 3 "" H 3300 1650 50  0000 C CNN
@ -459,10 +459,10 @@ Wire Wire Line
 	3050 1950 3150 1950
 Connection ~ 3300 1700
 $Comp
-L GND #PWR078
+L GND #PWR76
 U 1 1 58EE01EB
 P 3300 2150
-F 0 "#PWR078" H 3300 1900 50  0001 C CNN
+F 0 "#PWR76" H 3300 1900 50  0001 C CNN
 F 1 "GND" H 3300 2000 50  0000 C CNN
 F 2 "" H 3300 2150 50  0000 C CNN
 F 3 "" H 3300 2150 50  0000 C CNN
--- a/gpio.bak
+++ b/gpio.bak
@ -54,10 +54,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR05
+L GND #PWR22
 U 1 1 56AC4825
 P 7800 3550
-F 0 "#PWR05" H 7800 3300 50  0001 C CNN
+F 0 "#PWR22" H 7800 3300 50  0001 C CNN
 F 1 "GND" H 7800 3400 50  0000 C CNN
 F 2 "" H 7800 3550 60  0000 C CNN
 F 3 "" H 7800 3550 60  0000 C CNN
@ -65,10 +65,10 @@ F 3 "" H 7800 3550 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR06
+L GND #PWR23
 U 1 1 56AC482D
 P 9000 3550
-F 0 "#PWR06" H 9000 3300 50  0001 C CNN
+F 0 "#PWR23" H 9000 3300 50  0001 C CNN
 F 1 "GND" H 9000 3400 50  0000 C CNN
 F 2 "" H 9000 3550 60  0000 C CNN
 F 3 "" H 9000 3550 60  0000 C CNN
@ -80,8 +80,8 @@ L D_Schottky_Small D51
 U 1 1 56AC483B
 P 7450 5350
 F 0 "D51" H 7400 5430 50  0000 L CNN
-F 1 "2A" H 7400 5250 50  0000 L CNN
-F 2 "SMD_Packages:SMD-1206_Pol" V 7450 5350 60  0001 C CNN
+F 1 "STPS2L30AF" H 7400 5250 50  0000 L CNN
+F 2 "Diodes_SMD:D_SMA_Handsoldering" V 7450 5350 60  0001 C CNN
 F 3 "" V 7450 5350 60  0000 C CNN
 	1    7450 5350
 	1    0    0    -1  
@ -93,8 +93,8 @@ L D_Schottky_Small D52
 U 1 1 56AC4846
 P 9400 5350
 F 0 "D52" H 9350 5430 50  0000 L CNN
-F 1 "2A" H 9350 5250 50  0000 L CNN
-F 2 "SMD_Packages:SMD-1206_Pol" V 9400 5350 60  0001 C CNN
+F 1 "STPS2L30AF" H 9350 5250 50  0000 L CNN
+F 2 "Diodes_SMD:D_SMA_Handsoldering" V 9400 5350 60  0001 C CNN
 F 3 "" V 9400 5350 60  0000 C CNN
 	1    9400 5350
 	1    0    0    -1  
@ -102,10 +102,10 @@ $EndComp
 Text Label 8700 5350 0    60   ~ 0
 OUT5V
 $Comp
-L +5V #PWR07
+L +5V #PWR17
 U 1 1 56AC484F
 P 7350 5350
-F 0 "#PWR07" H 7350 5200 50  0001 C CNN
+F 0 "#PWR17" H 7350 5200 50  0001 C CNN
 F 1 "+5V" H 7350 5490 50  0000 C CNN
 F 2 "" H 7350 5350 60  0000 C CNN
 F 3 "" H 7350 5350 60  0000 C CNN
@ -113,10 +113,10 @@ F 3 "" H 7350 5350 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR08
+L +3V3 #PWR26
 U 1 1 58D5FBBC
 P 9150 3450
-F 0 "#PWR08" H 9150 3300 50  0001 C CNN
+F 0 "#PWR26" H 9150 3300 50  0001 C CNN
 F 1 "+3V3" H 9150 3590 50  0000 C CNN
 F 2 "" H 9150 3450 50  0000 C CNN
 F 3 "" H 9150 3450 50  0000 C CNN
@ -124,10 +124,10 @@ F 3 "" H 9150 3450 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR09
+L +3V3 #PWR19
 U 1 1 58D5FBF3
 P 7650 3450
-F 0 "#PWR09" H 7650 3300 50  0001 C CNN
+F 0 "#PWR19" H 7650 3300 50  0001 C CNN
 F 1 "+3V3" H 7650 3590 50  0000 C CNN
 F 2 "" H 7650 3450 50  0000 C CNN
 F 3 "" H 7650 3450 50  0000 C CNN
@ -157,10 +157,10 @@ F 3 "" H 1850 3500 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR010
+L GND #PWR20
 U 1 1 58E6D572
 P 7750 4450
-F 0 "#PWR010" H 7750 4200 50  0001 C CNN
+F 0 "#PWR20" H 7750 4200 50  0001 C CNN
 F 1 "GND" H 7750 4300 50  0000 C CNN
 F 2 "" H 7750 4450 60  0000 C CNN
 F 3 "" H 7750 4450 60  0000 C CNN
@ -168,10 +168,10 @@ F 3 "" H 7750 4450 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR011
+L +3V3 #PWR18
 U 1 1 58E6D578
 P 7600 4350
-F 0 "#PWR011" H 7600 4200 50  0001 C CNN
+F 0 "#PWR18" H 7600 4200 50  0001 C CNN
 F 1 "+3V3" H 7600 4490 50  0000 C CNN
 F 2 "" H 7600 4350 50  0000 C CNN
 F 3 "" H 7600 4350 50  0000 C CNN
@ -179,10 +179,10 @@ F 3 "" H 7600 4350 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR012
+L GND #PWR24
 U 1 1 58E6D59D
 P 9050 4450
-F 0 "#PWR012" H 9050 4200 50  0001 C CNN
+F 0 "#PWR24" H 9050 4200 50  0001 C CNN
 F 1 "GND" H 9050 4300 50  0000 C CNN
 F 2 "" H 9050 4450 60  0000 C CNN
 F 3 "" H 9050 4450 60  0000 C CNN
@ -190,10 +190,10 @@ F 3 "" H 9050 4450 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR013
+L +3V3 #PWR27
 U 1 1 58E6D5A3
 P 9200 4350
-F 0 "#PWR013" H 9200 4200 50  0001 C CNN
+F 0 "#PWR27" H 9200 4200 50  0001 C CNN
 F 1 "+3V3" H 9200 4490 50  0000 C CNN
 F 2 "" H 9200 4350 50  0000 C CNN
 F 3 "" H 9200 4350 50  0000 C CNN
@ -201,10 +201,10 @@ F 3 "" H 9200 4350 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR014
+L GND #PWR21
 U 1 1 58E6E4EC
 P 7750 5250
-F 0 "#PWR014" H 7750 5000 50  0001 C CNN
+F 0 "#PWR21" H 7750 5000 50  0001 C CNN
 F 1 "GND" H 7750 5100 50  0000 C CNN
 F 2 "" H 7750 5250 60  0000 C CNN
 F 3 "" H 7750 5250 60  0000 C CNN
@ -212,10 +212,10 @@ F 3 "" H 7750 5250 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR015
+L +3V3 #PWR7
 U 1 1 58E6E4F2
 P 1050 5400
-F 0 "#PWR015" H 1050 5250 50  0001 C CNN
+F 0 "#PWR7" H 1050 5250 50  0001 C CNN
 F 1 "+3V3" H 1050 5540 50  0000 C CNN
 F 2 "" H 1050 5400 50  0000 C CNN
 F 3 "" H 1050 5400 50  0000 C CNN
@ -223,10 +223,10 @@ F 3 "" H 1050 5400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR016
+L GND #PWR25
 U 1 1 58E6E536
 P 9050 5250
-F 0 "#PWR016" H 9050 5000 50  0001 C CNN
+F 0 "#PWR25" H 9050 5000 50  0001 C CNN
 F 1 "GND" H 9050 5100 50  0000 C CNN
 F 2 "" H 9050 5250 60  0000 C CNN
 F 3 "" H 9050 5250 60  0000 C CNN
@ -234,10 +234,10 @@ F 3 "" H 9050 5250 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR017
+L +3V3 #PWR14
 U 1 1 58E6E53C
 P 2600 5400
-F 0 "#PWR017" H 2600 5250 50  0001 C CNN
+F 0 "#PWR14" H 2600 5250 50  0001 C CNN
 F 1 "+3V3" H 2600 5540 50  0000 C CNN
 F 2 "" H 2600 5400 50  0000 C CNN
 F 3 "" H 2600 5400 50  0000 C CNN
@ -273,10 +273,10 @@ Wire Wire Line
 Wire Wire Line
 	7750 5250 8150 5250
 $Comp
-L GND #PWR018
+L GND #PWR8
 U 1 1 58E710CC
 P 1200 3600
-F 0 "#PWR018" H 1200 3350 50  0001 C CNN
+F 0 "#PWR8" H 1200 3350 50  0001 C CNN
 F 1 "GND" H 1200 3450 50  0000 C CNN
 F 2 "" H 1200 3600 60  0000 C CNN
 F 3 "" H 1200 3600 60  0000 C CNN
@ -284,10 +284,10 @@ F 3 "" H 1200 3600 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR019
+L +3V3 #PWR5
 U 1 1 58E710E0
 P 1050 3500
-F 0 "#PWR019" H 1050 3350 50  0001 C CNN
+F 0 "#PWR5" H 1050 3350 50  0001 C CNN
 F 1 "+3V3" H 1050 3640 50  0000 C CNN
 F 2 "" H 1050 3500 50  0000 C CNN
 F 3 "" H 1050 3500 50  0000 C CNN
@ -295,10 +295,10 @@ F 3 "" H 1050 3500 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR020
+L GND #PWR9
 U 1 1 58E710E6
 P 1200 4500
-F 0 "#PWR020" H 1200 4250 50  0001 C CNN
+F 0 "#PWR9" H 1200 4250 50  0001 C CNN
 F 1 "GND" H 1200 4350 50  0000 C CNN
 F 2 "" H 1200 4500 60  0000 C CNN
 F 3 "" H 1200 4500 60  0000 C CNN
@ -306,10 +306,10 @@ F 3 "" H 1200 4500 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR021
+L +3V3 #PWR6
 U 1 1 58E710EC
 P 1050 4400
-F 0 "#PWR021" H 1050 4250 50  0001 C CNN
+F 0 "#PWR6" H 1050 4250 50  0001 C CNN
 F 1 "+3V3" H 1050 4540 50  0000 C CNN
 F 2 "" H 1050 4400 50  0000 C CNN
 F 3 "" H 1050 4400 50  0000 C CNN
@ -317,10 +317,10 @@ F 3 "" H 1050 4400 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR10
 U 1 1 58E710F2
 P 1200 5300
-F 0 "#PWR022" H 1200 5050 50  0001 C CNN
+F 0 "#PWR10" H 1200 5050 50  0001 C CNN
 F 1 "GND" H 1200 5150 50  0000 C CNN
 F 2 "" H 1200 5300 60  0000 C CNN
 F 3 "" H 1200 5300 60  0000 C CNN
@ -338,10 +338,10 @@ Wire Wire Line
 Wire Wire Line
 	1200 5300 1600 5300
 $Comp
-L GND #PWR023
+L GND #PWR13
 U 1 1 58E7117D
 P 2550 3600
-F 0 "#PWR023" H 2550 3350 50  0001 C CNN
+F 0 "#PWR13" H 2550 3350 50  0001 C CNN
 F 1 "GND" H 2550 3450 50  0000 C CNN
 F 2 "" H 2550 3600 60  0000 C CNN
 F 3 "" H 2550 3600 60  0000 C CNN
@ -349,10 +349,10 @@ F 3 "" H 2550 3600 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR024
+L +3V3 #PWR16
 U 1 1 58E71191
 P 2700 3500
-F 0 "#PWR024" H 2700 3350 50  0001 C CNN
+F 0 "#PWR16" H 2700 3350 50  0001 C CNN
 F 1 "+3V3" H 2700 3640 50  0000 C CNN
 F 2 "" H 2700 3500 50  0000 C CNN
 F 3 "" H 2700 3500 50  0000 C CNN
@ -360,10 +360,10 @@ F 3 "" H 2700 3500 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR11
 U 1 1 58E71197
 P 2500 4500
-F 0 "#PWR025" H 2500 4250 50  0001 C CNN
+F 0 "#PWR11" H 2500 4250 50  0001 C CNN
 F 1 "GND" H 2500 4350 50  0000 C CNN
 F 2 "" H 2500 4500 60  0000 C CNN
 F 3 "" H 2500 4500 60  0000 C CNN
@ -371,10 +371,10 @@ F 3 "" H 2500 4500 60  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L +3V3 #PWR026
+L +3V3 #PWR15
 U 1 1 58E7119D
 P 2650 4400
-F 0 "#PWR026" H 2650 4250 50  0001 C CNN
+F 0 "#PWR15" H 2650 4250 50  0001 C CNN
 F 1 "+3V3" H 2650 4540 50  0000 C CNN
 F 2 "" H 2650 4400 50  0000 C CNN
 F 3 "" H 2650 4400 50  0000 C CNN
@ -382,10 +382,10 @@ F 3 "" H 2650 4400 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR027
+L GND #PWR12
 U 1 1 58E711A3
 P 2500 5300
-F 0 "#PWR027" H 2500 5050 50  0001 C CNN
+F 0 "#PWR12" H 2500 5050 50  0001 C CNN
 F 1 "GND" H 2500 5150 50  0000 C CNN
 F 2 "" H 2500 5300 60  0000 C CNN
 F 3 "" H 2500 5300 60  0000 C CNN
@ -403,10 +403,10 @@ Wire Wire Line
 Wire Wire Line
 	2100 5300 2500 5300
 $Comp
-L +5V #PWR028
+L +5V #PWR28
 U 1 1 58E75077
 P 9500 5350
-F 0 "#PWR028" H 9500 5200 50  0001 C CNN
+F 0 "#PWR28" H 9500 5200 50  0001 C CNN
 F 1 "+5V" H 9500 5490 50  0000 C CNN
 F 2 "" H 9500 5350 50  0000 C CNN
 F 3 "" H 9500 5350 50  0000 C CNN
--- a/power.bak
+++ b/power.bak
@ -54,10 +54,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR029
+L GND #PWR29
 U 1 1 58D54769
 P 1100 2650
-F 0 "#PWR029" H 1100 2400 50  0001 C CNN
+F 0 "#PWR29" H 1100 2400 50  0001 C CNN
 F 1 "GND" H 1100 2500 50  0000 C CNN
 F 2 "" H 1100 2650 60  0000 C CNN
 F 3 "" H 1100 2650 60  0000 C CNN
@ -67,140 +67,140 @@ $EndComp
 $Comp
 L AP3429A U3
 U 1 1 58D58840
-P 8500 3350
-F 0 "U3" H 8500 3500 60  0000 C CNN
-F 1 "AP3429A" H 8500 3400 60  0000 C CNN
-F 2 "TSOT-25:TSOT-25" H 8500 3350 60  0001 C CNN
-F 3 "" H 8500 3350 60  0001 C CNN
-	1    8500 3350
+P 7300 3350
+F 0 "U3" H 7300 3500 60  0000 C CNN
+F 1 "AP3429A" H 7300 3400 60  0000 C CNN
+F 2 "TSOT-25:TSOT-25" H 7300 3350 60  0001 C CNN
+F 3 "" H 7300 3350 60  0001 C CNN
+	1    7300 3350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR030
+L GND #PWR50
 U 1 1 58D58A0B
-P 8500 3850
-F 0 "#PWR030" H 8500 3600 50  0001 C CNN
-F 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
-	1    8500 3850
+P 7300 3850
+F 0 "#PWR50" H 7300 3600 50  0001 C CNN
+F 1 "GND" H 7300 3700 50  0000 C CNN
+F 2 "" H 7300 3850 50  0000 C CNN
+F 3 "" H 7300 3850 50  0000 C CNN
+	1    7300 3850
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR031
+L +5V #PWR44
 U 1 1 58D58F93
-P 7850 3200
-F 0 "#PWR031" H 7850 3050 50  0001 C CNN
-F 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
-	1    7850 3200
+P 6650 3200
+F 0 "#PWR44" H 6650 3050 50  0001 C CNN
+F 1 "+5V" H 6650 3340 50  0000 C CNN
+F 2 "" H 6650 3200 50  0000 C CNN
+F 3 "" H 6650 3200 50  0000 C CNN
+	1    6650 3200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR032
+L GND #PWR45
 U 1 1 58D5989A
-P 7850 3850
-F 0 "#PWR032" H 7850 3600 50  0001 C CNN
-F 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
-	1    7850 3850
+P 6650 3850
+F 0 "#PWR45" H 6650 3600 50  0001 C CNN
+F 1 "GND" H 6650 3700 50  0000 C CNN
+F 2 "" H 6650 3850 50  0000 C CNN
+F 3 "" H 6650 3850 50  0000 C CNN
+	1    6650 3850
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C1
 U 1 1 58D598B7
-P 7850 3650
-F 0 "C1" H 7875 3750 50  0000 L CNN
-F 1 "22uF" H 7875 3550 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 7888 3500 50  0001 C CNN
-F 3 "" H 7850 3650 50  0000 C CNN
-	1    7850 3650
+P 6650 3650
+F 0 "C1" H 6675 3750 50  0000 L CNN
+F 1 "22uF" H 6675 3550 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 6688 3500 50  0001 C CNN
+F 3 "" H 6650 3650 50  0000 C CNN
+	1    6650 3650
 	1    0    0    -1  
 $EndComp
 $Comp
 L L L1
 U 1 1 58D59D36
-P 9350 3050
-F 0 "L1" V 9300 3050 50  0000 C CNN
-F 1 "2.2uH" V 9425 3050 50  0000 C CNN
-F 2 "Resistors_SMD:R_1210_HandSoldering" H 9350 3050 50  0001 C CNN
-F 3 "" H 9350 3050 50  0000 C CNN
-	1    9350 3050
+P 8150 3050
+F 0 "L1" V 8100 3050 50  0000 C CNN
+F 1 "2.2uH" V 8225 3050 50  0000 C CNN
+F 2 "Resistors_SMD:R_1210_HandSoldering" H 8150 3050 50  0001 C CNN
+F 3 "" H 8150 3050 50  0000 C CNN
+	1    8150 3050
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C C2
 U 1 1 58D5A146
-P 9550 3250
-F 0 "C2" H 9575 3350 50  0000 L CNN
-F 1 "470pF" H 9575 3150 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 9588 3100 50  0001 C CNN
-F 3 "" H 9550 3250 50  0000 C CNN
-	1    9550 3250
+P 8350 3250
+F 0 "C2" H 8375 3350 50  0000 L CNN
+F 1 "470pF" H 8375 3150 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 8388 3100 50  0001 C CNN
+F 3 "" H 8350 3250 50  0000 C CNN
+	1    8350 3250
 	1    0    0    -1  
 $EndComp
 $Comp
 L R RA1
 U 1 1 58D5A193
-P 9850 3250
-F 0 "RA1" V 9930 3250 50  0000 C CNN
-F 1 "15k" V 9850 3250 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 9780 3250 50  0001 C CNN
-F 3 "" H 9850 3250 50  0000 C CNN
-	1    9850 3250
+P 8650 3250
+F 0 "RA1" V 8730 3250 50  0000 C CNN
+F 1 "15k" V 8650 3250 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 8580 3250 50  0001 C CNN
+F 3 "" H 8650 3250 50  0000 C CNN
+	1    8650 3250
 	1    0    0    -1  
 $EndComp
 $Comp
 L R RB1
 U 1 1 58D5A1E5
-P 10050 3450
-F 0 "RB1" V 10130 3450 50  0000 C CNN
-F 1 "15k" V 10050 3450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 9980 3450 50  0001 C CNN
-F 3 "" H 10050 3450 50  0000 C CNN
-	1    10050 3450
+P 8850 3450
+F 0 "RB1" V 8930 3450 50  0000 C CNN
+F 1 "15k" V 8850 3450 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 8780 3450 50  0001 C CNN
+F 3 "" H 8850 3450 50  0000 C CNN
+	1    8850 3450
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR033
+L GND #PWR53
 U 1 1 58D5AE5E
-P 10250 3550
-F 0 "#PWR033" H 10250 3300 50  0001 C CNN
-F 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
-	1    10250 3550
+P 9050 3550
+F 0 "#PWR53" H 9050 3300 50  0001 C CNN
+F 1 "GND" H 9050 3400 50  0000 C CNN
+F 2 "" H 9050 3550 50  0000 C CNN
+F 3 "" H 9050 3550 50  0000 C CNN
+	1    9050 3550
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C3
 U 1 1 58D5AE64
-P 10250 3250
-F 0 "C3" H 10275 3350 50  0000 L CNN
-F 1 "22uF" H 10275 3150 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10288 3100 50  0001 C CNN
-F 3 "" H 10250 3250 50  0000 C CNN
-	1    10250 3250
+P 9050 3250
+F 0 "C3" H 9075 3350 50  0000 L CNN
+F 1 "22uF" H 9075 3150 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9088 3100 50  0001 C CNN
+F 3 "" H 9050 3250 50  0000 C CNN
+	1    9050 3250
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C4
 U 1 1 58D5AEB3
-P 10600 3250
-F 0 "C4" H 10625 3350 50  0000 L CNN
-F 1 "22uF" H 10625 3150 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10638 3100 50  0001 C CNN
-F 3 "" H 10600 3250 50  0000 C CNN
-	1    10600 3250
+P 9400 3250
+F 0 "C4" H 9425 3350 50  0000 L CNN
+F 1 "22uF" H 9425 3150 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9438 3100 50  0001 C CNN
+F 3 "" H 9400 3250 50  0000 C CNN
+	1    9400 3250
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR034
+L +3V3 #PWR39
 U 1 1 58D5CFDD
 P 4400 900
-F 0 "#PWR034" H 4400 750 50  0001 C CNN
+F 0 "#PWR39" H 4400 750 50  0001 C CNN
 F 1 "+3V3" H 4400 1040 50  0000 C CNN
 F 2 "" H 4400 900 50  0000 C CNN
 F 3 "" H 4400 900 50  0000 C CNN
@ -210,349 +210,349 @@ $EndComp
 $Comp
 L AP3429A U4
 U 1 1 58D62946
-P 8500 5750
-F 0 "U4" H 8500 5900 60  0000 C CNN
-F 1 "AP3429A" H 8500 5800 60  0000 C CNN
-F 2 "TSOT-25:TSOT-25" H 8500 5750 60  0001 C CNN
-F 3 "" H 8500 5750 60  0001 C CNN
-	1    8500 5750
+P 7300 5750
+F 0 "U4" H 7300 5900 60  0000 C CNN
+F 1 "AP3429A" H 7300 5800 60  0000 C CNN
+F 2 "TSOT-25:TSOT-25" H 7300 5750 60  0001 C CNN
+F 3 "" H 7300 5750 60  0001 C CNN
+	1    7300 5750
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR035
+L GND #PWR52
 U 1 1 58D6294C
-P 8500 6250
-F 0 "#PWR035" H 8500 6000 50  0001 C CNN
-F 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
-	1    8500 6250
+P 7300 6250
+F 0 "#PWR52" H 7300 6000 50  0001 C CNN
+F 1 "GND" H 7300 6100 50  0000 C CNN
+F 2 "" H 7300 6250 50  0000 C CNN
+F 3 "" H 7300 6250 50  0000 C CNN
+	1    7300 6250
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR036
+L +5V #PWR48
 U 1 1 58D62952
-P 7850 5600
-F 0 "#PWR036" H 7850 5450 50  0001 C CNN
-F 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
-	1    7850 5600
+P 6650 5600
+F 0 "#PWR48" H 6650 5450 50  0001 C CNN
+F 1 "+5V" H 6650 5740 50  0000 C CNN
+F 2 "" H 6650 5600 50  0000 C CNN
+F 3 "" H 6650 5600 50  0000 C CNN
+	1    6650 5600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR037
+L GND #PWR49
 U 1 1 58D62958
-P 7850 6250
-F 0 "#PWR037" H 7850 6000 50  0001 C CNN
-F 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
-	1    7850 6250
+P 6650 6250
+F 0 "#PWR49" H 6650 6000 50  0001 C CNN
+F 1 "GND" H 6650 6100 50  0000 C CNN
+F 2 "" H 6650 6250 50  0000 C CNN
+F 3 "" H 6650 6250 50  0000 C CNN
+	1    6650 6250
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C5
 U 1 1 58D6295E
-P 7850 6050
-F 0 "C5" H 7875 6150 50  0000 L CNN
-F 1 "22uF" H 7875 5950 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 7888 5900 50  0001 C CNN
-F 3 "" H 7850 6050 50  0000 C CNN
-	1    7850 6050
+P 6650 6050
+F 0 "C5" H 6675 6150 50  0000 L CNN
+F 1 "22uF" H 6675 5950 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 6688 5900 50  0001 C CNN
+F 3 "" H 6650 6050 50  0000 C CNN
+	1    6650 6050
 	1    0    0    -1  
 $EndComp
 $Comp
 L L L2
 U 1 1 58D62964
-P 9350 5450
-F 0 "L2" V 9300 5450 50  0000 C CNN
-F 1 "2.2uH" V 9425 5450 50  0000 C CNN
-F 2 "Resistors_SMD:R_1210_HandSoldering" H 9350 5450 50  0001 C CNN
-F 3 "" H 9350 5450 50  0000 C CNN
-	1    9350 5450
+P 8150 5450
+F 0 "L2" V 8100 5450 50  0000 C CNN
+F 1 "2.2uH" V 8225 5450 50  0000 C CNN
+F 2 "Resistors_SMD:R_1210_HandSoldering" H 8150 5450 50  0001 C CNN
+F 3 "" H 8150 5450 50  0000 C CNN
+	1    8150 5450
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C C6
 U 1 1 58D6296A
-P 9550 5650
-F 0 "C6" H 9575 5750 50  0000 L CNN
-F 1 "470pF" H 9575 5550 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 9588 5500 50  0001 C CNN
-F 3 "" H 9550 5650 50  0000 C CNN
-	1    9550 5650
+P 8350 5650
+F 0 "C6" H 8375 5750 50  0000 L CNN
+F 1 "470pF" H 8375 5550 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 8388 5500 50  0001 C CNN
+F 3 "" H 8350 5650 50  0000 C CNN
+	1    8350 5650
 	1    0    0    -1  
 $EndComp
 $Comp
 L R RA3
 U 1 1 58D62970
-P 9850 5650
-F 0 "RA3" V 9930 5650 50  0000 C CNN
-F 1 "15k" V 9850 5650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 9780 5650 50  0001 C CNN
-F 3 "" H 9850 5650 50  0000 C CNN
-	1    9850 5650
+P 8650 5650
+F 0 "RA3" V 8730 5650 50  0000 C CNN
+F 1 "15k" V 8650 5650 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 8580 5650 50  0001 C CNN
+F 3 "" H 8650 5650 50  0000 C CNN
+	1    8650 5650
 	1    0    0    -1  
 $EndComp
 $Comp
 L R RB3
 U 1 1 58D62976
-P 10050 5850
-F 0 "RB3" V 10130 5850 50  0000 C CNN
-F 1 "3.3k" V 10050 5850 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 9980 5850 50  0001 C CNN
-F 3 "" H 10050 5850 50  0000 C CNN
-	1    10050 5850
+P 8850 5850
+F 0 "RB3" V 8930 5850 50  0000 C CNN
+F 1 "3.3k" V 8850 5850 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 8780 5850 50  0001 C CNN
+F 3 "" H 8850 5850 50  0000 C CNN
+	1    8850 5850
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR038
+L GND #PWR55
 U 1 1 58D62982
-P 10250 5950
-F 0 "#PWR038" H 10250 5700 50  0001 C CNN
-F 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
-	1    10250 5950
+P 9050 5950
+F 0 "#PWR55" H 9050 5700 50  0001 C CNN
+F 1 "GND" H 9050 5800 50  0000 C CNN
+F 2 "" H 9050 5950 50  0000 C CNN
+F 3 "" H 9050 5950 50  0000 C CNN
+	1    9050 5950
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C7
 U 1 1 58D62988
-P 10250 5650
-F 0 "C7" H 10275 5750 50  0000 L CNN
-F 1 "22uF" H 10275 5550 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10288 5500 50  0001 C CNN
-F 3 "" H 10250 5650 50  0000 C CNN
-	1    10250 5650
+P 9050 5650
+F 0 "C7" H 9075 5750 50  0000 L CNN
+F 1 "22uF" H 9075 5550 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9088 5500 50  0001 C CNN
+F 3 "" H 9050 5650 50  0000 C CNN
+	1    9050 5650
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C8
 U 1 1 58D6298E
-P 10600 5650
-F 0 "C8" H 10625 5750 50  0000 L CNN
-F 1 "22uF" H 10625 5550 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10638 5500 50  0001 C CNN
-F 3 "" H 10600 5650 50  0000 C CNN
-	1    10600 5650
+P 9400 5650
+F 0 "C8" H 9425 5750 50  0000 L CNN
+F 1 "22uF" H 9425 5550 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9438 5500 50  0001 C CNN
+F 3 "" H 9400 5650 50  0000 C CNN
+	1    9400 5650
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR039
+L +3V3 #PWR58
 U 1 1 58D62CE2
-P 10600 5400
-F 0 "#PWR039" H 10600 5250 50  0001 C CNN
-F 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
-	1    10600 5400
+P 9400 5400
+F 0 "#PWR58" H 9400 5250 50  0001 C CNN
+F 1 "+3V3" H 9400 5540 50  0000 C CNN
+F 2 "" H 9400 5400 50  0000 C CNN
+F 3 "" H 9400 5400 50  0000 C CNN
+	1    9400 5400
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V2 #PWR040
+L +1V2 #PWR56
 U 1 1 58D63C77
-P 10600 3000
-F 0 "#PWR040" H 10600 2850 50  0001 C CNN
-F 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
-	1    10600 3000
+P 9400 3000
+F 0 "#PWR56" H 9400 2850 50  0001 C CNN
+F 1 "+1V2" H 9400 3140 50  0000 C CNN
+F 2 "" H 9400 3000 50  0000 C CNN
+F 3 "" H 9400 3000 50  0000 C CNN
+	1    9400 3000
 	1    0    0    -1  
 $EndComp
 $Comp
-L +1V2 #PWR041
+L +1V2 #PWR30
 U 1 1 58D63D96
 P 1800 900
-F 0 "#PWR041" H 1800 750 50  0001 C CNN
+F 0 "#PWR30" H 1800 750 50  0001 C CNN
 F 1 "+1V2" H 1800 1040 50  0000 C CNN
 F 2 "" H 1800 900 50  0000 C CNN
 F 3 "" H 1800 900 50  0000 C CNN
 	1    1800 900 
 	1    0    0    -1  
 $EndComp
-Text Notes 6700 2950 0    60   ~ 0
+Text Notes 5500 2950 0    60   ~ 0
 AP3429/A voltage setting: is 0.6V at FB pin\nVout = (RA/RB+1)*0.6V\n
 $Comp
 L AP3429A U5
 U 1 1 58D67BBA
-P 8500 4550
-F 0 "U5" H 8500 4700 60  0000 C CNN
-F 1 "AP3429A" H 8500 4600 60  0000 C CNN
-F 2 "TSOT-25:TSOT-25" H 8500 4550 60  0001 C CNN
-F 3 "" H 8500 4550 60  0001 C CNN
-	1    8500 4550
+P 7300 4550
+F 0 "U5" H 7300 4700 60  0000 C CNN
+F 1 "AP3429A" H 7300 4600 60  0000 C CNN
+F 2 "TSOT-25:TSOT-25" H 7300 4550 60  0001 C CNN
+F 3 "" H 7300 4550 60  0001 C CNN
+	1    7300 4550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR042
+L GND #PWR51
 U 1 1 58D67BC0
-P 8500 5050
-F 0 "#PWR042" H 8500 4800 50  0001 C CNN
-F 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
-	1    8500 5050
+P 7300 5050
+F 0 "#PWR51" H 7300 4800 50  0001 C CNN
+F 1 "GND" H 7300 4900 50  0000 C CNN
+F 2 "" H 7300 5050 50  0000 C CNN
+F 3 "" H 7300 5050 50  0000 C CNN
+	1    7300 5050
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR043
+L +5V #PWR46
 U 1 1 58D67BC6
-P 7850 4400
-F 0 "#PWR043" H 7850 4250 50  0001 C CNN
-F 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
-	1    7850 4400
+P 6650 4400
+F 0 "#PWR46" H 6650 4250 50  0001 C CNN
+F 1 "+5V" H 6650 4540 50  0000 C CNN
+F 2 "" H 6650 4400 50  0000 C CNN
+F 3 "" H 6650 4400 50  0000 C CNN
+	1    6650 4400
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR044
+L GND #PWR47
 U 1 1 58D67BCC
-P 7850 5050
-F 0 "#PWR044" H 7850 4800 50  0001 C CNN
-F 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
-	1    7850 5050
+P 6650 5050
+F 0 "#PWR47" H 6650 4800 50  0001 C CNN
+F 1 "GND" H 6650 4900 50  0000 C CNN
+F 2 "" H 6650 5050 50  0000 C CNN
+F 3 "" H 6650 5050 50  0000 C CNN
+	1    6650 5050
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C9
 U 1 1 58D67BD2
-P 7850 4850
-F 0 "C9" H 7875 4950 50  0000 L CNN
-F 1 "22uF" H 7875 4750 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 7888 4700 50  0001 C CNN
-F 3 "" H 7850 4850 50  0000 C CNN
-	1    7850 4850
+P 6650 4850
+F 0 "C9" H 6675 4950 50  0000 L CNN
+F 1 "22uF" H 6675 4750 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 6688 4700 50  0001 C CNN
+F 3 "" H 6650 4850 50  0000 C CNN
+	1    6650 4850
 	1    0    0    -1  
 $EndComp
 $Comp
 L L L3
 U 1 1 58D67BD8
-P 9350 4250
-F 0 "L3" V 9300 4250 50  0000 C CNN
-F 1 "2.2uH" V 9425 4250 50  0000 C CNN
-F 2 "Resistors_SMD:R_1210_HandSoldering" H 9350 4250 50  0001 C CNN
-F 3 "" H 9350 4250 50  0000 C CNN
-	1    9350 4250
+P 8150 4250
+F 0 "L3" V 8100 4250 50  0000 C CNN
+F 1 "2.2uH" V 8225 4250 50  0000 C CNN
+F 2 "Resistors_SMD:R_1210_HandSoldering" H 8150 4250 50  0001 C CNN
+F 3 "" H 8150 4250 50  0000 C CNN
+	1    8150 4250
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C C10
 U 1 1 58D67BDE
-P 9550 4450
-F 0 "C10" H 9575 4550 50  0000 L CNN
-F 1 "470pF" H 9575 4350 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 9588 4300 50  0001 C CNN
-F 3 "" H 9550 4450 50  0000 C CNN
-	1    9550 4450
+P 8350 4450
+F 0 "C10" H 8375 4550 50  0000 L CNN
+F 1 "470pF" H 8375 4350 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 8388 4300 50  0001 C CNN
+F 3 "" H 8350 4450 50  0000 C CNN
+	1    8350 4450
 	1    0    0    -1  
 $EndComp
 $Comp
 L R RA2
 U 1 1 58D67BE4
-P 9850 4450
-F 0 "RA2" V 9930 4450 50  0000 C CNN
-F 1 "15k" V 9850 4450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 9780 4450 50  0001 C CNN
-F 3 "" H 9850 4450 50  0000 C CNN
-	1    9850 4450
+P 8650 4450
+F 0 "RA2" V 8730 4450 50  0000 C CNN
+F 1 "15k" V 8650 4450 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 8580 4450 50  0001 C CNN
+F 3 "" H 8650 4450 50  0000 C CNN
+	1    8650 4450
 	1    0    0    -1  
 $EndComp
 $Comp
 L R RB2
 U 1 1 58D67BEA
-P 10050 4650
-F 0 "RB2" V 10130 4650 50  0000 C CNN
-F 1 "4.7k" V 10050 4650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 9980 4650 50  0001 C CNN
-F 3 "" H 10050 4650 50  0000 C CNN
-	1    10050 4650
+P 8850 4650
+F 0 "RB2" V 8930 4650 50  0000 C CNN
+F 1 "4.7k" V 8850 4650 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 8780 4650 50  0001 C CNN
+F 3 "" H 8850 4650 50  0000 C CNN
+	1    8850 4650
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR045
+L GND #PWR54
 U 1 1 58D67BF0
-P 10250 4750
-F 0 "#PWR045" H 10250 4500 50  0001 C CNN
-F 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
-	1    10250 4750
+P 9050 4750
+F 0 "#PWR54" H 9050 4500 50  0001 C CNN
+F 1 "GND" H 9050 4600 50  0000 C CNN
+F 2 "" H 9050 4750 50  0000 C CNN
+F 3 "" H 9050 4750 50  0000 C CNN
+	1    9050 4750
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C11
 U 1 1 58D67BF6
-P 10250 4450
-F 0 "C11" H 10275 4550 50  0000 L CNN
-F 1 "22uF" H 10275 4350 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10288 4300 50  0001 C CNN
-F 3 "" H 10250 4450 50  0000 C CNN
-	1    10250 4450
+P 9050 4450
+F 0 "C11" H 9075 4550 50  0000 L CNN
+F 1 "22uF" H 9075 4350 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9088 4300 50  0001 C CNN
+F 3 "" H 9050 4450 50  0000 C CNN
+	1    9050 4450
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C12
 U 1 1 58D67BFC
-P 10600 4450
-F 0 "C12" H 10625 4550 50  0000 L CNN
-F 1 "22uF" H 10625 4350 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10638 4300 50  0001 C CNN
-F 3 "" H 10600 4450 50  0000 C CNN
-	1    10600 4450
+P 9400 4450
+F 0 "C12" H 9425 4550 50  0000 L CNN
+F 1 "22uF" H 9425 4350 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9438 4300 50  0001 C CNN
+F 3 "" H 9400 4450 50  0000 C CNN
+	1    9400 4450
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R1
 U 1 1 58D67C1D
-P 4150 4600
-F 0 "R1" V 4230 4600 50  0000 C CNN
-F 1 "15k" V 4150 4600 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 4080 4600 50  0001 C CNN
-F 3 "" H 4150 4600 50  0000 C CNN
-	1    4150 4600
+P 4400 4650
+F 0 "R1" V 4480 4650 50  0000 C CNN
+F 1 "15k" V 4400 4650 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 4330 4650 50  0001 C CNN
+F 3 "" H 4400 4650 50  0000 C CNN
+	1    4400 4650
 	1    0    0    -1  
 $EndComp
 $Comp
-L +2V5 #PWR046
+L +2V5 #PWR57
 U 1 1 58D681D4
-P 10600 4200
-F 0 "#PWR046" H 10600 4050 50  0001 C CNN
-F 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
-	1    10600 4200
+P 9400 4200
+F 0 "#PWR57" H 9400 4050 50  0001 C CNN
+F 1 "+2V5" H 9400 4340 50  0000 C CNN
+F 2 "" H 9400 4200 50  0000 C CNN
+F 3 "" H 9400 4200 50  0000 C CNN
+	1    9400 4200
 	1    0    0    -1  
 $EndComp
-Text Notes 9150 2900 0    60   ~ 0
+Text Notes 7950 2900 0    60   ~ 0
 (15k/15k+1)*0.6V = 1.2V\n
-Text Label 9250 3450 0    60   ~ 0
+Text Label 8050 3450 0    60   ~ 0
 FB1
-Text Notes 9150 4100 0    60   ~ 0
+Text Notes 7950 4100 0    60   ~ 0
 (15k/4.7k+1)*0.6V = 2.51V\n
-Text Notes 9150 5300 0    60   ~ 0
+Text Notes 7950 5300 0    60   ~ 0
 (15k/3.3k+1)*0.6V = 3.32V\n
-Text Label 7400 3450 0    60   ~ 0
+Text Label 6200 3450 0    60   ~ 0
 PWREN
-Text Label 7450 4650 0    60   ~ 0
+Text Label 6250 4650 0    60   ~ 0
 PWREN
-Text Label 7450 5850 0    60   ~ 0
+Text Label 6250 5850 0    60   ~ 0
 PWREN
-Text Label 4300 4850 0    60   ~ 0
+Text Label 4550 4900 0    60   ~ 0
 PWREN
-Text Label 9250 5850 0    60   ~ 0
+Text Label 8050 5850 0    60   ~ 0
 FB3
-Text Label 9250 4650 0    60   ~ 0
+Text Label 8050 4650 0    60   ~ 0
 FB2
 $Comp
-L +2V5 #PWR047
+L +2V5 #PWR37
 U 1 1 58D68750
 P 3900 900
-F 0 "#PWR047" H 3900 750 50  0001 C CNN
+F 0 "#PWR37" H 3900 750 50  0001 C CNN
 F 1 "+2V5" H 3900 1040 50  0000 C CNN
 F 2 "" H 3900 900 50  0000 C CNN
 F 3 "" H 3900 900 50  0000 C CNN
@ -560,10 +560,10 @@ F 3 "" H 3900 900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR048
+L +3V3 #PWR43
 U 1 1 58D69259
 P 6650 900
-F 0 "#PWR048" H 6650 750 50  0001 C CNN
+F 0 "#PWR43" H 6650 750 50  0001 C CNN
 F 1 "+3V3" H 6650 1040 50  0000 C CNN
 F 2 "" H 6650 900 50  0000 C CNN
 F 3 "" H 6650 900 50  0000 C CNN
@ -573,396 +573,383 @@ $EndComp
 $Comp
 L PCF8563 U7
 U 1 1 58D70684
-P 2100 3550
-F 0 "U7" H 1800 3900 50  0000 L CNN
-F 1 "PCF8523" H 2200 3900 50  0000 L CNN
-F 2 "Power_Integrations:SO-8" H 2100 3550 50  0001 C CNN
-F 3 "" H 2100 3550 50  0000 C CNN
-	1    2100 3550
+P 2050 3600
+F 0 "U7" H 1750 3950 50  0000 L CNN
+F 1 "PCF8523" H 2150 3950 50  0000 L CNN
+F 2 "Power_Integrations:SO-8" H 2050 3600 50  0001 C CNN
+F 3 "" H 2050 3600 50  0000 C CNN
+	1    2050 3600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR049
+L GND #PWR33
 U 1 1 58D7085C
-P 2100 4050
-F 0 "#PWR049" H 2100 3800 50  0001 C CNN
-F 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
-	1    2100 4050
+P 2050 4100
+F 0 "#PWR33" H 2050 3850 50  0001 C CNN
+F 1 "GND" H 2050 3950 50  0000 C CNN
+F 2 "" H 2050 4100 50  0000 C CNN
+F 3 "" H 2050 4100 50  0000 C CNN
+	1    2050 4100
 	1    0    0    -1  
 $EndComp
-Text GLabel 2600 3350 2    60   Input ~ 0
+Text GLabel 2550 3400 2    60   Input ~ 0
 GPDI_SCL
-Text GLabel 2600 3450 2    60   Input ~ 0
+Text GLabel 2550 3500 2    60   Input ~ 0
 GPDI_SDA
 $Comp
 L Battery_Cell BAT1
 U 1 1 58D72202
-P 2800 4000
-F 0 "BAT1" H 2900 4100 50  0000 L CNN
-F 1 "CR1225" H 2900 4000 50  0000 L CNN
-F 2 "Keystone_3000_1x12mm-CoinCell:Keystone_3000_1x12mm-CoinCell" V 2800 4060 50  0001 C CNN
-F 3 "" V 2800 4060 50  0000 C CNN
-	1    2800 4000
+P 2750 4050
+F 0 "BAT1" H 2450 4150 50  0000 L CNN
+F 1 "CR1225" H 2350 4050 50  0000 L CNN
+F 2 "Keystone_3000_1x12mm-CoinCell:Keystone_3000_1x12mm-CoinCell" V 2750 4110 50  0001 C CNN
+F 3 "" V 2750 4110 50  0000 C CNN
+	1    2750 4050
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR050
+L GND #PWR31
 U 1 1 58D72406
-P 2800 4150
-F 0 "#PWR050" H 2800 3900 50  0001 C CNN
-F 1 "GND" H 2800 4000 50  0000 C CNN
-F 2 "" H 2800 4150 50  0000 C CNN
-F 3 "" H 2800 4150 50  0000 C CNN
-	1    2800 4150
-	1    0    0    -1  
+P 2000 4550
+F 0 "#PWR31" H 2000 4300 50  0001 C CNN
+F 1 "GND" H 2000 4400 50  0000 C CNN
+F 2 "" H 2000 4550 50  0000 C CNN
+F 3 "" H 2000 4550 50  0000 C CNN
+	1    2000 4550
+	0    1    1    0   
 $EndComp
-Text Label 2550 3750 0    60   ~ 0
+Text Label 2500 3800 0    60   ~ 0
 VBAT
-Text Notes 6750 4250 0    60   ~ 0
+Text Notes 5550 4250 0    60   ~ 0
 PWREN\nabove +1.5V turns ON\nbelow +0.4V turns OFF
 $Comp
 L D D10
 U 1 1 58D79CB5
-P 4150 4150
-F 0 "D10" H 4150 4250 50  0000 C CNN
-F 1 "1N4148" H 4150 4050 50  0000 C CNN
-F 2 "Diodes_SMD:D_SOD-323" H 4150 4150 50  0001 C CNN
-F 3 "" H 4150 4150 50  0000 C CNN
-	1    4150 4150
+P 4400 4200
+F 0 "D10" H 4400 4300 50  0000 C CNN
+F 1 "1N4148" H 4400 4100 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323" H 4400 4200 50  0001 C CNN
+F 3 "" H 4400 4200 50  0000 C CNN
+	1    4400 4200
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C C13
 U 1 1 58D7A3F0
-P 4150 3650
-F 0 "C13" H 4175 3750 50  0000 L CNN
-F 1 "2.2uF" H 4175 3550 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 4188 3500 50  0001 C CNN
-F 3 "" H 4150 3650 50  0000 C CNN
-	1    4150 3650
+P 4400 3700
+F 0 "C13" H 4425 3800 50  0000 L CNN
+F 1 "2.2uF" H 4425 3600 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 4438 3550 50  0001 C CNN
+F 3 "" H 4400 3700 50  0000 C CNN
+	1    4400 3700
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R2
 U 1 1 58D7BDD9
-P 4150 5500
-F 0 "R2" V 4230 5500 50  0000 C CNN
-F 1 "47k" V 4150 5500 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 4080 5500 50  0001 C CNN
-F 3 "" H 4150 5500 50  0000 C CNN
-	1    4150 5500
+P 4400 5550
+F 0 "R2" V 4480 5550 50  0000 C CNN
+F 1 "47k" V 4400 5550 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 4330 5550 50  0001 C CNN
+F 3 "" H 4400 5550 50  0000 C CNN
+	1    4400 5550
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR051
+L GND #PWR41
 U 1 1 58D7C223
-P 4150 6100
-F 0 "#PWR051" 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
-	1    4150 6100
+P 4400 6150
+F 0 "#PWR41" H 4400 5900 50  0001 C CNN
+F 1 "GND" H 4400 6000 50  0000 C CNN
+F 2 "" H 4400 6150 50  0000 C CNN
+F 3 "" H 4400 6150 50  0000 C CNN
+	1    4400 6150
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R4
 U 1 1 58D7CBD5
-P 4700 4600
-F 0 "R4" V 4780 4600 50  0000 C CNN
-F 1 "15k" V 4700 4600 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 4630 4600 50  0001 C CNN
-F 3 "" H 4700 4600 50  0000 C CNN
-	1    4700 4600
+P 4950 4650
+F 0 "R4" V 5030 4650 50  0000 C CNN
+F 1 "15k" V 4950 4650 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 4880 4650 50  0001 C CNN
+F 3 "" H 4950 4650 50  0000 C CNN
+	1    4950 4650
 	1    0    0    -1  
 $EndComp
 $Comp
 L D D11
 U 1 1 58D7CBDC
-P 4700 4150
-F 0 "D11" H 4700 4250 50  0000 C CNN
-F 1 "1N4148" H 4700 4050 50  0000 C CNN
-F 2 "Diodes_SMD:D_SOD-323" H 4700 4150 50  0001 C CNN
-F 3 "" H 4700 4150 50  0000 C CNN
-	1    4700 4150
+P 4950 4200
+F 0 "D11" H 4950 4300 50  0000 C CNN
+F 1 "1N4148" H 4950 4100 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323" H 4950 4200 50  0001 C CNN
+F 3 "" H 4950 4200 50  0000 C CNN
+	1    4950 4200
 	0    -1   -1   0   
 $EndComp
 $Comp
-L +3V3 #PWR052
+L +3V3 #PWR42
 U 1 1 58D7CCF7
-P 4700 3900
-F 0 "#PWR052" H 4700 3750 50  0001 C CNN
-F 1 "+3V3" H 4700 4040 50  0000 C CNN
-F 2 "" H 4700 3900 50  0000 C CNN
-F 3 "" H 4700 3900 50  0000 C CNN
-	1    4700 3900
+P 4950 3950
+F 0 "#PWR42" H 4950 3800 50  0001 C CNN
+F 1 "+3V3" H 4950 4090 50  0000 C CNN
+F 2 "" H 4950 3950 50  0000 C CNN
+F 3 "" H 4950 3950 50  0000 C CNN
+	1    4950 3950
 	1    0    0    -1  
 $EndComp
-Text Notes 3150 3550 0    60   ~ 0
+Text Notes 3100 3650 0    60   ~ 0
 WAKEUPn\nopen drain \nactive low
-Text Label 2550 3650 0    60   ~ 0
+Text Label 2500 3700 0    60   ~ 0
 WAKEUPn
 $Comp
 L C C14
 U 1 1 58D84952
-P 3550 5750
-F 0 "C14" H 3575 5850 50  0000 L CNN
-F 1 "100nF" H 3575 5650 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3588 5600 50  0001 C CNN
-F 3 "" H 3550 5750 50  0000 C CNN
-	1    3550 5750
+P 3800 5800
+F 0 "C14" H 3825 5900 50  0000 L CNN
+F 1 "100nF" H 3825 5700 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3838 5650 50  0001 C CNN
+F 3 "" H 3800 5800 50  0000 C CNN
+	1    3800 5800
 	1    0    0    -1  
 $EndComp
 $Comp
 L D_Schottky D15
 U 1 1 58D84D8A
-P 2950 5500
-F 0 "D15" H 2950 5600 50  0000 C CNN
-F 1 "BAT54W" H 2950 5400 50  0000 C CNN
-F 2 "Diodes_SMD:D_SOD-323F" H 2950 5500 50  0001 C CNN
-F 3 "" H 2950 5500 50  0000 C CNN
-	1    2950 5500
+P 3200 5550
+F 0 "D15" H 3200 5650 50  0000 C CNN
+F 1 "BAT54W" H 3200 5450 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323F" H 3200 5550 50  0001 C CNN
+F 3 "" H 3200 5550 50  0000 C CNN
+	1    3200 5550
 	-1   0    0    1   
 $EndComp
 $Comp
 L R R5
 U 1 1 58D85B68
-P 3250 5750
-F 0 "R5" V 3330 5750 50  0000 C CNN
-F 1 "4.7M" V 3250 5750 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 3180 5750 50  0001 C CNN
-F 3 "" H 3250 5750 50  0000 C CNN
-	1    3250 5750
+P 3500 5800
+F 0 "R5" V 3580 5800 50  0000 C CNN
+F 1 "4.7M" V 3500 5800 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3430 5800 50  0001 C CNN
+F 3 "" H 3500 5800 50  0000 C CNN
+	1    3500 5800
 	1    0    0    -1  
 $EndComp
-Text Notes 2800 6150 0    60   ~ 0
+Text Notes 3050 6200 0    60   ~ 0
 RC to hold 0.5s shutdown
-Text Label 4150 4000 0    60   ~ 0
+Text Label 4400 4050 0    60   ~ 0
 WKUP
-Text Label 4150 4400 0    60   ~ 0
+Text Label 4400 4450 0    60   ~ 0
 WAKE
-Text Label 4700 4400 0    60   ~ 0
+Text Label 4950 4450 0    60   ~ 0
 HOLD
-Text Label 3300 5500 0    60   ~ 0
+Text Label 3550 5550 0    60   ~ 0
 SHUT
 $Comp
 L R R6
 U 1 1 58D7B291
-P 3200 3650
-F 0 "R6" V 3280 3650 50  0000 C CNN
-F 1 "1k" V 3200 3650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 3130 3650 50  0001 C CNN
-F 3 "" H 3200 3650 50  0000 C CNN
-	1    3200 3650
+P 3500 3700
+F 0 "R6" V 3580 3700 50  0000 C CNN
+F 1 "1k" V 3500 3700 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3430 3700 50  0001 C CNN
+F 3 "" H 3500 3700 50  0000 C CNN
+	1    3500 3700
 	0    1    1    0   
 $EndComp
-Text Label 3400 3650 0    60   ~ 0
+Text Label 3650 3700 0    60   ~ 0
 WKn
 $Comp
 L D D12
 U 1 1 58D7BC4A
-P 3650 4850
-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_SOD-323" H 3650 4850 50  0001 C CNN
-F 3 "" H 3650 4850 50  0000 C CNN
-	1    3650 4850
+P 3900 4900
+F 0 "D12" H 3900 5000 50  0000 C CNN
+F 1 "1N4148" H 3900 4800 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323" H 3900 4900 50  0001 C CNN
+F 3 "" H 3900 4900 50  0000 C CNN
+	1    3900 4900
 	-1   0    0    1   
 $EndComp
 $Comp
 L R R8
 U 1 1 58D8111E
-P 3950 5100
-F 0 "R8" V 4030 5100 50  0000 C CNN
-F 1 "1k" V 3950 5100 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 3880 5100 50  0001 C CNN
-F 3 "" H 3950 5100 50  0000 C CNN
-	1    3950 5100
+P 4200 5150
+F 0 "R8" V 4280 5150 50  0000 C CNN
+F 1 "1k" V 4200 5150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 4130 5150 50  0001 C CNN
+F 3 "" H 4200 5150 50  0000 C CNN
+	1    4200 5150
 	1    0    0    -1  
 $EndComp
 $Comp
 L Crystal_GND23 Y2
 U 1 1 58D85AAB
-P 1050 3550
-F 0 "Y2" V 900 3350 50  0000 L CNN
-F 1 "32768Hz" V 1200 3150 50  0000 L CNN
-F 2 "abs25:Crystal_SMD_ABS25" H 1050 3550 50  0001 C CNN
-F 3 "" H 1050 3550 50  0000 C CNN
-	1    1050 3550
+P 1000 3600
+F 0 "Y2" V 850 3400 50  0000 L CNN
+F 1 "32768Hz" V 1150 3200 50  0000 L CNN
+F 2 "abs25:Crystal_SMD_ABS25" H 1000 3600 50  0001 C CNN
+F 3 "" H 1000 3600 50  0000 C CNN
+	1    1000 3600
 	0    1    1    0   
 $EndComp
-NoConn ~ 850  3550
-NoConn ~ 1250 3550
-Text Label 1200 3350 0    60   ~ 0
+NoConn ~ 800  3600
+NoConn ~ 1200 3600
+Text Label 1150 3400 0    60   ~ 0
 OSCI_32k
-Text Label 1200 3750 0    60   ~ 0
+Text Label 1150 3800 0    60   ~ 0
 OSCO_32k
 $Comp
 L Q_NMOS_GSD Q2
 U 1 1 58D883BD
-P 3850 5500
-F 0 "Q2" H 3700 5600 50  0000 L CNN
-F 1 "2N7002" H 3600 5700 50  0000 L CNN
-F 2 "TO_SOT_Packages_SMD:SOT-23_Handsoldering" H 4050 5600 50  0001 C CNN
-F 3 "" H 3850 5500 50  0000 C CNN
-	1    3850 5500
+P 4100 5550
+F 0 "Q2" H 3950 5650 50  0000 L CNN
+F 1 "2N7002" H 3850 5750 50  0000 L CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23_Handsoldering" H 4300 5650 50  0001 C CNN
+F 3 "" H 4100 5550 50  0000 C CNN
+	1    4100 5550
 	1    0    0    -1  
 $EndComp
 $Comp
 L Q_PNP_BEC Q1
 U 1 1 58D89315
-P 3800 3650
-F 0 "Q1" H 3650 3550 50  0000 L CNN
-F 1 "BC857" H 3600 3850 50  0000 L CNN
-F 2 "TO_SOT_Packages_SMD:SOT-23_Handsoldering" H 4000 3750 50  0001 C CNN
-F 3 "" H 3800 3650 50  0000 C CNN
-	1    3800 3650
+P 4050 3700
+F 0 "Q1" H 3900 3600 50  0000 L CNN
+F 1 "BC857" H 3850 3900 50  0000 L CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23_Handsoldering" H 4250 3800 50  0001 C CNN
+F 3 "" H 4050 3700 50  0000 C CNN
+	1    4050 3700
 	1    0    0    1   
 $EndComp
 $Comp
 L R R13
 U 1 1 58DA1F4D
-P 2700 5750
-F 0 "R13" V 2780 5750 50  0000 C CNN
-F 1 "15k" V 2700 5750 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 2630 5750 50  0001 C CNN
-F 3 "" H 2700 5750 50  0000 C CNN
-	1    2700 5750
+P 2950 5800
+F 0 "R13" V 3030 5800 50  0000 C CNN
+F 1 "15k" V 2950 5800 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 2880 5800 50  0001 C CNN
+F 3 "" H 2950 5800 50  0000 C CNN
+	1    2950 5800
 	1    0    0    -1  
 $EndComp
-Text Notes 5600 6400 0    60   ~ 0
+Text Notes 5050 6950 0    60   ~ 0
 Important:\nPlace voltage feedback and filter \nRC network close to FPGA. Position of \nSMPS chip and L doesn't matter.\n
 $Comp
 L D D13
 U 1 1 58DA2DA9
-P 3900 4150
-F 0 "D13" H 3900 4250 50  0000 C CNN
-F 1 "1N4148" H 3900 4050 50  0000 C CNN
-F 2 "Diodes_SMD:D_SOD-323" H 3900 4150 50  0001 C CNN
-F 3 "" H 3900 4150 50  0000 C CNN
-	1    3900 4150
+P 4150 4200
+F 0 "D13" H 4150 4300 50  0000 C CNN
+F 1 "1N4148" H 4150 4100 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323" H 4150 4200 50  0001 C CNN
+F 3 "" H 4150 4200 50  0000 C CNN
+	1    4150 4200
 	0    1    1    0   
 $EndComp
 $Comp
-L GND #PWR053
+L GND #PWR38
 U 1 1 58DA2E46
-P 3900 4300
-F 0 "#PWR053" 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
-	1    3900 4300
+P 4150 4350
+F 0 "#PWR38" H 4150 4100 50  0001 C CNN
+F 1 "GND" H 4150 4200 50  0000 C CNN
+F 2 "" H 4150 4350 50  0000 C CNN
+F 3 "" H 4150 4350 50  0000 C CNN
+	1    4150 4350
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR054
+L +5V #PWR40
 U 1 1 58D67C25
-P 4150 3300
-F 0 "#PWR054" 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
-	1    4150 3300
+P 4400 3350
+F 0 "#PWR40" H 4400 3200 50  0001 C CNN
+F 1 "+5V" H 4400 3490 50  0000 C CNN
+F 2 "" H 4400 3350 50  0000 C CNN
+F 3 "" H 4400 3350 50  0000 C CNN
+	1    4400 3350
 	1    0    0    -1  
 $EndComp
-Text Notes 3050 4550 0    60   ~ 0
+Text Notes 3550 4700 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_SOD-323" H 3250 5300 50  0001 C CNN
-F 3 "" H 3250 5300 50  0000 C CNN
-	1    3250 5300
+P 3500 5350
+F 0 "D14" H 3500 5450 50  0000 C CNN
+F 1 "1N4148" H 3500 5250 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323" H 3500 5350 50  0001 C CNN
+F 3 "" H 3500 5350 50  0000 C CNN
+	1    3500 5350
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR055
+L +3V3 #PWR36
 U 1 1 58DA569C
-P 3250 5150
-F 0 "#PWR055" 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
+P 3500 5200
+F 0 "#PWR36" H 3500 5050 50  0001 C CNN
+F 1 "+3V3" H 3500 5340 50  0000 C CNN
+F 2 "" H 3500 5200 50  0000 C CNN
+F 3 "" H 3500 5200 50  0000 C CNN
+	1    3500 5200
 	1    0    0    -1  
 $EndComp
-Text Notes 2300 5300 0    60   ~ 0
+Text Notes 2550 5350 0    60   ~ 0
 D14 discharges\nC14 at shutdown
-Text GLabel 2550 5500 0    60   Input ~ 0
+Text GLabel 2800 5550 0    60   Input ~ 0
 SHUTDOWN
 $Comp
 L R R3
 U 1 1 58E810CC
-P 1500 6650
-F 0 "R3" V 1580 6650 50  0000 C CNN
-F 1 "4.7k" V 1500 6650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 1430 6650 50  0001 C CNN
-F 3 "" H 1500 6650 50  0000 C CNN
-	1    1500 6650
-	1    0    0    -1  
+P 3250 4350
+F 0 "R3" V 3350 4350 50  0000 C CNN
+F 1 "4.7k" V 3250 4350 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3180 4350 50  0001 C CNN
+F 3 "" H 3250 4350 50  0000 C CNN
+	1    3250 4350
+	0    1    1    0   
 $EndComp
 $Comp
 L D D16
 U 1 1 58E813AE
-P 1300 6850
-F 0 "D16" H 1300 6950 50  0000 C CNN
-F 1 "1N4148" H 1300 6750 50  0000 C CNN
-F 2 "Diodes_SMD:D_SOD-323" H 1300 6850 50  0001 C CNN
-F 3 "" H 1300 6850 50  0000 C CNN
-	1    1300 6850
-	-1   0    0    1   
+P 3000 3900
+F 0 "D16" H 3000 4000 50  0000 C CNN
+F 1 "1N4148" H 3000 3800 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323" H 3000 3900 50  0001 C CNN
+F 3 "" H 3000 3900 50  0000 C CNN
+	1    3000 3900
+	0    -1   -1   0   
 $EndComp
-Text Label 750  6850 0    60   ~ 0
-WAKEUPn
 $Comp
-L +5V #PWR056
+L +5V #PWR35
 U 1 1 58E82A7E
-P 1500 6500
-F 0 "#PWR056" H 1500 6350 50  0001 C CNN
-F 1 "+5V" H 1500 6640 50  0000 C CNN
-F 2 "" H 1500 6500 50  0000 C CNN
-F 3 "" H 1500 6500 50  0000 C CNN
-	1    1500 6500
-	1    0    0    -1  
+P 3400 4350
+F 0 "#PWR35" H 3400 4200 50  0001 C CNN
+F 1 "+5V" H 3400 4490 50  0000 C CNN
+F 2 "" H 3400 4350 50  0000 C CNN
+F 3 "" H 3400 4350 50  0000 C CNN
+	1    3400 4350
+	0    1    1    0   
 $EndComp
 $Comp
 L D D17
 U 1 1 58E82B1D
-P 1700 6850
-F 0 "D17" H 1700 6950 50  0000 C CNN
-F 1 "1N4148" H 1700 6750 50  0000 C CNN
-F 2 "Diodes_SMD:D_SOD-323" H 1700 6850 50  0001 C CNN
-F 3 "" H 1700 6850 50  0000 C CNN
-	1    1700 6850
+P 3250 4100
+F 0 "D17" H 3250 4000 50  0000 C CNN
+F 1 "1N4148" H 3300 4200 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323" H 3250 4100 50  0001 C CNN
+F 3 "" H 3250 4100 50  0000 C CNN
+	1    3250 4100
 	1    0    0    -1  
 $EndComp
-Text GLabel 1850 6850 2    60   Input ~ 0
+Text GLabel 3400 4100 2    60   Input ~ 0
 BTN_PWRn
 $Comp
 L CONN_02X01 BTN0
 U 1 1 58E83FE0
-P 1500 7150
-F 0 "BTN0" H 1500 7250 50  0000 C CNN
-F 1 "POWER" H 1500 7050 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 1500 5950 50  0001 C CNN
-F 3 "" H 1500 5950 50  0000 C CNN
-	1    1500 7150
-	0    1    1    0   
-$EndComp
-$Comp
-L GND #PWR057
-U 1 1 58E840F5
-P 1500 7400
-F 0 "#PWR057" H 1500 7150 50  0001 C CNN
-F 1 "GND" H 1500 7250 50  0000 C CNN
-F 2 "" H 1500 7400 50  0000 C CNN
-F 3 "" H 1500 7400 50  0000 C CNN
-	1    1500 7400
-	1    0    0    -1  
+P 2250 4550
+F 0 "BTN0" H 2250 4650 50  0000 C CNN
+F 1 "POWER" H 2250 4450 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 2250 3350 50  0001 C CNN
+F 3 "" H 2250 3350 50  0000 C CNN
+	1    2250 4550
+	-1   0    0    1   
 $EndComp
 Wire Wire Line
 	900  2450 900  2550
@ -1372,151 +1359,151 @@ Wire Wire Line
 	2300 1000 2300 1100
 Connection ~ 2300 1000
 Wire Wire Line
-	8500 3750 8500 3850
+	7300 3750 7300 3850
 Wire Wire Line
-	7850 3200 7850 3500
+	6650 3200 6650 3500
 Wire Wire Line
-	7850 3800 7850 3850
+	6650 3800 6650 3850
 Wire Wire Line
-	9150 3250 9100 3250
+	7950 3250 7900 3250
 Wire Wire Line
-	9150 3050 9150 3250
+	7950 3050 7950 3250
 Wire Wire Line
-	9500 3050 10950 3050
+	8300 3050 10100 3050
 Wire Wire Line
-	9850 3050 9850 3100
+	8650 3050 8650 3100
 Wire Wire Line
-	9550 3100 9550 3050
+	8350 3100 8350 3050
 Wire Wire Line
-	9550 3400 9550 3450
+	8350 3400 8350 3450
 Wire Wire Line
-	9850 3450 9850 3400
+	8650 3450 8650 3400
 Wire Wire Line
-	9100 3450 9900 3450
+	7900 3450 8700 3450
 Wire Wire Line
-	10250 3400 10250 3550
+	9050 3400 9050 3550
 Wire Wire Line
-	10600 3450 10600 3400
+	9400 3450 9400 3400
 Wire Wire Line
-	10200 3450 10950 3450
-Connection ~ 10250 3450
+	9000 3450 10100 3450
+Connection ~ 9050 3450
 Wire Wire Line
-	10250 3050 10250 3100
+	9050 3050 9050 3100
 Wire Wire Line
-	10600 3000 10600 3100
-Connection ~ 9850 3450
-Connection ~ 9550 3450
-Connection ~ 9550 3050
+	9400 3000 9400 3100
+Connection ~ 8650 3450
+Connection ~ 8350 3450
+Connection ~ 8350 3050
 Wire Wire Line
-	9150 3050 9200 3050
-Connection ~ 10600 3050
+	7950 3050 8000 3050
+Connection ~ 9400 3050
 Wire Wire Line
 	1700 1000 3600 1000
-Connection ~ 7850 3250
+Connection ~ 6650 3250
 Wire Wire Line
-	7850 3250 7900 3250
+	6650 3250 6700 3250
 Wire Wire Line
-	7900 3450 7350 3450
+	6700 3450 6150 3450
 Wire Wire Line
-	8500 6150 8500 6250
+	7300 6150 7300 6250
 Wire Wire Line
-	7850 5600 7850 5900
+	6650 5600 6650 5900
 Wire Wire Line
-	7850 6200 7850 6250
+	6650 6200 6650 6250
 Wire Wire Line
-	9150 5650 9100 5650
+	7950 5650 7900 5650
 Wire Wire Line
-	9150 5450 9150 5650
+	7950 5450 7950 5650
 Wire Wire Line
-	9500 5450 10950 5450
+	8300 5450 10100 5450
 Wire Wire Line
-	9850 5450 9850 5500
+	8650 5450 8650 5500
 Wire Wire Line
-	9550 5500 9550 5450
+	8350 5500 8350 5450
 Wire Wire Line
-	9550 5800 9550 5850
+	8350 5800 8350 5850
 Wire Wire Line
-	9850 5850 9850 5800
+	8650 5850 8650 5800
 Wire Wire Line
-	9100 5850 9900 5850
+	7900 5850 8700 5850
 Wire Wire Line
-	10250 5800 10250 5950
+	9050 5800 9050 5950
 Wire Wire Line
-	10600 5850 10600 5800
+	9400 5850 9400 5800
 Wire Wire Line
-	10200 5850 10950 5850
-Connection ~ 10250 5850
+	9000 5850 10100 5850
+Connection ~ 9050 5850
 Wire Wire Line
-	10250 5450 10250 5500
+	9050 5450 9050 5500
 Wire Wire Line
-	10600 5400 10600 5500
-Connection ~ 10250 5450
-Connection ~ 9850 5850
-Connection ~ 9550 5850
-Connection ~ 9850 5450
-Connection ~ 9550 5450
+	9400 5400 9400 5500
+Connection ~ 9050 5450
+Connection ~ 8650 5850
+Connection ~ 8350 5850
+Connection ~ 8650 5450
+Connection ~ 8350 5450
 Wire Wire Line
-	9150 5450 9200 5450
-Connection ~ 10600 5450
-Connection ~ 7850 5650
+	7950 5450 8000 5450
+Connection ~ 9400 5450
+Connection ~ 6650 5650
 Wire Wire Line
-	7850 5650 7900 5650
+	6650 5650 6700 5650
 Wire Wire Line
-	7900 5850 7400 5850
-Connection ~ 10250 3050
-Connection ~ 9850 3050
+	6700 5850 6200 5850
+Connection ~ 9050 3050
+Connection ~ 8650 3050
 Wire Wire Line
-	8500 4950 8500 5050
+	7300 4950 7300 5050
 Wire Wire Line
-	7850 4400 7850 4700
+	6650 4400 6650 4700
 Wire Wire Line
-	7850 5000 7850 5050
+	6650 5000 6650 5050
 Wire Wire Line
-	9150 4450 9100 4450
+	7950 4450 7900 4450
 Wire Wire Line
-	9150 4250 9150 4450
+	7950 4250 7950 4450
 Wire Wire Line
-	9500 4250 10950 4250
+	8300 4250 10100 4250
 Wire Wire Line
-	9850 4250 9850 4300
+	8650 4250 8650 4300
 Wire Wire Line
-	9550 4300 9550 4250
+	8350 4300 8350 4250
 Wire Wire Line
-	9550 4600 9550 4650
+	8350 4600 8350 4650
 Wire Wire Line
-	9850 4650 9850 4600
+	8650 4650 8650 4600
 Wire Wire Line
-	9100 4650 9900 4650
+	7900 4650 8700 4650
 Wire Wire Line
-	10250 4600 10250 4750
+	9050 4600 9050 4750
 Wire Wire Line
-	10600 4650 10600 4600
+	9400 4650 9400 4600
 Wire Wire Line
-	10200 4650 10950 4650
-Connection ~ 10250 4650
+	9000 4650 10100 4650
+Connection ~ 9050 4650
 Wire Wire Line
-	10250 4250 10250 4300
+	9050 4250 9050 4300
 Wire Wire Line
-	10600 4200 10600 4300
-Connection ~ 10250 4250
-Connection ~ 9850 4650
-Connection ~ 9550 4650
-Connection ~ 9850 4250
-Connection ~ 9550 4250
+	9400 4200 9400 4300
+Connection ~ 9050 4250
+Connection ~ 8650 4650
+Connection ~ 8350 4650
+Connection ~ 8650 4250
+Connection ~ 8350 4250
 Wire Wire Line
-	9150 4250 9200 4250
-Connection ~ 10600 4250
-Connection ~ 7850 4450
+	7950 4250 8000 4250
+Connection ~ 9400 4250
+Connection ~ 6650 4450
 Wire Wire Line
-	7850 4450 7900 4450
+	6650 4450 6700 4450
 Wire Wire Line
-	7900 4650 7400 4650
+	6700 4650 6200 4650
 Wire Wire Line
-	4150 4450 4150 4300
+	4400 4500 4400 4350
 Wire Wire Line
-	4150 4750 4150 5350
+	4400 4800 4400 5400
 Wire Wire Line
-	3800 4850 4700 4850
+	4050 4900 4950 4900
 Wire Wire Line
 	3800 1000 4100 1000
 Wire Wire Line
@ -1524,96 +1511,89 @@ Wire Wire Line
 Wire Wire Line
 	4300 1000 4300 1100
 Wire Wire Line
-	2100 3950 2100 4050
-Wire Wire Line
-	2500 3350 2600 3350
+	2050 4000 2050 4100
 Wire Wire Line
-	2500 3450 2600 3450
+	2450 3400 2550 3400
 Wire Wire Line
-	1050 3700 1050 3750
+	2450 3500 2550 3500
 Wire Wire Line
-	1050 3400 1050 3350
+	1000 3750 1000 3800
 Wire Wire Line
-	2500 3750 2800 3750
+	1000 3450 1000 3400
 Wire Wire Line
-	2800 3750 2800 3800
+	2450 3800 2750 3800
 Wire Wire Line
-	2800 4100 2800 4150
+	2750 3800 2750 3850
 Wire Wire Line
-	1050 3350 1700 3350
+	2750 4150 2750 4200
 Wire Wire Line
-	1050 3750 1700 3750
+	1000 3400 1650 3400
 Wire Wire Line
-	2100 3150 2100 3050
+	1000 3800 1650 3800
 Wire Wire Line
-	4150 3800 4150 4000
+	2050 3200 2050 3100
 Wire Wire Line
-	4150 3300 4150 3500
-Connection ~ 4150 3900
-Connection ~ 4150 3400
-Connection ~ 4150 4850
+	4400 3850 4400 4050
 Wire Wire Line
-	4150 5650 4150 6100
+	4400 3350 4400 3550
+Connection ~ 4400 3950
+Connection ~ 4400 3450
+Connection ~ 4400 4900
 Wire Wire Line
-	4700 4450 4700 4300
+	4400 5700 4400 6150
 Wire Wire Line
-	4700 3900 4700 4000
+	4950 4500 4950 4350
 Wire Wire Line
-	2500 3650 3050 3650
+	4950 3950 4950 4050
 Wire Wire Line
-	3550 6000 3550 5900
+	2450 3700 3350 3700
 Wire Wire Line
-	4700 4850 4700 4750
+	3800 6050 3800 5950
 Wire Wire Line
-	3950 4850 3950 4950
+	4950 4900 4950 4800
 Wire Wire Line
-	3950 6000 3950 5700
+	4200 4900 4200 5000
 Wire Wire Line
-	3100 5500 3650 5500
+	4200 6050 4200 5750
 Wire Wire Line
-	2550 5500 2800 5500
-Connection ~ 3550 5500
-Connection ~ 3250 5500
+	3350 5550 3900 5550
 Wire Wire Line
-	3250 5900 3250 6000
+	2800 5550 3050 5550
+Connection ~ 3800 5550
+Connection ~ 3500 5550
 Wire Wire Line
-	2700 6000 4150 6000
-Connection ~ 3550 6000
-Connection ~ 4150 6000
-Connection ~ 3950 6000
+	3500 5950 3500 6050
 Wire Wire Line
-	3350 3650 3600 3650
+	2950 6050 4400 6050
+Connection ~ 3800 6050
+Connection ~ 4400 6050
+Connection ~ 4200 6050
 Wire Wire Line
-	3950 5300 3950 5250
-Connection ~ 2700 5500
+	3650 3700 3850 3700
 Wire Wire Line
-	2700 5900 2700 6000
-Connection ~ 3250 6000
-Connection ~ 3950 4850
+	4200 5350 4200 5300
+Connection ~ 2950 5550
 Wire Wire Line
-	2700 4850 3500 4850
+	2950 5950 2950 6050
+Connection ~ 3500 6050
+Connection ~ 4200 4900
 Wire Wire Line
-	3900 3450 3900 3400
+	2950 4900 3750 4900
 Wire Wire Line
-	3900 3400 4150 3400
+	4150 3500 4150 3450
 Wire Wire Line
-	3900 3850 3900 4000
+	4150 3450 4400 3450
 Wire Wire Line
-	4150 3900 3900 3900
-Connection ~ 3900 3900
+	4150 3900 4150 4050
 Wire Wire Line
-	2700 5500 2700 5600
+	4400 3950 4150 3950
+Connection ~ 4150 3950
 Wire Wire Line
-	3250 5450 3250 5600
+	2950 5550 2950 5650
 Wire Wire Line
-	3550 5500 3550 5600
+	3500 5500 3500 5650
 Wire Wire Line
-	1150 6850 700  6850
-Wire Wire Line
-	1500 6800 1500 6900
-Wire Wire Line
-	1450 6850 1550 6850
-Connection ~ 1500 6850
+	3800 5550 3800 5650
 Wire Wire Line
 	6550 1000 7450 1000
 Wire Wire Line
@ -1634,81 +1614,158 @@ F 3 "" H 4850 2700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR058
+L +3V3 #PWR32
 U 1 1 591C4E6A
-P 2100 3050
-F 0 "#PWR058" H 2100 2900 50  0001 C CNN
-F 1 "+3V3" 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
-	1    2100 3050
+P 2050 3100
+F 0 "#PWR32" H 2050 2950 50  0001 C CNN
+F 1 "+3V3" H 2050 3240 50  0000 C CNN
+F 2 "" H 2050 3100 50  0000 C CNN
+F 3 "" H 2050 3100 50  0000 C CNN
+	1    2050 3100
 	1    0    0    -1  
 $EndComp
 Text Notes 1400 2850 0    60   ~ 0
-RTC can also be powered from 2.5V\nbut it is simpler to route 3.3V
-Text GLabel 2350 4850 0    60   Input ~ 0
+RTC can also be powered from 2.5V\nbut it is easier to route 3.3V
+Text GLabel 2600 4900 0    60   Input ~ 0
 FTDI_nSLEEP
 $Comp
 L R R10
 U 1 1 591E4865
-P 2550 4850
-F 0 "R10" V 2630 4850 50  0000 C CNN
-F 1 "220" V 2550 4850 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 2480 4850 50  0001 C CNN
-F 3 "" H 2550 4850 50  0000 C CNN
-	1    2550 4850
+P 2800 4900
+F 0 "R10" V 2880 4900 50  0000 C CNN
+F 1 "220" V 2800 4900 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 2730 4900 50  0001 C CNN
+F 3 "" H 2800 4900 50  0000 C CNN
+	1    2800 4900
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	2350 4850 2400 4850
-Text Label 2750 4850 0    60   ~ 0
+	2600 4900 2650 4900
+Text Label 3000 4900 0    60   ~ 0
 FTDI_nSUSPEND
 $Comp
 L C C17
 U 1 1 592462C1
-P 10950 3250
-F 0 "C17" H 10975 3350 50  0000 L CNN
-F 1 "2.2uF" H 10975 3150 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10988 3100 50  0001 C CNN
-F 3 "" H 10950 3250 50  0000 C CNN
-	1    10950 3250
+P 9750 3250
+F 0 "C17" H 9775 3350 50  0000 L CNN
+F 1 "2.2uF" H 9775 3150 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9788 3100 50  0001 C CNN
+F 3 "" H 9750 3250 50  0000 C CNN
+	1    9750 3250
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C19
 U 1 1 59246A2A
-P 10950 4450
-F 0 "C19" H 10975 4550 50  0000 L CNN
-F 1 "2.2uF" H 10975 4350 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10988 4300 50  0001 C CNN
-F 3 "" H 10950 4450 50  0000 C CNN
-	1    10950 4450
+P 9750 4450
+F 0 "C19" H 9775 4550 50  0000 L CNN
+F 1 "2.2uF" H 9775 4350 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9788 4300 50  0001 C CNN
+F 3 "" H 9750 4450 50  0000 C CNN
+	1    9750 4450
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C20
 U 1 1 59246E14
-P 10950 5650
-F 0 "C20" H 10975 5750 50  0000 L CNN
-F 1 "2.2uF" H 10975 5550 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10988 5500 50  0001 C CNN
-F 3 "" H 10950 5650 50  0000 C CNN
-	1    10950 5650
+P 9750 5650
+F 0 "C20" H 9775 5750 50  0000 L CNN
+F 1 "2.2uF" H 9775 5550 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9788 5500 50  0001 C CNN
+F 3 "" H 9750 5650 50  0000 C CNN
+	1    9750 5650
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9750 3050 9750 3100
+Wire Wire Line
+	9750 3450 9750 3400
+Connection ~ 9400 3450
+Wire Wire Line
+	9750 4250 9750 4300
+Wire Wire Line
+	9750 4650 9750 4600
+Connection ~ 9400 4650
+Wire Wire Line
+	9750 5450 9750 5500
+Wire Wire Line
+	9750 5850 9750 5800
+Connection ~ 9400 5850
+Connection ~ 3000 4100
+Connection ~ 3000 4350
+Wire Wire Line
+	3000 4100 3100 4100
+Wire Wire Line
+	3000 4350 3100 4350
+Wire Wire Line
+	3000 3700 3000 3750
+Connection ~ 3000 3700
+$Comp
+L GND #PWR34
+U 1 1 59D5B51B
+P 2750 4200
+F 0 "#PWR34" H 2750 3950 50  0001 C CNN
+F 1 "GND" H 2750 4050 50  0000 C CNN
+F 2 "" H 2750 4200 50  0000 C CNN
+F 3 "" H 2750 4200 50  0000 C CNN
+	1    2750 4200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3000 4550 2500 4550
+Wire Wire Line
+	3000 4050 3000 4550
+Text Label 2550 4550 0    60   ~ 0
+PWRBTn
+$Comp
+L C C22
+U 1 1 59D56B84
+P 10100 3250
+F 0 "C22" H 10125 3350 50  0000 L CNN
+F 1 "2.2uF" H 10125 3150 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10138 3100 50  0001 C CNN
+F 3 "" H 10100 3250 50  0000 C CNN
+	1    10100 3250
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C23
+U 1 1 59D56D50
+P 10100 4450
+F 0 "C23" H 10125 4550 50  0000 L CNN
+F 1 "2.2uF" H 10125 4350 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10138 4300 50  0001 C CNN
+F 3 "" H 10100 4450 50  0000 C CNN
+	1    10100 4450
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C24
+U 1 1 59D56EAA
+P 10100 5650
+F 0 "C24" H 10125 5750 50  0000 L CNN
+F 1 "2.2uF" H 10125 5550 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10138 5500 50  0001 C CNN
+F 3 "" H 10100 5650 50  0000 C CNN
+	1    10100 5650
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10950 3050 10950 3100
+	10100 3050 10100 3100
+Connection ~ 9750 3050
 Wire Wire Line
-	10950 3450 10950 3400
-Connection ~ 10600 3450
+	10100 3450 10100 3400
+Connection ~ 9750 3450
 Wire Wire Line
-	10950 4250 10950 4300
+	10100 5450 10100 5500
+Connection ~ 9750 5450
 Wire Wire Line
-	10950 4650 10950 4600
-Connection ~ 10600 4650
+	10100 5850 10100 5800
+Connection ~ 9750 5850
 Wire Wire Line
-	10950 5450 10950 5500
+	10100 4250 10100 4300
+Connection ~ 9750 4250
 Wire Wire Line
-	10950 5850 10950 5800
-Connection ~ 10600 5850
+	10100 4650 10100 4600
+Connection ~ 9750 4650
 $EndSCHEMATC
--- a/power.sch
+++ b/power.sch
@ -67,133 +67,133 @@ $EndComp
 $Comp
 L AP3429A U3
 U 1 1 58D58840
-P 8500 3350
-F 0 "U3" H 8500 3500 60  0000 C CNN
-F 1 "AP3429A" H 8500 3400 60  0000 C CNN
-F 2 "TSOT-25:TSOT-25" H 8500 3350 60  0001 C CNN
-F 3 "" H 8500 3350 60  0001 C CNN
-	1    8500 3350
+P 7300 3350
+F 0 "U3" H 7300 3500 60  0000 C CNN
+F 1 "AP3429A" H 7300 3400 60  0000 C CNN
+F 2 "TSOT-25:TSOT-25" H 7300 3350 60  0001 C CNN
+F 3 "" H 7300 3350 60  0001 C CNN
+	1    7300 3350
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR030
 U 1 1 58D58A0B
-P 8500 3850
-F 0 "#PWR030" H 8500 3600 50  0001 C CNN
-F 1 "GND" H 8500 3700 50  0000 C CNN
-F 2 "" H 8500 3850 50  0000 C CNN
-F 3 "" H 8500 3850 50  0000 C CNN
-	1    8500 3850
+P 7300 3850
+F 0 "#PWR030" H 7300 3600 50  0001 C CNN
+F 1 "GND" H 7300 3700 50  0000 C CNN
+F 2 "" H 7300 3850 50  0000 C CNN
+F 3 "" H 7300 3850 50  0000 C CNN
+	1    7300 3850
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5V #PWR031
 U 1 1 58D58F93
-P 7850 3200
-F 0 "#PWR031" H 7850 3050 50  0001 C CNN
-F 1 "+5V" H 7850 3340 50  0000 C CNN
-F 2 "" H 7850 3200 50  0000 C CNN
-F 3 "" H 7850 3200 50  0000 C CNN
-	1    7850 3200
+P 6650 3200
+F 0 "#PWR031" H 6650 3050 50  0001 C CNN
+F 1 "+5V" H 6650 3340 50  0000 C CNN
+F 2 "" H 6650 3200 50  0000 C CNN
+F 3 "" H 6650 3200 50  0000 C CNN
+	1    6650 3200
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR032
 U 1 1 58D5989A
-P 7850 3850
-F 0 "#PWR032" H 7850 3600 50  0001 C CNN
-F 1 "GND" H 7850 3700 50  0000 C CNN
-F 2 "" H 7850 3850 50  0000 C CNN
-F 3 "" H 7850 3850 50  0000 C CNN
-	1    7850 3850
+P 6650 3850
+F 0 "#PWR032" H 6650 3600 50  0001 C CNN
+F 1 "GND" H 6650 3700 50  0000 C CNN
+F 2 "" H 6650 3850 50  0000 C CNN
+F 3 "" H 6650 3850 50  0000 C CNN
+	1    6650 3850
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C1
 U 1 1 58D598B7
-P 7850 3650
-F 0 "C1" H 7875 3750 50  0000 L CNN
-F 1 "22uF" H 7875 3550 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 7888 3500 50  0001 C CNN
-F 3 "" H 7850 3650 50  0000 C CNN
-	1    7850 3650
+P 6650 3650
+F 0 "C1" H 6675 3750 50  0000 L CNN
+F 1 "22uF" H 6675 3550 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 6688 3500 50  0001 C CNN
+F 3 "" H 6650 3650 50  0000 C CNN
+	1    6650 3650
 	1    0    0    -1  
 $EndComp
 $Comp
 L L L1
 U 1 1 58D59D36
-P 9350 3050
-F 0 "L1" V 9300 3050 50  0000 C CNN
-F 1 "2.2uH" V 9425 3050 50  0000 C CNN
-F 2 "Resistors_SMD:R_1210_HandSoldering" H 9350 3050 50  0001 C CNN
-F 3 "" H 9350 3050 50  0000 C CNN
-	1    9350 3050
+P 8150 3050
+F 0 "L1" V 8100 3050 50  0000 C CNN
+F 1 "2.2uH" V 8225 3050 50  0000 C CNN
+F 2 "Resistors_SMD:R_1210_HandSoldering" H 8150 3050 50  0001 C CNN
+F 3 "" H 8150 3050 50  0000 C CNN
+	1    8150 3050
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C C2
 U 1 1 58D5A146
-P 9550 3250
-F 0 "C2" H 9575 3350 50  0000 L CNN
-F 1 "470pF" H 9575 3150 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 9588 3100 50  0001 C CNN
-F 3 "" H 9550 3250 50  0000 C CNN
-	1    9550 3250
+P 8350 3250
+F 0 "C2" H 8375 3350 50  0000 L CNN
+F 1 "470pF" H 8375 3150 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 8388 3100 50  0001 C CNN
+F 3 "" H 8350 3250 50  0000 C CNN
+	1    8350 3250
 	1    0    0    -1  
 $EndComp
 $Comp
 L R RA1
 U 1 1 58D5A193
-P 9850 3250
-F 0 "RA1" V 9930 3250 50  0000 C CNN
-F 1 "15k" V 9850 3250 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 9780 3250 50  0001 C CNN
-F 3 "" H 9850 3250 50  0000 C CNN
-	1    9850 3250
+P 8650 3250
+F 0 "RA1" V 8730 3250 50  0000 C CNN
+F 1 "15k" V 8650 3250 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 8580 3250 50  0001 C CNN
+F 3 "" H 8650 3250 50  0000 C CNN
+	1    8650 3250
 	1    0    0    -1  
 $EndComp
 $Comp
 L R RB1
 U 1 1 58D5A1E5
-P 10050 3450
-F 0 "RB1" V 10130 3450 50  0000 C CNN
-F 1 "15k" V 10050 3450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 9980 3450 50  0001 C CNN
-F 3 "" H 10050 3450 50  0000 C CNN
-	1    10050 3450
+P 8850 3450
+F 0 "RB1" V 8930 3450 50  0000 C CNN
+F 1 "15k" V 8850 3450 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 8780 3450 50  0001 C CNN
+F 3 "" H 8850 3450 50  0000 C CNN
+	1    8850 3450
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR033
 U 1 1 58D5AE5E
-P 10250 3550
-F 0 "#PWR033" H 10250 3300 50  0001 C CNN
-F 1 "GND" H 10250 3400 50  0000 C CNN
-F 2 "" H 10250 3550 50  0000 C CNN
-F 3 "" H 10250 3550 50  0000 C CNN
-	1    10250 3550
+P 9050 3550
+F 0 "#PWR033" H 9050 3300 50  0001 C CNN
+F 1 "GND" H 9050 3400 50  0000 C CNN
+F 2 "" H 9050 3550 50  0000 C CNN
+F 3 "" H 9050 3550 50  0000 C CNN
+	1    9050 3550
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C3
 U 1 1 58D5AE64
-P 10250 3250
-F 0 "C3" H 10275 3350 50  0000 L CNN
-F 1 "22uF" H 10275 3150 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10288 3100 50  0001 C CNN
-F 3 "" H 10250 3250 50  0000 C CNN
-	1    10250 3250
+P 9050 3250
+F 0 "C3" H 9075 3350 50  0000 L CNN
+F 1 "22uF" H 9075 3150 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9088 3100 50  0001 C CNN
+F 3 "" H 9050 3250 50  0000 C CNN
+	1    9050 3250
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C4
 U 1 1 58D5AEB3
-P 10600 3250
-F 0 "C4" H 10625 3350 50  0000 L CNN
-F 1 "22uF" H 10625 3150 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10638 3100 50  0001 C CNN
-F 3 "" H 10600 3250 50  0000 C CNN
-	1    10600 3250
+P 9400 3250
+F 0 "C4" H 9425 3350 50  0000 L CNN
+F 1 "22uF" H 9425 3150 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9438 3100 50  0001 C CNN
+F 3 "" H 9400 3250 50  0000 C CNN
+	1    9400 3250
 	1    0    0    -1  
 $EndComp
 $Comp
@ -210,155 +210,155 @@ $EndComp
 $Comp
 L AP3429A U4
 U 1 1 58D62946
-P 8500 5750
-F 0 "U4" H 8500 5900 60  0000 C CNN
-F 1 "AP3429A" H 8500 5800 60  0000 C CNN
-F 2 "TSOT-25:TSOT-25" H 8500 5750 60  0001 C CNN
-F 3 "" H 8500 5750 60  0001 C CNN
-	1    8500 5750
+P 7300 5750
+F 0 "U4" H 7300 5900 60  0000 C CNN
+F 1 "AP3429A" H 7300 5800 60  0000 C CNN
+F 2 "TSOT-25:TSOT-25" H 7300 5750 60  0001 C CNN
+F 3 "" H 7300 5750 60  0001 C CNN
+	1    7300 5750
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR035
 U 1 1 58D6294C
-P 8500 6250
-F 0 "#PWR035" H 8500 6000 50  0001 C CNN
-F 1 "GND" H 8500 6100 50  0000 C CNN
-F 2 "" H 8500 6250 50  0000 C CNN
-F 3 "" H 8500 6250 50  0000 C CNN
-	1    8500 6250
+P 7300 6250
+F 0 "#PWR035" H 7300 6000 50  0001 C CNN
+F 1 "GND" H 7300 6100 50  0000 C CNN
+F 2 "" H 7300 6250 50  0000 C CNN
+F 3 "" H 7300 6250 50  0000 C CNN
+	1    7300 6250
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5V #PWR036
 U 1 1 58D62952
-P 7850 5600
-F 0 "#PWR036" H 7850 5450 50  0001 C CNN
-F 1 "+5V" H 7850 5740 50  0000 C CNN
-F 2 "" H 7850 5600 50  0000 C CNN
-F 3 "" H 7850 5600 50  0000 C CNN
-	1    7850 5600
+P 6650 5600
+F 0 "#PWR036" H 6650 5450 50  0001 C CNN
+F 1 "+5V" H 6650 5740 50  0000 C CNN
+F 2 "" H 6650 5600 50  0000 C CNN
+F 3 "" H 6650 5600 50  0000 C CNN
+	1    6650 5600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR037
 U 1 1 58D62958
-P 7850 6250
-F 0 "#PWR037" H 7850 6000 50  0001 C CNN
-F 1 "GND" H 7850 6100 50  0000 C CNN
-F 2 "" H 7850 6250 50  0000 C CNN
-F 3 "" H 7850 6250 50  0000 C CNN
-	1    7850 6250
+P 6650 6250
+F 0 "#PWR037" H 6650 6000 50  0001 C CNN
+F 1 "GND" H 6650 6100 50  0000 C CNN
+F 2 "" H 6650 6250 50  0000 C CNN
+F 3 "" H 6650 6250 50  0000 C CNN
+	1    6650 6250
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C5
 U 1 1 58D6295E
-P 7850 6050
-F 0 "C5" H 7875 6150 50  0000 L CNN
-F 1 "22uF" H 7875 5950 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 7888 5900 50  0001 C CNN
-F 3 "" H 7850 6050 50  0000 C CNN
-	1    7850 6050
+P 6650 6050
+F 0 "C5" H 6675 6150 50  0000 L CNN
+F 1 "22uF" H 6675 5950 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 6688 5900 50  0001 C CNN
+F 3 "" H 6650 6050 50  0000 C CNN
+	1    6650 6050
 	1    0    0    -1  
 $EndComp
 $Comp
 L L L2
 U 1 1 58D62964
-P 9350 5450
-F 0 "L2" V 9300 5450 50  0000 C CNN
-F 1 "2.2uH" V 9425 5450 50  0000 C CNN
-F 2 "Resistors_SMD:R_1210_HandSoldering" H 9350 5450 50  0001 C CNN
-F 3 "" H 9350 5450 50  0000 C CNN
-	1    9350 5450
+P 8150 5450
+F 0 "L2" V 8100 5450 50  0000 C CNN
+F 1 "2.2uH" V 8225 5450 50  0000 C CNN
+F 2 "Resistors_SMD:R_1210_HandSoldering" H 8150 5450 50  0001 C CNN
+F 3 "" H 8150 5450 50  0000 C CNN
+	1    8150 5450
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C C6
 U 1 1 58D6296A
-P 9550 5650
-F 0 "C6" H 9575 5750 50  0000 L CNN
-F 1 "470pF" H 9575 5550 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 9588 5500 50  0001 C CNN
-F 3 "" H 9550 5650 50  0000 C CNN
-	1    9550 5650
+P 8350 5650
+F 0 "C6" H 8375 5750 50  0000 L CNN
+F 1 "470pF" H 8375 5550 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 8388 5500 50  0001 C CNN
+F 3 "" H 8350 5650 50  0000 C CNN
+	1    8350 5650
 	1    0    0    -1  
 $EndComp
 $Comp
 L R RA3
 U 1 1 58D62970
-P 9850 5650
-F 0 "RA3" V 9930 5650 50  0000 C CNN
-F 1 "15k" V 9850 5650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 9780 5650 50  0001 C CNN
-F 3 "" H 9850 5650 50  0000 C CNN
-	1    9850 5650
+P 8650 5650
+F 0 "RA3" V 8730 5650 50  0000 C CNN
+F 1 "15k" V 8650 5650 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 8580 5650 50  0001 C CNN
+F 3 "" H 8650 5650 50  0000 C CNN
+	1    8650 5650
 	1    0    0    -1  
 $EndComp
 $Comp
 L R RB3
 U 1 1 58D62976
-P 10050 5850
-F 0 "RB3" V 10130 5850 50  0000 C CNN
-F 1 "3.3k" V 10050 5850 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 9980 5850 50  0001 C CNN
-F 3 "" H 10050 5850 50  0000 C CNN
-	1    10050 5850
+P 8850 5850
+F 0 "RB3" V 8930 5850 50  0000 C CNN
+F 1 "3.3k" V 8850 5850 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 8780 5850 50  0001 C CNN
+F 3 "" H 8850 5850 50  0000 C CNN
+	1    8850 5850
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR038
 U 1 1 58D62982
-P 10250 5950
-F 0 "#PWR038" H 10250 5700 50  0001 C CNN
-F 1 "GND" H 10250 5800 50  0000 C CNN
-F 2 "" H 10250 5950 50  0000 C CNN
-F 3 "" H 10250 5950 50  0000 C CNN
-	1    10250 5950
+P 9050 5950
+F 0 "#PWR038" H 9050 5700 50  0001 C CNN
+F 1 "GND" H 9050 5800 50  0000 C CNN
+F 2 "" H 9050 5950 50  0000 C CNN
+F 3 "" H 9050 5950 50  0000 C CNN
+	1    9050 5950
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C7
 U 1 1 58D62988
-P 10250 5650
-F 0 "C7" H 10275 5750 50  0000 L CNN
-F 1 "22uF" H 10275 5550 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10288 5500 50  0001 C CNN
-F 3 "" H 10250 5650 50  0000 C CNN
-	1    10250 5650
+P 9050 5650
+F 0 "C7" H 9075 5750 50  0000 L CNN
+F 1 "22uF" H 9075 5550 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9088 5500 50  0001 C CNN
+F 3 "" H 9050 5650 50  0000 C CNN
+	1    9050 5650
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C8
 U 1 1 58D6298E
-P 10600 5650
-F 0 "C8" H 10625 5750 50  0000 L CNN
-F 1 "22uF" H 10625 5550 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10638 5500 50  0001 C CNN
-F 3 "" H 10600 5650 50  0000 C CNN
-	1    10600 5650
+P 9400 5650
+F 0 "C8" H 9425 5750 50  0000 L CNN
+F 1 "22uF" H 9425 5550 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9438 5500 50  0001 C CNN
+F 3 "" H 9400 5650 50  0000 C CNN
+	1    9400 5650
 	1    0    0    -1  
 $EndComp
 $Comp
 L +3V3 #PWR039
 U 1 1 58D62CE2
-P 10600 5400
-F 0 "#PWR039" H 10600 5250 50  0001 C CNN
-F 1 "+3V3" H 10600 5540 50  0000 C CNN
-F 2 "" H 10600 5400 50  0000 C CNN
-F 3 "" H 10600 5400 50  0000 C CNN
-	1    10600 5400
+P 9400 5400
+F 0 "#PWR039" H 9400 5250 50  0001 C CNN
+F 1 "+3V3" H 9400 5540 50  0000 C CNN
+F 2 "" H 9400 5400 50  0000 C CNN
+F 3 "" H 9400 5400 50  0000 C CNN
+	1    9400 5400
 	1    0    0    -1  
 $EndComp
 $Comp
 L +1V2 #PWR040
 U 1 1 58D63C77
-P 10600 3000
-F 0 "#PWR040" H 10600 2850 50  0001 C CNN
-F 1 "+1V2" H 10600 3140 50  0000 C CNN
-F 2 "" H 10600 3000 50  0000 C CNN
-F 3 "" H 10600 3000 50  0000 C CNN
-	1    10600 3000
+P 9400 3000
+F 0 "#PWR040" H 9400 2850 50  0001 C CNN
+F 1 "+1V2" H 9400 3140 50  0000 C CNN
+F 2 "" H 9400 3000 50  0000 C CNN
+F 3 "" H 9400 3000 50  0000 C CNN
+	1    9400 3000
 	1    0    0    -1  
 $EndComp
 $Comp
@ -372,181 +372,181 @@ F 3 "" H 1800 900 50  0000 C CNN
 	1    1800 900 
 	1    0    0    -1  
 $EndComp
-Text Notes 6700 2950 0    60   ~ 0
+Text Notes 5500 2950 0    60   ~ 0
 AP3429/A voltage setting: is 0.6V at FB pin\nVout = (RA/RB+1)*0.6V\n
 $Comp
 L AP3429A U5
 U 1 1 58D67BBA
-P 8500 4550
-F 0 "U5" H 8500 4700 60  0000 C CNN
-F 1 "AP3429A" H 8500 4600 60  0000 C CNN
-F 2 "TSOT-25:TSOT-25" H 8500 4550 60  0001 C CNN
-F 3 "" H 8500 4550 60  0001 C CNN
-	1    8500 4550
+P 7300 4550
+F 0 "U5" H 7300 4700 60  0000 C CNN
+F 1 "AP3429A" H 7300 4600 60  0000 C CNN
+F 2 "TSOT-25:TSOT-25" H 7300 4550 60  0001 C CNN
+F 3 "" H 7300 4550 60  0001 C CNN
+	1    7300 4550
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR042
 U 1 1 58D67BC0
-P 8500 5050
-F 0 "#PWR042" H 8500 4800 50  0001 C CNN
-F 1 "GND" H 8500 4900 50  0000 C CNN
-F 2 "" H 8500 5050 50  0000 C CNN
-F 3 "" H 8500 5050 50  0000 C CNN
-	1    8500 5050
+P 7300 5050
+F 0 "#PWR042" H 7300 4800 50  0001 C CNN
+F 1 "GND" H 7300 4900 50  0000 C CNN
+F 2 "" H 7300 5050 50  0000 C CNN
+F 3 "" H 7300 5050 50  0000 C CNN
+	1    7300 5050
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5V #PWR043
 U 1 1 58D67BC6
-P 7850 4400
-F 0 "#PWR043" H 7850 4250 50  0001 C CNN
-F 1 "+5V" H 7850 4540 50  0000 C CNN
-F 2 "" H 7850 4400 50  0000 C CNN
-F 3 "" H 7850 4400 50  0000 C CNN
-	1    7850 4400
+P 6650 4400
+F 0 "#PWR043" H 6650 4250 50  0001 C CNN
+F 1 "+5V" H 6650 4540 50  0000 C CNN
+F 2 "" H 6650 4400 50  0000 C CNN
+F 3 "" H 6650 4400 50  0000 C CNN
+	1    6650 4400
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR044
 U 1 1 58D67BCC
-P 7850 5050
-F 0 "#PWR044" H 7850 4800 50  0001 C CNN
-F 1 "GND" H 7850 4900 50  0000 C CNN
-F 2 "" H 7850 5050 50  0000 C CNN
-F 3 "" H 7850 5050 50  0000 C CNN
-	1    7850 5050
+P 6650 5050
+F 0 "#PWR044" H 6650 4800 50  0001 C CNN
+F 1 "GND" H 6650 4900 50  0000 C CNN
+F 2 "" H 6650 5050 50  0000 C CNN
+F 3 "" H 6650 5050 50  0000 C CNN
+	1    6650 5050
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C9
 U 1 1 58D67BD2
-P 7850 4850
-F 0 "C9" H 7875 4950 50  0000 L CNN
-F 1 "22uF" H 7875 4750 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 7888 4700 50  0001 C CNN
-F 3 "" H 7850 4850 50  0000 C CNN
-	1    7850 4850
+P 6650 4850
+F 0 "C9" H 6675 4950 50  0000 L CNN
+F 1 "22uF" H 6675 4750 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 6688 4700 50  0001 C CNN
+F 3 "" H 6650 4850 50  0000 C CNN
+	1    6650 4850
 	1    0    0    -1  
 $EndComp
 $Comp
 L L L3
 U 1 1 58D67BD8
-P 9350 4250
-F 0 "L3" V 9300 4250 50  0000 C CNN
-F 1 "2.2uH" V 9425 4250 50  0000 C CNN
-F 2 "Resistors_SMD:R_1210_HandSoldering" H 9350 4250 50  0001 C CNN
-F 3 "" H 9350 4250 50  0000 C CNN
-	1    9350 4250
+P 8150 4250
+F 0 "L3" V 8100 4250 50  0000 C CNN
+F 1 "2.2uH" V 8225 4250 50  0000 C CNN
+F 2 "Resistors_SMD:R_1210_HandSoldering" H 8150 4250 50  0001 C CNN
+F 3 "" H 8150 4250 50  0000 C CNN
+	1    8150 4250
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C C10
 U 1 1 58D67BDE
-P 9550 4450
-F 0 "C10" H 9575 4550 50  0000 L CNN
-F 1 "470pF" H 9575 4350 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 9588 4300 50  0001 C CNN
-F 3 "" H 9550 4450 50  0000 C CNN
-	1    9550 4450
+P 8350 4450
+F 0 "C10" H 8375 4550 50  0000 L CNN
+F 1 "470pF" H 8375 4350 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 8388 4300 50  0001 C CNN
+F 3 "" H 8350 4450 50  0000 C CNN
+	1    8350 4450
 	1    0    0    -1  
 $EndComp
 $Comp
 L R RA2
 U 1 1 58D67BE4
-P 9850 4450
-F 0 "RA2" V 9930 4450 50  0000 C CNN
-F 1 "15k" V 9850 4450 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 9780 4450 50  0001 C CNN
-F 3 "" H 9850 4450 50  0000 C CNN
-	1    9850 4450
+P 8650 4450
+F 0 "RA2" V 8730 4450 50  0000 C CNN
+F 1 "15k" V 8650 4450 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 8580 4450 50  0001 C CNN
+F 3 "" H 8650 4450 50  0000 C CNN
+	1    8650 4450
 	1    0    0    -1  
 $EndComp
 $Comp
 L R RB2
 U 1 1 58D67BEA
-P 10050 4650
-F 0 "RB2" V 10130 4650 50  0000 C CNN
-F 1 "4.7k" V 10050 4650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 9980 4650 50  0001 C CNN
-F 3 "" H 10050 4650 50  0000 C CNN
-	1    10050 4650
+P 8850 4650
+F 0 "RB2" V 8930 4650 50  0000 C CNN
+F 1 "4.7k" V 8850 4650 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 8780 4650 50  0001 C CNN
+F 3 "" H 8850 4650 50  0000 C CNN
+	1    8850 4650
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR045
 U 1 1 58D67BF0
-P 10250 4750
-F 0 "#PWR045" H 10250 4500 50  0001 C CNN
-F 1 "GND" H 10250 4600 50  0000 C CNN
-F 2 "" H 10250 4750 50  0000 C CNN
-F 3 "" H 10250 4750 50  0000 C CNN
-	1    10250 4750
+P 9050 4750
+F 0 "#PWR045" H 9050 4500 50  0001 C CNN
+F 1 "GND" H 9050 4600 50  0000 C CNN
+F 2 "" H 9050 4750 50  0000 C CNN
+F 3 "" H 9050 4750 50  0000 C CNN
+	1    9050 4750
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C11
 U 1 1 58D67BF6
-P 10250 4450
-F 0 "C11" H 10275 4550 50  0000 L CNN
-F 1 "22uF" H 10275 4350 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10288 4300 50  0001 C CNN
-F 3 "" H 10250 4450 50  0000 C CNN
-	1    10250 4450
+P 9050 4450
+F 0 "C11" H 9075 4550 50  0000 L CNN
+F 1 "22uF" H 9075 4350 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9088 4300 50  0001 C CNN
+F 3 "" H 9050 4450 50  0000 C CNN
+	1    9050 4450
 	1    0    0    -1  
 $EndComp
 $Comp
 L CP C12
 U 1 1 58D67BFC
-P 10600 4450
-F 0 "C12" H 10625 4550 50  0000 L CNN
-F 1 "22uF" H 10625 4350 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10638 4300 50  0001 C CNN
-F 3 "" H 10600 4450 50  0000 C CNN
-	1    10600 4450
+P 9400 4450
+F 0 "C12" H 9425 4550 50  0000 L CNN
+F 1 "22uF" H 9425 4350 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9438 4300 50  0001 C CNN
+F 3 "" H 9400 4450 50  0000 C CNN
+	1    9400 4450
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R1
 U 1 1 58D67C1D
-P 4150 4600
-F 0 "R1" V 4230 4600 50  0000 C CNN
-F 1 "15k" V 4150 4600 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 4080 4600 50  0001 C CNN
-F 3 "" H 4150 4600 50  0000 C CNN
-	1    4150 4600
+P 4400 4650
+F 0 "R1" V 4480 4650 50  0000 C CNN
+F 1 "15k" V 4400 4650 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 4330 4650 50  0001 C CNN
+F 3 "" H 4400 4650 50  0000 C CNN
+	1    4400 4650
 	1    0    0    -1  
 $EndComp
 $Comp
 L +2V5 #PWR046
 U 1 1 58D681D4
-P 10600 4200
-F 0 "#PWR046" H 10600 4050 50  0001 C CNN
-F 1 "+2V5" H 10600 4340 50  0000 C CNN
-F 2 "" H 10600 4200 50  0000 C CNN
-F 3 "" H 10600 4200 50  0000 C CNN
-	1    10600 4200
+P 9400 4200
+F 0 "#PWR046" H 9400 4050 50  0001 C CNN
+F 1 "+2V5" H 9400 4340 50  0000 C CNN
+F 2 "" H 9400 4200 50  0000 C CNN
+F 3 "" H 9400 4200 50  0000 C CNN
+	1    9400 4200
 	1    0    0    -1  
 $EndComp
-Text Notes 9150 2900 0    60   ~ 0
+Text Notes 7950 2900 0    60   ~ 0
 (15k/15k+1)*0.6V = 1.2V\n
-Text Label 9250 3450 0    60   ~ 0
+Text Label 8050 3450 0    60   ~ 0
 FB1
-Text Notes 9150 4100 0    60   ~ 0
+Text Notes 7950 4100 0    60   ~ 0
 (15k/4.7k+1)*0.6V = 2.51V\n
-Text Notes 9150 5300 0    60   ~ 0
+Text Notes 7950 5300 0    60   ~ 0
 (15k/3.3k+1)*0.6V = 3.32V\n
-Text Label 7400 3450 0    60   ~ 0
+Text Label 6200 3450 0    60   ~ 0
 PWREN
-Text Label 7450 4650 0    60   ~ 0
+Text Label 6250 4650 0    60   ~ 0
 PWREN
-Text Label 7450 5850 0    60   ~ 0
+Text Label 6250 5850 0    60   ~ 0
 PWREN
-Text Label 4300 4850 0    60   ~ 0
+Text Label 4550 4900 0    60   ~ 0
 PWREN
-Text Label 9250 5850 0    60   ~ 0
+Text Label 8050 5850 0    60   ~ 0
 FB3
-Text Label 9250 4650 0    60   ~ 0
+Text Label 8050 4650 0    60   ~ 0
 FB2
 $Comp
 L +2V5 #PWR047
@ -573,396 +573,383 @@ $EndComp
 $Comp
 L PCF8563 U7
 U 1 1 58D70684
-P 2100 3550
-F 0 "U7" H 1800 3900 50  0000 L CNN
-F 1 "PCF8523" H 2200 3900 50  0000 L CNN
-F 2 "Power_Integrations:SO-8" H 2100 3550 50  0001 C CNN
-F 3 "" H 2100 3550 50  0000 C CNN
-	1    2100 3550
+P 2050 3600
+F 0 "U7" H 1750 3950 50  0000 L CNN
+F 1 "PCF8523" H 2150 3950 50  0000 L CNN
+F 2 "Power_Integrations:SO-8" H 2050 3600 50  0001 C CNN
+F 3 "" H 2050 3600 50  0000 C CNN
+	1    2050 3600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR049
 U 1 1 58D7085C
-P 2100 4050
-F 0 "#PWR049" H 2100 3800 50  0001 C CNN
-F 1 "GND" H 2100 3900 50  0000 C CNN
-F 2 "" H 2100 4050 50  0000 C CNN
-F 3 "" H 2100 4050 50  0000 C CNN
-	1    2100 4050
+P 2050 4100
+F 0 "#PWR049" H 2050 3850 50  0001 C CNN
+F 1 "GND" H 2050 3950 50  0000 C CNN
+F 2 "" H 2050 4100 50  0000 C CNN
+F 3 "" H 2050 4100 50  0000 C CNN
+	1    2050 4100
 	1    0    0    -1  
 $EndComp
-Text GLabel 2600 3350 2    60   Input ~ 0
+Text GLabel 2550 3400 2    60   Input ~ 0
 GPDI_SCL
-Text GLabel 2600 3450 2    60   Input ~ 0
+Text GLabel 2550 3500 2    60   Input ~ 0
 GPDI_SDA
 $Comp
 L Battery_Cell BAT1
 U 1 1 58D72202
-P 2800 4000
-F 0 "BAT1" H 2900 4100 50  0000 L CNN
-F 1 "CR1225" H 2900 4000 50  0000 L CNN
-F 2 "Keystone_3000_1x12mm-CoinCell:Keystone_3000_1x12mm-CoinCell" V 2800 4060 50  0001 C CNN
-F 3 "" V 2800 4060 50  0000 C CNN
-	1    2800 4000
+P 2750 4050
+F 0 "BAT1" H 2450 4150 50  0000 L CNN
+F 1 "CR1225" H 2350 4050 50  0000 L CNN
+F 2 "Keystone_3000_1x12mm-CoinCell:Keystone_3000_1x12mm-CoinCell" V 2750 4110 50  0001 C CNN
+F 3 "" V 2750 4110 50  0000 C CNN
+	1    2750 4050
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR050
 U 1 1 58D72406
-P 2800 4150
-F 0 "#PWR050" H 2800 3900 50  0001 C CNN
-F 1 "GND" H 2800 4000 50  0000 C CNN
-F 2 "" H 2800 4150 50  0000 C CNN
-F 3 "" H 2800 4150 50  0000 C CNN
-	1    2800 4150
-	1    0    0    -1  
+P 2000 4550
+F 0 "#PWR050" H 2000 4300 50  0001 C CNN
+F 1 "GND" H 2000 4400 50  0000 C CNN
+F 2 "" H 2000 4550 50  0000 C CNN
+F 3 "" H 2000 4550 50  0000 C CNN
+	1    2000 4550
+	0    1    1    0   
 $EndComp
-Text Label 2550 3750 0    60   ~ 0
+Text Label 2500 3800 0    60   ~ 0
 VBAT
-Text Notes 6750 4250 0    60   ~ 0
+Text Notes 5550 4250 0    60   ~ 0
 PWREN\nabove +1.5V turns ON\nbelow +0.4V turns OFF
 $Comp
 L D D10
 U 1 1 58D79CB5
-P 4150 4150
-F 0 "D10" H 4150 4250 50  0000 C CNN
-F 1 "1N4148" H 4150 4050 50  0000 C CNN
-F 2 "Diodes_SMD:D_SOD-323" H 4150 4150 50  0001 C CNN
-F 3 "" H 4150 4150 50  0000 C CNN
-	1    4150 4150
+P 4400 4200
+F 0 "D10" H 4400 4300 50  0000 C CNN
+F 1 "1N4148" H 4400 4100 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323" H 4400 4200 50  0001 C CNN
+F 3 "" H 4400 4200 50  0000 C CNN
+	1    4400 4200
 	0    -1   -1   0   
 $EndComp
 $Comp
 L C C13
 U 1 1 58D7A3F0
-P 4150 3650
-F 0 "C13" H 4175 3750 50  0000 L CNN
-F 1 "2.2uF" H 4175 3550 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 4188 3500 50  0001 C CNN
-F 3 "" H 4150 3650 50  0000 C CNN
-	1    4150 3650
+P 4400 3700
+F 0 "C13" H 4425 3800 50  0000 L CNN
+F 1 "2.2uF" H 4425 3600 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 4438 3550 50  0001 C CNN
+F 3 "" H 4400 3700 50  0000 C CNN
+	1    4400 3700
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R2
 U 1 1 58D7BDD9
-P 4150 5500
-F 0 "R2" V 4230 5500 50  0000 C CNN
-F 1 "47k" V 4150 5500 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 4080 5500 50  0001 C CNN
-F 3 "" H 4150 5500 50  0000 C CNN
-	1    4150 5500
+P 4400 5550
+F 0 "R2" V 4480 5550 50  0000 C CNN
+F 1 "47k" V 4400 5550 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 4330 5550 50  0001 C CNN
+F 3 "" H 4400 5550 50  0000 C CNN
+	1    4400 5550
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR051
 U 1 1 58D7C223
-P 4150 6100
-F 0 "#PWR051" 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
-	1    4150 6100
+P 4400 6150
+F 0 "#PWR051" H 4400 5900 50  0001 C CNN
+F 1 "GND" H 4400 6000 50  0000 C CNN
+F 2 "" H 4400 6150 50  0000 C CNN
+F 3 "" H 4400 6150 50  0000 C CNN
+	1    4400 6150
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R4
 U 1 1 58D7CBD5
-P 4700 4600
-F 0 "R4" V 4780 4600 50  0000 C CNN
-F 1 "15k" V 4700 4600 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 4630 4600 50  0001 C CNN
-F 3 "" H 4700 4600 50  0000 C CNN
-	1    4700 4600
+P 4950 4650
+F 0 "R4" V 5030 4650 50  0000 C CNN
+F 1 "15k" V 4950 4650 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 4880 4650 50  0001 C CNN
+F 3 "" H 4950 4650 50  0000 C CNN
+	1    4950 4650
 	1    0    0    -1  
 $EndComp
 $Comp
 L D D11
 U 1 1 58D7CBDC
-P 4700 4150
-F 0 "D11" H 4700 4250 50  0000 C CNN
-F 1 "1N4148" H 4700 4050 50  0000 C CNN
-F 2 "Diodes_SMD:D_SOD-323" H 4700 4150 50  0001 C CNN
-F 3 "" H 4700 4150 50  0000 C CNN
-	1    4700 4150
+P 4950 4200
+F 0 "D11" H 4950 4300 50  0000 C CNN
+F 1 "1N4148" H 4950 4100 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323" H 4950 4200 50  0001 C CNN
+F 3 "" H 4950 4200 50  0000 C CNN
+	1    4950 4200
 	0    -1   -1   0   
 $EndComp
 $Comp
 L +3V3 #PWR052
 U 1 1 58D7CCF7
-P 4700 3900
-F 0 "#PWR052" H 4700 3750 50  0001 C CNN
-F 1 "+3V3" H 4700 4040 50  0000 C CNN
-F 2 "" H 4700 3900 50  0000 C CNN
-F 3 "" H 4700 3900 50  0000 C CNN
-	1    4700 3900
+P 4950 3950
+F 0 "#PWR052" H 4950 3800 50  0001 C CNN
+F 1 "+3V3" H 4950 4090 50  0000 C CNN
+F 2 "" H 4950 3950 50  0000 C CNN
+F 3 "" H 4950 3950 50  0000 C CNN
+	1    4950 3950
 	1    0    0    -1  
 $EndComp
-Text Notes 3150 3550 0    60   ~ 0
+Text Notes 3100 3650 0    60   ~ 0
 WAKEUPn\nopen drain \nactive low
-Text Label 2550 3650 0    60   ~ 0
+Text Label 2500 3700 0    60   ~ 0
 WAKEUPn
 $Comp
 L C C14
 U 1 1 58D84952
-P 3550 5750
-F 0 "C14" H 3575 5850 50  0000 L CNN
-F 1 "100nF" H 3575 5650 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3588 5600 50  0001 C CNN
-F 3 "" H 3550 5750 50  0000 C CNN
-	1    3550 5750
+P 3800 5800
+F 0 "C14" H 3825 5900 50  0000 L CNN
+F 1 "100nF" H 3825 5700 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3838 5650 50  0001 C CNN
+F 3 "" H 3800 5800 50  0000 C CNN
+	1    3800 5800
 	1    0    0    -1  
 $EndComp
 $Comp
 L D_Schottky D15
 U 1 1 58D84D8A
-P 2950 5500
-F 0 "D15" H 2950 5600 50  0000 C CNN
-F 1 "BAT54W" H 2950 5400 50  0000 C CNN
-F 2 "Diodes_SMD:D_SOD-323F" H 2950 5500 50  0001 C CNN
-F 3 "" H 2950 5500 50  0000 C CNN
-	1    2950 5500
+P 3200 5550
+F 0 "D15" H 3200 5650 50  0000 C CNN
+F 1 "BAT54W" H 3200 5450 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323F" H 3200 5550 50  0001 C CNN
+F 3 "" H 3200 5550 50  0000 C CNN
+	1    3200 5550
 	-1   0    0    1   
 $EndComp
 $Comp
 L R R5
 U 1 1 58D85B68
-P 3250 5750
-F 0 "R5" V 3330 5750 50  0000 C CNN
-F 1 "4.7M" V 3250 5750 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 3180 5750 50  0001 C CNN
-F 3 "" H 3250 5750 50  0000 C CNN
-	1    3250 5750
+P 3500 5800
+F 0 "R5" V 3580 5800 50  0000 C CNN
+F 1 "4.7M" V 3500 5800 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3430 5800 50  0001 C CNN
+F 3 "" H 3500 5800 50  0000 C CNN
+	1    3500 5800
 	1    0    0    -1  
 $EndComp
-Text Notes 2800 6150 0    60   ~ 0
+Text Notes 3050 6200 0    60   ~ 0
 RC to hold 0.5s shutdown
-Text Label 4150 4000 0    60   ~ 0
+Text Label 4400 4050 0    60   ~ 0
 WKUP
-Text Label 4150 4400 0    60   ~ 0
+Text Label 4400 4450 0    60   ~ 0
 WAKE
-Text Label 4700 4400 0    60   ~ 0
+Text Label 4950 4450 0    60   ~ 0
 HOLD
-Text Label 3300 5500 0    60   ~ 0
+Text Label 3550 5550 0    60   ~ 0
 SHUT
 $Comp
 L R R6
 U 1 1 58D7B291
-P 3200 3650
-F 0 "R6" V 3280 3650 50  0000 C CNN
-F 1 "1k" V 3200 3650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 3130 3650 50  0001 C CNN
-F 3 "" H 3200 3650 50  0000 C CNN
-	1    3200 3650
+P 3500 3700
+F 0 "R6" V 3580 3700 50  0000 C CNN
+F 1 "1k" V 3500 3700 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3430 3700 50  0001 C CNN
+F 3 "" H 3500 3700 50  0000 C CNN
+	1    3500 3700
 	0    1    1    0   
 $EndComp
-Text Label 3400 3650 0    60   ~ 0
+Text Label 3650 3700 0    60   ~ 0
 WKn
 $Comp
 L D D12
 U 1 1 58D7BC4A
-P 3650 4850
-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_SOD-323" H 3650 4850 50  0001 C CNN
-F 3 "" H 3650 4850 50  0000 C CNN
-	1    3650 4850
+P 3900 4900
+F 0 "D12" H 3900 5000 50  0000 C CNN
+F 1 "1N4148" H 3900 4800 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323" H 3900 4900 50  0001 C CNN
+F 3 "" H 3900 4900 50  0000 C CNN
+	1    3900 4900
 	-1   0    0    1   
 $EndComp
 $Comp
 L R R8
 U 1 1 58D8111E
-P 3950 5100
-F 0 "R8" V 4030 5100 50  0000 C CNN
-F 1 "1k" V 3950 5100 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 3880 5100 50  0001 C CNN
-F 3 "" H 3950 5100 50  0000 C CNN
-	1    3950 5100
+P 4200 5150
+F 0 "R8" V 4280 5150 50  0000 C CNN
+F 1 "1k" V 4200 5150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 4130 5150 50  0001 C CNN
+F 3 "" H 4200 5150 50  0000 C CNN
+	1    4200 5150
 	1    0    0    -1  
 $EndComp
 $Comp
 L Crystal_GND23 Y2
 U 1 1 58D85AAB
-P 1050 3550
-F 0 "Y2" V 900 3350 50  0000 L CNN
-F 1 "32768Hz" V 1200 3150 50  0000 L CNN
-F 2 "abs25:Crystal_SMD_ABS25" H 1050 3550 50  0001 C CNN
-F 3 "" H 1050 3550 50  0000 C CNN
-	1    1050 3550
+P 1000 3600
+F 0 "Y2" V 850 3400 50  0000 L CNN
+F 1 "32768Hz" V 1150 3200 50  0000 L CNN
+F 2 "abs25:Crystal_SMD_ABS25" H 1000 3600 50  0001 C CNN
+F 3 "" H 1000 3600 50  0000 C CNN
+	1    1000 3600
 	0    1    1    0   
 $EndComp
-NoConn ~ 850  3550
-NoConn ~ 1250 3550
-Text Label 1200 3350 0    60   ~ 0
+NoConn ~ 800  3600
+NoConn ~ 1200 3600
+Text Label 1150 3400 0    60   ~ 0
 OSCI_32k
-Text Label 1200 3750 0    60   ~ 0
+Text Label 1150 3800 0    60   ~ 0
 OSCO_32k
 $Comp
 L Q_NMOS_GSD Q2
 U 1 1 58D883BD
-P 3850 5500
-F 0 "Q2" H 3700 5600 50  0000 L CNN
-F 1 "2N7002" H 3600 5700 50  0000 L CNN
-F 2 "TO_SOT_Packages_SMD:SOT-23_Handsoldering" H 4050 5600 50  0001 C CNN
-F 3 "" H 3850 5500 50  0000 C CNN
-	1    3850 5500
+P 4100 5550
+F 0 "Q2" H 3950 5650 50  0000 L CNN
+F 1 "2N7002" H 3850 5750 50  0000 L CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23_Handsoldering" H 4300 5650 50  0001 C CNN
+F 3 "" H 4100 5550 50  0000 C CNN
+	1    4100 5550
 	1    0    0    -1  
 $EndComp
 $Comp
 L Q_PNP_BEC Q1
 U 1 1 58D89315
-P 3800 3650
-F 0 "Q1" H 3650 3550 50  0000 L CNN
-F 1 "BC857" H 3600 3850 50  0000 L CNN
-F 2 "TO_SOT_Packages_SMD:SOT-23_Handsoldering" H 4000 3750 50  0001 C CNN
-F 3 "" H 3800 3650 50  0000 C CNN
-	1    3800 3650
+P 4050 3700
+F 0 "Q1" H 3900 3600 50  0000 L CNN
+F 1 "BC857" H 3850 3900 50  0000 L CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23_Handsoldering" H 4250 3800 50  0001 C CNN
+F 3 "" H 4050 3700 50  0000 C CNN
+	1    4050 3700
 	1    0    0    1   
 $EndComp
 $Comp
 L R R13
 U 1 1 58DA1F4D
-P 2700 5750
-F 0 "R13" V 2780 5750 50  0000 C CNN
-F 1 "15k" V 2700 5750 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 2630 5750 50  0001 C CNN
-F 3 "" H 2700 5750 50  0000 C CNN
-	1    2700 5750
+P 2950 5800
+F 0 "R13" V 3030 5800 50  0000 C CNN
+F 1 "15k" V 2950 5800 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 2880 5800 50  0001 C CNN
+F 3 "" H 2950 5800 50  0000 C CNN
+	1    2950 5800
 	1    0    0    -1  
 $EndComp
-Text Notes 5600 6400 0    60   ~ 0
+Text Notes 5050 6950 0    60   ~ 0
 Important:\nPlace voltage feedback and filter \nRC network close to FPGA. Position of \nSMPS chip and L doesn't matter.\n
 $Comp
 L D D13
 U 1 1 58DA2DA9
-P 3900 4150
-F 0 "D13" H 3900 4250 50  0000 C CNN
-F 1 "1N4148" H 3900 4050 50  0000 C CNN
-F 2 "Diodes_SMD:D_SOD-323" H 3900 4150 50  0001 C CNN
-F 3 "" H 3900 4150 50  0000 C CNN
-	1    3900 4150
+P 4150 4200
+F 0 "D13" H 4150 4300 50  0000 C CNN
+F 1 "1N4148" H 4150 4100 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323" H 4150 4200 50  0001 C CNN
+F 3 "" H 4150 4200 50  0000 C CNN
+	1    4150 4200
 	0    1    1    0   
 $EndComp
 $Comp
 L GND #PWR053
 U 1 1 58DA2E46
-P 3900 4300
-F 0 "#PWR053" 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
-	1    3900 4300
+P 4150 4350
+F 0 "#PWR053" H 4150 4100 50  0001 C CNN
+F 1 "GND" H 4150 4200 50  0000 C CNN
+F 2 "" H 4150 4350 50  0000 C CNN
+F 3 "" H 4150 4350 50  0000 C CNN
+	1    4150 4350
 	1    0    0    -1  
 $EndComp
 $Comp
 L +5V #PWR054
 U 1 1 58D67C25
-P 4150 3300
-F 0 "#PWR054" 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
-	1    4150 3300
+P 4400 3350
+F 0 "#PWR054" H 4400 3200 50  0001 C CNN
+F 1 "+5V" H 4400 3490 50  0000 C CNN
+F 2 "" H 4400 3350 50  0000 C CNN
+F 3 "" H 4400 3350 50  0000 C CNN
+	1    4400 3350
 	1    0    0    -1  
 $EndComp
-Text Notes 3050 4550 0    60   ~ 0
+Text Notes 3550 4700 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_SOD-323" H 3250 5300 50  0001 C CNN
-F 3 "" H 3250 5300 50  0000 C CNN
-	1    3250 5300
+P 3500 5350
+F 0 "D14" H 3500 5450 50  0000 C CNN
+F 1 "1N4148" H 3500 5250 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323" H 3500 5350 50  0001 C CNN
+F 3 "" H 3500 5350 50  0000 C CNN
+	1    3500 5350
 	0    1    1    0   
 $EndComp
 $Comp
 L +3V3 #PWR055
 U 1 1 58DA569C
-P 3250 5150
-F 0 "#PWR055" 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
+P 3500 5200
+F 0 "#PWR055" H 3500 5050 50  0001 C CNN
+F 1 "+3V3" H 3500 5340 50  0000 C CNN
+F 2 "" H 3500 5200 50  0000 C CNN
+F 3 "" H 3500 5200 50  0000 C CNN
+	1    3500 5200
 	1    0    0    -1  
 $EndComp
-Text Notes 2300 5300 0    60   ~ 0
+Text Notes 2550 5350 0    60   ~ 0
 D14 discharges\nC14 at shutdown
-Text GLabel 2550 5500 0    60   Input ~ 0
+Text GLabel 2800 5550 0    60   Input ~ 0
 SHUTDOWN
 $Comp
 L R R3
 U 1 1 58E810CC
-P 1500 6650
-F 0 "R3" V 1580 6650 50  0000 C CNN
-F 1 "4.7k" V 1500 6650 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 1430 6650 50  0001 C CNN
-F 3 "" H 1500 6650 50  0000 C CNN
-	1    1500 6650
-	1    0    0    -1  
+P 3250 4350
+F 0 "R3" V 3350 4350 50  0000 C CNN
+F 1 "4.7k" V 3250 4350 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 3180 4350 50  0001 C CNN
+F 3 "" H 3250 4350 50  0000 C CNN
+	1    3250 4350
+	0    1    1    0   
 $EndComp
 $Comp
 L D D16
 U 1 1 58E813AE
-P 1300 6850
-F 0 "D16" H 1300 6950 50  0000 C CNN
-F 1 "1N4148" H 1300 6750 50  0000 C CNN
-F 2 "Diodes_SMD:D_SOD-323" H 1300 6850 50  0001 C CNN
-F 3 "" H 1300 6850 50  0000 C CNN
-	1    1300 6850
-	-1   0    0    1   
+P 3000 3900
+F 0 "D16" H 3000 4000 50  0000 C CNN
+F 1 "1N4148" H 3000 3800 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323" H 3000 3900 50  0001 C CNN
+F 3 "" H 3000 3900 50  0000 C CNN
+	1    3000 3900
+	0    -1   -1   0   
 $EndComp
-Text Label 750  6850 0    60   ~ 0
-WAKEUPn
 $Comp
 L +5V #PWR056
 U 1 1 58E82A7E
-P 1500 6500
-F 0 "#PWR056" H 1500 6350 50  0001 C CNN
-F 1 "+5V" H 1500 6640 50  0000 C CNN
-F 2 "" H 1500 6500 50  0000 C CNN
-F 3 "" H 1500 6500 50  0000 C CNN
-	1    1500 6500
-	1    0    0    -1  
+P 3400 4350
+F 0 "#PWR056" H 3400 4200 50  0001 C CNN
+F 1 "+5V" H 3400 4490 50  0000 C CNN
+F 2 "" H 3400 4350 50  0000 C CNN
+F 3 "" H 3400 4350 50  0000 C CNN
+	1    3400 4350
+	0    1    1    0   
 $EndComp
 $Comp
 L D D17
 U 1 1 58E82B1D
-P 1700 6850
-F 0 "D17" H 1700 6950 50  0000 C CNN
-F 1 "1N4148" H 1700 6750 50  0000 C CNN
-F 2 "Diodes_SMD:D_SOD-323" H 1700 6850 50  0001 C CNN
-F 3 "" H 1700 6850 50  0000 C CNN
-	1    1700 6850
+P 3250 4100
+F 0 "D17" H 3250 4000 50  0000 C CNN
+F 1 "1N4148" H 3300 4200 50  0000 C CNN
+F 2 "Diodes_SMD:D_SOD-323" H 3250 4100 50  0001 C CNN
+F 3 "" H 3250 4100 50  0000 C CNN
+	1    3250 4100
 	1    0    0    -1  
 $EndComp
-Text GLabel 1850 6850 2    60   Input ~ 0
+Text GLabel 3400 4100 2    60   Input ~ 0
 BTN_PWRn
 $Comp
 L CONN_02X01 BTN0
 U 1 1 58E83FE0
-P 1500 7150
-F 0 "BTN0" H 1500 7250 50  0000 C CNN
-F 1 "POWER" H 1500 7050 50  0000 C CNN
-F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 1500 5950 50  0001 C CNN
-F 3 "" H 1500 5950 50  0000 C CNN
-	1    1500 7150
-	0    1    1    0   
-$EndComp
-$Comp
-L GND #PWR057
-U 1 1 58E840F5
-P 1500 7400
-F 0 "#PWR057" H 1500 7150 50  0001 C CNN
-F 1 "GND" H 1500 7250 50  0000 C CNN
-F 2 "" H 1500 7400 50  0000 C CNN
-F 3 "" H 1500 7400 50  0000 C CNN
-	1    1500 7400
-	1    0    0    -1  
+P 2250 4550
+F 0 "BTN0" H 2250 4650 50  0000 C CNN
+F 1 "POWER" H 2250 4450 50  0000 C CNN
+F 2 "Buttons_Switches_SMD:SW_SPST_PTS645" H 2250 3350 50  0001 C CNN
+F 3 "" H 2250 3350 50  0000 C CNN
+	1    2250 4550
+	-1   0    0    1   
 $EndComp
 Wire Wire Line
 	900  2450 900  2550
@ -1372,151 +1359,151 @@ Wire Wire Line
 	2300 1000 2300 1100
 Connection ~ 2300 1000
 Wire Wire Line
-	8500 3750 8500 3850
+	7300 3750 7300 3850
 Wire Wire Line
-	7850 3200 7850 3500
+	6650 3200 6650 3500
 Wire Wire Line
-	7850 3800 7850 3850
+	6650 3800 6650 3850
 Wire Wire Line
-	9150 3250 9100 3250
+	7950 3250 7900 3250
 Wire Wire Line
-	9150 3050 9150 3250
+	7950 3050 7950 3250
 Wire Wire Line
-	9500 3050 10950 3050
+	8300 3050 10100 3050
 Wire Wire Line
-	9850 3050 9850 3100
+	8650 3050 8650 3100
 Wire Wire Line
-	9550 3100 9550 3050
+	8350 3100 8350 3050
 Wire Wire Line
-	9550 3400 9550 3450
+	8350 3400 8350 3450
 Wire Wire Line
-	9850 3450 9850 3400
+	8650 3450 8650 3400
 Wire Wire Line
-	9100 3450 9900 3450
+	7900 3450 8700 3450
 Wire Wire Line
-	10250 3400 10250 3550
+	9050 3400 9050 3550
 Wire Wire Line
-	10600 3450 10600 3400
+	9400 3450 9400 3400
 Wire Wire Line
-	10200 3450 10950 3450
-Connection ~ 10250 3450
+	9000 3450 10100 3450
+Connection ~ 9050 3450
 Wire Wire Line
-	10250 3050 10250 3100
+	9050 3050 9050 3100
 Wire Wire Line
-	10600 3000 10600 3100
-Connection ~ 9850 3450
-Connection ~ 9550 3450
-Connection ~ 9550 3050
+	9400 3000 9400 3100
+Connection ~ 8650 3450
+Connection ~ 8350 3450
+Connection ~ 8350 3050
 Wire Wire Line
-	9150 3050 9200 3050
-Connection ~ 10600 3050
+	7950 3050 8000 3050
+Connection ~ 9400 3050
 Wire Wire Line
 	1700 1000 3600 1000
-Connection ~ 7850 3250
+Connection ~ 6650 3250
 Wire Wire Line
-	7850 3250 7900 3250
+	6650 3250 6700 3250
 Wire Wire Line
-	7900 3450 7350 3450
+	6700 3450 6150 3450
 Wire Wire Line
-	8500 6150 8500 6250
+	7300 6150 7300 6250
 Wire Wire Line
-	7850 5600 7850 5900
+	6650 5600 6650 5900
 Wire Wire Line
-	7850 6200 7850 6250
+	6650 6200 6650 6250
 Wire Wire Line
-	9150 5650 9100 5650
+	7950 5650 7900 5650
 Wire Wire Line
-	9150 5450 9150 5650
+	7950 5450 7950 5650
 Wire Wire Line
-	9500 5450 10950 5450
+	8300 5450 10100 5450
 Wire Wire Line
-	9850 5450 9850 5500
+	8650 5450 8650 5500
 Wire Wire Line
-	9550 5500 9550 5450
+	8350 5500 8350 5450
 Wire Wire Line
-	9550 5800 9550 5850
+	8350 5800 8350 5850
 Wire Wire Line
-	9850 5850 9850 5800
+	8650 5850 8650 5800
 Wire Wire Line
-	9100 5850 9900 5850
+	7900 5850 8700 5850
 Wire Wire Line
-	10250 5800 10250 5950
+	9050 5800 9050 5950
 Wire Wire Line
-	10600 5850 10600 5800
+	9400 5850 9400 5800
 Wire Wire Line
-	10200 5850 10950 5850
-Connection ~ 10250 5850
+	9000 5850 10100 5850
+Connection ~ 9050 5850
 Wire Wire Line
-	10250 5450 10250 5500
+	9050 5450 9050 5500
 Wire Wire Line
-	10600 5400 10600 5500
-Connection ~ 10250 5450
-Connection ~ 9850 5850
-Connection ~ 9550 5850
-Connection ~ 9850 5450
-Connection ~ 9550 5450
+	9400 5400 9400 5500
+Connection ~ 9050 5450
+Connection ~ 8650 5850
+Connection ~ 8350 5850
+Connection ~ 8650 5450
+Connection ~ 8350 5450
 Wire Wire Line
-	9150 5450 9200 5450
-Connection ~ 10600 5450
-Connection ~ 7850 5650
+	7950 5450 8000 5450
+Connection ~ 9400 5450
+Connection ~ 6650 5650
 Wire Wire Line
-	7850 5650 7900 5650
+	6650 5650 6700 5650
 Wire Wire Line
-	7900 5850 7400 5850
-Connection ~ 10250 3050
-Connection ~ 9850 3050
+	6700 5850 6200 5850
+Connection ~ 9050 3050
+Connection ~ 8650 3050
 Wire Wire Line
-	8500 4950 8500 5050
+	7300 4950 7300 5050
 Wire Wire Line
-	7850 4400 7850 4700
+	6650 4400 6650 4700
 Wire Wire Line
-	7850 5000 7850 5050
+	6650 5000 6650 5050
 Wire Wire Line
-	9150 4450 9100 4450
+	7950 4450 7900 4450
 Wire Wire Line
-	9150 4250 9150 4450
+	7950 4250 7950 4450
 Wire Wire Line
-	9500 4250 10950 4250
+	8300 4250 10100 4250
 Wire Wire Line
-	9850 4250 9850 4300
+	8650 4250 8650 4300
 Wire Wire Line
-	9550 4300 9550 4250
+	8350 4300 8350 4250
 Wire Wire Line
-	9550 4600 9550 4650
+	8350 4600 8350 4650
 Wire Wire Line
-	9850 4650 9850 4600
+	8650 4650 8650 4600
 Wire Wire Line
-	9100 4650 9900 4650
+	7900 4650 8700 4650
 Wire Wire Line
-	10250 4600 10250 4750
+	9050 4600 9050 4750
 Wire Wire Line
-	10600 4650 10600 4600
+	9400 4650 9400 4600
 Wire Wire Line
-	10200 4650 10950 4650
-Connection ~ 10250 4650
+	9000 4650 10100 4650
+Connection ~ 9050 4650
 Wire Wire Line
-	10250 4250 10250 4300
+	9050 4250 9050 4300
 Wire Wire Line
-	10600 4200 10600 4300
-Connection ~ 10250 4250
-Connection ~ 9850 4650
-Connection ~ 9550 4650
-Connection ~ 9850 4250
-Connection ~ 9550 4250
+	9400 4200 9400 4300
+Connection ~ 9050 4250
+Connection ~ 8650 4650
+Connection ~ 8350 4650
+Connection ~ 8650 4250
+Connection ~ 8350 4250
 Wire Wire Line
-	9150 4250 9200 4250
-Connection ~ 10600 4250
-Connection ~ 7850 4450
+	7950 4250 8000 4250
+Connection ~ 9400 4250
+Connection ~ 6650 4450
 Wire Wire Line
-	7850 4450 7900 4450
+	6650 4450 6700 4450
 Wire Wire Line
-	7900 4650 7400 4650
+	6700 4650 6200 4650
 Wire Wire Line
-	4150 4450 4150 4300
+	4400 4500 4400 4350
 Wire Wire Line
-	4150 4750 4150 5350
+	4400 4800 4400 5400
 Wire Wire Line
-	3800 4850 4700 4850
+	4050 4900 4950 4900
 Wire Wire Line
 	3800 1000 4100 1000
 Wire Wire Line
@ -1524,96 +1511,89 @@ Wire Wire Line
 Wire Wire Line
 	4300 1000 4300 1100
 Wire Wire Line
-	2100 3950 2100 4050
-Wire Wire Line
-	2500 3350 2600 3350
+	2050 4000 2050 4100
 Wire Wire Line
-	2500 3450 2600 3450
+	2450 3400 2550 3400
 Wire Wire Line
-	1050 3700 1050 3750
+	2450 3500 2550 3500
 Wire Wire Line
-	1050 3400 1050 3350
+	1000 3750 1000 3800
 Wire Wire Line
-	2500 3750 2800 3750
+	1000 3450 1000 3400
 Wire Wire Line
-	2800 3750 2800 3800
+	2450 3800 2750 3800
 Wire Wire Line
-	2800 4100 2800 4150
+	2750 3800 2750 3850
 Wire Wire Line
-	1050 3350 1700 3350
+	2750 4150 2750 4200
 Wire Wire Line
-	1050 3750 1700 3750
+	1000 3400 1650 3400
 Wire Wire Line
-	2100 3150 2100 3050
+	1000 3800 1650 3800
 Wire Wire Line
-	4150 3800 4150 4000
+	2050 3200 2050 3100
 Wire Wire Line
-	4150 3300 4150 3500
-Connection ~ 4150 3900
-Connection ~ 4150 3400
-Connection ~ 4150 4850
+	4400 3850 4400 4050
 Wire Wire Line
-	4150 5650 4150 6100
+	4400 3350 4400 3550
+Connection ~ 4400 3950
+Connection ~ 4400 3450
+Connection ~ 4400 4900
 Wire Wire Line
-	4700 4450 4700 4300
+	4400 5700 4400 6150
 Wire Wire Line
-	4700 3900 4700 4000
+	4950 4500 4950 4350
 Wire Wire Line
-	2500 3650 3050 3650
+	4950 3950 4950 4050
 Wire Wire Line
-	3550 6000 3550 5900
+	2450 3700 3350 3700
 Wire Wire Line
-	4700 4850 4700 4750
+	3800 6050 3800 5950
 Wire Wire Line
-	3950 4850 3950 4950
+	4950 4900 4950 4800
 Wire Wire Line
-	3950 6000 3950 5700
+	4200 4900 4200 5000
 Wire Wire Line
-	3100 5500 3650 5500
+	4200 6050 4200 5750
 Wire Wire Line
-	2550 5500 2800 5500
-Connection ~ 3550 5500
-Connection ~ 3250 5500
+	3350 5550 3900 5550
 Wire Wire Line
-	3250 5900 3250 6000
+	2800 5550 3050 5550
+Connection ~ 3800 5550
+Connection ~ 3500 5550
 Wire Wire Line
-	2700 6000 4150 6000
-Connection ~ 3550 6000
-Connection ~ 4150 6000
-Connection ~ 3950 6000
+	3500 5950 3500 6050
 Wire Wire Line
-	3350 3650 3600 3650
+	2950 6050 4400 6050
+Connection ~ 3800 6050
+Connection ~ 4400 6050
+Connection ~ 4200 6050
 Wire Wire Line
-	3950 5300 3950 5250
-Connection ~ 2700 5500
+	3650 3700 3850 3700
 Wire Wire Line
-	2700 5900 2700 6000
-Connection ~ 3250 6000
-Connection ~ 3950 4850
+	4200 5350 4200 5300
+Connection ~ 2950 5550
 Wire Wire Line
-	2700 4850 3500 4850
+	2950 5950 2950 6050
+Connection ~ 3500 6050
+Connection ~ 4200 4900
 Wire Wire Line
-	3900 3450 3900 3400
+	2950 4900 3750 4900
 Wire Wire Line
-	3900 3400 4150 3400
+	4150 3500 4150 3450
 Wire Wire Line
-	3900 3850 3900 4000
+	4150 3450 4400 3450
 Wire Wire Line
-	4150 3900 3900 3900
-Connection ~ 3900 3900
+	4150 3900 4150 4050
 Wire Wire Line
-	2700 5500 2700 5600
+	4400 3950 4150 3950
+Connection ~ 4150 3950
 Wire Wire Line
-	3250 5450 3250 5600
+	2950 5550 2950 5650
 Wire Wire Line
-	3550 5500 3550 5600
+	3500 5500 3500 5650
 Wire Wire Line
-	1150 6850 700  6850
-Wire Wire Line
-	1500 6800 1500 6900
-Wire Wire Line
-	1450 6850 1550 6850
-Connection ~ 1500 6850
+	3800 5550 3800 5650
 Wire Wire Line
 	6550 1000 7450 1000
 Wire Wire Line
@ -1634,81 +1614,158 @@ F 3 "" H 4850 2700 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR058
+L +3V3 #PWR057
 U 1 1 591C4E6A
-P 2100 3050
-F 0 "#PWR058" H 2100 2900 50  0001 C CNN
-F 1 "+3V3" 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
-	1    2100 3050
+P 2050 3100
+F 0 "#PWR057" H 2050 2950 50  0001 C CNN
+F 1 "+3V3" H 2050 3240 50  0000 C CNN
+F 2 "" H 2050 3100 50  0000 C CNN
+F 3 "" H 2050 3100 50  0000 C CNN
+	1    2050 3100
 	1    0    0    -1  
 $EndComp
 Text Notes 1400 2850 0    60   ~ 0
-RTC can also be powered from 2.5V\nbut it is simpler to route 3.3V
-Text GLabel 2350 4850 0    60   Input ~ 0
+RTC can also be powered from 2.5V\nbut it is easier to route 3.3V
+Text GLabel 2600 4900 0    60   Input ~ 0
 FTDI_nSLEEP
 $Comp
 L R R10
 U 1 1 591E4865
-P 2550 4850
-F 0 "R10" V 2630 4850 50  0000 C CNN
-F 1 "220" V 2550 4850 50  0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 2480 4850 50  0001 C CNN
-F 3 "" H 2550 4850 50  0000 C CNN
-	1    2550 4850
+P 2800 4900
+F 0 "R10" V 2880 4900 50  0000 C CNN
+F 1 "220" V 2800 4900 50  0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 2730 4900 50  0001 C CNN
+F 3 "" H 2800 4900 50  0000 C CNN
+	1    2800 4900
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	2350 4850 2400 4850
-Text Label 2750 4850 0    60   ~ 0
+	2600 4900 2650 4900
+Text Label 3000 4900 0    60   ~ 0
 FTDI_nSUSPEND
 $Comp
 L C C17
 U 1 1 592462C1
-P 10950 3250
-F 0 "C17" H 10975 3350 50  0000 L CNN
-F 1 "2.2uF" H 10975 3150 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10988 3100 50  0001 C CNN
-F 3 "" H 10950 3250 50  0000 C CNN
-	1    10950 3250
+P 10100 3250
+F 0 "C17" H 10125 3350 50  0000 L CNN
+F 1 "2.2uF" H 10125 3150 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10138 3100 50  0001 C CNN
+F 3 "" H 10100 3250 50  0000 C CNN
+	1    10100 3250
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C19
 U 1 1 59246A2A
-P 10950 4450
-F 0 "C19" H 10975 4550 50  0000 L CNN
-F 1 "2.2uF" H 10975 4350 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10988 4300 50  0001 C CNN
-F 3 "" H 10950 4450 50  0000 C CNN
-	1    10950 4450
+P 10100 4450
+F 0 "C19" H 10125 4550 50  0000 L CNN
+F 1 "2.2uF" H 10125 4350 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10138 4300 50  0001 C CNN
+F 3 "" H 10100 4450 50  0000 C CNN
+	1    10100 4450
 	1    0    0    -1  
 $EndComp
 $Comp
 L C C20
 U 1 1 59246E14
-P 10950 5650
-F 0 "C20" H 10975 5750 50  0000 L CNN
-F 1 "2.2uF" H 10975 5550 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10988 5500 50  0001 C CNN
-F 3 "" H 10950 5650 50  0000 C CNN
-	1    10950 5650
+P 10100 5650
+F 0 "C20" H 10125 5750 50  0000 L CNN
+F 1 "2.2uF" H 10125 5550 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10138 5500 50  0001 C CNN
+F 3 "" H 10100 5650 50  0000 C CNN
+	1    10100 5650
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9750 3050 9750 3100
+Wire Wire Line
+	9750 3450 9750 3400
+Connection ~ 9400 3450
+Wire Wire Line
+	9750 4250 9750 4300
+Wire Wire Line
+	9750 4650 9750 4600
+Connection ~ 9400 4650
+Wire Wire Line
+	9750 5450 9750 5500
+Wire Wire Line
+	9750 5850 9750 5800
+Connection ~ 9400 5850
+Connection ~ 3000 4100
+Connection ~ 3000 4350
+Wire Wire Line
+	3000 4100 3100 4100
+Wire Wire Line
+	3000 4350 3100 4350
+Wire Wire Line
+	3000 3700 3000 3750
+Connection ~ 3000 3700
+$Comp
+L GND #PWR058
+U 1 1 59D5B51B
+P 2750 4200
+F 0 "#PWR058" H 2750 3950 50  0001 C CNN
+F 1 "GND" H 2750 4050 50  0000 C CNN
+F 2 "" H 2750 4200 50  0000 C CNN
+F 3 "" H 2750 4200 50  0000 C CNN
+	1    2750 4200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3000 4550 2500 4550
+Wire Wire Line
+	3000 4050 3000 4550
+Text Label 2550 4550 0    60   ~ 0
+PWRBTn
+$Comp
+L C C22
+U 1 1 59D56B84
+P 9750 3250
+F 0 "C22" H 9775 3350 50  0000 L CNN
+F 1 "2.2uF" H 9775 3150 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9788 3100 50  0001 C CNN
+F 3 "" H 9750 3250 50  0000 C CNN
+	1    9750 3250
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C23
+U 1 1 59D56D50
+P 9750 4450
+F 0 "C23" H 9775 4550 50  0000 L CNN
+F 1 "2.2uF" H 9775 4350 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9788 4300 50  0001 C CNN
+F 3 "" H 9750 4450 50  0000 C CNN
+	1    9750 4450
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C24
+U 1 1 59D56EAA
+P 9750 5650
+F 0 "C24" H 9775 5750 50  0000 L CNN
+F 1 "2.2uF" H 9775 5550 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 9788 5500 50  0001 C CNN
+F 3 "" H 9750 5650 50  0000 C CNN
+	1    9750 5650
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	10950 3050 10950 3100
+	10100 3050 10100 3100
+Connection ~ 9750 3050
 Wire Wire Line
-	10950 3450 10950 3400
-Connection ~ 10600 3450
+	10100 3450 10100 3400
+Connection ~ 9750 3450
 Wire Wire Line
-	10950 4250 10950 4300
+	10100 5450 10100 5500
+Connection ~ 9750 5450
 Wire Wire Line
-	10950 4650 10950 4600
-Connection ~ 10600 4650
+	10100 5850 10100 5800
+Connection ~ 9750 5850
 Wire Wire Line
-	10950 5450 10950 5500
+	10100 4250 10100 4300
+Connection ~ 9750 4250
 Wire Wire Line
-	10950 5850 10950 5800
-Connection ~ 10600 5850
+	10100 4650 10100 4600
+Connection ~ 9750 4650
 $EndSCHEMATC
--- a/ram.bak
+++ b/ram.bak
@ -86,10 +86,10 @@ Wire Wire Line
 	5250 2000 5250 2200
 Connection ~ 5250 2100
 $Comp
-L +3V3 #PWR099
+L +3V3 #PWR99
 U 1 1 58D928FF
 P 5250 2000
-F 0 "#PWR099" H 5250 1850 50  0001 C CNN
+F 0 "#PWR99" 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
@ -97,10 +97,10 @@ F 3 "" H 5250 2000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0100
+L +3V3 #PWR103
 U 1 1 58D92915
 P 5550 2000
-F 0 "#PWR0100" H 5550 1850 50  0001 C CNN
+F 0 "#PWR103" 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
@ -129,10 +129,10 @@ Wire Wire Line
 	5650 4800 5650 4900
 Connection ~ 5650 4900
 $Comp
-L GND #PWR0101
+L GND #PWR100
 U 1 1 58D929C8
 P 5250 5000
-F 0 "#PWR0101" H 5250 4750 50  0001 C CNN
+F 0 "#PWR100" 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
@ -140,10 +140,10 @@ F 3 "" H 5250 5000 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0102
+L GND #PWR104
 U 1 1 58D929DE
 P 5550 5000
-F 0 "#PWR0102" H 5550 4750 50  0001 C CNN
+F 0 "#PWR104" 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
@ -368,10 +368,10 @@ F 3 "" H 5350 5900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0103
+L GND #PWR102
 U 1 1 59131FCA
 P 5350 6050
-F 0 "#PWR0103" H 5350 5800 50  0001 C CNN
+F 0 "#PWR102" H 5350 5800 50  0001 C CNN
 F 1 "GND" H 5350 5900 50  0000 C CNN
 F 2 "" H 5350 6050 50  0000 C CNN
 F 3 "" H 5350 6050 50  0000 C CNN
@ -379,10 +379,10 @@ F 3 "" H 5350 6050 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0104
+L +3V3 #PWR101
 U 1 1 59132092
 P 5350 5750
-F 0 "#PWR0104" H 5350 5600 50  0001 C CNN
+F 0 "#PWR101" H 5350 5600 50  0001 C CNN
 F 1 "+3V3" H 5350 5890 50  0000 C CNN
 F 2 "" H 5350 5750 50  0000 C CNN
 F 3 "" H 5350 5750 50  0000 C CNN
--- a/sdcard.bak
+++ b/sdcard.bak
@ -54,10 +54,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR0113
+L GND #PWR115
 U 1 1 58DA7C6F
 P 3550 3650
-F 0 "#PWR0113" H 3550 3400 50  0001 C CNN
+F 0 "#PWR115" H 3550 3400 50  0001 C CNN
 F 1 "GND" H 3550 3500 50  0000 C CNN
 F 2 "" H 3550 3650 50  0000 C CNN
 F 3 "" H 3550 3650 50  0000 C CNN
@ -65,10 +65,10 @@ F 3 "" H 3550 3650 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR0114
+L GND #PWR116
 U 1 1 58DA7C71
 P 5800 3950
-F 0 "#PWR0114" H 5800 3700 50  0001 C CNN
+F 0 "#PWR116" H 5800 3700 50  0001 C CNN
 F 1 "GND" H 5800 3800 50  0000 C CNN
 F 2 "" H 5800 3950 50  0000 C CNN
 F 3 "" H 5800 3950 50  0000 C CNN
@ -76,10 +76,10 @@ F 3 "" H 5800 3950 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR0115
+L +3V3 #PWR113
 U 1 1 58DA7C72
 P 3150 2950
-F 0 "#PWR0115" H 3150 2800 50  0001 C CNN
+F 0 "#PWR113" H 3150 2800 50  0001 C CNN
 F 1 "+3V3" H 3150 3090 50  0000 C CNN
 F 2 "" H 3150 2950 50  0000 C CNN
 F 3 "" H 3150 2950 50  0000 C CNN
@ -112,10 +112,10 @@ F 3 "" H 3150 3100 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR0116
+L GND #PWR114
 U 1 1 590C5E90
 P 3150 3650
-F 0 "#PWR0116" H 3150 3400 50  0001 C CNN
+F 0 "#PWR114" H 3150 3400 50  0001 C CNN
 F 1 "GND" H 3150 3500 50  0000 C CNN
 F 2 "" H 3150 3650 50  0000 C CNN
 F 3 "" H 3150 3650 50  0000 C CNN
--- a/ulx3s.bak
+++ b/ulx3s.bak
@ -160,10 +160,10 @@ F 3 "" H 3150 5600 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR01
+L GND #PWR2
 U 1 1 58E6BC0E
 P 3150 6550
-F 0 "#PWR01" H 3150 6300 50  0001 C CNN
+F 0 "#PWR2" H 3150 6300 50  0001 C CNN
 F 1 "GND" H 3150 6400 50  0000 C CNN
 F 2 "" H 3150 6550 50  0000 C CNN
 F 3 "" H 3150 6550 50  0000 C CNN
@ -171,10 +171,10 @@ F 3 "" H 3150 6550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR02
+L GND #PWR4
 U 1 1 58E6BC2E
 P 4250 6550
-F 0 "#PWR02" H 4250 6300 50  0001 C CNN
+F 0 "#PWR4" H 4250 6300 50  0001 C CNN
 F 1 "GND" H 4250 6400 50  0000 C CNN
 F 2 "" H 4250 6550 50  0000 C CNN
 F 3 "" H 4250 6550 50  0000 C CNN
@ -182,10 +182,10 @@ F 3 "" H 4250 6550 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR03
+L GND #PWR3
 U 1 1 58E6BC56
 P 4250 5850
-F 0 "#PWR03" H 4250 5600 50  0001 C CNN
+F 0 "#PWR3" H 4250 5600 50  0001 C CNN
 F 1 "GND" H 4250 5700 50  0000 C CNN
 F 2 "" H 4250 5850 50  0000 C CNN
 F 3 "" H 4250 5850 50  0000 C CNN
@ -193,10 +193,10 @@ F 3 "" H 4250 5850 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR04
+L GND #PWR1
 U 1 1 58E6BC72
 P 3150 5800
-F 0 "#PWR04" H 3150 5550 50  0001 C CNN
+F 0 "#PWR1" H 3150 5550 50  0001 C CNN
 F 1 "GND" H 3150 5650 50  0000 C CNN
 F 2 "" H 3150 5800 50  0000 C CNN
 F 3 "" H 3150 5800 50  0000 C CNN
--- a/ulx3s.kicad_pcb
+++ b/ulx3s.kicad_pcb
--- a/ulx3s.kicad_pcb-bak
+++ b/ulx3s.kicad_pcb-bak
--- a/usb.bak
+++ b/usb.bak
@ -65,10 +65,10 @@ F 3 "" V 2300 1700 60  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L +5V #PWR079
+L +5V #PWR85
 U 1 1 58D6C83B
 P 3050 1700
-F 0 "#PWR079" H 3050 1550 50  0001 C CNN
+F 0 "#PWR85" H 3050 1550 50  0001 C CNN
 F 1 "+5V" H 3050 1840 50  0000 C CNN
 F 2 "" H 3050 1700 60  0000 C CNN
 F 3 "" H 3050 1700 60  0000 C CNN
@ -87,10 +87,10 @@ F 3 "" V 2600 2650 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR080
+L +5V #PWR86
 U 1 1 58D6C83D
 P 3200 2650
-F 0 "#PWR080" H 3200 2500 50  0001 C CNN
+F 0 "#PWR86" H 3200 2500 50  0001 C CNN
 F 1 "+5V" H 3200 2790 50  0000 C CNN
 F 2 "" H 3200 2650 60  0000 C CNN
 F 3 "" H 3200 2650 60  0000 C CNN
@ -124,10 +124,10 @@ F 3 "" V 1450 2750 50  0000 C CNN
 	0    -1   1    0   
 $EndComp
 $Comp
-L GND #PWR081
+L GND #PWR81
 U 1 1 58D6C842
 P 1850 2100
-F 0 "#PWR081" H 1850 1850 50  0001 C CNN
+F 0 "#PWR81" H 1850 1850 50  0001 C CNN
 F 1 "GND" H 1850 1950 50  0000 C CNN
 F 2 "" H 1850 2100 50  0000 C CNN
 F 3 "" H 1850 2100 50  0000 C CNN
@ -135,10 +135,10 @@ F 3 "" H 1850 2100 50  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR082
+L GND #PWR82
 U 1 1 58D6C843
 P 1850 3050
-F 0 "#PWR082" H 1850 2800 50  0001 C CNN
+F 0 "#PWR82" H 1850 2800 50  0001 C CNN
 F 1 "GND" H 1850 2900 50  0000 C CNN
 F 2 "" H 1850 3050 50  0000 C CNN
 F 3 "" H 1850 3050 50  0000 C CNN
@ -156,10 +156,10 @@ USB_FPGA_D+
 NoConn ~ 1850 2950
 NoConn ~ 1850 2000
 $Comp
-L GND #PWR083
+L GND #PWR79
 U 1 1 58D82518
 P 1400 2300
-F 0 "#PWR083" H 1400 2050 50  0001 C CNN
+F 0 "#PWR79" 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
@ -167,10 +167,10 @@ F 3 "" H 1400 2300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR084
+L GND #PWR80
 U 1 1 58D8254A
 P 1400 3250
-F 0 "#PWR084" H 1400 3000 50  0001 C CNN
+F 0 "#PWR80" 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
@ -178,10 +178,10 @@ F 3 "" H 1400 3250 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR085
+L GND #PWR88
 U 1 1 58D8877C
 P 5600 4500
-F 0 "#PWR085" H 5600 4250 50  0001 C CNN
+F 0 "#PWR88" H 5600 4250 50  0001 C CNN
 F 1 "GND" H 5600 4350 50  0000 C CNN
 F 2 "" H 5600 4500 50  0000 C CNN
 F 3 "" H 5600 4500 50  0000 C CNN
@ -243,10 +243,10 @@ F 3 "" H 5700 3400 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR086
+L +5V #PWR87
 U 1 1 58EB8213
 P 5600 2500
-F 0 "#PWR086" H 5600 2350 50  0001 C CNN
+F 0 "#PWR87" H 5600 2350 50  0001 C CNN
 F 1 "+5V" H 5600 2640 50  0000 C CNN
 F 2 "" H 5600 2500 50  0000 C CNN
 F 3 "" H 5600 2500 50  0000 C CNN
@ -443,10 +443,10 @@ F 3 "" H 2200 2450 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L +3V3 #PWR087
+L +3V3 #PWR83
 U 1 1 591C6DA4
 P 2200 2300
-F 0 "#PWR087" H 2200 2150 50  0001 C CNN
+F 0 "#PWR83" H 2200 2150 50  0001 C CNN
 F 1 "+3V3" H 2200 2440 50  0000 C CNN
 F 2 "" H 2200 2300 50  0000 C CNN
 F 3 "" H 2200 2300 50  0000 C CNN
@ -477,10 +477,10 @@ JTAG_TCK
 Text GLabel 9150 5100 0    60   Input ~ 0
 JTAG_TMS
 $Comp
-L GND #PWR088
+L GND #PWR89
 U 1 1 591E1000
 P 8700 4900
-F 0 "#PWR088" H 8700 4650 50  0001 C CNN
+F 0 "#PWR89" H 8700 4650 50  0001 C CNN
 F 1 "GND" H 8700 4750 50  0000 C CNN
 F 2 "" H 8700 4900 50  0000 C CNN
 F 3 "" H 8700 4900 50  0000 C CNN
@ -488,10 +488,10 @@ F 3 "" H 8700 4900 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR089
+L +3V3 #PWR90
 U 1 1 591E1028
 P 10100 4900
-F 0 "#PWR089" H 10100 4750 50  0001 C CNN
+F 0 "#PWR90" H 10100 4750 50  0001 C CNN
 F 1 "+3V3" H 10100 5040 50  0000 C CNN
 F 2 "" H 10100 4900 50  0000 C CNN
 F 3 "" H 10100 4900 50  0000 C CNN
@ -593,10 +593,10 @@ Wire Wire Line
 Wire Wire Line
 	2300 3200 2300 3100
 $Comp
-L GND #PWR090
+L GND #PWR84
 U 1 1 59C1372A
 P 2250 3250
-F 0 "#PWR090" H 2250 3000 50  0001 C CNN
+F 0 "#PWR84" H 2250 3000 50  0001 C CNN
 F 1 "GND" H 2250 3100 50  0000 C CNN
 F 2 "" H 2250 3250 50  0001 C CNN
 F 3 "" H 2250 3250 50  0001 C CNN
--- a/wifi.bak
+++ b/wifi.bak
@ -91,10 +91,10 @@ F 3 "" H 6400 5250 60  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR091
+L GND #PWR96
 U 1 1 58E56E8D
 P 5500 4100
-F 0 "#PWR091" H 5500 3850 50  0001 C CNN
+F 0 "#PWR96" H 5500 3850 50  0001 C CNN
 F 1 "GND" H 5500 3950 50  0000 C CNN
 F 2 "" H 5500 4100 50  0000 C CNN
 F 3 "" H 5500 4100 50  0000 C CNN
@ -102,10 +102,10 @@ F 3 "" H 5500 4100 50  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L +3V3 #PWR092
+L +3V3 #PWR95
 U 1 1 58E56EA3
 P 5350 4200
-F 0 "#PWR092" H 5350 4050 50  0001 C CNN
+F 0 "#PWR95" H 5350 4050 50  0001 C CNN
 F 1 "+3V3" H 5350 4340 50  0000 C CNN
 F 2 "" H 5350 4200 50  0000 C CNN
 F 3 "" H 5350 4200 50  0000 C CNN
@ -119,10 +119,10 @@ Wire Wire Line
 Text GLabel 5900 4300 0    60   Input ~ 0
 WIFI_EN
 $Comp
-L +3V3 #PWR093
+L +3V3 #PWR93
 U 1 1 58ED6C57
 P 4600 4300
-F 0 "#PWR093" H 4600 4150 50  0001 C CNN
+F 0 "#PWR93" H 4600 4150 50  0001 C CNN
 F 1 "+3V3" H 4600 4440 50  0000 C CNN
 F 2 "" H 4600 4300 50  0000 C CNN
 F 3 "" H 4600 4300 50  0000 C CNN
@ -148,10 +148,10 @@ Wire Wire Line
 	4600 4650 4750 4650
 Connection ~ 4600 4650
 $Comp
-L GND #PWR094
+L GND #PWR94
 U 1 1 58EE2982
 P 4600 5500
-F 0 "#PWR094" H 4600 5250 50  0001 C CNN
+F 0 "#PWR94" H 4600 5250 50  0001 C CNN
 F 1 "GND" H 4600 5350 50  0000 C CNN
 F 2 "" H 4600 5500 50  0000 C CNN
 F 3 "" H 4600 5500 50  0000 C CNN
@ -194,10 +194,10 @@ F 3 "" H 3850 4450 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +3V3 #PWR095
+L +3V3 #PWR91
 U 1 1 5924A1EA
 P 3850 4300
-F 0 "#PWR095" H 3850 4150 50  0001 C CNN
+F 0 "#PWR91" H 3850 4150 50  0001 C CNN
 F 1 "+3V3" H 3850 4440 50  0000 C CNN
 F 2 "" H 3850 4300 50  0000 C CNN
 F 3 "" H 3850 4300 50  0000 C CNN
@ -205,10 +205,10 @@ F 3 "" H 3850 4300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR096
+L GND #PWR92
 U 1 1 5924A206
 P 3850 4600
-F 0 "#PWR096" H 3850 4350 50  0001 C CNN
+F 0 "#PWR92" H 3850 4350 50  0001 C CNN
 F 1 "GND" H 3850 4450 50  0000 C CNN
 F 2 "" H 3850 4600 50  0000 C CNN
 F 3 "" H 3850 4600 50  0000 C CNN
@ -257,10 +257,10 @@ WIFI GPIO15 (HSPI_SS)\nconnected to \nBANK6 on "usb" sheet
 Text GLabel 7750 5250 2    60   Input ~ 0
 WIFI_GPIO16
 $Comp
-L GND #PWR097
+L GND #PWR98
 U 1 1 59C1BF96
 P 7850 4150
-F 0 "#PWR097" H 7850 3900 50  0001 C CNN
+F 0 "#PWR98" H 7850 3900 50  0001 C CNN
 F 1 "GND" H 7850 4000 50  0000 C CNN
 F 2 "" H 7850 4150 50  0001 C CNN
 F 3 "" H 7850 4150 50  0001 C CNN
@ -270,10 +270,10 @@ $EndComp
 Wire Wire Line
 	7750 4150 7850 4150
 $Comp
-L GND #PWR098
+L GND #PWR97
 U 1 1 59C1BFCC
 P 7850 4050
-F 0 "#PWR098" H 7850 3800 50  0001 C CNN
+F 0 "#PWR97" H 7850 3800 50  0001 C CNN
 F 1 "GND" H 7850 3900 50  0000 C CNN
 F 2 "" H 7850 4050 50  0001 C CNN
 F 3 "" H 7850 4050 50  0001 C CNN