Skip to content

Commit 805b5af

Browse files
Fix units to comply with LinearSystem and plant.
Signed-off-by: thenetworkgrinch <thenetworkgrinch@users.noreply.github.com>
1 parent 29caeb8 commit 805b5af

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

yams/java/yams/math/LQRConfig.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import static edu.wpi.first.units.Units.Meters;
66
import static edu.wpi.first.units.Units.MetersPerSecond;
77
import static edu.wpi.first.units.Units.Milliseconds;
8-
import static edu.wpi.first.units.Units.Rotations;
9-
import static edu.wpi.first.units.Units.RotationsPerSecond;
8+
import static edu.wpi.first.units.Units.Radians;
9+
import static edu.wpi.first.units.Units.RadiansPerSecond;
1010
import static edu.wpi.first.units.Units.Seconds;
1111
import static edu.wpi.first.units.Units.Volts;
1212

@@ -176,9 +176,9 @@ public LQRConfig withMaxVoltage(Voltage voltage)
176176
public LQRConfig withFlyWheel(AngularVelocity qelms, AngularVelocity modelTrust, AngularVelocity encoderTrust)
177177
{
178178
m_type = Optional.of(LQRType.FLYWHEEL);
179-
m_qelms = Optional.of(VecBuilder.fill(qelms.in(RotationsPerSecond)));
180-
m_modelStdDevs = Optional.of(VecBuilder.fill(modelTrust.in(RotationsPerSecond)));
181-
m_encoderStdDevs = Optional.of(VecBuilder.fill(encoderTrust.in(RotationsPerSecond)));
179+
m_qelms = Optional.of(VecBuilder.fill(qelms.in(RadiansPerSecond)));
180+
m_modelStdDevs = Optional.of(VecBuilder.fill(modelTrust.in(RadiansPerSecond)));
181+
m_encoderStdDevs = Optional.of(VecBuilder.fill(encoderTrust.in(RadiansPerSecond)));
182182
return this;
183183
}
184184

@@ -230,10 +230,10 @@ public LQRConfig withArm(Angle qelmsPosition, AngularVelocity qelmsVelocity, Ang
230230
AngularVelocity modelVelocityTrust, Angle encoderPositionTrust)
231231
{
232232
m_type = Optional.of(LQRType.ARM);
233-
m_qelms = Optional.of(VecBuilder.fill(qelmsPosition.in(Rotations), qelmsVelocity.in(RotationsPerSecond)));
234-
m_modelStdDevs = Optional.of(VecBuilder.fill(modelPositionTrust.in(Rotations),
235-
modelVelocityTrust.in(RotationsPerSecond)));
236-
m_encoderStdDevs = Optional.of(VecBuilder.fill(encoderPositionTrust.in(Rotations)));
233+
m_qelms = Optional.of(VecBuilder.fill(qelmsPosition.in(Radians), qelmsVelocity.in(RadiansPerSecond)));
234+
m_modelStdDevs = Optional.of(VecBuilder.fill(modelPositionTrust.in(Radians),
235+
modelVelocityTrust.in(RadiansPerSecond)));
236+
m_encoderStdDevs = Optional.of(VecBuilder.fill(encoderPositionTrust.in(Radians)));
237237
return this;
238238
}
239239

0 commit comments

Comments
 (0)