Browse Source

layout ngay 16/8

sonnt 4 years ago
parent
commit
1633d9bce5
21 changed files with 6515 additions and 1325 deletions
  1. 6 6
      RFID.bak
  2. 6 6
      RFID.sch
  3. 33 0
      _saved_vinhome.pro
  4. 34 34
      atmega328.bak
  5. 34 34
      atmega328.sch
  6. 51 131
      connectorsch.bak
  7. 51 131
      connectorsch.sch
  8. 64 38
      display.bak
  9. 64 38
      display.sch
  10. 21 17
      keypad.bak
  11. 21 17
      keypad.sch
  12. 286 177
      main.bak
  13. 286 177
      main.sch
  14. 45 72
      motor.bak
  15. 45 72
      motor.sch
  16. 39 94
      vinhome-cache.lib
  17. 111 135
      vinhome.bak
  18. 2157 1
      vinhome.kicad_pcb
  19. 2154 0
      vinhome.kicad_pcb-bak
  20. 898 0
      vinhome.net
  21. 109 145
      vinhome.sch

+ 6 - 6
RFID.bak

@@ -15,10 +15,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Connector:Conn_01x08 J?
+L Connector:Conn_01x08 J11
 U 1 1 5B71F223
 P 1550 2300
-F 0 "J?" H 1470 1675 50  0000 C CNN
+F 0 "J11" H 1470 1675 50  0000 C CNN
 F 1 "RFID_RC522" H 1470 1766 50  0000 C CNN
 F 2 "Pin_Headers:Pin_Header_Straight_1x08_Pitch2.54mm" H 1550 2300 50  0001 C CNN
 F 3 "~" H 1550 2300 50  0001 C CNN
@@ -26,10 +26,10 @@ F 3 "~" H 1550 2300 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR034
 U 1 1 5B71F699
 P 1900 2600
-F 0 "#PWR?" H 1900 2450 50  0001 C CNN
+F 0 "#PWR034" H 1900 2450 50  0001 C CNN
 F 1 "+3V3" H 1915 2773 50  0000 C CNN
 F 2 "" H 1900 2600 50  0001 C CNN
 F 3 "" H 1900 2600 50  0001 C CNN
@@ -43,10 +43,10 @@ Wire Wire Line
 Wire Wire Line
 	1750 2400 2100 2400
 $Comp
-L power:GND #PWR?
+L power:GND #PWR035
 U 1 1 5B71F74D
 P 2100 2400
-F 0 "#PWR?" H 2100 2150 50  0001 C CNN
+F 0 "#PWR035" H 2100 2150 50  0001 C CNN
 F 1 "GND" V 2105 2272 50  0000 R CNN
 F 2 "" H 2100 2400 50  0001 C CNN
 F 3 "" H 2100 2400 50  0001 C CNN

+ 6 - 6
RFID.sch

@@ -15,10 +15,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Connector:Conn_01x08 J?
+L Connector:Conn_01x08 J11
 U 1 1 5B71F223
 P 1550 2300
-F 0 "J?" H 1470 1675 50  0000 C CNN
+F 0 "J11" H 1470 1675 50  0000 C CNN
 F 1 "RFID_RC522" H 1470 1766 50  0000 C CNN
 F 2 "Pin_Headers:Pin_Header_Straight_1x08_Pitch2.54mm" H 1550 2300 50  0001 C CNN
 F 3 "~" H 1550 2300 50  0001 C CNN
@@ -26,10 +26,10 @@ F 3 "~" H 1550 2300 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR034
 U 1 1 5B71F699
 P 1900 2600
-F 0 "#PWR?" H 1900 2450 50  0001 C CNN
+F 0 "#PWR034" H 1900 2450 50  0001 C CNN
 F 1 "+3V3" H 1915 2773 50  0000 C CNN
 F 2 "" H 1900 2600 50  0001 C CNN
 F 3 "" H 1900 2600 50  0001 C CNN
@@ -43,10 +43,10 @@ Wire Wire Line
 Wire Wire Line
 	1750 2400 2100 2400
 $Comp
-L power:GND #PWR?
+L power:GND #PWR035
 U 1 1 5B71F74D
 P 2100 2400
-F 0 "#PWR?" H 2100 2150 50  0001 C CNN
+F 0 "#PWR035" H 2100 2150 50  0001 C CNN
 F 1 "GND" V 2105 2272 50  0000 R CNN
 F 2 "" H 2100 2400 50  0001 C CNN
 F 3 "" H 2100 2400 50  0001 C CNN

+ 33 - 0
_saved_vinhome.pro

@@ -0,0 +1,33 @@
+update=22/05/2015 07:44:53
+version=1
+last_client=kicad
+[general]
+version=1
+RootSch=
+BoardNm=
+[pcbnew]
+version=1
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.600000000000
+PadDrillOvalY=0.600000000000
+PadSizeH=1.500000000000
+PadSizeV=1.500000000000
+PcbTextSizeV=1.500000000000
+PcbTextSizeH=1.500000000000
+PcbTextThickness=0.300000000000
+ModuleTextSizeV=1.000000000000
+ModuleTextSizeH=1.000000000000
+ModuleTextSizeThickness=0.150000000000
+SolderMaskClearance=0.000000000000
+SolderMaskMinWidth=0.000000000000
+DrawSegmentWidth=0.200000000000
+BoardOutlineThickness=0.100000000000
+ModuleOutlineThickness=0.150000000000
+[cvpcb]
+version=1
+NetIExt=net
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]

+ 34 - 34
atmega328.bak

@@ -15,10 +15,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L atmel:ATMEGA328P-AU U?
+L atmel:ATMEGA328P-AU U3
 U 1 1 5B6CC01A
 P 5700 4150
-F 0 "U?" H 5750 5517 50  0000 C CNN
+F 0 "U3" H 5750 5517 50  0000 C CNN
 F 1 "ATMEGA328P-AU" H 5750 5426 50  0000 C CNN
 F 2 "Housings_QFP:TQFP-32_7x7mm_Pitch0.8mm" H 5700 4150 50  0001 C CIN
 F 3 "http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf" H 5700 4150 50  0001 C CNN
@@ -29,10 +29,10 @@ NoConn ~ 4800 4400
 NoConn ~ 4800 4500
 Connection ~ 4800 5250
 $Comp
-L power:GND #PWR?
+L power:GND #PWR025
 U 1 1 5B6CC2E7
 P 4800 5400
-F 0 "#PWR?" H 4800 5150 50  0001 C CNN
+F 0 "#PWR025" H 4800 5150 50  0001 C CNN
 F 1 "GND" H 4805 5227 50  0000 C CNN
 F 2 "" H 4800 5400 50  0001 C CNN
 F 3 "" H 4800 5400 50  0001 C CNN
@@ -55,10 +55,10 @@ Connection ~ 4800 3350
 Wire Wire Line
 	4800 3350 4800 3150
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR024
 U 1 1 5B6CC572
 P 4800 2850
-F 0 "#PWR?" H 4800 2700 50  0001 C CNN
+F 0 "#PWR024" H 4800 2700 50  0001 C CNN
 F 1 "+3V3" H 4815 3023 50  0000 C CNN
 F 2 "" H 4800 2850 50  0001 C CNN
 F 3 "" H 4800 2850 50  0001 C CNN
@@ -69,22 +69,22 @@ Wire Wire Line
 	4800 2850 4800 3050
 Connection ~ 4800 3050
 $Comp
-L device:C_Small C?
+L device:C_Small C10
 U 1 1 5B6CC796
 P 4700 3650
-F 0 "C?" V 4471 3650 50  0000 C CNN
+F 0 "C10" V 4471 3650 50  0000 C CNN
 F 1 "104" V 4562 3650 50  0000 C CNN
-F 2 "" H 4700 3650 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 4700 3650 50  0001 C CNN
 F 3 "" H 4700 3650 50  0001 C CNN
 	1    4700 3650
 	0    1    1    0   
 $EndComp
 Connection ~ 4800 3650
 $Comp
-L power:GND #PWR?
+L power:GND #PWR023
 U 1 1 5B6CC845
 P 4500 3650
-F 0 "#PWR?" H 4500 3400 50  0001 C CNN
+F 0 "#PWR023" H 4500 3400 50  0001 C CNN
 F 1 "GND" H 4505 3477 50  0000 C CNN
 F 2 "" H 4500 3650 50  0001 C CNN
 F 3 "" H 4500 3650 50  0001 C CNN
@@ -94,10 +94,10 @@ $EndComp
 Wire Wire Line
 	4600 3650 4500 3650
 $Comp
-L device:Crystal_GND24_Small Y?
+L device:Crystal_GND24_Small Y1
 U 1 1 5B6CCC42
 P 7000 3700
-F 0 "Y?" V 6954 3866 50  0000 L CNN
+F 0 "Y1" V 6954 3866 50  0000 L CNN
 F 1 "16MHZ" V 7045 3866 50  0000 L CNN
 F 2 "Crystals:Crystal_SMD_5032-4pin_5.0x3.2mm" H 7000 3700 50  0001 C CNN
 F 3 "" H 7000 3700 50  0001 C CNN
@@ -117,12 +117,12 @@ Wire Wire Line
 Wire Wire Line
 	6850 3800 7000 3800
 $Comp
-L device:C_Small C?
+L device:C_Small C11
 U 1 1 5B6CD364
 P 7300 3600
-F 0 "C?" V 7071 3600 50  0000 C CNN
+F 0 "C11" V 7071 3600 50  0000 C CNN
 F 1 "20pF" V 7162 3600 50  0000 C CNN
-F 2 "" H 7300 3600 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 7300 3600 50  0001 C CNN
 F 3 "" H 7300 3600 50  0001 C CNN
 	1    7300 3600
 	0    1    1    0   
@@ -131,12 +131,12 @@ Wire Wire Line
 	7200 3600 7000 3600
 Connection ~ 7000 3600
 $Comp
-L device:C_Small C?
+L device:C_Small C12
 U 1 1 5B6CD756
 P 7300 3800
-F 0 "C?" V 7071 3800 50  0000 C CNN
+F 0 "C12" V 7071 3800 50  0000 C CNN
 F 1 "20pF" V 7400 3850 50  0000 C CNN
-F 2 "" H 7300 3800 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 7300 3800 50  0001 C CNN
 F 3 "" H 7300 3800 50  0001 C CNN
 	1    7300 3800
 	0    1    1    0   
@@ -145,10 +145,10 @@ Wire Wire Line
 	7000 3800 7200 3800
 Connection ~ 7000 3800
 $Comp
-L power:GND #PWR?
+L power:GND #PWR026
 U 1 1 5B6CDA03
 P 7500 3700
-F 0 "#PWR?" H 7500 3450 50  0001 C CNN
+F 0 "#PWR026" H 7500 3450 50  0001 C CNN
 F 1 "GND" V 7505 3572 50  0000 R CNN
 F 2 "" H 7500 3700 50  0001 C CNN
 F 3 "" H 7500 3700 50  0001 C CNN
@@ -248,21 +248,21 @@ PD6
 Text HLabel 6950 5350 2    50   Input ~ 0
 PD7
 $Comp
-L Connector:Conn_01x05 J?
+L Connector:Conn_01x05 J7
 U 1 1 5B6D7EF3
 P 1350 1550
-F 0 "J?" H 1270 1125 50  0000 C CNN
+F 0 "J7" H 1270 1125 50  0000 C CNN
 F 1 "nap serial atmega328" H 1450 1250 50  0000 C CNN
-F 2 "" H 1350 1550 50  0001 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x05_Pitch2.54mm" H 1350 1550 50  0001 C CNN
 F 3 "~" H 1350 1550 50  0001 C CNN
 	1    1350 1550
 	-1   0    0    1   
 $EndComp
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR021
 U 1 1 5B6D8146
 P 1650 1750
-F 0 "#PWR?" H 1650 1600 50  0001 C CNN
+F 0 "#PWR021" H 1650 1600 50  0001 C CNN
 F 1 "+3V3" H 1665 1923 50  0000 C CNN
 F 2 "" H 1650 1750 50  0001 C CNN
 F 3 "" H 1650 1750 50  0001 C CNN
@@ -272,10 +272,10 @@ $EndComp
 Wire Wire Line
 	1550 1750 1650 1750
 $Comp
-L power:GND #PWR?
+L power:GND #PWR022
 U 1 1 5B6D8D77
 P 1750 1650
-F 0 "#PWR?" H 1750 1400 50  0001 C CNN
+F 0 "#PWR022" H 1750 1400 50  0001 C CNN
 F 1 "GND" V 1755 1522 50  0000 R CNN
 F 2 "" H 1750 1650 50  0001 C CNN
 F 3 "" H 1750 1650 50  0001 C CNN
@@ -295,10 +295,10 @@ RXD_AT
 Wire Wire Line
 	1550 1350 1750 1350
 $Comp
-L device:C_Small C?
+L device:C_Small C9
 U 1 1 5B6DC171
 P 1850 1350
-F 0 "C?" V 1621 1350 50  0000 C CNN
+F 0 "C9" V 1621 1350 50  0000 C CNN
 F 1 "104" V 1712 1350 50  0000 C CNN
 F 2 "Capacitors_SMD:C_0805" H 1850 1350 50  0001 C CNN
 F 3 "" H 1850 1350 50  0001 C CNN
@@ -312,10 +312,10 @@ RESET
 Wire Wire Line
 	6700 4500 7400 4500
 $Comp
-L device:R R?
+L device:R R8
 U 1 1 5B6EB8E6
 P 7550 4500
