From: Kevin Zhang <icestormf1@gmail.com>
Date: Sat, 23 Jan 2016 03:35:09 +0000 (-0800)
Subject: Fix diverging conflicts, not sure how this happened but it did
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=89dad1e0fb923df053c895423a209d2017d3947c

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

89dad1e0fb923df053c895423a209d2017d3947c
diff --cc src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
index fd8f6122,4a6c6890..2bb3c7a6
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@@ -8,16 -8,16 +8,16 @@@ 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;
-   private final static double OUTPUT_SPROCKET_DIAMETER = 2.0;
-   private final static double WHEEL_SPROCKET_DIAMETER = 3.5;
+   private final static double PULSES_PER_ROTATION = 256; // in pulses
+   private final static double OUTPUT_SPROCKET_DIAMETER = 2.0; // in inches
+   private final static double WHEEL_SPROCKET_DIAMETER = 3.5; // in inches
  
    public final static double INCHES_PER_PULSE = (((Math.PI)
        * OUTPUT_SPROCKET_DIAMETER / PULSES_PER_ROTATION) / WHEEL_SPROCKET_DIAMETER)