Merge branch 'master' of git.philsson.com:philsson/mechanical-keyboard

This commit is contained in:
Mattias Lasersköld 2020-02-23 22:23:20 +01:00
commit c4a3ddac69
8 changed files with 3586 additions and 2078 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
*.sch-bak
*.kicad_pcb-bak

View File

@ -3,4 +3,5 @@
(lib (name custom_tmk)(type KiCad)(uri ${KEYBOARD_PROJ_1}/tmk_keyboard_footprints.pretty)(options "")(descr ""))
(lib (name custom_teensy)(type KiCad)(uri ${KEYBOARD_PROJ_1}/teensy_footprints.pretty)(options "")(descr ""))
(lib (name keyboard)(type KiCad)(uri ${KEYBOARD_PROJ_1}/kicad_keyboard_footprints.pretty)(options "")(descr ""))
(lib (name arduino_promicro)(type KiCad)(uri ${KEYBOARD_PROJ_1}/biacco42_promicro/promicro.pretty)(options "")(descr ""))
)

View File

@ -1,6 +1,30 @@
EESchema-LIBRARY Version 2.4
#encoding utf-8
#
# Connector_AudioJack4
#
DEF Connector_AudioJack4 J 0 20 Y Y 1 F N
F0 "J" 0 350 50 H V C CNN
F1 "Connector_AudioJack4" 0 250 50 H V C CNN
F2 "" 0 0 50 H I C CNN
F3 "" 0 0 50 H I C CNN
$FPLIST
Jack*
$ENDFPLIST
DRAW
S -250 -200 -300 -300 0 1 10 F
S 100 150 -250 -300 0 1 10 f
P 4 0 1 10 0 -200 25 -225 50 -200 100 -200 N
P 5 0 1 10 -225 -200 -200 -225 -175 -200 -175 100 100 100 N
P 5 0 1 10 -75 -200 -50 -225 -25 -200 -25 -100 100 -100 N
P 5 0 1 10 100 0 -100 0 -100 -200 -125 -225 -150 -200 N
X ~ R1 200 -100 100 L 50 50 1 1 P
X ~ R2 200 0 100 L 50 50 1 1 P
X ~ S 200 100 100 L 50 50 1 1 P
X ~ T 200 -200 100 L 50 50 1 1 P
ENDDRAW
ENDDEF
#
# Device_D
#
DEF Device_D D 0 40 N N 1 F N
@ -23,46 +47,39 @@ X A 2 150 0 100 L 50 50 1 1 P
ENDDRAW
ENDDEF
#
# custom_teensy_Teensy2.0_(Arduino)
# arduino_promicro_ProMicro
#
DEF custom_teensy_Teensy2.0_(Arduino) U 0 40 Y Y 1 F N
DEF arduino_promicro_ProMicro U 0 40 Y Y 1 F N
F0 "U" 0 950 60 H V C CNN
F1 "custom_teensy_Teensy2.0_(Arduino)" 0 -950 60 H V C CNN
F1 "arduino_promicro_ProMicro" 0 -550 60 H V C CNN
F2 "" 100 -1050 60 H V C CNN
F3 "" 100 -1050 60 H V C CNN
DRAW
S -500 850 500 -850 0 1 0 N
X GND 1 -700 750 200 R 50 50 1 1 W
X 8_INT3_TX 10 -700 -150 200 R 50 50 1 1 B
X 9_PWM 11 -700 -250 200 R 50 50 1 1 B
X 10_PWM 12 -700 -350 200 R 50 50 1 1 B
X 23 13 -700 -450 200 R 50 50 1 1 B
X +5V 14 -700 -550 200 R 50 50 1 1 W
X GND 15 -700 -650 200 R 50 50 1 1 W
X RST 16 -700 -750 200 R 50 50 1 1 I
X 22_A11 17 700 -750 200 L 50 50 1 1 B
X 11_A10_LED 18 700 -650 200 L 50 50 1 1 B
X 12_A9_PWM 19 700 -550 200 L 50 50 1 1 B
X 0 2 -700 650 200 R 50 50 1 1 B
X 13_A8 20 700 -450 200 L 50 50 1 1 B
X 14_A7_PWM 21 700 -350 200 L 50 50 1 1 B
X 15_A6_PWM 22 700 -250 200 L 50 50 1 1 B
X 16_A5 23 700 -150 200 L 50 50 1 1 B
X 17_A4 24 700 -50 200 L 50 50 1 1 B
X 18_A3 25 700 50 200 L 50 50 1 1 B
X 19_A2 26 700 150 200 L 50 50 1 1 B
X 20_A1 27 700 250 200 L 50 50 1 1 B
X 21_A0 28 700 350 200 L 50 50 1 1 B
X +5V 29 700 450 200 L 50 50 1 1 W
X 1 3 -700 550 200 R 50 50 1 1 B
X 24 30 700 550 200 L 50 50 1 1 B
X AREF 31 700 650 200 L 50 50 1 1 I
X 2 4 -700 450 200 R 50 50 1 1 B
X 3 5 -700 350 200 R 50 50 1 1 B
X 4_PWM 6 -700 250 200 R 50 50 1 1 B
X 5_INT0_PWM 7 -700 150 200 R 50 50 1 1 B
X 6_INT1 8 -700 50 200 R 50 50 1 1 B
X 7_INT2_RX 9 -700 -50 200 R 50 50 1 1 B
S -500 850 500 -450 0 1 0 N
X TX 1 -700 750 200 R 50 50 1 1 B
X E6 10 -700 -150 200 R 50 50 1 1 B
X B4 11 -700 -250 200 R 50 50 1 1 B
X B5 12 -700 -350 200 R 50 50 1 1 B
X B6 13 700 -350 200 L 50 50 1 1 B
X B2 14 700 -250 200 L 50 50 1 1 B
X B3 15 700 -150 200 L 50 50 1 1 B
X B1 16 700 -50 200 L 50 50 1 1 B
X F7 17 700 50 200 L 50 50 1 1 B
X F6 18 700 150 200 L 50 50 1 1 B
X F5 19 700 250 200 L 50 50 1 1 B
X RX 2 -700 650 200 R 50 50 1 1 B
X F4 20 700 350 200 L 50 50 1 1 B
X VCC 21 700 450 200 L 50 50 1 1 W
X RST 22 700 550 200 L 50 50 1 1 I
X GND 23 700 650 200 L 50 50 1 1 W
X RAW 24 700 750 200 L 50 50 1 1 w
X GND 3 -700 550 200 R 50 50 1 1 W
X GND 4 -700 450 200 R 50 50 1 1 W
X SCL 5 -700 350 200 R 50 50 1 1 B
X SDA 6 -700 250 200 R 50 50 1 1 B
X D4 7 -700 150 200 R 50 50 1 1 B
X C6 8 -700 50 200 R 50 50 1 1 B
X D7 9 -700 -50 200 R 50 50 1 1 B
ENDDRAW
ENDDEF
#

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,411 +0,0 @@
EESchema Schematic File Version 4
EELAYER 30 0
EELAYER END
$Descr A4 11693 8268
encoding utf-8
Sheet 1 1
Title ""
Date ""
Rev ""
Comp ""
Comment1 ""
Comment2 ""
Comment3 ""
Comment4 ""
$EndDescr
Text GLabel 850 950 0 50 BiDi ~ 0
row4
Wire Wire Line
4450 2800 4400 2800
Wire Wire Line
5650 2800 5600 2800
Wire Wire Line
5650 3100 5650 2800
Connection ~ 3550 4750
Wire Wire Line
3550 4750 3300 4750
Text GLabel 3300 4750 0 50 BiDi ~ 0
row1
Text GLabel 3300 3750 0 50 BiDi ~ 0
row0
Text GLabel 5600 2800 0 50 BiDi ~ 0
col1
Wire Wire Line
4450 3100 4450 2800
Text GLabel 4400 2800 0 50 BiDi ~ 0
col0
Wire Wire Line
3550 3750 3550 3550
Wire Wire Line
4750 3650 4750 3750
Wire Wire Line
3550 4200 3550 4050
Wire Wire Line
3550 4750 3550 4500
Wire Wire Line
4950 4050 4750 4050
$Comp
L Device:D D22
U 1 1 5E425D14
P 4750 4350
F 0 "D22" V 4796 4271 50 0000 R CNN
F 1 "D" V 4705 4271 50 0000 R CNN
F 2 "Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal" H 4750 4350 50 0001 C CNN
F 3 "~" H 4750 4350 50 0001 C CNN
1 4750 4350
0 -1 -1 0
$EndComp
$Comp
L Device:D D21
U 1 1 5E425CA4
P 3550 4350
F 0 "D21" V 3596 4271 50 0000 R CNN
F 1 "D" V 3505 4271 50 0000 R CNN
F 2 "Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal" H 3550 4350 50 0001 C CNN
F 3 "~" H 3550 4350 50 0001 C CNN
1 3550 4350
0 -1 -1 0
$EndComp
$Comp
L Device:D D12
U 1 1 5E425AB3
P 4750 3500
F 0 "D12" V 4796 3421 50 0000 R CNN
F 1 "D" V 4705 3421 50 0000 R CNN
F 2 "Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal" H 4750 3500 50 0001 C CNN
F 3 "~" H 4750 3500 50 0001 C CNN
1 4750 3500
0 -1 -1 0
$EndComp
$Comp
L Device:D D11
U 1 1 5E424EF0
P 3550 3400
F 0 "D11" V 3596 3321 50 0000 R CNN
F 1 "D" V 3505 3321 50 0000 R CNN
F 2 "Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal" H 3550 3400 50 0001 C CNN
F 3 "~" H 3550 3400 50 0001 C CNN
1 3550 3400
0 -1 -1 0
$EndComp
$Comp
L keyboard-rescue:KEYSW-hasu_keayboard K22
U 1 1 5E42490B
P 5250 4050
F 0 "K22" H 5250 4283 60 0000 C CNN
F 1 "KEYSW" H 5250 3950 60 0001 C CNN
F 2 "custom_keebs_pretty:Mx_Alps_100" H 5250 4050 60 0001 C CNN
F 3 "" H 5250 4050 60 0000 C CNN
1 5250 4050
1 0 0 -1
$EndComp
$Comp
L keyboard-rescue:KEYSW-hasu_keayboard K21
U 1 1 5E424905
P 4050 4050
F 0 "K21" H 4050 4283 60 0000 C CNN
F 1 "KEYSW" H 4050 3950 60 0001 C CNN
F 2 "custom_keebs_pretty:Mx_Alps_100" H 4050 4050 60 0001 C CNN
F 3 "" H 4050 4050 60 0000 C CNN
1 4050 4050
1 0 0 -1
$EndComp
$Comp
L keyboard-rescue:KEYSW-hasu_keayboard K11
U 1 1 5E423041
P 4050 3100
F 0 "K11" H 4050 3333 60 0000 C CNN
F 1 "KEYSW" H 4050 3000 60 0001 C CNN
F 2 "custom_keebs_pretty:Mx_Alps_100" H 4050 3100 60 0001 C CNN
F 3 "" H 4050 3100 60 0000 C CNN
1 4050 3100
1 0 0 -1
$EndComp
Wire Wire Line
4900 3100 4750 3100
$Comp
L keyboard-rescue:KEYSW-hasu_keayboard K12
U 1 1 5E423F93
P 5200 3100
F 0 "K12" H 5200 3333 60 0000 C CNN
F 1 "KEYSW" H 5200 3000 60 0001 C CNN
F 2 "custom_keebs_pretty:Mx_Alps_100" H 5200 3100 60 0001 C CNN
F 3 "" H 5200 3100 60 0000 C CNN
1 5200 3100
1 0 0 -1
$EndComp
Wire Wire Line
4750 3100 4750 3350
Wire Wire Line
4750 4500 4750 4750
Wire Wire Line
4750 4200 4750 4050
Text GLabel 6750 2800 0 50 BiDi ~ 0
col2
Wire Wire Line
5900 3650 5900 3750
Wire Wire Line
6150 4050 5950 4050
$Comp
L Device:D D23
U 1 1 5E4C7502
P 5950 4350
F 0 "D23" V 5996 4271 50 0000 R CNN
F 1 "D" V 5905 4271 50 0000 R CNN
F 2 "Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal" H 5950 4350 50 0001 C CNN
F 3 "~" H 5950 4350 50 0001 C CNN
1 5950 4350
0 -1 -1 0
$EndComp
$Comp
L Device:D D13
U 1 1 5E4C7508
P 5900 3500
F 0 "D13" V 5946 3421 50 0000 R CNN
F 1 "D" V 5855 3421 50 0000 R CNN
F 2 "Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal" H 5900 3500 50 0001 C CNN
F 3 "~" H 5900 3500 50 0001 C CNN
1 5900 3500
0 -1 -1 0
$EndComp
$Comp
L keyboard-rescue:KEYSW-hasu_keayboard K23
U 1 1 5E4C750E
P 6450 4050
F 0 "K23" H 6450 4283 60 0000 C CNN
F 1 "KEYSW" H 6450 3950 60 0001 C CNN
F 2 "custom_keebs_pretty:Mx_Alps_100" H 6450 4050 60 0001 C CNN
F 3 "" H 6450 4050 60 0000 C CNN
1 6450 4050
1 0 0 -1
$EndComp
Wire Wire Line
6050 3100 5900 3100
$Comp
L keyboard-rescue:KEYSW-hasu_keayboard K13
U 1 1 5E4C7516
P 6350 3100
F 0 "K13" H 6350 3333 60 0000 C CNN
F 1 "KEYSW" H 6350 3000 60 0001 C CNN
F 2 "custom_keebs_pretty:Mx_Alps_100" H 6350 3100 60 0001 C CNN
F 3 "" H 6350 3100 60 0000 C CNN
1 6350 3100
1 0 0 -1
$EndComp
Wire Wire Line
5900 3100 5900 3350
Wire Wire Line
5950 4500 5950 4750
Wire Wire Line
5950 4200 5950 4050
Wire Wire Line
3550 5750 3300 5750
Text GLabel 3300 5750 0 50 BiDi ~ 0
row2
Wire Wire Line
3550 5200 3550 5050
Wire Wire Line
3550 5750 3550 5500
Wire Wire Line
4950 5050 4750 5050
$Comp
L Device:D D32
U 1 1 5E4D8469
P 4750 5350
F 0 "D32" V 4796 5271 50 0000 R CNN
F 1 "D" V 4705 5271 50 0000 R CNN
F 2 "Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal" H 4750 5350 50 0001 C CNN
F 3 "~" H 4750 5350 50 0001 C CNN
1 4750 5350
0 -1 -1 0
$EndComp
$Comp
L Device:D D31
U 1 1 5E4D846F
P 3550 5350
F 0 "D31" V 3596 5271 50 0000 R CNN
F 1 "D" V 3505 5271 50 0000 R CNN
F 2 "Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal" H 3550 5350 50 0001 C CNN
F 3 "~" H 3550 5350 50 0001 C CNN
1 3550 5350
0 -1 -1 0
$EndComp
$Comp
L keyboard-rescue:KEYSW-hasu_keayboard K32
U 1 1 5E4D8475
P 5250 5050
F 0 "K32" H 5250 5283 60 0000 C CNN
F 1 "KEYSW" H 5250 4950 60 0001 C CNN
F 2 "custom_keebs_pretty:Mx_Alps_100" H 5250 5050 60 0001 C CNN
F 3 "" H 5250 5050 60 0000 C CNN
1 5250 5050
1 0 0 -1
$EndComp
$Comp
L keyboard-rescue:KEYSW-hasu_keayboard K31
U 1 1 5E4D847B
P 4050 5050
F 0 "K31" H 4050 5283 60 0000 C CNN
F 1 "KEYSW" H 4050 4950 60 0001 C CNN
F 2 "custom_keebs_pretty:Mx_Alps_100" H 4050 5050 60 0001 C CNN
F 3 "" H 4050 5050 60 0000 C CNN
1 4050 5050
1 0 0 -1
$EndComp
Wire Wire Line
4750 5500 4750 5750
Wire Wire Line
4750 5200 4750 5050
Wire Wire Line
6150 5050 5950 5050
$Comp
L Device:D D33
U 1 1 5E4D8485
P 5950 5350
F 0 "D33" V 5996 5271 50 0000 R CNN
F 1 "D" V 5905 5271 50 0000 R CNN
F 2 "Diode_THT:D_DO-35_SOD27_P7.62mm_Horizontal" H 5950 5350 50 0001 C CNN
F 3 "~" H 5950 5350 50 0001 C CNN
1 5950 5350
0 -1 -1 0
$EndComp
$Comp
L keyboard-rescue:KEYSW-hasu_keayboard K33
U 1 1 5E4D848B
P 6450 5050
F 0 "K33" H 6450 5283 60 0000 C CNN
F 1 "KEYSW" H 6450 4950 60 0001 C CNN
F 2 "custom_keebs_pretty:Mx_Alps_100" H 6450 5050 60 0001 C CNN
F 3 "" H 6450 5050 60 0000 C CNN
1 6450 5050
1 0 0 -1
$EndComp
Wire Wire Line
5950 5500 5950 5750
Wire Wire Line
5950 5200 5950 5050
Wire Wire Line
3550 4050 3750 4050
Wire Wire Line
3550 5050 3750 5050
Connection ~ 3550 3750
Wire Wire Line
3550 3750 3300 3750
Connection ~ 4750 4750
Wire Wire Line
4750 4750 3550 4750
Wire Wire Line
4750 4750 5950 4750
Wire Wire Line
4450 3100 4350 3100
Wire Wire Line
5550 5050 5650 5050
Wire Wire Line
4750 5750 5950 5750
Wire Wire Line
3550 5750 4750 5750
Connection ~ 3550 5750
Connection ~ 4750 5750
Wire Wire Line
4350 5050 4450 5050
Wire Wire Line
4350 4050 4450 4050
Connection ~ 4450 4050
Wire Wire Line
4450 4050 4450 5050
Wire Wire Line
5650 4050 5550 4050
Wire Wire Line
5650 4050 5650 5050
Wire Wire Line
5650 3100 5650 4050
Wire Wire Line
6850 2800 6850 3100
Wire Wire Line
6650 3100 6850 3100
Connection ~ 6850 3100
Wire Wire Line
6850 3100 6850 4050
Wire Wire Line
6750 4050 6850 4050
Connection ~ 6850 4050
Wire Wire Line
6850 4050 6850 5050
Wire Wire Line
6750 5050 6850 5050
Wire Wire Line
4450 3100 4450 4050
Connection ~ 4450 3100
Wire Wire Line
3550 3250 3550 3100
Wire Wire Line
3750 3100 3550 3100
Wire Wire Line
6850 2800 6750 2800
Connection ~ 4750 3750
Wire Wire Line
4750 3750 5900 3750
Wire Wire Line
3550 3750 4750 3750
Connection ~ 5650 4050
Connection ~ 5650 3100
Wire Wire Line
5500 3100 5650 3100
$Comp
L custom_teensy:Teensy2.0_(Arduino) Microcontroller1
U 1 1 5E4F032A
P 1650 1600
F 0 "Microcontroller1" H 1650 2637 60 0000 C CNN
F 1 "Teensy2.0_(Arduino)" H 1650 2531 60 0000 C CNN
F 2 "" H 1750 550 60 0000 C CNN
F 3 "" H 1750 550 60 0000 C CNN
1 1650 1600
1 0 0 -1
$EndComp
Text GLabel 850 2050 0 50 BiDi ~ 0
col6
Text GLabel 850 1950 0 50 BiDi ~ 0
col5
Text GLabel 850 1850 0 50 BiDi ~ 0
col4
Text GLabel 850 1750 0 50 BiDi ~ 0
col3
Text GLabel 850 1650 0 50 BiDi ~ 0
col2
Text GLabel 850 1050 0 50 BiDi ~ 0
row3
Text GLabel 850 1150 0 50 BiDi ~ 0
row2
Text GLabel 850 1250 0 50 BiDi ~ 0
row1
Text GLabel 850 1350 0 50 BiDi ~ 0
row0
Text GLabel 850 1550 0 50 BiDi ~ 0
col1
Text GLabel 850 1450 0 50 BiDi ~ 0
col0
Wire Wire Line
850 950 950 950
Wire Wire Line
850 1050 950 1050
Wire Wire Line
850 1150 950 1150
Wire Wire Line
850 1250 950 1250
Wire Wire Line
850 1350 950 1350
Wire Wire Line
850 1450 950 1450
Wire Wire Line
850 1550 950 1550
Wire Wire Line
850 1650 950 1650
Wire Wire Line
850 1750 950 1750
Wire Wire Line
850 1850 950 1850
Wire Wire Line
850 1950 950 1950
Wire Wire Line
850 2050 950 2050
$EndSCHEMATC

