Skip to content

Commit 365c026

Browse files
Fix Brain Behavior
1 parent 196aa80 commit 365c026

1 file changed

Lines changed: 3 additions & 8 deletions

File tree

src/main/java/frc/robot/commands/robot/collectalgaereef/CollectAlgaeReefScoopCmd.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import frc.robot.subsystems.brain.SetHoldingCmd;
2828
import frc.robot.subsystems.drive.Drive;
2929
import frc.robot.subsystems.grabber.GrabberSubsystem;
30-
import frc.robot.subsystems.grabber.commands.RunGrabberVoltsCmd;
3130
import frc.robot.subsystems.manipulator.ManipulatorConstants;
3231
import frc.robot.subsystems.manipulator.ManipulatorSubsystem;
3332
import frc.robot.subsystems.manipulator.commands.GoToCmdDirect;
@@ -120,8 +119,8 @@ public void initSequence(SequentialCommandGroup seq) {
120119
new GentleLowerElevator(manipulator_, ManipulatorConstants.Elevator.Positions.kAlgaeReefHold)) ;
121120
}
122121
else {
123-
postseq = Commands.sequence(
124-
RobotContainer.getInstance().gamepad().setLockCommand(false)) ;
122+
postseq = RobotContainer.getInstance().gamepad().setLockCommand(false)
123+
.alongWith(collect_ ? new SetHoldingCmd(brain_, GamePiece.ALGAE_HIGH) : Commands.none());
125124
}
126125

127126

@@ -133,11 +132,7 @@ public void initSequence(SequentialCommandGroup seq) {
133132
grabber_.setVoltageCommand(Volts.zero()),
134133
new GoToCmdDirect(manipulator_, height, angle)
135134
),
136-
this::hasAlgae)) ;
135+
grabber_::hasAlgae));
137136
seq.addCommands(RobotContainer.getInstance().gamepad().setLockCommand(false)) ;
138137
}
139-
140-
private boolean hasAlgae() {
141-
return grabber_.hasAlgae() ;
142-
}
143138
}

0 commit comments

Comments
 (0)