From 6bb7f8ac8eca89a8e0b308720f7e15178eef43ea Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Sun, 14 Feb 2016 15:27:35 -0800 Subject: [PATCH] Add everything all commands to specific packages --- src/org/usfirst/frc/team3501/robot/OI.java | 4 +-- .../frc/team3501/robot/commands/Detect.java | 30 ------------------- .../frc/team3501/robot/commands/Drive.java | 30 ------------------- .../frc/team3501/robot/commands/Intake.java | 30 ------------------- .../MoveIntakeArmToBallIntakeHeight.java | 5 ---- .../frc/team3501/robot/commands/Position.java | 30 ------------------- .../commands/{ => auton}/AimAndAlign.java | 2 +- .../{ => auton}/DefaultAutonStrategy.java | 3 +- .../commands/{ => auton}/LiftPortcullis.java | 2 +- .../robot/commands/{ => auton}/LiftRobot.java | 2 +- .../{ => auton}/PassChevalDeFrise.java | 2 +- .../commands/{ => auton}/PassDrawBridge.java | 2 +- .../commands/{ => auton}/PassLowBar.java | 2 +- .../robot/commands/{ => auton}/PassMoat.java | 2 +- .../commands/{ => auton}/PassRampart.java | 2 +- .../commands/{ => auton}/PassRockWall.java | 2 +- .../{ => auton}/PassRoughTerrain.java | 2 +- .../commands/{ => auton}/PassSallyPort.java | 2 +- .../LowerDefenseArmContinuous.java | 2 +- .../LowerDefenseWristContinuous.java | 2 +- .../RaiseDefenseArmContinuous.java | 2 +- .../RaiseDefenseWristContinuous.java | 2 +- .../{ => defensearm}/RetractDefenseArm.java | 2 +- .../{ => defensearm}/SetArmToAngle.java | 2 +- .../{ => defensearm}/SetHandToAngle.java | 2 +- .../{ => driving}/DriveForDistance.java | 2 +- .../robot/commands/{ => driving}/Stop.java | 2 +- .../commands/{ => driving}/TurnForAngle.java | 2 +- .../commands/{ => driving}/TurnForTime.java | 2 +- .../BallRollerExpelContinuous.java | 2 +- .../BallRollerIntakeContinuous.java | 2 +- .../commands/{ => intakearm}/ExpelBall.java | 2 +- .../commands/{ => intakearm}/IntakeBall.java | 2 +- .../{ => intakearm}/MoveIntakeArmToAngle.java | 2 +- .../MoveIntakeArmToBallIntakeHeight.java | 5 ++++ .../{ => intakearm}/MoveIntakeArmUp.java | 2 +- .../robot/commands/{ => scaler}/ClampBar.java | 2 +- .../commands/{ => scaler}/ExtendLift.java | 2 +- .../commands/{ => scaler}/RetractLift.java | 2 +- .../{ => shooter}/ChangeShooterSpeed.java | 2 +- .../{ => shooter}/SetShooterSpeed.java | 2 +- .../robot/commands/{ => shooter}/Shoot.java | 2 +- .../commands/{ => shooter}/runShooter.java | 2 +- 43 files changed, 44 insertions(+), 163 deletions(-) delete mode 100755 src/org/usfirst/frc/team3501/robot/commands/Detect.java delete mode 100755 src/org/usfirst/frc/team3501/robot/commands/Drive.java delete mode 100755 src/org/usfirst/frc/team3501/robot/commands/Intake.java delete mode 100644 src/org/usfirst/frc/team3501/robot/commands/MoveIntakeArmToBallIntakeHeight.java delete mode 100755 src/org/usfirst/frc/team3501/robot/commands/Position.java rename src/org/usfirst/frc/team3501/robot/commands/{ => auton}/AimAndAlign.java (86%) rename src/org/usfirst/frc/team3501/robot/commands/{ => auton}/DefaultAutonStrategy.java (90%) rename src/org/usfirst/frc/team3501/robot/commands/{ => auton}/LiftPortcullis.java (93%) rename src/org/usfirst/frc/team3501/robot/commands/{ => auton}/LiftRobot.java (86%) rename src/org/usfirst/frc/team3501/robot/commands/{ => auton}/PassChevalDeFrise.java (93%) rename src/org/usfirst/frc/team3501/robot/commands/{ => auton}/PassDrawBridge.java (92%) rename src/org/usfirst/frc/team3501/robot/commands/{ => auton}/PassLowBar.java (92%) rename src/org/usfirst/frc/team3501/robot/commands/{ => auton}/PassMoat.java (92%) rename src/org/usfirst/frc/team3501/robot/commands/{ => auton}/PassRampart.java (92%) rename src/org/usfirst/frc/team3501/robot/commands/{ => auton}/PassRockWall.java (92%) rename src/org/usfirst/frc/team3501/robot/commands/{ => auton}/PassRoughTerrain.java (92%) rename src/org/usfirst/frc/team3501/robot/commands/{ => auton}/PassSallyPort.java (94%) rename src/org/usfirst/frc/team3501/robot/commands/{ => defensearm}/LowerDefenseArmContinuous.java (93%) rename src/org/usfirst/frc/team3501/robot/commands/{ => defensearm}/LowerDefenseWristContinuous.java (93%) rename src/org/usfirst/frc/team3501/robot/commands/{ => defensearm}/RaiseDefenseArmContinuous.java (93%) rename src/org/usfirst/frc/team3501/robot/commands/{ => defensearm}/RaiseDefenseWristContinuous.java (93%) rename src/org/usfirst/frc/team3501/robot/commands/{ => defensearm}/RetractDefenseArm.java (92%) rename src/org/usfirst/frc/team3501/robot/commands/{ => defensearm}/SetArmToAngle.java (95%) rename src/org/usfirst/frc/team3501/robot/commands/{ => defensearm}/SetHandToAngle.java (95%) rename src/org/usfirst/frc/team3501/robot/commands/{ => driving}/DriveForDistance.java (91%) rename src/org/usfirst/frc/team3501/robot/commands/{ => driving}/Stop.java (85%) rename src/org/usfirst/frc/team3501/robot/commands/{ => driving}/TurnForAngle.java (86%) rename src/org/usfirst/frc/team3501/robot/commands/{ => driving}/TurnForTime.java (86%) rename src/org/usfirst/frc/team3501/robot/commands/{ => intakearm}/BallRollerExpelContinuous.java (93%) rename src/org/usfirst/frc/team3501/robot/commands/{ => intakearm}/BallRollerIntakeContinuous.java (93%) rename src/org/usfirst/frc/team3501/robot/commands/{ => intakearm}/ExpelBall.java (94%) rename src/org/usfirst/frc/team3501/robot/commands/{ => intakearm}/IntakeBall.java (94%) rename src/org/usfirst/frc/team3501/robot/commands/{ => intakearm}/MoveIntakeArmToAngle.java (95%) create mode 100644 src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmToBallIntakeHeight.java rename src/org/usfirst/frc/team3501/robot/commands/{ => intakearm}/MoveIntakeArmUp.java (86%) rename src/org/usfirst/frc/team3501/robot/commands/{ => scaler}/ClampBar.java (93%) rename src/org/usfirst/frc/team3501/robot/commands/{ => scaler}/ExtendLift.java (89%) rename src/org/usfirst/frc/team3501/robot/commands/{ => scaler}/RetractLift.java (88%) rename src/org/usfirst/frc/team3501/robot/commands/{ => shooter}/ChangeShooterSpeed.java (90%) rename src/org/usfirst/frc/team3501/robot/commands/{ => shooter}/SetShooterSpeed.java (90%) rename src/org/usfirst/frc/team3501/robot/commands/{ => shooter}/Shoot.java (85%) rename src/org/usfirst/frc/team3501/robot/commands/{ => shooter}/runShooter.java (89%) diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java index 6b2f0510..1c891af0 100644 --- a/src/org/usfirst/frc/team3501/robot/OI.java +++ b/src/org/usfirst/frc/team3501/robot/OI.java @@ -1,7 +1,7 @@ package org.usfirst.frc.team3501.robot; -import org.usfirst.frc.team3501.robot.commands.ChangeShooterSpeed; -import org.usfirst.frc.team3501.robot.commands.SetShooterSpeed; +import org.usfirst.frc.team3501.robot.commands.shooter.ChangeShooterSpeed; +import org.usfirst.frc.team3501.robot.commands.shooter.SetShooterSpeed; import edu.wpi.first.wpilibj.Joystick; import edu.wpi.first.wpilibj.buttons.Button; diff --git a/src/org/usfirst/frc/team3501/robot/commands/Detect.java b/src/org/usfirst/frc/team3501/robot/commands/Detect.java deleted file mode 100755 index 95ad0019..00000000 --- a/src/org/usfirst/frc/team3501/robot/commands/Detect.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.usfirst.frc.team3501.robot.commands; - -import edu.wpi.first.wpilibj.command.Command; - -public class Detect extends Command { - - public Detect() { - } - - @Override - protected void initialize() { - } - - @Override - protected void execute() { - } - - @Override - protected boolean isFinished() { - return false; - } - - @Override - protected void end() { - } - - @Override - protected void interrupted() { - } -} diff --git a/src/org/usfirst/frc/team3501/robot/commands/Drive.java b/src/org/usfirst/frc/team3501/robot/commands/Drive.java deleted file mode 100755 index d036f2c8..00000000 --- a/src/org/usfirst/frc/team3501/robot/commands/Drive.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.usfirst.frc.team3501.robot.commands; - -import edu.wpi.first.wpilibj.command.Command; - -public class Drive extends Command { - - public Drive() { - } - - @Override - protected void initialize() { - } - - @Override - protected void execute() { - } - - @Override - protected boolean isFinished() { - return false; - } - - @Override - protected void end() { - } - - @Override - protected void interrupted() { - } -} diff --git a/src/org/usfirst/frc/team3501/robot/commands/Intake.java b/src/org/usfirst/frc/team3501/robot/commands/Intake.java deleted file mode 100755 index 3cef684d..00000000 --- a/src/org/usfirst/frc/team3501/robot/commands/Intake.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.usfirst.frc.team3501.robot.commands; - -import edu.wpi.first.wpilibj.command.Command; - -public class Intake extends Command { - - public Intake() { - } - - @Override - protected void initialize() { - } - - @Override - protected void execute() { - } - - @Override - protected boolean isFinished() { - return false; - } - - @Override - protected void end() { - } - - @Override - protected void interrupted() { - } -} diff --git a/src/org/usfirst/frc/team3501/robot/commands/MoveIntakeArmToBallIntakeHeight.java b/src/org/usfirst/frc/team3501/robot/commands/MoveIntakeArmToBallIntakeHeight.java deleted file mode 100644 index 805bd786..00000000 --- a/src/org/usfirst/frc/team3501/robot/commands/MoveIntakeArmToBallIntakeHeight.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.usfirst.frc.team3501.robot.commands; - -public class MoveIntakeArmToBallIntakeHeight { - -} diff --git a/src/org/usfirst/frc/team3501/robot/commands/Position.java b/src/org/usfirst/frc/team3501/robot/commands/Position.java deleted file mode 100755 index e1a8c869..00000000 --- a/src/org/usfirst/frc/team3501/robot/commands/Position.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.usfirst.frc.team3501.robot.commands; - -import edu.wpi.first.wpilibj.command.Command; - -public class Position extends Command { - - public Position() { - } - - @Override - protected void initialize() { - } - - @Override - protected void execute() { - } - - @Override - protected boolean isFinished() { - return false; - } - - @Override - protected void end() { - } - - @Override - protected void interrupted() { - } -} diff --git a/src/org/usfirst/frc/team3501/robot/commands/AimAndAlign.java b/src/org/usfirst/frc/team3501/robot/commands/auton/AimAndAlign.java similarity index 86% rename from src/org/usfirst/frc/team3501/robot/commands/AimAndAlign.java rename to src/org/usfirst/frc/team3501/robot/commands/auton/AimAndAlign.java index 72819405..d304013f 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/AimAndAlign.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/AimAndAlign.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.auton; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/DefaultAutonStrategy.java b/src/org/usfirst/frc/team3501/robot/commands/auton/DefaultAutonStrategy.java similarity index 90% rename from src/org/usfirst/frc/team3501/robot/commands/DefaultAutonStrategy.java rename to src/org/usfirst/frc/team3501/robot/commands/auton/DefaultAutonStrategy.java index 99fe317d..4146977d 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/DefaultAutonStrategy.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/DefaultAutonStrategy.java @@ -1,6 +1,7 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.auton; import org.usfirst.frc.team3501.robot.Constants.Defense; +import org.usfirst.frc.team3501.robot.commands.shooter.Shoot; import edu.wpi.first.wpilibj.command.CommandGroup; diff --git a/src/org/usfirst/frc/team3501/robot/commands/LiftPortcullis.java b/src/org/usfirst/frc/team3501/robot/commands/auton/LiftPortcullis.java similarity index 93% rename from src/org/usfirst/frc/team3501/robot/commands/LiftPortcullis.java rename to src/org/usfirst/frc/team3501/robot/commands/auton/LiftPortcullis.java index 992f9e1a..fbef75d4 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/LiftPortcullis.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/LiftPortcullis.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.auton; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/LiftRobot.java b/src/org/usfirst/frc/team3501/robot/commands/auton/LiftRobot.java similarity index 86% rename from src/org/usfirst/frc/team3501/robot/commands/LiftRobot.java rename to src/org/usfirst/frc/team3501/robot/commands/auton/LiftRobot.java index 024958f4..e5953b19 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/LiftRobot.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/LiftRobot.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.auton; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/PassChevalDeFrise.java b/src/org/usfirst/frc/team3501/robot/commands/auton/PassChevalDeFrise.java similarity index 93% rename from src/org/usfirst/frc/team3501/robot/commands/PassChevalDeFrise.java rename to src/org/usfirst/frc/team3501/robot/commands/auton/PassChevalDeFrise.java index 2f80dc23..4dc469fd 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/PassChevalDeFrise.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassChevalDeFrise.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.auton; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/PassDrawBridge.java b/src/org/usfirst/frc/team3501/robot/commands/auton/PassDrawBridge.java similarity index 92% rename from src/org/usfirst/frc/team3501/robot/commands/PassDrawBridge.java rename to src/org/usfirst/frc/team3501/robot/commands/auton/PassDrawBridge.java index ad3d7ee7..497ef92e 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/PassDrawBridge.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassDrawBridge.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.auton; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/PassLowBar.java b/src/org/usfirst/frc/team3501/robot/commands/auton/PassLowBar.java similarity index 92% rename from src/org/usfirst/frc/team3501/robot/commands/PassLowBar.java rename to src/org/usfirst/frc/team3501/robot/commands/auton/PassLowBar.java index f5570041..8d42325e 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/PassLowBar.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassLowBar.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.auton; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/PassMoat.java b/src/org/usfirst/frc/team3501/robot/commands/auton/PassMoat.java similarity index 92% rename from src/org/usfirst/frc/team3501/robot/commands/PassMoat.java rename to src/org/usfirst/frc/team3501/robot/commands/auton/PassMoat.java index 634240a4..7178aa1f 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/PassMoat.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassMoat.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.auton; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/PassRampart.java b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRampart.java similarity index 92% rename from src/org/usfirst/frc/team3501/robot/commands/PassRampart.java rename to src/org/usfirst/frc/team3501/robot/commands/auton/PassRampart.java index d531d88b..f381af4f 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/PassRampart.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRampart.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.auton; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/PassRockWall.java b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java similarity index 92% rename from src/org/usfirst/frc/team3501/robot/commands/PassRockWall.java rename to src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java index 874eb22a..7498138e 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/PassRockWall.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.auton; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/PassRoughTerrain.java b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRoughTerrain.java similarity index 92% rename from src/org/usfirst/frc/team3501/robot/commands/PassRoughTerrain.java rename to src/org/usfirst/frc/team3501/robot/commands/auton/PassRoughTerrain.java index b1f0fb76..6706fb38 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/PassRoughTerrain.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRoughTerrain.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.auton; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/PassSallyPort.java b/src/org/usfirst/frc/team3501/robot/commands/auton/PassSallyPort.java similarity index 94% rename from src/org/usfirst/frc/team3501/robot/commands/PassSallyPort.java rename to src/org/usfirst/frc/team3501/robot/commands/auton/PassSallyPort.java index b2734acf..8d5db25f 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/PassSallyPort.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassSallyPort.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.auton; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/LowerDefenseArmContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/defensearm/LowerDefenseArmContinuous.java similarity index 93% rename from src/org/usfirst/frc/team3501/robot/commands/LowerDefenseArmContinuous.java rename to src/org/usfirst/frc/team3501/robot/commands/defensearm/LowerDefenseArmContinuous.java index b5fe5649..208accbd 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/LowerDefenseArmContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/defensearm/LowerDefenseArmContinuous.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.defensearm; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/LowerDefenseWristContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/defensearm/LowerDefenseWristContinuous.java similarity index 93% rename from src/org/usfirst/frc/team3501/robot/commands/LowerDefenseWristContinuous.java rename to src/org/usfirst/frc/team3501/robot/commands/defensearm/LowerDefenseWristContinuous.java index d5319633..204bdf27 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/LowerDefenseWristContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/defensearm/LowerDefenseWristContinuous.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.defensearm; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/RaiseDefenseArmContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/defensearm/RaiseDefenseArmContinuous.java similarity index 93% rename from src/org/usfirst/frc/team3501/robot/commands/RaiseDefenseArmContinuous.java rename to src/org/usfirst/frc/team3501/robot/commands/defensearm/RaiseDefenseArmContinuous.java index 9749ac3c..53839142 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/RaiseDefenseArmContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/defensearm/RaiseDefenseArmContinuous.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.defensearm; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/RaiseDefenseWristContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/defensearm/RaiseDefenseWristContinuous.java similarity index 93% rename from src/org/usfirst/frc/team3501/robot/commands/RaiseDefenseWristContinuous.java rename to src/org/usfirst/frc/team3501/robot/commands/defensearm/RaiseDefenseWristContinuous.java index 6b54111b..a670fac1 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/RaiseDefenseWristContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/defensearm/RaiseDefenseWristContinuous.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.defensearm; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/RetractDefenseArm.java b/src/org/usfirst/frc/team3501/robot/commands/defensearm/RetractDefenseArm.java similarity index 92% rename from src/org/usfirst/frc/team3501/robot/commands/RetractDefenseArm.java rename to src/org/usfirst/frc/team3501/robot/commands/defensearm/RetractDefenseArm.java index 95f5f92e..9a4c7880 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/RetractDefenseArm.java +++ b/src/org/usfirst/frc/team3501/robot/commands/defensearm/RetractDefenseArm.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.defensearm; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/SetArmToAngle.java b/src/org/usfirst/frc/team3501/robot/commands/defensearm/SetArmToAngle.java similarity index 95% rename from src/org/usfirst/frc/team3501/robot/commands/SetArmToAngle.java rename to src/org/usfirst/frc/team3501/robot/commands/defensearm/SetArmToAngle.java index d5a0409b..709757de 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/SetArmToAngle.java +++ b/src/org/usfirst/frc/team3501/robot/commands/defensearm/SetArmToAngle.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.defensearm; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/SetHandToAngle.java b/src/org/usfirst/frc/team3501/robot/commands/defensearm/SetHandToAngle.java similarity index 95% rename from src/org/usfirst/frc/team3501/robot/commands/SetHandToAngle.java rename to src/org/usfirst/frc/team3501/robot/commands/defensearm/SetHandToAngle.java index f89ac0da..60618d56 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/SetHandToAngle.java +++ b/src/org/usfirst/frc/team3501/robot/commands/defensearm/SetHandToAngle.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.defensearm; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/DriveForDistance.java b/src/org/usfirst/frc/team3501/robot/commands/driving/DriveForDistance.java similarity index 91% rename from src/org/usfirst/frc/team3501/robot/commands/DriveForDistance.java rename to src/org/usfirst/frc/team3501/robot/commands/driving/DriveForDistance.java index 719e1662..6765216d 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/DriveForDistance.java +++ b/src/org/usfirst/frc/team3501/robot/commands/driving/DriveForDistance.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.driving; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/Stop.java b/src/org/usfirst/frc/team3501/robot/commands/driving/Stop.java similarity index 85% rename from src/org/usfirst/frc/team3501/robot/commands/Stop.java rename to src/org/usfirst/frc/team3501/robot/commands/driving/Stop.java index 69c67d6e..dc134394 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/Stop.java +++ b/src/org/usfirst/frc/team3501/robot/commands/driving/Stop.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.driving; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/TurnForAngle.java b/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java similarity index 86% rename from src/org/usfirst/frc/team3501/robot/commands/TurnForAngle.java rename to src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java index d1b61a2a..7c3fba79 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/TurnForAngle.java +++ b/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForAngle.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.driving; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/TurnForTime.java b/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForTime.java similarity index 86% rename from src/org/usfirst/frc/team3501/robot/commands/TurnForTime.java rename to src/org/usfirst/frc/team3501/robot/commands/driving/TurnForTime.java index e1987e7a..d184f58c 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/TurnForTime.java +++ b/src/org/usfirst/frc/team3501/robot/commands/driving/TurnForTime.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.driving; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/BallRollerExpelContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/intakearm/BallRollerExpelContinuous.java similarity index 93% rename from src/org/usfirst/frc/team3501/robot/commands/BallRollerExpelContinuous.java rename to src/org/usfirst/frc/team3501/robot/commands/intakearm/BallRollerExpelContinuous.java index 30947453..638716cf 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/BallRollerExpelContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/intakearm/BallRollerExpelContinuous.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.intakearm; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/BallRollerIntakeContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/intakearm/BallRollerIntakeContinuous.java similarity index 93% rename from src/org/usfirst/frc/team3501/robot/commands/BallRollerIntakeContinuous.java rename to src/org/usfirst/frc/team3501/robot/commands/intakearm/BallRollerIntakeContinuous.java index f8c3ffdd..d3a01b4b 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/BallRollerIntakeContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/intakearm/BallRollerIntakeContinuous.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.intakearm; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/ExpelBall.java b/src/org/usfirst/frc/team3501/robot/commands/intakearm/ExpelBall.java similarity index 94% rename from src/org/usfirst/frc/team3501/robot/commands/ExpelBall.java rename to src/org/usfirst/frc/team3501/robot/commands/intakearm/ExpelBall.java index ba95e6e2..83ee34e6 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/ExpelBall.java +++ b/src/org/usfirst/frc/team3501/robot/commands/intakearm/ExpelBall.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.intakearm; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/IntakeBall.java b/src/org/usfirst/frc/team3501/robot/commands/intakearm/IntakeBall.java similarity index 94% rename from src/org/usfirst/frc/team3501/robot/commands/IntakeBall.java rename to src/org/usfirst/frc/team3501/robot/commands/intakearm/IntakeBall.java index 87902d39..8eda8dba 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/IntakeBall.java +++ b/src/org/usfirst/frc/team3501/robot/commands/intakearm/IntakeBall.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.intakearm; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/MoveIntakeArmToAngle.java b/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmToAngle.java similarity index 95% rename from src/org/usfirst/frc/team3501/robot/commands/MoveIntakeArmToAngle.java rename to src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmToAngle.java index 092f2d41..8541262c 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/MoveIntakeArmToAngle.java +++ b/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmToAngle.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.intakearm; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmToBallIntakeHeight.java b/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmToBallIntakeHeight.java new file mode 100644 index 00000000..e618c8a6 --- /dev/null +++ b/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmToBallIntakeHeight.java @@ -0,0 +1,5 @@ +package org.usfirst.frc.team3501.robot.commands.intakearm; + +public class MoveIntakeArmToBallIntakeHeight { + +} diff --git a/src/org/usfirst/frc/team3501/robot/commands/MoveIntakeArmUp.java b/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmUp.java similarity index 86% rename from src/org/usfirst/frc/team3501/robot/commands/MoveIntakeArmUp.java rename to src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmUp.java index c51eeaee..c22bf82d 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/MoveIntakeArmUp.java +++ b/src/org/usfirst/frc/team3501/robot/commands/intakearm/MoveIntakeArmUp.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.intakearm; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/ClampBar.java b/src/org/usfirst/frc/team3501/robot/commands/scaler/ClampBar.java similarity index 93% rename from src/org/usfirst/frc/team3501/robot/commands/ClampBar.java rename to src/org/usfirst/frc/team3501/robot/commands/scaler/ClampBar.java index 90f9c7e6..9e9fbc1b 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/ClampBar.java +++ b/src/org/usfirst/frc/team3501/robot/commands/scaler/ClampBar.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.scaler; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/ExtendLift.java b/src/org/usfirst/frc/team3501/robot/commands/scaler/ExtendLift.java similarity index 89% rename from src/org/usfirst/frc/team3501/robot/commands/ExtendLift.java rename to src/org/usfirst/frc/team3501/robot/commands/scaler/ExtendLift.java index cebbc89b..f4001d9a 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/ExtendLift.java +++ b/src/org/usfirst/frc/team3501/robot/commands/scaler/ExtendLift.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.scaler; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/RetractLift.java b/src/org/usfirst/frc/team3501/robot/commands/scaler/RetractLift.java similarity index 88% rename from src/org/usfirst/frc/team3501/robot/commands/RetractLift.java rename to src/org/usfirst/frc/team3501/robot/commands/scaler/RetractLift.java index 953d4289..e160b19c 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/RetractLift.java +++ b/src/org/usfirst/frc/team3501/robot/commands/scaler/RetractLift.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.scaler; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/ChangeShooterSpeed.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/ChangeShooterSpeed.java similarity index 90% rename from src/org/usfirst/frc/team3501/robot/commands/ChangeShooterSpeed.java rename to src/org/usfirst/frc/team3501/robot/commands/shooter/ChangeShooterSpeed.java index 637afc17..186f7972 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/ChangeShooterSpeed.java +++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/ChangeShooterSpeed.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.shooter; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/SetShooterSpeed.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/SetShooterSpeed.java similarity index 90% rename from src/org/usfirst/frc/team3501/robot/commands/SetShooterSpeed.java rename to src/org/usfirst/frc/team3501/robot/commands/shooter/SetShooterSpeed.java index 98c4c97d..6dce5005 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/SetShooterSpeed.java +++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/SetShooterSpeed.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.shooter; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/Shoot.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/Shoot.java similarity index 85% rename from src/org/usfirst/frc/team3501/robot/commands/Shoot.java rename to src/org/usfirst/frc/team3501/robot/commands/shooter/Shoot.java index fbfafeb9..ec5a11d5 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/Shoot.java +++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/Shoot.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.shooter; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc/team3501/robot/commands/runShooter.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/runShooter.java similarity index 89% rename from src/org/usfirst/frc/team3501/robot/commands/runShooter.java rename to src/org/usfirst/frc/team3501/robot/commands/shooter/runShooter.java index 3d87624f..b69ae167 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/runShooter.java +++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/runShooter.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.shooter; import org.usfirst.frc.team3501.robot.Robot; -- 2.30.2