diff options
| author | Jonas Avellana <14019120+ninjonas@users.noreply.github.com> | 2020-03-13 17:56:21 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-13 16:56:21 -0700 |
| commit | 0fdd37ee19d07d6f15217074dd3291fda4c4cb2f (patch) | |
| tree | 595a398a2977755695c1903cdf71b6fcf2ce03aa /users/ninjonas/ninjonas.h | |
| parent | 40e8d60ecd68c1c43e1fc911e993626943930fd0 (diff) | |
| download | firmware-0fdd37ee19d07d6f15217074dd3291fda4c4cb2f.tar.gz firmware-0fdd37ee19d07d6f15217074dd3291fda4c4cb2f.tar.bz2 firmware-0fdd37ee19d07d6f15217074dd3291fda4c4cb2f.zip | |
[Keymap] ninjonas keymap updates (#8373)
* [keymap(ninjonas)] ninjonas keymap updates
* [refactor] switching encoder rotation logic. recent pull seems to have flipped encoder stuff
* [keymap(lily58)] added chrome change profile key on RAISE
Co-authored-by: Jonas Avellana <jonas.avellana@workday.com>
Diffstat (limited to 'users/ninjonas/ninjonas.h')
| -rw-r--r-- | users/ninjonas/ninjonas.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/users/ninjonas/ninjonas.h b/users/ninjonas/ninjonas.h index 6772957e2..94b4712a6 100644 --- a/users/ninjonas/ninjonas.h +++ b/users/ninjonas/ninjonas.h @@ -27,6 +27,12 @@ #include "split_util.h" #endif +#ifdef ENCODER_ENABLE +bool left_encoder_rotated; +bool right_encoder_rotated; +uint16_t encoder_rotated_timer; +#endif + #define _QWERTY 0 #define _DVORAK 1 #define _COLEMAK 2 @@ -40,24 +46,17 @@ #define K_CSCN LGUI(LCTL(LSFT(KC_4))) // Copy a portion of the screen to the clipboard #define K_CPRF LGUI(LSFT(KC_M)) // Cmd + Shift + M. Used for switching Google Chrome profiles #define K_MDSH LSFT(LALT(KC_MINS)) -#define K_LAPP SGUI(KC_TAB) // Cmd + Shift + Tab -#define K_RAPP LGUI(KC_TAB) // Cmd + Tab // Layer Keys -#define LM_LOW MO(_LOWER) -#define LM_RAI MO(_RAISE) -#define LG_LOW TG(_LOWER) -#define LG_RAI TG(_RAISE) -#define LG_NUM TG(_NUMPAD) #define LT_LOW LT(_LOWER, KC_ENT) #define LT_RAI LT(_RAISE, KC_SPC) // Mod-Tap Keys -#define MT_DEL MT(MOD_LGUI | MOD_LALT | MOD_LSFT, KC_DEL) -#define MT_EQL MT(MOD_LALT | MOD_LSFT, KC_EQL) +#define MT_DEL MT(MOD_LALT | MOD_LSFT, KC_DEL) +#define MT_EQL MT(MOD_RSFT, KC_EQL) // Layout blocks -#define _____________________QWERTY_L1______________________ T_TAB, T_Q, KC_W, KC_E, KC_R, KC_T +#define _____________________QWERTY_L1______________________ T_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T #define _____________________QWERTY_L2______________________ T_ESC, KC_A, KC_S, KC_D, KC_F, KC_G #define _____________________QWERTY_L3______________________ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B @@ -130,7 +129,7 @@ #define __________________________________ _______, _______, _______, _______ #define _____________MOD_LEFT_____________ KC_LALT, T_GUI, KC_LCTL, LT_RAI -#define _____________MOD_RIGHT____________ LT_LOW, KC_BSPC, MT_DEL, T_CPNU +#define _____________MOD_RIGHT____________ LT_LOW, KC_BSPC, MT_DEL, T_CPAP #define _________MEDIA_1_________ KC_BRIU, KC_MPLY, KC_MUTE #define _________MEDIA_2_________ KC_BRID, KC_MFFD, KC__VOLUP @@ -141,7 +140,7 @@ #define ________MOD_RIGHT________ LT_LOW, KC_BSPC, MT_DEL #else #define ________MOD_LEFT_________ KC_LALT, T_GUI, KC_LCTL - #define ________MOD_RIGHT________ KC_BSPC, MT_DEL, T_CPNU + #define ________MOD_RIGHT________ KC_BSPC, MT_DEL, T_CPAP #endif // Layout wrappers |