Layout

Minor layout fix.

3 files changed, 106 insertions, 294 deletions

diff --git a/PinLock.sch-bak b/PinLock.sch-bak
index 5956b4d..68d4973 100644
--- a/PinLock.sch-bak
+++ b/PinLock.sch-bak
@@ -165,270 +165,8 @@ Wire Wire Line
 Connection ~ 2050 7000
 Wire Wire Line
 	2050 7000 2050 7100
-Text GLabel 7800 5300 0    50   Input ~ 0
-a1
-Text GLabel 7800 5800 0    50   Input ~ 0
-f1
-Text GLabel 7800 5900 0    50   Input ~ 0
-g1
-Text GLabel 7800 5700 0    50   Input ~ 0
-e1
-Text GLabel 7800 5600 0    50   Input ~ 0
-d1
-Text GLabel 7800 5500 0    50   Input ~ 0
-c1
-Text GLabel 7800 5400 0    50   Input ~ 0
-b1
-Wire Wire Line
-	7800 6000 7800 6200
-Wire Wire Line
-	7800 6200 7550 6200
 Connection ~ 5400 950 
 Wire Wire Line
-	7550 6200 7550 4750
-Connection ~ 7550 6200
-Wire Wire Line
-	6900 6200 7550 6200
-$Comp
-L Device:LED D?
-U 1 1 5DC0E72A
-P 5550 6850
-F 0 "D?" V 5350 6900 50  0000 R CNN
-F 1 "LED" V 5250 6900 50  0000 R CNN
-F 2 "" H 5550 6850 50  0001 C CNN
-F 3 "~" H 5550 6850 50  0001 C CNN
-	1    5550 6850
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:LED D?
-U 1 1 5DC1A58B
-P 5700 6850
-F 0 "D?" V 5500 6900 50  0000 R CNN
-F 1 "LED" V 5400 6900 50  0000 R CNN
-F 2 "" H 5700 6850 50  0001 C CNN
-F 3 "~" H 5700 6850 50  0001 C CNN
-	1    5700 6850
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:LED D?
-U 1 1 5DC1AB20
-P 5850 6850
-F 0 "D?" V 5650 6900 50  0000 R CNN
-F 1 "LED" V 5550 6900 50  0000 R CNN
-F 2 "" H 5850 6850 50  0001 C CNN
-F 3 "~" H 5850 6850 50  0001 C CNN
-	1    5850 6850
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:LED D?
-U 1 1 5DC1AF13
-P 6000 6850
-F 0 "D?" V 5800 6900 50  0000 R CNN
-F 1 "LED" V 5700 6900 50  0000 R CNN
-F 2 "" H 6000 6850 50  0001 C CNN
-F 3 "~" H 6000 6850 50  0001 C CNN
-	1    6000 6850
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:LED D?
-U 1 1 5DC1B270
-P 6150 6850
-F 0 "D?" V 5950 6900 50  0000 R CNN
-F 1 "LED" V 5850 6900 50  0000 R CNN
-F 2 "" H 6150 6850 50  0001 C CNN
-F 3 "~" H 6150 6850 50  0001 C CNN
-	1    6150 6850
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:LED D?
-U 1 1 5DC1B61B
-P 6300 6850
-F 0 "D?" V 6100 6900 50  0000 R CNN
-F 1 "LED" V 6000 6900 50  0000 R CNN
-F 2 "" H 6300 6850 50  0001 C CNN
-F 3 "~" H 6300 6850 50  0001 C CNN
-	1    6300 6850
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:LED D?
-U 1 1 5DC1B9D5
-P 6450 6850
-F 0 "D?" V 6250 6900 50  0000 R CNN
-F 1 "LED" V 6150 6900 50  0000 R CNN
-F 2 "" H 6450 6850 50  0001 C CNN
-F 3 "~" H 6450 6850 50  0001 C CNN
-	1    6450 6850
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:LED D?
-U 1 1 5DC1BD81
-P 6600 6850
-F 0 "D?" V 6400 6900 50  0000 R CNN
-F 1 "LED" V 6300 6900 50  0000 R CNN
-F 2 "" H 6600 6850 50  0001 C CNN
-F 3 "~" H 6600 6850 50  0001 C CNN
-	1    6600 6850
-	0    -1   -1   0   
-$EndComp
-$Comp
-L Device:R R?
-U 1 1 5DC375B2
-P 5550 6550
-F 0 "R?" H 5450 6400 50  0000 L CNN
-F 1 "R" H 5550 6400 50  0000 L CNN
-F 2 "" V 5480 6550 50  0001 C CNN
-F 3 "~" H 5550 6550 50  0001 C CNN
-	1    5550 6550
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R?
-U 1 1 5DC388C3
-P 5700 6550
-F 0 "R?" H 5600 6400 50  0000 L CNN
-F 1 "R" H 5700 6400 50  0000 L CNN
-F 2 "" V 5630 6550 50  0001 C CNN
-F 3 "~" H 5700 6550 50  0001 C CNN
-	1    5700 6550
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R?
-U 1 1 5DC38D6E
-P 5850 6550
-F 0 "R?" H 5750 6400 50  0000 L CNN
-F 1 "R" H 5850 6400 50  0000 L CNN
-F 2 "" V 5780 6550 50  0001 C CNN
-F 3 "~" H 5850 6550 50  0001 C CNN
-	1    5850 6550
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R?
-U 1 1 5DC390CD
-P 6000 6550
-F 0 "R?" H 5900 6400 50  0000 L CNN
-F 1 "R" H 6000 6400 50  0000 L CNN
-F 2 "" V 5930 6550 50  0001 C CNN
-F 3 "~" H 6000 6550 50  0001 C CNN
-	1    6000 6550
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R?
-U 1 1 5DC39423
-P 6150 6550
-F 0 "R?" H 6050 6400 50  0000 L CNN
-F 1 "R" H 6150 6400 50  0000 L CNN
-F 2 "" V 6080 6550 50  0001 C CNN
-F 3 "~" H 6150 6550 50  0001 C CNN
-	1    6150 6550
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R?
-U 1 1 5DC39795
-P 6300 6550
-F 0 "R?" H 6200 6400 50  0000 L CNN
-F 1 "R" H 6300 6400 50  0000 L CNN
-F 2 "" V 6230 6550 50  0001 C CNN
-F 3 "~" H 6300 6550 50  0001 C CNN
-	1    6300 6550
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R?
-U 1 1 5DC39B18
-P 6450 6550
-F 0 "R?" H 6350 6400 50  0000 L CNN
-F 1 "R" H 6450 6400 50  0000 L CNN
-F 2 "" V 6380 6550 50  0001 C CNN
-F 3 "~" H 6450 6550 50  0001 C CNN
-	1    6450 6550
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R?
-U 1 1 5DC39F58
-P 6600 6550
-F 0 "R?" H 6500 6400 50  0000 L CNN
-F 1 "R" H 6600 6400 50  0000 L CNN
-F 2 "" V 6530 6550 50  0001 C CNN
-F 3 "~" H 6600 6550 50  0001 C CNN
-	1    6600 6550
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	5300 5300 5300 7000
-Wire Wire Line
-	6900 6200 6900 7000
-Wire Wire Line
-	6900 7000 6600 7000
-Connection ~ 5300 7000
-Connection ~ 5550 7000
-Wire Wire Line
-	5550 7000 5300 7000
-Connection ~ 5700 7000
-Wire Wire Line
-	5700 7000 5550 7000
-Connection ~ 5850 7000
-Wire Wire Line
-	5850 7000 5700 7000
-Connection ~ 6000 7000
-Wire Wire Line
-	6000 7000 5850 7000
-Connection ~ 6150 7000
-Wire Wire Line
-	6150 7000 6000 7000
-Connection ~ 6300 7000
-Wire Wire Line
-	6300 7000 6150 7000
-Connection ~ 6450 7000
-Wire Wire Line
-	6450 7000 6300 7000
-Connection ~ 6600 7000
-Wire Wire Line
-	6600 7000 6450 7000
-Text GLabel 5550 6400 1    50   Input ~ 0
-s0
-Text GLabel 5700 6400 1    50   Input ~ 0
-s1
-Text GLabel 5850 6400 1    50   Input ~ 0
-s2
-Text GLabel 6000 6400 1    50   Input ~ 0
-s3
-Text GLabel 6150 6400 1    50   Input ~ 0
-s4
-Text GLabel 6300 6400 1    50   Input ~ 0
-s5
-Text GLabel 6450 6400 1    50   Input ~ 0
-s6
-Text GLabel 6600 6400 1    50   Input ~ 0
-s7
-Text GLabel 5900 5350 2    50   Output ~ 0
-s0
-Text GLabel 5900 5450 2    50   Output ~ 0
-s1
-Text GLabel 5900 5550 2    50   Output ~ 0
-s2
-Text GLabel 5900 5650 2    50   Output ~ 0
-s3
-Text GLabel 5900 5750 2    50   Output ~ 0
-s4
-Text GLabel 5900 5850 2    50   Output ~ 0
-s5
-Text GLabel 5900 5950 2    50   Output ~ 0
-s6
-Text GLabel 5900 6050 2    50   Output ~ 0
-s7
-Wire Wire Line
 	5900 1600 6550 1600
 Wire Wire Line
 	5900 1700 6550 1700
