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 935c4c6e32eb4da8fb3dbc5590e4f51bfef6aea5..42a01369f5fae3ff15cfde14f648ad55fc2a3b9a 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot;
 
+import org.usfirst.frc.team3501.robot.commands.accessories.ToggleCameraFeed;
+
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;
 import edu.wpi.first.wpilibj.buttons.JoystickButton;
@@ -13,15 +15,29 @@ public class OI {
   public static Button toggleIndexWheel;
   public static Button toggleFlyWheel;
 
+  public static Button toggleCameraFeeds;
+
+  public static Button toggleGear;
+
   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);
+    /*
+     * 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);
+
+    toggleCameraFeeds.whenReleased(new ToggleCameraFeed());
+    System.out.println("toggle ready");
   }
 
   public static OI getOI() {