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

[wpilibc] Solenoid classes: Make methods non-virtual (#7080)

Browse Source
This commit is contained in:
Ryan Blue
2024-09-16 21:36:04 -04:00
committed by GitHub
parent b93160d7ba
commit 777f07edfd
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibc/src/main/native/include/frc/DoubleSolenoid.h
View File

@@ -70,14 +70,14 @@ class DoubleSolenoid : public wpi::Sendable,
*
* @param value The value to set (Off, Forward or Reverse)
*/
virtual void Set(Value value);
void Set(Value value);
/**
* Read the current value of the solenoid.
*
* @return The current value of the solenoid.
*/
virtual Value Get() const;
Value Get() const;
/**
* Toggle the value of the solenoid.

4
wpilibc/src/main/native/include/frc/Solenoid.h
View File

@@ -52,14 +52,14 @@ class Solenoid : public wpi::Sendable, public wpi::SendableHelper<Solenoid> {
*
* @param on Turn the solenoid output off or on.
*/
virtual void Set(bool on);
void Set(bool on);
/**
* Read the current value of the solenoid.
*
* @return The current value of the solenoid.
*/
virtual bool Get() const;
bool Get() const;
/**
* Toggle the value of the solenoid.

6
wpilibc/src/main/native/include/frc/simulation/SolenoidSim.h
View File

@@ -16,7 +16,7 @@ class SolenoidSim {
SolenoidSim(std::shared_ptr<PneumaticsBaseSim> moduleSim, int channel);
SolenoidSim(int module, PneumaticsModuleType type, int channel);
SolenoidSim(PneumaticsModuleType type, int channel);
virtual ~SolenoidSim() = default;
~SolenoidSim() = default;
bool GetOutput() const;
void SetOutput(bool output);
@@ -31,8 +31,8 @@ class SolenoidSim {
* callback.
*/
[[nodiscard]]
virtual std::unique_ptr<CallbackStore> RegisterOutputCallback(
NotifyCallback callback, bool initialNotify);
std::unique_ptr<CallbackStore> RegisterOutputCallback(NotifyCallback callback,
bool initialNotify);
std::shared_ptr<PneumaticsBaseSim> GetModuleSim() const;