Commit Diff

Commit:
59bb2d299df3f39ffaf3d5befd552c8dd30f5c34
From:
witcher <witcher@wiredspace.de>
Via:
Thomas Böhler <witcher@wiredspace.de>
Date:
Message:
Refine mouse input Add settings for kinetic mode which are commented out, and replace constant mode with accelerated mode. The mouse key mappings have been refined a bit.
Actions:
Patch | Tree
commit - c6a9f091824cf3abaf96af915e43aced4aad2c42
commit + 59bb2d299df3f39ffaf3d5befd552c8dd30f5c34
blob - c032e80820749ab4f6b5febf93a5ad8e10ee06a0
blob + f99677063be4b48b64df0b351a1e6c5135e88546
--- keyboards/crkbd/keymaps/witcher/config.h
+++ keyboards/crkbd/keymaps/witcher/config.h
@@ -52,16 +52,30 @@ along with this program.  If not, see <http://www.gnu.
 // only using < 16 layers
 #define LAYER_STATE_16BIT
 
+// https://docs.qmk.fm/#/feature_mouse_keys
+// use accelerated mouse speeds (default)
+#define MOUSEKEY_INTERVAL 7
+#define MOUSEKEY_MAX_SPEED 4
+#define MOUSEKEY_TIME_TO_MAX 50
+#define MOUSEKEY_WHEEL_INTERVAL 60
+#define MOUSEKEY_WHEEL_MAX_SPEED 3
+#define MOUSEKEY_WHEEL_TIME_TO_MAX 50
+
+// use kinetic mouse speeds
+//#define MK_KINETIC_SPEED
+//#define MOUSEKEY_INTERVAL 8
+//#define MOUSEKEY_BASE_SPEED 1000
+
 // use constant mode for mouse speeds
-#define MK_3_SPEED
+//#define MK_3_SPEED
+//
+//#define MK_C_OFFSET_0 8 // default 1
+//#define MK_C_INTERVAL_0 16 // default 32
+//#define MK_C_OFFSET_1 24 // default 4
+//#define MK_C_INTERVAL_1 16 // default 16
+//#define MK_C_OFFSET_2 32 // default 32
+//#define MK_C_INTERVAL_2 16 // default 16
 
-#define MK_C_OFFSET_0 8 // default 1
-#define MK_C_INTERVAL_0 16 // default 32
-#define MK_C_OFFSET_1 24 // default 4
-#define MK_C_INTERVAL_1 16 // default 16
-#define MK_C_OFFSET_2 32 // default 32
-#define MK_C_INTERVAL_2 16 // default 16
-
 // outright disable RGB
 #undef RGBLIGHT_ANIMATIONS
 #undef RGBLIGHT_EFFECT_BREATHING
blob - f35eb734c8b61e7de09f58db4b92d34125f2c285
blob + 5d68a3daf38fe0f8c6f34e50f9a0200600b93457
--- keyboards/crkbd/keymaps/witcher/keymap.c
+++ keyboards/crkbd/keymaps/witcher/keymap.c
@@ -126,11 +126,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_C
     // 8 - Mouse emulation
     [8] = LAYOUT_split_3x6_3(
 	//,-----------------------------------------------------.                    ,-----------------------------------------------------.
-	    _______, _______, _______, _______, _______, _______,                      _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______,
+	    _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______,                      _______, _______, _______, _______, _______, _______,
 	//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-	    _______, _______, _______, KC_BTN2, KC_BTN1, _______,                      KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,
+	    _______, _______, KC_BTN4, KC_BTN2, KC_BTN1, KC_BTN5,                      KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,
 	//|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-	    KC_TRNS, _______, _______, _______, _______, _______,                      _______, KC_WH_D, KC_WH_U, _______, _______, _______,
+	    KC_TRNS, _______, KC_WH_L, KC_WH_U, KC_WH_D, KC_WH_R,                      _______, _______, _______, _______, _______, _______,
 	//|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
 	                                        _______, _______, _______,    _______, _______, _______
 	                                    //`--------------------------'  `--------------------------'