Merge branch 'master' of https://github.com/Dbroqua/DK60

2017-06-10 22:49:46 +02:00 · 2017-06-10 22:49:46 +02:00 · 3680e5862d
commit 3680e5862d
parent 9a706871c4 eb6f820fda
24 changed files with 94281 additions and 130369 deletions
--- a/DK60TP/Cases/Sandwich/All-in-one.dxf
+++ b/DK60TP/Cases/Sandwich/All-in-one.dxf
--- a/DK60TP/Cases/Sandwich/Tmp/bottom_9078876e87945705b95cf6bebeb35452b0d5319d.dxf
+++ b/DK60TP/Cases/Sandwich/Tmp/bottom_9078876e87945705b95cf6bebeb35452b0d5319d.dxf
--- a/DK60TP/Cases/Sandwich/Tmp/closed_9078876e87945705b95cf6bebeb35452b0d5319d.dxf
+++ b/DK60TP/Cases/Sandwich/Tmp/closed_9078876e87945705b95cf6bebeb35452b0d5319d.dxf
--- a/DK60TP/Cases/Sandwich/Tmp/open_9078876e87945705b95cf6bebeb35452b0d5319d.dxf
+++ b/DK60TP/Cases/Sandwich/Tmp/open_9078876e87945705b95cf6bebeb35452b0d5319d.dxf
--- a/DK60TP/Cases/Sandwich/Tmp/switch_9078876e87945705b95cf6bebeb35452b0d5319d.dxf
+++ b/DK60TP/Cases/Sandwich/Tmp/switch_9078876e87945705b95cf6bebeb35452b0d5319d.dxf
--- a/DK60TP/Cases/Sandwich/Tmp/top_9078876e87945705b95cf6bebeb35452b0d5319d.dxf
+++ b/DK60TP/Cases/Sandwich/Tmp/top_9078876e87945705b95cf6bebeb35452b0d5319d.dxf
--- a/DK60TP/Cases/Sandwich/layersBylayers.ods
+++ b/DK60TP/Cases/Sandwich/layersBylayers.ods
--- a/DK60TP/Kicad/BACKLIT.sch
+++ b/DK60TP/Kicad/BACKLIT.sch
@ -58,10 +58,10 @@ F 3 "" H 1100 1600 50  0000 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L VCC #PWR014
+L VCC #PWR016
 U 1 1 5932E02F
 P 1100 1000
-F 0 "#PWR014" H 1100 850 50  0001 C CNN
+F 0 "#PWR016" H 1100 850 50  0001 C CNN
 F 1 "VCC" H 1100 1150 50  0000 C CNN
 F 2 "" H 1100 1000 50  0000 C CNN
 F 3 "" H 1100 1000 50  0000 C CNN
@ -80,10 +80,10 @@ F 3 "" H 2450 1350 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR015
+L GND #PWR017
 U 1 1 5932E0A0
 P 1100 2200
-F 0 "#PWR015" H 1100 1950 50  0001 C CNN
+F 0 "#PWR017" H 1100 1950 50  0001 C CNN
 F 1 "GND" H 1100 2050 50  0000 C CNN
 F 2 "" H 1100 2200 50  0000 C CNN
 F 3 "" H 1100 2200 50  0000 C CNN
@ -113,10 +113,10 @@ F 3 "" H 3900 1400 50  0000 C CNN
 	1    0    0    1   
 $EndComp
 $Comp
-L GND #PWR016
+L GND #PWR018
 U 1 1 5932EBAF
 P 3900 2200
-F 0 "#PWR016" H 3900 1950 50  0001 C CNN
+F 0 "#PWR018" H 3900 1950 50  0001 C CNN
 F 1 "GND" H 3900 2050 50  0000 C CNN
 F 2 "" H 3900 2200 50  0000 C CNN
 F 3 "" H 3900 2200 50  0000 C CNN
--- a/DK60TP/Kicad/DK60TP-cache.lib
+++ b/DK60TP/Kicad/DK60TP-cache.lib
@ -73,41 +73,65 @@ X PF4 39 1100 550 300 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# CONN_02X05
+# CONN_01X05
 #
-DEF CONN_02X05 P 0 1 Y N 1 F N
+DEF CONN_01X05 P 0 40 Y N 1 F N
 F0 "P" 0 300 50 H V C CNN
-F1 "CONN_02X05" 0 -300 50 H V C CNN
+F1 "CONN_01X05" 100 0 50 V V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Pin_Header_Straight_1X05
+ Pin_Header_Angled_1X05
+ Socket_Strip_Straight_1X05
+ Socket_Strip_Angled_1X05
+$ENDFPLIST
+DRAW
+S -50 -195 10 -205 0 1 0 N
+S -50 -95 10 -105 0 1 0 N
+S -50 5 10 -5 0 1 0 N
+S -50 105 10 95 0 1 0 N
+S -50 205 10 195 0 1 0 N
+S -50 250 50 -250 0 1 0 N
+X P1 1 -200 200 150 R 50 50 1 1 P
+X P2 2 -200 100 150 R 50 50 1 1 P
+X P3 3 -200 0 150 R 50 50 1 1 P
+X P4 4 -200 -100 150 R 50 50 1 1 P
+X P5 5 -200 -200 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CONN_02X04
+#
+DEF CONN_02X04 P 0 1 Y N 1 F N
+F0 "P" 0 250 50 H V C CNN
+F1 "CONN_02X04" 0 -250 50 H V C CNN
 F2 "" 0 -1200 50 H V C CNN
 F3 "" 0 -1200 50 H V C CNN
 $FPLIST
- Pin_Header_Straight_2X05
- Pin_Header_Angled_2X05
- Socket_Strip_Straight_2X05
- Socket_Strip_Angled_2X05
+ Pin_Header_Straight_2X04
+ Pin_Header_Angled_2X04
+ Socket_Strip_Straight_2X04
+ Socket_Strip_Angled_2X04
 $ENDFPLIST
 DRAW
-S -100 -195 -50 -205 0 1 0 N
-S -100 -95 -50 -105 0 1 0 N
-S -100 5 -50 -5 0 1 0 N
-S -100 105 -50 95 0 1 0 N
-S -100 205 -50 195 0 1 0 N
-S -100 250 100 -250 0 1 0 N
-S 50 -195 100 -205 0 1 0 N
-S 50 -95 100 -105 0 1 0 N
-S 50 5 100 -5 0 1 0 N
-S 50 105 100 95 0 1 0 N
-S 50 205 100 195 0 1 0 N
-X P1 1 -250 200 150 R 50 50 1 1 P
-X P2 2 250 200 150 L 50 50 1 1 P
-X P3 3 -250 100 150 R 50 50 1 1 P
-X P4 4 250 100 150 L 50 50 1 1 P
-X P5 5 -250 0 150 R 50 50 1 1 P
-X P6 6 250 0 150 L 50 50 1 1 P
-X P7 7 -250 -100 150 R 50 50 1 1 P
-X P8 8 250 -100 150 L 50 50 1 1 P
-X P9 9 -250 -200 150 R 50 50 1 1 P
-X P10 10 250 -200 150 L 50 50 1 1 P
+S -100 -145 -50 -155 0 1 0 N
+S -100 -45 -50 -55 0 1 0 N
+S -100 55 -50 45 0 1 0 N
+S -100 155 -50 145 0 1 0 N
+S -100 200 100 -200 0 1 0 N
+S 50 -145 100 -155 0 1 0 N
+S 50 -45 100 -55 0 1 0 N
+S 50 55 100 45 0 1 0 N
+S 50 155 100 145 0 1 0 N
+X P1 1 -250 150 150 R 50 50 1 1 P
+X P2 2 250 150 150 L 50 50 1 1 P
+X P3 3 -250 50 150 R 50 50 1 1 P
+X P4 4 250 50 150 L 50 50 1 1 P
+X P5 5 -250 -50 150 R 50 50 1 1 P
+X P6 6 250 -50 150 L 50 50 1 1 P
+X P7 7 -250 -150 150 R 50 50 1 1 P
+X P8 8 250 -150 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@ -224,6 +248,18 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# MISC
+#
+DEF MISC M 0 40 Y Y 1 F N
+F0 "M" 0 150 60 H V C CNN
+F1 "MISC" 0 -150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 0 100 0 1 0 N
+ENDDRAW
+ENDDEF
+#
 # MOUNT_HOLE
 #
 DEF MOUNT_HOLE MH 0 40 Y Y 1 F N
