projects / 3501 / 2017steamworks / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f5a8dab)
Added joystick buttons
authorTrevor <tr89on@gmail.com>
Wed, 25 Jan 2017 04:09:12 +0000 (20:09 -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 92169fe89424c64724d283b165a8b8fc1e807ad5..6821cd9dbd5ff1997e753813fca2af221d400e9a 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,5 +1,7 @@
 package org.usfirst.frc.team3501.robot;
 
+<<<<<<<HEAD
+
 import org.usfirst.frc.team3501.robot.commandgroups.PrepareToShoot;
 import org.usfirst.frc.team3501.robot.commandgroups.Shoot;
 import org.usfirst.frc.team3501.robot.commands.driving.ToggleGear;
@@ -7,7 +9,11 @@ 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.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 edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;
@@ -17,6 +23,24 @@ 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;
@@ -42,6 +66,7 @@ public class OI {
         Constants.OI.TOGGLE_INDEXWHEEL_PORT);
     toggleFlyWheel = new JoystickButton(leftJoystick,
         Constants.OI.TOGGLE_FLYWHEEL_PORT);
+
     toggleIntake = new JoystickButton(leftJoystick,
         Constants.OI.TOGGLE_FLYWHEEL_PORT);
     toggleReverseIntake = new JoystickButton(leftJoystick,
@@ -72,6 +97,7 @@ public class OI {
     turn90Left.whenPressed(new Turn90Left());
     readyShooter.whenPressed(new PrepareToShoot());
     shootButton.whenPressed(new Shoot());
+
   }
 
   public static OI getOI() {