fix obvious mistakes of v0.1

2021-05-21 23:10:16 +02:00 · 2021-05-21 23:10:16 +02:00 · fc3de6598a
commit fc3de6598a
parent a100a0075a
3 changed files with 372 additions and 264 deletions
--- a/fiatlux-cache.lib
+++ b/fiatlux-cache.lib
@ -257,6 +257,25 @@ X A 2 100 0 70 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Device_Q_NPN_BEC
+#
+DEF Device_Q_NPN_BEC Q 0 0 Y N 1 F N
+F0 "Q" 200 50 50 H V L CNN
+F1 "Device_Q_NPN_BEC" 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 50 0 111 0 1 10 N
+P 2 0 1 0 25 25 100 100 N
+P 3 0 1 0 25 -25 100 -100 100 -100 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
+X B 1 -200 0 225 R 50 50 1 1 I
+X E 2 100 -200 100 U 50 50 1 1 P
+X C 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Device_R
 #
 DEF Device_R R 0 0 N Y 1 F N
@ -391,26 +410,20 @@ X VI 3 -300 0 100 R 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# Transistor_BJT_S8050
+# Switch_SW_Push
 #
-DEF Transistor_BJT_S8050 Q 0 0 Y N 1 F N
-F0 "Q" 200 75 50 H V L CNN
-F1 "Transistor_BJT_S8050" 200 0 50 H V L CNN
-F2 "Package_TO_SOT_THT:TO-92_Inline" 200 -75 50 H I L CIN
-F3 "" 0 0 50 H I L CNN
-$FPLIST
- TO?92*
-$ENDFPLIST
+DEF Switch_SW_Push SW 0 40 N N 1 F N
+F0 "SW" 50 100 50 H V L CNN
+F1 "Switch_SW_Push" 0 -60 50 H V C CNN
+F2 "" 0 200 50 H I C CNN
+F3 "" 0 200 50 H I C CNN
 DRAW
-C 50 0 111 0 1 10 N
-P 2 0 1 0 0 0 25 0 N
-P 2 0 1 0 25 25 100 100 N
-P 3 0 1 0 25 -25 100 -100 100 -100 N
-P 3 0 1 20 25 75 25 -75 25 -75 N
-P 5 0 1 0 50 -70 70 -50 90 -90 50 -70 50 -70 F
-X E 1 100 -200 100 U 50 50 1 1 P
-X B 2 -200 0 200 R 50 50 1 1 I
-X C 3 100 200 100 D 50 50 1 1 P
+C -80 0 20 0 1 0 N
+C 80 0 20 0 1 0 N
+P 2 0 1 0 0 50 0 120 N
+P 2 0 1 0 100 50 -100 50 N
+X 1 1 -200 0 100 R 50 50 0 1 P
+X 2 2 200 0 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
--- a/fiatlux.sch
+++ b/fiatlux.sch
@ -16,13 +16,13 @@ $EndDescr
 $Comp
 L Interface_USB:CP2102N-A01-GQFN28 U2
 U 1 1 607804B7
-P 4550 5550
-F 0 "U2" H 4700 4300 50  0000 C CNN
-F 1 "CP2102-GMR" H 5000 6800 50  0000 C CNN
-F 2 "Package_DFN_QFN:QFN-28-1EP_5x5mm_P0.5mm_EP3.35x3.35mm" H 5000 4350 50  0001 L CNN
-F 3 "https://www.silabs.com/documents/public/data-sheets/cp2102n-datasheet.pdf" H 4600 4800 50  0001 C CNN
-F 4 "C6568" H 4550 5550 50  0001 C CNN "LCSC"
-	1    4550 5550
+P 5450 5600
+F 0 "U2" H 5600 4350 50  0000 C CNN
+F 1 "CP2102-GMR" H 5900 6850 50  0000 C CNN
+F 2 "Package_DFN_QFN:QFN-28-1EP_5x5mm_P0.5mm_EP3.35x3.35mm" H 5900 4400 50  0001 L CNN
+F 3 "https://www.silabs.com/documents/public/data-sheets/cp2102n-datasheet.pdf" H 5500 4850 50  0001 C CNN
+F 4 "C6568" H 5450 5600 50  0001 C CNN "LCSC"
+	1    5450 5600
 	1    0    0    -1  
 $EndComp
 $Sheet
@ -31,18 +31,6 @@ U 6078273A
 F0 "Power" 50
 F1 "power.sch" 50
 $EndSheet
