From 5cc5270aaf07a57bc086ef563b46e8bd84ab9cd4 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 22 Sep 2023 15:59:41 -0700 Subject: [PATCH] Royal Kludge RK G68 Community Layout Support (#22103) * Rename `LAYOUT` to `LAYOUT_65_ansi` [refactor] * Enable Community Layout support [enhancement] * Touch-up keymaps - fix keycode grid alignment [style] * Touch-up readme - link to maintainer's GitHub profile - specify codebase is for RGB version of RK G68 - update Hardware Availability links [docs] --- keyboards/rkg68/info.json | 6 +++++- keyboards/rkg68/keymaps/default/keymap.c | 8 ++++---- keyboards/rkg68/keymaps/via/keymap.c | 8 ++++---- keyboards/rkg68/readme.md | 14 +++++++------- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/keyboards/rkg68/info.json b/keyboards/rkg68/info.json index c0043377a95..72244d50d69 100644 --- a/keyboards/rkg68/info.json +++ b/keyboards/rkg68/info.json @@ -30,8 +30,12 @@ "pid": "0x0049", "vid": "0x0049" }, + "layout_aliases": { + "LAYOUT": "LAYOUT_65_ansi" + }, + "community_layouts": ["65_ansi"], "layouts": { - "LAYOUT": { + "LAYOUT_65_ansi": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, diff --git a/keyboards/rkg68/keymaps/default/keymap.c b/keyboards/rkg68/keymaps/default/keymap.c index 2631452b5ba..09f81e64511 100644 --- a/keyboards/rkg68/keymaps/default/keymap.c +++ b/keyboards/rkg68/keymaps/default/keymap.c @@ -17,18 +17,18 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_65_ansi( 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_BSPC, 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_BSLS, KC_DEL, 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_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT( + [1] = LAYOUT_65_ansi( KC_TRNS, 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_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, RGB_MOD, KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BRK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_SCRL, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_VAD, RGB_SPD + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_VAD, RGB_SPD ) -}; \ No newline at end of file +}; diff --git a/keyboards/rkg68/keymaps/via/keymap.c b/keyboards/rkg68/keymaps/via/keymap.c index 2631452b5ba..09f81e64511 100644 --- a/keyboards/rkg68/keymaps/via/keymap.c +++ b/keyboards/rkg68/keymaps/via/keymap.c @@ -17,18 +17,18 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_65_ansi( 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_BSPC, 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_BSLS, KC_DEL, 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_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT( + [1] = LAYOUT_65_ansi( KC_TRNS, 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_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, RGB_MOD, KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BRK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_SCRL, - QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_VAD, RGB_SPD + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_VAD, RGB_SPD ) -}; \ No newline at end of file +}; diff --git a/keyboards/rkg68/readme.md b/keyboards/rkg68/readme.md index 8069a53169e..c0c4a583ba5 100644 --- a/keyboards/rkg68/readme.md +++ b/keyboards/rkg68/readme.md @@ -1,10 +1,10 @@ -# RK G68 +# Royal Kludge RK G68 -![Keyboard picture](https://imgur.com/UnOJPZrh.jpg) +![Royal Kludge RK G68](https://imgur.com/UnOJPZrh.jpg) -* Keyboard Maintainer: [Royal Kludge](https://rkgamingstore.com/) -* Hardware Supported: Royal Kludge RK G68 -* Hardware Availability: [RKG 68](http://en.rkgaming.com/download/1/) +* Keyboard Maintainer: [Thomaz Peres](https://github.com/Thomaz-Peres) +* Hardware Supported: Royal Kludge RK G68, RGB version +* Hardware Availability: [RKGaming.com](http://en.rkgaming.com/product/13/), [Amazon.com](https://www.amazon.com/RK-ROYAL-KLUDGE-Bluetooth-Mechanical/dp/B08JCRMZX9/) After setting up your build environment, you can compile the default keymap by using: @@ -24,8 +24,8 @@ Enter the bootloader in 3 ways: - **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead - **Keycode in layout**: Press the key `FN` and `Left CTRL`. -## Layouts +## Layout -- ANSI layout; +- 65% Standard ANSI layout ![Imgur](https://i.imgur.com/l7ka1gkh.png)