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 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();
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");
+ cameraServer2 = CameraServer.getInstance();
+ axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+
}
public static DriveTrain getDriveTrain() {
}
public static DriveTrain getDriveTrain() {