diff --git a/wpilibc/src/main/native/include/frc/simulation/DifferentialDrivetrainSim.h b/wpilibc/src/main/native/include/frc/simulation/DifferentialDrivetrainSim.h index 1d47726b29..e510e18b81 100644 --- a/wpilibc/src/main/native/include/frc/simulation/DifferentialDrivetrainSim.h +++ b/wpilibc/src/main/native/include/frc/simulation/DifferentialDrivetrainSim.h @@ -257,7 +257,7 @@ class DifferentialDrivetrainSim { * (26_in / 2) * (26_in / 2); return DifferentialDrivetrainSim{ - motor, gearing, batteryMoi + gearboxMoi, 25_kg, + motor, gearing, batteryMoi + gearboxMoi, 60_lb, wheelSize / 2.0, 26_in, measurementStdDevs}; } @@ -281,7 +281,7 @@ class DifferentialDrivetrainSim { units::kilogram_square_meter_t J, const std::array& measurementStdDevs = {}) { return DifferentialDrivetrainSim{ - motor, gearing, J, 25_kg, wheelSize / 2.0, 26_in, measurementStdDevs}; + motor, gearing, J, 60_lb, wheelSize / 2.0, 26_in, measurementStdDevs}; } private: diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DifferentialDrivetrainSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DifferentialDrivetrainSim.java index 19657f3dcf..fffd441d97 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DifferentialDrivetrainSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/DifferentialDrivetrainSim.java @@ -480,7 +480,7 @@ public class DifferentialDrivetrainSim { motor.value, gearing.value, jKgMetersSquared, - 25 / 2.2, + Units.lbsToKilograms(60), wheelSize.value / 2.0, Units.inchesToMeters(26), measurementStdDevs);