working

diff --git a/src/main/java/frc/robot/commands/gpm/BrownOutControl.java b/src/main/java/frc/robot/commands/gpm/BrownOutControl.java
index cfa986ced1abe8f4eb46e26729e3556c9349ec71..d7f2b7da8359465375031966f6ed0a39e35aa1af 100644 (file)
--- a/src/main/java/frc/robot/commands/gpm/BrownOutControl.java
+++ b/src/main/java/frc/robot/commands/gpm/BrownOutControl.java
@@ -79,7 +79,7 @@ public class BrownOutControl extends Command {
         shooter.setNewCurrentLimit(shooterCurrent);
         turret.setCurrentLimits(turretCurrent);
         hood.setCurrentLimits(hoodCurrent);
-        spindexer.setNewCurrentLimit(spindexerCurrent);
+        spindexer.setNewCurrentLimit(spindexerCurrent, 67);
         intake.setCurrentLimits(intakeCurrent);
         drivetrain.applyNewModuleCurrents(steerCurrent, driveCurrent);
 

diff --git a/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java b/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
index 9b578202b6efd1d84c26a6ad203d06f72f206dd8..be2e21fe3da836a3a9bebd8e6b2c1f9ac4bea8de 100644 (file)
--- a/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
+++ b/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
@@ -161,12 +161,12 @@ public class PS5ControllerDriverConfig extends BaseDriverConfig {
     private void shootFocus(boolean turnOn) {
         if (turnOn) {
             System.out.println("Shooting is now Focused");
-            spindexer.setNewCurrentLimit(SpindexerConstants.currentLimit);
+            spindexer.setNewCurrentLimit(SpindexerConstants.CURRENT_FORWARD_STATOR_LIMIT, SpindexerConstants.SUPPLY_CURRENT_LIMIT);
             drive.applyNewModuleCurrents(DriveConstants.STEER_PEAK_CURRENT_LIMIT, 
                     DriveConstants.DRIVE_PEAK_CURRENT_LIMIT * 0.25);
         } else {
             System.out.println("Shooting back to normal (From focus)");
-            spindexer.setNewCurrentLimit(SpindexerConstants.currentLimit);
+                        spindexer.setNewCurrentLimit(SpindexerConstants.CURRENT_FORWARD_STATOR_LIMIT, SpindexerConstants.SUPPLY_CURRENT_LIMIT);
             drive.applyNewModuleCurrents(DriveConstants.STEER_PEAK_CURRENT_LIMIT, 
                     DriveConstants.DRIVE_PEAK_CURRENT_LIMIT);
         }

diff --git a/src/main/java/frc/robot/subsystems/spindexer/Spindexer.java b/src/main/java/frc/robot/subsystems/spindexer/Spindexer.java
index 54c215211f3b73ff4f96673de6c3d01e6aa52492..90316db4f6a1cd98203d124b1119edea4e2c08a1 100644 (file)
--- a/src/main/java/frc/robot/subsystems/spindexer/Spindexer.java
+++ b/src/main/java/frc/robot/subsystems/spindexer/Spindexer.java
@@ -31,9 +31,9 @@ public class Spindexer extends SubsystemBase implements SpindexerIO {
 
         // configure current limit
         CurrentLimitsConfigs limitConfig = new CurrentLimitsConfigs();
-        limitConfig.StatorCurrentLimit = SpindexerConstants.CURRENT_STATOR_LIMIT;
+        limitConfig.StatorCurrentLimit = SpindexerConstants.SUPPLY_CURRENT_LIMIT;
         limitConfig.StatorCurrentLimitEnable = true;
-        limitConfig.SupplyCurrentLowerLimit = SpindexerConstants.FORWARD_SUPPLY_CURRENT_LIMIT;
+        limitConfig.SupplyCurrentLowerLimit = SpindexerConstants.CURRENT_FORWARD_STATOR_LIMIT;
         limitConfig.SupplyCurrentLimitEnable = true;
         motorOne.getConfigurator().apply(limitConfig);
         motorTwo.getConfigurator().apply(limitConfig);

diff --git a/src/main/java/frc/robot/util/BrownOut/BrownOutConstants.java b/src/main/java/frc/robot/util/BrownOut/BrownOutConstants.java
index f9dc0c6b257c1d9f796ae32a79527a5b1eed9406..82364d697f20cd88e2fcebb4e4e47cfd1ebe12c6 100644 (file)
--- a/src/main/java/frc/robot/util/BrownOut/BrownOutConstants.java
+++ b/src/main/java/frc/robot/util/BrownOut/BrownOutConstants.java
@@ -32,7 +32,7 @@ public class BrownOutConstants {
     public static final BrownOutLevel BROWNOUT_LVL_ONE = new BrownOutLevel(
         ShooterConstants.SHOOTER_CURRENT_LIMIT, 
         HoodConstants.NORMAL_CURRENT_LIMIT, 
-        SpindexerConstants.currentLimit, 
+        SpindexerConstants.SUPPLY_CURRENT_LIMIT, 
         TurretConstants.NORMAL_CURRENT_LIMIT, 
         IntakeConstants.NORMAL_CURRENT_LIMIT, 
         DriveConstants.STEER_PEAK_CURRENT_LIMIT, 
@@ -43,7 +43,7 @@ public class BrownOutConstants {
     public static final BrownOutLevel BROWNOUT_LVL_TWO = new BrownOutLevel(
         ShooterConstants.SHOOTER_CURRENT_LIMIT * 1.0, // keep as same 
         HoodConstants.NORMAL_CURRENT_LIMIT * 1.0, // preserve aiming speed
-        SpindexerConstants.currentLimit * 1.0, // preserve indexing speed
+        SpindexerConstants.SUPPLY_CURRENT_LIMIT * 1.0, // preserve indexing speed
         TurretConstants.NORMAL_CURRENT_LIMIT * 1.0, // preserve aiming speed
         IntakeConstants.NORMAL_CURRENT_LIMIT * 1.0, // preserve indexing speed
         DriveConstants.STEER_PEAK_CURRENT_LIMIT * 0.8, // lower drive rotation
@@ -54,7 +54,7 @@ public class BrownOutConstants {
     public static final BrownOutLevel BROWNOUT_LVL_THREE = new BrownOutLevel(
         ShooterConstants.SHOOTER_CURRENT_LIMIT * 1.0, // keep as same 
         HoodConstants.NORMAL_CURRENT_LIMIT * 1.0, // preserve aiming speed
-        SpindexerConstants.currentLimit * 0.8, // preserve indexing speed
+        SpindexerConstants.SUPPLY_CURRENT_LIMIT * 0.8, // preserve indexing speed
         TurretConstants.NORMAL_CURRENT_LIMIT * 1.0, // preserve aiming speed
         IntakeConstants.NORMAL_CURRENT_LIMIT * 0.8, // preserve indexing speed
         DriveConstants.STEER_PEAK_CURRENT_LIMIT * 0.7, // lower drive rotation
@@ -65,7 +65,7 @@ public class BrownOutConstants {
     public static final BrownOutLevel BROWNOUT_LVL_FOUR = new BrownOutLevel(
         ShooterConstants.SHOOTER_CURRENT_LIMIT * 1.0, // keep as same 
         HoodConstants.NORMAL_CURRENT_LIMIT * 0.8, // preserve aiming speed
-        SpindexerConstants.currentLimit * 0.6, // preserve indexing speed
+        SpindexerConstants.SUPPLY_CURRENT_LIMIT * 0.6, // preserve indexing speed
         TurretConstants.NORMAL_CURRENT_LIMIT * 0.8, // preserve aiming speed
         IntakeConstants.NORMAL_CURRENT_LIMIT * 0.6, // preserve indexing speed
         DriveConstants.STEER_PEAK_CURRENT_LIMIT * 0.5, // lower drive rotation
@@ -76,7 +76,7 @@ public class BrownOutConstants {
     public static final BrownOutLevel BROWNOUT_LVL_FIVE = new BrownOutLevel(
         ShooterConstants.SHOOTER_CURRENT_LIMIT * 0.8, // keep as same 
         HoodConstants.NORMAL_CURRENT_LIMIT * 0.7, // preserve aiming speed
-        SpindexerConstants.currentLimit * 0.5, // preserve indexing speed
+        SpindexerConstants.SUPPLY_CURRENT_LIMIT * 0.5, // preserve indexing speed
         TurretConstants.NORMAL_CURRENT_LIMIT * 0.7, // preserve aiming speed
         IntakeConstants.NORMAL_CURRENT_LIMIT * 0.5, // preserve indexing speed
         DriveConstants.STEER_PEAK_CURRENT_LIMIT * 0.45, // lower drive rotation