Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-22 01:11:42 +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

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