Skip to content

Commit a5b463e

Browse files
changed bindings and ratio
1 parent 595783a commit a5b463e

4 files changed

Lines changed: 22 additions & 8 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 = "2024 Robot Code";
77
public static final String VERSION = "unspecified";
8-
public static final int GIT_REVISION = 320;
9-
public static final String GIT_SHA = "2c89f93b696e8f38145ff3ece9139d637201b983";
10-
public static final String GIT_DATE = "2024-08-10 19:14:18 EDT";
11-
public static final String GIT_BRANCH = "amp-bar";
12-
public static final String BUILD_DATE = "2024-08-12 20:49:44 EDT";
13-
public static final long BUILD_UNIX_TIME = 1723510184499L;
8+
public static final int GIT_REVISION = 321;
9+
public static final String GIT_SHA = "595783aa307f432a03116af1c4f77599478ee51c";
10+
public static final String GIT_DATE = "2024-08-12 20:54:55 EDT";
11+
public static final String GIT_BRANCH = "amp-bar-reamp";
12+
public static final String BUILD_DATE = "2024-08-14 20:13:53 EDT";
13+
public static final long BUILD_UNIX_TIME = 1723680833471L;
1414
public static final int DIRTY = 1;
1515

1616
private BuildConstants() {}

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -911,11 +911,25 @@ private void manipControls() {
911911
new InstantCommand(() -> pivot.setShootState(SHOOT_STATE.AIMBOT))
912912
.andThen(
913913
new SequentialCommandGroup(
914+
new SetAmpBarTarget(5, 3, elevator),
914915
new InstantCommand(() -> shooter.turnOffFan()),
915916
new SetElevatorTarget(0, 0.5, elevator),
916917
new InstantCommand(() -> elevator.setConstraints(30, 85)),
917918
new InstantCommand(() -> shooter.stopFlywheels(), shooter),
918919
new SetPivotTarget(Constants.PivotConstants.STOW_SETPOINT_DEG, pivot))));
920+
// manipAButton.onTrue(
921+
// new InstantCommand(() -> pivot.setShootState(SHOOT_STATE.AMP))
922+
// .andThen(new ScoreAmp(elevator, pivot, shooter, drive)));
923+
924+
// manipAButton.onFalse(
925+
// new InstantCommand(() -> pivot.setShootState(SHOOT_STATE.AIMBOT))
926+
// .andThen(
927+
// new SequentialCommandGroup(
928+
// new InstantCommand(() -> shooter.turnOffFan()),
929+
// new SetElevatorTarget(0, 0.5, elevator),
930+
// new InstantCommand(() -> elevator.setConstraints(30, 85)),
931+
// new InstantCommand(() -> shooter.stopFlywheels(), shooter),
932+
// new SetPivotTarget(Constants.PivotConstants.STOW_SETPOINT_DEG, pivot))));
919933

920934
manipBButton.onTrue(
921935
new ParallelCommandGroup(

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(2400, 2400), shooter),
25+
new InstantCommand(() -> shooter.setFlywheelRPMs(500, 700), 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/subsystems/elevator/AmpBarIOSparkMAX.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class AmpBarIOSparkMAX implements AmpBarIO {
1313
private final CANSparkMax barMotor;
1414
private final SparkPIDController pid;
1515
private double barPositionSetpoint;
16-
private final double gearRatio = 5. / 1.;
16+
private final double gearRatio = 15. / 1.;
1717

1818
public AmpBarIOSparkMAX(int motorID) {
1919

0 commit comments

Comments
 (0)