projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix merge conflicts.
[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 d467182080a4343d91d6fd6bcefd22ca8310659e..e7c5e5b1928398f30bc31fd42c0c5bc43f87634f 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/
src/org/usfirst/frc/team3501/robot/Robot.java
@@
-25,7
+25,9
@@
public class Robot extends IterativeRobot {
oi = OI.getOI();
shooter = Shooter.getShooter();
intake = Intake.getIntake();
oi = OI.getOI();
shooter = Shooter.getShooter();
intake = Intake.getIntake();
-
+ cameraServer2 = CameraServer.getInstance();
+ axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+ cameraFeeds = new CameraFeeds();
cameraFeeds = CameraFeeds.getCameraFeeds();
// usbCamera = CameraServer.getInstance().startAutomaticCapture();
cameraFeeds = CameraFeeds.getCameraFeeds();
// usbCamera = CameraServer.getInstance().startAutomaticCapture();
@@
-42,7
+44,6
@@
public class Robot extends IterativeRobot {
// axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
// cameraFeeds = new CameraFeeds();
// axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
// cameraFeeds = new CameraFeeds();
-
}
public static DriveTrain getDriveTrain() {
}
public static DriveTrain getDriveTrain() {
@@
-80,12
+81,10
@@
public class Robot extends IterativeRobot {
@Override
public void teleopInit() {
@Override
public void teleopInit() {
-
}
@Override
public void teleopPeriodic() {
Scheduler.getInstance().run();
}
@Override
public void teleopPeriodic() {
Scheduler.getInstance().run();
-
}
}
}
}