added command for toggling camera feeds

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 432b068d8cf24fbcd50302a505c09356527d77ea..7164c7b996b0d839bf74339018f79f93d407177e 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -17,11 +17,11 @@ public class Constants {
     public final static int TOGGLE_WINCH_PORT = 0;
     public final static int TOGGLE_FLYWHEEL_PORT = 0;
     public final static int TOGGLE_INDEXWHEEL_PORT = 0;
-<<<<<<< HEAD
+
     public final static int TOGGLE_GEAR_PORT = 0;
-=======
-       public static final int TOGGLE_CAMERA_FEEDS = 7;
->>>>>>> Made final int for toggling camera feeds equal to 7(button 7)
+
+    public static final int TOGGLE_CAMERA_FEEDS = 7;
+
   }
 
   public static class Shooter {

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index ec405ac0aeca44daba0e501381b186e0ba476dbe..07634e7e03e5643082ea3947bd5052fa2e9c67b2 100644 (file)
--- 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;
 
+<<<<<<< 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 edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;
@@ -14,6 +18,8 @@ public class OI {
 
   public static Button toggleIndexWheel;
   public static Button toggleFlyWheel;
+  
+  public static Button toggleCameraFeeds;
 
   public static Button toggleGear;
 
@@ -26,9 +32,16 @@ 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
   }
 
   public static OI getOI() {