@@ -472,7 +210,7 @@ F5 "COLUMNS" O L 7900 1700 50
 F6 "CLK" I L 7900 1800 50 
 $EndSheet
 Wire Wire Line
-	5400 950  10300 950 
+	5400 950  7250 950 
 $Sheet
 S 6550 1450 600  1950
 U 5DD2ECA3
@@ -498,10 +236,14 @@ F18 "CHAR3_2" I L 6550 3100 50
 F19 "CHAR3_3" I L 6550 3200 50 
 $EndSheet
 $Sheet
-S 8750 1500 550  500 
+S 9150 1450 550  450 
 U 5DE30C4A
 F0 "Status" 50
 F1 "status.sch" 50
+F2 "VCC" B R 9700 1500 50 
+F3 "GND" B R 9700 1800 50 
+F4 "STATUS" I L 9150 1600 50 
+F5 "CLK" I L 9150 1700 50 
 $EndSheet
 Text GLabel 5900 3400 2    50   Output ~ 0
 ROWS
@@ -509,8 +251,8 @@ $Comp
 L MCU_Microchip_ATmega:ATmega16A-PU U?
 U 1 1 5DB85A9E
 P 5300 3300
-F 0 "U?" H 5750 1350 50  0000 C CNN
-F 1 "ATmega16A-PU" H 4900 1350 50  0000 C CNN
+F 0 "U?" H 5750 5250 50  0000 C CNN
+F 1 "ATmega16A-PU" H 4900 5250 50  0000 C CNN
 F 2 "Package_DIP:DIP-40_W15.24mm" H 5300 3300 50  0001 C CIN
 F 3 "http://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-8154-8-bit-AVR-ATmega16A_Datasheet.pdf" H 5300 3300 50  0001 C CNN
 	1    5300 3300