-$Comp
-L Transistor_BJT:S8050 Q2
-U 1 1 6079A3D0
-P 1500 7000
-F 0 "Q2" H 1691 6954 50  0000 L CNN
-F 1 "S8050" H 1691 7045 50  0000 L CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 1700 6925 50  0001 L CIN
-F 3 "http://www.unisonic.com.tw/datasheet/S8050.pdf" H 1500 7000 50  0001 L CNN
-F 4 "C2146" H 1500 7000 50  0001 C CNN "LCSC"
-	1    1500 7000
-	-1   0    0    1   
-$EndComp
 Wire Wire Line
 	1400 6350 1400 6550
 Wire Wire Line
@ -62,18 +50,6 @@ F 4 "C22790" H 2050 7000 50  0001 C CNN "LCSC"
 	0    1    1    0   
 $EndComp
 $Comp
-L Transistor_BJT:S8050 Q1
-U 1 1 6079F735
-P 1500 6150
-F 0 "Q1" H 1691 6196 50  0000 L CNN
-F 1 "S8050" H 1691 6105 50  0000 L CNN
-F 2 "Package_TO_SOT_SMD:SOT-23" H 1700 6075 50  0001 L CIN
-F 3 "http://www.unisonic.com.tw/datasheet/S8050.pdf" H 1500 6150 50  0001 L CNN
-F 4 "C2146" H 1500 6150 50  0001 C CNN "LCSC"
-	1    1500 6150
-	-1   0    0    -1  
-$EndComp
-$Comp
 L Device:R R6
 U 1 1 6079FFA8
 P 2050 6150
@ -120,205 +96,183 @@ RTS
 Text GLabel 1200 5850 0    50   Input ~ 0
 nRST
 Text GLabel 1200 7300 0    50   Input ~ 0
-GPIO0
+FLSH
 $Comp
 L power:+3.3V #PWR0110
 U 1 1 607ABCA1
-P 4550 4250
-F 0 "#PWR0110" H 4550 4100 50  0001 C CNN
-F 1 "+3.3V" H 4600 4400 50  0000 C CNN
-F 2 "" H 4550 4250 50  0001 C CNN
-F 3 "" H 4550 4250 50  0001 C CNN
-	1    4550 4250
+P 5450 4300
+F 0 "#PWR0110" H 5450 4150 50  0001 C CNN
+F 1 "+3.3V" H 5500 4450 50  0000 C CNN
+F 2 "" H 5450 4300 50  0001 C CNN
+F 3 "" H 5450 4300 50  0001 C CNN
+	1    5450 4300
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:+3.3V #PWR0111
 U 1 1 607AC230
-P 4450 4250
-F 0 "#PWR0111" H 4450 4100 50  0001 C CNN
-F 1 "+3.3V" H 4350 4400 50  0000 C CNN
-F 2 "" H 4450 4250 50  0001 C CNN
-F 3 "" H 4450 4250 50  0001 C CNN
-	1    4450 4250
+P 5350 4300
+F 0 "#PWR0111" H 5350 4150 50  0001 C CNN
+F 1 "+3.3V" H 5250 4450 50  0000 C CNN
+F 2 "" H 5350 4300 50  0001 C CNN
+F 3 "" H 5350 4300 50  0001 C CNN
+	1    5350 4300
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0112
 U 1 1 607AD365
-P 4550 6850
-F 0 "#PWR0112" H 4550 6600 50  0001 C CNN
-F 1 "GND" H 4555 6677 50  0000 C CNN
-F 2 "" H 4550 6850 50  0001 C CNN
-F 3 "" H 4550 6850 50  0001 C CNN
-	1    4550 6850
+P 5450 6900
+F 0 "#PWR0112" H 5450 6650 50  0001 C CNN
+F 1 "GND" H 5455 6727 50  0000 C CNN
+F 2 "" H 5450 6900 50  0001 C CNN
+F 3 "" H 5450 6900 50  0001 C CNN
+	1    5450 6900
 	1    0    0    -1  
 $EndComp
 $Comp
 L Connector:USB_B_Micro J1
 U 1 1 607AE779
