Added two keys and migration to KiCad5 using base parts

2019-02-22 13:21:00 +01:00 · 2019-02-22 13:21:00 +01:00 · e3b4ac8670
commit e3b4ac8670
parent 21dcf6c66c
2 changed files with 1176 additions and 1126 deletions
--- a/tests_pcb/sample_atmega32/keyboard_pcb.kicad_pcb
+++ b/tests_pcb/sample_atmega32/keyboard_pcb.kicad_pcb
--- a/tests_pcb/sample_atmega32/keyboard_pcb.sch
+++ b/tests_pcb/sample_atmega32/keyboard_pcb.sch
@ -1,5 +1,4 @@
 EESchema Schematic File Version 4
-LIBS:keyboard_pcb-cache
 EELAYER 26 0
 EELAYER END
 $Descr A3 16535 11693
@ -18,26 +17,18 @@ Text Label 2400 4150 2    60   ~ 0
 row0
 Text Label 2400 3700 2    60   ~ 0
 row1
-Text Label 2400 3250 2    60   ~ 0
-row2
-Text Label 2400 2800 2    60   ~ 0
-row3
-Text Label 2400 2350 2    60   ~ 0
-row4
-Text Label 2400 1900 2    60   ~ 0
-row5
 Text Label 3400 1200 0    60   ~ 0
 col0
 $Comp
-L keyboard_parts:KEYSW K_1001
+L Switch:SW_Push K_1001
 U 1 1 5AA598B3
 P 3000 3400
 F 0 "K_1001" H 2950 3400 60  0000 C CNN
 F 1 "KEYSW" H 3000 3300 60  0001 C CNN
-F 2 "Keyboard:CHERRY_PCB_100H" H 3000 3400 60  0001 C CNN
+F 2 "Button_Switch_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3000 3400 60  0001 C CNN
 F 3 "" H 3000 3400 60  0000 C CNN
 	1    3000 3400
-	1    0    0    -1  
+	-1   0    0    1   
 $EndComp
 $Comp
 L Device:D D_1001
@ -45,27 +36,23 @@ U 1 1 5AA598BA
 P 2650 3550
 F 0 "D_1001" V 2500 3500 60  0000 C CNN
 F 1 "D" V 2800 3500 60  0001 C CNN
-F 2 "Diodes_SMD:D_SOD-123" H 2650 3550 60  0001 C CNN
-F 3 "1N4148WTPMSCT-ND" H 2650 3550 60  0000 C CNN
+F 2 "Diode_SMD:D_SOD-123" H 2650 3550 60  0001 C CNN
+F 3 "1N4148WTPMSCT-ND" V 2650 3550 60  0000 C CNN
 	1    2650 3550
 	0    -1   -1   0   
 $EndComp
-Wire Wire Line
-	3300 3400 3400 3400
 Wire Wire Line
 	2400 3700 2650 3700
-Wire Wire Line
-	2650 3400 2700 3400
 $Comp
-L keyboard_parts:KEYSW K_1000
+L Switch:SW_Push K_1000
 U 1 1 5AA59B0B
 P 3000 3850
 F 0 "K_1000" H 2950 3850 60  0000 C CNN
 F 1 "KEYSW" H 3000 3750 60  0001 C CNN
-F 2 "Keyboard:CHERRY_PCB_100H" H 3000 3850 60  0001 C CNN
+F 2 "Button_Switch_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 3000 3850 60  0001 C CNN
 F 3 "" H 3000 3850 60  0000 C CNN
 	1    3000 3850
-	1    0    0    -1  
+	-1   0    0    1   
 $EndComp
 $Comp
 L Device:D D_1000
@ -73,115 +60,32 @@ U 1 1 5AA59B12
 P 2650 4000
 F 0 "D_1000" V 2500 3950 60  0000 C CNN
 F 1 "D" V 2800 3950 60  0001 C CNN
-F 2 "Diodes_SMD:D_SOD-123" H 2650 4000 60  0001 C CNN
-F 3 "1N4148WTPMSCT-ND" H 2650 4000 60  0000 C CNN
+F 2 "Diode_SMD:D_SOD-123" H 2650 4000 60  0001 C CNN
+F 3 "1N4148WTPMSCT-ND" V 2650 4000 60  0000 C CNN
 	1    2650 4000
 	0    -1   -1   0   
 $EndComp
-Wire Wire Line
-	3300 3850 3400 3850
-Wire Wire Line
-	2650 3850 2700 3850
 Wire Wire Line
 	2400 4150 2650 4150
 Wire Wire Line
 	3400 3400 3400 3850
