structure, buttons, status

Implemented hierarchy.
Added button interface.
Added status interface.

1 files changed, 453 insertions, 113 deletions

diff --git a/PinLock.sch-bak b/PinLock.sch-bak
index 820c49a..5956b4d 100644
--- a/PinLock.sch-bak
+++ b/PinLock.sch-bak
@@ -4,7 +4,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 1 1
+Sheet 1 4
 Title "Pin Lock"
 Date "2019-10-29"
 Rev "1.0"
@@ -14,61 +14,38 @@ Comment2 "WiSe 2019/2020"
 Comment3 ""
 Comment4 ""
 $EndDescr
+Wire Wire Line
+	5300 950  5400 950 
+Connection ~ 5300 950 
+Wire Wire Line
+	5400 950  5400 1300
+Wire Wire Line
+	5300 950  5300 1300
 $Comp
-L 74xx:74LS48 U?
-U 1 1 5DB8ABBB
-P 7050 1900
-F 0 "U?" H 7050 2681 50  0000 C CNN
-F 1 "74LS48" H 7050 2590 50  0000 C CNN
-F 2 "" H 7050 1900 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74LS48" H 7050 1900 50  0001 C CNN
-	1    7050 1900
-	1    0    0    -1  
-$EndComp
-$Comp
-L 74xx:74LS48 U?
-U 1 1 5DB8F280
-P 9150 1800
-F 0 "U?" H 9150 2581 50  0000 C CNN
-F 1 "74LS48" H 9150 2490 50  0000 C CNN
-F 2 "" H 9150 1800 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74LS48" H 9150 1800 50  0001 C CNN
-	1    9150 1800
-	1    0    0    -1  
-$EndComp
-$Comp
-L 74xx:74LS48 U?
-U 1 1 5DB99928
-P 7650 3650
-F 0 "U?" H 7650 4431 50  0000 C CNN
-F 1 "74LS48" H 7650 4340 50  0000 C CNN
-F 2 "" H 7650 3650 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74LS48" H 7650 3650 50  0001 C CNN
-	1    7650 3650
-	1    0    0    -1  
-$EndComp
-$Comp
-L 74xx:74LS48 U?
-U 1 1 5DB9A0A0
-P 9450 3650
-F 0 "U?" H 9450 4431 50  0000 C CNN
-F 1 "74LS48" H 9450 4340 50  0000 C CNN
-F 2 "" H 9450 3650 50  0001 C CNN
-F 3 "http://www.ti.com/lit/gpn/sn74LS48" H 9450 3650 50  0001 C CNN
-	1    9450 3650
+L Switch:SW_Push SW?
+U 1 1 5DBE2224
+P 4250 1600
+F 0 "SW?" H 4250 1885 50  0000 C CNN
+F 1 "SW_Push" H 4250 1794 50  0000 C CNN
+F 2 "" H 4250 1800 50  0001 C CNN
+F 3 "~" H 4250 1800 50  0001 C CNN
+	1    4250 1600
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	4700 1600 4450 1600
 $Comp
-L Connector:Barrel_Jack_MountingPin J?
-U 1 1 5DBB60C9
-P 2300 1050
-F 0 "J?" H 2357 1367 50  0000 C CNN
-F 1 "Barrel_Jack_MountingPin" H 2357 1276 50  0000 C CNN
-F 2 "" H 2350 1010 50  0001 C CNN
-F 3 "~" H 2350 1010 50  0001 C CNN
-	1    2300 1050
+L power:GND #PWR?
+U 1 1 5DBD43C2
+P 2050 7100
+F 0 "#PWR?" H 2050 6850 50  0001 C CNN
+F 1 "GND" H 2055 6927 50  0000 C CNN
+F 2 "" H 2050 7100 50  0001 C CNN
+F 3 "" H 2050 7100 50  0001 C CNN
+	1    2050 7100
 	1    0    0    -1  
 $EndComp
+NoConn ~ 1650 1350
 $Comp
 L Regulator_Linear:AMS1117-5.0 U?
 U 1 1 5DBB71E9
@@ -81,103 +58,376 @@ F 3 "http://www.advanced-monolithic.com/pdf/ds1117.pdf" H 3400 700 50  0001 C CN
 	1    0    0    -1  
 $EndComp
 $Comp
+L Connector:Barrel_Jack_MountingPin J?
+U 1 1 5DBB60C9
+P 1650 1050
+F 0 "J?" H 1707 1367 50  0000 C CNN
+F 1 "Barrel_Jack_MountingPin" H 1707 1276 50  0000 C CNN
+F 2 "" H 1700 1010 50  0001 C CNN
+F 3 "~" H 1700 1010 50  0001 C CNN
+	1    1650 1050
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3600 950  3700 950 
+$Comp
 L Connector:USB_B_Micro J?
 U 1 1 5DBB7B46
