From 6cc7e52de74abce2b01de4f94cb58a3047a81f5c Mon Sep 17 00:00:00 2001 From: Ryan Blue Date: Thu, 1 Feb 2024 23:24:43 -0500 Subject: [PATCH] [commands] TrapezoidProfileSubsystem: Fix incorrect ordering of parameters (#6338) --- .../wpi/first/wpilibj2/command/TrapezoidProfileSubsystem.java | 2 +- .../native/include/frc2/command/TrapezoidProfileSubsystem.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileSubsystem.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileSubsystem.java index 54d4edef5c..44abdfc4db 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileSubsystem.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/TrapezoidProfileSubsystem.java @@ -63,7 +63,7 @@ public abstract class TrapezoidProfileSubsystem extends SubsystemBase { @Override public void periodic() { - m_state = m_profile.calculate(m_period, m_goal, m_state); + m_state = m_profile.calculate(m_period, m_state, m_goal); if (m_enabled) { useState(m_state); } diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/TrapezoidProfileSubsystem.h b/wpilibNewCommands/src/main/native/include/frc2/command/TrapezoidProfileSubsystem.h index 344aefc77e..5668010312 100644 --- a/wpilibNewCommands/src/main/native/include/frc2/command/TrapezoidProfileSubsystem.h +++ b/wpilibNewCommands/src/main/native/include/frc2/command/TrapezoidProfileSubsystem.h @@ -45,7 +45,7 @@ class TrapezoidProfileSubsystem : public SubsystemBase { m_period(period) {} void Periodic() override { - m_state = m_profile.Calculate(m_period, m_goal, m_state); + m_state = m_profile.Calculate(m_period, m_state, m_goal); if (m_enabled) { UseState(m_state); }