Browse Source

mach layout 17/08

sonnt 5 years ago
parent
commit
87b1c1def7
8 changed files with 645 additions and 1060 deletions
  1. 28 1
      RFID.sch
  2. 99 14
      atmega328.sch
  3. 0 70
      connectorsch.sch
  4. 75 44
      display.sch
  5. 23 53
      main.sch
  6. 196 419
      vinhome.kicad_pcb
  7. 196 419
      vinhome.kicad_pcb-bak
  8. 28 40
      vinhome.sch

+ 28 - 1
RFID.sch

@@ -4,7 +4,7 @@ EELAYER 26 0
 EELAYER END
 EELAYER END
 $Descr A4 11693 8268
 $Descr A4 11693 8268
 encoding utf-8
 encoding utf-8
-Sheet 8 8
+Sheet 7 8
 Title ""
 Title ""
 Date ""
 Date ""
 Rev ""
 Rev ""
@@ -75,4 +75,31 @@ Text HLabel 2050 1900 2    50   Input ~ 0
 SDA_RF
 SDA_RF
 Text HLabel 2100 2500 2    50   Input ~ 0
 Text HLabel 2100 2500 2    50   Input ~ 0
 RST_RF
 RST_RF
+$Comp
+L device:C_Small C14
+U 1 1 5B76BCD3
+P 2100 2600
+F 0 "C14" V 2200 2600 50  0000 C CNN
+F 1 "104" V 2200 2750 50  0000 C CNN
+F 2 "Capacitors_SMD:C_0805" H 2100 2600 50  0001 C CNN
+F 3 "" H 2100 2600 50  0001 C CNN
+	1    2100 2600
+	0    1    1    0   
+$EndComp
+Wire Wire Line
+	2000 2600 1900 2600
+$Comp
+L power:GND #PWR07
+U 1 1 5B76C22D
+P 2300 2600
+F 0 "#PWR07" H 2300 2350 50  0001 C CNN
+F 1 "GND" V 2305 2472 50  0000 R CNN
+F 2 "" H 2300 2600 50  0001 C CNN
+F 3 "" H 2300 2600 50  0001 C CNN
+	1    2300 2600
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	2200 2600 2300 2600
+Connection ~ 1900 2600
 $EndSCHEMATC
 $EndSCHEMATC

+ 99 - 14
atmega328.sch

@@ -248,17 +248,6 @@ PD6
 Text HLabel 6950 5350 2    50   Input ~ 0
 Text HLabel 6950 5350 2    50   Input ~ 0
 PD7
 PD7
 $Comp
 $Comp
-L Connector:Conn_01x05 J7
-U 1 1 5B6D7EF3
-P 1350 1550
-F 0 "J7" H 1270 1125 50  0000 C CNN
-F 1 "nap serial atmega328" H 1450 1250 50  0000 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 #PWR021
 L power:+3V3 #PWR021
 U 1 1 5B6D8146
 U 1 1 5B6D8146
 P 1650 1750
 P 1650 1750
@@ -298,15 +287,15 @@ $Comp
 L device:C_Small C9
 L device:C_Small C9
 U 1 1 5B6DC171
 U 1 1 5B6DC171
 P 1850 1350
 P 1850 1350
-F 0 "C9" V 1621 1350 50  0000 C CNN
-F 1 "104" V 1712 1350 50  0000 C CNN
+F 0 "C9" V 1700 1450 50  0000 C CNN
+F 1 "104" V 1800 1450 50  0000 C CNN
 F 2 "Capacitors_SMD:C_0805" H 1850 1350 50  0001 C CNN
 F 2 "Capacitors_SMD:C_0805" H 1850 1350 50  0001 C CNN
 F 3 "" H 1850 1350 50  0001 C CNN
 F 3 "" H 1850 1350 50  0001 C CNN
 	1    1850 1350
 	1    1850 1350
 	0    1    1    0   
 	0    1    1    0   
 $EndComp
 $EndComp
 Wire Wire Line
 Wire Wire Line
-	1950 1350 2200 1350
+	1950 1350 2050 1350
 Text Label 2000 1350 0    50   ~ 0
 Text Label 2000 1350 0    50   ~ 0
 RESET
 RESET
 Wire Wire Line
 Wire Wire Line
@@ -337,4 +326,100 @@ Wire Wire Line
 	7700 4500 7800 4500
 	7700 4500 7800 4500
 Wire Wire Line
 Wire Wire Line
 	7400 3700 7500 3700
 	7400 3700 7500 3700