-Text Label 6300 6000 0    60   ~ 0
-col11
-Text Label 7400 6000 0    60   ~ 0
-col12
-Text Label 8450 6000 0    60   ~ 0
-col13
-Text Label 12500 6000 0    60   ~ 0
-col15
-Text Label 13600 6000 0    60   ~ 0
-col16
-Text Label 4250 7700 0    50   ~ 0
+Text Label 3200 7700 0    50   ~ 0
 row0
-Text Label 4250 8400 0    50   ~ 0
+Text Label 3200 8400 0    50   ~ 0
 row1
-Text Label 4250 8900 0    50   ~ 0
-row2
-Text Label 4250 9000 0    50   ~ 0
-row3
-Text Label 4250 8700 0    50   ~ 0
-row4
-Text Label 4250 10500 0    50   ~ 0
-row5
-Text Label 4250 9200 0    50   ~ 0
+Text Label 3200 8600 0    50   ~ 0
 col1
-Text Label 4250 9100 0    50   ~ 0
-col2
-Text Label 4250 9900 0    50   ~ 0
-col3
-Text Label 4250 10100 0    50   ~ 0
-col4
-Text Label 4250 10200 0    50   ~ 0
-col5
-Text Label 4250 10300 0    50   ~ 0
-col6
-Text Label 4250 10400 0    50   ~ 0
-col7
-Text Label 4250 8300 0    50   ~ 0
-col8
-Text Label 4250 8200 0    50   ~ 0
-col9
-Text Label 4250 8100 0    50   ~ 0
-col10
-Text Label 4250 9600 0    50   ~ 0
-col11
-Text Label 4250 9500 0    50   ~ 0
-col12
-Text Label 4250 9300 0    50   ~ 0
-col13
-Text Label 4250 9400 0    50   ~ 0
-col14
-Text Label 4250 7800 0    50   ~ 0
-col15
-Text Label 4250 7900 0    50   ~ 0
-col16
-Text Label 4250 8600 0    50   ~ 0
+Text Label 3200 8300 0    50   ~ 0
 col0
-Text Label 4250 8000 0    50   ~ 0
-col17
-Text Label 14700 6000 0    60   ~ 0
-col17
-Text Label 11400 8050 2    60   ~ 0
-row2
-Text Label 11400 7600 2    60   ~ 0
-row3
-Text Label 11400 7150 2    60   ~ 0
-row4
-Text Label 11400 6700 2    60   ~ 0
-row5
-Text Label 9550 6000 0    50   ~ 0
-col14
 Text Notes 1950 4900 0    197  ~ 0
 Controller
-Text Notes 6750 5600 0    197  ~ 0
-É-Enter
-Text Notes 12450 5650 0    197  ~ 0
-Directions
-Text Notes 7950 850  0    197  ~ 0
-Main
-$Comp
-L MCU_Atmel_ATMEGA:ATMEGA32U4-AU U1
-U 1 1 5B4FB57A
-P 3150 9250
-F 0 "U1" H 3125 11228 50  0000 C CNN
-F 1 "ATMEGA32U4-AU" H 3125 11137 50  0000 C CNN
-F 2 "Package_QFP:TQFP-44_10x10mm_P0.8mm" H 3150 9250 50  0001 C CIN
-F 3 "ATMEGA32U4-AU-ND" H 4250 10350 50  0001 C CNN
-	1    3150 9250
-	1    0    0    -1  
-$EndComp
 $Comp
 L Device:Crystal_GND24 X101
 U 1 1 5B4FFE79
 P 1300 5350
 F 0 "X101" H 1491 5403 60  0000 L CNN
 F 1 "Crystal" H 1491 5297 60  0000 L CNN
-F 2 "Crystals:Crystal_SMD_3225-4pin_3.2x2.5mm" H 1300 5350 60  0001 C CNN
+F 2 "Crystal:Crystal_SMD_3225-4Pin_3.2x2.5mm" H 1300 5350 60  0001 C CNN
 F 3 "1923-1291-1-ND " H 1300 5350 60  0001 C CNN
 	1    1300 5350
 	1    0    0    -1  
@ -216,100 +120,81 @@ Wire Wire Line
 Wire Wire Line
 	1300 5700 1000 5700
 $Comp
-L Connector_Specialized:USB_B_Micro J101
+L Connector:USB_B_Micro J101
 U 1 1 5B6855D1
-P 1150 9450
-F 0 "J101" H 1205 9917 50  0000 C CNN
-F 1 "USB_A" H 1205 9826 50  0000 C CNN
-F 2 "Connectors_USB:USB_Micro-B_Wuerth-629105150521_CircularHoles" H 1300 9400 50  0001 C CNN
-F 3 "609-4613-1-ND" H 1300 9400 50  0001 C CNN
-	1    1150 9450
+P 1150 9050
+F 0 "J101" H 1205 9517 50  0000 C CNN
+F 1 "USB_A" H 1205 9426 50  0000 C CNN
+F 2 "Connectors_USB:USB_Micro-B_Wuerth-629105150521_CircularHoles" H 1300 9000 50  0001 C CNN
+F 3 "609-4613-1-ND" H 1300 9000 50  0001 C CNN
+	1    1150 9050
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2000 9050 1750 9050
+	2000 8700 1750 8700
 Wire Wire Line
-	1750 9050 1750 9450
+	1750 8700 1750 9050
 Wire Wire Line
-	1800 9550 1800 9150
+	1800 9150 1800 8800
 Wire Wire Line
-	1800 9150 2000 9150
+	1800 8800 2000 8800
 $Comp
 L Device:R R101
 U 1 1 5B7710FD
-P 1600 9450
-F 0 "R101" V 1393 9450 50  0000 C CNN
-F 1 "22" V 1484 9450 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1530 9450 50  0001 C CNN
-F 3 "RMCF0603JT22R0CT-ND" H 1600 9450 50  0001 C CNN
-	1    1600 9450
+P 1600 9050
+F 0 "R101" V 1393 9050 50  0000 C CNN
+F 1 "22" V 1484 9050 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 1530 9050 50  0001 C CNN
+F 3 "RMCF0603JT22R0CT-ND" H 1600 9050 50  0001 C CNN
+	1    1600 9050
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:R R102
 U 1 1 5B771434
-P 1600 9550
-F 0 "R102" V 1393 9550 50  0000 C CNN
-F 1 "22" V 1484 9550 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1530 9550 50  0001 C CNN
-F 3 "RMCF0603JT22R0CT-ND" H 1600 9550 50  0001 C CNN
-	1    1600 9550
+P 1600 9150
+F 0 "R102" V 1393 9150 50  0000 C CNN
+F 1 "22" V 1484 9150 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 1530 9150 50  0001 C CNN
+F 3 "RMCF0603JT22R0CT-ND" H 1600 9150 50  0001 C CNN
+	1    1600 9150
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	1750 9550 1800 9550
-Wire Wire Line
-	2000 8900 1950 8900
+	1750 9150 1800 9150
 $Comp
 L Device:C C103
 U 1 1 5B860D38
-P 1950 9500
-F 0 "C103" H 2065 9546 50  0000 L CNN
-F 1 "1u" H 2065 9455 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0402_1005Metric" H 1988 9350 50  0001 C CNN
-F 3 "1276-1235-1-ND" H 1950 9500 50  0001 C CNN
-	1    1950 9500
+P 1950 9250
+F 0 "C103" H 2065 9296 50  0000 L CNN
+F 1 "1u" H 2065 9205 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0402_1005Metric" H 1988 9100 50  0001 C CNN
+F 3 "1276-1235-1-ND" H 1950 9250 50  0001 C CNN
+	1    1950 9250
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	2000 9300 1950 9300
-Wire Wire Line
-	1950 9300 1950 9350
-Wire Wire Line
-	1700 8900 1700 8850
-$Comp
-L power:VCC #PWR0104
-U 1 1 5B8C6A3A
-P 1700 8850
-F 0 "#PWR0104" H 1700 8700 50  0001 C CNN
-F 1 "VCC" H 1717 9023 50  0000 C CNN
-F 2 "" H 1700 8850 50  0001 C CNN
-F 3 "" H 1700 8850 50  0001 C CNN
-	1    1700 8850
-	1    0    0    -1  
-$EndComp
-Wire Wire Line
-	4250 9800 4600 9800
+	3200 9800 3550 9800
 $Comp
 L Device:R R103
 U 1 1 5B92CAB7
-P 4750 9800
-F 0 "R103" V 4543 9800 50  0000 C CNN
-F 1 "10k" V 4634 9800 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 4680 9800 50  0001 C CNN
-F 3 "RMCF0603JG10K0CT-ND" H 4750 9800 50  0001 C CNN
-	1    4750 9800
+P 3700 9800
+F 0 "R103" V 3493 9800 50  0000 C CNN
+F 1 "10k" V 3584 9800 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 3630 9800 50  0001 C CNN
+F 3 "RMCF0603JG10K0CT-ND" H 3700 9800 50  0001 C CNN
+	1    3700 9800
 	0    1    1    0   
 $EndComp
 $Comp
 L power:GND #PWR0105
 U 1 1 5B92D2E7
