Browse Source

layout mach 20/8 SD card va connect keypad ESP

sonnt 4 years ago
parent
commit
e657af291b
3 changed files with 229 additions and 125 deletions
  1. 121 47
      display.sch
  2. 72 44
      vinhome.kicad_pcb
  3. 36 34
      vinhome.sch

+ 121 - 47
display.sch

@@ -65,17 +65,6 @@ F 3 "http://www.fairchildsemi.com/ds/BC/BC807.pdf" H 3350 2450 50  0001 L CNN
 $EndComp
 Wire Wire Line
 	3250 2100 3250 2250
-$Comp
-L Connector:Conn_01x11 J1
-U 1 1 5B765827
-P 2300 2550
-F 0 "J1" H 2220 3267 50  0000 C CNN
-F 1 "Conn_01x11" H 2220 3176 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x11_Pitch2.54mm" H 2300 2550 50  0001 C CNN
-F 3 "~" H 2300 2550 50  0001 C CNN
-	1    2300 2550
-	-1   0    0    -1  
-$EndComp
 Wire Wire Line
 	2500 2250 2800 2250
 Wire Wire Line
@@ -91,58 +80,143 @@ Wire Wire Line
 $Comp
 L device:C_Small C15
 U 1 1 5B765EF1
-P 2700 2050
-F 0 "C15" H 2792 2096 50  0000 L CNN
-F 1 "104" H 2792 2005 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805" H 2700 2050 50  0001 C CNN
-F 3 "" H 2700 2050 50  0001 C CNN
-	1    2700 2050
+P 2700 1950
+F 0 "C15" H 2792 1996 50  0000 L CNN
+F 1 "104" H 2792 1905 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 2700 1950 50  0001 C CNN
+F 3 "" H 2700 1950 50  0001 C CNN
+	1    2700 1950
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	2500 2050 2500 1950
-Wire Wire Line
-	2500 1950 2700 1950
 $Comp
 L power:GND #PWR01
 U 1 1 5B766203
-P 2700 1950
-F 0 "#PWR01" H 2700 1700 50  0001 C CNN
-F 1 "GND" H 2705 1777 50  0000 C CNN
-F 2 "" H 2700 1950 50  0001 C CNN
-F 3 "" H 2700 1950 50  0001 C CNN
-	1    2700 1950
+P 2700 1750
+F 0 "#PWR01" H 2700 1500 50  0001 C CNN
+F 1 "GND" H 2705 1577 50  0000 C CNN
+F 2 "" H 2700 1750 50  0001 C CNN
+F 3 "" H 2700 1750 50  0001 C CNN
+	1    2700 1750
 	-1   0    0    1   
 $EndComp
-Connection ~ 2700 1950
 $Comp
 L power:+3V3 #PWR03
 U 1 1 5B7662BA
-P 2900 1950
-F 0 "#PWR03" H 2900 1800 50  0001 C CNN
-F 1 "+3V3" H 2915 2123 50  0000 C CNN
-F 2 "" H 2900 1950 50  0001 C CNN
-F 3 "" H 2900 1950 50  0001 C CNN
-	1    2900 1950
+P 2900 2050
+F 0 "#PWR03" H 2900 1900 50  0001 C CNN
+F 1 "+3V3" H 2915 2223 50  0000 C CNN
+F 2 "" H 2900 2050 50  0001 C CNN
+F 3 "" H 2900 2050 50  0001 C CNN
+	1    2900 2050
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:Conn_01x09 J1
+U 1 1 5B7AC080
+P 2300 2350
+F 0 "J1" H 2220 1725 50  0000 C CNN
+F 1 "lcd" H 2220 1816 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x09_Pitch2.54mm" H 2300 2350 50  0001 C CNN
+F 3 "~" H 2300 2350 50  0001 C CNN
+	1    2300 2350
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	2500 1950 2500 1850
+Wire Wire Line
+	2500 1850 2700 1850
+Wire Wire Line
+	2700 1850 2700 1750
+Connection ~ 2700 1850
+Wire Wire Line
+	2500 2050 2700 2050
+Connection ~ 2700 2050
+Wire Wire Line
+	2700 2050 2900 2050
+Wire Wire Line
+	2500 2150 2800 2150
+Text HLabel 2800 2150 2    50   Input ~ 0
+CS_LCD
+$Comp
+L Connector:Conn_01x06 J7
+U 1 1 5B7AD180
+P 2300 3900
+F 0 "J7" H 2220 3375 50  0000 C CNN
+F 1 "SD_card" H 2220 3466 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x06_Pitch2.54mm" H 2300 3900 50  0001 C CNN
+F 3 "~" H 2300 3900 50  0001 C CNN
+	1    2300 3900
+	-1   0    0    1   
+$EndComp
+$Comp
+L device:C_Small C16
+U 1 1 5B7AD6EA
+P 2750 3600
+F 0 "C16" H 2842 3646 50  0000 L CNN
+F 1 "104" H 2842 3555 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805" H 2750 3600 50  0001 C CNN
+F 3 "" H 2750 3600 50  0001 C CNN
+	1    2750 3600
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:GND #PWR032
+U 1 1 5B7AD7DA
+P 2750 3450
+F 0 "#PWR032" H 2750 3200 50  0001 C CNN
+F 1 "GND" H 2755 3277 50  0000 C CNN
+F 2 "" H 2750 3450 50  0001 C CNN
+F 3 "" H 2750 3450 50  0001 C CNN
+	1    2750 3450
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:+3V3 #PWR033
+U 1 1 5B7AD834
+P 3000 3650
+F 0 "#PWR033" H 3000 3500 50  0001 C CNN
+F 1 "+3V3" H 3015 3823 50  0000 C CNN
+F 2 "" H 3000 3650 50  0001 C CNN
+F 3 "" H 3000 3650 50  0001 C CNN
+	1    3000 3650
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2500 2150 2700 2150
+	2500 3600 2600 3600
+Wire Wire Line
+	2600 3600 2600 3500
+Wire Wire Line
+	2600 3500 2750 3500
+Wire Wire Line
+	2750 3500 2750 3450
+Connection ~ 2750 3500
+Wire Wire Line
+	2500 3700 2750 3700
+Wire Wire Line
+	3000 3700 3000 3650
+Connection ~ 2750 3700
 Wire Wire Line
