From ea3ff7afb56735bd2af901e8870def0917b0e3e0 Mon Sep 17 00:00:00 2001 From: Tyler Wilcox Date: Mon, 23 Mar 2026 22:06:05 -0400 Subject: [PATCH] Maybe fix swerve odemetry --- lib/RoboLib | 2 +- .../commands/AutoShootCommandChassisTurret.java | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/RoboLib b/lib/RoboLib index ad53b44..8eb0a76 160000 --- a/lib/RoboLib +++ b/lib/RoboLib @@ -1 +1 @@ -Subproject commit ad53b44e2fb4c06b72ff2546b30e37446ac2fb8d +Subproject commit 8eb0a76b2646235f173cd524fbf7462256ab1696 diff --git a/src/main/java/frc/robot/commands/AutoShootCommandChassisTurret.java b/src/main/java/frc/robot/commands/AutoShootCommandChassisTurret.java index 220ce48..6ea77df 100644 --- a/src/main/java/frc/robot/commands/AutoShootCommandChassisTurret.java +++ b/src/main/java/frc/robot/commands/AutoShootCommandChassisTurret.java @@ -32,7 +32,7 @@ public class AutoShootCommandChassisTurret extends Command{ private int[] tagFilters; - private AprilTagFieldLayout filedTags = AprilTagFieldLayout.loadField(AprilTagFields.k2026RebuiltAndymark); + private AprilTagFieldLayout fieldTags = AprilTagFieldLayout.loadField(AprilTagFields.k2026RebuiltAndymark); private final double chassisRotateSpeed = Math.PI * 0.1; @@ -79,13 +79,11 @@ public class AutoShootCommandChassisTurret extends Command{ Logger.recordOutput("AutoAlignState", "Look for tag"); Pose3d botPose = driveSubsystem.getBotPose(); // Find closest target to us - List tagPoses = Arrays.stream(tagFilters).mapToObj(tagId -> filedTags.getTagPose(tagId).get()).toList(); - for(int i=0;i 0 ? chassisRotateSpeed : -chassisRotateSpeed); // May need to flip this - } + List tagPoses = Arrays.stream(tagFilters).mapToObj(tagId -> fieldTags.getTagPose(tagId).get()).toList(); + Pose3d closest = botPose.nearest(tagPoses); + Logger.recordOutput("AutoAlign-ClosestAprilTagPose", closest); + Transform3d delta = botPose.minus(closest); + driveSubsystem.rotateChassis(delta.getRotation().getAngle() > 0 ? chassisRotateSpeed : -chassisRotateSpeed); // May need to flip this } else // We have an april tag, center it to the camera frame {