From 4c854ce7613a498364e66eebf1ca6da714117c24 Mon Sep 17 00:00:00 2001
From: mmilunicmobile <mmilunicmobile@gmail.com>
Date: Tue, 10 Dec 2024 21:01:46 -0500
Subject: [PATCH] Renamed Constants directory to constants

---
 .../pathplanner/paths/Example Path.path       | 52 -------------------
 .../GlobalConstants.java                      |  0
 .../TunerConstants.java                       | 22 --------
 .../subsystems/CommandSwerveDrivetrain.java   |  1 -
 4 files changed, 75 deletions(-)
 delete mode 100644 src/main/deploy/pathplanner/paths/Example Path.path
 rename src/main/java/frc/robot/{Constants => constants}/GlobalConstants.java (100%)
 rename src/main/java/frc/robot/{Constants => constants}/TunerConstants.java (91%)

diff --git a/src/main/deploy/pathplanner/paths/Example Path.path b/src/main/deploy/pathplanner/paths/Example Path.path
deleted file mode 100644
index 6e12b6dd..00000000
--- a/src/main/deploy/pathplanner/paths/Example Path.path	
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "version": 1.0,
-  "waypoints": [
-    {
-      "anchor": {
-        "x": 2.0,
-        "y": 7.0
-      },
-      "prevControl": null,
-      "nextControl": {
-        "x": 3.0,
-        "y": 7.0
-      },
-      "isLocked": false,
-      "linkedName": null
-    },
-    {
-      "anchor": {
-        "x": 4.0,
-        "y": 6.0
-      },
-      "prevControl": {
-        "x": 3.0,
-        "y": 6.0
-      },
-      "nextControl": null,
-      "isLocked": false,
-      "linkedName": null
-    }
-  ],
-  "rotationTargets": [],
-  "constraintZones": [],
-  "pointTowardsZones": [],
-  "eventMarkers": [],
-  "globalConstraints": {
-    "maxVelocity": 6.0,
-    "maxAcceleration": 3.0,
-    "maxAngularVelocity": 540.0,
-    "maxAngularAcceleration": 720.0
-  },
-  "goalEndState": {
-    "velocity": 0,
-    "rotation": 0.0
-  },
-  "reversed": false,
-  "folder": null,
-  "idealStartingState": {
-    "velocity": 0,
-    "rotation": 0.0
-  },
-  "useDefaultConstraints": true
-}
\ No newline at end of file
diff --git a/src/main/java/frc/robot/Constants/GlobalConstants.java b/src/main/java/frc/robot/constants/GlobalConstants.java
similarity index 100%
rename from src/main/java/frc/robot/Constants/GlobalConstants.java
rename to src/main/java/frc/robot/constants/GlobalConstants.java
diff --git a/src/main/java/frc/robot/Constants/TunerConstants.java b/src/main/java/frc/robot/constants/TunerConstants.java
similarity index 91%
rename from src/main/java/frc/robot/Constants/TunerConstants.java
rename to src/main/java/frc/robot/constants/TunerConstants.java
index feed5de2..8b903a5c 100644
--- a/src/main/java/frc/robot/Constants/TunerConstants.java
+++ b/src/main/java/frc/robot/constants/TunerConstants.java
@@ -118,11 +118,7 @@ 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;
 
@@ -130,15 +126,9 @@ public class TunerConstants {
     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;
 
@@ -146,15 +136,9 @@ public class TunerConstants {
     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;
 
@@ -162,15 +146,9 @@ public class TunerConstants {
     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;
 
diff --git a/src/main/java/frc/robot/subsystems/CommandSwerveDrivetrain.java b/src/main/java/frc/robot/subsystems/CommandSwerveDrivetrain.java
index e506dbdf..a8fbae55 100644
--- a/src/main/java/frc/robot/subsystems/CommandSwerveDrivetrain.java
+++ b/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;
     }