Added NerD 80% (TKL) support

10 files changed, 149 insertions, 111 deletions

diff --git a/keyboard/nerd/Makefile b/keyboard/nerd/Makefile
index 10fa144fbb..5fd382841f 100644
--- a/keyboard/nerd/Makefile
+++ b/keyboard/nerd/Makefile
@@ -50,9 +50,15 @@ TARGET_DIR = .
 # project specific files
 SRC =	keymap_common.c \
 	matrix.c \
-	backlight.c \
-	led.c \
-	keymap_ansi150.c
+	backlight.c
+
+ifdef LAYOUT
+   OPT_DEFS += -DNERD_LAYOUT_$(LAYOUT)
+endif
+
+ifdef KEYMAP
+    SRC := keymap_$(LAYOUT)_$(KEYMAP).c $(SRC)
+endif
 
 CONFIG_H = config.h
 
@@ -103,7 +109,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 #   comment out to disable the options.
 #
 BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
-#MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
+MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
 CONSOLE_ENABLE = yes	# Console for debug(+400)
 COMMAND_ENABLE = yes    # Commands for debug and configuration
@@ -118,6 +124,3 @@ VPATH += $(TOP_DIR)
 include $(TOP_DIR)/protocol/lufa.mk
 include $(TOP_DIR)/common.mk
 include $(TOP_DIR)/rules.mk
-
-winkey: OPT_DEFS += -DLAYOUT_WINKEY
-winkey: all
diff --git a/keyboard/nerd/README.md b/keyboard/nerd/README.md
index 0130fe49fd..5b4acd3ba9 100644
--- a/keyboard/nerd/README.md
+++ b/keyboard/nerd/README.md
@@ -17,6 +17,7 @@ Supported features
 
 * All layout options are supported
 * All leds are supported
+* 60% and 80% (TKL) pcbs are supported
 
 
 Changing Bootloader
@@ -35,7 +36,13 @@ won't work anymore and you'll lose your warrenty. GON won't provide any support
 Build
 -----
 
-Move to this directory then just run `make`.
+For building you have to specify two build-options, LAYOUT and KEYMAP. The layout option defines
+pcb layout and can be either 60% or 80% at the momemnt. The keymap option selects your
+preferred keymapping.
+
+Move to this directory then just run `make LAYOUT=60 KEYMAP=ansi150`
+
+to compile a firmware for a 60% pcb with ANSI 150 key mapping.
 
 
 Jump to Bootloader
diff --git a/keyboard/nerd/backlight.c b/keyboard/nerd/backlight.c
index 804b4848a6..2dc85c7532 100644
--- a/keyboard/nerd/backlight.c
+++ b/keyboard/nerd/backlight.c
@@ -17,12 +17,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <avr/io.h>
 #include "backlight.h"
+#include "led.h"
 
 void backlight_init_ports()
 {
     DDRB |= 0b11100000; // PB7 (switch), PB6 (pcb), PB5 (caps)
 }
 
