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

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