+$Comp
+L Connector:Conn_01x08 J6
+U 1 1 5B7787F8
+P 1350 1450
+F 0 "J6" H 1270 825 50  0000 C CNN
+F 1 "Conn_01x08" H 1270 916 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x08_Pitch2.54mm" H 1350 1450 50  0001 C CNN
+F 3 "~" H 1350 1450 50  0001 C CNN
+	1    1350 1450
+	-1   0    0    1   
+$EndComp
+$Comp
+L power:+3V3 #PWR030
+U 1 1 5B778BF8
+P 1650 950
+F 0 "#PWR030" H 1650 800 50  0001 C CNN
+F 1 "+3V3" H 1665 1123 50  0000 C CNN
+F 2 "" H 1650 950 50  0001 C CNN
+F 3 "" H 1650 950 50  0001 C CNN
+	1    1650 950 
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	1550 1050 1650 1050
+Wire Wire Line
+	1650 1050 1650 950 
+Wire Wire Line
+	1550 1150 2050 1150
+Wire Wire Line
+	2050 1150 2050 1350
+Connection ~ 2050 1350
+Wire Wire Line
+	2050 1350 2200 1350
+$Comp
+L power:GND #PWR015
+U 1 1 5B77AECA
+P 1600 1250
+F 0 "#PWR015" H 1600 1000 50  0001 C CNN
+F 1 "GND" V 1605 1122 50  0000 R CNN
+F 2 "" H 1600 1250 50  0001 C CNN
+F 3 "" H 1600 1250 50  0001 C CNN
+	1    1600 1250
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	1550 1250 1600 1250
+Text Label 6750 4300 0    50   ~ 0
+SDA
+Text Label 6750 4400 0    50   ~ 0
+SCL
+$Comp
+L device:R R14
+U 1 1 5B77D8B7
+P 8600 4150
+F 0 "R14" H 8530 4104 50  0000 R CNN
+F 1 "10k" H 8530 4195 50  0000 R CNN
+F 2 "Resistors_SMD:R_0805" V 8530 4150 50  0001 C CNN
+F 3 "" H 8600 4150 50  0001 C CNN
+	1    8600 4150
+	-1   0    0    1   
+$EndComp
+$Comp
+L device:R R13
+U 1 1 5B77D98E
+P 8400 4150
+F 0 "R13" H 8330 4104 50  0000 R CNN
+F 1 "10k" H 8330 4195 50  0000 R CNN
+F 2 "Resistors_SMD:R_0805" V 8330 4150 50  0001 C CNN
+F 3 "" H 8400 4150 50  0001 C CNN
+	1    8400 4150
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	8400 4000 8500 4000
+$Comp
+L power:+3V3 #PWR031
+U 1 1 5B7875E5
+P 8500 4000
+F 0 "#PWR031" H 8500 3850 50  0001 C CNN
+F 1 "+3V3" V 8515 4128 50  0000 L CNN
+F 2 "" H 8500 4000 50  0001 C CNN
+F 3 "" H 8500 4000 50  0001 C CNN
+	1    8500 4000
+	1    0    0    -1  
+$EndComp
+Connection ~ 8500 4000
+Wire Wire Line
+	8500 4000 8600 4000
+Wire Wire Line
+	8400 4300 8400 4450
+Wire Wire Line
+	8600 4300 8600 4450
+Text Label 8400 4450 1    50   ~ 0
+SDA
+Text Label 8600 4450 1    50   ~ 0
+SCL
 $EndSCHEMATC
 $EndSCHEMATC

+ 0 - 70
connectorsch.sch

@@ -82,74 +82,4 @@ Text HLabel 4400 1700 2    50   Input ~ 0
 OUT_ESP2
 OUT_ESP2
 Text HLabel 4400 1800 2    50   Input ~ 0
 Text HLabel 4400 1800 2    50   Input ~ 0
 OUT_ESP3
 OUT_ESP3
