Add `60_ansi_tsangan_split_bs_rshift` to community layouts (#24186)

5 files changed, 13 insertions, 7 deletions

diff --git a/keyboards/jacky_studio/piggy60/info.json b/keyboards/jacky_studio/piggy60/info.json
index 9f85193916..39cc3fe9ee 100644
--- a/keyboards/jacky_studio/piggy60/info.json
+++ b/keyboards/jacky_studio/piggy60/info.json
@@ -139,7 +139,7 @@
                 {"label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4}
             ]
         },
-        "LAYOUT_60_tsangan_hhkb": {
+        "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
             "layout": [
                 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
                 {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
@@ -205,5 +205,8 @@
                 {"label": "Ctrl", "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4}
             ]
         }
+    },
+    "layout_aliases": {
+        "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
     }
 }
diff --git a/keyboards/jacky_studio/piggy60/keymaps/default/keymap.c b/keyboards/jacky_studio/piggy60/keymaps/default/keymap.c
index d2458a1422..f3d83c98ae 100644
--- a/keyboards/jacky_studio/piggy60/keymaps/default/keymap.c
+++ b/keyboards/jacky_studio/piggy60/keymaps/default/keymap.c
@@ -23,14 +23,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │Ctrl │GUI│ Alt │                           │ Alt │GUI│ Ctrl│
      * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
      */
-    [0] = LAYOUT_60_tsangan_hhkb(
+    [0] = 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,  
         LT(1,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,  LT(1,KC_MUTE),            
         KC_LCTL,        KC_LGUI,  KC_LALT,                                          KC_SPC,                       KC_RALT,            KC_RGUI,  KC_RCTL
     ),
-    [1] = LAYOUT_60_tsangan_hhkb(
+    [1] = 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,   KC_INS,   KC_PSCR,
         KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_PGUP,  KC_HOME,  KC_TRNS,   KC_VOLU,  KC_BRIU,  KC_TRNS,  KC_WH_U,  KC_TRNS,  KC_TRNS,  KC_DEL,
         KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_PGDN,  KC_END,   KC_TRNS,   KC_VOLD,  KC_BRID,  KC_TRNS,  KC_WH_D,  KC_TRNS,            KC_TRNS,
diff --git a/keyboards/jacky_studio/piggy60/rev1/hotswap/keyboard.json b/keyboards/jacky_studio/piggy60/rev1/hotswap/keyboard.json
index 8b10920700..71fbbefa0a 100644
--- a/keyboards/jacky_studio/piggy60/rev1/hotswap/keyboard.json
+++ b/keyboards/jacky_studio/piggy60/rev1/hotswap/keyboard.json
@@ -1,4 +1,4 @@
 {
     "diode_direction": "ROW2COL",
-    "community_layouts": ["60_hhkb", "60_tsangan_hhkb"]
+    "community_layouts": ["60_hhkb", "60_ansi_tsangan_split_bs_rshift"]
 }
diff --git a/keyboards/jacky_studio/piggy60/rev1/solder/keyboard.json b/keyboards/jacky_studio/piggy60/rev1/solder/keyboard.json
index 3f4d4a2632..4c792f8ff9 100644
--- a/keyboards/jacky_studio/piggy60/rev1/solder/keyboard.json
+++ b/keyboards/jacky_studio/piggy60/rev1/solder/keyboard.json
@@ -4,11 +4,11 @@
        "60_ansi",
        "60_ansi_split_bs_rshift",
        "60_ansi_tsangan",
+       "60_ansi_tsangan_split_bs_rshift",
        "60_hhkb",
        "60_iso",
        "60_iso_split_bs_rshift",
        "60_iso_tsangan",
-       "60_tsangan_hhkb"
     ],
     "layouts": {
         "LAYOUT_60_ansi": {
diff --git a/keyboards/jacky_studio/piggy60/rev2/keyboard.json b/keyboards/jacky_studio/piggy60/rev2/keyboard.json
index 2a3c7e3313..4dcc0cbab6 100644
--- a/keyboards/jacky_studio/piggy60/rev2/keyboard.json
+++ b/keyboards/jacky_studio/piggy60/rev2/keyboard.json
@@ -1,7 +1,6 @@
 {
     "bootloader": "uf2boot",
     "diode_direction": "ROW2COL",
-    "community_layouts": ["60_hhkb", "60_tsangan_hhkb"],
     "features": {
         "bootmagic": true,
         "extrakey": true,
@@ -79,6 +78,10 @@
         "device_version": "2.0.0",
         "pid": "0x1002"
     },
+    "layout_aliases": {
+        "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
+    },
+    "community_layouts": ["60_hhkb", "60_ansi_tsangan_split_bs_rshift"],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -213,7 +216,7 @@
                 {"label": "Alt", "matrix": [4, 12], "x": 12.5, "y": 4}
             ]
         },
-        "LAYOUT_60_tsangan_hhkb": {
+        "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
             "layout": [
                 {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
                 {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},