fix some power issues

Electronics/EggbotWireless/EggbotWireless-cache.lib

@@ -302,38 +302,6 @@ X C 3 100 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Device_Q_PMOS_GDS
-#
-DEF Device_Q_PMOS_GDS Q 0 0 Y N 1 F N
-F0 "Q" 200 50 50 H V L CNN
-F1 "Device_Q_PMOS_GDS" 200 -50 50 H V L CNN
-F2 "" 200 100 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-DRAW
-C 65 0 111 0 1 10 N
-C 100 -70 11 0 1 0 F
-C 100 70 11 0 1 0 F
-P 2 0 1 0 2 0 10 0 N
-P 2 0 1 0 30 -70 100 -70 N
-P 2 0 1 10 30 -50 30 -90 N
-P 2 0 1 0 30 0 100 0 N
-P 2 0 1 10 30 20 30 -20 N
-P 2 0 1 0 30 70 100 70 N
-P 2 0 1 10 30 90 30 50 N
-P 2 0 1 0 100 -70 100 -100 N
-P 2 0 1 0 100 -70 100 0 N
-P 2 0 1 0 100 100 100 70 N
-P 3 0 1 10 10 75 10 -75 10 -75 N
-P 4 0 1 0 90 0 50 -15 50 15 90 0 F
-P 4 0 1 0 100 -70 130 -70 130 70 100 70 N
-P 4 0 1 0 110 -20 115 -15 145 -15 150 -10 N
-P 4 0 1 0 130 -15 115 10 145 10 130 -15 N
-X G 1 -200 0 200 R 50 50 1 1 I
-X D 2 100 200 100 D 50 50 1 1 P
-X S 3 100 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # Device_R
 #
 DEF Device_R R 0 0 N Y 1 F N
@@ -605,21 +573,22 @@ X DCR 9 800 200 150 L 50 50 1 1 I L
 ENDDRAW
 ENDDEF
 #
-# Jumper_SolderJumper_2_Open
+# Jumper_SolderJumper_2_Bridged
 #
-DEF Jumper_SolderJumper_2_Open JP 0 0 Y N 1 F N
+DEF Jumper_SolderJumper_2_Bridged JP 0 0 Y N 1 F N
 F0 "JP" 0 80 50 H V C CNN
-F1 "Jumper_SolderJumper_2_Open" 0 -100 50 H V C CNN
+F1 "Jumper_SolderJumper_2_Bridged" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- SolderJumper*Open*
+ SolderJumper*Bridged*
 $ENDFPLIST
 DRAW
 A -10 0 40 901 -901 0 1 0 N -10 40 -10 -40
 A -10 0 40 901 -901 0 1 0 F -10 40 -10 -40
 A 10 0 40 -899 899 0 1 0 N 10 -40 10 40
 A 10 0 40 -899 899 0 1 0 F 10 -40 10 40
+S -20 20 20 -20 0 1 0 F
 P 2 0 1 0 -10 40 -10 -40 N
 P 2 0 1 0 10 40 10 -40 N
 X A 1 -150 0 100 R 50 50 1 1 P

Electronics/EggbotWireless/EggbotWireless.bak

@@ -111,7 +111,7 @@ L Device:D_Schottky D1
 U 1 1 5D005B12
 P 9950 4450
 F 0 "D1" H 9950 4234 50  0000 C CNN
-F 1 "SK24" H 9950 4325 50  0000 C CNN
+F 1 "SSB43L" H 9950 4325 50  0000 C CNN
 F 2 "Diode_SMD:D_SMB_Handsoldering" H 9950 4450 50  0001 C CNN
 F 3 "~" H 9950 4450 50  0001 C CNN
 	1    9950 4450
@@ -373,8 +373,6 @@ $EndComp
 Connection ~ 9050 4450
 Wire Wire Line
 	9050 4450 9300 4450
-Wire Wire Line
-	9050 3850 9300 3850
 Wire Wire Line
 	9600 4450 9700 4450
 Wire Wire Line
@@ -389,7 +387,7 @@ L Device:R R15
 U 1 1 5CEF81B9
 P 9700 5350
 F 0 "R15" H 9770 5396 50  0000 L CNN
-F 1 "0.006" H 9770 5305 50  0000 L CNN
+F 1 "0.008" H 9770 5305 50  0000 L CNN
 F 2 "Resistor_SMD:R_1206_3216Metric_Pad1.42x1.75mm_HandSolder" V 9630 5350 50  0001 C CNN
 F 3 "~" H 9700 5350 50  0001 C CNN
 	1    9700 5350
