diff --git a/wpilibc/src/main/native/include/wpi/drive/RobotDriveBase.hpp b/wpilibc/src/main/native/include/wpi/drive/RobotDriveBase.hpp index 6177dc3951..02f5cf6ba3 100644 --- a/wpilibc/src/main/native/include/wpi/drive/RobotDriveBase.hpp +++ b/wpilibc/src/main/native/include/wpi/drive/RobotDriveBase.hpp @@ -78,10 +78,10 @@ class RobotDriveBase : public MotorSafety { protected: /// Default input deadband. - static constexpr double kDefaultDeadband = 0.02; + static constexpr double DEFAULT_DEADBAND = 0.02; /// Default maximum output. - static constexpr double kDefaultMaxOutput = 1.0; + static constexpr double DEFAULT_MAX_OUTPUT = 1.0; /** * Renormalize all wheel velocities if the magnitude of any wheel is greater @@ -90,10 +90,10 @@ class RobotDriveBase : public MotorSafety { static void Desaturate(std::span wheelVelocities); /// Input deadband. - double m_deadband = kDefaultDeadband; + double m_deadband = DEFAULT_DEADBAND; /// Maximum output. - double m_maxOutput = kDefaultMaxOutput; + double m_maxOutput = DEFAULT_MAX_OUTPUT; }; } // namespace wpi diff --git a/wpilibc/src/main/python/semiwrap/RobotDriveBase.yml b/wpilibc/src/main/python/semiwrap/RobotDriveBase.yml index a146ef0fa0..c50727dbc2 100644 --- a/wpilibc/src/main/python/semiwrap/RobotDriveBase.yml +++ b/wpilibc/src/main/python/semiwrap/RobotDriveBase.yml @@ -7,8 +7,8 @@ classes: attributes: m_deadband: m_maxOutput: - kDefaultDeadband: - kDefaultMaxOutput: + DEFAULT_DEADBAND: + DEFAULT_MAX_OUTPUT: enums: MotorType: methods: diff --git a/wpilibj/src/main/java/org/wpilib/drive/DifferentialDrive.java b/wpilibj/src/main/java/org/wpilib/drive/DifferentialDrive.java index 9e44b6a21f..c11337366a 100644 --- a/wpilibj/src/main/java/org/wpilib/drive/DifferentialDrive.java +++ b/wpilibj/src/main/java/org/wpilib/drive/DifferentialDrive.java @@ -43,7 +43,7 @@ import org.wpilib.util.sendable.SendableRegistry; * positive Z axis points up. Rotations follow the right-hand rule, so counterclockwise rotation * around the Z axis is positive. * - *

Inputs smaller then {@value org.wpilib.drive.RobotDriveBase#kDefaultDeadband} will be set to + *

Inputs smaller then {@value org.wpilib.drive.RobotDriveBase#DEFAULT_DEADBAND} will be set to * 0, and larger values will be scaled so that the full range is still used. This deadband value can * be changed with {@link #setDeadband}. * diff --git a/wpilibj/src/main/java/org/wpilib/drive/MecanumDrive.java b/wpilibj/src/main/java/org/wpilib/drive/MecanumDrive.java index 9bf1fcb406..0da6f5d945 100644 --- a/wpilibj/src/main/java/org/wpilib/drive/MecanumDrive.java +++ b/wpilibj/src/main/java/org/wpilib/drive/MecanumDrive.java @@ -42,7 +42,7 @@ import org.wpilib.util.sendable.SendableRegistry; * positive Z axis points up. Rotations follow the right-hand rule, so counterclockwise rotation * around the Z axis is positive. * - *

Inputs smaller then {@value org.wpilib.drive.RobotDriveBase#kDefaultDeadband} will be set to + *

Inputs smaller then {@value org.wpilib.drive.RobotDriveBase#DEFAULT_DEADBAND} will be set to * 0, and larger values will be scaled so that the full range is still used. This deadband value can * be changed with {@link #setDeadband}. * diff --git a/wpilibj/src/main/java/org/wpilib/drive/RobotDriveBase.java b/wpilibj/src/main/java/org/wpilib/drive/RobotDriveBase.java index 4170b6a536..29e4924f0a 100644 --- a/wpilibj/src/main/java/org/wpilib/drive/RobotDriveBase.java +++ b/wpilibj/src/main/java/org/wpilib/drive/RobotDriveBase.java @@ -13,16 +13,16 @@ import org.wpilib.hardware.motor.MotorSafety; */ public abstract class RobotDriveBase extends MotorSafety { /** Default input deadband. */ - public static final double kDefaultDeadband = 0.02; + public static final double DEFAULT_DEADBAND = 0.02; /** Default maximum output. */ - public static final double kDefaultMaxOutput = 1.0; + public static final double DEFAULT_MAX_OUTPUT = 1.0; /** Input deadband. */ - protected double m_deadband = kDefaultDeadband; + protected double m_deadband = DEFAULT_DEADBAND; /** Maximum output. */ - protected double m_maxOutput = kDefaultMaxOutput; + protected double m_maxOutput = DEFAULT_MAX_OUTPUT; /** The location of a motor on the robot for the purpose of driving. */ public enum MotorType { @@ -58,7 +58,7 @@ public abstract class RobotDriveBase extends MotorSafety { /** * Sets the deadband applied to the drive inputs (e.g., joystick values). * - *

The default value is {@value #kDefaultDeadband}. Inputs smaller than the deadband are set to + *

The default value is {@value #DEFAULT_DEADBAND}. Inputs smaller than the deadband are set to * 0.0 while inputs larger than the deadband are scaled from 0.0 to 1.0. See {@link * org.wpilib.math.util.MathUtil#applyDeadband}. * @@ -72,7 +72,7 @@ public abstract class RobotDriveBase extends MotorSafety { * Configure the scaling factor for using drive methods with motor controllers in a mode other * than PercentVbus or to limit the maximum output. * - *

The default value is {@value #kDefaultMaxOutput}. + *

The default value is {@value #DEFAULT_MAX_OUTPUT}. * * @param maxOutput Multiplied with the output percentage computed by the drive functions. */