Fix merging errors with climber subclass

[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 8fcc2615d8cd64a7554fe02c7b1daaec043485be..0c4880ea29d559b6ea96a5393c4b613b04adffb0 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -19,11 +19,19 @@ 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 Shooter {
+    // MOTOR CONTROLLERS
+    public static final int FLY_WHEEL = 0;
+    public static final int INDEX_WHEEL = 0;
+  }
+
   public static class DriveTrain {
     // MOTOR CONTROLLERS
     public static final int FRONT_LEFT = 1;