-	2700 2150 2900 2150
+	2750 3700 3000 3700
 Wire Wire Line
-	2900 2150 2900 1950
-Connection ~ 2700 2150
+	2500 3800 2800 3800
 Wire Wire Line
-	2500 2850 2800 2850
+	2500 3900 2800 3900
 Wire Wire Line
-	2500 2950 2800 2950
+	2500 4000 2800 4000
 Wire Wire Line
-	2500 3050 2800 3050
-Text HLabel 2800 2850 2    50   Input ~ 0
-CS1
-Text HLabel 2800 2950 2    50   Input ~ 0
-CS2
-Text HLabel 2800 3050 2    50   Input ~ 0
-PEN
+	2500 4100 2800 4100
+Text HLabel 2800 3800 2    50   Input ~ 0
+SD_CS
+Text Label 2500 2250 0    50   ~ 0
+SCK_TFT
+Text Label 2500 2350 0    50   ~ 0
+MOSI_TFT
+Text Label 2500 2750 0    50   ~ 0
+MISO_TFT
+Text Label 2500 3900 0    50   ~ 0
+MOSI_TFT
+Text Label 2500 4000 0    50   ~ 0
+MISO_TFT
+Text Label 2500 4100 0    50   ~ 0
+SCK_TFT
 $EndSCHEMATC

+ 72 - 44
vinhome.kicad_pcb

