Fixed Dump

Dump commands were flipped (fixed), openThenClose starts death spiral that disables the bot. As a result, openThenClose has been abandoned for the time being.
OakvilleDynamics · Mar 8, 2024 · a35a082 · a35a082
1 parent d1c991a
commit a35a082
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/frc/robot/commands/ConveyorCommand.java b/src/main/java/frc/robot/commands/ConveyorCommand.java
@@ -6,13 +6,14 @@
 
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj2.command.Command;
+import frc.robot.Constants.OperatorConstants;
 import frc.robot.subsystems.Conveyor;
 
 public class ConveyorCommand extends Command {
   private final Conveyor m_ConveyorSubsystem;
   // controller
   // TODO: Change this to the correct controller
-  private final Joystick ConveyorJoystick = new Joystick(1);
+  private final Joystick ConveyorJoystick = new Joystick(OperatorConstants.COPILOT_CONTROLLER);
 
   public ConveyorCommand(Conveyor subsystem) {
     m_ConveyorSubsystem = subsystem;

diff --git a/src/main/java/frc/robot/commands/FlyWCommand.java b/src/main/java/frc/robot/commands/FlyWCommand.java
@@ -6,13 +6,14 @@
 
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj2.command.Command;
+import frc.robot.Constants.OperatorConstants;
 import frc.robot.subsystems.FlyWheel;
 
 public class FlyWCommand extends Command {
   private final FlyWheel m_FlyWSubsystem;
   // controller
   // TODO: Change this to the correct controller
-  private final Joystick FlyWJoystick = new Joystick(1);
+  private final Joystick FlyWJoystick = new Joystick(OperatorConstants.COPILOT_CONTROLLER);
 
   public FlyWCommand(FlyWheel subsystem) {
     m_FlyWSubsystem = subsystem;
@@ -26,7 +27,9 @@ public void initialize() {}
   public void execute() {
     if (FlyWJoystick.getPOV() == 315 | FlyWJoystick.getPOV() == 0 | FlyWJoystick.getPOV() == 45) {
       m_FlyWSubsystem.enableflywheelfull();
-    } else if (FlyWJoystick.getPOV() == 225 | FlyWJoystick.getPOV() == 180 | FlyWJoystick.getPOV() == 135) {
+    } else if (FlyWJoystick.getPOV() == 225
+        | FlyWJoystick.getPOV() == 180
+        | FlyWJoystick.getPOV() == 135) {
       m_FlyWSubsystem.enableflywheellow();
     } else if (FlyWJoystick.getRawButton(12) == true) {
       m_FlyWSubsystem.enableflywheelreduced();

diff --git a/src/main/java/frc/robot/commands/IntakeCommand.java b/src/main/java/frc/robot/commands/IntakeCommand.java
@@ -6,13 +6,14 @@
 
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj2.command.Command;
+import frc.robot.Constants.OperatorConstants;
 import frc.robot.subsystems.Intake;
 
 public class IntakeCommand extends Command {
   private final Intake m_intakeSubsystem;
   // controller
   // TODO: Change this to the correct controller
-  private final Joystick IntakeJoystick = new Joystick(1);
+  private final Joystick IntakeJoystick = new Joystick(OperatorConstants.COPILOT_CONTROLLER);
 
   public IntakeCommand(Intake subsystem) {
     m_intakeSubsystem = subsystem;

diff --git a/src/main/java/frc/robot/subsystems/Dump.java b/src/main/java/frc/robot/subsystems/Dump.java
@@ -29,13 +29,13 @@ public Dump() {
   }
 
   /** Opens the piston */
-  public void open() {
+  public void close() {
     doubleSolenoid.set(DoubleSolenoid.Value.kForward);
     SmartDashboard.putBoolean(getName(), true);
   }
 
   /** Closes the piston */
-  public void close() {
+  public void open() {
     doubleSolenoid.set(DoubleSolenoid.Value.kReverse);
     SmartDashboard.putBoolean(getName(), false);
   }