-P 2900 4950
-F 0 "J1" H 2957 5417 50  0000 C CNN
-F 1 "USB_B_Micro" H 2957 5326 50  0000 C CNN
-F 2 "stock:micro_usb" H 3050 4900 50  0001 C CNN
-F 3 "~" H 3050 4900 50  0001 C CNN
-F 4 "C21377" H 2900 4950 50  0001 C CNN "LCSC"
-	1    2900 4950
+P 3800 5000
+F 0 "J1" H 3857 5467 50  0000 C CNN
+F 1 "USB_B_Micro" H 3857 5376 50  0000 C CNN
+F 2 "stock:micro_usb" H 3950 4950 50  0001 C CNN
+F 3 "~" H 3950 4950 50  0001 C CNN
+F 4 "C21377" H 3800 5000 50  0001 C CNN "LCSC"
+	1    3800 5000
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3200 4750 3400 4750
+	4100 4800 4300 4800
 Wire Wire Line
-	3400 4750 3400 4850
+	4300 4800 4300 4900
 Wire Wire Line
-	3400 4850 4050 4850
+	4300 4900 4950 4900
 Wire Wire Line
-	3400 4750 3400 4650
-Connection ~ 3400 4750
+	4300 4800 4300 4700
+Connection ~ 4300 4800
 Wire Wire Line
-	4050 4950 3200 4950
+	4950 5000 4100 5000
 Wire Wire Line
-	4050 5050 3200 5050
-$Comp
-L power:GND #PWR0113
-U 1 1 607ED641
-P 2900 5350
-F 0 "#PWR0113" H 2900 5100 50  0001 C CNN
-F 1 "GND" H 2905 5177 50  0000 C CNN
-F 2 "" H 2900 5350 50  0001 C CNN
-F 3 "" H 2900 5350 50  0001 C CNN
-	1    2900 5350
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GND #PWR0114
-U 1 1 607EDC45
-P 2800 5350
-F 0 "#PWR0114" H 2800 5100 50  0001 C CNN
-F 1 "GND" H 2805 5177 50  0000 C CNN
-F 2 "" H 2800 5350 50  0001 C CNN
-F 3 "" H 2800 5350 50  0001 C CNN
-	1    2800 5350
-	1    0    0    -1  
-$EndComp
-NoConn ~ 4050 4650
-NoConn ~ 5050 5450
-NoConn ~ 5050 5650
-NoConn ~ 5050 5750
-NoConn ~ 5050 5850
-NoConn ~ 5050 6550
-NoConn ~ 5050 6050
-NoConn ~ 5050 6150
-NoConn ~ 5050 6250
-NoConn ~ 5050 6350
-NoConn ~ 5050 6450
-NoConn ~ 5050 6650
-Text GLabel 1200 4300 0    50   Input ~ 0
+	4950 5100 4100 5100
+NoConn ~ 4950 4700
+NoConn ~ 5950 5500
+NoConn ~ 5950 5700
+NoConn ~ 5950 5800
+NoConn ~ 5950 5900
+NoConn ~ 5950 6600
+NoConn ~ 5950 6100
+NoConn ~ 5950 6200
+NoConn ~ 5950 6300
+NoConn ~ 5950 6400
+NoConn ~ 5950 6500
+NoConn ~ 5950 6700
+Text GLabel 1000 4600 0    50   Input ~ 0
 nRST
 $Comp
 L power:GND #PWR0116
 U 1 1 6081A73D
-P 1400 4800
-F 0 "#PWR0116" H 1400 4550 50  0001 C CNN
-F 1 "GND" H 1405 4627 50  0000 C CNN
-F 2 "" H 1400 4800 50  0001 C CNN
-F 3 "" H 1400 4800 50  0001 C CNN
-	1    1400 4800
+P 1200 5100
+F 0 "#PWR0116" H 1200 4850 50  0001 C CNN
+F 1 "GND" H 1205 4927 50  0000 C CNN
+F 2 "" H 1200 5100 50  0001 C CNN
+F 3 "" H 1200 5100 50  0001 C CNN
+	1    1200 5100
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:+3.3V #PWR0117
 U 1 1 6081AC29
-P 1400 3800
-F 0 "#PWR0117" H 1400 3650 50  0001 C CNN
-F 1 "+3.3V" H 1415 3973 50  0000 C CNN
-F 2 "" H 1400 3800 50  0001 C CNN
-F 3 "" H 1400 3800 50  0001 C CNN
-	1    1400 3800
+P 1200 4100
+F 0 "#PWR0117" H 1200 3950 50  0001 C CNN
+F 1 "+3.3V" H 1215 4273 50  0000 C CNN
+F 2 "" H 1200 4100 50  0001 C CNN
+F 3 "" H 1200 4100 50  0001 C CNN
+	1    1200 4100
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R1
 U 1 1 6081B1DC
