keyboard pcb: updated with small cleanups to KiCAD 5.x

reform-keyboard-pcb/mntcomp-keyboard-cache.lib

@@ -1,4 +1,302 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
+# Connector_Generic_Conn_01x02
+#
+DEF Connector_Generic_Conn_01x02 J 0 40 Y N 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Connector_Generic_Conn_01x02" 0 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_1x??_*
+$ENDFPLIST
+DRAW
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 50 50 -150 1 1 10 f
+X Pin_1 1 -200 0 150 R 50 50 1 1 P
+X Pin_2 2 -200 -100 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Connector_Generic_Conn_01x05
+#
+DEF Connector_Generic_Conn_01x05 J 0 40 Y N 1 F N
+F0 "J" 0 300 50 H V C CNN
+F1 "Connector_Generic_Conn_01x05" 0 -300 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_1x??_*
+$ENDFPLIST
+DRAW
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 250 50 -250 1 1 10 f
+X Pin_1 1 -200 200 150 R 50 50 1 1 P
+X Pin_2 2 -200 100 150 R 50 50 1 1 P
+X Pin_3 3 -200 0 150 R 50 50 1 1 P
+X Pin_4 4 -200 -100 150 R 50 50 1 1 P
+X Pin_5 5 -200 -200 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Connector_Generic_Conn_01x06
+#
+DEF Connector_Generic_Conn_01x06 J 0 40 Y N 1 F N
+F0 "J" 0 300 50 H V C CNN
+F1 "Connector_Generic_Conn_01x06" 0 -400 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_1x??_*
+$ENDFPLIST
+DRAW
+S -50 -295 0 -305 1 1 6 N
+S -50 -195 0 -205 1 1 6 N
+S -50 -95 0 -105 1 1 6 N
+S -50 5 0 -5 1 1 6 N
+S -50 105 0 95 1 1 6 N
+S -50 205 0 195 1 1 6 N
+S -50 250 50 -350 1 1 10 f
+X Pin_1 1 -200 200 150 R 50 50 1 1 P
+X Pin_2 2 -200 100 150 R 50 50 1 1 P
+X Pin_3 3 -200 0 150 R 50 50 1 1 P
+X Pin_4 4 -200 -100 150 R 50 50 1 1 P
+X Pin_5 5 -200 -200 150 R 50 50 1 1 P
+X Pin_6 6 -200 -300 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_C_Small
+#
+DEF Device_C_Small C 0 10 N N 1 F N
+F0 "C" 10 70 50 H V L CNN
+F1 "Device_C_Small" 10 -80 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 13 -60 -20 60 -20 N
+P 2 0 1 12 -60 20 60 20 N
+X ~ 1 0 100 80 D 50 50 1 1 P
+X ~ 2 0 -100 80 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_Crystal_GND24
+#
+DEF Device_Crystal_GND24 Y 0 40 Y N 1 F N
+F0 "Y" 125 200 50 H V L CNN
+F1 "Device_Crystal_GND24" 125 125 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Crystal*
+$ENDFPLIST
+DRAW
+S -45 100 45 -100 0 1 12 N
+P 2 0 1 0 -100 0 -80 0 N
+P 2 0 1 20 -80 -50 -80 50 N
+P 2 0 1 0 0 -150 0 -140 N
+P 2 0 1 0 0 140 0 150 N
+P 2 0 1 20 80 -50 80 50 N
+P 2 0 1 0 80 0 100 0 N
+P 4 0 1 0 -100 -90 -100 -140 100 -140 100 -90 N
+P 4 0 1 0 -100 90 -100 140 100 140 100 90 N
+X 1 1 -150 0 50 R 50 50 1 1 P
+X 2 2 0 200 50 D 50 50 1 1 P
+X 3 3 150 0 50 L 50 50 1 1 P
+X 4 4 0 -200 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_D_Small
+#
+DEF Device_D_Small D 0 10 N N 1 F N
+F0 "D" -50 80 50 H V L CNN
+F1 "Device_D_Small" -150 -80 50 H V L CNN
+F2 "" 0 0 50 V I C CNN
+F3 "" 0 0 50 V I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 -30 -40 -30 40 N
+P 2 0 1 0 -30 0 30 0 N
+P 4 0 1 0 30 -40 -30 0 30 40 30 -40 N
+X K 1 -100 0 70 R 50 50 1 1 P
+X A 2 100 0 70 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_LED
+#
+DEF Device_LED D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "Device_LED" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ LED*
+ LED_SMD:*
+ LED_THT:*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 -50 -50 50 N
+P 2 0 1 0 -50 0 50 0 N
+P 4 0 1 8 50 -50 50 50 -50 0 50 -50 N
+P 5 0 1 0 -120 -30 -180 -90 -150 -90 -180 -90 -180 -60 N
+P 5 0 1 0 -70 -30 -130 -90 -100 -90 -130 -90 -130 -60 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_R_Small
+#
+DEF Device_R_Small R 0 10 N N 1 F N
+F0 "R" 30 20 50 H V L CNN
+F1 "Device_R_Small" 30 -40 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ R_*
+$ENDFPLIST
+DRAW
+S -30 70 30 -70 0 1 8 N
+X ~ 1 0 100 30 D 50 50 1 1 P
+X ~ 2 0 -100 30 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# MCU_Microchip_ATmega_ATmega32U4-AU
+#
+DEF MCU_Microchip_ATmega_ATmega32U4-AU U 0 20 Y Y 1 F N
+F0 "U" -500 1750 50 H V L BNN
+F1 "MCU_Microchip_ATmega_ATmega32U4-AU" 100 -1750 50 H V L TNN
+F2 "Package_QFP:TQFP-44_10x10mm_P0.8mm" 0 0 50 H I C CIN
+F3 "" 0 0 50 H I C CNN
+ALIAS ATmega16U4RC-AU ATmega32U4-AU ATmega32U4RC-AU
+$FPLIST
+ TQFP*10x10mm*P0.8mm*
+$ENDFPLIST
+DRAW
+S -500 -1700 500 1700 0 1 10 f
+X PE6 1 600 -700 100 L 50 50 1 1 T
+X PB2 10 600 1300 100 L 50 50 1 1 T
+X PB3 11 600 1200 100 L 50 50 1 1 T
+X PB7 12 600 800 100 L 50 50 1 1 T
+X ~RESET 13 -600 1500 100 R 50 50 1 1 I
+X VCC 14 0 1800 100 D 50 50 1 1 W
+X GND 15 0 -1800 100 U 50 50 1 1 W
+X XTAL2 16 -600 1100 100 R 50 50 1 1 O
+X XTAL1 17 -600 1300 100 R 50 50 1 1 I
+X PD0 18 600 300 100 L 50 50 1 1 T
+X PD1 19 600 200 100 L 50 50 1 1 T
+X UVCC 2 -100 1800 100 D 50 50 1 1 W
+X PD2 20 600 100 100 L 50 50 1 1 T
+X PD3 21 600 0 100 L 50 50 1 1 T
+X PD5 22 600 -200 100 L 50 50 1 1 T
+X GND 23 0 -1800 100 U 50 50 1 1 P N
+X AVCC 24 100 1800 100 D 50 50 1 1 W
+X PD4 25 600 -100 100 L 50 50 1 1 T
+X PD6 26 600 -300 100 L 50 50 1 1 T
+X PD7 27 600 -400 100 L 50 50 1 1 T
+X PB4 28 600 1100 100 L 50 50 1 1 T
+X PB5 29 600 1000 100 L 50 50 1 1 T
+X D- 3 -600 400 100 R 50 50 1 1 B
+X PB6 30 600 900 100 L 50 50 1 1 T
+X PC6 31 600 600 100 L 50 50 1 1 T
+X PC7 32 600 500 100 L 50 50 1 1 T
+X ~HWB~/PE2 33 600 -600 100 L 50 50 1 1 T
+X VCC 34 0 1800 100 D 50 50 1 1 P N
+X GND 35 0 -1800 100 U 50 50 1 1 P N
+X PF7 36 600 -1400 100 L 50 50 1 1 T
+X PF6 37 600 -1300 100 L 50 50 1 1 T
+X PF5 38 600 -1200 100 L 50 50 1 1 T
+X PF4 39 600 -1100 100 L 50 50 1 1 T
+X D+ 4 -600 500 100 R 50 50 1 1 B
+X PF1 40 600 -1000 100 L 50 50 1 1 T
+X PF0 41 600 -900 100 L 50 50 1 1 T
+X AREF 42 -600 900 100 R 50 50 1 1 P
+X GND 43 0 -1800 100 U 50 50 1 1 P N
+X AVCC 44 100 1800 100 D 50 50 1 1 P N
+X UGND 5 -100 -1800 100 U 50 50 1 1 P
+X UCAP 6 -600 200 100 R 50 50 1 1 P
+X VBUS 7 -600 700 100 R 50 50 1 1 I
+X PB0 8 600 1500 100 L 50 50 1 1 T
+X PB1 9 600 1400 100 L 50 50 1 1 T
+ENDDRAW
+ENDDEF
+#
+# Mechanical_MountingHole
+#
+DEF Mechanical_MountingHole H 0 40 Y Y 1 F N
+F0 "H" 0 200 50 H V C CNN
+F1 "Mechanical_MountingHole" 0 125 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ MountingHole*
+$ENDFPLIST
+DRAW
+C 0 0 50 0 1 50 N
+ENDDRAW
+ENDDEF
+#
+# mntcomp-keyboard_ML
+#
+DEF mntcomp-keyboard_ML SW 0 40 N N 1 F N
+F0 "SW" 150 -50 50 H V C CNN
+F1 "mntcomp-keyboard_ML" -150 -50 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+DRAW
+S -170 50 170 60 0 1 0 N
+P 4 0 1 0 -40 60 -30 90 30 90 40 60 N
+X 1 1 -250 150 200 R 50 50 1 1 P
+X 2 2 0 350 200 D 50 50 1 1 P I
+X 3 3 250 150 200 L 50 50 1 1 P
+X 4 4 0 -200 200 U 50 50 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# power_+5V
+#
+DEF power_+5V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "power_+5V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +5V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# power_GND
+#
+DEF power_GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "power_GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
 #End Library

