diff --git a/sysid/src/main/native/cpp/view/Analyzer.cpp b/sysid/src/main/native/cpp/view/Analyzer.cpp index 457a26295b..3bbd1860f9 100644 --- a/sysid/src/main/native/cpp/view/Analyzer.cpp +++ b/sysid/src/main/native/cpp/view/Analyzer.cpp @@ -32,7 +32,6 @@ Analyzer::Analyzer(glass::Storage& storage, wpi::Logger& logger) // Fill the StringMap with preset values. m_presets["Default"] = presets::kDefault; m_presets["WPILib"] = presets::kWPILib; - m_presets["CTRE Phoenix 5 CANcoder"] = presets::kCTREv5CANCoder; m_presets["CTRE Phoenix 5"] = presets::kCTREv5; m_presets["CTRE Phoenix 6"] = presets::kCTREv6; m_presets["REV Brushless Encoder Port"] = presets::kREVNEOBuiltIn; diff --git a/sysid/src/main/native/include/sysid/analysis/FeedbackControllerPreset.h b/sysid/src/main/native/include/sysid/analysis/FeedbackControllerPreset.h index d30d80aae9..683a8f683d 100644 --- a/sysid/src/main/native/include/sysid/analysis/FeedbackControllerPreset.h +++ b/sysid/src/main/native/include/sysid/analysis/FeedbackControllerPreset.h @@ -115,8 +115,6 @@ inline constexpr FeedbackControllerPreset kWPILib{kDefault}; * * Total delay = 50 ms + 31.5 ms = 81.5 ms. */ -inline constexpr FeedbackControllerPreset kCTREv5CANCoder{1.0 / 12.0, 60.0, - 1_ms, true, 81.5_ms}; inline constexpr FeedbackControllerPreset kCTREv5{1023.0 / 12.0, 0.1, 1_ms, false, 81.5_ms}; /** diff --git a/sysid/src/test/native/cpp/analysis/FeedbackAnalysisTest.cpp b/sysid/src/test/native/cpp/analysis/FeedbackAnalysisTest.cpp index acb9785284..92b26ca763 100644 --- a/sysid/src/test/native/cpp/analysis/FeedbackAnalysisTest.cpp +++ b/sysid/src/test/native/cpp/analysis/FeedbackAnalysisTest.cpp @@ -54,10 +54,10 @@ TEST(FeedbackAnalysisTest, VelocityCTRE) { sysid::LQRParameters params{1, 1.5, 7}; - auto [Kp, Kd] = sysid::CalculateVelocityFeedbackGains( - sysid::presets::kCTREv5CANCoder, params, Kv, Ka); + auto [Kp, Kd] = sysid::CalculateVelocityFeedbackGains(sysid::presets::kCTREv5, + params, Kv, Ka); - EXPECT_NEAR(Kp, 0.000417, 0.00005); + EXPECT_NEAR(Kp, 259.21276731541178, 0.00005); EXPECT_NEAR(Kd, 0.00, 0.05); } @@ -67,12 +67,12 @@ TEST(FeedbackAnalysisTest, VelocityCTREConversion) { sysid::LQRParameters params{1, 1.5, 7}; - auto [Kp, Kd] = sysid::CalculateVelocityFeedbackGains( - sysid::presets::kCTREv5CANCoder, params, Kv, Ka, 3.0); + auto [Kp, Kd] = sysid::CalculateVelocityFeedbackGains(sysid::presets::kCTREv5, + params, Kv, Ka, 3.0); // This should have the same Kp as the test above, but scaled by a factor // of 3. - EXPECT_NEAR(Kp, 0.000417 / 3, 0.00005); + EXPECT_NEAR(Kp, 259.21276731541178 / 3, 0.00005); EXPECT_NEAR(Kd, 0.00, 0.05); }