From 17684b4d3c7249675d1547df4ef7c570466cca1b Mon Sep 17 00:00:00 2001 From: Richard Baptist Date: Tue, 1 Oct 2019 10:15:46 +0200 Subject: [PATCH] Remove layer keycode macros --- keyboards/crkbd/keymaps/rpbaptist/keymap.c | 191 ++++++++++----------- 1 file changed, 86 insertions(+), 105 deletions(-) diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c index e71158b735a..eb152545386 100644 --- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c +++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c @@ -1,6 +1,5 @@ #include QMK_KEYBOARD_H - extern uint8_t is_master; enum layer_names { @@ -14,139 +13,121 @@ enum layer_names { }; // Base layers -#define KC_CLMK DF(_COLEMAKDHM) -#define KC_GAME DF(_GAMING) +#define COLEMAK DF(_COLEMAKDHM) +#define GAMING DF(_GAMING) // Layer toggle and switch -#define KC_T_NAV TT(_NAV) -#define KC_S_NAV MO(_NAV) +#define T_NAV TT(_NAV) +#define S_NAV MO(_NAV) -#define KC_T_NUM TT(_NUM) -#define KC_S_NUM MO(_NUM) +#define T_NUM TT(_NUM) +#define S_NUM MO(_NUM) // Layer keys with functionality on tap -#define KC_FNTAB LT(_FN, KC_TAB) -#define KC_0_NAV LT(_NAV, KC_0) -#define KC_GMSFT LT(_GAMING_EXT, KC_LSHIFT) +#define FN_TAB LT(_FN, KC_TAB) +#define NAV_0 LT(_NAV, KC_0) +#define EXT_SF LT(_GAMING_EXT, KC_LSHIFT) // Tap/mod keys -#define KC_RCTBR RCTL_T(KC_RBRACKET) -#define KC_LCTBR LCTL_T(KC_LBRACKET) +#define RCTBR RCTL_T(KC_RBRACKET) +#define LCTBR LCTL_T(KC_LBRACKET) -#define KC_SFSPC LSFT_T(KC_SPACE) -#define KC_SFENT LSFT_T(KC_ENTER) +#define SFSPC LSFT_T(KC_SPACE) +#define SFENT LSFT_T(KC_ENTER) // Global tab forward and backward -#define KC_TBFWD LCTL(KC_TAB) -#define KC_TBBCK LCTL(LSFT(KC_TAB)) +#define TBFWD LCTL(KC_TAB) +#define TBBCK LCTL(LSFT(KC_TAB)) // Custom key for NUM layer -#define KC_CTEQL RCTL_T(KC_EQL) +#define CTEQL RCTL_T(KC_EQL) // € #define KC_EUR ALGR(KC_5) -#define KC______ KC_TRNS -#define KC_XXXXX KC_NO -#define KC_RST RESET -#define KC_LTOG RGB_TOG -#define KC_LHUI RGB_HUI -#define KC_LHUD RGB_HUD -#define KC_LSAI RGB_SAI -#define KC_LSAD RGB_SAD -#define KC_LSPI RGB_SPI -#define KC_LSPD RGB_SPD -#define KC_LVAI RGB_VAI -#define KC_LVAD RGB_VAD - -#define KC_LMOD RGB_MOD - -#define KC_LFMOD RGB_MODE_FORWARD -#define KC_LRMOD RGB_MODE_REVERSE - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_COLEMAKDHM] = LAYOUT_kc( \ - //,-----------------------------------------. ,-----------------------------------------. - ESC, Q, W, F, P, B, J, L, U, Y, SCLN, BSPC,\ - //|------+------+------+------+------+------| |------+------+------+------+------+------| - FNTAB, A, R, S, T, G, M, N, E, I, O, QUOT,\ - //|------+------+------+------+------+------| |------+------+------+------+------+------| - LCTBR, Z, X, C, D, V, K, H, COMM, DOT, SLSH, RCTBR,\ - //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - LALT, T_NUM, SFSPC, SFENT, T_NAV, RGUI \ - //`--------------------' `--------------------' + [_COLEMAKDHM] = LAYOUT( \ + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,\ + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + FN_TAB, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT,\ + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + LCTBR, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, RCTBR,\ + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LALT, T_NUM, SFSPC, SFENT, T_NAV, KC_RGUI \ + //`--------------------------' `--------------------------' ), - [_GAMING] = LAYOUT_kc( \ - //,-----------------------------------------. ,-----------------------------------------. - _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____,\ - //|------+------+------+------+------+------| |------+------+------+------+------+------| - TAB, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____,\ - //|------+------+------+------+------+------| |------+------+------+------+------+------| - LCTL, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, RCTL,\ - //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - _____, GMSFT, SPC, _____, _____, _____ \ - //`--------------------' `--------------------' + [_GAMING] = LAYOUT( \ + //,-----------------------------------------------------. ,-----------------------------------------------------. + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_TAB, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RCTL,\ + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + _______, EXT_SF, KC_SPC, _______, _______, _______ \ + //`--------------------------' `--------------------------' ), - [_GAMING_EXT] = LAYOUT_kc( \ - //,-----------------------------------------. ,-----------------------------------------. - GRV, 1, 2, _____, 3, 4, F1, F2, F3, F4, F5, DEL,\ - //|------+------+------+------+------+------| |------+------+------+------+------+------| - LBRC, RBRC, _____, _____, _____, BSLS, F6, F7, F8, F9, F10, _____,\ - //|------+------+------+------+------+------| |------+------+------+------+------+------| - 5, 6, 7, 8, 9, 0, F11, F12, MINS, EQL, _____, _____,\ - //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - _____, _____, _____, ENT, _____, _____ \ - //`--------------------' `--------------------' + [_GAMING_EXT] = LAYOUT( \ + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_GRV, KC_1, KC_2, _______, KC_3, KC_4, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_DEL,\ + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_LBRC, KC_RBRC, _______, _______, _______, KC_BSLS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,\ + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F11, KC_F12, KC_MINS, KC_EQL, _______, _______,\ + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + _______, _______, _______, KC_ENT, _______, _______ \ + //`--------------------------' `--------------------------' ), - [_FN] = LAYOUT_kc( \ - //,-----------------------------------------. ,-----------------------------------------. - F12, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11,\ - //|------+------+------+------+------+------| |------+------+------+------+------+------| - _____, XXXXX, XXXXX, XXXXX, CAPS, NLCK, XXXXX, MINS, PIPE, BSLS, PLUS, XXXXX,\ - //|------+------+------+------+------+------| |------+------+------+------+------+------| - _____, XXXXX, PAUS, SLCK, PSCR, INS, XXXXX, UNDS, LT, GT, EQL, _____,\ - //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - _____, _____, _____, _____, _____, _____ \ - //`--------------------' `--------------------' + [_FN] = LAYOUT( \ + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,\ + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS, KC_NLCK, XXXXXXX, KC_MINS, KC_PIPE, KC_BSLS, KC_PLUS, XXXXXXX,\ + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + _______, XXXXXXX, KC_PAUS, KC_SLCK, KC_PSCR, KC_INS, XXXXXXX, KC_UNDS, KC_LT, KC_GT, KC_EQL, _______,\ + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + _______, _______, _______, _______, _______, _______ \ + //`--------------------------' `--------------------------' ), - [_NUM] = LAYOUT_kc( \ - //,-----------------------------------------. ,-----------------------------------------. - GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, _____,\ - //|------+------+------+------+------+------| |------+------+------+------+------+------| - TILD, EXLM, AT, HASH, DLR, PERC, SLSH, 4, 5, 6, MINS, PLUS,\ - //|------+------+------+------+------+------| |------+------+------+------+------+------| - _____, CIRC, AMPR, EUR, LPRN, RPRN, ASTR, 1, 2, 3, UNDS, CTEQL,\ - //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - _____, S_NUM, _____, _____, 0_NAV, DOT \ - //`--------------------' `--------------------' + [_NUM] = LAYOUT( \ + //,-----------------------------------------------------. ,-----------------------------------------------------. + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,\ + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_SLSH, KC_4, KC_5, KC_6, KC_MINS, KC_PLUS,\ + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + _______, KC_CIRC, KC_AMPR, KC_EUR, KC_LPRN, KC_RPRN, KC_ASTR, KC_1, KC_2, KC_3, KC_UNDS, CTEQL,\ + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + _______, S_NUM, _______, _______, NAV_0, KC_DOT \ + //`--------------------------' `--------------------------' ), - [_NAV] = LAYOUT_kc( \ - //,-----------------------------------------. ,-----------------------------------------. - _____, WH_U, TBBCK, MS_U, TBFWD, BTN2, PGUP, HOME, UP, END, XXXXX, DEL,\ - //|------+------+------+------+------+------| |------+------+------+------+------+------| - TAB, WH_D, MS_L, MS_D, MS_R, BTN1, PGDN, LEFT, DOWN, RGHT, XXXXX, XXXXX,\ - //|------+------+------+------+------+------| |------+------+------+------+------+------| - _____, XXXXX, WH_L, XXXXX, WH_R, XXXXX, XXXXX, ACL0, ACL1, ACL2, XXXXX, _____,\ - //|------+------+------+------+------+------+------| |------+------+------+------+------+-----+-------| - _____, _____, _____, _____, S_NAV, _____ \ - //`--------------------' `--------------------' + [_NAV] = LAYOUT( \ + //,-----------------------------------------------------. ,-----------------------------------------------------. + _______, KC_WH_U, TBBCK, KC_MS_U, TBFWD, KC_BTN2, KC_PGUP, KC_HOME, KC_UP, KC_END, XXXXXXX, KC_DEL,\ + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + KC_TAB, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN1, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,\ + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + _______, XXXXXXX, KC_WH_L, XXXXXXX, KC_WH_R, XXXXXXX, XXXXXXX, KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, _______,\ + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+-------+---------| + _______, _______, _______, _______, S_NAV, _______ \ + //`--------------------------' `--------------------------' ), - [_UTIL] = LAYOUT_kc( \ - //,-----------------------------------------. ,-----------------------------------------. - RST, XXXXX, MSTP, VOLU, MNXT, XXXXX, CLMK, GAME, XXXXX, XXXXX, XXXXX, XXXXX,\ - //|------+------+------+------+------+------| |------+------+------+------+------+------| - XXXXX, XXXXX, MPRV, VOLD, MPLY, XXXXX, XXXXX, LFMOD, LSPI, LHUI, LSAI, LVAI,\ - //|------+------+------+------+------+------| |------+------+------+------+------+------| - XXXXX, SLEP, XXXXX, MUTE, XXXXX, XXXXX, LTOG, LRMOD, LSPD, LHUD, LSAD, LVAD,\ - //|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - _____, _____, _____, _____, _____, _____ \ - //`--------------------' `--------------------' + [_UTIL] = LAYOUT( \ + //,-----------------------------------------------------. ,-----------------------------------------------------. + RESET, XXXXXXX, KC_MSTP, KC_VOLU, KC_MNXT, XXXXXXX, COLEMAK, GAMING, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\ + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + XXXXXXX, XXXXXXX, KC_MPRV, KC_VOLD, KC_MPLY, XXXXXXX, XXXXXXX, RGB_MOD, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI,\ + //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| + XXXXXXX, KC_SLEP, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, RGB_TOG,RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD,\ + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + _______, _______, _______, _______, _______, _______ \ + //`--------------------------' `--------------------------' ) };