aboutsummaryrefslogtreecommitdiff
path: root/keyboards/chlx/merro60
diff options
context:
space:
mode:
authorRyan <[email protected]>2024-09-02 09:13:28 +1000
committerGitHub <[email protected]>2024-09-02 09:13:28 +1000
commit28b6a8841fcc4f3198b107f1ae0bf4e3badf3fca (patch)
treee49e8e75a464455d253e1526a1279b27ac256611 /keyboards/chlx/merro60
parent884a808813fe9e5f90aab4079a5944997465161e (diff)
downloadqmk_firmware-28b6a8841fcc4f3198b107f1ae0bf4e3badf3fca.tar.gz
qmk_firmware-28b6a8841fcc4f3198b107f1ae0bf4e3badf3fca.zip
Add `60_ansi_tsangan_split_bs_rshift` to community layouts (#24186)
Diffstat (limited to 'keyboards/chlx/merro60')
-rw-r--r--keyboards/chlx/merro60/keyboard.json13
-rw-r--r--keyboards/chlx/merro60/keymaps/tsangan/keymap.c4
2 files changed, 12 insertions, 5 deletions
diff --git a/keyboards/chlx/merro60/keyboard.json b/keyboards/chlx/merro60/keyboard.json
index 700af7e7e7..31f83f80a5 100644
--- a/keyboards/chlx/merro60/keyboard.json
+++ b/keyboards/chlx/merro60/keyboard.json
@@ -33,9 +33,16 @@
"LAYOUT_default": "LAYOUT_all",
"LAYOUT_hhkb": "LAYOUT_60_hhkb",
"LAYOUT_iso": "LAYOUT_60_iso_split_bs_rshift",
- "LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb"
+ "LAYOUT_tsangan": "LAYOUT_60_ansi_tsangan_split_bs_rshift",
+ "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift"
},
- "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_tsangan_hhkb"],
+ "community_layouts": [
+ "60_ansi",
+ "60_ansi_split_bs_rshift",
+ "60_ansi_tsangan_split_bs_rshift",
+ "60_hhkb",
+ "60_iso"
+ ],
"layouts": {
"LAYOUT_all": {
"layout": [
@@ -460,7 +467,7 @@
{"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
},
- "LAYOUT_60_tsangan_hhkb": {
+ "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/chlx/merro60/keymaps/tsangan/keymap.c b/keyboards/chlx/merro60/keymaps/tsangan/keymap.c
index 557711eeed..e7266d227e 100644
--- a/keyboards/chlx/merro60/keymaps/tsangan/keymap.c
+++ b/keyboards/chlx/merro60/keymaps/tsangan/keymap.c
@@ -19,14 +19,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_60_tsangan_hhkb(
+[0] = 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_BSPC, 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_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, MO(1),
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_DEL, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,