Fix conflict in indexer piston

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / Robot.java

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index a8c48643019bffbf7786a505e4264316be539b42..66b7f47dd13c1b47c9858dfbeeb1f67ff64f3610 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -16,6 +16,7 @@ public class Robot extends IterativeRobot {
   private static Shooter shooter;
   private static OI oi;
   private static Intake intake;
+  private static CameraServer server;
 
   @Override
   public void robotInit() {
@@ -24,7 +25,7 @@ public class Robot extends IterativeRobot {
     shooter = Shooter.getShooter();
     intake = Intake.getIntake();
 
-    CameraServer server = CameraServer.getInstance();
+    server = CameraServer.getInstance();
     UsbCamera climberCam = server.startAutomaticCapture("climbercam", 0);
     UsbCamera intakeCam = server.startAutomaticCapture("intakecam", 1);
 
@@ -32,6 +33,7 @@ public class Robot extends IterativeRobot {
   }
 
   public static DriveTrain getDriveTrain() {
+
     return DriveTrain.getDriveTrain();
   }
 
@@ -47,12 +49,20 @@ public class Robot extends IterativeRobot {
     return Intake.getIntake();
   }
 
+  public static void swapCameraFeed() {
+    UsbCamera climberCam = server.startAutomaticCapture("climbercam", 1);
+    UsbCamera intakeCam = server.startAutomaticCapture("intakecam", 0);
+  }
+
   // If the gear values do not match in the left and right piston, then they are
   // both set to high gear
   @Override
   public void autonomousInit() {
     driveTrain.setHighGear();
+<<<<<<< HEAD
     driveTrain.setCANTalonsBrakeMode(driveTrain.DRIVE_COAST_MODE);
+=======
+>>>>>>> Add code to toggle agitator pistons in RunIndexWheelContinuous
   }
 
   @Override