-F 0 "R?" V 7757 4500 50  0000 C CNN
+F 0 "R8" V 7757 4500 50  0000 C CNN
 F 1 "10k" V 7666 4500 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805_HandSoldering" V 7480 4500 50  0001 C CNN
 F 3 "" H 7550 4500 50  0001 C CNN
@@ -323,10 +323,10 @@ F 3 "" H 7550 4500 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR027
 U 1 1 5B6ECCB2
 P 7800 4500
-F 0 "#PWR?" H 7800 4350 50  0001 C CNN
+F 0 "#PWR027" H 7800 4350 50  0001 C CNN
 F 1 "+3V3" V 7815 4628 50  0000 L CNN
 F 2 "" H 7800 4500 50  0001 C CNN
 F 3 "" H 7800 4500 50  0001 C CNN

+ 34 - 34
atmega328.sch

@@ -15,10 +15,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L atmel:ATMEGA328P-AU U?
+L atmel:ATMEGA328P-AU U3
 U 1 1 5B6CC01A
 P 5700 4150
-F 0 "U?" H 5750 5517 50  0000 C CNN
+F 0 "U3" H 5750 5517 50  0000 C CNN
 F 1 "ATMEGA328P-AU" H 5750 5426 50  0000 C CNN
 F 2 "Housings_QFP:TQFP-32_7x7mm_Pitch0.8mm" H 5700 4150 50  0001 C CIN
 F 3 "http://www.atmel.com/images/atmel-8271-8-bit-avr-microcontroller-atmega48a-48pa-88a-88pa-168a-168pa-328-328p_datasheet.pdf" H 5700 4150 50  0001 C CNN
@@ -29,10 +29,10 @@ NoConn ~ 4800 4400
 NoConn ~ 4800 4500
 Connection ~ 4800 5250
 $Comp
-L power:GND #PWR?
+L power:GND #PWR025
 U 1 1 5B6CC2E7
 P 4800 5400
-F 0 "#PWR?" H 4800 5150 50  0001 C CNN
+F 0 "#PWR025" H 4800 5150 50  0001 C CNN
 F 1 "GND" H 4805 5227 50  0000 C CNN
 F 2 "" H 4800 5400 50  0001 C CNN
 F 3 "" H 4800 5400 50  0001 C CNN
@@ -55,10 +55,10 @@ Connection ~ 4800 3350
 Wire Wire Line
 	4800 3350 4800 3150
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR024
 U 1 1 5B6CC572
 P 4800 2850
-F 0 "#PWR?" H 4800 2700 50  0001 C CNN
+F 0 "#PWR024" H 4800 2700 50  0001 C CNN
 F 1 "+3V3" H 4815 3023 50  0000 C CNN
 F 2 "" H 4800 2850 50  0001 C CNN
 F 3 "" H 4800 2850 50  0001 C CNN
@@ -69,22 +69,22 @@ Wire Wire Line
 	4800 2850 4800 3050
 Connection ~ 4800 3050
 $Comp
-L device:C_Small C?
+L device:C_Small C10
 U 1 1 5B6CC796
 P 4700 3650
-F 0 "C?" V 4471 3650 50  0000 C CNN
+F 0 "C10" V 4471 3650 50  0000 C CNN
 F 1 "104" V 4562 3650 50  0000 C CNN
-F 2 "" H 4700 3650 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 4700 3650 50  0001 C CNN
 F 3 "" H 4700 3650 50  0001 C CNN
 	1    4700 3650
 	0    1    1    0   
 $EndComp
 Connection ~ 4800 3650
 $Comp
-L power:GND #PWR?
+L power:GND #PWR023
 U 1 1 5B6CC845
 P 4500 3650
-F 0 "#PWR?" H 4500 3400 50  0001 C CNN
+F 0 "#PWR023" H 4500 3400 50  0001 C CNN
 F 1 "GND" H 4505 3477 50  0000 C CNN
 F 2 "" H 4500 3650 50  0001 C CNN
 F 3 "" H 4500 3650 50  0001 C CNN
@@ -94,10 +94,10 @@ $EndComp
 Wire Wire Line
 	4600 3650 4500 3650
 $Comp
-L device:Crystal_GND24_Small Y?
+L device:Crystal_GND24_Small Y1
 U 1 1 5B6CCC42
 P 7000 3700
-F 0 "Y?" V 6954 3866 50  0000 L CNN
+F 0 "Y1" V 6954 3866 50  0000 L CNN
 F 1 "16MHZ" V 7045 3866 50  0000 L CNN
 F 2 "Crystals:Crystal_SMD_5032-4pin_5.0x3.2mm" H 7000 3700 50  0001 C CNN
 F 3 "" H 7000 3700 50  0001 C CNN
@@ -117,12 +117,12 @@ Wire Wire Line
 Wire Wire Line
 	6850 3800 7000 3800
 $Comp
-L device:C_Small C?
+L device:C_Small C11
 U 1 1 5B6CD364
 P 7300 3600
-F 0 "C?" V 7071 3600 50  0000 C CNN
+F 0 "C11" V 7071 3600 50  0000 C CNN
 F 1 "20pF" V 7162 3600 50  0000 C CNN
-F 2 "" H 7300 3600 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 7300 3600 50  0001 C CNN
 F 3 "" H 7300 3600 50  0001 C CNN
 	1    7300 3600
 	0    1    1    0   
@@ -131,12 +131,12 @@ Wire Wire Line
 	7200 3600 7000 3600
 Connection ~ 7000 3600
 $Comp
-L device:C_Small C?
+L device:C_Small C12
 U 1 1 5B6CD756
 P 7300 3800
-F 0 "C?" V 7071 3800 50  0000 C CNN
+F 0 "C12" V 7071 3800 50  0000 C CNN
 F 1 "20pF" V 7400 3850 50  0000 C CNN
-F 2 "" H 7300 3800 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 7300 3800 50  0001 C CNN
 F 3 "" H 7300 3800 50  0001 C CNN
 	1    7300 3800
 	0    1    1    0   
@@ -145,10 +145,10 @@ Wire Wire Line
 	7000 3800 7200 3800
 Connection ~ 7000 3800
 $Comp
-L power:GND #PWR?
+L power:GND #PWR026
 U 1 1 5B6CDA03
 P 7500 3700
-F 0 "#PWR?" H 7500 3450 50  0001 C CNN
+F 0 "#PWR026" H 7500 3450 50  0001 C CNN
 F 1 "GND" V 7505 3572 50  0000 R CNN
 F 2 "" H 7500 3700 50  0001 C CNN
 F 3 "" H 7500 3700 50  0001 C CNN
@@ -248,21 +248,21 @@ PD6
 Text HLabel 6950 5350 2    50   Input ~ 0
 PD7
 $Comp
-L Connector:Conn_01x05 J?
+L Connector:Conn_01x05 J7
 U 1 1 5B6D7EF3
 P 1350 1550
-F 0 "J?" H 1270 1125 50  0000 C CNN
+F 0 "J7" H 1270 1125 50  0000 C CNN
 F 1 "nap serial atmega328" H 1450 1250 50  0000 C CNN
-F 2 "" H 1350 1550 50  0001 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x05_Pitch2.54mm" H 1350 1550 50  0001 C CNN
 F 3 "~" H 1350 1550 50  0001 C CNN
 	1    1350 1550
 	-1   0    0    1   
 $EndComp
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR021
 U 1 1 5B6D8146
 P 1650 1750
-F 0 "#PWR?" H 1650 1600 50  0001 C CNN
+F 0 "#PWR021" H 1650 1600 50  0001 C CNN
 F 1 "+3V3" H 1665 1923 50  0000 C CNN
 F 2 "" H 1650 1750 50  0001 C CNN
 F 3 "" H 1650 1750 50  0001 C CNN
@@ -272,10 +272,10 @@ $EndComp
 Wire Wire Line
 	1550 1750 1650 1750
 $Comp
-L power:GND #PWR?
+L power:GND #PWR022
 U 1 1 5B6D8D77
 P 1750 1650
-F 0 "#PWR?" H 1750 1400 50  0001 C CNN
+F 0 "#PWR022" H 1750 1400 50  0001 C CNN
 F 1 "GND" V 1755 1522 50  0000 R CNN
 F 2 "" H 1750 1650 50  0001 C CNN
 F 3 "" H 1750 1650 50  0001 C CNN
@@ -295,10 +295,10 @@ RXD_AT
 Wire Wire Line
 	1550 1350 1750 1350
 $Comp
-L device:C_Small C?
+L device:C_Small C9
 U 1 1 5B6DC171
 P 1850 1350
-F 0 "C?" V 1621 1350 50  0000 C CNN
+F 0 "C9" V 1621 1350 50  0000 C CNN
 F 1 "104" V 1712 1350 50  0000 C CNN
 F 2 "Capacitors_SMD:C_0805" H 1850 1350 50  0001 C CNN
 F 3 "" H 1850 1350 50  0001 C CNN
@@ -312,10 +312,10 @@ RESET
 Wire Wire Line
 	6700 4500 7400 4500
 $Comp
-L device:R R?
+L device:R R8
 U 1 1 5B6EB8E6
 P 7550 4500
-F 0 "R?" V 7757 4500 50  0000 C CNN
+F 0 "R8" V 7757 4500 50  0000 C CNN
 F 1 "10k" V 7666 4500 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805_HandSoldering" V 7480 4500 50  0001 C CNN
 F 3 "" H 7550 4500 50  0001 C CNN
@@ -323,10 +323,10 @@ F 3 "" H 7550 4500 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR027
 U 1 1 5B6ECCB2
 P 7800 4500
-F 0 "#PWR?" H 7800 4350 50  0001 C CNN
+F 0 "#PWR027" H 7800 4350 50  0001 C CNN
 F 1 "+3V3" V 7815 4628 50  0000 L CNN
 F 2 "" H 7800 4500 50  0001 C CNN
 F 3 "" H 7800 4500 50  0001 C CNN

+ 51 - 131
connectorsch.bak

@@ -15,10 +15,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Connector:Conn_01x05 J?
+L Connector:Conn_01x05 J8
 U 1 1 5B6EED46
 P 3850 1800
-F 0 "J?" H 3770 1375 50  0000 C CNN
+F 0 "J8" H 3770 1375 50  0000 C CNN
 F 1 "connector-ESP" H 3770 1466 50  0000 C CNN
 F 2 "Pin_Headers:Pin_Header_Straight_1x05_Pitch2.54mm" H 3850 1800 50  0001 C CNN
 F 3 "~" H 3850 1800 50  0001 C CNN
@@ -26,10 +26,10 @@ F 3 "~" H 3850 1800 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L device:C_Small C?
+L device:C_Small C13
 U 1 1 5B6EF154
 P 4250 2000
-F 0 "C?" V 4150 2150 50  0000 C CNN
+F 0 "C13" V 4150 2150 50  0000 C CNN
 F 1 "104" V 4200 2150 50  0000 C CNN
 F 2 "Capacitors_SMD:C_0805" H 4250 2000 50  0001 C CNN
 F 3 "" H 4250 2000 50  0001 C CNN
@@ -37,10 +37,10 @@ F 3 "" H 4250 2000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR028
 U 1 1 5B6EF3C1
 P 4250 2150
-F 0 "#PWR?" H 4250 2000 50  0001 C CNN
+F 0 "#PWR028" H 4250 2000 50  0001 C CNN
 F 1 "+3V3" H 4265 2323 50  0000 C CNN
 F 2 "" H 4250 2150 50  0001 C CNN
 F 3 "" H 4250 2150 50  0001 C CNN
@@ -60,10 +60,10 @@ Wire Wire Line
 	4250 1900 4450 1900
 Connection ~ 4250 1900
 $Comp
-L power:GND #PWR?
+L power:GND #PWR029
 U 1 1 5B6EFEBA
 P 4450 1900
-F 0 "#PWR?" H 4450 1650 50  0001 C CNN
+F 0 "#PWR029" H 4450 1650 50  0001 C CNN
 F 1 "GND" V 4455 1772 50  0000 R CNN
 F 2 "" H 4450 1900 50  0001 C CNN
 F 3 "" H 4450 1900 50  0001 C CNN
@@ -83,153 +83,73 @@ OUT_ESP2
 Text HLabel 4400 1800 2    50   Input ~ 0
 OUT_ESP3
 $Comp
-L Connector:Conn_01x07 J?
-U 1 1 5B6F3435
-P 5450 1850
-F 0 "J?" H 5370 1325 50  0000 C CNN
-F 1 "Conn_01x07" H 5370 1416 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x07_Pitch2.54mm" H 5450 1850 50  0001 C CNN
-F 3 "~" H 5450 1850 50  0001 C CNN
-	1    5450 1850
-	-1   0    0    1   
-$EndComp
-$Comp
-L device:C_Small C?
+L device:C_Small C14
 U 1 1 5B6F365D
-P 5950 2150
-F 0 "C?" V 5850 2300 50  0000 C CNN
-F 1 "104" V 5900 2300 50  0000 C CNN
-F 2 "Capacitors_SMD:C_0805" H 5950 2150 50  0001 C CNN
-F 3 "" H 5950 2150 50  0001 C CNN
-	1    5950 2150
+P 5900 2000
+F 0 "C14" V 5800 2150 50  0000 C CNN
+F 1 "104" V 5850 2150 50  0000 C CNN
+F 2 "Capacitors_SMD:C_0805" H 5900 2000 50  0001 C CNN
+F 3 "" H 5900 2000 50  0001 C CNN
+	1    5900 2000
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR030
 U 1 1 5B6F36D4
