From a648a7af4f3cc2c8f88fab934837102b4e7e0705 Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 7 May 2024 23:12:13 -0500 Subject: [PATCH] Removing rest of single tap tap holds - now overriding comma and dot - removed autoshift tap holds so I can type faster and do repeats --- users/t4corun/features/keyoverride.c | 5 ++++ users/t4corun/features/taphold.c | 15 +++++------ users/t4corun/features/taphold.h | 12 ++++----- users/t4corun/t4corun.c | 8 +++--- users/t4corun/t4corun.h | 37 +++++++++++----------------- 5 files changed, 38 insertions(+), 39 deletions(-) diff --git a/users/t4corun/features/keyoverride.c b/users/t4corun/features/keyoverride.c index 5803d561..8e5fd858 100644 --- a/users/t4corun/features/keyoverride.c +++ b/users/t4corun/features/keyoverride.c @@ -7,6 +7,9 @@ const key_override_t media_next_override = ko_make_basic(MOD_MASK_SHIFT, KC_MNXT const key_override_t at_sym_override = ko_make_basic(MOD_MASK_SHIFT, KC_AT, KC_AMPR); const key_override_t exlm_sym_override = ko_make_basic(MOD_MASK_SHIFT, KC_EXLM, KC_DLR); const key_override_t perc_sym_override = ko_make_basic(MOD_MASK_SHIFT, KC_PERC, KC_CIRC); +const key_override_t comm_sym_override = ko_make_basic(MOD_MASK_SHIFT, KC_COMM, KC_LPRN); +const key_override_t dot_sym_override = ko_make_basic(MOD_MASK_SHIFT, KC_DOT, KC_RPRN); + const key_override_t **key_overrides = (const key_override_t *[]){ @@ -15,6 +18,8 @@ const key_override_t **key_overrides = (const key_override_t *[]){ &at_sym_override, &exlm_sym_override, &perc_sym_override, + &comm_sym_override, + &dot_sym_override, NULL // Null terminate the array of overrides! }; \ No newline at end of file diff --git a/users/t4corun/features/taphold.c b/users/t4corun/features/taphold.c index 72ecb17f..ec8381af 100644 --- a/users/t4corun/features/taphold.c +++ b/users/t4corun/features/taphold.c @@ -62,13 +62,13 @@ bool process_tap_hold_key(keyrecord_t* record, uint16_t keycode) { case TR_SLSH: single_tap(TAPHOLD_SLSH, isHold); break; - case TR_COMM: +/* case TR_COMM: single_tap(TAPHOLD_COMM, isHold); break; case TR_DOT: single_tap(TAPHOLD_DOT, isHold); break; -/* case TR_PERC: + case TR_PERC: single_tap(TAPHOLD_PERC, isHold); break; case TR_EXLM: @@ -76,7 +76,7 @@ bool process_tap_hold_key(keyrecord_t* record, uint16_t keycode) { break; case TR_AT: single_tap(TAPHOLD_AT, isHold); - break; */ + break; case TR_MINS: single_tap(TAPHOLD_MINS, isHold); break; @@ -88,7 +88,7 @@ bool process_tap_hold_key(keyrecord_t* record, uint16_t keycode) { break; case TR_QUOT: single_tap(TAPHOLD_QUOT, isHold); - break; + break;*/ } @@ -130,13 +130,13 @@ bool process_tap_hold_key(keyrecord_t* record, uint16_t keycode) { break; //custom action - case TR_COMM: +/* case TR_COMM: single_tap(TAPHOLD_COMM, isHold); break; case TR_DOT: single_tap(TAPHOLD_DOT, isHold); break; -/* case TR_PERC: + case TR_PERC: single_tap(TAPHOLD_PERC, isHold); break; case TR_EXLM: @@ -145,7 +145,7 @@ bool process_tap_hold_key(keyrecord_t* record, uint16_t keycode) { case TR_AT: single_tap(TAPHOLD_AT, isHold); break; -*/ + //simulates auto-shift case TR_MINS: single_tap(TAPHOLD_MINS, isHold); @@ -159,6 +159,7 @@ bool process_tap_hold_key(keyrecord_t* record, uint16_t keycode) { case TR_QUOT: single_tap(TAPHOLD_QUOT, isHold); break; +*/ } return false; diff --git a/users/t4corun/features/taphold.h b/users/t4corun/features/taphold.h index fcf80894..4525e969 100644 --- a/users/t4corun/features/taphold.h +++ b/users/t4corun/features/taphold.h @@ -26,16 +26,16 @@ bool process_tap_hold_key(keyrecord_t* record, uint16_t keycode); #define TAPHOLD_SLSH KC_SLSH, KC_SLSH //Custom: things like overriding default shifted key -#define TAPHOLD_COMM KC_COMM, KC_LPRN -#define TAPHOLD_DOT KC_DOT, KC_RPRN +//#define TAPHOLD_COMM KC_COMM, KC_LPRN +//#define TAPHOLD_DOT KC_DOT, KC_RPRN //#define TAPHOLD_PERC KC_PERC, KC_CIRC //#define TAPHOLD_EXLM KC_EXLM, KC_DLR //#define TAPHOLD_AT KC_AT, KC_AMPR //auto shift -#define TAPHOLD_MINS KC_MINS, KC_UNDS -#define TAPHOLD_GRV KC_GRV, KC_TILD -#define TAPHOLD_SCLN KC_SCLN, KC_COLN -#define TAPHOLD_QUOT KC_QUOT, KC_DQUO +//#define TAPHOLD_MINS KC_MINS, KC_UNDS +//#define TAPHOLD_GRV KC_GRV, KC_TILD +//#define TAPHOLD_SCLN KC_SCLN, KC_COLN +//#define TAPHOLD_QUOT KC_QUOT, KC_DQUO diff --git a/users/t4corun/t4corun.c b/users/t4corun/t4corun.c index 1a75e0c6..b4c71831 100644 --- a/users/t4corun/t4corun.c +++ b/users/t4corun/t4corun.c @@ -103,15 +103,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case TR_EQL: case TR_BSLS: case TR_SLSH: - case TR_COMM: +/* case TR_COMM: case TR_DOT: -/* case TR_PERC: + case TR_PERC: case TR_EXLM: - case TR_AT: */ + case TR_AT: case TR_MINS: case TR_GRV: case TR_SCLN: - case TR_QUOT: + case TR_QUOT: */ return process_tap_hold_key(record, keycode); } diff --git a/users/t4corun/t4corun.h b/users/t4corun/t4corun.h index da7029a8..aeb96764 100644 --- a/users/t4corun/t4corun.h +++ b/users/t4corun/t4corun.h @@ -26,7 +26,7 @@ enum keycodes { TH_BSLS, TH_SLSH, - TH_COMM, +/* TH_COMM, TH_DOT, TH_PERC, TH_EXLM, @@ -35,7 +35,7 @@ enum keycodes { TH_MINS, TH_GRV, TH_SCLN, - TH_QUOT, + TH_QUOT, */ PN_DRGS, PN_PDPI, @@ -89,17 +89,17 @@ enum keycodes { #define TR_BSLS LT(_DEFAULT_LAYER_1, TH_BSLS) #define TR_SLSH LT(_DEFAULT_LAYER_1, TH_SLSH) -#define TR_COMM LT(_DEFAULT_LAYER_1, TH_COMM) // custom behavior -#define TR_DOT LT(_DEFAULT_LAYER_1, TH_DOT) +//#define TR_COMM LT(_DEFAULT_LAYER_1, TH_COMM) // custom behavior +//#define TR_DOT LT(_DEFAULT_LAYER_1, TH_DOT) //#define TR_PERC LT(_DEFAULT_LAYER_1, TH_PERC) //#define TR_EXLM LT(_DEFAULT_LAYER_1, TH_EXLM) //#define TR_AT LT(_DEFAULT_LAYER_1, TH_AT) // basically auto shift -#define TR_MINS LT(_DEFAULT_LAYER_1, TH_MINS) -#define TR_GRV LT(_DEFAULT_LAYER_1, TH_GRV) -#define TR_SCLN LT(_DEFAULT_LAYER_1, TH_SCLN) -#define TR_QUOT LT(_DEFAULT_LAYER_1, TH_QUOT) +//#define TR_MINS LT(_DEFAULT_LAYER_1, TH_MINS) +//#define TR_GRV LT(_DEFAULT_LAYER_1, TH_GRV) +//#define TR_SCLN LT(_DEFAULT_LAYER_1, TH_SCLN) +//#define TR_QUOT LT(_DEFAULT_LAYER_1, TH_QUOT) #if defined(KEYBOARD_bastardkb_charybdis_3x5) @@ -164,15 +164,15 @@ enum keycodes { #define LAYER_QWERTY \ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TR_QUOT, \ - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, TR_COMM, TR_DOT, TR_MINS, \ + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_MINS, \ _BASE_L4_________________, _BASE_R4_________________ #define LAYER_COLEMAK_DH \ - KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, TR_QUOT, \ + KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, \ KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, \ - KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, TR_COMM, TR_DOT, TR_MINS, \ + KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_MINS, \ _BASE_L4_________________, _BASE_R4_________________ @@ -189,18 +189,11 @@ enum keycodes { _UCCPR_L___________________________________, ___x___, KC_APP, TR_SNIP, TR_SDPI, TR_PDPI, \ ZOOMRST, SYM, KC_ENT, _LAYER_TRANS_____________ -/* -#define LAYER_SYMBOL \ - KC_ESC, KC_BTN3, KC_BTN2, KC_BTN1, TR_GRV, TR_EQL, KC_HASH, TR_LABK, KC_RABK, TR_PERC, \ - _GACS_MODS________________________, TR_SCLN, TR_AT, KC_ASTR, TR_LBRC, KC_RBRC, TR_SQUO, \ - _UCCPR_L___________________________________, TR_BSLS, TR_SLSH, TR_LPRN, KC_RPRN, TR_MINS, \ - _LAYER_TRANS_____________, TR_EXLM, _______, ___x___ -*/ #define LAYER_SYMBOL \ - KC_ESC, KC_BTN3, KC_BTN2, KC_BTN1, TR_GRV, TR_EQL, KC_HASH, TR_LABK, KC_RABK, KC_PERC, \ - _GACS_MODS________________________, TR_SCLN, KC_AT, KC_ASTR, TR_LBRC, KC_RBRC, TR_SQUO, \ - _UCCPR_L___________________________________, TR_BSLS, TR_SLSH, TR_LPRN, KC_RPRN, TR_MINS, \ + KC_ESC, KC_BTN3, KC_BTN2, KC_BTN1, KC_GRV, TR_EQL, KC_HASH, TR_LABK, KC_RABK, KC_PERC, \ + _GACS_MODS________________________, KC_SCLN, KC_AT, KC_ASTR, TR_LBRC, KC_RBRC, TR_SQUO, \ + _UCCPR_L___________________________________, TR_BSLS, TR_SLSH, TR_LPRN, KC_RPRN, KC_MINS, \ _LAYER_TRANS_____________, KC_EXLM, _______, ___x___