From 1fb6ed96403e3cd89640a375a690d34ea331d6c2 Mon Sep 17 00:00:00 2001 From: Meryem Esa Date: Mon, 15 Feb 2016 11:24:47 -0800 Subject: [PATCH] move commands/command groups to the proper packages --- .../frc/team3501/robot/commands/PassMoat.java | 39 ------------------- .../team3501/robot/commands/PassRockWall.java | 2 + .../commands/{ => auton}/AlignToScore.java | 2 +- .../robot/commands/auton/PassMoat.java | 9 +++++ .../robot/commands/auton/PassRockWall.java | 9 +++-- .../commands/{ => driving}/DriveForTime.java | 2 +- 6 files changed, 19 insertions(+), 44 deletions(-) delete mode 100755 src/org/usfirst/frc/team3501/robot/commands/PassMoat.java rename src/org/usfirst/frc/team3501/robot/commands/{ => auton}/AlignToScore.java (98%) rename src/org/usfirst/frc/team3501/robot/commands/{ => driving}/DriveForTime.java (91%) diff --git a/src/org/usfirst/frc/team3501/robot/commands/PassMoat.java b/src/org/usfirst/frc/team3501/robot/commands/PassMoat.java deleted file mode 100755 index b54508f4..00000000 --- a/src/org/usfirst/frc/team3501/robot/commands/PassMoat.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.usfirst.frc.team3501.robot.commands; - -import edu.wpi.first.wpilibj.command.CommandGroup; - -/*** - * This command will drive the robot through the moat. - * - * The code drives the robot for a specific time at a specific speed up the ramp - * to the defense then drive over the defense at a different speed and time. - * - * dependency on subsystem: drivetrain - * - * dependency on other commands: DriveForTime - * - * pre-condition: robot is flush against the ramp of the outerworks in front of - * the moat - * - * post-condition: the robot has passed the moat and is in the next zone - * - * @author Meryem and Avi - * - */ - -public class PassMoat extends CommandGroup { - - private final double BEG_TIME = 0; - private final double MID_TIME = 0; - private final double END_TIME = 0; - private final double BEG_SPEED = 0; - private final double MID_SPEED = 0; - private final double END_SPEED = 0; - - public PassMoat() { - addSequential(new DriveForTime(BEG_TIME, BEG_SPEED)); - addSequential(new DriveForTime(MID_TIME, MID_SPEED)); - addSequential(new DriveForTime(END_TIME, END_SPEED)); - - } -} diff --git a/src/org/usfirst/frc/team3501/robot/commands/PassRockWall.java b/src/org/usfirst/frc/team3501/robot/commands/PassRockWall.java index 9e1eb2eb..02499419 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/PassRockWall.java +++ b/src/org/usfirst/frc/team3501/robot/commands/PassRockWall.java @@ -1,5 +1,7 @@ package org.usfirst.frc.team3501.robot.commands; +import org.usfirst.frc.team3501.robot.commands.driving.DriveForTime; + import edu.wpi.first.wpilibj.command.CommandGroup; /*** diff --git a/src/org/usfirst/frc/team3501/robot/commands/AlignToScore.java b/src/org/usfirst/frc/team3501/robot/commands/auton/AlignToScore.java similarity index 98% rename from src/org/usfirst/frc/team3501/robot/commands/AlignToScore.java rename to src/org/usfirst/frc/team3501/robot/commands/auton/AlignToScore.java index e5550cb1..31811723 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/AlignToScore.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/AlignToScore.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.auton; import org.usfirst.frc.team3501.robot.Robot; diff --git a/src/org/usfirst/frc/team3501/robot/commands/auton/PassMoat.java b/src/org/usfirst/frc/team3501/robot/commands/auton/PassMoat.java index 1e7ce585..1f465d95 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/auton/PassMoat.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassMoat.java @@ -1,10 +1,19 @@ package org.usfirst.frc.team3501.robot.commands.auton; +import org.usfirst.frc.team3501.robot.commands.driving.DriveForTime; + import edu.wpi.first.wpilibj.command.CommandGroup; /*** * This command will drive the robot through the moat. * + * The code drives the robot for a specific time at a specific speed up the ramp + * to the defense then drive over the defense at a different speed and time. + * + * dependency on subsystem: drivetrain + * + * dependency on other commands: DriveForTime + * * pre-condition: robot is flush against the ramp of the outerworks in front of * the moat * diff --git a/src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java index 364133f8..b27c6de1 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java +++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassRockWall.java @@ -1,10 +1,16 @@ package org.usfirst.frc.team3501.robot.commands.auton; +import org.usfirst.frc.team3501.robot.commands.driving.DriveForTime; + import edu.wpi.first.wpilibj.command.CommandGroup; /*** * This command will drive the robot through the rock wall. * + * dependency on subsystems: drivetrain + * + * dependency on other commands: DriveForTime + * * pre-condition: robot is flush against the ramp of the outerworks in front of * the rock wall * @@ -14,9 +20,6 @@ import edu.wpi.first.wpilibj.command.CommandGroup; * */ -/** - * - */ public class PassRockWall extends CommandGroup { private final double BEG_TIME = 0; diff --git a/src/org/usfirst/frc/team3501/robot/commands/DriveForTime.java b/src/org/usfirst/frc/team3501/robot/commands/driving/DriveForTime.java similarity index 91% rename from src/org/usfirst/frc/team3501/robot/commands/DriveForTime.java rename to src/org/usfirst/frc/team3501/robot/commands/driving/DriveForTime.java index 004b912e..eafc0408 100755 --- a/src/org/usfirst/frc/team3501/robot/commands/DriveForTime.java +++ b/src/org/usfirst/frc/team3501/robot/commands/driving/DriveForTime.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.commands; +package org.usfirst.frc.team3501.robot.commands.driving; import org.usfirst.frc.team3501.robot.Robot; -- 2.30.2