package team.gif;

import edu.wpi.first.wpilibj.Joystick;
import edu.wpi.first.wpilibj.buttons.Button;
import edu.wpi.first.wpilibj.buttons.DigitalIOButton;
import edu.wpi.first.wpilibj.buttons.JoystickButton;
import team.gif.commands.*;

public class OI {
    
    public static final Joystick
        leftStick = new Joystick(1),
        rightStick = new Joystick(2),
        auxStick = new Joystick(3);
    
    private final Button
        leftTrigger = new JoystickButton(leftStick, 1),
        aux2 = new JoystickButton(rightStick, 2),
        aux3 = new JoystickButton(rightStick, 3),
        aux6 = new JoystickButton(rightStick, 6),
        aux7 = new JoystickButton(rightStick, 7);
    
    public static final Button auxTrigger = new JoystickButton(rightStick, 1);
    
    public OI() {
        leftTrigger.whileHeld(new ShifterHigh());
        
        aux2.whileHeld(new CollectorReceive());
        aux2.whenPressed(new EarsOpen());
        
        aux3.whileHeld(new CollectorPass());
        aux3.whenPressed(new EarsOpen());
        aux3.whenReleased(new CollectorStandby());
        aux3.whenReleased(new EarsClosed());
        
        aux6.whileHeld(new BumperUp());
        aux7.whileHeld(new CollectorRaise());
    }
}


@@ -287,24 +287,16 @@
 Joystick
-%0A       
  leftSti
@@ -315,25 +315,41 @@
 stick(1)
-,
+;
 %0A    
-   
+public static final
  rightSt
@@ -369,25 +369,41 @@
 stick(2)
-,
+;
 %0A    
-   
+public static final
  auxStic
@@ -452,24 +452,16 @@
 l Button
-%0A       
  leftTri
@@ -499,29 +499,48 @@
 tick, 1)
-,%0A 
+;%0A
     
-   aux
+private final Button right
 2 = new 
@@ -568,29 +568,48 @@
 tick, 2)
-,
+;
 %0A    
-    aux
+private final Button right
 3 = new 
@@ -637,29 +637,48 @@
 tick, 3)
-,%0A        aux
+;%0A    private final Button right
 6 = new 
@@ -710,21 +710,40 @@
 , 6)
-,
+;
 %0A    
-    aux
+private final Button right
 7 = 
@@ -947,27 +947,29 @@
    %0A        
-aux
+right
 2.whileHeld(
@@ -1001,19 +1001,21 @@
         
-aux
+right
 2.whenPr
@@ -1050,27 +1050,29 @@
    %0A        
-aux
+right
 3.whileHeld(
@@ -1097,27 +1097,29 @@
 ));%0A        
-aux
+right
 3.whenPresse
@@ -1137,35 +1137,37 @@
 pen());%0A        
-aux
+right
 3.whenReleased(n
@@ -1198,19 +1198,21 @@
         
-aux
+right
 3.whenRe
@@ -1254,19 +1254,21 @@
         
-aux
+right
 6.whileH
@@ -1296,19 +1296,21 @@
         
-aux
+right
 7.whileH

Update OI.java