From 1cac6c82d7cd42d210d46ae0edb59bc10f44ba26 Mon Sep 17 00:00:00 2001 From: Meryem Esa Date: Thu, 2 Feb 2017 19:38:35 -0800 Subject: [PATCH] implement CameraFeeds into robot.java and add todos --- src/org/usfirst/frc/team3501/robot/CameraFeeds.java | 4 ++-- src/org/usfirst/frc/team3501/robot/Robot.java | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java index c6cd477..c354594 100755 --- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java +++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java @@ -32,10 +32,10 @@ public class CameraFeeds { public void run() { - if() + if(/*add test for toggle*/) changeCam(intakeCam); - if() + if(/*add test for toggle*/) changeCam(climberCam); updateCam(); diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index 29b1a3c..5be99d5 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -18,6 +18,7 @@ public class Robot extends IterativeRobot { private static UsbCamera usbCamera; private static CameraServer cameraServer2; private static AxisCamera axisCamera; + private static CameraFeeds cameraFeeds; @Override public void robotInit() { @@ -33,7 +34,11 @@ public class Robot extends IterativeRobot { cameraServer2 = CameraServer.getInstance(); axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11"); +<<<<<<< HEAD +======= + cameraFeeds = new CameraFeeds(); +>>>>>>> implement CameraFeeds into robot.java and add todos } public static DriveTrain getDriveTrain() { @@ -67,12 +72,17 @@ public class Robot extends IterativeRobot { @Override public void teleopInit() { +<<<<<<< HEAD +======= + cameraFeeds.init(); +>>>>>>> implement CameraFeeds into robot.java and add todos } @Override public void teleopPeriodic() { Scheduler.getInstance().run(); + cameraFeeds.run(); } } -- 2.30.2