From 0c746368c4dd945e3f1095011b12b9783d4bc05b Mon Sep 17 00:00:00 2001 From: Andres Esteban Echeverria G Date: Sat, 4 Feb 2017 17:08:47 -0800 Subject: [PATCH] Made final int for toggling camera feeds equal to 7(button 7) --- src/org/usfirst/frc/team3501/robot/Constants.java | 4 ++++ src/org/usfirst/frc/team3501/robot/Robot.java | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java index 7bcd0ad..432b068 100644 --- a/src/org/usfirst/frc/team3501/robot/Constants.java +++ b/src/org/usfirst/frc/team3501/robot/Constants.java @@ -17,7 +17,11 @@ public class Constants { public final static int TOGGLE_WINCH_PORT = 0; public final static int TOGGLE_FLYWHEEL_PORT = 0; public final static int TOGGLE_INDEXWHEEL_PORT = 0; +<<<<<<< HEAD public final static int TOGGLE_GEAR_PORT = 0; +======= + public static final int TOGGLE_CAMERA_FEEDS = 7; +>>>>>>> Made final int for toggling camera feeds equal to 7(button 7) } public static class Shooter { diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index 008369a..b6abd84 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -75,11 +75,9 @@ public class Robot extends IterativeRobot { @Override public void teleopInit() { -<<<<<<< HEAD -======= cameraFeeds.init(); ->>>>>>> implement CameraFeeds into robot.java and add todos + } @Override -- 2.30.2