Skip to content

Commit 822f817

Browse files
committed
Remaining Comp Changes
1 parent 86d0f3e commit 822f817

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/main/java/frc/robot/Robot.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ public void robotPeriodic() {
5555
SmartDashboard.putString("Hopper State", Hopper.hopperState);
5656
SmartDashboard.putString("Intake State", Intake.intakeState);
5757
SmartDashboard.putString("Kicker State", KickerCommand.kickerState);
58+
SmartDashboard.putBoolean(
59+
"Flywheel On",
60+
!(FlywheelCommand.flywheelState.equals("none")
61+
|| FlywheelCommand.flywheelState.equals("Stopped")));
5862
try {
5963
var pose = drivetrain.getState().Pose;
6064
SmartDashboard.putNumber("OdometryX", pose.getX());

src/main/java/frc/robot/config/TunerConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class TunerConstants {
5555

5656
// The stator current at which the wheels start to slip;
5757
// This needs to be tuned to your individual robot
58-
private static final Current kSlipCurrent = Amps.of(60); // from 120
58+
private static final Current kSlipCurrent = Amps.of(120); // from 120
5959

6060
// Initial configs for the drive and steer motors and the azimuth encoder; these cannot be null.
6161
// Some configs will be overwritten; check the `with*InitialConfigs()` API documentation.

src/main/java/frc/robot/helpers/ShotCalculator.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ public static double calculateFlywheelShot(Translation2d robotPosition) {
1818
double distanceToGoal = calculateHubPosition().getDistance(robotPosition);
1919
// 2. Retrieve correlating RPS from map based off of distance
2020
if (distanceToGoal > Units.inchesToMeters(87) || distanceToGoal < Units.inchesToMeters(43)) {
21-
System.out.println(getRPM(distanceToGoal));
2221
return getRPM(distanceToGoal);
2322
}
24-
System.out.println(DISTANCE_TO_FLYWHEEL.get(distanceToGoal));
2523
return DISTANCE_TO_FLYWHEEL.get(distanceToGoal);
2624
}
2725

0 commit comments

Comments
 (0)