From f139e3132139b3c27c10334c94aef9a6b8478767 Mon Sep 17 00:00:00 2001
From: Logan Howard <logan@oflogan.com>
Date: Fri, 17 Apr 2015 22:02:00 -0700
Subject: [PATCH] rearrange a few more files. realize that adding the auton
 read from file thing was stupid, will replace later

---
 src/org/usfirst/frc/team3501/bases/CommandBase.java    |  2 +-
 src/org/usfirst/frc/team3501/robot/Robot.java          |  1 +
 .../frc/team3501/robot/autons/ContainerOverStep.java   | 10 ++++------
 .../frc/team3501/robot/autons/PickUpContainer.java     |  9 ++++-----
 .../frc/team3501/{robot => util}/AutonData.java        |  2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)
 rename src/org/usfirst/frc/team3501/{robot => util}/AutonData.java (98%)

diff --git a/src/org/usfirst/frc/team3501/bases/CommandBase.java b/src/org/usfirst/frc/team3501/bases/CommandBase.java
index d797ce6..770f48d 100644
--- a/src/org/usfirst/frc/team3501/bases/CommandBase.java
+++ b/src/org/usfirst/frc/team3501/bases/CommandBase.java
@@ -1,9 +1,9 @@
 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.*;
+import org.usfirst.frc.team3501.util.AutonData;
 
 public interface CommandBase {
 
diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 532d254..c7ef783 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -11,6 +11,7 @@ import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 import org.usfirst.frc.team3501.robot.autons.*;
 import org.usfirst.frc.team3501.robot.commands.*;
 import org.usfirst.frc.team3501.robot.subsystems.*;
+import org.usfirst.frc.team3501.util.AutonData;
 
 public class Robot extends IterativeRobot {
 
diff --git a/src/org/usfirst/frc/team3501/robot/autons/ContainerOverStep.java b/src/org/usfirst/frc/team3501/robot/autons/ContainerOverStep.java
index 75e592b..35019a1 100644
--- a/src/org/usfirst/frc/team3501/robot/autons/ContainerOverStep.java
+++ b/src/org/usfirst/frc/team3501/robot/autons/ContainerOverStep.java
@@ -1,17 +1,15 @@
 package org.usfirst.frc.team3501.robot.autons;
 
-import org.usfirst.frc.team3501.robot.Robot;
-
-import edu.wpi.first.wpilibj.command.CommandGroup;
+import org.usfirst.frc.team3501.bases.CommandGroup;
 
 public class ContainerOverStep extends CommandGroup {
 
     public ContainerOverStep() {
         super("ContainerOverStep");
 
-        requires(Robot.drivetrain);
-        requires(Robot.arm);
-        requires(Robot.claw);
+        requires(drivetrain);
+        requires(arm);
+        requires(claw);
 
         queueCommands();
     }
diff --git a/src/org/usfirst/frc/team3501/robot/autons/PickUpContainer.java b/src/org/usfirst/frc/team3501/robot/autons/PickUpContainer.java
index 3f4b4aa..87d82bc 100644
--- a/src/org/usfirst/frc/team3501/robot/autons/PickUpContainer.java
+++ b/src/org/usfirst/frc/team3501/robot/autons/PickUpContainer.java
@@ -1,7 +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.*;
 
 public class PickUpContainer extends CommandGroup {
@@ -9,8 +8,8 @@ public class PickUpContainer extends CommandGroup {
     public PickUpContainer() {
         super("PickUpContainer");
 
-        requires(Robot.arm);
-        requires(Robot.claw);
+        requires(arm);
+        requires(claw);
 
         queueCommands();
     }
@@ -18,7 +17,7 @@ public class PickUpContainer extends CommandGroup {
     private void queueCommands() {
         addSequential(new CloseClaw());
         addSequential(new MoveArmFor(
-                Robot.autonData.getTime("pickup_container"),
-                Robot.autonData.getSpeed("pickup_container")));
+                autonData.getTime("pickup_container"),
+                autonData.getSpeed("pickup_container")));
     }
 }
diff --git a/src/org/usfirst/frc/team3501/robot/AutonData.java b/src/org/usfirst/frc/team3501/util/AutonData.java
similarity index 98%
rename from src/org/usfirst/frc/team3501/robot/AutonData.java
rename to src/org/usfirst/frc/team3501/util/AutonData.java
index a643b06..df91645 100644
--- a/src/org/usfirst/frc/team3501/robot/AutonData.java
+++ b/src/org/usfirst/frc/team3501/util/AutonData.java
@@ -1,4 +1,4 @@
-package org.usfirst.frc.team3501.robot;
+package org.usfirst.frc.team3501.util;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
-- 
2.30.2