Skip to content

Commit ba8fd3b

Browse files
committed
got rid of amp bar
1 parent 52110d3 commit ba8fd3b

4 files changed

Lines changed: 15 additions & 9 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ public final class BuildConstants {
55
public static final String MAVEN_GROUP = "";
66
public static final String MAVEN_NAME = "2024RobotCode";
77
public static final String VERSION = "unspecified";
8-
public static final int GIT_REVISION = 340;
9-
public static final String GIT_SHA = "8467354a722f04493be8bcf84f7096eb996dcebc";
10-
public static final String GIT_DATE = "2024-08-16 15:09:54 EDT";
8+
public static final int GIT_REVISION = 341;
9+
public static final String GIT_SHA = "52110d32d74cddd2d6fb389056bfb52d6b0a8d3e";
10+
public static final String GIT_DATE = "2024-08-16 15:56:41 EDT";
1111
public static final String GIT_BRANCH = "marc";
12-
public static final String BUILD_DATE = "2024-08-16 15:51:28 EDT";
13-
public static final long BUILD_UNIX_TIME = 1723837888747L;
12+
public static final String BUILD_DATE = "2024-08-17 08:58:04 EDT";
13+
public static final long BUILD_UNIX_TIME = 1723899484988L;
1414
public static final int DIRTY = 1;
1515

1616
private BuildConstants() {}

src/main/java/frc/robot/RobotContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ private void manipControls() {
921921
new InstantCommand(() -> pivot.setShootState(SHOOT_STATE.AIMBOT))
922922
.andThen(
923923
new SequentialCommandGroup(
924-
new SetAmpBarTarget(5, 3, elevator),
924+
// new SetAmpBarTarget(5, 3, elevator),
925925
new InstantCommand(() -> shooter.turnOffFan()),
926926
new SetElevatorTarget(0, 0.5, elevator),
927927
new InstantCommand(() -> elevator.setConstraints(30, 85)),

src/main/java/frc/robot/commands/ScoreAmp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public ScoreAmp(Elevator elevator, Pivot pivot, Shooter shooter, Drive drive) {
2424
new InstantCommand(() -> elevator.setConstraints(100, 640), elevator),
2525
new InstantCommand(() -> shooter.setFlywheelRPMs(500, 700), shooter),
2626
new SetPivotTarget(Constants.PivotConstants.AMP_SETPOINT_DEG, pivot)),
27-
new SetAmpBarTarget(195, 0, elevator),
27+
// new SetAmpBarTarget(195, 0, elevator),
2828
new SetElevatorTarget(6, 1, elevator));
2929

3030
// addCommands(

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -726,14 +726,20 @@ public Translation2d getTargetNoteLocation() {
726726

727727
Translation2d visionCoords = getCachedNoteLocation();
728728
Translation2d fieldCoords = AllianceFlipUtil.apply(noteLocations.get(getNote()));
729+
730+
Logger.recordOutput(
731+
"cached note distance to field ", getCachedNoteLocation().getDistance(fieldCoords));
732+
733+
Logger.recordOutput("note is new", noteImageIsNew());
734+
Logger.recordOutput("note is not null", getCachedNoteLocation() != null);
735+
Logger.recordOutput("note time aint -1", getCachedNoteTime());
736+
729737
boolean useVisionNoteCoords =
730738
getCachedNoteLocation().getDistance(fieldCoords) < 1.323
731739
&& getCachedNoteLocation() != null
732740
&& getCachedNoteTime() != -1
733741
&& noteImageIsNew();
734742

735-
Logger.recordOutput(
736-
"cached note distance to field ", getCachedNoteLocation().getDistance(fieldCoords));
737743
Logger.recordOutput("use vision note coords", useVisionNoteCoords);
738744

739745
if (useVisionNoteCoords) return visionCoords;

0 commit comments

Comments
 (0)