2121import edu .wpi .first .wpilibj .Joystick ;
2222import edu .wpi .first .wpilibj2 .command .Command ;
2323import edu .wpi .first .wpilibj2 .command .Commands ;
24- import edu .wpi .first .wpilibj2 .command .WaitCommand ;
2524import edu .wpi .first .wpilibj2 .command .Command .InterruptionBehavior ;
2625import edu .wpi .first .wpilibj2 .command .button .CommandXboxController ;
2726import edu .wpi .first .wpilibj2 .command .button .JoystickButton ;
@@ -153,13 +152,18 @@ private void competitionButtonBindings(){
153152 dPadUp .onTrue (robotGoToHeightCommandCreator (ElevatorHeight .L4 ));
154153
155154
156- // OUTTAKING
157- // Trigger leftBumper = operatorController.leftBumper();
158- // leftBumper.whileTrue(new IntakeCoralCommand(manipulator, passthrough));
159-
160155 Trigger rightBumper = operatorController .rightBumper ();
161156 rightBumper .whileTrue (new OuttakeCoralCommand (manipulator ));
162157
158+ Trigger dislodgeAlgaeTrigger = operatorController .rightTrigger ();
159+ dislodgeAlgaeTrigger .whileTrue (new DislodgeAlgaeCommand (manipulator , false ));
160+
161+ Trigger leftTrigger = operatorController .leftTrigger ();
162+ leftTrigger .onTrue (robotGoToHeightCommandCreator (ElevatorHeight .DISLODGE ));
163+
164+ Trigger yPressedTrigger = operatorController .y ();
165+ yPressedTrigger .onTrue (new WristGoToPositionCommand (wrist , Constants .WristConstants .WristAngleRad .DISLODGE_ANGLE ));
166+
163167
164168 // FUNNEL INTAKING
165169
@@ -262,6 +266,8 @@ private WristAngleRad getEndWristAngleForGivenElevatorHeight(ElevatorHeight heig
262266 return WristAngleRad .L2L3 ;
263267 case FUNNEL :
264268 return WristAngleRad .FUNNEL_ANGLE ;
269+ case DISLODGE :
270+ return WristAngleRad .DISLODGE_ANGLE ;
265271 case L1 :
266272 return WristAngleRad .L1 ;
267273 case L2 :
@@ -402,8 +408,7 @@ private void configureManipulatorBindings(){
402408 // new WaitCommand(0.04),
403409 // Commands.runOnce(() -> manipulator.stopOuttake(), manipulator)));
404410
405- // Trigger dislodgeAlgaeTrigger = operatorController.rightTrigger();
406- // dislodgeAlgaeTrigger.whileTrue(new DislodgeAlgaeCommand(manipulator, false));
411+
407412
408413 }
409414
@@ -429,9 +434,9 @@ private void configureElevatorBindings(){
429434 new ElevatorGoToPositionPositionCommand (elevator , ElevatorHeight .L3 )
430435 );
431436
432- Trigger dPadUp = operatorController .povUp ();
433- dPadUp .whileTrue (
434- new ElevatorGoToPositionPositionCommand (elevator , ElevatorHeight .L4 )
435- );
437+ // Trigger dPadUp = operatorController.povUp();
438+ // dPadUp.whileTrue(
439+ // new ElevatorGoToPositionPositionCommand(elevator, ElevatorHeight.L4)
440+ // );
436441 }
437442}
0 commit comments