reform-keyboard-pcb/mntcomp-keyboard.pro

@@ -1,6 +1,6 @@
-update=Sun 11 Nov 2018 02:39:42 PM CET
+update=Fri 29 Mar 2019 02:03:52 PM CET
 version=1
-last_client=kicad
+last_client=eeschema
 [pcbnew]
 version=1
 LastNetListRead=
@@ -25,40 +25,6 @@ version=1
 NetIExt=net
 [general]
 version=1
-[eeschema]
-version=1
-LibDir=
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=microcontrollers
-LibName13=dsp
-LibName14=microchip
-LibName15=analog_switches
-LibName16=motorola
-LibName17=texas
-LibName18=intel
-LibName19=audio
-LibName20=interface
-LibName21=digital-audio
-LibName22=philips
-LibName23=display
-LibName24=cypress
-LibName25=siliconi
-LibName26=opto
-LibName27=atmel
-LibName28=contrib
-LibName29=valves
-LibName30=mntcomp-keyboard
 [schematic_editor]
 version=1
 PageLayoutDescrFile=
@@ -69,3 +35,6 @@ NetFmtName=
 SpiceAjustPassiveValues=0
 LabSize=60
 ERC_TestSimilarLabels=1
+[eeschema]
+version=1
+LibDir=

reform-keyboard-pcb/reform-kbd-mcu.sch

