projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add code for toggling camera, but took it off
[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 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();
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() {
}
public static DriveTrain getDriveTrain() {