-P 5950 2350
-F 0 "#PWR?" H 5950 2200 50  0001 C CNN
-F 1 "+3V3" H 5965 2523 50  0000 C CNN
-F 2 "" H 5950 2350 50  0001 C CNN
-F 3 "" H 5950 2350 50  0001 C CNN
-	1    5950 2350
+P 5900 2200
+F 0 "#PWR030" H 5900 2050 50  0001 C CNN
+F 1 "+3V3" H 5915 2373 50  0000 C CNN
+F 2 "" H 5900 2200 50  0001 C CNN
+F 3 "" H 5900 2200 50  0001 C CNN
+	1    5900 2200
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	5650 2150 5850 2150
+	5600 2000 5800 2000
 Wire Wire Line
-	5850 2150 5850 2250
+	5800 2000 5800 2100
 Wire Wire Line
-	5850 2250 5950 2250
+	5800 2100 5900 2100
 Wire Wire Line
-	5950 2350 5950 2250
-Connection ~ 5950 2250
+	5900 2200 5900 2100
+Connection ~ 5900 2100
 Wire Wire Line
-	5650 2050 5950 2050
+	5600 1900 5900 1900
 $Comp
-L power:GND #PWR?
+L power:GND #PWR031
 U 1 1 5B6F3F67
-P 6100 2050
-F 0 "#PWR?" H 6100 1800 50  0001 C CNN
-F 1 "GND" V 6105 1922 50  0000 R CNN
-F 2 "" H 6100 2050 50  0001 C CNN
-F 3 "" H 6100 2050 50  0001 C CNN
-	1    6100 2050
+P 6050 1900
+F 0 "#PWR031" H 6050 1650 50  0001 C CNN
+F 1 "GND" V 6055 1772 50  0000 R CNN
+F 2 "" H 6050 1900 50  0001 C CNN
+F 3 "" H 6050 1900 50  0001 C CNN
+	1    6050 1900
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	5950 2050 6100 2050
-Connection ~ 5950 2050
+	5900 1900 6050 1900
+Connection ~ 5900 1900
 Wire Wire Line
-	5650 1550 6000 1550
+	5600 1600 5950 1600
 Wire Wire Line
-	5650 1650 6000 1650
+	5600 1700 5950 1700
 Wire Wire Line
-	5650 1750 6000 1750
-Wire Wire Line
-	5650 1850 6000 1850
-Wire Wire Line
-	5650 1950 6000 1950
-Text HLabel 6000 1550 2    50   Input ~ 0
+	5600 1800 5950 1800
+Text HLabel 5950 1600 2    50   Input ~ 0
 OUT_ESP4
-Text HLabel 6000 1650 2    50   Input ~ 0
+Text HLabel 5950 1700 2    50   Input ~ 0
 OUT_ESP5
-Text HLabel 6000 1750 2    50   Input ~ 0
+Text HLabel 5950 1800 2    50   Input ~ 0
 OUT_ESP6
-Text HLabel 6000 1850 2    50   Input ~ 0
-OUT_ESP7
-Text HLabel 6000 1950 2    50   Input ~ 0
-OUT_ESP8
-$Comp
-L Connector:Conn_01x06 J?
-U 1 1 5B6FFC44
-P 7000 1850
-F 0 "J?" H 6920 1325 50  0000 C CNN
-F 1 "Conn_01x06" H 6920 1416 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x06_Pitch2.54mm" H 7000 1850 50  0001 C CNN
-F 3 "~" H 7000 1850 50  0001 C CNN
-	1    7000 1850
-	-1   0    0    1   
-$EndComp
-$Comp
-L device:C_Small C?
-U 1 1 5B6FFDBD
-P 7500 2050
-F 0 "C?" V 7400 2050 50  0000 C CNN
-F 1 "104" V 7600 2050 50  0000 C CNN
-F 2 "Capacitors_SMD:C_0805" H 7500 2050 50  0001 C CNN
-F 3 "" H 7500 2050 50  0001 C CNN
-	1    7500 2050
-	1    0    0    -1  
-$EndComp
 $Comp
-L power:+3V3 #PWR?
-U 1 1 5B6FFE3F
-P 7500 2200
-F 0 "#PWR?" H 7500 2050 50  0001 C CNN
-F 1 "+3V3" H 7515 2373 50  0000 C CNN
-F 2 "" H 7500 2200 50  0001 C CNN
-F 3 "" H 7500 2200 50  0001 C CNN
-	1    7500 2200
+L Connector:Conn_01x05 J6
+U 1 1 5B7756C7
+P 5400 1800
+F 0 "J6" H 5320 1375 50  0000 C CNN
+F 1 "Conn_01x05" H 5320 1466 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x05_Pitch2.54mm" H 5400 1800 50  0001 C CNN
+F 3 "~" H 5400 1800 50  0001 C CNN
+	1    5400 1800
 	-1   0    0    1   
 $EndComp
-Wire Wire Line
-	7200 2050 7200 2150
-Wire Wire Line
-	7200 2150 7500 2150
-Wire Wire Line
-	7500 2200 7500 2150
-Connection ~ 7500 2150
-Wire Wire Line
-	7200 1950 7500 1950
-$Comp
-L power:GND #PWR?
-U 1 1 5B7010FE
-P 7600 1950
-F 0 "#PWR?" H 7600 1700 50  0001 C CNN
-F 1 "GND" V 7605 1822 50  0000 R CNN
-F 2 "" H 7600 1950 50  0001 C CNN
-F 3 "" H 7600 1950 50  0001 C CNN
-	1    7600 1950
-	0    -1   -1   0   
-$EndComp
-Wire Wire Line
-	7500 1950 7600 1950
-Connection ~ 7500 1950
-Wire Wire Line
-	7200 1550 7550 1550
-Wire Wire Line
-	7200 1650 7550 1650
-Wire Wire Line
-	7200 1750 7550 1750
-Wire Wire Line
-	7200 1850 7550 1850
-Text HLabel 7550 1550 2    50   Input ~ 0
-OUT_ESP9
-Text HLabel 7550 1650 2    50   Input ~ 0
-OUT_ESP10
-Text HLabel 7550 1750 2    50   Input ~ 0
-OUT_ESP11
-Text HLabel 7550 1850 2    50   Input ~ 0
-OUT_ESP12
 $EndSCHEMATC

+ 51 - 131
connectorsch.sch

@@ -15,10 +15,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Connector:Conn_01x05 J?
+L Connector:Conn_01x05 J8
 U 1 1 5B6EED46
 P 3850 1800
-F 0 "J?" H 3770 1375 50  0000 C CNN
+F 0 "J8" H 3770 1375 50  0000 C CNN
 F 1 "connector-ESP" H 3770 1466 50  0000 C CNN
 F 2 "Pin_Headers:Pin_Header_Straight_1x05_Pitch2.54mm" H 3850 1800 50  0001 C CNN
 F 3 "~" H 3850 1800 50  0001 C CNN
@@ -26,10 +26,10 @@ F 3 "~" H 3850 1800 50  0001 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L device:C_Small C?
+L device:C_Small C13
 U 1 1 5B6EF154
 P 4250 2000
-F 0 "C?" V 4150 2150 50  0000 C CNN
+F 0 "C13" V 4150 2150 50  0000 C CNN
 F 1 "104" V 4200 2150 50  0000 C CNN
 F 2 "Capacitors_SMD:C_0805" H 4250 2000 50  0001 C CNN
 F 3 "" H 4250 2000 50  0001 C CNN
@@ -37,10 +37,10 @@ F 3 "" H 4250 2000 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR028
 U 1 1 5B6EF3C1
 P 4250 2150
-F 0 "#PWR?" H 4250 2000 50  0001 C CNN
+F 0 "#PWR028" H 4250 2000 50  0001 C CNN
 F 1 "+3V3" H 4265 2323 50  0000 C CNN
 F 2 "" H 4250 2150 50  0001 C CNN
 F 3 "" H 4250 2150 50  0001 C CNN
@@ -60,10 +60,10 @@ Wire Wire Line
 	4250 1900 4450 1900
 Connection ~ 4250 1900
 $Comp
-L power:GND #PWR?
+L power:GND #PWR029
 U 1 1 5B6EFEBA
 P 4450 1900
-F 0 "#PWR?" H 4450 1650 50  0001 C CNN
+F 0 "#PWR029" H 4450 1650 50  0001 C CNN
 F 1 "GND" V 4455 1772 50  0000 R CNN
 F 2 "" H 4450 1900 50  0001 C CNN
 F 3 "" H 4450 1900 50  0001 C CNN
@@ -83,153 +83,73 @@ OUT_ESP2
 Text HLabel 4400 1800 2    50   Input ~ 0
 OUT_ESP3
 $Comp
-L Connector:Conn_01x07 J?
-U 1 1 5B6F3435
-P 5450 1850
-F 0 "J?" H 5370 1325 50  0000 C CNN
-F 1 "Conn_01x07" H 5370 1416 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x07_Pitch2.54mm" H 5450 1850 50  0001 C CNN
-F 3 "~" H 5450 1850 50  0001 C CNN
-	1    5450 1850
-	-1   0    0    1   
-$EndComp
-$Comp
-L device:C_Small C?
+L device:C_Small C14
 U 1 1 5B6F365D
-P 5950 2150
-F 0 "C?" V 5850 2300 50  0000 C CNN
-F 1 "104" V 5900 2300 50  0000 C CNN
-F 2 "Capacitors_SMD:C_0805" H 5950 2150 50  0001 C CNN
-F 3 "" H 5950 2150 50  0001 C CNN
-	1    5950 2150
+P 5900 2000
+F 0 "C14" V 5800 2150 50  0000 C CNN
+F 1 "104" V 5850 2150 50  0000 C CNN
+F 2 "Capacitors_SMD:C_0805" H 5900 2000 50  0001 C CNN
+F 3 "" H 5900 2000 50  0001 C CNN
+	1    5900 2000
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR030
 U 1 1 5B6F36D4
-P 5950 2350
-F 0 "#PWR?" H 5950 2200 50  0001 C CNN
-F 1 "+3V3" H 5965 2523 50  0000 C CNN
-F 2 "" H 5950 2350 50  0001 C CNN
-F 3 "" H 5950 2350 50  0001 C CNN
-	1    5950 2350
+P 5900 2200
+F 0 "#PWR030" H 5900 2050 50  0001 C CNN
+F 1 "+3V3" H 5915 2373 50  0000 C CNN
+F 2 "" H 5900 2200 50  0001 C CNN
+F 3 "" H 5900 2200 50  0001 C CNN
+	1    5900 2200
 	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	5650 2150 5850 2150
+	5600 2000 5800 2000
 Wire Wire Line
-	5850 2150 5850 2250
+	5800 2000 5800 2100
 Wire Wire Line
-	5850 2250 5950 2250
+	5800 2100 5900 2100
 Wire Wire Line
-	5950 2350 5950 2250
-Connection ~ 5950 2250
+	5900 2200 5900 2100
+Connection ~ 5900 2100
 Wire Wire Line
-	5650 2050 5950 2050
+	5600 1900 5900 1900
 $Comp
-L power:GND #PWR?
+L power:GND #PWR031
 U 1 1 5B6F3F67
-P 6100 2050
-F 0 "#PWR?" H 6100 1800 50  0001 C CNN
-F 1 "GND" V 6105 1922 50  0000 R CNN
-F 2 "" H 6100 2050 50  0001 C CNN
-F 3 "" H 6100 2050 50  0001 C CNN
-	1    6100 2050
+P 6050 1900
+F 0 "#PWR031" H 6050 1650 50  0001 C CNN
+F 1 "GND" V 6055 1772 50  0000 R CNN
+F 2 "" H 6050 1900 50  0001 C CNN
+F 3 "" H 6050 1900 50  0001 C CNN
+	1    6050 1900
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	5950 2050 6100 2050
-Connection ~ 5950 2050
+	5900 1900 6050 1900
+Connection ~ 5900 1900
 Wire Wire Line
-	5650 1550 6000 1550
+	5600 1600 5950 1600
 Wire Wire Line
-	5650 1650 6000 1650
+	5600 1700 5950 1700
 Wire Wire Line
-	5650 1750 6000 1750
-Wire Wire Line
-	5650 1850 6000 1850
-Wire Wire Line
-	5650 1950 6000 1950
-Text HLabel 6000 1550 2    50   Input ~ 0
+	5600 1800 5950 1800
+Text HLabel 5950 1600 2    50   Input ~ 0
 OUT_ESP4
-Text HLabel 6000 1650 2    50   Input ~ 0
+Text HLabel 5950 1700 2    50   Input ~ 0
 OUT_ESP5
-Text HLabel 6000 1750 2    50   Input ~ 0
+Text HLabel 5950 1800 2    50   Input ~ 0
 OUT_ESP6
-Text HLabel 6000 1850 2    50   Input ~ 0
-OUT_ESP7
-Text HLabel 6000 1950 2    50   Input ~ 0
-OUT_ESP8
-$Comp
-L Connector:Conn_01x06 J?
-U 1 1 5B6FFC44
-P 7000 1850
-F 0 "J?" H 6920 1325 50  0000 C CNN
-F 1 "Conn_01x06" H 6920 1416 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x06_Pitch2.54mm" H 7000 1850 50  0001 C CNN
-F 3 "~" H 7000 1850 50  0001 C CNN
-	1    7000 1850
-	-1   0    0    1   
-$EndComp
-$Comp
-L device:C_Small C?
-U 1 1 5B6FFDBD
-P 7500 2050
-F 0 "C?" V 7400 2050 50  0000 C CNN
-F 1 "104" V 7600 2050 50  0000 C CNN
-F 2 "Capacitors_SMD:C_0805" H 7500 2050 50  0001 C CNN
-F 3 "" H 7500 2050 50  0001 C CNN
-	1    7500 2050
-	1    0    0    -1  
-$EndComp
 $Comp
