Make 2 methods for gyro to getAngle and setSensitivity in DriveTrain class

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 3b0be41130e86b59a5c27f46df6672e6661dfa40..60a5511927a0b589fbdeeb15c808d93c664e75fb 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -16,6 +16,7 @@ public class Robot extends IterativeRobot {
   public static OI oi;
   public static DriveTrain driveTrain;
   public static Shooter shooter;
+
   public static Scaler scaler;
   public static DefenseArm defenseArm;
   public static IntakeArm intakeArm;
@@ -104,20 +105,6 @@ public class Robot extends IterativeRobot {
 >>>>>>> Initialize AnalogGyro in Robot class
   }
 
-  private void addDefense(SendableChooser chooser) {
-    chooser.addDefault("Portcullis", Defense.PORTCULLIS);
-    chooser.addObject("Sally Port", Defense.SALLY_PORT);
-    chooser.addObject("Rough Terrain", Defense.ROUGH_TERRAIN);
-    chooser.addObject("Low Bar", Defense.LOW_BAR);
-    chooser.addObject("Cheval De Frise", Defense.CHEVAL_DE_FRISE);
-    chooser.addObject("Drawbridge", Defense.DRAWBRIDGE);
-    chooser.addObject("Moat", Defense.MOAT);
-    chooser.addObject("Rock Wall", Defense.ROCK_WALL);
-
-    shooter = new Shooter();
-
-  }
-
   @Override
   public void autonomousInit() {
     Scheduler.getInstance().run();

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
index 0d6d4327a9e21ddf54ec598d98ca882aefeeec2a..cd8b3d3a02407f9a3d3d93467c4c80ade71057ea 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@ -26,6 +26,7 @@ public class DriveTrain extends Subsystem {
   public final static double INCHES_PER_PULSE = (((Math.PI)
       * OUTPUT_SPROCKET_DIAMETER / PULSES_PER_ROTATION)
       / WHEEL_SPROCKET_DIAMETER) * WHEEL_DIAMETER;
+
   // Drivetrain specific constants that relate to the PID controllers
   private final static double Kp = 1.0, Ki = 0.0,
       Kd = 0.0 * (OUTPUT_SPROCKET_DIAMETER / PULSES_PER_ROTATION)
@@ -104,5 +105,4 @@ public class DriveTrain extends Subsystem {
     this.rearLeft.set(leftSpeed);
     this.rearRight.set(-rightSpeed);
   }
-
 }