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

Fix Drive usage reporting order (#1908)

Browse Source 
Fixes #1893
This commit is contained in:
sciencewhiz
2019-09-29 20:35:04 -07:00
committed by Peter Johnson
parent 762c88adb8
commit c58b072c89
8 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wpilibc/src/main/native/cpp/RobotDrive.cpp
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */
/* Copyright (c) 2008-2019 FIRST. 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 the root directory of */
/* the project. */
@@ -120,8 +120,8 @@ void RobotDrive::Drive(double outputMagnitude, double curve) {
double leftOutput, rightOutput;
static bool reported = false;
if (!reported) {
HAL_Report(HALUsageReporting::kResourceType_RobotDrive, GetNumMotors(),
HALUsageReporting::kRobotDrive_ArcadeRatioCurve);
HAL_Report(HALUsageReporting::kResourceType_RobotDrive,
HALUsageReporting::kRobotDrive_ArcadeRatioCurve, GetNumMotors());
reported = true;
}
@@ -180,8 +180,8 @@ void RobotDrive::TankDrive(double leftValue, double rightValue,
bool squaredInputs) {
static bool reported = false;
if (!reported) {
HAL_Report(HALUsageReporting::kResourceType_RobotDrive, GetNumMotors(),
HALUsageReporting::kRobotDrive_Tank);
HAL_Report(HALUsageReporting::kResourceType_RobotDrive,
HALUsageReporting::kRobotDrive_Tank, GetNumMotors());
reported = true;
}
@@ -230,8 +230,8 @@ void RobotDrive::ArcadeDrive(double moveValue, double rotateValue,
bool squaredInputs) {
static bool reported = false;
if (!reported) {
HAL_Report(HALUsageReporting::kResourceType_RobotDrive, GetNumMotors(),
HALUsageReporting::kRobotDrive_ArcadeStandard);
HAL_Report(HALUsageReporting::kResourceType_RobotDrive,
HALUsageReporting::kRobotDrive_ArcadeStandard, GetNumMotors());
reported = true;
}
@@ -273,8 +273,8 @@ void RobotDrive::MecanumDrive_Cartesian(double x, double y, double rotation,
double gyroAngle) {
static bool reported = false;
if (!reported) {
HAL_Report(HALUsageReporting::kResourceType_RobotDrive, GetNumMotors(),
HALUsageReporting::kRobotDrive_MecanumCartesian);
HAL_Report(HALUsageReporting::kResourceType_RobotDrive,
HALUsageReporting::kRobotDrive_MecanumCartesian, GetNumMotors());
reported = true;
}
@@ -305,8 +305,8 @@ void RobotDrive::MecanumDrive_Polar(double magnitude, double direction,
double rotation) {
static bool reported = false;
if (!reported) {
HAL_Report(HALUsageReporting::kResourceType_RobotDrive, GetNumMotors(),
HALUsageReporting::kRobotDrive_MecanumPolar);
HAL_Report(HALUsageReporting::kResourceType_RobotDrive,
HALUsageReporting::kRobotDrive_MecanumPolar, GetNumMotors());
reported = true;
}

12
wpilibc/src/main/native/cpp/drive/DifferentialDrive.cpp
View File

@@ -33,8 +33,8 @@ void DifferentialDrive::ArcadeDrive(double xSpeed, double zRotation,
bool squareInputs) {
static bool reported = false;
if (!reported) {
HAL_Report(HALUsageReporting::kResourceType_RobotDrive, 2,
HALUsageReporting::kRobotDrive2_DifferentialArcade);
HAL_Report(HALUsageReporting::kResourceType_RobotDrive,
HALUsageReporting::kRobotDrive2_DifferentialArcade, 2);
reported = true;
}
@@ -88,8 +88,8 @@ void DifferentialDrive::CurvatureDrive(double xSpeed, double zRotation,
bool isQuickTurn) {
static bool reported = false;
if (!reported) {
HAL_Report(HALUsageReporting::kResourceType_RobotDrive, 2,
HALUsageReporting::kRobotDrive2_DifferentialCurvature);
HAL_Report(HALUsageReporting::kResourceType_RobotDrive,
HALUsageReporting::kRobotDrive2_DifferentialCurvature, 2);
reported = true;
}
@@ -162,8 +162,8 @@ void DifferentialDrive::TankDrive(double leftSpeed, double rightSpeed,
bool squareInputs) {
static bool reported = false;
if (!reported) {
HAL_Report(HALUsageReporting::kResourceType_RobotDrive, 2,
HALUsageReporting::kRobotDrive2_DifferentialTank);
HAL_Report(HALUsageReporting::kResourceType_RobotDrive,
HALUsageReporting::kRobotDrive2_DifferentialTank, 2);
reported = true;
}

8
wpilibc/src/main/native/cpp/drive/KilloughDrive.cpp
View File

@@ -48,8 +48,8 @@ KilloughDrive::KilloughDrive(SpeedController& leftMotor,
void KilloughDrive::DriveCartesian(double ySpeed, double xSpeed,
double zRotation, double gyroAngle) {
if (!reported) {
HAL_Report(HALUsageReporting::kResourceType_RobotDrive, 3,
HALUsageReporting::kRobotDrive2_KilloughCartesian);
HAL_Report(HALUsageReporting::kResourceType_RobotDrive,
HALUsageReporting::kRobotDrive2_KilloughCartesian, 3);
reported = true;
}
@@ -80,8 +80,8 @@ void KilloughDrive::DriveCartesian(double ySpeed, double xSpeed,
void KilloughDrive::DrivePolar(double magnitude, double angle,
double zRotation) {
if (!reported) {
HAL_Report(HALUsageReporting::kResourceType_RobotDrive, 3,
HALUsageReporting::kRobotDrive2_KilloughPolar);
HAL_Report(HALUsageReporting::kResourceType_RobotDrive,
HALUsageReporting::kRobotDrive2_KilloughPolar, 3);
reported = true;
}

8
wpilibc/src/main/native/cpp/drive/MecanumDrive.cpp
View File

@@ -41,8 +41,8 @@ MecanumDrive::MecanumDrive(SpeedController& frontLeftMotor,
void MecanumDrive::DriveCartesian(double ySpeed, double xSpeed,
double zRotation, double gyroAngle) {
if (!reported) {
HAL_Report(HALUsageReporting::kResourceType_RobotDrive, 4,
HALUsageReporting::kRobotDrive2_MecanumCartesian);
HAL_Report(HALUsageReporting::kResourceType_RobotDrive,
HALUsageReporting::kRobotDrive2_MecanumCartesian, 4);
reported = true;
}
@@ -77,8 +77,8 @@ void MecanumDrive::DriveCartesian(double ySpeed, double xSpeed,
void MecanumDrive::DrivePolar(double magnitude, double angle,
double zRotation) {
if (!reported) {
HAL_Report(HALUsageReporting::kResourceType_RobotDrive, 4,
HALUsageReporting::kRobotDrive2_MecanumPolar);
HAL_Report(HALUsageReporting::kResourceType_RobotDrive,
HALUsageReporting::kRobotDrive2_MecanumPolar, 4);
reported = true;
}

20
wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotDrive.java
View File

@@ -170,8 +170,8 @@ public class RobotDrive extends MotorSafety implements AutoCloseable {
final double rightOutput;
if (!kArcadeRatioCurve_Reported) {
HAL.report(tResourceType.kResourceType_RobotDrive, getNumMotors(),
tInstances.kRobotDrive_ArcadeRatioCurve);
HAL.report(tResourceType.kResourceType_RobotDrive, tInstances.kRobotDrive_ArcadeRatioCurve,
getNumMotors());
kArcadeRatioCurve_Reported = true;
}
if (curve < 0) {
@@ -273,8 +273,8 @@ public class RobotDrive extends MotorSafety implements AutoCloseable {
*/
public void tankDrive(double leftValue, double rightValue, boolean squaredInputs) {
if (!kTank_Reported) {
HAL.report(tResourceType.kResourceType_RobotDrive, getNumMotors(),
tInstances.kRobotDrive_Tank);
HAL.report(tResourceType.kResourceType_RobotDrive, tInstances.kRobotDrive_Tank,
getNumMotors());
kTank_Reported = true;
}
@@ -378,8 +378,8 @@ public class RobotDrive extends MotorSafety implements AutoCloseable {
public void arcadeDrive(double moveValue, double rotateValue, boolean squaredInputs) {
// local variables to hold the computed PWM values for the motors
if (!kArcadeStandard_Reported) {
HAL.report(tResourceType.kResourceType_RobotDrive, getNumMotors(),
tInstances.kRobotDrive_ArcadeStandard);
HAL.report(tResourceType.kResourceType_RobotDrive, tInstances.kRobotDrive_ArcadeStandard,
getNumMotors());
kArcadeStandard_Reported = true;
}
@@ -451,8 +451,8 @@ public class RobotDrive extends MotorSafety implements AutoCloseable {
@SuppressWarnings("ParameterName")
public void mecanumDrive_Cartesian(double x, double y, double rotation, double gyroAngle) {
if (!kMecanumCartesian_Reported) {
HAL.report(tResourceType.kResourceType_RobotDrive, getNumMotors(),
tInstances.kRobotDrive_MecanumCartesian);
HAL.report(tResourceType.kResourceType_RobotDrive, tInstances.kRobotDrive_MecanumCartesian,
getNumMotors());
kMecanumCartesian_Reported = true;
}
@SuppressWarnings("LocalVariableName")
@@ -496,8 +496,8 @@ public class RobotDrive extends MotorSafety implements AutoCloseable {
*/
public void mecanumDrive_Polar(double magnitude, double direction, double rotation) {
if (!kMecanumPolar_Reported) {
HAL.report(tResourceType.kResourceType_RobotDrive, getNumMotors(),
tInstances.kRobotDrive_MecanumPolar);
HAL.report(tResourceType.kResourceType_RobotDrive, tInstances.kRobotDrive_MecanumPolar,
getNumMotors());
kMecanumPolar_Reported = true;
}
// Normalized for full power along the Cartesian axes.

12
wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/DifferentialDrive.java
View File

@@ -174,8 +174,8 @@ public class DifferentialDrive extends RobotDriveBase implements Sendable {
@SuppressWarnings("ParameterName")
public void arcadeDrive(double xSpeed, double zRotation, boolean squareInputs) {
if (!m_reported) {
HAL.report(tResourceType.kResourceType_RobotDrive, 2,
tInstances.kRobotDrive2_DifferentialArcade);
HAL.report(tResourceType.kResourceType_RobotDrive,
tInstances.kRobotDrive2_DifferentialArcade, 2);
m_reported = true;
}
@@ -241,8 +241,8 @@ public class DifferentialDrive extends RobotDriveBase implements Sendable {
@SuppressWarnings({"ParameterName", "PMD.CyclomaticComplexity"})
public void curvatureDrive(double xSpeed, double zRotation, boolean isQuickTurn) {
if (!m_reported) {
HAL.report(tResourceType.kResourceType_RobotDrive, 2,
tInstances.kRobotDrive2_DifferentialCurvature);
HAL.report(tResourceType.kResourceType_RobotDrive,
tInstances.kRobotDrive2_DifferentialCurvature, 2);
m_reported = true;
}
@@ -332,8 +332,8 @@ public class DifferentialDrive extends RobotDriveBase implements Sendable {
*/
public void tankDrive(double leftSpeed, double rightSpeed, boolean squareInputs) {
if (!m_reported) {
HAL.report(tResourceType.kResourceType_RobotDrive, 2,
tInstances.kRobotDrive2_DifferentialTank);
HAL.report(tResourceType.kResourceType_RobotDrive,
tInstances.kRobotDrive2_DifferentialTank, 2);
m_reported = true;
}

8
wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/KilloughDrive.java
View File

@@ -169,8 +169,8 @@ public class KilloughDrive extends RobotDriveBase implements Sendable {
public void driveCartesian(double ySpeed, double xSpeed, double zRotation,
double gyroAngle) {
if (!m_reported) {
HAL.report(tResourceType.kResourceType_RobotDrive, 3,
tInstances.kRobotDrive2_KilloughCartesian);
HAL.report(tResourceType.kResourceType_RobotDrive,
tInstances.kRobotDrive2_KilloughCartesian, 3);
m_reported = true;
}
@@ -212,8 +212,8 @@ public class KilloughDrive extends RobotDriveBase implements Sendable {
@SuppressWarnings("ParameterName")
public void drivePolar(double magnitude, double angle, double zRotation) {
if (!m_reported) {
HAL.report(tResourceType.kResourceType_RobotDrive, 3,
tInstances.kRobotDrive2_KilloughPolar);
HAL.report(tResourceType.kResourceType_RobotDrive,
tInstances.kRobotDrive2_KilloughPolar, 3);
m_reported = true;
}

6
wpilibj/src/main/java/edu/wpi/first/wpilibj/drive/MecanumDrive.java
View File

@@ -154,8 +154,8 @@ public class MecanumDrive extends RobotDriveBase implements Sendable {
@SuppressWarnings("ParameterName")
public void driveCartesian(double ySpeed, double xSpeed, double zRotation, double gyroAngle) {
if (!m_reported) {
HAL.report(tResourceType.kResourceType_RobotDrive, 4,
tInstances.kRobotDrive2_MecanumCartesian);
HAL.report(tResourceType.kResourceType_RobotDrive,
tInstances.kRobotDrive2_MecanumCartesian, 4);
m_reported = true;
}
@@ -201,7 +201,7 @@ public class MecanumDrive extends RobotDriveBase implements Sendable {
@SuppressWarnings("ParameterName")
public void drivePolar(double magnitude, double angle, double zRotation) {
if (!m_reported) {
HAL.report(tResourceType.kResourceType_RobotDrive, 4, tInstances.kRobotDrive2_MecanumPolar);
HAL.report(tResourceType.kResourceType_RobotDrive, tInstances.kRobotDrive2_MecanumPolar, 4);
m_reported = true;
}