Merge branch 'rhaberkorn-serial-mouse'

[tmk_firmware.git] / common / mousekey.c

diff --git a/common/mousekey.c b/common/mousekey.c
index b8af3e59c7668a8611a66b4aeb2d7e7e695d9abb..017be94116f3792cf67561b884d7f3566f9e397f 100644 (file)
--- a/common/mousekey.c
+++ b/common/mousekey.c
@@ -26,6 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 
+static report_mouse_t mouse_report = {};
 static uint8_t mousekey_repeat =  0;
 static uint8_t mousekey_accel = 0;
 
@@ -86,7 +87,7 @@ static uint8_t wheel_unit(void)
         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) {
+    } 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;
@@ -187,10 +188,10 @@ static void mousekey_debug(void)
     if (!debug_mouse) return;
     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("/");
-    phex(mousekey_accel); print(")\n");
+    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");
 }