projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix ChangeCameraView
[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 1278a330a14aa63999100881d93978a7538cd2ff..e72f07e03b85c3a2c8512acf2989800469be42af 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/
src/org/usfirst/frc/team3501/robot/Robot.java
@@
-16,6
+16,7
@@
public class Robot extends IterativeRobot {
private static Shooter shooter;
private static OI oi;
private static Intake intake;
private static Shooter shooter;
private static OI oi;
private static Intake intake;
+ private static CameraServer server;
@Override
public void robotInit() {
@Override
public void robotInit() {
@@
-23,7
+24,7
@@
public class Robot extends IterativeRobot {
oi = OI.getOI();
shooter = Shooter.getShooter();
intake = Intake.getIntake();
oi = OI.getOI();
shooter = Shooter.getShooter();
intake = Intake.getIntake();
-
CameraServer
server = CameraServer.getInstance();
+ server = CameraServer.getInstance();
UsbCamera climberCam = server.startAutomaticCapture("climbercam", 0);
UsbCamera intakeCam = server.startAutomaticCapture("intakecam", 1);
}
UsbCamera climberCam = server.startAutomaticCapture("climbercam", 0);
UsbCamera intakeCam = server.startAutomaticCapture("intakecam", 1);
}
@@
-45,6
+46,11
@@
public class Robot extends IterativeRobot {
return Intake.getIntake();
}
return Intake.getIntake();
}
+ public static void swapCameraFeed() {
+ UsbCamera climberCam = server.startAutomaticCapture("climbercam", 1);
+ UsbCamera intakeCam = server.startAutomaticCapture("intakecam", 0);
+ }
+
// If the gear values do not match in the left and right piston, then they are
// both set to high gear
@Override
// If the gear values do not match in the left and right piston, then they are
// both set to high gear
@Override