Deprecate KC_LOCK for QK_LOCK (#18796)
				
					
				
			This commit is contained in:
		| @@ -2,17 +2,17 @@ | ||||
|  | ||||
| Sometimes you may find yourself needing to hold down a specific key for a long period of time. Key Lock holds down the next key you press for you. Press it again, and it will be released. | ||||
|  | ||||
| Let's say you need to type in ALL CAPS for a few sentences. Hit `KC_LOCK`, and then Shift. Now, Shift will be considered held until you tap it again. You can think of Key Lock as Caps Lock, but supercharged. | ||||
| Let's say you need to type in ALL CAPS for a few sentences. Hit `QK_LOCK`, and then Shift. Now, Shift will be considered held until you tap it again. You can think of Key Lock as Caps Lock, but supercharged. | ||||
|  | ||||
| ## Usage | ||||
|  | ||||
| First, enable Key Lock by setting `KEY_LOCK_ENABLE = yes` in your `rules.mk`. Then pick a key in your keymap and assign it the keycode `KC_LOCK`. | ||||
| First, enable Key Lock by setting `KEY_LOCK_ENABLE = yes` in your `rules.mk`. Then pick a key in your keymap and assign it the keycode `QK_LOCK`. | ||||
|  | ||||
| ## Keycodes | ||||
|  | ||||
| |Keycode  |Description                                                   | | ||||
| |---------|--------------------------------------------------------------| | ||||
| |`KC_LOCK`|Hold down the next key pressed, until the key is pressed again| | ||||
| |`QK_LOCK`|Hold down the next key pressed, until the key is pressed again| | ||||
|  | ||||
| ## Caveats | ||||
|  | ||||
|   | ||||
| @@ -305,7 +305,7 @@ See also: [Key Lock](feature_key_lock.md) | ||||
|  | ||||
| |Key      |Description                                                   | | ||||
| |---------|--------------------------------------------------------------| | ||||
| |`KC_LOCK`|Hold down the next key pressed, until the key is pressed again| | ||||
| |`QK_LOCK`|Hold down the next key pressed, until the key is pressed again| | ||||
|  | ||||
| ## Layer Switching :id=layer-switching | ||||
|  | ||||
|   | ||||
| @@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, | ||||
|         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_INS, KC_HOME, KC_PGUP, KC_TRNS, | ||||
|         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS, | ||||
|         KC_TRNS, KC_TRNS, KC_LOCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, C(A(KC_DEL)) | ||||
|         KC_TRNS, KC_TRNS, QK_LOCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, C(A(KC_DEL)) | ||||
|     ) | ||||
| }; | ||||
| @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, | ||||
|         KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_INS, KC_HOME, KC_PGUP, KC_TRNS, | ||||
|         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END, KC_PGDN, KC_TRNS, | ||||
|         KC_TRNS, KC_TRNS, KC_LOCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, C(A(KC_DEL)) | ||||
|         KC_TRNS, KC_TRNS, QK_LOCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, C(A(KC_DEL)) | ||||
|     ), | ||||
|     [2] = LAYOUT_60_ansi( | ||||
|         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_TRNS, | ||||
|   | ||||
| @@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|  */ | ||||
| [_FN] = { | ||||
|   {_______, _______, _______, _______, _______, _______, _______, DE_UDIA, _______, DE_ODIA, _______, KC_DEL }, | ||||
|   {KC_LOCK, DE_ADIA, DE_SS,   _______, _______, G_1,     _______, RGB_M_P, RGB_M_B, RGB_M_SW,_______, _______}, | ||||
|   {QK_LOCK, DE_ADIA, DE_SS,   _______, _______, G_1,     _______, RGB_M_P, RGB_M_B, RGB_M_SW,_______, _______}, | ||||
|   {_______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_TOG, RGB_HUI, KC_PGUP, _______}, | ||||
|   {_______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END } | ||||
| }, | ||||
|   | ||||
| @@ -5,12 +5,6 @@ | ||||
|  | ||||
| #include "edvorakjp.h" | ||||
|  | ||||
| /* | ||||
|  * enum custom_keycodes { | ||||
|  *   KC_LOCK = NEW_SAFE_RANGE, | ||||
|  * }; | ||||
|  */ | ||||
|  | ||||
| #define LAYOUT_wrapper(...) LAYOUT_split_3x6_3(__VA_ARGS__) | ||||
|  | ||||
| // clang-format off | ||||
|   | ||||
| @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|                     _______,     _______,     _______,      QK_BOOT, | ||||
|                     _______,     _______,     _______,      KC_KP_PLUS, | ||||
|                     _______,     _______,     _______,      KC_KP_MINUS, | ||||
|         KC_LOCK,    _______,     _______,     _______,      KC_EQL | ||||
|         QK_LOCK,    _______,     _______,     _______,      KC_EQL | ||||
|     ), | ||||
| }; | ||||
|  | ||||
|   | ||||
| @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         _______,     _______,     _______,      QK_BOOT, | ||||
|         _______,     _______,     _______,      KC_KP_PLUS, | ||||
|         _______,     _______,     _______,      KC_KP_MINUS, | ||||
|         _______,     _______,     _______,      KC_EQL,         KC_LOCK | ||||
|         _______,     _______,     _______,      KC_EQL,         QK_LOCK | ||||
|   ), | ||||
| }; | ||||
|  | ||||
|   | ||||
| @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|                     _______,     _______,     _______,      QK_BOOT, | ||||
|                     _______,     _______,     _______,      KC_KP_PLUS, | ||||
|                     _______,     _______,     _______,      KC_KP_MINUS, | ||||
|         KC_LOCK,    _______,     _______,     _______,      KC_EQL | ||||
|         QK_LOCK,    _______,     _______,     _______,      KC_EQL | ||||
|     ), | ||||
| }; | ||||
|  | ||||
|   | ||||
| @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|                     _______,     _______,     _______,      QK_BOOT, | ||||
|                     _______,     _______,     _______,      KC_KP_PLUS, | ||||
|                     _______,     _______,     _______,      KC_KP_MINUS, | ||||
|         KC_LOCK,    _______,     _______,     _______,      KC_EQL | ||||
|         QK_LOCK,    _______,     _______,     _______,      KC_EQL | ||||
|     ), | ||||
| }; | ||||
|  | ||||
|   | ||||
| @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|                     _______,     _______,     _______,      QK_BOOT, | ||||
|                     _______,     _______,     _______,      KC_KP_PLUS, | ||||
|                     _______,     _______,     _______,      KC_KP_MINUS, | ||||
|         KC_LOCK,    _______,     _______,     _______,      KC_EQL | ||||
|         QK_LOCK,    _______,     _______,     _______,      KC_EQL | ||||
|     ), | ||||
|  | ||||
|     [2] = LAYOUT( | ||||
|   | ||||
| @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|                     _______,     _______,     _______,      QK_BOOT, | ||||
|                     _______,     _______,     _______,      KC_KP_PLUS, | ||||
|                     _______,     _______,     _______,      KC_KP_MINUS, | ||||
|         KC_LOCK,    _______,     _______,     _______,      KC_EQL | ||||
|         QK_LOCK,    _______,     _______,     _______,      KC_EQL | ||||
|     ), | ||||
|  | ||||
|     [2] = LAYOUT( | ||||
|   | ||||
| @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         _______,     _______,     _______,      QK_BOOT, | ||||
|         _______,     _______,     _______,      KC_KP_PLUS, | ||||
|         _______,     _______,     _______,      KC_KP_MINUS, | ||||
|         _______,     _______,     _______,      KC_EQL,         KC_LOCK | ||||
|         _______,     _______,     _______,      KC_EQL,         QK_LOCK | ||||
|   ), | ||||
| }; | ||||
|  | ||||
|   | ||||
| @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         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_TAB,  KC_NO,   KC_HOME,       KC_UP,               KC_END,          KC_NO,   KC_HOME, KC_PGDN, KC_PGUP, KC_END,   KC_NO,   KC_NO,   KC_NO,  KC_NO, | ||||
|         KC_CAPS, KC_NO,   KC_LEFT,       KC_DOWN,             KC_RIGHT,        KC_NO,   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_NO,   KC_NO,   KC_ENT, | ||||
|         KC_LSFT, KC_MPRV, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN,   KC_AUDIO_VOL_UP, KC_MNXT, KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_LOCK, KC_PGUP, KC_INS, | ||||
|         KC_LSFT, KC_MPRV, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN,   KC_AUDIO_VOL_UP, KC_MNXT, KC_NO,   KC_NO,   KC_NO,   KC_NO,    QK_LOCK, KC_PGUP, KC_INS, | ||||
|         KC_MEH,  KC_LALT, KC_LGUI,       KC_MEDIA_PLAY_PAUSE, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN,  KC_END | ||||
|     ), | ||||
|  | ||||
|   | ||||
| @@ -4,4 +4,4 @@ BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite | ||||
| MOUSEKEY_ENABLE = yes       # Mouse keys | ||||
| EXTRAKEY_ENABLE = yes       # Audio control and System control | ||||
| RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow | ||||
| KEY_LOCK_ENABLE = yes       # Enables use of KC_LOCK | ||||
| KEY_LOCK_ENABLE = yes | ||||
|   | ||||
| @@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     // |--------------||--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|------------------|| | ||||
|     // | ||||
|     // |------2.25--------|---Z----|---X----|---C----|---V----|---B----|---N----|---M----|---,----|---.----||----1.75------|--------|--------|| | ||||
|           KC_LSFT,         KC_MPRV, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, _______, _______, XXXXXXX, XXXXXXX,     KC_LOCK,     KC_PGUP,  KC_INS, | ||||
|           KC_LSFT,         KC_MPRV, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT, _______, _______, XXXXXXX, XXXXXXX,     QK_LOCK,     KC_PGUP,  KC_INS, | ||||
|     // |------------------|--------|--------|--------|--------|--------|--------|--------|--------|--------||--------------|--------|--------|| | ||||
|     // | ||||
|     // |---1.25---|---1.25---||---1.25---||--------2.75----------||---1.25---|------2.25--------||--------|--------|--------|--------|--------| | ||||
|   | ||||
| @@ -9,7 +9,7 @@ COMMAND_ENABLE = no         # Commands for debug and configuration | ||||
| NKRO_ENABLE = yes           # USB Nkey Rollover | ||||
| BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality | ||||
| RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow | ||||
| KEY_LOCK_ENABLE = yes       # Enables use of KC_LOCK | ||||
| KEY_LOCK_ENABLE = yes | ||||
|  | ||||
| # Enables including users/twschum/twschum.h | ||||
| USER_NAME := twschum | ||||
|   | ||||
| @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, KC_DEL,  KC_KP_7, KC_KP_8,   KC_KP_9, | ||||
|   KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_PAUS, KC_KP_4, KC_KP_5,   KC_KP_6, | ||||
|   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_ENT,  KC_KP_1, KC_KP_2,   KC_KP_3, | ||||
|   KC_LCTL, KC_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT | ||||
|   KC_LCTL, QK_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT | ||||
|   ), | ||||
|  | ||||
| /* RAISE | ||||
|   | ||||
| @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC, KC_DEL,  KC_KP_7, KC_KP_8,   KC_KP_9, | ||||
|   KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_PAUS, KC_KP_4, KC_KP_5,   KC_KP_6, | ||||
|   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_ENT,  KC_KP_1, KC_KP_2,   KC_KP_3, | ||||
|   KC_LCTL, KC_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC, KC_SPC, RAISE, KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT | ||||
|   KC_LCTL, QK_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC, KC_SPC, RAISE, KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT | ||||
|   ), | ||||
|  | ||||
| /* RAISE | ||||
|   | ||||
| @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC, KC_DEL,  KC_KP_7, KC_KP_8,   KC_KP_9, | ||||
|   KC_ESC,  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_KP_4, KC_KP_5,   KC_KP_6, | ||||
|   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_PAUS, KC_KP_1, KC_KP_2,   KC_KP_3, | ||||
|   KC_LCTL, KC_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC, KC_SPC, RAISE, KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT | ||||
|   KC_LCTL, QK_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC, KC_SPC, RAISE, KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT | ||||
|   ), | ||||
|  | ||||
| /* RAISE | ||||
|   | ||||
| @@ -3,7 +3,7 @@ EXTRAKEY_ENABLE  = yes # Audio control and System control | ||||
| COMMAND_ENABLE   = yes # Commands for debug and configuration | ||||
| NKRO_ENABLE      = yes # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | ||||
| SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard | ||||
| KEY_LOCK_ENABLE  = yes # Enable the KC_LOCK key | ||||
| KEY_LOCK_ENABLE  = yes | ||||
| TAP_DANCE_ENABLE = yes # Enable the tap dance feature. | ||||
| CONSOLE_ENABLE   = yes  # Console for debug | ||||
|  | ||||
|   | ||||
| @@ -3,7 +3,7 @@ EXTRAKEY_ENABLE  = yes # Audio control and System control | ||||
| COMMAND_ENABLE   = yes # Commands for debug and configuration | ||||
| NKRO_ENABLE      = yes # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | ||||
| SWAP_HANDS_ENABLE = yes # Allow swapping hands of keyboard | ||||
| KEY_LOCK_ENABLE  = yes # Enable the KC_LOCK key | ||||
| KEY_LOCK_ENABLE  = yes | ||||
| TAP_DANCE_ENABLE = yes # Enable the tap dance feature. | ||||
| CONSOLE_ENABLE   = yes  # Console for debug | ||||
|  | ||||
|   | ||||
| @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         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,\ | ||||
|         KC_LCTL,          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_LOCK, KC_Z,    KC_X,    KC_C,  KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ | ||||
|         KC_LSFT, QK_LOCK, KC_Z,    KC_X,    KC_C,  KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ | ||||
|         KC_HYPR, KC_LGUI, KC_LALT, LT(1, KC_SPC),                                           KC_RALT, KC_RGUI, KC_APP,  KC_RCTL), | ||||
|  | ||||
|     /* 1: spacefn with WASD arrows/navigation block and extra space key for | ||||
|   | ||||
| @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   LAYOUT( | ||||
|     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_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_NO,  \ | ||||
|     KC_LOCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_HOME, KC_ENT, \ | ||||
|     QK_LOCK, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_HOME, KC_ENT, \ | ||||
|     KC_LSFT, KC_BSLS, KC_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT,\ | ||||
|     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_NO,   MO(1),   KC_LEFT, KC_DOWN, KC_RGHT), | ||||
|   /* 1: fn */ | ||||
|   | ||||
| @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|      KC_T,   KC_TAB,  KC_Q,    KC_W,  KC_E,    KC_R,                                          KC_Y,    KC_U,     KC_I,         KC_O,   KC_P,    KC_BSLS, | ||||
|      KC_G,   KC_LCTL, KC_A,    KC_S,  KC_D,    KC_F,                                          KC_H,    KC_J,     KC_K,         KC_L,   KC_SCLN, KC_QUOT, | ||||
|      KC_B,   KC_LSFT, KC_Z,    KC_X,  KC_C,    KC_V,                                          KC_N,    KC_M,     KC_COMM,      KC_DOT, KC_SLSH, KC_RSFT, | ||||
|                       KC_LOCK,        KC_LALT, KC_SPC, KC_ENT,  KC_GRV,    TG(GAME), _______, _______, _______,                KC_EQL, | ||||
|                       QK_LOCK,        KC_LALT, KC_SPC, KC_ENT,  KC_GRV,    TG(GAME), _______, _______, _______,                KC_EQL, | ||||
|                                                        KC_BSPC, KC_F5,     KC_F6,    _______ | ||||
|   ), | ||||
| }; | ||||
|   | ||||
| @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     KC_MUTE,          KC_MPLY | ||||
|   ), | ||||
|   [1] = LAYOUT( | ||||
|     KC_LOCK, KC_UP  , _______, | ||||
|     QK_LOCK, KC_UP  , _______, | ||||
|     KC_LEFT, KC_DOWN, KC_RGHT, | ||||
|     KC_BTN1,          KC_BTN2 | ||||
|   ), | ||||
|   | ||||
| @@ -1,11 +1,6 @@ | ||||
| #pragma once | ||||
|  | ||||
| #include "edvorakjp.h" | ||||
| /* | ||||
|  * enum custom_keycodes { | ||||
|  *   KC_LOCK = NEW_SAFE_RANGE, | ||||
|  * }; | ||||
|  */ | ||||
|  | ||||
| #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) | ||||
|  | ||||
|   | ||||
| @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|  | ||||
|     [FCTN] = LAYOUT(KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_SYRQ, | ||||
|                     //-------------------------------// | ||||
|                     KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_LOCK, KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS, | ||||
|                     KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_LOCK, KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS, | ||||
|                     //-------------------------------// | ||||
|                     KC_PAUS, RGB_VAI, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BRIU, KC_CLR, | ||||
|                     //-------------------------------// | ||||
|   | ||||
| @@ -1,12 +1,6 @@ | ||||
| #include QMK_KEYBOARD_H | ||||
| #include "edvorakjp.h" | ||||
|  | ||||
| /* | ||||
|  * enum custom_keycodes { | ||||
|  *   KC_LOCK = NEW_SAFE_RANGE, | ||||
|  * }; | ||||
|  */ | ||||
|  | ||||
| #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) | ||||
| #define __KC_TRNS_x6__ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS | ||||
|  | ||||
|   | ||||
| @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|  | ||||
|     [FCTN] = LAYOUT( | ||||
|         KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_SYRQ, | ||||
|         KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_LOCK, KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS, | ||||
|         KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_LOCK, KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS, | ||||
|         KC_PAUS, RGB_VAI, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BRIU, KC_CLR, | ||||
|         _______, KC_MPRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_MNXT, KC_F11, KC_F12, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, _______, | ||||
|         _______, _______, _______, _______, _______, _______ | ||||
|   | ||||
| @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| [L_GAMING] = LAYOUT( | ||||
|     _______,_______,_______,_______,_______,                _______,_______,_______,_______,_______, | ||||
|     _______,_______,_______,_______,_______,                _______,_______,_______,_______,_______, | ||||
|     _______,_______,KC_C,   KC_D,   _______,_______,KC_LOCK,_______,_______,_______,_______,_______, | ||||
|     _______,_______,KC_C,   KC_D,   _______,_______,QK_LOCK,_______,_______,_______,_______,_______, | ||||
|     _______,KC_TAB, KC_LALT,KC_LSFT,KC_SPC, KC_LCTL,KC_LALT,KC_BSPC,KC_BTN1,KC_BTN2,KC_BTN3,_______ | ||||
| ), | ||||
|  | ||||
|   | ||||
| @@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality | ||||
| RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow | ||||
| AUDIO_ENABLE = no           # Audio output | ||||
|  | ||||
| KEY_LOCK_ENABLE = no        # Enable KC_LOCK support | ||||
| KEY_LOCK_ENABLE = no | ||||
|   | ||||
| @@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|  */ | ||||
| [_RAISE] = LAYOUT_ortho_4x12( \ | ||||
|   KC_CAPS, KC_MINS, KC_PLUS, KC_EQL,  KC_LPRN, KC_RPRN, _______, KC_7,  KC_8,    KC_9, KC_BSPC, KC_DEL, \ | ||||
|   KC_LOCK,  KC_TILD, KC_UNDS, _______,KC_LBRC, KC_RBRC, _______, KC_4,  KC_5,    KC_6, _______, _______, \ | ||||
|   QK_LOCK,  KC_TILD, KC_UNDS, _______,KC_LBRC, KC_RBRC, _______, KC_4,  KC_5,    KC_6, _______, _______, \ | ||||
|   KC_INS, KC_GRV, KC_BSLS, KC_PIPE,  KC_LCBR, KC_RCBR, _______, KC_1,  KC_2,    KC_3, KC_DOT, _______, \ | ||||
|   KC_LCTL, _______, KC_LALT, _______, _______, _______, _______, _______, KC_0, _______, KC_HOME, KC_END \ | ||||
| ) | ||||
|   | ||||
| @@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   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,  _______, _______, CC_PRN,  CC_BRC,  CC_CBR,  KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______, \ | ||||
|   QK_BOOT, KC_WBAK, KC_WFWD, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, \ | ||||
|   _______, _______, _______, _______, KC_LOCK, _______, _______,          KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT \ | ||||
|   _______, _______, _______, _______, QK_LOCK, _______, _______,          KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT \ | ||||
| ), | ||||
|  | ||||
| /* Raise | ||||
|   | ||||
| @@ -75,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| [_FN] = LAYOUT( | ||||
|   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F10,  KC_F11,  KC_F12, | ||||
|   _______, _______, _______, _______, _______, _______, _______, DE_UDIA, KC_F9,   DE_ODIA, _______, KC_DEL, | ||||
|   KC_LOCK, DE_ADIA, DE_SS,   _______, _______, G_1,     _______, RGB_M_P, RGB_M_SW,RGB_M_SN,_______, _______, | ||||
|   QK_LOCK, DE_ADIA, DE_SS,   _______, _______, G_1,     _______, RGB_M_P, RGB_M_SW,RGB_M_SN,_______, _______, | ||||
|   _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_TOG, RGB_HUI, KC_PGUP, _______, | ||||
|   XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX,      _______,     XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END | ||||
| ), | ||||
|   | ||||
| @@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_TAB,  __________________QWERTY_L1__________________, KC_SLSH, | ||||
|         KC_LALT, __________________QWERTY_L2__________________, KC_BSLS, | ||||
|         KC_LSFT, __________________QWERTY_L3__________________, | ||||
|         KC_LGUI, MACRO_1, MACRO_2, MACRO_3, MACRO_4,   KC_LOCK, | ||||
|         KC_LGUI, MACRO_1, MACRO_2, MACRO_3, MACRO_4,   QK_LOCK, | ||||
|                                     KC_SPC, KC_BTN2, MO(_LOWER) | ||||
|     ), | ||||
|     [_GAME_LOWER] = LAYOUT_moonlander_gamepad( | ||||
| @@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_TAB,  __________________QWERTY_L1__________________, KC_SLSH, | ||||
|         KC_LALT, __________________QWERTY_L2__________________, KC_BSLS, | ||||
|         KC_LSFT, __________________QWERTY_L3__________________, | ||||
|         KC_LGUI, MACRO_5, MACRO_6, MACRO_7, MACRO_8,   KC_LOCK, | ||||
|         KC_LGUI, MACRO_5, MACRO_6, MACRO_7, MACRO_8,   QK_LOCK, | ||||
|                                     KC_SPC, KC_BTN2, MO(_LOWER) | ||||
|     ) | ||||
| }; | ||||
|   | ||||
| @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     // Space:  Media Play / Pause | ||||
|     // m: enter mouse layer | ||||
|     _______,          DM_PLY1, DM_PLY2, DM_REC1, DM_REC2, DM_RSTP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||||
|     KC_LOCK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||||
|     QK_LOCK, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||||
|     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||||
|     KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, | ||||
|     _______, _______, _______, _______, _______, _______, _______, _______, TG(_MS), _______, _______, _______,          _______,          KC_VOLU,          _______, _______, _______, _______, | ||||
|   | ||||
| @@ -17,6 +17,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality | ||||
| RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow | ||||
| AUDIO_ENABLE = no           # Audio output | ||||
|  | ||||
| KEY_LOCK_ENABLE = yes       # Enable KC_LOCK support | ||||
| KEY_LOCK_ENABLE = yes | ||||
|  | ||||
| LAYOUTS = 65_ansi_blocker | ||||
|   | ||||
| @@ -17,6 +17,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality | ||||
| RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow | ||||
| AUDIO_ENABLE = no           # Audio output | ||||
|  | ||||
| KEY_LOCK_ENABLE = yes       # Enable KC_LOCK support | ||||
| KEY_LOCK_ENABLE = yes | ||||
|  | ||||
| LAYOUTS = 65_ansi_blocker | ||||
|   | ||||
| @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|       SIX_TRNS,                                              _______,     _______, SIX_TRNS, | ||||
|       KC_LCTL,  FOUR_TRNS,                          _______, KC_F6,         _______, SIX_TRNS, | ||||
|       KC_LSFT,  KC_Z,    FOUR_TRNS,                          KC_F5,         _______, SIX_TRNS, | ||||
|       KC_ENT,   _______, KC_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSM(SYMB),     _______, SIX_TRNS | ||||
|       KC_ENT,   _______, QK_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSM(SYMB),     _______, SIX_TRNS | ||||
|   ), | ||||
|  | ||||
|   [GAME_ARROW] = LAYOUT_wrapper( | ||||
| @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|       _______,  _______, KC_UP,   _______,  _______, _______, _______,     _______, SIX_TRNS, | ||||
|       KC_LCTL,  KC_LEFT, KC_DOWN, KC_RGHT,  _______, _______, KC_F6,       _______, SIX_TRNS, | ||||
|       KC_LSFT,  KC_Z,    FOUR_TRNS,                           KC_F5,       _______, SIX_TRNS, | ||||
|       KC_ENT,   _______, KC_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSM(SYMB),    _______, SIX_TRNS | ||||
|       KC_ENT,   _______, QK_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSM(SYMB),    _______, SIX_TRNS | ||||
|   ) | ||||
| }; | ||||
|  | ||||
|   | ||||
| @@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   OSM(MOD_LCTL), OSM(MOD_LALT), OSM(MOD_LGUI), MC(KC_W), KC_DELETE,    KC_APP | ||||
| ), | ||||
| [LY_1101] = LAYOUT_gunp( | ||||
|   SANDBOX,   XXXXXXX,    AU_TOG,       KC_LOCK,    RGB_TOG,       QK_BOOT, | ||||
|   SANDBOX,   XXXXXXX,    AU_TOG,       QK_LOCK,    RGB_TOG,       QK_BOOT, | ||||
|   KC_WAKE,   KC_CAPS,    USER_NAME,    USER_EMAIL, RGB_MOD,       DB_TOGG, | ||||
|   KC_SLEP,   KC_NUM,     DM_REC1,      DM_PLY1,    XXXXXXX,       EE_CLR, | ||||
|   KC_PWR,    KC_SCRL,    DM_REC2,      DM_PLY2,    DM_RSTP,       KC_INSERT | ||||
|   | ||||
| @@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         ), | ||||
|     [_DYN] = LAYOUT_planck_mit( /* special */ | ||||
|         KM_HOLD,  DYN_REC_START1, DYN_MACRO_PLAY1, _______, _______,    _______, _______, KC_APP,  KC_INS,  _______, KC_PSCR, KC_PAUS, | ||||
|         KC_LOCK,  DYN_REC_START2, DYN_MACRO_PLAY2, _______, _______,    _______, _______, _______, _______, KC_CAPS, KC_SCRL, KC_NUM, | ||||
|         QK_LOCK,  DYN_REC_START2, DYN_MACRO_PLAY2, _______, _______,    _______, _______, _______, _______, KC_CAPS, KC_SCRL, KC_NUM, | ||||
|         KM_SHLK,  _______,        _______,         _______, _______,    _______, _______, _______, _______, _______, _______, _______, | ||||
|         _______,  _______,        _______,         _______, KM_PP_GAME,      DF(_QW),     DF(_PP), _______, _______, _______, _______ | ||||
|         ), | ||||
|   | ||||
| @@ -18,6 +18,6 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow | ||||
| AUDIO_ENABLE = no           # Audio output | ||||
| LTO_ENABLE = yes | ||||
|  | ||||
| KEY_LOCK_ENABLE = no      # Enable KC_LOCK support | ||||
| KEY_LOCK_ENABLE = no | ||||
|  | ||||
| LAYOUTS = tkl_ansi | ||||
|   | ||||
| @@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|  */ | ||||
| [_ADJUST] = LAYOUT_preonic_grid( | ||||
|   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_LOCK, QK_BOOT, CK_TOGG, MU_MOD,  QWERTY,  PURE,    BLANK,   KC_WH_D, KC_MS_U, KC_WH_U, _______, KC_DEL,  \ | ||||
|   QK_LOCK, QK_BOOT, CK_TOGG, MU_MOD,  QWERTY,  PURE,    BLANK,   KC_WH_D, KC_MS_U, KC_WH_U, _______, KC_DEL,  \ | ||||
|   _______, AU_ON,   AU_OFF,  KC_BTN2, KC_BTN1, AG_NORM, AG_SWAP, KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_ACL0, \ | ||||
|   _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, KC_ACL1, \ | ||||
|   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ACL2  \ | ||||
|   | ||||
| @@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     _______, _______,        _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______, \ | ||||
|     KC_LCTL, _______,        _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______, \ | ||||
|     KC_LSFT, KC_Z,           _______, _______, _______, _______,                    _______, _______, _______, _______, _______, KC_LGUI, \ | ||||
|     KC_ENT,  TG(GAME_ARROW), KC_LOCK, KC_BSPC, KC_F5,   KC_LALT, KC_SPC, OSL(SYMB), KC_F6,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \ | ||||
|     KC_ENT,  TG(GAME_ARROW), QK_LOCK, KC_BSPC, KC_F5,   KC_LALT, KC_SPC, OSL(SYMB), KC_F6,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \ | ||||
| ), | ||||
| /* Gaming Arrow mode (Raise) | ||||
|  * Turns wasd into arrows | ||||
| @@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     _______, _______, KC_UP,   _______, _______, _______,                    _______, _______, _______, _______, _______, _______, \ | ||||
|     KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                    _______, _______, _______, _______, _______, _______, \ | ||||
|     KC_LSFT, KC_Z,    _______, _______, _______, _______,                    _______, _______, _______, _______, _______, KC_LGUI, \ | ||||
|     KC_ENT,  _______, KC_LOCK, KC_BSPC, KC_F5,   KC_LALT, KC_SPC, OSL(SYMB), KC_F6,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \ | ||||
|     KC_ENT,  _______, QK_LOCK, KC_BSPC, KC_F5,   KC_LALT, KC_SPC, OSL(SYMB), KC_F6,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \ | ||||
| ) | ||||
| }; | ||||
|  | ||||
|   | ||||
| @@ -16,4 +16,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover | ||||
| BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality | ||||
| RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow | ||||
|  | ||||
| KEY_LOCK_ENABLE = yes     # Enable KC_LOCK support | ||||
| KEY_LOCK_ENABLE = yes | ||||
|   | ||||
| @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     KC_TAB,  KC_K,    KC_DOT,  KC_O,    KC_COMM,  N_Y,    DM_REC2,  DM_PLY2, KC_V,   KC_G,    KC_C,    KC_L,    N_SS,   N_Z,     KC_TRNS, | ||||
|     MO(_3),  KC_H,    KC_A,    KC_E,    KC_I,     KC_U,   N_UNDO,   DM_RSTP, KC_D,   KC_T,    KC_R,    KC_N,    KC_S,   KC_F,    MO(_3), | ||||
|     KC_LSFT, KC_X,    KC_Q,    N_AE,    N_UE,     N_OE,   N_COPY,   N_CUT,   KC_B,   KC_P,    KC_W,    KC_M,    KC_J,   KC_RSFT, KC_RSFT, | ||||
|     KC_LCTL, MO(_4),  KC_TRNS, KC_LGUI, KC_LALT,  KC_SPC, N_PASTE,  KC_SPC,  KC_SPC, MO(_4),  KC_RCTL, KC_TRNS, KC_TRNS,KC_LOCK, MO(_7) | ||||
|     KC_LCTL, MO(_4),  KC_TRNS, KC_LGUI, KC_LALT,  KC_SPC, N_PASTE,  KC_SPC,  KC_SPC, MO(_4),  KC_RCTL, KC_TRNS, KC_TRNS,QK_LOCK, MO(_7) | ||||
|   ), | ||||
|  | ||||
| /* Layer 3 | ||||
|   | ||||
| @@ -17,7 +17,7 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality | ||||
| RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow | ||||
| AUDIO_ENABLE = no           # Audio output | ||||
|  | ||||
| KEY_LOCK_ENABLE = no        # Enable KC_LOCK support | ||||
| KEY_LOCK_ENABLE = no | ||||
|  | ||||
| AUDIO_SUPPORTED = no | ||||
|  | ||||
|   | ||||
| @@ -16,4 +16,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover | ||||
| BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality | ||||
| RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow | ||||
| AUDIO_ENABLE = no           # Audio output | ||||
| KEY_LOCK_ENABLE = yes       # Enable KC_LOCK support | ||||
| KEY_LOCK_ENABLE = yes | ||||
|   | ||||
| @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| 		_______,  RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, BL_OFF,  BL_ON,   BL_DEC,   BL_INC,       _______,     _______, _______, _______, _______,  \ | ||||
| 		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD,  RGB_VAI,      KC_MUTE,     _______, KC_VOLU, _______, _______,  \ | ||||
| 		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,  BL_TOGG,                   KC_MPRV, KC_MPLY, KC_MNXT, _______,  \ | ||||
| 		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,     KC_PGUP, _______, KC_VOLD, _______, KC_LOCK,  \ | ||||
| 		_______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,     KC_PGUP, _______, KC_VOLD, _______, QK_LOCK,  \ | ||||
| 		_______,  _______, KC_RALT,                               _______,                           _______,      _______,    KC_HOME, KC_PGDN, KC_END,  _______, _______            \ | ||||
| 	) | ||||
| }; | ||||
|   | ||||
| @@ -220,7 +220,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______, | ||||
|         KC_LCTL, _______, _______, _______, _______, _______,                                              _______, _______, _______, _______, _______, _______, | ||||
|         KC_LSFT, KC_Z,    _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______, | ||||
|         KC_ENT,  _______, _______, KC_LOCK, KC_BSPC,                                                                _______, _______, _______, _______, _______, | ||||
|         KC_ENT,  _______, _______, QK_LOCK, KC_BSPC,                                                                _______, _______, _______, _______, _______, | ||||
|                                                               KC_F5,   KC_F6,         LCTL(KC_C), LCTL(KC_V), | ||||
|                                                                        _______,       KC_UP, | ||||
|                                                      KC_LALT, KC_SPC,  OSM(SYMB),     KC_DOWN,    _______, _______ | ||||
| @@ -254,7 +254,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         _______, _______, KC_UP,   _______,  _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______, | ||||
|         KC_LCTL, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,                                              _______, _______, _______, _______, _______, _______, | ||||
|         KC_LSFT, KC_Z,    _______, _______,  _______, _______, _______,                            _______, _______, _______, _______, _______, _______, _______, | ||||
|         KC_ENT,  _______, _______, KC_LOCK,  KC_BSPC,                                                                _______, _______, _______, _______, _______, | ||||
|         KC_ENT,  _______, _______, QK_LOCK,  KC_BSPC,                                                                _______, _______, _______, _______, _______, | ||||
|                                                                KC_F5,   KC_F6,         LCTL(KC_C), LCTL(KC_V), | ||||
|                                                                         _______,       KC_UP, | ||||
|                                                       KC_LALT, KC_SPC,  OSM(SYMB),     KC_DOWN,    _______, _______ | ||||
|   | ||||
| @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     TG_GAME, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL, | ||||
|     CAPWORD, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS, | ||||
|              KC_M,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, | ||||
|     KC_LOCK, KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, | ||||
|     QK_LOCK, KC_K,    KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, | ||||
|                       TAB_SFT, MO_FN,   KC_RALT, KC_RGUI, MO_SLED, | ||||
|     KC_LEFT, KC_RGHT, | ||||
|     KC_UP, | ||||
| @@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     KC_ESC, KC_A,   KC_R,   KC_S,   KC_T,   _______, | ||||
|     KC_LSFT,_______,_______,KC_C,   KC_D,   _______,_______, | ||||
|     _______,_______,KC_TAB, KC_LALT,KC_LCTL, | ||||
|                                             KC_LOCK,_______, | ||||
|                                             QK_LOCK,_______, | ||||
|                                                     _______, | ||||
|                                     KC_SPC, KC_LSFT,_______, | ||||
|  | ||||
|   | ||||
| @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     KC_TAB,        KC_Q,         KC_W,  KC_E,    KC_R,    KC_T,           KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,            KC_BSLS, \ | ||||
|     KC_ESC,        KC_A,         KC_S,  KC_D,    KC_F,    KC_G,           KC_H,    KC_J,    KC_K,    KC_L,   KC_SCLN,         KC_QUOT, \ | ||||
|     OSM(MOD_LSFT), LCTL_T(KC_Z), KC_X,  KC_C,    KC_V,    KC_B,           KC_N,    KC_M,    KC_COMM, KC_DOT, RCTL_T(KC_SLSH), OSM(MOD_RSFT), \ | ||||
|     KC_LCTL,       KC_LALT,      KC_F4, KC_LGUI, KC_BSPC, TD(TD_SYM_VIM), KC_SPC,  KC_ENT,  KC_LOCK, KC_EQL, KC_RALT,         KC_DEL \ | ||||
|     KC_LCTL,       KC_LALT,      KC_F4, KC_LGUI, KC_BSPC, TD(TD_SYM_VIM), KC_SPC,  KC_ENT,  QK_LOCK, KC_EQL, KC_RALT,         KC_DEL \ | ||||
| ), | ||||
|  | ||||
| /* Symbols | ||||
| @@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______,    \ | ||||
|     KC_LCTL, _______, _______, _______, KC_F,    _______, _______,   _______, _______, _______, _______, _______,    \ | ||||
|     KC_LSFT, KC_Z,    _______, _______, _______, _______, _______,   _______, _______, _______, _______, KC_LGUI,    \ | ||||
|     KC_ENT,  _______, KC_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSL(SYMB), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \ | ||||
|     KC_ENT,  _______, QK_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSL(SYMB), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \ | ||||
| ) | ||||
| }; | ||||
|  | ||||
|   | ||||
| @@ -70,7 +70,7 @@ bool process_key_lock(uint16_t *keycode, keyrecord_t *record) { | ||||
|     //    reset the state in our map and return false. When the user releases the | ||||
|     //    key, the up event will no longer be masked and the OS will observe the | ||||
|     //    released key. | ||||
|     // 3. KC_LOCK was just pressed. In this case, we set up the state machine | ||||
|     // 3. QK_LOCK was just pressed. In this case, we set up the state machine | ||||
|     //    to watch for the next key down event, and finish processing | ||||
|     // 4. The keycode is below 0xFF, and we are watching for new keys. In this case, | ||||
|     //    we will send the key down event to the os, and set the key_state for that | ||||
| @@ -95,20 +95,20 @@ bool process_key_lock(uint16_t *keycode, keyrecord_t *record) { | ||||
|  | ||||
|     if (record->event.pressed) { | ||||
|         // Non-standard keycode, reset and return | ||||
|         if (!(IS_STANDARD_KEYCODE(translated_keycode) || translated_keycode == KC_LOCK)) { | ||||
|         if (!(IS_STANDARD_KEYCODE(translated_keycode) || translated_keycode == QK_LOCK)) { | ||||
|             watching = false; | ||||
|             return true; | ||||
|         } | ||||
|  | ||||
|         // If we're already watching, turn off the watch. | ||||
|         if (translated_keycode == KC_LOCK) { | ||||
|         if (translated_keycode == QK_LOCK) { | ||||
|             watching = !watching; | ||||
|             return false; | ||||
|         } | ||||
|  | ||||
|         if (IS_STANDARD_KEYCODE(translated_keycode)) { | ||||
|             // We check watching first. This is so that in the following scenario, we continue to | ||||
|             // hold the key: KC_LOCK, KC_F, KC_LOCK, KC_F | ||||
|             // hold the key: QK_LOCK, KC_F, QK_LOCK, KC_F | ||||
|             // If we checked in reverse order, we'd end up holding the key pressed after the second | ||||
|             // KC_F press is registered, when the user likely meant to hold F | ||||
|             if (watching) { | ||||
|   | ||||
| @@ -471,7 +471,7 @@ enum quantum_keycodes { | ||||
|     OUT_BT, // 5D2A | ||||
|  | ||||
|     // Lock Key | ||||
|     KC_LOCK, // 5D2B | ||||
|     QK_LOCK, // 5D2B | ||||
|  | ||||
|     // Unused slots | ||||
|     UNUSED_000, // 5D2C | ||||
|   | ||||
| @@ -3,8 +3,8 @@ | ||||
| // clang-format off | ||||
|  | ||||
| // Deprecated Quantum keycodes | ||||
|  | ||||
| #define KC_LEAD QK_LEADER | ||||
| #define KC_LOCK QK_LOCK | ||||
|  | ||||
| #define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.") | ||||
| #define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.") | ||||
|   | ||||
| @@ -18,7 +18,7 @@ EXTRAKEY_ENABLE  = yes # Audio control and System control | ||||
| COMMAND_ENABLE   = no # Commands for debug and configuration | ||||
| NKRO_ENABLE      = no # Enable N-Key Rollover | ||||
| SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard | ||||
| KEY_LOCK_ENABLE  = no # Enable the KC_LOCK key | ||||
| KEY_LOCK_ENABLE  = no | ||||
| TAP_DANCE_ENABLE = no # Enable the tap dance feature. | ||||
| CONSOLE_ENABLE   = no  # Console for debug | ||||
|  | ||||
|   | ||||
| @@ -38,7 +38,7 @@ Note that my Iris keyboard has an Elite-C on the left half and a ProMicro on the | ||||
| 	* `PRINT SCREEN`, `PAUSE`, `SYSREQ`, `INSERT`, and `CLEAR` also mapped, as intelligently as possible. | ||||
| 	* `Q` toggles the RGB underglow (which changes color to indicate active layer). | ||||
| 	* `A` increases RGB underglow brightness (with `SHIFT`, decreases brightness). | ||||
| 	* `Y` is mapped to [`KC_LOCK`](https://beta.docs.qmk.fm/using-qmk/software-features/feature_key_lock). | ||||
| 	* `Y` is mapped to [`QK_LOCK`](https://beta.docs.qmk.fm/using-qmk/software-features/feature_key_lock). | ||||
|  | ||||
| ## Contribute | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user