change location of base files

diff --git a/src/org/usfirst/frc/team3501/bases/Command.java b/src/org/usfirst/frc/team3501/bases/Command.java
new file mode 100644 (file)
index 0000000..b25eb39
--- /dev/null
+++ b/src/org/usfirst/frc/team3501/bases/Command.java
@@ -0,0 +1,24 @@
+package org.usfirst.frc.team3501.bases;
+
+import edu.wpi.first.wpilibj.command.Scheduler;
+
+public abstract class Command
+    extends edu.wpi.first.wpilibj.command.Command
+    implements CommandBase {
+
+    public Command(String commandName) {
+        super(commandName);
+    }
+
+    protected void schedule(Command c) {
+        Scheduler.getInstance().add(c);
+    }
+
+    protected void initialize() {}
+
+    protected void execute() {}
+
+    protected void end() {}
+
+    protected void interrupted() {}
+}

diff --git a/src/org/usfirst/frc/team3501/bases/CommandBase.java b/src/org/usfirst/frc/team3501/bases/CommandBase.java
new file mode 100644 (file)
index 0000000..d797ce6
--- /dev/null
+++ b/src/org/usfirst/frc/team3501/bases/CommandBase.java
@@ -0,0 +1,19 @@
+package org.usfirst.frc.team3501.bases;
+
+import org.usfirst.frc.team3501.robot.AutonData;
+import org.usfirst.frc.team3501.robot.OI;
+import org.usfirst.frc.team3501.robot.Robot;
+import org.usfirst.frc.team3501.robot.subsystems.*;
+
+public interface CommandBase {
+
+    final static OI oi = Robot.oi;
+
+    final static AutonData autonData = Robot.autonData;
+
+    final static Drivetrain drivetrain = Robot.drivetrain;
+    final static               Arm arm = Robot.arm;
+    final static             Claw claw = Robot.claw;
+
+    final static Pneumatics pneumatics = Robot.pneumatics;
+}

diff --git a/src/org/usfirst/frc/team3501/bases/CommandGroup.java b/src/org/usfirst/frc/team3501/bases/CommandGroup.java
new file mode 100644 (file)
index 0000000..b1d5c31
--- /dev/null
+++ b/src/org/usfirst/frc/team3501/bases/CommandGroup.java
@@ -0,0 +1,10 @@
+package org.usfirst.frc.team3501.bases;
+
+public abstract class CommandGroup
+    extends edu.wpi.first.wpilibj.command.CommandGroup
+    implements CommandBase {
+
+    public CommandGroup(String commandGroupName) {
+        super(commandGroupName);
+    }
+}

diff --git a/src/org/usfirst/frc/team3501/robot/autons/DriveOverStep.java b/src/org/usfirst/frc/team3501/robot/autons/DriveOverStep.java
index 224bc9ca5eac3c0a2a644cfbf4e0915c34c5dce6..aa3e752eca405c8d9bdc1a27882a9a179cd31c7d 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/autons/DriveOverStep.java
+++ b/src/org/usfirst/frc/team3501/robot/autons/DriveOverStep.java
@@ -1,6 +1,6 @@
 package org.usfirst.frc.team3501.robot.autons;
 
