From a1a9bb70a6a25abccae66ebfb315ca05391eae69 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 | 4 ++++ 2 files changed, 6 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 56010e1..a5f15fb 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() { @@ -28,6 +29,7 @@ public class Robot extends IterativeRobot { usbCamera = CameraServer.getInstance().startAutomaticCapture(); cameraServer2 = CameraServer.getInstance(); axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11"); + cameraFeeds = new CameraFeeds(); } public static DriveTrain getDriveTrain() { @@ -58,11 +60,13 @@ public class Robot extends IterativeRobot { @Override public void teleopInit() { + cameraFeeds.init(); } @Override public void teleopPeriodic() { Scheduler.getInstance().run(); + cameraFeeds.run(); } } -- 2.30.2