mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-07-05 03:10:35 -04:00
Cleaning up docs and combo logic
This commit is contained in:
parent
fa85221e82
commit
92efb790af
2 changed files with 8 additions and 22 deletions
|
@ -11,9 +11,8 @@ uint16_t get_combo_term(uint16_t index, combo_t *combo) {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool get_combo_must_tap(uint16_t index, combo_t *combo) {
|
bool get_combo_must_tap(uint16_t index, combo_t *combo) {
|
||||||
|
|
||||||
switch (index) {
|
|
||||||
|
|
||||||
|
switch (index) {
|
||||||
|
|
||||||
#if defined(MOUSEKEY_ENABLE)
|
#if defined(MOUSEKEY_ENABLE)
|
||||||
case MOUSE_BUTTON3:
|
case MOUSE_BUTTON3:
|
||||||
|
@ -63,8 +62,13 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode
|
||||||
|
|
||||||
switch (combo_index) {
|
switch (combo_index) {
|
||||||
|
|
||||||
case KEY_ESC:
|
|
||||||
case KEY_ENT:
|
case KEY_ENT:
|
||||||
|
if ( get_highest_layer(layer_state) == _SYMBOL ) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case KEY_ESC:
|
||||||
case KEY_TAB:
|
case KEY_TAB:
|
||||||
if ( get_highest_layer(layer_state) == _NAVIGATION ||
|
if ( get_highest_layer(layer_state) == _NAVIGATION ||
|
||||||
get_highest_layer(layer_state) == _SYMBOL ) {
|
get_highest_layer(layer_state) == _SYMBOL ) {
|
||||||
|
@ -78,9 +82,7 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode
|
||||||
case MOUSE_BUTTON4:
|
case MOUSE_BUTTON4:
|
||||||
case MOUSE_BUTTON5:
|
case MOUSE_BUTTON5:
|
||||||
case MOUSE_DRGTOG:
|
case MOUSE_DRGTOG:
|
||||||
if ( get_highest_layer(layer_state) == _NAVIGATION ||
|
if ( get_highest_layer(layer_state) > _DEFAULT_LAYER_1 ) {
|
||||||
get_highest_layer(layer_state) == _NUMBER ||
|
|
||||||
get_highest_layer(layer_state) == _SYMBOL ) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -249,20 +249,4 @@ If I was going to combine number and symbols together, it'd look like this
|
||||||
_GACS_MODS________________________, TR_GRV, TR_SCLN, KC_4, KC_5, KC_6, TR_EQL, \
|
_GACS_MODS________________________, TR_GRV, TR_SCLN, KC_4, KC_5, KC_6, TR_EQL, \
|
||||||
_UCCPR_L___________________________________, KC_SLSH, KC_1, KC_2, KC_3, KC_BSLS, \
|
_UCCPR_L___________________________________, KC_SLSH, KC_1, KC_2, KC_3, KC_BSLS, \
|
||||||
_LAYER_TRANS_____________, KC_SPC, NAV_0, ___x___
|
_LAYER_TRANS_____________, KC_SPC, NAV_0, ___x___
|
||||||
|
|
||||||
|
|
||||||
nav and the N key together for config (not using combo)
|
|
||||||
- move all the rgb settings over one
|
|
||||||
- move rgb toggle to right encoder press
|
|
||||||
- move baselyr to left encoder press
|
|
||||||
|
|
||||||
If we want to get rid of the mouse combos
|
|
||||||
- put all the mouse buttons on the top number layer row
|
|
||||||
- get rid of snipping tool and file explorer shortcuts
|
|
||||||
- 53214 is the button layout
|
|
||||||
- drag scroll toggle goes left of shift maybe
|
|
||||||
|
|
||||||
if i want to force the use of enter combo
|
|
||||||
- i have to remove it from the navigation layer
|
|
||||||
|
|
||||||
*/
|
*/
|
Loading…
Add table
Add a link
Reference in a new issue