-P 4900 9800
-F 0 "#PWR0105" H 4900 9550 50  0001 C CNN
-F 1 "GND" V 4905 9672 50  0000 R CNN
-F 2 "" H 4900 9800 50  0001 C CNN
-F 3 "" H 4900 9800 50  0001 C CNN
-	1    4900 9800
+P 3850 9800
+F 0 "#PWR0105" H 3850 9550 50  0001 C CNN
+F 1 "GND" V 3855 9672 50  0000 R CNN
+F 2 "" H 3850 9800 50  0001 C CNN
+F 3 "" H 3850 9800 50  0001 C CNN
+	1    3850 9800
 	0    -1   -1   0   
 $EndComp
 $Comp
@ -370,89 +255,80 @@ $EndComp
 $Comp
 L power:VCC #PWR0107
 U 1 1 5BB36550
-P 1250 7250
-F 0 "#PWR0107" H 1250 7100 50  0001 C CNN
-F 1 "VCC" V 1268 7377 50  0000 L CNN
-F 2 "" H 1250 7250 50  0001 C CNN
-F 3 "" H 1250 7250 50  0001 C CNN
-	1    1250 7250
+P 1050 7250
+F 0 "#PWR0107" H 1050 7100 50  0001 C CNN
+F 1 "VCC" V 1068 7377 50  0000 L CNN
+F 2 "" H 1050 7250 50  0001 C CNN
+F 3 "" H 1050 7250 50  0001 C CNN
+	1    1050 7250
 	0    -1   -1   0   
 $EndComp
 $Comp
 L power:GND #PWR0108
 U 1 1 5BB36A29
-P 1250 7700
-F 0 "#PWR0108" H 1250 7450 50  0001 C CNN
-F 1 "GND" V 1255 7572 50  0000 R CNN
-F 2 "" H 1250 7700 50  0001 C CNN
-F 3 "" H 1250 7700 50  0001 C CNN
-	1    1250 7700
+P 1050 7700
+F 0 "#PWR0108" H 1050 7450 50  0001 C CNN
+F 1 "GND" V 1055 7572 50  0000 R CNN
+F 2 "" H 1050 7700 50  0001 C CNN
+F 3 "" H 1050 7700 50  0001 C CNN
+	1    1050 7700
 	0    1    1    0   
 $EndComp
 $Comp
-L dk_Tactile-Switches:1825910-7 SW101
+L Switch:SW_Push SW101
 U 1 1 5BB36E8A
-P 1550 7800
-F 0 "SW101" H 1550 8125 50  0000 C CNN
-F 1 "SW_Push" H 1550 8034 50  0000 C CNN
-F 2 "digikey-footprints:Switch_Tactile_THT_6x6mm" H 1550 8000 50  0001 C CNN
-F 3 "450-1804-ND " H 1550 8000 50  0001 C CNN
-	1    1550 7800
+P 1350 7800
+F 0 "SW101" H 1350 8125 50  0000 C CNN
+F 1 "SW_Push" H 1350 8034 50  0000 C CNN
+F 2 "digikey-footprints:Switch_Tactile_THT_6x6mm" H 1350 8000 50  0001 C CNN
+F 3 "450-1804-ND " H 1350 8000 50  0001 C CNN
+	1    1350 7800
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:R R104
 U 1 1 5BB3732A
-P 1550 7250
-F 0 "R104" V 1343 7250 50  0000 C CNN
-F 1 "10k" V 1434 7250 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1480 7250 50  0001 C CNN
-F 3 "RMCF0603JG10K0CT-ND" H 1550 7250 50  0001 C CNN
-	1    1550 7250
+P 1350 7250
+F 0 "R104" V 1143 7250 50  0000 C CNN
+F 1 "10k" V 1234 7250 50  0000 C CNN
+F 2 "Resistor_SMD:R_0603_1608Metric" V 1280 7250 50  0001 C CNN
+F 3 "RMCF0603JG10K0CT-ND" H 1350 7250 50  0001 C CNN
+	1    1350 7250
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	1700 7250 1850 7250
-Wire Wire Line
-	1850 7250 1850 7700
-Wire Wire Line
-	1850 7700 2000 7700
-Wire Wire Line
-	1850 7700 1750 7700
-Connection ~ 1850 7700
-Wire Wire Line
-	1350 7700 1250 7700
+	1150 7700 1050 7700
 $Comp
 L power:GND #PWR0119
 U 1 1 5BC192AB
