mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-05-17 12:55:29 -04:00
More Cleanup so we can do the test
- I forgot I removed the function layer
This commit is contained in:
parent
0d194ac08f
commit
7c665ff65a
8 changed files with 12 additions and 12 deletions
|
@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
[_NAVIGATION] = ROLLOW(LAYER_NAVIGATION),
|
[_NAVIGATION] = ROLLOW(LAYER_NAVIGATION),
|
||||||
[_NUMBER] = ROLLOW(LAYER_NUMBER),
|
[_NUMBER] = ROLLOW(LAYER_NUMBER),
|
||||||
[_SYMBOL] = ROLLOW(LAYER_SYMBOL),
|
[_SYMBOL] = ROLLOW(LAYER_SYMBOL),
|
||||||
[_FUNCTION] = ROLLOW(LAYER_FUNCTION),
|
//[_FUNCTION] = ROLLOW(LAYER_FUNCTION),
|
||||||
[_CONFIG] = ROLLOW(LAYER_CONFIG)
|
[_CONFIG] = ROLLOW(LAYER_CONFIG)
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -41,7 +41,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
|
||||||
[_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) },
|
[_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) },
|
||||||
[_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) },
|
[_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) },
|
||||||
[_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
|
[_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
|
||||||
[_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_DOWN, KC_UP ) },
|
//[_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_DOWN, KC_UP ) },
|
||||||
[_CONFIG] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
|
[_CONFIG] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
[_NAVIGATION] = CNANO(LAYER_NAVIGATION),
|
[_NAVIGATION] = CNANO(LAYER_NAVIGATION),
|
||||||
[_NUMBER] = CNANO(LAYER_NUMBER),
|
[_NUMBER] = CNANO(LAYER_NUMBER),
|
||||||
[_SYMBOL] = CNANO(LAYER_SYMBOL),
|
[_SYMBOL] = CNANO(LAYER_SYMBOL),
|
||||||
[_FUNCTION] = CNANO(LAYER_FUNCTION),
|
//[_FUNCTION] = CNANO(LAYER_FUNCTION),
|
||||||
[_CONFIG] = CNANO(LAYER_CONFIG)
|
[_CONFIG] = CNANO(LAYER_CONFIG)
|
||||||
|
|
||||||
};
|
};
|
|
@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
[_NAVIGATION] = SWOOP(LAYER_NAVIGATION),
|
[_NAVIGATION] = SWOOP(LAYER_NAVIGATION),
|
||||||
[_NUMBER] = SWOOP(LAYER_NUMBER),
|
[_NUMBER] = SWOOP(LAYER_NUMBER),
|
||||||
[_SYMBOL] = SWOOP(LAYER_SYMBOL),
|
[_SYMBOL] = SWOOP(LAYER_SYMBOL),
|
||||||
[_FUNCTION] = SWOOP(LAYER_FUNCTION),
|
//[_FUNCTION] = SWOOP(LAYER_FUNCTION),
|
||||||
[_CONFIG] = SWOOP(LAYER_CONFIG)
|
[_CONFIG] = SWOOP(LAYER_CONFIG)
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -42,7 +42,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
|
||||||
[_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) },
|
[_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) },
|
||||||
[_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) },
|
[_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) },
|
||||||
[_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
|
[_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
|
||||||
[_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_DOWN, KC_UP ) },
|
//[_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_DOWN, KC_UP ) },
|
||||||
[_CONFIG] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
|
[_CONFIG] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
[_NAVIGATION] = CRKBD(LAYER_NAVIGATION),
|
[_NAVIGATION] = CRKBD(LAYER_NAVIGATION),
|
||||||
[_NUMBER] = CRKBD(LAYER_NUMBER),
|
[_NUMBER] = CRKBD(LAYER_NUMBER),
|
||||||
[_SYMBOL] = CRKBD(LAYER_SYMBOL),
|
[_SYMBOL] = CRKBD(LAYER_SYMBOL),
|
||||||
[_FUNCTION] = CRKBD(LAYER_FUNCTION),
|
//[_FUNCTION] = CRKBD(LAYER_FUNCTION),
|
||||||
[_CONFIG] = CRKBD(LAYER_CONFIG)
|
[_CONFIG] = CRKBD(LAYER_CONFIG)
|
||||||
|
|
||||||
};
|
};
|
|
@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
[_NAVIGATION] = PLANCK(LAYER_NAVIGATION),
|
[_NAVIGATION] = PLANCK(LAYER_NAVIGATION),
|
||||||
[_NUMBER] = PLANCK(LAYER_NUMBER),
|
[_NUMBER] = PLANCK(LAYER_NUMBER),
|
||||||
[_SYMBOL] = PLANCK(LAYER_SYMBOL),
|
[_SYMBOL] = PLANCK(LAYER_SYMBOL),
|
||||||
[_FUNCTION] = PLANCK(LAYER_FUNCTION),
|
//[_FUNCTION] = PLANCK(LAYER_FUNCTION),
|
||||||
[_CONFIG] = PLANCK(LAYER_CONFIG)
|
[_CONFIG] = PLANCK(LAYER_CONFIG)
|
||||||
|
|
||||||
};
|
};
|
|
@ -39,7 +39,7 @@ bool get_combo_must_hold(uint16_t index, combo_t *combo) {
|
||||||
switch (index) {
|
switch (index) {
|
||||||
|
|
||||||
case LYR_CONFIG:
|
case LYR_CONFIG:
|
||||||
case LYR_FUNCTION:
|
//case LYR_FUNCTION:
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -39,7 +39,7 @@ const uint16_t PROGMEM mou_drg_combo[] = { KC_S, KC_D, COMBO_END };
|
||||||
|
|
||||||
const uint16_t PROGMEM key_esc_combo[] = { KC_W, KC_E, COMBO_END };
|
const uint16_t PROGMEM key_esc_combo[] = { KC_W, KC_E, COMBO_END };
|
||||||
const uint16_t PROGMEM key_ent_combo[] = { KC_X, KC_C, COMBO_END };
|
const uint16_t PROGMEM key_ent_combo[] = { KC_X, KC_C, COMBO_END };
|
||||||
const uint16_t PROGMEM lyr_fun_combo[] = { NUM, TR_LSFT, COMBO_END };
|
//const uint16_t PROGMEM lyr_fun_combo[] = { NUM, TR_LSFT, COMBO_END };
|
||||||
|
|
||||||
|
|
||||||
// right hand combos
|
// right hand combos
|
||||||
|
@ -64,7 +64,7 @@ combo_t key_combos[COMBO_LENGTH] = {
|
||||||
|
|
||||||
[KEY_ESC] = COMBO(key_esc_combo, KC_ESC),
|
[KEY_ESC] = COMBO(key_esc_combo, KC_ESC),
|
||||||
[KEY_ENT] = COMBO(key_ent_combo, KC_ENT),
|
[KEY_ENT] = COMBO(key_ent_combo, KC_ENT),
|
||||||
[LYR_FUNCTION] = COMBO(lyr_fun_combo, FUNC),
|
//[LYR_FUNCTION] = COMBO(lyr_fun_combo, FUNC),
|
||||||
|
|
||||||
// right hand combos
|
// right hand combos
|
||||||
[KEY_TAB] = COMBO(key_tab_combo, KC_TAB),
|
[KEY_TAB] = COMBO(key_tab_combo, KC_TAB),
|
||||||
|
|
|
@ -44,7 +44,7 @@ enum keycodes {
|
||||||
#define NAV MO(_NAVIGATION)
|
#define NAV MO(_NAVIGATION)
|
||||||
#define NAV_0 LT(_NAVIGATION, KC_0)
|
#define NAV_0 LT(_NAVIGATION, KC_0)
|
||||||
#define NUM MO(_NUMBER)
|
#define NUM MO(_NUMBER)
|
||||||
#define FUNC MO(_FUNCTION)
|
//#define FUNC MO(_FUNCTION)
|
||||||
#define CONFIG MO(_CONFIG)
|
#define CONFIG MO(_CONFIG)
|
||||||
|
|
||||||
// Windows Shortcuts
|
// Windows Shortcuts
|
||||||
|
@ -241,7 +241,7 @@ enum keycodes {
|
||||||
|
|
||||||
#define LAYER_SYMBOL \
|
#define LAYER_SYMBOL \
|
||||||
___x___, ___x___, KC_AT, KC_DLR, TR_GRV, TR_EQL, KC_HASH, KC_ASTR, ___x___, TR_DQUO, \
|
___x___, ___x___, KC_AT, KC_DLR, TR_GRV, TR_EQL, KC_HASH, KC_ASTR, ___x___, TR_DQUO, \
|
||||||
KC_AMPR, TR_LCBR, KC_RCBR, KC_PIPE, TH_SCLN, TR_PLUS, KC_QUES, TR_LBRC, KC_RBRC, TR_SQUO, \
|
KC_AMPR, TR_LCBR, KC_RCBR, KC_PIPE, TH_SCLN, KC_PLUS, KC_QUES, TR_LBRC, KC_RBRC, TR_SQUO, \
|
||||||
TR_PERC, TR_LABK, KC_RABK, KC_BSLS, KC_EXLM, ___x___, KC_SLSH, TR_LPRN, TR_DOT, TR_MINS, \
|
TR_PERC, TR_LABK, KC_RABK, KC_BSLS, KC_EXLM, ___x___, KC_SLSH, TR_LPRN, TR_DOT, TR_MINS, \
|
||||||
_LAYER_TRANS_____________, _LAYER_TRANS_____________
|
_LAYER_TRANS_____________, _LAYER_TRANS_____________
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue