Skip to content

Commit 36673cc

Browse files
committed
changes to amp align angle and amp speeds
1 parent a1e239c commit 36673cc

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

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

Lines changed: 6 additions & 6 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 = 352;
9-
public static final String GIT_SHA = "ea8da7366576569467cfc6aef5ac6051f7bc9530";
10-
public static final String GIT_DATE = "2024-09-08 16:03:17 EDT";
11-
public static final String GIT_BRANCH = "pre-goonettes";
12-
public static final String BUILD_DATE = "2024-09-08 16:11:08 EDT";
13-
public static final long BUILD_UNIX_TIME = 1725826268973L;
8+
public static final int GIT_REVISION = 355;
9+
public static final String GIT_SHA = "a1e239c47e0c0a8e0dcd569d1d9ff6ccb8abaef5";
10+
public static final String GIT_DATE = "2024-10-06 23:26:26 EDT";
11+
public static final String GIT_BRANCH = "pre-bloomfield";
12+
public static final String BUILD_DATE = "2024-10-16 18:59:50 EDT";
13+
public static final long BUILD_UNIX_TIME = 1729119590187L;
1414
public static final int DIRTY = 1;
1515

1616
private BuildConstants() {}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ public static Command joystickDrive(
204204
// if (DriverStation.getAlliance().get() == Alliance.Blue) {
205205
// targeRotation2d = Rotation2d.fromDegrees(-60); //-60 for blue source
206206
// } else {
207-
// targeRotation2d = Rotation2d.fromDegrees(240); //240 for red source
207+
// targeRotation2d = Rotation2d.fromDegrees(240); //240 for red sjkource
208208
// }
209-
targeRotation2d = Rotation2d.fromDegrees(-90); // TODO 90 or -90 for amp, need to test
209+
targeRotation2d = Rotation2d.fromDegrees(-88); // TODO 90 or -90 for amp, need to test
210210
rotationPID.setSetpoint(targeRotation2d.getDegrees());
211211

212212
wantedRotationVelocity =

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(350, 550), shooter),
25+
new InstantCommand(() -> shooter.setFlywheelRPMs(300, 650), shooter),
2626
new SetPivotTarget(Constants.PivotConstants.AMP_SETPOINT_DEG, pivot)),
2727
// new SetAmpBarTarget(195, 0, elevator),
2828
new SetElevatorTarget(6, 1, elevator));

0 commit comments

Comments
 (0)