Skip to content

Commit 60bfd0d

Browse files
committed
Algae dislodger code
1 parent 3751b8d commit 60bfd0d

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

src/main/java/frc/robot/Constants.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ public enum ElevatorHeight{
263263
// THESE ARE ALL STILL ARBITRARY
264264
HOME(minHeightMeters),
265265
FUNNEL(minHeightMeters + Units.inchesToMeters(3.0)), // Used to be 8 inches
266-
266+
DISLODGE(minHeightMeters + Units.inchesToMeters(3 + 13)),
267267
L1(minHeightMeters + Units.inchesToMeters(2)),
268268
L2(minHeightMeters + Units.inchesToMeters(3)),
269269
L3(minHeightMeters + Units.inchesToMeters(3 + 16)),
@@ -394,6 +394,7 @@ public static final class WristConstants{
394394
public static enum WristAngleRad {
395395
FREEHANG(Units.degreesToRadians(90)),
396396
FUNNEL_ANGLE(Units.degreesToRadians(66)),
397+
DISLODGE_ANGLE(Units.degreesToRadians(215)),
397398
L1(Units.degreesToRadians(252)), // Needs to be changed
398399
L2L3(Units.degreesToRadians(252)),
399400
L4(Units.degreesToRadians(200));

src/main/java/frc/robot/RobotContainer.java

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import edu.wpi.first.wpilibj.Joystick;
2222
import edu.wpi.first.wpilibj2.command.Command;
2323
import edu.wpi.first.wpilibj2.command.Commands;
24-
import edu.wpi.first.wpilibj2.command.WaitCommand;
2524
import edu.wpi.first.wpilibj2.command.Command.InterruptionBehavior;
2625
import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
2726
import 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
}

src/main/java/frc/robot/subsystems/Manipulator/Manipulator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ public void startDislodger(boolean invert){
9191
}
9292
public void stopDislodger(){
9393
currentDislodgerGoal = new State(0, 0);
94+
manipulatorIO.setDislodgerVoltage(0);
9495
}
9596

9697

0 commit comments

Comments
 (0)