@@ -501,7 +499,7 @@ L Device:R R16
 U 1 1 5CF6C873
 P 10200 5400
 F 0 "R16" H 10270 5446 50  0000 L CNN
-F 1 "9.1K" H 10270 5355 50  0000 L CNN
+F 1 "8.45K" H 10270 5355 50  0000 L CNN
 F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 10130 5400 50  0001 C CNN
 F 3 "~" H 10200 5400 50  0001 C CNN
 	1    10200 5400
@@ -628,16 +626,15 @@ F 3 "~" H 9300 4000 50  0001 C CNN
 	1    9300 4000
 	1    0    0    -1  
 $EndComp
-Connection ~ 9300 3850
 $Comp
 L EggbotWireless-rescue:GND-power-Catfi-rescue #PWR0136
 U 1 1 5D0FBB70
-P 9300 4150
-F 0 "#PWR0136" H 9300 3900 50  0001 C CNN
-F 1 "GND" H 9305 3977 50  0000 C CNN
-F 2 "" H 9300 4150 50  0001 C CNN
-F 3 "" H 9300 4150 50  0001 C CNN
-	1    9300 4150
+P 9300 4200
+F 0 "#PWR0136" H 9300 3950 50  0001 C CNN
+F 1 "GND" H 9305 4027 50  0000 C CNN
+F 2 "" H 9300 4200 50  0001 C CNN
+F 3 "" H 9300 4200 50  0001 C CNN
+	1    9300 4200
 	1    0    0    -1  
 $EndComp
 Text GLabel 2900 6700 2    50   Input ~ 0
@@ -966,15 +963,10 @@ Wire Wire Line
 Connection ~ 4500 4150
 Wire Wire Line
 	4500 4150 4550 4150
-Wire Wire Line
-	4400 4350 4400 4250
 Wire Wire Line
 	4400 4250 4550 4250
-Wire Wire Line
-	4400 4350 4400 6100
 Wire Wire Line
 	4400 6100 4600 6100
-Connection ~ 4400 4350
 Wire Wire Line
 	4350 4550 4350 6200
 Wire Wire Line
@@ -997,7 +989,6 @@ Wire Wire Line
 	4450 4550 4450 4350
 Wire Wire Line
 	4450 4350 4550 4350
-Connection ~ 4350 4550
 $Comp
 L power:+3.3V #PWR0146
 U 1 1 5D2FA0EE
@@ -1013,45 +1004,10 @@ Wire Wire Line
 	4150 4150 4100 4150
 Wire Wire Line
 	4100 4150 4100 4350
-Connection ~ 4150 4150
 Wire Wire Line
 	4100 4350 4050 4350
 Wire Wire Line
 	4050 4350 4050 4550
-Connection ~ 4100 4350
-$Comp
-L Jumper:SolderJumper_2_Open JP3
-U 1 1 5D1FD66D
-P 4300 4150
-F 0 "JP3" H 4300 4250 50  0000 C CNN
-F 1 " " H 4300 4264 50  0000 C CNN
-F 2 "Jumper:SolderJumper-2_P1.3mm_Open_Pad1.0x1.5mm" H 4300 4150 50  0001 C CNN
-F 3 "~" H 4300 4150 50  0001 C CNN
-	1    4300 4150
-	1    0    0    -1  
-$EndComp
-$Comp
-L Jumper:SolderJumper_2_Open JP2
-U 1 1 5D2160D7
-P 4250 4350
-F 0 "JP2" H 4250 4450 50  0000 C CNN
-F 1 " " H 4250 4464 50  0000 C CNN
-F 2 "Jumper:SolderJumper-2_P1.3mm_Open_Pad1.0x1.5mm" H 4250 4350 50  0001 C CNN
-F 3 "~" H 4250 4350 50  0001 C CNN
-	1    4250 4350
-	1    0    0    -1  
-$EndComp
-$Comp
-L Jumper:SolderJumper_2_Open JP1
-U 1 1 5D2166DA
-P 4200 4550
-F 0 "JP1" H 4200 4650 50  0000 C CNN
-F 1 " " H 4200 4664 50  0000 C CNN
-F 2 "Jumper:SolderJumper-2_P1.3mm_Open_Pad1.0x1.5mm" H 4200 4550 50  0001 C CNN
-F 3 "~" H 4200 4550 50  0001 C CNN
-	1    4200 4550
-	1    0    0    -1  
-$EndComp
 $Comp
 L power:+3.3V #PWR0138
 U 1 1 5CEA2E4D
@@ -1186,8 +1142,6 @@ Wire Wire Line
 	2000 800  2050 800 
 Wire Wire Line
 	2050 800  2050 900 
