Skip to content
This repository was archived by the owner on May 19, 2024. It is now read-only.

Commit ca91a12

Browse files
committed
refactor(controller): Report degrees.
1 parent 8e56beb commit ca91a12

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

src/main/java/frc/lib/controller/PositionControllerIO.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package frc.lib.controller;
22

3+
import edu.wpi.first.math.util.Units;
34
import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardLayout;
45
import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
56
import frc.lib.Telemetry;
@@ -57,10 +58,13 @@ public static void addToShuffleboard(
5758
ShuffleboardTab tab, String name, PositionControllerIOValues values) {
5859
ShuffleboardLayout positionController = Telemetry.addColumn(tab, name);
5960

60-
positionController.addDouble("Position (rot)", () -> values.positionRotations);
61-
positionController.addDouble("Velocity (rps)", () -> values.velocityRotationsPerSecond);
6261
positionController.addDouble(
63-
"Acceleration (rpsps)", () -> values.accelerationRotationsPerSecondPerSecond);
62+
"Position (deg)", () -> Units.rotationsToDegrees(values.positionRotations));
63+
positionController.addDouble(
64+
"Velocity (dps)", () -> Units.rotationsToDegrees(values.velocityRotationsPerSecond));
65+
positionController.addDouble(
66+
"Acceleration (dpsps)",
67+
() -> Units.rotationsToDegrees(values.accelerationRotationsPerSecondPerSecond));
6468
positionController.addDouble("Voltage (V)", () -> values.motorVolts);
6569
positionController.addDouble("Current (A)", () -> values.motorAmps);
6670
}

src/main/java/frc/lib/controller/VelocityControllerIO.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package frc.lib.controller;
22

3+
import edu.wpi.first.math.util.Units;
34
import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardLayout;
45
import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardTab;
56
import frc.lib.Telemetry;
@@ -51,9 +52,11 @@ public static void addToShuffleboard(
5152
ShuffleboardTab tab, String name, VelocityControllerIOValues values) {
5253
ShuffleboardLayout velocityController = Telemetry.addColumn(tab, name);
5354

54-
velocityController.addDouble("Velocity (rps)", () -> values.velocityRotationsPerSecond);
5555
velocityController.addDouble(
56-
"Acceleration (rpsps)", () -> values.accelerationRotationsPerSecondPerSecond);
56+
"Velocity (dps)", () -> Units.rotationsToDegrees(values.velocityRotationsPerSecond));
57+
velocityController.addDouble(
58+
"Acceleration (dpsps)",
59+
() -> Units.rotationsToDegrees(values.accelerationRotationsPerSecondPerSecond));
5760
velocityController.addDouble("Voltage (V)", () -> values.motorVolts);
5861
velocityController.addDouble("Current (A)", () -> values.motorAmps);
5962
}

0 commit comments

Comments
 (0)