@@ -1,108 +1,78 @@
 EESchema Schematic File Version 4
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-LIBS:mntcomp-keyboard
 LIBS:mntcomp-keyboard-cache
-EELAYER 26 0
+EELAYER 29 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
 Sheet 2 2
 Title "Reform Keyboard"
-Date "2018-11-11"
-Rev "0.4"
+Date "2019-03-29"
+Rev "0.5"
 Comp "MNT Media and Technology UG"
 Comment1 "License: GPLv3+ https://www.gnu.org/licenses/gpl-3.0.en.html"
-Comment2 "Copyright 2017,2018 Lukas F. Hartmann / mntmn"
-Comment3 "https://mntmn.com/reform"
+Comment2 "Copyright 2017,2018,2019 Lukas F. Hartmann / mntmn"
+Comment3 "https://mntre.com/reform"
 Comment4 ""
 $EndDescr
 $Comp
-L GND #PWR01
+L power:GND #PWR01
 U 1 1 5A20720B
-P 3800 4700
-F 0 "#PWR01" H 3800 4450 50  0001 C CNN
-F 1 "GND" H 3800 4550 50  0000 C CNN
-F 2 "" H 3800 4700 50  0001 C CNN
-F 3 "" H 3800 4700 50  0001 C CNN
-	1    3800 4700
+P 4650 4450
+F 0 "#PWR01" H 4650 4200 50  0001 C CNN
+F 1 "GND" H 4650 4300 50  0000 C CNN
+F 2 "" H 4650 4450 50  0001 C CNN
+F 3 "" H 4650 4450 50  0001 C CNN
+	1    4650 4450
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C1
+L Device:C_Small C1
 U 1 1 5A2073AA
-P 2700 3600
-F 0 "C1" H 2710 3670 50  0000 L CNN
-F 1 "18pF" H 2710 3520 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 2700 3600 50  0001 C CNN
-F 3 "" H 2700 3600 50  0001 C CNN
-	1    2700 3600
+P 3500 3400
+F 0 "C1" H 3510 3470 50  0000 L CNN
+F 1 "18pF" H 3510 3320 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3500 3400 50  0001 C CNN
+F 3 "" H 3500 3400 50  0001 C CNN
+	1    3500 3400
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C2
+L Device:C_Small C2
 U 1 1 5A2073F7
-P 3300 3600
-F 0 "C2" H 3310 3670 50  0000 L CNN
-F 1 "18pF" H 3310 3520 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3300 3600 50  0001 C CNN
-F 3 "" H 3300 3600 50  0001 C CNN
-	1    3300 3600
+P 4100 3400
+F 0 "C2" H 4110 3470 50  0000 L CNN
+F 1 "18pF" H 4110 3320 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 4100 3400 50  0001 C CNN
+F 3 "" H 4100 3400 50  0001 C CNN
+	1    4100 3400
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR02
+L power:GND #PWR02
 U 1 1 5A207477