-Wire Wire Line
-	9300 3850 9300 3800
 Wire Wire Line
 	2200 5700 2300 5700
 Connection ~ 2200 5700
@@ -1215,7 +1169,7 @@ L Device:Q_NMOS_GDS Q1
 U 1 1 5CEE2D00
 P 9600 4750
 F 0 "Q1" H 9806 4796 50  0000 L CNN
-F 1 "FDD8447L" H 9806 4705 50  0000 L CNN
+F 1 "FDD8800" H 9806 4705 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:TO-252-2" H 9800 4850 50  0001 C CNN
 F 3 "~" H 9600 4750 50  0001 C CNN
 	1    9600 4750
@@ -1650,13 +1604,10 @@ Wire Wire Line
 Connection ~ 7650 1000
 Wire Wire Line
 	7650 1000 7500 1000
-Connection ~ 7650 650 
 Text GLabel 9900 1100 0    50   Input ~ 0
 VBUS
 Wire Wire Line
 	9900 1100 9900 1950
-Wire Wire Line
-	10450 1400 10450 1950
 $Comp
 L EggbotWireless-rescue:GND-power-Catfi-rescue #PWR0123
 U 1 1 5D79742F
@@ -1681,7 +1632,7 @@ L EggbotWireless-rescue:R-Device-Catfi-rescue R6
 U 1 1 5D79743A
 P 10050 1300
 F 0 "R6" V 9843 1300 50  0000 C CNN
-F 1 "100K" V 9934 1300 50  0000 C CNN
+F 1 "10K" V 9934 1300 50  0000 C CNN
 F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 9980 1300 50  0001 C CNN
 F 3 "~" H 10050 1300 50  0001 C CNN
 	1    10050 1300
@@ -1692,7 +1643,7 @@ L Device:D_Schottky D2
 U 1 1 5D797446
 P 10150 1950
 F 0 "D2" H 10150 1734 50  0000 C CNN
-F 1 "SK84" H 10150 1825 50  0000 C CNN
+F 1 "SSB43L" H 10150 1825 50  0000 C CNN
 F 2 "Diode_SMD:D_SMB_Handsoldering" H 10150 1950 50  0001 C CNN
 F 3 "~" H 10150 1950 50  0001 C CNN
 	1    10150 1950
@@ -1701,46 +1652,29 @@ $EndComp
 $Comp
 L Switch:SW_SPDT SW1
 U 1 1 5CEB7C0D
-P 10650 1400
-F 0 "SW1" H 10650 1550 50  0000 C CNN
-F 1 " " H 10650 1594 50  0000 C CNN
-F 2 "Button_Switch_THT:SW_CuK_OS102011MA1QN1_SPDT_Angled" H 10650 1400 50  0001 C CNN
-F 3 "~" H 10650 1400 50  0001 C CNN
-	1    10650 1400
+P 10750 1400
+F 0 "SW1" H 10750 1550 50  0000 C CNN
+F 1 " " H 10750 1594 50  0000 C CNN
+F 2 "Button_Switch_THT:SW_CuK_OS102011MA1QN1_SPDT_Angled" H 10750 1400 50  0001 C CNN
+F 3 "~" H 10750 1400 50  0001 C CNN
+	1    10750 1400
 	1    0    0    -1  
 $EndComp
-Connection ~ 10450 1400
 $Comp
 L power:+5V #PWR0130
 U 1 1 5D7ABED4
-P 10850 1300
-F 0 "#PWR0130" H 10850 1150 50  0001 C CNN
-F 1 "+5V" H 10865 1473 50  0000 C CNN
-F 2 "" H 10850 1300 50  0001 C CNN
-F 3 "" H 10850 1300 50  0001 C CNN
-	1    10850 1300
+P 10950 1300
+F 0 "#PWR0130" H 10950 1150 50  0001 C CNN
+F 1 "+5V" H 10965 1473 50  0000 C CNN
+F 2 "" H 10950 1300 50  0001 C CNN
+F 3 "" H 10950 1300 50  0001 C CNN
+	1    10950 1300
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	7650 650  10350 650 
 Wire Wire Line
 	10350 650  10350 900 
-Wire Wire Line
-	10450 1950 10300 1950
 Wire Wire Line
 	10000 1950 9900 1950
-Connection ~ 10050 1100
-$Comp
-L Device:Q_PMOS_GDS Q3
-U 1 1 5D797440
-P 10250 1100
-F 0 "Q3" H 10456 1146 50  0000 L CNN
-F 1 "AOD403" H 10456 1055 50  0000 L CNN
-F 2 "Package_TO_SOT_SMD:TO-252-2" H 10450 1200 50  0001 C CNN
-F 3 "~" H 10250 1100 50  0001 C CNN
-	1    10250 1100
-	1    0    0    -1  
-$EndComp
 $Comp
 L DMG4800LSD:DMG4800LSD U4
 U 1 1 5DA22C7B
