Merge remote-tracking branch 'origin/master' into develop

4 files changed, 126 insertions, 0 deletions

diff --git a/keyboards/subrezon/lancer/info.json b/keyboards/subrezon/lancer/info.json
new file mode 100644
index 0000000000..cf678c84bc
--- /dev/null
+++ b/keyboards/subrezon/lancer/info.json
@@ -0,0 +1,65 @@
+{
+    "keyboard_name": "lancer",
+    "url": "https://github.com/subrezon/lancer",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x1A7D",
+        "device_version": "1.0.0"
+    },
+    "development_board": "promicro",
+    "matrix_pins": { 
+        "rows": ["F5", "D4", "B3", "B6", "B5"],
+        "cols": ["F4", "F6", "F7", "B1", "B2", "B4", "E6", "D7", "C6", "D2"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "Q",     "matrix": [0, 0], "x": 0,   "y": 0},
+                { "label": "W",     "matrix": [0, 1], "x": 1,   "y": 0},
+                { "label": "E",     "matrix": [0, 2], "x": 2,   "y": 0},
+                { "label": "R",     "matrix": [0, 3], "x": 3,   "y": 0},
+                { "label": "T",     "matrix": [0, 4], "x": 4,   "y": 0},
+                { "label": "Y",     "matrix": [1, 5], "x": 6,   "y": 0},
+                { "label": "U",     "matrix": [1, 6], "x": 7,   "y": 0},
+                { "label": "I",     "matrix": [1, 7], "x": 8,   "y": 0},
+                { "label": "O",     "matrix": [1, 8], "x": 9,   "y": 0},
+                { "label": "P",     "matrix": [1, 9], "x": 10,  "y": 0},
+                { "label": "A",     "matrix": [2, 0], "x": 0,   "y": 1},
+                { "label": "S",     "matrix": [2, 1], "x": 1,   "y": 1},
+                { "label": "D",     "matrix": [2, 2], "x": 2,   "y": 1},
+                { "label": "F",     "matrix": [2, 3], "x": 3,   "y": 1},
+                { "label": "G",     "matrix": [2, 4], "x": 4,   "y": 1},
+                { "label": "H",     "matrix": [2, 5], "x": 6,   "y": 1},
+                { "label": "J",     "matrix": [2, 6], "x": 7,   "y": 1},
+                { "label": "K",     "matrix": [2, 7], "x": 8,   "y": 1},
+                { "label": "L",     "matrix": [2, 8], "x": 9,   "y": 1},
+                { "label": ";",     "matrix": [2, 9], "x": 10,  "y": 1},
+                { "label": "Z",     "matrix": [3, 0], "x": 0,   "y": 2},
+                { "label": "X",     "matrix": [3, 1], "x": 1,   "y": 2},
+                { "label": "C",     "matrix": [3, 2], "x": 2,   "y": 2},
+                { "label": "V",     "matrix": [3, 3], "x": 3,   "y": 2},
+                { "label": "B",     "matrix": [3, 4], "x": 4,   "y": 2},
+                { "label": "N",     "matrix": [3, 5], "x": 6,   "y": 2},
+                { "label": "M",     "matrix": [3, 6], "x": 7,   "y": 2},
+                { "label": ",",     "matrix": [3, 7], "x": 8,   "y": 2},
+                { "label": ".",     "matrix": [3, 8], "x": 9,   "y": 2},
+                { "label": "Enter", "matrix": [3, 9], "x": 10,  "y": 2},
+                { "label": "Ctrl",  "matrix": [4, 2], "x": 2.5, "y": 3},
+                { "label": "Lower", "matrix": [4, 3], "x": 3.5, "y": 3},
+                { "label": "",      "matrix": [4, 4], "x": 4.5, "y": 3},
+                { "label": "Bksp",  "matrix": [4, 5], "x": 5.5, "y": 3},
+                { "label": "Shift", "matrix": [4, 6], "x": 6.5, "y": 3},
+                { "label": "Raise", "matrix": [4, 7], "x": 7.5, "y": 3}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/subrezon/lancer/keymaps/default/keymap.json b/keyboards/subrezon/lancer/keymaps/default/keymap.json
new file mode 100644
index 0000000000..b25e81d538
--- /dev/null
+++ b/keyboards/subrezon/lancer/keymaps/default/keymap.json
@@ -0,0 +1,33 @@
+{
+    "version": 1,
+    "notes": "default keymap",
+    "keyboard": "subrezon/lancer",
+    "keymap": "default",
+    "layout": "LAYOUT",
+    "layers": [
+        [
+               "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",
+               "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L", "KC_SCLN",
+               "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",  "KC_COMM", "KC_DOT",  "KC_ENT",
+                                  "KC_LCTL",   "MO(1)",  "KC_SPC", "KC_BSPC", "KC_LSFT",   "MO(2)"
+        ],
+        [
+             "KC_TAB",    "KC_7",    "KC_8",    "KC_9",  "KC_GRV", "KC_MPRV", "KC_PGUP",   "KC_UP", "KC_PGDN", "KC_DEL",
+             "KC_ESC",    "KC_4",    "KC_5",    "KC_6",    "KC_0", "KC_MPLY", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_RSFT",
+            "KC_LALT",    "KC_1",    "KC_2",    "KC_3", "KC_TILD", "KC_MNXT", "KC_HOME",  "KC_INS",  "KC_END", "KC_RALT",
+                                  "KC_LCTL", "_______",  "KC_SPC", "KC_BSPC", "KC_LGUI",   "MO(3)"
+        ],
+        [
+             "KC_TAB", "KC_AMPR", "KC_ASTR", "KC_BSLS", "KC_LBRC", "KC_RBRC", "KC_UNDS", "KC_PLUS", "KC_DQUO",  "KC_DEL",
+             "KC_ESC",  "KC_DLR", "KC_PERC", "KC_CIRC", "KC_LPRN", "KC_RPRN", "KC_MINS", "KC_EQL",  "KC_QUOT", "KC_SLSH",
+            "KC_LALT", "KC_EXLM",   "KC_AT", "KC_HASH", "KC_LCBR", "KC_RCBR", "KC_PIPE", "KC_SCLN", "KC_COLN", "KC_QUES",
+                                  "KC_LCTL",   "MO(3)",  "KC_SPC", "KC_BSPC", "KC_LSFT", "_______"
+        ],
+        [
+            "QK_BOOT",   "KC_F7",   "KC_F8",   "KC_F9",  "KC_F12", "KC_PSCR", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",
+            "KC_CAPS",   "KC_F4",   "KC_F5",   "KC_F6",  "KC_F11", "KC_SCRL", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",
+            "XXXXXXX",   "KC_F1",   "KC_F2",   "KC_F3",  "KC_F10", "KC_PAUS", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",
+                                  "XXXXXXX", "_______", "XXXXXXX", "XXXXXXX", "XXXXXXX", "_______"
+        ]
+    ]
+}
\ No newline at end of file
diff --git a/keyboards/subrezon/lancer/readme.md b/keyboards/subrezon/lancer/readme.md
new file mode 100644
index 0000000000..99bf79b38b
--- /dev/null
+++ b/keyboards/subrezon/lancer/readme.md
@@ -0,0 +1,27 @@
+# subrezon/lancer
+
+The [Lancer](https://github.com/subrezon/lancer) is a 36-key ortholinear keyboard with a light split and a focus on compact footprint and portability. It is a direct successor to [la_nc](https://github.com/subrezon/la_nc), and is very much inspired by other keyboards like Planck, Lumberjack and Lesovoz. Powered by a Pro Micro compatible MCU board and featuring battery and nice!view support, it offers a simple and productive typing experience, both with and without the wire.
+
+![subrezon/lancer](https://i.imgur.com/W41Vx4rh.jpg)
+
+* Keyboard Maintainer: [Daniel Osipishin](https://github.com/subrezon)
+* Hardware Supported: Lancer PCB, with a ProMicro or other compatible MCU board
+* Hardware Availability: https://github.com/subrezon/lancer
+
+Make example for this keyboard (after setting up your build environment):
+
+    make subrezon/lancer:default
+
+Flashing example for this keyboard:
+
+    make subrezon/lancer:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/subrezon/lancer/rules.mk b/keyboards/subrezon/lancer/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/subrezon/lancer/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank