Skip to content

Commit

Permalink
Merge dedicated mouse layer with FN layer
Browse files Browse the repository at this point in the history
  • Loading branch information
@DustVoice
DustVoice committed May 29, 2024
1 parent 292493e commit 15100e3
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 30 deletions.
46 changes: 17 additions & 29 deletions config/base.keymap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,17 @@
#define FN 2
#define NUM 3
#define SYS 4
#define MOUSE 5
#if CONFIG_GAMING
#define MOBA 6
#define MOBA_FN 7
#define FPS 8
#define FPS_FN 9
#define MOBA 5
#define MOBA_FN 6
#define FPS 7
#define FPS_FN 8
#endif
#if CONFIG_UNICODE
#if CONFIG_GAMING
#define UNICODE 10
#define UNICODE 9
#else
#define UNICODE 6
#define UNICODE 5
#endif
#endif

Expand Down Expand Up @@ -150,12 +149,13 @@ ZMK_TAP_DANCE(num_dance,
continue-list = <BSPC DEL DOT COMMA PLUS MINUS STAR FSLH EQUAL>;
};

// NOTE: Not in use
// smart-mouse, requires PR #1366
ZMK_TRI_STATE(smart_mouse,
bindings = <&tog MOUSE>, <&none>, <&tog MOUSE>;
ignored-key-positions = <LT1 LT3 RT0 RT1 RT2 RT3 RT4 RM1 RM2 RM3 RB1 RB2 RB3 RH0 RH1 LH0>;
ignored-layers = <MOUSE>;
)
// ZMK_TRI_STATE(smart_mouse,
// bindings = <&tog MOUSE>, <&none>, <&tog MOUSE>;
// ignored-key-positions = <LT1 LT3 RT0 RT1 RT2 RT3 RT4 RM1 RM2 RM3 RB1 RB2 RB3 RH0 RH1 LH0>;
// ignored-layers = <MOUSE>;
// )

/* Custom behaviors */

Expand Down Expand Up @@ -284,18 +284,18 @@ ZMK_LAYER(nav,
//╰──────╯ ╰─────────────┴─────────────╯ ╰──────╯ ╰─────────────┴─────────────╯ ╰──────╯
)

ZMK_LAYER(fn,
ZMK_LAYER(fn_mouse,
//╭──────╮ ╭──────╮ ╭──────╮
X_LN X_MN X_RN
//╰──────╯ ╰──────╯ ╰──────╯
//╭──────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭──────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭──────╮
X_LT &kp F12 &kp F7 &kp F8 &kp F9 ___ X_MT ___ ___ ___ ___ ___ X_RT
X_LT &kp F12 &kp F7 &kp F8 &kp F9 ___ X_MT U_WH_L U_WH_D U_MS_U U_WH_U U_WH_R X_RT
//├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤
X_LM &hml LGUI F11 &hml LALT F4 &hml LSHFT F5 &hml LCTRL F6 ___ X_MM ___ ___ ___ ___ ___ X_RM
X_LM &hml LGUI F11 &hml LALT F4 &hml LSHFT F5 &hml LCTRL F6 ___ X_MM ___ U_MS_L U_MS_D U_MS_R ___ X_RM
//├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤
X_LB &kp F10 &kp F1 &kp F2 &kp F3 ___ X_MB ___ ___ ___ ___ ___ X_RB
X_LB &kp F10 &kp F1 &kp F2 &kp F3 ___ X_MB ___ &mkp MB4 &mkp MCLK &mkp MB5 ___ X_RB
//├──────┤ ╰─────────────┼─────────────┴─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┴───────────────────────────╯ ├──────┤
X_LH ___ ___ X_MH ___ ___ X_RH
X_LH ___ ___ X_MH &mkp LCLK &mkp RCLK X_RH
//╰──────╯ ╰─────────────┴─────────────╯ ╰──────╯ ╰─────────────┴─────────────╯ ╰──────╯
)

Expand Down Expand Up @@ -329,18 +329,6 @@ ZMK_LAYER(sys,
//╰──────╯ ╰─────────────┴─────────────╯ ╰──────╯ ╰─────────────┴─────────────╯ ╰──────╯
)

ZMK_LAYER(mouse,
//╭──────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭──────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭──────╮
X_LT ___ ___ ___ ___ ___ X_MT U_WH_L U_WH_D U_MS_U U_WH_U U_WH_R X_RT
//├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤
X_LM ___ ___ ___ ___ ___ X_MM ___ U_MS_L U_MS_D U_MS_R ___ X_RM
//├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├──────┤
X_LB ___ ___ ___ ___ ___ X_MB ___ &mkp MB4 &mkp MCLK &mkp MB5 ___ X_RB
//├──────┤ ╰─────────────┼─────────────┴─────────────┼─────────────┼─────────────┤ ├──────┤ ├─────────────┼─────────────┼─────────────┴───────────────────────────╯ ├──────┤
X_LH ___ CANCEL X_MH &mkp LCLK &mkp RCLK X_RH
//╰──────╯ ╰─────────────┴─────────────╯ ╰──────╯ ╰─────────────┴─────────────╯ ╰──────╯
)

#if CONFIG_GAMING
ZMK_LAYER(moba,
//╭──────╮ ╭──────╮ ╭──────╮
Expand Down
3 changes: 2 additions & 1 deletion config/combos.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
/* Horizontal combos - left hand */
ZMK_COMBO(esc, &kp ESC, LT3 LT2, DEF NAV NUM, COMBO_TERM_FAST, COMBO_IDLE_FAST)
ZMK_COMBO(ret, &kp RETURN, LT2 LT1, DEF NAV NUM, COMBO_TERM_FAST, COMBO_IDLE_FAST)
ZMK_COMBO(mouse, &smart_mouse, LT3 LT1, DEF NAV NUM, COMBO_TERM_FAST, COMBO_IDLE_FAST)
// NOTE: Not in use
// ZMK_COMBO(mouse, &smart_mouse, LT3 LT1, DEF NAV NUM, COMBO_TERM_FAST, COMBO_IDLE_FAST)

ZMK_COMBO(tab, HRC_TAB, LM3 LM2, DEF NAV NUM, COMBO_TERM_FAST, COMBO_IDLE_FAST)
ZMK_COMBO(repeat,HRC_REPEAT, LM2 LM1, DEF NAV NUM, COMBO_TERM_FAST, COMBO_IDLE_FAST)
Expand Down

0 comments on commit 15100e3

Please sign in to comment.