-P 1100 9850
-F 0 "#PWR0119" H 1100 9600 50  0001 C CNN
-F 1 "GND" H 1105 9677 50  0000 C CNN
-F 2 "" H 1100 9850 50  0001 C CNN
-F 3 "" H 1100 9850 50  0001 C CNN
-	1    1100 9850
+P 1100 9450
+F 0 "#PWR0119" H 1100 9200 50  0001 C CNN
+F 1 "GND" H 1105 9277 50  0000 C CNN
+F 2 "" H 1100 9450 50  0001 C CNN
+F 3 "" H 1100 9450 50  0001 C CNN
+	1    1100 9450
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:GND #PWR0103
 U 1 1 5BC19AC1
-P 1950 9650
-F 0 "#PWR0103" H 1950 9400 50  0001 C CNN
-F 1 "GND" H 1955 9477 50  0000 C CNN
-F 2 "" H 1950 9650 50  0001 C CNN
-F 3 "" H 1950 9650 50  0001 C CNN
-	1    1950 9650
+P 1950 9400
+F 0 "#PWR0103" H 1950 9150 50  0001 C CNN
+F 1 "GND" H 1955 9227 50  0000 C CNN
+F 2 "" H 1950 9400 50  0001 C CNN
+F 3 "" H 1950 9400 50  0001 C CNN
+	1    1950 9400
 	1    0    0    -1  
 $EndComp
 $Comp
 L power:VCC #PWR0120
 U 1 1 5BC1A9DD
-P 2000 10100
-F 0 "#PWR0120" H 2000 9950 50  0001 C CNN
-F 1 "VCC" V 2018 10227 50  0000 L CNN
-F 2 "" H 2000 10100 50  0001 C CNN
-F 3 "" H 2000 10100 50  0001 C CNN
-	1    2000 10100
+P 2000 9700
+F 0 "#PWR0120" H 2000 9550 50  0001 C CNN
+F 1 "VCC" V 2018 9827 50  0000 L CNN
+F 2 "" H 2000 9700 50  0001 C CNN
+F 3 "" H 2000 9700 50  0001 C CNN
+	1    2000 9700
 	0    -1   -1   0   
 $EndComp
 Wire Wire Line
@ -461,124 +337,11 @@ Wire Wire Line
 	1000 5350 1150 5350
 Wire Wire Line
 	1000 5350 1000 5400
-NoConn ~ 2400 1900
-NoConn ~ 2400 2350
-NoConn ~ 2400 2800
-NoConn ~ 2400 3250
 Wire Wire Line
 	3400 3400 3400 1200
 Connection ~ 3400 3400
-NoConn ~ 9550 6000
-NoConn ~ 8450 6000
-NoConn ~ 7400 6000
-NoConn ~ 6300 6000
-NoConn ~ 14700 6000
-NoConn ~ 13600 6000
-NoConn ~ 12500 6000
-NoConn ~ 11400 6700
-NoConn ~ 11400 7150
-NoConn ~ 11400 7600
-NoConn ~ 11400 8050
-Text Notes 8000 850  0    197  ~ 0
-Main
-Text Label 14200 1200 0    60   ~ 0
-col10
-Wire Wire Line
-	14200 1200 14200 1600
-Text Label 13150 1200 0    60   ~ 0
-col9
-Wire Wire Line
-	13150 1200 13150 1600
-Text Label 12050 1200 0    60   ~ 0
-col8
-Wire Wire Line
-	12050 1200 12050 1600
-Text Label 10950 1200 0    60   ~ 0
-col7
-Wire Wire Line
-	10950 1200 10950 1600
-Text Label 9900 1200 0    60   ~ 0
-col6
-Wire Wire Line
-	9900 1200 9900 1600
-Text Label 8850 1200 0    60   ~ 0
-col5
-Wire Wire Line
-	8850 1200 8850 1600
-Text Label 7750 1200 0    60   ~ 0
-col4
-Wire Wire Line
-	7750 1200 7750 1600
-Text Label 6700 1200 0    60   ~ 0
-col3
-Wire Wire Line
-	6700 1200 6700 1600
-Wire Wire Line
-	5600 1200 5600 2050
-Text Label 5600 1200 0    60   ~ 0
-col2
 Text Label 4500 1200 0    60   ~ 0
 col1