-$Comp
-L device:C_Small C14
-U 1 1 5B6F365D
-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 #PWR030
-U 1 1 5B6F36D4
-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
-	5600 2000 5800 2000
-Wire Wire Line
-	5800 2000 5800 2100
-Wire Wire Line
-	5800 2100 5900 2100
-Wire Wire Line
-	5900 2200 5900 2100
-Connection ~ 5900 2100
-Wire Wire Line
-	5600 1900 5900 1900
-$Comp
-L power:GND #PWR031
-U 1 1 5B6F3F67
-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
-	5900 1900 6050 1900
-Connection ~ 5900 1900
-Wire Wire Line
-	5600 1600 5950 1600
-Wire Wire Line
-	5600 1700 5950 1700
-Wire Wire Line
-	5600 1800 5950 1800
-Text HLabel 5950 1600 2    50   Input ~ 0
-OUT_ESP4
-Text HLabel 5950 1700 2    50   Input ~ 0
-OUT_ESP5
-Text HLabel 5950 1800 2    50   Input ~ 0
-OUT_ESP6
-$Comp
-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
 $EndSCHEMATC
 $EndSCHEMATC

+ 75 - 44
display.sch

@@ -15,28 +15,6 @@ Comment3 ""
 Comment4 ""
 Comment4 ""
 $EndDescr
 $EndDescr
 $Comp
 $Comp
-L Connector:Conn_01x08 J1
-U 1 1 5B62B126
-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 #PWR01
-U 1 1 5B62B5E5
-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
-$Comp
 L power:+3V3 #PWR02
 L power:+3V3 #PWR02
 U 1 1 5B62B66C
 U 1 1 5B62B66C
 P 3250 2100
 P 3250 2100
@@ -47,16 +25,6 @@ F 3 "" H 3250 2100 50  0001 C CNN
 	1    3250 2100
 	1    3250 2100
 	1    0    0    -1  
 	1    0    0    -1  
 $EndComp
 $EndComp
-Wire Wire Line
-	2450 2250 2800 2250
-Wire Wire Line
-	2450 2350 2800 2350
-Wire Wire Line
-	2450 2450 2800 2450
-Wire Wire Line
-	2450 2550 2800 2550
-Wire Wire Line
-	2450 2750 2800 2750
 Text HLabel 2800 2250 2    50   Input ~ 0
 Text HLabel 2800 2250 2    50   Input ~ 0
 CLK
 CLK
 Text HLabel 2800 2350 2    50   Input ~ 0
 Text HLabel 2800 2350 2    50   Input ~ 0
@@ -67,8 +35,6 @@ Text HLabel 2800 2550 2    50   Input ~ 0
 DC
 DC
 Text HLabel 2800 2750 2    50   Input ~ 0
 Text HLabel 2800 2750 2    50   Input ~ 0
 MISO
 MISO
-Wire Wire Line
-	2450 2650 3250 2650
 $Comp
 $Comp
 L device:R R9
 L device:R R9
 U 1 1 5B73F886
 U 1 1 5B73F886
@@ -100,18 +66,83 @@ $EndComp
 Wire Wire Line
 Wire Wire Line
 	3250 2100 3250 2250
 	3250 2100 3250 2250
 $Comp
 $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
+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
+	2500 2350 2800 2350
+Wire Wire Line
+	2500 2450 2800 2450
+Wire Wire Line
+	2500 2550 2800 2550
+Wire Wire Line
+	2500 2650 3250 2650
+Wire Wire Line
+	2500 2750 2800 2750
+$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
+	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
 	-1   0    0    1   
 	-1   0    0    1   
 $EndComp
 $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
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2500 2150 2700 2150
+Wire Wire Line
+	2700 2150 2900 2150
+Wire Wire Line
+	2900 2150 2900 1950
+Connection ~ 2700 2150
+Wire Wire Line
+	2500 2850 2800 2850
 Wire Wire Line
 Wire Wire Line
-	2450 2850 2800 2850
+	2500 2950 2800 2950
 Wire Wire Line
 Wire Wire Line
-	2450 2950 2800 2950
+	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
 $EndSCHEMATC
 $EndSCHEMATC

+ 23 - 53
main.sch

@@ -409,36 +409,12 @@ Wire Wire Line
 	4350 4250 4350 4200
 	4350 4250 4350 4200
 Wire Wire Line
 Wire Wire Line
 	4350 4200 4650 4200
 	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
 Wire Wire Line
 	4350 5350 4700 5350
 	4350 5350 4700 5350
 Wire Wire Line
 Wire Wire Line
-	3500 4450 3100 4450
+	3500 4450 3400 4450
 Wire Wire Line
 Wire Wire Line