@@ -526,4 +268,74 @@ Text GLabel 7900 1700 0    50   Output ~ 0
 COLUMNS
 Text GLabel 7900 1800 0    50   Input ~ 0
 CLK_BUTTONS
+Text GLabel 5900 3700 2    50   Output ~ 0
+STATUS
+Text GLabel 5900 3800 2    50   Output ~ 0
+CLK_STATUS
+Text GLabel 9150 1600 0    50   Input ~ 0
+STATUS
+Text GLabel 9150 1700 0    50   Input ~ 0
+CLK_STATUS
+Wire Wire Line
+	7150 1500 7250 1500
+Wire Wire Line
+	7250 1500 7250 950 
+Connection ~ 7250 950 
+Wire Wire Line
+	7250 950  8550 950 
+Wire Wire Line
+	8450 1500 8550 1500
+Wire Wire Line
+	8550 1500 8550 950 
+Wire Wire Line
+	8550 950  9800 950 
+Wire Wire Line
+	9800 950  9800 1500
+Wire Wire Line
+	9800 1500 9700 1500
+Connection ~ 8550 950 
+Wire Wire Line
+	7150 3300 7250 3300
+Wire Wire Line
+	7250 3300 7250 5400
+Wire Wire Line
+	7250 5400 5300 5400
+Wire Wire Line
+	5300 5300 5300 5400
+Wire Wire Line
+	5300 5400 5300 7000
+Connection ~ 5300 5400
+Wire Wire Line
+	7250 5400 8550 5400
+Wire Wire Line
+	8550 5400 8550 1900
+Wire Wire Line
+	8550 1900 8450 1900
+Connection ~ 7250 5400
+Wire Wire Line
+	8550 5400 9800 5400
+Wire Wire Line
+	9800 5400 9800 1800
+Wire Wire Line
+	9800 1800 9700 1800
+Connection ~ 8550 5400
+NoConn ~ 5900 3900
+NoConn ~ 5900 4000
+NoConn ~ 5900 4100
+NoConn ~ 5900 4300
+NoConn ~ 5900 4400
+NoConn ~ 5900 4500
+NoConn ~ 5900 4600
+NoConn ~ 5900 4700
+NoConn ~ 5900 4800
+NoConn ~ 5900 4900
+NoConn ~ 5900 5000
+Wire Wire Line
+	4700 2200 4600 2200
+Wire Wire Line
+	4600 2200 4600 5400
+Wire Wire Line
+	4600 5400 5300 5400
+NoConn ~ 4700 1800
+NoConn ~ 4700 2000
 $EndSCHEMATC
