From 4b8a525ff87cb3ba85058e8b53f5e896a25320bb Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Sat, 14 Nov 2015 16:39:20 -0800 Subject: [PATCH] change package names --- .../RiceCatRobot/auton/MoveForwardFiveFt.java | 17 +++++++++++++++++ .../RiceCatRobot/commands/CloseClaw.java | 2 +- .../frc3501/RiceCatRobot/commands/DriveFor.java | 4 ++-- .../RiceCatRobot/commands/MoveArmFor.java | 6 +++--- .../RiceCatRobot/commands/MoveDistance.java | 2 +- .../frc3501/RiceCatRobot/commands/OpenClaw.java | 2 +- .../RiceCatRobot/commands/ToggleClaw.java | 2 +- .../RiceCatRobot/commands/ToggleCompressor.java | 2 +- .../frc3501/RiceCatRobot/commands/TurnFor.java | 4 ++-- .../frc3501/RiceCatRobot/{ => robot}/OI.java | 2 +- .../frc3501/RiceCatRobot/{ => robot}/Robot.java | 2 +- .../RiceCatRobot/{ => robot}/RobotMap.java | 2 +- .../frc3501/RiceCatRobot/subsystems/Arm.java | 2 +- .../frc3501/RiceCatRobot/subsystems/Claw.java | 6 +++--- .../RiceCatRobot/subsystems/DriveTrain.java | 2 +- 15 files changed, 37 insertions(+), 20 deletions(-) create mode 100644 src/org/usfirst/frc3501/RiceCatRobot/auton/MoveForwardFiveFt.java rename src/org/usfirst/frc3501/RiceCatRobot/{ => robot}/OI.java (95%) rename src/org/usfirst/frc3501/RiceCatRobot/{ => robot}/Robot.java (97%) rename src/org/usfirst/frc3501/RiceCatRobot/{ => robot}/RobotMap.java (96%) diff --git a/src/org/usfirst/frc3501/RiceCatRobot/auton/MoveForwardFiveFt.java b/src/org/usfirst/frc3501/RiceCatRobot/auton/MoveForwardFiveFt.java new file mode 100644 index 0000000..3532d34 --- /dev/null +++ b/src/org/usfirst/frc3501/RiceCatRobot/auton/MoveForwardFiveFt.java @@ -0,0 +1,17 @@ +package org.usfirst.frc3501.RiceCatRobot.auton; + +import org.usfirst.frc3501.RiceCatRobot.commands.MoveDistance; +import org.usfirst.frc3501.RiceCatRobot.robot.Robot; + +import edu.wpi.first.wpilibj.command.CommandGroup; + +public class MoveForwardFiveFt extends CommandGroup{ + + public MoveForwardFiveFt (){ + requires(Robot.driveTrain); + + addSequential(new MoveDistance(60, 0, 0.5)); + } + + +} diff --git a/src/org/usfirst/frc3501/RiceCatRobot/commands/CloseClaw.java b/src/org/usfirst/frc3501/RiceCatRobot/commands/CloseClaw.java index eb0eea2..66cf89b 100644 --- a/src/org/usfirst/frc3501/RiceCatRobot/commands/CloseClaw.java +++ b/src/org/usfirst/frc3501/RiceCatRobot/commands/CloseClaw.java @@ -2,7 +2,7 @@ package org.usfirst.frc3501.RiceCatRobot.commands; import edu.wpi.first.wpilibj.command.Command; -import org.usfirst.frc3501.RiceCatRobot.Robot; +import org.usfirst.frc3501.RiceCatRobot.robot.Robot; /** * diff --git a/src/org/usfirst/frc3501/RiceCatRobot/commands/DriveFor.java b/src/org/usfirst/frc3501/RiceCatRobot/commands/DriveFor.java index 6e61e61..bbc3dfa 100644 --- a/src/org/usfirst/frc3501/RiceCatRobot/commands/DriveFor.java +++ b/src/org/usfirst/frc3501/RiceCatRobot/commands/DriveFor.java @@ -1,7 +1,7 @@ package org.usfirst.frc3501.RiceCatRobot.commands; -import org.usfirst.frc3501.RiceCatRobot.Robot; -import org.usfirst.frc3501.RiceCatRobot.RobotMap.Direction; +import org.usfirst.frc3501.RiceCatRobot.robot.Robot; +import org.usfirst.frc3501.RiceCatRobot.robot.RobotMap.Direction; import edu.wpi.first.wpilibj.Timer; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc3501/RiceCatRobot/commands/MoveArmFor.java b/src/org/usfirst/frc3501/RiceCatRobot/commands/MoveArmFor.java index c082b2f..0600b1d 100644 --- a/src/org/usfirst/frc3501/RiceCatRobot/commands/MoveArmFor.java +++ b/src/org/usfirst/frc3501/RiceCatRobot/commands/MoveArmFor.java @@ -1,8 +1,8 @@ package org.usfirst.frc3501.RiceCatRobot.commands; -import org.usfirst.frc3501.RiceCatRobot.Robot; -import org.usfirst.frc3501.RiceCatRobot.RobotMap; -import org.usfirst.frc3501.RiceCatRobot.RobotMap.Direction; +import org.usfirst.frc3501.RiceCatRobot.robot.Robot; +import org.usfirst.frc3501.RiceCatRobot.robot.RobotMap; +import org.usfirst.frc3501.RiceCatRobot.robot.RobotMap.Direction; import edu.wpi.first.wpilibj.Timer; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc3501/RiceCatRobot/commands/MoveDistance.java b/src/org/usfirst/frc3501/RiceCatRobot/commands/MoveDistance.java index 2243bc7..6608c33 100644 --- a/src/org/usfirst/frc3501/RiceCatRobot/commands/MoveDistance.java +++ b/src/org/usfirst/frc3501/RiceCatRobot/commands/MoveDistance.java @@ -1,6 +1,6 @@ package org.usfirst.frc3501.RiceCatRobot.commands; -import org.usfirst.frc3501.RiceCatRobot.Robot; +import org.usfirst.frc3501.RiceCatRobot.robot.Robot; import org.usfirst.frc3501.RiceCatRobot.subsystems.DriveTrain; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc3501/RiceCatRobot/commands/OpenClaw.java b/src/org/usfirst/frc3501/RiceCatRobot/commands/OpenClaw.java index bece53b..320f4d0 100644 --- a/src/org/usfirst/frc3501/RiceCatRobot/commands/OpenClaw.java +++ b/src/org/usfirst/frc3501/RiceCatRobot/commands/OpenClaw.java @@ -2,7 +2,7 @@ package org.usfirst.frc3501.RiceCatRobot.commands; import edu.wpi.first.wpilibj.command.Command; -import org.usfirst.frc3501.RiceCatRobot.Robot; +import org.usfirst.frc3501.RiceCatRobot.robot.Robot; /** * Opens claw by reversing solenoids. diff --git a/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleClaw.java b/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleClaw.java index f746056..720ec41 100644 --- a/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleClaw.java +++ b/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleClaw.java @@ -1,6 +1,6 @@ package org.usfirst.frc3501.RiceCatRobot.commands; -import org.usfirst.frc3501.RiceCatRobot.Robot; +import org.usfirst.frc3501.RiceCatRobot.robot.Robot; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleCompressor.java b/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleCompressor.java index 5f3fad1..eb41354 100644 --- a/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleCompressor.java +++ b/src/org/usfirst/frc3501/RiceCatRobot/commands/ToggleCompressor.java @@ -1,6 +1,6 @@ package org.usfirst.frc3501.RiceCatRobot.commands; -import org.usfirst.frc3501.RiceCatRobot.Robot; +import org.usfirst.frc3501.RiceCatRobot.robot.Robot; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc3501/RiceCatRobot/commands/TurnFor.java b/src/org/usfirst/frc3501/RiceCatRobot/commands/TurnFor.java index 9be3779..cf716d4 100644 --- a/src/org/usfirst/frc3501/RiceCatRobot/commands/TurnFor.java +++ b/src/org/usfirst/frc3501/RiceCatRobot/commands/TurnFor.java @@ -1,7 +1,7 @@ package org.usfirst.frc3501.RiceCatRobot.commands; -import org.usfirst.frc3501.RiceCatRobot.Robot; -import org.usfirst.frc3501.RiceCatRobot.RobotMap.Direction; +import org.usfirst.frc3501.RiceCatRobot.robot.Robot; +import org.usfirst.frc3501.RiceCatRobot.robot.RobotMap.Direction; import edu.wpi.first.wpilibj.Timer; import edu.wpi.first.wpilibj.command.Command; diff --git a/src/org/usfirst/frc3501/RiceCatRobot/OI.java b/src/org/usfirst/frc3501/RiceCatRobot/robot/OI.java similarity index 95% rename from src/org/usfirst/frc3501/RiceCatRobot/OI.java rename to src/org/usfirst/frc3501/RiceCatRobot/robot/OI.java index bb7fbed..6bebe54 100644 --- a/src/org/usfirst/frc3501/RiceCatRobot/OI.java +++ b/src/org/usfirst/frc3501/RiceCatRobot/robot/OI.java @@ -1,4 +1,4 @@ -package org.usfirst.frc3501.RiceCatRobot; +package org.usfirst.frc3501.RiceCatRobot.robot; import org.usfirst.frc3501.RiceCatRobot.commands.ToggleClaw; import org.usfirst.frc3501.RiceCatRobot.commands.ToggleCompressor; diff --git a/src/org/usfirst/frc3501/RiceCatRobot/Robot.java b/src/org/usfirst/frc3501/RiceCatRobot/robot/Robot.java similarity index 97% rename from src/org/usfirst/frc3501/RiceCatRobot/Robot.java rename to src/org/usfirst/frc3501/RiceCatRobot/robot/Robot.java index 7e9fabe..1191d0e 100644 --- a/src/org/usfirst/frc3501/RiceCatRobot/Robot.java +++ b/src/org/usfirst/frc3501/RiceCatRobot/robot/Robot.java @@ -1,4 +1,4 @@ -package org.usfirst.frc3501.RiceCatRobot; +package org.usfirst.frc3501.RiceCatRobot.robot; import org.usfirst.frc3501.RiceCatRobot.subsystems.Arm; import org.usfirst.frc3501.RiceCatRobot.subsystems.Claw; diff --git a/src/org/usfirst/frc3501/RiceCatRobot/RobotMap.java b/src/org/usfirst/frc3501/RiceCatRobot/robot/RobotMap.java similarity index 96% rename from src/org/usfirst/frc3501/RiceCatRobot/RobotMap.java rename to src/org/usfirst/frc3501/RiceCatRobot/robot/RobotMap.java index 4bf6e4a..95604c3 100644 --- a/src/org/usfirst/frc3501/RiceCatRobot/RobotMap.java +++ b/src/org/usfirst/frc3501/RiceCatRobot/robot/RobotMap.java @@ -1,4 +1,4 @@ -package org.usfirst.frc3501.RiceCatRobot; +package org.usfirst.frc3501.RiceCatRobot.robot; import edu.wpi.first.wpilibj.DoubleSolenoid; import edu.wpi.first.wpilibj.DoubleSolenoid.Value; diff --git a/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java b/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java index 452c569..be8cfa8 100644 --- a/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java +++ b/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java @@ -1,6 +1,6 @@ package org.usfirst.frc3501.RiceCatRobot.subsystems; -import org.usfirst.frc3501.RiceCatRobot.RobotMap; +import org.usfirst.frc3501.RiceCatRobot.robot.RobotMap; import edu.wpi.first.wpilibj.CANJaguar; import edu.wpi.first.wpilibj.command.Subsystem; diff --git a/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Claw.java b/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Claw.java index 100eff4..3738f59 100644 --- a/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Claw.java +++ b/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Claw.java @@ -1,10 +1,10 @@ package org.usfirst.frc3501.RiceCatRobot.subsystems; -import org.usfirst.frc3501.RiceCatRobot.OI; -import org.usfirst.frc3501.RiceCatRobot.Robot; -import org.usfirst.frc3501.RiceCatRobot.RobotMap; import org.usfirst.frc3501.RiceCatRobot.commands.CloseClaw; import org.usfirst.frc3501.RiceCatRobot.commands.OpenClaw; +import org.usfirst.frc3501.RiceCatRobot.robot.OI; +import org.usfirst.frc3501.RiceCatRobot.robot.Robot; +import org.usfirst.frc3501.RiceCatRobot.robot.RobotMap; import edu.wpi.first.wpilibj.DoubleSolenoid; import edu.wpi.first.wpilibj.command.Subsystem; diff --git a/src/org/usfirst/frc3501/RiceCatRobot/subsystems/DriveTrain.java b/src/org/usfirst/frc3501/RiceCatRobot/subsystems/DriveTrain.java index a8716b6..dda70f8 100644 --- a/src/org/usfirst/frc3501/RiceCatRobot/subsystems/DriveTrain.java +++ b/src/org/usfirst/frc3501/RiceCatRobot/subsystems/DriveTrain.java @@ -1,6 +1,6 @@ package org.usfirst.frc3501.RiceCatRobot.subsystems; -import org.usfirst.frc3501.RiceCatRobot.RobotMap; +import org.usfirst.frc3501.RiceCatRobot.robot.RobotMap; import edu.wpi.first.wpilibj.CANJaguar; import edu.wpi.first.wpilibj.Encoder; -- 2.30.2