drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Improve mouse keys docs and constant speed mode

Browse source
This commit is contained in:
Markus Weimar 2018-10-17 10:40:52 +02:00 • committed by Drashna Jaelre
parent 74af596d8a
commit e3a940026e
3 changed files with 136 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

29
tmk_core/common/mousekey.c
View file

@ -171,28 +171,31 @@ void mousekey_off(uint8_t code) {
enum {
mkspd_slow,
mkspd_med,
mkspd_fast,
mkspd_unmod,
mkspd_0,
mkspd_1,
mkspd_2,
mkspd_COUNT
};
static uint8_t mk_speed = mkspd_med;
#ifdef MK_MOMENTARY_ACCEL
static uint8_t mkspd_DEFAULT = mkspd_med;
#ifndef MK_MOMENTARY_ACCEL
static uint8_t mk_speed = mkspd_1;
#else
static uint8_t mk_speed = mkspd_unmod;
static uint8_t mkspd_DEFAULT = mkspd_unmod;
#endif
static uint16_t last_timer_c = 0;
static uint16_t last_timer_w = 0;
uint16_t c_offsets[mkspd_COUNT] = {
MK_C_OFFSET_SLOW, MK_C_OFFSET_MED, MK_C_OFFSET_FAST
MK_C_OFFSET_UNMOD, MK_C_OFFSET_0, MK_C_OFFSET_1, MK_C_OFFSET_2
};
uint16_t c_intervals[mkspd_COUNT] = {
MK_C_INTERVAL_SLOW, MK_C_INTERVAL_MED, MK_C_INTERVAL_FAST
MK_C_INTERVAL_UNMOD, MK_C_INTERVAL_0, MK_C_INTERVAL_1, MK_C_INTERVAL_2
};
uint16_t w_offsets[mkspd_COUNT] = {
MK_W_OFFSET_SLOW, MK_W_OFFSET_MED, MK_W_OFFSET_FAST
MK_W_OFFSET_UNMOD, MK_W_OFFSET_0, MK_W_OFFSET_1, MK_W_OFFSET_2
};
uint16_t w_intervals[mkspd_COUNT] = {
MK_W_INTERVAL_SLOW, MK_W_INTERVAL_MED, MK_W_INTERVAL_FAST
MK_W_INTERVAL_UNMOD, MK_W_INTERVAL_0, MK_W_INTERVAL_1, MK_W_INTERVAL_2
};
@ -254,9 +257,9 @@ void mousekey_on(uint8_t code) {
else if (code == KC_MS_BTN3) mouse_report.buttons |= MOUSE_BTN3;
else if (code == KC_MS_BTN4) mouse_report.buttons |= MOUSE_BTN4;
else if (code == KC_MS_BTN5) mouse_report.buttons |= MOUSE_BTN5;
else if (code == KC_MS_ACCEL0) mk_speed = mkspd_slow;
else if (code == KC_MS_ACCEL1) mk_speed = mkspd_med;
else if (code == KC_MS_ACCEL2) mk_speed = mkspd_fast;
else if (code == KC_MS_ACCEL0) mk_speed = mkspd_0;
else if (code == KC_MS_ACCEL1) mk_speed = mkspd_1;
else if (code == KC_MS_ACCEL2) mk_speed = mkspd_2;
if (mk_speed != old_speed) adjust_speed();
}

60
tmk_core/common/mousekey.h
View file

@ -64,42 +64,54 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#else /* #ifndef MK_3_SPEED */
#ifndef MK_C_OFFSET_SLOW
#define MK_C_OFFSET_SLOW 1
#ifndef MK_C_OFFSET_UNMOD
#define MK_C_OFFSET_UNMOD 16
#endif
#ifndef MK_C_INTERVAL_SLOW
#define MK_C_INTERVAL_SLOW 100
#ifndef MK_C_INTERVAL_UNMOD
#define MK_C_INTERVAL_UNMOD 16
#endif
#ifndef MK_C_OFFSET_MED
#define MK_C_OFFSET_MED 4
#ifndef MK_C_OFFSET_0
#define MK_C_OFFSET_0 1
#endif
#ifndef MK_C_INTERVAL_MED
#define MK_C_INTERVAL_MED 16
#ifndef MK_C_INTERVAL_0
#define MK_C_INTERVAL_0 32
#endif
#ifndef MK_C_OFFSET_FAST
#define MK_C_OFFSET_FAST 12
#ifndef MK_C_OFFSET_1
#define MK_C_OFFSET_1 4
#endif
#ifndef MK_C_INTERVAL_FAST
#define MK_C_INTERVAL_FAST 16
#ifndef MK_C_INTERVAL_1
#define MK_C_INTERVAL_1 16
#endif
#ifndef MK_C_OFFSET_2
#define MK_C_OFFSET_2 32
#endif
#ifndef MK_C_INTERVAL_2
#define MK_C_INTERVAL_2 16
#endif
#ifndef MK_W_OFFSET_SLOW
#define MK_W_OFFSET_SLOW 1
#ifndef MK_W_OFFSET_UNMOD
#define MK_W_OFFSET_UNMOD 1
#endif
#ifndef MK_W_INTERVAL_SLOW
#define MK_W_INTERVAL_SLOW 400
#ifndef MK_W_INTERVAL_UNMOD
#define MK_W_INTERVAL_UNMOD 40
#endif
#ifndef MK_W_OFFSET_MED
#define MK_W_OFFSET_MED 1
#ifndef MK_W_OFFSET_0
#define MK_W_OFFSET_0 1
#endif
#ifndef MK_W_INTERVAL_MED
#define MK_W_INTERVAL_MED 200
#ifndef MK_W_INTERVAL_0
#define MK_W_INTERVAL_0 360
#endif
#ifndef MK_W_OFFSET_FAST
#define MK_W_OFFSET_FAST 1
#ifndef MK_W_OFFSET_1
#define MK_W_OFFSET_1 1
#endif
#ifndef MK_W_INTERVAL_FAST
#define MK_W_INTERVAL_FAST 100
#ifndef MK_W_INTERVAL_1
#define MK_W_INTERVAL_1 120
#endif
#ifndef MK_W_OFFSET_2
#define MK_W_OFFSET_2 1
#endif
#ifndef MK_W_INTERVAL_2
#define MK_W_INTERVAL_2 20
#endif
#endif /* #ifndef MK_3_SPEED */