-P 1400 4050
-F 0 "R1" H 1470 4096 50  0000 L CNN
-F 1 "12kOhm" H 1470 4005 50  0000 L CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1330 4050 50  0001 C CNN
-F 3 "~" H 1400 4050 50  0001 C CNN
-F 4 "C22790" H 1400 4050 50  0001 C CNN "LCSC"
-	1    1400 4050
+P 1200 4350
+F 0 "R1" H 1270 4396 50  0000 L CNN
+F 1 "12kOhm" H 1270 4305 50  0000 L CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 1130 4350 50  0001 C CNN
+F 3 "~" H 1200 4350 50  0001 C CNN
+F 4 "C22790" H 1200 4350 50  0001 C CNN "LCSC"
+	1    1200 4350
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C4
 U 1 1 60820053
-P 1400 4550
+P 1200 4850
 AR Path="/60820053" Ref="C4"  Part="1" 
 AR Path="/6078273A/60820053" Ref="C?"  Part="1" 
-F 0 "C4" H 1515 4596 50  0000 L CNN
-F 1 "100nF" H 1515 4505 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 1438 4400 50  0001 C CNN
-F 3 "~" H 1400 4550 50  0001 C CNN
-F 4 "C14663" H 1400 4550 50  0001 C CNN "LCSC"
-	1    1400 4550
+F 0 "C4" H 1315 4896 50  0000 L CNN
+F 1 "100nF" H 1315 4805 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 1238 4700 50  0001 C CNN
+F 3 "~" H 1200 4850 50  0001 C CNN
+F 4 "C14663" H 1200 4850 50  0001 C CNN "LCSC"
+	1    1200 4850
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	1400 3800 1400 3900
+	1200 4100 1200 4200
 Wire Wire Line
-	1400 4200 1400 4300
-Connection ~ 1400 4300
+	1200 4500 1200 4600
+Connection ~ 1200 4600
 Wire Wire Line
-	1400 4300 1400 4400
+	1200 4600 1200 4700
 Wire Wire Line
-	1400 4700 1400 4800
+	1200 5000 1200 5100
 Wire Wire Line
-	1200 4300 1400 4300
+	1000 4600 1200 4600
 Text GLabel 3050 1750 0    50   Input ~ 0
 nRST
 Text GLabel 3050 1950 0    50   Input ~ 0
 EN
 Text GLabel 4250 2650 2    50   Input ~ 0
 GPIO15
-Text GLabel 1250 3100 0    50   Input ~ 0
+Text GLabel 1250 2800 0    50   Input ~ 0
 GPIO15
 $Comp
 L Device:R R5
 U 1 1 6085845D
-P 1550 3100
-F 0 "R5" V 1343 3100 50  0000 C CNN
-F 1 "12kOhm" V 1434 3100 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1480 3100 50  0001 C CNN
-F 3 "~" H 1550 3100 50  0001 C CNN
-F 4 "C22790" H 1550 3100 50  0001 C CNN "LCSC"
-	1    1550 3100
+P 1550 2800
+F 0 "R5" V 1343 2800 50  0000 C CNN
+F 1 "12kOhm" V 1434 2800 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 1480 2800 50  0001 C CNN
+F 3 "~" H 1550 2800 50  0001 C CNN
+F 4 "C22790" H 1550 2800 50  0001 C CNN "LCSC"
+	1    1550 2800
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	1400 3100 1250 3100
+	1400 2800 1250 2800
 $Comp
 L Device:R R4
 U 1 1 6085AAA5
-P 1550 2650
-F 0 "R4" V 1343 2650 50  0000 C CNN
-F 1 "12kOhm" V 1434 2650 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1480 2650 50  0001 C CNN
-F 3 "~" H 1550 2650 50  0001 C CNN
-F 4 "C22790" H 1550 2650 50  0001 C CNN "LCSC"
-	1    1550 2650
+P 1550 2350
+F 0 "R4" V 1343 2350 50  0000 C CNN
+F 1 "12kOhm" V 1434 2350 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 1480 2350 50  0001 C CNN
+F 3 "~" H 1550 2350 50  0001 C CNN
+F 4 "C22790" H 1550 2350 50  0001 C CNN "LCSC"
+	1    1550 2350
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:R R3
 U 1 1 6085B97B
