diff options
43 files changed, 56 insertions, 56 deletions
| diff --git a/keyboards/a_dux/keymaps/daliusd/keymap.c b/keyboards/a_dux/keymaps/daliusd/keymap.c index 3da9b76057..72f2417278 100644 --- a/keyboards/a_dux/keymaps/daliusd/keymap.c +++ b/keyboards/a_dux/keymaps/daliusd/keymap.c @@ -189,9 +189,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    [_MISC] = LAYOUT(    //┌────────┬────────┬────────┬────────┬────────┐                         ┌────────┬────────┬────────┬────────┬────────┐ -     RESET   ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_BRID ,KC_BRIU ,KC_PSCR ,XXXXXXX ,K_PRINT , +     QK_BOOT ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_BRID ,KC_BRIU ,KC_PSCR ,XXXXXXX ,K_PRINT ,    //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤ -     XXXXXXX ,XXXXXXX ,DEBUG   ,LT_OSLNX,XXXXXXX ,                          KC_MPRV ,KC_MPLY ,KC_MNXT ,XXXXXXX ,K_VIDEO , +     XXXXXXX ,XXXXXXX ,DB_TOGG ,LT_OSLNX,XXXXXXX ,                          KC_MPRV ,KC_MPLY ,KC_MNXT ,XXXXXXX ,K_VIDEO ,    //├────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┤       XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,                          KC_VOLD ,KC_VOLU ,XXXXXXX ,XXXXXXX ,XXXXXXX ,    //└────────┴────────┴────────┴────┬───┴────┬───┼────────┐       ┌────────┼───┬────┴───┬────┴────────┴────────┴────────┘ diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c index 082a151674..b3aeaf014f 100644 --- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c +++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/keymap.c @@ -90,7 +90,7 @@ static uint16_t auto_pointer_layer_timer = 0;   */  #define LAYOUT_LAYER_FUNCTION                                                                 \      _______________DEAD_HALF_ROW_______________, KC_PSCR,   KC_F7,   KC_F8,   KC_F9,  KC_F12, \ -    ______________HOME_ROW_GACS_L______________, KC_SLCK,   KC_F4,   KC_F5,   KC_F6,  KC_F11, \ +    ______________HOME_ROW_GACS_L______________, KC_SCRL,   KC_F4,   KC_F5,   KC_F6,  KC_F11, \      _______________DEAD_HALF_ROW_______________, KC_PAUS,   KC_F1,   KC_F2,   KC_F3,  KC_F10, \                                 _______, XXXXXXX, XXXXXXX, XXXXXXX @@ -111,7 +111,7 @@ static uint16_t auto_pointer_layer_timer = 0;   */  #define LAYOUT_LAYER_NAVIGATION                                                               \      _______________DEAD_HALF_ROW_______________, _______________DEAD_HALF_ROW_______________, \ -    ______________HOME_ROW_GACS_L______________, KC_CLCK, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, \ +    ______________HOME_ROW_GACS_L______________, KC_CAPS, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, \      _______________DEAD_HALF_ROW_______________,  KC_INS, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, \                                 XXXXXXX, _______,  KC_ENT, KC_BSPC diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c index e8e5ccd83b..2c262521bc 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c @@ -133,7 +133,7 @@ enum bstiq_layers {  // Function keys.  #define LAYOUT_LAYER_FUN                                                                      \       KC_F12,   KC_F7,   KC_F8,   KC_F9, KC_PSCR, ________________HOME_ROW_NA________________, \ -     KC_F11,   KC_F4,   KC_F5,   KC_F6, KC_SLCK, ______________HOME_ROW_GASC_R______________, \ +     KC_F11,   KC_F4,   KC_F5,   KC_F6, KC_SCRL, ______________HOME_ROW_GASC_R______________, \       KC_F10,   KC_F1,   KC_F2,   KC_F3, KC_PAUS, ______________HOME_ROW_ALGR_R______________,\                           U_NA,  KC_APP,  KC_TAB,    U_NA,    U_NA,    U_NA diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c index cbee085f26..461976b276 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤         KC_LSFT, KC_LCTL, KC_LALT, KC_RGUI, KC_VOLD,    XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,    // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤ -       QK_BOOT, EEP_RST, KC_MPRV, KC_MNXT, KC_MPLY,    XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX,  KC_ENT, +       QK_BOOT, EE_CLR,  KC_MPRV, KC_MNXT, KC_MPLY,    XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX,  KC_ENT,    // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯                              KC_A, _______, KC_LSFT,     KC_SPC, _______,    KC_A    //                   ╰───────────────────────────╯ ╰──────────────────────────╯ diff --git a/keyboards/crkbd/keymaps/nimishgautam/keymap.c b/keyboards/crkbd/keymaps/nimishgautam/keymap.c index 508388d442..e8a476cfc5 100644 --- a/keyboards/crkbd/keymaps/nimishgautam/keymap.c +++ b/keyboards/crkbd/keymaps/nimishgautam/keymap.c @@ -137,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    [_TEXT_NAV] = LAYOUT_split_3x6_3( //text nav and special navigation (lock screen, adjust layer, etc)    //,-----------------------------------------------------.                    ,-----------------------------------------------------. -      LOCK_SCREEN, KC_PSCR, SELECT_LEFT_LINE, KC_UP, SELECT_RIGHT_LINE, TD(TD_MOVE_BEGIN_LINE),                    TD(TD_MOVE_END_LINE), KC_MS_WH_UP, EMOJI_KBD, KC_TRANSPARENT, KC_TRANSPARENT, RESET, +      LOCK_SCREEN, KC_PSCR, SELECT_LEFT_LINE, KC_UP, SELECT_RIGHT_LINE, TD(TD_MOVE_BEGIN_LINE),                    TD(TD_MOVE_END_LINE), KC_MS_WH_UP, EMOJI_KBD, KC_TRANSPARENT, KC_TRANSPARENT, QK_BOOT,    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|        TO(_BASE), SELECT_LEFT_WD, KC_LEFT, KC_DOWN, KC_RIGHT,SELECT_RIGHT_WD,              KC_MS_WH_LEFT, KC_RGUI, KC_RSFT, KC_RALT,KC_RCTL, KC_CAPS,    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------| diff --git a/keyboards/crkbd/keymaps/sharkby7e/keymap.c b/keyboards/crkbd/keymaps/sharkby7e/keymap.c index e37ef9881b..9f483a27a4 100644 --- a/keyboards/crkbd/keymaps/sharkby7e/keymap.c +++ b/keyboards/crkbd/keymaps/sharkby7e/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    [3] = LAYOUT_split_3x6_3(    //,-----------------------------------------------------.                    ,-----------------------------------------------------. -        XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +      XXXXXXX, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|        XXXXXXX, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------| diff --git a/keyboards/crkbd/keymaps/thunderbird2086/layers_block.h b/keyboards/crkbd/keymaps/thunderbird2086/layers_block.h index f182a1a6d8..ba41cd9223 100644 --- a/keyboards/crkbd/keymaps/thunderbird2086/layers_block.h +++ b/keyboards/crkbd/keymaps/thunderbird2086/layers_block.h @@ -44,7 +44,7 @@  #define ________________________SYMBOL_R2________________________ XXXXXXX , KC_LCBR , KC_RCBR , KC_LBRC , KC_RBRC , KC_PLUS -#define ________________________ADJUST_L1________________________ RESET   , XXXXXXX , KC_PWR  , KC_WAKE , KC_SLEP , XXXXXXX +#define ________________________ADJUST_L1________________________ QK_BOOT , XXXXXXX , KC_PWR  , KC_WAKE , KC_SLEP , XXXXXXX  #if defined(RGB_MATRIX_ENABLE) || defined(RGBLIGHT_ENABLE)  #   define ________________________ADJUST_L2________________________ RGBRST  , XXXXXXX , RGB_SPI , RGB_SAI , RGB_HUI , RGB_VAI diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h index 30b1b389bc..b35ad7590d 100644 --- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h @@ -90,7 +90,7 @@ enum combos {  #define KC_LINX KC_LINUX -#define KC_RESET RESET +#define KC_RESET QK_BOOT  #define KC_RST KC_RESET  #define OS_GIT OSL(GIT) diff --git a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c index 3d4b29e621..1fb29d5a4a 100644 --- a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c +++ b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    // Layer 1, Space-modifiers: Basic keys    LAYOUT_diag_4x14( -    RESET,            KC_EXEC, KC_HELP, KC_MENU, KC_SLCT, KC_STOP,      KC_BTN2, KC_INT1, KC_MINS, KC_EQL,  KC_INT3, SFT_LBR, KC_TRNS, +    QK_BOOT,          KC_EXEC, KC_HELP, KC_MENU, KC_SLCT, KC_STOP,      KC_BTN2, KC_INT1, KC_MINS, KC_EQL,  KC_INT3, SFT_LBR, KC_TRNS,      KC_TRNS,          KC_AGIN, KC_FIND, KC_PGUP, KC_PGDN, KC_F19,       KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_ENT,  SFT_7,   SFT_2,      KC_TRNS, KC_TRNS, KC_UNDO, KC_CUT,  KC_COPY, KC_PSTE, KC_APP,       KC_BSPC, KC_DEL,  KC_RBRC, KC_BSLS, KC_HOME,          KC_END,      KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,               RCT_IN7, RGU_IN8, KC_TRNS, KC_INT2, KC_INT4,          MU_MOD diff --git a/keyboards/keyboardio/model01/keymaps/pugmajere/keymap.c b/keyboards/keyboardio/model01/keymaps/pugmajere/keymap.c index b7043ef640..9520a116fd 100644 --- a/keyboards/keyboardio/model01/keymaps/pugmajere/keymap.c +++ b/keyboards/keyboardio/model01/keymaps/pugmajere/keymap.c @@ -179,8 +179,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {          case MACRO_KVM_TG:              if (record->event.pressed) {                  register_code(KC_LSFT); -                tap_code(KC_NUMLOCK); -                tap_code(KC_NUMLOCK); +                tap_code(KC_NUM); +                tap_code(KC_NUM);                  unregister_code(KC_LSFT);                  tap_code(KC_LCTL);              } diff --git a/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c index d4f49b209d..3412a843a2 100644 --- a/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c +++ b/keyboards/mechbrewery/mb65s/keymaps/iso_blocker_tsangan/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {       * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘       */      [0] = LAYOUT_65_iso_blocker_tsangan_split_bs( -        KC_GESC, 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_BSPC, KC_HOME, +        QK_GESC, 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_BSPC, KC_HOME,          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_PGUP,          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_NUHS,          KC_ENT,  KC_PGDN,          KC_LSFT, KC_NUBS, 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_END, diff --git a/keyboards/planck/keymaps/rennerom/keymap.c b/keyboards/planck/keymaps/rennerom/keymap.c index 6423d848ab..67394b8964 100644 --- a/keyboards/planck/keymaps/rennerom/keymap.c +++ b/keyboards/planck/keymaps/rennerom/keymap.c @@ -142,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   */  [_ADJUST] = LAYOUT_planck_grid( -    _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    RGB_TOG,  _______,  RGB_HUD,  RGB_HUI,  _______,  DB_TOGG,  RESET, +    _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    RGB_TOG,  _______,  RGB_HUD,  RGB_HUI,  _______,  DB_TOGG,  QK_BOOT,      _______,  KC_F5,    KC_F6,    KC_F7,    KC_F8,    RGB_RMOD, RGB_MOD,  RGB_SAD,  RGB_SAI,  _______,  _______,  _______,      _______,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   RGB_SPD,  RGB_SPI,  RGB_VAD,  RGB_VAI,  _______,  _______,  _______,      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______ diff --git a/keyboards/preonic/keymaps/rmeli/keymap.c b/keyboards/preonic/keymaps/rmeli/keymap.c index da6269129e..b12dffe4b0 100644 --- a/keyboards/preonic/keymaps/rmeli/keymap.c +++ b/keyboards/preonic/keymaps/rmeli/keymap.c @@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  [_ADJUST] = LAYOUT_wrapper(    QK_BOOT, _________________NONE_5x___________________, ______________________NONE_6x_______________________,    XXXXXXX, MU_ON,   AU_ON,   MI_ON,   XXXXXXX, XXXXXXX, _______________CONFIG_R1_x5________________,  QWERTY, -  RESET,   MU_MOD,  AU_TOG,  MI_TOG,  XXXXXXX, XXXXXXX, _______________CONFIG_R2_x5________________, XXXXXXX, +  QK_BOOT, MU_MOD,  AU_TOG,  MI_TOG,  XXXXXXX, XXXXXXX, _______________CONFIG_R2_x5________________, XXXXXXX,    XXXXXXX, MU_OFF,  AU_OFF,  MI_OFF,  XXXXXXX, XXXXXXX, _______________CONFIG_R3_x5________________, COLEMAK,    ______________________BLANK_6x______________________, ______________________BLANK_6x______________________  ) diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c index 59de0e64f3..3b9257068f 100644 --- a/keyboards/rocketboard_16/keycode_lookup.c +++ b/keyboards/rocketboard_16/keycode_lookup.c @@ -287,7 +287,7 @@ lookup_table_t lookup_table[333] =   {"KC_LT", KC_LT},   {"KC_GT", KC_GT},   {"KC_QUES", KC_QUES}, - {"RESET", QK_BOOT}, + {"QK_BOOT", QK_BOOT},   {"DB_TOGG", DB_TOGG},   {"MAGIC_TOGGLE_NKRO", MAGIC_TOGGLE_NKRO},   {"QK_GESC", QK_GESC}, diff --git a/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h b/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h index 89980614e1..7ecb2353dd 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h +++ b/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h @@ -59,7 +59,7 @@  )  #define TEMPLATE_RESET LAYOUT_arrow( \ -    RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, \ +    QK_BOOT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, QK_BOOT, \      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ -    KC_NO, KC_NO, KC_NO,      KC_NO, KC_NO,      KC_NO, KC_NO, KC_NO, RESET) +    KC_NO, KC_NO, KC_NO,      KC_NO, KC_NO,      KC_NO, KC_NO, KC_NO, QK_BOOT) diff --git a/users/callum/callum.c b/users/callum/callum.c index b3254a9cfa..73367e8e57 100644 --- a/users/callum/callum.c +++ b/users/callum/callum.c @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {      ),      [NAV] = LAYOUT_callum( -        KC_TAB,  SW_WIN,  TABL,    TABR,    KC_VOLU, RESET,   HOME,    KC_UP,   END,     KC_DEL, +        KC_TAB,  SW_WIN,  TABL,    TABR,    KC_VOLU, QK_BOOT, HOME,    KC_UP,   END,     KC_DEL,          OS_SHFT, OS_CTRL, OS_ALT,  OS_CMD,  KC_VOLD, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,          SPCL,    SPC_R,   BACK,    FWD,     KC_MPLY, XXXXXXX, KC_PGDN, KC_PGUP, SW_LANG, KC_ENT,                                     _______, _______, _______, _______ diff --git a/users/curry/process_records.h b/users/curry/process_records.h index 605abdfae2..4db25c34e1 100644 --- a/users/curry/process_records.h +++ b/users/curry/process_records.h @@ -62,7 +62,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record);  #   define WORKMAN KC_WORKMAN  #endif -#define KC_RST RESET +#define KC_RST QK_BOOT  #if defined(SWAP_HANDS_ENABLE)  #    define KC_C1R3 SH_T(KC_TAB) diff --git a/users/cwebster2/my_miryoku.h b/users/cwebster2/my_miryoku.h index 8b167cd619..c4b4b59a1d 100644 --- a/users/cwebster2/my_miryoku.h +++ b/users/cwebster2/my_miryoku.h @@ -35,7 +35,7 @@  #define _______NAKED_R___T____ KC_ENT,   KC_BSPC,  KC_DEL  #define _______NAKED_L___T____ KC_ESC,   KC_SPC,   KC_TAB -#define _______INACTIVE_R1____ KC_LOCK,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RESET +#define _______INACTIVE_R1____ KC_LOCK,  KC_TRNS,  KC_TRNS,  KC_TRNS,  QK_BOOT  #define _______INACTIVE_R2____ KC_TRNS,  KC_LSFT,  KC_LCTL,  KC_LALT,  KC_LGUI  #define _______INACTIVE_R3____ KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_RALT,  KC_TRNS diff --git a/users/ericgebhart/extensions/oneshot.c b/users/ericgebhart/extensions/oneshot.c index 83c8a04363..55c2fa1ae3 100644 --- a/users/ericgebhart/extensions/oneshot.c +++ b/users/ericgebhart/extensions/oneshot.c @@ -125,10 +125,10 @@ int8_t update_oneshot_modifiers(uint16_t keycode, keyrecord_t *record, int8_t ke  // registers/unregisters a mod to the operating system on state change if necessary  void update_modifier(oneshot_mod osmod, oneshot_state previous_state, oneshot_state current_state) {      if (previous_state == ONESHOT_STATE_OFF) { -        register_code(KC_LCTRL + osmod); +        register_code(KC_LCTL + osmod);      } else {          if (current_state == ONESHOT_STATE_OFF) { -            unregister_code(KC_LCTRL + osmod); +            unregister_code(KC_LCTL + osmod);          }      }  } diff --git a/users/ericgebhart/layers/edge_keys.h b/users/ericgebhart/layers/edge_keys.h index 0794b91a02..107434750b 100644 --- a/users/ericgebhart/layers/edge_keys.h +++ b/users/ericgebhart/layers/edge_keys.h @@ -367,13 +367,13 @@  // all others are handled through macros.  #define ___5_BOTTOM_LEFT___  ___X2___,  KC_INS,  KC_LEFT, KC_RIGHT -#define ___5_BOTTOM_RIGHT___ KC_UP,  KC_DOWN,  KC_BSLASH, ___X2___ +#define ___5_BOTTOM_RIGHT___ KC_UP,  KC_DOWN,  KC_BSLS, ___X2___  #define ___5_BOTTOM_LEFT_EN___  ___5_BOTTOM_LEFT___  #define ___5_BOTTOM_RIGHT_EN___  ___5_BOTTOM_RIGHT___  #define ___4_BOTTOM_LEFT___  LCTL(KC_V),  KC_INS,  KC_LEFT,   KC_RIGHT -#define ___4_BOTTOM_RIGHT___ KC_UP,       KC_DOWN, KC_BSLASH, LCTL(KC_C) +#define ___4_BOTTOM_RIGHT___ KC_UP,       KC_DOWN, KC_BSLS, LCTL(KC_C)  #define ___4_BOTTOM_LEFT_EN___  ___4___ //___4_BOTTOM_LEFT___  #define ___4_BOTTOM_RIGHT_EN___  ___4___ //___4_BOTTOM_RIGHT___ diff --git a/users/ericgebhart/layers/toprows.h b/users/ericgebhart/layers/toprows.h index 351df442ed..3ae1c4665b 100644 --- a/users/ericgebhart/layers/toprows.h +++ b/users/ericgebhart/layers/toprows.h @@ -25,8 +25,8 @@  /*******************************************************************/  // Kinesis function key row. I don't use them. but might as well define them.  #define ___KINTFUNC_L___ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8 -// #define ___KINTFUNC_RIGHT___ KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_FN0, RESET -#define ___KINTFUNC_R___ KC_F9, KC_F10, KC_F11, KC_F12, XXX, XXX, XXX, XXX, RESET +// #define ___KINTFUNC_RIGHT___ KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_FN0, QK_BOOT +#define ___KINTFUNC_R___ KC_F9, KC_F10, KC_F11, KC_F12, XXX, XXX, XXX, XXX, QK_BOOT  // A TOPROWS Layer.  // set it how you like it, if you like it. diff --git a/users/ericgebhart/layers/utility.h b/users/ericgebhart/layers/utility.h index a688f8196d..dab0bb4f41 100644 --- a/users/ericgebhart/layers/utility.h +++ b/users/ericgebhart/layers/utility.h @@ -74,7 +74,7 @@  #define ___ADJUST_L3___ ___RGB_HUE_SAT_INT_DN___,       KC_RGB_T  #define ___ADJUST_R1___  ___, KC_MAKE, VRSN, MG_NKRO, KC_RESET -#define ___ADJUST_R2___  EEP_RST, ___PRV_PLAY_NXT_STOP___, +#define ___ADJUST_R2___  EE_CLR, ___PRV_PLAY_NXT_STOP___,  #define ___ADJUST_R3___  MG_NKRO, ___VDN_MUTE_VUP___, RGB_IDL  /********************************************************************************/  /* The Adjust LAYER Chunks                                                      */ diff --git a/users/gary/gary.h b/users/gary/gary.h index ce920cf776..adf25b9a75 100644 --- a/users/gary/gary.h +++ b/users/gary/gary.h @@ -16,7 +16,7 @@ enum custom_keycodes {    RAISE,  }; -#define KC_RST RESET +#define KC_RST QK_BOOT  #define KC_ KC_TRNS  #define KC_LOWR MO(_LOWER) // Lower layer diff --git a/users/jarred/jarred.h b/users/jarred/jarred.h index 49b1253be5..cec407da7f 100644 --- a/users/jarred/jarred.h +++ b/users/jarred/jarred.h @@ -110,7 +110,7 @@ enum {  #define NUMPAD_L3  _______, _______, _______, _______, RGB_VAD, RGB_VAI  #define NUMPAD_L4  _______, _______, _______, _______, RGB_SPD, RGB_SPI -#define NUMPAD_R1                                                        DF(_QW),DF(_GAME), _______, _______, _______,   RESET +#define NUMPAD_R1                                                        DF(_QW),DF(_GAME), _______, _______, _______, QK_BOOT  #define NUMPAD_R2                                                        _______, _______, _______, _______, _______, _______  #define NUMPAD_R3                                                           VRSN, _______, _______, _______, _______, _______   #define NUMPAD_R4                                                        _______, _______, _______, _______, _______, _______  diff --git a/users/jjerrell/wrappers.h b/users/jjerrell/wrappers.h index 87aa8e250f..39e579cbfa 100644 --- a/users/jjerrell/wrappers.h +++ b/users/jjerrell/wrappers.h @@ -319,7 +319,7 @@  #define __________________RAISE_R3___________________   KC_AT,   KC_QUOT, KC_DQUO, KC_PLUS, KC_CIRC  // Adjust -#define __________________ADJUST_L1__________________   KC_MAKE, DB_TOGG, RESET,   XXXXXXX, XXXXXXX +#define __________________ADJUST_L1__________________   KC_MAKE, DB_TOGG, QK_BOOT, XXXXXXX, XXXXXXX  #define __________________ADJUST_L2__________________   KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT  #define __________________ADJUST_L3__________________   KC_VRSN, AU_ON,   AU_OFF,  CG_SWAP, CG_NORM diff --git a/users/kageurufu/layouts.h b/users/kageurufu/layouts.h index eccfa0700e..edf64c0b39 100644 --- a/users/kageurufu/layouts.h +++ b/users/kageurufu/layouts.h @@ -46,7 +46,7 @@  #define _________________ADJUST_L1_________________     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6 -#define _________________ADJUST_L2_________________     _______, RGB_SAD, RGB_VAI, RGB_SAI, RESET,   _______ +#define _________________ADJUST_L2_________________     _______, RGB_SAD, RGB_VAI, RGB_SAI, QK_BOOT, _______  #define _________________ADJUST_L3_________________     _______, RGB_HUD, RGB_VAD, RGB_HUI, RGBRST,  _______  #define _________________ADJUST_L4_________________     _______, _______, _______, _______, _______, _______  #define _________________ADJUST_L5_________________     _______, _______, _______, _______, _______, _______ diff --git a/users/kuchosauronad0/process_records.h b/users/kuchosauronad0/process_records.h index d3d4c4fe83..0e1c1ceadd 100644 --- a/users/kuchosauronad0/process_records.h +++ b/users/kuchosauronad0/process_records.h @@ -84,7 +84,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record);  #define WORKMAN  KC_WORKMAN  #define PLOVER   KC_PLOVER -#define KC_RESET RESET +#define KC_RESET QK_BOOT  #define KC_RST   KC_RESET  #define UC_IRNY  UC(0x2E2E) diff --git a/users/mattly/mattly.c b/users/mattly/mattly.c index d097c8cd7b..eb6536a7f1 100644 --- a/users/mattly/mattly.c +++ b/users/mattly/mattly.c @@ -57,7 +57,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {              set_lights_default();              #endif              return true; -        case RESET: +        case QK_BOOT:              #ifdef RGBLIGHT_ENABLE              rgblight_sethsv_noeeprom(HSV_RESET);              #endif diff --git a/users/miles2go/milestogo.h b/users/miles2go/milestogo.h index 81fc02ded1..c57c0cf7a2 100644 --- a/users/miles2go/milestogo.h +++ b/users/miles2go/milestogo.h @@ -69,7 +69,7 @@ enum userspace_custom_keycodes {  #define QWERTY KC_QWERTY  #define COLEMAK KC_CDH -#define KC_RESET RESET +#define KC_RESET QK_BOOT  #if (!defined(LAYOUT) && defined(KEYMAP))  #    define LAYOUT KEYMAP diff --git a/users/muppetjones/wrappers.h b/users/muppetjones/wrappers.h index 7a6d702dad..9bcf81857c 100644 --- a/users/muppetjones/wrappers.h +++ b/users/muppetjones/wrappers.h @@ -65,7 +65,7 @@   * `----------------------------------' `----------------------------------'   */   // NOTE: The "BACKLIT" keycode is planck specific -#define __ADJUST_L1________________________________ RESET,   DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX +#define __ADJUST_L1________________________________ QK_BOOT, DB_TOGG, XXXXXXX, XXXXXXX, XXXXXXX  #define __ADJUST_L2________________________________ RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD  #define __ADJUST_L3________________________________ XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX diff --git a/users/pdl/pdl.h b/users/pdl/pdl.h index 394f79f2f3..4079ba9d33 100644 --- a/users/pdl/pdl.h +++ b/users/pdl/pdl.h @@ -128,7 +128,7 @@ enum userspace_layers {  #define _________________FUNCTN_L1_________________  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   MY_AF4  #define _________________FUNCTN_L2_________________  KC_APP,  KC_F4,   KC_F5,   KC_F6,   MY_CF5 -#define _________________FUNCTN_L3_________________  RESET,   KC_F7,   KC_F8,   KC_F9,   MY_CF4 +#define _________________FUNCTN_L3_________________  QK_BOOT, KC_F7,   KC_F8,   KC_F9,   MY_CF4  #define _________________FUNCTN_R1_________________  KC_VOLU, KC_F10,  KC_F11,  KC_F12,  KC_INS  #define _________________FUNCTN_R2_________________  KC_VOLD, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT diff --git a/users/ridingqwerty/wrappers.h b/users/ridingqwerty/wrappers.h index f4f3de91f1..dbfd8ea050 100644 --- a/users/ridingqwerty/wrappers.h +++ b/users/ridingqwerty/wrappers.h @@ -98,7 +98,7 @@  #define ________________DEBUG_L3___________________        _______, _______, _______, VERSION, _______  #define ________________DEBUG_R1___________________        VPRWAVE, STRAYA,  _______, TESTING, _______ -#define ________________DEBUG_R2___________________        _______, _______, EE_CLR,  RESET,   MAKE +#define ________________DEBUG_R2___________________        _______, _______, EE_CLR,  QK_BOOT, MAKE  #define ________________DEBUG_R3___________________        QWERTY,  DVORAK,  COLEMAK, _______, _______ diff --git a/users/rmeli/config.h b/users/rmeli/config.h index 1a6db91d1b..5c31462d35 100644 --- a/users/rmeli/config.h +++ b/users/rmeli/config.h @@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define TAPPING_TERM 200  #ifdef UNICODEMAP_ENABLE -#    define UNICODE_SELECTED_MODES UC_MAC, UC_LNX +#    define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_LINUX  #endif  #ifdef AUTO_SHIFT_ENABLED diff --git a/users/romus/romus.h b/users/romus/romus.h index f79777d91b..a3d6db9523 100644 --- a/users/romus/romus.h +++ b/users/romus/romus.h @@ -231,7 +231,7 @@ enum {   * |Musir|     |     |     |     |Vol +||Vol -| Prev| Stop|TogMu| Next|     |   * `------------------------------------------------------------------------' */  #define SETTINGS \ -    BL_STEP,KC_F1,  KC_F2,  KC_F3,  KC_F4,  UNI_LI, UNI_WN, KC_WAKE,_______,RGB_HUD,RGB_HUI,RESET  , \ +    BL_STEP,KC_F1,  KC_F2,  KC_F3,  KC_F4,  UNI_LI, UNI_WN, KC_WAKE,_______,RGB_HUD,RGB_HUI,QK_BOOT, \      _______,KC_F5,  KC_F6,  KC_F7,  KC_F8,  _______,KC_MUTE,_______,RGB_TOG,RGB_SAD,RGB_SAI,_______, \      K_GAMES,KC_F9,  KC_F10, KC_F11, KC_F12, KC_MUTE,_______,KC_PSCR,RGB_MOD,RGB_VAD,RGB_VAI,_______, \      MU_TOG, _______,_______,_______,_______,KC_VOLU,KC_VOLD,KC_MPRV,KC_MSTP,KC_MPLY,KC_MNXT,_______ diff --git a/users/rs/rs.h b/users/rs/rs.h index d19b887f48..ecd9a06de6 100644 --- a/users/rs/rs.h +++ b/users/rs/rs.h @@ -27,7 +27,7 @@ enum custom_keycodes {  #define KC_CODE MO(_CODE)  #define KC_BCOD LT(_CODE, KC_BSPC)  #define KC_FN   MO(_FN) -#define KC_RST  RESET +#define KC_RST  QK_BOOT  #define KC_CTRA LCTL(KC_A)  #define KC_CTRE LCTL(KC_E)  #define KC_BLTG BL_TOGG diff --git a/users/rupa/wrappers.h b/users/rupa/wrappers.h index b5794c8fad..dfc00b5120 100644 --- a/users/rupa/wrappers.h +++ b/users/rupa/wrappers.h @@ -109,14 +109,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.   * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘   */  #define ____65_ADJUST______________ROW1    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______ -#define ____65_ADJUST______________ROW2    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______ +#define ____65_ADJUST______________ROW2    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______  #define ____65_ADJUST______________ROW3    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  _______  #define ____65_ADJUST______________ROW4    _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, UC_NEXT, _______, _______  #define ____65_ADJUST______________ROW5    _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______ -#define ____65_ADJUST__________RGB_ROW2    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, RESET,   _______ +#define ____65_ADJUST__________RGB_ROW2    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, QK_BOOT, _______  #define ____65_ADJUST__________RGB_ROW3    _______, RGB_M_P, RGB_M_B, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EE_CLR,  _______ -#define ____65_ADJUST___________BL_ROW2    _______, BL_TOGG, BL_BRTG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______ +#define ____65_ADJUST___________BL_ROW2    _______, BL_TOGG, BL_BRTG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______  // clang-format on diff --git a/users/talljoe/talljoe.h b/users/talljoe/talljoe.h index cdb01a9744..23dabdd883 100644 --- a/users/talljoe/talljoe.h +++ b/users/talljoe/talljoe.h @@ -176,9 +176,9 @@ enum layers {  #ifndef TEMPLATE_RESET    #define TEMPLATE_RESET TEMPLATE_ALT( \ -      RESET  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET  ,  \ -      RESET  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET  ,           \ +      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,  \ +      QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,           \        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,           \        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,           \ -      RESET  , XXXXXXX, XXXXXXX,                   XXXXXXX, RESET  , XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX) +      QK_BOOT, XXXXXXX, XXXXXXX,                   XXXXXXX, QK_BOOT, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX)  #endif diff --git a/users/tominabox1/wrappers.h b/users/tominabox1/wrappers.h index c5aeadae38..f7f4c7fd23 100644 --- a/users/tominabox1/wrappers.h +++ b/users/tominabox1/wrappers.h @@ -49,7 +49,7 @@ expanded before being used as arguments to the LAYOUT_xxx macro.  #define ___________________FKEY4___________________       KC_NO, KC_NO, KC_NO, KC_NO,   KC_NO,   KC_TRNS,   KC_NO, KC_NO  // Dimple Adjust layer -#define ___________________ADJST1__________________       RESET,RGBRST,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO +#define ___________________ADJST1__________________       QK_BOOT,RGBRST,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO  #define ___________________ADJST2__________________       RGB_M_P,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO  #define ___________________ADJST3__________________       RGB_MOD,   RGB_HUI,   RGB_HUD,   RGB_M_SN,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO  #define ___________________ADJST4__________________       RGB_VAD, RGB_TOG, RGB_VAI, KC_NO,   KC_NO,   KC_TRNS,   KC_NO,   KC_NO diff --git a/users/wanleg/wanleg.c b/users/wanleg/wanleg.c index b056f5dd96..c8ca77676b 100644 --- a/users/wanleg/wanleg.c +++ b/users/wanleg/wanleg.c @@ -124,7 +124,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {        return false;        break;    //on RESET, underglow red if present -  case RESET: +  case QK_BOOT:        if (record->event.pressed) {  		  #if defined(RGBLIGHT_ENABLE)  		  rgblight_enable_noeeprom(); // enables Rgb, without saving settings diff --git a/users/wanleg/wanleg.h b/users/wanleg/wanleg.h index 3c5901de41..a9d1bbf6a6 100644 --- a/users/wanleg/wanleg.h +++ b/users/wanleg/wanleg.h @@ -169,7 +169,7 @@ enum {   * | Sft//Cp| CAPS   |        |        |        | C-A-D  | mScrL  | mScrR  | ALT    |  DEL   |   * '-----------------------------------------------------------------------------------------'   */ -#define _______________Gherkin_ETC_0_______________			KC_GRV, 		KC_MS_U, _______,KC_ESC,  RESET,   KC_RSFT, 			KC_WH_D, KC_WH_U, _______, KC_BSLS +#define _______________Gherkin_ETC_0_______________			KC_GRV, 		KC_MS_U, _______,KC_ESC,  QK_BOOT, KC_RSFT, 			KC_WH_D, KC_WH_U, _______, KC_BSLS  #define _______________Gherkin_ETC_1_______________			KC_MS_L, 		KC_MS_D, KC_MS_R,_______, KC_LSFT, KC_BTN3, 			KC_BTN1, KC_BTN2, KC_SCLN, KC_QUOT  #define _______________Gherkin_ETC_2_______________			TD(TD_SFT_CAPS),KC_CAPS, _______,_______, _______, LALT(LCTL(KC_DEL)),	KC_WH_L, KC_WH_R, KC_LALT, KC_DEL @@ -219,7 +219,7 @@ enum {   * |        |        |        |        |        |        |        |        |        |        |        |        |   * '-----------------------------------------------------------------------------------------------------------'   */ -#define ________________SUPRA_Row_0________________   RESET,   KC_TAB,  KC_UP,   _______, KC_INS,  KC_LCTL, KC_RSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL,  KC_DEL +#define ________________SUPRA_Row_0________________   QK_BOOT, KC_TAB,  KC_UP,   _______, KC_INS,  KC_LCTL, KC_RSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL,  KC_DEL  #define ________________SUPRA_Row_1________________   _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PSCR, KC_LSFT, KC_RCTL, KC_PGDN, KC_END,  KC_LBRC, KC_RBRC, KC_BSLS  #define ________________SUPRA_Row_2________________   _______, KC_PAUS, _______, _______, _______, _______, _______, _______, KC_RGUI, KC_RALT, _______, _______  #define ________________SUPRA_Row_3________________   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/users/xulkal/layouts.h b/users/xulkal/layouts.h index ccf466166e..9eec97ac6e 100644 --- a/users/xulkal/layouts.h +++ b/users/xulkal/layouts.h @@ -81,7 +81,7 @@    */  #define __________________LOWER_L1_________________ _______,  RGB_RMOD, RGB_MOD,  RGB_TOG,  _______,  _______ -#define __________________LOWER_L2_________________ RGB_SPI,  RGB_SAI,  RGB_VAI,  RGB_HUI,  RESET,    _______ +#define __________________LOWER_L2_________________ RGB_SPI,  RGB_SAI,  RGB_VAI,  RGB_HUI,  QK_BOOT,  _______  #define __________________LOWER_L3_________________ RGB_SPD,  RGB_SAD,  RGB_VAD,  RGB_HUD,  RGBRST,   _______  #define __________________LOWER_L4_________________ _______,  _______,  _______,  _______,  _______,  _______  #define __________________LOWER_L5_________________ _______,  _______,  _______,  _______,  _______,  _______ @@ -107,7 +107,7 @@    */  #define _________________ADJUST_L1_________________ _______,  _______,  _______,  _______,  _______,  _______ -#define _________________ADJUST_L2_________________ _______,  RESET,    DB_TOGG,  _______,  _______,  _______ +#define _________________ADJUST_L2_________________ _______,  QK_BOOT,  DB_TOGG,  _______,  _______,  _______  #define _________________ADJUST_L3_________________ _______,  _______,  MU_MOD,   AU_ON,    AU_OFF,   AG_NORM  #define _________________ADJUST_L4_________________ _______,  MUV_DE,   MUV_IN,   MU_ON,    MU_OFF,   MI_ON  #define _________________ADJUST_L5_________________ _______,  _______,  _______,  _______,  _______,  _______ diff --git a/users/xulkal/process_records.c b/users/xulkal/process_records.c index 47996110bb..804dd4677a 100644 --- a/users/xulkal/process_records.c +++ b/users/xulkal/process_records.c @@ -29,7 +29,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record)                  rgb_reset();  #endif              return false; -        case RESET: +        case QK_BOOT:              {                  if (record->event.pressed)                      reset_timer = timer_read() + 500; diff --git a/users/yet-another-developer/process_records.h b/users/yet-another-developer/process_records.h index d4576f541e..d4b9e21326 100644 --- a/users/yet-another-developer/process_records.h +++ b/users/yet-another-developer/process_records.h @@ -80,7 +80,7 @@ bool process_record_keymap( uint16_t keycode, keyrecord_t *record);  #define WORKMAN KC_WORKMAN  #define UNICODE KC_UNICODE -#define KC_RESET RESET +#define KC_RESET QK_BOOT  #define KC_RST KC_RESET  #define BK_LWER LT(_LOWER, KC_BSPC) | 
