Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-25 01:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Timer usage in TrapezoidProfileCommand (#1992)

Browse Source
This commit is contained in:
Oblarg
2019-10-26 15:50:30 -04:00
committed by Peter Johnson
parent 79f8c5644a
commit dbc33b61e1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibc/src/main/native/cpp/frc2/command/TrapezoidProfileCommand.cpp
View File

@@ -25,7 +25,7 @@ void TrapezoidProfileCommand::Initialize() {
}
void TrapezoidProfileCommand::Execute() {
m_output(m_profile.Calculate(units::second_t(m_timer.Get())));
m_output(m_profile.Calculate(m_timer.Get()));
}
void TrapezoidProfileCommand::End(bool interrupted) { m_timer.Stop(); }

4
wpilibc/src/main/native/include/frc2/command/TrapezoidProfileCommand.h
View File

@@ -5,8 +5,8 @@
/* the project. */
/*----------------------------------------------------------------------------*/
#include <frc/Timer.h>
#include <frc/trajectory/TrapezoidProfile.h>
#include <frc2/Timer.h>
#include <functional>
@@ -49,7 +49,7 @@ class TrapezoidProfileCommand
frc::TrapezoidProfile m_profile;
std::function<void(frc::TrapezoidProfile::State)> m_output;
frc::Timer m_timer;
Timer m_timer;
};
} // namespace frc2