Major formatting changes (breaks diffs). No code changes.

The changes made in this commit do not affect any actual code,
    they are purely aesthetic. I ran clang-format with google style
    over all .h/.cpp files in wpilibc that weren't in wpilibC++Sim
    or gtest, and the eclipse formatter over all of the Java files
    using the Google eclipse formatting configuration.

Change-Id: I9627bca0bc103c398ecc1c5ba17467193291ae63
This commit is contained in:
James Kuszmaul
2015-06-25 15:07:55 -04:00
parent bd64d9a7ef
commit 7eb8550bdb
470 changed files with 89798 additions and 77287 deletions

View File

@@ -1,5 +1,6 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) FIRST 2008. All Rights Reserved. */
/* Copyright (c) FIRST 2008. All Rights Reserved.
*/
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in $(WIND_BASE)/WPILib. */
/*----------------------------------------------------------------------------*/
@@ -11,96 +12,79 @@
/**
* Initialize a SafePWM object by setting defaults
*/
void SafePWM::InitSafePWM()
{
m_safetyHelper = new MotorSafetyHelper(this);
m_safetyHelper->SetSafetyEnabled(false);
void SafePWM::InitSafePWM() {
m_safetyHelper = new MotorSafetyHelper(this);
m_safetyHelper->SetSafetyEnabled(false);
}
/**
* Constructor for a SafePWM object taking a channel number.
* @param channel The PWM channel number 0-9 are on-board, 10-19 are on the MXP port
* @param channel The PWM channel number 0-9 are on-board, 10-19 are on the MXP
* port
*/
SafePWM::SafePWM(uint32_t channel): PWM(channel)
{
InitSafePWM();
}
SafePWM::SafePWM(uint32_t channel) : PWM(channel) { InitSafePWM(); }
SafePWM::~SafePWM()
{
delete m_safetyHelper;
}
SafePWM::~SafePWM() { delete m_safetyHelper; }
/**
* Set the expiration time for the PWM object
* @param timeout The timeout (in seconds) for this motor object
*/
void SafePWM::SetExpiration(float timeout)
{
m_safetyHelper->SetExpiration(timeout);
void SafePWM::SetExpiration(float timeout) {
m_safetyHelper->SetExpiration(timeout);
}
/**
* Return the expiration time for the PWM object.
* @returns The expiration time value.
*/
float SafePWM::GetExpiration() const
{
return m_safetyHelper->GetExpiration();
}
float SafePWM::GetExpiration() const { return m_safetyHelper->GetExpiration(); }
/**
* Check if the PWM object is currently alive or stopped due to a timeout.
* @returns a bool value that is true if the motor has NOT timed out and should still
* @returns a bool value that is true if the motor has NOT timed out and should
* still
* be running.
*/
bool SafePWM::IsAlive() const
{
return m_safetyHelper->IsAlive();
}
bool SafePWM::IsAlive() const { return m_safetyHelper->IsAlive(); }
/**
* Stop the motor associated with this PWM object.
* This is called by the MotorSafetyHelper object when it has a timeout for this PWM and needs to
* This is called by the MotorSafetyHelper object when it has a timeout for this
* PWM and needs to
* stop it from running.
*/
void SafePWM::StopMotor()
{
SetRaw(kPwmDisabled);
}
void SafePWM::StopMotor() { SetRaw(kPwmDisabled); }
/**
* Enable/disable motor safety for this device
* Turn on and off the motor safety option for this PWM object.
* @param enabled True if motor safety is enforced for this object
*/
void SafePWM::SetSafetyEnabled(bool enabled)
{
m_safetyHelper->SetSafetyEnabled(enabled);
void SafePWM::SetSafetyEnabled(bool enabled) {
m_safetyHelper->SetSafetyEnabled(enabled);
}
/**
* Check if motor safety is enabled for this object
* @returns True if motor safety is enforced for this object
*/
bool SafePWM::IsSafetyEnabled() const
{
return m_safetyHelper->IsSafetyEnabled();
bool SafePWM::IsSafetyEnabled() const {
return m_safetyHelper->IsSafetyEnabled();
}
void SafePWM::GetDescription(char *desc) const
{
sprintf(desc, "PWM %d", GetChannel());
void SafePWM::GetDescription(char *desc) const {
sprintf(desc, "PWM %d", GetChannel());
}
/**
* Feed the MotorSafety timer when setting the speed.
* This method is called by the subclass motor whenever it updates its speed, thereby reseting
* This method is called by the subclass motor whenever it updates its speed,
* thereby reseting
* the timeout value.
* @param speed Value to pass to the PWM class
*/
void SafePWM::SetSpeed(float speed)
{
PWM::SetSpeed(speed);
m_safetyHelper->Feed();
void SafePWM::SetSpeed(float speed) {
PWM::SetSpeed(speed);
m_safetyHelper->Feed();
}