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

8 files changed, 257 insertions, 0 deletions

diff --git a/keyboards/gl516/xr63gl/config.h b/keyboards/gl516/xr63gl/config.h
new file mode 100644
index 0000000000..302f68620d
--- /dev/null
+++ b/keyboards/gl516/xr63gl/config.h
@@ -0,0 +1,29 @@
+// Copyright 2022 gachiham (@gachiham)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*
+ * 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 MATRIX_MASKED
+
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 1
+
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED_MASK 0U
diff --git a/keyboards/gl516/xr63gl/info.json b/keyboards/gl516/xr63gl/info.json
new file mode 100644
index 0000000000..7c6229a903
--- /dev/null
+++ b/keyboards/gl516/xr63gl/info.json
@@ -0,0 +1,95 @@
+{
+    "manufacturer": "gachiham",
+    "keyboard_name": "gl516/xr63gl",
+    "maintainer": "gachiham",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP26", "GP27", "GP28", "GP29", "GP0", "GP3", "GP4", "GP2", "GP1"],
+        "rows": ["GP26", "GP27", "GP28", "GP29", "GP0", "GP3", "GP4", "GP2", "GP1"]
+    },
+    "processor": "RP2040",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x8686"
+    },
+    "layouts": {
+        "LAYOUT_63_ansi": {
+            "layout": [
+                { "label":"ESC", "matrix": [0, 1], "x": 0, "y": 0 },
+                { "label":"1!", "matrix": [0, 2], "x": 1, "y": 0 },
+                { "label":"2@", "matrix": [0, 3], "x": 2, "y": 0 },
+                { "label":"3#", "matrix": [0, 4], "x": 3, "y": 0 },
+                { "label":"4$", "matrix": [0, 5], "x": 4, "y": 0 },
+                { "label":"5%", "matrix": [0, 6], "x": 5, "y": 0 },
+                { "label":"6^", "matrix": [0, 7], "x": 6, "y": 0 },
+                { "label":"7&", "matrix": [0, 8], "x": 7, "y": 0 },
+                { "label":"8*", "matrix": [1, 0], "x": 8, "y": 0 },
+                { "label":"9(", "matrix": [1, 2], "x": 9, "y": 0 },
+                { "label":"0)", "matrix": [1, 3], "x": 10, "y": 0 },
+                { "label":"-_", "matrix": [1, 4], "x": 11, "y": 0 },
+                { "label":"=+", "matrix": [1, 5], "x": 12, "y": 0 },
+                { "label":"Backspace", "matrix": [1, 6], "w": 2, "x": 13, "y": 0 },
+                { "label":"Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label":"Q", "matrix": [2, 1], "x": 1.5, "y": 1 },
+                { "label":"W", "matrix": [2, 3], "x": 2.5, "y": 1 },
+                { "label":"E", "matrix": [2, 4], "x": 3.5, "y": 1 },
+                { "label":"R", "matrix": [2, 5], "x": 4.5, "y": 1 },
+                { "label":"T", "matrix": [2, 6], "x": 5.5, "y": 1 },
+                { "label":"Y", "matrix": [2, 7], "x": 6.5, "y": 1 },
+                { "label":"U", "matrix": [2, 8], "x": 7.5, "y": 1 },
+                { "label":"I", "matrix": [3, 0], "x": 8.5, "y": 1 },
+                { "label":"O", "matrix": [3, 1], "x": 9.5, "y": 1 },
+                { "label":"P", "matrix": [3, 2], "x": 10.5, "y": 1 },
+                { "label":"[{", "matrix": [3, 4], "x": 11.5, "y": 1 },
+                { "label":"]}", "matrix": [3, 5], "x": 12.5, "y": 1 },
+                { "label":"\\|", "matrix": [3, 6], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label":"Caps Lock", "matrix": [4, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label":"A", "matrix": [4, 1], "x": 1.75, "y": 2 },
+                { "label":"S", "matrix": [4, 2], "x": 2.75, "y": 2 },
+                { "label":"D", "matrix": [4, 3], "x": 3.75, "y": 2 },
+                { "label":"F", "matrix": [4, 5], "x": 4.75, "y": 2 },
+                { "label":"G", "matrix": [4, 6], "x": 5.75, "y": 2 },
+                { "label":"H", "matrix": [4, 7], "x": 6.75, "y": 2 },
+                { "label":"J", "matrix": [4, 8], "x": 7.75, "y": 2 },
+                { "label":"K", "matrix": [5, 0], "x": 8.75, "y": 2 },
+                { "label":"L", "matrix": [5, 1], "x": 9.75, "y": 2 },
+                { "label":";:", "matrix": [5, 2], "x": 10.75, "y": 2 },
+                { "label":"'\"", "matrix": [5, 3], "x": 11.75, "y": 2 },
+                { "label":"Enter", "matrix": [5, 4], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label":"Shift", "matrix": [6, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label":"Z", "matrix": [6, 1], "x": 2.25, "y": 3 },
+                { "label":"X", "matrix": [6, 2], "x": 3.25, "y": 3 },
+                { "label":"C", "matrix": [6, 3], "x": 4.25, "y": 3 },
+                { "label":"V", "matrix": [6, 4], "x": 5.25, "y": 3 },
+                { "label":"B", "matrix": [6, 5], "x": 6.25, "y": 3 },
+                { "label":"N", "matrix": [6, 7], "x": 7.25, "y": 3 },
+                { "label":"M", "matrix": [6, 8], "x": 8.25, "y": 3 },
+                { "label":",<", "matrix": [7, 0], "x": 9.25, "y": 3 },
+                { "label":".>", "matrix": [7, 1], "x": 10.25, "y": 3 },
+                { "label":"/?", "matrix": [7, 2], "x": 11.25, "y": 3 },
+                { "label":"Shift", "matrix": [7, 3], "w": 1.25, "x": 12.25, "y": 3 },
+                { "label":"Up", "matrix": [7, 4], "x": 14, "y": 3 },
+                { "label":"Ctrl", "matrix": [8, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label":"Win", "matrix": [8, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label":"Alt", "matrix": [8, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "label":"Space", "matrix": [8, 3], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label":"MO(2)", "matrix": [8, 4], "w": 1.25, "x": 10, "y": 4 },
+                { "label":"MO(1)", "matrix": [8, 5], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label":"Left", "matrix": [8, 6], "x": 13, "y": 4 },
+                { "label":"Down", "matrix": [8, 7], "x": 14, "y": 4 },
+                { "label":"Right", "matrix": [7, 5], "x": 15, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/gl516/xr63gl/keymaps/default/keymap.c b/keyboards/gl516/xr63gl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..36fc6b121c
--- /dev/null
+++ b/keyboards/gl516/xr63gl/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2022 gachiham (@gachiham)
+ *
+ * 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_63_ansi(
+        KC_ESC,  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_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_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_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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(2),   MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_63_ansi(
+        KC_GRV,  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_DEL,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP,
+        _______, _______, _______,                            _______,                            _______, _______, KC_HOME, KC_PGDN, KC_END
+    ),
+    [2] = LAYOUT_63_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/gl516/xr63gl/keymaps/via/keymap.c b/keyboards/gl516/xr63gl/keymaps/via/keymap.c
new file mode 100644
index 0000000000..070598962b
--- /dev/null
+++ b/keyboards/gl516/xr63gl/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 gachiham (@gachiham)
+ *
+ * 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_63_ansi(
+        KC_ESC,  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_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_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_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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(2),   MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_63_ansi(
+        KC_GRV,  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_DEL,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP,
+        _______, _______, _______,                            _______,                            _______, _______, KC_HOME, KC_PGDN, KC_END
+    ),
+    [2] = LAYOUT_63_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_63_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
+    )
+
+};
diff --git a/keyboards/gl516/xr63gl/keymaps/via/rules.mk b/keyboards/gl516/xr63gl/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/gl516/xr63gl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/gl516/xr63gl/readme.md b/keyboards/gl516/xr63gl/readme.md
new file mode 100644
index 0000000000..a593bbba76
--- /dev/null
+++ b/keyboards/gl516/xr63gl/readme.md
@@ -0,0 +1,27 @@
+# gl516/xr63gl
+
+![gl516/xr63gl](https://i.imgur.com/zSbrTmIh.jpg)
+
+Layout with only the Arrow key added to the 60% keyboard.
+
+* Keyboard Maintainer: [gachiham](https://github.com/gachiham)
+* Hardware Supported: XR63GL PCB, XIAO RP2040
+* Hardware Availability: [PCB Data](https://github.com/gachiham/XR63GL)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gl516/xr63gl:default
+
+Flashing example for this keyboard:
+
+    make gl516/xr63gl: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,1) 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/gl516/xr63gl/rules.mk b/keyboards/gl516/xr63gl/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/gl516/xr63gl/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/gl516/xr63gl/xr63gl.c b/keyboards/gl516/xr63gl/xr63gl.c
new file mode 100644
index 0000000000..4817f07a92
--- /dev/null
+++ b/keyboards/gl516/xr63gl/xr63gl.c
@@ -0,0 +1,16 @@
+// Copyright 2022 gachiham (@gachiham)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const matrix_row_t matrix_mask[MATRIX_ROWS] = {
+    0b1111111111111110,
+    0b1111111111111101,
+    0b1111111111111011,
+    0b1111111111110111,
+    0b1111111111101111,
+    0b1111111111011111,
+    0b1111111110111111,
+    0b1111111101111111,
+    0b1111111011111111,
+};