Skip to content

Commit ea8da73

Browse files
committed
feeding locaiton and amp speed
1 parent 7674857 commit ea8da73

4 files changed

Lines changed: 12 additions & 12 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 = 350;
9-
public static final String GIT_SHA = "d3a4b77fb70a2d760a10eb947609fad05b79f577";
10-
public static final String GIT_DATE = "2024-09-06 09:19:32 EDT";
8+
public static final int GIT_REVISION = 351;
9+
public static final String GIT_SHA = "7674857210fa4b588e1b24bd87aff4ff0b492160";
10+
public static final String GIT_DATE = "2024-09-08 09:58:56 EDT";
1111
public static final String GIT_BRANCH = "pre-goonettes";
12-
public static final String BUILD_DATE = "2024-09-08 07:29:40 EDT";
13-
public static final long BUILD_UNIX_TIME = 1725794980725L;
12+
public static final String BUILD_DATE = "2024-09-08 14:15:58 EDT";
13+
public static final long BUILD_UNIX_TIME = 1725819358226L;
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
@@ -415,7 +415,7 @@ public RobotContainer() {
415415
.andThen(
416416
new InstantCommand(() -> intake.stopRollers())
417417
.andThen(new InstantCommand(() -> shooter.stopFeeders())))
418-
.withTimeout(1.5));
418+
.withTimeout(1.7));
419419

420420
NamedCommands.registerCommand("C5", new InstantCommand(() -> drive.setNote(NOTE_POSITIONS.C5)));
421421
NamedCommands.registerCommand("C4", new InstantCommand(() -> drive.setNote(NOTE_POSITIONS.C4)));

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

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

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,17 @@ public void execute() {
8585
"trans2",
8686
new Translation2d(
8787
FieldConstants.fieldLength - drive.getPose().getX(),
88-
(FieldConstants.fieldWidth - 2.5) - drive.getPose().getY()));
88+
(FieldConstants.fieldWidth - 1.5) - drive.getPose().getY()));
8989
targetAngle =
9090
new Rotation2d(
9191
FieldConstants.fieldLength - drive.getPose().getX(),
92-
(FieldConstants.fieldWidth - 2.5) - drive.getPose().getY())
92+
(FieldConstants.fieldWidth - 1.5) - drive.getPose().getY())
9393
.getDegrees()
9494
+ 180;
9595
pid.setSetpoint(
9696
new Rotation2d(
9797
FieldConstants.fieldLength - drive.getPose().getX(),
98-
(FieldConstants.fieldWidth - 2.5) - drive.getPose().getY())
98+
(FieldConstants.fieldWidth - 1.5) - drive.getPose().getY())
9999
.getDegrees()
100100
+ 180);
101101
// pid.setSetpoint(
@@ -106,15 +106,15 @@ public void execute() {
106106
// + 180);
107107
} else {
108108
// Logger.recordOutput("trans2", new Translation2d(0, FieldConstants.fieldWidth));
109-
targetAngle = new Translation2d(0, (FieldConstants.fieldWidth - 2.5)).getAngle().getDegrees();
109+
targetAngle = new Translation2d(0, (FieldConstants.fieldWidth - 1.5)).getAngle().getDegrees();
110110
// new Rotation2d(0, FieldConstants.fieldWidth).getDegrees() + 180;
111111
// pid.setSetpoint(
112112
// new Rotation2d(0, FieldConstants.fieldWidth).getDegrees()
113113
// + 180);
114114
pid.setSetpoint(
115115
new Rotation2d(
116116
-drive.getPose().getX(),
117-
(FieldConstants.fieldWidth - 2.5) - drive.getPose().getY())
117+
(FieldConstants.fieldWidth - 1.5) - drive.getPose().getY())
118118
.getDegrees()
119119
+ 180);
120120
// pid.setSetpoint(

0 commit comments

Comments
 (0)