Fix merge conflicts

diff --git a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index 07cf52e6a4e445150b7eb2d59c6637f475dd2b3c..d1b0ac0970a5820ac91476a5d3d34c01811186a1 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@ -20,7 +20,7 @@ public class CameraFeeds {
   private CameraFeeds(/* Joystick Button */) {
     System.out.println("Enter CameraFeeds constructor");
     server = CameraServer.getInstance();
-    climberCam = server.addAxisCamera("AxisCamera", "10.35.1.11");
+    climberCam = server.addAxisCamera("ClimberCam", "10.35.1.11");
     intakeCam = server.startAutomaticCapture();
     usbCamName = intakeCam.getName();
     axisCamName = climberCam.getName();
@@ -47,11 +47,13 @@ public class CameraFeeds {
     if (curCam.equals(intakeCam)) {
       changeCam(climberCam);
       curCam = climberCam;
-      System.out.println("Switching to climber camera.");
+      System.out
+          .println("Switching to climber camera, curCam = " + curCam.getName());
     } else if (curCam.equals(climberCam)) {
       changeCam(intakeCam);
       curCam = intakeCam;
-      System.out.println("Switching to intake camera.");
+      System.out
+          .println("Switching to intake camera, curCam = " + curCam.getName());
     }
   }
 

diff --git a/src/org/usfirst/frc/team3501/robot/commands/accessories/ToggleCameraFeed.java b/src/org/usfirst/frc/team3501/robot/commands/accessories/ToggleCameraFeed.java
index d5c9c60f508b200b111274568c1d0d924ab8c195..7671e2a2eb3a26e83c9f803853a45b4a528e6944 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/accessories/ToggleCameraFeed.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/accessories/ToggleCameraFeed.java
@@ -10,7 +10,7 @@ public class ToggleCameraFeed extends Command {
   @Override
   protected void execute() {
     CameraFeeds cf = Robot.getCameraFeeds();
-    // System.out.println(cf.getCurrentCamName());
+    System.out.println("Button Pressed");
     cf.toggleCamera();
   }