--- a/DK60TP/Kicad/DK60TP.kicad_pcb
+++ b/DK60TP/Kicad/DK60TP.kicad_pcb
--- a/DK60TP/Kicad/DK60TP.net
+++ b/DK60TP/Kicad/DK60TP.net
--- a/DK60TP/Kicad/DK60TP.sch
+++ b/DK60TP/Kicad/DK60TP.sch
@ -327,6 +327,249 @@ F 3 "" H 4850 950 50  0001 C CNN
 	1    4850 950 
 	1    0    0    -1  
 $EndComp
+$Sheet
+S 5550 850  1250 150 
+U 5932D4E4
+F0 "BACKLIT" 60
+F1 "BACKLIT.sch" 60
+$EndSheet
+Text GLabel 2500 1950 0    60   Input ~ 0
+BACKLIT
+$Sheet
+S 5550 1250 1250 150 
+U 593532A7
+F0 "Function Leds" 60
+F1 "Function_leds.sch" 60
+$EndSheet
+$Comp
+L GND #PWR010
+U 1 1 59349AA8
+P 1450 3000
+F 0 "#PWR010" H 1450 2750 50  0001 C CNN
+F 1 "GND" H 1450 2850 50  0000 C CNN
+F 2 "" H 1450 3000 50  0001 C CNN
+F 3 "" H 1450 3000 50  0001 C CNN
+	1    1450 3000
+	1    0    0    -1  
+$EndComp
+Text GLabel 2500 850  0    60   Input ~ 0
+CAPS_LED
+$Sheet
+S 4700 3600 1050 450 
+U 5934BBCF
+F0 "TRACKPOINT" 60
+F1 "TRACKPOINT.sch" 60
+F2 "Col5" I L 4700 3650 60 
+F3 "Col4" I L 4700 3750 60 
+F4 "Col3" I L 4700 3850 60 
+F5 "Row4" I L 4700 3950 60 
+F6 "D2" I R 5750 3650 60 
+F7 "D5" I R 5750 3750 60 
+F8 "GND" I R 5750 3850 60 
+F9 "VCC" I R 5750 3950 60 
+$EndSheet
+Text GLabel 2500 1650 0    60   Input ~ 0
+Col5
+Text GLabel 4650 2250 2    60   Input ~ 0
+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
+Col0
+Text GLabel 4650 1450 2    60   Input ~ 0
+Col1
+Text GLabel 4650 1350 2    60   Input ~ 0
+Col2
+Text GLabel 4650 2650 2    60   Input ~ 0
+Col6
+Text GLabel 2500 1850 0    60   Input ~ 0
+Col7
+Text GLabel 4650 2750 2    60   Input ~ 0
+Col8
+Text GLabel 4650 2450 2    60   Input ~ 0
+Col9
+Text GLabel 2500 2850 0    60   Input ~ 0
+ColA
+Text GLabel 2500 2650 0    60   Input ~ 0
+ColB
+Text GLabel 2500 2550 0    60   Input ~ 0
+ColC
+Text GLabel 2500 1550 0    60   Input ~ 0
+ColD
+Text GLabel 4650 1550 2    60   Input ~ 0
+Row0
+Text GLabel 4650 2150 2    60   Input ~ 0
+Row1
+Text GLabel 4650 2350 2    60   Input ~ 0
+Row2
+Text GLabel 2500 1750 0    60   Input ~ 0
+Row3
+$Comp
+L GND #PWR011
+U 1 1 593621F1
+P 4900 1750
+F 0 "#PWR011" H 4900 1500 50  0001 C CNN
+F 1 "GND" H 4900 1600 50  0000 C CNN
+F 2 "" H 4900 1750 50  0001 C CNN
+F 3 "" H 4900 1750 50  0001 C CNN
+	1    4900 1750
+	0    -1   -1   0   
+$EndComp
+$Comp
+L VCC #PWR012
+U 1 1 593B1C08
+P 5250 800
+F 0 "#PWR012" H 5250 650 50  0001 C CNN
+F 1 "VCC" H 5250 950 50  0000 C CNN
+F 2 "" H 5250 800 50  0001 C CNN
+F 3 "" H 5250 800 50  0001 C CNN
+	1    5250 800 
+	1    0    0    -1  
+$EndComp
+$Sheet
+S 7000 850  1250 150 
+U 5935238D
+F0 "MATRIX" 60
+F1 "MATRIX.sch" 60
+$EndSheet
+Text GLabel 7950 2800 2    60   Input ~ 0
+RESET
+Text GLabel 2500 2050 0    60   Input ~ 0
+RESET
+$Comp
+L VCC #PWR013
+U 1 1 59395D72
+P 1800 1750
+F 0 "#PWR013" H 1800 1600 50  0001 C CNN
+F 1 "VCC" H 1800 1900 50  0000 C CNN
+F 2 "" H 1800 1750 50  0001 C CNN
+F 3 "" H 1800 1750 50  0001 C CNN
+	1    1800 1750
+	1    0    0    -1  
+$EndComp
+Text GLabel 9600 1100 1    60   Input ~ 0
+XTAL2
+Text GLabel 8700 1100 1    60   Input ~ 0
+XTAL1
+Text GLabel 2500 2450 0    60   Input ~ 0
+XTAL2
+Text GLabel 2500 2350 0    60   Input ~ 0
+XTAL1
+Text Notes 5600 700  0    60   ~ 0
+External sheets
+Text Notes 5600 2250 0    60   ~ 0
+Power decoupling
+Text Notes 6900 2250 0    60   ~ 0
+Reset
+Text Notes 8600 700  0    60   ~ 0
+Clock
+Text Notes 700  700  0    60   ~ 0
+µControler
+$Sheet
+S 7000 1250 1250 150 
+U 593984AD
+F0 "RGB Underglow" 60
+F1 "RGB_UNDERGLOW.sch" 60
+$EndSheet
+$Sheet
+S 7000 1650 1250 150 
+U 5939867D
+F0 "Mounting Holes" 60
+F1 "HOLES.sch" 60
+$EndSheet
+Text GLabel 4650 2550 2    60   Input ~ 0
+RGB
+$Comp
+L CONN_02X04 P1
+U 1 1 593CBA33
+P 4050 4600
+F 0 "P1" H 4050 4850 50  0000 C CNN
+F 1 "CONN_02X04" H 4050 4350 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Angled_2x04" H 4050 3400 50  0001 C CNN
+F 3 "" H 4050 3400 50  0000 C CNN
+	1    4050 4600
+	1    0    0    -1  
+$EndComp
+Text GLabel 3800 4550 0    60   Input ~ 0
+Col5
+Text GLabel 3800 4650 0    60   Input ~ 0
+Col4
+Text GLabel 3800 4750 0    60   Input ~ 0
+Col3
+Text GLabel 4300 4750 2    60   Input ~ 0
+Row4
+$Comp
+L GND #PWR014
+U 1 1 593CBEF2
+P 4950 4750
+F 0 "#PWR014" H 4950 4500 50  0001 C CNN
+F 1 "GND" H 4950 4600 50  0000 C CNN
+F 2 "" H 4950 4750 50  0001 C CNN
+F 3 "" H 4950 4750 50  0001 C CNN
+	1    4950 4750
+	1    0    0    -1  
+$EndComp
+Text GLabel 4300 4650 2    60   Input ~ 0
+D5
+Text GLabel 4300 4550 2    60   Input ~ 0
+D2
+$Comp
+L MISC M1
+U 1 1 593CCEE2
+P 1450 5800
+F 0 "M1" H 1450 5950 60  0000 C CNN
+F 1 "MISC" H 1450 5650 60  0000 C CNN
+F 2 "Footprint:BreakHoles" H 1450 5800 60  0001 C CNN
+F 3 "" H 1450 5800 60  0000 C CNN
+	1    1450 5800
+	1    0    0    -1  
+$EndComp
+$Comp
+L MISC M3
+U 1 1 593CCFFA
+P 1800 5800
+F 0 "M3" H 1800 5950 60  0000 C CNN
+F 1 "MISC" H 1800 5650 60  0000 C CNN
+F 2 "Footprint:BreakHoles" H 1800 5800 60  0001 C CNN
+F 3 "" H 1800 5800 60  0000 C CNN
+	1    1800 5800
+	1    0    0    -1  
+$EndComp
+$Comp
+L MISC M2
+U 1 1 593CD07A
+P 1450 6250
+F 0 "M2" H 1450 6400 60  0000 C CNN
+F 1 "MISC" H 1450 6100 60  0000 C CNN
+F 2 "Footprint:BreakHoles" H 1450 6250 60  0001 C CNN
+F 3 "" H 1450 6250 60  0000 C CNN
+	1    1450 6250
+	1    0    0    -1  
+$EndComp
+$Comp
+L MISC M4
+U 1 1 593CD101
+P 1800 6250
+F 0 "M4" H 1800 6400 60  0000 C CNN
+F 1 "MISC" H 1800 6100 60  0000 C CNN
+F 2 "Footprint:BreakHoles" H 1800 6250 60  0001 C CNN
+F 3 "" H 1800 6250 60  0000 C CNN
+	1    1800 6250
+	1    0    0    -1  
+$EndComp
+$Comp
+L VCC #PWR015
+U 1 1 593CBBEA
+P 3700 4350
+F 0 "#PWR015" H 3700 4200 50  0001 C CNN
+F 1 "VCC" H 3700 4500 50  0000 C CNN
+F 2 "" H 3700 4350 50  0001 C CNN
+F 3 "" H 3700 4350 50  0001 C CNN
+	1    3700 4350
+	1    0    0    -1  
+$EndComp
 Wire Wire Line
 	5650 2550 5650 2700
 Wire Wire Line
