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

Change C++ WaitCommand to use units (#1865)

Browse Source 
Also remove unique_ptr usage.
This commit is contained in:
Peter Johnson
2019-09-02 23:39:51 -07:00
committed by GitHub
parent 1fb3011235
commit 761bc3ef85
10 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wpilibc/src/main/native/include/frc2/command/WaitCommand.h
View File

@@ -7,8 +7,7 @@
#pragma once
#include <memory>
#include <units/units.h>
#include <wpi/Twine.h>
#include "CommandBase.h"
@@ -27,9 +26,9 @@ class WaitCommand : public CommandHelper<CommandBase, WaitCommand> {
* Creates a new WaitCommand. This command will do nothing, and end after the
* specified duration.
*
* @param seconds the time to wait, in seconds
* @param duration the time to wait
*/
explicit WaitCommand(double seconds);
explicit WaitCommand(units::second_t duration);
WaitCommand(WaitCommand&& other) = default;
@@ -44,9 +43,9 @@ class WaitCommand : public CommandHelper<CommandBase, WaitCommand> {
bool RunsWhenDisabled() const override;
protected:
std::unique_ptr<frc::Timer> m_timer;
frc::Timer m_timer;
private:
double m_duration;
units::second_t m_duration;
};
} // namespace frc2