Update ports to competition setup, minor bugfixes

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / subsystems / DriveTrain.java

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
index 5f370e98baee876cf422f749fe286b6b1935656e..c68b472e2ff3a5878dc32569aa702ed4aafd99db 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@ -29,10 +29,10 @@ public class DriveTrain extends PIDSubsystem {
     super(Constants.DriveTrain.kp, Constants.DriveTrain.ki,
         Constants.DriveTrain.kd);
 
-    frontLeft = new CANTalon(Constants.DriveTrain.FRONT_LEFT);
-    frontRight = new CANTalon(Constants.DriveTrain.FRONT_RIGHT);
-    rearLeft = new CANTalon(Constants.DriveTrain.REAR_LEFT);
-    rearRight = new CANTalon(Constants.DriveTrain.REAR_RIGHT);
+    frontLeft = new CANTalon(Constants.DriveTrain.DRIVE_FRONT_LEFT);
+    frontRight = new CANTalon(Constants.DriveTrain.DRIVE_FRONT_RIGHT);
+    rearLeft = new CANTalon(Constants.DriveTrain.DRIVE_REAR_LEFT);
+    rearRight = new CANTalon(Constants.DriveTrain.DRIVE_REAR_RIGHT);
 
     robotDrive = new RobotDrive(frontLeft, rearLeft, frontRight, rearRight);
 
@@ -48,10 +48,10 @@ public class DriveTrain extends PIDSubsystem {
 
     this.disable();
 
-    leftGearPiston = new DoubleSolenoid(Constants.DriveTrain.LEFT_MODULE,
-        Constants.DriveTrain.LEFT_FORWARD, Constants.DriveTrain.LEFT_REVERSE);
-    rightGearPiston = new DoubleSolenoid(Constants.DriveTrain.RIGHT_MODULE,
-        Constants.DriveTrain.RIGHT_FORWARD, Constants.DriveTrain.RIGHT_REVERSE);
+    leftGearPiston = new DoubleSolenoid(Constants.DriveTrain.LEFT_SHIFT_MODULE,
+        Constants.DriveTrain.LEFT_SHIFT_FORWARD, Constants.DriveTrain.LEFT_SHIFT_REVERSE);
+    rightGearPiston = new DoubleSolenoid(Constants.DriveTrain.RIGHT_SHIFT_MODULE,
+        Constants.DriveTrain.RIGHT_SHIFT_FORWARD, Constants.DriveTrain.RIGHT_SHIFT_REVERSE);
   }
 
   @Override