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

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / Constants.java

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index bf265a4fea8ced0142b226ae055c79de7b77f902..ee9e7269cd7ec3e8148d7c40f669d5a5f1a0ea10 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -10,8 +10,6 @@ public class Constants {
   public static class OI {
     public final static int LEFT_STICK_PORT = 0;
     public final static int RIGHT_STICK_PORT = 1;
-    public final static int TOGGLE_WINCH_PORT = 0;
-
     public final static int TOGGLE_WINCH_PORT = 0;
     public final static int TOGGLE_FLYWHEEL_PORT = 0;
     public final static int TOGGLE_INDEXWHEEL_PORT = 0;
@@ -21,6 +19,10 @@ public class Constants {
     // MOTOR CONTROLLERS
     public static final int FLY_WHEEL = 0;
     public static final int INDEX_WHEEL = 0;
+    public final static int TOGGLE_WINCH_PORT = 0;
+
+    public final static int TOGGLE_FLYWHEEL_PORT = 0;
+    public final static int TOGGLE_INDEXWHEEL_PORT = 0;
   }
 
   public static class DriveTrain {
@@ -40,7 +42,10 @@ public class Constants {
   public static class Climber {
     // MOTOR CONTROLLERS
     public static final int MOTOR_VAL = 1;
+  }
 
+  public static class Intake {
+    public static final int INTAKE_ROLLER_PORT = 0;
   }
 
   public static enum Direction {