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

9 files changed, 829 insertions, 0 deletions

diff --git a/keyboards/xd87/config.h b/keyboards/xd87/config.h
new file mode 100644
index 0000000000..3682af7409
--- /dev/null
+++ b/keyboards/xd87/config.h
@@ -0,0 +1,227 @@
+/*
+Copyright 2018 Alexander Fougner <fougner89 at gmail.com>
+
+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/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x0000
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    KP Republic
+#define PRODUCT         XD87 TKL
+#define DESCRIPTION     KP Republic XD87
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+
+
+#define MATRIX_ROW_PINS { D1, B0, B1, C7, D3, D5 }
+
+#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B5, B6, C6, D4, D6, D7, B4, B2, B3, D2 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
+#define DIODE_DIRECTION COL2ROW
+
+#define BACKLIGHT_PIN D0
+// #define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 3
+
+// #define RGB_DI_PIN E2
+// #ifdef RGB_DI_PIN
+// #define RGBLIGHT_ANIMATIONS
+// #define RGBLED_NUM 16
+// #define RGBLIGHT_HUE_STEP 8
+// #define RGBLIGHT_SAT_STEP 8
+// #define RGBLIGHT_VAL_STEP 8
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCING_DELAY 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
+)
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP1          H
+//#define MAGIC_KEY_HELP2          SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0_ALT1    ESC
+//#define MAGIC_KEY_LAYER0_ALT2    GRAVE
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     PAUSE
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 1
+
+/*
+ * HD44780 LCD Display Configuration
+ */
+/*
+#define LCD_LINES           2     //< number of visible lines of the display
+#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
+
+#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
+
+#if LCD_IO_MODE
+#define LCD_PORT         PORTB        //< port for the LCD lines
+#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
+#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
+#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
+#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
+#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
+#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
+#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
+#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
+#define LCD_RS_PORT      LCD_PORT     //< port for RS line
+#define LCD_RS_PIN       3            //< pin  for RS line
+#define LCD_RW_PORT      LCD_PORT     //< port for RW line
+#define LCD_RW_PIN       2            //< pin  for RW line
+#define LCD_E_PORT       LCD_PORT     //< port for Enable line
+#define LCD_E_PIN        1            //< pin  for Enable line
+#endif
+*/
+
diff --git a/keyboards/xd87/info.json b/keyboards/xd87/info.json
new file mode 100644
index 0000000000..3837358cd3
--- /dev/null
+++ b/keyboards/xd87/info.json
@@ -0,0 +1,291 @@
+{
+  "keyboard_name": "XD87",
+  "url": "",
+  "maintainer": "qmk",
+  "width": 18.25,
+  "height": 7.25,
+  "layouts": {
+    "LAYOUT_all": {
+      "layout": [
+        { "label": "K00", "x": 0, "y": 0 },
+        { "label": "K01", "x": 1, "y": 0 },
+        { "label": "K02", "x": 2, "y": 0 },
+        { "label": "K03", "x": 3, "y": 0 },
+        { "label": "K04", "x": 4, "y": 0 },
+        { "label": "K05", "x": 5, "y": 0 },
+        { "label": "K06", "x": 6.5, "y": 0 },
+        { "label": "K07", "x": 7.5, "y": 0 },
+        { "label": "K08", "x": 8.5, "y": 0 },
+        { "label": "K09", "x": 9.5, "y": 0 },
+        { "label": "K0A", "x": 11, "y": 0 },
+        { "label": "K0B", "x": 12, "y": 0 },
+        { "label": "K0C", "x": 13, "y": 0 },
+        { "label": "K0D", "x": 14, "y": 0 },
+        { "label": "K0E", "x": 15.25, "y": 0 },
+        { "label": "K0F", "x": 16.25, "y": 0 },
+        { "label": "K0G", "x": 17.25, "y": 0 },
+        { "label": "K10", "x": 0, "y": 1.25 },
+        { "label": "K11", "x": 1, "y": 1.25 },
+        { "label": "K12", "x": 2, "y": 1.25 },
+        { "label": "K13", "x": 3, "y": 1.25 },
+        { "label": "K14", "x": 4, "y": 1.25 },
+        { "label": "K15", "x": 5, "y": 1.25 },
+        { "label": "K16", "x": 6, "y": 1.25 },
+        { "label": "K17", "x": 7, "y": 1.25 },
+        { "label": "K18", "x": 8, "y": 1.25 },
+        { "label": "K19", "x": 9, "y": 1.25 },
+        { "label": "K1A", "x": 10, "y": 1.25 },
+        { "label": "K1B", "x": 11, "y": 1.25 },
+        { "label": "K1C", "x": 12, "y": 1.25 },
+        { "label": "K1D", "x": 13, "y": 1.25 },
+        { "label": "K3E", "x": 14, "y": 1.25 },
+        { "label": "K1E", "x": 15.25, "y": 1.25 },
+        { "label": "K1F", "x": 16.25, "y": 1.25 },
+        { "label": "K1G", "x": 17.25, "y": 1.25 },
+        { "label": "K20", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "K21", "x": 1.5, "y": 2.25 },
+        { "label": "K22", "x": 2.5, "y": 2.25 },
+        { "label": "K23", "x": 3.5, "y": 2.25 },
+        { "label": "K24", "x": 4.5, "y": 2.25 },
+        { "label": "K25", "x": 5.5, "y": 2.25 },
+        { "label": "K26", "x": 6.5, "y": 2.25 },
+        { "label": "K27", "x": 7.5, "y": 2.25 },
+        { "label": "K28", "x": 8.5, "y": 2.25 },
+        { "label": "K29", "x": 9.5, "y": 2.25 },
+        { "label": "K2A", "x": 10.5, "y": 2.25 },
+        { "label": "K2B", "x": 11.5, "y": 2.25 },
+        { "label": "K2C", "x": 12.5, "y": 2.25 },
+        { "label": "K2D", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "label": "K2E", "x": 15.25, "y": 2.25 },
+        { "label": "K2F", "x": 16.25, "y": 2.25 },
+        { "label": "K2G", "x": 17.25, "y": 2.25 },
+        { "label": "K30", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "K31", "x": 1.75, "y": 3.25 },
+        { "label": "K32", "x": 2.75, "y": 3.25 },
+        { "label": "K33", "x": 3.75, "y": 3.25 },
+        { "label": "K34", "x": 4.75, "y": 3.25 },
+        { "label": "K35", "x": 5.75, "y": 3.25 },
+        { "label": "K36", "x": 6.75, "y": 3.25 },
+        { "label": "K37", "x": 7.75, "y": 3.25 },
+        { "label": "K38", "x": 8.75, "y": 3.25 },
+        { "label": "K39", "x": 9.75, "y": 3.25 },
+        { "label": "K3A", "x": 10.75, "y": 3.25 },
+        { "label": "K3B", "x": 11.75, "y": 3.25 },
+        { "label": "K3C", "x": 12.75, "y": 3.25 },
+        { "label": "K3D", "x": 13.75, "y": 3.25, "w": 1.25 },
+        { "label": "K40", "x": 0, "y": 4.25, "w": 1.25 },
+        { "label": "K41", "x": 1.25, "y": 4.25 },
+        { "label": "K42", "x": 2.25, "y": 4.25 },
+        { "label": "K43", "x": 3.25, "y": 4.25 },
+        { "label": "K44", "x": 4.25, "y": 4.25 },
+        { "label": "K45", "x": 5.25, "y": 4.25 },
+        { "label": "K46", "x": 6.25, "y": 4.25 },
+        { "label": "K47", "x": 7.25, "y": 4.25 },
+        { "label": "K48", "x": 8.25, "y": 4.25 },
+        { "label": "K49", "x": 9.25, "y": 4.25 },
+        { "label": "K4A", "x": 10.25, "y": 4.25 },
+        { "label": "K4B", "x": 11.25, "y": 4.25 },
+        { "label": "K4C", "x": 12.25, "y": 4.25, "w": 1.75 },
+        { "label": "K4D", "x": 14, "y": 4.25 },
+        { "label": "K4E", "x": 15.25, "y": 4.25 },
+        { "label": "K4F", "x": 16.25, "y": 4.25 },
+        { "label": "K4G", "x": 17.25, "y": 4.25 },
+        { "label": "K50", "x": 0, "y": 5.25, "w": 1.5 },
+        { "label": "K51", "x": 1.5, "y": 5.25 },
+        { "label": "K52", "x": 2.5, "y": 5.25, "w": 1.5 },
+        { "label": "K55", "x": 4, "y": 5.25, "w": 3 },
+        { "label": "K58", "x": 7, "y": 5.25, "w": 3 },
+        { "label": "K5A", "x": 10, "y": 5.25, "w": 1.25 },
+        { "label": "K5B", "x": 11.25, "y": 5.25, "w": 1.25 },
+        { "label": "K5C", "x": 12.5, "y": 5.25, "w": 1.25 },
+        { "label": "K5D", "x": 13.75, "y": 5.25, "w": 1.25 },
+        { "label": "K5E", "x": 15.25, "y": 5.25 },
+        { "label": "K5F", "x": 16.25, "y": 5.25 },
+        { "label": "K5G", "x": 17.25, "y": 5.25 }
+      ]
+    },
+    "LAYOUT_tkl_ansi": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 2, "y": 0 },
+        { "label": "F2", "x": 3, "y": 0 },
+        { "label": "F3", "x": 4, "y": 0 },
+        { "label": "F4", "x": 5, "y": 0 },
+        { "label": "F5", "x": 6.5, "y": 0 },
+        { "label": "F6", "x": 7.5, "y": 0 },
+        { "label": "F7", "x": 8.5, "y": 0 },
+        { "label": "F8", "x": 9.5, "y": 0 },
+        { "label": "F9", "x": 11, "y": 0 },
+        { "label": "F10", "x": 12, "y": 0 },
+        { "label": "F11", "x": 13, "y": 0 },
+        { "label": "F12", "x": 14, "y": 0 },
+        { "label": "Print Screen", "x": 15.25, "y": 0 },
+        { "label": "Scroll Lock", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
+        { "label": "`", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PgUp", "x": 17.25, "y": 1.25 },
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PgDn", "x": 17.25, "y": 2.25 },
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+        { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
+        { "label": "Up", "x": 16.25, "y": 4.25 },
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
+        { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
+        { "label": "Space", "x": 3.75, "y": 5.25, "w": 6.25 },
+        { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
+        { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
+        { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
+        { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
+        { "label": "Left", "x": 15.25, "y": 5.25 },
+        { "label": "Down", "x": 16.25, "y": 5.25 },
+        { "label": "Right", "x": 17.25, "y": 5.25 }
+      ]
+    },
+    "LAYOUT_tkl_iso": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 2, "y": 0 },
+        { "label": "F2", "x": 3, "y": 0 },
+        { "label": "F3", "x": 4, "y": 0 },
+        { "label": "F4", "x": 5, "y": 0 },
+        { "label": "F5", "x": 6.5, "y": 0 },
+        { "label": "F6", "x": 7.5, "y": 0 },
+        { "label": "F7", "x": 8.5, "y": 0 },
+        { "label": "F8", "x": 9.5, "y": 0 },
+        { "label": "F9", "x": 11, "y": 0 },
+        { "label": "F10", "x": 12, "y": 0 },
+        { "label": "F11", "x": 13, "y": 0 },
+        { "label": "F12", "x": 14, "y": 0 },
+        { "label": "Print Screen", "x": 15.25, "y": 0 },
+        { "label": "Scroll Lock", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
+        { "label": "`", "x": 0, "y": 1.25 },
+        { "label": "1", "x": 1, "y": 1.25 },
+        { "label": "2", "x": 2, "y": 1.25 },
+        { "label": "3", "x": 3, "y": 1.25 },
+        { "label": "4", "x": 4, "y": 1.25 },
+        { "label": "5", "x": 5, "y": 1.25 },
+        { "label": "6", "x": 6, "y": 1.25 },
+        { "label": "7", "x": 7, "y": 1.25 },
+        { "label": "8", "x": 8, "y": 1.25 },
+        { "label": "9", "x": 9, "y": 1.25 },
+        { "label": "0", "x": 10, "y": 1.25 },
+        { "label": "-", "x": 11, "y": 1.25 },
+        { "label": "=", "x": 12, "y": 1.25 },
+        { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
+        { "label": "Insert", "x": 15.25, "y": 1.25 },
+        { "label": "Home", "x": 16.25, "y": 1.25 },
+        { "label": "PgUp", "x": 17.25, "y": 1.25 },
+        { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.25 },
+        { "label": "W", "x": 2.5, "y": 2.25 },
+        { "label": "E", "x": 3.5, "y": 2.25 },
+        { "label": "R", "x": 4.5, "y": 2.25 },
+        { "label": "T", "x": 5.5, "y": 2.25 },
+        { "label": "Y", "x": 6.5, "y": 2.25 },
+        { "label": "U", "x": 7.5, "y": 2.25 },
+        { "label": "I", "x": 8.5, "y": 2.25 },
+        { "label": "O", "x": 9.5, "y": 2.25 },
+        { "label": "P", "x": 10.5, "y": 2.25 },
+        { "label": "[", "x": 11.5, "y": 2.25 },
+        { "label": "]", "x": 12.5, "y": 2.25 },
+        { "label": "Delete", "x": 15.25, "y": 2.25 },
+        { "label": "End", "x": 16.25, "y": 2.25 },
+        { "label": "PgDn", "x": 17.25, "y": 2.25 },
+        { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.25 },
+        { "label": "S", "x": 2.75, "y": 3.25 },
+        { "label": "D", "x": 3.75, "y": 3.25 },
+        { "label": "F", "x": 4.75, "y": 3.25 },
+        { "label": "G", "x": 5.75, "y": 3.25 },
+        { "label": "H", "x": 6.75, "y": 3.25 },
+        { "label": "J", "x": 7.75, "y": 3.25 },
+        { "label": "K", "x": 8.75, "y": 3.25 },
+        { "label": "L", "x": 9.75, "y": 3.25 },
+        { "label": ";", "x": 10.75, "y": 3.25 },
+        { "label": "'", "x": 11.75, "y": 3.25 },
+        { "label": "#", "x": 12.75, "y": 3.25 },
+        { "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2 },
+        { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 },
+        { "label": "\\", "x": 1.25, "y": 4.25 },
+        { "label": "Z", "x": 2.25, "y": 4.25 },
+        { "label": "X", "x": 3.25, "y": 4.25 },
+        { "label": "C", "x": 4.25, "y": 4.25 },
+        { "label": "V", "x": 5.25, "y": 4.25 },
+        { "label": "B", "x": 6.25, "y": 4.25 },
+        { "label": "N", "x": 7.25, "y": 4.25 },
+        { "label": "M", "x": 8.25, "y": 4.25 },
+        { "label": ",", "x": 9.25, "y": 4.25 },
+        { "label": ".", "x": 10.25, "y": 4.25 },
+        { "label": "/", "x": 11.25, "y": 4.25 },
+        { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
+        { "label": "Up", "x": 16.25, "y": 4.25 },
+        { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
+        { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
+        { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
+        { "label": "Space", "x": 3.75, "y": 5.25, "w": 6.25 },
+        { "label": "AltGr", "x": 10, "y": 5.25, "w": 1.25 },
+        { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
+        { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
+        { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
+        { "label": "Left", "x": 15.25, "y": 5.25 },
+        { "label": "Down", "x": 16.25, "y": 5.25 },
+        { "label": "Right", "x": 17.25, "y": 5.25 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/xd87/keymaps/default/config.h b/keyboards/xd87/keymaps/default/config.h
new file mode 100644
index 0000000000..ed56340c39
--- /dev/null
+++ b/keyboards/xd87/keymaps/default/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2018 Alexander Fougner <fougner89 at gmail.com>
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+// place overrides here
diff --git a/keyboards/xd87/keymaps/default/keymap.c b/keyboards/xd87/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b31db9b577
--- /dev/null
+++ b/keyboards/xd87/keymaps/default/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2018 Alexander Fougner <fougner89 at gmail.com>
+ *
+ * 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 QMK_KEYBOARD_H
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+  QMKBEST = SAFE_RANGE,
+  QMKURL
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_tkl_iso(\
+      KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS, \
+      KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP, \
+      KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,            KC_DEL,  KC_END,  KC_PGDN, \
+      KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT, KC_NUHS, KC_ENT, \
+      KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,            KC_UP, \
+      KC_LCTL,KC_LGUI,KC_LALT,                KC_SPC,                                 KC_RALT,KC_RGUI, KC_APP,  KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT  )
+};
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case QMKBEST:
+      if (record->event.pressed) {
+        // when keycode QMKBEST is pressed
+        SEND_STRING("QMK is the best thing ever!");
+      } else {
+        // when keycode QMKBEST is released
+      }
+      break;
+    case QMKURL:
+      if (record->event.pressed) {
+        // when keycode QMKURL is pressed
+        SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
+      } else {
+        // when keycode QMKURL is released
+      }
+      break;
+  }
+  return true;
+}
+
+void matrix_init_user(void) {
+
+}
+
+void matrix_scan_user(void) {
+
+}
+
+void led_set_user(uint8_t usb_led) {
+
+}
diff --git a/keyboards/xd87/keymaps/default/readme.md b/keyboards/xd87/keymaps/default/readme.md
new file mode 100644
index 0000000000..41baff9435
--- /dev/null
+++ b/keyboards/xd87/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for xd87
\ No newline at end of file
diff --git a/keyboards/xd87/readme.md b/keyboards/xd87/readme.md
new file mode 100644
index 0000000000..0b9389740d
--- /dev/null
+++ b/keyboards/xd87/readme.md
@@ -0,0 +1,26 @@
+# XD87
+
+![XD87](https://i.imgur.com/qVyOies.jpg)
+
+
+- Keyboard Maintainer: [Alexander Fougner](https://github.com/fougner)  
+- Hardware Supported: XD87 PCB v1.1  
+- Hardware Availability:  
+	- [KPrepublic.com](https://kprepublic.com/products/xd87-xd87-xd80-custom-mechanical-keyboard-kit80-supports-tkg-tools-support-underglow-rgb-pcb-programmed-gh80-kle)
+	- [AliExpress](https://www.aliexpress.com/item/xd87-XD87-XD80-Custom-Mechanical-Keyboard-Kit80-Supports-TKG-TOOLS-Support-Underglow-RGB-PCB-programmed-gh80/32892540743.html)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make xd87:default
+
+It also supports the tkl_ansi and tkl_iso community layouts:
+
+	  # Build firmware with ANSI layout
+	  make xd87:default_tkl_ansi
+	  # Build firmware with ISO layout
+	  make xd87:default_tkl_iso
+
+
+The keyboard can be reset to bootloader by using bootmagic (space+b by default) or short out the small connector between the Delete and End keys.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
\ No newline at end of file
diff --git a/keyboards/xd87/rules.mk b/keyboards/xd87/rules.mk
new file mode 100644
index 0000000000..39540e701d
--- /dev/null
+++ b/keyboards/xd87/rules.mk
@@ -0,0 +1,84 @@
+# MCU name
+#MCU = at90usb1286
+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 = 16000000
+
+
+#
+# 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)
+
+# Interrupt driven control endpoint task(+60)
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   atmega32a    bootloadHID
+BOOTLOADER = atmel-dfu
+
+
+# If you don't know the bootloader type, then you can specify the
+# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
+#   Teensy halfKay      512
+#   Teensy++ halfKay    1024
+#   Atmel DFU loader    4096
+#   LUFA bootloader     4096
+#   USBaspLoader        2048
+# OPT_DEFS += -DBOOTLOADER_SIZE=4096
+
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no        # 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
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality on B7 by default
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no           # Audio output on port C6
+FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
+HD44780_ENABLE = no     # Enable support for HD44780 based LCDs (+400)
+
+# Supported layouts
+LAYOUTS = tkl_ansi tkl_iso
diff --git a/keyboards/xd87/xd87.c b/keyboards/xd87/xd87.c
new file mode 100644
index 0000000000..da07c71d88
--- /dev/null
+++ b/keyboards/xd87/xd87.c
@@ -0,0 +1,43 @@
+/* Copyright 2018 Alexander Fougner <fougner89 at gmail.com>
+ *
+ * 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 "xd87.h"
+
+void matrix_init_kb(void) {
+  // put your keyboard start-up code here
+  // runs once when the firmware starts up
+
+  matrix_init_user();
+}
+
+void matrix_scan_kb(void) {
+  // put your looping keyboard code here
+  // runs every cycle (a lot)
+
+  matrix_scan_user();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+  // put your per-action keyboard code here
+  // runs for every action, just before processing by the firmware
+  
+  return process_record_user(keycode, record);
+}
+
+void led_set_kb(uint8_t usb_led) {
+  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+
+  led_set_user(usb_led);
+}
diff --git a/keyboards/xd87/xd87.h b/keyboards/xd87/xd87.h
new file mode 100644
index 0000000000..c4df290a3b
--- /dev/null
+++ b/keyboards/xd87/xd87.h
@@ -0,0 +1,70 @@
+/* Copyright 2018 Alexander Fougner <fougner89 at gmail.com>
+ *
+ * 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 XD87_H
+#define XD87_H
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E, K1E, K1F, K1G, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, K2F, K2G, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                     \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4E, K4F, K4G, \
+    K50, K51, K52,           K55,      K58,           K5A, K5B, K5C, K5D,      K5E, K5F, K5G  \
+) { \
+/*          0      1      2      3      4      5      6      7      8      9      A      B      C      D      E      F      G    */  \
+/* 0 */   { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
+/* 1 */   { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
+/* 2 */   { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
+/* 3 */   { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
+/* 4 */   { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F,   K4G   }, \
+/* 5 */   { K50,   K51,   K52,   KC_NO, KC_NO, K55,   KC_NO, KC_NO, K58,   KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }  \
+}
+
+#define LAYOUT_tkl_ansi( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, K0F, K0G, \
+    K01, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D,      K1E, K1F, K1G, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, K2F, K2G, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,                K4F,      \
+    K50, K51, K52,                K58,                K5A, K5B, K5C, K5D,      K5E, K5F, K5G  \
+) LAYOUT_all( \
+    K00,   KC_NO, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,          K0E,   K0F,   K0G,   \
+    K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   KC_NO, K1D, KC_NO,   K1E,   K1F,   K1G,   \
+    K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,          K2E,   K2F,   K2G,   \
+    K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,                               \
+    K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO,        KC_NO, K4F,   KC_NO, \
+    K50,   K51,   K52,                 KC_NO,        K58,                 K5A,   K5B,   K5C,   K5D,          K5E,   K5F,   K5G    \
+)
+
+#define LAYOUT_tkl_iso( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, K1F, K1G, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2E, K2F, K2G, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                     \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,                K4F,      \
+    K50, K51, K52,                K58,                K5A, K5B, K5C, K5D,      K5E, K5F, K5G  \
+) LAYOUT_all( \
+    K00,   KC_NO, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,          K0E,   K0F,   K0G,   \
+    K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D, KC_NO,   K1E,   K1F,   K1G,   \
+    K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO,        K2E,   K2F,   K2G,   \
+    K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,                               \
+    K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   KC_NO,        KC_NO, K4F,   KC_NO, \
+    K50,   K51,   K52,                 KC_NO,        K58,                 K5A,   K5B,   K5C,   K5D,          K5E,   K5F,   K5G    \
+)
+
+#endif
\ No newline at end of file