From dbc33b61e141e2e24821402aa2a5e26cba15e4a3 Mon Sep 17 00:00:00 2001
From: Oblarg <emichaelbarnett@gmail.com>
Date: Sat, 26 Oct 2019 15:50:30 -0400
Subject: [PATCH] Fix Timer usage in TrapezoidProfileCommand (#1992)

---
 .../main/native/cpp/frc2/command/TrapezoidProfileCommand.cpp  | 2 +-
 .../native/include/frc2/command/TrapezoidProfileCommand.h     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wpilibc/src/main/native/cpp/frc2/command/TrapezoidProfileCommand.cpp b/wpilibc/src/main/native/cpp/frc2/command/TrapezoidProfileCommand.cpp
index 7dccd2716b..bb17edc24e 100644
--- a/wpilibc/src/main/native/cpp/frc2/command/TrapezoidProfileCommand.cpp
+++ b/wpilibc/src/main/native/cpp/frc2/command/TrapezoidProfileCommand.cpp
@@ -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(); }
diff --git a/wpilibc/src/main/native/include/frc2/command/TrapezoidProfileCommand.h b/wpilibc/src/main/native/include/frc2/command/TrapezoidProfileCommand.h
index d2074813b1..6864f53f26 100644
--- a/wpilibc/src/main/native/include/frc2/command/TrapezoidProfileCommand.h
+++ b/wpilibc/src/main/native/include/frc2/command/TrapezoidProfileCommand.h
@@ -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