Maybe fixed eject outtakeside + including more stuff in NEO commands

Author: aaron345678

src/main/java/org/carlmontrobotics/commands/EjectOuttakeSide.java

@@ -17,7 +17,7 @@ public EjectOuttakeSide(IntakeShooter intakeShooter) {
     @Override
     public void initialize() {
         intakeShooter.setMaxIntake(1);
-        intakeShooter.setMaxOutakeOverload(1);
+        intakeShooter.setMaxOutake(1);
         timer.reset();
         timer.start();
     }
@@ -36,6 +36,6 @@ public void end(boolean interrupted) {
     }
     @Override
     public boolean isFinished() {
-        return timer.get() >= SMART_CURRENT_LIMIT_TIMEOUT;
+        return timer.get() >= 4 || (!intakeShooter.intakeDetectsNote() && !intakeShooter.outakeDetectsNote());
     }
 }

src/main/java/org/carlmontrobotics/commands/IntakeNEO.java

@@ -11,9 +11,6 @@ public class IntakeNEO extends Command {
   // intake until sees game peice or 4sec has passed
   private Timer timer = new Timer();
   private final IntakeShooter intake;
-
-  private double endAt = 0;
-  private final double keepIntakingFor = 0.2;
   int increaseAmount = 750;
   int index = 0;
 

src/main/java/org/carlmontrobotics/commands/PassToOuttake.java

@@ -28,7 +28,7 @@ public void execute() {
     public void end(boolean interrupted) {
         timer.stop();
         timer.reset();
-        intakeShooter.setCurrentLimit(20);
+        intakeShooter.resetCurrentLimit();
     }
 
     @Override

src/main/java/org/carlmontrobotics/commands/SwitchRPMShootNEO.java

@@ -12,6 +12,7 @@
 public class SwitchRPMShootNEO extends Command {
     private IntakeShooter intakeShooter;
     private double rpmAmount;
+    private Timer timer = new Timer();
 
 
     public SwitchRPMShootNEO(IntakeShooter intakeShooter) {
@@ -21,26 +22,26 @@ public SwitchRPMShootNEO(IntakeShooter intakeShooter) {
     @Override
     public void initialize() {
         intakeShooter.setMaxOutake(1);
-        
+        timer.reset();
     }
     @Override
     public void execute() {
         rpmAmount = RPM_SELECTOR[Arm.getSelector()];
         if(intakeShooter.getOutakeRPM() >= rpmAmount) {
         intakeShooter.setMaxIntake(1);
-       
+        timer.start();
         }
     }
     @Override
     public void end(boolean interrupted) {
         intakeShooter.stopIntake();
         intakeShooter.stopOutake();
         intakeShooter.resetCurrentLimit();
-      
+        timer.stop();
 
     }
     @Override
     public boolean isFinished() {
-        return (!intakeShooter.intakeDetectsNote() && !intakeShooter.outakeDetectsNote());
+        return (!intakeShooter.intakeDetectsNote() && !intakeShooter.outakeDetectsNote()) || timer.get() > 10;
     }
 }