@@ -1780,17 +1714,6 @@ Text GLabel 8200 2500 2    50   Input ~ 0
 TXD_USB
 Text GLabel 8200 2900 2    50   Input ~ 0
 DTR_USB
-$Comp
-L EggbotWireless-rescue:R-Device-Catfi-rescue R20
-U 1 1 5D171129
-P 8300 6000
-F 0 "R20" V 8093 6000 50  0000 C CNN
-F 1 "100K" V 8184 6000 50  0000 C CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 8230 6000 50  0001 C CNN
-F 3 "~" H 8300 6000 50  0001 C CNN
-	1    8300 6000
-	-1   0    0    1   
-$EndComp
 Wire Wire Line
 	8200 5850 8300 5850
 Wire Wire Line
@@ -2067,7 +1990,7 @@ L EggbotWireless-rescue:R-Device-Catfi-rescue R22
 U 1 1 5D432E09
 P 5900 1800
 F 0 "R22" V 5693 1800 50  0000 C CNN
-F 1 "100K" V 5784 1800 50  0000 C CNN
+F 1 "10K" V 5784 1800 50  0000 C CNN
 F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 5830 1800 50  0001 C CNN
 F 3 "~" H 5900 1800 50  0001 C CNN
 	1    5900 1800
@@ -2100,4 +2023,112 @@ F 3 "" H 10550 4450 50  0001 C CNN
 $EndComp
 Text GLabel 2900 6500 2    50   Input ~ 0
 SLEEP
+$Comp
+L EggbotWireless-rescue:R-Device-Catfi-rescue R20
+U 1 1 5D171129
+P 8300 6000
+F 0 "R20" V 8093 6000 50  0000 C CNN
+F 1 "10K" V 8184 6000 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 8230 6000 50  0001 C CNN
+F 3 "~" H 8300 6000 50  0001 C CNN
+	1    8300 6000
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:D_Schottky D4
+U 1 1 5D32EDF7
+P 10200 650
+F 0 "D4" H 10200 434 50  0000 C CNN
+F 1 "SSB43L" H 10200 525 50  0000 C CNN
+F 2 "Diode_SMD:D_SMB_Handsoldering" H 10200 650 50  0001 C CNN
+F 3 "~" H 10200 650 50  0001 C CNN
+	1    10200 650 
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	10050 650  7650 650 
+Connection ~ 7650 650 
+Wire Wire Line
+	9300 4200 9300 4150
+Wire Wire Line
+	9300 3850 9300 3800
+Connection ~ 9300 3850
+Wire Wire Line
+	9050 3850 9300 3850
+$Comp
+L Device:C C17
+U 1 1 5D338D3C
+P 9700 4000
+F 0 "C17" H 9815 4046 50  0000 L CNN
+F 1 "10uF" H 9815 3955 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9738 3850 50  0001 C CNN
+F 3 "~" H 9700 4000 50  0001 C CNN
+	1    9700 4000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9300 3850 9700 3850
+Wire Wire Line
+	9700 4150 9300 4150
+Connection ~ 9300 4150
+$Comp
+L Transistor_FET:IRLML6402 Q3
+U 1 1 5D2DC610
+P 10250 1100
+F 0 "Q3" H 10456 1054 50  0000 L CNN
+F 1 "IRLML6402" H 10456 1145 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 10450 1025 50  0001 L CIN
+F 3 "https://www.infineon.com/dgdl/irlml6402pbf.pdf?fileId=5546d462533600a401535668d5c2263c" H 10250 1100 50  0001 L CNN
+	1    10250 1100
+	1    0    0    1   
+$EndComp
+Connection ~ 10050 1100
+Wire Wire Line
+	10300 1950 10450 1950
+Wire Wire Line
+	10450 1950 10450 1400
+Connection ~ 10450 1400
+Wire Wire Line
+	10450 1400 10550 1400
+$Comp
+L Jumper:SolderJumper_2_Bridged JP?
+U 1 1 5D3CD55E
+P 4300 4150
+F 0 "JP?" H 4300 4355 50  0000 C CNN
+F 1 "SolderJumper_2_Bridged" H 4300 4264 50  0000 C CNN
+F 2 "Jumper:SolderJumper-2_P1.3mm_Bridged_Pad1.0x1.5mm" H 4300 4150 50  0001 C CNN
+F 3 "~" H 4300 4150 50  0001 C CNN
+	1    4300 4150
+	1    0    0    -1  
+$EndComp
+$Comp
+L Jumper:SolderJumper_2_Bridged JP?
+U 1 1 5D3CED16
+P 4250 4350
+F 0 "JP?" H 4250 4555 50  0000 C CNN
+F 1 "SolderJumper_2_Bridged" H 4250 4464 50  0000 C CNN
+F 2 "Jumper:SolderJumper-2_P1.3mm_Bridged_Pad1.0x1.5mm" H 4250 4350 50  0001 C CNN
+F 3 "~" H 4250 4350 50  0001 C CNN
+	1    4250 4350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Jumper:SolderJumper_2_Bridged JP?
+U 1 1 5D3CF16C
+P 4200 4550
+F 0 "JP?" H 4200 4755 50  0000 C CNN
+F 1 "SolderJumper_2_Bridged" H 4200 4664 50  0000 C CNN
+F 2 "Jumper:SolderJumper-2_P1.3mm_Bridged_Pad1.0x1.5mm" H 4200 4550 50  0001 C CNN
+F 3 "~" H 4200 4550 50  0001 C CNN
+	1    4200 4550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4400 4250 4400 4350
+Connection ~ 4150 4150
+Connection ~ 4100 4350
+Connection ~ 4400 4350
+Wire Wire Line
+	4400 4350 4400 6100
+Connection ~ 4350 4550
 $EndSCHEMATC

