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

Switches internal joystick errors to take StringRef (#378)

Browse Source 
Previously this would have allocated the std::string every time, even if
the message wasn't printed. Now takes a StringRef, and only converts to
std::string when the message actually gets printed.
This commit is contained in:
Thad House
2016-11-26 21:22:39 -08:00
committed by Peter Johnson
parent 31fecc28a4
commit a6fb1efcbe
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wpilibc/athena/include/DriverStation.h
View File

@@ -18,6 +18,7 @@
#include "HAL/cpp/priority_mutex.h"
#include "RobotState.h"
#include "SensorBase.h"
#include "llvm/StringRef.h"
namespace frc {
@@ -96,8 +97,8 @@ class DriverStation : public SensorBase, public RobotStateInterface {
private:
DriverStation();
void ReportJoystickUnpluggedError(std::string message);
void ReportJoystickUnpluggedWarning(std::string message);
void ReportJoystickUnpluggedError(llvm::StringRef message);
void ReportJoystickUnpluggedWarning(llvm::StringRef message);
void Run();
void UpdateControlWord(bool force, HAL_ControlWord& controlWord) const;

4
wpilibc/athena/src/DriverStation.cpp
View File

@@ -595,7 +595,7 @@ DriverStation::DriverStation() {
* Reports errors related to unplugged joysticks
* Throttles the errors so that they don't overwhelm the DS
*/
void DriverStation::ReportJoystickUnpluggedError(std::string message) {
void DriverStation::ReportJoystickUnpluggedError(llvm::StringRef message) {
double currentTime = Timer::GetFPGATimestamp();
if (currentTime > m_nextMessageTime) {
ReportError(message);
@@ -608,7 +608,7 @@ void DriverStation::ReportJoystickUnpluggedError(std::string message) {
*
* Throttles the errors so that they don't overwhelm the DS.
*/
void DriverStation::ReportJoystickUnpluggedWarning(std::string message) {
void DriverStation::ReportJoystickUnpluggedWarning(llvm::StringRef message) {
double currentTime = Timer::GetFPGATimestamp();
if (currentTime > m_nextMessageTime) {
ReportWarning(message);