-P 3000 3850
-F 0 "#PWR02" H 3000 3600 50  0001 C CNN
-F 1 "GND" H 3000 3700 50  0000 C CNN
-F 2 "" H 3000 3850 50  0001 C CNN
-F 3 "" H 3000 3850 50  0001 C CNN
-	1    3000 3850
+P 3800 3650
+F 0 "#PWR02" H 3800 3400 50  0001 C CNN
+F 1 "GND" H 3800 3500 50  0000 C CNN
+F 2 "" H 3800 3650 50  0001 C CNN
+F 3 "" H 3800 3650 50  0001 C CNN
+	1    3800 3650
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C3
+L Device:C_Small C3
 U 1 1 5A20764E
-P 3800 4500
-F 0 "C3" H 3810 4570 50  0000 L CNN
-F 1 "1uF" H 3810 4420 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3800 4500 50  0001 C CNN
-F 3 "" H 3800 4500 50  0001 C CNN
-	1    3800 4500
+P 4650 4250
+F 0 "C3" H 4660 4320 50  0000 L CNN
+F 1 "1uF" H 4660 4170 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 4650 4250 50  0001 C CNN
+F 3 "" H 4650 4250 50  0001 C CNN
+	1    4650 4250
 	1    0    0    -1  
 $EndComp
 Text GLabel 8900 3850 2    60   Input ~ 0
 UVCC
 $Comp
-L GND #PWR03
+L power:GND #PWR03
 U 1 1 5A2077AE
 P 9400 4000
 F 0 "#PWR03" H 9400 3750 50  0001 C CNN
@@ -118,27 +88,27 @@ Text GLabel 8900 3750 2    60   Input ~ 0
 D-
 Text GLabel 8900 3450 2    60   Input ~ 0
 PWRON
-Text GLabel 3900 3700 0    60   Input ~ 0
+Text GLabel 4750 3350 0    60   Input ~ 0
 UVCC
-Text GLabel 3600 4050 0    60   Input ~ 0
+Text GLabel 4450 3700 0    60   Input ~ 0
 D+
-Text GLabel 3600 4150 0    60   Input ~ 0
+Text GLabel 4450 3800 0    60   Input ~ 0
 D-
-Text GLabel 4700 1900 1    60   Input ~ 0
+Text GLabel 5550 1850 1    60   Input ~ 0
 UVCC
 $Comp
-L GND #PWR04
+L power:GND #PWR04
 U 1 1 5A207A65
-P 4750 6200
-F 0 "#PWR04" H 4750 5950 50  0001 C CNN
-F 1 "GND" H 4750 6050 50  0000 C CNN
-F 2 "" H 4750 6200 50  0001 C CNN
-F 3 "" H 4750 6200 50  0001 C CNN
-	1    4750 6200
+P 5550 6350
+F 0 "#PWR04" H 5550 6100 50  0001 C CNN
+F 1 "GND" H 5550 6200 50  0000 C CNN
+F 2 "" H 5550 6350 50  0001 C CNN
+F 3 "" H 5550 6350 50  0001 C CNN
+	1    5550 6350
 	1    0    0    -1  
 $EndComp
 $Comp
-L Conn_01x02 J1
+L Connector_Generic:Conn_01x02 J1
 U 1 1 5A207D64
 P 7700 2950
 F 0 "J1" H 7700 3050 50  0000 C CNN
@@ -150,10 +120,10 @@ F 3 "" H 7700 2950 50  0001 C CNN
 $EndComp
 Text GLabel 7900 2850 2    60   Input ~ 0
 RESET
-Text GLabel 3700 2700 0    60   Input ~ 0
+Text GLabel 4750 2700 0    60   Input ~ 0
 RESET
 $Comp
-L GND #PWR05
+L power:GND #PWR05
 U 1 1 5A207DEF
 P 8000 3100
 F 0 "#PWR05" H 8000 2850 50  0001 C CNN
@@ -205,23 +175,12 @@ Text GLabel 6250 5400 2    60   Input ~ 0
 COL14
 Text GLabel 6250 5500 2    60   Input ~ 0
 COL15
-$Comp
-L ATMEGA32U4-AU U1
-U 1 1 5A21306C
-P 5150 4250
-F 0 "U1" H 4200 5950 50  0000 C CNN
-F 1 "ATMEGA32U4-AU" H 5850 2750 50  0000 C CNN
-F 2 "Housings_QFP:TQFP-44_10x10mm_Pitch0.8mm" H 5150 4250 50  0001 C CIN
-F 3 "" H 6250 5350 50  0001 C CNN
-	1    5150 4250
-	1    0    0    -1  
-$EndComp
 Text GLabel 6250 5600 2    60   Input ~ 0
 PWRON