View File

@ -1,6 +1,7 @@
(sym_lib_table
(lib (name custom_tmk_keayboard)(type Legacy)(uri ${KEYBOARD_PROJ_1}/tmk_keyboard_symbols.pretty/keyboard_parts.lib)(options "")(descr ""))
(lib (name custom_tmk_mk)(type Legacy)(uri ${KEYBOARD_PROJ_1}/tmk_keyboard_symbols.pretty/mkl27z256vfm4.lib)(options "")(descr ""))
(lib (name custom_tmk_keayboard)(type Legacy)(uri ${KEYBOARD_PROJ_1}/tmk_keyboard_symbols_library/keyboard_parts.lib)(options "")(descr ""))
(lib (name custom_tmk_mk)(type Legacy)(uri ${KEYBOARD_PROJ_1}/tmk_keyboard_symbols_library/mkl27z256vfm4.lib)(options "")(descr ""))
(lib (name keyboard-rescue)(type Legacy)(uri ${KIPRJMOD}/keyboard-rescue.lib)(options "")(descr ""))
(lib (name custom_teensy)(type Legacy)(uri ${KEYBOARD_PROJ_1}/teensy_symbols.pretty/teensy.lib)(options "")(descr ""))
(lib (name custom_teensy)(type Legacy)(uri ${KEYBOARD_PROJ_1}/teensy_symbols_library/teensy.lib)(options "")(descr ""))
(lib (name arduino_promicro)(type Legacy)(uri ${KEYBOARD_PROJ_1}/biacco42_promicro/promicro_library/promicro.lib)(options "")(descr ""))
)