Electronics/EggbotWireless/EggbotWireless.sch

@@ -111,7 +111,7 @@ L Device:D_Schottky D1
 U 1 1 5D005B12
 P 9950 4450
 F 0 "D1" H 9950 4234 50  0000 C CNN
-F 1 "SK24" H 9950 4325 50  0000 C CNN
+F 1 "SSB43L" H 9950 4325 50  0000 C CNN
 F 2 "Diode_SMD:D_SMB_Handsoldering" H 9950 4450 50  0001 C CNN
 F 3 "~" H 9950 4450 50  0001 C CNN
 	1    9950 4450
@@ -373,8 +373,6 @@ $EndComp
 Connection ~ 9050 4450
 Wire Wire Line
 	9050 4450 9300 4450
-Wire Wire Line
-	9050 3850 9300 3850
 Wire Wire Line
 	9600 4450 9700 4450
 Wire Wire Line
@@ -389,7 +387,7 @@ L Device:R R15
 U 1 1 5CEF81B9
 P 9700 5350
 F 0 "R15" H 9770 5396 50  0000 L CNN
-F 1 "0.006" H 9770 5305 50  0000 L CNN
+F 1 "0.008" H 9770 5305 50  0000 L CNN
 F 2 "Resistor_SMD:R_1206_3216Metric_Pad1.42x1.75mm_HandSolder" V 9630 5350 50  0001 C CNN
 F 3 "~" H 9700 5350 50  0001 C CNN
 	1    9700 5350
@@ -501,7 +499,7 @@ L Device:R R16
 U 1 1 5CF6C873
 P 10200 5400
 F 0 "R16" H 10270 5446 50  0000 L CNN
-F 1 "9.1K" H 10270 5355 50  0000 L CNN
+F 1 "8.45K" H 10270 5355 50  0000 L CNN
 F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 10130 5400 50  0001 C CNN
 F 3 "~" H 10200 5400 50  0001 C CNN
 	1    10200 5400
@@ -628,16 +626,15 @@ F 3 "~" H 9300 4000 50  0001 C CNN
 	1    9300 4000
 	1    0    0    -1  
 $EndComp
-Connection ~ 9300 3850
 $Comp
 L EggbotWireless-rescue:GND-power-Catfi-rescue #PWR0136
 U 1 1 5D0FBB70
-P 9300 4150
-F 0 "#PWR0136" H 9300 3900 50  0001 C CNN
-F 1 "GND" H 9305 3977 50  0000 C CNN
-F 2 "" H 9300 4150 50  0001 C CNN
-F 3 "" H 9300 4150 50  0001 C CNN
-	1    9300 4150
+P 9300 4200
+F 0 "#PWR0136" H 9300 3950 50  0001 C CNN
+F 1 "GND" H 9305 4027 50  0000 C CNN
+F 2 "" H 9300 4200 50  0001 C CNN
+F 3 "" H 9300 4200 50  0001 C CNN
+	1    9300 4200
 	1    0    0    -1  
 $EndComp
 Text GLabel 2900 6700 2    50   Input ~ 0
@@ -966,15 +963,10 @@ Wire Wire Line
 Connection ~ 4500 4150
 Wire Wire Line
 	4500 4150 4550 4150
