add ports & buttons

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index d4e8f7e1213fd16b7d4cc6a34e86cf1b493baeed..a13ca0b7fcdf1e25e99518d4392cbd4b5b475259 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -17,30 +17,28 @@ public class Constants {
 
     // Need to fill in the port numbers of the following buttons
     public final static int TOGGLE_WINCH_PORT = 0;
-    public final static int TOGGLE_FLYWHEEL_PORT = 0;
-    public final static int TOGGLE_INDEXWHEEL_PORT = 0;
+    public final static int TOGGLE_FLYWHEEL_PORT = 4;
+    public final static int RUN_INDEXWHEEL_PORT = 1;
     public final static int REVERSE_INDEXWHEEL_PORT = 0;
     public final static int TOGGLE_GEAR_PORT = 5;
-    public final static int TOGGLE_INTAKE_PORT = 1;
-    public final static int REVERSE_INTAKE_PORT = 2;
+    public final static int RUN_INTAKE_PORT = 1;
+    public final static int REVERSE_INTAKE_PORT = 0;
+    public static final int INCREASE_SHOOTER_SPEED_PORT = 6;
+    public static final int DECREASE_SHOOTER_SPEED_PORT = 2;
   }
 
   public static class Shooter {
     // MOTOR CONTROLLERS
-    public static final int FLY_WHEEL1 = 0;
-    public static final int FLY_WHEEL2 = 0;
-    public static final int INDEX_WHEEL = 0;
-    public final static int TOGGLE_WINCH_PORT = 0;
-
-    public final static int TOGGLE_FLYWHEEL_PORT = 0;
-    public final static int TOGGLE_INDEXWHEEL_PORT = 0;
+    public static final int FLY_WHEEL1 = 5;
+    public static final int FLY_WHEEL2 = 6;
+    public static final int INDEX_WHEEL = 7;
 
-    public final static int HALL_EFFECT_PORT = 4;
+    public final static int HALL_EFFECT_PORT = 8;
   }
 
   public static class DriveTrain {
     // GEARS
-    public static final int LEFT_GEAR_PISTON_FORWARD = 0,
+    public static final int PISTON_MODULE = 10, LEFT_GEAR_PISTON_FORWARD = 0,
         LEFT_GEAR_PISTON_REVERSE = 1, RIGHT_GEAR_PISTON_FORWARD = 2,
         RIGHT_GEAR_PISTON_REVERSE = 3;
     public static final Value HIGH_GEAR = DoubleSolenoid.Value.kForward;

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index f878e7cf57016d154da3f7c85ac3cbefed482210..510b722179b5e057de78c7e731daba29180fbc3f 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -4,6 +4,8 @@ import org.usfirst.frc.team3501.robot.commands.climber.ToggleWinch;
 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.DecreaseShootingSpeed;
+import org.usfirst.frc.team3501.robot.commands.shooter.IncreaseShootingSpeed;
 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;
@@ -27,19 +29,22 @@ public class OI {
   public static Button runIntake;
   public static Button reverseIntake;
 
+  public static Button increaseShooterSpeed;
+  public static Button decreaseShooterSpeed;
+
   public OI() {
     leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
     rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT);
 
-    runIndexWheel = new JoystickButton(leftJoystick,
-        Constants.OI.TOGGLE_INDEXWHEEL_PORT);
+    runIndexWheel = new JoystickButton(rightJoystick,
+        Constants.OI.RUN_INDEXWHEEL_PORT);
     runIndexWheel.whileHeld(new RunIndexWheelContinuous());
 
     reverseIndexWheel = new JoystickButton(leftJoystick,
         Constants.OI.REVERSE_INDEXWHEEL_PORT);
     reverseIndexWheel.whileHeld(new ReverseIndexWheelContinuous());
 
-    toggleFlyWheel = new JoystickButton(leftJoystick,
+    toggleFlyWheel = new JoystickButton(rightJoystick,
         Constants.OI.TOGGLE_FLYWHEEL_PORT);
     toggleFlyWheel.toggleWhenPressed(new RunFlyWheelContinuous());
 
@@ -48,7 +53,7 @@ public class OI {
     toggleGear.whenPressed(new ToggleGear());
 
     runIntake = new JoystickButton(leftJoystick,
-        Constants.OI.TOGGLE_INTAKE_PORT);
+        Constants.OI.RUN_INTAKE_PORT);
     runIntake.whileHeld(new RunIntakeContinuous());
 
     reverseIntake = new JoystickButton(leftJoystick,
@@ -58,6 +63,14 @@ public class OI {
     toggleWinch = new JoystickButton(leftJoystick,
         Constants.OI.TOGGLE_WINCH_PORT);
     toggleWinch.whenPressed(new ToggleWinch());
+
+    increaseShooterSpeed = new JoystickButton(leftJoystick,
+        Constants.OI.INCREASE_SHOOTER_SPEED_PORT);
+    increaseShooterSpeed.whenPressed(new IncreaseShootingSpeed());
+
+    decreaseShooterSpeed = new JoystickButton(leftJoystick,
+        Constants.OI.DECREASE_SHOOTER_SPEED_PORT);
+    decreaseShooterSpeed.whenPressed(new DecreaseShootingSpeed());
   }
 
   public static OI getOI() {