Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

9 files changed, 792 insertions, 0 deletions

diff --git a/keyboards/kbd19x/config.h b/keyboards/kbd19x/config.h
new file mode 100644
index 0000000000..47cfd7484a
--- /dev/null
+++ b/keyboards/kbd19x/config.h
@@ -0,0 +1,224 @@
+/*
+Copyright 2018 Jeff Shufelt <jshuf@puppyfish.com> @jshuf
+
+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    KBDFans
+#define PRODUCT         kbd19x
+#define DESCRIPTION     A compact-1800 keyboard kit.
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 13
+
+/*
+ * 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 { B7, B3, E6, F0, D5, D4, D6, C7 }
+#define MATRIX_COL_PINS { C6, F1, F4, F5, F6, F7, D7, B4, B5, D0, D1, D2, D3 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
+#define DIODE_DIRECTION COL2ROW
+
+#define BACKLIGHT_PIN B6
+// #define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 3
+
+#define RGB_DI_PIN E2
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 18
+#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/kbd19x/info.json b/keyboards/kbd19x/info.json
new file mode 100644
index 0000000000..31f2f9cf57
--- /dev/null
+++ b/keyboards/kbd19x/info.json
@@ -0,0 +1,218 @@
+{
+    "keyboard_name": "KBD19x",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbd19x",
+    "maintainer": "qmk",
+    "width": 19.5,
+    "height": 6.75,
+    "layouts": {
+        "LAYOUT_ansi": {
+	    "key_count": 99,
+            "layout": [{"label":"Esc", "x":0, "y":0},
+		       {"label":"F1", "x":1.25, "y":0},
+		       {"label":"F2", "x":2.25, "y":0},
+		       {"label":"F3", "x":3.25, "y":0},
+		       {"label":"F4", "x":4.25, "y":0},
+		       {"label":"F5", "x":5.5, "y":0},
+		       {"label":"F6", "x":6.5, "y":0},
+		       {"label":"F7", "x":7.5, "y":0},
+		       {"label":"F8", "x":8.5, "y":0},
+		       {"label":"F9", "x":9.75, "y":0},
+		       {"label":"F10", "x":10.75, "y":0},
+		       {"label":"F11", "x":11.75, "y":0},
+		       {"label":"F12", "x":12.75, "y":0},
+		       {"label":"BkLgt Step", "x":14, "y":0},
+		       {"label":"Print Screen", "x":15.5, "y":0},
+		       {"label":"Scroll Lock", "x":16.5, "y":0},
+		       {"label":"Pause Break", "x":17.5, "y":0},
+		       {"label":"PgDn", "x":18.5, "y":0},
+		       {"label":"~", "x":0, "y":1.5},
+		       {"label":"!", "x":1, "y":1.5},
+		       {"label":"@", "x":2, "y":1.5},
+		       {"label":"#", "x":3, "y":1.5},
+		       {"label":"$", "x":4, "y":1.5},
+		       {"label":"%", "x":5, "y":1.5},
+		       {"label":"^", "x":6, "y":1.5},
+		       {"label":"&", "x":7, "y":1.5},
+		       {"label":"*", "x":8, "y":1.5},
+		       {"label":"(", "x":9, "y":1.5},
+		       {"label":")", "x":10, "y":1.5},
+		       {"label":"_", "x":11, "y":1.5},
+		       {"label":"+", "x":12, "y":1.5},
+		       {"label":"Backspace", "x":13, "y":1.5, "w":2},
+		       {"label":"Num Lock", "x":15.5, "y":1.5},
+		       {"label":"/", "x":16.5, "y":1.5},
+		       {"label":"*", "x":17.5, "y":1.5},
+		       {"label":"-", "x":18.5, "y":1.5},
+		       {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+		       {"label":"Q", "x":1.5, "y":2.5},
+		       {"label":"W", "x":2.5, "y":2.5},
+		       {"label":"E", "x":3.5, "y":2.5},
+		       {"label":"R", "x":4.5, "y":2.5},
+		       {"label":"T", "x":5.5, "y":2.5},
+		       {"label":"Y", "x":6.5, "y":2.5},
+		       {"label":"U", "x":7.5, "y":2.5},
+		       {"label":"I", "x":8.5, "y":2.5},
+		       {"label":"O", "x":9.5, "y":2.5},
+		       {"label":"P", "x":10.5, "y":2.5},
+		       {"label":"{", "x":11.5, "y":2.5},
+		       {"label":"}", "x":12.5, "y":2.5},
+		       {"label":"|", "x":13.5, "y":2.5, "w":1.5},
+		       {"label":"7", "x":15.5, "y":2.5},
+		       {"label":"8", "x":16.5, "y":2.5},
+		       {"label":"9", "x":17.5, "y":2.5},
+		       {"label":"+", "x":18.5, "y":2.5, "h":2},
+		       {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+		       {"label":"A", "x":1.75, "y":3.5},
+		       {"label":"S", "x":2.75, "y":3.5},
+		       {"label":"D", "x":3.75, "y":3.5},
+		       {"label":"F", "x":4.75, "y":3.5},
+		       {"label":"G", "x":5.75, "y":3.5},
+		       {"label":"H", "x":6.75, "y":3.5},
+		       {"label":"J", "x":7.75, "y":3.5},
+		       {"label":"K", "x":8.75, "y":3.5},
+		       {"label":"L", "x":9.75, "y":3.5},
+		       {"label":":", "x":10.75, "y":3.5},
+		       {"label":"\"", "x":11.75, "y":3.5},
+		       {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+		       {"label":"4", "x":15.5, "y":3.5},
+		       {"label":"5", "x":16.5, "y":3.5},
+		       {"label":"6", "x":17.5, "y":3.5},
+		       {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+		       {"label":"Z", "x":2.25, "y":4.5},
+		       {"label":"X", "x":3.25, "y":4.5},
+		       {"label":"C", "x":4.25, "y":4.5},
+		       {"label":"V", "x":5.25, "y":4.5},
+		       {"label":"B", "x":6.25, "y":4.5},
+		       {"label":"N", "x":7.25, "y":4.5},
+		       {"label":"M", "x":8.25, "y":4.5},
+		       {"label":"<", "x":9.25, "y":4.5},
+		       {"label":">", "x":10.25, "y":4.5},
+		       {"label":"?", "x":11.25, "y":4.5},
+		       {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
+		       {"label":"1", "x":15.5, "y":4.5},
+		       {"label":"2", "x":16.5, "y":4.5},
+		       {"label":"3", "x":17.5, "y":4.5},
+		       {"label":"Enter", "x":18.5, "y":4.5, "h":2},
+		       {"label":"\u2191", "x":14.25, "y":4.75},
+		       {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+		       {"label":"Win", "x":1.25, "y":5.5},
+		       {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
+		       {"x":3.5, "y":5.5, "w":6.25},
+		       {"label":"Alt", "x":9.75, "y":5.5},
+		       {"label":"MO(1)", "x":10.75, "y":5.5},
+		       {"label":"Ctrl", "x":11.75, "y":5.5, "w":1.25},
+		       {"label":"0", "x":16.5, "y":5.5},
+		       {"label":".", "x":17.5, "y":5.5},
+		       {"label":"\u2190", "x":13.25, "y":5.75},
+		       {"label":"\u2193", "x":14.25, "y":5.75},
+		       {"label":"\u2192", "x":15.25, "y":5.75}]
+        },
+        "LAYOUT_all": {
+	    "key_count": 103,
+            "layout": [{"label":"Esc", "x":0, "y":0},
+		       {"label":"F1", "x":1.25, "y":0},
+		       {"label":"F2", "x":2.25, "y":0},
+		       {"label":"F3", "x":3.25, "y":0},
+		       {"label":"F4", "x":4.25, "y":0},
+		       {"label":"F5", "x":5.5, "y":0},
+		       {"label":"F6", "x":6.5, "y":0},
+		       {"label":"F7", "x":7.5, "y":0},
+		       {"label":"F8", "x":8.5, "y":0},
+		       {"label":"F9", "x":9.75, "y":0},
+		       {"label":"F10", "x":10.75, "y":0},
+		       {"label":"F11", "x":11.75, "y":0},
+		       {"label":"F12", "x":12.75, "y":0},
+		       {"label":"BkLgt Step", "x":14, "y":0},
+		       {"label":"Print Screen", "x":15.5, "y":0},
+		       {"label":"Scroll Lock", "x":16.5, "y":0},
+		       {"label":"Pause Break", "x":17.5, "y":0},
+		       {"label":"PgDn", "x":18.5, "y":0},
+		       {"label":"~", "x":0, "y":1.5},
+		       {"label":"!", "x":1, "y":1.5},
+		       {"label":"@", "x":2, "y":1.5},
+		       {"label":"#", "x":3, "y":1.5},
+		       {"label":"$", "x":4, "y":1.5},
+		       {"label":"%", "x":5, "y":1.5},
+		       {"label":"^", "x":6, "y":1.5},
+		       {"label":"&", "x":7, "y":1.5},
+		       {"label":"*", "x":8, "y":1.5},
+		       {"label":"(", "x":9, "y":1.5},
+		       {"label":")", "x":10, "y":1.5},
+		       {"label":"_", "x":11, "y":1.5},
+		       {"label":"+", "x":12, "y":1.5},
+		       {"x":13, "y":1.5},
+		       {"label":"BS", "x":14, "y":1.5},
+		       {"label":"Num Lock", "x":15.5, "y":1.5},
+		       {"label":"/", "x":16.5, "y":1.5},
+		       {"label":"*", "x":17.5, "y":1.5},
+		       {"label":"-", "x":18.5, "y":1.5},
+		       {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+		       {"label":"Q", "x":1.5, "y":2.5},
+		       {"label":"W", "x":2.5, "y":2.5},
+		       {"label":"E", "x":3.5, "y":2.5},
+		       {"label":"R", "x":4.5, "y":2.5},
+		       {"label":"T", "x":5.5, "y":2.5},
+		       {"label":"Y", "x":6.5, "y":2.5},
+		       {"label":"U", "x":7.5, "y":2.5},
+		       {"label":"I", "x":8.5, "y":2.5},
+		       {"label":"O", "x":9.5, "y":2.5},
+		       {"label":"P", "x":10.5, "y":2.5},
+		       {"label":"{", "x":11.5, "y":2.5},
+		       {"label":"}", "x":12.5, "y":2.5},
+		       {"label":"|", "x":13.5, "y":2.5, "w":1.5},
+		       {"label":"7", "x":15.5, "y":2.5},
+		       {"label":"8", "x":16.5, "y":2.5},
+		       {"label":"9", "x":17.5, "y":2.5},
+		       {"label":"+", "x":18.5, "y":2.5},
+		       {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+		       {"label":"A", "x":1.75, "y":3.5},
+		       {"label":"S", "x":2.75, "y":3.5},
+		       {"label":"D", "x":3.75, "y":3.5},
+		       {"label":"F", "x":4.75, "y":3.5},
+		       {"label":"G", "x":5.75, "y":3.5},
+		       {"label":"H", "x":6.75, "y":3.5},
+		       {"label":"J", "x":7.75, "y":3.5},
+		       {"label":"K", "x":8.75, "y":3.5},
+		       {"label":"L", "x":9.75, "y":3.5},
+		       {"label":":", "x":10.75, "y":3.5},
+		       {"label":"\"", "x":11.75, "y":3.5},
+		       {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+		       {"label":"4", "x":15.5, "y":3.5},
+		       {"label":"5", "x":16.5, "y":3.5},
+		       {"label":"6", "x":17.5, "y":3.5},
+		       {"x":18.5, "y":3.5},
+		       {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+		       {"x":1.25, "y":4.5},
+		       {"label":"Z", "x":2.25, "y":4.5},
+		       {"label":"X", "x":3.25, "y":4.5},
+		       {"label":"C", "x":4.25, "y":4.5},
+		       {"label":"V", "x":5.25, "y":4.5},
+		       {"label":"B", "x":6.25, "y":4.5},
+		       {"label":"N", "x":7.25, "y":4.5},
+		       {"label":"M", "x":8.25, "y":4.5},
+		       {"label":"<", "x":9.25, "y":4.5},
+		       {"label":">", "x":10.25, "y":4.5},
+		       {"label":"?", "x":11.25, "y":4.5},
+		       {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
+		       {"label":"1", "x":15.5, "y":4.5},
+		       {"label":"2", "x":16.5, "y":4.5},
+		       {"label":"3", "x":17.5, "y":4.5},
+		       {"label":"Enter", "x":18.5, "y":4.5},
+		       {"label":"\u2191", "x":14.25, "y":4.75},
+		       {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+		       {"label":"Win", "x":1.25, "y":5.5},
+		       {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
+		       {"x":3.5, "y":5.5, "w":6.25},
+		       {"label":"Alt", "x":9.75, "y":5.5},
+		       {"label":"Menu", "x":10.75, "y":5.5},
+		       {"label":"Ctrl", "x":11.75, "y":5.5, "w":1.25},
+		       {"label":"0", "x":16.5, "y":5.5},
+		       {"label":".", "x":17.5, "y":5.5},
+		       {"x":18.5, "y":5.5},
+		       {"label":"\u2190", "x":13.25, "y":5.75},
+		       {"label":"\u2193", "x":14.25, "y":5.75},
+		       {"label":"\u2192", "x":15.25, "y":5.75}]
+        }
+    }
+}
+
diff --git a/keyboards/kbd19x/kbd19x.c b/keyboards/kbd19x/kbd19x.c
new file mode 100644
index 0000000000..360345600d
--- /dev/null
+++ b/keyboards/kbd19x/kbd19x.c
@@ -0,0 +1,63 @@
+/*
+Copyright 2018 Jeff Shufelt <jshuf@puppyfish.com> @jshuf
+
+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 "kbd19x.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
+
+  if (usb_led & (1<<USB_LED_NUM_LOCK)) {
+    kbd19x_nmlk_led_on();
+  } else {
+    kbd19x_nmlk_led_off();
+  }
+
+  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+    kbd19x_caps_led_on();
+  } else {
+    kbd19x_caps_led_off();
+  }
+
+  if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
+    kbd19x_sclk_led_on();
+  } else {
+    kbd19x_sclk_led_off();
+  }
+
+  led_set_user(usb_led);
+}
diff --git a/keyboards/kbd19x/kbd19x.h b/keyboards/kbd19x/kbd19x.h
new file mode 100644
index 0000000000..728c7ca5ca
--- /dev/null
+++ b/keyboards/kbd19x/kbd19x.h
@@ -0,0 +1,103 @@
+/*
+Copyright 2018 Jeff Shufelt <jshuf@puppyfish.com> @jshuf
+
+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 KBD19X_H
+#define KBD19X_H
+
+#include "quantum.h"
+#include "led.h"
+
+inline void kbd19x_caps_led_on(void)    { DDRB |=  (1<<0); PORTB &= ~(1<<0); }
+inline void kbd19x_caps_led_off(void)   { DDRB &= ~(1<<0); PORTB &= ~(1<<0); }
+
+inline void kbd19x_sclk_led_on(void)    { DDRB |=  (1<<1); PORTB &= ~(1<<1); }
+inline void kbd19x_sclk_led_off(void)   { DDRB &= ~(1<<1); PORTB &= ~(1<<1); }
+
+inline void kbd19x_nmlk_led_on(void)    { DDRB |=  (1<<2); PORTB &= ~(1<<2); }
+inline void kbd19x_nmlk_led_off(void)   { DDRB &= ~(1<<2); PORTB &= ~(1<<2); }
+
+// readability
+#define XXX KC_NO
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+// 2u backspace: XXX, k1e
+// split backspace: k1d, k1e
+
+// 2u numpad +: k2i, XXX
+// split numpad +: k2i, k3i
+
+// 2u numpad enter: k4i, XXX
+// split numpad enter: k4i, k5i
+
+// 2.25u lshift: k40, XXX
+// split (1.25u, 1u) lshift: k40, k41
+
+// ANSI enter or ISO enter: k3e
+// backslash or NUHS: k2e
+
+// left winkey: k50, k51, k52
+// left WKL: k50, XXX, k52
+
+// right winkey: k59, k5a, k5b
+// right WKL: k59, XXX, k5b
+
+#define LAYOUT_all( \
+  k00,  k01, k02, k03, k04,  k05, k06, k07, k08,  k09, k0a, k0b, k0c,   k0e,  k0f, k0g, k0h, k0i, \
+  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,  k1f, k1g, k1h, k1i, \
+  k20,  k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,     k2e,  k2f, k2g, k2h, k2i, \
+  k30,    k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,        k3e,  k3f, k3g, k3h, k3i, \
+  k40,  k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c,    k4e,   k4f, k4g, k4h, k4i, \
+  k50,  k51, k52,                k56,            k59, k5a, k5b,   k5d, k5e, k5f,   k5g, k5h, k5i  \
+)\
+{\
+  {k00, k01, k02, k03, k04, k09, k0a, k0b, k0c, k0f, k0g, k0h, k0i},\
+  {k10, k11, k12, k13, k14, k19, k1a, k1b, k1c, k1f, k1g, k1h, k1i},\
+  {k20, k21, k22, k23, k24, k29, k2a, k2b, k2c, k2f, k2g, k2h, k2i},\
+  {k30, k32, k33, k34, k35, k3a, k3b, k3c, k3e, k3f, k3g, k3h, k3i},\
+  {k40, k41, k42, k43, k44, k49, k4a, k4b, k4c, k4f, k4g, k4h, k4i},\
+  {k50, k51, k52, k5e, k5f, k59, k5a, k5b, k5d, k56, k5g, k5h, k5i},\
+  {k05, k06, k07, k08, k15, k16, k17, k18, k25, k26, k27, k28, k36},\
+  {k1d, k1e, k0e, k2e, k4e, k37, k38, k39, k45, k46, k47, k48, XXX},\
+}
+
+#define LAYOUT_ansi( \
+  k00,  k01, k02, k03, k04,  k05, k06, k07, k08,  k09, k0a, k0b, k0c, k0e,     k0f, k0g, k0h, k0i, \
+  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,    k1e,     k1f, k1g, k1h, k1i, \
+  k20,  k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,   k2e,     k2f, k2g, k2h, k2i, \
+  k30,    k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3e,     k3f, k3g, k3h,      \
+  k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,    k4c,   k4e,   k4f, k4g, k4h, k4i, \
+  k50, k51, k52,                k56,            k59, k5a, k5b,     k5d, k5e, k5f,   k5g, k5h       \
+)\
+{\
+  {k00, k01, k02, k03, k04, k09, k0a, k0b, k0c, k0f, k0g, k0h, k0i},\
+  {k10, k11, k12, k13, k14, k19, k1a, k1b, k1c, k1f, k1g, k1h, k1i},\
+  {k20, k21, k22, k23, k24, k29, k2a, k2b, k2c, k2f, k2g, k2h, k2i},\
+  {k30, k32, k33, k34, k35, k3a, k3b, k3c, k3e, k3f, k3g, k3h, XXX},\
+  {k40, XXX, k42, k43, k44, k49, k4a, k4b, k4c, k4f, k4g, k4h, k4i},\
+  {k50, k51, k52, k5e, k5f, k59, k5a, k5b, k5d, k56, k5g, k5h, XXX},\
+  {k05, k06, k07, k08, k15, k16, k17, k18, k25, k26, k27, k28, k36},\
+  {XXX, k1e, k0e, k2e, k4e, k37, k38, k39, k45, k46, k47, k48, XXX},\
+}
+#endif
diff --git a/keyboards/kbd19x/keymaps/default/config.h b/keyboards/kbd19x/keymaps/default/config.h
new file mode 100644
index 0000000000..70028a525c
--- /dev/null
+++ b/keyboards/kbd19x/keymaps/default/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2018 Jeff Shufelt <jshuf@puppyfish.com> @jshuf
+
+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/kbd19x/keymaps/default/keymap.c b/keyboards/kbd19x/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c806072114
--- /dev/null
+++ b/keyboards/kbd19x/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+/*
+Copyright 2018 Jeff Shufelt <jshuf@puppyfish.com> @jshuf
+
+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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ansi( /* Base */
+    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,  BL_STEP,          KC_PSCR, KC_SLCK, KC_PAUS, KC_PGDN, \
+    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_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
+    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_BSLS,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS, \
+    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_ENT,           KC_P4,   KC_P5,   KC_P6,            \
+    KC_LSFT,          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_P1,   KC_P2,   KC_P3,   KC_PENT, \
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL,       KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,   KC_PDOT           \
+  ),
+  [1] = LAYOUT_ansi( /* Func */
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  RGB_TOG,         _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  RESET,           _______, _______, _______, _______, \
+    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,  _______,         _______, _______, _______, _______, \
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,         _______, _______, _______,          \
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______,   _______,    _______, _______, _______, _______, \
+    _______, _______, _______,                            _______,                   _______, _______, _______,       _______, _______, _______,    _______, _______           \
+  ),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  return true;
+}
+
+void matrix_init_user(void) {
+
+}
+
+void matrix_scan_user(void) {
+
+}
+
+void led_set_user(uint8_t usb_led) {
+
+}
diff --git a/keyboards/kbd19x/keymaps/default/readme.md b/keyboards/kbd19x/keymaps/default/readme.md
new file mode 100644
index 0000000000..504a3ed02e
--- /dev/null
+++ b/keyboards/kbd19x/keymaps/default/readme.md
@@ -0,0 +1,13 @@
+# Default KBD19x Layout
+
+This is the default KBD19x layout, consisting of the base layer and the function layer.  Backlighting and RGB controls are accessible on the function layer.
+
+**Base layer**
+
+![kbd19x default base layer](https://i.imgur.com/XhT980a.png)
+
+**Function layer**
+
+![kbd19x default function layer](https://i.imgur.com/3w3PXN2.png)
+
+
diff --git a/keyboards/kbd19x/readme.md b/keyboards/kbd19x/readme.md
new file mode 100644
index 0000000000..ee4969b00d
--- /dev/null
+++ b/keyboards/kbd19x/readme.md
@@ -0,0 +1,19 @@
+# kbd19x
+
+![kbd19x](https://i.imgur.com/0hWTEnh.jpg)
+
+**Layout possibilities for the KBD19x**
+
+![kbd19x](https://i.imgur.com/pVaR2zY.png)
+
+The KBD19x is a compact-1800 keyboard kit produced by KBDfans, offering a number of layout options.
+
+Keyboard Maintainer: [jshuf](https://github.com/jshuf)  
+Hardware Supported: KBD19x PCB  
+Hardware Availability: [KBDfans](https://kbdfans.cn)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kbd19x:default
+
+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).
diff --git a/keyboards/kbd19x/rules.mk b/keyboards/kbd19x/rules.mk
new file mode 100644
index 0000000000..8e50962afa
--- /dev/null
+++ b/keyboards/kbd19x/rules.mk
@@ -0,0 +1,80 @@
+# 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 = 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 = no      # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = no        # Console for debug(+400)
+COMMAND_ENABLE = no        # 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 = yes       # 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)