-import org.usfirst.frc.team3501.robot.commands.Command;
+import org.usfirst.frc.team3501.bases.Command;
 
 public class DriveOverStep extends Command {
 

diff --git a/src/org/usfirst/frc/team3501/robot/autons/DrivePastStep.java b/src/org/usfirst/frc/team3501/robot/autons/DrivePastStep.java
index f45975064b74726adaf3c195bd902648e1c54b0d..fe4e2c314826ad08f8214dc19501863e63a96b0d 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/autons/DrivePastStep.java
+++ b/src/org/usfirst/frc/team3501/robot/autons/DrivePastStep.java
@@ -1,6 +1,6 @@
 package org.usfirst.frc.team3501.robot.autons;
 
-import org.usfirst.frc.team3501.robot.commands.Command;
+import org.usfirst.frc.team3501.bases.Command;
 
 public class DrivePastStep extends Command {
 

diff --git a/src/org/usfirst/frc/team3501/robot/autons/PickUpContainer.java b/src/org/usfirst/frc/team3501/robot/autons/PickUpContainer.java
index 52fb2b4479dfb464c9155de948b3e4525058b3aa..3f4b4aac9e3695abc922f5d6c5fc2ed4f4511145 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/autons/PickUpContainer.java
+++ b/src/org/usfirst/frc/team3501/robot/autons/PickUpContainer.java
@@ -1,5 +1,6 @@
 package org.usfirst.frc.team3501.robot.autons;
 
+import org.usfirst.frc.team3501.bases.CommandGroup;
 import org.usfirst.frc.team3501.robot.Robot;
 import org.usfirst.frc.team3501.robot.commands.*;
 

diff --git a/src/org/usfirst/frc/team3501/robot/commands/CloseClaw.java b/src/org/usfirst/frc/team3501/robot/commands/CloseClaw.java
index d4b1199d17223f258b96f8249246927b6b35d29c..90e8accc50f34949678daa0c81f2a0547a7f55bf 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/CloseClaw.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/CloseClaw.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class CloseClaw extends Command {
 
     public CloseClaw() {

diff --git a/src/org/usfirst/frc/team3501/robot/commands/Command.java b/src/org/usfirst/frc/team3501/robot/commands/Command.java
deleted file mode 100644 (file)
index 42c58d6..0000000
--- a/src/org/usfirst/frc/team3501/robot/commands/Command.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands;
-
-import edu.wpi.first.wpilibj.command.Scheduler;
-
-public abstract class Command
-    extends edu.wpi.first.wpilibj.command.Command
-    implements CommandBase {
-
-    public Command(String commandName) {
-        super(commandName);
-    }
-
-    protected void schedule(Command c) {
-        Scheduler.getInstance().add(c);
-    }
-
-    protected void initialize() {}
-
-    protected void execute() {}
-
-    protected void end() {}
-
-    protected void interrupted() {}
-}

diff --git a/src/org/usfirst/frc/team3501/robot/commands/CommandBase.java b/src/org/usfirst/frc/team3501/robot/commands/CommandBase.java
deleted file mode 100644 (file)
index 3a5044e..0000000
--- a/src/org/usfirst/frc/team3501/robot/commands/CommandBase.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands;
-
-import org.usfirst.frc.team3501.robot.AutonData;
-import org.usfirst.frc.team3501.robot.OI;
-import org.usfirst.frc.team3501.robot.Robot;
-import org.usfirst.frc.team3501.robot.subsystems.*;
-
-public interface CommandBase {
-
-    final static OI oi = Robot.oi;
-
-    final static AutonData autonData = Robot.autonData;
-
-    final static Drivetrain drivetrain = Robot.drivetrain;
-    final static               Arm arm = Robot.arm;
-    final static             Claw claw = Robot.claw;
-
-    final static Pneumatics pneumatics = Robot.pneumatics;
-}

diff --git a/src/org/usfirst/frc/team3501/robot/commands/CommandGroup.java b/src/org/usfirst/frc/team3501/robot/commands/CommandGroup.java
deleted file mode 100644 (file)
index fcb7d26..0000000
--- a/src/org/usfirst/frc/team3501/robot/commands/CommandGroup.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.usfirst.frc.team3501.robot.commands;
-
-public class CommandGroup
-    extends edu.wpi.first.wpilibj.command.CommandGroup
-    implements CommandBase {
-
-    public CommandGroup(String commandGroupName) {
-        super(commandGroupName);
-    }
-}

diff --git a/src/org/usfirst/frc/team3501/robot/commands/DriveFor.java b/src/org/usfirst/frc/team3501/robot/commands/DriveFor.java
index 295834b5dbddc14fa93d558e5a11d7a3eb7b38d1..95aae897c785a20f4292bfaaac8f6cc52c6a842c 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/DriveFor.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/DriveFor.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class DriveFor extends Command {
 
     private double speed;

diff --git a/src/org/usfirst/frc/team3501/robot/commands/DriveWithJoysticks.java b/src/org/usfirst/frc/team3501/robot/commands/DriveWithJoysticks.java
index cf5446ad825a7fa3307e632d7243ec45759fcc7d..5e935c97e0c99294eb9c32411107883a3a2fcc18 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/DriveWithJoysticks.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/DriveWithJoysticks.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class DriveWithJoysticks extends Command {
 
     public DriveWithJoysticks() {

diff --git a/src/org/usfirst/frc/team3501/robot/commands/MoveArm.java b/src/org/usfirst/frc/team3501/robot/commands/MoveArm.java
index e2097717654b03189f8759cbea23f5edc06faffc..804375346dfb623a746869775365ca8af6ac5bb4 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/MoveArm.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/MoveArm.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class MoveArm extends Command {
 
     public MoveArm() {

diff --git a/src/org/usfirst/frc/team3501/robot/commands/MoveArmFor.java b/src/org/usfirst/frc/team3501/robot/commands/MoveArmFor.java
index b9f3bc73ed62baeb20dbb443ae251922c3ee397c..eb2a5ce28ff71339246c2662823ddb26322b9e35 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/MoveArmFor.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/MoveArmFor.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class MoveArmFor extends Command {
 
     private double speed;

diff --git a/src/org/usfirst/frc/team3501/robot/commands/OpenClaw.java b/src/org/usfirst/frc/team3501/robot/commands/OpenClaw.java
index 6adb5a7a149f80947a0c26b07e3a4257800a8773..397dcf44af150b24e9dfbc8d9b2e1635d50a5e1f 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/OpenClaw.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/OpenClaw.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class OpenClaw extends Command {
 
     public OpenClaw() {

diff --git a/src/org/usfirst/frc/team3501/robot/commands/TensionLeftWinch.java b/src/org/usfirst/frc/team3501/robot/commands/TensionLeftWinch.java
index b915896c790952e28973360f7d743721c76ff17d..3a5ac17dd7f0f926131deb6a41c3d3634fd15faf 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/TensionLeftWinch.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/TensionLeftWinch.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class TensionLeftWinch extends Command {
 
     private double speed;

diff --git a/src/org/usfirst/frc/team3501/robot/commands/TensionRightWinch.java b/src/org/usfirst/frc/team3501/robot/commands/TensionRightWinch.java
index 30dfb10fa9a306a2be6eaa1033d37335fceb5265..993302c39bfd5aa319fc75ef1253e7551d764aad 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/TensionRightWinch.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/TensionRightWinch.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class TensionRightWinch extends Command {
 
     private double speed;

diff --git a/src/org/usfirst/frc/team3501/robot/commands/ToggleClaw.java b/src/org/usfirst/frc/team3501/robot/commands/ToggleClaw.java
index b7e7b5288740dc1c52360955cacd4273821bfe7b..802baf8fb1b4240ecc10b9f3fa80ea931034360c 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/ToggleClaw.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/ToggleClaw.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class ToggleClaw extends Command {
 
     public ToggleClaw() {

diff --git a/src/org/usfirst/frc/team3501/robot/commands/TurnOffCompressor.java b/src/org/usfirst/frc/team3501/robot/commands/TurnOffCompressor.java
index 85838f9db3e85406838da88150656af67608a501..43db593c5552b5ebd67385c4b874d4751e054824 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/TurnOffCompressor.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/TurnOffCompressor.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class TurnOffCompressor extends Command {
 
     public TurnOffCompressor() {

diff --git a/src/org/usfirst/frc/team3501/robot/commands/TurnOnCompressor.java b/src/org/usfirst/frc/team3501/robot/commands/TurnOnCompressor.java
index 49853f2ff14e2725689b4a5c14732cd7bf4fd87e..69057644196e4041396f37ce44d0edbc0175f9af 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/TurnOnCompressor.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/TurnOnCompressor.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands;
 
+import org.usfirst.frc.team3501.bases.Command;
+
 public class TurnOnCompressor extends Command {
 
     public TurnOnCompressor() {