@@ -3,7 +3,7 @@
   (general
     (thickness 1.6)
     (drawings 5)
-    (tracks 425)
+    (tracks 453)
     (zones 0)
     (modules 46)
     (nets 49)
@@ -1317,7 +1317,7 @@
   )
 
   (module Resistors_SMD:R_0805_HandSoldering (layer B.Cu) (tedit 58E0A804) (tstamp 5B79BADD)
-    (at 113.03 146.685)
+    (at 111.76 146.685)
     (descr "Resistor SMD 0805, hand soldering")
     (tags "resistor 0805")
     (path /5B6C3004/5B6EB8E6)
@@ -1967,18 +1967,18 @@
   )
 
   (module Capacitors_SMD:C_0805 (layer F.Cu) (tedit 58AA8463) (tstamp 5B792110)
-    (at 86.36 118.11 180)
+    (at 85.344 119.253 90)
     (descr "Capacitor SMD 0805, reflow soldering, AVX (see smccp.pdf)")
     (tags "capacitor 0805")
     (path /5B71ECD0/5B76BCD3)
     (attr smd)
-    (fp_text reference C14 (at 0 -1.5 180) (layer F.SilkS)
+    (fp_text reference C14 (at 0 -1.5 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 104 (at 0 1.75 180) (layer F.Fab)
+    (fp_text value 104 (at 0 1.75 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text user %R (at 0 -1.5 180) (layer F.Fab)
+    (fp_text user %R (at 0 -1.5 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -1 0.62) (end -1 -0.62) (layer F.Fab) (width 0.1))
@@ -1991,9 +1991,9 @@
     (fp_line (start -1.75 -0.88) (end -1.75 0.87) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.75 0.87) (end 1.75 -0.88) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.75 0.87) (end -1.75 0.87) (layer F.CrtYd) (width 0.05))
-    (pad 1 smd rect (at -1 0 180) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
+    (pad 1 smd rect (at -1 0 90) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
       (net 1 GND))
-    (pad 2 smd rect (at 1 0 180) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
+    (pad 2 smd rect (at 1 0 90) (size 1 1.25) (layers F.Cu F.Paste F.Mask)
       (net 3 +3V3))
     (model Capacitors_SMD.3dshapes/C_0805.wrl
       (at (xyz 0 0 0))
@@ -2132,6 +2132,10 @@
   (gr_line (start 64.77 153.67) (end 123.825 153.67) (layer Edge.Cuts) (width 0.15))
   (gr_line (start 64.77 153.67) (end 64.77 113.03) (layer Edge.Cuts) (width 0.15))
 
+  (via (at 67.31 115.57) (size 4) (drill 3.2) (layers F.Cu B.Cu) (net 0))
+  (via (at 121.92 115.57) (size 4) (drill 3.2) (layers F.Cu B.Cu) (net 0))
+  (via (at 67.31 151.13) (size 4) (drill 3.2) (layers F.Cu B.Cu) (net 0) (tstamp 5B7A2ED2))
+  (via (at 121.92 151.13) (size 4) (drill 3.2) (layers F.Cu B.Cu) (net 0) (tstamp 5B7A2EE8))
   (segment (start 116.86 123.825) (end 114.3 121.265) (width 1.5) (layer B.Cu) (net 1) (status 20))
   (segment (start 121.285 123.825) (end 116.86 123.825) (width 1.5) (layer B.Cu) (net 1) (status 10))
   (segment (start 114.3 125.73) (end 114.3 121.265) (width 1.5) (layer B.Cu) (net 1) (status 30))
@@ -2173,6 +2177,14 @@
   (segment (start 70.739 122.936) (end 71.735 121.94) (width 0.254) (layer F.Cu) (net 1))
   (segment (start 72.898 118.852) (end 73.005 118.745) (width 0.254) (layer F.Cu) (net 1))
   (segment (start 72.898 121.94) (end 72.898 118.852) (width 0.254) (layer F.Cu) (net 1))
+  (segment (start 99.06 125.73) (end 114.3 125.73) (width 1.27) (layer B.Cu) (net 1))
+  (segment (start 113.919 125.349) (end 114.3 125.73) (width 1.27) (layer F.Cu) (net 1))
+  (segment (start 111.046 125.349) (end 113.919 125.349) (width 1.27) (layer F.Cu) (net 1))
+  (segment (start 108.29 128.105) (end 111.046 125.349) (width 1.27) (layer F.Cu) (net 1))
+  (segment (start 108.29 130.175) (end 108.29 128.105) (width 1.27) (layer F.Cu) (net 1))
+  (segment (start 101.668 141.878) (end 106.318 141.878) (width 0.254) (layer F.Cu) (net 1))
+  (segment (start 107.118 142.678) (end 110.168 142.678) (width 0.254) (layer F.Cu) (net 1))
+  (segment (start 106.318 141.878) (end 107.118 142.678) (width 0.254) (layer F.Cu) (net 1))
   (segment (start 114.36 118.825) (end 114.3 118.765) (width 1.5) (layer B.Cu) (net 2) (status 30))
   (segment (start 121.285 118.825) (end 114.36 118.825) (width 1.5) (layer B.Cu) (net 2) (status 30))
   (segment (start 96.52 114.3) (end 95.25 115.57) (width 1.5) (layer B.Cu) (net 2) (status 20))
@@ -2189,12 +2201,9 @@
   (segment (start 83.74 137.16) (end 83.74 139.7) (width 0.381) (layer B.Cu) (net 3) (status 30))
   (segment (start 103.8 121.58) (end 103.8 130.175) (width 1.27) (layer F.Cu) (net 3) (status 20))
   (segment (start 99.06 116.84) (end 103.8 121.58) (width 1.27) (layer F.Cu) (net 3) (status 10))
-  (segment (start 120.65 146.685) (end 121.285 147.32) (width 0.381) (layer B.Cu) (net 3) (status 30))
-  (segment (start 114.38 146.685) (end 120.65 146.685) (width 0.381) (layer B.Cu) (net 3) (status 30))
   (segment (start 68.088 146.542) (end 67.31 147.32) (width 0.508) (layer F.Cu) (net 3) (status 30))
   (segment (start 69.85 146.542) (end 68.088 146.542) (width 0.508) (layer F.Cu) (net 3) (status 30))
   (segment (start 71.644 146.542) (end 69.85 146.542) (width 0.508) (layer F.Cu) (net 3) (status 20))
-  (segment (start 74.646 143.54) (end 71.644 146.542) (width 0.508) (layer F.Cu) (net 3) (status 10))
   (segment (start 74.93 143.54) (end 74.646 143.54) (width 0.508) (layer F.Cu) (net 3) (status 30))
   (segment (start 68.072 132.842) (end 67.31 132.08) (width 0.508) (layer B.Cu) (net 3) (status 30))
   (segment (start 70.532 132.842) (end 68.072 132.842) (width 0.508) (layer B.Cu) (net 3) (status 30))
@@ -2208,7 +2217,6 @@
   (segment (start 67.33 147.3) (end 67.31 147.32) (width 0.762) (layer B.Cu) (net 3) (status 30))
   (segment (start 70.485 147.3) (end 67.33 147.3) (width 0.762) (layer B.Cu) (net 3) (status 30))
   (segment (start 85.36 115.84) (end 85.09 115.57) (width 0.254) (layer F.Cu) (net 3) (status 30))
-  (segment (start 85.36 118.11) (end 85.36 115.84) (width 0.254) (layer F.Cu) (net 3) (status 30))
   (segment (start 118.618 148.61) (end 118.344 148.336) (width 0.762) (layer F.Cu) (net 3) (status 30))
   (segment (start 118.618 151.13) (end 118.618 148.61) (width 0.762) (layer F.Cu) (net 3) (status 30))
   (segment (start 120.269 148.336) (end 121.285 147.32) (width 0.762) (layer F.Cu) (net 3) (status 20))
@@ -2238,10 +2246,29 @@
   (segment (start 103.8 131.277) (end 103.8 130.175) (width 0.508) (layer F.Cu) (net 3))
   (segment (start 98.806 136.271) (end 103.8 131.277) (width 0.508) (layer F.Cu) (net 3))
   (segment (start 98.806 139.716) (end 98.806 136.271) (width 0.508) (layer F.Cu) (net 3))
-  (segment (start 111.315 146.32) (end 111.68 146.685) (width 0.25) (layer B.Cu) (net 4) (status 30))
-  (segment (start 107.95 146.32) (end 111.315 146.32) (width 0.25) (layer B.Cu) (net 4) (status 30))
-  (segment (start 108.585026 145.684974) (end 107.95 146.32) (width 0.254) (layer B.Cu) (net 4) (status 20))
-  (segment (start 108.585 145.685) (end 107.95 146.32) (width 0.254) (layer B.Cu) (net 4) (status 20))
+  (segment (start 70.532 132.842) (end 70.532 140.255) (width 0.762) (layer B.Cu) (net 3))
+  (via (at 73.152 145.034) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 3))
+  (segment (start 74.646 143.54) (end 73.152 145.034) (width 0.508) (layer F.Cu) (net 3))
+  (segment (start 73.152 145.034) (end 71.644 146.542) (width 0.508) (layer F.Cu) (net 3))
+  (segment (start 73.152 142.875) (end 73.152 145.034) (width 0.762) (layer B.Cu) (net 3))
+  (segment (start 70.532 140.255) (end 73.152 142.875) (width 0.762) (layer B.Cu) (net 3))
+  (segment (start 74.93 143.54) (end 75.849 142.621) (width 0.254) (layer F.Cu) (net 3))
+  (segment (start 75.849 142.621) (end 82.677 142.621) (width 0.254) (layer F.Cu) (net 3))
+  (via (at 83.74 139.7) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 3))
+  (segment (start 83.74 141.558) (end 83.74 139.7) (width 0.254) (layer F.Cu) (net 3))
+  (segment (start 82.677 142.621) (end 83.74 141.558) (width 0.254) (layer F.Cu) (net 3))
+  (segment (start 85.09 115.57) (end 85.09 116.967) (width 1.016) (layer B.Cu) (net 3))
+  (via (at 91.078 118.11) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 3))
+  (segment (start 86.233 118.11) (end 91.078 118.11) (width 1.016) (layer B.Cu) (net 3))
+  (segment (start 85.09 116.967) (end 86.233 118.11) (width 1.016) (layer B.Cu) (net 3))
+  (segment (start 98.298 118.11) (end 91.18601 118.11) (width 1.016) (layer F.Cu) (net 3))
+  (segment (start 99.06 117.348) (end 98.298 118.11) (width 1.016) (layer F.Cu) (net 3))
+  (segment (start 99.06 116.84) (end 99.06 117.348) (width 1.016) (layer F.Cu) (net 3))
+  (segment (start 85.344 115.824) (end 85.09 115.57) (width 1.016) (layer F.Cu) (net 3))
+  (segment (start 85.344 118.253) (end 85.344 115.824) (width 1.016) (layer F.Cu) (net 3))
+  (segment (start 113.11 146.685) (end 113.21 146.685) (width 0.762) (layer B.Cu) (net 3))
+  (segment (start 120.65 146.685) (end 121.285 147.32) (width 0.254) (layer B.Cu) (net 3))
+  (segment (start 113.11 146.685) (end 120.65 146.685) (width 0.254) (layer B.Cu) (net 3))
   (segment (start 103.886 150.622) (end 103.378 151.13) (width 0.254) (layer F.Cu) (net 4) (status 30))
   (segment (start 103.886 149.86) (end 103.886 150.622) (width 0.254) (layer F.Cu) (net 4) (status 20))
   (segment (start 106.318 147.428) (end 103.886 149.86) (width 0.254) (layer F.Cu) (net 4))
@@ -2249,6 +2276,8 @@
   (segment (start 103.378 150.368) (end 103.378 151.13) (width 0.254) (layer B.Cu) (net 4) (status 30))
   (segment (start 107.426 146.32) (end 103.378 150.368) (width 0.254) (layer B.Cu) (net 4) (status 30))
   (segment (start 107.95 146.32) (end 107.426 146.32) (width 0.254) (layer B.Cu) (net 4) (status 30))
+  (segment (start 108.315 146.685) (end 107.95 146.32) (width 0.254) (layer B.Cu) (net 4))
+  (segment (start 110.41 146.685) (end 108.315 146.685) (width 0.254) (layer B.Cu) (net 4))
   (segment (start 107.95 150.622) (end 108.458 151.13) (width 0.508) (layer B.Cu) (net 5) (status 30))
   (segment (start 107.95 148.32) (end 107.95 150.622) (width 0.508) (layer B.Cu) (net 5) (status 30))
   (segment (start 116.058 142.108) (end 115.808 141.858) (width 0.254) (layer F.Cu) (net 6) (status 30))
@@ -2285,16 +2314,18 @@
   (segment (start 97.79 137.287) (end 94.418685 137.287) (width 0.254) (layer B.Cu) (net 13))
   (via (at 93.853 137.287) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 13))
   (segment (start 94.418685 137.287) (end 93.853 137.287) (width 0.254) (layer B.Cu) (net 13))
-  (segment (start 93.726 121.666) (end 87.63 115.57) (width 0.254) (layer F.Cu) (net 13))
-  (segment (start 93.726 136.594315) (end 93.726 121.666) (width 0.254) (layer F.Cu) (net 13))
-  (segment (start 93.853 136.721315) (end 93.726 136.594315) (width 0.254) (layer F.Cu) (net 13))
+  (segment (start 87.63 119.38) (end 87.63 115.57) (width 0.254) (layer F.Cu) (net 13))
   (segment (start 93.853 137.287) (end 93.853 136.721315) (width 0.254) (layer F.Cu) (net 13))
-  (segment (start 98.435502 147.32) (end 103.38 147.32) (width 0.254) (layer F.Cu) (net 14))
-  (segment (start 90.17 115.57) (end 95.758 121.158) (width 0.254) (layer F.Cu) (net 14))
+  (segment (start 93.726 136.594315) (end 93.726 125.476) (width 0.254) (layer F.Cu) (net 13))
+  (segment (start 93.853 136.721315) (end 93.726 136.594315) (width 0.254) (layer F.Cu) (net 13))
+  (segment (start 93.726 125.476) (end 87.63 119.38) (width 0.254) (layer F.Cu) (net 13))
   (segment (start 103.918 146.782) (end 103.918 145.728) (width 0.254) (layer F.Cu) (net 14))
-  (segment (start 95.758 121.158) (end 95.758 144.642498) (width 0.254) (layer F.Cu) (net 14))
-  (segment (start 95.758 144.642498) (end 98.435502 147.32) (width 0.254) (layer F.Cu) (net 14))
+  (segment (start 98.435502 147.32) (end 103.38 147.32) (width 0.254) (layer F.Cu) (net 14))
+  (segment (start 90.17 115.57) (end 90.17 120.396) (width 0.254) (layer F.Cu) (net 14))
+  (segment (start 95.758 125.984) (end 95.758 144.642498) (width 0.254) (layer F.Cu) (net 14))
   (segment (start 103.38 147.32) (end 103.918 146.782) (width 0.254) (layer F.Cu) (net 14))
+  (segment (start 90.17 120.396) (end 95.758 125.984) (width 0.254) (layer F.Cu) (net 14))
+  (segment (start 95.758 144.642498) (end 98.435502 147.32) (width 0.254) (layer F.Cu) (net 14))
   (via (at 79.121 125.984) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 15))
   (segment (start 77.958987 127.146013) (end 78.721001 126.383999) (width 0.254) (layer B.Cu) (net 15))
   (segment (start 67.31 127) (end 68.512081 127) (width 0.254) (layer B.Cu) (net 15))
@@ -2330,13 +2361,13 @@
   (segment (start 68.072 119.38) (end 67.31 119.38) (width 0.254) (layer F.Cu) (net 18) (status 30))
   (segment (start 69.342 123.19) (end 69.342 120.65) (width 0.254) (layer F.Cu) (net 18))
   (via (at 79.248 133.349994) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 19))
-  (segment (start 72.898 149.352) (end 72.898 139.699994) (width 0.254) (layer B.Cu) (net 19))
-  (segment (start 71.12 151.13) (end 72.898 149.352) (width 0.254) (layer B.Cu) (net 19) (status 10))
-  (segment (start 72.898 139.699994) (end 78.848001 133.749993) (width 0.254) (layer B.Cu) (net 19))
-  (segment (start 78.848001 133.749993) (end 79.248 133.349994) (width 0.254) (layer B.Cu) (net 19))
   (segment (start 81.480836 133.349994) (end 79.248 133.349994) (width 0.254) (layer F.Cu) (net 19))
   (segment (start 88.739994 133.349994) (end 81.480836 133.349994) (width 0.254) (layer F.Cu) (net 19))
   (segment (start 88.93 133.54) (end 88.739994 133.349994) (width 0.254) (layer F.Cu) (net 19))
+  (segment (start 74.549 147.701) (end 74.549 138.048994) (width 0.254) (layer B.Cu) (net 19))
+  (segment (start 78.848001 133.749993) (end 79.248 133.349994) (width 0.254) (layer B.Cu) (net 19))
+  (segment (start 74.549 138.048994) (end 78.848001 133.749993) (width 0.254) (layer B.Cu) (net 19))
+  (segment (start 71.12 151.13) (end 74.549 147.701) (width 0.254) (layer B.Cu) (net 19))
   (segment (start 110.744 148.336) (end 113.538 151.13) (width 0.254) (layer F.Cu) (net 20) (status 20))
   (segment (start 108.458 148.336) (end 110.744 148.336) (width 0.254) (layer F.Cu) (net 20))
   (segment (start 107.918 147.796) (end 108.458 148.336) (width 0.254) (layer F.Cu) (net 20))
@@ -2399,9 +2430,6 @@
   (segment (start 104.718 137.228) (end 104.718 135.693) (width 0.254) (layer F.Cu) (net 29))
   (segment (start 105.791 134.62) (end 112.477885 134.62) (width 0.254) (layer F.Cu) (net 29))
   (segment (start 112.477885 134.62) (end 112.731885 134.366) (width 0.254) (layer F.Cu) (net 29))
-  (segment (start 88.93 137.54) (end 86.74 137.54) (width 0.381) (layer F.Cu) (net 45) (status 10))
-  (segment (start 86.74 137.54) (end 86.36 137.16) (width 0.381) (layer F.Cu) (net 45))
-  (via (at 86.44 137.16) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 45) (status 30))
   (segment (start 94.554 122.661) (end 94.554 119.634) (width 0.762) (layer B.Cu) (net 30) (status 20))
   (segment (start 93.66 123.555) (end 94.554 122.661) (width 0.762) (layer B.Cu) (net 30) (status 10))
   (segment (start 93.726 123.621) (end 93.66 123.555) (width 0.254) (layer B.Cu) (net 30) (status 30))
