fix conflicts

[3501/2015-FRC-Spark] / src / org / usfirst / frc3501 / RiceCatRobot / OI.java

diff --git a/src/org/usfirst/frc3501/RiceCatRobot/OI.java b/src/org/usfirst/frc3501/RiceCatRobot/OI.java
deleted file mode 100644 (file)
index e463ea3..0000000
--- a/src/org/usfirst/frc3501/RiceCatRobot/OI.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.usfirst.frc3501.RiceCatRobot;
-
-import org.usfirst.frc3501.RiceCatRobot.commands.ToggleClaw;
-import org.usfirst.frc3501.RiceCatRobot.commands.ToggleCompressor;
-
-import edu.wpi.first.wpilibj.Joystick;
-import edu.wpi.first.wpilibj.buttons.JoystickButton;
-
-public class OI {
-  public static Joystick leftJoystick;
-  public static Joystick rightJoystick;
-  public static JoystickButton trigger;
-  public static JoystickButton toggleCompressor;
-  public static JoystickButton toggleClaw;
-
-  public OI() {
-    System.out.println("OI is open");
-    leftJoystick = new Joystick(RobotMap.LEFT_STICK_PORT);
-    rightJoystick = new Joystick(RobotMap.RIGHT_STICK_PORT);
-
-    trigger = new JoystickButton(rightJoystick, RobotMap.TRIGGER_PORT);
-
-    toggleClaw = new JoystickButton(rightJoystick, RobotMap.TOGGLE_PORT);
-    toggleClaw.whenPressed(new ToggleClaw());
-
-    toggleCompressor = new JoystickButton(rightJoystick,
-        RobotMap.TOGGLE_COMPRESSOR_PORT);
-    toggleCompressor.whenPressed(new ToggleCompressor());
-
-  }
-}