-Text GLabel 3700 2150 0    60   Input ~ 0
+Text GLabel 4750 2150 0    60   Input ~ 0
 RAWVCC
 $Comp
-L Conn_01x06 J2
+L Connector_Generic:Conn_01x06 J2
 U 1 1 5A213B3D
 P 8700 3650
 F 0 "J2" H 8700 3950 50  0000 C CNN
@@ -234,75 +193,75 @@ $EndComp
 Text GLabel 8900 3350 2    60   Input ~ 0
 RAWVCC
 $Comp
-L R_Small R2
+L Device:R_Small R2
 U 1 1 5A213EDF
-P 3750 4150
-F 0 "R2" V 3850 4100 50  0000 L CNN
-F 1 "0" V 3850 4250 50  0000 L CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" H 3750 4150 50  0001 C CNN
-F 3 "" H 3750 4150 50  0001 C CNN
-	1    3750 4150
+P 4600 3800
+F 0 "R2" V 4700 3750 50  0000 L CNN
+F 1 "0" V 4700 3900 50  0000 L CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" H 4600 3800 50  0001 C CNN
+F 3 "" H 4600 3800 50  0001 C CNN
+	1    4600 3800
 	0    1    1    0   
 $EndComp
 $Comp
-L R_Small R1
+L Device:R_Small R1
 U 1 1 5A213F64
-P 3750 4050
-F 0 "R1" V 3650 4000 50  0000 L CNN
-F 1 "0" V 3650 4150 50  0000 L CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" H 3750 4050 50  0001 C CNN
-F 3 "" H 3750 4050 50  0001 C CNN
-	1    3750 4050
+P 4600 3700
+F 0 "R1" V 4500 3650 50  0000 L CNN
+F 1 "0" V 4500 3800 50  0000 L CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" H 4600 3700 50  0001 C CNN
+F 3 "" H 4600 3700 50  0001 C CNN
+	1    4600 3700
 	0    1    1    0   
 $EndComp
-Text GLabel 4950 1900 1    60   Input ~ 0
+Text GLabel 5650 1850 1    60   Input ~ 0
 RAWVCC
 $Comp
-L C_Small C4
+L Device:C_Small C4
 U 1 1 5A2148C0
-P 4450 2200
-F 0 "C4" H 4460 2270 50  0000 L CNN
-F 1 "1uF" H 4460 2120 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 4450 2200 50  0001 C CNN
-F 3 "" H 4450 2200 50  0001 C CNN
-	1    4450 2200
+P 5300 2150
+F 0 "C4" H 5310 2220 50  0000 L CNN
+F 1 "1uF" H 5310 2070 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 5300 2150 50  0001 C CNN
+F 3 "" H 5300 2150 50  0001 C CNN
+	1    5300 2150
 	1    0    0    -1  
 $EndComp
 $Comp
-L C_Small C5
+L Device:C_Small C5
 U 1 1 5A214A09
-P 5700 2150
-F 0 "C5" H 5710 2220 50  0000 L CNN
-F 1 "1uF" H 5710 2070 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 5700 2150 50  0001 C CNN
-F 3 "" H 5700 2150 50  0001 C CNN
-	1    5700 2150
+P 6000 2100
+F 0 "C5" H 6010 2170 50  0000 L CNN
+F 1 "1uF" H 6010 2020 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 6000 2100 50  0001 C CNN
+F 3 "" H 6000 2100 50  0001 C CNN
+	1    6000 2100
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR06
+L power:GND #PWR06
 U 1 1 5A214AB7
-P 4450 2300
-F 0 "#PWR06" H 4450 2050 50  0001 C CNN
-F 1 "GND" H 4450 2150 50  0000 C CNN
-F 2 "" H 4450 2300 50  0001 C CNN
-F 3 "" H 4450 2300 50  0001 C CNN
-	1    4450 2300
+P 5300 2250
+F 0 "#PWR06" H 5300 2000 50  0001 C CNN
+F 1 "GND" H 5300 2100 50  0000 C CNN
+F 2 "" H 5300 2250 50  0001 C CNN
+F 3 "" H 5300 2250 50  0001 C CNN
+	1    5300 2250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR07
+L power:GND #PWR07
 U 1 1 5A214B4F
-P 5700 2300
-F 0 "#PWR07" H 5700 2050 50  0001 C CNN
-F 1 "GND" H 5700 2150 50  0000 C CNN
-F 2 "" H 5700 2300 50  0001 C CNN
-F 3 "" H 5700 2300 50  0001 C CNN
-	1    5700 2300
+P 6000 2250
+F 0 "#PWR07" H 6000 2000 50  0001 C CNN
+F 1 "GND" H 6000 2100 50  0000 C CNN
+F 2 "" H 6000 2250 50  0001 C CNN
+F 3 "" H 6000 2250 50  0001 C CNN
+	1    6000 2250
 	1    0    0    -1  
 $EndComp
 $Comp
