26855 mill valley stable

TechDudie · TechDudie · commit 154c1af9bab4 · 2025-11-15T08:54:21.000-06:00
diff --git a/TeamCode2028/src/main/java/com/technodot/ftc/twentyfive/common/Controls.java b/TeamCode2028/src/main/java/com/technodot/ftc/twentyfive/common/Controls.java
@@ -36,7 +36,7 @@ public static boolean drivePrecise(Gamepad gamepad) {
 
     public static boolean driveAim(Gamepad gamepad) {
 //        return gamepad != null && gamepad.x;
-        return gamepad != null && (gamepad.a || gamepad.y); // aim will activate at same time as extake shoot
+        return gamepad != null && (gamepad.x || gamepad.a || gamepad.y); // aim will activate at same time as extake shoot
     }
 
     public static boolean intakeIn(Gamepad gamepad) {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public static boolean drivePrecise(Gamepad gamepad) {`
`36`	`36`
`37`	`37`	`public static boolean driveAim(Gamepad gamepad) {`
`38`	`38`	`// return gamepad != null && gamepad.x;`
`39`		`- return gamepad != null && (gamepad.a \|\| gamepad.y); // aim will activate at same time as extake shoot`
	`39`	`+ return gamepad != null && (gamepad.x \|\| gamepad.a \|\| gamepad.y); // aim will activate at same time as extake shoot`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public static boolean intakeIn(Gamepad gamepad) {`