X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tmk_core%2Fcommon%2Fmousekey.c;h=bb08576b9faf96d0ca071f68adc28c781226896d;hb=3483c51f62640c83d35a0b4c4636a5939f2c3898;hp=23469476e264fd8bacdc56682dcf2e23c5a84c2b;hpb=1a02ebcc612e9a9c0d87e02295c7258de3a70ccc;p=qmk_firmware.git

diff --git a/tmk_core/common/mousekey.c b/tmk_core/common/mousekey.c
index 23469476e..bb08576b9 100644
--- a/tmk_core/common/mousekey.c
+++ b/tmk_core/common/mousekey.c
@@ -23,13 +23,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "debug.h"
 #include "mousekey.h"
 
+inline int8_t times_inv_sqrt2(int8_t x) {
+  // 181/256 is pretty close to 1/sqrt(2)
+  // 0.70703125                 0.707106781
+  // 1 too small for x=99 and x=198
+  // This ends up being a mult and discard lower 8 bits
+  return (x * 181) >> 8;
+}
 
-
-static report_mouse_t mouse_report = {};
-static uint8_t mousekey_repeat =  0;
+static report_mouse_t mouse_report = {0};
+static void mousekey_debug(void);
 static uint8_t mousekey_accel = 0;
+static uint8_t mousekey_repeat =  0;
+static uint16_t last_timer = 0;
+
+
+
+#ifndef MK_3_SPEED
 
-static void mousekey_debug(void);
 
 
 /*
@@ -52,145 +63,263 @@ uint8_t mk_time_to_max = MOUSEKEY_TIME_TO_MAX;
 uint8_t mk_wheel_max_speed = MOUSEKEY_WHEEL_MAX_SPEED;
 uint8_t mk_wheel_time_to_max = MOUSEKEY_WHEEL_TIME_TO_MAX;
 
+static uint8_t move_unit(void) {
+  uint16_t unit;
+  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;
+  }
+  return (unit > MOUSEKEY_MOVE_MAX ? MOUSEKEY_MOVE_MAX : (unit == 0 ? 1 : unit));
+}
 
-static uint16_t last_timer = 0;
+static uint8_t wheel_unit(void) {
+  uint16_t unit;
+  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_wheel_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;
+  }
+  return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : (unit == 0 ? 1 : unit));
+}
 
+void mousekey_task(void) {
+  if (timer_elapsed(last_timer) < (mousekey_repeat ? mk_interval : mk_delay*10)) {
+    return;
+  }
+  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 (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;
+  /* diagonal move [1/sqrt(2)] */
+  if (mouse_report.x && mouse_report.y) {
+    mouse_report.x = times_inv_sqrt2(mouse_report.x);
+    if (mouse_report.x == 0) { mouse_report.x = 1; }
+    mouse_report.y = times_inv_sqrt2(mouse_report.y);
+    if (mouse_report.y == 0) { mouse_report.y = 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();
+}
 
-static uint8_t move_unit(void)
-{
-    uint16_t unit;
-    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;
-    }
-    return (unit > MOUSEKEY_MOVE_MAX ? MOUSEKEY_MOVE_MAX : (unit == 0 ? 1 : unit));
+void mousekey_on(uint8_t code) {
+  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);
 }
 
-static uint8_t wheel_unit(void)
-{
-    uint16_t unit;
-    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_wheel_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;
-    }
-    return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : (unit == 0 ? 1 : unit));
+void mousekey_off(uint8_t code) {
+  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;
+  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;
 }
 
-void mousekey_task(void)
-{
-    if (timer_elapsed(last_timer) < (mousekey_repeat ? mk_interval : mk_delay*10))
-        return;
 
-    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++;
 
+#else  /* #ifndef MK_3_SPEED */
 
-    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;
 
-    /* diagonal move [1/sqrt(2) = 0.7] */
-    if (mouse_report.x && mouse_report.y) {
-        mouse_report.x *= 0.7;
-        mouse_report.y *= 0.7;
-    }
 
-    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;
+enum {
+  mkspd_unmod,
+  mkspd_0,
+  mkspd_1,
+  mkspd_2,
+  mkspd_COUNT
+};
+#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_UNMOD, MK_C_OFFSET_0, MK_C_OFFSET_1, MK_C_OFFSET_2
+};
+uint16_t c_intervals[mkspd_COUNT] = {
+  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_UNMOD, MK_W_OFFSET_0, MK_W_OFFSET_1, MK_W_OFFSET_2
+};
+uint16_t w_intervals[mkspd_COUNT] = {
+  MK_W_INTERVAL_UNMOD, MK_W_INTERVAL_0, MK_W_INTERVAL_1, MK_W_INTERVAL_2
+};
 
