commit 6a8aac30d86a36d149b2ba55538a920b4370d4cc
author James Kuszmaul <jabukuszmaul@gmail.com> Tue Dec 26 11:03:19 2023 -0800
committer Gerrit Code Review <gerrit@software.frc971.org> Tue Dec 26 11:03:19 2023 -0800
tree cdddfb52ac834dec8a98e737eaacf1067003d5c6
parent f1cfe7f6624eeda54ed6fcab1c4c1d490d6da90d
parent f6873e44d891b2268dc036a36192856e28dd172a

Merge "Upgrade CTRE libraries to beta-5"

y2023/constants.h

diff --git a/y2023/constants.h b/y2023/constants.h
index 84d6499..d90bbc9 100644
--- a/y2023/constants.h
+++ b/y2023/constants.h
@@ -54,8 +54,7 @@
 
   static double DrivetrainCANEncoderToMeters(double rotations) {
     return (rotations * (2.0 * M_PI)) *
-           control_loops::drivetrain::kHighOutputRatio *
-           control_loops::drivetrain::kWheelRadius;
+           control_loops::drivetrain::kHighOutputRatio;
   }
   static constexpr double kProximalEncoderCountsPerRevolution() {
     return 4096.0;

y2023_bot3/constants.h

diff --git a/y2023_bot3/constants.h b/y2023_bot3/constants.h
index 73ac7cf..ba7267c 100644
--- a/y2023_bot3/constants.h
+++ b/y2023_bot3/constants.h
@@ -61,8 +61,7 @@
 
   static double DrivetrainCANEncoderToMeters(double rotations) {
     return (rotations * (2.0 * M_PI)) *
-           control_loops::drivetrain::kHighOutputRatio *
-           control_loops::drivetrain::kWheelRadius;
+           control_loops::drivetrain::kHighOutputRatio;
   }
 
   // Pivot Joint