Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-04 03:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

41
wpilibc/src/main/native/include/frc/Watchdog.h
View File

@@ -9,7 +9,6 @@
#include <units/time.h>
#include <wpi/StringRef.h>
#include <wpi/deprecated.h>
#include "frc/Tracer.h"
@@ -26,19 +25,6 @@ namespace frc {
*/
class Watchdog {
public:
/**
* Watchdog constructor.
*
* @deprecated use unit-safe version instead.
* Watchdog(units::second_t timeout, std::function<void()> callback)
*
* @param timeout The watchdog's timeout in seconds with microsecond
* resolution.
* @param callback This function is called when the timeout expires.
*/
WPI_DEPRECATED("Use unit-safe version instead")
Watchdog(double timeout, std::function<void()> callback);
/**
* Watchdog constructor.
*
@@ -48,11 +34,6 @@ class Watchdog {
*/
Watchdog(units::second_t timeout, std::function<void()> callback);
template <typename Callable, typename Arg, typename... Args>
WPI_DEPRECATED("Use unit-safe version instead")
Watchdog(double timeout, Callable&& f, Arg&& arg, Args&&... args)
: Watchdog(units::second_t{timeout}, arg, args...) {}
template <typename Callable, typename Arg, typename... Args>
Watchdog(units::second_t timeout, Callable&& f, Arg&& arg, Args&&... args)
: Watchdog(timeout,
@@ -65,21 +46,9 @@ class Watchdog {
Watchdog& operator=(Watchdog&& rhs);
/**
* Returns the time in seconds since the watchdog was last fed.
* Returns the time since the watchdog was last fed.
*/
double GetTime() const;
/**
* Sets the watchdog's timeout.
*
* @deprecated use the unit safe version instead.
* SetTimeout(units::second_t timeout)
*
* @param timeout The watchdog's timeout in seconds with microsecond
* resolution.
*/
WPI_DEPRECATED("Use unit-safe version instead")
void SetTimeout(double timeout);
units::second_t GetTime() const;
/**
* Sets the watchdog's timeout.
@@ -90,9 +59,9 @@ class Watchdog {
void SetTimeout(units::second_t timeout);
/**
* Returns the watchdog's timeout in seconds.
* Returns the watchdog's timeout.
*/
double GetTimeout() const;
units::second_t GetTimeout() const;
/**
* Returns true if the watchdog timer has expired.
@@ -143,7 +112,7 @@ class Watchdog {
private:
// Used for timeout print rate-limiting
static constexpr units::second_t kMinPrintPeriod = 1_s;
static constexpr auto kMinPrintPeriod = 1_s;
units::second_t m_startTime = 0_s;
units::second_t m_timeout;