-L power:+3V3 #PWR?
-U 1 1 5B6FFE3F
-P 7500 2200
-F 0 "#PWR?" H 7500 2050 50  0001 C CNN
-F 1 "+3V3" H 7515 2373 50  0000 C CNN
-F 2 "" H 7500 2200 50  0001 C CNN
-F 3 "" H 7500 2200 50  0001 C CNN
-	1    7500 2200
+L Connector:Conn_01x05 J6
+U 1 1 5B7756C7
+P 5400 1800
+F 0 "J6" H 5320 1375 50  0000 C CNN
+F 1 "Conn_01x05" H 5320 1466 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x05_Pitch2.54mm" H 5400 1800 50  0001 C CNN
+F 3 "~" H 5400 1800 50  0001 C CNN
+	1    5400 1800
 	-1   0    0    1   
 $EndComp
-Wire Wire Line
-	7200 2050 7200 2150
-Wire Wire Line
-	7200 2150 7500 2150
-Wire Wire Line
-	7500 2200 7500 2150
-Connection ~ 7500 2150
-Wire Wire Line
-	7200 1950 7500 1950
-$Comp
-L power:GND #PWR?
-U 1 1 5B7010FE
-P 7600 1950
-F 0 "#PWR?" H 7600 1700 50  0001 C CNN
-F 1 "GND" V 7605 1822 50  0000 R CNN
-F 2 "" H 7600 1950 50  0001 C CNN
-F 3 "" H 7600 1950 50  0001 C CNN
-	1    7600 1950
-	0    -1   -1   0   
-$EndComp
-Wire Wire Line
-	7500 1950 7600 1950
-Connection ~ 7500 1950
-Wire Wire Line
-	7200 1550 7550 1550
-Wire Wire Line
-	7200 1650 7550 1650
-Wire Wire Line
-	7200 1750 7550 1750
-Wire Wire Line
-	7200 1850 7550 1850
-Text HLabel 7550 1550 2    50   Input ~ 0
-OUT_ESP9
-Text HLabel 7550 1650 2    50   Input ~ 0
-OUT_ESP10
-Text HLabel 7550 1750 2    50   Input ~ 0
-OUT_ESP11
-Text HLabel 7550 1850 2    50   Input ~ 0
-OUT_ESP12
 $EndSCHEMATC

+ 64 - 38
display.bak

@@ -15,45 +15,39 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Connector:Conn_01x08 J?
+L Connector:Conn_01x08 J1
 U 1 1 5B62B126
-P 2250 2350
-F 0 "J?" H 2170 2867 50  0000 C CNN
-F 1 "LCD TFT 2.4 inch" H 2170 2776 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x08_Pitch2.54mm" H 2250 2350 50  0001 C CNN
-F 3 "~" H 2250 2350 50  0001 C CNN
-	1    2250 2350
+P 2250 2550
+F 0 "J1" H 2170 3067 50  0000 C CNN
+F 1 "LCD TFT 2.4 inch" H 2170 2976 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x08_Pitch2.54mm" H 2250 2550 50  0001 C CNN
+F 3 "~" H 2250 2550 50  0001 C CNN
+	1    2250 2550
 	-1   0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR01
 U 1 1 5B62B5E5
-P 2600 2050
-F 0 "#PWR?" H 2600 1800 50  0001 C CNN
-F 1 "GND" V 2605 1922 50  0000 R CNN
-F 2 "" H 2600 2050 50  0001 C CNN
-F 3 "" H 2600 2050 50  0001 C CNN
-	1    2600 2050
+P 2800 2850
+F 0 "#PWR01" H 2800 2600 50  0001 C CNN
+F 1 "GND" V 2805 2722 50  0000 R CNN
+F 2 "" H 2800 2850 50  0001 C CNN
+F 3 "" H 2800 2850 50  0001 C CNN
+	1    2800 2850
 	0    -1   -1   0   
 $EndComp
-Wire Wire Line
-	2450 2050 2600 2050
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR02
 U 1 1 5B62B66C
-P 2950 2100
-F 0 "#PWR?" H 2950 1950 50  0001 C CNN
-F 1 "+3V3" H 2965 2273 50  0000 C CNN
-F 2 "" H 2950 2100 50  0001 C CNN
-F 3 "" H 2950 2100 50  0001 C CNN
-	1    2950 2100
+P 3250 2100
+F 0 "#PWR02" H 3250 1950 50  0001 C CNN
+F 1 "+3V3" H 3265 2273 50  0000 C CNN
+F 2 "" H 3250 2100 50  0001 C CNN
+F 3 "" H 3250 2100 50  0001 C CNN
+	1    3250 2100
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2450 2150 2950 2150
-Wire Wire Line
-	2950 2150 2950 2100
-Wire Wire Line
 	2450 2250 2800 2250
 Wire Wire Line
 	2450 2350 2800 2350
@@ -73,19 +67,51 @@ Text HLabel 2800 2550 2    50   Input ~ 0
 DC
 Text HLabel 2800 2750 2    50   Input ~ 0
 MISO
+Wire Wire Line
+	2450 2650 3250 2650
 $Comp
-L power:+3V3 #PWR?
-U 1 1 5B62B951
-P 3150 2600
-F 0 "#PWR?" H 3150 2450 50  0001 C CNN
-F 1 "+3V3" H 3165 2773 50  0000 C CNN
-F 2 "" H 3150 2600 50  0001 C CNN
-F 3 "" H 3150 2600 50  0001 C CNN
-	1    3150 2600
-	1    0    0    -1  
+L device:R R9
+U 1 1 5B73F886
+P 3800 2450
+F 0 "R9" V 3593 2450 50  0000 C CNN
+F 1 "100R" V 3684 2450 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" V 3730 2450 50  0001 C CNN
+F 3 "" H 3800 2450 50  0001 C CNN
+	1    3800 2450
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	3550 2450 3650 2450
+Wire Wire Line
+	3950 2450 4050 2450
+Text HLabel 4050 2450 2    50   Input ~ 0
+BLK
+$Comp
+L Transistor:BC807 Q2
+U 1 1 5B740909
+P 3350 2450
+F 0 "Q2" H 3540 2404 50  0000 L CNN
+F 1 "BC807" H 3540 2495 50  0000 L CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23" H 3550 2375 50  0001 L CIN
+F 3 "http://www.fairchildsemi.com/ds/BC/BC807.pdf" H 3350 2450 50  0001 L CNN
+	1    3350 2450
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	3250 2100 3250 2250
+$Comp
+L power:+3V3 #PWR0102
+U 1 1 5B745CBA
+P 2800 2950
+F 0 "#PWR0102" H 2800 2800 50  0001 C CNN
+F 1 "+3V3" H 2815 3123 50  0000 C CNN
+F 2 "" H 2800 2950 50  0001 C CNN
+F 3 "" H 2800 2950 50  0001 C CNN
+	1    2800 2950
+	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	3150 2650 3150 2600
+	2450 2850 2800 2850
 Wire Wire Line
-	2450 2650 3150 2650
+	2450 2950 2800 2950
 $EndSCHEMATC

+ 64 - 38
display.sch

@@ -15,45 +15,39 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Connector:Conn_01x08 J?
+L Connector:Conn_01x08 J1
 U 1 1 5B62B126
-P 2250 2350
-F 0 "J?" H 2170 2867 50  0000 C CNN
-F 1 "LCD TFT 2.4 inch" H 2170 2776 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x08_Pitch2.54mm" H 2250 2350 50  0001 C CNN
-F 3 "~" H 2250 2350 50  0001 C CNN
-	1    2250 2350
+P 2250 2550
+F 0 "J1" H 2170 3067 50  0000 C CNN
+F 1 "LCD TFT 2.4 inch" H 2170 2976 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x08_Pitch2.54mm" H 2250 2550 50  0001 C CNN
+F 3 "~" H 2250 2550 50  0001 C CNN
+	1    2250 2550
 	-1   0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR01
 U 1 1 5B62B5E5
-P 2600 2050
-F 0 "#PWR?" H 2600 1800 50  0001 C CNN
-F 1 "GND" V 2605 1922 50  0000 R CNN
-F 2 "" H 2600 2050 50  0001 C CNN
-F 3 "" H 2600 2050 50  0001 C CNN
-	1    2600 2050
+P 2800 2850
+F 0 "#PWR01" H 2800 2600 50  0001 C CNN
+F 1 "GND" V 2805 2722 50  0000 R CNN
+F 2 "" H 2800 2850 50  0001 C CNN
+F 3 "" H 2800 2850 50  0001 C CNN
+	1    2800 2850
 	0    -1   -1   0   
 $EndComp
-Wire Wire Line
-	2450 2050 2600 2050
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR02
 U 1 1 5B62B66C
-P 2950 2100
-F 0 "#PWR?" H 2950 1950 50  0001 C CNN
-F 1 "+3V3" H 2965 2273 50  0000 C CNN
-F 2 "" H 2950 2100 50  0001 C CNN
-F 3 "" H 2950 2100 50  0001 C CNN
-	1    2950 2100
+P 3250 2100
+F 0 "#PWR02" H 3250 1950 50  0001 C CNN
+F 1 "+3V3" H 3265 2273 50  0000 C CNN
+F 2 "" H 3250 2100 50  0001 C CNN
+F 3 "" H 3250 2100 50  0001 C CNN
+	1    3250 2100
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2450 2150 2950 2150
-Wire Wire Line
-	2950 2150 2950 2100
-Wire Wire Line
 	2450 2250 2800 2250
 Wire Wire Line
 	2450 2350 2800 2350
@@ -73,19 +67,51 @@ Text HLabel 2800 2550 2    50   Input ~ 0
 DC
 Text HLabel 2800 2750 2    50   Input ~ 0
 MISO
+Wire Wire Line
+	2450 2650 3250 2650
 $Comp
-L power:+3V3 #PWR?
-U 1 1 5B62B951
-P 3150 2600
-F 0 "#PWR?" H 3150 2450 50  0001 C CNN
-F 1 "+3V3" H 3165 2773 50  0000 C CNN
-F 2 "" H 3150 2600 50  0001 C CNN
-F 3 "" H 3150 2600 50  0001 C CNN
-	1    3150 2600
-	1    0    0    -1  
+L device:R R9
+U 1 1 5B73F886
+P 3800 2450
+F 0 "R9" V 3593 2450 50  0000 C CNN
+F 1 "100R" V 3684 2450 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" V 3730 2450 50  0001 C CNN
+F 3 "" H 3800 2450 50  0001 C CNN
+	1    3800 2450
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	3550 2450 3650 2450
+Wire Wire Line
+	3950 2450 4050 2450
+Text HLabel 4050 2450 2    50   Input ~ 0
+BLK
+$Comp
+L Transistor:BC807 Q2
+U 1 1 5B740909
+P 3350 2450
+F 0 "Q2" H 3540 2404 50  0000 L CNN
+F 1 "BC807" H 3540 2495 50  0000 L CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23" H 3550 2375 50  0001 L CIN
+F 3 "http://www.fairchildsemi.com/ds/BC/BC807.pdf" H 3350 2450 50  0001 L CNN
+	1    3350 2450
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	3250 2100 3250 2250
+$Comp
+L power:+3V3 #PWR0102
+U 1 1 5B745CBA
+P 2800 2950
+F 0 "#PWR0102" H 2800 2800 50  0001 C CNN
+F 1 "+3V3" H 2815 3123 50  0000 C CNN
+F 2 "" H 2800 2950 50  0001 C CNN
+F 3 "" H 2800 2950 50  0001 C CNN
+	1    2800 2950
+	-1   0    0    1   
 $EndComp
 Wire Wire Line
-	3150 2650 3150 2600
+	2450 2850 2800 2850
 Wire Wire Line
-	2450 2650 3150 2650
+	2450 2950 2800 2950
 $EndSCHEMATC

+ 21 - 17
keypad.bak

@@ -15,21 +15,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Connector:Conn_01x04 J?
-U 1 1 5B628A4A
-P 1650 2300
-F 0 "J?" H 1570 1875 50  0000 C CNN
-F 1 "Conn_01x04" H 1570 1966 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x04_Pitch2.54mm" H 1650 2300 50  0001 C CNN
-F 3 "~" H 1650 2300 50  0001 C CNN
-	1    1650 2300
-	-1   0    0    1   
-$EndComp
-$Comp
-L device:C_Small C?
+L device:C_Small C5
 U 1 1 5B628D63
 P 2200 2100
-F 0 "C?" H 2292 2146 50  0000 L CNN
+F 0 "C5" H 2292 2146 50  0000 L CNN
 F 1 "C_Small" H 2292 2055 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 2200 2100 50  0001 C CNN
 F 3 "" H 2200 2100 50  0001 C CNN
@@ -37,10 +26,10 @@ F 3 "" H 2200 2100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR010
 U 1 1 5B628E8A
 P 1850 1900
-F 0 "#PWR?" H 1850 1750 50  0001 C CNN
+F 0 "#PWR010" H 1850 1750 50  0001 C CNN
 F 1 "+3V3" H 1865 2073 50  0000 C CNN
 F 2 "" H 1850 1900 50  0001 C CNN
 F 3 "" H 1850 1900 50  0001 C CNN