-Wire Wire Line
-	4400 4350 4400 4250
 Wire Wire Line
 	4400 4250 4550 4250
-Wire Wire Line
-	4400 4350 4400 6100
 Wire Wire Line
 	4400 6100 4600 6100
-Connection ~ 4400 4350
 Wire Wire Line
 	4350 4550 4350 6200
 Wire Wire Line
@@ -997,7 +989,6 @@ Wire Wire Line
 	4450 4550 4450 4350
 Wire Wire Line
 	4450 4350 4550 4350
-Connection ~ 4350 4550
 $Comp
 L power:+3.3V #PWR0146
 U 1 1 5D2FA0EE
@@ -1013,45 +1004,10 @@ Wire Wire Line
 	4150 4150 4100 4150
 Wire Wire Line
 	4100 4150 4100 4350
-Connection ~ 4150 4150
 Wire Wire Line
 	4100 4350 4050 4350
 Wire Wire Line
 	4050 4350 4050 4550
-Connection ~ 4100 4350
-$Comp
-L Jumper:SolderJumper_2_Open JP3
-U 1 1 5D1FD66D
-P 4300 4150
-F 0 "JP3" H 4300 4250 50  0000 C CNN
-F 1 " " H 4300 4264 50  0000 C CNN
-F 2 "Jumper:SolderJumper-2_P1.3mm_Open_Pad1.0x1.5mm" H 4300 4150 50  0001 C CNN
-F 3 "~" H 4300 4150 50  0001 C CNN
-	1    4300 4150
-	1    0    0    -1  
-$EndComp
-$Comp
-L Jumper:SolderJumper_2_Open JP2
-U 1 1 5D2160D7
-P 4250 4350
-F 0 "JP2" H 4250 4450 50  0000 C CNN
-F 1 " " H 4250 4464 50  0000 C CNN
-F 2 "Jumper:SolderJumper-2_P1.3mm_Open_Pad1.0x1.5mm" H 4250 4350 50  0001 C CNN
-F 3 "~" H 4250 4350 50  0001 C CNN
-	1    4250 4350
-	1    0    0    -1  
-$EndComp
-$Comp
-L Jumper:SolderJumper_2_Open JP1
-U 1 1 5D2166DA
-P 4200 4550
-F 0 "JP1" H 4200 4650 50  0000 C CNN
-F 1 " " H 4200 4664 50  0000 C CNN
-F 2 "Jumper:SolderJumper-2_P1.3mm_Open_Pad1.0x1.5mm" H 4200 4550 50  0001 C CNN
-F 3 "~" H 4200 4550 50  0001 C CNN
-	1    4200 4550
-	1    0    0    -1  
-$EndComp
 $Comp
 L power:+3.3V #PWR0138
 U 1 1 5CEA2E4D
@@ -1186,8 +1142,6 @@ Wire Wire Line
 	2000 800  2050 800 
 Wire Wire Line
 	2050 800  2050 900 
-Wire Wire Line
-	9300 3850 9300 3800
 Wire Wire Line
 	2200 5700 2300 5700
 Connection ~ 2200 5700
@@ -1215,7 +1169,7 @@ L Device:Q_NMOS_GDS Q1
 U 1 1 5CEE2D00
 P 9600 4750
 F 0 "Q1" H 9806 4796 50  0000 L CNN
-F 1 "FDD8447L" H 9806 4705 50  0000 L CNN
+F 1 "FDD8800" H 9806 4705 50  0000 L CNN
 F 2 "Package_TO_SOT_SMD:TO-252-2" H 9800 4850 50  0001 C CNN
 F 3 "~" H 9600 4750 50  0001 C CNN
 	1    9600 4750
@@ -1650,13 +1604,10 @@ Wire Wire Line
 Connection ~ 7650 1000
 Wire Wire Line
 	7650 1000 7500 1000
-Connection ~ 7650 650 
 Text GLabel 9900 1100 0    50   Input ~ 0
 VBUS
 Wire Wire Line
 	9900 1100 9900 1950
-Wire Wire Line
-	10450 1400 10450 1950
 $Comp
 L EggbotWireless-rescue:GND-power-Catfi-rescue #PWR0123
 U 1 1 5D79742F
@@ -1681,7 +1632,7 @@ L EggbotWireless-rescue:R-Device-Catfi-rescue R6
 U 1 1 5D79743A
 P 10050 1300
 F 0 "R6" V 9843 1300 50  0000 C CNN
-F 1 "100K" V 9934 1300 50  0000 C CNN
+F 1 "10K" V 9934 1300 50  0000 C CNN
 F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 9980 1300 50  0001 C CNN
 F 3 "~" H 10050 1300 50  0001 C CNN
 	1    10050 1300
