From 6a8586748081b77bad88b8a200fe99fcc62468fa Mon Sep 17 00:00:00 2001 From: moo Date: Sat, 7 Mar 2026 23:56:59 -0800 Subject: [PATCH] changes --- .../java/frc/robot/commands/gpm/AutoShootCommand.java | 2 +- src/main/java/frc/robot/constants/FieldConstants.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/frc/robot/commands/gpm/AutoShootCommand.java b/src/main/java/frc/robot/commands/gpm/AutoShootCommand.java index ba23257..992cdd3 100644 --- a/src/main/java/frc/robot/commands/gpm/AutoShootCommand.java +++ b/src/main/java/frc/robot/commands/gpm/AutoShootCommand.java @@ -76,7 +76,7 @@ public class AutoShootCommand extends Command { FieldConstants.getHubTranslation().minus(new Translation3d(drivepose.getTranslation())), 8.0); // Random initial goalState to prevent it being null // Jerry Debug - System.out.println("The current goal state (including the exit vel):" + goalState); + // System.out.println("The current goal state (including the exit vel):" + goalState); addRequirements(turret); } diff --git a/src/main/java/frc/robot/constants/FieldConstants.java b/src/main/java/frc/robot/constants/FieldConstants.java index 9a91454..2c7bfa0 100644 --- a/src/main/java/frc/robot/constants/FieldConstants.java +++ b/src/main/java/frc/robot/constants/FieldConstants.java @@ -162,12 +162,12 @@ public class FieldConstants { || x > FIELD_LENGTH/2 + Units.inchesToMeters(120.0) && x < RED_ALLIANCE_LINE) { return FieldZone.TRENCH_BUMP; } - if(((y < FIELD_WIDTH - (48.75 / 2) && y > FIELD_WIDTH - (48.75 / 2))) && (x < 47.0 || x > FIELD_LENGTH - 47.0)) { - return FieldZone.UNDER_LADDER; - } - if(((y < FIELD_WIDTH - (46.75 / 2) && y > FIELD_WIDTH - (46.75 / 2))) && ((x > 207.42375 && x < 207.42375 + 36.0) || (x < FIELD_LENGTH - 207.42375 && x > FIELD_LENGTH - 207.42375 - 36.0))) { + if(((y < FIELD_WIDTH - ((48.75 / 2) + 0.158750) && y > FIELD_WIDTH - (48.75 / 2) - 0.736600)) && (x < 47.0 || x > FIELD_LENGTH - 47.0)) { return FieldZone.UNDER_LADDER; } + // if(((y < FIELD_WIDTH - (46.75 / 2) && y > FIELD_WIDTH - (46.75 / 2))) && ((x > 207.42375 && x < 207.42375 + 36.0) || (x < FIELD_LENGTH - 207.42375 && x > FIELD_LENGTH - 207.42375 - 36.0))) { + // return FieldZone.UNDER_LADDER; + // } if(x > FieldConstants.RED_ALLIANCE_LINE) { // inside red if (Robot.getAlliance() == Alliance.Red) { return FieldZone.ALLIANCE; -- 2.39.5