Use new 60_ansi_tsangan_split_bs_rshift layout

bcat · Nov 3, 2024 · f862a20 · f862a20
1 parent 3fc41b5
commit f862a20
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,8 @@ canonical ones (preferred for typing and gaming, respectively).
   * Used on: Crkbd
   * Columnar-staggered split ergo layout, preferred for typing
 
-* [60% ANSI Tsangan HHKB layout](layouts/60_tsangan_hhkb/bcat)
+* [60% ANSI Tsangan layout with split Backspace and Right
+  Shift](layouts/60_ansi_tsangan_split_bs_rshift/bcat)
   * Used on: ai03 Polaris, CannonKeys AN-C, CannonKeys Instant60, DZ60
   * Row-staggered layout, preferred for gaming
 

diff --git a/layouts/60_tsangan_hhkb/bcat/keymap.c → ...nsi_tsangan_split_bs_rshift/bcat/keymap.c b/layouts/60_tsangan_hhkb/bcat/keymap.c → ...nsi_tsangan_split_bs_rshift/bcat/keymap.c
@@ -20,21 +20,21 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
-    [LAYER_DEFAULT] = LAYOUT_60_tsangan_hhkb(
+    [LAYER_DEFAULT] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
         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_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,                      CC_RFN,
         KC_LCTL,  CC_LFN,   KC_LALT,                                KC_SPC,                                           KC_RALT,  KC_RGUI,            KC_RCTL
     ),
-    [LAYER_FUNCTION] = LAYOUT_60_tsangan_hhkb(
+    [LAYER_FUNCTION] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
         _______,  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_INS,   KC_DEL,
         KC_CAPS,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SCRL,  KC_PAUS,  KC_UP,    _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,            _______,
         _______,  KC_APP,   _______,  _______,  _______,  _______,  _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,                      _______,
         _______,  _______,  _______,                                _______,                                          _______,  _______,            _______
     ),
-    [LAYER_ADJUST] = LAYOUT_60_tsangan_hhkb(
+    [LAYER_ADJUST] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EE_CLR,   QK_BOOT,  _______,  _______,  _______,  RGB_VAI,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  BL_UP,    _______,  RGB_SPI,  RGB_HUI,  RGB_SAI,  RGB_RMOD, RGB_MOD,            RGB_TOG,

diff --git a/...uts/60_tsangan_hhkb/bcat/layer_adjust.png → ...gan_split_bs_rshift/bcat/layer_adjust.png b/...uts/60_tsangan_hhkb/bcat/layer_adjust.png → ...gan_split_bs_rshift/bcat/layer_adjust.png
diff --git a/...ts/60_tsangan_hhkb/bcat/layer_default.png → ...an_split_bs_rshift/bcat/layer_default.png b/...ts/60_tsangan_hhkb/bcat/layer_default.png → ...an_split_bs_rshift/bcat/layer_default.png
diff --git a/...s/60_tsangan_hhkb/bcat/layer_function.png → ...n_split_bs_rshift/bcat/layer_function.png b/...s/60_tsangan_hhkb/bcat/layer_function.png → ...n_split_bs_rshift/bcat/layer_function.png
diff --git a/layouts/60_tsangan_hhkb/bcat/readme.md → ...si_tsangan_split_bs_rshift/bcat/readme.md b/layouts/60_tsangan_hhkb/bcat/readme.md → ...si_tsangan_split_bs_rshift/bcat/readme.md
@@ -1,4 +1,4 @@
-# bcat's 60% ANSI Tsangan HHKB layout
+# bcat's 60% ANSI Tsangan layout with split Backspace and Right Shift
 
 This is a Tsangan/HHKB (split Backspace, split Right Shift) layout based on the
 [traditional HHKB layout](https://hhkb.io/layout/) with some custom [DIP

diff --git a/qmk.json b/qmk.json
@@ -6,21 +6,21 @@
             "ai03/polaris",
             "bcat",
             {
-                "FORCE_LAYOUT": "60_tsangan_hhkb"
+                "FORCE_LAYOUT": "60_ansi_tsangan_split_bs_rshift"
             }
         ],
         [
             "cannonkeys/an_c",
             "bcat",
             {
-                "FORCE_LAYOUT": "60_tsangan_hhkb"
+                "FORCE_LAYOUT": "60_ansi_tsangan_split_bs_rshift"
             }
         ],
         [
             "cannonkeys/instant60",
             "bcat",
             {
-                "FORCE_LAYOUT": "60_tsangan_hhkb"
+                "FORCE_LAYOUT": "60_ansi_tsangan_split_bs_rshift"
             }
         ],
         [
@@ -41,7 +41,7 @@
             "dz60",
             "bcat",
             {
-                "FORCE_LAYOUT": "60_tsangan_hhkb"
+                "FORCE_LAYOUT": "60_ansi_tsangan_split_bs_rshift"
             }
         ],
         ["eco/rev2", "bcat"],