-P 2250 2000
-F 0 "J?" H 2307 2467 50  0000 C CNN
-F 1 "USB_B_Micro" H 2307 2376 50  0000 C CNN
-F 2 "" H 2400 1950 50  0001 C CNN
-F 3 "~" H 2400 1950 50  0001 C CNN
-	1    2250 2000
+P 1650 1900
+F 0 "J?" H 1707 2367 50  0000 C CNN
+F 1 "USB_B_Micro" H 1707 2276 50  0000 C CNN
+F 2 "" H 1800 1850 50  0001 C CNN
+F 3 "~" H 1800 1850 50  0001 C CNN
+	1    1650 1900
 	1    0    0    -1  
 $EndComp
-NoConn ~ 2550 2000
-NoConn ~ 2300 1350
-NoConn ~ 2550 2100
-NoConn ~ 2550 2200
-NoConn ~ 2150 2400
+$Comp
+L Device:C C?
+U 1 1 5DC7168B
+P 2300 1250
+F 0 "C?" V 2250 1150 50  0000 C CNN
+F 1 "C" V 2250 1350 50  0000 C CNN
+F 2 "" H 2338 1100 50  0001 C CNN
+F 3 "~" H 2300 1250 50  0001 C CNN
+	1    2300 1250
+	0    1    1    0   
+$EndComp
 Wire Wire Line
-	2600 1150 2900 1150
+	1950 950  2050 950 
 Wire Wire Line
-	2900 1150 2900 950 
+	2050 950  2050 1250
 Wire Wire Line
-	2600 950  2750 950 
+	1950 1150 2150 1150
 Wire Wire Line
-	2750 950  2750 1600
+	2150 1150 2150 950 
 Wire Wire Line
-	2250 2400 2750 2400
-Connection ~ 2750 2400
-$Comp
-L power:GND #PWR?
-U 1 1 5DBD43C2
-P 2750 7100
-F 0 "#PWR?" H 2750 6850 50  0001 C CNN
-F 1 "GND" H 2755 6927 50  0000 C CNN
-F 2 "" H 2750 7100 50  0001 C CNN
-F 3 "" H 2750 7100 50  0001 C CNN
-	1    2750 7100
-	1    0    0    -1  
-$EndComp
+	2150 950  2550 950 
 Wire Wire Line
-	2900 950  3000 950 
+	2050 1250 2150 1250
+Connection ~ 2050 1250
 Wire Wire Line
-	3600 950  3700 950 
+	2050 1250 2050 1350
+Wire Wire Line
+	2450 1250 2550 1250
+Wire Wire Line
+	2550 1250 2550 950 
+Connection ~ 2550 950 
 Wire Wire Line
-	2550 1800 3700 1800
+	2550 950  3000 950 
 Wire Wire Line
-	3700 1800 3700 950 
+	3300 1250 3300 1350
+Wire Wire Line
+	3300 1350 2050 1350
+Connection ~ 2050 1350
+Wire Wire Line
+	2050 1350 2050 1600
+Wire Wire Line
+	1950 1700 2250 1700
+Wire Wire Line
+	3700 1700 3700 950 
 Connection ~ 3700 950 
 Wire Wire Line
 	3700 950  5300 950 
 Wire Wire Line
-	5300 950  5400 950 
-Connection ~ 5300 950 
+	1650 2300 1650 2400
 Wire Wire Line
-	5400 950  5400 1300
+	1650 2400 2050 2400
+Connection ~ 2050 2400
 Wire Wire Line
-	5300 950  5300 1300
+	2050 2400 2050 7000
 $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 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
+L Device:C C?
+U 1 1 5DC8ECAA
+P 2250 1950
+F 0 "C?" H 2365 1996 50  0000 L CNN
+F 1 "C" H 2365 1905 50  0000 L CNN
+F 2 "" H 2288 1800 50  0001 C CNN
+F 3 "~" H 2250 1950 50  0001 C CNN
+	1    2250 1950
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2750 2400 2750 6000
+	2250 1700 2250 1800
+Connection ~ 2250 1700
+Wire Wire Line
+	2250 1700 3700 1700
+Wire Wire Line
+	2250 2100 2250 2400
 Wire Wire Line
-	5300 5300 5300 6000
+	2250 2400 2050 2400
 Wire Wire Line