-L TEST MH1
+L Mechanical:MountingHole MH1
 U 1 1 5A26DEEF
 P 1500 5950
 F 0 "MH1" H 1500 6250 50  0000 C BNN
@@ -313,7 +272,7 @@ F 3 "" H 1500 5950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L TEST MH2
+L Mechanical:MountingHole MH2
 U 1 1 5A26E0DE
 P 1750 5950
 F 0 "MH2" H 1750 6250 50  0000 C BNN
@@ -324,7 +283,7 @@ F 3 "" H 1750 5950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L TEST MH3
+L Mechanical:MountingHole MH3
 U 1 1 5A26E127
 P 2000 5950
 F 0 "MH3" H 2000 6250 50  0000 C BNN
@@ -335,7 +294,7 @@ F 3 "" H 2000 5950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L TEST MH4
+L Mechanical:MountingHole MH4
 U 1 1 5A26E16D
 P 2250 5950
 F 0 "MH4" H 2250 6250 50  0000 C BNN
@@ -346,51 +305,51 @@ F 3 "" H 2250 5950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR08
+L power:+5V #PWR08
 U 1 1 5A635C68
-P 5150 2050
-F 0 "#PWR08" H 5150 1900 50  0001 C CNN
-F 1 "+5V" H 5150 2190 50  0000 C CNN
-F 2 "" H 5150 2050 50  0001 C CNN
-F 3 "" H 5150 2050 50  0001 C CNN
-	1    5150 2050
+P 5750 2000
+F 0 "#PWR08" H 5750 1850 50  0001 C CNN
+F 1 "+5V" H 5750 2140 50  0000 C CNN
+F 2 "" H 5750 2000 50  0001 C CNN
+F 3 "" H 5750 2000 50  0001 C CNN
+	1    5750 2000
 	1    0    0    -1  
 $EndComp
 $Comp
-L +5V #PWR09
+L power:+5V #PWR09
 U 1 1 5A635C9E
-P 3800 2050
-F 0 "#PWR09" H 3800 1900 50  0001 C CNN
-F 1 "+5V" H 3800 2190 50  0000 C CNN
-F 2 "" H 3800 2050 50  0001 C CNN
-F 3 "" H 3800 2050 50  0001 C CNN
-	1    3800 2050
+P 4850 2050
+F 0 "#PWR09" H 4850 1900 50  0001 C CNN
+F 1 "+5V" H 4850 2190 50  0000 C CNN
+F 2 "" H 4850 2050 50  0001 C CNN
+F 3 "" H 4850 2050 50  0001 C CNN
+	1    4850 2050
 	1    0    0    -1  
 $EndComp
 $Comp
-L R_Small R3
+L Device:R_Small R3
 U 1 1 5A21443A
-P 3800 2350
-F 0 "R3" H 3830 2370 50  0000 L CNN
-F 1 "10k" H 3830 2310 50  0000 L CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" H 3800 2350 50  0001 C CNN
-F 3 "" H 3800 2350 50  0001 C CNN
-	1    3800 2350
+P 4850 2350
+F 0 "R3" H 4880 2370 50  0000 L CNN
+F 1 "10k" H 4880 2310 50  0000 L CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" H 4850 2350 50  0001 C CNN
+F 3 "" H 4850 2350 50  0001 C CNN
+	1    4850 2350
 	1    0    0    -1  
 $EndComp
 $Comp
-L Crystal_GND24 Y1
+L Device:Crystal_GND24 Y1
 U 1 1 5A6378F6
-P 3000 3300
-F 0 "Y1" H 3125 3500 50  0000 L CNN
-F 1 "16MHz" H 3125 3425 50  0000 L CNN
-F 2 "Crystals:Crystal_SMD_3225-4pin_3.2x2.5mm_HandSoldering" H 3000 3300 50  0001 C CNN
-F 3 "" H 3000 3300 50  0001 C CNN
-	1    3000 3300
+P 3800 3100
+F 0 "Y1" H 3925 3300 50  0000 L CNN
+F 1 "16MHz" H 3925 3225 50  0000 L CNN
+F 2 "Crystals:Crystal_SMD_3225-4pin_3.2x2.5mm_HandSoldering" H 3800 3100 50  0001 C CNN
+F 3 "" H 3800 3100 50  0001 C CNN
+	1    3800 3100
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED D80
+L Device:LED D80
 U 1 1 5A666D80
 P 6950 5300
 F 0 "D80" H 6950 5400 50  0000 C CNN
@@ -401,7 +360,7 @@ F 3 "" H 6950 5300 50  0001 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R_Small R4
+L Device:R_Small R4
 U 1 1 5A666EFB
 P 6950 5550
 F 0 "R4" H 6980 5570 50  0000 L CNN
