Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

10 files changed, 0 insertions, 750 deletions

diff --git a/keyboard/nerd/Makefile b/keyboard/nerd/Makefile
deleted file mode 100644
index 30149345ce..0000000000
--- a/keyboard/nerd/Makefile
+++ /dev/null
@@ -1,126 +0,0 @@
-#----------------------------------------------------------------------------
-# On command line:
-#
-# make all = Make software.
-#
-# make clean = Clean out built project files.
-#
-# make coff = Convert ELF to AVR COFF.
-#
-# make extcoff = Convert ELF to AVR Extended COFF.
-#
-# make program = Download the hex file to the device.
-#                Please customize your programmer settings(PROGRAM_CMD)
-#
-# make teensy = Download the hex file to the device, using teensy_loader_cli.
-#               (must have teensy_loader_cli installed).
-#
-# make dfu = Download the hex file to the device, using dfu-programmer (must
-#            have dfu-programmer installed).
-#
-# make flip = Download the hex file to the device, using Atmel FLIP (must
-#             have Atmel FLIP installed).
-#
-# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
-#               (must have dfu-programmer installed).
-#
-# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
-#                (must have Atmel FLIP installed).
-#
-# make debug = Start either simulavr or avarice as specified for debugging, 
-#              with avr-gdb or avr-insight as the front end for debugging.
-#
-# make filename.s = Just compile filename.c into the assembler code only.
-#
-# make filename.i = Create a preprocessed source file for use in submitting
-#                   bug reports to the GCC project.
-#
-# To rebuild project do "make clean" then "make all".
-#----------------------------------------------------------------------------
-
-# Target file name (without extension).
-TARGET = nerd_lufa
-
-# Directory common source filess exist
-TMK_DIR = ../../tmk_core
-
-# Directory keyboard dependent files exist
-TARGET_DIR = .
-
-# project specific files
-SRC =	keymap_common.c \
-	matrix.c \
-	backlight.c
-
-ifdef LAYOUT
-   OPT_DEFS += -DNERD_LAYOUT_$(LAYOUT)
-endif
-
-ifdef KEYMAP
-    SRC := keymap_$(LAYOUT)_$(KEYMAP).c $(SRC)
-endif
-
-CONFIG_H = config.h
-
-# MCU name
-MCU = atmega32u4
-
-# Processor frequency.
-#     This will define a symbol, F_CPU, in all source code files equal to the
-#     processor frequency in Hz. You can then use this symbol in your source code to
-#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-#     automatically to create a 32-bit value in your source code.
-#
-#     This will be an integer division of F_USB below, as it is sourced by
-#     F_USB after it has run through any CPU prescalers. Note that this value
-#     does not *change* the processor frequency - it should merely be updated to
-#     reflect the processor speed set externally so that the code can use accurate
-#     software delays.
-F_CPU = 8000000
-
-#
-# LUFA specific
-#
-# Target architecture (see library "Board Types" documentation).
-ARCH = AVR8
-
-# Input clock frequency.
-#     This will define a symbol, F_USB, in all source code files equal to the
-#     input clock frequency (before any prescaling is performed) in Hz. This value may
-#     differ from F_CPU if prescaling is used on the latter, and is required as the
-#     raw input clock is fed directly to the PLL sections of the AVR for high speed
-#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
-#     at the end, this will be done automatically to create a 32-bit value in your
-#     source code.
-#
-#     If no clock division is performed on the input clock inside the AVR (via the
-#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_USB = $(F_CPU)
-
-# Boot Section Size in *bytes*
-#   Teensy halfKay   512
-#   Teensy++ halfKay 1024
-#   Atmel DFU loader 4096
-#   LUFA bootloader  4096
-#   USBaspLoader     2048
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
-
-# Build Options
-#   comment out to disable the options.
-#
-BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
-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
-#SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
-#NKRO_ENABLE = yes	# USB Nkey Rollover - not yet supported in LUFA
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-
-# Search Path
-VPATH += $(TARGET_DIR)
-VPATH += $(TMK_DIR)
-
-include $(TMK_DIR)/protocol/lufa.mk
-include $(TMK_DIR)/common.mk
-include $(TMK_DIR)/rules.mk
diff --git a/keyboard/nerd/README.md b/keyboard/nerd/README.md
deleted file mode 100644
index 5b4acd3ba9..0000000000
--- a/keyboard/nerd/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-NerD keyboard firmware
-========================
-
-Korean Keyboard designed by GON.
-
-*Note that this is not the official firmware*
-
-
-Hardware revision
------------------
-
-This firmware was developed and tested for NerD pcb version 1.61 and 2.0.
-
-
-Supported features
-------------------
-
-* All layout options are supported
-* All leds are supported
-* 60% and 80% (TKL) pcbs are supported
-
-
-Changing Bootloader
--------------------
-
-You can't simply just upload this firmware to a new NerD board because the original
-bootloader won't accept DFU connections.
-
-You can change the bootloader of the keyboard with an ISP programmer of your choice.
-The bootloader pins are easy to access on the NerD pcb.
-
-*Be aware that after changing the bootloader the official configuration software
-won't work anymore and you'll lose your warrenty. GON won't provide any support for this firmware.*
-
-
-Build
------
-
-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
-------------------
-
-You can jump to bootloader by software if you have a macro defined for this in your keymap. The
-default command is (LSFT+RSFT+PAUS) to access the bootloader by software jump.
diff --git a/keyboard/nerd/backlight.c b/keyboard/nerd/backlight.c
deleted file mode 100644
index 2dc85c7532..0000000000
--- a/keyboard/nerd/backlight.c
+++ /dev/null
@@ -1,81 +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 "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();
-    (level & BACKLIGHT_PCB) ? backlight_pcb_enable() : backlight_pcb_disable();
-}
-
-void backlight_switch_enable()
-{
-    PORTB |= 0b10000000;
-}
-
-void backlight_switch_disable()
-{
-    PORTB &= ~0b10000000;
-}
-
-void backlight_switch_invert()
-{
-    PORTB ^= 0b10000000;
-}
-
-void backlight_pcb_enable()
-{
-    PORTB |= 0b01000000;
-}
-
-void backlight_pcb_disable()
-{
-    PORTB &= ~0b01000000;
-}
-
-void backlight_pcb_invert()
-{
-    PORTB ^= 0b01000000;
-}
-
-void backlight_caps_enable()
-{
-    PORTB |= 0b00100000;
-}
-
-void backlight_caps_disable()
-{
-    PORTB &= ~0b00100000;
-}
-
-void backlight_caps_invert()
-{
-    PORTB ^= 0b00100000;
-}
diff --git a/keyboard/nerd/backlight.h b/keyboard/nerd/backlight.h
deleted file mode 100644
index 4c75d9db65..0000000000
--- a/keyboard/nerd/backlight.h
+++ /dev/null
@@ -1,40 +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/>.
-*/
-
-#ifndef BACKLIGHT_H
-#define BACKLIGHT_H
-
-enum backlight_level {
-    BACKLIGHT_SWITCH = 0b0000001,
-    BACKLIGHT_PCB    = 0b0000010,
-};
-
-void backlight_init_ports(void);
-
-void backlight_switch_invert(void);
-void backlight_switch_enable(void);
-void backlight_switch_disable(void);
-
-void backlight_pcb_invert(void);
-void backlight_pcb_enable(void);
-void backlight_pcb_disable(void);
-
-void backlight_caps_invert(void);
-void backlight_caps_enable(void);
-void backlight_caps_disable(void);
-
-#endif // BACKLIGHT_H
diff --git a/keyboard/nerd/config.h b/keyboard/nerd/config.h
deleted file mode 100644
index ac2e6989d6..0000000000
--- a/keyboard/nerd/config.h
+++ /dev/null
@@ -1,49 +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/>.
-*/
-#ifndef CONFIG_H
-#define CONFIG_H
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    GON
-#define PRODUCT         NerD
-#define DESCRIPTION     t.m.k. keyboard firmware for NerD
-
-/* key matrix size */
-#define MATRIX_ROWS 9
-#define MATRIX_COLS 10
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 2
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* key combination for command */
-#define IS_COMMAND() ( \
-    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
-
-#endif
diff --git a/keyboard/nerd/keymap_60_ansi150.c b/keyboard/nerd/keymap_60_ansi150.c
deleted file mode 100644
index f85836ab55..0000000000
--- a/keyboard/nerd/keymap_60_ansi150.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#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,PAUS,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
deleted file mode 100644
index 72a7d83c9b..0000000000
--- a/keyboard/nerd/keymap_80_ansi150.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#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,PAUS,  \
-                   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_common.c b/keyboard/nerd/keymap_common.c
deleted file mode 100644
index 29ec4e53ef..0000000000
--- a/keyboard/nerd/keymap_common.c
+++ /dev/null
@@ -1,29 +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 "keymap_common.h"
-
-/* translates key to keycode */
-uint8_t keymap_key_to_keycode(uint8_t layer, keypos_t key)
-{
-    return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
-}
-
-/* translates Fn keycode to action */
-action_t keymap_fn_to_action(uint8_t keycode)
-{
-    return (action_t){ .code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]) };
-}
diff --git a/keyboard/nerd/keymap_common.h b/keyboard/nerd/keymap_common.h
deleted file mode 100644
index e116635918..0000000000
--- a/keyboard/nerd/keymap_common.h
+++ /dev/null
@@ -1,89 +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/>.
-*/
-
-#ifndef KEYMAP_COMMON_H
-#define KEYMAP_COMMON_H
-
-#include <stdint.h>
-#include <avr/pgmspace.h>
-#include "keycode.h"
-#include "action.h"
-#include "action_macro.h"
-#include "report.h"
-#include "host.h"
-#include "print.h"
-#include "debug.h"
-#include "keymap.h"
-
-extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-extern const uint16_t fn_actions[];
-
-#define 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, 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  \
-) { \
-      { 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 }  \
-}
-
-#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/matrix.c b/keyboard/nerd/matrix.c
deleted file mode 100644
index eb5a9ab4f1..0000000000
--- a/keyboard/nerd/matrix.c
+++ /dev/null
@@ -1,221 +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 <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
-#include <util/delay.h>
-#include "print.h"
-#include "debug.h"
-#include "util.h"
-#include "matrix.h"
-#include "backlight.h"
-
-
-#ifndef DEBOUNCE
-#   define DEBOUNCE 5
-#endif
-static uint8_t debouncing = DEBOUNCE;
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-static matrix_row_t matrix_debouncing[MATRIX_ROWS];
-
-static uint16_t read_inputs(void);
-static void init_inputs(void);
-static void init_outputs(void);
-static void reset_inputs(void);
-static void reset_outputs(void);
-static void select_output(uint8_t col);
-
-inline
-uint8_t matrix_rows(void)
-{
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void)
-{
-    return MATRIX_COLS;
-}
-
-void matrix_init(void)
-{
-    backlight_init_ports();
-    init_inputs();
-    init_outputs();
-
-    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
-        matrix[i] = 0;
-        matrix_debouncing[i] = 0;
-    }
-}
-
-uint8_t matrix_scan(void)
-{
-    for (uint8_t col = 0; col < MATRIX_COLS; col++) {
-        reset_inputs();
-        reset_outputs();
-        select_output(col);
-        _delay_us(3);
-        uint16_t rows = read_inputs();
-        for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-            bool prev_bit = matrix_debouncing[row] & ((matrix_row_t)1<<col);
-            bool curr_bit = rows & (1<<row);
-            if (prev_bit != curr_bit) {
-                matrix_debouncing[row] ^= ((matrix_row_t)1<<col);
-                if (debouncing) {
-                    dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
-                }
-                debouncing = DEBOUNCE;
-            }
-        }
-    }
-
-    if (debouncing) {
-        if (--debouncing) {
-            _delay_ms(1);
-        } else {
-            for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-                matrix[i] = matrix_debouncing[i];
-            }
-        }
-    }
-
-    return 1;
-}
-
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print("\nr/c 0123456789ABCDEF\n");
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
-        print("\n");
-    }
-}
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
-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 &= ~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 (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)
-{
-    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 |= 0b00100011; // PD0 (Col 6), PD1 (Col 8 TKL), PD5 (Col 7)
-}
-
-static void init_outputs(void)
-{
-    DDRB |= 0b00010000; // PB4 (Row 0)
-    DDRE |= 0b00000100; // PE2 (Row 1)
-    DDRF |= 0b11110010; // PF4 (Row 2), PF7 (Row 3), PF1 (Row 4), PF6 (Row 5), PF5 (Row 7)
-    DDRC |= 0b11000000; // PC6 (Row 6), PC7 (Row 9)
-    DDRD |= 0b10000000; // PD7 (Row 8)
-}
-
-static void reset_outputs(void)
-{
-    PORTB |= 0b00010000; // PB4 (Row 0)
-    PORTE |= 0b00000100; // PE2 (Row 1)
-    PORTF |= 0b11110010; // PF4 (Row 2), PF7 (Row 3), PF1 (Row 4), PF6 (Row 5), PF5 (Row 7)
-    PORTC |= 0b11000000; // PC6 (Row 6), PC7 (Row 9)
-    PORTD |= 0b10000000; // PD7 (Row 8)
-}
-
-static void select_output(uint8_t col)
-{
-    switch (col) {
-        case 0:
-            PORTB &= ~(1<<4);
-            break;
-        case 1:
-            PORTE &= ~(1<<2);
-            break;
-        case 2:
-            PORTF &= ~(1<<4);
-            break;
-        case 3:
-            PORTF &= ~(1<<7);
-            break;
-        case 4:
-            PORTF &= ~(1<<1);
-            break;
-        case 5:
-            PORTF &= ~(1<<6);
-            break;
-        case 6:
-            PORTC &= ~(1<<6);
-            break;
-        case 7:
-            PORTF &= ~(1<<5);
-            break;
-        case 8:
-            PORTD &= ~(1<<7);
-            break;
-        case 9:
-            PORTC &= ~(1<<7);
-            break;
-    }
-}