-Wire Wire Line
-	4500 1200 4500 1600
-NoConn ~ 14200 1600
-NoConn ~ 13150 1600
-NoConn ~ 12050 1600
-NoConn ~ 10950 1600
-NoConn ~ 9900 1600
-NoConn ~ 8850 1600
-NoConn ~ 7750 1600
-NoConn ~ 6700 1600
-NoConn ~ 5600 2050
-NoConn ~ 4500 1600
-Text Label 11400 8500 2    60   ~ 0
-row1
-Text Label 11400 8950 2    60   ~ 0
-row0
-$Comp
-L power:VCC #PWR0113
-U 1 1 5BC14098
-P 3400 7450
-F 0 "#PWR0113" H 3400 7300 50  0001 C CNN
-F 1 "VCC" H 3417 7623 50  0000 C CNN
-F 2 "" H 3400 7450 50  0001 C CNN
-F 3 "" H 3400 7450 50  0001 C CNN
-	1    3400 7450
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:VCC #PWR0112
-U 1 1 5BC13E18
-P 3300 7450
-F 0 "#PWR0112" H 3300 7300 50  0001 C CNN
-F 1 "VCC" H 3317 7623 50  0000 C CNN
-F 2 "" H 3300 7450 50  0001 C CNN
-F 3 "" H 3300 7450 50  0001 C CNN
-	1    3300 7450
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:VCC #PWR0111
-U 1 1 5BC13B98
-P 3050 7450
-F 0 "#PWR0111" H 3050 7300 50  0001 C CNN
-F 1 "VCC" H 3067 7623 50  0000 C CNN
-F 2 "" H 3050 7450 50  0001 C CNN
-F 3 "" H 3050 7450 50  0001 C CNN
-	1    3050 7450
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:VCC #PWR0110
-U 1 1 5BC13918
-P 2950 7450
-F 0 "#PWR0110" H 2950 7300 50  0001 C CNN
-F 1 "VCC" H 2967 7623 50  0000 C CNN
-F 2 "" H 2950 7450 50  0001 C CNN
-F 3 "" H 2950 7450 50  0001 C CNN
-	1    2950 7450
-	1    0    0    -1  
-$EndComp
 $Comp
 L power:VCC #PWR0101
 U 1 1 5B4FFBC4
@ -629,13 +392,6 @@ F 3 "" H 2450 5750 50  0001 C CNN
 	1    2450 5750
 	1    0    0    -1  
 $EndComp
-Wire Wire Line
-	2700 7450 1950 7450
-Wire Wire Line
-	1950 7450 1950 8900
-Connection ~ 1950 8900
-Wire Wire Line
-	1950 8900 1700 8900
 Wire Wire Line
 	1000 5350 800  5350
 Connection ~ 1000 5350
@ -646,9 +402,9 @@ Text Label 800  5350 2    50   ~ 0
 xtal1
 Text Label 2000 5350 0    50   ~ 0
 xtal2
-Text Label 2000 8100 2    50   ~ 0
+Text Label 2000 7900 2    50   ~ 0
 xtal1
-Text Label 2000 8300 2    50   ~ 0
+Text Label 2000 8100 2    50   ~ 0
 xtal2
 Wire Wire Line
 	1300 5700 1650 5700
@ -664,93 +420,29 @@ F 3 "" H 1300 5800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	1750 7700 1750 7900
-Connection ~ 1750 7700
-Wire Wire Line
-	1350 7700 1350 7900
-Connection ~ 1350 7700
-$Comp
-L power:PWR_FLAG #FLG0101
-U 1 1 5BEC402B
-P 1200 6550
-F 0 "#FLG0101" H 1200 6625 50  0001 C CNN
-F 1 "PWR_FLAG" H 1200 6724 50  0000 C CNN
-F 2 "" H 1200 6550 50  0001 C CNN
-F 3 "" H 1200 6550 50  0001 C CNN
-	1    1200 6550
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:VCC #PWR0122
-U 1 1 5BEC43C5
-P 1200 6550
-F 0 "#PWR0122" H 1200 6400 50  0001 C CNN
-F 1 "VCC" V 1217 6678 50  0000 L CNN
-F 2 "" H 1200 6550 50  0001 C CNN
-F 3 "" H 1200 6550 50  0001 C CNN
-	1    1200 6550
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	2750 10850 3000 10850
-Wire Wire Line
-	1250 7250 1400 7250
-Wire Wire Line
-	3100 10850 3000 10850
-Connection ~ 3000 10850
-Wire Wire Line
-	3100 10850 3200 10850
-Connection ~ 3100 10850
-Wire Wire Line
-	3200 10850 3300 10850
-Connection ~ 3200 10850
-Wire Wire Line
-	3300 10850 3300 11000
-Connection ~ 3300 10850
+	1050 7250 1200 7250
 $Comp
 L power:GND #PWR0114
 U 1 1 5BECACF6