-    mousekey_send();
+
+void mousekey_task(void) {
+  // report cursor and scroll movement independently
+  report_mouse_t const tmpmr = mouse_report;
+  if ((mouse_report.x  ||  mouse_report.y)  &&  timer_elapsed(last_timer_c) > c_intervals[mk_speed]) {
+  mouse_report.h = 0;
+  mouse_report.v = 0;
+  mousekey_send();
+  last_timer_c = last_timer;
+  mouse_report = tmpmr;
+  }
+  if ((mouse_report.h  ||  mouse_report.v)  &&  timer_elapsed(last_timer_w) > w_intervals[mk_speed]) {
+  mouse_report.x = 0;
+  mouse_report.y = 0;
+  mousekey_send();
+  last_timer_w = last_timer;
+  mouse_report = tmpmr;
+  }
 }
 
-void mousekey_on(uint8_t code)
-{
-    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 adjust_speed(void) {
+  uint16_t const c_offset = c_offsets[mk_speed];
+  uint16_t const w_offset = w_offsets[mk_speed];
+  if (mouse_report.x > 0) mouse_report.x = c_offset;
+  if (mouse_report.x < 0) mouse_report.x = c_offset * -1;
+  if (mouse_report.y > 0) mouse_report.y = c_offset;
+  if (mouse_report.y < 0) mouse_report.y = c_offset * -1;
+  if (mouse_report.h > 0) mouse_report.h = w_offset;
+  if (mouse_report.h < 0) mouse_report.h = w_offset * -1;
+  if (mouse_report.v > 0) mouse_report.v = w_offset;
+  if (mouse_report.v < 0) mouse_report.v = w_offset * -1;
+  // adjust for diagonals
+  if (mouse_report.x && mouse_report.y) {
+  mouse_report.x = times_inv_sqrt2(mouse_report.x);
+  if (mouse_report.x == 0) { mouse_report.x = 1; }
+  mouse_report.y = times_inv_sqrt2(mouse_report.y);
+  if (mouse_report.y == 0) { mouse_report.y = 1; }
+  }
+  if (mouse_report.h && mouse_report.v) {
+  mouse_report.h = times_inv_sqrt2(mouse_report.h);
+  mouse_report.v = times_inv_sqrt2(mouse_report.v);
+  }
 }
 
-void mousekey_off(uint8_t code)
-{
-    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;
-    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;
+void mousekey_on(uint8_t code) {
+  uint16_t const c_offset = c_offsets[mk_speed];
+  uint16_t const w_offset = w_offsets[mk_speed];
+  uint8_t const old_speed = mk_speed;
+  if      (code == KC_MS_UP)       mouse_report.y = c_offset * -1;
+  else if (code == KC_MS_DOWN)     mouse_report.y = c_offset;
+  else if (code == KC_MS_LEFT)     mouse_report.x = c_offset * -1;
+  else if (code == KC_MS_RIGHT)    mouse_report.x = c_offset;
+  else if (code == KC_MS_WH_UP)    mouse_report.v = w_offset;
+  else if (code == KC_MS_WH_DOWN)  mouse_report.v = w_offset * -1;
+  else if (code == KC_MS_WH_LEFT)  mouse_report.h = w_offset * -1;
+  else if (code == KC_MS_WH_RIGHT) mouse_report.h = w_offset;
+  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)   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();
 }
 
-void mousekey_send(void)
-{
-    mousekey_debug();
-    host_mouse_send(&mouse_report);
-    last_timer = timer_read();
+void mousekey_off(uint8_t code) {
+#ifdef MK_MOMENTARY_ACCEL
+  uint8_t const old_speed = mk_speed;
+#endif
+  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;
+#ifdef MK_MOMENTARY_ACCEL
+  else if (code == KC_MS_ACCEL0) mk_speed = mkspd_DEFAULT;
+  else if (code == KC_MS_ACCEL1) mk_speed = mkspd_DEFAULT;
+  else if (code == KC_MS_ACCEL2) mk_speed = mkspd_DEFAULT;
+  if (mk_speed != old_speed) adjust_speed();
+#endif
 }
 
-void mousekey_clear(void)
-{
-    mouse_report = (report_mouse_t){};
-    mousekey_repeat = 0;
-    mousekey_accel = 0;
+
+
+
+#endif /* #ifndef MK_3_SPEED */
+
+
+
+
+void mousekey_send(void) {
+  mousekey_debug();
+  host_mouse_send(&mouse_report);
+  last_timer = timer_read();
+}
+
+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/acl): [");
-    phex(mouse_report.buttons); print("|");
-    print_decs(mouse_report.x); print(" ");
-    print_decs(mouse_report.y); print(" ");
-    print_decs(mouse_report.v); print(" ");
-    print_decs(mouse_report.h); print("](");
-    print_dec(mousekey_repeat); print("/");
-    print_dec(mousekey_accel); print(")\n");
+static void mousekey_debug(void) {
+  if (!debug_mouse) return;
+  print("mousekey [btn|x y v h](rep/acl): [");
+  phex(mouse_report.buttons); print("|");
+  print_decs(mouse_report.x); print(" ");
+  print_decs(mouse_report.y); print(" ");
+  print_decs(mouse_report.v); print(" ");
+  print_decs(mouse_report.h); print("](");
+  print_dec(mousekey_repeat); print("/");
+  print_dec(mousekey_accel); print(")\n");
 }