@ -394,112 +637,13 @@ Wire Wire Line
 	5150 2450 5150 2600
 Wire Wire Line
 	4650 950  4850 950 
-$Sheet
-S 5550 850  1250 150 
-U 5932D4E4
-F0 "BACKLIT" 60
-F1 "BACKLIT.sch" 60
-$EndSheet
-Text GLabel 2500 1950 0    60   Input ~ 0
-BACKLIT
-$Sheet
-S 5550 1250 1250 150 
-U 593532A7
-F0 "Function Leds" 60
-F1 "Function_leds.sch" 60
-$EndSheet
-$Comp
-L GND #PWR010
-U 1 1 59349AA8
-P 1450 3000
-F 0 "#PWR010" H 1450 2750 50  0001 C CNN
-F 1 "GND" H 1450 2850 50  0000 C CNN
-F 2 "" H 1450 3000 50  0001 C CNN
-F 3 "" H 1450 3000 50  0001 C CNN
-	1    1450 3000
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	1450 2250 2500 2250
-Text GLabel 2500 850  0    60   Input ~ 0
-CAPS_LED
-$Sheet
-S 5550 1650 1250 150 
-U 5934BBCF
-F0 "TRACKPOINT" 60
-F1 "TRACKPOINT.sch" 60
-$EndSheet
-Text GLabel 2500 1650 0    60   Input ~ 0
-Col5
-Text GLabel 4650 2250 2    60   Input ~ 0
-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
-Col0
-Text GLabel 4650 1450 2    60   Input ~ 0
-Col1
-Text GLabel 4650 1350 2    60   Input ~ 0
-Col2
-Text GLabel 4650 2650 2    60   Input ~ 0
-Col6
-Text GLabel 2500 1850 0    60   Input ~ 0
-Col7
-Text GLabel 4650 2750 2    60   Input ~ 0
-Col8
-Text GLabel 4650 2450 2    60   Input ~ 0
-Col9
-Text GLabel 2500 2850 0    60   Input ~ 0
-ColA
-Text GLabel 2500 2650 0    60   Input ~ 0
-ColB
-Text GLabel 2500 2550 0    60   Input ~ 0
-ColC
-Text GLabel 2500 1550 0    60   Input ~ 0
-ColD
-Text GLabel 4650 1550 2    60   Input ~ 0
-Row0
-Text GLabel 4650 2150 2    60   Input ~ 0
-Row1
-Text GLabel 4650 2350 2    60   Input ~ 0
-Row2
-Text GLabel 2500 1750 0    60   Input ~ 0
-Row3
-$Comp
-L GND #PWR011
-U 1 1 593621F1
-P 4900 1750
-F 0 "#PWR011" H 4900 1500 50  0001 C CNN
-F 1 "GND" H 4900 1600 50  0000 C CNN
-F 2 "" H 4900 1750 50  0001 C CNN
-F 3 "" H 4900 1750 50  0001 C CNN
-	1    4900 1750
-	0    -1   -1   0   
-$EndComp
-$Comp
-L VCC #PWR012
-U 1 1 593B1C08
-P 5250 800
-F 0 "#PWR012" H 5250 650 50  0001 C CNN
-F 1 "VCC" H 5250 950 50  0000 C CNN
-F 2 "" H 5250 800 50  0001 C CNN
-F 3 "" H 5250 800 50  0001 C CNN
-	1    5250 800 
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	4650 1750 4900 1750
 Wire Wire Line
 	4650 1850 5250 1850
 Connection ~ 5250 1850
-$Sheet
-S 7000 850  1250 150 
-U 5935238D
-F0 "MATRIX" 60
-F1 "MATRIX.sch" 60
-$EndSheet
 Wire Wire Line
 	4650 850  5250 850 
 Connection ~ 5250 850 
@ -526,10 +670,6 @@ Wire Wire Line
 Wire Wire Line
 	7700 2800 7950 2800
 Connection ~ 7700 2800
-Text GLabel 7950 2800 2    60   Input ~ 0
-RESET
-Text GLabel 2500 2050 0    60   Input ~ 0
-RESET
 Wire Notes Line
 	6800 2100 6800 3250
 Wire Notes Line
@ -538,17 +678,6 @@ Wire Notes Line
 	6800 2100 8400 2100
 Wire Wire Line
 	2000 1450 2000 2150
-$Comp
-L VCC #PWR013
-U 1 1 59395D72
-P 1800 1750
-F 0 "#PWR013" H 1800 1600 50  0001 C CNN
-F 1 "VCC" H 1800 1900 50  0000 C CNN
-F 2 "" H 1800 1750 50  0001 C CNN
-F 3 "" H 1800 1750 50  0001 C CNN
-	1    1800 1750
-	1    0    0    -1  
-$EndComp
 Wire Wire Line
 	1800 1750 2000 1750
 Connection ~ 2000 1750
@ -563,32 +692,14 @@ Wire Wire Line
 Wire Wire Line
 	9600 1650 9600 1500
 Connection ~ 9150 1650
