Skip to content

Treat ToTouch state as an active contact #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
emmanuelyoussefyoussef wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −2
Draft

Treat ToTouch state as an active contact #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion AmtPtpDeviceUsbUm/InputInterrupt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,10 @@ AmtPtpServiceTouchInputInterruptType5(
// 0x4 = Contact/Valid
// I've gotten 0x6 if I press on the trackpad and then keep my finger close
// Note: These values come from my MBP9,2. These also are valid on my MT2
PtpReport.Contacts[i].TipSwitch = (f->State & 0x4) && (DeviceContext->IgnoreNearFingers == FALSE ? TRUE : !(f->State & 0x2));
// State 0x3 is the transition into touch (ToTouch), so it must already be
// reported as an active contact. Otherwise a click in that frame may be
// classified by Windows as a one-finger left click.
PtpReport.Contacts[i].TipSwitch = (f->State == 0x3) || ((f->State & 0x4) && (DeviceContext->IgnoreNearFingers == FALSE ? TRUE : !(f->State & 0x2)));

// The Microsoft spec says reject any input larger than 25mm. This is not ideal
// for Magic Trackpad 2 - so we raised the threshold a bit higher.
Expand Down
5 changes: 4 additions & 1 deletion AmtPtpHidFilter/Input.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,10 @@ PtpFilterInputParseMT2Report(
// 0x4 = Contact/Valid
// I've gotten 0x6 if I press on the trackpad and then keep my finger close
// Note: These values come from my MBP9,2. These also are valid on my MT2
ptpOutputReport.Contacts[i].TipSwitch = (f->State & 0x4) && (driverContext->IgnoreNearFingers == FALSE ? TRUE : !(f->State & 0x2));
// State 0x3 is the transition into touch (ToTouch), so it must already be
// reported as an active contact. Otherwise a click in that frame may be
// classified by Windows as a one-finger left click.
ptpOutputReport.Contacts[i].TipSwitch = (f->State == 0x3) || ((f->State & 0x4) && (driverContext->IgnoreNearFingers == FALSE ? TRUE : !(f->State & 0x2)));

// The Microsoft spec says reject any input larger than 25mm. This is not ideal
// for Magic Trackpad 2 - so we raised the threshold a bit higher.
Expand Down