@@ -1692,7 +1643,7 @@ L Device:D_Schottky D2
 U 1 1 5D797446
 P 10150 1950
 F 0 "D2" H 10150 1734 50  0000 C CNN
-F 1 "SK84" H 10150 1825 50  0000 C CNN
+F 1 "SSB43L" H 10150 1825 50  0000 C CNN
 F 2 "Diode_SMD:D_SMB_Handsoldering" H 10150 1950 50  0001 C CNN
 F 3 "~" H 10150 1950 50  0001 C CNN
 	1    10150 1950
@@ -1701,46 +1652,29 @@ $EndComp
 $Comp
 L Switch:SW_SPDT SW1
 U 1 1 5CEB7C0D
-P 10650 1400
-F 0 "SW1" H 10650 1550 50  0000 C CNN
-F 1 " " H 10650 1594 50  0000 C CNN
-F 2 "Button_Switch_THT:SW_CuK_OS102011MA1QN1_SPDT_Angled" H 10650 1400 50  0001 C CNN
-F 3 "~" H 10650 1400 50  0001 C CNN
-	1    10650 1400
+P 10750 1400
+F 0 "SW1" H 10750 1550 50  0000 C CNN
+F 1 " " H 10750 1594 50  0000 C CNN
+F 2 "Button_Switch_THT:SW_CuK_OS102011MA1QN1_SPDT_Angled" H 10750 1400 50  0001 C CNN
+F 3 "~" H 10750 1400 50  0001 C CNN
+	1    10750 1400
 	1    0    0    -1  
 $EndComp
-Connection ~ 10450 1400
 $Comp
 L power:+5V #PWR0130
 U 1 1 5D7ABED4
-P 10850 1300
-F 0 "#PWR0130" H 10850 1150 50  0001 C CNN
-F 1 "+5V" H 10865 1473 50  0000 C CNN
-F 2 "" H 10850 1300 50  0001 C CNN
-F 3 "" H 10850 1300 50  0001 C CNN
-	1    10850 1300
+P 10950 1300
+F 0 "#PWR0130" H 10950 1150 50  0001 C CNN
+F 1 "+5V" H 10965 1473 50  0000 C CNN
+F 2 "" H 10950 1300 50  0001 C CNN
+F 3 "" H 10950 1300 50  0001 C CNN
+	1    10950 1300
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	7650 650  10350 650 
 Wire Wire Line
 	10350 650  10350 900 
-Wire Wire Line
-	10450 1950 10300 1950
 Wire Wire Line
 	10000 1950 9900 1950
-Connection ~ 10050 1100
-$Comp
-L Device:Q_PMOS_GDS Q3
-U 1 1 5D797440
-P 10250 1100
-F 0 "Q3" H 10456 1146 50  0000 L CNN
-F 1 "AOD403" H 10456 1055 50  0000 L CNN
-F 2 "Package_TO_SOT_SMD:TO-252-2" H 10450 1200 50  0001 C CNN
-F 3 "~" H 10250 1100 50  0001 C CNN
-	1    10250 1100
-	1    0    0    -1  
-$EndComp
 $Comp
 L DMG4800LSD:DMG4800LSD U4
 U 1 1 5DA22C7B
@@ -1780,17 +1714,6 @@ Text GLabel 8200 2500 2    50   Input ~ 0
 TXD_USB
 Text GLabel 8200 2900 2    50   Input ~ 0
 DTR_USB
-$Comp
-L EggbotWireless-rescue:R-Device-Catfi-rescue R20
-U 1 1 5D171129
-P 8300 6000
-F 0 "R20" V 8093 6000 50  0000 C CNN
-F 1 "100K" V 8184 6000 50  0000 C CNN
-F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 8230 6000 50  0001 C CNN
-F 3 "~" H 8300 6000 50  0001 C CNN
-	1    8300 6000
-	-1   0    0    1   
-$EndComp
 Wire Wire Line
 	8200 5850 8300 5850
 Wire Wire Line
@@ -2067,7 +1990,7 @@ L EggbotWireless-rescue:R-Device-Catfi-rescue R22
 U 1 1 5D432E09
 P 5900 1800
 F 0 "R22" V 5693 1800 50  0000 C CNN
-F 1 "100K" V 5784 1800 50  0000 C CNN
+F 1 "10K" V 5784 1800 50  0000 C CNN
 F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 5830 1800 50  0001 C CNN
 F 3 "~" H 5900 1800 50  0001 C CNN
 	1    5900 1800
