Skip to content

Commit 3116f79

Browse files
authored
[sysid] Fix wrong position Kd with unnormalized time (#6433)
1 parent 0e013dc commit 3116f79

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

sysid/src/main/native/cpp/analysis/FeedbackAnalysis.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@ FeedbackGains sysid::CalculatePositionFeedbackGains(
4242
controller.LatencyCompensate(system, preset.period,
4343
preset.measurementDelay);
4444

45-
return {controller.K(0, 0) * preset.outputConversionFactor,
46-
controller.K(0, 1) * preset.outputConversionFactor /
47-
(preset.normalized ? 1 : preset.period.value())};
45+
return {
46+
controller.K(0, 0) * preset.outputConversionFactor,
47+
controller.K(0, 1) * preset.outputConversionFactor /
48+
(preset.normalized ? 1 : units::second_t{preset.period}.value())};
4849
}
4950

5051
// This is our special model to avoid instabilities in the LQR.

sysid/src/test/native/cpp/analysis/FeedbackAnalysisTest.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,16 @@ TEST(FeedbackAnalysisTest, PositionWithLatencyCompensation) {
130130
EXPECT_NEAR(Kp, 5.92, 0.05);
131131
EXPECT_NEAR(Kd, 2.12, 0.05);
132132
}
133+
134+
TEST(FeedbackAnalysisTest, PositionREV) {
135+
auto Kv = 3.060;
136+
auto Ka = 0.327;
137+
138+
sysid::LQRParameters params{1, 1.5, 7};
139+
140+
auto [Kp, Kd] = sysid::CalculatePositionFeedbackGains(
141+
sysid::presets::kREVNEOBuiltIn, params, Kv, Ka);
142+
143+
EXPECT_NEAR(Kp, 0.30202, 0.05);
144+
EXPECT_NEAR(Kd, 48.518, 0.05);
145+
}

0 commit comments

Comments
 (0)