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

[wpilibc] MotorSafety::GetDescription(): Return std::string (#3390)

Browse Source 
This is only called in an error condition, so it's not necessary to over
optimize it.
This commit is contained in:
Peter Johnson
2021-05-26 07:25:32 -07:00
committed by GitHub
parent f4e2d26d58
commit 50915cb7ed
15 changed files with 35 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,8 @@
#pragma once
#include <string>
#include "frc/DigitalOutput.h"
#include "frc/MotorSafety.h"
#include "frc/PWM.h"
@@ -74,7 +76,7 @@ class NidecBrushless : public MotorController,
// MotorSafety interface
void StopMotor() override;
void GetDescription(wpi::raw_ostream& desc) const override;
std::string GetDescription() const override;
/**
* Gets the channel number associated with the object.

8
wpilibc/src/main/native/include/frc/motorcontrol/PWMMotorController.h
View File

@@ -4,6 +4,8 @@
#pragma once
#include <string>
#include <wpi/Twine.h>
#include "frc/MotorSafety.h"
@@ -12,10 +14,6 @@
#include "frc/smartdashboard/Sendable.h"
#include "frc/smartdashboard/SendableHelper.h"
namespace wpi {
class raw_ostream;
} // namespace wpi
namespace frc {
/**
@@ -56,7 +54,7 @@ class PWMMotorController : public MotorController,
// MotorSafety interface
void StopMotor() override;
void GetDescription(wpi::raw_ostream& desc) const override;
std::string GetDescription() const override;
int GetChannel() const;