@@ -57,10 +46,10 @@ Connection ~ 1850 2000
 Wire Wire Line
 	1850 2000 1850 2100
 $Comp
-L power:GND #PWR?
+L power:GND #PWR011
 U 1 1 5B628F47
 P 2450 2200
-F 0 "#PWR?" H 2450 1950 50  0001 C CNN
+F 0 "#PWR011" H 2450 1950 50  0001 C CNN
 F 1 "GND" V 2455 2072 50  0000 R CNN
 F 2 "" H 2450 2200 50  0001 C CNN
 F 3 "" H 2450 2200 50  0001 C CNN
@@ -78,4 +67,19 @@ Text HLabel 2150 2300 2    50   Input ~ 0
 SCL
 Text HLabel 2150 2400 2    50   Input ~ 0
 SDO
+$Comp
+L Connector:Conn_01x05 J4
+U 1 1 5B7439C1
+P 1650 2300
+F 0 "J4" H 1570 2717 50  0000 C CNN
+F 1 "Conn_01x05" H 1570 2626 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x05_Pitch2.54mm" H 1650 2300 50  0001 C CNN
+F 3 "~" H 1650 2300 50  0001 C CNN
+	1    1650 2300
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	1850 2500 2150 2500
+Text HLabel 2150 2500 2    50   Input ~ 0
+SDA
 $EndSCHEMATC

+ 21 - 17
keypad.sch

@@ -15,21 +15,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Connector:Conn_01x04 J?
-U 1 1 5B628A4A
-P 1650 2300
-F 0 "J?" H 1570 1875 50  0000 C CNN
-F 1 "Conn_01x04" H 1570 1966 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x04_Pitch2.54mm" H 1650 2300 50  0001 C CNN
-F 3 "~" H 1650 2300 50  0001 C CNN
-	1    1650 2300
-	-1   0    0    1   
-$EndComp
-$Comp
-L device:C_Small C?
+L device:C_Small C5
 U 1 1 5B628D63
 P 2200 2100
-F 0 "C?" H 2292 2146 50  0000 L CNN
+F 0 "C5" H 2292 2146 50  0000 L CNN
 F 1 "C_Small" H 2292 2055 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 2200 2100 50  0001 C CNN
 F 3 "" H 2200 2100 50  0001 C CNN
@@ -37,10 +26,10 @@ F 3 "" H 2200 2100 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR010
 U 1 1 5B628E8A
 P 1850 1900
-F 0 "#PWR?" H 1850 1750 50  0001 C CNN
+F 0 "#PWR010" H 1850 1750 50  0001 C CNN
 F 1 "+3V3" H 1865 2073 50  0000 C CNN
 F 2 "" H 1850 1900 50  0001 C CNN
 F 3 "" H 1850 1900 50  0001 C CNN
@@ -57,10 +46,10 @@ Connection ~ 1850 2000
 Wire Wire Line
 	1850 2000 1850 2100
 $Comp
-L power:GND #PWR?
+L power:GND #PWR011
 U 1 1 5B628F47
 P 2450 2200
-F 0 "#PWR?" H 2450 1950 50  0001 C CNN
+F 0 "#PWR011" H 2450 1950 50  0001 C CNN
 F 1 "GND" V 2455 2072 50  0000 R CNN
 F 2 "" H 2450 2200 50  0001 C CNN
 F 3 "" H 2450 2200 50  0001 C CNN
@@ -78,4 +67,19 @@ Text HLabel 2150 2300 2    50   Input ~ 0
 SCL
 Text HLabel 2150 2400 2    50   Input ~ 0
 SDO
+$Comp
+L Connector:Conn_01x05 J4
+U 1 1 5B7439C1
+P 1650 2300
+F 0 "J4" H 1570 2717 50  0000 C CNN
+F 1 "Conn_01x05" H 1570 2626 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x05_Pitch2.54mm" H 1650 2300 50  0001 C CNN
+F 3 "~" H 1650 2300 50  0001 C CNN
+	1    1650 2300
+	-1   0    0    -1  
+$EndComp
+Wire Wire Line
+	1850 2500 2150 2500
+Text HLabel 2150 2500 2    50   Input ~ 0
+SDA
 $EndSCHEMATC

+ 286 - 177
main.bak

@@ -15,111 +15,111 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L ESP8266:ESP-12E U?
+L ESP8266:ESP-12E U2
 U 1 1 5B61664F
-P 5400 3100
-F 0 "U?" H 5400 3865 50  0000 C CNN
-F 1 "ESP-12E" H 5400 3774 50  0000 C CNN
-F 2 "ESP8266:ESP-12E_SMD" H 5400 3100 50  0001 C CNN
-F 3 "" H 5400 3100 50  0001 C CNN
-	1    5400 3100
+P 8000 2900
+F 0 "U2" H 8000 3665 50  0000 C CNN
+F 1 "ESP-12E" H 8000 3574 50  0000 C CNN
+F 2 "ESP8266:ESP-12E_SMD" H 8000 2900 50  0001 C CNN
+F 3 "" H 8000 2900 50  0001 C CNN
+	1    8000 2900
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4500 2800 4200 2800
-Text Label 4250 2800 0    50   ~ 0
-RST
+	7100 2600 6800 2600
+Text Label 6850 2600 0    50   ~ 0
+RST_ESP
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR018
 U 1 1 5B618403
-P 4350 3500
-F 0 "#PWR?" H 4350 3350 50  0001 C CNN
-F 1 "+3V3" V 4365 3628 50  0000 L CNN
-F 2 "" H 4350 3500 50  0001 C CNN
-F 3 "" H 4350 3500 50  0001 C CNN
-	1    4350 3500
+P 6950 3300
+F 0 "#PWR018" H 6950 3150 50  0001 C CNN
+F 1 "+3V3" V 6965 3428 50  0000 L CNN
+F 2 "" H 6950 3300 50  0001 C CNN
+F 3 "" H 6950 3300 50  0001 C CNN
+	1    6950 3300
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	4500 3500 4400 3500
+	7100 3300 7000 3300
 $Comp
-L power:GND #PWR?
+L power:GND #PWR020
 U 1 1 5B6184D1
-P 6500 3500
-F 0 "#PWR?" H 6500 3250 50  0001 C CNN
-F 1 "GND" V 6505 3372 50  0000 R CNN
-F 2 "" H 6500 3500 50  0001 C CNN
-F 3 "" H 6500 3500 50  0001 C CNN
-	1    6500 3500
+P 9100 3300
+F 0 "#PWR020" H 9100 3050 50  0001 C CNN
+F 1 "GND" V 9105 3172 50  0000 R CNN
+F 2 "" H 9100 3300 50  0001 C CNN
+F 3 "" H 9100 3300 50  0001 C CNN
+	1    9100 3300
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	6300 3500 6500 3500
+	8900 3300 9100 3300
 $Comp
-L device:C_Small C?
+L device:C_Small C8
 U 1 1 5B618730
-P 4400 3700
-F 0 "C?" H 4492 3746 50  0000 L CNN
-F 1 "105" H 4492 3655 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 4400 3700 50  0001 C CNN
-F 3 "" H 4400 3700 50  0001 C CNN
-	1    4400 3700
+P 7000 3500
+F 0 "C8" H 7092 3546 50  0000 L CNN
+F 1 "105" H 7092 3455 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 7000 3500 50  0001 C CNN
+F 3 "" H 7000 3500 50  0001 C CNN
+	1    7000 3500
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR019
 U 1 1 5B618843
-P 4400 3900
-F 0 "#PWR?" H 4400 3650 50  0001 C CNN
-F 1 "GND" H 4405 3727 50  0000 C CNN
-F 2 "" H 4400 3900 50  0001 C CNN
-F 3 "" H 4400 3900 50  0001 C CNN
-	1    4400 3900
+P 7000 3700
+F 0 "#PWR019" H 7000 3450 50  0001 C CNN
+F 1 "GND" H 7005 3527 50  0000 C CNN
+F 2 "" H 7000 3700 50  0001 C CNN
+F 3 "" H 7000 3700 50  0001 C CNN
+	1    7000 3700
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4400 3600 4400 3500
-Connection ~ 4400 3500
+	7000 3400 7000 3300
+Connection ~ 7000 3300
 Wire Wire Line
-	4400 3500 4350 3500
+	7000 3300 6950 3300
 Wire Wire Line
-	4400 3800 4400 3900
-NoConn ~ 4500 2900
+	7000 3600 7000 3700
+NoConn ~ 7100 2700
 Wire Wire Line
-	4500 3000 4200 3000
-Text Label 4250 3000 0    50   ~ 0
+	7100 2800 6800 2800
+Text Label 6850 2800 0    50   ~ 0
 CH_PD
 Wire Wire Line
-	4500 3100 4200 3100
+	7100 2900 6800 2900
 Wire Wire Line
-	4500 3200 4200 3200
+	7100 3000 6800 3000
 Wire Wire Line
-	4200 3300 4500 3300
+	6800 3100 7100 3100
 Wire Wire Line
-	4500 3400 4200 3400
+	7100 3200 6800 3200
 Wire Wire Line
-	6300 3200 6600 3200
+	8900 3000 9200 3000
 Wire Wire Line
-	6300 3300 6600 3300
+	8900 3100 9200 3100
 Wire Wire Line
-	6300 3400 6600 3400
+	8900 3200 9200 3200
 Wire Wire Line
-	5150 4000 5150 4200
+	7750 3800 7750 4000
 Wire Wire Line
-	5250 4000 5250 4200
+	7850 3800 7850 4000
 Wire Wire Line
-	5350 4000 5350 4200
+	7950 3800 7950 4000
 Wire Wire Line
-	5450 4000 5450 4200
+	8050 3800 8050 4000
 Wire Wire Line
-	5550 4000 5550 4200
+	8150 3800 8150 4000
 Wire Wire Line
-	5650 4000 5650 4200
+	8250 3800 8250 4000
 $Comp
-L device:R R?
+L device:R R3
 U 1 1 5B61A13D
 P 1250 2050
-F 0 "R?" V 1150 2050 50  0000 C CNN
+F 0 "R3" V 1150 2050 50  0000 C CNN
 F 1 "12k" V 1250 2050 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805_HandSoldering" V 1180 2050 50  0001 C CNN
 F 3 "" H 1250 2050 50  0001 C CNN
@@ -127,10 +127,10 @@ F 3 "" H 1250 2050 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L device:R R?
+L device:R R4
 U 1 1 5B61A490
 P 1250 2250
-F 0 "R?" V 1150 2250 50  0000 C CNN
+F 0 "R4" V 1150 2250 50  0000 C CNN
 F 1 "12k" V 1250 2250 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805_HandSoldering" V 1180 2250 50  0001 C CNN
 F 3 "" H 1250 2250 50  0001 C CNN
@@ -138,10 +138,10 @@ F 3 "" H 1250 2250 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L device:R R?
+L device:R R5
 U 1 1 5B61A4C8
 P 1250 2450
-F 0 "R?" V 1150 2450 50  0000 C CNN
+F 0 "R5" V 1150 2450 50  0000 C CNN
 F 1 "12k" V 1250 2450 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805_HandSoldering" V 1180 2450 50  0001 C CNN
 F 3 "" H 1250 2450 50  0001 C CNN
@@ -149,10 +149,10 @@ F 3 "" H 1250 2450 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L device:R R?
+L device:R R6
 U 1 1 5B61A4EA
 P 1250 2650
-F 0 "R?" V 1150 2650 50  0000 C CNN
+F 0 "R6" V 1150 2650 50  0000 C CNN
 F 1 "12k" V 1250 2650 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805_HandSoldering" V 1180 2650 50  0001 C CNN
 F 3 "" H 1250 2650 50  0001 C CNN
@@ -160,10 +160,10 @@ F 3 "" H 1250 2650 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L device:R R?
+L device:R R7
 U 1 1 5B61A5B4
 P 1250 2850
-F 0 "R?" V 1150 2850 50  0000 C CNN
+F 0 "R7" V 1150 2850 50  0000 C CNN
 F 1 "12k" V 1250 2850 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805_HandSoldering" V 1180 2850 50  0001 C CNN
 F 3 "" H 1250 2850 50  0001 C CNN
@@ -187,10 +187,10 @@ Connection ~ 1000 2450
 Wire Wire Line
 	1000 2450 1000 2250
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR012
 U 1 1 5B61BD51
 P 1000 1950
-F 0 "#PWR?" H 1000 1800 50  0001 C CNN
+F 0 "#PWR012" H 1000 1800 50  0001 C CNN
 F 1 "+3V3" H 1015 2123 50  0000 C CNN
 F 2 "" H 1000 1950 50  0001 C CNN
 F 3 "" H 1000 1950 50  0001 C CNN
@@ -209,10 +209,10 @@ Wire Wire Line
 Wire Wire Line
 	1100 2850 1000 2850
 $Comp
-L power:GND #PWR?
+L power:GND #PWR013
 U 1 1 5B61EC07
 P 1000 2950
-F 0 "#PWR?" H 1000 2700 50  0001 C CNN
+F 0 "#PWR013" H 1000 2700 50  0001 C CNN
 F 1 "GND" H 1005 2777 50  0000 C CNN
 F 2 "" H 1000 2950 50  0001 C CNN
 F 3 "" H 1000 2950 50  0001 C CNN
@@ -228,14 +228,14 @@ GPIO2
 Text Label 1450 2450 0    50   ~ 0
 CH_PD
 Text Label 1450 2650 0    50   ~ 0
