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 779bd9dec0ad0e0c98ad0fe440d6ffc181babe78..eeac4900e1b9a5f44b8ca2e1951012c9b3b55376 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@ -1,7 +1,6 @@
 package org.usfirst.frc.team3501.robot.subsystems;
 
 import org.usfirst.frc.team3501.robot.Constants;
-import org.usfirst.frc.team3501.robot.Robot;
 import org.usfirst.frc.team3501.robot.commands.driving.JoystickDrive;
 
 import edu.wpi.first.wpilibj.CANTalon;
@@ -195,15 +194,15 @@ public class DriveTrain extends PIDSubsystem {
   public void joystickDrive(double left, double right) {
     int type = Constants.DriveTrain.DRIVE_TYPE;
     double k = (isFlipped() ? -1 : 1);
-    if (type == Constants.DriveTrain.TANK_DRIVE) {
+    if (type == Constants.DriveTrain.TANK) {
       robotDrive.tankDrive(-left * k, -right * k);
-    } else if (type == Constants.DriveTrain.ARCADE_DRIVE) {
+    } else if (type == Constants.DriveTrain.ARCADE) {
       robotDrive.arcadeDrive(left * k, right);
     }
   }
 
   public void setMotorSpeeds(double left, double right) {
-    double k = (Robot.driveTrain.isFlipped() ? -1 : 1);
+    double k = (isFlipped() ? -1 : 1);
     robotDrive.tankDrive(-left * k, -right * k);
   }