Skip to content

Commit 2ba96a6

Browse files
current limit stuff
1 parent dbfb048 commit 2ba96a6

3 files changed

Lines changed: 22 additions & 8 deletions

File tree

src/main/java/frc/robot/BuildConstants.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
/** Automatically generated file containing build version information. */
44
public final class BuildConstants {
55
public static final String MAVEN_GROUP = "";
6-
public static final String MAVEN_NAME = "2024RobotCode";
6+
public static final String MAVEN_NAME = "2024 Robot Code";
77
public static final String VERSION = "unspecified";
8-
public static final int GIT_REVISION = 313;
9-
public static final String GIT_SHA = "974424bf6ad82162eaa1ac360b41f2aa0d05c04d";
10-
public static final String GIT_DATE = "2024-07-27 20:08:15 EDT";
11-
public static final String GIT_BRANCH = "rainbow-rumble";
12-
public static final String BUILD_DATE = "2024-07-28 13:00:32 EDT";
13-
public static final long BUILD_UNIX_TIME = 1722186032402L;
8+
public static final int GIT_REVISION = 314;
9+
public static final String GIT_SHA = "dbfb048d3f7aa479526221e9947ca94220ee5472";
10+
public static final String GIT_DATE = "2024-07-28 19:57:18 EDT";
11+
public static final String GIT_BRANCH = "main";
12+
public static final String BUILD_DATE = "2024-08-12 20:03:21 EDT";
13+
public static final long BUILD_UNIX_TIME = 1723507401200L;
1414
public static final int DIRTY = 1;
1515

1616
private BuildConstants() {}

src/main/java/frc/robot/Constants.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,15 @@ public static class ModuleConstants {
6565
public static final double DRIVE_GEAR_RATIO = 6.12;
6666
public static final double TURN_GEAR_RATIO = 150.0 / 7.0;
6767

68-
public static final double DRIVE_STATOR_CURRENT_LIMIT = 40.0;
68+
public static final double DRIVE_STATOR_CURRENT_LIMIT = 90.0;
6969
public static final boolean DRIVE_STATOR_CURRENT_LIMIT_ENABLED = true;
70+
public static final double DRIVE_SUPPLY_CURRENT_LIMIT = 42.0;
71+
public static final boolean DRIVE_SUPPLY_CURRENT_LIMIT_ENABLED = true;
72+
7073
public static final double TURN_STATOR_CURRENT_LIMIT = 30.0;
7174
public static final boolean TURN_STATOR_CURRENT_LIMIT_ENABLED = true;
75+
public static final double TURN_SUPPLY_CURRENT_LIMIT = 30.0;
76+
public static final boolean TURN_SUPPLY_CURRENT_LIMIT_ENABLED = true;
7277
}
7378

7479
public static class IntakeConstants {

src/main/java/frc/robot/subsystems/drive/ModuleIOTalonFX.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,11 @@ public ModuleIOTalonFX(int index) {
9898
Constants.ModuleConstants.DRIVE_STATOR_CURRENT_LIMIT;
9999
driveConfig.CurrentLimits.StatorCurrentLimitEnable =
100100
Constants.ModuleConstants.DRIVE_STATOR_CURRENT_LIMIT_ENABLED;
101+
driveConfig.CurrentLimits.SupplyCurrentLimit =
102+
Constants.ModuleConstants.DRIVE_SUPPLY_CURRENT_LIMIT;
103+
driveConfig.CurrentLimits.SupplyCurrentLimitEnable =
104+
Constants.ModuleConstants.DRIVE_SUPPLY_CURRENT_LIMIT_ENABLED;
105+
101106
driveTalon.getConfigurator().apply(driveConfig);
102107
setDriveBrakeMode(true);
103108
// setDriveOpenLoopRamp(Constants.SwerveConstants.OPEN_LOOP_RAMP_SEC);
@@ -107,6 +112,10 @@ public ModuleIOTalonFX(int index) {
107112
Constants.ModuleConstants.TURN_STATOR_CURRENT_LIMIT;
108113
turnConfig.CurrentLimits.StatorCurrentLimitEnable =
109114
Constants.ModuleConstants.TURN_STATOR_CURRENT_LIMIT_ENABLED;
115+
turnConfig.CurrentLimits.SupplyCurrentLimit =
116+
Constants.ModuleConstants.TURN_SUPPLY_CURRENT_LIMIT;
117+
turnConfig.CurrentLimits.SupplyCurrentLimitEnable =
118+
Constants.ModuleConstants.TURN_SUPPLY_CURRENT_LIMIT_ENABLED;
110119
turnTalon.getConfigurator().apply(turnConfig);
111120
setTurnBrakeMode(true);
112121

0 commit comments

Comments
 (0)