-RST
+RST_ESP
 Text Label 1450 2850 0    50   ~ 0
 GPIO15
 $Comp
-L device:C_Small C?
+L device:C_Small C7
 U 1 1 5B620CF1
 P 2000 2750
-F 0 "C?" H 2092 2796 50  0000 L CNN
+F 0 "C7" H 2092 2796 50  0000 L CNN
 F 1 "103" H 2092 2705 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 2000 2750 50  0001 C CNN
 F 3 "" H 2000 2750 50  0001 C CNN
@@ -245,10 +245,10 @@ $EndComp
 Wire Wire Line
 	1400 2850 1800 2850
 $Comp
-L power:GND #PWR?
+L power:GND #PWR017
 U 1 1 5B621FFB
 P 2000 2950
-F 0 "#PWR?" H 2000 2700 50  0001 C CNN
+F 0 "#PWR017" H 2000 2700 50  0001 C CNN
 F 1 "GND" H 2005 2777 50  0000 C CNN
 F 2 "" H 2000 2950 50  0001 C CNN
 F 3 "" H 2000 2950 50  0001 C CNN
@@ -260,146 +260,255 @@ Wire Wire Line
 Wire Wire Line
 	2000 2950 2000 2850
 Wire Wire Line
-	6300 2800 6600 2800
+	8900 2600 9200 2600
 Wire Wire Line
-	6300 2900 6600 2900
+	8900 2700 9200 2700
 Wire Wire Line
-	6300 3000 6600 3000
+	8900 2800 9200 2800
 Wire Wire Line
-	6300 3100 6600 3100
-NoConn ~ 5150 4200
-Text Label 6300 3400 0    50   ~ 0
+	8900 2900 9200 2900
+NoConn ~ 7750 4000
+Text Label 8900 3200 0    50   ~ 0
 GPIO15
-Text Label 6300 3200 0    50   ~ 0
+Text Label 8900 3000 0    50   ~ 0
 GPIO0
-Text Label 6300 3300 0    50   ~ 0
+Text Label 8900 3100 0    50   ~ 0
 GPIO2
 $Comp
-L Connector:Conn_01x02 J?
-U 1 1 5B62DC1E
-P 1050 3700
-F 0 "J?" H 970 3375 50  0000 C CNN
-F 1 "select boot" H 970 3466 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm" H 1050 3700 50  0001 C CNN
-F 3 "~" H 1050 3700 50  0001 C CNN
-	1    1050 3700
-	-1   0    0    1   
-$EndComp
-$Comp
-L power:GND #PWR?
-U 1 1 5B62E025
-P 1400 3750
-F 0 "#PWR?" H 1400 3500 50  0001 C CNN
-F 1 "GND" H 1405 3577 50  0000 C CNN
-F 2 "" H 1400 3750 50  0001 C CNN
-F 3 "" H 1400 3750 50  0001 C CNN
-	1    1400 3750
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	1250 3700 1400 3700
-Wire Wire Line
-	1400 3700 1400 3750
-Wire Wire Line
-	1250 3600 1600 3600
-Text Label 1350 3600 0    50   ~ 0
-GPIO0
-$Comp
-L Connector:Conn_01x04 J?
-U 1 1 5B6C3707
-P 1050 4450
-F 0 "J?" H 970 4025 50  0000 C CNN
-F 1 "nap" H 970 4116 50  0000 C CNN
-F 2 "" H 1050 4450 50  0001 C CNN
-F 3 "~" H 1050 4450 50  0001 C CNN
-	1    1050 4450
-	-1   0    0    1   
-$EndComp
-$Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR014
 U 1 1 5B6C4359
-P 1250 4800
-F 0 "#PWR?" H 1250 4650 50  0001 C CNN
-F 1 "+3V3" H 1265 4973 50  0000 C CNN
-F 2 "" H 1250 4800 50  0001 C CNN
-F 3 "" H 1250 4800 50  0001 C CNN
-	1    1250 4800
+P 1250 6050
+F 0 "#PWR014" H 1250 5900 50  0001 C CNN
+F 1 "+3V3" H 1265 6223 50  0000 C CNN
+F 2 "" H 1250 6050 50  0001 C CNN
+F 3 "" H 1250 6050 50  0001 C CNN
+	1    1250 6050
 	-1   0    0    1   
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR016
 U 1 1 5B6C4F86
-P 1550 4450
-F 0 "#PWR?" H 1550 4200 50  0001 C CNN
-F 1 "GND" V 1555 4322 50  0000 R CNN
-F 2 "" H 1550 4450 50  0001 C CNN
-F 3 "" H 1550 4450 50  0001 C CNN
-	1    1550 4450
+P 1550 5700
+F 0 "#PWR016" H 1550 5450 50  0001 C CNN
+F 1 "GND" V 1555 5572 50  0000 R CNN
+F 2 "" H 1550 5700 50  0001 C CNN
+F 3 "" H 1550 5700 50  0001 C CNN
+	1    1550 5700
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	1250 4450 1450 4450
+	1250 5700 1450 5700
 Wire Wire Line
-	1250 4800 1250 4650
+	1250 6050 1250 5900
 $Comp
-L device:C_Small C?
+L device:C_Small C6
 U 1 1 5B6C7440
-P 1450 4550
-F 0 "C?" H 1542 4596 50  0000 L CNN
-F 1 "104" H 1542 4505 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805" H 1450 4550 50  0001 C CNN
-F 3 "" H 1450 4550 50  0001 C CNN
-	1    1450 4550
+P 1450 5800
+F 0 "C6" H 1542 5846 50  0000 L CNN
+F 1 "104" H 1542 5755 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 1450 5800 50  0001 C CNN
+F 3 "" H 1450 5800 50  0001 C CNN
+	1    1450 5800
 	1    0    0    -1  
 $EndComp
-Connection ~ 1450 4450
+Connection ~ 1450 5700
 Wire Wire Line
-	1450 4450 1550 4450
+	1450 5700 1550 5700
 Wire Wire Line
-	1450 4650 1250 4650
-Connection ~ 1250 4650
+	1450 5900 1250 5900
+Connection ~ 1250 5900
 Wire Wire Line
-	1250 4650 1250 4550
+	1250 5900 1250 5800
 Wire Wire Line
-	1250 4250 1650 4250
+	1250 5500 1650 5500
 Wire Wire Line
-	1250 4350 1650 4350
-Text Label 6400 2800 0    50   ~ 0
+	1250 5600 1650 5600
+Text Label 9000 2600 0    50   ~ 0
 TXD
-Text Label 6400 2900 0    50   ~ 0
+Text Label 9000 2700 0    50   ~ 0
 RXD
-Text Label 1350 4350 0    50   ~ 0
+Text Label 1350 5600 0    50   ~ 0
 TXD
-Text Label 1350 4250 0    50   ~ 0
+Text Label 1350 5500 0    50   ~ 0
 RXD
-Text HLabel 4200 2800 0    50   Input ~ 0
+Text HLabel 3300 6150 0    50   Input ~ 0
 RST
-Text HLabel 6600 3300 2    50   Input ~ 0
+Text HLabel 9200 3100 2    50   Input ~ 0
 SDA_ESP
-Text HLabel 4200 3200 0    50   Input ~ 0
+Text HLabel 6800 3000 0    50   Input ~ 0
 SCL_ESP
-Text HLabel 6600 3000 2    50   Input ~ 0
+Text HLabel 9200 2800 2    50   Input ~ 0
 GPIO5
-Text HLabel 6600 3100 2    50   Input ~ 0
+Text HLabel 9200 2900 2    50   Input ~ 0
 GPIO4
-Text HLabel 6600 3200 2    50   Input ~ 0
+Text HLabel 9200 3000 2    50   Input ~ 0
 GPIO0
-Text HLabel 6600 3400 2    50   Input ~ 0
+Text HLabel 9200 3200 2    50   Input ~ 0
 GPIO15
-Text HLabel 4200 3100 0    50   Input ~ 0
+Text HLabel 6800 2900 0    50   Input ~ 0
 GPIO16
-Text HLabel 4200 3300 0    50   Input ~ 0
+Text HLabel 6800 3100 0    50   Input ~ 0
 GPIO12
-Text HLabel 4200 3400 0    50   Input ~ 0
+Text HLabel 6800 3200 0    50   Input ~ 0
 GPIO13
-Text HLabel 5250 4200 3    50   Input ~ 0
+Text HLabel 7850 4000 3    50   Input ~ 0
 MISO_ESP
-Text HLabel 5350 4200 3    50   Input ~ 0
+Text HLabel 7950 4000 3    50   Input ~ 0
 GPIO9
-Text HLabel 5450 4200 3    50   Input ~ 0
+Text HLabel 8050 4000 3    50   Input ~ 0
 GPIO10
-Text HLabel 5550 4200 3    50   Input ~ 0
+Text HLabel 8150 4000 3    50   Input ~ 0
 MOSI_ESP
-Text HLabel 5650 4200 3    50   Input ~ 0
+Text HLabel 8250 4000 3    50   Input ~ 0
 SCLK_ESP
+$Comp
+L device:R R11
+U 1 1 5B748144
+P 3650 5150
+F 0 "R11" V 3443 5150 50  0000 C CNN
+F 1 "12k" V 3534 5150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 3580 5150 50  0001 C CNN
+F 3 "" H 3650 5150 50  0001 C CNN
+	1    3650 5150
+	0    1    1    0   
+$EndComp
+$Comp
+L device:R R10
+U 1 1 5B7483AD
+P 3650 4450
+F 0 "R10" V 3443 4450 50  0000 C CNN
+F 1 "12k" V 3534 4450 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 3580 4450 50  0001 C CNN
+F 3 "" H 3650 4450 50  0001 C CNN
+	1    3650 4450
+	0    1    1    0   
+$EndComp
+$Comp
+L Transistor:2N2219 Q3
+U 1 1 5B748949
+P 4250 4450
+F 0 "Q3" H 4441 4496 50  0000 L CNN
+F 1 "MMBT9018" H 4441 4405 50  0000 L CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23" H 4450 4375 50  0001 L CIN
+F 3 "http://www.onsemi.com/pub_link/Collateral/2N2219-D.PDF" H 4250 4450 50  0001 L CNN
+	1    4250 4450
+	1    0    0    -1  
+$EndComp
+$Comp
+L Transistor:2N2219 Q4
+U 1 1 5B7499E4
+P 4250 5150
+F 0 "Q4" H 4441 5104 50  0000 L CNN
+F 1 "MMBT9018" H 4441 5195 50  0000 L CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23" H 4450 5075 50  0001 L CIN
+F 3 "http://www.onsemi.com/pub_link/Collateral/2N2219-D.PDF" H 4250 5150 50  0001 L CNN
+	1    4250 5150
+	1    0    0    1   
+$EndComp
+Wire Wire Line
+	4350 4250 4350 4200
+Wire Wire Line
+	4350 4200 4650 4200
+Wire Wire Line
+	3800 4450 3850 4450
+Wire Wire Line
+	3800 5150 3850 5150
+Wire Wire Line
+	4350 4950 4350 4850
+Wire Wire Line
+	4350 4850 3850 4850
+Wire Wire Line
+	3850 4850 3850 4450
+Connection ~ 3850 4450
+Wire Wire Line
+	3850 4450 4050 4450
+Wire Wire Line
+	3850 5150 3850 4950
+Wire Wire Line
+	3850 4950 4150 4950
+Wire Wire Line
+	4150 4950 4150 4650
+Wire Wire Line
+	4150 4650 4350 4650
+Connection ~ 3850 5150
+Wire Wire Line
+	3850 5150 4050 5150
+Wire Wire Line
+	4350 5350 4700 5350
+Wire Wire Line
+	3500 4450 3100 4450
+Wire Wire Line
+	3500 5150 3100 5150
+Text Label 4450 4200 0    50   ~ 0
+RST_ESP
+Text Label 4450 5350 0    50   ~ 0
+GPIO0
+Text Label 3150 4450 0    50   ~ 0
+DTR
+Text Label 3150 5150 0    50   ~ 0
+RTS
+$Comp
+L Connector:Conn_01x06 J5
+U 1 1 5B755821
+P 1050 5600
+F 0 "J5" H 970 5075 50  0000 C CNN
+F 1 "Conn_01x06" H 970 5166 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x06_Pitch2.54mm" H 1050 5600 50  0001 C CNN
+F 3 "~" H 1050 5600 50  0001 C CNN
+	1    1050 5600
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	1250 5300 1650 5300
+Wire Wire Line
+	1250 5400 1650 5400
+Text Label 1350 5400 0    50   ~ 0
+RTS
+Text Label 1350 5300 0    50   ~ 0
+DTR
+$Comp
+L device:R R12
+U 1 1 5B77A49F
+P 3650 6150
+F 0 "R12" V 3443 6150 50  0000 C CNN
+F 1 "220R" V 3534 6150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 3580 6150 50  0001 C CNN
+F 3 "" H 3650 6150 50  0001 C CNN
+	1    3650 6150
+	0    1    1    0   
+$EndComp
+$Comp
+L Transistor:2N2219 Q5
+U 1 1 5B77A669
+P 4200 6150
+F 0 "Q5" H 4391 6196 50  0000 L CNN
+F 1 "MMBT9018" H 4391 6105 50  0000 L CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23" H 4400 6075 50  0001 L CIN
+F 3 "http://www.onsemi.com/pub_link/Collateral/2N2219-D.PDF" H 4200 6150 50  0001 L CNN
+	1    4200 6150
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR03
+U 1 1 5B780890
+P 4300 6450
+F 0 "#PWR03" H 4300 6200 50  0001 C CNN
+F 1 "GND" V 4305 6322 50  0000 R CNN
+F 2 "" H 4300 6450 50  0001 C CNN
+F 3 "" H 4300 6450 50  0001 C CNN
+	1    4300 6450
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3300 6150 3500 6150
+Wire Wire Line
+	3800 6150 4000 6150
+Wire Wire Line
+	4300 6350 4300 6450
+Wire Wire Line
+	4300 5950 4300 5750
+Wire Wire Line
+	4300 5750 4600 5750
+Text Label 4400 5750 0    50   ~ 0
+RST_ESP
 $EndSCHEMATC

