melissa/zsa_qmk_firmware
1
0
Fork 0
mirror of https://github.com/zsa/qmk_firmware.git synced 2026-01-11 08:02:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(inertia): regression preventing inertia to trigger consistantly

Browse Source
This commit is contained in:
Florian Didron
2025-12-04 15:33:20 +07:00
parent fc2577b182
commit 85598cd8d2
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/sensors/navigator_trackpad.c
View File

@@ -519,15 +519,27 @@ report_mouse_t navigator_trackpad_get_report(report_mouse_t mouse_report) {
if (fingers >= 2 && gesture.state != TP_SCROLLING) {
gesture.state = TP_SCROLLING;
} else if (fingers < 2 && gesture.state == TP_SCROLLING) {
# ifdef NAVIGATOR_TRACKPAD_SCROLL_INERTIA_ENABLE
// Check if we should trigger inertia before transitioning
// This handles the case where fingers lift quickly (2->1->0)
int16_t abs_vx = scroll_inertia.smooth_vx < 0 ? -scroll_inertia.smooth_vx : scroll_inertia.smooth_vx;
int16_t abs_vy = scroll_inertia.smooth_vy < 0 ? -scroll_inertia.smooth_vy : scroll_inertia.smooth_vy;
if (abs_vx >= (NAVIGATOR_TRACKPAD_SCROLL_INERTIA_TRIGGER * 256) ||
abs_vy >= (NAVIGATOR_TRACKPAD_SCROLL_INERTIA_TRIGGER * 256)) {
// Store inertia values before transitioning
scroll_inertia.vx = scroll_inertia.smooth_vx;
scroll_inertia.vy = scroll_inertia.smooth_vy;
scroll_inertia.timer = timer_read();
scroll_inertia.active = true;
} else {
scroll_inertia.active = false;
}
# endif
// Transition from scrolling back to moving when finger is lifted
gesture.state = TP_MOVING;
// Reset position tracking to prevent jump from stale scroll position
gesture.prev_x = local_report.fingers[0].x;
gesture.prev_y = local_report.fingers[0].y;
# ifdef NAVIGATOR_TRACKPAD_SCROLL_INERTIA_ENABLE
// Stop scroll inertia when transitioning to cursor mode
scroll_inertia.active = false;
# endif
}
# endif

2
drivers/sensors/navigator_trackpad.h
View File

@@ -131,7 +131,7 @@ Configurable values (all optional):
#define NAVIGATOR_TRACKPAD_SCROLL_INERTIA_INTERVAL 5 // Glide report interval in ms
#endif
#ifndef NAVIGATOR_TRACKPAD_SCROLL_INERTIA_TRIGGER
#define NAVIGATOR_TRACKPAD_SCROLL_INERTIA_TRIGGER 1 // Min velocity to trigger glide
#define NAVIGATOR_TRACKPAD_SCROLL_INERTIA_TRIGGER 0 // Min velocity to trigger glide
#endif
typedef struct {