Commiting so I can pull

[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 07634e7e03e5643082ea3947bd5052fa2e9c67b2..87f069bdb8ce692ad33721fcbb7ed4d570bd3d89 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,10 +1,14 @@
 package org.usfirst.frc.team3501.robot;
 
-<<<<<<< HEAD
+
+
 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 org.usfirst.frc.team3501.robot.commands.accessories.ToggleCameraFeed;
+>>>>>>> cb0f662264528bcb0d783fcb00db22eb8d4f4283
 
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;
@@ -18,7 +22,9 @@ public class OI {
 
   public static Button toggleIndexWheel;
   public static Button toggleFlyWheel;
-  
+
+  public static Button toggleCameraFeeds;
+
   public static Button toggleCameraFeeds;
 
   public static Button toggleGear;
@@ -32,16 +38,23 @@ public class OI {
         Constants.OI.TOGGLE_INDEXWHEEL_PORT);
     toggleFlyWheel = new JoystickButton(leftJoystick,
         Constants.OI.TOGGLE_FLYWHEEL_PORT);
-<<<<<<< HEAD
+
+
     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());
->>>>>>> added command for toggling camera feeds
+
+
+
+    toggleCameraFeeds = new JoystickButton(leftJoystick, Constants.OI.TOGGLE_CAMERA_FEEDS);
+
+    toggleCameraFeeds.whenReleased(new ToggleCameraFeed());
+
   }
 
   public static OI getOI() {