From b90bdbe6e89ccf67caa508921615a032c336e8df Mon Sep 17 00:00:00 2001 From: Rayan Hirech Date: Sat, 28 Jan 2017 15:55:24 -0800 Subject: [PATCH] Move code to more updated branch. --- src/org/usfirst/frc/team3501/robot/Robot.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index 1cffcb0..1ad62e1 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -4,6 +4,9 @@ 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; @@ -12,6 +15,9 @@ public class Robot extends IterativeRobot { private static Shooter shooter; private static OI oi; private static Intake intake; + private static UsbCamera usbCamera; + private static CameraServer cameraServer2; + private static AxisCamera axisCamera; @Override public void robotInit() { @@ -20,6 +26,10 @@ public class Robot extends IterativeRobot { shooter = Shooter.getShooter(); intake = Intake.getIntake(); + usbCamera = CameraServer.getInstance().startAutomaticCapture(); + // cameraServer2 = CameraServer;getInstance(); + // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11"); + } public static DriveTrain getDriveTrain() { -- 2.30.2