projects
/
3501
/
2017steamworks
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6c8d1c4
)
Add code for toggling camera, but took it off
author
yavda
<advay.anand@gmail.com>
Sun, 29 Jan 2017 01:15:14 +0000
(17:15 -0800)
committer
yavda
<advay.anand@gmail.com>
Sun, 29 Jan 2017 01:15:14 +0000
(17:15 -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 529ddca86e2bef38d9297e523d030ae9c9edb7a0..56010e15111f4296af8c3baa49bdc64d7e269457 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/
src/org/usfirst/frc/team3501/robot/Robot.java
@@
-26,8
+26,8
@@
public class Robot extends IterativeRobot {
shooter = Shooter.getShooter();
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() {