mirrors/qmk_userspace
1
0
Fork 1
mirror of https://github.com/qmk/qmk_userspace.git synced 2025-05-04 22:54:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

putting keyboard combos back

Browse source 
- it felt too weird and clunky now I got used to combos
This commit is contained in:
Victor 2024-05-24 00:35:26 -05:00
parent 0344373690
commit 90ea8d727a
Failed to generate hash of commit
5 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
users/t4corun/config/combo_config.h
View file

@ -22,5 +22,5 @@
#define COMBO_TERM 35 #define COMBO_TERM 35
//#define COMBO_MUST_TAP_PER_COMBO #define COMBO_MUST_TAP_PER_COMBO
#define COMBO_SHOULD_TRIGGER #define COMBO_SHOULD_TRIGGER

9
users/t4corun/features/combo.c
View file

@ -1,6 +1,6 @@
#include "combo.h" #include "combo.h"
/*
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) {
@ -10,9 +10,8 @@ bool get_combo_must_tap(uint16_t index, combo_t *combo) {
// case MOUSE_BUTTON5: // case MOUSE_BUTTON5:
// case MOUSE_DRGTOG: // case MOUSE_DRGTOG:
case KEY_ENT: case KEY_ENT:
// case KEY_TAB: case KEY_TAB:
return true; return true;
default: 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) { 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_BUTTON2:
// case MOUSE_BUTTON3: // case MOUSE_BUTTON3:
// case MOUSE_BUTTON4: // case MOUSE_BUTTON4:
// case MOUSE_BUTTON5: df// case MOUSE_BUTTON5:
case MOUSE_DRGTOG: case MOUSE_DRGTOG:
if ( get_highest_layer(layer_state | default_layer_state) > _DEFAULT_LAYER_1 ) return false; if ( get_highest_layer(layer_state | default_layer_state) > _DEFAULT_LAYER_1 ) return false;

18
users/t4corun/features/combo.h
View file

@ -10,9 +10,9 @@
const uint16_t PROGMEM mou_drg_combo[] = { KC_X, KC_C, COMBO_END }; 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_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_tab_combo[] = { KC_M, TR_DOT, COMBO_END };
//const uint16_t PROGMEM key_bspc_combo[] = { KC_M, TR_COMM, COMBO_END }; const uint16_t PROGMEM key_bspc_combo[] = { KC_M, TR_COMM, COMBO_END };
@ -24,9 +24,9 @@ enum combos {
// MOUSE_BUTTON5, // MOUSE_BUTTON5,
MOUSE_DRGTOG, MOUSE_DRGTOG,
// KEY_ENT, KEY_ENT,
// KEY_TAB, KEY_TAB,
// KEY_BSPC, KEY_BSPC,
COMBO_LENGTH COMBO_LENGTH
}; };
@ -43,8 +43,8 @@ combo_t key_combos[COMBO_LENGTH] = {
// [MOUSE_BUTTON5] = COMBO(mou_btn5_combo, KC_BTN5), // [MOUSE_BUTTON5] = COMBO(mou_btn5_combo, KC_BTN5),
[MOUSE_DRGTOG] = COMBO(mou_drg_combo, TR_DRGS) [MOUSE_DRGTOG] = COMBO(mou_drg_combo, TR_DRGS)
// [KEY_ENT] = COMBO(key_ent_combo, KC_ENT), [KEY_ENT] = COMBO(key_ent_combo, KC_ENT),
// [KEY_TAB] = COMBO(key_tab_combo, KC_TAB), [KEY_TAB] = COMBO(key_tab_combo, KC_TAB),
// [KEY_BSPC] = COMBO(key_bspc_combo, KC_BSPC) [KEY_BSPC] = COMBO(key_bspc_combo, KC_BSPC)
}; };

1
users/t4corun/features/tapping.c
View file

@ -1,6 +1,5 @@
#include "tapping.h" #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) { uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
switch (keycode) { switch (keycode) {
case NAV: case NAV:

8
users/t4corun/t4corun.h
View file

@ -222,15 +222,15 @@ enum keycodes {
#define LAYER_NAVIGATION \ #define LAYER_NAVIGATION \
KC_ESC, KC_HOME, KC_UP, KC_END, KC_PGUP, ___x___, KC_APP, SC_FILE, SC_SNIP, CONFIG, \ KC_ESC, KC_HOME, KC_UP, KC_END, KC_PGUP, ___x___, ___x___, fdSC_FILE, SC_SNIP, CONFIG, \
___x___, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_BSPC, _SCAG_MODS________________________, \ ___x___, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, ___x___, _SCAG_MODS________________________, \
_UCCPR_L___________________________________, ___x___, KC_TAB, TR_SNIP, TR_SDPI, TR_PDPI, \ _UCCPR_L___________________________________, ___x___, KC_APP, TR_SNIP, TR_SDPI, TR_PDPI, \
ZOOMRST, NUM, KC_ENT, _LAYER_TRANS_____________ ZOOMRST, NUM, KC_ENT, _LAYER_TRANS_____________
#define LAYER_NUMBER \ #define LAYER_NUMBER \
KC_ESC, KC_BTN3, KC_BTN2, KC_BTN1, TR_GRV, ___x___, KC_7, KC_8, KC_9, KC_COMM, \ KC_ESC, KC_BTN3, KC_BTN2, KC_BTN1, TR_GRV, ___x___, KC_7, KC_8, KC_9, KC_COMM, \
_GACS_MODS________________________, TR_SCLN, KC_BSPC, KC_4, KC_5, KC_6, KC_DOT, \ _GACS_MODS________________________, TR_SCLN, ___x___, KC_4, KC_5, KC_6, KC_DOT, \
_UCCPR_L___________________________________, ___x___, KC_1, KC_2, KC_3, KC_MINS, \ _UCCPR_L___________________________________, ___x___, KC_1, KC_2, KC_3, KC_MINS, \
_LAYER_TRANS_____________, _BASE_R4_________________ _LAYER_TRANS_____________, _BASE_R4_________________