Fix merge conflicts.

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / OI.java

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index 5082911be4703b6a55a674aad623f05b9507ab05..42a01369f5fae3ff15cfde14f648ad55fc2a3b9a 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,7 +1,6 @@
 package org.usfirst.frc.team3501.robot;
 
 import org.usfirst.frc.team3501.robot.commands.accessories.ToggleCameraFeed;
-import org.usfirst.frc.team3501.robot.commands.driving.ToggleGear;
 
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;
@@ -23,17 +22,16 @@ public class OI {
   public OI() {
     leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
     rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT);
-    /*toggleWinch = new JoystickButton(leftJoystick,
-        Constants.OI.TOGGLE_WINCH_PORT);
-    toggleIndexWheel = new JoystickButton(leftJoystick,
-        Constants.OI.TOGGLE_INDEXWHEEL_PORT);
-    toggleFlyWheel = new JoystickButton(leftJoystick,
-        Constants.OI.TOGGLE_FLYWHEEL_PORT);
-
-    toggleGear = new JoystickButton(leftJoystick,
-        Constants.OI.TOGGLE_GEAR_PORT);
-    toggleGear.whenPressed(new ToggleGear());
-    */
+    /*
+     * toggleWinch = new JoystickButton(leftJoystick,
+     * Constants.OI.TOGGLE_WINCH_PORT); toggleIndexWheel = new
+     * JoystickButton(leftJoystick, Constants.OI.TOGGLE_INDEXWHEEL_PORT);
+     * toggleFlyWheel = new JoystickButton(leftJoystick,
+     * Constants.OI.TOGGLE_FLYWHEEL_PORT);
+     * 
+     * toggleGear = new JoystickButton(leftJoystick,
+     * Constants.OI.TOGGLE_GEAR_PORT); toggleGear.whenPressed(new ToggleGear());
+     */
 
     toggleCameraFeeds = new JoystickButton(leftJoystick,
         Constants.OI.TOGGLE_CAMERA_FEEDS);