Testing out the swoop finally

- Had to revert the keycode enumerators
- Adjusted the Swoop encoder mappings
- Had to put the mouse wheels back in
This commit is contained in:
Victor 2024-04-22 00:10:09 -05:00
parent f8bded656b
commit cc64b41f4b
Failed to generate hash of commit
2 changed files with 49 additions and 24 deletions

View file

@ -35,13 +35,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* The encoder presses are handled in the keymap */
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_DEFAULT_LAYER_1] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
[_DEFAULT_LAYER_2] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
[_DEFAULT_LAYER_3] = { ENCODER_CCW_CW(TR_MWHD, TR_MWHU), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
[_NAVIGATION] = { ENCODER_CCW_CW(ZOOMIN, ZOOMOUT), ENCODER_CCW_CW(___x___, ___x___) },
[_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) },
[_DEFAULT_LAYER_1] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_DEFAULT_LAYER_2] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_DEFAULT_LAYER_3] = { ENCODER_CCW_CW(TR_MWHU, TR_MWHD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_NAVIGATION] = { ENCODER_CCW_CW(ZOOMOUT,dddddddf ZOOMIN), ENCODER_CCW_CW(___x___, ___x___) },
[_NUMBER] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
[_SYMBOL] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
[_CONFIG] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(___x___, ___x___) },
[_CONFIG] = { ENCODER_CCW_CW(___x___, ___x___), ENCODER_CCW_CW(LSFT(TR_RMOD), TR_RMOD) },
};
#endif

View file

@ -16,7 +16,26 @@ enum layers {
enum keycodes {
//These are only here to make the taphold/defines unique
KY_SQUO = QK_USER,
TH_LCBR = QK_USER,
TH_LABK,
TH_LBRC,
TH_LPRN,
TH_SQUO,
TH_DQUO,
TH_EQL,
TH_PLUS,
TH_PIPE,
TH_COMM,
TH_DOT,
TH_PERC,
TH_EXLM,
TH_MINS,
TH_GRV,
TH_SCLN,
TH_QUOT,
PN_DRGS,
PN_PDPI,
@ -61,31 +80,34 @@ enum keycodes {
//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_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_LPRN LT(_DEFAULT_LAYER_1, TH_LPRN)
#define TR_SQUO LT(_DEFAULT_LAYER_1, TH_SQUO)
#define TR_DQUO LT(_DEFAULT_LAYER_1, TH_DQUO)
#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) // double tap
#define TR_PLUS LT(_DEFAULT_LAYER_1, TH_PLUS)
#define TR_PIPE LT(_DEFAULT_LAYER_1, TH_PIPE)
#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)
#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)
// 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)
#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(MOUSEKEY_ENABLE)
# define TR_MWHU KC_WH_U
# define TR_MWHD KC_WH_D
# define TR_BTN1 KC_BTN1
# define TR_BTN2 KC_BTN2
# define TR_BTN3 KC_BTN3
@ -107,6 +129,9 @@ enum keycodes {
#else
# define TR_MWHU ___x___
# define TR_MWHD ___x___
# define TR_BTN1 ___x___
# define TR_BTN2 ___x___
# define TR_BTN3 ___x___