Further cleanup

Team4414 · Dec 24, 2018 · fc2b0da · fc2b0da
1 parent c475c34
commit fc2b0da
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/frc/robot/OI.java b/src/main/java/frc/robot/OI.java
@@ -25,12 +25,11 @@ public static OI getInstance(){
     private static final int kTurnAxis = 0;
     private static final int kThrottleAxis = 1;
 
-    private static final int kQuickTurnButtonID = 6;
+    private static final int[] kQuickTurnButtonIDs = new int[]{6};
 
 
     private Joystick throttleNub;
     private Joystick turnNub;
-    private Joystick xbox;
 
     private OI(){
         throttleNub = new Joystick(kThrottleNubID);
@@ -53,7 +52,10 @@ public double getForward(){
     }
 
     public boolean getQuickTurn(){
-        return ((throttleNub.getRawButton(11))
-            ||  (throttleNub.getRawButton(10)));
+        for(int id: kQuickTurnButtonIDs){
+            if(throttleNub.getRawButton(id))
+                return true;
+         }
+        return false;
     }
 }
diff --git a/src/main/java/frc/robot/Robot.java b/src/main/java/frc/robot/Robot.java
@@ -1,7 +1,6 @@
 package frc.robot;
 
 import java.util.LinkedHashMap;
-import edu.wpi.first.wpilibj.CameraServer;
 import edu.wpi.first.wpilibj.IterativeRobot;
 import edu.wpi.first.wpilibj.command.Command;
 import edu.wpi.first.wpilibj.command.Scheduler;

diff --git a/src/main/java/frc/robot/subsystems/Drivetrain.java b/src/main/java/frc/robot/subsystems/Drivetrain.java
@@ -37,7 +37,7 @@ public static Drivetrain getInstance(){
 
     //Hardware Controllers:
     private TalonSRX mLeftMaster, mRightMaster;
-
+    @SuppressWarnings("unused") 
     private VictorSPX mLeftSlaveA, mLeftSlaveB, mRightSlaveA, mRightSlaveB;
 
     private PigeonIMU mGyro;