From 05ae4f4cd561108e7fd8db405806a1bf1abb45da Mon Sep 17 00:00:00 2001 From: jakobst1n Date: Sun, 28 Jan 2024 20:40:21 +0100 Subject: ps2 --- config/corne.conf | 1 + config/corne.keymap | 7 +- config/corne_right.conf | 2 +- config/includes/combos.dtsi | 183 ---------------------------------------- config/includes/combos.dtsi.old | 183 ++++++++++++++++++++++++++++++++++++++++ config/includes/mouse_tp.dtsi | 4 +- 6 files changed, 190 insertions(+), 190 deletions(-) delete mode 100644 config/includes/combos.dtsi create mode 100644 config/includes/combos.dtsi.old (limited to 'config') diff --git a/config/corne.conf b/config/corne.conf index 72094c8..242b35f 100644 --- a/config/corne.conf +++ b/config/corne.conf @@ -26,6 +26,7 @@ CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_PROXY=y # Configure PS2 Mouse Settings # +CONFIG_ZMK_MOUSE=y CONFIG_HEAP_MEM_POOL_SIZE=256 # Enable additional error mitigations to prevent cursor jumps diff --git a/config/corne.keymap b/config/corne.keymap index cef11d3..9922b2b 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -24,7 +24,6 @@ #include "utils/common.h" -#define HAS_UROB #define HAS_MOUSE_KEYS #define HAS_MOUSE_TP #ifdef HAS_MOUSE_KEYS @@ -116,10 +115,10 @@ COMBO(lnx_ao_comb, K_A K_O, DEFAULT, &lnx_no_ao) // | | | | | | | | label = "TP"; bindings = < + ___ ___ ___ ___ ___ &mms MS_TP_SENSITIVITY_INCR &mkp RCLK ___ ___ ___ ___ ___ + ___ ___ ___ ___ ___ &mms MS_TP_SENSITIVITY_DECR ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ - ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ - ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ - ___ ___ ___ ___ ___ ___ + ___ ___ ___ &mkp LCLK &mkp MCLK ___ >; }; }; diff --git a/config/corne_right.conf b/config/corne_right.conf index 9a282bd..1f2c6f7 100644 --- a/config/corne_right.conf +++ b/config/corne_right.conf @@ -1,2 +1,2 @@ CONFIG_ZMK_SPLIT_ROLE_CENTRAL=y -CONFIG_ZMK_USB_LOGGING=y +CONFIG_ZMK_USB_LOGGING=n diff --git a/config/includes/combos.dtsi b/config/includes/combos.dtsi deleted file mode 100644 index f24cffb..0000000 --- a/config/includes/combos.dtsi +++ /dev/null @@ -1,183 +0,0 @@ -#define COMBO_TERM_FAST 35 -#define COMBO_TERM_SLOW 40 -#define COMBO_PRIOR_IDLE 100 - -/ { - combos { - compatible = "zmk,combos"; - - combo_bracket_v_round_l { - timeout-ms = ; - require-prior-idle-ms = ; - key-positions = ; - layers = ; - bindings = <&kp LPAR>; - }; - - combo_bracket_v_round_r { - timeout-ms = ; - require-prior-idle-ms = ; - key-positions = ; - layers = ; - bindings = <&kp RPAR>; - }; - - combo_bracket_v_square_l { - timeout-ms = ; - require-prior-idle-ms = ; - key-positions = ; - layers = ; - bindings = <&kp LBKT>; - }; - - combo_bracket_v_square_r { - timeout-ms = ; - require-prior-idle-ms = ; - key-positions = ; - layers = ; - bindings = <&kp RBKT>; - }; - - combo_bracket_v_curly_l { - timeout-ms = ; - require-prior-idle-ms = ; - key-positions = ; - layers = ; - bindings = <&kp LBRC>; - }; - - combo_bracket_v_curly_r { - timeout-ms = ; - require-prior-idle-ms = ; - key-positions = ; - layers = ; - bindings = <&kp RBRC>; - }; - - combo_bracket_v_angled_l { - timeout-ms = ; - require-prior-idle-ms = ; - key-positions = ; - layers = ; - bindings = <&kp LT>; - }; - - combo_bracket_v_angled_r { - timeout-ms = ; - require-prior-idle-ms = ; - key-positions = ; - layers = ; - bindings = <&kp GT>; - }; - - combo_capsword { - timeout-ms = ; - require-prior-idle-ms = ; - key-positions = ; - layers = ; - -#ifdef HAS_CAPSLOCK - bindings = <&caps_word_capslock >; -#else - bindings = <&caps_word>; -#endif - }; - - combo_return { - timeout-ms = ; - require-prior-idle-ms = ; - key-positions = ; - layers = ; - bindings = <&kp RET>; - }; - - combo_bspc { - timeout-ms = ; - require-prior-idle-ms = ; - key-positions = ; - layers = ; - bindings = <&kp BSPC>; - }; - - // combo_grave { - // timeout-ms = ; - // require-prior-idle-ms = ; - // key-positions = ; - // layers = <>; - // bindings = <&kp GRAVE>; - // }; - - // combo_md_code_block { - // timeout-ms = ; - // require-prior-idle-ms = ; - // key-positions = ; - // layers = <>; - // bindings = <&m_type_md_code_block>; - // }; - - combo_tog_nav_word { - timeout-ms = ; - require-prior-idle-ms = ; - key-positions = ; - layers = ; - - #ifdef HAS_UROB - bindings = <&nav_word>; - #else - bindings = <&tog NAV_WORD>; - #endif - - }; - - combo_tog_num_word { - timeout-ms = ; - require-prior-idle-ms = ; - key-positions = ; - layers = ; - - #ifdef HAS_UROB - bindings = <&num_word>; - #else - bindings = <&tog NUM_WORD>; - #endif - - }; - -#ifdef HAS_MOUSE_TP - combo_tog_mouse_settings_l { - timeout-ms = ; - // require-prior-idle-ms = ; - key-positions = ; - layers = ; - bindings = <&tog MOUSE_SET>; - }; - - combo_tog_mouse_settings_r { - timeout-ms = ; - // require-prior-idle-ms = ; - key-positions = ; - layers = ; - bindings = <&tog MOUSE_SET>; - }; -#endif - -#ifdef HAS_MOUSE_KEYS - combo_tog_mouse_keys_l { - timeout-ms = ; - // require-prior-idle-ms = ; - key-positions = ; - layers = ; - bindings = <&tog MOUSE_KEYS>; - }; - - combo_tog_mouse_keys_r { - timeout-ms = ; - // require-prior-idle-ms = ; - key-positions = ; - layers = ; - bindings = <&tog MOUSE_KEYS>; - }; -#endif - - }; -}; diff --git a/config/includes/combos.dtsi.old b/config/includes/combos.dtsi.old new file mode 100644 index 0000000..f24cffb --- /dev/null +++ b/config/includes/combos.dtsi.old @@ -0,0 +1,183 @@ +#define COMBO_TERM_FAST 35 +#define COMBO_TERM_SLOW 40 +#define COMBO_PRIOR_IDLE 100 + +/ { + combos { + compatible = "zmk,combos"; + + combo_bracket_v_round_l { + timeout-ms = ; + require-prior-idle-ms = ; + key-positions = ; + layers = ; + bindings = <&kp LPAR>; + }; + + combo_bracket_v_round_r { + timeout-ms = ; + require-prior-idle-ms = ; + key-positions = ; + layers = ; + bindings = <&kp RPAR>; + }; + + combo_bracket_v_square_l { + timeout-ms = ; + require-prior-idle-ms = ; + key-positions = ; + layers = ; + bindings = <&kp LBKT>; + }; + + combo_bracket_v_square_r { + timeout-ms = ; + require-prior-idle-ms = ; + key-positions = ; + layers = ; + bindings = <&kp RBKT>; + }; + + combo_bracket_v_curly_l { + timeout-ms = ; + require-prior-idle-ms = ; + key-positions = ; + layers = ; + bindings = <&kp LBRC>; + }; + + combo_bracket_v_curly_r { + timeout-ms = ; + require-prior-idle-ms = ; + key-positions = ; + layers = ; + bindings = <&kp RBRC>; + }; + + combo_bracket_v_angled_l { + timeout-ms = ; + require-prior-idle-ms = ; + key-positions = ; + layers = ; + bindings = <&kp LT>; + }; + + combo_bracket_v_angled_r { + timeout-ms = ; + require-prior-idle-ms = ; + key-positions = ; + layers = ; + bindings = <&kp GT>; + }; + + combo_capsword { + timeout-ms = ; + require-prior-idle-ms = ; + key-positions = ; + layers = ; + +#ifdef HAS_CAPSLOCK + bindings = <&caps_word_capslock >; +#else + bindings = <&caps_word>; +#endif + }; + + combo_return { + timeout-ms = ; + require-prior-idle-ms = ; + key-positions = ; + layers = ; + bindings = <&kp RET>; + }; + + combo_bspc { + timeout-ms = ; + require-prior-idle-ms = ; + key-positions = ; + layers = ; + bindings = <&kp BSPC>; + }; + + // combo_grave { + // timeout-ms = ; + // require-prior-idle-ms = ; + // key-positions = ; + // layers = <>; + // bindings = <&kp GRAVE>; + // }; + + // combo_md_code_block { + // timeout-ms = ; + // require-prior-idle-ms = ; + // key-positions = ; + // layers = <>; + // bindings = <&m_type_md_code_block>; + // }; + + combo_tog_nav_word { + timeout-ms = ; + require-prior-idle-ms = ; + key-positions = ; + layers = ; + + #ifdef HAS_UROB + bindings = <&nav_word>; + #else + bindings = <&tog NAV_WORD>; + #endif + + }; + + combo_tog_num_word { + timeout-ms = ; + require-prior-idle-ms = ; + key-positions = ; + layers = ; + + #ifdef HAS_UROB + bindings = <&num_word>; + #else + bindings = <&tog NUM_WORD>; + #endif + + }; + +#ifdef HAS_MOUSE_TP + combo_tog_mouse_settings_l { + timeout-ms = ; + // require-prior-idle-ms = ; + key-positions = ; + layers = ; + bindings = <&tog MOUSE_SET>; + }; + + combo_tog_mouse_settings_r { + timeout-ms = ; + // require-prior-idle-ms = ; + key-positions = ; + layers = ; + bindings = <&tog MOUSE_SET>; + }; +#endif + +#ifdef HAS_MOUSE_KEYS + combo_tog_mouse_keys_l { + timeout-ms = ; + // require-prior-idle-ms = ; + key-positions = ; + layers = ; + bindings = <&tog MOUSE_KEYS>; + }; + + combo_tog_mouse_keys_r { + timeout-ms = ; + // require-prior-idle-ms = ; + key-positions = ; + layers = ; + bindings = <&tog MOUSE_KEYS>; + }; +#endif + + }; +}; diff --git a/config/includes/mouse_tp.dtsi b/config/includes/mouse_tp.dtsi index 52856ca..6345cf4 100644 --- a/config/includes/mouse_tp.dtsi +++ b/config/includes/mouse_tp.dtsi @@ -70,7 +70,7 @@ &mouse_ps2 { // Enables scroll wheel on mouse devices supporting the Intellimouse // extension. - // scroll-mode; + scroll-mode; // Disables clicking. Useful when using a PS2 driver that is prone to @@ -135,7 +135,7 @@ // How long to wait, after the last mouse movement, before deactivating // the layer (Default: 250) - layer-toggle-timeout-ms = <250>; + layer-toggle-timeout-ms = <1000>; }; -- cgit v1.2.3