Skip to content

Commit 99382d4

Browse files
stuff
1 parent db6f168 commit 99382d4

File tree

1 file changed

+23
-14
lines changed

1 file changed

+23
-14
lines changed

src/main/java/org/carlmontrobotics/RobotContainer.java

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,11 @@ private void setBindingsDriver() {
188188
.onTrue(new InstantCommand(()->drivetrain.setFieldOriented(false)))
189189
.onFalse(new InstantCommand(()->drivetrain.setFieldOriented(true)));
190190

191-
axisTrigger(driverController, Manipulator.SHOOTER_BUTTON)
192-
.whileTrue(new SequentialCommandGroup(new PrintCommand("Running Intake"),
193-
new IntakeNEO(intakeShooter)));
191+
/*
192+
* axisTrigger(driverController, Manipulator.SHOOTER_BUTTON)
193+
* .whileTrue(new SequentialCommandGroup(new PrintCommand("Running Intake"),
194+
* new IntakeNEO(intakeShooter)));
195+
*/
194196
new JoystickButton(driverController, Driver.rotateFieldRelative0Deg)
195197
.onTrue(new RotateToFieldRelativeAngle(Rotation2d.fromDegrees(0), drivetrain));
196198
new JoystickButton(driverController, Driver.rotateFieldRelative90Deg)
@@ -207,15 +209,19 @@ private void setBindingsManipulatorNEO() {
207209
new JoystickButton(manipulatorController, Button.kB.value).whileTrue(new RampMaxRPM(intakeShooter));
208210
new JoystickButton(manipulatorController, AMP_BUTTON).whileTrue(new EjectOuttakeSide(intakeShooter));
209211

210-
axisTrigger(manipulatorController, Manipulator.SHOOTER_BUTTON)
211-
.onTrue(
212-
new SwitchRPMShootNEO(intakeShooter));
212+
/*
213+
* axisTrigger(manipulatorController, Manipulator.SHOOTER_BUTTON)
214+
* .onTrue(
215+
* new SwitchRPMShootNEO(intakeShooter));
216+
*/
213217
axisTrigger(manipulatorController, Manipulator.SHOOTER_BUTTON)
214218
.onFalse(
215219
new InstantCommand(intakeShooter::stopOuttake, intakeShooter));
216-
axisTrigger(manipulatorController, Manipulator.INTAKE_BUTTON)
217-
.whileTrue(new SequentialCommandGroup(new PrintCommand("Running Intake"),
218-
new IntakeNEO(intakeShooter)));
220+
/*
221+
* axisTrigger(manipulatorController, Manipulator.INTAKE_BUTTON)
222+
* .whileTrue(new SequentialCommandGroup(new PrintCommand("Running Intake"),
223+
* new IntakeNEO(intakeShooter)));
224+
*/
219225
axisTrigger(manipulatorController, Manipulator.INTAKE_BUTTON)
220226
.onFalse(
221227
new InstantCommand(intakeShooter::stopIntake, intakeShooter));
@@ -239,9 +245,11 @@ private void setBindingsManipulatorENDEFF() {
239245
.onFalse(new InstantCommand(intakeShooter::stopOuttake, intakeShooter));
240246
new JoystickButton(manipulatorController, AMP_BUTTON).onTrue(new EjectOuttakeSide(intakeShooter));
241247

242-
axisTrigger(manipulatorController, Manipulator.SHOOTER_BUTTON)
243-
.onTrue(
244-
new SwitchRPMShoot(intakeShooter));
248+
/*
249+
* axisTrigger(manipulatorController, Manipulator.SHOOTER_BUTTON)
250+
* .onTrue(
251+
* new SwitchRPMShoot(intakeShooter));
252+
*/
245253
axisTrigger(manipulatorController, Manipulator.SHOOTER_BUTTON)
246254
.onFalse(
247255
new InstantCommand(intakeShooter::stopOuttake, intakeShooter));
@@ -336,7 +344,7 @@ private Trigger axisTrigger(GenericHID controller, Axis axis) {
336344

337345
private void registerAutoCommands(){
338346
////AUTO-USABLE COMMANDS
339-
NamedCommands.registerCommand("Intake", new IntakeNEO(intakeShooter));
347+
// NamedCommands.registerCommand("Intake", new IntakeNEO(intakeShooter));
340348
NamedCommands.registerCommand("Eject", new Eject(intakeShooter));
341349

342350
// NamedCommands.registerCommand("ArmToSpeaker", new MoveToPos(arm, Armc.SPEAKER_ANGLE_RAD, 0));
@@ -346,7 +354,8 @@ private void registerAutoCommands(){
346354
NamedCommands.registerCommand("ArmToGround", new ArmToPos(arm, GROUND_INTAKE_POS, 1));
347355

348356

349-
NamedCommands.registerCommand("SwitchRPMShoot", new SwitchRPMShootNEO(intakeShooter));
357+
// NamedCommands.registerCommand("SwitchRPMShoot", new
358+
// SwitchRPMShootNEO(intakeShooter));
350359

351360
NamedCommands.registerCommand("PassToOuttake", new PassToOuttake(intakeShooter));
352361

0 commit comments

Comments
 (0)