Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
2daad28ab1
1 changed files with 6 additions and 2 deletions
|
@ -74,6 +74,10 @@ uint8_t mk_wheel_interval = MOUSEKEY_WHEEL_INTERVAL;
|
||||||
uint8_t mk_wheel_max_speed = MOUSEKEY_WHEEL_MAX_SPEED;
|
uint8_t mk_wheel_max_speed = MOUSEKEY_WHEEL_MAX_SPEED;
|
||||||
uint8_t mk_wheel_time_to_max = MOUSEKEY_WHEEL_TIME_TO_MAX;
|
uint8_t mk_wheel_time_to_max = MOUSEKEY_WHEEL_TIME_TO_MAX;
|
||||||
|
|
||||||
|
bool should_mousekey_report_send(report_mouse_t *mouse_report) {
|
||||||
|
return mouse_report->x || mouse_report->y || mouse_report->v || mouse_report->h;
|
||||||
|
}
|
||||||
|
|
||||||
# ifndef MK_COMBINED
|
# ifndef MK_COMBINED
|
||||||
# ifndef MK_KINETIC_SPEED
|
# ifndef MK_KINETIC_SPEED
|
||||||
|
|
||||||
|
@ -257,7 +261,7 @@ void mousekey_task(void) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (has_mouse_report_changed(&mouse_report, &tmpmr)) {
|
if (has_mouse_report_changed(&mouse_report, &tmpmr) || should_mousekey_report_send(&mouse_report)) {
|
||||||
mousekey_send();
|
mousekey_send();
|
||||||
}
|
}
|
||||||
memcpy(&mouse_report, &tmpmr, sizeof(tmpmr));
|
memcpy(&mouse_report, &tmpmr, sizeof(tmpmr));
|
||||||
|
@ -363,7 +367,7 @@ void mousekey_task(void) {
|
||||||
mouse_report.h = tmpmr.h;
|
mouse_report.h = tmpmr.h;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (has_mouse_report_changed(&mouse_report, &tmpmr)) {
|
if (has_mouse_report_changed(&mouse_report, &tmpmr) || should_mousekey_report_send(&mouse_report)) {
|
||||||
mousekey_send();
|
mousekey_send();
|
||||||
}
|
}
|
||||||
memcpy(&mouse_report, &tmpmr, sizeof(tmpmr));
|
memcpy(&mouse_report, &tmpmr, sizeof(tmpmr));
|
||||||
|
|
Loading…
Reference in a new issue