From 082926a4e1d363e97edd9884e9625b656f621ee8 Mon Sep 17 00:00:00 2001 From: Victor Date: Sun, 21 Apr 2024 10:32:13 -0500 Subject: [PATCH] Polish and cleanup - Redid the tap hold to simplify maintenance - moved the ploopy nano stuff into tap hold - removed all mention of function layer - added double taps for programming macros --- .../rollow/keymaps/t4corun/keymap.c | 2 - .../charybdis/3x5/keymaps/t4corun/keymap.c | 1 - .../bluebell/swoop/keymaps/t4corun/keymap.c | 2 - keyboards/crkbd/keymaps/t4corun/keymap.c | 1 - keyboards/planck/keymaps/t4corun/keymap.c | 1 - users/t4corun/features/taphold.c | 210 +++++++++++------- users/t4corun/features/taphold.h | 53 +++-- users/t4corun/t4corun.c | 66 +++--- users/t4corun/t4corun.h | 113 +++------- 9 files changed, 217 insertions(+), 232 deletions(-) diff --git a/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c b/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c index fb7618cc..5c69c0d0 100644 --- a/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c +++ b/keyboards/barbellboards/rollow/keymaps/t4corun/keymap.c @@ -25,7 +25,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NAVIGATION] = ROLLOW(LAYER_NAVIGATION), [_NUMBER] = ROLLOW(LAYER_NUMBER), [_SYMBOL] = ROLLOW(LAYER_SYMBOL), - //[_FUNCTION] = ROLLOW(LAYER_FUNCTION), [_CONFIG] = ROLLOW(LAYER_CONFIG) }; @@ -41,7 +40,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) }, [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) }, [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, - //[_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_DOWN, KC_UP ) }, [_CONFIG] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, }; diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/keymap.c index 5ae6753e..37f70165 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/keymap.c +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/t4corun/keymap.c @@ -25,7 +25,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NAVIGATION] = CNANO(LAYER_NAVIGATION), [_NUMBER] = CNANO(LAYER_NUMBER), [_SYMBOL] = CNANO(LAYER_SYMBOL), - //[_FUNCTION] = CNANO(LAYER_FUNCTION), [_CONFIG] = CNANO(LAYER_CONFIG) }; \ No newline at end of file diff --git a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c index 55d1dea9..479fd38a 100644 --- a/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c +++ b/keyboards/bluebell/swoop/keymaps/t4corun/keymap.c @@ -25,7 +25,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NAVIGATION] = SWOOP(LAYER_NAVIGATION), [_NUMBER] = SWOOP(LAYER_NUMBER), [_SYMBOL] = SWOOP(LAYER_SYMBOL), - //[_FUNCTION] = SWOOP(LAYER_FUNCTION), [_CONFIG] = SWOOP(LAYER_CONFIG) }; @@ -42,7 +41,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) }, [_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) }, [_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, - //[_FUNCTION] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_DOWN, KC_UP ) }, [_CONFIG] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) }, }; diff --git a/keyboards/crkbd/keymaps/t4corun/keymap.c b/keyboards/crkbd/keymaps/t4corun/keymap.c index 17fc604b..2d82da80 100644 --- a/keyboards/crkbd/keymaps/t4corun/keymap.c +++ b/keyboards/crkbd/keymaps/t4corun/keymap.c @@ -25,7 +25,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NAVIGATION] = CRKBD(LAYER_NAVIGATION), [_NUMBER] = CRKBD(LAYER_NUMBER), [_SYMBOL] = CRKBD(LAYER_SYMBOL), - //[_FUNCTION] = CRKBD(LAYER_FUNCTION), [_CONFIG] = CRKBD(LAYER_CONFIG) }; \ No newline at end of file diff --git a/keyboards/planck/keymaps/t4corun/keymap.c b/keyboards/planck/keymaps/t4corun/keymap.c index cb461c1b..dfa3e5fc 100644 --- a/keyboards/planck/keymaps/t4corun/keymap.c +++ b/keyboards/planck/keymaps/t4corun/keymap.c @@ -25,7 +25,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NAVIGATION] = PLANCK(LAYER_NAVIGATION), [_NUMBER] = PLANCK(LAYER_NUMBER), [_SYMBOL] = PLANCK(LAYER_SYMBOL), - //[_FUNCTION] = PLANCK(LAYER_FUNCTION), [_CONFIG] = PLANCK(LAYER_CONFIG) }; \ No newline at end of file diff --git a/users/t4corun/features/taphold.c b/users/t4corun/features/taphold.c index 28f32484..c2201dae 100644 --- a/users/t4corun/features/taphold.c +++ b/users/t4corun/features/taphold.c @@ -1,128 +1,172 @@ #include "taphold.h" -void insert_brackets(uint16_t left, uint16_t right) { +void single_tap(uint16_t key, uint16_t altkey, bool isHold) { + isHold ? tap_code16(altkey) : tap_code16(key); +} + +void double_tap(uint16_t key, uint16_t altkey, uint32_t ms) { + tap_code16(key); + wait_ms(ms); + tap_code16(altkey); +} + +void insert_brackets(uint16_t left, uint16_t right, uint32_t ms) { tap_code16(left); + wait_ms(ms); tap_code16(right); + wait_ms(ms); tap_code16(KC_LEFT); } -void double_tap(uint16_t keycode, uint32_t ms) { - tap_code16(keycode); - wait_ms(ms); - tap_code16(keycode); -} - - //here we can have the holds be more complex, like sending "" when you hold " bool process_tap_hold_key(keyrecord_t* record, uint16_t keycode) { //tap is record->tap.count && record->event.pressed //hold is record->event.pressed + //just saving this to handle mods //bool isShift = ( (get_mods() & MOD_BIT(KC_LSFT)) || (get_oneshot_mods() & MOD_BIT(KC_LSFT)) ); - uint16_t key = KC_NO; - uint16_t altkey = KC_NO; - - switch(keycode) { - - //Brackets - //open and close brackets and put the cursor inside - case TR_LCBR: - key = KC_LCBR; - altkey = KC_RCBR; - break; - case TR_LABK: - key = KC_LABK; - altkey = KC_RABK; - break; - case TR_LBRC: - key = KC_LBRC; - altkey = KC_RBRC; - break; - case TR_SQUO: - key = KC_QUOT; - altkey = KC_QUOT; - break; - case TR_DQUO: - key = KC_DQUO; - altkey = KC_DQUO; - break; - - //Custom - case TR_LPRN: //tap for comma, hold for bracket parenthesis - case TR_COMM: //tap for comma, hold for left parenthesis - key = KC_COMM; - altkey = KC_LPRN; - break; - case TR_DOT: //tap for dot, hold for right parenthesis - key = KC_DOT; - altkey = KC_RPRN; - break; - case TR_PERC: //tap for percent, hold for carat. for saving room on symbols layer - key = KC_PERC; - altkey = KC_CIRC; - break; - - //faux auto-shift - case TR_EQL: //tap for equal, hold for plus - key = KC_EQL; - altkey = KC_PLUS; - break; - case TR_MINS: //tap for minus, hold for underscore - key = KC_MINS; - altkey = KC_UNDS; - break; - case TR_GRV: //tap for grave, hold for tilde - key = KC_GRV; - altkey = KC_TILDE; - break; - case TH_SCLN: //tap for semicolon, hold for colon - key = KC_SCLN; - altkey = KC_COLN; - break; - case TR_QUOT: //tap for single quote, hold for double quote - key = KC_QUOT; - altkey = KC_DQUO; - break; - } + //isShift ? insert_brackets(LSFT(key), LSFT(altkey)) : insert_brackets(key, altkey); + bool isHold = false; if (record->tap.count && record->event.pressed) { - tap_code16(key); + switch(keycode) { + + case TR_LCBR: + single_tap(TH_LCBR, isHold); + break; + case TR_LABK: + single_tap(TH_LABK, isHold); + break; + case TR_LBRC: + single_tap(TH_LBRC, isHold); + break; + case TR_LPRN: + single_tap(TH_LPRN, isHold); + break; + case TR_SQUO: + single_tap(TH_SQUO, isHold); + break; + case TR_DQUO: + single_tap(TH_DQUO, isHold); + break; + case TR_EQL: + single_tap(TH_LPRN, isHold); + break; + case TR_PLUS: + single_tap(TH_PLUS, isHold); + break; + case TR_PIPE: + single_tap(TH_PIPE, isHold); + break; + case TR_COMM: + single_tap(TH_COMM, isHold); + break; + case TR_DOT: + single_tap(TH_DOT, isHold); + break; + case TR_PERC: + single_tap(TH_PERC, isHold); + break; + case TR_EXLM: + single_tap(TH_EXLM, isHold); + break; + case TR_MINS: + single_tap(TH_MINS, isHold); + break; + case TR_GRV: + single_tap(TH_GRV, isHold); + break; + case TH_SCLN: + single_tap(TH_SCLN, isHold); + break; + case TR_QUOT: + single_tap(TH_QUOT, isHold); + break; + + //tap numlock twice to toggle ploopy nano drag scroll + case PN_DRGS: + double_tap(TH_NUM, WAIT_DELAY); + break; + + //tap capslock twice to cycle ploopy nano pointer DPI + case PN_PDPI: + double_tap(TH_CAPS, WAIT_DELAY); + break; + } + return false; } else if (record->tap.count == 0 && record->event.pressed) { + isHold = true; + switch(keycode) { //Brackets case TR_LCBR: + insert_brackets(TH_LCBR); + break; case TR_LABK: + insert_brackets(TH_LABK); + break; case TR_LBRC: + insert_brackets(TH_LBRC); + break; case TR_SQUO: + insert_brackets(TH_SQUO); + break; case TR_DQUO: - //isShift ? insert_brackets(LSFT(key), LSFT(altkey)) : insert_brackets(key, altkey); - insert_brackets(key, altkey); + insert_brackets(TH_DQUO); break; - - //custom and faux auto-shift case TR_LPRN: - insert_brackets(KC_LPRN, KC_RPRN); + insert_brackets(TH_LPRN); break; - case TR_COMM: - case TR_DOT: - case TR_PERC: + + //double tap case TR_EQL: + double_tap(TH_LPRN); + break; + case TR_PLUS: + double_tap(TH_PLUS); + break; + case TR_PIPE: + double_tap(TH_PIPE); + break; + + //custom action + case TR_COMM: + single_tap(TH_COMM, isHold); + break; + case TR_DOT: + single_tap(TH_DOT, isHold); + break; + case TR_PERC: + single_tap(TH_PERC, isHold); + break; + case TR_EXLM: + double_tap(TH_NEQL); + break; + + //simulates auto-shift case TR_MINS: + single_tap(TH_MINS, isHold); + break; case TR_GRV: + single_tap(TH_GRV, isHold); + break; case TH_SCLN: + single_tap(TH_SCLN, isHold); + break; case TR_QUOT: - tap_code16(altkey); + single_tap(TH_QUOT, isHold); break; } return false; + } return true; // Continue default handling. diff --git a/users/t4corun/features/taphold.h b/users/t4corun/features/taphold.h index 96c2a43a..fc74b7d6 100644 --- a/users/t4corun/features/taphold.h +++ b/users/t4corun/features/taphold.h @@ -1,39 +1,44 @@ #pragma once #include "t4corun.h" -void insert_brackets(uint16_t left, uint16_t right); -void double_tap(uint16_t keycode, uint32_t ms); +void single_tap(uint16_t key, uint16_t altkey, bool isHold); +void double_tap(uint16_t key, uint16_t altkey, uint32_t ms); +void insert_brackets(uint16_t left, uint16_t right, uint32_t ms); bool process_tap_hold_key(keyrecord_t* record, uint16_t keycode); -/* the first element is the key - * the second is altkey - * for the most part it will be tap for key, hold for alt key +/* the first element is the alt key (tap action) + * the second is altkey (hold action usually) * * I was doing a switch statement to assign these each time, but this is faster * and easier to maintain */ -/* + //Brackets: open and close brackets and put the cursor inside -static const uint16_t TR_LCBR_taphold[] = { KC_LCBR, KC_RCBR }; -static const uint16_t TR_LABK_taphold[] = { KC_LABK, KC_RABK }; -static const uint16_t TR_LBRC_taphold[] = { KC_LBRC, KC_RBRC }; -static const uint16_t TR_SQUO_taphold[] = { KC_QUOT, KC_QUOT }; -static const uint16_t TR_DQUO_taphold[] = { KC_DQUO, KC_DQUO }; +#define TH_LCBR KC_LCBR, KC_RCBR +#define TH_LABK KC_LABK, KC_RABK +#define TH_LBRC KC_LBRC, KC_RBRC +#define TH_SQUO KC_QUOT, KC_QUOT +#define TH_DQUO KC_DQUO, KC_DQUO +#define TH_LPRN KC_LPRN, KC_RPRN //double tap -static const uint16_t TR_EQL_taphold[] = { KC_EQL, KC_EQL }; -static const uint16_t TR_PLUS_taphold[] = { KC_PLUS, KC_PLUS }; -static const uint16_t TR_PIPE_taphold[] = { KC_PIPE, KC_PIPE }; +#define TH_EQL KC_EQL, KC_EQL +#define TH_PLUS KC_PLUS, KC_PLUS +#define TH_PIPE KC_PIPE, KC_PIPE +#define TH_NUM KC_NUM, KC_NUM //For ploopy nano +#define TH_CAPS KC_CAPS, KC_CAPS //Custom: things like overriding default shifted key -static const uint16_t TR_LPRN_taphold[] = { KC_LPRN, KC_LPRN }; -static const uint16_t TR_COMM_taphold[] = { KC_COMM, KC_LPRN }; -static const uint16_t TR_DOT_taphold[] = { KC_DOT, KC_RPRN }; -static const uint16_t TR_PERC_taphold[] = { KC_PERC, KC_CIRC }; +#define TH_COMM KC_COMM, KC_LPRN +#define TH_DOT KC_DOT, KC_RPRN +#define TH_PERC KC_PERC, KC_CIRC +#define TH_EXLM KC_EXLM, KC_EXLM +#define TH_NEQL KC_EXLM, KC_EQL + +//auto shift +#define TH_MINS KC_MINS, KC_UNDS +#define TH_GRV KC_GRV, KC_TILD +#define TH_SCLN KC_SCLN, KC_COLN +#define TH_QUOT KC_QUOT, KC_DQUO + -//Faux auto shift -static const uint16_t TR_MINS_taphold[] = { KC_MINS, KC_UNDS }; -static const uint16_t TR_GRV_taphold[] = { KC_GRV, KC_TILDE }; -static const uint16_t TR_SCLN_taphold[] = { KC_SCLN, KC_COLN }; -static const uint16_t TR_QUOT_taphold[] = { KC_QUOT, KC_DQUO }; -*/ \ No newline at end of file diff --git a/users/t4corun/t4corun.c b/users/t4corun/t4corun.c index 1193ece6..c7bd8abe 100644 --- a/users/t4corun/t4corun.c +++ b/users/t4corun/t4corun.c @@ -13,44 +13,36 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case BASELYR: - if (record->event.pressed) { - current_base_layer = (current_base_layer + 1) % NUM_BASE_LAYER; - set_single_persistent_default_layer(current_base_layer); - } - return false; - - case PN_DRGS: - if (record->event.pressed) { - double_tap(KC_NUM, WAIT_DELAY); - } - return false; - - case PN_PDPI: - if (record->event.pressed) { - double_tap(KC_CAPS, WAIT_DELAY); - } - return false; - - //https://docs.qmk.fm/#/mod_tap?id=changing-both-tasp-and-hold - //https://getreuer.info/posts/keyboards/triggers/index.html#tap-vs.-long-press - //https://www.jonashietala.se/series/t-34/ he focuses on a keymap for programming/VIM - case TR_LCBR: - case TR_LABK: - case TR_LBRC: - case TR_SQUO: - case TR_DQUO: - case TR_LPRN: - case TR_COMM: - case TR_DOT: - case TR_PERC: - case TR_EQL: - case TR_MINS: - case TR_GRV: - case TH_SCLN: - case TR_QUOT: - return process_tap_hold_key(record, keycode); + case BASELYR: + if (record->event.pressed) { + current_base_layer = (current_base_layer + 1) % NUM_BASE_LAYER; + set_single_persistent_default_layer(current_base_layer); + } + return false; + //https://docs.qmk.fm/#/mod_tap?id=changing-both-tasp-and-hold + //https://getreuer.info/posts/keyboards/triggers/index.html#tap-vs.-long-press + //https://www.jonashietala.se/series/t-34/ he focuses on a keymap for programming/VIM + case TR_LCBR: + case TR_LABK: + case TR_LBRC: + case TR_LPRN: + case TR_SQUO: + case TR_DQUO: + case TR_EQL: + case TR_PLUS: + case TR_PIPE: + case TR_COMM: + case TR_DOT: + case TR_PERC: + case TR_EXLM: + case TR_MINS: + case TR_GRV: + case TH_SCLN: + case TR_QUOT: + case PN_DRGS: + case PN_PDPI: + return process_tap_hold_key(record, keycode); } return true; diff --git a/users/t4corun/t4corun.h b/users/t4corun/t4corun.h index 1c992332..44b206fd 100644 --- a/users/t4corun/t4corun.h +++ b/users/t4corun/t4corun.h @@ -11,26 +11,12 @@ enum layers { _NAVIGATION, _NUMBER, _SYMBOL, - _FUNCTION, _CONFIG }; enum keycodes { - //These are only here to make the case statements unique in taphold.c - TH_LCBR = QK_USER, - TH_LABK, - TH_LBRC, - TH_SQUO, - TH_DQUO, - TH_LPRN, - TH_COMM, - TH_DOT, - TH_PERC, - TH_EQL, - TH_MINS, - TH_GRV, - TH_SCLN, - TH_QUOT, + //These are only here to make the taphold/defines unique + KY_SQUO = QK_USER, PN_DRGS, PN_PDPI, @@ -44,7 +30,6 @@ enum keycodes { #define NAV MO(_NAVIGATION) #define NAV_0 LT(_NAVIGATION, KC_0) #define NUM MO(_NUMBER) -//#define FUNC MO(_FUNCTION) #define CONFIG MO(_CONFIG) // Windows Shortcuts @@ -75,35 +60,32 @@ enum keycodes { #define TR_LGUI OSM(MOD_LGUI) -//tap hoLd -#define TR_LCBR LT(_DEFAULT_LAYER_1, TH_LCBR) // bracket behvavior -#define TR_LABK LT(_DEFAULT_LAYER_1, TH_LABK) -#define TR_LBRC LT(_DEFAULT_LAYER_1, TH_LBRC) -#define TR_SQUO LT(_DEFAULT_LAYER_1, TH_SQUO) -#define TR_DQUO LT(_DEFAULT_LAYER_1, TH_DQUO) +//tap hoLd. These will be intercepted and overridden. The LT will be ignored +#define TR_LCBR LT(_DEFAULT_LAYER_1, KC_LCBR) // bracket behvavior +#define TR_LABK LT(_DEFAULT_LAYER_1, KC_LABK) +#define TR_LBRC LT(_DEFAULT_LAYER_1, KC_LBRC) +#define TR_LPRN LT(_DEFAULT_LAYER_1, KC_LPRN) +#define TR_SQUO LT(_DEFAULT_LAYER_1, KY_SQUO) +#define TR_DQUO LT(_DEFAULT_LAYER_1, KC_DQUO) -#define TR_LPRN LT(_DEFAULT_LAYER_1, TH_LPRN) // custom behavior -#define TR_COMM LT(_DEFAULT_LAYER_1, TH_COMM) -#define TR_DOT LT(_DEFAULT_LAYER_1, TH_DOT) -#define TR_PERC LT(_DEFAULT_LAYER_1, TH_PERC) +#define TR_EQL LT(_DEFAULT_LAYER_1, KC_EQL) // double tap +#define TR_PLUS LT(_DEFAULT_LAYER_1, KC_PLUS) +#define TR_PIPE LT(_DEFAULT_LAYER_1, KC_PIPE) -#define TR_EQL LT(_DEFAULT_LAYER_1, TH_EQL) // 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_COMM LT(_DEFAULT_LAYER_1, KC_COMM) // custom behavior +#define TR_DOT LT(_DEFAULT_LAYER_1, KC_DOT) +#define TR_PERC LT(_DEFAULT_LAYER_1, KC_PERC) +#define TR_EXLM LT(_DEFAULT_LAYER_1, KC_EXLM) + + // basically auto shift +#define TR_MINS LT(_DEFAULT_LAYER_1, KC_MINS) +#define TR_GRV LT(_DEFAULT_LAYER_1, KC_GRV) +#define TR_SCLN LT(_DEFAULT_LAYER_1, KC_SCLN) +#define TR_QUOT LT(_DEFAULT_LAYER_1, KC_QUOT) #if defined(MOUSEKEY_ENABLE) -# define TR_MOUU KC_MS_U -# define TR_MOUD KC_MS_D -# define TR_MOUL KC_MS_L -# define TR_MOUR KC_MS_R - -# define TR_MWHU KC_WH_U //Mouse wheel keys are not needed unless the board has no encoders -# define TR_MWHD KC_WH_D - # define TR_BTN1 KC_BTN1 # define TR_BTN2 KC_BTN2 # define TR_BTN3 KC_BTN3 @@ -125,14 +107,6 @@ enum keycodes { #else -# define TR_MOUU ___x___ -# define TR_MOUD ___x___ -# define TR_MOUL ___x___ -# define TR_MOUR ___x___ - -# define TR_MWHU ___x___ -# define TR_MWHD ___x___ - # define TR_BTN1 ___x___ # define TR_BTN2 ___x___ # define TR_BTN3 ___x___ @@ -185,7 +159,6 @@ enum keycodes { #define _NONE_3__________________ ___x___, ___x___, ___x___ #define _NONE_5____________________________________ ___x___, ___x___, ___x___, ___x___, ___x___ #define _GACS_MODS________________________ TR_LGUI, TR_LALT, TR_LCTL, TR_LSFT -#define _GACS_MOUSE_MODS_________ TR_LALT, TR_LCTL, TR_LSFT #define _SCAG_MODS________________________ TR_LSFT, TR_LCTL, TR_LALT, TR_LGUI #define _UCCPR_L___________________________________ SC_UNDO, SC_CUT, SC_COPY, SC_PAST, SC_REDO @@ -216,14 +189,6 @@ enum keycodes { KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LALT, KC_1, KC_2, KC_3, CM_TOGG, \ KC_ENT, KC_LSFT, KC_SPC, KC_SPC, NAV_0, KC_MUTE -/* -#define LAYER_NAVIGATION \ - KC_ESC, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_INS, KC_CAPS, KC_SCRL, ___x___, ___x___, \ - ___x___, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, ___x___, _SCAG_MODS________________________, \ - _UCCPR_L___________________________________, ___x___, KC_APP, KC_VOLD, KC_VOLU, KC_MUTE, \ - ZOOMRST, _______, KC_ENT, _LAYER_TRANS_____________ -*/ - #define LAYER_NAVIGATION \ ___x___, KC_HOME, KC_UP, KC_END, KC_PGUP, ___x___, TR_DRGS, TR_SNIP, TR_SDPI, TR_PDPI, \ @@ -241,10 +206,17 @@ enum keycodes { #define LAYER_SYMBOL \ ___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, 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, \ + KC_AMPR, TR_LCBR, KC_RCBR, TR_PIPE, TH_SCLN, TR_PLUS, KC_QUES, TR_LBRC, KC_RBRC, TR_SQUO, \ + TR_PERC, TR_LABK, KC_RABK, KC_BSLS, TR_EXLM, ___x___, KC_SLSH, TR_LPRN, KC_RPRN, TR_MINS, \ _LAYER_TRANS_____________, _LAYER_TRANS_____________ + +#define LAYER_CONFIG \ + KC_F10, KC_F7, KC_F8, KC_F9, ___x___, ___x___, ___x___, ___x___, ___x___, QK_BOOT, \ + KC_F11, KC_F4, KC_F5, KC_F6, ___x___, BASELYR, TR_LSFT, _NONE_3__________________, \ + KC_F12, KC_F1, KC_F2, KC_F3, ___x___, TR_RHUI, TR_RSAI, TR_RVAI, TR_RSPI, TR_RTOG, \ + ___x___, TR_DMR1, TR_DMP1, _NONE_3__________________ + /* If I was going to combine number and symbols together, it'd look like this @@ -253,25 +225,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, \ _UCCPR_L___________________________________, KC_SLSH, KC_1, KC_2, KC_3, KC_BSLS, \ _LAYER_TRANS_____________, KC_SPC, NAV_0, ___x___ -*/ - -/* -#define LAYER_FUNCTION \ - ___x___, ___x___, TR_MOUU, ___x___, TR_MWHU, KC_PSCR, KC_F7, KC_F8, KC_F9, KC_F10, \ - ___x___, TR_MOUL, TR_MOUD, TR_MOUR, TR_MWHD, KC_NUM, KC_F4, KC_F5, KC_F6, KC_F11, \ - TR_PDPI, TR_SDPI, ___x___, TR_DRGS, TR_SNIP, KC_PAUS, KC_F1, KC_F2, KC_F3, KC_F12, \ - _LAYER_TRANS_____________, TR_DMP1, TR_DMR1, ___x___ - - -#define LAYER_CONFIG \ - _NONE_5____________________________________, EE_CLR, QK_RBT, QK_BOOT, ___x___, ___x___, \ - TR_RTOG, TR_RMOD, _NONE_3__________________, BASELYR, _SCAG_MODS________________________, \ - TR_RHUI, TR_RSAI, TR_RVAI, TR_RSPI, ___x___, _NONE_5____________________________________, \ - _NONE_3__________________, _NONE_3__________________ -*/ - -#define LAYER_CONFIG \ - KC_F10, KC_F7, KC_F8, KC_F9, ___x___, ___x___, ___x___, ___x___, ___x___, QK_BOOT, \ - KC_F11, KC_F4, KC_F5, KC_F6, ___x___, BASELYR, TR_LSFT, _NONE_3__________________, \ - KC_F12, KC_F1, KC_F2, KC_F3, ___x___, TR_RHUI, TR_RSAI, TR_RVAI, TR_RSPI, TR_RTOG, \ - _NONE_3__________________, _NONE_3__________________ +*/ \ No newline at end of file