Fix ports on solenoids

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 114dc509fc60eec6e0a3fc79f7f99712562022e1..6ed069637770a2d3b0d8915eb5d5d2121b90e75f 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -66,8 +66,8 @@ public class Constants {
     public static final int MANUAL_MODE = 1, ENCODER_MODE = 2, GYRO_MODE = 3;
 
     public static final int MODULE_A_ID = 9, MODULE_B_ID = 10;
-    public static final int LEFT_FORWARD = 5, LEFT_REVERSE = 1,
-        RIGHT_FORWARD = 4, RIGHT_REVERSE = 0;
+    public static final int LEFT_FORWARD = 1, LEFT_REVERSE = 5,
+        RIGHT_FORWARD = 0, RIGHT_REVERSE = 6;
 
     public static double time = 0;
 

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
index 7b6ef174bd3cc046ade23a65c00695c7a99862cd..c0eb39bc2c4b96338dc5c793423a378a9ebc8e1f 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@ -15,9 +15,9 @@ import edu.wpi.first.wpilibj.command.Subsystem;
  * motors. The piston controlling the platform pushes the ball onto the wheel.
  * The wheel is controlled by a motor, which is running before the ball is
  * pushed onto the wheel. The spinning wheel propels the ball.
- *
+ * 
  * @author superuser
- *
+ * 
  */
 
 public class Shooter extends Subsystem {
@@ -30,12 +30,14 @@ public class Shooter extends Subsystem {
 
   public Shooter() {
     shooter = new CANTalon(Constants.Shooter.PORT);
-    hood1 = new DoubleSolenoid(10, Constants.Shooter.RIGHT_HOOD_FORWARD,
+    hood1 = new DoubleSolenoid(Constants.DriveTrain.MODULE_B_ID,
+        Constants.Shooter.RIGHT_HOOD_FORWARD,
         Constants.Shooter.RIGHT_HOOD_REVERSE); // right
-    hood2 = new DoubleSolenoid(9, Constants.Shooter.LEFT_HOOD_FORWARD,
+    hood2 = new DoubleSolenoid(Constants.DriveTrain.MODULE_A_ID,
+        Constants.Shooter.LEFT_HOOD_FORWARD,
         Constants.Shooter.LEFT_HOOD_REVERSE);// left
-    punch = new DoubleSolenoid(9, Constants.Shooter.PUNCH_FORWARD,
-        Constants.Shooter.PUNCH_REVERSE);
+    punch = new DoubleSolenoid(Constants.DriveTrain.MODULE_A_ID,
+        Constants.Shooter.PUNCH_FORWARD, Constants.Shooter.PUNCH_REVERSE);
 
     encoder = new Encoder(Constants.Shooter.ENCODER_PORT_A,
         Constants.Shooter.ENCODER_PORT_B, false, EncodingType.k4X);
@@ -45,7 +47,7 @@ public class Shooter extends Subsystem {
   /***
    * This method checks to see if the ball has successfully passed through the
    * intake rollers and is inside.
-   *
+   * 
    * @return whether the presence of the ball is true or false and returns the
    *         state of the condition (true or false).
    */