@@ -2464,9 +2492,9 @@
   (segment (start 110.168 143.478) (end 112.046 143.478) (width 0.254) (layer F.Cu) (net 38))
   (via (at 112.024393 143.467562) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 38))
   (segment (start 112.056438 143.467562) (end 112.024393 143.467562) (width 0.254) (layer F.Cu) (net 38))
-  (segment (start 112.024393 143.467562) (end 116.289562 143.467562) (width 0.254) (layer B.Cu) (net 38))
-  (segment (start 117.602 144.78) (end 121.285 144.78) (width 0.254) (layer B.Cu) (net 38))
-  (segment (start 116.289562 143.467562) (end 117.602 144.78) (width 0.254) (layer B.Cu) (net 38))
+  (segment (start 119.38 144.78) (end 121.285 144.78) (width 0.254) (layer B.Cu) (net 38))
+  (segment (start 118.067562 143.467562) (end 119.38 144.78) (width 0.254) (layer B.Cu) (net 38))
+  (segment (start 112.024393 143.467562) (end 118.067562 143.467562) (width 0.254) (layer B.Cu) (net 38))
   (via (at 110.617 136.906) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 39))
   (segment (start 81.534 126.111) (end 81.534 120.269) (width 0.254) (layer B.Cu) (net 39))
   (segment (start 78.105 116.84) (end 78.105 115.57) (width 0.254) (layer B.Cu) (net 39))
