combo: moving mouse and nav layer selection to combo keys

SjB · Sep 16, 2022 · 15a2b39 · 15a2b39
1 parent 3809222
commit 15a2b39
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/users/sjb/combos.c b/users/sjb/combos.c
@@ -26,13 +26,15 @@ enum combo_events {
     C_CAPS,
     C_TG_RAISE,
     C_TG_NUMPAD,
+    C_TO_MOUSE,
+    C_TO_NAV,
     C_LSBR,
     C_RSBR,
     C_LBRC,
     C_RBRC,
     C_LSBRC,
     C_RSBRC,
-    C_PLUS,
+    C_MINS,
     C_EQUAL,
     C_LCTL,
     C_RCTL,
@@ -50,9 +52,13 @@ const uint16_t COMBO_LEN = COMBO_LENGTH;
 const uint16_t PROGMEM lbootloader_combo[] = {KC_Q, KC_T, COMBO_END};
 const uint16_t PROGMEM rbootloader_combo[] = {KC_P, KC_Y, COMBO_END};
 const uint16_t PROGMEM caplock_combo[]     = {TAB_ALT, OSM_SFT, COMBO_END};
+
 const uint16_t PROGMEM tg_raise_combo[]    = {BSPC_RS, SPC_RS, COMBO_END};
 const uint16_t PROGMEM tg_numpad_combo[]   = {G_NUM, H_NUM, COMBO_END};
 
+const uint16_t PROGMEM to_mouse_combo[] = {KC_V, KC_B, COMBO_END};
+const uint16_t PROGMEM to_nav_combo[] = {KC_N, KC_M, COMBO_END};
+
 const uint16_t PROGMEM lbrc_combo[] = {KC_T, KC_R, COMBO_END};
 const uint16_t PROGMEM lsbr_combo[] = {KC_R, KC_E, COMBO_END};
 const uint16_t PROGMEM lsbrc_combo[] = {KC_E, KC_W, COMBO_END};
@@ -61,7 +67,7 @@ const uint16_t PROGMEM rbrc_combo[] = {KC_Y, KC_U, COMBO_END};
 const uint16_t PROGMEM rsbr_combo[] = {KC_U, KC_I, COMBO_END};
 const uint16_t PROGMEM rsbrc_combo[] = {KC_I, KC_O, COMBO_END};
 
-const uint16_t PROGMEM plus_combo[]  = {KC_O, KC_P, COMBO_END};
+const uint16_t PROGMEM mins_combo[]  = {KC_O, KC_P, COMBO_END};
 const uint16_t PROGMEM equal_combo[] = {KC_DOT, KC_SLSH, COMBO_END};
 
 const uint16_t PROGMEM lctl_combo[] = {KC_F, KC_D, COMBO_END};
@@ -82,6 +88,8 @@ combo_t key_combos[] = {
     [C_CAPS]        = COMBO(caplock_combo, KC_CAPS),
     [C_TG_RAISE]    = COMBO(tg_raise_combo, TO(_RAISE)),
     [C_TG_NUMPAD]   = COMBO(tg_numpad_combo, TO(_NUMPAD)),
+    [C_TO_MOUSE]    = COMBO(to_mouse_combo, TO(_MOUSE)),
+    [C_TO_NAV]      = COMBO(to_nav_combo, TO(_NAV)),
 
     [C_LSBR]  = COMBO(lsbr_combo, S(KC_9)),
     [C_RSBR]  = COMBO(rsbr_combo, S(KC_0)),
@@ -92,7 +100,7 @@ combo_t key_combos[] = {
     [C_LSBRC] = COMBO(lsbrc_combo, S(KC_LBRC)),
     [C_RSBRC] = COMBO(rsbrc_combo, S(KC_RBRC)),
 
-    [C_PLUS]  = COMBO(plus_combo, KC_PLUS),
+    [C_MINS]  = COMBO(mins_combo, KC_MINS),
     [C_EQUAL] = COMBO(equal_combo, KC_EQL),
 
     [C_LCTL]  = COMBO(lctl_combo, OSM(MOD_LCTL)),

diff --git a/users/sjb/sjb.h b/users/sjb/sjb.h
@@ -64,7 +64,6 @@
 #define RIGHT_QW_ROW_2 H_NUM, KC_J, KC_K, KC_L, KC_SCLN
 #define RIGHT_QW_ROW_3 KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH
 
-
 #define LEFT_RAISE_ROW_1 S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5)
 #define LEFT_RAISE_ROW_2 KC_1, KC_2, KC_3, KC_4, LT_NUM(KC_5)
 #define LEFT_RAISE_ROW_3 KC_BSLS, KC_GRV, KC_LBRC, S(KC_LBRC), KC_QUOT
@@ -73,9 +72,9 @@
 #define RIGHT_RAISE_ROW_2 LT_NUM(KC_6), KC_7, KC_8, KC_9, KC_0
 #define RIGHT_RAISE_ROW_3 S(KC_QUOT), S(KC_RBRC), KC_RBRC, KC_MINS, KC_EQL
 
-#define NUMPAD_ROW_1 KC_PSLS, KC_7, KC_8, KC_9, KC_PMNS
-#define NUMPAD_ROW_2 KC_PAST, KC_4, KC_5, KC_6, KC_PPLS
-#define NUMPAD_ROW_3 KC_DOT, KC_1, KC_2, KC_3, KC_0
+#define NUMPAD_ROW_1 KC_PSLS , KC_7, KC_8, KC_9, KC_PMNS
+#define NUMPAD_ROW_2 KC_DOT  , KC_4, KC_5, KC_6, KC_0
+#define NUMPAD_ROW_3 KC_PAST , KC_1, KC_2, KC_3, KC_PPLS
 
 #define RIGHT_MOUSE_ROW_1 KC_BTN7, KC_BTN4, KC_MS_U, KC_BTN5, KC_BTN6
 #define RIGHT_MOUSE_ROW_2 KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_ACL0
@@ -96,9 +95,9 @@
 #define NAV_ROW_2 KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_MNXT
 #define NAV_ROW_3 KC_END, KC_PGDN, KC_MUTE, KC_VOLD, KC_MPLY
 
-#define FUNCPAD_ROW_1 KC_F12, KC_F7, KC_F8, KC_F9, TO(_NAV)
-#define FUNCPAD_ROW_2 KC_F11, KC_F4, KC_F5, KC_F6, TO(_MOUSE)
-#define FUNCPAD_ROW_3 KC_F10, KC_F1, KC_F2, KC_F3, KC_PSCR
+#define FUNCPAD_ROW_1 KC_F12, KC_F7, KC_F8, KC_F9, KC_PSCR
+#define FUNCPAD_ROW_2 KC_F11, KC_F4, KC_F5, KC_F6, KC_PEQL
+#define FUNCPAD_ROW_3 KC_F10, KC_F1, KC_F2, KC_F3, KC_PEQL
 
 #define TRANSPARENT_THUMB_CLUSTER _______, _______, _______
 #define LEFT_TRANSPARENT_THUMB_CLUSTER(LAYER) _______, _______, TO(LAYER)
@@ -109,9 +108,8 @@
 #define LEFT_RAISE_THUMB_CLUSTER(LAYER) TAB_RALT, LT_RSE(KC_DEL), TO(LAYER)
 #define LEFT_MOUSE_THUMB_CLUSTER(LAYER) KC_MS_BTN2, LT_RSE(KC_MS_BTN1), TO(LAYER)
 
-#define RIGHT_NUMPAD_THUMB_CLUSTER _______, LT_RSE(KC_0), _______
+#define RIGHT_NUMPAD_THUMB_CLUSTER _______, _______ , _______
 #define RIGHT_MOUSE_THUMB_CLUSTER KC_ENT, KC_MS_BTN1, KC_MS_BTN2
 #define RIGHT_TRANSPARENT_THUMB_CLUSTER(_key) _______, _______, _key
 
-
 #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)