From d1b6b062024dddf047f760efbad21edb2acca394 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Oct 2022 02:21:40 +1100 Subject: Remove legacy locking caps/num/scroll keycodes (#18601) --- layouts/community/ergodox/osx_neo2/keymap.c | 4 ++-- .../community/ergodox/twentylives_dvorak_with_hebrew/keymap.c | 10 +++++----- layouts/community/planck_mit/guidoism/keys.json | 6 +++--- quantum/keycode_legacy.h | 3 --- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/layouts/community/ergodox/osx_neo2/keymap.c b/layouts/community/ergodox/osx_neo2/keymap.c index 125cc43a8f..22d6f35e08 100644 --- a/layouts/community/ergodox/osx_neo2/keymap.c +++ b/layouts/community/ergodox/osx_neo2/keymap.c @@ -687,9 +687,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if ((capslock_state & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) { // CAPSLOCK is currently active, disable it if (host_keyboard_leds() & (1 << USB_LED_CAPS_LOCK)) { - unregister_code(KC_LOCKING_CAPS); + unregister_code(KC_LOCKING_CAPS_LOCK); } else { - register_code(KC_LOCKING_CAPS); + register_code(KC_LOCKING_CAPS_LOCK); } return false; } diff --git a/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c index 12548ae0ea..25ce96e068 100644 --- a/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c +++ b/layouts/community/ergodox/twentylives_dvorak_with_hebrew/keymap.c @@ -161,11 +161,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, // Right Hand - KC_TRNS, KC_TRNS, KC_LOCKING_NUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_TRNS, - KC_TRNS, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_KP_1, KC_KP_2, KC_KP_3, KC_ENTER, KC_TRNS, - KC_KP_0, KC_KP_0, KC_KP_DOT, KC_ENTER, KC_TRNS, + KC_TRNS, KC_TRNS, KC_LNUM, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_TRNS, + KC_TRNS, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_KP_1, KC_KP_2, KC_KP_3, KC_ENTER, KC_TRNS, + KC_KP_0, KC_KP_0, KC_KP_DOT, KC_ENTER, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/layouts/community/planck_mit/guidoism/keys.json b/layouts/community/planck_mit/guidoism/keys.json index 791119b4f2..bcc9e0da62 100644 --- a/layouts/community/planck_mit/guidoism/keys.json +++ b/layouts/community/planck_mit/guidoism/keys.json @@ -118,11 +118,11 @@ "KC_RALT": "\u2325", "KC_RGUI": "\u2318", "KC_RCMD": "\u2318", - "KC_LOCKING_CAPS": "Locking Caps Lock", + "KC_LOCKING_CAPS_LOCK": "Locking Caps Lock", "KC_LCAP": "Locking Caps Lock", - "KC_LOCKING_NUM": "Locking Num Lock", + "KC_LOCKING_NUM_LOCK": "Locking Num Lock", "KC_LNUM": "Locking Num Lock", - "KC_LOCKING_SCROLL": "Locking Scroll Lock", + "KC_LOCKING_SCROLL_LOCK": "Locking Scroll Lock", "KC_LSCR": "Locking Scroll Lock", "KC_INT4": "JIS Henkan", "KC_HENK": "JIS Henkan", diff --git a/quantum/keycode_legacy.h b/quantum/keycode_legacy.h index 0317a05534..9169f3cb89 100644 --- a/quantum/keycode_legacy.h +++ b/quantum/keycode_legacy.h @@ -19,9 +19,6 @@ #define KC__MUTE KC_KB_MUTE #define KC__VOLUP KC_KB_VOLUME_UP #define KC__VOLDOWN KC_KB_VOLUME_DOWN -#define KC_LOCKING_CAPS KC_LOCKING_CAPS_LOCK -#define KC_LOCKING_NUM KC_LOCKING_NUM_LOCK -#define KC_LOCKING_SCROLL KC_LOCKING_SCROLL_LOCK #define KC_LANG1 KC_LANGUAGE_1 #define KC_LANG2 KC_LANGUAGE_2 #define KC_LANG3 KC_LANGUAGE_3 -- cgit v1.2.3