Adjusted shooter RPM code
This commit is contained in:
@@ -104,33 +104,29 @@ public class ShooterSubsystem extends SubsystemBase {
|
||||
}
|
||||
|
||||
public void setIndexerAndRampMotorRPM() {
|
||||
// if (LimelightHelpers.getTX("limelight") < 1.5 &&
|
||||
// LimelightHelpers.getTX("limelight") > -1.5) {
|
||||
indexerAndRampMotorPIDController.setSetpoint(Constants.ShooterConstants.INDEXER_AND_RAMP_MOTOR_RPM, ControlType.kVelocity);
|
||||
// } else
|
||||
// indexerMotor.set(0);
|
||||
}
|
||||
|
||||
/* public Command shootFuelCommand() {
|
||||
return run(() -> startShooterMotors())
|
||||
public Command shootFuelCommand() {
|
||||
return run(() -> setShooterMotorsRPM())
|
||||
.until(() -> {
|
||||
return (getShooterMotorVelocity() >= Constants.ShooterConstants.SHOOTER_VELOCITY);
|
||||
return (getShooterMotorRPM() >= Constants.ShooterConstants.SHOOTER_RPM);
|
||||
})
|
||||
.andThen(() -> startIndexerMotor());
|
||||
} */
|
||||
.andThen(() -> setIndexerAndRampMotorRPM());
|
||||
}
|
||||
|
||||
|
||||
public Command shootFuelCommand() {
|
||||
/* public Command shootFuelCommand() {
|
||||
return runOnce(() -> setShooterMotorsRPM()).andThen(new WaitCommand(2))
|
||||
.andThen(() -> setIndexerAndRampMotorRPM());
|
||||
};
|
||||
}; */
|
||||
|
||||
|
||||
public void stopShooters() {
|
||||
|
||||
centerShooterMotor.set(0);
|
||||
leftShooterMotor.set(0);
|
||||
//rightShooterMotor.set(0);
|
||||
rightShooterMotor.set(0);
|
||||
indexerAndRampMotor.set(0);
|
||||
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ public class TargetingSubsystems extends SubsystemBase {
|
||||
double angleSpeed = angleController.calculate(currentRobotPose.getRotation().getRadians(),
|
||||
desiredPose.getRotation().getRadians());
|
||||
|
||||
swerveDrive.drive(new Translation2d(xSpeed, ySpeed), angleSpeed, true);
|
||||
swerveDrive.drive(new Translation2d(xSpeed, ySpeed), angleSpeed, false);
|
||||
}, swerveDrive);
|
||||
}
|
||||
|
||||
@@ -108,7 +108,7 @@ public class TargetingSubsystems extends SubsystemBase {
|
||||
rot = MathUtil.clamp(rot, -3.0, 3.0);
|
||||
|
||||
swerveDrive.drive(new Translation2d(driverXbox.getLeftY() * -1,
|
||||
driverXbox.getLeftX() * -1), rot, true);
|
||||
driverXbox.getLeftX() * -1), rot, false);
|
||||
}, swerveDrive);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user