Delete copies of methods, and change initialize code in runIntakeContinuous and runRe...

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 0c4880ea29d559b6ea96a5393c4b613b04adffb0..ee9e7269cd7ec3e8148d7c40f669d5a5f1a0ea10 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -23,13 +23,6 @@ public class Constants {
 
     public final static int TOGGLE_FLYWHEEL_PORT = 0;
     public final static int TOGGLE_INDEXWHEEL_PORT = 0;
-
-  }
-
-  public static class Shooter {
-    // MOTOR CONTROLLERS
-    public static final int FLY_WHEEL = 0;
-    public static final int INDEX_WHEEL = 0;
   }
 
   public static class DriveTrain {

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 63a11d04b6286e9e61e517e65d3785943cf1691b..c2e4f996d49458d36e9e300d101888b341214047 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -12,8 +12,6 @@ public class Robot extends IterativeRobot {
   private static DriveTrain driveTrain;
   private static Shooter shooter;
   private static OI oi;
-  private static Shooter shooter;
-  private static OI oi;
   private static Intake intake;
 
   @Override
@@ -36,19 +34,10 @@ public class Robot extends IterativeRobot {
     return OI.getOI();
   }
 
-  public static OI getOI() {
-    return OI.getOI();
-  }
-
   public static Intake getIntake() {
     return Intake.getIntake();
   }
 
-  public static Intake getIntake() {
-    return Intake.getIntake();
-
-  }
-
   @Override
   public void autonomousInit() {
     Scheduler.getInstance().add(new TimeDrive(1.5, 0.4));

diff --git a/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java b/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
index 0924614e3e4a931a1f0233fef4aeaec33dc9770a..597bd65d18ca44be30885d09d056aee9070f13af 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
@@ -14,7 +14,6 @@ public class StopWinch extends Command {
 
   public StopWinch() {
     requires(Robot.getDriveTrain());
-    requires(Robot.getClimber());
   }
 
   @Override

diff --git a/src/org/usfirst/frc/team3501/robot/commands/intake/ReverseIntakeContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/intake/ReverseIntakeContinuous.java
index f387112ef612a0cf3327dbe5e1e3c89a018c89b7..a75a4bb28b4b665596441e1da874f895876ef67c 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/intake/ReverseIntakeContinuous.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/intake/ReverseIntakeContinuous.java
@@ -18,14 +18,12 @@ public class ReverseIntakeContinuous extends Command {
   // Called just before this Command runs the first time
   @Override
   protected void initialize() {
-    Robot.getIntake().runReverseIntake();
-
   }
 
   // Called repeatedly when this Command is scheduled to run
   @Override
   protected void execute() {
-
+    Robot.getIntake().runReverseIntake();
   }
 
   // Make this return true when this Command no longer needs to run execute()

diff --git a/src/org/usfirst/frc/team3501/robot/commands/intake/RunIntakeContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/intake/RunIntakeContinuous.java
index efcd4d77e32d9a98e56cfc3b9181272f45fc07ea..3188fe6a688e946c02a884a2ea603f3b17338566 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/intake/RunIntakeContinuous.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/intake/RunIntakeContinuous.java
@@ -30,13 +30,13 @@ public class RunIntakeContinuous extends Command {
   // Called just before this Command runs the first time
   @Override
   protected void initialize() {
-    Robot.getIntake().runIntake();
+
   }
 
   // Called repeatedly when this Command is scheduled to run
   @Override
   protected void execute() {
-
+    Robot.getIntake().runIntake();
   }
 
   // Called once after isFinished returns true