@@ -2483,15 +2511,11 @@
   (via (at 110.49 135.528) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 40))
   (segment (start 110.344 135.382) (end 110.49 135.528) (width 0.254) (layer F.Cu) (net 40))
   (segment (start 108.71 135.382) (end 110.344 135.382) (width 0.254) (layer F.Cu) (net 40))
-  (segment (start 81.494999 116.419999) (end 80.645 115.57) (width 0.254) (layer B.Cu) (net 40))
-  (segment (start 82.423 124.079) (end 82.423 117.348) (width 0.254) (layer B.Cu) (net 40))
-  (segment (start 86.606999 129.316401) (end 86.606999 128.262999) (width 0.254) (layer B.Cu) (net 40))
-  (segment (start 110.49 135.528) (end 93.872 135.528) (width 0.254) (layer B.Cu) (net 40))
+  (segment (start 110.49 135.528) (end 92.221 135.528) (width 0.254) (layer B.Cu) (net 40))
   (segment (start 82.423 117.348) (end 81.494999 116.419999) (width 0.254) (layer B.Cu) (net 40))
-  (segment (start 93.872 135.528) (end 87.762001 129.418001) (width 0.254) (layer B.Cu) (net 40))
-  (segment (start 86.606999 128.262999) (end 82.423 124.079) (width 0.254) (layer B.Cu) (net 40))
-  (segment (start 87.762001 129.418001) (end 86.708599 129.418001) (width 0.254) (layer B.Cu) (net 40))
-  (segment (start 86.708599 129.418001) (end 86.606999 129.316401) (width 0.254) (layer B.Cu) (net 40))
+  (segment (start 81.494999 116.419999) (end 80.645 115.57) (width 0.254) (layer B.Cu) (net 40))
+  (segment (start 92.221 135.528) (end 82.423 125.73) (width 0.254) (layer B.Cu) (net 40))
+  (segment (start 82.423 125.73) (end 82.423 117.348) (width 0.254) (layer B.Cu) (net 40))
   (segment (start 83.058 130.556) (end 96.78001 144.27801) (width 0.254) (layer B.Cu) (net 41))
   (segment (start 97.055996 144.27801) (end 97.621681 144.27801) (width 0.254) (layer B.Cu) (net 41))
   (segment (start 101.668 144.278) (end 97.621691 144.278) (width 0.254) (layer F.Cu) (net 41))
