From 4050a354f7fb5855d2e42ee4bb720bdc2db60951 Mon Sep 17 00:00:00 2001
From: Matt9150 <matthewrkruger@gmail.com>
Date: Fri, 23 Jan 2026 20:19:21 -0600
Subject: [PATCH] Update TelopV3 and Targeting for merge conflicts.

---
 .../java/org/firstinspires/ftc/teamcode/teleop/TeleopV3.java  | 2 +-
 .../java/org/firstinspires/ftc/teamcode/utils/Targeting.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV3.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV3.java
index bc81e2f..df2fc6d 100644
--- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV3.java
+++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV3.java
@@ -120,7 +120,7 @@ public class TeleopV3 extends LinearOpMode {
     private double transferStamp = 0.0;
     private int tickerA = 1;
     private boolean transferIn = false;
-    boolean turretInterpolate = true;
+    boolean turretInterpolate = false;
 
     public static double velPrediction(double distance) {
         if (distance < 30) {
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Targeting.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Targeting.java
index d802ba2..d9850a5 100644
--- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Targeting.java
+++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Targeting.java
@@ -97,8 +97,8 @@ public class Targeting {
         robotInchesY = rotatedY * unitConversionFactor;
 
         // Find approximate location in the grid
-        robotGridX = Math.abs(Math.floorDiv((int) robotInchesX, tileSize) + 1);
-        robotGridY = Math.abs(Math.floorDiv((int) robotInchesY, tileSize));
+        int gridX = Math.abs(Math.floorDiv((int) robotInchesX, tileSize) + 1);
+        int gridY = Math.abs(Math.floorDiv((int) robotInchesY, tileSize));
 
         //clamp
         robotGridX = Math.max(0, Math.min(gridX, KNOWNTARGETING[0].length - 1));