From 4ae979f6ef8dbf9e1d1f35be15322ad6d02e2958 Mon Sep 17 00:00:00 2001 From: tmk Date: Sat, 6 Oct 2012 02:23:12 +0900 Subject: Initial version of new code for layer switch is added. --- common/mousekey.c | 120 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 73 insertions(+), 47 deletions(-) (limited to 'common/mousekey.c') diff --git a/common/mousekey.c b/common/mousekey.c index 1d35355b4..7f8e860aa 100644 --- a/common/mousekey.c +++ b/common/mousekey.c @@ -26,7 +26,6 @@ along with this program. If not, see . static report_mouse_t report; -static report_mouse_t report_prev; static uint8_t mousekey_repeat = 0; @@ -38,84 +37,111 @@ static void mousekey_debug(void); * see wikipedia http://en.wikipedia.org/wiki/Mouse_keys */ #ifndef MOUSEKEY_DELAY_TIME -# define MOUSEKEY_DELAY_TIME 255 +# define MOUSEKEY_DELAY_TIME 20 #endif +#define MOUSEKEY_MOVE_INIT 5 +#define MOUSEKEY_WHEEL_INIT 1 +#define MOUSEKEY_MOVE_ACCEL 5 +#define MOUSEKEY_WHEEL_ACCEL 1 + +static uint16_t last_timer = 0; + // acceleration parameters -uint8_t mousekey_move_unit = 2; -uint8_t mousekey_resolution = 5; +//uint8_t mousekey_move_unit = 2; +//uint8_t mousekey_resolution = 5; static inline uint8_t move_unit(void) { - uint16_t unit = 5 + mousekey_repeat*2; + uint16_t unit = 5 + mousekey_repeat*4; return (unit > 63 ? 63 : unit); } -void mousekey_decode(uint8_t code) -{ - if (code == KB_MS_UP) report.y = -move_unit(); - else if (code == KB_MS_DOWN) report.y = move_unit(); - else if (code == KB_MS_LEFT) report.x = -move_unit(); - else if (code == KB_MS_RIGHT) report.x = move_unit(); - else if (code == KB_MS_BTN1) report.buttons |= MOUSE_BTN1; - else if (code == KB_MS_BTN2) report.buttons |= MOUSE_BTN2; - else if (code == KB_MS_BTN3) report.buttons |= MOUSE_BTN3; - else if (code == KB_MS_BTN4) report.buttons |= MOUSE_BTN4; - else if (code == KB_MS_BTN5) report.buttons |= MOUSE_BTN5; - else if (code == KB_MS_WH_UP) report.v += move_unit()/4; - else if (code == KB_MS_WH_DOWN) report.v -= move_unit()/4; - else if (code == KB_MS_WH_LEFT) report.h -= move_unit()/4; - else if (code == KB_MS_WH_RIGHT)report.h += move_unit()/4; -} - -bool mousekey_changed(void) -{ - return (report.buttons != report_prev.buttons || - report.x || report.y || report.v || report.h); -} - -void mousekey_send(void) +void mousekey_task(void) { - static uint16_t last_timer = 0; - - if (!mousekey_changed()) { - mousekey_repeat = 0; - mousekey_clear_report(); + if (timer_elapsed(last_timer) < MOUSEKEY_DELAY_TIME) return; - } - // send immediately when buttun state is changed - if (report.buttons == report_prev.buttons) { - if (timer_elapsed(last_timer) < 100) { - mousekey_clear_report(); - return; - } - } + if (report.x == 0 && report.y == 0 && report.v == 0 && report.h == 0) + return; - if (mousekey_repeat != 0xFF) { + if (mousekey_repeat != UINT8_MAX) mousekey_repeat++; - } + + + if (report.x > 0) report.x = move_unit(); + if (report.x < 0) report.x = move_unit() * -1; + if (report.y > 0) report.y = move_unit(); + if (report.y < 0) report.y = move_unit() * -1; if (report.x && report.y) { report.x *= 0.7; report.y *= 0.7; } + if (report.v > 0) report.v = move_unit(); + if (report.v < 0) report.v = move_unit() * -1; + if (report.h > 0) report.h = move_unit(); + if (report.h < 0) report.h = move_unit() * -1; + + mousekey_send(); +} + +void mousekey_on(uint8_t code) +{ + if (code == KB_MS_UP) report.y = MOUSEKEY_MOVE_INIT * -1; + else if (code == KB_MS_DOWN) report.y = MOUSEKEY_MOVE_INIT; + else if (code == KB_MS_LEFT) report.x = MOUSEKEY_MOVE_INIT * -1; + else if (code == KB_MS_RIGHT) report.x = MOUSEKEY_MOVE_INIT; + else if (code == KB_MS_WH_UP) report.v = MOUSEKEY_WHEEL_INIT; + else if (code == KB_MS_WH_DOWN) report.v = MOUSEKEY_WHEEL_INIT * -1; + else if (code == KB_MS_WH_LEFT) report.h = MOUSEKEY_WHEEL_INIT * -1; + else if (code == KB_MS_WH_RIGHT) report.h = MOUSEKEY_WHEEL_INIT; + else if (code == KB_MS_BTN1) report.buttons |= MOUSE_BTN1; + else if (code == KB_MS_BTN2) report.buttons |= MOUSE_BTN2; + else if (code == KB_MS_BTN3) report.buttons |= MOUSE_BTN3; + else if (code == KB_MS_BTN4) report.buttons |= MOUSE_BTN4; + else if (code == KB_MS_BTN5) report.buttons |= MOUSE_BTN5; +} + +void mousekey_off(uint8_t code) +{ + if (code == KB_MS_UP && report.y < 0) report.y = 0; + else if (code == KB_MS_DOWN && report.y > 0) report.y = 0; + else if (code == KB_MS_LEFT && report.x < 0) report.x = 0; + else if (code == KB_MS_RIGHT && report.x > 0) report.x = 0; + else if (code == KB_MS_WH_UP && report.v > 0) report.v = 0; + else if (code == KB_MS_WH_DOWN && report.v < 0) report.v = 0; + else if (code == KB_MS_WH_LEFT && report.h < 0) report.h = 0; + else if (code == KB_MS_WH_RIGHT && report.h > 0) report.h = 0; + else if (code == KB_MS_BTN1) report.buttons &= ~MOUSE_BTN1; + else if (code == KB_MS_BTN2) report.buttons &= ~MOUSE_BTN2; + else if (code == KB_MS_BTN3) report.buttons &= ~MOUSE_BTN3; + else if (code == KB_MS_BTN4) report.buttons &= ~MOUSE_BTN4; + else if (code == KB_MS_BTN5) report.buttons &= ~MOUSE_BTN5; + + if (report.x == 0 && report.y == 0 && report.v == 0 && report.h == 0) + mousekey_repeat = 0; +} + +void mousekey_send(void) +{ mousekey_debug(); host_mouse_send(&report); - report_prev = report; last_timer = timer_read(); - mousekey_clear_report(); } -void mousekey_clear_report(void) +void mousekey_clear(void) { + report = (report_mouse_t){}; +/* report.buttons = 0; report.x = 0; report.y = 0; report.v = 0; report.h = 0; +*/ } static void mousekey_debug(void) -- cgit v1.2.3 From 16ba9bda5601ebef6e4db04a5ad079af32370815 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 9 Oct 2012 13:48:39 +0900 Subject: Add consumer/system usage support. --- common/mousekey.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'common/mousekey.c') diff --git a/common/mousekey.c b/common/mousekey.c index 7f8e860aa..222d9e445 100644 --- a/common/mousekey.c +++ b/common/mousekey.c @@ -135,13 +135,6 @@ void mousekey_send(void) void mousekey_clear(void) { report = (report_mouse_t){}; -/* - report.buttons = 0; - report.x = 0; - report.y = 0; - report.v = 0; - report.h = 0; -*/ } static void mousekey_debug(void) -- cgit v1.2.3 From 373ab0e7192811944786c095facb80938c33f1d5 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 9 Oct 2012 14:36:13 +0900 Subject: Add keycode.h and remove usb_keycodes.h. --- common/mousekey.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'common/mousekey.c') diff --git a/common/mousekey.c b/common/mousekey.c index 222d9e445..58a6e35bb 100644 --- a/common/mousekey.c +++ b/common/mousekey.c @@ -17,7 +17,7 @@ along with this program. If not, see . #include #include -#include "usb_keycodes.h" +#include "keycode.h" #include "host.h" #include "timer.h" #include "print.h" @@ -90,36 +90,36 @@ void mousekey_task(void) void mousekey_on(uint8_t code) { - if (code == KB_MS_UP) report.y = MOUSEKEY_MOVE_INIT * -1; - else if (code == KB_MS_DOWN) report.y = MOUSEKEY_MOVE_INIT; - else if (code == KB_MS_LEFT) report.x = MOUSEKEY_MOVE_INIT * -1; - else if (code == KB_MS_RIGHT) report.x = MOUSEKEY_MOVE_INIT; - else if (code == KB_MS_WH_UP) report.v = MOUSEKEY_WHEEL_INIT; - else if (code == KB_MS_WH_DOWN) report.v = MOUSEKEY_WHEEL_INIT * -1; - else if (code == KB_MS_WH_LEFT) report.h = MOUSEKEY_WHEEL_INIT * -1; - else if (code == KB_MS_WH_RIGHT) report.h = MOUSEKEY_WHEEL_INIT; - else if (code == KB_MS_BTN1) report.buttons |= MOUSE_BTN1; - else if (code == KB_MS_BTN2) report.buttons |= MOUSE_BTN2; - else if (code == KB_MS_BTN3) report.buttons |= MOUSE_BTN3; - else if (code == KB_MS_BTN4) report.buttons |= MOUSE_BTN4; - else if (code == KB_MS_BTN5) report.buttons |= MOUSE_BTN5; + if (code == KC_MS_UP) report.y = MOUSEKEY_MOVE_INIT * -1; + else if (code == KC_MS_DOWN) report.y = MOUSEKEY_MOVE_INIT; + else if (code == KC_MS_LEFT) report.x = MOUSEKEY_MOVE_INIT * -1; + else if (code == KC_MS_RIGHT) report.x = MOUSEKEY_MOVE_INIT; + else if (code == KC_MS_WH_UP) report.v = MOUSEKEY_WHEEL_INIT; + else if (code == KC_MS_WH_DOWN) report.v = MOUSEKEY_WHEEL_INIT * -1; + else if (code == KC_MS_WH_LEFT) report.h = MOUSEKEY_WHEEL_INIT * -1; + else if (code == KC_MS_WH_RIGHT) report.h = MOUSEKEY_WHEEL_INIT; + else if (code == KC_MS_BTN1) report.buttons |= MOUSE_BTN1; + else if (code == KC_MS_BTN2) report.buttons |= MOUSE_BTN2; + else if (code == KC_MS_BTN3) report.buttons |= MOUSE_BTN3; + else if (code == KC_MS_BTN4) report.buttons |= MOUSE_BTN4; + else if (code == KC_MS_BTN5) report.buttons |= MOUSE_BTN5; } void mousekey_off(uint8_t code) { - if (code == KB_MS_UP && report.y < 0) report.y = 0; - else if (code == KB_MS_DOWN && report.y > 0) report.y = 0; - else if (code == KB_MS_LEFT && report.x < 0) report.x = 0; - else if (code == KB_MS_RIGHT && report.x > 0) report.x = 0; - else if (code == KB_MS_WH_UP && report.v > 0) report.v = 0; - else if (code == KB_MS_WH_DOWN && report.v < 0) report.v = 0; - else if (code == KB_MS_WH_LEFT && report.h < 0) report.h = 0; - else if (code == KB_MS_WH_RIGHT && report.h > 0) report.h = 0; - else if (code == KB_MS_BTN1) report.buttons &= ~MOUSE_BTN1; - else if (code == KB_MS_BTN2) report.buttons &= ~MOUSE_BTN2; - else if (code == KB_MS_BTN3) report.buttons &= ~MOUSE_BTN3; - else if (code == KB_MS_BTN4) report.buttons &= ~MOUSE_BTN4; - else if (code == KB_MS_BTN5) report.buttons &= ~MOUSE_BTN5; + if (code == KC_MS_UP && report.y < 0) report.y = 0; + else if (code == KC_MS_DOWN && report.y > 0) report.y = 0; + else if (code == KC_MS_LEFT && report.x < 0) report.x = 0; + else if (code == KC_MS_RIGHT && report.x > 0) report.x = 0; + else if (code == KC_MS_WH_UP && report.v > 0) report.v = 0; + else if (code == KC_MS_WH_DOWN && report.v < 0) report.v = 0; + else if (code == KC_MS_WH_LEFT && report.h < 0) report.h = 0; + else if (code == KC_MS_WH_RIGHT && report.h > 0) report.h = 0; + else if (code == KC_MS_BTN1) report.buttons &= ~MOUSE_BTN1; + else if (code == KC_MS_BTN2) report.buttons &= ~MOUSE_BTN2; + else if (code == KC_MS_BTN3) report.buttons &= ~MOUSE_BTN3; + else if (code == KC_MS_BTN4) report.buttons &= ~MOUSE_BTN4; + else if (code == KC_MS_BTN5) report.buttons &= ~MOUSE_BTN5; if (report.x == 0 && report.y == 0 && report.v == 0 && report.h == 0) mousekey_repeat = 0; -- cgit v1.2.3 From 5b00cf3f024a09d834d125374d93cacc269f84ba Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 10 Oct 2012 11:06:47 +0900 Subject: Fix build option MOUSEKEY_ENABLE. --- common/mousekey.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'common/mousekey.c') diff --git a/common/mousekey.c b/common/mousekey.c index 58a6e35bb..6fe8e2d26 100644 --- a/common/mousekey.c +++ b/common/mousekey.c @@ -37,7 +37,7 @@ static void mousekey_debug(void); * see wikipedia http://en.wikipedia.org/wiki/Mouse_keys */ #ifndef MOUSEKEY_DELAY_TIME -# define MOUSEKEY_DELAY_TIME 20 +# define MOUSEKEY_DELAY_TIME 100 #endif #define MOUSEKEY_MOVE_INIT 5 @@ -54,10 +54,16 @@ static uint16_t last_timer = 0; static inline uint8_t move_unit(void) { - uint16_t unit = 5 + mousekey_repeat*4; + uint16_t unit = MOUSEKEY_MOVE_INIT + MOUSEKEY_MOVE_ACCEL * mousekey_repeat; return (unit > 63 ? 63 : unit); } +static inline uint8_t wheel_unit(void) +{ + uint16_t unit = MOUSEKEY_WHEEL_INIT + MOUSEKEY_WHEEL_ACCEL * mousekey_repeat; + return (unit > 15 ? 15 : unit); +} + void mousekey_task(void) { if (timer_elapsed(last_timer) < MOUSEKEY_DELAY_TIME) @@ -80,10 +86,10 @@ void mousekey_task(void) report.y *= 0.7; } - if (report.v > 0) report.v = move_unit(); - if (report.v < 0) report.v = move_unit() * -1; - if (report.h > 0) report.h = move_unit(); - if (report.h < 0) report.h = move_unit() * -1; + if (report.v > 0) report.v = wheel_unit(); + if (report.v < 0) report.v = wheel_unit() * -1; + if (report.h > 0) report.h = wheel_unit(); + if (report.h < 0) report.h = wheel_unit() * -1; mousekey_send(); } @@ -107,19 +113,19 @@ void mousekey_on(uint8_t code) void mousekey_off(uint8_t code) { - if (code == KC_MS_UP && report.y < 0) report.y = 0; - else if (code == KC_MS_DOWN && report.y > 0) report.y = 0; - else if (code == KC_MS_LEFT && report.x < 0) report.x = 0; - else if (code == KC_MS_RIGHT && report.x > 0) report.x = 0; + if (code == KC_MS_UP && report.y < 0) report.y = 0; + else if (code == KC_MS_DOWN && report.y > 0) report.y = 0; + else if (code == KC_MS_LEFT && report.x < 0) report.x = 0; + else if (code == KC_MS_RIGHT && report.x > 0) report.x = 0; else if (code == KC_MS_WH_UP && report.v > 0) report.v = 0; else if (code == KC_MS_WH_DOWN && report.v < 0) report.v = 0; else if (code == KC_MS_WH_LEFT && report.h < 0) report.h = 0; else if (code == KC_MS_WH_RIGHT && report.h > 0) report.h = 0; - else if (code == KC_MS_BTN1) report.buttons &= ~MOUSE_BTN1; - else if (code == KC_MS_BTN2) report.buttons &= ~MOUSE_BTN2; - else if (code == KC_MS_BTN3) report.buttons &= ~MOUSE_BTN3; - else if (code == KC_MS_BTN4) report.buttons &= ~MOUSE_BTN4; - else if (code == KC_MS_BTN5) report.buttons &= ~MOUSE_BTN5; + else if (code == KC_MS_BTN1) report.buttons &= ~MOUSE_BTN1; + else if (code == KC_MS_BTN2) report.buttons &= ~MOUSE_BTN2; + else if (code == KC_MS_BTN3) report.buttons &= ~MOUSE_BTN3; + else if (code == KC_MS_BTN4) report.buttons &= ~MOUSE_BTN4; + else if (code == KC_MS_BTN5) report.buttons &= ~MOUSE_BTN5; if (report.x == 0 && report.y == 0 && report.v == 0 && report.h == 0) mousekey_repeat = 0; -- cgit v1.2.3 From 0a70be9a97215e2b514841f67e52b4c55a6adab1 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 10 Oct 2012 15:31:00 +0900 Subject: Add subset of Xorg MouseKey acceleration parameters. --- common/mousekey.c | 102 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 74 insertions(+), 28 deletions(-) (limited to 'common/mousekey.c') diff --git a/common/mousekey.c b/common/mousekey.c index 6fe8e2d26..4b1fe1740 100644 --- a/common/mousekey.c +++ b/common/mousekey.c @@ -32,41 +32,87 @@ static uint8_t mousekey_repeat = 0; static void mousekey_debug(void); +/* max value on report descriptor */ +#define MOUSEKEY_MOVE_MAX 127 +#define MOUSEKEY_WHEEL_MAX 15 + +#ifndef MOUSEKEY_MOVE_DELTA +#define MOUSEKEY_MOVE_DELTA 5 +#endif +#ifndef MOUSEKEY_WHEEL_DELTA +#define MOUSEKEY_WHEEL_DELTA 1 +#endif +#ifndef MOUSEKEY_DELAY +#define MOUSEKEY_DELAY 300 +#endif +#ifndef MOUSEKEY_INTERVAL +#define MOUSEKEY_INTERVAL 50 +#endif +#ifndef MOUSEKEY_MAX_SPEED +#define MOUSEKEY_MAX_SPEED 10 +#endif +#ifndef MOUSEKEY_TIME_TO_MAX +#define MOUSEKEY_TIME_TO_MAX 20 +#endif +#ifndef MOUSEKEY_WHEEL_MAX_SPEED +#define MOUSEKEY_WHEEL_MAX_SPEED 8 +#endif +#ifndef MOUSEKEY_WHEEL_TIME_TO_MAX +#define MOUSEKEY_WHEEL_TIME_TO_MAX 40 +#endif + + /* - * TODO: fix acceleration algorithm - * see wikipedia http://en.wikipedia.org/wiki/Mouse_keys + * Mouse keys acceleration algorithm + * http://en.wikipedia.org/wiki/Mouse_keys + * + * speed = delta * max_speed * (repeat / time_to_max)**((1000+curve)/1000) */ -#ifndef MOUSEKEY_DELAY_TIME -# define MOUSEKEY_DELAY_TIME 100 -#endif +/* milliseconds between the initial key press and first repeated motion event (0-2550) */ +static uint8_t mk_delay = MOUSEKEY_DELAY/10; +/* milliseconds between repeated motion events (0-255) */ +static uint8_t mk_interval = MOUSEKEY_INTERVAL; +/* steady speed (in action_delta units) applied each event (0-255) */ +static uint8_t mk_max_speed = MOUSEKEY_MAX_SPEED; +/* number of events (count) accelerating to steady speed (0-255) */ +static uint8_t mk_time_to_max = MOUSEKEY_TIME_TO_MAX; +/* ramp used to reach maximum pointer speed (NOT SUPPORTED) */ +//static int8_t mk_curve = 0; -#define MOUSEKEY_MOVE_INIT 5 -#define MOUSEKEY_WHEEL_INIT 1 -#define MOUSEKEY_MOVE_ACCEL 5 -#define MOUSEKEY_WHEEL_ACCEL 1 +static uint8_t mk_wheel_max_speed = MOUSEKEY_WHEEL_MAX_SPEED; +static uint8_t mk_wheel_time_to_max = MOUSEKEY_WHEEL_TIME_TO_MAX; -static uint16_t last_timer = 0; -// acceleration parameters -//uint8_t mousekey_move_unit = 2; -//uint8_t mousekey_resolution = 5; +static uint16_t last_timer = 0; -static inline uint8_t move_unit(void) +static uint8_t move_unit(void) { - uint16_t unit = MOUSEKEY_MOVE_INIT + MOUSEKEY_MOVE_ACCEL * mousekey_repeat; - return (unit > 63 ? 63 : unit); + uint16_t unit; + if (mousekey_repeat > mk_time_to_max) { + unit = MOUSEKEY_MOVE_DELTA * mk_max_speed; + } else { + unit = (MOUSEKEY_MOVE_DELTA * mk_max_speed * mousekey_repeat) / mk_time_to_max; + } + if (unit == 0) return 1; + return (unit > MOUSEKEY_MOVE_MAX ? MOUSEKEY_MOVE_MAX : unit); } -static inline uint8_t wheel_unit(void) +static uint8_t wheel_unit(void) { - uint16_t unit = MOUSEKEY_WHEEL_INIT + MOUSEKEY_WHEEL_ACCEL * mousekey_repeat; - return (unit > 15 ? 15 : unit); + uint16_t unit; + if (mousekey_repeat > mk_time_to_max) { + unit = MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed; + } else { + unit = (MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed * mousekey_repeat) / mk_time_to_max; + } + if (unit == 0) return 1; + return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : unit); } void mousekey_task(void) { - if (timer_elapsed(last_timer) < MOUSEKEY_DELAY_TIME) + if (timer_elapsed(last_timer) < (mousekey_repeat ? mk_interval : mk_delay*10)) return; if (report.x == 0 && report.y == 0 && report.v == 0 && report.h == 0) @@ -96,14 +142,14 @@ void mousekey_task(void) void mousekey_on(uint8_t code) { - if (code == KC_MS_UP) report.y = MOUSEKEY_MOVE_INIT * -1; - else if (code == KC_MS_DOWN) report.y = MOUSEKEY_MOVE_INIT; - else if (code == KC_MS_LEFT) report.x = MOUSEKEY_MOVE_INIT * -1; - else if (code == KC_MS_RIGHT) report.x = MOUSEKEY_MOVE_INIT; - else if (code == KC_MS_WH_UP) report.v = MOUSEKEY_WHEEL_INIT; - else if (code == KC_MS_WH_DOWN) report.v = MOUSEKEY_WHEEL_INIT * -1; - else if (code == KC_MS_WH_LEFT) report.h = MOUSEKEY_WHEEL_INIT * -1; - else if (code == KC_MS_WH_RIGHT) report.h = MOUSEKEY_WHEEL_INIT; + if (code == KC_MS_UP) report.y = MOUSEKEY_MOVE_DELTA * -1; + else if (code == KC_MS_DOWN) report.y = MOUSEKEY_MOVE_DELTA; + else if (code == KC_MS_LEFT) report.x = MOUSEKEY_MOVE_DELTA * -1; + else if (code == KC_MS_RIGHT) report.x = MOUSEKEY_MOVE_DELTA; + else if (code == KC_MS_WH_UP) report.v = MOUSEKEY_WHEEL_DELTA; + else if (code == KC_MS_WH_DOWN) report.v = MOUSEKEY_WHEEL_DELTA * -1; + else if (code == KC_MS_WH_LEFT) report.h = MOUSEKEY_WHEEL_DELTA * -1; + else if (code == KC_MS_WH_RIGHT) report.h = MOUSEKEY_WHEEL_DELTA; else if (code == KC_MS_BTN1) report.buttons |= MOUSE_BTN1; else if (code == KC_MS_BTN2) report.buttons |= MOUSE_BTN2; else if (code == KC_MS_BTN3) report.buttons |= MOUSE_BTN3; -- cgit v1.2.3 From 1677b021d7bff6af7763532b038612363b61dada Mon Sep 17 00:00:00 2001 From: tmk Date: Fri, 12 Oct 2012 04:46:37 +0900 Subject: Fix layer switching and host API. --- common/mousekey.c | 95 +++++++++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 48 deletions(-) (limited to 'common/mousekey.c') diff --git a/common/mousekey.c b/common/mousekey.c index 4b1fe1740..353890a16 100644 --- a/common/mousekey.c +++ b/common/mousekey.c @@ -25,7 +25,6 @@ along with this program. If not, see . #include "mousekey.h" -static report_mouse_t report; static uint8_t mousekey_repeat = 0; @@ -115,89 +114,89 @@ void mousekey_task(void) if (timer_elapsed(last_timer) < (mousekey_repeat ? mk_interval : mk_delay*10)) return; - if (report.x == 0 && report.y == 0 && report.v == 0 && report.h == 0) + if (mouse_report.x == 0 && mouse_report.y == 0 && mouse_report.v == 0 && mouse_report.h == 0) return; if (mousekey_repeat != UINT8_MAX) mousekey_repeat++; - if (report.x > 0) report.x = move_unit(); - if (report.x < 0) report.x = move_unit() * -1; - if (report.y > 0) report.y = move_unit(); - if (report.y < 0) report.y = move_unit() * -1; + if (mouse_report.x > 0) mouse_report.x = move_unit(); + if (mouse_report.x < 0) mouse_report.x = move_unit() * -1; + if (mouse_report.y > 0) mouse_report.y = move_unit(); + if (mouse_report.y < 0) mouse_report.y = move_unit() * -1; - if (report.x && report.y) { - report.x *= 0.7; - report.y *= 0.7; + if (mouse_report.x && mouse_report.y) { + mouse_report.x *= 0.7; + mouse_report.y *= 0.7; } - if (report.v > 0) report.v = wheel_unit(); - if (report.v < 0) report.v = wheel_unit() * -1; - if (report.h > 0) report.h = wheel_unit(); - if (report.h < 0) report.h = wheel_unit() * -1; + if (mouse_report.v > 0) mouse_report.v = wheel_unit(); + if (mouse_report.v < 0) mouse_report.v = wheel_unit() * -1; + if (mouse_report.h > 0) mouse_report.h = wheel_unit(); + if (mouse_report.h < 0) mouse_report.h = wheel_unit() * -1; mousekey_send(); } void mousekey_on(uint8_t code) { - if (code == KC_MS_UP) report.y = MOUSEKEY_MOVE_DELTA * -1; - else if (code == KC_MS_DOWN) report.y = MOUSEKEY_MOVE_DELTA; - else if (code == KC_MS_LEFT) report.x = MOUSEKEY_MOVE_DELTA * -1; - else if (code == KC_MS_RIGHT) report.x = MOUSEKEY_MOVE_DELTA; - else if (code == KC_MS_WH_UP) report.v = MOUSEKEY_WHEEL_DELTA; - else if (code == KC_MS_WH_DOWN) report.v = MOUSEKEY_WHEEL_DELTA * -1; - else if (code == KC_MS_WH_LEFT) report.h = MOUSEKEY_WHEEL_DELTA * -1; - else if (code == KC_MS_WH_RIGHT) report.h = MOUSEKEY_WHEEL_DELTA; - else if (code == KC_MS_BTN1) report.buttons |= MOUSE_BTN1; - else if (code == KC_MS_BTN2) report.buttons |= MOUSE_BTN2; - else if (code == KC_MS_BTN3) report.buttons |= MOUSE_BTN3; - else if (code == KC_MS_BTN4) report.buttons |= MOUSE_BTN4; - else if (code == KC_MS_BTN5) report.buttons |= MOUSE_BTN5; + if (code == KC_MS_UP) mouse_report.y = MOUSEKEY_MOVE_DELTA * -1; + else if (code == KC_MS_DOWN) mouse_report.y = MOUSEKEY_MOVE_DELTA; + else if (code == KC_MS_LEFT) mouse_report.x = MOUSEKEY_MOVE_DELTA * -1; + else if (code == KC_MS_RIGHT) mouse_report.x = MOUSEKEY_MOVE_DELTA; + else if (code == KC_MS_WH_UP) mouse_report.v = MOUSEKEY_WHEEL_DELTA; + else if (code == KC_MS_WH_DOWN) mouse_report.v = MOUSEKEY_WHEEL_DELTA * -1; + else if (code == KC_MS_WH_LEFT) mouse_report.h = MOUSEKEY_WHEEL_DELTA * -1; + else if (code == KC_MS_WH_RIGHT) mouse_report.h = MOUSEKEY_WHEEL_DELTA; + else if (code == KC_MS_BTN1) mouse_report.buttons |= MOUSE_BTN1; + else if (code == KC_MS_BTN2) mouse_report.buttons |= MOUSE_BTN2; + 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; } void mousekey_off(uint8_t code) { - if (code == KC_MS_UP && report.y < 0) report.y = 0; - else if (code == KC_MS_DOWN && report.y > 0) report.y = 0; - else if (code == KC_MS_LEFT && report.x < 0) report.x = 0; - else if (code == KC_MS_RIGHT && report.x > 0) report.x = 0; - else if (code == KC_MS_WH_UP && report.v > 0) report.v = 0; - else if (code == KC_MS_WH_DOWN && report.v < 0) report.v = 0; - else if (code == KC_MS_WH_LEFT && report.h < 0) report.h = 0; - else if (code == KC_MS_WH_RIGHT && report.h > 0) report.h = 0; - else if (code == KC_MS_BTN1) report.buttons &= ~MOUSE_BTN1; - else if (code == KC_MS_BTN2) report.buttons &= ~MOUSE_BTN2; - else if (code == KC_MS_BTN3) report.buttons &= ~MOUSE_BTN3; - else if (code == KC_MS_BTN4) report.buttons &= ~MOUSE_BTN4; - else if (code == KC_MS_BTN5) report.buttons &= ~MOUSE_BTN5; - - if (report.x == 0 && report.y == 0 && report.v == 0 && report.h == 0) + if (code == KC_MS_UP && mouse_report.y < 0) mouse_report.y = 0; + else if (code == KC_MS_DOWN && mouse_report.y > 0) mouse_report.y = 0; + else if (code == KC_MS_LEFT && mouse_report.x < 0) mouse_report.x = 0; + else if (code == KC_MS_RIGHT && mouse_report.x > 0) mouse_report.x = 0; + else if (code == KC_MS_WH_UP && mouse_report.v > 0) mouse_report.v = 0; + else if (code == KC_MS_WH_DOWN && mouse_report.v < 0) mouse_report.v = 0; + else if (code == KC_MS_WH_LEFT && mouse_report.h < 0) mouse_report.h = 0; + else if (code == KC_MS_WH_RIGHT && mouse_report.h > 0) mouse_report.h = 0; + else if (code == KC_MS_BTN1) mouse_report.buttons &= ~MOUSE_BTN1; + else if (code == KC_MS_BTN2) mouse_report.buttons &= ~MOUSE_BTN2; + 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; + + if (mouse_report.x == 0 && mouse_report.y == 0 && mouse_report.v == 0 && mouse_report.h == 0) mousekey_repeat = 0; } void mousekey_send(void) { mousekey_debug(); - host_mouse_send(&report); + host_mouse_send(&mouse_report); last_timer = timer_read(); } void mousekey_clear(void) { - report = (report_mouse_t){}; + mouse_report = (report_mouse_t){}; } static void mousekey_debug(void) { if (!debug_mouse) return; print("mousekey [btn|x y v h]rep: ["); - phex(report.buttons); print("|"); - phex(report.x); print(" "); - phex(report.y); print(" "); - phex(report.v); print(" "); - phex(report.h); print("]"); + phex(mouse_report.buttons); print("|"); + phex(mouse_report.x); print(" "); + phex(mouse_report.y); print(" "); + phex(mouse_report.v); print(" "); + phex(mouse_report.h); print("]"); phex(mousekey_repeat); print("\n"); } -- cgit v1.2.3 From e451c059296a4c9af7a476577fee64afb9965bca Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 16 Oct 2012 11:20:49 +0900 Subject: Fix commands --- common/mousekey.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/mousekey.c') diff --git a/common/mousekey.c b/common/mousekey.c index 353890a16..99e6d34ff 100644 --- a/common/mousekey.c +++ b/common/mousekey.c @@ -103,7 +103,7 @@ static uint8_t wheel_unit(void) if (mousekey_repeat > mk_time_to_max) { unit = MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed; } else { - unit = (MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed * mousekey_repeat) / mk_time_to_max; + unit = (MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed * mousekey_repeat) / mk_wheel_time_to_max; } if (unit == 0) return 1; return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : unit); -- cgit v1.2.3 From 8f7ed2bc1902cdeeb78c49f4833816a33cd6d3a0 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 17 Oct 2012 03:27:25 +0900 Subject: Add Mousekey parameters and accel keys. --- common/mousekey.c | 106 ++++++++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 56 deletions(-) (limited to 'common/mousekey.c') diff --git a/common/mousekey.c b/common/mousekey.c index 99e6d34ff..b8af3e59c 100644 --- a/common/mousekey.c +++ b/common/mousekey.c @@ -27,40 +27,11 @@ along with this program. If not, see . static uint8_t mousekey_repeat = 0; +static uint8_t mousekey_accel = 0; static void mousekey_debug(void); -/* max value on report descriptor */ -#define MOUSEKEY_MOVE_MAX 127 -#define MOUSEKEY_WHEEL_MAX 15 - -#ifndef MOUSEKEY_MOVE_DELTA -#define MOUSEKEY_MOVE_DELTA 5 -#endif -#ifndef MOUSEKEY_WHEEL_DELTA -#define MOUSEKEY_WHEEL_DELTA 1 -#endif -#ifndef MOUSEKEY_DELAY -#define MOUSEKEY_DELAY 300 -#endif -#ifndef MOUSEKEY_INTERVAL -#define MOUSEKEY_INTERVAL 50 -#endif -#ifndef MOUSEKEY_MAX_SPEED -#define MOUSEKEY_MAX_SPEED 10 -#endif -#ifndef MOUSEKEY_TIME_TO_MAX -#define MOUSEKEY_TIME_TO_MAX 20 -#endif -#ifndef MOUSEKEY_WHEEL_MAX_SPEED -#define MOUSEKEY_WHEEL_MAX_SPEED 8 -#endif -#ifndef MOUSEKEY_WHEEL_TIME_TO_MAX -#define MOUSEKEY_WHEEL_TIME_TO_MAX 40 -#endif - - /* * Mouse keys acceleration algorithm * http://en.wikipedia.org/wiki/Mouse_keys @@ -68,18 +39,18 @@ static void mousekey_debug(void); * speed = delta * max_speed * (repeat / time_to_max)**((1000+curve)/1000) */ /* milliseconds between the initial key press and first repeated motion event (0-2550) */ -static uint8_t mk_delay = MOUSEKEY_DELAY/10; +uint8_t mk_delay = MOUSEKEY_DELAY/10; /* milliseconds between repeated motion events (0-255) */ -static uint8_t mk_interval = MOUSEKEY_INTERVAL; +uint8_t mk_interval = MOUSEKEY_INTERVAL; /* steady speed (in action_delta units) applied each event (0-255) */ -static uint8_t mk_max_speed = MOUSEKEY_MAX_SPEED; +uint8_t mk_max_speed = MOUSEKEY_MAX_SPEED; /* number of events (count) accelerating to steady speed (0-255) */ -static uint8_t mk_time_to_max = MOUSEKEY_TIME_TO_MAX; +uint8_t mk_time_to_max = MOUSEKEY_TIME_TO_MAX; /* ramp used to reach maximum pointer speed (NOT SUPPORTED) */ -//static int8_t mk_curve = 0; - -static uint8_t mk_wheel_max_speed = MOUSEKEY_WHEEL_MAX_SPEED; -static uint8_t mk_wheel_time_to_max = MOUSEKEY_WHEEL_TIME_TO_MAX; +//int8_t mk_curve = 0; +/* wheel params */ +uint8_t mk_wheel_max_speed = MOUSEKEY_WHEEL_MAX_SPEED; +uint8_t mk_wheel_time_to_max = MOUSEKEY_WHEEL_TIME_TO_MAX; static uint16_t last_timer = 0; @@ -88,25 +59,39 @@ static uint16_t last_timer = 0; static uint8_t move_unit(void) { uint16_t unit; - if (mousekey_repeat > mk_time_to_max) { + if (mousekey_accel & (1<<0)) { + unit = (MOUSEKEY_MOVE_DELTA * mk_max_speed)/4; + } else if (mousekey_accel & (1<<1)) { + unit = (MOUSEKEY_MOVE_DELTA * mk_max_speed)/2; + } else if (mousekey_accel & (1<<2)) { + unit = (MOUSEKEY_MOVE_DELTA * mk_max_speed); + } else if (mousekey_repeat == 0) { + unit = MOUSEKEY_MOVE_DELTA; + } else if (mousekey_repeat >= mk_time_to_max) { unit = MOUSEKEY_MOVE_DELTA * mk_max_speed; } else { unit = (MOUSEKEY_MOVE_DELTA * mk_max_speed * mousekey_repeat) / mk_time_to_max; } - if (unit == 0) return 1; - return (unit > MOUSEKEY_MOVE_MAX ? MOUSEKEY_MOVE_MAX : unit); + return (unit > MOUSEKEY_MOVE_MAX ? MOUSEKEY_MOVE_MAX : (unit == 0 ? 1 : unit)); } static uint8_t wheel_unit(void) { uint16_t unit; - if (mousekey_repeat > mk_time_to_max) { + if (mousekey_accel & (1<<0)) { + unit = (MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed)/4; + } else if (mousekey_accel & (1<<1)) { + unit = (MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed)/2; + } else if (mousekey_accel & (1<<2)) { + unit = (MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed); + } else if (mousekey_repeat == 0) { + unit = MOUSEKEY_WHEEL_DELTA; + } else if (mousekey_repeat >= mk_time_to_max) { unit = MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed; } else { unit = (MOUSEKEY_WHEEL_DELTA * mk_wheel_max_speed * mousekey_repeat) / mk_wheel_time_to_max; } - if (unit == 0) return 1; - return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : unit); + return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : (unit == 0 ? 1 : unit)); } void mousekey_task(void) @@ -126,6 +111,7 @@ void mousekey_task(void) if (mouse_report.y > 0) mouse_report.y = move_unit(); if (mouse_report.y < 0) mouse_report.y = move_unit() * -1; + /* diagonal move [1/sqrt(2) = 0.7] */ if (mouse_report.x && mouse_report.y) { mouse_report.x *= 0.7; mouse_report.y *= 0.7; @@ -141,19 +127,22 @@ void mousekey_task(void) void mousekey_on(uint8_t code) { - if (code == KC_MS_UP) mouse_report.y = MOUSEKEY_MOVE_DELTA * -1; - else if (code == KC_MS_DOWN) mouse_report.y = MOUSEKEY_MOVE_DELTA; - else if (code == KC_MS_LEFT) mouse_report.x = MOUSEKEY_MOVE_DELTA * -1; - else if (code == KC_MS_RIGHT) mouse_report.x = MOUSEKEY_MOVE_DELTA; - else if (code == KC_MS_WH_UP) mouse_report.v = MOUSEKEY_WHEEL_DELTA; - else if (code == KC_MS_WH_DOWN) mouse_report.v = MOUSEKEY_WHEEL_DELTA * -1; - else if (code == KC_MS_WH_LEFT) mouse_report.h = MOUSEKEY_WHEEL_DELTA * -1; - else if (code == KC_MS_WH_RIGHT) mouse_report.h = MOUSEKEY_WHEEL_DELTA; + if (code == KC_MS_UP) mouse_report.y = move_unit() * -1; + else if (code == KC_MS_DOWN) mouse_report.y = move_unit(); + else if (code == KC_MS_LEFT) mouse_report.x = move_unit() * -1; + else if (code == KC_MS_RIGHT) mouse_report.x = move_unit(); + else if (code == KC_MS_WH_UP) mouse_report.v = wheel_unit(); + else if (code == KC_MS_WH_DOWN) mouse_report.v = wheel_unit() * -1; + else if (code == KC_MS_WH_LEFT) mouse_report.h = wheel_unit() * -1; + else if (code == KC_MS_WH_RIGHT) mouse_report.h = wheel_unit(); else if (code == KC_MS_BTN1) mouse_report.buttons |= MOUSE_BTN1; else if (code == KC_MS_BTN2) mouse_report.buttons |= MOUSE_BTN2; 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) mousekey_accel |= (1<<0); + else if (code == KC_MS_ACCEL1) mousekey_accel |= (1<<1); + else if (code == KC_MS_ACCEL2) mousekey_accel |= (1<<2); } void mousekey_off(uint8_t code) @@ -171,6 +160,9 @@ void mousekey_off(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) mousekey_accel &= ~(1<<0); + else if (code == KC_MS_ACCEL1) mousekey_accel &= ~(1<<1); + else if (code == KC_MS_ACCEL2) mousekey_accel &= ~(1<<2); if (mouse_report.x == 0 && mouse_report.y == 0 && mouse_report.v == 0 && mouse_report.h == 0) mousekey_repeat = 0; @@ -186,17 +178,19 @@ void mousekey_send(void) void mousekey_clear(void) { mouse_report = (report_mouse_t){}; + mousekey_repeat = 0; + mousekey_accel = 0; } static void mousekey_debug(void) { if (!debug_mouse) return; - print("mousekey [btn|x y v h]rep: ["); + print("mousekey [btn|x y v h](rep/acl): ["); phex(mouse_report.buttons); print("|"); phex(mouse_report.x); print(" "); phex(mouse_report.y); print(" "); phex(mouse_report.v); print(" "); - phex(mouse_report.h); print("]"); - phex(mousekey_repeat); - print("\n"); + phex(mouse_report.h); print("]("); + phex(mousekey_repeat); print("/"); + phex(mousekey_accel); print(")\n"); } -- cgit v1.2.3