Merge branch 'feature/split_spacebar' into develop

This commit is contained in:
dbroqua 2017-10-13 00:16:09 +02:00
commit a4c20e71f0
9 changed files with 4506 additions and 4107 deletions

File diff suppressed because it is too large Load diff

View file

@ -317,7 +317,7 @@ S 5550 1550 1250 500
U 5934BBCF U 5934BBCF
F0 "TRACKPOINT" 60 F0 "TRACKPOINT" 60
F1 "TRACKPOINT.sch" 60 F1 "TRACKPOINT.sch" 60
F2 "Col5" I L 5550 1600 60 F2 "Col8" I L 5550 1600 60
F3 "Col4" I L 5550 1700 60 F3 "Col4" I L 5550 1700 60
F4 "Col3" I L 5550 1800 60 F4 "Col3" I L 5550 1800 60
F5 "Row4" I L 5550 1900 60 F5 "Row4" I L 5550 1900 60
@ -329,25 +329,25 @@ F10 "RGB" I R 6800 2000 60
$EndSheet $EndSheet
Text GLabel 2500 1550 0 60 Input ~ 0 Text GLabel 2500 1550 0 60 Input ~ 0
Col5 Col5
Text GLabel 4650 2250 2 60 Input ~ 0 Text GLabel 4650 1550 2 60 Input ~ 0
Col4 Col4
Text GLabel 4650 1250 2 60 Input ~ 0
Col3
Text GLabel 4650 2050 2 60 Input ~ 0
Row4
Text GLabel 4650 1650 2 60 Input ~ 0 Text GLabel 4650 1650 2 60 Input ~ 0
Col3
Text GLabel 4650 2650 2 60 Input ~ 0
Row4
Text GLabel 4650 2450 2 60 Input ~ 0
Col0 Col0
Text GLabel 4650 1450 2 60 Input ~ 0 Text GLabel 4650 2350 2 60 Input ~ 0
Col1 Col1
Text GLabel 4650 1350 2 60 Input ~ 0 Text GLabel 4650 2150 2 60 Input ~ 0
Col2 Col2
Text GLabel 2500 1750 0 60 Input ~ 0 Text GLabel 2500 1750 0 60 Input ~ 0
Col6 Col6
Text GLabel 2500 1850 0 60 Input ~ 0 Text GLabel 2500 1850 0 60 Input ~ 0
Col7 Col7
Text GLabel 4650 2650 2 60 Input ~ 0 Text GLabel 4650 1350 2 60 Input ~ 0
Col8 Col8
Text GLabel 4650 2450 2 60 Input ~ 0 Text GLabel 4650 1250 2 60 Input ~ 0
Col9 Col9
Text GLabel 2500 2850 0 60 Input ~ 0 Text GLabel 2500 2850 0 60 Input ~ 0
ColA ColA
@ -357,11 +357,11 @@ Text GLabel 2500 2550 0 60 Input ~ 0
ColC ColC
Text GLabel 4650 2750 2 60 Input ~ 0 Text GLabel 4650 2750 2 60 Input ~ 0
ColD ColD
Text GLabel 4650 1550 2 60 Input ~ 0 Text GLabel 4650 2050 2 60 Input ~ 0
Row0 Row0
Text GLabel 4650 2150 2 60 Input ~ 0 Text GLabel 4650 1450 2 60 Input ~ 0
Row1 Row1
Text GLabel 4650 2350 2 60 Input ~ 0 Text GLabel 4650 2250 2 60 Input ~ 0
Row2 Row2
Text GLabel 2500 1650 0 60 Input ~ 0 Text GLabel 2500 1650 0 60 Input ~ 0
Row3 Row3
@ -453,7 +453,7 @@ F 3 "" H 5350 3200 50 0000 C CNN
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
Text GLabel 5100 4400 0 60 Input ~ 0 Text GLabel 5100 4400 0 60 Input ~ 0
Col5 Col8
Text GLabel 5600 4300 2 60 Input ~ 0 Text GLabel 5600 4300 2 60 Input ~ 0
Col4 Col4
Text GLabel 5100 4300 0 60 Input ~ 0 Text GLabel 5100 4300 0 60 Input ~ 0

View file

