Skip to content

Commit a9a7f94

Browse files
committed
removed MOTION_PROFILING
1 parent 2128fe0 commit a9a7f94

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

src/main/java/com/spikes2212/command/drivetrains/smartmotorcontrollerdrivetrain/TalonFXTankDrivetrain.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ public void pidSet(UnifiedControlMode controlMode, double leftSetpoint, double r
165165
case CURRENT -> new TorqueCurrentFOC(leftSetpoint);
166166
case PERCENT_OUTPUT -> new DutyCycleOut(leftSetpoint);
167167
case TRAPEZOID_PROFILE -> new MotionMagicDutyCycle(leftSetpoint);
168-
case MOTION_PROFILING -> throw new UnsupportedOperationException("Motion Profiling is not yet implemented in SpikesLib2!");
169168
case VOLTAGE -> new VoltageOut(leftSetpoint);
170169
case VELOCITY -> new VelocityDutyCycle(leftSetpoint);
171170
case POSITION -> new PositionDutyCycle(leftSetpoint);
@@ -174,7 +173,6 @@ public void pidSet(UnifiedControlMode controlMode, double leftSetpoint, double r
174173
case CURRENT -> new TorqueCurrentFOC(rightSetpoint);
175174
case PERCENT_OUTPUT -> new DutyCycleOut(rightSetpoint);
176175
case TRAPEZOID_PROFILE -> new MotionMagicDutyCycle(rightSetpoint);
177-
case MOTION_PROFILING -> throw new UnsupportedOperationException("Motion Profiling is not yet implemented in SpikesLib2!");
178176
case VOLTAGE -> new VoltageOut(rightSetpoint);
179177
case VELOCITY -> new VelocityDutyCycle(rightSetpoint);
180178
case POSITION -> new PositionDutyCycle(rightSetpoint);
@@ -206,7 +204,7 @@ public void finish() {
206204
public boolean leftOnTarget(UnifiedControlMode controlMode, double tolerance, double setpoint) {
207205
double value = switch (controlMode) {
208206
case VELOCITY -> leftMaster.getVelocity().getValueAsDouble();
209-
case POSITION, MOTION_PROFILING, TRAPEZOID_PROFILE -> leftMaster.getPosition().getValueAsDouble();
207+
case POSITION, TRAPEZOID_PROFILE -> leftMaster.getPosition().getValueAsDouble();
210208
case CURRENT -> leftMaster.getTorqueCurrent().getValueAsDouble();
211209
case PERCENT_OUTPUT -> leftMaster.get();
212210
case VOLTAGE -> leftMaster.getMotorVoltage().getValueAsDouble();
@@ -226,7 +224,7 @@ public boolean leftOnTarget(UnifiedControlMode controlMode, double tolerance, do
226224
public boolean rightOnTarget(UnifiedControlMode controlMode, double tolerance, double setpoint) {
227225
double value = switch (controlMode) {
228226
case VELOCITY -> rightMaster.getVelocity().getValueAsDouble();
229-
case POSITION, MOTION_PROFILING, TRAPEZOID_PROFILE -> rightMaster.getPosition().getValueAsDouble();
227+
case POSITION, TRAPEZOID_PROFILE -> rightMaster.getPosition().getValueAsDouble();
230228
case CURRENT -> rightMaster.getTorqueCurrent().getValueAsDouble();
231229
case PERCENT_OUTPUT -> rightMaster.get();
232230
case VOLTAGE -> rightMaster.getMotorVoltage().getValueAsDouble();

src/main/java/com/spikes2212/util/UnifiedControlMode.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public enum UnifiedControlMode {
1818
CURRENT(ControlModeValue.TorqueCurrentFOC, SparkBase.ControlType.kCurrent),
1919
PERCENT_OUTPUT(ControlModeValue.DutyCycleOut, SparkBase.ControlType.kDutyCycle),
2020
TRAPEZOID_PROFILE(ControlModeValue.MotionMagicDutyCycle, SparkBase.ControlType.kMAXMotionPositionControl),
21-
MOTION_PROFILING(null, null),
2221
VOLTAGE(ControlModeValue.VoltageOut, SparkBase.ControlType.kVoltage);
2322

2423
private final ControlModeValue talonFXControlMode;

src/main/java/com/spikes2212/util/smartmotorcontrollers/TalonFXWrapper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ public void pidSet(UnifiedControlMode controlMode, double setpoint, PIDSettings
110110
case CURRENT -> new TorqueCurrentFOC(setpoint);
111111
case PERCENT_OUTPUT -> new DutyCycleOut(setpoint);
112112
case TRAPEZOID_PROFILE -> new MotionMagicDutyCycle(setpoint);
113-
case MOTION_PROFILING -> throw new UnsupportedOperationException("Motion Profiling is not yet implemented in SpikesLib2!");
114113
case VOLTAGE -> new VoltageOut(setpoint);
115114
case VELOCITY -> new VelocityDutyCycle(setpoint);
116115
case POSITION -> new PositionDutyCycle(setpoint);
@@ -214,7 +213,7 @@ public double getVoltage() {
214213
public boolean onTarget(UnifiedControlMode controlMode, double tolerance, double setpoint) {
215214
double value = switch (controlMode) {
216215
case VELOCITY -> getVelocity();
217-
case POSITION, MOTION_PROFILING, TRAPEZOID_PROFILE -> getPosition();
216+
case POSITION, TRAPEZOID_PROFILE -> getPosition();
218217
case CURRENT -> getCurrent();
219218
case PERCENT_OUTPUT -> talonFX.get();
220219
case VOLTAGE -> getVoltage();

0 commit comments

Comments
 (0)