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

3 files changed, 60 insertions, 0 deletions

diff --git a/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c b/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c
new file mode 100644
index 0000000000..e630851db5
--- /dev/null
+++ b/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 mizuho1998
+ *
+ * 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_60_ansi_split_bs_rshift_space(
+        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_GRV,
+        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_NO,             KC_ENT,
+        KC_LSFT, KC_NO,   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_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_LSFT,                KC_SPC,         KC_ESC,  KC_RGUI, MO(1),    KC_LEFT, KC_DOWN,  KC_RIGHT
+    ),
+    [1] = LAYOUT_60_ansi_split_bs_rshift_space(
+        RESET,   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_F13,   KC_F14,
+        KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,
+        KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,
+        KC_LSFT, KC_NO,   KC_NO,   KC_APP,  BL_STEP,KC_NO,  KC_NO,  KC_VOLD,KC_VOLU,KC_MUTE, KC_END,  KC_PGDN,  KC_RSFT, KC_PGUP,  KC_INS,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_LSFT,                KC_SPC,         KC_ESC,  KC_RGUI, MO(1),    KC_HOME, KC_PGDOWN,KC_END
+    )
+};
diff --git a/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/readme.md b/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/readme.md
new file mode 100644
index 0000000000..56f384f436
--- /dev/null
+++ b/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/readme.md
@@ -0,0 +1,13 @@
+# Split Space Keymap for XIUDI's 60% XD60 PCB
+
+![Split Space Keymap for XD60](https://user-images.githubusercontent.com/39789796/140330345-2ccde096-dad5-49d0-b8a7-b231180018e6.png)
+
+
+* Keyboard Maintainer: [mizuho1998](https://github.com/mizuho1998)
+* Hardware Supported: xd60 PCB rev3
+
+Make example for this keyboard (after setting up your build environment):
+
+    make xiudi/xd60/rev3:ansi_split_bs_rshift_space
+
+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/xiudi/xd60/xd60.h b/keyboards/xiudi/xd60/xd60.h
index dc6a1080f9..cf698adcc1 100644
--- a/keyboards/xiudi/xd60/xd60.h
+++ b/keyboards/xiudi/xd60/xd60.h
@@ -60,6 +60,20 @@ inline void xd60_bl_led_off(void)     { DDRF &= ~(1<<5); PORTF &= ~(1<<5); }
     { K40,   K41,   K42,  KC_NO, KC_NO, K45,  KC_NO, KC_NO, KC_NO, K49,   K4A,   K4B,  K4C,   K4D }  \
 }
 
+#define LAYOUT_60_ansi_split_bs_rshift_space( \
+      K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K49, \
+      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D,       \
+      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,       \
+      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K47,  K3D,  K3C, \
+      K40,  K41,  K42,        K46,              K45,        K44,  K4A,  K4B,  K48,  K4C,  K4D  \
+) { \
+    { K00, K01,   K02, K03,   K04,   K05,  K06,   K07,   K08,   K09,   K0A, K0B, K0C,   K0D },  \
+    { K10, K11,   K12, K13,   K14,   K15,  K16,   K17,   K18,   K19,   K1A, K1B, K1C,   K1D },  \
+    { K20, K21,   K22, K23,   K24,   K25,  K26,   K27,   K28,   K29,   K2A, K2B, K2C,   K2D },  \
+    { K30, K31,   K32, K33,   K34,   K35,  K36,   K37,   K38,   K39,   K3A, K3B, K3C,   K3D },  \
+    { K40, K41,   K42, KC_NO, K44,   K45,  K46,   K47,   K48,   K49,   K4A, K4B, K4C,   K4D }   \
+}
+
 #define LAYOUT_60_iso( \
       K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D, \
       K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,       \