LAYOUT_60_tsangan_hhkb -> LAYOUT_60_ansi_tsangan_split_bs_rshift

haunt98 · Sep 13, 2024 · c0ad2a2 · c0ad2a2
1 parent e27a65b
commit c0ad2a2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/hineybush_h60/keymap_drawer/keymap.yaml b/hineybush_h60/keymap_drawer/keymap.yaml
@@ -1,4 +1,8 @@
-layout: { qmk_keyboard: hineybush/h60, qmk_layout: LAYOUT_60_tsangan_hhkb }
+layout:
+  {
+    qmk_keyboard: hineybush/h60,
+    qmk_layout: LAYOUT_60_ansi_tsangan_split_bs_rshift,
+  }
 layers:
   L0:
     - { t: "$$mdi:keyboard-esc$$", type: esc }

diff --git a/hineybush_h60/keymaps/haunt98/keymap.c b/hineybush_h60/keymaps/haunt98/keymap.c
@@ -10,28 +10,28 @@
 // https://github.com/qmk/qmk_firmware/blob/master/docs/features/space_cadet.md
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [LAYER_QWERTY] = LAYOUT_60_tsangan_hhkb(
+    [LAYER_QWERTY] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
         QK_GESC,  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,
         CTL_ESC,  KC_A,     KC_S,     KC_D,    KC_F,     KC_G,     KC_H,    KC_J,  KC_K,     KC_L,    KC_SCLN,  KC_QUOT,  KC_ENT,
         SC_LSPO,  KC_Z,     KC_X,     KC_C,    KC_V,     KC_B,     KC_N,    KC_M,  KC_COMM,  KC_DOT,  KC_SLSH,  SC_RSPC,  TL_LOWR,
         XXXXXXX,  KC_LOPT,  KC_LCMD,  KC_SPC,  KC_RCMD,  TL_UPPR,  XXXXXXX
     ),
-    [LAYER_LOWER] = LAYOUT_60_tsangan_hhkb(
+    [LAYER_LOWER] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
         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,   XXXXXXX,  XXXXXXX,
         XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_UP,    XXXXXXX,  KC_DEL,
         XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_LEFT,  KC_RGHT,  XXXXXXX,
         _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_DOWN,  _______,  XXXXXXX,
         XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,  XXXXXXX
     ),
-    [LAYER_UPPER] = LAYOUT_60_tsangan_hhkb(
+    [LAYER_UPPER] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
         XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
         XXXXXXX,  KC_BRMD,  KC_BRMU,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
         KC_CAPS,  KC_VOLD,  KC_VOLU,  KC_MUTE,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
         _______,  UG_HUEU,  UG_SATU,  UG_VALU,  UG_SPDU,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  _______,  _______,
         XXXXXXX,  UG_TOGG,  UG_NEXT,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX
     ),
-    [LAYER_ADJUST] = LAYOUT_60_tsangan_hhkb(
+    [LAYER_ADJUST] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
         QK_BOOT,  EE_CLR,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
         XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
         XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,

diff --git a/hineybush_h60/keymaps_json/haunt98/keymap.json b/hineybush_h60/keymaps_json/haunt98/keymap.json
@@ -7,5 +7,5 @@
         ["KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_BRMD", "KC_BRMU", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_CAPS", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "UG_HUEU", "UG_SATU", "UG_VALU", "UG_SPDU", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_TRNS", "KC_TRNS", "KC_NO", "UG_TOGG", "UG_NEXT", "KC_NO", "KC_NO", "KC_NO", "KC_NO"],
         ["QK_BOOT", "EE_CLR", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO", "KC_NO"]
     ],
-    "layout": "LAYOUT_60_tsangan_hhkb"
+    "layout": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
 }