|
5 | 5 | import static edu.wpi.first.units.Units.Meters; |
6 | 6 | import static edu.wpi.first.units.Units.MetersPerSecond; |
7 | 7 | 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; |
10 | 10 | import static edu.wpi.first.units.Units.Seconds; |
11 | 11 | import static edu.wpi.first.units.Units.Volts; |
12 | 12 |
|
@@ -176,9 +176,9 @@ public LQRConfig withMaxVoltage(Voltage voltage) |
176 | 176 | public LQRConfig withFlyWheel(AngularVelocity qelms, AngularVelocity modelTrust, AngularVelocity encoderTrust) |
177 | 177 | { |
178 | 178 | 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))); |
182 | 182 | return this; |
183 | 183 | } |
184 | 184 |
|
@@ -230,10 +230,10 @@ public LQRConfig withArm(Angle qelmsPosition, AngularVelocity qelmsVelocity, Ang |
230 | 230 | AngularVelocity modelVelocityTrust, Angle encoderPositionTrust) |
231 | 231 | { |
232 | 232 | 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))); |
237 | 237 | return this; |
238 | 238 | } |
239 | 239 |
|
|
0 commit comments