fix port constants for joystick and drive train

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 7372b0af89d2b11a17292f304d1e99a3929f0853..b8016bd62da35c46a902e738404cb70da0231c2f 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -9,7 +9,7 @@ package org.usfirst.frc.team3501.robot;
 public class Constants {
   public static class OI {
     public final static int LEFT_STICK_PORT = 0;
-    public final static int RIGHT_STICK_PORT = 0;
+    public final static int RIGHT_STICK_PORT = 1;
   }
 
   public static class DriveTrain {
@@ -17,13 +17,13 @@ public class Constants {
     public static final int FRONT_LEFT = 1;
     public static final int FRONT_RIGHT = 3;
     public static final int REAR_LEFT = 2;
-    public static final int REAR_RIGHT = 9;
+    public static final int REAR_RIGHT = 4;
 
     // ENCODERS
-    public static final int ENCODER_LEFT_A = 2;
-    public static final int ENCODER_LEFT_B = 3;
-    public static final int ENCODER_RIGHT_A = 0;
-    public static final int ENCODER_RIGHT_B = 1;
+    public static final int ENCODER_LEFT_A = 0;
+    public static final int ENCODER_LEFT_B = 1;
+    public static final int ENCODER_RIGHT_A = 2;
+    public static final int ENCODER_RIGHT_B = 3;
 
     public static final int INCHES_PER_PULSE = 0;
   }

diff --git a/src/org/usfirst/frc/team3501/robot/commandGroups/ExampleCommandGroup.java b/src/org/usfirst/frc/team3501/robot/commandGroups/ExampleCommandGroup.java
deleted file mode 100644 (file)
index 7035c91..0000000
--- a/src/org/usfirst/frc/team3501/robot/commandGroups/ExampleCommandGroup.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.usfirst.frc.team3501.robot.commandGroups;
-
-import edu.wpi.first.wpilibj.command.CommandGroup;
-
-/**
- *
- */
-public class ExampleCommandGroup extends CommandGroup {
-
-    public ExampleCommandGroup() {
-        // Add Commands here:
-        // e.g. addSequential(new Command1());
-        //      addSequential(new Command2());
-        // these will run in order.
-
-        // To run multiple commands at the same time,
-        // use addParallel()
-        // e.g. addParallel(new Command1());
-        //      addSequential(new Command2());
-        // Command1 and Command2 will run in parallel.
-
-        // A command group will require all of the subsystems that each member
-        // would require.
-        // e.g. if Command1 requires chassis, and Command2 requires arm,
-        // a CommandGroup containing them would require both the chassis and the
-        // arm.
-    }
-}