Revert "spelling mistake and reverseintakeflywheel"

This reverts commit 0bfb71c.
awtybots · Sep 28, 2024 · 886ff4d · 886ff4d
1 parent 4420d47
commit 886ff4d
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 59 deletions.
diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
@@ -37,7 +37,6 @@
 import frc.robot.commands.Positions.SpeakerShot;
 import frc.robot.commands.Positions.StowPosition;
 import frc.robot.commands.PreRunShooter;
-import frc.robot.commands.ReverseIntakeFlywheel;
 import frc.robot.commands.ShootNote;
 import frc.robot.commands.ShootNoteTeleop;
 import frc.robot.subsystems.arm.Arm;
@@ -74,6 +73,8 @@ public class RobotContainer {
   // Subsystems
   private final Drive sDrive;
   private final Flywheel sFlywheel;
+  private final Flywheel sEject;
+  private final Intake sOutake;
   private final Intake sIntake;
   private final Arm sArm;
 
@@ -337,8 +338,7 @@ private void configureButtonBindings() {
         new PreRunShooter(sFlywheel, true, sIntake)); // Runs the flywheel slowly at all times
 
     operatorController.rightBumper().whileTrue(new ShootNoteTeleop(sIntake, sFlywheel, sArm));
-    // operatorController.leftBumper().whileTrue(new PreRunShooter(sFlywheel, sIntake));
-    operatorController.leftBumper().whileTrue(new ReverseIntakeFlywheel(sIntake, sFlywheel));
+    operatorController.leftBumper().whileTrue(new ShootNoteTeleop(sOutake, sEject, sArm));
 
     // Climber controls (The first one is 90% probably the one that works.)
     // sClimber.setDefaultCommand(

diff --git a/src/main/java/frc/robot/commands/ControlCommands/IntakeShooterControls.java b/src/main/java/frc/robot/commands/ControlCommands/IntakeShooterControls.java
@@ -31,7 +31,7 @@ public static Command intakeShooterDefaultCommand(
             intake.runPercentSpeed(
                 Constants.IntakeConstants.percentPower * rightTriggerSupplier.getAsDouble());
           }
-          boolean noteDetected = intake.getConveyorProximity() || intake.getShooterProximity();
+          boolean noteDetected = intake.getConveyerProximity() || intake.getShooterProximity();
           SmartDashboard.putBoolean("Note Detected", noteDetected);
         },
         intake);

diff --git a/src/main/java/frc/robot/commands/IntakeNote.java b/src/main/java/frc/robot/commands/IntakeNote.java
@@ -35,7 +35,7 @@ public void initialize() {}
   @Override
   public void execute() {
 
-    if (intake.getConveyorProximity()) {
+    if (intake.getConveyerProximity()) {
       intake.runPercentSpeed(0);
     } else {
       intake.runPercentSpeed(-Constants.IntakeConstants.percentPower);
@@ -51,6 +51,6 @@ public void end(boolean interrupted) {
 
   @Override
   public boolean isFinished() {
-    return intake.getConveyorProximity();
+    return intake.getConveyerProximity();
   }
 }
diff --git a/src/main/java/frc/robot/commands/IntakeNoteAndAlign.java b/src/main/java/frc/robot/commands/IntakeNoteAndAlign.java
@@ -35,7 +35,7 @@ public void initialize() {}
   @Override
   public void execute() {
 
-    if (intake.getConveyorProximity()) {
+    if (intake.getConveyerProximity()) {
       intake.runPercentSpeed(0);
     } else {
       intake.runPercentSpeed(-Constants.IntakeConstants.percentPower);
@@ -51,6 +51,6 @@ public void end(boolean interrupted) {
 
   @Override
   public boolean isFinished() {
-    return intake.getConveyorProximity();
+    return intake.getConveyerProximity();
   }
 }
diff --git a/src/main/java/frc/robot/commands/PreRunShooter.java b/src/main/java/frc/robot/commands/PreRunShooter.java
@@ -46,7 +46,7 @@ public void execute() {
       flywheel.runVelocity(500);
 
     } else if (slowerDefault) {
-      if (intake.getConveyorProximity()) {
+      if (intake.getConveyerProximity()) {
         flywheel.runVelocity(Constants.FlywheelConstants.slowShootingVelocity);
       } else {
         flywheel.runVelocity(300);

diff --git a/src/main/java/frc/robot/commands/ReverseIntakeFlywheel.java b/src/main/java/frc/robot/commands/ReverseIntakeFlywheel.java
diff --git a/src/main/java/frc/robot/commands/ShootNote.java b/src/main/java/frc/robot/commands/ShootNote.java
@@ -53,7 +53,7 @@ public void execute() {
       intake.runPercentSpeed(-1);
     }
 
-    if (!intake.getConveyorProximity() && !intake.getShooterProximity()) {
+    if (!intake.getConveyerProximity() && !intake.getShooterProximity()) {
       if (sensorsZeroTime == null) {
         sensorsZeroTime = System.currentTimeMillis();
       }

diff --git a/src/main/java/frc/robot/subsystems/LedSubsystem.java b/src/main/java/frc/robot/subsystems/LedSubsystem.java
@@ -67,7 +67,7 @@ public void setDisco() {
 
   @Override
   public void periodic() {
-    boolean noteDetected = intake.getConveyorProximity() || intake.getShooterProximity();
+    boolean noteDetected = intake.getConveyerProximity() || intake.getShooterProximity();
     SmartDashboard.putBoolean("Note Detected", noteDetected);
     if (noteDetected) {
       setColor(new int[] {0, 255, 0});

diff --git a/src/main/java/frc/robot/subsystems/intake/Intake.java b/src/main/java/frc/robot/subsystems/intake/Intake.java
@@ -75,7 +75,7 @@ public void runPercentSpeed(double percentSpeed) {
     Logger.recordOutput("Intake/PercentSpeed", percentSpeed);
   }
 
-  public boolean getConveyorProximity() {
+  public boolean getConveyerProximity() {
     return proximitySensorInputs.isConveyorSensorTriggered;
   }