X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FCameraFeeds.java;h=b18fbca8cebb663f1f009ff0f4f718346fe77488;hb=8d23fc007f8caa255a1e6748e67254824a34f8ac;hp=4ea9b161f51bf82c0339c07e32d50336f6bee632;hpb=6aa639bea4460d1d57a96d15115ef114b8a400d8;p=3501%2F2017steamworks diff --git a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java index 4ea9b16..b18fbca 100755 --- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java +++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java @@ -21,7 +21,7 @@ public class CameraFeeds { System.out.println("Enter CameraFeeds constructor"); server = CameraServer.getInstance(); climberCam = server.addAxisCamera("ClimberCam", "10.35.1.11"); - intakeCam = server.startAutomaticCapture(); + // intakeCam = server.startAutomaticCapture(); usbCamName = intakeCam.getName(); axisCamName = climberCam.getName(); curCam = climberCam; @@ -63,6 +63,5 @@ public class CameraFeeds { */ public void changeCam(VideoSource cam) { server.removeCamera(curCam.getName()); - server.addCamera(cam); } }