From 6ad2a614131c1f2e6f5a0d3660bb7f5c0c60c771 Mon Sep 17 00:00:00 2001 From: "Keenan D. Buckley" Date: Sun, 8 Mar 2020 10:24:40 -0600 Subject: [PATCH] Rename Related Commands --- .../java/frc4388/robot/commands/shooter/ShootFireGroup.java | 4 ++-- .../java/frc4388/robot/commands/shooter/ShootPrepGroup.java | 4 ++-- .../commands/storage/{StorageRun.java => StorageFire.java} | 4 ++-- .../storage/{StoragePrepAim.java => StoragePrep.java} | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename src/main/java/frc4388/robot/commands/storage/{StorageRun.java => StorageFire.java} (93%) rename src/main/java/frc4388/robot/commands/storage/{StoragePrepAim.java => StoragePrep.java} (95%) diff --git a/src/main/java/frc4388/robot/commands/shooter/ShootFireGroup.java b/src/main/java/frc4388/robot/commands/shooter/ShootFireGroup.java index 15ee080..02d5799 100644 --- a/src/main/java/frc4388/robot/commands/shooter/ShootFireGroup.java +++ b/src/main/java/frc4388/robot/commands/shooter/ShootFireGroup.java @@ -9,7 +9,7 @@ package frc4388.robot.commands.shooter; import edu.wpi.first.wpilibj2.command.ParallelRaceGroup; import edu.wpi.first.wpilibj2.command.RunCommand; -import frc4388.robot.commands.storage.StorageRun; +import frc4388.robot.commands.storage.StorageFire; import frc4388.robot.subsystems.Shooter; import frc4388.robot.subsystems.ShooterAim; import frc4388.robot.subsystems.ShooterHood; @@ -30,7 +30,7 @@ public class ShootFireGroup extends ParallelRaceGroup { new RunCommand(() -> m_shooter.runDrumShooterVelocityPID(m_shooter.addFireVel()), m_shooter), new RunCommand(() -> m_shooterHood.runAngleAdjustPID(m_shooterHood.addFireAngle()), m_shooterHood), new TrackTarget(m_shooterAim) - //new StorageRun(m_storage) + //new StorageFire(m_storage) ); } } \ No newline at end of file diff --git a/src/main/java/frc4388/robot/commands/shooter/ShootPrepGroup.java b/src/main/java/frc4388/robot/commands/shooter/ShootPrepGroup.java index 14accc3..d919d32 100644 --- a/src/main/java/frc4388/robot/commands/shooter/ShootPrepGroup.java +++ b/src/main/java/frc4388/robot/commands/shooter/ShootPrepGroup.java @@ -8,7 +8,7 @@ package frc4388.robot.commands.shooter; import edu.wpi.first.wpilibj2.command.ParallelDeadlineGroup; -import frc4388.robot.commands.storage.StoragePrepAim; +import frc4388.robot.commands.storage.StoragePrep; import frc4388.robot.subsystems.Shooter; import frc4388.robot.subsystems.ShooterAim; import frc4388.robot.subsystems.ShooterHood; @@ -30,7 +30,7 @@ public class ShootPrepGroup extends ParallelDeadlineGroup { new TrackTarget(m_shooterAim), new ShooterVelocityControlPID(m_shooter), new HoodPositionPID(m_shooterHood), - new StoragePrepAim(m_storage) + new StoragePrep(m_storage) ); } } diff --git a/src/main/java/frc4388/robot/commands/storage/StorageRun.java b/src/main/java/frc4388/robot/commands/storage/StorageFire.java similarity index 93% rename from src/main/java/frc4388/robot/commands/storage/StorageRun.java rename to src/main/java/frc4388/robot/commands/storage/StorageFire.java index 11dbc4b..6413c1e 100644 --- a/src/main/java/frc4388/robot/commands/storage/StorageRun.java +++ b/src/main/java/frc4388/robot/commands/storage/StorageFire.java @@ -11,13 +11,13 @@ import edu.wpi.first.wpilibj2.command.CommandBase; import frc4388.robot.Constants.StorageConstants; import frc4388.robot.subsystems.Storage; -public class StorageRun extends CommandBase { +public class StorageFire extends CommandBase { Storage m_storage; /** * Runs the Storage at a speed * @param storageSub The Storage subsytem */ - public StorageRun(Storage storageSub) { + public StorageFire(Storage storageSub) { m_storage = storageSub; } diff --git a/src/main/java/frc4388/robot/commands/storage/StoragePrepAim.java b/src/main/java/frc4388/robot/commands/storage/StoragePrep.java similarity index 95% rename from src/main/java/frc4388/robot/commands/storage/StoragePrepAim.java rename to src/main/java/frc4388/robot/commands/storage/StoragePrep.java index 6d47abf..09850f8 100644 --- a/src/main/java/frc4388/robot/commands/storage/StoragePrepAim.java +++ b/src/main/java/frc4388/robot/commands/storage/StoragePrep.java @@ -12,14 +12,14 @@ import edu.wpi.first.wpilibj2.command.CommandBase; import frc4388.robot.Constants.StorageConstants; import frc4388.robot.subsystems.Storage; -public class StoragePrepAim extends CommandBase { +public class StoragePrep extends CommandBase { Storage m_storage; double startTime; /** * Prepares the Storage for aiming * @param storeSub The Storage subsystem */ - public StoragePrepAim(Storage storeSub) { + public StoragePrep(Storage storeSub) { m_storage = storeSub; addRequirements(m_storage); }