Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-28 02:11: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-10-06 19:43:02 -07:00
parent b1aaabc1c6 2fb5271cc9
commit 7ff312bb69
47 changed files with 1439 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wpiunits/src/main/java/edu/wpi/first/units/Measure.java
View File

@@ -649,17 +649,10 @@ public interface Measure<U extends Unit> extends Comparable<Measure<U>> {
return unit().ofBaseUnits(baseUnitResult);
}
if (unit() instanceof DimensionlessUnit) {
// Numerator is a dimensionless
if (divisor.unit() instanceof PerUnit<?, ?> ratio) {
// Dividing by a ratio, return its reciprocal scaled by this
return ratio.reciprocal().ofBaseUnits(baseUnitResult);
}
if (divisor.unit() instanceof PerUnit<?, ?> ratio) {
// Dividing by a Per<Time, U>, return its reciprocal velocity scaled by this
// Note: Per<Time, U>.reciprocal() is coded to return a Velocity<U>
return ratio.reciprocal().ofBaseUnits(baseUnitResult);
}
// Numerator is a dimensionless
if (unit() instanceof DimensionlessUnit && divisor.unit() instanceof PerUnit<?, ?> ratio) {
// Dividing by a ratio, return its reciprocal scaled by this
return ratio.reciprocal().ofBaseUnits(baseUnitResult);
}
if (divisor.unit() instanceof PerUnit<?, ?> ratio