-Text GLabel 9600 1100 1    60   Input ~ 0
-XTAL2
-Text GLabel 8700 1100 1    60   Input ~ 0
-XTAL1
-Text GLabel 2500 2450 0    60   Input ~ 0
-XTAL2
-Text GLabel 2500 2350 0    60   Input ~ 0
-XTAL1
 Wire Notes Line
 	8500 550  9800 550 
-Text Notes 5600 700  0    60   ~ 0
-External sheets
 Wire Notes Line
 	5500 3250 6700 3250
-Text Notes 5600 2250 0    60   ~ 0
-Power decoupling
 Wire Notes Line
 	8400 3250 6800 3250
-Text Notes 6900 2250 0    60   ~ 0
-Reset
 Wire Wire Line
 	6950 2950 6950 3000
-Text Notes 8600 700  0    60   ~ 0
-Clock
-Text Notes 700  700  0    60   ~ 0
-µControler
 Wire Wire Line
 	5250 800  5250 2850
 Wire Notes Line
@ -611,20 +722,6 @@ Wire Notes Line
 	9800 550  9800 2000
 Wire Notes Line
 	8500 2000 8500 550 
-$Sheet
-S 7000 1250 1250 150 
-U 593984AD
-F0 "RGB Underglow" 60
-F1 "RGB_UNDERGLOW.sch" 60
-$EndSheet
-$Sheet
-S 7000 1650 1250 150 
-U 5939867D
-F0 "Mounting Holes" 60
-F1 "HOLES.sch" 60
-$EndSheet
-Text GLabel 4650 2550 2    60   Input ~ 0
-RGB
 Wire Wire Line
 	1450 1250 1450 3000
 Connection ~ 1450 1450
@ -640,4 +737,12 @@ Wire Wire Line
 	1800 850  1800 950 
 Wire Notes Line
 	9800 2000 8500 2000
+Wire Wire Line
+	3700 4350 3700 4450
+Wire Wire Line
+	3700 4450 3800 4450
+Wire Wire Line
+	4300 4450 4950 4450
+Wire Wire Line
+	4950 4450 4950 4750
 $EndSCHEMATC
--- a/DK60TP/Kicad/Function_leds.sch
+++ b/DK60TP/Kicad/Function_leds.sch
@ -69,10 +69,10 @@ F 3 "" H 2050 1400 50  0001 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR017
+L GND #PWR019
 U 1 1 5907C578
 P 3150 1700
-F 0 "#PWR017" H 3150 1450 50  0001 C CNN
+F 0 "#PWR019" H 3150 1450 50  0001 C CNN
 F 1 "GND" H 3150 1550 50  0000 C CNN
 F 2 "" H 3150 1700 50  0001 C CNN
 F 3 "" H 3150 1700 50  0001 C CNN