-P 1550 2250
-F 0 "R3" V 1343 2250 50  0000 C CNN
-F 1 "12kOhm" V 1434 2250 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1480 2250 50  0001 C CNN
-F 3 "~" H 1550 2250 50  0001 C CNN
-F 4 "C22790" H 1550 2250 50  0001 C CNN "LCSC"
-	1    1550 2250
-	0    1    1    0   
+P 2550 4350
+F 0 "R3" H 2650 4400 50  0000 C CNN
+F 1 "12kOhm" H 2750 4300 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 2480 4350 50  0001 C CNN
+F 3 "~" H 2550 4350 50  0001 C CNN
+F 4 "C22790" H 2550 4350 50  0001 C CNN "LCSC"
+	1    2550 4350
+	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R2
@ -332,38 +286,23 @@ F 4 "C22790" H 1550 1800 50  0001 C CNN "LCSC"
 	1    1550 1800
 	0    1    1    0   
 $EndComp
-Text GLabel 1200 2650 0    50   Input ~ 0
+Text GLabel 1200 2350 0    50   Input ~ 0
 GPIO2
-Text GLabel 1200 2250 0    50   Input ~ 0
-GPIO0
 Text GLabel 1100 1800 0    50   Input ~ 0
 EN
 Wire Wire Line
 	1400 1800 1100 1800
 Wire Wire Line
-	1400 2250 1200 2250
-Wire Wire Line
-	1400 2650 1200 2650
+	1400 2350 1200 2350
 $Comp
 L power:+3.3V #PWR0118
 U 1 1 60864F25
-P 2000 2550
-F 0 "#PWR0118" H 2000 2400 50  0001 C CNN
-F 1 "+3.3V" H 2015 2723 50  0000 C CNN
-F 2 "" H 2000 2550 50  0001 C CNN
-F 3 "" H 2000 2550 50  0001 C CNN
-	1    2000 2550
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:+3.3V #PWR0119
-U 1 1 6086661C
-P 2000 2150
-F 0 "#PWR0119" H 2000 2000 50  0001 C CNN
-F 1 "+3.3V" H 2015 2323 50  0000 C CNN
-F 2 "" H 2000 2150 50  0001 C CNN
-F 3 "" H 2000 2150 50  0001 C CNN
-	1    2000 2150
+P 2000 2250
+F 0 "#PWR0118" H 2000 2100 50  0001 C CNN
+F 1 "+3.3V" H 2015 2423 50  0000 C CNN
+F 2 "" H 2000 2250 50  0001 C CNN
+F 3 "" H 2000 2250 50  0001 C CNN
+	1    2000 2250
 	1    0    0    -1  
 $EndComp
 $Comp
@ -380,77 +319,73 @@ $EndComp
 $Comp
 L power:GND #PWR0121
 U 1 1 608670B9
-P 2000 3200
-F 0 "#PWR0121" H 2000 2950 50  0001 C CNN
-F 1 "GND" H 2005 3027 50  0000 C CNN
-F 2 "" H 2000 3200 50  0001 C CNN
-F 3 "" H 2000 3200 50  0001 C CNN
-	1    2000 3200
+P 2000 2900
+F 0 "#PWR0121" H 2000 2650 50  0001 C CNN
+F 1 "GND" H 2005 2727 50  0000 C CNN
+F 2 "" H 2000 2900 50  0001 C CNN
+F 3 "" H 2000 2900 50  0001 C CNN
+	1    2000 2900
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	1700 2650 2000 2650
+	1700 2350 2000 2350
 Wire Wire Line
-	2000 2650 2000 2550
-Wire Wire Line
-	1700 2250 2000 2250
-Wire Wire Line
-	2000 2250 2000 2150
+	2000 2350 2000 2250
 Wire Wire Line
 	1700 1800 2000 1800
 Wire Wire Line
 	2000 1800 2000 1700
 Wire Wire Line
-	2000 3100 2000 3200
+	2000 2800 2000 2900
 Wire Wire Line
-	1700 3100 2000 3100
+	1700 2800 2000 2800
 Text GLabel 4250 1750 2    50   Input ~ 0
-GPIO0
+FLSH
 Text GLabel 4250 1950 2    50   Input ~ 0
 GPIO2
 Text GLabel 4250 1850 2    50   Input ~ 0
 TXD0
-Text GLabel 5050 4750 2    50   Input ~ 0
+Text GLabel 5950 4700 2    50   Input ~ 0
 TXD0
 $Comp
 L Device:R R9
 U 1 1 6088365F
