Commiting so I can pull

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 7164c7b996b0d839bf74339018f79f93d407177e..97036b54f41ce14482e159032cbf6763966556c0 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -22,6 +22,8 @@ public class Constants {
 
     public static final int TOGGLE_CAMERA_FEEDS = 7;
 
+    public static final int TOGGLE_CAMERA_FEEDS = 4;
+
   }
 
   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 a9948d7ae500cce9d4167a140ce592530b40c59e..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;
 
 
+
 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;
@@ -21,6 +25,8 @@ public class OI {
 
   public static Button toggleCameraFeeds;
 
+  public static Button toggleCameraFeeds;
+
   public static Button toggleGear;
 
   public OI() {
@@ -33,6 +39,7 @@ public class OI {
     toggleFlyWheel = new JoystickButton(leftJoystick,
         Constants.OI.TOGGLE_FLYWHEEL_PORT);
 
+
     toggleGear = new JoystickButton(leftJoystick,
         Constants.OI.TOGGLE_GEAR_PORT);
     toggleGear.whenPressed(new ToggleGear());
@@ -42,6 +49,12 @@ public class OI {
 
     toggleCameraFeeds.whenReleased(new ToggleCameraFeed());
 
+
+
+    toggleCameraFeeds = new JoystickButton(leftJoystick, Constants.OI.TOGGLE_CAMERA_FEEDS);
+
+    toggleCameraFeeds.whenReleased(new ToggleCameraFeed());
+
   }
 
   public static OI getOI() {

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index c8ef56804895f761c144b995680e0d31968d2628..d4f5d946eb9e987828350b694c6b0f550f3d4174 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -40,8 +40,11 @@ public class Robot extends IterativeRobot {
     // CameraServer.getInstance().startAutomaticCapture();
     // cameraServer2 = CameraServer.getInstance();
     // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+
     // cameraFeeds = new CameraFeeds();
 
+    cameraFeeds = new CameraFeeds();
+
   }
 
   public static DriveTrain getDriveTrain() {
@@ -78,6 +81,8 @@ public class Robot extends IterativeRobot {
 
     cameraFeeds.init();
 
+    cameraFeeds.init();
+
   }
 
   @Override