Replaced 'with' with 'w'

src/main/java/frc/robot/commands/States/prep_algae/PrepNetWithCoral.java → src/main/java/frc/robot/commands/States/prep_algae/PrepNetWCoral.java

@@ -16,15 +16,15 @@
 import frc.robot.subsystems.StateMachine.RobotState;
 
 /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */
-public class PrepNetWithCoral extends Command {
+public class PrepNetWCoral extends Command {
   Motion globalMotion;
   Rotors globalRotors;
   StateMachine globalStateMachine;
   Drivetrain globalDrivetrain;
   Pose2d closestPoseByRotation;
   MechanismPositionGroup prepNet;
 
-  public PrepNetWithCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors,
+  public PrepNetWCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors,
       Drivetrain subDrivetrain) {
     // Use addRequirements() here to declare subsystem dependencies.
     globalMotion = subMotion;

src/main/java/frc/robot/commands/States/prep_algae/PrepProcessorWithCoral.java → src/main/java/frc/robot/commands/States/prep_algae/PrepProcessorWCoral.java

@@ -12,12 +12,12 @@
 import frc.robot.subsystems.StateMachine;
 
 /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */
-public class PrepProcessorWithCoral extends Command {
+public class PrepProcessorWCoral extends Command {
   Motion globalMotion;
   Rotors globalRotors;
   StateMachine globalStateMachine;
 
-  public PrepProcessorWithCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors) {
+  public PrepProcessorWCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors) {
     // Use addRequirements() here to declare subsystem dependencies.
     globalMotion = subMotion;
     globalRotors = subRotors;

src/main/java/frc/robot/commands/States/prep_coral/PrepCoralWithAlgae.java → src/main/java/frc/robot/commands/States/prep_coral/PrepCoralWAlgae.java

@@ -16,7 +16,7 @@
 import frc.robot.subsystems.StateMachine.RobotState;
 
 /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */
-public class PrepCoralWithAlgae extends Command {
+public class PrepCoralWAlgae extends Command {
   /** Creates a new PrepCoralWithAlgae. */
   Drivetrain globalDrivetrain;
   Motion globalMotion;
@@ -28,7 +28,7 @@ public class PrepCoralWithAlgae extends Command {
   MechanismPositionGroup prepL4;
   int targetLevel;
 
-  public PrepCoralWithAlgae(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors,
+  public PrepCoralWAlgae(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors,
       Drivetrain subDrivetrain, int level) {
     // Use addRequirements() here to declare subsystem dependencies.
     globalMotion = subMotion;

src/main/java/frc/robot/commands/States/scoring/ScoringAlgaeWithCoral.java → src/main/java/frc/robot/commands/States/scoring/AlgaeScoringWCoral.java

@@ -11,11 +11,11 @@
 import frc.robot.subsystems.Rotors;
 
 /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */
-public class ScoringAlgaeWithCoral extends Command {
+public class AlgaeScoringWCoral extends Command {
   StateMachine globalStateMachine;
   Rotors globalRotors;
 
-  public ScoringAlgaeWithCoral(StateMachine globalStateMachine, Rotors subRotors) {
+  public AlgaeScoringWCoral(StateMachine globalStateMachine, Rotors subRotors) {
     // Use addRequirements() here to declare subsystem dependencies.
     globalRotors = subRotors;
     this.globalStateMachine = globalStateMachine;

src/main/java/frc/robot/commands/States/scoring/ScoringCoralWithAlgae.java → src/main/java/frc/robot/commands/States/scoring/ScoringCoralWAlgae.java

@@ -11,11 +11,11 @@
 import frc.robot.subsystems.Rotors;
 
 /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */
-public class ScoringCoralWithAlgae extends Command {
+public class ScoringCoralWAlgae extends Command {
   StateMachine globalStateMachine;
   Rotors globalRotors;
 
-  public ScoringCoralWithAlgae(StateMachine globalStateMachine, Rotors subRotors) {
+  public ScoringCoralWAlgae(StateMachine globalStateMachine, Rotors subRotors) {
     // Use addRequirements() here to declare subsystem dependencies.
     globalRotors = subRotors;
     this.globalStateMachine = globalStateMachine;

src/main/java/frc/robot/commands/States/second_scoring_element/CleanHighWithCoral.java → src/main/java/frc/robot/commands/States/second_scoring_element/CleanHighWCoral.java

@@ -17,7 +17,7 @@
 import frc.robot.subsystems.StateMachine.RobotState;
 
 /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */
-public class CleanHighWithCoral extends Command {
+public class CleanHighWCoral extends Command {
   /** Creates a new CleanHighWithCoral. */
   Motion globalMotion;
   Rotors globalRotors;
@@ -26,7 +26,7 @@ public class CleanHighWithCoral extends Command {
   Drivetrain globalDrivetrain;
   MechanismPositionGroup cleanHighWithCoral;
 
-  public CleanHighWithCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors,
+  public CleanHighWCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors,
       Drivetrain subDrivetrain) {
     // Use addRequirements() here to declare subsystem dependencies.
     this.globalStateMachine = globalStateMachine;

src/main/java/frc/robot/commands/States/second_scoring_element/CleanLowWithCoral.java → src/main/java/frc/robot/commands/States/second_scoring_element/CleanLowWCoral.java

@@ -17,7 +17,7 @@
 import frc.robot.subsystems.StateMachine.RobotState;
 
 /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */
-public class CleanLowWithCoral extends Command {
+public class CleanLowWCoral extends Command {
   /** Creates a new CleanLowWithCoral. */
   Motion globalMotion;
   Rotors globalRotors;
@@ -26,7 +26,7 @@ public class CleanLowWithCoral extends Command {
   Drivetrain globalDrivetrain;
   MechanismPositionGroup cleanLowWithCoral;
 
-  public CleanLowWithCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors,
+  public CleanLowWCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors,
       Drivetrain subDrivetrain) {
     // Use addRequirements() here to declare subsystem dependencies.
     this.globalStateMachine = globalStateMachine;

src/main/java/frc/robot/commands/States/second_scoring_element/IntakeAlgaeGroundWithCoral.java → src/main/java/frc/robot/commands/States/second_scoring_element/IntakeAlgaeGroundWCoral.java

@@ -13,12 +13,12 @@
 import frc.robot.subsystems.StateMachine;
 
 /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */
-public class IntakeAlgaeGroundWithCoral extends Command {
+public class IntakeAlgaeGroundWCoral extends Command {
   Motion globalMotion;
   Rotors globalRotors;
   StateMachine globalStateMachine;
 
-  public IntakeAlgaeGroundWithCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors) {
+  public IntakeAlgaeGroundWCoral(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors) {
     // Use addRequirements() here to declare subsystem dependencies.
     globalMotion = subMotion;
     globalRotors = subRotors;

src/main/java/frc/robot/commands/States/second_scoring_element/IntakeCoralGroundWithAlgae.java → src/main/java/frc/robot/commands/States/second_scoring_element/IntakeCoralGroundWAlgae.java

@@ -13,12 +13,12 @@
 import frc.robot.subsystems.Rotors;
 
 /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */
-public class IntakeCoralGroundWithAlgae extends Command {
+public class IntakeCoralGroundWAlgae extends Command {
   StateMachine globalStateMachine;
   Motion globalMotion;
   Rotors globalRotors;
 
-  public IntakeCoralGroundWithAlgae(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors) {
+  public IntakeCoralGroundWAlgae(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors) {
     // Use addRequirements() here to declare subsystem dependencies.
     globalMotion = subMotion;
     globalRotors = subRotors;

src/main/java/frc/robot/commands/States/second_scoring_element/IntakeCoralStationWithAlgae.java → src/main/java/frc/robot/commands/States/second_scoring_element/IntakeCoralStationWAlgae.java

@@ -13,12 +13,12 @@
 import frc.robot.subsystems.StateMachine.RobotState;
 
 /* You should consider using the more terse Command factories API instead https://docs.wpilib.org/en/stable/docs/software/commandbased/organizing-command-based.html#defining-commands */
-public class IntakeCoralStationWithAlgae extends Command {
+public class IntakeCoralStationWAlgae extends Command {
   Motion globalMotion;
   Rotors globalRotors;
   StateMachine globalStateMachine;
 
-  public IntakeCoralStationWithAlgae(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors) {
+  public IntakeCoralStationWAlgae(StateMachine globalStateMachine, Motion subMotion, Rotors subRotors) {
     // Use addRequirements() here to declare subsystem dependencies.
     globalMotion = subMotion;
     globalRotors = subRotors;

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

@@ -167,7 +167,7 @@ public Command tryState(RobotState desiredState) {
           case PREP_CORAL_ZERO_WITH_ALGAE:
           case PREP_ALGAE_PROCESSOR_WITH_CORAL:
           case PREP_ALGAE_NET_WITH_CORAL:
-            return new PrepCoralWithAlgae(subStateMachine, subMotion, subRotors, subDrivetrain, 2);
+            return new PrepCoralWAlgae(subStateMachine, subMotion, subRotors, subDrivetrain, 2);
 
         }
         break;
@@ -180,7 +180,7 @@ public Command tryState(RobotState desiredState) {
           case PREP_CORAL_ZERO_WITH_ALGAE:
           case PREP_ALGAE_PROCESSOR_WITH_CORAL:
           case PREP_ALGAE_NET_WITH_CORAL:
-            return new PrepCoralWithAlgae(subStateMachine, subMotion, subRotors, subDrivetrain, 3);
+            return new PrepCoralWAlgae(subStateMachine, subMotion, subRotors, subDrivetrain, 3);
 
         }
         break;
@@ -193,7 +193,7 @@ public Command tryState(RobotState desiredState) {
           case PREP_CORAL_ZERO_WITH_ALGAE:
           case PREP_ALGAE_PROCESSOR_WITH_CORAL:
           case PREP_ALGAE_NET_WITH_CORAL:
-            return new PrepCoralWithAlgae(subStateMachine, subMotion, subRotors, subDrivetrain,
+            return new PrepCoralWAlgae(subStateMachine, subMotion, subRotors, subDrivetrain,
                 4);
 
         }
@@ -207,7 +207,7 @@ public Command tryState(RobotState desiredState) {
           case PREP_CORAL_L4_WITH_ALGAE:
           case PREP_ALGAE_PROCESSOR_WITH_CORAL:
           case PREP_ALGAE_NET_WITH_CORAL:
-            return new PrepCoralWithAlgae(subStateMachine, subMotion, subRotors, subDrivetrain, 0);
+            return new PrepCoralWAlgae(subStateMachine, subMotion, subRotors, subDrivetrain, 0);
 
         }
         break;
@@ -254,7 +254,7 @@ public Command tryState(RobotState desiredState) {
           case PREP_CORAL_L3_WITH_ALGAE:
           case PREP_CORAL_L4_WITH_ALGAE:
           case PREP_CORAL_ZERO_WITH_ALGAE:
-            return new PrepNetWithCoral(subStateMachine, subMotion, subRotors, subDrivetrain);
+            return new PrepNetWCoral(subStateMachine, subMotion, subRotors, subDrivetrain);
 
         }
         break;
@@ -267,7 +267,7 @@ public Command tryState(RobotState desiredState) {
           case PREP_CORAL_L3_WITH_ALGAE:
           case PREP_CORAL_L4_WITH_ALGAE:
           case PREP_CORAL_ZERO_WITH_ALGAE:
-            return new PrepProcessorWithCoral(subStateMachine, subMotion, subRotors);
+            return new PrepProcessorWCoral(subStateMachine, subMotion, subRotors);
 
         }
         break;
@@ -405,7 +405,7 @@ public Command tryState(RobotState desiredState) {
           case PREP_ALGAE_NET_WITH_CORAL:
           case PREP_ALGAE_PROCESSOR_WITH_CORAL:
           case PREP_CORAL_ZERO_WITH_ALGAE:
-            return new ScoringAlgaeWithCoral(subStateMachine, subRotors);
+            return new AlgaeScoringWCoral(subStateMachine, subRotors);
         }
         break;
 
@@ -416,7 +416,7 @@ public Command tryState(RobotState desiredState) {
           case PREP_CORAL_L4_WITH_ALGAE:
           case PREP_CORAL_ZERO_WITH_ALGAE:
 
-            return new ScoringCoralWithAlgae(subStateMachine, subRotors);
+            return new ScoringCoralWAlgae(subStateMachine, subRotors);
         }
         break;
 
@@ -428,7 +428,7 @@ public Command tryState(RobotState desiredState) {
           case PREP_CORAL_L4:
           case HAS_CORAL:
           case INTAKE_ALGAE_GROUND_WITH_CORAL:
-            return new CleanHighWithCoral(subStateMachine, subMotion, subRotors, subDrivetrain);
+            return new CleanHighWCoral(subStateMachine, subMotion, subRotors, subDrivetrain);
         }
         break;
 
@@ -440,7 +440,7 @@ public Command tryState(RobotState desiredState) {
           case PREP_CORAL_L4:
           case CLEAN_HIGH_WITH_CORAL:
           case INTAKE_ALGAE_GROUND_WITH_CORAL:
-            return new CleanLowWithCoral(subStateMachine, subMotion, subRotors, subDrivetrain);
+            return new CleanLowWCoral(subStateMachine, subMotion, subRotors, subDrivetrain);
         }
         break;
 
@@ -456,7 +456,7 @@ public Command tryState(RobotState desiredState) {
         switch (currentRobotState) {
           case HAS_ALGAE:
           case INTAKE_CORAL_STATION_WITH_ALGAE:
-            return new IntakeCoralGroundWithAlgae(subStateMachine, subMotion, subRotors);
+            return new IntakeCoralGroundWAlgae(subStateMachine, subMotion, subRotors);
         }
         break;
 
@@ -466,14 +466,14 @@ public Command tryState(RobotState desiredState) {
           case CLEAN_HIGH_WITH_CORAL:
           case CLEAN_LOW_WITH_CORAL:
           case PREP_CORAL_ZERO:
-            return new IntakeAlgaeGroundWithCoral(subStateMachine, subMotion, subRotors);
+            return new IntakeAlgaeGroundWCoral(subStateMachine, subMotion, subRotors);
         }
         break;
       case INTAKE_CORAL_STATION_WITH_ALGAE:
         switch (currentRobotState) {
           case HAS_ALGAE:
           case INTAKE_CORAL_GROUND_WITH_ALGAE:
-            return new IntakeCoralStationWithAlgae(subStateMachine, subMotion, subRotors);
+            return new IntakeCoralStationWAlgae(subStateMachine, subMotion, subRotors);
         }
         break;
     }