Renamed Constants directory to constants

src/main/java/frc/robot/Constants/TunerConstants.java → src/main/java/frc/robot/constants/TunerConstants.java

@@ -118,59 +118,37 @@ public class TunerConstants {
     // Front Left
     private static final int kFrontLeftDriveMotorId = 1;
     private static final int kFrontLeftSteerMotorId = 2;
-<<<<<<< HEAD
     private static final int kFrontLeftEncoderId = 20;
-=======
-    private static final int kFrontLeftEncoderId = 3;
->>>>>>> 4ddadbc (Fixed conflicting CAN IDs (0))
     private static final Angle kFrontLeftEncoderOffset = Rotations.of(0);
     private static final boolean kFrontLeftSteerMotorInverted = false;
 
     private static final Distance kFrontLeftXPos = Inches.of(10);
     private static final Distance kFrontLeftYPos = Inches.of(10);
 
     // Front Right
-<<<<<<< HEAD
     private static final int kFrontRightDriveMotorId = 3;
     private static final int kFrontRightSteerMotorId = 4;
     private static final int kFrontRightEncoderId = 21;
-=======
-    private static final int kFrontRightDriveMotorId = 4;
-    private static final int kFrontRightSteerMotorId = 5;
-    private static final int kFrontRightEncoderId = 6;
->>>>>>> 4ddadbc (Fixed conflicting CAN IDs (0))
     private static final Angle kFrontRightEncoderOffset = Rotations.of(0);
     private static final boolean kFrontRightSteerMotorInverted = false;
 
     private static final Distance kFrontRightXPos = Inches.of(10);
     private static final Distance kFrontRightYPos = Inches.of(-10);
 
     // Back Left
-<<<<<<< HEAD
     private static final int kBackLeftDriveMotorId = 5;
     private static final int kBackLeftSteerMotorId = 6;
     private static final int kBackLeftEncoderId = 22;
-=======
-    private static final int kBackLeftDriveMotorId = 7;
-    private static final int kBackLeftSteerMotorId = 8;
-    private static final int kBackLeftEncoderId = 9;
->>>>>>> 4ddadbc (Fixed conflicting CAN IDs (0))
     private static final Angle kBackLeftEncoderOffset = Rotations.of(0);
     private static final boolean kBackLeftSteerMotorInverted = false;
 
     private static final Distance kBackLeftXPos = Inches.of(-10);
     private static final Distance kBackLeftYPos = Inches.of(10);
 
     // Back Right
-<<<<<<< HEAD
     private static final int kBackRightDriveMotorId = 7;
     private static final int kBackRightSteerMotorId = 8;
     private static final int kBackRightEncoderId = 23;
-=======
-    private static final int kBackRightDriveMotorId = 10;
-    private static final int kBackRightSteerMotorId = 11;
-    private static final int kBackRightEncoderId = 12;
->>>>>>> 4ddadbc (Fixed conflicting CAN IDs (0))
     private static final Angle kBackRightEncoderOffset = Rotations.of(0);
     private static final boolean kBackRightSteerMotorInverted = false;
 

src/main/java/frc/robot/subsystems/CommandSwerveDrivetrain.java

@@ -269,7 +269,6 @@ private FieldOrientedOrbitSwerveRequest generateSwerveSetpointConfig()
 
         var request = new FieldOrientedOrbitSwerveRequest(setpointGenerator, previousSetpoint, getState().Pose.getRotation());
         request.withDriverOrientation(true);
-        request.withXRateLimits(2,2);
         return request;
     }