From 305ab08f1ce9bda13be0caf58da01e26ab122f1a Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Wed, 25 May 2016 23:09:24 -0700 Subject: [PATCH] Renamed DriverStation::IsSysBrownedOut() to DriverStation::IsBrownedOut() to match the Java version. This changes the external API. (#67) --- wpilibc/athena/include/DriverStation.h | 2 +- wpilibc/athena/src/DriverStation.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wpilibc/athena/include/DriverStation.h b/wpilibc/athena/include/DriverStation.h index 90db3c09b5..0f0176c750 100644 --- a/wpilibc/athena/include/DriverStation.h +++ b/wpilibc/athena/include/DriverStation.h @@ -61,7 +61,7 @@ class DriverStation : public SensorBase, public RobotStateInterface { bool IsNewControlData() const; bool IsFMSAttached() const; bool IsSysActive() const; - bool IsSysBrownedOut() const; + bool IsBrownedOut() const; Alliance GetAlliance() const; uint32_t GetLocation() const; diff --git a/wpilibc/athena/src/DriverStation.cpp b/wpilibc/athena/src/DriverStation.cpp index dd2766b08c..fa582dabbb 100644 --- a/wpilibc/athena/src/DriverStation.cpp +++ b/wpilibc/athena/src/DriverStation.cpp @@ -463,7 +463,7 @@ bool DriverStation::IsSysActive() const { * * @return True if the system is browned out */ -bool DriverStation::IsSysBrownedOut() const { +bool DriverStation::IsBrownedOut() const { int32_t status = 0; bool retVal = HALGetBrownedOut(&status); wpi_setErrorWithContext(status, getHALErrorMessage(status));