+void led_set(uint8_t usb_led)
+{
+    (usb_led & (1<<USB_LED_CAPS_LOCK)) ? backlight_caps_enable() : backlight_caps_disable();
+}
+
 void backlight_set(uint8_t level)
 {
     (level & BACKLIGHT_SWITCH) ? backlight_switch_enable() : backlight_switch_disable();
diff --git a/keyboard/nerd/config.h b/keyboard/nerd/config.h
index 7eab1cb090..ac2e6989d6 100644
--- a/keyboard/nerd/config.h
+++ b/keyboard/nerd/config.h
@@ -26,11 +26,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DESCRIPTION     t.m.k. keyboard firmware for NerD
 
 /* key matrix size */
-#define MATRIX_ROWS 8
+#define MATRIX_ROWS 9
 #define MATRIX_COLS 10
 
 /* Set 0 if debouncing isn't needed */
-#define DEBOUNCE    5
+#define DEBOUNCE 5
 
 /* number of backlight levels */
 #define BACKLIGHT_LEVELS 2
diff --git a/keyboard/nerd/keymap_60_ansi150.c b/keyboard/nerd/keymap_60_ansi150.c
new file mode 100644
index 0000000000..c43d195332
--- /dev/null
+++ b/keyboard/nerd/keymap_60_ansi150.c
@@ -0,0 +1,30 @@
+#include "keymap_common.h"
+#include "backlight.h"
+
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Layer 0: Default */
+    KEYMAP_ANSI150(GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC, \
+                   TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSLS, \
+                   ESC, A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     ENT,  \
+                   LSFT,     Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,RSFT,      \
+                   LCTL,LGUI,LALT,          SPC,                          RALT,FN0 ,RCTL),
+    /* Layer 1: Space Fn */
+    KEYMAP_ANSI150(TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+                   TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
+                   TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS, \
+                   TRNS,     TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,      \
+                   TRNS,TRNS,TRNS,          FN1,                          TRNS,FN0, TRNS),
+    /* Layer 2: Functions */
+    KEYMAP_ANSI150(SLEP,F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, MUTE, \
+                   TRNS,BTN1,MS_U,BTN3,PSCR,SLCK,BRK, HOME,INS, END, MPLY,VOLD,VOLU,FN3,  \
+                   CAPS,MS_L,MS_D,MS_R,PGDN,TRNS,LEFT,DOWN,UP  ,RGHT,MPRV,MNXT,     FN2,  \
+                   UP,       TRNS,DEL, TRNS,TRNS,PGUP,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,      \
+                   LEFT,DOWN,RGHT,          TRNS,                         TRNS,TRNS,TRNS)
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+    [0] = ACTION_LAYER_MOMENTARY(2),
+    [1] = ACTION_LAYER_TAP_KEY(2, KC_SPACE),
+    [2] = ACTION_LAYER_TOGGLE(1),
+    [3] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_SWITCH)
+};
diff --git a/keyboard/nerd/keymap_80_ansi150.c b/keyboard/nerd/keymap_80_ansi150.c
new file mode 100644
index 0000000000..a2ba279c55
--- /dev/null
+++ b/keyboard/nerd/keymap_80_ansi150.c
@@ -0,0 +1,33 @@
+#include "keymap_common.h"
+#include "backlight.h"
+
+const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Layer 0: Default */
+    KEYMAP_ANSI150(ESC,      F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12,   PSCR,SLCK, BRK,  \
+                   GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC,  INS, HOME, PGUP, \
+                   TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSLS,  DEL, END,  PGDN, \
+                   CAPS,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     ENT,                    \
+                   LSFT,     Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,RSFT,            UP,         \
+                   LCTL,LGUI,LALT,               SPC,                     RALT,FN0, RCTL,  LEFT,DOWN,RGHT),
+    /* Layer 1: Space Fn */
+    KEYMAP_ANSI150(TRNS,     TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,  TRNS,TRNS,TRNS,  \
+                   TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,  TRNS,TRNS,TRNS,  \
+                   TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,  TRNS,TRNS,TRNS,  \
+                    ESC,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS,                   \
+                   TRNS,     TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,            TRNS,       \
+                   TRNS,TRNS,TRNS,               FN1,                     TRNS,FN0, TRNS,  TRNS,TRNS,TRNS),
+    /* Layer 2: Functions */
+    KEYMAP_ANSI150(SLEP,     MYCM,WSCH,WHOM,MAIL,VOLD,VOLU,MUTE,MSEL,MPLY,MPRV,MNXT,MSTP,  TRNS,TRNS,TRNS,  \
+                   TRNS,TRNS,TRNS,TRNS,END, TRNS,TRNS,TRNS,TRNS,TRNS,HOME,TRNS,TRNS,TRNS,  TRNS,TRNS,TRNS,  \
+                   TRNS,BTN1,MS_U,BTN3,PSCR,SLCK,TRNS,TRNS,INS, TRNS,TRNS,TRNS,TRNS,FN3,   TRNS,TRNS,TRNS,  \
+                   CAPS,MS_L,MS_D,MS_R,PGDN,TRNS,LEFT,DOWN,UP  ,RGHT,TRNS,TRNS,     FN2,                    \
+                   TRNS,     TRNS,DEL, TRNS,TRNS,PGUP,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,            TRNS,       \
+                   TRNS,TRNS,TRNS,               TRNS,                    TRNS,TRNS,TRNS,  TRNS,TRNS,TRNS),
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+    [0] = ACTION_LAYER_MOMENTARY(2),
+    [1] = ACTION_LAYER_TAP_KEY(2, KC_SPACE),
+    [2] = ACTION_LAYER_TOGGLE(1),
+    [3] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_SWITCH)
+};
diff --git a/keyboard/nerd/keymap_ansi150.c b/keyboard/nerd/keymap_ansi150.c
deleted file mode 100644
index 645ad6a83d..0000000000
--- a/keyboard/nerd/keymap_ansi150.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "keymap_common.h"
-#include "action_layer.h"
-#include "backlight.h"
-
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Layer 0: Default */
-    KEYMAP_ANSI150(GRV, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSPC, \
-                   TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSLS, \
-                   ESC, A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     ENT,  \
-                   LSFT,     Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,RSFT,      \
-                   LCTL,LGUI,LALT,          SPC,                          RALT,FN0 ,RCTL),
-    /* Layer 1: Arrow keys */
-    KEYMAP_ANSI150(TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
-                   TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
-                   TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS, \
-                   UP,       TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,      \
-                   LEFT,DOWN,RGHT,          TRNS,                         TRNS,TRNS,TRNS),
-    /* Layer 2: Space Fn */
-    KEYMAP_ANSI150(TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
-                   TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, \
-                   TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS, \
-                   TRNS,     TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,      \
-                   TRNS,TRNS,TRNS,          FN1,                          TRNS,TRNS,TRNS),
-    /* Layer 3: Functions */
-    KEYMAP_ANSI150(SLEP,F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, FN4,  \
-                   TRNS,TRNS,UP,  END, PSCR,SLCK,BRK, TRNS,INS, HOME,TRNS,VOLD,VOLU,FN5,  \
-                   CAPS,LEFT,DOWN,RGHT,PGDN,TRNS,LEFT,DOWN,UP  ,RGHT,TRNS,TRNS,     TRNS, \
-                   TRNS,     TRNS,DEL, TRNS,TRNS,PGUP,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,      \
-                   MPRV,MPLY,MNXT,          TRNS,                          FN2,TRNS,FN3),
-};
-
-const uint16_t PROGMEM fn_actions[] = {
-    [0] = ACTION_LAYER_MOMENTARY(3),                // Switch to function layer
-    [1] = ACTION_LAYER_TAP_KEY(3, KC_SPACE),        // Switch to function layer (Space Fn)
-    [2] = ACTION_LAYER_TOGGLE(1),                   // Toggle "Arrow keys" layer
-    [3] = ACTION_LAYER_TOGGLE(2),                   // Toggle "Space fn" layer
-    [4] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_SWITCH), // Toggle switch leds
-    [5] = ACTION_BACKLIGHT_LEVEL(BACKLIGHT_PCB),    // Toggle pcb leds
-};
diff --git a/keyboard/nerd/keymap_common.h b/keyboard/nerd/keymap_common.h
index 2d801654da..e116635918 100644
--- a/keyboard/nerd/keymap_common.h
+++ b/keyboard/nerd/keymap_common.h
@@ -33,35 +33,57 @@ extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
 extern const uint16_t fn_actions[];
 
 #define KEYMAP( \
