mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-05-05 23:24:17 -04:00
putting keyboard combos back
- it felt too weird and clunky now I got used to combos
This commit is contained in:
parent
0344373690
commit
90ea8d727a
5 changed files with 18 additions and 20 deletions
|
@ -1,6 +1,6 @@
|
|||
#include "combo.h"
|
||||
|
||||
/*
|
||||
|
||||
bool get_combo_must_tap(uint16_t index, combo_t *combo) {
|
||||
|
||||
switch (index) {
|
||||
|
@ -10,9 +10,8 @@ bool get_combo_must_tap(uint16_t index, combo_t *combo) {
|
|||
// case MOUSE_BUTTON5:
|
||||
// case MOUSE_DRGTOG:
|
||||
|
||||
|
||||
case KEY_ENT:
|
||||
// case KEY_TAB:
|
||||
case KEY_TAB:
|
||||
return true;
|
||||
|
||||
default:
|
||||
|
@ -20,7 +19,7 @@ bool get_combo_must_tap(uint16_t index, combo_t *combo) {
|
|||
|
||||
}
|
||||
|
||||
} */
|
||||
}
|
||||
|
||||
bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) {
|
||||
|
||||
|
@ -34,7 +33,7 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode
|
|||
// case MOUSE_BUTTON2:
|
||||
// case MOUSE_BUTTON3:
|
||||
// case MOUSE_BUTTON4:
|
||||
// case MOUSE_BUTTON5:
|
||||
df// case MOUSE_BUTTON5:
|
||||
|
||||
case MOUSE_DRGTOG:
|
||||
if ( get_highest_layer(layer_state | default_layer_state) > _DEFAULT_LAYER_1 ) return false;
|
||||
|
|
|
@ -10,9 +10,9 @@
|
|||
const uint16_t PROGMEM mou_drg_combo[] = { KC_X, KC_C, COMBO_END };
|
||||
|
||||
|
||||
//const uint16_t PROGMEM key_ent_combo[] = { KC_C, KC_V, COMBO_END };
|
||||
//const uint16_t PROGMEM key_tab_combo[] = { KC_U, KC_I, COMBO_END };
|
||||
//const uint16_t PROGMEM key_bspc_combo[] = { KC_M, TR_COMM, COMBO_END };
|
||||
const uint16_t PROGMEM key_ent_combo[] = { KC_C, KC_V, COMBO_END };
|
||||
const uint16_t PROGMEM key_tab_combo[] = { KC_M, TR_DOT, COMBO_END };
|
||||
const uint16_t PROGMEM key_bspc_combo[] = { KC_M, TR_COMM, COMBO_END };
|
||||
|
||||
|
||||
|
||||
|
@ -24,9 +24,9 @@ enum combos {
|
|||
// MOUSE_BUTTON5,
|
||||
MOUSE_DRGTOG,
|
||||
|
||||
// KEY_ENT,
|
||||
// KEY_TAB,
|
||||
// KEY_BSPC,
|
||||
KEY_ENT,
|
||||
KEY_TAB,
|
||||
KEY_BSPC,
|
||||
COMBO_LENGTH
|
||||
};
|
||||
|
||||
|
@ -43,8 +43,8 @@ combo_t key_combos[COMBO_LENGTH] = {
|
|||
// [MOUSE_BUTTON5] = COMBO(mou_btn5_combo, KC_BTN5),
|
||||
[MOUSE_DRGTOG] = COMBO(mou_drg_combo, TR_DRGS)
|
||||
|
||||
// [KEY_ENT] = COMBO(key_ent_combo, KC_ENT),
|
||||
// [KEY_TAB] = COMBO(key_tab_combo, KC_TAB),
|
||||
// [KEY_BSPC] = COMBO(key_bspc_combo, KC_BSPC)
|
||||
[KEY_ENT] = COMBO(key_ent_combo, KC_ENT),
|
||||
[KEY_TAB] = COMBO(key_tab_combo, KC_TAB),
|
||||
[KEY_BSPC] = COMBO(key_bspc_combo, KC_BSPC)
|
||||
|
||||
};
|
|
@ -1,6 +1,5 @@
|
|||
#include "tapping.h"
|
||||
|
||||
uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
|
||||
uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
|
||||
switch (keycode) {
|
||||
case NAV:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue