Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 2027

Browse Source
This commit is contained in:
Peter Johnson
2025-11-29 10:41:16 -08:00
parent a79f86ade3 769ce5e9fa
commit 704b6ccaee
8 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wpiunits/src/main/java/org/wpilib/units/AngularMomentumUnit.java
View File

@@ -73,6 +73,16 @@ public final class AngularMomentumUnit extends MultUnit<LinearMomentumUnit, Dist
return VelocityUnit.combine(this, time);
}
/**
* Combines this angular momentum by an angular velocity to yield a unit of moment of inertia.
*
* @param omega the unit of angular velocity
* @return the moment of inertia unit
*/
public MomentOfInertiaUnit per(AngularVelocityUnit omega) {
return MomentOfInertiaUnit.combine(this, omega);
}
/**
* Creates a ratio unit between this unit and an arbitrary other unit.
*
@@ -94,14 +104,4 @@ public final class AngularMomentumUnit extends MultUnit<LinearMomentumUnit, Dist
public double convertFrom(double magnitude, AngularMomentumUnit otherUnit) {
return fromBaseUnits(otherUnit.toBaseUnits(magnitude));
}
/**
* Multiplies this angular momentum by an angular velocity to yield a unit of moment of inertia.
*
* @param omega the unit of angular velocity
* @return the moment of inertia unit
*/
public MomentOfInertiaUnit mult(AngularVelocityUnit omega) {
return MomentOfInertiaUnit.combine(this, omega);
}
}

2
wpiunits/src/main/java/org/wpilib/units/Units.java
View File

@@ -378,7 +378,7 @@ public final class Units {
/** The standard SI unit for moment of inertia. */
public static final MomentOfInertiaUnit KilogramSquareMeters =
KilogramMetersSquaredPerSecond.mult(RadiansPerSecond);
KilogramMetersSquaredPerSecond.per(RadiansPerSecond);
// VoltageUnit
/** The base unit of electric potential. */