@@ -414,7 +373,7 @@ $EndComp
 Text GLabel 7200 5750 2    60   Input ~ 0
 RAWVCC
 $Comp
-L Conn_01x05 J3
+L Connector_Generic:Conn_01x05 J3
 U 1 1 5A6671A0
 P 7400 4800
 F 0 "J3" H 7400 5100 50  0000 C CNN
@@ -425,18 +384,16 @@ F 3 "" H 7400 4800 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	3300 3300 3300 3500
-Wire Wire Line
-	2700 3000 2700 3500
+	4100 3100 4100 3300
 Wire Wire Line
-	2700 3800 3300 3800
+	3500 2800 3500 3100
 Wire Wire Line
-	3000 3500 3000 3850
+	3500 3600 3800 3600
 Wire Wire Line
-	3300 3800 3300 3700
-Connection ~ 3000 3800
+	3800 3300 3800 3350
 Wire Wire Line
-	4750 5850 4750 6200
+	4100 3600 4100 3500
+Connection ~ 3800 3600
 Wire Wire Line
 	9400 4000 9400 3550
 Wire Wire Line
@@ -446,72 +403,43 @@ Wire Wire Line
 Wire Wire Line
 	8000 2950 7900 2950
 Wire Wire Line
-	4000 4300 3800 4300
-Wire Wire Line
-	3800 4300 3800 4400
-Wire Wire Line
-	3800 4700 3800 4600
-Wire Wire Line
-	4700 1900 4700 2450
-Wire Wire Line
-	4950 1900 4950 2450
-Connection ~ 4950 2300
-Wire Wire Line
-	5050 2450 5050 2300
-Connection ~ 5050 2300
-Wire Wire Line
-	5300 2300 5300 2450
-Connection ~ 5300 2300
-Connection ~ 5400 2300
-Wire Wire Line
-	5300 6000 5300 5850
+	4650 4450 4650 4350
 Wire Wire Line
-	4750 6000 5300 6000
-Connection ~ 4750 6000
+	5550 1850 5550 2000
 Wire Wire Line
-	5000 5850 5000 6000
-Connection ~ 5000 6000
+	5650 1850 5650 2000
 Wire Wire Line
-	5100 5850 5100 6000
-Connection ~ 5100 6000
+	5650 2400 5650 2250
+Connection ~ 5650 2250
 Wire Wire Line
-	5200 5850 5200 6000
-Connection ~ 5200 6000
+	5750 2250 5750 2400
 Wire Wire Line
-	4450 2050 4700 2050
-Connection ~ 4700 2050
+	5300 2000 5550 2000
+Connection ~ 5550 2000
 Wire Wire Line
-	4950 2300 5400 2300
+	5650 2000 5750 2000
+Connection ~ 5650 2000
 Wire Wire Line
-	5400 2300 5400 2450
+	4500 3800 4450 3800
 Wire Wire Line
-	4950 2050 5700 2050
-Connection ~ 4950 2050
+	4500 3700 4450 3700
 Wire Wire Line
-	3650 4150 3600 4150
+	4750 3350 4850 3350
 Wire Wire Line
-	3650 4050 3600 4050
+	4850 3350 4850 3500
 Wire Wire Line
-	3850 4050 4000 4050
+	4850 2450 4850 2700
 Wire Wire Line
-	4000 4150 3850 4150
+	4750 2700 4850 2700
+Connection ~ 4850 2700
 Wire Wire Line
-	3900 3700 4000 3700
+	4850 2050 4850 2150
 Wire Wire Line
-	4000 3700 4000 3900
+	4750 2150 4850 2150
+Connection ~ 4850 2150
+Connection ~ 5750 2000
 Wire Wire Line
-	3800 2450 3800 2700
-Wire Wire Line
-	3700 2700 4000 2700
-Connection ~ 3800 2700
-Wire Wire Line
-	3800 2050 3800 2250
-Wire Wire Line
-	3700 2150 3800 2150
-Connection ~ 3800 2150
-Connection ~ 5150 2050
-Wire Wire Line
-	5700 2300 5700 2250
+	6000 2250 6000 2200
 Wire Wire Line
 	6250 3600 7000 3600
 Wire Wire Line
@@ -523,34 +451,32 @@ Wire Wire Line
 Wire Wire Line
 	6250 4800 7200 4800
 Wire Wire Line
-	6250 4900 7050 4900
+	6250 4900 6950 4900
 Wire Wire Line
 	7000 4600 7200 4600
 Wire Wire Line
 	6950 4700 7200 4700
 Wire Wire Line
-	4450 2100 4450 2050
-Wire Wire Line
-	4000 3100 3300 3100
+	5300 2050 5300 2000
 Wire Wire Line
