From f7bb1c69319c7e0ccc689102285b309b27efbfcf Mon Sep 17 00:00:00 2001 From: HorrorTroll Date: Mon, 23 Jun 2025 13:56:28 +0700 Subject: [PATCH] Resolved changes suggested --- keyboards/horrortroll/cat/60/info.json | 11 ++++++++++ .../cat/60/rev1/hotswap/keyboard.json | 19 +++------------- .../60/rev1/hotswap/keymaps/default/keymap.c | 4 ++-- keyboards/horrortroll/cat/60/rev1/info.json | 13 +++++++++++ .../cat/60/rev1/solder/keyboard.json | 19 +++------------- .../cat/60/rev2/hotswap/keyboard.json | 22 ++++--------------- .../60/rev2/hotswap/keymaps/default/keymap.c | 4 ++-- keyboards/horrortroll/cat/60/rev2/info.json | 14 ++++++++++++ .../cat/60/rev2/solder/keyboard.json | 22 ++++--------------- 9 files changed, 56 insertions(+), 72 deletions(-) create mode 100644 keyboards/horrortroll/cat/60/info.json create mode 100644 keyboards/horrortroll/cat/60/rev1/info.json create mode 100644 keyboards/horrortroll/cat/60/rev2/info.json diff --git a/keyboards/horrortroll/cat/60/info.json b/keyboards/horrortroll/cat/60/info.json new file mode 100644 index 00000000000..6c119af448a --- /dev/null +++ b/keyboards/horrortroll/cat/60/info.json @@ -0,0 +1,11 @@ +{ + "keyboard_name": "Cat 60", + "manufacturer": "HorrorTroll", + "maintainer": "HorrorTroll", + "usb": { + "vid": "0x7516", + }, + "diode_direction": "COL2ROW", + "processor": "RP2040", + "bootloader": "rp2040" +} \ No newline at end of file diff --git a/keyboards/horrortroll/cat/60/rev1/hotswap/keyboard.json b/keyboards/horrortroll/cat/60/rev1/hotswap/keyboard.json index 042bce90445..05aa6b5141b 100644 --- a/keyboards/horrortroll/cat/60/rev1/hotswap/keyboard.json +++ b/keyboards/horrortroll/cat/60/rev1/hotswap/keyboard.json @@ -1,26 +1,13 @@ { - "keyboard_name": "Cat 60", - "manufacturer": "HorrorTroll", - "maintainer": "HorrorTroll", "usb": { - "vid": "0x7516", - "pid": "0x6006", - "device_version": "0.0.1" + "pid": "0x6006" }, - "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["GP3", "GP24", "GP2", "GP1", "GP0", "GP4", "GP16", "GP11", "GP10", "GP9", "GP8", "GP15", "GP14", "GP13"], "rows": ["GP25", "GP26", "GP7", "GP12", "GP17"] }, - "processor": "RP2040", - "bootloader": "rp2040", - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": false, - "nkro": true + "layout_aliases": { + "LAYOUT_all": "LAYOUT_60_ansi_tsangan_split_bs_rshift" }, "community_layouts": [ "60_ansi_tsangan", diff --git a/keyboards/horrortroll/cat/60/rev1/hotswap/keymaps/default/keymap.c b/keyboards/horrortroll/cat/60/rev1/hotswap/keymaps/default/keymap.c index cda4b52c047..2cac052667d 100644 --- a/keyboards/horrortroll/cat/60/rev1/hotswap/keymaps/default/keymap.c +++ b/keyboards/horrortroll/cat/60/rev1/hotswap/keymaps/default/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ */ /* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 */ - [_BASE] = LAYOUT_60_tsangan_hhkb( + [_BASE] = 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_GRV, 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, @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ */ /* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 */ - [_FN] = LAYOUT_60_tsangan_hhkb( + [_FN] = 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, _______, KC_UP, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/horrortroll/cat/60/rev1/info.json b/keyboards/horrortroll/cat/60/rev1/info.json new file mode 100644 index 00000000000..626b88ac2eb --- /dev/null +++ b/keyboards/horrortroll/cat/60/rev1/info.json @@ -0,0 +1,13 @@ +{ + "usb": { + "device_version": "1.0.0" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true + } +} \ No newline at end of file diff --git a/keyboards/horrortroll/cat/60/rev1/solder/keyboard.json b/keyboards/horrortroll/cat/60/rev1/solder/keyboard.json index a94d39b1630..c070d968700 100644 --- a/keyboards/horrortroll/cat/60/rev1/solder/keyboard.json +++ b/keyboards/horrortroll/cat/60/rev1/solder/keyboard.json @@ -1,26 +1,13 @@ { - "keyboard_name": "Cat 60", - "manufacturer": "HorrorTroll", - "maintainer": "HorrorTroll", "usb": { - "vid": "0x7516", - "pid": "0x6004", - "device_version": "0.0.1" + "pid": "0x6004" }, - "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["GP3", "GP24", "GP2", "GP1", "GP0", "GP4", "GP16", "GP11", "GP10", "GP9", "GP15", "GP8", "GP14", "GP13"], "rows": ["GP25", "GP26", "GP7", "GP12", "GP17"] }, - "processor": "RP2040", - "bootloader": "rp2040", - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": false, - "nkro": true + "layout_aliases": { + "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift" }, "community_layouts": [ "60_ansi", diff --git a/keyboards/horrortroll/cat/60/rev2/hotswap/keyboard.json b/keyboards/horrortroll/cat/60/rev2/hotswap/keyboard.json index 7f80de743cc..973789f7978 100644 --- a/keyboards/horrortroll/cat/60/rev2/hotswap/keyboard.json +++ b/keyboards/horrortroll/cat/60/rev2/hotswap/keyboard.json @@ -1,28 +1,11 @@ { - "keyboard_name": "Cat 60", - "manufacturer": "HorrorTroll", - "maintainer": "HorrorTroll", "usb": { - "vid": "0x7516", - "pid": "0x6008", - "device_version": "0.0.2" + "pid": "0x6008" }, - "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["GP4", "GP24", "GP3", "GP2", "GP1", "GP5", "GP16", "GP11", "GP10", "GP9", "GP8", "GP15", "GP14", "GP13"], "rows": ["GP25", "GP26", "GP7", "GP12", "GP17"] }, - "processor": "RP2040", - "bootloader": "rp2040", - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": false, - "nkro": true, - "rgblight": true - }, "ws2812": { "driver": "vendor", "pin": "GP0" @@ -43,6 +26,9 @@ "twinkle": true } }, + "layout_aliases": { + "LAYOUT_all": "LAYOUT_60_ansi_tsangan_split_bs_rshift" + }, "community_layouts": [ "60_ansi_tsangan", "60_ansi_tsangan_split_bs_rshift", diff --git a/keyboards/horrortroll/cat/60/rev2/hotswap/keymaps/default/keymap.c b/keyboards/horrortroll/cat/60/rev2/hotswap/keymaps/default/keymap.c index cda4b52c047..2cac052667d 100644 --- a/keyboards/horrortroll/cat/60/rev2/hotswap/keymaps/default/keymap.c +++ b/keyboards/horrortroll/cat/60/rev2/hotswap/keymaps/default/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ */ /* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 */ - [_BASE] = LAYOUT_60_tsangan_hhkb( + [_BASE] = 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_GRV, 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, @@ -62,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘ */ /* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 */ - [_FN] = LAYOUT_60_tsangan_hhkb( + [_FN] = 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, _______, KC_UP, _______, _______, _______, _______, _______, KC_INS, _______, KC_PSCR, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/horrortroll/cat/60/rev2/info.json b/keyboards/horrortroll/cat/60/rev2/info.json new file mode 100644 index 00000000000..41a8ef37acf --- /dev/null +++ b/keyboards/horrortroll/cat/60/rev2/info.json @@ -0,0 +1,14 @@ +{ + "usb": { + "device_version": "2.0.0" + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "rgblight": true + } +} \ No newline at end of file diff --git a/keyboards/horrortroll/cat/60/rev2/solder/keyboard.json b/keyboards/horrortroll/cat/60/rev2/solder/keyboard.json index 5e7190cb438..cd1cca3a5c4 100644 --- a/keyboards/horrortroll/cat/60/rev2/solder/keyboard.json +++ b/keyboards/horrortroll/cat/60/rev2/solder/keyboard.json @@ -1,28 +1,11 @@ { - "keyboard_name": "Cat 60", - "manufacturer": "HorrorTroll", - "maintainer": "HorrorTroll", "usb": { - "vid": "0x7516", - "pid": "0x6007", - "device_version": "0.0.2" + "pid": "0x6007" }, - "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["GP4", "GP24", "GP3", "GP2", "GP1", "GP5", "GP16", "GP11", "GP10", "GP9", "GP15", "GP8", "GP14", "GP13"], "rows": ["GP25", "GP26", "GP7", "GP12", "GP17"] }, - "processor": "RP2040", - "bootloader": "rp2040", - "features": { - "bootmagic": true, - "mousekey": true, - "extrakey": true, - "console": false, - "command": false, - "nkro": true, - "rgblight": true - }, "ws2812": { "driver": "vendor", "pin": "GP0" @@ -43,6 +26,9 @@ "twinkle": true } }, + "layout_aliases": { + "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift" + }, "community_layouts": [ "60_ansi", "60_ansi_split_bs_rshift",