Team4388/2022NoWayHome
1
0
Fork 0
mirror of https://github.com/Team4388/2022NoWayHome.git synced 2026-06-09 08:48:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'button-box-mode-switching' of https://github.com/Team4388/2022NoWayHome into button-box-mode-switching

Browse Source
This commit is contained in:
66945
2022-03-21 01:24:59 -06:00
parent 28663aa54b 258db7ab9e
commit 6dead80f63
1 changed files with 12 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/frc4388/robot/RobotContainer.java
+12 -33
View File
@@ -71,6 +71,7 @@ import frc4388.robot.Constants.OIConstants;
import frc4388.robot.Constants.ShooterConstants; import frc4388.robot.Constants.ShooterConstants;
import frc4388.robot.Constants.StorageConstants; import frc4388.robot.Constants.StorageConstants;
import frc4388.robot.Constants.SwerveDriveConstants; import frc4388.robot.Constants.SwerveDriveConstants;
import frc4388.robot.commands.BasicCommandChooser;
import frc4388.robot.commands.ComplexCommandChooser; import frc4388.robot.commands.ComplexCommandChooser;
import frc4388.robot.commands.ButtonBoxCommands.RunMiddleSwitch; import frc4388.robot.commands.ButtonBoxCommands.RunMiddleSwitch;
import frc4388.robot.commands.ButtonBoxCommands.RunTurretOrClimberAuto; import frc4388.robot.commands.ButtonBoxCommands.RunTurretOrClimberAuto;
@@ -170,6 +171,7 @@ public class RobotContainer {
// climber mode switching // climber mode switching
// private enum ClimberMode { MANUAL, AUTONOMOUS }; // private enum ClimberMode { MANUAL, AUTONOMOUS };
private ControlMode currentClimberMode = ControlMode.MANUAL; private ControlMode currentClimberMode = ControlMode.MANUAL;
private boolean command1 = true;
/** /**
* The container for the robot. Contains subsystems, OI devices, and commands. * The container for the robot. Contains subsystems, OI devices, and commands.
@@ -361,40 +363,17 @@ public class RobotContainer {
// toggle manual mode and autonomous mode based on the current control mode // toggle manual mode and autonomous mode based on the current control mode
new JoystickButton(getButtonBox(), ButtonBox.Button.kRightSwitch.value) new JoystickButton(getButtonBox(), ButtonBox.Button.kRightSwitch.value)
.whenPressed(new InstantCommand(() -> this.command1 = !this.command1))
.whenPressed(new BasicCommandChooser( new RunCommand(() -> System.out.println("COMMAND 1")),
new RunCommand(() -> System.out.println("COMMAND 2")),
() -> this.command1 == true,
() -> this.command1 == false))
.whenReleased(new InstantCommand(() -> this.command1 = !this.command1));
// .whenPressed(new InstantCommand(() -> { // .whenPressed(new ComplexCommandChooser(new HashMap<Command, BooleanSupplier>() {{
// if (this.currentControlMode.equals(SubsystemMode.CLIMBER)) { m_robotTurret.gotoZero(); } // put(new RunClimberPath(m_robotClimber, m_robotClaws, new Point[] {new Point()}), () -> currentControlMode.equals(SubsystemMode.CLIMBER));
// }, m_robotTurret)) // put(new AimToCenter(m_robotTurret, m_robotSwerveDrive, m_robotVisionOdometry), () -> currentControlMode.equals(SubsystemMode.SHOOTER));
// }}));
// .whenPressed(new InstantCommand(() -> {
// if (this.currentControlMode.equals(SubsystemMode.SHOOTER)) { this.currentTurretMode = ControlMode.MANUAL; }
// if (this.currentControlMode.equals(SubsystemMode.CLIMBER)) { this.currentClimberMode = ControlMode.AUTONOMOUS; }
// }))
// * custom Command inside InstantCommand
// .whenPressed(new InstantCommand(() -> {
// if (this.currentControlMode.equals(ControlMode.CLIMBER)) { new RunClimberPath(m_robotClimber, m_robotClaws, new Point[] {new Point()}); }
// if (this.currentControlMode.equals(ControlMode.SHOOTER)) { new AimToCenter(m_robotTurret, m_robotSwerveDrive, m_robotVisionOdometry); }
// })
// .until(() -> this.currentClimberMode.equals(ClimberMode.MANUAL)))
// * external RunTurretOrClimberAutos command, which runs either one (conditionally) based on currentControlMode
// .whenPressed(new RunTurretOrClimberAuto(m_robotTurret, m_robotSwerveDrive, m_robotVisionOdometry, m_robotClimber, m_robotClaws))
// * CommandChooser with BooleanSuppliers
.whenPressed(new ComplexCommandChooser(new HashMap<Command, BooleanSupplier>() {{
put(new InstantCommand(() -> System.out.println("true")), () -> true);
put(new InstantCommand(() -> System.out.println("false")), () -> false);
}}));
// .whenPressed(new CommandChooser(new RunClimberPath(m_robotClimber, m_robotClaws, new Point[] {new Point()}),
// new AimToCenter(m_robotTurret, m_robotSwerveDrive, m_robotVisionOdometry),
// () -> this.currentControlMode.equals(SubsystemMode.CLIMBER),
// () -> this.currentControlMode.equals(SubsystemMode.SHOOTER)))
// .whenReleased(new InstantCommand(() -> {
// if (this.currentControlMode.equals(SubsystemMode.SHOOTER)) { this.currentTurretMode = ControlMode.AUTONOMOUS; }
// if (this.currentControlMode.equals(SubsystemMode.CLIMBER)) { this.currentClimberMode = ControlMode.MANUAL; }
// }));
new JoystickButton(getButtonBox(), ButtonBox.Button.kLeftButton.value) new JoystickButton(getButtonBox(), ButtonBox.Button.kLeftButton.value)
.whileHeld(new RunCommand(() -> m_robotExtender.runExtender(-1.0), m_robotExtender)) .whileHeld(new RunCommand(() -> m_robotExtender.runExtender(-1.0), m_robotExtender))