@ -342,4 +342,37 @@ F 3 "" H 7050 5350 60 0000 C CNN
1 7050 5350 1 7050 5350
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp
L MOUNT_HOLE SPC_275_0
U 1 1 59DE9C95
P 6350 5850
F 0 "SPC_275_0" H 6350 6000 60 0000 C CNN
F 1 "SPC_275_0" H 6350 5700 60 0000 C CNN
F 2 "Footprint:MXST" H 6350 5850 60 0001 C CNN
F 3 "" H 6350 5850 60 0000 C CNN
1 6350 5850
1 0 0 -1
$EndComp
$Comp
L MOUNT_HOLE SPC_275_1
U 1 1 59DE9D0D
P 7050 5850
F 0 "SPC_275_1" H 7050 6000 60 0000 C CNN
F 1 "SPC_275_1" H 7050 5700 60 0000 C CNN
F 2 "Footprint:MXST" H 7050 5850 60 0001 C CNN
F 3 "" H 7050 5850 60 0000 C CNN
1 7050 5850
1 0 0 -1
$EndComp
$Comp
L MOUNT_HOLE SPC_225_0
U 1 1 59DE9D8E
P 6350 6350
F 0 "SPC_225_0" H 6350 6500 60 0000 C CNN
F 1 "SPC_225_0" H 6350 6200 60 0000 C CNN
F 2 "Footprint:MXST" H 6350 6350 60 0001 C CNN
F 3 "" H 6350 6350 60 0000 C CNN
1 6350 6350
1 0 0 -1
$EndComp
$EndSCHEMATC $EndSCHEMATC

View file

@ -812,7 +812,7 @@ F 1 "K46" H 5150 6050 60 0001 C CNN
F 2 "Footprint:Mx_700" H 5150 6150 60 0001 C CNN F 2 "Footprint:Mx_700" H 5150 6150 60 0001 C CNN
F 3 "" H 5150 6150 60 0000 C CNN F 3 "" H 5150 6150 60 0000 C CNN
1 5150 6150 1 5150 6150
1 0 0 -1 -1 0 0 1
$EndComp $EndComp
$Comp $Comp
L KEYSW K940 L KEYSW K940
@ -2089,4 +2089,71 @@ Connection ~ 8350 5850
Connection ~ 8350 6150 Connection ~ 8350 6150
Connection ~ 9050 5850 Connection ~ 9050 5850
Connection ~ 9750 5850 Connection ~ 9750 5850
$Comp
L KEYSW K540
U 1 1 59DE9804
P 4450 5550
F 0 "K540" H 4400 5550 60 0001 C CNN
F 1 "K465" H 4450 5450 60 0000 C CNN
F 2 "Footprint:Mx_275" H 4450 5550 60 0001 C CNN
F 3 "" H 4450 5550 60 0000 C CNN
1 4450 5550
1 0 0 -1
$EndComp
$Comp
L KEYSW K740
U 1 1 59DE980F
P 5850 5550
F 0 "K740" H 5800 5550 60 0001 C CNN
F 1 "K47" H 5850 5450 60 0000 C CNN
F 2 "Footprint:Mx_225" H 5850 5550 60 0001 C CNN
F 3 "" H 5850 5550 60 0000 C CNN
1 5850 5550
1 0 0 -1
$EndComp
Text GLabel 4750 5250 0 60 Input ~ 0
Col5
Text GLabel 6150 5250 0 60 Input ~ 0
Col7
$Comp
L D DK74
U 1 1 59DE981E
P 6150 5400
F 0 "DK74" H 6150 5500 50 0001 C CNN
F 1 "D47" H 6150 5300 50 0001 C CNN
F 2 "Footprint:D_SOD123" H 6150 5400 50 0001 C CNN
F 3 "" H 6150 5400 50 0000 C CNN
1 6150 5400
0 -1 -1 0
$EndComp
$Comp
L D DK54
U 1 1 59DE9829
P 4750 5400
F 0 "DK54" H 4750 5500 50 0001 C CNN
F 1 "D45" H 4750 5300 50 0001 C CNN
F 2 "Footprint:D_SOD123" H 4750 5400 50 0001 C CNN
F 3 "" H 4750 5400 50 0000 C CNN
1 4750 5400
0 -1 -1 0
$EndComp
$Comp
L KEYSW K643
U 1 1 59DE985B
P 5150 5700
F 0 "K643" H 5100 5700 60 0001 C CNN
F 1 "K46" H 5150 5600 60 0001 C CNN
F 2 "Footprint:Mx_100" H 5150 5700 60 0001 C CNN
F 3 "" H 5150 5700 60 0000 C CNN
1 5150 5700
1 0 0 -1
$EndComp
Wire Wire Line
4150 5550 4150 6400
Connection ~ 4150 6400
Wire Wire Line
5550 5550 5550 6400
Connection ~ 5550 6400
Connection ~ 4850 5700
Connection ~ 5450 5700
$EndSCHEMATC $EndSCHEMATC

