reverting eileens changes

diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 2d922ab1691a63fddd8a7577e357bab131aefc9d..8ded8fa91f2cc8b37abee0c7ce50bbb0199ca191 100644 (file)
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -111,13 +111,12 @@ public class RobotContainer {
         hood = new Hood();
       
       case TwinBot:
-        //spindexer = new Spindexer();
-        //intake = new Intake();
-
+        spindexer = new Spindexer();
+        intake = new Intake();
       case SwerveCompetition: // AKA "Vantage"
 
       case BetaBot: // AKA "Pancake"
-        //vision = new Vision(VisionConstants.APRIL_TAG_CAMERAS);
+        vision = new Vision(VisionConstants.APRIL_TAG_CAMERAS);
         // fall-through
 
       case Vivace:

diff --git a/src/main/java/frc/robot/constants/IdConstants.java b/src/main/java/frc/robot/constants/IdConstants.java
index 520a576ff3889c3e7c759bf42444886f8196d9c6..160c8da00e32e990f0fe3455c59454b620ad24f3 100644 (file)
--- a/src/main/java/frc/robot/constants/IdConstants.java
+++ b/src/main/java/frc/robot/constants/IdConstants.java
@@ -5,7 +5,7 @@ public class IdConstants {
     public static final int DRIVE_FRONT_LEFT_ID = 1;
     public static final int STEER_FRONT_LEFT_ID = 2;
     public static final int ENCODER_FRONT_LEFT_ID = 3;
-    public static final int DRIVE_FRONT_RIGHT_ID = 31;
+    public static final int DRIVE_FRONT_RIGHT_ID = 10;
     public static final int STEER_FRONT_RIGHT_ID = 11;
     public static final int ENCODER_FRONT_RIGHT_ID = 12;
     public static final int DRIVE_BACK_LEFT_ID = 7;