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

Fix missing typename and return type (#2115)

Browse Source
This commit is contained in:
Oblarg
2019-11-21 00:46:33 -05:00
committed by Peter Johnson
parent 5f85457a97
commit 3d1ca856b2
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibNewCommands/src/main/native/include/frc2/command/ProfiledPIDCommand.h
View File

@@ -32,7 +32,7 @@ class ProfiledPIDCommand
using Velocity = using Velocity =
units::compound_unit<Distance, units::inverse<units::seconds>>; units::compound_unit<Distance, units::inverse<units::seconds>>;
using Velocity_t = units::unit_t<Velocity>; using Velocity_t = units::unit_t<Velocity>;
using State = frc::TrapezoidProfile<Distance>::State; using State = typename frc::TrapezoidProfile<Distance>::State;
public: public:
/** /**
@@ -139,7 +139,7 @@ class ProfiledPIDCommand
protected: protected:
frc::ProfiledPIDController<Distance> m_controller; frc::ProfiledPIDController<Distance> m_controller;
std::function<units::unit_t<Distance>> m_measurement; std::function<Distance_t> m_measurement;
std::function<State()> m_goal; std::function<State()> m_goal;
std::function<void(double, State)> m_useOutput; std::function<void(double, State)> m_useOutput;
}; };

4
wpilibNewCommands/src/main/native/include/frc2/command/ProfiledPIDSubsystem.h
View File

@@ -25,7 +25,7 @@ class ProfiledPIDSubsystem : public SubsystemBase {
using Velocity = using Velocity =
units::compound_unit<Distance, units::inverse<units::seconds>>; units::compound_unit<Distance, units::inverse<units::seconds>>;
using Velocity_t = units::unit_t<Velocity>; using Velocity_t = units::unit_t<Velocity>;
using State = frc::TrapezoidProfile<Distance>::State; using State = typename frc::TrapezoidProfile<Distance>::State;
public: public:
/** /**
@@ -65,7 +65,7 @@ class ProfiledPIDSubsystem : public SubsystemBase {
* *
* @return the measurement of the process variable * @return the measurement of the process variable
*/ */
virtual units::meter_t GetMeasurement() = 0; virtual Distance_t GetMeasurement() = 0;
/** /**
* Enables the PID control. Resets the controller. * Enables the PID control. Resets the controller.

2
wpilibNewCommands/src/main/native/include/frc2/command/TrapezoidProfileCommand.h
View File

@@ -30,7 +30,7 @@ class TrapezoidProfileCommand
using Velocity = using Velocity =
units::compound_unit<Distance, units::inverse<units::seconds>>; units::compound_unit<Distance, units::inverse<units::seconds>>;
using Velocity_t = units::unit_t<Velocity>; using Velocity_t = units::unit_t<Velocity>;
using State = frc::TrapezoidProfile<Distance>::State; using State = typename frc::TrapezoidProfile<Distance>::State;
public: public:
/** /**
* Creates a new TrapezoidProfileCommand that will execute the given * Creates a new TrapezoidProfileCommand that will execute the given

4
wpilibNewCommands/src/main/native/include/frc2/command/TrapezoidProfileSubsystem.h
View File

@@ -23,8 +23,8 @@ class TrapezoidProfileSubsystem : public SubsystemBase {
using Velocity = using Velocity =
units::compound_unit<Distance, units::inverse<units::seconds>>; units::compound_unit<Distance, units::inverse<units::seconds>>;
using Velocity_t = units::unit_t<Velocity>; using Velocity_t = units::unit_t<Velocity>;
using State = frc::TrapezoidProfile<Distance>::State; using State = typename frc::TrapezoidProfile<Distance>::State;
using Constraints = frc::TrapezoidProfile<Distance>::Constraints; using Constraints = typename frc::TrapezoidProfile<Distance>::Constraints;
public: public:
/** /**
* Creates a new TrapezoidProfileSubsystem. * Creates a new TrapezoidProfileSubsystem.