-	3300 3100 3300 3000
+	4100 2900 4100 2800
 Wire Wire Line
-	3300 3000 2700 3000
-Connection ~ 2700 3300
-Connection ~ 3300 3300
+	4100 2800 3500 2800
+Connection ~ 3500 3100
+Connection ~ 4100 3100
 Wire Wire Line
-	2700 3800 2700 3700
+	3500 3600 3500 3500
 Wire Wire Line
-	3150 3300 4000 3300
+	3950 3100 4100 3100
 Wire Wire Line
-	2850 3300 2700 3300
+	3650 3100 3500 3100
 Wire Wire Line
-	3000 3100 2800 3100
+	3800 2900 3600 2900
 Wire Wire Line
-	2800 3100 2800 3550
+	3600 2900 3600 3350
 Wire Wire Line
-	2800 3550 3000 3550
-Connection ~ 3000 3550
+	3600 3350 3800 3350
+Connection ~ 3800 3350
 Wire Wire Line
 	6950 5750 6950 5650
 Wire Wire Line
@@ -563,13 +489,11 @@ Wire Wire Line
 Wire Wire Line
 	7050 5000 7200 5000
 Wire Wire Line
-	7200 4350 7150 4350
-Wire Wire Line
-	7150 4350 7150 4900
+	7400 5300 7400 5250
 Wire Wire Line
 	7150 4900 7200 4900
 $Comp
-L TEST MH5
+L Mechanical:MountingHole MH5
 U 1 1 5A6678C8
 P 2500 5950
 F 0 "MH5" H 2500 6250 50  0000 C BNN
@@ -580,7 +504,7 @@ F 3 "" H 2500 5950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L TEST MH6
+L Mechanical:MountingHole MH6
 U 1 1 5A6678CE
 P 2750 5950
 F 0 "MH6" H 2750 6250 50  0000 C BNN
@@ -591,14 +515,70 @@ F 3 "" H 2750 5950 50  0001 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR010
+L power:GND #PWR010
 U 1 1 5A667BAA
-P 7200 4350
-F 0 "#PWR010" H 7200 4100 50  0001 C CNN
-F 1 "GND" H 7200 4200 50  0000 C CNN
-F 2 "" H 7200 4350 50  0001 C CNN
-F 3 "" H 7200 4350 50  0001 C CNN
-	1    7200 4350
-	0    -1   -1   0   
+P 7400 5300
+F 0 "#PWR010" H 7400 5050 50  0001 C CNN
+F 1 "GND" H 7400 5150 50  0000 C CNN
+F 2 "" H 7400 5300 50  0001 C CNN
+F 3 "" H 7400 5300 50  0001 C CNN
+	1    7400 5300
+	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	3800 3600 4100 3600
+Wire Wire Line
+	3800 3600 3800 3650
+Wire Wire Line
+	5650 2250 5750 2250
+Wire Wire Line
+	5550 2000 5550 2400
+Wire Wire Line
+	5650 2000 5650 2250
+Wire Wire Line
+	4850 2700 5050 2700
+Wire Wire Line
+	4850 2150 4850 2250
+Wire Wire Line
+	5750 2000 6000 2000
+Wire Wire Line
+	3500 3100 3500 3300
+Wire Wire Line
+	3800 3350 3800 3600
+Wire Wire Line
+	6950 4900 7050 4900
+Wire Wire Line
+	4100 2900 5050 2900
+Wire Wire Line
+	4100 3100 5050 3100
+Wire Wire Line
+	4850 3500 5050 3500
+Wire Wire Line
+	4700 3700 5050 3700
+Wire Wire Line
+	4700 3800 5050 3800
+Wire Wire Line
+	4650 4000 5050 4000
+Wire Wire Line
+	4650 4000 4650 4150
+Wire Wire Line
+	5550 6000 5550 6350
+$Comp
+L MCU_Microchip_ATmega:ATmega32U4-AU U1
+U 1 1 5A21306C
+P 5650 4200
+F 0 "U1" H 5900 2450 50  0000 C CNN
+F 1 "ATMEGA32U4-AU" H 6150 2350 50  0000 C CNN
+F 2 "Housings_QFP:TQFP-44_10x10mm_Pitch0.8mm" H 5650 4200 50  0001 C CIN
+F 3 "" H 6750 5300 50  0001 C CNN
+	1    5650 4200
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	5650 6000 5550 6000
+Connection ~ 5550 6000
+Wire Wire Line
+	7150 4900 7150 5250
+Wire Wire Line
+	7150 5250 7400 5250
 $EndSCHEMATC

reform-keyboard-pcb/sym-lib-table

@@ -0,0 +1,3 @@
+(sym_lib_table
+  (lib (name mntcomp-keyboard)(type Legacy)(uri ${KIPRJMOD}/mntcomp-keyboard.lib)(options "")(descr ""))
+)