From 242a3a860f5edacb8fae966f3f177f48ac1118e2 Mon Sep 17 00:00:00 2001 From: BrodyKarr Date: Fri, 17 Jul 2026 20:48:02 -0700 Subject: [PATCH 1/4] changed the naming architypes --- src/main/java/frc/robot/DeviceIDs.java | 8 ++++---- src/main/java/frc/robot/RobotContainer.java | 12 ++++++------ .../{ConstMotion.java => ConstFreeSpin.java} | 2 +- .../{ConstRotors.java => ConstPositional.java} | 2 +- .../{Rotors.java => FreeSpinComponents.java} | 4 ++-- .../{Motion.java => PositionalComponents.java} | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) rename src/main/java/frc/robot/constants/{ConstMotion.java => ConstFreeSpin.java} (92%) rename src/main/java/frc/robot/constants/{ConstRotors.java => ConstPositional.java} (92%) rename src/main/java/frc/robot/subsystems/{Rotors.java => FreeSpinComponents.java} (84%) rename src/main/java/frc/robot/subsystems/{Motion.java => PositionalComponents.java} (77%) diff --git a/src/main/java/frc/robot/DeviceIDs.java b/src/main/java/frc/robot/DeviceIDs.java index ad9646e..2651078 100644 --- a/src/main/java/frc/robot/DeviceIDs.java +++ b/src/main/java/frc/robot/DeviceIDs.java @@ -36,13 +36,13 @@ public static class drivetrainIDs { public static final int BACK_RIGHT_ABSOLUTE_ENCODER_CAN = 3; } - // Rotor and Motion IDs: 10~29 - public static class rotorIDs { + // FreeSpin and Positional IDs: 10~29 + public static class freeSpinIDs { } - // Motion Profile IDs: 30~49 - public static class motionIDs { + // PositionalComponents Profile IDs: 30~49 + public static class positionalIDs { } } diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index ee9cd86..e4c225f 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -29,9 +29,9 @@ import frc.robot.subsystems.DriverStateMachine; import frc.robot.subsystems.DriverStateMachine.DriverState; import frc.robot.subsystems.Drivetrain; -import frc.robot.subsystems.Motion; +import frc.robot.subsystems.PositionalComponents; import frc.robot.subsystems.RobotPoses; -import frc.robot.subsystems.Rotors; +import frc.robot.subsystems.FreeSpinComponents; import frc.robot.subsystems.StateMachine; import frc.robot.subsystems.StateMachine.RobotState; import frc.robot.subsystems.Telemetry; @@ -48,10 +48,10 @@ public class RobotContainer { private final SN_XboxController conDriver = new SN_XboxController(controllerIDs.DRIVER_USB); - public static final Rotors rotorsInstance = new Rotors(); - private final Rotors loggedRotorsInstance = rotorsInstance; - public static final Motion motionInstance = new Motion(); - private final Motion loggedMotionInstance = motionInstance; + public static final FreeSpinComponents freeSpinInstance = new FreeSpinComponents(); + private final FreeSpinComponents loggedFreeSpinInstance = freeSpinInstance; + public static final PositionalComponents positionalInstance = new PositionalComponents(); + private final PositionalComponents loggedPositionalInstance = positionalInstance; public static final Drivetrain drivetrainInstance = new Drivetrain(); private final Drivetrain loggedDrivetrainInstance = drivetrainInstance; public static final DriverStateMachine driverStateMachineInstance = new DriverStateMachine(); diff --git a/src/main/java/frc/robot/constants/ConstMotion.java b/src/main/java/frc/robot/constants/ConstFreeSpin.java similarity index 92% rename from src/main/java/frc/robot/constants/ConstMotion.java rename to src/main/java/frc/robot/constants/ConstFreeSpin.java index 8dd0e88..77d6b33 100644 --- a/src/main/java/frc/robot/constants/ConstMotion.java +++ b/src/main/java/frc/robot/constants/ConstFreeSpin.java @@ -5,7 +5,7 @@ package frc.robot.constants; /** Add your docs here. */ -public class ConstMotion { +public class ConstFreeSpin { public static final double STOP = 0; static { diff --git a/src/main/java/frc/robot/constants/ConstRotors.java b/src/main/java/frc/robot/constants/ConstPositional.java similarity index 92% rename from src/main/java/frc/robot/constants/ConstRotors.java rename to src/main/java/frc/robot/constants/ConstPositional.java index 847dcbb..fe10ecb 100644 --- a/src/main/java/frc/robot/constants/ConstRotors.java +++ b/src/main/java/frc/robot/constants/ConstPositional.java @@ -5,7 +5,7 @@ package frc.robot.constants; /** Add your docs here. */ -public class ConstRotors { +public class ConstPositional { public static final double STOP = 0; static { diff --git a/src/main/java/frc/robot/subsystems/Rotors.java b/src/main/java/frc/robot/subsystems/FreeSpinComponents.java similarity index 84% rename from src/main/java/frc/robot/subsystems/Rotors.java rename to src/main/java/frc/robot/subsystems/FreeSpinComponents.java index fc2fd8f..523d8dc 100644 --- a/src/main/java/frc/robot/subsystems/Rotors.java +++ b/src/main/java/frc/robot/subsystems/FreeSpinComponents.java @@ -8,9 +8,9 @@ import edu.wpi.first.wpilibj2.command.SubsystemBase; @Logged -public class Rotors extends SubsystemBase { +public class FreeSpinComponents extends SubsystemBase { /** Creates a new Rotors. */ - public Rotors() { + public FreeSpinComponents() { } @Override diff --git a/src/main/java/frc/robot/subsystems/Motion.java b/src/main/java/frc/robot/subsystems/PositionalComponents.java similarity index 77% rename from src/main/java/frc/robot/subsystems/Motion.java rename to src/main/java/frc/robot/subsystems/PositionalComponents.java index 1f428b6..2d6f33f 100644 --- a/src/main/java/frc/robot/subsystems/Motion.java +++ b/src/main/java/frc/robot/subsystems/PositionalComponents.java @@ -8,9 +8,9 @@ import edu.wpi.first.wpilibj2.command.SubsystemBase; @Logged -public class Motion extends SubsystemBase { - /** Creates a new Motion. */ - public Motion() { +public class PositionalComponents extends SubsystemBase { + /** Creates a new Positional. */ + public PositionalComponents() { } @Override From f60b5c20b40335b735b3afd510be38c75072f6d5 Mon Sep 17 00:00:00 2001 From: Yutong Zhu Date: Fri, 17 Jul 2026 21:28:07 -0700 Subject: [PATCH 2/4] rename --- src/main/java/frc/robot/DeviceIDs.java | 2 +- src/main/java/frc/robot/RobotContainer.java | 12 ++++++------ .../{FreeSpinComponents.java => FreeSpin.java} | 4 ++-- .../{PositionalComponents.java => Positional.java} | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) rename src/main/java/frc/robot/subsystems/{FreeSpinComponents.java => FreeSpin.java} (84%) rename src/main/java/frc/robot/subsystems/{PositionalComponents.java => Positional.java} (83%) diff --git a/src/main/java/frc/robot/DeviceIDs.java b/src/main/java/frc/robot/DeviceIDs.java index 2651078..1b682d8 100644 --- a/src/main/java/frc/robot/DeviceIDs.java +++ b/src/main/java/frc/robot/DeviceIDs.java @@ -41,7 +41,7 @@ public static class freeSpinIDs { } - // PositionalComponents Profile IDs: 30~49 + // Positional IDs: 30~49 public static class positionalIDs { } diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index e4c225f..b7e09bf 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -29,9 +29,9 @@ import frc.robot.subsystems.DriverStateMachine; import frc.robot.subsystems.DriverStateMachine.DriverState; import frc.robot.subsystems.Drivetrain; -import frc.robot.subsystems.PositionalComponents; +import frc.robot.subsystems.FreeSpin; +import frc.robot.subsystems.Positional; import frc.robot.subsystems.RobotPoses; -import frc.robot.subsystems.FreeSpinComponents; import frc.robot.subsystems.StateMachine; import frc.robot.subsystems.StateMachine.RobotState; import frc.robot.subsystems.Telemetry; @@ -48,10 +48,10 @@ public class RobotContainer { private final SN_XboxController conDriver = new SN_XboxController(controllerIDs.DRIVER_USB); - public static final FreeSpinComponents freeSpinInstance = new FreeSpinComponents(); - private final FreeSpinComponents loggedFreeSpinInstance = freeSpinInstance; - public static final PositionalComponents positionalInstance = new PositionalComponents(); - private final PositionalComponents loggedPositionalInstance = positionalInstance; + public static final FreeSpin freeSpinInstance = new FreeSpin(); + private final FreeSpin loggedFreeSpinInstance = freeSpinInstance; + public static final Positional positionalInstance = new Positional(); + private final Positional loggedPositionalInstance = positionalInstance; public static final Drivetrain drivetrainInstance = new Drivetrain(); private final Drivetrain loggedDrivetrainInstance = drivetrainInstance; public static final DriverStateMachine driverStateMachineInstance = new DriverStateMachine(); diff --git a/src/main/java/frc/robot/subsystems/FreeSpinComponents.java b/src/main/java/frc/robot/subsystems/FreeSpin.java similarity index 84% rename from src/main/java/frc/robot/subsystems/FreeSpinComponents.java rename to src/main/java/frc/robot/subsystems/FreeSpin.java index 523d8dc..b7806e6 100644 --- a/src/main/java/frc/robot/subsystems/FreeSpinComponents.java +++ b/src/main/java/frc/robot/subsystems/FreeSpin.java @@ -8,9 +8,9 @@ import edu.wpi.first.wpilibj2.command.SubsystemBase; @Logged -public class FreeSpinComponents extends SubsystemBase { +public class FreeSpin extends SubsystemBase { /** Creates a new Rotors. */ - public FreeSpinComponents() { + public FreeSpin() { } @Override diff --git a/src/main/java/frc/robot/subsystems/PositionalComponents.java b/src/main/java/frc/robot/subsystems/Positional.java similarity index 83% rename from src/main/java/frc/robot/subsystems/PositionalComponents.java rename to src/main/java/frc/robot/subsystems/Positional.java index 2d6f33f..f4b34c1 100644 --- a/src/main/java/frc/robot/subsystems/PositionalComponents.java +++ b/src/main/java/frc/robot/subsystems/Positional.java @@ -8,9 +8,9 @@ import edu.wpi.first.wpilibj2.command.SubsystemBase; @Logged -public class PositionalComponents extends SubsystemBase { +public class Positional extends SubsystemBase { /** Creates a new Positional. */ - public PositionalComponents() { + public Positional() { } @Override From bce08944b87983f2539b1f17b56c52a39c916503 Mon Sep 17 00:00:00 2001 From: Yutong Zhu <3681247216@qq.com> Date: Sat, 18 Jul 2026 11:38:34 -0700 Subject: [PATCH 3/4] Apply suggestions from code review Co-authored-by: Tayler Uva <8679670+TaylerUva@users.noreply.github.com> --- src/main/java/frc/robot/subsystems/FreeSpin.java | 1 - src/main/java/frc/robot/subsystems/Positional.java | 1 - 2 files changed, 2 deletions(-) diff --git a/src/main/java/frc/robot/subsystems/FreeSpin.java b/src/main/java/frc/robot/subsystems/FreeSpin.java index b7806e6..153f5e7 100644 --- a/src/main/java/frc/robot/subsystems/FreeSpin.java +++ b/src/main/java/frc/robot/subsystems/FreeSpin.java @@ -9,7 +9,6 @@ @Logged public class FreeSpin extends SubsystemBase { - /** Creates a new Rotors. */ public FreeSpin() { } diff --git a/src/main/java/frc/robot/subsystems/Positional.java b/src/main/java/frc/robot/subsystems/Positional.java index f4b34c1..c708ed5 100644 --- a/src/main/java/frc/robot/subsystems/Positional.java +++ b/src/main/java/frc/robot/subsystems/Positional.java @@ -9,7 +9,6 @@ @Logged public class Positional extends SubsystemBase { - /** Creates a new Positional. */ public Positional() { } From 203a5f21bd224a29f70148ca16c089fb0b29f590 Mon Sep 17 00:00:00 2001 From: Yutong Zhu <3681247216@qq.com> Date: Sat, 18 Jul 2026 13:59:42 -0700 Subject: [PATCH 4/4] Apply suggestions from code review Co-authored-by: Tayler Uva <8679670+TaylerUva@users.noreply.github.com> --- src/main/java/frc/robot/DeviceIDs.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/frc/robot/DeviceIDs.java b/src/main/java/frc/robot/DeviceIDs.java index 1b682d8..21bb259 100644 --- a/src/main/java/frc/robot/DeviceIDs.java +++ b/src/main/java/frc/robot/DeviceIDs.java @@ -36,7 +36,7 @@ public static class drivetrainIDs { public static final int BACK_RIGHT_ABSOLUTE_ENCODER_CAN = 3; } - // FreeSpin and Positional IDs: 10~29 + // FreeSpin IDs: 10~29 public static class freeSpinIDs { }