@@ -2524,6 +2548,9 @@
   (segment (start 80.196081 148.844) (end 80.196081 148.776081) (width 0.381) (layer B.Cu) (net 44))
   (segment (start 79.01 147.59) (end 79.01 146.558) (width 0.381) (layer B.Cu) (net 44) (status 20))
   (segment (start 80.196081 148.776081) (end 79.01 147.59) (width 0.381) (layer B.Cu) (net 44))
+  (segment (start 88.93 137.54) (end 86.74 137.54) (width 0.381) (layer F.Cu) (net 45) (status 10))
+  (segment (start 86.74 137.54) (end 86.36 137.16) (width 0.381) (layer F.Cu) (net 45))
+  (via (at 86.44 137.16) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 45) (status 30))
   (segment (start 76.2 151.13) (end 76.2 140.916844) (width 0.254) (layer B.Cu) (net 45))
   (segment (start 84.816 135.636) (end 86.34 137.16) (width 0.254) (layer B.Cu) (net 45))
   (segment (start 81.480844 135.636) (end 84.816 135.636) (width 0.254) (layer B.Cu) (net 45))
@@ -2538,13 +2565,14 @@
   (segment (start 81.680001 135.436843) (end 81.407 135.709844) (width 0.254) (layer B.Cu) (net 45))
   (segment (start 80.029001 128.289001) (end 80.264 128.524) (width 0.254) (layer B.Cu) (net 45))
   (segment (start 80.029001 125.495001) (end 80.029001 128.289001) (width 0.254) (layer B.Cu) (net 45))