View file

@ -38,10 +38,10 @@ F 3 "" H 6400 1300 60 0000 C CNN
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
L KEYSW K540 L KEYSW K840
U 1 1 593C141B U 1 1 593C141B
P 7250 1300 P 7250 1300
F 0 "K540" H 7200 1300 60 0001 C CNN F 0 "K840" H 7200 1300 60 0001 C CNN
F 1 "RMB" H 7250 1200 60 0000 C CNN F 1 "RMB" H 7250 1200 60 0000 C CNN
F 2 "Footprint:Mx_100" H 7250 1300 60 0001 C CNN F 2 "Footprint:Mx_100" H 7250 1300 60 0001 C CNN
F 3 "" H 7250 1300 60 0000 C CNN F 3 "" H 7250 1300 60 0000 C CNN
@ -60,10 +60,10 @@ F 3 "" H 5550 1550 60 0000 C CNN
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
L KEYSW K541 L KEYSW K841
U 1 1 593C149E U 1 1 593C149E
P 7250 1550 P 7250 1550
F 0 "K541" H 7200 1550 60 0001 C CNN F 0 "K841" H 7200 1550 60 0001 C CNN
F 1 "RMB" H 7250 1450 60 0001 C CNN F 1 "RMB" H 7250 1450 60 0001 C CNN
F 2 "Footprint:Mx_125" H 7250 1550 60 0001 C CNN F 2 "Footprint:Mx_125" H 7250 1550 60 0001 C CNN
F 3 "" H 7250 1550 60 0000 C CNN F 3 "" H 7250 1550 60 0000 C CNN
@ -93,11 +93,11 @@ F 3 "" H 6700 1150 50 0000 C CNN
0 -1 -1 0 0 -1 -1 0
$EndComp $EndComp
$Comp $Comp
L D DK54 L D DK84
U 1 1 593C19F1 U 1 1 593C19F1
P 7550 1150 P 7550 1150
F 0 "DK54" H 7550 1250 50 0001 C CNN F 0 "DK84" H 7550 1250 50 0001 C CNN
F 1 "D45" H 7550 1050 50 0001 C CNN F 1 "D48" H 7550 1050 50 0001 C CNN
F 2 "Footprint:D_SOD123" H 7550 1150 50 0001 C CNN F 2 "Footprint:D_SOD123" H 7550 1150 50 0001 C CNN
F 3 "" H 7550 1150 50 0000 C CNN F 3 "" H 7550 1150 50 0000 C CNN
1 7550 1150 1 7550 1150
@ -159,7 +159,7 @@ F 3 "" H 2150 1400 50 0000 C CNN
-1 0 0 1 -1 0 0 1
$EndComp $EndComp
Text HLabel 1100 800 0 60 Input ~ 0 Text HLabel 1100 800 0 60 Input ~ 0
Col5 Col8
Text HLabel 1100 900 0 60 Input ~ 0 Text HLabel 1100 900 0 60 Input ~ 0
Col4 Col4
Text HLabel 1100 1050 0 60 Input ~ 0 Text HLabel 1100 1050 0 60 Input ~ 0
@ -252,11 +252,11 @@ D2
Text Label 8050 1350 0 60 ~ 0 Text Label 8050 1350 0 60 ~ 0
D2 D2
Text Label 1350 800 0 60 ~ 0 Text Label 1350 800 0 60 ~ 0
Col5 Col8
Text Label 7600 900 0 60 ~ 0 Text Label 7600 900 0 60 ~ 0
Col5 Col8
Text Label 8050 1250 0 60 ~ 0 Text Label 8050 1250 0 60 ~ 0
Col5 Col8
Wire Wire Line Wire Wire Line
8050 1150 8300 1150 8050 1150 8300 1150
Text Label 1350 900 0 60 ~ 0 Text Label 1350 900 0 60 ~ 0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 504 KiB

After

Width:  |  Height:  |  Size: 508 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 194 KiB

After

Width:  |  Height:  |  Size: 192 KiB

Binary file not shown.