diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RamseteCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RamseteCommand.java index 148606002d..2bba7ea787 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RamseteCommand.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/RamseteCommand.java @@ -200,6 +200,10 @@ public class RamseteCommand extends CommandBase { @Override public void end(boolean interrupted) { m_timer.stop(); + + if (interrupted) { + m_output.accept(0.0, 0.0); + } } @Override diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/RamseteCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/RamseteCommand.cpp index 4c6cf73e6c..c974e19f83 100644 --- a/wpilibNewCommands/src/main/native/cpp/frc2/command/RamseteCommand.cpp +++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/RamseteCommand.cpp @@ -146,6 +146,14 @@ void RamseteCommand::Execute() { void RamseteCommand::End(bool interrupted) { m_timer.Stop(); + + if (interrupted) { + if (m_usePID) { + m_outputVolts(0_V, 0_V); + } else { + m_outputVel(0_mps, 0_mps); + } + } } bool RamseteCommand::IsFinished() {