Updated personal keymaps, fixed Let's Split default keymap, updated JJ40 README (#2704)

* Add M6-A keymap

* Update XD60 keymap

* Update XD60 keymap readme

* Update JJ40 and Let's Split keymaps

* Add readme for M6-A

* Fix typo, update JJ40 README

* Update jj40 readme

* Cleanup jj40 keymap

* Revert Let's Split QWERTY layer to default before #2010

* Update numpad layers

* Fix: Let's Split keymap getting stuck mods due to having keycodes assigned on the Raise layer

* Keep ASCII art consistent with keymap

3 files changed, 19 insertions, 33 deletions

diff --git a/keyboards/xd60/keymaps/krusli/HHKB-like.txt b/keyboards/xd60/keymaps/krusli/HHKB-like.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/xd60/keymaps/krusli/HHKB-like.txt
+++ /dev/null
diff --git a/keyboards/xd60/keymaps/krusli/keymap.c b/keyboards/xd60/keymaps/krusli/keymap.c
index 95a3e3fadf..cf3edff403 100644
--- a/keyboards/xd60/keymaps/krusli/keymap.c
+++ b/keyboards/xd60/keymaps/krusli/keymap.c
@@ -1,40 +1,26 @@
 #include "xd60.h"
 #include "action_layer.h"
 
-/* HHKB-like layout for standard 60% layout with split RShift and split backspace */
+#define _______ KC_TRNS
 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+#define _BASE 0
+#define _FN   1
 
-  // 0: Base Layer
-  LAYOUT_ALL(
-      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_BSLS,  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_BSPC,   \
-      KC_LCTL, 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_RSFT,  F(0),      \
-      KC_LCTL, KC_LALT, KC_LGUI,                          KC_SPC,                          KC_RGUI, KC_RALT,  F(0),    KC_RCTL,  KC_RCTL),
-
-  // 1: Function Layer
-  /* Layer HHKB: HHKB mode (HHKB Fn)
-  |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-  | Pwr  | F1  | F2  | F3  | F4 | F5 | F6 | F7 | F8  | F9  | F10 | F11 | F12   | Ins   | Del |
-  |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-  | Caps |     |     |     |    |    |    |    | Psc | Slk | Pus | Up  |       | Backs |     |
-  |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-  |      | VoD | VoU | Mut |    |    | *  | /  | Hom | PgU | Lef | Rig | Enter |       |     |
-  |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-  |      |     |     |     |    |    | +  | -  | End | PgD | Dow |     |       |       |     |
-  |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-
-             |------+------+----------------------+------+------+
-             | **** | **** | ******************** | **** | **** |
-             |------+------+----------------------+------+------+
- */
-  LAYOUT_ALL(
-      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_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,    KC_TRNS, KC_BSPC,             \
-      KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,  KC_NO,             KC_ENT,    \
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN,  KC_TRNS, KC_TRNS,  KC_TRNS,   \
-      KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,                              KC_TRNS, KC_TRNS,  F(0),    KC_TRNS,  KC_TRNS),
+/* HHKB-like layout for standard 60% layout with split RShift */
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = KEYMAP(
+      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_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_RSFT,  F(0),       \
+      KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RALT, KC_RGUI, _______, KC_APP,  KC_RCTL),
+
+  [_FN] = KEYMAP(
+      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,   _______,      \
+      RESET,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_SAD, RGB_SAI, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, KC_INS,                 \
+      _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_NO,        _______            \
+      _______, KC_NO,   _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,  _______,      \
+      _______, _______, _______,                          _______,                              _______, _______, _______, _______, _______),
 };
 
 // Custom Actions
diff --git a/keyboards/xd60/keymaps/krusli/readme.md b/keyboards/xd60/keymaps/krusli/readme.md
index aefb23cca3..34f46e026c 100644
--- a/keyboards/xd60/keymaps/krusli/readme.md
+++ b/keyboards/xd60/keymaps/krusli/readme.md
@@ -1,7 +1,7 @@
 # krusli's Keymap for XIUDI's 60% XD60 PCB
 
 ## Additional Notes
-Keymap for the XD60 with 2.25u left shift and split backspace. HHKB-like function layer.
+Keymap for the XD60 (ANSI) with 2.25u left shift, split right shift. HHKB-like function layer.
 
 ## Build
 To build this keymap, simply run `make xd60:krusli` on the top-level directory for QMK.