+ 286 - 177
main.sch

@@ -15,111 +15,111 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L ESP8266:ESP-12E U?
+L ESP8266:ESP-12E U2
 U 1 1 5B61664F
-P 5400 3100
-F 0 "U?" H 5400 3865 50  0000 C CNN
-F 1 "ESP-12E" H 5400 3774 50  0000 C CNN
-F 2 "ESP8266:ESP-12E_SMD" H 5400 3100 50  0001 C CNN
-F 3 "" H 5400 3100 50  0001 C CNN
-	1    5400 3100
+P 8000 2900
+F 0 "U2" H 8000 3665 50  0000 C CNN
+F 1 "ESP-12E" H 8000 3574 50  0000 C CNN
+F 2 "ESP8266:ESP-12E_SMD" H 8000 2900 50  0001 C CNN
+F 3 "" H 8000 2900 50  0001 C CNN
+	1    8000 2900
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4500 2800 4200 2800
-Text Label 4250 2800 0    50   ~ 0
-RST
+	7100 2600 6800 2600
+Text Label 6850 2600 0    50   ~ 0
+RST_ESP
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR018
 U 1 1 5B618403
-P 4350 3500
-F 0 "#PWR?" H 4350 3350 50  0001 C CNN
-F 1 "+3V3" V 4365 3628 50  0000 L CNN
-F 2 "" H 4350 3500 50  0001 C CNN
-F 3 "" H 4350 3500 50  0001 C CNN
-	1    4350 3500
+P 6950 3300
+F 0 "#PWR018" H 6950 3150 50  0001 C CNN
+F 1 "+3V3" V 6965 3428 50  0000 L CNN
+F 2 "" H 6950 3300 50  0001 C CNN
+F 3 "" H 6950 3300 50  0001 C CNN
+	1    6950 3300
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	4500 3500 4400 3500
+	7100 3300 7000 3300
 $Comp
-L power:GND #PWR?
+L power:GND #PWR020
 U 1 1 5B6184D1
-P 6500 3500
-F 0 "#PWR?" H 6500 3250 50  0001 C CNN
-F 1 "GND" V 6505 3372 50  0000 R CNN
-F 2 "" H 6500 3500 50  0001 C CNN
-F 3 "" H 6500 3500 50  0001 C CNN
-	1    6500 3500
+P 9100 3300
+F 0 "#PWR020" H 9100 3050 50  0001 C CNN
+F 1 "GND" V 9105 3172 50  0000 R CNN
+F 2 "" H 9100 3300 50  0001 C CNN
+F 3 "" H 9100 3300 50  0001 C CNN
+	1    9100 3300
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	6300 3500 6500 3500
+	8900 3300 9100 3300
 $Comp
-L device:C_Small C?
+L device:C_Small C8
 U 1 1 5B618730
-P 4400 3700
-F 0 "C?" H 4492 3746 50  0000 L CNN
-F 1 "105" H 4492 3655 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 4400 3700 50  0001 C CNN
-F 3 "" H 4400 3700 50  0001 C CNN
-	1    4400 3700
+P 7000 3500
+F 0 "C8" H 7092 3546 50  0000 L CNN
+F 1 "105" H 7092 3455 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 7000 3500 50  0001 C CNN
+F 3 "" H 7000 3500 50  0001 C CNN
+	1    7000 3500
 	1    0    0    -1  
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR019
 U 1 1 5B618843
-P 4400 3900
-F 0 "#PWR?" H 4400 3650 50  0001 C CNN
-F 1 "GND" H 4405 3727 50  0000 C CNN
-F 2 "" H 4400 3900 50  0001 C CNN
-F 3 "" H 4400 3900 50  0001 C CNN
-	1    4400 3900
+P 7000 3700
+F 0 "#PWR019" H 7000 3450 50  0001 C CNN
+F 1 "GND" H 7005 3527 50  0000 C CNN
+F 2 "" H 7000 3700 50  0001 C CNN
+F 3 "" H 7000 3700 50  0001 C CNN
+	1    7000 3700
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	4400 3600 4400 3500
-Connection ~ 4400 3500
+	7000 3400 7000 3300
+Connection ~ 7000 3300
 Wire Wire Line
-	4400 3500 4350 3500
+	7000 3300 6950 3300
 Wire Wire Line
-	4400 3800 4400 3900
-NoConn ~ 4500 2900
+	7000 3600 7000 3700
+NoConn ~ 7100 2700
 Wire Wire Line
-	4500 3000 4200 3000
-Text Label 4250 3000 0    50   ~ 0
+	7100 2800 6800 2800
+Text Label 6850 2800 0    50   ~ 0
 CH_PD
 Wire Wire Line
-	4500 3100 4200 3100
+	7100 2900 6800 2900
 Wire Wire Line
-	4500 3200 4200 3200
+	7100 3000 6800 3000
 Wire Wire Line
-	4200 3300 4500 3300
+	6800 3100 7100 3100
 Wire Wire Line
-	4500 3400 4200 3400
+	7100 3200 6800 3200
 Wire Wire Line
-	6300 3200 6600 3200
+	8900 3000 9200 3000
 Wire Wire Line
-	6300 3300 6600 3300
+	8900 3100 9200 3100
 Wire Wire Line
-	6300 3400 6600 3400
+	8900 3200 9200 3200
 Wire Wire Line
-	5150 4000 5150 4200
+	7750 3800 7750 4000
 Wire Wire Line
-	5250 4000 5250 4200
+	7850 3800 7850 4000
 Wire Wire Line
-	5350 4000 5350 4200
+	7950 3800 7950 4000
 Wire Wire Line
-	5450 4000 5450 4200
+	8050 3800 8050 4000
 Wire Wire Line
-	5550 4000 5550 4200
+	8150 3800 8150 4000
 Wire Wire Line
-	5650 4000 5650 4200
+	8250 3800 8250 4000
 $Comp
-L device:R R?
+L device:R R3
 U 1 1 5B61A13D
 P 1250 2050
-F 0 "R?" V 1150 2050 50  0000 C CNN
+F 0 "R3" V 1150 2050 50  0000 C CNN
 F 1 "12k" V 1250 2050 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805_HandSoldering" V 1180 2050 50  0001 C CNN
 F 3 "" H 1250 2050 50  0001 C CNN
@@ -127,10 +127,10 @@ F 3 "" H 1250 2050 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L device:R R?
+L device:R R4
 U 1 1 5B61A490
 P 1250 2250
-F 0 "R?" V 1150 2250 50  0000 C CNN
+F 0 "R4" V 1150 2250 50  0000 C CNN
 F 1 "12k" V 1250 2250 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805_HandSoldering" V 1180 2250 50  0001 C CNN
 F 3 "" H 1250 2250 50  0001 C CNN
@@ -138,10 +138,10 @@ F 3 "" H 1250 2250 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L device:R R?
+L device:R R5
 U 1 1 5B61A4C8
 P 1250 2450
-F 0 "R?" V 1150 2450 50  0000 C CNN
+F 0 "R5" V 1150 2450 50  0000 C CNN
 F 1 "12k" V 1250 2450 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805_HandSoldering" V 1180 2450 50  0001 C CNN
 F 3 "" H 1250 2450 50  0001 C CNN
@@ -149,10 +149,10 @@ F 3 "" H 1250 2450 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L device:R R?
+L device:R R6
 U 1 1 5B61A4EA
 P 1250 2650
-F 0 "R?" V 1150 2650 50  0000 C CNN
+F 0 "R6" V 1150 2650 50  0000 C CNN
 F 1 "12k" V 1250 2650 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805_HandSoldering" V 1180 2650 50  0001 C CNN
 F 3 "" H 1250 2650 50  0001 C CNN
@@ -160,10 +160,10 @@ F 3 "" H 1250 2650 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L device:R R?
+L device:R R7
 U 1 1 5B61A5B4
 P 1250 2850
-F 0 "R?" V 1150 2850 50  0000 C CNN
+F 0 "R7" V 1150 2850 50  0000 C CNN
 F 1 "12k" V 1250 2850 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805_HandSoldering" V 1180 2850 50  0001 C CNN
 F 3 "" H 1250 2850 50  0001 C CNN
@@ -187,10 +187,10 @@ Connection ~ 1000 2450
 Wire Wire Line
 	1000 2450 1000 2250
 $Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR012
 U 1 1 5B61BD51
 P 1000 1950
-F 0 "#PWR?" H 1000 1800 50  0001 C CNN
+F 0 "#PWR012" H 1000 1800 50  0001 C CNN
 F 1 "+3V3" H 1015 2123 50  0000 C CNN
 F 2 "" H 1000 1950 50  0001 C CNN
 F 3 "" H 1000 1950 50  0001 C CNN
@@ -209,10 +209,10 @@ Wire Wire Line
 Wire Wire Line
 	1100 2850 1000 2850
 $Comp
-L power:GND #PWR?
+L power:GND #PWR013
 U 1 1 5B61EC07
 P 1000 2950
-F 0 "#PWR?" H 1000 2700 50  0001 C CNN
+F 0 "#PWR013" H 1000 2700 50  0001 C CNN
 F 1 "GND" H 1005 2777 50  0000 C CNN
 F 2 "" H 1000 2950 50  0001 C CNN
 F 3 "" H 1000 2950 50  0001 C CNN
@@ -228,14 +228,14 @@ GPIO2
 Text Label 1450 2450 0    50   ~ 0
 CH_PD
 Text Label 1450 2650 0    50   ~ 0
-RST
+RST_ESP
 Text Label 1450 2850 0    50   ~ 0
 GPIO15
 $Comp
-L device:C_Small C?
+L device:C_Small C7
 U 1 1 5B620CF1
 P 2000 2750
-F 0 "C?" H 2092 2796 50  0000 L CNN
+F 0 "C7" H 2092 2796 50  0000 L CNN
 F 1 "103" H 2092 2705 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 2000 2750 50  0001 C CNN
 F 3 "" H 2000 2750 50  0001 C CNN
@@ -245,10 +245,10 @@ $EndComp
 Wire Wire Line
 	1400 2850 1800 2850
 $Comp
-L power:GND #PWR?
+L power:GND #PWR017
 U 1 1 5B621FFB
 P 2000 2950
-F 0 "#PWR?" H 2000 2700 50  0001 C CNN
+F 0 "#PWR017" H 2000 2700 50  0001 C CNN
 F 1 "GND" H 2005 2777 50  0000 C CNN
 F 2 "" H 2000 2950 50  0001 C CNN
 F 3 "" H 2000 2950 50  0001 C CNN
@@ -260,146 +260,255 @@ Wire Wire Line
 Wire Wire Line
 	2000 2950 2000 2850
 Wire Wire Line
-	6300 2800 6600 2800
+	8900 2600 9200 2600
 Wire Wire Line
-	6300 2900 6600 2900
+	8900 2700 9200 2700
 Wire Wire Line
-	6300 3000 6600 3000
+	8900 2800 9200 2800
 Wire Wire Line
-	6300 3100 6600 3100
-NoConn ~ 5150 4200
-Text Label 6300 3400 0    50   ~ 0
+	8900 2900 9200 2900
+NoConn ~ 7750 4000
+Text Label 8900 3200 0    50   ~ 0
 GPIO15
-Text Label 6300 3200 0    50   ~ 0
+Text Label 8900 3000 0    50   ~ 0
 GPIO0
-Text Label 6300 3300 0    50   ~ 0
+Text Label 8900 3100 0    50   ~ 0
 GPIO2
 $Comp
-L Connector:Conn_01x02 J?
-U 1 1 5B62DC1E
-P 1050 3700
-F 0 "J?" H 970 3375 50  0000 C CNN
-F 1 "select boot" H 970 3466 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm" H 1050 3700 50  0001 C CNN
-F 3 "~" H 1050 3700 50  0001 C CNN
-	1    1050 3700
-	-1   0    0    1   
-$EndComp
-$Comp
-L power:GND #PWR?
-U 1 1 5B62E025
-P 1400 3750
-F 0 "#PWR?" H 1400 3500 50  0001 C CNN
-F 1 "GND" H 1405 3577 50  0000 C CNN
-F 2 "" H 1400 3750 50  0001 C CNN
-F 3 "" H 1400 3750 50  0001 C CNN
-	1    1400 3750
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	1250 3700 1400 3700
-Wire Wire Line
-	1400 3700 1400 3750
-Wire Wire Line
-	1250 3600 1600 3600
-Text Label 1350 3600 0    50   ~ 0
-GPIO0
-$Comp
-L Connector:Conn_01x04 J?
-U 1 1 5B6C3707
-P 1050 4450
-F 0 "J?" H 970 4025 50  0000 C CNN
-F 1 "nap" H 970 4116 50  0000 C CNN
-F 2 "" H 1050 4450 50  0001 C CNN
-F 3 "~" H 1050 4450 50  0001 C CNN
-	1    1050 4450
-	-1   0    0    1   
-$EndComp
-$Comp
-L power:+3V3 #PWR?
+L power:+3V3 #PWR014
 U 1 1 5B6C4359
