package org.usfirst.frc.team3501.robot;
-<<<<<<< HEAD
import org.usfirst.frc.team3501.robot.commands.driving.BrakeCANTalons;
import org.usfirst.frc.team3501.robot.commands.driving.CoastCANTalons;
-=======
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import org.usfirst.frc.team3501.robot.commands.climber.ToggleWinch;
->>>>>>> Fix ChangeCameraView
import org.usfirst.frc.team3501.robot.commands.driving.ToggleGear;
import org.usfirst.frc.team3501.robot.commands.intake.ReverseIntakeContinuous;
import org.usfirst.frc.team3501.robot.commands.intake.RunIntakeContinuous;
import org.usfirst.frc.team3501.robot.commands.shooter.ReverseIndexWheelContinuous;
import org.usfirst.frc.team3501.robot.commands.shooter.RunFlyWheelContinuous;
import org.usfirst.frc.team3501.robot.commands.shooter.RunIndexWheelContinuous;
-<<<<<<< HEAD
import org.usfirst.frc.team3501.robot.commands.shooter.ToggleIndexerPiston;
-=======
->>>>>>> Fix ChangeCameraView
import org.usfirst.frc.team3501.robot.utils.ChangeCameraView;
import edu.wpi.first.wpilibj.Joystick;
import edu.wpi.first.wpilibj.buttons.Button;
import edu.wpi.first.wpilibj.buttons.JoystickButton;
-<<<<<<< HEAD
public class OI /* implements KeyListener */ {
-=======
-public class OI implements KeyListener {
->>>>>>> Fix ChangeCameraView
private static OI oi;
public static Joystick leftJoystick;
public static Joystick rightJoystick;
coastCANTalons = new JoystickButton(rightJoystick,
Constants.OI.COAST_CANTALONS_PORT);
coastCANTalons.whenPressed(new CoastCANTalons());
+
}
public static OI getOI() {
return oi;
}
-<<<<<<< HEAD
/*
* @Override public void keyPressed(KeyEvent e) { if (e.getKeyCode() ==
* KeyEvent.VK_Z) { // Robot.swapCameraFeed();
*
* @Override public void keyTyped(KeyEvent e) { }
*/
-
-=======
- @Override
- public void keyTyped(KeyEvent e) {
-
- }
-
- @Override
- public void keyPressed(KeyEvent e) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void keyReleased(KeyEvent e) {
- // TODO Auto-generated method stub
-
- }
->>>>>>> Fix ChangeCameraView
}