Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-04 03:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reformat for recent commits (#54)

Browse Source
This commit is contained in:
Peter Johnson
2016-05-24 22:16:21 -07:00
parent 3af8e7e9fd
commit 565a125dad
3 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

2
wpilibc/athena/src/PIDController.cpp
View File

@@ -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);
}

32
wpilibc/sim/src/RobotDrive.cpp
View File

@@ -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();
}