--- a/DK60TP/Kicad/MouseButtons/MouseButtons-cache.lib
+++ b/DK60TP/Kicad/MouseButtons/MouseButtons-cache.lib
@ -1,70 +0,0 @@
-EESchema-LIBRARY Version 2.3
-#encoding utf-8
-#
-# CONN_01X04
-#
-DEF CONN_01X04 P 0 40 Y N 1 F N
-F0 "P" 0 250 50 H V C CNN
-F1 "CONN_01X04" 100 0 50 V V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- Pin_Header_Straight_1X04
- Pin_Header_Angled_1X04
- Socket_Strip_Straight_1X04
- Socket_Strip_Angled_1X04
-$ENDFPLIST
-DRAW
-S -50 -145 10 -155 0 1 0 N
-S -50 -45 10 -55 0 1 0 N
-S -50 55 10 45 0 1 0 N
-S -50 155 10 145 0 1 0 N
-S -50 200 50 -200 0 1 0 N
-X P1 1 -200 150 150 R 50 50 1 1 P
-X P2 2 -200 50 150 R 50 50 1 1 P
-X P3 3 -200 -50 150 R 50 50 1 1 P
-X P4 4 -200 -150 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# D
-#
-DEF D D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- Diode_*
- D-*
- *SingleDiode
- *_Diode_*
- *SingleDiode*
- D_*
-$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
-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
-#
-# KEYSW
-#
-DEF ~KEYSW K? 0 40 Y Y 1 F N
-F0 "K?" -50 0 60 H V C CNN
-F1 "KEYSW" 0 -100 60 H I C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-C -200 0 50 0 1 0 N
-C 200 0 50 0 1 0 N
-P 2 0 1 10 -200 50 150 150 N
-X ~ 1 300 0 50 L 60 60 1 1 P
-X ~ 2 -300 0 50 R 60 60 1 1 P
-ENDDRAW
-ENDDEF
-#
-#End Library
--- a/DK60TP/Kicad/MouseButtons/MouseButtons.kicad_pcb
+++ b/DK60TP/Kicad/MouseButtons/MouseButtons.kicad_pcb
--- a/DK60TP/Kicad/MouseButtons/MouseButtons.net
+++ b/DK60TP/Kicad/MouseButtons/MouseButtons.net
@ -1,144 +0,0 @@
-(export (version D)
-  (design
-    (source /home/dbroqua/Webstorm/dbroqua/DK60/DK60TP/Kicad/MouseButtons/MouseButtons.sch)
-    (date "Fri 02 Jun 2017 07:32:09 PM CEST")
-    (tool "Eeschema 4.0.5+dfsg1-4")
-    (sheet (number 1) (name /) (tstamps /)
-      (title_block
-        (title)
-        (company)
-        (rev)
-        (date)
-        (source MouseButtons.sch)
-        (comment (number 1) (value ""))
-        (comment (number 2) (value ""))
-        (comment (number 3) (value ""))
-        (comment (number 4) (value "")))))
-  (components
-    (comp (ref K1)
-      (value K43)
-      (footprint Footprint:Mx_Alps_100)
-      (libsource (lib keyboard_parts) (part KEYSW))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 593156D7))
-    (comp (ref K2)
-      (value K43)
-      (footprint Footprint:Mx_Alps_125)
-      (libsource (lib keyboard_parts) (part KEYSW))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 59315811))
-    (comp (ref K3)
-      (value K44)
-      (footprint Footprint:Mx_Alps_100)
-      (libsource (lib keyboard_parts) (part KEYSW))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 5931582D))
-    (comp (ref K4)
-      (value K45)
-      (footprint Footprint:Mx_Alps_100)
-      (libsource (lib keyboard_parts) (part KEYSW))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 593158A2))
-    (comp (ref K5)
-      (value K45)
-      (footprint Footprint:Mx_Alps_125)
-      (libsource (lib keyboard_parts) (part KEYSW))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 593158F2))
-    (comp (ref D1)
-      (value D)
-      (footprint Footprint:D_SOD123)
-      (libsource (lib device) (part D))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 59315914))
-    (comp (ref D2)
-      (value D)
-      (footprint Footprint:D_SOD123)
-      (libsource (lib device) (part D))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 593159AD))
-    (comp (ref D3)
-      (value D)
-      (footprint Footprint:D_SOD123)
-      (libsource (lib device) (part D))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 593159F6))
-    (comp (ref P1)
-      (value CONN_01X04)
-      (footprint Pin_Headers:Pin_Header_Angled_1x04)
-      (libsource (lib conn) (part CONN_01X04))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 59315D1F)))
-  (libparts
-    (libpart (lib conn) (part CONN_01X04)
-      (description "Connector, single row, 01x04")
-      (footprints
-        (fp Pin_Header_Straight_1X04)
-        (fp Pin_Header_Angled_1X04)
-        (fp Socket_Strip_Straight_1X04)
-        (fp Socket_Strip_Angled_1X04))
-      (fields
-        (field (name Reference) P)
-        (field (name Value) CONN_01X04))
-      (pins
-        (pin (num 1) (name P1) (type passive))
-        (pin (num 2) (name P2) (type passive))
-        (pin (num 3) (name P3) (type passive))
-        (pin (num 4) (name P4) (type passive))))
-    (libpart (lib device) (part D)
-      (description Diode)
-      (footprints
-        (fp Diode_*)
-        (fp D-*)
-        (fp *SingleDiode)
-        (fp *_Diode_*)
-        (fp *SingleDiode*)
-        (fp D_*))
-      (fields
-        (field (name Reference) D)
-        (field (name Value) D))
-      (pins
-        (pin (num 1) (name K) (type passive))
-        (pin (num 2) (name A) (type passive))))
-    (libpart (lib keyboard_parts) (part KEYSW)
-      (fields
-        (field (name Reference) K?)
-        (field (name Value) KEYSW))
-      (pins
-        (pin (num 1) (name ~) (type passive))
-        (pin (num 2) (name ~) (type passive)))))
-  (libraries
-    (library (logical device)
-      (uri /usr/share/kicad/library/device.lib))
-    (library (logical conn)
-      (uri /usr/share/kicad/library/conn.lib))
-    (library (logical keyboard_parts)
-      (uri /home/dbroqua/Webstorm/dbroqua/DK60/Libraries/keyboard_parts.lib)))
-  (nets
-    (net (code 1) (name "Net-(D2-Pad2)")
-      (node (ref K3) (pin 2))
-      (node (ref D2) (pin 2)))
-    (net (code 2) (name Col5)
-      (node (ref K5) (pin 1))
-      (node (ref P1) (pin 1))
-      (node (ref K4) (pin 1)))
-    (net (code 3) (name Col4)
-      (node (ref P1) (pin 2))
-      (node (ref K3) (pin 1)))
-    (net (code 4) (name Col3)
-      (node (ref K1) (pin 1))
-      (node (ref K2) (pin 1))
-      (node (ref P1) (pin 3)))
-    (net (code 5) (name Row4)
-      (node (ref D1) (pin 1))
-      (node (ref P1) (pin 4))
-      (node (ref D3) (pin 1))
-      (node (ref D2) (pin 1)))
-    (net (code 6) (name "Net-(D1-Pad2)")
-      (node (ref D1) (pin 2))
-      (node (ref K2) (pin 2))
-      (node (ref K1) (pin 2)))
-    (net (code 7) (name "Net-(D3-Pad2)")
-      (node (ref K5) (pin 2))
-      (node (ref D3) (pin 2))
-      (node (ref K4) (pin 2)))))
--- a/DK60TP/Kicad/MouseButtons/MouseButtons.pro
+++ b/DK60TP/Kicad/MouseButtons/MouseButtons.pro
@ -1,63 +0,0 @@
-update=Fri 02 Jun 2017 01:58:32 PM CEST
-version=1
-last_client=kicad
-[pcbnew]
-version=1
-LastNetListRead=
-UseCmpFile=1
-PadDrill=0.600000000000
-PadDrillOvalY=0.600000000000
-PadSizeH=1.500000000000
-PadSizeV=1.500000000000
-PcbTextSizeV=1.500000000000
-PcbTextSizeH=1.500000000000
-PcbTextThickness=0.300000000000
-ModuleTextSizeV=1.000000000000
-ModuleTextSizeH=1.000000000000
-ModuleTextSizeThickness=0.150000000000
-SolderMaskClearance=0.000000000000
-SolderMaskMinWidth=0.000000000000
-DrawSegmentWidth=0.200000000000
-BoardOutlineThickness=0.100000000000
-ModuleOutlineThickness=0.150000000000
-[cvpcb]
-version=1
-NetIExt=net
-[general]
-version=1
-[eeschema]
-version=1
-LibDir=../../../Libraries
-[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=keyboard_parts
-LibName31=mkl27z256vfm4
-LibName32=Trackpad
--- a/DK60TP/Kicad/MouseButtons/MouseButtons.sch
+++ b/DK60TP/Kicad/MouseButtons/MouseButtons.sch
@ -1,184 +0,0 @@
-EESchema Schematic File Version 2
-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:keyboard_parts
-LIBS:mkl27z256vfm4
-LIBS:Trackpad
-LIBS:MouseButtons-cache
-EELAYER 25 0
-EELAYER END
-$Descr A4 11693 8268
-encoding utf-8
-Sheet 1 1
-Title ""
-Date ""
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Comp
-L KEYSW K1
-U 1 1 593156D7
-P 2000 1300
-F 0 "K1" H 1950 1300 60  0001 C CNN
-F 1 "K43" H 2000 1200 60  0000 C CNN
-F 2 "Footprint:Mx_Alps_100" H 2000 1300 60  0001 C CNN
-F 3 "" H 2000 1300 60  0000 C CNN
-	1    2000 1300
-	1    0    0    -1  
-$EndComp
-$Comp
-L KEYSW K2
-U 1 1 59315811
-P 2000 1550
-F 0 "K2" H 1950 1550 60  0001 C CNN
-F 1 "K43" H 2000 1450 60  0001 C CNN
-F 2 "Footprint:Mx_Alps_125" H 2000 1550 60  0001 C CNN
-F 3 "" H 2000 1550 60  0000 C CNN
-	1    2000 1550
-	1    0    0    -1  
-$EndComp
-$Comp
-L KEYSW K3
-U 1 1 5931582D
-P 2800 1300
-F 0 "K3" H 2750 1300 60  0001 C CNN
-F 1 "K44" H 2800 1200 60  0000 C CNN
-F 2 "Footprint:Mx_Alps_100" H 2800 1300 60  0001 C CNN
-F 3 "" H 2800 1300 60  0000 C CNN
-	1    2800 1300
-	1    0    0    -1  
-$EndComp
-$Comp
-L KEYSW K4
-U 1 1 593158A2
-P 3600 1300
-F 0 "K4" H 3550 1300 60  0001 C CNN
-F 1 "K45" H 3600 1200 60  0000 C CNN
-F 2 "Footprint:Mx_Alps_100" H 3600 1300 60  0001 C CNN
-F 3 "" H 3600 1300 60  0000 C CNN
-	1    3600 1300
-	1    0    0    -1  
-$EndComp
-$Comp
-L KEYSW K5
-U 1 1 593158F2
-P 3600 1550
-F 0 "K5" H 3550 1550 60  0001 C CNN
-F 1 "K45" H 3600 1450 60  0001 C CNN
-F 2 "Footprint:Mx_Alps_125" H 3600 1550 60  0001 C CNN
-F 3 "" H 3600 1550 60  0000 C CNN
-	1    3600 1550
-	1    0    0    -1  
-$EndComp
-$Comp
-L D D1
-U 1 1 59315914
-P 1700 1850
-F 0 "D1" H 1700 1950 50  0000 C CNN
-F 1 "D" H 1700 1750 50  0000 C CNN
-F 2 "Footprint:D_SOD123" H 1700 1850 50  0001 C CNN
-F 3 "" H 1700 1850 50  0000 C CNN
-	1    1700 1850
-	0    -1   -1   0   
-$EndComp
-$Comp
-L D D2
-U 1 1 593159AD
-P 2500 1850
-F 0 "D2" H 2500 1950 50  0000 C CNN
-F 1 "D" H 2500 1750 50  0000 C CNN
-F 2 "Footprint:D_SOD123" H 2500 1850 50  0001 C CNN
-F 3 "" H 2500 1850 50  0000 C CNN
-	1    2500 1850
-	0    -1   -1   0   
-$EndComp
-$Comp
-L D D3
-U 1 1 593159F6
-P 3300 1850
-F 0 "D3" H 3300 1950 50  0000 C CNN
-F 1 "D" H 3300 1750 50  0000 C CNN
-F 2 "Footprint:D_SOD123" H 3300 1850 50  0001 C CNN
-F 3 "" H 3300 1850 50  0000 C CNN
-	1    3300 1850
-	0    -1   -1   0   
-$EndComp
-Text GLabel 2300 850  1    60   Input ~ 0
-Col3
-Text GLabel 4300 2000 2    60   Input ~ 0
-Row4
-Text GLabel 3100 850  1    60   Input ~ 0
-Col4
-Text GLabel 3900 850  1    60   Input ~ 0
-Col5
-Wire Wire Line
-	1700 2000 4300 2000
-Connection ~ 2500 2000
-Connection ~ 3300 2000
-Wire Wire Line
-	2300 850  2300 1550
-Connection ~ 2300 1300
-Wire Wire Line
-	3100 850  3100 1300
-Wire Wire Line
-	3900 850  3900 1550
-Connection ~ 3900 1300
-Wire Wire Line
-	3300 1300 3300 1700
-Connection ~ 3300 1550
-Wire Wire Line
-	2500 1300 2500 1700
-Wire Wire Line
-	1700 1300 1700 1700
-Connection ~ 1700 1550
-$Comp
-L CONN_01X04 P1
-U 1 1 59315D1F
-P 4950 1300
-F 0 "P1" H 4950 1550 50  0000 C CNN
-F 1 "CONN_01X04" V 5050 1300 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Angled_1x04" H 4950 1300 50  0001 C CNN
-F 3 "" H 4950 1300 50  0000 C CNN
-	1    4950 1300
-	1    0    0    -1  
-$EndComp
-Text GLabel 4750 1450 0    60   Input ~ 0
-Row4
-Text GLabel 4750 1150 0    60   Input ~ 0
-Col5
-Text GLabel 4750 1250 0    60   Input ~ 0
-Col4
-Text GLabel 4750 1350 0    60   Input ~ 0
-Col3
-$EndSCHEMATC
--- a/DK60TP/Kicad/MouseButtons/fp-lib-table
+++ b/DK60TP/Kicad/MouseButtons/fp-lib-table
@ -1,3 +0,0 @@
-(fp_lib_table
-  (lib (name Footprint)(type KiCad)(uri /home/dbroqua/Webstorm/dbroqua/DK60/Footprint)(options "")(descr ""))
-)
--- a/DK60TP/Kicad/RGB_UNDERGLOW.sch
+++ b/DK60TP/Kicad/RGB_UNDERGLOW.sch
@ -47,10 +47,10 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L VCC #PWR021
+L VCC #PWR029
 U 1 1 593558DB
 P 1700 1100
-F 0 "#PWR021" H 1700 950 50  0001 C CNN
+F 0 "#PWR029" H 1700 950 50  0001 C CNN
 F 1 "VCC" H 1700 1250 50  0000 C CNN
 F 2 "" H 1700 1100 50  0000 C CNN
 F 3 "" H 1700 1100 50  0000 C CNN
@ -126,10 +126,10 @@ F 3 "" H 2700 3850 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR022
+L GND #PWR030
 U 1 1 59355E8A
 P 3200 4100
-F 0 "#PWR022" H 3200 3850 50  0001 C CNN
+F 0 "#PWR030" H 3200 3850 50  0001 C CNN
 F 1 "GND" H 3200 3950 50  0000 C CNN
 F 2 "" H 3200 4100 50  0000 C CNN
 F 3 "" H 3200 4100 50  0000 C CNN
@ -170,10 +170,10 @@ F 3 "" H 1950 3400 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR023
+L GND #PWR031
 U 1 1 59356713
 P 1950 1700
-F 0 "#PWR023" H 1950 1450 50  0001 C CNN
+F 0 "#PWR031" H 1950 1450 50  0001 C CNN
 F 1 "GND" H 1950 1550 50  0000 C CNN
 F 2 "" H 1950 1700 50  0000 C CNN
 F 3 "" H 1950 1700 50  0000 C CNN
@ -181,10 +181,10 @@ F 3 "" H 1950 1700 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR024
+L GND #PWR032
 U 1 1 59356739
 P 1950 2300
-F 0 "#PWR024" H 1950 2050 50  0001 C CNN
+F 0 "#PWR032" H 1950 2050 50  0001 C CNN
 F 1 "GND" H 1950 2150 50  0000 C CNN
 F 2 "" H 1950 2300 50  0000 C CNN
 F 3 "" H 1950 2300 50  0000 C CNN
@ -192,10 +192,10 @@ F 3 "" H 1950 2300 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR033
 U 1 1 5935675F
 P 1950 2900
-F 0 "#PWR025" H 1950 2650 50  0001 C CNN
+F 0 "#PWR033" H 1950 2650 50  0001 C CNN
 F 1 "GND" H 1950 2750 50  0000 C CNN
 F 2 "" H 1950 2900 50  0000 C CNN
 F 3 "" H 1950 2900 50  0000 C CNN
@ -203,10 +203,10 @@ F 3 "" H 1950 2900 50  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR026
+L GND #PWR034
 U 1 1 59356785
 P 1950 3500
-F 0 "#PWR026" H 1950 3250 50  0001 C CNN
+F 0 "#PWR034" H 1950 3250 50  0001 C CNN
 F 1 "GND" H 1950 3350 50  0000 C CNN
 F 2 "" H 1950 3500 50  0000 C CNN
 F 3 "" H 1950 3500 50  0000 C CNN
@ -225,10 +225,10 @@ F 3 "" H 4450 2100 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR027
+L VCC #PWR035
 U 1 1 59356ADE
 P 5700 2600
-F 0 "#PWR027" H 5700 2450 50  0001 C CNN
+F 0 "#PWR035" H 5700 2450 50  0001 C CNN
 F 1 "VCC" H 5700 2750 50  0000 C CNN
 F 2 "" H 5700 2600 50  0000 C CNN
 F 3 "" H 5700 2600 50  0000 C CNN
@ -236,10 +236,10 @@ F 3 "" H 5700 2600 50  0000 C CNN
 	-1   0    0    1   
 $EndComp
 $Comp
-L GND #PWR028
+L GND #PWR036
 U 1 1 59356B44
 P 5450 2600
-F 0 "#PWR028" H 5450 2350 50  0001 C CNN
+F 0 "#PWR036" H 5450 2350 50  0001 C CNN
 F 1 "GND" H 5450 2450 50  0000 C CNN
 F 2 "" H 5450 2600 50  0000 C CNN
 F 3 "" H 5450 2600 50  0000 C CNN
@ -369,10 +369,10 @@ Wire Wire Line
 	1950 3900 1950 3750
 Connection ~ 1950 3750
 $Comp
-L GND #PWR029
+L GND #PWR037
 U 1 1 59357568
 P 1950 4100
-F 0 "#PWR029" H 1950 3850 50  0001 C CNN
+F 0 "#PWR037" H 1950 3850 50  0001 C CNN
 F 1 "GND" H 1950 3950 50  0000 C CNN
 F 2 "" H 1950 4100 50  0000 C CNN
 F 3 "" H 1950 4100 50  0000 C CNN
--- a/DK60TP/Kicad/TRACKPOINT.sch
+++ b/DK60TP/Kicad/TRACKPOINT.sch
@ -47,157 +47,309 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L CONN_02X05 P2
-U 1 1 59315D86
-P 2100 1600
-F 0 "P2" H 2100 1900 50  0000 C CNN
-F 1 "CONN_02X05" H 2100 1300 50  0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Angled_2x05" H 2100 400 50  0001 C CNN
-F 3 "" H 2100 400 50  0000 C CNN
-	1    2100 1600
+L KEYSW KM340
+U 1 1 593C12F1
+P 7200 1900
+F 0 "KM340" H 7150 1900 60  0000 C CNN
+F 1 "LMB" H 7200 1800 60  0001 C CNN
+F 2 "Footprint:Mx_100" H 7200 1900 60  0001 C CNN
+F 3 "" H 7200 1900 60  0000 C CNN
+	1    7200 1900
 	1    0    0    -1  
 $EndComp
-Text GLabel 1600 1150 0    60   Input ~ 0
-D5
 $Comp
-L GND #PWR018
-U 1 1 5931B8F7
-P 3650 2200
-F 0 "#PWR018" H 3650 1950 50  0001 C CNN
-F 1 "GND" H 3650 2050 50  0000 C CNN
-F 2 "" H 3650 2200 50  0001 C CNN
-F 3 "" H 3650 2200 50  0001 C CNN
-	1    3650 2200
+L KEYSW KM440
+U 1 1 593C13CC
+P 8050 1900
+F 0 "KM440" H 8000 1900 60  0000 C CNN
+F 1 "MMB" H 8050 1800 60  0001 C CNN
+F 2 "Footprint:Mx_100" H 8050 1900 60  0001 C CNN
+F 3 "" H 8050 1900 60  0000 C CNN
+	1    8050 1900
 	1    0    0    -1  
 $EndComp
-Text GLabel 1600 2100 0    60   Input ~ 0
-D2
 $Comp
-L R R7
-U 1 1 5926BDA0
-P 3350 1950
-F 0 "R7" V 3430 1950 50  0000 C CNN
-F 1 "100K" V 3350 1950 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 3280 1950 50  0001 C CNN
-F 3 "" H 3350 1950 50  0001 C CNN
-	1    3350 1950
+L KEYSW KM540
+U 1 1 593C141B
+P 8900 1900
+F 0 "KM540" H 8850 1900 60  0000 C CNN
+F 1 "KEYSW" H 8900 1800 60  0001 C CNN
+F 2 "Footprint:Mx_100" H 8900 1900 60  0001 C CNN
+F 3 "" H 8900 1900 60  0000 C CNN
+	1    8900 1900
+	1    0    0    -1  
+$EndComp
+$Comp
+L KEYSW KM341
+U 1 1 593C146D
+P 7200 2150
+F 0 "KM341" H 7150 2150 60  0000 C CNN
+F 1 "KEYSW" H 7200 2050 60  0001 C CNN
+F 2 "Footprint:Mx_125" H 7200 2150 60  0001 C CNN
+F 3 "" H 7200 2150 60  0000 C CNN
+	1    7200 2150
+	1    0    0    -1  
+$EndComp
+$Comp
+L KEYSW KM541
+U 1 1 593C149E
+P 8900 2150
+F 0 "KM541" H 8850 2150 60  0000 C CNN
+F 1 "KEYSW" H 8900 2050 60  0001 C CNN
+F 2 "Footprint:Mx_125" H 8900 2150 60  0001 C CNN
+F 3 "" H 8900 2150 60  0000 C CNN
+	1    8900 2150
+	1    0    0    -1  
+$EndComp
+$Comp
+L D DM34
+U 1 1 593C18C0
+P 6900 2400
+F 0 "DM34" H 6900 2500 50  0000 C CNN
+F 1 "D" H 6900 2300 50  0000 C CNN
+F 2 "Footprint:D_SOD123" H 6900 2400 50  0001 C CNN
+F 3 "" H 6900 2400 50  0000 C CNN
+	1    6900 2400
 	0    -1   -1   0   
 $EndComp
 $Comp
-L C_Small C9
-U 1 1 5926BA1E
-P 3000 1950
-F 0 "C9" H 3010 2020 50  0000 L CNN
-F 1 "2.2u" H 3010 1870 50  0000 L CNN
-F 2 "Capacitors_SMD:C_0805_HandSoldering" H 3000 1950 50  0001 C CNN
-F 3 "" H 3000 1950 50  0001 C CNN
-	1    3000 1950
-	0    1    1    0   
+L D DM44
+U 1 1 593C199F
+P 7750 2400
+F 0 "DM44" H 7750 2500 50  0000 C CNN
+F 1 "D" H 7750 2300 50  0000 C CNN
+F 2 "Footprint:D_SOD123" H 7750 2400 50  0001 C CNN
+F 3 "" H 7750 2400 50  0000 C CNN
+	1    7750 2400
+	0    -1   -1   0   
+$EndComp
+$Comp
+L D DM54
+U 1 1 593C19F1
+P 8600 2400
+F 0 "DM54" H 8600 2500 50  0000 C CNN
+F 1 "D" H 8600 2300 50  0000 C CNN
+F 2 "Footprint:D_SOD123" H 8600 2400 50  0001 C CNN
+F 3 "" H 8600 2400 50  0000 C CNN
+	1    8600 2400
+	0    -1   -1   0   
 $EndComp
 $Comp
 L R R8
-U 1 1 5926BC03
-P 2600 1950
-F 0 "R8" V 2680 1950 50  0000 C CNN
-F 1 "4.7K" V 2600 1950 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 2530 1950 50  0001 C CNN
-F 3 "" H 2600 1950 50  0001 C CNN
-	1    2600 1950
+U 1 1 593C48D0
+P 5350 3550
+F 0 "R8" V 5430 3550 50  0000 C CNN
+F 1 "4.7K" V 5350 3550 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" V 5280 3550 50  0001 C CNN
+F 3 "" H 5350 3550 50  0001 C CNN
+	1    5350 3550
+	0    1    1    0   
+$EndComp
+$Comp
+L R R7
+U 1 1 593C48CA
+P 5000 3350
+F 0 "R7" V 5080 3350 50  0000 C CNN
+F 1 "4.7K" V 5000 3350 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" V 4930 3350 50  0001 C CNN
+F 3 "" H 5000 3350 50  0001 C CNN
+	1    5000 3350
+	0    1    1    0   
+$EndComp
+$Comp
+L C_Small C9
+U 1 1 593C48C4
+P 5650 3550
+F 0 "C9" H 5660 3620 50  0000 L CNN
+F 1 "2.2u" H 5660 3470 50  0000 L CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 5650 3550 50  0001 C CNN
+F 3 "" H 5650 3550 50  0001 C CNN
+	1    5650 3550
 	0    1    1    0   
 $EndComp
 $Comp
 L R R9
-U 1 1 5926BD28
-P 2700 1400
-F 0 "R9" V 2780 1400 50  0000 C CNN
-F 1 "4.7K" V 2700 1400 50  0000 C CNN
-F 2 "Resistors_SMD:R_0805_HandSoldering" V 2630 1400 50  0001 C CNN
-F 3 "" H 2700 1400 50  0001 C CNN
-	1    2700 1400
-	0    1    1    0   
+U 1 1 593C48BE
+P 6000 3550
+F 0 "R9" V 6080 3550 50  0000 C CNN
+F 1 "100K" V 6000 3550 50  0000 C CNN
+F 2 "Resistors_SMD:R_0805_HandSoldering" V 5930 3550 50  0001 C CNN
+F 3 "" H 6000 3550 50  0001 C CNN
+	1    6000 3550
+	0    -1   -1   0   
 $EndComp
 $Comp
-L VCC #PWR019
-U 1 1 5934D86D
-P 2900 2200
-F 0 "#PWR019" H 2900 2050 50  0001 C CNN
-F 1 "VCC" H 2900 2350 50  0000 C CNN
-F 2 "" H 2900 2200 50  0001 C CNN
-F 3 "" H 2900 2200 50  0001 C CNN
-	1    2900 2200
+L CONN_01X05 P3
+U 1 1 593C4069
+P 4350 3550
+F 0 "P3" H 4350 3850 50  0000 C CNN
+F 1 "TRACKPOINT" V 4450 3550 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Angled_1x05" H 4350 3550 50  0001 C CNN
+F 3 "" H 4350 3550 50  0000 C CNN
+	1    4350 3550
 	-1   0    0    1   
 $EndComp
-Text GLabel 1600 1500 0    60   Input ~ 0
+Text HLabel 1050 2850 0    60   Input ~ 0
 Col5
-Text GLabel 1600 1600 0    60   Input ~ 0
+Text HLabel 1050 3000 0    60   Input ~ 0
 Col4
-Text GLabel 1600 1700 0    60   Input ~ 0
+Text HLabel 1050 3150 0    60   Input ~ 0
 Col3
-Text GLabel 1600 1800 0    60   Input ~ 0
+Text HLabel 1050 3300 0    60   Input ~ 0
 Row4
+Text HLabel 1050 3450 0    60   Input ~ 0
+D2
+Text HLabel 1050 3600 0    60   Input ~ 0
+D5
+Text HLabel 1050 3750 0    60   Input ~ 0
+GND
+Text HLabel 1050 3900 0    60   Input ~ 0
+VCC
+Wire Wire Line
+	7500 1250 7500 2150
+Connection ~ 7500 1900
+Wire Wire Line
+	8350 1250 8350 1900
+Wire Wire Line
+	9200 1250 9200 2150
+Connection ~ 9200 1900
+Wire Wire Line
+	6900 1900 6900 2250
+Wire Wire Line
+	8600 1900 8600 2250
+Wire Wire Line
+	5950 2550 8600 2550
+Connection ~ 7750 2550
+Connection ~ 6900 2550
+Connection ~ 6900 2150
+Wire Wire Line
+	7750 1900 7750 2250
+Connection ~ 8600 2150
+Wire Wire Line
+	4550 3750 4700 3750
+Wire Wire Line
+	4550 3650 4950 3650
+Wire Wire Line
+	4850 3350 4550 3350
+Wire Wire Line
+	4650 3000 4650 3350
+Connection ~ 4650 3350
+Wire Wire Line
+	5150 3350 6500 3350
+Wire Wire Line
+	4550 3550 5200 3550
+Wire Wire Line
+	5200 3550 5200 4050
+Wire Wire Line
+	5500 3550 5550 3550
+Wire Wire Line
+	5550 3550 5550 4050
+Wire Wire Line
+	4550 3450 5800 3450
+Wire Wire Line
+	5800 3450 5800 3550
+Wire Wire Line
+	5750 3550 5850 3550
+Connection ~ 5800 3550
+Wire Wire Line
+	6500 3350 6500 4050
+Wire Wire Line
+	6150 3550 6300 3550
+Wire Wire Line
+	6300 3550 6300 4050
+Wire Wire Line
+	1050 2850 1300 2850
+Wire Wire Line
+	1050 3000 1300 3000
+Wire Wire Line
+	1050 3150 1300 3150
+Wire Wire Line
+	1050 3300 1300 3300
+Wire Wire Line
+	1050 3450 1300 3450
+Wire Wire Line
+	1050 3600 1300 3600
+Wire Wire Line
+	1050 3750 1300 3750
+Wire Wire Line
+	1050 3900 1300 3900
+Wire Wire Line
+	2300 3100 2550 3100
+Text Notes 2550 2900 0    60   ~ 0
+MOUSE PCB
 $Comp
-L VCC #PWR020
-U 1 1 5934E30B
-P 3850 2200
-F 0 "#PWR020" H 3850 2050 50  0001 C CNN
-F 1 "VCC" H 3850 2350 50  0000 C CNN
-F 2 "" H 3850 2200 50  0001 C CNN
-F 3 "" H 3850 2200 50  0001 C CNN
-	1    3850 2200
-	-1   0    0    1   
+L CONN_02X04 P2
+U 1 1 593C4FB5
+P 2800 3250
+F 0 "P2" H 2800 3500 50  0000 C CNN
+F 1 "MAIN_BOARD" H 2800 3000 50  0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Angled_2x04" H 2800 2050 50  0001 C CNN
+F 3 "" H 2800 2050 50  0000 C CNN
+	1    2800 3250
+	1    0    0    -1  
 $EndComp
+Text Label 1300 3600 0    60   ~ 0
+D5
+Text Label 3050 3300 0    60   ~ 0
+D5
+Text Label 4650 3000 0    60   ~ 0
+D5
+Text Label 5200 4050 0    60   ~ 0
+D2
+Text Label 1300 3450 0    60   ~ 0
+D2
+Text Label 3050 3200 0    60   ~ 0
+D2
+Text Label 1300 2850 0    60   ~ 0
+Col5
+Text Label 9200 1250 0    60   ~ 0
+Col5
+Text Label 2300 3200 0    60   ~ 0
+Col5
 Wire Wire Line
-	2350 1400 2550 1400
-Connection ~ 2450 1400
+	2300 3200 2550 3200
+Text Label 1300 3000 0    60   ~ 0
+Col4
+Text Label 2300 3300 0    60   ~ 0
+Col4
 Wire Wire Line
-	2850 1400 3850 1400
+	2300 3300 2550 3300
+Text Label 8350 1250 0    60   ~ 0
+Col4
+Text Label 1300 3150 0    60   ~ 0
+Col3
+Text Label 2300 3400 0    60   ~ 0
+Col3
+Text Label 7500 1250 0    60   ~ 0
+Col3
 Wire Wire Line
-	2350 1600 3650 1600
+	2300 3400 2550 3400
+Text Label 1300 3300 0    60   ~ 0
+Row4
+Text Label 3050 3400 0    60   ~ 0
+Row4
+Text Label 5950 2550 0    60   ~ 0
+Row4
+Text Label 3050 3100 0    60   ~ 0
+GND
+Text Label 1300 3750 0    60   ~ 0
+GND
+Text Label 4950 4050 0    60   ~ 0
+GND
+Text Label 6300 4050 0    60   ~ 0
+GND
+Text Label 1300 3900 0    60   ~ 0
+VCC
+Text Label 4700 4050 0    60   ~ 0
+VCC
+Text Label 5550 4050 0    60   ~ 0
+VCC
+Text Label 6500 4050 0    60   ~ 0
+VCC
 Wire Wire Line
-	1600 1500 1850 1500
+	4700 3750 4700 4050
 Wire Wire Line
-	1600 1600 1850 1600
-Wire Wire Line
-	1600 1700 1850 1700
-Wire Wire Line
-	1600 1800 1850 1800
-Wire Wire Line
-	3850 1400 3850 2200
-Wire Wire Line
-	2350 1500 3850 1500
-Connection ~ 3850 1500
-Wire Wire Line
-	3650 1600 3650 2200
-Wire Wire Line
-	1600 1150 2450 1150
-Wire Wire Line
-	2450 1150 2450 1400
-Wire Wire Line
-	2450 2100 1600 2100
-Wire Wire Line
-	2350 1800 2450 1800
-Wire Wire Line
-	2450 1800 2450 2100
-Connection ~ 2450 1950
-Wire Wire Line
-	2750 1950 2900 1950
-Wire Wire Line
-	2900 1950 2900 2200
-Wire Wire Line
-	2350 1700 3200 1700
-Wire Wire Line
-	3200 1700 3200 1950
-Wire Wire Line
-	3200 1950 3100 1950
-Wire Wire Line
-	3500 1950 3650 1950
-Connection ~ 3650 1950
-Wire Notes Line
-	1200 1000 4100 1000
-Wire Notes Line
-	1200 2500 4100 2500
-Wire Notes Line
-	1200 2500 1200 1000
-Wire Notes Line
-	4100 2500 4100 1000
+	4950 3650 4950 4050
+Text Label 2300 3100 0    60   ~ 0
+VCC
 $EndSCHEMATC
--- a/Previews/DK60TP-PCB-FRONT.png
+++ b/Previews/DK60TP-PCB-FRONT.png
--- a/Previews/DK60TP-PCB.png
+++ b/Previews/DK60TP-PCB.png
--- a/Previews/MouseButtons.png
+++ b/Previews/MouseButtons.png