projects / 3501 / 2017steamworks / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b90bdbe)
Add code for toggling camera, but took it off
authoryavda <advay.anand@gmail.com>
Sun, 29 Jan 2017 01:15:14 +0000 (17:15 -0800)
committerRayan Hirech <ramine411@gmail.com>
Tue, 7 Feb 2017 03:44:46 +0000 (19:44 -0800)
src/org/usfirst/frc/team3501/robot/Robot.java patch | blob | blame | history

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 1ad62e1f4de0b8a7d9d6c262680d41a0e4b19ea3..29b1a3cdde2ecea9d847eb48dbf3b215fdae0e71 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -27,9 +27,13 @@ public class Robot extends IterativeRobot {
     intake = Intake.getIntake();
 
     usbCamera = CameraServer.getInstance().startAutomaticCapture();
+
     // cameraServer2 = CameraServer;getInstance();
     // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
 
+    cameraServer2 = CameraServer.getInstance();
+    axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+
   }
 
   public static DriveTrain getDriveTrain() {