From 565a125dadef5cf6543ba602af5a92a027f927b3 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Tue, 24 May 2016 22:16:21 -0700 Subject: [PATCH] Reformat for recent commits (#54) --- wpilibc/athena/src/CANJaguar.cpp | 4 +--- wpilibc/athena/src/PIDController.cpp | 2 +- wpilibc/sim/src/RobotDrive.cpp | 32 ++++++++++++++-------------- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/wpilibc/athena/src/CANJaguar.cpp b/wpilibc/athena/src/CANJaguar.cpp index f9111cd76f..a58aa371fc 100644 --- a/wpilibc/athena/src/CANJaguar.cpp +++ b/wpilibc/athena/src/CANJaguar.cpp @@ -1536,9 +1536,7 @@ void CANJaguar::SetVoltageMode(CANJaguar::PotentiometerStruct) { * * @param outputValue The set-point to sent to the motor controller. */ -void CANJaguar::Set(float outputValue) { - Set(outputValue, 0); -} +void CANJaguar::Set(float outputValue) { Set(outputValue, 0); } /** * Used internally. In order to set the control mode see the methods listed diff --git a/wpilibc/athena/src/PIDController.cpp b/wpilibc/athena/src/PIDController.cpp index 58a1085b48..9346679ad2 100644 --- a/wpilibc/athena/src/PIDController.cpp +++ b/wpilibc/athena/src/PIDController.cpp @@ -78,7 +78,7 @@ void PIDController::Initialize(float Kp, float Ki, float Kd, float Kf, } PIDController::~PIDController() { - //forcefully stopping the notifier so the callback can successfully run. + // forcefully stopping the notifier so the callback can successfully run. m_controlLoop->Stop(); if (m_table != nullptr) m_table->RemoveTableListener(this); } diff --git a/wpilibc/sim/src/RobotDrive.cpp b/wpilibc/sim/src/RobotDrive.cpp index 137fb58389..0604cf412f 100644 --- a/wpilibc/sim/src/RobotDrive.cpp +++ b/wpilibc/sim/src/RobotDrive.cpp @@ -507,13 +507,13 @@ void RobotDrive::MecanumDrive_Cartesian(float x, float y, float rotation, Normalize(wheelSpeeds); m_frontLeftMotor->Set(wheelSpeeds[kFrontLeftMotor] * - m_invertedMotors[kFrontLeftMotor] * m_maxOutput); + m_invertedMotors[kFrontLeftMotor] * m_maxOutput); m_frontRightMotor->Set(wheelSpeeds[kFrontRightMotor] * - m_invertedMotors[kFrontRightMotor] * m_maxOutput); + m_invertedMotors[kFrontRightMotor] * m_maxOutput); m_rearLeftMotor->Set(wheelSpeeds[kRearLeftMotor] * - m_invertedMotors[kRearLeftMotor] * m_maxOutput); + m_invertedMotors[kRearLeftMotor] * m_maxOutput); m_rearRightMotor->Set(wheelSpeeds[kRearRightMotor] * - m_invertedMotors[kRearRightMotor] * m_maxOutput); + m_invertedMotors[kRearRightMotor] * m_maxOutput); // FIXME: m_safetyHelper->Feed(); } @@ -557,13 +557,13 @@ void RobotDrive::MecanumDrive_Polar(float magnitude, float direction, Normalize(wheelSpeeds); m_frontLeftMotor->Set(wheelSpeeds[kFrontLeftMotor] * - m_invertedMotors[kFrontLeftMotor] * m_maxOutput); + m_invertedMotors[kFrontLeftMotor] * m_maxOutput); m_frontRightMotor->Set(wheelSpeeds[kFrontRightMotor] * - m_invertedMotors[kFrontRightMotor] * m_maxOutput); + m_invertedMotors[kFrontRightMotor] * m_maxOutput); m_rearLeftMotor->Set(wheelSpeeds[kRearLeftMotor] * - m_invertedMotors[kRearLeftMotor] * m_maxOutput); + m_invertedMotors[kRearLeftMotor] * m_maxOutput); m_rearRightMotor->Set(wheelSpeeds[kRearRightMotor] * - m_invertedMotors[kRearRightMotor] * m_maxOutput); + m_invertedMotors[kRearRightMotor] * m_maxOutput); // FIXME: m_safetyHelper->Feed(); } @@ -599,16 +599,16 @@ void RobotDrive::SetLeftRightMotorOutputs(float leftOutput, float rightOutput) { wpi_assert(m_rearLeftMotor != nullptr && m_rearRightMotor != nullptr); if (m_frontLeftMotor != nullptr) - m_frontLeftMotor->Set( - Limit(leftOutput) * m_invertedMotors[kFrontLeftMotor] * m_maxOutput); - m_rearLeftMotor->Set( - Limit(leftOutput) * m_invertedMotors[kRearLeftMotor] * m_maxOutput); + m_frontLeftMotor->Set(Limit(leftOutput) * + m_invertedMotors[kFrontLeftMotor] * m_maxOutput); + m_rearLeftMotor->Set(Limit(leftOutput) * m_invertedMotors[kRearLeftMotor] * + m_maxOutput); if (m_frontRightMotor != nullptr) - m_frontRightMotor->Set( - -Limit(rightOutput) * m_invertedMotors[kFrontRightMotor] * m_maxOutput); - m_rearRightMotor->Set( - -Limit(rightOutput) * m_invertedMotors[kRearRightMotor] * m_maxOutput); + m_frontRightMotor->Set(-Limit(rightOutput) * + m_invertedMotors[kFrontRightMotor] * m_maxOutput); + m_rearRightMotor->Set(-Limit(rightOutput) * + m_invertedMotors[kRearRightMotor] * m_maxOutput); // FIXME: m_safetyHelper->Feed(); }