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

Reduce scope of for loop variables to for loop initializer (#517)

Browse Source
This commit is contained in:
Chris Gregory
2017-05-06 23:15:34 -07:00
committed by Fred Silberberg
parent dbe821baee
commit a5cd24e7ea
8 changed files with 42 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wpilibc/sim/src/DriverStation.cpp
View File

@@ -134,11 +134,12 @@ int16_t DriverStation::GetStickButtons(int stick) {
"stick must be between 0 and 5");
return false;
}
int16_t btns = 0, btnid;
int16_t btns = 0;
std::unique_lock<std::recursive_mutex> lock(m_joystickMutex);
gazebo::msgs::FRCJoystickPtr joy = joysticks[stick];
for (btnid = 0; btnid < joy->buttons().size() && btnid < 12; btnid++) {
for (int16_t btnid = 0; btnid < joy->buttons().size() && btnid < 12;
btnid++) {
if (joysticks[stick]->buttons(btnid)) {
btns |= (1 << btnid);
}

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

@@ -633,13 +633,12 @@ double RobotDrive::Limit(double num) {
*/
void RobotDrive::Normalize(double* wheelSpeeds) {
double maxMagnitude = std::fabs(wheelSpeeds[0]);
int i;
for (i = 1; i < kMaxNumberOfMotors; i++) {
for (int i = 1; i < kMaxNumberOfMotors; i++) {
double temp = std::fabs(wheelSpeeds[i]);
if (maxMagnitude < temp) maxMagnitude = temp;
}
if (maxMagnitude > 1.0) {
for (i = 0; i < kMaxNumberOfMotors; i++) {
for (int i = 0; i < kMaxNumberOfMotors; i++) {
wheelSpeeds[i] = wheelSpeeds[i] / maxMagnitude;
}
}