-	5300 6000 2750 6000
-Connection ~ 2750 6000
+	4050 1600 2050 1600
+Connection ~ 2050 1600
 Wire Wire Line
-	2750 6000 2750 7100
+	2050 1600 2050 2400
+Wire Wire Line
+	5300 7000 2050 7000
+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 Switch:SW_Push SW?
-U 1 1 5DBE2224
-P 4250 1600
-F 0 "SW?" H 4250 1885 50  0000 C CNN
-F 1 "SW_Push" H 4250 1794 50  0000 C CNN
-F 2 "" H 4250 1800 50  0001 C CNN
-F 3 "~" H 4250 1800 50  0001 C CNN
-	1    4250 1600
+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
-	2750 2400 3300 2400
+	5300 5300 5300 7000
 Wire Wire Line
-	3300 2400 3300 1250
+	6900 6200 6900 7000
 Wire Wire Line
-	4700 1600 4450 1600
+	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
-	4050 1600 2750 1600
-Connection ~ 2750 1600
+	6000 7000 5850 7000
+Connection ~ 6150 7000
 Wire Wire Line
-	2750 1600 2750 2400
+	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
@@ -186,4 +436,94 @@ Wire Wire Line
 	5900 1800 6550 1800
 Wire Wire Line
 	5900 1900 6550 1900
+Wire Wire Line
+	5900 2000 6550 2000
+Wire Wire Line
+	5900 2100 6550 2100
+Wire Wire Line
+	5900 2200 6550 2200
+Wire Wire Line
+	5900 2300 6550 2300
+Wire Wire Line
+	5900 2500 6550 2500
+Wire Wire Line
+	5900 2600 6550 2600
+Wire Wire Line
+	5900 2700 6550 2700
+Wire Wire Line
+	5900 2800 6550 2800
+Wire Wire Line
+	5900 2900 6550 2900
+Wire Wire Line
+	5900 3000 6550 3000
+Wire Wire Line
+	5900 3100 6550 3100
+Wire Wire Line
+	5900 3200 6550 3200
+$Sheet
+S 7900 1450 550  550 
+U 5DDEAC3F
+F0 "Buttons" 50
+F1 "buttons.sch" 50
+F2 "VCC" B R 8450 1500 50 
+F3 "GND" B R 8450 1900 50 
+F4 "ROWS" I L 7900 1600 50 
+F5 "COLUMNS" O L 7900 1700 50 
+F6 "CLK" I L 7900 1800 50 
+$EndSheet
+Wire Wire Line
+	5400 950  10300 950 
+$Sheet
+S 6550 1450 600  1950
+U 5DD2ECA3
+F0 "Display" 50
+F1 "display.sch" 50
+F2 "VCC" B R 7150 1500 50 
+F3 "GND" B R 7150 3300 50 
+F4 "CHAR0_0" I L 6550 1600 50 
+F5 "CHAR0_1" I L 6550 1700 50 
+F6 "CHAR0_2" I L 6550 1800 50 
+F7 "CHAR0_3" I L 6550 1900 50 
+F8 "CHAR1_0" I L 6550 2000 50 
+F9 "CHAR1_1" I L 6550 2100 50 
+F10 "CHAR1_2" I L 6550 2200 50 
+F11 "CHAR1_3" I L 6550 2300 50 
+F12 "CHAR2_0" I L 6550 2500 50 
+F13 "CHAR2_1" I L 6550 2600 50 
+F14 "CHAR2_2" I L 6550 2700 50 
+F15 "CHAR2_3" I L 6550 2800 50 
+F16 "CHAR3_0" I L 6550 2900 50 
+F17 "CHAR3_1" I L 6550 3000 50 
+F18 "CHAR3_2" I L 6550 3100 50 
+F19 "CHAR3_3" I L 6550 3200 50 
+$EndSheet
+$Sheet
+S 8750 1500 550  500 
+U 5DE30C4A
+F0 "Status" 50
+F1 "status.sch" 50
+$EndSheet
+Text GLabel 5900 3400 2    50   Output ~ 0
+ROWS
+$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 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
+	1    0    0    -1  
+$EndComp
+Text GLabel 5900 3500 2    50   Input ~ 0
+COLUMNS
+Text GLabel 5900 3600 2    50   Output ~ 0
+CLK_BUTTONS
+Text GLabel 7900 1600 0    50   Input ~ 0
+ROWS
+Text GLabel 7900 1700 0    50   Output ~ 0
+COLUMNS
+Text GLabel 7900 1800 0    50   Input ~ 0
+CLK_BUTTONS
 $EndSCHEMATC