Skip to content

Commit e9fafa3

Browse files
committed
decrease auto align timeout
1 parent cbd3125 commit e9fafa3

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

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

+5-5
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 = 341;
9-
public static final String GIT_SHA = "52110d32d74cddd2d6fb389056bfb52d6b0a8d3e";
10-
public static final String GIT_DATE = "2024-08-16 15:56:41 EDT";
8+
public static final int GIT_REVISION = 343;
9+
public static final String GIT_SHA = "cbd3125922c579935803217b3b80ae24f510c99a";
10+
public static final String GIT_DATE = "2024-08-17 11:17:26 EDT";
1111
public static final String GIT_BRANCH = "marc";
12-
public static final String BUILD_DATE = "2024-08-17 08:58:04 EDT";
13-
public static final long BUILD_UNIX_TIME = 1723899484988L;
12+
public static final String BUILD_DATE = "2024-08-17 16:11:47 EDT";
13+
public static final long BUILD_UNIX_TIME = 1723925507047L;
1414
public static final int DIRTY = 1;
1515

1616
private BuildConstants() {}

src/main/java/frc/robot/Constants.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static class ModuleConstants {
6565
public static final double DRIVE_GEAR_RATIO = 6.12;
6666
public static final double TURN_GEAR_RATIO = 150.0 / 7.0;
6767

68-
public static final double DRIVE_STATOR_CURRENT_LIMIT = 90.0;
68+
public static final double DRIVE_STATOR_CURRENT_LIMIT = 75.0;
6969
public static final boolean DRIVE_STATOR_CURRENT_LIMIT_ENABLED = true;
7070
public static final double DRIVE_SUPPLY_CURRENT_LIMIT = 42.0;
7171
public static final boolean DRIVE_SUPPLY_CURRENT_LIMIT_ENABLED = true;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ public RobotContainer() {
481481
.andThen(
482482
new InstantCommand(() -> intake.stopRollers())
483483
.andThen(new InstantCommand(() -> shooter.stopFeeders())))
484-
.withTimeout(2.5));
484+
.withTimeout(1.5));
485485

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private double calculatePivotAngleDeg(double distanceToSpeakerMeter) {
158158
return 34;
159159
}
160160
Logger.recordOutput("pivot target auto", pivotSetpointDeg);
161-
return pivotSetpointDeg + 2.26;
161+
return pivotSetpointDeg + 1.26;
162162
}
163163

164164
private double calculateDistanceToSpeaker() {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void execute() {
104104
// }
105105
}
106106

107-
public void angleShooter() {
107+
public void angleShooter() {
108108
if (DriverStation.getAlliance().isPresent()) this.alliance = DriverStation.getAlliance().get();
109109
// Logger.recordOutput("distance to speak", Units.metersToFeet(distanceToSpeakerMeter));
110110
distanceToSpeakerMeter = calculateDistanceToSpeaker();

src/main/java/frc/robot/subsystems/Elevator/Elevator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public Elevator(ElevatorIO elevator, AmpBarIO ampBar) {
115115
extenderCurrent = extenderProfile.calculate(0, extenderCurrent, extenderGoal);
116116

117117
maxVelocityDegPerSec = 1200;
118-
maxAccelerationDegPerSecSquared = 800;
118+
maxAccelerationDegPerSecSquared = 1550;
119119

120120
barConstraints =
121121
new TrapezoidProfile.Constraints(maxVelocityDegPerSec, maxAccelerationDegPerSecSquared);

0 commit comments

Comments
 (0)