-P 5700 4650
-F 0 "R9" V 5493 4650 50  0000 C CNN
-F 1 "470Ohm" V 5584 4650 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 5630 4650 50  0001 C CNN
-F 3 "~" H 5700 4650 50  0001 C CNN
-F 4 "C23179" H 5700 4650 50  0001 C CNN "LCSC"
-	1    5700 4650
+P 6600 4800
+F 0 "R9" V 6393 4800 50  0000 C CNN
+F 1 "470Ohm" V 6484 4800 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 6530 4800 50  0001 C CNN
+F 3 "~" H 6600 4800 50  0001 C CNN
+F 4 "C23179" H 6600 4800 50  0001 C CNN "LCSC"
+	1    6600 4800
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	5550 4650 5050 4650
-Text GLabel 6100 4650 2    50   Input ~ 0
+	6450 4800 5950 4800
+Text GLabel 7000 4800 2    50   Input ~ 0
 RXD0
 Wire Wire Line
-	6100 4650 5850 4650
-Text GLabel 5050 4950 2    50   Input ~ 0
+	7000 4800 6750 4800
+Text GLabel 5950 5000 2    50   Input ~ 0
 DTR
-Text GLabel 5050 4550 2    50   Input ~ 0
+Text GLabel 5950 4600 2    50   Input ~ 0
 RTS
 Text GLabel 4250 2050 2    50   Input ~ 0
 RXD0
 Wire Wire Line
-	5050 4850 5400 4850
+	5950 4900 6300 4900
 Wire Wire Line
-	5050 5050 5400 5050
+	5950 5100 6300 5100
 Wire Wire Line
-	5050 5150 5400 5150
+	5950 5200 6300 5200
 Wire Wire Line
-	5050 5350 5400 5350
-NoConn ~ 5400 5350
-NoConn ~ 5400 5150
-NoConn ~ 5400 5050
-NoConn ~ 5400 4850
+	5950 5400 6300 5400
+NoConn ~ 6300 5400
+NoConn ~ 6300 5200
+NoConn ~ 6300 5100
+NoConn ~ 6300 4900
 Wire Wire Line
-	5050 4450 5400 4450
-NoConn ~ 5400 4450
+	5950 4500 6300 4500
+NoConn ~ 6300 4500
 NoConn ~ 3050 2450
 Text GLabel 3050 2150 0    50   Input ~ 0
 ADC
@ -821,12 +756,12 @@ $EndComp
 $Comp
 L power:+5V #PWR0106
 U 1 1 608B3C6C
-P 3400 4650
-F 0 "#PWR0106" H 3400 4500 50  0001 C CNN
-F 1 "+5V" H 3415 4823 50  0000 C CNN
-F 2 "" H 3400 4650 50  0001 C CNN
-F 3 "" H 3400 4650 50  0001 C CNN
-	1    3400 4650
+P 4300 4700
+F 0 "#PWR0106" H 4300 4550 50  0001 C CNN
+F 1 "+5V" H 4315 4873 50  0000 C CNN
+F 2 "" H 4300 4700 50  0001 C CNN
+F 3 "" H 4300 4700 50  0001 C CNN
+	1    4300 4700
 	1    0    0    -1  
 $EndComp
 $Comp
@ -862,35 +797,22 @@ F 3 "~" H 5550 1150 50  0001 C CNN
 	1    5550 1150
 	-1   0    0    1   
 $EndComp
-Text GLabel 1100 1150 0    50   Input ~ 0
+Text GLabel 1100 1250 0    50   Input ~ 0
 ADC
-Text GLabel 1100 850  0    50   Input ~ 0
-nRST
-$Comp
-L Connector:Conn_01x01_Female J6
-U 1 1 609717CF
-P 1300 850
-F 0 "J6" H 1328 876 50  0000 L CNN
-F 1 "Testpoint_RST" H 1328 785 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_D2.0mm" H 1300 850 50  0001 C CNN
-F 3 "~" H 1300 850 50  0001 C CNN
-	1    1300 850 
-	1    0    0    -1  
-$EndComp
 $Comp
 L Connector:Conn_01x01_Female J7
 U 1 1 60971CC4