-	3500 5150 3100 5150
+	3500 5150 3450 5150
 Text Label 4450 4200 0    50   ~ 0
 Text Label 4450 4200 0    50   ~ 0
 RST_ESP
 RST_ESP
 Text Label 4450 5350 0    50   ~ 0
 Text Label 4450 5350 0    50   ~ 0
@@ -477,38 +453,32 @@ F 3 "" H 3650 6150 50  0001 C CNN
 	1    3650 6150
 	1    3650 6150
 	0    1    1    0   
 	0    1    1    0   
 $EndComp
 $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
 Wire Wire Line
 	3300 6150 3500 6150
 	3300 6150 3500 6150
 Wire Wire Line
 Wire Wire Line
 	3800 6150 4000 6150
 	3800 6150 4000 6150
+Text Label 4000 6150 0    50   ~ 0
+RST_ESP
 Wire Wire Line
 Wire Wire Line
-	4300 6350 4300 6450
+	3800 4450 4050 4450
 Wire Wire Line
 Wire Wire Line
-	4300 5950 4300 5750
+	3800 5150 4050 5150
 Wire Wire Line
 Wire Wire Line
-	4300 5750 4600 5750
-Text Label 4400 5750 0    50   ~ 0
-RST_ESP
+	4350 4950 4350 4750
+Wire Wire Line
+	4350 4750 3400 4750
+Wire Wire Line
+	3400 4750 3400 4450
+Connection ~ 3400 4450
+Wire Wire Line
+	3400 4450 3100 4450
+Wire Wire Line
+	4350 4650 4350 4700
+Wire Wire Line
+	4350 4700 3450 4700
+Wire Wire Line
+	3450 4700 3450 5150
+Connection ~ 3450 5150
+Wire Wire Line
+	3450 5150 3100 5150
 $EndSCHEMATC
 $EndSCHEMATC

File diff suppressed because it is too large
+ 196 - 419
vinhome.kicad_pcb


File diff suppressed because it is too large
+ 196 - 419
vinhome.kicad_pcb-bak


+ 28 - 40
vinhome.sch

@@ -15,7 +15,7 @@ Comment3 ""
 Comment4 ""
 Comment4 ""
 $EndDescr
 $EndDescr
 $Sheet
 $Sheet
-S 6500 5150 900  1050
+S 6500 5450 900  1050
 U 5B616228
 U 5B616228
 F0 "Sheet5B616227" 50
 F0 "Sheet5B616227" 50
 F1 "display.sch" 50
 F1 "display.sch" 50
@@ -25,6 +25,9 @@ F4 "RES" I L 6500 5700 50
 F5 "DC" I L 6500 5800 50 
 F5 "DC" I L 6500 5800 50 
 F6 "MISO" I L 6500 5600 50 
 F6 "MISO" I L 6500 5600 50 
 F7 "BLK" I L 6500 6100 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 
 $EndSheet
 $EndSheet
 $Sheet
 $Sheet
 S 2650 2950 850  1050
 S 2650 2950 850  1050
@@ -45,16 +48,16 @@ F3 "SDO" I R 4300 4400 50
 F4 "SDA" I R 4300 4500 50 
 F4 "SDA" I R 4300 4500 50 
 $EndSheet
 $EndSheet
 $Sheet
 $Sheet
-S 4650 5150 1150 1050
+S 4650 5150 1150 1450
 U 5B6C14E1
 U 5B6C14E1
 F0 "Sheet5B6C14E0" 50
 F0 "Sheet5B6C14E0" 50
 F1 "main.sch" 50
 F1 "main.sch" 50
 F2 "SDA_ESP" I R 5800 5250 50 
 F2 "SDA_ESP" I R 5800 5250 50 
 F3 "SCL_ESP" I R 5800 5350 50 
 F3 "SCL_ESP" I R 5800 5350 50 
 F4 "RST" I R 5800 5450 50 
 F4 "RST" I R 5800 5450 50 
-F5 "GPIO5" I L 4650 5600 50 
-F6 "GPIO4" I L 4650 5700 50 
-F7 "GPIO0" I L 4650 5800 50 
+F5 "GPIO5" I R 5800 6400 50 
+F6 "GPIO4" I R 5800 6300 50 
+F7 "GPIO0" I R 5800 6200 50 
 F8 "GPIO15" I R 5800 6100 50 
 F8 "GPIO15" I R 5800 6100 50 
 F9 "GPIO16" I L 4650 5250 50 
 F9 "GPIO16" I L 4650 5250 50 
 F10 "GPIO13" I L 4650 5450 50 
 F10 "GPIO13" I L 4650 5450 50 
