@@ -40,24 +40,45 @@ public Manager() {
4040 addTrigger (IDLE , OUTTAKING , DRIVER_CONTROLLER ::getXButtonPressed );
4141 addTrigger (INTAKE_PASSING , OUTTAKING , DRIVER_CONTROLLER ::getXButtonPressed );
4242 addTrigger (INTAKING , OUTTAKING , DRIVER_CONTROLLER ::getXButtonPressed );
43+ addTrigger (
44+ INTAKING ,
45+ IDLE ,
46+ () -> DRIVER_CONTROLLER .getXButtonPressed () && DRIVER_CONTROLLER .getRightBumperButton ()
47+ );
48+ addTrigger (OUTTAKING , IDLE , DRIVER_CONTROLLER ::getXButtonPressed );
4349
50+ addTrigger (
51+ IDLE ,
52+ FIXED_ALIGN ,
53+ () -> DRIVER_CONTROLLER .getYButtonPressed () && DRIVER_CONTROLLER .getRightBumperButton ()
54+ );
4455 addTrigger (IDLE , INTAKING , DRIVER_CONTROLLER ::getAButtonPressed );
4556 addTrigger (INTAKING , INTAKE_PASSING , DRIVER_CONTROLLER ::getAButtonPressed );
4657 addTrigger (INTAKE_PASSING , FIXED_ALIGN , DRIVER_CONTROLLER ::getAButtonPressed );
4758 addTrigger (FIXED_ALIGN , FIXED_SHOOT , DRIVER_CONTROLLER ::getAButtonPressed );
4859 addTrigger (FIXED_ALIGN , FIXED_SHOOT , () -> hoodedShooterSupersystem .readyToShoot ());
60+ addTrigger (FIXED_SHOOT , IDLE , DRIVER_CONTROLLER ::getAButtonPressed );
4961
62+ addTrigger (
63+ IDLE ,
64+ DYNAMIC_ALIGN ,
65+ () -> DRIVER_CONTROLLER .getYButtonPressed () && DRIVER_CONTROLLER .getRightBumperButton ()
66+ );
5067 addTrigger (INTAKE_PASSING , DYNAMIC_ALIGN , DRIVER_CONTROLLER ::getYButtonPressed );
5168 addTrigger (DYNAMIC_ALIGN , DYNAMIC_SHOOT , DRIVER_CONTROLLER ::getYButtonPressed );
5269 addTrigger (DYNAMIC_ALIGN , DYNAMIC_SHOOT , () -> hoodedShooterSupersystem .readyToShoot ());
70+ addTrigger (DYNAMIC_SHOOT , IDLE , DRIVER_CONTROLLER ::getYButtonPressed );
71+
72+ addRunnableTrigger (
73+ () -> {
74+ setState (IDLE );
75+ },
76+ DRIVER_CONTROLLER ::getBButtonPressed
77+ );
5378 }
5479
5580 @ Override
5681 public void runState () {
57- if (DRIVER_CONTROLLER .getBButtonPressed ()) {
58- setState (IDLE );
59- }
60-
6182 logData ();
6283
6384 intake .setState (getState ().getIntakeStates ());
0 commit comments