Skip to content

Commit 8467354

Browse files
committed
testing in sim
1 parent 18a691d commit 8467354

2 files changed

Lines changed: 14 additions & 12 deletions

File tree

src/main/java/frc/robot/BuildConstants.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
/** Automatically generated file containing build version information. */
44
public final class BuildConstants {
55
public static final String MAVEN_GROUP = "";
6-
public static final String MAVEN_NAME = "2024 Robot Code";
6+
public static final String MAVEN_NAME = "2024RobotCode";
77
public static final String VERSION = "unspecified";
8-
public static final int GIT_REVISION = 328;
9-
public static final String GIT_SHA = "2b21d6b98cde049db5aee43e214983d0f90a2076";
10-
public static final String GIT_DATE = "2024-08-14 20:38:25 EDT";
11-
public static final String GIT_BRANCH = "pre-marc";
12-
public static final String BUILD_DATE = "2024-08-14 20:39:57 EDT";
13-
public static final long BUILD_UNIX_TIME = 1723682397590L;
8+
public static final int GIT_REVISION = 339;
9+
public static final String GIT_SHA = "18a691d2f6d19e87115ebcd3031c38f6abed2138";
10+
public static final String GIT_DATE = "2024-08-16 15:05:13 EDT";
11+
public static final String GIT_BRANCH = "marc";
12+
public static final String BUILD_DATE = "2024-08-16 15:06:33 EDT";
13+
public static final long BUILD_UNIX_TIME = 1723835193555L;
1414
public static final int DIRTY = 1;
1515

1616
private BuildConstants() {}

src/main/java/frc/robot/subsystems/drive/Drive.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
import frc.robot.util.LimelightHelpers.PoseEstimate;
6060
import frc.robot.util.LimelightHelpers.RawFiducial;
6161
import frc.robot.util.LocalADStarAK;
62-
6362
import java.util.HashMap;
6463
import java.util.List;
6564
import java.util.Optional;
@@ -735,25 +734,28 @@ public Translation2d getTargetNoteLocation() {
735734
Translation2d fieldCoords = noteLocations.get(getNote());
736735
boolean useVisionNoteCoords =
737736
getCachedNoteLocation().getDistance(fieldCoords) < 1.25
738-
&& getCachedNoteLocation() != null && getCachedNoteTime() != -1 && noteImageIsNew();
737+
&& getCachedNoteLocation() != null
738+
&& getCachedNoteTime() != -1
739+
&& noteImageIsNew();
739740

740741
Logger.recordOutput(
741-
"cached note distance to field ", getCachedNoteLocation().getDistance(fieldCoords));
742+
"cached note distance to field ", getCachedNoteLocation().getDistance(fieldCoords));
742743
Logger.recordOutput("use vision note coords", useVisionNoteCoords);
743744

744745
if (useVisionNoteCoords) return visionCoords;
745746
return fieldCoords;
746747
}
747748

748-
public PathPlannerPath generateTrajectoryToNote(
749+
public PathPlannerPath generateTrajectoryToNote(
749750
Translation2d target,
750751
double maxVelMetersPerSec,
751752
double maxAccelMetersPerSecSquared,
752753
double maxAngVelDegPerSec,
753754
double maxAngAccelDegPerSecSquared,
754755
double endVelMetersPerSec) {
755756
Rotation2d targetRotation =
756-
AllianceFlipUtil.apply(new Rotation2d(target.getX() - getPose().getX(), target.getY() - getPose().getY()));
757+
AllianceFlipUtil.apply(
758+
new Rotation2d(target.getX() - getPose().getX(), target.getY() - getPose().getY()));
757759

758760
Logger.recordOutput("Target Note Pose3d", new Pose3d(new Pose2d(target, new Rotation2d())));
759761
List<Translation2d> points =

0 commit comments

Comments
 (0)