@@ -74,19 +77,19 @@ F2 "SDA" I R 6000 4650 50
 F3 "SCL" I R 6000 4550 50 
 F3 "SCL" I R 6000 4550 50 
 F4 "MISO" I R 6000 3800 50 
 F4 "MISO" I R 6000 3800 50 
 F5 "MOSI" I R 6000 3900 50 
 F5 "MOSI" I R 6000 3900 50 
-F6 "PB1" I R 6000 3600 50 
+F6 "PB1" I L 4600 3950 50 
 F7 "PB2" I R 6000 4100 50 
 F7 "PB2" I R 6000 4100 50 
 F8 "SCK" I R 6000 4000 50 
 F8 "SCK" I R 6000 4000 50 
 F9 "PC2" I L 4600 3650 50 
 F9 "PC2" I L 4600 3650 50 
 F10 "PC3" I L 4600 3750 50 
 F10 "PC3" I L 4600 3750 50 
-F11 "PD2" I L 4600 3850 50 
-F12 "PD3" I R 6000 3700 50 
-F13 "PD4" I L 4600 4300 50 
+F11 "PD2" I R 6000 3700 50 
+F12 "PD3" I L 4600 3850 50 
+F13 "PD4" I R 6000 3600 50 
 F14 "PD5" I L 4600 4400 50 
 F14 "PD5" I L 4600 4400 50 
 F15 "PD6" I L 4600 4500 50 
 F15 "PD6" I L 4600 4500 50 
 F16 "PD7" I L 4600 4650 50 
 F16 "PD7" I L 4600 4650 50 
 F17 "PB0" I L 4600 4050 50 
 F17 "PB0" I L 4600 4050 50 
-F18 "PC0" I L 4600 3950 50 
+F18 "PC0" I L 4600 4300 50 
 F19 "PC1" I R 6000 4450 50 
 F19 "PC1" I R 6000 4450 50 
 $EndSheet
 $EndSheet
 Wire Wire Line
 Wire Wire Line
@@ -114,18 +117,6 @@ Wire Wire Line
 Wire Wire Line
 Wire Wire Line
 	3700 5250 4650 5250
 	3700 5250 4650 5250
 $Sheet
 $Sheet
-S 2950 5150 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 
-F5 "OUT_ESP4" I R 3700 5650 50 
-F6 "OUT_ESP5" I R 3700 5750 50 
-F7 "OUT_ESP6" I R 3700 5850 50 
-$EndSheet
-$Sheet
 S 6550 3400 850  850 
 S 6550 3400 850  850 
 U 5B71ECD0
 U 5B71ECD0
 F0 "Sheet5B71ECCF" 50
 F0 "Sheet5B71ECCF" 50
@@ -180,24 +171,6 @@ Wire Wire Line
 Wire Wire Line
 Wire Wire Line
 	6400 4000 6550 4000
 	6400 4000 6550 4000
 NoConn ~ 4600 4650
 NoConn ~ 4600 4650
-Wire Wire Line
-	3700 5650 3800 5650
-Wire Wire Line
-	3800 5650 3800 5600
-Wire Wire Line
-	3800 5600 4650 5600
-Wire Wire Line
-	3700 5750 3850 5750
-Wire Wire Line
-	3850 5750 3850 5700
-Wire Wire Line
-	3850 5700 4650 5700
-Wire Wire Line
-	3700 5850 3900 5850
-Wire Wire Line
-	3900 5850 3900 5800
-Wire Wire Line
-	3900 5800 4650 5800
 Wire Wire Line
 Wire Wire Line
 	5800 5600 6500 5600
 	5800 5600 6500 5600
 Wire Wire Line
 Wire Wire Line
@@ -218,4 +191,19 @@ Wire Wire Line
 	3500 3750 4600 3750
 	3500 3750 4600 3750
 Wire Wire Line
 Wire Wire Line
 	3500 3850 4600 3850
 	3500 3850 4600 3850
+$Sheet
+S 2950 5150 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 
+$EndSheet
+Wire Wire Line
+	5800 6200 6500 6200
+Wire Wire Line
+	6500 6300 5800 6300
+Wire Wire Line
+	6500 6400 5800 6400
 $EndSCHEMATC
 $EndSCHEMATC

Some files were not shown because too many files changed in this diff