Skip to content

Commit de23ffd

Browse files
committed
Squashed commit of the following:
commit f82a33d Author: Talon540-root <122660543+Talon540-root@users.noreply.github.com> Date: Mon Mar 10 15:46:43 2025 -0400 Moved hardware IDs to respective subsystem constants files commit 9a6732f Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sun Mar 9 13:26:05 2025 -0400 Fix drive PID Coefficients and Deep Run Changes commit 8773d7d Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sat Mar 8 23:35:34 2025 -0500 Semi-final PID Coefficients commit d390ead Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Mar 5 01:01:36 2025 -0500 Reimplement I term into SparkMax PID Controllers Revert "Reimplement I term into SparkMax PID Controllers" This reverts commit 553d51a. proto drive I term and IZone commit 72df17d Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Mar 5 00:49:10 2025 -0500 Update tunable number API to avoid redundant resets and call correct static overrides commit 8072903 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Tue Mar 4 23:39:29 2025 -0500 update vendor deps commit f47b2de Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Tue Mar 4 23:27:50 2025 -0500 stuff for ayush to fix commit 813d3df Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Tue Mar 4 14:04:32 2025 -0500 add algae mode commit 2391b50 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Mon Mar 3 09:49:19 2025 -0500 Add robot relative override commit db57af5 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sat Mar 1 19:01:14 2025 -0500 add wait period to checking intake when enabling immediately after elevator (fix this later to be better) commit c8e1dbb Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sat Mar 1 19:00:45 2025 -0500 make eject configurable based on level commit 26c56be Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sat Mar 1 19:00:19 2025 -0500 add taxi auto commit 60ebba7 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sat Mar 1 19:00:08 2025 -0500 remove intake timeout commit 773704f Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Fri Feb 28 12:44:29 2025 -0500 add reserialize command commit fd13f3f Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Fri Feb 28 12:44:13 2025 -0500 update dispenser eject to be faster also goes back to stow automatically commit 5b7bf78 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Fri Feb 28 12:42:38 2025 -0500 Rename holdingCoral to better match lombok commit 3d7c324 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Fri Feb 28 12:41:47 2025 -0500 stop elevator from honing on gyro reset commit f17c272 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Fri Feb 28 12:41:19 2025 -0500 Make intake toggleable commit de0014c Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Fri Feb 28 12:40:28 2025 -0500 Make slow mode toggleable and cleanup changes from Thursday commit e9c1694 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Fri Feb 28 10:51:20 2025 -0500 idk if this matters commit 24e9f2b Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Fri Feb 28 10:50:57 2025 -0500 Auto hone elevator on start commit eda4d4b Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Fri Feb 28 10:50:05 2025 -0500 Fix characterization DT bug commit a6ac1fe Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Fri Feb 28 10:49:23 2025 -0500 fix merge commit 32aca1e Author: Talon540-root <122660543+Talon540-root@users.noreply.github.com> Date: Thu Feb 27 01:05:11 2025 -0500 tuning stuff commit 1b9467e Merge: 07083ba 2e7b277 Author: Talon540-root <122660543+Talon540-root@users.noreply.github.com> Date: Wed Feb 26 18:55:24 2025 -0500 Merge branch 'sriman-dev' of https://github.com/Talon540Programming/Reefscape2025 into sriman-dev commit 2e7b277 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 26 18:48:56 2025 -0500 Create ElevatorVisualizer.java commit b32b9fc Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 26 18:48:48 2025 -0500 Update RobotContainer.java commit 6cfc8e3 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 26 14:57:45 2025 -0500 Update LoggedTunableNumber.java commit e7fadb7 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 26 11:20:15 2025 -0500 schedule home command if not homed on teleop init commit 1d3b191 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 26 10:24:53 2025 -0500 add proto auto intake commit d1f8beb Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 26 10:24:33 2025 -0500 add sprint commit d267a5f Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 26 01:54:57 2025 -0500 add elevator and end effector subsystems commit 07083ba Author: Talon540-root <122660543+Talon540-root@users.noreply.github.com> Date: Wed Feb 26 01:36:12 2025 -0500 fixes commit ee57f87 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Tue Feb 25 22:03:17 2025 -0500 WIP commit 9f9de79 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Tue Feb 25 03:29:28 2025 -0500 Update IO commit ba09067 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Mon Feb 24 14:36:57 2025 -0500 Implement ElevatorIO commit 19e3976 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Mon Feb 24 14:36:49 2025 -0500 Implement DispenserIO commit bd348ee Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Mon Feb 24 14:36:40 2025 -0500 Make sim models non static avoids building creating these objects when running as non-sim commit 1baa58d Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Mon Feb 24 11:09:27 2025 -0500 Add updatable debouncer commit ba6e299 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Mon Feb 24 05:03:14 2025 -0500 Update EqualsUtil.java commit fb12507 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sun Feb 23 13:58:29 2025 -0500 Update FieldConstants.java commit 96f6eae Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sat Feb 22 10:40:15 2025 -0500 dont make conversion factors variables commit 4343534 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sat Feb 22 10:39:38 2025 -0500 explicitly set motor temp signals commit e8fbd80 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sat Feb 22 01:28:04 2025 -0500 Update Intake commit 6adf211 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sat Feb 22 01:05:32 2025 -0500 Fix DT bug commit ca2f600 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sat Feb 22 00:53:08 2025 -0500 Update robot constants to match bot commit 68e75f9 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 19 23:34:57 2025 -0500 Add intake subsystem commit de577e5 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 19 21:47:57 2025 -0500 fix akit version mismatch commit 2a1068c Merge: 420fa3d 3be2661 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sun Feb 16 15:45:12 2025 -0500 Merge branch 'main' into sriman-dev commit 3be2661 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sun Feb 16 15:43:57 2025 -0500 Update stuff (#7) * Implement Full Logging and Drivetrain Subsystem (#1) * Da Code * Add alerts on drive spark maxes * Add Config Changes from Meeting * Other lil bs * Add automatic brake disable on robot disable * add odometry * add SIM module * Add DriveCommands * Update RobotContainer.java * Formatting fixes * Misc Fixes * Add low voltage warning for DT * Add velocity scalars for DT * Update PID Coefficents and fix odometry issues * Update URCL.json --------- Fix CI Co-Authored-By: Talon540-root <122660543+Talon540-root@users.noreply.github.com> * Increase voltage warning on battery and add CAN error alert * clean * Fix Modules Falsely Reporting as Disconnected * Cleanup typing, make errors more obvious * Cleanup dashboard setting stuff * Update sim characterization constants to be more accurate, stops a massive overshooting for some reason * Log drive motor temps * Formatting fixes * Inline tuning mode alert * Rename RobotState to PoseEstimator Because only vision and drive will interact with pose (and purely position) and no other robot state is tracked, it makes more sense for this to be renammed to reflect that. * Refactor abstract alerts into util class to later roll into LEDs * Update Phoenix6 to 2025.2.2 * Refactor code structure to not over-expose subsystem specific stuff * Shorten name for drive temp * Fix red alliance drive commands bug * Update WPILIB to 2025.3.1 --------- Co-authored-by: Talon540-root <122660543+Talon540-root@users.noreply.github.com> commit 420fa3d Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sun Feb 16 15:38:07 2025 -0500 Update WPILIB to 2025.3.1 commit 5b6968a Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Thu Feb 13 01:44:37 2025 -0500 Fix red alliance drive commands bug commit 2952998 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sat Feb 15 01:43:00 2025 -0500 Shorten name for drive temp commit b2626e8 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Thu Feb 13 00:06:04 2025 -0500 Refactor code structure to not over-expose subsystem specific stuff commit 2af259b Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 12 23:47:30 2025 -0500 Update Phoenix6 to 2025.2.2 commit 2ae942f Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 12 23:44:07 2025 -0500 Refactor abstract alerts into util class to later roll into LEDs commit 876046f Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 12 23:42:36 2025 -0500 Rename RobotState to PoseEstimator Because only vision and drive will interact with pose (and purely position) and no other robot state is tracked, it makes more sense for this to be renammed to reflect that. commit e5c4843 Merge: f7606cf 9325f68 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 12 22:08:31 2025 -0500 Merge branch 'main' into sriman-dev commit 9325f68 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 12 22:07:52 2025 -0500 Misc drive fixes (#6) * Implement Full Logging and Drivetrain Subsystem (#1) * Da Code * Add alerts on drive spark maxes * Add Config Changes from Meeting * Other lil bs * Add automatic brake disable on robot disable * add odometry * add SIM module * Add DriveCommands * Update RobotContainer.java * Formatting fixes * Misc Fixes * Add low voltage warning for DT * Add velocity scalars for DT * Update PID Coefficents and fix odometry issues * Update URCL.json --------- Fix CI Co-Authored-By: Talon540-root <122660543+Talon540-root@users.noreply.github.com> * Increase voltage warning on battery and add CAN error alert * clean * Fix Modules Falsely Reporting as Disconnected * Cleanup typing, make errors more obvious * Cleanup dashboard setting stuff * Update sim characterization constants to be more accurate, stops a massive overshooting for some reason * Log drive motor temps * Formatting fixes * Inline tuning mode alert --------- Co-authored-by: Talon540-root <122660543+Talon540-root@users.noreply.github.com> commit f7606cf Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 12 22:07:08 2025 -0500 Inline tuning mode alert commit addcdce Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 12 22:04:53 2025 -0500 Formatting fixes commit 1b089c2 Merge: 37cd26f 93e655d Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 12 22:03:18 2025 -0500 Merge branch 'main' into sriman-dev commit 37cd26f Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 12 21:55:27 2025 -0500 Log drive motor temps commit 15e8caf Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 12 21:43:07 2025 -0500 Update sim characterization constants to be more accurate, stops a massive overshooting for some reason commit 803498a Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 12 21:42:46 2025 -0500 Cleanup dashboard setting stuff commit 1cc2430 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 12 21:42:25 2025 -0500 Cleanup typing, make errors more obvious commit 98c0715 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 5 13:21:38 2025 -0500 Fix Modules Falsely Reporting as Disconnected commit 93e655d Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sat Jan 18 04:02:47 2025 -0500 Implement Full Logging and Drivetrain Subsystem (#1) * Da Code * Add alerts on drive spark maxes * Add Config Changes from Meeting * Other lil bs * Add automatic brake disable on robot disable * add odometry * add SIM module * Add DriveCommands * Update RobotContainer.java * Formatting fixes * Misc Fixes * Add low voltage warning for DT * Add velocity scalars for DT * Update PID Coefficents and fix odometry issues * Update URCL.json --------- Fix CI commit f9babf3 Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Sat Feb 1 09:57:53 2025 -0500 clean commit 16c4eba Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Jan 29 12:44:39 2025 -0500 Increase voltage warning on battery and add CAN error alert commit 9485d1d Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Mon Feb 24 14:36:49 2025 -0500 Implement Elevator Subsystem Implement ElevatorIO Update IO WIP fixes add elevator and end effector subsystems commit 0aa671a Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Feb 19 23:34:57 2025 -0500 Implement Intake Subsystem, fix SIM initialization Update Intake explicitly set motor temp signals dont make conversion factors variables Update FieldConstants.java Add updatable debouncer Make sim models non static avoids building creating these objects when running as non-sim commit b616b8f Author: Sriman Achanta <68172138+srimanachanta@users.noreply.github.com> Date: Wed Jan 29 12:44:39 2025 -0500 Alerts usage update, dependency bump, and misc drive fixes clean Fix Modules Falsely Reporting as Disconnected Cleanup typing, make errors more obvious Cleanup dashboard setting stuff Update sim characterization constants to be more accurate, stops a massive overshooting for some reason Log drive motor temps Inline tuning mode alert Rename RobotState to PoseEstimator Because only vision and drive will interact with pose (and purely position) and no other robot state is tracked, it makes more sense for this to be renammed to reflect that. Refactor abstract alerts into util class to later roll into LEDs Update Phoenix6 to 2025.2.2 Refactor code structure to not over-expose subsystem specific stuff Shorten name for drive temp Fix red alliance drive commands bug Update WPILIB to 2025.3.1 fix akit version mismatch Fix DT bug Update EqualsUtil.java Update robot constants to match bot
1 parent 2609d97 commit de23ffd

