From ddb1a1fe8d412405b7f39386c622ee325609f694 Mon Sep 17 00:00:00 2001 From: Fernando Birra Date: Sat, 18 Nov 2023 14:39:54 +0000 Subject: [PATCH] Keymap changes --- keyboards/royal_kludge/rk61_rgb/info.json | 2 +- .../rk61_rgb/keymaps/via/keymap.c | 56 +++++++++---------- .../rk61_rgb/keymaps/via/rk61-rgb_via.json | 2 +- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/keyboards/royal_kludge/rk61_rgb/info.json b/keyboards/royal_kludge/rk61_rgb/info.json index f180d92f0572..d9257dc86e89 100644 --- a/keyboards/royal_kludge/rk61_rgb/info.json +++ b/keyboards/royal_kludge/rk61_rgb/info.json @@ -8,7 +8,7 @@ "processor": "SN32F248BF", "usb": { "vid": "0x0C45", - "pid": "0x024F", + "pid": "0x8016", "device_version": "1.0.0", "force_nkro": true }, diff --git a/keyboards/royal_kludge/rk61_rgb/keymaps/via/keymap.c b/keyboards/royal_kludge/rk61_rgb/keymaps/via/keymap.c index db2ee93441fc..d85b7a511253 100644 --- a/keyboards/royal_kludge/rk61_rgb/keymaps/via/keymap.c +++ b/keyboards/royal_kludge/rk61_rgb/keymaps/via/keymap.c @@ -17,40 +17,40 @@ #include QMK_KEYBOARD_H enum layer_names { - _MAC_BASE, - _MAC_FN, - _WIN_BASE, - _WIN_FN + _MAC, + _MACFN, + _VIA1, + _VIA2 }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_MAC_BASE] = { - { 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_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_NO, KC_ENT, }, - { KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, }, - { KC_LCTL, KC_LALT, KC_LCMD, KC_NO, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_RCMD, KC_RALT, KC_RCTL, KC_NO, MO(_MAC_FN), } + [_MAC] = { + { 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_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_NO, KC_ENT, }, + { KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, }, + { KC_LCTL, KC_LALT, KC_LCMD, KC_NO, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_RCMD, KC_RALT, KC_RCTL, KC_NO, MO(_MACFN), } }, - [_MAC_FN] = { - { 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, }, - { KC_TRNS, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_PSCR, KC_SCRL, KC_PAUS, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_MOD, }, - { KC_TRNS, DF(_WIN_BASE), KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, }, - { KC_TRNS, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, KC_DEL, KC_END, KC_PGDN, RGB_HUI, KC_UP, KC_TRNS, KC_TRNS, }, - { QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, } + [_MACFN] = { + { 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, }, + { KC_TRNS, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_PSCR, KC_SCRL, KC_PAUS, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_MOD, }, + { KC_TRNS, AG_SWAP, AG_NORM, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, }, + { KC_TRNS, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, KC_DEL, KC_END, KC_PGDN, RGB_HUI, KC_UP, KC_TRNS, KC_TRNS, }, + { QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, } }, - [_WIN_BASE] = { - { 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_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_NO, KC_ENT, }, - { KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, }, - { KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_RALT, KC_APP, KC_RCTL, KC_NO, MO(_WIN_FN), } + [_VIA1] = { + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, }, }, - [_WIN_FN] = { - { 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, }, - { KC_TRNS, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_PSCR, KC_SCRL, KC_PAUS, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, RGB_MOD, }, - { KC_TRNS, KC_NO, DF(_MAC_BASE), KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, }, - { KC_TRNS, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, KC_DEL, KC_END, KC_PGDN, RGB_HUI, KC_UP, KC_TRNS, KC_TRNS, }, - { QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, } + [_VIA2] = { + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, }, + { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, }, } }; diff --git a/keyboards/royal_kludge/rk61_rgb/keymaps/via/rk61-rgb_via.json b/keyboards/royal_kludge/rk61_rgb/keymaps/via/rk61-rgb_via.json index b305b260f4fa..5c71333764bd 100644 --- a/keyboards/royal_kludge/rk61_rgb/keymaps/via/rk61-rgb_via.json +++ b/keyboards/royal_kludge/rk61_rgb/keymaps/via/rk61-rgb_via.json @@ -1,7 +1,7 @@ { "name": "Royal Kludge RK61 RGB", "vendorId": "0x0C45", - "productId": "0x024F", + "productId": "0x8016", "menus": ["qmk_rgb_matrix"], "matrix": {"rows": 5, "cols": 14}, "layouts": {