projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implement CameraFeeds into robot.java and add todos
[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 5b0f35e01656a4fd26370230fbd4e7eeb7a8eaec..a5f15fb788558ec303e74196b4eb3fc64c8c2c93 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/
src/org/usfirst/frc/team3501/robot/Robot.java
@@
-1,10
+1,12
@@
package org.usfirst.frc.team3501.robot;
package org.usfirst.frc.team3501.robot;
-import org.usfirst.frc.team3501.robot.commands.driving.TimeDrive;
import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
import org.usfirst.frc.team3501.robot.subsystems.Intake;
import org.usfirst.frc.team3501.robot.subsystems.Shooter;
import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
import org.usfirst.frc.team3501.robot.subsystems.Intake;
import org.usfirst.frc.team3501.robot.subsystems.Shooter;
+import edu.wpi.cscore.AxisCamera;
+import edu.wpi.cscore.UsbCamera;
+import edu.wpi.first.wpilibj.CameraServer;
import edu.wpi.first.wpilibj.IterativeRobot;
import edu.wpi.first.wpilibj.command.Scheduler;
import edu.wpi.first.wpilibj.IterativeRobot;
import edu.wpi.first.wpilibj.command.Scheduler;
@@
-13,6
+15,10
@@
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 UsbCamera usbCamera;
+ private static CameraServer cameraServer2;
+ private static AxisCamera axisCamera;
+ private static CameraFeeds cameraFeeds;
@Override
public void robotInit() {
@Override
public void robotInit() {
@@
-20,6
+26,10
@@
public class Robot extends IterativeRobot {
oi = OI.getOI();
shooter = Shooter.getShooter();
intake = Intake.getIntake();
oi = OI.getOI();
shooter = Shooter.getShooter();
intake = Intake.getIntake();
+ usbCamera = CameraServer.getInstance().startAutomaticCapture();
+ cameraServer2 = CameraServer.getInstance();
+ axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+ cameraFeeds = new CameraFeeds();
}
public static DriveTrain getDriveTrain() {
}
public static DriveTrain getDriveTrain() {
@@
-35,12
+45,11
@@
public class Robot extends IterativeRobot {
}
public static Intake getIntake() {
}
public static Intake getIntake() {
- return Intake.getIntake()
+ return Intake.getIntake()
;
}
@Override
public void autonomousInit() {
}
@Override
public void autonomousInit() {
- Scheduler.getInstance().add(new TimeDrive(1.5, 0.4));
}
@Override
}
@Override
@@
-51,11
+60,13
@@
public class Robot extends IterativeRobot {
@Override
public void teleopInit() {
@Override
public void teleopInit() {
+ cameraFeeds.init();
}
@Override
public void teleopPeriodic() {
Scheduler.getInstance().run();
}
@Override
public void teleopPeriodic() {
Scheduler.getInstance().run();
+ cameraFeeds.run();
}
}
}
}