-P 1250 4800
-F 0 "#PWR?" H 1250 4650 50  0001 C CNN
-F 1 "+3V3" H 1265 4973 50  0000 C CNN
-F 2 "" H 1250 4800 50  0001 C CNN
-F 3 "" H 1250 4800 50  0001 C CNN
-	1    1250 4800
+P 1250 6050
+F 0 "#PWR014" H 1250 5900 50  0001 C CNN
+F 1 "+3V3" H 1265 6223 50  0000 C CNN
+F 2 "" H 1250 6050 50  0001 C CNN
+F 3 "" H 1250 6050 50  0001 C CNN
+	1    1250 6050
 	-1   0    0    1   
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR016
 U 1 1 5B6C4F86
-P 1550 4450
-F 0 "#PWR?" H 1550 4200 50  0001 C CNN
-F 1 "GND" V 1555 4322 50  0000 R CNN
-F 2 "" H 1550 4450 50  0001 C CNN
-F 3 "" H 1550 4450 50  0001 C CNN
-	1    1550 4450
+P 1550 5700
+F 0 "#PWR016" H 1550 5450 50  0001 C CNN
+F 1 "GND" V 1555 5572 50  0000 R CNN
+F 2 "" H 1550 5700 50  0001 C CNN
+F 3 "" H 1550 5700 50  0001 C CNN
+	1    1550 5700
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
-	1250 4450 1450 4450
+	1250 5700 1450 5700
 Wire Wire Line
-	1250 4800 1250 4650
+	1250 6050 1250 5900
 $Comp
-L device:C_Small C?
+L device:C_Small C6
 U 1 1 5B6C7440
-P 1450 4550
-F 0 "C?" H 1542 4596 50  0000 L CNN
-F 1 "104" H 1542 4505 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805" H 1450 4550 50  0001 C CNN
-F 3 "" H 1450 4550 50  0001 C CNN
-	1    1450 4550
+P 1450 5800
+F 0 "C6" H 1542 5846 50  0000 L CNN
+F 1 "104" H 1542 5755 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 1450 5800 50  0001 C CNN
+F 3 "" H 1450 5800 50  0001 C CNN
+	1    1450 5800
 	1    0    0    -1  
 $EndComp
-Connection ~ 1450 4450
+Connection ~ 1450 5700
 Wire Wire Line
-	1450 4450 1550 4450
+	1450 5700 1550 5700
 Wire Wire Line
-	1450 4650 1250 4650
-Connection ~ 1250 4650
+	1450 5900 1250 5900
+Connection ~ 1250 5900
 Wire Wire Line
-	1250 4650 1250 4550
+	1250 5900 1250 5800
 Wire Wire Line
-	1250 4250 1650 4250
+	1250 5500 1650 5500
 Wire Wire Line
-	1250 4350 1650 4350
-Text Label 6400 2800 0    50   ~ 0
+	1250 5600 1650 5600
+Text Label 9000 2600 0    50   ~ 0
 TXD
-Text Label 6400 2900 0    50   ~ 0
+Text Label 9000 2700 0    50   ~ 0
 RXD
-Text Label 1350 4350 0    50   ~ 0
+Text Label 1350 5600 0    50   ~ 0
 TXD
-Text Label 1350 4250 0    50   ~ 0
+Text Label 1350 5500 0    50   ~ 0
 RXD
-Text HLabel 4200 2800 0    50   Input ~ 0
+Text HLabel 3300 6150 0    50   Input ~ 0
 RST
-Text HLabel 6600 3300 2    50   Input ~ 0
+Text HLabel 9200 3100 2    50   Input ~ 0
 SDA_ESP
-Text HLabel 4200 3200 0    50   Input ~ 0
+Text HLabel 6800 3000 0    50   Input ~ 0
 SCL_ESP
-Text HLabel 6600 3000 2    50   Input ~ 0
+Text HLabel 9200 2800 2    50   Input ~ 0
 GPIO5
-Text HLabel 6600 3100 2    50   Input ~ 0
+Text HLabel 9200 2900 2    50   Input ~ 0
 GPIO4
-Text HLabel 6600 3200 2    50   Input ~ 0
+Text HLabel 9200 3000 2    50   Input ~ 0
 GPIO0
-Text HLabel 6600 3400 2    50   Input ~ 0
+Text HLabel 9200 3200 2    50   Input ~ 0
 GPIO15
-Text HLabel 4200 3100 0    50   Input ~ 0
+Text HLabel 6800 2900 0    50   Input ~ 0
 GPIO16
-Text HLabel 4200 3300 0    50   Input ~ 0
+Text HLabel 6800 3100 0    50   Input ~ 0
 GPIO12
-Text HLabel 4200 3400 0    50   Input ~ 0
+Text HLabel 6800 3200 0    50   Input ~ 0
 GPIO13
-Text HLabel 5250 4200 3    50   Input ~ 0
+Text HLabel 7850 4000 3    50   Input ~ 0
 MISO_ESP
-Text HLabel 5350 4200 3    50   Input ~ 0
+Text HLabel 7950 4000 3    50   Input ~ 0
 GPIO9
-Text HLabel 5450 4200 3    50   Input ~ 0
+Text HLabel 8050 4000 3    50   Input ~ 0
 GPIO10
-Text HLabel 5550 4200 3    50   Input ~ 0
+Text HLabel 8150 4000 3    50   Input ~ 0
 MOSI_ESP
-Text HLabel 5650 4200 3    50   Input ~ 0
+Text HLabel 8250 4000 3    50   Input ~ 0
 SCLK_ESP
+$Comp
+L device:R R11
+U 1 1 5B748144
+P 3650 5150
+F 0 "R11" V 3443 5150 50  0000 C CNN
+F 1 "12k" V 3534 5150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 3580 5150 50  0001 C CNN
+F 3 "" H 3650 5150 50  0001 C CNN
+	1    3650 5150
+	0    1    1    0   
+$EndComp
+$Comp
+L device:R R10
+U 1 1 5B7483AD
+P 3650 4450
+F 0 "R10" V 3443 4450 50  0000 C CNN
+F 1 "12k" V 3534 4450 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 3580 4450 50  0001 C CNN
+F 3 "" H 3650 4450 50  0001 C CNN
+	1    3650 4450
+	0    1    1    0   
+$EndComp
+$Comp
+L Transistor:2N2219 Q3
+U 1 1 5B748949
+P 4250 4450
+F 0 "Q3" H 4441 4496 50  0000 L CNN
+F 1 "MMBT9018" H 4441 4405 50  0000 L CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23" H 4450 4375 50  0001 L CIN
+F 3 "http://www.onsemi.com/pub_link/Collateral/2N2219-D.PDF" H 4250 4450 50  0001 L CNN
+	1    4250 4450
+	1    0    0    -1  
+$EndComp
+$Comp
+L Transistor:2N2219 Q4
+U 1 1 5B7499E4
+P 4250 5150
+F 0 "Q4" H 4441 5104 50  0000 L CNN
+F 1 "MMBT9018" H 4441 5195 50  0000 L CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23" H 4450 5075 50  0001 L CIN
+F 3 "http://www.onsemi.com/pub_link/Collateral/2N2219-D.PDF" H 4250 5150 50  0001 L CNN
+	1    4250 5150
+	1    0    0    1   
+$EndComp
+Wire Wire Line
+	4350 4250 4350 4200
+Wire Wire Line
+	4350 4200 4650 4200
+Wire Wire Line
+	3800 4450 3850 4450
+Wire Wire Line
+	3800 5150 3850 5150
+Wire Wire Line
+	4350 4950 4350 4850
+Wire Wire Line
+	4350 4850 3850 4850
+Wire Wire Line
+	3850 4850 3850 4450
+Connection ~ 3850 4450
+Wire Wire Line
+	3850 4450 4050 4450
+Wire Wire Line
+	3850 5150 3850 4950
+Wire Wire Line
+	3850 4950 4150 4950
+Wire Wire Line
+	4150 4950 4150 4650
+Wire Wire Line
+	4150 4650 4350 4650
+Connection ~ 3850 5150
+Wire Wire Line
+	3850 5150 4050 5150
+Wire Wire Line
+	4350 5350 4700 5350
+Wire Wire Line
+	3500 4450 3100 4450
+Wire Wire Line
+	3500 5150 3100 5150
+Text Label 4450 4200 0    50   ~ 0
+RST_ESP
+Text Label 4450 5350 0    50   ~ 0
+GPIO0
+Text Label 3150 4450 0    50   ~ 0
+DTR
+Text Label 3150 5150 0    50   ~ 0
+RTS
+$Comp
+L Connector:Conn_01x06 J5
+U 1 1 5B755821
+P 1050 5600
+F 0 "J5" H 970 5075 50  0000 C CNN
+F 1 "Conn_01x06" H 970 5166 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x06_Pitch2.54mm" H 1050 5600 50  0001 C CNN
+F 3 "~" H 1050 5600 50  0001 C CNN
+	1    1050 5600
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	1250 5300 1650 5300
+Wire Wire Line
+	1250 5400 1650 5400
+Text Label 1350 5400 0    50   ~ 0
+RTS
+Text Label 1350 5300 0    50   ~ 0
+DTR
+$Comp
+L device:R R12
+U 1 1 5B77A49F
+P 3650 6150
+F 0 "R12" V 3443 6150 50  0000 C CNN
+F 1 "220R" V 3534 6150 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805" V 3580 6150 50  0001 C CNN
+F 3 "" H 3650 6150 50  0001 C CNN
+	1    3650 6150
+	0    1    1    0   
+$EndComp
+$Comp
+L Transistor:2N2219 Q5
+U 1 1 5B77A669
+P 4200 6150
+F 0 "Q5" H 4391 6196 50  0000 L CNN
+F 1 "MMBT9018" H 4391 6105 50  0000 L CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23" H 4400 6075 50  0001 L CIN
+F 3 "http://www.onsemi.com/pub_link/Collateral/2N2219-D.PDF" H 4200 6150 50  0001 L CNN
+	1    4200 6150
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR03
+U 1 1 5B780890
+P 4300 6450
+F 0 "#PWR03" H 4300 6200 50  0001 C CNN
+F 1 "GND" V 4305 6322 50  0000 R CNN
+F 2 "" H 4300 6450 50  0001 C CNN
+F 3 "" H 4300 6450 50  0001 C CNN
+	1    4300 6450
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3300 6150 3500 6150
+Wire Wire Line
+	3800 6150 4000 6150
+Wire Wire Line
+	4300 6350 4300 6450
+Wire Wire Line
+	4300 5950 4300 5750
+Wire Wire Line
+	4300 5750 4600 5750
+Text Label 4400 5750 0    50   ~ 0
+RST_ESP
 $EndSCHEMATC

+ 45 - 72
motor.bak

@@ -15,21 +15,21 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L Connector:Conn_01x02 J?
+L Connector:Conn_01x02 J2
 U 1 1 5B62FA88
 P 2000 2300
-F 0 "J?" H 1920 1975 50  0000 C CNN
+F 0 "J2" H 1920 1975 50  0000 C CNN
 F 1 "power 12V" H 1920 2066 50  0000 C CNN
-F 2 "" H 2000 2300 50  0001 C CNN
+F 2 "Connectors_Terminal_Blocks:TerminalBlock_Philmore_TB132_02x5mm_Straight" H 2000 2300 50  0001 C CNN
 F 3 "~" H 2000 2300 50  0001 C CNN
 	1    2000 2300
 	-1   0    0    1   
 $EndComp
 $Comp
-L power:GND #PWR?
+L power:GND #PWR04
 U 1 1 5B62FC7F
 P 2350 2800
-F 0 "#PWR?" H 2350 2550 50  0001 C CNN
+F 0 "#PWR04" H 2350 2550 50  0001 C CNN
 F 1 "GND" H 2355 2627 50  0000 C CNN
 F 2 "" H 2350 2800 50  0001 C CNN
 F 3 "" H 2350 2800 50  0001 C CNN
@@ -41,10 +41,10 @@ Wire Wire Line
 Wire Wire Line
 	2200 2200 2400 2200
 $Comp
-L power:+12V #PWR?
+L power:+12V #PWR05
 U 1 1 5B62FD2D
 P 2400 2050
-F 0 "#PWR?" H 2400 1900 50  0001 C CNN
+F 0 "#PWR05" H 2400 1900 50  0001 C CNN
 F 1 "+12V" H 2415 2223 50  0000 C CNN
 F 2 "" H 2400 2050 50  0001 C CNN
 F 3 "" H 2400 2050 50  0001 C CNN
@@ -55,10 +55,10 @@ Wire Wire Line
 	2400 2050 2400 2200
 Connection ~ 2400 2200
 $Comp
-L device:R R?
+L device:R R1
 U 1 1 5B63085B
 P 7750 2900
-F 0 "R?" V 7543 2900 50  0000 C CNN
+F 0 "R1" V 7543 2900 50  0000 C CNN
 F 1 "10R" V 7634 2900 50  0000 C CNN
 F 2 "Resistors_SMD:R_0805" V 7680 2900 50  0001 C CNN
 F 3 "" H 7750 2900 50  0001 C CNN
@@ -68,14 +68,14 @@ $EndComp
 Wire Wire Line
 	7600 2900 7300 2900