X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FOI.java;h=a9948d7ae500cce9d4167a140ce592530b40c59e;hb=5bee67e1c82f6a9e7f12a1e217b1fb80beb616bf;hp=ec405ac0aeca44daba0e501381b186e0ba476dbe;hpb=7935bf262ed52d56431a191e55fd5cfb8d1f49c2;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index ec405ac..a9948d7 100644
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,6 +1,10 @@
 package org.usfirst.frc.team3501.robot;
 
+
 import org.usfirst.frc.team3501.robot.commands.driving.ToggleGear;
+=======
+import org.usfirst.frc.team3501.robot.commands.accessories.ToggleCameraFeed;
+>>>>>>> added command for toggling camera feeds
 
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;
@@ -15,6 +19,8 @@ public class OI {
   public static Button toggleIndexWheel;
   public static Button toggleFlyWheel;
 
+  public static Button toggleCameraFeeds;
+
   public static Button toggleGear;
 
   public OI() {
@@ -26,9 +32,16 @@ public class OI {
         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());
+
   }
 
   public static OI getOI() {