@@ -2100,4 +2023,112 @@ F 3 "" H 10550 4450 50  0001 C CNN
 $EndComp
 Text GLabel 2900 6500 2    50   Input ~ 0
 SLEEP
+$Comp
+L EggbotWireless-rescue:R-Device-Catfi-rescue R20
+U 1 1 5D171129
+P 8300 6000
+F 0 "R20" V 8093 6000 50  0000 C CNN
+F 1 "10K" V 8184 6000 50  0000 C CNN
+F 2 "Resistor_SMD:R_0805_2012Metric_Pad1.15x1.40mm_HandSolder" V 8230 6000 50  0001 C CNN
+F 3 "~" H 8300 6000 50  0001 C CNN
+	1    8300 6000
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:D_Schottky D4
+U 1 1 5D32EDF7
+P 10200 650
+F 0 "D4" H 10200 434 50  0000 C CNN
+F 1 "SSB43L" H 10200 525 50  0000 C CNN
+F 2 "Diode_SMD:D_SMB_Handsoldering" H 10200 650 50  0001 C CNN
+F 3 "~" H 10200 650 50  0001 C CNN
+	1    10200 650 
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	10050 650  7650 650 
+Connection ~ 7650 650 
+Wire Wire Line
+	9300 4200 9300 4150
+Wire Wire Line
+	9300 3850 9300 3800
+Connection ~ 9300 3850
+Wire Wire Line
+	9050 3850 9300 3850
+$Comp
+L Device:C C17
+U 1 1 5D338D3C
+P 9700 4000
+F 0 "C17" H 9815 4046 50  0000 L CNN
+F 1 "10uF" H 9815 3955 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0805_2012Metric_Pad1.15x1.40mm_HandSolder" H 9738 3850 50  0001 C CNN
+F 3 "~" H 9700 4000 50  0001 C CNN
+	1    9700 4000
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	9300 3850 9700 3850
+Wire Wire Line
+	9700 4150 9300 4150
+Connection ~ 9300 4150
+$Comp
+L Transistor_FET:IRLML6402 Q3
+U 1 1 5D2DC610
+P 10250 1100
+F 0 "Q3" H 10456 1054 50  0000 L CNN
+F 1 "IRLML6402" H 10456 1145 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 10450 1025 50  0001 L CIN
+F 3 "https://www.infineon.com/dgdl/irlml6402pbf.pdf?fileId=5546d462533600a401535668d5c2263c" H 10250 1100 50  0001 L CNN
+	1    10250 1100
+	1    0    0    1   
+$EndComp
+Connection ~ 10050 1100
+Wire Wire Line
+	10300 1950 10450 1950
+Wire Wire Line
+	10450 1950 10450 1400
+Connection ~ 10450 1400
+Wire Wire Line
+	10450 1400 10550 1400
+$Comp
+L Jumper:SolderJumper_2_Bridged JP3
+U 1 1 5D3CD55E
+P 4300 4150
+F 0 "JP3" H 4300 4355 50  0000 C CNN
+F 1 "SolderJumper_2_Bridged" H 4300 4264 50  0000 C CNN
+F 2 "Jumper:SolderJumper-2_P1.3mm_Bridged_Pad1.0x1.5mm" H 4300 4150 50  0001 C CNN
+F 3 "~" H 4300 4150 50  0001 C CNN
+	1    4300 4150
+	1    0    0    -1  
+$EndComp
+$Comp
+L Jumper:SolderJumper_2_Bridged JP2
+U 1 1 5D3CED16
+P 4250 4350
+F 0 "JP2" H 4250 4555 50  0000 C CNN
+F 1 "SolderJumper_2_Bridged" H 4250 4464 50  0000 C CNN
+F 2 "Jumper:SolderJumper-2_P1.3mm_Bridged_Pad1.0x1.5mm" H 4250 4350 50  0001 C CNN
+F 3 "~" H 4250 4350 50  0001 C CNN
+	1    4250 4350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Jumper:SolderJumper_2_Bridged JP1
+U 1 1 5D3CF16C
+P 4200 4550
+F 0 "JP1" H 4200 4755 50  0000 C CNN
+F 1 "SolderJumper_2_Bridged" H 4200 4664 50  0000 C CNN
+F 2 "Jumper:SolderJumper-2_P1.3mm_Bridged_Pad1.0x1.5mm" H 4200 4550 50  0001 C CNN
+F 3 "~" H 4200 4550 50  0001 C CNN
+	1    4200 4550
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	4400 4250 4400 4350
+Connection ~ 4150 4150
+Connection ~ 4100 4350
+Connection ~ 4400 4350
+Wire Wire Line
+	4400 4350 4400 6100
+Connection ~ 4350 4550
 $EndSCHEMATC