12 files changed

Lines changed: 30 additions & 27 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import edu.wpi.first.wpilibj.RobotBase;
55

66
public class Constants {
7-
private static RobotType robotType = RobotType.SIMBOT;
7+
private static RobotType robotType = RobotType.COMPBOT;
88
// Allows tunable values to be changed when enabled. Also adds tunable selectors to AutoSelector
99
public static final boolean TUNING_MODE = true;
1010
// Disable the AdvantageKit logger from running

src/main/java/frc/robot/subsystems/dispenser/DispenserConstants.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ class DispenserConstants {
44
public static final boolean inverted = true;
55
public static final double moi = 0.025; // TODO
66
public static final double gearing = 34.0 / 24.0;
7+
public static final int id = 14;
78
}

src/main/java/frc/robot/subsystems/dispenser/DispenserIOSpark.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class DispenserIOSpark implements DispenserIO {
2121
private final DigitalInput rearBeamBreak = new DigitalInput(0);
2222

2323
public DispenserIOSpark() {
24-
spark = new SparkMax(14, MotorType.kBrushless);
24+
spark = new SparkMax(id, MotorType.kBrushless);
2525
encoder = spark.getEncoder();
2626

2727
var config = new SparkMaxConfig();

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

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ class Module {
2121
new LoggedTunableNumber("Drive/Module/DrivekI");
2222
private static final LoggedTunableNumber drivekD =
2323
new LoggedTunableNumber("Drive/Module/DrivekD");
24+
private static final LoggedTunableNumber driveIZone =
25+
new LoggedTunableNumber("Drive/Module/DrivekIZone");
2426
private static final LoggedTunableNumber turnkP = new LoggedTunableNumber("Drive/Module/TurnkP");
2527
private static final LoggedTunableNumber turnkI = new LoggedTunableNumber("Drive/Module/TurnkI");
2628
private static final LoggedTunableNumber turnkD = new LoggedTunableNumber("Drive/Module/TurnkD");
@@ -30,19 +32,20 @@ class Module {
3032
case COMPBOT -> {
3133
drivekS.initDefault(0.69641);
3234
drivekV.initDefault(0.12647);
33-
drivekP.initDefault(0.0);
34-
drivekI.initDefault(0.0);
35-
drivekD.initDefault(0.0);
36-
turnkP.initDefault(1.5);
37-
turnkI.initDefault(0.0);
38-
turnkD.initDefault(0.0);
35+
drivekP.initDefault(0.0075);
36+
drivekI.initDefault(0.0000005);
37+
drivekD.initDefault(0.001);
38+
driveIZone.initDefault(0.01);
39+
turnkP.initDefault(0.65);
40+
turnkD.initDefault(0.1);
3941
}
4042
default -> {
4143
drivekS.initDefault(0.113190);
4244
drivekV.initDefault(0.841640);
4345
drivekP.initDefault(0.1);
4446
drivekI.initDefault(0.0);
4547
drivekD.initDefault(0.0);
48+
driveIZone.initDefault(0.0);
4649
turnkP.initDefault(10.0);
4750
turnkI.initDefault(0.0);
4851
turnkD.initDefault(0.0);
@@ -80,18 +83,14 @@ public void periodic() {
8083
hashCode(), () -> m_io.setDriveFF(drivekS.get(), drivekV.get()), true, drivekS, drivekV);
8184
LoggedTunableNumber.ifChanged(
8285
hashCode(),
83-
() -> m_io.setDrivePID(drivekP.get(), drivekI.get(), drivekD.get()),
86+
() -> m_io.setDrivePID(drivekP.get(), drivekI.get(), drivekD.get(), driveIZone.get()),
8487
true,
8588
drivekP,
8689
drivekI,
87-
drivekD);
90+
drivekD,
91+
driveIZone);
8892
LoggedTunableNumber.ifChanged(
89-
hashCode(),
90-
() -> m_io.setTurnPID(turnkP.get(), turnkI.get(), turnkD.get()),
91-
true,
92-
turnkP,
93-
turnkI,
94-
turnkD);
93+
hashCode(), () -> m_io.setTurnPID(turnkP.get(), 0, turnkD.get()), true, turnkP, turnkD);
9594

9695
// Update Odometry Positions
9796
int sampleCount = m_inputs.odometryDrivePositionsRad.length;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public default void runDriveVelocity(double velocityRadPerSec) {}
4141
public default void runTurnPosition(Rotation2d rotation) {}
4242

4343
/** Set P, I, and D gains for closed loop control on drive motor. */
44-
public default void setDrivePID(double kP, double kI, double kD) {}
44+
public default void setDrivePID(double kP, double kI, double kD, double IZone) {}
4545

4646
/** Set kS, kV gains for closed loop control on drive motor. */
4747
public default void setDriveFF(double kS, double kV) {}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,9 @@ public void runTurnPosition(Rotation2d rotation) {
119119
}
120120

121121
@Override
122-
public void setDrivePID(double kP, double kI, double kD) {
122+
public void setDrivePID(double kP, double kI, double kD, double IZone) {
123123
driveController.setPID(kP, kI, kD);
124+
driveController.setI(IZone);
124125
}
125126

126127
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ public void runTurnPosition(Rotation2d rotation) {
195195
}
196196

197197
@Override
198-
public void setDrivePID(double kP, double kI, double kD) {
198+
public void setDrivePID(double kP, double kI, double kD, double IZone) {
199199
var drivePIDConfig = new SparkMaxConfig();
200-
drivePIDConfig.closedLoop.pid(kP, kI, kD);
200+
drivePIDConfig.closedLoop.pid(kP, kI, kD).iZone(IZone);
201201

202202
driveSpark.configure(
203203
drivePIDConfig, ResetMode.kNoResetSafeParameters, PersistMode.kNoPersistParameters);

src/main/java/frc/robot/subsystems/elevator/ElevatorBase.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
public class ElevatorBase extends SubsystemBase {
2626
// Tunable numbers
2727
private static final LoggedTunableNumber kP = new LoggedTunableNumber("Elevator/kP");
28-
private static final LoggedTunableNumber kI = new LoggedTunableNumber("Elevator/kI");
2928
private static final LoggedTunableNumber kD = new LoggedTunableNumber("Elevator/kD");
3029
private static final LoggedTunableNumber kS = new LoggedTunableNumber("Elevator/kS");
3130
private static final LoggedTunableNumber kG = new LoggedTunableNumber("Elevator/kG");
@@ -50,15 +49,13 @@ public class ElevatorBase extends SubsystemBase {
5049
switch (Constants.getRobot()) {
5150
case COMPBOT -> {
5251
kP.initDefault(0.3);
53-
kI.initDefault(0.0);
5452
kD.initDefault(0.25);
5553
kS.initDefault(0);
5654
kG.initDefault(1.05);
5755
kA.initDefault(0.0);
5856
}
5957
case SIMBOT -> {
6058
kP.initDefault(0); // TODO
61-
kI.initDefault(0.0); // TODO
6259
kD.initDefault(0); // TODO
6360
kS.initDefault(0); // TODO
6461
kG.initDefault(0); // TODO
@@ -139,7 +136,7 @@ public void periodic() {
139136
followerDisconnectedAlert.set(!inputs.followerConnected);
140137

141138
// Update tunable numbers
142-
LoggedTunableNumber.ifChanged(() -> io.setPID(kP.get(), kI.get(), kD.get()), true, kP, kI, kD);
139+
LoggedTunableNumber.ifChanged(() -> io.setPID(kP.get(), 0.0, kD.get()), true, kP, kD);
143140
LoggedTunableNumber.ifChanged(
144141
() -> {
145142
feedforward.setKs(kS.get());

src/main/java/frc/robot/subsystems/elevator/ElevatorConstants.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ public class ElevatorConstants {
2020

2121
public static final double carriageMassKg = Units.lbsToKilograms(6.0);
2222
public static final double stagesMassKg = Units.lbsToKilograms(12.0);
23+
24+
public static final int leaderId = 12;
25+
public static final int followerId = 13;
2326
}

src/main/java/frc/robot/subsystems/elevator/ElevatorIOSpark.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public class ElevatorIOSpark implements ElevatorIO {
2222
private final Debouncer followerConnectedDebouncer = new Debouncer(0.5);
2323

2424
public ElevatorIOSpark() {
25-
leaderSpark = new SparkMax(12, MotorType.kBrushless);
26-
followerSpark = new SparkMax(13, MotorType.kBrushless);
25+
leaderSpark = new SparkMax(leaderId, MotorType.kBrushless);
26+
followerSpark = new SparkMax(followerId, MotorType.kBrushless);
2727

2828
encoder = leaderSpark.getEncoder();
2929
controller = leaderSpark.getClosedLoopController();

0 commit comments

Comments
 (0)