-        K08, K01, K10, K11, K20, K21, K30, K31, K40, K41, K50, K51, K60, K61, \
-        K02, K03, K12, K13, K22, K23, K32, K33, K42, K43, K52, K53, K62, K63, \
-        K04, K14, K15, K24, K25, K34, K35, K44, K45, K54, K55, K64, K71, K65, \
-        K07, K79, K16, K17, K26, K27, K36, K37, K46, K47, K56, K57, K66, K67, \
-        K06, K05, K78,                K70,                K72, K73, K74, K75  \
+        K08,      K09, K18, K19, K28, K29, K38, K39, K48, K49, K58, K59, K68,    K69, K88, K89, \
+        K00, K01, K10, K11, K20, K21, K30, K31, K40, K41, K50, K51, K60, K61,    K80, K81, K84, \
+        K02, K03, K12, K13, K22, K23, K32, K33, K42, K43, K52, K53, K62, K63,    K82, K83, K85, \
+        K04, K14, K15, K24, K25, K34, K35, K44, K45, K54, K55, K64, K71, K65,                   \
+        K07, K79, K16, K17, K26, K27, K36, K37, K46, K47, K56, K57, K66, K67,         K86,      \
+        K06, K05, K78,                K70,                K72, K73, K74, K75,    K76, K77, K87  \
 ) { \
-/*          0         1         2         3         4         5         6         7         8         9      */\
-/* 0 */ { KC_NO,    KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_NO },   \
-/* 1 */ { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_NO,    KC_NO },   \
-/* 2 */ { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_NO,    KC_NO },   \
-/* 3 */ { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_NO,    KC_NO },   \
-/* 4 */ { KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_##K47, KC_NO,    KC_NO },   \
-/* 5 */ { KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57, KC_NO,    KC_NO },   \
-/* 6 */ { KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_##K67, KC_NO,    KC_NO },   \
-/* 7 */ { KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_NO,    KC_NO,    KC_##K78, KC_##K79 } \
+      { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, KC_##K09 }, \
+      { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, KC_##K19 }, \
+      { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, KC_##K29 }, \
+      { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39 }, \
+      { KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_##K47, KC_##K48, KC_##K49 }, \
+      { KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57, KC_##K58, KC_##K59 }, \
+      { KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_##K67, KC_##K68, KC_##K69 }, \
+      { KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_##K77, KC_##K78, KC_##K79 }, \
+      { KC_##K80, KC_##K81, KC_##K82, KC_##K83, KC_##K84, KC_##K85, KC_##K86, KC_##K87, KC_##K88, KC_##K89 }  \
 }
 
-#define KEYMAP_ANSI150( \
-        K08, K01, K10, K11, K20, K21, K30, K31, K40, K41, K50, K51, K60, K61, \
-        K02, K03, K12, K13, K22, K23, K32, K33, K42, K43, K52, K53, K62, K63, \
-        K04, K14, K15, K24, K25, K34, K35, K44, K45, K54, K55, K64,      K65, \
-        K07,      K16, K17, K26, K27, K36, K37, K46, K47, K56, K57, K66,      \
-        K06, K05, K78,                K70,                     K73, K74, K75  \
-) KEYMAP( \
-        K08, K01, K10, K11, K20, K21, K30, K31, K40, K41, K50, K51, K60, K61, \
-        K02, K03, K12, K13, K22, K23, K32, K33, K42, K43, K52, K53, K62, K63, \
-        K04, K14, K15, K24, K25, K34, K35, K44, K45, K54, K55, K64, NO,  K65, \
-        K07, NO,  K16, K17, K26, K27, K36, K37, K46, K47, K56, K57, K66, NO,  \
-        K06, K05, K78,                K70,                NO,  K73, K74, K75  \
-)
+#ifdef NERD_LAYOUT_60
+  #define KEYMAP_ANSI150( \
+          K08, K01, K10, K11, K20, K21, K30, K31, K40, K41, K50, K51, K60, K61, \
+          K02, K03, K12, K13, K22, K23, K32, K33, K42, K43, K52, K53, K62, K63, \
+          K04, K14, K15, K24, K25, K34, K35, K44, K45, K54, K55, K64,      K65, \
+          K07,      K16, K17, K26, K27, K36, K37, K46, K47, K56, K57, K66,      \
+          K06, K05, K78,                K70,                     K73, K74, K75  \
+  ) KEYMAP( \
+          K08,      NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,   NO,  NO,  NO,  \
+          NO,  K01, K10, K11, K20, K21, K30, K31, K40, K41, K50, K51, K60, K61,  NO,  NO,  NO,  \
+          K02, K03, K12, K13, K22, K23, K32, K33, K42, K43, K52, K53, K62, K63,  NO,  NO,  NO,  \
+          K04, K14, K15, K24, K25, K34, K35, K44, K45, K54, K55, K64, NO,  K65,                 \
+          K07, NO,  K16, K17, K26, K27, K36, K37, K46, K47, K56, K57, K66, NO,        NO,       \
+          K06, K05, K78,                K70,                NO,  K73, K74, K75,  NO,  NO,  NO   \
+  )
+#endif
+
+#ifdef NERD_LAYOUT_80
+  #define KEYMAP_ANSI150( \
+          K08,      K09, K18, K19, K28, K29, K38, K39, K48, K49, K58, K59, K68,  K69, K88, K89, \
+          K00, K01, K10, K11, K20, K21, K30, K31, K40, K41, K50, K51, K60, K61,  K80, K81, K84, \
+          K02, K03, K12, K13, K22, K23, K32, K33, K42, K43, K52, K53, K62, K63,  K82, K83, K85, \
+          K04, K14, K15, K24, K25, K34, K35, K44, K45, K54, K55, K64,      K65,                 \
+          K07,      K16, K17, K26, K27, K36, K37, K46, K47, K56, K57, K66,            K86,      \
+          K06, K05, K78,                K70,                     K73, K74, K75,  K76, K77, K87  \
+  ) KEYMAP( \
+          K08,      K09, K18, K19, K28, K29, K38, K39, K48, K49, K58, K59, K68,  K69, K88, K89, \
+          K00, K01, K10, K11, K20, K21, K30, K31, K40, K41, K50, K51, K60, K61,  K80, K81, K84, \
+          K02, K03, K12, K13, K22, K23, K32, K33, K42, K43, K52, K53, K62, K63,  K82, K83, K85, \
+          K04, K14, K15, K24, K25, K34, K35, K44, K45, K54, K55, K64, NO,  K65,                 \
+          K07, NO,  K16, K17, K26, K27, K36, K37, K46, K47, K56, K57, K66, NO,        K86,      \
+          K06, K05, K78,                K70,                NO,  K73, K74, K75,  K76, K77, K87  \
+  )
+#endif
 
 #endif // KEYMAP_COMMON_H
diff --git a/keyboard/nerd/led.c b/keyboard/nerd/led.c
deleted file mode 100644
index 7d9ce6d878..0000000000
--- a/keyboard/nerd/led.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2014 Ralf Schmitt <ralf@bunkertor.net>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <avr/io.h>
-#include "stdint.h"
-#include "led.h"
-
-void led_set(uint8_t usb_led)
-{
-    (usb_led & (1<<USB_LED_CAPS_LOCK)) ? backlight_caps_enable() : backlight_caps_disable();
-}
diff --git a/keyboard/nerd/matrix.c b/keyboard/nerd/matrix.c
index f0ffe772da..eb5a9ab4f1 100644
--- a/keyboard/nerd/matrix.c
+++ b/keyboard/nerd/matrix.c
@@ -142,19 +142,20 @@ static void init_inputs(void)
     DDRE &= ~0b01000000; // PE6 (Col 0)
     DDRB &= ~0b00001111; // PB0 (Col 1), PB1 (Col 2), PB2 (Col 3), PB3 (Col 4)
     DDRF &= ~0b00000001; // PF0 (Col 5)
-    DDRD &= ~0b00100001; // PD0 (Col 6), PD5 (Col 7)
+    DDRD &= ~0b00100011; // PD0 (Col 6), PD1 (Col 8 TKL), PD5 (Col 7)
 }
 
 static uint16_t read_inputs(void)
 {
-    return (PINE&(1<<6) ? 0 : (1<<0)) |  // PE6 (Row 0)
-           (PINB&(1<<0) ? 0 : (1<<1)) |  // PB0 (Row 1)
-           (PINB&(1<<1) ? 0 : (1<<2)) |  // PB1 (Row 2)
-           (PINB&(1<<2) ? 0 : (1<<3)) |  // PB2 (Row 3)
-           (PINB&(1<<3) ? 0 : (1<<4)) |  // PB3 (Row 4)
-           (PINF&(1<<0) ? 0 : (1<<5)) |  // PF0 (Row 5)
-           (PIND&(1<<0) ? 0 : (1<<6)) |  // PD0 (Row 6)
-           (PIND&(1<<5) ? 0 : (1<<7));   // PD5 (Row 7)
+    return (PINE&(1<<6) ? 0 : (1<<0)) |  // PE6 (Col 0)
+           (PINB&(1<<0) ? 0 : (1<<1)) |  // PB0 (Col 1)
+           (PINB&(1<<1) ? 0 : (1<<2)) |  // PB1 (Col 2)
+           (PINB&(1<<2) ? 0 : (1<<3)) |  // PB2 (Col 3)
+           (PINB&(1<<3) ? 0 : (1<<4)) |  // PB3 (Col 4)
+           (PINF&(1<<0) ? 0 : (1<<5)) |  // PF0 (Col 5)
+           (PIND&(1<<0) ? 0 : (1<<6)) |  // PD0 (Col 6)
+           (PIND&(1<<5) ? 0 : (1<<7)) |  // PD5 (Col 7)
+           (PIND&(1<<1) ? 0 : (1<<8));   // PD1 (Col 8 TKL)
 }
 
 static void reset_inputs(void)
@@ -162,7 +163,7 @@ static void reset_inputs(void)
     PORTE |= 0b01000000; // PE6 (Col 0)
     PORTB |= 0b00001111; // PB0 (Col 1), PB1 (Col 2), PB2 (Col 3), PB3 (Col 4)
     PORTF |= 0b00000001; // PF0 (Col 5)
-    PORTD |= 0b00100001; // PD0 (Col 6), PD5 (Col 7)
+    PORTD |= 0b00100011; // PD0 (Col 6), PD1 (Col 8 TKL), PD5 (Col 7)
 }
 
 static void init_outputs(void)