Fix diverging conflicts, not sure how this happened but it did

[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 4a6c6890d6d031683e2b37d4df4f4a19f5a7a96c..2bb3c7a65422789fdacec52f957313b752a510c1 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@ -8,11 +8,11 @@ import edu.wpi.first.wpilibj.Encoder;
 import edu.wpi.first.wpilibj.command.Subsystem;
 
 public class DriveTrain extends Subsystem {
-  // Drivetrain Related Objects
-  private CANTalon frontLeft, frontRight, rearLeft, rearRight;
+  // Drivetrain related objects
   private Encoder leftEncoder, rightEncoder;
+  private CANTalon frontLeft, frontRight, rearLeft, rearRight;
 
-  // Drivetrain Specific Constants that relate to the Inches per Pulse value of
+  // Drivetrain specific constants that relate to the inches per pulse value for
   // the encoders
   private final static double WHEEL_DIAMETER = 6.0; // in inches
   private final static double PULSES_PER_ROTATION = 256; // in pulses
@@ -75,8 +75,8 @@ public class DriveTrain extends Subsystem {
   }
 
   public void setMotorSpeeds(double leftSpeed, double rightSpeed) {
-    // Right motors receive negative values because they turn in the opposite
-    // direction
+    // speed passed to right motor is negative because right motor rotates in
+    // opposite direction
     this.frontLeft.set(leftSpeed);
     this.frontRight.set(-rightSpeed);
     this.rearLeft.set(leftSpeed);