-  (segment (start 73.66 151.13) (end 73.66 142.113014) (width 0.254) (layer B.Cu) (net 46))
-  (segment (start 73.66 142.113014) (end 80.372001 135.401013) (width 0.254) (layer B.Cu) (net 46))
-  (segment (start 80.372001 135.401013) (end 80.772 135.001014) (width 0.254) (layer B.Cu) (net 46))
   (segment (start 81.337685 135.001014) (end 80.772 135.001014) (width 0.254) (layer F.Cu) (net 46))
   (segment (start 88.391014 135.001014) (end 81.337685 135.001014) (width 0.254) (layer F.Cu) (net 46))
   (via (at 80.772 135.001014) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 46))
   (segment (start 88.93 135.54) (end 88.391014 135.001014) (width 0.254) (layer F.Cu) (net 46))
+  (segment (start 80.372001 135.401013) (end 80.772 135.001014) (width 0.254) (layer B.Cu) (net 46))
+  (segment (start 75.184 140.589014) (end 80.372001 135.401013) (width 0.254) (layer B.Cu) (net 46))
+  (segment (start 75.184 149.606) (end 75.184 140.589014) (width 0.254) (layer B.Cu) (net 46))
+  (segment (start 73.66 151.13) (end 75.184 149.606) (width 0.254) (layer B.Cu) (net 46))
   (segment (start 71.12 124.14) (end 71.42 124.14) (width 0.254) (layer B.Cu) (net 47) (status 30))
   (segment (start 72.182 123.51) (end 73.93 123.51) (width 0.254) (layer B.Cu) (net 47) (status 20))
   (segment (start 71.12 124.14) (end 71.186 124.14) (width 0.254) (layer B.Cu) (net 47) (status 30))

+ 36 - 34
vinhome.sch

@@ -25,9 +25,8 @@ F4 "RES" I L 6500 5700 50
 F5 "DC" I L 6500 5800 50 
 F6 "MISO" I L 6500 5600 50 
 F7 "BLK" I L 6500 6100 50 
-F8 "CS1" I L 6500 6200 50 
-F9 "CS2" I L 6500 6300 50 
-F10 "PEN" I L 6500 6400 50 
+F8 "CS_lcd" I L 6500 6200 50 
+F9 "CS_SD" I L 6500 6300 50 
 $EndSheet
 $Sheet
 S 2650 2950 850  1050
@@ -39,13 +38,13 @@ F3 "open" I R 3500 3750 50
 F4 "NO" I R 3500 3850 50 
 $EndSheet
 $Sheet
-S 3450 4200 850  550 
+S 2750 5400 850  550 
 U 5B629A42
 F0 "Sheet5B629A41" 50
 F1 "keypad.sch" 50
