[wpilibc] Transition C++ classes to units::second_t (#3396)

A lot of these are breaking changes. frc::Timer was replaced with the
contents of frc2::Timer. The others were in-place argument changes or
removing deprecated non-unit overloads.
This commit is contained in:
Tyler Veness
2021-05-28 22:06:59 -07:00
committed by GitHub
parent 827b17a52b
commit e09293a15e
99 changed files with 503 additions and 790 deletions

View File

@@ -249,9 +249,9 @@ class CommandScheduler final : public frc::Sendable,
* them.
*
* @param command the command to query
* @return the time since the command was scheduled, in seconds
* @return the time since the command was scheduled
*/
double TimeSinceScheduled(const Command* command) const;
units::second_t TimeSinceScheduled(const Command* command) const;
/**
* Whether the given commands are running. Note that this only works on

View File

@@ -4,6 +4,8 @@
#pragma once
#include <units/time.h>
namespace frc2 {
/**
* Class that holds scheduling state for a command. Used internally by the
@@ -18,10 +20,10 @@ class CommandState final {
bool IsInterruptible() const { return m_interruptible; }
// The time since this command was initialized.
double TimeSinceInitialized() const;
units::second_t TimeSinceInitialized() const;
private:
double m_startTime = -1;
units::second_t m_startTime = -1_s;
bool m_interruptible;
void StartTiming();

View File

@@ -7,6 +7,7 @@
#include <initializer_list>
#include <memory>
#include <frc/Timer.h>
#include <frc/controller/HolonomicDriveController.h>
#include <frc/controller/PIDController.h>
#include <frc/controller/ProfiledPIDController.h>
@@ -24,7 +25,6 @@
#include "CommandBase.h"
#include "CommandHelper.h"
#include "frc2/Timer.h"
#pragma once
@@ -444,7 +444,7 @@ class MecanumControllerCommand
m_outputVolts;
bool m_usePID;
frc2::Timer m_timer;
frc::Timer m_timer;
frc::MecanumDriveWheelSpeeds m_prevSpeeds;
units::second_t m_prevTime;
};

View File

@@ -8,6 +8,7 @@
#include <initializer_list>
#include <memory>
#include <frc/Timer.h>
#include <frc/controller/PIDController.h>
#include <frc/controller/RamseteController.h>
#include <frc/controller/SimpleMotorFeedforward.h>
@@ -18,7 +19,6 @@
#include <units/voltage.h>
#include <wpi/ArrayRef.h>
#include "frc2/Timer.h"
#include "frc2/command/CommandBase.h"
#include "frc2/command/CommandHelper.h"
@@ -185,7 +185,7 @@ class RamseteCommand : public CommandHelper<CommandBase, RamseteCommand> {
std::function<void(units::meters_per_second_t, units::meters_per_second_t)>
m_outputVel;
Timer m_timer;
frc::Timer m_timer;
units::second_t m_prevTime;
frc::DifferentialDriveWheelSpeeds m_prevSpeeds;
bool m_usePID;

View File

@@ -7,6 +7,7 @@
#include <initializer_list>
#include <memory>
#include <frc/Timer.h>
#include <frc/controller/HolonomicDriveController.h>
#include <frc/controller/PIDController.h>
#include <frc/controller/ProfiledPIDController.h>
@@ -22,7 +23,6 @@
#include "CommandBase.h"
#include "CommandHelper.h"
#include "frc2/Timer.h"
#pragma once
@@ -225,7 +225,7 @@ class SwerveControllerCommand
std::function<frc::Rotation2d()> m_desiredRotation;
frc2::Timer m_timer;
frc::Timer m_timer;
units::second_t m_prevTime;
frc::Rotation2d m_finalRotation;
};

View File

@@ -7,10 +7,10 @@
#include <functional>
#include <initializer_list>
#include <frc/Timer.h>
#include <frc/trajectory/TrapezoidProfile.h>
#include <wpi/ArrayRef.h>
#include "frc2/Timer.h"
#include "frc2/command/CommandBase.h"
#include "frc2/command/CommandHelper.h"
@@ -76,7 +76,7 @@ class TrapezoidProfileCommand
frc::TrapezoidProfile<Distance> m_profile;
std::function<void(State)> m_output;
Timer m_timer;
frc::Timer m_timer;
};
} // namespace frc2

View File

@@ -4,9 +4,9 @@
#pragma once
#include <frc/Timer.h>
#include <units/time.h>
#include "frc2/Timer.h"
#include "frc2/command/CommandBase.h"
#include "frc2/command/CommandHelper.h"
@@ -39,7 +39,7 @@ class WaitCommand : public CommandHelper<CommandBase, WaitCommand> {
bool RunsWhenDisabled() const override;
protected:
Timer m_timer;
frc::Timer m_timer;
private:
units::second_t m_duration;