projects / 3501 / 2017steamworks / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9dcc48a)
added all the joystick buttons
authorTrevor <tr89on@gmail.com>
Wed, 25 Jan 2017 04:43:26 +0000 (20:43 -0800)
committerTrevor <tr89on@gmail.com>
Tue, 31 Jan 2017 03:13:49 +0000 (19:13 -0800)
src/org/usfirst/frc/team3501/robot/OI.java patch | blob | blame | history

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index 6821cd9dbd5ff1997e753813fca2af221d400e9a..ccd9db85ea09da81172423c4cfe15ca9cec131f2 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,6 +1,6 @@
 package org.usfirst.frc.team3501.robot;
 
-<<<<<<<HEAD
+<<<<<<<HEAD<<<<<<<HEAD
 
 import org.usfirst.frc.team3501.robot.commandgroups.PrepareToShoot;
 import org.usfirst.frc.team3501.robot.commandgroups.Shoot;
@@ -8,13 +8,12 @@ import org.usfirst.frc.team3501.robot.commands.driving.ToggleGear;
 import org.usfirst.frc.team3501.robot.commands.driving.Turn90Left;
 import org.usfirst.frc.team3501.robot.commands.driving.Turn90Right;
 import org.usfirst.frc.team3501.robot.commands.shooter.DecreaseShootingSpeed;
-import org.usfirst.frc.team3501.robot.commands.shooter.IncreaseShootingSpeed;
-import org.usfirst.frc.team3501.robot.commands.shooter.RunIndexWheelContinuous;=======
+import org.usfirst.frc.team3501.robot.commands.shooter.IncreaseShootingSpeed;import org.usfirst.frc.team3501.robot.commands.shooter.RunIndexWheelContinuous;=======
 import org.usfirst.frc3501.RiceCatRobot.Constants;
 import org.usfirst.frc3501.RiceCatRobot.commands.CloseClaw;
-import org.usfirst.frc3501.RiceCatRobot.commands.ToggleClaw;
-import org.usfirst.frc3501.RiceCatRobot.commands.ToggleCompressor;>>>>>>>Added joystick buttons
+import org.usfirst.frc3501.RiceCatRobot.commands.ToggleClaw;import org.usfirst.frc3501.RiceCatRobot.commands.ToggleCompressor;>>>>>>>Added joystick buttons
 
+=======>>>>>>>added all the joystick buttons
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;
 import edu.wpi.first.wpilibj.buttons.JoystickButton;
@@ -23,25 +22,6 @@ public class OI {
   private static OI oi;
   public static Joystick leftJoystick;
   public static Joystick rightJoystick;
-<<<<<<< HEAD
-=======
-  public static Button toggleWinch;
-  public static Button triggerButton;
-
-  public static Button ;
-  public static Button ;
-  public static Button ;
-  public static Button ;
-  public static Button ;
-  public static Button ;
-  public static Button ;
-  public static Button ;
-  public static Button ;
-  public static Button ;
-  public static Button ;
-  public static Button ;
->>>>>>> Added joystick buttons
-
   public static Button toggleWinch;
   public static Button toggleIndexWheel;
   public static Button toggleFlyWheel;