Skip to content

Commit 7674857

Browse files
committed
oincrease angle increase rpm feed
1 parent d3a4b77 commit 7674857

5 files changed

Lines changed: 9 additions & 10 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 = 349;
9-
public static final String GIT_SHA = "e06112e177790ef204ee1fe37177bf842824e43f";
10-
public static final String GIT_DATE = "2024-09-05 15:20:31 EDT";
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";
1111
public static final String GIT_BRANCH = "pre-goonettes";
12-
public static final String BUILD_DATE = "2024-09-06 04:55:48 EDT";
13-
public static final long BUILD_UNIX_TIME = 1725612948700L;
12+
public static final String BUILD_DATE = "2024-09-08 07:29:40 EDT";
13+
public static final long BUILD_UNIX_TIME = 1725794980725L;
1414
public static final int DIRTY = 1;
1515

1616
private BuildConstants() {}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ private double calculateShooterSpeed(double distanceToSpeakerFeet) {
120120
}
121121

122122
private double calculatePivotAngleDeg(double distanceToSpeakerMeter) {
123-
double shooterOffset = 0.5;
123+
double shooterOffset = 1.323;
124124
pivotSetpointDeg =
125125
Units.radiansToDegrees(Math.atan(2.1 / distanceToSpeakerMeter)) + shooterOffset;
126126
if (Units.metersToFeet(distanceToSpeakerMeter) > 12.5) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private double calculateShooterSpeed(double distanceToSpeakerFeet) {
129129
}
130130

131131
private double calculatePivotAngleDeg(double distanceToSpeakerMeter) {
132-
double shooterOffset = 0.5;
132+
double shooterOffset = 1.323;
133133
pivotSetpointDeg =
134134
Units.radiansToDegrees(Math.atan(2.1 / distanceToSpeakerMeter)) + shooterOffset;
135135
if (Units.metersToFeet(distanceToSpeakerMeter) > 12.5) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import edu.wpi.first.wpilibj.DriverStation.Alliance;
2525
import edu.wpi.first.wpilibj2.command.Command;
2626
import edu.wpi.first.wpilibj2.command.Commands;
27-
import edu.wpi.first.wpilibj2.command.ConditionalCommand;
2827
import edu.wpi.first.wpilibj2.command.InstantCommand;
2928
import edu.wpi.first.wpilibj2.command.ParallelCommandGroup;
3029
import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
@@ -122,7 +121,7 @@ public static Command intakeCommand(
122121
turnToSourceSupplier),
123122
new PivotIntakeTele(pivot, intake, shooter, led, false, false)));
124123
}
125-
//TODO rewrite above to condense, example below
124+
// TODO rewrite above to condense, example below
126125
// return new ConditionalCommand(
127126
// new InstantCommand(() -> {}),
128127
// new ConditionalCommand(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public TurnToAmpCorner(
7171
@Override
7272
public void initialize() {
7373
pivot.setPivotGoal(50);
74-
shooter.setFlywheelRPMs(3700, 2700);
74+
shooter.setFlywheelRPMs(4000, 3000);
7575
}
7676

7777
// Called every time the scheduler runs while the command is scheduled.

0 commit comments

Comments
 (0)