Skip to content

Commit

Permalink
fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Lu-han-wang committed Mar 28, 2024
1 parent f58ae11 commit b0c02ba
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.jmhsrobotics.frc2024.ComboCommands;


import org.jmhsrobotics.frc2024.subsystems.shintake.ShintakeSubsystem;
import org.jmhsrobotics.frc2024.subsystems.shintake.ShintakeSubsystem.ControlType;

Expand Down
4 changes: 1 addition & 3 deletions src/main/java/org/jmhsrobotics/frc2024/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

package org.jmhsrobotics.frc2024;

import org.jmhsrobotics.frc2024.ComboCommands.AmpHelper;
import org.jmhsrobotics.frc2024.ComboCommands.AmpShotCommand;
import org.jmhsrobotics.frc2024.ComboCommands.ComboIntakeArmCommand;
import org.jmhsrobotics.frc2024.autoCommands.NFireAmp;
Expand Down Expand Up @@ -191,8 +190,7 @@ private void configurePathPlanner() {

NamedCommands.registerCommand("ArmAmp", new CommandArm(this.armSubsystem, Constants.ArmSetpoint.AMP.value));
NamedCommands.registerCommand("ArmShoot", new CommandArm(this.armSubsystem, Constants.ArmSetpoint.SHOOT.value));
NamedCommands.registerCommand("Intake",
new IntakeCommand(1, this.shintakeSubsystem).withTimeout(0.5));
NamedCommands.registerCommand("Intake", new IntakeCommand(1, this.shintakeSubsystem).withTimeout(0.5));

// Move Arm to Pickup position
NamedCommands.registerCommand("ArmPickup",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public class NFloorIntake extends SequentialCommandGroup {
*/
public NFloorIntake(ArmPIDSubsystem arm, ShintakeSubsystem shintakeSubsystem) {
// new CommandArm(arm, Constants.ArmSetpoint.PICKUP.value),
addCommands(Commands.either(Commands.none(),
Commands.parallel(new CommandArm(arm, Constants.ArmSetpoint.PICKUP.value), new LIntake(shintakeSubsystem)),
addCommands(Commands.either(Commands.none(), Commands
.parallel(new CommandArm(arm, Constants.ArmSetpoint.PICKUP.value), new LIntake(shintakeSubsystem)),
shintakeSubsystem::hasNote));

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ public class PrepareShot extends Command {
* @param shintake
* @param vision
*/
public PrepareShot(DriveSubsystem drive, ArmPIDSubsystem arm, ShintakeSubsystem shintakeSubsystem, VisionSubsystem vision) {
public PrepareShot(DriveSubsystem drive, ArmPIDSubsystem arm, ShintakeSubsystem shintakeSubsystem,
VisionSubsystem vision) {
Commands.repeatingSequence(new ArmVision(arm, vision, drive), new ShooterAutoCommand(shintakeSubsystem, 5000));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public boolean noteTooHigh() {
return this.upperSensor.getRange() < 320;
}

public boolean shooterAtGoal(){
public boolean shooterAtGoal() {
return this.lowerPID.atSetpoint() || this.upperPID.atSetpoint();
}
private void initializeMotors() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ public class IntakeCommand extends Command {
*/

public IntakeCommand(double speed, ShintakeSubsystem shintakeSubsystem) { // Fixme:
// add
// requirements
// for
// shooter!
// add
// requirements
// for
// shooter!
this.speed = speed;
this.shintakeSubsystem = shintakeSubsystem;

Expand Down

0 comments on commit b0c02ba

Please sign in to comment.