-P 1300 1150
-F 0 "J7" H 1328 1176 50  0000 L CNN
-F 1 "Testpoint_ADC" H 1328 1085 50  0000 L CNN
-F 2 "TestPoint:TestPoint_Pad_D2.0mm" H 1300 1150 50  0001 C CNN
-F 3 "~" H 1300 1150 50  0001 C CNN
-	1    1300 1150
+P 1300 1250
+F 0 "J7" H 1328 1276 50  0000 L CNN
+F 1 "Testpoint_ADC" H 1328 1185 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_D2.0mm" H 1300 1250 50  0001 C CNN
+F 3 "~" H 1300 1250 50  0001 C CNN
+	1    1300 1250
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3200 5150 3600 5150
-NoConn ~ 3600 5150
+	4100 5200 4500 5200
+NoConn ~ 4500 5200
 $Comp
 L Mechanical:MountingHole_Pad H1
 U 1 1 60A2A45B
@ -1020,4 +942,177 @@ Text GLabel 6150 1700 0    50   Input ~ 0
 GPIO5
 Text GLabel 5350 1050 0    50   Input ~ 0
 GPIO5
+$Comp
+L Device:Q_NPN_BEC Q2
+U 1 1 60AA4E39
+P 1500 7000
+F 0 "Q2" H 1691 6954 50  0000 L CNN
+F 1 "S8050" H 1691 7045 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 1700 7100 50  0001 C CNN
+F 3 "http://www.unisonic.com.tw/datasheet/S8050.pdf" H 1500 7000 50  0001 C CNN
+F 4 "C2146" H 1500 7000 50  0001 C CNN "LCSC"
+	1    1500 7000
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:Q_NPN_BEC Q1
+U 1 1 60AA76E5
+P 1500 6150
+F 0 "Q1" H 1691 6196 50  0000 L CNN
+F 1 "S8050" H 1691 6105 50  0000 L CNN
+F 2 "Package_TO_SOT_SMD:SOT-23" H 1700 6250 50  0001 C CNN
+F 3 "http://www.unisonic.com.tw/datasheet/S8050.pdf" H 1500 6150 50  0001 C CNN
+F 4 "C2146" H 1500 6150 50  0001 C CNN "LCSC"
+	1    1500 6150
+	-1   0    0    -1  
+$EndComp
+$Comp
+L Connector:Conn_01x01_Female J6
+U 1 1 609717CF
+P 1300 950
+F 0 "J6" H 1328 976 50  0000 L CNN
+F 1 "Testpoint_RST" H 1328 885 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_D2.0mm" H 1300 950 50  0001 C CNN
+F 3 "~" H 1300 950 50  0001 C CNN
+	1    1300 950 
+	1    0    0    -1  
+$EndComp
+Text GLabel 1100 950  0    50   Input ~ 0
+nRST
+$Comp
+L Connector:Conn_01x01_Female J14
+U 1 1 60ABDD61
+P 1300 650
+F 0 "J14" H 1328 676 50  0000 L CNN
+F 1 "Testpoint_RST" H 1328 585 50  0000 L CNN
+F 2 "TestPoint:TestPoint_Pad_D2.0mm" H 1300 650 50  0001 C CNN
+F 3 "~" H 1300 650 50  0001 C CNN
+	1    1300 650 
+	1    0    0    -1  
+$EndComp
+Text GLabel 1100 650  0    50   Input ~ 0
+FLSH
+$Comp
+L Switch:SW_Push SW1
+U 1 1 60AAD571
+P 1600 4900
+F 0 "SW1" V 1554 5048 50  0000 L CNN
+F 1 "SW_Push" V 1645 5048 50  0000 L CNN
+F 2 "Button_Switch_SMD:SW_SPST_CK_RS282G05A3" H 1600 5100 50  0001 C CNN
+F 3 "~" H 1600 5100 50  0001 C CNN
+	1    1600 4900
+	0    1    1    0   
+$EndComp
+$Comp
+L power:GND #PWR0114
+U 1 1 607EDC45
+P 3700 5400
+F 0 "#PWR0114" H 3700 5150 50  0001 C CNN
+F 1 "GND" H 3705 5227 50  0000 C CNN
+F 2 "" H 3700 5400 50  0001 C CNN
+F 3 "" H 3700 5400 50  0001 C CNN
+	1    3700 5400
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0113
+U 1 1 607ED641
+P 3800 5400
+F 0 "#PWR0113" H 3800 5150 50  0001 C CNN
+F 1 "GND" H 3805 5227 50  0000 C CNN
+F 2 "" H 3800 5400 50  0001 C CNN
+F 3 "" H 3800 5400 50  0001 C CNN
+	1    3800 5400
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR0119
+U 1 1 60B37023
+P 1600 5100
+F 0 "#PWR0119" H 1600 4850 50  0001 C CNN
+F 1 "GND" H 1605 4927 50  0000 C CNN
+F 2 "" H 1600 5100 50  0001 C CNN
+F 3 "" H 1600 5100 50  0001 C CNN
+	1    1600 5100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1600 4700 1600 4600
+Wire Wire Line
+	1600 4600 1200 4600
+$Comp
+L power:GND #PWR0151
+U 1 1 60B5BFFC
+P 2550 5100
+F 0 "#PWR0151" H 2550 4850 50  0001 C CNN
+F 1 "GND" H 2555 4927 50  0000 C CNN
+F 2 "" H 2550 5100 50  0001 C CNN
+F 3 "" H 2550 5100 50  0001 C CNN
+	1    2550 5100
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:+3.3V #PWR0152
+U 1 1 60B5C002
+P 2550 4100
+F 0 "#PWR0152" H 2550 3950 50  0001 C CNN
+F 1 "+3.3V" H 2565 4273 50  0000 C CNN
+F 2 "" H 2550 4100 50  0001 C CNN
+F 3 "" H 2550 4100 50  0001 C CNN
+	1    2550 4100
+	1    0    0    -1  
+$EndComp
+$Comp
+L Device:C C9
+U 1 1 60B5C010
+P 2550 4850
+AR Path="/60B5C010" Ref="C9"  Part="1" 
+AR Path="/6078273A/60B5C010" Ref="C?"  Part="1" 
+F 0 "C9" H 2665 4896 50  0000 L CNN
+F 1 "100nF" H 2665 4805 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 2588 4700 50  0001 C CNN
+F 3 "~" H 2550 4850 50  0001 C CNN
+F 4 "C14663" H 2550 4850 50  0001 C CNN "LCSC"
+	1    2550 4850
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2550 4100 2550 4200
+Wire Wire Line
+	2550 4500 2550 4600
+Connection ~ 2550 4600
+Wire Wire Line
+	2550 4600 2550 4700
+Wire Wire Line
+	2550 5000 2550 5100
+Wire Wire Line
+	2350 4600 2550 4600
+$Comp
+L Switch:SW_Push SW2
+U 1 1 60B5C01C
+P 2950 4900
+F 0 "SW2" V 2904 5048 50  0000 L CNN
+F 1 "SW_Push" V 2995 5048 50  0000 L CNN
+F 2 "Button_Switch_SMD:SW_SPST_CK_RS282G05A3" H 2950 5100 50  0001 C CNN
+F 3 "~" H 2950 5100 50  0001 C CNN
+	1    2950 4900
+	0    1    1    0   
+$EndComp
+$Comp
+L power:GND #PWR0153
+U 1 1 60B5C022
+P 2950 5100
+F 0 "#PWR0153" H 2950 4850 50  0001 C CNN
+F 1 "GND" H 2955 4927 50  0000 C CNN
+F 2 "" H 2950 5100 50  0001 C CNN
+F 3 "" H 2950 5100 50  0001 C CNN
+	1    2950 5100
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2950 4700 2950 4600
+Wire Wire Line
+	2950 4600 2550 4600
+Text GLabel 2350 4600 0    50   Input ~ 0
+FLSH
 $EndSCHEMATC
--- a/power.sch
+++ b/power.sch
@ -325,7 +325,7 @@ U 1 1 608E2DA3
 P 8700 2700
 F 0 "D7" V 8654 2780 50  0000 L CNN
 F 1 "Z 5V" V 8745 2780 50  0000 L CNN
-F 2 "Diode_SMD:D_0805_2012Metric" H 8700 2700 50  0001 C CNN
+F 2 "Diode_SMD:D_MiniMELF_Handsoldering" H 8700 2700 50  0001 C CNN
 F 3 "~" H 8700 2700 50  0001 C CNN
 	1    8700 2700
 	0    1    1    0   
@ -336,7 +336,7 @@ U 1 1 608E7242
 P 9450 2700
 F 0 "D8" V 9404 2780 50  0000 L CNN
 F 1 "Z 12V" V 9495 2780 50  0000 L CNN
-F 2 "Diode_SMD:D_0805_2012Metric" H 9450 2700 50  0001 C CNN
+F 2 "Diode_SMD:D_MiniMELF_Handsoldering" H 9450 2700 50  0001 C CNN
 F 3 "~" H 9450 2700 50  0001 C CNN
 	1    9450 2700
 	0    1    1    0