Remove layer keycode macros

This commit is contained in:
Richard Baptist 2019-10-01 10:15:46 +02:00
parent 3b86679d6b
commit 17684b4d3c
No known key found for this signature in database
GPG Key ID: 115D8B1815981F35

View File

@ -1,6 +1,5 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
extern uint8_t is_master; extern uint8_t is_master;
enum layer_names { enum layer_names {
@ -14,139 +13,121 @@ enum layer_names {
}; };
// Base layers // Base layers
#define KC_CLMK DF(_COLEMAKDHM) #define COLEMAK DF(_COLEMAKDHM)
#define KC_GAME DF(_GAMING) #define GAMING DF(_GAMING)
// Layer toggle and switch // Layer toggle and switch
#define KC_T_NAV TT(_NAV) #define T_NAV TT(_NAV)
#define KC_S_NAV MO(_NAV) #define S_NAV MO(_NAV)
#define KC_T_NUM TT(_NUM) #define T_NUM TT(_NUM)
#define KC_S_NUM MO(_NUM) #define S_NUM MO(_NUM)
// Layer keys with functionality on tap // Layer keys with functionality on tap
#define KC_FNTAB LT(_FN, KC_TAB) #define FN_TAB LT(_FN, KC_TAB)
#define KC_0_NAV LT(_NAV, KC_0) #define NAV_0 LT(_NAV, KC_0)
#define KC_GMSFT LT(_GAMING_EXT, KC_LSHIFT) #define EXT_SF LT(_GAMING_EXT, KC_LSHIFT)
// Tap/mod keys // Tap/mod keys
#define KC_RCTBR RCTL_T(KC_RBRACKET) #define RCTBR RCTL_T(KC_RBRACKET)
#define KC_LCTBR LCTL_T(KC_LBRACKET) #define LCTBR LCTL_T(KC_LBRACKET)
#define KC_SFSPC LSFT_T(KC_SPACE) #define SFSPC LSFT_T(KC_SPACE)
#define KC_SFENT LSFT_T(KC_ENTER) #define SFENT LSFT_T(KC_ENTER)
// Global tab forward and backward // Global tab forward and backward
#define KC_TBFWD LCTL(KC_TAB) #define TBFWD LCTL(KC_TAB)
#define KC_TBBCK LCTL(LSFT(KC_TAB)) #define TBBCK LCTL(LSFT(KC_TAB))
// Custom key for NUM layer // 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_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] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_COLEMAKDHM] = LAYOUT_kc( \ [_COLEMAKDHM] = LAYOUT( \
//,-----------------------------------------. ,-----------------------------------------. //,-----------------------------------------------------. ,-----------------------------------------------------.
ESC, Q, W, F, P, B, J, L, U, Y, SCLN, BSPC,\ KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,\
//|------+------+------+------+------+------| |------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
FNTAB, A, R, S, T, G, M, N, E, I, O, QUOT,\ 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, Z, X, C, D, V, K, H, COMM, DOT, SLSH, RCTBR,\ LCTBR, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, RCTBR,\
//|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
LALT, T_NUM, SFSPC, SFENT, T_NAV, RGUI \ KC_LALT, T_NUM, SFSPC, SFENT, T_NAV, KC_RGUI \
//`--------------------' `--------------------' //`--------------------------' `--------------------------'
), ),
[_GAMING] = LAYOUT_kc( \ [_GAMING] = LAYOUT( \
//,-----------------------------------------. ,-----------------------------------------. //,-----------------------------------------------------. ,-----------------------------------------------------.
_____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____,\ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
//|------+------+------+------+------+------| |------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
TAB, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____,\ KC_TAB, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\
//|------+------+------+------+------+------| |------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
LCTL, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, RCTL,\ KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RCTL,\
//|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
_____, GMSFT, SPC, _____, _____, _____ \ _______, EXT_SF, KC_SPC, _______, _______, _______ \
//`--------------------' `--------------------' //`--------------------------' `--------------------------'
), ),
[_GAMING_EXT] = LAYOUT_kc( \ [_GAMING_EXT] = LAYOUT( \
//,-----------------------------------------. ,-----------------------------------------. //,-----------------------------------------------------. ,-----------------------------------------------------.
GRV, 1, 2, _____, 3, 4, F1, F2, F3, F4, F5, DEL,\ KC_GRV, KC_1, KC_2, _______, KC_3, KC_4, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_DEL,\
//|------+------+------+------+------+------| |------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
LBRC, RBRC, _____, _____, _____, BSLS, F6, F7, F8, F9, F10, _____,\ KC_LBRC, KC_RBRC, _______, _______, _______, KC_BSLS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,\
//|------+------+------+------+------+------| |------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
5, 6, 7, 8, 9, 0, F11, F12, MINS, EQL, _____, _____,\ KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F11, KC_F12, KC_MINS, KC_EQL, _______, _______,\
//|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
_____, _____, _____, ENT, _____, _____ \ _______, _______, _______, KC_ENT, _______, _______ \
//`--------------------' `--------------------' //`--------------------------' `--------------------------'
), ),
[_FN] = LAYOUT_kc( \ [_FN] = LAYOUT( \
//,-----------------------------------------. ,-----------------------------------------. //,-----------------------------------------------------. ,-----------------------------------------------------.
F12, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11,\ KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,\
//|------+------+------+------+------+------| |------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
_____, XXXXX, XXXXX, XXXXX, CAPS, NLCK, XXXXX, MINS, PIPE, BSLS, PLUS, XXXXX,\ _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS, KC_NLCK, XXXXXXX, KC_MINS, KC_PIPE, KC_BSLS, KC_PLUS, XXXXXXX,\
//|------+------+------+------+------+------| |------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
_____, XXXXX, PAUS, SLCK, PSCR, INS, XXXXX, UNDS, LT, GT, EQL, _____,\ _______, XXXXXXX, KC_PAUS, KC_SLCK, KC_PSCR, KC_INS, XXXXXXX, KC_UNDS, KC_LT, KC_GT, KC_EQL, _______,\
//|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
_____, _____, _____, _____, _____, _____ \ _______, _______, _______, _______, _______, _______ \
//`--------------------' `--------------------' //`--------------------------' `--------------------------'
), ),
[_NUM] = LAYOUT_kc( \ [_NUM] = LAYOUT( \
//,-----------------------------------------. ,-----------------------------------------. //,-----------------------------------------------------. ,-----------------------------------------------------.
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, _____,\ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,\
//|------+------+------+------+------+------| |------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
TILD, EXLM, AT, HASH, DLR, PERC, SLSH, 4, 5, 6, MINS, PLUS,\ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_SLSH, KC_4, KC_5, KC_6, KC_MINS, KC_PLUS,\
//|------+------+------+------+------+------| |------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
_____, CIRC, AMPR, EUR, LPRN, RPRN, ASTR, 1, 2, 3, UNDS, CTEQL,\ _______, KC_CIRC, KC_AMPR, KC_EUR, KC_LPRN, KC_RPRN, KC_ASTR, KC_1, KC_2, KC_3, KC_UNDS, CTEQL,\
//|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
_____, S_NUM, _____, _____, 0_NAV, DOT \ _______, S_NUM, _______, _______, NAV_0, KC_DOT \
//`--------------------' `--------------------' //`--------------------------' `--------------------------'
), ),
[_NAV] = LAYOUT_kc( \ [_NAV] = LAYOUT( \
//,-----------------------------------------. ,-----------------------------------------. //,-----------------------------------------------------. ,-----------------------------------------------------.
_____, WH_U, TBBCK, MS_U, TBFWD, BTN2, PGUP, HOME, UP, END, XXXXX, DEL,\ _______, KC_WH_U, TBBCK, KC_MS_U, TBFWD, KC_BTN2, KC_PGUP, KC_HOME, KC_UP, KC_END, XXXXXXX, KC_DEL,\
//|------+------+------+------+------+------| |------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
TAB, WH_D, MS_L, MS_D, MS_R, BTN1, PGDN, LEFT, DOWN, RGHT, XXXXX, XXXXX,\ 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,\
//|------+------+------+------+------+------| |------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
_____, XXXXX, WH_L, XXXXX, WH_R, XXXXX, XXXXX, ACL0, ACL1, ACL2, XXXXX, _____,\ _______, XXXXXXX, KC_WH_L, XXXXXXX, KC_WH_R, XXXXXXX, XXXXXXX, KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX, _______,\
//|------+------+------+------+------+------+------| |------+------+------+------+------+-----+-------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+-------+---------|
_____, _____, _____, _____, S_NAV, _____ \ _______, _______, _______, _______, S_NAV, _______ \
//`--------------------' `--------------------' //`--------------------------' `--------------------------'
), ),
[_UTIL] = LAYOUT_kc( \ [_UTIL] = LAYOUT( \
//,-----------------------------------------. ,-----------------------------------------. //,-----------------------------------------------------. ,-----------------------------------------------------.
RST, XXXXX, MSTP, VOLU, MNXT, XXXXX, CLMK, GAME, XXXXX, XXXXX, XXXXX, XXXXX,\ RESET, XXXXXXX, KC_MSTP, KC_VOLU, KC_MNXT, XXXXXXX, COLEMAK, GAMING, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
//|------+------+------+------+------+------| |------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
XXXXX, XXXXX, MPRV, VOLD, MPLY, XXXXX, XXXXX, LFMOD, LSPI, LHUI, LSAI, LVAI,\ XXXXXXX, XXXXXXX, KC_MPRV, KC_VOLD, KC_MPLY, XXXXXXX, XXXXXXX, RGB_MOD, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI,\
//|------+------+------+------+------+------| |------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
XXXXX, SLEP, XXXXX, MUTE, XXXXX, XXXXX, LTOG, LRMOD, LSPD, LHUD, LSAD, LVAD,\ XXXXXXX, KC_SLEP, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, RGB_TOG,RGB_RMOD, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD,\
//|------+------+------+------+------+------+------| |------+------+------+------+------+------+------| //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
_____, _____, _____, _____, _____, _____ \ _______, _______, _______, _______, _______, _______ \
//`--------------------' `--------------------' //`--------------------------' `--------------------------'
) )
}; };