-F2 "SCL" I R 4300 4300 50 
-F3 "SDO" I R 4300 4400 50 
-F4 "SDA" I R 4300 4500 50 
+F2 "SCL" I R 3600 5500 50 
+F3 "SDO" I R 3600 5600 50 
+F4 "SDA" I R 3600 5700 50 
 $EndSheet
 $Sheet
 S 4650 5150 1150 1450
@@ -55,13 +54,13 @@ F1 "main.sch" 50
 F2 "SDA_ESP" I R 5800 5250 50 
 F3 "SCL_ESP" I R 5800 5350 50 
 F4 "RST" I R 5800 5450 50 
-F5 "GPIO5" I R 5800 6400 50 
-F6 "GPIO4" I R 5800 6300 50 
+F5 "GPIO5" I R 5800 6300 50 
+F6 "GPIO4" I L 4650 5700 50 
 F7 "GPIO0" I R 5800 6200 50 
 F8 "GPIO15" I R 5800 6100 50 
 F9 "GPIO16" I L 4650 5250 50 
-F10 "GPIO13" I L 4650 5450 50 
-F11 "GPIO12" I L 4650 5350 50 
+F10 "GPIO13" I L 4650 5600 50 
+F11 "GPIO12" I L 4650 5500 50 
 F12 "GPIO9" I R 5800 5800 50 
 F13 "GPIO10" I R 5800 5700 50 
 F14 "MOSI_ESP" I R 5800 5900 50 
@@ -83,13 +82,13 @@ F8 "SCK" I R 6000 4000 50
 F9 "PC2" I L 4600 3650 50 
 F10 "PC3" I L 4600 3750 50 
 F11 "PD2" I R 6000 3700 50 
-F12 "PD3" I L 4600 3850 50 
+F12 "PD3" I L 4600 4650 50 
 F13 "PD4" I R 6000 3600 50 
 F14 "PD5" I L 4600 4400 50 
 F15 "PD6" I L 4600 4500 50 
-F16 "PD7" I L 4600 4650 50 
+F16 "PD7" I L 4600 4300 50 
 F17 "PB0" I L 4600 4050 50 
-F18 "PC0" I L 4600 4300 50 
+F18 "PC0" I L 4600 3850 50 
 F19 "PC1" I R 6000 4450 50 
 $EndSheet
 Wire Wire Line
@@ -110,12 +109,6 @@ Wire Wire Line
 	6250 4450 6250 5450
 Wire Wire Line
 	6250 5450 5800 5450
-Wire Wire Line
-	3700 5450 4650 5450
-Wire Wire Line
-	3700 5350 4650 5350
-Wire Wire Line
-	3700 5250 4650 5250
 $Sheet
 S 6550 3400 850  850 
 U 5B71ECD0
@@ -128,12 +121,6 @@ F5 "MOSI_RF" I L 6550 3800 50
 F6 "SCK_RF" I L 6550 3900 50 
 F7 "SDA_RF" I L 6550 4000 50 
 $EndSheet
-Wire Wire Line
-	4300 4300 4600 4300
-Wire Wire Line
-	4300 4400 4600 4400
-Wire Wire Line
-	4300 4500 4600 4500
 Wire Wire Line
 	6000 3600 6150 3600
 Wire Wire Line
@@ -170,7 +157,6 @@ Wire Wire Line
 	6400 4100 6400 4000
 Wire Wire Line
 	6400 4000 6550 4000
-NoConn ~ 4600 4650
 Wire Wire Line
 	5800 5600 6500 5600
 Wire Wire Line
@@ -191,19 +177,35 @@ Wire Wire Line
 	3500 3750 4600 3750
 Wire Wire Line
 	3500 3850 4600 3850
+Wire Wire Line
+	6500 6200 5800 6200
+Wire Wire Line
+	6500 6300 5800 6300
 $Sheet
-S 2950 5150 750  900 
+S 2750 4100 750  900 
 U 5B71E55D
 F0 "Sheet5B71E55C" 50
 F1 "connectorsch.sch" 50
-F2 "OUT_ESP1" I R 3700 5250 50 
-F3 "OUT_ESP2" I R 3700 5350 50 
-F4 "OUT_ESP3" I R 3700 5450 50 
+F2 "OUT_ESP1" I R 3500 4300 50 
+F3 "OUT_ESP2" I R 3500 4400 50 
+F4 "OUT_ESP3" I R 3500 4500 50 
 $EndSheet
 Wire Wire Line
-	5800 6200 6500 6200
+	3600 5500 4650 5500
 Wire Wire Line
-	6500 6300 5800 6300
+	3600 5600 4650 5600
+Wire Wire Line
+	3600 5700 4650 5700
+Wire Wire Line
+	4600 4300 3500 4300
+Wire Wire Line
+	4600 4400 3500 4400
+Wire Wire Line
+	4600 4500 3500 4500
+Wire Wire Line
+	4600 4650 4450 4650
+Wire Wire Line
+	4450 4650 4450 5250
 Wire Wire Line
-	6500 6400 5800 6400
+	4450 5250 4650 5250
 $EndSCHEMATC