diff --git a/display.sch-bak b/display.sch-bak
index 36861f5..d4fcbdd 100644
--- a/display.sch-bak
+++ b/display.sch-bak
@@ -4,7 +4,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 2 4
+Sheet 3 4
 Title ""
 Date ""
 Rev ""
diff --git a/status.sch b/status.sch
index feed9eb..4ec8afd 100644
--- a/status.sch
+++ b/status.sch
@@ -175,12 +175,6 @@ F 3 "~" H 3850 2450 50  0001 C CNN
 	1    3850 2450
 	-1   0    0    1   
 $EndComp
-Wire Wire Line
-	4000 2350 4200 2350
-Wire Wire Line
-	4200 2350 4200 2450
-Wire Wire Line
-	4200 3550 2500 3550
 Connection ~ 2500 3550
 Wire Wire Line
 	3000 2450 3200 2450
@@ -277,38 +271,44 @@ Wire Wire Line
 Wire Wire Line
 	3500 3050 3700 3050
 Wire Wire Line
-	4000 2450 4200 2450
-Connection ~ 4200 2450
+	4000 2350 4300 2350
+Wire Wire Line
+	4300 2350 4300 2450
+Wire Wire Line
+	2500 3550 4300 3550
+Wire Wire Line
+	4000 2450 4300 2450
+Connection ~ 4300 2450
 Wire Wire Line
-	4200 2450 4200 2550
+	4300 2450 4300 2550
 Wire Wire Line
-	4000 2550 4200 2550
-Connection ~ 4200 2550
+	4000 2550 4300 2550
+Connection ~ 4300 2550
 Wire Wire Line
-	4200 2550 4200 2650
+	4300 2550 4300 2650
 Wire Wire Line
-	4000 2650 4200 2650
-Connection ~ 4200 2650
+	4000 2650 4300 2650
+Connection ~ 4300 2650
 Wire Wire Line
-	4200 2650 4200 2750
+	4300 2650 4300 2750
 Wire Wire Line
-	4000 2750 4200 2750
-Connection ~ 4200 2750
+	4000 2750 4300 2750
+Connection ~ 4300 2750
 Wire Wire Line
-	4200 2750 4200 2850
+	4300 2750 4300 2850
 Wire Wire Line
-	4000 2850 4200 2850
-Connection ~ 4200 2850
+	4000 2850 4300 2850
+Connection ~ 4300 2850
 Wire Wire Line
-	4200 2850 4200 2950
+	4300 2850 4300 2950
 Wire Wire Line
-	4000 2950 4200 2950
-Connection ~ 4200 2950
+	4300 2950 4000 2950
+Connection ~ 4300 2950
 Wire Wire Line
-	4200 2950 4200 3050
+	4300 2950 4300 3050
 Wire Wire Line
-	4000 3050 4200 3050
-Connection ~ 4200 3050
+	4000 3050 4300 3050
+Connection ~ 4300 3050
 Wire Wire Line
-	4200 3050 4200 3550
+	4300 3050 4300 3550
 $EndSCHEMATC