PS4 touchpad boolean fix (#1186)

arntsonl · web-flow · commit 7f7647c489c7 · 2024-10-04T12:45:09.000-04:00
diff --git a/src/drivers/ps4/PS4Driver.cpp b/src/drivers/ps4/PS4Driver.cpp
@@ -245,13 +245,13 @@ void PS4Driver::process(Gamepad * gamepad) {
     } else if (pointOneTouched && touchpadData.p1.unpressed) {
         pointOneTouched = false;
     }
-    if (!pointTwoTouched && touchpadData.p2.unpressed) {
+    if (!pointTwoTouched && !touchpadData.p2.unpressed) {
         touchCounter = (touchCounter < PS4_TP_MAX_COUNT ? touchCounter+1 : 0);
     
         touchpadData.p2.counter = touchCounter;
     
         pointTwoTouched = true;
-    } else if (pointTwoTouched && touchpadData.p1.unpressed) {
+    } else if (pointTwoTouched && touchpadData.p2.unpressed) {
         pointTwoTouched = false;
     }
     ps4Report.touchpad_data = touchpadData;

Original file line number	Diff line number	Diff line change
`@@ -245,13 +245,13 @@ void PS4Driver::process(Gamepad * gamepad) {`
`245`	`245`	`} else if (pointOneTouched && touchpadData.p1.unpressed) {`
`246`	`246`	`pointOneTouched = false;`
`247`	`247`	`}`
`248`		`- if (!pointTwoTouched && touchpadData.p2.unpressed) {`
	`248`	`+ if (!pointTwoTouched && !touchpadData.p2.unpressed) {`
`249`	`249`	`touchCounter = (touchCounter < PS4_TP_MAX_COUNT ? touchCounter+1 : 0);`
`250`	`250`
`251`	`251`	`touchpadData.p2.counter = touchCounter;`
`252`	`252`
`253`	`253`	`pointTwoTouched = true;`
`254`		`- } else if (pointTwoTouched && touchpadData.p1.unpressed) {`
	`254`	`+ } else if (pointTwoTouched && touchpadData.p2.unpressed) {`
`255`	`255`	`pointTwoTouched = false;`
`256`	`256`	`}`
`257`	`257`	`ps4Report.touchpad_data = touchpadData;`