~ruther/qmk_firmware

f7eb7926e80e34565c615e517a4dbb636dc82797 — QMK Bot 3 years ago 0151f4c + 74bec84
Merge remote-tracking branch 'origin/master' into develop
2 files changed, 5 insertions(+), 4 deletions(-)

M quantum/mousekey.c
M quantum/mousekey.h
M quantum/mousekey.c => quantum/mousekey.c +4 -4
@@ 74,10 74,6 @@ uint8_t mk_wheel_interval = MOUSEKEY_WHEEL_INTERVAL;
uint8_t mk_wheel_max_speed   = MOUSEKEY_WHEEL_MAX_SPEED;
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_KINETIC_SPEED



@@ 504,3 500,7 @@ static void mousekey_debug(void) {
report_mouse_t mousekey_get_report(void) {
    return mouse_report;
}

bool should_mousekey_report_send(report_mouse_t *mouse_report) {
    return mouse_report->x || mouse_report->y || mouse_report->v || mouse_report->h;
}

M quantum/mousekey.h => quantum/mousekey.h +1 -0
@@ 174,6 174,7 @@ void           mousekey_off(uint8_t code);
void           mousekey_clear(void);
void           mousekey_send(void);
report_mouse_t mousekey_get_report(void);
bool           should_mousekey_report_send(report_mouse_t *mouse_report);

#ifdef __cplusplus
}