-P 3300 11000
-F 0 "#PWR0114" H 3300 10750 50  0001 C CNN
-F 1 "GND" H 3305 10827 50  0000 C CNN
-F 2 "" H 3300 11000 50  0001 C CNN
-F 3 "" H 3300 11000 50  0001 C CNN
-	1    3300 11000
+P 2900 11000
+F 0 "#PWR0114" H 2900 10750 50  0001 C CNN
+F 1 "GND" H 2905 10827 50  0000 C CNN
+F 2 "" H 2900 11000 50  0001 C CNN
+F 3 "" H 2900 11000 50  0001 C CNN
+	1    2900 11000
 	1    0    0    -1  
 $EndComp
-$Comp
-L power:PWR_FLAG #FLG0102
-U 1 1 5BECB8EA
-P 1800 6550
-F 0 "#FLG0102" H 1800 6625 50  0001 C CNN
-F 1 "PWR_FLAG" H 1800 6724 50  0000 C CNN
-F 2 "" H 1800 6550 50  0001 C CNN
-F 3 "" H 1800 6550 50  0001 C CNN
-	1    1800 6550
-	1    0    0    -1  
-$EndComp
-$Comp
-L power:GND #PWR0109
-U 1 1 5BECB985
-P 1800 6550
-F 0 "#PWR0109" H 1800 6300 50  0001 C CNN
-F 1 "GND" V 1805 6422 50  0000 R CNN
-F 2 "" H 1800 6550 50  0001 C CNN
-F 3 "" H 1800 6550 50  0001 C CNN
-	1    1800 6550
-	0    -1   -1   0   
-$EndComp
-Text Label 1850 9050 0    50   ~ 0
+Text Label 1850 8700 0    50   ~ 0
 D+
-Text Label 1850 9150 0    50   ~ 0
+Text Label 1850 8800 0    50   ~ 0
 D-
-Text Label 1450 9450 0    50   ~ 0
+Text Label 1450 9050 0    50   ~ 0
 Du+
-Text Label 1450 9550 0    50   ~ 0
+Text Label 1450 9150 0    50   ~ 0
 Du-
-Text Label 1950 9300 0    50   ~ 0
+Text Label 1950 9050 0    50   ~ 0
 Ucap
-NoConn ~ 1450 9650
+NoConn ~ 1450 9250
 Wire Wire Line
 	1300 5550 1300 5700
 Wire Wire Line
@ -761,14 +453,171 @@ Wire Wire Line
 	850  5700 1000 5700
 Connection ~ 1000 5700
 Wire Wire Line
-	1450 9250 1700 9250
+	1450 8850 1700 8850
 Wire Wire Line
-	1100 9850 1150 9850
-Connection ~ 1100 9850
+	1100 9450 1150 9450
+Connection ~ 1100 9450
 Wire Wire Line
-	1050 9850 1100 9850
-Connection ~ 1700 8900
+	1050 9450 1100 9450
 Wire Wire Line
-	1700 9250 1700 8900
-NoConn ~ 4250 10600
+	1700 8850 1700 8500
+NoConn ~ 3200 10600
+Wire Wire Line
+	1950 9000 1950 9100
+Wire Wire Line
+	1950 9000 2000 9000
+Wire Wire Line
+	1150 7800 1150 7700
+Wire Wire Line
+	1550 7700 1550 7800
+NoConn ~ 2000 8300
+Wire Wire Line
+	1700 8500 2000 8500
+$Comp
+L MCU_Microchip_ATmega:ATmega32U4-AU U1
+U 1 1 5B4FB57A
+P 2600 9200
+F 0 "U1" H 2575 11178 50  0000 C CNN
+F 1 "ATMEGA32U4-AU" H 2575 11087 50  0000 C CNN
+F 2 "Package_QFP:TQFP-44_10x10mm_P0.8mm" H 2600 9200 50  0001 C CIN
+F 3 "ATMEGA32U4-AU-ND" H 3700 10300 50  0001 C CNN
+	1    2600 9200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2500 7400 2600 7400
+Wire Wire Line
+	2700 7400 2600 7400
+Connection ~ 2600 7400
+Wire Wire Line
+	1500 7250 1550 7250
+Wire Wire Line
+	1550 7250 1550 7700
+Connection ~ 1550 7700
+Wire Wire Line
+	1550 7700 2000 7700
+Wire Wire Line
+	3200 3400 3400 3400
+Wire Wire Line
+	3200 3850 3400 3850
+Wire Wire Line
+	2650 3400 2800 3400
+Wire Wire Line
+	2650 3850 2800 3850
+Connection ~ 2500 7400
+Wire Wire Line
+	1700 8500 1700 7400
+Wire Wire Line
+	1700 7400 2500 7400
+Connection ~ 1700 8500
+NoConn ~ 3200 7800
+NoConn ~ 3200 7900
+NoConn ~ 3200 8000
+NoConn ~ 3200 8100
+NoConn ~ 3200 8200
+NoConn ~ 3200 8700
+NoConn ~ 3200 8900
+NoConn ~ 3200 9000
+NoConn ~ 3200 9100
+NoConn ~ 3200 9300
+NoConn ~ 3200 9400
+NoConn ~ 3200 9500
+NoConn ~ 3200 9600
+NoConn ~ 3200 9900
+NoConn ~ 3200 10100
+NoConn ~ 3200 10200
+NoConn ~ 3200 10300
+NoConn ~ 3200 10400
+NoConn ~ 3200 10500
+$Comp
+L Switch:SW_Push K_1002
+U 1 1 5C746BFB
+P 4100 3400
+F 0 "K_1002" H 4050 3400 60  0000 C CNN
+F 1 "KEYSW" H 4100 3300 60  0001 C CNN
+F 2 "Button_Switch_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4100 3400 60  0001 C CNN
+F 3 "" H 4100 3400 60  0000 C CNN
+	1    4100 3400
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:D D_1002
+U 1 1 5C746C02
+P 3750 3550
+F 0 "D_1002" V 3600 3500 60  0000 C CNN
+F 1 "D" V 3900 3500 60  0001 C CNN
+F 2 "Diode_SMD:D_SOD-123" H 3750 3550 60  0001 C CNN
+F 3 "1N4148WTPMSCT-ND" V 3750 3550 60  0000 C CNN
+	1    3750 3550
+	0    -1   -1   0   
+$EndComp
+$Comp
+L Switch:SW_Push K_1003
+U 1 1 5C746C0A
+P 4100 3850
+F 0 "K_1003" H 4050 3850 60  0000 C CNN
+F 1 "KEYSW" H 4100 3750 60  0001 C CNN
+F 2 "Button_Switch_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 4100 3850 60  0001 C CNN
+F 3 "" H 4100 3850 60  0000 C CNN
+	1    4100 3850
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:D D_1003
+U 1 1 5C746C11
+P 3750 4000
+F 0 "D_1003" V 3600 3950 60  0000 C CNN
+F 1 "D" V 3900 3950 60  0001 C CNN
+F 2 "Diode_SMD:D_SOD-123" H 3750 4000 60  0001 C CNN
+F 3 "1N4148WTPMSCT-ND" V 3750 4000 60  0000 C CNN
+	1    3750 4000
+	0    -1   -1   0   
+$EndComp
+Wire Wire Line
+	3750 3400 3900 3400
+Wire Wire Line
+	3750 3850 3900 3850
+Wire Wire Line
+	4500 3400 4300 3400
+Wire Wire Line
+	4500 1200 4500 3400
+Wire Wire Line
+	4500 3400 4500 3850
+Wire Wire Line
+	4500 3850 4300 3850
+Connection ~ 4500 3400
+Wire Wire Line
+	2650 3700 3750 3700
+Connection ~ 2650 3700
+Wire Wire Line
+	2650 4150 3750 4150
+Connection ~ 2650 4150
+Wire Wire Line
+	2500 11000 2600 11000
+Wire Wire Line
+	2600 11000 2900 11000
+Connection ~ 2600 11000
+$Comp
+L power:PWR_FLAG #FLG0101
+U 1 1 5C7521E0
+P 2500 6400
+F 0 "#FLG0101" H 2500 6475 50  0001 C CNN
+F 1 "PWR_FLAG" H 2500 6574 50  0000 C CNN
+F 2 "" H 2500 6400 50  0001 C CNN
+F 3 "~" H 2500 6400 50  0001 C CNN
+	1    2500 6400
+	1    0    0    -1  
+$EndComp
+$Comp
+L power:VCC #PWR0104
+U 1 1 5C752551
+P 2500 6400
+F 0 "#PWR0104" H 2500 6250 50  0001 C CNN
+F 1 "VCC" V 2518 6527 50  0000 L CNN
+F 2 "" H 2500 6400 50  0001 C CNN
+F 3 "" H 2500 6400 50  0001 C CNN
+	1    2500 6400
+	0    -1   -1   0   
+$EndComp
+NoConn ~ 3200 9200
 $EndSCHEMATC